From 62a7ba20c1d1804b8d4b18c371112470ac6b0f73 Mon Sep 17 00:00:00 2001 From: Vincent Laporte Date: Sun, 4 Oct 2015 10:43:34 +0200 Subject: [PATCH 001/162] ocaml-ppx_tools: init at 0.99.2 Tools for authors of ppx rewriters Homepage: https://github.com/alainfrisch/ppx_tools --- .../ocaml-modules/ppx_tools/default.nix | 21 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 5 +++++ 2 files changed, 26 insertions(+) create mode 100644 pkgs/development/ocaml-modules/ppx_tools/default.nix diff --git a/pkgs/development/ocaml-modules/ppx_tools/default.nix b/pkgs/development/ocaml-modules/ppx_tools/default.nix new file mode 100644 index 000000000000..4e99dcd1af45 --- /dev/null +++ b/pkgs/development/ocaml-modules/ppx_tools/default.nix @@ -0,0 +1,21 @@ +{ stdenv, fetchzip, ocaml, findlib }: + +stdenv.mkDerivation { + name = "ocaml-ppx_tools-0.99.2"; + src = fetchzip { + url = https://github.com/alainfrisch/ppx_tools/archive/ppx_tools_0.99.2.tar.gz; + sha256 = "1m09r2sjcb37i4dyhpbk9n2wxkcvpib6bvairsird91fm9w0vqw7"; + }; + + buildInputs = [ ocaml findlib ]; + + createFindlibDestdir = true; + + meta = with stdenv.lib; { + description = "Tools for authors of ppx rewriters"; + homepage = http://www.lexifi.com/ppx_tools; + license = licenses.mit; + platforms = ocaml.meta.platforms; + maintainers = with maintainers; [ vbgl ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index fc78dac5ee79..b3c501e1c542 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -4624,6 +4624,11 @@ let pprint = callPackage ../development/ocaml-modules/pprint { }; + ppx_tools = + if lib.versionAtLeast ocaml_version "4.02" + then callPackage ../development/ocaml-modules/ppx_tools {} + else null; + pycaml = callPackage ../development/ocaml-modules/pycaml { }; qcheck = callPackage ../development/ocaml-modules/qcheck { From f88399fe2015eb0dbd5a360403d1e5d49b3aead5 Mon Sep 17 00:00:00 2001 From: Vincent Laporte Date: Wed, 14 Oct 2015 08:21:36 +0200 Subject: [PATCH 002/162] ocaml-lwt: enable ppx --- pkgs/development/ocaml-modules/lwt/default.nix | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/pkgs/development/ocaml-modules/lwt/default.nix b/pkgs/development/ocaml-modules/lwt/default.nix index 0c81775f2365..0c73ff6521f2 100644 --- a/pkgs/development/ocaml-modules/lwt/default.nix +++ b/pkgs/development/ocaml-modules/lwt/default.nix @@ -1,4 +1,4 @@ -{stdenv, fetchzip, which, cryptopp, ocaml, findlib, ocaml_react, ocaml_ssl, libev, pkgconfig, ncurses, ocaml_oasis, ocaml_text, glib, camlp4}: +{ stdenv, fetchzip, which, cryptopp, ocaml, findlib, ocaml_react, ocaml_ssl, libev, pkgconfig, ncurses, ocaml_oasis, ocaml_text, glib, camlp4, ppx_tools }: let version = "2.4.6"; @@ -16,11 +16,12 @@ stdenv.mkDerivation { sha256 = "0idci0zadpb8hmblszsrvg6yf36w5a9y6rsdwjc3jww71dgrw5d9"; }; - buildInputs = [ocaml_oasis pkgconfig which cryptopp ocaml findlib glib ncurses camlp4]; + buildInputs = [ ocaml_oasis pkgconfig which cryptopp ocaml findlib glib ncurses camlp4 ppx_tools ]; propagatedBuildInputs = [ ocaml_react ocaml_ssl ocaml_text libev ]; - configureFlags = [ "--enable-react" "--enable-glib" "--enable-ssl" "--enable-text" "--disable-ppx" ] + configureFlags = [ "--enable-react" "--enable-glib" "--enable-ssl" "--enable-text" ] + ++ [ (if versionAtLeast ocaml_version "4.02" then "--enable-ppx" else "--disable-ppx") ] ++ optional (versionAtLeast ocaml_version "4.0" && ! versionAtLeast ocaml_version "4.02") "--enable-toplevel"; createFindlibDestdir = true; From 3136a17834acb451b44767a180fb5f1d6f640362 Mon Sep 17 00:00:00 2001 From: "Ricardo M. Correia" Date: Wed, 28 Oct 2015 15:20:32 +0100 Subject: [PATCH 003/162] rr: 3.0.0 -> 4.0.0 --- .../development/tools/analysis/rr/default.nix | 22 ++++++++++--------- pkgs/top-level/all-packages.nix | 4 +++- 2 files changed, 15 insertions(+), 11 deletions(-) diff --git a/pkgs/development/tools/analysis/rr/default.nix b/pkgs/development/tools/analysis/rr/default.nix index 992d797c1892..70d61bc4deb4 100644 --- a/pkgs/development/tools/analysis/rr/default.nix +++ b/pkgs/development/tools/analysis/rr/default.nix @@ -1,29 +1,31 @@ -{ stdenv, fetchFromGitHub, cmake, libpfm, zlib, python }: +{ stdenv, fetchFromGitHub, cmake, libpfm, zlib, python, pkgconfig, pythonPackages, which, procps }: stdenv.mkDerivation rec { - version = "3.0.0"; + version = "4.0.0"; name = "rr-${version}"; src = fetchFromGitHub { owner = "mozilla"; repo = "rr"; rev = version; - sha256 = "1h4ddq7mmi0sfj6mh1qg2bfs3x7gz5qmn9dlnmpkrp38rqgnnhrg"; + sha256 = "02njg9riziyvgp0q39lhpyf32p1hjjk1wih5dvl74wrzy5anhbwk"; }; patchPhase = '' substituteInPlace src/Command.cc --replace '_BSD_SOURCE' '_DEFAULT_SOURCE' - '' - # On 64bit machines, don't build the 32-bit components for debugging - # 32-bit binaries. This sucks but I don't know how to make 'gcc' cooperate - # easily with how CMake works to build 32 and 64bit binaries at once. - + stdenv.lib.optionalString (stdenv.system == "x86_64-linux") '' - substituteInPlace CMakeLists.txt --replace 'if(rr_64BIT)' 'if(false)' + patchShebangs . ''; - buildInputs = [ cmake libpfm zlib python ]; + buildInputs = [ cmake libpfm zlib python pkgconfig pythonPackages.pexpect which procps ]; cmakeFlags = "-DCMAKE_C_FLAGS_RELEASE:STRING= -DCMAKE_CXX_FLAGS_RELEASE:STRING="; + enableParallelBuilding = true; + + # FIXME + #doCheck = true; + + preCheck = "export HOME=$TMPDIR"; + meta = { homepage = http://rr-project.org/; description = "Records nondeterministic executions and debugs them deterministically"; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 3479ba9b8f8d..a1799aad1e00 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -5779,7 +5779,9 @@ let rman = callPackage ../development/tools/misc/rman { }; - rr = callPackage ../development/tools/analysis/rr { }; + rr = callPackage ../development/tools/analysis/rr { + stdenv = stdenv_32bit; + }; saleae-logic = callPackage ../development/tools/misc/saleae-logic { }; From d35baf0fd26d90a754fad7eaaf0bdede62ccf4ca Mon Sep 17 00:00:00 2001 From: Thomas Tuegel Date: Wed, 7 Oct 2015 06:28:20 -0500 Subject: [PATCH 004/162] kf5_latest: kf512 -> kf514 --- pkgs/top-level/all-packages.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 2c4ae620eca9..c0309c03750e 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -6753,8 +6753,8 @@ let kf510 = recurseIntoAttrs (callPackage ../development/libraries/kde-frameworks-5.10 { }); kf512 = recurseIntoAttrs (callPackage ../development/libraries/kde-frameworks-5.12 { }); kf514 = recurseIntoAttrs (import ../development/libraries/kde-frameworks-5.14 { inherit pkgs; }); - kf5_latest = kf512; kf5_stable = kf510; + kf5_latest = kf514; kf5PackagesFun = self: with self; { From d49a6d47afa54545d2554fa876f3f48a398170ba Mon Sep 17 00:00:00 2001 From: Thomas Tuegel Date: Wed, 7 Oct 2015 06:28:45 -0500 Subject: [PATCH 005/162] kdeApps_latest: kdeApps_15_04 -> kdeApps_15_08 --- pkgs/top-level/all-packages.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index c0309c03750e..144199647f37 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -12045,8 +12045,8 @@ let kdeApps_15_04 = recurseIntoAttrs (callPackage ../applications/kde-apps-15.04 {}); kdeApps_stable = kdeApps_15_04; - kdeApps_latest = kdeApps_15_04; kdeApps_15_08 = recurseIntoAttrs (import ../applications/kde-apps-15.08 { inherit pkgs; }); + kdeApps_latest = kdeApps_15_08; keepnote = callPackage ../applications/office/keepnote { pygtk = pyGtkGlade; From 79832d773b572065b5570d5a8ce2f512d3d261b6 Mon Sep 17 00:00:00 2001 From: Thomas Tuegel Date: Wed, 7 Oct 2015 06:29:05 -0500 Subject: [PATCH 006/162] plasma5_latest: plasma53 -> plasma54 --- pkgs/top-level/all-packages.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 144199647f37..5b1a07258c53 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -14375,9 +14375,9 @@ let numix-gtk-theme = callPackage ../misc/themes/gtk3/numix-gtk-theme { }; plasma53 = recurseIntoAttrs (callPackage ../desktops/plasma-5.3 { }); - plasma5_latest = plasma53; plasma5_stable = plasma53; plasma54 = recurseIntoAttrs (callPackage ../desktops/plasma-5.4 { inherit pkgs; }); + plasma5_latest = plasma54; kde5 = kf5_stable // plasma5_stable // kdeApps_stable; From 2e06a781bcc7521e2250ac4a92860608648e10a1 Mon Sep 17 00:00:00 2001 From: Thomas Tuegel Date: Wed, 7 Oct 2015 06:29:41 -0500 Subject: [PATCH 007/162] remove kf512 --- .../libraries/kde-frameworks-5.12/default.nix | 228 -- .../kde-frameworks-5.12/dependencies.sh | 22 - .../0001-extra-cmake-modules-paths.patch | 74 - .../kauth/kauth-policy-install.patch | 13 - ...utils-pluginselector-follow-symlinks.patch | 13 - ...igwidgets-helpclient-follow-symlinks.patch | 13 - .../kdoctools-no-find-docbook-xml.patch | 12 - .../kinit/0001-kinit-libpath.patch | 42 - .../kpackage/0001-allow-external-paths.patch | 25 - ...service-kbuildsycoca-follow-symlinks.patch | 13 - ...ce-kbuildsycoca-no-canonicalize-path.patch | 13 - .../0001-no-qcoreapplication.patch | 48 - .../kde-frameworks-5.12/packages.json | 2116 ----------------- .../libraries/kde-frameworks-5.12/packages.sh | 22 - .../plasma-framework-external-paths.patch | 13 - .../kde-frameworks-5.12/renames.json | 71 - .../kde-frameworks-5.12/setup-hook.sh | 1 - pkgs/top-level/all-packages.nix | 1 - 18 files changed, 2740 deletions(-) delete mode 100644 pkgs/development/libraries/kde-frameworks-5.12/default.nix delete mode 100755 pkgs/development/libraries/kde-frameworks-5.12/dependencies.sh delete mode 100644 pkgs/development/libraries/kde-frameworks-5.12/extra-cmake-modules/0001-extra-cmake-modules-paths.patch delete mode 100644 pkgs/development/libraries/kde-frameworks-5.12/kauth/kauth-policy-install.patch delete mode 100644 pkgs/development/libraries/kde-frameworks-5.12/kcmutils/kcmutils-pluginselector-follow-symlinks.patch delete mode 100644 pkgs/development/libraries/kde-frameworks-5.12/kconfigwidgets/kconfigwidgets-helpclient-follow-symlinks.patch delete mode 100644 pkgs/development/libraries/kde-frameworks-5.12/kdoctools/kdoctools-no-find-docbook-xml.patch delete mode 100644 pkgs/development/libraries/kde-frameworks-5.12/kinit/0001-kinit-libpath.patch delete mode 100644 pkgs/development/libraries/kde-frameworks-5.12/kpackage/0001-allow-external-paths.patch delete mode 100644 pkgs/development/libraries/kde-frameworks-5.12/kservice/kservice-kbuildsycoca-follow-symlinks.patch delete mode 100644 pkgs/development/libraries/kde-frameworks-5.12/kservice/kservice-kbuildsycoca-no-canonicalize-path.patch delete mode 100644 pkgs/development/libraries/kde-frameworks-5.12/ktexteditor/0001-no-qcoreapplication.patch delete mode 100644 pkgs/development/libraries/kde-frameworks-5.12/packages.json delete mode 100755 pkgs/development/libraries/kde-frameworks-5.12/packages.sh delete mode 100644 pkgs/development/libraries/kde-frameworks-5.12/plasma-framework/plasma-framework-external-paths.patch delete mode 100644 pkgs/development/libraries/kde-frameworks-5.12/renames.json delete mode 100644 pkgs/development/libraries/kde-frameworks-5.12/setup-hook.sh diff --git a/pkgs/development/libraries/kde-frameworks-5.12/default.nix b/pkgs/development/libraries/kde-frameworks-5.12/default.nix deleted file mode 100644 index 229f28f90958..000000000000 --- a/pkgs/development/libraries/kde-frameworks-5.12/default.nix +++ /dev/null @@ -1,228 +0,0 @@ -# Maintainer's Notes: -# -# Minor updates: -# 1. Edit ./manifest.sh to point to the updated URL. Upstream sometimes -# releases updates that include only the changed packages; in this case, -# multiple URLs can be provided and the results will be merged. -# 2. Run ./manifest.sh and ./dependencies.sh. -# 3. Build and enjoy. -# -# Major updates: -# We prefer not to immediately overwrite older versions with major updates, so -# make a copy of this directory first. After copying, be sure to delete ./tmp -# if it exists. Then follow the minor update instructions. - -{ pkgs, newScope, qt5 ? null, debug ? false }: - -let inherit (pkgs) autonix stdenv symlinkJoin; in - -with autonix; let inherit (stdenv) lib; in - -let - qt5_ = if qt5 != null then qt5 else pkgs.qt54; -in - -let - - qt5 = qt5_; - - super = - let json = builtins.fromJSON (builtins.readFile ./packages.json); - mirrorUrl = n: pkg: pkg // { - src = pkg.src // { url = "mirror://kde/${pkg.src.url}"; }; - }; - renames = builtins.fromJSON (builtins.readFile ./renames.json); - propagated = [ "extra-cmake-modules" ]; - native = [ - "bison" - "extra-cmake-modules" - "flex" - "kdoctools" - "ki18n" - "libxslt" - "perl" - "pythoninterp" - ]; - user = [ - "qt5" - "qt5core" - "qt5dbus" - "qt5gui" - "qt5qml" - "qt5quick" - "qt5svg" - "qt5webkitwidgets" - "qt5widgets" - "qt5x11extras" - "shareddesktopontologies" - "sharedmimeinfo" - ]; - in lib.fold (f: attrs: f attrs) json [ - (lib.mapAttrs kdePackage) - (userEnvDeps user) - (nativeDeps native) - (propagateDeps propagated) - (renameDeps renames) - (lib.mapAttrs mirrorUrl) - ]; - - kdePackage = name: pkg: - let defaultOverride = drv: drv // { - setupHook = ./setup-hook.sh; - cmakeFlags = - (drv.cmakeFlags or []) - ++ [ "-DBUILD_TESTING=OFF" ] - ++ lib.optional debug "-DCMAKE_BUILD_TYPE=Debug"; - meta = { - license = with stdenv.lib.licenses; [ - lgpl21Plus lgpl3Plus bsd2 mit gpl2Plus gpl3Plus fdl12 - ]; - platforms = stdenv.lib.platforms.linux; - maintainers = with stdenv.lib.maintainers; [ ttuegel ]; - homepage = "http://www.kde.org"; - }; - }; - callPackage = newScope { - inherit (stdenv) mkDerivation; - inherit (pkgs) fetchurl; - inherit scope; - }; - in mkPackage callPackage defaultOverride name pkg; - - scope = - # packages in this collection - self // - # packages pinned to this version of Qt 5 - { - dbusmenu-qt5 = pkgs.libdbusmenu_qt5.override { inherit qt5; }; - phonon4qt5 = pkgs.phonon_qt5.override { inherit qt5; }; - polkit_qt5 = pkgs.polkit_qt5.override { inherit qt5; }; - qt5 = qt5.base; - qt5core = qt5.base; - qt5dbus = qt5.base; - qt5gui = qt5.base; - qt5linguisttools = qt5.tools; - qt5qml = [qt5.declarative qt5.graphicaleffects]; - qt5quick = [qt5.quickcontrols qt5.graphicaleffects]; - qt5script = qt5.script; - qt5svg = qt5.svg; - qt5webkitwidgets = qt5.webkit; - qt5widgets = qt5.base; - qt5x11extras = qt5.x11extras; - qt5xmlpatterns = qt5.xmlpatterns; - } // - # packages from the nixpkgs collection - (with pkgs; - { - inherit acl cmake docbook_xml_dtd_45 docbook5_xsl epoxy fam gpgme - libgcrypt libgit2 modemmanager networkmanager perl - perlPackages qimageblitz xorg zlib; - boost = boost155; - gif = giflib; - glib2 = glib; - jpeg = libjpeg; - libintl = gettext; - liblzma = lzma; - pythoninterp = python; - pythonlibrary = python; - sharedmimeinfo = shared_mime_info; - } - ); - - self = super // { - bluez-qt = overrideDerivation super.bluez-qt (drv: { - preConfigure = '' - substituteInPlace CMakeLists.txt \ - --replace /lib/udev/rules.d "$out/lib/udev/rules.d" - ''; - }); - - extra-cmake-modules = overrideDerivation super.extra-cmake-modules (drv: { - buildInputs = []; - nativeBuildInputs = []; - propagatedBuildInputs = []; - propagatedNativeBuildInputs = [ scope.cmake pkgs.pkgconfig qt5.tools ]; - propagatedUserEnvPkgs = []; - cmakeFlags = ["-DBUILD_TESTING=OFF"]; - patches = [./extra-cmake-modules/0001-extra-cmake-modules-paths.patch]; - meta = { - license = stdenv.lib.licenses.bsd2; - platforms = stdenv.lib.platforms.linux; - maintainers = with stdenv.lib.maintainers; [ ttuegel ]; - homepage = "http://www.kde.org"; - }; - }); - - frameworkintegration = extendDerivation super.frameworkintegration { - buildInputs = [ scope.xorg.libXcursor ]; - }; - - kauth = extendDerivation super.kauth { - buildInputs = [ scope.polkit_qt5 ]; - patches = [ ./kauth/kauth-policy-install.patch ]; - }; - - kcmutils = extendDerivation super.kcmutils { - patches = [ ./kcmutils/kcmutils-pluginselector-follow-symlinks.patch ]; - }; - - kconfigwidgets = extendDerivation super.kconfigwidgets { - patches = [ ./kconfigwidgets/kconfigwidgets-helpclient-follow-symlinks.patch ]; - }; - - kdelibs4support = extendDerivation super.kdelibs4support { - buildInputs = [ scope.networkmanager scope.xorg.libSM ]; - cmakeFlags = [ - "-DDocBookXML4_DTD_DIR=${pkgs.docbook_xml_dtd_45}/xml/dtd/docbook" - "-DDocBookXML4_DTD_VERSION=4.5" - ]; - }; - - kdoctools = extendDerivation super.kdoctools { - propagatedNativeBuildInputs = [ scope.perl scope.perlPackages.URI ]; - cmakeFlags = [ - "-DDocBookXML4_DTD_DIR=${scope.docbook_xml_dtd_45}/xml/dtd/docbook" - "-DDocBookXML4_DTD_VERSION=4.5" - "-DDocBookXSL_DIR=${scope.docbook5_xsl}/xml/xsl/docbook" - ]; - patches = [ ./kdoctools/kdoctools-no-find-docbook-xml.patch ]; - }; - - ki18n = extendDerivation super.ki18n { - propagatedNativeBuildInputs = with scope; [ libintl pythoninterp ]; - }; - - kimageformats = extendDerivation super.kimageformats { - NIX_CFLAGS_COMPILE = "-I${pkgs.ilmbase}/include/OpenEXR"; - }; - - kinit = extendDerivation super.kinit { - patches = [./kinit/0001-kinit-libpath.patch]; - }; - - kpackage = extendDerivation super.kpackage { - patches = [ ./kpackage/0001-allow-external-paths.patch ]; - }; - - kservice = extendDerivation super.kservice { - buildInputs = [ scope.kwindowsystem ]; - patches = [ - ./kservice/kservice-kbuildsycoca-follow-symlinks.patch - ./kservice/kservice-kbuildsycoca-no-canonicalize-path.patch - ]; - }; - - ktexteditor = extendDerivation super.ktexteditor { - patches = [ ./ktexteditor/0001-no-qcoreapplication.patch ]; - }; - - kwallet = extendDerivation super.kwallet { - buildInputs = [ scope.kdoctools ]; - }; - - networkmanager-qt = extendDerivation super.networkmanager-qt { - propagatedBuildInputs = [ scope.networkmanager ]; - }; - }; - -in self diff --git a/pkgs/development/libraries/kde-frameworks-5.12/dependencies.sh b/pkgs/development/libraries/kde-frameworks-5.12/dependencies.sh deleted file mode 100755 index 6122ddf4b3a6..000000000000 --- a/pkgs/development/libraries/kde-frameworks-5.12/dependencies.sh +++ /dev/null @@ -1,22 +0,0 @@ -#!/bin/sh - -# This script rebuilds dependencies.nix. -# You must run manifest.sh first to download the packages. - -# Without arguments, this will use the version of autonix-deps-kf5 in nixpkgs. -# If you are working on the packages, this is probably what you want. - -# You can also pass the path to a source tree where you have built -# autonix-deps-kf5 yourself. If you are working on autonix-deps-kf5, this is -# probably what you want. - -manifestXML=$(nix-build -E 'with (import ../../../.. {}); autonix.writeManifestXML ./manifest.nix') - -autonixDepsKf5="" -if [[ -z $1 ]]; then - autonixDepsKF5=$(nix-build ../../../.. -A haskellPackages.autonix-deps-kf5)/bin -else - autonixDepsKF5="$1/dist/build/kf5-deps" -fi - -exec ${autonixDepsKF5}/kf5-deps "${manifestXML}" diff --git a/pkgs/development/libraries/kde-frameworks-5.12/extra-cmake-modules/0001-extra-cmake-modules-paths.patch b/pkgs/development/libraries/kde-frameworks-5.12/extra-cmake-modules/0001-extra-cmake-modules-paths.patch deleted file mode 100644 index 9717716faf5b..000000000000 --- a/pkgs/development/libraries/kde-frameworks-5.12/extra-cmake-modules/0001-extra-cmake-modules-paths.patch +++ /dev/null @@ -1,74 +0,0 @@ -From 3cc148e878b69fc3e0228f3e3bf1bbe689dad87c Mon Sep 17 00:00:00 2001 -From: Thomas Tuegel -Date: Fri, 20 Feb 2015 23:17:39 -0600 -Subject: [PATCH] extra-cmake-modules paths - ---- - kde-modules/KDEInstallDirs.cmake | 37 ++++--------------------------------- - 1 file changed, 4 insertions(+), 33 deletions(-) - -diff --git a/kde-modules/KDEInstallDirs.cmake b/kde-modules/KDEInstallDirs.cmake -index b7cd34d..2f868ac 100644 ---- a/kde-modules/KDEInstallDirs.cmake -+++ b/kde-modules/KDEInstallDirs.cmake -@@ -193,37 +193,8 @@ - # (To distribute this file outside of extra-cmake-modules, substitute the full - # License text for the above reference.) - --# Figure out what the default install directory for libraries should be. --# This is based on the logic in GNUInstallDirs, but simplified (the --# GNUInstallDirs code deals with re-configuring, but that is dealt with --# by the _define_* macros in this module). -+# The default library directory on NixOS is *always* /lib. - set(_LIBDIR_DEFAULT "lib") --# Override this default 'lib' with 'lib64' iff: --# - we are on a Linux, kFreeBSD or Hurd system but NOT cross-compiling --# - we are NOT on debian --# - we are on a 64 bits system --# reason is: amd64 ABI: http://www.x86-64.org/documentation/abi.pdf --# For Debian with multiarch, use 'lib/${CMAKE_LIBRARY_ARCHITECTURE}' if --# CMAKE_LIBRARY_ARCHITECTURE is set (which contains e.g. "i386-linux-gnu" --# See http://wiki.debian.org/Multiarch --if((CMAKE_SYSTEM_NAME MATCHES "Linux|kFreeBSD" OR CMAKE_SYSTEM_NAME STREQUAL "GNU") -- AND NOT CMAKE_CROSSCOMPILING) -- if (EXISTS "/etc/debian_version") # is this a debian system ? -- if(CMAKE_LIBRARY_ARCHITECTURE) -- set(_LIBDIR_DEFAULT "lib/${CMAKE_LIBRARY_ARCHITECTURE}") -- endif() -- else() # not debian, rely on CMAKE_SIZEOF_VOID_P: -- if(NOT DEFINED CMAKE_SIZEOF_VOID_P) -- message(AUTHOR_WARNING -- "Unable to determine default LIB_INSTALL_LIBDIR directory because no target architecture is known. " -- "Please enable at least one language before including KDEInstallDirs.") -- else() -- if("${CMAKE_SIZEOF_VOID_P}" EQUAL "8") -- set(_LIBDIR_DEFAULT "lib64") -- endif() -- endif() -- endif() --endif() - - set(_gnu_install_dirs_vars - BINDIR -@@ -445,15 +416,15 @@ if(KDE_INSTALL_USE_QT_SYS_PATHS) - "QtQuick2 imports" - QML_INSTALL_DIR) - else() -- _define_relative(QTPLUGINDIR LIBDIR "plugins" -+ _define_relative(QTPLUGINDIR LIBDIR "qt5/plugins" - "Qt plugins" - QT_PLUGIN_INSTALL_DIR) - -- _define_relative(QTQUICKIMPORTSDIR QTPLUGINDIR "imports" -+ _define_relative(QTQUICKIMPORTSDIR QTPLUGINDIR "qt5/imports" - "QtQuick1 imports" - IMPORTS_INSTALL_DIR) - -- _define_relative(QMLDIR LIBDIR "qml" -+ _define_relative(QMLDIR LIBDIR "qt5/qml" - "QtQuick2 imports" - QML_INSTALL_DIR) - endif() --- -2.3.0 - diff --git a/pkgs/development/libraries/kde-frameworks-5.12/kauth/kauth-policy-install.patch b/pkgs/development/libraries/kde-frameworks-5.12/kauth/kauth-policy-install.patch deleted file mode 100644 index 340155256f28..000000000000 --- a/pkgs/development/libraries/kde-frameworks-5.12/kauth/kauth-policy-install.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/KF5AuthConfig.cmake.in b/KF5AuthConfig.cmake.in -index e859ec7..9a8ab18 100644 ---- a/KF5AuthConfig.cmake.in -+++ b/KF5AuthConfig.cmake.in -@@ -4,7 +4,7 @@ set(KAUTH_STUB_FILES_DIR "${PACKAGE_PREFIX_DIR}/@KF5_DATA_INSTALL_DIR@/kauth/") - - set(KAUTH_BACKEND_NAME "@KAUTH_BACKEND_NAME@") - set(KAUTH_HELPER_BACKEND_NAME "@KAUTH_HELPER_BACKEND_NAME@") --set(KAUTH_POLICY_FILES_INSTALL_DIR "@KAUTH_POLICY_FILES_INSTALL_DIR@") -+set(KAUTH_POLICY_FILES_INSTALL_DIR "\${CMAKE_INSTALL_PREFIX}/share/polkit-1/actions") - set(KAUTH_HELPER_INSTALL_DIR "@KAUTH_HELPER_INSTALL_DIR@") - - find_dependency(KF5CoreAddons "@KF5_DEP_VERSION@") diff --git a/pkgs/development/libraries/kde-frameworks-5.12/kcmutils/kcmutils-pluginselector-follow-symlinks.patch b/pkgs/development/libraries/kde-frameworks-5.12/kcmutils/kcmutils-pluginselector-follow-symlinks.patch deleted file mode 100644 index 47b8dfad1800..000000000000 --- a/pkgs/development/libraries/kde-frameworks-5.12/kcmutils/kcmutils-pluginselector-follow-symlinks.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/src/kpluginselector.cpp b/src/kpluginselector.cpp -index c63241b..2243f94 100644 ---- a/src/kpluginselector.cpp -+++ b/src/kpluginselector.cpp -@@ -304,7 +304,7 @@ void KPluginSelector::addPlugins(const QString &componentName, - QStringList desktopFileNames; - const QStringList dirs = QStandardPaths::locateAll(QStandardPaths::GenericDataLocation, componentName + QStringLiteral("/kpartplugins"), QStandardPaths::LocateDirectory); - Q_FOREACH (const QString &dir, dirs) { -- QDirIterator it(dir, QStringList() << QStringLiteral("*.desktop"), QDir::NoFilter, QDirIterator::Subdirectories); -+ QDirIterator it(dir, QStringList() << QStringLiteral("*.desktop"), QDir::NoFilter, QDirIterator::Subdirectories | QDirIterator::FollowSymlinks); - while (it.hasNext()) { - desktopFileNames.append(it.next()); - } diff --git a/pkgs/development/libraries/kde-frameworks-5.12/kconfigwidgets/kconfigwidgets-helpclient-follow-symlinks.patch b/pkgs/development/libraries/kde-frameworks-5.12/kconfigwidgets/kconfigwidgets-helpclient-follow-symlinks.patch deleted file mode 100644 index 3bd946cbd842..000000000000 --- a/pkgs/development/libraries/kde-frameworks-5.12/kconfigwidgets/kconfigwidgets-helpclient-follow-symlinks.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/src/khelpclient.cpp b/src/khelpclient.cpp -index 53a331e..80fbb01 100644 ---- a/src/khelpclient.cpp -+++ b/src/khelpclient.cpp -@@ -48,7 +48,7 @@ void KHelpClient::invokeHelp(const QString &anchor, const QString &_appname) - QString docPath; - const QStringList desktopDirs = QStandardPaths::standardLocations(QStandardPaths::ApplicationsLocation); - Q_FOREACH (const QString &dir, desktopDirs) { -- QDirIterator it(dir, QStringList() << appname + QLatin1String(".desktop"), QDir::NoFilter, QDirIterator::Subdirectories); -+ QDirIterator it(dir, QStringList() << appname + QLatin1String(".desktop"), QDir::NoFilter, QDirIterator::Subdirectories | QDirIterator::FollowSymlinks); - while (it.hasNext()) { - const QString desktopPath(it.next()); - KDesktopFile desktopFile(desktopPath); diff --git a/pkgs/development/libraries/kde-frameworks-5.12/kdoctools/kdoctools-no-find-docbook-xml.patch b/pkgs/development/libraries/kde-frameworks-5.12/kdoctools/kdoctools-no-find-docbook-xml.patch deleted file mode 100644 index 4e3a33efab32..000000000000 --- a/pkgs/development/libraries/kde-frameworks-5.12/kdoctools/kdoctools-no-find-docbook-xml.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff --git a/CMakeLists.txt b/CMakeLists.txt -index 5c4863c..f731775 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -46,7 +46,6 @@ set_package_properties(LibXml2 PROPERTIES - ) - - --find_package(DocBookXML4 "4.5") - - set_package_properties(DocBookXML4 PROPERTIES - TYPE REQUIRED diff --git a/pkgs/development/libraries/kde-frameworks-5.12/kinit/0001-kinit-libpath.patch b/pkgs/development/libraries/kde-frameworks-5.12/kinit/0001-kinit-libpath.patch deleted file mode 100644 index 9c76079a382a..000000000000 --- a/pkgs/development/libraries/kde-frameworks-5.12/kinit/0001-kinit-libpath.patch +++ /dev/null @@ -1,42 +0,0 @@ -From 723c9b1268a04127647a1c20eebe9804150566dd Mon Sep 17 00:00:00 2001 -From: Thomas Tuegel -Date: Sat, 13 Jun 2015 08:57:55 -0500 -Subject: [PATCH] kinit libpath - ---- - src/kdeinit/kinit.cpp | 18 ++++++++++-------- - 1 file changed, 10 insertions(+), 8 deletions(-) - -diff --git a/src/kdeinit/kinit.cpp b/src/kdeinit/kinit.cpp -index 9e775b6..0ac5646 100644 ---- a/src/kdeinit/kinit.cpp -+++ b/src/kdeinit/kinit.cpp -@@ -660,15 +660,17 @@ static pid_t launch(int argc, const char *_name, const char *args, - if (!libpath.isEmpty()) { - if (!l.load()) { - if (libpath_relative) { -- // NB: Because Qt makes the actual dlopen() call, the -- // RUNPATH of kdeinit is *not* respected - see -- // https://sourceware.org/bugzilla/show_bug.cgi?id=13945 -- // - so we try hacking it in ourselves -- QString install_lib_dir = QFile::decodeName( -- CMAKE_INSTALL_PREFIX "/" LIB_INSTALL_DIR "/"); -- libpath = install_lib_dir + libpath; -- l.setFileName(libpath); -+ // Use QT_PLUGIN_PATH to find shared library directories -+ // For KF5, the plugin path is /lib/qt5/plugins/, so kdeinit5 -+ // shared libraries should be in /lib/qt5/plugins/../../ -+ const QRegExp pathSepRegExp(QString::fromLatin1("[:\b]")); -+ const QString up = QString::fromLocal8Bit("/../../"); -+ const QStringList paths = QString::fromLocal8Bit(qgetenv("QT_PLUGIN_PATH")).split(pathSepRegExp, QString::KeepEmptyParts); -+ Q_FOREACH (const QString &path, paths) { -+ l.setFileName(path + up + libpath); - l.load(); -+ if (l.isLoaded()) break; -+ } - } - } - if (!l.isLoaded()) { --- -2.4.2 - diff --git a/pkgs/development/libraries/kde-frameworks-5.12/kpackage/0001-allow-external-paths.patch b/pkgs/development/libraries/kde-frameworks-5.12/kpackage/0001-allow-external-paths.patch deleted file mode 100644 index 440e979c0086..000000000000 --- a/pkgs/development/libraries/kde-frameworks-5.12/kpackage/0001-allow-external-paths.patch +++ /dev/null @@ -1,25 +0,0 @@ -From fbf10d2059fa1f19a0f0cfa2fda0abb6c435fa78 Mon Sep 17 00:00:00 2001 -From: Thomas Tuegel -Date: Wed, 28 Jan 2015 07:15:30 -0600 -Subject: [PATCH] allow external paths - ---- - src/kpackage/package.cpp | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/src/kpackage/package.cpp b/src/kpackage/package.cpp -index eb4a09b..f70f1a1 100644 ---- a/src/kpackage/package.cpp -+++ b/src/kpackage/package.cpp -@@ -758,7 +758,7 @@ PackagePrivate::PackagePrivate() - : QSharedData(), - fallbackPackage(0), - metadata(0), -- externalPaths(false), -+ externalPaths(true), - valid(false), - checkedValid(false) - { --- -2.1.4 - diff --git a/pkgs/development/libraries/kde-frameworks-5.12/kservice/kservice-kbuildsycoca-follow-symlinks.patch b/pkgs/development/libraries/kde-frameworks-5.12/kservice/kservice-kbuildsycoca-follow-symlinks.patch deleted file mode 100644 index e9bc418544ab..000000000000 --- a/pkgs/development/libraries/kde-frameworks-5.12/kservice/kservice-kbuildsycoca-follow-symlinks.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/src/kbuildsycoca/kbuildsycoca.cpp b/src/kbuildsycoca/kbuildsycoca.cpp -index 69b1427..9c37a49 100644 ---- a/src/kbuildsycoca/kbuildsycoca.cpp -+++ b/src/kbuildsycoca/kbuildsycoca.cpp -@@ -227,7 +227,7 @@ bool KBuildSycoca::build() - QStringList relFiles; - const QStringList dirs = QStandardPaths::locateAll(QStandardPaths::GenericDataLocation, g_resourceSubdir, QStandardPaths::LocateDirectory); - Q_FOREACH (const QString &dir, dirs) { -- QDirIterator it(dir, QDirIterator::Subdirectories); -+ QDirIterator it(dir, QDirIterator::Subdirectories | QDirIterator::FollowSymlinks); - while (it.hasNext()) { - const QString filePath = it.next(); - Q_ASSERT(filePath.startsWith(dir)); // due to the line below... diff --git a/pkgs/development/libraries/kde-frameworks-5.12/kservice/kservice-kbuildsycoca-no-canonicalize-path.patch b/pkgs/development/libraries/kde-frameworks-5.12/kservice/kservice-kbuildsycoca-no-canonicalize-path.patch deleted file mode 100644 index 7e21ebfe86f2..000000000000 --- a/pkgs/development/libraries/kde-frameworks-5.12/kservice/kservice-kbuildsycoca-no-canonicalize-path.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/src/kbuildsycoca/vfolder_menu.cpp b/src/kbuildsycoca/vfolder_menu.cpp -index 2eb1275..e39a36f 100644 ---- a/src/kbuildsycoca/vfolder_menu.cpp -+++ b/src/kbuildsycoca/vfolder_menu.cpp -@@ -412,7 +412,7 @@ VFolderMenu::absoluteDir(const QString &_dir, const QString &baseDir, bool keepR - } - - if (!relative) { -- QString resolved = QDir(dir).canonicalPath(); -+ QString resolved = QDir::cleanPath(dir); - if (!resolved.isEmpty()) { - dir = resolved; - } diff --git a/pkgs/development/libraries/kde-frameworks-5.12/ktexteditor/0001-no-qcoreapplication.patch b/pkgs/development/libraries/kde-frameworks-5.12/ktexteditor/0001-no-qcoreapplication.patch deleted file mode 100644 index c2e77a537c5a..000000000000 --- a/pkgs/development/libraries/kde-frameworks-5.12/ktexteditor/0001-no-qcoreapplication.patch +++ /dev/null @@ -1,48 +0,0 @@ -From 71e28c7c6fdd1142f04c662f45cc8f779e457cda Mon Sep 17 00:00:00 2001 -From: Thomas Tuegel -Date: Sun, 15 Feb 2015 19:09:17 -0600 -Subject: [PATCH] no qcoreapplication - ---- - src/syntax/data/katehighlightingindexer.cpp | 11 ++++------- - 1 file changed, 4 insertions(+), 7 deletions(-) - -diff --git a/src/syntax/data/katehighlightingindexer.cpp b/src/syntax/data/katehighlightingindexer.cpp -index 3f02e8c..d1a865b 100644 ---- a/src/syntax/data/katehighlightingindexer.cpp -+++ b/src/syntax/data/katehighlightingindexer.cpp -@@ -49,19 +49,16 @@ QStringList readListing(const QString &fileName) - - int main(int argc, char *argv[]) - { -- // get app instance -- QCoreApplication app(argc, argv); -- - // ensure enough arguments are passed -- if (app.arguments().size() < 3) -+ if (argc < 3) - return 1; - - // open schema - QXmlSchema schema; -- if (!schema.load(QUrl::fromLocalFile(app.arguments().at(2)))) -+ if (!schema.load(QUrl::fromLocalFile(QString::fromLocal8Bit(argv[2])))) - return 2; - -- const QString hlFilenamesListing = app.arguments().value(3); -+ const QString hlFilenamesListing = QString::fromLocal8Bit(argv[3]); - if (hlFilenamesListing.isEmpty()) { - return 1; - } -@@ -127,7 +124,7 @@ int main(int argc, char *argv[]) - return anyError; - - // create outfile, after all has worked! -- QFile outFile(app.arguments().at(1)); -+ QFile outFile(QString::fromLocal8Bit(argv[1])); - if (!outFile.open(QIODevice::WriteOnly | QIODevice::Truncate)) - return 7; - --- -2.1.4 - diff --git a/pkgs/development/libraries/kde-frameworks-5.12/packages.json b/pkgs/development/libraries/kde-frameworks-5.12/packages.json deleted file mode 100644 index f59515172664..000000000000 --- a/pkgs/development/libraries/kde-frameworks-5.12/packages.json +++ /dev/null @@ -1,2116 +0,0 @@ -{ - "kwallet": { - "nativeBuildInputs": [ - "cmake" - ], - "propagatedNativeBuildInputs": [], - "propagatedUserEnvPkgs": [], - "propagatedBuildInputs": [ - "qt5gui" - ], - "name": "kwallet-5.12.0", - "src": { - "url": "stable/frameworks/5.12/kwallet-5.12.0.tar.xz", - "name": "kwallet-5.12.0.tar.xz", - "sha256": "0i45qf4j42172jr4mz3xzw589frp4xw86b2j3rhgzipfi26cx3zd" - }, - "buildInputs": [ - "ecm", - "gpgme", - "kf5config", - "kf5coreaddons", - "kf5dbusaddons", - "kf5gpgmepp", - "kf5i18n", - "kf5iconthemes", - "kf5notifications", - "kf5service", - "kf5widgetsaddons", - "kf5windowsystem", - "libgcrypt", - "qt5", - "qt5dbus", - "qt5gui", - "qt5test", - "qt5widgets" - ] - }, - "kdewebkit": { - "nativeBuildInputs": [ - "cmake" - ], - "propagatedNativeBuildInputs": [], - "propagatedUserEnvPkgs": [], - "propagatedBuildInputs": [ - "qt5webkitwidgets" - ], - "name": "kdewebkit-5.12.0", - "src": { - "url": "stable/frameworks/5.12/kdewebkit-5.12.0.tar.xz", - "name": "kdewebkit-5.12.0.tar.xz", - "sha256": "09r0bvjgvb9ar13whr4ar21r4kzjwa4zipn6iqzx9n0xxwn2mxjv" - }, - "buildInputs": [ - "ecm", - "kf5config", - "kf5coreaddons", - "kf5jobwidgets", - "kf5kio", - "kf5parts", - "kf5service", - "kf5wallet", - "qt5", - "qt5core", - "qt5network", - "qt5webkitwidgets", - "qt5widgets" - ] - }, - "kbookmarks": { - "nativeBuildInputs": [ - "cmake" - ], - "propagatedNativeBuildInputs": [], - "propagatedUserEnvPkgs": [], - "propagatedBuildInputs": [ - "kf5widgetsaddons", - "qt5widgets", - "qt5xml" - ], - "name": "kbookmarks-5.12.0", - "src": { - "url": "stable/frameworks/5.12/kbookmarks-5.12.0.tar.xz", - "name": "kbookmarks-5.12.0.tar.xz", - "sha256": "07xayi77h9wg2f4pnwgjbicbfqk42lphqvcha9sn97p0hnzl1g5h" - }, - "buildInputs": [ - "ecm", - "kf5codecs", - "kf5config", - "kf5configwidgets", - "kf5coreaddons", - "kf5iconthemes", - "kf5widgetsaddons", - "kf5xmlgui", - "qt5", - "qt5dbus", - "qt5test", - "qt5widgets", - "qt5xml" - ] - }, - "bluez-qt": { - "nativeBuildInputs": [ - "cmake" - ], - "propagatedNativeBuildInputs": [], - "propagatedUserEnvPkgs": [], - "propagatedBuildInputs": [ - "qt5core" - ], - "name": "bluez-qt-5.12.0", - "src": { - "url": "stable/frameworks/5.12/bluez-qt-5.12.0.tar.xz", - "name": "bluez-qt-5.12.0.tar.xz", - "sha256": "1asgcvspwra52ywfk6v4mv1fdxkshyh5zyqnwljbbs1a1n8g8gl0" - }, - "buildInputs": [ - "ecm", - "qt5", - "qt5core", - "qt5dbus", - "qt5network", - "qt5qml", - "qt5quicktest", - "qt5test" - ] - }, - "threadweaver": { - "nativeBuildInputs": [ - "cmake", - "snippetextractor" - ], - "propagatedNativeBuildInputs": [], - "propagatedUserEnvPkgs": [], - "propagatedBuildInputs": [ - "qt5core" - ], - "name": "threadweaver-5.12.0", - "src": { - "url": "stable/frameworks/5.12/threadweaver-5.12.0.tar.xz", - "name": "threadweaver-5.12.0.tar.xz", - "sha256": "1xswh5k48n3nq5v8zgc3qyldky8pq3xgsbsgjg1is5pgayw4j08b" - }, - "buildInputs": [ - "ecm", - "kf5threadweaver", - "qt5", - "qt5core", - "qt5network", - "qt5test", - "qt5widgets", - "qt5xml" - ] - }, - "kcompletion": { - "nativeBuildInputs": [ - "cmake" - ], - "propagatedNativeBuildInputs": [], - "propagatedUserEnvPkgs": [], - "propagatedBuildInputs": [ - "qt5widgets" - ], - "name": "kcompletion-5.12.0", - "src": { - "url": "stable/frameworks/5.12/kcompletion-5.12.0.tar.xz", - "name": "kcompletion-5.12.0.tar.xz", - "sha256": "0g4gvc9r0l7ng7jv0hkp8khhlckgwzpix5hsjjcmzggfkhsl4sj0" - }, - "buildInputs": [ - "ecm", - "kf5config", - "kf5widgetsaddons", - "qt5", - "qt5test", - "qt5widgets" - ] - }, - "kwidgetsaddons": { - "nativeBuildInputs": [ - "cmake" - ], - "propagatedNativeBuildInputs": [], - "propagatedUserEnvPkgs": [], - "propagatedBuildInputs": [ - "qt5widgets" - ], - "name": "kwidgetsaddons-5.12.0", - "src": { - "url": "stable/frameworks/5.12/kwidgetsaddons-5.12.0.tar.xz", - "name": "kwidgetsaddons-5.12.0.tar.xz", - "sha256": "12n3c3j6nawrhgc9mqk627q1brjvbdxkm52g0mnm5c5ql953gqs6" - }, - "buildInputs": [ - "ecm", - "qt5", - "qt5test", - "qt5uitools", - "qt5widgets" - ] - }, - "kxmlrpcclient": { - "nativeBuildInputs": [ - "cmake" - ], - "propagatedNativeBuildInputs": [], - "propagatedUserEnvPkgs": [], - "propagatedBuildInputs": [ - "kf5kio" - ], - "name": "kxmlrpcclient-5.12.0", - "src": { - "url": "stable/frameworks/5.12/kxmlrpcclient-5.12.0.tar.xz", - "name": "kxmlrpcclient-5.12.0.tar.xz", - "sha256": "1ysw61kcx0i6il6r782jdyr2a9n8hy0j5mgpd7slr57mrcfgsivd" - }, - "buildInputs": [ - "ecm", - "kf5i18n", - "kf5kio", - "qt5test" - ] - }, - "extra-cmake-modules": { - "nativeBuildInputs": [ - "cmake", - "qcollectiongenerator_executable", - "sphinx_executable" - ], - "propagatedNativeBuildInputs": [], - "propagatedUserEnvPkgs": [], - "propagatedBuildInputs": [], - "name": "extra-cmake-modules-5.12.0", - "src": { - "url": "stable/frameworks/5.12/extra-cmake-modules-5.12.0.tar.xz", - "name": "extra-cmake-modules-5.12.0.tar.xz", - "sha256": "14n77sn493m8kzr42wv13mdgxpnbx7x64bvw37ircrx8wmf4002i" - }, - "buildInputs": [ - "agg", - "blitz", - "bluez", - "eigen2", - "enchant", - "ffmpeg", - "flac", - "flex", - "gobject", - "gstreamer", - "lcms", - "libart", - "libxslt", - "openexr", - "pcre", - "qca2", - "qimageblitz", - "qt5core", - "qt5linguisttools", - "sqlite", - "strigi", - "usb", - "xine", - "xmms" - ] - }, - "kidletime": { - "nativeBuildInputs": [ - "cmake" - ], - "propagatedNativeBuildInputs": [], - "propagatedUserEnvPkgs": [], - "propagatedBuildInputs": [ - "qt5core" - ], - "name": "kidletime-5.12.0", - "src": { - "url": "stable/frameworks/5.12/kidletime-5.12.0.tar.xz", - "name": "kidletime-5.12.0.tar.xz", - "sha256": "1rpvj4q07sc17an4274pcszdsqjdl8x33ln3lmw5x2q27v5d22qc" - }, - "buildInputs": [ - "ecm", - "qt5", - "qt5dbus", - "qt5widgets", - "qt5x11extras", - "x11", - "x11_xcb", - "xcb" - ] - }, - "kitemmodels": { - "nativeBuildInputs": [ - "cmake" - ], - "propagatedNativeBuildInputs": [], - "propagatedUserEnvPkgs": [], - "propagatedBuildInputs": [ - "qt5core" - ], - "name": "kitemmodels-5.12.0", - "src": { - "url": "stable/frameworks/5.12/kitemmodels-5.12.0.tar.xz", - "name": "kitemmodels-5.12.0.tar.xz", - "sha256": "0wmsb59svzk0iay9ynbjbdgqxph1cpvifvvnlxc67a5nzhgk5cms" - }, - "buildInputs": [ - "ecm", - "grantlee", - "qt5", - "qt5core", - "qt5quickwidgets", - "qt5script", - "qt5test", - "qt5widgets" - ] - }, - "attica": { - "nativeBuildInputs": [ - "cmake" - ], - "propagatedNativeBuildInputs": [], - "propagatedUserEnvPkgs": [], - "propagatedBuildInputs": [ - "qt5core" - ], - "name": "attica-5.12.0", - "src": { - "url": "stable/frameworks/5.12/attica-5.12.0.tar.xz", - "name": "attica-5.12.0.tar.xz", - "sha256": "05311rr7zsfwzq3569gg2gkq6rksvhdji1x0jv8zxax5a1n40gc7" - }, - "buildInputs": [ - "ecm", - "qt5", - "qt5core", - "qt5network", - "qt5test", - "qt5widgets" - ] - }, - "kwindowsystem": { - "nativeBuildInputs": [ - "cmake" - ], - "propagatedNativeBuildInputs": [], - "propagatedUserEnvPkgs": [], - "propagatedBuildInputs": [ - "qt5widgets" - ], - "name": "kwindowsystem-5.12.0", - "src": { - "url": "stable/frameworks/5.12/kwindowsystem-5.12.0.tar.xz", - "name": "kwindowsystem-5.12.0.tar.xz", - "sha256": "0fjxhf07r186cmp0mjvinrwxg4z90zlyvycqhy0n18fdp67szckl" - }, - "buildInputs": [ - "ecm", - "qt5", - "qt5test", - "qt5widgets", - "qt5winextras", - "qt5x11extras", - "x11", - "xcb" - ] - }, - "ki18n": { - "nativeBuildInputs": [ - "cmake" - ], - "propagatedNativeBuildInputs": [], - "propagatedUserEnvPkgs": [], - "propagatedBuildInputs": [], - "name": "ki18n-5.12.0", - "src": { - "url": "stable/frameworks/5.12/ki18n-5.12.0.tar.xz", - "name": "ki18n-5.12.0.tar.xz", - "sha256": "11bivhaiqk8rlnz288ghnbjp3i2kdivmrzscjjnyqw25rpjj4drz" - }, - "buildInputs": [ - "ecm", - "libintl", - "qt5", - "qt5concurrent", - "qt5core", - "qt5script", - "qt5test" - ] - }, - "knewstuff": { - "nativeBuildInputs": [ - "cmake" - ], - "propagatedNativeBuildInputs": [], - "propagatedUserEnvPkgs": [], - "propagatedBuildInputs": [ - "kf5attica", - "kf5service", - "kf5xmlgui", - "qt5widgets" - ], - "name": "knewstuff-5.12.0", - "src": { - "url": "stable/frameworks/5.12/knewstuff-5.12.0.tar.xz", - "name": "knewstuff-5.12.0.tar.xz", - "sha256": "03zxj81a4hy46azh047xxfmr4mjp8ri7hzcxspi31hmr8gf1hxv9" - }, - "buildInputs": [ - "ecm", - "kf5archive", - "kf5attica", - "kf5completion", - "kf5config", - "kf5coreaddons", - "kf5i18n", - "kf5iconthemes", - "kf5itemviews", - "kf5kio", - "kf5service", - "kf5textwidgets", - "kf5widgetsaddons", - "kf5xmlgui", - "qt5", - "qt5test", - "qt5widgets", - "qt5xml" - ] - }, - "kdelibs4support": { - "nativeBuildInputs": [ - "cmake" - ], - "propagatedNativeBuildInputs": [], - "propagatedUserEnvPkgs": [], - "propagatedBuildInputs": [ - "kdewin", - "kf5archive", - "kf5auth", - "kf5configwidgets", - "kf5coreaddons", - "kf5crash", - "kf5dbusaddons", - "kf5designerplugin", - "kf5doctools", - "kf5emoticons", - "kf5guiaddons", - "kf5iconthemes", - "kf5init", - "kf5itemmodels", - "kf5kdelibs4support", - "kf5notifications", - "kf5parts", - "kf5textwidgets", - "kf5unitconversion", - "kf5windowsystem", - "qt5dbus", - "qt5printsupport", - "qt5xml" - ], - "name": "kdelibs4support-5.12.0", - "src": { - "url": "stable/frameworks/5.12/portingAids/kdelibs4support-5.12.0.tar.xz", - "name": "kdelibs4support-5.12.0.tar.xz", - "sha256": "0hbs1gwqgx4sc8cma1q5pyanf2kj5brfz9dph5xcf32bijz2ds4f" - }, - "buildInputs": [ - "agg", - "blitz", - "bluez", - "docbookxml4", - "ecm", - "eigen2", - "enchant", - "ffmpeg", - "flac", - "gobject", - "gstreamer", - "kdewin", - "kf5completion", - "kf5config", - "kf5configwidgets", - "kf5crash", - "kf5dbusaddons", - "kf5designerplugin", - "kf5doctools", - "kf5globalaccel", - "kf5guiaddons", - "kf5i18n", - "kf5iconthemes", - "kf5kio", - "kf5notifications", - "kf5parts", - "kf5service", - "kf5textwidgets", - "kf5unitconversion", - "kf5widgetsaddons", - "kf5windowsystem", - "kf5xmlgui", - "lcms", - "libart", - "networkmanager", - "openexr", - "openssl", - "pcre", - "qca2", - "qimageblitz", - "qntrack", - "qt5", - "qt5concurrent", - "qt5dbus", - "qt5designer", - "qt5network", - "qt5printsupport", - "qt5svg", - "qt5test", - "qt5widgets", - "qt5x11extras", - "sqlite", - "usb", - "x11", - "xine", - "xmms" - ] - }, - "sonnet": { - "nativeBuildInputs": [ - "cmake" - ], - "propagatedNativeBuildInputs": [], - "propagatedUserEnvPkgs": [], - "propagatedBuildInputs": [ - "qt5core" - ], - "name": "sonnet-5.12.0", - "src": { - "url": "stable/frameworks/5.12/sonnet-5.12.0.tar.xz", - "name": "sonnet-5.12.0.tar.xz", - "sha256": "1rr5dbs9477mf8lacmk5dcvw0h3s597l4miwm4j3rmn9jpvlcm1l" - }, - "buildInputs": [ - "aspell", - "ecm", - "enchant", - "hspell", - "hunspell", - "qt5", - "qt5test", - "qt5widgets", - "zlib" - ] - }, - "networkmanager-qt": { - "nativeBuildInputs": [ - "cmake" - ], - "propagatedNativeBuildInputs": [], - "propagatedUserEnvPkgs": [], - "propagatedBuildInputs": [ - "qt5core" - ], - "name": "networkmanager-qt-5.12.0", - "src": { - "url": "stable/frameworks/5.12/networkmanager-qt-5.12.0.tar.xz", - "name": "networkmanager-qt-5.12.0.tar.xz", - "sha256": "0znwp1nyw47dpq48m1c1y250msm2lh9hipzjmgvh2mqr60vvy094" - }, - "buildInputs": [ - "ecm", - "networkmanager", - "qt4", - "qt5", - "qt5core", - "qt5dbus", - "qt5network", - "qt5test" - ] - }, - "solid": { - "nativeBuildInputs": [ - "cmake" - ], - "propagatedNativeBuildInputs": [], - "propagatedUserEnvPkgs": [], - "propagatedBuildInputs": [ - "qt5core" - ], - "name": "solid-5.12.0", - "src": { - "url": "stable/frameworks/5.12/solid-5.12.0.tar.xz", - "name": "solid-5.12.0.tar.xz", - "sha256": "0s3xjrc5v350s0w26jpzb427h0nx6bhqldv7qswknrqir5x6zymj" - }, - "buildInputs": [ - "bison", - "ecm", - "flex", - "iokit", - "mediaplayerinfo", - "qt5", - "qt5concurrent", - "qt5dbus", - "qt5network", - "qt5qml", - "qt5test", - "qt5widgets", - "qt5xml", - "udev" - ] - }, - "modemmanager-qt": { - "nativeBuildInputs": [ - "cmake" - ], - "propagatedNativeBuildInputs": [], - "propagatedUserEnvPkgs": [], - "propagatedBuildInputs": [ - "qt5core" - ], - "name": "modemmanager-qt-5.12.0", - "src": { - "url": "stable/frameworks/5.12/modemmanager-qt-5.12.0.tar.xz", - "name": "modemmanager-qt-5.12.0.tar.xz", - "sha256": "1s9ayfpkpkkrqss3x2swb2fzg5zxja8qkawwy59crf9xjfk3gwxi" - }, - "buildInputs": [ - "ecm", - "kf5modemmanagerqt", - "modemmanager", - "qt4", - "qt5", - "qt5core", - "qt5dbus", - "qt5test", - "qt5xml" - ] - }, - "kactivities": { - "nativeBuildInputs": [ - "cmake" - ], - "propagatedNativeBuildInputs": [], - "propagatedUserEnvPkgs": [], - "propagatedBuildInputs": [ - "qt5core" - ], - "name": "kactivities-5.12.0", - "src": { - "url": "stable/frameworks/5.12/kactivities-5.12.0.tar.xz", - "name": "kactivities-5.12.0.tar.xz", - "sha256": "1rv5fb5gx7nkksy857aqbsvgkkw0fc0zs8yab3b4hyv4ybqx4j2q" - }, - "buildInputs": [ - "boost", - "ecm", - "kf5", - "kf5config", - "kf5coreaddons", - "kf5dbusaddons", - "kf5declarative", - "kf5globalaccel", - "kf5i18n", - "kf5kcmutils", - "kf5kio", - "kf5service", - "kf5windowsystem", - "kf5xmlgui", - "qt5", - "qt5core", - "qt5dbus", - "qt5gui", - "qt5qml", - "qt5quick", - "qt5quickwidgets", - "qt5sql", - "qt5test", - "qt5widgets" - ] - }, - "kpeople": { - "nativeBuildInputs": [ - "cmake" - ], - "propagatedNativeBuildInputs": [], - "propagatedUserEnvPkgs": [], - "propagatedBuildInputs": [ - "qt5core" - ], - "name": "kpeople-5.12.0", - "src": { - "url": "stable/frameworks/5.12/kpeople-5.12.0.tar.xz", - "name": "kpeople-5.12.0.tar.xz", - "sha256": "0p8qamrxcfxb0f7fsrjn1k5vhi8hmd2iph6b5bjblfpwgw2f44r8" - }, - "buildInputs": [ - "ecm", - "kf5coreaddons", - "kf5i18n", - "kf5itemviews", - "kf5service", - "kf5widgetsaddons", - "qt5", - "qt5dbus", - "qt5gui", - "qt5qml", - "qt5quick", - "qt5sql", - "qt5test", - "qt5widgets" - ] - }, - "kcrash": { - "nativeBuildInputs": [ - "cmake" - ], - "propagatedNativeBuildInputs": [], - "propagatedUserEnvPkgs": [], - "propagatedBuildInputs": [ - "qt5core" - ], - "name": "kcrash-5.12.0", - "src": { - "url": "stable/frameworks/5.12/kcrash-5.12.0.tar.xz", - "name": "kcrash-5.12.0.tar.xz", - "sha256": "00m69f0wrykrdhiyasfpwykrkh4r05hldr8yjvw2sn62gb1s45pg" - }, - "buildInputs": [ - "ecm", - "kf5coreaddons", - "kf5windowsystem", - "qt5", - "qt5core", - "qt5test", - "qt5widgets", - "qt5x11extras", - "x11" - ] - }, - "kglobalaccel": { - "nativeBuildInputs": [ - "cmake" - ], - "propagatedNativeBuildInputs": [], - "propagatedUserEnvPkgs": [], - "propagatedBuildInputs": [ - "qt5dbus", - "qt5widgets" - ], - "name": "kglobalaccel-5.12.0", - "src": { - "url": "stable/frameworks/5.12/kglobalaccel-5.12.0.tar.xz", - "name": "kglobalaccel-5.12.0.tar.xz", - "sha256": "1p8kj31m4lyy6dr85383v6j8bg622xmw3x8kyiijlckd1zf2bmr8" - }, - "buildInputs": [ - "ecm", - "kf5config", - "kf5coreaddons", - "kf5crash", - "kf5dbusaddons", - "kf5windowsystem", - "qt5", - "qt5dbus", - "qt5test", - "qt5widgets", - "qt5x11extras", - "x11", - "xcb" - ] - }, - "kitemviews": { - "nativeBuildInputs": [ - "cmake" - ], - "propagatedNativeBuildInputs": [], - "propagatedUserEnvPkgs": [], - "propagatedBuildInputs": [ - "qt5widgets" - ], - "name": "kitemviews-5.12.0", - "src": { - "url": "stable/frameworks/5.12/kitemviews-5.12.0.tar.xz", - "name": "kitemviews-5.12.0.tar.xz", - "sha256": "0swlp9kynsw708mm9b4bh2r9rcwqxqmkwaga4gg33cjchf0y8862" - }, - "buildInputs": [ - "ecm", - "qt5", - "qt5test", - "qt5widgets" - ] - }, - "kplotting": { - "nativeBuildInputs": [ - "cmake" - ], - "propagatedNativeBuildInputs": [], - "propagatedUserEnvPkgs": [], - "propagatedBuildInputs": [ - "qt5widgets" - ], - "name": "kplotting-5.12.0", - "src": { - "url": "stable/frameworks/5.12/kplotting-5.12.0.tar.xz", - "name": "kplotting-5.12.0.tar.xz", - "sha256": "1xh0lbi7fxsz3gj2y762r9md85l8fp0l6kj5577444k4vswgaial" - }, - "buildInputs": [ - "ecm", - "qt5", - "qt5test", - "qt5widgets" - ] - }, - "kauth": { - "nativeBuildInputs": [ - "cmake" - ], - "propagatedNativeBuildInputs": [], - "propagatedUserEnvPkgs": [], - "propagatedBuildInputs": [ - "kf5coreaddons" - ], - "name": "kauth-5.12.0", - "src": { - "url": "stable/frameworks/5.12/kauth-5.12.0.tar.xz", - "name": "kauth-5.12.0.tar.xz", - "sha256": "1ky3f16z4w0p97yzdfn3v4qs50wcir5p18cq6sakjhp95fxj1m2y" - }, - "buildInputs": [ - "ecm", - "kf5coreaddons", - "qt5", - "qt5dbus", - "qt5test", - "qt5widgets" - ] - }, - "plasma-framework": { - "nativeBuildInputs": [ - "cmake", - "sh" - ], - "propagatedNativeBuildInputs": [], - "propagatedUserEnvPkgs": [], - "propagatedBuildInputs": [ - "kf5package", - "kf5service" - ], - "name": "plasma-framework-5.12.0", - "src": { - "url": "stable/frameworks/5.12/plasma-framework-5.12.0.tar.xz", - "name": "plasma-framework-5.12.0.tar.xz", - "sha256": "07ma5nr3v3r9x9gc5sb3rhghci8cl0mm11f8dfawl3bvyzzhq3hm" - }, - "buildInputs": [ - "ecm", - "egl", - "gpgme", - "kactivities", - "kcoreaddons", - "kde4support", - "kdeclarative", - "kdepimlibs", - "kdesu", - "kf5", - "kf5activities", - "kf5archive", - "kf5auth", - "kf5bookmarks", - "kf5codecs", - "kf5completion", - "kf5config", - "kf5configwidgets", - "kf5coreaddons", - "kf5crash", - "kf5dbusaddons", - "kf5declarative", - "kf5doctools", - "kf5globalaccel", - "kf5guiaddons", - "kf5i18n", - "kf5iconthemes", - "kf5idletime", - "kf5init", - "kf5itemmodels", - "kf5itemviews", - "kf5jobwidgets", - "kf5js", - "kf5karchive", - "kf5kauth", - "kf5kbookmarks", - "kf5kcodecs", - "kf5kcompletion", - "kf5kconfig", - "kf5kconfigwidgets", - "kf5kcoreaddons", - "kf5kcrash", - "kf5kdbusaddons", - "kf5kde4support", - "kf5kdeclarative", - "kf5kdesu", - "kf5kdoctools", - "kf5kf5globalaccel", - "kf5kguiaddons", - "kf5ki18n", - "kf5kiconthemes", - "kf5kidletime", - "kf5kinit", - "kf5kio", - "kf5kjobwidgets", - "kf5kjs", - "kf5knotifications", - "kf5kparts", - "kf5kross", - "kf5kservice", - "kf5ktextwidgets", - "kf5kunitconversion", - "kf5kwallet", - "kf5kwidgetsaddons", - "kf5kwindowsystem", - "kf5notifications", - "kf5package", - "kf5parts", - "kf5service", - "kf5solid", - "kf5sonnet", - "kf5su", - "kf5textwidgets", - "kf5threadweaver", - "kf5unitconversion", - "kf5wallet", - "kf5widgetsaddons", - "kf5windowsystem", - "kf5xmlgui", - "opengl", - "qca2", - "qt5", - "qt5gui", - "qt5qml", - "qt5quick", - "qt5script", - "qt5sql", - "qt5svg", - "qt5test", - "qt5widgets", - "qt5x11extras", - "solid", - "x11", - "xcb" - ] - }, - "kguiaddons": { - "nativeBuildInputs": [ - "cmake" - ], - "propagatedNativeBuildInputs": [], - "propagatedUserEnvPkgs": [], - "propagatedBuildInputs": [ - "qt5gui" - ], - "name": "kguiaddons-5.12.0", - "src": { - "url": "stable/frameworks/5.12/kguiaddons-5.12.0.tar.xz", - "name": "kguiaddons-5.12.0.tar.xz", - "sha256": "0s49vn617vaddnrpryivrpwmcdb95xincx2x86bsybdsss8nawp3" - }, - "buildInputs": [ - "ecm", - "qt5", - "qt5gui", - "qt5test", - "qt5widgets", - "qt5x11extras", - "x11", - "xcb" - ] - }, - "kservice": { - "nativeBuildInputs": [ - "cmake" - ], - "propagatedNativeBuildInputs": [], - "propagatedUserEnvPkgs": [], - "propagatedBuildInputs": [ - "kf5config", - "kf5coreaddons" - ], - "name": "kservice-5.12.0", - "src": { - "url": "stable/frameworks/5.12/kservice-5.12.0.tar.xz", - "name": "kservice-5.12.0.tar.xz", - "sha256": "12zfxvzv34hbcwi325izlahr65cgd465hsj29ib3lgr0aadi8r0b" - }, - "buildInputs": [ - "ecm", - "kf5config", - "kf5coreaddons", - "kf5crash", - "kf5dbusaddons", - "kf5doctools", - "kf5i18n", - "qt5", - "qt5concurrent", - "qt5dbus", - "qt5test", - "qt5xml" - ] - }, - "khtml": { - "nativeBuildInputs": [ - "cmake" - ], - "propagatedNativeBuildInputs": [], - "propagatedUserEnvPkgs": [], - "propagatedBuildInputs": [ - "kf5archive", - "kf5bookmarks", - "kf5globalaccel", - "kf5i18n", - "kf5iconthemes", - "kf5js", - "kf5kio", - "kf5notifications", - "kf5parts", - "kf5sonnet", - "kf5wallet", - "kf5widgetsaddons", - "kf5windowsystem", - "qt5core" - ], - "name": "khtml-5.12.0", - "src": { - "url": "stable/frameworks/5.12/portingAids/khtml-5.12.0.tar.xz", - "name": "khtml-5.12.0.tar.xz", - "sha256": "0f76x8zy81dd7y0qwkf7drwa3k2f4yzbr13w2i89yaa078l7p9sw" - }, - "buildInputs": [ - "ecm", - "gif", - "jpeg", - "kdewin", - "kf5archive", - "kf5codecs", - "kf5globalaccel", - "kf5i18n", - "kf5iconthemes", - "kf5js", - "kf5kio", - "kf5notifications", - "kf5parts", - "kf5sonnet", - "kf5textwidgets", - "kf5wallet", - "kf5widgetsaddons", - "kf5windowsystem", - "kf5xmlgui", - "openssl", - "perl", - "phonon4qt5", - "png", - "qt5", - "qt5test", - "qt5x11extras", - "x11" - ] - }, - "kded": { - "nativeBuildInputs": [ - "cmake" - ], - "propagatedNativeBuildInputs": [], - "propagatedUserEnvPkgs": [], - "propagatedBuildInputs": [], - "name": "kded-5.12.0", - "src": { - "url": "stable/frameworks/5.12/kded-5.12.0.tar.xz", - "name": "kded-5.12.0.tar.xz", - "sha256": "1876gc1kkz41kcmy78lnl212paygfhj0syvswbdpx3nq4gyyrkyx" - }, - "buildInputs": [ - "ecm", - "kf5config", - "kf5coreaddons", - "kf5crash", - "kf5dbusaddons", - "kf5doctools", - "kf5init", - "kf5service", - "qt5" - ] - }, - "kpty": { - "nativeBuildInputs": [ - "cmake" - ], - "propagatedNativeBuildInputs": [], - "propagatedUserEnvPkgs": [], - "propagatedBuildInputs": [ - "kf5coreaddons" - ], - "name": "kpty-5.12.0", - "src": { - "url": "stable/frameworks/5.12/kpty-5.12.0.tar.xz", - "name": "kpty-5.12.0.tar.xz", - "sha256": "0gpvjdsag5fmdz5fmjna7wb6j64cpwzfk6rljg938xg0pidms6wc" - }, - "buildInputs": [ - "ecm", - "kf5coreaddons", - "kf5i18n", - "qt5", - "utempter" - ] - }, - "kross": { - "nativeBuildInputs": [ - "cmake" - ], - "propagatedNativeBuildInputs": [], - "propagatedUserEnvPkgs": [], - "propagatedBuildInputs": [ - "kf5i18n", - "kf5iconthemes", - "kf5kio", - "kf5parts", - "kf5widgetsaddons", - "qt5script", - "qt5widgets", - "qt5xml" - ], - "name": "kross-5.12.0", - "src": { - "url": "stable/frameworks/5.12/portingAids/kross-5.12.0.tar.xz", - "name": "kross-5.12.0.tar.xz", - "sha256": "1s7vxsp992y8r39m1val4mylfcl084wsj391y5z333cdryr4wqwq" - }, - "buildInputs": [ - "ecm", - "kf5completion", - "kf5coreaddons", - "kf5doctools", - "kf5i18n", - "kf5iconthemes", - "kf5kio", - "kf5parts", - "kf5widgetsaddons", - "kf5xmlgui", - "qt5", - "qt5core", - "qt5script", - "qt5test", - "qt5uitools", - "qt5widgets", - "qt5xml" - ] - }, - "kxmlgui": { - "nativeBuildInputs": [ - "cmake" - ], - "propagatedNativeBuildInputs": [], - "propagatedUserEnvPkgs": [], - "propagatedBuildInputs": [ - "kf5config", - "kf5configwidgets", - "qt5dbus", - "qt5widgets", - "qt5xml" - ], - "name": "kxmlgui-5.12.0", - "src": { - "url": "stable/frameworks/5.12/kxmlgui-5.12.0.tar.xz", - "name": "kxmlgui-5.12.0.tar.xz", - "sha256": "1v9nf3hrymikgy3d7lh9xcyw8dx1ndl8gsgmzfbxjli60fjniiyl" - }, - "buildInputs": [ - "ecm", - "kf5attica", - "kf5config", - "kf5configwidgets", - "kf5globalaccel", - "kf5i18n", - "kf5iconthemes", - "kf5itemviews", - "kf5textwidgets", - "kf5widgetsaddons", - "kf5windowsystem", - "qt5", - "qt5dbus", - "qt5network", - "qt5printsupport", - "qt5test", - "qt5widgets", - "qt5xml" - ] - }, - "kconfig": { - "nativeBuildInputs": [ - "cmake" - ], - "propagatedNativeBuildInputs": [], - "propagatedUserEnvPkgs": [], - "propagatedBuildInputs": [ - "qt5xml" - ], - "name": "kconfig-5.12.0", - "src": { - "url": "stable/frameworks/5.12/kconfig-5.12.0.tar.xz", - "name": "kconfig-5.12.0.tar.xz", - "sha256": "1dxdf01kswigv7cdad9zjxg5iri479hi8gib3b72pwm24m0wc5ac" - }, - "buildInputs": [ - "ecm", - "qt5", - "qt5concurrent", - "qt5core", - "qt5gui", - "qt5test", - "qt5xml" - ] - }, - "kinit": { - "nativeBuildInputs": [ - "cmake" - ], - "propagatedNativeBuildInputs": [], - "propagatedUserEnvPkgs": [], - "propagatedBuildInputs": [], - "name": "kinit-5.12.0", - "src": { - "url": "stable/frameworks/5.12/kinit-5.12.0.tar.xz", - "name": "kinit-5.12.0.tar.xz", - "sha256": "19w1wgv9javrfmfq52bdvaazd3hqlf6hwdw09hc5935b043zx6cz" - }, - "buildInputs": [ - "ecm", - "kf5config", - "kf5crash", - "kf5doctools", - "kf5i18n", - "kf5kio", - "kf5service", - "kf5windowsystem", - "libcap", - "qt5", - "x11" - ] - }, - "kpackage": { - "nativeBuildInputs": [ - "cmake" - ], - "propagatedNativeBuildInputs": [], - "propagatedUserEnvPkgs": [], - "propagatedBuildInputs": [ - "kf5coreaddons" - ], - "name": "kpackage-5.12.0", - "src": { - "url": "stable/frameworks/5.12/kpackage-5.12.0.tar.xz", - "name": "kpackage-5.12.0.tar.xz", - "sha256": "1a8cn1zqv930nmda8n45fnwc5al1iw7xdgqvydbgds7q0mqwg7l5" - }, - "buildInputs": [ - "ecm", - "kf5archive", - "kf5config", - "kf5coreaddons", - "kf5doctools", - "kf5i18n", - "qt5", - "qt5core", - "qt5test" - ] - }, - "karchive": { - "nativeBuildInputs": [ - "cmake" - ], - "propagatedNativeBuildInputs": [], - "propagatedUserEnvPkgs": [], - "propagatedBuildInputs": [ - "qt5core" - ], - "name": "karchive-5.12.0", - "src": { - "url": "stable/frameworks/5.12/karchive-5.12.0.tar.xz", - "name": "karchive-5.12.0.tar.xz", - "sha256": "0dh6pskw1picj3f6a4bbhd9j9ki8l738x7f9dxfwcx05mzsliyl8" - }, - "buildInputs": [ - "bzip2", - "ecm", - "kf5archive", - "liblzma", - "qt5core", - "qt5test", - "zlib" - ] - }, - "kdesu": { - "nativeBuildInputs": [ - "cmake" - ], - "propagatedNativeBuildInputs": [], - "propagatedUserEnvPkgs": [], - "propagatedBuildInputs": [ - "kf5pty" - ], - "name": "kdesu-5.12.0", - "src": { - "url": "stable/frameworks/5.12/kdesu-5.12.0.tar.xz", - "name": "kdesu-5.12.0.tar.xz", - "sha256": "1ks695j7wnb7j6vca7a3cb0ii0li4g7sdyksvqsmkxbb1rrpg11f" - }, - "buildInputs": [ - "ecm", - "kf5coreaddons", - "kf5i18n", - "kf5pty", - "kf5service", - "qt5core", - "x11" - ] - }, - "kimageformats": { - "nativeBuildInputs": [ - "cmake" - ], - "propagatedNativeBuildInputs": [], - "propagatedUserEnvPkgs": [], - "propagatedBuildInputs": [], - "name": "kimageformats-5.12.0", - "src": { - "url": "stable/frameworks/5.12/kimageformats-5.12.0.tar.xz", - "name": "kimageformats-5.12.0.tar.xz", - "sha256": "1h91xwj4xjv8z5a9hnid7zqcs35cwxv6hf3kwaag35vllm2cs0s7" - }, - "buildInputs": [ - "ecm", - "jasper", - "openexr", - "qt5gui", - "qt5printsupport", - "qt5test" - ] - }, - "kmediaplayer": { - "nativeBuildInputs": [ - "cmake" - ], - "propagatedNativeBuildInputs": [], - "propagatedUserEnvPkgs": [], - "propagatedBuildInputs": [ - "kf5parts" - ], - "name": "kmediaplayer-5.12.0", - "src": { - "url": "stable/frameworks/5.12/portingAids/kmediaplayer-5.12.0.tar.xz", - "name": "kmediaplayer-5.12.0.tar.xz", - "sha256": "0yr5jjpfnjgfrzqpksl85k6jsgihdb5spf0k9478ryyzpzw3as15" - }, - "buildInputs": [ - "ecm", - "kf5parts", - "kf5xmlgui", - "qt5dbus", - "qt5test", - "qt5widgets" - ] - }, - "ktexteditor": { - "nativeBuildInputs": [ - "cmake" - ], - "propagatedNativeBuildInputs": [], - "propagatedUserEnvPkgs": [], - "propagatedBuildInputs": [], - "name": "ktexteditor-5.12.0", - "src": { - "url": "stable/frameworks/5.12/ktexteditor-5.12.0.tar.xz", - "name": "ktexteditor-5.12.0.tar.xz", - "sha256": "09fcyxanl744mrbpxw5sa1bvf18d9hcs305jaim8bgfw58gz7prl" - }, - "buildInputs": [ - "ecm", - "kf5archive", - "kf5config", - "kf5guiaddons", - "kf5i18n", - "kf5iconthemes", - "kf5kio", - "kf5parts", - "kf5sonnet", - "libgit2", - "perl", - "qt5", - "qt5core", - "qt5printsupport", - "qt5script", - "qt5test", - "qt5widgets", - "qt5xml", - "qt5xmlpatterns" - ] - }, - "kdesignerplugin": { - "nativeBuildInputs": [ - "cmake" - ], - "propagatedNativeBuildInputs": [], - "propagatedUserEnvPkgs": [], - "propagatedBuildInputs": [], - "name": "kdesignerplugin-5.12.0", - "src": { - "url": "stable/frameworks/5.12/kdesignerplugin-5.12.0.tar.xz", - "name": "kdesignerplugin-5.12.0.tar.xz", - "sha256": "05n5pfqabmmy5y8dvk7xz51nyky4k44vxhv7k9fq231cza07w3dg" - }, - "buildInputs": [ - "ecm", - "kf5completion", - "kf5config", - "kf5configwidgets", - "kf5coreaddons", - "kf5doctools", - "kf5iconthemes", - "kf5itemviews", - "kf5kio", - "kf5plotting", - "kf5sonnet", - "kf5textwidgets", - "kf5webkit", - "kf5widgetsaddons", - "kf5xmlgui", - "qt5core", - "qt5designer", - "qt5test", - "qt5widgets" - ] - }, - "kparts": { - "nativeBuildInputs": [ - "cmake" - ], - "propagatedNativeBuildInputs": [], - "propagatedUserEnvPkgs": [], - "propagatedBuildInputs": [ - "kf5kio", - "kf5textwidgets", - "kf5xmlgui" - ], - "name": "kparts-5.12.0", - "src": { - "url": "stable/frameworks/5.12/kparts-5.12.0.tar.xz", - "name": "kparts-5.12.0.tar.xz", - "sha256": "075iqmjdmg8jlbmnpp4jjfr4way4i4c5zwg4c1d4cgd14rr9vm1r" - }, - "buildInputs": [ - "ecm", - "kf5config", - "kf5coreaddons", - "kf5i18n", - "kf5iconthemes", - "kf5jobwidgets", - "kf5kio", - "kf5notifications", - "kf5service", - "kf5textwidgets", - "kf5widgetsaddons", - "kf5xmlgui", - "qt5", - "qt5core", - "qt5test", - "qt5widgets", - "qt5xml" - ] - }, - "kcmutils": { - "nativeBuildInputs": [ - "cmake" - ], - "propagatedNativeBuildInputs": [], - "propagatedUserEnvPkgs": [], - "propagatedBuildInputs": [ - "kf5configwidgets", - "kf5service" - ], - "name": "kcmutils-5.12.0", - "src": { - "url": "stable/frameworks/5.12/kcmutils-5.12.0.tar.xz", - "name": "kcmutils-5.12.0.tar.xz", - "sha256": "1bnrybzfzhb98ihxcvxjgd6agbr16grhdp8zrbq0lhqbaivyfrzd" - }, - "buildInputs": [ - "ecm", - "kf5configwidgets", - "kf5coreaddons", - "kf5declarative", - "kf5i18n", - "kf5iconthemes", - "kf5itemviews", - "kf5package", - "kf5service", - "kf5xmlgui", - "qt5", - "qt5dbus", - "qt5qml", - "qt5quick", - "qt5widgets" - ] - }, - "frameworkintegration": { - "nativeBuildInputs": [ - "cmake" - ], - "propagatedNativeBuildInputs": [], - "propagatedUserEnvPkgs": [], - "propagatedBuildInputs": [ - "kf5configwidgets", - "kf5iconthemes" - ], - "name": "frameworkintegration-5.12.0", - "src": { - "url": "stable/frameworks/5.12/frameworkintegration-5.12.0.tar.xz", - "name": "frameworkintegration-5.12.0.tar.xz", - "sha256": "0pi1gsc2k681f7913ald5d4i53riv2nwj09plalkabydh8kcd55j" - }, - "buildInputs": [ - "ecm", - "kf5config", - "kf5configwidgets", - "kf5i18n", - "kf5iconthemes", - "kf5kio", - "kf5notifications", - "kf5widgetsaddons", - "oxygenfont", - "qt5", - "qt5dbus", - "qt5qml", - "qt5test", - "qt5widgets", - "qt5x11extras", - "x11", - "xcb" - ] - }, - "kiconthemes": { - "nativeBuildInputs": [ - "cmake" - ], - "propagatedNativeBuildInputs": [], - "propagatedUserEnvPkgs": [], - "propagatedBuildInputs": [ - "qt5widgets" - ], - "name": "kiconthemes-5.12.0", - "src": { - "url": "stable/frameworks/5.12/kiconthemes-5.12.0.tar.xz", - "name": "kiconthemes-5.12.0.tar.xz", - "sha256": "0myaqpi1pavjyf2pyvkb2v87vwpyzwd2bvm5bh88va1p1kw747a5" - }, - "buildInputs": [ - "ecm", - "kf5configwidgets", - "kf5i18n", - "kf5itemviews", - "kf5widgetsaddons", - "qt5", - "qt5dbus", - "qt5svg", - "qt5test", - "qt5widgets" - ] - }, - "kjs": { - "nativeBuildInputs": [ - "cmake" - ], - "propagatedNativeBuildInputs": [], - "propagatedUserEnvPkgs": [], - "propagatedBuildInputs": [ - "qt5core" - ], - "name": "kjs-5.12.0", - "src": { - "url": "stable/frameworks/5.12/portingAids/kjs-5.12.0.tar.xz", - "name": "kjs-5.12.0.tar.xz", - "sha256": "1ajcnpphn3vdkx4xwb762bvj0ws7l2h5sxq53cz3lzvznn9q99ps" - }, - "buildInputs": [ - "ecm", - "kf5doctools", - "pcre", - "perl", - "qt5core", - "qt5test" - ] - }, - "knotifyconfig": { - "nativeBuildInputs": [ - "cmake" - ], - "propagatedNativeBuildInputs": [], - "propagatedUserEnvPkgs": [], - "propagatedBuildInputs": [ - "qt5widgets" - ], - "name": "knotifyconfig-5.12.0", - "src": { - "url": "stable/frameworks/5.12/knotifyconfig-5.12.0.tar.xz", - "name": "knotifyconfig-5.12.0.tar.xz", - "sha256": "0gznp2m7hlrbl6y7d3p8g6nwdgpk1h2iyy810cs6cjhs5n7b7bfk" - }, - "buildInputs": [ - "ecm", - "kf5completion", - "kf5config", - "kf5configwidgets", - "kf5i18n", - "kf5kio", - "kf5notifications", - "kf5widgetsaddons", - "kf5xmlgui", - "phonon4qt5", - "qt5", - "qt5dbus", - "qt5optional_components", - "qt5test", - "qt5texttospeech", - "qt5widgets" - ] - }, - "kio": { - "nativeBuildInputs": [ - "cmake" - ], - "propagatedNativeBuildInputs": [], - "propagatedUserEnvPkgs": [], - "propagatedBuildInputs": [ - "kf5bookmarks", - "kf5completion", - "kf5config", - "kf5coreaddons", - "kf5itemviews", - "kf5jobwidgets", - "kf5service", - "kf5solid", - "kf5xmlgui", - "qt5network" - ], - "name": "kio-5.12.0", - "src": { - "url": "stable/frameworks/5.12/kio-5.12.0.tar.xz", - "name": "kio-5.12.0.tar.xz", - "sha256": "139jngyaa1rm159qj0ivjk9bd18rb6sp9n8290xsqwpfvs6ixn7w" - }, - "buildInputs": [ - "acl", - "ecm", - "gssapi", - "kf5archive", - "kf5bookmarks", - "kf5completion", - "kf5config", - "kf5configwidgets", - "kf5coreaddons", - "kf5dbusaddons", - "kf5doctools", - "kf5i18n", - "kf5iconthemes", - "kf5itemviews", - "kf5jobwidgets", - "kf5notifications", - "kf5service", - "kf5solid", - "kf5textwidgets", - "kf5wallet", - "kf5widgetsaddons", - "kf5windowsystem", - "kf5xmlgui", - "libxml2", - "libxslt", - "openssl", - "qt5", - "qt5concurrent", - "qt5core", - "qt5dbus", - "qt5network", - "qt5script", - "qt5test", - "qt5widgets", - "qt5x11extras", - "qt5xml", - "strigi", - "x11", - "zlib" - ] - }, - "kunitconversion": { - "nativeBuildInputs": [ - "cmake" - ], - "propagatedNativeBuildInputs": [], - "propagatedUserEnvPkgs": [], - "propagatedBuildInputs": [ - "qt5core" - ], - "name": "kunitconversion-5.12.0", - "src": { - "url": "stable/frameworks/5.12/kunitconversion-5.12.0.tar.xz", - "name": "kunitconversion-5.12.0.tar.xz", - "sha256": "0gmxqjryjzhhr75clbs7swd765asfaf0b7ivnqk99j0dzdg1yh8m" - }, - "buildInputs": [ - "ecm", - "kf5i18n", - "qt5", - "qt5core", - "qt5network", - "qt5test", - "qt5xml" - ] - }, - "kdnssd": { - "nativeBuildInputs": [ - "cmake" - ], - "propagatedNativeBuildInputs": [], - "propagatedUserEnvPkgs": [], - "propagatedBuildInputs": [ - "qt5network" - ], - "name": "kdnssd-5.12.0", - "src": { - "url": "stable/frameworks/5.12/kdnssd-5.12.0.tar.xz", - "name": "kdnssd-5.12.0.tar.xz", - "sha256": "1v8nml6fmabail6d9wybfqmg02kymg15x5ng4vc08z9wrn1jvxrd" - }, - "buildInputs": [ - "avahi", - "dnssd", - "ecm", - "qt5", - "qt5dbus", - "qt5network" - ] - }, - "knotifications": { - "nativeBuildInputs": [ - "cmake" - ], - "propagatedNativeBuildInputs": [], - "propagatedUserEnvPkgs": [], - "propagatedBuildInputs": [ - "qt5widgets" - ], - "name": "knotifications-5.12.0", - "src": { - "url": "stable/frameworks/5.12/knotifications-5.12.0.tar.xz", - "name": "knotifications-5.12.0.tar.xz", - "sha256": "08clp98lpplk2k6c4r1l01yh16ssn4ipfc6w8wiahqipp6gzw1bv" - }, - "buildInputs": [ - "dbusmenu-qt5", - "ecm", - "kf5codecs", - "kf5config", - "kf5coreaddons", - "kf5iconthemes", - "kf5service", - "kf5windowsystem", - "phonon4qt5", - "qt5", - "qt5dbus", - "qt5optional_components", - "qt5test", - "qt5texttospeech", - "qt5widgets", - "qt5x11extras", - "x11" - ] - }, - "kdbusaddons": { - "nativeBuildInputs": [ - "cmake" - ], - "propagatedNativeBuildInputs": [], - "propagatedUserEnvPkgs": [], - "propagatedBuildInputs": [ - "qt5dbus" - ], - "name": "kdbusaddons-5.12.0", - "src": { - "url": "stable/frameworks/5.12/kdbusaddons-5.12.0.tar.xz", - "name": "kdbusaddons-5.12.0.tar.xz", - "sha256": "1nfanafpsi67lmszf8lf3zyjghb3j0jfbc5s7vsa19zbxz9dsh3d" - }, - "buildInputs": [ - "ecm", - "qt5dbus", - "qt5test", - "qt5x11extras" - ] - }, - "kemoticons": { - "nativeBuildInputs": [ - "cmake" - ], - "propagatedNativeBuildInputs": [], - "propagatedUserEnvPkgs": [], - "propagatedBuildInputs": [ - "kf5service", - "qt5gui" - ], - "name": "kemoticons-5.12.0", - "src": { - "url": "stable/frameworks/5.12/kemoticons-5.12.0.tar.xz", - "name": "kemoticons-5.12.0.tar.xz", - "sha256": "11wm832xv59vlwnlq314vr7j151mfv7s5xsgab1h0w1ypf8nbggv" - }, - "buildInputs": [ - "ecm", - "kf5archive", - "kf5config", - "kf5coreaddons", - "kf5service", - "qt5", - "qt5gui", - "qt5test", - "qt5widgets", - "qt5xml" - ] - }, - "kdoctools": { - "nativeBuildInputs": [ - "cmake" - ], - "propagatedNativeBuildInputs": [], - "propagatedUserEnvPkgs": [], - "propagatedBuildInputs": [ - "qt5core" - ], - "name": "kdoctools-5.12.0", - "src": { - "url": "stable/frameworks/5.12/kdoctools-5.12.0.tar.xz", - "name": "kdoctools-5.12.0.tar.xz", - "sha256": "0if3lss9ywwkpcgb8k6vi6b35vl5xxy77gdsbmvd2w2r83p2s6n4" - }, - "buildInputs": [ - "docbookxml4", - "docbookxsl", - "ecm", - "kf5archive", - "kf5doctools", - "kf5i18n", - "libxml2", - "libxslt", - "qt5core" - ] - }, - "kapidox": { - "nativeBuildInputs": [ - "cmake" - ], - "propagatedNativeBuildInputs": [], - "propagatedUserEnvPkgs": [], - "propagatedBuildInputs": [], - "name": "kapidox-5.12.0", - "src": { - "url": "stable/frameworks/5.12/kapidox-5.12.0.tar.xz", - "name": "kapidox-5.12.0.tar.xz", - "sha256": "0pcmyp92l63klxjz3valpk9kr9rh3ny663hqlfj1qcbl5qx10fic" - }, - "buildInputs": [ - "pythoninterp" - ] - }, - "kcoreaddons": { - "nativeBuildInputs": [ - "cmake" - ], - "propagatedNativeBuildInputs": [], - "propagatedUserEnvPkgs": [], - "propagatedBuildInputs": [ - "qt5core" - ], - "name": "kcoreaddons-5.12.0", - "src": { - "url": "stable/frameworks/5.12/kcoreaddons-5.12.0.tar.xz", - "name": "kcoreaddons-5.12.0.tar.xz", - "sha256": "1w113966p2wsr6ddwifzpc6lvx2hpr2qziq7kn4ycjpq3fc6whl7" - }, - "buildInputs": [ - "ecm", - "fam", - "qt5", - "qt5core", - "qt5test", - "qt5widgets", - "sharedmimeinfo" - ] - }, - "krunner": { - "nativeBuildInputs": [ - "cmake" - ], - "propagatedNativeBuildInputs": [], - "propagatedUserEnvPkgs": [], - "propagatedBuildInputs": [ - "kf5plasma", - "qt5core" - ], - "name": "krunner-5.12.0", - "src": { - "url": "stable/frameworks/5.12/portingAids/krunner-5.12.0.tar.xz", - "name": "krunner-5.12.0.tar.xz", - "sha256": "167zz32q5ghxc672yp372livdr37wx24769726izhfhqh22gqbpz" - }, - "buildInputs": [ - "ecm", - "kf5config", - "kf5coreaddons", - "kf5i18n", - "kf5kio", - "kf5plasma", - "kf5service", - "kf5solid", - "kf5threadweaver", - "qt5", - "qt5gui", - "qt5quick", - "qt5test", - "qt5widgets" - ] - }, - "kjobwidgets": { - "nativeBuildInputs": [ - "cmake" - ], - "propagatedNativeBuildInputs": [], - "propagatedUserEnvPkgs": [], - "propagatedBuildInputs": [ - "kf5coreaddons", - "qt5widgets" - ], - "name": "kjobwidgets-5.12.0", - "src": { - "url": "stable/frameworks/5.12/kjobwidgets-5.12.0.tar.xz", - "name": "kjobwidgets-5.12.0.tar.xz", - "sha256": "1vrxcsy4jad2dzjhwlb44l18fckb1h5p3f4w6q8493clribc27kj" - }, - "buildInputs": [ - "ecm", - "kf5coreaddons", - "kf5widgetsaddons", - "qt5", - "qt5dbus", - "qt5test", - "qt5widgets", - "qt5x11extras", - "x11" - ] - }, - "kcodecs": { - "nativeBuildInputs": [ - "cmake" - ], - "propagatedNativeBuildInputs": [], - "propagatedUserEnvPkgs": [], - "propagatedBuildInputs": [ - "qt5core" - ], - "name": "kcodecs-5.12.0", - "src": { - "url": "stable/frameworks/5.12/kcodecs-5.12.0.tar.xz", - "name": "kcodecs-5.12.0.tar.xz", - "sha256": "1xwz1ipf53azhcpm91c8q1q1i5v4avbnfapgz45hr223ilfkdmpy" - }, - "buildInputs": [ - "ecm", - "qt5core", - "qt5test" - ] - }, - "kconfigwidgets": { - "nativeBuildInputs": [ - "cmake" - ], - "propagatedNativeBuildInputs": [], - "propagatedUserEnvPkgs": [], - "propagatedBuildInputs": [ - "kf5auth", - "kf5codecs", - "kf5config", - "kf5widgetsaddons" - ], - "name": "kconfigwidgets-5.12.0", - "src": { - "url": "stable/frameworks/5.12/kconfigwidgets-5.12.0.tar.xz", - "name": "kconfigwidgets-5.12.0.tar.xz", - "sha256": "1xwk6alrfpgm3pblhdglzglazvjp9i5kzcg212ngad8q9z05c4jg" - }, - "buildInputs": [ - "ecm", - "kf5auth", - "kf5codecs", - "kf5config", - "kf5coreaddons", - "kf5doctools", - "kf5guiaddons", - "kf5i18n", - "kf5widgetsaddons", - "qt5", - "qt5test" - ] - }, - "kdeclarative": { - "nativeBuildInputs": [ - "cmake" - ], - "propagatedNativeBuildInputs": [], - "propagatedUserEnvPkgs": [], - "propagatedBuildInputs": [ - "kf5config", - "kf5package", - "qt5qml" - ], - "name": "kdeclarative-5.12.0", - "src": { - "url": "stable/frameworks/5.12/kdeclarative-5.12.0.tar.xz", - "name": "kdeclarative-5.12.0.tar.xz", - "sha256": "0k6c6ar5xi0m2p4s81p0057i13zpihakniscx5v9yz1ncv7sl8gm" - }, - "buildInputs": [ - "activeapp", - "ecm", - "epoxy", - "kf5config", - "kf5globalaccel", - "kf5guiaddons", - "kf5i18n", - "kf5iconthemes", - "kf5kio", - "kf5package", - "kf5widgetsaddons", - "kf5windowsystem", - "qt5", - "qt5gui", - "qt5qml", - "qt5quick", - "qt5test" - ] - }, - "ktextwidgets": { - "nativeBuildInputs": [ - "cmake" - ], - "propagatedNativeBuildInputs": [], - "propagatedUserEnvPkgs": [], - "propagatedBuildInputs": [ - "kf5i18n", - "kf5sonnet", - "qt5widgets" - ], - "name": "ktextwidgets-5.12.0", - "src": { - "url": "stable/frameworks/5.12/ktextwidgets-5.12.0.tar.xz", - "name": "ktextwidgets-5.12.0.tar.xz", - "sha256": "0m2813dm3xs9q2rwvbkynckgbbh0q51swhibhdyirggl1xc8vvf0" - }, - "buildInputs": [ - "ecm", - "kf5completion", - "kf5config", - "kf5configwidgets", - "kf5i18n", - "kf5iconthemes", - "kf5service", - "kf5sonnet", - "kf5widgetsaddons", - "kf5windowsystem", - "qt5", - "qt5optional_components", - "qt5test", - "qt5texttospeech", - "qt5widgets" - ] - }, - "kjsembed": { - "nativeBuildInputs": [ - "cmake" - ], - "propagatedNativeBuildInputs": [], - "propagatedUserEnvPkgs": [], - "propagatedBuildInputs": [ - "kf5i18n", - "kf5js" - ], - "name": "kjsembed-5.12.0", - "src": { - "url": "stable/frameworks/5.12/portingAids/kjsembed-5.12.0.tar.xz", - "name": "kjsembed-5.12.0.tar.xz", - "sha256": "0fmgpi0c62y2658xaf0d825azywmpy77vg97k788liqy0d1ykhvh" - }, - "buildInputs": [ - "ecm", - "kf5doctools", - "kf5i18n", - "kf5js", - "qt5" - ] - } -} \ No newline at end of file diff --git a/pkgs/development/libraries/kde-frameworks-5.12/packages.sh b/pkgs/development/libraries/kde-frameworks-5.12/packages.sh deleted file mode 100755 index b859a87f32f9..000000000000 --- a/pkgs/development/libraries/kde-frameworks-5.12/packages.sh +++ /dev/null @@ -1,22 +0,0 @@ -#!/bin/sh - -set -x - -origin="$(pwd)" - -# if setting KDE_MIRROR, be sure to set --cut-dirs=N in MANIFEST_EXTRA_ARGS -KDE_MIRROR="${KDE_MIRROR:-http://download.kde.org}" - -alias nix-build="nix-build --no-out-link \"$origin/../../../..\"" - -# The extra slash at the end of the URL is necessary to stop wget -# from recursing over the whole server! (No, it's not a bug.) -$(nix-build -A autonix.manifest) \ - "${KDE_MIRROR}/stable/frameworks/5.12/" \ - "$@" -A '*.tar.xz' - -AUTONIX_DEPS_KF5=${AUTONIX_DEPS_KF5:-"$(nix-build -A haskellPackages.autonix-deps-kf5)/bin/kf5-deps"} - -$AUTONIX_DEPS_KF5 manifest.json - -rm manifest.json diff --git a/pkgs/development/libraries/kde-frameworks-5.12/plasma-framework/plasma-framework-external-paths.patch b/pkgs/development/libraries/kde-frameworks-5.12/plasma-framework/plasma-framework-external-paths.patch deleted file mode 100644 index 9a22c0bdbcd5..000000000000 --- a/pkgs/development/libraries/kde-frameworks-5.12/plasma-framework/plasma-framework-external-paths.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/src/plasma/package.cpp b/src/plasma/package.cpp -index 07b3c90..84417e3 100644 ---- a/src/plasma/package.cpp -+++ b/src/plasma/package.cpp -@@ -791,7 +791,7 @@ PackagePrivate::PackagePrivate() - servicePrefix("plasma-applet-"), - fallbackPackage(0), - metadata(0), -- externalPaths(false), -+ externalPaths(true), - valid(false), - checkedValid(false) - { diff --git a/pkgs/development/libraries/kde-frameworks-5.12/renames.json b/pkgs/development/libraries/kde-frameworks-5.12/renames.json deleted file mode 100644 index e469d582b1ca..000000000000 --- a/pkgs/development/libraries/kde-frameworks-5.12/renames.json +++ /dev/null @@ -1,71 +0,0 @@ -{ - "kf5widgetsaddons": "kwidgetsaddons", - "kf5texteditor": "ktexteditor", - "kf5designerplugin": "kdesignerplugin", - "kf5bookmarks": "kbookmarks", - "kf5frameworkintegration": "frameworkintegration", - "kf5package": "kpackage", - "kf5archive": "karchive", - "kf5plasma": "plasma-framework", - "kf5kcmutils": "kcmutils", - "kf5configwidgets": "kconfigwidgets", - "ctest": "attica", - "kf5kio": "kio", - "kf5networkmanagerqt": "networkmanager-qt", - "kf5coreaddons": "kcoreaddons", - "kf5guiaddons": "kguiaddons", - "kf5jobwidgets": "kjobwidgets", - "kf5modemmanagerqt": "modemmanager-qt", - "kf5runner": "krunner", - "kf5globalaccel": "kglobalaccel", - "kf5dbusaddons": "kdbusaddons", - "kf5crash": "kcrash", - "kf5itemviews": "kitemviews", - "kf5doctools": "kdoctools", - "kf5i18n": "ki18n", - "kf5webkit": "kdewebkit", - "kf5newstuff": "knewstuff", - "kded": "kded", - "kf5notifications": "knotifications", - "kf5activitiesexperimentalstats": "kactivities", - "kf5dnssd": "kdnssd", - "kf5notifyconfig": "knotifyconfig", - "kf5iconthemes": "kiconthemes", - "kf5js": "kjs", - "kf5kde4support": "kdelibs4support", - "kf5parts": "kparts", - "backend": "plasma-framework", - "kf5completion": "kcompletion", - "kf5threadweaver": "threadweaver", - "kf5mediaplayer": "kmediaplayer", - "kf5plasmaquick": "plasma-framework", - "kf5wallet": "kwallet", - "kf5xmlgui": "kxmlgui", - "kf5attica": "attica", - "kf5declarative": "kdeclarative", - "kf5config": "kconfig", - "kf5init": "kinit", - "kf5textwidgets": "ktextwidgets", - "kf5jsembed": "kjsembed", - "kf5codecs": "kcodecs", - "kf5service": "kservice", - "kf5sonnet": "sonnet", - "kf5kdelibs4support": "kdelibs4support", - "kf5pty": "kpty", - "kf5solid": "solid", - "kf5auth": "kauth", - "ecm": "extra-cmake-modules", - "kf5activities": "kactivities", - "kf5plotting": "kplotting", - "kf5people": "kpeople", - "kf5emoticons": "kemoticons", - "kf5kross": "kross", - "kf5su": "kdesu", - "kf5khtml": "khtml", - "kf5unitconversion": "kunitconversion", - "kf5idletime": "kidletime", - "kf5bluezqt": "bluez-qt", - "kf5windowsystem": "kwindowsystem", - "kf5xmlrpcclient": "kxmlrpcclient", - "kf5itemmodels": "kitemmodels" -} \ No newline at end of file diff --git a/pkgs/development/libraries/kde-frameworks-5.12/setup-hook.sh b/pkgs/development/libraries/kde-frameworks-5.12/setup-hook.sh deleted file mode 100644 index a8d9b7e0e36f..000000000000 --- a/pkgs/development/libraries/kde-frameworks-5.12/setup-hook.sh +++ /dev/null @@ -1 +0,0 @@ -addToSearchPath XDG_DATA_DIRS @out@/share diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 5b1a07258c53..6013458161a3 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -6751,7 +6751,6 @@ let }; kf510 = recurseIntoAttrs (callPackage ../development/libraries/kde-frameworks-5.10 { }); - kf512 = recurseIntoAttrs (callPackage ../development/libraries/kde-frameworks-5.12 { }); kf514 = recurseIntoAttrs (import ../development/libraries/kde-frameworks-5.14 { inherit pkgs; }); kf5_stable = kf510; kf5_latest = kf514; From b102fa5a07f0121a0a51455ffd045fac6e505e92 Mon Sep 17 00:00:00 2001 From: Thomas Tuegel Date: Wed, 7 Oct 2015 06:46:48 -0500 Subject: [PATCH 008/162] nixos/kde5: ready for plasma-5.4 --- nixos/modules/services/x11/desktop-managers/kde5.nix | 11 +++-------- 1 file changed, 3 insertions(+), 8 deletions(-) diff --git a/nixos/modules/services/x11/desktop-managers/kde5.nix b/nixos/modules/services/x11/desktop-managers/kde5.nix index 5061d59b7c7f..b0528d185e2c 100644 --- a/nixos/modules/services/x11/desktop-managers/kde5.nix +++ b/nixos/modules/services/x11/desktop-managers/kde5.nix @@ -37,9 +37,9 @@ let kf5 = pkgs.kf5_stable; - plasma5 = pkgs.plasma5_stable.override { inherit kf5; }; + plasma5 = pkgs.plasma5_stable; - kdeApps = pkgs.kdeApps_stable.override { inherit kf5; }; + kdeApps = pkgs.kdeApps_stable; in @@ -93,13 +93,8 @@ in ++ [ pkgs.qt4 # qtconfig is the only way to set Qt 4 theme - kdeApps.kde-baseapps - kdeApps.kde-base-artwork - kdeApps.kmix + kdeApps.dolphin kdeApps.konsole - kdeApps.oxygen-icons - - kdeApps.kde-runtime pkgs.hicolor_icon_theme From b44923561b49595d5f3d5727c1d3971029f9f6dc Mon Sep 17 00:00:00 2001 From: Thomas Tuegel Date: Wed, 7 Oct 2015 08:48:40 -0500 Subject: [PATCH 009/162] qtbase: include current package in runtime paths The runtime paths QT_PLUGIN_PATH, QML_IMPORT_PATH, QML2_IMPORT_PATH, and XDG_DATA_DIRS did not include the appropriate paths from the current package being built because addToSearchPath does not add directories which don't exist. --- pkgs/development/libraries/qt-5/5.5/qtbase/setup-hook.sh | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/pkgs/development/libraries/qt-5/5.5/qtbase/setup-hook.sh b/pkgs/development/libraries/qt-5/5.5/qtbase/setup-hook.sh index 9f1bafc9f496..15d4818ccc73 100644 --- a/pkgs/development/libraries/qt-5/5.5/qtbase/setup-hook.sh +++ b/pkgs/development/libraries/qt-5/5.5/qtbase/setup-hook.sh @@ -88,10 +88,11 @@ Documentation = share/doc/qt5 EOF export QMAKE="$qtOut/bin/qmake" -addToSearchPath QT_PLUGIN_PATH "$out/lib/qt5/plugins" -addToSearchPath QML_IMPORT_PATH "$out/lib/qt5/imports" -addToSearchPath QML2_IMPORT_PATH "$out/lib/qt5/qml" -addToSearchPath XDG_DATA_DIRS "$out/share" +# cannot use addToSearchPath because these directories may not exist yet +export QT_PLUGIN_PATH="$QT_PLUGIN_PATH${QT_PLUGIN_PATH:+:}$out/lib/qt5/plugins" +export QML_IMPORT_PATH="$QML_IMPORT_PATH${QML_IMPORT_PATH:+:}$out/lib/qt5/imports" +export QML2_IMPORT_PATH="$QML2_IMPORT_PATH${QML2_IMPORT_PATH:+:}$out/lib/qt5/qml" +export XDG_DATA_DIRS="$XDG_DATA_DIRS${XDG_DATA_DIRS:+:}$out/share" envHooks+=(addQtModule) preConfigurePhases+=(setQMakePath) From ebb9c071685cd92fc5148c3f4da898b1235caee0 Mon Sep 17 00:00:00 2001 From: Thomas Tuegel Date: Wed, 7 Oct 2015 08:50:53 -0500 Subject: [PATCH 010/162] qtbase: remove redundant directory checks addToSearchPath already checks if the directory exists before adding it to the path; it's not necessary to check it again. --- .../libraries/qt-5/5.5/qtbase/setup-hook.sh | 19 ++++--------------- 1 file changed, 4 insertions(+), 15 deletions(-) diff --git a/pkgs/development/libraries/qt-5/5.5/qtbase/setup-hook.sh b/pkgs/development/libraries/qt-5/5.5/qtbase/setup-hook.sh index 15d4818ccc73..5bfc672559cb 100644 --- a/pkgs/development/libraries/qt-5/5.5/qtbase/setup-hook.sh +++ b/pkgs/development/libraries/qt-5/5.5/qtbase/setup-hook.sh @@ -19,21 +19,10 @@ addQtModule() { done fi - if [[ -d "$1/lib/qt5/plugins" ]]; then - addToSearchPath QT_PLUGIN_PATH "$1/lib/qt5/plugins" - fi - - if [[ -d "$1/lib/qt5/imports" ]]; then - addToSearchPath QML_IMPORT_PATH "$1/lib/qt5/imports" - fi - - if [[ -d "$1/lib/qt5/qml" ]]; then - addToSearchPath QML2_IMPORT_PATH "$1/lib/qt5/qml" - fi - - if [[ -d "$1/share" ]]; then - addToSearchPath XDG_DATA_DIRS "$1/share" - fi + addToSearchPath QT_PLUGIN_PATH "$1/lib/qt5/plugins" + addToSearchPath QML_IMPORT_PATH "$1/lib/qt5/imports" + addToSearchPath QML2_IMPORT_PATH "$1/lib/qt5/qml" + addToSearchPath XDG_DATA_DIRS "$1/share" } rmQtModules() { From b9b5b69f114fc3cd97ff9023dc4a6a9d5ad9c2a3 Mon Sep 17 00:00:00 2001 From: Thomas Tuegel Date: Wed, 7 Oct 2015 11:46:59 -0500 Subject: [PATCH 011/162] plasma54.libksysguard: clean up expression --- pkgs/desktops/plasma-5.4/libksysguard.nix | 36 +++++------------------ 1 file changed, 7 insertions(+), 29 deletions(-) diff --git a/pkgs/desktops/plasma-5.4/libksysguard.nix b/pkgs/desktops/plasma-5.4/libksysguard.nix index d36eadb3b4f8..73cb38d89da5 100644 --- a/pkgs/desktops/plasma-5.4/libksysguard.nix +++ b/pkgs/desktops/plasma-5.4/libksysguard.nix @@ -1,19 +1,7 @@ -{ plasmaPackage -, extra-cmake-modules -, kauth -, kcompletion -, kconfigwidgets -, kcoreaddons -, kservice -, kwidgetsaddons -, kwindowsystem -, plasma-framework -, qtscript -, qtwebkit -, qtx11extras -, kconfig -, ki18n -, kiconthemes +{ plasmaPackage, extra-cmake-modules, kauth, kcompletion +, kconfigwidgets, kcoreaddons, kservice, kwidgetsaddons +, kwindowsystem, plasma-framework, qtscript, qtwebkit, qtx11extras +, kconfig, ki18n, kiconthemes }: plasmaPackage { @@ -22,21 +10,11 @@ plasmaPackage { extra-cmake-modules ]; buildInputs = [ - kauth - kcompletion - kconfigwidgets - kcoreaddons - kservice - kwidgetsaddons - kwindowsystem - plasma-framework - qtscript - qtwebkit + kauth kcompletion kconfigwidgets kcoreaddons kservice + kwidgetsaddons kwindowsystem plasma-framework qtscript qtwebkit qtx11extras ]; propagatedBuildInputs = [ - kconfig - ki18n - kiconthemes + kconfig ki18n kiconthemes ]; } From a3adb749d7401c6a866445d4f503c48215764499 Mon Sep 17 00:00:00 2001 From: Thomas Tuegel Date: Wed, 7 Oct 2015 11:47:20 -0500 Subject: [PATCH 012/162] plasma54.plasma-workspace: add missing runtime dependencies --- .../plasma-5.4/plasma-workspace/default.nix | 102 +++--------------- 1 file changed, 16 insertions(+), 86 deletions(-) diff --git a/pkgs/desktops/plasma-5.4/plasma-workspace/default.nix b/pkgs/desktops/plasma-5.4/plasma-workspace/default.nix index f9339f808062..3408526fa339 100644 --- a/pkgs/desktops/plasma-5.4/plasma-workspace/default.nix +++ b/pkgs/desktops/plasma-5.4/plasma-workspace/default.nix @@ -1,56 +1,13 @@ -{ plasmaPackage -, extra-cmake-modules -, kdoctools -, baloo -, kactivities -, kcmutils -, kcrash -, kdbusaddons -, kdeclarative -, kdelibs4support -, kdesu -, kdewebkit -, kglobalaccel -, kidletime -, kjsembed -, knewstuff -, knotifyconfig -, kpackage -, krunner -, ktexteditor -, ktextwidgets -, kwallet -, kwayland -, kwin -, kxmlrpcclient -, libdbusmenu -, libkscreen -, libSM -, libXcursor -, networkmanager-qt -, pam -, phonon -, plasma-framework -, qtscript -, qtx11extras -, wayland -, libksysguard -, bash -, coreutils -, gnused -, gnugrep -, socat -, kconfig -, kinit -, kservice -, qttools -, dbus_tools -, mkfontdir -, xmessage -, xprop -, xrdb -, xset -, xsetroot +{ plasmaPackage, extra-cmake-modules, kdoctools, baloo +, kactivities, kcmutils, kcrash, kdbusaddons, kdeclarative +, kdelibs4support, kdesu, kdewebkit, kglobalaccel, kidletime +, kjsembed, knewstuff, knotifyconfig, kpackage, krunner +, ktexteditor, ktextwidgets, kwallet, kwayland, kwin, kxmlrpcclient +, libdbusmenu, libkscreen, libSM, libXcursor, networkmanager-qt +, pam, phonon, plasma-framework, qtquick1, qtscript, qtx11extras, wayland +, libksysguard, bash, coreutils, gnused, gnugrep, socat, kconfig +, kinit, kservice, qttools, dbus_tools, mkfontdir, xmessage, xprop +, xrdb, xset, xsetroot, solid }: plasmaPackage { @@ -60,39 +17,12 @@ plasmaPackage { kdoctools ]; buildInputs = [ - baloo - kactivities - kcmutils - kcrash - kdbusaddons - kdeclarative - kdelibs4support - kdesu - kdewebkit - kglobalaccel - kidletime - kjsembed - knewstuff - knotifyconfig - kpackage - krunner - ktexteditor - ktextwidgets - kwallet - kwayland - kwin - kxmlrpcclient - libdbusmenu - libkscreen - libSM - libXcursor - networkmanager-qt - pam - phonon - plasma-framework - qtscript - qtx11extras - wayland + baloo kactivities kcmutils kcrash kdbusaddons kdeclarative + kdelibs4support kdesu kdewebkit kglobalaccel kidletime kjsembed + knewstuff knotifyconfig kpackage krunner ktexteditor ktextwidgets + kwallet kwayland kwin kxmlrpcclient libdbusmenu libkscreen libSM + libXcursor networkmanager-qt pam phonon plasma-framework qtquick1 + qtscript qtx11extras solid wayland ]; propagatedBuildInputs = [ libksysguard From 998f234d1a5a3dbf8abaab86ac5fbf598c7b6f16 Mon Sep 17 00:00:00 2001 From: Thomas Tuegel Date: Thu, 8 Oct 2015 20:15:59 -0500 Subject: [PATCH 013/162] plasma54.plasma-desktop: add missing dependencies --- .../plasma-5.4/plasma-desktop/default.nix | 96 ++++--------------- 1 file changed, 16 insertions(+), 80 deletions(-) diff --git a/pkgs/desktops/plasma-5.4/plasma-desktop/default.nix b/pkgs/desktops/plasma-5.4/plasma-desktop/default.nix index b89496dfd795..934d4c1643d9 100644 --- a/pkgs/desktops/plasma-5.4/plasma-desktop/default.nix +++ b/pkgs/desktops/plasma-5.4/plasma-desktop/default.nix @@ -1,46 +1,12 @@ -{ plasmaPackage -, substituteAll -, extra-cmake-modules -, kdoctools -, attica -, baloo -, boost -, fontconfig -, kactivities -, kauth -, kcmutils -, kdbusaddons -, kdeclarative -, kded -, kdelibs4support -, kemoticons -, kglobalaccel -, ki18n -, kitemmodels -, knewstuff -, knotifications -, knotifyconfig -, kpeople -, krunner -, kwallet -, kwin -, phonon -, plasma-framework -, plasma-workspace -, qtdeclarative -, qtx11extras -, qtsvg -, libXcursor -, libXft -, libxkbfile -, xf86inputevdev -, xf86inputsynaptics -, xinput -, xkeyboard_config -, xorgserver -, libcanberra_kde -, libpulseaudio -, utillinux +{ plasmaPackage, substituteAll, extra-cmake-modules, kdoctools +, attica, baloo, boost, fontconfig, kactivities, kauth, kcmutils +, kdbusaddons, kdeclarative, kded, kdelibs4support, kemoticons +, kglobalaccel, ki18n, kitemmodels, knewstuff, knotifications +, knotifyconfig, kpeople, krunner, kwallet, kwin, phonon +, plasma-framework, plasma-workspace, qtdeclarative, qtx11extras +, qtsvg, libXcursor, libXft, libxkbfile, xf86inputevdev +, xf86inputsynaptics, xinput, xkeyboard_config, xorgserver +, libcanberra_kde, libpulseaudio, utillinux }: plasmaPackage { @@ -50,43 +16,13 @@ plasmaPackage { kdoctools ]; buildInputs = [ - attica - baloo - boost - fontconfig - kactivities - kauth - kcmutils - kdbusaddons - kdeclarative - kded - kdelibs4support - kemoticons - kglobalaccel - ki18n - kitemmodels - knewstuff - knotifications - knotifyconfig - kpeople - krunner - kwallet - kwin - libcanberra_kde - libXcursor - libpulseaudio - libXft - libxkbfile - phonon - plasma-framework - plasma-workspace - qtdeclarative - qtx11extras - qtsvg - xf86inputevdev - xf86inputsynaptics - xkeyboard_config - xinput + attica baloo boost fontconfig kactivities kauth kcmutils + kdbusaddons kdeclarative kded kdelibs4support kemoticons + kglobalaccel ki18n kitemmodels knewstuff knotifications + knotifyconfig kpeople krunner kwallet kwin libcanberra_kde + libXcursor libpulseaudio libXft libxkbfile phonon plasma-framework + plasma-workspace qtdeclarative qtx11extras qtsvg xf86inputevdev + xf86inputsynaptics xkeyboard_config xinput ]; patches = [ (substituteAll { From a122ca8ba3363b4c595e036099c073c1d61dc77f Mon Sep 17 00:00:00 2001 From: Thomas Tuegel Date: Fri, 9 Oct 2015 18:20:53 -0500 Subject: [PATCH 014/162] qt55.qtbase: add makeQtWrapper --- .../libraries/qt-5/5.5/qtbase/setup-hook.sh | 16 +++++++++++++++- 1 file changed, 15 insertions(+), 1 deletion(-) diff --git a/pkgs/development/libraries/qt-5/5.5/qtbase/setup-hook.sh b/pkgs/development/libraries/qt-5/5.5/qtbase/setup-hook.sh index 5bfc672559cb..cae1aeaac2cc 100644 --- a/pkgs/development/libraries/qt-5/5.5/qtbase/setup-hook.sh +++ b/pkgs/development/libraries/qt-5/5.5/qtbase/setup-hook.sh @@ -50,7 +50,21 @@ setQMakePath() { } wrapQtProgram() { - wrapProgram "$1" \ + local prog="$1" + shift + wrapProgram "$prog" \ + --set QT_PLUGIN_PATH "$QT_PLUGIN_PATH" \ + --set QML_IMPORT_PATH "$QML_IMPORT_PATH" \ + --set QML2_IMPORT_PATH "$QML2_IMPORT_PATH" \ + "$@" +} + +makeQtWrapper() { + local old="$1" + local new="$2" + shift + shift + makeWrapper "$old" "$new" \ --set QT_PLUGIN_PATH "$QT_PLUGIN_PATH" \ --set QML_IMPORT_PATH "$QML_IMPORT_PATH" \ --set QML2_IMPORT_PATH "$QML2_IMPORT_PATH" \ From 1c8c5a12787024f8ec2693d5ffb3cdbfc05196f6 Mon Sep 17 00:00:00 2001 From: Thomas Tuegel Date: Fri, 9 Oct 2015 18:21:07 -0500 Subject: [PATCH 015/162] kf514.extra-cmake-modules: add makeKDEWrapper --- .../extra-cmake-modules/setup-hook.sh | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) diff --git a/pkgs/development/libraries/kde-frameworks-5.14/extra-cmake-modules/setup-hook.sh b/pkgs/development/libraries/kde-frameworks-5.14/extra-cmake-modules/setup-hook.sh index ce9aafb90e85..83ffcc93935a 100644 --- a/pkgs/development/libraries/kde-frameworks-5.14/extra-cmake-modules/setup-hook.sh +++ b/pkgs/development/libraries/kde-frameworks-5.14/extra-cmake-modules/setup-hook.sh @@ -1,4 +1,15 @@ +makeKDEWrapper() { + KSERVICE_BUILD_KDESYCOCA=${KDESYCOCA:+1} + local old="$1" + local new="$2" + shift + shift + makeQtWrapper "$old" "$new" ${KDESYCOCA:+--set KDESYCOCA "$KDESYCOCA"} "$@" +} + wrapKDEProgram() { KSERVICE_BUILD_KDESYCOCA=${KDESYCOCA:+1} - wrapQtProgram "$1" ${KDESYCOCA:+--set KDESYCOCA "$KDESYCOCA"} "$@" + local prog="$1" + shift + wrapQtProgram "$prog" ${KDESYCOCA:+--set KDESYCOCA "$KDESYCOCA"} "$@" } From a166ec9318ad2bb360580791d2d2d27cf0b29ea0 Mon Sep 17 00:00:00 2001 From: Thomas Tuegel Date: Sat, 10 Oct 2015 09:52:10 -0500 Subject: [PATCH 016/162] propagate baloo dependencies --- .../kde-apps-15.08/baloo-widgets.nix | 4 ++- pkgs/applications/kde-apps-15.08/dolphin.nix | 4 ++- pkgs/applications/kde-apps-15.08/gwenview.nix | 4 ++- .../plasma-5.4/plasma-desktop/default.nix | 3 +- .../plasma-5.4/plasma-mediacenter.nix | 34 ++++--------------- .../plasma-5.4/plasma-workspace/default.nix | 4 +-- 6 files changed, 19 insertions(+), 34 deletions(-) diff --git a/pkgs/applications/kde-apps-15.08/baloo-widgets.nix b/pkgs/applications/kde-apps-15.08/baloo-widgets.nix index d38eea96c599..4501dcec7acf 100644 --- a/pkgs/applications/kde-apps-15.08/baloo-widgets.nix +++ b/pkgs/applications/kde-apps-15.08/baloo-widgets.nix @@ -23,9 +23,11 @@ kdeApp { ki18n kservice kfilemetadata - baloo kdelibs4support ]; + propagatedBuildInputs = [ + baloo + ]; meta = { license = [ lib.licenses.lgpl21 ]; maintainers = [ lib.maintainers.ttuegel ]; diff --git a/pkgs/applications/kde-apps-15.08/dolphin.nix b/pkgs/applications/kde-apps-15.08/dolphin.nix index 1704e9ae2722..2b886b63d146 100644 --- a/pkgs/applications/kde-apps-15.08/dolphin.nix +++ b/pkgs/applications/kde-apps-15.08/dolphin.nix @@ -51,11 +51,13 @@ kdeApp { knotifications kactivities phonon - baloo baloo-widgets kfilemetadata kdelibs4support ]; + propagatedBuildInputs = [ + baloo + ]; meta = { license = with lib.licenses; [ gpl2 fdl12 ]; maintainers = [ lib.maintainers.ttuegel ]; diff --git a/pkgs/applications/kde-apps-15.08/gwenview.nix b/pkgs/applications/kde-apps-15.08/gwenview.nix index 27d20369128a..4a83209dc0cf 100644 --- a/pkgs/applications/kde-apps-15.08/gwenview.nix +++ b/pkgs/applications/kde-apps-15.08/gwenview.nix @@ -20,7 +20,6 @@ kdeApp { kdoctools ]; buildInputs = [ - baloo exiv2 kactivities kdelibs4support @@ -28,6 +27,9 @@ kdeApp { lcms2 phonon qtsvg + ]; + propagatedBuildInputs = [ + baloo qtx11extras ]; meta = { diff --git a/pkgs/desktops/plasma-5.4/plasma-desktop/default.nix b/pkgs/desktops/plasma-5.4/plasma-desktop/default.nix index 934d4c1643d9..76ddb520fed5 100644 --- a/pkgs/desktops/plasma-5.4/plasma-desktop/default.nix +++ b/pkgs/desktops/plasma-5.4/plasma-desktop/default.nix @@ -16,7 +16,7 @@ plasmaPackage { kdoctools ]; buildInputs = [ - attica baloo boost fontconfig kactivities kauth kcmutils + attica boost fontconfig kactivities kauth kcmutils kdbusaddons kdeclarative kded kdelibs4support kemoticons kglobalaccel ki18n kitemmodels knewstuff knotifications knotifyconfig kpeople krunner kwallet kwin libcanberra_kde @@ -24,6 +24,7 @@ plasmaPackage { plasma-workspace qtdeclarative qtx11extras qtsvg xf86inputevdev xf86inputsynaptics xkeyboard_config xinput ]; + propagatedBuildInputs = [ baloo ]; patches = [ (substituteAll { src = ./0001-hwclock.patch; diff --git a/pkgs/desktops/plasma-5.4/plasma-mediacenter.nix b/pkgs/desktops/plasma-5.4/plasma-mediacenter.nix index 6b21eed5a957..27ae27012bc9 100644 --- a/pkgs/desktops/plasma-5.4/plasma-mediacenter.nix +++ b/pkgs/desktops/plasma-5.4/plasma-mediacenter.nix @@ -1,18 +1,6 @@ -{ plasmaPackage -, extra-cmake-modules -, baloo -, kactivities -, kconfig -, kcoreaddons -, kdeclarative -, kguiaddons -, ki18n -, kio -, kservice -, kfilemetadata -, plasma-framework -, qtdeclarative -, qtmultimedia +{ plasmaPackage, extra-cmake-modules, baloo, kactivities, kconfig +, kcoreaddons, kdeclarative, kguiaddons, ki18n, kio, kservice +, kfilemetadata, plasma-framework, qtdeclarative, qtmultimedia , taglib }: @@ -22,19 +10,9 @@ plasmaPackage { extra-cmake-modules ]; buildInputs = [ - baloo - kactivities - kconfig - kcoreaddons - kdeclarative - kguiaddons - ki18n - kio - kservice - kfilemetadata - plasma-framework - qtdeclarative - qtmultimedia + kactivities kconfig kcoreaddons kdeclarative kguiaddons ki18n kio + kservice kfilemetadata plasma-framework qtdeclarative qtmultimedia taglib ]; + propagatedBuildInputs = [ baloo ]; } diff --git a/pkgs/desktops/plasma-5.4/plasma-workspace/default.nix b/pkgs/desktops/plasma-5.4/plasma-workspace/default.nix index 3408526fa339..f1c44536a52e 100644 --- a/pkgs/desktops/plasma-5.4/plasma-workspace/default.nix +++ b/pkgs/desktops/plasma-5.4/plasma-workspace/default.nix @@ -17,7 +17,7 @@ plasmaPackage { kdoctools ]; buildInputs = [ - baloo kactivities kcmutils kcrash kdbusaddons kdeclarative + kactivities kcmutils kcrash kdbusaddons kdeclarative kdelibs4support kdesu kdewebkit kglobalaccel kidletime kjsembed knewstuff knotifyconfig kpackage krunner ktexteditor ktextwidgets kwallet kwayland kwin kxmlrpcclient libdbusmenu libkscreen libSM @@ -25,7 +25,7 @@ plasmaPackage { qtscript qtx11extras solid wayland ]; propagatedBuildInputs = [ - libksysguard + baloo libksysguard ]; patches = [ ./0001-startkde-NixOS-patches.patch ]; From a5eafc16e02a0589bbbafdfe219c793425c66e07 Mon Sep 17 00:00:00 2001 From: Thomas Tuegel Date: Sat, 10 Oct 2015 09:53:13 -0500 Subject: [PATCH 017/162] propagate bluez-qt dependencies --- pkgs/desktops/plasma-5.4/bluedevil.nix | 32 ++++++-------------------- 1 file changed, 7 insertions(+), 25 deletions(-) diff --git a/pkgs/desktops/plasma-5.4/bluedevil.nix b/pkgs/desktops/plasma-5.4/bluedevil.nix index 208540c4c796..e9d368020d3b 100644 --- a/pkgs/desktops/plasma-5.4/bluedevil.nix +++ b/pkgs/desktops/plasma-5.4/bluedevil.nix @@ -1,17 +1,6 @@ -{ plasmaPackage -, extra-cmake-modules -, bluez-qt -, kcoreaddons -, kdbusaddons -, kded -, ki18n -, kiconthemes -, kio -, knotifications -, kwidgetsaddons -, kwindowsystem -, plasma-framework -, qtdeclarative +{ plasmaPackage, extra-cmake-modules, bluez-qt, kcoreaddons +, kdbusaddons, kded, ki18n, kiconthemes, kio, knotifications +, kwidgetsaddons, kwindowsystem, plasma-framework, qtdeclarative , shared_mime_info }: @@ -19,18 +8,11 @@ plasmaPackage { name = "bluedevil"; nativeBuildInputs = [ extra-cmake-modules shared_mime_info ]; buildInputs = [ - bluez-qt - kcoreaddons - kdbusaddons - kded - ki18n - kiconthemes - kio - knotifications + kcoreaddons kdbusaddons kded kiconthemes knotifications kwidgetsaddons - kwindowsystem - plasma-framework - qtdeclarative + ]; + propagatedBuildInputs = [ + baloo bluez-qt ki18n kio kwindowsystem plasma-framework qtdeclarative ]; postInstall = '' wrapKDEProgram "$out/bin/bluedevil-wizard" From 3e67cf4f01bc804bc8e4004864bdffed6c8abef1 Mon Sep 17 00:00:00 2001 From: Thomas Tuegel Date: Sat, 10 Oct 2015 09:55:04 -0500 Subject: [PATCH 018/162] propagate frameworkintegration dependencies --- pkgs/desktops/plasma-5.4/breeze-qt5.nix | 26 +++++---------------- pkgs/desktops/plasma-5.4/oxygen.nix | 30 +++++-------------------- 2 files changed, 12 insertions(+), 44 deletions(-) diff --git a/pkgs/desktops/plasma-5.4/breeze-qt5.nix b/pkgs/desktops/plasma-5.4/breeze-qt5.nix index ea769b1e282c..bf582f1a4061 100644 --- a/pkgs/desktops/plasma-5.4/breeze-qt5.nix +++ b/pkgs/desktops/plasma-5.4/breeze-qt5.nix @@ -1,14 +1,6 @@ -{ plasmaPackage -, extra-cmake-modules -, frameworkintegration -, kcmutils -, kconfigwidgets -, kcoreaddons -, kdecoration -, kguiaddons -, ki18n -, kwindowsystem -, qtx11extras +{ plasmaPackage, extra-cmake-modules, frameworkintegration +, kcmutils, kconfigwidgets, kcoreaddons, kdecoration, kguiaddons +, ki18n, kwindowsystem, qtx11extras }: plasmaPackage { @@ -18,16 +10,10 @@ plasmaPackage { extra-cmake-modules ]; buildInputs = [ - frameworkintegration - kcmutils - kconfigwidgets - kcoreaddons - kdecoration - kguiaddons - ki18n - kwindowsystem - qtx11extras + kcmutils kconfigwidgets kcoreaddons kdecoration kguiaddons ki18n + kwindowsystem qtx11extras ]; + propagatedBuildInputs = [ frameworkintegration ]; cmakeFlags = [ "-DUSE_KDE4=OFF" ]; postInstall = '' wrapKDEProgram "$out/bin/breeze-settings5" diff --git a/pkgs/desktops/plasma-5.4/oxygen.nix b/pkgs/desktops/plasma-5.4/oxygen.nix index 5d221bc92b63..1dba49d93f4e 100644 --- a/pkgs/desktops/plasma-5.4/oxygen.nix +++ b/pkgs/desktops/plasma-5.4/oxygen.nix @@ -1,16 +1,6 @@ -{ plasmaPackage -, extra-cmake-modules -, ki18n -, kcmutils -, kconfig -, kdecoration -, kguiaddons -, kwidgetsaddons -, kservice -, kcompletion -, frameworkintegration -, kwindowsystem -, qtx11extras +{ plasmaPackage, extra-cmake-modules, ki18n, kcmutils, kconfig +, kdecoration, kguiaddons, kwidgetsaddons, kservice, kcompletion +, frameworkintegration, kwindowsystem, qtx11extras }: plasmaPackage { @@ -19,18 +9,10 @@ plasmaPackage { extra-cmake-modules ]; buildInputs = [ - ki18n - kcmutils - kconfig - kdecoration - kguiaddons - kwidgetsaddons - kservice - kcompletion - frameworkintegration - kwindowsystem - qtx11extras + ki18n kcmutils kconfig kdecoration kguiaddons kwidgetsaddons + kservice kcompletion kwindowsystem qtx11extras ]; + propagatedBuildInputs = [ frameworkintegration ]; postInstall = '' wrapKDEProgram "$out/bin/oxygen-demo5" wrapKDEProgram "$out/bin/oxygen-settings5" From cf1c90837751f8e4b727a97a8e689131fd858d61 Mon Sep 17 00:00:00 2001 From: Thomas Tuegel Date: Sat, 10 Oct 2015 09:58:23 -0500 Subject: [PATCH 019/162] propagate kactivities dependencies --- pkgs/applications/kde-apps-15.08/dolphin.nix | 2 +- pkgs/applications/kde-apps-15.08/gwenview.nix | 2 +- pkgs/applications/kde-apps-15.08/kate.nix | 4 +- pkgs/desktops/plasma-5.4/kwin/default.nix | 81 +++---------------- .../plasma-5.4/plasma-desktop/default.nix | 4 +- .../plasma-5.4/plasma-mediacenter.nix | 4 +- .../plasma-5.4/plasma-workspace/default.nix | 4 +- pkgs/desktops/plasma-5.4/powerdevil.nix | 41 ++-------- .../plasma-framework/default.nix | 31 ++----- 9 files changed, 39 insertions(+), 134 deletions(-) diff --git a/pkgs/applications/kde-apps-15.08/dolphin.nix b/pkgs/applications/kde-apps-15.08/dolphin.nix index 2b886b63d146..e61d322d435b 100644 --- a/pkgs/applications/kde-apps-15.08/dolphin.nix +++ b/pkgs/applications/kde-apps-15.08/dolphin.nix @@ -49,7 +49,6 @@ kdeApp { ktexteditor kwindowsystem knotifications - kactivities phonon baloo-widgets kfilemetadata @@ -57,6 +56,7 @@ kdeApp { ]; propagatedBuildInputs = [ baloo + kactivities ]; meta = { license = with lib.licenses; [ gpl2 fdl12 ]; diff --git a/pkgs/applications/kde-apps-15.08/gwenview.nix b/pkgs/applications/kde-apps-15.08/gwenview.nix index 4a83209dc0cf..97cb2dd0502b 100644 --- a/pkgs/applications/kde-apps-15.08/gwenview.nix +++ b/pkgs/applications/kde-apps-15.08/gwenview.nix @@ -21,7 +21,6 @@ kdeApp { ]; buildInputs = [ exiv2 - kactivities kdelibs4support kio lcms2 @@ -30,6 +29,7 @@ kdeApp { ]; propagatedBuildInputs = [ baloo + kactivities qtx11extras ]; meta = { diff --git a/pkgs/applications/kde-apps-15.08/kate.nix b/pkgs/applications/kde-apps-15.08/kate.nix index b24ef0b863f6..39db56edb059 100644 --- a/pkgs/applications/kde-apps-15.08/kate.nix +++ b/pkgs/applications/kde-apps-15.08/kate.nix @@ -34,7 +34,6 @@ kdeApp { ]; buildInputs = [ qtscript - kactivities kconfig kcrash kguiaddons @@ -56,6 +55,9 @@ kdeApp { knewstuff libgit2 ]; + propagatedBuildInputs = [ + kactivities + ]; meta = { license = with lib.licenses; [ gpl3 lgpl3 lgpl2 ]; maintainers = [ lib.maintainers.ttuegel ]; diff --git a/pkgs/desktops/plasma-5.4/kwin/default.nix b/pkgs/desktops/plasma-5.4/kwin/default.nix index 429d336f661a..958bc45180a3 100644 --- a/pkgs/desktops/plasma-5.4/kwin/default.nix +++ b/pkgs/desktops/plasma-5.4/kwin/default.nix @@ -1,39 +1,10 @@ -{ plasmaPackage -, extra-cmake-modules -, kdoctools -, epoxy -, kactivities -, kcompletion -, kcmutils -, kconfig -, kconfigwidgets -, kcoreaddons -, kcrash -, kdeclarative -, kdecoration -, kglobalaccel -, ki18n -, kiconthemes -, kinit -, kio -, knewstuff -, knotifications -, kpackage -, kservice -, kwayland -, kwidgetsaddons -, kwindowsystem -, kxmlgui -, libinput -, libICE -, libSM -, plasma-framework -, qtdeclarative -, qtscript -, qtx11extras -, udev -, wayland -, xcb-util-cursor +{ plasmaPackage, extra-cmake-modules, kdoctools, epoxy +, kactivities, kcompletion, kcmutils, kconfig, kconfigwidgets +, kcoreaddons, kcrash, kdeclarative, kdecoration, kglobalaccel +, ki18n, kiconthemes, kinit, kio, knewstuff, knotifications +, kpackage, kservice, kwayland, kwidgetsaddons, kwindowsystem +, kxmlgui, libinput, libICE, libSM, plasma-framework, qtdeclarative +, qtscript, qtx11extras, udev, wayland, xcb-util-cursor }: plasmaPackage { @@ -43,40 +14,14 @@ plasmaPackage { kdoctools ]; buildInputs = [ - epoxy - kactivities - kcompletion - kcmutils - kconfig - kconfigwidgets - kcoreaddons - kcrash - kdeclarative - kdecoration - kglobalaccel - ki18n - kiconthemes - kinit - kio - knewstuff - knotifications - kpackage - kservice - kwayland - kwidgetsaddons - kwindowsystem - kxmlgui - libinput - libICE - libSM - plasma-framework - qtdeclarative - qtscript - qtx11extras - udev - wayland + epoxy kcompletion kcmutils kconfig kconfigwidgets kcoreaddons + kcrash kdeclarative kdecoration kglobalaccel ki18n kiconthemes + kinit kio knewstuff knotifications kpackage kservice kwayland + kwidgetsaddons kwindowsystem kxmlgui libinput libICE libSM + plasma-framework qtdeclarative qtscript qtx11extras udev wayland xcb-util-cursor ]; + propagatedBuildInputs = [ kactivities ]; patches = [ ./kwin-import-plugin-follow-symlinks.patch ]; postInstall = '' wrapKDEProgram "$out/bin/kwin_x11" diff --git a/pkgs/desktops/plasma-5.4/plasma-desktop/default.nix b/pkgs/desktops/plasma-5.4/plasma-desktop/default.nix index 76ddb520fed5..99932ba63c3f 100644 --- a/pkgs/desktops/plasma-5.4/plasma-desktop/default.nix +++ b/pkgs/desktops/plasma-5.4/plasma-desktop/default.nix @@ -16,7 +16,7 @@ plasmaPackage { kdoctools ]; buildInputs = [ - attica boost fontconfig kactivities kauth kcmutils + attica boost fontconfig kauth kcmutils kdbusaddons kdeclarative kded kdelibs4support kemoticons kglobalaccel ki18n kitemmodels knewstuff knotifications knotifyconfig kpeople krunner kwallet kwin libcanberra_kde @@ -24,7 +24,7 @@ plasmaPackage { plasma-workspace qtdeclarative qtx11extras qtsvg xf86inputevdev xf86inputsynaptics xkeyboard_config xinput ]; - propagatedBuildInputs = [ baloo ]; + propagatedBuildInputs = [ baloo kactivities ]; patches = [ (substituteAll { src = ./0001-hwclock.patch; diff --git a/pkgs/desktops/plasma-5.4/plasma-mediacenter.nix b/pkgs/desktops/plasma-5.4/plasma-mediacenter.nix index 27ae27012bc9..b5b479c2d5e6 100644 --- a/pkgs/desktops/plasma-5.4/plasma-mediacenter.nix +++ b/pkgs/desktops/plasma-5.4/plasma-mediacenter.nix @@ -10,9 +10,9 @@ plasmaPackage { extra-cmake-modules ]; buildInputs = [ - kactivities kconfig kcoreaddons kdeclarative kguiaddons ki18n kio + kconfig kcoreaddons kdeclarative kguiaddons ki18n kio kservice kfilemetadata plasma-framework qtdeclarative qtmultimedia taglib ]; - propagatedBuildInputs = [ baloo ]; + propagatedBuildInputs = [ baloo kactivities ]; } diff --git a/pkgs/desktops/plasma-5.4/plasma-workspace/default.nix b/pkgs/desktops/plasma-5.4/plasma-workspace/default.nix index f1c44536a52e..900036a2867b 100644 --- a/pkgs/desktops/plasma-5.4/plasma-workspace/default.nix +++ b/pkgs/desktops/plasma-5.4/plasma-workspace/default.nix @@ -17,7 +17,7 @@ plasmaPackage { kdoctools ]; buildInputs = [ - kactivities kcmutils kcrash kdbusaddons kdeclarative + kcmutils kcrash kdbusaddons kdeclarative kdelibs4support kdesu kdewebkit kglobalaccel kidletime kjsembed knewstuff knotifyconfig kpackage krunner ktexteditor ktextwidgets kwallet kwayland kwin kxmlrpcclient libdbusmenu libkscreen libSM @@ -25,7 +25,7 @@ plasmaPackage { qtscript qtx11extras solid wayland ]; propagatedBuildInputs = [ - baloo libksysguard + baloo kactivities libksysguard ]; patches = [ ./0001-startkde-NixOS-patches.patch ]; diff --git a/pkgs/desktops/plasma-5.4/powerdevil.nix b/pkgs/desktops/plasma-5.4/powerdevil.nix index 9427638936e5..48ca659c6f7b 100644 --- a/pkgs/desktops/plasma-5.4/powerdevil.nix +++ b/pkgs/desktops/plasma-5.4/powerdevil.nix @@ -1,21 +1,7 @@ -{ plasmaPackage -, extra-cmake-modules -, kdoctools -, kactivities -, kauth -, kconfig -, kdbusaddons -, kdelibs4support -, kglobalaccel -, ki18n -, kidletime -, kio -, knotifyconfig -, libkscreen -, plasma-workspace -, qtx11extras -, solid -, udev +{ plasmaPackage, extra-cmake-modules, kdoctools, kactivities +, kauth, kconfig, kdbusaddons, kdelibs4support, kglobalaccel, ki18n +, kidletime, kio, knotifyconfig, libkscreen, plasma-workspace +, qtx11extras, solid, udev }: plasmaPackage { @@ -25,20 +11,9 @@ plasmaPackage { kdoctools ]; buildInputs = [ - kactivities - kauth - kconfig - kdbusaddons - kdelibs4support - kglobalaccel - ki18n - kidletime - kio - knotifyconfig - libkscreen - plasma-workspace - qtx11extras - solid - udev + kauth kconfig kdbusaddons kdelibs4support kglobalaccel ki18n + kidletime kio knotifyconfig libkscreen plasma-workspace + qtx11extras solid udev ]; + propagatedBuildInputs = [ kactivities ]; } diff --git a/pkgs/development/libraries/kde-frameworks-5.14/plasma-framework/default.nix b/pkgs/development/libraries/kde-frameworks-5.14/plasma-framework/default.nix index d838996f99c7..10ba63efdfd2 100644 --- a/pkgs/development/libraries/kde-frameworks-5.14/plasma-framework/default.nix +++ b/pkgs/development/libraries/kde-frameworks-5.14/plasma-framework/default.nix @@ -1,36 +1,19 @@ -{ kdeFramework, lib -, extra-cmake-modules -, kactivities -, karchive -, kconfig -, kconfigwidgets -, kcoreaddons -, kdbusaddons -, kdeclarative -, kdoctools -, kglobalaccel -, kguiaddons -, ki18n -, kiconthemes -, kio -, knotifications -, kpackage -, kservice -, kwindowsystem -, kxmlgui -, qtscript -, qtx11extras +{ kdeFramework, lib, extra-cmake-modules, kactivities, karchive +, kconfig, kconfigwidgets, kcoreaddons, kdbusaddons, kdeclarative +, kdoctools, kglobalaccel, kguiaddons, ki18n, kiconthemes, kio +, knotifications, kpackage, kservice, kwindowsystem, kxmlgui +, qtscript, qtx11extras }: kdeFramework { name = "plasma-framework"; nativeBuildInputs = [ extra-cmake-modules kdoctools ]; buildInputs = [ - kactivities karchive kconfig kconfigwidgets kcoreaddons + karchive kconfig kconfigwidgets kcoreaddons kdbusaddons kdeclarative kglobalaccel kguiaddons ki18n kiconthemes kio knotifications kwindowsystem kxmlgui qtscript qtx11extras ]; - propagatedBuildInputs = [ kpackage kservice ]; + propagatedBuildInputs = [ kactivities kpackage kservice ]; postInstall = '' wrapKDEProgram "$out/bin/plasmapkg2" ''; From d013d746b62019654b9514d28c10b18ce713641a Mon Sep 17 00:00:00 2001 From: Thomas Tuegel Date: Sat, 10 Oct 2015 10:01:52 -0500 Subject: [PATCH 020/162] propagate kauth dependencies --- pkgs/desktops/plasma-5.4/libksysguard.nix | 4 +- .../plasma-5.4/plasma-desktop/default.nix | 4 +- pkgs/desktops/plasma-5.4/powerdevil.nix | 4 +- .../libraries/kde-frameworks-5.14/baloo.nix | 33 +++------------ .../kconfigwidgets/default.nix | 11 +---- .../kde-frameworks-5.14/kdelibs4support.nix | 40 ++++--------------- 6 files changed, 20 insertions(+), 76 deletions(-) diff --git a/pkgs/desktops/plasma-5.4/libksysguard.nix b/pkgs/desktops/plasma-5.4/libksysguard.nix index 73cb38d89da5..afcb8a35b7ce 100644 --- a/pkgs/desktops/plasma-5.4/libksysguard.nix +++ b/pkgs/desktops/plasma-5.4/libksysguard.nix @@ -10,11 +10,11 @@ plasmaPackage { extra-cmake-modules ]; buildInputs = [ - kauth kcompletion kconfigwidgets kcoreaddons kservice + kcompletion kconfigwidgets kcoreaddons kservice kwidgetsaddons kwindowsystem plasma-framework qtscript qtwebkit qtx11extras ]; propagatedBuildInputs = [ - kconfig ki18n kiconthemes + kauth kconfig ki18n kiconthemes ]; } diff --git a/pkgs/desktops/plasma-5.4/plasma-desktop/default.nix b/pkgs/desktops/plasma-5.4/plasma-desktop/default.nix index 99932ba63c3f..be0920457819 100644 --- a/pkgs/desktops/plasma-5.4/plasma-desktop/default.nix +++ b/pkgs/desktops/plasma-5.4/plasma-desktop/default.nix @@ -16,7 +16,7 @@ plasmaPackage { kdoctools ]; buildInputs = [ - attica boost fontconfig kauth kcmutils + attica boost fontconfig kcmutils kdbusaddons kdeclarative kded kdelibs4support kemoticons kglobalaccel ki18n kitemmodels knewstuff knotifications knotifyconfig kpeople krunner kwallet kwin libcanberra_kde @@ -24,7 +24,7 @@ plasmaPackage { plasma-workspace qtdeclarative qtx11extras qtsvg xf86inputevdev xf86inputsynaptics xkeyboard_config xinput ]; - propagatedBuildInputs = [ baloo kactivities ]; + propagatedBuildInputs = [ baloo kactivities kauth ]; patches = [ (substituteAll { src = ./0001-hwclock.patch; diff --git a/pkgs/desktops/plasma-5.4/powerdevil.nix b/pkgs/desktops/plasma-5.4/powerdevil.nix index 48ca659c6f7b..2d3a5521e7da 100644 --- a/pkgs/desktops/plasma-5.4/powerdevil.nix +++ b/pkgs/desktops/plasma-5.4/powerdevil.nix @@ -11,9 +11,9 @@ plasmaPackage { kdoctools ]; buildInputs = [ - kauth kconfig kdbusaddons kdelibs4support kglobalaccel ki18n + kconfig kdbusaddons kdelibs4support kglobalaccel ki18n kidletime kio knotifyconfig libkscreen plasma-workspace qtx11extras solid udev ]; - propagatedBuildInputs = [ kactivities ]; + propagatedBuildInputs = [ kactivities kauth ]; } diff --git a/pkgs/development/libraries/kde-frameworks-5.14/baloo.nix b/pkgs/development/libraries/kde-frameworks-5.14/baloo.nix index 8b6b3509f0db..59133e404323 100644 --- a/pkgs/development/libraries/kde-frameworks-5.14/baloo.nix +++ b/pkgs/development/libraries/kde-frameworks-5.14/baloo.nix @@ -1,39 +1,16 @@ -{ kdeFramework, lib -, extra-cmake-modules -, kauth -, kconfig -, kcoreaddons -, kcrash -, kdbusaddons -, kfilemetadata -, ki18n -, kidletime -, kio -, lmdb -, qtbase -, qtquick1 -, solid +{ kdeFramework, lib, extra-cmake-modules, kauth, kconfig +, kcoreaddons, kcrash, kdbusaddons, kfilemetadata, ki18n, kidletime +, kio, lmdb, qtbase, qtquick1, solid }: kdeFramework { name = "baloo"; nativeBuildInputs = [ extra-cmake-modules ]; buildInputs = [ - kauth - kconfig - kcrash - kdbusaddons - ki18n - kidletime - kio - lmdb - qtquick1 - solid + kconfig kcrash kdbusaddons ki18n kidletime kio lmdb qtquick1 solid ]; propagatedBuildInputs = [ - kcoreaddons - kfilemetadata - qtbase + kauth kcoreaddons kfilemetadata qtbase ]; postInstall = '' wrapKDEProgram "$out/bin/baloo_file" diff --git a/pkgs/development/libraries/kde-frameworks-5.14/kconfigwidgets/default.nix b/pkgs/development/libraries/kde-frameworks-5.14/kconfigwidgets/default.nix index d16f7f92bea3..aa6fe8770814 100644 --- a/pkgs/development/libraries/kde-frameworks-5.14/kconfigwidgets/default.nix +++ b/pkgs/development/libraries/kde-frameworks-5.14/kconfigwidgets/default.nix @@ -1,12 +1,5 @@ -{ kdeFramework, lib -, extra-cmake-modules -, kauth -, kcodecs -, kconfig -, kdoctools -, kguiaddons -, ki18n -, kwidgetsaddons +{ kdeFramework, lib, extra-cmake-modules, kauth, kcodecs, kconfig +, kdoctools, kguiaddons, ki18n, kwidgetsaddons }: kdeFramework { diff --git a/pkgs/development/libraries/kde-frameworks-5.14/kdelibs4support.nix b/pkgs/development/libraries/kde-frameworks-5.14/kdelibs4support.nix index f54fa3e9be65..cec5f268c21c 100644 --- a/pkgs/development/libraries/kde-frameworks-5.14/kdelibs4support.nix +++ b/pkgs/development/libraries/kde-frameworks-5.14/kdelibs4support.nix @@ -1,36 +1,10 @@ -{ kdeFramework, lib -, extra-cmake-modules -, docbook_xml_dtd_45 -, kauth -, karchive -, kcompletion -, kconfig -, kconfigwidgets -, kcoreaddons -, kcrash -, kdbusaddons -, kdesignerplugin -, kdoctools -, kemoticons -, kglobalaccel -, kguiaddons -, ki18n -, kiconthemes -, kio -, kitemmodels -, kinit -, knotifications -, kparts -, kservice -, ktextwidgets -, kunitconversion -, kwidgetsaddons -, kwindowsystem -, kxmlgui -, networkmanager -, qtsvg -, qtx11extras -, xlibs +{ kdeFramework, lib, extra-cmake-modules, docbook_xml_dtd_45, kauth +, karchive, kcompletion, kconfig, kconfigwidgets, kcoreaddons +, kcrash, kdbusaddons, kdesignerplugin, kdoctools, kemoticons +, kglobalaccel, kguiaddons, ki18n, kiconthemes, kio, kitemmodels +, kinit, knotifications, kparts, kservice, ktextwidgets +, kunitconversion, kwidgetsaddons, kwindowsystem, kxmlgui +, networkmanager, qtsvg, qtx11extras, xlibs }: # TODO: debug docbook detection From c21da82680dc3d20e42dc25eed137783cbff1f76 Mon Sep 17 00:00:00 2001 From: Thomas Tuegel Date: Sat, 10 Oct 2015 10:06:36 -0500 Subject: [PATCH 021/162] propagate kdeclarative dependencies --- pkgs/desktops/plasma-5.4/kinfocenter.nix | 47 +++----------- pkgs/desktops/plasma-5.4/kwin/default.nix | 4 +- pkgs/desktops/plasma-5.4/milou.nix | 21 ++----- .../plasma-5.4/plasma-desktop/default.nix | 4 +- .../plasma-5.4/plasma-mediacenter.nix | 4 +- pkgs/desktops/plasma-5.4/plasma-nm.nix | 62 ++++--------------- pkgs/desktops/plasma-5.4/plasma-pa.nix | 20 ++---- .../plasma-5.4/plasma-workspace/default.nix | 4 +- .../kde-frameworks-5.14/kactivities.nix | 34 ++-------- .../kde-frameworks-5.14/kcmutils/default.nix | 24 ++----- .../plasma-framework/default.nix | 4 +- 11 files changed, 49 insertions(+), 179 deletions(-) diff --git a/pkgs/desktops/plasma-5.4/kinfocenter.nix b/pkgs/desktops/plasma-5.4/kinfocenter.nix index 89a3b4643830..11e7c6af6fd0 100644 --- a/pkgs/desktops/plasma-5.4/kinfocenter.nix +++ b/pkgs/desktops/plasma-5.4/kinfocenter.nix @@ -1,24 +1,7 @@ -{ plasmaPackage -, extra-cmake-modules -, kdoctools -, kcmutils -, kcompletion -, kconfig -, kconfigwidgets -, kcoreaddons -, kdbusaddons -, kdeclarative -, kdelibs4support -, ki18n -, kiconthemes -, kio -, kpackage -, kservice -, kwidgetsaddons -, kxmlgui -, libraw1394 -, pciutils -, solid +{ plasmaPackage, extra-cmake-modules, kdoctools, kcmutils +, kcompletion, kconfig, kconfigwidgets, kcoreaddons, kdbusaddons +, kdeclarative, kdelibs4support, ki18n, kiconthemes, kio, kpackage +, kservice, kwidgetsaddons, kxmlgui, libraw1394, pciutils, solid }: plasmaPackage { @@ -28,25 +11,11 @@ plasmaPackage { kdoctools ]; buildInputs = [ - kcmutils - kcompletion - kconfig - kconfigwidgets - kcoreaddons - kdbusaddons - kdeclarative - kdelibs4support - ki18n - kiconthemes - kio - kpackage - kservice - kwidgetsaddons - kxmlgui - libraw1394 - pciutils - solid + kcmutils kcompletion kconfig kconfigwidgets kcoreaddons + kdbusaddons kdelibs4support ki18n kiconthemes kio kpackage + kservice kwidgetsaddons kxmlgui libraw1394 pciutils solid ]; + propagatedBuildInputs = [ kdeclarative ]; postInstall = '' wrapKDEProgram "$out/bin/kinfocenter" ''; diff --git a/pkgs/desktops/plasma-5.4/kwin/default.nix b/pkgs/desktops/plasma-5.4/kwin/default.nix index 958bc45180a3..e01a5bfed013 100644 --- a/pkgs/desktops/plasma-5.4/kwin/default.nix +++ b/pkgs/desktops/plasma-5.4/kwin/default.nix @@ -15,13 +15,13 @@ plasmaPackage { ]; buildInputs = [ epoxy kcompletion kcmutils kconfig kconfigwidgets kcoreaddons - kcrash kdeclarative kdecoration kglobalaccel ki18n kiconthemes + kcrash kdecoration kglobalaccel ki18n kiconthemes kinit kio knewstuff knotifications kpackage kservice kwayland kwidgetsaddons kwindowsystem kxmlgui libinput libICE libSM plasma-framework qtdeclarative qtscript qtx11extras udev wayland xcb-util-cursor ]; - propagatedBuildInputs = [ kactivities ]; + propagatedBuildInputs = [ kactivities kdeclarative ]; patches = [ ./kwin-import-plugin-follow-symlinks.patch ]; postInstall = '' wrapKDEProgram "$out/bin/kwin_x11" diff --git a/pkgs/desktops/plasma-5.4/milou.nix b/pkgs/desktops/plasma-5.4/milou.nix index 86698e8aee63..767848ccc0e2 100644 --- a/pkgs/desktops/plasma-5.4/milou.nix +++ b/pkgs/desktops/plasma-5.4/milou.nix @@ -1,12 +1,5 @@ -{ plasmaPackage -, extra-cmake-modules -, qtscript -, qtdeclarative -, kcoreaddons -, ki18n -, kdeclarative -, kservice -, plasma-framework +{ plasmaPackage, extra-cmake-modules, qtscript, qtdeclarative +, kcoreaddons, ki18n, kdeclarative, kservice, plasma-framework , krunner }: @@ -16,13 +9,7 @@ plasmaPackage { extra-cmake-modules ]; buildInputs = [ - qtscript - qtdeclarative - kcoreaddons - ki18n - kdeclarative - kservice - plasma-framework - krunner + qtscript kcoreaddons ki18n kservice plasma-framework krunner ]; + propagatedBuildInputs = [ kdeclarative qtdeclarative ]; } diff --git a/pkgs/desktops/plasma-5.4/plasma-desktop/default.nix b/pkgs/desktops/plasma-5.4/plasma-desktop/default.nix index be0920457819..9061cef1e87a 100644 --- a/pkgs/desktops/plasma-5.4/plasma-desktop/default.nix +++ b/pkgs/desktops/plasma-5.4/plasma-desktop/default.nix @@ -17,14 +17,14 @@ plasmaPackage { ]; buildInputs = [ attica boost fontconfig kcmutils - kdbusaddons kdeclarative kded kdelibs4support kemoticons + kdbusaddons kded kdelibs4support kemoticons kglobalaccel ki18n kitemmodels knewstuff knotifications knotifyconfig kpeople krunner kwallet kwin libcanberra_kde libXcursor libpulseaudio libXft libxkbfile phonon plasma-framework plasma-workspace qtdeclarative qtx11extras qtsvg xf86inputevdev xf86inputsynaptics xkeyboard_config xinput ]; - propagatedBuildInputs = [ baloo kactivities kauth ]; + propagatedBuildInputs = [ baloo kactivities kauth kdeclarative ]; patches = [ (substituteAll { src = ./0001-hwclock.patch; diff --git a/pkgs/desktops/plasma-5.4/plasma-mediacenter.nix b/pkgs/desktops/plasma-5.4/plasma-mediacenter.nix index b5b479c2d5e6..d86d9f1c6872 100644 --- a/pkgs/desktops/plasma-5.4/plasma-mediacenter.nix +++ b/pkgs/desktops/plasma-5.4/plasma-mediacenter.nix @@ -10,9 +10,9 @@ plasmaPackage { extra-cmake-modules ]; buildInputs = [ - kconfig kcoreaddons kdeclarative kguiaddons ki18n kio + kconfig kcoreaddons kguiaddons ki18n kio kservice kfilemetadata plasma-framework qtdeclarative qtmultimedia taglib ]; - propagatedBuildInputs = [ baloo kactivities ]; + propagatedBuildInputs = [ baloo kactivities kdeclarative ]; } diff --git a/pkgs/desktops/plasma-5.4/plasma-nm.nix b/pkgs/desktops/plasma-5.4/plasma-nm.nix index 1cf3ec27b36e..c7ddf6e89efa 100644 --- a/pkgs/desktops/plasma-5.4/plasma-nm.nix +++ b/pkgs/desktops/plasma-5.4/plasma-nm.nix @@ -1,29 +1,9 @@ -{ plasmaPackage -, extra-cmake-modules -, kdoctools -, kcompletion -, kconfigwidgets -, kcoreaddons -, kdbusaddons -, kdeclarative -, kdelibs4support -, ki18n -, kiconthemes -, kinit -, kio -, kitemviews -, knotifications -, kservice -, kwallet -, kwidgetsaddons -, kwindowsystem -, kxmlgui -, mobile_broadband_provider_info -, modemmanager-qt -, networkmanager-qt -, openconnect -, plasma-framework -, qtdeclarative +{ plasmaPackage, extra-cmake-modules, kdoctools, kcompletion +, kconfigwidgets, kcoreaddons, kdbusaddons, kdeclarative +, kdelibs4support, ki18n, kiconthemes, kinit, kio, kitemviews +, knotifications, kservice, kwallet, kwidgetsaddons, kwindowsystem +, kxmlgui, mobile_broadband_provider_info, modemmanager-qt +, networkmanager-qt, openconnect, plasma-framework, qtdeclarative , solid }: @@ -34,31 +14,13 @@ plasmaPackage { kdoctools ]; buildInputs = [ - kcompletion - kconfigwidgets - kcoreaddons - kdbusaddons - kdeclarative - kdelibs4support - ki18n - kiconthemes - kinit - kio - kitemviews - knotifications - kservice - kwallet - kwidgetsaddons - kwindowsystem - kxmlgui - mobile_broadband_provider_info - modemmanager-qt - networkmanager-qt - openconnect - plasma-framework - qtdeclarative - solid + kcompletion kconfigwidgets kcoreaddons kdbusaddons kdelibs4support + ki18n kiconthemes kinit kio kitemviews knotifications kservice + kwallet kwidgetsaddons kwindowsystem kxmlgui + mobile_broadband_provider_info modemmanager-qt networkmanager-qt + openconnect plasma-framework qtdeclarative solid ]; + propagatedBuildInputs = [ kdeclarative ]; postInstall = '' wrapKDEProgram "$out/bin/kde5-nm-connection-editor" ''; diff --git a/pkgs/desktops/plasma-5.4/plasma-pa.nix b/pkgs/desktops/plasma-5.4/plasma-pa.nix index e82a5b814a6a..a5cc11d89ae9 100644 --- a/pkgs/desktops/plasma-5.4/plasma-pa.nix +++ b/pkgs/desktops/plasma-5.4/plasma-pa.nix @@ -1,12 +1,5 @@ -{ plasmaPackage -, extra-cmake-modules -, glib -, kconfigwidgets -, kcoreaddons -, kdeclarative -, kglobalaccel -, ki18n -, libpulseaudio +{ plasmaPackage, extra-cmake-modules, glib, kconfigwidgets +, kcoreaddons, kdeclarative, kglobalaccel, ki18n, libpulseaudio , plasma-framework }: @@ -16,13 +9,8 @@ plasmaPackage { extra-cmake-modules ]; buildInputs = [ - glib - kconfigwidgets - kcoreaddons - kdeclarative - kglobalaccel - ki18n - libpulseaudio + glib kconfigwidgets kcoreaddons kglobalaccel ki18n libpulseaudio plasma-framework ]; + propagatedBuildInputs = [ kdeclarative ]; } diff --git a/pkgs/desktops/plasma-5.4/plasma-workspace/default.nix b/pkgs/desktops/plasma-5.4/plasma-workspace/default.nix index 900036a2867b..b1e2010da319 100644 --- a/pkgs/desktops/plasma-5.4/plasma-workspace/default.nix +++ b/pkgs/desktops/plasma-5.4/plasma-workspace/default.nix @@ -17,7 +17,7 @@ plasmaPackage { kdoctools ]; buildInputs = [ - kcmutils kcrash kdbusaddons kdeclarative + kcmutils kcrash kdbusaddons kdelibs4support kdesu kdewebkit kglobalaccel kidletime kjsembed knewstuff knotifyconfig kpackage krunner ktexteditor ktextwidgets kwallet kwayland kwin kxmlrpcclient libdbusmenu libkscreen libSM @@ -25,7 +25,7 @@ plasmaPackage { qtscript qtx11extras solid wayland ]; propagatedBuildInputs = [ - baloo kactivities libksysguard + baloo kactivities kdeclarative libksysguard ]; patches = [ ./0001-startkde-NixOS-patches.patch ]; diff --git a/pkgs/development/libraries/kde-frameworks-5.14/kactivities.nix b/pkgs/development/libraries/kde-frameworks-5.14/kactivities.nix index c8e296bad805..ed0c7b6575ac 100644 --- a/pkgs/development/libraries/kde-frameworks-5.14/kactivities.nix +++ b/pkgs/development/libraries/kde-frameworks-5.14/kactivities.nix @@ -1,38 +1,16 @@ -{ kdeFramework, lib -, extra-cmake-modules -, boost -, kcmutils -, kconfig -, kcoreaddons -, kdbusaddons -, kdeclarative -, kglobalaccel -, ki18n -, kio -, kservice -, kwindowsystem -, kxmlgui -, qtdeclarative +{ kdeFramework, lib, extra-cmake-modules, boost, kcmutils, kconfig +, kcoreaddons, kdbusaddons, kdeclarative, kglobalaccel, ki18n +, kio, kservice, kwindowsystem, kxmlgui, qtdeclarative }: kdeFramework { name = "kactivities"; nativeBuildInputs = [ extra-cmake-modules ]; buildInputs = [ - boost - kcmutils - kconfig - kcoreaddons - kdbusaddons - kdeclarative - kglobalaccel - ki18n - kio - kservice - kwindowsystem - kxmlgui - qtdeclarative + boost kcmutils kconfig kcoreaddons kdbusaddons kglobalaccel ki18n + kio kservice kwindowsystem kxmlgui ]; + propagatedBuildInputs = [ kdeclarative qtdeclarative ]; postInstall = '' wrapKDEProgram "$out/bin/kactivitymanagerd" ''; diff --git a/pkgs/development/libraries/kde-frameworks-5.14/kcmutils/default.nix b/pkgs/development/libraries/kde-frameworks-5.14/kcmutils/default.nix index ac7a5af06a40..9fb366ae403c 100644 --- a/pkgs/development/libraries/kde-frameworks-5.14/kcmutils/default.nix +++ b/pkgs/development/libraries/kde-frameworks-5.14/kcmutils/default.nix @@ -1,29 +1,15 @@ -{ kdeFramework, lib -, extra-cmake-modules -, kconfigwidgets -, kcoreaddons -, kdeclarative -, ki18n -, kiconthemes -, kitemviews -, kpackage -, kservice -, kxmlgui +{ kdeFramework, lib, extra-cmake-modules, kconfigwidgets +, kcoreaddons, kdeclarative, ki18n, kiconthemes, kitemviews +, kpackage, kservice, kxmlgui }: kdeFramework { name = "kcmutils"; nativeBuildInputs = [ extra-cmake-modules ]; buildInputs = [ - kcoreaddons - kdeclarative - ki18n - kiconthemes - kitemviews - kpackage - kxmlgui + kcoreaddons ki18n kiconthemes kitemviews kpackage kxmlgui ]; - propagatedBuildInputs = [ kconfigwidgets kservice ]; + propagatedBuildInputs = [ kconfigwidgets kdeclarative kservice ]; patches = [ ./kcmutils-pluginselector-follow-symlinks.patch ]; meta = { maintainers = [ lib.maintainers.ttuegel ]; diff --git a/pkgs/development/libraries/kde-frameworks-5.14/plasma-framework/default.nix b/pkgs/development/libraries/kde-frameworks-5.14/plasma-framework/default.nix index 10ba63efdfd2..f9479aa39f62 100644 --- a/pkgs/development/libraries/kde-frameworks-5.14/plasma-framework/default.nix +++ b/pkgs/development/libraries/kde-frameworks-5.14/plasma-framework/default.nix @@ -10,10 +10,10 @@ kdeFramework { nativeBuildInputs = [ extra-cmake-modules kdoctools ]; buildInputs = [ karchive kconfig kconfigwidgets kcoreaddons - kdbusaddons kdeclarative kglobalaccel kguiaddons ki18n kiconthemes + kdbusaddons kglobalaccel kguiaddons ki18n kiconthemes kio knotifications kwindowsystem kxmlgui qtscript qtx11extras ]; - propagatedBuildInputs = [ kactivities kpackage kservice ]; + propagatedBuildInputs = [ kactivities kdeclarative kpackage kservice ]; postInstall = '' wrapKDEProgram "$out/bin/plasmapkg2" ''; From f4ca03fea005fc44cc89c0a8e57821345baa1375 Mon Sep 17 00:00:00 2001 From: Thomas Tuegel Date: Sat, 10 Oct 2015 11:19:37 -0500 Subject: [PATCH 022/162] propagate kdelibs4support dependencies --- .../kde-apps-15.08/baloo-widgets.nix | 2 +- .../kde-apps-15.08/dolphin-plugins.nix | 4 +- pkgs/applications/kde-apps-15.08/dolphin.nix | 2 +- pkgs/applications/kde-apps-15.08/gwenview.nix | 2 +- pkgs/applications/kde-apps-15.08/konsole.nix | 4 +- pkgs/desktops/plasma-5.4/kde-cli-tools.nix | 26 +++--------- pkgs/desktops/plasma-5.4/kdeplasma-addons.nix | 42 ++++--------------- pkgs/desktops/plasma-5.4/kgamma5.nix | 15 ++----- pkgs/desktops/plasma-5.4/khotkeys.nix | 29 +++---------- pkgs/desktops/plasma-5.4/kinfocenter.nix | 6 +-- pkgs/desktops/plasma-5.4/kmenuedit.nix | 21 ++-------- pkgs/desktops/plasma-5.4/ksysguard.nix | 23 +++------- .../plasma-5.4/plasma-desktop/default.nix | 5 +-- pkgs/desktops/plasma-5.4/plasma-nm.nix | 10 ++--- .../plasma-5.4/plasma-workspace/default.nix | 4 +- pkgs/desktops/plasma-5.4/powerdevil.nix | 4 +- 16 files changed, 53 insertions(+), 146 deletions(-) diff --git a/pkgs/applications/kde-apps-15.08/baloo-widgets.nix b/pkgs/applications/kde-apps-15.08/baloo-widgets.nix index 4501dcec7acf..6f469d19c85c 100644 --- a/pkgs/applications/kde-apps-15.08/baloo-widgets.nix +++ b/pkgs/applications/kde-apps-15.08/baloo-widgets.nix @@ -23,10 +23,10 @@ kdeApp { ki18n kservice kfilemetadata - kdelibs4support ]; propagatedBuildInputs = [ baloo + kdelibs4support ]; meta = { license = [ lib.licenses.lgpl21 ]; diff --git a/pkgs/applications/kde-apps-15.08/dolphin-plugins.nix b/pkgs/applications/kde-apps-15.08/dolphin-plugins.nix index 4eeec1c17e5b..5a3dbc2b635c 100644 --- a/pkgs/applications/kde-apps-15.08/dolphin-plugins.nix +++ b/pkgs/applications/kde-apps-15.08/dolphin-plugins.nix @@ -19,9 +19,11 @@ kdeApp { kxmlgui ki18n kio - kdelibs4support dolphin ]; + propagatedBuildInputs = [ + kdelibs4support + ]; meta = { license = [ lib.licenses.gpl2 ]; maintainers = [ lib.maintainers.ttuegel ]; diff --git a/pkgs/applications/kde-apps-15.08/dolphin.nix b/pkgs/applications/kde-apps-15.08/dolphin.nix index e61d322d435b..54657606d928 100644 --- a/pkgs/applications/kde-apps-15.08/dolphin.nix +++ b/pkgs/applications/kde-apps-15.08/dolphin.nix @@ -52,11 +52,11 @@ kdeApp { phonon baloo-widgets kfilemetadata - kdelibs4support ]; propagatedBuildInputs = [ baloo kactivities + kdelibs4support ]; meta = { license = with lib.licenses; [ gpl2 fdl12 ]; diff --git a/pkgs/applications/kde-apps-15.08/gwenview.nix b/pkgs/applications/kde-apps-15.08/gwenview.nix index 97cb2dd0502b..b53f78b8084c 100644 --- a/pkgs/applications/kde-apps-15.08/gwenview.nix +++ b/pkgs/applications/kde-apps-15.08/gwenview.nix @@ -21,7 +21,6 @@ kdeApp { ]; buildInputs = [ exiv2 - kdelibs4support kio lcms2 phonon @@ -30,6 +29,7 @@ kdeApp { propagatedBuildInputs = [ baloo kactivities + kdelibs4support qtx11extras ]; meta = { diff --git a/pkgs/applications/kde-apps-15.08/konsole.nix b/pkgs/applications/kde-apps-15.08/konsole.nix index 05cac334348e..a01e9c9adc87 100644 --- a/pkgs/applications/kde-apps-15.08/konsole.nix +++ b/pkgs/applications/kde-apps-15.08/konsole.nix @@ -42,7 +42,6 @@ kdeApp { ki18n kiconthemes kinit - kdelibs4support kio knotifications knotifyconfig @@ -54,6 +53,9 @@ kdeApp { kwindowsystem kxmlgui ]; + propagatedBuildInputs = [ + kdelibs4support + ]; meta = { license = with lib.licenses; [ gpl2 lgpl21 fdl12 ]; maintainers = [ lib.maintainers.ttuegel ]; diff --git a/pkgs/desktops/plasma-5.4/kde-cli-tools.nix b/pkgs/desktops/plasma-5.4/kde-cli-tools.nix index ce93bb86b325..045429af21b3 100644 --- a/pkgs/desktops/plasma-5.4/kde-cli-tools.nix +++ b/pkgs/desktops/plasma-5.4/kde-cli-tools.nix @@ -1,31 +1,15 @@ -{ plasmaPackage -, extra-cmake-modules -, kcmutils -, kconfig -, kdelibs4support -, kdesu -, kdoctools -, ki18n -, kiconthemes -, kwindowsystem -, qtsvg -, qtx11extras +{ plasmaPackage, extra-cmake-modules, kcmutils, kconfig +, kdelibs4support, kdesu, kdoctools, ki18n, kiconthemes +, kwindowsystem, qtsvg, qtx11extras }: plasmaPackage { name = "kde-cli-tools"; nativeBuildInputs = [ extra-cmake-modules kdoctools ]; buildInputs = [ - kcmutils - kconfig - kdelibs4support - kdesu - ki18n - kiconthemes - kwindowsystem - qtsvg - qtx11extras + kcmutils kconfig kdesu ki18n kiconthemes kwindowsystem ]; + propagatedBuildInputs = [ kdelibs4support qtsvg qtx11extras ]; postInstall = '' wrapKDEProgram "$out/bin/kmimetypefinder5" wrapKDEProgram "$out/bin/ksvgtopng5" diff --git a/pkgs/desktops/plasma-5.4/kdeplasma-addons.nix b/pkgs/desktops/plasma-5.4/kdeplasma-addons.nix index 3e7058315e57..9328db7ad0b9 100644 --- a/pkgs/desktops/plasma-5.4/kdeplasma-addons.nix +++ b/pkgs/desktops/plasma-5.4/kdeplasma-addons.nix @@ -1,22 +1,7 @@ -{ plasmaPackage -, extra-cmake-modules -, kdoctools -, ibus -, kconfig -, kconfigwidgets -, kcoreaddons -, kcmutils -, kdelibs4support -, ki18n -, kio -, knewstuff -, kross -, krunner -, kservice -, kunitconversion -, plasma-framework -, qtdeclarative -, qtx11extras +{ plasmaPackage, extra-cmake-modules, kdoctools, ibus, kconfig +, kconfigwidgets, kcoreaddons, kcmutils, kdelibs4support, ki18n +, kio, knewstuff, kross, krunner, kservice, kunitconversion +, plasma-framework, qtdeclarative, qtx11extras }: plasmaPackage { @@ -26,21 +11,8 @@ plasmaPackage { kdoctools ]; buildInputs = [ - ibus - kconfig - kconfigwidgets - kcoreaddons - kcmutils - kdelibs4support - ki18n - kio - knewstuff - kross - krunner - kservice - kunitconversion - plasma-framework - qtdeclarative - qtx11extras + ibus kconfig kconfigwidgets kcoreaddons kcmutils ki18n kio + knewstuff kross krunner kservice kunitconversion plasma-framework ]; + propagatedBuildInputs = [ kdelibs4support qtdeclarative qtx11extras ]; } diff --git a/pkgs/desktops/plasma-5.4/kgamma5.nix b/pkgs/desktops/plasma-5.4/kgamma5.nix index 8d954cc145a0..965c33e6eef8 100644 --- a/pkgs/desktops/plasma-5.4/kgamma5.nix +++ b/pkgs/desktops/plasma-5.4/kgamma5.nix @@ -1,18 +1,9 @@ -{ plasmaPackage -, extra-cmake-modules -, kdoctools -, kdelibs4support +{ plasmaPackage, extra-cmake-modules, kdoctools, kdelibs4support , qtx11extras }: plasmaPackage { name = "kgamma5"; - nativeBuildInputs = [ - extra-cmake-modules - kdoctools - ]; - buildInputs = [ - kdelibs4support - qtx11extras - ]; + nativeBuildInputs = [ extra-cmake-modules kdoctools ]; + propagatedBuildInputs = [ kdelibs4support qtx11extras ]; } diff --git a/pkgs/desktops/plasma-5.4/khotkeys.nix b/pkgs/desktops/plasma-5.4/khotkeys.nix index 02c43efd27e8..dc1e73ccdfe2 100644 --- a/pkgs/desktops/plasma-5.4/khotkeys.nix +++ b/pkgs/desktops/plasma-5.4/khotkeys.nix @@ -1,16 +1,6 @@ -{ plasmaPackage -, extra-cmake-modules -, kdoctools -, kcmutils -, kdbusaddons -, kdelibs4support -, kglobalaccel -, ki18n -, kio -, kxmlgui -, plasma-framework -, plasma-workspace -, qtx11extras +{ plasmaPackage, extra-cmake-modules, kdoctools, kcmutils +, kdbusaddons, kdelibs4support, kglobalaccel, ki18n, kio, kxmlgui +, plasma-framework, plasma-workspace, qtx11extras }: plasmaPackage { @@ -20,15 +10,8 @@ plasmaPackage { kdoctools ]; buildInputs = [ - kcmutils - kdbusaddons - kdelibs4support - kglobalaccel - ki18n - kio - kxmlgui - plasma-framework - plasma-workspace - qtx11extras + kcmutils kdbusaddons kglobalaccel ki18n kio kxmlgui + plasma-framework plasma-workspace ]; + propagatedBuildInputs = [ kdelibs4support qtx11extras ]; } diff --git a/pkgs/desktops/plasma-5.4/kinfocenter.nix b/pkgs/desktops/plasma-5.4/kinfocenter.nix index 11e7c6af6fd0..b76199ab5219 100644 --- a/pkgs/desktops/plasma-5.4/kinfocenter.nix +++ b/pkgs/desktops/plasma-5.4/kinfocenter.nix @@ -12,10 +12,10 @@ plasmaPackage { ]; buildInputs = [ kcmutils kcompletion kconfig kconfigwidgets kcoreaddons - kdbusaddons kdelibs4support ki18n kiconthemes kio kpackage - kservice kwidgetsaddons kxmlgui libraw1394 pciutils solid + kdbusaddons ki18n kiconthemes kio kpackage kservice kwidgetsaddons + kxmlgui libraw1394 pciutils solid ]; - propagatedBuildInputs = [ kdeclarative ]; + propagatedBuildInputs = [ kdeclarative kdelibs4support ]; postInstall = '' wrapKDEProgram "$out/bin/kinfocenter" ''; diff --git a/pkgs/desktops/plasma-5.4/kmenuedit.nix b/pkgs/desktops/plasma-5.4/kmenuedit.nix index d5eeb3c35730..b041d8dcedc8 100644 --- a/pkgs/desktops/plasma-5.4/kmenuedit.nix +++ b/pkgs/desktops/plasma-5.4/kmenuedit.nix @@ -1,13 +1,5 @@ -{ plasmaPackage -, extra-cmake-modules -, kdoctools -, ki18n -, kxmlgui -, kdbusaddons -, kiconthemes -, kio -, sonnet -, kdelibs4support +{ plasmaPackage, extra-cmake-modules, kdoctools, ki18n, kxmlgui +, kdbusaddons, kiconthemes, kio, sonnet, kdelibs4support }: plasmaPackage { @@ -17,14 +9,9 @@ plasmaPackage { kdoctools ]; buildInputs = [ - ki18n - kxmlgui - kdbusaddons - kiconthemes - kio - sonnet - kdelibs4support + ki18n kxmlgui kdbusaddons kiconthemes kio sonnet ]; + propagatedBuildInputs = [ kdelibs4support ]; postInstall = '' wrapKDEProgram "$out/bin/kmenuedit" ''; diff --git a/pkgs/desktops/plasma-5.4/ksysguard.nix b/pkgs/desktops/plasma-5.4/ksysguard.nix index 23a7c04cca20..d415e726d02f 100644 --- a/pkgs/desktops/plasma-5.4/ksysguard.nix +++ b/pkgs/desktops/plasma-5.4/ksysguard.nix @@ -1,14 +1,6 @@ -{ plasmaPackage -, extra-cmake-modules -, kdoctools -, kconfig -, kcoreaddons -, kdelibs4support -, ki18n -, kitemviews -, knewstuff -, kiconthemes -, libksysguard +{ plasmaPackage, extra-cmake-modules, kdoctools, kconfig +, kcoreaddons, kdelibs4support, ki18n, kitemviews, knewstuff +, kiconthemes, libksysguard }: plasmaPackage { @@ -18,15 +10,10 @@ plasmaPackage { kdoctools ]; buildInputs = [ - kconfig - kcoreaddons - kdelibs4support - ki18n - kitemviews - knewstuff - kiconthemes + kconfig kcoreaddons ki18n kitemviews knewstuff kiconthemes libksysguard ]; + propagatedBuildInputs = [ kdelibs4support ]; postInstall = '' wrapKDEProgram "$out/bin/ksysguardd" wrapKDEProgram "$out/bin/ksysguard" diff --git a/pkgs/desktops/plasma-5.4/plasma-desktop/default.nix b/pkgs/desktops/plasma-5.4/plasma-desktop/default.nix index 9061cef1e87a..489a4a143717 100644 --- a/pkgs/desktops/plasma-5.4/plasma-desktop/default.nix +++ b/pkgs/desktops/plasma-5.4/plasma-desktop/default.nix @@ -16,15 +16,14 @@ plasmaPackage { kdoctools ]; buildInputs = [ - attica boost fontconfig kcmutils - kdbusaddons kded kdelibs4support kemoticons + attica boost fontconfig kcmutils kdbusaddons kded kemoticons kglobalaccel ki18n kitemmodels knewstuff knotifications knotifyconfig kpeople krunner kwallet kwin libcanberra_kde libXcursor libpulseaudio libXft libxkbfile phonon plasma-framework plasma-workspace qtdeclarative qtx11extras qtsvg xf86inputevdev xf86inputsynaptics xkeyboard_config xinput ]; - propagatedBuildInputs = [ baloo kactivities kauth kdeclarative ]; + propagatedBuildInputs = [ baloo kactivities kauth kdeclarative kdelibs4support ]; patches = [ (substituteAll { src = ./0001-hwclock.patch; diff --git a/pkgs/desktops/plasma-5.4/plasma-nm.nix b/pkgs/desktops/plasma-5.4/plasma-nm.nix index c7ddf6e89efa..e244f586a817 100644 --- a/pkgs/desktops/plasma-5.4/plasma-nm.nix +++ b/pkgs/desktops/plasma-5.4/plasma-nm.nix @@ -14,13 +14,13 @@ plasmaPackage { kdoctools ]; buildInputs = [ - kcompletion kconfigwidgets kcoreaddons kdbusaddons kdelibs4support - ki18n kiconthemes kinit kio kitemviews knotifications kservice - kwallet kwidgetsaddons kwindowsystem kxmlgui + kcompletion kconfigwidgets kcoreaddons kdbusaddons ki18n + kiconthemes kinit kio kitemviews knotifications kservice kwallet + kwidgetsaddons kwindowsystem kxmlgui mobile_broadband_provider_info modemmanager-qt networkmanager-qt - openconnect plasma-framework qtdeclarative solid + openconnect plasma-framework solid ]; - propagatedBuildInputs = [ kdeclarative ]; + propagatedBuildInputs = [ kdeclarative kdelibs4support qtdeclarative ]; postInstall = '' wrapKDEProgram "$out/bin/kde5-nm-connection-editor" ''; diff --git a/pkgs/desktops/plasma-5.4/plasma-workspace/default.nix b/pkgs/desktops/plasma-5.4/plasma-workspace/default.nix index b1e2010da319..a2ac1b69f01a 100644 --- a/pkgs/desktops/plasma-5.4/plasma-workspace/default.nix +++ b/pkgs/desktops/plasma-5.4/plasma-workspace/default.nix @@ -18,14 +18,14 @@ plasmaPackage { ]; buildInputs = [ kcmutils kcrash kdbusaddons - kdelibs4support kdesu kdewebkit kglobalaccel kidletime kjsembed + kdesu kdewebkit kglobalaccel kidletime kjsembed knewstuff knotifyconfig kpackage krunner ktexteditor ktextwidgets kwallet kwayland kwin kxmlrpcclient libdbusmenu libkscreen libSM libXcursor networkmanager-qt pam phonon plasma-framework qtquick1 qtscript qtx11extras solid wayland ]; propagatedBuildInputs = [ - baloo kactivities kdeclarative libksysguard + baloo kactivities kdeclarative kdelibs4support libksysguard ]; patches = [ ./0001-startkde-NixOS-patches.patch ]; diff --git a/pkgs/desktops/plasma-5.4/powerdevil.nix b/pkgs/desktops/plasma-5.4/powerdevil.nix index 2d3a5521e7da..239b1c77318d 100644 --- a/pkgs/desktops/plasma-5.4/powerdevil.nix +++ b/pkgs/desktops/plasma-5.4/powerdevil.nix @@ -11,9 +11,9 @@ plasmaPackage { kdoctools ]; buildInputs = [ - kconfig kdbusaddons kdelibs4support kglobalaccel ki18n + kconfig kdbusaddons kglobalaccel ki18n kidletime kio knotifyconfig libkscreen plasma-workspace qtx11extras solid udev ]; - propagatedBuildInputs = [ kactivities kauth ]; + propagatedBuildInputs = [ kactivities kauth kdelibs4support ]; } From 5ef3477a3e240efc36c9fbc73032706999b865cb Mon Sep 17 00:00:00 2001 From: Thomas Tuegel Date: Sat, 10 Oct 2015 11:20:49 -0500 Subject: [PATCH 023/162] propagate kemoticons dependencies --- pkgs/desktops/plasma-5.4/plasma-desktop/default.nix | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/pkgs/desktops/plasma-5.4/plasma-desktop/default.nix b/pkgs/desktops/plasma-5.4/plasma-desktop/default.nix index 489a4a143717..1e8fd80e8cd6 100644 --- a/pkgs/desktops/plasma-5.4/plasma-desktop/default.nix +++ b/pkgs/desktops/plasma-5.4/plasma-desktop/default.nix @@ -16,14 +16,16 @@ plasmaPackage { kdoctools ]; buildInputs = [ - attica boost fontconfig kcmutils kdbusaddons kded kemoticons + attica boost fontconfig kcmutils kdbusaddons kded kglobalaccel ki18n kitemmodels knewstuff knotifications knotifyconfig kpeople krunner kwallet kwin libcanberra_kde libXcursor libpulseaudio libXft libxkbfile phonon plasma-framework plasma-workspace qtdeclarative qtx11extras qtsvg xf86inputevdev xf86inputsynaptics xkeyboard_config xinput ]; - propagatedBuildInputs = [ baloo kactivities kauth kdeclarative kdelibs4support ]; + propagatedBuildInputs = [ + baloo kactivities kauth kdeclarative kdelibs4support kemoticons + ]; patches = [ (substituteAll { src = ./0001-hwclock.patch; From 57bbea240f3728376978dbcca7f439b2e51d903e Mon Sep 17 00:00:00 2001 From: Thomas Tuegel Date: Sat, 10 Oct 2015 11:25:16 -0500 Subject: [PATCH 024/162] propagate kfilemetadata dependencies --- pkgs/applications/kde-apps-15.08/baloo-widgets.nix | 2 +- pkgs/applications/kde-apps-15.08/dolphin.nix | 2 +- pkgs/desktops/plasma-5.4/plasma-mediacenter.nix | 7 +++---- 3 files changed, 5 insertions(+), 6 deletions(-) diff --git a/pkgs/applications/kde-apps-15.08/baloo-widgets.nix b/pkgs/applications/kde-apps-15.08/baloo-widgets.nix index 6f469d19c85c..f7edbb4b01d1 100644 --- a/pkgs/applications/kde-apps-15.08/baloo-widgets.nix +++ b/pkgs/applications/kde-apps-15.08/baloo-widgets.nix @@ -22,11 +22,11 @@ kdeApp { kio ki18n kservice - kfilemetadata ]; propagatedBuildInputs = [ baloo kdelibs4support + kfilemetadata ]; meta = { license = [ lib.licenses.lgpl21 ]; diff --git a/pkgs/applications/kde-apps-15.08/dolphin.nix b/pkgs/applications/kde-apps-15.08/dolphin.nix index 54657606d928..b92543ed831b 100644 --- a/pkgs/applications/kde-apps-15.08/dolphin.nix +++ b/pkgs/applications/kde-apps-15.08/dolphin.nix @@ -51,12 +51,12 @@ kdeApp { knotifications phonon baloo-widgets - kfilemetadata ]; propagatedBuildInputs = [ baloo kactivities kdelibs4support + kfilemetadata ]; meta = { license = with lib.licenses; [ gpl2 fdl12 ]; diff --git a/pkgs/desktops/plasma-5.4/plasma-mediacenter.nix b/pkgs/desktops/plasma-5.4/plasma-mediacenter.nix index d86d9f1c6872..74b4bece7e28 100644 --- a/pkgs/desktops/plasma-5.4/plasma-mediacenter.nix +++ b/pkgs/desktops/plasma-5.4/plasma-mediacenter.nix @@ -10,9 +10,8 @@ plasmaPackage { extra-cmake-modules ]; buildInputs = [ - kconfig kcoreaddons kguiaddons ki18n kio - kservice kfilemetadata plasma-framework qtdeclarative qtmultimedia - taglib + kconfig kcoreaddons kguiaddons ki18n kio kservice plasma-framework + qtdeclarative qtmultimedia taglib ]; - propagatedBuildInputs = [ baloo kactivities kdeclarative ]; + propagatedBuildInputs = [ baloo kactivities kdeclarative kfilemetadata ]; } From 7534be95be7ec01138d3ee83db29c890e1451e10 Mon Sep 17 00:00:00 2001 From: Thomas Tuegel Date: Sat, 10 Oct 2015 11:30:10 -0500 Subject: [PATCH 025/162] propagate kglobalaccel dependencies --- pkgs/desktops/plasma-5.4/khotkeys.nix | 11 +++---- pkgs/desktops/plasma-5.4/kscreen.nix | 24 +++----------- pkgs/desktops/plasma-5.4/kwin/default.nix | 10 +++--- .../plasma-5.4/plasma-desktop/default.nix | 3 +- pkgs/desktops/plasma-5.4/plasma-pa.nix | 4 +-- .../plasma-5.4/plasma-workspace/default.nix | 6 ++-- pkgs/desktops/plasma-5.4/powerdevil.nix | 9 ++--- .../kde-frameworks-5.14/kactivities.nix | 6 ++-- .../kde-frameworks-5.14/kdeclarative.nix | 4 +-- .../kde-frameworks-5.14/kdelibs4support.nix | 8 ++--- .../libraries/kde-frameworks-5.14/khtml.nix | 33 +++++-------------- .../libraries/kde-frameworks-5.14/kxmlgui.nix | 20 ++++------- .../plasma-framework/default.nix | 10 +++--- 13 files changed, 56 insertions(+), 92 deletions(-) diff --git a/pkgs/desktops/plasma-5.4/khotkeys.nix b/pkgs/desktops/plasma-5.4/khotkeys.nix index dc1e73ccdfe2..8dfe4c089489 100644 --- a/pkgs/desktops/plasma-5.4/khotkeys.nix +++ b/pkgs/desktops/plasma-5.4/khotkeys.nix @@ -5,13 +5,10 @@ plasmaPackage { name = "khotkeys"; - nativeBuildInputs = [ - extra-cmake-modules - kdoctools - ]; + nativeBuildInputs = [ extra-cmake-modules kdoctools ]; buildInputs = [ - kcmutils kdbusaddons kglobalaccel ki18n kio kxmlgui - plasma-framework plasma-workspace + kcmutils kdbusaddons ki18n kio kxmlgui plasma-framework + plasma-workspace ]; - propagatedBuildInputs = [ kdelibs4support qtx11extras ]; + propagatedBuildInputs = [ kdelibs4support kglobalaccel qtx11extras ]; } diff --git a/pkgs/desktops/plasma-5.4/kscreen.nix b/pkgs/desktops/plasma-5.4/kscreen.nix index f221f66f03f6..fb75548d8404 100644 --- a/pkgs/desktops/plasma-5.4/kscreen.nix +++ b/pkgs/desktops/plasma-5.4/kscreen.nix @@ -1,14 +1,6 @@ -{ plasmaPackage -, extra-cmake-modules -, kconfig -, kconfigwidgets -, kdbusaddons -, kglobalaccel -, ki18n -, kwidgetsaddons -, kxmlgui -, libkscreen -, qtdeclarative +{ plasmaPackage, extra-cmake-modules, kconfig, kconfigwidgets +, kdbusaddons, kglobalaccel, ki18n, kwidgetsaddons, kxmlgui +, libkscreen, qtdeclarative }: plasmaPackage { @@ -17,16 +9,10 @@ plasmaPackage { extra-cmake-modules ]; buildInputs = [ - kconfig - kconfigwidgets - kdbusaddons - kglobalaccel - ki18n - kwidgetsaddons - kxmlgui + kconfig kconfigwidgets kdbusaddons ki18n kwidgetsaddons kxmlgui libkscreen - qtdeclarative ]; + propagatedBuildInputs = [ kglobalaccel qtdeclarative ]; postInstall = '' wrapKDEProgram "$out/bin/kscreen-console" ''; diff --git a/pkgs/desktops/plasma-5.4/kwin/default.nix b/pkgs/desktops/plasma-5.4/kwin/default.nix index e01a5bfed013..051161c399fb 100644 --- a/pkgs/desktops/plasma-5.4/kwin/default.nix +++ b/pkgs/desktops/plasma-5.4/kwin/default.nix @@ -15,13 +15,13 @@ plasmaPackage { ]; buildInputs = [ epoxy kcompletion kcmutils kconfig kconfigwidgets kcoreaddons - kcrash kdecoration kglobalaccel ki18n kiconthemes - kinit kio knewstuff knotifications kpackage kservice kwayland - kwidgetsaddons kwindowsystem kxmlgui libinput libICE libSM - plasma-framework qtdeclarative qtscript qtx11extras udev wayland + kcrash kdecoration ki18n kiconthemes kinit kio knewstuff + knotifications kpackage kservice kwayland kwidgetsaddons + kwindowsystem kxmlgui libinput libICE libSM plasma-framework + qtdeclarative qtscript qtx11extras udev wayland xcb-util-cursor ]; - propagatedBuildInputs = [ kactivities kdeclarative ]; + propagatedBuildInputs = [ kactivities kdeclarative kglobalaccel ]; patches = [ ./kwin-import-plugin-follow-symlinks.patch ]; postInstall = '' wrapKDEProgram "$out/bin/kwin_x11" diff --git a/pkgs/desktops/plasma-5.4/plasma-desktop/default.nix b/pkgs/desktops/plasma-5.4/plasma-desktop/default.nix index 1e8fd80e8cd6..e485262ab266 100644 --- a/pkgs/desktops/plasma-5.4/plasma-desktop/default.nix +++ b/pkgs/desktops/plasma-5.4/plasma-desktop/default.nix @@ -17,7 +17,7 @@ plasmaPackage { ]; buildInputs = [ attica boost fontconfig kcmutils kdbusaddons kded - kglobalaccel ki18n kitemmodels knewstuff knotifications + ki18n kitemmodels knewstuff knotifications knotifyconfig kpeople krunner kwallet kwin libcanberra_kde libXcursor libpulseaudio libXft libxkbfile phonon plasma-framework plasma-workspace qtdeclarative qtx11extras qtsvg xf86inputevdev @@ -25,6 +25,7 @@ plasmaPackage { ]; propagatedBuildInputs = [ baloo kactivities kauth kdeclarative kdelibs4support kemoticons + kglobalaccel ]; patches = [ (substituteAll { diff --git a/pkgs/desktops/plasma-5.4/plasma-pa.nix b/pkgs/desktops/plasma-5.4/plasma-pa.nix index a5cc11d89ae9..2525dde0bcb2 100644 --- a/pkgs/desktops/plasma-5.4/plasma-pa.nix +++ b/pkgs/desktops/plasma-5.4/plasma-pa.nix @@ -9,8 +9,8 @@ plasmaPackage { extra-cmake-modules ]; buildInputs = [ - glib kconfigwidgets kcoreaddons kglobalaccel ki18n libpulseaudio + glib kconfigwidgets kcoreaddons ki18n libpulseaudio plasma-framework ]; - propagatedBuildInputs = [ kdeclarative ]; + propagatedBuildInputs = [ kdeclarative kglobalaccel ]; } diff --git a/pkgs/desktops/plasma-5.4/plasma-workspace/default.nix b/pkgs/desktops/plasma-5.4/plasma-workspace/default.nix index a2ac1b69f01a..7d72e38203dc 100644 --- a/pkgs/desktops/plasma-5.4/plasma-workspace/default.nix +++ b/pkgs/desktops/plasma-5.4/plasma-workspace/default.nix @@ -17,15 +17,15 @@ plasmaPackage { kdoctools ]; buildInputs = [ - kcmutils kcrash kdbusaddons - kdesu kdewebkit kglobalaccel kidletime kjsembed + kcmutils kcrash kdbusaddons kdesu kdewebkit kidletime kjsembed knewstuff knotifyconfig kpackage krunner ktexteditor ktextwidgets kwallet kwayland kwin kxmlrpcclient libdbusmenu libkscreen libSM libXcursor networkmanager-qt pam phonon plasma-framework qtquick1 qtscript qtx11extras solid wayland ]; propagatedBuildInputs = [ - baloo kactivities kdeclarative kdelibs4support libksysguard + baloo kactivities kdeclarative kdelibs4support kglobalaccel + libksysguard ]; patches = [ ./0001-startkde-NixOS-patches.patch ]; diff --git a/pkgs/desktops/plasma-5.4/powerdevil.nix b/pkgs/desktops/plasma-5.4/powerdevil.nix index 239b1c77318d..5ed8087d0ce9 100644 --- a/pkgs/desktops/plasma-5.4/powerdevil.nix +++ b/pkgs/desktops/plasma-5.4/powerdevil.nix @@ -11,9 +11,10 @@ plasmaPackage { kdoctools ]; buildInputs = [ - kconfig kdbusaddons kglobalaccel ki18n - kidletime kio knotifyconfig libkscreen plasma-workspace - qtx11extras solid udev + kconfig kdbusaddons ki18n kidletime kio knotifyconfig libkscreen + plasma-workspace solid udev + ]; + propagatedBuildInputs = [ + kactivities kauth kdelibs4support kglobalaccel qtx11extras ]; - propagatedBuildInputs = [ kactivities kauth kdelibs4support ]; } diff --git a/pkgs/development/libraries/kde-frameworks-5.14/kactivities.nix b/pkgs/development/libraries/kde-frameworks-5.14/kactivities.nix index ed0c7b6575ac..cc39129815f8 100644 --- a/pkgs/development/libraries/kde-frameworks-5.14/kactivities.nix +++ b/pkgs/development/libraries/kde-frameworks-5.14/kactivities.nix @@ -7,10 +7,10 @@ kdeFramework { name = "kactivities"; nativeBuildInputs = [ extra-cmake-modules ]; buildInputs = [ - boost kcmutils kconfig kcoreaddons kdbusaddons kglobalaccel ki18n - kio kservice kwindowsystem kxmlgui + boost kcmutils kconfig kcoreaddons kdbusaddons ki18n kio kservice + kwindowsystem kxmlgui ]; - propagatedBuildInputs = [ kdeclarative qtdeclarative ]; + propagatedBuildInputs = [ kdeclarative kglobalaccel qtdeclarative ]; postInstall = '' wrapKDEProgram "$out/bin/kactivitymanagerd" ''; diff --git a/pkgs/development/libraries/kde-frameworks-5.14/kdeclarative.nix b/pkgs/development/libraries/kde-frameworks-5.14/kdeclarative.nix index b62a13f8fa9f..10cd2d602a6b 100644 --- a/pkgs/development/libraries/kde-frameworks-5.14/kdeclarative.nix +++ b/pkgs/development/libraries/kde-frameworks-5.14/kdeclarative.nix @@ -18,9 +18,9 @@ kdeFramework { name = "kdeclarative"; nativeBuildInputs = [ extra-cmake-modules ]; buildInputs = [ - epoxy kglobalaccel kguiaddons ki18n kiconthemes kio kwidgetsaddons kwindowsystem + epoxy kguiaddons ki18n kiconthemes kio kwidgetsaddons kwindowsystem ]; - propagatedBuildInputs = [ kconfig kpackage qtdeclarative ]; + propagatedBuildInputs = [ kconfig kglobalaccel kpackage qtdeclarative ]; postInstall = '' wrapKDEProgram "$out/bin/kpackagelauncherqml" ''; diff --git a/pkgs/development/libraries/kde-frameworks-5.14/kdelibs4support.nix b/pkgs/development/libraries/kde-frameworks-5.14/kdelibs4support.nix index cec5f268c21c..5deed2036b69 100644 --- a/pkgs/development/libraries/kde-frameworks-5.14/kdelibs4support.nix +++ b/pkgs/development/libraries/kde-frameworks-5.14/kdelibs4support.nix @@ -13,14 +13,14 @@ kdeFramework { name = "kdelibs4support"; nativeBuildInputs = [ extra-cmake-modules kdoctools ]; buildInputs = [ - kcompletion kconfig kglobalaccel ki18n kio kservice kwidgetsaddons + kcompletion kconfig ki18n kio kservice kwidgetsaddons kxmlgui networkmanager qtsvg qtx11extras xlibs.libSM ]; propagatedBuildInputs = [ kauth karchive kconfigwidgets kcoreaddons kcrash kdbusaddons - kdesignerplugin kemoticons kguiaddons kiconthemes kitemmodels - kinit knotifications kparts ktextwidgets kunitconversion - kwindowsystem + kdesignerplugin kemoticons kglobalaccel kguiaddons kiconthemes + kitemmodels kinit knotifications kparts ktextwidgets + kunitconversion kwindowsystem ]; cmakeFlags = [ "-DDocBookXML4_DTD_DIR=${docbook_xml_dtd_45}/xml/dtd/docbook" diff --git a/pkgs/development/libraries/kde-frameworks-5.14/khtml.nix b/pkgs/development/libraries/kde-frameworks-5.14/khtml.nix index 45dd45089c42..cbb511608edd 100644 --- a/pkgs/development/libraries/kde-frameworks-5.14/khtml.nix +++ b/pkgs/development/libraries/kde-frameworks-5.14/khtml.nix @@ -1,34 +1,19 @@ -{ kdeFramework, lib -, extra-cmake-modules -, giflib -, karchive -, kcodecs -, kglobalaccel -, ki18n -, kiconthemes -, kio -, kjs -, knotifications -, kparts -, ktextwidgets -, kwallet -, kwidgetsaddons -, kwindowsystem -, kxmlgui -, perl -, phonon -, qtx11extras -, sonnet +{ kdeFramework, lib, extra-cmake-modules, giflib, karchive +, kcodecs, kglobalaccel, ki18n, kiconthemes, kio, kjs +, knotifications, kparts, ktextwidgets, kwallet, kwidgetsaddons +, kwindowsystem, kxmlgui, perl, phonon, qtx11extras, sonnet }: kdeFramework { name = "khtml"; nativeBuildInputs = [ extra-cmake-modules perl ]; buildInputs = [ - giflib karchive kglobalaccel kiconthemes knotifications kwallet - kwidgetsaddons kwindowsystem kxmlgui phonon qtx11extras sonnet + giflib karchive kiconthemes knotifications kwallet kwidgetsaddons + kwindowsystem kxmlgui phonon qtx11extras sonnet + ]; + propagatedBuildInputs = [ + kcodecs kglobalaccel ki18n kio kjs kparts ktextwidgets ]; - propagatedBuildInputs = [ kcodecs ki18n kio kjs kparts ktextwidgets ]; meta = { maintainers = [ lib.maintainers.ttuegel ]; }; diff --git a/pkgs/development/libraries/kde-frameworks-5.14/kxmlgui.nix b/pkgs/development/libraries/kde-frameworks-5.14/kxmlgui.nix index 6e1398d2f84b..3eeea735d822 100644 --- a/pkgs/development/libraries/kde-frameworks-5.14/kxmlgui.nix +++ b/pkgs/development/libraries/kde-frameworks-5.14/kxmlgui.nix @@ -1,24 +1,16 @@ -{ kdeFramework, lib -, extra-cmake-modules -, attica -, kconfig -, kconfigwidgets -, kglobalaccel -, ki18n -, kiconthemes -, kitemviews -, ktextwidgets -, kwindowsystem -, sonnet +{ kdeFramework, lib, extra-cmake-modules, attica, kconfig +, kconfigwidgets, kglobalaccel, ki18n, kiconthemes, kitemviews +, ktextwidgets, kwindowsystem, sonnet }: kdeFramework { name = "kxmlgui"; nativeBuildInputs = [ extra-cmake-modules ]; buildInputs = [ - attica kconfig kconfigwidgets kglobalaccel ki18n kiconthemes - kitemviews ktextwidgets kwindowsystem sonnet + attica kconfig kconfigwidgets ki18n kiconthemes kitemviews + ktextwidgets kwindowsystem sonnet ]; + propagatedBuildInputs = [ kglobalaccel ]; meta = { maintainers = [ lib.maintainers.ttuegel ]; }; diff --git a/pkgs/development/libraries/kde-frameworks-5.14/plasma-framework/default.nix b/pkgs/development/libraries/kde-frameworks-5.14/plasma-framework/default.nix index f9479aa39f62..33eff0f424cc 100644 --- a/pkgs/development/libraries/kde-frameworks-5.14/plasma-framework/default.nix +++ b/pkgs/development/libraries/kde-frameworks-5.14/plasma-framework/default.nix @@ -9,11 +9,13 @@ kdeFramework { name = "plasma-framework"; nativeBuildInputs = [ extra-cmake-modules kdoctools ]; buildInputs = [ - karchive kconfig kconfigwidgets kcoreaddons - kdbusaddons kglobalaccel kguiaddons ki18n kiconthemes - kio knotifications kwindowsystem kxmlgui qtscript qtx11extras + karchive kconfig kconfigwidgets kcoreaddons kdbusaddons kguiaddons + ki18n kiconthemes kio knotifications kwindowsystem kxmlgui + qtscript qtx11extras + ]; + propagatedBuildInputs = [ + kactivities kdeclarative kglobalaccel kpackage kservice ]; - propagatedBuildInputs = [ kactivities kdeclarative kpackage kservice ]; postInstall = '' wrapKDEProgram "$out/bin/plasmapkg2" ''; From 644045a8940bb54fb963e0a89687d806c999cfe2 Mon Sep 17 00:00:00 2001 From: Thomas Tuegel Date: Sat, 10 Oct 2015 11:31:23 -0500 Subject: [PATCH 026/162] propagate khtml dependencies --- pkgs/applications/kde-apps-15.08/ark.nix | 4 ++- pkgs/desktops/plasma-5.4/khelpcenter.nix | 26 ++++------------- pkgs/desktops/plasma-5.4/systemsettings.nix | 31 ++++----------------- 3 files changed, 14 insertions(+), 47 deletions(-) diff --git a/pkgs/applications/kde-apps-15.08/ark.nix b/pkgs/applications/kde-apps-15.08/ark.nix index b0bf81e0b5bb..816adaaa7ed3 100644 --- a/pkgs/applications/kde-apps-15.08/ark.nix +++ b/pkgs/applications/kde-apps-15.08/ark.nix @@ -29,13 +29,15 @@ kdeApp { kdbusaddons ki18n kiconthemes - khtml kio kservice kpty kwidgetsaddons libarchive ]; + propagatedBuildInputs = [ + khtml + ]; meta = { license = with lib.licenses; [ gpl2 lgpl3 ]; maintainers = [ lib.maintainers.ttuegel ]; diff --git a/pkgs/desktops/plasma-5.4/khelpcenter.nix b/pkgs/desktops/plasma-5.4/khelpcenter.nix index dc7afd348c45..5ed93f6199ef 100644 --- a/pkgs/desktops/plasma-5.4/khelpcenter.nix +++ b/pkgs/desktops/plasma-5.4/khelpcenter.nix @@ -1,15 +1,6 @@ -{ plasmaPackage -, extra-cmake-modules -, kdoctools -, kconfig -, kcoreaddons -, kdbusaddons -, ki18n -, kinit -, kcmutils -, kdelibs4support -, khtml -, kservice +{ plasmaPackage, extra-cmake-modules, kdoctools, kconfig +, kcoreaddons, kdbusaddons, ki18n, kinit, kcmutils, kdelibs4support +, khtml, kservice }: plasmaPackage { @@ -19,16 +10,9 @@ plasmaPackage { kdoctools ]; buildInputs = [ - kconfig - kcoreaddons - kdbusaddons - ki18n - kinit - kcmutils - kdelibs4support - khtml - kservice + kconfig kcoreaddons kdbusaddons ki18n kinit kcmutils kservice ]; + propagatedBuildInputs = [ kdelibs4support khtml ]; postInstall = '' wrapKDEProgram "$out/bin/khelpcenter" ''; diff --git a/pkgs/desktops/plasma-5.4/systemsettings.nix b/pkgs/desktops/plasma-5.4/systemsettings.nix index 089dc2790665..36b9d322f19f 100644 --- a/pkgs/desktops/plasma-5.4/systemsettings.nix +++ b/pkgs/desktops/plasma-5.4/systemsettings.nix @@ -1,17 +1,6 @@ -{ plasmaPackage -, extra-cmake-modules -, kdoctools -, kitemviews -, kcmutils -, ki18n -, kio -, kservice -, kiconthemes -, kwindowsystem -, kxmlgui -, kdbusaddons -, kconfig -, khtml +{ plasmaPackage, extra-cmake-modules, kdoctools, kitemviews +, kcmutils, ki18n, kio, kservice, kiconthemes, kwindowsystem +, kxmlgui, kdbusaddons, kconfig, khtml }: plasmaPackage { @@ -21,18 +10,10 @@ plasmaPackage { kdoctools ]; buildInputs = [ - kitemviews - kcmutils - ki18n - kio - kservice - kiconthemes - kwindowsystem - kxmlgui - kdbusaddons - kconfig - khtml + kitemviews kcmutils ki18n kio kservice kiconthemes kwindowsystem + kxmlgui kdbusaddons kconfig ]; + propagatedBuildInputs = [ khtml ]; postInstall = '' wrapKDEProgram "$out/bin/systemsettings5" ''; From ea2f246b61351c0b1fe8c6ff12b5ab04b7675212 Mon Sep 17 00:00:00 2001 From: Thomas Tuegel Date: Sat, 10 Oct 2015 11:50:36 -0500 Subject: [PATCH 027/162] propagate ki18n dependencies --- pkgs/applications/kde-apps-15.08/ark.nix | 2 +- .../kde-apps-15.08/baloo-widgets.nix | 2 +- .../kde-apps-15.08/dolphin-plugins.nix | 2 +- pkgs/applications/kde-apps-15.08/dolphin.nix | 2 +- pkgs/applications/kde-apps-15.08/kate.nix | 2 +- pkgs/applications/kde-apps-15.08/konsole.nix | 2 +- .../kde-apps-15.08/print-manager.nix | 4 ++- pkgs/desktops/plasma-5.4/breeze-qt5.nix | 4 +-- pkgs/desktops/plasma-5.4/kde-gtk-config.nix | 3 +- pkgs/desktops/plasma-5.4/kdeplasma-addons.nix | 2 +- pkgs/desktops/plasma-5.4/khelpcenter.nix | 4 +-- pkgs/desktops/plasma-5.4/khotkeys.nix | 4 +-- pkgs/desktops/plasma-5.4/kinfocenter.nix | 4 +-- pkgs/desktops/plasma-5.4/kmenuedit.nix | 4 +-- pkgs/desktops/plasma-5.4/kscreen.nix | 4 +-- pkgs/desktops/plasma-5.4/ksshaskpass.nix | 22 +++--------- pkgs/desktops/plasma-5.4/ksysguard.nix | 5 ++- pkgs/desktops/plasma-5.4/kwin/default.nix | 11 +++--- pkgs/desktops/plasma-5.4/kwrited.nix | 22 +++--------- .../plasma-5.4/libkscreen/default.nix | 2 ++ pkgs/desktops/plasma-5.4/milou.nix | 4 +-- pkgs/desktops/plasma-5.4/oxygen.nix | 4 +-- .../plasma-5.4/plasma-desktop/default.nix | 4 +-- .../plasma-5.4/plasma-mediacenter.nix | 6 ++-- pkgs/desktops/plasma-5.4/plasma-nm.nix | 6 ++-- pkgs/desktops/plasma-5.4/plasma-pa.nix | 5 ++- pkgs/desktops/plasma-5.4/polkit-kde-agent.nix | 2 +- pkgs/desktops/plasma-5.4/powerdevil.nix | 4 +-- pkgs/desktops/plasma-5.4/systemsettings.nix | 4 +-- .../libraries/kde-frameworks-5.14/baloo.nix | 4 +-- .../frameworkintegration.nix | 27 +++----------- .../kde-frameworks-5.14/kactivities.nix | 4 +-- .../kde-frameworks-5.14/kcmutils/default.nix | 4 +-- .../kconfigwidgets/default.nix | 4 +-- .../kde-frameworks-5.14/kdeclarative.nix | 21 +++-------- .../kde-frameworks-5.14/kdelibs4support.nix | 6 ++-- .../libraries/kde-frameworks-5.14/kdesu.nix | 10 ++---- .../kde-frameworks-5.14/kdewebkit.nix | 17 +++------ .../kde-frameworks-5.14/kdoctools/default.nix | 13 +++---- .../kde-frameworks-5.14/kfilemetadata.nix | 17 +++------ .../kde-frameworks-5.14/kiconthemes.nix | 11 +++--- .../kde-frameworks-5.14/kinit/default.nix | 15 +++----- .../libraries/kde-frameworks-5.14/kio.nix | 36 +++++-------------- .../kde-frameworks-5.14/kjsembed.nix | 6 +--- .../kde-frameworks-5.14/knewstuff.nix | 22 +++--------- .../kde-frameworks-5.14/knotifyconfig.nix | 12 +++---- .../kde-frameworks-5.14/kpackage/default.nix | 4 +-- .../libraries/kde-frameworks-5.14/kparts.nix | 20 +++-------- .../libraries/kde-frameworks-5.14/kpeople.nix | 13 +++---- .../libraries/kde-frameworks-5.14/kpty.nix | 9 ++--- .../libraries/kde-frameworks-5.14/kross.nix | 15 ++------ .../libraries/kde-frameworks-5.14/krunner.nix | 16 +++------ .../kde-frameworks-5.14/kservice/default.nix | 15 +++----- .../ktexteditor/default.nix | 21 ++++------- .../kde-frameworks-5.14/ktextwidgets.nix | 11 ++---- .../kde-frameworks-5.14/kunitconversion.nix | 7 ++-- .../libraries/kde-frameworks-5.14/kwallet.nix | 19 +++------- .../libraries/kde-frameworks-5.14/kxmlgui.nix | 4 +-- .../kde-frameworks-5.14/kxmlrpcclient.nix | 9 ++--- .../plasma-framework/default.nix | 6 ++-- 60 files changed, 172 insertions(+), 372 deletions(-) diff --git a/pkgs/applications/kde-apps-15.08/ark.nix b/pkgs/applications/kde-apps-15.08/ark.nix index 816adaaa7ed3..155e024f9708 100644 --- a/pkgs/applications/kde-apps-15.08/ark.nix +++ b/pkgs/applications/kde-apps-15.08/ark.nix @@ -27,7 +27,6 @@ kdeApp { kconfig kcrash kdbusaddons - ki18n kiconthemes kio kservice @@ -37,6 +36,7 @@ kdeApp { ]; propagatedBuildInputs = [ khtml + ki18n ]; meta = { license = with lib.licenses; [ gpl2 lgpl3 ]; diff --git a/pkgs/applications/kde-apps-15.08/baloo-widgets.nix b/pkgs/applications/kde-apps-15.08/baloo-widgets.nix index f7edbb4b01d1..6d18a2e83044 100644 --- a/pkgs/applications/kde-apps-15.08/baloo-widgets.nix +++ b/pkgs/applications/kde-apps-15.08/baloo-widgets.nix @@ -20,13 +20,13 @@ kdeApp { buildInputs = [ kconfig kio - ki18n kservice ]; propagatedBuildInputs = [ baloo kdelibs4support kfilemetadata + ki18n ]; meta = { license = [ lib.licenses.lgpl21 ]; diff --git a/pkgs/applications/kde-apps-15.08/dolphin-plugins.nix b/pkgs/applications/kde-apps-15.08/dolphin-plugins.nix index 5a3dbc2b635c..578d4bf9e210 100644 --- a/pkgs/applications/kde-apps-15.08/dolphin-plugins.nix +++ b/pkgs/applications/kde-apps-15.08/dolphin-plugins.nix @@ -17,12 +17,12 @@ kdeApp { ]; buildInputs = [ kxmlgui - ki18n kio dolphin ]; propagatedBuildInputs = [ kdelibs4support + ki18n ]; meta = { license = [ lib.licenses.gpl2 ]; diff --git a/pkgs/applications/kde-apps-15.08/dolphin.nix b/pkgs/applications/kde-apps-15.08/dolphin.nix index b92543ed831b..1c468d613f5a 100644 --- a/pkgs/applications/kde-apps-15.08/dolphin.nix +++ b/pkgs/applications/kde-apps-15.08/dolphin.nix @@ -37,7 +37,6 @@ kdeApp { kcmutils kcoreaddons knewstuff - ki18n kdbusaddons kbookmarks kconfig @@ -57,6 +56,7 @@ kdeApp { kactivities kdelibs4support kfilemetadata + ki18n ]; meta = { license = with lib.licenses; [ gpl2 fdl12 ]; diff --git a/pkgs/applications/kde-apps-15.08/kate.nix b/pkgs/applications/kde-apps-15.08/kate.nix index 39db56edb059..b7ee4859dea8 100644 --- a/pkgs/applications/kde-apps-15.08/kate.nix +++ b/pkgs/applications/kde-apps-15.08/kate.nix @@ -38,7 +38,6 @@ kdeApp { kcrash kguiaddons kiconthemes - ki18n kinit kjobwidgets kio @@ -57,6 +56,7 @@ kdeApp { ]; propagatedBuildInputs = [ kactivities + ki18n ]; meta = { license = with lib.licenses; [ gpl3 lgpl3 lgpl2 ]; diff --git a/pkgs/applications/kde-apps-15.08/konsole.nix b/pkgs/applications/kde-apps-15.08/konsole.nix index a01e9c9adc87..4ad675c04328 100644 --- a/pkgs/applications/kde-apps-15.08/konsole.nix +++ b/pkgs/applications/kde-apps-15.08/konsole.nix @@ -39,7 +39,6 @@ kdeApp { kconfigwidgets kcoreaddons kguiaddons - ki18n kiconthemes kinit kio @@ -55,6 +54,7 @@ kdeApp { ]; propagatedBuildInputs = [ kdelibs4support + ki18n ]; meta = { license = with lib.licenses; [ gpl2 lgpl21 fdl12 ]; diff --git a/pkgs/applications/kde-apps-15.08/print-manager.nix b/pkgs/applications/kde-apps-15.08/print-manager.nix index 909aea8e716c..73c13cf49fa7 100644 --- a/pkgs/applications/kde-apps-15.08/print-manager.nix +++ b/pkgs/applications/kde-apps-15.08/print-manager.nix @@ -29,7 +29,6 @@ kdeApp { kconfigwidgets kdbusaddons kiconthemes - ki18n kcmutils kio knotifications @@ -38,6 +37,9 @@ kdeApp { kwindowsystem kitemviews ]; + propagatedBuildInputs = [ + ki18n + ]; meta = { license = [ lib.licenses.gpl2 ]; maintainers = [ lib.maintainers.ttuegel ]; diff --git a/pkgs/desktops/plasma-5.4/breeze-qt5.nix b/pkgs/desktops/plasma-5.4/breeze-qt5.nix index bf582f1a4061..f526d2ebc9fd 100644 --- a/pkgs/desktops/plasma-5.4/breeze-qt5.nix +++ b/pkgs/desktops/plasma-5.4/breeze-qt5.nix @@ -10,10 +10,10 @@ plasmaPackage { extra-cmake-modules ]; buildInputs = [ - kcmutils kconfigwidgets kcoreaddons kdecoration kguiaddons ki18n + kcmutils kconfigwidgets kcoreaddons kdecoration kguiaddons kwindowsystem qtx11extras ]; - propagatedBuildInputs = [ frameworkintegration ]; + propagatedBuildInputs = [ frameworkintegration ki18n ]; cmakeFlags = [ "-DUSE_KDE4=OFF" ]; postInstall = '' wrapKDEProgram "$out/bin/breeze-settings5" diff --git a/pkgs/desktops/plasma-5.4/kde-gtk-config.nix b/pkgs/desktops/plasma-5.4/kde-gtk-config.nix index 9c59665f1a0c..d6a041220b2f 100644 --- a/pkgs/desktops/plasma-5.4/kde-gtk-config.nix +++ b/pkgs/desktops/plasma-5.4/kde-gtk-config.nix @@ -16,9 +16,10 @@ plasmaPackage { name = "kde-gtk-config"; nativeBuildInputs = [ extra-cmake-modules ]; buildInputs = [ - glib gtk2 gtk3 karchive kcmutils kconfigwidgets ki18n kiconthemes + glib gtk2 gtk3 karchive kcmutils kconfigwidgets kiconthemes kio knewstuff ]; + propagatedBuildInputs = [ ki18n ]; cmakeFlags = [ "-DGTK2_GLIBCONFIG_INCLUDE_DIR=${glib}/lib/glib-2.0/include" "-DGTK2_GDKCONFIG_INCLUDE_DIR=${gtk2}/lib/gtk-2.0/include" diff --git a/pkgs/desktops/plasma-5.4/kdeplasma-addons.nix b/pkgs/desktops/plasma-5.4/kdeplasma-addons.nix index 9328db7ad0b9..ca52d23b4008 100644 --- a/pkgs/desktops/plasma-5.4/kdeplasma-addons.nix +++ b/pkgs/desktops/plasma-5.4/kdeplasma-addons.nix @@ -11,7 +11,7 @@ plasmaPackage { kdoctools ]; buildInputs = [ - ibus kconfig kconfigwidgets kcoreaddons kcmutils ki18n kio + ibus kconfig kconfigwidgets kcoreaddons kcmutils kio knewstuff kross krunner kservice kunitconversion plasma-framework ]; propagatedBuildInputs = [ kdelibs4support qtdeclarative qtx11extras ]; diff --git a/pkgs/desktops/plasma-5.4/khelpcenter.nix b/pkgs/desktops/plasma-5.4/khelpcenter.nix index 5ed93f6199ef..609996c3bd10 100644 --- a/pkgs/desktops/plasma-5.4/khelpcenter.nix +++ b/pkgs/desktops/plasma-5.4/khelpcenter.nix @@ -10,9 +10,9 @@ plasmaPackage { kdoctools ]; buildInputs = [ - kconfig kcoreaddons kdbusaddons ki18n kinit kcmutils kservice + kconfig kcoreaddons kdbusaddons kinit kcmutils kservice ]; - propagatedBuildInputs = [ kdelibs4support khtml ]; + propagatedBuildInputs = [ kdelibs4support khtml ki18n ]; postInstall = '' wrapKDEProgram "$out/bin/khelpcenter" ''; diff --git a/pkgs/desktops/plasma-5.4/khotkeys.nix b/pkgs/desktops/plasma-5.4/khotkeys.nix index 8dfe4c089489..484e59ac380f 100644 --- a/pkgs/desktops/plasma-5.4/khotkeys.nix +++ b/pkgs/desktops/plasma-5.4/khotkeys.nix @@ -7,8 +7,8 @@ plasmaPackage { name = "khotkeys"; nativeBuildInputs = [ extra-cmake-modules kdoctools ]; buildInputs = [ - kcmutils kdbusaddons ki18n kio kxmlgui plasma-framework + kcmutils kdbusaddons kio kxmlgui plasma-framework plasma-workspace ]; - propagatedBuildInputs = [ kdelibs4support kglobalaccel qtx11extras ]; + propagatedBuildInputs = [ kdelibs4support kglobalaccel ki18n qtx11extras ]; } diff --git a/pkgs/desktops/plasma-5.4/kinfocenter.nix b/pkgs/desktops/plasma-5.4/kinfocenter.nix index b76199ab5219..62696505f8c3 100644 --- a/pkgs/desktops/plasma-5.4/kinfocenter.nix +++ b/pkgs/desktops/plasma-5.4/kinfocenter.nix @@ -12,10 +12,10 @@ plasmaPackage { ]; buildInputs = [ kcmutils kcompletion kconfig kconfigwidgets kcoreaddons - kdbusaddons ki18n kiconthemes kio kpackage kservice kwidgetsaddons + kdbusaddons kiconthemes kio kpackage kservice kwidgetsaddons kxmlgui libraw1394 pciutils solid ]; - propagatedBuildInputs = [ kdeclarative kdelibs4support ]; + propagatedBuildInputs = [ kdeclarative kdelibs4support ki18n ]; postInstall = '' wrapKDEProgram "$out/bin/kinfocenter" ''; diff --git a/pkgs/desktops/plasma-5.4/kmenuedit.nix b/pkgs/desktops/plasma-5.4/kmenuedit.nix index b041d8dcedc8..a7a89678e67f 100644 --- a/pkgs/desktops/plasma-5.4/kmenuedit.nix +++ b/pkgs/desktops/plasma-5.4/kmenuedit.nix @@ -9,9 +9,9 @@ plasmaPackage { kdoctools ]; buildInputs = [ - ki18n kxmlgui kdbusaddons kiconthemes kio sonnet + kxmlgui kdbusaddons kiconthemes kio sonnet ]; - propagatedBuildInputs = [ kdelibs4support ]; + propagatedBuildInputs = [ kdelibs4support ki18n ]; postInstall = '' wrapKDEProgram "$out/bin/kmenuedit" ''; diff --git a/pkgs/desktops/plasma-5.4/kscreen.nix b/pkgs/desktops/plasma-5.4/kscreen.nix index fb75548d8404..7123ead146a7 100644 --- a/pkgs/desktops/plasma-5.4/kscreen.nix +++ b/pkgs/desktops/plasma-5.4/kscreen.nix @@ -9,10 +9,10 @@ plasmaPackage { extra-cmake-modules ]; buildInputs = [ - kconfig kconfigwidgets kdbusaddons ki18n kwidgetsaddons kxmlgui + kconfig kconfigwidgets kdbusaddons kwidgetsaddons kxmlgui libkscreen ]; - propagatedBuildInputs = [ kglobalaccel qtdeclarative ]; + propagatedBuildInputs = [ kglobalaccel ki18n qtdeclarative ]; postInstall = '' wrapKDEProgram "$out/bin/kscreen-console" ''; diff --git a/pkgs/desktops/plasma-5.4/ksshaskpass.nix b/pkgs/desktops/plasma-5.4/ksshaskpass.nix index d20a44df0ac8..0a68893e0bf6 100644 --- a/pkgs/desktops/plasma-5.4/ksshaskpass.nix +++ b/pkgs/desktops/plasma-5.4/ksshaskpass.nix @@ -1,24 +1,12 @@ -{ plasmaPackage -, extra-cmake-modules -, kdoctools -, kcoreaddons -, ki18n -, kwallet -, kwidgetsaddons +{ plasmaPackage, extra-cmake-modules, kdoctools, kcoreaddons +, ki18n, kwallet, kwidgetsaddons }: plasmaPackage { name = "ksshaskpass"; - nativeBuildInputs = [ - extra-cmake-modules - kdoctools - ]; - buildInputs = [ - kcoreaddons - ki18n - kwallet - kwidgetsaddons - ]; + nativeBuildInputs = [ extra-cmake-modules kdoctools ]; + buildInputs = [ kcoreaddons kwallet kwidgetsaddons ]; + propagatedBuildInputs = [ ki18n ]; postInstall = '' wrapKDEProgram "$out/bin/ksshaskpass" ''; diff --git a/pkgs/desktops/plasma-5.4/ksysguard.nix b/pkgs/desktops/plasma-5.4/ksysguard.nix index d415e726d02f..5f24d68bb390 100644 --- a/pkgs/desktops/plasma-5.4/ksysguard.nix +++ b/pkgs/desktops/plasma-5.4/ksysguard.nix @@ -10,10 +10,9 @@ plasmaPackage { kdoctools ]; buildInputs = [ - kconfig kcoreaddons ki18n kitemviews knewstuff kiconthemes - libksysguard + kconfig kcoreaddons kitemviews knewstuff kiconthemes libksysguard ]; - propagatedBuildInputs = [ kdelibs4support ]; + propagatedBuildInputs = [ kdelibs4support ki18n ]; postInstall = '' wrapKDEProgram "$out/bin/ksysguardd" wrapKDEProgram "$out/bin/ksysguard" diff --git a/pkgs/desktops/plasma-5.4/kwin/default.nix b/pkgs/desktops/plasma-5.4/kwin/default.nix index 051161c399fb..e2d1cd62c6d2 100644 --- a/pkgs/desktops/plasma-5.4/kwin/default.nix +++ b/pkgs/desktops/plasma-5.4/kwin/default.nix @@ -15,13 +15,12 @@ plasmaPackage { ]; buildInputs = [ epoxy kcompletion kcmutils kconfig kconfigwidgets kcoreaddons - kcrash kdecoration ki18n kiconthemes kinit kio knewstuff - knotifications kpackage kservice kwayland kwidgetsaddons - kwindowsystem kxmlgui libinput libICE libSM plasma-framework - qtdeclarative qtscript qtx11extras udev wayland - xcb-util-cursor + kcrash kdecoration kiconthemes kinit kio knewstuff knotifications + kpackage kservice kwayland kwidgetsaddons kwindowsystem kxmlgui + libinput libICE libSM plasma-framework qtdeclarative qtscript + qtx11extras udev wayland xcb-util-cursor ]; - propagatedBuildInputs = [ kactivities kdeclarative kglobalaccel ]; + propagatedBuildInputs = [ kactivities kdeclarative kglobalaccel ki18n ]; patches = [ ./kwin-import-plugin-follow-symlinks.patch ]; postInstall = '' wrapKDEProgram "$out/bin/kwin_x11" diff --git a/pkgs/desktops/plasma-5.4/kwrited.nix b/pkgs/desktops/plasma-5.4/kwrited.nix index afd69073227c..a6ed9d9bb287 100644 --- a/pkgs/desktops/plasma-5.4/kwrited.nix +++ b/pkgs/desktops/plasma-5.4/kwrited.nix @@ -1,22 +1,10 @@ -{ plasmaPackage -, extra-cmake-modules -, kcoreaddons -, ki18n -, kpty -, knotifications -, kdbusaddons +{ plasmaPackage, extra-cmake-modules, kcoreaddons, ki18n, kpty +, knotifications, kdbusaddons }: plasmaPackage { name = "kwrited"; - nativeBuildInputs = [ - extra-cmake-modules - ]; - buildInputs = [ - kcoreaddons - ki18n - kpty - knotifications - kdbusaddons - ]; + nativeBuildInputs = [ extra-cmake-modules ]; + buildInputs = [ kcoreaddons kpty knotifications kdbusaddons ]; + propagatedBuildInputs = [ ki18n ]; } diff --git a/pkgs/desktops/plasma-5.4/libkscreen/default.nix b/pkgs/desktops/plasma-5.4/libkscreen/default.nix index 8f5212e76c85..9fccbd6834c3 100644 --- a/pkgs/desktops/plasma-5.4/libkscreen/default.nix +++ b/pkgs/desktops/plasma-5.4/libkscreen/default.nix @@ -11,6 +11,8 @@ plasmaPackage { ]; buildInputs = [ libXrandr + ]; + propagatedBuildInputs = [ qtx11extras ]; } diff --git a/pkgs/desktops/plasma-5.4/milou.nix b/pkgs/desktops/plasma-5.4/milou.nix index 767848ccc0e2..c9a829731a91 100644 --- a/pkgs/desktops/plasma-5.4/milou.nix +++ b/pkgs/desktops/plasma-5.4/milou.nix @@ -9,7 +9,7 @@ plasmaPackage { extra-cmake-modules ]; buildInputs = [ - qtscript kcoreaddons ki18n kservice plasma-framework krunner + qtscript kcoreaddons kservice plasma-framework krunner ]; - propagatedBuildInputs = [ kdeclarative qtdeclarative ]; + propagatedBuildInputs = [ kdeclarative ki18n qtdeclarative ]; } diff --git a/pkgs/desktops/plasma-5.4/oxygen.nix b/pkgs/desktops/plasma-5.4/oxygen.nix index 1dba49d93f4e..882a5ea582bc 100644 --- a/pkgs/desktops/plasma-5.4/oxygen.nix +++ b/pkgs/desktops/plasma-5.4/oxygen.nix @@ -9,10 +9,10 @@ plasmaPackage { extra-cmake-modules ]; buildInputs = [ - ki18n kcmutils kconfig kdecoration kguiaddons kwidgetsaddons + kcmutils kconfig kdecoration kguiaddons kwidgetsaddons kservice kcompletion kwindowsystem qtx11extras ]; - propagatedBuildInputs = [ frameworkintegration ]; + propagatedBuildInputs = [ frameworkintegration ki18n ]; postInstall = '' wrapKDEProgram "$out/bin/oxygen-demo5" wrapKDEProgram "$out/bin/oxygen-settings5" diff --git a/pkgs/desktops/plasma-5.4/plasma-desktop/default.nix b/pkgs/desktops/plasma-5.4/plasma-desktop/default.nix index e485262ab266..83f1d0c0d06c 100644 --- a/pkgs/desktops/plasma-5.4/plasma-desktop/default.nix +++ b/pkgs/desktops/plasma-5.4/plasma-desktop/default.nix @@ -17,7 +17,7 @@ plasmaPackage { ]; buildInputs = [ attica boost fontconfig kcmutils kdbusaddons kded - ki18n kitemmodels knewstuff knotifications + kitemmodels knewstuff knotifications knotifyconfig kpeople krunner kwallet kwin libcanberra_kde libXcursor libpulseaudio libXft libxkbfile phonon plasma-framework plasma-workspace qtdeclarative qtx11extras qtsvg xf86inputevdev @@ -25,7 +25,7 @@ plasmaPackage { ]; propagatedBuildInputs = [ baloo kactivities kauth kdeclarative kdelibs4support kemoticons - kglobalaccel + kglobalaccel ki18n ]; patches = [ (substituteAll { diff --git a/pkgs/desktops/plasma-5.4/plasma-mediacenter.nix b/pkgs/desktops/plasma-5.4/plasma-mediacenter.nix index 74b4bece7e28..e1f2dab72308 100644 --- a/pkgs/desktops/plasma-5.4/plasma-mediacenter.nix +++ b/pkgs/desktops/plasma-5.4/plasma-mediacenter.nix @@ -10,8 +10,10 @@ plasmaPackage { extra-cmake-modules ]; buildInputs = [ - kconfig kcoreaddons kguiaddons ki18n kio kservice plasma-framework + kconfig kcoreaddons kguiaddons kio kservice plasma-framework qtdeclarative qtmultimedia taglib ]; - propagatedBuildInputs = [ baloo kactivities kdeclarative kfilemetadata ]; + propagatedBuildInputs = [ + baloo kactivities kdeclarative kfilemetadata ki18n + ]; } diff --git a/pkgs/desktops/plasma-5.4/plasma-nm.nix b/pkgs/desktops/plasma-5.4/plasma-nm.nix index e244f586a817..b0904e957e68 100644 --- a/pkgs/desktops/plasma-5.4/plasma-nm.nix +++ b/pkgs/desktops/plasma-5.4/plasma-nm.nix @@ -14,13 +14,13 @@ plasmaPackage { kdoctools ]; buildInputs = [ - kcompletion kconfigwidgets kcoreaddons kdbusaddons ki18n - kiconthemes kinit kio kitemviews knotifications kservice kwallet + kcompletion kconfigwidgets kcoreaddons kdbusaddons kiconthemes + kinit kio kitemviews knotifications kservice kwallet kwidgetsaddons kwindowsystem kxmlgui mobile_broadband_provider_info modemmanager-qt networkmanager-qt openconnect plasma-framework solid ]; - propagatedBuildInputs = [ kdeclarative kdelibs4support qtdeclarative ]; + propagatedBuildInputs = [ kdeclarative kdelibs4support ki18n qtdeclarative ]; postInstall = '' wrapKDEProgram "$out/bin/kde5-nm-connection-editor" ''; diff --git a/pkgs/desktops/plasma-5.4/plasma-pa.nix b/pkgs/desktops/plasma-5.4/plasma-pa.nix index 2525dde0bcb2..a8334c2bdcdb 100644 --- a/pkgs/desktops/plasma-5.4/plasma-pa.nix +++ b/pkgs/desktops/plasma-5.4/plasma-pa.nix @@ -9,8 +9,7 @@ plasmaPackage { extra-cmake-modules ]; buildInputs = [ - glib kconfigwidgets kcoreaddons ki18n libpulseaudio - plasma-framework + glib kconfigwidgets kcoreaddons libpulseaudio plasma-framework ]; - propagatedBuildInputs = [ kdeclarative kglobalaccel ]; + propagatedBuildInputs = [ kdeclarative kglobalaccel ki18n ]; } diff --git a/pkgs/desktops/plasma-5.4/polkit-kde-agent.nix b/pkgs/desktops/plasma-5.4/polkit-kde-agent.nix index a38c68d62dcc..c1c57657a6b4 100644 --- a/pkgs/desktops/plasma-5.4/polkit-kde-agent.nix +++ b/pkgs/desktops/plasma-5.4/polkit-kde-agent.nix @@ -18,7 +18,6 @@ plasmaPackage { extra-cmake-modules ]; buildInputs = [ - ki18n kwindowsystem kdbusaddons kwidgetsaddons @@ -29,4 +28,5 @@ plasmaPackage { knotifications polkitQt ]; + propagatedBuildInputs = [ ki18n ]; } diff --git a/pkgs/desktops/plasma-5.4/powerdevil.nix b/pkgs/desktops/plasma-5.4/powerdevil.nix index 5ed8087d0ce9..22803256b99d 100644 --- a/pkgs/desktops/plasma-5.4/powerdevil.nix +++ b/pkgs/desktops/plasma-5.4/powerdevil.nix @@ -11,10 +11,10 @@ plasmaPackage { kdoctools ]; buildInputs = [ - kconfig kdbusaddons ki18n kidletime kio knotifyconfig libkscreen + kconfig kdbusaddons kidletime kio knotifyconfig libkscreen plasma-workspace solid udev ]; propagatedBuildInputs = [ - kactivities kauth kdelibs4support kglobalaccel qtx11extras + kactivities kauth kdelibs4support kglobalaccel ki18n qtx11extras ]; } diff --git a/pkgs/desktops/plasma-5.4/systemsettings.nix b/pkgs/desktops/plasma-5.4/systemsettings.nix index 36b9d322f19f..1c3ddfa7b062 100644 --- a/pkgs/desktops/plasma-5.4/systemsettings.nix +++ b/pkgs/desktops/plasma-5.4/systemsettings.nix @@ -10,10 +10,10 @@ plasmaPackage { kdoctools ]; buildInputs = [ - kitemviews kcmutils ki18n kio kservice kiconthemes kwindowsystem + kitemviews kcmutils kio kservice kiconthemes kwindowsystem kxmlgui kdbusaddons kconfig ]; - propagatedBuildInputs = [ khtml ]; + propagatedBuildInputs = [ khtml ki18n ]; postInstall = '' wrapKDEProgram "$out/bin/systemsettings5" ''; diff --git a/pkgs/development/libraries/kde-frameworks-5.14/baloo.nix b/pkgs/development/libraries/kde-frameworks-5.14/baloo.nix index 59133e404323..2cd7281125f4 100644 --- a/pkgs/development/libraries/kde-frameworks-5.14/baloo.nix +++ b/pkgs/development/libraries/kde-frameworks-5.14/baloo.nix @@ -7,10 +7,10 @@ kdeFramework { name = "baloo"; nativeBuildInputs = [ extra-cmake-modules ]; buildInputs = [ - kconfig kcrash kdbusaddons ki18n kidletime kio lmdb qtquick1 solid + kconfig kcrash kdbusaddons kidletime kio lmdb qtquick1 solid ]; propagatedBuildInputs = [ - kauth kcoreaddons kfilemetadata qtbase + kauth kcoreaddons kfilemetadata ki18n qtbase ]; postInstall = '' wrapKDEProgram "$out/bin/baloo_file" diff --git a/pkgs/development/libraries/kde-frameworks-5.14/frameworkintegration.nix b/pkgs/development/libraries/kde-frameworks-5.14/frameworkintegration.nix index ad30cc87ecff..2470d5378b4a 100644 --- a/pkgs/development/libraries/kde-frameworks-5.14/frameworkintegration.nix +++ b/pkgs/development/libraries/kde-frameworks-5.14/frameworkintegration.nix @@ -1,33 +1,16 @@ -{ kdeFramework, lib -, extra-cmake-modules -, kbookmarks -, kcompletion -, kconfig -, kconfigwidgets -, ki18n -, kiconthemes -, kio -, knotifications -, kwidgetsaddons -, libXcursor -, qtx11extras +{ kdeFramework, lib, extra-cmake-modules, kbookmarks, kcompletion +, kconfig, kconfigwidgets, ki18n, kiconthemes, kio, knotifications +, kwidgetsaddons, libXcursor, qtx11extras }: kdeFramework { name = "frameworkintegration"; nativeBuildInputs = [ extra-cmake-modules ]; buildInputs = [ - kbookmarks - kcompletion - kconfig - ki18n - kio - knotifications - kwidgetsaddons + kbookmarks kcompletion kconfig kio knotifications kwidgetsaddons libXcursor - qtx11extras ]; - propagatedBuildInputs = [ kconfigwidgets kiconthemes ]; + propagatedBuildInputs = [ kconfigwidgets ki18n kiconthemes qtx11extras ]; meta = { maintainers = [ lib.maintainers.ttuegel ]; }; diff --git a/pkgs/development/libraries/kde-frameworks-5.14/kactivities.nix b/pkgs/development/libraries/kde-frameworks-5.14/kactivities.nix index cc39129815f8..45ed7da463c3 100644 --- a/pkgs/development/libraries/kde-frameworks-5.14/kactivities.nix +++ b/pkgs/development/libraries/kde-frameworks-5.14/kactivities.nix @@ -7,10 +7,10 @@ kdeFramework { name = "kactivities"; nativeBuildInputs = [ extra-cmake-modules ]; buildInputs = [ - boost kcmutils kconfig kcoreaddons kdbusaddons ki18n kio kservice + boost kcmutils kconfig kcoreaddons kdbusaddons kio kservice kwindowsystem kxmlgui ]; - propagatedBuildInputs = [ kdeclarative kglobalaccel qtdeclarative ]; + propagatedBuildInputs = [ kdeclarative kglobalaccel ki18n qtdeclarative ]; postInstall = '' wrapKDEProgram "$out/bin/kactivitymanagerd" ''; diff --git a/pkgs/development/libraries/kde-frameworks-5.14/kcmutils/default.nix b/pkgs/development/libraries/kde-frameworks-5.14/kcmutils/default.nix index 9fb366ae403c..a0eb805e62b5 100644 --- a/pkgs/development/libraries/kde-frameworks-5.14/kcmutils/default.nix +++ b/pkgs/development/libraries/kde-frameworks-5.14/kcmutils/default.nix @@ -7,9 +7,9 @@ kdeFramework { name = "kcmutils"; nativeBuildInputs = [ extra-cmake-modules ]; buildInputs = [ - kcoreaddons ki18n kiconthemes kitemviews kpackage kxmlgui + kcoreaddons kiconthemes kitemviews kpackage kxmlgui ]; - propagatedBuildInputs = [ kconfigwidgets kdeclarative kservice ]; + propagatedBuildInputs = [ kconfigwidgets kdeclarative ki18n kservice ]; patches = [ ./kcmutils-pluginselector-follow-symlinks.patch ]; meta = { maintainers = [ lib.maintainers.ttuegel ]; diff --git a/pkgs/development/libraries/kde-frameworks-5.14/kconfigwidgets/default.nix b/pkgs/development/libraries/kde-frameworks-5.14/kconfigwidgets/default.nix index aa6fe8770814..580914934b67 100644 --- a/pkgs/development/libraries/kde-frameworks-5.14/kconfigwidgets/default.nix +++ b/pkgs/development/libraries/kde-frameworks-5.14/kconfigwidgets/default.nix @@ -5,8 +5,8 @@ kdeFramework { name = "kconfigwidgets"; nativeBuildInputs = [ extra-cmake-modules kdoctools ]; - buildInputs = [ kguiaddons ki18n ]; - propagatedBuildInputs = [ kauth kconfig kcodecs kwidgetsaddons ]; + buildInputs = [ kguiaddons ]; + propagatedBuildInputs = [ kauth kconfig kcodecs ki18n kwidgetsaddons ]; patches = [ ./kconfigwidgets-helpclient-follow-symlinks.patch ]; postInstall = '' wrapKDEProgram "$out/bin/preparetips5" diff --git a/pkgs/development/libraries/kde-frameworks-5.14/kdeclarative.nix b/pkgs/development/libraries/kde-frameworks-5.14/kdeclarative.nix index 10cd2d602a6b..d74f76ae1515 100644 --- a/pkgs/development/libraries/kde-frameworks-5.14/kdeclarative.nix +++ b/pkgs/development/libraries/kde-frameworks-5.14/kdeclarative.nix @@ -1,26 +1,15 @@ -{ kdeFramework, lib -, extra-cmake-modules -, epoxy -, kconfig -, kglobalaccel -, kguiaddons -, ki18n -, kiconthemes -, kio -, kpackage -, kwidgetsaddons -, kwindowsystem -, pkgconfig -, qtdeclarative +{ kdeFramework, lib, extra-cmake-modules, epoxy, kconfig +, kglobalaccel, kguiaddons, ki18n, kiconthemes, kio, kpackage +, kwidgetsaddons, kwindowsystem, pkgconfig, qtdeclarative }: kdeFramework { name = "kdeclarative"; nativeBuildInputs = [ extra-cmake-modules ]; buildInputs = [ - epoxy kguiaddons ki18n kiconthemes kio kwidgetsaddons kwindowsystem + epoxy kguiaddons kiconthemes kio kwidgetsaddons kwindowsystem ]; - propagatedBuildInputs = [ kconfig kglobalaccel kpackage qtdeclarative ]; + propagatedBuildInputs = [ kconfig kglobalaccel ki18n kpackage qtdeclarative ]; postInstall = '' wrapKDEProgram "$out/bin/kpackagelauncherqml" ''; diff --git a/pkgs/development/libraries/kde-frameworks-5.14/kdelibs4support.nix b/pkgs/development/libraries/kde-frameworks-5.14/kdelibs4support.nix index 5deed2036b69..fedba82ccdfd 100644 --- a/pkgs/development/libraries/kde-frameworks-5.14/kdelibs4support.nix +++ b/pkgs/development/libraries/kde-frameworks-5.14/kdelibs4support.nix @@ -13,13 +13,13 @@ kdeFramework { name = "kdelibs4support"; nativeBuildInputs = [ extra-cmake-modules kdoctools ]; buildInputs = [ - kcompletion kconfig ki18n kio kservice kwidgetsaddons + kcompletion kconfig kio kservice kwidgetsaddons kxmlgui networkmanager qtsvg qtx11extras xlibs.libSM ]; propagatedBuildInputs = [ kauth karchive kconfigwidgets kcoreaddons kcrash kdbusaddons - kdesignerplugin kemoticons kglobalaccel kguiaddons kiconthemes - kitemmodels kinit knotifications kparts ktextwidgets + kdesignerplugin kemoticons kglobalaccel kguiaddons ki18n + kiconthemes kitemmodels kinit knotifications kparts ktextwidgets kunitconversion kwindowsystem ]; cmakeFlags = [ diff --git a/pkgs/development/libraries/kde-frameworks-5.14/kdesu.nix b/pkgs/development/libraries/kde-frameworks-5.14/kdesu.nix index 4503d8bcd109..364fbd6a720b 100644 --- a/pkgs/development/libraries/kde-frameworks-5.14/kdesu.nix +++ b/pkgs/development/libraries/kde-frameworks-5.14/kdesu.nix @@ -1,16 +1,12 @@ -{ kdeFramework, lib -, extra-cmake-modules -, kcoreaddons -, ki18n -, kpty +{ kdeFramework, lib, extra-cmake-modules, kcoreaddons, ki18n, kpty , kservice }: kdeFramework { name = "kdesu"; nativeBuildInputs = [ extra-cmake-modules ]; - buildInputs = [ kcoreaddons ki18n kservice ]; - propagatedBuildInputs = [ kpty ]; + buildInputs = [ kcoreaddons kservice ]; + propagatedBuildInputs = [ ki18n kpty ]; meta = { maintainers = [ lib.maintainers.ttuegel ]; }; diff --git a/pkgs/development/libraries/kde-frameworks-5.14/kdewebkit.nix b/pkgs/development/libraries/kde-frameworks-5.14/kdewebkit.nix index 52ae0162b864..1922eaf010c3 100644 --- a/pkgs/development/libraries/kde-frameworks-5.14/kdewebkit.nix +++ b/pkgs/development/libraries/kde-frameworks-5.14/kdewebkit.nix @@ -1,21 +1,12 @@ -{ kdeFramework, lib -, extra-cmake-modules -, kconfig -, kcoreaddons -, ki18n -, kio -, kjobwidgets -, kparts -, kservice -, kwallet -, qtwebkit +{ kdeFramework, lib, extra-cmake-modules, kconfig, kcoreaddons +, ki18n, kio, kjobwidgets, kparts, kservice, kwallet, qtwebkit }: kdeFramework { name = "kdewebkit"; nativeBuildInputs = [ extra-cmake-modules ]; - buildInputs = [ kconfig kcoreaddons ki18n kio kjobwidgets kparts kservice kwallet ]; - propagatedBuildInputs = [ qtwebkit ]; + buildInputs = [ kconfig kcoreaddons kio kjobwidgets kparts kservice kwallet ]; + propagatedBuildInputs = [ ki18n qtwebkit ]; meta = { maintainers = [ lib.maintainers.ttuegel ]; }; diff --git a/pkgs/development/libraries/kde-frameworks-5.14/kdoctools/default.nix b/pkgs/development/libraries/kde-frameworks-5.14/kdoctools/default.nix index 0ec13d1a15c1..0eeaf89c58bb 100644 --- a/pkgs/development/libraries/kde-frameworks-5.14/kdoctools/default.nix +++ b/pkgs/development/libraries/kde-frameworks-5.14/kdoctools/default.nix @@ -1,17 +1,12 @@ -{ kdeFramework, lib -, extra-cmake-modules -, docbook_xml_dtd_45 -, docbook5_xsl -, karchive -, ki18n -, perl -, perlPackages +{ kdeFramework, lib, extra-cmake-modules, docbook_xml_dtd_45 +, docbook5_xsl, karchive, ki18n, perl, perlPackages }: kdeFramework { name = "kdoctools"; nativeBuildInputs = [ extra-cmake-modules ]; - buildInputs = [ karchive ki18n ]; + buildInputs = [ karchive ]; + propagatedBuildInputs = [ ki18n ]; propagatedNativeBuildInputs = [ perl perlPackages.URI ]; cmakeFlags = [ "-DDocBookXML4_DTD_DIR=${docbook_xml_dtd_45}/xml/dtd/docbook" diff --git a/pkgs/development/libraries/kde-frameworks-5.14/kfilemetadata.nix b/pkgs/development/libraries/kde-frameworks-5.14/kfilemetadata.nix index 53c509417f21..92ca1f26b93b 100644 --- a/pkgs/development/libraries/kde-frameworks-5.14/kfilemetadata.nix +++ b/pkgs/development/libraries/kde-frameworks-5.14/kfilemetadata.nix @@ -1,21 +1,12 @@ -{ kdeFramework, lib -, extra-cmake-modules -, attr -, ebook_tools -, exiv2 -, ffmpeg -, karchive -, ki18n -, popplerQt -, qtbase -, taglib +{ kdeFramework, lib, extra-cmake-modules, attr, ebook_tools, exiv2 +, ffmpeg, karchive, ki18n, popplerQt, qtbase, taglib }: kdeFramework { name = "kfilemetadata"; nativeBuildInputs = [ extra-cmake-modules ]; - buildInputs = [ attr ebook_tools exiv2 ffmpeg karchive ki18n popplerQt taglib ]; - propagatedBuildInputs = [ qtbase ]; + buildInputs = [ attr ebook_tools exiv2 ffmpeg karchive popplerQt taglib ]; + propagatedBuildInputs = [ qtbase ki18n ]; meta = { maintainers = [ lib.maintainers.ttuegel ]; }; diff --git a/pkgs/development/libraries/kde-frameworks-5.14/kiconthemes.nix b/pkgs/development/libraries/kde-frameworks-5.14/kiconthemes.nix index 862c17f104f0..02b516afedc6 100644 --- a/pkgs/development/libraries/kde-frameworks-5.14/kiconthemes.nix +++ b/pkgs/development/libraries/kde-frameworks-5.14/kiconthemes.nix @@ -1,15 +1,12 @@ -{ kdeFramework, lib -, extra-cmake-modules -, kconfigwidgets -, ki18n -, kitemviews -, qtsvg +{ kdeFramework, lib, extra-cmake-modules, kconfigwidgets, ki18n +, kitemviews, qtsvg }: kdeFramework { name = "kiconthemes"; nativeBuildInputs = [ extra-cmake-modules ]; - buildInputs = [ kconfigwidgets ki18n kitemviews qtsvg ]; + buildInputs = [ kconfigwidgets kitemviews qtsvg ]; + propagatedBuildInputs = [ ki18n ]; meta = { maintainers = [ lib.maintainers.ttuegel ]; }; diff --git a/pkgs/development/libraries/kde-frameworks-5.14/kinit/default.nix b/pkgs/development/libraries/kde-frameworks-5.14/kinit/default.nix index 47f1aec72de5..8caf17acd1a1 100644 --- a/pkgs/development/libraries/kde-frameworks-5.14/kinit/default.nix +++ b/pkgs/development/libraries/kde-frameworks-5.14/kinit/default.nix @@ -1,13 +1,5 @@ -{ kdeFramework, lib -, extra-cmake-modules -, kconfig -, kcrash -, kdoctools -, ki18n -, kio -, kservice -, kwindowsystem -, libcap +{ kdeFramework, lib, extra-cmake-modules, kconfig, kcrash +, kdoctools, ki18n, kio, kservice, kwindowsystem, libcap , libcap_progs }: @@ -16,7 +8,8 @@ kdeFramework { name = "kinit"; nativeBuildInputs = [ extra-cmake-modules kdoctools libcap_progs ]; - buildInputs = [ kconfig kcrash ki18n kio kservice kwindowsystem libcap ]; + buildInputs = [ kconfig kcrash kio kservice kwindowsystem libcap ]; + propagatedBuildInputs = [ ki18n ]; patches = [ ./0001-kinit-libpath.patch ]; meta = { maintainers = [ lib.maintainers.ttuegel ]; diff --git a/pkgs/development/libraries/kde-frameworks-5.14/kio.nix b/pkgs/development/libraries/kde-frameworks-5.14/kio.nix index 6605de03e38b..b81be46b5d55 100644 --- a/pkgs/development/libraries/kde-frameworks-5.14/kio.nix +++ b/pkgs/development/libraries/kde-frameworks-5.14/kio.nix @@ -1,27 +1,8 @@ -{ kdeFramework, lib -, extra-cmake-modules -, acl -, karchive -, kbookmarks -, kcompletion -, kconfig -, kconfigwidgets -, kcoreaddons -, kdbusaddons -, kdoctools -, ki18n -, kiconthemes -, kitemviews -, kjobwidgets -, knotifications -, kservice -, ktextwidgets -, kwallet -, kwidgetsaddons -, kwindowsystem -, kxmlgui -, qtscript -, qtx11extras +{ kdeFramework, lib, extra-cmake-modules, acl, karchive +, kbookmarks, kcompletion, kconfig, kconfigwidgets, kcoreaddons +, kdbusaddons, kdoctools, ki18n, kiconthemes, kitemviews +, kjobwidgets, knotifications, kservice, ktextwidgets, kwallet +, kwidgetsaddons, kwindowsystem, kxmlgui, qtscript, qtx11extras , solid }: @@ -29,12 +10,13 @@ kdeFramework { name = "kio"; nativeBuildInputs = [ extra-cmake-modules kdoctools ]; buildInputs = [ - acl karchive kconfig kcoreaddons kdbusaddons ki18n kiconthemes + acl karchive kconfig kcoreaddons kdbusaddons kiconthemes knotifications ktextwidgets kwallet kwidgetsaddons kwindowsystem - qtscript qtx11extras + qtscript ]; propagatedBuildInputs = [ - kbookmarks kcompletion kconfigwidgets kitemviews kjobwidgets kservice kxmlgui solid + kbookmarks kcompletion kconfigwidgets ki18n kitemviews kjobwidgets + kservice kxmlgui solid qtx11extras ]; postInstall = '' wrapKDEProgram "$out/bin/kcookiejar5" diff --git a/pkgs/development/libraries/kde-frameworks-5.14/kjsembed.nix b/pkgs/development/libraries/kde-frameworks-5.14/kjsembed.nix index bbc5169a1cc8..6997e48d07b7 100644 --- a/pkgs/development/libraries/kde-frameworks-5.14/kjsembed.nix +++ b/pkgs/development/libraries/kde-frameworks-5.14/kjsembed.nix @@ -1,8 +1,4 @@ -{ kdeFramework, lib -, extra-cmake-modules -, kdoctools -, ki18n -, kjs +{ kdeFramework, lib, extra-cmake-modules, kdoctools, ki18n, kjs , qtsvg }: diff --git a/pkgs/development/libraries/kde-frameworks-5.14/knewstuff.nix b/pkgs/development/libraries/kde-frameworks-5.14/knewstuff.nix index d0b884f8f680..631c431124b9 100644 --- a/pkgs/development/libraries/kde-frameworks-5.14/knewstuff.nix +++ b/pkgs/development/libraries/kde-frameworks-5.14/knewstuff.nix @@ -1,28 +1,16 @@ -{ kdeFramework, lib -, extra-cmake-modules -, attica -, karchive -, kcompletion -, kconfig -, kcoreaddons -, ki18n -, kiconthemes -, kio -, kitemviews -, kservice -, ktextwidgets -, kwidgetsaddons -, kxmlgui +{ kdeFramework, lib, extra-cmake-modules, attica, karchive +, kcompletion, kconfig, kcoreaddons, ki18n, kiconthemes, kio +, kitemviews, kservice, ktextwidgets, kwidgetsaddons, kxmlgui }: kdeFramework { name = "knewstuff"; nativeBuildInputs = [ extra-cmake-modules ]; buildInputs = [ - karchive kcompletion kconfig kcoreaddons ki18n kiconthemes kio + karchive kcompletion kconfig kcoreaddons kiconthemes kio kitemviews ktextwidgets kwidgetsaddons ]; - propagatedBuildInputs = [ attica kservice kxmlgui ]; + propagatedBuildInputs = [ attica ki18n kservice kxmlgui ]; meta = { maintainers = [ lib.maintainers.ttuegel ]; }; diff --git a/pkgs/development/libraries/kde-frameworks-5.14/knotifyconfig.nix b/pkgs/development/libraries/kde-frameworks-5.14/knotifyconfig.nix index f6509a166d48..c4b3408a7944 100644 --- a/pkgs/development/libraries/kde-frameworks-5.14/knotifyconfig.nix +++ b/pkgs/development/libraries/kde-frameworks-5.14/knotifyconfig.nix @@ -1,16 +1,12 @@ -{ kdeFramework, lib -, extra-cmake-modules -, kcompletion -, kconfig -, ki18n -, kio -, phonon +{ kdeFramework, lib, extra-cmake-modules, kcompletion, kconfig +, ki18n, kio, phonon }: kdeFramework { name = "knotifyconfig"; nativeBuildInputs = [ extra-cmake-modules ]; - buildInputs = [ kcompletion kconfig ki18n kio phonon ]; + buildInputs = [ kcompletion kconfig kio phonon ]; + propagatedBuildInputs = [ ki18n ]; meta = { maintainers = [ lib.maintainers.ttuegel ]; }; diff --git a/pkgs/development/libraries/kde-frameworks-5.14/kpackage/default.nix b/pkgs/development/libraries/kde-frameworks-5.14/kpackage/default.nix index f7c3689503ba..7c3a1afee72a 100644 --- a/pkgs/development/libraries/kde-frameworks-5.14/kpackage/default.nix +++ b/pkgs/development/libraries/kde-frameworks-5.14/kpackage/default.nix @@ -10,8 +10,8 @@ kdeFramework { name = "kpackage"; nativeBuildInputs = [ extra-cmake-modules kdoctools ]; - buildInputs = [ karchive kconfig ki18n ]; - propagatedBuildInputs = [ kcoreaddons ]; + buildInputs = [ karchive kconfig ]; + propagatedBuildInputs = [ kcoreaddons ki18n ]; patches = [ ./0001-allow-external-paths.patch ]; postInstall = '' wrapKDEProgram "$out/bin/kpackagetool5" diff --git a/pkgs/development/libraries/kde-frameworks-5.14/kparts.nix b/pkgs/development/libraries/kde-frameworks-5.14/kparts.nix index 96c1b984ab7d..1c3e0b2cbc51 100644 --- a/pkgs/development/libraries/kde-frameworks-5.14/kparts.nix +++ b/pkgs/development/libraries/kde-frameworks-5.14/kparts.nix @@ -1,26 +1,16 @@ -{ kdeFramework, lib -, extra-cmake-modules -, kconfig -, kcoreaddons -, ki18n -, kiconthemes -, kio -, kjobwidgets -, knotifications -, kservice -, ktextwidgets -, kwidgetsaddons -, kxmlgui +{ kdeFramework, lib, extra-cmake-modules, kconfig, kcoreaddons +, ki18n, kiconthemes, kio, kjobwidgets, knotifications, kservice +, ktextwidgets, kwidgetsaddons, kxmlgui }: kdeFramework { name = "kparts"; nativeBuildInputs = [ extra-cmake-modules ]; buildInputs = [ - kconfig kcoreaddons ki18n kiconthemes kjobwidgets knotifications + kconfig kcoreaddons kiconthemes kjobwidgets knotifications kservice kwidgetsaddons ]; - propagatedBuildInputs = [ kio ktextwidgets kxmlgui ]; + propagatedBuildInputs = [ ki18n kio ktextwidgets kxmlgui ]; meta = { maintainers = [ lib.maintainers.ttuegel ]; }; diff --git a/pkgs/development/libraries/kde-frameworks-5.14/kpeople.nix b/pkgs/development/libraries/kde-frameworks-5.14/kpeople.nix index ffc028d97c32..4c3877e7efd2 100644 --- a/pkgs/development/libraries/kde-frameworks-5.14/kpeople.nix +++ b/pkgs/development/libraries/kde-frameworks-5.14/kpeople.nix @@ -1,19 +1,14 @@ -{ kdeFramework, lib -, extra-cmake-modules -, kcoreaddons -, ki18n -, kitemviews -, kservice -, kwidgetsaddons -, qtdeclarative +{ kdeFramework, lib, extra-cmake-modules, kcoreaddons, ki18n +, kitemviews, kservice, kwidgetsaddons, qtdeclarative }: kdeFramework { name = "kpeople"; nativeBuildInputs = [ extra-cmake-modules ]; buildInputs = [ - kcoreaddons ki18n kitemviews kservice kwidgetsaddons qtdeclarative + kcoreaddons kitemviews kservice kwidgetsaddons ]; + propagatedBuildInputs = [ ki18n qtdeclarative ]; meta = { maintainers = [ lib.maintainers.ttuegel ]; }; diff --git a/pkgs/development/libraries/kde-frameworks-5.14/kpty.nix b/pkgs/development/libraries/kde-frameworks-5.14/kpty.nix index 72ac842a00a7..2e34e6f674ce 100644 --- a/pkgs/development/libraries/kde-frameworks-5.14/kpty.nix +++ b/pkgs/development/libraries/kde-frameworks-5.14/kpty.nix @@ -1,14 +1,9 @@ -{ kdeFramework, lib -, extra-cmake-modules -, kcoreaddons -, ki18n -}: +{ kdeFramework, lib, extra-cmake-modules, kcoreaddons, ki18n }: kdeFramework { name = "kpty"; nativeBuildInputs = [ extra-cmake-modules ]; - buildInputs = [ ki18n ]; - propagatedBuildInputs = [ kcoreaddons ]; + propagatedBuildInputs = [ kcoreaddons ki18n ]; meta = { maintainers = [ lib.maintainers.ttuegel ]; }; diff --git a/pkgs/development/libraries/kde-frameworks-5.14/kross.nix b/pkgs/development/libraries/kde-frameworks-5.14/kross.nix index ca14e9827e2d..7c6f079feaa7 100644 --- a/pkgs/development/libraries/kde-frameworks-5.14/kross.nix +++ b/pkgs/development/libraries/kde-frameworks-5.14/kross.nix @@ -1,15 +1,6 @@ -{ kdeFramework, lib -, extra-cmake-modules -, kcompletion -, kcoreaddons -, kdoctools -, ki18n -, kiconthemes -, kio -, kparts -, kwidgetsaddons -, kxmlgui -, qtscript +{ kdeFramework, lib, extra-cmake-modules, kcompletion, kcoreaddons +, kdoctools, ki18n, kiconthemes, kio, kparts, kwidgetsaddons +, kxmlgui, qtscript }: kdeFramework { diff --git a/pkgs/development/libraries/kde-frameworks-5.14/krunner.nix b/pkgs/development/libraries/kde-frameworks-5.14/krunner.nix index 618494ef5c58..0891654eb884 100644 --- a/pkgs/development/libraries/kde-frameworks-5.14/krunner.nix +++ b/pkgs/development/libraries/kde-frameworks-5.14/krunner.nix @@ -1,13 +1,5 @@ -{ kdeFramework, lib -, extra-cmake-modules -, kconfig -, kcoreaddons -, ki18n -, kio -, kservice -, plasma-framework -, qtquick1 -, solid +{ kdeFramework, lib, extra-cmake-modules, kconfig, kcoreaddons +, ki18n, kio, kservice, plasma-framework, qtquick1, solid , threadweaver }: @@ -15,9 +7,9 @@ kdeFramework { name = "krunner"; nativeBuildInputs = [ extra-cmake-modules ]; buildInputs = [ - kconfig kcoreaddons ki18n kio kservice qtquick1 solid threadweaver + kconfig kcoreaddons kio kservice qtquick1 solid threadweaver ]; - propagatedBuildInputs = [ plasma-framework ]; + propagatedBuildInputs = [ ki18n plasma-framework ]; meta = { maintainers = [ lib.maintainers.ttuegel ]; }; diff --git a/pkgs/development/libraries/kde-frameworks-5.14/kservice/default.nix b/pkgs/development/libraries/kde-frameworks-5.14/kservice/default.nix index b46797f5e0e7..b1c47ec53d64 100644 --- a/pkgs/development/libraries/kde-frameworks-5.14/kservice/default.nix +++ b/pkgs/development/libraries/kde-frameworks-5.14/kservice/default.nix @@ -1,20 +1,13 @@ -{ kdeFramework, lib -, extra-cmake-modules -, kconfig -, kcoreaddons -, kcrash -, kdbusaddons -, kdoctools -, ki18n -, kwindowsystem +{ kdeFramework, lib, extra-cmake-modules, kconfig, kcoreaddons +, kcrash, kdbusaddons, kdoctools, ki18n, kwindowsystem }: kdeFramework { name = "kservice"; setupHook = ./setup-hook.sh; nativeBuildInputs = [ extra-cmake-modules kdoctools ]; - buildInputs = [ kcoreaddons kcrash kdbusaddons ki18n kwindowsystem ]; - propagatedBuildInputs = [ kconfig ]; + buildInputs = [ kcoreaddons kcrash kdbusaddons kwindowsystem ]; + propagatedBuildInputs = [ kconfig ki18n ]; patches = [ ./kservice-kbuildsycoca-follow-symlinks.patch ./kservice-kbuildsycoca-no-canonicalize-path.patch diff --git a/pkgs/development/libraries/kde-frameworks-5.14/ktexteditor/default.nix b/pkgs/development/libraries/kde-frameworks-5.14/ktexteditor/default.nix index 8c02e602c5d9..e4b6cfd1e44e 100644 --- a/pkgs/development/libraries/kde-frameworks-5.14/ktexteditor/default.nix +++ b/pkgs/development/libraries/kde-frameworks-5.14/ktexteditor/default.nix @@ -1,25 +1,16 @@ -{ kdeFramework, lib -, extra-cmake-modules -, karchive -, kconfig -, kguiaddons -, ki18n -, kio -, kiconthemes -, kparts -, perl -, qtscript -, qtxmlpatterns -, sonnet +{ kdeFramework, lib, extra-cmake-modules, karchive, kconfig +, kguiaddons, ki18n, kio, kiconthemes, kparts, perl, qtscript +, qtxmlpatterns, sonnet }: kdeFramework { name = "ktexteditor"; nativeBuildInputs = [ extra-cmake-modules perl ]; buildInputs = [ - karchive kconfig kguiaddons ki18n kiconthemes kio kparts - qtscript qtxmlpatterns sonnet + karchive kconfig kguiaddons kiconthemes kio kparts qtscript + qtxmlpatterns sonnet ]; + propagatedBuildInputs = [ ki18n ]; patches = [ ./0001-no-qcoreapplication.patch ]; meta = { maintainers = [ lib.maintainers.ttuegel ]; diff --git a/pkgs/development/libraries/kde-frameworks-5.14/ktextwidgets.nix b/pkgs/development/libraries/kde-frameworks-5.14/ktextwidgets.nix index e27839162ef7..5ef2353a3618 100644 --- a/pkgs/development/libraries/kde-frameworks-5.14/ktextwidgets.nix +++ b/pkgs/development/libraries/kde-frameworks-5.14/ktextwidgets.nix @@ -1,12 +1,5 @@ -{ kdeFramework, lib -, extra-cmake-modules -, kcompletion -, kconfig -, kconfigwidgets -, ki18n -, kiconthemes -, kservice -, kwindowsystem +{ kdeFramework, lib, extra-cmake-modules, kcompletion, kconfig +, kconfigwidgets, ki18n, kiconthemes, kservice, kwindowsystem , sonnet }: diff --git a/pkgs/development/libraries/kde-frameworks-5.14/kunitconversion.nix b/pkgs/development/libraries/kde-frameworks-5.14/kunitconversion.nix index 6c6a4caeb986..3cf0f847d83d 100644 --- a/pkgs/development/libraries/kde-frameworks-5.14/kunitconversion.nix +++ b/pkgs/development/libraries/kde-frameworks-5.14/kunitconversion.nix @@ -1,12 +1,9 @@ -{ kdeFramework, lib -, extra-cmake-modules -, ki18n -}: +{ kdeFramework, lib, extra-cmake-modules, ki18n }: kdeFramework { name = "kunitconversion"; nativeBuildInputs = [ extra-cmake-modules ]; - buildInputs = [ ki18n ]; + propagatedBuildInputs = [ ki18n ]; meta = { maintainers = [ lib.maintainers.ttuegel ]; }; diff --git a/pkgs/development/libraries/kde-frameworks-5.14/kwallet.nix b/pkgs/development/libraries/kde-frameworks-5.14/kwallet.nix index 267ddf8303db..e028a94b0170 100644 --- a/pkgs/development/libraries/kde-frameworks-5.14/kwallet.nix +++ b/pkgs/development/libraries/kde-frameworks-5.14/kwallet.nix @@ -1,25 +1,16 @@ -{ kdeFramework, lib -, extra-cmake-modules -, kconfig -, kcoreaddons -, kdbusaddons -, kdoctools -, ki18n -, kiconthemes -, knotifications -, kservice -, kwidgetsaddons -, kwindowsystem -, libgcrypt +{ kdeFramework, lib, extra-cmake-modules, kconfig, kcoreaddons +, kdbusaddons, kdoctools, ki18n, kiconthemes, knotifications +, kservice, kwidgetsaddons, kwindowsystem, libgcrypt }: kdeFramework { name = "kwallet"; nativeBuildInputs = [ extra-cmake-modules kdoctools ]; buildInputs = [ - kconfig kcoreaddons kdbusaddons ki18n kiconthemes knotifications + kconfig kcoreaddons kdbusaddons kiconthemes knotifications kservice kwidgetsaddons kwindowsystem libgcrypt ]; + propagatedBuildInputs = [ ki18n ]; postInstall = '' wrapKDEProgram "$out/bin/kwalletd5" wrapKDEProgram "$out/bin/kwallet-query" diff --git a/pkgs/development/libraries/kde-frameworks-5.14/kxmlgui.nix b/pkgs/development/libraries/kde-frameworks-5.14/kxmlgui.nix index 3eeea735d822..69a59f0c4173 100644 --- a/pkgs/development/libraries/kde-frameworks-5.14/kxmlgui.nix +++ b/pkgs/development/libraries/kde-frameworks-5.14/kxmlgui.nix @@ -7,10 +7,10 @@ kdeFramework { name = "kxmlgui"; nativeBuildInputs = [ extra-cmake-modules ]; buildInputs = [ - attica kconfig kconfigwidgets ki18n kiconthemes kitemviews + attica kconfig kconfigwidgets kiconthemes kitemviews ktextwidgets kwindowsystem sonnet ]; - propagatedBuildInputs = [ kglobalaccel ]; + propagatedBuildInputs = [ kglobalaccel ki18n ]; meta = { maintainers = [ lib.maintainers.ttuegel ]; }; diff --git a/pkgs/development/libraries/kde-frameworks-5.14/kxmlrpcclient.nix b/pkgs/development/libraries/kde-frameworks-5.14/kxmlrpcclient.nix index b28c00a33bed..20a300b68bc8 100644 --- a/pkgs/development/libraries/kde-frameworks-5.14/kxmlrpcclient.nix +++ b/pkgs/development/libraries/kde-frameworks-5.14/kxmlrpcclient.nix @@ -1,14 +1,9 @@ -{ kdeFramework, lib -, extra-cmake-modules -, ki18n -, kio -}: +{ kdeFramework, lib, extra-cmake-modules, ki18n, kio }: kdeFramework { name = "kxmlrpcclient"; nativeBuildInputs = [ extra-cmake-modules ]; - buildInputs = [ ki18n ]; - propagatedBuildInputs = [ kio ]; + propagatedBuildInputs = [ ki18n kio ]; meta = { maintainers = [ lib.maintainers.ttuegel ]; }; diff --git a/pkgs/development/libraries/kde-frameworks-5.14/plasma-framework/default.nix b/pkgs/development/libraries/kde-frameworks-5.14/plasma-framework/default.nix index 33eff0f424cc..e8e873d0cb9d 100644 --- a/pkgs/development/libraries/kde-frameworks-5.14/plasma-framework/default.nix +++ b/pkgs/development/libraries/kde-frameworks-5.14/plasma-framework/default.nix @@ -10,11 +10,11 @@ kdeFramework { nativeBuildInputs = [ extra-cmake-modules kdoctools ]; buildInputs = [ karchive kconfig kconfigwidgets kcoreaddons kdbusaddons kguiaddons - ki18n kiconthemes kio knotifications kwindowsystem kxmlgui - qtscript qtx11extras + kiconthemes kio knotifications kwindowsystem kxmlgui qtscript ]; propagatedBuildInputs = [ - kactivities kdeclarative kglobalaccel kpackage kservice + kactivities kdeclarative kglobalaccel ki18n kpackage kservice + qtx11extras ]; postInstall = '' wrapKDEProgram "$out/bin/plasmapkg2" From c017efa46687bb2031475ca449cc91ffb4c178c9 Mon Sep 17 00:00:00 2001 From: Thomas Tuegel Date: Sat, 10 Oct 2015 11:51:36 -0500 Subject: [PATCH 028/162] propagate kidletime dependencies --- pkgs/desktops/plasma-5.4/plasma-workspace/default.nix | 8 ++++---- pkgs/desktops/plasma-5.4/powerdevil.nix | 7 ++++--- pkgs/development/libraries/kde-frameworks-5.14/baloo.nix | 4 ++-- 3 files changed, 10 insertions(+), 9 deletions(-) diff --git a/pkgs/desktops/plasma-5.4/plasma-workspace/default.nix b/pkgs/desktops/plasma-5.4/plasma-workspace/default.nix index 7d72e38203dc..2f608fdad6a7 100644 --- a/pkgs/desktops/plasma-5.4/plasma-workspace/default.nix +++ b/pkgs/desktops/plasma-5.4/plasma-workspace/default.nix @@ -17,15 +17,15 @@ plasmaPackage { kdoctools ]; buildInputs = [ - kcmutils kcrash kdbusaddons kdesu kdewebkit kidletime kjsembed - knewstuff knotifyconfig kpackage krunner ktexteditor ktextwidgets - kwallet kwayland kwin kxmlrpcclient libdbusmenu libkscreen libSM + kcmutils kcrash kdbusaddons kdesu kdewebkit kjsembed knewstuff + knotifyconfig kpackage krunner ktexteditor ktextwidgets kwallet + kwayland kwin kxmlrpcclient libdbusmenu libkscreen libSM libXcursor networkmanager-qt pam phonon plasma-framework qtquick1 qtscript qtx11extras solid wayland ]; propagatedBuildInputs = [ baloo kactivities kdeclarative kdelibs4support kglobalaccel - libksysguard + kidletime libksysguard ]; patches = [ ./0001-startkde-NixOS-patches.patch ]; diff --git a/pkgs/desktops/plasma-5.4/powerdevil.nix b/pkgs/desktops/plasma-5.4/powerdevil.nix index 22803256b99d..15e28651fc13 100644 --- a/pkgs/desktops/plasma-5.4/powerdevil.nix +++ b/pkgs/desktops/plasma-5.4/powerdevil.nix @@ -11,10 +11,11 @@ plasmaPackage { kdoctools ]; buildInputs = [ - kconfig kdbusaddons kidletime kio knotifyconfig libkscreen - plasma-workspace solid udev + kconfig kdbusaddons kio knotifyconfig libkscreen plasma-workspace + solid udev ]; propagatedBuildInputs = [ - kactivities kauth kdelibs4support kglobalaccel ki18n qtx11extras + kactivities kauth kdelibs4support kglobalaccel ki18n kidletime + qtx11extras ]; } diff --git a/pkgs/development/libraries/kde-frameworks-5.14/baloo.nix b/pkgs/development/libraries/kde-frameworks-5.14/baloo.nix index 2cd7281125f4..621aeb4142ee 100644 --- a/pkgs/development/libraries/kde-frameworks-5.14/baloo.nix +++ b/pkgs/development/libraries/kde-frameworks-5.14/baloo.nix @@ -7,10 +7,10 @@ kdeFramework { name = "baloo"; nativeBuildInputs = [ extra-cmake-modules ]; buildInputs = [ - kconfig kcrash kdbusaddons kidletime kio lmdb qtquick1 solid + kconfig kcrash kdbusaddons kio lmdb qtquick1 solid ]; propagatedBuildInputs = [ - kauth kcoreaddons kfilemetadata ki18n qtbase + kauth kcoreaddons kfilemetadata ki18n kidletime qtbase ]; postInstall = '' wrapKDEProgram "$out/bin/baloo_file" From 8b14c5883121b3a5709d0ed97bb5c57863eab9bb Mon Sep 17 00:00:00 2001 From: Thomas Tuegel Date: Sat, 10 Oct 2015 12:29:20 -0500 Subject: [PATCH 029/162] propagate kio dependencies --- pkgs/applications/kde-apps-15.08/ark.nix | 2 +- pkgs/applications/kde-apps-15.08/baloo-widgets.nix | 2 +- pkgs/applications/kde-apps-15.08/dolphin-plugins.nix | 2 +- pkgs/applications/kde-apps-15.08/dolphin.nix | 2 +- pkgs/applications/kde-apps-15.08/gwenview.nix | 2 +- pkgs/applications/kde-apps-15.08/kate.nix | 2 +- pkgs/applications/kde-apps-15.08/print-manager.nix | 4 ++-- pkgs/desktops/plasma-5.4/kde-cli-tools.nix | 4 ++-- pkgs/desktops/plasma-5.4/kde-gtk-config.nix | 4 ++-- pkgs/desktops/plasma-5.4/kdeplasma-addons.nix | 4 ++-- pkgs/desktops/plasma-5.4/khotkeys.nix | 4 ++-- pkgs/desktops/plasma-5.4/kinfocenter.nix | 4 ++-- pkgs/desktops/plasma-5.4/kmenuedit.nix | 4 ++-- pkgs/desktops/plasma-5.4/kwin/default.nix | 4 ++-- pkgs/desktops/plasma-5.4/plasma-mediacenter.nix | 4 ++-- pkgs/desktops/plasma-5.4/plasma-nm.nix | 4 ++-- pkgs/desktops/plasma-5.4/powerdevil.nix | 4 ++-- pkgs/desktops/plasma-5.4/systemsettings.nix | 4 ++-- pkgs/development/libraries/kde-frameworks-5.14/baloo.nix | 4 ++-- .../libraries/kde-frameworks-5.14/frameworkintegration.nix | 4 ++-- .../libraries/kde-frameworks-5.14/kactivities.nix | 6 ++++-- .../libraries/kde-frameworks-5.14/kdeclarative.nix | 4 ++-- .../libraries/kde-frameworks-5.14/kdelibs4support.nix | 4 ++-- .../libraries/kde-frameworks-5.14/kdesignerplugin.nix | 3 ++- .../development/libraries/kde-frameworks-5.14/kdewebkit.nix | 4 ++-- .../libraries/kde-frameworks-5.14/kinit/default.nix | 4 ++-- .../development/libraries/kde-frameworks-5.14/knewstuff.nix | 4 ++-- .../libraries/kde-frameworks-5.14/knotifyconfig.nix | 4 ++-- pkgs/development/libraries/kde-frameworks-5.14/krunner.nix | 4 ++-- .../libraries/kde-frameworks-5.14/ktexteditor/default.nix | 4 ++-- .../kde-frameworks-5.14/plasma-framework/default.nix | 4 ++-- 31 files changed, 58 insertions(+), 55 deletions(-) diff --git a/pkgs/applications/kde-apps-15.08/ark.nix b/pkgs/applications/kde-apps-15.08/ark.nix index 155e024f9708..ce984f951f14 100644 --- a/pkgs/applications/kde-apps-15.08/ark.nix +++ b/pkgs/applications/kde-apps-15.08/ark.nix @@ -28,7 +28,6 @@ kdeApp { kcrash kdbusaddons kiconthemes - kio kservice kpty kwidgetsaddons @@ -37,6 +36,7 @@ kdeApp { propagatedBuildInputs = [ khtml ki18n + kio ]; meta = { license = with lib.licenses; [ gpl2 lgpl3 ]; diff --git a/pkgs/applications/kde-apps-15.08/baloo-widgets.nix b/pkgs/applications/kde-apps-15.08/baloo-widgets.nix index 6d18a2e83044..a24928160df1 100644 --- a/pkgs/applications/kde-apps-15.08/baloo-widgets.nix +++ b/pkgs/applications/kde-apps-15.08/baloo-widgets.nix @@ -19,7 +19,6 @@ kdeApp { ]; buildInputs = [ kconfig - kio kservice ]; propagatedBuildInputs = [ @@ -27,6 +26,7 @@ kdeApp { kdelibs4support kfilemetadata ki18n + kio ]; meta = { license = [ lib.licenses.lgpl21 ]; diff --git a/pkgs/applications/kde-apps-15.08/dolphin-plugins.nix b/pkgs/applications/kde-apps-15.08/dolphin-plugins.nix index 578d4bf9e210..72a08c732614 100644 --- a/pkgs/applications/kde-apps-15.08/dolphin-plugins.nix +++ b/pkgs/applications/kde-apps-15.08/dolphin-plugins.nix @@ -17,12 +17,12 @@ kdeApp { ]; buildInputs = [ kxmlgui - kio dolphin ]; propagatedBuildInputs = [ kdelibs4support ki18n + kio ]; meta = { license = [ lib.licenses.gpl2 ]; diff --git a/pkgs/applications/kde-apps-15.08/dolphin.nix b/pkgs/applications/kde-apps-15.08/dolphin.nix index 1c468d613f5a..9c42152a1531 100644 --- a/pkgs/applications/kde-apps-15.08/dolphin.nix +++ b/pkgs/applications/kde-apps-15.08/dolphin.nix @@ -40,7 +40,6 @@ kdeApp { kdbusaddons kbookmarks kconfig - kio kparts solid kiconthemes @@ -57,6 +56,7 @@ kdeApp { kdelibs4support kfilemetadata ki18n + kio ]; meta = { license = with lib.licenses; [ gpl2 fdl12 ]; diff --git a/pkgs/applications/kde-apps-15.08/gwenview.nix b/pkgs/applications/kde-apps-15.08/gwenview.nix index b53f78b8084c..4e867f4dbb10 100644 --- a/pkgs/applications/kde-apps-15.08/gwenview.nix +++ b/pkgs/applications/kde-apps-15.08/gwenview.nix @@ -21,7 +21,6 @@ kdeApp { ]; buildInputs = [ exiv2 - kio lcms2 phonon qtsvg @@ -30,6 +29,7 @@ kdeApp { baloo kactivities kdelibs4support + kio qtx11extras ]; meta = { diff --git a/pkgs/applications/kde-apps-15.08/kate.nix b/pkgs/applications/kde-apps-15.08/kate.nix index b7ee4859dea8..1a79791599e2 100644 --- a/pkgs/applications/kde-apps-15.08/kate.nix +++ b/pkgs/applications/kde-apps-15.08/kate.nix @@ -40,7 +40,6 @@ kdeApp { kiconthemes kinit kjobwidgets - kio kparts ktexteditor kwindowsystem @@ -57,6 +56,7 @@ kdeApp { propagatedBuildInputs = [ kactivities ki18n + kio ]; meta = { license = with lib.licenses; [ gpl3 lgpl3 lgpl2 ]; diff --git a/pkgs/applications/kde-apps-15.08/print-manager.nix b/pkgs/applications/kde-apps-15.08/print-manager.nix index 73c13cf49fa7..ef4a9f40134c 100644 --- a/pkgs/applications/kde-apps-15.08/print-manager.nix +++ b/pkgs/applications/kde-apps-15.08/print-manager.nix @@ -23,14 +23,12 @@ kdeApp { extra-cmake-modules ]; buildInputs = [ - qtdeclarative cups kconfig kconfigwidgets kdbusaddons kiconthemes kcmutils - kio knotifications plasma-framework kwidgetsaddons @@ -39,6 +37,8 @@ kdeApp { ]; propagatedBuildInputs = [ ki18n + kio + qtdeclarative ]; meta = { license = [ lib.licenses.gpl2 ]; diff --git a/pkgs/desktops/plasma-5.4/kde-cli-tools.nix b/pkgs/desktops/plasma-5.4/kde-cli-tools.nix index 045429af21b3..002186f7d2ab 100644 --- a/pkgs/desktops/plasma-5.4/kde-cli-tools.nix +++ b/pkgs/desktops/plasma-5.4/kde-cli-tools.nix @@ -7,9 +7,9 @@ plasmaPackage { name = "kde-cli-tools"; nativeBuildInputs = [ extra-cmake-modules kdoctools ]; buildInputs = [ - kcmutils kconfig kdesu ki18n kiconthemes kwindowsystem + kcmutils kconfig kdesu kiconthemes kwindowsystem ]; - propagatedBuildInputs = [ kdelibs4support qtsvg qtx11extras ]; + propagatedBuildInputs = [ kdelibs4support ki18n qtsvg qtx11extras ]; postInstall = '' wrapKDEProgram "$out/bin/kmimetypefinder5" wrapKDEProgram "$out/bin/ksvgtopng5" diff --git a/pkgs/desktops/plasma-5.4/kde-gtk-config.nix b/pkgs/desktops/plasma-5.4/kde-gtk-config.nix index d6a041220b2f..fb5059b7eb83 100644 --- a/pkgs/desktops/plasma-5.4/kde-gtk-config.nix +++ b/pkgs/desktops/plasma-5.4/kde-gtk-config.nix @@ -17,9 +17,9 @@ plasmaPackage { nativeBuildInputs = [ extra-cmake-modules ]; buildInputs = [ glib gtk2 gtk3 karchive kcmutils kconfigwidgets kiconthemes - kio knewstuff + knewstuff ]; - propagatedBuildInputs = [ ki18n ]; + propagatedBuildInputs = [ ki18n kio ]; cmakeFlags = [ "-DGTK2_GLIBCONFIG_INCLUDE_DIR=${glib}/lib/glib-2.0/include" "-DGTK2_GDKCONFIG_INCLUDE_DIR=${gtk2}/lib/gtk-2.0/include" diff --git a/pkgs/desktops/plasma-5.4/kdeplasma-addons.nix b/pkgs/desktops/plasma-5.4/kdeplasma-addons.nix index ca52d23b4008..0d11a29c4231 100644 --- a/pkgs/desktops/plasma-5.4/kdeplasma-addons.nix +++ b/pkgs/desktops/plasma-5.4/kdeplasma-addons.nix @@ -11,8 +11,8 @@ plasmaPackage { kdoctools ]; buildInputs = [ - ibus kconfig kconfigwidgets kcoreaddons kcmutils kio + ibus kconfig kconfigwidgets kcoreaddons kcmutils knewstuff kross krunner kservice kunitconversion plasma-framework ]; - propagatedBuildInputs = [ kdelibs4support qtdeclarative qtx11extras ]; + propagatedBuildInputs = [ kdelibs4support kio qtdeclarative qtx11extras ]; } diff --git a/pkgs/desktops/plasma-5.4/khotkeys.nix b/pkgs/desktops/plasma-5.4/khotkeys.nix index 484e59ac380f..a890ab6ee75b 100644 --- a/pkgs/desktops/plasma-5.4/khotkeys.nix +++ b/pkgs/desktops/plasma-5.4/khotkeys.nix @@ -7,8 +7,8 @@ plasmaPackage { name = "khotkeys"; nativeBuildInputs = [ extra-cmake-modules kdoctools ]; buildInputs = [ - kcmutils kdbusaddons kio kxmlgui plasma-framework + kcmutils kdbusaddons kxmlgui plasma-framework plasma-workspace ]; - propagatedBuildInputs = [ kdelibs4support kglobalaccel ki18n qtx11extras ]; + propagatedBuildInputs = [ kdelibs4support kglobalaccel ki18n kio qtx11extras ]; } diff --git a/pkgs/desktops/plasma-5.4/kinfocenter.nix b/pkgs/desktops/plasma-5.4/kinfocenter.nix index 62696505f8c3..4015507aa2ff 100644 --- a/pkgs/desktops/plasma-5.4/kinfocenter.nix +++ b/pkgs/desktops/plasma-5.4/kinfocenter.nix @@ -12,10 +12,10 @@ plasmaPackage { ]; buildInputs = [ kcmutils kcompletion kconfig kconfigwidgets kcoreaddons - kdbusaddons kiconthemes kio kpackage kservice kwidgetsaddons + kdbusaddons kiconthemes kpackage kservice kwidgetsaddons kxmlgui libraw1394 pciutils solid ]; - propagatedBuildInputs = [ kdeclarative kdelibs4support ki18n ]; + propagatedBuildInputs = [ kdeclarative kdelibs4support ki18n kio ]; postInstall = '' wrapKDEProgram "$out/bin/kinfocenter" ''; diff --git a/pkgs/desktops/plasma-5.4/kmenuedit.nix b/pkgs/desktops/plasma-5.4/kmenuedit.nix index a7a89678e67f..51e370562c1a 100644 --- a/pkgs/desktops/plasma-5.4/kmenuedit.nix +++ b/pkgs/desktops/plasma-5.4/kmenuedit.nix @@ -9,9 +9,9 @@ plasmaPackage { kdoctools ]; buildInputs = [ - kxmlgui kdbusaddons kiconthemes kio sonnet + kxmlgui kdbusaddons kiconthemes sonnet ]; - propagatedBuildInputs = [ kdelibs4support ki18n ]; + propagatedBuildInputs = [ kdelibs4support ki18n kio ]; postInstall = '' wrapKDEProgram "$out/bin/kmenuedit" ''; diff --git a/pkgs/desktops/plasma-5.4/kwin/default.nix b/pkgs/desktops/plasma-5.4/kwin/default.nix index e2d1cd62c6d2..33653ab9ef2a 100644 --- a/pkgs/desktops/plasma-5.4/kwin/default.nix +++ b/pkgs/desktops/plasma-5.4/kwin/default.nix @@ -15,12 +15,12 @@ plasmaPackage { ]; buildInputs = [ epoxy kcompletion kcmutils kconfig kconfigwidgets kcoreaddons - kcrash kdecoration kiconthemes kinit kio knewstuff knotifications + kcrash kdecoration kiconthemes kinit knewstuff knotifications kpackage kservice kwayland kwidgetsaddons kwindowsystem kxmlgui libinput libICE libSM plasma-framework qtdeclarative qtscript qtx11extras udev wayland xcb-util-cursor ]; - propagatedBuildInputs = [ kactivities kdeclarative kglobalaccel ki18n ]; + propagatedBuildInputs = [ kactivities kdeclarative kglobalaccel ki18n kio ]; patches = [ ./kwin-import-plugin-follow-symlinks.patch ]; postInstall = '' wrapKDEProgram "$out/bin/kwin_x11" diff --git a/pkgs/desktops/plasma-5.4/plasma-mediacenter.nix b/pkgs/desktops/plasma-5.4/plasma-mediacenter.nix index e1f2dab72308..9c528aa2de00 100644 --- a/pkgs/desktops/plasma-5.4/plasma-mediacenter.nix +++ b/pkgs/desktops/plasma-5.4/plasma-mediacenter.nix @@ -10,10 +10,10 @@ plasmaPackage { extra-cmake-modules ]; buildInputs = [ - kconfig kcoreaddons kguiaddons kio kservice plasma-framework + kconfig kcoreaddons kguiaddons kservice plasma-framework qtdeclarative qtmultimedia taglib ]; propagatedBuildInputs = [ - baloo kactivities kdeclarative kfilemetadata ki18n + baloo kactivities kdeclarative kfilemetadata ki18n kio ]; } diff --git a/pkgs/desktops/plasma-5.4/plasma-nm.nix b/pkgs/desktops/plasma-5.4/plasma-nm.nix index b0904e957e68..5a4af534d314 100644 --- a/pkgs/desktops/plasma-5.4/plasma-nm.nix +++ b/pkgs/desktops/plasma-5.4/plasma-nm.nix @@ -15,12 +15,12 @@ plasmaPackage { ]; buildInputs = [ kcompletion kconfigwidgets kcoreaddons kdbusaddons kiconthemes - kinit kio kitemviews knotifications kservice kwallet + kinit kitemviews knotifications kservice kwallet kwidgetsaddons kwindowsystem kxmlgui mobile_broadband_provider_info modemmanager-qt networkmanager-qt openconnect plasma-framework solid ]; - propagatedBuildInputs = [ kdeclarative kdelibs4support ki18n qtdeclarative ]; + propagatedBuildInputs = [ kdeclarative kdelibs4support ki18n kio qtdeclarative ]; postInstall = '' wrapKDEProgram "$out/bin/kde5-nm-connection-editor" ''; diff --git a/pkgs/desktops/plasma-5.4/powerdevil.nix b/pkgs/desktops/plasma-5.4/powerdevil.nix index 15e28651fc13..08f7b4b70614 100644 --- a/pkgs/desktops/plasma-5.4/powerdevil.nix +++ b/pkgs/desktops/plasma-5.4/powerdevil.nix @@ -11,11 +11,11 @@ plasmaPackage { kdoctools ]; buildInputs = [ - kconfig kdbusaddons kio knotifyconfig libkscreen plasma-workspace + kconfig kdbusaddons knotifyconfig libkscreen plasma-workspace solid udev ]; propagatedBuildInputs = [ - kactivities kauth kdelibs4support kglobalaccel ki18n kidletime + kactivities kauth kdelibs4support kglobalaccel ki18n kio kidletime qtx11extras ]; } diff --git a/pkgs/desktops/plasma-5.4/systemsettings.nix b/pkgs/desktops/plasma-5.4/systemsettings.nix index 1c3ddfa7b062..4c132e34f39d 100644 --- a/pkgs/desktops/plasma-5.4/systemsettings.nix +++ b/pkgs/desktops/plasma-5.4/systemsettings.nix @@ -10,10 +10,10 @@ plasmaPackage { kdoctools ]; buildInputs = [ - kitemviews kcmutils kio kservice kiconthemes kwindowsystem + kitemviews kcmutils kservice kiconthemes kwindowsystem kxmlgui kdbusaddons kconfig ]; - propagatedBuildInputs = [ khtml ki18n ]; + propagatedBuildInputs = [ khtml ki18n kio ]; postInstall = '' wrapKDEProgram "$out/bin/systemsettings5" ''; diff --git a/pkgs/development/libraries/kde-frameworks-5.14/baloo.nix b/pkgs/development/libraries/kde-frameworks-5.14/baloo.nix index 621aeb4142ee..ce8a7a40e3d7 100644 --- a/pkgs/development/libraries/kde-frameworks-5.14/baloo.nix +++ b/pkgs/development/libraries/kde-frameworks-5.14/baloo.nix @@ -7,10 +7,10 @@ kdeFramework { name = "baloo"; nativeBuildInputs = [ extra-cmake-modules ]; buildInputs = [ - kconfig kcrash kdbusaddons kio lmdb qtquick1 solid + kconfig kcrash kdbusaddons lmdb qtquick1 solid ]; propagatedBuildInputs = [ - kauth kcoreaddons kfilemetadata ki18n kidletime qtbase + kauth kcoreaddons kfilemetadata ki18n kio kidletime qtbase ]; postInstall = '' wrapKDEProgram "$out/bin/baloo_file" diff --git a/pkgs/development/libraries/kde-frameworks-5.14/frameworkintegration.nix b/pkgs/development/libraries/kde-frameworks-5.14/frameworkintegration.nix index 2470d5378b4a..26987c385ad5 100644 --- a/pkgs/development/libraries/kde-frameworks-5.14/frameworkintegration.nix +++ b/pkgs/development/libraries/kde-frameworks-5.14/frameworkintegration.nix @@ -7,10 +7,10 @@ kdeFramework { name = "frameworkintegration"; nativeBuildInputs = [ extra-cmake-modules ]; buildInputs = [ - kbookmarks kcompletion kconfig kio knotifications kwidgetsaddons + kbookmarks kcompletion kconfig knotifications kwidgetsaddons libXcursor ]; - propagatedBuildInputs = [ kconfigwidgets ki18n kiconthemes qtx11extras ]; + propagatedBuildInputs = [ kconfigwidgets ki18n kio kiconthemes qtx11extras ]; meta = { maintainers = [ lib.maintainers.ttuegel ]; }; diff --git a/pkgs/development/libraries/kde-frameworks-5.14/kactivities.nix b/pkgs/development/libraries/kde-frameworks-5.14/kactivities.nix index 45ed7da463c3..fca69adf7dd1 100644 --- a/pkgs/development/libraries/kde-frameworks-5.14/kactivities.nix +++ b/pkgs/development/libraries/kde-frameworks-5.14/kactivities.nix @@ -7,10 +7,12 @@ kdeFramework { name = "kactivities"; nativeBuildInputs = [ extra-cmake-modules ]; buildInputs = [ - boost kcmutils kconfig kcoreaddons kdbusaddons kio kservice + boost kcmutils kconfig kcoreaddons kdbusaddons kservice kwindowsystem kxmlgui ]; - propagatedBuildInputs = [ kdeclarative kglobalaccel ki18n qtdeclarative ]; + propagatedBuildInputs = [ + kdeclarative kglobalaccel ki18n kio qtdeclarative + ]; postInstall = '' wrapKDEProgram "$out/bin/kactivitymanagerd" ''; diff --git a/pkgs/development/libraries/kde-frameworks-5.14/kdeclarative.nix b/pkgs/development/libraries/kde-frameworks-5.14/kdeclarative.nix index d74f76ae1515..674587ba48e2 100644 --- a/pkgs/development/libraries/kde-frameworks-5.14/kdeclarative.nix +++ b/pkgs/development/libraries/kde-frameworks-5.14/kdeclarative.nix @@ -7,9 +7,9 @@ kdeFramework { name = "kdeclarative"; nativeBuildInputs = [ extra-cmake-modules ]; buildInputs = [ - epoxy kguiaddons kiconthemes kio kwidgetsaddons kwindowsystem + epoxy kguiaddons kiconthemes kwidgetsaddons kwindowsystem ]; - propagatedBuildInputs = [ kconfig kglobalaccel ki18n kpackage qtdeclarative ]; + propagatedBuildInputs = [ kconfig kglobalaccel ki18n kio kpackage qtdeclarative ]; postInstall = '' wrapKDEProgram "$out/bin/kpackagelauncherqml" ''; diff --git a/pkgs/development/libraries/kde-frameworks-5.14/kdelibs4support.nix b/pkgs/development/libraries/kde-frameworks-5.14/kdelibs4support.nix index fedba82ccdfd..0dd5c4157612 100644 --- a/pkgs/development/libraries/kde-frameworks-5.14/kdelibs4support.nix +++ b/pkgs/development/libraries/kde-frameworks-5.14/kdelibs4support.nix @@ -13,12 +13,12 @@ kdeFramework { name = "kdelibs4support"; nativeBuildInputs = [ extra-cmake-modules kdoctools ]; buildInputs = [ - kcompletion kconfig kio kservice kwidgetsaddons + kcompletion kconfig kservice kwidgetsaddons kxmlgui networkmanager qtsvg qtx11extras xlibs.libSM ]; propagatedBuildInputs = [ kauth karchive kconfigwidgets kcoreaddons kcrash kdbusaddons - kdesignerplugin kemoticons kglobalaccel kguiaddons ki18n + kdesignerplugin kemoticons kglobalaccel kguiaddons ki18n kio kiconthemes kitemmodels kinit knotifications kparts ktextwidgets kunitconversion kwindowsystem ]; diff --git a/pkgs/development/libraries/kde-frameworks-5.14/kdesignerplugin.nix b/pkgs/development/libraries/kde-frameworks-5.14/kdesignerplugin.nix index 100d16d64bc6..dea0e8e896d3 100644 --- a/pkgs/development/libraries/kde-frameworks-5.14/kdesignerplugin.nix +++ b/pkgs/development/libraries/kde-frameworks-5.14/kdesignerplugin.nix @@ -21,9 +21,10 @@ kdeFramework { nativeBuildInputs = [ extra-cmake-modules kdoctools ]; buildInputs = [ kcompletion kconfig kconfigwidgets kcoreaddons kdewebkit - kiconthemes kio kitemviews kplotting ktextwidgets kwidgetsaddons + kiconthemes kitemviews kplotting ktextwidgets kwidgetsaddons kxmlgui sonnet ]; + propagatedBuildInputs = [ kio ]; meta = { maintainers = [ lib.maintainers.ttuegel ]; }; diff --git a/pkgs/development/libraries/kde-frameworks-5.14/kdewebkit.nix b/pkgs/development/libraries/kde-frameworks-5.14/kdewebkit.nix index 1922eaf010c3..d361313d1d49 100644 --- a/pkgs/development/libraries/kde-frameworks-5.14/kdewebkit.nix +++ b/pkgs/development/libraries/kde-frameworks-5.14/kdewebkit.nix @@ -5,8 +5,8 @@ kdeFramework { name = "kdewebkit"; nativeBuildInputs = [ extra-cmake-modules ]; - buildInputs = [ kconfig kcoreaddons kio kjobwidgets kparts kservice kwallet ]; - propagatedBuildInputs = [ ki18n qtwebkit ]; + buildInputs = [ kconfig kcoreaddons kjobwidgets kparts kservice kwallet ]; + propagatedBuildInputs = [ ki18n kio qtwebkit ]; meta = { maintainers = [ lib.maintainers.ttuegel ]; }; diff --git a/pkgs/development/libraries/kde-frameworks-5.14/kinit/default.nix b/pkgs/development/libraries/kde-frameworks-5.14/kinit/default.nix index 8caf17acd1a1..da4d1de52184 100644 --- a/pkgs/development/libraries/kde-frameworks-5.14/kinit/default.nix +++ b/pkgs/development/libraries/kde-frameworks-5.14/kinit/default.nix @@ -8,8 +8,8 @@ kdeFramework { name = "kinit"; nativeBuildInputs = [ extra-cmake-modules kdoctools libcap_progs ]; - buildInputs = [ kconfig kcrash kio kservice kwindowsystem libcap ]; - propagatedBuildInputs = [ ki18n ]; + buildInputs = [ kconfig kcrash kservice kwindowsystem libcap ]; + propagatedBuildInputs = [ ki18n kio ]; patches = [ ./0001-kinit-libpath.patch ]; meta = { maintainers = [ lib.maintainers.ttuegel ]; diff --git a/pkgs/development/libraries/kde-frameworks-5.14/knewstuff.nix b/pkgs/development/libraries/kde-frameworks-5.14/knewstuff.nix index 631c431124b9..5bcd6f301462 100644 --- a/pkgs/development/libraries/kde-frameworks-5.14/knewstuff.nix +++ b/pkgs/development/libraries/kde-frameworks-5.14/knewstuff.nix @@ -7,10 +7,10 @@ kdeFramework { name = "knewstuff"; nativeBuildInputs = [ extra-cmake-modules ]; buildInputs = [ - karchive kcompletion kconfig kcoreaddons kiconthemes kio + karchive kcompletion kconfig kcoreaddons kiconthemes kitemviews ktextwidgets kwidgetsaddons ]; - propagatedBuildInputs = [ attica ki18n kservice kxmlgui ]; + propagatedBuildInputs = [ attica ki18n kio kservice kxmlgui ]; meta = { maintainers = [ lib.maintainers.ttuegel ]; }; diff --git a/pkgs/development/libraries/kde-frameworks-5.14/knotifyconfig.nix b/pkgs/development/libraries/kde-frameworks-5.14/knotifyconfig.nix index c4b3408a7944..dd99d2d4f1e5 100644 --- a/pkgs/development/libraries/kde-frameworks-5.14/knotifyconfig.nix +++ b/pkgs/development/libraries/kde-frameworks-5.14/knotifyconfig.nix @@ -5,8 +5,8 @@ kdeFramework { name = "knotifyconfig"; nativeBuildInputs = [ extra-cmake-modules ]; - buildInputs = [ kcompletion kconfig kio phonon ]; - propagatedBuildInputs = [ ki18n ]; + buildInputs = [ kcompletion kconfig phonon ]; + propagatedBuildInputs = [ ki18n kio ]; meta = { maintainers = [ lib.maintainers.ttuegel ]; }; diff --git a/pkgs/development/libraries/kde-frameworks-5.14/krunner.nix b/pkgs/development/libraries/kde-frameworks-5.14/krunner.nix index 0891654eb884..12d2b54d0eb3 100644 --- a/pkgs/development/libraries/kde-frameworks-5.14/krunner.nix +++ b/pkgs/development/libraries/kde-frameworks-5.14/krunner.nix @@ -7,9 +7,9 @@ kdeFramework { name = "krunner"; nativeBuildInputs = [ extra-cmake-modules ]; buildInputs = [ - kconfig kcoreaddons kio kservice qtquick1 solid threadweaver + kconfig kcoreaddons kservice qtquick1 solid threadweaver ]; - propagatedBuildInputs = [ ki18n plasma-framework ]; + propagatedBuildInputs = [ ki18n kio plasma-framework ]; meta = { maintainers = [ lib.maintainers.ttuegel ]; }; diff --git a/pkgs/development/libraries/kde-frameworks-5.14/ktexteditor/default.nix b/pkgs/development/libraries/kde-frameworks-5.14/ktexteditor/default.nix index e4b6cfd1e44e..ca43495159d4 100644 --- a/pkgs/development/libraries/kde-frameworks-5.14/ktexteditor/default.nix +++ b/pkgs/development/libraries/kde-frameworks-5.14/ktexteditor/default.nix @@ -7,10 +7,10 @@ kdeFramework { name = "ktexteditor"; nativeBuildInputs = [ extra-cmake-modules perl ]; buildInputs = [ - karchive kconfig kguiaddons kiconthemes kio kparts qtscript + karchive kconfig kguiaddons kiconthemes kparts qtscript qtxmlpatterns sonnet ]; - propagatedBuildInputs = [ ki18n ]; + propagatedBuildInputs = [ ki18n kio ]; patches = [ ./0001-no-qcoreapplication.patch ]; meta = { maintainers = [ lib.maintainers.ttuegel ]; diff --git a/pkgs/development/libraries/kde-frameworks-5.14/plasma-framework/default.nix b/pkgs/development/libraries/kde-frameworks-5.14/plasma-framework/default.nix index e8e873d0cb9d..0e53e1c13f8c 100644 --- a/pkgs/development/libraries/kde-frameworks-5.14/plasma-framework/default.nix +++ b/pkgs/development/libraries/kde-frameworks-5.14/plasma-framework/default.nix @@ -10,10 +10,10 @@ kdeFramework { nativeBuildInputs = [ extra-cmake-modules kdoctools ]; buildInputs = [ karchive kconfig kconfigwidgets kcoreaddons kdbusaddons kguiaddons - kiconthemes kio knotifications kwindowsystem kxmlgui qtscript + kiconthemes knotifications kwindowsystem kxmlgui qtscript ]; propagatedBuildInputs = [ - kactivities kdeclarative kglobalaccel ki18n kpackage kservice + kactivities kdeclarative kglobalaccel ki18n kio kpackage kservice qtx11extras ]; postInstall = '' From 308babd8a16bbcbe7fd02ac2ec74b3dd20cdb5a6 Mon Sep 17 00:00:00 2001 From: Thomas Tuegel Date: Sat, 10 Oct 2015 12:30:20 -0500 Subject: [PATCH 030/162] propagate kpeople dependencies --- pkgs/desktops/plasma-5.4/plasma-desktop/default.nix | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) diff --git a/pkgs/desktops/plasma-5.4/plasma-desktop/default.nix b/pkgs/desktops/plasma-5.4/plasma-desktop/default.nix index 83f1d0c0d06c..4b4617164374 100644 --- a/pkgs/desktops/plasma-5.4/plasma-desktop/default.nix +++ b/pkgs/desktops/plasma-5.4/plasma-desktop/default.nix @@ -16,16 +16,15 @@ plasmaPackage { kdoctools ]; buildInputs = [ - attica boost fontconfig kcmutils kdbusaddons kded - kitemmodels knewstuff knotifications - knotifyconfig kpeople krunner kwallet kwin libcanberra_kde - libXcursor libpulseaudio libXft libxkbfile phonon plasma-framework - plasma-workspace qtdeclarative qtx11extras qtsvg xf86inputevdev - xf86inputsynaptics xkeyboard_config xinput + attica boost fontconfig kcmutils kdbusaddons kded kitemmodels + knewstuff knotifications knotifyconfig krunner kwallet kwin + libcanberra_kde libXcursor libpulseaudio libXft libxkbfile phonon + plasma-framework plasma-workspace qtdeclarative qtx11extras qtsvg + xf86inputevdev xf86inputsynaptics xkeyboard_config xinput ]; propagatedBuildInputs = [ baloo kactivities kauth kdeclarative kdelibs4support kemoticons - kglobalaccel ki18n + kglobalaccel ki18n kpeople ]; patches = [ (substituteAll { From dcf9735d08aa785955bca2045bdf4c47d95978fa Mon Sep 17 00:00:00 2001 From: Thomas Tuegel Date: Sat, 10 Oct 2015 12:30:53 -0500 Subject: [PATCH 031/162] propagated kross dependencies --- pkgs/desktops/plasma-5.4/kdeplasma-addons.nix | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/pkgs/desktops/plasma-5.4/kdeplasma-addons.nix b/pkgs/desktops/plasma-5.4/kdeplasma-addons.nix index 0d11a29c4231..a6f574d9d662 100644 --- a/pkgs/desktops/plasma-5.4/kdeplasma-addons.nix +++ b/pkgs/desktops/plasma-5.4/kdeplasma-addons.nix @@ -12,7 +12,9 @@ plasmaPackage { ]; buildInputs = [ ibus kconfig kconfigwidgets kcoreaddons kcmutils - knewstuff kross krunner kservice kunitconversion plasma-framework + knewstuff krunner kservice kunitconversion plasma-framework + ]; + propagatedBuildInputs = [ + kdelibs4support kio kross qtdeclarative qtx11extras ]; - propagatedBuildInputs = [ kdelibs4support kio qtdeclarative qtx11extras ]; } From 84de582bd5a103de0dc67c367fcef0c3c86ee2d0 Mon Sep 17 00:00:00 2001 From: Thomas Tuegel Date: Sat, 10 Oct 2015 12:31:55 -0500 Subject: [PATCH 032/162] propagate krunner dependencies --- pkgs/desktops/plasma-5.4/kdeplasma-addons.nix | 4 ++-- pkgs/desktops/plasma-5.4/milou.nix | 4 ++-- pkgs/desktops/plasma-5.4/plasma-desktop/default.nix | 4 ++-- pkgs/desktops/plasma-5.4/plasma-workspace/default.nix | 4 ++-- 4 files changed, 8 insertions(+), 8 deletions(-) diff --git a/pkgs/desktops/plasma-5.4/kdeplasma-addons.nix b/pkgs/desktops/plasma-5.4/kdeplasma-addons.nix index a6f574d9d662..7933c4a7d85c 100644 --- a/pkgs/desktops/plasma-5.4/kdeplasma-addons.nix +++ b/pkgs/desktops/plasma-5.4/kdeplasma-addons.nix @@ -12,9 +12,9 @@ plasmaPackage { ]; buildInputs = [ ibus kconfig kconfigwidgets kcoreaddons kcmutils - knewstuff krunner kservice kunitconversion plasma-framework + knewstuff kservice kunitconversion plasma-framework ]; propagatedBuildInputs = [ - kdelibs4support kio kross qtdeclarative qtx11extras + kdelibs4support kio kross krunner qtdeclarative qtx11extras ]; } diff --git a/pkgs/desktops/plasma-5.4/milou.nix b/pkgs/desktops/plasma-5.4/milou.nix index c9a829731a91..71e86e22e89b 100644 --- a/pkgs/desktops/plasma-5.4/milou.nix +++ b/pkgs/desktops/plasma-5.4/milou.nix @@ -9,7 +9,7 @@ plasmaPackage { extra-cmake-modules ]; buildInputs = [ - qtscript kcoreaddons kservice plasma-framework krunner + qtscript kcoreaddons kservice plasma-framework ]; - propagatedBuildInputs = [ kdeclarative ki18n qtdeclarative ]; + propagatedBuildInputs = [ kdeclarative ki18n krunner qtdeclarative ]; } diff --git a/pkgs/desktops/plasma-5.4/plasma-desktop/default.nix b/pkgs/desktops/plasma-5.4/plasma-desktop/default.nix index 4b4617164374..4309957f6280 100644 --- a/pkgs/desktops/plasma-5.4/plasma-desktop/default.nix +++ b/pkgs/desktops/plasma-5.4/plasma-desktop/default.nix @@ -17,14 +17,14 @@ plasmaPackage { ]; buildInputs = [ attica boost fontconfig kcmutils kdbusaddons kded kitemmodels - knewstuff knotifications knotifyconfig krunner kwallet kwin + knewstuff knotifications knotifyconfig kwallet kwin libcanberra_kde libXcursor libpulseaudio libXft libxkbfile phonon plasma-framework plasma-workspace qtdeclarative qtx11extras qtsvg xf86inputevdev xf86inputsynaptics xkeyboard_config xinput ]; propagatedBuildInputs = [ baloo kactivities kauth kdeclarative kdelibs4support kemoticons - kglobalaccel ki18n kpeople + kglobalaccel ki18n kpeople krunner ]; patches = [ (substituteAll { diff --git a/pkgs/desktops/plasma-5.4/plasma-workspace/default.nix b/pkgs/desktops/plasma-5.4/plasma-workspace/default.nix index 2f608fdad6a7..d9eddf050b91 100644 --- a/pkgs/desktops/plasma-5.4/plasma-workspace/default.nix +++ b/pkgs/desktops/plasma-5.4/plasma-workspace/default.nix @@ -18,14 +18,14 @@ plasmaPackage { ]; buildInputs = [ kcmutils kcrash kdbusaddons kdesu kdewebkit kjsembed knewstuff - knotifyconfig kpackage krunner ktexteditor ktextwidgets kwallet + knotifyconfig kpackage ktexteditor ktextwidgets kwallet kwayland kwin kxmlrpcclient libdbusmenu libkscreen libSM libXcursor networkmanager-qt pam phonon plasma-framework qtquick1 qtscript qtx11extras solid wayland ]; propagatedBuildInputs = [ baloo kactivities kdeclarative kdelibs4support kglobalaccel - kidletime libksysguard + kidletime krunner libksysguard ]; patches = [ ./0001-startkde-NixOS-patches.patch ]; From 15a9aaa5abf33efe73da6a77bba539e1f1f7d7a3 Mon Sep 17 00:00:00 2001 From: Thomas Tuegel Date: Sat, 10 Oct 2015 12:32:32 -0500 Subject: [PATCH 033/162] propagate ktexteditor dependencies --- pkgs/applications/kde-apps-15.08/dolphin.nix | 2 +- pkgs/applications/kde-apps-15.08/kate.nix | 2 +- pkgs/desktops/plasma-5.4/plasma-workspace/default.nix | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/applications/kde-apps-15.08/dolphin.nix b/pkgs/applications/kde-apps-15.08/dolphin.nix index 9c42152a1531..e5a0857c7f4c 100644 --- a/pkgs/applications/kde-apps-15.08/dolphin.nix +++ b/pkgs/applications/kde-apps-15.08/dolphin.nix @@ -44,7 +44,6 @@ kdeApp { solid kiconthemes kcompletion - ktexteditor kwindowsystem knotifications phonon @@ -57,6 +56,7 @@ kdeApp { kfilemetadata ki18n kio + ktexteditor ]; meta = { license = with lib.licenses; [ gpl2 fdl12 ]; diff --git a/pkgs/applications/kde-apps-15.08/kate.nix b/pkgs/applications/kde-apps-15.08/kate.nix index 1a79791599e2..1053d97d4120 100644 --- a/pkgs/applications/kde-apps-15.08/kate.nix +++ b/pkgs/applications/kde-apps-15.08/kate.nix @@ -41,7 +41,6 @@ kdeApp { kinit kjobwidgets kparts - ktexteditor kwindowsystem kxmlgui kdbusaddons @@ -57,6 +56,7 @@ kdeApp { kactivities ki18n kio + ktexteditor ]; meta = { license = with lib.licenses; [ gpl3 lgpl3 lgpl2 ]; diff --git a/pkgs/desktops/plasma-5.4/plasma-workspace/default.nix b/pkgs/desktops/plasma-5.4/plasma-workspace/default.nix index d9eddf050b91..fe860f2956ff 100644 --- a/pkgs/desktops/plasma-5.4/plasma-workspace/default.nix +++ b/pkgs/desktops/plasma-5.4/plasma-workspace/default.nix @@ -18,14 +18,14 @@ plasmaPackage { ]; buildInputs = [ kcmutils kcrash kdbusaddons kdesu kdewebkit kjsembed knewstuff - knotifyconfig kpackage ktexteditor ktextwidgets kwallet + knotifyconfig kpackage ktextwidgets kwallet kwayland kwin kxmlrpcclient libdbusmenu libkscreen libSM libXcursor networkmanager-qt pam phonon plasma-framework qtquick1 qtscript qtx11extras solid wayland ]; propagatedBuildInputs = [ baloo kactivities kdeclarative kdelibs4support kglobalaccel - kidletime krunner libksysguard + kidletime krunner ktexteditor libksysguard ]; patches = [ ./0001-startkde-NixOS-patches.patch ]; From 5abff86df9ecad5a990018f0c49cc38ec5585a92 Mon Sep 17 00:00:00 2001 From: Thomas Tuegel Date: Sat, 10 Oct 2015 12:42:19 -0500 Subject: [PATCH 034/162] propagate kwindowsystem dependencies --- pkgs/applications/kde-apps-15.08/dolphin.nix | 2 +- pkgs/applications/kde-apps-15.08/kate.nix | 2 +- pkgs/applications/kde-apps-15.08/konsole.nix | 2 +- pkgs/applications/kde-apps-15.08/print-manager.nix | 2 +- pkgs/desktops/plasma-5.4/breeze-qt5.nix | 3 +-- pkgs/desktops/plasma-5.4/kde-cli-tools.nix | 6 ++++-- pkgs/desktops/plasma-5.4/kwin/default.nix | 10 ++++++---- pkgs/desktops/plasma-5.4/libksysguard.nix | 5 ++--- pkgs/desktops/plasma-5.4/oxygen.nix | 4 ++-- pkgs/desktops/plasma-5.4/plasma-nm.nix | 6 ++++-- pkgs/desktops/plasma-5.4/polkit-kde-agent.nix | 3 +-- pkgs/desktops/plasma-5.4/systemsettings.nix | 6 +++--- .../libraries/kde-frameworks-5.14/kactivities.nix | 4 ++-- .../libraries/kde-frameworks-5.14/kcrash.nix | 3 ++- .../libraries/kde-frameworks-5.14/kdbusaddons.nix | 2 +- .../libraries/kde-frameworks-5.14/kdeclarative.nix | 6 ++++-- .../libraries/kde-frameworks-5.14/kglobalaccel.nix | 3 ++- .../libraries/kde-frameworks-5.14/khtml.nix | 4 ++-- .../libraries/kde-frameworks-5.14/kinit/default.nix | 4 ++-- pkgs/development/libraries/kde-frameworks-5.14/kio.nix | 4 ++-- .../libraries/kde-frameworks-5.14/kjobwidgets.nix | 3 ++- .../libraries/kde-frameworks-5.14/knotifications.nix | 4 ++-- .../libraries/kde-frameworks-5.14/kservice/default.nix | 4 ++-- .../libraries/kde-frameworks-5.14/ktextwidgets.nix | 4 ++-- .../libraries/kde-frameworks-5.14/kwallet.nix | 4 ++-- .../libraries/kde-frameworks-5.14/kxmlgui.nix | 4 ++-- .../kde-frameworks-5.14/plasma-framework/default.nix | 4 ++-- 27 files changed, 58 insertions(+), 50 deletions(-) diff --git a/pkgs/applications/kde-apps-15.08/dolphin.nix b/pkgs/applications/kde-apps-15.08/dolphin.nix index e5a0857c7f4c..102108a057cd 100644 --- a/pkgs/applications/kde-apps-15.08/dolphin.nix +++ b/pkgs/applications/kde-apps-15.08/dolphin.nix @@ -44,7 +44,6 @@ kdeApp { solid kiconthemes kcompletion - kwindowsystem knotifications phonon baloo-widgets @@ -57,6 +56,7 @@ kdeApp { ki18n kio ktexteditor + kwindowsystem ]; meta = { license = with lib.licenses; [ gpl2 fdl12 ]; diff --git a/pkgs/applications/kde-apps-15.08/kate.nix b/pkgs/applications/kde-apps-15.08/kate.nix index 1053d97d4120..b8220ce9c1fe 100644 --- a/pkgs/applications/kde-apps-15.08/kate.nix +++ b/pkgs/applications/kde-apps-15.08/kate.nix @@ -41,7 +41,6 @@ kdeApp { kinit kjobwidgets kparts - kwindowsystem kxmlgui kdbusaddons kwallet @@ -57,6 +56,7 @@ kdeApp { ki18n kio ktexteditor + kwindowsystem ]; meta = { license = with lib.licenses; [ gpl3 lgpl3 lgpl2 ]; diff --git a/pkgs/applications/kde-apps-15.08/konsole.nix b/pkgs/applications/kde-apps-15.08/konsole.nix index 4ad675c04328..ce98c17443fc 100644 --- a/pkgs/applications/kde-apps-15.08/konsole.nix +++ b/pkgs/applications/kde-apps-15.08/konsole.nix @@ -49,12 +49,12 @@ kdeApp { kservice ktextwidgets kwidgetsaddons - kwindowsystem kxmlgui ]; propagatedBuildInputs = [ kdelibs4support ki18n + kwindowsystem ]; meta = { license = with lib.licenses; [ gpl2 lgpl21 fdl12 ]; diff --git a/pkgs/applications/kde-apps-15.08/print-manager.nix b/pkgs/applications/kde-apps-15.08/print-manager.nix index ef4a9f40134c..c73094e258ef 100644 --- a/pkgs/applications/kde-apps-15.08/print-manager.nix +++ b/pkgs/applications/kde-apps-15.08/print-manager.nix @@ -32,12 +32,12 @@ kdeApp { knotifications plasma-framework kwidgetsaddons - kwindowsystem kitemviews ]; propagatedBuildInputs = [ ki18n kio + kwindowsystem qtdeclarative ]; meta = { diff --git a/pkgs/desktops/plasma-5.4/breeze-qt5.nix b/pkgs/desktops/plasma-5.4/breeze-qt5.nix index f526d2ebc9fd..6e878b428580 100644 --- a/pkgs/desktops/plasma-5.4/breeze-qt5.nix +++ b/pkgs/desktops/plasma-5.4/breeze-qt5.nix @@ -11,9 +11,8 @@ plasmaPackage { ]; buildInputs = [ kcmutils kconfigwidgets kcoreaddons kdecoration kguiaddons - kwindowsystem qtx11extras ]; - propagatedBuildInputs = [ frameworkintegration ki18n ]; + propagatedBuildInputs = [ frameworkintegration ki18n kwindowsystem qtx11extras ]; cmakeFlags = [ "-DUSE_KDE4=OFF" ]; postInstall = '' wrapKDEProgram "$out/bin/breeze-settings5" diff --git a/pkgs/desktops/plasma-5.4/kde-cli-tools.nix b/pkgs/desktops/plasma-5.4/kde-cli-tools.nix index 002186f7d2ab..56676a9c52ee 100644 --- a/pkgs/desktops/plasma-5.4/kde-cli-tools.nix +++ b/pkgs/desktops/plasma-5.4/kde-cli-tools.nix @@ -7,9 +7,11 @@ plasmaPackage { name = "kde-cli-tools"; nativeBuildInputs = [ extra-cmake-modules kdoctools ]; buildInputs = [ - kcmutils kconfig kdesu kiconthemes kwindowsystem + kcmutils kconfig kdesu kiconthemes + ]; + propagatedBuildInputs = [ + kdelibs4support ki18n kwindowsystem qtsvg qtx11extras ]; - propagatedBuildInputs = [ kdelibs4support ki18n qtsvg qtx11extras ]; postInstall = '' wrapKDEProgram "$out/bin/kmimetypefinder5" wrapKDEProgram "$out/bin/ksvgtopng5" diff --git a/pkgs/desktops/plasma-5.4/kwin/default.nix b/pkgs/desktops/plasma-5.4/kwin/default.nix index 33653ab9ef2a..96cc3166ab7a 100644 --- a/pkgs/desktops/plasma-5.4/kwin/default.nix +++ b/pkgs/desktops/plasma-5.4/kwin/default.nix @@ -16,11 +16,13 @@ plasmaPackage { buildInputs = [ epoxy kcompletion kcmutils kconfig kconfigwidgets kcoreaddons kcrash kdecoration kiconthemes kinit knewstuff knotifications - kpackage kservice kwayland kwidgetsaddons kwindowsystem kxmlgui - libinput libICE libSM plasma-framework qtdeclarative qtscript - qtx11extras udev wayland xcb-util-cursor + kpackage kservice kwayland kwidgetsaddons kxmlgui libinput libICE + libSM plasma-framework qtscript udev wayland xcb-util-cursor + ]; + propagatedBuildInputs = [ + kactivities kdeclarative kglobalaccel ki18n kio kwindowsystem + qtdeclarative qtx11extras ]; - propagatedBuildInputs = [ kactivities kdeclarative kglobalaccel ki18n kio ]; patches = [ ./kwin-import-plugin-follow-symlinks.patch ]; postInstall = '' wrapKDEProgram "$out/bin/kwin_x11" diff --git a/pkgs/desktops/plasma-5.4/libksysguard.nix b/pkgs/desktops/plasma-5.4/libksysguard.nix index afcb8a35b7ce..e38c251abeaf 100644 --- a/pkgs/desktops/plasma-5.4/libksysguard.nix +++ b/pkgs/desktops/plasma-5.4/libksysguard.nix @@ -11,10 +11,9 @@ plasmaPackage { ]; buildInputs = [ kcompletion kconfigwidgets kcoreaddons kservice - kwidgetsaddons kwindowsystem plasma-framework qtscript qtwebkit - qtx11extras + kwidgetsaddons plasma-framework qtscript qtwebkit ]; propagatedBuildInputs = [ - kauth kconfig ki18n kiconthemes + kauth kconfig ki18n kiconthemes kwindowsystem qtx11extras ]; } diff --git a/pkgs/desktops/plasma-5.4/oxygen.nix b/pkgs/desktops/plasma-5.4/oxygen.nix index 882a5ea582bc..da2a6cab4b09 100644 --- a/pkgs/desktops/plasma-5.4/oxygen.nix +++ b/pkgs/desktops/plasma-5.4/oxygen.nix @@ -10,9 +10,9 @@ plasmaPackage { ]; buildInputs = [ kcmutils kconfig kdecoration kguiaddons kwidgetsaddons - kservice kcompletion kwindowsystem qtx11extras + kservice kcompletion ]; - propagatedBuildInputs = [ frameworkintegration ki18n ]; + propagatedBuildInputs = [ frameworkintegration ki18n kwindowsystem qtx11extras ]; postInstall = '' wrapKDEProgram "$out/bin/oxygen-demo5" wrapKDEProgram "$out/bin/oxygen-settings5" diff --git a/pkgs/desktops/plasma-5.4/plasma-nm.nix b/pkgs/desktops/plasma-5.4/plasma-nm.nix index 5a4af534d314..ed4f5aea6834 100644 --- a/pkgs/desktops/plasma-5.4/plasma-nm.nix +++ b/pkgs/desktops/plasma-5.4/plasma-nm.nix @@ -16,11 +16,13 @@ plasmaPackage { buildInputs = [ kcompletion kconfigwidgets kcoreaddons kdbusaddons kiconthemes kinit kitemviews knotifications kservice kwallet - kwidgetsaddons kwindowsystem kxmlgui + kwidgetsaddons kxmlgui mobile_broadband_provider_info modemmanager-qt networkmanager-qt openconnect plasma-framework solid ]; - propagatedBuildInputs = [ kdeclarative kdelibs4support ki18n kio qtdeclarative ]; + propagatedBuildInputs = [ + kdeclarative kdelibs4support ki18n kio kwindowsystem qtdeclarative + ]; postInstall = '' wrapKDEProgram "$out/bin/kde5-nm-connection-editor" ''; diff --git a/pkgs/desktops/plasma-5.4/polkit-kde-agent.nix b/pkgs/desktops/plasma-5.4/polkit-kde-agent.nix index c1c57657a6b4..0173ec655169 100644 --- a/pkgs/desktops/plasma-5.4/polkit-kde-agent.nix +++ b/pkgs/desktops/plasma-5.4/polkit-kde-agent.nix @@ -18,7 +18,6 @@ plasmaPackage { extra-cmake-modules ]; buildInputs = [ - kwindowsystem kdbusaddons kwidgetsaddons kcoreaddons @@ -28,5 +27,5 @@ plasmaPackage { knotifications polkitQt ]; - propagatedBuildInputs = [ ki18n ]; + propagatedBuildInputs = [ ki18n kwindowsystem ]; } diff --git a/pkgs/desktops/plasma-5.4/systemsettings.nix b/pkgs/desktops/plasma-5.4/systemsettings.nix index 4c132e34f39d..e5617e1e5df9 100644 --- a/pkgs/desktops/plasma-5.4/systemsettings.nix +++ b/pkgs/desktops/plasma-5.4/systemsettings.nix @@ -10,10 +10,10 @@ plasmaPackage { kdoctools ]; buildInputs = [ - kitemviews kcmutils kservice kiconthemes kwindowsystem - kxmlgui kdbusaddons kconfig + kitemviews kcmutils kservice kiconthemes kxmlgui kdbusaddons + kconfig ]; - propagatedBuildInputs = [ khtml ki18n kio ]; + propagatedBuildInputs = [ khtml ki18n kio kwindowsystem ]; postInstall = '' wrapKDEProgram "$out/bin/systemsettings5" ''; diff --git a/pkgs/development/libraries/kde-frameworks-5.14/kactivities.nix b/pkgs/development/libraries/kde-frameworks-5.14/kactivities.nix index fca69adf7dd1..3cdc3c4144d2 100644 --- a/pkgs/development/libraries/kde-frameworks-5.14/kactivities.nix +++ b/pkgs/development/libraries/kde-frameworks-5.14/kactivities.nix @@ -8,10 +8,10 @@ kdeFramework { nativeBuildInputs = [ extra-cmake-modules ]; buildInputs = [ boost kcmutils kconfig kcoreaddons kdbusaddons kservice - kwindowsystem kxmlgui + kxmlgui ]; propagatedBuildInputs = [ - kdeclarative kglobalaccel ki18n kio qtdeclarative + kdeclarative kglobalaccel ki18n kio kwindowsystem qtdeclarative ]; postInstall = '' wrapKDEProgram "$out/bin/kactivitymanagerd" diff --git a/pkgs/development/libraries/kde-frameworks-5.14/kcrash.nix b/pkgs/development/libraries/kde-frameworks-5.14/kcrash.nix index b919c7ad2228..bbab78ccb409 100644 --- a/pkgs/development/libraries/kde-frameworks-5.14/kcrash.nix +++ b/pkgs/development/libraries/kde-frameworks-5.14/kcrash.nix @@ -8,7 +8,8 @@ kdeFramework { name = "kcrash"; nativeBuildInputs = [ extra-cmake-modules ]; - buildInputs = [ kcoreaddons kwindowsystem qtx11extras ]; + buildInputs = [ kcoreaddons ]; + propagatedBuildInputs = [ kwindowsystem qtx11extras ]; meta = { maintainers = [ lib.maintainers.ttuegel ]; }; diff --git a/pkgs/development/libraries/kde-frameworks-5.14/kdbusaddons.nix b/pkgs/development/libraries/kde-frameworks-5.14/kdbusaddons.nix index eb76e14705e9..ed046e582627 100644 --- a/pkgs/development/libraries/kde-frameworks-5.14/kdbusaddons.nix +++ b/pkgs/development/libraries/kde-frameworks-5.14/kdbusaddons.nix @@ -6,7 +6,7 @@ kdeFramework { name = "kdbusaddons"; nativeBuildInputs = [ extra-cmake-modules ]; - buildInputs = [ qtx11extras ]; + propagatedBuildInputs = [ qtx11extras ]; postInstall = '' wrapKDEProgram "$out/bin/kquitapp5" ''; diff --git a/pkgs/development/libraries/kde-frameworks-5.14/kdeclarative.nix b/pkgs/development/libraries/kde-frameworks-5.14/kdeclarative.nix index 674587ba48e2..aaeb97a067b1 100644 --- a/pkgs/development/libraries/kde-frameworks-5.14/kdeclarative.nix +++ b/pkgs/development/libraries/kde-frameworks-5.14/kdeclarative.nix @@ -7,9 +7,11 @@ kdeFramework { name = "kdeclarative"; nativeBuildInputs = [ extra-cmake-modules ]; buildInputs = [ - epoxy kguiaddons kiconthemes kwidgetsaddons kwindowsystem + epoxy kguiaddons kiconthemes kwidgetsaddons + ]; + propagatedBuildInputs = [ + kconfig kglobalaccel ki18n kio kpackage kwindowsystem qtdeclarative ]; - propagatedBuildInputs = [ kconfig kglobalaccel ki18n kio kpackage qtdeclarative ]; postInstall = '' wrapKDEProgram "$out/bin/kpackagelauncherqml" ''; diff --git a/pkgs/development/libraries/kde-frameworks-5.14/kglobalaccel.nix b/pkgs/development/libraries/kde-frameworks-5.14/kglobalaccel.nix index f7c5ea562661..32f71a7e3dcd 100644 --- a/pkgs/development/libraries/kde-frameworks-5.14/kglobalaccel.nix +++ b/pkgs/development/libraries/kde-frameworks-5.14/kglobalaccel.nix @@ -11,7 +11,8 @@ kdeFramework { name = "kglobalaccel"; nativeBuildInputs = [ extra-cmake-modules ]; - buildInputs = [ kconfig kcoreaddons kcrash kdbusaddons kwindowsystem qtx11extras ]; + buildInputs = [ kconfig kcoreaddons kcrash kdbusaddons ]; + propagatedBuildInputs = [ kwindowsystem qtx11extras ]; postInstall = '' wrapKDEProgram "$out/bin/kglobalaccel5" ''; diff --git a/pkgs/development/libraries/kde-frameworks-5.14/khtml.nix b/pkgs/development/libraries/kde-frameworks-5.14/khtml.nix index cbb511608edd..c7ac8f8b3b44 100644 --- a/pkgs/development/libraries/kde-frameworks-5.14/khtml.nix +++ b/pkgs/development/libraries/kde-frameworks-5.14/khtml.nix @@ -9,10 +9,10 @@ kdeFramework { nativeBuildInputs = [ extra-cmake-modules perl ]; buildInputs = [ giflib karchive kiconthemes knotifications kwallet kwidgetsaddons - kwindowsystem kxmlgui phonon qtx11extras sonnet + kxmlgui phonon qtx11extras sonnet ]; propagatedBuildInputs = [ - kcodecs kglobalaccel ki18n kio kjs kparts ktextwidgets + kcodecs kglobalaccel ki18n kio kjs kparts ktextwidgets kwindowsystem ]; meta = { maintainers = [ lib.maintainers.ttuegel ]; diff --git a/pkgs/development/libraries/kde-frameworks-5.14/kinit/default.nix b/pkgs/development/libraries/kde-frameworks-5.14/kinit/default.nix index da4d1de52184..5f644d7c424e 100644 --- a/pkgs/development/libraries/kde-frameworks-5.14/kinit/default.nix +++ b/pkgs/development/libraries/kde-frameworks-5.14/kinit/default.nix @@ -8,8 +8,8 @@ kdeFramework { name = "kinit"; nativeBuildInputs = [ extra-cmake-modules kdoctools libcap_progs ]; - buildInputs = [ kconfig kcrash kservice kwindowsystem libcap ]; - propagatedBuildInputs = [ ki18n kio ]; + buildInputs = [ kconfig kcrash kservice libcap ]; + propagatedBuildInputs = [ ki18n kio kwindowsystem ]; patches = [ ./0001-kinit-libpath.patch ]; meta = { maintainers = [ lib.maintainers.ttuegel ]; diff --git a/pkgs/development/libraries/kde-frameworks-5.14/kio.nix b/pkgs/development/libraries/kde-frameworks-5.14/kio.nix index b81be46b5d55..58d5667a50e0 100644 --- a/pkgs/development/libraries/kde-frameworks-5.14/kio.nix +++ b/pkgs/development/libraries/kde-frameworks-5.14/kio.nix @@ -11,12 +11,12 @@ kdeFramework { nativeBuildInputs = [ extra-cmake-modules kdoctools ]; buildInputs = [ acl karchive kconfig kcoreaddons kdbusaddons kiconthemes - knotifications ktextwidgets kwallet kwidgetsaddons kwindowsystem + knotifications ktextwidgets kwallet kwidgetsaddons qtscript ]; propagatedBuildInputs = [ kbookmarks kcompletion kconfigwidgets ki18n kitemviews kjobwidgets - kservice kxmlgui solid qtx11extras + kservice kwindowsystem kxmlgui solid qtx11extras ]; postInstall = '' wrapKDEProgram "$out/bin/kcookiejar5" diff --git a/pkgs/development/libraries/kde-frameworks-5.14/kjobwidgets.nix b/pkgs/development/libraries/kde-frameworks-5.14/kjobwidgets.nix index c3f1d37f8589..746edf12eea0 100644 --- a/pkgs/development/libraries/kde-frameworks-5.14/kjobwidgets.nix +++ b/pkgs/development/libraries/kde-frameworks-5.14/kjobwidgets.nix @@ -8,7 +8,8 @@ kdeFramework { name = "kjobwidgets"; nativeBuildInputs = [ extra-cmake-modules ]; - buildInputs = [ kcoreaddons kwidgetsaddons qtx11extras ]; + buildInputs = [ kcoreaddons kwidgetsaddons ]; + propagatedBuildInputs = [ qtx11extras ]; meta = { maintainers = [ lib.maintainers.ttuegel ]; }; diff --git a/pkgs/development/libraries/kde-frameworks-5.14/knotifications.nix b/pkgs/development/libraries/kde-frameworks-5.14/knotifications.nix index f3aa29f018c1..7e301dd0f268 100644 --- a/pkgs/development/libraries/kde-frameworks-5.14/knotifications.nix +++ b/pkgs/development/libraries/kde-frameworks-5.14/knotifications.nix @@ -12,9 +12,9 @@ kdeFramework { name = "knotifications"; nativeBuildInputs = [ extra-cmake-modules ]; buildInputs = [ - kcodecs kconfig kcoreaddons kwindowsystem - phonon qtx11extras + kcodecs kconfig kcoreaddons phonon ]; + propagatedBuildInputs = [ kwindowsystem qtx11extras ]; meta = { maintainers = [ lib.maintainers.ttuegel ]; }; diff --git a/pkgs/development/libraries/kde-frameworks-5.14/kservice/default.nix b/pkgs/development/libraries/kde-frameworks-5.14/kservice/default.nix index b1c47ec53d64..ba1bd03f9df6 100644 --- a/pkgs/development/libraries/kde-frameworks-5.14/kservice/default.nix +++ b/pkgs/development/libraries/kde-frameworks-5.14/kservice/default.nix @@ -6,8 +6,8 @@ kdeFramework { name = "kservice"; setupHook = ./setup-hook.sh; nativeBuildInputs = [ extra-cmake-modules kdoctools ]; - buildInputs = [ kcoreaddons kcrash kdbusaddons kwindowsystem ]; - propagatedBuildInputs = [ kconfig ki18n ]; + buildInputs = [ kcoreaddons kcrash kdbusaddons ]; + propagatedBuildInputs = [ kconfig ki18n kwindowsystem ]; patches = [ ./kservice-kbuildsycoca-follow-symlinks.patch ./kservice-kbuildsycoca-no-canonicalize-path.patch diff --git a/pkgs/development/libraries/kde-frameworks-5.14/ktextwidgets.nix b/pkgs/development/libraries/kde-frameworks-5.14/ktextwidgets.nix index 5ef2353a3618..e332d4ff9a83 100644 --- a/pkgs/development/libraries/kde-frameworks-5.14/ktextwidgets.nix +++ b/pkgs/development/libraries/kde-frameworks-5.14/ktextwidgets.nix @@ -7,9 +7,9 @@ kdeFramework { name = "ktextwidgets"; nativeBuildInputs = [ extra-cmake-modules ]; buildInputs = [ - kcompletion kconfig kconfigwidgets kiconthemes kservice kwindowsystem + kcompletion kconfig kconfigwidgets kiconthemes kservice ]; - propagatedBuildInputs = [ ki18n sonnet ]; + propagatedBuildInputs = [ ki18n kwindowsystem sonnet ]; meta = { maintainers = [ lib.maintainers.ttuegel ]; }; diff --git a/pkgs/development/libraries/kde-frameworks-5.14/kwallet.nix b/pkgs/development/libraries/kde-frameworks-5.14/kwallet.nix index e028a94b0170..77f1c5d05e68 100644 --- a/pkgs/development/libraries/kde-frameworks-5.14/kwallet.nix +++ b/pkgs/development/libraries/kde-frameworks-5.14/kwallet.nix @@ -8,9 +8,9 @@ kdeFramework { nativeBuildInputs = [ extra-cmake-modules kdoctools ]; buildInputs = [ kconfig kcoreaddons kdbusaddons kiconthemes knotifications - kservice kwidgetsaddons kwindowsystem libgcrypt + kservice kwidgetsaddons libgcrypt ]; - propagatedBuildInputs = [ ki18n ]; + propagatedBuildInputs = [ ki18n kwindowsystem ]; postInstall = '' wrapKDEProgram "$out/bin/kwalletd5" wrapKDEProgram "$out/bin/kwallet-query" diff --git a/pkgs/development/libraries/kde-frameworks-5.14/kxmlgui.nix b/pkgs/development/libraries/kde-frameworks-5.14/kxmlgui.nix index 69a59f0c4173..51a38c2688b1 100644 --- a/pkgs/development/libraries/kde-frameworks-5.14/kxmlgui.nix +++ b/pkgs/development/libraries/kde-frameworks-5.14/kxmlgui.nix @@ -8,9 +8,9 @@ kdeFramework { nativeBuildInputs = [ extra-cmake-modules ]; buildInputs = [ attica kconfig kconfigwidgets kiconthemes kitemviews - ktextwidgets kwindowsystem sonnet + ktextwidgets sonnet ]; - propagatedBuildInputs = [ kglobalaccel ki18n ]; + propagatedBuildInputs = [ kglobalaccel ki18n kwindowsystem ]; meta = { maintainers = [ lib.maintainers.ttuegel ]; }; diff --git a/pkgs/development/libraries/kde-frameworks-5.14/plasma-framework/default.nix b/pkgs/development/libraries/kde-frameworks-5.14/plasma-framework/default.nix index 0e53e1c13f8c..a47b904d25d4 100644 --- a/pkgs/development/libraries/kde-frameworks-5.14/plasma-framework/default.nix +++ b/pkgs/development/libraries/kde-frameworks-5.14/plasma-framework/default.nix @@ -10,10 +10,10 @@ kdeFramework { nativeBuildInputs = [ extra-cmake-modules kdoctools ]; buildInputs = [ karchive kconfig kconfigwidgets kcoreaddons kdbusaddons kguiaddons - kiconthemes knotifications kwindowsystem kxmlgui qtscript + kiconthemes knotifications kxmlgui qtscript ]; propagatedBuildInputs = [ - kactivities kdeclarative kglobalaccel ki18n kio kpackage kservice + kactivities kdeclarative kglobalaccel ki18n kio kpackage kservice kwindowsystem qtx11extras ]; postInstall = '' From 9747a3c7647782b1b77cab4a558119e2fd69ced2 Mon Sep 17 00:00:00 2001 From: Thomas Tuegel Date: Sat, 10 Oct 2015 12:45:57 -0500 Subject: [PATCH 035/162] propagate plasma-framework dependencies --- pkgs/applications/kde-apps-15.08/kate.nix | 2 +- pkgs/applications/kde-apps-15.08/print-manager.nix | 2 +- pkgs/desktops/plasma-5.4/kdeplasma-addons.nix | 5 +++-- pkgs/desktops/plasma-5.4/khotkeys.nix | 7 ++++--- pkgs/desktops/plasma-5.4/kwin/default.nix | 4 ++-- pkgs/desktops/plasma-5.4/libksysguard.nix | 5 +++-- pkgs/desktops/plasma-5.4/milou.nix | 6 ++++-- pkgs/desktops/plasma-5.4/plasma-desktop/default.nix | 4 ++-- pkgs/desktops/plasma-5.4/plasma-mediacenter.nix | 3 ++- pkgs/desktops/plasma-5.4/plasma-nm.nix | 10 +++++----- pkgs/desktops/plasma-5.4/plasma-pa.nix | 6 ++++-- pkgs/desktops/plasma-5.4/plasma-workspace/default.nix | 4 ++-- 12 files changed, 33 insertions(+), 25 deletions(-) diff --git a/pkgs/applications/kde-apps-15.08/kate.nix b/pkgs/applications/kde-apps-15.08/kate.nix index b8220ce9c1fe..b66d015a3bcb 100644 --- a/pkgs/applications/kde-apps-15.08/kate.nix +++ b/pkgs/applications/kde-apps-15.08/kate.nix @@ -44,7 +44,6 @@ kdeApp { kxmlgui kdbusaddons kwallet - plasma-framework kitemmodels knotifications threadweaver @@ -57,6 +56,7 @@ kdeApp { kio ktexteditor kwindowsystem + plasma-framework ]; meta = { license = with lib.licenses; [ gpl3 lgpl3 lgpl2 ]; diff --git a/pkgs/applications/kde-apps-15.08/print-manager.nix b/pkgs/applications/kde-apps-15.08/print-manager.nix index c73094e258ef..b4eab372789d 100644 --- a/pkgs/applications/kde-apps-15.08/print-manager.nix +++ b/pkgs/applications/kde-apps-15.08/print-manager.nix @@ -30,7 +30,6 @@ kdeApp { kiconthemes kcmutils knotifications - plasma-framework kwidgetsaddons kitemviews ]; @@ -38,6 +37,7 @@ kdeApp { ki18n kio kwindowsystem + plasma-framework qtdeclarative ]; meta = { diff --git a/pkgs/desktops/plasma-5.4/kdeplasma-addons.nix b/pkgs/desktops/plasma-5.4/kdeplasma-addons.nix index 7933c4a7d85c..d6a96a3276d7 100644 --- a/pkgs/desktops/plasma-5.4/kdeplasma-addons.nix +++ b/pkgs/desktops/plasma-5.4/kdeplasma-addons.nix @@ -12,9 +12,10 @@ plasmaPackage { ]; buildInputs = [ ibus kconfig kconfigwidgets kcoreaddons kcmutils - knewstuff kservice kunitconversion plasma-framework + knewstuff kservice kunitconversion ]; propagatedBuildInputs = [ - kdelibs4support kio kross krunner qtdeclarative qtx11extras + kdelibs4support kio kross krunner plasma-framework qtdeclarative + qtx11extras ]; } diff --git a/pkgs/desktops/plasma-5.4/khotkeys.nix b/pkgs/desktops/plasma-5.4/khotkeys.nix index a890ab6ee75b..2f520bc021f4 100644 --- a/pkgs/desktops/plasma-5.4/khotkeys.nix +++ b/pkgs/desktops/plasma-5.4/khotkeys.nix @@ -7,8 +7,9 @@ plasmaPackage { name = "khotkeys"; nativeBuildInputs = [ extra-cmake-modules kdoctools ]; buildInputs = [ - kcmutils kdbusaddons kxmlgui plasma-framework - plasma-workspace + kcmutils kdbusaddons kxmlgui plasma-workspace + ]; + propagatedBuildInputs = [ + kdelibs4support kglobalaccel ki18n kio plasma-framework qtx11extras ]; - propagatedBuildInputs = [ kdelibs4support kglobalaccel ki18n kio qtx11extras ]; } diff --git a/pkgs/desktops/plasma-5.4/kwin/default.nix b/pkgs/desktops/plasma-5.4/kwin/default.nix index 96cc3166ab7a..626859e6e23e 100644 --- a/pkgs/desktops/plasma-5.4/kwin/default.nix +++ b/pkgs/desktops/plasma-5.4/kwin/default.nix @@ -17,11 +17,11 @@ plasmaPackage { epoxy kcompletion kcmutils kconfig kconfigwidgets kcoreaddons kcrash kdecoration kiconthemes kinit knewstuff knotifications kpackage kservice kwayland kwidgetsaddons kxmlgui libinput libICE - libSM plasma-framework qtscript udev wayland xcb-util-cursor + libSM qtscript udev wayland xcb-util-cursor ]; propagatedBuildInputs = [ kactivities kdeclarative kglobalaccel ki18n kio kwindowsystem - qtdeclarative qtx11extras + plasma-framework qtdeclarative qtx11extras ]; patches = [ ./kwin-import-plugin-follow-symlinks.patch ]; postInstall = '' diff --git a/pkgs/desktops/plasma-5.4/libksysguard.nix b/pkgs/desktops/plasma-5.4/libksysguard.nix index e38c251abeaf..81e59975db2e 100644 --- a/pkgs/desktops/plasma-5.4/libksysguard.nix +++ b/pkgs/desktops/plasma-5.4/libksysguard.nix @@ -11,9 +11,10 @@ plasmaPackage { ]; buildInputs = [ kcompletion kconfigwidgets kcoreaddons kservice - kwidgetsaddons plasma-framework qtscript qtwebkit + kwidgetsaddons qtscript qtwebkit ]; propagatedBuildInputs = [ - kauth kconfig ki18n kiconthemes kwindowsystem qtx11extras + kauth kconfig ki18n kiconthemes kwindowsystem plasma-framework + qtx11extras ]; } diff --git a/pkgs/desktops/plasma-5.4/milou.nix b/pkgs/desktops/plasma-5.4/milou.nix index 71e86e22e89b..760de2d79ab4 100644 --- a/pkgs/desktops/plasma-5.4/milou.nix +++ b/pkgs/desktops/plasma-5.4/milou.nix @@ -9,7 +9,9 @@ plasmaPackage { extra-cmake-modules ]; buildInputs = [ - qtscript kcoreaddons kservice plasma-framework + qtscript kcoreaddons kservice + ]; + propagatedBuildInputs = [ + kdeclarative ki18n krunner plasma-framework qtdeclarative ]; - propagatedBuildInputs = [ kdeclarative ki18n krunner qtdeclarative ]; } diff --git a/pkgs/desktops/plasma-5.4/plasma-desktop/default.nix b/pkgs/desktops/plasma-5.4/plasma-desktop/default.nix index 4309957f6280..3a226a6976d7 100644 --- a/pkgs/desktops/plasma-5.4/plasma-desktop/default.nix +++ b/pkgs/desktops/plasma-5.4/plasma-desktop/default.nix @@ -19,12 +19,12 @@ plasmaPackage { attica boost fontconfig kcmutils kdbusaddons kded kitemmodels knewstuff knotifications knotifyconfig kwallet kwin libcanberra_kde libXcursor libpulseaudio libXft libxkbfile phonon - plasma-framework plasma-workspace qtdeclarative qtx11extras qtsvg + plasma-workspace qtdeclarative qtx11extras qtsvg xf86inputevdev xf86inputsynaptics xkeyboard_config xinput ]; propagatedBuildInputs = [ baloo kactivities kauth kdeclarative kdelibs4support kemoticons - kglobalaccel ki18n kpeople krunner + kglobalaccel ki18n kpeople krunner plasma-framework ]; patches = [ (substituteAll { diff --git a/pkgs/desktops/plasma-5.4/plasma-mediacenter.nix b/pkgs/desktops/plasma-5.4/plasma-mediacenter.nix index 9c528aa2de00..40912087b8c8 100644 --- a/pkgs/desktops/plasma-5.4/plasma-mediacenter.nix +++ b/pkgs/desktops/plasma-5.4/plasma-mediacenter.nix @@ -10,10 +10,11 @@ plasmaPackage { extra-cmake-modules ]; buildInputs = [ - kconfig kcoreaddons kguiaddons kservice plasma-framework + kconfig kcoreaddons kguiaddons kservice qtdeclarative qtmultimedia taglib ]; propagatedBuildInputs = [ baloo kactivities kdeclarative kfilemetadata ki18n kio + plasma-framework ]; } diff --git a/pkgs/desktops/plasma-5.4/plasma-nm.nix b/pkgs/desktops/plasma-5.4/plasma-nm.nix index ed4f5aea6834..9f956ca635ef 100644 --- a/pkgs/desktops/plasma-5.4/plasma-nm.nix +++ b/pkgs/desktops/plasma-5.4/plasma-nm.nix @@ -15,13 +15,13 @@ plasmaPackage { ]; buildInputs = [ kcompletion kconfigwidgets kcoreaddons kdbusaddons kiconthemes - kinit kitemviews knotifications kservice kwallet - kwidgetsaddons kxmlgui - mobile_broadband_provider_info modemmanager-qt networkmanager-qt - openconnect plasma-framework solid + kinit kitemviews knotifications kservice kwallet kwidgetsaddons + kxmlgui mobile_broadband_provider_info modemmanager-qt + networkmanager-qt openconnect solid ]; propagatedBuildInputs = [ - kdeclarative kdelibs4support ki18n kio kwindowsystem qtdeclarative + kdeclarative kdelibs4support ki18n kio kwindowsystem plasma-framework + qtdeclarative ]; postInstall = '' wrapKDEProgram "$out/bin/kde5-nm-connection-editor" diff --git a/pkgs/desktops/plasma-5.4/plasma-pa.nix b/pkgs/desktops/plasma-5.4/plasma-pa.nix index a8334c2bdcdb..aef6bfeb6799 100644 --- a/pkgs/desktops/plasma-5.4/plasma-pa.nix +++ b/pkgs/desktops/plasma-5.4/plasma-pa.nix @@ -9,7 +9,9 @@ plasmaPackage { extra-cmake-modules ]; buildInputs = [ - glib kconfigwidgets kcoreaddons libpulseaudio plasma-framework + glib kconfigwidgets kcoreaddons libpulseaudio + ]; + propagatedBuildInputs = [ + kdeclarative kglobalaccel ki18n plasma-framework ]; - propagatedBuildInputs = [ kdeclarative kglobalaccel ki18n ]; } diff --git a/pkgs/desktops/plasma-5.4/plasma-workspace/default.nix b/pkgs/desktops/plasma-5.4/plasma-workspace/default.nix index fe860f2956ff..5c4d6f63ddce 100644 --- a/pkgs/desktops/plasma-5.4/plasma-workspace/default.nix +++ b/pkgs/desktops/plasma-5.4/plasma-workspace/default.nix @@ -20,12 +20,12 @@ plasmaPackage { kcmutils kcrash kdbusaddons kdesu kdewebkit kjsembed knewstuff knotifyconfig kpackage ktextwidgets kwallet kwayland kwin kxmlrpcclient libdbusmenu libkscreen libSM - libXcursor networkmanager-qt pam phonon plasma-framework qtquick1 + libXcursor networkmanager-qt pam phonon qtquick1 qtscript qtx11extras solid wayland ]; propagatedBuildInputs = [ baloo kactivities kdeclarative kdelibs4support kglobalaccel - kidletime krunner ktexteditor libksysguard + kidletime krunner ktexteditor libksysguard plasma-framework ]; patches = [ ./0001-startkde-NixOS-patches.patch ]; From 9e3aa586498afa54a6ac2c84918330c416c80e5f Mon Sep 17 00:00:00 2001 From: Thomas Tuegel Date: Sat, 10 Oct 2015 12:47:51 -0500 Subject: [PATCH 036/162] propagate sonnet dependencies --- pkgs/desktops/plasma-5.4/kmenuedit.nix | 4 ++-- .../libraries/kde-frameworks-5.14/kdesignerplugin.nix | 4 ++-- pkgs/development/libraries/kde-frameworks-5.14/khtml.nix | 5 +++-- .../libraries/kde-frameworks-5.14/ktexteditor/default.nix | 4 ++-- pkgs/development/libraries/kde-frameworks-5.14/kxmlgui.nix | 4 ++-- 5 files changed, 11 insertions(+), 10 deletions(-) diff --git a/pkgs/desktops/plasma-5.4/kmenuedit.nix b/pkgs/desktops/plasma-5.4/kmenuedit.nix index 51e370562c1a..673a56c9513e 100644 --- a/pkgs/desktops/plasma-5.4/kmenuedit.nix +++ b/pkgs/desktops/plasma-5.4/kmenuedit.nix @@ -9,9 +9,9 @@ plasmaPackage { kdoctools ]; buildInputs = [ - kxmlgui kdbusaddons kiconthemes sonnet + kxmlgui kdbusaddons kiconthemes ]; - propagatedBuildInputs = [ kdelibs4support ki18n kio ]; + propagatedBuildInputs = [ kdelibs4support ki18n kio sonnet ]; postInstall = '' wrapKDEProgram "$out/bin/kmenuedit" ''; diff --git a/pkgs/development/libraries/kde-frameworks-5.14/kdesignerplugin.nix b/pkgs/development/libraries/kde-frameworks-5.14/kdesignerplugin.nix index dea0e8e896d3..28df24153208 100644 --- a/pkgs/development/libraries/kde-frameworks-5.14/kdesignerplugin.nix +++ b/pkgs/development/libraries/kde-frameworks-5.14/kdesignerplugin.nix @@ -22,9 +22,9 @@ kdeFramework { buildInputs = [ kcompletion kconfig kconfigwidgets kcoreaddons kdewebkit kiconthemes kitemviews kplotting ktextwidgets kwidgetsaddons - kxmlgui sonnet + kxmlgui ]; - propagatedBuildInputs = [ kio ]; + propagatedBuildInputs = [ kio sonnet ]; meta = { maintainers = [ lib.maintainers.ttuegel ]; }; diff --git a/pkgs/development/libraries/kde-frameworks-5.14/khtml.nix b/pkgs/development/libraries/kde-frameworks-5.14/khtml.nix index c7ac8f8b3b44..d40df466ebbd 100644 --- a/pkgs/development/libraries/kde-frameworks-5.14/khtml.nix +++ b/pkgs/development/libraries/kde-frameworks-5.14/khtml.nix @@ -9,10 +9,11 @@ kdeFramework { nativeBuildInputs = [ extra-cmake-modules perl ]; buildInputs = [ giflib karchive kiconthemes knotifications kwallet kwidgetsaddons - kxmlgui phonon qtx11extras sonnet + kxmlgui phonon ]; propagatedBuildInputs = [ - kcodecs kglobalaccel ki18n kio kjs kparts ktextwidgets kwindowsystem + kcodecs kglobalaccel ki18n kio kjs kparts ktextwidgets + kwindowsystem qtx11extras sonnet ]; meta = { maintainers = [ lib.maintainers.ttuegel ]; diff --git a/pkgs/development/libraries/kde-frameworks-5.14/ktexteditor/default.nix b/pkgs/development/libraries/kde-frameworks-5.14/ktexteditor/default.nix index ca43495159d4..39092fbb2784 100644 --- a/pkgs/development/libraries/kde-frameworks-5.14/ktexteditor/default.nix +++ b/pkgs/development/libraries/kde-frameworks-5.14/ktexteditor/default.nix @@ -8,9 +8,9 @@ kdeFramework { nativeBuildInputs = [ extra-cmake-modules perl ]; buildInputs = [ karchive kconfig kguiaddons kiconthemes kparts qtscript - qtxmlpatterns sonnet + qtxmlpatterns ]; - propagatedBuildInputs = [ ki18n kio ]; + propagatedBuildInputs = [ ki18n kio sonnet ]; patches = [ ./0001-no-qcoreapplication.patch ]; meta = { maintainers = [ lib.maintainers.ttuegel ]; diff --git a/pkgs/development/libraries/kde-frameworks-5.14/kxmlgui.nix b/pkgs/development/libraries/kde-frameworks-5.14/kxmlgui.nix index 51a38c2688b1..b3b8b39932de 100644 --- a/pkgs/development/libraries/kde-frameworks-5.14/kxmlgui.nix +++ b/pkgs/development/libraries/kde-frameworks-5.14/kxmlgui.nix @@ -8,9 +8,9 @@ kdeFramework { nativeBuildInputs = [ extra-cmake-modules ]; buildInputs = [ attica kconfig kconfigwidgets kiconthemes kitemviews - ktextwidgets sonnet + ktextwidgets ]; - propagatedBuildInputs = [ kglobalaccel ki18n kwindowsystem ]; + propagatedBuildInputs = [ kglobalaccel ki18n kwindowsystem sonnet ]; meta = { maintainers = [ lib.maintainers.ttuegel ]; }; From 148b0f06b169d916d9276b3155bf025c24151905 Mon Sep 17 00:00:00 2001 From: Thomas Tuegel Date: Sun, 11 Oct 2015 10:15:50 -0500 Subject: [PATCH 037/162] propagate kwin dependencies --- pkgs/desktops/plasma-5.4/plasma-desktop/default.nix | 4 ++-- pkgs/desktops/plasma-5.4/plasma-workspace/default.nix | 9 ++++----- 2 files changed, 6 insertions(+), 7 deletions(-) diff --git a/pkgs/desktops/plasma-5.4/plasma-desktop/default.nix b/pkgs/desktops/plasma-5.4/plasma-desktop/default.nix index 3a226a6976d7..53b53ec3100c 100644 --- a/pkgs/desktops/plasma-5.4/plasma-desktop/default.nix +++ b/pkgs/desktops/plasma-5.4/plasma-desktop/default.nix @@ -17,14 +17,14 @@ plasmaPackage { ]; buildInputs = [ attica boost fontconfig kcmutils kdbusaddons kded kitemmodels - knewstuff knotifications knotifyconfig kwallet kwin + knewstuff knotifications knotifyconfig kwallet libcanberra_kde libXcursor libpulseaudio libXft libxkbfile phonon plasma-workspace qtdeclarative qtx11extras qtsvg xf86inputevdev xf86inputsynaptics xkeyboard_config xinput ]; propagatedBuildInputs = [ baloo kactivities kauth kdeclarative kdelibs4support kemoticons - kglobalaccel ki18n kpeople krunner plasma-framework + kglobalaccel ki18n kpeople krunner kwin plasma-framework ]; patches = [ (substituteAll { diff --git a/pkgs/desktops/plasma-5.4/plasma-workspace/default.nix b/pkgs/desktops/plasma-5.4/plasma-workspace/default.nix index 5c4d6f63ddce..b240302ace94 100644 --- a/pkgs/desktops/plasma-5.4/plasma-workspace/default.nix +++ b/pkgs/desktops/plasma-5.4/plasma-workspace/default.nix @@ -18,14 +18,13 @@ plasmaPackage { ]; buildInputs = [ kcmutils kcrash kdbusaddons kdesu kdewebkit kjsembed knewstuff - knotifyconfig kpackage ktextwidgets kwallet - kwayland kwin kxmlrpcclient libdbusmenu libkscreen libSM - libXcursor networkmanager-qt pam phonon qtquick1 - qtscript qtx11extras solid wayland + knotifyconfig kpackage ktextwidgets kwallet kwayland kxmlrpcclient + libdbusmenu libkscreen libSM libXcursor networkmanager-qt pam + phonon qtquick1 qtscript qtx11extras solid wayland ]; propagatedBuildInputs = [ baloo kactivities kdeclarative kdelibs4support kglobalaccel - kidletime krunner ktexteditor libksysguard plasma-framework + kidletime krunner ktexteditor kwin libksysguard plasma-framework ]; patches = [ ./0001-startkde-NixOS-patches.patch ]; From a1da594888a9004253ae4669cbd2a10336b188de Mon Sep 17 00:00:00 2001 From: Thomas Tuegel Date: Sun, 11 Oct 2015 10:17:00 -0500 Subject: [PATCH 038/162] propagate libkscreen dependencies --- pkgs/desktops/plasma-5.4/kscreen.nix | 3 +-- pkgs/desktops/plasma-5.4/plasma-workspace/default.nix | 7 ++++--- pkgs/desktops/plasma-5.4/powerdevil.nix | 5 ++--- 3 files changed, 7 insertions(+), 8 deletions(-) diff --git a/pkgs/desktops/plasma-5.4/kscreen.nix b/pkgs/desktops/plasma-5.4/kscreen.nix index 7123ead146a7..f2f348073650 100644 --- a/pkgs/desktops/plasma-5.4/kscreen.nix +++ b/pkgs/desktops/plasma-5.4/kscreen.nix @@ -10,9 +10,8 @@ plasmaPackage { ]; buildInputs = [ kconfig kconfigwidgets kdbusaddons kwidgetsaddons kxmlgui - libkscreen ]; - propagatedBuildInputs = [ kglobalaccel ki18n qtdeclarative ]; + propagatedBuildInputs = [ kglobalaccel ki18n libkscreen qtdeclarative ]; postInstall = '' wrapKDEProgram "$out/bin/kscreen-console" ''; diff --git a/pkgs/desktops/plasma-5.4/plasma-workspace/default.nix b/pkgs/desktops/plasma-5.4/plasma-workspace/default.nix index b240302ace94..5e29fe2e2e62 100644 --- a/pkgs/desktops/plasma-5.4/plasma-workspace/default.nix +++ b/pkgs/desktops/plasma-5.4/plasma-workspace/default.nix @@ -19,12 +19,13 @@ plasmaPackage { buildInputs = [ kcmutils kcrash kdbusaddons kdesu kdewebkit kjsembed knewstuff knotifyconfig kpackage ktextwidgets kwallet kwayland kxmlrpcclient - libdbusmenu libkscreen libSM libXcursor networkmanager-qt pam - phonon qtquick1 qtscript qtx11extras solid wayland + libdbusmenu libSM libXcursor networkmanager-qt pam phonon qtquick1 + qtscript qtx11extras solid wayland ]; propagatedBuildInputs = [ baloo kactivities kdeclarative kdelibs4support kglobalaccel - kidletime krunner ktexteditor kwin libksysguard plasma-framework + kidletime krunner ktexteditor kwin libkscreen libksysguard + plasma-framework ]; patches = [ ./0001-startkde-NixOS-patches.patch ]; diff --git a/pkgs/desktops/plasma-5.4/powerdevil.nix b/pkgs/desktops/plasma-5.4/powerdevil.nix index 08f7b4b70614..61398592d1fd 100644 --- a/pkgs/desktops/plasma-5.4/powerdevil.nix +++ b/pkgs/desktops/plasma-5.4/powerdevil.nix @@ -11,11 +11,10 @@ plasmaPackage { kdoctools ]; buildInputs = [ - kconfig kdbusaddons knotifyconfig libkscreen plasma-workspace - solid udev + kconfig kdbusaddons knotifyconfig plasma-workspace solid udev ]; propagatedBuildInputs = [ kactivities kauth kdelibs4support kglobalaccel ki18n kio kidletime - qtx11extras + libkscreen qtx11extras ]; } From a543b456308c64ccc81e8640ace731731f322a57 Mon Sep 17 00:00:00 2001 From: Thomas Tuegel Date: Sun, 11 Oct 2015 10:19:01 -0500 Subject: [PATCH 039/162] propagate plasma-workspace dependencies --- pkgs/desktops/plasma-5.4/khotkeys.nix | 5 +++-- pkgs/desktops/plasma-5.4/plasma-desktop/default.nix | 9 +++++---- pkgs/desktops/plasma-5.4/powerdevil.nix | 4 ++-- 3 files changed, 10 insertions(+), 8 deletions(-) diff --git a/pkgs/desktops/plasma-5.4/khotkeys.nix b/pkgs/desktops/plasma-5.4/khotkeys.nix index 2f520bc021f4..141320e6b3e6 100644 --- a/pkgs/desktops/plasma-5.4/khotkeys.nix +++ b/pkgs/desktops/plasma-5.4/khotkeys.nix @@ -7,9 +7,10 @@ plasmaPackage { name = "khotkeys"; nativeBuildInputs = [ extra-cmake-modules kdoctools ]; buildInputs = [ - kcmutils kdbusaddons kxmlgui plasma-workspace + kcmutils kdbusaddons kxmlgui ]; propagatedBuildInputs = [ - kdelibs4support kglobalaccel ki18n kio plasma-framework qtx11extras + kdelibs4support kglobalaccel ki18n kio plasma-framework + plasma-workspace qtx11extras ]; } diff --git a/pkgs/desktops/plasma-5.4/plasma-desktop/default.nix b/pkgs/desktops/plasma-5.4/plasma-desktop/default.nix index 53b53ec3100c..c2fc98517307 100644 --- a/pkgs/desktops/plasma-5.4/plasma-desktop/default.nix +++ b/pkgs/desktops/plasma-5.4/plasma-desktop/default.nix @@ -17,14 +17,15 @@ plasmaPackage { ]; buildInputs = [ attica boost fontconfig kcmutils kdbusaddons kded kitemmodels - knewstuff knotifications knotifyconfig kwallet - libcanberra_kde libXcursor libpulseaudio libXft libxkbfile phonon - plasma-workspace qtdeclarative qtx11extras qtsvg - xf86inputevdev xf86inputsynaptics xkeyboard_config xinput + knewstuff knotifications knotifyconfig kwallet libcanberra_kde + libXcursor libpulseaudio libXft libxkbfile phonon qtdeclarative + qtx11extras qtsvg xf86inputevdev xf86inputsynaptics + xkeyboard_config xinput ]; propagatedBuildInputs = [ baloo kactivities kauth kdeclarative kdelibs4support kemoticons kglobalaccel ki18n kpeople krunner kwin plasma-framework + plasma-workspace ]; patches = [ (substituteAll { diff --git a/pkgs/desktops/plasma-5.4/powerdevil.nix b/pkgs/desktops/plasma-5.4/powerdevil.nix index 61398592d1fd..4b57a2e0a798 100644 --- a/pkgs/desktops/plasma-5.4/powerdevil.nix +++ b/pkgs/desktops/plasma-5.4/powerdevil.nix @@ -11,10 +11,10 @@ plasmaPackage { kdoctools ]; buildInputs = [ - kconfig kdbusaddons knotifyconfig plasma-workspace solid udev + kconfig kdbusaddons knotifyconfig solid udev ]; propagatedBuildInputs = [ kactivities kauth kdelibs4support kglobalaccel ki18n kio kidletime - libkscreen qtx11extras + libkscreen plasma-workspace qtx11extras ]; } From e870e43e968048dc7e3a555f4169c38ab8f93afa Mon Sep 17 00:00:00 2001 From: Thomas Tuegel Date: Sun, 11 Oct 2015 10:35:23 -0500 Subject: [PATCH 040/162] plasma54.bluedevil: remove baloo dependency --- pkgs/desktops/plasma-5.4/bluedevil.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/desktops/plasma-5.4/bluedevil.nix b/pkgs/desktops/plasma-5.4/bluedevil.nix index e9d368020d3b..0408f69a94a9 100644 --- a/pkgs/desktops/plasma-5.4/bluedevil.nix +++ b/pkgs/desktops/plasma-5.4/bluedevil.nix @@ -12,7 +12,7 @@ plasmaPackage { kwidgetsaddons ]; propagatedBuildInputs = [ - baloo bluez-qt ki18n kio kwindowsystem plasma-framework qtdeclarative + bluez-qt ki18n kio kwindowsystem plasma-framework qtdeclarative ]; postInstall = '' wrapKDEProgram "$out/bin/bluedevil-wizard" From 89d31daa8f5b76bb9f4704d4cef0258f7380e10e Mon Sep 17 00:00:00 2001 From: Thomas Tuegel Date: Sun, 11 Oct 2015 10:49:41 -0500 Subject: [PATCH 041/162] qtmultimedia: build with gstreamer-1.0 Fixes #10289. --- pkgs/development/libraries/qt-5/5.5/default.nix | 4 +++- pkgs/development/libraries/qt-5/5.5/qtmultimedia.nix | 4 ++-- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/pkgs/development/libraries/qt-5/5.5/default.nix b/pkgs/development/libraries/qt-5/5.5/default.nix index 418ab88cd9f5..87895eaa0aa2 100644 --- a/pkgs/development/libraries/qt-5/5.5/default.nix +++ b/pkgs/development/libraries/qt-5/5.5/default.nix @@ -80,7 +80,9 @@ let qtimageformats = callPackage ./qtimageformats.nix {}; qtlocation = callPackage ./qtlocation.nix {}; /* qtmacextras = not packaged */ - qtmultimedia = callPackage ./qtmultimedia.nix {}; + qtmultimedia = callPackage ./qtmultimedia.nix { + inherit (pkgs.gst_all_1) gstreamer gst-plugins-base; + }; qtquick1 = callPackage ./qtquick1.nix {}; qtquickcontrols = callPackage ./qtquickcontrols.nix {}; qtscript = callPackage ./qtscript {}; diff --git a/pkgs/development/libraries/qt-5/5.5/qtmultimedia.nix b/pkgs/development/libraries/qt-5/5.5/qtmultimedia.nix index 7d70cf0e371e..22e856863ba8 100644 --- a/pkgs/development/libraries/qt-5/5.5/qtmultimedia.nix +++ b/pkgs/development/libraries/qt-5/5.5/qtmultimedia.nix @@ -1,11 +1,11 @@ { qtSubmodule, qtbase, qtdeclarative -, alsaLib, gstreamer, gst_plugins_base, libpulseaudio +, alsaLib, gstreamer, gst-plugins-base, libpulseaudio }: qtSubmodule { name = "qtmultimedia"; qtInputs = [ qtbase qtdeclarative ]; buildInputs = [ - alsaLib gstreamer gst_plugins_base libpulseaudio + alsaLib gstreamer gst-plugins-base libpulseaudio ]; } From 9fa3e42b933fa71fd344f385eedbd3b3204d6690 Mon Sep 17 00:00:00 2001 From: Thomas Tuegel Date: Tue, 13 Oct 2015 18:27:12 -0500 Subject: [PATCH 042/162] kde-frameworks: 5.14 -> 5.15 --- pkgs/applications/kde-apps-15.08/default.nix | 2 +- .../libraries/kde-frameworks-5.14/srcs.nix | 549 ------------------ .../attica.nix | 0 .../baloo.nix | 0 .../bluez-qt.nix | 0 .../default.nix | 0 .../0001-extra-cmake-modules-paths.patch | 0 .../extra-cmake-modules/default.nix | 0 .../extra-cmake-modules/setup-hook.sh | 0 .../fetchsrcs.sh | 2 +- .../frameworkintegration.nix | 0 .../kactivities.nix | 0 .../kapidox.nix | 0 .../karchive.nix | 0 .../kauth/default.nix | 0 .../kauth/kauth-policy-install.patch | 0 .../kbookmarks.nix | 0 .../kcmutils/default.nix | 0 ...utils-pluginselector-follow-symlinks.patch | 0 .../kcodecs.nix | 0 .../kcompletion.nix | 0 .../kconfig.nix | 0 .../kconfigwidgets/default.nix | 0 ...igwidgets-helpclient-follow-symlinks.patch | 0 .../kcoreaddons.nix | 0 .../kcrash.nix | 0 .../kdbusaddons.nix | 0 .../kdeclarative.nix | 0 .../kded.nix | 0 .../kdelibs4support.nix | 0 .../kdesignerplugin.nix | 0 .../kdesu.nix | 0 .../kdewebkit.nix | 0 .../kdnssd.nix | 0 .../kdoctools/default.nix | 0 .../kdoctools-no-find-docbook-xml.patch | 0 .../kemoticons.nix | 0 .../kfilemetadata.nix | 0 .../kglobalaccel.nix | 0 .../kguiaddons.nix | 0 .../khtml.nix | 0 .../ki18n.nix | 0 .../kiconthemes.nix | 0 .../kidletime.nix | 0 .../kimageformats.nix | 0 .../kinit/0001-kinit-libpath.patch | 0 .../kinit/default.nix | 0 .../kio.nix | 0 .../kitemmodels.nix | 0 .../kitemviews.nix | 0 .../kjobwidgets.nix | 0 .../kjs.nix | 0 .../kjsembed.nix | 0 .../kmediaplayer.nix | 0 .../knewstuff.nix | 0 .../knotifications.nix | 0 .../knotifyconfig.nix | 0 .../kpackage/0001-allow-external-paths.patch | 0 .../kpackage/default.nix | 0 .../kparts.nix | 0 .../kpeople.nix | 0 .../kplotting.nix | 0 .../kpty.nix | 0 .../kross.nix | 0 .../krunner.nix | 0 .../kservice/default.nix | 0 ...service-kbuildsycoca-follow-symlinks.patch | 0 ...ce-kbuildsycoca-no-canonicalize-path.patch | 0 .../kservice/setup-hook.sh | 0 .../0001-no-qcoreapplication.patch | 0 .../ktexteditor/default.nix | 0 .../ktextwidgets.nix | 0 .../kunitconversion.nix | 0 .../kwallet.nix | 0 .../kwidgetsaddons.nix | 0 .../kwindowsystem.nix | 0 .../kxmlgui.nix | 0 .../kxmlrpcclient.nix | 0 .../modemmanager-qt.nix | 0 .../networkmanager-qt.nix | 0 .../plasma-framework/default.nix | 0 .../solid.nix | 0 .../sonnet.nix | 0 .../libraries/kde-frameworks-5.15/srcs.nix | 549 ++++++++++++++++++ .../threadweaver.nix | 0 pkgs/top-level/all-packages.nix | 8 +- 86 files changed, 555 insertions(+), 555 deletions(-) delete mode 100644 pkgs/development/libraries/kde-frameworks-5.14/srcs.nix rename pkgs/development/libraries/{kde-frameworks-5.14 => kde-frameworks-5.15}/attica.nix (100%) rename pkgs/development/libraries/{kde-frameworks-5.14 => kde-frameworks-5.15}/baloo.nix (100%) rename pkgs/development/libraries/{kde-frameworks-5.14 => kde-frameworks-5.15}/bluez-qt.nix (100%) rename pkgs/development/libraries/{kde-frameworks-5.14 => kde-frameworks-5.15}/default.nix (100%) rename pkgs/development/libraries/{kde-frameworks-5.14 => kde-frameworks-5.15}/extra-cmake-modules/0001-extra-cmake-modules-paths.patch (100%) rename pkgs/development/libraries/{kde-frameworks-5.14 => kde-frameworks-5.15}/extra-cmake-modules/default.nix (100%) rename pkgs/development/libraries/{kde-frameworks-5.14 => kde-frameworks-5.15}/extra-cmake-modules/setup-hook.sh (100%) rename pkgs/development/libraries/{kde-frameworks-5.14 => kde-frameworks-5.15}/fetchsrcs.sh (96%) rename pkgs/development/libraries/{kde-frameworks-5.14 => kde-frameworks-5.15}/frameworkintegration.nix (100%) rename pkgs/development/libraries/{kde-frameworks-5.14 => kde-frameworks-5.15}/kactivities.nix (100%) rename pkgs/development/libraries/{kde-frameworks-5.14 => kde-frameworks-5.15}/kapidox.nix (100%) rename pkgs/development/libraries/{kde-frameworks-5.14 => kde-frameworks-5.15}/karchive.nix (100%) rename pkgs/development/libraries/{kde-frameworks-5.14 => kde-frameworks-5.15}/kauth/default.nix (100%) rename pkgs/development/libraries/{kde-frameworks-5.14 => kde-frameworks-5.15}/kauth/kauth-policy-install.patch (100%) rename pkgs/development/libraries/{kde-frameworks-5.14 => kde-frameworks-5.15}/kbookmarks.nix (100%) rename pkgs/development/libraries/{kde-frameworks-5.14 => kde-frameworks-5.15}/kcmutils/default.nix (100%) rename pkgs/development/libraries/{kde-frameworks-5.14 => kde-frameworks-5.15}/kcmutils/kcmutils-pluginselector-follow-symlinks.patch (100%) rename pkgs/development/libraries/{kde-frameworks-5.14 => kde-frameworks-5.15}/kcodecs.nix (100%) rename pkgs/development/libraries/{kde-frameworks-5.14 => kde-frameworks-5.15}/kcompletion.nix (100%) rename pkgs/development/libraries/{kde-frameworks-5.14 => kde-frameworks-5.15}/kconfig.nix (100%) rename pkgs/development/libraries/{kde-frameworks-5.14 => kde-frameworks-5.15}/kconfigwidgets/default.nix (100%) rename pkgs/development/libraries/{kde-frameworks-5.14 => kde-frameworks-5.15}/kconfigwidgets/kconfigwidgets-helpclient-follow-symlinks.patch (100%) rename pkgs/development/libraries/{kde-frameworks-5.14 => kde-frameworks-5.15}/kcoreaddons.nix (100%) rename pkgs/development/libraries/{kde-frameworks-5.14 => kde-frameworks-5.15}/kcrash.nix (100%) rename pkgs/development/libraries/{kde-frameworks-5.14 => kde-frameworks-5.15}/kdbusaddons.nix (100%) rename pkgs/development/libraries/{kde-frameworks-5.14 => kde-frameworks-5.15}/kdeclarative.nix (100%) rename pkgs/development/libraries/{kde-frameworks-5.14 => kde-frameworks-5.15}/kded.nix (100%) rename pkgs/development/libraries/{kde-frameworks-5.14 => kde-frameworks-5.15}/kdelibs4support.nix (100%) rename pkgs/development/libraries/{kde-frameworks-5.14 => kde-frameworks-5.15}/kdesignerplugin.nix (100%) rename pkgs/development/libraries/{kde-frameworks-5.14 => kde-frameworks-5.15}/kdesu.nix (100%) rename pkgs/development/libraries/{kde-frameworks-5.14 => kde-frameworks-5.15}/kdewebkit.nix (100%) rename pkgs/development/libraries/{kde-frameworks-5.14 => kde-frameworks-5.15}/kdnssd.nix (100%) rename pkgs/development/libraries/{kde-frameworks-5.14 => kde-frameworks-5.15}/kdoctools/default.nix (100%) rename pkgs/development/libraries/{kde-frameworks-5.14 => kde-frameworks-5.15}/kdoctools/kdoctools-no-find-docbook-xml.patch (100%) rename pkgs/development/libraries/{kde-frameworks-5.14 => kde-frameworks-5.15}/kemoticons.nix (100%) rename pkgs/development/libraries/{kde-frameworks-5.14 => kde-frameworks-5.15}/kfilemetadata.nix (100%) rename pkgs/development/libraries/{kde-frameworks-5.14 => kde-frameworks-5.15}/kglobalaccel.nix (100%) rename pkgs/development/libraries/{kde-frameworks-5.14 => kde-frameworks-5.15}/kguiaddons.nix (100%) rename pkgs/development/libraries/{kde-frameworks-5.14 => kde-frameworks-5.15}/khtml.nix (100%) rename pkgs/development/libraries/{kde-frameworks-5.14 => kde-frameworks-5.15}/ki18n.nix (100%) rename pkgs/development/libraries/{kde-frameworks-5.14 => kde-frameworks-5.15}/kiconthemes.nix (100%) rename pkgs/development/libraries/{kde-frameworks-5.14 => kde-frameworks-5.15}/kidletime.nix (100%) rename pkgs/development/libraries/{kde-frameworks-5.14 => kde-frameworks-5.15}/kimageformats.nix (100%) rename pkgs/development/libraries/{kde-frameworks-5.14 => kde-frameworks-5.15}/kinit/0001-kinit-libpath.patch (100%) rename pkgs/development/libraries/{kde-frameworks-5.14 => kde-frameworks-5.15}/kinit/default.nix (100%) rename pkgs/development/libraries/{kde-frameworks-5.14 => kde-frameworks-5.15}/kio.nix (100%) rename pkgs/development/libraries/{kde-frameworks-5.14 => kde-frameworks-5.15}/kitemmodels.nix (100%) rename pkgs/development/libraries/{kde-frameworks-5.14 => kde-frameworks-5.15}/kitemviews.nix (100%) rename pkgs/development/libraries/{kde-frameworks-5.14 => kde-frameworks-5.15}/kjobwidgets.nix (100%) rename pkgs/development/libraries/{kde-frameworks-5.14 => kde-frameworks-5.15}/kjs.nix (100%) rename pkgs/development/libraries/{kde-frameworks-5.14 => kde-frameworks-5.15}/kjsembed.nix (100%) rename pkgs/development/libraries/{kde-frameworks-5.14 => kde-frameworks-5.15}/kmediaplayer.nix (100%) rename pkgs/development/libraries/{kde-frameworks-5.14 => kde-frameworks-5.15}/knewstuff.nix (100%) rename pkgs/development/libraries/{kde-frameworks-5.14 => kde-frameworks-5.15}/knotifications.nix (100%) rename pkgs/development/libraries/{kde-frameworks-5.14 => kde-frameworks-5.15}/knotifyconfig.nix (100%) rename pkgs/development/libraries/{kde-frameworks-5.14 => kde-frameworks-5.15}/kpackage/0001-allow-external-paths.patch (100%) rename pkgs/development/libraries/{kde-frameworks-5.14 => kde-frameworks-5.15}/kpackage/default.nix (100%) rename pkgs/development/libraries/{kde-frameworks-5.14 => kde-frameworks-5.15}/kparts.nix (100%) rename pkgs/development/libraries/{kde-frameworks-5.14 => kde-frameworks-5.15}/kpeople.nix (100%) rename pkgs/development/libraries/{kde-frameworks-5.14 => kde-frameworks-5.15}/kplotting.nix (100%) rename pkgs/development/libraries/{kde-frameworks-5.14 => kde-frameworks-5.15}/kpty.nix (100%) rename pkgs/development/libraries/{kde-frameworks-5.14 => kde-frameworks-5.15}/kross.nix (100%) rename pkgs/development/libraries/{kde-frameworks-5.14 => kde-frameworks-5.15}/krunner.nix (100%) rename pkgs/development/libraries/{kde-frameworks-5.14 => kde-frameworks-5.15}/kservice/default.nix (100%) rename pkgs/development/libraries/{kde-frameworks-5.14 => kde-frameworks-5.15}/kservice/kservice-kbuildsycoca-follow-symlinks.patch (100%) rename pkgs/development/libraries/{kde-frameworks-5.14 => kde-frameworks-5.15}/kservice/kservice-kbuildsycoca-no-canonicalize-path.patch (100%) rename pkgs/development/libraries/{kde-frameworks-5.14 => kde-frameworks-5.15}/kservice/setup-hook.sh (100%) rename pkgs/development/libraries/{kde-frameworks-5.14 => kde-frameworks-5.15}/ktexteditor/0001-no-qcoreapplication.patch (100%) rename pkgs/development/libraries/{kde-frameworks-5.14 => kde-frameworks-5.15}/ktexteditor/default.nix (100%) rename pkgs/development/libraries/{kde-frameworks-5.14 => kde-frameworks-5.15}/ktextwidgets.nix (100%) rename pkgs/development/libraries/{kde-frameworks-5.14 => kde-frameworks-5.15}/kunitconversion.nix (100%) rename pkgs/development/libraries/{kde-frameworks-5.14 => kde-frameworks-5.15}/kwallet.nix (100%) rename pkgs/development/libraries/{kde-frameworks-5.14 => kde-frameworks-5.15}/kwidgetsaddons.nix (100%) rename pkgs/development/libraries/{kde-frameworks-5.14 => kde-frameworks-5.15}/kwindowsystem.nix (100%) rename pkgs/development/libraries/{kde-frameworks-5.14 => kde-frameworks-5.15}/kxmlgui.nix (100%) rename pkgs/development/libraries/{kde-frameworks-5.14 => kde-frameworks-5.15}/kxmlrpcclient.nix (100%) rename pkgs/development/libraries/{kde-frameworks-5.14 => kde-frameworks-5.15}/modemmanager-qt.nix (100%) rename pkgs/development/libraries/{kde-frameworks-5.14 => kde-frameworks-5.15}/networkmanager-qt.nix (100%) rename pkgs/development/libraries/{kde-frameworks-5.14 => kde-frameworks-5.15}/plasma-framework/default.nix (100%) rename pkgs/development/libraries/{kde-frameworks-5.14 => kde-frameworks-5.15}/solid.nix (100%) rename pkgs/development/libraries/{kde-frameworks-5.14 => kde-frameworks-5.15}/sonnet.nix (100%) create mode 100644 pkgs/development/libraries/kde-frameworks-5.15/srcs.nix rename pkgs/development/libraries/{kde-frameworks-5.14 => kde-frameworks-5.15}/threadweaver.nix (100%) diff --git a/pkgs/applications/kde-apps-15.08/default.nix b/pkgs/applications/kde-apps-15.08/default.nix index 3d1049f8d5b9..f5a815903208 100644 --- a/pkgs/applications/kde-apps-15.08/default.nix +++ b/pkgs/applications/kde-apps-15.08/default.nix @@ -63,6 +63,6 @@ let print-manager = callPackage ./print-manager.nix {}; }; - newScope = scope: pkgs.kf514.newScope ({ inherit kdeApp; } // scope); + newScope = scope: pkgs.kf515.newScope ({ inherit kdeApp; } // scope); in lib.makeScope newScope packages diff --git a/pkgs/development/libraries/kde-frameworks-5.14/srcs.nix b/pkgs/development/libraries/kde-frameworks-5.14/srcs.nix deleted file mode 100644 index f9923e3645f5..000000000000 --- a/pkgs/development/libraries/kde-frameworks-5.14/srcs.nix +++ /dev/null @@ -1,549 +0,0 @@ -# DO NOT EDIT! This file is generated automatically by fetchsrcs.sh -{ fetchurl, mirror }: - -{ - attica = { - version = "5.14.0"; - src = fetchurl { - url = "${mirror}/stable/frameworks/5.14/attica-5.14.0.tar.xz"; - sha256 = "0n5znf19112i1j2mwvyzc3g75bc83fdr1p7vljw670fjy2wm1fjy"; - name = "attica-5.14.0.tar.xz"; - }; - }; - baloo = { - version = "5.14.0"; - src = fetchurl { - url = "${mirror}/stable/frameworks/5.14/baloo-5.14.0.tar.xz"; - sha256 = "0q72ij44r827259mw26q9f6518nj6jbawa94m8m2vrqdhcfjn25d"; - name = "baloo-5.14.0.tar.xz"; - }; - }; - bluez-qt = { - version = "5.14.0"; - src = fetchurl { - url = "${mirror}/stable/frameworks/5.14/bluez-qt-5.14.0.tar.xz"; - sha256 = "136kjw4d91k85pkj90hs01nnqq51apppzbhjl7mx3xjqd2f15ljz"; - name = "bluez-qt-5.14.0.tar.xz"; - }; - }; - extra-cmake-modules = { - version = "5.14.0"; - src = fetchurl { - url = "${mirror}/stable/frameworks/5.14/extra-cmake-modules-5.14.0.tar.xz"; - sha256 = "1c6frrvs8j56fyj0d9gcbqq3phhxmvn5ciy6bvj8vch3lynxrvyg"; - name = "extra-cmake-modules-5.14.0.tar.xz"; - }; - }; - frameworkintegration = { - version = "5.14.0"; - src = fetchurl { - url = "${mirror}/stable/frameworks/5.14/frameworkintegration-5.14.0.tar.xz"; - sha256 = "194vhbjbjpdc8v69g1i08qcm8ywxfxm4ryc75dpp20117jfy9xy8"; - name = "frameworkintegration-5.14.0.tar.xz"; - }; - }; - kactivities = { - version = "5.14.0"; - src = fetchurl { - url = "${mirror}/stable/frameworks/5.14/kactivities-5.14.0.tar.xz"; - sha256 = "0q6c06qjypg3iy8x60wvyhm5n8fvdkcw5ibvns0zxxa8vw13l6z9"; - name = "kactivities-5.14.0.tar.xz"; - }; - }; - kapidox = { - version = "5.14.0"; - src = fetchurl { - url = "${mirror}/stable/frameworks/5.14/kapidox-5.14.0.tar.xz"; - sha256 = "14ai2n5ajm8sqdv0yy5hr0fg1ks9mvkf3diij7zjfzqi315wav6q"; - name = "kapidox-5.14.0.tar.xz"; - }; - }; - karchive = { - version = "5.14.0"; - src = fetchurl { - url = "${mirror}/stable/frameworks/5.14/karchive-5.14.0.tar.xz"; - sha256 = "1sary49lwp09vrgwndaz3lhp6j3zkllxklbvm5s05i9mjxzgqww4"; - name = "karchive-5.14.0.tar.xz"; - }; - }; - kauth = { - version = "5.14.0"; - src = fetchurl { - url = "${mirror}/stable/frameworks/5.14/kauth-5.14.0.tar.xz"; - sha256 = "1kfqp6jrgx1wlznplr29spi08927cmiln718wzpzvzy8h3sfjc0l"; - name = "kauth-5.14.0.tar.xz"; - }; - }; - kbookmarks = { - version = "5.14.0"; - src = fetchurl { - url = "${mirror}/stable/frameworks/5.14/kbookmarks-5.14.0.tar.xz"; - sha256 = "12kv62ykys5rvmsia955nxv7m4xd551z762bjvvwjq3zds8pj5p3"; - name = "kbookmarks-5.14.0.tar.xz"; - }; - }; - kcmutils = { - version = "5.14.0"; - src = fetchurl { - url = "${mirror}/stable/frameworks/5.14/kcmutils-5.14.0.tar.xz"; - sha256 = "0c71b8gqja1qv8lkb7yn0z7qrgvnmhvhb751k9xsiabp306apx5f"; - name = "kcmutils-5.14.0.tar.xz"; - }; - }; - kcodecs = { - version = "5.14.0"; - src = fetchurl { - url = "${mirror}/stable/frameworks/5.14/kcodecs-5.14.0.tar.xz"; - sha256 = "0prhj43h7dh4811f3kfp6n0wvskczg42q17lbfn6p0d5qa0bz07y"; - name = "kcodecs-5.14.0.tar.xz"; - }; - }; - kcompletion = { - version = "5.14.0"; - src = fetchurl { - url = "${mirror}/stable/frameworks/5.14/kcompletion-5.14.0.tar.xz"; - sha256 = "14ba77fmcf4ldqbwc86frai9hz9jsz9663b0v8r3aca0mg7k096v"; - name = "kcompletion-5.14.0.tar.xz"; - }; - }; - kconfig = { - version = "5.14.0"; - src = fetchurl { - url = "${mirror}/stable/frameworks/5.14/kconfig-5.14.0.tar.xz"; - sha256 = "1c2rw3blgc7rmkaybr9jc3dfc1vzhvskrll7bc8xdm82b5m1850x"; - name = "kconfig-5.14.0.tar.xz"; - }; - }; - kconfigwidgets = { - version = "5.14.0"; - src = fetchurl { - url = "${mirror}/stable/frameworks/5.14/kconfigwidgets-5.14.0.tar.xz"; - sha256 = "103c2vd05ccmyzqf7yznz8d0vhd94c1381p5ajvibvzfv9cs4djg"; - name = "kconfigwidgets-5.14.0.tar.xz"; - }; - }; - kcoreaddons = { - version = "5.14.0"; - src = fetchurl { - url = "${mirror}/stable/frameworks/5.14/kcoreaddons-5.14.0.tar.xz"; - sha256 = "0xm2n7gvzq674cwi8gb8zkawj9pkaiv1qi63a76hl9vylidrm26q"; - name = "kcoreaddons-5.14.0.tar.xz"; - }; - }; - kcrash = { - version = "5.14.0"; - src = fetchurl { - url = "${mirror}/stable/frameworks/5.14/kcrash-5.14.0.tar.xz"; - sha256 = "18cc444wwfdfbr0m1064l34azl6f560f5npcz5spvz0yydlh0fs4"; - name = "kcrash-5.14.0.tar.xz"; - }; - }; - kdbusaddons = { - version = "5.14.0"; - src = fetchurl { - url = "${mirror}/stable/frameworks/5.14/kdbusaddons-5.14.0.tar.xz"; - sha256 = "009rzlr5a8znn4f31gz6zwi93mla09jy3rs336i7f6b111ha4yqy"; - name = "kdbusaddons-5.14.0.tar.xz"; - }; - }; - kdeclarative = { - version = "5.14.0"; - src = fetchurl { - url = "${mirror}/stable/frameworks/5.14/kdeclarative-5.14.0.tar.xz"; - sha256 = "1d87s26crv94w0g88xkqand3a1d02dcr9glbvpx1xxpz64mybvr4"; - name = "kdeclarative-5.14.0.tar.xz"; - }; - }; - kded = { - version = "5.14.0"; - src = fetchurl { - url = "${mirror}/stable/frameworks/5.14/kded-5.14.0.tar.xz"; - sha256 = "03s95pq283vjng106bs9lrj1i2fcb1pnp58cnk1fr6w3w8fp6daq"; - name = "kded-5.14.0.tar.xz"; - }; - }; - kdelibs4support = { - version = "5.14.0"; - src = fetchurl { - url = "${mirror}/stable/frameworks/5.14/portingAids/kdelibs4support-5.14.0.tar.xz"; - sha256 = "1qdw5alnf643bw0pzq3yjwajl87000xpbs8h4k2c1872rmqq1m8r"; - name = "kdelibs4support-5.14.0.tar.xz"; - }; - }; - kdesignerplugin = { - version = "5.14.0"; - src = fetchurl { - url = "${mirror}/stable/frameworks/5.14/kdesignerplugin-5.14.0.tar.xz"; - sha256 = "1bb79szygplysckx7p4x66inbn9i2hmf6p7ikynbvkzph33zm375"; - name = "kdesignerplugin-5.14.0.tar.xz"; - }; - }; - kdesu = { - version = "5.14.0"; - src = fetchurl { - url = "${mirror}/stable/frameworks/5.14/kdesu-5.14.0.tar.xz"; - sha256 = "1l232jhl6x7b6xqw21qw0s342c6n2gnldsdd5fmh6grx4vv556nn"; - name = "kdesu-5.14.0.tar.xz"; - }; - }; - kdewebkit = { - version = "5.14.0"; - src = fetchurl { - url = "${mirror}/stable/frameworks/5.14/kdewebkit-5.14.0.tar.xz"; - sha256 = "0pz0z43mgcp4m5kdcqjl6x0cwafl0j2nidayj3vhaxcj40kn4k8l"; - name = "kdewebkit-5.14.0.tar.xz"; - }; - }; - kdnssd = { - version = "5.14.0"; - src = fetchurl { - url = "${mirror}/stable/frameworks/5.14/kdnssd-5.14.0.tar.xz"; - sha256 = "0cc0adzn4pc0s6mdv71bv6h8k7x0q941f6xdmj7jpcz2q6lycav1"; - name = "kdnssd-5.14.0.tar.xz"; - }; - }; - kdoctools = { - version = "5.14.0"; - src = fetchurl { - url = "${mirror}/stable/frameworks/5.14/kdoctools-5.14.0.tar.xz"; - sha256 = "06477pk0wni40c88c1v6rcl1yy91msfs399djb0i0ipkjnbj8gbs"; - name = "kdoctools-5.14.0.tar.xz"; - }; - }; - kemoticons = { - version = "5.14.0"; - src = fetchurl { - url = "${mirror}/stable/frameworks/5.14/kemoticons-5.14.0.tar.xz"; - sha256 = "1dsr9hbqjrwn44zm9i5anm8sy8jb90yjyv4s219kll5rkrbxk0zr"; - name = "kemoticons-5.14.0.tar.xz"; - }; - }; - kfilemetadata = { - version = "5.14.0"; - src = fetchurl { - url = "${mirror}/stable/frameworks/5.14/kfilemetadata-5.14.0.tar.xz"; - sha256 = "1ixn5yc7j4s3nvn03h7whkxsg15gf1cqnd3z2qxngvyvchzqhsd2"; - name = "kfilemetadata-5.14.0.tar.xz"; - }; - }; - kglobalaccel = { - version = "5.14.0"; - src = fetchurl { - url = "${mirror}/stable/frameworks/5.14/kglobalaccel-5.14.0.tar.xz"; - sha256 = "0cr62as4n3k34dbdcarmhkxkcznnkp65q57sy6k29a68jxgxq6c3"; - name = "kglobalaccel-5.14.0.tar.xz"; - }; - }; - kguiaddons = { - version = "5.14.0"; - src = fetchurl { - url = "${mirror}/stable/frameworks/5.14/kguiaddons-5.14.0.tar.xz"; - sha256 = "0658nn4lb59vzn6b9kmasl2a4g58c81cran6kz0fwc82d2310ncn"; - name = "kguiaddons-5.14.0.tar.xz"; - }; - }; - khtml = { - version = "5.14.0"; - src = fetchurl { - url = "${mirror}/stable/frameworks/5.14/portingAids/khtml-5.14.0.tar.xz"; - sha256 = "1hj406v06isggbzvsw47ws510iz128jv5ggxw64p9pcibs3wb5j2"; - name = "khtml-5.14.0.tar.xz"; - }; - }; - ki18n = { - version = "5.14.0"; - src = fetchurl { - url = "${mirror}/stable/frameworks/5.14/ki18n-5.14.0.tar.xz"; - sha256 = "0pwpxda5k7hl6njzzaj68brm1slfffprncgwknhaxksizprdh1qz"; - name = "ki18n-5.14.0.tar.xz"; - }; - }; - kiconthemes = { - version = "5.14.0"; - src = fetchurl { - url = "${mirror}/stable/frameworks/5.14/kiconthemes-5.14.0.tar.xz"; - sha256 = "0mhykdhzab112h5pb2s2sma821x57mnr3ydwq96qjr7xhdib8dwr"; - name = "kiconthemes-5.14.0.tar.xz"; - }; - }; - kidletime = { - version = "5.14.0"; - src = fetchurl { - url = "${mirror}/stable/frameworks/5.14/kidletime-5.14.0.tar.xz"; - sha256 = "07qhmyld01xcidbhkwscz5x8xvnnbphz7hfiqkn20d0n6kmlfbr8"; - name = "kidletime-5.14.0.tar.xz"; - }; - }; - kimageformats = { - version = "5.14.0"; - src = fetchurl { - url = "${mirror}/stable/frameworks/5.14/kimageformats-5.14.0.tar.xz"; - sha256 = "13s25pxxjddbbzvf9l0pcrjcwkkc108318v7yglqrm58ankq8pyy"; - name = "kimageformats-5.14.0.tar.xz"; - }; - }; - kinit = { - version = "5.14.0"; - src = fetchurl { - url = "${mirror}/stable/frameworks/5.14/kinit-5.14.0.tar.xz"; - sha256 = "1g6wvpd7kzmnayfax2ph7sng1blaa91fclzfxpvwnxqpayzj2z6a"; - name = "kinit-5.14.0.tar.xz"; - }; - }; - kio = { - version = "5.14.0"; - src = fetchurl { - url = "${mirror}/stable/frameworks/5.14/kio-5.14.0.tar.xz"; - sha256 = "1brirg53khh8wyyd3sbnas82924idxbbc81wqk8433ryv645i8ra"; - name = "kio-5.14.0.tar.xz"; - }; - }; - kitemmodels = { - version = "5.14.0"; - src = fetchurl { - url = "${mirror}/stable/frameworks/5.14/kitemmodels-5.14.0.tar.xz"; - sha256 = "0phf2278fpiyippz347l18gw3kgfvmdm2mv2wx56rsfy5inih8qf"; - name = "kitemmodels-5.14.0.tar.xz"; - }; - }; - kitemviews = { - version = "5.14.0"; - src = fetchurl { - url = "${mirror}/stable/frameworks/5.14/kitemviews-5.14.0.tar.xz"; - sha256 = "1yk8djnrw4z5dw7xmwwsgz3fw1n3c1yjkggkgjy75659656psac1"; - name = "kitemviews-5.14.0.tar.xz"; - }; - }; - kjobwidgets = { - version = "5.14.0"; - src = fetchurl { - url = "${mirror}/stable/frameworks/5.14/kjobwidgets-5.14.0.tar.xz"; - sha256 = "0ibxbhh335b8j5603z500fw4mnk776jj364ha9c1n4qdd7ar5yi0"; - name = "kjobwidgets-5.14.0.tar.xz"; - }; - }; - kjs = { - version = "5.14.0"; - src = fetchurl { - url = "${mirror}/stable/frameworks/5.14/portingAids/kjs-5.14.0.tar.xz"; - sha256 = "1xwp9jpwmkc5h1rab6bda6ffib064qn1wpmz6hdhrgzp77v5ljw4"; - name = "kjs-5.14.0.tar.xz"; - }; - }; - kjsembed = { - version = "5.14.0"; - src = fetchurl { - url = "${mirror}/stable/frameworks/5.14/portingAids/kjsembed-5.14.0.tar.xz"; - sha256 = "09vlq2d0nzhw1fiy7nww0ixa15ciwc6i9f4xqay746xy9f5i30vl"; - name = "kjsembed-5.14.0.tar.xz"; - }; - }; - kmediaplayer = { - version = "5.14.0"; - src = fetchurl { - url = "${mirror}/stable/frameworks/5.14/portingAids/kmediaplayer-5.14.0.tar.xz"; - sha256 = "1mcvrffg9lfvhy6qs9v1caxf523zh2jy1mhd88m34p7sfdxp8azm"; - name = "kmediaplayer-5.14.0.tar.xz"; - }; - }; - knewstuff = { - version = "5.14.0"; - src = fetchurl { - url = "${mirror}/stable/frameworks/5.14/knewstuff-5.14.0.tar.xz"; - sha256 = "0yprn590g5y0gcvmlk5p79v2svn29zyhgq9lmp5qzhh7wgz8jp26"; - name = "knewstuff-5.14.0.tar.xz"; - }; - }; - knotifications = { - version = "5.14.0"; - src = fetchurl { - url = "${mirror}/stable/frameworks/5.14/knotifications-5.14.0.tar.xz"; - sha256 = "0w0b9wb5zpwjhzph5cqfvcgxz2dafi33f3jgwmdw9sm2cgmwavgb"; - name = "knotifications-5.14.0.tar.xz"; - }; - }; - knotifyconfig = { - version = "5.14.0"; - src = fetchurl { - url = "${mirror}/stable/frameworks/5.14/knotifyconfig-5.14.0.tar.xz"; - sha256 = "04872agypbnj3kc6q0xa5ndzd7lzny5zp1llad0x10k7spvwk0rb"; - name = "knotifyconfig-5.14.0.tar.xz"; - }; - }; - kpackage = { - version = "5.14.0"; - src = fetchurl { - url = "${mirror}/stable/frameworks/5.14/kpackage-5.14.0.tar.xz"; - sha256 = "0rvm9vwlirk38wbjyp8kkvs2m03mb1bby63zakbd7y2x5l26hyd5"; - name = "kpackage-5.14.0.tar.xz"; - }; - }; - kparts = { - version = "5.14.0"; - src = fetchurl { - url = "${mirror}/stable/frameworks/5.14/kparts-5.14.0.tar.xz"; - sha256 = "149mck84rlbvw0am7jqbs6irhhabp8xd49m1b5avgdqfrkjsrrz5"; - name = "kparts-5.14.0.tar.xz"; - }; - }; - kpeople = { - version = "5.14.0"; - src = fetchurl { - url = "${mirror}/stable/frameworks/5.14/kpeople-5.14.0.tar.xz"; - sha256 = "08khnnywj7f3xkgr7yclz7wdhq4lyi9xfm7f7lzsfk6vpvzn84p5"; - name = "kpeople-5.14.0.tar.xz"; - }; - }; - kplotting = { - version = "5.14.0"; - src = fetchurl { - url = "${mirror}/stable/frameworks/5.14/kplotting-5.14.0.tar.xz"; - sha256 = "1d3fii89ziqnjv864qp7v9r5wd9v2qb56n6m5v9j0pz8gysc2fyp"; - name = "kplotting-5.14.0.tar.xz"; - }; - }; - kpty = { - version = "5.14.0"; - src = fetchurl { - url = "${mirror}/stable/frameworks/5.14/kpty-5.14.0.tar.xz"; - sha256 = "0lyayl4z6a1fn1lr1plikx22crdalnr1sv66nwhld7dh9j3lgd6j"; - name = "kpty-5.14.0.tar.xz"; - }; - }; - kross = { - version = "5.14.0"; - src = fetchurl { - url = "${mirror}/stable/frameworks/5.14/portingAids/kross-5.14.0.tar.xz"; - sha256 = "1s7icj7xsnj8sxg99ahv3h8rbv6xnkyqpybxgaj9xs6k738rjclv"; - name = "kross-5.14.0.tar.xz"; - }; - }; - krunner = { - version = "5.14.0"; - src = fetchurl { - url = "${mirror}/stable/frameworks/5.14/portingAids/krunner-5.14.0.tar.xz"; - sha256 = "0lxsbg4r0hxq9cgj2c8bs5yyzaxbpn73nsxhh1a9ivjcdbdz52x3"; - name = "krunner-5.14.0.tar.xz"; - }; - }; - kservice = { - version = "5.14.3"; - src = fetchurl { - url = "${mirror}/stable/frameworks/5.14/kservice-5.14.3.tar.xz"; - sha256 = "0x3lbzs39vxyndh3v3kcwbp9127llfxyjgbm6yga1mff29ld57g7"; - name = "kservice-5.14.3.tar.xz"; - }; - }; - ktexteditor = { - version = "5.14.0"; - src = fetchurl { - url = "${mirror}/stable/frameworks/5.14/ktexteditor-5.14.0.tar.xz"; - sha256 = "1r3zshqn7f7z81i2zzswc0a4158q21jgk5ydlx82v5w41lgsng9z"; - name = "ktexteditor-5.14.0.tar.xz"; - }; - }; - ktextwidgets = { - version = "5.14.0"; - src = fetchurl { - url = "${mirror}/stable/frameworks/5.14/ktextwidgets-5.14.0.tar.xz"; - sha256 = "0nm6jaqx2jrwmqds3hdpkxmzl03vz46f147q0q659gashq9i6nlr"; - name = "ktextwidgets-5.14.0.tar.xz"; - }; - }; - kunitconversion = { - version = "5.14.0"; - src = fetchurl { - url = "${mirror}/stable/frameworks/5.14/kunitconversion-5.14.0.tar.xz"; - sha256 = "080y8lxggb1dm4hjv0qb6baklb42mngz7ic3fdp9nc7jrsfbn4qq"; - name = "kunitconversion-5.14.0.tar.xz"; - }; - }; - kwallet = { - version = "5.14.0"; - src = fetchurl { - url = "${mirror}/stable/frameworks/5.14/kwallet-5.14.0.tar.xz"; - sha256 = "1sk1mami15wygx7rmq2p445qdvx7yq10rhvbxgwclmvd4lj8vnly"; - name = "kwallet-5.14.0.tar.xz"; - }; - }; - kwidgetsaddons = { - version = "5.14.0"; - src = fetchurl { - url = "${mirror}/stable/frameworks/5.14/kwidgetsaddons-5.14.0.tar.xz"; - sha256 = "0vqrz54f57qz2jls7iw3hsfgglidfjhk88rkpr0sam449hmqxw2v"; - name = "kwidgetsaddons-5.14.0.tar.xz"; - }; - }; - kwindowsystem = { - version = "5.14.0"; - src = fetchurl { - url = "${mirror}/stable/frameworks/5.14/kwindowsystem-5.14.0.tar.xz"; - sha256 = "0fgqbrm1ngisjz11ccwvjb05v9v8fy85hvxaqnak0xysmvsw4sq1"; - name = "kwindowsystem-5.14.0.tar.xz"; - }; - }; - kxmlgui = { - version = "5.14.0"; - src = fetchurl { - url = "${mirror}/stable/frameworks/5.14/kxmlgui-5.14.0.tar.xz"; - sha256 = "1j3m37h6lxkk3bs2klqqlqlpnrlqvc1a3yd1hn8sr5sn279src30"; - name = "kxmlgui-5.14.0.tar.xz"; - }; - }; - kxmlrpcclient = { - version = "5.14.0"; - src = fetchurl { - url = "${mirror}/stable/frameworks/5.14/kxmlrpcclient-5.14.0.tar.xz"; - sha256 = "13s1np7sjjkmnih5r6rszqs3pvq0m4wq9za73cwhwnmlha7m3q0s"; - name = "kxmlrpcclient-5.14.0.tar.xz"; - }; - }; - modemmanager-qt = { - version = "5.14.0"; - src = fetchurl { - url = "${mirror}/stable/frameworks/5.14/modemmanager-qt-5.14.0.tar.xz"; - sha256 = "1njg0gmzmj6g1w6d7id44g6dw7bki8xsq3sk0p7jqh1lcnsww4ck"; - name = "modemmanager-qt-5.14.0.tar.xz"; - }; - }; - networkmanager-qt = { - version = "5.14.0"; - src = fetchurl { - url = "${mirror}/stable/frameworks/5.14/networkmanager-qt-5.14.0.tar.xz"; - sha256 = "1j2srgz4z2jd6b0iyb1rj979k0jz9hk8k7wx23146cvgrr4h4s86"; - name = "networkmanager-qt-5.14.0.tar.xz"; - }; - }; - plasma-framework = { - version = "5.14.0"; - src = fetchurl { - url = "${mirror}/stable/frameworks/5.14/plasma-framework-5.14.0.tar.xz"; - sha256 = "16yghp353l9apndwqcaa310cxhm6vn0c2amggzvpr5fdwa3jb6mh"; - name = "plasma-framework-5.14.0.tar.xz"; - }; - }; - solid = { - version = "5.14.0"; - src = fetchurl { - url = "${mirror}/stable/frameworks/5.14/solid-5.14.0.tar.xz"; - sha256 = "0znrmpw9nr2yccqs1xr0kai3sfhi175gfr006h4h88kfr0gc9s4i"; - name = "solid-5.14.0.tar.xz"; - }; - }; - sonnet = { - version = "5.14.0"; - src = fetchurl { - url = "${mirror}/stable/frameworks/5.14/sonnet-5.14.0.tar.xz"; - sha256 = "06nn9zxxvj7sf6pdg35vay1f022c2binhl8p7i29w7vmxnxdg4w9"; - name = "sonnet-5.14.0.tar.xz"; - }; - }; - threadweaver = { - version = "5.14.0"; - src = fetchurl { - url = "${mirror}/stable/frameworks/5.14/threadweaver-5.14.0.tar.xz"; - sha256 = "01vdqhlg5jp14dhalpggy359hw9620309zbssp0pdv7bflnwl0n3"; - name = "threadweaver-5.14.0.tar.xz"; - }; - }; -} diff --git a/pkgs/development/libraries/kde-frameworks-5.14/attica.nix b/pkgs/development/libraries/kde-frameworks-5.15/attica.nix similarity index 100% rename from pkgs/development/libraries/kde-frameworks-5.14/attica.nix rename to pkgs/development/libraries/kde-frameworks-5.15/attica.nix diff --git a/pkgs/development/libraries/kde-frameworks-5.14/baloo.nix b/pkgs/development/libraries/kde-frameworks-5.15/baloo.nix similarity index 100% rename from pkgs/development/libraries/kde-frameworks-5.14/baloo.nix rename to pkgs/development/libraries/kde-frameworks-5.15/baloo.nix diff --git a/pkgs/development/libraries/kde-frameworks-5.14/bluez-qt.nix b/pkgs/development/libraries/kde-frameworks-5.15/bluez-qt.nix similarity index 100% rename from pkgs/development/libraries/kde-frameworks-5.14/bluez-qt.nix rename to pkgs/development/libraries/kde-frameworks-5.15/bluez-qt.nix diff --git a/pkgs/development/libraries/kde-frameworks-5.14/default.nix b/pkgs/development/libraries/kde-frameworks-5.15/default.nix similarity index 100% rename from pkgs/development/libraries/kde-frameworks-5.14/default.nix rename to pkgs/development/libraries/kde-frameworks-5.15/default.nix diff --git a/pkgs/development/libraries/kde-frameworks-5.14/extra-cmake-modules/0001-extra-cmake-modules-paths.patch b/pkgs/development/libraries/kde-frameworks-5.15/extra-cmake-modules/0001-extra-cmake-modules-paths.patch similarity index 100% rename from pkgs/development/libraries/kde-frameworks-5.14/extra-cmake-modules/0001-extra-cmake-modules-paths.patch rename to pkgs/development/libraries/kde-frameworks-5.15/extra-cmake-modules/0001-extra-cmake-modules-paths.patch diff --git a/pkgs/development/libraries/kde-frameworks-5.14/extra-cmake-modules/default.nix b/pkgs/development/libraries/kde-frameworks-5.15/extra-cmake-modules/default.nix similarity index 100% rename from pkgs/development/libraries/kde-frameworks-5.14/extra-cmake-modules/default.nix rename to pkgs/development/libraries/kde-frameworks-5.15/extra-cmake-modules/default.nix diff --git a/pkgs/development/libraries/kde-frameworks-5.14/extra-cmake-modules/setup-hook.sh b/pkgs/development/libraries/kde-frameworks-5.15/extra-cmake-modules/setup-hook.sh similarity index 100% rename from pkgs/development/libraries/kde-frameworks-5.14/extra-cmake-modules/setup-hook.sh rename to pkgs/development/libraries/kde-frameworks-5.15/extra-cmake-modules/setup-hook.sh diff --git a/pkgs/development/libraries/kde-frameworks-5.14/fetchsrcs.sh b/pkgs/development/libraries/kde-frameworks-5.15/fetchsrcs.sh similarity index 96% rename from pkgs/development/libraries/kde-frameworks-5.14/fetchsrcs.sh rename to pkgs/development/libraries/kde-frameworks-5.15/fetchsrcs.sh index a402d406b8aa..e7f6d9e00e5c 100755 --- a/pkgs/development/libraries/kde-frameworks-5.14/fetchsrcs.sh +++ b/pkgs/development/libraries/kde-frameworks-5.15/fetchsrcs.sh @@ -4,7 +4,7 @@ set -x # The trailing slash at the end is necessary! -RELEASE_URL="http://download.kde.org/stable/frameworks/5.14/" +RELEASE_URL="http://download.kde.org/stable/frameworks/5.15/" EXTRA_WGET_ARGS='-A *.tar.xz' mkdir tmp; cd tmp diff --git a/pkgs/development/libraries/kde-frameworks-5.14/frameworkintegration.nix b/pkgs/development/libraries/kde-frameworks-5.15/frameworkintegration.nix similarity index 100% rename from pkgs/development/libraries/kde-frameworks-5.14/frameworkintegration.nix rename to pkgs/development/libraries/kde-frameworks-5.15/frameworkintegration.nix diff --git a/pkgs/development/libraries/kde-frameworks-5.14/kactivities.nix b/pkgs/development/libraries/kde-frameworks-5.15/kactivities.nix similarity index 100% rename from pkgs/development/libraries/kde-frameworks-5.14/kactivities.nix rename to pkgs/development/libraries/kde-frameworks-5.15/kactivities.nix diff --git a/pkgs/development/libraries/kde-frameworks-5.14/kapidox.nix b/pkgs/development/libraries/kde-frameworks-5.15/kapidox.nix similarity index 100% rename from pkgs/development/libraries/kde-frameworks-5.14/kapidox.nix rename to pkgs/development/libraries/kde-frameworks-5.15/kapidox.nix diff --git a/pkgs/development/libraries/kde-frameworks-5.14/karchive.nix b/pkgs/development/libraries/kde-frameworks-5.15/karchive.nix similarity index 100% rename from pkgs/development/libraries/kde-frameworks-5.14/karchive.nix rename to pkgs/development/libraries/kde-frameworks-5.15/karchive.nix diff --git a/pkgs/development/libraries/kde-frameworks-5.14/kauth/default.nix b/pkgs/development/libraries/kde-frameworks-5.15/kauth/default.nix similarity index 100% rename from pkgs/development/libraries/kde-frameworks-5.14/kauth/default.nix rename to pkgs/development/libraries/kde-frameworks-5.15/kauth/default.nix diff --git a/pkgs/development/libraries/kde-frameworks-5.14/kauth/kauth-policy-install.patch b/pkgs/development/libraries/kde-frameworks-5.15/kauth/kauth-policy-install.patch similarity index 100% rename from pkgs/development/libraries/kde-frameworks-5.14/kauth/kauth-policy-install.patch rename to pkgs/development/libraries/kde-frameworks-5.15/kauth/kauth-policy-install.patch diff --git a/pkgs/development/libraries/kde-frameworks-5.14/kbookmarks.nix b/pkgs/development/libraries/kde-frameworks-5.15/kbookmarks.nix similarity index 100% rename from pkgs/development/libraries/kde-frameworks-5.14/kbookmarks.nix rename to pkgs/development/libraries/kde-frameworks-5.15/kbookmarks.nix diff --git a/pkgs/development/libraries/kde-frameworks-5.14/kcmutils/default.nix b/pkgs/development/libraries/kde-frameworks-5.15/kcmutils/default.nix similarity index 100% rename from pkgs/development/libraries/kde-frameworks-5.14/kcmutils/default.nix rename to pkgs/development/libraries/kde-frameworks-5.15/kcmutils/default.nix diff --git a/pkgs/development/libraries/kde-frameworks-5.14/kcmutils/kcmutils-pluginselector-follow-symlinks.patch b/pkgs/development/libraries/kde-frameworks-5.15/kcmutils/kcmutils-pluginselector-follow-symlinks.patch similarity index 100% rename from pkgs/development/libraries/kde-frameworks-5.14/kcmutils/kcmutils-pluginselector-follow-symlinks.patch rename to pkgs/development/libraries/kde-frameworks-5.15/kcmutils/kcmutils-pluginselector-follow-symlinks.patch diff --git a/pkgs/development/libraries/kde-frameworks-5.14/kcodecs.nix b/pkgs/development/libraries/kde-frameworks-5.15/kcodecs.nix similarity index 100% rename from pkgs/development/libraries/kde-frameworks-5.14/kcodecs.nix rename to pkgs/development/libraries/kde-frameworks-5.15/kcodecs.nix diff --git a/pkgs/development/libraries/kde-frameworks-5.14/kcompletion.nix b/pkgs/development/libraries/kde-frameworks-5.15/kcompletion.nix similarity index 100% rename from pkgs/development/libraries/kde-frameworks-5.14/kcompletion.nix rename to pkgs/development/libraries/kde-frameworks-5.15/kcompletion.nix diff --git a/pkgs/development/libraries/kde-frameworks-5.14/kconfig.nix b/pkgs/development/libraries/kde-frameworks-5.15/kconfig.nix similarity index 100% rename from pkgs/development/libraries/kde-frameworks-5.14/kconfig.nix rename to pkgs/development/libraries/kde-frameworks-5.15/kconfig.nix diff --git a/pkgs/development/libraries/kde-frameworks-5.14/kconfigwidgets/default.nix b/pkgs/development/libraries/kde-frameworks-5.15/kconfigwidgets/default.nix similarity index 100% rename from pkgs/development/libraries/kde-frameworks-5.14/kconfigwidgets/default.nix rename to pkgs/development/libraries/kde-frameworks-5.15/kconfigwidgets/default.nix diff --git a/pkgs/development/libraries/kde-frameworks-5.14/kconfigwidgets/kconfigwidgets-helpclient-follow-symlinks.patch b/pkgs/development/libraries/kde-frameworks-5.15/kconfigwidgets/kconfigwidgets-helpclient-follow-symlinks.patch similarity index 100% rename from pkgs/development/libraries/kde-frameworks-5.14/kconfigwidgets/kconfigwidgets-helpclient-follow-symlinks.patch rename to pkgs/development/libraries/kde-frameworks-5.15/kconfigwidgets/kconfigwidgets-helpclient-follow-symlinks.patch diff --git a/pkgs/development/libraries/kde-frameworks-5.14/kcoreaddons.nix b/pkgs/development/libraries/kde-frameworks-5.15/kcoreaddons.nix similarity index 100% rename from pkgs/development/libraries/kde-frameworks-5.14/kcoreaddons.nix rename to pkgs/development/libraries/kde-frameworks-5.15/kcoreaddons.nix diff --git a/pkgs/development/libraries/kde-frameworks-5.14/kcrash.nix b/pkgs/development/libraries/kde-frameworks-5.15/kcrash.nix similarity index 100% rename from pkgs/development/libraries/kde-frameworks-5.14/kcrash.nix rename to pkgs/development/libraries/kde-frameworks-5.15/kcrash.nix diff --git a/pkgs/development/libraries/kde-frameworks-5.14/kdbusaddons.nix b/pkgs/development/libraries/kde-frameworks-5.15/kdbusaddons.nix similarity index 100% rename from pkgs/development/libraries/kde-frameworks-5.14/kdbusaddons.nix rename to pkgs/development/libraries/kde-frameworks-5.15/kdbusaddons.nix diff --git a/pkgs/development/libraries/kde-frameworks-5.14/kdeclarative.nix b/pkgs/development/libraries/kde-frameworks-5.15/kdeclarative.nix similarity index 100% rename from pkgs/development/libraries/kde-frameworks-5.14/kdeclarative.nix rename to pkgs/development/libraries/kde-frameworks-5.15/kdeclarative.nix diff --git a/pkgs/development/libraries/kde-frameworks-5.14/kded.nix b/pkgs/development/libraries/kde-frameworks-5.15/kded.nix similarity index 100% rename from pkgs/development/libraries/kde-frameworks-5.14/kded.nix rename to pkgs/development/libraries/kde-frameworks-5.15/kded.nix diff --git a/pkgs/development/libraries/kde-frameworks-5.14/kdelibs4support.nix b/pkgs/development/libraries/kde-frameworks-5.15/kdelibs4support.nix similarity index 100% rename from pkgs/development/libraries/kde-frameworks-5.14/kdelibs4support.nix rename to pkgs/development/libraries/kde-frameworks-5.15/kdelibs4support.nix diff --git a/pkgs/development/libraries/kde-frameworks-5.14/kdesignerplugin.nix b/pkgs/development/libraries/kde-frameworks-5.15/kdesignerplugin.nix similarity index 100% rename from pkgs/development/libraries/kde-frameworks-5.14/kdesignerplugin.nix rename to pkgs/development/libraries/kde-frameworks-5.15/kdesignerplugin.nix diff --git a/pkgs/development/libraries/kde-frameworks-5.14/kdesu.nix b/pkgs/development/libraries/kde-frameworks-5.15/kdesu.nix similarity index 100% rename from pkgs/development/libraries/kde-frameworks-5.14/kdesu.nix rename to pkgs/development/libraries/kde-frameworks-5.15/kdesu.nix diff --git a/pkgs/development/libraries/kde-frameworks-5.14/kdewebkit.nix b/pkgs/development/libraries/kde-frameworks-5.15/kdewebkit.nix similarity index 100% rename from pkgs/development/libraries/kde-frameworks-5.14/kdewebkit.nix rename to pkgs/development/libraries/kde-frameworks-5.15/kdewebkit.nix diff --git a/pkgs/development/libraries/kde-frameworks-5.14/kdnssd.nix b/pkgs/development/libraries/kde-frameworks-5.15/kdnssd.nix similarity index 100% rename from pkgs/development/libraries/kde-frameworks-5.14/kdnssd.nix rename to pkgs/development/libraries/kde-frameworks-5.15/kdnssd.nix diff --git a/pkgs/development/libraries/kde-frameworks-5.14/kdoctools/default.nix b/pkgs/development/libraries/kde-frameworks-5.15/kdoctools/default.nix similarity index 100% rename from pkgs/development/libraries/kde-frameworks-5.14/kdoctools/default.nix rename to pkgs/development/libraries/kde-frameworks-5.15/kdoctools/default.nix diff --git a/pkgs/development/libraries/kde-frameworks-5.14/kdoctools/kdoctools-no-find-docbook-xml.patch b/pkgs/development/libraries/kde-frameworks-5.15/kdoctools/kdoctools-no-find-docbook-xml.patch similarity index 100% rename from pkgs/development/libraries/kde-frameworks-5.14/kdoctools/kdoctools-no-find-docbook-xml.patch rename to pkgs/development/libraries/kde-frameworks-5.15/kdoctools/kdoctools-no-find-docbook-xml.patch diff --git a/pkgs/development/libraries/kde-frameworks-5.14/kemoticons.nix b/pkgs/development/libraries/kde-frameworks-5.15/kemoticons.nix similarity index 100% rename from pkgs/development/libraries/kde-frameworks-5.14/kemoticons.nix rename to pkgs/development/libraries/kde-frameworks-5.15/kemoticons.nix diff --git a/pkgs/development/libraries/kde-frameworks-5.14/kfilemetadata.nix b/pkgs/development/libraries/kde-frameworks-5.15/kfilemetadata.nix similarity index 100% rename from pkgs/development/libraries/kde-frameworks-5.14/kfilemetadata.nix rename to pkgs/development/libraries/kde-frameworks-5.15/kfilemetadata.nix diff --git a/pkgs/development/libraries/kde-frameworks-5.14/kglobalaccel.nix b/pkgs/development/libraries/kde-frameworks-5.15/kglobalaccel.nix similarity index 100% rename from pkgs/development/libraries/kde-frameworks-5.14/kglobalaccel.nix rename to pkgs/development/libraries/kde-frameworks-5.15/kglobalaccel.nix diff --git a/pkgs/development/libraries/kde-frameworks-5.14/kguiaddons.nix b/pkgs/development/libraries/kde-frameworks-5.15/kguiaddons.nix similarity index 100% rename from pkgs/development/libraries/kde-frameworks-5.14/kguiaddons.nix rename to pkgs/development/libraries/kde-frameworks-5.15/kguiaddons.nix diff --git a/pkgs/development/libraries/kde-frameworks-5.14/khtml.nix b/pkgs/development/libraries/kde-frameworks-5.15/khtml.nix similarity index 100% rename from pkgs/development/libraries/kde-frameworks-5.14/khtml.nix rename to pkgs/development/libraries/kde-frameworks-5.15/khtml.nix diff --git a/pkgs/development/libraries/kde-frameworks-5.14/ki18n.nix b/pkgs/development/libraries/kde-frameworks-5.15/ki18n.nix similarity index 100% rename from pkgs/development/libraries/kde-frameworks-5.14/ki18n.nix rename to pkgs/development/libraries/kde-frameworks-5.15/ki18n.nix diff --git a/pkgs/development/libraries/kde-frameworks-5.14/kiconthemes.nix b/pkgs/development/libraries/kde-frameworks-5.15/kiconthemes.nix similarity index 100% rename from pkgs/development/libraries/kde-frameworks-5.14/kiconthemes.nix rename to pkgs/development/libraries/kde-frameworks-5.15/kiconthemes.nix diff --git a/pkgs/development/libraries/kde-frameworks-5.14/kidletime.nix b/pkgs/development/libraries/kde-frameworks-5.15/kidletime.nix similarity index 100% rename from pkgs/development/libraries/kde-frameworks-5.14/kidletime.nix rename to pkgs/development/libraries/kde-frameworks-5.15/kidletime.nix diff --git a/pkgs/development/libraries/kde-frameworks-5.14/kimageformats.nix b/pkgs/development/libraries/kde-frameworks-5.15/kimageformats.nix similarity index 100% rename from pkgs/development/libraries/kde-frameworks-5.14/kimageformats.nix rename to pkgs/development/libraries/kde-frameworks-5.15/kimageformats.nix diff --git a/pkgs/development/libraries/kde-frameworks-5.14/kinit/0001-kinit-libpath.patch b/pkgs/development/libraries/kde-frameworks-5.15/kinit/0001-kinit-libpath.patch similarity index 100% rename from pkgs/development/libraries/kde-frameworks-5.14/kinit/0001-kinit-libpath.patch rename to pkgs/development/libraries/kde-frameworks-5.15/kinit/0001-kinit-libpath.patch diff --git a/pkgs/development/libraries/kde-frameworks-5.14/kinit/default.nix b/pkgs/development/libraries/kde-frameworks-5.15/kinit/default.nix similarity index 100% rename from pkgs/development/libraries/kde-frameworks-5.14/kinit/default.nix rename to pkgs/development/libraries/kde-frameworks-5.15/kinit/default.nix diff --git a/pkgs/development/libraries/kde-frameworks-5.14/kio.nix b/pkgs/development/libraries/kde-frameworks-5.15/kio.nix similarity index 100% rename from pkgs/development/libraries/kde-frameworks-5.14/kio.nix rename to pkgs/development/libraries/kde-frameworks-5.15/kio.nix diff --git a/pkgs/development/libraries/kde-frameworks-5.14/kitemmodels.nix b/pkgs/development/libraries/kde-frameworks-5.15/kitemmodels.nix similarity index 100% rename from pkgs/development/libraries/kde-frameworks-5.14/kitemmodels.nix rename to pkgs/development/libraries/kde-frameworks-5.15/kitemmodels.nix diff --git a/pkgs/development/libraries/kde-frameworks-5.14/kitemviews.nix b/pkgs/development/libraries/kde-frameworks-5.15/kitemviews.nix similarity index 100% rename from pkgs/development/libraries/kde-frameworks-5.14/kitemviews.nix rename to pkgs/development/libraries/kde-frameworks-5.15/kitemviews.nix diff --git a/pkgs/development/libraries/kde-frameworks-5.14/kjobwidgets.nix b/pkgs/development/libraries/kde-frameworks-5.15/kjobwidgets.nix similarity index 100% rename from pkgs/development/libraries/kde-frameworks-5.14/kjobwidgets.nix rename to pkgs/development/libraries/kde-frameworks-5.15/kjobwidgets.nix diff --git a/pkgs/development/libraries/kde-frameworks-5.14/kjs.nix b/pkgs/development/libraries/kde-frameworks-5.15/kjs.nix similarity index 100% rename from pkgs/development/libraries/kde-frameworks-5.14/kjs.nix rename to pkgs/development/libraries/kde-frameworks-5.15/kjs.nix diff --git a/pkgs/development/libraries/kde-frameworks-5.14/kjsembed.nix b/pkgs/development/libraries/kde-frameworks-5.15/kjsembed.nix similarity index 100% rename from pkgs/development/libraries/kde-frameworks-5.14/kjsembed.nix rename to pkgs/development/libraries/kde-frameworks-5.15/kjsembed.nix diff --git a/pkgs/development/libraries/kde-frameworks-5.14/kmediaplayer.nix b/pkgs/development/libraries/kde-frameworks-5.15/kmediaplayer.nix similarity index 100% rename from pkgs/development/libraries/kde-frameworks-5.14/kmediaplayer.nix rename to pkgs/development/libraries/kde-frameworks-5.15/kmediaplayer.nix diff --git a/pkgs/development/libraries/kde-frameworks-5.14/knewstuff.nix b/pkgs/development/libraries/kde-frameworks-5.15/knewstuff.nix similarity index 100% rename from pkgs/development/libraries/kde-frameworks-5.14/knewstuff.nix rename to pkgs/development/libraries/kde-frameworks-5.15/knewstuff.nix diff --git a/pkgs/development/libraries/kde-frameworks-5.14/knotifications.nix b/pkgs/development/libraries/kde-frameworks-5.15/knotifications.nix similarity index 100% rename from pkgs/development/libraries/kde-frameworks-5.14/knotifications.nix rename to pkgs/development/libraries/kde-frameworks-5.15/knotifications.nix diff --git a/pkgs/development/libraries/kde-frameworks-5.14/knotifyconfig.nix b/pkgs/development/libraries/kde-frameworks-5.15/knotifyconfig.nix similarity index 100% rename from pkgs/development/libraries/kde-frameworks-5.14/knotifyconfig.nix rename to pkgs/development/libraries/kde-frameworks-5.15/knotifyconfig.nix diff --git a/pkgs/development/libraries/kde-frameworks-5.14/kpackage/0001-allow-external-paths.patch b/pkgs/development/libraries/kde-frameworks-5.15/kpackage/0001-allow-external-paths.patch similarity index 100% rename from pkgs/development/libraries/kde-frameworks-5.14/kpackage/0001-allow-external-paths.patch rename to pkgs/development/libraries/kde-frameworks-5.15/kpackage/0001-allow-external-paths.patch diff --git a/pkgs/development/libraries/kde-frameworks-5.14/kpackage/default.nix b/pkgs/development/libraries/kde-frameworks-5.15/kpackage/default.nix similarity index 100% rename from pkgs/development/libraries/kde-frameworks-5.14/kpackage/default.nix rename to pkgs/development/libraries/kde-frameworks-5.15/kpackage/default.nix diff --git a/pkgs/development/libraries/kde-frameworks-5.14/kparts.nix b/pkgs/development/libraries/kde-frameworks-5.15/kparts.nix similarity index 100% rename from pkgs/development/libraries/kde-frameworks-5.14/kparts.nix rename to pkgs/development/libraries/kde-frameworks-5.15/kparts.nix diff --git a/pkgs/development/libraries/kde-frameworks-5.14/kpeople.nix b/pkgs/development/libraries/kde-frameworks-5.15/kpeople.nix similarity index 100% rename from pkgs/development/libraries/kde-frameworks-5.14/kpeople.nix rename to pkgs/development/libraries/kde-frameworks-5.15/kpeople.nix diff --git a/pkgs/development/libraries/kde-frameworks-5.14/kplotting.nix b/pkgs/development/libraries/kde-frameworks-5.15/kplotting.nix similarity index 100% rename from pkgs/development/libraries/kde-frameworks-5.14/kplotting.nix rename to pkgs/development/libraries/kde-frameworks-5.15/kplotting.nix diff --git a/pkgs/development/libraries/kde-frameworks-5.14/kpty.nix b/pkgs/development/libraries/kde-frameworks-5.15/kpty.nix similarity index 100% rename from pkgs/development/libraries/kde-frameworks-5.14/kpty.nix rename to pkgs/development/libraries/kde-frameworks-5.15/kpty.nix diff --git a/pkgs/development/libraries/kde-frameworks-5.14/kross.nix b/pkgs/development/libraries/kde-frameworks-5.15/kross.nix similarity index 100% rename from pkgs/development/libraries/kde-frameworks-5.14/kross.nix rename to pkgs/development/libraries/kde-frameworks-5.15/kross.nix diff --git a/pkgs/development/libraries/kde-frameworks-5.14/krunner.nix b/pkgs/development/libraries/kde-frameworks-5.15/krunner.nix similarity index 100% rename from pkgs/development/libraries/kde-frameworks-5.14/krunner.nix rename to pkgs/development/libraries/kde-frameworks-5.15/krunner.nix diff --git a/pkgs/development/libraries/kde-frameworks-5.14/kservice/default.nix b/pkgs/development/libraries/kde-frameworks-5.15/kservice/default.nix similarity index 100% rename from pkgs/development/libraries/kde-frameworks-5.14/kservice/default.nix rename to pkgs/development/libraries/kde-frameworks-5.15/kservice/default.nix diff --git a/pkgs/development/libraries/kde-frameworks-5.14/kservice/kservice-kbuildsycoca-follow-symlinks.patch b/pkgs/development/libraries/kde-frameworks-5.15/kservice/kservice-kbuildsycoca-follow-symlinks.patch similarity index 100% rename from pkgs/development/libraries/kde-frameworks-5.14/kservice/kservice-kbuildsycoca-follow-symlinks.patch rename to pkgs/development/libraries/kde-frameworks-5.15/kservice/kservice-kbuildsycoca-follow-symlinks.patch diff --git a/pkgs/development/libraries/kde-frameworks-5.14/kservice/kservice-kbuildsycoca-no-canonicalize-path.patch b/pkgs/development/libraries/kde-frameworks-5.15/kservice/kservice-kbuildsycoca-no-canonicalize-path.patch similarity index 100% rename from pkgs/development/libraries/kde-frameworks-5.14/kservice/kservice-kbuildsycoca-no-canonicalize-path.patch rename to pkgs/development/libraries/kde-frameworks-5.15/kservice/kservice-kbuildsycoca-no-canonicalize-path.patch diff --git a/pkgs/development/libraries/kde-frameworks-5.14/kservice/setup-hook.sh b/pkgs/development/libraries/kde-frameworks-5.15/kservice/setup-hook.sh similarity index 100% rename from pkgs/development/libraries/kde-frameworks-5.14/kservice/setup-hook.sh rename to pkgs/development/libraries/kde-frameworks-5.15/kservice/setup-hook.sh diff --git a/pkgs/development/libraries/kde-frameworks-5.14/ktexteditor/0001-no-qcoreapplication.patch b/pkgs/development/libraries/kde-frameworks-5.15/ktexteditor/0001-no-qcoreapplication.patch similarity index 100% rename from pkgs/development/libraries/kde-frameworks-5.14/ktexteditor/0001-no-qcoreapplication.patch rename to pkgs/development/libraries/kde-frameworks-5.15/ktexteditor/0001-no-qcoreapplication.patch diff --git a/pkgs/development/libraries/kde-frameworks-5.14/ktexteditor/default.nix b/pkgs/development/libraries/kde-frameworks-5.15/ktexteditor/default.nix similarity index 100% rename from pkgs/development/libraries/kde-frameworks-5.14/ktexteditor/default.nix rename to pkgs/development/libraries/kde-frameworks-5.15/ktexteditor/default.nix diff --git a/pkgs/development/libraries/kde-frameworks-5.14/ktextwidgets.nix b/pkgs/development/libraries/kde-frameworks-5.15/ktextwidgets.nix similarity index 100% rename from pkgs/development/libraries/kde-frameworks-5.14/ktextwidgets.nix rename to pkgs/development/libraries/kde-frameworks-5.15/ktextwidgets.nix diff --git a/pkgs/development/libraries/kde-frameworks-5.14/kunitconversion.nix b/pkgs/development/libraries/kde-frameworks-5.15/kunitconversion.nix similarity index 100% rename from pkgs/development/libraries/kde-frameworks-5.14/kunitconversion.nix rename to pkgs/development/libraries/kde-frameworks-5.15/kunitconversion.nix diff --git a/pkgs/development/libraries/kde-frameworks-5.14/kwallet.nix b/pkgs/development/libraries/kde-frameworks-5.15/kwallet.nix similarity index 100% rename from pkgs/development/libraries/kde-frameworks-5.14/kwallet.nix rename to pkgs/development/libraries/kde-frameworks-5.15/kwallet.nix diff --git a/pkgs/development/libraries/kde-frameworks-5.14/kwidgetsaddons.nix b/pkgs/development/libraries/kde-frameworks-5.15/kwidgetsaddons.nix similarity index 100% rename from pkgs/development/libraries/kde-frameworks-5.14/kwidgetsaddons.nix rename to pkgs/development/libraries/kde-frameworks-5.15/kwidgetsaddons.nix diff --git a/pkgs/development/libraries/kde-frameworks-5.14/kwindowsystem.nix b/pkgs/development/libraries/kde-frameworks-5.15/kwindowsystem.nix similarity index 100% rename from pkgs/development/libraries/kde-frameworks-5.14/kwindowsystem.nix rename to pkgs/development/libraries/kde-frameworks-5.15/kwindowsystem.nix diff --git a/pkgs/development/libraries/kde-frameworks-5.14/kxmlgui.nix b/pkgs/development/libraries/kde-frameworks-5.15/kxmlgui.nix similarity index 100% rename from pkgs/development/libraries/kde-frameworks-5.14/kxmlgui.nix rename to pkgs/development/libraries/kde-frameworks-5.15/kxmlgui.nix diff --git a/pkgs/development/libraries/kde-frameworks-5.14/kxmlrpcclient.nix b/pkgs/development/libraries/kde-frameworks-5.15/kxmlrpcclient.nix similarity index 100% rename from pkgs/development/libraries/kde-frameworks-5.14/kxmlrpcclient.nix rename to pkgs/development/libraries/kde-frameworks-5.15/kxmlrpcclient.nix diff --git a/pkgs/development/libraries/kde-frameworks-5.14/modemmanager-qt.nix b/pkgs/development/libraries/kde-frameworks-5.15/modemmanager-qt.nix similarity index 100% rename from pkgs/development/libraries/kde-frameworks-5.14/modemmanager-qt.nix rename to pkgs/development/libraries/kde-frameworks-5.15/modemmanager-qt.nix diff --git a/pkgs/development/libraries/kde-frameworks-5.14/networkmanager-qt.nix b/pkgs/development/libraries/kde-frameworks-5.15/networkmanager-qt.nix similarity index 100% rename from pkgs/development/libraries/kde-frameworks-5.14/networkmanager-qt.nix rename to pkgs/development/libraries/kde-frameworks-5.15/networkmanager-qt.nix diff --git a/pkgs/development/libraries/kde-frameworks-5.14/plasma-framework/default.nix b/pkgs/development/libraries/kde-frameworks-5.15/plasma-framework/default.nix similarity index 100% rename from pkgs/development/libraries/kde-frameworks-5.14/plasma-framework/default.nix rename to pkgs/development/libraries/kde-frameworks-5.15/plasma-framework/default.nix diff --git a/pkgs/development/libraries/kde-frameworks-5.14/solid.nix b/pkgs/development/libraries/kde-frameworks-5.15/solid.nix similarity index 100% rename from pkgs/development/libraries/kde-frameworks-5.14/solid.nix rename to pkgs/development/libraries/kde-frameworks-5.15/solid.nix diff --git a/pkgs/development/libraries/kde-frameworks-5.14/sonnet.nix b/pkgs/development/libraries/kde-frameworks-5.15/sonnet.nix similarity index 100% rename from pkgs/development/libraries/kde-frameworks-5.14/sonnet.nix rename to pkgs/development/libraries/kde-frameworks-5.15/sonnet.nix diff --git a/pkgs/development/libraries/kde-frameworks-5.15/srcs.nix b/pkgs/development/libraries/kde-frameworks-5.15/srcs.nix new file mode 100644 index 000000000000..fd4998c49ba8 --- /dev/null +++ b/pkgs/development/libraries/kde-frameworks-5.15/srcs.nix @@ -0,0 +1,549 @@ +# DO NOT EDIT! This file is generated automatically by fetchsrcs.sh +{ fetchurl, mirror }: + +{ + attica = { + version = "5.15.0"; + src = fetchurl { + url = "${mirror}/stable/frameworks/5.15/attica-5.15.0.tar.xz"; + sha256 = "0gddapcl2m5gds8f341z0954qlllx22xbd51649lri429aw2ijcl"; + name = "attica-5.15.0.tar.xz"; + }; + }; + baloo = { + version = "5.15.0"; + src = fetchurl { + url = "${mirror}/stable/frameworks/5.15/baloo-5.15.0.tar.xz"; + sha256 = "10qwxljzhl8wagfmvdbrmqlzk68jkrp703d232fr7gvz3qrmdpbz"; + name = "baloo-5.15.0.tar.xz"; + }; + }; + bluez-qt = { + version = "5.15.0"; + src = fetchurl { + url = "${mirror}/stable/frameworks/5.15/bluez-qt-5.15.0.tar.xz"; + sha256 = "15k242ifj3mfy0g0v7h504zn07cvahc70whc6n9yr0091j1azf5f"; + name = "bluez-qt-5.15.0.tar.xz"; + }; + }; + extra-cmake-modules = { + version = "5.15.0"; + src = fetchurl { + url = "${mirror}/stable/frameworks/5.15/extra-cmake-modules-5.15.0.tar.xz"; + sha256 = "1g02dcbx1r0n2skrhmc6d3pckqvbii7ai91chlkwcdd8vzd4lgcg"; + name = "extra-cmake-modules-5.15.0.tar.xz"; + }; + }; + frameworkintegration = { + version = "5.15.0"; + src = fetchurl { + url = "${mirror}/stable/frameworks/5.15/frameworkintegration-5.15.0.tar.xz"; + sha256 = "06sacinx3g3hrs11v67k7j8ddp5swasjrw6x36ng3mr81i2ksyia"; + name = "frameworkintegration-5.15.0.tar.xz"; + }; + }; + kactivities = { + version = "5.15.0"; + src = fetchurl { + url = "${mirror}/stable/frameworks/5.15/kactivities-5.15.0.tar.xz"; + sha256 = "0h9f78f8r5z5jarxph168h1m0zvz2zhd8iq6gc9sg09044xn1lnq"; + name = "kactivities-5.15.0.tar.xz"; + }; + }; + kapidox = { + version = "5.15.0"; + src = fetchurl { + url = "${mirror}/stable/frameworks/5.15/kapidox-5.15.0.tar.xz"; + sha256 = "1342j7459rafz1ns0nnlh1i65c05cd6l3c4sh1j75qgl0pjnrvcq"; + name = "kapidox-5.15.0.tar.xz"; + }; + }; + karchive = { + version = "5.15.0"; + src = fetchurl { + url = "${mirror}/stable/frameworks/5.15/karchive-5.15.0.tar.xz"; + sha256 = "1s5mggi0vydg9w589qk4fp4qbhj7h9wcczn6k7j41bcqdapxzdfh"; + name = "karchive-5.15.0.tar.xz"; + }; + }; + kauth = { + version = "5.15.0"; + src = fetchurl { + url = "${mirror}/stable/frameworks/5.15/kauth-5.15.0.tar.xz"; + sha256 = "1nhrfbfasmg8a9gj94ri5qcvrdhhb204miv3i5y59ma09hd1xag2"; + name = "kauth-5.15.0.tar.xz"; + }; + }; + kbookmarks = { + version = "5.15.0"; + src = fetchurl { + url = "${mirror}/stable/frameworks/5.15/kbookmarks-5.15.0.tar.xz"; + sha256 = "1y21679a37lspwf02vy687k5najap18x7hxd8k8hssdivjvg43z8"; + name = "kbookmarks-5.15.0.tar.xz"; + }; + }; + kcmutils = { + version = "5.15.0"; + src = fetchurl { + url = "${mirror}/stable/frameworks/5.15/kcmutils-5.15.0.tar.xz"; + sha256 = "0syk030b89z90aa85d1mlag613yaajipgfxxfxnp3f488s54qn6z"; + name = "kcmutils-5.15.0.tar.xz"; + }; + }; + kcodecs = { + version = "5.15.0"; + src = fetchurl { + url = "${mirror}/stable/frameworks/5.15/kcodecs-5.15.0.tar.xz"; + sha256 = "1kz8vbxblzf0lxcn6c2433lhgi2iyvqsm65qxsvf5zgxckq5277p"; + name = "kcodecs-5.15.0.tar.xz"; + }; + }; + kcompletion = { + version = "5.15.0"; + src = fetchurl { + url = "${mirror}/stable/frameworks/5.15/kcompletion-5.15.0.tar.xz"; + sha256 = "1mq110fg30y3xdmjicckysz3k5ylz92hz609ffjnm2svk56w5cny"; + name = "kcompletion-5.15.0.tar.xz"; + }; + }; + kconfig = { + version = "5.15.0"; + src = fetchurl { + url = "${mirror}/stable/frameworks/5.15/kconfig-5.15.0.tar.xz"; + sha256 = "083g4pr5sbqvpdn3ic3afbjzvczxl095rj0pi34g2b28anpwhjvn"; + name = "kconfig-5.15.0.tar.xz"; + }; + }; + kconfigwidgets = { + version = "5.15.0"; + src = fetchurl { + url = "${mirror}/stable/frameworks/5.15/kconfigwidgets-5.15.0.tar.xz"; + sha256 = "0gkq7ifgyf7865ypxf4cwqkndn4qrp07k8wxp8fl0xa15d74nrj3"; + name = "kconfigwidgets-5.15.0.tar.xz"; + }; + }; + kcoreaddons = { + version = "5.15.0"; + src = fetchurl { + url = "${mirror}/stable/frameworks/5.15/kcoreaddons-5.15.0.tar.xz"; + sha256 = "1v06bblxrxcwj9sbsz7xvqq6yg231m939pms8w0bbmyidsq4vpdm"; + name = "kcoreaddons-5.15.0.tar.xz"; + }; + }; + kcrash = { + version = "5.15.0"; + src = fetchurl { + url = "${mirror}/stable/frameworks/5.15/kcrash-5.15.0.tar.xz"; + sha256 = "1631wmg895bb4ls2mfxnlnffmzl1mjm82ad8fk361gv0s9g0xb3y"; + name = "kcrash-5.15.0.tar.xz"; + }; + }; + kdbusaddons = { + version = "5.15.0"; + src = fetchurl { + url = "${mirror}/stable/frameworks/5.15/kdbusaddons-5.15.0.tar.xz"; + sha256 = "1w32ra4ifhb2k2k2j3dfqrrc65w0rsmj9yr34k0flqiqs0mq1pfx"; + name = "kdbusaddons-5.15.0.tar.xz"; + }; + }; + kdeclarative = { + version = "5.15.0"; + src = fetchurl { + url = "${mirror}/stable/frameworks/5.15/kdeclarative-5.15.0.tar.xz"; + sha256 = "06xv552v52zp9qb5v6w3cps9nm3wpacpjvm8s08zmij1y7by0z32"; + name = "kdeclarative-5.15.0.tar.xz"; + }; + }; + kded = { + version = "5.15.0"; + src = fetchurl { + url = "${mirror}/stable/frameworks/5.15/kded-5.15.0.tar.xz"; + sha256 = "144lfjx6gmbhqqwdv4ll1ab4rj3pcyn8bp9yp4snzh6v2a2hncwq"; + name = "kded-5.15.0.tar.xz"; + }; + }; + kdelibs4support = { + version = "5.15.0"; + src = fetchurl { + url = "${mirror}/stable/frameworks/5.15/portingAids/kdelibs4support-5.15.0.tar.xz"; + sha256 = "1091nc3rrcq360sillynvmxwvmd209cnlql6g9x249zdxjpv62qy"; + name = "kdelibs4support-5.15.0.tar.xz"; + }; + }; + kdesignerplugin = { + version = "5.15.0"; + src = fetchurl { + url = "${mirror}/stable/frameworks/5.15/kdesignerplugin-5.15.0.tar.xz"; + sha256 = "0my6x0fx72dk65z6lajn1faxifc622msvll6jab0rk50x8ws9dwq"; + name = "kdesignerplugin-5.15.0.tar.xz"; + }; + }; + kdesu = { + version = "5.15.0"; + src = fetchurl { + url = "${mirror}/stable/frameworks/5.15/kdesu-5.15.0.tar.xz"; + sha256 = "0cnqd0gm5xyqsqngl0x6rs0f01bilcfv8xx1ry9hfnqffv9amr9y"; + name = "kdesu-5.15.0.tar.xz"; + }; + }; + kdewebkit = { + version = "5.15.0"; + src = fetchurl { + url = "${mirror}/stable/frameworks/5.15/kdewebkit-5.15.0.tar.xz"; + sha256 = "1cgwhb5nr6g6y3azp2ii0hdjlvwacdr94ldlsirqmzl7rymkgkqa"; + name = "kdewebkit-5.15.0.tar.xz"; + }; + }; + kdnssd = { + version = "5.15.0"; + src = fetchurl { + url = "${mirror}/stable/frameworks/5.15/kdnssd-5.15.0.tar.xz"; + sha256 = "1z5d26pmc9vmf30zz35kcl585fpjfrp8xf5r13lfwnnbfr6pnh0k"; + name = "kdnssd-5.15.0.tar.xz"; + }; + }; + kdoctools = { + version = "5.15.0"; + src = fetchurl { + url = "${mirror}/stable/frameworks/5.15/kdoctools-5.15.0.tar.xz"; + sha256 = "0vci37val64ixcz7zr99gzdqlb0ff04gdj2kad5dj32295iixhva"; + name = "kdoctools-5.15.0.tar.xz"; + }; + }; + kemoticons = { + version = "5.15.0"; + src = fetchurl { + url = "${mirror}/stable/frameworks/5.15/kemoticons-5.15.0.tar.xz"; + sha256 = "0a3izq6w3w37qd6b6w2g179w9nrh5pwh8hnc4iggyr2wwf2hfw9c"; + name = "kemoticons-5.15.0.tar.xz"; + }; + }; + kfilemetadata = { + version = "5.15.0"; + src = fetchurl { + url = "${mirror}/stable/frameworks/5.15/kfilemetadata-5.15.0.tar.xz"; + sha256 = "1y90azm27mnw2wfilwmg1gls21fpnd2nzvdl26vrhpsvnclf8rqn"; + name = "kfilemetadata-5.15.0.tar.xz"; + }; + }; + kglobalaccel = { + version = "5.15.0"; + src = fetchurl { + url = "${mirror}/stable/frameworks/5.15/kglobalaccel-5.15.0.tar.xz"; + sha256 = "1ii7bd1rf038zjimz7nd2snfi76drqdnyrkivwd6np4fdvcsyhjr"; + name = "kglobalaccel-5.15.0.tar.xz"; + }; + }; + kguiaddons = { + version = "5.15.0"; + src = fetchurl { + url = "${mirror}/stable/frameworks/5.15/kguiaddons-5.15.0.tar.xz"; + sha256 = "0pfcns136i0ghk32gyr7nnq7wnk2j8rmcr3jr18f1y9pkk3ih6q8"; + name = "kguiaddons-5.15.0.tar.xz"; + }; + }; + khtml = { + version = "5.15.0"; + src = fetchurl { + url = "${mirror}/stable/frameworks/5.15/portingAids/khtml-5.15.0.tar.xz"; + sha256 = "01gx1qd7hhvyhzndin8kw9yg3jlz8rz7i8kxbl6wpab9sc270a70"; + name = "khtml-5.15.0.tar.xz"; + }; + }; + ki18n = { + version = "5.15.0"; + src = fetchurl { + url = "${mirror}/stable/frameworks/5.15/ki18n-5.15.0.tar.xz"; + sha256 = "0qy7nv4ssjbyskjhnx8sr6vg9jwg183f6zd759rzp56pz5j79qdd"; + name = "ki18n-5.15.0.tar.xz"; + }; + }; + kiconthemes = { + version = "5.15.0"; + src = fetchurl { + url = "${mirror}/stable/frameworks/5.15/kiconthemes-5.15.0.tar.xz"; + sha256 = "0ab9iki3jl4izzjph9bps04w7grimyyaaxsna6j0dzg90izg1zg2"; + name = "kiconthemes-5.15.0.tar.xz"; + }; + }; + kidletime = { + version = "5.15.0"; + src = fetchurl { + url = "${mirror}/stable/frameworks/5.15/kidletime-5.15.0.tar.xz"; + sha256 = "0gp6grv6a9zb14yfrznwn5ih1946v500zlj5g9s8f1xw5p0792i2"; + name = "kidletime-5.15.0.tar.xz"; + }; + }; + kimageformats = { + version = "5.15.0"; + src = fetchurl { + url = "${mirror}/stable/frameworks/5.15/kimageformats-5.15.0.tar.xz"; + sha256 = "0q66w91khj4xax4nzak5r9wmr0qny5cq7dapv11zdzn7rf90bpvv"; + name = "kimageformats-5.15.0.tar.xz"; + }; + }; + kinit = { + version = "5.15.0"; + src = fetchurl { + url = "${mirror}/stable/frameworks/5.15/kinit-5.15.0.tar.xz"; + sha256 = "0ccf2rg6m74xj7mq4i0fsl09l2wkwyhmlfp3lvrn4714w19bj5yf"; + name = "kinit-5.15.0.tar.xz"; + }; + }; + kio = { + version = "5.15.0"; + src = fetchurl { + url = "${mirror}/stable/frameworks/5.15/kio-5.15.0.tar.xz"; + sha256 = "0ld56arcjms5kiz9zj3g7hgd6xq05zg2bx0qpr4aaihl3hgp6888"; + name = "kio-5.15.0.tar.xz"; + }; + }; + kitemmodels = { + version = "5.15.0"; + src = fetchurl { + url = "${mirror}/stable/frameworks/5.15/kitemmodels-5.15.0.tar.xz"; + sha256 = "112a8mdxabzv7lhpxfnnz2jrib972lz6ww7gd92lqziprz78fyga"; + name = "kitemmodels-5.15.0.tar.xz"; + }; + }; + kitemviews = { + version = "5.15.0"; + src = fetchurl { + url = "${mirror}/stable/frameworks/5.15/kitemviews-5.15.0.tar.xz"; + sha256 = "1112x7lf0wvwsizcr2ij0w463cssg0ahcav872g39gzirf67lqyi"; + name = "kitemviews-5.15.0.tar.xz"; + }; + }; + kjobwidgets = { + version = "5.15.0"; + src = fetchurl { + url = "${mirror}/stable/frameworks/5.15/kjobwidgets-5.15.0.tar.xz"; + sha256 = "12r3j1bwvmacj70dng4g5yrgjgj4v8nizk4yf22dfy858k8v8zda"; + name = "kjobwidgets-5.15.0.tar.xz"; + }; + }; + kjs = { + version = "5.15.0"; + src = fetchurl { + url = "${mirror}/stable/frameworks/5.15/portingAids/kjs-5.15.0.tar.xz"; + sha256 = "1aj9w8009q8bdq17ckjr1z219qy4wkjwc5xggl1879haqxn1pfg3"; + name = "kjs-5.15.0.tar.xz"; + }; + }; + kjsembed = { + version = "5.15.0"; + src = fetchurl { + url = "${mirror}/stable/frameworks/5.15/portingAids/kjsembed-5.15.0.tar.xz"; + sha256 = "099m6k6m6imy7jdia822i1g6c61gp955w21m4bb5nndwdy580mj4"; + name = "kjsembed-5.15.0.tar.xz"; + }; + }; + kmediaplayer = { + version = "5.15.0"; + src = fetchurl { + url = "${mirror}/stable/frameworks/5.15/portingAids/kmediaplayer-5.15.0.tar.xz"; + sha256 = "1rli98klmizwmmwwn6lcna7vxihd7b5yrvshisw6ivb21ygjgrxm"; + name = "kmediaplayer-5.15.0.tar.xz"; + }; + }; + knewstuff = { + version = "5.15.0"; + src = fetchurl { + url = "${mirror}/stable/frameworks/5.15/knewstuff-5.15.0.tar.xz"; + sha256 = "0s8ha0qqy007kq1k55mii5msbqxnczb57xici3in1idxjd83fjnw"; + name = "knewstuff-5.15.0.tar.xz"; + }; + }; + knotifications = { + version = "5.15.0"; + src = fetchurl { + url = "${mirror}/stable/frameworks/5.15/knotifications-5.15.0.tar.xz"; + sha256 = "1189xx9a5i932lfyniqnz43gl3hhjlg962j996zy0g9yasc2r3cm"; + name = "knotifications-5.15.0.tar.xz"; + }; + }; + knotifyconfig = { + version = "5.15.0"; + src = fetchurl { + url = "${mirror}/stable/frameworks/5.15/knotifyconfig-5.15.0.tar.xz"; + sha256 = "0b279z1qwfhj2mnpil0jd3xs8yn4i8mvib8dws6q4nygl941b8sa"; + name = "knotifyconfig-5.15.0.tar.xz"; + }; + }; + kpackage = { + version = "5.15.0"; + src = fetchurl { + url = "${mirror}/stable/frameworks/5.15/kpackage-5.15.0.tar.xz"; + sha256 = "03zcnqly2pb67pza9xm9n0asjixqicxwj5vnv25yvki02cgwmvn3"; + name = "kpackage-5.15.0.tar.xz"; + }; + }; + kparts = { + version = "5.15.0"; + src = fetchurl { + url = "${mirror}/stable/frameworks/5.15/kparts-5.15.0.tar.xz"; + sha256 = "0pjfmb97387kvvn7c4xzmxdja2jghx946ima5g8jnfw0zacsd2mw"; + name = "kparts-5.15.0.tar.xz"; + }; + }; + kpeople = { + version = "5.15.0"; + src = fetchurl { + url = "${mirror}/stable/frameworks/5.15/kpeople-5.15.0.tar.xz"; + sha256 = "11frmba6rqn2bmqp28wrwrqw8lpkdg27v5fa5lg47vrdp4ih0rgs"; + name = "kpeople-5.15.0.tar.xz"; + }; + }; + kplotting = { + version = "5.15.0"; + src = fetchurl { + url = "${mirror}/stable/frameworks/5.15/kplotting-5.15.0.tar.xz"; + sha256 = "0wwqlza0qfd25p9d5gfrs0ymwzg5b0lnb4b8slfw2znazvi03krj"; + name = "kplotting-5.15.0.tar.xz"; + }; + }; + kpty = { + version = "5.15.0"; + src = fetchurl { + url = "${mirror}/stable/frameworks/5.15/kpty-5.15.0.tar.xz"; + sha256 = "03yl4kwhwma0nwbgww95z4853waxrq4xipy41k7224n3gvd62c30"; + name = "kpty-5.15.0.tar.xz"; + }; + }; + kross = { + version = "5.15.0"; + src = fetchurl { + url = "${mirror}/stable/frameworks/5.15/portingAids/kross-5.15.0.tar.xz"; + sha256 = "1mlvs0ra3ngrmrmqb4qjg3nkw5hqscdd1p3cdh94mpcwk330svq0"; + name = "kross-5.15.0.tar.xz"; + }; + }; + krunner = { + version = "5.15.0"; + src = fetchurl { + url = "${mirror}/stable/frameworks/5.15/portingAids/krunner-5.15.0.tar.xz"; + sha256 = "0kyb135a45b9si4xh7pml7aiigs3j5077dgjfrghhz0ci3ibmn0v"; + name = "krunner-5.15.0.tar.xz"; + }; + }; + kservice = { + version = "5.15.0"; + src = fetchurl { + url = "${mirror}/stable/frameworks/5.15/kservice-5.15.0.tar.xz"; + sha256 = "13yfg99s7k7y2npj8jn12iikan95dsf8hdmqfjb59n5qg4a6h253"; + name = "kservice-5.15.0.tar.xz"; + }; + }; + ktexteditor = { + version = "5.15.0"; + src = fetchurl { + url = "${mirror}/stable/frameworks/5.15/ktexteditor-5.15.0.tar.xz"; + sha256 = "161kkssai0lwssy6l4mxgclx7229bgfkfgsf973i94p6hanaymb8"; + name = "ktexteditor-5.15.0.tar.xz"; + }; + }; + ktextwidgets = { + version = "5.15.0"; + src = fetchurl { + url = "${mirror}/stable/frameworks/5.15/ktextwidgets-5.15.0.tar.xz"; + sha256 = "1r9drjjlag5v7y8inswbrj2fmkzkranrnzyrwl4bl7v0l1dir2l8"; + name = "ktextwidgets-5.15.0.tar.xz"; + }; + }; + kunitconversion = { + version = "5.15.0"; + src = fetchurl { + url = "${mirror}/stable/frameworks/5.15/kunitconversion-5.15.0.tar.xz"; + sha256 = "1qbps67w3ii2797q967wvy56zclsm9l6vcrwnylx9rfqygcs5ixf"; + name = "kunitconversion-5.15.0.tar.xz"; + }; + }; + kwallet = { + version = "5.15.0"; + src = fetchurl { + url = "${mirror}/stable/frameworks/5.15/kwallet-5.15.0.tar.xz"; + sha256 = "1b97v4vad7lzrjmf04zikm4q9czyzbzkk3vdhcd2mi47vizrj392"; + name = "kwallet-5.15.0.tar.xz"; + }; + }; + kwidgetsaddons = { + version = "5.15.0"; + src = fetchurl { + url = "${mirror}/stable/frameworks/5.15/kwidgetsaddons-5.15.0.tar.xz"; + sha256 = "1nbgsf5dfz0f12azw19ir7791y6ykkkj7y96ln0k81d3cbcgxq63"; + name = "kwidgetsaddons-5.15.0.tar.xz"; + }; + }; + kwindowsystem = { + version = "5.15.0"; + src = fetchurl { + url = "${mirror}/stable/frameworks/5.15/kwindowsystem-5.15.0.tar.xz"; + sha256 = "1x8pagby6j7k2ns3davbmyysggril0kp9ccn3326qm89l70zrf8x"; + name = "kwindowsystem-5.15.0.tar.xz"; + }; + }; + kxmlgui = { + version = "5.15.0"; + src = fetchurl { + url = "${mirror}/stable/frameworks/5.15/kxmlgui-5.15.0.tar.xz"; + sha256 = "1d5mm2fkzk92q9gfh76a83mbzqw2pcagkg6s51i5ax3zqb7jnzdm"; + name = "kxmlgui-5.15.0.tar.xz"; + }; + }; + kxmlrpcclient = { + version = "5.15.0"; + src = fetchurl { + url = "${mirror}/stable/frameworks/5.15/kxmlrpcclient-5.15.0.tar.xz"; + sha256 = "03ckqn33djzyg0ik9g1jk4dj33incsxwvvdc7g5k8wjgjcdkp433"; + name = "kxmlrpcclient-5.15.0.tar.xz"; + }; + }; + modemmanager-qt = { + version = "5.15.0"; + src = fetchurl { + url = "${mirror}/stable/frameworks/5.15/modemmanager-qt-5.15.0.tar.xz"; + sha256 = "1sxi32jxsz3d51nkcx7wxjyjvr2fg3qay3s3nzrpdzm0pa79drr9"; + name = "modemmanager-qt-5.15.0.tar.xz"; + }; + }; + networkmanager-qt = { + version = "5.15.0"; + src = fetchurl { + url = "${mirror}/stable/frameworks/5.15/networkmanager-qt-5.15.0.tar.xz"; + sha256 = "0l0396c9fgwxdv1h33p7y8w0ylvm4pa3a53yv7jckkc49nygk38p"; + name = "networkmanager-qt-5.15.0.tar.xz"; + }; + }; + plasma-framework = { + version = "5.15.0"; + src = fetchurl { + url = "${mirror}/stable/frameworks/5.15/plasma-framework-5.15.0.tar.xz"; + sha256 = "0v36i64jb3n6lq964417lzbdm6m57nvg83kjli4wqlc17dywjp8s"; + name = "plasma-framework-5.15.0.tar.xz"; + }; + }; + solid = { + version = "5.15.0"; + src = fetchurl { + url = "${mirror}/stable/frameworks/5.15/solid-5.15.0.tar.xz"; + sha256 = "0118bynfqcgvg333ljbb80k7bkam6skc7vygwvy7fr7y4dzmlwfa"; + name = "solid-5.15.0.tar.xz"; + }; + }; + sonnet = { + version = "5.15.0"; + src = fetchurl { + url = "${mirror}/stable/frameworks/5.15/sonnet-5.15.0.tar.xz"; + sha256 = "18qs5szdyvjzwlbid62g3qs7cs4fdb46n25aw49saq7drf567gm0"; + name = "sonnet-5.15.0.tar.xz"; + }; + }; + threadweaver = { + version = "5.15.0"; + src = fetchurl { + url = "${mirror}/stable/frameworks/5.15/threadweaver-5.15.0.tar.xz"; + sha256 = "19ha9r6wjm93w4kh5rjaal0r91vxhsr9q82dw5b9j927zrqwb7pq"; + name = "threadweaver-5.15.0.tar.xz"; + }; + }; +} diff --git a/pkgs/development/libraries/kde-frameworks-5.14/threadweaver.nix b/pkgs/development/libraries/kde-frameworks-5.15/threadweaver.nix similarity index 100% rename from pkgs/development/libraries/kde-frameworks-5.14/threadweaver.nix rename to pkgs/development/libraries/kde-frameworks-5.15/threadweaver.nix diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 6013458161a3..fbf086fb9c4c 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -6751,9 +6751,9 @@ let }; kf510 = recurseIntoAttrs (callPackage ../development/libraries/kde-frameworks-5.10 { }); - kf514 = recurseIntoAttrs (import ../development/libraries/kde-frameworks-5.14 { inherit pkgs; }); + kf515 = recurseIntoAttrs (import ../development/libraries/kde-frameworks-5.15 { inherit pkgs; }); kf5_stable = kf510; - kf5_latest = kf514; + kf5_latest = kf515; kf5PackagesFun = self: with self; { @@ -6793,8 +6793,8 @@ let }; - kf514Packages = lib.makeScope kf514.newScope kf5PackagesFun; - kf5Packages = kf514Packages; + kf515Packages = lib.makeScope kf515.newScope kf5PackagesFun; + kf5Packages = kf515Packages; kinetic-cpp-client = callPackage ../development/libraries/kinetic-cpp-client { }; From e904e1029d931fa5f48c271363a3cf4b83be26a1 Mon Sep 17 00:00:00 2001 From: Thomas Tuegel Date: Tue, 13 Oct 2015 18:27:21 -0500 Subject: [PATCH 043/162] kde-apps: 15.08.1 -> 15.08.2 --- pkgs/applications/kde-apps-15.08/fetchsrcs.sh | 2 +- pkgs/applications/kde-apps-15.08/srcs.nix | 1976 ++++++++--------- 2 files changed, 989 insertions(+), 989 deletions(-) diff --git a/pkgs/applications/kde-apps-15.08/fetchsrcs.sh b/pkgs/applications/kde-apps-15.08/fetchsrcs.sh index aa7adc49123a..e739cc9b1e47 100755 --- a/pkgs/applications/kde-apps-15.08/fetchsrcs.sh +++ b/pkgs/applications/kde-apps-15.08/fetchsrcs.sh @@ -4,7 +4,7 @@ set -x # The trailing slash at the end is necessary! -RELEASE_URL="http://download.kde.org/stable/applications/15.08.1/" +RELEASE_URL="http://download.kde.org/stable/applications/15.08.2/" EXTRA_WGET_ARGS='-A *.tar.xz' mkdir tmp; cd tmp diff --git a/pkgs/applications/kde-apps-15.08/srcs.nix b/pkgs/applications/kde-apps-15.08/srcs.nix index 3c89c39b5edb..d23a21f4add4 100644 --- a/pkgs/applications/kde-apps-15.08/srcs.nix +++ b/pkgs/applications/kde-apps-15.08/srcs.nix @@ -3,1979 +3,1979 @@ { akonadi = { - version = "15.08.1"; + version = "15.08.2"; src = fetchurl { - url = "${mirror}/stable/applications/15.08.1/src/akonadi-15.08.1.tar.xz"; - sha256 = "19222mzvi34lqdaxavcpx0d1mxfnfynvhv5562rw3d7iqmhvbms6"; - name = "akonadi-15.08.1.tar.xz"; + url = "${mirror}/stable/applications/15.08.2/src/akonadi-15.08.2.tar.xz"; + sha256 = "1fqv767396ymm57yaqzhvxxcv2rr07m14h41vh7y3xq8n880wx90"; + name = "akonadi-15.08.2.tar.xz"; }; }; akonadi-calendar = { - version = "15.08.1"; + version = "15.08.2"; src = fetchurl { - url = "${mirror}/stable/applications/15.08.1/src/akonadi-calendar-15.08.1.tar.xz"; - sha256 = "00iyv123s18157v46y3xdg56lyfr0w6f0zz8qsp6js7vn0fa468j"; - name = "akonadi-calendar-15.08.1.tar.xz"; + url = "${mirror}/stable/applications/15.08.2/src/akonadi-calendar-15.08.2.tar.xz"; + sha256 = "0gl2i7qd16ibfg4m8vcvn6lkja1jn5ba7d0mpxmv3rx41i7ppcfi"; + name = "akonadi-calendar-15.08.2.tar.xz"; }; }; akonadi-search = { - version = "15.08.1"; + version = "15.08.2"; src = fetchurl { - url = "${mirror}/stable/applications/15.08.1/src/akonadi-search-15.08.1.tar.xz"; - sha256 = "0mzhil4ihs2b7k6dg29d5igpwsiwiv6awzvj6b5xn76i4xax1jk1"; - name = "akonadi-search-15.08.1.tar.xz"; + url = "${mirror}/stable/applications/15.08.2/src/akonadi-search-15.08.2.tar.xz"; + sha256 = "1a0lzbiz2f2i35q6safmqkgi2pplmf9x20p8xvd6crfwgd1af2f8"; + name = "akonadi-search-15.08.2.tar.xz"; }; }; amor = { - version = "15.08.1"; + version = "15.08.2"; src = fetchurl { - url = "${mirror}/stable/applications/15.08.1/src/amor-15.08.1.tar.xz"; - sha256 = "125s9hsj4s3h21khgri9p52abkaa78a9yz7fnw5ij4i0ivhbks6a"; - name = "amor-15.08.1.tar.xz"; + url = "${mirror}/stable/applications/15.08.2/src/amor-15.08.2.tar.xz"; + sha256 = "0ddv5b9an4hlgwbacga7xds1kdlbf9n9l7abxvz3nl2vhxnpfic6"; + name = "amor-15.08.2.tar.xz"; }; }; analitza = { - version = "15.08.1"; + version = "15.08.2"; src = fetchurl { - url = "${mirror}/stable/applications/15.08.1/src/analitza-15.08.1.tar.xz"; - sha256 = "0zxkpsccnp0m8r7z1p243h5vh4fz4dzq2dz932vfac8hs45lcaki"; - name = "analitza-15.08.1.tar.xz"; + url = "${mirror}/stable/applications/15.08.2/src/analitza-15.08.2.tar.xz"; + sha256 = "11rcqaxynqrngzqb079901m0kkx90ixlabijf1yqwjwjwjm5dv70"; + name = "analitza-15.08.2.tar.xz"; }; }; ark = { - version = "15.08.1"; + version = "15.08.2"; src = fetchurl { - url = "${mirror}/stable/applications/15.08.1/src/ark-15.08.1.tar.xz"; - sha256 = "0lmqi9qdf46v9yap6f7s5favx4y66w3sixhplby4q1cm085yg5hl"; - name = "ark-15.08.1.tar.xz"; + url = "${mirror}/stable/applications/15.08.2/src/ark-15.08.2.tar.xz"; + sha256 = "0569m5yldp5mgwixjg4l7vxgkm4q3n4skyf1ixb59zg40xxvmalv"; + name = "ark-15.08.2.tar.xz"; }; }; artikulate = { - version = "15.08.1"; + version = "15.08.2"; src = fetchurl { - url = "${mirror}/stable/applications/15.08.1/src/artikulate-15.08.1.tar.xz"; - sha256 = "0pz66hrnd89519ivk1cw8gzddjv6043x59nbkhmnlk8f5hvvkk2k"; - name = "artikulate-15.08.1.tar.xz"; + url = "${mirror}/stable/applications/15.08.2/src/artikulate-15.08.2.tar.xz"; + sha256 = "1bqzqbj6qfacdqm4g7agv3zxdjd213yvbvk1p32726qif5fxd0qv"; + name = "artikulate-15.08.2.tar.xz"; }; }; audiocd-kio = { - version = "15.08.1"; + version = "15.08.2"; src = fetchurl { - url = "${mirror}/stable/applications/15.08.1/src/audiocd-kio-15.08.1.tar.xz"; - sha256 = "0sqh21x12za743xqmyfyd8h4z0wz0nzd2zjp6fzga76xfcryci5j"; - name = "audiocd-kio-15.08.1.tar.xz"; + url = "${mirror}/stable/applications/15.08.2/src/audiocd-kio-15.08.2.tar.xz"; + sha256 = "1w8227sircqz61k6xgy9ccr387zra4plq2zx97l68ia4ynnwyrwh"; + name = "audiocd-kio-15.08.2.tar.xz"; }; }; baloo-widgets = { - version = "15.08.1"; + version = "15.08.2"; src = fetchurl { - url = "${mirror}/stable/applications/15.08.1/src/baloo-widgets-15.08.1.tar.xz"; - sha256 = "021lgivqmahad2b5mwdg4vngyyfi6gcsk3xgn9rbzkxg67k2ivbc"; - name = "baloo-widgets-15.08.1.tar.xz"; + url = "${mirror}/stable/applications/15.08.2/src/baloo-widgets-15.08.2.tar.xz"; + sha256 = "1r9np98cf9mvmih0ixxzq8sv6c41lrw0mxca49k9g0gxcxgfk4zj"; + name = "baloo-widgets-15.08.2.tar.xz"; }; }; blinken = { - version = "15.08.1"; + version = "15.08.2"; src = fetchurl { - url = "${mirror}/stable/applications/15.08.1/src/blinken-15.08.1.tar.xz"; - sha256 = "0yh5ay2cpgb45y4any6sanzpwcngfxl98x3gnc5n81zl2kzb9y8m"; - name = "blinken-15.08.1.tar.xz"; + url = "${mirror}/stable/applications/15.08.2/src/blinken-15.08.2.tar.xz"; + sha256 = "0b80kdkh1373z1qrcf18yp92w256jv2mlzchvv5smhhcwpl1ddrk"; + name = "blinken-15.08.2.tar.xz"; }; }; bomber = { - version = "15.08.1"; + version = "15.08.2"; src = fetchurl { - url = "${mirror}/stable/applications/15.08.1/src/bomber-15.08.1.tar.xz"; - sha256 = "08l8ksqzap8hyza7mmf1wwddj8xkl03hsrc0mwvxsvyp7h7v3rxq"; - name = "bomber-15.08.1.tar.xz"; + url = "${mirror}/stable/applications/15.08.2/src/bomber-15.08.2.tar.xz"; + sha256 = "1x005q258v8p7d31prh2jy32qrxnw2yy14cn0dffbcnkk1vz1v9q"; + name = "bomber-15.08.2.tar.xz"; }; }; bovo = { - version = "15.08.1"; + version = "15.08.2"; src = fetchurl { - url = "${mirror}/stable/applications/15.08.1/src/bovo-15.08.1.tar.xz"; - sha256 = "1lj2hwjdwkn70gfgyk3v0r8wdrdlpqkx9n17fd15x0jm8xjxc7wj"; - name = "bovo-15.08.1.tar.xz"; + url = "${mirror}/stable/applications/15.08.2/src/bovo-15.08.2.tar.xz"; + sha256 = "06cmfdha4cwc0kiy5spn7kq58mykwal9n21ak4pp2rqcv93zp5hk"; + name = "bovo-15.08.2.tar.xz"; }; }; cantor = { - version = "15.08.1"; + version = "15.08.2"; src = fetchurl { - url = "${mirror}/stable/applications/15.08.1/src/cantor-15.08.1.tar.xz"; - sha256 = "0qcx077khzzjs8gaz2m1dph1r4ql3gpfsq536626fd94cb5is83x"; - name = "cantor-15.08.1.tar.xz"; + url = "${mirror}/stable/applications/15.08.2/src/cantor-15.08.2.tar.xz"; + sha256 = "08faiysviy0c1pr50001wpgz0xkkjjim9cl5ix81kvsqnnv2d1v5"; + name = "cantor-15.08.2.tar.xz"; }; }; cervisia = { - version = "15.08.1"; + version = "15.08.2"; src = fetchurl { - url = "${mirror}/stable/applications/15.08.1/src/cervisia-15.08.1.tar.xz"; - sha256 = "0cha7j0769ib8hc2jjgdxm1pv81cqwii721ww94dd4d614isv4pk"; - name = "cervisia-15.08.1.tar.xz"; + url = "${mirror}/stable/applications/15.08.2/src/cervisia-15.08.2.tar.xz"; + sha256 = "0fgc6fvipbmaiza5vd0h7mihiwg2vyh3lb4k1ngxkl2p1vryyg25"; + name = "cervisia-15.08.2.tar.xz"; }; }; dolphin = { - version = "15.08.1"; + version = "15.08.2"; src = fetchurl { - url = "${mirror}/stable/applications/15.08.1/src/dolphin-15.08.1.tar.xz"; - sha256 = "09mr54zbyyq4kd3ddi054c86ji63b0k5fjd3y8x44vnd3id8jpjs"; - name = "dolphin-15.08.1.tar.xz"; + url = "${mirror}/stable/applications/15.08.2/src/dolphin-15.08.2.tar.xz"; + sha256 = "1zd127k56zx80jqkr5j1rafnfccahj1wvggaia0l281d1jw6572d"; + name = "dolphin-15.08.2.tar.xz"; }; }; dolphin-plugins = { - version = "15.08.1"; + version = "15.08.2"; src = fetchurl { - url = "${mirror}/stable/applications/15.08.1/src/dolphin-plugins-15.08.1.tar.xz"; - sha256 = "1fpsbxcds2wzivcpc6vf6bqwi658mw4jrlpwd52w2nlsjpmgr31x"; - name = "dolphin-plugins-15.08.1.tar.xz"; + url = "${mirror}/stable/applications/15.08.2/src/dolphin-plugins-15.08.2.tar.xz"; + sha256 = "16n9xnfj7kmhmj0xpggr64bvgqvz0ggprj9raxdyx0ijg7alsiy2"; + name = "dolphin-plugins-15.08.2.tar.xz"; }; }; dragon = { - version = "15.08.1"; + version = "15.08.2"; src = fetchurl { - url = "${mirror}/stable/applications/15.08.1/src/dragon-15.08.1.tar.xz"; - sha256 = "0ffb0jspckwp8alis70akhrv7kkjq69zba34y61axm67f65izh9l"; - name = "dragon-15.08.1.tar.xz"; + url = "${mirror}/stable/applications/15.08.2/src/dragon-15.08.2.tar.xz"; + sha256 = "071pq9rysqm1n2cgkb1mrnpl4w6mpq5vrkbprh192qgjwl5yzbzf"; + name = "dragon-15.08.2.tar.xz"; }; }; ffmpegthumbs = { - version = "15.08.1"; + version = "15.08.2"; src = fetchurl { - url = "${mirror}/stable/applications/15.08.1/src/ffmpegthumbs-15.08.1.tar.xz"; - sha256 = "00bk11zq5hkdkwxj7d4fydslh2gybhzxz2gyldjfdd8agjcl1rfm"; - name = "ffmpegthumbs-15.08.1.tar.xz"; + url = "${mirror}/stable/applications/15.08.2/src/ffmpegthumbs-15.08.2.tar.xz"; + sha256 = "1cszm4fszg8574xap2f8kp0ibarx65y7nc6grpba55y2yylq83ma"; + name = "ffmpegthumbs-15.08.2.tar.xz"; }; }; filelight = { - version = "15.08.1"; + version = "15.08.2"; src = fetchurl { - url = "${mirror}/stable/applications/15.08.1/src/filelight-15.08.1.tar.xz"; - sha256 = "085n071j5mpzh2yr4035bdxgfay782g4zx386lr2s03ywc5icsw2"; - name = "filelight-15.08.1.tar.xz"; + url = "${mirror}/stable/applications/15.08.2/src/filelight-15.08.2.tar.xz"; + sha256 = "10chmx0kl0vhxwc84yghk3wb8sb8n623fwn0yayk4im3cnr50lan"; + name = "filelight-15.08.2.tar.xz"; }; }; gpgmepp = { - version = "15.08.1"; + version = "15.08.2"; src = fetchurl { - url = "${mirror}/stable/applications/15.08.1/src/gpgmepp-15.08.1.tar.xz"; - sha256 = "1nr4k3k34cmmvn4mznnr4kgvbi4raan96phbiqzgh6mzkq2rc8yr"; - name = "gpgmepp-15.08.1.tar.xz"; + url = "${mirror}/stable/applications/15.08.2/src/gpgmepp-15.08.2.tar.xz"; + sha256 = "1d93vlkqzjyj2xmiq9l46qd6lbyhkl08y7gl1sq63n2dd1ix5209"; + name = "gpgmepp-15.08.2.tar.xz"; }; }; granatier = { - version = "15.08.1"; + version = "15.08.2"; src = fetchurl { - url = "${mirror}/stable/applications/15.08.1/src/granatier-15.08.1.tar.xz"; - sha256 = "1ngdjgf3imdbv1hmp88fhnpvpspjgl2zpaig3d96fjlhxh0bgng1"; - name = "granatier-15.08.1.tar.xz"; + url = "${mirror}/stable/applications/15.08.2/src/granatier-15.08.2.tar.xz"; + sha256 = "12ckzd8yhxxz3jknz4xzhgw7ml40pqax3bkibqhw3clhwgbr5874"; + name = "granatier-15.08.2.tar.xz"; }; }; gwenview = { - version = "15.08.1"; + version = "15.08.2"; src = fetchurl { - url = "${mirror}/stable/applications/15.08.1/src/gwenview-15.08.1.tar.xz"; - sha256 = "0lks7chyd8bylz1m3nv3bfch5jcffkv52aawxv9r5www9wd7jq69"; - name = "gwenview-15.08.1.tar.xz"; + url = "${mirror}/stable/applications/15.08.2/src/gwenview-15.08.2.tar.xz"; + sha256 = "0han5gz4rlv33wd6r3hjirjgigr6xlwwqfcpr98v906d09ra4mf3"; + name = "gwenview-15.08.2.tar.xz"; }; }; jovie = { - version = "15.08.1"; + version = "15.08.2"; src = fetchurl { - url = "${mirror}/stable/applications/15.08.1/src/jovie-15.08.1.tar.xz"; - sha256 = "021j7rxbbv5p2jjp4d7m7vsdy5117myng2min42bn6vfz4g6s5rx"; - name = "jovie-15.08.1.tar.xz"; + url = "${mirror}/stable/applications/15.08.2/src/jovie-15.08.2.tar.xz"; + sha256 = "0mza97q8d34g9lr9z6d6hbwp5p3rd1v1hnlcgqcql9p6jiwkapm8"; + name = "jovie-15.08.2.tar.xz"; }; }; juk = { - version = "15.08.1"; + version = "15.08.2"; src = fetchurl { - url = "${mirror}/stable/applications/15.08.1/src/juk-15.08.1.tar.xz"; - sha256 = "0l6zq90jvhkhppjq0djmj1ij1c1yjjvhh5ss4czqn39bay33r2a7"; - name = "juk-15.08.1.tar.xz"; + url = "${mirror}/stable/applications/15.08.2/src/juk-15.08.2.tar.xz"; + sha256 = "100wpi39jp243551ihfi062lpvskwczwbazjwpak6x7bgdy1dzac"; + name = "juk-15.08.2.tar.xz"; }; }; kaccessible = { - version = "15.08.1"; + version = "15.08.2"; src = fetchurl { - url = "${mirror}/stable/applications/15.08.1/src/kaccessible-15.08.1.tar.xz"; - sha256 = "10crgqpiqkbrb0hil1660cy4dcywiljicqhnhr3nns0ncllvw2vi"; - name = "kaccessible-15.08.1.tar.xz"; + url = "${mirror}/stable/applications/15.08.2/src/kaccessible-15.08.2.tar.xz"; + sha256 = "0b3mk7xc1kmp9jczl669zrq1qr5bkmyylxaw5h46i49r0pkjy9m8"; + name = "kaccessible-15.08.2.tar.xz"; }; }; kaccounts-integration = { - version = "15.08.1"; + version = "15.08.2"; src = fetchurl { - url = "${mirror}/stable/applications/15.08.1/src/kaccounts-integration-15.08.1.tar.xz"; - sha256 = "07kryp71xq2zwfdm05g8mcmkmxhlj2wb2l9fi2sxbhsr360z33mx"; - name = "kaccounts-integration-15.08.1.tar.xz"; + url = "${mirror}/stable/applications/15.08.2/src/kaccounts-integration-15.08.2.tar.xz"; + sha256 = "1i09w5xsnv6gny036d45nyh478550yh8h2ykz1gf9j8wddampnvm"; + name = "kaccounts-integration-15.08.2.tar.xz"; }; }; kaccounts-providers = { - version = "15.08.1"; + version = "15.08.2"; src = fetchurl { - url = "${mirror}/stable/applications/15.08.1/src/kaccounts-providers-15.08.1.tar.xz"; - sha256 = "15sl3rwwpshqvzjrkfiray3gg3ja84awsyk3y5n9jbf97rw47v3k"; - name = "kaccounts-providers-15.08.1.tar.xz"; + url = "${mirror}/stable/applications/15.08.2/src/kaccounts-providers-15.08.2.tar.xz"; + sha256 = "1h7a4mvp6419rfvjkx0kpsv7iqvv0l4wq1w51jzf3xxa52hims25"; + name = "kaccounts-providers-15.08.2.tar.xz"; }; }; kajongg = { - version = "15.08.1"; + version = "15.08.2"; src = fetchurl { - url = "${mirror}/stable/applications/15.08.1/src/kajongg-15.08.1.tar.xz"; - sha256 = "1ialza77fc0a6541yg71b8qbjvq78sww7l0g3s1rn30pj1j1r3rx"; - name = "kajongg-15.08.1.tar.xz"; + url = "${mirror}/stable/applications/15.08.2/src/kajongg-15.08.2.tar.xz"; + sha256 = "0p311pqp84lr0k9iy38a942f53yp60yxpxi616v689d8m9v5f88w"; + name = "kajongg-15.08.2.tar.xz"; }; }; kalarmcal = { - version = "15.08.1"; + version = "15.08.2"; src = fetchurl { - url = "${mirror}/stable/applications/15.08.1/src/kalarmcal-15.08.1.tar.xz"; - sha256 = "02m2fd98jdacr7hm71dl6hsshil152c09p1daaa9b58yrgb9dqd9"; - name = "kalarmcal-15.08.1.tar.xz"; + url = "${mirror}/stable/applications/15.08.2/src/kalarmcal-15.08.2.tar.xz"; + sha256 = "1qiws5l2wl31mf51zhmxlf4h7gljwcbxbii53v8j8cmafi6v2jsy"; + name = "kalarmcal-15.08.2.tar.xz"; }; }; kalgebra = { - version = "15.08.1"; + version = "15.08.2"; src = fetchurl { - url = "${mirror}/stable/applications/15.08.1/src/kalgebra-15.08.1.tar.xz"; - sha256 = "1an9lc9h1178d94pq2a60pnw9wadxdni3drbx40w1l1kfaa38ghy"; - name = "kalgebra-15.08.1.tar.xz"; + url = "${mirror}/stable/applications/15.08.2/src/kalgebra-15.08.2.tar.xz"; + sha256 = "1sna3bb6vp069k1d4a3z27bqz1j5akabwl34q8q3rfw8p2j57bjy"; + name = "kalgebra-15.08.2.tar.xz"; }; }; kalzium = { - version = "15.08.1"; + version = "15.08.2"; src = fetchurl { - url = "${mirror}/stable/applications/15.08.1/src/kalzium-15.08.1.tar.xz"; - sha256 = "0jhfv5cw5vhgy13ld5km664r7ydqv52nwd4k450x2d62rvq63nfp"; - name = "kalzium-15.08.1.tar.xz"; + url = "${mirror}/stable/applications/15.08.2/src/kalzium-15.08.2.tar.xz"; + sha256 = "1a1vfz6bg7qcc9k7lgkr9768n2lrwava9hb7md8qlyn2gmigp43v"; + name = "kalzium-15.08.2.tar.xz"; }; }; kamera = { - version = "15.08.1"; + version = "15.08.2"; src = fetchurl { - url = "${mirror}/stable/applications/15.08.1/src/kamera-15.08.1.tar.xz"; - sha256 = "0czpr3wb3irlbczrx0dczph6l9dwhz3wv9amrz2lvb8p9c8j4nmd"; - name = "kamera-15.08.1.tar.xz"; + url = "${mirror}/stable/applications/15.08.2/src/kamera-15.08.2.tar.xz"; + sha256 = "04c1r0aadnrjiadd57qg2xz42xy08wi14nbnpqpx3npcdlg7fvw4"; + name = "kamera-15.08.2.tar.xz"; }; }; kanagram = { - version = "15.08.1"; + version = "15.08.2"; src = fetchurl { - url = "${mirror}/stable/applications/15.08.1/src/kanagram-15.08.1.tar.xz"; - sha256 = "0bchwvr87wj9p82v1vgdmfw0a8d1gax08ccq24lzigrny6ljlizr"; - name = "kanagram-15.08.1.tar.xz"; + url = "${mirror}/stable/applications/15.08.2/src/kanagram-15.08.2.tar.xz"; + sha256 = "0blrill882l4spl4abgvs6b4jbqcjk9dq0lz7x4li34d9yik6n34"; + name = "kanagram-15.08.2.tar.xz"; }; }; kapman = { - version = "15.08.1"; + version = "15.08.2"; src = fetchurl { - url = "${mirror}/stable/applications/15.08.1/src/kapman-15.08.1.tar.xz"; - sha256 = "070zckasm7bm1g01rvp55gbilyzxqs5gsrp56zp3lyids0ycjfgz"; - name = "kapman-15.08.1.tar.xz"; + url = "${mirror}/stable/applications/15.08.2/src/kapman-15.08.2.tar.xz"; + sha256 = "19a36hicxndhra5vczv4p38dv30nyjr6c6v8kp64hm57wdw2r8y1"; + name = "kapman-15.08.2.tar.xz"; }; }; kapptemplate = { - version = "15.08.1"; + version = "15.08.2"; src = fetchurl { - url = "${mirror}/stable/applications/15.08.1/src/kapptemplate-15.08.1.tar.xz"; - sha256 = "1pc3dq3h30lx7d51zan52mnz5zwb70g6r84cskkgc2dmws7mrl0k"; - name = "kapptemplate-15.08.1.tar.xz"; + url = "${mirror}/stable/applications/15.08.2/src/kapptemplate-15.08.2.tar.xz"; + sha256 = "1rl87ikk7qbscfzfk613ky5nz3sjv519laj1xkz4nww14m3j9d98"; + name = "kapptemplate-15.08.2.tar.xz"; }; }; kate = { - version = "15.08.1"; + version = "15.08.2"; src = fetchurl { - url = "${mirror}/stable/applications/15.08.1/src/kate-15.08.1.tar.xz"; - sha256 = "0hrbr4lnmz0hgs856kfb966k85p8ccdzva8h4f6ifvacgxppb5iz"; - name = "kate-15.08.1.tar.xz"; + url = "${mirror}/stable/applications/15.08.2/src/kate-15.08.2.tar.xz"; + sha256 = "03s3j5f1clgiq2hl97s751pd6rixwbnx9sdwm9whg5k76rqfw168"; + name = "kate-15.08.2.tar.xz"; }; }; katomic = { - version = "15.08.1"; + version = "15.08.2"; src = fetchurl { - url = "${mirror}/stable/applications/15.08.1/src/katomic-15.08.1.tar.xz"; - sha256 = "0rj6sgh8v8x57fqbjvhik9xcw563nx0dvv8rin05nr22hlid8l9y"; - name = "katomic-15.08.1.tar.xz"; + url = "${mirror}/stable/applications/15.08.2/src/katomic-15.08.2.tar.xz"; + sha256 = "0p6f28bs61pnabgyc6nnpqfcbr38akcv0gzbd2f2d196vnfrjk98"; + name = "katomic-15.08.2.tar.xz"; }; }; kblackbox = { - version = "15.08.1"; + version = "15.08.2"; src = fetchurl { - url = "${mirror}/stable/applications/15.08.1/src/kblackbox-15.08.1.tar.xz"; - sha256 = "1hnxsjdp9gbjc0049jx7bnzx0cykyc7qf6f2z3mrir8knin0fmi5"; - name = "kblackbox-15.08.1.tar.xz"; + url = "${mirror}/stable/applications/15.08.2/src/kblackbox-15.08.2.tar.xz"; + sha256 = "05kx9k5bikqb81z4x2rp6lxm3iklw5b7zlsk8w4g166pp7fxmjwd"; + name = "kblackbox-15.08.2.tar.xz"; }; }; kblocks = { - version = "15.08.1"; + version = "15.08.2"; src = fetchurl { - url = "${mirror}/stable/applications/15.08.1/src/kblocks-15.08.1.tar.xz"; - sha256 = "1vvlxna5dmnf7igr53p3m5z224zj1ni92qifjnnblwr55gqqwsva"; - name = "kblocks-15.08.1.tar.xz"; + url = "${mirror}/stable/applications/15.08.2/src/kblocks-15.08.2.tar.xz"; + sha256 = "1yaqwsjr4jy673vpkl574h95mzqbwjxi7mch74r2xxjz3mbwzi7s"; + name = "kblocks-15.08.2.tar.xz"; }; }; kblog = { - version = "15.08.1"; + version = "15.08.2"; src = fetchurl { - url = "${mirror}/stable/applications/15.08.1/src/kblog-15.08.1.tar.xz"; - sha256 = "0a5ycnk0ljw8k4m5pm7cn37ijjq9x1p2hxf4k77jb7aw1apyqv15"; - name = "kblog-15.08.1.tar.xz"; + url = "${mirror}/stable/applications/15.08.2/src/kblog-15.08.2.tar.xz"; + sha256 = "0dpdkyks7q3fr1gwxz4q300n1k0asfa470rbh6j2fz50rnrc6fxp"; + name = "kblog-15.08.2.tar.xz"; }; }; kbounce = { - version = "15.08.1"; + version = "15.08.2"; src = fetchurl { - url = "${mirror}/stable/applications/15.08.1/src/kbounce-15.08.1.tar.xz"; - sha256 = "127b7c4rpkz04nihqyl7d594k9vwjcvlq0758jfmkxijsgpjc334"; - name = "kbounce-15.08.1.tar.xz"; + url = "${mirror}/stable/applications/15.08.2/src/kbounce-15.08.2.tar.xz"; + sha256 = "0g9g7m0wizs3kpil6j13v4ixfyjnfdniwhv1bjdwyinarmq4dq47"; + name = "kbounce-15.08.2.tar.xz"; }; }; kbreakout = { - version = "15.08.1"; + version = "15.08.2"; src = fetchurl { - url = "${mirror}/stable/applications/15.08.1/src/kbreakout-15.08.1.tar.xz"; - sha256 = "1l83iy6iad6npykl4dyh45s5z8pgamdp7aqi2r5c9r4awg16iq48"; - name = "kbreakout-15.08.1.tar.xz"; + url = "${mirror}/stable/applications/15.08.2/src/kbreakout-15.08.2.tar.xz"; + sha256 = "1sazg6qs0lr3z4b9mmw033wlpbzcgsm3451dy77c6wfmg0a3w2hs"; + name = "kbreakout-15.08.2.tar.xz"; }; }; kbruch = { - version = "15.08.1"; + version = "15.08.2"; src = fetchurl { - url = "${mirror}/stable/applications/15.08.1/src/kbruch-15.08.1.tar.xz"; - sha256 = "1mdbrfj7g92v5yzpdi0cccmhf5vdy7y5blbnk50p56qaq8w8avm2"; - name = "kbruch-15.08.1.tar.xz"; + url = "${mirror}/stable/applications/15.08.2/src/kbruch-15.08.2.tar.xz"; + sha256 = "112dlaxp80m0hhsdjkh7514fhf24q805mxnilj3wv01w2z12i20k"; + name = "kbruch-15.08.2.tar.xz"; }; }; kcachegrind = { - version = "15.08.1"; + version = "15.08.2"; src = fetchurl { - url = "${mirror}/stable/applications/15.08.1/src/kcachegrind-15.08.1.tar.xz"; - sha256 = "1nmyw0nld1qasd2zz8dg854br8nqn3kby2xd2afr9a8frhzzmiv2"; - name = "kcachegrind-15.08.1.tar.xz"; + url = "${mirror}/stable/applications/15.08.2/src/kcachegrind-15.08.2.tar.xz"; + sha256 = "04kvm1ylsjj8s8d740zz30csz18acw5pag9zvq72q844gshqzx4d"; + name = "kcachegrind-15.08.2.tar.xz"; }; }; kcalc = { - version = "15.08.1"; + version = "15.08.2"; src = fetchurl { - url = "${mirror}/stable/applications/15.08.1/src/kcalc-15.08.1.tar.xz"; - sha256 = "02xj9n6zv3f3m35g38gsmqnrshbswqkya930sc5nqc0mlyflli6m"; - name = "kcalc-15.08.1.tar.xz"; + url = "${mirror}/stable/applications/15.08.2/src/kcalc-15.08.2.tar.xz"; + sha256 = "0qv55yp3bn88r6d3yhgalwzcfsnzp7glnb7qc7yf8qay4vj8mrc6"; + name = "kcalc-15.08.2.tar.xz"; }; }; kcalcore = { - version = "15.08.1"; + version = "15.08.2"; src = fetchurl { - url = "${mirror}/stable/applications/15.08.1/src/kcalcore-15.08.1.tar.xz"; - sha256 = "0dpip8hbc5fb8yw876lig19kp2wi71dkwcb1mj8k49lph09k3460"; - name = "kcalcore-15.08.1.tar.xz"; + url = "${mirror}/stable/applications/15.08.2/src/kcalcore-15.08.2.tar.xz"; + sha256 = "1d7c7gprqszrdl9k1zy7ibk9bjafqrn612y72j78v8jpfasglz43"; + name = "kcalcore-15.08.2.tar.xz"; }; }; kcalutils = { - version = "15.08.1"; + version = "15.08.2"; src = fetchurl { - url = "${mirror}/stable/applications/15.08.1/src/kcalutils-15.08.1.tar.xz"; - sha256 = "0l8kzz092wz93j58h52q4icpvhvl2djgagdbx12yl7qlwin7wnd3"; - name = "kcalutils-15.08.1.tar.xz"; + url = "${mirror}/stable/applications/15.08.2/src/kcalutils-15.08.2.tar.xz"; + sha256 = "008srl4y53mzq178nzn7k6jlfng6pafvhcbsfpijq6gax3dwx1gw"; + name = "kcalutils-15.08.2.tar.xz"; }; }; kcharselect = { - version = "15.08.1"; + version = "15.08.2"; src = fetchurl { - url = "${mirror}/stable/applications/15.08.1/src/kcharselect-15.08.1.tar.xz"; - sha256 = "0g785ab5iclv1db2dwwlzf14a2l6n9yznw6pb8hx589za7yc46v2"; - name = "kcharselect-15.08.1.tar.xz"; + url = "${mirror}/stable/applications/15.08.2/src/kcharselect-15.08.2.tar.xz"; + sha256 = "0sqnr8h3kq4hg1dd3jd5ri53p1yqsmx2xp5d052pybn4fg40aaz7"; + name = "kcharselect-15.08.2.tar.xz"; }; }; kcolorchooser = { - version = "15.08.1"; + version = "15.08.2"; src = fetchurl { - url = "${mirror}/stable/applications/15.08.1/src/kcolorchooser-15.08.1.tar.xz"; - sha256 = "1ig03dg4baf29hhim1m77bzwnm6mqqyzbmyhk6g92mj5883nnfb7"; - name = "kcolorchooser-15.08.1.tar.xz"; + url = "${mirror}/stable/applications/15.08.2/src/kcolorchooser-15.08.2.tar.xz"; + sha256 = "1mp0774jdpn647fkmlpds4379ac1pdwwp3anid5rbwg9vxzajbpa"; + name = "kcolorchooser-15.08.2.tar.xz"; }; }; kcontacts = { - version = "15.08.1"; + version = "15.08.2"; src = fetchurl { - url = "${mirror}/stable/applications/15.08.1/src/kcontacts-15.08.1.tar.xz"; - sha256 = "1a9ww08m3k7sdqnkb2dpi2c0fpfihjschyzwx82kcp1z613agx1c"; - name = "kcontacts-15.08.1.tar.xz"; + url = "${mirror}/stable/applications/15.08.2/src/kcontacts-15.08.2.tar.xz"; + sha256 = "1bf60w2w360wbvmn3mhdmabfhixsrd8lrwy4djy6slssa5h312i1"; + name = "kcontacts-15.08.2.tar.xz"; }; }; kcron = { - version = "15.08.1"; + version = "15.08.2"; src = fetchurl { - url = "${mirror}/stable/applications/15.08.1/src/kcron-15.08.1.tar.xz"; - sha256 = "1s90bmlfbhcfiq6iizp4sq0z3ds8nrqghckcx9zrbyyj852llh0f"; - name = "kcron-15.08.1.tar.xz"; + url = "${mirror}/stable/applications/15.08.2/src/kcron-15.08.2.tar.xz"; + sha256 = "0b3ryp3g6x449p31awh4w42w1np3x7b1bl3i7acgnyflid1l723x"; + name = "kcron-15.08.2.tar.xz"; }; }; kdeartwork = { - version = "15.08.1"; + version = "15.08.2"; src = fetchurl { - url = "${mirror}/stable/applications/15.08.1/src/kdeartwork-15.08.1.tar.xz"; - sha256 = "0j37pzih616fv1k6i3hll6qkxh42v9gkhy5vl57ancx7a5kxikyc"; - name = "kdeartwork-15.08.1.tar.xz"; + url = "${mirror}/stable/applications/15.08.2/src/kdeartwork-15.08.2.tar.xz"; + sha256 = "0053mv2209rdmgb3vs4wfp1mfc3wgas3g5pm2aa5yghf4cwjjlsm"; + name = "kdeartwork-15.08.2.tar.xz"; }; }; kde-baseapps = { - version = "15.08.1"; + version = "15.08.2"; src = fetchurl { - url = "${mirror}/stable/applications/15.08.1/src/kde-baseapps-15.08.1.tar.xz"; - sha256 = "1ngi571gs62qnpz1ph106ard13pfh9f1ljg4y4cyv77nv90x4a2k"; - name = "kde-baseapps-15.08.1.tar.xz"; + url = "${mirror}/stable/applications/15.08.2/src/kde-baseapps-15.08.2.tar.xz"; + sha256 = "00zrki5q9mkszv58vk0mj3wqrhxnsbmdy76px1gqlmrpchdlln2c"; + name = "kde-baseapps-15.08.2.tar.xz"; }; }; kde-base-artwork = { - version = "15.08.1"; + version = "15.08.2"; src = fetchurl { - url = "${mirror}/stable/applications/15.08.1/src/kde-base-artwork-15.08.1.tar.xz"; - sha256 = "081mrc0s2lnbzwmmy9hwqas28cl6jzdycwxx3vfn4rvsgw4cgrp2"; - name = "kde-base-artwork-15.08.1.tar.xz"; + url = "${mirror}/stable/applications/15.08.2/src/kde-base-artwork-15.08.2.tar.xz"; + sha256 = "13dxl0fjf8zkwp1zv0dlsrvy659fmdgvgdjjcyahzcll6z8zlwaq"; + name = "kde-base-artwork-15.08.2.tar.xz"; }; }; kdebugsettings = { - version = "15.08.1"; + version = "15.08.2"; src = fetchurl { - url = "${mirror}/stable/applications/15.08.1/src/kdebugsettings-15.08.1.tar.xz"; - sha256 = "1h5wn6ilhkrygjacb592nmdv31791y9r0rx6m3l7xx3nbj9hy12c"; - name = "kdebugsettings-15.08.1.tar.xz"; + url = "${mirror}/stable/applications/15.08.2/src/kdebugsettings-15.08.2.tar.xz"; + sha256 = "1rf4p593nqg8w5ax39hqciv4fhn6mrj2ycx4krfnc703fz18sxgg"; + name = "kdebugsettings-15.08.2.tar.xz"; }; }; kde-dev-scripts = { - version = "15.08.1"; + version = "15.08.2"; src = fetchurl { - url = "${mirror}/stable/applications/15.08.1/src/kde-dev-scripts-15.08.1.tar.xz"; - sha256 = "01s13qwji4d2sgbg85kj0ggg4mnl2vggangi8fpvaps03fpq7571"; - name = "kde-dev-scripts-15.08.1.tar.xz"; + url = "${mirror}/stable/applications/15.08.2/src/kde-dev-scripts-15.08.2.tar.xz"; + sha256 = "06rjhix56nb36sx91nfgbahjym2s62zl9jiqi5hsmfkh4p3ijr7l"; + name = "kde-dev-scripts-15.08.2.tar.xz"; }; }; kde-dev-utils = { - version = "15.08.1"; + version = "15.08.2"; src = fetchurl { - url = "${mirror}/stable/applications/15.08.1/src/kde-dev-utils-15.08.1.tar.xz"; - sha256 = "0jashpk1gjcf74b4vpkyrab2izp18ddwi0xky4v47micicl7wm5n"; - name = "kde-dev-utils-15.08.1.tar.xz"; + url = "${mirror}/stable/applications/15.08.2/src/kde-dev-utils-15.08.2.tar.xz"; + sha256 = "1vz6w2ypgl20yqglnvzgir9q8c16day52xzd33hq2f9asbhjjvm2"; + name = "kde-dev-utils-15.08.2.tar.xz"; }; }; kdeedu-data = { - version = "15.08.1"; + version = "15.08.2"; src = fetchurl { - url = "${mirror}/stable/applications/15.08.1/src/kdeedu-data-15.08.1.tar.xz"; - sha256 = "1yfx8526i753ifmcyh9r481cqiqzs4wh3xm1ys5x8pspg9rpn0wi"; - name = "kdeedu-data-15.08.1.tar.xz"; + url = "${mirror}/stable/applications/15.08.2/src/kdeedu-data-15.08.2.tar.xz"; + sha256 = "08w0n6apm2rqcwph74lpfsdmfzfxhks01z3wp982vgj4dl47nk5x"; + name = "kdeedu-data-15.08.2.tar.xz"; }; }; kdegraphics-mobipocket = { - version = "15.08.1"; + version = "15.08.2"; src = fetchurl { - url = "${mirror}/stable/applications/15.08.1/src/kdegraphics-mobipocket-15.08.1.tar.xz"; - sha256 = "0fnrd2za98plc8aw2gmn83yar0m7ix5rg84lpfm0vnshkhrslqg6"; - name = "kdegraphics-mobipocket-15.08.1.tar.xz"; + url = "${mirror}/stable/applications/15.08.2/src/kdegraphics-mobipocket-15.08.2.tar.xz"; + sha256 = "1i2d4m1vci78wnwrn1pxfp30pzlm72isjxb9lz0l7gk6fwzhf25f"; + name = "kdegraphics-mobipocket-15.08.2.tar.xz"; }; }; kdegraphics-strigi-analyzer = { - version = "15.08.1"; + version = "15.08.2"; src = fetchurl { - url = "${mirror}/stable/applications/15.08.1/src/kdegraphics-strigi-analyzer-15.08.1.tar.xz"; - sha256 = "12yby24k5crsyz6mhm2r0wnl306gp7422yj1nrl6yqi16wd37rbs"; - name = "kdegraphics-strigi-analyzer-15.08.1.tar.xz"; + url = "${mirror}/stable/applications/15.08.2/src/kdegraphics-strigi-analyzer-15.08.2.tar.xz"; + sha256 = "192iprh66cp6dc9y14sk8022phdxcclliwv07i5hzby08c7p2llm"; + name = "kdegraphics-strigi-analyzer-15.08.2.tar.xz"; }; }; kdegraphics-thumbnailers = { - version = "15.08.1"; + version = "15.08.2"; src = fetchurl { - url = "${mirror}/stable/applications/15.08.1/src/kdegraphics-thumbnailers-15.08.1.tar.xz"; - sha256 = "1qavbvczjikad4kg28lq6zbb7dvllfw5nggilrs0s2qar7jqlrkw"; - name = "kdegraphics-thumbnailers-15.08.1.tar.xz"; + url = "${mirror}/stable/applications/15.08.2/src/kdegraphics-thumbnailers-15.08.2.tar.xz"; + sha256 = "1126xlh064djl50i4sb4bgdv34ypijlf4hbdcsyq1jh2i4c1h0zq"; + name = "kdegraphics-thumbnailers-15.08.2.tar.xz"; }; }; kde-l10n-ar = { - version = "15.08.1"; + version = "15.08.2"; src = fetchurl { - url = "${mirror}/stable/applications/15.08.1/src/kde-l10n/kde-l10n-ar-15.08.1.tar.xz"; - sha256 = "101c1316wwxl3pf38fb9ch2h5nyra8h2cf79w9l1krdcp6s4776w"; - name = "kde-l10n-ar-15.08.1.tar.xz"; + url = "${mirror}/stable/applications/15.08.2/src/kde-l10n/kde-l10n-ar-15.08.2.tar.xz"; + sha256 = "0dyylzwvnssg0nh0pk6ll7zilnn6543a29fcfrr0spfsr0z8b08w"; + name = "kde-l10n-ar-15.08.2.tar.xz"; }; }; kde-l10n-bg = { - version = "15.08.1"; + version = "15.08.2"; src = fetchurl { - url = "${mirror}/stable/applications/15.08.1/src/kde-l10n/kde-l10n-bg-15.08.1.tar.xz"; - sha256 = "1r515r3c03328ivwqkm7ijj2264l21liblzllgvjy6zmg7n8ilsp"; - name = "kde-l10n-bg-15.08.1.tar.xz"; + url = "${mirror}/stable/applications/15.08.2/src/kde-l10n/kde-l10n-bg-15.08.2.tar.xz"; + sha256 = "081y0v23apsgbhfi2n4lfqa5868j8yl246z551crcmskwpdyhzd5"; + name = "kde-l10n-bg-15.08.2.tar.xz"; }; }; kde-l10n-bs = { - version = "15.08.1"; + version = "15.08.2"; src = fetchurl { - url = "${mirror}/stable/applications/15.08.1/src/kde-l10n/kde-l10n-bs-15.08.1.tar.xz"; - sha256 = "0wyk547g8k3j6lcl1wipw4jwd0wqi8zrnb2h59g55il9rj7782q3"; - name = "kde-l10n-bs-15.08.1.tar.xz"; + url = "${mirror}/stable/applications/15.08.2/src/kde-l10n/kde-l10n-bs-15.08.2.tar.xz"; + sha256 = "1ybnayqkb543sm8ql7m6hj8d8jzxggsghw46q2zxajgcg2p7mlsl"; + name = "kde-l10n-bs-15.08.2.tar.xz"; }; }; kde-l10n-ca = { - version = "15.08.1"; + version = "15.08.2"; src = fetchurl { - url = "${mirror}/stable/applications/15.08.1/src/kde-l10n/kde-l10n-ca-15.08.1.tar.xz"; - sha256 = "0ql4b550wasf31vkvha1kjyv7d0svyxk7wc77v39fbly0agxwbap"; - name = "kde-l10n-ca-15.08.1.tar.xz"; + url = "${mirror}/stable/applications/15.08.2/src/kde-l10n/kde-l10n-ca-15.08.2.tar.xz"; + sha256 = "13akidgwm90754i085r7nxm27fq7wyw6h2rzfz13wh9azqlv9xrr"; + name = "kde-l10n-ca-15.08.2.tar.xz"; }; }; kde-l10n-ca_valencia = { - version = "ca_valencia-15.08.1"; + version = "ca_valencia-15.08.2"; src = fetchurl { - url = "${mirror}/stable/applications/15.08.1/src/kde-l10n/kde-l10n-ca@valencia-15.08.1.tar.xz"; - sha256 = "075j5zbn9fy510bf278j3184niwf8dkdpzihvjsram8xrggl4whl"; - name = "kde-l10n-ca_valencia-15.08.1.tar.xz"; + url = "${mirror}/stable/applications/15.08.2/src/kde-l10n/kde-l10n-ca@valencia-15.08.2.tar.xz"; + sha256 = "1fxxfsa857y689qxvv3bry8djah70wp3iympq4ki84sgs4sj1fr3"; + name = "kde-l10n-ca_valencia-15.08.2.tar.xz"; }; }; kde-l10n-cs = { - version = "15.08.1"; + version = "15.08.2"; src = fetchurl { - url = "${mirror}/stable/applications/15.08.1/src/kde-l10n/kde-l10n-cs-15.08.1.tar.xz"; - sha256 = "1lmln0q9r7cvkvs0qz2ky01rj8rjbrwl7g3vkz2zyr64gxgnjilz"; - name = "kde-l10n-cs-15.08.1.tar.xz"; + url = "${mirror}/stable/applications/15.08.2/src/kde-l10n/kde-l10n-cs-15.08.2.tar.xz"; + sha256 = "031p9wdx762ysb0w29gbkhm2c4axdlk1kflhd0fzff9s5sxjlykh"; + name = "kde-l10n-cs-15.08.2.tar.xz"; }; }; kde-l10n-da = { - version = "15.08.1"; + version = "15.08.2"; src = fetchurl { - url = "${mirror}/stable/applications/15.08.1/src/kde-l10n/kde-l10n-da-15.08.1.tar.xz"; - sha256 = "10sxs45bvs5qw02pj2qhykymm3ddl6ij3gvwgxj7r1kl84lfkil6"; - name = "kde-l10n-da-15.08.1.tar.xz"; + url = "${mirror}/stable/applications/15.08.2/src/kde-l10n/kde-l10n-da-15.08.2.tar.xz"; + sha256 = "1mvb3jdp2vi3plq2c5cpqydbfzhahwvfpw7rh0ysii1c9hj9gva7"; + name = "kde-l10n-da-15.08.2.tar.xz"; }; }; kde-l10n-de = { - version = "15.08.1"; + version = "15.08.2"; src = fetchurl { - url = "${mirror}/stable/applications/15.08.1/src/kde-l10n/kde-l10n-de-15.08.1.tar.xz"; - sha256 = "11ayw3n392qz1dyblw4gsw4pbdp3wll11z76cawhbmj2jscjd1yb"; - name = "kde-l10n-de-15.08.1.tar.xz"; + url = "${mirror}/stable/applications/15.08.2/src/kde-l10n/kde-l10n-de-15.08.2.tar.xz"; + sha256 = "0pc2653wfmf3znfbqzgzzi9k7rwwv6hm3q2chhd6mc29y5q8ay4s"; + name = "kde-l10n-de-15.08.2.tar.xz"; }; }; kde-l10n-el = { - version = "15.08.1"; + version = "15.08.2"; src = fetchurl { - url = "${mirror}/stable/applications/15.08.1/src/kde-l10n/kde-l10n-el-15.08.1.tar.xz"; - sha256 = "0qznnbk6mgbdjz4mm7rpmr04b6i9fya1yjhnmv8hpwlicl8n9sd6"; - name = "kde-l10n-el-15.08.1.tar.xz"; + url = "${mirror}/stable/applications/15.08.2/src/kde-l10n/kde-l10n-el-15.08.2.tar.xz"; + sha256 = "1k9wsrcw73dvnwj2kwg1aqcvvac4gbw7a6zb9cygkngrawl6llf7"; + name = "kde-l10n-el-15.08.2.tar.xz"; }; }; kde-l10n-en_GB = { - version = "en_GB-15.08.1"; + version = "en_GB-15.08.2"; src = fetchurl { - url = "${mirror}/stable/applications/15.08.1/src/kde-l10n/kde-l10n-en_GB-15.08.1.tar.xz"; - sha256 = "0rb4pjxds75x84ylc71ci2sj75l5p8vr2hmnrlddmj39j22c3mcj"; - name = "kde-l10n-en_GB-15.08.1.tar.xz"; + url = "${mirror}/stable/applications/15.08.2/src/kde-l10n/kde-l10n-en_GB-15.08.2.tar.xz"; + sha256 = "0vgpl1kky8zbxq93sgrkwkky06s8ad0v5m2yvp72blkg04maja0q"; + name = "kde-l10n-en_GB-15.08.2.tar.xz"; }; }; kde-l10n-eo = { - version = "15.08.1"; + version = "15.08.2"; src = fetchurl { - url = "${mirror}/stable/applications/15.08.1/src/kde-l10n/kde-l10n-eo-15.08.1.tar.xz"; - sha256 = "07rns0a5bb2sq13hcndvq79zg451lc3rj2cldmdxdyj5axl0c955"; - name = "kde-l10n-eo-15.08.1.tar.xz"; + url = "${mirror}/stable/applications/15.08.2/src/kde-l10n/kde-l10n-eo-15.08.2.tar.xz"; + sha256 = "0bfrqgmzxasfsh0n3rb5bbjlzv54hygk3vc796zlm89rygxf9lr5"; + name = "kde-l10n-eo-15.08.2.tar.xz"; }; }; kde-l10n-es = { - version = "15.08.1"; + version = "15.08.2"; src = fetchurl { - url = "${mirror}/stable/applications/15.08.1/src/kde-l10n/kde-l10n-es-15.08.1.tar.xz"; - sha256 = "1bb1vp8k6f323q2rjclxpja9yykfgm2di6wn0qhr787swr6qrxjb"; - name = "kde-l10n-es-15.08.1.tar.xz"; + url = "${mirror}/stable/applications/15.08.2/src/kde-l10n/kde-l10n-es-15.08.2.tar.xz"; + sha256 = "172m68cbhg1nln99nzg5srzaf2givfdjhkbhkwv83l1gya9r0p1j"; + name = "kde-l10n-es-15.08.2.tar.xz"; }; }; kde-l10n-et = { - version = "15.08.1"; + version = "15.08.2"; src = fetchurl { - url = "${mirror}/stable/applications/15.08.1/src/kde-l10n/kde-l10n-et-15.08.1.tar.xz"; - sha256 = "027vpybfrm6zdmglwlhmyrh6157gmv8i5x1hx5d8f57m8jnh3nfq"; - name = "kde-l10n-et-15.08.1.tar.xz"; + url = "${mirror}/stable/applications/15.08.2/src/kde-l10n/kde-l10n-et-15.08.2.tar.xz"; + sha256 = "1zwfs1vz75k980256x6kjxydhf3cvbhq9gyz1af20xmm11pmmzpl"; + name = "kde-l10n-et-15.08.2.tar.xz"; }; }; kde-l10n-eu = { - version = "15.08.1"; + version = "15.08.2"; src = fetchurl { - url = "${mirror}/stable/applications/15.08.1/src/kde-l10n/kde-l10n-eu-15.08.1.tar.xz"; - sha256 = "01jcykc8d7nzlsfjp2xcbf7bkld7skf7mmrig7dllgl0igdkx1qm"; - name = "kde-l10n-eu-15.08.1.tar.xz"; + url = "${mirror}/stable/applications/15.08.2/src/kde-l10n/kde-l10n-eu-15.08.2.tar.xz"; + sha256 = "13ml8mja8fnrvamlrglg9gpv8afji91ayjk11w3iiknr4ml4ra38"; + name = "kde-l10n-eu-15.08.2.tar.xz"; }; }; kde-l10n-fa = { - version = "15.08.1"; + version = "15.08.2"; src = fetchurl { - url = "${mirror}/stable/applications/15.08.1/src/kde-l10n/kde-l10n-fa-15.08.1.tar.xz"; - sha256 = "1bai66j03khb6f6y8v72axan6aggdlbwgv3bi91mxwlzhy8ycjxx"; - name = "kde-l10n-fa-15.08.1.tar.xz"; + url = "${mirror}/stable/applications/15.08.2/src/kde-l10n/kde-l10n-fa-15.08.2.tar.xz"; + sha256 = "11xgyk0jnv36vk4jd6l2dx9q5dydr9ldaq8fcmdgcwlcyi2ngbwd"; + name = "kde-l10n-fa-15.08.2.tar.xz"; }; }; kde-l10n-fi = { - version = "15.08.1"; + version = "15.08.2"; src = fetchurl { - url = "${mirror}/stable/applications/15.08.1/src/kde-l10n/kde-l10n-fi-15.08.1.tar.xz"; - sha256 = "0ajgy01p22h1c2dsarsq7ximwp3blvmxnf9217szikkf5yky2w9m"; - name = "kde-l10n-fi-15.08.1.tar.xz"; + url = "${mirror}/stable/applications/15.08.2/src/kde-l10n/kde-l10n-fi-15.08.2.tar.xz"; + sha256 = "12v92y0sgw77l15vg61vmzdh4gx3455awaai8ywffvsxgl2plsbg"; + name = "kde-l10n-fi-15.08.2.tar.xz"; }; }; kde-l10n-fr = { - version = "15.08.1"; + version = "15.08.2"; src = fetchurl { - url = "${mirror}/stable/applications/15.08.1/src/kde-l10n/kde-l10n-fr-15.08.1.tar.xz"; - sha256 = "1mclsk410ir9y6xvy8j8dswpa3k7hmjng232annq05fzapw7bda6"; - name = "kde-l10n-fr-15.08.1.tar.xz"; + url = "${mirror}/stable/applications/15.08.2/src/kde-l10n/kde-l10n-fr-15.08.2.tar.xz"; + sha256 = "1dqrd8vr3i1kdkckd6i6vai40i61l6pahg2rrjgxdxgq2vbd0hzm"; + name = "kde-l10n-fr-15.08.2.tar.xz"; }; }; kde-l10n-ga = { - version = "15.08.1"; + version = "15.08.2"; src = fetchurl { - url = "${mirror}/stable/applications/15.08.1/src/kde-l10n/kde-l10n-ga-15.08.1.tar.xz"; - sha256 = "06l39s9d6y33f4vvcxvry7cxw2m431xgvcz1wcmf6zhlpi5wwlmr"; - name = "kde-l10n-ga-15.08.1.tar.xz"; + url = "${mirror}/stable/applications/15.08.2/src/kde-l10n/kde-l10n-ga-15.08.2.tar.xz"; + sha256 = "1jfbshfrqlsw6ai1iajkf3qy5cgw8glk928slw8j7mlnqpl0adjf"; + name = "kde-l10n-ga-15.08.2.tar.xz"; }; }; kde-l10n-gl = { - version = "15.08.1"; + version = "15.08.2"; src = fetchurl { - url = "${mirror}/stable/applications/15.08.1/src/kde-l10n/kde-l10n-gl-15.08.1.tar.xz"; - sha256 = "0fapj4gmm4pp5bf3gj6xwnzjxw9094mal7njb0nisshvdfbpgr37"; - name = "kde-l10n-gl-15.08.1.tar.xz"; + url = "${mirror}/stable/applications/15.08.2/src/kde-l10n/kde-l10n-gl-15.08.2.tar.xz"; + sha256 = "198zb8v1bl2syypnk21hcdfk4a26rx3hc8clv01llyjh1x69ardb"; + name = "kde-l10n-gl-15.08.2.tar.xz"; }; }; kde-l10n-he = { - version = "15.08.1"; + version = "15.08.2"; src = fetchurl { - url = "${mirror}/stable/applications/15.08.1/src/kde-l10n/kde-l10n-he-15.08.1.tar.xz"; - sha256 = "1fgxnm6l45kcjrgjg19z2fg6fnsbpdy0agllj6rw0ffbcp68l863"; - name = "kde-l10n-he-15.08.1.tar.xz"; + url = "${mirror}/stable/applications/15.08.2/src/kde-l10n/kde-l10n-he-15.08.2.tar.xz"; + sha256 = "0vv8hl400vsn0vdag4ya20gxdzj15lfg2jbmp7yphna0l54ac6cv"; + name = "kde-l10n-he-15.08.2.tar.xz"; }; }; kde-l10n-hi = { - version = "15.08.1"; + version = "15.08.2"; src = fetchurl { - url = "${mirror}/stable/applications/15.08.1/src/kde-l10n/kde-l10n-hi-15.08.1.tar.xz"; - sha256 = "0ys05gxcj6vkx4a8xjhwfym6faz6ifh50i5si175rynb6igyydnh"; - name = "kde-l10n-hi-15.08.1.tar.xz"; + url = "${mirror}/stable/applications/15.08.2/src/kde-l10n/kde-l10n-hi-15.08.2.tar.xz"; + sha256 = "07p4f98p68cjmni5abvzks1jm7y00s392ysbjpfg9x5nbfswza08"; + name = "kde-l10n-hi-15.08.2.tar.xz"; }; }; kde-l10n-hr = { - version = "15.08.1"; + version = "15.08.2"; src = fetchurl { - url = "${mirror}/stable/applications/15.08.1/src/kde-l10n/kde-l10n-hr-15.08.1.tar.xz"; - sha256 = "0jlnig5rsmdxv3ng352hd8n0vqd020bf00xnjbdihcnvdwq625lv"; - name = "kde-l10n-hr-15.08.1.tar.xz"; + url = "${mirror}/stable/applications/15.08.2/src/kde-l10n/kde-l10n-hr-15.08.2.tar.xz"; + sha256 = "04rq8m4cipnn9a88h8mfr0sphdqd7vrd1iywsrg2dcbimbjnq9jr"; + name = "kde-l10n-hr-15.08.2.tar.xz"; }; }; kde-l10n-hu = { - version = "15.08.1"; + version = "15.08.2"; src = fetchurl { - url = "${mirror}/stable/applications/15.08.1/src/kde-l10n/kde-l10n-hu-15.08.1.tar.xz"; - sha256 = "0jysfqb9pmhcw2kd48n6asmkci56mgk1jcsx8gxn9lcfrqnpc52g"; - name = "kde-l10n-hu-15.08.1.tar.xz"; + url = "${mirror}/stable/applications/15.08.2/src/kde-l10n/kde-l10n-hu-15.08.2.tar.xz"; + sha256 = "12g79klwjn5vfv1hyb0ly2576cp79zhp68rxansy3mk1sdwywdcl"; + name = "kde-l10n-hu-15.08.2.tar.xz"; }; }; kde-l10n-ia = { - version = "15.08.1"; + version = "15.08.2"; src = fetchurl { - url = "${mirror}/stable/applications/15.08.1/src/kde-l10n/kde-l10n-ia-15.08.1.tar.xz"; - sha256 = "1mgzpzy1s45v6nf2wbqgsam7bdg1x0fkmggnwy8k8f7kx5yxfcw4"; - name = "kde-l10n-ia-15.08.1.tar.xz"; + url = "${mirror}/stable/applications/15.08.2/src/kde-l10n/kde-l10n-ia-15.08.2.tar.xz"; + sha256 = "0b5hxrhp292hg0lhq9fqzhcdc045j7qzjg7j715b9r26c89n8g56"; + name = "kde-l10n-ia-15.08.2.tar.xz"; }; }; kde-l10n-id = { - version = "15.08.1"; + version = "15.08.2"; src = fetchurl { - url = "${mirror}/stable/applications/15.08.1/src/kde-l10n/kde-l10n-id-15.08.1.tar.xz"; - sha256 = "13lls8w18c8zrfrqfaz2yjn7jcjrv6dsax09l8wda5144xhbsxw3"; - name = "kde-l10n-id-15.08.1.tar.xz"; + url = "${mirror}/stable/applications/15.08.2/src/kde-l10n/kde-l10n-id-15.08.2.tar.xz"; + sha256 = "1azmhrk42j1kk88v9i7343qpah39cfpqa9ikpzbnj7jzc269i951"; + name = "kde-l10n-id-15.08.2.tar.xz"; }; }; kde-l10n-is = { - version = "15.08.1"; + version = "15.08.2"; src = fetchurl { - url = "${mirror}/stable/applications/15.08.1/src/kde-l10n/kde-l10n-is-15.08.1.tar.xz"; - sha256 = "0n3ws9imns4jzvnnrkrm8dk8yzlfjcbxl7ip36m7a09lnnskc4zw"; - name = "kde-l10n-is-15.08.1.tar.xz"; + url = "${mirror}/stable/applications/15.08.2/src/kde-l10n/kde-l10n-is-15.08.2.tar.xz"; + sha256 = "1l8nwzjqiqqa7l5w1d62simhrcgdvf0qg93wzsgp5ph8ycldkggh"; + name = "kde-l10n-is-15.08.2.tar.xz"; }; }; kde-l10n-it = { - version = "15.08.1"; + version = "15.08.2"; src = fetchurl { - url = "${mirror}/stable/applications/15.08.1/src/kde-l10n/kde-l10n-it-15.08.1.tar.xz"; - sha256 = "04blm19llvm2n885p9in4iicaj81ap9vvxsqmfnz7rwb93bsy4wl"; - name = "kde-l10n-it-15.08.1.tar.xz"; + url = "${mirror}/stable/applications/15.08.2/src/kde-l10n/kde-l10n-it-15.08.2.tar.xz"; + sha256 = "0al6mv1kx2shpg7052p51kcccvpyzi8252k5c4hbab4jxhvbhcxm"; + name = "kde-l10n-it-15.08.2.tar.xz"; }; }; kde-l10n-ja = { - version = "15.08.1"; + version = "15.08.2"; src = fetchurl { - url = "${mirror}/stable/applications/15.08.1/src/kde-l10n/kde-l10n-ja-15.08.1.tar.xz"; - sha256 = "0ir82yc2jmy7ijn02y9f2vxnv1cd5a92pjji3fzriqfg6dlgyiw9"; - name = "kde-l10n-ja-15.08.1.tar.xz"; + url = "${mirror}/stable/applications/15.08.2/src/kde-l10n/kde-l10n-ja-15.08.2.tar.xz"; + sha256 = "0z3lv3pv0mz9dgii3hv6fl4m22mc29qjrr6nann0y3yalsqhps01"; + name = "kde-l10n-ja-15.08.2.tar.xz"; }; }; kde-l10n-kk = { - version = "15.08.1"; + version = "15.08.2"; src = fetchurl { - url = "${mirror}/stable/applications/15.08.1/src/kde-l10n/kde-l10n-kk-15.08.1.tar.xz"; - sha256 = "13zi7yh9hsxmb8v6x2jqlyh4wdb4waj653py27g91rbznsp1fjzp"; - name = "kde-l10n-kk-15.08.1.tar.xz"; + url = "${mirror}/stable/applications/15.08.2/src/kde-l10n/kde-l10n-kk-15.08.2.tar.xz"; + sha256 = "1x8j2a2cxck7shsr2l4yz8d4lanhl6y4x4xdv7c7l2pwchnki9by"; + name = "kde-l10n-kk-15.08.2.tar.xz"; }; }; kde-l10n-km = { - version = "15.08.1"; + version = "15.08.2"; src = fetchurl { - url = "${mirror}/stable/applications/15.08.1/src/kde-l10n/kde-l10n-km-15.08.1.tar.xz"; - sha256 = "1yjckfma9dj8li9whwfa6bid289z05vllxqigbsjfy12721ahrc6"; - name = "kde-l10n-km-15.08.1.tar.xz"; + url = "${mirror}/stable/applications/15.08.2/src/kde-l10n/kde-l10n-km-15.08.2.tar.xz"; + sha256 = "0c450yfiavm7wy3yr01idczg6svhsrjsi1jnd10nnc79w5iw8k13"; + name = "kde-l10n-km-15.08.2.tar.xz"; }; }; kde-l10n-ko = { - version = "15.08.1"; + version = "15.08.2"; src = fetchurl { - url = "${mirror}/stable/applications/15.08.1/src/kde-l10n/kde-l10n-ko-15.08.1.tar.xz"; - sha256 = "19w7z4j7463lg0yzkf8ndfvf3664hk524qfcrdygf61f03hkp22l"; - name = "kde-l10n-ko-15.08.1.tar.xz"; + url = "${mirror}/stable/applications/15.08.2/src/kde-l10n/kde-l10n-ko-15.08.2.tar.xz"; + sha256 = "0wkq67baydd17gn1zb7mi27grddgpxf9rfx6kcrkj50b610680wm"; + name = "kde-l10n-ko-15.08.2.tar.xz"; }; }; kde-l10n-lt = { - version = "15.08.1"; + version = "15.08.2"; src = fetchurl { - url = "${mirror}/stable/applications/15.08.1/src/kde-l10n/kde-l10n-lt-15.08.1.tar.xz"; - sha256 = "03g7l9yyw6wajjpkqss16kfyg6piv50xjrzdy8611asdfabhccjs"; - name = "kde-l10n-lt-15.08.1.tar.xz"; + url = "${mirror}/stable/applications/15.08.2/src/kde-l10n/kde-l10n-lt-15.08.2.tar.xz"; + sha256 = "1zvsh03vmpyp63fg00gm46d4rpmi7lm6i2b3xl3i8k1zr8s1c99v"; + name = "kde-l10n-lt-15.08.2.tar.xz"; }; }; kde-l10n-lv = { - version = "15.08.1"; + version = "15.08.2"; src = fetchurl { - url = "${mirror}/stable/applications/15.08.1/src/kde-l10n/kde-l10n-lv-15.08.1.tar.xz"; - sha256 = "105lq8q97dg9y9j5p5zqf78gvk28qn4axr3ppk1j698576l1ihxl"; - name = "kde-l10n-lv-15.08.1.tar.xz"; + url = "${mirror}/stable/applications/15.08.2/src/kde-l10n/kde-l10n-lv-15.08.2.tar.xz"; + sha256 = "0d84ljb9c2na1zfdq5qxk6bmdqfi0r6vqbsy8jz9qrnizqac3zg2"; + name = "kde-l10n-lv-15.08.2.tar.xz"; }; }; kde-l10n-mr = { - version = "15.08.1"; + version = "15.08.2"; src = fetchurl { - url = "${mirror}/stable/applications/15.08.1/src/kde-l10n/kde-l10n-mr-15.08.1.tar.xz"; - sha256 = "0ga55szsi9kbvjdcc2cjl8m15jzcfrpiryak1m78s46p056lfs7n"; - name = "kde-l10n-mr-15.08.1.tar.xz"; + url = "${mirror}/stable/applications/15.08.2/src/kde-l10n/kde-l10n-mr-15.08.2.tar.xz"; + sha256 = "0w1lx06ncbvyvwl9mq33hafy0n94aahym80dcapbgb1mhvscac8v"; + name = "kde-l10n-mr-15.08.2.tar.xz"; }; }; kde-l10n-nb = { - version = "15.08.1"; + version = "15.08.2"; src = fetchurl { - url = "${mirror}/stable/applications/15.08.1/src/kde-l10n/kde-l10n-nb-15.08.1.tar.xz"; - sha256 = "1y51kdmgnirfjsc5ka75rjvbqjbxxchqj2j4430h8jncjgvjvw6d"; - name = "kde-l10n-nb-15.08.1.tar.xz"; + url = "${mirror}/stable/applications/15.08.2/src/kde-l10n/kde-l10n-nb-15.08.2.tar.xz"; + sha256 = "1faynqp07nvz8q5m4pcvbh01xys9zfrxbrqj3l45ihjq04461zwi"; + name = "kde-l10n-nb-15.08.2.tar.xz"; }; }; kde-l10n-nds = { - version = "15.08.1"; + version = "15.08.2"; src = fetchurl { - url = "${mirror}/stable/applications/15.08.1/src/kde-l10n/kde-l10n-nds-15.08.1.tar.xz"; - sha256 = "0ifndqj0d58g6k71qw9n4xhd0a90fqba3xsk2qyd6yhnmygd48xd"; - name = "kde-l10n-nds-15.08.1.tar.xz"; + url = "${mirror}/stable/applications/15.08.2/src/kde-l10n/kde-l10n-nds-15.08.2.tar.xz"; + sha256 = "1azap1ixrngri98my4ln9zva4xy6bhs9ybj6mwadwa8x97cpzawr"; + name = "kde-l10n-nds-15.08.2.tar.xz"; }; }; kde-l10n-nl = { - version = "15.08.1"; + version = "15.08.2"; src = fetchurl { - url = "${mirror}/stable/applications/15.08.1/src/kde-l10n/kde-l10n-nl-15.08.1.tar.xz"; - sha256 = "11jzaf5dbyl52s61031lygn8xf6qjjqaldlyqgljz1scpp13f75b"; - name = "kde-l10n-nl-15.08.1.tar.xz"; + url = "${mirror}/stable/applications/15.08.2/src/kde-l10n/kde-l10n-nl-15.08.2.tar.xz"; + sha256 = "1gcgncmg6m0vc672sy9034cwd9mpgy9q0pxhc4wfgbf0r4phiy7c"; + name = "kde-l10n-nl-15.08.2.tar.xz"; }; }; kde-l10n-nn = { - version = "15.08.1"; + version = "15.08.2"; src = fetchurl { - url = "${mirror}/stable/applications/15.08.1/src/kde-l10n/kde-l10n-nn-15.08.1.tar.xz"; - sha256 = "01h9xysa8vghaghqpfp7gvps3rymiypb52ffz50srhrhjyh1zq0y"; - name = "kde-l10n-nn-15.08.1.tar.xz"; + url = "${mirror}/stable/applications/15.08.2/src/kde-l10n/kde-l10n-nn-15.08.2.tar.xz"; + sha256 = "0fdd83a6xmxx2vixs1l4fcrndyhwjpjxvk3v6zcp0yih464d1dl9"; + name = "kde-l10n-nn-15.08.2.tar.xz"; }; }; kde-l10n-pa = { - version = "15.08.1"; + version = "15.08.2"; src = fetchurl { - url = "${mirror}/stable/applications/15.08.1/src/kde-l10n/kde-l10n-pa-15.08.1.tar.xz"; - sha256 = "05n9kaalsdx8nvn0p29wf33barhkhb64xxr3xg8cc0d3x21kmhx1"; - name = "kde-l10n-pa-15.08.1.tar.xz"; + url = "${mirror}/stable/applications/15.08.2/src/kde-l10n/kde-l10n-pa-15.08.2.tar.xz"; + sha256 = "0dnni5k1gv7r7nd7pxd4dbhajw160z4g0wsjihijyxdg5j07lk3x"; + name = "kde-l10n-pa-15.08.2.tar.xz"; }; }; kde-l10n-pl = { - version = "15.08.1"; + version = "15.08.2"; src = fetchurl { - url = "${mirror}/stable/applications/15.08.1/src/kde-l10n/kde-l10n-pl-15.08.1.tar.xz"; - sha256 = "0ifjvbvzm5qks35z54i5mdz151347690zg4rn8y033lag81c7ir1"; - name = "kde-l10n-pl-15.08.1.tar.xz"; + url = "${mirror}/stable/applications/15.08.2/src/kde-l10n/kde-l10n-pl-15.08.2.tar.xz"; + sha256 = "0b4x81pfk6448jirwj81nd4dh1kxj1k77xj566s6cwv2wym2wqhb"; + name = "kde-l10n-pl-15.08.2.tar.xz"; }; }; kde-l10n-pt = { - version = "15.08.1"; + version = "15.08.2"; src = fetchurl { - url = "${mirror}/stable/applications/15.08.1/src/kde-l10n/kde-l10n-pt-15.08.1.tar.xz"; - sha256 = "0z5lginm78i6wrxhcdarv660sszybjih02ra3j4wghflzhwrgrhw"; - name = "kde-l10n-pt-15.08.1.tar.xz"; + url = "${mirror}/stable/applications/15.08.2/src/kde-l10n/kde-l10n-pt-15.08.2.tar.xz"; + sha256 = "0r5qw93lnghn69zji26dncpa0mc631jr67sk9hp5fnxjaayxll20"; + name = "kde-l10n-pt-15.08.2.tar.xz"; }; }; kde-l10n-pt_BR = { - version = "pt_BR-15.08.1"; + version = "pt_BR-15.08.2"; src = fetchurl { - url = "${mirror}/stable/applications/15.08.1/src/kde-l10n/kde-l10n-pt_BR-15.08.1.tar.xz"; - sha256 = "0dr0h5bxw462mpirzsnvxcy3s14nlk3a2gh5h9r2wis5fii364da"; - name = "kde-l10n-pt_BR-15.08.1.tar.xz"; + url = "${mirror}/stable/applications/15.08.2/src/kde-l10n/kde-l10n-pt_BR-15.08.2.tar.xz"; + sha256 = "1svx6576dkn4md2vmvif7zngn32jqc5zk857qbfm7asz1dil80gi"; + name = "kde-l10n-pt_BR-15.08.2.tar.xz"; }; }; kde-l10n-ro = { - version = "15.08.1"; + version = "15.08.2"; src = fetchurl { - url = "${mirror}/stable/applications/15.08.1/src/kde-l10n/kde-l10n-ro-15.08.1.tar.xz"; - sha256 = "0j3qccfwarb9azsvm2pf0ikc12dsbywzfi7hv2xd244qcnjpp289"; - name = "kde-l10n-ro-15.08.1.tar.xz"; + url = "${mirror}/stable/applications/15.08.2/src/kde-l10n/kde-l10n-ro-15.08.2.tar.xz"; + sha256 = "0swxxl92djdac9afr3yxn0y47jyljaaqqixd70krlx4fijzkrzg8"; + name = "kde-l10n-ro-15.08.2.tar.xz"; }; }; kde-l10n-ru = { - version = "15.08.1"; + version = "15.08.2"; src = fetchurl { - url = "${mirror}/stable/applications/15.08.1/src/kde-l10n/kde-l10n-ru-15.08.1.tar.xz"; - sha256 = "1qdgh3y8q7hnkhjfbid35fxy4xjl1hj800kljhif7q4kg4ish86m"; - name = "kde-l10n-ru-15.08.1.tar.xz"; + url = "${mirror}/stable/applications/15.08.2/src/kde-l10n/kde-l10n-ru-15.08.2.tar.xz"; + sha256 = "1nawl89fygbyd6fyrja6syzc6i63sd29ixsyalm2n995m6vp73d6"; + name = "kde-l10n-ru-15.08.2.tar.xz"; }; }; kde-l10n-sk = { - version = "15.08.1"; + version = "15.08.2"; src = fetchurl { - url = "${mirror}/stable/applications/15.08.1/src/kde-l10n/kde-l10n-sk-15.08.1.tar.xz"; - sha256 = "13fcfrsdn0q7z0p2cxkcl54g597ix17327lyxz0ns4xn9ada198s"; - name = "kde-l10n-sk-15.08.1.tar.xz"; + url = "${mirror}/stable/applications/15.08.2/src/kde-l10n/kde-l10n-sk-15.08.2.tar.xz"; + sha256 = "1bcbj359spx705zsc33mqzkj70r3afbp9inwslnz6irizif5bbd8"; + name = "kde-l10n-sk-15.08.2.tar.xz"; }; }; kde-l10n-sl = { - version = "15.08.1"; + version = "15.08.2"; src = fetchurl { - url = "${mirror}/stable/applications/15.08.1/src/kde-l10n/kde-l10n-sl-15.08.1.tar.xz"; - sha256 = "12gg889lhq6l1h5bv6hlcwsq2zkqdfxgicxhkjnm3i7ly5laij4f"; - name = "kde-l10n-sl-15.08.1.tar.xz"; + url = "${mirror}/stable/applications/15.08.2/src/kde-l10n/kde-l10n-sl-15.08.2.tar.xz"; + sha256 = "16c9z7y54fm1w1r8x74wnamp1c1yxq6nkf9rjm4hqdi0nzk21l0c"; + name = "kde-l10n-sl-15.08.2.tar.xz"; }; }; kde-l10n-sr = { - version = "15.08.1"; + version = "15.08.2"; src = fetchurl { - url = "${mirror}/stable/applications/15.08.1/src/kde-l10n/kde-l10n-sr-15.08.1.tar.xz"; - sha256 = "1ag5fj3iy5kycwgwhxiwcp4xl19j1q1lbk07b6nz69jm12kpsy6i"; - name = "kde-l10n-sr-15.08.1.tar.xz"; + url = "${mirror}/stable/applications/15.08.2/src/kde-l10n/kde-l10n-sr-15.08.2.tar.xz"; + sha256 = "0xq91qc979h0cp94hjkkn8r45da5z33c4isrxk0y70i068rxakq7"; + name = "kde-l10n-sr-15.08.2.tar.xz"; }; }; kde-l10n-sv = { - version = "15.08.1"; + version = "15.08.2"; src = fetchurl { - url = "${mirror}/stable/applications/15.08.1/src/kde-l10n/kde-l10n-sv-15.08.1.tar.xz"; - sha256 = "0dvgqf39xiz1fkfxvfn9232j454377d92c72dd0h3yl7mf9nndd7"; - name = "kde-l10n-sv-15.08.1.tar.xz"; + url = "${mirror}/stable/applications/15.08.2/src/kde-l10n/kde-l10n-sv-15.08.2.tar.xz"; + sha256 = "0vh2kmw87likz3r4p7wjgg1yjpwm4c3qy4g45fbds028d7hlsjs5"; + name = "kde-l10n-sv-15.08.2.tar.xz"; }; }; kde-l10n-tr = { - version = "15.08.1"; + version = "15.08.2"; src = fetchurl { - url = "${mirror}/stable/applications/15.08.1/src/kde-l10n/kde-l10n-tr-15.08.1.tar.xz"; - sha256 = "1bca3scdg4ma6k6957pq45dmjxgp8hx3bm9jql2rqp0knqf9dwl8"; - name = "kde-l10n-tr-15.08.1.tar.xz"; + url = "${mirror}/stable/applications/15.08.2/src/kde-l10n/kde-l10n-tr-15.08.2.tar.xz"; + sha256 = "08na2a7a4j74i15yayds21a53qbkkdq0jksam59ls6ckxnmqdpxn"; + name = "kde-l10n-tr-15.08.2.tar.xz"; }; }; kde-l10n-ug = { - version = "15.08.1"; + version = "15.08.2"; src = fetchurl { - url = "${mirror}/stable/applications/15.08.1/src/kde-l10n/kde-l10n-ug-15.08.1.tar.xz"; - sha256 = "1brnbjnpwqhh52g058s2hqh77a6p2c81sygdfsjgngc0griahl4q"; - name = "kde-l10n-ug-15.08.1.tar.xz"; + url = "${mirror}/stable/applications/15.08.2/src/kde-l10n/kde-l10n-ug-15.08.2.tar.xz"; + sha256 = "1d0jzfm7y8abfxikls8v7pw50pzxyil23p3bacyi1v10mgzpl27g"; + name = "kde-l10n-ug-15.08.2.tar.xz"; }; }; kde-l10n-uk = { - version = "15.08.1"; + version = "15.08.2"; src = fetchurl { - url = "${mirror}/stable/applications/15.08.1/src/kde-l10n/kde-l10n-uk-15.08.1.tar.xz"; - sha256 = "00f6mjs7nalg8q87ix7h66kqicy7xb9pgkghldbhpal0rqgzscph"; - name = "kde-l10n-uk-15.08.1.tar.xz"; + url = "${mirror}/stable/applications/15.08.2/src/kde-l10n/kde-l10n-uk-15.08.2.tar.xz"; + sha256 = "1c8vdj2m2j3zphvhxxv0w72p67iq56krisi172j92ryixpy8d9rp"; + name = "kde-l10n-uk-15.08.2.tar.xz"; }; }; kde-l10n-wa = { - version = "15.08.1"; + version = "15.08.2"; src = fetchurl { - url = "${mirror}/stable/applications/15.08.1/src/kde-l10n/kde-l10n-wa-15.08.1.tar.xz"; - sha256 = "0z9s118fc0wj2dg2ha7mv0rldvsa3rr8mhwjdgawkmfr9ns82w64"; - name = "kde-l10n-wa-15.08.1.tar.xz"; + url = "${mirror}/stable/applications/15.08.2/src/kde-l10n/kde-l10n-wa-15.08.2.tar.xz"; + sha256 = "0q0a9lnbq30arpwzdn2qn294x660fcdjnh7mlya99bvmdlqgxqbk"; + name = "kde-l10n-wa-15.08.2.tar.xz"; }; }; kde-l10n-zh_CN = { - version = "zh_CN-15.08.1"; + version = "zh_CN-15.08.2"; src = fetchurl { - url = "${mirror}/stable/applications/15.08.1/src/kde-l10n/kde-l10n-zh_CN-15.08.1.tar.xz"; - sha256 = "0j88zjxihddgi4a53034i5br3jf8v61wp5mcbclci59i4p4cwrh7"; - name = "kde-l10n-zh_CN-15.08.1.tar.xz"; + url = "${mirror}/stable/applications/15.08.2/src/kde-l10n/kde-l10n-zh_CN-15.08.2.tar.xz"; + sha256 = "0dkh2lw60ykc9p1dj2iqww9bhz90c3jichbfhsskk6gxzlvxnfsm"; + name = "kde-l10n-zh_CN-15.08.2.tar.xz"; }; }; kde-l10n-zh_TW = { - version = "zh_TW-15.08.1"; + version = "zh_TW-15.08.2"; src = fetchurl { - url = "${mirror}/stable/applications/15.08.1/src/kde-l10n/kde-l10n-zh_TW-15.08.1.tar.xz"; - sha256 = "1w4f8wr9c132z4kmqcjknrgp1hh33s08qvyjxysns6ncj6izpaaz"; - name = "kde-l10n-zh_TW-15.08.1.tar.xz"; + url = "${mirror}/stable/applications/15.08.2/src/kde-l10n/kde-l10n-zh_TW-15.08.2.tar.xz"; + sha256 = "0lg0cx5h6jqa6rscp891chvazngf83y6q2chzb97ywgbz8w7qmx5"; + name = "kde-l10n-zh_TW-15.08.2.tar.xz"; }; }; kdelibs = { - version = "4.14.12"; + version = "4.14.13"; src = fetchurl { - url = "${mirror}/stable/applications/15.08.1/src/kdelibs-4.14.12.tar.xz"; - sha256 = "1s4p3x5si0mx64rhfqplgpyqm04c84wj4mpmbmi86wxwyr5d65rg"; - name = "kdelibs-4.14.12.tar.xz"; + url = "${mirror}/stable/applications/15.08.2/src/kdelibs-4.14.13.tar.xz"; + sha256 = "1ba0nbhqf5yin8n2fwf3cj5yvln72g5yprfgfrgdqd7ybk21l4v1"; + name = "kdelibs-4.14.13.tar.xz"; }; }; kdenetwork-filesharing = { - version = "15.08.1"; + version = "15.08.2"; src = fetchurl { - url = "${mirror}/stable/applications/15.08.1/src/kdenetwork-filesharing-15.08.1.tar.xz"; - sha256 = "03w78qf8sgwypzgwpyl5cfb5441787j6vzzhlddsbmkrl4vnhnff"; - name = "kdenetwork-filesharing-15.08.1.tar.xz"; + url = "${mirror}/stable/applications/15.08.2/src/kdenetwork-filesharing-15.08.2.tar.xz"; + sha256 = "1rqihra8ssajqb6m596gf4dnvdm8p0wfdrj9krvslsijx58pm7wv"; + name = "kdenetwork-filesharing-15.08.2.tar.xz"; }; }; kdenetwork-strigi-analyzers = { - version = "15.08.1"; + version = "15.08.2"; src = fetchurl { - url = "${mirror}/stable/applications/15.08.1/src/kdenetwork-strigi-analyzers-15.08.1.tar.xz"; - sha256 = "0w3jlg9idsxi1pwxh97s9iawjyq8m2z51kz5mm0d0irwslkwaygk"; - name = "kdenetwork-strigi-analyzers-15.08.1.tar.xz"; + url = "${mirror}/stable/applications/15.08.2/src/kdenetwork-strigi-analyzers-15.08.2.tar.xz"; + sha256 = "1a2hnpsm5842y2kra7lqc6v9hh0d6wn7kgnmahnb5sjw9n0xrry3"; + name = "kdenetwork-strigi-analyzers-15.08.2.tar.xz"; }; }; kdenlive = { - version = "15.08.1"; + version = "15.08.2"; src = fetchurl { - url = "${mirror}/stable/applications/15.08.1/src/kdenlive-15.08.1.tar.xz"; - sha256 = "03rbkl3jblzprwb6sd7wycizpnpk65551ji53i2h7rxwsns53hig"; - name = "kdenlive-15.08.1.tar.xz"; + url = "${mirror}/stable/applications/15.08.2/src/kdenlive-15.08.2.tar.xz"; + sha256 = "1ykv8w0zhfbx3f3hcjc8qajv95bgjpr9965fjnzbmix8r7r76bwa"; + name = "kdenlive-15.08.2.tar.xz"; }; }; kdepim = { - version = "15.08.1"; + version = "15.08.2"; src = fetchurl { - url = "${mirror}/stable/applications/15.08.1/src/kdepim-15.08.1.tar.xz"; - sha256 = "06j6zmizkc8yg59dvnbcla82jb4csrwrvzzk3al18j6js0sdjnqr"; - name = "kdepim-15.08.1.tar.xz"; + url = "${mirror}/stable/applications/15.08.2/src/kdepim-15.08.2.tar.xz"; + sha256 = "1i9f6q0a7si0wv9hdxfni07kvqvm587af5b1fcc100vwlambhqhl"; + name = "kdepim-15.08.2.tar.xz"; }; }; kdepimlibs = { - version = "15.08.1"; + version = "15.08.2"; src = fetchurl { - url = "${mirror}/stable/applications/15.08.1/src/kdepimlibs-15.08.1.tar.xz"; - sha256 = "0sjh4n2hgcfd3ngbvzk051yzglkchcjhx0nnn12li0lw2bg7l9w3"; - name = "kdepimlibs-15.08.1.tar.xz"; + url = "${mirror}/stable/applications/15.08.2/src/kdepimlibs-15.08.2.tar.xz"; + sha256 = "1lg8l7a6lfphrlygvpq6cr13zw6gq6nf7hrdlx1qps54wksf5ak2"; + name = "kdepimlibs-15.08.2.tar.xz"; }; }; kdepim-runtime = { - version = "15.08.1"; + version = "15.08.2"; src = fetchurl { - url = "${mirror}/stable/applications/15.08.1/src/kdepim-runtime-15.08.1.tar.xz"; - sha256 = "1hcg900bnjryxii3f1c2yjj2nr3z4pn7yigdxclmwpfk6gvlkqm4"; - name = "kdepim-runtime-15.08.1.tar.xz"; + url = "${mirror}/stable/applications/15.08.2/src/kdepim-runtime-15.08.2.tar.xz"; + sha256 = "15za5ggfha20ibiihjsh0qq51jgps65lw34a1bv2gwyhh8nw6n8x"; + name = "kdepim-runtime-15.08.2.tar.xz"; }; }; kde-runtime = { - version = "15.08.1"; + version = "15.08.2"; src = fetchurl { - url = "${mirror}/stable/applications/15.08.1/src/kde-runtime-15.08.1.tar.xz"; - sha256 = "04vx2v9m5dz5jihvmqvcd6pvk312hdhgj7pkzv8q0lg3z81fqgyi"; - name = "kde-runtime-15.08.1.tar.xz"; + url = "${mirror}/stable/applications/15.08.2/src/kde-runtime-15.08.2.tar.xz"; + sha256 = "0inwb29y5r2641g4qgahizk9znf1bgvbbvv8j43wif894a7xcddv"; + name = "kde-runtime-15.08.2.tar.xz"; }; }; kdesdk-kioslaves = { - version = "15.08.1"; + version = "15.08.2"; src = fetchurl { - url = "${mirror}/stable/applications/15.08.1/src/kdesdk-kioslaves-15.08.1.tar.xz"; - sha256 = "161885bzayf804pdci5n1xh1n4zw3pddk2j53icn573gzpvczwla"; - name = "kdesdk-kioslaves-15.08.1.tar.xz"; + url = "${mirror}/stable/applications/15.08.2/src/kdesdk-kioslaves-15.08.2.tar.xz"; + sha256 = "1pmkfkqpd61y8ydgbb0f12xqgz63z7pnxjrc11iig1hkm5qfggkq"; + name = "kdesdk-kioslaves-15.08.2.tar.xz"; }; }; kdesdk-strigi-analyzers = { - version = "15.08.1"; + version = "15.08.2"; src = fetchurl { - url = "${mirror}/stable/applications/15.08.1/src/kdesdk-strigi-analyzers-15.08.1.tar.xz"; - sha256 = "1g2c511ba42mxg955yyh8w45ga5313mvvpkdl7yvbz7ikb2z6ji5"; - name = "kdesdk-strigi-analyzers-15.08.1.tar.xz"; + url = "${mirror}/stable/applications/15.08.2/src/kdesdk-strigi-analyzers-15.08.2.tar.xz"; + sha256 = "02ndnm19p71v678kb8357l3i8dmwy121pw6b7vxj35ymg9knbzil"; + name = "kdesdk-strigi-analyzers-15.08.2.tar.xz"; }; }; kdesdk-thumbnailers = { - version = "15.08.1"; + version = "15.08.2"; src = fetchurl { - url = "${mirror}/stable/applications/15.08.1/src/kdesdk-thumbnailers-15.08.1.tar.xz"; - sha256 = "0719qaw9whp1aa15cxcz7axfhmcm30iwwrr78xypzcy097f63q4v"; - name = "kdesdk-thumbnailers-15.08.1.tar.xz"; + url = "${mirror}/stable/applications/15.08.2/src/kdesdk-thumbnailers-15.08.2.tar.xz"; + sha256 = "07cqfk0f64n2dk2rnfc6zmsvg29m7s1zvj4vhxa0w3di65zlcjlj"; + name = "kdesdk-thumbnailers-15.08.2.tar.xz"; }; }; kde-wallpapers = { - version = "15.08.1"; + version = "15.08.2"; src = fetchurl { - url = "${mirror}/stable/applications/15.08.1/src/kde-wallpapers-15.08.1.tar.xz"; - sha256 = "01q5yh4q7kjjryab3jc8g4qwi4w18la6na0ra2mf0cf637xnlh83"; - name = "kde-wallpapers-15.08.1.tar.xz"; + url = "${mirror}/stable/applications/15.08.2/src/kde-wallpapers-15.08.2.tar.xz"; + sha256 = "0iz5j0xhwnyab8l6384mnd3a6v6mfcg84161aszi1qsvr4qlv3zl"; + name = "kde-wallpapers-15.08.2.tar.xz"; }; }; kdewebdev = { - version = "15.08.1"; + version = "15.08.2"; src = fetchurl { - url = "${mirror}/stable/applications/15.08.1/src/kdewebdev-15.08.1.tar.xz"; - sha256 = "00q25xp28m9sfgs7h4g89gyh34v36zwmliz1jvsq18aja45f5hpm"; - name = "kdewebdev-15.08.1.tar.xz"; + url = "${mirror}/stable/applications/15.08.2/src/kdewebdev-15.08.2.tar.xz"; + sha256 = "0p7pwdzr0gjhjaabh4202r334xwmz0gxpncbgffydriwl9sckv88"; + name = "kdewebdev-15.08.2.tar.xz"; }; }; kdf = { - version = "15.08.1"; + version = "15.08.2"; src = fetchurl { - url = "${mirror}/stable/applications/15.08.1/src/kdf-15.08.1.tar.xz"; - sha256 = "062rz8syp7kxc9xyl4ldcqx66fdrjh5fhgdqgdjdgpn273n5v447"; - name = "kdf-15.08.1.tar.xz"; + url = "${mirror}/stable/applications/15.08.2/src/kdf-15.08.2.tar.xz"; + sha256 = "124zsl1w93d5f4b5g01cv38ykj4k5w73lb464a65dk3v2sb1fm82"; + name = "kdf-15.08.2.tar.xz"; }; }; kdiamond = { - version = "15.08.1"; + version = "15.08.2"; src = fetchurl { - url = "${mirror}/stable/applications/15.08.1/src/kdiamond-15.08.1.tar.xz"; - sha256 = "1f81l6pnwrpirb5v0npcd2452dkdh0llpmzh57gfd8cik0n1agzm"; - name = "kdiamond-15.08.1.tar.xz"; + url = "${mirror}/stable/applications/15.08.2/src/kdiamond-15.08.2.tar.xz"; + sha256 = "05waxcpri7qaik69fwbcmqqzskvic2jms8ja4s9x3a6s1fpzdgi8"; + name = "kdiamond-15.08.2.tar.xz"; }; }; kfloppy = { - version = "15.08.1"; + version = "15.08.2"; src = fetchurl { - url = "${mirror}/stable/applications/15.08.1/src/kfloppy-15.08.1.tar.xz"; - sha256 = "0yg94p5gj9xazl9kk503mblawyndv2j6m0scf6na68xksgx0yplv"; - name = "kfloppy-15.08.1.tar.xz"; + url = "${mirror}/stable/applications/15.08.2/src/kfloppy-15.08.2.tar.xz"; + sha256 = "1vakzrky94j8z54b1m337m389s7ykm1vsqbfbqad1j2zajn2wms8"; + name = "kfloppy-15.08.2.tar.xz"; }; }; kfourinline = { - version = "15.08.1"; + version = "15.08.2"; src = fetchurl { - url = "${mirror}/stable/applications/15.08.1/src/kfourinline-15.08.1.tar.xz"; - sha256 = "19rssc5mf8hn6fv9pm91pbhdcxp123z9c1wrmay1wmja7fmnyv9s"; - name = "kfourinline-15.08.1.tar.xz"; + url = "${mirror}/stable/applications/15.08.2/src/kfourinline-15.08.2.tar.xz"; + sha256 = "0xwgnnydbmcskqi289knnaq31l8bhw6r3h1dkfjfwhdmbwdfpmdc"; + name = "kfourinline-15.08.2.tar.xz"; }; }; kgeography = { - version = "15.08.1"; + version = "15.08.2"; src = fetchurl { - url = "${mirror}/stable/applications/15.08.1/src/kgeography-15.08.1.tar.xz"; - sha256 = "1ilb9l6v8pf7aq9dzs29bbdqb60fzf7a0dwjjdfvjq8jbnhcxa9v"; - name = "kgeography-15.08.1.tar.xz"; + url = "${mirror}/stable/applications/15.08.2/src/kgeography-15.08.2.tar.xz"; + sha256 = "0p3i97qpny1gv0h97vh9n0cl2gr6q95wa7krpc99mk1dnvw7fsxm"; + name = "kgeography-15.08.2.tar.xz"; }; }; kget = { - version = "15.08.1"; + version = "15.08.2"; src = fetchurl { - url = "${mirror}/stable/applications/15.08.1/src/kget-15.08.1.tar.xz"; - sha256 = "02npfzdk283930jywhjch6sscnj16w2n3nn4ik04bx8hxv74br74"; - name = "kget-15.08.1.tar.xz"; + url = "${mirror}/stable/applications/15.08.2/src/kget-15.08.2.tar.xz"; + sha256 = "11z7vxfx1f11k8izrmwnqfiqm3kbq3x009yv4klsga7fn73gbfzz"; + name = "kget-15.08.2.tar.xz"; }; }; kgoldrunner = { - version = "15.08.1"; + version = "15.08.2"; src = fetchurl { - url = "${mirror}/stable/applications/15.08.1/src/kgoldrunner-15.08.1.tar.xz"; - sha256 = "18xs36g9gmhzlwyg2gl9cc3842dzwc196dpfp0xshja2f1rlr6fp"; - name = "kgoldrunner-15.08.1.tar.xz"; + url = "${mirror}/stable/applications/15.08.2/src/kgoldrunner-15.08.2.tar.xz"; + sha256 = "1al9fv62aj07mnv041g1dg1q46mkf996037g6xyxvnssbgqp5pn7"; + name = "kgoldrunner-15.08.2.tar.xz"; }; }; kgpg = { - version = "15.08.1"; + version = "15.08.2"; src = fetchurl { - url = "${mirror}/stable/applications/15.08.1/src/kgpg-15.08.1.tar.xz"; - sha256 = "0728pb6d70qfrbmd1d16lwxshy3ifb8snx5bi8vp9rrs7ncy8r4a"; - name = "kgpg-15.08.1.tar.xz"; + url = "${mirror}/stable/applications/15.08.2/src/kgpg-15.08.2.tar.xz"; + sha256 = "0q32s1yk1z5cf0zn5wvc8js1ms4dbzbmmc1ykjfqc1wy5bl0rybk"; + name = "kgpg-15.08.2.tar.xz"; }; }; khangman = { - version = "15.08.1"; + version = "15.08.2"; src = fetchurl { - url = "${mirror}/stable/applications/15.08.1/src/khangman-15.08.1.tar.xz"; - sha256 = "1g60s028b08vd34l7n8m4sd7d9zl419kz8f1hvdgs2z9zacd5zqg"; - name = "khangman-15.08.1.tar.xz"; + url = "${mirror}/stable/applications/15.08.2/src/khangman-15.08.2.tar.xz"; + sha256 = "14yrxs7wrlyi74da88mzlrxnnq7b4psk4y5q525f5rns3r46hjzc"; + name = "khangman-15.08.2.tar.xz"; }; }; kholidays = { - version = "15.08.1"; + version = "15.08.2"; src = fetchurl { - url = "${mirror}/stable/applications/15.08.1/src/kholidays-15.08.1.tar.xz"; - sha256 = "1i875c7wpp5vlzjyw78bsxgyhmhv2y9846xbv6xi5y4b211iw6lf"; - name = "kholidays-15.08.1.tar.xz"; + url = "${mirror}/stable/applications/15.08.2/src/kholidays-15.08.2.tar.xz"; + sha256 = "0wgvrcic43ml8cdwsniqsx2f3livzc01zfwi14jnfmqrjq1l02w0"; + name = "kholidays-15.08.2.tar.xz"; }; }; kidentitymanagement = { - version = "15.08.1"; + version = "15.08.2"; src = fetchurl { - url = "${mirror}/stable/applications/15.08.1/src/kidentitymanagement-15.08.1.tar.xz"; - sha256 = "0aslniqzp8bgayvvrxkdfb9ihvz57n6zf3rh99dsv34z20mfyc59"; - name = "kidentitymanagement-15.08.1.tar.xz"; + url = "${mirror}/stable/applications/15.08.2/src/kidentitymanagement-15.08.2.tar.xz"; + sha256 = "0sq6sjrk4rlyyzd7shyjx8w34mpiag01gnqg6966jh8qflm0ll6g"; + name = "kidentitymanagement-15.08.2.tar.xz"; }; }; kig = { - version = "15.08.1"; + version = "15.08.2"; src = fetchurl { - url = "${mirror}/stable/applications/15.08.1/src/kig-15.08.1.tar.xz"; - sha256 = "0wyvqfsgr1101vmzmsixribvd9plys91dvrx6cj9ji7mf4k5875g"; - name = "kig-15.08.1.tar.xz"; + url = "${mirror}/stable/applications/15.08.2/src/kig-15.08.2.tar.xz"; + sha256 = "0wnnn4d1lam2fzqa5g791c86nmdkww60alqgq0qb1njnn53d4hrl"; + name = "kig-15.08.2.tar.xz"; }; }; kigo = { - version = "15.08.1"; + version = "15.08.2"; src = fetchurl { - url = "${mirror}/stable/applications/15.08.1/src/kigo-15.08.1.tar.xz"; - sha256 = "1l1l0yxc6kz1y74pvr5nl5rdmynbzm5izrh412g30nzs30rj2hiw"; - name = "kigo-15.08.1.tar.xz"; + url = "${mirror}/stable/applications/15.08.2/src/kigo-15.08.2.tar.xz"; + sha256 = "08l5585sgyq6z8mwv7djfgijfzfz8v5jr7f8qd4l7915s51522g1"; + name = "kigo-15.08.2.tar.xz"; }; }; killbots = { - version = "15.08.1"; + version = "15.08.2"; src = fetchurl { - url = "${mirror}/stable/applications/15.08.1/src/killbots-15.08.1.tar.xz"; - sha256 = "1p7lxi3rh8ghashy04252wc086kxz1crdxgnisfw4dv4kr17qmb2"; - name = "killbots-15.08.1.tar.xz"; + url = "${mirror}/stable/applications/15.08.2/src/killbots-15.08.2.tar.xz"; + sha256 = "01bv5vfiq6cnbb856akrikfg5fpaq4yvnafjj2j0g8wdq7pblghs"; + name = "killbots-15.08.2.tar.xz"; }; }; kimap = { - version = "15.08.1"; + version = "15.08.2"; src = fetchurl { - url = "${mirror}/stable/applications/15.08.1/src/kimap-15.08.1.tar.xz"; - sha256 = "07q4z16jfddh17khdd39dzasjfmnvd2zgdnph24s171815c2x2ps"; - name = "kimap-15.08.1.tar.xz"; + url = "${mirror}/stable/applications/15.08.2/src/kimap-15.08.2.tar.xz"; + sha256 = "1dh90acl2ib6jyyg23nd2swp0mdbm32mfm7a7320r9v0nyx74m0h"; + name = "kimap-15.08.2.tar.xz"; }; }; kio-extras = { - version = "15.08.1"; + version = "15.08.2"; src = fetchurl { - url = "${mirror}/stable/applications/15.08.1/src/kio-extras-15.08.1.tar.xz"; - sha256 = "06vnr10a3m4gs5bjz3dqx1bv1sqz3q69ihq1hlih4c8lyy9wd26q"; - name = "kio-extras-15.08.1.tar.xz"; + url = "${mirror}/stable/applications/15.08.2/src/kio-extras-15.08.2.tar.xz"; + sha256 = "0r90lb6823nrbq5mzdjxs53sgnj98bnz1fy80q5py3wwckmq715s"; + name = "kio-extras-15.08.2.tar.xz"; }; }; kiriki = { - version = "15.08.1"; + version = "15.08.2"; src = fetchurl { - url = "${mirror}/stable/applications/15.08.1/src/kiriki-15.08.1.tar.xz"; - sha256 = "1ighd4bmvgn84misb7zldjg5z75k1i7z8l7yjb0qybh1cc2bw3b3"; - name = "kiriki-15.08.1.tar.xz"; + url = "${mirror}/stable/applications/15.08.2/src/kiriki-15.08.2.tar.xz"; + sha256 = "04524q3pnvasnvdfq0zn4aysliwwcq06kdd6233ql5pqr2fnzxgr"; + name = "kiriki-15.08.2.tar.xz"; }; }; kiten = { - version = "15.08.1"; + version = "15.08.2"; src = fetchurl { - url = "${mirror}/stable/applications/15.08.1/src/kiten-15.08.1.tar.xz"; - sha256 = "1pz9frvf23hi2hy7g040prcgjvjssgv3yya2kvapafpmbwnd38dv"; - name = "kiten-15.08.1.tar.xz"; + url = "${mirror}/stable/applications/15.08.2/src/kiten-15.08.2.tar.xz"; + sha256 = "0d3jskqgjffsr3mkpviyhkp5wqfg44nf9scscl2d3hixda32bjf1"; + name = "kiten-15.08.2.tar.xz"; }; }; kjumpingcube = { - version = "15.08.1"; + version = "15.08.2"; src = fetchurl { - url = "${mirror}/stable/applications/15.08.1/src/kjumpingcube-15.08.1.tar.xz"; - sha256 = "1b0mqf9rhbdz4dfd0gbps59zzjqdif30zz642v4yi6mqnc002yv9"; - name = "kjumpingcube-15.08.1.tar.xz"; + url = "${mirror}/stable/applications/15.08.2/src/kjumpingcube-15.08.2.tar.xz"; + sha256 = "1hp4xmdi6swsygqrpxchrkmj2q7xdykcp4maqkjpkwsb7iimldqc"; + name = "kjumpingcube-15.08.2.tar.xz"; }; }; kldap = { - version = "15.08.1"; + version = "15.08.2"; src = fetchurl { - url = "${mirror}/stable/applications/15.08.1/src/kldap-15.08.1.tar.xz"; - sha256 = "13mn0zkyd8qkp2rlcd75g821k3xpvwrj6xwjwvllfn25zsng32yw"; - name = "kldap-15.08.1.tar.xz"; + url = "${mirror}/stable/applications/15.08.2/src/kldap-15.08.2.tar.xz"; + sha256 = "1pq3wcixnmizfk5zakn5dzc4nzyvqv7ixlj8mixp0aa3d06pcmg4"; + name = "kldap-15.08.2.tar.xz"; }; }; klettres = { - version = "15.08.1"; + version = "15.08.2"; src = fetchurl { - url = "${mirror}/stable/applications/15.08.1/src/klettres-15.08.1.tar.xz"; - sha256 = "0ykb5pfawiyby2xshfdq2gy7w66dw5vhqdd4vjkix6nyb87n703z"; - name = "klettres-15.08.1.tar.xz"; + url = "${mirror}/stable/applications/15.08.2/src/klettres-15.08.2.tar.xz"; + sha256 = "1lqhyifrdwfymw69aj8pbimmw3qc6zly326gwrsg05xyk3qw2x6y"; + name = "klettres-15.08.2.tar.xz"; }; }; klickety = { - version = "15.08.1"; + version = "15.08.2"; src = fetchurl { - url = "${mirror}/stable/applications/15.08.1/src/klickety-15.08.1.tar.xz"; - sha256 = "1prbr2401jy4pifcyn8dy6q34f1nrhvhh8gm8p5jbr1jkzxmm1k1"; - name = "klickety-15.08.1.tar.xz"; + url = "${mirror}/stable/applications/15.08.2/src/klickety-15.08.2.tar.xz"; + sha256 = "0dwzddygnhynib2qp8csbacdi2h0l3jsgscax2k0c4q67jlld59c"; + name = "klickety-15.08.2.tar.xz"; }; }; klines = { - version = "15.08.1"; + version = "15.08.2"; src = fetchurl { - url = "${mirror}/stable/applications/15.08.1/src/klines-15.08.1.tar.xz"; - sha256 = "17vnbk0qbiynyjycj5nda9w38ija5cvhlfhji1f580hq156qzsgl"; - name = "klines-15.08.1.tar.xz"; + url = "${mirror}/stable/applications/15.08.2/src/klines-15.08.2.tar.xz"; + sha256 = "15gaz611vanz8jpp5hi57rg06q7l9hashs7izh5ffbixw1h8cnyv"; + name = "klines-15.08.2.tar.xz"; }; }; kmag = { - version = "15.08.1"; + version = "15.08.2"; src = fetchurl { - url = "${mirror}/stable/applications/15.08.1/src/kmag-15.08.1.tar.xz"; - sha256 = "02bhjmmqb28qyacqzikrkxgh1zf4v1012kdjpdczsmnrgb1nmpgl"; - name = "kmag-15.08.1.tar.xz"; + url = "${mirror}/stable/applications/15.08.2/src/kmag-15.08.2.tar.xz"; + sha256 = "1zc8kjldvry96gm1334w27s0g579sfgxmxc1nxra56b1c6gvslgs"; + name = "kmag-15.08.2.tar.xz"; }; }; kmahjongg = { - version = "15.08.1"; + version = "15.08.2"; src = fetchurl { - url = "${mirror}/stable/applications/15.08.1/src/kmahjongg-15.08.1.tar.xz"; - sha256 = "193ynx3da2nyaf2ixq7gc93nv8p9djslh8m666kdnqcxarlxd2qn"; - name = "kmahjongg-15.08.1.tar.xz"; + url = "${mirror}/stable/applications/15.08.2/src/kmahjongg-15.08.2.tar.xz"; + sha256 = "1v21zs6hb3r4ms8lfxxmfl0yhwkb8xks2813711gqs9fkff326sl"; + name = "kmahjongg-15.08.2.tar.xz"; }; }; kmailtransport = { - version = "15.08.1"; + version = "15.08.2"; src = fetchurl { - url = "${mirror}/stable/applications/15.08.1/src/kmailtransport-15.08.1.tar.xz"; - sha256 = "18gnhw49df0f7j0n0nzfnr5v6wvl37mf82slwbsrjqvhj60b2xsg"; - name = "kmailtransport-15.08.1.tar.xz"; + url = "${mirror}/stable/applications/15.08.2/src/kmailtransport-15.08.2.tar.xz"; + sha256 = "1g235pv3lrwl2smwg4f3f4sbc6ail31b5f98kbipqlpcxg3rdx9d"; + name = "kmailtransport-15.08.2.tar.xz"; }; }; kmbox = { - version = "15.08.1"; + version = "15.08.2"; src = fetchurl { - url = "${mirror}/stable/applications/15.08.1/src/kmbox-15.08.1.tar.xz"; - sha256 = "1b4b9kk99kvcz4krixnzwvwf7ydkpbsrzza74f8ljbl40ldn94jn"; - name = "kmbox-15.08.1.tar.xz"; + url = "${mirror}/stable/applications/15.08.2/src/kmbox-15.08.2.tar.xz"; + sha256 = "0csnbzi4xwrdzar060qgzl2w2rysil09asv5z4njh1rwhk8l8s4w"; + name = "kmbox-15.08.2.tar.xz"; }; }; kmime = { - version = "15.08.1"; + version = "15.08.2"; src = fetchurl { - url = "${mirror}/stable/applications/15.08.1/src/kmime-15.08.1.tar.xz"; - sha256 = "1rz9nmx01rd4asv8iggh47m7snm0fdvlc9f59jpkbch1wxf70vqc"; - name = "kmime-15.08.1.tar.xz"; + url = "${mirror}/stable/applications/15.08.2/src/kmime-15.08.2.tar.xz"; + sha256 = "1skq9csf08bc7g0s145ga5z8amiaimvff8rnwg2f8mafh59hbdmk"; + name = "kmime-15.08.2.tar.xz"; }; }; kmines = { - version = "15.08.1"; + version = "15.08.2"; src = fetchurl { - url = "${mirror}/stable/applications/15.08.1/src/kmines-15.08.1.tar.xz"; - sha256 = "12n4im9vqyym5jr0chs4g3wjlr2d2a3i35jhm52j8ibdx7fnpmw6"; - name = "kmines-15.08.1.tar.xz"; + url = "${mirror}/stable/applications/15.08.2/src/kmines-15.08.2.tar.xz"; + sha256 = "1jbgr0nmh3bw0qi29z5lff1n25rdnyi50kfxk542ld1wqp97nmij"; + name = "kmines-15.08.2.tar.xz"; }; }; kmix = { - version = "15.08.1"; + version = "15.08.2"; src = fetchurl { - url = "${mirror}/stable/applications/15.08.1/src/kmix-15.08.1.tar.xz"; - sha256 = "1lpzghasljw07kq9a94lw61l4qlvhif6cd7jypg0vici65lz8k7d"; - name = "kmix-15.08.1.tar.xz"; + url = "${mirror}/stable/applications/15.08.2/src/kmix-15.08.2.tar.xz"; + sha256 = "0vaja9yw12gwif53vj6hsm11k2p7rj0ndkk6sfv5nlhrid3h541q"; + name = "kmix-15.08.2.tar.xz"; }; }; kmousetool = { - version = "15.08.1"; + version = "15.08.2"; src = fetchurl { - url = "${mirror}/stable/applications/15.08.1/src/kmousetool-15.08.1.tar.xz"; - sha256 = "0snyqp2410bjkc5krxhkk08i3lyd5724513vs48lxdasv24jc0nz"; - name = "kmousetool-15.08.1.tar.xz"; + url = "${mirror}/stable/applications/15.08.2/src/kmousetool-15.08.2.tar.xz"; + sha256 = "0j1hlp7fk1j3g2p408wm3biy4ac6jfk7f107pyxspwqkcd0d2pb1"; + name = "kmousetool-15.08.2.tar.xz"; }; }; kmouth = { - version = "15.08.1"; + version = "15.08.2"; src = fetchurl { - url = "${mirror}/stable/applications/15.08.1/src/kmouth-15.08.1.tar.xz"; - sha256 = "1w6jgs9skis1y8g07hdzwpdsa7dmzfi5dw82wx0wnnmdm076vg41"; - name = "kmouth-15.08.1.tar.xz"; + url = "${mirror}/stable/applications/15.08.2/src/kmouth-15.08.2.tar.xz"; + sha256 = "0vrpv1r88wqm66bakssnirn8c7pi0lndkp9lvv9wpxw1g3rkw652"; + name = "kmouth-15.08.2.tar.xz"; }; }; kmplot = { - version = "15.08.1"; + version = "15.08.2"; src = fetchurl { - url = "${mirror}/stable/applications/15.08.1/src/kmplot-15.08.1.tar.xz"; - sha256 = "1a1b6vcxp1wkp6qfidwj42vqkh6wm4m64q0hm7zv6h01l10fzdm2"; - name = "kmplot-15.08.1.tar.xz"; + url = "${mirror}/stable/applications/15.08.2/src/kmplot-15.08.2.tar.xz"; + sha256 = "03q0691060a8x9kxwb33b44cac6difxs435r349jf1mcj34dz157"; + name = "kmplot-15.08.2.tar.xz"; }; }; knavalbattle = { - version = "15.08.1"; + version = "15.08.2"; src = fetchurl { - url = "${mirror}/stable/applications/15.08.1/src/knavalbattle-15.08.1.tar.xz"; - sha256 = "1j235kdnb0qx1dkq89gqcwk0qjj16m0iyf502d6p1mz8cskz7fkp"; - name = "knavalbattle-15.08.1.tar.xz"; + url = "${mirror}/stable/applications/15.08.2/src/knavalbattle-15.08.2.tar.xz"; + sha256 = "1m8y094fymiiqninv7nvgibq96kpfa1srzqfka8j64a4zp0zw7m3"; + name = "knavalbattle-15.08.2.tar.xz"; }; }; knetwalk = { - version = "15.08.1"; + version = "15.08.2"; src = fetchurl { - url = "${mirror}/stable/applications/15.08.1/src/knetwalk-15.08.1.tar.xz"; - sha256 = "0biis3gz943s09dzdxxdpkpizy3qzp9csi72njbm3bapxwmcflr2"; - name = "knetwalk-15.08.1.tar.xz"; + url = "${mirror}/stable/applications/15.08.2/src/knetwalk-15.08.2.tar.xz"; + sha256 = "0hz98w0animdcmrzwsv5qiajwm9i1agz3qmalispq7hxnsss36wm"; + name = "knetwalk-15.08.2.tar.xz"; }; }; kolf = { - version = "15.08.1"; + version = "15.08.2"; src = fetchurl { - url = "${mirror}/stable/applications/15.08.1/src/kolf-15.08.1.tar.xz"; - sha256 = "05xldbfkbbvmq743029cksgdcsfn20xadn91sw1yp9146k0bd97h"; - name = "kolf-15.08.1.tar.xz"; + url = "${mirror}/stable/applications/15.08.2/src/kolf-15.08.2.tar.xz"; + sha256 = "0afqdsymsgp5gkhghlmdxvk4z2mxpcfyhlxcj92070w1idm537jd"; + name = "kolf-15.08.2.tar.xz"; }; }; kollision = { - version = "15.08.1"; + version = "15.08.2"; src = fetchurl { - url = "${mirror}/stable/applications/15.08.1/src/kollision-15.08.1.tar.xz"; - sha256 = "03bm9ydrfq0kicf7j2bmrvjgcffciq7ys0fz0xpcllkwglidsnar"; - name = "kollision-15.08.1.tar.xz"; + url = "${mirror}/stable/applications/15.08.2/src/kollision-15.08.2.tar.xz"; + sha256 = "13zxmjhj8wf4qjp9nzgrc4i5hfdyh23y8hq29v2pycls9m5crv79"; + name = "kollision-15.08.2.tar.xz"; }; }; kolourpaint = { - version = "15.08.1"; + version = "15.08.2"; src = fetchurl { - url = "${mirror}/stable/applications/15.08.1/src/kolourpaint-15.08.1.tar.xz"; - sha256 = "1m0dwv2wxf5nsisg4zc6h1cqbnzv4187il7y45rbkxli430jh43d"; - name = "kolourpaint-15.08.1.tar.xz"; + url = "${mirror}/stable/applications/15.08.2/src/kolourpaint-15.08.2.tar.xz"; + sha256 = "0m4vcjkaprlkv5lhvin88m3yfnnkd3vp839fz0m7f8nsrgr1lxsz"; + name = "kolourpaint-15.08.2.tar.xz"; }; }; kompare = { - version = "15.08.1"; + version = "15.08.2"; src = fetchurl { - url = "${mirror}/stable/applications/15.08.1/src/kompare-15.08.1.tar.xz"; - sha256 = "0n474f1nvbkxj1ryyv2x0yqm9qg3crdzmr30l2fbagi2fxmjxkli"; - name = "kompare-15.08.1.tar.xz"; + url = "${mirror}/stable/applications/15.08.2/src/kompare-15.08.2.tar.xz"; + sha256 = "0s7w2x4j420vs7sqpm6i52c30wxwvmrz8skhlk8fnypz5mldbqda"; + name = "kompare-15.08.2.tar.xz"; }; }; konquest = { - version = "15.08.1"; + version = "15.08.2"; src = fetchurl { - url = "${mirror}/stable/applications/15.08.1/src/konquest-15.08.1.tar.xz"; - sha256 = "0ss7gvr8ihk7ip4dhxyps8h1137i5m20m6sf0rv10c2h0y9cy0zk"; - name = "konquest-15.08.1.tar.xz"; + url = "${mirror}/stable/applications/15.08.2/src/konquest-15.08.2.tar.xz"; + sha256 = "1m6zd1a4s8593rsqk4six664ajlfn5izgc3n04xiyqsxyjq73gsr"; + name = "konquest-15.08.2.tar.xz"; }; }; konsole = { - version = "15.08.1"; + version = "15.08.2"; src = fetchurl { - url = "${mirror}/stable/applications/15.08.1/src/konsole-15.08.1.tar.xz"; - sha256 = "15d401xxqhd8sfjc6gpn7f1zcs5w8l6y2bjvjvidmpzmr24xky1j"; - name = "konsole-15.08.1.tar.xz"; + url = "${mirror}/stable/applications/15.08.2/src/konsole-15.08.2.tar.xz"; + sha256 = "195m7is6lwhdh644isqcyfq57q78nslwb572jpyp77wp1vhvyl78"; + name = "konsole-15.08.2.tar.xz"; }; }; kontactinterface = { - version = "15.08.1"; + version = "15.08.2"; src = fetchurl { - url = "${mirror}/stable/applications/15.08.1/src/kontactinterface-15.08.1.tar.xz"; - sha256 = "1axsixl5yvawrczpgfbrcyax9d9mmc8yjvkxi0hi26mq8zzxkxnm"; - name = "kontactinterface-15.08.1.tar.xz"; + url = "${mirror}/stable/applications/15.08.2/src/kontactinterface-15.08.2.tar.xz"; + sha256 = "0rdpncmb1jrsh3s4zc94b5sml6a1xj0pxfpb06zcvrn1cz90laap"; + name = "kontactinterface-15.08.2.tar.xz"; }; }; kopete = { - version = "15.08.1"; + version = "15.08.2"; src = fetchurl { - url = "${mirror}/stable/applications/15.08.1/src/kopete-15.08.1.tar.xz"; - sha256 = "0949m4xw94hnw79c6ar8m9qjcx7r14qs6jww3pcnab7r0ax4xahb"; - name = "kopete-15.08.1.tar.xz"; + url = "${mirror}/stable/applications/15.08.2/src/kopete-15.08.2.tar.xz"; + sha256 = "0c4h2g22wiyw2qdpdr2d3wchcbd0n289v2jlw8qfblzr0xcb6wzk"; + name = "kopete-15.08.2.tar.xz"; }; }; kpat = { - version = "15.08.1"; + version = "15.08.2"; src = fetchurl { - url = "${mirror}/stable/applications/15.08.1/src/kpat-15.08.1.tar.xz"; - sha256 = "0cw17agpx23fsmnnvwkjn3xvq59d6hpppgydalnhrqka9321qy2d"; - name = "kpat-15.08.1.tar.xz"; + url = "${mirror}/stable/applications/15.08.2/src/kpat-15.08.2.tar.xz"; + sha256 = "0jsvljvx8qf85gibxc8yb1p54z26yfixh04gx02sfkr66mz4jbrg"; + name = "kpat-15.08.2.tar.xz"; }; }; kpimtextedit = { - version = "15.08.1"; + version = "15.08.2"; src = fetchurl { - url = "${mirror}/stable/applications/15.08.1/src/kpimtextedit-15.08.1.tar.xz"; - sha256 = "1djk0gyfdxsqjwhrqf4rnkjvy7hz1rysdm3idjqrnjhnlrjwsiwc"; - name = "kpimtextedit-15.08.1.tar.xz"; + url = "${mirror}/stable/applications/15.08.2/src/kpimtextedit-15.08.2.tar.xz"; + sha256 = "1yq8fg1fasfw7nsndav6yhd6ig885z6pm1l6yimlfig1z114047i"; + name = "kpimtextedit-15.08.2.tar.xz"; }; }; kppp = { - version = "15.08.1"; + version = "15.08.2"; src = fetchurl { - url = "${mirror}/stable/applications/15.08.1/src/kppp-15.08.1.tar.xz"; - sha256 = "1v2dqb9bdi1yl4fpyn98iq8pg69r9pfy7z1wbq6b37nwlhlapva8"; - name = "kppp-15.08.1.tar.xz"; + url = "${mirror}/stable/applications/15.08.2/src/kppp-15.08.2.tar.xz"; + sha256 = "14svvk3nkxmj6rl6gz0204blh0m5j05glklan2ph179sd4x84sv0"; + name = "kppp-15.08.2.tar.xz"; }; }; kqtquickcharts = { - version = "15.08.1"; + version = "15.08.2"; src = fetchurl { - url = "${mirror}/stable/applications/15.08.1/src/kqtquickcharts-15.08.1.tar.xz"; - sha256 = "0jjn8nrxqjpsg9cwfazqz7v4lacl99wxhdh9mclqxk4xy54ydxqc"; - name = "kqtquickcharts-15.08.1.tar.xz"; + url = "${mirror}/stable/applications/15.08.2/src/kqtquickcharts-15.08.2.tar.xz"; + sha256 = "0x946bc0zczxvc56ichbwb4ib2s7b222cmxq77f1dzyjpwi22jz1"; + name = "kqtquickcharts-15.08.2.tar.xz"; }; }; krdc = { - version = "15.08.1"; + version = "15.08.2"; src = fetchurl { - url = "${mirror}/stable/applications/15.08.1/src/krdc-15.08.1.tar.xz"; - sha256 = "1gx3vhl8w64ya71894lgy2i3kkggr84r1c5sx8nbwvapw5v4ngiz"; - name = "krdc-15.08.1.tar.xz"; + url = "${mirror}/stable/applications/15.08.2/src/krdc-15.08.2.tar.xz"; + sha256 = "0ldjf77svdl8qfr9nm4g34jfzpg7nzsc3pc960q4c2k1jwzywh76"; + name = "krdc-15.08.2.tar.xz"; }; }; kremotecontrol = { - version = "15.08.1"; + version = "15.08.2"; src = fetchurl { - url = "${mirror}/stable/applications/15.08.1/src/kremotecontrol-15.08.1.tar.xz"; - sha256 = "01fck27b3ilni2h78lmhq27aq4sw89060bh69xhw8z80iad2bxyy"; - name = "kremotecontrol-15.08.1.tar.xz"; + url = "${mirror}/stable/applications/15.08.2/src/kremotecontrol-15.08.2.tar.xz"; + sha256 = "08n63nj35x5vswaa61vdnlss27bqr3n979r79rrrmvnksjzpw1kx"; + name = "kremotecontrol-15.08.2.tar.xz"; }; }; kreversi = { - version = "15.08.1"; + version = "15.08.2"; src = fetchurl { - url = "${mirror}/stable/applications/15.08.1/src/kreversi-15.08.1.tar.xz"; - sha256 = "0clxm23a0m5j8aj3cp1va5s38y0y5wr7akwmigpk37xjylzp1xdd"; - name = "kreversi-15.08.1.tar.xz"; + url = "${mirror}/stable/applications/15.08.2/src/kreversi-15.08.2.tar.xz"; + sha256 = "180qh06cjxf0nilhism9lkl1qk24hxpva8ikk68yzm3fajskaiy4"; + name = "kreversi-15.08.2.tar.xz"; }; }; krfb = { - version = "15.08.1"; + version = "15.08.2"; src = fetchurl { - url = "${mirror}/stable/applications/15.08.1/src/krfb-15.08.1.tar.xz"; - sha256 = "0cpypajr483iwch385240zi5l0vf4j28k0sng0kszhizspkhvp35"; - name = "krfb-15.08.1.tar.xz"; + url = "${mirror}/stable/applications/15.08.2/src/krfb-15.08.2.tar.xz"; + sha256 = "0p8h6b5rz2mh38y8gfx70c2ga7hpz5dxs86fm8jk696g1g4knq7l"; + name = "krfb-15.08.2.tar.xz"; }; }; kross-interpreters = { - version = "15.08.1"; + version = "15.08.2"; src = fetchurl { - url = "${mirror}/stable/applications/15.08.1/src/kross-interpreters-15.08.1.tar.xz"; - sha256 = "1lqkmxxw1kz23q4pmmvrwqgi9vkxp0pw6g3zpr0x4zkzsj62q2ff"; - name = "kross-interpreters-15.08.1.tar.xz"; + url = "${mirror}/stable/applications/15.08.2/src/kross-interpreters-15.08.2.tar.xz"; + sha256 = "19jnh25kzfi2bf85pm0wdy1wv6csgk55gm97ccc80306frncyman"; + name = "kross-interpreters-15.08.2.tar.xz"; }; }; kruler = { - version = "15.08.1"; + version = "15.08.2"; src = fetchurl { - url = "${mirror}/stable/applications/15.08.1/src/kruler-15.08.1.tar.xz"; - sha256 = "06qlvdyd1cbw8vr2qcqs7q8jylj7kl0y218agp8b60h03nri9psj"; - name = "kruler-15.08.1.tar.xz"; + url = "${mirror}/stable/applications/15.08.2/src/kruler-15.08.2.tar.xz"; + sha256 = "1amn9h7fz3ywrw7xazrdxh0apsgn2gpql35wih8zpq4pznmcxs7j"; + name = "kruler-15.08.2.tar.xz"; }; }; ksaneplugin = { - version = "15.08.1"; + version = "15.08.2"; src = fetchurl { - url = "${mirror}/stable/applications/15.08.1/src/ksaneplugin-15.08.1.tar.xz"; - sha256 = "0fx0y4js4nbbky342ly3aw59rbzz25mjb1da0hkykky9kxrcwnxk"; - name = "ksaneplugin-15.08.1.tar.xz"; + url = "${mirror}/stable/applications/15.08.2/src/ksaneplugin-15.08.2.tar.xz"; + sha256 = "1b0hcv3w2h7pqdi3liwvahfn2y853b74xnx6rq92scrsk4grlri2"; + name = "ksaneplugin-15.08.2.tar.xz"; }; }; kscd = { - version = "15.08.1"; + version = "15.08.2"; src = fetchurl { - url = "${mirror}/stable/applications/15.08.1/src/kscd-15.08.1.tar.xz"; - sha256 = "0alf1088p32spwlpjjj91wpgk48ahzqphvag8adgvh9cp8ij7m7j"; - name = "kscd-15.08.1.tar.xz"; + url = "${mirror}/stable/applications/15.08.2/src/kscd-15.08.2.tar.xz"; + sha256 = "1n1l25a74kdrdz426gn3mk7kdwflg5xq1rjf9c0mfh7h6jqic4vx"; + name = "kscd-15.08.2.tar.xz"; }; }; kshisen = { - version = "15.08.1"; + version = "15.08.2"; src = fetchurl { - url = "${mirror}/stable/applications/15.08.1/src/kshisen-15.08.1.tar.xz"; - sha256 = "1lrn5l4jscbn0ppppshpkh62plskzwy2km9dqp1hp5czpq5zvwk8"; - name = "kshisen-15.08.1.tar.xz"; + url = "${mirror}/stable/applications/15.08.2/src/kshisen-15.08.2.tar.xz"; + sha256 = "0fnjjaf6q04snd0la89hgvijcm3kckh3c47w9a7ih0524331jlkb"; + name = "kshisen-15.08.2.tar.xz"; }; }; ksirk = { - version = "15.08.1"; + version = "15.08.2"; src = fetchurl { - url = "${mirror}/stable/applications/15.08.1/src/ksirk-15.08.1.tar.xz"; - sha256 = "00zlmjyxf31hl910kickgxcc3sh5g2j9grg2mlps8qxdv9m4g1d5"; - name = "ksirk-15.08.1.tar.xz"; + url = "${mirror}/stable/applications/15.08.2/src/ksirk-15.08.2.tar.xz"; + sha256 = "1934qwcbcmghz7iwjc2nimbyl0wv1lvpc8r45c8xwwdbsz0mvkwc"; + name = "ksirk-15.08.2.tar.xz"; }; }; ksnakeduel = { - version = "15.08.1"; + version = "15.08.2"; src = fetchurl { - url = "${mirror}/stable/applications/15.08.1/src/ksnakeduel-15.08.1.tar.xz"; - sha256 = "1q0hcya6dl2lfahqnwx18hl6cwmibsvlyf25x41d42669f7vm1zz"; - name = "ksnakeduel-15.08.1.tar.xz"; + url = "${mirror}/stable/applications/15.08.2/src/ksnakeduel-15.08.2.tar.xz"; + sha256 = "1nx3ac1vjfck7nhnyx5rf42rhjlq4gp3sairxm9ad3lrm885wg3v"; + name = "ksnakeduel-15.08.2.tar.xz"; }; }; ksnapshot = { - version = "15.08.1"; + version = "15.08.2"; src = fetchurl { - url = "${mirror}/stable/applications/15.08.1/src/ksnapshot-15.08.1.tar.xz"; - sha256 = "19z3rbvkn55waig6dm1lvan6wlndshhjbiqwwdlc9nh2wng8dcd0"; - name = "ksnapshot-15.08.1.tar.xz"; + url = "${mirror}/stable/applications/15.08.2/src/ksnapshot-15.08.2.tar.xz"; + sha256 = "1sf9sshqnpnszvzix76k7swxiwgik9gw7rkpahwgq9vyczyjq3v8"; + name = "ksnapshot-15.08.2.tar.xz"; }; }; kspaceduel = { - version = "15.08.1"; + version = "15.08.2"; src = fetchurl { - url = "${mirror}/stable/applications/15.08.1/src/kspaceduel-15.08.1.tar.xz"; - sha256 = "0anviqhcmyfnyq9zz6hh8cka75hy5ydxq5yvz7q0g6c3flj34fq2"; - name = "kspaceduel-15.08.1.tar.xz"; + url = "${mirror}/stable/applications/15.08.2/src/kspaceduel-15.08.2.tar.xz"; + sha256 = "1k2nvlvm1s5hs4568h7f10mlc2yj3zdnnlzb8zff93j9ydh4rng8"; + name = "kspaceduel-15.08.2.tar.xz"; }; }; ksquares = { - version = "15.08.1"; + version = "15.08.2"; src = fetchurl { - url = "${mirror}/stable/applications/15.08.1/src/ksquares-15.08.1.tar.xz"; - sha256 = "17qx89q594w22nd2qhqcmb1wc291b89zs22jh62xrm62yr6h9ijj"; - name = "ksquares-15.08.1.tar.xz"; + url = "${mirror}/stable/applications/15.08.2/src/ksquares-15.08.2.tar.xz"; + sha256 = "0ba95qjkv2wh3g74384lgvk5vq4xc8q59cdiv8vcxllgpgh6hk4p"; + name = "ksquares-15.08.2.tar.xz"; }; }; kstars = { - version = "15.08.1"; + version = "15.08.2"; src = fetchurl { - url = "${mirror}/stable/applications/15.08.1/src/kstars-15.08.1.tar.xz"; - sha256 = "049pnbqn1ddmqd663vc181yh5z204klbs255w41k7p1z1vl5zszr"; - name = "kstars-15.08.1.tar.xz"; + url = "${mirror}/stable/applications/15.08.2/src/kstars-15.08.2.tar.xz"; + sha256 = "0x39djm78bafxxk1n36w7kp0a7jmwsxhbpap6k44awb9mdnd0410"; + name = "kstars-15.08.2.tar.xz"; }; }; ksudoku = { - version = "15.08.1"; + version = "15.08.2"; src = fetchurl { - url = "${mirror}/stable/applications/15.08.1/src/ksudoku-15.08.1.tar.xz"; - sha256 = "1l6dgackab9k1rnzbwwz3rfpxlqvydp5q632ibpqs449c6pk3kww"; - name = "ksudoku-15.08.1.tar.xz"; + url = "${mirror}/stable/applications/15.08.2/src/ksudoku-15.08.2.tar.xz"; + sha256 = "1v0c1dflz8sj1fqkqca1dhs4cb4ijy4nyg9i7ngqqw4pp9pdb2ks"; + name = "ksudoku-15.08.2.tar.xz"; }; }; ksystemlog = { - version = "15.08.1"; + version = "15.08.2"; src = fetchurl { - url = "${mirror}/stable/applications/15.08.1/src/ksystemlog-15.08.1.tar.xz"; - sha256 = "1v18f6dcirr6rayaxy8h85swj04g5giafs67h64g9flq5gacykji"; - name = "ksystemlog-15.08.1.tar.xz"; + url = "${mirror}/stable/applications/15.08.2/src/ksystemlog-15.08.2.tar.xz"; + sha256 = "1p5xlsll68jb02mg16fyy3jvfk20pf4nw6gn9ar0s7hvmk11p8zv"; + name = "ksystemlog-15.08.2.tar.xz"; }; }; kteatime = { - version = "15.08.1"; + version = "15.08.2"; src = fetchurl { - url = "${mirror}/stable/applications/15.08.1/src/kteatime-15.08.1.tar.xz"; - sha256 = "0bsy22dgfpsibkpi0nv4245mxaf0xnh8rpaia8mzrh0d72gf2syb"; - name = "kteatime-15.08.1.tar.xz"; + url = "${mirror}/stable/applications/15.08.2/src/kteatime-15.08.2.tar.xz"; + sha256 = "1bgliai4y4b6ci8rr53yfdaw09am4db2zydf7v60qvc0lqaas8gx"; + name = "kteatime-15.08.2.tar.xz"; }; }; ktimer = { - version = "15.08.1"; + version = "15.08.2"; src = fetchurl { - url = "${mirror}/stable/applications/15.08.1/src/ktimer-15.08.1.tar.xz"; - sha256 = "07882zpgalf2yzqplg3mzl6sxh84zfkbk1jwlw8kwkr7pr7lmfvv"; - name = "ktimer-15.08.1.tar.xz"; + url = "${mirror}/stable/applications/15.08.2/src/ktimer-15.08.2.tar.xz"; + sha256 = "05l46bbn7m67ncsm8bi283pdwixwqm85r51hi7fvqih6dwkc0143"; + name = "ktimer-15.08.2.tar.xz"; }; }; ktnef = { - version = "15.08.1"; + version = "15.08.2"; src = fetchurl { - url = "${mirror}/stable/applications/15.08.1/src/ktnef-15.08.1.tar.xz"; - sha256 = "04jq60qpbgaclscgpwx3sj0l67sqzk9zr01zr6fx127apqzc2xmh"; - name = "ktnef-15.08.1.tar.xz"; + url = "${mirror}/stable/applications/15.08.2/src/ktnef-15.08.2.tar.xz"; + sha256 = "0wqhj8a496zf0nns7jsncm9d21pd4qibrmqi5lsnvc3dj20ijrxm"; + name = "ktnef-15.08.2.tar.xz"; }; }; ktouch = { - version = "15.08.1"; + version = "15.08.2"; src = fetchurl { - url = "${mirror}/stable/applications/15.08.1/src/ktouch-15.08.1.tar.xz"; - sha256 = "1hlg1l1xpmpwvzz47vmif395pw9szjy93p8yxhqsdhkh1f4mdssq"; - name = "ktouch-15.08.1.tar.xz"; + url = "${mirror}/stable/applications/15.08.2/src/ktouch-15.08.2.tar.xz"; + sha256 = "1wwqq52mwc1bnia05zf5pmrqd1ii537n8z72f99jgbvgnq6xyph1"; + name = "ktouch-15.08.2.tar.xz"; }; }; ktp-accounts-kcm = { - version = "15.08.1"; + version = "15.08.2"; src = fetchurl { - url = "${mirror}/stable/applications/15.08.1/src/ktp-accounts-kcm-15.08.1.tar.xz"; - sha256 = "1qk25v0ivxkv8cyq4y44ixz9rx28djfxk06zcvn2m1rwjqhrx204"; - name = "ktp-accounts-kcm-15.08.1.tar.xz"; + url = "${mirror}/stable/applications/15.08.2/src/ktp-accounts-kcm-15.08.2.tar.xz"; + sha256 = "1ikbaqgavah175s936n69j0na09jgmfk8vr0kb5g41zwabza58g8"; + name = "ktp-accounts-kcm-15.08.2.tar.xz"; }; }; ktp-approver = { - version = "15.08.1"; + version = "15.08.2"; src = fetchurl { - url = "${mirror}/stable/applications/15.08.1/src/ktp-approver-15.08.1.tar.xz"; - sha256 = "0qdax2zby93xc694s3s6s21y4bfjbfxsd292ag544cwazcjz8zp5"; - name = "ktp-approver-15.08.1.tar.xz"; + url = "${mirror}/stable/applications/15.08.2/src/ktp-approver-15.08.2.tar.xz"; + sha256 = "0nib7c95aq2ij9sbpkf7rxynnqcdfk5ib9yrxqrh640cqb4ifbx6"; + name = "ktp-approver-15.08.2.tar.xz"; }; }; ktp-auth-handler = { - version = "15.08.1"; + version = "15.08.2"; src = fetchurl { - url = "${mirror}/stable/applications/15.08.1/src/ktp-auth-handler-15.08.1.tar.xz"; - sha256 = "0dwpaw2pvigc0lyqa29gxq49fp6rp5hh2wg6ysr1d00s54lr2qgw"; - name = "ktp-auth-handler-15.08.1.tar.xz"; + url = "${mirror}/stable/applications/15.08.2/src/ktp-auth-handler-15.08.2.tar.xz"; + sha256 = "0b4vnvhxj2j8lmd7lglbhzibwqag0pf2clhv50mvyc3mrp5l80r4"; + name = "ktp-auth-handler-15.08.2.tar.xz"; }; }; ktp-common-internals = { - version = "15.08.1"; + version = "15.08.2"; src = fetchurl { - url = "${mirror}/stable/applications/15.08.1/src/ktp-common-internals-15.08.1.tar.xz"; - sha256 = "13alrk7zn3vq6khackdbyqbk209ivvcfza9mpqaxxll8sg9r3i3k"; - name = "ktp-common-internals-15.08.1.tar.xz"; + url = "${mirror}/stable/applications/15.08.2/src/ktp-common-internals-15.08.2.tar.xz"; + sha256 = "0ny9z1xwprkn7ckx809i2zi4n1bjrniigif0wbyfdmbyp7dz7sgi"; + name = "ktp-common-internals-15.08.2.tar.xz"; }; }; ktp-contact-list = { - version = "15.08.1"; + version = "15.08.2"; src = fetchurl { - url = "${mirror}/stable/applications/15.08.1/src/ktp-contact-list-15.08.1.tar.xz"; - sha256 = "0x8fvfqjjrhdnfaa9ybagf33lv1r21bywkipvkp2f81dalsd1sv0"; - name = "ktp-contact-list-15.08.1.tar.xz"; + url = "${mirror}/stable/applications/15.08.2/src/ktp-contact-list-15.08.2.tar.xz"; + sha256 = "03c0h801zwjqkb9d58v5nk5nmkkhq3517d170pppx9cxza87nzm9"; + name = "ktp-contact-list-15.08.2.tar.xz"; }; }; ktp-contact-runner = { - version = "15.08.1"; + version = "15.08.2"; src = fetchurl { - url = "${mirror}/stable/applications/15.08.1/src/ktp-contact-runner-15.08.1.tar.xz"; - sha256 = "1m8jc39l9d394x3hqlqvc5msy7wi1aki9q8nd4bg6nmdz8v5dxz9"; - name = "ktp-contact-runner-15.08.1.tar.xz"; + url = "${mirror}/stable/applications/15.08.2/src/ktp-contact-runner-15.08.2.tar.xz"; + sha256 = "1pjc7sjiq4s96x0dyyc5kv7r00jmy1gi67y7y71vlxf9mccgi1fv"; + name = "ktp-contact-runner-15.08.2.tar.xz"; }; }; ktp-desktop-applets = { - version = "15.08.1"; + version = "15.08.2"; src = fetchurl { - url = "${mirror}/stable/applications/15.08.1/src/ktp-desktop-applets-15.08.1.tar.xz"; - sha256 = "16nan7vb2gzpll2fnc4li23sjjxhgy7ijzfp6zcp5gc1bxn86jj4"; - name = "ktp-desktop-applets-15.08.1.tar.xz"; + url = "${mirror}/stable/applications/15.08.2/src/ktp-desktop-applets-15.08.2.tar.xz"; + sha256 = "0y1zm57smjr6ww89797bgwbrpm16yksscl3p5vhm0fapr0pw2g76"; + name = "ktp-desktop-applets-15.08.2.tar.xz"; }; }; ktp-filetransfer-handler = { - version = "15.08.1"; + version = "15.08.2"; src = fetchurl { - url = "${mirror}/stable/applications/15.08.1/src/ktp-filetransfer-handler-15.08.1.tar.xz"; - sha256 = "135zpcl0g81xd9hljch05cjngs6x05cnzngzx5h5hsjf13fgz9cn"; - name = "ktp-filetransfer-handler-15.08.1.tar.xz"; + url = "${mirror}/stable/applications/15.08.2/src/ktp-filetransfer-handler-15.08.2.tar.xz"; + sha256 = "06s1ibbgplafca6kwn44fyf36w8ygn17hg6c8wighg3603m72n0z"; + name = "ktp-filetransfer-handler-15.08.2.tar.xz"; }; }; ktp-kded-module = { - version = "15.08.1"; + version = "15.08.2"; src = fetchurl { - url = "${mirror}/stable/applications/15.08.1/src/ktp-kded-module-15.08.1.tar.xz"; - sha256 = "0l2s07z87q2j92q4w6n16rbvd7xm8k4zgchlk06djb5d9gwdgvl0"; - name = "ktp-kded-module-15.08.1.tar.xz"; + url = "${mirror}/stable/applications/15.08.2/src/ktp-kded-module-15.08.2.tar.xz"; + sha256 = "1hqrlb82fgsrdna1sinxl1dnx22dfb7j98bmrfvn6cxxkay866sq"; + name = "ktp-kded-module-15.08.2.tar.xz"; }; }; ktp-send-file = { - version = "15.08.1"; + version = "15.08.2"; src = fetchurl { - url = "${mirror}/stable/applications/15.08.1/src/ktp-send-file-15.08.1.tar.xz"; - sha256 = "07pk6d1rzz0hwfsw7nk4grixvvjja219jvr56j50vpnlmlza29xs"; - name = "ktp-send-file-15.08.1.tar.xz"; + url = "${mirror}/stable/applications/15.08.2/src/ktp-send-file-15.08.2.tar.xz"; + sha256 = "0kwamr99aj78v816gxiyr3bxivl6sy6dc29q59x03bkpdqdnn87n"; + name = "ktp-send-file-15.08.2.tar.xz"; }; }; ktp-text-ui = { - version = "15.08.1"; + version = "15.08.2"; src = fetchurl { - url = "${mirror}/stable/applications/15.08.1/src/ktp-text-ui-15.08.1.tar.xz"; - sha256 = "1f7r47rbcciq12c5531qb9wr7xqz7nvsy04jk8gaxwdsr9a97ayf"; - name = "ktp-text-ui-15.08.1.tar.xz"; + url = "${mirror}/stable/applications/15.08.2/src/ktp-text-ui-15.08.2.tar.xz"; + sha256 = "074cj52h2admwl8xpjj36jjjlpf199fpasylpga0xval6362vrln"; + name = "ktp-text-ui-15.08.2.tar.xz"; }; }; ktuberling = { - version = "15.08.1"; + version = "15.08.2"; src = fetchurl { - url = "${mirror}/stable/applications/15.08.1/src/ktuberling-15.08.1.tar.xz"; - sha256 = "1y9ifgg2086zz45pj32xxjrgnbsgiq7ajbjl8cybjxcx624j66ic"; - name = "ktuberling-15.08.1.tar.xz"; + url = "${mirror}/stable/applications/15.08.2/src/ktuberling-15.08.2.tar.xz"; + sha256 = "136wnpn04zahmk4q8yymjqix5q6h4w5ibfgp19kr1b2qm721g0p4"; + name = "ktuberling-15.08.2.tar.xz"; }; }; kturtle = { - version = "15.08.1"; + version = "15.08.2"; src = fetchurl { - url = "${mirror}/stable/applications/15.08.1/src/kturtle-15.08.1.tar.xz"; - sha256 = "0n6vbj2kvcby62cn8i65dq2rl5jv1zfp9xbg827s6vz681an2sqk"; - name = "kturtle-15.08.1.tar.xz"; + url = "${mirror}/stable/applications/15.08.2/src/kturtle-15.08.2.tar.xz"; + sha256 = "00wknl5z38jpvsh5zji4v4hf0077c6sl9fvwj5zyb0l033l3sqd4"; + name = "kturtle-15.08.2.tar.xz"; }; }; ktux = { - version = "15.08.1"; + version = "15.08.2"; src = fetchurl { - url = "${mirror}/stable/applications/15.08.1/src/ktux-15.08.1.tar.xz"; - sha256 = "1vw0ybkvrcqcng6sz0hw12bhsspig98m0wjn8phlyljfd5d8p4h3"; - name = "ktux-15.08.1.tar.xz"; + url = "${mirror}/stable/applications/15.08.2/src/ktux-15.08.2.tar.xz"; + sha256 = "0y6brihalwm6v96lin3fbakljgbk5ns2wcwr2bliy3y3g322b5p0"; + name = "ktux-15.08.2.tar.xz"; }; }; kubrick = { - version = "15.08.1"; + version = "15.08.2"; src = fetchurl { - url = "${mirror}/stable/applications/15.08.1/src/kubrick-15.08.1.tar.xz"; - sha256 = "1sanlaz70m1jpaxjwlx2gljh57gg4gdcz7y9g2w191667yk0kq8g"; - name = "kubrick-15.08.1.tar.xz"; + url = "${mirror}/stable/applications/15.08.2/src/kubrick-15.08.2.tar.xz"; + sha256 = "1h7idvf3dn68cfzlsgjbrn8yn1ykdyh9hp9400slb4m4d0qhhlk4"; + name = "kubrick-15.08.2.tar.xz"; }; }; kuser = { - version = "15.08.1"; + version = "15.08.2"; src = fetchurl { - url = "${mirror}/stable/applications/15.08.1/src/kuser-15.08.1.tar.xz"; - sha256 = "0qgvjfh1r4ri227zbcb2v9dg7njg1wq3pi189y0l3jzgfa4h1aph"; - name = "kuser-15.08.1.tar.xz"; + url = "${mirror}/stable/applications/15.08.2/src/kuser-15.08.2.tar.xz"; + sha256 = "0cj60nhsvxqng6q32dzqb9ybns942wvqsa11r52f537v1z5csn6m"; + name = "kuser-15.08.2.tar.xz"; }; }; kwalletmanager = { - version = "15.08.1"; + version = "15.08.2"; src = fetchurl { - url = "${mirror}/stable/applications/15.08.1/src/kwalletmanager-15.08.1.tar.xz"; - sha256 = "1ibfiaglwgqxnsmx1f8pcylv0kzywpd2mvyawcdhcl3yqdpyw4v7"; - name = "kwalletmanager-15.08.1.tar.xz"; + url = "${mirror}/stable/applications/15.08.2/src/kwalletmanager-15.08.2.tar.xz"; + sha256 = "0b7krm8g7r4wmm792rshmxpp2jx6ln323cnk1iqxy3dnfs0wb7zc"; + name = "kwalletmanager-15.08.2.tar.xz"; }; }; kwordquiz = { - version = "15.08.1"; + version = "15.08.2"; src = fetchurl { - url = "${mirror}/stable/applications/15.08.1/src/kwordquiz-15.08.1.tar.xz"; - sha256 = "0b20n7k8ging2gw6l0k09r71ww1dg0fh5y5lqzlzcl8vqhdwkwpp"; - name = "kwordquiz-15.08.1.tar.xz"; + url = "${mirror}/stable/applications/15.08.2/src/kwordquiz-15.08.2.tar.xz"; + sha256 = "032lrfxq6izhxmlg9d1jwz6sakvy2nidgjhaznlzaspag96jhgzv"; + name = "kwordquiz-15.08.2.tar.xz"; }; }; libkcddb = { - version = "15.08.1"; + version = "15.08.2"; src = fetchurl { - url = "${mirror}/stable/applications/15.08.1/src/libkcddb-15.08.1.tar.xz"; - sha256 = "1x26dpr26d6xc73203dbk3vni7hcn1w6jdk94ffs0aaf3bmifal2"; - name = "libkcddb-15.08.1.tar.xz"; + url = "${mirror}/stable/applications/15.08.2/src/libkcddb-15.08.2.tar.xz"; + sha256 = "0kmxxcbjvd2iw0vhypm686pw3whnw14hc3xz224md76cr6wwmizm"; + name = "libkcddb-15.08.2.tar.xz"; }; }; libkcompactdisc = { - version = "15.08.1"; + version = "15.08.2"; src = fetchurl { - url = "${mirror}/stable/applications/15.08.1/src/libkcompactdisc-15.08.1.tar.xz"; - sha256 = "19b6zjzdmjagz9d9x1bb46cc59r92qm9g0pbvim9br603crwsasd"; - name = "libkcompactdisc-15.08.1.tar.xz"; + url = "${mirror}/stable/applications/15.08.2/src/libkcompactdisc-15.08.2.tar.xz"; + sha256 = "10ikmqjj9yjmd1knr7nq51fi3khp38p819qarszwlqj43kfbl61d"; + name = "libkcompactdisc-15.08.2.tar.xz"; }; }; libkdcraw = { - version = "15.08.1"; + version = "15.08.2"; src = fetchurl { - url = "${mirror}/stable/applications/15.08.1/src/libkdcraw-15.08.1.tar.xz"; - sha256 = "0kshhch81sqjlashbh3ww3nz9ahv99f1bsxlrly39rvfa8yg6vpv"; - name = "libkdcraw-15.08.1.tar.xz"; + url = "${mirror}/stable/applications/15.08.2/src/libkdcraw-15.08.2.tar.xz"; + sha256 = "1msfcafj6dj4j2sxrwnlbs1lb4987cffpsqiiwg9imzfgq3c2nwy"; + name = "libkdcraw-15.08.2.tar.xz"; }; }; libkdeedu = { - version = "15.08.1"; + version = "15.08.2"; src = fetchurl { - url = "${mirror}/stable/applications/15.08.1/src/libkdeedu-15.08.1.tar.xz"; - sha256 = "09fv1fbxlf6n4k0fyiy49avykpnxbmvi833i6ibm90v9csrfv6hf"; - name = "libkdeedu-15.08.1.tar.xz"; + url = "${mirror}/stable/applications/15.08.2/src/libkdeedu-15.08.2.tar.xz"; + sha256 = "1s1jn80i5jrdz1rpl6m5y3kq1hb51wynxh67garlfch056dlcyfp"; + name = "libkdeedu-15.08.2.tar.xz"; }; }; libkdegames = { - version = "15.08.1"; + version = "15.08.2"; src = fetchurl { - url = "${mirror}/stable/applications/15.08.1/src/libkdegames-15.08.1.tar.xz"; - sha256 = "0khr3rih3yv2vh9q2dkvdc2r1lpxhky5hmh7gachhyjh0296i9nq"; - name = "libkdegames-15.08.1.tar.xz"; + url = "${mirror}/stable/applications/15.08.2/src/libkdegames-15.08.2.tar.xz"; + sha256 = "020m58lbjnh8h87jp3vdcd3w410d2sl1spc0j9amgjhaq6p5bpmr"; + name = "libkdegames-15.08.2.tar.xz"; }; }; libkeduvocdocument = { - version = "15.08.1"; + version = "15.08.2"; src = fetchurl { - url = "${mirror}/stable/applications/15.08.1/src/libkeduvocdocument-15.08.1.tar.xz"; - sha256 = "0fz8fkcai1zdmqhvcic689sbwm07zg69z7jw4m6wgk7yqls8mkvq"; - name = "libkeduvocdocument-15.08.1.tar.xz"; + url = "${mirror}/stable/applications/15.08.2/src/libkeduvocdocument-15.08.2.tar.xz"; + sha256 = "0yql1yg550q6jcjjsywrg5a0wdd7cwaaci87az75jq6b9mxf5il2"; + name = "libkeduvocdocument-15.08.2.tar.xz"; }; }; libkexiv2 = { - version = "15.08.1"; + version = "15.08.2"; src = fetchurl { - url = "${mirror}/stable/applications/15.08.1/src/libkexiv2-15.08.1.tar.xz"; - sha256 = "0cgbh6g5kqi8lzlnidd19yxlyzid71pncpxikmhqfmnwhdgrqq2f"; - name = "libkexiv2-15.08.1.tar.xz"; + url = "${mirror}/stable/applications/15.08.2/src/libkexiv2-15.08.2.tar.xz"; + sha256 = "03fcd7fk4jxnbadm0v59swvfm5cvsylvf4fgz8m6v1rqk5z5sw10"; + name = "libkexiv2-15.08.2.tar.xz"; }; }; libkface = { - version = "15.08.1"; + version = "15.08.2"; src = fetchurl { - url = "${mirror}/stable/applications/15.08.1/src/libkface-15.08.1.tar.xz"; - sha256 = "0k2rsmnzfyab1x1nyirlhs48c19b2i2f0x60w1igp7b66n6819kd"; - name = "libkface-15.08.1.tar.xz"; + url = "${mirror}/stable/applications/15.08.2/src/libkface-15.08.2.tar.xz"; + sha256 = "1jnfg77nvppzvkas9bik5ciq57qdvjzqwxpk773zzx870bp6n3mi"; + name = "libkface-15.08.2.tar.xz"; }; }; libkgeomap = { - version = "15.08.1"; + version = "15.08.2"; src = fetchurl { - url = "${mirror}/stable/applications/15.08.1/src/libkgeomap-15.08.1.tar.xz"; - sha256 = "18y3pas4bx16ykf50jlwry7fbrx34cz1s0qflirxyrx6n8kh9lgm"; - name = "libkgeomap-15.08.1.tar.xz"; + url = "${mirror}/stable/applications/15.08.2/src/libkgeomap-15.08.2.tar.xz"; + sha256 = "1qpkffs8hyz2ax7xhxy6r5mvm2kndzlis2vwwm2mca5ac5gi10hj"; + name = "libkgeomap-15.08.2.tar.xz"; }; }; libkipi = { - version = "15.08.1"; + version = "15.08.2"; src = fetchurl { - url = "${mirror}/stable/applications/15.08.1/src/libkipi-15.08.1.tar.xz"; - sha256 = "0mmk8zfwffns7gacdjhjh45ki762wpd21nwvgbjclf3rjzgbyxz8"; - name = "libkipi-15.08.1.tar.xz"; + url = "${mirror}/stable/applications/15.08.2/src/libkipi-15.08.2.tar.xz"; + sha256 = "1ryck2mzzy5v50sbs3xzw5g8kxpcj444fizq2bjnn1ffijkrific"; + name = "libkipi-15.08.2.tar.xz"; }; }; libkmahjongg = { - version = "15.08.1"; + version = "15.08.2"; src = fetchurl { - url = "${mirror}/stable/applications/15.08.1/src/libkmahjongg-15.08.1.tar.xz"; - sha256 = "1jpcj2kj9wn6988gzz4csrwy4c2pwbnyi184iq6c39fmbvrv4f2r"; - name = "libkmahjongg-15.08.1.tar.xz"; + url = "${mirror}/stable/applications/15.08.2/src/libkmahjongg-15.08.2.tar.xz"; + sha256 = "0hj9qk9pwqvmrrrs0qq053vz4xw3m9fszvlz9289mqla93xm9kx7"; + name = "libkmahjongg-15.08.2.tar.xz"; }; }; libkomparediff2 = { - version = "15.08.1"; + version = "15.08.2"; src = fetchurl { - url = "${mirror}/stable/applications/15.08.1/src/libkomparediff2-15.08.1.tar.xz"; - sha256 = "1g8j5idy18a4fnc2m9cjg3xzq6kck070yq5ki4l9lbjinrhl3jpr"; - name = "libkomparediff2-15.08.1.tar.xz"; + url = "${mirror}/stable/applications/15.08.2/src/libkomparediff2-15.08.2.tar.xz"; + sha256 = "1myc4fa9nrrszjfl9mg5yxa26pmc0fk2bygbjmsm0glxbvj3yn32"; + name = "libkomparediff2-15.08.2.tar.xz"; }; }; libksane = { - version = "15.08.1"; + version = "15.08.2"; src = fetchurl { - url = "${mirror}/stable/applications/15.08.1/src/libksane-15.08.1.tar.xz"; - sha256 = "0ih4axq0pcpvmgs8x12ad22bxixcccqpkqs160vxl7a29327rbdm"; - name = "libksane-15.08.1.tar.xz"; + url = "${mirror}/stable/applications/15.08.2/src/libksane-15.08.2.tar.xz"; + sha256 = "05c71hkivr14z1gmd2967d3d0r2cccgh7krqra209pyk83xnax7a"; + name = "libksane-15.08.2.tar.xz"; }; }; lokalize = { - version = "15.08.1"; + version = "15.08.2"; src = fetchurl { - url = "${mirror}/stable/applications/15.08.1/src/lokalize-15.08.1.tar.xz"; - sha256 = "15xsx430a9w3kr1abvlh4h3spn063992mc76rq17c7a8n1n7zr4b"; - name = "lokalize-15.08.1.tar.xz"; + url = "${mirror}/stable/applications/15.08.2/src/lokalize-15.08.2.tar.xz"; + sha256 = "15jilc5z3rd6ivaaw1hibsdv367n9zy163xi0b0m9szij5yzbcwd"; + name = "lokalize-15.08.2.tar.xz"; }; }; lskat = { - version = "15.08.1"; + version = "15.08.2"; src = fetchurl { - url = "${mirror}/stable/applications/15.08.1/src/lskat-15.08.1.tar.xz"; - sha256 = "13vhfpi34qcv6q56qaxwk89apss8l921a59qvlmadmw999h7ms0s"; - name = "lskat-15.08.1.tar.xz"; + url = "${mirror}/stable/applications/15.08.2/src/lskat-15.08.2.tar.xz"; + sha256 = "178yl7iwfv8j2kr89m3j4h9advr6sw4kb902hn62gdabp6p695s6"; + name = "lskat-15.08.2.tar.xz"; }; }; marble = { - version = "15.08.1"; + version = "15.08.2"; src = fetchurl { - url = "${mirror}/stable/applications/15.08.1/src/marble-15.08.1.tar.xz"; - sha256 = "0dx0r1hjcfn3mvmsw0wgaw57jkn42166aj97ky0zdhdavkqv4j3j"; - name = "marble-15.08.1.tar.xz"; + url = "${mirror}/stable/applications/15.08.2/src/marble-15.08.2.tar.xz"; + sha256 = "00hv6vvwhw8d2z5zy19iqp2jniknjh75013wxraaz32rpw7n7i53"; + name = "marble-15.08.2.tar.xz"; }; }; mplayerthumbs = { - version = "15.08.1"; + version = "15.08.2"; src = fetchurl { - url = "${mirror}/stable/applications/15.08.1/src/mplayerthumbs-15.08.1.tar.xz"; - sha256 = "01l063iply1d4bfdb04agj11imha4fpnv131dcfd39ixi1icv8yb"; - name = "mplayerthumbs-15.08.1.tar.xz"; + url = "${mirror}/stable/applications/15.08.2/src/mplayerthumbs-15.08.2.tar.xz"; + sha256 = "1i3aqfn8y8nwlwpyg0bi640p6ig4y9fk42m4x62cv8zw3gfq4fyc"; + name = "mplayerthumbs-15.08.2.tar.xz"; }; }; okteta = { - version = "15.08.1"; + version = "15.08.2"; src = fetchurl { - url = "${mirror}/stable/applications/15.08.1/src/okteta-15.08.1.tar.xz"; - sha256 = "14mbfqc61rw2g89shh0ad38ph24c6nrj76qx9g1diazvr3p9sf1j"; - name = "okteta-15.08.1.tar.xz"; + url = "${mirror}/stable/applications/15.08.2/src/okteta-15.08.2.tar.xz"; + sha256 = "0c29linn7i8dx0cf1cr3l69h3galys50hh4fqyskr19c1c1l1nlb"; + name = "okteta-15.08.2.tar.xz"; }; }; okular = { - version = "15.08.1"; + version = "15.08.2"; src = fetchurl { - url = "${mirror}/stable/applications/15.08.1/src/okular-15.08.1.tar.xz"; - sha256 = "0nicpz25srpn9zmwjxrnz8h2ba597ixsqcyhymki465dv5hgx5x7"; - name = "okular-15.08.1.tar.xz"; + url = "${mirror}/stable/applications/15.08.2/src/okular-15.08.2.tar.xz"; + sha256 = "15qn7wsqnc4b8klj1ld7j1xczdrhq66f1xwhcb87v3bccqn4b7zf"; + name = "okular-15.08.2.tar.xz"; }; }; palapeli = { - version = "15.08.1"; + version = "15.08.2"; src = fetchurl { - url = "${mirror}/stable/applications/15.08.1/src/palapeli-15.08.1.tar.xz"; - sha256 = "09sbyw25ngvcg6inhh7ig0x5yyhsi3gw2il1p98sfdabjk2f8736"; - name = "palapeli-15.08.1.tar.xz"; + url = "${mirror}/stable/applications/15.08.2/src/palapeli-15.08.2.tar.xz"; + sha256 = "1izpy143zrzc19gsyl1bgvhxhy83b2cl38qqkrf1jxcynjwy7j33"; + name = "palapeli-15.08.2.tar.xz"; }; }; parley = { - version = "15.08.1"; + version = "15.08.2"; src = fetchurl { - url = "${mirror}/stable/applications/15.08.1/src/parley-15.08.1.tar.xz"; - sha256 = "0f88ia58f9lw8rpz1mgr21hslkmwnwwf2ac0affm81b17nxx8zpc"; - name = "parley-15.08.1.tar.xz"; + url = "${mirror}/stable/applications/15.08.2/src/parley-15.08.2.tar.xz"; + sha256 = "18jmls6il3j7kxhd7zv02r6zk834m4avjq28k0z4j6z9k8paf2a4"; + name = "parley-15.08.2.tar.xz"; }; }; picmi = { - version = "15.08.1"; + version = "15.08.2"; src = fetchurl { - url = "${mirror}/stable/applications/15.08.1/src/picmi-15.08.1.tar.xz"; - sha256 = "16sa0w3bhxbj8f8nl0wh5b639gzi6y45167g3mh62a7di6llw1rm"; - name = "picmi-15.08.1.tar.xz"; + url = "${mirror}/stable/applications/15.08.2/src/picmi-15.08.2.tar.xz"; + sha256 = "168vn7yjkg1cngqb7crfrqz1mjciz0zznd60w38gws0rfdrk2dkr"; + name = "picmi-15.08.2.tar.xz"; }; }; poxml = { - version = "15.08.1"; + version = "15.08.2"; src = fetchurl { - url = "${mirror}/stable/applications/15.08.1/src/poxml-15.08.1.tar.xz"; - sha256 = "076ksfa9pdjbs8xk38j5z1ysryqcq68fgk5zw157cmxjaxv4ahqm"; - name = "poxml-15.08.1.tar.xz"; + url = "${mirror}/stable/applications/15.08.2/src/poxml-15.08.2.tar.xz"; + sha256 = "0ar61p52qikdv403nbfj0bpvzv17zbfskii25bxs3mq46basi6hx"; + name = "poxml-15.08.2.tar.xz"; }; }; print-manager = { - version = "15.08.1"; + version = "15.08.2"; src = fetchurl { - url = "${mirror}/stable/applications/15.08.1/src/print-manager-15.08.1.tar.xz"; - sha256 = "0cy5ga11kk11ca4nzpr6wjb4a342ziaflilc9pz6l3b7r8vhjv09"; - name = "print-manager-15.08.1.tar.xz"; + url = "${mirror}/stable/applications/15.08.2/src/print-manager-15.08.2.tar.xz"; + sha256 = "02fr7h4nym7h6j6kvhcxl51g08fgbda678irx0i81a00i0qzqpph"; + name = "print-manager-15.08.2.tar.xz"; }; }; rocs = { - version = "15.08.1"; + version = "15.08.2"; src = fetchurl { - url = "${mirror}/stable/applications/15.08.1/src/rocs-15.08.1.tar.xz"; - sha256 = "1s3mdi9hqhajryax4yg074dn0h5yq9fq4a8j6ksgg7a2ggl4l8kv"; - name = "rocs-15.08.1.tar.xz"; + url = "${mirror}/stable/applications/15.08.2/src/rocs-15.08.2.tar.xz"; + sha256 = "03h07f2c20gl9yyiqz1mf285dxmc74ifrvg60pp601xwavg4khcv"; + name = "rocs-15.08.2.tar.xz"; }; }; signon-kwallet-extension = { - version = "15.08.1"; + version = "15.08.2"; src = fetchurl { - url = "${mirror}/stable/applications/15.08.1/src/signon-kwallet-extension-15.08.1.tar.xz"; - sha256 = "1pb73zqs34kygvaphgrvvl08hj882znsws1nzwbyyskyn6gjsw2n"; - name = "signon-kwallet-extension-15.08.1.tar.xz"; + url = "${mirror}/stable/applications/15.08.2/src/signon-kwallet-extension-15.08.2.tar.xz"; + sha256 = "1p22vqr5bgjvwjjc2n8xdw71ksvgw6cbykigh3i0cnz3l8sj6xf0"; + name = "signon-kwallet-extension-15.08.2.tar.xz"; }; }; step = { - version = "15.08.1"; + version = "15.08.2"; src = fetchurl { - url = "${mirror}/stable/applications/15.08.1/src/step-15.08.1.tar.xz"; - sha256 = "15capfa297s4shrr6xwbpg62rn8pimwpmjm11p160g6lqdspwacm"; - name = "step-15.08.1.tar.xz"; + url = "${mirror}/stable/applications/15.08.2/src/step-15.08.2.tar.xz"; + sha256 = "1j9kb9mc7byqy3qq4bbcd7cx98dppvpq8k8j1gi4fm71q5jmdhdj"; + name = "step-15.08.2.tar.xz"; }; }; superkaramba = { - version = "15.08.1"; + version = "15.08.2"; src = fetchurl { - url = "${mirror}/stable/applications/15.08.1/src/superkaramba-15.08.1.tar.xz"; - sha256 = "0pk7kr2bcj2yasf9af3bdqg207pidkg5m2yafmvp83dz2anyxad9"; - name = "superkaramba-15.08.1.tar.xz"; + url = "${mirror}/stable/applications/15.08.2/src/superkaramba-15.08.2.tar.xz"; + sha256 = "0xwf040xw0hnd4ky07xi59597mrwh10fkfcpygrb52ai1hjqm8yn"; + name = "superkaramba-15.08.2.tar.xz"; }; }; svgpart = { - version = "15.08.1"; + version = "15.08.2"; src = fetchurl { - url = "${mirror}/stable/applications/15.08.1/src/svgpart-15.08.1.tar.xz"; - sha256 = "10vvnsm7xlgy5fia8l8cz6cgj4xsjshiqkiiwkzlmyzzx081zi57"; - name = "svgpart-15.08.1.tar.xz"; + url = "${mirror}/stable/applications/15.08.2/src/svgpart-15.08.2.tar.xz"; + sha256 = "10kqh2i74a7hyx2vj1bb0zk13sp0hn1jb95bp71gwszyfrg207ky"; + name = "svgpart-15.08.2.tar.xz"; }; }; sweeper = { - version = "15.08.1"; + version = "15.08.2"; src = fetchurl { - url = "${mirror}/stable/applications/15.08.1/src/sweeper-15.08.1.tar.xz"; - sha256 = "08vk9yq7py576irkg34d3rzkdrzi6bb6zhynbyziyx097sqj5khj"; - name = "sweeper-15.08.1.tar.xz"; + url = "${mirror}/stable/applications/15.08.2/src/sweeper-15.08.2.tar.xz"; + sha256 = "1hzscn0d317a41z30qb04xpkgx6iramj2zinrjga53cdsmgjgpq7"; + name = "sweeper-15.08.2.tar.xz"; }; }; syndication = { - version = "15.08.1"; + version = "15.08.2"; src = fetchurl { - url = "${mirror}/stable/applications/15.08.1/src/syndication-15.08.1.tar.xz"; - sha256 = "1kklbw77iiiqfcv8sydy9jkc8g630xw551y6r1jp1wbvrdkjwq47"; - name = "syndication-15.08.1.tar.xz"; + url = "${mirror}/stable/applications/15.08.2/src/syndication-15.08.2.tar.xz"; + sha256 = "07ivknrhc253pcngwqjv6rjixcxc2b3kgwp9nzyiylxd7yp2qlf8"; + name = "syndication-15.08.2.tar.xz"; }; }; umbrello = { - version = "15.08.1"; + version = "15.08.2"; src = fetchurl { - url = "${mirror}/stable/applications/15.08.1/src/umbrello-15.08.1.tar.xz"; - sha256 = "0pq2d4iz1dmxb7cdmcja65703qlsakp590v5yjvhjsnlasnk8anj"; - name = "umbrello-15.08.1.tar.xz"; + url = "${mirror}/stable/applications/15.08.2/src/umbrello-15.08.2.tar.xz"; + sha256 = "15nqd5b340dn6lv1l6whr0bn5hjfw4bh77y7zvji3sgmlzim4vll"; + name = "umbrello-15.08.2.tar.xz"; }; }; zeroconf-ioslave = { - version = "15.08.1"; + version = "15.08.2"; src = fetchurl { - url = "${mirror}/stable/applications/15.08.1/src/zeroconf-ioslave-15.08.1.tar.xz"; - sha256 = "1h8v78b6fb82brpxkhlwyphb830ndzlq4z5llgav1dy7i0v8pd7r"; - name = "zeroconf-ioslave-15.08.1.tar.xz"; + url = "${mirror}/stable/applications/15.08.2/src/zeroconf-ioslave-15.08.2.tar.xz"; + sha256 = "1q16xd6k8ps7zjpsjygpfkx0nqzfplfmn58363598fbvmiq7wq79"; + name = "zeroconf-ioslave-15.08.2.tar.xz"; }; }; } From e76d31616c971a890feae377ec932726c9f7e391 Mon Sep 17 00:00:00 2001 From: Thomas Tuegel Date: Wed, 14 Oct 2015 06:32:29 -0500 Subject: [PATCH 044/162] kservice: update patches --- .../0001-qdiriterator-follow-symlinks.patch | 25 +++++++++++++++++++ .../kservice/0002-no-canonicalize-path.patch | 25 +++++++++++++++++++ .../kde-frameworks-5.15/kservice/default.nix | 4 +-- ...service-kbuildsycoca-follow-symlinks.patch | 13 ---------- ...ce-kbuildsycoca-no-canonicalize-path.patch | 13 ---------- 5 files changed, 52 insertions(+), 28 deletions(-) create mode 100644 pkgs/development/libraries/kde-frameworks-5.15/kservice/0001-qdiriterator-follow-symlinks.patch create mode 100644 pkgs/development/libraries/kde-frameworks-5.15/kservice/0002-no-canonicalize-path.patch delete mode 100644 pkgs/development/libraries/kde-frameworks-5.15/kservice/kservice-kbuildsycoca-follow-symlinks.patch delete mode 100644 pkgs/development/libraries/kde-frameworks-5.15/kservice/kservice-kbuildsycoca-no-canonicalize-path.patch diff --git a/pkgs/development/libraries/kde-frameworks-5.15/kservice/0001-qdiriterator-follow-symlinks.patch b/pkgs/development/libraries/kde-frameworks-5.15/kservice/0001-qdiriterator-follow-symlinks.patch new file mode 100644 index 000000000000..3d8397d8ee2d --- /dev/null +++ b/pkgs/development/libraries/kde-frameworks-5.15/kservice/0001-qdiriterator-follow-symlinks.patch @@ -0,0 +1,25 @@ +From ae8919eb81abad369e4a26ffcd845b140983398d Mon Sep 17 00:00:00 2001 +From: Thomas Tuegel +Date: Wed, 14 Oct 2015 06:28:57 -0500 +Subject: [PATCH 1/2] qdiriterator follow symlinks + +--- + src/sycoca/kbuildsycoca.cpp | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/src/sycoca/kbuildsycoca.cpp b/src/sycoca/kbuildsycoca.cpp +index 1deae14..250baa8 100644 +--- a/src/sycoca/kbuildsycoca.cpp ++++ b/src/sycoca/kbuildsycoca.cpp +@@ -208,7 +208,7 @@ bool KBuildSycoca::build() + QStringList relFiles; + const QStringList dirs = QStandardPaths::locateAll(QStandardPaths::GenericDataLocation, m_resourceSubdir, QStandardPaths::LocateDirectory); + Q_FOREACH (const QString &dir, dirs) { +- QDirIterator it(dir, QDirIterator::Subdirectories); ++ QDirIterator it(dir, QDirIterator::Subdirectories | QDirIterator::FollowSymlinks); + while (it.hasNext()) { + const QString filePath = it.next(); + Q_ASSERT(filePath.startsWith(dir)); // due to the line below... +-- +2.5.2 + diff --git a/pkgs/development/libraries/kde-frameworks-5.15/kservice/0002-no-canonicalize-path.patch b/pkgs/development/libraries/kde-frameworks-5.15/kservice/0002-no-canonicalize-path.patch new file mode 100644 index 000000000000..685c68526119 --- /dev/null +++ b/pkgs/development/libraries/kde-frameworks-5.15/kservice/0002-no-canonicalize-path.patch @@ -0,0 +1,25 @@ +From 46d124da602d84b7611a7ff0ac0862168d451cdb Mon Sep 17 00:00:00 2001 +From: Thomas Tuegel +Date: Wed, 14 Oct 2015 06:31:29 -0500 +Subject: [PATCH 2/2] no canonicalize path + +--- + src/sycoca/vfolder_menu.cpp | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/src/sycoca/vfolder_menu.cpp b/src/sycoca/vfolder_menu.cpp +index d3e31c3..d15d743 100644 +--- a/src/sycoca/vfolder_menu.cpp ++++ b/src/sycoca/vfolder_menu.cpp +@@ -415,7 +415,7 @@ VFolderMenu::absoluteDir(const QString &_dir, const QString &baseDir, bool keepR + } + + if (!relative) { +- QString resolved = QDir(dir).canonicalPath(); ++ QString resolved = QDir::cleanPath(dir); + if (!resolved.isEmpty()) { + dir = resolved; + } +-- +2.5.2 + diff --git a/pkgs/development/libraries/kde-frameworks-5.15/kservice/default.nix b/pkgs/development/libraries/kde-frameworks-5.15/kservice/default.nix index ba1bd03f9df6..ab017ce402ab 100644 --- a/pkgs/development/libraries/kde-frameworks-5.15/kservice/default.nix +++ b/pkgs/development/libraries/kde-frameworks-5.15/kservice/default.nix @@ -9,8 +9,8 @@ kdeFramework { buildInputs = [ kcoreaddons kcrash kdbusaddons ]; propagatedBuildInputs = [ kconfig ki18n kwindowsystem ]; patches = [ - ./kservice-kbuildsycoca-follow-symlinks.patch - ./kservice-kbuildsycoca-no-canonicalize-path.patch + ./0001-qdiriterator-follow-symlinks.patch + ./0002-no-canonicalize-path.patch ]; meta = { maintainers = [ lib.maintainers.ttuegel ]; diff --git a/pkgs/development/libraries/kde-frameworks-5.15/kservice/kservice-kbuildsycoca-follow-symlinks.patch b/pkgs/development/libraries/kde-frameworks-5.15/kservice/kservice-kbuildsycoca-follow-symlinks.patch deleted file mode 100644 index e9bc418544ab..000000000000 --- a/pkgs/development/libraries/kde-frameworks-5.15/kservice/kservice-kbuildsycoca-follow-symlinks.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/src/kbuildsycoca/kbuildsycoca.cpp b/src/kbuildsycoca/kbuildsycoca.cpp -index 69b1427..9c37a49 100644 ---- a/src/kbuildsycoca/kbuildsycoca.cpp -+++ b/src/kbuildsycoca/kbuildsycoca.cpp -@@ -227,7 +227,7 @@ bool KBuildSycoca::build() - QStringList relFiles; - const QStringList dirs = QStandardPaths::locateAll(QStandardPaths::GenericDataLocation, g_resourceSubdir, QStandardPaths::LocateDirectory); - Q_FOREACH (const QString &dir, dirs) { -- QDirIterator it(dir, QDirIterator::Subdirectories); -+ QDirIterator it(dir, QDirIterator::Subdirectories | QDirIterator::FollowSymlinks); - while (it.hasNext()) { - const QString filePath = it.next(); - Q_ASSERT(filePath.startsWith(dir)); // due to the line below... diff --git a/pkgs/development/libraries/kde-frameworks-5.15/kservice/kservice-kbuildsycoca-no-canonicalize-path.patch b/pkgs/development/libraries/kde-frameworks-5.15/kservice/kservice-kbuildsycoca-no-canonicalize-path.patch deleted file mode 100644 index 7e21ebfe86f2..000000000000 --- a/pkgs/development/libraries/kde-frameworks-5.15/kservice/kservice-kbuildsycoca-no-canonicalize-path.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/src/kbuildsycoca/vfolder_menu.cpp b/src/kbuildsycoca/vfolder_menu.cpp -index 2eb1275..e39a36f 100644 ---- a/src/kbuildsycoca/vfolder_menu.cpp -+++ b/src/kbuildsycoca/vfolder_menu.cpp -@@ -412,7 +412,7 @@ VFolderMenu::absoluteDir(const QString &_dir, const QString &baseDir, bool keepR - } - - if (!relative) { -- QString resolved = QDir(dir).canonicalPath(); -+ QString resolved = QDir::cleanPath(dir); - if (!resolved.isEmpty()) { - dir = resolved; - } From ed4170f4f56d67052fbeba7824171dc2bbde68d7 Mon Sep 17 00:00:00 2001 From: Thomas Tuegel Date: Wed, 14 Oct 2015 06:45:24 -0500 Subject: [PATCH 045/162] kcmutils: update patches --- ...=> 0001-qdiriterator-follow-symlinks.patch} | 18 +++++++++++++++--- .../kde-frameworks-5.15/kcmutils/default.nix | 2 +- 2 files changed, 16 insertions(+), 4 deletions(-) rename pkgs/development/libraries/kde-frameworks-5.15/kcmutils/{kcmutils-pluginselector-follow-symlinks.patch => 0001-qdiriterator-follow-symlinks.patch} (53%) diff --git a/pkgs/development/libraries/kde-frameworks-5.15/kcmutils/kcmutils-pluginselector-follow-symlinks.patch b/pkgs/development/libraries/kde-frameworks-5.15/kcmutils/0001-qdiriterator-follow-symlinks.patch similarity index 53% rename from pkgs/development/libraries/kde-frameworks-5.15/kcmutils/kcmutils-pluginselector-follow-symlinks.patch rename to pkgs/development/libraries/kde-frameworks-5.15/kcmutils/0001-qdiriterator-follow-symlinks.patch index 47b8dfad1800..0d861fa95012 100644 --- a/pkgs/development/libraries/kde-frameworks-5.15/kcmutils/kcmutils-pluginselector-follow-symlinks.patch +++ b/pkgs/development/libraries/kde-frameworks-5.15/kcmutils/0001-qdiriterator-follow-symlinks.patch @@ -1,13 +1,25 @@ +From f14d2a275323a47104b33eb61c5b6910ae1a9f59 Mon Sep 17 00:00:00 2001 +From: Thomas Tuegel +Date: Wed, 14 Oct 2015 06:43:53 -0500 +Subject: [PATCH] qdiriterator follow symlinks + +--- + src/kpluginselector.cpp | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + diff --git a/src/kpluginselector.cpp b/src/kpluginselector.cpp -index c63241b..2243f94 100644 +index 9c3431d..d6b1ee2 100644 --- a/src/kpluginselector.cpp +++ b/src/kpluginselector.cpp -@@ -304,7 +304,7 @@ void KPluginSelector::addPlugins(const QString &componentName, +@@ -305,7 +305,7 @@ void KPluginSelector::addPlugins(const QString &componentName, QStringList desktopFileNames; const QStringList dirs = QStandardPaths::locateAll(QStandardPaths::GenericDataLocation, componentName + QStringLiteral("/kpartplugins"), QStandardPaths::LocateDirectory); Q_FOREACH (const QString &dir, dirs) { - QDirIterator it(dir, QStringList() << QStringLiteral("*.desktop"), QDir::NoFilter, QDirIterator::Subdirectories); -+ QDirIterator it(dir, QStringList() << QStringLiteral("*.desktop"), QDir::NoFilter, QDirIterator::Subdirectories | QDirIterator::FollowSymlinks); ++ QDirIterator it(dir, QStringList() << QStringLiteral("*.desktop"), QDir::NoFilter, QDirIterator::Subdirectories | QDirIterator::FollowSymlinks); while (it.hasNext()) { desktopFileNames.append(it.next()); } +-- +2.5.2 + diff --git a/pkgs/development/libraries/kde-frameworks-5.15/kcmutils/default.nix b/pkgs/development/libraries/kde-frameworks-5.15/kcmutils/default.nix index a0eb805e62b5..dbbb783ac615 100644 --- a/pkgs/development/libraries/kde-frameworks-5.15/kcmutils/default.nix +++ b/pkgs/development/libraries/kde-frameworks-5.15/kcmutils/default.nix @@ -10,7 +10,7 @@ kdeFramework { kcoreaddons kiconthemes kitemviews kpackage kxmlgui ]; propagatedBuildInputs = [ kconfigwidgets kdeclarative ki18n kservice ]; - patches = [ ./kcmutils-pluginselector-follow-symlinks.patch ]; + patches = [ ./0001-qdiriterator-follow-symlinks.patch ]; meta = { maintainers = [ lib.maintainers.ttuegel ]; }; From 30a476c311f88efb570db6d1333b91f6464f206a Mon Sep 17 00:00:00 2001 From: Thomas Tuegel Date: Wed, 14 Oct 2015 06:48:09 -0500 Subject: [PATCH 046/162] kconfigwidgets: update patches --- ...patch => 0001-qdiriterator-follow-symlinks.patch} | 12 ++++++++++++ .../kde-frameworks-5.15/kconfigwidgets/default.nix | 2 +- 2 files changed, 13 insertions(+), 1 deletion(-) rename pkgs/development/libraries/kde-frameworks-5.15/kconfigwidgets/{kconfigwidgets-helpclient-follow-symlinks.patch => 0001-qdiriterator-follow-symlinks.patch} (74%) diff --git a/pkgs/development/libraries/kde-frameworks-5.15/kconfigwidgets/kconfigwidgets-helpclient-follow-symlinks.patch b/pkgs/development/libraries/kde-frameworks-5.15/kconfigwidgets/0001-qdiriterator-follow-symlinks.patch similarity index 74% rename from pkgs/development/libraries/kde-frameworks-5.15/kconfigwidgets/kconfigwidgets-helpclient-follow-symlinks.patch rename to pkgs/development/libraries/kde-frameworks-5.15/kconfigwidgets/0001-qdiriterator-follow-symlinks.patch index 3bd946cbd842..7a6c0ee90534 100644 --- a/pkgs/development/libraries/kde-frameworks-5.15/kconfigwidgets/kconfigwidgets-helpclient-follow-symlinks.patch +++ b/pkgs/development/libraries/kde-frameworks-5.15/kconfigwidgets/0001-qdiriterator-follow-symlinks.patch @@ -1,3 +1,12 @@ +From 4f84780893d505b2d62a14633dd983baa8ec6e28 Mon Sep 17 00:00:00 2001 +From: Thomas Tuegel +Date: Wed, 14 Oct 2015 06:47:01 -0500 +Subject: [PATCH] qdiriterator follow symlinks + +--- + src/khelpclient.cpp | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + diff --git a/src/khelpclient.cpp b/src/khelpclient.cpp index 53a331e..80fbb01 100644 --- a/src/khelpclient.cpp @@ -11,3 +20,6 @@ index 53a331e..80fbb01 100644 while (it.hasNext()) { const QString desktopPath(it.next()); KDesktopFile desktopFile(desktopPath); +-- +2.5.2 + diff --git a/pkgs/development/libraries/kde-frameworks-5.15/kconfigwidgets/default.nix b/pkgs/development/libraries/kde-frameworks-5.15/kconfigwidgets/default.nix index 580914934b67..39315d9616bd 100644 --- a/pkgs/development/libraries/kde-frameworks-5.15/kconfigwidgets/default.nix +++ b/pkgs/development/libraries/kde-frameworks-5.15/kconfigwidgets/default.nix @@ -7,7 +7,7 @@ kdeFramework { nativeBuildInputs = [ extra-cmake-modules kdoctools ]; buildInputs = [ kguiaddons ]; propagatedBuildInputs = [ kauth kconfig kcodecs ki18n kwidgetsaddons ]; - patches = [ ./kconfigwidgets-helpclient-follow-symlinks.patch ]; + patches = [ ./0001-qdiriterator-follow-symlinks.patch ]; postInstall = '' wrapKDEProgram "$out/bin/preparetips5" ''; From e6c8cffd7a2466e6b23e1d71e22970a77639e1a3 Mon Sep 17 00:00:00 2001 From: Thomas Tuegel Date: Wed, 14 Oct 2015 06:51:23 -0500 Subject: [PATCH 047/162] kpackage: update patches --- .../kpackage/0001-allow-external-paths.patch | 10 ++--- .../0002-qdiriterator-follow-symlinks.patch | 39 +++++++++++++++++++ .../kde-frameworks-5.15/kpackage/default.nix | 5 ++- 3 files changed, 48 insertions(+), 6 deletions(-) create mode 100644 pkgs/development/libraries/kde-frameworks-5.15/kpackage/0002-qdiriterator-follow-symlinks.patch diff --git a/pkgs/development/libraries/kde-frameworks-5.15/kpackage/0001-allow-external-paths.patch b/pkgs/development/libraries/kde-frameworks-5.15/kpackage/0001-allow-external-paths.patch index 440e979c0086..beede4d7ccb5 100644 --- a/pkgs/development/libraries/kde-frameworks-5.15/kpackage/0001-allow-external-paths.patch +++ b/pkgs/development/libraries/kde-frameworks-5.15/kpackage/0001-allow-external-paths.patch @@ -1,17 +1,17 @@ -From fbf10d2059fa1f19a0f0cfa2fda0abb6c435fa78 Mon Sep 17 00:00:00 2001 +From a92ac391b4e6ca335bd7fa78f1addd23c9467931 Mon Sep 17 00:00:00 2001 From: Thomas Tuegel Date: Wed, 28 Jan 2015 07:15:30 -0600 -Subject: [PATCH] allow external paths +Subject: [PATCH 1/2] allow external paths --- src/kpackage/package.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/kpackage/package.cpp b/src/kpackage/package.cpp -index eb4a09b..f70f1a1 100644 +index 539b21a..977a026 100644 --- a/src/kpackage/package.cpp +++ b/src/kpackage/package.cpp -@@ -758,7 +758,7 @@ PackagePrivate::PackagePrivate() +@@ -789,7 +789,7 @@ PackagePrivate::PackagePrivate() : QSharedData(), fallbackPackage(0), metadata(0), @@ -21,5 +21,5 @@ index eb4a09b..f70f1a1 100644 checkedValid(false) { -- -2.1.4 +2.5.2 diff --git a/pkgs/development/libraries/kde-frameworks-5.15/kpackage/0002-qdiriterator-follow-symlinks.patch b/pkgs/development/libraries/kde-frameworks-5.15/kpackage/0002-qdiriterator-follow-symlinks.patch new file mode 100644 index 000000000000..6e93fca9b21d --- /dev/null +++ b/pkgs/development/libraries/kde-frameworks-5.15/kpackage/0002-qdiriterator-follow-symlinks.patch @@ -0,0 +1,39 @@ +From 9fc26c3c0478eb7cb0a531836ba2e3a85d820c88 Mon Sep 17 00:00:00 2001 +From: Thomas Tuegel +Date: Wed, 14 Oct 2015 06:50:28 -0500 +Subject: [PATCH 2/2] qdiriterator follow symlinks + +--- + src/kpackage/packageloader.cpp | 2 +- + src/kpackage/private/packagejobthread.cpp | 2 +- + 2 files changed, 2 insertions(+), 2 deletions(-) + +diff --git a/src/kpackage/packageloader.cpp b/src/kpackage/packageloader.cpp +index eb5ed47..94217f6 100644 +--- a/src/kpackage/packageloader.cpp ++++ b/src/kpackage/packageloader.cpp +@@ -241,7 +241,7 @@ QList PackageLoader::listPackages(const QString &packageFormat, + } else { + //qDebug() << "Not cached"; + // If there's no cache file, fall back to listing the directory +- const QDirIterator::IteratorFlags flags = QDirIterator::Subdirectories; ++ const QDirIterator::IteratorFlags flags = QDirIterator::Subdirectories | QDirIterator::FollowSymlinks; + const QStringList nameFilters = QStringList(QStringLiteral("metadata.desktop")); + + QDirIterator it(plugindir, nameFilters, QDir::Files, flags); +diff --git a/src/kpackage/private/packagejobthread.cpp b/src/kpackage/private/packagejobthread.cpp +index ca523b3..1cfa792 100644 +--- a/src/kpackage/private/packagejobthread.cpp ++++ b/src/kpackage/private/packagejobthread.cpp +@@ -145,7 +145,7 @@ bool indexDirectory(const QString& dir, const QString& dest) + QJsonArray plugins; + + int i = 0; +- QDirIterator it(dir, QStringList()< Date: Wed, 14 Oct 2015 07:06:08 -0500 Subject: [PATCH 048/162] kwin: update patches --- ...h => 0001-qdiriterator-follow-symlinks.patch} | 16 ++++++++++++++-- pkgs/desktops/plasma-5.4/kwin/default.nix | 2 +- 2 files changed, 15 insertions(+), 3 deletions(-) rename pkgs/desktops/plasma-5.4/kwin/{kwin-import-plugin-follow-symlinks.patch => 0001-qdiriterator-follow-symlinks.patch} (59%) diff --git a/pkgs/desktops/plasma-5.4/kwin/kwin-import-plugin-follow-symlinks.patch b/pkgs/desktops/plasma-5.4/kwin/0001-qdiriterator-follow-symlinks.patch similarity index 59% rename from pkgs/desktops/plasma-5.4/kwin/kwin-import-plugin-follow-symlinks.patch rename to pkgs/desktops/plasma-5.4/kwin/0001-qdiriterator-follow-symlinks.patch index fd1f35d717e3..797a32fc5f83 100644 --- a/pkgs/desktops/plasma-5.4/kwin/kwin-import-plugin-follow-symlinks.patch +++ b/pkgs/desktops/plasma-5.4/kwin/0001-qdiriterator-follow-symlinks.patch @@ -1,8 +1,17 @@ +From 78a4b554187c18fd86b62089f7730c4273fadd4c Mon Sep 17 00:00:00 2001 +From: Thomas Tuegel +Date: Wed, 14 Oct 2015 07:05:22 -0500 +Subject: [PATCH] qdiriterator follow symlinks + +--- + clients/aurorae/src/aurorae.cpp | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + diff --git a/clients/aurorae/src/aurorae.cpp b/clients/aurorae/src/aurorae.cpp -index 26b44a9..d14e226 100644 +index 781c960..ad5f420 100644 --- a/clients/aurorae/src/aurorae.cpp +++ b/clients/aurorae/src/aurorae.cpp -@@ -73,7 +73,7 @@ void AuroraeFactory::init() +@@ -211,7 +211,7 @@ void Helper::init() // so let's try to locate our plugin: QString pluginPath; for (const QString &path : m_engine->importPathList()) { @@ -11,3 +20,6 @@ index 26b44a9..d14e226 100644 while (it.hasNext()) { it.next(); QFileInfo fileInfo = it.fileInfo(); +-- +2.5.2 + diff --git a/pkgs/desktops/plasma-5.4/kwin/default.nix b/pkgs/desktops/plasma-5.4/kwin/default.nix index 626859e6e23e..6afdf33e1bba 100644 --- a/pkgs/desktops/plasma-5.4/kwin/default.nix +++ b/pkgs/desktops/plasma-5.4/kwin/default.nix @@ -23,7 +23,7 @@ plasmaPackage { kactivities kdeclarative kglobalaccel ki18n kio kwindowsystem plasma-framework qtdeclarative qtx11extras ]; - patches = [ ./kwin-import-plugin-follow-symlinks.patch ]; + patches = [ ./0001-qdiriterator-follow-symlinks.patch ]; postInstall = '' wrapKDEProgram "$out/bin/kwin_x11" wrapKDEProgram "$out/bin/kwin_wayland" From f416ba4833c9c4b66833846811b04129fcaf1101 Mon Sep 17 00:00:00 2001 From: Thomas Tuegel Date: Wed, 14 Oct 2015 07:09:03 -0500 Subject: [PATCH 049/162] libksysguard: follow symlinks --- pkgs/desktops/plasma-5.4/default.nix | 2 +- .../0001-qdiriterator-follow-symlinks.patch | 25 +++++++++++++++++++ .../default.nix} | 1 + 3 files changed, 27 insertions(+), 1 deletion(-) create mode 100644 pkgs/desktops/plasma-5.4/libksysguard/0001-qdiriterator-follow-symlinks.patch rename pkgs/desktops/plasma-5.4/{libksysguard.nix => libksysguard/default.nix} (90%) diff --git a/pkgs/desktops/plasma-5.4/default.nix b/pkgs/desktops/plasma-5.4/default.nix index af2602c9afd0..61a06421c3dd 100644 --- a/pkgs/desktops/plasma-5.4/default.nix +++ b/pkgs/desktops/plasma-5.4/default.nix @@ -66,7 +66,7 @@ let kwin = callPackage ./kwin {}; kwrited = callPackage ./kwrited.nix {}; libkscreen = callPackage ./libkscreen {}; - libksysguard = callPackage ./libksysguard.nix {}; + libksysguard = callPackage ./libksysguard {}; milou = callPackage ./milou.nix {}; oxygen = callPackage ./oxygen.nix {}; oxygen-fonts = callPackage ./oxygen-fonts.nix {}; diff --git a/pkgs/desktops/plasma-5.4/libksysguard/0001-qdiriterator-follow-symlinks.patch b/pkgs/desktops/plasma-5.4/libksysguard/0001-qdiriterator-follow-symlinks.patch new file mode 100644 index 000000000000..fbbb11ae7556 --- /dev/null +++ b/pkgs/desktops/plasma-5.4/libksysguard/0001-qdiriterator-follow-symlinks.patch @@ -0,0 +1,25 @@ +From 46164a50de4102d02ae9d1d480acdd4b12303db8 Mon Sep 17 00:00:00 2001 +From: Thomas Tuegel +Date: Wed, 14 Oct 2015 07:07:22 -0500 +Subject: [PATCH] qdiriterator follow symlinks + +--- + processui/scripting.cpp | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/processui/scripting.cpp b/processui/scripting.cpp +index efed8ff..841761a 100644 +--- a/processui/scripting.cpp ++++ b/processui/scripting.cpp +@@ -167,7 +167,7 @@ void Scripting::loadContextMenu() { + QStringList scripts; + const QStringList dirs = QStandardPaths::locateAll(QStandardPaths::GenericDataLocation, "ksysguard/scripts/", QStandardPaths::LocateDirectory); + Q_FOREACH (const QString& dir, dirs) { +- QDirIterator it(dir, QStringList() << QStringLiteral("*.desktop"), QDir::NoFilter, QDirIterator::Subdirectories); ++ QDirIterator it(dir, QStringList() << QStringLiteral("*.desktop"), QDir::NoFilter, QDirIterator::Subdirectories | QDirIterator::FollowSymlinks); + while (it.hasNext()) { + scripts.append(it.next()); + } +-- +2.5.2 + diff --git a/pkgs/desktops/plasma-5.4/libksysguard.nix b/pkgs/desktops/plasma-5.4/libksysguard/default.nix similarity index 90% rename from pkgs/desktops/plasma-5.4/libksysguard.nix rename to pkgs/desktops/plasma-5.4/libksysguard/default.nix index 81e59975db2e..373221b2b305 100644 --- a/pkgs/desktops/plasma-5.4/libksysguard.nix +++ b/pkgs/desktops/plasma-5.4/libksysguard/default.nix @@ -6,6 +6,7 @@ plasmaPackage { name = "libksysguard"; + patches = [ ./0001-qdiriterator-follow-symlinks.patch ]; nativeBuildInputs = [ extra-cmake-modules ]; From 4523689157ce616ea56952057281327b30aaa4bf Mon Sep 17 00:00:00 2001 From: Thomas Tuegel Date: Wed, 14 Oct 2015 08:52:06 -0500 Subject: [PATCH 050/162] baloo: baloo-monitor removed --- pkgs/development/libraries/kde-frameworks-5.15/baloo.nix | 1 - 1 file changed, 1 deletion(-) diff --git a/pkgs/development/libraries/kde-frameworks-5.15/baloo.nix b/pkgs/development/libraries/kde-frameworks-5.15/baloo.nix index ce8a7a40e3d7..adfe7894f8da 100644 --- a/pkgs/development/libraries/kde-frameworks-5.15/baloo.nix +++ b/pkgs/development/libraries/kde-frameworks-5.15/baloo.nix @@ -18,7 +18,6 @@ kdeFramework { wrapKDEProgram "$out/bin/balooctl" wrapKDEProgram "$out/bin/baloosearch" wrapKDEProgram "$out/bin/balooshow" - wrapKDEProgram "$out/bin/baloo-monitor" ''; meta = { maintainers = [ lib.maintainers.ttuegel ]; From 895100ef91690e2b68c12a0d201c923fee08b441 Mon Sep 17 00:00:00 2001 From: Thomas Tuegel Date: Wed, 14 Oct 2015 09:09:41 -0500 Subject: [PATCH 051/162] ktexteditor: update patches --- .../ktexteditor/0001-no-qcoreapplication.patch | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/pkgs/development/libraries/kde-frameworks-5.15/ktexteditor/0001-no-qcoreapplication.patch b/pkgs/development/libraries/kde-frameworks-5.15/ktexteditor/0001-no-qcoreapplication.patch index c2e77a537c5a..def55bff9b23 100644 --- a/pkgs/development/libraries/kde-frameworks-5.15/ktexteditor/0001-no-qcoreapplication.patch +++ b/pkgs/development/libraries/kde-frameworks-5.15/ktexteditor/0001-no-qcoreapplication.patch @@ -1,6 +1,6 @@ -From 71e28c7c6fdd1142f04c662f45cc8f779e457cda Mon Sep 17 00:00:00 2001 +From dc50fffdc72b76498384ce2f9065c3757b786d71 Mon Sep 17 00:00:00 2001 From: Thomas Tuegel -Date: Sun, 15 Feb 2015 19:09:17 -0600 +Date: Wed, 14 Oct 2015 09:08:59 -0500 Subject: [PATCH] no qcoreapplication --- @@ -8,16 +8,16 @@ Subject: [PATCH] no qcoreapplication 1 file changed, 4 insertions(+), 7 deletions(-) diff --git a/src/syntax/data/katehighlightingindexer.cpp b/src/syntax/data/katehighlightingindexer.cpp -index 3f02e8c..d1a865b 100644 +index 3c63140..e3d5efe 100644 --- a/src/syntax/data/katehighlightingindexer.cpp +++ b/src/syntax/data/katehighlightingindexer.cpp -@@ -49,19 +49,16 @@ QStringList readListing(const QString &fileName) +@@ -51,19 +51,16 @@ QStringList readListing(const QString &fileName) int main(int argc, char *argv[]) { - // get app instance - QCoreApplication app(argc, argv); -- +- // ensure enough arguments are passed - if (app.arguments().size() < 3) + if (argc < 3) @@ -34,9 +34,9 @@ index 3f02e8c..d1a865b 100644 if (hlFilenamesListing.isEmpty()) { return 1; } -@@ -127,7 +124,7 @@ int main(int argc, char *argv[]) +@@ -147,7 +144,7 @@ int main(int argc, char *argv[]) return anyError; - + // create outfile, after all has worked! - QFile outFile(app.arguments().at(1)); + QFile outFile(QString::fromLocal8Bit(argv[1])); @@ -44,5 +44,5 @@ index 3f02e8c..d1a865b 100644 return 7; -- -2.1.4 +2.5.2 From d57e50d840589db867397cac29d1fd88092fbfd9 Mon Sep 17 00:00:00 2001 From: Thomas Tuegel Date: Wed, 14 Oct 2015 09:44:10 -0500 Subject: [PATCH 052/162] separate makeQtWrapper from qtbase setup-hook --- pkgs/applications/audio/cantata/default.nix | 6 ++- pkgs/applications/audio/dfasma/default.nix | 4 +- .../audio/sonic-visualiser/default.nix | 4 +- .../display-managers/sddm/default.nix | 4 +- .../misc/cool-retro-term/default.nix | 5 +- .../libraries/qt-5/5.5/default.nix | 4 +- .../libraries/qt-5/5.5/make-qt-wrapper.sh | 52 +++++++++++++++++++ .../libraries/qt-5/5.5/qtbase/setup-hook.sh | 32 ------------ 8 files changed, 70 insertions(+), 41 deletions(-) create mode 100644 pkgs/development/libraries/qt-5/5.5/make-qt-wrapper.sh diff --git a/pkgs/applications/audio/cantata/default.nix b/pkgs/applications/audio/cantata/default.nix index fa0fe73ebae3..2d399ba44da3 100644 --- a/pkgs/applications/audio/cantata/default.nix +++ b/pkgs/applications/audio/cantata/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchurl, cmake , withQt4 ? false, qt4 -, withQt5 ? true, qtbase, qtsvg, qttools +, withQt5 ? true, qtbase, qtsvg, qttools, makeQtWrapper # I'm unable to make KDE work here, crashes at runtime so I simply # make Qt4 the default until someone who wants KDE can figure it out. @@ -68,6 +68,8 @@ stdenv.mkDerivation rec { ++ stdenv.lib.optional withMusicbrainz libmusicbrainz5 ++ stdenv.lib.optional (withTaglib && !withKDE4 && withDevices) udisks2; + nativeBuildInputs = stdenv.lib.optional withQt5 makeQtWrapper; + unpackPhase = "tar -xvf $src"; sourceRoot = "${name}"; @@ -91,7 +93,7 @@ stdenv.mkDerivation rec { "-DENABLE_UDISKS2=ON" ]; - postInstall = '' + postInstall = stdenv.lib.optionalString withQt5 '' wrapQtProgram "$out/bin/cantata" ''; diff --git a/pkgs/applications/audio/dfasma/default.nix b/pkgs/applications/audio/dfasma/default.nix index d439f344f5ba..9be3fff6ecbd 100644 --- a/pkgs/applications/audio/dfasma/default.nix +++ b/pkgs/applications/audio/dfasma/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, fftw, libsndfile, qtbase, qtmultimedia }: +{ stdenv, fetchFromGitHub, fftw, libsndfile, qtbase, qtmultimedia, makeQtWrapper }: let @@ -41,6 +41,8 @@ in stdenv.mkDerivation { buildInputs = [ fftw libsndfile qtbase qtmultimedia ]; + nativeBuildInputs = [ makeQtWrapper ]; + postPatch = '' substituteInPlace dfasma.pro --replace '$$DFASMAVERSIONGITPRO' '${version}' cp -Rv "${reaperFork.src}"/* external/REAPER diff --git a/pkgs/applications/audio/sonic-visualiser/default.nix b/pkgs/applications/audio/sonic-visualiser/default.nix index bef2006d60b2..ae7a39240a54 100644 --- a/pkgs/applications/audio/sonic-visualiser/default.nix +++ b/pkgs/applications/audio/sonic-visualiser/default.nix @@ -2,7 +2,7 @@ { stdenv, fetchurl, alsaLib, bzip2, fftw, libjack2, libX11, liblo , libmad, libogg, librdf, librdf_raptor, librdf_rasqal, libsamplerate -, libsndfile, pkgconfig, libpulseaudio, qtbase, redland +, libsndfile, pkgconfig, libpulseaudio, makeQtWrapper, qtbase, redland , rubberband, serd, sord, vampSDK, fftwFloat }: @@ -32,6 +32,8 @@ stdenv.mkDerivation rec { libX11 ]; + nativeBuildInputs = [ makeQtWrapper ]; + buildPhase = '' for i in sonic-visualiser svapp svcore svgui; do cd $i && qmake -makefile PREFIX=$out && cd ..; diff --git a/pkgs/applications/display-managers/sddm/default.nix b/pkgs/applications/display-managers/sddm/default.nix index aad4bccb4181..97bda43166aa 100644 --- a/pkgs/applications/display-managers/sddm/default.nix +++ b/pkgs/applications/display-managers/sddm/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchpatch, makeWrapper, fetchFromGitHub, cmake, pkgconfig, libxcb, libpthreadstubs +{ stdenv, fetchpatch, makeQtWrapper, fetchFromGitHub, cmake, pkgconfig, libxcb, libpthreadstubs , libXdmcp, libXau, qtbase, qtdeclarative, qttools, pam, systemd }: let @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { patches = [ ./sddm-ignore-config-mtime.patch ]; - nativeBuildInputs = [ cmake pkgconfig qttools ]; + nativeBuildInputs = [ cmake makeQtWrapper pkgconfig qttools ]; buildInputs = [ libxcb libpthreadstubs libXdmcp libXau qtbase qtdeclarative pam systemd ]; diff --git a/pkgs/applications/misc/cool-retro-term/default.nix b/pkgs/applications/misc/cool-retro-term/default.nix index 9f97e1eccee6..890bc2c016b0 100644 --- a/pkgs/applications/misc/cool-retro-term/default.nix +++ b/pkgs/applications/misc/cool-retro-term/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchgit, makeWrapper, qtbase, qtquick1, qmltermwidget }: +{ stdenv, fetchgit, makeQtWrapper, qtbase, qtquick1, qmltermwidget }: stdenv.mkDerivation rec { version = "1.0.0"; @@ -15,7 +15,8 @@ stdenv.mkDerivation rec { sed -i -e '/qmltermwidget/d' cool-retro-term.pro ''; - buildInputs = [ makeWrapper qtbase qtquick1 qmltermwidget ]; + buildInputs = [ qtbase qtquick1 qmltermwidget ]; + nativeBuildInputs = [ makeQtWrapper ]; configurePhase = "qmake PREFIX=$out"; diff --git a/pkgs/development/libraries/qt-5/5.5/default.nix b/pkgs/development/libraries/qt-5/5.5/default.nix index 87895eaa0aa2..d5f542a06fa3 100644 --- a/pkgs/development/libraries/qt-5/5.5/default.nix +++ b/pkgs/development/libraries/qt-5/5.5/default.nix @@ -18,7 +18,7 @@ , decryptSslTraffic ? false }: -let inherit (pkgs) stdenv; in +let inherit (pkgs) makeSetupHook makeWrapper stdenv; in with stdenv.lib; @@ -101,6 +101,8 @@ let qtx11extras = callPackage ./qtx11extras.nix {}; qtxmlpatterns = callPackage ./qtxmlpatterns.nix {}; + makeQtWrapper = makeSetupHook { deps = [ makeWrapper ]; } ./make-qt-wrapper.sh; + }; in makeScope pkgs.newScope addPackages diff --git a/pkgs/development/libraries/qt-5/5.5/make-qt-wrapper.sh b/pkgs/development/libraries/qt-5/5.5/make-qt-wrapper.sh new file mode 100644 index 000000000000..f4f13833b8d0 --- /dev/null +++ b/pkgs/development/libraries/qt-5/5.5/make-qt-wrapper.sh @@ -0,0 +1,52 @@ +addQtDependency() { + addToSearchPath QT_PLUGIN_PATH "$1/lib/qt5/plugins" + addToSearchPath QML_IMPORT_PATH "$1/lib/qt5/imports" + addToSearchPath QML2_IMPORT_PATH "$1/lib/qt5/qml" + addToSearchPath XDG_DATA_DIRS "$1/share" +} + +wrapQtProgram() { + local prog="$1" + shift + if [[ -n "$QT_WRAPPER_IMPURE" ]]; then + wrapProgram "$prog" \ + --prefix QT_PLUGIN_PATH : "$QT_PLUGIN_PATH" \ + --prefix QML_IMPORT_PATH : "$QML_IMPORT_PATH" \ + --prefix QML2_IMPORT_PATH : "$QML2_IMPORT_PATH" \ + "$@" + else + wrapProgram "$prog" \ + --set QT_PLUGIN_PATH "$QT_PLUGIN_PATH" \ + --set QML_IMPORT_PATH "$QML_IMPORT_PATH" \ + --set QML2_IMPORT_PATH "$QML2_IMPORT_PATH" \ + "$@" + fi +} + +makeQtWrapper() { + local old="$1" + local new="$2" + shift + shift + if [[ -n "$QT_WRAPPER_IMPURE" ]]; then + makeWrapper "$old" "$new" \ + --prefix QT_PLUGIN_PATH : "$QT_PLUGIN_PATH" \ + --prefix QML_IMPORT_PATH : "$QML_IMPORT_PATH" \ + --prefix QML2_IMPORT_PATH : "$QML2_IMPORT_PATH" \ + "$@" + else + makeWrapper "$old" "$new" \ + --set QT_PLUGIN_PATH "$QT_PLUGIN_PATH" \ + --set QML_IMPORT_PATH "$QML_IMPORT_PATH" \ + --set QML2_IMPORT_PATH "$QML2_IMPORT_PATH" \ + "$@" + fi +} + +# cannot use addToSearchPath because these directories may not exist yet +export QT_PLUGIN_PATH="$QT_PLUGIN_PATH${QT_PLUGIN_PATH:+:}$out/lib/qt5/plugins" +export QML_IMPORT_PATH="$QML_IMPORT_PATH${QML_IMPORT_PATH:+:}$out/lib/qt5/imports" +export QML2_IMPORT_PATH="$QML2_IMPORT_PATH${QML2_IMPORT_PATH:+:}$out/lib/qt5/qml" +export XDG_DATA_DIRS="$XDG_DATA_DIRS${XDG_DATA_DIRS:+:}$out/share" + +envHooks+=(addQtDependency) diff --git a/pkgs/development/libraries/qt-5/5.5/qtbase/setup-hook.sh b/pkgs/development/libraries/qt-5/5.5/qtbase/setup-hook.sh index cae1aeaac2cc..ab34cbd36751 100644 --- a/pkgs/development/libraries/qt-5/5.5/qtbase/setup-hook.sh +++ b/pkgs/development/libraries/qt-5/5.5/qtbase/setup-hook.sh @@ -18,11 +18,6 @@ addQtModule() { fi done fi - - addToSearchPath QT_PLUGIN_PATH "$1/lib/qt5/plugins" - addToSearchPath QML_IMPORT_PATH "$1/lib/qt5/imports" - addToSearchPath QML2_IMPORT_PATH "$1/lib/qt5/qml" - addToSearchPath XDG_DATA_DIRS "$1/share" } rmQtModules() { @@ -49,28 +44,6 @@ setQMakePath() { export PATH="$qtOut/bin${PATH:+:}$PATH" } -wrapQtProgram() { - local prog="$1" - shift - wrapProgram "$prog" \ - --set QT_PLUGIN_PATH "$QT_PLUGIN_PATH" \ - --set QML_IMPORT_PATH "$QML_IMPORT_PATH" \ - --set QML2_IMPORT_PATH "$QML2_IMPORT_PATH" \ - "$@" -} - -makeQtWrapper() { - local old="$1" - local new="$2" - shift - shift - makeWrapper "$old" "$new" \ - --set QT_PLUGIN_PATH "$QT_PLUGIN_PATH" \ - --set QML_IMPORT_PATH "$QML_IMPORT_PATH" \ - --set QML2_IMPORT_PATH "$QML2_IMPORT_PATH" \ - "$@" -} - qtOut="" if [[ -z "$NIX_QT_SUBMODULE" ]]; then qtOut="$PWD/qmake-$name" @@ -91,11 +64,6 @@ Documentation = share/doc/qt5 EOF export QMAKE="$qtOut/bin/qmake" -# cannot use addToSearchPath because these directories may not exist yet -export QT_PLUGIN_PATH="$QT_PLUGIN_PATH${QT_PLUGIN_PATH:+:}$out/lib/qt5/plugins" -export QML_IMPORT_PATH="$QML_IMPORT_PATH${QML_IMPORT_PATH:+:}$out/lib/qt5/imports" -export QML2_IMPORT_PATH="$QML2_IMPORT_PATH${QML2_IMPORT_PATH:+:}$out/lib/qt5/qml" -export XDG_DATA_DIRS="$XDG_DATA_DIRS${XDG_DATA_DIRS:+:}$out/share" envHooks+=(addQtModule) preConfigurePhases+=(setQMakePath) From 3af189455739b71ee8564928dde42db1a11a83a3 Mon Sep 17 00:00:00 2001 From: Thomas Tuegel Date: Wed, 14 Oct 2015 18:41:23 -0500 Subject: [PATCH 053/162] makeKDEWrapper: separate from extra-cmake-modules --- pkgs/desktops/plasma-5.4/bluedevil.nix | 8 +++++--- pkgs/desktops/plasma-5.4/breeze-qt5.nix | 3 ++- pkgs/desktops/plasma-5.4/kde-cli-tools.nix | 4 ++-- pkgs/desktops/plasma-5.4/khelpcenter.nix | 3 ++- pkgs/desktops/plasma-5.4/kinfocenter.nix | 4 +++- pkgs/desktops/plasma-5.4/kmenuedit.nix | 3 ++- pkgs/desktops/plasma-5.4/kscreen.nix | 3 ++- pkgs/desktops/plasma-5.4/ksshaskpass.nix | 4 ++-- pkgs/desktops/plasma-5.4/ksysguard.nix | 3 ++- pkgs/desktops/plasma-5.4/oxygen.nix | 4 ++-- pkgs/desktops/plasma-5.4/plasma-desktop/default.nix | 3 ++- pkgs/desktops/plasma-5.4/plasma-nm.nix | 7 ++++--- pkgs/desktops/plasma-5.4/plasma-workspace/default.nix | 5 +++-- pkgs/desktops/plasma-5.4/systemsettings.nix | 3 ++- pkgs/development/libraries/kde-frameworks-5.15/baloo.nix | 4 ++-- .../development/libraries/kde-frameworks-5.15/default.nix | 3 ++- .../kde-frameworks-5.15/extra-cmake-modules/default.nix | 1 - .../libraries/kde-frameworks-5.15/kactivities.nix | 4 ++-- .../development/libraries/kde-frameworks-5.15/kconfig.nix | 3 ++- .../kde-frameworks-5.15/kconfigwidgets/default.nix | 4 ++-- .../libraries/kde-frameworks-5.15/kdbusaddons.nix | 3 ++- .../libraries/kde-frameworks-5.15/kdeclarative.nix | 5 +++-- .../libraries/kde-frameworks-5.15/kdoctools/default.nix | 4 ++-- .../libraries/kde-frameworks-5.15/kglobalaccel.nix | 3 ++- pkgs/development/libraries/kde-frameworks-5.15/kio.nix | 6 +++--- pkgs/development/libraries/kde-frameworks-5.15/kjs.nix | 3 ++- .../libraries/kde-frameworks-5.15/kjsembed.nix | 4 ++-- .../libraries/kde-frameworks-5.15/kpackage/default.nix | 3 ++- .../development/libraries/kde-frameworks-5.15/kwallet.nix | 4 ++-- .../libraries/kde-frameworks-5.15/make-kde-wrapper.nix | 3 +++ .../setup-hook.sh => make-kde-wrapper.sh} | 0 .../kde-frameworks-5.15/plasma-framework/default.nix | 4 ++-- pkgs/development/libraries/kde-frameworks-5.15/solid.nix | 3 ++- 33 files changed, 72 insertions(+), 49 deletions(-) create mode 100644 pkgs/development/libraries/kde-frameworks-5.15/make-kde-wrapper.nix rename pkgs/development/libraries/kde-frameworks-5.15/{extra-cmake-modules/setup-hook.sh => make-kde-wrapper.sh} (100%) diff --git a/pkgs/desktops/plasma-5.4/bluedevil.nix b/pkgs/desktops/plasma-5.4/bluedevil.nix index 0408f69a94a9..3c5e2f570d74 100644 --- a/pkgs/desktops/plasma-5.4/bluedevil.nix +++ b/pkgs/desktops/plasma-5.4/bluedevil.nix @@ -1,12 +1,14 @@ { plasmaPackage, extra-cmake-modules, bluez-qt, kcoreaddons , kdbusaddons, kded, ki18n, kiconthemes, kio, knotifications -, kwidgetsaddons, kwindowsystem, plasma-framework, qtdeclarative -, shared_mime_info +, kwidgetsaddons, kwindowsystem, makeKDEWrapper, plasma-framework +, qtdeclarative, shared_mime_info }: plasmaPackage { name = "bluedevil"; - nativeBuildInputs = [ extra-cmake-modules shared_mime_info ]; + nativeBuildInputs = [ + extra-cmake-modules makeKDEWrapper shared_mime_info + ]; buildInputs = [ kcoreaddons kdbusaddons kded kiconthemes knotifications kwidgetsaddons diff --git a/pkgs/desktops/plasma-5.4/breeze-qt5.nix b/pkgs/desktops/plasma-5.4/breeze-qt5.nix index 6e878b428580..9583a0084c27 100644 --- a/pkgs/desktops/plasma-5.4/breeze-qt5.nix +++ b/pkgs/desktops/plasma-5.4/breeze-qt5.nix @@ -1,6 +1,6 @@ { plasmaPackage, extra-cmake-modules, frameworkintegration , kcmutils, kconfigwidgets, kcoreaddons, kdecoration, kguiaddons -, ki18n, kwindowsystem, qtx11extras +, ki18n, kwindowsystem, makeKDEWrapper, qtx11extras }: plasmaPackage { @@ -8,6 +8,7 @@ plasmaPackage { sname = "breeze"; nativeBuildInputs = [ extra-cmake-modules + makeKDEWrapper ]; buildInputs = [ kcmutils kconfigwidgets kcoreaddons kdecoration kguiaddons diff --git a/pkgs/desktops/plasma-5.4/kde-cli-tools.nix b/pkgs/desktops/plasma-5.4/kde-cli-tools.nix index 56676a9c52ee..0b0e7b324249 100644 --- a/pkgs/desktops/plasma-5.4/kde-cli-tools.nix +++ b/pkgs/desktops/plasma-5.4/kde-cli-tools.nix @@ -1,11 +1,11 @@ { plasmaPackage, extra-cmake-modules, kcmutils, kconfig , kdelibs4support, kdesu, kdoctools, ki18n, kiconthemes -, kwindowsystem, qtsvg, qtx11extras +, kwindowsystem, makeKDEWrapper, qtsvg, qtx11extras }: plasmaPackage { name = "kde-cli-tools"; - nativeBuildInputs = [ extra-cmake-modules kdoctools ]; + nativeBuildInputs = [ extra-cmake-modules kdoctools makeKDEWrapper ]; buildInputs = [ kcmutils kconfig kdesu kiconthemes ]; diff --git a/pkgs/desktops/plasma-5.4/khelpcenter.nix b/pkgs/desktops/plasma-5.4/khelpcenter.nix index 609996c3bd10..5759605af2b7 100644 --- a/pkgs/desktops/plasma-5.4/khelpcenter.nix +++ b/pkgs/desktops/plasma-5.4/khelpcenter.nix @@ -1,6 +1,6 @@ { plasmaPackage, extra-cmake-modules, kdoctools, kconfig , kcoreaddons, kdbusaddons, ki18n, kinit, kcmutils, kdelibs4support -, khtml, kservice +, khtml, kservice, makeKDEWrapper }: plasmaPackage { @@ -8,6 +8,7 @@ plasmaPackage { nativeBuildInputs = [ extra-cmake-modules kdoctools + makeKDEWrapper ]; buildInputs = [ kconfig kcoreaddons kdbusaddons kinit kcmutils kservice diff --git a/pkgs/desktops/plasma-5.4/kinfocenter.nix b/pkgs/desktops/plasma-5.4/kinfocenter.nix index 4015507aa2ff..80caa95dc886 100644 --- a/pkgs/desktops/plasma-5.4/kinfocenter.nix +++ b/pkgs/desktops/plasma-5.4/kinfocenter.nix @@ -1,7 +1,8 @@ { plasmaPackage, extra-cmake-modules, kdoctools, kcmutils , kcompletion, kconfig, kconfigwidgets, kcoreaddons, kdbusaddons , kdeclarative, kdelibs4support, ki18n, kiconthemes, kio, kpackage -, kservice, kwidgetsaddons, kxmlgui, libraw1394, pciutils, solid +, kservice, kwidgetsaddons, kxmlgui, libraw1394, makeKDEWrapper +, pciutils, solid }: plasmaPackage { @@ -9,6 +10,7 @@ plasmaPackage { nativeBuildInputs = [ extra-cmake-modules kdoctools + makeKDEWrapper ]; buildInputs = [ kcmutils kcompletion kconfig kconfigwidgets kcoreaddons diff --git a/pkgs/desktops/plasma-5.4/kmenuedit.nix b/pkgs/desktops/plasma-5.4/kmenuedit.nix index 673a56c9513e..d8c9c3aa2ac0 100644 --- a/pkgs/desktops/plasma-5.4/kmenuedit.nix +++ b/pkgs/desktops/plasma-5.4/kmenuedit.nix @@ -1,5 +1,5 @@ { plasmaPackage, extra-cmake-modules, kdoctools, ki18n, kxmlgui -, kdbusaddons, kiconthemes, kio, sonnet, kdelibs4support +, kdbusaddons, kiconthemes, kio, sonnet, kdelibs4support, makeKDEWrapper }: plasmaPackage { @@ -7,6 +7,7 @@ plasmaPackage { nativeBuildInputs = [ extra-cmake-modules kdoctools + makeKDEWrapper ]; buildInputs = [ kxmlgui kdbusaddons kiconthemes diff --git a/pkgs/desktops/plasma-5.4/kscreen.nix b/pkgs/desktops/plasma-5.4/kscreen.nix index f2f348073650..c97bc4e18710 100644 --- a/pkgs/desktops/plasma-5.4/kscreen.nix +++ b/pkgs/desktops/plasma-5.4/kscreen.nix @@ -1,12 +1,13 @@ { plasmaPackage, extra-cmake-modules, kconfig, kconfigwidgets , kdbusaddons, kglobalaccel, ki18n, kwidgetsaddons, kxmlgui -, libkscreen, qtdeclarative +, libkscreen, makeKDEWrapper, qtdeclarative }: plasmaPackage { name = "kscreen"; nativeBuildInputs = [ extra-cmake-modules + makeKDEWrapper ]; buildInputs = [ kconfig kconfigwidgets kdbusaddons kwidgetsaddons kxmlgui diff --git a/pkgs/desktops/plasma-5.4/ksshaskpass.nix b/pkgs/desktops/plasma-5.4/ksshaskpass.nix index 0a68893e0bf6..112d8eda4036 100644 --- a/pkgs/desktops/plasma-5.4/ksshaskpass.nix +++ b/pkgs/desktops/plasma-5.4/ksshaskpass.nix @@ -1,10 +1,10 @@ { plasmaPackage, extra-cmake-modules, kdoctools, kcoreaddons -, ki18n, kwallet, kwidgetsaddons +, ki18n, kwallet, kwidgetsaddons, makeKDEWrapper }: plasmaPackage { name = "ksshaskpass"; - nativeBuildInputs = [ extra-cmake-modules kdoctools ]; + nativeBuildInputs = [ extra-cmake-modules kdoctools makeKDEWrapper ]; buildInputs = [ kcoreaddons kwallet kwidgetsaddons ]; propagatedBuildInputs = [ ki18n ]; postInstall = '' diff --git a/pkgs/desktops/plasma-5.4/ksysguard.nix b/pkgs/desktops/plasma-5.4/ksysguard.nix index 5f24d68bb390..4e9fca43ded8 100644 --- a/pkgs/desktops/plasma-5.4/ksysguard.nix +++ b/pkgs/desktops/plasma-5.4/ksysguard.nix @@ -1,6 +1,6 @@ { plasmaPackage, extra-cmake-modules, kdoctools, kconfig , kcoreaddons, kdelibs4support, ki18n, kitemviews, knewstuff -, kiconthemes, libksysguard +, kiconthemes, libksysguard, makeKDEWrapper }: plasmaPackage { @@ -8,6 +8,7 @@ plasmaPackage { nativeBuildInputs = [ extra-cmake-modules kdoctools + makeKDEWrapper ]; buildInputs = [ kconfig kcoreaddons kitemviews knewstuff kiconthemes libksysguard diff --git a/pkgs/desktops/plasma-5.4/oxygen.nix b/pkgs/desktops/plasma-5.4/oxygen.nix index da2a6cab4b09..58ccd4809c79 100644 --- a/pkgs/desktops/plasma-5.4/oxygen.nix +++ b/pkgs/desktops/plasma-5.4/oxygen.nix @@ -1,12 +1,12 @@ { plasmaPackage, extra-cmake-modules, ki18n, kcmutils, kconfig , kdecoration, kguiaddons, kwidgetsaddons, kservice, kcompletion -, frameworkintegration, kwindowsystem, qtx11extras +, frameworkintegration, kwindowsystem, makeKDEWrapper, qtx11extras }: plasmaPackage { name = "oxygen"; nativeBuildInputs = [ - extra-cmake-modules + extra-cmake-modules makeKDEWrapper ]; buildInputs = [ kcmutils kconfig kdecoration kguiaddons kwidgetsaddons diff --git a/pkgs/desktops/plasma-5.4/plasma-desktop/default.nix b/pkgs/desktops/plasma-5.4/plasma-desktop/default.nix index c2fc98517307..f0271e876874 100644 --- a/pkgs/desktops/plasma-5.4/plasma-desktop/default.nix +++ b/pkgs/desktops/plasma-5.4/plasma-desktop/default.nix @@ -6,7 +6,7 @@ , plasma-framework, plasma-workspace, qtdeclarative, qtx11extras , qtsvg, libXcursor, libXft, libxkbfile, xf86inputevdev , xf86inputsynaptics, xinput, xkeyboard_config, xorgserver -, libcanberra_kde, libpulseaudio, utillinux +, libcanberra_kde, libpulseaudio, makeKDEWrapper, utillinux }: plasmaPackage { @@ -14,6 +14,7 @@ plasmaPackage { nativeBuildInputs = [ extra-cmake-modules kdoctools + makeKDEWrapper ]; buildInputs = [ attica boost fontconfig kcmutils kdbusaddons kded kitemmodels diff --git a/pkgs/desktops/plasma-5.4/plasma-nm.nix b/pkgs/desktops/plasma-5.4/plasma-nm.nix index 9f956ca635ef..7b0a65473d15 100644 --- a/pkgs/desktops/plasma-5.4/plasma-nm.nix +++ b/pkgs/desktops/plasma-5.4/plasma-nm.nix @@ -2,9 +2,9 @@ , kconfigwidgets, kcoreaddons, kdbusaddons, kdeclarative , kdelibs4support, ki18n, kiconthemes, kinit, kio, kitemviews , knotifications, kservice, kwallet, kwidgetsaddons, kwindowsystem -, kxmlgui, mobile_broadband_provider_info, modemmanager-qt -, networkmanager-qt, openconnect, plasma-framework, qtdeclarative -, solid +, kxmlgui, makeKDEWrapper, mobile_broadband_provider_info +, modemmanager-qt, networkmanager-qt, openconnect, plasma-framework +, qtdeclarative, solid }: plasmaPackage { @@ -12,6 +12,7 @@ plasmaPackage { nativeBuildInputs = [ extra-cmake-modules kdoctools + makeKDEWrapper ]; buildInputs = [ kcompletion kconfigwidgets kcoreaddons kdbusaddons kiconthemes diff --git a/pkgs/desktops/plasma-5.4/plasma-workspace/default.nix b/pkgs/desktops/plasma-5.4/plasma-workspace/default.nix index 5e29fe2e2e62..6ccce9dec0ec 100644 --- a/pkgs/desktops/plasma-5.4/plasma-workspace/default.nix +++ b/pkgs/desktops/plasma-5.4/plasma-workspace/default.nix @@ -6,8 +6,8 @@ , libdbusmenu, libkscreen, libSM, libXcursor, networkmanager-qt , pam, phonon, plasma-framework, qtquick1, qtscript, qtx11extras, wayland , libksysguard, bash, coreutils, gnused, gnugrep, socat, kconfig -, kinit, kservice, qttools, dbus_tools, mkfontdir, xmessage, xprop -, xrdb, xset, xsetroot, solid +, kinit, kservice, makeKDEWrapper, qttools, dbus_tools, mkfontdir, xmessage +, xprop, xrdb, xset, xsetroot, solid }: plasmaPackage { @@ -15,6 +15,7 @@ plasmaPackage { nativeBuildInputs = [ extra-cmake-modules kdoctools + makeKDEWrapper ]; buildInputs = [ kcmutils kcrash kdbusaddons kdesu kdewebkit kjsembed knewstuff diff --git a/pkgs/desktops/plasma-5.4/systemsettings.nix b/pkgs/desktops/plasma-5.4/systemsettings.nix index e5617e1e5df9..7cf656e9dbeb 100644 --- a/pkgs/desktops/plasma-5.4/systemsettings.nix +++ b/pkgs/desktops/plasma-5.4/systemsettings.nix @@ -1,6 +1,6 @@ { plasmaPackage, extra-cmake-modules, kdoctools, kitemviews , kcmutils, ki18n, kio, kservice, kiconthemes, kwindowsystem -, kxmlgui, kdbusaddons, kconfig, khtml +, kxmlgui, kdbusaddons, kconfig, khtml, makeKDEWrapper }: plasmaPackage { @@ -8,6 +8,7 @@ plasmaPackage { nativeBuildInputs = [ extra-cmake-modules kdoctools + makeKDEWrapper ]; buildInputs = [ kitemviews kcmutils kservice kiconthemes kxmlgui kdbusaddons diff --git a/pkgs/development/libraries/kde-frameworks-5.15/baloo.nix b/pkgs/development/libraries/kde-frameworks-5.15/baloo.nix index adfe7894f8da..a11c316010d3 100644 --- a/pkgs/development/libraries/kde-frameworks-5.15/baloo.nix +++ b/pkgs/development/libraries/kde-frameworks-5.15/baloo.nix @@ -1,11 +1,11 @@ { kdeFramework, lib, extra-cmake-modules, kauth, kconfig , kcoreaddons, kcrash, kdbusaddons, kfilemetadata, ki18n, kidletime -, kio, lmdb, qtbase, qtquick1, solid +, kio, lmdb, makeKDEWrapper, qtbase, qtquick1, solid }: kdeFramework { name = "baloo"; - nativeBuildInputs = [ extra-cmake-modules ]; + nativeBuildInputs = [ extra-cmake-modules makeKDEWrapper ]; buildInputs = [ kconfig kcrash kdbusaddons lmdb qtquick1 solid ]; diff --git a/pkgs/development/libraries/kde-frameworks-5.15/default.nix b/pkgs/development/libraries/kde-frameworks-5.15/default.nix index 1ff433c13c8e..0fc3d77c67b5 100644 --- a/pkgs/development/libraries/kde-frameworks-5.15/default.nix +++ b/pkgs/development/libraries/kde-frameworks-5.15/default.nix @@ -9,7 +9,7 @@ let - inherit (pkgs) lib stdenv; + inherit (pkgs) lib makeSetupHook stdenv; mirror = "mirror://kde"; srcs = import ./srcs.nix { inherit (pkgs) fetchurl; inherit mirror; }; @@ -105,6 +105,7 @@ let solid = callPackage ./solid.nix {}; sonnet = callPackage ./sonnet.nix {}; threadweaver = callPackage ./threadweaver.nix {}; + makeKDEWrapper = callPackage ./make-kde-wrapper.nix { inherit makeSetupHook; }; }; newScope = scope: pkgs.qt55Libs.newScope ({ inherit kdeFramework; } // scope); diff --git a/pkgs/development/libraries/kde-frameworks-5.15/extra-cmake-modules/default.nix b/pkgs/development/libraries/kde-frameworks-5.15/extra-cmake-modules/default.nix index 4d669b72a896..3c5b4155fa46 100644 --- a/pkgs/development/libraries/kde-frameworks-5.15/extra-cmake-modules/default.nix +++ b/pkgs/development/libraries/kde-frameworks-5.15/extra-cmake-modules/default.nix @@ -2,7 +2,6 @@ kdeFramework { name = "extra-cmake-modules"; - setupHook = ./setup-hook.sh; patches = [ ./0001-extra-cmake-modules-paths.patch ]; # It is OK to propagate these inputs as long as diff --git a/pkgs/development/libraries/kde-frameworks-5.15/kactivities.nix b/pkgs/development/libraries/kde-frameworks-5.15/kactivities.nix index 3cdc3c4144d2..955a6120e2cd 100644 --- a/pkgs/development/libraries/kde-frameworks-5.15/kactivities.nix +++ b/pkgs/development/libraries/kde-frameworks-5.15/kactivities.nix @@ -1,11 +1,11 @@ { kdeFramework, lib, extra-cmake-modules, boost, kcmutils, kconfig , kcoreaddons, kdbusaddons, kdeclarative, kglobalaccel, ki18n -, kio, kservice, kwindowsystem, kxmlgui, qtdeclarative +, kio, kservice, kwindowsystem, kxmlgui, makeKDEWrapper, qtdeclarative }: kdeFramework { name = "kactivities"; - nativeBuildInputs = [ extra-cmake-modules ]; + nativeBuildInputs = [ extra-cmake-modules makeKDEWrapper ]; buildInputs = [ boost kcmutils kconfig kcoreaddons kdbusaddons kservice kxmlgui diff --git a/pkgs/development/libraries/kde-frameworks-5.15/kconfig.nix b/pkgs/development/libraries/kde-frameworks-5.15/kconfig.nix index ce890745767c..8d076e03fa9d 100644 --- a/pkgs/development/libraries/kde-frameworks-5.15/kconfig.nix +++ b/pkgs/development/libraries/kde-frameworks-5.15/kconfig.nix @@ -1,10 +1,11 @@ { kdeFramework, lib , extra-cmake-modules +, makeKDEWrapper }: kdeFramework { name = "kconfig"; - nativeBuildInputs = [ extra-cmake-modules ]; + nativeBuildInputs = [ extra-cmake-modules makeKDEWrapper ]; postInstall = '' wrapKDEProgram "$out/bin/kreadconfig5" wrapKDEProgram "$out/bin/kwriteconfig5" diff --git a/pkgs/development/libraries/kde-frameworks-5.15/kconfigwidgets/default.nix b/pkgs/development/libraries/kde-frameworks-5.15/kconfigwidgets/default.nix index 39315d9616bd..2112f2274f9c 100644 --- a/pkgs/development/libraries/kde-frameworks-5.15/kconfigwidgets/default.nix +++ b/pkgs/development/libraries/kde-frameworks-5.15/kconfigwidgets/default.nix @@ -1,10 +1,10 @@ { kdeFramework, lib, extra-cmake-modules, kauth, kcodecs, kconfig -, kdoctools, kguiaddons, ki18n, kwidgetsaddons +, kdoctools, kguiaddons, ki18n, kwidgetsaddons, makeKDEWrapper }: kdeFramework { name = "kconfigwidgets"; - nativeBuildInputs = [ extra-cmake-modules kdoctools ]; + nativeBuildInputs = [ extra-cmake-modules kdoctools makeKDEWrapper ]; buildInputs = [ kguiaddons ]; propagatedBuildInputs = [ kauth kconfig kcodecs ki18n kwidgetsaddons ]; patches = [ ./0001-qdiriterator-follow-symlinks.patch ]; diff --git a/pkgs/development/libraries/kde-frameworks-5.15/kdbusaddons.nix b/pkgs/development/libraries/kde-frameworks-5.15/kdbusaddons.nix index ed046e582627..4a1c7a198423 100644 --- a/pkgs/development/libraries/kde-frameworks-5.15/kdbusaddons.nix +++ b/pkgs/development/libraries/kde-frameworks-5.15/kdbusaddons.nix @@ -1,11 +1,12 @@ { kdeFramework, lib , extra-cmake-modules +, makeKDEWrapper , qtx11extras }: kdeFramework { name = "kdbusaddons"; - nativeBuildInputs = [ extra-cmake-modules ]; + nativeBuildInputs = [ extra-cmake-modules makeKDEWrapper ]; propagatedBuildInputs = [ qtx11extras ]; postInstall = '' wrapKDEProgram "$out/bin/kquitapp5" diff --git a/pkgs/development/libraries/kde-frameworks-5.15/kdeclarative.nix b/pkgs/development/libraries/kde-frameworks-5.15/kdeclarative.nix index aaeb97a067b1..32df2fc3f8ab 100644 --- a/pkgs/development/libraries/kde-frameworks-5.15/kdeclarative.nix +++ b/pkgs/development/libraries/kde-frameworks-5.15/kdeclarative.nix @@ -1,11 +1,12 @@ { kdeFramework, lib, extra-cmake-modules, epoxy, kconfig , kglobalaccel, kguiaddons, ki18n, kiconthemes, kio, kpackage -, kwidgetsaddons, kwindowsystem, pkgconfig, qtdeclarative +, kwidgetsaddons, kwindowsystem, makeKDEWrapper, pkgconfig +, qtdeclarative }: kdeFramework { name = "kdeclarative"; - nativeBuildInputs = [ extra-cmake-modules ]; + nativeBuildInputs = [ extra-cmake-modules makeKDEWrapper ]; buildInputs = [ epoxy kguiaddons kiconthemes kwidgetsaddons ]; diff --git a/pkgs/development/libraries/kde-frameworks-5.15/kdoctools/default.nix b/pkgs/development/libraries/kde-frameworks-5.15/kdoctools/default.nix index 0eeaf89c58bb..bc17a391afd7 100644 --- a/pkgs/development/libraries/kde-frameworks-5.15/kdoctools/default.nix +++ b/pkgs/development/libraries/kde-frameworks-5.15/kdoctools/default.nix @@ -1,5 +1,5 @@ { kdeFramework, lib, extra-cmake-modules, docbook_xml_dtd_45 -, docbook5_xsl, karchive, ki18n, perl, perlPackages +, docbook5_xsl, karchive, ki18n, makeKDEWrapper, perl, perlPackages }: kdeFramework { @@ -7,7 +7,7 @@ kdeFramework { nativeBuildInputs = [ extra-cmake-modules ]; buildInputs = [ karchive ]; propagatedBuildInputs = [ ki18n ]; - propagatedNativeBuildInputs = [ perl perlPackages.URI ]; + propagatedNativeBuildInputs = [ makeKDEWrapper perl perlPackages.URI ]; cmakeFlags = [ "-DDocBookXML4_DTD_DIR=${docbook_xml_dtd_45}/xml/dtd/docbook" "-DDocBookXSL_DIR=${docbook5_xsl}/xml/xsl/docbook" diff --git a/pkgs/development/libraries/kde-frameworks-5.15/kglobalaccel.nix b/pkgs/development/libraries/kde-frameworks-5.15/kglobalaccel.nix index 32f71a7e3dcd..12094ad7f79b 100644 --- a/pkgs/development/libraries/kde-frameworks-5.15/kglobalaccel.nix +++ b/pkgs/development/libraries/kde-frameworks-5.15/kglobalaccel.nix @@ -5,12 +5,13 @@ , kcrash , kdbusaddons , kwindowsystem +, makeKDEWrapper , qtx11extras }: kdeFramework { name = "kglobalaccel"; - nativeBuildInputs = [ extra-cmake-modules ]; + nativeBuildInputs = [ extra-cmake-modules makeKDEWrapper ]; buildInputs = [ kconfig kcoreaddons kcrash kdbusaddons ]; propagatedBuildInputs = [ kwindowsystem qtx11extras ]; postInstall = '' diff --git a/pkgs/development/libraries/kde-frameworks-5.15/kio.nix b/pkgs/development/libraries/kde-frameworks-5.15/kio.nix index 58d5667a50e0..c125157f6238 100644 --- a/pkgs/development/libraries/kde-frameworks-5.15/kio.nix +++ b/pkgs/development/libraries/kde-frameworks-5.15/kio.nix @@ -2,13 +2,13 @@ , kbookmarks, kcompletion, kconfig, kconfigwidgets, kcoreaddons , kdbusaddons, kdoctools, ki18n, kiconthemes, kitemviews , kjobwidgets, knotifications, kservice, ktextwidgets, kwallet -, kwidgetsaddons, kwindowsystem, kxmlgui, qtscript, qtx11extras -, solid +, kwidgetsaddons, kwindowsystem, kxmlgui, makeKDEWrapper +, qtscript, qtx11extras, solid }: kdeFramework { name = "kio"; - nativeBuildInputs = [ extra-cmake-modules kdoctools ]; + nativeBuildInputs = [ extra-cmake-modules kdoctools makeKDEWrapper ]; buildInputs = [ acl karchive kconfig kcoreaddons kdbusaddons kiconthemes knotifications ktextwidgets kwallet kwidgetsaddons diff --git a/pkgs/development/libraries/kde-frameworks-5.15/kjs.nix b/pkgs/development/libraries/kde-frameworks-5.15/kjs.nix index 902674d49b76..cdbc20f279d3 100644 --- a/pkgs/development/libraries/kde-frameworks-5.15/kjs.nix +++ b/pkgs/development/libraries/kde-frameworks-5.15/kjs.nix @@ -1,11 +1,12 @@ { kdeFramework, lib , extra-cmake-modules , kdoctools +, makeKDEWrapper }: kdeFramework { name = "kjs"; - nativeBuildInputs = [ extra-cmake-modules kdoctools ]; + nativeBuildInputs = [ extra-cmake-modules kdoctools makeKDEWrapper ]; postInstall = '' wrapKDEProgram "$out/bin/kjs5" ''; diff --git a/pkgs/development/libraries/kde-frameworks-5.15/kjsembed.nix b/pkgs/development/libraries/kde-frameworks-5.15/kjsembed.nix index 6997e48d07b7..e6d08d387b69 100644 --- a/pkgs/development/libraries/kde-frameworks-5.15/kjsembed.nix +++ b/pkgs/development/libraries/kde-frameworks-5.15/kjsembed.nix @@ -1,10 +1,10 @@ { kdeFramework, lib, extra-cmake-modules, kdoctools, ki18n, kjs -, qtsvg +, makeKDEWrapper, qtsvg }: kdeFramework { name = "kjsembed"; - nativeBuildInputs = [ extra-cmake-modules kdoctools ]; + nativeBuildInputs = [ extra-cmake-modules kdoctools makeKDEWrapper ]; buildInputs = [ qtsvg ]; propagatedBuildInputs = [ ki18n kjs ]; postInstall = '' diff --git a/pkgs/development/libraries/kde-frameworks-5.15/kpackage/default.nix b/pkgs/development/libraries/kde-frameworks-5.15/kpackage/default.nix index 4e4c2412ced5..3581eb3deca0 100644 --- a/pkgs/development/libraries/kde-frameworks-5.15/kpackage/default.nix +++ b/pkgs/development/libraries/kde-frameworks-5.15/kpackage/default.nix @@ -5,11 +5,12 @@ , kcoreaddons , kdoctools , ki18n +, makeKDEWrapper }: kdeFramework { name = "kpackage"; - nativeBuildInputs = [ extra-cmake-modules kdoctools ]; + nativeBuildInputs = [ extra-cmake-modules kdoctools makeKDEWrapper ]; buildInputs = [ karchive kconfig ]; propagatedBuildInputs = [ kcoreaddons ki18n ]; patches = [ diff --git a/pkgs/development/libraries/kde-frameworks-5.15/kwallet.nix b/pkgs/development/libraries/kde-frameworks-5.15/kwallet.nix index 77f1c5d05e68..4267b65281fc 100644 --- a/pkgs/development/libraries/kde-frameworks-5.15/kwallet.nix +++ b/pkgs/development/libraries/kde-frameworks-5.15/kwallet.nix @@ -1,11 +1,11 @@ { kdeFramework, lib, extra-cmake-modules, kconfig, kcoreaddons , kdbusaddons, kdoctools, ki18n, kiconthemes, knotifications -, kservice, kwidgetsaddons, kwindowsystem, libgcrypt +, kservice, kwidgetsaddons, kwindowsystem, libgcrypt, makeKDEWrapper }: kdeFramework { name = "kwallet"; - nativeBuildInputs = [ extra-cmake-modules kdoctools ]; + nativeBuildInputs = [ extra-cmake-modules kdoctools makeKDEWrapper ]; buildInputs = [ kconfig kcoreaddons kdbusaddons kiconthemes knotifications kservice kwidgetsaddons libgcrypt diff --git a/pkgs/development/libraries/kde-frameworks-5.15/make-kde-wrapper.nix b/pkgs/development/libraries/kde-frameworks-5.15/make-kde-wrapper.nix new file mode 100644 index 000000000000..2df5037bb335 --- /dev/null +++ b/pkgs/development/libraries/kde-frameworks-5.15/make-kde-wrapper.nix @@ -0,0 +1,3 @@ +{ makeSetupHook, makeQtWrapper }: + +makeSetupHook { deps = [ makeQtWrapper ]; } ./make-kde-wrapper.sh diff --git a/pkgs/development/libraries/kde-frameworks-5.15/extra-cmake-modules/setup-hook.sh b/pkgs/development/libraries/kde-frameworks-5.15/make-kde-wrapper.sh similarity index 100% rename from pkgs/development/libraries/kde-frameworks-5.15/extra-cmake-modules/setup-hook.sh rename to pkgs/development/libraries/kde-frameworks-5.15/make-kde-wrapper.sh diff --git a/pkgs/development/libraries/kde-frameworks-5.15/plasma-framework/default.nix b/pkgs/development/libraries/kde-frameworks-5.15/plasma-framework/default.nix index a47b904d25d4..97cbfee36e54 100644 --- a/pkgs/development/libraries/kde-frameworks-5.15/plasma-framework/default.nix +++ b/pkgs/development/libraries/kde-frameworks-5.15/plasma-framework/default.nix @@ -2,12 +2,12 @@ , kconfig, kconfigwidgets, kcoreaddons, kdbusaddons, kdeclarative , kdoctools, kglobalaccel, kguiaddons, ki18n, kiconthemes, kio , knotifications, kpackage, kservice, kwindowsystem, kxmlgui -, qtscript, qtx11extras +, makeKDEWrapper, qtscript, qtx11extras }: kdeFramework { name = "plasma-framework"; - nativeBuildInputs = [ extra-cmake-modules kdoctools ]; + nativeBuildInputs = [ extra-cmake-modules kdoctools makeKDEWrapper ]; buildInputs = [ karchive kconfig kconfigwidgets kcoreaddons kdbusaddons kguiaddons kiconthemes knotifications kxmlgui qtscript diff --git a/pkgs/development/libraries/kde-frameworks-5.15/solid.nix b/pkgs/development/libraries/kde-frameworks-5.15/solid.nix index 06b0797cbc1b..ce2af0f6a5d7 100644 --- a/pkgs/development/libraries/kde-frameworks-5.15/solid.nix +++ b/pkgs/development/libraries/kde-frameworks-5.15/solid.nix @@ -1,10 +1,11 @@ { kdeFramework, lib , extra-cmake-modules +, makeKDEWrapper }: kdeFramework { name = "solid"; - nativeBuildInputs = [ extra-cmake-modules ]; + nativeBuildInputs = [ extra-cmake-modules makeKDEWrapper ]; postInstall = '' wrapKDEProgram "$out/bin/solid-hardware5" ''; From 7500e0d19cfc71a8af1c0ac7914bfa88005a56fc Mon Sep 17 00:00:00 2001 From: Thomas Tuegel Date: Fri, 16 Oct 2015 19:01:31 -0500 Subject: [PATCH 054/162] plasma-desktop: propagate runtime dependencies --- .../desktops/plasma-5.4/plasma-desktop/default.nix | 14 +++++++++++--- 1 file changed, 11 insertions(+), 3 deletions(-) diff --git a/pkgs/desktops/plasma-5.4/plasma-desktop/default.nix b/pkgs/desktops/plasma-5.4/plasma-desktop/default.nix index f0271e876874..77dfe3d91820 100644 --- a/pkgs/desktops/plasma-5.4/plasma-desktop/default.nix +++ b/pkgs/desktops/plasma-5.4/plasma-desktop/default.nix @@ -19,14 +19,14 @@ plasmaPackage { buildInputs = [ attica boost fontconfig kcmutils kdbusaddons kded kitemmodels knewstuff knotifications knotifyconfig kwallet libcanberra_kde - libXcursor libpulseaudio libXft libxkbfile phonon qtdeclarative - qtx11extras qtsvg xf86inputevdev xf86inputsynaptics + libXcursor libpulseaudio libXft libxkbfile phonon + qtsvg xf86inputevdev xf86inputsynaptics xkeyboard_config xinput ]; propagatedBuildInputs = [ baloo kactivities kauth kdeclarative kdelibs4support kemoticons kglobalaccel ki18n kpeople krunner kwin plasma-framework - plasma-workspace + plasma-workspace qtdeclarative qtx11extras ]; patches = [ (substituteAll { @@ -41,6 +41,14 @@ plasmaPackage { "-DSynaptics_INCLUDE_DIRS=${xf86inputsynaptics}/include/xorg" ]; postInstall = '' + # These files are installed in the wrong location. + cd "$out/share/plasma/plasmoids/org.kde.desktopcontainment/contents" + mv "code/LayoutManager.js" "ui/LayoutManager.js" + cd "$out/share/plasma/plasmoids/org.kde.panel/contents" + mv "code/LayoutManager.js" "ui/LayoutManager.js" + + cd "$NIX_BUILD_TOP" + wrapKDEProgram "$out/bin/kaccess" wrapKDEProgram "$out/bin/solid-action-desktop-gen" wrapKDEProgram "$out/bin/knetattach" From 55c5d17e1b38ff06cb3d56ef77a4c74473e6692e Mon Sep 17 00:00:00 2001 From: Thomas Tuegel Date: Fri, 16 Oct 2015 19:01:54 -0500 Subject: [PATCH 055/162] plasma-workspace: propagate runtime dependencies --- pkgs/desktops/plasma-5.4/plasma-workspace/default.nix | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/pkgs/desktops/plasma-5.4/plasma-workspace/default.nix b/pkgs/desktops/plasma-5.4/plasma-workspace/default.nix index 6ccce9dec0ec..6ecc56cdb301 100644 --- a/pkgs/desktops/plasma-5.4/plasma-workspace/default.nix +++ b/pkgs/desktops/plasma-5.4/plasma-workspace/default.nix @@ -7,7 +7,7 @@ , pam, phonon, plasma-framework, qtquick1, qtscript, qtx11extras, wayland , libksysguard, bash, coreutils, gnused, gnugrep, socat, kconfig , kinit, kservice, makeKDEWrapper, qttools, dbus_tools, mkfontdir, xmessage -, xprop, xrdb, xset, xsetroot, solid +, xprop, xrdb, xset, xsetroot, solid, qtquickcontrols }: plasmaPackage { @@ -20,13 +20,13 @@ plasmaPackage { buildInputs = [ kcmutils kcrash kdbusaddons kdesu kdewebkit kjsembed knewstuff knotifyconfig kpackage ktextwidgets kwallet kwayland kxmlrpcclient - libdbusmenu libSM libXcursor networkmanager-qt pam phonon qtquick1 - qtscript qtx11extras solid wayland + libdbusmenu libSM libXcursor networkmanager-qt pam phonon + qtscript wayland ]; propagatedBuildInputs = [ baloo kactivities kdeclarative kdelibs4support kglobalaccel kidletime krunner ktexteditor kwin libkscreen libksysguard - plasma-framework + plasma-framework qtquick1 qtquickcontrols qtx11extras solid ]; patches = [ ./0001-startkde-NixOS-patches.patch ]; @@ -39,6 +39,7 @@ plasmaPackage { --replace kdostartupconfig5 $out/bin/kdostartupconfig5 ''; postInstall = '' + export QT_WRAPPER_IMPURE=1 wrapKDEProgram "$out/bin/ksmserver" wrapKDEProgram "$out/bin/plasmawindowed" wrapKDEProgram "$out/bin/kcminit_startup" From b1569b30153ee38e663293ff49790c863a7b3e4b Mon Sep 17 00:00:00 2001 From: Thomas Tuegel Date: Fri, 16 Oct 2015 19:02:04 -0500 Subject: [PATCH 056/162] solid: depend on qtdeclarative --- pkgs/development/libraries/kde-frameworks-5.15/solid.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/development/libraries/kde-frameworks-5.15/solid.nix b/pkgs/development/libraries/kde-frameworks-5.15/solid.nix index ce2af0f6a5d7..8916a9a3f815 100644 --- a/pkgs/development/libraries/kde-frameworks-5.15/solid.nix +++ b/pkgs/development/libraries/kde-frameworks-5.15/solid.nix @@ -1,11 +1,13 @@ { kdeFramework, lib , extra-cmake-modules , makeKDEWrapper +, qtdeclarative }: kdeFramework { name = "solid"; nativeBuildInputs = [ extra-cmake-modules makeKDEWrapper ]; + buildInputs = [ qtdeclarative ]; postInstall = '' wrapKDEProgram "$out/bin/solid-hardware5" ''; From a3855ef9aee3ffebc41ce1ed07e2aad176ad2808 Mon Sep 17 00:00:00 2001 From: Thomas Tuegel Date: Sat, 17 Oct 2015 09:23:37 -0500 Subject: [PATCH 057/162] qt55: set library paths from NIX_PROFILES --- .../5.5/qtbase/0001-dlopen-gtkstyle.patch | 6 +-- .../qt-5/5.5/qtbase/0002-dlopen-resolv.patch | 6 +-- .../qt-5/5.5/qtbase/0003-dlopen-gl.patch | 6 +-- .../qt-5/5.5/qtbase/0004-tzdir.patch | 6 +-- .../5.5/qtbase/0005-dlopen-libXcursor.patch | 6 +-- .../qt-5/5.5/qtbase/0006-dlopen-openssl.patch | 6 +-- .../qt-5/5.5/qtbase/0007-dlopen-dbus.patch | 6 +-- .../5.5/qtbase/0008-xdg-config-dirs.patch | 6 +-- .../5.5/qtbase/0009-decrypt-ssl-traffic.patch | 6 +-- .../qt-5/5.5/qtbase/0010-mkspecs-libgl.patch | 27 +++++++++++++ .../0011-nix-profiles-library-paths.patch | 38 +++++++++++++++++++ .../qt-5/5.5/qtbase/0014-mkspecs-libgl.patch | 17 --------- .../libraries/qt-5/5.5/qtbase/default.nix | 5 ++- 13 files changed, 95 insertions(+), 46 deletions(-) create mode 100644 pkgs/development/libraries/qt-5/5.5/qtbase/0010-mkspecs-libgl.patch create mode 100644 pkgs/development/libraries/qt-5/5.5/qtbase/0011-nix-profiles-library-paths.patch delete mode 100644 pkgs/development/libraries/qt-5/5.5/qtbase/0014-mkspecs-libgl.patch diff --git a/pkgs/development/libraries/qt-5/5.5/qtbase/0001-dlopen-gtkstyle.patch b/pkgs/development/libraries/qt-5/5.5/qtbase/0001-dlopen-gtkstyle.patch index b86dfaf628b3..a4211378b904 100644 --- a/pkgs/development/libraries/qt-5/5.5/qtbase/0001-dlopen-gtkstyle.patch +++ b/pkgs/development/libraries/qt-5/5.5/qtbase/0001-dlopen-gtkstyle.patch @@ -1,7 +1,7 @@ -From d3224286c647f1d1e7dac485bbeee5bc8286e6c6 Mon Sep 17 00:00:00 2001 +From 5334f7d5d3e7be31ea25c3553dfb60f283a14669 Mon Sep 17 00:00:00 2001 From: Thomas Tuegel Date: Mon, 1 Dec 2014 17:21:58 -0600 -Subject: [PATCH 1/9] dlopen-gtkstyle +Subject: [PATCH 01/11] dlopen-gtkstyle --- qtbase/src/widgets/styles/qgtk2painter.cpp | 2 +- @@ -59,5 +59,5 @@ index 0e119a1..ad6caa1 100644 return (QGtkStylePrivate::gconf_client_get_default !=0); } -- -2.5.0 +2.5.2 diff --git a/pkgs/development/libraries/qt-5/5.5/qtbase/0002-dlopen-resolv.patch b/pkgs/development/libraries/qt-5/5.5/qtbase/0002-dlopen-resolv.patch index 90afce32dc13..ce768fec80c4 100644 --- a/pkgs/development/libraries/qt-5/5.5/qtbase/0002-dlopen-resolv.patch +++ b/pkgs/development/libraries/qt-5/5.5/qtbase/0002-dlopen-resolv.patch @@ -1,7 +1,7 @@ -From af315c076c8626292075592fab1726fcd62c3169 Mon Sep 17 00:00:00 2001 +From 51ae02d8c9de1cb93bf22b2519efb119dd2e39d9 Mon Sep 17 00:00:00 2001 From: Thomas Tuegel Date: Mon, 1 Dec 2014 17:22:55 -0600 -Subject: [PATCH 2/9] dlopen-resolv +Subject: [PATCH 02/11] dlopen-resolv --- qtbase/src/network/kernel/qdnslookup_unix.cpp | 2 +- @@ -35,5 +35,5 @@ index 90a6f76..758407a 100644 return; } -- -2.5.0 +2.5.2 diff --git a/pkgs/development/libraries/qt-5/5.5/qtbase/0003-dlopen-gl.patch b/pkgs/development/libraries/qt-5/5.5/qtbase/0003-dlopen-gl.patch index a8a0bdf44106..0f8bd78aa320 100644 --- a/pkgs/development/libraries/qt-5/5.5/qtbase/0003-dlopen-gl.patch +++ b/pkgs/development/libraries/qt-5/5.5/qtbase/0003-dlopen-gl.patch @@ -1,7 +1,7 @@ -From fc9f34b6e8a290615868e27bfcd31c355d11487c Mon Sep 17 00:00:00 2001 +From d1f7bf62e4bab26df5deea37f08cfdd278cca47c Mon Sep 17 00:00:00 2001 From: Thomas Tuegel Date: Mon, 1 Dec 2014 17:23:08 -0600 -Subject: [PATCH 3/9] dlopen-gl +Subject: [PATCH 03/11] dlopen-gl --- .../plugins/platforms/xcb/gl_integrations/xcb_glx/qglxintegration.cpp | 2 +- @@ -21,5 +21,5 @@ index 5166372..bdeb69a 100644 } } -- -2.5.0 +2.5.2 diff --git a/pkgs/development/libraries/qt-5/5.5/qtbase/0004-tzdir.patch b/pkgs/development/libraries/qt-5/5.5/qtbase/0004-tzdir.patch index a4e9cd986a24..c2564df4e1a1 100644 --- a/pkgs/development/libraries/qt-5/5.5/qtbase/0004-tzdir.patch +++ b/pkgs/development/libraries/qt-5/5.5/qtbase/0004-tzdir.patch @@ -1,7 +1,7 @@ -From b1a0771652ddf91058f67fa92260a89c43f5c530 Mon Sep 17 00:00:00 2001 +From 26c73d6da84f1b4797421b9ddecef18d6ce588f0 Mon Sep 17 00:00:00 2001 From: Thomas Tuegel Date: Mon, 1 Dec 2014 17:23:22 -0600 -Subject: [PATCH 4/9] tzdir +Subject: [PATCH 04/11] tzdir --- qtbase/src/corelib/tools/qtimezoneprivate_tz.cpp | 21 +++++++++++++++------ @@ -48,5 +48,5 @@ index 29f0e17..3878974 100644 } -- -2.5.0 +2.5.2 diff --git a/pkgs/development/libraries/qt-5/5.5/qtbase/0005-dlopen-libXcursor.patch b/pkgs/development/libraries/qt-5/5.5/qtbase/0005-dlopen-libXcursor.patch index fe53e0e7c48b..61c9b9846f5a 100644 --- a/pkgs/development/libraries/qt-5/5.5/qtbase/0005-dlopen-libXcursor.patch +++ b/pkgs/development/libraries/qt-5/5.5/qtbase/0005-dlopen-libXcursor.patch @@ -1,7 +1,7 @@ -From 5fbe717120864d490fa4d60bc7f7676ac19bd69d Mon Sep 17 00:00:00 2001 +From 9fbdfd6c1231ee4778acc9a2edf297cf4b9314ac Mon Sep 17 00:00:00 2001 From: Thomas Tuegel Date: Mon, 1 Dec 2014 17:33:51 -0600 -Subject: [PATCH 5/9] dlopen-libXcursor +Subject: [PATCH 05/11] dlopen-libXcursor --- qtbase/src/plugins/platforms/xcb/qxcbcursor.cpp | 4 ++-- @@ -25,5 +25,5 @@ index e51ab85..7ec4b0b 100644 } if (xcursorFound) { -- -2.5.0 +2.5.2 diff --git a/pkgs/development/libraries/qt-5/5.5/qtbase/0006-dlopen-openssl.patch b/pkgs/development/libraries/qt-5/5.5/qtbase/0006-dlopen-openssl.patch index 718ff08ca43f..ad48133d93f7 100644 --- a/pkgs/development/libraries/qt-5/5.5/qtbase/0006-dlopen-openssl.patch +++ b/pkgs/development/libraries/qt-5/5.5/qtbase/0006-dlopen-openssl.patch @@ -1,7 +1,7 @@ -From 4c4b1f2a35644014da79d089d3860e518fa9a27d Mon Sep 17 00:00:00 2001 +From 2d7e4e21291238e2b41d0e173f918cd3530c8ade Mon Sep 17 00:00:00 2001 From: Thomas Tuegel Date: Sun, 23 Aug 2015 08:52:04 -0500 -Subject: [PATCH 6/9] dlopen openssl +Subject: [PATCH 06/11] dlopen openssl --- qtbase/src/network/ssl/qsslsocket_openssl_symbols.cpp | 8 ++++---- @@ -34,5 +34,5 @@ index e2700df..a7ccf88 100644 // libssl.so.0 and libcrypto.so.0 found return pair; -- -2.5.0 +2.5.2 diff --git a/pkgs/development/libraries/qt-5/5.5/qtbase/0007-dlopen-dbus.patch b/pkgs/development/libraries/qt-5/5.5/qtbase/0007-dlopen-dbus.patch index 96d268c358bd..dcd5855e824e 100644 --- a/pkgs/development/libraries/qt-5/5.5/qtbase/0007-dlopen-dbus.patch +++ b/pkgs/development/libraries/qt-5/5.5/qtbase/0007-dlopen-dbus.patch @@ -1,7 +1,7 @@ -From a23141d76cdde068ba1cefdad4a6352c921ce7c9 Mon Sep 17 00:00:00 2001 +From d060d32d8df3e320a12567ebdfc2c1d01c648168 Mon Sep 17 00:00:00 2001 From: Thomas Tuegel Date: Sun, 23 Aug 2015 08:52:27 -0500 -Subject: [PATCH 7/9] dlopen dbus +Subject: [PATCH 07/11] dlopen dbus --- qtbase/src/dbus/qdbus_symbols.cpp | 2 +- @@ -21,5 +21,5 @@ index b82d92b..f72c9cb 100644 lib->unload(); -- -2.5.0 +2.5.2 diff --git a/pkgs/development/libraries/qt-5/5.5/qtbase/0008-xdg-config-dirs.patch b/pkgs/development/libraries/qt-5/5.5/qtbase/0008-xdg-config-dirs.patch index 4d23d640df00..ebb572081bf1 100644 --- a/pkgs/development/libraries/qt-5/5.5/qtbase/0008-xdg-config-dirs.patch +++ b/pkgs/development/libraries/qt-5/5.5/qtbase/0008-xdg-config-dirs.patch @@ -1,7 +1,7 @@ -From a7dc6209542ef8aa54191c0e17fbb9b41cbad67f Mon Sep 17 00:00:00 2001 +From 253c0829d4bc30da0152a22114a949449796ec7d Mon Sep 17 00:00:00 2001 From: Thomas Tuegel Date: Sun, 23 Aug 2015 08:52:57 -0500 -Subject: [PATCH 8/9] xdg config dirs +Subject: [PATCH 08/11] xdg config dirs --- qtbase/src/corelib/io/qsettings.cpp | 18 ++++++++++++++++++ @@ -51,5 +51,5 @@ index 93d63fd..160b197 100644 SandboxConfFile = 0, NumConfFiles = 1 -- -2.5.0 +2.5.2 diff --git a/pkgs/development/libraries/qt-5/5.5/qtbase/0009-decrypt-ssl-traffic.patch b/pkgs/development/libraries/qt-5/5.5/qtbase/0009-decrypt-ssl-traffic.patch index 8c8ec6974585..1d7202924cd3 100644 --- a/pkgs/development/libraries/qt-5/5.5/qtbase/0009-decrypt-ssl-traffic.patch +++ b/pkgs/development/libraries/qt-5/5.5/qtbase/0009-decrypt-ssl-traffic.patch @@ -1,7 +1,7 @@ -From 64bc88615a4cb58d461fe600b46611415d74b7b2 Mon Sep 17 00:00:00 2001 +From 44378743aa6ca21eb61de93476daa8356081c0fc Mon Sep 17 00:00:00 2001 From: Thomas Tuegel Date: Sun, 23 Aug 2015 08:53:42 -0500 -Subject: [PATCH 9/9] decrypt ssl traffic +Subject: [PATCH 09/11] decrypt ssl traffic --- qtbase/src/network/ssl/qsslsocket_openssl.cpp | 2 +- @@ -21,5 +21,5 @@ index 049666b..e8342ab 100644 #include "qssl_p.h" #include "qsslsocket_openssl_p.h" -- -2.5.0 +2.5.2 diff --git a/pkgs/development/libraries/qt-5/5.5/qtbase/0010-mkspecs-libgl.patch b/pkgs/development/libraries/qt-5/5.5/qtbase/0010-mkspecs-libgl.patch new file mode 100644 index 000000000000..0f418e600f15 --- /dev/null +++ b/pkgs/development/libraries/qt-5/5.5/qtbase/0010-mkspecs-libgl.patch @@ -0,0 +1,27 @@ +From 5113406661f06afa01da48ebc0567a4d0f69051c Mon Sep 17 00:00:00 2001 +From: Thomas Tuegel +Date: Sat, 17 Oct 2015 09:12:46 -0500 +Subject: [PATCH 10/11] mkspecs libgl + +--- + qtbase/mkspecs/common/linux.conf | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/qtbase/mkspecs/common/linux.conf b/qtbase/mkspecs/common/linux.conf +index 8d6fb6f..0ff9181 100644 +--- a/qtbase/mkspecs/common/linux.conf ++++ b/qtbase/mkspecs/common/linux.conf +@@ -12,8 +12,8 @@ QMAKE_INCDIR = + QMAKE_LIBDIR = + QMAKE_INCDIR_X11 = + QMAKE_LIBDIR_X11 = +-QMAKE_INCDIR_OPENGL = +-QMAKE_LIBDIR_OPENGL = ++QMAKE_INCDIR_OPENGL = @mesa@/include ++QMAKE_LIBDIR_OPENGL = @mesa@/lib + QMAKE_INCDIR_OPENGL_ES2 = $$QMAKE_INCDIR_OPENGL + QMAKE_LIBDIR_OPENGL_ES2 = $$QMAKE_LIBDIR_OPENGL + QMAKE_INCDIR_EGL = +-- +2.5.2 + diff --git a/pkgs/development/libraries/qt-5/5.5/qtbase/0011-nix-profiles-library-paths.patch b/pkgs/development/libraries/qt-5/5.5/qtbase/0011-nix-profiles-library-paths.patch new file mode 100644 index 000000000000..8eaf2f4ffac5 --- /dev/null +++ b/pkgs/development/libraries/qt-5/5.5/qtbase/0011-nix-profiles-library-paths.patch @@ -0,0 +1,38 @@ +From 2da5e660c4b470444e756f2ec88cb520a124bc99 Mon Sep 17 00:00:00 2001 +From: Thomas Tuegel +Date: Sat, 17 Oct 2015 09:20:35 -0500 +Subject: [PATCH] nix profiles library paths + +--- + qtbase/src/corelib/kernel/qcoreapplication.cpp | 15 +++++++++++++++ + 1 file changed, 15 insertions(+) + +diff --git a/qtbase/src/corelib/kernel/qcoreapplication.cpp b/qtbase/src/corelib/kernel/qcoreapplication.cpp +index ecafe91..96e3eb5 100644 +--- a/qtbase/src/corelib/kernel/qcoreapplication.cpp ++++ b/qtbase/src/corelib/kernel/qcoreapplication.cpp +@@ -2496,6 +2496,21 @@ QStringList QCoreApplication::libraryPaths() + } + } + } ++ ++ // Add library paths derived from NIX_PROFILES. ++ const QByteArray nixProfilesEnv = qgetenv("NIX_PROFILES"); ++ if (!nixProfilesEnv.isEmpty()) { ++ QLatin1Char pathSep(' '); ++ QStringList paths = QFile::decodeName(nixProfilesEnv).split(pathSep, QString::SkipEmptyParts); ++ for (QStringList::iterator it = paths.begin(); it != paths.end(); ++it) { ++ it->append("/lib/qt5/plugins"); ++ QString canonicalPath = QDir(*it).canonicalPath(); ++ if (!canonicalPath.isEmpty() ++ && !app_libpaths->contains(canonicalPath)) { ++ app_libpaths->append(canonicalPath); ++ } ++ } ++ } + } + return *(coreappdata()->app_libpaths); + } +-- +2.5.2 + diff --git a/pkgs/development/libraries/qt-5/5.5/qtbase/0014-mkspecs-libgl.patch b/pkgs/development/libraries/qt-5/5.5/qtbase/0014-mkspecs-libgl.patch deleted file mode 100644 index 1fc4bbd60765..000000000000 --- a/pkgs/development/libraries/qt-5/5.5/qtbase/0014-mkspecs-libgl.patch +++ /dev/null @@ -1,17 +0,0 @@ -Ensure Qt knows where libGL is. - -Author: Bjørn Forsman -diff -uNr qt-everywhere-opensource-src-5.3.2.orig/qtbase/mkspecs/common/linux.conf qt-everywhere-opensource-src-5.3.2/qtbase/mkspecs/common/linux.conf ---- qt-everywhere-opensource-src-5.3.2.orig/qtbase/mkspecs/common/linux.conf 2014-09-11 12:48:07.000000000 +0200 -+++ qt-everywhere-opensource-src-5.3.2/qtbase/mkspecs/common/linux.conf 2015-08-23 13:03:30.617473019 +0200 -@@ -12,8 +12,8 @@ - QMAKE_LIBDIR = - QMAKE_INCDIR_X11 = - QMAKE_LIBDIR_X11 = --QMAKE_INCDIR_OPENGL = --QMAKE_LIBDIR_OPENGL = -+QMAKE_INCDIR_OPENGL = @mesa@/include -+QMAKE_LIBDIR_OPENGL = @mesa@/lib - QMAKE_INCDIR_OPENGL_ES2 = $$QMAKE_INCDIR_OPENGL - QMAKE_LIBDIR_OPENGL_ES2 = $$QMAKE_LIBDIR_OPENGL - QMAKE_INCDIR_EGL = diff --git a/pkgs/development/libraries/qt-5/5.5/qtbase/default.nix b/pkgs/development/libraries/qt-5/5.5/qtbase/default.nix index a80810353ad4..7c48c4571d92 100644 --- a/pkgs/development/libraries/qt-5/5.5/qtbase/default.nix +++ b/pkgs/development/libraries/qt-5/5.5/qtbase/default.nix @@ -84,12 +84,13 @@ stdenv.mkDerivation { xdg-config-dirs = ./0008-xdg-config-dirs.patch; decrypt-ssl-traffic = ./0009-decrypt-ssl-traffic.patch; mkspecs-libgl = substituteAll { - src = ./0014-mkspecs-libgl.patch; + src = ./0010-mkspecs-libgl.patch; inherit mesa; }; + nix-profiles-library-paths = ./0011-nix-profiles-library-paths.patch; in [ dlopen-resolv dlopen-gl tzdir dlopen-libXcursor dlopen-openssl - dlopen-dbus xdg-config-dirs + dlopen-dbus xdg-config-dirs nix-profiles-library-paths ] ++ optional gtkStyle dlopen-gtkstyle ++ optional decryptSslTraffic decrypt-ssl-traffic From b1f904f69a61ad5faeb7bf84cfd14782bef9f069 Mon Sep 17 00:00:00 2001 From: Thomas Tuegel Date: Sat, 17 Oct 2015 09:32:13 -0500 Subject: [PATCH 058/162] qt55: set Qt Quick import paths from NIX_PROFILES --- .../libraries/qt-5/5.5/default.nix | 2 +- .../0001-nix-profiles-import-paths.patch | 37 +++++++++++++++++++ .../{qtquick1.nix => qtquick1/default.nix} | 1 + 3 files changed, 39 insertions(+), 1 deletion(-) create mode 100644 pkgs/development/libraries/qt-5/5.5/qtquick1/0001-nix-profiles-import-paths.patch rename pkgs/development/libraries/qt-5/5.5/{qtquick1.nix => qtquick1/default.nix} (73%) diff --git a/pkgs/development/libraries/qt-5/5.5/default.nix b/pkgs/development/libraries/qt-5/5.5/default.nix index d5f542a06fa3..1391667e3eb7 100644 --- a/pkgs/development/libraries/qt-5/5.5/default.nix +++ b/pkgs/development/libraries/qt-5/5.5/default.nix @@ -83,7 +83,7 @@ let qtmultimedia = callPackage ./qtmultimedia.nix { inherit (pkgs.gst_all_1) gstreamer gst-plugins-base; }; - qtquick1 = callPackage ./qtquick1.nix {}; + qtquick1 = callPackage ./qtquick1 {}; qtquickcontrols = callPackage ./qtquickcontrols.nix {}; qtscript = callPackage ./qtscript {}; qtsensors = callPackage ./qtsensors.nix {}; diff --git a/pkgs/development/libraries/qt-5/5.5/qtquick1/0001-nix-profiles-import-paths.patch b/pkgs/development/libraries/qt-5/5.5/qtquick1/0001-nix-profiles-import-paths.patch new file mode 100644 index 000000000000..63b141f6ce5a --- /dev/null +++ b/pkgs/development/libraries/qt-5/5.5/qtquick1/0001-nix-profiles-import-paths.patch @@ -0,0 +1,37 @@ +From bbc706b3fcb90ca3b2b51d5e3434145572152711 Mon Sep 17 00:00:00 2001 +From: Thomas Tuegel +Date: Sat, 17 Oct 2015 09:29:51 -0500 +Subject: [PATCH] nix profiles import paths + +--- + src/declarative/qml/qdeclarativeimport.cpp | 14 ++++++++++++++ + 1 file changed, 14 insertions(+) + +diff --git a/src/declarative/qml/qdeclarativeimport.cpp b/src/declarative/qml/qdeclarativeimport.cpp +index 9404834..d185ed5 100644 +--- a/src/declarative/qml/qdeclarativeimport.cpp ++++ b/src/declarative/qml/qdeclarativeimport.cpp +@@ -725,6 +725,20 @@ QDeclarativeImportDatabase::QDeclarativeImportDatabase(QDeclarativeEngine *e) + + addImportPath(installImportsPath); + ++ // Add import paths derived from NIX_PROFILES. ++ const QByteArray nixProfilesEnv = qgetenv("NIX_PROFILES"); ++ if (!nixProfilesEnv.isEmpty()) { ++ QLatin1Char pathSep(' '); ++ QStringList paths = QFile::decodeName(nixProfilesEnv).split(pathSep, QString::SkipEmptyParts); ++ for (QStringList::iterator it = paths.begin(); it != paths.end(); ++it) { ++ it->append("/lib/qt5/imports"); ++ QString canonicalPath = QDir(*it).canonicalPath(); ++ if (!canonicalPath.isEmpty()) { ++ addImportPath(canonicalPath); ++ } ++ } ++ } ++ + // env import paths + QByteArray envImportPath = qgetenv("QML_IMPORT_PATH"); + if (!envImportPath.isEmpty()) { +-- +2.5.2 + diff --git a/pkgs/development/libraries/qt-5/5.5/qtquick1.nix b/pkgs/development/libraries/qt-5/5.5/qtquick1/default.nix similarity index 73% rename from pkgs/development/libraries/qt-5/5.5/qtquick1.nix rename to pkgs/development/libraries/qt-5/5.5/qtquick1/default.nix index 23282e029065..d1c7bb389a49 100644 --- a/pkgs/development/libraries/qt-5/5.5/qtquick1.nix +++ b/pkgs/development/libraries/qt-5/5.5/qtquick1/default.nix @@ -2,5 +2,6 @@ qtSubmodule { name = "qtquick1"; + patches = [ ./0001-nix-profiles-import-paths.patch ]; qtInputs = [ qtscript qtsvg qtwebkit qtxmlpatterns ]; } From fb375f1a2eb64517df81ae9ff909461c60910c0c Mon Sep 17 00:00:00 2001 From: Thomas Tuegel Date: Sat, 17 Oct 2015 09:33:51 -0500 Subject: [PATCH 059/162] qt55: set QML import paths from NIX_PROFILES --- .../libraries/qt-5/5.5/default.nix | 2 +- .../0001-nix-profiles-import-paths.patch | 37 +++++++++++++++++++ .../default.nix} | 1 + 3 files changed, 39 insertions(+), 1 deletion(-) create mode 100644 pkgs/development/libraries/qt-5/5.5/qtdeclarative/0001-nix-profiles-import-paths.patch rename pkgs/development/libraries/qt-5/5.5/{qtdeclarative.nix => qtdeclarative/default.nix} (75%) diff --git a/pkgs/development/libraries/qt-5/5.5/default.nix b/pkgs/development/libraries/qt-5/5.5/default.nix index 1391667e3eb7..10d7f6eb914e 100644 --- a/pkgs/development/libraries/qt-5/5.5/default.nix +++ b/pkgs/development/libraries/qt-5/5.5/default.nix @@ -73,7 +73,7 @@ let /* qtandroidextras = not packaged */ /* qtcanvas3d = not packaged */ qtconnectivity = callPackage ./qtconnectivity.nix {}; - qtdeclarative = callPackage ./qtdeclarative.nix {}; + qtdeclarative = callPackage ./qtdeclarative {}; qtdoc = callPackage ./qtdoc.nix {}; qtenginio = callPackage ./qtenginio.nix {}; qtgraphicaleffects = callPackage ./qtgraphicaleffects.nix {}; diff --git a/pkgs/development/libraries/qt-5/5.5/qtdeclarative/0001-nix-profiles-import-paths.patch b/pkgs/development/libraries/qt-5/5.5/qtdeclarative/0001-nix-profiles-import-paths.patch new file mode 100644 index 000000000000..8e86f97a9477 --- /dev/null +++ b/pkgs/development/libraries/qt-5/5.5/qtdeclarative/0001-nix-profiles-import-paths.patch @@ -0,0 +1,37 @@ +From 3f6fa74067aacd0e595e45b4ef7ce754514cb205 Mon Sep 17 00:00:00 2001 +From: Thomas Tuegel +Date: Sat, 17 Oct 2015 09:28:18 -0500 +Subject: [PATCH] nix profiles import paths + +--- + src/qml/qml/qqmlimport.cpp | 14 ++++++++++++++ + 1 file changed, 14 insertions(+) + +diff --git a/src/qml/qml/qqmlimport.cpp b/src/qml/qml/qqmlimport.cpp +index 5a54609..f33c2f9 100644 +--- a/src/qml/qml/qqmlimport.cpp ++++ b/src/qml/qml/qqmlimport.cpp +@@ -1549,6 +1549,20 @@ QQmlImportDatabase::QQmlImportDatabase(QQmlEngine *e) + QString installImportsPath = QLibraryInfo::location(QLibraryInfo::Qml2ImportsPath); + addImportPath(installImportsPath); + ++ // Add import paths derived from NIX_PROFILES. ++ const QByteArray nixProfilesEnv = qgetenv("NIX_PROFILES"); ++ if (!nixProfilesEnv.isEmpty()) { ++ QLatin1Char pathSep(' '); ++ QStringList paths = QFile::decodeName(nixProfilesEnv).split(pathSep, QString::SkipEmptyParts); ++ for (QStringList::iterator it = paths.begin(); it != paths.end(); ++it) { ++ it->append("/lib/qt5/qml"); ++ QString canonicalPath = QDir(*it).canonicalPath(); ++ if (!canonicalPath.isEmpty()) { ++ addImportPath(canonicalPath); ++ } ++ } ++ } ++ + // env import paths + QByteArray envImportPath = qgetenv("QML2_IMPORT_PATH"); + if (!envImportPath.isEmpty()) { +-- +2.5.2 + diff --git a/pkgs/development/libraries/qt-5/5.5/qtdeclarative.nix b/pkgs/development/libraries/qt-5/5.5/qtdeclarative/default.nix similarity index 75% rename from pkgs/development/libraries/qt-5/5.5/qtdeclarative.nix rename to pkgs/development/libraries/qt-5/5.5/qtdeclarative/default.nix index a71f11b7d40d..9181c37b2258 100644 --- a/pkgs/development/libraries/qt-5/5.5/qtdeclarative.nix +++ b/pkgs/development/libraries/qt-5/5.5/qtdeclarative/default.nix @@ -2,6 +2,7 @@ qtSubmodule { name = "qtdeclarative"; + patches = [ ./0001-nix-profiles-import-paths.patch ]; qtInputs = [ qtbase qtsvg qtxmlpatterns ]; nativeBuildInputs = [ python ]; } From 300b5eb7edcd887681c96a7a015340d92c05adc5 Mon Sep 17 00:00:00 2001 From: Thomas Tuegel Date: Sat, 17 Oct 2015 09:34:11 -0500 Subject: [PATCH 060/162] makeKDEWrapper: allow impure wrappers --- .../kde-frameworks-5.15/make-kde-wrapper.sh | 16 ++++++++++++---- 1 file changed, 12 insertions(+), 4 deletions(-) diff --git a/pkgs/development/libraries/kde-frameworks-5.15/make-kde-wrapper.sh b/pkgs/development/libraries/kde-frameworks-5.15/make-kde-wrapper.sh index 83ffcc93935a..9996e3cae712 100644 --- a/pkgs/development/libraries/kde-frameworks-5.15/make-kde-wrapper.sh +++ b/pkgs/development/libraries/kde-frameworks-5.15/make-kde-wrapper.sh @@ -1,15 +1,23 @@ makeKDEWrapper() { - KSERVICE_BUILD_KDESYCOCA=${KDESYCOCA:+1} local old="$1" local new="$2" shift shift - makeQtWrapper "$old" "$new" ${KDESYCOCA:+--set KDESYCOCA "$KDESYCOCA"} "$@" + if [[ -z "$KDE_WRAPPER_IMPURE" ]]; then + KSERVICE_BUILD_KDESYCOCA=${KDESYCOCA:+1} + makeQtWrapper "$old" "$new" ${KDESYCOCA:+--set KDESYCOCA "$KDESYCOCA"} "$@" + else + makeQtWrapper "$old" "$new" "$@" + fi } wrapKDEProgram() { - KSERVICE_BUILD_KDESYCOCA=${KDESYCOCA:+1} local prog="$1" shift - wrapQtProgram "$prog" ${KDESYCOCA:+--set KDESYCOCA "$KDESYCOCA"} "$@" + if [[ -z "$KDE_WRAPPER_IMPURE" ]]; then + KSERVICE_BUILD_KDESYCOCA=${KDESYCOCA:+1} + wrapQtProgram "$prog" ${KDESYCOCA:+--set KDESYCOCA "$KDESYCOCA"} "$@" + else + wrapQtProgram "$prog" "$@" + fi } From e4873abc262aa21880a41f75f079c7384c07ba74 Mon Sep 17 00:00:00 2001 From: Thomas Tuegel Date: Sat, 17 Oct 2015 09:34:26 -0500 Subject: [PATCH 061/162] plasma-workspace: use impure wrappers --- pkgs/desktops/plasma-5.4/plasma-workspace/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/desktops/plasma-5.4/plasma-workspace/default.nix b/pkgs/desktops/plasma-5.4/plasma-workspace/default.nix index 6ecc56cdb301..a2843a192907 100644 --- a/pkgs/desktops/plasma-5.4/plasma-workspace/default.nix +++ b/pkgs/desktops/plasma-5.4/plasma-workspace/default.nix @@ -40,6 +40,7 @@ plasmaPackage { ''; postInstall = '' export QT_WRAPPER_IMPURE=1 + export KDE_WRAPPER_IMPURE=1 wrapKDEProgram "$out/bin/ksmserver" wrapKDEProgram "$out/bin/plasmawindowed" wrapKDEProgram "$out/bin/kcminit_startup" From 80670a2d13d87b6d1f58f86a8df241b09512cba6 Mon Sep 17 00:00:00 2001 From: Thomas Tuegel Date: Sat, 17 Oct 2015 09:39:40 -0500 Subject: [PATCH 062/162] nixos/environment: don't set Qt 5 paths --- nixos/modules/programs/environment.nix | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/nixos/modules/programs/environment.nix b/nixos/modules/programs/environment.nix index 52f6cc221119..a35b5cc9513e 100644 --- a/nixos/modules/programs/environment.nix +++ b/nixos/modules/programs/environment.nix @@ -38,9 +38,7 @@ in PERL5LIB = [ "/lib/perl5/site_perl" ]; KDEDIRS = [ "" ]; STRIGI_PLUGIN_PATH = [ "/lib/strigi/" ]; - QT_PLUGIN_PATH = [ "/lib/qt4/plugins" "/lib/kde4/plugins" "/lib/qt5/plugins" ]; - QML_IMPORT_PATH = [ "/lib/qt5/imports" ]; - QML2_IMPORT_PATH = [ "/lib/qt5/qml" ]; + QT_PLUGIN_PATH = [ "/lib/qt4/plugins" "/lib/kde4/plugins" ]; QTWEBKIT_PLUGIN_PATH = [ "/lib/mozilla/plugins/" ]; GTK_PATH = [ "/lib/gtk-2.0" "/lib/gtk-3.0" ]; XDG_CONFIG_DIRS = [ "/etc/xdg" ]; From 5d4950a02cbb97f670ea877d7d49964e71d49d8e Mon Sep 17 00:00:00 2001 From: Thomas Tuegel Date: Sat, 17 Oct 2015 10:40:33 -0500 Subject: [PATCH 063/162] nixos/kde5: only install required packages --- .../services/x11/desktop-managers/kde5.nix | 39 ++++++++++++++++--- 1 file changed, 33 insertions(+), 6 deletions(-) diff --git a/nixos/modules/services/x11/desktop-managers/kde5.nix b/nixos/modules/services/x11/desktop-managers/kde5.nix index b0528d185e2c..831c95cd850c 100644 --- a/nixos/modules/services/x11/desktop-managers/kde5.nix +++ b/nixos/modules/services/x11/desktop-managers/kde5.nix @@ -36,9 +36,7 @@ let (name: attrByPath [name] (throw "unknown phonon backend `${name}'") phononBackends); kf5 = pkgs.kf5_stable; - plasma5 = pkgs.plasma5_stable; - kdeApps = pkgs.kdeApps_stable; in @@ -88,18 +86,47 @@ in }; environment.systemPackages = - filter isDerivation (builtins.attrValues plasma5) - ++ filter isDerivation (builtins.attrValues kf5) - ++ [ + [ pkgs.qt4 # qtconfig is the only way to set Qt 4 theme + kf5.kinit + kf5.kglobalaccel + + plasma5.breeze + plasma5.kde-cli-tools + plasma5.kdeplasma-addons + plasma5.kgamma5 + plasma5.khelpcenter + plasma5.khotkeys + plasma5.kinfocenter + plasma5.kmenuedit + plasma5.kscreen + plasma5.ksysguard + plasma5.kwayland + plasma5.kwin + plasma5.kwrited + plasma5.milou + plasma5.oxygen + plasma5.polkit-kde-agent + plasma5.systemsettings + + plasma5.plasma-desktop + plasma5.plasma-workspace + plasma5.plasma-workspace-wallpapers + kdeApps.dolphin kdeApps.konsole pkgs.hicolor_icon_theme + plasma5.kde-gtk-config pkgs.orion # GTK theme, nearly identical to Breeze - ] ++ phononBackendPackages; + ] + ++ lib.optional config.hardware.bluetooth.enable plasma5.bluedevil + ++ lib.optional config.networking.networkmanager.enable plasma5.plasma-nm + ++ lib.optional config.hardware.pulseaudio.enable plasma5.plasma-pa + ++ lib.optional config.powerManagement.enable plasma5.powerdevil + ++ phononBackendPackages; environment.pathsToLink = [ "/share" ]; From 2386bd7c61e899667b8a388b588557c132eb64a3 Mon Sep 17 00:00:00 2001 From: Thomas Tuegel Date: Sat, 17 Oct 2015 10:47:04 -0500 Subject: [PATCH 064/162] nixos/kde5: refine Phonon backend options --- .../services/x11/desktop-managers/kde5.nix | 78 ++++++++++--------- 1 file changed, 41 insertions(+), 37 deletions(-) diff --git a/nixos/modules/services/x11/desktop-managers/kde5.nix b/nixos/modules/services/x11/desktop-managers/kde5.nix index 831c95cd850c..62931d9b1dac 100644 --- a/nixos/modules/services/x11/desktop-managers/kde5.nix +++ b/nixos/modules/services/x11/desktop-managers/kde5.nix @@ -8,33 +8,6 @@ let cfg = xcfg.desktopManager.kde5; xorg = pkgs.xorg; - phononBackends = { - gstreamer = [ - pkgs.phonon_backend_gstreamer - pkgs.gst_all.gstreamer - pkgs.gst_all.gstPluginsBase - pkgs.gst_all.gstPluginsGood - pkgs.gst_all.gstPluginsUgly - pkgs.gst_all.gstPluginsBad - pkgs.gst_all.gstFfmpeg # for mp3 playback - pkgs.phonon_qt5_backend_gstreamer - pkgs.gst_all_1.gstreamer - pkgs.gst_all_1.gst-plugins-base - pkgs.gst_all_1.gst-plugins-good - pkgs.gst_all_1.gst-plugins-ugly - pkgs.gst_all_1.gst-plugins-bad - pkgs.gst_all_1.gst-libav # for mp3 playback - ]; - - vlc = [ - pkgs.phonon_qt5_backend_vlc - pkgs.phonon_backend_vlc - ]; - }; - - phononBackendPackages = flip concatMap cfg.phononBackends - (name: attrByPath [name] (throw "unknown phonon backend `${name}'") phononBackends); - kf5 = pkgs.kf5_stable; plasma5 = pkgs.plasma5_stable; kdeApps = pkgs.kdeApps_stable; @@ -51,14 +24,24 @@ in description = "Enable the Plasma 5 (KDE 5) desktop environment."; }; - phononBackends = mkOption { - type = types.listOf types.str; - default = ["gstreamer"]; - example = ["gstreamer" "vlc"]; - description = '' - Phonon backends to use in KDE. Only the VLC and GStreamer backends are - available. The GStreamer backend is preferred by upstream. - ''; + phonon = { + + gstreamer = { + enable = mkOption { + type = types.bool; + default = true; + description = "Enable the GStreamer Phonon backend (recommended)."; + }; + }; + + vlc = { + enable = mkOption { + type = types.bool; + default = false; + description = "Enable the VLC Phonon backend."; + }; + }; + }; }; @@ -126,7 +109,28 @@ in ++ lib.optional config.networking.networkmanager.enable plasma5.plasma-nm ++ lib.optional config.hardware.pulseaudio.enable plasma5.plasma-pa ++ lib.optional config.powerManagement.enable plasma5.powerdevil - ++ phononBackendPackages; + ++ lib.optionals cfg.phonon.gstreamer.enable + [ + pkgs.phonon_backend_gstreamer + pkgs.gst_all.gstreamer + pkgs.gst_all.gstPluginsBase + pkgs.gst_all.gstPluginsGood + pkgs.gst_all.gstPluginsUgly + pkgs.gst_all.gstPluginsBad + pkgs.gst_all.gstFfmpeg # for mp3 playback + pkgs.phonon_qt5_backend_gstreamer + pkgs.gst_all_1.gstreamer + pkgs.gst_all_1.gst-plugins-base + pkgs.gst_all_1.gst-plugins-good + pkgs.gst_all_1.gst-plugins-ugly + pkgs.gst_all_1.gst-plugins-bad + pkgs.gst_all_1.gst-libav # for mp3 playback + ] + ++ lib.optionals cfg.phonon.vlc.enable + [ + pkgs.phonon_qt5_backend_vlc + pkgs.phonon_backend_vlc + ]; environment.pathsToLink = [ "/share" ]; @@ -136,7 +140,7 @@ in }; environment.profileRelativeEnvVars = - mkIf (lib.elem "gstreamer" cfg.phononBackends) + mkIf cfg.phonon.gstreamer.enable { GST_PLUGIN_SYSTEM_PATH = [ "/lib/gstreamer-0.10" ]; GST_PLUGIN_SYSTEM_PATH_1_0 = [ "/lib/gstreamer-1.0" ]; From 5df5e1f1651066c4d9293f6cdeb83f9d18a07704 Mon Sep 17 00:00:00 2001 From: Thomas Tuegel Date: Sat, 17 Oct 2015 16:52:46 -0500 Subject: [PATCH 065/162] plasma54: propagate packages to user profile --- nixos/modules/services/x11/desktop-managers/kde5.nix | 1 - pkgs/desktops/plasma-5.4/plasma-desktop/default.nix | 5 ++++- pkgs/desktops/plasma-5.4/plasma-mediacenter.nix | 5 ++++- pkgs/desktops/plasma-5.4/plasma-workspace/default.nix | 5 ++++- 4 files changed, 12 insertions(+), 4 deletions(-) diff --git a/nixos/modules/services/x11/desktop-managers/kde5.nix b/nixos/modules/services/x11/desktop-managers/kde5.nix index 62931d9b1dac..bde5aad07a05 100644 --- a/nixos/modules/services/x11/desktop-managers/kde5.nix +++ b/nixos/modules/services/x11/desktop-managers/kde5.nix @@ -73,7 +73,6 @@ in pkgs.qt4 # qtconfig is the only way to set Qt 4 theme kf5.kinit - kf5.kglobalaccel plasma5.breeze plasma5.kde-cli-tools diff --git a/pkgs/desktops/plasma-5.4/plasma-desktop/default.nix b/pkgs/desktops/plasma-5.4/plasma-desktop/default.nix index 77dfe3d91820..eb013292805a 100644 --- a/pkgs/desktops/plasma-5.4/plasma-desktop/default.nix +++ b/pkgs/desktops/plasma-5.4/plasma-desktop/default.nix @@ -9,7 +9,7 @@ , libcanberra_kde, libpulseaudio, makeKDEWrapper, utillinux }: -plasmaPackage { +plasmaPackage rec { name = "plasma-desktop"; nativeBuildInputs = [ extra-cmake-modules @@ -28,6 +28,9 @@ plasmaPackage { kglobalaccel ki18n kpeople krunner kwin plasma-framework plasma-workspace qtdeclarative qtx11extras ]; + # All propagatedBuildInputs should be present in the profile because + # wrappers cannot be used here. + propagatedUserEnvPkgs = propagatedBuildInputs; patches = [ (substituteAll { src = ./0001-hwclock.patch; diff --git a/pkgs/desktops/plasma-5.4/plasma-mediacenter.nix b/pkgs/desktops/plasma-5.4/plasma-mediacenter.nix index 40912087b8c8..afd8a18bbbd6 100644 --- a/pkgs/desktops/plasma-5.4/plasma-mediacenter.nix +++ b/pkgs/desktops/plasma-5.4/plasma-mediacenter.nix @@ -4,7 +4,7 @@ , taglib }: -plasmaPackage { +plasmaPackage rec { name = "plasma-mediacenter"; nativeBuildInputs = [ extra-cmake-modules @@ -17,4 +17,7 @@ plasmaPackage { baloo kactivities kdeclarative kfilemetadata ki18n kio plasma-framework ]; + # All propagatedBuildInputs should be present in the profile because + # wrappers cannot be used here. + propagatedUserEnvPkgs = propagatedBuildInputs; } diff --git a/pkgs/desktops/plasma-5.4/plasma-workspace/default.nix b/pkgs/desktops/plasma-5.4/plasma-workspace/default.nix index a2843a192907..37f55204ec1c 100644 --- a/pkgs/desktops/plasma-5.4/plasma-workspace/default.nix +++ b/pkgs/desktops/plasma-5.4/plasma-workspace/default.nix @@ -10,7 +10,7 @@ , xprop, xrdb, xset, xsetroot, solid, qtquickcontrols }: -plasmaPackage { +plasmaPackage rec { name = "plasma-workspace"; nativeBuildInputs = [ extra-cmake-modules @@ -28,6 +28,9 @@ plasmaPackage { kidletime krunner ktexteditor kwin libkscreen libksysguard plasma-framework qtquick1 qtquickcontrols qtx11extras solid ]; + # All propagatedBuildInputs should be present in the profile because + # impure wrappers are used below. + propagatedUserEnvPkgs = propagatedBuildInputs; patches = [ ./0001-startkde-NixOS-patches.patch ]; inherit bash coreutils gnused gnugrep socat; From b93e80a6e8df4557ec037d861ec528c9844d1228 Mon Sep 17 00:00:00 2001 From: Thomas Tuegel Date: Sun, 18 Oct 2015 08:50:05 -0500 Subject: [PATCH 066/162] kdeApps_15_08.oxygen-icons: init at 15.04.03 --- pkgs/applications/kde-apps-15.08/default.nix | 1 + pkgs/applications/kde-apps-15.08/fetchsrcs.sh | 5 ++--- pkgs/applications/kde-apps-15.08/oxygen-icons.nix | 13 +++++++++++++ pkgs/applications/kde-apps-15.08/srcs.nix | 8 ++++++++ 4 files changed, 24 insertions(+), 3 deletions(-) create mode 100644 pkgs/applications/kde-apps-15.08/oxygen-icons.nix diff --git a/pkgs/applications/kde-apps-15.08/default.nix b/pkgs/applications/kde-apps-15.08/default.nix index f5a815903208..b24c9023caf0 100644 --- a/pkgs/applications/kde-apps-15.08/default.nix +++ b/pkgs/applications/kde-apps-15.08/default.nix @@ -60,6 +60,7 @@ let libkexiv2 = callPackage ./libkexiv2.nix {}; libkipi = callPackage ./libkipi.nix {}; okular = callPackage ./okular.nix {}; + oxygen-icons = callPackage ./oxygen-icons.nix {}; print-manager = callPackage ./print-manager.nix {}; }; diff --git a/pkgs/applications/kde-apps-15.08/fetchsrcs.sh b/pkgs/applications/kde-apps-15.08/fetchsrcs.sh index e739cc9b1e47..8a4bf33f0196 100755 --- a/pkgs/applications/kde-apps-15.08/fetchsrcs.sh +++ b/pkgs/applications/kde-apps-15.08/fetchsrcs.sh @@ -4,14 +4,13 @@ set -x # The trailing slash at the end is necessary! -RELEASE_URL="http://download.kde.org/stable/applications/15.08.2/" -EXTRA_WGET_ARGS='-A *.tar.xz' +WGET_ARGS='http://download.kde.org/stable/applications/15.08.2/ http://download.kde.org/stable/applications/15.04.3/src/oxygen-icons-15.04.3.tar.xz -A *.tar.xz' mkdir tmp; cd tmp rm -f ../srcs.csv -wget -nH -r -c --no-parent $RELEASE_URL $EXTRA_WGET_ARGS +wget -nH -r -c --no-parent $WGET_ARGS find . | while read src; do if [[ -f "${src}" ]]; then diff --git a/pkgs/applications/kde-apps-15.08/oxygen-icons.nix b/pkgs/applications/kde-apps-15.08/oxygen-icons.nix new file mode 100644 index 000000000000..7259f6353fc1 --- /dev/null +++ b/pkgs/applications/kde-apps-15.08/oxygen-icons.nix @@ -0,0 +1,13 @@ +{ kdeApp +, lib +, cmake +}: + +kdeApp { + name = "oxygen-icons"; + nativeBuildInputs = [ cmake ]; + meta = { + license = lib.license.lgpl3Plus; + maintainers = [ lib.maintainers.ttuegel ]; + }; +} diff --git a/pkgs/applications/kde-apps-15.08/srcs.nix b/pkgs/applications/kde-apps-15.08/srcs.nix index d23a21f4add4..d87fbb6b9787 100644 --- a/pkgs/applications/kde-apps-15.08/srcs.nix +++ b/pkgs/applications/kde-apps-15.08/srcs.nix @@ -1866,6 +1866,14 @@ name = "okular-15.08.2.tar.xz"; }; }; + oxygen-icons = { + version = "15.04.3"; + src = fetchurl { + url = "${mirror}/stable/applications/15.04.3/src/oxygen-icons-15.04.3.tar.xz"; + sha256 = "07npzyrbw2fn1qd04imnv7cz0sisk7yllrwr2y21yr2i1gbncfqk"; + name = "oxygen-icons-15.04.3.tar.xz"; + }; + }; palapeli = { version = "15.08.2"; src = fetchurl { From 88b99f0054efdf1257551ba208555e041cc8c6e0 Mon Sep 17 00:00:00 2001 From: Thomas Tuegel Date: Sun, 18 Oct 2015 08:50:57 -0500 Subject: [PATCH 067/162] nixos/kde5: install oxygen-icons --- nixos/modules/services/x11/desktop-managers/kde5.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/nixos/modules/services/x11/desktop-managers/kde5.nix b/nixos/modules/services/x11/desktop-managers/kde5.nix index bde5aad07a05..4f72d0f47cd9 100644 --- a/nixos/modules/services/x11/desktop-managers/kde5.nix +++ b/nixos/modules/services/x11/desktop-managers/kde5.nix @@ -99,6 +99,7 @@ in kdeApps.dolphin kdeApps.konsole + kdeApps.oxygen-icons pkgs.hicolor_icon_theme plasma5.kde-gtk-config From cdbb1360c2c66b8558e30ba2db12fb17f504c7e4 Mon Sep 17 00:00:00 2001 From: Thomas Tuegel Date: Sun, 18 Oct 2015 09:15:49 -0500 Subject: [PATCH 068/162] makeKDEWrapper: don't build kdesycoca --- .../kde-frameworks-5.15/make-kde-wrapper.sh | 14 ++------------ 1 file changed, 2 insertions(+), 12 deletions(-) diff --git a/pkgs/development/libraries/kde-frameworks-5.15/make-kde-wrapper.sh b/pkgs/development/libraries/kde-frameworks-5.15/make-kde-wrapper.sh index 9996e3cae712..d7f9691a3913 100644 --- a/pkgs/development/libraries/kde-frameworks-5.15/make-kde-wrapper.sh +++ b/pkgs/development/libraries/kde-frameworks-5.15/make-kde-wrapper.sh @@ -3,21 +3,11 @@ makeKDEWrapper() { local new="$2" shift shift - if [[ -z "$KDE_WRAPPER_IMPURE" ]]; then - KSERVICE_BUILD_KDESYCOCA=${KDESYCOCA:+1} - makeQtWrapper "$old" "$new" ${KDESYCOCA:+--set KDESYCOCA "$KDESYCOCA"} "$@" - else - makeQtWrapper "$old" "$new" "$@" - fi + makeQtWrapper "$old" "$new" "$@" } wrapKDEProgram() { local prog="$1" shift - if [[ -z "$KDE_WRAPPER_IMPURE" ]]; then - KSERVICE_BUILD_KDESYCOCA=${KDESYCOCA:+1} - wrapQtProgram "$prog" ${KDESYCOCA:+--set KDESYCOCA "$KDESYCOCA"} "$@" - else - wrapQtProgram "$prog" "$@" - fi + wrapQtProgram "$prog" "$@" } From fa81cf08741a4ba4188ee103ac8cbb98ee29c391 Mon Sep 17 00:00:00 2001 From: Thomas Tuegel Date: Sun, 18 Oct 2015 09:16:53 -0500 Subject: [PATCH 069/162] kservice: don't build kdesycoca --- .../kde-frameworks-5.15/kservice/default.nix | 1 - .../kde-frameworks-5.15/kservice/setup-hook.sh | 13 ------------- 2 files changed, 14 deletions(-) delete mode 100644 pkgs/development/libraries/kde-frameworks-5.15/kservice/setup-hook.sh diff --git a/pkgs/development/libraries/kde-frameworks-5.15/kservice/default.nix b/pkgs/development/libraries/kde-frameworks-5.15/kservice/default.nix index ab017ce402ab..5c7727cdb647 100644 --- a/pkgs/development/libraries/kde-frameworks-5.15/kservice/default.nix +++ b/pkgs/development/libraries/kde-frameworks-5.15/kservice/default.nix @@ -4,7 +4,6 @@ kdeFramework { name = "kservice"; - setupHook = ./setup-hook.sh; nativeBuildInputs = [ extra-cmake-modules kdoctools ]; buildInputs = [ kcoreaddons kcrash kdbusaddons ]; propagatedBuildInputs = [ kconfig ki18n kwindowsystem ]; diff --git a/pkgs/development/libraries/kde-frameworks-5.15/kservice/setup-hook.sh b/pkgs/development/libraries/kde-frameworks-5.15/kservice/setup-hook.sh deleted file mode 100644 index 007876a0b309..000000000000 --- a/pkgs/development/libraries/kde-frameworks-5.15/kservice/setup-hook.sh +++ /dev/null @@ -1,13 +0,0 @@ -export KDESYCOCA="$out/var/cache/kservices5/$name.sycoca" - -KSERVICE_BUILD_KDESYCOCA= - -buildKdeSycoca() { - if [[ -n "$KSERVICE_BUILD_KDESYCOCA" ]]; then - echo "building kdesycoca database in $KDESYCOCA" - mkdir -p "$(dirname $KDESYCOCA)" - kbuildsycoca5 --nosignal - fi -} - -preFixupPhases+=" buildKdeSycoca" From 5292e67e50811e9ccf800708f3b18290c9098a39 Mon Sep 17 00:00:00 2001 From: Thomas Tuegel Date: Sun, 18 Oct 2015 09:24:59 -0500 Subject: [PATCH 070/162] remove kf515.makeKDEWrapper --- pkgs/desktops/plasma-5.4/bluedevil.nix | 8 ++--- pkgs/desktops/plasma-5.4/breeze-qt5.nix | 8 ++--- pkgs/desktops/plasma-5.4/kde-cli-tools.nix | 24 +++++++------- pkgs/desktops/plasma-5.4/khelpcenter.nix | 6 ++-- pkgs/desktops/plasma-5.4/kinfocenter.nix | 6 ++-- pkgs/desktops/plasma-5.4/kmenuedit.nix | 6 ++-- pkgs/desktops/plasma-5.4/kscreen.nix | 6 ++-- pkgs/desktops/plasma-5.4/ksshaskpass.nix | 6 ++-- pkgs/desktops/plasma-5.4/ksysguard.nix | 8 ++--- pkgs/desktops/plasma-5.4/kwin/default.nix | 7 +++-- pkgs/desktops/plasma-5.4/oxygen.nix | 8 ++--- .../plasma-5.4/plasma-desktop/default.nix | 20 ++++++------ pkgs/desktops/plasma-5.4/plasma-nm.nix | 6 ++-- .../plasma-5.4/plasma-workspace/default.nix | 31 +++++++++---------- pkgs/desktops/plasma-5.4/systemsettings.nix | 6 ++-- .../libraries/kde-frameworks-5.15/baloo.nix | 14 ++++----- .../libraries/kde-frameworks-5.15/default.nix | 1 - .../kde-frameworks-5.15/kactivities.nix | 6 ++-- .../libraries/kde-frameworks-5.15/kconfig.nix | 8 ++--- .../kconfigwidgets/default.nix | 6 ++-- .../kde-frameworks-5.15/kdbusaddons.nix | 6 ++-- .../kde-frameworks-5.15/kdeclarative.nix | 6 ++-- .../kde-frameworks-5.15/kdoctools/default.nix | 4 +-- .../kde-frameworks-5.15/kglobalaccel.nix | 6 ++-- .../libraries/kde-frameworks-5.15/kio.nix | 12 +++---- .../libraries/kde-frameworks-5.15/kjs.nix | 6 ++-- .../kde-frameworks-5.15/kjsembed.nix | 8 ++--- .../kde-frameworks-5.15/kpackage/default.nix | 6 ++-- .../libraries/kde-frameworks-5.15/kwallet.nix | 8 ++--- .../kde-frameworks-5.15/make-kde-wrapper.nix | 3 -- .../kde-frameworks-5.15/make-kde-wrapper.sh | 13 -------- .../plasma-framework/default.nix | 6 ++-- .../libraries/kde-frameworks-5.15/solid.nix | 6 ++-- 33 files changed, 132 insertions(+), 149 deletions(-) delete mode 100644 pkgs/development/libraries/kde-frameworks-5.15/make-kde-wrapper.nix delete mode 100644 pkgs/development/libraries/kde-frameworks-5.15/make-kde-wrapper.sh diff --git a/pkgs/desktops/plasma-5.4/bluedevil.nix b/pkgs/desktops/plasma-5.4/bluedevil.nix index 3c5e2f570d74..d099e95a16b4 100644 --- a/pkgs/desktops/plasma-5.4/bluedevil.nix +++ b/pkgs/desktops/plasma-5.4/bluedevil.nix @@ -1,13 +1,13 @@ { plasmaPackage, extra-cmake-modules, bluez-qt, kcoreaddons , kdbusaddons, kded, ki18n, kiconthemes, kio, knotifications -, kwidgetsaddons, kwindowsystem, makeKDEWrapper, plasma-framework +, kwidgetsaddons, kwindowsystem, makeQtWrapper, plasma-framework , qtdeclarative, shared_mime_info }: plasmaPackage { name = "bluedevil"; nativeBuildInputs = [ - extra-cmake-modules makeKDEWrapper shared_mime_info + extra-cmake-modules makeQtWrapper shared_mime_info ]; buildInputs = [ kcoreaddons kdbusaddons kded kiconthemes knotifications @@ -17,7 +17,7 @@ plasmaPackage { bluez-qt ki18n kio kwindowsystem plasma-framework qtdeclarative ]; postInstall = '' - wrapKDEProgram "$out/bin/bluedevil-wizard" - wrapKDEProgram "$out/bin/bluedevil-sendfile" + wrapQtProgram "$out/bin/bluedevil-wizard" + wrapQtProgram "$out/bin/bluedevil-sendfile" ''; } diff --git a/pkgs/desktops/plasma-5.4/breeze-qt5.nix b/pkgs/desktops/plasma-5.4/breeze-qt5.nix index 9583a0084c27..f50179ef64ce 100644 --- a/pkgs/desktops/plasma-5.4/breeze-qt5.nix +++ b/pkgs/desktops/plasma-5.4/breeze-qt5.nix @@ -1,6 +1,6 @@ { plasmaPackage, extra-cmake-modules, frameworkintegration , kcmutils, kconfigwidgets, kcoreaddons, kdecoration, kguiaddons -, ki18n, kwindowsystem, makeKDEWrapper, qtx11extras +, ki18n, kwindowsystem, makeQtWrapper, qtx11extras }: plasmaPackage { @@ -8,14 +8,14 @@ plasmaPackage { sname = "breeze"; nativeBuildInputs = [ extra-cmake-modules - makeKDEWrapper + makeQtWrapper ]; buildInputs = [ kcmutils kconfigwidgets kcoreaddons kdecoration kguiaddons ]; propagatedBuildInputs = [ frameworkintegration ki18n kwindowsystem qtx11extras ]; - cmakeFlags = [ "-DUSE_KDE4=OFF" ]; + cmakeFlags = [ "-DUSE_Qt4=OFF" ]; postInstall = '' - wrapKDEProgram "$out/bin/breeze-settings5" + wrapQtProgram "$out/bin/breeze-settings5" ''; } diff --git a/pkgs/desktops/plasma-5.4/kde-cli-tools.nix b/pkgs/desktops/plasma-5.4/kde-cli-tools.nix index 0b0e7b324249..7f19af6959ec 100644 --- a/pkgs/desktops/plasma-5.4/kde-cli-tools.nix +++ b/pkgs/desktops/plasma-5.4/kde-cli-tools.nix @@ -1,11 +1,11 @@ { plasmaPackage, extra-cmake-modules, kcmutils, kconfig , kdelibs4support, kdesu, kdoctools, ki18n, kiconthemes -, kwindowsystem, makeKDEWrapper, qtsvg, qtx11extras +, kwindowsystem, makeQtWrapper, qtsvg, qtx11extras }: plasmaPackage { name = "kde-cli-tools"; - nativeBuildInputs = [ extra-cmake-modules kdoctools makeKDEWrapper ]; + nativeBuildInputs = [ extra-cmake-modules kdoctools makeQtWrapper ]; buildInputs = [ kcmutils kconfig kdesu kiconthemes ]; @@ -13,15 +13,15 @@ plasmaPackage { kdelibs4support ki18n kwindowsystem qtsvg qtx11extras ]; postInstall = '' - wrapKDEProgram "$out/bin/kmimetypefinder5" - wrapKDEProgram "$out/bin/ksvgtopng5" - wrapKDEProgram "$out/bin/ktraderclient5" - wrapKDEProgram "$out/bin/kioclient5" - wrapKDEProgram "$out/bin/kdecp5" - wrapKDEProgram "$out/bin/keditfiletype5" - wrapKDEProgram "$out/bin/kcmshell5" - wrapKDEProgram "$out/bin/kdemv5" - wrapKDEProgram "$out/bin/kstart5" - wrapKDEProgram "$out/bin/kde-open5" + wrapQtProgram "$out/bin/kmimetypefinder5" + wrapQtProgram "$out/bin/ksvgtopng5" + wrapQtProgram "$out/bin/ktraderclient5" + wrapQtProgram "$out/bin/kioclient5" + wrapQtProgram "$out/bin/kdecp5" + wrapQtProgram "$out/bin/keditfiletype5" + wrapQtProgram "$out/bin/kcmshell5" + wrapQtProgram "$out/bin/kdemv5" + wrapQtProgram "$out/bin/kstart5" + wrapQtProgram "$out/bin/kde-open5" ''; } diff --git a/pkgs/desktops/plasma-5.4/khelpcenter.nix b/pkgs/desktops/plasma-5.4/khelpcenter.nix index 5759605af2b7..6ba860b9dfb2 100644 --- a/pkgs/desktops/plasma-5.4/khelpcenter.nix +++ b/pkgs/desktops/plasma-5.4/khelpcenter.nix @@ -1,6 +1,6 @@ { plasmaPackage, extra-cmake-modules, kdoctools, kconfig , kcoreaddons, kdbusaddons, ki18n, kinit, kcmutils, kdelibs4support -, khtml, kservice, makeKDEWrapper +, khtml, kservice, makeQtWrapper }: plasmaPackage { @@ -8,13 +8,13 @@ plasmaPackage { nativeBuildInputs = [ extra-cmake-modules kdoctools - makeKDEWrapper + makeQtWrapper ]; buildInputs = [ kconfig kcoreaddons kdbusaddons kinit kcmutils kservice ]; propagatedBuildInputs = [ kdelibs4support khtml ki18n ]; postInstall = '' - wrapKDEProgram "$out/bin/khelpcenter" + wrapQtProgram "$out/bin/khelpcenter" ''; } diff --git a/pkgs/desktops/plasma-5.4/kinfocenter.nix b/pkgs/desktops/plasma-5.4/kinfocenter.nix index 80caa95dc886..ed717790cd0d 100644 --- a/pkgs/desktops/plasma-5.4/kinfocenter.nix +++ b/pkgs/desktops/plasma-5.4/kinfocenter.nix @@ -1,7 +1,7 @@ { plasmaPackage, extra-cmake-modules, kdoctools, kcmutils , kcompletion, kconfig, kconfigwidgets, kcoreaddons, kdbusaddons , kdeclarative, kdelibs4support, ki18n, kiconthemes, kio, kpackage -, kservice, kwidgetsaddons, kxmlgui, libraw1394, makeKDEWrapper +, kservice, kwidgetsaddons, kxmlgui, libraw1394, makeQtWrapper , pciutils, solid }: @@ -10,7 +10,7 @@ plasmaPackage { nativeBuildInputs = [ extra-cmake-modules kdoctools - makeKDEWrapper + makeQtWrapper ]; buildInputs = [ kcmutils kcompletion kconfig kconfigwidgets kcoreaddons @@ -19,6 +19,6 @@ plasmaPackage { ]; propagatedBuildInputs = [ kdeclarative kdelibs4support ki18n kio ]; postInstall = '' - wrapKDEProgram "$out/bin/kinfocenter" + wrapQtProgram "$out/bin/kinfocenter" ''; } diff --git a/pkgs/desktops/plasma-5.4/kmenuedit.nix b/pkgs/desktops/plasma-5.4/kmenuedit.nix index d8c9c3aa2ac0..3834ca1328f8 100644 --- a/pkgs/desktops/plasma-5.4/kmenuedit.nix +++ b/pkgs/desktops/plasma-5.4/kmenuedit.nix @@ -1,5 +1,5 @@ { plasmaPackage, extra-cmake-modules, kdoctools, ki18n, kxmlgui -, kdbusaddons, kiconthemes, kio, sonnet, kdelibs4support, makeKDEWrapper +, kdbusaddons, kiconthemes, kio, sonnet, kdelibs4support, makeQtWrapper }: plasmaPackage { @@ -7,13 +7,13 @@ plasmaPackage { nativeBuildInputs = [ extra-cmake-modules kdoctools - makeKDEWrapper + makeQtWrapper ]; buildInputs = [ kxmlgui kdbusaddons kiconthemes ]; propagatedBuildInputs = [ kdelibs4support ki18n kio sonnet ]; postInstall = '' - wrapKDEProgram "$out/bin/kmenuedit" + wrapQtProgram "$out/bin/kmenuedit" ''; } diff --git a/pkgs/desktops/plasma-5.4/kscreen.nix b/pkgs/desktops/plasma-5.4/kscreen.nix index c97bc4e18710..64fcab343e44 100644 --- a/pkgs/desktops/plasma-5.4/kscreen.nix +++ b/pkgs/desktops/plasma-5.4/kscreen.nix @@ -1,19 +1,19 @@ { plasmaPackage, extra-cmake-modules, kconfig, kconfigwidgets , kdbusaddons, kglobalaccel, ki18n, kwidgetsaddons, kxmlgui -, libkscreen, makeKDEWrapper, qtdeclarative +, libkscreen, makeQtWrapper, qtdeclarative }: plasmaPackage { name = "kscreen"; nativeBuildInputs = [ extra-cmake-modules - makeKDEWrapper + makeQtWrapper ]; buildInputs = [ kconfig kconfigwidgets kdbusaddons kwidgetsaddons kxmlgui ]; propagatedBuildInputs = [ kglobalaccel ki18n libkscreen qtdeclarative ]; postInstall = '' - wrapKDEProgram "$out/bin/kscreen-console" + wrapQtProgram "$out/bin/kscreen-console" ''; } diff --git a/pkgs/desktops/plasma-5.4/ksshaskpass.nix b/pkgs/desktops/plasma-5.4/ksshaskpass.nix index 112d8eda4036..f274512e027a 100644 --- a/pkgs/desktops/plasma-5.4/ksshaskpass.nix +++ b/pkgs/desktops/plasma-5.4/ksshaskpass.nix @@ -1,13 +1,13 @@ { plasmaPackage, extra-cmake-modules, kdoctools, kcoreaddons -, ki18n, kwallet, kwidgetsaddons, makeKDEWrapper +, ki18n, kwallet, kwidgetsaddons, makeQtWrapper }: plasmaPackage { name = "ksshaskpass"; - nativeBuildInputs = [ extra-cmake-modules kdoctools makeKDEWrapper ]; + nativeBuildInputs = [ extra-cmake-modules kdoctools makeQtWrapper ]; buildInputs = [ kcoreaddons kwallet kwidgetsaddons ]; propagatedBuildInputs = [ ki18n ]; postInstall = '' - wrapKDEProgram "$out/bin/ksshaskpass" + wrapQtProgram "$out/bin/ksshaskpass" ''; } diff --git a/pkgs/desktops/plasma-5.4/ksysguard.nix b/pkgs/desktops/plasma-5.4/ksysguard.nix index 4e9fca43ded8..7af3584989c3 100644 --- a/pkgs/desktops/plasma-5.4/ksysguard.nix +++ b/pkgs/desktops/plasma-5.4/ksysguard.nix @@ -1,6 +1,6 @@ { plasmaPackage, extra-cmake-modules, kdoctools, kconfig , kcoreaddons, kdelibs4support, ki18n, kitemviews, knewstuff -, kiconthemes, libksysguard, makeKDEWrapper +, kiconthemes, libksysguard, makeQtWrapper }: plasmaPackage { @@ -8,14 +8,14 @@ plasmaPackage { nativeBuildInputs = [ extra-cmake-modules kdoctools - makeKDEWrapper + makeQtWrapper ]; buildInputs = [ kconfig kcoreaddons kitemviews knewstuff kiconthemes libksysguard ]; propagatedBuildInputs = [ kdelibs4support ki18n ]; postInstall = '' - wrapKDEProgram "$out/bin/ksysguardd" - wrapKDEProgram "$out/bin/ksysguard" + wrapQtProgram "$out/bin/ksysguardd" + wrapQtProgram "$out/bin/ksysguard" ''; } diff --git a/pkgs/desktops/plasma-5.4/kwin/default.nix b/pkgs/desktops/plasma-5.4/kwin/default.nix index 6afdf33e1bba..89da25f691d8 100644 --- a/pkgs/desktops/plasma-5.4/kwin/default.nix +++ b/pkgs/desktops/plasma-5.4/kwin/default.nix @@ -4,7 +4,7 @@ , ki18n, kiconthemes, kinit, kio, knewstuff, knotifications , kpackage, kservice, kwayland, kwidgetsaddons, kwindowsystem , kxmlgui, libinput, libICE, libSM, plasma-framework, qtdeclarative -, qtscript, qtx11extras, udev, wayland, xcb-util-cursor +, qtscript, qtx11extras, udev, wayland, xcb-util-cursor, makeQtWrapper }: plasmaPackage { @@ -12,6 +12,7 @@ plasmaPackage { nativeBuildInputs = [ extra-cmake-modules kdoctools + makeQtWrapper ]; buildInputs = [ epoxy kcompletion kcmutils kconfig kconfigwidgets kcoreaddons @@ -25,7 +26,7 @@ plasmaPackage { ]; patches = [ ./0001-qdiriterator-follow-symlinks.patch ]; postInstall = '' - wrapKDEProgram "$out/bin/kwin_x11" - wrapKDEProgram "$out/bin/kwin_wayland" + wrapQtProgram "$out/bin/kwin_x11" + wrapQtProgram "$out/bin/kwin_wayland" ''; } diff --git a/pkgs/desktops/plasma-5.4/oxygen.nix b/pkgs/desktops/plasma-5.4/oxygen.nix index 58ccd4809c79..02918100408a 100644 --- a/pkgs/desktops/plasma-5.4/oxygen.nix +++ b/pkgs/desktops/plasma-5.4/oxygen.nix @@ -1,12 +1,12 @@ { plasmaPackage, extra-cmake-modules, ki18n, kcmutils, kconfig , kdecoration, kguiaddons, kwidgetsaddons, kservice, kcompletion -, frameworkintegration, kwindowsystem, makeKDEWrapper, qtx11extras +, frameworkintegration, kwindowsystem, makeQtWrapper, qtx11extras }: plasmaPackage { name = "oxygen"; nativeBuildInputs = [ - extra-cmake-modules makeKDEWrapper + extra-cmake-modules makeQtWrapper ]; buildInputs = [ kcmutils kconfig kdecoration kguiaddons kwidgetsaddons @@ -14,7 +14,7 @@ plasmaPackage { ]; propagatedBuildInputs = [ frameworkintegration ki18n kwindowsystem qtx11extras ]; postInstall = '' - wrapKDEProgram "$out/bin/oxygen-demo5" - wrapKDEProgram "$out/bin/oxygen-settings5" + wrapQtProgram "$out/bin/oxygen-demo5" + wrapQtProgram "$out/bin/oxygen-settings5" ''; } diff --git a/pkgs/desktops/plasma-5.4/plasma-desktop/default.nix b/pkgs/desktops/plasma-5.4/plasma-desktop/default.nix index eb013292805a..51b67b343f27 100644 --- a/pkgs/desktops/plasma-5.4/plasma-desktop/default.nix +++ b/pkgs/desktops/plasma-5.4/plasma-desktop/default.nix @@ -6,7 +6,7 @@ , plasma-framework, plasma-workspace, qtdeclarative, qtx11extras , qtsvg, libXcursor, libXft, libxkbfile, xf86inputevdev , xf86inputsynaptics, xinput, xkeyboard_config, xorgserver -, libcanberra_kde, libpulseaudio, makeKDEWrapper, utillinux +, libcanberra_kde, libpulseaudio, makeQtWrapper, utillinux }: plasmaPackage rec { @@ -14,7 +14,7 @@ plasmaPackage rec { nativeBuildInputs = [ extra-cmake-modules kdoctools - makeKDEWrapper + makeQtWrapper ]; buildInputs = [ attica boost fontconfig kcmutils kdbusaddons kded kitemmodels @@ -52,13 +52,13 @@ plasmaPackage rec { cd "$NIX_BUILD_TOP" - wrapKDEProgram "$out/bin/kaccess" - wrapKDEProgram "$out/bin/solid-action-desktop-gen" - wrapKDEProgram "$out/bin/knetattach" - wrapKDEProgram "$out/bin/krdb" - wrapKDEProgram "$out/bin/kapplymousetheme" - wrapKDEProgram "$out/bin/kfontinst" - wrapKDEProgram "$out/bin/kcm-touchpad-list-devices" - wrapKDEProgram "$out/bin/kfontview" + wrapQtProgram "$out/bin/kaccess" + wrapQtProgram "$out/bin/solid-action-desktop-gen" + wrapQtProgram "$out/bin/knetattach" + wrapQtProgram "$out/bin/krdb" + wrapQtProgram "$out/bin/kapplymousetheme" + wrapQtProgram "$out/bin/kfontinst" + wrapQtProgram "$out/bin/kcm-touchpad-list-devices" + wrapQtProgram "$out/bin/kfontview" ''; } diff --git a/pkgs/desktops/plasma-5.4/plasma-nm.nix b/pkgs/desktops/plasma-5.4/plasma-nm.nix index 7b0a65473d15..92b04e2af1fd 100644 --- a/pkgs/desktops/plasma-5.4/plasma-nm.nix +++ b/pkgs/desktops/plasma-5.4/plasma-nm.nix @@ -2,7 +2,7 @@ , kconfigwidgets, kcoreaddons, kdbusaddons, kdeclarative , kdelibs4support, ki18n, kiconthemes, kinit, kio, kitemviews , knotifications, kservice, kwallet, kwidgetsaddons, kwindowsystem -, kxmlgui, makeKDEWrapper, mobile_broadband_provider_info +, kxmlgui, makeQtWrapper, mobile_broadband_provider_info , modemmanager-qt, networkmanager-qt, openconnect, plasma-framework , qtdeclarative, solid }: @@ -12,7 +12,7 @@ plasmaPackage { nativeBuildInputs = [ extra-cmake-modules kdoctools - makeKDEWrapper + makeQtWrapper ]; buildInputs = [ kcompletion kconfigwidgets kcoreaddons kdbusaddons kiconthemes @@ -25,6 +25,6 @@ plasmaPackage { qtdeclarative ]; postInstall = '' - wrapKDEProgram "$out/bin/kde5-nm-connection-editor" + wrapQtProgram "$out/bin/kde5-nm-connection-editor" ''; } diff --git a/pkgs/desktops/plasma-5.4/plasma-workspace/default.nix b/pkgs/desktops/plasma-5.4/plasma-workspace/default.nix index 37f55204ec1c..8fa5709feab5 100644 --- a/pkgs/desktops/plasma-5.4/plasma-workspace/default.nix +++ b/pkgs/desktops/plasma-5.4/plasma-workspace/default.nix @@ -6,7 +6,7 @@ , libdbusmenu, libkscreen, libSM, libXcursor, networkmanager-qt , pam, phonon, plasma-framework, qtquick1, qtscript, qtx11extras, wayland , libksysguard, bash, coreutils, gnused, gnugrep, socat, kconfig -, kinit, kservice, makeKDEWrapper, qttools, dbus_tools, mkfontdir, xmessage +, kinit, kservice, makeQtWrapper, qttools, dbus_tools, mkfontdir, xmessage , xprop, xrdb, xset, xsetroot, solid, qtquickcontrols }: @@ -15,7 +15,7 @@ plasmaPackage rec { nativeBuildInputs = [ extra-cmake-modules kdoctools - makeKDEWrapper + makeQtWrapper ]; buildInputs = [ kcmutils kcrash kdbusaddons kdesu kdewebkit kjsembed knewstuff @@ -43,19 +43,18 @@ plasmaPackage rec { ''; postInstall = '' export QT_WRAPPER_IMPURE=1 - export KDE_WRAPPER_IMPURE=1 - wrapKDEProgram "$out/bin/ksmserver" - wrapKDEProgram "$out/bin/plasmawindowed" - wrapKDEProgram "$out/bin/kcminit_startup" - wrapKDEProgram "$out/bin/ksplashqml" - wrapKDEProgram "$out/bin/kcheckrunning" - wrapKDEProgram "$out/bin/systemmonitor" - wrapKDEProgram "$out/bin/kstartupconfig5" - wrapKDEProgram "$out/bin/startplasmacompositor" - wrapKDEProgram "$out/bin/kdostartupconfig5" - wrapKDEProgram "$out/bin/klipper" - wrapKDEProgram "$out/bin/kuiserver5" - wrapKDEProgram "$out/bin/krunner" - wrapKDEProgram "$out/bin/plasmashell" + wrapQtProgram "$out/bin/ksmserver" + wrapQtProgram "$out/bin/plasmawindowed" + wrapQtProgram "$out/bin/kcminit_startup" + wrapQtProgram "$out/bin/ksplashqml" + wrapQtProgram "$out/bin/kcheckrunning" + wrapQtProgram "$out/bin/systemmonitor" + wrapQtProgram "$out/bin/kstartupconfig5" + wrapQtProgram "$out/bin/startplasmacompositor" + wrapQtProgram "$out/bin/kdostartupconfig5" + wrapQtProgram "$out/bin/klipper" + wrapQtProgram "$out/bin/kuiserver5" + wrapQtProgram "$out/bin/krunner" + wrapQtProgram "$out/bin/plasmashell" ''; } diff --git a/pkgs/desktops/plasma-5.4/systemsettings.nix b/pkgs/desktops/plasma-5.4/systemsettings.nix index 7cf656e9dbeb..a921e153dbc2 100644 --- a/pkgs/desktops/plasma-5.4/systemsettings.nix +++ b/pkgs/desktops/plasma-5.4/systemsettings.nix @@ -1,6 +1,6 @@ { plasmaPackage, extra-cmake-modules, kdoctools, kitemviews , kcmutils, ki18n, kio, kservice, kiconthemes, kwindowsystem -, kxmlgui, kdbusaddons, kconfig, khtml, makeKDEWrapper +, kxmlgui, kdbusaddons, kconfig, khtml, makeQtWrapper }: plasmaPackage { @@ -8,7 +8,7 @@ plasmaPackage { nativeBuildInputs = [ extra-cmake-modules kdoctools - makeKDEWrapper + makeQtWrapper ]; buildInputs = [ kitemviews kcmutils kservice kiconthemes kxmlgui kdbusaddons @@ -16,6 +16,6 @@ plasmaPackage { ]; propagatedBuildInputs = [ khtml ki18n kio kwindowsystem ]; postInstall = '' - wrapKDEProgram "$out/bin/systemsettings5" + wrapQtProgram "$out/bin/systemsettings5" ''; } diff --git a/pkgs/development/libraries/kde-frameworks-5.15/baloo.nix b/pkgs/development/libraries/kde-frameworks-5.15/baloo.nix index a11c316010d3..38c41d9271d8 100644 --- a/pkgs/development/libraries/kde-frameworks-5.15/baloo.nix +++ b/pkgs/development/libraries/kde-frameworks-5.15/baloo.nix @@ -1,11 +1,11 @@ { kdeFramework, lib, extra-cmake-modules, kauth, kconfig , kcoreaddons, kcrash, kdbusaddons, kfilemetadata, ki18n, kidletime -, kio, lmdb, makeKDEWrapper, qtbase, qtquick1, solid +, kio, lmdb, makeQtWrapper, qtbase, qtquick1, solid }: kdeFramework { name = "baloo"; - nativeBuildInputs = [ extra-cmake-modules makeKDEWrapper ]; + nativeBuildInputs = [ extra-cmake-modules makeQtWrapper ]; buildInputs = [ kconfig kcrash kdbusaddons lmdb qtquick1 solid ]; @@ -13,11 +13,11 @@ kdeFramework { kauth kcoreaddons kfilemetadata ki18n kio kidletime qtbase ]; postInstall = '' - wrapKDEProgram "$out/bin/baloo_file" - wrapKDEProgram "$out/bin/baloo_file_extractor" - wrapKDEProgram "$out/bin/balooctl" - wrapKDEProgram "$out/bin/baloosearch" - wrapKDEProgram "$out/bin/balooshow" + wrapQtProgram "$out/bin/baloo_file" + wrapQtProgram "$out/bin/baloo_file_extractor" + wrapQtProgram "$out/bin/balooctl" + wrapQtProgram "$out/bin/baloosearch" + wrapQtProgram "$out/bin/balooshow" ''; meta = { maintainers = [ lib.maintainers.ttuegel ]; diff --git a/pkgs/development/libraries/kde-frameworks-5.15/default.nix b/pkgs/development/libraries/kde-frameworks-5.15/default.nix index 0fc3d77c67b5..6b6b95ab3c70 100644 --- a/pkgs/development/libraries/kde-frameworks-5.15/default.nix +++ b/pkgs/development/libraries/kde-frameworks-5.15/default.nix @@ -105,7 +105,6 @@ let solid = callPackage ./solid.nix {}; sonnet = callPackage ./sonnet.nix {}; threadweaver = callPackage ./threadweaver.nix {}; - makeKDEWrapper = callPackage ./make-kde-wrapper.nix { inherit makeSetupHook; }; }; newScope = scope: pkgs.qt55Libs.newScope ({ inherit kdeFramework; } // scope); diff --git a/pkgs/development/libraries/kde-frameworks-5.15/kactivities.nix b/pkgs/development/libraries/kde-frameworks-5.15/kactivities.nix index 955a6120e2cd..3225098f4398 100644 --- a/pkgs/development/libraries/kde-frameworks-5.15/kactivities.nix +++ b/pkgs/development/libraries/kde-frameworks-5.15/kactivities.nix @@ -1,11 +1,11 @@ { kdeFramework, lib, extra-cmake-modules, boost, kcmutils, kconfig , kcoreaddons, kdbusaddons, kdeclarative, kglobalaccel, ki18n -, kio, kservice, kwindowsystem, kxmlgui, makeKDEWrapper, qtdeclarative +, kio, kservice, kwindowsystem, kxmlgui, makeQtWrapper, qtdeclarative }: kdeFramework { name = "kactivities"; - nativeBuildInputs = [ extra-cmake-modules makeKDEWrapper ]; + nativeBuildInputs = [ extra-cmake-modules makeQtWrapper ]; buildInputs = [ boost kcmutils kconfig kcoreaddons kdbusaddons kservice kxmlgui @@ -14,7 +14,7 @@ kdeFramework { kdeclarative kglobalaccel ki18n kio kwindowsystem qtdeclarative ]; postInstall = '' - wrapKDEProgram "$out/bin/kactivitymanagerd" + wrapQtProgram "$out/bin/kactivitymanagerd" ''; meta = { maintainers = [ lib.maintainers.ttuegel ]; diff --git a/pkgs/development/libraries/kde-frameworks-5.15/kconfig.nix b/pkgs/development/libraries/kde-frameworks-5.15/kconfig.nix index 8d076e03fa9d..e132afe59886 100644 --- a/pkgs/development/libraries/kde-frameworks-5.15/kconfig.nix +++ b/pkgs/development/libraries/kde-frameworks-5.15/kconfig.nix @@ -1,14 +1,14 @@ { kdeFramework, lib , extra-cmake-modules -, makeKDEWrapper +, makeQtWrapper }: kdeFramework { name = "kconfig"; - nativeBuildInputs = [ extra-cmake-modules makeKDEWrapper ]; + nativeBuildInputs = [ extra-cmake-modules makeQtWrapper ]; postInstall = '' - wrapKDEProgram "$out/bin/kreadconfig5" - wrapKDEProgram "$out/bin/kwriteconfig5" + wrapQtProgram "$out/bin/kreadconfig5" + wrapQtProgram "$out/bin/kwriteconfig5" ''; meta = { maintainers = [ lib.maintainers.ttuegel ]; diff --git a/pkgs/development/libraries/kde-frameworks-5.15/kconfigwidgets/default.nix b/pkgs/development/libraries/kde-frameworks-5.15/kconfigwidgets/default.nix index 2112f2274f9c..0e14d06edd36 100644 --- a/pkgs/development/libraries/kde-frameworks-5.15/kconfigwidgets/default.nix +++ b/pkgs/development/libraries/kde-frameworks-5.15/kconfigwidgets/default.nix @@ -1,15 +1,15 @@ { kdeFramework, lib, extra-cmake-modules, kauth, kcodecs, kconfig -, kdoctools, kguiaddons, ki18n, kwidgetsaddons, makeKDEWrapper +, kdoctools, kguiaddons, ki18n, kwidgetsaddons, makeQtWrapper }: kdeFramework { name = "kconfigwidgets"; - nativeBuildInputs = [ extra-cmake-modules kdoctools makeKDEWrapper ]; + nativeBuildInputs = [ extra-cmake-modules kdoctools makeQtWrapper ]; buildInputs = [ kguiaddons ]; propagatedBuildInputs = [ kauth kconfig kcodecs ki18n kwidgetsaddons ]; patches = [ ./0001-qdiriterator-follow-symlinks.patch ]; postInstall = '' - wrapKDEProgram "$out/bin/preparetips5" + wrapQtProgram "$out/bin/preparetips5" ''; meta = { maintainers = [ lib.maintainers.ttuegel ]; diff --git a/pkgs/development/libraries/kde-frameworks-5.15/kdbusaddons.nix b/pkgs/development/libraries/kde-frameworks-5.15/kdbusaddons.nix index 4a1c7a198423..d2ceab31d14b 100644 --- a/pkgs/development/libraries/kde-frameworks-5.15/kdbusaddons.nix +++ b/pkgs/development/libraries/kde-frameworks-5.15/kdbusaddons.nix @@ -1,15 +1,15 @@ { kdeFramework, lib , extra-cmake-modules -, makeKDEWrapper +, makeQtWrapper , qtx11extras }: kdeFramework { name = "kdbusaddons"; - nativeBuildInputs = [ extra-cmake-modules makeKDEWrapper ]; + nativeBuildInputs = [ extra-cmake-modules makeQtWrapper ]; propagatedBuildInputs = [ qtx11extras ]; postInstall = '' - wrapKDEProgram "$out/bin/kquitapp5" + wrapQtProgram "$out/bin/kquitapp5" ''; meta = { maintainers = [ lib.maintainers.ttuegel ]; diff --git a/pkgs/development/libraries/kde-frameworks-5.15/kdeclarative.nix b/pkgs/development/libraries/kde-frameworks-5.15/kdeclarative.nix index 32df2fc3f8ab..74d107466cfc 100644 --- a/pkgs/development/libraries/kde-frameworks-5.15/kdeclarative.nix +++ b/pkgs/development/libraries/kde-frameworks-5.15/kdeclarative.nix @@ -1,12 +1,12 @@ { kdeFramework, lib, extra-cmake-modules, epoxy, kconfig , kglobalaccel, kguiaddons, ki18n, kiconthemes, kio, kpackage -, kwidgetsaddons, kwindowsystem, makeKDEWrapper, pkgconfig +, kwidgetsaddons, kwindowsystem, makeQtWrapper, pkgconfig , qtdeclarative }: kdeFramework { name = "kdeclarative"; - nativeBuildInputs = [ extra-cmake-modules makeKDEWrapper ]; + nativeBuildInputs = [ extra-cmake-modules makeQtWrapper ]; buildInputs = [ epoxy kguiaddons kiconthemes kwidgetsaddons ]; @@ -14,7 +14,7 @@ kdeFramework { kconfig kglobalaccel ki18n kio kpackage kwindowsystem qtdeclarative ]; postInstall = '' - wrapKDEProgram "$out/bin/kpackagelauncherqml" + wrapQtProgram "$out/bin/kpackagelauncherqml" ''; meta = { maintainers = [ lib.maintainers.ttuegel ]; diff --git a/pkgs/development/libraries/kde-frameworks-5.15/kdoctools/default.nix b/pkgs/development/libraries/kde-frameworks-5.15/kdoctools/default.nix index bc17a391afd7..f67c19f42395 100644 --- a/pkgs/development/libraries/kde-frameworks-5.15/kdoctools/default.nix +++ b/pkgs/development/libraries/kde-frameworks-5.15/kdoctools/default.nix @@ -1,5 +1,5 @@ { kdeFramework, lib, extra-cmake-modules, docbook_xml_dtd_45 -, docbook5_xsl, karchive, ki18n, makeKDEWrapper, perl, perlPackages +, docbook5_xsl, karchive, ki18n, makeQtWrapper, perl, perlPackages }: kdeFramework { @@ -7,7 +7,7 @@ kdeFramework { nativeBuildInputs = [ extra-cmake-modules ]; buildInputs = [ karchive ]; propagatedBuildInputs = [ ki18n ]; - propagatedNativeBuildInputs = [ makeKDEWrapper perl perlPackages.URI ]; + propagatedNativeBuildInputs = [ makeQtWrapper perl perlPackages.URI ]; cmakeFlags = [ "-DDocBookXML4_DTD_DIR=${docbook_xml_dtd_45}/xml/dtd/docbook" "-DDocBookXSL_DIR=${docbook5_xsl}/xml/xsl/docbook" diff --git a/pkgs/development/libraries/kde-frameworks-5.15/kglobalaccel.nix b/pkgs/development/libraries/kde-frameworks-5.15/kglobalaccel.nix index 12094ad7f79b..c535b3590a38 100644 --- a/pkgs/development/libraries/kde-frameworks-5.15/kglobalaccel.nix +++ b/pkgs/development/libraries/kde-frameworks-5.15/kglobalaccel.nix @@ -5,17 +5,17 @@ , kcrash , kdbusaddons , kwindowsystem -, makeKDEWrapper +, makeQtWrapper , qtx11extras }: kdeFramework { name = "kglobalaccel"; - nativeBuildInputs = [ extra-cmake-modules makeKDEWrapper ]; + nativeBuildInputs = [ extra-cmake-modules makeQtWrapper ]; buildInputs = [ kconfig kcoreaddons kcrash kdbusaddons ]; propagatedBuildInputs = [ kwindowsystem qtx11extras ]; postInstall = '' - wrapKDEProgram "$out/bin/kglobalaccel5" + wrapQtProgram "$out/bin/kglobalaccel5" ''; meta = { maintainers = [ lib.maintainers.ttuegel ]; diff --git a/pkgs/development/libraries/kde-frameworks-5.15/kio.nix b/pkgs/development/libraries/kde-frameworks-5.15/kio.nix index c125157f6238..0789828d812b 100644 --- a/pkgs/development/libraries/kde-frameworks-5.15/kio.nix +++ b/pkgs/development/libraries/kde-frameworks-5.15/kio.nix @@ -2,13 +2,13 @@ , kbookmarks, kcompletion, kconfig, kconfigwidgets, kcoreaddons , kdbusaddons, kdoctools, ki18n, kiconthemes, kitemviews , kjobwidgets, knotifications, kservice, ktextwidgets, kwallet -, kwidgetsaddons, kwindowsystem, kxmlgui, makeKDEWrapper +, kwidgetsaddons, kwindowsystem, kxmlgui, makeQtWrapper , qtscript, qtx11extras, solid }: kdeFramework { name = "kio"; - nativeBuildInputs = [ extra-cmake-modules kdoctools makeKDEWrapper ]; + nativeBuildInputs = [ extra-cmake-modules kdoctools makeQtWrapper ]; buildInputs = [ acl karchive kconfig kcoreaddons kdbusaddons kiconthemes knotifications ktextwidgets kwallet kwidgetsaddons @@ -19,10 +19,10 @@ kdeFramework { kservice kwindowsystem kxmlgui solid qtx11extras ]; postInstall = '' - wrapKDEProgram "$out/bin/kcookiejar5" - wrapKDEProgram "$out/bin/ktelnetservice5" - wrapKDEProgram "$out/bin/ktrash5" - wrapKDEProgram "$out/bin/kmailservice5" + wrapQtProgram "$out/bin/kcookiejar5" + wrapQtProgram "$out/bin/ktelnetservice5" + wrapQtProgram "$out/bin/ktrash5" + wrapQtProgram "$out/bin/kmailservice5" ''; meta = { maintainers = [ lib.maintainers.ttuegel ]; diff --git a/pkgs/development/libraries/kde-frameworks-5.15/kjs.nix b/pkgs/development/libraries/kde-frameworks-5.15/kjs.nix index cdbc20f279d3..768720f178c8 100644 --- a/pkgs/development/libraries/kde-frameworks-5.15/kjs.nix +++ b/pkgs/development/libraries/kde-frameworks-5.15/kjs.nix @@ -1,14 +1,14 @@ { kdeFramework, lib , extra-cmake-modules , kdoctools -, makeKDEWrapper +, makeQtWrapper }: kdeFramework { name = "kjs"; - nativeBuildInputs = [ extra-cmake-modules kdoctools makeKDEWrapper ]; + nativeBuildInputs = [ extra-cmake-modules kdoctools makeQtWrapper ]; postInstall = '' - wrapKDEProgram "$out/bin/kjs5" + wrapQtProgram "$out/bin/kjs5" ''; meta = { maintainers = [ lib.maintainers.ttuegel ]; diff --git a/pkgs/development/libraries/kde-frameworks-5.15/kjsembed.nix b/pkgs/development/libraries/kde-frameworks-5.15/kjsembed.nix index e6d08d387b69..22eef2d47bde 100644 --- a/pkgs/development/libraries/kde-frameworks-5.15/kjsembed.nix +++ b/pkgs/development/libraries/kde-frameworks-5.15/kjsembed.nix @@ -1,15 +1,15 @@ { kdeFramework, lib, extra-cmake-modules, kdoctools, ki18n, kjs -, makeKDEWrapper, qtsvg +, makeQtWrapper, qtsvg }: kdeFramework { name = "kjsembed"; - nativeBuildInputs = [ extra-cmake-modules kdoctools makeKDEWrapper ]; + nativeBuildInputs = [ extra-cmake-modules kdoctools makeQtWrapper ]; buildInputs = [ qtsvg ]; propagatedBuildInputs = [ ki18n kjs ]; postInstall = '' - wrapKDEProgram "$out/bin/kjscmd5" - wrapKDEProgram "$out/bin/kjsconsole" + wrapQtProgram "$out/bin/kjscmd5" + wrapQtProgram "$out/bin/kjsconsole" ''; meta = { maintainers = [ lib.maintainers.ttuegel ]; diff --git a/pkgs/development/libraries/kde-frameworks-5.15/kpackage/default.nix b/pkgs/development/libraries/kde-frameworks-5.15/kpackage/default.nix index 3581eb3deca0..d2dc262bf1ac 100644 --- a/pkgs/development/libraries/kde-frameworks-5.15/kpackage/default.nix +++ b/pkgs/development/libraries/kde-frameworks-5.15/kpackage/default.nix @@ -5,12 +5,12 @@ , kcoreaddons , kdoctools , ki18n -, makeKDEWrapper +, makeQtWrapper }: kdeFramework { name = "kpackage"; - nativeBuildInputs = [ extra-cmake-modules kdoctools makeKDEWrapper ]; + nativeBuildInputs = [ extra-cmake-modules kdoctools makeQtWrapper ]; buildInputs = [ karchive kconfig ]; propagatedBuildInputs = [ kcoreaddons ki18n ]; patches = [ @@ -18,7 +18,7 @@ kdeFramework { ./0002-qdiriterator-follow-symlinks.patch ]; postInstall = '' - wrapKDEProgram "$out/bin/kpackagetool5" + wrapQtProgram "$out/bin/kpackagetool5" ''; meta = { maintainers = [ lib.maintainers.ttuegel ]; diff --git a/pkgs/development/libraries/kde-frameworks-5.15/kwallet.nix b/pkgs/development/libraries/kde-frameworks-5.15/kwallet.nix index 4267b65281fc..7c4177e009d2 100644 --- a/pkgs/development/libraries/kde-frameworks-5.15/kwallet.nix +++ b/pkgs/development/libraries/kde-frameworks-5.15/kwallet.nix @@ -1,19 +1,19 @@ { kdeFramework, lib, extra-cmake-modules, kconfig, kcoreaddons , kdbusaddons, kdoctools, ki18n, kiconthemes, knotifications -, kservice, kwidgetsaddons, kwindowsystem, libgcrypt, makeKDEWrapper +, kservice, kwidgetsaddons, kwindowsystem, libgcrypt, makeQtWrapper }: kdeFramework { name = "kwallet"; - nativeBuildInputs = [ extra-cmake-modules kdoctools makeKDEWrapper ]; + nativeBuildInputs = [ extra-cmake-modules kdoctools makeQtWrapper ]; buildInputs = [ kconfig kcoreaddons kdbusaddons kiconthemes knotifications kservice kwidgetsaddons libgcrypt ]; propagatedBuildInputs = [ ki18n kwindowsystem ]; postInstall = '' - wrapKDEProgram "$out/bin/kwalletd5" - wrapKDEProgram "$out/bin/kwallet-query" + wrapQtProgram "$out/bin/kwalletd5" + wrapQtProgram "$out/bin/kwallet-query" ''; meta = { maintainers = [ lib.maintainers.ttuegel ]; diff --git a/pkgs/development/libraries/kde-frameworks-5.15/make-kde-wrapper.nix b/pkgs/development/libraries/kde-frameworks-5.15/make-kde-wrapper.nix deleted file mode 100644 index 2df5037bb335..000000000000 --- a/pkgs/development/libraries/kde-frameworks-5.15/make-kde-wrapper.nix +++ /dev/null @@ -1,3 +0,0 @@ -{ makeSetupHook, makeQtWrapper }: - -makeSetupHook { deps = [ makeQtWrapper ]; } ./make-kde-wrapper.sh diff --git a/pkgs/development/libraries/kde-frameworks-5.15/make-kde-wrapper.sh b/pkgs/development/libraries/kde-frameworks-5.15/make-kde-wrapper.sh deleted file mode 100644 index d7f9691a3913..000000000000 --- a/pkgs/development/libraries/kde-frameworks-5.15/make-kde-wrapper.sh +++ /dev/null @@ -1,13 +0,0 @@ -makeKDEWrapper() { - local old="$1" - local new="$2" - shift - shift - makeQtWrapper "$old" "$new" "$@" -} - -wrapKDEProgram() { - local prog="$1" - shift - wrapQtProgram "$prog" "$@" -} diff --git a/pkgs/development/libraries/kde-frameworks-5.15/plasma-framework/default.nix b/pkgs/development/libraries/kde-frameworks-5.15/plasma-framework/default.nix index 97cbfee36e54..d8846f777231 100644 --- a/pkgs/development/libraries/kde-frameworks-5.15/plasma-framework/default.nix +++ b/pkgs/development/libraries/kde-frameworks-5.15/plasma-framework/default.nix @@ -2,12 +2,12 @@ , kconfig, kconfigwidgets, kcoreaddons, kdbusaddons, kdeclarative , kdoctools, kglobalaccel, kguiaddons, ki18n, kiconthemes, kio , knotifications, kpackage, kservice, kwindowsystem, kxmlgui -, makeKDEWrapper, qtscript, qtx11extras +, makeQtWrapper, qtscript, qtx11extras }: kdeFramework { name = "plasma-framework"; - nativeBuildInputs = [ extra-cmake-modules kdoctools makeKDEWrapper ]; + nativeBuildInputs = [ extra-cmake-modules kdoctools makeQtWrapper ]; buildInputs = [ karchive kconfig kconfigwidgets kcoreaddons kdbusaddons kguiaddons kiconthemes knotifications kxmlgui qtscript @@ -17,7 +17,7 @@ kdeFramework { qtx11extras ]; postInstall = '' - wrapKDEProgram "$out/bin/plasmapkg2" + wrapQtProgram "$out/bin/plasmapkg2" ''; meta = { maintainers = [ lib.maintainers.ttuegel ]; diff --git a/pkgs/development/libraries/kde-frameworks-5.15/solid.nix b/pkgs/development/libraries/kde-frameworks-5.15/solid.nix index 8916a9a3f815..afd125e3c597 100644 --- a/pkgs/development/libraries/kde-frameworks-5.15/solid.nix +++ b/pkgs/development/libraries/kde-frameworks-5.15/solid.nix @@ -1,15 +1,15 @@ { kdeFramework, lib , extra-cmake-modules -, makeKDEWrapper +, makeQtWrapper , qtdeclarative }: kdeFramework { name = "solid"; - nativeBuildInputs = [ extra-cmake-modules makeKDEWrapper ]; + nativeBuildInputs = [ extra-cmake-modules makeQtWrapper ]; buildInputs = [ qtdeclarative ]; postInstall = '' - wrapKDEProgram "$out/bin/solid-hardware5" + wrapQtProgram "$out/bin/solid-hardware5" ''; meta = { maintainers = [ lib.maintainers.ttuegel ]; From 5a2c45427b391a6ac4431db8cb49563d2dc624ca Mon Sep 17 00:00:00 2001 From: Thomas Tuegel Date: Sun, 18 Oct 2015 09:25:50 -0500 Subject: [PATCH 071/162] makeQtWrapper: always wrap impurely --- .../plasma-5.4/plasma-workspace/default.nix | 4 --- .../libraries/qt-5/5.5/make-qt-wrapper.sh | 36 ++++++------------- 2 files changed, 10 insertions(+), 30 deletions(-) diff --git a/pkgs/desktops/plasma-5.4/plasma-workspace/default.nix b/pkgs/desktops/plasma-5.4/plasma-workspace/default.nix index 8fa5709feab5..4a7f8b460ed5 100644 --- a/pkgs/desktops/plasma-5.4/plasma-workspace/default.nix +++ b/pkgs/desktops/plasma-5.4/plasma-workspace/default.nix @@ -28,9 +28,6 @@ plasmaPackage rec { kidletime krunner ktexteditor kwin libkscreen libksysguard plasma-framework qtquick1 qtquickcontrols qtx11extras solid ]; - # All propagatedBuildInputs should be present in the profile because - # impure wrappers are used below. - propagatedUserEnvPkgs = propagatedBuildInputs; patches = [ ./0001-startkde-NixOS-patches.patch ]; inherit bash coreutils gnused gnugrep socat; @@ -42,7 +39,6 @@ plasmaPackage rec { --replace kdostartupconfig5 $out/bin/kdostartupconfig5 ''; postInstall = '' - export QT_WRAPPER_IMPURE=1 wrapQtProgram "$out/bin/ksmserver" wrapQtProgram "$out/bin/plasmawindowed" wrapQtProgram "$out/bin/kcminit_startup" diff --git a/pkgs/development/libraries/qt-5/5.5/make-qt-wrapper.sh b/pkgs/development/libraries/qt-5/5.5/make-qt-wrapper.sh index f4f13833b8d0..156d794af7ff 100644 --- a/pkgs/development/libraries/qt-5/5.5/make-qt-wrapper.sh +++ b/pkgs/development/libraries/qt-5/5.5/make-qt-wrapper.sh @@ -8,19 +8,11 @@ addQtDependency() { wrapQtProgram() { local prog="$1" shift - if [[ -n "$QT_WRAPPER_IMPURE" ]]; then - wrapProgram "$prog" \ - --prefix QT_PLUGIN_PATH : "$QT_PLUGIN_PATH" \ - --prefix QML_IMPORT_PATH : "$QML_IMPORT_PATH" \ - --prefix QML2_IMPORT_PATH : "$QML2_IMPORT_PATH" \ - "$@" - else - wrapProgram "$prog" \ - --set QT_PLUGIN_PATH "$QT_PLUGIN_PATH" \ - --set QML_IMPORT_PATH "$QML_IMPORT_PATH" \ - --set QML2_IMPORT_PATH "$QML2_IMPORT_PATH" \ - "$@" - fi + wrapProgram "$prog" \ + --prefix QT_PLUGIN_PATH : "$QT_PLUGIN_PATH" \ + --prefix QML_IMPORT_PATH : "$QML_IMPORT_PATH" \ + --prefix QML2_IMPORT_PATH : "$QML2_IMPORT_PATH" \ + "$@" } makeQtWrapper() { @@ -28,19 +20,11 @@ makeQtWrapper() { local new="$2" shift shift - if [[ -n "$QT_WRAPPER_IMPURE" ]]; then - makeWrapper "$old" "$new" \ - --prefix QT_PLUGIN_PATH : "$QT_PLUGIN_PATH" \ - --prefix QML_IMPORT_PATH : "$QML_IMPORT_PATH" \ - --prefix QML2_IMPORT_PATH : "$QML2_IMPORT_PATH" \ - "$@" - else - makeWrapper "$old" "$new" \ - --set QT_PLUGIN_PATH "$QT_PLUGIN_PATH" \ - --set QML_IMPORT_PATH "$QML_IMPORT_PATH" \ - --set QML2_IMPORT_PATH "$QML2_IMPORT_PATH" \ - "$@" - fi + makeWrapper "$old" "$new" \ + --prefix QT_PLUGIN_PATH : "$QT_PLUGIN_PATH" \ + --prefix QML_IMPORT_PATH : "$QML_IMPORT_PATH" \ + --prefix QML2_IMPORT_PATH : "$QML2_IMPORT_PATH" \ + "$@" } # cannot use addToSearchPath because these directories may not exist yet From 2b52937afb07792e77d754bbff7adb836233fb6c Mon Sep 17 00:00:00 2001 From: Thomas Tuegel Date: Sun, 18 Oct 2015 11:22:02 -0500 Subject: [PATCH 072/162] kwin: depend on qtmultimedia --- pkgs/desktops/plasma-5.4/kwin/default.nix | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/pkgs/desktops/plasma-5.4/kwin/default.nix b/pkgs/desktops/plasma-5.4/kwin/default.nix index 89da25f691d8..2ba35807ff86 100644 --- a/pkgs/desktops/plasma-5.4/kwin/default.nix +++ b/pkgs/desktops/plasma-5.4/kwin/default.nix @@ -4,7 +4,8 @@ , ki18n, kiconthemes, kinit, kio, knewstuff, knotifications , kpackage, kservice, kwayland, kwidgetsaddons, kwindowsystem , kxmlgui, libinput, libICE, libSM, plasma-framework, qtdeclarative -, qtscript, qtx11extras, udev, wayland, xcb-util-cursor, makeQtWrapper +, qtmultimedia, qtscript, qtx11extras, udev, wayland, xcb-util-cursor +, makeQtWrapper }: plasmaPackage { @@ -22,7 +23,7 @@ plasmaPackage { ]; propagatedBuildInputs = [ kactivities kdeclarative kglobalaccel ki18n kio kwindowsystem - plasma-framework qtdeclarative qtx11extras + plasma-framework qtdeclarative qtmultimedia qtx11extras ]; patches = [ ./0001-qdiriterator-follow-symlinks.patch ]; postInstall = '' From e2383b1f0848e5af5ecf55c7d2983d0ab18a7a6b Mon Sep 17 00:00:00 2001 From: Thomas Tuegel Date: Sun, 18 Oct 2015 11:57:34 -0500 Subject: [PATCH 073/162] extra-cmake-modules: propagate MIME type providers --- .../extra-cmake-modules/default.nix | 2 ++ .../extra-cmake-modules/setup-hook.sh | 27 +++++++++++++++++++ 2 files changed, 29 insertions(+) create mode 100644 pkgs/development/libraries/kde-frameworks-5.15/extra-cmake-modules/setup-hook.sh diff --git a/pkgs/development/libraries/kde-frameworks-5.15/extra-cmake-modules/default.nix b/pkgs/development/libraries/kde-frameworks-5.15/extra-cmake-modules/default.nix index 3c5b4155fa46..4e1b1aff3bd1 100644 --- a/pkgs/development/libraries/kde-frameworks-5.15/extra-cmake-modules/default.nix +++ b/pkgs/development/libraries/kde-frameworks-5.15/extra-cmake-modules/default.nix @@ -4,6 +4,8 @@ kdeFramework { name = "extra-cmake-modules"; patches = [ ./0001-extra-cmake-modules-paths.patch ]; + setupHook = ./setup-hook.sh; + # It is OK to propagate these inputs as long as # extra-cmake-modules is never a propagated input # of some other derivation. diff --git a/pkgs/development/libraries/kde-frameworks-5.15/extra-cmake-modules/setup-hook.sh b/pkgs/development/libraries/kde-frameworks-5.15/extra-cmake-modules/setup-hook.sh new file mode 100644 index 000000000000..a6fa6189240b --- /dev/null +++ b/pkgs/development/libraries/kde-frameworks-5.15/extra-cmake-modules/setup-hook.sh @@ -0,0 +1,27 @@ +addMimePkg() { + local propagated + + if [[ -d "$1/share/mime" ]]; then + propagated= + for pkg in $propagatedBuildInputs; do + if [[ "z$pkg" == "z$1" ]]; then + propagated=1 + fi + done + if [[ -z $propagated ]]; then + propagatedBuildInputs="$propagatedBuildInputs $1" + fi + + propagated= + for pkg in $propagatedUserEnvPkgs; do + if [[ "z$pkg" == "z$1" ]]; then + propagated=1 + fi + done + if [[ -z $propagated ]]; then + propagatedUserEnvPkgs="$propagatedUserEnvPkgs $1" + fi + fi +} + +envHooks+=(addMimePkg) From 03ed16a1c4a706f9f0dedf593b6863e99bb3edb3 Mon Sep 17 00:00:00 2001 From: Thomas Tuegel Date: Sun, 18 Oct 2015 11:57:50 -0500 Subject: [PATCH 074/162] kservice: propagate service providers --- .../kde-frameworks-5.15/kservice/default.nix | 6 ++- .../kservice/setup-hook.sh | 43 +++++++++++++++++++ 2 files changed, 47 insertions(+), 2 deletions(-) create mode 100644 pkgs/development/libraries/kde-frameworks-5.15/kservice/setup-hook.sh diff --git a/pkgs/development/libraries/kde-frameworks-5.15/kservice/default.nix b/pkgs/development/libraries/kde-frameworks-5.15/kservice/default.nix index 5c7727cdb647..03b7c7c2f51d 100644 --- a/pkgs/development/libraries/kde-frameworks-5.15/kservice/default.nix +++ b/pkgs/development/libraries/kde-frameworks-5.15/kservice/default.nix @@ -4,9 +4,11 @@ kdeFramework { name = "kservice"; + setupHook = ./setup-hook.sh; nativeBuildInputs = [ extra-cmake-modules kdoctools ]; - buildInputs = [ kcoreaddons kcrash kdbusaddons ]; - propagatedBuildInputs = [ kconfig ki18n kwindowsystem ]; + buildInputs = [ kcrash kdbusaddons ]; + propagatedBuildInputs = [ kconfig kcoreaddons ki18n kwindowsystem ]; + propagatedUserEnvPkgs = [ kcoreaddons ]; patches = [ ./0001-qdiriterator-follow-symlinks.patch ./0002-no-canonicalize-path.patch diff --git a/pkgs/development/libraries/kde-frameworks-5.15/kservice/setup-hook.sh b/pkgs/development/libraries/kde-frameworks-5.15/kservice/setup-hook.sh new file mode 100644 index 000000000000..c28e862ff8ae --- /dev/null +++ b/pkgs/development/libraries/kde-frameworks-5.15/kservice/setup-hook.sh @@ -0,0 +1,43 @@ +addServicePkg() { + local propagated + for dir in "share/kservices5" "share/kservicetypes5"; do + if [[ -d "$1/$dir" ]]; then + propagated= + for pkg in $propagatedBuildInputs; do + if [[ "z$pkg" == "z$1" ]]; then + propagated=1 + break + fi + done + if [[ -z $propagated ]]; then + propagatedBuildInputs="$propagatedBuildInputs $1" + fi + + propagated= + for pkg in $propagatedUserEnvPkgs; do + if [[ "z$pkg" == "z$1" ]]; then + propagated=1 + break + fi + done + if [[ -z $propagated ]]; then + propagatedUserEnvPkgs="$propagatedUserEnvPkgs $1" + fi + + break + fi + done +} + +envHooks+=(addServicePkg) + +local propagated +for pkg in $propagatedBuildInputs; do + if [[ "z$pkg" == "z@out@" ]]; then + propagated=1 + break + fi +done +if [[ -z $propagated ]]; then + propagatedBuildInputs="$propagatedBuildInputs @out@" +fi From b36c2dd0a07610a51d26cbe1e7bb850d3058b0e5 Mon Sep 17 00:00:00 2001 From: Thomas Tuegel Date: Sun, 18 Oct 2015 13:42:36 -0500 Subject: [PATCH 075/162] nixos/kde5: install frameworkintegration --- nixos/modules/services/x11/desktop-managers/kde5.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/nixos/modules/services/x11/desktop-managers/kde5.nix b/nixos/modules/services/x11/desktop-managers/kde5.nix index 4f72d0f47cd9..00859885e087 100644 --- a/nixos/modules/services/x11/desktop-managers/kde5.nix +++ b/nixos/modules/services/x11/desktop-managers/kde5.nix @@ -72,6 +72,7 @@ in [ pkgs.qt4 # qtconfig is the only way to set Qt 4 theme + kf5.frameworkintegration kf5.kinit plasma5.breeze From 0267246f2f78b52cf12c654ace8af2c76343aebf Mon Sep 17 00:00:00 2001 From: Thomas Tuegel Date: Sun, 18 Oct 2015 14:55:01 -0500 Subject: [PATCH 076/162] kwin: remove obsolete patch --- .../plasma-5.4/kwin/libinput-0.8.patch | 25 ------------------- 1 file changed, 25 deletions(-) delete mode 100644 pkgs/desktops/plasma-5.4/kwin/libinput-0.8.patch diff --git a/pkgs/desktops/plasma-5.4/kwin/libinput-0.8.patch b/pkgs/desktops/plasma-5.4/kwin/libinput-0.8.patch deleted file mode 100644 index d0b9658b3bfc..000000000000 --- a/pkgs/desktops/plasma-5.4/kwin/libinput-0.8.patch +++ /dev/null @@ -1,25 +0,0 @@ -commit a93a2ab1918630c6d571b5a24379c15a0458d1fa -Author: Martin Gräßlin -Date: Wed Jan 28 16:20:57 2015 +0100 - - Disable libinput integration if >= 0.8 is found - - libinput 0.8 is incompatible causing the build to fail. As we are in - dependency freeze the only option is to disable the build. - - BUG: 342893 - FIXED-IN: 5.2.1 - -diff --git a/CMakeLists.txt b/CMakeLists.txt -index 550ef57..8d9c593 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -145,7 +145,7 @@ set_package_properties(UDev PROPERTIES URL "http://www.freedesktop.org/software - PURPOSE "Required for input handling on Wayland." - ) - set(HAVE_INPUT FALSE) --if (Libinput_FOUND AND UDEV_FOUND) -+if (Libinput_FOUND AND UDEV_FOUND AND Libinput_VERSION VERSION_LESS 0.8) - set(HAVE_INPUT TRUE) - endif() - From 9fa17aa2933cb1e5048d6de3713cb65f562d81f6 Mon Sep 17 00:00:00 2001 From: Thomas Tuegel Date: Sun, 18 Oct 2015 14:56:30 -0500 Subject: [PATCH 077/162] kdoctools: set XDG_DATA_DIRS in setupHook --- .../libraries/kde-frameworks-5.15/kdoctools/default.nix | 1 + .../libraries/kde-frameworks-5.15/kdoctools/setup-hook.sh | 5 +++++ pkgs/development/libraries/qt-5/5.5/make-qt-wrapper.sh | 1 - 3 files changed, 6 insertions(+), 1 deletion(-) create mode 100644 pkgs/development/libraries/kde-frameworks-5.15/kdoctools/setup-hook.sh diff --git a/pkgs/development/libraries/kde-frameworks-5.15/kdoctools/default.nix b/pkgs/development/libraries/kde-frameworks-5.15/kdoctools/default.nix index f67c19f42395..138c3fc33b94 100644 --- a/pkgs/development/libraries/kde-frameworks-5.15/kdoctools/default.nix +++ b/pkgs/development/libraries/kde-frameworks-5.15/kdoctools/default.nix @@ -4,6 +4,7 @@ kdeFramework { name = "kdoctools"; + setupHook = ./setup-hook.sh; nativeBuildInputs = [ extra-cmake-modules ]; buildInputs = [ karchive ]; propagatedBuildInputs = [ ki18n ]; diff --git a/pkgs/development/libraries/kde-frameworks-5.15/kdoctools/setup-hook.sh b/pkgs/development/libraries/kde-frameworks-5.15/kdoctools/setup-hook.sh new file mode 100644 index 000000000000..5cfffbd622d1 --- /dev/null +++ b/pkgs/development/libraries/kde-frameworks-5.15/kdoctools/setup-hook.sh @@ -0,0 +1,5 @@ +addXdgData() { + addToSearchPath XDG_DATA_DIRS "$1/share" +} + +envHooks+=(addXdgData) diff --git a/pkgs/development/libraries/qt-5/5.5/make-qt-wrapper.sh b/pkgs/development/libraries/qt-5/5.5/make-qt-wrapper.sh index 156d794af7ff..4eda9f82faa2 100644 --- a/pkgs/development/libraries/qt-5/5.5/make-qt-wrapper.sh +++ b/pkgs/development/libraries/qt-5/5.5/make-qt-wrapper.sh @@ -2,7 +2,6 @@ addQtDependency() { addToSearchPath QT_PLUGIN_PATH "$1/lib/qt5/plugins" addToSearchPath QML_IMPORT_PATH "$1/lib/qt5/imports" addToSearchPath QML2_IMPORT_PATH "$1/lib/qt5/qml" - addToSearchPath XDG_DATA_DIRS "$1/share" } wrapQtProgram() { From 361b1165efc6202bb1bf0b862ef5ef9a61d9d5cd Mon Sep 17 00:00:00 2001 From: Thomas Tuegel Date: Sun, 18 Oct 2015 14:59:42 -0500 Subject: [PATCH 078/162] qtbase: propagate runtime dependencies This is done so that makeQtWrapper works correctly. --- .../libraries/qt-5/5.5/qtbase/setup-hook.sh | 21 ++++++++++++++++++- 1 file changed, 20 insertions(+), 1 deletion(-) diff --git a/pkgs/development/libraries/qt-5/5.5/qtbase/setup-hook.sh b/pkgs/development/libraries/qt-5/5.5/qtbase/setup-hook.sh index ab34cbd36751..33380ce0d979 100644 --- a/pkgs/development/libraries/qt-5/5.5/qtbase/setup-hook.sh +++ b/pkgs/development/libraries/qt-5/5.5/qtbase/setup-hook.sh @@ -20,6 +20,25 @@ addQtModule() { fi } +propagateRuntimeDeps() { + local propagated + for dir in "lib/qt5/plugins" "lib/qt5/qml" "lib/qt5/imports"; do + if [[ -d "$1/$dir" ]]; then + propagated= + for pkg in $propagatedBuildInputs; do + if [[ "z$pkg" == "z$1" ]]; then + propagated=1 + break + fi + done + if [[ -z $propagated ]]; then + propagatedBuildInputs="$propagatedBuildInputs $1" + fi + break + fi + done +} + rmQtModules() { cat "$out/nix-support/qt-inputs" | while read file; do if [[ -h "$out/$file" ]]; then @@ -65,7 +84,7 @@ EOF export QMAKE="$qtOut/bin/qmake" -envHooks+=(addQtModule) +envHooks+=(addQtModule propagateRuntimeDeps) preConfigurePhases+=(setQMakePath) if [[ -n "$NIX_QT_SUBMODULE" ]]; then From 67cfc9c8c9f82c1f19be3311dd625121b43f028c Mon Sep 17 00:00:00 2001 From: Thomas Tuegel Date: Mon, 19 Oct 2015 18:48:26 -0500 Subject: [PATCH 079/162] plasma-desktop: fix QML import paths for Qt 5.5 --- .../plasma-desktop/0001-hwclock.patch | 6 +-- .../plasma-desktop/0002-zoneinfo.patch | 6 +-- .../0003-qt-5.5-QML-import-paths.patch | 39 +++++++++++++++++++ .../plasma-5.4/plasma-desktop/default.nix | 1 + 4 files changed, 46 insertions(+), 6 deletions(-) create mode 100644 pkgs/desktops/plasma-5.4/plasma-desktop/0003-qt-5.5-QML-import-paths.patch diff --git a/pkgs/desktops/plasma-5.4/plasma-desktop/0001-hwclock.patch b/pkgs/desktops/plasma-5.4/plasma-desktop/0001-hwclock.patch index 1a0ca99113d9..a0b1f880ba85 100644 --- a/pkgs/desktops/plasma-5.4/plasma-desktop/0001-hwclock.patch +++ b/pkgs/desktops/plasma-5.4/plasma-desktop/0001-hwclock.patch @@ -1,7 +1,7 @@ -From bce620c9dcb25a4e603b22ead5c004b053dae7bf Mon Sep 17 00:00:00 2001 +From 618d86f35b83ee9e57da12be9d0866e34e487b88 Mon Sep 17 00:00:00 2001 From: Thomas Tuegel Date: Fri, 28 Aug 2015 10:16:38 -0500 -Subject: [PATCH 1/2] hwclock +Subject: [PATCH 1/3] hwclock --- kcms/dateandtime/helper.cpp | 6 +----- @@ -32,5 +32,5 @@ index cec5ab8..fc4a6b9 100644 KProcess::execute(hwclock, QStringList() << "--systohc"); } -- -2.5.0 +2.5.2 diff --git a/pkgs/desktops/plasma-5.4/plasma-desktop/0002-zoneinfo.patch b/pkgs/desktops/plasma-5.4/plasma-desktop/0002-zoneinfo.patch index 321bf083ae26..900c4d095e87 100644 --- a/pkgs/desktops/plasma-5.4/plasma-desktop/0002-zoneinfo.patch +++ b/pkgs/desktops/plasma-5.4/plasma-desktop/0002-zoneinfo.patch @@ -1,7 +1,7 @@ -From 2778186be31a8f949135ed99232eafee201a668d Mon Sep 17 00:00:00 2001 +From decdc77a7e89b6f1bb3d49268b08a43daf4a7147 Mon Sep 17 00:00:00 2001 From: Thomas Tuegel Date: Fri, 28 Aug 2015 10:16:53 -0500 -Subject: [PATCH 2/2] zoneinfo +Subject: [PATCH 2/3] zoneinfo --- kcms/dateandtime/helper.cpp | 7 ++++++- @@ -26,5 +26,5 @@ index fc4a6b9..7b64d05 100644 if (QFile::exists(tz)) { // make sure the new TZ really exists QFile::remove("/etc/localtime"); -- -2.5.0 +2.5.2 diff --git a/pkgs/desktops/plasma-5.4/plasma-desktop/0003-qt-5.5-QML-import-paths.patch b/pkgs/desktops/plasma-5.4/plasma-desktop/0003-qt-5.5-QML-import-paths.patch new file mode 100644 index 000000000000..56d74ee1e94f --- /dev/null +++ b/pkgs/desktops/plasma-5.4/plasma-desktop/0003-qt-5.5-QML-import-paths.patch @@ -0,0 +1,39 @@ +From d640d060109e552b333578abc80a36b47e521d4c Mon Sep 17 00:00:00 2001 +From: Thomas Tuegel +Date: Mon, 19 Oct 2015 18:45:36 -0500 +Subject: [PATCH 3/3] qt-5.5 QML import paths + +--- + containments/desktop/package/contents/ui/main.qml | 2 +- + containments/panel/contents/ui/main.qml | 2 +- + 2 files changed, 2 insertions(+), 2 deletions(-) + +diff --git a/containments/desktop/package/contents/ui/main.qml b/containments/desktop/package/contents/ui/main.qml +index 8c42706..fc74433 100644 +--- a/containments/desktop/package/contents/ui/main.qml ++++ b/containments/desktop/package/contents/ui/main.qml +@@ -28,7 +28,7 @@ import org.kde.draganddrop 2.0 as DragDrop + + import org.kde.private.desktopcontainment.desktop 0.1 as Desktop + +-import "LayoutManager.js" as LayoutManager ++import "../code/LayoutManager.js" as LayoutManager + + DragDrop.DropArea { + id: root +diff --git a/containments/panel/contents/ui/main.qml b/containments/panel/contents/ui/main.qml +index 6a6f364..edba48e 100644 +--- a/containments/panel/contents/ui/main.qml ++++ b/containments/panel/contents/ui/main.qml +@@ -25,7 +25,7 @@ import org.kde.plasma.components 2.0 as PlasmaComponents + import org.kde.kquickcontrolsaddons 2.0 + import org.kde.draganddrop 2.0 as DragDrop + +-import "LayoutManager.js" as LayoutManager ++import "../code/LayoutManager.js" as LayoutManager + + DragDrop.DropArea { + id: root +-- +2.5.2 + diff --git a/pkgs/desktops/plasma-5.4/plasma-desktop/default.nix b/pkgs/desktops/plasma-5.4/plasma-desktop/default.nix index 51b67b343f27..6c9e45212c08 100644 --- a/pkgs/desktops/plasma-5.4/plasma-desktop/default.nix +++ b/pkgs/desktops/plasma-5.4/plasma-desktop/default.nix @@ -37,6 +37,7 @@ plasmaPackage rec { hwclock = "${utillinux}/sbin/hwclock"; }) ./0002-zoneinfo.patch + ./0003-qt-5.5-QML-import-paths.patch ]; NIX_CFLAGS_COMPILE = [ "-I${xorgserver}/include/xorg" ]; cmakeFlags = [ From 154a2d8835992e894a494cae2baf5df750977ffa Mon Sep 17 00:00:00 2001 From: Thomas Tuegel Date: Mon, 19 Oct 2015 18:56:56 -0500 Subject: [PATCH 080/162] plasma-workspace: fix QML import paths for Qt 5.5 --- .../0001-startkde-NixOS-patches.patch | 8 +- .../0002-qt-5.5-QML-import-paths.patch | 123 ++++++++++++++++++ .../plasma-5.4/plasma-workspace/default.nix | 5 +- 3 files changed, 131 insertions(+), 5 deletions(-) create mode 100644 pkgs/desktops/plasma-5.4/plasma-workspace/0002-qt-5.5-QML-import-paths.patch diff --git a/pkgs/desktops/plasma-5.4/plasma-workspace/0001-startkde-NixOS-patches.patch b/pkgs/desktops/plasma-5.4/plasma-workspace/0001-startkde-NixOS-patches.patch index 6752258112ef..9f2de9c7f9a0 100644 --- a/pkgs/desktops/plasma-5.4/plasma-workspace/0001-startkde-NixOS-patches.patch +++ b/pkgs/desktops/plasma-5.4/plasma-workspace/0001-startkde-NixOS-patches.patch @@ -1,14 +1,14 @@ -From d34575dc1edb9fcc8e7608e82e63c6c9d20f37ea Mon Sep 17 00:00:00 2001 +From 3d837f48853987d5adaf69a9498c4cf116368a18 Mon Sep 17 00:00:00 2001 From: Thomas Tuegel Date: Thu, 27 Aug 2015 20:36:39 -0500 -Subject: [PATCH] startkde NixOS patches +Subject: [PATCH 1/2] startkde NixOS patches --- startkde/startkde.cmake | 219 ++++++++++++++++++++---------------------------- 1 file changed, 89 insertions(+), 130 deletions(-) diff --git a/startkde/startkde.cmake b/startkde/startkde.cmake -index cfbe227..999dd8f 100644 +index 2c4c315..d418253 100644 --- a/startkde/startkde.cmake +++ b/startkde/startkde.cmake @@ -1,8 +1,31 @@ @@ -400,5 +400,5 @@ index cfbe227..999dd8f 100644 echo 'startkde: Done.' 1>&2 -- -2.5.0 +2.5.2 diff --git a/pkgs/desktops/plasma-5.4/plasma-workspace/0002-qt-5.5-QML-import-paths.patch b/pkgs/desktops/plasma-5.4/plasma-workspace/0002-qt-5.5-QML-import-paths.patch new file mode 100644 index 000000000000..8eec571654ed --- /dev/null +++ b/pkgs/desktops/plasma-5.4/plasma-workspace/0002-qt-5.5-QML-import-paths.patch @@ -0,0 +1,123 @@ +From 709fe8bff26c9680de13be5e8e5bc587c25a9b2e Mon Sep 17 00:00:00 2001 +From: Thomas Tuegel +Date: Mon, 19 Oct 2015 18:55:36 -0500 +Subject: [PATCH 2/2] qt-5.5 QML import paths + +--- + applets/analog-clock/contents/ui/analogclock.qml | 2 +- + applets/batterymonitor/package/contents/ui/BatteryItem.qml | 2 +- + applets/batterymonitor/package/contents/ui/CompactRepresentation.qml | 2 +- + applets/batterymonitor/package/contents/ui/PopupDialog.qml | 2 +- + applets/batterymonitor/package/contents/ui/batterymonitor.qml | 2 +- + applets/lock_logout/contents/ui/lockout.qml | 2 +- + applets/notifications/package/contents/ui/main.qml | 2 +- + applets/systemtray/package/contents/ui/main.qml | 2 +- + 8 files changed, 8 insertions(+), 8 deletions(-) + +diff --git a/applets/analog-clock/contents/ui/analogclock.qml b/applets/analog-clock/contents/ui/analogclock.qml +index edb3af9..7eb839d 100644 +--- a/applets/analog-clock/contents/ui/analogclock.qml ++++ b/applets/analog-clock/contents/ui/analogclock.qml +@@ -25,7 +25,7 @@ import org.kde.plasma.calendar 2.0 as PlasmaCalendar + import QtQuick.Layouts 1.1 + + import org.kde.plasma.core 2.0 as PlasmaCore +-import "logic.js" as Logic ++import "../code/logic.js" as Logic + + Item { + id: analogclock +diff --git a/applets/batterymonitor/package/contents/ui/BatteryItem.qml b/applets/batterymonitor/package/contents/ui/BatteryItem.qml +index 8d43797..3322369 100644 +--- a/applets/batterymonitor/package/contents/ui/BatteryItem.qml ++++ b/applets/batterymonitor/package/contents/ui/BatteryItem.qml +@@ -26,7 +26,7 @@ import org.kde.plasma.components 2.0 as PlasmaComponents + import org.kde.plasma.extras 2.0 as PlasmaExtras + import org.kde.plasma.workspace.components 2.0 + import org.kde.kcoreaddons 1.0 as KCoreAddons +-import "logic.js" as Logic ++import "../code/logic.js" as Logic + + Item { + id: batteryItem +diff --git a/applets/batterymonitor/package/contents/ui/CompactRepresentation.qml b/applets/batterymonitor/package/contents/ui/CompactRepresentation.qml +index b4059cb..ae8eeaf 100755 +--- a/applets/batterymonitor/package/contents/ui/CompactRepresentation.qml ++++ b/applets/batterymonitor/package/contents/ui/CompactRepresentation.qml +@@ -24,7 +24,7 @@ import QtQuick.Layouts 1.1 + import org.kde.plasma.core 2.0 as PlasmaCore + import org.kde.plasma.components 2.0 as Components + import org.kde.plasma.workspace.components 2.0 +-import "logic.js" as Logic ++import "../code/logic.js" as Logic + + MouseArea { + id: root +diff --git a/applets/batterymonitor/package/contents/ui/PopupDialog.qml b/applets/batterymonitor/package/contents/ui/PopupDialog.qml +index d4952c6..2b6586d 100644 +--- a/applets/batterymonitor/package/contents/ui/PopupDialog.qml ++++ b/applets/batterymonitor/package/contents/ui/PopupDialog.qml +@@ -23,7 +23,7 @@ import org.kde.plasma.core 2.0 as PlasmaCore + import org.kde.plasma.components 2.0 as Components + import org.kde.plasma.extras 2.0 as PlasmaExtras + import org.kde.kquickcontrolsaddons 2.0 +-import "logic.js" as Logic ++import "../code/logic.js" as Logic + + FocusScope { + id: dialog +diff --git a/applets/batterymonitor/package/contents/ui/batterymonitor.qml b/applets/batterymonitor/package/contents/ui/batterymonitor.qml +index a086581..6e1e8be 100755 +--- a/applets/batterymonitor/package/contents/ui/batterymonitor.qml ++++ b/applets/batterymonitor/package/contents/ui/batterymonitor.qml +@@ -25,7 +25,7 @@ import org.kde.plasma.plasmoid 2.0 + import org.kde.plasma.core 2.0 as PlasmaCore + import org.kde.kcoreaddons 1.0 as KCoreAddons + import org.kde.kquickcontrolsaddons 2.0 +-import "logic.js" as Logic ++import "../code/logic.js" as Logic + + Item { + id: batterymonitor +diff --git a/applets/lock_logout/contents/ui/lockout.qml b/applets/lock_logout/contents/ui/lockout.qml +index d243796..86475df 100644 +--- a/applets/lock_logout/contents/ui/lockout.qml ++++ b/applets/lock_logout/contents/ui/lockout.qml +@@ -23,7 +23,7 @@ import org.kde.plasma.plasmoid 2.0 + import org.kde.plasma.core 2.0 as PlasmaCore + import org.kde.plasma.components 2.0 + import org.kde.kquickcontrolsaddons 2.0 +-import "data.js" as Data ++import "../code/data.js" as Data + + Flow { + id: lockout +diff --git a/applets/notifications/package/contents/ui/main.qml b/applets/notifications/package/contents/ui/main.qml +index 2871cdb..3f50856 100644 +--- a/applets/notifications/package/contents/ui/main.qml ++++ b/applets/notifications/package/contents/ui/main.qml +@@ -28,7 +28,7 @@ import org.kde.plasma.extras 2.0 as PlasmaExtras + + import org.kde.plasma.private.notifications 1.0 + +-import "uiproperties.js" as UiProperties ++import "../code/uiproperties.js" as UiProperties + + MouseEventListener { + id: notificationsApplet +diff --git a/applets/systemtray/package/contents/ui/main.qml b/applets/systemtray/package/contents/ui/main.qml +index 2e26455..864c9c5 100644 +--- a/applets/systemtray/package/contents/ui/main.qml ++++ b/applets/systemtray/package/contents/ui/main.qml +@@ -25,7 +25,7 @@ import org.kde.plasma.core 2.0 as PlasmaCore + // import org.kde.plasma.extras 2.0 as PlasmaExtras + + import org.kde.private.systemtray 2.0 as SystemTray +-import "Layout.js" as LayoutManager ++import "../code/Layout.js" as LayoutManager + + Item { + id: root +-- +2.5.2 + diff --git a/pkgs/desktops/plasma-5.4/plasma-workspace/default.nix b/pkgs/desktops/plasma-5.4/plasma-workspace/default.nix index 4a7f8b460ed5..0b4e4165ae6c 100644 --- a/pkgs/desktops/plasma-5.4/plasma-workspace/default.nix +++ b/pkgs/desktops/plasma-5.4/plasma-workspace/default.nix @@ -28,7 +28,10 @@ plasmaPackage rec { kidletime krunner ktexteditor kwin libkscreen libksysguard plasma-framework qtquick1 qtquickcontrols qtx11extras solid ]; - patches = [ ./0001-startkde-NixOS-patches.patch ]; + patches = [ + ./0001-startkde-NixOS-patches.patch + ./0002-qt-5.5-QML-import-paths.patch + ]; inherit bash coreutils gnused gnugrep socat; inherit kconfig kinit kservice qttools; From 79b1b3e00a5f0e2efc338145ed83561767bd6a56 Mon Sep 17 00:00:00 2001 From: Thomas Tuegel Date: Mon, 19 Oct 2015 18:59:00 -0500 Subject: [PATCH 081/162] plasma-desktop: fix more QML import paths --- .../0003-qt-5.5-QML-import-paths.patch | 36 ++++++++++++++++--- 1 file changed, 32 insertions(+), 4 deletions(-) diff --git a/pkgs/desktops/plasma-5.4/plasma-desktop/0003-qt-5.5-QML-import-paths.patch b/pkgs/desktops/plasma-5.4/plasma-desktop/0003-qt-5.5-QML-import-paths.patch index 56d74ee1e94f..6b143bd2eb04 100644 --- a/pkgs/desktops/plasma-5.4/plasma-desktop/0003-qt-5.5-QML-import-paths.patch +++ b/pkgs/desktops/plasma-5.4/plasma-desktop/0003-qt-5.5-QML-import-paths.patch @@ -1,13 +1,41 @@ -From d640d060109e552b333578abc80a36b47e521d4c Mon Sep 17 00:00:00 2001 +From 4231d70ec08d9bbb367b222d9ef04454c1dc7328 Mon Sep 17 00:00:00 2001 From: Thomas Tuegel Date: Mon, 19 Oct 2015 18:45:36 -0500 Subject: [PATCH 3/3] qt-5.5 QML import paths --- - containments/desktop/package/contents/ui/main.qml | 2 +- - containments/panel/contents/ui/main.qml | 2 +- - 2 files changed, 2 insertions(+), 2 deletions(-) + applets/pager/package/contents/ui/main.qml | 2 +- + containments/desktop/package/contents/ui/FolderView.qml | 2 +- + containments/desktop/package/contents/ui/main.qml | 2 +- + containments/panel/contents/ui/main.qml | 2 +- + 4 files changed, 4 insertions(+), 4 deletions(-) +diff --git a/applets/pager/package/contents/ui/main.qml b/applets/pager/package/contents/ui/main.qml +index 0c367c6..c9a82be 100644 +--- a/applets/pager/package/contents/ui/main.qml ++++ b/applets/pager/package/contents/ui/main.qml +@@ -23,7 +23,7 @@ import org.kde.plasma.components 2.0 as PlasmaComponents + import org.kde.kquickcontrolsaddons 2.0 as KQuickControlsAddonsComponents + import org.kde.draganddrop 2.0 + import org.kde.plasma.private.pager 2.0 +-import "utils.js" as Utils ++import "../code/utils.js" as Utils + + MouseArea { + id: root +diff --git a/containments/desktop/package/contents/ui/FolderView.qml b/containments/desktop/package/contents/ui/FolderView.qml +index 578ec87..04e088c 100644 +--- a/containments/desktop/package/contents/ui/FolderView.qml ++++ b/containments/desktop/package/contents/ui/FolderView.qml +@@ -27,7 +27,7 @@ import org.kde.plasma.extras 2.0 as PlasmaExtras + import org.kde.kquickcontrolsaddons 2.0 + + import org.kde.private.desktopcontainment.folder 0.1 as Folder +-import "FolderTools.js" as FolderTools ++import "../code/FolderTools.js" as FolderTools + + Item { + id: main diff --git a/containments/desktop/package/contents/ui/main.qml b/containments/desktop/package/contents/ui/main.qml index 8c42706..fc74433 100644 --- a/containments/desktop/package/contents/ui/main.qml From fda04aaaa3cf51f2f8567a2a7b8b8b093eff1c6a Mon Sep 17 00:00:00 2001 From: Thomas Tuegel Date: Mon, 19 Oct 2015 19:01:47 -0500 Subject: [PATCH 082/162] plasma-desktop: don't move files --- pkgs/desktops/plasma-5.4/plasma-desktop/default.nix | 8 -------- 1 file changed, 8 deletions(-) diff --git a/pkgs/desktops/plasma-5.4/plasma-desktop/default.nix b/pkgs/desktops/plasma-5.4/plasma-desktop/default.nix index 6c9e45212c08..211bf5a355ec 100644 --- a/pkgs/desktops/plasma-5.4/plasma-desktop/default.nix +++ b/pkgs/desktops/plasma-5.4/plasma-desktop/default.nix @@ -45,14 +45,6 @@ plasmaPackage rec { "-DSynaptics_INCLUDE_DIRS=${xf86inputsynaptics}/include/xorg" ]; postInstall = '' - # These files are installed in the wrong location. - cd "$out/share/plasma/plasmoids/org.kde.desktopcontainment/contents" - mv "code/LayoutManager.js" "ui/LayoutManager.js" - cd "$out/share/plasma/plasmoids/org.kde.panel/contents" - mv "code/LayoutManager.js" "ui/LayoutManager.js" - - cd "$NIX_BUILD_TOP" - wrapQtProgram "$out/bin/kaccess" wrapQtProgram "$out/bin/solid-action-desktop-gen" wrapQtProgram "$out/bin/knetattach" From b4af2259e218cdc39e050ae5f2d2c1c315afb1a1 Mon Sep 17 00:00:00 2001 From: Thomas Tuegel Date: Mon, 19 Oct 2015 21:59:48 -0500 Subject: [PATCH 083/162] plasma-workspace: fix screen locker --- pkgs/desktops/plasma-5.4/plasma-workspace/default.nix | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/pkgs/desktops/plasma-5.4/plasma-workspace/default.nix b/pkgs/desktops/plasma-5.4/plasma-workspace/default.nix index 0b4e4165ae6c..85f38b24e8cc 100644 --- a/pkgs/desktops/plasma-5.4/plasma-workspace/default.nix +++ b/pkgs/desktops/plasma-5.4/plasma-workspace/default.nix @@ -55,5 +55,9 @@ plasmaPackage rec { wrapQtProgram "$out/bin/kuiserver5" wrapQtProgram "$out/bin/krunner" wrapQtProgram "$out/bin/plasmashell" + + wrapQtProgram "$out/lib/libexec/drkonqi" + wrapQtProgram "$out/lib/libexec/kscreenlocker_greet" + rm "$out/lib/libexec/startplasma" ''; } From 007cde764d09276035f97c8967656e986cd050ae Mon Sep 17 00:00:00 2001 From: Thomas Tuegel Date: Mon, 19 Oct 2015 21:59:58 -0500 Subject: [PATCH 084/162] plasma-desktop: fix logout/shutdown dialogs --- pkgs/desktops/plasma-5.4/plasma-desktop/default.nix | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/pkgs/desktops/plasma-5.4/plasma-desktop/default.nix b/pkgs/desktops/plasma-5.4/plasma-desktop/default.nix index 211bf5a355ec..6aae2e20aaae 100644 --- a/pkgs/desktops/plasma-5.4/plasma-desktop/default.nix +++ b/pkgs/desktops/plasma-5.4/plasma-desktop/default.nix @@ -7,6 +7,7 @@ , qtsvg, libXcursor, libXft, libxkbfile, xf86inputevdev , xf86inputsynaptics, xinput, xkeyboard_config, xorgserver , libcanberra_kde, libpulseaudio, makeQtWrapper, utillinux +, qtquick1, qtquickcontrols }: plasmaPackage rec { @@ -26,7 +27,8 @@ plasmaPackage rec { propagatedBuildInputs = [ baloo kactivities kauth kdeclarative kdelibs4support kemoticons kglobalaccel ki18n kpeople krunner kwin plasma-framework - plasma-workspace qtdeclarative qtx11extras + plasma-workspace qtdeclarative qtquick1 qtquickcontrols + qtx11extras ]; # All propagatedBuildInputs should be present in the profile because # wrappers cannot be used here. From dcd70c54aa85582bf84923789593da99099f3d28 Mon Sep 17 00:00:00 2001 From: Thomas Tuegel Date: Sat, 24 Oct 2015 19:00:47 -0500 Subject: [PATCH 085/162] qtbase: copy qmake to temp dir Fixes #10273. --- pkgs/development/libraries/qt-5/5.5/qtbase/setup-hook.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/libraries/qt-5/5.5/qtbase/setup-hook.sh b/pkgs/development/libraries/qt-5/5.5/qtbase/setup-hook.sh index 33380ce0d979..d5e9eff60eff 100644 --- a/pkgs/development/libraries/qt-5/5.5/qtbase/setup-hook.sh +++ b/pkgs/development/libraries/qt-5/5.5/qtbase/setup-hook.sh @@ -65,7 +65,7 @@ setQMakePath() { qtOut="" if [[ -z "$NIX_QT_SUBMODULE" ]]; then - qtOut="$PWD/qmake-$name" + qtOut=`mktemp -d` else qtOut=$out fi From cade7dfd77327ac1dbd8b2d7bc9b5385042052c6 Mon Sep 17 00:00:00 2001 From: Thomas Tuegel Date: Sun, 25 Oct 2015 08:46:18 -0500 Subject: [PATCH 086/162] kdeApps_15_08: package locales --- pkgs/applications/kde-apps-15.08/default.nix | 260 +++++++++++++++++++ 1 file changed, 260 insertions(+) diff --git a/pkgs/applications/kde-apps-15.08/default.nix b/pkgs/applications/kde-apps-15.08/default.nix index b24c9023caf0..d374f2b12875 100644 --- a/pkgs/applications/kde-apps-15.08/default.nix +++ b/pkgs/applications/kde-apps-15.08/default.nix @@ -41,6 +41,43 @@ let } // (args.meta or {}); }); + kdeLocale4 = name: args: + { kdeApp, automoc4, cmake, gettext, kdelibs, perl }: + + kdeApp (args // { + sname = "kde-l10n-${name}"; + name = "kde-l10n-${name}-qt4"; + + nativeBuildInputs = + [ automoc4 cmake gettext perl ] + ++ (args.nativeBuildInputs or []); + buildInputs = + [ kdelibs ] + ++ (args.buildInputs or []); + + preConfigure = '' + sed -e 's/add_subdirectory(5)//' -i CMakeLists.txt + ${args.preConfigure or ""} + ''; + }); + + kdeLocale5 = name: args: + { kdeApp, cmake, extra-cmake-modules, gettext, kdoctools }: + + kdeApp (args // { + sname = "kde-l10n-${name}"; + name = "kde-l10n-${name}-qt5"; + + nativeBuildInputs = + [ cmake extra-cmake-modules gettext kdoctools ] + ++ (args.nativeBuildInputs or []); + + preConfigure = '' + sed -e 's/add_subdirectory(4)//' -i CMakeLists.txt + ${args.preConfigure or ""} + ''; + }); + packages = self: with self; { kdelibs = callPackage ./kdelibs { inherit (pkgs) attica phonon; }; @@ -62,6 +99,229 @@ let okular = callPackage ./okular.nix {}; oxygen-icons = callPackage ./oxygen-icons.nix {}; print-manager = callPackage ./print-manager.nix {}; + + l10n = lib.mapAttrs (name: attr: pkgs.recurseIntoAttrs attr) { + ar = { + qt4 = callPackage (kdeLocale4 "ar" {}) {}; + qt5 = callPackage (kdeLocale5 "ar" {}) {}; + }; + bg = { + qt4 = callPackage (kdeLocale4 "bg" {}) {}; + qt5 = callPackage (kdeLocale5 "bg" {}) {}; + }; + bs = { + qt4 = callPackage (kdeLocale4 "bs" {}) {}; + qt5 = callPackage (kdeLocale5 "bs" {}) {}; + }; + ca = { + qt4 = callPackage (kdeLocale4 "ca" {}) {}; + qt5 = callPackage (kdeLocale5 "ca" {}) {}; + }; + ca_valencia = { + qt4 = callPackage (kdeLocale4 "ca_valencia" {}) {}; + qt5 = callPackage (kdeLocale5 "ca_valencia" {}) {}; + }; + cs = { + qt4 = callPackage (kdeLocale4 "cs" {}) {}; + qt5 = callPackage (kdeLocale5 "cs" {}) {}; + }; + da = { + qt4 = callPackage (kdeLocale4 "da" {}) {}; + qt5 = callPackage (kdeLocale5 "da" {}) {}; + }; + de = { + qt4 = callPackage (kdeLocale4 "de" {}) {}; + qt5 = callPackage (kdeLocale5 "de" {}) {}; + }; + el = { + qt4 = callPackage (kdeLocale4 "el" {}) {}; + qt5 = callPackage (kdeLocale5 "el" {}) {}; + }; + en_GB = { + qt4 = callPackage (kdeLocale4 "en_GB" {}) {}; + qt5 = callPackage (kdeLocale5 "en_GB" {}) {}; + }; + eo = { + qt4 = callPackage (kdeLocale4 "eo" {}) {}; + qt5 = callPackage (kdeLocale5 "eo" {}) {}; + }; + es = { + qt4 = callPackage (kdeLocale4 "es" {}) {}; + qt5 = callPackage (kdeLocale5 "es" {}) {}; + }; + et = { + qt4 = callPackage (kdeLocale4 "et" {}) {}; + qt5 = callPackage (kdeLocale5 "et" {}) {}; + }; + eu = { + qt4 = callPackage (kdeLocale4 "eu" {}) {}; + qt5 = callPackage (kdeLocale5 "eu" {}) {}; + }; + fa = { + qt4 = callPackage (kdeLocale4 "fa" {}) {}; + qt5 = callPackage (kdeLocale5 "fa" {}) {}; + }; + fi = { + qt4 = callPackage (kdeLocale4 "fi" {}) {}; + qt5 = callPackage (kdeLocale5 "fi" {}) {}; + }; + fr = { + qt4 = callPackage (kdeLocale4 "fr" {}) {}; + qt5 = callPackage (kdeLocale5 "fr" {}) {}; + }; + ga = { + qt4 = callPackage (kdeLocale4 "ga" {}) {}; + qt5 = callPackage (kdeLocale5 "ga" {}) {}; + }; + gl = { + qt4 = callPackage (kdeLocale4 "gl" {}) {}; + qt5 = callPackage (kdeLocale5 "gl" {}) {}; + }; + he = { + qt4 = callPackage (kdeLocale4 "he" {}) {}; + qt5 = callPackage (kdeLocale5 "he" {}) {}; + }; + hi = { + qt4 = callPackage (kdeLocale4 "hi" {}) {}; + qt5 = callPackage (kdeLocale5 "hi" {}) {}; + }; + hr = { + qt4 = callPackage (kdeLocale4 "hr" {}) {}; + qt5 = callPackage (kdeLocale5 "hr" {}) {}; + }; + hu = { + qt4 = callPackage (kdeLocale4 "hu" {}) {}; + qt5 = callPackage (kdeLocale5 "hu" {}) {}; + }; + ia = { + qt4 = callPackage (kdeLocale4 "ia" {}) {}; + qt5 = callPackage (kdeLocale5 "ia" {}) {}; + }; + id = { + qt4 = callPackage (kdeLocale4 "id" {}) {}; + qt5 = callPackage (kdeLocale5 "id" {}) {}; + }; + is = { + qt4 = callPackage (kdeLocale4 "is" {}) {}; + qt5 = callPackage (kdeLocale5 "is" {}) {}; + }; + it = { + qt4 = callPackage (kdeLocale4 "it" {}) {}; + qt5 = callPackage (kdeLocale5 "it" {}) {}; + }; + ja = { + qt4 = callPackage (kdeLocale4 "ja" {}) {}; + qt5 = callPackage (kdeLocale5 "ja" {}) {}; + }; + kk = { + qt4 = callPackage (kdeLocale4 "kk" {}) {}; + qt5 = callPackage (kdeLocale5 "kk" {}) {}; + }; + km = { + qt4 = callPackage (kdeLocale4 "km" {}) {}; + qt5 = callPackage (kdeLocale5 "km" {}) {}; + }; + ko = { + qt4 = callPackage (kdeLocale4 "ko" {}) {}; + qt5 = callPackage (kdeLocale5 "ko" {}) {}; + }; + lt = { + qt4 = callPackage (kdeLocale4 "lt" {}) {}; + qt5 = callPackage (kdeLocale5 "lt" {}) {}; + }; + lv = { + qt4 = callPackage (kdeLocale4 "lv" {}) {}; + qt5 = callPackage (kdeLocale5 "lv" {}) {}; + }; + mr = { + qt4 = callPackage (kdeLocale4 "mr" {}) {}; + qt5 = callPackage (kdeLocale5 "mr" {}) {}; + }; + nb = { + qt4 = callPackage (kdeLocale4 "nb" {}) {}; + qt5 = callPackage (kdeLocale5 "nb" {}) {}; + }; + nds = { + qt4 = callPackage (kdeLocale4 "nds" {}) {}; + qt5 = callPackage (kdeLocale5 "nds" {}) {}; + }; + nl = { + qt4 = callPackage (kdeLocale4 "nl" {}) {}; + qt5 = callPackage (kdeLocale5 "nl" {}) {}; + }; + nn = { + qt4 = callPackage (kdeLocale4 "nn" {}) {}; + qt5 = callPackage (kdeLocale5 "nn" {}) {}; + }; + pa = { + qt4 = callPackage (kdeLocale4 "pa" {}) {}; + qt5 = callPackage (kdeLocale5 "pa" {}) {}; + }; + pl = { + qt4 = callPackage (kdeLocale4 "pl" {}) {}; + qt5 = callPackage (kdeLocale5 "pl" {}) {}; + }; + pt = { + qt4 = callPackage (kdeLocale4 "pt" {}) {}; + qt5 = callPackage (kdeLocale5 "pt" {}) {}; + }; + pt_BR = { + qt4 = callPackage (kdeLocale4 "pt_BR" {}) {}; + qt5 = callPackage (kdeLocale5 "pt_BR" {}) {}; + }; + ro = { + qt4 = callPackage (kdeLocale4 "ro" {}) {}; + qt5 = callPackage (kdeLocale5 "ro" {}) {}; + }; + ru = { + qt4 = callPackage (kdeLocale4 "ru" {}) {}; + qt5 = callPackage (kdeLocale5 "ru" {}) {}; + }; + sk = { + qt4 = callPackage (kdeLocale4 "sk" {}) {}; + qt5 = callPackage (kdeLocale5 "sk" {}) {}; + }; + sl = { + qt4 = callPackage (kdeLocale4 "sl" {}) {}; + qt5 = callPackage (kdeLocale5 "sl" {}) {}; + }; + sr = { + qt4 = callPackage (kdeLocale4 "sr" {}) {}; + qt5 = callPackage (kdeLocale5 "sr" { + preConfigure = '' + sed -e 's/add_subdirectory(kdesdk)//' -i 5/sr/data/CMakeLists.txt + ''; + }) {}; + }; + sv = { + qt4 = callPackage (kdeLocale4 "sv" {}) {}; + qt5 = callPackage (kdeLocale5 "sv" {}) {}; + }; + tr = { + qt4 = callPackage (kdeLocale4 "tr" {}) {}; + qt5 = callPackage (kdeLocale5 "tr" {}) {}; + }; + ug = { + qt4 = callPackage (kdeLocale4 "ug" {}) {}; + qt5 = callPackage (kdeLocale5 "ug" {}) {}; + }; + uk = { + qt4 = callPackage (kdeLocale4 "uk" {}) {}; + qt5 = callPackage (kdeLocale5 "uk" {}) {}; + }; + wa = { + qt4 = callPackage (kdeLocale4 "wa" {}) {}; + qt5 = callPackage (kdeLocale5 "wa" {}) {}; + }; + zh_CN = { + qt4 = callPackage (kdeLocale4 "zh_CN" {}) {}; + qt5 = callPackage (kdeLocale5 "zh_CN" {}) {}; + }; + zh_TW = { + qt4 = callPackage (kdeLocale4 "zh_TW" {}) {}; + qt5 = callPackage (kdeLocale5 "zh_TW" {}) {}; + }; + }; }; newScope = scope: pkgs.kf515.newScope ({ inherit kdeApp; } // scope); From 0f6ba0ee7821a39941457709cde0b85d9fa2db8e Mon Sep 17 00:00:00 2001 From: Thomas Tuegel Date: Sun, 25 Oct 2015 08:49:10 -0500 Subject: [PATCH 087/162] kdeApps: move kdeApp to separate file --- pkgs/applications/kde-apps-15.08/default.nix | 23 ++++---------------- pkgs/applications/kde-apps-15.08/kde-app.nix | 23 ++++++++++++++++++++ 2 files changed, 27 insertions(+), 19 deletions(-) create mode 100644 pkgs/applications/kde-apps-15.08/kde-app.nix diff --git a/pkgs/applications/kde-apps-15.08/default.nix b/pkgs/applications/kde-apps-15.08/default.nix index d374f2b12875..914b0c8e4aa4 100644 --- a/pkgs/applications/kde-apps-15.08/default.nix +++ b/pkgs/applications/kde-apps-15.08/default.nix @@ -21,25 +21,10 @@ let srcs = import ./srcs.nix { inherit (pkgs) fetchurl; inherit mirror; }; mirror = "mirror://kde"; - kdeApp = args: - let - inherit (args) name; - sname = args.sname or name; - inherit (srcs."${sname}") src version; - in stdenv.mkDerivation (args // { - name = "${name}-${version}"; - inherit src; - - cmakeFlags = - (args.cmakeFlags or []) - ++ [ "-DBUILD_TESTING=OFF" ] - ++ lib.optional debug "-DCMAKE_BUILD_TYPE=Debug"; - - meta = { - platforms = lib.platforms.linux; - homepage = "http://www.kde.org"; - } // (args.meta or {}); - }); + kdeApp = import ./kde-app.nix { + inherit stdenv lib; + inherit debug srcs; + }; kdeLocale4 = name: args: { kdeApp, automoc4, cmake, gettext, kdelibs, perl }: diff --git a/pkgs/applications/kde-apps-15.08/kde-app.nix b/pkgs/applications/kde-apps-15.08/kde-app.nix new file mode 100644 index 000000000000..242f3d9c793d --- /dev/null +++ b/pkgs/applications/kde-apps-15.08/kde-app.nix @@ -0,0 +1,23 @@ +{ stdenv, lib, debug, srcs }: + +args: + +let + inherit (args) name; + sname = args.sname or name; + inherit (srcs."${sname}") src version; +in +stdenv.mkDerivation (args // { + name = "${name}-${version}"; + inherit src; + + cmakeFlags = + (args.cmakeFlags or []) + ++ [ "-DBUILD_TESTING=OFF" ] + ++ lib.optional debug "-DCMAKE_BUILD_TYPE=Debug"; + + meta = { + platforms = lib.platforms.linux; + homepage = "http://www.kde.org"; + } // (args.meta or {}); +}) From 713ae1063ae2a2882e8a0c5ed25b82962c64b443 Mon Sep 17 00:00:00 2001 From: Thomas Tuegel Date: Sun, 25 Oct 2015 08:53:48 -0500 Subject: [PATCH 088/162] kdeApps_15_08.l10n: move into separate file --- pkgs/applications/kde-apps-15.08/default.nix | 260 +----------------- .../kde-apps-15.08/kde-locale-4.nix | 20 ++ .../kde-apps-15.08/kde-locale-5.nix | 17 ++ pkgs/applications/kde-apps-15.08/l10n.nix | 231 ++++++++++++++++ 4 files changed, 269 insertions(+), 259 deletions(-) create mode 100644 pkgs/applications/kde-apps-15.08/kde-locale-4.nix create mode 100644 pkgs/applications/kde-apps-15.08/kde-locale-5.nix create mode 100644 pkgs/applications/kde-apps-15.08/l10n.nix diff --git a/pkgs/applications/kde-apps-15.08/default.nix b/pkgs/applications/kde-apps-15.08/default.nix index 914b0c8e4aa4..8694ee0b264f 100644 --- a/pkgs/applications/kde-apps-15.08/default.nix +++ b/pkgs/applications/kde-apps-15.08/default.nix @@ -26,43 +26,6 @@ let inherit debug srcs; }; - kdeLocale4 = name: args: - { kdeApp, automoc4, cmake, gettext, kdelibs, perl }: - - kdeApp (args // { - sname = "kde-l10n-${name}"; - name = "kde-l10n-${name}-qt4"; - - nativeBuildInputs = - [ automoc4 cmake gettext perl ] - ++ (args.nativeBuildInputs or []); - buildInputs = - [ kdelibs ] - ++ (args.buildInputs or []); - - preConfigure = '' - sed -e 's/add_subdirectory(5)//' -i CMakeLists.txt - ${args.preConfigure or ""} - ''; - }); - - kdeLocale5 = name: args: - { kdeApp, cmake, extra-cmake-modules, gettext, kdoctools }: - - kdeApp (args // { - sname = "kde-l10n-${name}"; - name = "kde-l10n-${name}-qt5"; - - nativeBuildInputs = - [ cmake extra-cmake-modules gettext kdoctools ] - ++ (args.nativeBuildInputs or []); - - preConfigure = '' - sed -e 's/add_subdirectory(4)//' -i CMakeLists.txt - ${args.preConfigure or ""} - ''; - }); - packages = self: with self; { kdelibs = callPackage ./kdelibs { inherit (pkgs) attica phonon; }; @@ -85,228 +48,7 @@ let oxygen-icons = callPackage ./oxygen-icons.nix {}; print-manager = callPackage ./print-manager.nix {}; - l10n = lib.mapAttrs (name: attr: pkgs.recurseIntoAttrs attr) { - ar = { - qt4 = callPackage (kdeLocale4 "ar" {}) {}; - qt5 = callPackage (kdeLocale5 "ar" {}) {}; - }; - bg = { - qt4 = callPackage (kdeLocale4 "bg" {}) {}; - qt5 = callPackage (kdeLocale5 "bg" {}) {}; - }; - bs = { - qt4 = callPackage (kdeLocale4 "bs" {}) {}; - qt5 = callPackage (kdeLocale5 "bs" {}) {}; - }; - ca = { - qt4 = callPackage (kdeLocale4 "ca" {}) {}; - qt5 = callPackage (kdeLocale5 "ca" {}) {}; - }; - ca_valencia = { - qt4 = callPackage (kdeLocale4 "ca_valencia" {}) {}; - qt5 = callPackage (kdeLocale5 "ca_valencia" {}) {}; - }; - cs = { - qt4 = callPackage (kdeLocale4 "cs" {}) {}; - qt5 = callPackage (kdeLocale5 "cs" {}) {}; - }; - da = { - qt4 = callPackage (kdeLocale4 "da" {}) {}; - qt5 = callPackage (kdeLocale5 "da" {}) {}; - }; - de = { - qt4 = callPackage (kdeLocale4 "de" {}) {}; - qt5 = callPackage (kdeLocale5 "de" {}) {}; - }; - el = { - qt4 = callPackage (kdeLocale4 "el" {}) {}; - qt5 = callPackage (kdeLocale5 "el" {}) {}; - }; - en_GB = { - qt4 = callPackage (kdeLocale4 "en_GB" {}) {}; - qt5 = callPackage (kdeLocale5 "en_GB" {}) {}; - }; - eo = { - qt4 = callPackage (kdeLocale4 "eo" {}) {}; - qt5 = callPackage (kdeLocale5 "eo" {}) {}; - }; - es = { - qt4 = callPackage (kdeLocale4 "es" {}) {}; - qt5 = callPackage (kdeLocale5 "es" {}) {}; - }; - et = { - qt4 = callPackage (kdeLocale4 "et" {}) {}; - qt5 = callPackage (kdeLocale5 "et" {}) {}; - }; - eu = { - qt4 = callPackage (kdeLocale4 "eu" {}) {}; - qt5 = callPackage (kdeLocale5 "eu" {}) {}; - }; - fa = { - qt4 = callPackage (kdeLocale4 "fa" {}) {}; - qt5 = callPackage (kdeLocale5 "fa" {}) {}; - }; - fi = { - qt4 = callPackage (kdeLocale4 "fi" {}) {}; - qt5 = callPackage (kdeLocale5 "fi" {}) {}; - }; - fr = { - qt4 = callPackage (kdeLocale4 "fr" {}) {}; - qt5 = callPackage (kdeLocale5 "fr" {}) {}; - }; - ga = { - qt4 = callPackage (kdeLocale4 "ga" {}) {}; - qt5 = callPackage (kdeLocale5 "ga" {}) {}; - }; - gl = { - qt4 = callPackage (kdeLocale4 "gl" {}) {}; - qt5 = callPackage (kdeLocale5 "gl" {}) {}; - }; - he = { - qt4 = callPackage (kdeLocale4 "he" {}) {}; - qt5 = callPackage (kdeLocale5 "he" {}) {}; - }; - hi = { - qt4 = callPackage (kdeLocale4 "hi" {}) {}; - qt5 = callPackage (kdeLocale5 "hi" {}) {}; - }; - hr = { - qt4 = callPackage (kdeLocale4 "hr" {}) {}; - qt5 = callPackage (kdeLocale5 "hr" {}) {}; - }; - hu = { - qt4 = callPackage (kdeLocale4 "hu" {}) {}; - qt5 = callPackage (kdeLocale5 "hu" {}) {}; - }; - ia = { - qt4 = callPackage (kdeLocale4 "ia" {}) {}; - qt5 = callPackage (kdeLocale5 "ia" {}) {}; - }; - id = { - qt4 = callPackage (kdeLocale4 "id" {}) {}; - qt5 = callPackage (kdeLocale5 "id" {}) {}; - }; - is = { - qt4 = callPackage (kdeLocale4 "is" {}) {}; - qt5 = callPackage (kdeLocale5 "is" {}) {}; - }; - it = { - qt4 = callPackage (kdeLocale4 "it" {}) {}; - qt5 = callPackage (kdeLocale5 "it" {}) {}; - }; - ja = { - qt4 = callPackage (kdeLocale4 "ja" {}) {}; - qt5 = callPackage (kdeLocale5 "ja" {}) {}; - }; - kk = { - qt4 = callPackage (kdeLocale4 "kk" {}) {}; - qt5 = callPackage (kdeLocale5 "kk" {}) {}; - }; - km = { - qt4 = callPackage (kdeLocale4 "km" {}) {}; - qt5 = callPackage (kdeLocale5 "km" {}) {}; - }; - ko = { - qt4 = callPackage (kdeLocale4 "ko" {}) {}; - qt5 = callPackage (kdeLocale5 "ko" {}) {}; - }; - lt = { - qt4 = callPackage (kdeLocale4 "lt" {}) {}; - qt5 = callPackage (kdeLocale5 "lt" {}) {}; - }; - lv = { - qt4 = callPackage (kdeLocale4 "lv" {}) {}; - qt5 = callPackage (kdeLocale5 "lv" {}) {}; - }; - mr = { - qt4 = callPackage (kdeLocale4 "mr" {}) {}; - qt5 = callPackage (kdeLocale5 "mr" {}) {}; - }; - nb = { - qt4 = callPackage (kdeLocale4 "nb" {}) {}; - qt5 = callPackage (kdeLocale5 "nb" {}) {}; - }; - nds = { - qt4 = callPackage (kdeLocale4 "nds" {}) {}; - qt5 = callPackage (kdeLocale5 "nds" {}) {}; - }; - nl = { - qt4 = callPackage (kdeLocale4 "nl" {}) {}; - qt5 = callPackage (kdeLocale5 "nl" {}) {}; - }; - nn = { - qt4 = callPackage (kdeLocale4 "nn" {}) {}; - qt5 = callPackage (kdeLocale5 "nn" {}) {}; - }; - pa = { - qt4 = callPackage (kdeLocale4 "pa" {}) {}; - qt5 = callPackage (kdeLocale5 "pa" {}) {}; - }; - pl = { - qt4 = callPackage (kdeLocale4 "pl" {}) {}; - qt5 = callPackage (kdeLocale5 "pl" {}) {}; - }; - pt = { - qt4 = callPackage (kdeLocale4 "pt" {}) {}; - qt5 = callPackage (kdeLocale5 "pt" {}) {}; - }; - pt_BR = { - qt4 = callPackage (kdeLocale4 "pt_BR" {}) {}; - qt5 = callPackage (kdeLocale5 "pt_BR" {}) {}; - }; - ro = { - qt4 = callPackage (kdeLocale4 "ro" {}) {}; - qt5 = callPackage (kdeLocale5 "ro" {}) {}; - }; - ru = { - qt4 = callPackage (kdeLocale4 "ru" {}) {}; - qt5 = callPackage (kdeLocale5 "ru" {}) {}; - }; - sk = { - qt4 = callPackage (kdeLocale4 "sk" {}) {}; - qt5 = callPackage (kdeLocale5 "sk" {}) {}; - }; - sl = { - qt4 = callPackage (kdeLocale4 "sl" {}) {}; - qt5 = callPackage (kdeLocale5 "sl" {}) {}; - }; - sr = { - qt4 = callPackage (kdeLocale4 "sr" {}) {}; - qt5 = callPackage (kdeLocale5 "sr" { - preConfigure = '' - sed -e 's/add_subdirectory(kdesdk)//' -i 5/sr/data/CMakeLists.txt - ''; - }) {}; - }; - sv = { - qt4 = callPackage (kdeLocale4 "sv" {}) {}; - qt5 = callPackage (kdeLocale5 "sv" {}) {}; - }; - tr = { - qt4 = callPackage (kdeLocale4 "tr" {}) {}; - qt5 = callPackage (kdeLocale5 "tr" {}) {}; - }; - ug = { - qt4 = callPackage (kdeLocale4 "ug" {}) {}; - qt5 = callPackage (kdeLocale5 "ug" {}) {}; - }; - uk = { - qt4 = callPackage (kdeLocale4 "uk" {}) {}; - qt5 = callPackage (kdeLocale5 "uk" {}) {}; - }; - wa = { - qt4 = callPackage (kdeLocale4 "wa" {}) {}; - qt5 = callPackage (kdeLocale5 "wa" {}) {}; - }; - zh_CN = { - qt4 = callPackage (kdeLocale4 "zh_CN" {}) {}; - qt5 = callPackage (kdeLocale5 "zh_CN" {}) {}; - }; - zh_TW = { - qt4 = callPackage (kdeLocale4 "zh_TW" {}) {}; - qt5 = callPackage (kdeLocale5 "zh_TW" {}) {}; - }; - }; + l10n = pkgs.recurseIntoAttrs (import ./l10n.nix { inherit callPackage lib pkgs; }); }; newScope = scope: pkgs.kf515.newScope ({ inherit kdeApp; } // scope); diff --git a/pkgs/applications/kde-apps-15.08/kde-locale-4.nix b/pkgs/applications/kde-apps-15.08/kde-locale-4.nix new file mode 100644 index 000000000000..4b612ee3e3c2 --- /dev/null +++ b/pkgs/applications/kde-apps-15.08/kde-locale-4.nix @@ -0,0 +1,20 @@ +name: args: + +{ kdeApp, automoc4, cmake, gettext, kdelibs, perl }: + +kdeApp (args // { + sname = "kde-l10n-${name}"; + name = "kde-l10n-${name}-qt4"; + + nativeBuildInputs = + [ automoc4 cmake gettext perl ] + ++ (args.nativeBuildInputs or []); + buildInputs = + [ kdelibs ] + ++ (args.buildInputs or []); + + preConfigure = '' + sed -e 's/add_subdirectory(5)//' -i CMakeLists.txt + ${args.preConfigure or ""} + ''; +}) diff --git a/pkgs/applications/kde-apps-15.08/kde-locale-5.nix b/pkgs/applications/kde-apps-15.08/kde-locale-5.nix new file mode 100644 index 000000000000..522fc542aeb2 --- /dev/null +++ b/pkgs/applications/kde-apps-15.08/kde-locale-5.nix @@ -0,0 +1,17 @@ +name: args: + +{ kdeApp, cmake, extra-cmake-modules, gettext, kdoctools }: + +kdeApp (args // { + sname = "kde-l10n-${name}"; + name = "kde-l10n-${name}-qt5"; + + nativeBuildInputs = + [ cmake extra-cmake-modules gettext kdoctools ] + ++ (args.nativeBuildInputs or []); + + preConfigure = '' + sed -e 's/add_subdirectory(4)//' -i CMakeLists.txt + ${args.preConfigure or ""} + ''; +}) diff --git a/pkgs/applications/kde-apps-15.08/l10n.nix b/pkgs/applications/kde-apps-15.08/l10n.nix new file mode 100644 index 000000000000..7a9f1c36cbfd --- /dev/null +++ b/pkgs/applications/kde-apps-15.08/l10n.nix @@ -0,0 +1,231 @@ +{ callPackage, pkgs, lib }: + +let + + kdeLocale4 = import ./kde-locale-4.nix; + kdeLocale5 = import ./kde-locale-5.nix; + +in + +lib.mapAttrs (name: attr: pkgs.recurseIntoAttrs attr) { + ar = { + qt4 = callPackage (kdeLocale4 "ar" {}) {}; + qt5 = callPackage (kdeLocale5 "ar" {}) {}; + }; + bg = { + qt4 = callPackage (kdeLocale4 "bg" {}) {}; + qt5 = callPackage (kdeLocale5 "bg" {}) {}; + }; + bs = { + qt4 = callPackage (kdeLocale4 "bs" {}) {}; + qt5 = callPackage (kdeLocale5 "bs" {}) {}; + }; + ca = { + qt4 = callPackage (kdeLocale4 "ca" {}) {}; + qt5 = callPackage (kdeLocale5 "ca" {}) {}; + }; + ca_valencia = { + qt4 = callPackage (kdeLocale4 "ca_valencia" {}) {}; + qt5 = callPackage (kdeLocale5 "ca_valencia" {}) {}; + }; + cs = { + qt4 = callPackage (kdeLocale4 "cs" {}) {}; + qt5 = callPackage (kdeLocale5 "cs" {}) {}; + }; + da = { + qt4 = callPackage (kdeLocale4 "da" {}) {}; + qt5 = callPackage (kdeLocale5 "da" {}) {}; + }; + de = { + qt4 = callPackage (kdeLocale4 "de" {}) {}; + qt5 = callPackage (kdeLocale5 "de" {}) {}; + }; + el = { + qt4 = callPackage (kdeLocale4 "el" {}) {}; + qt5 = callPackage (kdeLocale5 "el" {}) {}; + }; + en_GB = { + qt4 = callPackage (kdeLocale4 "en_GB" {}) {}; + qt5 = callPackage (kdeLocale5 "en_GB" {}) {}; + }; + eo = { + qt4 = callPackage (kdeLocale4 "eo" {}) {}; + qt5 = callPackage (kdeLocale5 "eo" {}) {}; + }; + es = { + qt4 = callPackage (kdeLocale4 "es" {}) {}; + qt5 = callPackage (kdeLocale5 "es" {}) {}; + }; + et = { + qt4 = callPackage (kdeLocale4 "et" {}) {}; + qt5 = callPackage (kdeLocale5 "et" {}) {}; + }; + eu = { + qt4 = callPackage (kdeLocale4 "eu" {}) {}; + qt5 = callPackage (kdeLocale5 "eu" {}) {}; + }; + fa = { + qt4 = callPackage (kdeLocale4 "fa" {}) {}; + qt5 = callPackage (kdeLocale5 "fa" {}) {}; + }; + fi = { + qt4 = callPackage (kdeLocale4 "fi" {}) {}; + qt5 = callPackage (kdeLocale5 "fi" {}) {}; + }; + fr = { + qt4 = callPackage (kdeLocale4 "fr" {}) {}; + qt5 = callPackage (kdeLocale5 "fr" {}) {}; + }; + ga = { + qt4 = callPackage (kdeLocale4 "ga" {}) {}; + qt5 = callPackage (kdeLocale5 "ga" {}) {}; + }; + gl = { + qt4 = callPackage (kdeLocale4 "gl" {}) {}; + qt5 = callPackage (kdeLocale5 "gl" {}) {}; + }; + he = { + qt4 = callPackage (kdeLocale4 "he" {}) {}; + qt5 = callPackage (kdeLocale5 "he" {}) {}; + }; + hi = { + qt4 = callPackage (kdeLocale4 "hi" {}) {}; + qt5 = callPackage (kdeLocale5 "hi" {}) {}; + }; + hr = { + qt4 = callPackage (kdeLocale4 "hr" {}) {}; + qt5 = callPackage (kdeLocale5 "hr" {}) {}; + }; + hu = { + qt4 = callPackage (kdeLocale4 "hu" {}) {}; + qt5 = callPackage (kdeLocale5 "hu" {}) {}; + }; + ia = { + qt4 = callPackage (kdeLocale4 "ia" {}) {}; + qt5 = callPackage (kdeLocale5 "ia" {}) {}; + }; + id = { + qt4 = callPackage (kdeLocale4 "id" {}) {}; + qt5 = callPackage (kdeLocale5 "id" {}) {}; + }; + is = { + qt4 = callPackage (kdeLocale4 "is" {}) {}; + qt5 = callPackage (kdeLocale5 "is" {}) {}; + }; + it = { + qt4 = callPackage (kdeLocale4 "it" {}) {}; + qt5 = callPackage (kdeLocale5 "it" {}) {}; + }; + ja = { + qt4 = callPackage (kdeLocale4 "ja" {}) {}; + qt5 = callPackage (kdeLocale5 "ja" {}) {}; + }; + kk = { + qt4 = callPackage (kdeLocale4 "kk" {}) {}; + qt5 = callPackage (kdeLocale5 "kk" {}) {}; + }; + km = { + qt4 = callPackage (kdeLocale4 "km" {}) {}; + qt5 = callPackage (kdeLocale5 "km" {}) {}; + }; + ko = { + qt4 = callPackage (kdeLocale4 "ko" {}) {}; + qt5 = callPackage (kdeLocale5 "ko" {}) {}; + }; + lt = { + qt4 = callPackage (kdeLocale4 "lt" {}) {}; + qt5 = callPackage (kdeLocale5 "lt" {}) {}; + }; + lv = { + qt4 = callPackage (kdeLocale4 "lv" {}) {}; + qt5 = callPackage (kdeLocale5 "lv" {}) {}; + }; + mr = { + qt4 = callPackage (kdeLocale4 "mr" {}) {}; + qt5 = callPackage (kdeLocale5 "mr" {}) {}; + }; + nb = { + qt4 = callPackage (kdeLocale4 "nb" {}) {}; + qt5 = callPackage (kdeLocale5 "nb" {}) {}; + }; + nds = { + qt4 = callPackage (kdeLocale4 "nds" {}) {}; + qt5 = callPackage (kdeLocale5 "nds" {}) {}; + }; + nl = { + qt4 = callPackage (kdeLocale4 "nl" {}) {}; + qt5 = callPackage (kdeLocale5 "nl" {}) {}; + }; + nn = { + qt4 = callPackage (kdeLocale4 "nn" {}) {}; + qt5 = callPackage (kdeLocale5 "nn" {}) {}; + }; + pa = { + qt4 = callPackage (kdeLocale4 "pa" {}) {}; + qt5 = callPackage (kdeLocale5 "pa" {}) {}; + }; + pl = { + qt4 = callPackage (kdeLocale4 "pl" {}) {}; + qt5 = callPackage (kdeLocale5 "pl" {}) {}; + }; + pt = { + qt4 = callPackage (kdeLocale4 "pt" {}) {}; + qt5 = callPackage (kdeLocale5 "pt" {}) {}; + }; + pt_BR = { + qt4 = callPackage (kdeLocale4 "pt_BR" {}) {}; + qt5 = callPackage (kdeLocale5 "pt_BR" {}) {}; + }; + ro = { + qt4 = callPackage (kdeLocale4 "ro" {}) {}; + qt5 = callPackage (kdeLocale5 "ro" {}) {}; + }; + ru = { + qt4 = callPackage (kdeLocale4 "ru" {}) {}; + qt5 = callPackage (kdeLocale5 "ru" {}) {}; + }; + sk = { + qt4 = callPackage (kdeLocale4 "sk" {}) {}; + qt5 = callPackage (kdeLocale5 "sk" {}) {}; + }; + sl = { + qt4 = callPackage (kdeLocale4 "sl" {}) {}; + qt5 = callPackage (kdeLocale5 "sl" {}) {}; + }; + sr = { + qt4 = callPackage (kdeLocale4 "sr" {}) {}; + qt5 = callPackage (kdeLocale5 "sr" { + preConfigure = '' + sed -e 's/add_subdirectory(kdesdk)//' -i 5/sr/data/CMakeLists.txt + ''; + }) {}; + }; + sv = { + qt4 = callPackage (kdeLocale4 "sv" {}) {}; + qt5 = callPackage (kdeLocale5 "sv" {}) {}; + }; + tr = { + qt4 = callPackage (kdeLocale4 "tr" {}) {}; + qt5 = callPackage (kdeLocale5 "tr" {}) {}; + }; + ug = { + qt4 = callPackage (kdeLocale4 "ug" {}) {}; + qt5 = callPackage (kdeLocale5 "ug" {}) {}; + }; + uk = { + qt4 = callPackage (kdeLocale4 "uk" {}) {}; + qt5 = callPackage (kdeLocale5 "uk" {}) {}; + }; + wa = { + qt4 = callPackage (kdeLocale4 "wa" {}) {}; + qt5 = callPackage (kdeLocale5 "wa" {}) {}; + }; + zh_CN = { + qt4 = callPackage (kdeLocale4 "zh_CN" {}) {}; + qt5 = callPackage (kdeLocale5 "zh_CN" {}) {}; + }; + zh_TW = { + qt4 = callPackage (kdeLocale4 "zh_TW" {}) {}; + qt5 = callPackage (kdeLocale5 "zh_TW" {}) {}; + }; +} From 892b7c451f7d75acaf956646520468c261fedb7e Mon Sep 17 00:00:00 2001 From: Thomas Tuegel Date: Sun, 25 Oct 2015 09:16:25 -0500 Subject: [PATCH 089/162] plasma-nm: path to mobile-broadband-provider-info Fixes #9389. --- pkgs/desktops/plasma-5.4/default.nix | 2 +- ...-mobile-broadband-provider-info-path.patch | 25 +++++++++++++++++++ .../{plasma-nm.nix => plasma-nm/default.nix} | 10 ++++++-- 3 files changed, 34 insertions(+), 3 deletions(-) create mode 100644 pkgs/desktops/plasma-5.4/plasma-nm/0001-mobile-broadband-provider-info-path.patch rename pkgs/desktops/plasma-5.4/{plasma-nm.nix => plasma-nm/default.nix} (75%) diff --git a/pkgs/desktops/plasma-5.4/default.nix b/pkgs/desktops/plasma-5.4/default.nix index 61a06421c3dd..59b09a2dfbe2 100644 --- a/pkgs/desktops/plasma-5.4/default.nix +++ b/pkgs/desktops/plasma-5.4/default.nix @@ -72,7 +72,7 @@ let oxygen-fonts = callPackage ./oxygen-fonts.nix {}; plasma-desktop = callPackage ./plasma-desktop {}; plasma-mediacenter = callPackage ./plasma-mediacenter.nix {}; - plasma-nm = callPackage ./plasma-nm.nix {}; + plasma-nm = callPackage ./plasma-nm {}; plasma-pa = callPackage ./plasma-pa.nix {}; plasma-workspace = callPackage ./plasma-workspace {}; plasma-workspace-wallpapers = callPackage ./plasma-workspace-wallpapers.nix {}; diff --git a/pkgs/desktops/plasma-5.4/plasma-nm/0001-mobile-broadband-provider-info-path.patch b/pkgs/desktops/plasma-5.4/plasma-nm/0001-mobile-broadband-provider-info-path.patch new file mode 100644 index 000000000000..79b5cfb437e2 --- /dev/null +++ b/pkgs/desktops/plasma-5.4/plasma-nm/0001-mobile-broadband-provider-info-path.patch @@ -0,0 +1,25 @@ +From faf13c97ff1192a201843b9d52f4002dbd9022af Mon Sep 17 00:00:00 2001 +From: Thomas Tuegel +Date: Sun, 25 Oct 2015 09:09:27 -0500 +Subject: [PATCH] mobile-broadband-provider-info path + +--- + libs/editor/mobileproviders.cpp | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/libs/editor/mobileproviders.cpp b/libs/editor/mobileproviders.cpp +index 568cb34..98a5992 100644 +--- a/libs/editor/mobileproviders.cpp ++++ b/libs/editor/mobileproviders.cpp +@@ -26,7 +26,7 @@ + + #include + +-const QString MobileProviders::ProvidersFile = "/usr/share/mobile-broadband-provider-info/serviceproviders.xml"; ++const QString MobileProviders::ProvidersFile = "@mobile_broadband_provider_info@/share/mobile-broadband-provider-info/serviceproviders.xml"; + + bool localeAwareCompare(const QString & one, const QString & two) { + return one.localeAwareCompare(two) < 0; +-- +2.6.2 + diff --git a/pkgs/desktops/plasma-5.4/plasma-nm.nix b/pkgs/desktops/plasma-5.4/plasma-nm/default.nix similarity index 75% rename from pkgs/desktops/plasma-5.4/plasma-nm.nix rename to pkgs/desktops/plasma-5.4/plasma-nm/default.nix index 92b04e2af1fd..7e229d580524 100644 --- a/pkgs/desktops/plasma-5.4/plasma-nm.nix +++ b/pkgs/desktops/plasma-5.4/plasma-nm/default.nix @@ -1,5 +1,5 @@ -{ plasmaPackage, extra-cmake-modules, kdoctools, kcompletion -, kconfigwidgets, kcoreaddons, kdbusaddons, kdeclarative +{ plasmaPackage, substituteAll, extra-cmake-modules, kdoctools +, kcompletion, kconfigwidgets, kcoreaddons, kdbusaddons, kdeclarative , kdelibs4support, ki18n, kiconthemes, kinit, kio, kitemviews , knotifications, kservice, kwallet, kwidgetsaddons, kwindowsystem , kxmlgui, makeQtWrapper, mobile_broadband_provider_info @@ -9,6 +9,12 @@ plasmaPackage { name = "plasma-nm"; + patches = [ + (substituteAll { + src = ./0001-mobile-broadband-provider-info-path.patch; + inherit mobile_broadband_provider_info; + }) + ]; nativeBuildInputs = [ extra-cmake-modules kdoctools From 0992bb64b9108b7216504f0a6bd55aa22d4f3cf6 Mon Sep 17 00:00:00 2001 From: Thomas Tuegel Date: Sun, 25 Oct 2015 09:16:52 -0500 Subject: [PATCH 090/162] kgpg: wrap with path to gpg Fixes #5697. --- pkgs/applications/kde-apps-15.08/kgpg.nix | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/pkgs/applications/kde-apps-15.08/kgpg.nix b/pkgs/applications/kde-apps-15.08/kgpg.nix index cf3fe20d5d7e..3ee925197189 100644 --- a/pkgs/applications/kde-apps-15.08/kgpg.nix +++ b/pkgs/applications/kde-apps-15.08/kgpg.nix @@ -2,12 +2,14 @@ , lib , automoc4 , cmake +, makeWrapper , perl , pkgconfig , boost , gpgme , kdelibs , kdepimlibs +, gnupg }: kdeApp { @@ -15,6 +17,7 @@ kdeApp { nativeBuildInputs = [ automoc4 cmake + makeWrapper perl pkgconfig ]; @@ -24,6 +27,10 @@ kdeApp { kdelibs kdepimlibs ]; + postInstall = '' + wrapProgram "$out/bin/kgpg" \ + --prefix PATH : "${gnupg}/bin" + ''; meta = { license = [ lib.licenses.gpl2 ]; maintainers = [ lib.maintainers.ttuegel ]; From f817b8ab94f3074d383ac1edae1e2c929f48c9b5 Mon Sep 17 00:00:00 2001 From: Thomas Tuegel Date: Tue, 27 Oct 2015 11:46:44 -0500 Subject: [PATCH 091/162] ark: wrap with paths to wrapper programs --- pkgs/applications/kde-apps-15.08/ark.nix | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/pkgs/applications/kde-apps-15.08/ark.nix b/pkgs/applications/kde-apps-15.08/ark.nix index ce984f951f14..36a1ca7cfbd7 100644 --- a/pkgs/applications/kde-apps-15.08/ark.nix +++ b/pkgs/applications/kde-apps-15.08/ark.nix @@ -14,8 +14,17 @@ , kpty , kwidgetsaddons , libarchive +, p7zip +, unrar +, unzipNLS +, zip }: +let PATH = lib.makeSearchPath "bin" [ + p7zip unrar unzipNLS zip + ]; +in + kdeApp { name = "ark"; nativeBuildInputs = [ @@ -38,6 +47,10 @@ kdeApp { ki18n kio ]; + postInstall = '' + wrapQtProgram "$out/bin/ark" \ + --prefix PATH : "${PATH}" + ''; meta = { license = with lib.licenses; [ gpl2 lgpl3 ]; maintainers = [ lib.maintainers.ttuegel ]; From b4b2e7c23de3d3c1085c167144f32f4a314fcb80 Mon Sep 17 00:00:00 2001 From: Thomas Tuegel Date: Tue, 27 Oct 2015 11:57:58 -0500 Subject: [PATCH 092/162] nixos/kde5: install dolphin-plugins --- nixos/modules/services/x11/desktop-managers/kde5.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/nixos/modules/services/x11/desktop-managers/kde5.nix b/nixos/modules/services/x11/desktop-managers/kde5.nix index 00859885e087..3b428cc612c1 100644 --- a/nixos/modules/services/x11/desktop-managers/kde5.nix +++ b/nixos/modules/services/x11/desktop-managers/kde5.nix @@ -98,6 +98,7 @@ in plasma5.plasma-workspace-wallpapers kdeApps.dolphin + kdeApps.dolphin-plugins kdeApps.konsole kdeApps.oxygen-icons From fc4468e40aba76de086672fe3c0f2f116162ffb8 Mon Sep 17 00:00:00 2001 From: Thomas Tuegel Date: Tue, 27 Oct 2015 12:10:37 -0500 Subject: [PATCH 093/162] dolphin: wrap with Qt paths --- pkgs/applications/kde-apps-15.08/dolphin.nix | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/pkgs/applications/kde-apps-15.08/dolphin.nix b/pkgs/applications/kde-apps-15.08/dolphin.nix index 102108a057cd..3218146f510e 100644 --- a/pkgs/applications/kde-apps-15.08/dolphin.nix +++ b/pkgs/applications/kde-apps-15.08/dolphin.nix @@ -2,6 +2,7 @@ , lib , extra-cmake-modules , kdoctools +, makeQtWrapper , kinit , kcmutils , kcoreaddons @@ -31,6 +32,7 @@ kdeApp { nativeBuildInputs = [ extra-cmake-modules kdoctools + makeQtWrapper ]; buildInputs = [ kinit @@ -58,6 +60,9 @@ kdeApp { ktexteditor kwindowsystem ]; + postInstall = '' + wrapQtProgram "$out/bin/dolphin" + ''; meta = { license = with lib.licenses; [ gpl2 fdl12 ]; maintainers = [ lib.maintainers.ttuegel ]; From 8660b7f737bac693840c82357dd06fe029b1e841 Mon Sep 17 00:00:00 2001 From: Thomas Tuegel Date: Tue, 27 Oct 2015 13:00:14 -0500 Subject: [PATCH 094/162] gwenview: wrap with Qt paths --- pkgs/applications/kde-apps-15.08/gwenview.nix | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/pkgs/applications/kde-apps-15.08/gwenview.nix b/pkgs/applications/kde-apps-15.08/gwenview.nix index 4e867f4dbb10..732ac11e96d0 100644 --- a/pkgs/applications/kde-apps-15.08/gwenview.nix +++ b/pkgs/applications/kde-apps-15.08/gwenview.nix @@ -2,6 +2,7 @@ , lib , extra-cmake-modules , kdoctools +, makeQtWrapper , baloo , exiv2 , kactivities @@ -18,6 +19,7 @@ kdeApp { nativeBuildInputs = [ extra-cmake-modules kdoctools + makeQtWrapper ]; buildInputs = [ exiv2 @@ -32,6 +34,9 @@ kdeApp { kio qtx11extras ]; + postInstall = '' + wrapQtProgram "$out/bin/gwenview" + ''; meta = { license = with lib.licenses; [ gpl2 fdl12 ]; maintainers = [ lib.maintainers.ttuegel ]; From be954670f25267145322f9301d574f7a58343607 Mon Sep 17 00:00:00 2001 From: Thomas Tuegel Date: Tue, 27 Oct 2015 13:08:00 -0500 Subject: [PATCH 095/162] kate: wrap with Qt paths --- pkgs/applications/kde-apps-15.08/kate.nix | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/pkgs/applications/kde-apps-15.08/kate.nix b/pkgs/applications/kde-apps-15.08/kate.nix index b66d015a3bcb..91eeb2314a4c 100644 --- a/pkgs/applications/kde-apps-15.08/kate.nix +++ b/pkgs/applications/kde-apps-15.08/kate.nix @@ -58,6 +58,10 @@ kdeApp { kwindowsystem plasma-framework ]; + postInstall = '' + wrapQtProgram "$out/bin/kate" + wrapQtProgram "$out/bin/kwrite" + ''; meta = { license = with lib.licenses; [ gpl3 lgpl3 lgpl2 ]; maintainers = [ lib.maintainers.ttuegel ]; From 19ebf93df322a9be23eaedcee55895358fc71ba4 Mon Sep 17 00:00:00 2001 From: Thomas Tuegel Date: Tue, 27 Oct 2015 13:12:27 -0500 Subject: [PATCH 096/162] konsole: wrap with Qt path --- pkgs/applications/kde-apps-15.08/konsole.nix | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/pkgs/applications/kde-apps-15.08/konsole.nix b/pkgs/applications/kde-apps-15.08/konsole.nix index ce98c17443fc..4b4cba2a3779 100644 --- a/pkgs/applications/kde-apps-15.08/konsole.nix +++ b/pkgs/applications/kde-apps-15.08/konsole.nix @@ -2,6 +2,7 @@ , lib , extra-cmake-modules , kdoctools +, makeQtWrapper , qtscript , kbookmarks , kcompletion @@ -30,6 +31,7 @@ kdeApp { nativeBuildInputs = [ extra-cmake-modules kdoctools + makeQtWrapper ]; buildInputs = [ qtscript @@ -56,6 +58,9 @@ kdeApp { ki18n kwindowsystem ]; + postInstall = '' + wrapQtProgram "$out/bin/konsole" + ''; meta = { license = with lib.licenses; [ gpl2 lgpl21 fdl12 ]; maintainers = [ lib.maintainers.ttuegel ]; From 4c4a53e5164f9b23095d67dcb53434a7a3fc34f5 Mon Sep 17 00:00:00 2001 From: Thomas Tuegel Date: Tue, 27 Oct 2015 18:10:16 -0500 Subject: [PATCH 097/162] kiconthemes: default theme is breeze --- .../libraries/kde-frameworks-5.15/default.nix | 2 +- .../kiconthemes/0001-default-icon-theme.patch | 25 +++++++++++++++++++ .../default.nix} | 1 + 3 files changed, 27 insertions(+), 1 deletion(-) create mode 100644 pkgs/development/libraries/kde-frameworks-5.15/kiconthemes/0001-default-icon-theme.patch rename pkgs/development/libraries/kde-frameworks-5.15/{kiconthemes.nix => kiconthemes/default.nix} (87%) diff --git a/pkgs/development/libraries/kde-frameworks-5.15/default.nix b/pkgs/development/libraries/kde-frameworks-5.15/default.nix index 6b6b95ab3c70..52b76d3dfc43 100644 --- a/pkgs/development/libraries/kde-frameworks-5.15/default.nix +++ b/pkgs/development/libraries/kde-frameworks-5.15/default.nix @@ -69,7 +69,7 @@ let kguiaddons = callPackage ./kguiaddons.nix {}; khtml = callPackage ./khtml.nix {}; ki18n = callPackage ./ki18n.nix {}; - kiconthemes = callPackage ./kiconthemes.nix {}; + kiconthemes = callPackage ./kiconthemes {}; kidletime = callPackage ./kidletime.nix {}; kimageformats = callPackage ./kimageformats.nix {}; kinit = callPackage ./kinit {}; diff --git a/pkgs/development/libraries/kde-frameworks-5.15/kiconthemes/0001-default-icon-theme.patch b/pkgs/development/libraries/kde-frameworks-5.15/kiconthemes/0001-default-icon-theme.patch new file mode 100644 index 000000000000..0470b32da738 --- /dev/null +++ b/pkgs/development/libraries/kde-frameworks-5.15/kiconthemes/0001-default-icon-theme.patch @@ -0,0 +1,25 @@ +From 61dd07a27b229d33ceb386e9f909773d5885999c Mon Sep 17 00:00:00 2001 +From: Thomas Tuegel +Date: Tue, 27 Oct 2015 17:14:36 -0500 +Subject: [PATCH] default icon theme + +--- + src/kicontheme.cpp | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/src/kicontheme.cpp b/src/kicontheme.cpp +index d0ab4b9..dce7773 100644 +--- a/src/kicontheme.cpp ++++ b/src/kicontheme.cpp +@@ -542,7 +542,7 @@ void KIconTheme::reconfigure() + // static + QString KIconTheme::defaultThemeName() + { +- return QLatin1String("oxygen"); ++ return QLatin1String("breeze"); + } + + void KIconTheme::assignIconsToContextMenu(ContextMenus type, +-- +2.6.2 + diff --git a/pkgs/development/libraries/kde-frameworks-5.15/kiconthemes.nix b/pkgs/development/libraries/kde-frameworks-5.15/kiconthemes/default.nix similarity index 87% rename from pkgs/development/libraries/kde-frameworks-5.15/kiconthemes.nix rename to pkgs/development/libraries/kde-frameworks-5.15/kiconthemes/default.nix index 02b516afedc6..71114f68fb43 100644 --- a/pkgs/development/libraries/kde-frameworks-5.15/kiconthemes.nix +++ b/pkgs/development/libraries/kde-frameworks-5.15/kiconthemes/default.nix @@ -4,6 +4,7 @@ kdeFramework { name = "kiconthemes"; + patches = [ ./0001-default-icon-theme.patch ]; nativeBuildInputs = [ extra-cmake-modules ]; buildInputs = [ kconfigwidgets kitemviews qtsvg ]; propagatedBuildInputs = [ ki18n ]; From 0054a127726b54349ef6882abf286d73eec6e78f Mon Sep 17 00:00:00 2001 From: Thomas Tuegel Date: Tue, 27 Oct 2015 18:12:17 -0500 Subject: [PATCH 098/162] kde-gtk-config: follow symlinks --- pkgs/desktops/plasma-5.4/default.nix | 2 +- .../kde-gtk-config/0001-follow-symlinks.patch | 39 +++++++++++++++++++ .../default.nix} | 1 + 3 files changed, 41 insertions(+), 1 deletion(-) create mode 100644 pkgs/desktops/plasma-5.4/kde-gtk-config/0001-follow-symlinks.patch rename pkgs/desktops/plasma-5.4/{kde-gtk-config.nix => kde-gtk-config/default.nix} (91%) diff --git a/pkgs/desktops/plasma-5.4/default.nix b/pkgs/desktops/plasma-5.4/default.nix index 59b09a2dfbe2..570134d824f3 100644 --- a/pkgs/desktops/plasma-5.4/default.nix +++ b/pkgs/desktops/plasma-5.4/default.nix @@ -51,7 +51,7 @@ let let version = (builtins.parseDrvName breeze-qt5.name).version; in symlinkJoin "breeze-${version}" [ breeze-qt4 breeze-qt5 ]; kde-cli-tools = callPackage ./kde-cli-tools.nix {}; - kde-gtk-config = callPackage ./kde-gtk-config.nix {}; + kde-gtk-config = callPackage ./kde-gtk-config {}; kdecoration = callPackage ./kdecoration.nix {}; kdeplasma-addons = callPackage ./kdeplasma-addons.nix {}; kgamma5 = callPackage ./kgamma5.nix {}; diff --git a/pkgs/desktops/plasma-5.4/kde-gtk-config/0001-follow-symlinks.patch b/pkgs/desktops/plasma-5.4/kde-gtk-config/0001-follow-symlinks.patch new file mode 100644 index 000000000000..759eda4cc134 --- /dev/null +++ b/pkgs/desktops/plasma-5.4/kde-gtk-config/0001-follow-symlinks.patch @@ -0,0 +1,39 @@ +From 33b25c2e3c7a002c7f726cd79fc4bab22b1299be Mon Sep 17 00:00:00 2001 +From: Thomas Tuegel +Date: Tue, 27 Oct 2015 18:07:54 -0500 +Subject: [PATCH] follow symlinks + +--- + src/appearancegtk2.cpp | 2 +- + src/iconthemesmodel.cpp | 2 +- + 2 files changed, 2 insertions(+), 2 deletions(-) + +diff --git a/src/appearancegtk2.cpp b/src/appearancegtk2.cpp +index b1e0b52..095cddc 100644 +--- a/src/appearancegtk2.cpp ++++ b/src/appearancegtk2.cpp +@@ -73,7 +73,7 @@ QString AppearanceGTK2::themesGtkrcFile(const QString& themeName) const + QStringList themes=installedThemes(); + themes=themes.filter(QRegExp("/"+themeName+"/?$")); + if(themes.size()==1) { +- QDirIterator it(themes.first(), QDirIterator::Subdirectories); ++ QDirIterator it(themes.first(), QDirIterator::Subdirectories | QDirIterator::FollowSymlinks); + while(it.hasNext()) { + it.next(); + if(it.fileName()=="gtkrc") { +diff --git a/src/iconthemesmodel.cpp b/src/iconthemesmodel.cpp +index 07c7ad7..b04d978 100644 +--- a/src/iconthemesmodel.cpp ++++ b/src/iconthemesmodel.cpp +@@ -46,7 +46,7 @@ QList IconThemesModel::installedThemesPaths() + + foreach(const QString& dir, dirs) { + QDir userIconsDir(dir); +- QDirIterator it(userIconsDir.path(), QDir::NoDotAndDotDot|QDir::AllDirs|QDir::NoSymLinks); ++ QDirIterator it(userIconsDir.path(), QDir::NoDotAndDotDot|QDir::AllDirs); + while(it.hasNext()) { + QString currentPath = it.next(); + QDir dir(currentPath); +-- +2.6.2 + diff --git a/pkgs/desktops/plasma-5.4/kde-gtk-config.nix b/pkgs/desktops/plasma-5.4/kde-gtk-config/default.nix similarity index 91% rename from pkgs/desktops/plasma-5.4/kde-gtk-config.nix rename to pkgs/desktops/plasma-5.4/kde-gtk-config/default.nix index fb5059b7eb83..6b41599994d5 100644 --- a/pkgs/desktops/plasma-5.4/kde-gtk-config.nix +++ b/pkgs/desktops/plasma-5.4/kde-gtk-config/default.nix @@ -14,6 +14,7 @@ plasmaPackage { name = "kde-gtk-config"; + patches = [ ./0001-follow-symlinks.patch ]; nativeBuildInputs = [ extra-cmake-modules ]; buildInputs = [ glib gtk2 gtk3 karchive kcmutils kconfigwidgets kiconthemes From beaca8e3b7846d0f278101f05603847c12ca926d Mon Sep 17 00:00:00 2001 From: Thomas Tuegel Date: Tue, 27 Oct 2015 19:39:58 -0500 Subject: [PATCH 099/162] plasma-workspace: kapplymousetheme moved to plasma-desktop --- .../0001-startkde-NixOS-patches.patch | 17 +++++++---------- .../0002-qt-5.5-QML-import-paths.patch | 4 ++-- 2 files changed, 9 insertions(+), 12 deletions(-) diff --git a/pkgs/desktops/plasma-5.4/plasma-workspace/0001-startkde-NixOS-patches.patch b/pkgs/desktops/plasma-5.4/plasma-workspace/0001-startkde-NixOS-patches.patch index 9f2de9c7f9a0..f66cb6189270 100644 --- a/pkgs/desktops/plasma-5.4/plasma-workspace/0001-startkde-NixOS-patches.patch +++ b/pkgs/desktops/plasma-5.4/plasma-workspace/0001-startkde-NixOS-patches.patch @@ -1,14 +1,14 @@ -From 3d837f48853987d5adaf69a9498c4cf116368a18 Mon Sep 17 00:00:00 2001 +From 35efc2ce92ed698abb21a79aa6e6670e844ea776 Mon Sep 17 00:00:00 2001 From: Thomas Tuegel Date: Thu, 27 Aug 2015 20:36:39 -0500 Subject: [PATCH 1/2] startkde NixOS patches --- - startkde/startkde.cmake | 219 ++++++++++++++++++++---------------------------- - 1 file changed, 89 insertions(+), 130 deletions(-) + startkde/startkde.cmake | 217 ++++++++++++++++++++---------------------------- + 1 file changed, 88 insertions(+), 129 deletions(-) diff --git a/startkde/startkde.cmake b/startkde/startkde.cmake -index 2c4c315..d418253 100644 +index 2c4c315..7733721 100644 --- a/startkde/startkde.cmake +++ b/startkde/startkde.cmake @@ -1,8 +1,31 @@ @@ -94,7 +94,7 @@ index 2c4c315..d418253 100644 #This is basically setting defaults so we can use them with kstartupconfig5 cat >$configDir/startupconfigkeys <&2 -- -2.5.2 +2.6.2 diff --git a/pkgs/desktops/plasma-5.4/plasma-workspace/0002-qt-5.5-QML-import-paths.patch b/pkgs/desktops/plasma-5.4/plasma-workspace/0002-qt-5.5-QML-import-paths.patch index 8eec571654ed..7614a2add9d7 100644 --- a/pkgs/desktops/plasma-5.4/plasma-workspace/0002-qt-5.5-QML-import-paths.patch +++ b/pkgs/desktops/plasma-5.4/plasma-workspace/0002-qt-5.5-QML-import-paths.patch @@ -1,4 +1,4 @@ -From 709fe8bff26c9680de13be5e8e5bc587c25a9b2e Mon Sep 17 00:00:00 2001 +From 033d3560d26ceabbd6da6310d326fec7a473df82 Mon Sep 17 00:00:00 2001 From: Thomas Tuegel Date: Mon, 19 Oct 2015 18:55:36 -0500 Subject: [PATCH 2/2] qt-5.5 QML import paths @@ -119,5 +119,5 @@ index 2e26455..864c9c5 100644 Item { id: root -- -2.5.2 +2.6.2 From 24babaad9ab3e157d1bbb97531536ab6741511de Mon Sep 17 00:00:00 2001 From: Thomas Tuegel Date: Tue, 27 Oct 2015 19:40:28 -0500 Subject: [PATCH 100/162] makeQtWrapper: wrap XDG directories --- pkgs/development/libraries/qt-5/5.5/make-qt-wrapper.sh | 7 +++++++ pkgs/development/libraries/qt-5/5.5/qtbase/setup-hook.sh | 2 +- 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/pkgs/development/libraries/qt-5/5.5/make-qt-wrapper.sh b/pkgs/development/libraries/qt-5/5.5/make-qt-wrapper.sh index 4eda9f82faa2..d61665455bf4 100644 --- a/pkgs/development/libraries/qt-5/5.5/make-qt-wrapper.sh +++ b/pkgs/development/libraries/qt-5/5.5/make-qt-wrapper.sh @@ -2,6 +2,8 @@ addQtDependency() { addToSearchPath QT_PLUGIN_PATH "$1/lib/qt5/plugins" addToSearchPath QML_IMPORT_PATH "$1/lib/qt5/imports" addToSearchPath QML2_IMPORT_PATH "$1/lib/qt5/qml" + addToSearchPath XDG_CONFIG_DIRS "$1/etc/xdg" + addToSearchPath XDG_DATA_DIRS "$1/share" } wrapQtProgram() { @@ -11,6 +13,8 @@ wrapQtProgram() { --prefix QT_PLUGIN_PATH : "$QT_PLUGIN_PATH" \ --prefix QML_IMPORT_PATH : "$QML_IMPORT_PATH" \ --prefix QML2_IMPORT_PATH : "$QML2_IMPORT_PATH" \ + --prefix XDG_CONFIG_DIRS : "$XDG_CONFIG_DIRS" \ + --prefix XDG_DATA_DIRS : "$XDG_DATA_DIRS" \ "$@" } @@ -23,6 +27,8 @@ makeQtWrapper() { --prefix QT_PLUGIN_PATH : "$QT_PLUGIN_PATH" \ --prefix QML_IMPORT_PATH : "$QML_IMPORT_PATH" \ --prefix QML2_IMPORT_PATH : "$QML2_IMPORT_PATH" \ + --prefix XDG_CONFIG_DIRS : "$XDG_CONFIG_DIRS" \ + --prefix XDG_DATA_DIRS : "$XDG_DATA_DIRS" \ "$@" } @@ -30,6 +36,7 @@ makeQtWrapper() { export QT_PLUGIN_PATH="$QT_PLUGIN_PATH${QT_PLUGIN_PATH:+:}$out/lib/qt5/plugins" export QML_IMPORT_PATH="$QML_IMPORT_PATH${QML_IMPORT_PATH:+:}$out/lib/qt5/imports" export QML2_IMPORT_PATH="$QML2_IMPORT_PATH${QML2_IMPORT_PATH:+:}$out/lib/qt5/qml" +export XDG_CONFIG_DIRS="$XDG_CONFIG_DIRS${XDG_CONFIG_DIRS:+:}$out/etc/xdg" export XDG_DATA_DIRS="$XDG_DATA_DIRS${XDG_DATA_DIRS:+:}$out/share" envHooks+=(addQtDependency) diff --git a/pkgs/development/libraries/qt-5/5.5/qtbase/setup-hook.sh b/pkgs/development/libraries/qt-5/5.5/qtbase/setup-hook.sh index d5e9eff60eff..b86b6df28ac8 100644 --- a/pkgs/development/libraries/qt-5/5.5/qtbase/setup-hook.sh +++ b/pkgs/development/libraries/qt-5/5.5/qtbase/setup-hook.sh @@ -22,7 +22,7 @@ addQtModule() { propagateRuntimeDeps() { local propagated - for dir in "lib/qt5/plugins" "lib/qt5/qml" "lib/qt5/imports"; do + for dir in "etc/xdg" "lib/qt5/plugins" "lib/qt5/qml" "lib/qt5/imports" "share"; do if [[ -d "$1/$dir" ]]; then propagated= for pkg in $propagatedBuildInputs; do From 5e65741e41e948ca9ddd5177f6e17000e2698431 Mon Sep 17 00:00:00 2001 From: Thomas Tuegel Date: Tue, 27 Oct 2015 19:42:53 -0500 Subject: [PATCH 101/162] nixos/kde5: install a more complete desktop --- nixos/modules/services/x11/desktop-managers/kde5.nix | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/nixos/modules/services/x11/desktop-managers/kde5.nix b/nixos/modules/services/x11/desktop-managers/kde5.nix index 3b428cc612c1..7d740bca1e4a 100644 --- a/nixos/modules/services/x11/desktop-managers/kde5.nix +++ b/nixos/modules/services/x11/desktop-managers/kde5.nix @@ -97,11 +97,17 @@ in plasma5.plasma-workspace plasma5.plasma-workspace-wallpapers + kdeApps.ark kdeApps.dolphin kdeApps.dolphin-plugins + kdeApps.ffmpegthumbs + kdeApps.gwenview + kdeApps.kate + kdeApps.kdegraphics-thumbnailers kdeApps.konsole + kdeApps.okular + kdeApps.print-manager - kdeApps.oxygen-icons pkgs.hicolor_icon_theme plasma5.kde-gtk-config From afc364f1949fe1ffa53ccf76fb34796e22cdda0b Mon Sep 17 00:00:00 2001 From: Thomas Tuegel Date: Thu, 29 Oct 2015 15:51:48 -0500 Subject: [PATCH 102/162] Revert "kiconthemes: default theme is breeze" This reverts commit 6454d8725b21fbd8c85acdda4cc1de4e8eb9c1a7. --- .../libraries/kde-frameworks-5.15/default.nix | 2 +- .../default.nix => kiconthemes.nix} | 1 - .../kiconthemes/0001-default-icon-theme.patch | 25 ------------------- 3 files changed, 1 insertion(+), 27 deletions(-) rename pkgs/development/libraries/kde-frameworks-5.15/{kiconthemes/default.nix => kiconthemes.nix} (87%) delete mode 100644 pkgs/development/libraries/kde-frameworks-5.15/kiconthemes/0001-default-icon-theme.patch diff --git a/pkgs/development/libraries/kde-frameworks-5.15/default.nix b/pkgs/development/libraries/kde-frameworks-5.15/default.nix index 52b76d3dfc43..6b6b95ab3c70 100644 --- a/pkgs/development/libraries/kde-frameworks-5.15/default.nix +++ b/pkgs/development/libraries/kde-frameworks-5.15/default.nix @@ -69,7 +69,7 @@ let kguiaddons = callPackage ./kguiaddons.nix {}; khtml = callPackage ./khtml.nix {}; ki18n = callPackage ./ki18n.nix {}; - kiconthemes = callPackage ./kiconthemes {}; + kiconthemes = callPackage ./kiconthemes.nix {}; kidletime = callPackage ./kidletime.nix {}; kimageformats = callPackage ./kimageformats.nix {}; kinit = callPackage ./kinit {}; diff --git a/pkgs/development/libraries/kde-frameworks-5.15/kiconthemes/default.nix b/pkgs/development/libraries/kde-frameworks-5.15/kiconthemes.nix similarity index 87% rename from pkgs/development/libraries/kde-frameworks-5.15/kiconthemes/default.nix rename to pkgs/development/libraries/kde-frameworks-5.15/kiconthemes.nix index 71114f68fb43..02b516afedc6 100644 --- a/pkgs/development/libraries/kde-frameworks-5.15/kiconthemes/default.nix +++ b/pkgs/development/libraries/kde-frameworks-5.15/kiconthemes.nix @@ -4,7 +4,6 @@ kdeFramework { name = "kiconthemes"; - patches = [ ./0001-default-icon-theme.patch ]; nativeBuildInputs = [ extra-cmake-modules ]; buildInputs = [ kconfigwidgets kitemviews qtsvg ]; propagatedBuildInputs = [ ki18n ]; diff --git a/pkgs/development/libraries/kde-frameworks-5.15/kiconthemes/0001-default-icon-theme.patch b/pkgs/development/libraries/kde-frameworks-5.15/kiconthemes/0001-default-icon-theme.patch deleted file mode 100644 index 0470b32da738..000000000000 --- a/pkgs/development/libraries/kde-frameworks-5.15/kiconthemes/0001-default-icon-theme.patch +++ /dev/null @@ -1,25 +0,0 @@ -From 61dd07a27b229d33ceb386e9f909773d5885999c Mon Sep 17 00:00:00 2001 -From: Thomas Tuegel -Date: Tue, 27 Oct 2015 17:14:36 -0500 -Subject: [PATCH] default icon theme - ---- - src/kicontheme.cpp | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/src/kicontheme.cpp b/src/kicontheme.cpp -index d0ab4b9..dce7773 100644 ---- a/src/kicontheme.cpp -+++ b/src/kicontheme.cpp -@@ -542,7 +542,7 @@ void KIconTheme::reconfigure() - // static - QString KIconTheme::defaultThemeName() - { -- return QLatin1String("oxygen"); -+ return QLatin1String("breeze"); - } - - void KIconTheme::assignIconsToContextMenu(ContextMenus type, --- -2.6.2 - From db408a8cebefec419a28c728bc92abf543dda502 Mon Sep 17 00:00:00 2001 From: Thomas Tuegel Date: Fri, 30 Oct 2015 15:35:21 -0500 Subject: [PATCH 103/162] plasma_stable: plasma-5.3.2 -> plasma-5.4.2 --- .../0001-qalculate-filename-string-type.patch | 28 - pkgs/applications/kde-apps-15.04/default.nix | 540 -- ...guard-0001-disable-signalplottertest.patch | 36 - .../kdelibs/polkit-install.patch | 12 - .../kde-apps-15.04/kf5-renames.json | 70 - .../applications/kde-apps-15.04/packages.json | 5693 ----------------- pkgs/applications/kde-apps-15.04/packages.sh | 22 - .../kde-apps-15.04/plasma5-renames.json | 20 - pkgs/applications/kde-apps-15.04/renames.json | 31 - .../applications/kde-apps-15.04/setup-hook.sh | 12 - pkgs/desktops/plasma-5.3/default.nix | 258 - pkgs/desktops/plasma-5.3/kf5-renames.json | 70 - .../kwin-import-plugin-follow-symlinks.patch | 13 - .../plasma-5.3/kwin/libinput-0.8.patch | 25 - .../libkscreen/libkscreen-backend-path.patch | 130 - pkgs/desktops/plasma-5.3/manifest.sh | 10 - pkgs/desktops/plasma-5.3/packages.json | 1358 ---- pkgs/desktops/plasma-5.3/packages.sh | 22 - .../plasma-desktop-hwclock.patch | 24 - .../plasma-desktop-xkb-rules.patch | 47 - .../plasma-desktop-zoneinfo.patch | 18 - .../0001-startkde-NixOS-patches.patch | 411 -- pkgs/desktops/plasma-5.3/renames.json | 20 - pkgs/desktops/plasma-5.3/setup-hook.sh | 1 - .../libraries/kde-frameworks-5.10/default.nix | 217 - .../kde-frameworks-5.10/dependencies.sh | 22 - .../0001-extra-cmake-modules-paths.patch | 74 - .../kauth/kauth-policy-install.patch | 13 - ...utils-pluginselector-follow-symlinks.patch | 13 - ...igwidgets-helpclient-follow-symlinks.patch | 13 - .../kdoctools-no-find-docbook-xml.patch | 12 - .../kinit/0001-kinit-libpath.patch | 42 - .../kpackage/0001-allow-external-paths.patch | 25 - ...service-kbuildsycoca-follow-symlinks.patch | 13 - ...ce-kbuildsycoca-no-canonicalize-path.patch | 13 - .../0001-no-qcoreapplication.patch | 48 - .../kde-frameworks-5.10/packages.json | 2090 ------ .../libraries/kde-frameworks-5.10/packages.sh | 22 - .../plasma-framework-external-paths.patch | 13 - .../kde-frameworks-5.10/renames.json | 70 - .../kde-frameworks-5.10/setup-hook.sh | 1 - pkgs/top-level/all-packages.nix | 9 +- 42 files changed, 3 insertions(+), 11578 deletions(-) delete mode 100644 pkgs/applications/kde-apps-15.04/cantor/0001-qalculate-filename-string-type.patch delete mode 100644 pkgs/applications/kde-apps-15.04/default.nix delete mode 100644 pkgs/applications/kde-apps-15.04/kde-workspace/ksysguard-0001-disable-signalplottertest.patch delete mode 100644 pkgs/applications/kde-apps-15.04/kdelibs/polkit-install.patch delete mode 100644 pkgs/applications/kde-apps-15.04/kf5-renames.json delete mode 100644 pkgs/applications/kde-apps-15.04/packages.json delete mode 100755 pkgs/applications/kde-apps-15.04/packages.sh delete mode 100644 pkgs/applications/kde-apps-15.04/plasma5-renames.json delete mode 100644 pkgs/applications/kde-apps-15.04/renames.json delete mode 100644 pkgs/applications/kde-apps-15.04/setup-hook.sh delete mode 100644 pkgs/desktops/plasma-5.3/default.nix delete mode 100644 pkgs/desktops/plasma-5.3/kf5-renames.json delete mode 100644 pkgs/desktops/plasma-5.3/kwin/kwin-import-plugin-follow-symlinks.patch delete mode 100644 pkgs/desktops/plasma-5.3/kwin/libinput-0.8.patch delete mode 100644 pkgs/desktops/plasma-5.3/libkscreen/libkscreen-backend-path.patch delete mode 100755 pkgs/desktops/plasma-5.3/manifest.sh delete mode 100644 pkgs/desktops/plasma-5.3/packages.json delete mode 100755 pkgs/desktops/plasma-5.3/packages.sh delete mode 100644 pkgs/desktops/plasma-5.3/plasma-desktop/plasma-desktop-hwclock.patch delete mode 100644 pkgs/desktops/plasma-5.3/plasma-desktop/plasma-desktop-xkb-rules.patch delete mode 100644 pkgs/desktops/plasma-5.3/plasma-desktop/plasma-desktop-zoneinfo.patch delete mode 100644 pkgs/desktops/plasma-5.3/plasma-workspace/0001-startkde-NixOS-patches.patch delete mode 100644 pkgs/desktops/plasma-5.3/renames.json delete mode 100644 pkgs/desktops/plasma-5.3/setup-hook.sh delete mode 100644 pkgs/development/libraries/kde-frameworks-5.10/default.nix delete mode 100755 pkgs/development/libraries/kde-frameworks-5.10/dependencies.sh delete mode 100644 pkgs/development/libraries/kde-frameworks-5.10/extra-cmake-modules/0001-extra-cmake-modules-paths.patch delete mode 100644 pkgs/development/libraries/kde-frameworks-5.10/kauth/kauth-policy-install.patch delete mode 100644 pkgs/development/libraries/kde-frameworks-5.10/kcmutils/kcmutils-pluginselector-follow-symlinks.patch delete mode 100644 pkgs/development/libraries/kde-frameworks-5.10/kconfigwidgets/kconfigwidgets-helpclient-follow-symlinks.patch delete mode 100644 pkgs/development/libraries/kde-frameworks-5.10/kdoctools/kdoctools-no-find-docbook-xml.patch delete mode 100644 pkgs/development/libraries/kde-frameworks-5.10/kinit/0001-kinit-libpath.patch delete mode 100644 pkgs/development/libraries/kde-frameworks-5.10/kpackage/0001-allow-external-paths.patch delete mode 100644 pkgs/development/libraries/kde-frameworks-5.10/kservice/kservice-kbuildsycoca-follow-symlinks.patch delete mode 100644 pkgs/development/libraries/kde-frameworks-5.10/kservice/kservice-kbuildsycoca-no-canonicalize-path.patch delete mode 100644 pkgs/development/libraries/kde-frameworks-5.10/ktexteditor/0001-no-qcoreapplication.patch delete mode 100644 pkgs/development/libraries/kde-frameworks-5.10/packages.json delete mode 100755 pkgs/development/libraries/kde-frameworks-5.10/packages.sh delete mode 100644 pkgs/development/libraries/kde-frameworks-5.10/plasma-framework/plasma-framework-external-paths.patch delete mode 100644 pkgs/development/libraries/kde-frameworks-5.10/renames.json delete mode 100644 pkgs/development/libraries/kde-frameworks-5.10/setup-hook.sh diff --git a/pkgs/applications/kde-apps-15.04/cantor/0001-qalculate-filename-string-type.patch b/pkgs/applications/kde-apps-15.04/cantor/0001-qalculate-filename-string-type.patch deleted file mode 100644 index b2679b95a864..000000000000 --- a/pkgs/applications/kde-apps-15.04/cantor/0001-qalculate-filename-string-type.patch +++ /dev/null @@ -1,28 +0,0 @@ -From 1a526e40ffc1d6cb050334e8641d8b90d9858a54 Mon Sep 17 00:00:00 2001 -From: Thomas Tuegel -Date: Sun, 30 Aug 2015 07:05:03 -0500 -Subject: [PATCH] qalculate filename string type - ---- - src/backends/qalculate/qalculateexpression.cpp | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -diff --git a/src/backends/qalculate/qalculateexpression.cpp b/src/backends/qalculate/qalculateexpression.cpp -index 1891baa..b2a1984 100644 ---- a/src/backends/qalculate/qalculateexpression.cpp -+++ b/src/backends/qalculate/qalculateexpression.cpp -@@ -771,9 +771,9 @@ void QalculateExpression::evaluatePlotCommand() - if (plotParameters.filetype == PLOT_FILETYPE_EPS || - plotParameters.filetype == PLOT_FILETYPE_PS || - (plotParameters.filetype == PLOT_FILETYPE_AUTO && p >= 4 && -- plotParameters.filename.substr(p-4,4) == QLatin1String(".eps")) || -+ plotParameters.filename.substr(p-4,4) == basic_string(".eps")) || - (plotParameters.filetype == PLOT_FILETYPE_AUTO && p >= 3 && -- plotParameters.filename.substr(p-3,3) == QLatin1String(".ps"))) -+ plotParameters.filename.substr(p-3,3) == basic_string(".ps"))) - setResult(new Cantor::EpsResult(KUrl(plotParameters.filename.c_str()))); - else - setResult(new Cantor::ImageResult(KUrl(plotParameters.filename.c_str()))); --- -2.5.0 - diff --git a/pkgs/applications/kde-apps-15.04/default.nix b/pkgs/applications/kde-apps-15.04/default.nix deleted file mode 100644 index b10cca0e7bcb..000000000000 --- a/pkgs/applications/kde-apps-15.04/default.nix +++ /dev/null @@ -1,540 +0,0 @@ -# Maintainer's Notes: -# -# Minor updates: -# 1. Edit ./manifest.sh to point to the updated URL. Upstream sometimes -# releases updates that include only the changed packages; in this case, -# multiple URLs can be provided and the results will be merged. -# 2. Run ./manifest.sh and ./dependencies.sh. -# 3. Build and enjoy. -# -# Major updates: -# We prefer not to immediately overwrite older versions with major updates, so -# make a copy of this directory first. After copying, be sure to delete ./tmp -# if it exists. Then follow the minor update instructions. - -{ pkgs, newScope, kf5 ? null, plasma5 ? null, qt5 ? null, debug ? false }: - -let inherit (pkgs) autonix kde4 stdenv symlinkJoin; in - -with autonix; let inherit (stdenv) lib; in - -let - kf5_ = if kf5 != null then kf5 else pkgs.kf510; - plasma5_ = if plasma5 != null then plasma5 else pkgs.plasma53; - qt5_ = if qt5 != null then qt5 else pkgs.qt54; -in - -let - - kf5 = kf5_.override { inherit debug qt5; }; - plasma5 = plasma5_.override { inherit debug kf5 qt5; }; - qt5 = qt5_; - - kdeOrL10nPackage = name: pkg: - assert (builtins.isAttrs pkg); - if lib.hasPrefix "kde-l10n" pkg.name - then l10nPackage name pkg - else kdePackage name pkg; - - kdePackage = name: pkg: - let defaultOverride = drv: drv // { - setupHook = ./setup-hook.sh; - cmakeFlags = - (drv.cmakeFlags or []) - ++ [ "-DBUILD_TESTING=OFF" ] - ++ lib.optional debug "-DCMAKE_BUILD_TYPE=Debug"; - meta = { - license = with stdenv.lib.licenses; [ - lgpl21Plus lgpl3Plus bsd2 mit gpl2Plus gpl3Plus fdl12 - ]; - platforms = stdenv.lib.platforms.linux; - maintainers = with stdenv.lib.maintainers; [ ttuegel ]; - homepage = "http://www.kde.org"; - }; - }; - callPackage = newScope { - inherit (stdenv) mkDerivation; - inherit (pkgs) fetchurl; - inherit scope; - }; - in mkPackage callPackage defaultOverride name pkg; - - l10nPackage = name: pkg: - let nameVersion = builtins.parseDrvName pkg.name; - - pkgQt4 = pkg // { - name = "${nameVersion.name}-qt4-${nameVersion.version}"; - buildInputs = [ "kdelibs" "qt4" ]; - nativeBuildInputs = [ "cmake" "gettext" "perl" ]; - propagatedBuildInputs = []; - propagatedNativeBuildInputs = []; - propagatedUserEnvPkgs = []; - }; - drvQt4 = overrideDerivation (kdePackage name pkgQt4) (drv: { - preConfigure = (drv.preConfigure or "") + '' - cd 4/ - ''; - }); - - pkgQt5 = pkg // { - name = "${nameVersion.name}-qt5-${nameVersion.version}"; - buildInputs = [ "kdoctools" "ki18n" ]; - nativeBuildInputs = [ "cmake" "extra-cmake-modules" "gettext" "perl" ]; - propagatedBuildInputs = []; - propagatedNativeBuildInputs = []; - propagatedUserEnvPkgs = []; - }; - drvQt5 = overrideDerivation (kdePackage name pkgQt5) (drv: { - preConfigure = (drv.preConfigure or "") + '' - cd 5/ - ''; - }); - in symlinkJoin pkg.name [ drvQt4 drvQt5 ]; - - super = - let json = builtins.fromJSON (builtins.readFile ./packages.json); - mirrorUrl = n: pkg: pkg // { - src = pkg.src // { url = "mirror://kde/${pkg.src.url}"; }; - }; - renames = - (builtins.fromJSON (builtins.readFile ./kf5-renames.json)) - // (builtins.fromJSON (builtins.readFile ./plasma5-renames.json)) - // (builtins.fromJSON (builtins.readFile ./renames.json)); - propagated = [ "extra-cmake-modules" ]; - native = [ - "bison" - "extra-cmake-modules" - "flex" - "kdoctools" - "ki18n" - "libxslt" - "perl" - "pythoninterp" - ]; - user = [ - "qt5" - "qt5core" - "qt5dbus" - "qt5gui" - "qt5qml" - "qt5quick" - "qt5svg" - "qt5webkitwidgets" - "qt5widgets" - "qt5x11extras" - "shareddesktopontologies" - "sharedmimeinfo" - ]; - in lib.fold (f: attrs: f attrs) json [ - (lib.mapAttrs kdeOrL10nPackage) - (userEnvDeps user) - (nativeDeps native) - (propagateDeps propagated) - (renameDeps renames) - (lib.mapAttrs mirrorUrl) - ]; - - kde4Package = pkg: overrideScope pkg (with kde4; { - inherit akonadi baloo kactivities libkdegames libkmahjongg; - kde4 = self.kdelibs; - }); - - scope = - # KDE Frameworks 5 - kf5 // - # packages in this collection - self // - { - kf5baloo = plasma5.baloo; - kf5kdcraw = self.libkdcraw; - kf5kdegames = self.libkdegames; - kf5kipi = self.libkipi; - libkonq = self.kde-baseapps; - } // - # packages requiring same Qt 5 - (with pkgs; { - accountsqt5 = accounts-qt.override { inherit qt5; }; - dbusmenuqt = libdbusmenu_qt; - grantlee5 = grantlee5.override { inherit qt5; }; - mlt = pkgs.mlt-qt5.override { inherit qt5; }; - phonon4qt5 = pkgs.phonon_qt5.override { inherit qt5; }; - qca-qt5 = qca-qt5.override { inherit qt5; }; - qt5script = qt5.script; - qt5x11extras = qt5.x11extras; - signonqt5 = signon.override { inherit qt5; }; - telepathyqt5 = telepathy_qt5.override { inherit qt5; }; - }) // - # packages from nixpkgs - (with pkgs; { - inherit acl attr automoc4 avahi bison cdparanoia cfitsio cmake cups - djvulibre docbook_xml_dtd_42 docbook_xsl enchant eigen2 - exiv2 fam ffmpeg flac flex freetype gmp gettext gpgme - grantlee gsl hunspell ilmbase intltool jasper lcms2 - libaccounts-glib libgcrypt libotr libraw libssh libspectre - libvncserver libical networkmanager openal opencv - openexr perl phonon pkgconfig polkit_qt4 prison python qca2 - qimageblitz qjson qt4 samba saneBackends soprano speechd - strigi taglib udev xorg xplanet xscreensaver xz; - alsa = alsaLib; - assuan = libassuan; - boost = boost155; - canberra = libcanberra; - eigen3 = eigen; - epub = ebook_tools; - gif = giflib; - gphoto2 = libgphoto2; - hupnp = herqq; - indi = indilib; - jpeg = libjpeg; - ldap = openldap; - libattica = attica; - musicbrainz3 = libmusicbrainz; - oggvorbis = libvorbis; - poppler = poppler_qt4; - pulseaudio = libpulseaudio; - qalculate = libqalculate; - sasl2 = cyrus_sasl; - shareddesktopontologies = shared_desktop_ontologies; - sharedmimeinfo = shared_mime_info; - sndfile = libsndfile; - tiff = libtiff; - telepathyqt4 = telepathy_qt; - tunepimp = libtunepimp; - usb = libusb; - xsltproc = libxslt; - }); - - self = - (builtins.removeAttrs super [ - "artikulate" # build failure; wrong boost? - "kde-dev-scripts" "kde-dev-utils" # docbook errors - "kdewebdev" # unknown build failure - "kde-l10n-sr" # missing CMake command - ]) // { - audiocd-kio = kde4Package super.audiocd-kio; - - amor = kde4Package super.amor; - - ark = extendDerivation (kde4Package super.ark) { - buildInputs = [ pkgs.makeWrapper ]; - # runtime dependency - postInstall = '' - wrapProgram $out/bin/ark --prefix PATH : "${pkgs.unzipNLS}/bin" - ''; - }; - - cantor = extendDerivation (kde4Package super.cantor) { - patches = [ ./cantor/0001-qalculate-filename-string-type.patch ]; - }; - - cervisia = kde4Package super.cervisia; - - dolphin-plugins = kde4Package super.dolphin-plugins; - - dragon = kde4Package super.dragon; - - ffmpegthumbs = extendDerivation (kde4Package super.ffmpegthumbs) { - nativeBuildInputs = [ scope.pkgconfig ]; - }; - - juk = kde4Package super.juk; - - jovie = kde4Package super.jovie; - - kaccessible = kde4Package super.kaccessible; - - kaccounts-providers = extendDerivation super.kaccounts-providers { - buildInputs = [ pkgs.libaccounts-glib ]; - # hard-coded install path - preConfigure = '' - substituteInPlace webkit-options/CMakeLists.txt \ - --replace "/etc/signon-ui/webkit-options.d/" \ - "$out/etc/signon-ui/webkit-options.d/" - ''; - }; - - kajongg = kde4Package super.kajongg; - - kalzium = extendDerivation (kde4Package super.kalzium) { - nativeBuildInputs = [ scope.pkgconfig ]; - }; - - kamera = kde4Package super.kamera; - - kate = extendDerivation super.kate { - buildInputs = with scope; [ - kconfig kguiaddons kiconthemes ki18n kinit kjobwidgets kio - kparts ktexteditor kwindowsystem kxmlgui - ]; - nativeBuildInputs = [ scope.kdoctools ]; - }; - - kcachegrind = kde4Package super.kcachegrind; - - kcolorchooser = kde4Package super.kcolorchooser; - - kde-base-artwork = kde4Package super.kde-base-artwork; - - kde-baseapps = kde4Package super.kde-baseapps; - - kde-runtime = extendDerivation (kde4Package super.kde-runtime) { - buildInputs = [ scope.canberra ]; - nativeBuildInputs = [ scope.pkgconfig ]; - # cmake does not detect path to `ilmbase` - NIX_CFLAGS_COMPILE = "-I${scope.ilmbase}/include/OpenEXR -I${pkgs.glib}/include/glib-2.0 -I${pkgs.glib}/lib/glib-2.0/include"; - # some components of this package have been replaced in other packages - meta = { priority = 10; }; - }; - - kde-wallpapers = kde4Package super.kde-wallpapers; - - kde-workspace = extendDerivation (kde4Package super.kde-workspace) { - patches = [ ./kde-workspace/ksysguard-0001-disable-signalplottertest.patch ]; - buildInputs = with scope.xorg; [ - libxkbfile libXcomposite xcbutilimage xcbutilkeysyms xcbutilrenderutil - ]; - nativeBuildInputs = [ scope.pkgconfig ]; - # some components of this package have been replaced in other packages - meta = { priority = 10; }; - }; - - kdeartwork = kde4Package super.kdeartwork; - - kdegraphics-mobipocket = kde4Package super.kdegraphics-mobipocket; - - kdegraphics-strigi-analyzer = kde4Package super.kdegraphics-strigi-analyzer; - - kdegraphics-thumbnailers = kde4Package super.kdegraphics-thumbnailers; - - kdelibs = extendDerivation super.kdelibs { - buildInputs = with scope; [ attr polkit_qt4 xsltproc xz ]; - propagatedBuildInputs = with scope; [ qt4 soprano phonon strigi ]; - nativeBuildInputs = [ scope.pkgconfig ]; - propagatedNativeBuildInputs = with scope; [ - automoc4 cmake perl sharedmimeinfo - ]; - - patches = [ ./kdelibs/polkit-install.patch ]; - - # cmake does not detect path to `ilmbase` - NIX_CFLAGS_COMPILE = "-I${scope.ilmbase}/include/OpenEXR"; - - cmakeFlags = [ - "-DDOCBOOKXML_CURRENTDTD_DIR=${scope.docbook_xml_dtd_42}/xml/dtd/docbook" - "-DDOCBOOKXSL_DIR=${scope.docbook_xsl}/xml/xsl/docbook" - "-DHUPNP_ENABLED=ON" - "-DWITH_SOLID_UDISKS2=ON" - "-DKDE_DEFAULT_HOME=.kde" - ]; - }; - - kdenetwork-filesharing = kde4Package super.kdenetwork-filesharing; - - kdenetwork-strigi-analyzers = kde4Package super.kdenetwork-strigi-analyzers; - - kdenlive = extendDerivation super.kdenlive { buildInputs = [ scope.mlt ]; }; - - kdepim = extendDerivation (kde4Package super.kdepim) { - buildInputs = with scope; [ gpgme assuan ]; - nativeBuildInputs = [ scope.pkgconfig ]; - }; - - kdepim-runtime = kde4Package super.kdepim-runtime; - - kdepimlibs = extendDerivation (kde4Package super.kdepimlibs) { - nativeBuildInputs = [ scope.pkgconfig ]; - }; - - kdesdk-kioslaves = kde4Package super.kdesdk-kioslaves; - - kdesdk-strigi-analyzers = kde4Package super.kdesdk-strigi-analyzers; - - kdesdk-thumbnailers = - extendDerivation (kde4Package super.kdesdk-thumbnailers) { - nativeBuildInputs = [ scope.gettext ]; - }; - - kdf = kde4Package super.kdf; - - kfloppy = kde4Package super.kfloppy; - - kgamma = kde4Package super.kgamma; - - kget = kde4Package super.kget; - - kgoldrunner = kde4Package super.kgoldrunner; - - kgpg = extendDerivation (kde4Package super.kgpg) { - buildInputs = [ scope.boost ]; - }; - - khangman = extendDerivation super.khangman { buildInputs = [ scope.kio ]; }; - - kigo = kde4Package super.kigo; - - kiriki = kde4Package super.kiriki; - - klickety = kde4Package super.klickety; - - kmag = kde4Package super.kmag; - - kmahjongg = kde4Package super.kmahjongg; - - kmix = extendDerivation super.kmix { - nativeBuildInputs = [ scope.pkgconfig ]; - cmakeFlags = [ "-DKMIX_KF5_BUILD=ON" ]; - }; - - kmousetool = extendDerivation (kde4Package super.kmousetool) { - buildInputs = with scope.xorg; [ libXtst libXt ]; - }; - - kmouth = kde4Package super.kmouth; - - knavalbattle = kde4Package super.knavalbattle; - - kolf = kde4Package super.kolf; - - kolourpaint = kde4Package super.kolourpaint; - - konquest = kde4Package super.konquest; - - kopete = kde4Package super.kopete; - - kppp = kde4Package super.kppp; - - kqtquickcharts = kde4Package super.kqtquickcharts; - - krdc = kde4Package super.krdc; - - kremotecontrol = extendDerivation (kde4Package super.kremotecontrol) { - buildInputs = [ scope.xorg.libXtst ]; - }; - - kreversi = kde4Package super.kreversi; - - krfb = extendDerivation (kde4Package super.krfb) { - buildInputs = with scope; [ xorg.libXtst ktp-common-internals ]; - }; - - ksaneplugin = kde4Package super.ksaneplugin; - - kscd = kde4Package super.kscd; - - ksirk = kde4Package super.ksirk; - - ksnakeduel = kde4Package super.ksnakeduel; - - ksnapshot = kde4Package super.ksnapshot; - - kspaceduel = kde4Package super.kspaceduel; - - kstars = extendDerivation super.kstars { - buildInputs = with scope; [ kparts cfitsio ]; - }; - - ksudoku = kde4Package super.ksudoku; - - ksystemlog = kde4Package super.ksystemlog; - - ktp-accounts-kcm = extendDerivation super.ktp-accounts-kcm { - buildInputs = [ scope.libaccounts-glib ]; - }; - - ktp-common-internals = extendDerivation super.ktp-common-internals { - buildInputs = with scope; [ kdelibs4support kparts libotr ]; - }; - - ktp-text-ui = extendDerivation super.ktp-text-ui { - buildInputs = [ scope.kdbusaddons ]; - }; - - ktuberling = kde4Package super.ktuberling; - - ktux = kde4Package super.ktux; - - kubrick = kde4Package super.kubrick; - - kuser = kde4Package super.kuser; - - kwalletmanager = kde4Package super.kwalletmanager; - - lokalize = extendDerivation super.lokalize { - buildInputs = [ scope.kdbusaddons ]; - }; - - libkcddb = kde4Package super.libkcddb; - - libkcompactdisc = kde4Package super.libkcompactdisc; - - libkdcraw = extendDerivation super.libkdcraw { - buildInputs = with scope; [ kdelibs libraw ]; - nativeBuildInputs = [ scope.pkgconfig ]; - }; - - libkdeedu = kde4Package super.libkdeedu; - - libkexiv2 = extendDerivation super.libkexiv2 { - buildInputs = with scope; [ exiv2 kdelibs ]; - }; - - libkface = extendDerivation super.libkface { - buildInputs = with scope; [ kdelibs opencv ]; - }; - - libkgeomap = extendDerivation (kde4Package super.libkgeomap) { - cmakeFlags = - [ "-DCMAKE_MODULE_PATH=${scope.marble}/share/apps/cmake/modules" ]; - }; - - libkipi = extendDerivation super.libkipi { - buildInputs = [ scope.kdelibs ]; - }; - - libksane = extendDerivation super.libksane { - buildInputs = with scope; [ kdelibs saneBackends]; - }; - - lskat = kde4Package super.lskat; - - marble = kde4Package super.marble; - - mplayerthumbs = kde4Package super.mplayerthumbs; - - okular = extendDerivation (kde4Package super.okular) { - nativeBuildInputs = [ scope.pkgconfig ]; - }; - - pairs = kde4Package super.pairs; - - palapeli = kde4Package super.palapeli; - - picmi = kde4Package super.picmi; - - poxml = kde4Package super.poxml; - - rocs = extendDerivation super.rocs { - buildInputs = [ scope.kdelibs4support ]; - }; - - signon-kwallet-extension = extendDerivation super.signon-kwallet-extension { - buildInputs = [ scope.signonqt5 ]; - preConfigure = '' - sed -i src/CMakeLists.txt \ - -e "s,\''${SIGNONEXTENSION_PLUGINDIR},$out/lib/signon/extensions," - ''; - }; - - superkaramba = kde4Package super.superkaramba; - - svgpart = kde4Package super.svgpart; - - sweeper = kde4Package super.sweeper; - - umbrello = kde4Package super.umbrello; - - zeroconf-ioslave = kde4Package super.zeroconf-ioslave; - - }; - -in self diff --git a/pkgs/applications/kde-apps-15.04/kde-workspace/ksysguard-0001-disable-signalplottertest.patch b/pkgs/applications/kde-apps-15.04/kde-workspace/ksysguard-0001-disable-signalplottertest.patch deleted file mode 100644 index cd19b7e2d72a..000000000000 --- a/pkgs/applications/kde-apps-15.04/kde-workspace/ksysguard-0001-disable-signalplottertest.patch +++ /dev/null @@ -1,36 +0,0 @@ -From 38f35dcec38458f7192424b3d63bc0c614bb86e0 Mon Sep 17 00:00:00 2001 -From: Thomas Tuegel -Date: Mon, 7 Sep 2015 18:55:44 -0500 -Subject: [PATCH] ksysguard disable signalplottertest - ---- - libs/ksysguard/tests/CMakeLists.txt | 16 ---------------- - 1 file changed, 16 deletions(-) - -diff --git a/libs/ksysguard/tests/CMakeLists.txt b/libs/ksysguard/tests/CMakeLists.txt -index d472fd7..f178b71 100644 ---- a/libs/ksysguard/tests/CMakeLists.txt -+++ b/libs/ksysguard/tests/CMakeLists.txt -@@ -14,19 +14,3 @@ target_link_libraries(processtest processui ${KDE4_KDECORE_LIBS} ${QT_QTTEST_LIB - set( signalplotterbenchmark_SRCS signalplotterbenchmark.cpp ../signalplotter/ksignalplotter.cpp) - kde4_add_unit_test( signalplotterbenchmark TESTNAME ksysguard-signalplottertest ${signalplotterbenchmark_SRCS} ) - target_link_libraries( signalplotterbenchmark ${KDE4_KDEUI_LIBS} ${QT_QTTEST_LIBRARY} ${QT_QTBENCHMARK_LIBRARY} ) -- -- --# KGraphicsSignalPlotter benchmark --set( graphicssignalplotterbenchmark_SRCS graphicssignalplotterbenchmark.cpp ../signalplotter/kgraphicssignalplotter.cpp) --kde4_add_unit_test( graphicssignalplotterbenchmark TESTNAME ksysguard-signalplottertest ${graphicssignalplotterbenchmark_SRCS} ) --target_link_libraries( graphicssignalplotterbenchmark ${KDE4_KDEUI_LIBS} ${QT_QTTEST_LIBRARY} ${QT_QTBENCHMARK_LIBRARY} ) -- -- --# KSignalPlotter unit test --set( signalplottertest_SRCS signalplottertest.cpp ../signalplotter/ksignalplotter.cpp) --kde4_add_unit_test( signalplottertest TESTNAME ksysguard-signalplottertest ${signalplottertest_SRCS} ) --target_link_libraries( signalplottertest ${KDE4_KDEUI_LIBS} ${QT_QTTEST_LIBRARY} ) -- -- -- -- --- -2.5.0 - diff --git a/pkgs/applications/kde-apps-15.04/kdelibs/polkit-install.patch b/pkgs/applications/kde-apps-15.04/kdelibs/polkit-install.patch deleted file mode 100644 index d2ecac663ec5..000000000000 --- a/pkgs/applications/kde-apps-15.04/kdelibs/polkit-install.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -ru -x '*~' kdelibs-4.6.90-orig/kdecore/auth/ConfigureChecks.cmake kdelibs-4.6.90/kdecore/auth/ConfigureChecks.cmake ---- kdelibs-4.6.90-orig/kdecore/auth/ConfigureChecks.cmake 2011-05-20 22:24:54.000000000 +0200 -+++ kdelibs-4.6.90/kdecore/auth/ConfigureChecks.cmake 2011-07-12 14:03:00.000000000 +0200 -@@ -139,7 +139,7 @@ - ${CMAKE_INSTALL_PREFIX} _KDE4_AUTH_POLICY_FILES_INSTALL_DIR - ${POLKITQT-1_POLICY_FILES_INSTALL_DIR}) - -- set(KDE4_AUTH_POLICY_FILES_INSTALL_DIR ${_KDE4_AUTH_POLICY_FILES_INSTALL_DIR} CACHE STRING -+ set(KDE4_AUTH_POLICY_FILES_INSTALL_DIR "\${CMAKE_INSTALL_PREFIX}/share/polkit-1/actions" CACHE STRING - "Where policy files generated by KAuth will be installed" FORCE) - elseif(KDE4_AUTH_BACKEND_NAME STREQUAL "FAKE") - set (KAUTH_COMPILING_FAKE_BACKEND TRUE) diff --git a/pkgs/applications/kde-apps-15.04/kf5-renames.json b/pkgs/applications/kde-apps-15.04/kf5-renames.json deleted file mode 100644 index 4da5f8272eeb..000000000000 --- a/pkgs/applications/kde-apps-15.04/kf5-renames.json +++ /dev/null @@ -1,70 +0,0 @@ -{ - "kf5widgetsaddons": "kwidgetsaddons", - "kf5texteditor": "ktexteditor", - "kf5designerplugin": "kdesignerplugin", - "kf5bookmarks": "kbookmarks", - "kf5frameworkintegration": "frameworkintegration", - "kf5package": "kpackage", - "kf5archive": "karchive", - "kf5plasma": "plasma-framework", - "kf5kcmutils": "kcmutils", - "kf5configwidgets": "kconfigwidgets", - "ctest": "attica", - "kf5kio": "kio", - "kf5networkmanagerqt": "networkmanager-qt", - "kf5coreaddons": "kcoreaddons", - "kf5guiaddons": "kguiaddons", - "kf5jobwidgets": "kjobwidgets", - "kf5modemmanagerqt": "modemmanager-qt", - "kf5runner": "krunner", - "kf5globalaccel": "kglobalaccel", - "kf5dbusaddons": "kdbusaddons", - "kf5crash": "kcrash", - "kf5itemviews": "kitemviews", - "kf5doctools": "kdoctools", - "kf5i18n": "ki18n", - "kf5webkit": "kdewebkit", - "kf5newstuff": "knewstuff", - "kded": "kded", - "kf5notifications": "knotifications", - "kf5activitiesexperimentalstats": "kactivities", - "kf5dnssd": "kdnssd", - "kf5notifyconfig": "knotifyconfig", - "kf5iconthemes": "kiconthemes", - "kf5js": "kjs", - "kf5kde4support": "kdelibs4support", - "kf5parts": "kparts", - "backend": "plasma-framework", - "kf5completion": "kcompletion", - "kf5threadweaver": "threadweaver", - "kf5mediaplayer": "kmediaplayer", - "kf5plasmaquick": "plasma-framework", - "kf5wallet": "kwallet", - "kf5xmlgui": "kxmlgui", - "kf5attica": "attica", - "kf5declarative": "kdeclarative", - "kf5config": "kconfig", - "kf5init": "kinit", - "kf5textwidgets": "ktextwidgets", - "kf5jsembed": "kjsembed", - "kf5codecs": "kcodecs", - "kf5service": "kservice", - "kf5sonnet": "sonnet", - "kf5kdelibs4support": "kdelibs4support", - "kf5pty": "kpty", - "kf5solid": "solid", - "kf5auth": "kauth", - "ecm": "extra-cmake-modules", - "kf5activities": "kactivities", - "kf5plotting": "kplotting", - "kf5people": "kpeople", - "kf5emoticons": "kemoticons", - "kf5kross": "kross", - "kf5su": "kdesu", - "kf5khtml": "khtml", - "kf5unitconversion": "kunitconversion", - "kf5idletime": "kidletime", - "kf5windowsystem": "kwindowsystem", - "kf5xmlrpcclient": "kxmlrpcclient", - "kf5itemmodels": "kitemmodels" -} \ No newline at end of file diff --git a/pkgs/applications/kde-apps-15.04/packages.json b/pkgs/applications/kde-apps-15.04/packages.json deleted file mode 100644 index fef1a4610bf1..000000000000 --- a/pkgs/applications/kde-apps-15.04/packages.json +++ /dev/null @@ -1,5693 +0,0 @@ -{ - "libkexiv2": { - "nativeBuildInputs": [ - "cmake" - ], - "propagatedNativeBuildInputs": [], - "propagatedUserEnvPkgs": [], - "propagatedBuildInputs": [], - "name": "libkexiv2-15.04.3", - "src": { - "url": "stable/applications/15.04.3/src/libkexiv2-15.04.3.tar.xz", - "name": "libkexiv2-15.04.3.tar.xz", - "sha256": "0f5cfkdlqmngpj0sr9i6w2n57jgnhj6j6gvr8cc26n11zrdv9w04" - }, - "buildInputs": [ - "exiv2", - "kde4" - ] - }, - "kde-l10n-bg": { - "nativeBuildInputs": [ - "cmake" - ], - "propagatedNativeBuildInputs": [], - "propagatedUserEnvPkgs": [], - "propagatedBuildInputs": [], - "name": "kde-l10n-bg-15.04.3", - "src": { - "url": "stable/applications/15.04.3/src/kde-l10n/kde-l10n-bg-15.04.3.tar.xz", - "name": "kde-l10n-bg-15.04.3.tar.xz", - "sha256": "1s2qm9dlih7yfs83pywkn1q5mk9xik70rmzqvp1fj0zj66gxhf9i" - }, - "buildInputs": [ - "ecm", - "gettext", - "kde4", - "kf5doctools", - "kf5i18n" - ] - }, - "kqtquickcharts": { - "nativeBuildInputs": [ - "cmake" - ], - "propagatedNativeBuildInputs": [], - "propagatedUserEnvPkgs": [], - "propagatedBuildInputs": [], - "name": "kqtquickcharts-15.04.3", - "src": { - "url": "stable/applications/15.04.3/src/kqtquickcharts-15.04.3.tar.xz", - "name": "kqtquickcharts-15.04.3.tar.xz", - "sha256": "1fmyyiy2ahxxbf9cy5aqpb5zvcqk0yrig9h586hzhw028mdblj5a" - }, - "buildInputs": [ - "kde4" - ] - }, - "palapeli": { - "nativeBuildInputs": [ - "cmake", - "qvoronoi_executable" - ], - "propagatedNativeBuildInputs": [], - "propagatedUserEnvPkgs": [], - "propagatedBuildInputs": [], - "name": "palapeli-15.04.3", - "src": { - "url": "stable/applications/15.04.3/src/palapeli-15.04.3.tar.xz", - "name": "palapeli-15.04.3.tar.xz", - "sha256": "04l94nwwzqgsf54hg0yrbmv5fc2lljcgpxg4fcfbp8j58ypqv6kq" - }, - "buildInputs": [ - "kde4", - "kdegames", - "sharedmimeinfo" - ] - }, - "kmahjongg": { - "nativeBuildInputs": [ - "cmake" - ], - "propagatedNativeBuildInputs": [], - "propagatedUserEnvPkgs": [], - "propagatedBuildInputs": [], - "name": "kmahjongg-15.04.3", - "src": { - "url": "stable/applications/15.04.3/src/kmahjongg-15.04.3.tar.xz", - "name": "kmahjongg-15.04.3.tar.xz", - "sha256": "1066qmvkxzi83mnd736ldfqm6qmdwwj7bw1daixfarkr2mws7i51" - }, - "buildInputs": [ - "kde4", - "kdegames", - "libkmahjongg" - ] - }, - "analitza": { - "nativeBuildInputs": [ - "cmake" - ], - "propagatedNativeBuildInputs": [], - "propagatedUserEnvPkgs": [], - "propagatedBuildInputs": [ - "qt5core" - ], - "name": "analitza-15.04.3", - "src": { - "url": "stable/applications/15.04.3/src/analitza-15.04.3.tar.xz", - "name": "analitza-15.04.3.tar.xz", - "sha256": "0ljydfchs0928damms87k5v049w9g021k42y1a000z3z09154rm2" - }, - "buildInputs": [ - "ecm", - "eigen3", - "glew", - "opengl", - "qt5", - "qt5opengl", - "qt5qml", - "qt5quick", - "qt5svg", - "qt5test", - "qt5widgets", - "qt5xml" - ] - }, - "kfourinline": { - "nativeBuildInputs": [ - "cmake" - ], - "propagatedNativeBuildInputs": [], - "propagatedUserEnvPkgs": [], - "propagatedBuildInputs": [], - "name": "kfourinline-15.04.3", - "src": { - "url": "stable/applications/15.04.3/src/kfourinline-15.04.3.tar.xz", - "name": "kfourinline-15.04.3.tar.xz", - "sha256": "07rxjp7i9nhgy57zrh21qmc8352b915ykny6jsds80jrc2fl8hbs" - }, - "buildInputs": [ - "ecm", - "kf5", - "kf5completion", - "kf5config", - "kf5configwidgets", - "kf5coreaddons", - "kf5dbusaddons", - "kf5declarative", - "kf5dnssd", - "kf5i18n", - "kf5iconthemes", - "kf5itemmodels", - "kf5itemviews", - "kf5kdegames", - "kf5kdelibs4support", - "kf5kio", - "kf5notifyconfig", - "kf5xmlgui", - "qt5", - "qt5qml", - "qt5quick", - "qt5quickwidgets", - "qt5svg", - "qt5test", - "qt5widgets" - ] - }, - "juk": { - "nativeBuildInputs": [ - "cmake" - ], - "propagatedNativeBuildInputs": [], - "propagatedUserEnvPkgs": [], - "propagatedBuildInputs": [], - "name": "juk-15.04.3", - "src": { - "url": "stable/applications/15.04.3/src/juk-15.04.3.tar.xz", - "name": "juk-15.04.3.tar.xz", - "sha256": "1zdax89bzpmxs6yi196ybd805y9k6p7cgnnn9c7kba35zn96wj91" - }, - "buildInputs": [ - "kde4", - "taglib", - "tunepimp" - ] - }, - "kde-l10n-id": { - "nativeBuildInputs": [ - "cmake" - ], - "propagatedNativeBuildInputs": [], - "propagatedUserEnvPkgs": [], - "propagatedBuildInputs": [], - "name": "kde-l10n-id-15.04.3", - "src": { - "url": "stable/applications/15.04.3/src/kde-l10n/kde-l10n-id-15.04.3.tar.xz", - "name": "kde-l10n-id-15.04.3.tar.xz", - "sha256": "1rhn68s7zxaifm92i33ik99hc51p242hpqr4d0pdsgwnjbp2n76w" - }, - "buildInputs": [ - "ecm", - "gettext", - "kde4", - "kf5doctools", - "kf5i18n" - ] - }, - "kde-wallpapers": { - "nativeBuildInputs": [ - "cmake" - ], - "propagatedNativeBuildInputs": [], - "propagatedUserEnvPkgs": [], - "propagatedBuildInputs": [], - "name": "kde-wallpapers-15.04.3", - "src": { - "url": "stable/applications/15.04.3/src/kde-wallpapers-15.04.3.tar.xz", - "name": "kde-wallpapers-15.04.3.tar.xz", - "sha256": "1s2kgxx97jvl2xsnpz7cqzpg22j1mvybbvv793gpa8awsfsvhddw" - }, - "buildInputs": [ - "kde4" - ] - }, - "libkipi": { - "nativeBuildInputs": [ - "cmake" - ], - "propagatedNativeBuildInputs": [], - "propagatedUserEnvPkgs": [], - "propagatedBuildInputs": [], - "name": "libkipi-15.04.3", - "src": { - "url": "stable/applications/15.04.3/src/libkipi-15.04.3.tar.xz", - "name": "libkipi-15.04.3.tar.xz", - "sha256": "05ryh1lkghlkn7877k5nspmrny1ijx0vgwimv4bmlc6faifpgfjx" - }, - "buildInputs": [ - "kde4" - ] - }, - "artikulate": { - "nativeBuildInputs": [ - "cmake" - ], - "propagatedNativeBuildInputs": [], - "propagatedUserEnvPkgs": [], - "propagatedBuildInputs": [], - "name": "artikulate-15.04.3", - "src": { - "url": "stable/applications/15.04.3/src/artikulate-15.04.3.tar.xz", - "name": "artikulate-15.04.3.tar.xz", - "sha256": "17nmlh58vxlidgw2g060kvpscch14813zcpzhdykq0mr3293a05z" - }, - "buildInputs": [ - "kde4", - "kdeclarative", - "qtgstreamer" - ] - }, - "kde-l10n-it": { - "nativeBuildInputs": [ - "cmake" - ], - "propagatedNativeBuildInputs": [], - "propagatedUserEnvPkgs": [], - "propagatedBuildInputs": [], - "name": "kde-l10n-it-15.04.3", - "src": { - "url": "stable/applications/15.04.3/src/kde-l10n/kde-l10n-it-15.04.3.tar.xz", - "name": "kde-l10n-it-15.04.3.tar.xz", - "sha256": "1azijn9zz650r899d1ybvlj0qmiwgsyg9m5qd7iln0hxa01fw89i" - }, - "buildInputs": [ - "ecm", - "gettext", - "kde4", - "kf5doctools", - "kf5i18n" - ] - }, - "kde-l10n-da": { - "nativeBuildInputs": [ - "cmake" - ], - "propagatedNativeBuildInputs": [], - "propagatedUserEnvPkgs": [], - "propagatedBuildInputs": [], - "name": "kde-l10n-da-15.04.3", - "src": { - "url": "stable/applications/15.04.3/src/kde-l10n/kde-l10n-da-15.04.3.tar.xz", - "name": "kde-l10n-da-15.04.3.tar.xz", - "sha256": "182dyyx7knny4rs19aiwxd19c355z2fm93psck0ja4rgwhs1qxr3" - }, - "buildInputs": [ - "ecm", - "gettext", - "kde4", - "kf5doctools", - "kf5i18n" - ] - }, - "kde-l10n-km": { - "nativeBuildInputs": [ - "cmake" - ], - "propagatedNativeBuildInputs": [], - "propagatedUserEnvPkgs": [], - "propagatedBuildInputs": [], - "name": "kde-l10n-km-15.04.3", - "src": { - "url": "stable/applications/15.04.3/src/kde-l10n/kde-l10n-km-15.04.3.tar.xz", - "name": "kde-l10n-km-15.04.3.tar.xz", - "sha256": "0f9wkks5mrh9ap8810d9k46dbhqvhn6g8wwfb777iss18jx6g8jd" - }, - "buildInputs": [ - "ecm", - "gettext", - "kde4", - "kf5doctools", - "kf5i18n" - ] - }, - "kde-l10n-ca_valencia": { - "nativeBuildInputs": [ - "cmake" - ], - "propagatedNativeBuildInputs": [], - "propagatedUserEnvPkgs": [], - "propagatedBuildInputs": [], - "name": "kde-l10n-ca_valencia-15.04.3", - "src": { - "url": "stable/applications/15.04.3/src/kde-l10n/kde-l10n-ca@valencia-15.04.3.tar.xz", - "name": "kde-l10n-ca_valencia-15.04.3.tar.xz", - "sha256": "0h21x45hbm0iahf3c8qjfc9cdx5z36js40bqr5klzm7xvwpc596p" - }, - "buildInputs": [ - "ecm", - "gettext", - "kde4", - "kf5doctools", - "kf5i18n" - ] - }, - "kde-l10n-wa": { - "nativeBuildInputs": [ - "cmake" - ], - "propagatedNativeBuildInputs": [], - "propagatedUserEnvPkgs": [], - "propagatedBuildInputs": [], - "name": "kde-l10n-wa-15.04.3", - "src": { - "url": "stable/applications/15.04.3/src/kde-l10n/kde-l10n-wa-15.04.3.tar.xz", - "name": "kde-l10n-wa-15.04.3.tar.xz", - "sha256": "10lidmp54db9f8f3xzf2samvi6s0mck0azhyyiz17amcrfj28nkp" - }, - "buildInputs": [ - "ecm", - "gettext", - "kde4", - "kf5doctools", - "kf5i18n" - ] - }, - "libkomparediff2": { - "nativeBuildInputs": [ - "cmake" - ], - "propagatedNativeBuildInputs": [], - "propagatedUserEnvPkgs": [], - "propagatedBuildInputs": [], - "name": "libkomparediff2-15.04.3", - "src": { - "url": "stable/applications/15.04.3/src/libkomparediff2-15.04.3.tar.xz", - "name": "libkomparediff2-15.04.3.tar.xz", - "sha256": "1i9y5qjxcg5yl5q8ldczy3cssn3rw9p04wcjqx347faqv3dy4nxf" - }, - "buildInputs": [ - "ecm", - "kf5", - "kf5codecs", - "kf5config", - "kf5coreaddons", - "kf5i18n", - "kf5kio", - "kf5parts", - "kf5xmlgui", - "qt5core", - "qt5test", - "qt5widgets" - ] - }, - "kwalletmanager": { - "nativeBuildInputs": [ - "cmake" - ], - "propagatedNativeBuildInputs": [], - "propagatedUserEnvPkgs": [], - "propagatedBuildInputs": [], - "name": "kwalletmanager-15.04.3", - "src": { - "url": "stable/applications/15.04.3/src/kwalletmanager-15.04.3.tar.xz", - "name": "kwalletmanager-15.04.3.tar.xz", - "sha256": "1h5c4vjspzw29j0xqlwaxpdk7k3n0zlkjram25hy3c3vs40hihil" - }, - "buildInputs": [ - "kde4" - ] - }, - "ktp-auth-handler": { - "nativeBuildInputs": [ - "cmake" - ], - "propagatedNativeBuildInputs": [], - "propagatedUserEnvPkgs": [], - "propagatedBuildInputs": [], - "name": "ktp-auth-handler-15.04.3", - "src": { - "url": "stable/applications/15.04.3/src/ktp-auth-handler-15.04.3.tar.xz", - "name": "ktp-auth-handler-15.04.3.tar.xz", - "sha256": "0782lzh3ykk50cpdrh5djvxlgsp88hirbhivdpnwp8bcck3iiha9" - }, - "buildInputs": [ - "accountsqt5", - "ecm", - "kaccounts", - "kf5", - "kf5i18n", - "kf5kio", - "kf5wallet", - "kf5webkit", - "kf5widgetsaddons", - "ktp", - "qca-qt5", - "qca-qt5-ossl", - "qt5", - "qt5core", - "qt5dbus", - "qt5gui", - "qt5network", - "signonqt5", - "telepathyqt5" - ] - }, - "kde-l10n-ga": { - "nativeBuildInputs": [ - "cmake" - ], - "propagatedNativeBuildInputs": [], - "propagatedUserEnvPkgs": [], - "propagatedBuildInputs": [], - "name": "kde-l10n-ga-15.04.3", - "src": { - "url": "stable/applications/15.04.3/src/kde-l10n/kde-l10n-ga-15.04.3.tar.xz", - "name": "kde-l10n-ga-15.04.3.tar.xz", - "sha256": "1h83illxc04i0m116rxy8x23s22fksmxb9kaimn3bglbcd5jgi95" - }, - "buildInputs": [ - "ecm", - "gettext", - "kde4", - "kf5doctools", - "kf5i18n" - ] - }, - "ksnapshot": { - "nativeBuildInputs": [ - "cmake" - ], - "propagatedNativeBuildInputs": [], - "propagatedUserEnvPkgs": [], - "propagatedBuildInputs": [], - "name": "ksnapshot-15.04.3", - "src": { - "url": "stable/applications/15.04.3/src/ksnapshot-15.04.3.tar.xz", - "name": "ksnapshot-15.04.3.tar.xz", - "sha256": "00mj98bdbldw9klfw7qd332migh0gfzdy7pq89am8n2rbp84a0jw" - }, - "buildInputs": [ - "kde4", - "kipi" - ] - }, - "kreversi": { - "nativeBuildInputs": [ - "cmake" - ], - "propagatedNativeBuildInputs": [], - "propagatedUserEnvPkgs": [], - "propagatedBuildInputs": [], - "name": "kreversi-15.04.3", - "src": { - "url": "stable/applications/15.04.3/src/kreversi-15.04.3.tar.xz", - "name": "kreversi-15.04.3.tar.xz", - "sha256": "0nhg2jz0y79yhq68ax10l06sh1dkwn1mjh2qmkhsc6ks80wfq0lp" - }, - "buildInputs": [ - "kde4", - "kdeclarative", - "kdegames" - ] - }, - "kmix": { - "nativeBuildInputs": [ - "cmake" - ], - "propagatedNativeBuildInputs": [], - "propagatedUserEnvPkgs": [], - "propagatedBuildInputs": [], - "name": "kmix-15.04.3", - "src": { - "url": "stable/applications/15.04.3/src/kmix-15.04.3.tar.xz", - "name": "kmix-15.04.3.tar.xz", - "sha256": "1sjh9a4xp981h91ydlxbsxhz0sxdd5ajwn5zn39r3hnfnxh8vx9l" - }, - "buildInputs": [ - "alsa", - "canberra", - "ecm", - "glib2", - "kde4", - "kf5", - "kf5configwidgets", - "kf5dbusaddons", - "kf5globalaccel", - "kf5i18n", - "kf5iconthemes", - "kf5kcmutils", - "kf5kdelibs4support", - "kf5xmlgui", - "phonon", - "pulseaudio" - ] - }, - "signon-kwallet-extension": { - "nativeBuildInputs": [ - "cmake" - ], - "propagatedNativeBuildInputs": [], - "propagatedUserEnvPkgs": [], - "propagatedBuildInputs": [], - "name": "signon-kwallet-extension-15.04.3", - "src": { - "url": "stable/applications/15.04.3/src/signon-kwallet-extension-15.04.3.tar.xz", - "name": "signon-kwallet-extension-15.04.3.tar.xz", - "sha256": "07waf72xwgpdska42ydi9pifs2d2l7idaf0jwamrqrwf5s19vdf0" - }, - "buildInputs": [ - "ecm", - "kf5", - "kf5wallet", - "qt5", - "qt5core", - "qt5dbus", - "qt5test", - "signonextension" - ] - }, - "kde-l10n-es": { - "nativeBuildInputs": [ - "cmake" - ], - "propagatedNativeBuildInputs": [], - "propagatedUserEnvPkgs": [], - "propagatedBuildInputs": [], - "name": "kde-l10n-es-15.04.3", - "src": { - "url": "stable/applications/15.04.3/src/kde-l10n/kde-l10n-es-15.04.3.tar.xz", - "name": "kde-l10n-es-15.04.3.tar.xz", - "sha256": "0nqz9lal9f2s0ryydyy0xxh53q2pxjmpbhkad1l9107shjsy9ry7" - }, - "buildInputs": [ - "ecm", - "gettext", - "kde4", - "kf5doctools", - "kf5i18n" - ] - }, - "kompare": { - "nativeBuildInputs": [ - "cmake" - ], - "propagatedNativeBuildInputs": [], - "propagatedUserEnvPkgs": [], - "propagatedBuildInputs": [], - "name": "kompare-15.04.3", - "src": { - "url": "stable/applications/15.04.3/src/kompare-15.04.3.tar.xz", - "name": "kompare-15.04.3.tar.xz", - "sha256": "1dl0sddskmxm2h6qshgmv06glk740ih0ldw6d9vvlk9a4mnpk3yw" - }, - "buildInputs": [ - "ecm", - "kf5", - "kf5codecs", - "kf5config", - "kf5coreaddons", - "kf5doctools", - "kf5iconthemes", - "kf5jobwidgets", - "kf5parts", - "kf5texteditor", - "kf5widgetsaddons", - "libkomparediff2", - "qt5", - "qt5core", - "qt5printsupport", - "qt5widgets" - ] - }, - "kdiamond": { - "nativeBuildInputs": [ - "cmake" - ], - "propagatedNativeBuildInputs": [], - "propagatedUserEnvPkgs": [], - "propagatedBuildInputs": [], - "name": "kdiamond-15.04.3", - "src": { - "url": "stable/applications/15.04.3/src/kdiamond-15.04.3.tar.xz", - "name": "kdiamond-15.04.3.tar.xz", - "sha256": "066bf4vjcfnidj7yw04g0wdz09wqskvbjskljwndgx178bwb1zn1" - }, - "buildInputs": [ - "ecm", - "kf5", - "kf5config", - "kf5configwidgets", - "kf5coreaddons", - "kf5guiaddons", - "kf5i18n", - "kf5iconthemes", - "kf5kdegames", - "kf5notifyconfig", - "kf5widgetsaddons", - "kf5xmlgui", - "qt5", - "qt5widgets" - ] - }, - "kaccounts-integration": { - "nativeBuildInputs": [ - "cmake" - ], - "propagatedNativeBuildInputs": [], - "propagatedUserEnvPkgs": [], - "propagatedBuildInputs": [ - "accountsqt5", - "kf5coreaddons", - "qt5widgets", - "signonqt5" - ], - "name": "kaccounts-integration-15.04.3", - "src": { - "url": "stable/applications/15.04.3/src/kaccounts-integration-15.04.3.tar.xz", - "name": "kaccounts-integration-15.04.3.tar.xz", - "sha256": "1rx957mbx8fjy0i9al3axpwsqkydgzp2ksqa0lisjcp59sw93zsf" - }, - "buildInputs": [ - "accountsqt5", - "ecm", - "kf5", - "kf5akonadi", - "kf5config", - "kf5coreaddons", - "kf5dbusaddons", - "kf5i18n", - "kf5iconthemes", - "kf5kcmutils", - "kf5kio", - "kf5wallet", - "kf5widgetsaddons", - "qt5", - "qt5core", - "qt5test", - "qt5widgets", - "signonqt5" - ] - }, - "kde-l10n-gl": { - "nativeBuildInputs": [ - "cmake" - ], - "propagatedNativeBuildInputs": [], - "propagatedUserEnvPkgs": [], - "propagatedBuildInputs": [], - "name": "kde-l10n-gl-15.04.3", - "src": { - "url": "stable/applications/15.04.3/src/kde-l10n/kde-l10n-gl-15.04.3.tar.xz", - "name": "kde-l10n-gl-15.04.3.tar.xz", - "sha256": "09j27a65nbk4l96yjhfpk409va7vk5cq7s77h6wpy8pa1vdgl944" - }, - "buildInputs": [ - "ecm", - "gettext", - "kde4", - "kf5doctools", - "kf5i18n" - ] - }, - "kwordquiz": { - "nativeBuildInputs": [ - "cmake" - ], - "propagatedNativeBuildInputs": [], - "propagatedUserEnvPkgs": [], - "propagatedBuildInputs": [], - "name": "kwordquiz-15.04.3", - "src": { - "url": "stable/applications/15.04.3/src/kwordquiz-15.04.3.tar.xz", - "name": "kwordquiz-15.04.3.tar.xz", - "sha256": "00r977c2pi7v512j1h7lr3vs4mxqz6cvfz94a5nicp7khnqy9ysq" - }, - "buildInputs": [ - "ecm", - "kf5", - "kf5config", - "kf5configwidgets", - "kf5crash", - "kf5declarative", - "kf5doctools", - "kf5guiaddons", - "kf5i18n", - "kf5iconthemes", - "kf5itemviews", - "kf5kdelibs4support", - "kf5kio", - "kf5newstuff", - "kf5notifications", - "kf5notifyconfig", - "kf5sonnet", - "kf5xmlgui", - "libkeduvocdocument", - "phonon4qt5", - "qt5", - "qt5core", - "qt5printsupport", - "qt5widgets" - ] - }, - "kigo": { - "nativeBuildInputs": [ - "cmake" - ], - "propagatedNativeBuildInputs": [], - "propagatedUserEnvPkgs": [], - "propagatedBuildInputs": [], - "name": "kigo-15.04.3", - "src": { - "url": "stable/applications/15.04.3/src/kigo-15.04.3.tar.xz", - "name": "kigo-15.04.3.tar.xz", - "sha256": "0zhs5lhmd44kzr50ccb9f0dbdpnb2g2cgc7fwr4jsccfd5yz6974" - }, - "buildInputs": [ - "kde4", - "kdegames" - ] - }, - "ktp-desktop-applets": { - "nativeBuildInputs": [ - "cmake" - ], - "propagatedNativeBuildInputs": [], - "propagatedUserEnvPkgs": [], - "propagatedBuildInputs": [], - "name": "ktp-desktop-applets-15.04.3", - "src": { - "url": "stable/applications/15.04.3/src/ktp-desktop-applets-15.04.3.tar.xz", - "name": "ktp-desktop-applets-15.04.3.tar.xz", - "sha256": "038d7wlgrzwyyldxb1iq2yha8plkmxwvmi7wf6gs8q1nwy7dfwvw" - }, - "buildInputs": [ - "ecm", - "kf5", - "kf5plasma", - "kf5windowsystem", - "qt5", - "qt5qml" - ] - }, - "kolourpaint": { - "nativeBuildInputs": [ - "cmake" - ], - "propagatedNativeBuildInputs": [], - "propagatedUserEnvPkgs": [], - "propagatedBuildInputs": [], - "name": "kolourpaint-15.04.3", - "src": { - "url": "stable/applications/15.04.3/src/kolourpaint-15.04.3.tar.xz", - "name": "kolourpaint-15.04.3.tar.xz", - "sha256": "0lyik49wpa9wngj7y2yraklkl2fl1g7jnbyjzcircczaq9s644fk" - }, - "buildInputs": [ - "kde4", - "qimageblitz" - ] - }, - "kapptemplate": { - "nativeBuildInputs": [ - "cmake", - "rbkconfig_compiler4", - "rbuic4", - "xsltproc_executable" - ], - "propagatedNativeBuildInputs": [], - "propagatedUserEnvPkgs": [], - "propagatedBuildInputs": [], - "name": "kapptemplate-15.04.3", - "src": { - "url": "stable/applications/15.04.3/src/kapptemplate-15.04.3.tar.xz", - "name": "kapptemplate-15.04.3.tar.xz", - "sha256": "0hs063g2khrghrglwy7r1amrj46xr39dlh1gnbbfpadc5fmk2x6s" - }, - "buildInputs": [ - "ecm", - "kde4", - "kdepimlibs", - "kf5", - "kf5archive", - "kf5completion", - "kf5configwidgets", - "kf5coreaddons", - "kf5doctools", - "kf5i18n", - "kf5kio", - "kf5plasma", - "kf5xmlgui", - "qt5", - "qt5core", - "qt5gui", - "qt5test", - "qt5widgets" - ] - }, - "kdegraphics-thumbnailers": { - "nativeBuildInputs": [ - "cmake" - ], - "propagatedNativeBuildInputs": [], - "propagatedUserEnvPkgs": [], - "propagatedBuildInputs": [], - "name": "kdegraphics-thumbnailers-15.04.3", - "src": { - "url": "stable/applications/15.04.3/src/kdegraphics-thumbnailers-15.04.3.tar.xz", - "name": "kdegraphics-thumbnailers-15.04.3.tar.xz", - "sha256": "07cc7mp1c59hccn30670yzvmbr14f78whyxz5dwcwxpbcgaklq1a" - }, - "buildInputs": [ - "kdcraw", - "kde4", - "kexiv2" - ] - }, - "kde-l10n-pt_BR": { - "nativeBuildInputs": [ - "cmake" - ], - "propagatedNativeBuildInputs": [], - "propagatedUserEnvPkgs": [], - "propagatedBuildInputs": [], - "name": "kde-l10n-pt_BR-15.04.3", - "src": { - "url": "stable/applications/15.04.3/src/kde-l10n/kde-l10n-pt_BR-15.04.3.tar.xz", - "name": "kde-l10n-pt_BR-15.04.3.tar.xz", - "sha256": "0yyfk4whymblp4gy0zxvyri254x898lmg78n07amzddxz22dml5f" - }, - "buildInputs": [ - "ecm", - "gettext", - "kde4", - "kf5doctools", - "kf5i18n" - ] - }, - "ksystemlog": { - "nativeBuildInputs": [ - "cmake" - ], - "propagatedNativeBuildInputs": [], - "propagatedUserEnvPkgs": [], - "propagatedBuildInputs": [], - "name": "ksystemlog-15.04.3", - "src": { - "url": "stable/applications/15.04.3/src/ksystemlog-15.04.3.tar.xz", - "name": "ksystemlog-15.04.3.tar.xz", - "sha256": "117xkjgqrivyjyzh4jz3z5xvcj2l1f3x665kgc3rrw4y4zpwwcnm" - }, - "buildInputs": [ - "kde4" - ] - }, - "kuser": { - "nativeBuildInputs": [ - "cmake" - ], - "propagatedNativeBuildInputs": [], - "propagatedUserEnvPkgs": [], - "propagatedBuildInputs": [], - "name": "kuser-15.04.3", - "src": { - "url": "stable/applications/15.04.3/src/kuser-15.04.3.tar.xz", - "name": "kuser-15.04.3.tar.xz", - "sha256": "1q1f9l3lwcszpfiyfjaf7cjbw325cfjpbkc6rfvl3jp157w5nr4m" - }, - "buildInputs": [ - "kde4", - "kdepimlibs" - ] - }, - "libksane": { - "nativeBuildInputs": [ - "cmake" - ], - "propagatedNativeBuildInputs": [], - "propagatedUserEnvPkgs": [], - "propagatedBuildInputs": [], - "name": "libksane-15.04.3", - "src": { - "url": "stable/applications/15.04.3/src/libksane-15.04.3.tar.xz", - "name": "libksane-15.04.3.tar.xz", - "sha256": "0i5ynf3g2i6vlhzl5cga8imprblmdz418cfkznwkw1yj35g236c3" - }, - "buildInputs": [] - }, - "knavalbattle": { - "nativeBuildInputs": [ - "cmake" - ], - "propagatedNativeBuildInputs": [], - "propagatedUserEnvPkgs": [], - "propagatedBuildInputs": [], - "name": "knavalbattle-15.04.3", - "src": { - "url": "stable/applications/15.04.3/src/knavalbattle-15.04.3.tar.xz", - "name": "knavalbattle-15.04.3.tar.xz", - "sha256": "10nri1fvi057cvb6qwlhqyv9x1rjavsdhhipgrdhqpzmm0y84sd1" - }, - "buildInputs": [ - "kde4", - "kdegames" - ] - }, - "kaccessible": { - "nativeBuildInputs": [ - "cmake" - ], - "propagatedNativeBuildInputs": [], - "propagatedUserEnvPkgs": [], - "propagatedBuildInputs": [], - "name": "kaccessible-15.04.3", - "src": { - "url": "stable/applications/15.04.3/src/kaccessible-15.04.3.tar.xz", - "name": "kaccessible-15.04.3.tar.xz", - "sha256": "1a413cv32xsqx9aalkrqh3ybw6phvh4ckgzr15kxca3lc78zw00s" - }, - "buildInputs": [ - "kde4", - "qt4", - "speechd", - "x11" - ] - }, - "knetwalk": { - "nativeBuildInputs": [ - "cmake" - ], - "propagatedNativeBuildInputs": [], - "propagatedUserEnvPkgs": [], - "propagatedBuildInputs": [], - "name": "knetwalk-15.04.3", - "src": { - "url": "stable/applications/15.04.3/src/knetwalk-15.04.3.tar.xz", - "name": "knetwalk-15.04.3.tar.xz", - "sha256": "1bmn1avq2xpvrvaryzl25izdh7xn1c5pdxll51kj7l017590pa43" - }, - "buildInputs": [ - "ecm", - "kf5", - "kf5config", - "kf5configwidgets", - "kf5coreaddons", - "kf5dbusaddons", - "kf5guiaddons", - "kf5i18n", - "kf5iconthemes", - "kf5itemviews", - "kf5kdegames", - "kf5kio", - "kf5notifyconfig", - "kf5widgetsaddons", - "kf5xmlgui", - "qt5", - "qt5qml", - "qt5quick", - "qt5quickwidgets", - "qt5svg", - "qt5test", - "qt5widgets" - ] - }, - "kdewebdev": { - "nativeBuildInputs": [ - "cmake" - ], - "propagatedNativeBuildInputs": [], - "propagatedUserEnvPkgs": [], - "propagatedBuildInputs": [], - "name": "kdewebdev-15.04.3", - "src": { - "url": "stable/applications/15.04.3/src/kdewebdev-15.04.3.tar.xz", - "name": "kdewebdev-15.04.3.tar.xz", - "sha256": "05wxb6swr3dpjw8vvsz9ylznx2rcjg2glzj9blnckkd7wl35r3q1" - }, - "buildInputs": [ - "kde4", - "kdepimlibs", - "libtidy", - "ruby", - "zlib" - ] - }, - "kget": { - "nativeBuildInputs": [ - "cmake" - ], - "propagatedNativeBuildInputs": [], - "propagatedUserEnvPkgs": [], - "propagatedBuildInputs": [], - "name": "kget-15.04.3", - "src": { - "url": "stable/applications/15.04.3/src/kget-15.04.3.tar.xz", - "name": "kget-15.04.3.tar.xz", - "sha256": "17wlqx55r3yrnl149rydmmdksll9wg40dnqqq45knv2gx9mdxlwg" - }, - "buildInputs": [ - "boost", - "kde4", - "kde4workspace", - "ktorrent", - "libmms", - "nepomukcore", - "nepomukwidgets", - "qca2", - "qgpgme", - "shareddesktopontologies", - "soprano", - "sqlite" - ] - }, - "kalzium": { - "nativeBuildInputs": [ - "cmake" - ], - "propagatedNativeBuildInputs": [], - "propagatedUserEnvPkgs": [], - "propagatedBuildInputs": [], - "name": "kalzium-15.04.3", - "src": { - "url": "stable/applications/15.04.3/src/kalzium-15.04.3.tar.xz", - "name": "kalzium-15.04.3.tar.xz", - "sha256": "0hdffpyhg8dk4hhnkg0isizrdz65wbgndr6zja733p7n3gsrias6" - }, - "buildInputs": [ - "kde4", - "kdewin32" - ] - }, - "marble": { - "nativeBuildInputs": [ - "cmake" - ], - "propagatedNativeBuildInputs": [], - "propagatedUserEnvPkgs": [], - "propagatedBuildInputs": [], - "name": "marble-15.04.3", - "src": { - "url": "stable/applications/15.04.3/src/marble-15.04.3.tar.xz", - "name": "marble-15.04.3.tar.xz", - "sha256": "1fjbfarf8zp1d7ailvx017qb28sjk318r2jdb7pz5x8x4yl6b82s" - }, - "buildInputs": [ - "kde4", - "libgps", - "liblocation", - "libshp", - "libwlocate", - "perl", - "phonon", - "protobuf", - "pyqt4", - "pythonlibrary", - "qextserialport", - "qt4", - "qt5concurrent", - "qt5core", - "qt5designer", - "qt5network", - "qt5printsupport", - "qt5quick", - "qt5script", - "qt5sql", - "qt5svg", - "qt5test", - "qt5webkitwidgets", - "qt5widgets", - "qt5xml", - "qtlocation", - "quazip", - "sharedmimeinfo", - "sip", - "zlib" - ] - }, - "kig": { - "nativeBuildInputs": [ - "cmake" - ], - "propagatedNativeBuildInputs": [], - "propagatedUserEnvPkgs": [], - "propagatedBuildInputs": [], - "name": "kig-15.04.3", - "src": { - "url": "stable/applications/15.04.3/src/kig-15.04.3.tar.xz", - "name": "kig-15.04.3.tar.xz", - "sha256": "1k19pfp8b4k3spfcs70fgjhk78jkhbb7bfilyzf0ahzrjcpgp8c8" - }, - "buildInputs": [ - "boostpython", - "ecm", - "kf5archive", - "kf5configwidgets", - "kf5doctools", - "kf5emoticons", - "kf5i18n", - "kf5iconthemes", - "kf5itemmodels", - "kf5kdelibs4support", - "kf5parts", - "kf5texteditor", - "kf5xmlgui", - "qt5printsupport", - "qt5svg", - "qt5test" - ] - }, - "kiten": { - "nativeBuildInputs": [ - "cmake" - ], - "propagatedNativeBuildInputs": [], - "propagatedUserEnvPkgs": [], - "propagatedBuildInputs": [], - "name": "kiten-15.04.3", - "src": { - "url": "stable/applications/15.04.3/src/kiten-15.04.3.tar.xz", - "name": "kiten-15.04.3.tar.xz", - "sha256": "0f4kmm01ikn54dy2z2lnv0kdqx7rn77mnfrwv25470h6ar4w89w1" - }, - "buildInputs": [ - "ecm", - "kf5", - "kf5archive", - "kf5completion", - "kf5config", - "kf5configwidgets", - "kf5coreaddons", - "kf5doctools", - "kf5i18n", - "kf5khtml", - "kf5xmlgui", - "qt5", - "qt5core", - "qt5widgets" - ] - }, - "ktp-contact-list": { - "nativeBuildInputs": [ - "cmake" - ], - "propagatedNativeBuildInputs": [], - "propagatedUserEnvPkgs": [], - "propagatedBuildInputs": [], - "name": "ktp-contact-list-15.04.3", - "src": { - "url": "stable/applications/15.04.3/src/ktp-contact-list-15.04.3.tar.xz", - "name": "ktp-contact-list-15.04.3.tar.xz", - "sha256": "02vvp0i2bi3j7gk037pqzfhn44khln0wddwbql3kq49v4q2i5s7d" - }, - "buildInputs": [ - "ecm", - "kf5", - "kf5dbusaddons", - "kf5i18n", - "kf5iconthemes", - "kf5kcmutils", - "kf5kio", - "kf5notifications", - "kf5notifyconfig", - "kf5people", - "kf5windowsystem", - "kf5xmlgui", - "ktp", - "qt5", - "qt5widgets", - "qt5xml", - "telepathyqt5" - ] - }, - "kde-l10n-pt": { - "nativeBuildInputs": [ - "cmake" - ], - "propagatedNativeBuildInputs": [], - "propagatedUserEnvPkgs": [], - "propagatedBuildInputs": [], - "name": "kde-l10n-pt-15.04.3", - "src": { - "url": "stable/applications/15.04.3/src/kde-l10n/kde-l10n-pt-15.04.3.tar.xz", - "name": "kde-l10n-pt-15.04.3.tar.xz", - "sha256": "0gy7y8xns0kxl7n8wa073xypnyvdyq56gz1ahj0k8mpadfak6vk0" - }, - "buildInputs": [ - "ecm", - "gettext", - "kde4", - "kf5doctools", - "kf5i18n" - ] - }, - "kde-l10n-fr": { - "nativeBuildInputs": [ - "cmake" - ], - "propagatedNativeBuildInputs": [], - "propagatedUserEnvPkgs": [], - "propagatedBuildInputs": [], - "name": "kde-l10n-fr-15.04.3", - "src": { - "url": "stable/applications/15.04.3/src/kde-l10n/kde-l10n-fr-15.04.3.tar.xz", - "name": "kde-l10n-fr-15.04.3.tar.xz", - "sha256": "0z1ga48y5zih85cdmb165kyxm9z7ydhxykj4ci40ckdqiwzjhkag" - }, - "buildInputs": [ - "ecm", - "gettext", - "kde4", - "kf5doctools", - "kf5i18n" - ] - }, - "kmouth": { - "nativeBuildInputs": [ - "cmake" - ], - "propagatedNativeBuildInputs": [], - "propagatedUserEnvPkgs": [], - "propagatedBuildInputs": [], - "name": "kmouth-15.04.3", - "src": { - "url": "stable/applications/15.04.3/src/kmouth-15.04.3.tar.xz", - "name": "kmouth-15.04.3.tar.xz", - "sha256": "1ak1nvc0y0yi1gd9kdhhjw64j6fkf7bw11nnxxhpq9gvgmyyfm7r" - }, - "buildInputs": [ - "kde4" - ] - }, - "filelight": { - "nativeBuildInputs": [ - "cmake" - ], - "propagatedNativeBuildInputs": [], - "propagatedUserEnvPkgs": [], - "propagatedBuildInputs": [], - "name": "filelight-15.04.3", - "src": { - "url": "stable/applications/15.04.3/src/filelight-15.04.3.tar.xz", - "name": "filelight-15.04.3.tar.xz", - "sha256": "05ak727bkij70zc5lr458snq346ndc32r5icjz6jgmyxqxsdk17d" - }, - "buildInputs": [ - "ecm", - "kf5", - "kf5coreaddons", - "kf5doctools", - "kf5i18n", - "kf5kio", - "kf5parts", - "kf5solid", - "kf5xmlgui", - "qt5", - "qt5core", - "qt5dbus", - "qt5script", - "qt5test", - "qt5widgets" - ] - }, - "kdesdk-kioslaves": { - "nativeBuildInputs": [ - "cmake" - ], - "propagatedNativeBuildInputs": [], - "propagatedUserEnvPkgs": [], - "propagatedBuildInputs": [], - "name": "kdesdk-kioslaves-15.04.3", - "src": { - "url": "stable/applications/15.04.3/src/kdesdk-kioslaves-15.04.3.tar.xz", - "name": "kdesdk-kioslaves-15.04.3.tar.xz", - "sha256": "0f5cjlssylgr42bnrsdaw64xl17zr0sl989digqg47hrd7np1zf7" - }, - "buildInputs": [ - "kde4", - "perl", - "svn" - ] - }, - "kde-baseapps": { - "nativeBuildInputs": [ - "cmake" - ], - "propagatedNativeBuildInputs": [], - "propagatedUserEnvPkgs": [], - "propagatedBuildInputs": [], - "name": "kde-baseapps-15.04.3", - "src": { - "url": "stable/applications/15.04.3/src/kde-baseapps-15.04.3.tar.xz", - "name": "kde-baseapps-15.04.3.tar.xz", - "sha256": "1inkzj984qy0ab4ks5m002phs6a00cjfn25gri9jglcqn3jzy85a" - }, - "buildInputs": [ - "baloo", - "baloowidgets", - "glib2", - "kactivities", - "kde4", - "kfilemetadata", - "libtidy", - "x11", - "zlib" - ] - }, - "ksirk": { - "nativeBuildInputs": [ - "cmake" - ], - "propagatedNativeBuildInputs": [], - "propagatedUserEnvPkgs": [], - "propagatedBuildInputs": [], - "name": "ksirk-15.04.3", - "src": { - "url": "stable/applications/15.04.3/src/ksirk-15.04.3.tar.xz", - "name": "ksirk-15.04.3.tar.xz", - "sha256": "1km9423k6hdkb58and8sqz0wwyab8k6k4jg534xppjph7x8a3rm0" - }, - "buildInputs": [ - "kde4", - "kdegames", - "qca2" - ] - }, - "killbots": { - "nativeBuildInputs": [ - "cmake" - ], - "propagatedNativeBuildInputs": [], - "propagatedUserEnvPkgs": [], - "propagatedBuildInputs": [], - "name": "killbots-15.04.3", - "src": { - "url": "stable/applications/15.04.3/src/killbots-15.04.3.tar.xz", - "name": "killbots-15.04.3.tar.xz", - "sha256": "10pvgwmc2s8cz6cz7lr3gracia654qzwjh3b01z3sha7gjfd5ly2" - }, - "buildInputs": [ - "ecm", - "kf5", - "kf5completion", - "kf5config", - "kf5configwidgets", - "kf5coreaddons", - "kf5guiaddons", - "kf5i18n", - "kf5iconthemes", - "kf5itemviews", - "kf5kdegames", - "kf5kio", - "kf5notifyconfig", - "kf5widgetsaddons", - "kf5xmlgui", - "qt5", - "qt5test", - "qt5widgets" - ] - }, - "kjumpingcube": { - "nativeBuildInputs": [ - "cmake" - ], - "propagatedNativeBuildInputs": [], - "propagatedUserEnvPkgs": [], - "propagatedBuildInputs": [], - "name": "kjumpingcube-15.04.3", - "src": { - "url": "stable/applications/15.04.3/src/kjumpingcube-15.04.3.tar.xz", - "name": "kjumpingcube-15.04.3.tar.xz", - "sha256": "0ls4v7ip4vh5h9jn9966bwr00aic64psmwnp96j6zmvrlkmz5saf" - }, - "buildInputs": [ - "ecm", - "kf5", - "kf5config", - "kf5configwidgets", - "kf5coreaddons", - "kf5dbusaddons", - "kf5i18n", - "kf5itemmodels", - "kf5kdegames", - "kf5kdelibs4support", - "kf5kio", - "kf5newstuff", - "kf5notifyconfig", - "kf5textwidgets", - "kf5widgetsaddons", - "kf5windowsystem", - "kf5xmlgui", - "phonon4qt5", - "qt5", - "qt5qml", - "qt5quick", - "qt5quickwidgets", - "qt5svg", - "qt5test", - "qt5widgets" - ] - }, - "kde-l10n-sr": { - "nativeBuildInputs": [ - "cmake" - ], - "propagatedNativeBuildInputs": [], - "propagatedUserEnvPkgs": [], - "propagatedBuildInputs": [], - "name": "kde-l10n-sr-15.04.3", - "src": { - "url": "stable/applications/15.04.3/src/kde-l10n/kde-l10n-sr-15.04.3.tar.xz", - "name": "kde-l10n-sr-15.04.3.tar.xz", - "sha256": "03mpd7cf4zh144jwl0lzv68jbl2805idx68a2zfy50jifbx9k8qa" - }, - "buildInputs": [ - "ecm", - "gettext", - "kde4", - "kf5doctools", - "kf5i18n" - ] - }, - "kde-l10n-et": { - "nativeBuildInputs": [ - "cmake" - ], - "propagatedNativeBuildInputs": [], - "propagatedUserEnvPkgs": [], - "propagatedBuildInputs": [], - "name": "kde-l10n-et-15.04.3", - "src": { - "url": "stable/applications/15.04.3/src/kde-l10n/kde-l10n-et-15.04.3.tar.xz", - "name": "kde-l10n-et-15.04.3.tar.xz", - "sha256": "10jqj02dz1bklabrda8h0hd6gvfxhfxa7mfl7zdn142xz6qs1194" - }, - "buildInputs": [ - "ecm", - "gettext", - "kde4", - "kf5doctools", - "kf5i18n" - ] - }, - "kmag": { - "nativeBuildInputs": [ - "cmake" - ], - "propagatedNativeBuildInputs": [], - "propagatedUserEnvPkgs": [], - "propagatedBuildInputs": [], - "name": "kmag-15.04.3", - "src": { - "url": "stable/applications/15.04.3/src/kmag-15.04.3.tar.xz", - "name": "kmag-15.04.3.tar.xz", - "sha256": "1k2jnqjm1ky6mgqlyz47c4n6ivqlnyva25siyrx466anzbjn5ffp" - }, - "buildInputs": [ - "kde4", - "qaccessibilityclient" - ] - }, - "kdenetwork-strigi-analyzers": { - "nativeBuildInputs": [ - "cmake" - ], - "propagatedNativeBuildInputs": [], - "propagatedUserEnvPkgs": [], - "propagatedBuildInputs": [], - "name": "kdenetwork-strigi-analyzers-15.04.3", - "src": { - "url": "stable/applications/15.04.3/src/kdenetwork-strigi-analyzers-15.04.3.tar.xz", - "name": "kdenetwork-strigi-analyzers-15.04.3.tar.xz", - "sha256": "04xikfhzdl56vkz9zsk1whcikwdwqbs72y9mam40wd9qr0pzfxcw" - }, - "buildInputs": [ - "boost", - "kde4", - "strigi" - ] - }, - "kcharselect": { - "nativeBuildInputs": [ - "cmake" - ], - "propagatedNativeBuildInputs": [], - "propagatedUserEnvPkgs": [], - "propagatedBuildInputs": [], - "name": "kcharselect-15.04.3", - "src": { - "url": "stable/applications/15.04.3/src/kcharselect-15.04.3.tar.xz", - "name": "kcharselect-15.04.3.tar.xz", - "sha256": "12p85b7yplmm4v8v9znq0r4p8y3m2f088brdvlxgmb04x5158m9s" - }, - "buildInputs": [ - "ecm", - "kf5", - "kf5doctools", - "kf5i18n", - "kf5widgetsaddons", - "kf5xmlgui", - "qt5", - "qt5core", - "qt5widgets" - ] - }, - "kdegraphics-strigi-analyzer": { - "nativeBuildInputs": [ - "cmake" - ], - "propagatedNativeBuildInputs": [], - "propagatedUserEnvPkgs": [], - "propagatedBuildInputs": [], - "name": "kdegraphics-strigi-analyzer-15.04.3", - "src": { - "url": "stable/applications/15.04.3/src/kdegraphics-strigi-analyzer-15.04.3.tar.xz", - "name": "kdegraphics-strigi-analyzer-15.04.3.tar.xz", - "sha256": "1mya983vbkxa1q0lwn7gz0fc52y8cdkpadkvfnzal5kpbwvbh96r" - }, - "buildInputs": [ - "kde4", - "openexr", - "strigi", - "tiff" - ] - }, - "libkmahjongg": { - "nativeBuildInputs": [ - "cmake" - ], - "propagatedNativeBuildInputs": [], - "propagatedUserEnvPkgs": [], - "propagatedBuildInputs": [ - "kf5configwidgets", - "qt5gui" - ], - "name": "libkmahjongg-15.04.3", - "src": { - "url": "stable/applications/15.04.3/src/libkmahjongg-15.04.3.tar.xz", - "name": "libkmahjongg-15.04.3.tar.xz", - "sha256": "0b0zrb3bbkphqq96gc8y5xn28g19l5c60pr0s1h5rmm70021ixk6" - }, - "buildInputs": [ - "ecm", - "kf5", - "kf5completion", - "kf5config", - "kf5configwidgets", - "kf5coreaddons", - "kf5i18n", - "kf5widgetsaddons", - "qt5", - "qt5core", - "qt5gui", - "qt5svg", - "qt5test" - ] - }, - "ktp-kded-module": { - "nativeBuildInputs": [ - "cmake" - ], - "propagatedNativeBuildInputs": [], - "propagatedUserEnvPkgs": [], - "propagatedBuildInputs": [], - "name": "ktp-kded-module-15.04.3", - "src": { - "url": "stable/applications/15.04.3/src/ktp-kded-module-15.04.3.tar.xz", - "name": "ktp-kded-module-15.04.3.tar.xz", - "sha256": "1zr0h1yzn9m4b4xld8lp5dx4xx6phw6fnp0z3i27mjbr0a1n6qa1" - }, - "buildInputs": [ - "ecm", - "kf5", - "kf5config", - "kf5configwidgets", - "kf5dbusaddons", - "kf5i18n", - "kf5idletime", - "kf5kcmutils", - "kf5kio", - "kf5notifications", - "kf5widgetsaddons", - "ktp", - "qt5", - "qt5concurrent", - "qt5network", - "qt5sql", - "qt5widgets" - ] - }, - "ktuberling": { - "nativeBuildInputs": [ - "cmake" - ], - "propagatedNativeBuildInputs": [], - "propagatedUserEnvPkgs": [], - "propagatedBuildInputs": [], - "name": "ktuberling-15.04.3", - "src": { - "url": "stable/applications/15.04.3/src/ktuberling-15.04.3.tar.xz", - "name": "ktuberling-15.04.3.tar.xz", - "sha256": "0alxdrjzalngg2y1fyzcsgglsqjk4gcihkndmr25s0c663fzdrrn" - }, - "buildInputs": [ - "kde4", - "kdegames" - ] - }, - "kcron": { - "nativeBuildInputs": [ - "cmake" - ], - "propagatedNativeBuildInputs": [], - "propagatedUserEnvPkgs": [], - "propagatedBuildInputs": [], - "name": "kcron-15.04.3", - "src": { - "url": "stable/applications/15.04.3/src/kcron-15.04.3.tar.xz", - "name": "kcron-15.04.3.tar.xz", - "sha256": "0kwhzfmlgcj3fbi9kj08lnikz37z3gpywfcx940d4gw4n9hg26av" - }, - "buildInputs": [ - "ecm", - "kf5", - "kf5doctools", - "kf5i18n", - "kf5iconthemes", - "kf5kio", - "kf5xmlgui", - "qt5", - "qt5core", - "qt5printsupport", - "qt5widgets" - ] - }, - "kde-l10n-nl": { - "nativeBuildInputs": [ - "cmake" - ], - "propagatedNativeBuildInputs": [], - "propagatedUserEnvPkgs": [], - "propagatedBuildInputs": [], - "name": "kde-l10n-nl-15.04.3", - "src": { - "url": "stable/applications/15.04.3/src/kde-l10n/kde-l10n-nl-15.04.3.tar.xz", - "name": "kde-l10n-nl-15.04.3.tar.xz", - "sha256": "0id9rl05jp3ff6jd22qnfzs40dlnijsr2mkfwzvnf08h3nk6c8id" - }, - "buildInputs": [ - "ecm", - "gettext", - "kde4", - "kf5doctools", - "kf5i18n" - ] - }, - "parley": { - "nativeBuildInputs": [ - "cmake" - ], - "propagatedNativeBuildInputs": [], - "propagatedUserEnvPkgs": [], - "propagatedBuildInputs": [], - "name": "parley-15.04.3", - "src": { - "url": "stable/applications/15.04.3/src/parley-15.04.3.tar.xz", - "name": "parley-15.04.3.tar.xz", - "sha256": "1lvqih1vav234jvf18z00kdd6hn8vq7pm9659bchn02j5ic110d3" - }, - "buildInputs": [ - "ecm", - "kf5", - "kf5config", - "kf5coreaddons", - "kf5crash", - "kf5docbook", - "kf5doctools", - "kf5i18n", - "kf5kcmutils", - "kf5khtml", - "kf5kio", - "kf5kross", - "kf5module", - "kf5newstuff", - "kf5notifications", - "kf5produce", - "kf5sonnet", - "kf5the", - "kf5xmlgui", - "libattica", - "libkeduvocdocument", - "libxml2", - "libxslt", - "qt5", - "qt5concurrent", - "qt5core", - "qt5multimedia", - "qt5svg", - "qt5test" - ] - }, - "kgoldrunner": { - "nativeBuildInputs": [ - "cmake" - ], - "propagatedNativeBuildInputs": [], - "propagatedUserEnvPkgs": [], - "propagatedBuildInputs": [], - "name": "kgoldrunner-15.04.3", - "src": { - "url": "stable/applications/15.04.3/src/kgoldrunner-15.04.3.tar.xz", - "name": "kgoldrunner-15.04.3.tar.xz", - "sha256": "171q6v3nivr64vq2wn25hfv1zhrrmlf97rd128nxscb4qzk0zcnm" - }, - "buildInputs": [ - "kde4", - "kdegames" - ] - }, - "kiriki": { - "nativeBuildInputs": [ - "cmake" - ], - "propagatedNativeBuildInputs": [], - "propagatedUserEnvPkgs": [], - "propagatedBuildInputs": [], - "name": "kiriki-15.04.3", - "src": { - "url": "stable/applications/15.04.3/src/kiriki-15.04.3.tar.xz", - "name": "kiriki-15.04.3.tar.xz", - "sha256": "14s37qs7f0qgpms1syakjj9amkwa0d1va8yrbmlwfbk5dvx953ls" - }, - "buildInputs": [ - "kde4", - "kdegames" - ] - }, - "sweeper": { - "nativeBuildInputs": [ - "cmake" - ], - "propagatedNativeBuildInputs": [], - "propagatedUserEnvPkgs": [], - "propagatedBuildInputs": [], - "name": "sweeper-15.04.3", - "src": { - "url": "stable/applications/15.04.3/src/sweeper-15.04.3.tar.xz", - "name": "sweeper-15.04.3.tar.xz", - "sha256": "156vmxapddlbdhwpdal2s2jr8i4zbn1yccpafqnn8qf0k0384v0l" - }, - "buildInputs": [ - "kde4" - ] - }, - "lokalize": { - "nativeBuildInputs": [ - "cmake" - ], - "propagatedNativeBuildInputs": [], - "propagatedUserEnvPkgs": [], - "propagatedBuildInputs": [], - "name": "lokalize-15.04.3", - "src": { - "url": "stable/applications/15.04.3/src/lokalize-15.04.3.tar.xz", - "name": "lokalize-15.04.3.tar.xz", - "sha256": "1dpbzcgx32n27v2k39w944dzl0i2pph84a02ck4c8864w31d0vf5" - }, - "buildInputs": [ - "ecm", - "hunspell", - "kf5", - "kf5config", - "kf5coreaddons", - "kf5dbusaddons", - "kf5doctools", - "kf5i18n", - "kf5kio", - "kf5kross", - "kf5notifications", - "kf5sonnet", - "kf5xmlgui", - "qt5", - "qt5core", - "qt5dbus", - "qt5script", - "qt5sql", - "qt5widgets" - ] - }, - "kbounce": { - "nativeBuildInputs": [ - "cmake" - ], - "propagatedNativeBuildInputs": [], - "propagatedUserEnvPkgs": [], - "propagatedBuildInputs": [], - "name": "kbounce-15.04.3", - "src": { - "url": "stable/applications/15.04.3/src/kbounce-15.04.3.tar.xz", - "name": "kbounce-15.04.3.tar.xz", - "sha256": "1i0hyc3hb9qibqynkvi9n98a1gcvanw8k6rg0vngifzc3nv4750g" - }, - "buildInputs": [ - "ecm", - "kf5", - "kf5completion", - "kf5config", - "kf5configwidgets", - "kf5coreaddons", - "kf5dbusaddons", - "kf5guiaddons", - "kf5i18n", - "kf5iconthemes", - "kf5kdegames", - "kf5kio", - "kf5notifyconfig", - "kf5textwidgets", - "kf5widgetsaddons", - "kf5xmlgui", - "phonon4qt5", - "qt5", - "qt5svg", - "qt5test", - "qt5widgets" - ] - }, - "kde-l10n-eo": { - "nativeBuildInputs": [ - "cmake" - ], - "propagatedNativeBuildInputs": [], - "propagatedUserEnvPkgs": [], - "propagatedBuildInputs": [], - "name": "kde-l10n-eo-15.04.3", - "src": { - "url": "stable/applications/15.04.3/src/kde-l10n/kde-l10n-eo-15.04.3.tar.xz", - "name": "kde-l10n-eo-15.04.3.tar.xz", - "sha256": "0ac3mmflgnfy3qgsbl8938cf2j0961xh5vvhxwk7wp5j0y1g7nd0" - }, - "buildInputs": [ - "ecm", - "gettext", - "kde4", - "kf5doctools", - "kf5i18n" - ] - }, - "kde-l10n-is": { - "nativeBuildInputs": [ - "cmake" - ], - "propagatedNativeBuildInputs": [], - "propagatedUserEnvPkgs": [], - "propagatedBuildInputs": [], - "name": "kde-l10n-is-15.04.3", - "src": { - "url": "stable/applications/15.04.3/src/kde-l10n/kde-l10n-is-15.04.3.tar.xz", - "name": "kde-l10n-is-15.04.3.tar.xz", - "sha256": "0lv7hcq6qp422y0byv8sak7wf62ws1ssmyggm6izsxaw01z6di9m" - }, - "buildInputs": [ - "ecm", - "gettext", - "kde4", - "kf5doctools", - "kf5i18n" - ] - }, - "kde-l10n-sl": { - "nativeBuildInputs": [ - "cmake" - ], - "propagatedNativeBuildInputs": [], - "propagatedUserEnvPkgs": [], - "propagatedBuildInputs": [], - "name": "kde-l10n-sl-15.04.3", - "src": { - "url": "stable/applications/15.04.3/src/kde-l10n/kde-l10n-sl-15.04.3.tar.xz", - "name": "kde-l10n-sl-15.04.3.tar.xz", - "sha256": "12zg0wbdrvx61qqdv11mx99ncxsnbs6ywf2qa2s5pv9ccj81zl0y" - }, - "buildInputs": [ - "ecm", - "gettext", - "kde4", - "kf5doctools", - "kf5i18n" - ] - }, - "libkcompactdisc": { - "nativeBuildInputs": [ - "cmake" - ], - "propagatedNativeBuildInputs": [], - "propagatedUserEnvPkgs": [], - "propagatedBuildInputs": [], - "name": "libkcompactdisc-15.04.3", - "src": { - "url": "stable/applications/15.04.3/src/libkcompactdisc-15.04.3.tar.xz", - "name": "libkcompactdisc-15.04.3.tar.xz", - "sha256": "0xfb10zvrmvp9hxzh05mk75wd2q8c17kd28kxzy6vzsys1ml23fy" - }, - "buildInputs": [ - "alsa", - "kde4" - ] - }, - "picmi": { - "nativeBuildInputs": [ - "cmake" - ], - "propagatedNativeBuildInputs": [], - "propagatedUserEnvPkgs": [], - "propagatedBuildInputs": [], - "name": "picmi-15.04.3", - "src": { - "url": "stable/applications/15.04.3/src/picmi-15.04.3.tar.xz", - "name": "picmi-15.04.3.tar.xz", - "sha256": "08r5k1hs4ja724d3hgq17cwjr96xqhi09l1fr1ls6hrij6vw2qaj" - }, - "buildInputs": [ - "kde4", - "kdegames", - "qt4" - ] - }, - "superkaramba": { - "nativeBuildInputs": [ - "cmake" - ], - "propagatedNativeBuildInputs": [], - "propagatedUserEnvPkgs": [], - "propagatedBuildInputs": [], - "name": "superkaramba-15.04.3", - "src": { - "url": "stable/applications/15.04.3/src/superkaramba-15.04.3.tar.xz", - "name": "superkaramba-15.04.3.tar.xz", - "sha256": "1qd2gi0jllqr2f3wmv5n3smljfgirray8hba5k062ka3fjl6ssqx" - }, - "buildInputs": [ - "kde4", - "pythonlibs", - "qimageblitz" - ] - }, - "gwenview": { - "nativeBuildInputs": [ - "cmake" - ], - "propagatedNativeBuildInputs": [], - "propagatedUserEnvPkgs": [], - "propagatedBuildInputs": [], - "name": "gwenview-15.04.3", - "src": { - "url": "stable/applications/15.04.3/src/gwenview-15.04.3.tar.xz", - "name": "gwenview-15.04.3.tar.xz", - "sha256": "16p6dz8z63h5d6l5cjz61shpd30bawxgcasn55g6v7gk6rxdrvn2" - }, - "buildInputs": [ - "ecm", - "exiv2", - "jpeg", - "kf5", - "kf5activities", - "kf5baloo", - "kf5kdcraw", - "kf5kdelibs4support", - "kf5kio", - "kf5kipi", - "lcms2", - "phonon4qt5", - "png", - "qt5", - "qt5concurrent", - "qt5core", - "qt5dbus", - "qt5opengl", - "qt5script", - "qt5svg", - "qt5test", - "qt5widgets", - "qt5x11extras", - "x11" - ] - }, - "kde-l10n-fa": { - "nativeBuildInputs": [ - "cmake" - ], - "propagatedNativeBuildInputs": [], - "propagatedUserEnvPkgs": [], - "propagatedBuildInputs": [], - "name": "kde-l10n-fa-15.04.3", - "src": { - "url": "stable/applications/15.04.3/src/kde-l10n/kde-l10n-fa-15.04.3.tar.xz", - "name": "kde-l10n-fa-15.04.3.tar.xz", - "sha256": "0fslss3bz1kzjca3zy923sq8p54jyl1bvqk1qsmv3lmws2881djl" - }, - "buildInputs": [ - "ecm", - "gettext", - "kde4", - "kf5doctools", - "kf5i18n" - ] - }, - "kpat": { - "nativeBuildInputs": [ - "cmake" - ], - "propagatedNativeBuildInputs": [], - "propagatedUserEnvPkgs": [], - "propagatedBuildInputs": [], - "name": "kpat-15.04.3", - "src": { - "url": "stable/applications/15.04.3/src/kpat-15.04.3.tar.xz", - "name": "kpat-15.04.3.tar.xz", - "sha256": "08zb9r291wig1iwh3j7h493ncjfj55255f3pf5ag9nrq44ykvk11" - }, - "buildInputs": [ - "ecm", - "kf5", - "kf5completion", - "kf5config", - "kf5configwidgets", - "kf5coreaddons", - "kf5dbusaddons", - "kf5declarative", - "kf5guiaddons", - "kf5i18n", - "kf5iconthemes", - "kf5itemviews", - "kf5kdegames", - "kf5kio", - "kf5newstuff", - "kf5notifyconfig", - "kf5textwidgets", - "kf5widgetsaddons", - "kf5xmlgui", - "phonon4qt5", - "qt5", - "qt5qml", - "qt5quick", - "qt5quickwidgets", - "qt5svg", - "qt5test", - "qt5widgets", - "sharedmimeinfo" - ] - }, - "klettres": { - "nativeBuildInputs": [ - "cmake" - ], - "propagatedNativeBuildInputs": [], - "propagatedUserEnvPkgs": [], - "propagatedBuildInputs": [], - "name": "klettres-15.04.3", - "src": { - "url": "stable/applications/15.04.3/src/klettres-15.04.3.tar.xz", - "name": "klettres-15.04.3.tar.xz", - "sha256": "0pqdjm5ixkfrxbp20ypgqx18wxyk0mnrmv2bqf6nk3ybwrdfb5y5" - }, - "buildInputs": [ - "ecm", - "kf5", - "kf5completion", - "kf5configwidgets", - "kf5coreaddons", - "kf5doctools", - "kf5emoticons", - "kf5i18n", - "kf5itemmodels", - "kf5kdelibs4support", - "kf5newstuff", - "kf5widgetsaddons", - "phonon4qt5", - "qt5", - "qt5core", - "qt5svg", - "qt5test", - "qt5widgets" - ] - }, - "kdelibs": { - "nativeBuildInputs": [ - "cmake" - ], - "propagatedNativeBuildInputs": [], - "propagatedUserEnvPkgs": [], - "propagatedBuildInputs": [], - "name": "kdelibs-4.14.10", - "src": { - "url": "stable/applications/15.04.3/src/kdelibs-4.14.10.tar.xz", - "name": "kdelibs-4.14.10.tar.xz", - "sha256": "156ajl4al6s2vqyl920yxd2rrs7b77348233xa3bgg5jn2ysgx80" - }, - "buildInputs": [ - "acl", - "agg", - "aspell", - "automoc4", - "avahi", - "bison", - "blitz", - "bluez", - "bzip2", - "carbon", - "dbusmenuqt", - "dnssd", - "docbookxml", - "docbookxsl", - "eigen2", - "enchant", - "fam", - "ffmpeg", - "flac", - "flex", - "gif", - "gobject", - "grantlee", - "gssapi", - "gstreamer", - "hspell", - "hunspell", - "hupnp", - "iokit", - "jasper", - "jpeg", - "kde4", - "kde4internal", - "lcms", - "libart", - "libattica", - "libintl", - "libxml2", - "libxslt", - "openexr", - "openssl", - "pcre", - "perl", - "png", - "qca2", - "qimageblitz", - "qt4", - "shareddesktopontologies", - "sharedmimeinfo", - "soprano", - "sqlite", - "strigi", - "udev", - "usb", - "xine", - "xmms", - "zlib" - ] - }, - "katomic": { - "nativeBuildInputs": [ - "cmake" - ], - "propagatedNativeBuildInputs": [], - "propagatedUserEnvPkgs": [], - "propagatedBuildInputs": [], - "name": "katomic-15.04.3", - "src": { - "url": "stable/applications/15.04.3/src/katomic-15.04.3.tar.xz", - "name": "katomic-15.04.3.tar.xz", - "sha256": "0j3khd1yiyq2y9c4rm36cf79frml7xhzb1jgxab6hshyzcr10lc3" - }, - "buildInputs": [ - "ecm", - "kf5", - "kf5config", - "kf5configwidgets", - "kf5coreaddons", - "kf5guiaddons", - "kf5i18n", - "kf5iconthemes", - "kf5itemviews", - "kf5kdegames", - "kf5kio", - "kf5newstuff", - "kf5notifyconfig", - "kf5widgetsaddons", - "kf5xmlgui", - "qt5", - "qt5widgets" - ] - }, - "kollision": { - "nativeBuildInputs": [ - "cmake" - ], - "propagatedNativeBuildInputs": [], - "propagatedUserEnvPkgs": [], - "propagatedBuildInputs": [], - "name": "kollision-15.04.3", - "src": { - "url": "stable/applications/15.04.3/src/kollision-15.04.3.tar.xz", - "name": "kollision-15.04.3.tar.xz", - "sha256": "0x45mjm6irhgrv0jmpaxa55d38h1m3c4jry5hmv8r8x4c7l7z565" - }, - "buildInputs": [ - "ecm", - "kf5", - "kf5config", - "kf5configwidgets", - "kf5coreaddons", - "kf5dbusaddons", - "kf5i18n", - "kf5kdegames", - "kf5kio", - "kf5newstuff", - "kf5notifyconfig", - "kf5textwidgets", - "kf5widgetsaddons", - "kf5xmlgui", - "phonon4qt5", - "qt5", - "qt5qml", - "qt5quick", - "qt5quickwidgets", - "qt5svg", - "qt5test", - "qt5widgets" - ] - }, - "klines": { - "nativeBuildInputs": [ - "cmake" - ], - "propagatedNativeBuildInputs": [], - "propagatedUserEnvPkgs": [], - "propagatedBuildInputs": [], - "name": "klines-15.04.3", - "src": { - "url": "stable/applications/15.04.3/src/klines-15.04.3.tar.xz", - "name": "klines-15.04.3.tar.xz", - "sha256": "0v5r720i996qq8hrlz8x9avrdh0dnqxbxz7h1wr4mhmz5iqj2s9c" - }, - "buildInputs": [ - "ecm", - "kf5", - "kf5config", - "kf5configwidgets", - "kf5coreaddons", - "kf5dbusaddons", - "kf5guiaddons", - "kf5i18n", - "kf5iconthemes", - "kf5itemviews", - "kf5kdegames", - "kf5kio", - "kf5newstuff", - "kf5service", - "kf5widgetsaddons", - "kf5xmlgui", - "qt5", - "qt5qml", - "qt5quick", - "qt5quickwidgets", - "qt5svg", - "qt5test", - "qt5widgets" - ] - }, - "kde-l10n-ru": { - "nativeBuildInputs": [ - "cmake" - ], - "propagatedNativeBuildInputs": [], - "propagatedUserEnvPkgs": [], - "propagatedBuildInputs": [], - "name": "kde-l10n-ru-15.04.3", - "src": { - "url": "stable/applications/15.04.3/src/kde-l10n/kde-l10n-ru-15.04.3.tar.xz", - "name": "kde-l10n-ru-15.04.3.tar.xz", - "sha256": "0blm1fmvx7i0dzvf46qngq7cb9p16pw93v3j4bf63r24671w40xj" - }, - "buildInputs": [ - "ecm", - "gettext", - "kde4", - "kf5doctools", - "kf5i18n" - ] - }, - "kcalc": { - "nativeBuildInputs": [ - "cmake" - ], - "propagatedNativeBuildInputs": [], - "propagatedUserEnvPkgs": [], - "propagatedBuildInputs": [], - "name": "kcalc-15.04.3", - "src": { - "url": "stable/applications/15.04.3/src/kcalc-15.04.3.tar.xz", - "name": "kcalc-15.04.3.tar.xz", - "sha256": "0hxva8l2x5v6k2ry25zzzral6cdia1ypk1iz37qfnb20myfv7x6q" - }, - "buildInputs": [ - "ecm", - "gmp", - "kf5", - "kf5config", - "kf5configwidgets", - "kf5doctools", - "kf5guiaddons", - "kf5i18n", - "kf5init", - "kf5notifications", - "kf5xmlgui", - "qt5", - "qt5core", - "qt5widgets" - ] - }, - "kde-l10n-mr": { - "nativeBuildInputs": [ - "cmake" - ], - "propagatedNativeBuildInputs": [], - "propagatedUserEnvPkgs": [], - "propagatedBuildInputs": [], - "name": "kde-l10n-mr-15.04.3", - "src": { - "url": "stable/applications/15.04.3/src/kde-l10n/kde-l10n-mr-15.04.3.tar.xz", - "name": "kde-l10n-mr-15.04.3.tar.xz", - "sha256": "1yvjwcdsnf5pf8izb8fifsd2rsrvmkw704iw5m6yzh7fzdy6qyhg" - }, - "buildInputs": [ - "ecm", - "gettext", - "kde4", - "kf5doctools", - "kf5i18n" - ] - }, - "lskat": { - "nativeBuildInputs": [ - "cmake" - ], - "propagatedNativeBuildInputs": [], - "propagatedUserEnvPkgs": [], - "propagatedBuildInputs": [], - "name": "lskat-15.04.3", - "src": { - "url": "stable/applications/15.04.3/src/lskat-15.04.3.tar.xz", - "name": "lskat-15.04.3.tar.xz", - "sha256": "188pq09afxyapwnx7bc4v5hc5224049q2nkywgnl161sl8jhb40v" - }, - "buildInputs": [ - "kde4", - "kdegames" - ] - }, - "kcolorchooser": { - "nativeBuildInputs": [ - "cmake" - ], - "propagatedNativeBuildInputs": [], - "propagatedUserEnvPkgs": [], - "propagatedBuildInputs": [], - "name": "kcolorchooser-15.04.3", - "src": { - "url": "stable/applications/15.04.3/src/kcolorchooser-15.04.3.tar.xz", - "name": "kcolorchooser-15.04.3.tar.xz", - "sha256": "1rq4r3sn3rhd6whqhchzy2cvpqik43naikh8sdzinwpp968sbz0l" - }, - "buildInputs": [ - "kde4" - ] - }, - "kde-l10n-kk": { - "nativeBuildInputs": [ - "cmake" - ], - "propagatedNativeBuildInputs": [], - "propagatedUserEnvPkgs": [], - "propagatedBuildInputs": [], - "name": "kde-l10n-kk-15.04.3", - "src": { - "url": "stable/applications/15.04.3/src/kde-l10n/kde-l10n-kk-15.04.3.tar.xz", - "name": "kde-l10n-kk-15.04.3.tar.xz", - "sha256": "0ywz646pv3dfbhbsijrk7l47l96hw3n7mds2zplmw5624wlfz7dn" - }, - "buildInputs": [ - "ecm", - "gettext", - "kde4", - "kf5doctools", - "kf5i18n" - ] - }, - "kblocks": { - "nativeBuildInputs": [ - "cmake" - ], - "propagatedNativeBuildInputs": [], - "propagatedUserEnvPkgs": [], - "propagatedBuildInputs": [], - "name": "kblocks-15.04.3", - "src": { - "url": "stable/applications/15.04.3/src/kblocks-15.04.3.tar.xz", - "name": "kblocks-15.04.3.tar.xz", - "sha256": "1iizgcj75ayr4ckpw85igcy8r6ia594sshgy1x5yir4i2jiaxr1m" - }, - "buildInputs": [ - "ecm", - "kf5", - "kf5config", - "kf5configwidgets", - "kf5coreaddons", - "kf5dbusaddons", - "kf5i18n", - "kf5itemmodels", - "kf5kdegames", - "kf5kio", - "kf5newstuff", - "kf5notifyconfig", - "kf5textwidgets", - "kf5widgetsaddons", - "kf5windowsystem", - "kf5xmlgui", - "phonon4qt5", - "qt5", - "qt5qml", - "qt5quick", - "qt5quickwidgets", - "qt5svg", - "qt5test", - "qt5widgets" - ] - }, - "kde-l10n-lt": { - "nativeBuildInputs": [ - "cmake" - ], - "propagatedNativeBuildInputs": [], - "propagatedUserEnvPkgs": [], - "propagatedBuildInputs": [], - "name": "kde-l10n-lt-15.04.3", - "src": { - "url": "stable/applications/15.04.3/src/kde-l10n/kde-l10n-lt-15.04.3.tar.xz", - "name": "kde-l10n-lt-15.04.3.tar.xz", - "sha256": "1y8a7py2r3b35kvjmzpw4vgzjjmfhl44bjd0qjsyh4323q6mc4lw" - }, - "buildInputs": [ - "ecm", - "gettext", - "kde4", - "kf5doctools", - "kf5i18n" - ] - }, - "kde-l10n-cs": { - "nativeBuildInputs": [ - "cmake" - ], - "propagatedNativeBuildInputs": [], - "propagatedUserEnvPkgs": [], - "propagatedBuildInputs": [], - "name": "kde-l10n-cs-15.04.3", - "src": { - "url": "stable/applications/15.04.3/src/kde-l10n/kde-l10n-cs-15.04.3.tar.xz", - "name": "kde-l10n-cs-15.04.3.tar.xz", - "sha256": "0pjvyhg2x85l2ns5zhhyn4ij26l3kaq7yf4nb3qh67radqm4kd3w" - }, - "buildInputs": [ - "ecm", - "gettext", - "kde4", - "kf5doctools", - "kf5i18n" - ] - }, - "kblackbox": { - "nativeBuildInputs": [ - "cmake" - ], - "propagatedNativeBuildInputs": [], - "propagatedUserEnvPkgs": [], - "propagatedBuildInputs": [], - "name": "kblackbox-15.04.3", - "src": { - "url": "stable/applications/15.04.3/src/kblackbox-15.04.3.tar.xz", - "name": "kblackbox-15.04.3.tar.xz", - "sha256": "1al2qzfy9773zqs6f98zqi110dmzlaa60a45pzfmmamjlh0nf5ay" - }, - "buildInputs": [ - "ecm", - "kf5", - "kf5config", - "kf5coreaddons", - "kf5guiaddons", - "kf5i18n", - "kf5iconthemes", - "kf5kdegames", - "kf5xmlgui", - "qt5", - "qt5svg", - "qt5widgets" - ] - }, - "libkdeedu": { - "nativeBuildInputs": [ - "cmake" - ], - "propagatedNativeBuildInputs": [], - "propagatedUserEnvPkgs": [], - "propagatedBuildInputs": [], - "name": "libkdeedu-15.04.3", - "src": { - "url": "stable/applications/15.04.3/src/libkdeedu-15.04.3.tar.xz", - "name": "libkdeedu-15.04.3.tar.xz", - "sha256": "0sm3aqchxmv6nap003mpklk6yrkqlqrp5zlyvc6hn764mjm80mxr" - }, - "buildInputs": [ - "kde4" - ] - }, - "amor": { - "nativeBuildInputs": [ - "cmake" - ], - "propagatedNativeBuildInputs": [], - "propagatedUserEnvPkgs": [], - "propagatedBuildInputs": [], - "name": "amor-15.04.3", - "src": { - "url": "stable/applications/15.04.3/src/amor-15.04.3.tar.xz", - "name": "amor-15.04.3.tar.xz", - "sha256": "197vvdw6zsn19j5xnddaz60xsmk6hv4846hxvqsybi3k0sldnb8f" - }, - "buildInputs": [ - "kde4" - ] - }, - "kde-l10n-eu": { - "nativeBuildInputs": [ - "cmake" - ], - "propagatedNativeBuildInputs": [], - "propagatedUserEnvPkgs": [], - "propagatedBuildInputs": [], - "name": "kde-l10n-eu-15.04.3", - "src": { - "url": "stable/applications/15.04.3/src/kde-l10n/kde-l10n-eu-15.04.3.tar.xz", - "name": "kde-l10n-eu-15.04.3.tar.xz", - "sha256": "0cq453v58yw4nkj3a3zmk0994779f6ay1vvgmk8fz6ychy1sx4mw" - }, - "buildInputs": [ - "ecm", - "gettext", - "kde4", - "kf5doctools", - "kf5i18n" - ] - }, - "kamera": { - "nativeBuildInputs": [ - "cmake" - ], - "propagatedNativeBuildInputs": [], - "propagatedUserEnvPkgs": [], - "propagatedBuildInputs": [], - "name": "kamera-15.04.3", - "src": { - "url": "stable/applications/15.04.3/src/kamera-15.04.3.tar.xz", - "name": "kamera-15.04.3.tar.xz", - "sha256": "1xngcscz2cj3x292gf1fn6yigbq7nafwf4k3f2dgghb8yxnxzqrz" - }, - "buildInputs": [ - "gphoto2", - "kde4" - ] - }, - "pairs": { - "nativeBuildInputs": [ - "cmake" - ], - "propagatedNativeBuildInputs": [], - "propagatedUserEnvPkgs": [], - "propagatedBuildInputs": [], - "name": "pairs-15.04.3", - "src": { - "url": "stable/applications/15.04.3/src/pairs-15.04.3.tar.xz", - "name": "pairs-15.04.3.tar.xz", - "sha256": "1pzmxahr82rwahvcn8573qnw843nfyrqpmffngz02lj7fhxc7n9v" - }, - "buildInputs": [ - "kde4" - ] - }, - "dragon": { - "nativeBuildInputs": [ - "cmake" - ], - "propagatedNativeBuildInputs": [], - "propagatedUserEnvPkgs": [], - "propagatedBuildInputs": [], - "name": "dragon-15.04.3", - "src": { - "url": "stable/applications/15.04.3/src/dragon-15.04.3.tar.xz", - "name": "dragon-15.04.3.tar.xz", - "sha256": "0i1zl23hsf9rykd415xjh5p2v1cmkifwljxhvqyhn1x4bv729mk1" - }, - "buildInputs": [ - "kde4" - ] - }, - "kmplot": { - "nativeBuildInputs": [ - "cmake" - ], - "propagatedNativeBuildInputs": [], - "propagatedUserEnvPkgs": [], - "propagatedBuildInputs": [], - "name": "kmplot-15.04.3", - "src": { - "url": "stable/applications/15.04.3/src/kmplot-15.04.3.tar.xz", - "name": "kmplot-15.04.3.tar.xz", - "sha256": "1ymhw5iwdksbh6il0ivcagmhv0qchxmh17bawkd20bn2yh8w9njd" - }, - "buildInputs": [ - "ecm", - "kf5", - "kf5guiaddons", - "kf5i18n", - "kf5kdelibs4support", - "kf5parts", - "kf5widgetsaddons", - "qt5", - "qt5core", - "qt5gui", - "qt5printsupport", - "qt5svg", - "qt5widgets" - ] - }, - "kde-base-artwork": { - "nativeBuildInputs": [ - "cmake" - ], - "propagatedNativeBuildInputs": [], - "propagatedUserEnvPkgs": [], - "propagatedBuildInputs": [], - "name": "kde-base-artwork-15.04.3", - "src": { - "url": "stable/applications/15.04.3/src/kde-base-artwork-15.04.3.tar.xz", - "name": "kde-base-artwork-15.04.3.tar.xz", - "sha256": "10g3335ghz4pkyqqym8ay7lm6aw85gkk1y8bykpskyzpgv9kpc7r" - }, - "buildInputs": [ - "kde4" - ] - }, - "blinken": { - "nativeBuildInputs": [ - "cmake" - ], - "propagatedNativeBuildInputs": [], - "propagatedUserEnvPkgs": [], - "propagatedBuildInputs": [], - "name": "blinken-15.04.3", - "src": { - "url": "stable/applications/15.04.3/src/blinken-15.04.3.tar.xz", - "name": "blinken-15.04.3.tar.xz", - "sha256": "0ngg0l75vshcw288kd1141038dq1ayggid6g9r1c6djm7is17fn0" - }, - "buildInputs": [ - "ecm", - "kf5", - "kf5dbusaddons", - "kf5doctools", - "kf5guiaddons", - "kf5i18n", - "kf5xmlgui", - "phonon4qt5", - "qt5", - "qt5core", - "qt5svg", - "qt5widgets" - ] - }, - "konquest": { - "nativeBuildInputs": [ - "cmake" - ], - "propagatedNativeBuildInputs": [], - "propagatedUserEnvPkgs": [], - "propagatedBuildInputs": [], - "name": "konquest-15.04.3", - "src": { - "url": "stable/applications/15.04.3/src/konquest-15.04.3.tar.xz", - "name": "konquest-15.04.3.tar.xz", - "sha256": "092z41v548yns87n677ic3jqcjs11lya7znakw1wg8il2iq4p8ad" - }, - "buildInputs": [ - "kde4", - "kdegames" - ] - }, - "kde-l10n-he": { - "nativeBuildInputs": [ - "cmake" - ], - "propagatedNativeBuildInputs": [], - "propagatedUserEnvPkgs": [], - "propagatedBuildInputs": [], - "name": "kde-l10n-he-15.04.3", - "src": { - "url": "stable/applications/15.04.3/src/kde-l10n/kde-l10n-he-15.04.3.tar.xz", - "name": "kde-l10n-he-15.04.3.tar.xz", - "sha256": "083c5gxxgvibg5xryyh919h4sli3z129cwqi8x9bjzmqdjd1b3a7" - }, - "buildInputs": [ - "ecm", - "gettext", - "kde4", - "kf5doctools", - "kf5i18n" - ] - }, - "bovo": { - "nativeBuildInputs": [ - "cmake" - ], - "propagatedNativeBuildInputs": [], - "propagatedUserEnvPkgs": [], - "propagatedBuildInputs": [], - "name": "bovo-15.04.3", - "src": { - "url": "stable/applications/15.04.3/src/bovo-15.04.3.tar.xz", - "name": "bovo-15.04.3.tar.xz", - "sha256": "0fjvxvz8f3vr8sv8grpkwyhfvbcv7hayvsvmw7f1gpiamq7m7aab" - }, - "buildInputs": [ - "ecm", - "kf5", - "kf5coreaddons", - "kf5declarative", - "kf5kdegames", - "kf5newstuff", - "kf5xmlgui", - "qt5", - "qt5concurrent", - "qt5qml", - "qt5quick", - "qt5quickwidgets", - "qt5svg", - "qt5widgets" - ] - }, - "ktimer": { - "nativeBuildInputs": [ - "cmake" - ], - "propagatedNativeBuildInputs": [], - "propagatedUserEnvPkgs": [], - "propagatedBuildInputs": [], - "name": "ktimer-15.04.3", - "src": { - "url": "stable/applications/15.04.3/src/ktimer-15.04.3.tar.xz", - "name": "ktimer-15.04.3.tar.xz", - "sha256": "1pixq0nh6n4rm4pvpabrly2wxsq58a719k7fj70w6a541chsmy77" - }, - "buildInputs": [ - "ecm", - "kf5", - "kf5dbusaddons", - "kf5doctools", - "kf5i18n", - "kf5iconthemes", - "kf5kio", - "kf5notifications", - "kf5widgetsaddons", - "kf5xmlgui", - "qt5", - "qt5core", - "qt5widgets" - ] - }, - "kde-l10n-hu": { - "nativeBuildInputs": [ - "cmake" - ], - "propagatedNativeBuildInputs": [], - "propagatedUserEnvPkgs": [], - "propagatedBuildInputs": [], - "name": "kde-l10n-hu-15.04.3", - "src": { - "url": "stable/applications/15.04.3/src/kde-l10n/kde-l10n-hu-15.04.3.tar.xz", - "name": "kde-l10n-hu-15.04.3.tar.xz", - "sha256": "0ql1yh5hmzdxmr6dnzsl08rxmvgrb4zcs6rk1r0jqkcfnwlhdf53" - }, - "buildInputs": [ - "ecm", - "gettext", - "kde4", - "kf5doctools", - "kf5i18n" - ] - }, - "kde-l10n-ro": { - "nativeBuildInputs": [ - "cmake" - ], - "propagatedNativeBuildInputs": [], - "propagatedUserEnvPkgs": [], - "propagatedBuildInputs": [], - "name": "kde-l10n-ro-15.04.3", - "src": { - "url": "stable/applications/15.04.3/src/kde-l10n/kde-l10n-ro-15.04.3.tar.xz", - "name": "kde-l10n-ro-15.04.3.tar.xz", - "sha256": "0ix4p8alq6xrsgbwv23xijcnwpd8gcf96zsd59bfpmvykxqmwpdq" - }, - "buildInputs": [ - "ecm", - "gettext", - "kde4", - "kf5doctools", - "kf5i18n" - ] - }, - "kde-l10n-sv": { - "nativeBuildInputs": [ - "cmake" - ], - "propagatedNativeBuildInputs": [], - "propagatedUserEnvPkgs": [], - "propagatedBuildInputs": [], - "name": "kde-l10n-sv-15.04.3", - "src": { - "url": "stable/applications/15.04.3/src/kde-l10n/kde-l10n-sv-15.04.3.tar.xz", - "name": "kde-l10n-sv-15.04.3.tar.xz", - "sha256": "0qpkl0dqw6jwb0xy1adjibhabga32hzk0rhwl75dw7bw257aka6f" - }, - "buildInputs": [ - "ecm", - "gettext", - "kde4", - "kf5doctools", - "kf5i18n" - ] - }, - "kgamma": { - "nativeBuildInputs": [ - "cmake" - ], - "propagatedNativeBuildInputs": [], - "propagatedUserEnvPkgs": [], - "propagatedBuildInputs": [], - "name": "kgamma-15.04.3", - "src": { - "url": "stable/applications/15.04.3/src/kgamma-15.04.3.tar.xz", - "name": "kgamma-15.04.3.tar.xz", - "sha256": "0wdx2xv2jkhdlbcy46ylg6c2aib4rj1gfbwc7zxwfcm52amra6a8" - }, - "buildInputs": [ - "kde4", - "x11" - ] - }, - "kanagram": { - "nativeBuildInputs": [ - "cmake" - ], - "propagatedNativeBuildInputs": [], - "propagatedUserEnvPkgs": [], - "propagatedBuildInputs": [], - "name": "kanagram-15.04.3", - "src": { - "url": "stable/applications/15.04.3/src/kanagram-15.04.3.tar.xz", - "name": "kanagram-15.04.3.tar.xz", - "sha256": "18aix8r0ziprk2i8hdp6jis2i5b23q2r46x3y4lncgxs1ldgv74b" - }, - "buildInputs": [ - "ecm", - "kf5", - "kf5config", - "kf5configwidgets", - "kf5coreaddons", - "kf5crash", - "kf5declarative", - "kf5doctools", - "kf5i18n", - "kf5kio", - "kf5newstuff", - "kf5sonnet", - "libkeduvocdocument", - "qt5", - "qt5core", - "qt5opengl", - "qt5optional_components", - "qt5qml", - "qt5quick", - "qt5texttospeech" - ] - }, - "kstars": { - "nativeBuildInputs": [ - "cmake" - ], - "propagatedNativeBuildInputs": [], - "propagatedUserEnvPkgs": [], - "propagatedBuildInputs": [], - "name": "kstars-15.04.3", - "src": { - "url": "stable/applications/15.04.3/src/kstars-15.04.3.tar.xz", - "name": "kstars-15.04.3.tar.xz", - "sha256": "1lnspbgg037id7jq2fjf3p7rr819jd0h4hs21hxqifcsx2qm90qp" - }, - "buildInputs": [ - "astrometrynet", - "cfitsio", - "ecm", - "eigen3", - "indi", - "kf5", - "kf5config", - "kf5dbusaddons", - "kf5doctools", - "kf5guiaddons", - "kf5i18n", - "kf5iconthemes", - "kf5init", - "kf5jobwidgets", - "kf5kio", - "kf5newstuff", - "kf5plotting", - "kf5texteditor", - "kf5widgetsaddons", - "kf5windowsystem", - "kf5xmlgui", - "opengl", - "qt5", - "qt5gui", - "qt5multimedia", - "qt5opengl", - "qt5printsupport", - "qt5qml", - "qt5quick", - "qt5sql", - "qt5svg", - "qt5test", - "qt5xml", - "wcslib", - "xplanet" - ] - }, - "kdeartwork": { - "nativeBuildInputs": [ - "cmake" - ], - "propagatedNativeBuildInputs": [], - "propagatedUserEnvPkgs": [], - "propagatedBuildInputs": [], - "name": "kdeartwork-15.04.3", - "src": { - "url": "stable/applications/15.04.3/src/kdeartwork-15.04.3.tar.xz", - "name": "kdeartwork-15.04.3.tar.xz", - "sha256": "1ay8xwnniy9gd4vfnnd9h5i1yybv4w5fjpycn58xdkhwf0zi229p" - }, - "buildInputs": [ - "eigen3", - "kde4", - "kde4workspace", - "kexiv2", - "opengl", - "xscreensaver" - ] - }, - "kfloppy": { - "nativeBuildInputs": [ - "cmake" - ], - "propagatedNativeBuildInputs": [], - "propagatedUserEnvPkgs": [], - "propagatedBuildInputs": [], - "name": "kfloppy-15.04.3", - "src": { - "url": "stable/applications/15.04.3/src/kfloppy-15.04.3.tar.xz", - "name": "kfloppy-15.04.3.tar.xz", - "sha256": "0jzvcm1kkb0zzvmb96zl2xv0ya4a3ilirqq8zwjgzh36s06y1h7j" - }, - "buildInputs": [ - "kde4" - ] - }, - "jovie": { - "nativeBuildInputs": [ - "cmake" - ], - "propagatedNativeBuildInputs": [], - "propagatedUserEnvPkgs": [], - "propagatedBuildInputs": [], - "name": "jovie-15.04.3", - "src": { - "url": "stable/applications/15.04.3/src/jovie-15.04.3.tar.xz", - "name": "jovie-15.04.3.tar.xz", - "sha256": "02bfx985wggmb8bbca6yz5hgfjxg0zniqsbxap3h4baiba5n2rpn" - }, - "buildInputs": [ - "kde4", - "qt4", - "speechd" - ] - }, - "kde-l10n-zh_TW": { - "nativeBuildInputs": [ - "cmake" - ], - "propagatedNativeBuildInputs": [], - "propagatedUserEnvPkgs": [], - "propagatedBuildInputs": [], - "name": "kde-l10n-zh_TW-15.04.3", - "src": { - "url": "stable/applications/15.04.3/src/kde-l10n/kde-l10n-zh_TW-15.04.3.tar.xz", - "name": "kde-l10n-zh_TW-15.04.3.tar.xz", - "sha256": "1p19mzpa0cm7x5afc6x9j7xr83850hrz9fvn27h4gdc8s0gbmc9m" - }, - "buildInputs": [ - "ecm", - "gettext", - "kde4", - "kf5doctools", - "kf5i18n" - ] - }, - "kscd": { - "nativeBuildInputs": [ - "cmake" - ], - "propagatedNativeBuildInputs": [], - "propagatedUserEnvPkgs": [], - "propagatedBuildInputs": [], - "name": "kscd-15.04.3", - "src": { - "url": "stable/applications/15.04.3/src/kscd-15.04.3.tar.xz", - "name": "kscd-15.04.3.tar.xz", - "sha256": "0dy41w2vc53qks0z19azrwmf6p1y4jrh7bycj81prh2dinnpkra1" - }, - "buildInputs": [ - "alsa", - "kde4", - "musicbrainz3", - "qt4" - ] - }, - "kde-l10n-uk": { - "nativeBuildInputs": [ - "cmake" - ], - "propagatedNativeBuildInputs": [], - "propagatedUserEnvPkgs": [], - "propagatedBuildInputs": [], - "name": "kde-l10n-uk-15.04.3", - "src": { - "url": "stable/applications/15.04.3/src/kde-l10n/kde-l10n-uk-15.04.3.tar.xz", - "name": "kde-l10n-uk-15.04.3.tar.xz", - "sha256": "19xwxm3bjwjxzr7axr5my6n6pm12jn9gz6xrxxjpdnf1b8386y48" - }, - "buildInputs": [ - "ecm", - "gettext", - "kde4", - "kf5doctools", - "kf5i18n" - ] - }, - "konsole": { - "nativeBuildInputs": [ - "cmake" - ], - "propagatedNativeBuildInputs": [], - "propagatedUserEnvPkgs": [], - "propagatedBuildInputs": [], - "name": "konsole-15.04.3", - "src": { - "url": "stable/applications/15.04.3/src/konsole-15.04.3.tar.xz", - "name": "konsole-15.04.3.tar.xz", - "sha256": "147cx1ana0z5hg0vx0zgqavizk65s17a2pmyxd3fhdy3ad3c2ld0" - }, - "buildInputs": [ - "ecm", - "kf5", - "kf5bookmarks", - "kf5completion", - "kf5config", - "kf5configwidgets", - "kf5coreaddons", - "kf5doctools", - "kf5guiaddons", - "kf5i18n", - "kf5iconthemes", - "kf5init", - "kf5kdelibs4support", - "kf5kio", - "kf5notifications", - "kf5notifyconfig", - "kf5parts", - "kf5pty", - "kf5service", - "kf5textwidgets", - "kf5widgetsaddons", - "kf5windowsystem", - "kf5xmlgui", - "qt5", - "qt5core", - "qt5dbus", - "qt5script", - "qt5test", - "qt5widgets", - "x11" - ] - }, - "kruler": { - "nativeBuildInputs": [ - "cmake" - ], - "propagatedNativeBuildInputs": [], - "propagatedUserEnvPkgs": [], - "propagatedBuildInputs": [], - "name": "kruler-15.04.3", - "src": { - "url": "stable/applications/15.04.3/src/kruler-15.04.3.tar.xz", - "name": "kruler-15.04.3.tar.xz", - "sha256": "0ljssj6fqbpzsc7rvm8vyy6mpzll443w1xxbrima0dgvdc656lx0" - }, - "buildInputs": [ - "ecm", - "kf5", - "kf5doctools", - "kf5i18n", - "kf5notifications", - "kf5windowsystem", - "kf5xmlgui", - "qt5", - "qt5core", - "qt5widgets", - "qt5x11extras", - "x11", - "xcb" - ] - }, - "kubrick": { - "nativeBuildInputs": [ - "cmake" - ], - "propagatedNativeBuildInputs": [], - "propagatedUserEnvPkgs": [], - "propagatedBuildInputs": [], - "name": "kubrick-15.04.3", - "src": { - "url": "stable/applications/15.04.3/src/kubrick-15.04.3.tar.xz", - "name": "kubrick-15.04.3.tar.xz", - "sha256": "1gvamla9pxd0dj0yc8108pr31f1yf79x6ng87gmbi10nriw4dz27" - }, - "buildInputs": [ - "kde4", - "kdegames", - "opengl" - ] - }, - "kdenetwork-filesharing": { - "nativeBuildInputs": [ - "cmake" - ], - "propagatedNativeBuildInputs": [], - "propagatedUserEnvPkgs": [], - "propagatedBuildInputs": [], - "name": "kdenetwork-filesharing-15.04.3", - "src": { - "url": "stable/applications/15.04.3/src/kdenetwork-filesharing-15.04.3.tar.xz", - "name": "kdenetwork-filesharing-15.04.3.tar.xz", - "sha256": "083j6159sjcq0d8j2n6id6fyha5a4wk4ii7sl177md63xsl4xax1" - }, - "buildInputs": [ - "kde4" - ] - }, - "dolphin-plugins": { - "nativeBuildInputs": [ - "cmake" - ], - "propagatedNativeBuildInputs": [], - "propagatedUserEnvPkgs": [], - "propagatedBuildInputs": [], - "name": "dolphin-plugins-15.04.3", - "src": { - "url": "stable/applications/15.04.3/src/dolphin-plugins-15.04.3.tar.xz", - "name": "dolphin-plugins-15.04.3.tar.xz", - "sha256": "0pfrydfb7qn3r5zjs6x83i05fqvzizrw0idh1faqv5br4hra9pzp" - }, - "buildInputs": [ - "kde4", - "libkonq" - ] - }, - "kmines": { - "nativeBuildInputs": [ - "cmake" - ], - "propagatedNativeBuildInputs": [], - "propagatedUserEnvPkgs": [], - "propagatedBuildInputs": [], - "name": "kmines-15.04.3", - "src": { - "url": "stable/applications/15.04.3/src/kmines-15.04.3.tar.xz", - "name": "kmines-15.04.3.tar.xz", - "sha256": "0p8bfk8brh9y32qk9rpqcvpxk8if3y2m9mzh5mmg6d5bqv4r8v5a" - }, - "buildInputs": [ - "ecm", - "kf5", - "kf5config", - "kf5configwidgets", - "kf5coreaddons", - "kf5dbusaddons", - "kf5i18n", - "kf5kdegames", - "kf5kio", - "kf5notifyconfig", - "kf5textwidgets", - "kf5widgetsaddons", - "kf5xmlgui", - "phonon4qt5", - "qt5", - "qt5qml", - "qt5test", - "qt5widgets" - ] - }, - "kspaceduel": { - "nativeBuildInputs": [ - "cmake" - ], - "propagatedNativeBuildInputs": [], - "propagatedUserEnvPkgs": [], - "propagatedBuildInputs": [], - "name": "kspaceduel-15.04.3", - "src": { - "url": "stable/applications/15.04.3/src/kspaceduel-15.04.3.tar.xz", - "name": "kspaceduel-15.04.3.tar.xz", - "sha256": "1w4b1vd6p16fg7j08sbmhd3cqd8n1y6xm761yziz20mkkgr1yvjm" - }, - "buildInputs": [ - "kde4", - "kdegames" - ] - }, - "kde-l10n-tr": { - "nativeBuildInputs": [ - "cmake" - ], - "propagatedNativeBuildInputs": [], - "propagatedUserEnvPkgs": [], - "propagatedBuildInputs": [], - "name": "kde-l10n-tr-15.04.3", - "src": { - "url": "stable/applications/15.04.3/src/kde-l10n/kde-l10n-tr-15.04.3.tar.xz", - "name": "kde-l10n-tr-15.04.3.tar.xz", - "sha256": "0p201cjaf67ixcfdmqvxmigz5frly3w036ry15hmkqq3l2hz6q4l" - }, - "buildInputs": [ - "ecm", - "gettext", - "kde4", - "kf5doctools", - "kf5i18n" - ] - }, - "libkdcraw": { - "nativeBuildInputs": [ - "cmake" - ], - "propagatedNativeBuildInputs": [], - "propagatedUserEnvPkgs": [], - "propagatedBuildInputs": [], - "name": "libkdcraw-15.04.3", - "src": { - "url": "stable/applications/15.04.3/src/libkdcraw-15.04.3.tar.xz", - "name": "libkdcraw-15.04.3.tar.xz", - "sha256": "0hi5i07qzvw8mbk1yrv8w8l5zhbzgnfvvpv44ym56pcz4a9fmjfg" - }, - "buildInputs": [ - "kde4", - "libraw" - ] - }, - "ktp-approver": { - "nativeBuildInputs": [ - "cmake" - ], - "propagatedNativeBuildInputs": [], - "propagatedUserEnvPkgs": [], - "propagatedBuildInputs": [], - "name": "ktp-approver-15.04.3", - "src": { - "url": "stable/applications/15.04.3/src/ktp-approver-15.04.3.tar.xz", - "name": "ktp-approver-15.04.3.tar.xz", - "sha256": "051398wxm9cfnid2dvi4sycb61iygj8smg8f5xdfm31mfxdva3hn" - }, - "buildInputs": [ - "ecm", - "kf5", - "kf5config", - "kf5dbusaddons", - "kf5i18n", - "kf5notifications", - "kf5service", - "qt5", - "qt5network", - "qt5widgets", - "telepathyqt5" - ] - }, - "ktp-contact-runner": { - "nativeBuildInputs": [ - "cmake" - ], - "propagatedNativeBuildInputs": [], - "propagatedUserEnvPkgs": [], - "propagatedBuildInputs": [], - "name": "ktp-contact-runner-15.04.3", - "src": { - "url": "stable/applications/15.04.3/src/ktp-contact-runner-15.04.3.tar.xz", - "name": "ktp-contact-runner-15.04.3.tar.xz", - "sha256": "0bv83if7mwqwsblpnmdf87k6fvvjb21i6kwa7i1q9vnr7avka0yg" - }, - "buildInputs": [ - "ecm", - "kf5", - "kf5i18n", - "kf5runner", - "kf5service", - "ktp", - "qt5", - "qt5core", - "qt5dbus", - "qt5network", - "qt5widgets" - ] - }, - "kdepim-runtime": { - "nativeBuildInputs": [ - "_testrunner", - "cmake" - ], - "propagatedNativeBuildInputs": [], - "propagatedUserEnvPkgs": [], - "propagatedBuildInputs": [], - "name": "kdepim-runtime-4.14.10", - "src": { - "url": "stable/applications/15.04.3/src/kdepim-runtime-4.14.10.tar.xz", - "name": "kdepim-runtime-4.14.10.tar.xz", - "sha256": "0lndmza6x4969g9dgyl3p5zqh371nm1x8gciqy13wv34g0r1x3fn" - }, - "buildInputs": [ - "accountsqt", - "akonadi", - "boost", - "kde4", - "kdepimlibs", - "libkfbapi", - "libkgapi2", - "libkolab", - "libkolabxml", - "qjson", - "qt4", - "sasl2", - "sharedmimeinfo", - "signonqt", - "xsltproc" - ] - }, - "print-manager": { - "nativeBuildInputs": [ - "cmake" - ], - "propagatedNativeBuildInputs": [], - "propagatedUserEnvPkgs": [], - "propagatedBuildInputs": [], - "name": "print-manager-15.04.3", - "src": { - "url": "stable/applications/15.04.3/src/print-manager-15.04.3.tar.xz", - "name": "print-manager-15.04.3.tar.xz", - "sha256": "15mmypcxmgrypapss3nzi3vjrbmw7f547jbpbmsprcpij1klip6q" - }, - "buildInputs": [ - "cups", - "ecm", - "kf5", - "kf5config", - "kf5configwidgets", - "kf5coreaddons", - "kf5dbusaddons", - "kf5i18n", - "kf5iconthemes", - "kf5itemviews", - "kf5kcmutils", - "kf5kio", - "kf5notifications", - "kf5plasma", - "kf5widgetsaddons", - "kf5windowsystem", - "qt5", - "qt5core", - "qt5dbus", - "qt5network", - "qt5qml", - "qt5quick", - "qt5widgets" - ] - }, - "oxygen-icons": { - "nativeBuildInputs": [ - "cmake" - ], - "propagatedNativeBuildInputs": [], - "propagatedUserEnvPkgs": [], - "propagatedBuildInputs": [], - "name": "oxygen-icons-15.04.3", - "src": { - "url": "stable/applications/15.04.3/src/oxygen-icons-15.04.3.tar.xz", - "name": "oxygen-icons-15.04.3.tar.xz", - "sha256": "07npzyrbw2fn1qd04imnv7cz0sisk7yllrwr2y21yr2i1gbncfqk" - }, - "buildInputs": [] - }, - "umbrello": { - "nativeBuildInputs": [ - "cmake" - ], - "propagatedNativeBuildInputs": [], - "propagatedUserEnvPkgs": [], - "propagatedBuildInputs": [], - "name": "umbrello-15.04.3", - "src": { - "url": "stable/applications/15.04.3/src/umbrello-15.04.3.tar.xz", - "name": "umbrello-15.04.3.tar.xz", - "sha256": "0qil8814zc3pa11xqf0lz3lwkvp57j3iahhjzaw7famn8vfzjpmh" - }, - "buildInputs": [ - "kde4", - "libxml2", - "libxslt" - ] - }, - "kde-l10n-ar": { - "nativeBuildInputs": [ - "cmake" - ], - "propagatedNativeBuildInputs": [], - "propagatedUserEnvPkgs": [], - "propagatedBuildInputs": [], - "name": "kde-l10n-ar-15.04.3", - "src": { - "url": "stable/applications/15.04.3/src/kde-l10n/kde-l10n-ar-15.04.3.tar.xz", - "name": "kde-l10n-ar-15.04.3.tar.xz", - "sha256": "19kzdyjcrbjp5hwccvzyi2fd3gy3pm8yay64jpg9iln28ahzbx3b" - }, - "buildInputs": [ - "ecm", - "gettext", - "kde4", - "kf5doctools", - "kf5i18n" - ] - }, - "ktp-filetransfer-handler": { - "nativeBuildInputs": [ - "cmake" - ], - "propagatedNativeBuildInputs": [], - "propagatedUserEnvPkgs": [], - "propagatedBuildInputs": [], - "name": "ktp-filetransfer-handler-15.04.3", - "src": { - "url": "stable/applications/15.04.3/src/ktp-filetransfer-handler-15.04.3.tar.xz", - "name": "ktp-filetransfer-handler-15.04.3.tar.xz", - "sha256": "12z8zcrj2nhlhh1kyx565aaacczh7884hnid6rzrb2fmm58sx39h" - }, - "buildInputs": [ - "ecm", - "kf5", - "kf5config", - "kf5coreaddons", - "kf5i18n", - "kf5kio", - "ktp", - "qt5", - "qt5core", - "qt5dbus", - "qt5widgets" - ] - }, - "kdepimlibs": { - "nativeBuildInputs": [ - "_testrunner", - "cmake", - "perl_executable" - ], - "propagatedNativeBuildInputs": [], - "propagatedUserEnvPkgs": [], - "propagatedBuildInputs": [], - "name": "kdepimlibs-4.14.10", - "src": { - "url": "stable/applications/15.04.3/src/kdepimlibs-4.14.10.tar.xz", - "name": "kdepimlibs-4.14.10.tar.xz", - "sha256": "1hl4wmdsp3lswvzvspy8h9x31n38z9gj6l50plhz3v6nmna9dk68" - }, - "buildInputs": [ - "akonadi", - "boost", - "gpgme", - "kde4", - "ldap", - "libical", - "libxml2", - "libxslt", - "prison", - "qjson", - "sasl2", - "sharedmimeinfo", - "xsltproc" - ] - }, - "step": { - "nativeBuildInputs": [ - "cmake" - ], - "propagatedNativeBuildInputs": [], - "propagatedUserEnvPkgs": [], - "propagatedBuildInputs": [], - "name": "step-15.04.3", - "src": { - "url": "stable/applications/15.04.3/src/step-15.04.3.tar.xz", - "name": "step-15.04.3.tar.xz", - "sha256": "1nnjyw4jrqwdx0n34xw897kwq543vzyia8csyiadiqdq9hyzmlpg" - }, - "buildInputs": [ - "ecm", - "eigen3", - "gsl", - "kf5", - "kf5config", - "kf5doctools", - "kf5kdelibs4support", - "kf5khtml", - "kf5newstuff", - "kf5plotting", - "pythoninterp", - "qalculate", - "qt5", - "qt5opengl", - "qt5printsupport", - "qt5qml", - "qt5quick", - "qt5svg", - "qt5test", - "qt5xml" - ] - }, - "kmousetool": { - "nativeBuildInputs": [ - "cmake" - ], - "propagatedNativeBuildInputs": [], - "propagatedUserEnvPkgs": [], - "propagatedBuildInputs": [], - "name": "kmousetool-15.04.3", - "src": { - "url": "stable/applications/15.04.3/src/kmousetool-15.04.3.tar.xz", - "name": "kmousetool-15.04.3.tar.xz", - "sha256": "1allf52fw55fcwxzg43cqjhfan060xyv4avmqjf43bn23h25fmjs" - }, - "buildInputs": [ - "kde4" - ] - }, - "kde-l10n-ja": { - "nativeBuildInputs": [ - "cmake" - ], - "propagatedNativeBuildInputs": [], - "propagatedUserEnvPkgs": [], - "propagatedBuildInputs": [], - "name": "kde-l10n-ja-15.04.3", - "src": { - "url": "stable/applications/15.04.3/src/kde-l10n/kde-l10n-ja-15.04.3.tar.xz", - "name": "kde-l10n-ja-15.04.3.tar.xz", - "sha256": "1423jd7lkldnqslvww1ypvmdgzbydlibjy19gmrazlsnmfrp6zzs" - }, - "buildInputs": [ - "ecm", - "gettext", - "kde4", - "kf5doctools", - "kf5i18n" - ] - }, - "kdenlive": { - "nativeBuildInputs": [ - "cmake" - ], - "propagatedNativeBuildInputs": [], - "propagatedUserEnvPkgs": [], - "propagatedBuildInputs": [], - "name": "kdenlive-15.04.3", - "src": { - "url": "stable/applications/15.04.3/src/kdenlive-15.04.3.tar.xz", - "name": "kdenlive-15.04.3.tar.xz", - "sha256": "17v5r0fcb0j52a89v6ygsbap03cg4ah5v5jqy2lpck8y57vslvgv" - }, - "buildInputs": [ - "ecm", - "git", - "kf5", - "kf5archive", - "kf5bookmarks", - "kf5config", - "kf5configwidgets", - "kf5coreaddons", - "kf5dbusaddons", - "kf5doctools", - "kf5guiaddons", - "kf5iconthemes", - "kf5kio", - "kf5newstuff", - "kf5notifications", - "kf5notifyconfig", - "kf5plotting", - "kf5textwidgets", - "kf5widgetsaddons", - "kf5xmlgui", - "libv4l2", - "mlt", - "opengl", - "qt5", - "qt5core", - "qt5dbus", - "qt5opengl", - "qt5script", - "qt5svg", - "qt5test", - "qt5widgets", - "sdl", - "sharedmimeinfo" - ] - }, - "kbreakout": { - "nativeBuildInputs": [ - "cmake" - ], - "propagatedNativeBuildInputs": [], - "propagatedUserEnvPkgs": [], - "propagatedBuildInputs": [], - "name": "kbreakout-15.04.3", - "src": { - "url": "stable/applications/15.04.3/src/kbreakout-15.04.3.tar.xz", - "name": "kbreakout-15.04.3.tar.xz", - "sha256": "1wpc1r8xgz985514iiym49268rn4qa6msbslmc55r6bgyawjm1g1" - }, - "buildInputs": [ - "ecm", - "kf5", - "kf5completion", - "kf5config", - "kf5configwidgets", - "kf5coreaddons", - "kf5dbusaddons", - "kf5guiaddons", - "kf5i18n", - "kf5iconthemes", - "kf5jobwidgets", - "kf5kdegames", - "kf5kio", - "kf5service", - "kf5widgetsaddons", - "kf5xmlgui", - "qt5", - "qt5qml", - "qt5quick", - "qt5quickwidgets", - "qt5svg", - "qt5widgets" - ] - }, - "kde-workspace": { - "nativeBuildInputs": [ - "cmake" - ], - "propagatedNativeBuildInputs": [], - "propagatedUserEnvPkgs": [], - "propagatedBuildInputs": [], - "name": "kde-workspace-4.11.21", - "src": { - "url": "stable/applications/15.04.3/src/kde-workspace-4.11.21.tar.xz", - "name": "kde-workspace-4.11.21.tar.xz", - "sha256": "13vwgzz838nlqryh8nhlx70c5msyl5alrqdqlcamncxg0a4cd5ki" - }, - "buildInputs": [ - "akonadi", - "boost", - "dbusmenuqt", - "fontconfig", - "freetype", - "glib2", - "jpeg", - "kactivities", - "kde4", - "kdeclarative", - "kdepimlibs", - "libgps", - "nepomukcore", - "opengl", - "opengles", - "pciutils", - "png", - "prison", - "pythonlibrary", - "qalculate", - "qimageblitz", - "qjson", - "qt4", - "raw1394", - "sensors", - "soprano", - "strigi", - "udev", - "usb", - "wayland", - "x11", - "x11_xcb", - "xcb", - "xmms", - "zlib" - ] - }, - "ffmpegthumbs": { - "nativeBuildInputs": [ - "cmake" - ], - "propagatedNativeBuildInputs": [], - "propagatedUserEnvPkgs": [], - "propagatedBuildInputs": [], - "name": "ffmpegthumbs-15.04.3", - "src": { - "url": "stable/applications/15.04.3/src/ffmpegthumbs-15.04.3.tar.xz", - "name": "ffmpegthumbs-15.04.3.tar.xz", - "sha256": "1di5v6bpf8zvw243dc7rdrzynvvwgnk6pnckg9zafhwsds6br5wc" - }, - "buildInputs": [ - "ffmpeg", - "kde4" - ] - }, - "ktux": { - "nativeBuildInputs": [ - "cmake" - ], - "propagatedNativeBuildInputs": [], - "propagatedUserEnvPkgs": [], - "propagatedBuildInputs": [], - "name": "ktux-15.04.3", - "src": { - "url": "stable/applications/15.04.3/src/ktux-15.04.3.tar.xz", - "name": "ktux-15.04.3.tar.xz", - "sha256": "00b6fl056pcxdsgqzv81by10l8xpbijk8589nd0dmj74kca31qrn" - }, - "buildInputs": [ - "kde4", - "kde4workspace" - ] - }, - "kde-dev-utils": { - "nativeBuildInputs": [ - "cmake" - ], - "propagatedNativeBuildInputs": [], - "propagatedUserEnvPkgs": [], - "propagatedBuildInputs": [], - "name": "kde-dev-utils-15.04.3", - "src": { - "url": "stable/applications/15.04.3/src/kde-dev-utils-15.04.3.tar.xz", - "name": "kde-dev-utils-15.04.3.tar.xz", - "sha256": "0mykd3w2l0yfi18b8jpzdvhy2dzm9avwzfpbsscb8s19vsarqf2x" - }, - "buildInputs": [ - "kde4" - ] - }, - "libkeduvocdocument": { - "nativeBuildInputs": [ - "cmake" - ], - "propagatedNativeBuildInputs": [], - "propagatedUserEnvPkgs": [], - "propagatedBuildInputs": [], - "name": "libkeduvocdocument-15.04.3", - "src": { - "url": "stable/applications/15.04.3/src/libkeduvocdocument-15.04.3.tar.xz", - "name": "libkeduvocdocument-15.04.3.tar.xz", - "sha256": "1lx72m98x60ddzhqlf5jmnw64jh5pzh02hs4gv9vsgsvbjiizmix" - }, - "buildInputs": [ - "ecm", - "kf5", - "kf5archive", - "kf5i18n", - "kf5kio", - "qt5", - "qt5test", - "qt5xml" - ] - }, - "kde-l10n-pl": { - "nativeBuildInputs": [ - "cmake" - ], - "propagatedNativeBuildInputs": [], - "propagatedUserEnvPkgs": [], - "propagatedBuildInputs": [], - "name": "kde-l10n-pl-15.04.3", - "src": { - "url": "stable/applications/15.04.3/src/kde-l10n/kde-l10n-pl-15.04.3.tar.xz", - "name": "kde-l10n-pl-15.04.3.tar.xz", - "sha256": "1kzhwhf2jxmvkr3070qfhn51d7i44ni62dacghssdiisxkcvw0xi" - }, - "buildInputs": [ - "ecm", - "gettext", - "kde4", - "kf5doctools", - "kf5i18n" - ] - }, - "ktp-send-file": { - "nativeBuildInputs": [ - "cmake" - ], - "propagatedNativeBuildInputs": [], - "propagatedUserEnvPkgs": [], - "propagatedBuildInputs": [], - "name": "ktp-send-file-15.04.3", - "src": { - "url": "stable/applications/15.04.3/src/ktp-send-file-15.04.3.tar.xz", - "name": "ktp-send-file-15.04.3.tar.xz", - "sha256": "1yv4gmgcgi4rlxkispmlrlzi8jp3v1mfansh6w21lafallf3k8kf" - }, - "buildInputs": [ - "ecm", - "kf5", - "kf5i18n", - "kf5iconthemes", - "kf5kcmutils", - "kf5kio", - "ktp", - "qt5", - "qt5widgets" - ] - }, - "cantor": { - "nativeBuildInputs": [ - "cmake" - ], - "propagatedNativeBuildInputs": [], - "propagatedUserEnvPkgs": [], - "propagatedBuildInputs": [], - "name": "cantor-15.04.3", - "src": { - "url": "stable/applications/15.04.3/src/cantor-15.04.3.tar.xz", - "name": "cantor-15.04.3.tar.xz", - "sha256": "02n2pavs8wqngjm9lnw0g1ipdyv42d2pzii57p3nwplfhr8n0ia4" - }, - "buildInputs": [ - "analitza5", - "ecm", - "kde4", - "kf5", - "kf5archive", - "kf5config", - "kf5coreaddons", - "kf5kdelibs4support", - "kf5newstuff", - "kf5parts", - "kf5pty", - "kf5texteditor", - "libspectre", - "luajit", - "pythonlibs", - "pythonlibs3", - "qalculate", - "qt5", - "qt5core", - "qt5svg", - "qt5test", - "qt5widgets", - "qt5xml", - "qt5xmlpatterns", - "r" - ] - }, - "libkcddb": { - "nativeBuildInputs": [ - "cmake" - ], - "propagatedNativeBuildInputs": [], - "propagatedUserEnvPkgs": [], - "propagatedBuildInputs": [], - "name": "libkcddb-15.04.3", - "src": { - "url": "stable/applications/15.04.3/src/libkcddb-15.04.3.tar.xz", - "name": "libkcddb-15.04.3.tar.xz", - "sha256": "0050h4g99wxggiqibfgrmc9zyqkv1l49x0h2k1r32gxl9lf6iid8" - }, - "buildInputs": [ - "kde4", - "musicbrainz5" - ] - }, - "bomber": { - "nativeBuildInputs": [ - "cmake" - ], - "propagatedNativeBuildInputs": [], - "propagatedUserEnvPkgs": [], - "propagatedBuildInputs": [], - "name": "bomber-15.04.3", - "src": { - "url": "stable/applications/15.04.3/src/bomber-15.04.3.tar.xz", - "name": "bomber-15.04.3.tar.xz", - "sha256": "15b79l3m280miaf32w9m48w5rysrizv7kqpc4dg8pwp7i4zbjigc" - }, - "buildInputs": [ - "ecm", - "kf5", - "kf5config", - "kf5configwidgets", - "kf5coreaddons", - "kf5dbusaddons", - "kf5i18n", - "kf5kdegames", - "kf5kio", - "kf5xmlgui", - "phonon4qt5", - "qt5", - "qt5widgets" - ] - }, - "libkface": { - "nativeBuildInputs": [ - "cmake" - ], - "propagatedNativeBuildInputs": [], - "propagatedUserEnvPkgs": [], - "propagatedBuildInputs": [], - "name": "libkface-15.04.3", - "src": { - "url": "stable/applications/15.04.3/src/libkface-15.04.3.tar.xz", - "name": "libkface-15.04.3.tar.xz", - "sha256": "1k3m8qhqw7xlqg0biidp5ckc1z73m0syxw20shjbmzhhwag5qlql" - }, - "buildInputs": [ - "kde4", - "qt4" - ] - }, - "kde-l10n-nb": { - "nativeBuildInputs": [ - "cmake" - ], - "propagatedNativeBuildInputs": [], - "propagatedUserEnvPkgs": [], - "propagatedBuildInputs": [], - "name": "kde-l10n-nb-15.04.3", - "src": { - "url": "stable/applications/15.04.3/src/kde-l10n/kde-l10n-nb-15.04.3.tar.xz", - "name": "kde-l10n-nb-15.04.3.tar.xz", - "sha256": "0p07mwcdk2anazcx2f86dxywmkpgxb5qnwlaah9zfqzlv915v4mp" - }, - "buildInputs": [ - "ecm", - "gettext", - "kde4", - "kf5doctools", - "kf5i18n" - ] - }, - "kturtle": { - "nativeBuildInputs": [ - "cmake" - ], - "propagatedNativeBuildInputs": [], - "propagatedUserEnvPkgs": [], - "propagatedBuildInputs": [], - "name": "kturtle-15.04.3", - "src": { - "url": "stable/applications/15.04.3/src/kturtle-15.04.3.tar.xz", - "name": "kturtle-15.04.3.tar.xz", - "sha256": "0qxymwmd7fdqqzbkj7jjziddmgr01vhnfhfy891m6mzrmhak6dcb" - }, - "buildInputs": [ - "ecm", - "kf5", - "kf5i18n", - "kf5kdelibs4support", - "kf5kio", - "kf5newstuff", - "qt5", - "qt5core", - "qt5gui", - "qt5svg", - "qt5widgets" - ] - }, - "svgpart": { - "nativeBuildInputs": [ - "cmake" - ], - "propagatedNativeBuildInputs": [], - "propagatedUserEnvPkgs": [], - "propagatedBuildInputs": [], - "name": "svgpart-15.04.3", - "src": { - "url": "stable/applications/15.04.3/src/svgpart-15.04.3.tar.xz", - "name": "svgpart-15.04.3.tar.xz", - "sha256": "1b6apnppn2qal1jc0z1mfss71dscvfx2i8wr25wq6mzy8y1ajwzr" - }, - "buildInputs": [ - "kde4" - ] - }, - "kdegraphics-mobipocket": { - "nativeBuildInputs": [ - "cmake" - ], - "propagatedNativeBuildInputs": [], - "propagatedUserEnvPkgs": [], - "propagatedBuildInputs": [], - "name": "kdegraphics-mobipocket-15.04.3", - "src": { - "url": "stable/applications/15.04.3/src/kdegraphics-mobipocket-15.04.3.tar.xz", - "name": "kdegraphics-mobipocket-15.04.3.tar.xz", - "sha256": "123fa5x6zdnm2c18i02azp9ingr2vkrxsrhfafa38v5b4y3jki6g" - }, - "buildInputs": [ - "kde4", - "strigi" - ] - }, - "krfb": { - "nativeBuildInputs": [ - "cmake" - ], - "propagatedNativeBuildInputs": [], - "propagatedUserEnvPkgs": [], - "propagatedBuildInputs": [], - "name": "krfb-15.04.3", - "src": { - "url": "stable/applications/15.04.3/src/krfb-15.04.3.tar.xz", - "name": "krfb-15.04.3.tar.xz", - "sha256": "0pa2xnbgg6rlb3my92kc4kr0sgifrjf8r0j594sdsyfz960hzd2l" - }, - "buildInputs": [ - "kde4", - "ktp", - "libvncserver", - "telepathyqt4" - ] - }, - "kde-l10n-ko": { - "nativeBuildInputs": [ - "cmake" - ], - "propagatedNativeBuildInputs": [], - "propagatedUserEnvPkgs": [], - "propagatedBuildInputs": [], - "name": "kde-l10n-ko-15.04.3", - "src": { - "url": "stable/applications/15.04.3/src/kde-l10n/kde-l10n-ko-15.04.3.tar.xz", - "name": "kde-l10n-ko-15.04.3.tar.xz", - "sha256": "0qs4mcds85rs4kqhck7n450makj295bnfrjlx2hgx1bzk8jpgl19" - }, - "buildInputs": [ - "ecm", - "gettext", - "kde4", - "kf5doctools", - "kf5i18n" - ] - }, - "libkgeomap": { - "nativeBuildInputs": [ - "cmake" - ], - "propagatedNativeBuildInputs": [], - "propagatedUserEnvPkgs": [], - "propagatedBuildInputs": [], - "name": "libkgeomap-15.04.3", - "src": { - "url": "stable/applications/15.04.3/src/libkgeomap-15.04.3.tar.xz", - "name": "libkgeomap-15.04.3.tar.xz", - "sha256": "1h0w1vdnxawgibp479vh1rsqz17gps459wxcixwxmcgb4xxrf1dk" - }, - "buildInputs": [ - "kde4", - "marble", - "marblewidget", - "qt4" - ] - }, - "kalgebra": { - "nativeBuildInputs": [ - "cmake" - ], - "propagatedNativeBuildInputs": [], - "propagatedUserEnvPkgs": [], - "propagatedBuildInputs": [], - "name": "kalgebra-15.04.3", - "src": { - "url": "stable/applications/15.04.3/src/kalgebra-15.04.3.tar.xz", - "name": "kalgebra-15.04.3.tar.xz", - "sha256": "1h67lcxsvsccqk66k6xs1ah2nb1p05p1mcdkcbqjfs0bpw8mby5z" - }, - "buildInputs": [ - "analitza5", - "curses", - "ecm", - "kf5configwidgets", - "kf5doctools", - "kf5i18n", - "kf5kio", - "kf5widgetsaddons", - "opengl", - "qt5", - "qt5opengl", - "qt5printsupport", - "qt5qml", - "qt5quick", - "qt5svg", - "qt5test", - "qt5webkitwidgets", - "qt5xml", - "readline" - ] - }, - "rocs": { - "nativeBuildInputs": [ - "cmake" - ], - "propagatedNativeBuildInputs": [], - "propagatedUserEnvPkgs": [], - "propagatedBuildInputs": [], - "name": "rocs-15.04.3", - "src": { - "url": "stable/applications/15.04.3/src/rocs-15.04.3.tar.xz", - "name": "rocs-15.04.3.tar.xz", - "sha256": "123kj345nh1pq1d3w04k2ssf26q2hp6w8mnvlpza4fgav9lrw57m" - }, - "buildInputs": [ - "boost", - "ecm", - "grantlee5", - "kf5", - "kf5archive", - "kf5config", - "kf5coreaddons", - "kf5declarative", - "kf5doctools", - "kf5i18n", - "kf5itemviews", - "kf5texteditor", - "kf5xmlgui", - "qt5", - "qt5concurrent", - "qt5core", - "qt5gui", - "qt5quickwidgets", - "qt5script", - "qt5scripttools", - "qt5svg", - "qt5test", - "qt5webkit", - "qt5webkitwidgets", - "qt5widgets", - "qt5xmlpatterns" - ] - }, - "kbruch": { - "nativeBuildInputs": [ - "cmake" - ], - "propagatedNativeBuildInputs": [], - "propagatedUserEnvPkgs": [], - "propagatedBuildInputs": [], - "name": "kbruch-15.04.3", - "src": { - "url": "stable/applications/15.04.3/src/kbruch-15.04.3.tar.xz", - "name": "kbruch-15.04.3.tar.xz", - "sha256": "0fivkpa5cr5ahhh1h1z90vl1sr35ks0kmw2mnpk42wgpgipdfbfx" - }, - "buildInputs": [ - "ecm", - "kf5", - "kf5config", - "kf5crash", - "kf5doctools", - "kf5i18n", - "kf5widgetsaddons", - "kf5xmlgui", - "qt5", - "qt5core", - "qt5widgets" - ] - }, - "ksudoku": { - "nativeBuildInputs": [ - "cmake" - ], - "propagatedNativeBuildInputs": [], - "propagatedUserEnvPkgs": [], - "propagatedBuildInputs": [], - "name": "ksudoku-15.04.3", - "src": { - "url": "stable/applications/15.04.3/src/ksudoku-15.04.3.tar.xz", - "name": "ksudoku-15.04.3.tar.xz", - "sha256": "130v3fhhcxf2fkrhkgb7lqjdv4h7kwzn6z133hmqd617s53pnmfw" - }, - "buildInputs": [ - "kde4", - "kdegames", - "opengl" - ] - }, - "kde-l10n-el": { - "nativeBuildInputs": [ - "cmake" - ], - "propagatedNativeBuildInputs": [], - "propagatedUserEnvPkgs": [], - "propagatedBuildInputs": [], - "name": "kde-l10n-el-15.04.3", - "src": { - "url": "stable/applications/15.04.3/src/kde-l10n/kde-l10n-el-15.04.3.tar.xz", - "name": "kde-l10n-el-15.04.3.tar.xz", - "sha256": "1h5hj8li66h5p309rcyk4f6sahdgs25ihdfy673bd7hjz51hk3da" - }, - "buildInputs": [ - "ecm", - "gettext", - "kde4", - "kf5doctools", - "kf5i18n" - ] - }, - "kopete": { - "nativeBuildInputs": [ - "cmake" - ], - "propagatedNativeBuildInputs": [], - "propagatedUserEnvPkgs": [], - "propagatedBuildInputs": [], - "name": "kopete-15.04.3", - "src": { - "url": "stable/applications/15.04.3/src/kopete-15.04.3.tar.xz", - "name": "kopete-15.04.3.tar.xz", - "sha256": "07d51in5h6f07gf12pr2fb2w7gkwyca04ra8vy7m373lrkv71i35" - }, - "buildInputs": [ - "alsa", - "boost", - "expat", - "gif", - "glib2", - "idn", - "jasper", - "jsoncpp", - "kde4", - "kdepimlibs", - "kleopatra", - "libgadu", - "libmeanwhile", - "libmsn", - "libortp", - "libotr", - "libv4l2", - "libxml2", - "libxslt", - "mediastreamer", - "openssl", - "qca2", - "qgpgme", - "qimageblitz", - "qt4", - "qt5core", - "qt5network", - "speex", - "sqlite", - "srtp", - "xmms", - "zlib" - ] - }, - "kde-l10n-de": { - "nativeBuildInputs": [ - "cmake" - ], - "propagatedNativeBuildInputs": [], - "propagatedUserEnvPkgs": [], - "propagatedBuildInputs": [], - "name": "kde-l10n-de-15.04.3", - "src": { - "url": "stable/applications/15.04.3/src/kde-l10n/kde-l10n-de-15.04.3.tar.xz", - "name": "kde-l10n-de-15.04.3.tar.xz", - "sha256": "1yvc9z5fzhpv6xvc2r69fvfxhr6p6fp2b7hpfs7l0v2p1vlw59fl" - }, - "buildInputs": [ - "ecm", - "gettext", - "kde4", - "kf5doctools", - "kf5i18n" - ] - }, - "kde-l10n-nds": { - "nativeBuildInputs": [ - "cmake" - ], - "propagatedNativeBuildInputs": [], - "propagatedUserEnvPkgs": [], - "propagatedBuildInputs": [], - "name": "kde-l10n-nds-15.04.3", - "src": { - "url": "stable/applications/15.04.3/src/kde-l10n/kde-l10n-nds-15.04.3.tar.xz", - "name": "kde-l10n-nds-15.04.3.tar.xz", - "sha256": "135ibbcddyqw65v0gvb1cvd6d736wwdvqy2q819808z44ylah8ha" - }, - "buildInputs": [ - "ecm", - "gettext", - "kde4", - "kf5doctools", - "kf5i18n" - ] - }, - "kde-l10n-pa": { - "nativeBuildInputs": [ - "cmake" - ], - "propagatedNativeBuildInputs": [], - "propagatedUserEnvPkgs": [], - "propagatedBuildInputs": [], - "name": "kde-l10n-pa-15.04.3", - "src": { - "url": "stable/applications/15.04.3/src/kde-l10n/kde-l10n-pa-15.04.3.tar.xz", - "name": "kde-l10n-pa-15.04.3.tar.xz", - "sha256": "0dksyld8jn3qngnb7r4g0ir2zy6c7dm2gx8ws5zz3k7ism61fqby" - }, - "buildInputs": [ - "ecm", - "gettext", - "kde4", - "kf5doctools", - "kf5i18n" - ] - }, - "okteta": { - "nativeBuildInputs": [ - "cmake" - ], - "propagatedNativeBuildInputs": [], - "propagatedUserEnvPkgs": [], - "propagatedBuildInputs": [ - "kastencore", - "kastengui", - "kf5kio", - "oktetacore", - "oktetagui", - "oktetakastencore", - "oktetakastengui", - "qt5core", - "qt5gui", - "qt5widgets" - ], - "name": "okteta-15.04.3", - "src": { - "url": "stable/applications/15.04.3/src/okteta-15.04.3.tar.xz", - "name": "okteta-15.04.3.tar.xz", - "sha256": "1z52n88kjkzjdsvyr0sksh0kmjya5gwjra6gnjaqfd25nbralgnc" - }, - "buildInputs": [ - "ecm", - "kf5", - "kf5bookmarks", - "kf5codecs", - "kf5completion", - "kf5configwidgets", - "kf5dbusaddons", - "kf5doctools", - "kf5i18n", - "kf5iconthemes", - "kf5kcmutils", - "kf5kio", - "kf5newstuff", - "kf5parts", - "kf5service", - "kf5widgetsaddons", - "kf5xmlgui", - "qca-qt5", - "qt5", - "qt5core", - "qt5designer", - "qt5network", - "qt5printsupport", - "qt5script", - "qt5scripttools", - "qt5test", - "qt5widgets", - "qt5xml", - "sharedmimeinfo" - ] - }, - "ktp-accounts-kcm": { - "nativeBuildInputs": [ - "cmake" - ], - "propagatedNativeBuildInputs": [], - "propagatedUserEnvPkgs": [], - "propagatedBuildInputs": [], - "name": "ktp-accounts-kcm-15.04.3", - "src": { - "url": "stable/applications/15.04.3/src/ktp-accounts-kcm-15.04.3.tar.xz", - "name": "ktp-accounts-kcm-15.04.3.tar.xz", - "sha256": "00gvcps8h5bi612fwyy5xgb855avv7ad4gfhbbpqz2bykgsjfgj7" - }, - "buildInputs": [ - "accountsfiledir", - "accountsqt5", - "ecm", - "intltool", - "kaccounts", - "kf5", - "kf5codecs", - "kf5configwidgets", - "kf5coreaddons", - "kf5i18n", - "kf5iconthemes", - "kf5itemviews", - "kf5kcmutils", - "kf5kio", - "kf5widgetsaddons", - "qt5", - "qt5core", - "qt5dbus", - "qt5widgets", - "signonqt5", - "telepathyqt5" - ] - }, - "zeroconf-ioslave": { - "nativeBuildInputs": [ - "cmake" - ], - "propagatedNativeBuildInputs": [], - "propagatedUserEnvPkgs": [], - "propagatedBuildInputs": [], - "name": "zeroconf-ioslave-15.04.3", - "src": { - "url": "stable/applications/15.04.3/src/zeroconf-ioslave-15.04.3.tar.xz", - "name": "zeroconf-ioslave-15.04.3.tar.xz", - "sha256": "141hfbcikpwsr9il3ysjslprcqp1687ncrrhjw3h1qq5pdm8z96p" - }, - "buildInputs": [ - "kde4" - ] - }, - "kremotecontrol": { - "nativeBuildInputs": [ - "cmake" - ], - "propagatedNativeBuildInputs": [], - "propagatedUserEnvPkgs": [], - "propagatedBuildInputs": [], - "name": "kremotecontrol-15.04.3", - "src": { - "url": "stable/applications/15.04.3/src/kremotecontrol-15.04.3.tar.xz", - "name": "kremotecontrol-15.04.3.tar.xz", - "sha256": "0zia5j0svgprglckfkf9vb7d5dkgggil7a2qc55yhpr2ihnvryvl" - }, - "buildInputs": [ - "kde4", - "qt4" - ] - }, - "kde-l10n-bs": { - "nativeBuildInputs": [ - "cmake" - ], - "propagatedNativeBuildInputs": [], - "propagatedUserEnvPkgs": [], - "propagatedBuildInputs": [], - "name": "kde-l10n-bs-15.04.3", - "src": { - "url": "stable/applications/15.04.3/src/kde-l10n/kde-l10n-bs-15.04.3.tar.xz", - "name": "kde-l10n-bs-15.04.3.tar.xz", - "sha256": "0lf1nxf068fyl7vck3vqdzaj8f5mpq3lzs10rg5qkm3a3qli0drc" - }, - "buildInputs": [ - "ecm", - "gettext", - "kde4", - "kf5doctools", - "kf5i18n" - ] - }, - "ark": { - "nativeBuildInputs": [ - "cmake" - ], - "propagatedNativeBuildInputs": [], - "propagatedUserEnvPkgs": [], - "propagatedBuildInputs": [], - "name": "ark-15.04.3", - "src": { - "url": "stable/applications/15.04.3/src/ark-15.04.3.tar.xz", - "name": "ark-15.04.3.tar.xz", - "sha256": "1065i6vs1cswjd0lb7b01b7fl6k5p73pfbp5nfzjxi9a1sl4sql5" - }, - "buildInputs": [ - "bzip2", - "kde4", - "libarchive", - "libkonq", - "liblzma", - "qjson", - "zlib" - ] - }, - "libkdegames": { - "nativeBuildInputs": [ - "cmake" - ], - "propagatedNativeBuildInputs": [], - "propagatedUserEnvPkgs": [], - "propagatedBuildInputs": [ - "kf5completion", - "kf5config", - "kf5configwidgets", - "kf5i18n", - "kf5kdelibs4support", - "kf5widgetsaddons", - "qt5network", - "qt5qml", - "qt5quickwidgets", - "qt5widgets", - "qt5xml" - ], - "name": "libkdegames-15.04.3", - "src": { - "url": "stable/applications/15.04.3/src/libkdegames-15.04.3.tar.xz", - "name": "libkdegames-15.04.3.tar.xz", - "sha256": "051bn6f3f1blzxkm16lqnplwba9c6q0ig6ah819vadw7qbmls44n" - }, - "buildInputs": [ - "ecm", - "kf5", - "kf5archive", - "kf5bookmarks", - "kf5codecs", - "kf5completion", - "kf5config", - "kf5configwidgets", - "kf5coreaddons", - "kf5crash", - "kf5dbusaddons", - "kf5declarative", - "kf5dnssd", - "kf5globalaccel", - "kf5guiaddons", - "kf5i18n", - "kf5iconthemes", - "kf5itemviews", - "kf5jobwidgets", - "kf5kdelibs4support", - "kf5kio", - "kf5newstuff", - "kf5service", - "kf5textwidgets", - "kf5widgetsaddons", - "kf5xmlgui", - "openal", - "qt5", - "qt5qml", - "qt5quick", - "qt5quickwidgets", - "qt5svg", - "qt5test", - "qt5widgets", - "sndfile" - ] - }, - "kde-l10n-hi": { - "nativeBuildInputs": [ - "cmake" - ], - "propagatedNativeBuildInputs": [], - "propagatedUserEnvPkgs": [], - "propagatedBuildInputs": [], - "name": "kde-l10n-hi-15.04.3", - "src": { - "url": "stable/applications/15.04.3/src/kde-l10n/kde-l10n-hi-15.04.3.tar.xz", - "name": "kde-l10n-hi-15.04.3.tar.xz", - "sha256": "1xjicw98r69jlby116xy3g5z6kbblry1h0wfrsyp1m8s8fm4f2gm" - }, - "buildInputs": [ - "ecm", - "gettext", - "kde4", - "kf5doctools", - "kf5i18n" - ] - }, - "cervisia": { - "nativeBuildInputs": [ - "cmake" - ], - "propagatedNativeBuildInputs": [], - "propagatedUserEnvPkgs": [], - "propagatedBuildInputs": [], - "name": "cervisia-15.04.3", - "src": { - "url": "stable/applications/15.04.3/src/cervisia-15.04.3.tar.xz", - "name": "cervisia-15.04.3.tar.xz", - "sha256": "18fl0krby18y94xqc8g78rplgsidqwzxwvv4j3xypsjvhaalrw7q" - }, - "buildInputs": [ - "kde4" - ] - }, - "kde-l10n-en_GB": { - "nativeBuildInputs": [ - "cmake" - ], - "propagatedNativeBuildInputs": [], - "propagatedUserEnvPkgs": [], - "propagatedBuildInputs": [], - "name": "kde-l10n-en_GB-15.04.3", - "src": { - "url": "stable/applications/15.04.3/src/kde-l10n/kde-l10n-en_GB-15.04.3.tar.xz", - "name": "kde-l10n-en_GB-15.04.3.tar.xz", - "sha256": "0wlca0rp01x8z4ff26db8nsiafly2frk4fvxsw86rc7cwb15ck7q" - }, - "buildInputs": [ - "ecm", - "gettext", - "kde4", - "kf5doctools", - "kf5i18n" - ] - }, - "kapman": { - "nativeBuildInputs": [ - "cmake" - ], - "propagatedNativeBuildInputs": [], - "propagatedUserEnvPkgs": [], - "propagatedBuildInputs": [], - "name": "kapman-15.04.3", - "src": { - "url": "stable/applications/15.04.3/src/kapman-15.04.3.tar.xz", - "name": "kapman-15.04.3.tar.xz", - "sha256": "0avlvf4nw89xa224g5h53rf4xmmb32z25ia4ilpiaglsm5lavkf8" - }, - "buildInputs": [ - "ecm", - "kf5", - "kf5config", - "kf5configwidgets", - "kf5coreaddons", - "kf5i18n", - "kf5kdegames", - "kf5kio", - "kf5notifyconfig", - "kf5windowsystem", - "kf5xmlgui", - "phonon4qt5", - "qt5", - "qt5svg", - "qt5widgets" - ] - }, - "kdeedu-data": { - "nativeBuildInputs": [ - "cmake" - ], - "propagatedNativeBuildInputs": [], - "propagatedUserEnvPkgs": [], - "propagatedBuildInputs": [], - "name": "kdeedu-data-15.04.3", - "src": { - "url": "stable/applications/15.04.3/src/kdeedu-data-15.04.3.tar.xz", - "name": "kdeedu-data-15.04.3.tar.xz", - "sha256": "14k0dcbhxkfpb7rwrp08lzd3m201v3gahv1cd9hy1wzga513kbm2" - }, - "buildInputs": [ - "ecm" - ] - }, - "kgeography": { - "nativeBuildInputs": [ - "cmake" - ], - "propagatedNativeBuildInputs": [], - "propagatedUserEnvPkgs": [], - "propagatedBuildInputs": [], - "name": "kgeography-15.04.3", - "src": { - "url": "stable/applications/15.04.3/src/kgeography-15.04.3.tar.xz", - "name": "kgeography-15.04.3.tar.xz", - "sha256": "1qra3j6zrwihm5c896adh0acy7lgbkpcw8ja22dv519926slbi84" - }, - "buildInputs": [ - "ecm", - "kf5", - "kf5configwidgets", - "kf5coreaddons", - "kf5doctools", - "kf5i18n", - "kf5iconthemes", - "kf5itemviews", - "kf5service", - "kf5widgetsaddons", - "kf5xmlgui", - "qt5", - "qt5core", - "qt5widgets" - ] - }, - "kdesdk-thumbnailers": { - "nativeBuildInputs": [ - "cmake" - ], - "propagatedNativeBuildInputs": [], - "propagatedUserEnvPkgs": [], - "propagatedBuildInputs": [], - "name": "kdesdk-thumbnailers-15.04.3", - "src": { - "url": "stable/applications/15.04.3/src/kdesdk-thumbnailers-15.04.3.tar.xz", - "name": "kdesdk-thumbnailers-15.04.3.tar.xz", - "sha256": "06vznwg9fhrky5bf46hfaxw4dyh9nfr0v0slh77ys0szn18cns7c" - }, - "buildInputs": [ - "gettextpo", - "kde4" - ] - }, - "kppp": { - "nativeBuildInputs": [ - "cmake" - ], - "propagatedNativeBuildInputs": [], - "propagatedUserEnvPkgs": [], - "propagatedBuildInputs": [], - "name": "kppp-15.04.3", - "src": { - "url": "stable/applications/15.04.3/src/kppp-15.04.3.tar.xz", - "name": "kppp-15.04.3.tar.xz", - "sha256": "0ibmc0axcxg4x4dcwdjhq4mgvfrcm18n2g12qd2b27czhiffbq7b" - }, - "buildInputs": [ - "kde4" - ] - }, - "kde-l10n-ug": { - "nativeBuildInputs": [ - "cmake" - ], - "propagatedNativeBuildInputs": [], - "propagatedUserEnvPkgs": [], - "propagatedBuildInputs": [], - "name": "kde-l10n-ug-15.04.3", - "src": { - "url": "stable/applications/15.04.3/src/kde-l10n/kde-l10n-ug-15.04.3.tar.xz", - "name": "kde-l10n-ug-15.04.3.tar.xz", - "sha256": "1mrgcx242jnh32kz522jnc3wihn7a72231pibw6sh2hmykcv5yjl" - }, - "buildInputs": [ - "ecm", - "gettext", - "kde4", - "kf5doctools", - "kf5i18n" - ] - }, - "kgpg": { - "nativeBuildInputs": [ - "cmake" - ], - "propagatedNativeBuildInputs": [], - "propagatedUserEnvPkgs": [], - "propagatedBuildInputs": [], - "name": "kgpg-15.04.3", - "src": { - "url": "stable/applications/15.04.3/src/kgpg-15.04.3.tar.xz", - "name": "kgpg-15.04.3.tar.xz", - "sha256": "13hswfxfs4h58aizydl4v8i8zlac0k7qp5br7aqa5p9fpaj8496b" - }, - "buildInputs": [ - "gpgme", - "kde4", - "kdepimlibs" - ] - }, - "kde-l10n-lv": { - "nativeBuildInputs": [ - "cmake" - ], - "propagatedNativeBuildInputs": [], - "propagatedUserEnvPkgs": [], - "propagatedBuildInputs": [], - "name": "kde-l10n-lv-15.04.3", - "src": { - "url": "stable/applications/15.04.3/src/kde-l10n/kde-l10n-lv-15.04.3.tar.xz", - "name": "kde-l10n-lv-15.04.3.tar.xz", - "sha256": "1ac377lba57wjmnqr9jqjmq8qn9a15hvydbnbj35akqchppcvpk2" - }, - "buildInputs": [ - "ecm", - "gettext", - "kde4", - "kf5doctools", - "kf5i18n" - ] - }, - "kde-l10n-hr": { - "nativeBuildInputs": [ - "cmake" - ], - "propagatedNativeBuildInputs": [], - "propagatedUserEnvPkgs": [], - "propagatedBuildInputs": [], - "name": "kde-l10n-hr-15.04.3", - "src": { - "url": "stable/applications/15.04.3/src/kde-l10n/kde-l10n-hr-15.04.3.tar.xz", - "name": "kde-l10n-hr-15.04.3.tar.xz", - "sha256": "12n0s8a8iy1bldnjzhg9jiy896c9vyj5zj23mxlbmzchz5gz9bby" - }, - "buildInputs": [ - "ecm", - "gettext", - "kde4", - "kf5doctools", - "kf5i18n" - ] - }, - "kde-l10n-ca": { - "nativeBuildInputs": [ - "cmake" - ], - "propagatedNativeBuildInputs": [], - "propagatedUserEnvPkgs": [], - "propagatedBuildInputs": [], - "name": "kde-l10n-ca-15.04.3", - "src": { - "url": "stable/applications/15.04.3/src/kde-l10n/kde-l10n-ca-15.04.3.tar.xz", - "name": "kde-l10n-ca-15.04.3.tar.xz", - "sha256": "1yag38xhairw08zm0q5qrwzria3hzs75cipgf4xrwii946rx3g44" - }, - "buildInputs": [ - "ecm", - "gettext", - "kde4", - "kf5doctools", - "kf5i18n" - ] - }, - "mplayerthumbs": { - "nativeBuildInputs": [ - "cmake" - ], - "propagatedNativeBuildInputs": [], - "propagatedUserEnvPkgs": [], - "propagatedBuildInputs": [], - "name": "mplayerthumbs-15.04.3", - "src": { - "url": "stable/applications/15.04.3/src/mplayerthumbs-15.04.3.tar.xz", - "name": "mplayerthumbs-15.04.3.tar.xz", - "sha256": "0ah79wl2qi15y874ds39f53pz2qsc0iwy7h33jzrqmy85sx92g71" - }, - "buildInputs": [ - "kde4" - ] - }, - "kate": { - "nativeBuildInputs": [ - "cmake" - ], - "propagatedNativeBuildInputs": [], - "propagatedUserEnvPkgs": [], - "propagatedBuildInputs": [], - "name": "kate-15.04.3", - "src": { - "url": "stable/applications/15.04.3/src/kate-15.04.3.tar.xz", - "name": "kate-15.04.3.tar.xz", - "sha256": "0lr0f23ylv6rlm3yqzkrklnj9c0rsfnsmn0gnkd7bw7hwcgb0wfz" - }, - "buildInputs": [ - "ecm", - "kf5", - "kf5dbusaddons", - "libgit2", - "pykde4", - "pyqt4", - "pythonlibrary", - "qt5", - "qt5core", - "qt5dbus", - "qt5script", - "qt5sql", - "qt5test", - "qt5widgets", - "sip" - ] - }, - "ksaneplugin": { - "nativeBuildInputs": [ - "cmake" - ], - "propagatedNativeBuildInputs": [], - "propagatedUserEnvPkgs": [], - "propagatedBuildInputs": [], - "name": "ksaneplugin-15.04.3", - "src": { - "url": "stable/applications/15.04.3/src/ksaneplugin-15.04.3.tar.xz", - "name": "ksaneplugin-15.04.3.tar.xz", - "sha256": "1zy2ybdgihji4blz9vwfmnw0k1b8s60qfhpjcmrgzlbc4kp0wag7" - }, - "buildInputs": [ - "kde4", - "ksane" - ] - }, - "kde-runtime": { - "nativeBuildInputs": [ - "cmake", - "md5sum_executable", - "windres_executable" - ], - "propagatedNativeBuildInputs": [], - "propagatedUserEnvPkgs": [], - "propagatedBuildInputs": [], - "name": "kde-runtime-15.04.3", - "src": { - "url": "stable/applications/15.04.3/src/kde-runtime-15.04.3.tar.xz", - "name": "kde-runtime-15.04.3.tar.xz", - "sha256": "0fyd9wksb7lxqsbq24q2vhy35a7pfr9mqa1xgpx5rjcml3n1vlpq" - }, - "buildInputs": [ - "alsa", - "bzip2", - "exiv2", - "glib2", - "gpgme", - "jpeg", - "kactivities", - "kde4", - "kdeclarative", - "kdepimlibs", - "libattica", - "libgcrypt", - "liblzma", - "libssh", - "nepomukcore", - "networkmanager", - "openexr", - "pulseaudio", - "qca2", - "qgpgme", - "qntrack", - "samba", - "sharedmimeinfo", - "slp", - "soprano" - ] - }, - "ktp-text-ui": { - "nativeBuildInputs": [ - "cmake" - ], - "propagatedNativeBuildInputs": [], - "propagatedUserEnvPkgs": [], - "propagatedBuildInputs": [], - "name": "ktp-text-ui-15.04.3", - "src": { - "url": "stable/applications/15.04.3/src/ktp-text-ui-15.04.3.tar.xz", - "name": "ktp-text-ui-15.04.3.tar.xz", - "sha256": "0my4gxw73pmpi45xa2s3ny933kmbfal733iq235vpsqqmdyz7mah" - }, - "buildInputs": [ - "ecm", - "kf5", - "kf5archive", - "kf5dbusaddons", - "kf5emoticons", - "kf5i18n", - "kf5iconthemes", - "kf5itemviews", - "kf5kcmutils", - "kf5kio", - "kf5notifications", - "kf5notifyconfig", - "kf5people", - "kf5service", - "kf5sonnet", - "kf5textwidgets", - "kf5webkit", - "kf5widgetsaddons", - "kf5windowsystem", - "kf5xmlgui", - "ktp", - "qt5", - "qt5webkitwidgets" - ] - }, - "kaccounts-providers": { - "nativeBuildInputs": [ - "cmake" - ], - "propagatedNativeBuildInputs": [], - "propagatedUserEnvPkgs": [], - "propagatedBuildInputs": [], - "name": "kaccounts-providers-15.04.3", - "src": { - "url": "stable/applications/15.04.3/src/kaccounts-providers-15.04.3.tar.xz", - "name": "kaccounts-providers-15.04.3.tar.xz", - "sha256": "0lpdcjqqrl3c9l6asfqjbas79g145i6a8ix6dhzc8s77vp1wqxil" - }, - "buildInputs": [ - "accountsfiledir", - "ecm", - "intltool" - ] - }, - "kteatime": { - "nativeBuildInputs": [ - "cmake" - ], - "propagatedNativeBuildInputs": [], - "propagatedUserEnvPkgs": [], - "propagatedBuildInputs": [], - "name": "kteatime-15.04.3", - "src": { - "url": "stable/applications/15.04.3/src/kteatime-15.04.3.tar.xz", - "name": "kteatime-15.04.3.tar.xz", - "sha256": "1359y527nlwzb6jhid5wl3y93ajxawbjd1hf0pmfg5pxpy7aykzg" - }, - "buildInputs": [ - "ecm", - "kf5", - "kf5config", - "kf5crash", - "kf5doctools", - "kf5i18n", - "kf5iconthemes", - "kf5notifications", - "kf5notifyconfig", - "kf5textwidgets", - "kf5widgetsaddons", - "kf5xmlgui", - "qt5", - "qt5core", - "qt5dbus", - "qt5widgets" - ] - }, - "krdc": { - "nativeBuildInputs": [ - "cmake" - ], - "propagatedNativeBuildInputs": [], - "propagatedUserEnvPkgs": [], - "propagatedBuildInputs": [], - "name": "krdc-15.04.3", - "src": { - "url": "stable/applications/15.04.3/src/krdc-15.04.3.tar.xz", - "name": "krdc-15.04.3.tar.xz", - "sha256": "0ylq0dpn45cp1s3y3gb7mrvkjx798knpfmb50lhl3397z1niw4zv" - }, - "buildInputs": [ - "kde4", - "libnxcl", - "libvncserver", - "telepathyqt4" - ] - }, - "klickety": { - "nativeBuildInputs": [ - "cmake" - ], - "propagatedNativeBuildInputs": [], - "propagatedUserEnvPkgs": [], - "propagatedBuildInputs": [], - "name": "klickety-15.04.3", - "src": { - "url": "stable/applications/15.04.3/src/klickety-15.04.3.tar.xz", - "name": "klickety-15.04.3.tar.xz", - "sha256": "0zxnclm74l77f6lwz74wkk831sidwcsd6lc94p853gngmrra5a0c" - }, - "buildInputs": [ - "kde4", - "kdegames" - ] - }, - "kolf": { - "nativeBuildInputs": [ - "cmake" - ], - "propagatedNativeBuildInputs": [], - "propagatedUserEnvPkgs": [], - "propagatedBuildInputs": [], - "name": "kolf-15.04.3", - "src": { - "url": "stable/applications/15.04.3/src/kolf-15.04.3.tar.xz", - "name": "kolf-15.04.3.tar.xz", - "sha256": "1vhhy3pffp4f92zm1k1ksx18gvv404jfa6p28ybsp23fb22z8f90" - }, - "buildInputs": [ - "kde4", - "kdegames" - ] - }, - "ktouch": { - "nativeBuildInputs": [ - "cmake" - ], - "propagatedNativeBuildInputs": [], - "propagatedUserEnvPkgs": [], - "propagatedBuildInputs": [], - "name": "ktouch-15.04.3", - "src": { - "url": "stable/applications/15.04.3/src/ktouch-15.04.3.tar.xz", - "name": "ktouch-15.04.3.tar.xz", - "sha256": "03xvj2rpamw5b6bpbiqkk01jhnkhcqi3c4rxhd0dxqi3da0r1211" - }, - "buildInputs": [ - "kde4", - "kdeclarative", - "x11" - ] - }, - "kdepim": { - "nativeBuildInputs": [ - "cmake", - "dblatex_executable" - ], - "propagatedNativeBuildInputs": [], - "propagatedUserEnvPkgs": [], - "propagatedBuildInputs": [], - "name": "kdepim-4.14.10", - "src": { - "url": "stable/applications/15.04.3/src/kdepim-4.14.10.tar.xz", - "name": "kdepim-4.14.10.tar.xz", - "sha256": "1qmpbgwchjzfrw8nyvx5ibd6zl05w4kn341519w334r5h5dqdbgd" - }, - "buildInputs": [ - "akonadi", - "baloo", - "boost", - "git", - "grantlee", - "kde4", - "kdepimlibs", - "libkgapi2", - "prison", - "qgpgme", - "qjson", - "sasl2", - "xsltproc", - "zlib" - ] - }, - "poxml": { - "nativeBuildInputs": [ - "cmake" - ], - "propagatedNativeBuildInputs": [], - "propagatedUserEnvPkgs": [], - "propagatedBuildInputs": [], - "name": "poxml-15.04.3", - "src": { - "url": "stable/applications/15.04.3/src/poxml-15.04.3.tar.xz", - "name": "poxml-15.04.3.tar.xz", - "sha256": "1n49q5rrhi878jwcvgzy8cri2dd2ycv24m4b0js7j1vxl3cy26n9" - }, - "buildInputs": [ - "gettext", - "gettextpo", - "kde4" - ] - }, - "okular": { - "nativeBuildInputs": [ - "cmake" - ], - "propagatedNativeBuildInputs": [], - "propagatedUserEnvPkgs": [], - "propagatedBuildInputs": [], - "name": "okular-15.04.3", - "src": { - "url": "stable/applications/15.04.3/src/okular-15.04.3.tar.xz", - "name": "okular-15.04.3.tar.xz", - "sha256": "03mmdvnjbaaph4zdpddpfs55v7idn95cf1wvxv540flx3qzn9s7z" - }, - "buildInputs": [ - "activeapp", - "chm", - "djvulibre", - "epub", - "freetype", - "jpeg", - "kactivities", - "kde4", - "kexiv2", - "libkscreen", - "libspectre", - "poppler", - "qca2", - "qimageblitz", - "qmobipocket", - "tiff", - "zlib" - ] - }, - "kde-l10n-fi": { - "nativeBuildInputs": [ - "cmake" - ], - "propagatedNativeBuildInputs": [], - "propagatedUserEnvPkgs": [], - "propagatedBuildInputs": [], - "name": "kde-l10n-fi-15.04.3", - "src": { - "url": "stable/applications/15.04.3/src/kde-l10n/kde-l10n-fi-15.04.3.tar.xz", - "name": "kde-l10n-fi-15.04.3.tar.xz", - "sha256": "07vk6c62g1fywpqbvaa29gwgl4prcyxk4l1j15cj2zwrkl35hi20" - }, - "buildInputs": [ - "ecm", - "gettext", - "kde4", - "kf5doctools", - "kf5i18n" - ] - }, - "ktp-common-internals": { - "nativeBuildInputs": [ - "cmake" - ], - "propagatedNativeBuildInputs": [], - "propagatedUserEnvPkgs": [], - "propagatedBuildInputs": [ - "kf5wallet", - "telepathyloggerqt", - "telepathyqt5" - ], - "name": "ktp-common-internals-15.04.3", - "src": { - "url": "stable/applications/15.04.3/src/ktp-common-internals-15.04.3.tar.xz", - "name": "ktp-common-internals-15.04.3.tar.xz", - "sha256": "1i59k2063590y1nbzbpgdmnxyk4nap2sazr57pi8y4lqzzycr7qv" - }, - "buildInputs": [ - "accountsqt5", - "doxygen", - "ecm", - "kaccounts", - "kf5", - "kf5config", - "kf5coreaddons", - "kf5iconthemes", - "kf5kcmutils", - "kf5kio", - "kf5notifications", - "kf5notifyconfig", - "kf5people", - "kf5texteditor", - "kf5wallet", - "kf5widgetsaddons", - "kf5windowsystem", - "libgcrypt", - "libotr", - "qt5", - "qt5qml", - "qt5sql", - "qt5test", - "telepathyloggerqt", - "telepathyqt5", - "telepathyqt5service" - ] - }, - "kcachegrind": { - "nativeBuildInputs": [ - "cmake" - ], - "propagatedNativeBuildInputs": [], - "propagatedUserEnvPkgs": [], - "propagatedBuildInputs": [], - "name": "kcachegrind-15.04.3", - "src": { - "url": "stable/applications/15.04.3/src/kcachegrind-15.04.3.tar.xz", - "name": "kcachegrind-15.04.3.tar.xz", - "sha256": "1njlky2gsp9ac00id7kk0m19ygwfp5wpzjncmzvkcx65gdafhnwi" - }, - "buildInputs": [ - "kde4" - ] - }, - "kdf": { - "nativeBuildInputs": [ - "cmake" - ], - "propagatedNativeBuildInputs": [], - "propagatedUserEnvPkgs": [], - "propagatedBuildInputs": [], - "name": "kdf-15.04.3", - "src": { - "url": "stable/applications/15.04.3/src/kdf-15.04.3.tar.xz", - "name": "kdf-15.04.3.tar.xz", - "sha256": "1s8jhz9k4c913fzp88gxsrpxp183vk3rpj497aj0qqh5xrl4pz7a" - }, - "buildInputs": [ - "kde4" - ] - }, - "kajongg": { - "nativeBuildInputs": [ - "cmake" - ], - "propagatedNativeBuildInputs": [], - "propagatedUserEnvPkgs": [], - "propagatedBuildInputs": [], - "name": "kajongg-15.04.3", - "src": { - "url": "stable/applications/15.04.3/src/kajongg-15.04.3.tar.xz", - "name": "kajongg-15.04.3.tar.xz", - "sha256": "0gs7h6mx9ngvk2vhn4qn3qbcyf18aw97r1j7if4hqc3lr836zpbg" - }, - "buildInputs": [ - "kde4", - "twisted" - ] - }, - "ksquares": { - "nativeBuildInputs": [ - "cmake" - ], - "propagatedNativeBuildInputs": [], - "propagatedUserEnvPkgs": [], - "propagatedBuildInputs": [], - "name": "ksquares-15.04.3", - "src": { - "url": "stable/applications/15.04.3/src/ksquares-15.04.3.tar.xz", - "name": "ksquares-15.04.3.tar.xz", - "sha256": "0pczn92b0bbgqwqcah4dlhsj5qwqcm0v58j5schpxqvsxz7p26jx" - }, - "buildInputs": [ - "ecm", - "kf5", - "kf5config", - "kf5configwidgets", - "kf5coreaddons", - "kf5guiaddons", - "kf5i18n", - "kf5iconthemes", - "kf5itemviews", - "kf5kdegames", - "kf5kio", - "kf5notifyconfig", - "kf5widgetsaddons", - "kf5xmlgui", - "qt5", - "qt5test", - "qt5widgets" - ] - }, - "kshisen": { - "nativeBuildInputs": [ - "cmake" - ], - "propagatedNativeBuildInputs": [], - "propagatedUserEnvPkgs": [], - "propagatedBuildInputs": [], - "name": "kshisen-15.04.3", - "src": { - "url": "stable/applications/15.04.3/src/kshisen-15.04.3.tar.xz", - "name": "kshisen-15.04.3.tar.xz", - "sha256": "0kagbvw8kilv5908d4b20b7ayj8y44p8bm3av3rijvvz0mn7b4zx" - }, - "buildInputs": [ - "ecm", - "kf5", - "kf5config", - "kf5coreaddons", - "kf5declarative", - "kf5dnssd", - "kf5doctools", - "kf5kdegames", - "kf5kio", - "kf5kmahjongglib", - "kf5newstuff", - "kf5xmlgui", - "phonon4qt5", - "qt5", - "qt5core", - "qt5gui" - ] - }, - "kde-l10n-nn": { - "nativeBuildInputs": [ - "cmake" - ], - "propagatedNativeBuildInputs": [], - "propagatedUserEnvPkgs": [], - "propagatedBuildInputs": [], - "name": "kde-l10n-nn-15.04.3", - "src": { - "url": "stable/applications/15.04.3/src/kde-l10n/kde-l10n-nn-15.04.3.tar.xz", - "name": "kde-l10n-nn-15.04.3.tar.xz", - "sha256": "1xizqrxakgfa3hqfcdm4q97vgzj0lsx8np2jr4xvmd94bh2caw56" - }, - "buildInputs": [ - "ecm", - "gettext", - "kde4", - "kf5doctools", - "kf5i18n" - ] - }, - "kdesdk-strigi-analyzers": { - "nativeBuildInputs": [ - "cmake" - ], - "propagatedNativeBuildInputs": [], - "propagatedUserEnvPkgs": [], - "propagatedBuildInputs": [], - "name": "kdesdk-strigi-analyzers-15.04.3", - "src": { - "url": "stable/applications/15.04.3/src/kdesdk-strigi-analyzers-15.04.3.tar.xz", - "name": "kdesdk-strigi-analyzers-15.04.3.tar.xz", - "sha256": "0n821gwvj2il1zf5s6nqaq58i5r4pn2vzcck1yl2y901shqw6vzb" - }, - "buildInputs": [ - "kde4", - "strigi" - ] - }, - "kde-l10n-zh_CN": { - "nativeBuildInputs": [ - "cmake" - ], - "propagatedNativeBuildInputs": [], - "propagatedUserEnvPkgs": [], - "propagatedBuildInputs": [], - "name": "kde-l10n-zh_CN-15.04.3", - "src": { - "url": "stable/applications/15.04.3/src/kde-l10n/kde-l10n-zh_CN-15.04.3.tar.xz", - "name": "kde-l10n-zh_CN-15.04.3.tar.xz", - "sha256": "0i3d9dqcb5222k9ys7n14lp9llv7pdcc1fwymnmzrsszr38vd24j" - }, - "buildInputs": [ - "ecm", - "gettext", - "kde4", - "kf5doctools", - "kf5i18n" - ] - }, - "ksnakeduel": { - "nativeBuildInputs": [ - "cmake" - ], - "propagatedNativeBuildInputs": [], - "propagatedUserEnvPkgs": [], - "propagatedBuildInputs": [], - "name": "ksnakeduel-15.04.3", - "src": { - "url": "stable/applications/15.04.3/src/ksnakeduel-15.04.3.tar.xz", - "name": "ksnakeduel-15.04.3.tar.xz", - "sha256": "08q6r4r5d29ikiqpbx8mfw79nxjjphw2r2capkbs3bd6ly30bzpx" - }, - "buildInputs": [ - "kde4", - "kdegames" - ] - }, - "kde-l10n-ia": { - "nativeBuildInputs": [ - "cmake" - ], - "propagatedNativeBuildInputs": [], - "propagatedUserEnvPkgs": [], - "propagatedBuildInputs": [], - "name": "kde-l10n-ia-15.04.3", - "src": { - "url": "stable/applications/15.04.3/src/kde-l10n/kde-l10n-ia-15.04.3.tar.xz", - "name": "kde-l10n-ia-15.04.3.tar.xz", - "sha256": "17b42p7jw5nb97fp88lbg2f2pqy1zcsavisfp2h8wmd8sk4hfpd1" - }, - "buildInputs": [ - "ecm", - "gettext", - "kde4", - "kf5doctools", - "kf5i18n" - ] - }, - "granatier": { - "nativeBuildInputs": [ - "cmake" - ], - "propagatedNativeBuildInputs": [], - "propagatedUserEnvPkgs": [], - "propagatedBuildInputs": [], - "name": "granatier-15.04.3", - "src": { - "url": "stable/applications/15.04.3/src/granatier-15.04.3.tar.xz", - "name": "granatier-15.04.3.tar.xz", - "sha256": "1bi6p2xzgxzn6wdfjmxpxfms8z2cksgkkhsa6p0ngd6ln8plmdj9" - }, - "buildInputs": [ - "ecm", - "kf5", - "kf5config", - "kf5configwidgets", - "kf5coreaddons", - "kf5dbusaddons", - "kf5guiaddons", - "kf5i18n", - "kf5iconthemes", - "kf5itemviews", - "kf5kdegames", - "kf5kio", - "kf5newstuff", - "kf5notifyconfig", - "kf5widgetsaddons", - "kf5xmlgui", - "qt5", - "qt5svg", - "qt5widgets" - ] - }, - "kde-dev-scripts": { - "nativeBuildInputs": [ - "cmake" - ], - "propagatedNativeBuildInputs": [], - "propagatedUserEnvPkgs": [], - "propagatedBuildInputs": [], - "name": "kde-dev-scripts-15.04.3", - "src": { - "url": "stable/applications/15.04.3/src/kde-dev-scripts-15.04.3.tar.xz", - "name": "kde-dev-scripts-15.04.3.tar.xz", - "sha256": "0isa27ijgcqjcsh30cjg6hbrzpfwm1vjv1zi2blxxnfwmq2n1j0l" - }, - "buildInputs": [ - "ecm", - "kde4", - "kf5doctools" - ] - }, - "khangman": { - "nativeBuildInputs": [ - "cmake" - ], - "propagatedNativeBuildInputs": [], - "propagatedUserEnvPkgs": [], - "propagatedBuildInputs": [], - "name": "khangman-15.04.3", - "src": { - "url": "stable/applications/15.04.3/src/khangman-15.04.3.tar.xz", - "name": "khangman-15.04.3.tar.xz", - "sha256": "13rbm2g29hvjia1c28r0svw5xjgvr133vqgkhp8b5vsrvz9kqjrn" - }, - "buildInputs": [ - "ecm", - "kf5", - "kf5completion", - "kf5config", - "kf5configwidgets", - "kf5coreaddons", - "kf5crash", - "kf5declarative", - "kf5doctools", - "kf5i18n", - "kf5kio", - "kf5newstuff", - "kf5notifications", - "kf5xmlgui", - "libkeduvocdocument", - "qt5", - "qt5core", - "qt5qml", - "qt5quick", - "qt5quickwidgets", - "qt5svg" - ] - }, - "kde-l10n-sk": { - "nativeBuildInputs": [ - "cmake" - ], - "propagatedNativeBuildInputs": [], - "propagatedUserEnvPkgs": [], - "propagatedBuildInputs": [], - "name": "kde-l10n-sk-15.04.3", - "src": { - "url": "stable/applications/15.04.3/src/kde-l10n/kde-l10n-sk-15.04.3.tar.xz", - "name": "kde-l10n-sk-15.04.3.tar.xz", - "sha256": "05vvxphhapc4kc90a4p2f7j447varc4jz69n6y0fkh0xg2rpk12j" - }, - "buildInputs": [ - "ecm", - "gettext", - "kde4", - "kf5doctools", - "kf5i18n" - ] - }, - "audiocd-kio": { - "nativeBuildInputs": [ - "cmake" - ], - "propagatedNativeBuildInputs": [], - "propagatedUserEnvPkgs": [], - "propagatedBuildInputs": [], - "name": "audiocd-kio-15.04.3", - "src": { - "url": "stable/applications/15.04.3/src/audiocd-kio-15.04.3.tar.xz", - "name": "audiocd-kio-15.04.3.tar.xz", - "sha256": "0fwrjz4bkxinkzk52yv52jx2i6r9rm1nip056kddk718rqr224qi" - }, - "buildInputs": [ - "cdparanoia", - "flac", - "kde4", - "libkcddb", - "libkcompactdisc", - "oggvorbis" - ] - } -} \ No newline at end of file diff --git a/pkgs/applications/kde-apps-15.04/packages.sh b/pkgs/applications/kde-apps-15.04/packages.sh deleted file mode 100755 index a18324e513f1..000000000000 --- a/pkgs/applications/kde-apps-15.04/packages.sh +++ /dev/null @@ -1,22 +0,0 @@ -#!/bin/sh - -set -x - -origin="$(pwd)" - -# if setting KDE_MIRROR, be sure to set --cut-dirs=N in MANIFEST_EXTRA_ARGS -KDE_MIRROR="${KDE_MIRROR:-http://download.kde.org}" - -alias nix-build="nix-build --no-out-link \"$origin/../../..\"" - -# The extra slash at the end of the URL is necessary to stop wget -# from recursing over the whole server! (No, it's not a bug.) -$(nix-build -A autonix.manifest) \ - "${KDE_MIRROR}/stable/applications/15.04.3/" \ - "$@" -A '*.tar.xz' - -AUTONIX_DEPS_KF5=${AUTONIX_DEPS_KF5:-"$(nix-build -A haskellPackages.autonix-deps-kf5)/bin/kf5-deps"} - -$AUTONIX_DEPS_KF5 manifest.json - -rm manifest.json diff --git a/pkgs/applications/kde-apps-15.04/plasma5-renames.json b/pkgs/applications/kde-apps-15.04/plasma5-renames.json deleted file mode 100644 index 98141d29cc58..000000000000 --- a/pkgs/applications/kde-apps-15.04/plasma5-renames.json +++ /dev/null @@ -1,20 +0,0 @@ -{ - "kf5sysguard": "libksysguard", - "kf5baloo": "baloo", - "krunnerappdbusinterface": "plasma-workspace", - "screensaverdbusinterface": "plasma-workspace", - "ctest": "kdeplasma-addons", - "kf5filemetadata": "kfilemetadata", - "kwindbusinterface": "kwin", - "kf5activitiesexperimentalstats": "plasma-desktop", - "khotkeysdbusinterface": "khotkeys", - "libkworkspace": "plasma-workspace", - "libtaskmanager": "plasma-workspace", - "backend": "powerdevil", - "kf5screen": "libkscreen", - "ksmserverdbusinterface": "plasma-workspace", - "kf5wayland": "kwayland", - "kdecoration2": "kdecoration", - "kf5bluezqt": "bluez-qt", - "oxygenfont": "oxygen-fonts" -} \ No newline at end of file diff --git a/pkgs/applications/kde-apps-15.04/renames.json b/pkgs/applications/kde-apps-15.04/renames.json deleted file mode 100644 index 42b2e53df9a5..000000000000 --- a/pkgs/applications/kde-apps-15.04/renames.json +++ /dev/null @@ -1,31 +0,0 @@ -{ - "libkomparediff2": "libkomparediff2", - "kdegames": "libkdegames", - "ksane": "libksane", - "ctest": "sweeper", - "kastencore": "okteta", - "kastengui": "okteta", - "gpgmepp": "kdepimlibs", - "oktetacore": "okteta", - "kf5kmahjongglib": "libkmahjongg", - "oktetagui": "okteta", - "libkcompactdisc": "libkcompactdisc", - "libkdeedu": "libkdeedu", - "kaccounts": "kaccounts-integration", - "kastencontrollers": "okteta", - "backend": "kde-workspace", - "ktp": "ktp-common-internals", - "kdepimlibs": "kdepimlibs", - "qjdns": "kopete", - "libkeduvocdocument": "libkeduvocdocument", - "oktetakastencore": "okteta", - "libkcddb": "libkcddb", - "oktetakastengui": "okteta", - "kde4workspace": "kde-workspace", - "jdns": "kopete", - "okular": "okular", - "qmobipocket": "kdegraphics-mobipocket", - "kdeclarative": "kdelibs", - "analitza5": "analitza", - "oktetakastencontrollers": "okteta" -} \ No newline at end of file diff --git a/pkgs/applications/kde-apps-15.04/setup-hook.sh b/pkgs/applications/kde-apps-15.04/setup-hook.sh deleted file mode 100644 index 636669d4c622..000000000000 --- a/pkgs/applications/kde-apps-15.04/setup-hook.sh +++ /dev/null @@ -1,12 +0,0 @@ -addToSearchPath XDG_DATA_DIRS @out@/share - -addQt4Plugins() { - if [[ -d "$1/lib/qt4/plugins" ]]; then - propagatedUserEnvPkgs+=" $1" - fi - - if [[ -d "$1/lib/kde4/plugins" ]]; then - propagatedUserEnvPkgs+=" $1" - fi -} -envHooks+=(addQt4Plugins) diff --git a/pkgs/desktops/plasma-5.3/default.nix b/pkgs/desktops/plasma-5.3/default.nix deleted file mode 100644 index 80c04a38a484..000000000000 --- a/pkgs/desktops/plasma-5.3/default.nix +++ /dev/null @@ -1,258 +0,0 @@ -# Maintainer's Notes: -# -# Minor updates: -# 1. Edit ./manifest.sh to point to the updated URL. Upstream sometimes -# releases updates that include only the changed packages; in this case, -# multiple URLs can be provided and the results will be merged. -# 2. Run ./manifest.sh and ./dependencies.sh. -# 3. Build and enjoy. -# -# Major updates: -# We prefer not to immediately overwrite older versions with major updates, so -# make a copy of this directory first. After copying, be sure to delete ./tmp -# if it exists. Then follow the minor update instructions. - -{ pkgs, newScope, kdeApps ? null, kf5 ? null, qt5 ? null, debug ? false }: - -let inherit (pkgs) autonix stdenv symlinkJoin; in - -with autonix; let inherit (stdenv) lib; in - -let - kdeApps_ = if kdeApps != null then kdeApps else pkgs.kdeApps_15_04; - kf5_ = if kf5 != null then kf5 else pkgs.kf510; - qt5_ = if qt5 != null then qt5 else pkgs.qt54; -in - -let - - kdeApps = kdeApps_.override { inherit debug kf5 qt5; plasma5 = self; }; - kf5 = kf5_.override { inherit debug qt5; }; - qt5 = qt5_; - - kdePackage = name: pkg: - let defaultOverride = drv: drv // { - setupHook = ./setup-hook.sh; - cmakeFlags = - (drv.cmakeFlags or []) - ++ [ "-DBUILD_TESTING=OFF" ] - ++ lib.optional debug "-DCMAKE_BUILD_TYPE=Debug"; - meta = { - license = with stdenv.lib.licenses; [ - lgpl21Plus lgpl3Plus bsd2 mit gpl2Plus gpl3Plus fdl12 - ]; - platforms = stdenv.lib.platforms.linux; - maintainers = with stdenv.lib.maintainers; [ ttuegel ]; - homepage = "http://www.kde.org"; - }; - }; - callPackage = newScope { - inherit (stdenv) mkDerivation; - inherit (pkgs) fetchurl; - inherit scope; - }; - in mkPackage callPackage defaultOverride name pkg; - - super = - let json = builtins.fromJSON (builtins.readFile ./packages.json); - mirrorUrl = n: pkg: pkg // { - src = pkg.src // { url = "mirror://kde/${pkg.src.url}"; }; - }; - renames = - (builtins.fromJSON (builtins.readFile ./kf5-renames.json)) - // (builtins.fromJSON (builtins.readFile ./renames.json)); - propagated = [ "extra-cmake-modules" ]; - native = [ - "bison" - "extra-cmake-modules" - "flex" - "kdoctools" - "ki18n" - "libxslt" - "perl" - "pythoninterp" - ]; - user = [ - "qt5" - "qt5core" - "qt5dbus" - "qt5gui" - "qt5qml" - "qt5quick" - "qt5svg" - "qt5webkitwidgets" - "qt5widgets" - "qt5x11extras" - "shareddesktopontologies" - "sharedmimeinfo" - ]; - in lib.fold (f: attrs: f attrs) json [ - (lib.mapAttrs kdePackage) - (userEnvDeps user) - (nativeDeps native) - (propagateDeps propagated) - (renameDeps renames) - (lib.mapAttrs mirrorUrl) - ]; - - scope = - # KDE Frameworks 5 - kf5 // - # packages in this collection - self // - # packages pinned to this version of Qt 5 - { - dbusmenu-qt5 = pkgs.libdbusmenu_qt5.override { inherit qt5; }; - libbluedevil = pkgs.libbluedevil.override { inherit qt5; }; - phonon4qt5 = pkgs.phonon_qt5.override { inherit qt5; }; - polkitqt5-1 = pkgs.polkit_qt5.override { inherit qt5; }; - poppler_qt5 = pkgs.poppler_qt5.override { inherit qt5; }; - qt5 = qt5.base; - qt5core = qt5.base; - qt5dbus = qt5.base; - qt5gui = qt5.base; - qt5linguisttools = qt5.tools; - qt5qml = [qt5.declarative qt5.graphicaleffects]; - qt5quick = [qt5.quickcontrols qt5.graphicaleffects]; - qt5script = qt5.script; - qt5svg = qt5.svg; - qt5tools = qt5.tools; - qt5webkitwidgets = qt5.webkit; - qt5widgets = qt5.base; - qt5x11extras = qt5.x11extras; - qt5xmlpatterns = qt5.xmlpatterns; - } // - # packages from nixpkgs - (with pkgs; { - inherit attr bash cairo cmake coreutils dbus epoxy exiv2 ffmpeg - freetype glib gnugrep gnused gtk2 gtk3 libinput libssh - modemmanager openconnect openexr pam pango qt4 samba - socat substituteAll taglib utillinux wayland xapian - xkeyboard_config xorg; - boost = boost155; - canberra = libcanberra; - epub = ebook_tools; - fontforge_executable = fontforge; - mobilebroadbandproviderinfo = mobile_broadband_provider_info; - mtp = libmtp; - pulseaudio = libpulseaudio; - qalculate = libqalculate; - shareddesktopontologies = shared_desktop_ontologies; - sharedmimeinfo = shared_mime_info; - usb = libusb; - }); - - self = super // { - - bluez-qt = overrideDerivation super.bluez-qt (drv: { - preConfigure = '' - substituteInPlace CMakeLists.txt \ - --replace /lib/udev/rules.d "$out/lib/udev/rules.d" - ''; - }); - - breeze = - let - version = (builtins.parseDrvName super.breeze.name).version; - - breeze-qt4 = overrideDerivation super.breeze (drv: { - name = "breeze-qt4-${version}"; - buildInputs = [ pkgs.xorg.xproto pkgs.kde4.kdelibs pkgs.qt4 ]; - nativeBuildInputs = [ pkgs.automoc4 scope.cmake pkgs.pkgconfig ]; - cmakeFlags = [ - "-DUSE_KDE4=ON" - "-DQT_QMAKE_EXECUTABLE=${scope.qt4}/bin/qmake" - ]; - }); - - breeze-qt5 = overrideDerivation super.breeze (drv: { - name = "breeze-qt5-${version}"; - buildInputs = with kf5; with self; [ - kcompletion kconfig kconfigwidgets kcoreaddons kdecoration - kguiaddons frameworkintegration ki18n kwindowsystem qt5.base - qt5.x11extras - ]; - nativeBuildInputs = [ scope.cmake kf5.extra-cmake-modules pkgs.pkgconfig ]; - cmakeFlags = [ "-DUSE_KDE4=OFF" ]; - }); - in symlinkJoin "breeze-${version}" [ breeze-qt4 breeze-qt5 ]; - - kde-gtk-config = extendDerivation super.kde-gtk-config { - NIX_CFLAGS_COMPILE = with scope; - lib.concatStringsSep " " [ - "-I${cairo}/include/cairo" - "-I${gtk2}/include/gtk-2.0" - "-I${gtk2}/lib/gtk-2.0/include" - "-I${glib}/include/glib-2.0" - "-I${glib}/lib/glib-2.0/include" - "-I${pango}/include/pango-1.0" - ]; - }; - - kfilemetadata = extendDerivation super.kfilemetadata { - buildInputs = [ scope.attr ]; - }; - - kwin = extendDerivation super.kwin { - buildInputs = with scope.xorg; [ libICE libSM libXcursor ]; - patches = [ ./kwin/kwin-import-plugin-follow-symlinks.patch ]; - }; - - libkscreen = extendDerivation super.libkscreen { - buildInputs = [ scope.xorg.libXrandr]; - }; - - plasma-desktop = extendDerivation super.plasma-desktop { - buildInputs = with scope; - [ canberra ] - ++ (with xorg; [ libxkbfile libXcursor libXft ]); - patches = [ - (scope.substituteAll { - src = ./plasma-desktop/plasma-desktop-hwclock.patch; - hwclock = "${scope.utillinux}/sbin/hwclock"; - }) - ./plasma-desktop/plasma-desktop-zoneinfo.patch - (scope.substituteAll { - src = ./plasma-desktop/plasma-desktop-xkb-rules.patch; - xkb = scope.xkeyboard_config; - }) - ]; - NIX_CFLAGS_COMPILE = with scope.xorg; - lib.concatStringsSep " " [ - "-I${xf86inputsynaptics}/include/xorg" - "-I${xf86inputevdev}/include/xorg" - "-I${xorgserver}/include/xorg" - ]; - cmakeFlags = with scope.xorg; [ - "-DEvdev_INCLUDE_DIRS=${xf86inputevdev}/include" - "-DSynaptics_INCLUDE_DIRS=${xf86inputsynaptics}/include" - ]; - }; - - plasma-workspace = extendDerivation super.plasma-workspace { - patches = [ ./plasma-workspace/0001-startkde-NixOS-patches.patch ]; - buildInputs = with scope.xorg; [ libSM libXcursor scope.pam ]; - - inherit (scope) bash coreutils gnused gnugrep socat; - inherit (scope) kconfig kinit kservice qt5tools; - inherit (scope.xorg) mkfontdir xmessage xprop xrdb xset xsetroot; - dbus_tools = scope.dbus.tools; - kde_workspace = kdeApps.kde-workspace; - postPatch = '' - substituteInPlace startkde/kstartupconfig/kstartupconfig.cpp \ - --replace kdostartupconfig5 $out/bin/kdostartupconfig5 - substituteAllInPlace startkde/startkde.cmake - ''; - }; - - powerdevil = extendDerivation super.powerdevil { - buildInputs = [ scope.xorg.libXrandr ]; - }; - - sddm-kcm = extendDerivation super.sddm-kcm { - buildInputs = [ scope.xorg.libXcursor ]; - }; - - }; - -in self diff --git a/pkgs/desktops/plasma-5.3/kf5-renames.json b/pkgs/desktops/plasma-5.3/kf5-renames.json deleted file mode 100644 index 4da5f8272eeb..000000000000 --- a/pkgs/desktops/plasma-5.3/kf5-renames.json +++ /dev/null @@ -1,70 +0,0 @@ -{ - "kf5widgetsaddons": "kwidgetsaddons", - "kf5texteditor": "ktexteditor", - "kf5designerplugin": "kdesignerplugin", - "kf5bookmarks": "kbookmarks", - "kf5frameworkintegration": "frameworkintegration", - "kf5package": "kpackage", - "kf5archive": "karchive", - "kf5plasma": "plasma-framework", - "kf5kcmutils": "kcmutils", - "kf5configwidgets": "kconfigwidgets", - "ctest": "attica", - "kf5kio": "kio", - "kf5networkmanagerqt": "networkmanager-qt", - "kf5coreaddons": "kcoreaddons", - "kf5guiaddons": "kguiaddons", - "kf5jobwidgets": "kjobwidgets", - "kf5modemmanagerqt": "modemmanager-qt", - "kf5runner": "krunner", - "kf5globalaccel": "kglobalaccel", - "kf5dbusaddons": "kdbusaddons", - "kf5crash": "kcrash", - "kf5itemviews": "kitemviews", - "kf5doctools": "kdoctools", - "kf5i18n": "ki18n", - "kf5webkit": "kdewebkit", - "kf5newstuff": "knewstuff", - "kded": "kded", - "kf5notifications": "knotifications", - "kf5activitiesexperimentalstats": "kactivities", - "kf5dnssd": "kdnssd", - "kf5notifyconfig": "knotifyconfig", - "kf5iconthemes": "kiconthemes", - "kf5js": "kjs", - "kf5kde4support": "kdelibs4support", - "kf5parts": "kparts", - "backend": "plasma-framework", - "kf5completion": "kcompletion", - "kf5threadweaver": "threadweaver", - "kf5mediaplayer": "kmediaplayer", - "kf5plasmaquick": "plasma-framework", - "kf5wallet": "kwallet", - "kf5xmlgui": "kxmlgui", - "kf5attica": "attica", - "kf5declarative": "kdeclarative", - "kf5config": "kconfig", - "kf5init": "kinit", - "kf5textwidgets": "ktextwidgets", - "kf5jsembed": "kjsembed", - "kf5codecs": "kcodecs", - "kf5service": "kservice", - "kf5sonnet": "sonnet", - "kf5kdelibs4support": "kdelibs4support", - "kf5pty": "kpty", - "kf5solid": "solid", - "kf5auth": "kauth", - "ecm": "extra-cmake-modules", - "kf5activities": "kactivities", - "kf5plotting": "kplotting", - "kf5people": "kpeople", - "kf5emoticons": "kemoticons", - "kf5kross": "kross", - "kf5su": "kdesu", - "kf5khtml": "khtml", - "kf5unitconversion": "kunitconversion", - "kf5idletime": "kidletime", - "kf5windowsystem": "kwindowsystem", - "kf5xmlrpcclient": "kxmlrpcclient", - "kf5itemmodels": "kitemmodels" -} \ No newline at end of file diff --git a/pkgs/desktops/plasma-5.3/kwin/kwin-import-plugin-follow-symlinks.patch b/pkgs/desktops/plasma-5.3/kwin/kwin-import-plugin-follow-symlinks.patch deleted file mode 100644 index fd1f35d717e3..000000000000 --- a/pkgs/desktops/plasma-5.3/kwin/kwin-import-plugin-follow-symlinks.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/clients/aurorae/src/aurorae.cpp b/clients/aurorae/src/aurorae.cpp -index 26b44a9..d14e226 100644 ---- a/clients/aurorae/src/aurorae.cpp -+++ b/clients/aurorae/src/aurorae.cpp -@@ -73,7 +73,7 @@ void AuroraeFactory::init() - // so let's try to locate our plugin: - QString pluginPath; - for (const QString &path : m_engine->importPathList()) { -- QDirIterator it(path, QDirIterator::Subdirectories); -+ QDirIterator it(path, QDirIterator::Subdirectories | QDirIterator::FollowSymlinks); - while (it.hasNext()) { - it.next(); - QFileInfo fileInfo = it.fileInfo(); diff --git a/pkgs/desktops/plasma-5.3/kwin/libinput-0.8.patch b/pkgs/desktops/plasma-5.3/kwin/libinput-0.8.patch deleted file mode 100644 index d0b9658b3bfc..000000000000 --- a/pkgs/desktops/plasma-5.3/kwin/libinput-0.8.patch +++ /dev/null @@ -1,25 +0,0 @@ -commit a93a2ab1918630c6d571b5a24379c15a0458d1fa -Author: Martin Gräßlin -Date: Wed Jan 28 16:20:57 2015 +0100 - - Disable libinput integration if >= 0.8 is found - - libinput 0.8 is incompatible causing the build to fail. As we are in - dependency freeze the only option is to disable the build. - - BUG: 342893 - FIXED-IN: 5.2.1 - -diff --git a/CMakeLists.txt b/CMakeLists.txt -index 550ef57..8d9c593 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -145,7 +145,7 @@ set_package_properties(UDev PROPERTIES URL "http://www.freedesktop.org/software - PURPOSE "Required for input handling on Wayland." - ) - set(HAVE_INPUT FALSE) --if (Libinput_FOUND AND UDEV_FOUND) -+if (Libinput_FOUND AND UDEV_FOUND AND Libinput_VERSION VERSION_LESS 0.8) - set(HAVE_INPUT TRUE) - endif() - diff --git a/pkgs/desktops/plasma-5.3/libkscreen/libkscreen-backend-path.patch b/pkgs/desktops/plasma-5.3/libkscreen/libkscreen-backend-path.patch deleted file mode 100644 index d5797924d233..000000000000 --- a/pkgs/desktops/plasma-5.3/libkscreen/libkscreen-backend-path.patch +++ /dev/null @@ -1,130 +0,0 @@ -diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt -index 460022f..422a708 100644 ---- a/src/CMakeLists.txt -+++ b/src/CMakeLists.txt -@@ -1,5 +1,7 @@ - include_directories(${CMAKE_SOURCE_DIR} ${CMAKE_BINARY_DIR} ${CMAKE_CURRENT_BINARY_DIR} ${QT_INCLUDES}) - -+configure_file(config-libkscreen.h.cmake ${CMAKE_CURRENT_BINARY_DIR}/config-libkscreen.h) -+ - set(libkscreen_SRCS - backendloader.cpp - config.cpp -diff --git a/src/backendloader.cpp b/src/backendloader.cpp -index b93e469..8aebc14 100644 ---- a/src/backendloader.cpp -+++ b/src/backendloader.cpp -@@ -16,6 +16,7 @@ - * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA * - *************************************************************************************/ - -+#include "config-libkscreen.h" - #include "backendloader.h" - #include "debug_p.h" - #include "backends/abstractbackend.h" -@@ -40,55 +41,54 @@ bool BackendLoader::init() - const QString backend = qgetenv("KSCREEN_BACKEND").constData(); - const QString backendFilter = QString::fromLatin1("KSC_%1*").arg(backend); - -- const QStringList paths = QCoreApplication::libraryPaths(); -- Q_FOREACH (const QString &path, paths) { -- const QDir dir(path + QDir::separator() + QLatin1String("/kf5/kscreen/"), -- backendFilter, -- QDir::SortFlags(QDir::QDir::NoSort), -- QDir::NoDotAndDotDot | QDir::Files); -- const QFileInfoList finfos = dir.entryInfoList(); -- Q_FOREACH (const QFileInfo &finfo, finfos) { -- // Skip "Fake" backend unless explicitly specified via KSCREEN_BACKEND -- if (backend.isEmpty() && finfo.fileName().contains(QLatin1String("KSC_Fake"))) { -- continue; -- } -+ QString path = QFile::decodeName(CMAKE_INSTALL_PREFIX "/" PLUGIN_INSTALL_DIR "/"); - -- // When on X11, skip the QScreen backend, instead use the XRandR backend, -- // if not specified in KSCREEN_BACKEND -- if (backend.isEmpty() && -- finfo.fileName().contains(QLatin1String("KSC_QScreen")) && -- QX11Info::isPlatformX11()) { -- continue; -- } -+ const QDir dir(path + QDir::separator() + QLatin1String("/kf5/kscreen/"), -+ backendFilter, -+ QDir::SortFlags(QDir::QDir::NoSort), -+ QDir::NoDotAndDotDot | QDir::Files); -+ const QFileInfoList finfos = dir.entryInfoList(); -+ Q_FOREACH (const QFileInfo &finfo, finfos) { -+ // Skip "Fake" backend unless explicitly specified via KSCREEN_BACKEND -+ if (backend.isEmpty() && finfo.fileName().contains(QLatin1String("KSC_Fake"))) { -+ continue; -+ } - -- // When not on X11, skip the XRandR backend, and fall back to QSCreen -- // if not specified in KSCREEN_BACKEND -- if (backend.isEmpty() && -- finfo.fileName().contains(QLatin1String("KSC_XRandR")) && -- !QX11Info::isPlatformX11()) { -- continue; -- } -+ // When on X11, skip the QScreen backend, instead use the XRandR backend, -+ // if not specified in KSCREEN_BACKEND -+ if (backend.isEmpty() && -+ finfo.fileName().contains(QLatin1String("KSC_QScreen")) && -+ QX11Info::isPlatformX11()) { -+ continue; -+ } -+ -+ // When not on X11, skip the XRandR backend, and fall back to QSCreen -+ // if not specified in KSCREEN_BACKEND -+ if (backend.isEmpty() && -+ finfo.fileName().contains(QLatin1String("KSC_XRandR")) && -+ !QX11Info::isPlatformX11()) { -+ continue; -+ } - -- QPluginLoader loader(finfo.filePath()); -- loader.load(); -- QObject *instance = loader.instance(); -- if (!instance) { -+ QPluginLoader loader(finfo.filePath()); -+ loader.load(); -+ QObject *instance = loader.instance(); -+ if (!instance) { -+ loader.unload(); -+ continue; -+ } -+ -+ s_backend = qobject_cast< AbstractBackend* >(instance); -+ if (s_backend) { -+ if (!s_backend->isValid()) { -+ qCDebug(KSCREEN) << "Skipping" << s_backend->name() << "backend"; -+ delete s_backend; -+ s_backend = 0; - loader.unload(); - continue; - } -- -- s_backend = qobject_cast< AbstractBackend* >(instance); -- if (s_backend) { -- if (!s_backend->isValid()) { -- qCDebug(KSCREEN) << "Skipping" << s_backend->name() << "backend"; -- delete s_backend; -- s_backend = 0; -- loader.unload(); -- continue; -- } -- qCDebug(KSCREEN) << "Loading" << s_backend->name() << "backend"; -- return true; -- } -+ qCDebug(KSCREEN) << "Loading" << s_backend->name() << "backend"; -+ return true; - } - } - -diff --git a/src/config-libkscreen.h.cmake b/src/config-libkscreen.h.cmake -new file mode 100644 -index 0000000..a99f3d1 ---- /dev/null -+++ b/src/config-libkscreen.h.cmake -@@ -0,0 +1,2 @@ -+#define CMAKE_INSTALL_PREFIX "${CMAKE_INSTALL_PREFIX}" -+#define PLUGIN_INSTALL_DIR "${PLUGIN_INSTALL_DIR}" diff --git a/pkgs/desktops/plasma-5.3/manifest.sh b/pkgs/desktops/plasma-5.3/manifest.sh deleted file mode 100755 index 3ccfc8da3daa..000000000000 --- a/pkgs/desktops/plasma-5.3/manifest.sh +++ /dev/null @@ -1,10 +0,0 @@ -#!/bin/sh - -# if setting KDE_MIRROR, be sure to set --cut-dirs=N in MANIFEST_EXTRA_ARGS -KDE_MIRROR="${KDE_MIRROR:-http://download.kde.org}" - -# The extra slash at the end of the URL is necessary to stop wget -# from recursing over the whole server! (No, it's not a bug.) -$(nix-build ../../.. -A autonix.manifest) \ - "${KDE_MIRROR}/stable/plasma/5.3.1/" \ - $MANIFEST_EXTRA_ARGS -A '*.tar.xz' diff --git a/pkgs/desktops/plasma-5.3/packages.json b/pkgs/desktops/plasma-5.3/packages.json deleted file mode 100644 index ea8c47a46782..000000000000 --- a/pkgs/desktops/plasma-5.3/packages.json +++ /dev/null @@ -1,1358 +0,0 @@ -{ - "bluez-qt": { - "nativeBuildInputs": [ - "cmake" - ], - "propagatedNativeBuildInputs": [], - "propagatedUserEnvPkgs": [], - "propagatedBuildInputs": [ - "qt5core" - ], - "name": "bluez-qt-5.3.2", - "src": { - "url": "stable/plasma/5.3.2/bluez-qt-5.3.2.tar.xz", - "name": "bluez-qt-5.3.2.tar.xz", - "sha256": "0bc9pi8zbfh66h3p9i76hq1jh7ygavax3zw2wygl269f1k92brlh" - }, - "buildInputs": [ - "ecm", - "qt5", - "qt5core", - "qt5dbus", - "qt5network", - "qt5qml", - "qt5quicktest", - "qt5test" - ] - }, - "kmenuedit": { - "nativeBuildInputs": [ - "cmake" - ], - "propagatedNativeBuildInputs": [], - "propagatedUserEnvPkgs": [], - "propagatedBuildInputs": [], - "name": "kmenuedit-5.3.2", - "src": { - "url": "stable/plasma/5.3.2/kmenuedit-5.3.2.tar.xz", - "name": "kmenuedit-5.3.2.tar.xz", - "sha256": "13nsjh698h09ai6b7r8zi2hlkkxfv8c00b5b6dl0pb2b474a16di" - }, - "buildInputs": [ - "ecm", - "kf5", - "kf5dbusaddons", - "kf5i18n", - "kf5iconthemes", - "kf5kdelibs4support", - "kf5kio", - "kf5sonnet", - "kf5xmlgui", - "khotkeysdbusinterface", - "qt5", - "qt5core", - "qt5dbus", - "qt5xml" - ] - }, - "plasma-nm": { - "nativeBuildInputs": [ - "cmake" - ], - "propagatedNativeBuildInputs": [], - "propagatedUserEnvPkgs": [], - "propagatedBuildInputs": [], - "name": "plasma-nm-5.3.2", - "src": { - "url": "stable/plasma/5.3.2/plasma-nm-5.3.2.tar.xz", - "name": "plasma-nm-5.3.2.tar.xz", - "sha256": "0w3cs66rn7k4fzsr7qihzcgxjwmp2safnfr78lp69md59clc45ag" - }, - "buildInputs": [ - "ecm", - "kf5", - "kf5completion", - "kf5configwidgets", - "kf5coreaddons", - "kf5dbusaddons", - "kf5declarative", - "kf5i18n", - "kf5iconthemes", - "kf5init", - "kf5itemviews", - "kf5kdelibs4support", - "kf5kio", - "kf5modemmanagerqt", - "kf5networkmanagerqt", - "kf5notifications", - "kf5plasma", - "kf5service", - "kf5solid", - "kf5wallet", - "kf5widgetsaddons", - "kf5windowsystem", - "kf5xmlgui", - "mobilebroadbandproviderinfo", - "modemmanager", - "networkmanager", - "openconnect", - "openssl", - "qt5", - "qt5core", - "qt5dbus", - "qt5network", - "qt5quick", - "qt5widgets" - ] - }, - "khotkeys": { - "nativeBuildInputs": [ - "cmake" - ], - "propagatedNativeBuildInputs": [], - "propagatedUserEnvPkgs": [], - "propagatedBuildInputs": [], - "name": "khotkeys-5.3.2", - "src": { - "url": "stable/plasma/5.3.2/khotkeys-5.3.2.tar.xz", - "name": "khotkeys-5.3.2.tar.xz", - "sha256": "0f7z6vwkmi54jbvvqgyxn1mvh1gjwmrihj3afd4w7zd4cbyf61ka" - }, - "buildInputs": [ - "ecm", - "kf5", - "kf5dbusaddons", - "kf5globalaccel", - "kf5i18n", - "kf5kcmutils", - "kf5kdelibs4support", - "kf5kio", - "kf5plasma", - "kf5xmlgui", - "libkworkspace", - "qt5", - "qt5x11extras", - "x11" - ] - }, - "plasma-workspace-wallpapers": { - "nativeBuildInputs": [ - "cmake" - ], - "propagatedNativeBuildInputs": [], - "propagatedUserEnvPkgs": [], - "propagatedBuildInputs": [], - "name": "plasma-workspace-wallpapers-5.3.2", - "src": { - "url": "stable/plasma/5.3.2/plasma-workspace-wallpapers-5.3.2.tar.xz", - "name": "plasma-workspace-wallpapers-5.3.2.tar.xz", - "sha256": "1h3w824dv5yyjz6l9vsi6lddlb5xxmmaqdvvacz7qypy06f808aa" - }, - "buildInputs": [ - "ecm" - ] - }, - "kscreen": { - "nativeBuildInputs": [ - "cmake" - ], - "propagatedNativeBuildInputs": [], - "propagatedUserEnvPkgs": [], - "propagatedBuildInputs": [], - "name": "kscreen-5.3.2", - "src": { - "url": "stable/plasma/5.3.2/kscreen-5.3.2.tar.xz", - "name": "kscreen-5.3.2.tar.xz", - "sha256": "15dnraav3sn5rcz88nj3h6n95w4jiynn45n29pfv7yc3p41yahwd" - }, - "buildInputs": [ - "ecm", - "kf5", - "kf5configwidgets", - "kf5dbusaddons", - "kf5globalaccel", - "kf5i18n", - "kf5screen", - "kf5xmlgui", - "qt5", - "qt5quickwidgets", - "qt5test" - ] - }, - "oxygen-fonts": { - "nativeBuildInputs": [ - "cmake", - "fontforge_executable" - ], - "propagatedNativeBuildInputs": [], - "propagatedUserEnvPkgs": [], - "propagatedBuildInputs": [], - "name": "oxygen-fonts-5.3.2", - "src": { - "url": "stable/plasma/5.3.2/oxygen-fonts-5.3.2.tar.xz", - "name": "oxygen-fonts-5.3.2.tar.xz", - "sha256": "0x78fbllqd8ssxlr2d0xy76pvr4v6f5xans4mvr3f3aa6xhr05ya" - }, - "buildInputs": [ - "ecm" - ] - }, - "breeze": { - "nativeBuildInputs": [ - "cmake" - ], - "propagatedNativeBuildInputs": [], - "propagatedUserEnvPkgs": [], - "propagatedBuildInputs": [], - "name": "breeze-5.3.2", - "src": { - "url": "stable/plasma/5.3.2/breeze-5.3.2.tar.xz", - "name": "breeze-5.3.2.tar.xz", - "sha256": "0rnw5cblz6rdcx4n6x2wwr0blrk2xlkkq1gsbr06c969hp9gq4iy" - }, - "buildInputs": [ - "ecm", - "kde4", - "kdecoration2", - "kf5", - "kf5config", - "kf5configwidgets", - "kf5coreaddons", - "kf5frameworkintegration", - "kf5guiaddons", - "kf5i18n", - "kf5kcmutils", - "kf5windowsystem", - "pkgconfig", - "qt5", - "qt5core", - "qt5dbus", - "qt5widgets", - "qt5x11extras", - "xcb" - ] - }, - "oxygen": { - "nativeBuildInputs": [ - "cmake" - ], - "propagatedNativeBuildInputs": [], - "propagatedUserEnvPkgs": [], - "propagatedBuildInputs": [], - "name": "oxygen-5.3.2", - "src": { - "url": "stable/plasma/5.3.2/oxygen-5.3.2.tar.xz", - "name": "oxygen-5.3.2.tar.xz", - "sha256": "19z18n7zq8616r1dwvnw0s73wxh114d3z952x3p3z42dhl0lkrw0" - }, - "buildInputs": [ - "ecm", - "kde4", - "kde4workspace", - "kdecoration2", - "kf5", - "kf5completion", - "kf5config", - "kf5configwidgets", - "kf5coreaddons", - "kf5frameworkintegration", - "kf5guiaddons", - "kf5i18n", - "kf5service", - "kf5widgetsaddons", - "kf5windowsystem", - "pkgconfig", - "qt5", - "qt5dbus", - "qt5widgets", - "qt5x11extras", - "xcb" - ] - }, - "plasma-workspace": { - "nativeBuildInputs": [ - "cmake" - ], - "propagatedNativeBuildInputs": [], - "propagatedUserEnvPkgs": [], - "propagatedBuildInputs": [ - "kf5sysguard" - ], - "name": "plasma-workspace-5.3.2", - "src": { - "url": "stable/plasma/5.3.2/plasma-workspace-5.3.2.tar.xz", - "name": "plasma-workspace-5.3.2.tar.xz", - "sha256": "1i2lz9acxl63nd6nlvgvnv7lm3nq4bvj2kyj2lmd97f5xx3sara1" - }, - "buildInputs": [ - "dbusmenu-qt5", - "ecm", - "kf5", - "kf5activities", - "kf5baloo", - "kf5config", - "kf5coreaddons", - "kf5crash", - "kf5dbusaddons", - "kf5declarative", - "kf5doctools", - "kf5globalaccel", - "kf5i18n", - "kf5idletime", - "kf5jsembed", - "kf5kcmutils", - "kf5kdelibs4support", - "kf5networkmanagerqt", - "kf5newstuff", - "kf5notifyconfig", - "kf5package", - "kf5plasma", - "kf5plasmaquick", - "kf5prison", - "kf5runner", - "kf5screen", - "kf5solid", - "kf5su", - "kf5sysguard", - "kf5texteditor", - "kf5textwidgets", - "kf5wallet", - "kf5wayland", - "kf5webkit", - "kf5xmlrpcclient", - "kwindbusinterface", - "libgps", - "phonon4qt5", - "qalculate", - "qt5", - "qt5concurrent", - "qt5dbus", - "qt5network", - "qt5qml", - "qt5quick", - "qt5quickwidgets", - "qt5script", - "qt5sql", - "qt5test", - "qt5webkitwidgets", - "qt5widgets", - "qt5x11extras", - "wayland", - "waylandscanner", - "x11", - "xcb", - "zlib" - ] - }, - "kwrited": { - "nativeBuildInputs": [ - "cmake" - ], - "propagatedNativeBuildInputs": [], - "propagatedUserEnvPkgs": [], - "propagatedBuildInputs": [], - "name": "kwrited-5.3.2", - "src": { - "url": "stable/plasma/5.3.2/kwrited-5.3.2.tar.xz", - "name": "kwrited-5.3.2.tar.xz", - "sha256": "1h499rpp7jss5vikapm1247xn1bg5axq4bwwfr6frlyq03vcpga1" - }, - "buildInputs": [ - "ecm", - "kf5", - "kf5coreaddons", - "kf5dbusaddons", - "kf5i18n", - "kf5notifications", - "kf5pty", - "qt5", - "qt5widgets" - ] - }, - "plasma-desktop": { - "nativeBuildInputs": [ - "cmake" - ], - "propagatedNativeBuildInputs": [], - "propagatedUserEnvPkgs": [], - "propagatedBuildInputs": [ - "qt5core" - ], - "name": "plasma-desktop-5.3.2", - "src": { - "url": "stable/plasma/5.3.2/plasma-desktop-5.3.2.tar.xz", - "name": "plasma-desktop-5.3.2.tar.xz", - "sha256": "190g0nmm97a0403nvyp1478fpk8r3d7jkxpg0mif9nvws25qfvz1" - }, - "buildInputs": [ - "boost", - "canberra", - "ecm", - "evdev", - "fontconfig", - "freetype", - "glib2", - "kde4", - "kded", - "kf5", - "kf5activities", - "kf5attica", - "kf5auth", - "kf5baloo", - "kf5config", - "kf5coreaddons", - "kf5dbusaddons", - "kf5declarative", - "kf5doctools", - "kf5emoticons", - "kf5globalaccel", - "kf5guiaddons", - "kf5i18n", - "kf5itemmodels", - "kf5kcmutils", - "kf5kdelibs4support", - "kf5kio", - "kf5newstuff", - "kf5notifications", - "kf5notifyconfig", - "kf5people", - "kf5plasma", - "kf5plasmaquick", - "kf5runner", - "kf5wallet", - "krunnerappdbusinterface", - "ksmserverdbusinterface", - "kwindbusinterface", - "libkworkspace", - "libtaskmanager", - "opengl", - "opengles", - "packagekitqt5", - "phonon4qt5", - "pulseaudio", - "qt4", - "qt5", - "qt5concurrent", - "qt5dbus", - "qt5qml", - "qt5quick", - "qt5quickwidgets", - "qt5sql", - "qt5svg", - "qt5test", - "qt5widgets", - "qt5x11extras", - "screensaverdbusinterface", - "strigi", - "synaptics", - "usb", - "x11", - "xcb" - ] - }, - "systemsettings": { - "nativeBuildInputs": [ - "cmake" - ], - "propagatedNativeBuildInputs": [], - "propagatedUserEnvPkgs": [], - "propagatedBuildInputs": [], - "name": "systemsettings-5.3.2", - "src": { - "url": "stable/plasma/5.3.2/systemsettings-5.3.2.tar.xz", - "name": "systemsettings-5.3.2.tar.xz", - "sha256": "0lgl15hfr3na3v1dry8r5bd7z3d8jlrzh6a3avq9l9297lwfgaxd" - }, - "buildInputs": [ - "ecm", - "kf5", - "kf5config", - "kf5dbusaddons", - "kf5doctools", - "kf5i18n", - "kf5iconthemes", - "kf5itemviews", - "kf5kcmutils", - "kf5khtml", - "kf5kio", - "kf5service", - "kf5windowsystem", - "kf5xmlgui", - "qt5", - "qt5widgets" - ] - }, - "libkscreen": { - "nativeBuildInputs": [ - "cmake" - ], - "propagatedNativeBuildInputs": [], - "propagatedUserEnvPkgs": [], - "propagatedBuildInputs": [ - "qt5core" - ], - "name": "libkscreen-5.3.2", - "src": { - "url": "stable/plasma/5.3.2/libkscreen-5.3.2.tar.xz", - "name": "libkscreen-5.3.2.tar.xz", - "sha256": "1k6j4nxy41d2jgwydi0ah2v0idn6zhb1lmxziyrcshqpklhwiff2" - }, - "buildInputs": [ - "doxygen", - "ecm", - "qt5", - "qt5core", - "qt5dbus", - "qt5gui", - "qt5test", - "qt5x11extras", - "xcb" - ] - }, - "plasma-sdk": { - "nativeBuildInputs": [ - "cmake", - "git_executable_found" - ], - "propagatedNativeBuildInputs": [], - "propagatedUserEnvPkgs": [], - "propagatedBuildInputs": [], - "name": "plasma-sdk-5.3.2", - "src": { - "url": "stable/plasma/5.3.2/plasma-sdk-5.3.2.tar.xz", - "name": "plasma-sdk-5.3.2.tar.xz", - "sha256": "13vkxbayxggj4bx1l40rspck59j4l736gr5hg0sd1j7hmlwcys2z" - }, - "buildInputs": [ - "activeapp", - "ecm", - "kdepimlibs", - "kdevplatform", - "kf5", - "kf5archive", - "kf5completion", - "kf5config", - "kf5configwidgets", - "kf5coreaddons", - "kf5declarative", - "kf5i18n", - "kf5iconthemes", - "kf5kdelibs4support", - "kf5kio", - "kf5newstuff", - "kf5parts", - "kf5plasma", - "kf5plasmaquick", - "kf5service", - "kf5texteditor", - "kf5widgetsaddons", - "kf5windowsystem", - "kf5xmlgui", - "qgpgme", - "qt5", - "qt5core", - "qt5dbus", - "qt5gui", - "qt5qml", - "qt5quick", - "qt5svg", - "qt5test", - "qt5webkit", - "qt5webkitwidgets", - "qt5widgets", - "qt5xml" - ] - }, - "kwin": { - "nativeBuildInputs": [ - "cmake" - ], - "propagatedNativeBuildInputs": [], - "propagatedUserEnvPkgs": [], - "propagatedBuildInputs": [], - "name": "kwin-5.3.2", - "src": { - "url": "stable/plasma/5.3.2/kwin-5.3.2.tar.xz", - "name": "kwin-5.3.2.tar.xz", - "sha256": "0p2pf6aq9zy0l4f7px2p0wj1kfgax8qjmal6yn3mifx1al244xvz" - }, - "buildInputs": [ - "ecm", - "egl", - "epoxy", - "kdecoration2", - "kf5", - "kf5activities", - "kf5completion", - "kf5config", - "kf5configwidgets", - "kf5coreaddons", - "kf5crash", - "kf5declarative", - "kf5doctools", - "kf5globalaccel", - "kf5i18n", - "kf5iconthemes", - "kf5init", - "kf5kcmutils", - "kf5kio", - "kf5newstuff", - "kf5notifications", - "kf5plasma", - "kf5service", - "kf5wayland", - "kf5widgetsaddons", - "kf5windowsystem", - "kf5xmlgui", - "libinput", - "qt5", - "qt5concurrent", - "qt5core", - "qt5dbus", - "qt5multimedia", - "qt5quick", - "qt5quickwidgets", - "qt5script", - "qt5test", - "qt5uitools", - "qt5widgets", - "qt5x11extras", - "threads", - "udev", - "wayland", - "x11", - "x11_xcb", - "xcb", - "xkb" - ] - }, - "kdeplasma-addons": { - "nativeBuildInputs": [ - "cmake" - ], - "propagatedNativeBuildInputs": [], - "propagatedUserEnvPkgs": [], - "propagatedBuildInputs": [], - "name": "kdeplasma-addons-5.3.2", - "src": { - "url": "stable/plasma/5.3.2/kdeplasma-addons-5.3.2.tar.xz", - "name": "kdeplasma-addons-5.3.2.tar.xz", - "sha256": "08k3736ssir41r37y3f6bdf52l1whkr7q5qc2rfhbzm6c9lhqvn4" - }, - "buildInputs": [ - "ecm", - "gio", - "glib2", - "gobject", - "ibus", - "kde4", - "kdepimlibs", - "kexiv2", - "kf5", - "kf5config", - "kf5configwidgets", - "kf5coreaddons", - "kf5i18n", - "kf5kcmutils", - "kf5kdelibs4support", - "kf5kio", - "kf5kross", - "kf5newstuff", - "kf5plasma", - "kf5purpose", - "kf5runner", - "kf5service", - "kf5unitconversion", - "lancelot", - "lancelot-datamodels", - "qt5", - "qt5core", - "qt5dbus", - "qt5gui", - "qt5qml", - "qt5quick", - "qt5widgets", - "qt5x11extras", - "scim", - "sharedmimeinfo", - "x11", - "xcb" - ] - }, - "sddm-kcm": { - "nativeBuildInputs": [ - "cmake" - ], - "propagatedNativeBuildInputs": [], - "propagatedUserEnvPkgs": [], - "propagatedBuildInputs": [], - "name": "sddm-kcm-5.3.2", - "src": { - "url": "stable/plasma/5.3.2/sddm-kcm-5.3.2.tar.xz", - "name": "sddm-kcm-5.3.2.tar.xz", - "sha256": "17pk95xqr08gjn16i4gs7gnp2ksc6082myywdarywf66nz4whind" - }, - "buildInputs": [ - "ecm", - "kf5", - "kf5auth", - "kf5configwidgets", - "kf5coreaddons", - "kf5i18n", - "kf5kio", - "kf5xmlgui", - "qt5", - "qt5core", - "qt5designer", - "qt5gui", - "qt5quick", - "qt5quickwidgets", - "qt5widgets", - "qt5x11extras", - "x11", - "xcb" - ] - }, - "khelpcenter": { - "nativeBuildInputs": [ - "cmake" - ], - "propagatedNativeBuildInputs": [], - "propagatedUserEnvPkgs": [], - "propagatedBuildInputs": [], - "name": "khelpcenter-5.3.2", - "src": { - "url": "stable/plasma/5.3.2/khelpcenter-5.3.2.tar.xz", - "name": "khelpcenter-5.3.2.tar.xz", - "sha256": "1nd4kj4zhw21lfdj6yrmww2rx629mia5w0fb769y5wdas82w9wb3" - }, - "buildInputs": [ - "ecm", - "kf5", - "kf5config", - "kf5i18n", - "kf5init", - "kf5kcmutils", - "kf5kdelibs4support", - "kf5khtml", - "qt5", - "qt5dbus", - "qt5widgets" - ] - }, - "bluedevil": { - "nativeBuildInputs": [ - "cmake" - ], - "propagatedNativeBuildInputs": [], - "propagatedUserEnvPkgs": [], - "propagatedBuildInputs": [], - "name": "bluedevil-5.3.2", - "src": { - "url": "stable/plasma/5.3.2/bluedevil-5.3.2.tar.xz", - "name": "bluedevil-5.3.2.tar.xz", - "sha256": "0pdm4fpr4piaqd52nbyv3plib4z6y9dr7qgbh1cfk3bzfwi1jwn8" - }, - "buildInputs": [ - "ecm", - "kded", - "kf5", - "kf5bluezqt", - "kf5coreaddons", - "kf5dbusaddons", - "kf5i18n", - "kf5iconthemes", - "kf5kio", - "kf5module", - "kf5notifications", - "kf5plasma", - "kf5widgetsaddons", - "qt5", - "qt5core", - "qt5dbus", - "qt5qml", - "qt5widgets", - "sharedmimeinfo" - ] - }, - "ksysguard": { - "nativeBuildInputs": [ - "cmake" - ], - "propagatedNativeBuildInputs": [], - "propagatedUserEnvPkgs": [], - "propagatedBuildInputs": [], - "name": "ksysguard-5.3.2", - "src": { - "url": "stable/plasma/5.3.2/ksysguard-5.3.2.tar.xz", - "name": "ksysguard-5.3.2.tar.xz", - "sha256": "1vf2gdihrvfjrlkg5dmpg9f5yqgxawqa2cf8h9f96n2n0cd46gq7" - }, - "buildInputs": [ - "ecm", - "kf5", - "kf5config", - "kf5coreaddons", - "kf5i18n", - "kf5iconthemes", - "kf5itemviews", - "kf5kdelibs4support", - "kf5newstuff", - "kf5sysguard", - "qt5", - "qt5core", - "qt5widgets", - "sensors" - ] - }, - "baloo": { - "nativeBuildInputs": [ - "cmake" - ], - "propagatedNativeBuildInputs": [], - "propagatedUserEnvPkgs": [], - "propagatedBuildInputs": [ - "kf5coreaddons", - "kf5filemetadata", - "qt5core", - "xapian" - ], - "name": "baloo-5.9.2", - "src": { - "url": "stable/plasma/5.3.2/baloo-5.9.2.tar.xz", - "name": "baloo-5.9.2.tar.xz", - "sha256": "1rhrdri90xb4g23x92nv72x19lxrdzkzc16w5ivbglrnq5ipga8w" - }, - "buildInputs": [ - "ecm", - "kf5", - "kf5auth", - "kf5config", - "kf5crash", - "kf5dbusaddons", - "kf5filemetadata", - "kf5i18n", - "kf5idletime", - "kf5kdelibs4support", - "kf5kio", - "kf5solid", - "qt5", - "qt5dbus", - "qt5quick", - "qt5sql", - "qt5test", - "qt5widgets", - "xapian" - ] - }, - "kde-cli-tools": { - "nativeBuildInputs": [ - "cmake" - ], - "propagatedNativeBuildInputs": [], - "propagatedUserEnvPkgs": [], - "propagatedBuildInputs": [], - "name": "kde-cli-tools-5.3.2", - "src": { - "url": "stable/plasma/5.3.2/kde-cli-tools-5.3.2.tar.xz", - "name": "kde-cli-tools-5.3.2.tar.xz", - "sha256": "1ac36rhffw85yzck4mqj1l4yj20g6yrjxi40vrkakln5j26vxb3x" - }, - "buildInputs": [ - "ecm", - "kf5", - "kf5config", - "kf5i18n", - "kf5iconthemes", - "kf5kcmutils", - "kf5kdelibs4support", - "kf5su", - "kf5windowsystem", - "qt5", - "qt5dbus", - "qt5svg", - "qt5test", - "qt5widgets", - "qt5x11extras", - "x11" - ] - }, - "milou": { - "nativeBuildInputs": [ - "cmake" - ], - "propagatedNativeBuildInputs": [], - "propagatedUserEnvPkgs": [], - "propagatedBuildInputs": [], - "name": "milou-5.3.2", - "src": { - "url": "stable/plasma/5.3.2/milou-5.3.2.tar.xz", - "name": "milou-5.3.2.tar.xz", - "sha256": "1wlnis5ph7vxg7wj410qs8qvdc2b0s8ji1vgqpv0g19zhkph95kw" - }, - "buildInputs": [ - "ecm", - "kdepimlibs", - "kf5", - "kf5coreaddons", - "kf5declarative", - "kf5i18n", - "kf5plasma", - "kf5runner", - "kf5service", - "qt5", - "qt5qml", - "qt5quick", - "qt5script", - "qt5test", - "qt5widgets" - ] - }, - "powerdevil": { - "nativeBuildInputs": [ - "cmake" - ], - "propagatedNativeBuildInputs": [], - "propagatedUserEnvPkgs": [], - "propagatedBuildInputs": [], - "name": "powerdevil-5.3.2", - "src": { - "url": "stable/plasma/5.3.2/powerdevil-5.3.2.tar.xz", - "name": "powerdevil-5.3.2.tar.xz", - "sha256": "1zyfqi9qppra2hw0i18wil1xym84pgqdgmh9yn577c778grr4kgk" - }, - "buildInputs": [ - "ecm", - "kf5", - "kf5activities", - "kf5auth", - "kf5config", - "kf5dbusaddons", - "kf5globalaccel", - "kf5i18n", - "kf5idletime", - "kf5kdelibs4support", - "kf5kio", - "kf5notifyconfig", - "kf5screen", - "kf5solid", - "libkworkspace", - "qt5", - "qt5dbus", - "qt5widgets", - "qt5x11extras", - "udev", - "xcb" - ] - }, - "libksysguard": { - "nativeBuildInputs": [ - "cmake" - ], - "propagatedNativeBuildInputs": [], - "propagatedUserEnvPkgs": [], - "propagatedBuildInputs": [ - "kf5config", - "kf5i18n", - "kf5iconthemes", - "qt5core", - "qt5network", - "qt5widgets" - ], - "name": "libksysguard-5.3.2", - "src": { - "url": "stable/plasma/5.3.2/libksysguard-5.3.2.tar.xz", - "name": "libksysguard-5.3.2.tar.xz", - "sha256": "137dr7p4q3aldm7fs2rldchq4d3irij4rpqc3c799blrgmdrp98p" - }, - "buildInputs": [ - "ecm", - "kf5", - "kf5auth", - "kf5completion", - "kf5config", - "kf5configwidgets", - "kf5coreaddons", - "kf5i18n", - "kf5iconthemes", - "kf5plasma", - "kf5service", - "kf5widgetsaddons", - "kf5windowsystem", - "qt5", - "qt5dbus", - "qt5network", - "qt5script", - "qt5test", - "qt5webkitwidgets", - "qt5widgets", - "qt5x11extras", - "x11", - "zlib" - ] - }, - "plasma-mediacenter": { - "nativeBuildInputs": [ - "cmake" - ], - "propagatedNativeBuildInputs": [], - "propagatedUserEnvPkgs": [], - "propagatedBuildInputs": [], - "name": "plasma-mediacenter-5.3.2", - "src": { - "url": "stable/plasma/5.3.2/plasma-mediacenter-5.3.2.tar.xz", - "name": "plasma-mediacenter-5.3.2.tar.xz", - "sha256": "0nlkzhyfi87k2r567h0hdlj1a9115mwxac55yjg7j3bpm7jr36g6" - }, - "buildInputs": [ - "ecm", - "kf5", - "kf5baloo", - "kf5config", - "kf5configwidgets", - "kf5coreaddons", - "kf5declarative", - "kf5filemetadata", - "kf5guiaddons", - "kf5i18n", - "kf5kio", - "kf5plasma", - "kf5plasmaquick", - "kf5service", - "kf5windowsystem", - "mockcpp", - "qt5", - "qt5core", - "qt5dbus", - "qt5multimedia", - "qt5quick", - "qt5sql", - "qt5test", - "qt5xml", - "taglib" - ] - }, - "kfilemetadata": { - "nativeBuildInputs": [ - "cmake" - ], - "propagatedNativeBuildInputs": [], - "propagatedUserEnvPkgs": [], - "propagatedBuildInputs": [ - "qt5core" - ], - "name": "kfilemetadata-5.9.2", - "src": { - "url": "stable/plasma/5.3.2/kfilemetadata-5.9.2.tar.xz", - "name": "kfilemetadata-5.9.2.tar.xz", - "sha256": "070m5v54birqwh8cmik6n80nbcfjh38lay4w5i3ic0hqj6as2n89" - }, - "buildInputs": [ - "ecm", - "epub", - "exiv2", - "ffmpeg", - "kf5", - "kf5archive", - "kf5i18n", - "popplerqt5", - "qmobipocket", - "qt5", - "qt5test", - "qt5xml", - "taglib" - ] - }, - "kde-gtk-config": { - "nativeBuildInputs": [ - "cmake" - ], - "propagatedNativeBuildInputs": [], - "propagatedUserEnvPkgs": [], - "propagatedBuildInputs": [], - "name": "kde-gtk-config-5.3.2", - "src": { - "url": "stable/plasma/5.3.2/kde-gtk-config-5.3.2.tar.xz", - "name": "kde-gtk-config-5.3.2.tar.xz", - "sha256": "0rw4yv8svbjnv06pqva81m9xvpl75bvka53kckz0nqi6v96rdg2m" - }, - "buildInputs": [ - "ecm", - "gtk2", - "gtk3", - "kf5", - "kf5archive", - "kf5configwidgets", - "kf5i18n", - "kf5iconthemes", - "kf5kcmutils", - "kf5kio", - "kf5newstuff", - "qt5", - "qt5test", - "qt5widgets", - "x11" - ] - }, - "kwayland": { - "nativeBuildInputs": [ - "cmake" - ], - "propagatedNativeBuildInputs": [], - "propagatedUserEnvPkgs": [], - "propagatedBuildInputs": [ - "qt5gui" - ], - "name": "kwayland-5.3.2", - "src": { - "url": "stable/plasma/5.3.2/kwayland-5.3.2.tar.xz", - "name": "kwayland-5.3.2.tar.xz", - "sha256": "1z8k3vhrbfmnbaaji2akzgqvwm990cqk1jqd3crgzv26pbhinvci" - }, - "buildInputs": [ - "ecm", - "egl", - "qt5", - "qt5_check_private", - "qt5component", - "qt5concurrent", - "qt5core", - "qt5gui", - "qt5private", - "qt5test", - "qt5widgets", - "wayland", - "waylandscanner" - ] - }, - "ksshaskpass": { - "nativeBuildInputs": [ - "cmake" - ], - "propagatedNativeBuildInputs": [], - "propagatedUserEnvPkgs": [], - "propagatedBuildInputs": [], - "name": "ksshaskpass-5.3.2", - "src": { - "url": "stable/plasma/5.3.2/ksshaskpass-5.3.2.tar.xz", - "name": "ksshaskpass-5.3.2.tar.xz", - "sha256": "1v4p02141pd7xkyfxmhf7lf5385krri2zdh3vb90d8pr802mv3g7" - }, - "buildInputs": [ - "ecm", - "kf5", - "kf5coreaddons", - "kf5doctools", - "kf5i18n", - "kf5wallet", - "kf5widgetsaddons", - "qt5", - "qt5core" - ] - }, - "kinfocenter": { - "nativeBuildInputs": [ - "cmake" - ], - "propagatedNativeBuildInputs": [], - "propagatedUserEnvPkgs": [], - "propagatedBuildInputs": [], - "name": "kinfocenter-5.3.2", - "src": { - "url": "stable/plasma/5.3.2/kinfocenter-5.3.2.tar.xz", - "name": "kinfocenter-5.3.2.tar.xz", - "sha256": "1w8q9xq2rl1g8axf7n7l7cq49ahhw0r1zc0sdgv4409k5iwsrikr" - }, - "buildInputs": [ - "ecm", - "egl", - "kf5", - "kf5completion", - "kf5config", - "kf5configwidgets", - "kf5coreaddons", - "kf5dbusaddons", - "kf5declarative", - "kf5doctools", - "kf5i18n", - "kf5iconthemes", - "kf5kcmutils", - "kf5kdelibs4support", - "kf5kio", - "kf5package", - "kf5service", - "kf5solid", - "kf5wayland", - "kf5widgetsaddons", - "kf5xmlgui", - "opengl", - "opengles", - "pciutils", - "qt5", - "qt5core", - "qt5gui", - "qt5widgets", - "raw1394", - "x11" - ] - }, - "polkit-kde-agent": { - "nativeBuildInputs": [ - "cmake" - ], - "propagatedNativeBuildInputs": [], - "propagatedUserEnvPkgs": [], - "propagatedBuildInputs": [], - "name": "polkit-kde-agent-1-5.3.2", - "src": { - "url": "stable/plasma/5.3.2/polkit-kde-agent-1-5.3.2.tar.xz", - "name": "polkit-kde-agent-1-5.3.2.tar.xz", - "sha256": "0khbkgd3s0b2xl062rcxqimym8f3c9y6xadl5av27d4d78ayqmfn" - }, - "buildInputs": [ - "ecm", - "kf5", - "kf5config", - "kf5coreaddons", - "kf5crash", - "kf5dbusaddons", - "kf5i18n", - "kf5iconthemes", - "kf5notifications", - "kf5widgetsaddons", - "kf5windowsystem", - "polkitqt5-1", - "qt5", - "qt5core", - "qt5dbus", - "qt5widgets" - ] - }, - "kdecoration": { - "nativeBuildInputs": [ - "cmake" - ], - "propagatedNativeBuildInputs": [], - "propagatedUserEnvPkgs": [], - "propagatedBuildInputs": [ - "qt5gui" - ], - "name": "kdecoration-5.3.2", - "src": { - "url": "stable/plasma/5.3.2/kdecoration-5.3.2.tar.xz", - "name": "kdecoration-5.3.2.tar.xz", - "sha256": "192infj8s4rd3jwiy8fcvbg265zvng4xbmwj7a3bqz4h9jcrjc7v" - }, - "buildInputs": [ - "ecm", - "qt5", - "qt5core", - "qt5gui", - "qt5test" - ] - }, - "kio-extras": { - "nativeBuildInputs": [ - "cmake", - "md5sum_executable" - ], - "propagatedNativeBuildInputs": [], - "propagatedUserEnvPkgs": [], - "propagatedBuildInputs": [], - "name": "kio-extras-5.3.2", - "src": { - "url": "stable/plasma/5.3.2/kio-extras-5.3.2.tar.xz", - "name": "kio-extras-5.3.2.tar.xz", - "sha256": "1vfp203mmpqvwa9dqkkpgz9rgk07f11pwhg5drvkw03azi9hbjbw" - }, - "buildInputs": [ - "ecm", - "exiv2", - "jpeg", - "kf5", - "kf5archive", - "kf5bookmarks", - "kf5config", - "kf5configwidgets", - "kf5coreaddons", - "kf5dbusaddons", - "kf5dnssd", - "kf5doctools", - "kf5guiaddons", - "kf5i18n", - "kf5iconthemes", - "kf5kdelibs4support", - "kf5khtml", - "kf5kio", - "kf5pty", - "kf5solid", - "libssh", - "mtp", - "openexr", - "phonon4qt5", - "qt5", - "qt5dbus", - "qt5network", - "qt5svg", - "qt5test", - "qt5widgets", - "samba", - "sharedmimeinfo", - "slp" - ] - }, - "muon": { - "nativeBuildInputs": [ - "cmake" - ], - "propagatedNativeBuildInputs": [], - "propagatedUserEnvPkgs": [], - "propagatedBuildInputs": [], - "name": "muon-5.3.2", - "src": { - "url": "stable/plasma/5.3.2/muon-5.3.2.tar.xz", - "name": "muon-5.3.2.tar.xz", - "sha256": "0c2c94yirfrkcxp30gf77xzy9gmgznx0kkhn93idggdhc4qdyf9z" - }, - "buildInputs": [ - "akabeiclient", - "appstreamqt", - "bodega", - "debconfkde", - "ecm", - "kf5", - "kf5attica", - "kf5config", - "kf5configwidgets", - "kf5coreaddons", - "kf5dbusaddons", - "kf5declarative", - "kf5i18n", - "kf5iconthemes", - "kf5itemviews", - "kf5kdelibs4support", - "kf5kio", - "kf5newstuff", - "kf5notifications", - "kf5plasma", - "kf5solid", - "kf5wallet", - "kf5widgetsaddons", - "packagekitqt5", - "phonon4qt5", - "qapt", - "qca-qt5", - "qt5", - "qt5concurrent", - "qt5dbus", - "qt5network", - "qt5qml", - "qt5quickwidgets", - "qt5svg", - "qt5test", - "qt5widgets", - "qt5xml", - "qtoauth" - ] - } -} \ No newline at end of file diff --git a/pkgs/desktops/plasma-5.3/packages.sh b/pkgs/desktops/plasma-5.3/packages.sh deleted file mode 100755 index 68b20c49df97..000000000000 --- a/pkgs/desktops/plasma-5.3/packages.sh +++ /dev/null @@ -1,22 +0,0 @@ -#!/bin/sh - -set -x - -origin="$(pwd)" - -# if setting KDE_MIRROR, be sure to set --cut-dirs=N in MANIFEST_EXTRA_ARGS -KDE_MIRROR="${KDE_MIRROR:-http://download.kde.org}" - -alias nix-build="nix-build --no-out-link \"$origin/../../..\"" - -# The extra slash at the end of the URL is necessary to stop wget -# from recursing over the whole server! (No, it's not a bug.) -$(nix-build -A autonix.manifest) \ - "${KDE_MIRROR}/stable/plasma/5.3.2/" \ - "$@" -A '*.tar.xz' - -AUTONIX_DEPS_KF5=${AUTONIX_DEPS_KF5:-"$(nix-build -A haskellPackages.autonix-deps-kf5)/bin/kf5-deps"} - -$AUTONIX_DEPS_KF5 manifest.json - -rm manifest.json diff --git a/pkgs/desktops/plasma-5.3/plasma-desktop/plasma-desktop-hwclock.patch b/pkgs/desktops/plasma-5.3/plasma-desktop/plasma-desktop-hwclock.patch deleted file mode 100644 index 53bd43d38e2c..000000000000 --- a/pkgs/desktops/plasma-5.3/plasma-desktop/plasma-desktop-hwclock.patch +++ /dev/null @@ -1,24 +0,0 @@ -diff --git a/kcms/dateandtime/helper.cpp b/kcms/dateandtime/helper.cpp -index cec5ab8..fc4a6b9 100644 ---- a/kcms/dateandtime/helper.cpp -+++ b/kcms/dateandtime/helper.cpp -@@ -48,10 +48,6 @@ - #include - #endif - --// We cannot rely on the $PATH environment variable, because D-Bus activation --// clears it. So we have to use a reasonable default. --static const QString exePath = QLatin1String("/usr/sbin:/usr/bin:/sbin:/bin"); -- - int ClockHelper::ntp( const QStringList& ntpServers, bool ntpEnabled ) - { - int ret = 0; -@@ -227,7 +223,7 @@ int ClockHelper::tzreset() - - void ClockHelper::toHwclock() - { -- QString hwclock = KStandardDirs::findExe("hwclock", exePath); -+ QString hwclock = "@hwclock@"; - if (!hwclock.isEmpty()) { - KProcess::execute(hwclock, QStringList() << "--systohc"); - } diff --git a/pkgs/desktops/plasma-5.3/plasma-desktop/plasma-desktop-xkb-rules.patch b/pkgs/desktops/plasma-5.3/plasma-desktop/plasma-desktop-xkb-rules.patch deleted file mode 100644 index 8553222bfe0f..000000000000 --- a/pkgs/desktops/plasma-5.3/plasma-desktop/plasma-desktop-xkb-rules.patch +++ /dev/null @@ -1,47 +0,0 @@ -From 3f175a5ecc9b4fecd8fe25cb482cf2c91aa47cf6 Mon Sep 17 00:00:00 2001 -From: Thomas Tuegel -Date: Mon, 4 May 2015 22:23:21 -0500 -Subject: [PATCH] xkb rules path - ---- - kcms/keyboard/xkb_rules.cpp | 24 +----------------------- - 1 file changed, 1 insertion(+), 23 deletions(-) - -diff --git a/kcms/keyboard/xkb_rules.cpp b/kcms/keyboard/xkb_rules.cpp -index 341369d..27066d6 100644 ---- a/kcms/keyboard/xkb_rules.cpp -+++ b/kcms/keyboard/xkb_rules.cpp -@@ -157,29 +157,7 @@ QString Rules::getRulesName() - - QString Rules::findXkbDir() - { -- QString xkbParentDir; -- -- QString base(XLIBDIR); -- if( base.count('/') >= 3 ) { -- // .../usr/lib/X11 -> /usr/share/X11/xkb vs .../usr/X11/lib -> /usr/X11/share/X11/xkb -- QString delta = base.endsWith("X11") ? "/../../share/X11" : "/../share/X11"; -- QDir baseDir(base + delta); -- if( baseDir.exists() ) { -- xkbParentDir = baseDir.absolutePath(); -- } -- else { -- QDir baseDir(base + "/X11"); // .../usr/X11/lib/X11/xkb (old XFree) -- if( baseDir.exists() ) { -- xkbParentDir = baseDir.absolutePath(); -- } -- } -- } -- -- if( xkbParentDir.isEmpty() ) { -- xkbParentDir = "/usr/share/X11"; -- } -- -- return xkbParentDir + "/xkb"; -+ return "@xkb@/share/X11/xkb"; - } - - static QString findXkbRulesFile() --- -2.3.6 - diff --git a/pkgs/desktops/plasma-5.3/plasma-desktop/plasma-desktop-zoneinfo.patch b/pkgs/desktops/plasma-5.3/plasma-desktop/plasma-desktop-zoneinfo.patch deleted file mode 100644 index e924207054d1..000000000000 --- a/pkgs/desktops/plasma-5.3/plasma-desktop/plasma-desktop-zoneinfo.patch +++ /dev/null @@ -1,18 +0,0 @@ -diff --git a/kcms/dateandtime/helper.cpp b/kcms/dateandtime/helper.cpp -index fc4a6b9..7b64d05 100644 ---- a/kcms/dateandtime/helper.cpp -+++ b/kcms/dateandtime/helper.cpp -@@ -181,7 +181,12 @@ int ClockHelper::tz( const QString& selectedzone ) - - val = selectedzone; - #else -- QString tz = "/usr/share/zoneinfo/" + selectedzone; -+ // NixOS-specific path -+ QString tz = "/etc/zoneinfo/" + selectedzone; -+ if (!QFile::exists(tz)) { -+ // Standard Linux path -+ tz = "/usr/share/zoneinfo/" + selectedzone; -+ } - - if (QFile::exists(tz)) { // make sure the new TZ really exists - QFile::remove("/etc/localtime"); diff --git a/pkgs/desktops/plasma-5.3/plasma-workspace/0001-startkde-NixOS-patches.patch b/pkgs/desktops/plasma-5.3/plasma-workspace/0001-startkde-NixOS-patches.patch deleted file mode 100644 index bef2867f3434..000000000000 --- a/pkgs/desktops/plasma-5.3/plasma-workspace/0001-startkde-NixOS-patches.patch +++ /dev/null @@ -1,411 +0,0 @@ -From f124d2204cff11ae0ff0d6c788d268b746180407 Mon Sep 17 00:00:00 2001 -From: Thomas Tuegel -Date: Sat, 18 Jul 2015 12:13:08 -0500 -Subject: [PATCH] startkde NixOS patches - ---- - startkde/startkde.cmake | 222 ++++++++++++++++++++---------------------------- - 1 file changed, 91 insertions(+), 131 deletions(-) - -diff --git a/startkde/startkde.cmake b/startkde/startkde.cmake -index 6f93108..26cc2fc 100644 ---- a/startkde/startkde.cmake -+++ b/startkde/startkde.cmake -@@ -1,8 +1,31 @@ --#!/bin/sh -+#!@bash@/bin/bash - # - # DEFAULT KDE STARTUP SCRIPT ( @PROJECT_VERSION@ ) - # - -+set -x -+ -+# The KDE icon cache is supposed to update itself -+# automatically, but it uses the timestamp on the icon -+# theme directory as a trigger. Since in Nix the -+# timestamp is always the same, this doesn't work. So as -+# a workaround, nuke the icon cache on login. This isn't -+# perfect, since it may require logging out after -+# installing new applications to update the cache. -+# See http://lists-archives.org/kde-devel/26175-what-when-will-icon-cache-refresh.html -+rm -fv $HOME/.cache/icon-cache.kcache -+ -+# Qt writes a weird ‘libraryPath’ line to -+# ~/.config/Trolltech.conf that causes the KDE plugin -+# paths of previous KDE invocations to be searched. -+# Obviously using mismatching KDE libraries is potentially -+# disastrous, so here we nuke references to the Nix store -+# in Trolltech.conf. A better solution would be to stop -+# Qt from doing this wackiness in the first place. -+if [ -e $HOME/.config/Trolltech.conf ]; then -+ @gnused@/bin/sed -e '/nix\\store\|nix\/store/ d' -i $HOME/.config/Trolltech.conf -+fi -+ - if test "x$1" = x--failsafe; then - KDE_FAILSAFE=1 # General failsafe flag - KWIN_COMPOSE=N # Disable KWin's compositing -@@ -16,29 +39,16 @@ trap 'echo GOT SIGHUP' HUP - # we have to unset this for Darwin since it will screw up KDE's dynamic-loading - unset DYLD_FORCE_FLAT_NAMESPACE - --# in case we have been started with full pathname spec without being in PATH --bindir=`echo "$0" | sed -n 's,^\(/.*\)/[^/][^/]*$,\1,p'` --if [ -n "$bindir" ]; then -- qbindir=`qtpaths --binaries-dir` -- qdbus=$qbindir/qdbus -- case $PATH in -- $bindir|$bindir:*|*:$bindir|*:$bindir:*) ;; -- *) PATH=$bindir:$PATH; export PATH;; -- esac --else -- qdbus=qdbus --fi -- - # Check if a KDE session already is running and whether it's possible to connect to X --kcheckrunning -+@out@/bin/kcheckrunning - kcheckrunning_result=$? - if test $kcheckrunning_result -eq 0 ; then -- echo "KDE seems to be already running on this display." -- xmessage -geometry 500x100 "KDE seems to be already running on this display." > /dev/null 2>/dev/null -+ echo "KDE seems to be already running on this display." -+ @xmessage@/bin/xmessage -geometry 500x100 "KDE seems to be already running on this display." - exit 1 - elif test $kcheckrunning_result -eq 2 ; then - echo "\$DISPLAY is not set or cannot connect to the X server." -- exit 1 -+ exit 1 - fi - - # Boot sequence: -@@ -56,13 +66,8 @@ fi - # * Then ksmserver is started which takes control of the rest of the startup sequence - - # We need to create config folder so we can write startupconfigkeys --if [ ${XDG_CONFIG_HOME} ]; then -- configDir=$XDG_CONFIG_HOME; --else -- configDir=${HOME}/.config; #this is the default, http://standards.freedesktop.org/basedir-spec/basedir-spec-latest.html --fi -- --mkdir -p $configDir -+configDir=$(@qt5tools@/bin/qtpaths --writable-path GenericConfigLocation) -+mkdir -p "$configDir" - - #This is basically setting defaults so we can use them with kstartupconfig5 - cat >$configDir/startupconfigkeys </dev/null 2>/dev/null; then -+ : # ok -+else -+ echo 'startkde: Could not start D-Bus. Can you call qdbus?' 1>&2 -+ test -n "$ksplash_pid" && kill "$ksplash_pid" 2>/dev/null -+ @xmessage@/bin/xmessage -geometry 500x100 "Could not start D-Bus. Can you call qdbus?" -+ exit 1 -+fi -+ - ksplash_pid= - if test -z "$dl"; then - # the splashscreen and progress indicator - case "$ksplashrc_ksplash_engine" in - KSplashQML) -- ksplash_pid=`ksplashqml "${ksplashrc_ksplash_theme}" --pid` -+ ksplash_pid=`@out@/bin/ksplashqml "${ksplashrc_ksplash_theme}" --pid` - ;; - None) - ;; -@@ -205,8 +194,7 @@ fi - # For anything else (that doesn't set env vars, or that needs a window manager), - # better use the Autostart folder. - --# TODO: Use GenericConfigLocation once we depend on Qt 5.4 --scriptpath=`qtpaths --paths ConfigLocation | tr ':' '\n' | sed 's,$,/plasma-workspace,g'` -+scriptpath=$(@qt5tools@/bin/qtpaths --paths GenericConfigLocation | tr ':' '\n' | @gnused@/bin/sed 's,$,/plasma-workspace,g') - - # Add /env/ to the directory to locate the scripts to be sourced - for prefix in `echo $scriptpath`; do -@@ -216,7 +204,7 @@ for prefix in `echo $scriptpath`; do - done - - # Set the path for Qt plugins provided by KDE --QT_PLUGIN_PATH=${QT_PLUGIN_PATH+$QT_PLUGIN_PATH:}`qtpaths --plugin-dir` -+QT_PLUGIN_PATH=${QT_PLUGIN_PATH+$QT_PLUGIN_PATH:}`@qt5tools@/bin/qtpaths --plugin-dir` - # TODO: Do we really need this? - QT_PLUGIN_PATH=$QT_PLUGIN_PATH:$kdehome/lib/kde5/plugins/ - export QT_PLUGIN_PATH -@@ -242,7 +230,7 @@ usr_odir=$HOME/.fonts/kde-override - usr_fdir=$HOME/.fonts - - if test -n "$KDEDIRS"; then -- kdedirs_first=`echo "$KDEDIRS"|sed -e 's/:.*//'` -+ kdedirs_first=`echo "$KDEDIRS" | @gnused@/bin/sed -e 's/:.*//'` - sys_odir=$kdedirs_first/share/fonts/override - sys_fdir=$kdedirs_first/share/fonts - else -@@ -255,23 +243,13 @@ fi - # add the user's dirs to the font path, as they might simply have been made - # read-only by the administrator, for whatever reason. - --test -d "$sys_odir" && xset +fp "$sys_odir" --test -d "$usr_odir" && (mkfontdir "$usr_odir" ; xset +fp "$usr_odir") --test -d "$usr_fdir" && (mkfontdir "$usr_fdir" ; xset fp+ "$usr_fdir") --test -d "$sys_fdir" && xset fp+ "$sys_fdir" -+test -d "$sys_odir" && @xset@/bin/xset +fp "$sys_odir" -+test -d "$usr_odir" && ( @mkfontdir@/bin/mkfontdir "$usr_odir" ; @xset@/bin/xset +fp "$usr_odir" ) -+test -d "$usr_fdir" && ( @mkfontdir@/bin/mkfontdir "$usr_fdir" ; @xset@/bin/xset fp+ "$usr_fdir" ) -+test -d "$sys_fdir" && @xset@/bin/xset fp+ "$sys_fdir" - - # Ask X11 to rebuild its font list. --xset fp rehash -- --# Set a left cursor instead of the standard X11 "X" cursor, since I've heard --# from some users that they're confused and don't know what to do. This is --# especially necessary on slow machines, where starting KDE takes one or two --# minutes until anything appears on the screen. --# --# If the user has overwritten fonts, the cursor font may be different now --# so don't move this up. --# --xsetroot -cursor_name left_ptr -+@xset@/bin/xset fp rehash - - # Get Ghostscript to look into user's KDE fonts dir for additional Fontmap - if test -n "$GS_LIB" ; then -@@ -284,30 +262,6 @@ fi - - echo 'startkde: Starting up...' 1>&2 - --# Make sure that the KDE prefix is first in XDG_DATA_DIRS and that it's set at all. --# The spec allows XDG_DATA_DIRS to be not set, but X session startup scripts tend --# to set it to a list of paths *not* including the KDE prefix if it's not /usr or --# /usr/local. --if test -z "$XDG_DATA_DIRS"; then -- XDG_DATA_DIRS="@CMAKE_INSTALL_PREFIX@/@SHARE_INSTALL_PREFIX@:/usr/share:/usr/local/share" --fi --export XDG_DATA_DIRS -- --# Make sure that D-Bus is running --# D-Bus autolaunch is broken --if test -z "$DBUS_SESSION_BUS_ADDRESS" ; then -- eval `dbus-launch --sh-syntax --exit-with-session` --fi --if $qdbus >/dev/null 2>/dev/null; then -- : # ok --else -- echo 'startkde: Could not start D-Bus. Can you call qdbus?' 1>&2 -- test -n "$ksplash_pid" && kill "$ksplash_pid" 2>/dev/null -- xmessage -geometry 500x100 "Could not start D-Bus. Can you call qdbus?" -- exit 1 --fi -- -- - # Mark that full KDE session is running (e.g. Konqueror preloading works only - # with full KDE running). The KDE_FULL_SESSION property can be detected by - # any X client connected to the same X session, even if not launched -@@ -332,11 +286,11 @@ fi - # - KDE_FULL_SESSION=true - export KDE_FULL_SESSION --xprop -root -f KDE_FULL_SESSION 8t -set KDE_FULL_SESSION true -+@xprop@/bin/xprop -root -f KDE_FULL_SESSION 8t -set KDE_FULL_SESSION true - - KDE_SESSION_VERSION=5 - export KDE_SESSION_VERSION --xprop -root -f KDE_SESSION_VERSION 32c -set KDE_SESSION_VERSION 5 -+@xprop@/bin/xprop -root -f KDE_SESSION_VERSION 32c -set KDE_SESSION_VERSION 5 - - KDE_SESSION_UID=`id -ru` - export KDE_SESSION_UID -@@ -346,30 +300,36 @@ export XDG_CURRENT_DESKTOP - - # At this point all the environment is ready, let's send it to kwalletd if running - if test -n "$PAM_KWALLET_LOGIN" ; then -- env | socat STDIN UNIX-CONNECT:$PAM_KWALLET_LOGIN -+ env | @socat@/bin/socat STDIN UNIX-CONNECT:$PAM_KWALLET_LOGIN - fi - --# At this point all environment variables are set, let's send it to the DBus session server to update the activation environment -+# At this point all environment variables are set, let's send it to the DBus -+# session server to update the activation environment - @CMAKE_INSTALL_FULL_LIBEXECDIR@/ksyncdbusenv - if test $? -ne 0; then - # Startup error - echo 'startkde: Could not sync environment to dbus.' 1>&2 - test -n "$ksplash_pid" && kill "$ksplash_pid" 2>/dev/null -- xmessage -geometry 500x100 "Could not sync environment to dbus." -+ @xmessage@/bin/xmessage -geometry 500x100 "Could not sync environment to dbus." - exit 1 - fi - - # We set LD_BIND_NOW to increase the efficiency of kdeinit. - # kdeinit unsets this variable before loading applications. --LD_BIND_NOW=true @CMAKE_INSTALL_FULL_LIBEXECDIR_KF5@/start_kdeinit_wrapper --kded +kcminit_startup -+LD_BIND_NOW=true @kinit@/lib/libexec/kf5/start_kdeinit_wrapper --kded +kcminit_startup - if test $? -ne 0; then - # Startup error - echo 'startkde: Could not start kdeinit5. Check your installation.' 1>&2 - test -n "$ksplash_pid" && kill "$ksplash_pid" 2>/dev/null -- xmessage -geometry 500x100 "Could not start kdeinit5. Check your installation." -+ @xmessage@/bin/xmessage -geometry 500x100 "Could not start kdeinit5. Check your installation" - exit 1 - fi - -+# (NixOS) We run kbuildsycoca5 before starting the user session because things -+# may be missing or moved if they have run nixos-rebuild and it may not be -+# possible for them to start Konsole to run it manually! -+@kservice@/bin/kbuildsycoca5 -+ - # finally, give the session control to the session manager - # see kdebase/ksmserver for the description of the rest of the startup sequence - # if the KDEWM environment variable has been set, then it will be used as KDE's -@@ -385,27 +345,27 @@ test -n "$KDEWM" && KDEWM="--windowmanager $KDEWM" - # lock now and do the rest of the KDE startup underneath the locker. - KSMSERVEROPTIONS="" - test -n "$dl" && KSMSERVEROPTIONS=" --lockscreen" --kwrapper5 ksmserver $KDEWM $KSMSERVEROPTIONS -+@kinit@/bin/kwrapper5 ksmserver $KDEWM $KSMSERVEROPTIONS - if test $? -eq 255; then - # Startup error - echo 'startkde: Could not start ksmserver. Check your installation.' 1>&2 - test -n "$ksplash_pid" && kill "$ksplash_pid" 2>/dev/null -- xmessage -geometry 500x100 "Could not start ksmserver. Check your installation." -+ @xmessage@/bin/xmessage -geometry 500x100 "Could not start ksmserver. Check your installation." - fi - --wait_drkonqi=`kreadconfig5 --file startkderc --group WaitForDrKonqi --key Enabled --default true` -+wait_drkonqi=`@kconfig@/bin/kreadconfig5 --file startkderc --group WaitForDrKonqi --key Enabled --default true` - - if test x"$wait_drkonqi"x = x"true"x ; then - # wait for remaining drkonqi instances with timeout (in seconds) -- wait_drkonqi_timeout=`kreadconfig5 --file startkderc --group WaitForDrKonqi --key Timeout --default 900` -+ wait_drkonqi_timeout=`@kconfig@/bin/kreadconfig5 --file startkderc --group WaitForDrKonqi --key Timeout --default 900` - wait_drkonqi_counter=0 -- while $qdbus | grep "^[^w]*org.kde.drkonqi" > /dev/null ; do -+ while @qt5tools@/bin/qdbus | @gnugrep@/bin/grep "^[^w]*org.kde.drkonqi" > /dev/null ; do - sleep 5 - wait_drkonqi_counter=$((wait_drkonqi_counter+5)) - if test "$wait_drkonqi_counter" -ge "$wait_drkonqi_timeout" ; then - # ask remaining drkonqis to die in a graceful way -- $qdbus | grep 'org.kde.drkonqi-' | while read address ; do -- $qdbus "$address" "/MainApplication" "quit" -+ @qt5tools@/bin/qdbus | @gnugrep@/bin/grep 'org.kde.drkonqi-' | while read address ; do -+ @qt5tools@/bin/qdbus "$address" "/MainApplication" "quit" - done - break - fi -@@ -417,21 +377,21 @@ echo 'startkde: Shutting down...' 1>&2 - test -n "$ksplash_pid" && kill "$ksplash_pid" 2>/dev/null - - # Clean up --kdeinit5_shutdown -+@kinit@/bin/kdeinit5_shutdown - - echo 'startkde: Running shutdown scripts...' 1>&2 - - # Run scripts found in /plasma-workspace/shutdown - for prefix in `echo "$scriptpath"`; do -- for file in `ls "$prefix"/shutdown 2> /dev/null | egrep -v '(~|\.bak)$'`; do -+ for file in `ls "$prefix"/shutdown 2> /dev/null | @gnugrep@/bin/egrep -v '(~|\.bak)$'`; do - test -x "$prefix/shutdown/$file" && "$prefix/shutdown/$file" - done - done - - unset KDE_FULL_SESSION --xprop -root -remove KDE_FULL_SESSION -+@xprop@/bin/xprop -root -remove KDE_FULL_SESSION - unset KDE_SESSION_VERSION --xprop -root -remove KDE_SESSION_VERSION -+@xprop@/bin/xprop -root -remove KDE_SESSION_VERSION - unset KDE_SESSION_UID - - echo 'startkde: Done.' 1>&2 --- -2.4.5 - diff --git a/pkgs/desktops/plasma-5.3/renames.json b/pkgs/desktops/plasma-5.3/renames.json deleted file mode 100644 index 98141d29cc58..000000000000 --- a/pkgs/desktops/plasma-5.3/renames.json +++ /dev/null @@ -1,20 +0,0 @@ -{ - "kf5sysguard": "libksysguard", - "kf5baloo": "baloo", - "krunnerappdbusinterface": "plasma-workspace", - "screensaverdbusinterface": "plasma-workspace", - "ctest": "kdeplasma-addons", - "kf5filemetadata": "kfilemetadata", - "kwindbusinterface": "kwin", - "kf5activitiesexperimentalstats": "plasma-desktop", - "khotkeysdbusinterface": "khotkeys", - "libkworkspace": "plasma-workspace", - "libtaskmanager": "plasma-workspace", - "backend": "powerdevil", - "kf5screen": "libkscreen", - "ksmserverdbusinterface": "plasma-workspace", - "kf5wayland": "kwayland", - "kdecoration2": "kdecoration", - "kf5bluezqt": "bluez-qt", - "oxygenfont": "oxygen-fonts" -} \ No newline at end of file diff --git a/pkgs/desktops/plasma-5.3/setup-hook.sh b/pkgs/desktops/plasma-5.3/setup-hook.sh deleted file mode 100644 index a8d9b7e0e36f..000000000000 --- a/pkgs/desktops/plasma-5.3/setup-hook.sh +++ /dev/null @@ -1 +0,0 @@ -addToSearchPath XDG_DATA_DIRS @out@/share diff --git a/pkgs/development/libraries/kde-frameworks-5.10/default.nix b/pkgs/development/libraries/kde-frameworks-5.10/default.nix deleted file mode 100644 index e6961f16d277..000000000000 --- a/pkgs/development/libraries/kde-frameworks-5.10/default.nix +++ /dev/null @@ -1,217 +0,0 @@ -# Maintainer's Notes: -# -# Minor updates: -# 1. Edit ./manifest.sh to point to the updated URL. Upstream sometimes -# releases updates that include only the changed packages; in this case, -# multiple URLs can be provided and the results will be merged. -# 2. Run ./manifest.sh and ./dependencies.sh. -# 3. Build and enjoy. -# -# Major updates: -# We prefer not to immediately overwrite older versions with major updates, so -# make a copy of this directory first. After copying, be sure to delete ./tmp -# if it exists. Then follow the minor update instructions. - -{ pkgs, newScope, qt5 ? null, debug ? false }: - -let inherit (pkgs) autonix stdenv symlinkJoin; in - -with autonix; let inherit (stdenv) lib; in - -let - qt5_ = if qt5 != null then qt5 else pkgs.qt54; -in - -let - - qt5 = qt5_; - - super = - let json = builtins.fromJSON (builtins.readFile ./packages.json); - mirrorUrl = n: pkg: pkg // { - src = pkg.src // { url = "mirror://kde/${pkg.src.url}"; }; - }; - renames = builtins.fromJSON (builtins.readFile ./renames.json); - propagated = [ "extra-cmake-modules" ]; - native = [ - "bison" - "extra-cmake-modules" - "flex" - "kdoctools" - "ki18n" - "libxslt" - "perl" - "pythoninterp" - ]; - user = [ - "qt5" - "qt5core" - "qt5dbus" - "qt5gui" - "qt5qml" - "qt5quick" - "qt5svg" - "qt5webkitwidgets" - "qt5widgets" - "qt5x11extras" - "shareddesktopontologies" - "sharedmimeinfo" - ]; - in lib.fold (f: attrs: f attrs) json [ - (lib.mapAttrs kdePackage) - (userEnvDeps user) - (nativeDeps native) - (propagateDeps propagated) - (renameDeps renames) - (lib.mapAttrs mirrorUrl) - ]; - - kdePackage = name: pkg: - let defaultOverride = drv: drv // { - setupHook = ./setup-hook.sh; - cmakeFlags = - (drv.cmakeFlags or []) - ++ [ "-DBUILD_TESTING=OFF" ] - ++ lib.optional debug "-DCMAKE_BUILD_TYPE=Debug"; - meta = { - license = with stdenv.lib.licenses; [ - lgpl21Plus lgpl3Plus bsd2 mit gpl2Plus gpl3Plus fdl12 - ]; - platforms = stdenv.lib.platforms.linux; - maintainers = with stdenv.lib.maintainers; [ ttuegel ]; - homepage = "http://www.kde.org"; - }; - }; - callPackage = newScope { - inherit (stdenv) mkDerivation; - inherit (pkgs) fetchurl; - inherit scope; - }; - in mkPackage callPackage defaultOverride name pkg; - - scope = - # packages in this collection - self // - # packages pinned to this version of Qt 5 - { - dbusmenu-qt5 = pkgs.libdbusmenu_qt5.override { inherit qt5; }; - phonon4qt5 = pkgs.phonon_qt5.override { inherit qt5; }; - polkit_qt5 = pkgs.polkit_qt5.override { inherit qt5; }; - qt5 = qt5.base; - qt5core = qt5.base; - qt5dbus = qt5.base; - qt5gui = qt5.base; - qt5linguisttools = qt5.tools; - qt5qml = [qt5.declarative qt5.graphicaleffects]; - qt5quick = [qt5.quickcontrols qt5.graphicaleffects]; - qt5script = qt5.script; - qt5svg = qt5.svg; - qt5webkitwidgets = qt5.webkit; - qt5widgets = qt5.base; - qt5x11extras = qt5.x11extras; - qt5xmlpatterns = qt5.xmlpatterns; - } // - # packages from the nixpkgs collection - (with pkgs; - { - inherit acl cmake docbook_xml_dtd_45 docbook5_xsl epoxy fam gpgme - libgcrypt libgit2 modemmanager networkmanager perl - perlPackages qimageblitz xorg zlib; - boost = boost155; - gif = giflib; - glib2 = glib; - jpeg = libjpeg; - libintl = gettext; - liblzma = lzma; - pythoninterp = python; - pythonlibrary = python; - sharedmimeinfo = shared_mime_info; - } - ); - - self = super // { - extra-cmake-modules = overrideDerivation super.extra-cmake-modules (drv: { - buildInputs = []; - nativeBuildInputs = []; - propagatedBuildInputs = []; - propagatedNativeBuildInputs = [ scope.cmake pkgs.pkgconfig qt5.tools ]; - propagatedUserEnvPkgs = []; - cmakeFlags = ["-DBUILD_TESTING=OFF"]; - patches = [./extra-cmake-modules/0001-extra-cmake-modules-paths.patch]; - meta = { - license = stdenv.lib.licenses.bsd2; - platforms = stdenv.lib.platforms.linux; - maintainers = with stdenv.lib.maintainers; [ ttuegel ]; - homepage = "http://www.kde.org"; - }; - }); - - frameworkintegration = extendDerivation super.frameworkintegration { - buildInputs = [ scope.xorg.libXcursor ]; - }; - - kauth = extendDerivation super.kauth { - buildInputs = [ scope.polkit_qt5 ]; - patches = [ ./kauth/kauth-policy-install.patch ]; - }; - - kcmutils = extendDerivation super.kcmutils { - patches = [ ./kcmutils/kcmutils-pluginselector-follow-symlinks.patch ]; - }; - - kconfigwidgets = extendDerivation super.kconfigwidgets { - patches = [ ./kconfigwidgets/kconfigwidgets-helpclient-follow-symlinks.patch ]; - }; - - kdelibs4support = extendDerivation super.kdelibs4support { - buildInputs = [ scope.networkmanager scope.xorg.libSM ]; - cmakeFlags = [ - "-DDocBookXML4_DTD_DIR=${pkgs.docbook_xml_dtd_45}/xml/dtd/docbook" - "-DDocBookXML4_DTD_VERSION=4.5" - ]; - }; - - kdoctools = extendDerivation super.kdoctools { - propagatedNativeBuildInputs = [ scope.perl scope.perlPackages.URI ]; - cmakeFlags = [ - "-DDocBookXML4_DTD_DIR=${scope.docbook_xml_dtd_45}/xml/dtd/docbook" - "-DDocBookXML4_DTD_VERSION=4.5" - "-DDocBookXSL_DIR=${scope.docbook5_xsl}/xml/xsl/docbook" - ]; - patches = [ ./kdoctools/kdoctools-no-find-docbook-xml.patch ]; - }; - - ki18n = extendDerivation super.ki18n { - propagatedNativeBuildInputs = with scope; [ libintl pythoninterp ]; - }; - - kimageformats = extendDerivation super.kimageformats { - NIX_CFLAGS_COMPILE = "-I${pkgs.ilmbase}/include/OpenEXR"; - }; - - kinit = extendDerivation super.kinit { - patches = [./kinit/0001-kinit-libpath.patch]; - }; - - kpackage = extendDerivation super.kpackage { - patches = [ ./kpackage/0001-allow-external-paths.patch ]; - }; - - kservice = extendDerivation super.kservice { - buildInputs = [ scope.kwindowsystem ]; - patches = [ - ./kservice/kservice-kbuildsycoca-follow-symlinks.patch - ./kservice/kservice-kbuildsycoca-no-canonicalize-path.patch - ]; - }; - - ktexteditor = extendDerivation super.ktexteditor { - patches = [ ./ktexteditor/0001-no-qcoreapplication.patch ]; - }; - - networkmanager-qt = extendDerivation super.networkmanager-qt { - propagatedBuildInputs = [ scope.networkmanager ]; - }; - }; - -in self diff --git a/pkgs/development/libraries/kde-frameworks-5.10/dependencies.sh b/pkgs/development/libraries/kde-frameworks-5.10/dependencies.sh deleted file mode 100755 index 6122ddf4b3a6..000000000000 --- a/pkgs/development/libraries/kde-frameworks-5.10/dependencies.sh +++ /dev/null @@ -1,22 +0,0 @@ -#!/bin/sh - -# This script rebuilds dependencies.nix. -# You must run manifest.sh first to download the packages. - -# Without arguments, this will use the version of autonix-deps-kf5 in nixpkgs. -# If you are working on the packages, this is probably what you want. - -# You can also pass the path to a source tree where you have built -# autonix-deps-kf5 yourself. If you are working on autonix-deps-kf5, this is -# probably what you want. - -manifestXML=$(nix-build -E 'with (import ../../../.. {}); autonix.writeManifestXML ./manifest.nix') - -autonixDepsKf5="" -if [[ -z $1 ]]; then - autonixDepsKF5=$(nix-build ../../../.. -A haskellPackages.autonix-deps-kf5)/bin -else - autonixDepsKF5="$1/dist/build/kf5-deps" -fi - -exec ${autonixDepsKF5}/kf5-deps "${manifestXML}" diff --git a/pkgs/development/libraries/kde-frameworks-5.10/extra-cmake-modules/0001-extra-cmake-modules-paths.patch b/pkgs/development/libraries/kde-frameworks-5.10/extra-cmake-modules/0001-extra-cmake-modules-paths.patch deleted file mode 100644 index 9717716faf5b..000000000000 --- a/pkgs/development/libraries/kde-frameworks-5.10/extra-cmake-modules/0001-extra-cmake-modules-paths.patch +++ /dev/null @@ -1,74 +0,0 @@ -From 3cc148e878b69fc3e0228f3e3bf1bbe689dad87c Mon Sep 17 00:00:00 2001 -From: Thomas Tuegel -Date: Fri, 20 Feb 2015 23:17:39 -0600 -Subject: [PATCH] extra-cmake-modules paths - ---- - kde-modules/KDEInstallDirs.cmake | 37 ++++--------------------------------- - 1 file changed, 4 insertions(+), 33 deletions(-) - -diff --git a/kde-modules/KDEInstallDirs.cmake b/kde-modules/KDEInstallDirs.cmake -index b7cd34d..2f868ac 100644 ---- a/kde-modules/KDEInstallDirs.cmake -+++ b/kde-modules/KDEInstallDirs.cmake -@@ -193,37 +193,8 @@ - # (To distribute this file outside of extra-cmake-modules, substitute the full - # License text for the above reference.) - --# Figure out what the default install directory for libraries should be. --# This is based on the logic in GNUInstallDirs, but simplified (the --# GNUInstallDirs code deals with re-configuring, but that is dealt with --# by the _define_* macros in this module). -+# The default library directory on NixOS is *always* /lib. - set(_LIBDIR_DEFAULT "lib") --# Override this default 'lib' with 'lib64' iff: --# - we are on a Linux, kFreeBSD or Hurd system but NOT cross-compiling --# - we are NOT on debian --# - we are on a 64 bits system --# reason is: amd64 ABI: http://www.x86-64.org/documentation/abi.pdf --# For Debian with multiarch, use 'lib/${CMAKE_LIBRARY_ARCHITECTURE}' if --# CMAKE_LIBRARY_ARCHITECTURE is set (which contains e.g. "i386-linux-gnu" --# See http://wiki.debian.org/Multiarch --if((CMAKE_SYSTEM_NAME MATCHES "Linux|kFreeBSD" OR CMAKE_SYSTEM_NAME STREQUAL "GNU") -- AND NOT CMAKE_CROSSCOMPILING) -- if (EXISTS "/etc/debian_version") # is this a debian system ? -- if(CMAKE_LIBRARY_ARCHITECTURE) -- set(_LIBDIR_DEFAULT "lib/${CMAKE_LIBRARY_ARCHITECTURE}") -- endif() -- else() # not debian, rely on CMAKE_SIZEOF_VOID_P: -- if(NOT DEFINED CMAKE_SIZEOF_VOID_P) -- message(AUTHOR_WARNING -- "Unable to determine default LIB_INSTALL_LIBDIR directory because no target architecture is known. " -- "Please enable at least one language before including KDEInstallDirs.") -- else() -- if("${CMAKE_SIZEOF_VOID_P}" EQUAL "8") -- set(_LIBDIR_DEFAULT "lib64") -- endif() -- endif() -- endif() --endif() - - set(_gnu_install_dirs_vars - BINDIR -@@ -445,15 +416,15 @@ if(KDE_INSTALL_USE_QT_SYS_PATHS) - "QtQuick2 imports" - QML_INSTALL_DIR) - else() -- _define_relative(QTPLUGINDIR LIBDIR "plugins" -+ _define_relative(QTPLUGINDIR LIBDIR "qt5/plugins" - "Qt plugins" - QT_PLUGIN_INSTALL_DIR) - -- _define_relative(QTQUICKIMPORTSDIR QTPLUGINDIR "imports" -+ _define_relative(QTQUICKIMPORTSDIR QTPLUGINDIR "qt5/imports" - "QtQuick1 imports" - IMPORTS_INSTALL_DIR) - -- _define_relative(QMLDIR LIBDIR "qml" -+ _define_relative(QMLDIR LIBDIR "qt5/qml" - "QtQuick2 imports" - QML_INSTALL_DIR) - endif() --- -2.3.0 - diff --git a/pkgs/development/libraries/kde-frameworks-5.10/kauth/kauth-policy-install.patch b/pkgs/development/libraries/kde-frameworks-5.10/kauth/kauth-policy-install.patch deleted file mode 100644 index 340155256f28..000000000000 --- a/pkgs/development/libraries/kde-frameworks-5.10/kauth/kauth-policy-install.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/KF5AuthConfig.cmake.in b/KF5AuthConfig.cmake.in -index e859ec7..9a8ab18 100644 ---- a/KF5AuthConfig.cmake.in -+++ b/KF5AuthConfig.cmake.in -@@ -4,7 +4,7 @@ set(KAUTH_STUB_FILES_DIR "${PACKAGE_PREFIX_DIR}/@KF5_DATA_INSTALL_DIR@/kauth/") - - set(KAUTH_BACKEND_NAME "@KAUTH_BACKEND_NAME@") - set(KAUTH_HELPER_BACKEND_NAME "@KAUTH_HELPER_BACKEND_NAME@") --set(KAUTH_POLICY_FILES_INSTALL_DIR "@KAUTH_POLICY_FILES_INSTALL_DIR@") -+set(KAUTH_POLICY_FILES_INSTALL_DIR "\${CMAKE_INSTALL_PREFIX}/share/polkit-1/actions") - set(KAUTH_HELPER_INSTALL_DIR "@KAUTH_HELPER_INSTALL_DIR@") - - find_dependency(KF5CoreAddons "@KF5_DEP_VERSION@") diff --git a/pkgs/development/libraries/kde-frameworks-5.10/kcmutils/kcmutils-pluginselector-follow-symlinks.patch b/pkgs/development/libraries/kde-frameworks-5.10/kcmutils/kcmutils-pluginselector-follow-symlinks.patch deleted file mode 100644 index 47b8dfad1800..000000000000 --- a/pkgs/development/libraries/kde-frameworks-5.10/kcmutils/kcmutils-pluginselector-follow-symlinks.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/src/kpluginselector.cpp b/src/kpluginselector.cpp -index c63241b..2243f94 100644 ---- a/src/kpluginselector.cpp -+++ b/src/kpluginselector.cpp -@@ -304,7 +304,7 @@ void KPluginSelector::addPlugins(const QString &componentName, - QStringList desktopFileNames; - const QStringList dirs = QStandardPaths::locateAll(QStandardPaths::GenericDataLocation, componentName + QStringLiteral("/kpartplugins"), QStandardPaths::LocateDirectory); - Q_FOREACH (const QString &dir, dirs) { -- QDirIterator it(dir, QStringList() << QStringLiteral("*.desktop"), QDir::NoFilter, QDirIterator::Subdirectories); -+ QDirIterator it(dir, QStringList() << QStringLiteral("*.desktop"), QDir::NoFilter, QDirIterator::Subdirectories | QDirIterator::FollowSymlinks); - while (it.hasNext()) { - desktopFileNames.append(it.next()); - } diff --git a/pkgs/development/libraries/kde-frameworks-5.10/kconfigwidgets/kconfigwidgets-helpclient-follow-symlinks.patch b/pkgs/development/libraries/kde-frameworks-5.10/kconfigwidgets/kconfigwidgets-helpclient-follow-symlinks.patch deleted file mode 100644 index 3bd946cbd842..000000000000 --- a/pkgs/development/libraries/kde-frameworks-5.10/kconfigwidgets/kconfigwidgets-helpclient-follow-symlinks.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/src/khelpclient.cpp b/src/khelpclient.cpp -index 53a331e..80fbb01 100644 ---- a/src/khelpclient.cpp -+++ b/src/khelpclient.cpp -@@ -48,7 +48,7 @@ void KHelpClient::invokeHelp(const QString &anchor, const QString &_appname) - QString docPath; - const QStringList desktopDirs = QStandardPaths::standardLocations(QStandardPaths::ApplicationsLocation); - Q_FOREACH (const QString &dir, desktopDirs) { -- QDirIterator it(dir, QStringList() << appname + QLatin1String(".desktop"), QDir::NoFilter, QDirIterator::Subdirectories); -+ QDirIterator it(dir, QStringList() << appname + QLatin1String(".desktop"), QDir::NoFilter, QDirIterator::Subdirectories | QDirIterator::FollowSymlinks); - while (it.hasNext()) { - const QString desktopPath(it.next()); - KDesktopFile desktopFile(desktopPath); diff --git a/pkgs/development/libraries/kde-frameworks-5.10/kdoctools/kdoctools-no-find-docbook-xml.patch b/pkgs/development/libraries/kde-frameworks-5.10/kdoctools/kdoctools-no-find-docbook-xml.patch deleted file mode 100644 index 4e3a33efab32..000000000000 --- a/pkgs/development/libraries/kde-frameworks-5.10/kdoctools/kdoctools-no-find-docbook-xml.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff --git a/CMakeLists.txt b/CMakeLists.txt -index 5c4863c..f731775 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -46,7 +46,6 @@ set_package_properties(LibXml2 PROPERTIES - ) - - --find_package(DocBookXML4 "4.5") - - set_package_properties(DocBookXML4 PROPERTIES - TYPE REQUIRED diff --git a/pkgs/development/libraries/kde-frameworks-5.10/kinit/0001-kinit-libpath.patch b/pkgs/development/libraries/kde-frameworks-5.10/kinit/0001-kinit-libpath.patch deleted file mode 100644 index 9c76079a382a..000000000000 --- a/pkgs/development/libraries/kde-frameworks-5.10/kinit/0001-kinit-libpath.patch +++ /dev/null @@ -1,42 +0,0 @@ -From 723c9b1268a04127647a1c20eebe9804150566dd Mon Sep 17 00:00:00 2001 -From: Thomas Tuegel -Date: Sat, 13 Jun 2015 08:57:55 -0500 -Subject: [PATCH] kinit libpath - ---- - src/kdeinit/kinit.cpp | 18 ++++++++++-------- - 1 file changed, 10 insertions(+), 8 deletions(-) - -diff --git a/src/kdeinit/kinit.cpp b/src/kdeinit/kinit.cpp -index 9e775b6..0ac5646 100644 ---- a/src/kdeinit/kinit.cpp -+++ b/src/kdeinit/kinit.cpp -@@ -660,15 +660,17 @@ static pid_t launch(int argc, const char *_name, const char *args, - if (!libpath.isEmpty()) { - if (!l.load()) { - if (libpath_relative) { -- // NB: Because Qt makes the actual dlopen() call, the -- // RUNPATH of kdeinit is *not* respected - see -- // https://sourceware.org/bugzilla/show_bug.cgi?id=13945 -- // - so we try hacking it in ourselves -- QString install_lib_dir = QFile::decodeName( -- CMAKE_INSTALL_PREFIX "/" LIB_INSTALL_DIR "/"); -- libpath = install_lib_dir + libpath; -- l.setFileName(libpath); -+ // Use QT_PLUGIN_PATH to find shared library directories -+ // For KF5, the plugin path is /lib/qt5/plugins/, so kdeinit5 -+ // shared libraries should be in /lib/qt5/plugins/../../ -+ const QRegExp pathSepRegExp(QString::fromLatin1("[:\b]")); -+ const QString up = QString::fromLocal8Bit("/../../"); -+ const QStringList paths = QString::fromLocal8Bit(qgetenv("QT_PLUGIN_PATH")).split(pathSepRegExp, QString::KeepEmptyParts); -+ Q_FOREACH (const QString &path, paths) { -+ l.setFileName(path + up + libpath); - l.load(); -+ if (l.isLoaded()) break; -+ } - } - } - if (!l.isLoaded()) { --- -2.4.2 - diff --git a/pkgs/development/libraries/kde-frameworks-5.10/kpackage/0001-allow-external-paths.patch b/pkgs/development/libraries/kde-frameworks-5.10/kpackage/0001-allow-external-paths.patch deleted file mode 100644 index 440e979c0086..000000000000 --- a/pkgs/development/libraries/kde-frameworks-5.10/kpackage/0001-allow-external-paths.patch +++ /dev/null @@ -1,25 +0,0 @@ -From fbf10d2059fa1f19a0f0cfa2fda0abb6c435fa78 Mon Sep 17 00:00:00 2001 -From: Thomas Tuegel -Date: Wed, 28 Jan 2015 07:15:30 -0600 -Subject: [PATCH] allow external paths - ---- - src/kpackage/package.cpp | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/src/kpackage/package.cpp b/src/kpackage/package.cpp -index eb4a09b..f70f1a1 100644 ---- a/src/kpackage/package.cpp -+++ b/src/kpackage/package.cpp -@@ -758,7 +758,7 @@ PackagePrivate::PackagePrivate() - : QSharedData(), - fallbackPackage(0), - metadata(0), -- externalPaths(false), -+ externalPaths(true), - valid(false), - checkedValid(false) - { --- -2.1.4 - diff --git a/pkgs/development/libraries/kde-frameworks-5.10/kservice/kservice-kbuildsycoca-follow-symlinks.patch b/pkgs/development/libraries/kde-frameworks-5.10/kservice/kservice-kbuildsycoca-follow-symlinks.patch deleted file mode 100644 index e9bc418544ab..000000000000 --- a/pkgs/development/libraries/kde-frameworks-5.10/kservice/kservice-kbuildsycoca-follow-symlinks.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/src/kbuildsycoca/kbuildsycoca.cpp b/src/kbuildsycoca/kbuildsycoca.cpp -index 69b1427..9c37a49 100644 ---- a/src/kbuildsycoca/kbuildsycoca.cpp -+++ b/src/kbuildsycoca/kbuildsycoca.cpp -@@ -227,7 +227,7 @@ bool KBuildSycoca::build() - QStringList relFiles; - const QStringList dirs = QStandardPaths::locateAll(QStandardPaths::GenericDataLocation, g_resourceSubdir, QStandardPaths::LocateDirectory); - Q_FOREACH (const QString &dir, dirs) { -- QDirIterator it(dir, QDirIterator::Subdirectories); -+ QDirIterator it(dir, QDirIterator::Subdirectories | QDirIterator::FollowSymlinks); - while (it.hasNext()) { - const QString filePath = it.next(); - Q_ASSERT(filePath.startsWith(dir)); // due to the line below... diff --git a/pkgs/development/libraries/kde-frameworks-5.10/kservice/kservice-kbuildsycoca-no-canonicalize-path.patch b/pkgs/development/libraries/kde-frameworks-5.10/kservice/kservice-kbuildsycoca-no-canonicalize-path.patch deleted file mode 100644 index 7e21ebfe86f2..000000000000 --- a/pkgs/development/libraries/kde-frameworks-5.10/kservice/kservice-kbuildsycoca-no-canonicalize-path.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/src/kbuildsycoca/vfolder_menu.cpp b/src/kbuildsycoca/vfolder_menu.cpp -index 2eb1275..e39a36f 100644 ---- a/src/kbuildsycoca/vfolder_menu.cpp -+++ b/src/kbuildsycoca/vfolder_menu.cpp -@@ -412,7 +412,7 @@ VFolderMenu::absoluteDir(const QString &_dir, const QString &baseDir, bool keepR - } - - if (!relative) { -- QString resolved = QDir(dir).canonicalPath(); -+ QString resolved = QDir::cleanPath(dir); - if (!resolved.isEmpty()) { - dir = resolved; - } diff --git a/pkgs/development/libraries/kde-frameworks-5.10/ktexteditor/0001-no-qcoreapplication.patch b/pkgs/development/libraries/kde-frameworks-5.10/ktexteditor/0001-no-qcoreapplication.patch deleted file mode 100644 index c2e77a537c5a..000000000000 --- a/pkgs/development/libraries/kde-frameworks-5.10/ktexteditor/0001-no-qcoreapplication.patch +++ /dev/null @@ -1,48 +0,0 @@ -From 71e28c7c6fdd1142f04c662f45cc8f779e457cda Mon Sep 17 00:00:00 2001 -From: Thomas Tuegel -Date: Sun, 15 Feb 2015 19:09:17 -0600 -Subject: [PATCH] no qcoreapplication - ---- - src/syntax/data/katehighlightingindexer.cpp | 11 ++++------- - 1 file changed, 4 insertions(+), 7 deletions(-) - -diff --git a/src/syntax/data/katehighlightingindexer.cpp b/src/syntax/data/katehighlightingindexer.cpp -index 3f02e8c..d1a865b 100644 ---- a/src/syntax/data/katehighlightingindexer.cpp -+++ b/src/syntax/data/katehighlightingindexer.cpp -@@ -49,19 +49,16 @@ QStringList readListing(const QString &fileName) - - int main(int argc, char *argv[]) - { -- // get app instance -- QCoreApplication app(argc, argv); -- - // ensure enough arguments are passed -- if (app.arguments().size() < 3) -+ if (argc < 3) - return 1; - - // open schema - QXmlSchema schema; -- if (!schema.load(QUrl::fromLocalFile(app.arguments().at(2)))) -+ if (!schema.load(QUrl::fromLocalFile(QString::fromLocal8Bit(argv[2])))) - return 2; - -- const QString hlFilenamesListing = app.arguments().value(3); -+ const QString hlFilenamesListing = QString::fromLocal8Bit(argv[3]); - if (hlFilenamesListing.isEmpty()) { - return 1; - } -@@ -127,7 +124,7 @@ int main(int argc, char *argv[]) - return anyError; - - // create outfile, after all has worked! -- QFile outFile(app.arguments().at(1)); -+ QFile outFile(QString::fromLocal8Bit(argv[1])); - if (!outFile.open(QIODevice::WriteOnly | QIODevice::Truncate)) - return 7; - --- -2.1.4 - diff --git a/pkgs/development/libraries/kde-frameworks-5.10/packages.json b/pkgs/development/libraries/kde-frameworks-5.10/packages.json deleted file mode 100644 index c5e704e62b13..000000000000 --- a/pkgs/development/libraries/kde-frameworks-5.10/packages.json +++ /dev/null @@ -1,2090 +0,0 @@ -{ - "kwallet": { - "nativeBuildInputs": [ - "cmake" - ], - "propagatedNativeBuildInputs": [], - "propagatedUserEnvPkgs": [], - "propagatedBuildInputs": [ - "qt5gui" - ], - "name": "kwallet-5.10.0", - "src": { - "url": "stable/frameworks/5.10/kwallet-5.10.0.tar.xz", - "name": "kwallet-5.10.0.tar.xz", - "sha256": "0nrb67shmdfaw2naa87gp29f2y3nnscj6ipw854j7shxz4fl2nr4" - }, - "buildInputs": [ - "ecm", - "gpgme", - "kf5config", - "kf5coreaddons", - "kf5dbusaddons", - "kf5gpgmepp", - "kf5i18n", - "kf5iconthemes", - "kf5notifications", - "kf5service", - "kf5widgetsaddons", - "kf5windowsystem", - "libgcrypt", - "qt5", - "qt5dbus", - "qt5gui", - "qt5test", - "qt5widgets" - ] - }, - "kdewebkit": { - "nativeBuildInputs": [ - "cmake" - ], - "propagatedNativeBuildInputs": [], - "propagatedUserEnvPkgs": [], - "propagatedBuildInputs": [ - "qt5webkitwidgets" - ], - "name": "kdewebkit-5.10.0", - "src": { - "url": "stable/frameworks/5.10/kdewebkit-5.10.0.tar.xz", - "name": "kdewebkit-5.10.0.tar.xz", - "sha256": "08bw2ximj3z6rs06przf6kah1mczlv2nri99cgiihin99jx8f98h" - }, - "buildInputs": [ - "ecm", - "kf5config", - "kf5coreaddons", - "kf5jobwidgets", - "kf5kio", - "kf5parts", - "kf5service", - "kf5wallet", - "qt5", - "qt5core", - "qt5network", - "qt5webkitwidgets", - "qt5widgets" - ] - }, - "kbookmarks": { - "nativeBuildInputs": [ - "cmake" - ], - "propagatedNativeBuildInputs": [], - "propagatedUserEnvPkgs": [], - "propagatedBuildInputs": [ - "kf5widgetsaddons", - "qt5widgets", - "qt5xml" - ], - "name": "kbookmarks-5.10.0", - "src": { - "url": "stable/frameworks/5.10/kbookmarks-5.10.0.tar.xz", - "name": "kbookmarks-5.10.0.tar.xz", - "sha256": "040n5xv8n357smmhsq24hgv43dcsbpc0wfyjhfznz41azcibbydw" - }, - "buildInputs": [ - "ecm", - "kf5codecs", - "kf5config", - "kf5configwidgets", - "kf5coreaddons", - "kf5iconthemes", - "kf5widgetsaddons", - "kf5xmlgui", - "qt5", - "qt5dbus", - "qt5test", - "qt5widgets", - "qt5xml" - ] - }, - "threadweaver": { - "nativeBuildInputs": [ - "cmake", - "snippetextractor" - ], - "propagatedNativeBuildInputs": [], - "propagatedUserEnvPkgs": [], - "propagatedBuildInputs": [ - "qt5core" - ], - "name": "threadweaver-5.10.0", - "src": { - "url": "stable/frameworks/5.10/threadweaver-5.10.0.tar.xz", - "name": "threadweaver-5.10.0.tar.xz", - "sha256": "1lfdxin8rjvjpqky3g416magsg9ivf5kjmh9r37rz4v0mxsv5knd" - }, - "buildInputs": [ - "ecm", - "kf5threadweaver", - "qt5", - "qt5core", - "qt5network", - "qt5test", - "qt5widgets", - "qt5xml" - ] - }, - "kcompletion": { - "nativeBuildInputs": [ - "cmake" - ], - "propagatedNativeBuildInputs": [], - "propagatedUserEnvPkgs": [], - "propagatedBuildInputs": [ - "qt5widgets" - ], - "name": "kcompletion-5.10.0", - "src": { - "url": "stable/frameworks/5.10/kcompletion-5.10.0.tar.xz", - "name": "kcompletion-5.10.0.tar.xz", - "sha256": "1cb8b7qij67bghg35xcbs2lpkh5jzl7illln7h6h9jyygzv6vq7m" - }, - "buildInputs": [ - "ecm", - "kf5config", - "kf5widgetsaddons", - "qt5", - "qt5test", - "qt5widgets" - ] - }, - "kwidgetsaddons": { - "nativeBuildInputs": [ - "cmake" - ], - "propagatedNativeBuildInputs": [], - "propagatedUserEnvPkgs": [], - "propagatedBuildInputs": [ - "qt5widgets" - ], - "name": "kwidgetsaddons-5.10.0", - "src": { - "url": "stable/frameworks/5.10/kwidgetsaddons-5.10.0.tar.xz", - "name": "kwidgetsaddons-5.10.0.tar.xz", - "sha256": "0c9gzwsacm4zjjqc25akzf88fgrp9nraqid3c4na6asyn1pxzkmh" - }, - "buildInputs": [ - "ecm", - "qt5", - "qt5test", - "qt5uitools", - "qt5widgets" - ] - }, - "kxmlrpcclient": { - "nativeBuildInputs": [ - "cmake" - ], - "propagatedNativeBuildInputs": [], - "propagatedUserEnvPkgs": [], - "propagatedBuildInputs": [ - "kf5kio" - ], - "name": "kxmlrpcclient-5.10.0", - "src": { - "url": "stable/frameworks/5.10/kxmlrpcclient-5.10.0.tar.xz", - "name": "kxmlrpcclient-5.10.0.tar.xz", - "sha256": "1cjwqxpwwx9gxxb43dncyfcn3rjfx28af6dbh4zx7l0yqw4z4cxi" - }, - "buildInputs": [ - "ecm", - "kf5i18n", - "kf5kio", - "qt5test" - ] - }, - "extra-cmake-modules": { - "nativeBuildInputs": [ - "cmake", - "qcollectiongenerator_executable", - "sphinx_executable" - ], - "propagatedNativeBuildInputs": [], - "propagatedUserEnvPkgs": [], - "propagatedBuildInputs": [], - "name": "extra-cmake-modules-5.10.0", - "src": { - "url": "stable/frameworks/5.10/extra-cmake-modules-5.10.0.tar.xz", - "name": "extra-cmake-modules-5.10.0.tar.xz", - "sha256": "00h62mmxl8jwslssczv14dmydgmg3rr12dd8b5471xbmx8kvqb86" - }, - "buildInputs": [ - "agg", - "blitz", - "bluez", - "eigen2", - "enchant", - "ffmpeg", - "flac", - "flex", - "gobject", - "gstreamer", - "lcms", - "libart", - "libxslt", - "openexr", - "pcre", - "qca2", - "qimageblitz", - "qt5core", - "qt5linguisttools", - "sqlite", - "strigi", - "usb", - "xine", - "xmms" - ] - }, - "kidletime": { - "nativeBuildInputs": [ - "cmake" - ], - "propagatedNativeBuildInputs": [], - "propagatedUserEnvPkgs": [], - "propagatedBuildInputs": [ - "qt5core" - ], - "name": "kidletime-5.10.0", - "src": { - "url": "stable/frameworks/5.10/kidletime-5.10.0.tar.xz", - "name": "kidletime-5.10.0.tar.xz", - "sha256": "0rvw4b22x9jgkqx64wisc0qnl6kx2b97sz2hxcpqh2lkj1cql4r0" - }, - "buildInputs": [ - "ecm", - "qt5", - "qt5dbus", - "qt5widgets", - "qt5x11extras", - "x11", - "x11_xcb", - "xcb" - ] - }, - "kitemmodels": { - "nativeBuildInputs": [ - "cmake" - ], - "propagatedNativeBuildInputs": [], - "propagatedUserEnvPkgs": [], - "propagatedBuildInputs": [ - "qt5core" - ], - "name": "kitemmodels-5.10.0", - "src": { - "url": "stable/frameworks/5.10/kitemmodels-5.10.0.tar.xz", - "name": "kitemmodels-5.10.0.tar.xz", - "sha256": "1c63wsy9iy842ljv2vmnjcn6p3ahnv6pm73p1kayjdqq6wy0lmq6" - }, - "buildInputs": [ - "ecm", - "grantlee", - "qt5", - "qt5core", - "qt5quickwidgets", - "qt5script", - "qt5test", - "qt5widgets" - ] - }, - "attica": { - "nativeBuildInputs": [ - "cmake" - ], - "propagatedNativeBuildInputs": [], - "propagatedUserEnvPkgs": [], - "propagatedBuildInputs": [ - "qt5core" - ], - "name": "attica-5.10.0", - "src": { - "url": "stable/frameworks/5.10/attica-5.10.0.tar.xz", - "name": "attica-5.10.0.tar.xz", - "sha256": "1immb10bvpkscdawyv1n0y52jjnfy0y3hnjxxzfwci9fj24da625" - }, - "buildInputs": [ - "ecm", - "qt5", - "qt5core", - "qt5network", - "qt5test", - "qt5widgets" - ] - }, - "kwindowsystem": { - "nativeBuildInputs": [ - "cmake" - ], - "propagatedNativeBuildInputs": [], - "propagatedUserEnvPkgs": [], - "propagatedBuildInputs": [ - "qt5widgets" - ], - "name": "kwindowsystem-5.10.0", - "src": { - "url": "stable/frameworks/5.10/kwindowsystem-5.10.0.tar.xz", - "name": "kwindowsystem-5.10.0.tar.xz", - "sha256": "0grxbydcc9k88nnlav7vcn3lajzswcsim5cpjcsysx9irx8rbiqf" - }, - "buildInputs": [ - "ecm", - "qt5", - "qt5test", - "qt5widgets", - "qt5winextras", - "qt5x11extras", - "x11", - "xcb" - ] - }, - "ki18n": { - "nativeBuildInputs": [ - "cmake" - ], - "propagatedNativeBuildInputs": [], - "propagatedUserEnvPkgs": [], - "propagatedBuildInputs": [], - "name": "ki18n-5.10.0", - "src": { - "url": "stable/frameworks/5.10/ki18n-5.10.0.tar.xz", - "name": "ki18n-5.10.0.tar.xz", - "sha256": "0xa27c42bnvhks6mdz593hxwl3idagyz6mbmp8p5dj6xsfdabrcs" - }, - "buildInputs": [ - "ecm", - "libintl", - "qt5", - "qt5concurrent", - "qt5core", - "qt5script", - "qt5test" - ] - }, - "knewstuff": { - "nativeBuildInputs": [ - "cmake" - ], - "propagatedNativeBuildInputs": [], - "propagatedUserEnvPkgs": [], - "propagatedBuildInputs": [ - "kf5attica", - "kf5service", - "kf5xmlgui", - "qt5widgets" - ], - "name": "knewstuff-5.10.0", - "src": { - "url": "stable/frameworks/5.10/knewstuff-5.10.0.tar.xz", - "name": "knewstuff-5.10.0.tar.xz", - "sha256": "1z24h7rk7vyavw3949gj06y924x1sbyy8jh3krr1ngpddlrsk5l7" - }, - "buildInputs": [ - "ecm", - "kf5archive", - "kf5attica", - "kf5completion", - "kf5config", - "kf5coreaddons", - "kf5i18n", - "kf5iconthemes", - "kf5itemviews", - "kf5kio", - "kf5service", - "kf5textwidgets", - "kf5widgetsaddons", - "kf5xmlgui", - "qt5", - "qt5test", - "qt5widgets", - "qt5xml" - ] - }, - "kdelibs4support": { - "nativeBuildInputs": [ - "cmake" - ], - "propagatedNativeBuildInputs": [], - "propagatedUserEnvPkgs": [], - "propagatedBuildInputs": [ - "kdewin", - "kf5archive", - "kf5auth", - "kf5configwidgets", - "kf5coreaddons", - "kf5crash", - "kf5dbusaddons", - "kf5designerplugin", - "kf5doctools", - "kf5emoticons", - "kf5guiaddons", - "kf5iconthemes", - "kf5init", - "kf5itemmodels", - "kf5kdelibs4support", - "kf5notifications", - "kf5parts", - "kf5textwidgets", - "kf5unitconversion", - "kf5windowsystem", - "qt5dbus", - "qt5printsupport", - "qt5xml" - ], - "name": "kdelibs4support-5.10.0", - "src": { - "url": "stable/frameworks/5.10/portingAids/kdelibs4support-5.10.0.tar.xz", - "name": "kdelibs4support-5.10.0.tar.xz", - "sha256": "0j7ah078ckz8zcdb417j7dmzpcbs9vvbr42r6c49fk7rp7vy4ly2" - }, - "buildInputs": [ - "agg", - "blitz", - "bluez", - "docbookxml4", - "ecm", - "eigen2", - "enchant", - "ffmpeg", - "flac", - "gobject", - "gstreamer", - "kdewin", - "kf5completion", - "kf5config", - "kf5configwidgets", - "kf5crash", - "kf5dbusaddons", - "kf5designerplugin", - "kf5doctools", - "kf5globalaccel", - "kf5guiaddons", - "kf5i18n", - "kf5iconthemes", - "kf5kio", - "kf5notifications", - "kf5parts", - "kf5service", - "kf5textwidgets", - "kf5unitconversion", - "kf5widgetsaddons", - "kf5windowsystem", - "kf5xmlgui", - "lcms", - "libart", - "networkmanager", - "openexr", - "openssl", - "pcre", - "qca2", - "qimageblitz", - "qntrack", - "qt5", - "qt5concurrent", - "qt5dbus", - "qt5designer", - "qt5network", - "qt5printsupport", - "qt5svg", - "qt5test", - "qt5widgets", - "qt5x11extras", - "sqlite", - "usb", - "x11", - "xine", - "xmms" - ] - }, - "sonnet": { - "nativeBuildInputs": [ - "cmake" - ], - "propagatedNativeBuildInputs": [], - "propagatedUserEnvPkgs": [], - "propagatedBuildInputs": [ - "qt5core" - ], - "name": "sonnet-5.10.0", - "src": { - "url": "stable/frameworks/5.10/sonnet-5.10.0.tar.xz", - "name": "sonnet-5.10.0.tar.xz", - "sha256": "1ad205mldwk234vwjkbalx6pnib02mz68drajg07ii5ycsczgk93" - }, - "buildInputs": [ - "aspell", - "ecm", - "enchant", - "hspell", - "hunspell", - "qt5", - "qt5test", - "qt5widgets", - "zlib" - ] - }, - "networkmanager-qt": { - "nativeBuildInputs": [ - "cmake" - ], - "propagatedNativeBuildInputs": [], - "propagatedUserEnvPkgs": [], - "propagatedBuildInputs": [ - "qt5core" - ], - "name": "networkmanager-qt-5.10.0", - "src": { - "url": "stable/frameworks/5.10/networkmanager-qt-5.10.0.tar.xz", - "name": "networkmanager-qt-5.10.0.tar.xz", - "sha256": "0a9yg40rmvl7mxscyx6ndq4fwqxfy6rfy6a6cb8b6wm2im29njc4" - }, - "buildInputs": [ - "ecm", - "networkmanager", - "qt4", - "qt5", - "qt5core", - "qt5dbus", - "qt5network", - "qt5test" - ] - }, - "solid": { - "nativeBuildInputs": [ - "cmake" - ], - "propagatedNativeBuildInputs": [], - "propagatedUserEnvPkgs": [], - "propagatedBuildInputs": [ - "qt5core" - ], - "name": "solid-5.10.0", - "src": { - "url": "stable/frameworks/5.10/solid-5.10.0.tar.xz", - "name": "solid-5.10.0.tar.xz", - "sha256": "1qy3bic39jffc2pl1wh36qm8sizjld6gd2qx6y4j9xzkv723r864" - }, - "buildInputs": [ - "bison", - "ecm", - "flex", - "iokit", - "mediaplayerinfo", - "qt5", - "qt5concurrent", - "qt5dbus", - "qt5network", - "qt5qml", - "qt5test", - "qt5widgets", - "qt5xml", - "udev" - ] - }, - "modemmanager-qt": { - "nativeBuildInputs": [ - "cmake" - ], - "propagatedNativeBuildInputs": [], - "propagatedUserEnvPkgs": [], - "propagatedBuildInputs": [ - "qt5core" - ], - "name": "modemmanager-qt-5.10.0", - "src": { - "url": "stable/frameworks/5.10/modemmanager-qt-5.10.0.tar.xz", - "name": "modemmanager-qt-5.10.0.tar.xz", - "sha256": "1whhc8clibiwzda4zbk8asry65c7nlnlgq10sbmh7gq008l0z9l1" - }, - "buildInputs": [ - "ecm", - "kf5modemmanagerqt", - "modemmanager", - "qt4", - "qt5", - "qt5core", - "qt5dbus", - "qt5test", - "qt5xml" - ] - }, - "kactivities": { - "nativeBuildInputs": [ - "cmake" - ], - "propagatedNativeBuildInputs": [], - "propagatedUserEnvPkgs": [], - "propagatedBuildInputs": [ - "qt5core" - ], - "name": "kactivities-5.10.0", - "src": { - "url": "stable/frameworks/5.10/kactivities-5.10.0.tar.xz", - "name": "kactivities-5.10.0.tar.xz", - "sha256": "0d2cyjv9hb4zd99sp598miwq4k1nzv4ssbgak7jmifqcimjpjjsk" - }, - "buildInputs": [ - "boost", - "ecm", - "kf5", - "kf5config", - "kf5coreaddons", - "kf5dbusaddons", - "kf5declarative", - "kf5globalaccel", - "kf5i18n", - "kf5kcmutils", - "kf5kio", - "kf5service", - "kf5windowsystem", - "kf5xmlgui", - "qt5", - "qt5core", - "qt5dbus", - "qt5gui", - "qt5qml", - "qt5quick", - "qt5sql", - "qt5test", - "qt5widgets" - ] - }, - "kpeople": { - "nativeBuildInputs": [ - "cmake" - ], - "propagatedNativeBuildInputs": [], - "propagatedUserEnvPkgs": [], - "propagatedBuildInputs": [ - "qt5core" - ], - "name": "kpeople-5.10.0", - "src": { - "url": "stable/frameworks/5.10/kpeople-5.10.0.tar.xz", - "name": "kpeople-5.10.0.tar.xz", - "sha256": "0b56c3pha1rgz9h8ia0vd4k5nvmxh64wgk5vgfnxa0znij47wcka" - }, - "buildInputs": [ - "ecm", - "kf5coreaddons", - "kf5i18n", - "kf5itemviews", - "kf5service", - "kf5widgetsaddons", - "qt5", - "qt5dbus", - "qt5gui", - "qt5qml", - "qt5quick", - "qt5sql", - "qt5test", - "qt5widgets" - ] - }, - "kcrash": { - "nativeBuildInputs": [ - "cmake" - ], - "propagatedNativeBuildInputs": [], - "propagatedUserEnvPkgs": [], - "propagatedBuildInputs": [ - "qt5core" - ], - "name": "kcrash-5.10.0", - "src": { - "url": "stable/frameworks/5.10/kcrash-5.10.0.tar.xz", - "name": "kcrash-5.10.0.tar.xz", - "sha256": "1imgn8a8ns15f2alp5xljy6llmqy0dv7yiqqjb1n8klvyp5mynlx" - }, - "buildInputs": [ - "ecm", - "kf5coreaddons", - "kf5windowsystem", - "qt5", - "qt5core", - "qt5test", - "qt5widgets", - "qt5x11extras", - "x11" - ] - }, - "kglobalaccel": { - "nativeBuildInputs": [ - "cmake" - ], - "propagatedNativeBuildInputs": [], - "propagatedUserEnvPkgs": [], - "propagatedBuildInputs": [ - "qt5dbus", - "qt5widgets" - ], - "name": "kglobalaccel-5.10.0", - "src": { - "url": "stable/frameworks/5.10/kglobalaccel-5.10.0.tar.xz", - "name": "kglobalaccel-5.10.0.tar.xz", - "sha256": "02nr4f991zi03spq4m9rlj11m5kvhmqghkfl2ijqnwv8m4dq2afy" - }, - "buildInputs": [ - "ecm", - "kf5config", - "kf5coreaddons", - "kf5crash", - "kf5dbusaddons", - "kf5i18n", - "kf5windowsystem", - "qt5", - "qt5dbus", - "qt5test", - "qt5widgets", - "qt5x11extras", - "x11", - "xcb" - ] - }, - "kitemviews": { - "nativeBuildInputs": [ - "cmake" - ], - "propagatedNativeBuildInputs": [], - "propagatedUserEnvPkgs": [], - "propagatedBuildInputs": [ - "qt5widgets" - ], - "name": "kitemviews-5.10.0", - "src": { - "url": "stable/frameworks/5.10/kitemviews-5.10.0.tar.xz", - "name": "kitemviews-5.10.0.tar.xz", - "sha256": "0dihi79j7iqy2x3qivjalsj9qa2b17g7jl7j705fjjfnw64xj8bi" - }, - "buildInputs": [ - "ecm", - "qt5", - "qt5test", - "qt5widgets" - ] - }, - "kplotting": { - "nativeBuildInputs": [ - "cmake" - ], - "propagatedNativeBuildInputs": [], - "propagatedUserEnvPkgs": [], - "propagatedBuildInputs": [ - "qt5widgets" - ], - "name": "kplotting-5.10.0", - "src": { - "url": "stable/frameworks/5.10/kplotting-5.10.0.tar.xz", - "name": "kplotting-5.10.0.tar.xz", - "sha256": "0g7riml9nbs762s1pld9d3y743z52kxdaiaklg3ai5cljp5v5skh" - }, - "buildInputs": [ - "ecm", - "qt5", - "qt5test", - "qt5widgets" - ] - }, - "kauth": { - "nativeBuildInputs": [ - "cmake" - ], - "propagatedNativeBuildInputs": [], - "propagatedUserEnvPkgs": [], - "propagatedBuildInputs": [ - "kf5coreaddons" - ], - "name": "kauth-5.10.0", - "src": { - "url": "stable/frameworks/5.10/kauth-5.10.0.tar.xz", - "name": "kauth-5.10.0.tar.xz", - "sha256": "074xr0qzknh9d0f6lisbyf612p4drlqscs7lqkasmd8f0r14ixlq" - }, - "buildInputs": [ - "ecm", - "kf5coreaddons", - "qt5", - "qt5dbus", - "qt5test", - "qt5widgets" - ] - }, - "plasma-framework": { - "nativeBuildInputs": [ - "cmake", - "sh" - ], - "propagatedNativeBuildInputs": [], - "propagatedUserEnvPkgs": [], - "propagatedBuildInputs": [ - "kf5package", - "kf5service" - ], - "name": "plasma-framework-5.10.0", - "src": { - "url": "stable/frameworks/5.10/plasma-framework-5.10.0.tar.xz", - "name": "plasma-framework-5.10.0.tar.xz", - "sha256": "0a2lkxbpry8p8sar7ai2fcnjciiik4ir9y9snkmxci26vgql8j8a" - }, - "buildInputs": [ - "ecm", - "egl", - "gpgme", - "kactivities", - "kcoreaddons", - "kde4support", - "kdeclarative", - "kdepimlibs", - "kdesu", - "kf5", - "kf5activities", - "kf5archive", - "kf5auth", - "kf5bookmarks", - "kf5codecs", - "kf5completion", - "kf5config", - "kf5configwidgets", - "kf5coreaddons", - "kf5crash", - "kf5dbusaddons", - "kf5declarative", - "kf5doctools", - "kf5globalaccel", - "kf5guiaddons", - "kf5i18n", - "kf5iconthemes", - "kf5idletime", - "kf5init", - "kf5itemmodels", - "kf5itemviews", - "kf5jobwidgets", - "kf5js", - "kf5karchive", - "kf5kauth", - "kf5kbookmarks", - "kf5kcodecs", - "kf5kcompletion", - "kf5kconfig", - "kf5kconfigwidgets", - "kf5kcoreaddons", - "kf5kcrash", - "kf5kdbusaddons", - "kf5kde4support", - "kf5kdeclarative", - "kf5kdesu", - "kf5kdoctools", - "kf5kf5globalaccel", - "kf5kguiaddons", - "kf5ki18n", - "kf5kiconthemes", - "kf5kidletime", - "kf5kinit", - "kf5kio", - "kf5kjobwidgets", - "kf5kjs", - "kf5knotifications", - "kf5kparts", - "kf5kross", - "kf5kservice", - "kf5ktextwidgets", - "kf5kunitconversion", - "kf5kwallet", - "kf5kwidgetsaddons", - "kf5kwindowsystem", - "kf5notifications", - "kf5package", - "kf5parts", - "kf5service", - "kf5solid", - "kf5sonnet", - "kf5su", - "kf5textwidgets", - "kf5threadweaver", - "kf5unitconversion", - "kf5wallet", - "kf5widgetsaddons", - "kf5windowsystem", - "kf5xmlgui", - "opengl", - "qca2", - "qt5", - "qt5gui", - "qt5qml", - "qt5quick", - "qt5script", - "qt5sql", - "qt5svg", - "qt5test", - "qt5widgets", - "qt5x11extras", - "solid", - "x11", - "xcb" - ] - }, - "kguiaddons": { - "nativeBuildInputs": [ - "cmake" - ], - "propagatedNativeBuildInputs": [], - "propagatedUserEnvPkgs": [], - "propagatedBuildInputs": [ - "qt5gui" - ], - "name": "kguiaddons-5.10.0", - "src": { - "url": "stable/frameworks/5.10/kguiaddons-5.10.0.tar.xz", - "name": "kguiaddons-5.10.0.tar.xz", - "sha256": "033z4difclwbmy4bi0c819i08x8pb5znr0kd27c3l9xaf2z3kaxr" - }, - "buildInputs": [ - "ecm", - "qt5", - "qt5gui", - "qt5test", - "qt5widgets", - "qt5x11extras", - "x11", - "xcb" - ] - }, - "kservice": { - "nativeBuildInputs": [ - "cmake" - ], - "propagatedNativeBuildInputs": [], - "propagatedUserEnvPkgs": [], - "propagatedBuildInputs": [ - "kf5config", - "kf5coreaddons" - ], - "name": "kservice-5.10.0", - "src": { - "url": "stable/frameworks/5.10/kservice-5.10.0.tar.xz", - "name": "kservice-5.10.0.tar.xz", - "sha256": "15dmfd8ddjaac5mdb041ddhpkr3bh6gcgy0wfg404xiy1sx12dr6" - }, - "buildInputs": [ - "ecm", - "kf5config", - "kf5coreaddons", - "kf5crash", - "kf5dbusaddons", - "kf5doctools", - "kf5i18n", - "qt5", - "qt5concurrent", - "qt5dbus", - "qt5test", - "qt5xml" - ] - }, - "khtml": { - "nativeBuildInputs": [ - "cmake" - ], - "propagatedNativeBuildInputs": [], - "propagatedUserEnvPkgs": [], - "propagatedBuildInputs": [ - "kf5archive", - "kf5bookmarks", - "kf5globalaccel", - "kf5i18n", - "kf5iconthemes", - "kf5js", - "kf5kio", - "kf5notifications", - "kf5parts", - "kf5sonnet", - "kf5wallet", - "kf5widgetsaddons", - "kf5windowsystem", - "qt5core" - ], - "name": "khtml-5.10.0", - "src": { - "url": "stable/frameworks/5.10/portingAids/khtml-5.10.0.tar.xz", - "name": "khtml-5.10.0.tar.xz", - "sha256": "0wzzcysgvjkibs8j277z75b0s5dvjwby7c6lnyyzmnm5vmsw2dj2" - }, - "buildInputs": [ - "ecm", - "gif", - "jpeg", - "kdewin", - "kf5archive", - "kf5codecs", - "kf5globalaccel", - "kf5i18n", - "kf5iconthemes", - "kf5js", - "kf5kio", - "kf5notifications", - "kf5parts", - "kf5sonnet", - "kf5textwidgets", - "kf5wallet", - "kf5widgetsaddons", - "kf5windowsystem", - "kf5xmlgui", - "openssl", - "perl", - "phonon4qt5", - "png", - "qt5", - "qt5test", - "qt5x11extras", - "x11" - ] - }, - "kded": { - "nativeBuildInputs": [ - "cmake" - ], - "propagatedNativeBuildInputs": [], - "propagatedUserEnvPkgs": [], - "propagatedBuildInputs": [], - "name": "kded-5.10.0", - "src": { - "url": "stable/frameworks/5.10/kded-5.10.0.tar.xz", - "name": "kded-5.10.0.tar.xz", - "sha256": "0n2nd96j09igbxwq4697gyl45sfij22hs5mkys1gnaw5j8byaj4a" - }, - "buildInputs": [ - "ecm", - "kf5config", - "kf5coreaddons", - "kf5crash", - "kf5dbusaddons", - "kf5doctools", - "kf5init", - "kf5service", - "qt5" - ] - }, - "kpty": { - "nativeBuildInputs": [ - "cmake" - ], - "propagatedNativeBuildInputs": [], - "propagatedUserEnvPkgs": [], - "propagatedBuildInputs": [ - "kf5coreaddons" - ], - "name": "kpty-5.10.0", - "src": { - "url": "stable/frameworks/5.10/kpty-5.10.0.tar.xz", - "name": "kpty-5.10.0.tar.xz", - "sha256": "1ys8wv1hirv6jk6jdzjnvkhw2lx3rxj8xp4sgvxfbfs833vdnqx6" - }, - "buildInputs": [ - "ecm", - "kf5coreaddons", - "kf5i18n", - "qt5", - "utempter" - ] - }, - "kross": { - "nativeBuildInputs": [ - "cmake" - ], - "propagatedNativeBuildInputs": [], - "propagatedUserEnvPkgs": [], - "propagatedBuildInputs": [ - "kf5i18n", - "kf5iconthemes", - "kf5kio", - "kf5parts", - "kf5widgetsaddons", - "qt5script", - "qt5widgets", - "qt5xml" - ], - "name": "kross-5.10.0", - "src": { - "url": "stable/frameworks/5.10/portingAids/kross-5.10.0.tar.xz", - "name": "kross-5.10.0.tar.xz", - "sha256": "02mz7w920vka5wwgbnf0m774s56r4qkwplakdyal92ip3zc3m6jq" - }, - "buildInputs": [ - "ecm", - "kf5completion", - "kf5coreaddons", - "kf5doctools", - "kf5i18n", - "kf5iconthemes", - "kf5kio", - "kf5parts", - "kf5service", - "kf5widgetsaddons", - "kf5xmlgui", - "qt5", - "qt5core", - "qt5script", - "qt5test", - "qt5uitools", - "qt5widgets", - "qt5xml" - ] - }, - "kxmlgui": { - "nativeBuildInputs": [ - "cmake" - ], - "propagatedNativeBuildInputs": [], - "propagatedUserEnvPkgs": [], - "propagatedBuildInputs": [ - "kf5config", - "kf5configwidgets", - "qt5dbus", - "qt5widgets", - "qt5xml" - ], - "name": "kxmlgui-5.10.0", - "src": { - "url": "stable/frameworks/5.10/kxmlgui-5.10.0.tar.xz", - "name": "kxmlgui-5.10.0.tar.xz", - "sha256": "1m22ld9pd2z287j8nj9alk1pychq04r0w1g1vqhgr0shlxzx91pf" - }, - "buildInputs": [ - "ecm", - "kf5attica", - "kf5config", - "kf5configwidgets", - "kf5globalaccel", - "kf5i18n", - "kf5iconthemes", - "kf5itemviews", - "kf5textwidgets", - "kf5widgetsaddons", - "kf5windowsystem", - "qt5", - "qt5dbus", - "qt5network", - "qt5printsupport", - "qt5test", - "qt5widgets", - "qt5xml" - ] - }, - "kconfig": { - "nativeBuildInputs": [ - "cmake" - ], - "propagatedNativeBuildInputs": [], - "propagatedUserEnvPkgs": [], - "propagatedBuildInputs": [ - "qt5xml" - ], - "name": "kconfig-5.10.0", - "src": { - "url": "stable/frameworks/5.10/kconfig-5.10.0.tar.xz", - "name": "kconfig-5.10.0.tar.xz", - "sha256": "1r7r4yihlnld09l9qmq2q8h9xk7clmgbry8vnggzih1bamid79dq" - }, - "buildInputs": [ - "ecm", - "qt5", - "qt5concurrent", - "qt5core", - "qt5gui", - "qt5test", - "qt5xml" - ] - }, - "kinit": { - "nativeBuildInputs": [ - "cmake" - ], - "propagatedNativeBuildInputs": [], - "propagatedUserEnvPkgs": [], - "propagatedBuildInputs": [], - "name": "kinit-5.10.0", - "src": { - "url": "stable/frameworks/5.10/kinit-5.10.0.tar.xz", - "name": "kinit-5.10.0.tar.xz", - "sha256": "02da17n19xx9cqiyzh7qlbqyy0mpy4gr3pdja1xlqaapc52k99sz" - }, - "buildInputs": [ - "ecm", - "kf5config", - "kf5crash", - "kf5doctools", - "kf5i18n", - "kf5kio", - "kf5service", - "kf5windowsystem", - "libcap", - "qt5", - "x11" - ] - }, - "kpackage": { - "nativeBuildInputs": [ - "cmake" - ], - "propagatedNativeBuildInputs": [], - "propagatedUserEnvPkgs": [], - "propagatedBuildInputs": [ - "kf5coreaddons" - ], - "name": "kpackage-5.10.0", - "src": { - "url": "stable/frameworks/5.10/kpackage-5.10.0.tar.xz", - "name": "kpackage-5.10.0.tar.xz", - "sha256": "0c5xnks7k85lj6pkbylnlcmlhxns95zs6km9hfvdi7zh0i26y8qb" - }, - "buildInputs": [ - "ecm", - "kf5archive", - "kf5config", - "kf5coreaddons", - "kf5doctools", - "kf5i18n", - "qt5", - "qt5core", - "qt5test" - ] - }, - "karchive": { - "nativeBuildInputs": [ - "cmake" - ], - "propagatedNativeBuildInputs": [], - "propagatedUserEnvPkgs": [], - "propagatedBuildInputs": [ - "qt5core" - ], - "name": "karchive-5.10.0", - "src": { - "url": "stable/frameworks/5.10/karchive-5.10.0.tar.xz", - "name": "karchive-5.10.0.tar.xz", - "sha256": "19lzv1fi7vw95l9mx0qx10nfn5q7wzkqahsg2jswp31vgf977wfw" - }, - "buildInputs": [ - "bzip2", - "ecm", - "kf5archive", - "liblzma", - "qt5core", - "qt5test", - "zlib" - ] - }, - "kdesu": { - "nativeBuildInputs": [ - "cmake" - ], - "propagatedNativeBuildInputs": [], - "propagatedUserEnvPkgs": [], - "propagatedBuildInputs": [ - "kf5pty" - ], - "name": "kdesu-5.10.0", - "src": { - "url": "stable/frameworks/5.10/kdesu-5.10.0.tar.xz", - "name": "kdesu-5.10.0.tar.xz", - "sha256": "002ryv2svl1hmapflg0cvl7xd7qa4sh2msxnma9ijsad1ypv9nrw" - }, - "buildInputs": [ - "ecm", - "kf5coreaddons", - "kf5i18n", - "kf5pty", - "kf5service", - "qt5core", - "x11" - ] - }, - "kimageformats": { - "nativeBuildInputs": [ - "cmake" - ], - "propagatedNativeBuildInputs": [], - "propagatedUserEnvPkgs": [], - "propagatedBuildInputs": [], - "name": "kimageformats-5.10.0", - "src": { - "url": "stable/frameworks/5.10/kimageformats-5.10.0.tar.xz", - "name": "kimageformats-5.10.0.tar.xz", - "sha256": "140s1lydikb87rpaxqmv6ccp139ch9vsi62r6fmyvwx6l0ffh2ay" - }, - "buildInputs": [ - "ecm", - "jasper", - "openexr", - "qt5gui", - "qt5printsupport", - "qt5test" - ] - }, - "kmediaplayer": { - "nativeBuildInputs": [ - "cmake" - ], - "propagatedNativeBuildInputs": [], - "propagatedUserEnvPkgs": [], - "propagatedBuildInputs": [ - "kf5parts" - ], - "name": "kmediaplayer-5.10.0", - "src": { - "url": "stable/frameworks/5.10/portingAids/kmediaplayer-5.10.0.tar.xz", - "name": "kmediaplayer-5.10.0.tar.xz", - "sha256": "0q17lgajv3844d2nccnfyzg6g55wx79fxij2iw42m25wyxg7b4df" - }, - "buildInputs": [ - "ecm", - "kf5parts", - "kf5xmlgui", - "qt5dbus", - "qt5test", - "qt5widgets" - ] - }, - "ktexteditor": { - "nativeBuildInputs": [ - "cmake" - ], - "propagatedNativeBuildInputs": [], - "propagatedUserEnvPkgs": [], - "propagatedBuildInputs": [], - "name": "ktexteditor-5.10.0", - "src": { - "url": "stable/frameworks/5.10/ktexteditor-5.10.0.tar.xz", - "name": "ktexteditor-5.10.0.tar.xz", - "sha256": "1axs21vklg392hxcm8j6y01qk3wphsfldh0caqnv6ifhamvcvkhh" - }, - "buildInputs": [ - "ecm", - "kf5archive", - "kf5config", - "kf5guiaddons", - "kf5i18n", - "kf5iconthemes", - "kf5kio", - "kf5parts", - "kf5sonnet", - "libgit2", - "perl", - "qt5", - "qt5core", - "qt5printsupport", - "qt5script", - "qt5test", - "qt5widgets", - "qt5xml", - "qt5xmlpatterns" - ] - }, - "kdesignerplugin": { - "nativeBuildInputs": [ - "cmake" - ], - "propagatedNativeBuildInputs": [], - "propagatedUserEnvPkgs": [], - "propagatedBuildInputs": [], - "name": "kdesignerplugin-5.10.0", - "src": { - "url": "stable/frameworks/5.10/kdesignerplugin-5.10.0.tar.xz", - "name": "kdesignerplugin-5.10.0.tar.xz", - "sha256": "1z82kxn5hpbmhsrh4ic7mcmsz115p39gph7ysjz9fh6ylfdgcrpm" - }, - "buildInputs": [ - "ecm", - "kf5completion", - "kf5config", - "kf5configwidgets", - "kf5coreaddons", - "kf5doctools", - "kf5iconthemes", - "kf5itemviews", - "kf5kio", - "kf5plotting", - "kf5sonnet", - "kf5textwidgets", - "kf5webkit", - "kf5widgetsaddons", - "kf5xmlgui", - "qt5core", - "qt5designer", - "qt5test", - "qt5widgets" - ] - }, - "kparts": { - "nativeBuildInputs": [ - "cmake" - ], - "propagatedNativeBuildInputs": [], - "propagatedUserEnvPkgs": [], - "propagatedBuildInputs": [ - "kf5kio", - "kf5textwidgets", - "kf5xmlgui" - ], - "name": "kparts-5.10.0", - "src": { - "url": "stable/frameworks/5.10/kparts-5.10.0.tar.xz", - "name": "kparts-5.10.0.tar.xz", - "sha256": "0k1zkr2qvl65cgk0j3ybvmxs8wwjl0641yrgl36ngbk23lyi35rv" - }, - "buildInputs": [ - "ecm", - "kf5config", - "kf5coreaddons", - "kf5i18n", - "kf5iconthemes", - "kf5jobwidgets", - "kf5kio", - "kf5notifications", - "kf5service", - "kf5textwidgets", - "kf5widgetsaddons", - "kf5xmlgui", - "qt5", - "qt5core", - "qt5test", - "qt5widgets", - "qt5xml" - ] - }, - "kcmutils": { - "nativeBuildInputs": [ - "cmake" - ], - "propagatedNativeBuildInputs": [], - "propagatedUserEnvPkgs": [], - "propagatedBuildInputs": [ - "kf5configwidgets", - "kf5service" - ], - "name": "kcmutils-5.10.0", - "src": { - "url": "stable/frameworks/5.10/kcmutils-5.10.0.tar.xz", - "name": "kcmutils-5.10.0.tar.xz", - "sha256": "1995jbnnkwmkyiq8jav4r3x3mi3w5kv0am10c0d6g1pxjsig1xrx" - }, - "buildInputs": [ - "ecm", - "kf5configwidgets", - "kf5coreaddons", - "kf5declarative", - "kf5i18n", - "kf5iconthemes", - "kf5itemviews", - "kf5package", - "kf5service", - "kf5xmlgui", - "qt5", - "qt5dbus", - "qt5qml", - "qt5quick", - "qt5widgets" - ] - }, - "frameworkintegration": { - "nativeBuildInputs": [ - "cmake" - ], - "propagatedNativeBuildInputs": [], - "propagatedUserEnvPkgs": [], - "propagatedBuildInputs": [ - "kf5configwidgets", - "kf5iconthemes" - ], - "name": "frameworkintegration-5.10.0", - "src": { - "url": "stable/frameworks/5.10/frameworkintegration-5.10.0.tar.xz", - "name": "frameworkintegration-5.10.0.tar.xz", - "sha256": "00plajvkp19njdyq37qmf0q5xvwvl3vgx0vmls4hf2mk179yqm63" - }, - "buildInputs": [ - "ecm", - "kf5config", - "kf5configwidgets", - "kf5i18n", - "kf5iconthemes", - "kf5kio", - "kf5notifications", - "kf5widgetsaddons", - "oxygenfont", - "qt5", - "qt5dbus", - "qt5qml", - "qt5test", - "qt5widgets", - "qt5x11extras", - "x11", - "xcb" - ] - }, - "kiconthemes": { - "nativeBuildInputs": [ - "cmake" - ], - "propagatedNativeBuildInputs": [], - "propagatedUserEnvPkgs": [], - "propagatedBuildInputs": [ - "qt5widgets" - ], - "name": "kiconthemes-5.10.0", - "src": { - "url": "stable/frameworks/5.10/kiconthemes-5.10.0.tar.xz", - "name": "kiconthemes-5.10.0.tar.xz", - "sha256": "19vvg63ld4388jd47245zqzbj5bs8qj69524bvwqbv77201qg7j1" - }, - "buildInputs": [ - "ecm", - "kf5configwidgets", - "kf5i18n", - "kf5itemviews", - "kf5widgetsaddons", - "qt5", - "qt5dbus", - "qt5svg", - "qt5test", - "qt5widgets" - ] - }, - "kjs": { - "nativeBuildInputs": [ - "cmake" - ], - "propagatedNativeBuildInputs": [], - "propagatedUserEnvPkgs": [], - "propagatedBuildInputs": [ - "qt5core" - ], - "name": "kjs-5.10.0", - "src": { - "url": "stable/frameworks/5.10/portingAids/kjs-5.10.0.tar.xz", - "name": "kjs-5.10.0.tar.xz", - "sha256": "0l3pn9g7mv5wklihgd7v3c83563ly9swwayivqlyz4rj35m7lvq1" - }, - "buildInputs": [ - "ecm", - "kf5doctools", - "pcre", - "perl", - "qt5core", - "qt5test" - ] - }, - "knotifyconfig": { - "nativeBuildInputs": [ - "cmake" - ], - "propagatedNativeBuildInputs": [], - "propagatedUserEnvPkgs": [], - "propagatedBuildInputs": [ - "qt5widgets" - ], - "name": "knotifyconfig-5.10.0", - "src": { - "url": "stable/frameworks/5.10/knotifyconfig-5.10.0.tar.xz", - "name": "knotifyconfig-5.10.0.tar.xz", - "sha256": "1zhddbynsk4b27sldmbd8q8mk8kbjyfv5k27vrqahlbq7ysrhflm" - }, - "buildInputs": [ - "ecm", - "kf5completion", - "kf5config", - "kf5configwidgets", - "kf5i18n", - "kf5kio", - "kf5notifications", - "kf5widgetsaddons", - "kf5xmlgui", - "phonon4qt5", - "qt5", - "qt5dbus", - "qt5optional_components", - "qt5test", - "qt5texttospeech", - "qt5widgets" - ] - }, - "kio": { - "nativeBuildInputs": [ - "cmake" - ], - "propagatedNativeBuildInputs": [], - "propagatedUserEnvPkgs": [], - "propagatedBuildInputs": [ - "kf5bookmarks", - "kf5completion", - "kf5config", - "kf5coreaddons", - "kf5itemviews", - "kf5jobwidgets", - "kf5service", - "kf5solid", - "kf5xmlgui", - "qt5network" - ], - "name": "kio-5.10.0", - "src": { - "url": "stable/frameworks/5.10/kio-5.10.0.tar.xz", - "name": "kio-5.10.0.tar.xz", - "sha256": "1lbbxn5s6p8fsgyr4nwwyawgcw4ywldwy7mbvn8pk5xrzai3c04r" - }, - "buildInputs": [ - "acl", - "ecm", - "gssapi", - "kf5archive", - "kf5bookmarks", - "kf5completion", - "kf5config", - "kf5configwidgets", - "kf5coreaddons", - "kf5dbusaddons", - "kf5doctools", - "kf5i18n", - "kf5iconthemes", - "kf5itemviews", - "kf5jobwidgets", - "kf5notifications", - "kf5service", - "kf5solid", - "kf5textwidgets", - "kf5wallet", - "kf5widgetsaddons", - "kf5windowsystem", - "kf5xmlgui", - "libxml2", - "libxslt", - "openssl", - "qt5", - "qt5concurrent", - "qt5core", - "qt5dbus", - "qt5network", - "qt5script", - "qt5test", - "qt5widgets", - "qt5x11extras", - "qt5xml", - "strigi", - "x11", - "zlib" - ] - }, - "kunitconversion": { - "nativeBuildInputs": [ - "cmake" - ], - "propagatedNativeBuildInputs": [], - "propagatedUserEnvPkgs": [], - "propagatedBuildInputs": [ - "qt5core" - ], - "name": "kunitconversion-5.10.0", - "src": { - "url": "stable/frameworks/5.10/kunitconversion-5.10.0.tar.xz", - "name": "kunitconversion-5.10.0.tar.xz", - "sha256": "0dxawvihm2bnc9l9vx90bq50sbcgrnkfvlsixkwhirw2cvvz0v5p" - }, - "buildInputs": [ - "ecm", - "kf5i18n", - "qt5", - "qt5core", - "qt5network", - "qt5test", - "qt5xml" - ] - }, - "kdnssd": { - "nativeBuildInputs": [ - "cmake" - ], - "propagatedNativeBuildInputs": [], - "propagatedUserEnvPkgs": [], - "propagatedBuildInputs": [ - "qt5network" - ], - "name": "kdnssd-5.10.0", - "src": { - "url": "stable/frameworks/5.10/kdnssd-5.10.0.tar.xz", - "name": "kdnssd-5.10.0.tar.xz", - "sha256": "0frar6j0n6m43l7hdc14n0vbvs63fjg2gv5q59zwsx856rrqfszi" - }, - "buildInputs": [ - "avahi", - "dnssd", - "ecm", - "qt5", - "qt5dbus", - "qt5network" - ] - }, - "knotifications": { - "nativeBuildInputs": [ - "cmake" - ], - "propagatedNativeBuildInputs": [], - "propagatedUserEnvPkgs": [], - "propagatedBuildInputs": [ - "qt5widgets" - ], - "name": "knotifications-5.10.0", - "src": { - "url": "stable/frameworks/5.10/knotifications-5.10.0.tar.xz", - "name": "knotifications-5.10.0.tar.xz", - "sha256": "16qh492wwcyxanwmaqp1979wh3mrzmjkhvgnig5fxfvqzh9hxp0p" - }, - "buildInputs": [ - "dbusmenu-qt5", - "ecm", - "kf5codecs", - "kf5config", - "kf5coreaddons", - "kf5iconthemes", - "kf5service", - "kf5windowsystem", - "phonon4qt5", - "qt5", - "qt5dbus", - "qt5optional_components", - "qt5test", - "qt5texttospeech", - "qt5widgets", - "qt5x11extras", - "x11" - ] - }, - "kdbusaddons": { - "nativeBuildInputs": [ - "cmake" - ], - "propagatedNativeBuildInputs": [], - "propagatedUserEnvPkgs": [], - "propagatedBuildInputs": [ - "qt5dbus" - ], - "name": "kdbusaddons-5.10.0", - "src": { - "url": "stable/frameworks/5.10/kdbusaddons-5.10.0.tar.xz", - "name": "kdbusaddons-5.10.0.tar.xz", - "sha256": "0lk7h424lc015asqpnldck18zcjki4672fkswy3qdvmkkpzdgx3m" - }, - "buildInputs": [ - "ecm", - "qt5dbus", - "qt5test", - "qt5x11extras" - ] - }, - "kemoticons": { - "nativeBuildInputs": [ - "cmake" - ], - "propagatedNativeBuildInputs": [], - "propagatedUserEnvPkgs": [], - "propagatedBuildInputs": [ - "kf5service", - "qt5gui" - ], - "name": "kemoticons-5.10.0", - "src": { - "url": "stable/frameworks/5.10/kemoticons-5.10.0.tar.xz", - "name": "kemoticons-5.10.0.tar.xz", - "sha256": "0i3hj04k0dh2rx77sig9qdpjh2rik0n2snpr61ckiw9ixh8fggkr" - }, - "buildInputs": [ - "ecm", - "kf5archive", - "kf5config", - "kf5coreaddons", - "kf5service", - "qt5", - "qt5gui", - "qt5test", - "qt5widgets", - "qt5xml" - ] - }, - "kdoctools": { - "nativeBuildInputs": [ - "cmake" - ], - "propagatedNativeBuildInputs": [], - "propagatedUserEnvPkgs": [], - "propagatedBuildInputs": [ - "qt5core" - ], - "name": "kdoctools-5.10.0", - "src": { - "url": "stable/frameworks/5.10/kdoctools-5.10.0.tar.xz", - "name": "kdoctools-5.10.0.tar.xz", - "sha256": "0v00pjm0jsqkxq52ndpds7qn5vbsxkgzvvy379id1ag692s55jkp" - }, - "buildInputs": [ - "docbookxml4", - "docbookxsl", - "ecm", - "kf5archive", - "kf5doctools", - "kf5i18n", - "libxml2", - "libxslt", - "qt5core" - ] - }, - "kapidox": { - "nativeBuildInputs": [ - "cmake" - ], - "propagatedNativeBuildInputs": [], - "propagatedUserEnvPkgs": [], - "propagatedBuildInputs": [], - "name": "kapidox-5.10.0", - "src": { - "url": "stable/frameworks/5.10/kapidox-5.10.0.tar.xz", - "name": "kapidox-5.10.0.tar.xz", - "sha256": "1zjjj951vfnwc8833lh6schdcva0dhiws56kmhclg7m9mpnvbav4" - }, - "buildInputs": [ - "pythoninterp" - ] - }, - "kcoreaddons": { - "nativeBuildInputs": [ - "cmake" - ], - "propagatedNativeBuildInputs": [], - "propagatedUserEnvPkgs": [], - "propagatedBuildInputs": [ - "qt5core" - ], - "name": "kcoreaddons-5.10.0", - "src": { - "url": "stable/frameworks/5.10/kcoreaddons-5.10.0.tar.xz", - "name": "kcoreaddons-5.10.0.tar.xz", - "sha256": "0y1j50axd6i0givknp9xfk81jdcdzz5p7m761qvbbjflqrnznvc1" - }, - "buildInputs": [ - "ecm", - "fam", - "qt5", - "qt5core", - "qt5test", - "qt5widgets", - "sharedmimeinfo" - ] - }, - "krunner": { - "nativeBuildInputs": [ - "cmake" - ], - "propagatedNativeBuildInputs": [], - "propagatedUserEnvPkgs": [], - "propagatedBuildInputs": [ - "kf5plasma", - "qt5core" - ], - "name": "krunner-5.10.0", - "src": { - "url": "stable/frameworks/5.10/portingAids/krunner-5.10.0.tar.xz", - "name": "krunner-5.10.0.tar.xz", - "sha256": "15adxzsh27s6h37mfa8pwwdf47gp8whfsshj5chl7h3zdj5aa04i" - }, - "buildInputs": [ - "ecm", - "kf5config", - "kf5coreaddons", - "kf5i18n", - "kf5kio", - "kf5plasma", - "kf5service", - "kf5solid", - "kf5threadweaver", - "qt5", - "qt5gui", - "qt5quick", - "qt5test", - "qt5widgets" - ] - }, - "kjobwidgets": { - "nativeBuildInputs": [ - "cmake" - ], - "propagatedNativeBuildInputs": [], - "propagatedUserEnvPkgs": [], - "propagatedBuildInputs": [ - "kf5coreaddons", - "qt5widgets" - ], - "name": "kjobwidgets-5.10.0", - "src": { - "url": "stable/frameworks/5.10/kjobwidgets-5.10.0.tar.xz", - "name": "kjobwidgets-5.10.0.tar.xz", - "sha256": "0b2n0wn2l4k8xsjgycv7123xvlbq06g0pmbn5q6akywr0lrnyd16" - }, - "buildInputs": [ - "ecm", - "kf5coreaddons", - "kf5widgetsaddons", - "qt5", - "qt5dbus", - "qt5test", - "qt5widgets", - "qt5x11extras", - "x11" - ] - }, - "kcodecs": { - "nativeBuildInputs": [ - "cmake" - ], - "propagatedNativeBuildInputs": [], - "propagatedUserEnvPkgs": [], - "propagatedBuildInputs": [ - "qt5core" - ], - "name": "kcodecs-5.10.0", - "src": { - "url": "stable/frameworks/5.10/kcodecs-5.10.0.tar.xz", - "name": "kcodecs-5.10.0.tar.xz", - "sha256": "1izw6rpvpxhwnl6aqrfqh2m3v3ia5gynpsxd8syi1cxnzmajgwic" - }, - "buildInputs": [ - "ecm", - "qt5core", - "qt5test" - ] - }, - "kconfigwidgets": { - "nativeBuildInputs": [ - "cmake" - ], - "propagatedNativeBuildInputs": [], - "propagatedUserEnvPkgs": [], - "propagatedBuildInputs": [ - "kf5auth", - "kf5codecs", - "kf5config", - "kf5widgetsaddons" - ], - "name": "kconfigwidgets-5.10.0", - "src": { - "url": "stable/frameworks/5.10/kconfigwidgets-5.10.0.tar.xz", - "name": "kconfigwidgets-5.10.0.tar.xz", - "sha256": "19p073fzpvm6hn85qk959s6dlnizywwcipw4rfm92b3y3jqg77i0" - }, - "buildInputs": [ - "ecm", - "kf5auth", - "kf5codecs", - "kf5config", - "kf5coreaddons", - "kf5doctools", - "kf5guiaddons", - "kf5i18n", - "kf5widgetsaddons", - "qt5", - "qt5test" - ] - }, - "kdeclarative": { - "nativeBuildInputs": [ - "cmake" - ], - "propagatedNativeBuildInputs": [], - "propagatedUserEnvPkgs": [], - "propagatedBuildInputs": [ - "kf5config", - "kf5package", - "qt5qml" - ], - "name": "kdeclarative-5.10.0", - "src": { - "url": "stable/frameworks/5.10/kdeclarative-5.10.0.tar.xz", - "name": "kdeclarative-5.10.0.tar.xz", - "sha256": "1kfsqg43inn2is991nzcgcicd7aa7yg6bzsxac3c3136p32ii9yg" - }, - "buildInputs": [ - "activeapp", - "ecm", - "epoxy", - "kf5config", - "kf5globalaccel", - "kf5guiaddons", - "kf5i18n", - "kf5iconthemes", - "kf5kio", - "kf5package", - "kf5widgetsaddons", - "kf5windowsystem", - "qt5", - "qt5gui", - "qt5qml", - "qt5quick", - "qt5test" - ] - }, - "ktextwidgets": { - "nativeBuildInputs": [ - "cmake" - ], - "propagatedNativeBuildInputs": [], - "propagatedUserEnvPkgs": [], - "propagatedBuildInputs": [ - "kf5i18n", - "kf5sonnet", - "qt5widgets" - ], - "name": "ktextwidgets-5.10.0", - "src": { - "url": "stable/frameworks/5.10/ktextwidgets-5.10.0.tar.xz", - "name": "ktextwidgets-5.10.0.tar.xz", - "sha256": "0mpsikpy1i3j1dx352a5c77xx5m6iv4lfnff58yi5z0m31002mv6" - }, - "buildInputs": [ - "ecm", - "kf5completion", - "kf5config", - "kf5configwidgets", - "kf5i18n", - "kf5iconthemes", - "kf5service", - "kf5sonnet", - "kf5widgetsaddons", - "kf5windowsystem", - "qt5", - "qt5dbus", - "qt5test", - "qt5widgets" - ] - }, - "kjsembed": { - "nativeBuildInputs": [ - "cmake" - ], - "propagatedNativeBuildInputs": [], - "propagatedUserEnvPkgs": [], - "propagatedBuildInputs": [ - "kf5i18n", - "kf5js" - ], - "name": "kjsembed-5.10.0", - "src": { - "url": "stable/frameworks/5.10/portingAids/kjsembed-5.10.0.tar.xz", - "name": "kjsembed-5.10.0.tar.xz", - "sha256": "1922bvs3p2ffax5h8kmg4llw65h00m22qfs8n3qhcc952zgv1wxl" - }, - "buildInputs": [ - "ecm", - "kf5doctools", - "kf5i18n", - "kf5js", - "qt5" - ] - } -} \ No newline at end of file diff --git a/pkgs/development/libraries/kde-frameworks-5.10/packages.sh b/pkgs/development/libraries/kde-frameworks-5.10/packages.sh deleted file mode 100755 index 9d226db2c043..000000000000 --- a/pkgs/development/libraries/kde-frameworks-5.10/packages.sh +++ /dev/null @@ -1,22 +0,0 @@ -#!/bin/sh - -set -x - -origin="$(pwd)" - -# if setting KDE_MIRROR, be sure to set --cut-dirs=N in MANIFEST_EXTRA_ARGS -KDE_MIRROR="${KDE_MIRROR:-http://download.kde.org}" - -alias nix-build="nix-build --no-out-link \"$origin/../../../..\"" - -# The extra slash at the end of the URL is necessary to stop wget -# from recursing over the whole server! (No, it's not a bug.) -$(nix-build -A autonix.manifest) \ - "${KDE_MIRROR}/stable/frameworks/5.10/" \ - "$@" -A '*.tar.xz' - -AUTONIX_DEPS_KF5=${AUTONIX_DEPS_KF5:-"$(nix-build -A haskellPackages.autonix-deps-kf5)/bin/kf5-deps"} - -$AUTONIX_DEPS_KF5 manifest.json - -rm manifest.json diff --git a/pkgs/development/libraries/kde-frameworks-5.10/plasma-framework/plasma-framework-external-paths.patch b/pkgs/development/libraries/kde-frameworks-5.10/plasma-framework/plasma-framework-external-paths.patch deleted file mode 100644 index 9a22c0bdbcd5..000000000000 --- a/pkgs/development/libraries/kde-frameworks-5.10/plasma-framework/plasma-framework-external-paths.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/src/plasma/package.cpp b/src/plasma/package.cpp -index 07b3c90..84417e3 100644 ---- a/src/plasma/package.cpp -+++ b/src/plasma/package.cpp -@@ -791,7 +791,7 @@ PackagePrivate::PackagePrivate() - servicePrefix("plasma-applet-"), - fallbackPackage(0), - metadata(0), -- externalPaths(false), -+ externalPaths(true), - valid(false), - checkedValid(false) - { diff --git a/pkgs/development/libraries/kde-frameworks-5.10/renames.json b/pkgs/development/libraries/kde-frameworks-5.10/renames.json deleted file mode 100644 index 4da5f8272eeb..000000000000 --- a/pkgs/development/libraries/kde-frameworks-5.10/renames.json +++ /dev/null @@ -1,70 +0,0 @@ -{ - "kf5widgetsaddons": "kwidgetsaddons", - "kf5texteditor": "ktexteditor", - "kf5designerplugin": "kdesignerplugin", - "kf5bookmarks": "kbookmarks", - "kf5frameworkintegration": "frameworkintegration", - "kf5package": "kpackage", - "kf5archive": "karchive", - "kf5plasma": "plasma-framework", - "kf5kcmutils": "kcmutils", - "kf5configwidgets": "kconfigwidgets", - "ctest": "attica", - "kf5kio": "kio", - "kf5networkmanagerqt": "networkmanager-qt", - "kf5coreaddons": "kcoreaddons", - "kf5guiaddons": "kguiaddons", - "kf5jobwidgets": "kjobwidgets", - "kf5modemmanagerqt": "modemmanager-qt", - "kf5runner": "krunner", - "kf5globalaccel": "kglobalaccel", - "kf5dbusaddons": "kdbusaddons", - "kf5crash": "kcrash", - "kf5itemviews": "kitemviews", - "kf5doctools": "kdoctools", - "kf5i18n": "ki18n", - "kf5webkit": "kdewebkit", - "kf5newstuff": "knewstuff", - "kded": "kded", - "kf5notifications": "knotifications", - "kf5activitiesexperimentalstats": "kactivities", - "kf5dnssd": "kdnssd", - "kf5notifyconfig": "knotifyconfig", - "kf5iconthemes": "kiconthemes", - "kf5js": "kjs", - "kf5kde4support": "kdelibs4support", - "kf5parts": "kparts", - "backend": "plasma-framework", - "kf5completion": "kcompletion", - "kf5threadweaver": "threadweaver", - "kf5mediaplayer": "kmediaplayer", - "kf5plasmaquick": "plasma-framework", - "kf5wallet": "kwallet", - "kf5xmlgui": "kxmlgui", - "kf5attica": "attica", - "kf5declarative": "kdeclarative", - "kf5config": "kconfig", - "kf5init": "kinit", - "kf5textwidgets": "ktextwidgets", - "kf5jsembed": "kjsembed", - "kf5codecs": "kcodecs", - "kf5service": "kservice", - "kf5sonnet": "sonnet", - "kf5kdelibs4support": "kdelibs4support", - "kf5pty": "kpty", - "kf5solid": "solid", - "kf5auth": "kauth", - "ecm": "extra-cmake-modules", - "kf5activities": "kactivities", - "kf5plotting": "kplotting", - "kf5people": "kpeople", - "kf5emoticons": "kemoticons", - "kf5kross": "kross", - "kf5su": "kdesu", - "kf5khtml": "khtml", - "kf5unitconversion": "kunitconversion", - "kf5idletime": "kidletime", - "kf5windowsystem": "kwindowsystem", - "kf5xmlrpcclient": "kxmlrpcclient", - "kf5itemmodels": "kitemmodels" -} \ No newline at end of file diff --git a/pkgs/development/libraries/kde-frameworks-5.10/setup-hook.sh b/pkgs/development/libraries/kde-frameworks-5.10/setup-hook.sh deleted file mode 100644 index a8d9b7e0e36f..000000000000 --- a/pkgs/development/libraries/kde-frameworks-5.10/setup-hook.sh +++ /dev/null @@ -1 +0,0 @@ -addToSearchPath XDG_DATA_DIRS @out@/share diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index fbf086fb9c4c..8cc53561007a 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -6750,9 +6750,8 @@ let automake = automake111x; }; - kf510 = recurseIntoAttrs (callPackage ../development/libraries/kde-frameworks-5.10 { }); kf515 = recurseIntoAttrs (import ../development/libraries/kde-frameworks-5.15 { inherit pkgs; }); - kf5_stable = kf510; + kf5_stable = kf515; kf5_latest = kf515; kf5PackagesFun = self: with self; { @@ -12042,9 +12041,8 @@ let boost = boost155; }; - kdeApps_15_04 = recurseIntoAttrs (callPackage ../applications/kde-apps-15.04 {}); - kdeApps_stable = kdeApps_15_04; kdeApps_15_08 = recurseIntoAttrs (import ../applications/kde-apps-15.08 { inherit pkgs; }); + kdeApps_stable = kdeApps_15_08; kdeApps_latest = kdeApps_15_08; keepnote = callPackage ../applications/office/keepnote { @@ -14373,9 +14371,8 @@ let numix-gtk-theme = callPackage ../misc/themes/gtk3/numix-gtk-theme { }; - plasma53 = recurseIntoAttrs (callPackage ../desktops/plasma-5.3 { }); - plasma5_stable = plasma53; plasma54 = recurseIntoAttrs (callPackage ../desktops/plasma-5.4 { inherit pkgs; }); + plasma5_stable = plasma54; plasma5_latest = plasma54; kde5 = kf5_stable // plasma5_stable // kdeApps_stable; From 95725b2581c9cbe322b0717c744c8c9141abd670 Mon Sep 17 00:00:00 2001 From: Thomas Tuegel Date: Fri, 30 Oct 2015 16:05:34 -0500 Subject: [PATCH 104/162] nixos/kde5: install oxygen-icons --- nixos/modules/services/x11/desktop-managers/kde5.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/nixos/modules/services/x11/desktop-managers/kde5.nix b/nixos/modules/services/x11/desktop-managers/kde5.nix index 7d740bca1e4a..6fdd5b4fa36d 100644 --- a/nixos/modules/services/x11/desktop-managers/kde5.nix +++ b/nixos/modules/services/x11/desktop-managers/kde5.nix @@ -108,6 +108,7 @@ in kdeApps.okular kdeApps.print-manager + kdeApps.oxygen-icons pkgs.hicolor_icon_theme plasma5.kde-gtk-config From ccd16c338d1339e70322809ef56938f57405c6a3 Mon Sep 17 00:00:00 2001 From: Michael Fellinger Date: Sun, 1 Nov 2015 12:55:09 +0100 Subject: [PATCH 105/162] di: 4.35 -> 4.36 --- pkgs/tools/system/di/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/system/di/default.nix b/pkgs/tools/system/di/default.nix index dc15ce13bccb..9dec905379be 100644 --- a/pkgs/tools/system/di/default.nix +++ b/pkgs/tools/system/di/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl }: stdenv.mkDerivation rec { - name = "di-4.35"; + name = "di-4.36"; src = fetchurl { url = "http://gentoo.com/di/${name}.tar.gz"; - sha256 = "1lkiggvdm6wi14xy8845w6mqqr50j2q7g0i2rdcs7qw5gb7gmprc"; + sha256 = "11kd9jawpkir6qwjciis9l5fdvgbp9yndcv4rg6k3x9x1and40zb"; }; makeFlags = "INSTALL_DIR=$(out)"; From 07ad7b9af57ec623afb01a71a774a8bab8d39e5f Mon Sep 17 00:00:00 2001 From: Thomas Tuegel Date: Mon, 2 Nov 2015 10:12:49 -0600 Subject: [PATCH 106/162] oxygen-icons: fix typo in license attribute --- pkgs/applications/kde-apps-15.08/oxygen-icons.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/applications/kde-apps-15.08/oxygen-icons.nix b/pkgs/applications/kde-apps-15.08/oxygen-icons.nix index 7259f6353fc1..4f9a92dffdd1 100644 --- a/pkgs/applications/kde-apps-15.08/oxygen-icons.nix +++ b/pkgs/applications/kde-apps-15.08/oxygen-icons.nix @@ -7,7 +7,7 @@ kdeApp { name = "oxygen-icons"; nativeBuildInputs = [ cmake ]; meta = { - license = lib.license.lgpl3Plus; + license = lib.licenses.lgpl3Plus; maintainers = [ lib.maintainers.ttuegel ]; }; } From b2a958157d2bdab4fe045930fec9c24388ad7730 Mon Sep 17 00:00:00 2001 From: Daniel Frank Date: Tue, 3 Nov 2015 21:37:19 +0100 Subject: [PATCH 107/162] burp: new package (backup program) --- pkgs/tools/backup/burp/1.3.48.nix | 38 ++++++++++++++++++++++++ pkgs/tools/backup/burp/burp_1.3.48.patch | 22 ++++++++++++++ pkgs/tools/backup/burp/burp_1.4.40.patch | 12 ++++++++ pkgs/tools/backup/burp/default.nix | 38 ++++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 4 +++ 5 files changed, 114 insertions(+) create mode 100644 pkgs/tools/backup/burp/1.3.48.nix create mode 100644 pkgs/tools/backup/burp/burp_1.3.48.patch create mode 100644 pkgs/tools/backup/burp/burp_1.4.40.patch create mode 100644 pkgs/tools/backup/burp/default.nix diff --git a/pkgs/tools/backup/burp/1.3.48.nix b/pkgs/tools/backup/burp/1.3.48.nix new file mode 100644 index 000000000000..f680b9826cf2 --- /dev/null +++ b/pkgs/tools/backup/burp/1.3.48.nix @@ -0,0 +1,38 @@ +{ stdenv, fetchgit, + acl, + librsync_0_9, + ncurses, + openssl, + zlib +}: + +stdenv.mkDerivation rec { + name = "burp-1.3.48"; + + src = fetchgit { + url = "https://github.com/grke/burp.git"; + rev = "3636ce0a992904a374234d68170fc1c265bff357"; + sha256 = "708e06b758e8f918aaf7cc8f7517a7eadd456263fe34618e32330e5ad69438c0"; + }; + + patches = [ ./burp_1.3.48.patch ]; + + buildInputs = [ librsync_0_9 ncurses openssl zlib ] + # next two lines copied from bacula, as burp needs acl as well + # acl relies on attr, which I can't get to build on darwin + ++ stdenv.lib.optional (!stdenv.isDarwin) acl; + + configureFlags = [ + "--sbindir=$out/bin" + ]; + + #installPhase = ''make install''; + + meta = with stdenv.lib; { + description = "BURP - BackUp and Restore Program"; + homepage = http://burp.grke.org; + license = licenses.agpl3; + maintainers = with maintainers; [ tokudan ]; + platforms = platforms.all; + }; +} diff --git a/pkgs/tools/backup/burp/burp_1.3.48.patch b/pkgs/tools/backup/burp/burp_1.3.48.patch new file mode 100644 index 000000000000..4349a861a9a1 --- /dev/null +++ b/pkgs/tools/backup/burp/burp_1.3.48.patch @@ -0,0 +1,22 @@ +diff -Naur burp~/CHANGELOG burp/CHANGELOG +--- burp~/CHANGELOG 2015-11-01 21:14:52.621376413 +0000 ++++ burp/CHANGELOG 2015-11-01 21:31:44.718110435 +0000 +@@ -1,3 +1,6 @@ ++2015-11-01 NixOS Patch: ++ * remove dependency on /var and use localstatedir instead ++ + 2014-01-27 Changes in burp-1.3.48: + * Bug fix for restoring correct file times on Windows clients. + +diff -Naur burp~/Makefile.in burp/Makefile.in +--- burp~/Makefile.in 2015-11-01 21:14:52.621376413 +0000 ++++ burp/Makefile.in 2015-11-01 22:09:25.098997115 +0000 +@@ -90,8 +90,6 @@ + $(MKDIR) $(DESTDIR)$(sbindir) + $(MKDIR) $(DESTDIR)$(sysconfdir) + $(MKDIR) $(DESTDIR)$(sysconfdir)/CA-client +- $(MKDIR) $(DESTDIR)/var/run +- $(MKDIR) $(DESTDIR)/var/spool/burp + @if [ ! -d $(DESTDIR)$(sysconfdir)/clientconfdir ] ; then $(MKDIR) $(DESTDIR)$(sysconfdir)/clientconfdir ; cp configs/server/clientconfdir/testclient $(DESTDIR)$(sysconfdir)/clientconfdir/testclient ; fi + @if [ ! -d $(DESTDIR)$(sysconfdir)/clientconfdir/incexc ] ; then $(MKDIR) $(DESTDIR)$(sysconfdir)/clientconfdir/incexc ; cp configs/server/clientconfdir/incexc $(DESTDIR)$(sysconfdir)/clientconfdir/incexc/example ; fi + @if [ ! -d $(DESTDIR)$(sysconfdir)/autoupgrade/client ] ; then $(MKDIR) $(DESTDIR)$(sysconfdir)/autoupgrade/client ; fi diff --git a/pkgs/tools/backup/burp/burp_1.4.40.patch b/pkgs/tools/backup/burp/burp_1.4.40.patch new file mode 100644 index 000000000000..fe57202bc34a --- /dev/null +++ b/pkgs/tools/backup/burp/burp_1.4.40.patch @@ -0,0 +1,12 @@ +diff -Naur burp~/Makefile.in burp/Makefile.in +--- burp~/Makefile.in 2015-11-01 21:14:52.621376413 +0000 ++++ burp/Makefile.in 2015-11-01 22:09:25.098997115 +0000 +@@ -90,8 +90,6 @@ + $(MKDIR) $(DESTDIR)$(sbindir) + $(MKDIR) $(DESTDIR)$(sysconfdir) + $(MKDIR) $(DESTDIR)$(sysconfdir)/CA-client +- $(MKDIR) $(DESTDIR)/var/run +- $(MKDIR) $(DESTDIR)/var/spool/burp + @if [ ! -d $(DESTDIR)$(sysconfdir)/clientconfdir ] ; then $(MKDIR) $(DESTDIR)$(sysconfdir)/clientconfdir ; cp configs/server/clientconfdir/testclient $(DESTDIR)$(sysconfdir)/clientconfdir/testclient ; fi + @if [ ! -d $(DESTDIR)$(sysconfdir)/clientconfdir/incexc ] ; then $(MKDIR) $(DESTDIR)$(sysconfdir)/clientconfdir/incexc ; cp configs/server/clientconfdir/incexc $(DESTDIR)$(sysconfdir)/clientconfdir/incexc/example ; fi + @if [ ! -d $(DESTDIR)$(sysconfdir)/autoupgrade/client ] ; then $(MKDIR) $(DESTDIR)$(sysconfdir)/autoupgrade/client ; fi diff --git a/pkgs/tools/backup/burp/default.nix b/pkgs/tools/backup/burp/default.nix new file mode 100644 index 000000000000..a81a659eada4 --- /dev/null +++ b/pkgs/tools/backup/burp/default.nix @@ -0,0 +1,38 @@ +{ stdenv, fetchgit, + acl, + librsync, + ncurses, + openssl, + zlib +}: + +stdenv.mkDerivation rec { + name = "burp-1.4.40"; + + src = fetchgit { + url = "https://github.com/grke/burp.git"; + rev = "1e8eebac420f2b0dc29102602b7e5e437d58d5b7"; + sha256 = "201fe6daf598543eaf3c8cf3495812b3a65695c6841f555410aaaab1098b8f03"; + }; + + patches = [ ./burp_1.4.40.patch ]; + + buildInputs = [ librsync ncurses openssl zlib ] + # next two lines copied from bacula, as burp needs acl as well + # acl relies on attr, which I can't get to build on darwin + ++ stdenv.lib.optional (!stdenv.isDarwin) acl; + + configureFlags = [ + "--sbindir=$out/bin" + ]; + + #installPhase = ''make install''; + + meta = with stdenv.lib; { + description = "BURP - BackUp and Restore Program"; + homepage = http://burp.grke.org; + license = licenses.agpl3; + maintainers = with maintainers; [ tokudan ]; + platforms = platforms.all; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 5af665e81ecf..e5943b555e7b 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -985,6 +985,10 @@ let par2Support = (config.bup.par2Support or false); }; + burp_1_3 = callPackage ../tools/backup/burp/1.3.48.nix { }; + + burp = callPackage ../tools/backup/burp { }; + byzanz = callPackage ../applications/video/byzanz {}; ori = callPackage ../tools/backup/ori { }; From 97e65957526029bcd6e3c949508dbb4152ae2dc5 Mon Sep 17 00:00:00 2001 From: Daniel Frank Date: Tue, 3 Nov 2015 23:11:53 +0100 Subject: [PATCH 108/162] burp: remove unnecessary CHANGELOG entry in burp --- pkgs/tools/backup/burp/burp_1.3.48.patch | 10 ---------- 1 file changed, 10 deletions(-) diff --git a/pkgs/tools/backup/burp/burp_1.3.48.patch b/pkgs/tools/backup/burp/burp_1.3.48.patch index 4349a861a9a1..fe57202bc34a 100644 --- a/pkgs/tools/backup/burp/burp_1.3.48.patch +++ b/pkgs/tools/backup/burp/burp_1.3.48.patch @@ -1,13 +1,3 @@ -diff -Naur burp~/CHANGELOG burp/CHANGELOG ---- burp~/CHANGELOG 2015-11-01 21:14:52.621376413 +0000 -+++ burp/CHANGELOG 2015-11-01 21:31:44.718110435 +0000 -@@ -1,3 +1,6 @@ -+2015-11-01 NixOS Patch: -+ * remove dependency on /var and use localstatedir instead -+ - 2014-01-27 Changes in burp-1.3.48: - * Bug fix for restoring correct file times on Windows clients. - diff -Naur burp~/Makefile.in burp/Makefile.in --- burp~/Makefile.in 2015-11-01 21:14:52.621376413 +0000 +++ burp/Makefile.in 2015-11-01 22:09:25.098997115 +0000 From b570c6f0caddb29e668ec080b3606ab99787562b Mon Sep 17 00:00:00 2001 From: Tomas Hlavaty Date: Wed, 4 Nov 2015 09:07:52 +0100 Subject: [PATCH 109/162] slime: added The Superior Lisp Interaction Mode for Emacs --- .../editors/emacs-modes/slime/default.nix | 22 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 24 insertions(+) create mode 100644 pkgs/applications/editors/emacs-modes/slime/default.nix diff --git a/pkgs/applications/editors/emacs-modes/slime/default.nix b/pkgs/applications/editors/emacs-modes/slime/default.nix new file mode 100644 index 000000000000..4c6326425369 --- /dev/null +++ b/pkgs/applications/editors/emacs-modes/slime/default.nix @@ -0,0 +1,22 @@ +{stdenv, fetchFromGitHub, emacs}: + +stdenv.mkDerivation rec { + name = "slime"; + src = fetchFromGitHub { + owner = "slime"; + repo = "slime"; + rev = "f80c997ee9408a73637057759120c5b37b55d781"; + sha256 = "06ncqxzidmis6d7xsyi5pamg4pvifmc8l854xaa847rhagsvw7ax"; + }; + buildInputs = [emacs]; + installPhase = '' + rm -rf CVS + mkdir -p $out/share/emacs/site-lisp + cp -r . $out/share/emacs/site-lisp + ''; + meta = { + homepage = "https://common-lisp.net/project/slime/"; + description = "The Superior Lisp Interaction Mode for Emacs"; + license = "GPL"; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 5ce9c2cf0925..9ebdb50c1d3f 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -11399,6 +11399,8 @@ let xmlRpc = callPackage ../applications/editors/emacs-modes/xml-rpc { }; cask = callPackage ../applications/editors/emacs-modes/cask { }; + + slime = callPackage ../applications/editors/emacs-modes/slime { }; }; emacs24Packages = recurseIntoAttrs (emacsPackagesGen emacs24 pkgs.emacs24Packages); From 1fa318db8a216a96fc1fb6af7514347c12af47fd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Domen=20Ko=C5=BEar?= Date: Wed, 4 Nov 2015 10:39:50 +0100 Subject: [PATCH 110/162] pythonPackages.six: 1.9.0 -> 1.10.0 --- pkgs/top-level/python-packages.nix | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index f6ad5d2a8974..501c6eaa1a45 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -16310,16 +16310,13 @@ let six = buildPythonPackage rec { - name = "six-1.9.0"; + name = "six-1.10.0"; src = pkgs.fetchurl { url = "http://pypi.python.org/packages/source/s/six/${name}.tar.gz"; - sha256 = "1mci5i8mjqmljmv33h0q3d4djc13zk1kfmb3fbvd3yy43x0m4h72"; + sha256 = "0snmb8xffb3vsma0z67i0h0w2g2dy0p3gsgh9gi4i0kgc5l8spqh"; }; - # error: invalid command 'test' - doCheck = false; - meta = { description = "A Python 2 and 3 compatibility library"; homepage = http://pypi.python.org/pypi/six/; From ce4657b769de0292149c3320a17d0f5c90243163 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Domen=20Ko=C5=BEar?= Date: Wed, 4 Nov 2015 10:40:14 +0100 Subject: [PATCH 111/162] pythonPackages.sphinx: apply a patch to support py35 --- .../python-modules/sphinx-1.3.1-pr-1946.patch | 35 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 1 + 2 files changed, 36 insertions(+) create mode 100644 pkgs/development/python-modules/sphinx-1.3.1-pr-1946.patch diff --git a/pkgs/development/python-modules/sphinx-1.3.1-pr-1946.patch b/pkgs/development/python-modules/sphinx-1.3.1-pr-1946.patch new file mode 100644 index 000000000000..2933040141aa --- /dev/null +++ b/pkgs/development/python-modules/sphinx-1.3.1-pr-1946.patch @@ -0,0 +1,35 @@ +From 7ce3b991229c74262f81ab7692a1dc6bde2416ee Mon Sep 17 00:00:00 2001 +From: Barry Warsaw +Date: Thu, 25 Jun 2015 11:54:05 -0400 +Subject: [PATCH] One way to work around the lack of + html.parser.HTMLParserError in Python 3.5 + +--- + sphinx/builders/linkcheck.py | 12 +++++++++++- + 1 file changed, 11 insertions(+), 1 deletion(-) + +diff --git a/sphinx/builders/linkcheck.py b/sphinx/builders/linkcheck.py +index 9f5c213..b05c5b2 100644 +--- a/sphinx/builders/linkcheck.py ++++ b/sphinx/builders/linkcheck.py +@@ -19,9 +19,19 @@ + from six.moves.urllib.request import build_opener, Request, HTTPRedirectHandler + from six.moves.urllib.parse import unquote, urlsplit, quote + from six.moves.urllib.error import HTTPError +-from six.moves.html_parser import HTMLParser, HTMLParseError ++from six.moves.html_parser import HTMLParser + from docutils import nodes + ++# 2015-06-25 barry@python.org. This exception was deprecated in Python 3.3 and ++# removed in Python 3.5, however for backward compatibility reasons, we're not ++# going to just remove it. If it doesn't exist, define an exception that will ++# never be caught but leaves the code in check_anchor() intact. ++try: ++ from six.moves.html_parser import HTMLParseError ++except ImportError: ++ class HTMLParseError(Exception): ++ pass ++ + from sphinx.builders import Builder + from sphinx.util.console import purple, red, darkgreen, darkgray, \ + darkred, turquoise diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 501c6eaa1a45..2d4330b69781 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -16469,6 +16469,7 @@ let sha256 = "052i5c7cgvs5iv011dkq3r8d6jycg2gjjg3907ijsbdlq8q52vhs"; }; + patches = [ ../development/python-modules/sphinx-1.3.1-pr-1946.patch ]; LC_ALL = "en_US.UTF-8"; checkPhase = '' PYTHON=${python.executable} make test From 6663598a45f9938343996cf7aa20c30502452e50 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Domen=20Ko=C5=BEar?= Date: Wed, 4 Nov 2015 11:37:34 +0100 Subject: [PATCH 112/162] pythonPackages.oslosphinx: skip overriden patch --- pkgs/top-level/python-packages.nix | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 2d4330b69781..e3d35e7356f9 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -10559,10 +10559,13 @@ let propagatedBuildInputs = with self; [ pbr requests2 - (sphinx.override {src = pkgs.fetchurl { - url = "https://pypi.python.org/packages/source/s/sphinx/sphinx-1.2.3.tar.gz"; - sha256 = "94933b64e2fe0807da0612c574a021c0dac28c7bd3c4a23723ae5a39ea8f3d04"; - };}) + (sphinx.override { + src = pkgs.fetchurl { + url = "https://pypi.python.org/packages/source/s/sphinx/sphinx-1.2.3.tar.gz"; + sha256 = "94933b64e2fe0807da0612c574a021c0dac28c7bd3c4a23723ae5a39ea8f3d04"; + }; + patches = []; + }) ]; }; From 8a4f01c139ac5b079b3738a491dae208b4569a37 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Domen=20Ko=C5=BEar?= Date: Wed, 4 Nov 2015 11:53:49 +0100 Subject: [PATCH 113/162] nova: install migrate.cfg --- pkgs/applications/virtualization/openstack/nova.nix | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/pkgs/applications/virtualization/openstack/nova.nix b/pkgs/applications/virtualization/openstack/nova.nix index da62f27541c8..ee139868ba09 100644 --- a/pkgs/applications/virtualization/openstack/nova.nix +++ b/pkgs/applications/virtualization/openstack/nova.nix @@ -12,6 +12,11 @@ pythonPackages.buildPythonPackage rec { sha256 = "175n1znvmy8f5vqvabc2fa4qy8y17685z4gzpq8984mdsdnpv21w"; }; + # otherwise migrate.cfg is not installed + patchPhase = '' + echo "graft nova" >> MANIFEST.in + ''; + # https://github.com/openstack/nova/blob/stable/liberty/requirements.txt propagatedBuildInputs = with pythonPackages; [ pbr sqlalchemy_1_0 boto decorator eventlet jinja2 lxml routes cryptography From ac00195cbd2433b9e742babdc0f3a459425ce042 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Domen=20Ko=C5=BEar?= Date: Wed, 4 Nov 2015 12:23:57 +0100 Subject: [PATCH 114/162] glance: copy .ini config to /etc --- pkgs/applications/virtualization/openstack/glance.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/applications/virtualization/openstack/glance.nix b/pkgs/applications/virtualization/openstack/glance.nix index 51d58b896d1e..0ae461bcca9e 100644 --- a/pkgs/applications/virtualization/openstack/glance.nix +++ b/pkgs/applications/virtualization/openstack/glance.nix @@ -56,6 +56,8 @@ pythonPackages.buildPythonPackage rec { $i --help esac done + + cp etc/*-paste.ini $out/etc/ ''; meta = with stdenv.lib; { From b4882f14625722ec58ef6d9dc67bea18b11b1f74 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Domen=20Ko=C5=BEar?= Date: Wed, 4 Nov 2015 12:24:23 +0100 Subject: [PATCH 115/162] keystone: copy .ini files, make openssl tools available --- .../applications/virtualization/openstack/keystone.nix | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/virtualization/openstack/keystone.nix b/pkgs/applications/virtualization/openstack/keystone.nix index 42a40f035982..36c297e75d75 100644 --- a/pkgs/applications/virtualization/openstack/keystone.nix +++ b/pkgs/applications/virtualization/openstack/keystone.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pythonPackages, xmlsec, which }: +{ stdenv, fetchurl, pythonPackages, xmlsec, which, openssl }: pythonPackages.buildPythonPackage rec { name = "keystone-${version}"; @@ -30,10 +30,16 @@ pythonPackages.buildPythonPackage rec { buildInputs = with pythonPackages; [ coverage fixtures mock subunit tempest-lib testtools testrepository - ldap ldappool webtest requests2 oslotest pep8 pymongo which + ldap ldappool webtest requests2 oslotest pep8 pymongo which makeWrapper ]; + makeWrapperArgs = ["--prefix PATH : '${openssl}/bin:$PATH'"]; + postInstall = '' + # install .ini files + mkdir -p $out/etc + cp etc/* $out/etc + # check all binaries don't crash for i in $out/bin/*; do $i --help From 00aeb53bc08c591f4acf7b8a25b3ba1c74d25704 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Llu=C3=ADs=20Batlle=20i=20Rossell?= Date: Wed, 4 Nov 2015 12:01:21 +0100 Subject: [PATCH 116/162] coreutils 8.24 have a bug exhibited in a test in the Pi2. Patching. I pick the patch from upstream, and I apply only for ARM to avoid rebuilding stdenv. (cherry picked from commit 1b36f489b6fb2bde3b241d2763abfaa860a4fe55) --- pkgs/tools/misc/coreutils/default.nix | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/misc/coreutils/default.nix b/pkgs/tools/misc/coreutils/default.nix index c9d8f0ad6029..adbe62dd494e 100644 --- a/pkgs/tools/misc/coreutils/default.nix +++ b/pkgs/tools/misc/coreutils/default.nix @@ -19,13 +19,22 @@ let sha256 = "0w11jw3fb5sslf0f72kxy7llxgk1ia3a6bcw0c9kmvxrlj355mx2"; }; - patches = if stdenv.isCygwin then [ ./coreutils-8.23-4.cygwin.patch ] else null; + patches = (optional stdenv.isCygwin ./coreutils-8.23-4.cygwin.patch) ++ + (optional stdenv.isArm (fetchurl { + url = "http://git.savannah.gnu.org/cgit/coreutils.git/patch/?id=3ba68f9e64fa2eb8af22d510437a0c6441feb5e0"; + sha256 = "1dnlszhc8lihhg801i9sz896mlrgfsjfcz62636prb27k5hmixqz"; + name = "coreutils-tail-inotify-race.patch"; + })); # The test tends to fail on btrfs and maybe other unusual filesystems. postPatch = stdenv.lib.optionalString (!stdenv.isDarwin) '' sed '2i echo Skipping dd sparse test && exit 0' -i ./tests/dd/sparse.sh sed '2i echo Skipping cp sparse test && exit 0' -i ./tests/cp/sparse.sh - ''; + '' + + # This is required by coreutils-tail-inotify-race.patch to avoid more deps + stdenv.lib.optionalString stdenv.isArm '' + touch -r src/stat.c src/tail.c + ''; nativeBuildInputs = [ perl ]; buildInputs = [ gmp ] From 9819303647c055d578199fe3b970664cbb3565e7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Llu=C3=ADs=20Batlle=20i=20Rossell?= Date: Wed, 4 Nov 2015 12:41:35 +0100 Subject: [PATCH 117/162] Fixing the logic in coreutils to avoid stdenv rebuild. It was using 'null' instead of '[]' in case of no patches. So I change it to provide 'null'. (cherry picked from commit 56ff659e5d1fffd371786a3b8237129ee365ca5c) --- pkgs/tools/misc/coreutils/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/misc/coreutils/default.nix b/pkgs/tools/misc/coreutils/default.nix index adbe62dd494e..35e9e3828d93 100644 --- a/pkgs/tools/misc/coreutils/default.nix +++ b/pkgs/tools/misc/coreutils/default.nix @@ -19,12 +19,12 @@ let sha256 = "0w11jw3fb5sslf0f72kxy7llxgk1ia3a6bcw0c9kmvxrlj355mx2"; }; - patches = (optional stdenv.isCygwin ./coreutils-8.23-4.cygwin.patch) ++ - (optional stdenv.isArm (fetchurl { + patches = if stdenv.isCygwin then ./coreutils-8.23-4.cygwin.patch else + (if stdenv.isArm then (fetchurl { url = "http://git.savannah.gnu.org/cgit/coreutils.git/patch/?id=3ba68f9e64fa2eb8af22d510437a0c6441feb5e0"; sha256 = "1dnlszhc8lihhg801i9sz896mlrgfsjfcz62636prb27k5hmixqz"; name = "coreutils-tail-inotify-race.patch"; - })); + }) else null); # The test tends to fail on btrfs and maybe other unusual filesystems. postPatch = stdenv.lib.optionalString (!stdenv.isDarwin) '' From 4bfe873298f077e32fd6e05da62ba84e71c072f7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Domen=20Ko=C5=BEar?= Date: Wed, 4 Nov 2015 12:44:04 +0100 Subject: [PATCH 118/162] pythonPackages.{boto,httpretty}: use requests2 --- pkgs/top-level/python-packages.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index e3d35e7356f9..5b6e8688408b 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -1603,7 +1603,7 @@ let ''; buildInputs = [ self.nose self.mock ]; - propagatedBuildInputs = [ self.requests self.httpretty ]; + propagatedBuildInputs = [ self.requests2 self.httpretty ]; meta = { homepage = https://github.com/boto/boto; @@ -7731,7 +7731,7 @@ let sha256 = "0f295zj272plr9lhf80kgz19dxkargwv3ar83rwavrcy516mgg9n"; }; - buildInputs = with self; [ tornado requests httplib2 sure nose coverage certifi ]; + buildInputs = with self; [ tornado requests2 httplib2 sure nose coverage certifi ]; propagatedBuildInputs = with self; [ urllib3 ]; From 827adff712dde127163c0422a970e29a02d061a4 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Wed, 4 Nov 2015 13:22:22 +0100 Subject: [PATCH 119/162] linux: Update to 3.18.24 --- pkgs/os-specific/linux/kernel/linux-3.18.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/linux-3.18.nix b/pkgs/os-specific/linux/kernel/linux-3.18.nix index ffa220387b10..544cd4e897f7 100644 --- a/pkgs/os-specific/linux/kernel/linux-3.18.nix +++ b/pkgs/os-specific/linux/kernel/linux-3.18.nix @@ -1,12 +1,12 @@ { stdenv, fetchurl, perl, buildLinux, ... } @ args: import ./generic.nix (args // rec { - version = "3.18.23"; + version = "3.18.24"; extraMeta.branch = "3.18"; src = fetchurl { url = "mirror://kernel/linux/kernel/v3.x/linux-${version}.tar.xz"; - sha256 = "1jj3afa9p306j7gv13wsjwy322sdaz6jflhvzp6gwjfylncwyskj"; + sha256 = "06wcgzhbiddzrabfd3z0zsb9qwa2phva5cq7gg0mzff67a6cym7d"; }; features.iwlwifi = true; From 1d1cf4845f1f219f61d439a359f4937df2041f06 Mon Sep 17 00:00:00 2001 From: aszlig Date: Wed, 4 Nov 2015 13:59:36 +0100 Subject: [PATCH 120/162] python-hetzner: Update to bugfix version 0.7.4. Fixes pinned CA root certificate and probing for system CA bundle. Closes NixOS/nixops#354. I'm using fetchFromGitHub now because it's use of fetchzip is more stable for autogenerated tarballs from GitHub. Signed-off-by: aszlig --- pkgs/top-level/python-packages.nix | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 5b6e8688408b..48fd0fb246a9 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -7579,12 +7579,13 @@ let hetzner = buildPythonPackage rec { name = "hetzner-${version}"; - version = "0.7.3"; + version = "0.7.4"; - src = pkgs.fetchurl { - url = "https://github.com/RedMoonStudios/hetzner/archive/" - + "v${version}.tar.gz"; - sha256 = "1a0kcwqd1pj5giwh75m2m3jcnr1kd38v40hh64wgly2zp485nm5m"; + src = pkgs.fetchFromGitHub { + repo = "hetzner"; + owner = "RedMoonStudios"; + rev = "v${version}"; + sha256 = "04dlixczzvpimk48p87ix7j9q54jy46cwn4f05n2dlzsyc5vvxin"; }; # not there yet, but coming soon. From 1294c3a460f81045dd7c6ca0ad4e75c83a610cd3 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Wed, 4 Nov 2015 15:21:57 +0100 Subject: [PATCH 121/162] hack-font 2.015 -> 2.017 Changes: https://github.com/chrissimpkins/Hack/blob/master/CHANGELOG.md --- pkgs/data/fonts/hack/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/data/fonts/hack/default.nix b/pkgs/data/fonts/hack/default.nix index 3ef9443921f3..13dcd80c224d 100644 --- a/pkgs/data/fonts/hack/default.nix +++ b/pkgs/data/fonts/hack/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchurl, unzip }: -let version = "2.015"; in +let version = "2.017"; in stdenv.mkDerivation { name = "hack-font-${version}"; @@ -8,7 +8,7 @@ stdenv.mkDerivation { version_ = with stdenv.lib; concatStringsSep "_" (splitString "." version); in fetchurl { - sha256 = "0x0c3wwxiidl5a6axbcwizxny5q2yc6l4724smdj4gmn1xa137g5"; + sha256 = "1bspjdllmwbb7bs5rcdghyvvl4xf3pw5nss1z3zxc805pysxyy0c"; url = "https://github.com/chrissimpkins/Hack/releases/download/v${version}/Hack-v${version_}-ttf.zip"; }; From 0549078488f8301fa763cb1e482ddb0c80e33f0e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Domen=20Ko=C5=BEar?= Date: Wed, 4 Nov 2015 16:23:15 +0100 Subject: [PATCH 122/162] fix eval --- pkgs/applications/virtualization/openstack/keystone.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/applications/virtualization/openstack/keystone.nix b/pkgs/applications/virtualization/openstack/keystone.nix index 36c297e75d75..3060dcb04cb3 100644 --- a/pkgs/applications/virtualization/openstack/keystone.nix +++ b/pkgs/applications/virtualization/openstack/keystone.nix @@ -30,7 +30,7 @@ pythonPackages.buildPythonPackage rec { buildInputs = with pythonPackages; [ coverage fixtures mock subunit tempest-lib testtools testrepository - ldap ldappool webtest requests2 oslotest pep8 pymongo which makeWrapper + ldap ldappool webtest requests2 oslotest pep8 pymongo which ]; makeWrapperArgs = ["--prefix PATH : '${openssl}/bin:$PATH'"]; From 0d18edd645e9197a8b60327cd79b18dbe337e5bb Mon Sep 17 00:00:00 2001 From: Daniel Frank Date: Wed, 4 Nov 2015 19:22:39 +0100 Subject: [PATCH 123/162] burp: updates to match the coding conventions --- pkgs/tools/backup/burp/1.3.48.nix | 16 ++++------------ pkgs/tools/backup/burp/default.nix | 16 ++++------------ 2 files changed, 8 insertions(+), 24 deletions(-) diff --git a/pkgs/tools/backup/burp/1.3.48.nix b/pkgs/tools/backup/burp/1.3.48.nix index f680b9826cf2..a3cef656bdbc 100644 --- a/pkgs/tools/backup/burp/1.3.48.nix +++ b/pkgs/tools/backup/burp/1.3.48.nix @@ -1,10 +1,4 @@ -{ stdenv, fetchgit, - acl, - librsync_0_9, - ncurses, - openssl, - zlib -}: +{ stdenv, fetchgit, acl, librsync_0_9, ncurses, openssl, zlib }: stdenv.mkDerivation rec { name = "burp-1.3.48"; @@ -22,11 +16,9 @@ stdenv.mkDerivation rec { # acl relies on attr, which I can't get to build on darwin ++ stdenv.lib.optional (!stdenv.isDarwin) acl; - configureFlags = [ - "--sbindir=$out/bin" - ]; - - #installPhase = ''make install''; + configureFlags = [ + "--sbindir=$out/bin" + ]; meta = with stdenv.lib; { description = "BURP - BackUp and Restore Program"; diff --git a/pkgs/tools/backup/burp/default.nix b/pkgs/tools/backup/burp/default.nix index a81a659eada4..5dea4eba4895 100644 --- a/pkgs/tools/backup/burp/default.nix +++ b/pkgs/tools/backup/burp/default.nix @@ -1,10 +1,4 @@ -{ stdenv, fetchgit, - acl, - librsync, - ncurses, - openssl, - zlib -}: +{ stdenv, fetchgit, acl, librsync, ncurses, openssl, zlib }: stdenv.mkDerivation rec { name = "burp-1.4.40"; @@ -22,11 +16,9 @@ stdenv.mkDerivation rec { # acl relies on attr, which I can't get to build on darwin ++ stdenv.lib.optional (!stdenv.isDarwin) acl; - configureFlags = [ - "--sbindir=$out/bin" - ]; - - #installPhase = ''make install''; + configureFlags = [ + "--sbindir=$out/bin" + ]; meta = with stdenv.lib; { description = "BURP - BackUp and Restore Program"; From b3bb609b96e9d994c631a50117da89a6a25495f5 Mon Sep 17 00:00:00 2001 From: Thomas Tuegel Date: Wed, 4 Nov 2015 12:31:26 -0600 Subject: [PATCH 124/162] atlas: build on Linux only Fixes #10808. --- pkgs/development/libraries/science/math/atlas/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/development/libraries/science/math/atlas/default.nix b/pkgs/development/libraries/science/math/atlas/default.nix index 6eb72f2ed640..1fa48ffea91c 100644 --- a/pkgs/development/libraries/science/math/atlas/default.nix +++ b/pkgs/development/libraries/science/math/atlas/default.nix @@ -107,6 +107,7 @@ stdenv.mkDerivation { homepage = "http://math-atlas.sourceforge.net/"; description = "Automatically Tuned Linear Algebra Software (ATLAS)"; license = stdenv.lib.licenses.bsd3; + platforms = stdenv.lib.platforms.linux; longDescription = '' The ATLAS (Automatically Tuned Linear Algebra Software) project is an From d2e6b9f3ae5d4168ebe7ff92371ac09bdc2fcfe5 Mon Sep 17 00:00:00 2001 From: Jude Taylor Date: Tue, 3 Nov 2015 14:41:21 -0800 Subject: [PATCH 125/162] Revert "darwin purity: mosh" This reverts commit 772960bcb7c7b49661f355e36c83962444c2d0c8. --- pkgs/tools/networking/mosh/default.nix | 15 +++------------ 1 file changed, 3 insertions(+), 12 deletions(-) diff --git a/pkgs/tools/networking/mosh/default.nix b/pkgs/tools/networking/mosh/default.nix index 59ff89547f2e..ec2f8d78dc67 100644 --- a/pkgs/tools/networking/mosh/default.nix +++ b/pkgs/tools/networking/mosh/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, zlib, boost, protobuf, ncurses, pkgconfig, IOTty -, makeWrapper, perl, openssl, autoreconfHook }: +, makeWrapper, perl, openssl }: stdenv.mkDerivation rec { name = "mosh-1.2.5"; @@ -9,19 +9,10 @@ stdenv.mkDerivation rec { sha256 = "1qsb0y882yfgwnpy6f98pi5xqm6kykdsrxzvaal37hs7szjhky0s"; }; - buildInputs = [ - boost protobuf ncurses zlib pkgconfig IOTty makeWrapper perl openssl - ] ++ stdenv.lib.optional stdenv.isDarwin autoreconfHook; - - prePatch = stdenv.lib.optionalString stdenv.isDarwin '' - # look for forkpty in libSystem, not libutil - substituteInPlace configure.ac \ - --replace '[util]' '[System]' \ - --replace 'LIBUTIL="-lutil"' 'LIBUTIL="-lSystem"' - ''; + buildInputs = [ boost protobuf ncurses zlib pkgconfig IOTty makeWrapper perl openssl ]; postInstall = '' - wrapProgram $out/bin/mosh --prefix PERL5LIB : $PERL5LIB + wrapProgram $out/bin/mosh --prefix PERL5LIB : $PERL5LIB ''; meta = { From 7161be03c4af3b113c87eed68117486795fc3c6a Mon Sep 17 00:00:00 2001 From: Jude Taylor Date: Wed, 4 Nov 2015 10:49:13 -0800 Subject: [PATCH 126/162] add libutil into darwin.Libsystem --- .../apple-source-releases/Libsystem/default.nix | 8 +++----- .../darwin/apple-source-releases/default.nix | 2 +- .../apple-source-releases/libutil/default.nix | 17 +++++++++++++++++ 3 files changed, 21 insertions(+), 6 deletions(-) create mode 100644 pkgs/os-specific/darwin/apple-source-releases/libutil/default.nix diff --git a/pkgs/os-specific/darwin/apple-source-releases/Libsystem/default.nix b/pkgs/os-specific/darwin/apple-source-releases/Libsystem/default.nix index 108b430d7834..95c1ca73e511 100644 --- a/pkgs/os-specific/darwin/apple-source-releases/Libsystem/default.nix +++ b/pkgs/os-specific/darwin/apple-source-releases/Libsystem/default.nix @@ -1,6 +1,6 @@ { stdenv, appleDerivation, cpio, bootstrap_cmds, xnu, Libc, Libm, libdispatch, cctools, Libinfo, dyld, Csu, architecture, libclosure, CarbonHeaders, ncurses, CommonCrypto, copyfile, - removefile, libresolv, Libnotify, libpthread, mDNSResponder, launchd, version }: + removefile, libresolv, Libnotify, libpthread, mDNSResponder, launchd, libutil, version }: appleDerivation rec { phases = [ "unpackPhase" "installPhase" ]; @@ -54,7 +54,7 @@ appleDerivation rec { for dep in ${Libc} ${Libm} ${Libinfo} ${dyld} ${architecture} ${libclosure} ${CarbonHeaders} \ ${libdispatch} ${ncurses} ${CommonCrypto} ${copyfile} ${removefile} ${libresolv} \ - ${Libnotify} ${mDNSResponder} ${launchd}; do + ${Libnotify} ${mDNSResponder} ${launchd} ${libutil}; do (cd $dep/include && find . -name '*.h' | cpio -pdm $out/include) done @@ -120,7 +120,7 @@ appleDerivation rec { (map (l: "-reexport_library /usr/lib/system/lib${l}.dylib") systemlibs)} # Set up links to pretend we work like a conventional unix (Apple's design, not mine!) - for name in c dbm dl info m mx poll proc pthread rpcsvc gcc_s.10.4 gcc_s.10.5; do + for name in c dbm dl info m mx poll proc pthread rpcsvc util gcc_s.10.4 gcc_s.10.5; do ln -s libSystem.dylib $out/lib/lib$name.dylib done @@ -136,8 +136,6 @@ appleDerivation rec { -delete_rpath ${libresolv}/lib \ $out/lib/libresolv.9.dylib ln -s libresolv.9.dylib $out/lib/libresolv.dylib - - otool -L $out/lib/libresolv.dylib ''; meta = with stdenv.lib; { diff --git a/pkgs/os-specific/darwin/apple-source-releases/default.nix b/pkgs/os-specific/darwin/apple-source-releases/default.nix index 43698629a46f..906e0ad2d544 100644 --- a/pkgs/os-specific/darwin/apple-source-releases/default.nix +++ b/pkgs/os-specific/darwin/apple-source-releases/default.nix @@ -76,7 +76,7 @@ let libpthread = applePackage "libpthread" "105.1.4" "09vwwahcvmxvx2xl0890gkp91n61dld29j73y2pa597bqkag2qpg" {}; libresolv = applePackage "libresolv" "54" "028mp2smd744ryxwl8cqz4njv8h540sdw3an1yl7yxqcs04r0p4b" {}; Libsystem = applePackage "Libsystem" "1197.1.1" "1yfj2qdrf9vrzs7p9m4wlb7zzxcrim1gw43x4lvz4qydpp5kg2rh" {}; - #libutil = applePackage "libutil" "38" "12gsvmj342n5d81kqwba68bmz3zf2757442g1sz2y5xmcapa3g5f" {}; + libutil = applePackage "libutil" "38" "12gsvmj342n5d81kqwba68bmz3zf2757442g1sz2y5xmcapa3g5f" {}; libunwind = applePackage "libunwind" "35.3" "0miffaa41cv0lzf8az5k1j1ng8jvqvxcr4qrlkf3xyj479arbk1b" {}; mDNSResponder = applePackage "mDNSResponder" "522.92.1" "1cp87qda1s7brriv413i71yggm8yqfwv64vknrnqv24fcb8hzbmy" {}; objc4 = applePackage "objc4" "551.1" "1jrdb6yyb5jwwj27c1r0nr2y2ihqjln8ynj61mpkvp144c1cm5bg" {}; diff --git a/pkgs/os-specific/darwin/apple-source-releases/libutil/default.nix b/pkgs/os-specific/darwin/apple-source-releases/libutil/default.nix new file mode 100644 index 000000000000..c943c2068e6d --- /dev/null +++ b/pkgs/os-specific/darwin/apple-source-releases/libutil/default.nix @@ -0,0 +1,17 @@ +{ stdenv, appleDerivation }: + +# all symbols are located in libSystem +appleDerivation { + phases = [ "unpackPhase" "installPhase" ]; + + installPhase = '' + mkdir -p $out/include + cp *.h $out/include + ''; + + meta = with stdenv.lib; { + maintainers = with maintainers; [ copumpkin ]; + platforms = platforms.darwin; + license = licenses.apsl20; + }; +} From d2bb99b6e3347312c5083c70d38581b96cd495df Mon Sep 17 00:00:00 2001 From: Pascal Wittmann Date: Tue, 3 Nov 2015 09:28:55 +0100 Subject: [PATCH 127/162] perl-Catalyst-Plugin-Authorization-ACL: 0.15 -> 0.16 --- pkgs/top-level/perl-packages.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 77a05b51078f..81a3fed97930 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -1043,12 +1043,12 @@ let self = _self // overrides; _self = with self; { }; CatalystPluginAuthorizationACL = buildPerlPackage rec { - name = "Catalyst-Plugin-Authorization-ACL-0.15"; + name = "Catalyst-Plugin-Authorization-ACL-0.16"; src = fetchurl { url = "mirror://cpan/authors/id/R/RK/RKITOVER/${name}.tar.gz"; - sha256 = "12pj3c8hhm72jzyj83pjmxib0l48s3954spln97n3s0nsvliya98"; + sha256 = "0z4328rr6l9xi45hyv6q9pwwamp0864q6skcp29jrz9f919ycdra"; }; - propagatedBuildInputs = [CatalystRuntime ClassThrowable]; + propagatedBuildInputs = [ CatalystRuntime ClassThrowable ]; }; CatalystPluginAuthorizationRoles = buildPerlPackage { From 1f6c647f6cce979e267f8a93462b4feea94163e0 Mon Sep 17 00:00:00 2001 From: Pascal Wittmann Date: Tue, 3 Nov 2015 09:44:12 +0100 Subject: [PATCH 128/162] perl-Catalyst-Plugin-ConfigLoader: 0.33 -> 0.34 --- pkgs/top-level/perl-packages.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 81a3fed97930..7056fa397125 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -1112,10 +1112,10 @@ let self = _self // overrides; _self = with self; { }; CatalystPluginConfigLoader = buildPerlPackage rec { - name = "Catalyst-Plugin-ConfigLoader-0.33"; + name = "Catalyst-Plugin-ConfigLoader-0.34"; src = fetchurl { url = "mirror://cpan/authors/id/B/BO/BOBTFISH/${name}.tar.gz"; - sha256 = "0m18yqcwx5fzz4lrd5db8x8wyir1061pclv5jb9g963wbg4zk43g"; + sha256 = "19j7p4v7mbx6wrmpvmrnd974apx7hdl2s095ga3b9zcbdrl77h5q"; }; propagatedBuildInputs = [CatalystRuntime DataVisitor ConfigAny MROCompat]; }; From 23dd68623093c96da5c0d7d9464997f988bda25e Mon Sep 17 00:00:00 2001 From: Pascal Wittmann Date: Tue, 3 Nov 2015 09:52:58 +0100 Subject: [PATCH 129/162] perl-Catalyst-Plugin-Session: 0.39 -> 0.40 --- pkgs/top-level/perl-packages.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 7056fa397125..a0ff4268b318 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -1159,11 +1159,11 @@ let self = _self // overrides; _self = with self; { }; }; - CatalystPluginSession = buildPerlPackage { - name = "Catalyst-Plugin-Session-0.39"; + CatalystPluginSession = buildPerlPackage rec { + name = "Catalyst-Plugin-Session-0.40"; src = fetchurl { - url = mirror://cpan/authors/id/J/JJ/JJNAPIORK/Catalyst-Plugin-Session-0.39.tar.gz; - sha256 = "0m4a003qgz7848iyckwbigg2vw3kmfxggh1razrnzxrbz3n6x5gi"; + url = "mirror://cpan/authors/id/J/JJ/JJNAPIORK/${name}.tar.gz"; + sha256 = "171vi9xcl775scjaw4fcfdmqvz0rb1nr0xxg2gb3ng6bjzpslhgv"; }; buildInputs = [ TestDeep TestException TestWWWMechanizePSGI ]; propagatedBuildInputs = [ CatalystRuntime Moose MooseXEmulateClassAccessorFast MROCompat namespaceclean ObjectSignature ]; From 8843f53fcb31a51e4bca557328a7071c79d5d9b4 Mon Sep 17 00:00:00 2001 From: Pascal Wittmann Date: Wed, 4 Nov 2015 20:42:07 +0100 Subject: [PATCH 130/162] pugixml: 1.6 -> 1.7 --- pkgs/development/libraries/pugixml/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/pugixml/default.nix b/pkgs/development/libraries/pugixml/default.nix index 153d3ce8e80f..b866a347d95e 100644 --- a/pkgs/development/libraries/pugixml/default.nix +++ b/pkgs/development/libraries/pugixml/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "pugixml-${version}"; - version = "1.6"; + version = "1.7"; src = fetchurl { url = "https://github.com/zeux/pugixml/releases/download/v${version}/${name}.tar.gz"; - sha256 = "1pnrdi8n9fdclmhxri3jwc6xwpgvblbjnqkk9ykycpnljv20ads7"; + sha256 = "1jpml475kbhs1aqwa48g2cbfxlrb9qp115m2j9yryxhxyr30vqgv"; }; nativeBuildInputs = [ cmake ]; From e3ce30bef4d8a37054354cc280df61f80a8a341e Mon Sep 17 00:00:00 2001 From: Pascal Wittmann Date: Wed, 4 Nov 2015 20:54:48 +0100 Subject: [PATCH 131/162] perl-Catalyst-Plugin-Static-Simple: 0.31 -> 0.33 --- pkgs/top-level/perl-packages.nix | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index a0ff4268b318..47c69218976f 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -1241,14 +1241,15 @@ let self = _self // overrides; _self = with self; { }; }; - CatalystPluginStaticSimple = buildPerlPackage { - name = "Catalyst-Plugin-Static-Simple-0.31"; + CatalystPluginStaticSimple = buildPerlPackage rec { + name = "Catalyst-Plugin-Static-Simple-0.33"; src = fetchurl { - url = mirror://cpan/authors/id/A/AB/ABRAXXA/Catalyst-Plugin-Static-Simple-0.31.tar.gz; - sha256 = "1mcns9qdpnja153prbyypwjicgpm1sn7rw75k7hm28g3vf59z733"; + url = "mirror://cpan/authors/id/J/JJ/JJNAPIORK/${name}.tar.gz"; + sha256 = "1h8f12bhzh0ssq9gs8r9g3hqn8zn2k0q944vc1vm8j81bns16msy"; }; patches = [ ../development/perl-modules/catalyst-plugin-static-simple-etag.patch ]; - propagatedBuildInputs = [ CatalystRuntime MIMETypes Moose MooseXTypes namespaceautoclean ]; + propagatedBuildInputs = [ CatalystRuntime MIMETypes Moose MooseXTypes + namespaceautoclean ]; meta = { description = "Make serving static pages painless"; license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; From 997bf2c6657217481701bd2519b6aae9508ae6a9 Mon Sep 17 00:00:00 2001 From: Nikolay Amiantov Date: Wed, 4 Nov 2015 23:07:26 +0300 Subject: [PATCH 132/162] vc: init at 0.7.5, 1.0.0 --- pkgs/development/libraries/vc/0.7.nix | 25 +++++++++++++++++++++++ pkgs/development/libraries/vc/default.nix | 25 +++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 4 ++++ 3 files changed, 54 insertions(+) create mode 100644 pkgs/development/libraries/vc/0.7.nix create mode 100644 pkgs/development/libraries/vc/default.nix diff --git a/pkgs/development/libraries/vc/0.7.nix b/pkgs/development/libraries/vc/0.7.nix new file mode 100644 index 000000000000..932b7f50f351 --- /dev/null +++ b/pkgs/development/libraries/vc/0.7.nix @@ -0,0 +1,25 @@ +{ stdenv, fetchFromGitHub, cmake }: + +stdenv.mkDerivation rec { + version = "0.7.5"; + name = "Vc-${version}"; + + src = fetchFromGitHub { + owner = "VcDevel"; + repo = "Vc"; + rev = version; + sha256 = "190s4r2n3jsivl4j2m288j3rqmgjj6gl308hi9mzwyhcfn17q8br"; + }; + + nativeBuildInputs = [ cmake ]; + + enableParallelBuilding = true; + + meta = with stdenv.lib; { + description = "Library for multiprecision complex arithmetic with exact rounding"; + homepage = https://github.com/VcDevel/Vc; + license = licences.bsd3; + platforms = platforms.all; + maintainers = with maintainers; [ abbradar ]; + }; +} diff --git a/pkgs/development/libraries/vc/default.nix b/pkgs/development/libraries/vc/default.nix new file mode 100644 index 000000000000..b019ad63cdf2 --- /dev/null +++ b/pkgs/development/libraries/vc/default.nix @@ -0,0 +1,25 @@ +{ stdenv, fetchFromGitHub, cmake }: + +stdenv.mkDerivation rec { + version = "1.0.0"; + name = "Vc-${version}"; + + src = fetchFromGitHub { + owner = "VcDevel"; + repo = "Vc"; + rev = version; + sha256 = "014li9kcbbxinh9r1nngdzspjzs2nxwslcknd950msjkqgnjhz4r"; + }; + + nativeBuildInputs = [ cmake ]; + + enableParallelBuilding = true; + + meta = with stdenv.lib; { + description = "Library for multiprecision complex arithmetic with exact rounding"; + homepage = https://github.com/VcDevel/Vc; + license = licences.bsd3; + platforms = platforms.all; + maintainers = with maintainers; [ abbradar ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index eb0dc02f1073..9aca437fb43c 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -8433,6 +8433,10 @@ let vamp = callPackage ../development/libraries/audio/vamp { }; + vc = callPackage ../development/libraries/vc { }; + + vc_0_7 = callPackage ../development/libraries/vc/0.7.nix { }; + vcdimager = callPackage ../development/libraries/vcdimager { }; vid-stab = callPackage ../development/libraries/vid-stab { }; From b052cb1a10cdc8d0e1da2d9ddb20a31e9e71f67e Mon Sep 17 00:00:00 2001 From: Nikolay Amiantov Date: Wed, 4 Nov 2015 23:07:41 +0300 Subject: [PATCH 133/162] calligra: 2.8.7 -> 2.9.8 --- pkgs/applications/office/calligra/default.nix | 36 +++++++++---------- pkgs/top-level/all-packages.nix | 4 ++- 2 files changed, 19 insertions(+), 21 deletions(-) diff --git a/pkgs/applications/office/calligra/default.nix b/pkgs/applications/office/calligra/default.nix index 3d1eada1db61..d1f1cc2f03fa 100644 --- a/pkgs/applications/office/calligra/default.nix +++ b/pkgs/applications/office/calligra/default.nix @@ -1,36 +1,32 @@ -{ stdenv, fetchurl, automoc4, cmake, kdelibs, attica, perl, zlib, libpng, boost, mesa -, kdepimlibs, createresources ? null, eigen, qca2, exiv2, soprano, marble, lcms2 -, fontconfig, freetype, sqlite, icu, libwpd, libwpg, pkgconfig, poppler_qt4 -, libkdcraw, libxslt, fftw, glew, gsl, shared_desktop_ontologies, okular -, libvisio, kactivities, mysql, postgresql, freetds, xbase, openexr, ilmbase -, libodfgen, opencolorio, openjpeg, pstoedit, librevenge +{ stdenv, fetchurl, automoc4, cmake, perl, pkgconfig, kdelibs, 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 +# TODO: not found +#, xbase, openjpeg +# TODO: package libWPS, Spnav, m2mml, LibEtonyek }: stdenv.mkDerivation rec { - name = "calligra-2.8.7"; + name = "calligra-2.9.8"; src = fetchurl { url = "mirror://kde/stable/${name}/${name}.tar.xz"; - sha256 = "1d8fx0xn8n8y6jglw8hhpk7kr6kbhsbaxqwqlfzmnzh7x9s8nsxg"; + sha256 = "08a5k8gjmzp9yzq46xy0p1sw7dpvxmxh8zz6dyj8q1dq29719kkc"; }; nativeBuildInputs = [ automoc4 cmake perl pkgconfig ]; -# TODO: package Vc, libWPS, Spnav, m2mml, LibEtonyek, poppler-qt4-xpdf-headers -# not found: xbase, openjpeg(too new) - buildInputs = [ - kdelibs attica zlib libpng boost mesa kdepimlibs - createresources eigen qca2 exiv2 soprano marble lcms2 fontconfig freetype - sqlite icu libwpd libwpg poppler_qt4 libkdcraw libxslt fftw glew gsl - shared_desktop_ontologies okular libodfgen opencolorio openjpeg - libvisio kactivities mysql.lib postgresql freetds xbase openexr pstoedit - librevenge + kdelibs 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 ]; - patches = [ ./librevenge.patch ]; - - NIX_CFLAGS_COMPILE = "-I${ilmbase}/include/OpenEXR"; + enableParallelBuilding = true; meta = { description = "A suite of productivity applications"; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 9aca437fb43c..ed176ef4de84 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -14201,7 +14201,9 @@ let bluedevil = callPackage ../tools/bluetooth/bluedevil { }; - calligra = callPackage ../applications/office/calligra { eigen = eigen2; }; + calligra = callPackage ../applications/office/calligra { + vc = vc_0_7; + }; choqok = callPackage ../applications/networking/instant-messengers/choqok { }; From 88f7853e1633ac01f27a8b7c7d3a67e75c1130ab Mon Sep 17 00:00:00 2001 From: Nikolay Amiantov Date: Wed, 4 Nov 2015 23:11:37 +0300 Subject: [PATCH 134/162] calligra: remove unneeded patch --- .../office/calligra/librevenge.patch | 882 ------------------ 1 file changed, 882 deletions(-) delete mode 100644 pkgs/applications/office/calligra/librevenge.patch diff --git a/pkgs/applications/office/calligra/librevenge.patch b/pkgs/applications/office/calligra/librevenge.patch deleted file mode 100644 index ced0ff07407d..000000000000 --- a/pkgs/applications/office/calligra/librevenge.patch +++ /dev/null @@ -1,882 +0,0 @@ -From 8e8f99cc314435f100d367f41c110becd19d3885 Mon Sep 17 00:00:00 2001 -From: David Tardon -Date: Tue, 27 May 2014 16:15:52 +0200 -Subject: [PATCH] switch to librevenge-based import libs - ---- - CMakeLists.txt | 10 ++++++ - cmake/modules/FindLibEtonyek.cmake | 6 ++-- - cmake/modules/FindLibOdfGen.cmake | 6 ++-- - cmake/modules/FindLibRevenge.cmake | 37 +++++++++++++++++++++ - cmake/modules/FindLibVisio.cmake | 6 ++-- - cmake/modules/FindLibWpd.cmake | 22 +++---------- - cmake/modules/FindLibWpg.cmake | 6 ++-- - cmake/modules/FindLibWps.cmake | 6 ++-- - filters/flow/visio/import/CMakeLists.txt | 3 +- - filters/flow/visio/import/VSDXImport.cpp | 9 ++--- - filters/flow/wpg/import/CMakeLists.txt | 3 +- - filters/flow/wpg/import/WPGImport.cpp | 9 ++--- - filters/karbon/wpg/CMakeLists.txt | 4 +-- - filters/karbon/wpg/WPGImport.cpp | 39 ++++++++-------------- - filters/libodfhandler/DiskDocumentHandler.cxx | 13 ++++---- - filters/libodfhandler/DiskDocumentHandler.hxx | 8 ++--- - filters/libodfhandler/OutputFileHelper.cxx | 6 ++-- - filters/libodfhandler/OutputFileHelper.hxx | 9 ++--- - filters/libodfhandler/StdOutHandler.cxx | 13 ++++---- - filters/libodfhandler/StdOutHandler.hxx | 8 ++--- - filters/stage/keynote/import/CMakeLists.txt | 5 +-- - filters/stage/keynote/import/KeyImport.cpp | 15 +++++---- - filters/words/wordperfect/import/CMakeLists.txt | 3 +- - filters/words/wordperfect/import/WPDImport.cpp | 44 ++++++++++++++----------- - filters/words/works/import/CMakeLists.txt | 3 +- - filters/words/works/import/WPSImport.cpp | 18 +++++----- - 26 files changed, 177 insertions(+), 134 deletions(-) - create mode 100644 cmake/modules/FindLibRevenge.cmake - -diff --git a/CMakeLists.txt b/CMakeLists.txt -index 5b6b764..c337864 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -697,6 +697,16 @@ macro_optional_find_package(Okular) - macro_log_feature(OKULAR_FOUND "Okular" "Okular ODP Plugin" "http://okular.kde.org/" FALSE "" "Required to build the Okular OpenDocument Presenter plugin") - - ## -+## Test for librevenge -+## -+macro_optional_find_package(LibRevenge) -+macro_log_feature(LIBREVENGE_FOUND "LibRevenge" -+ "A base library for writing document import filters" -+ "http://sf.net/p/libwpd/librevenge/" FALSE "" -+ "Required by various import filters" -+) -+ -+## - ## Test for libodfgen - ## - macro_optional_find_package(LibOdfGen) -diff --git a/cmake/modules/FindLibEtonyek.cmake b/cmake/modules/FindLibEtonyek.cmake -index 5b78964..ad10d79 100644 ---- a/cmake/modules/FindLibEtonyek.cmake -+++ b/cmake/modules/FindLibEtonyek.cmake -@@ -10,16 +10,16 @@ - - include(LibFindMacros) - libfind_package(LIBETONYEK LibWpd) --libfind_pkg_check_modules(LIBETONYEK_PKGCONF libetonyek-0.0) -+libfind_pkg_check_modules(LIBETONYEK_PKGCONF libetonyek-0.1) - - find_path(LIBETONYEK_INCLUDE_DIR - NAMES libetonyek/libetonyek.h - HINTS ${LIBETONYEK_PKGCONF_INCLUDE_DIRS} ${LIBETONYEK_PKGCONF_INCLUDEDIR} -- PATH_SUFFIXES libetonyek-0.0 -+ PATH_SUFFIXES libetonyek-0.1 - ) - - find_library(LIBETONYEK_LIBRARY -- NAMES etonyek etonyek-0.0 -+ NAMES etonyek etonyek-0.1 - HINTS ${LIBETONYEK_PKGCONF_LIBRARY_DIRS} ${LIBETONYEK_PKGCONF_LIBDIR} - ) - -diff --git a/cmake/modules/FindLibOdfGen.cmake b/cmake/modules/FindLibOdfGen.cmake -index 9ab80d1..355c345 100644 ---- a/cmake/modules/FindLibOdfGen.cmake -+++ b/cmake/modules/FindLibOdfGen.cmake -@@ -9,16 +9,16 @@ - # Redistribution and use is allowed according to the terms of the BSD license. - - include(LibFindMacros) --libfind_pkg_check_modules(LIBODFGEN_PKGCONF libodfgen-0.0) -+libfind_pkg_check_modules(LIBODFGEN_PKGCONF libodfgen-0.1) - - find_path(LIBODFGEN_INCLUDE_DIR - NAMES libodfgen/libodfgen.hxx - HINTS ${LIBODFGEN_PKGCONF_INCLUDE_DIRS} ${LIBODFGEN_PKGCONF_INCLUDEDIR} -- PATH_SUFFIXES libodfgen-0.0 -+ PATH_SUFFIXES libodfgen-0.1 - ) - - find_library(LIBODFGEN_LIBRARY -- NAMES odfgen-0.0 -+ NAMES odfgen-0.1 - HINTS ${LIBODFGEN_PKGCONF_LIBRARY_DIRS} ${LIBODFGEN_PKGCONF_LIBDIR} - ) - -diff --git a/cmake/modules/FindLibRevenge.cmake b/cmake/modules/FindLibRevenge.cmake -new file mode 100644 -index 0000000..8ed18b1 ---- /dev/null -+++ b/cmake/modules/FindLibRevenge.cmake -@@ -0,0 +1,37 @@ -+# - Try to find the librevenge -+# Once done this will define -+# -+# LIBREVENGE_FOUND - system has LIBREVENGE -+# LIBREVENGE_INCLUDE_DIRS - the LIBREVENGE include directory -+# LIBREVENGE_LIBRARIES - Link these to use LIBREVENGE -+# LIBREVENGE_DEFINITIONS - Compiler switches required for using LIBREVENGE -+# -+ -+include(LibFindMacros) -+libfind_pkg_check_modules(REVENGE_PKGCONF librevenge-0.0) -+ -+find_path(REVENGE_INCLUDE_DIR -+ NAMES librevenge/librevenge.h -+ HINTS ${REVENGE_PKGCONF_INCLUDE_DIRS} ${REVENGE_PKGCONF_INCLUDEDIR} -+ PATH_SUFFIXES librevenge-0.0 -+) -+ -+find_path(REVENGE_STREAM_INCLUDE_DIR -+ NAMES librevenge-stream/librevenge-stream.h -+ HINTS ${REVENGE_STREAM_PKGCONF_INCLUDE_DIRS} ${REVENGE_STREAM_PKGCONF_INCLUDEDIR} -+ PATH_SUFFIXES librevenge-0.0 -+) -+ -+find_library(REVENGE_LIBRARY -+ NAMES revenge librevenge revenge-0.0 librevenge-0.0 -+ HINTS ${REVENGE_STREAM_PKGCONF_LIBRARY_DIRS} ${REVENGE_STREAM_PKGCONF_LIBDIR} -+) -+ -+find_library(REVENGE_STREAM_LIBRARY -+ NAMES revenge-stream librevenge-stream revenge-stream-0.0 librevenge-stream-0.0 -+ HINTS ${REVENGE_PKGCONF_LIBRARY_DIRS} ${REVENGE_PKGCONF_LIBDIR} -+) -+ -+set(LIBREVENGE_PROCESS_LIBS REVENGE_LIBRARY REVENGE_STREAM_LIBRARY) -+set(LIBREVENGE_PROCESS_INCLUDES REVENGE_INCLUDE_DIR REVENGE_STREAM_INCLUDE_DIR) -+libfind_process(LIBREVENGE) -diff --git a/cmake/modules/FindLibVisio.cmake b/cmake/modules/FindLibVisio.cmake -index a8533ee..49871b3 100644 ---- a/cmake/modules/FindLibVisio.cmake -+++ b/cmake/modules/FindLibVisio.cmake -@@ -12,16 +12,16 @@ - include(LibFindMacros) - libfind_package(LIBWPD LibWpd) - libfind_package(LIBWPG LibWpg) --libfind_pkg_check_modules(LIBVISIO_PKGCONF libvisio-0.0) -+libfind_pkg_check_modules(LIBVISIO_PKGCONF libvisio-0.1) - - find_path(LIBVISIO_INCLUDE_DIR - NAMES libvisio/libvisio.h - HINTS ${LIBVISIO_PKGCONF_INCLUDE_DIRS} ${LIBVISIO_PKGCONF_INCLUDEDIR} -- PATH_SUFFIXES libvisio-0.0 -+ PATH_SUFFIXES libvisio-0.1 - ) - - find_library(LIBVISIO_LIBRARY -- NAMES visio visio-0.0 -+ NAMES visio visio-0.1 - HINTS ${LIBVISIO_PKGCONF_LIBRARY_DIRS} ${LIBVISIO_PKGCONF_LIBDIR} - ) - -diff --git a/cmake/modules/FindLibWpd.cmake b/cmake/modules/FindLibWpd.cmake -index 2a324cc..ed9bc26 100644 ---- a/cmake/modules/FindLibWpd.cmake -+++ b/cmake/modules/FindLibWpd.cmake -@@ -8,31 +8,19 @@ - # - - include(LibFindMacros) --libfind_pkg_check_modules(WPD_PKGCONF libwpd-0.9) --libfind_pkg_check_modules(WPD_STREAM_PKGCONF libwpd-stream-0.9) -+libfind_pkg_check_modules(WPD_PKGCONF libwpd-0.10) - - find_path(WPD_INCLUDE_DIR - NAMES libwpd/libwpd.h - HINTS ${WPD_PKGCONF_INCLUDE_DIRS} ${WPD_PKGCONF_INCLUDEDIR} -- PATH_SUFFIXES libwpd-0.9 --) -- --find_path(WPD_STREAM_INCLUDE_DIR -- NAMES libwpd-stream/libwpd-stream.h -- HINTS ${WPD_STREAM_PKGCONF_INCLUDE_DIRS} ${WPD_STREAM_PKGCONF_INCLUDEDIR} -- PATH_SUFFIXES libwpd-0.9 -+ PATH_SUFFIXES libwpd-0.10 - ) - - find_library(WPD_LIBRARY -- NAMES wpd libwpd wpd-0.9 libwpd-0.9 -+ NAMES wpd libwpd wpd-0.10 libwpd-0.10 - HINTS ${WPD_PKGCONF_LIBRARY_DIRS} ${WPD_PKGCONF_LIBDIR} - ) - --find_library(WPD_STREAM_LIBRARY -- NAMES wpd-stream libwpd-stream wpd-stream-0.9 libwpd-stream-0.9 -- HINTS ${WPD_STREAM_PKGCONF_LIBRARY_DIRS} ${WPD_STREAM_PKGCONF_LIBDIR} --) -- --set(LIBWPD_PROCESS_LIBS WPD_LIBRARY WPD_STREAM_LIBRARY) --set(LIBWPD_PROCESS_INCLUDES WPD_INCLUDE_DIR WPD_STREAM_INCLUDE_DIR) -+set(LIBWPD_PROCESS_LIBS WPD_LIBRARY) -+set(LIBWPD_PROCESS_INCLUDES WPD_INCLUDE_DIR) - libfind_process(LIBWPD) -diff --git a/cmake/modules/FindLibWpg.cmake b/cmake/modules/FindLibWpg.cmake -index 56d9302..16c2a1c 100644 ---- a/cmake/modules/FindLibWpg.cmake -+++ b/cmake/modules/FindLibWpg.cmake -@@ -11,16 +11,16 @@ - - include(LibFindMacros) - libfind_package(LIBWPG LibWpd) --libfind_pkg_check_modules(LIBWPG_PKGCONF libwpg-0.2) -+libfind_pkg_check_modules(LIBWPG_PKGCONF libwpg-0.3) - - find_path(LIBWPG_INCLUDE_DIR - NAMES libwpg/libwpg.h - HINTS ${LIBWPG_PKGCONF_INCLUDE_DIRS} ${LIBWPG_PKGCONF_INCLUDEDIR} -- PATH_SUFFIXES libwpg-0.2 -+ PATH_SUFFIXES libwpg-0.3 - ) - - find_library(LIBWPG_LIBRARY -- NAMES wpg wpg-0.2 -+ NAMES wpg wpg-0.3 - HINTS ${LIBWPG_PKGCONF_LIBRARY_DIRS} ${LIBWPG_PKGCONF_LIBDIR} - ) - -diff --git a/cmake/modules/FindLibWps.cmake b/cmake/modules/FindLibWps.cmake -index 149f34c..f8c8225 100644 ---- a/cmake/modules/FindLibWps.cmake -+++ b/cmake/modules/FindLibWps.cmake -@@ -10,16 +10,16 @@ - - include(LibFindMacros) - libfind_package(LIBWPS LibWpd) --libfind_pkg_check_modules(LIBWPS_PKGCONF libwps-0.2) -+libfind_pkg_check_modules(LIBWPS_PKGCONF libwps-0.3) - - find_path(LIBWPS_INCLUDE_DIR - NAMES libwps/libwps.h - HINTS ${LIBWPS_PKGCONF_INCLUDE_DIRS} ${LIBWPS_PKGCONF_INCLUDEDIR} -- PATH_SUFFIXES libwps-0.2 -+ PATH_SUFFIXES libwps-0.3 - ) - - find_library(LIBWPS_LIBRARY -- NAMES wps wps-0.2 -+ NAMES wps wps-0.3 - HINTS ${LIBWPS_PKGCONF_LIBRARY_DIRS} ${LIBWPS_PKGCONF_LIBDIR} - ) - -diff --git a/filters/flow/visio/import/CMakeLists.txt b/filters/flow/visio/import/CMakeLists.txt -index 1de4385..4c2a391 100644 ---- a/filters/flow/visio/import/CMakeLists.txt -+++ b/filters/flow/visio/import/CMakeLists.txt -@@ -1,6 +1,7 @@ - include_directories( - ../../../libodfhandler/ - ${LIBODFGEN_INCLUDE_DIRS} -+ ${LIBREVENGE_INCLUDE_DIRS} - ${LIBVISIO_INCLUDE_DIRS} - ${KOMAIN_INCLUDES} - ) -@@ -15,7 +16,7 @@ set(vsdx2odg_PART_SRCS - - kde4_add_plugin(calligra_filter_vsdx2odg ${vsdx2odg_PART_SRCS}) - --target_link_libraries(calligra_filter_vsdx2odg komain ${LIBODFGEN_LIBRARIES} ${LIBVISIO_LIBRARIES}) -+target_link_libraries(calligra_filter_vsdx2odg komain ${LIBODFGEN_LIBRARIES} ${LIBREVENGE_LIBRARIES} ${LIBVISIO_LIBRARIES}) - - install(TARGETS calligra_filter_vsdx2odg DESTINATION ${PLUGIN_INSTALL_DIR}) - install(FILES calligra_filter_vsdx2odg.desktop DESTINATION ${SERVICES_INSTALL_DIR}) -diff --git a/filters/flow/visio/import/VSDXImport.cpp b/filters/flow/visio/import/VSDXImport.cpp -index 70a54d9..eb3a208 100644 ---- a/filters/flow/visio/import/VSDXImport.cpp -+++ b/filters/flow/visio/import/VSDXImport.cpp -@@ -17,7 +17,7 @@ - #include "VSDXImport.h" - - #include --#include -+#include - - #include "OutputFileHelper.hxx" - #include -@@ -39,7 +39,7 @@ public: - ~OdgOutputFileHelper() {} - - private: -- bool _isSupportedFormat(WPXInputStream *input, const char * /* password */) -+ bool _isSupportedFormat(librevenge::RVNGInputStream *input, const char * /* password */) - { - if (!libvisio::VisioDocument::isSupported(input)) - { -@@ -49,9 +49,10 @@ private: - return true; - } - -- bool _convertDocument(WPXInputStream *input, const char * /* password */, OdfDocumentHandler *handler, OdfStreamType streamType) -+ bool _convertDocument(librevenge::RVNGInputStream *input, const char * /* password */, OdfDocumentHandler *handler, OdfStreamType streamType) - { -- OdgGenerator exporter(handler, streamType); -+ OdgGenerator exporter; -+ exporter.addDocumentHandler(handler, streamType); - return libvisio::VisioDocument::parse(input, &exporter); - } - }; -diff --git a/filters/flow/wpg/import/CMakeLists.txt b/filters/flow/wpg/import/CMakeLists.txt -index 524d1b1..e2ee2a5 100644 ---- a/filters/flow/wpg/import/CMakeLists.txt -+++ b/filters/flow/wpg/import/CMakeLists.txt -@@ -1,6 +1,7 @@ - include_directories( - ../../../libodfhandler/ - ${LIBODFGEN_INCLUDE_DIRS} -+ ${LIBREVENGE_INCLUDE_DIRS} - ${LIBVISIO_INCLUDE_DIRS} - ${KOMAIN_INCLUDES} - ) -@@ -15,7 +16,7 @@ set(wpg2odg_PART_SRCS - - kde4_add_plugin(calligra_filter_wpg2odg ${wpg2odg_PART_SRCS}) - --target_link_libraries(calligra_filter_wpg2odg komain ${LIBODFGEN_LIBRARIES} ${LIBWPG_LIBRARIES}) -+target_link_libraries(calligra_filter_wpg2odg komain ${LIBODFGEN_LIBRARIES} ${LIBREVENGE_LIBRARIES} ${LIBWPG_LIBRARIES}) - - install(TARGETS calligra_filter_wpg2odg DESTINATION ${PLUGIN_INSTALL_DIR}) - install(FILES calligra_filter_wpg2odg.desktop DESTINATION ${SERVICES_INSTALL_DIR}) -diff --git a/filters/flow/wpg/import/WPGImport.cpp b/filters/flow/wpg/import/WPGImport.cpp -index b4e0fa7..563ae6e 100644 ---- a/filters/flow/wpg/import/WPGImport.cpp -+++ b/filters/flow/wpg/import/WPGImport.cpp -@@ -17,7 +17,7 @@ - #include "WPGImport.h" - - #include --#include -+#include - - #include "OutputFileHelper.hxx" - #include -@@ -39,7 +39,7 @@ public: - ~OdgOutputFileHelper() {} - - private: -- bool _isSupportedFormat(WPXInputStream *input, const char * /* password */) -+ bool _isSupportedFormat(librevenge::RVNGInputStream *input, const char * /* password */) - { - if (!libwpg::WPGraphics::isSupported(input)) - { -@@ -49,9 +49,10 @@ private: - return true; - } - -- bool _convertDocument(WPXInputStream *input, const char * /* password */, OdfDocumentHandler *handler, OdfStreamType streamType) -+ bool _convertDocument(librevenge::RVNGInputStream *input, const char * /* password */, OdfDocumentHandler *handler, OdfStreamType streamType) - { -- OdgGenerator exporter(handler, streamType); -+ OdgGenerator exporter; -+ exporter.addDocumentHandler(handler, streamType); - return libwpg::WPGraphics::parse(input, &exporter); - } - }; -diff --git a/filters/karbon/wpg/CMakeLists.txt b/filters/karbon/wpg/CMakeLists.txt -index 5f578e9..ffa7742 100644 ---- a/filters/karbon/wpg/CMakeLists.txt -+++ b/filters/karbon/wpg/CMakeLists.txt -@@ -1,11 +1,11 @@ - --include_directories(${CMAKE_BINARY_DIR}/filters/ ${LIBWPD_INCLUDE_DIRS} ${LIBWPG_INCLUDE_DIR}/) -+include_directories(${CMAKE_BINARY_DIR}/filters/ ${LIBREVENGE_INCLUDE_DIRS} ${LIBWPG_INCLUDE_DIR}/) - - set(wpg2svg_PART_SRCS WPGImport.cpp) - - kde4_add_plugin(calligra_filter_wpg2svg ${wpg2svg_PART_SRCS}) - --target_link_libraries(calligra_filter_wpg2svg komain ${LIBWPG_LIBRARIES} ${LIBWPG_STREAM_LIBRARIES} ${LIBWPD_LIBRARIES}) -+target_link_libraries(calligra_filter_wpg2svg komain ${LIBWPG_LIBRARIES} ${LIBREVENGE_LIBRARIES}) - - install(TARGETS calligra_filter_wpg2svg DESTINATION ${PLUGIN_INSTALL_DIR}) - install(FILES calligra_filter_wpg2svg.desktop DESTINATION ${SERVICES_INSTALL_DIR}) -diff --git a/filters/karbon/wpg/WPGImport.cpp b/filters/karbon/wpg/WPGImport.cpp -index f1852ee..4457bec 100644 ---- a/filters/karbon/wpg/WPGImport.cpp -+++ b/filters/karbon/wpg/WPGImport.cpp -@@ -32,14 +32,12 @@ - #include - #include - -+#include -+#include -+ - #include --#if LIBWPG_VERSION_MINOR<2 --#include --#else --#include --#include --#endif - -+#include - #include - - K_PLUGIN_FACTORY(WPGImportFactory, registerPlugin();) -@@ -63,39 +61,29 @@ KoFilter::ConversionStatus WPGImport::convert(const QByteArray& from, const QByt - if (to != "image/svg+xml") - return KoFilter::NotImplemented; - --#if LIBWPG_VERSION_MINOR<2 -- WPXInputStream* input = new libwpg::WPGFileStream(m_chain->inputFile().toLocal8Bit()); -- if (input->isOLEStream()) { -- WPXInputStream* olestream = input->getDocumentOLEStream(); -- if (olestream) { -- delete input; -- input = olestream; -- } -- } -- libwpg::WPGString output; --#else -- WPXInputStream* input = new WPXFileStream(m_chain->inputFile().toLocal8Bit()); -- if (input->isOLEStream()) { -- WPXInputStream* olestream = input->getDocumentOLEStream("Anything"); -+ librevenge::RVNGInputStream* input = new librevenge::RVNGFileStream(m_chain->inputFile().toLocal8Bit()); -+ if (input->isStructured()) { -+ librevenge::RVNGInputStream* olestream = input->getSubStreamByName("Anything"); - if (olestream) { - delete input; - input = olestream; - } - } -- ::WPXString output; --#endif -- - if (!libwpg::WPGraphics::isSupported(input)) { - kWarning() << "ERROR: Unsupported file format (unsupported version) or file is encrypted!"; - delete input; - return KoFilter::NotImplemented; - } - -- if (!libwpg::WPGraphics::generateSVG(input, output)) { -+ ::librevenge::RVNGStringVector output; -+ librevenge::RVNGSVGDrawingGenerator generator(output, ""); -+ -+ if (!libwpg::WPGraphics::parse(input, &generator)) { - kWarning() << "ERROR: SVG Generation failed!"; - delete input; - return KoFilter::ParsingError; - } -+ assert(1 == output.size()); - - delete input; - -@@ -104,7 +92,8 @@ KoFilter::ConversionStatus WPGImport::convert(const QByteArray& from, const QByt - kWarning() << "ERROR: Could not open output file" << m_chain->outputFile(); - return KoFilter::InternalError; - } -- outputFile.write(output.cstr()); -+ outputFile.write("\n\n"); -+ outputFile.write(output[0].cstr()); - outputFile.close(); - - return KoFilter::OK; -diff --git a/filters/libodfhandler/DiskDocumentHandler.cxx b/filters/libodfhandler/DiskDocumentHandler.cxx -index e035fdc..f8ca273 100644 ---- a/filters/libodfhandler/DiskDocumentHandler.cxx -+++ b/filters/libodfhandler/DiskDocumentHandler.cxx -@@ -37,7 +37,7 @@ DiskOdfDocumentHandler::DiskOdfDocumentHandler(FemtoZip *pOutput) : - { - } - --void DiskOdfDocumentHandler::startElement(const char *psName, const WPXPropertyList &xPropList) -+void DiskOdfDocumentHandler::startElement(const char *psName, const librevenge::RVNGPropertyList &xPropList) - { - if (mbIsTagOpened) - { -@@ -46,11 +46,11 @@ void DiskOdfDocumentHandler::startElement(const char *psName, const WPXPropertyL - } - PUTSTRING("<"); - PUTSTRING(psName); -- WPXPropertyList::Iter i(xPropList); -+ librevenge::RVNGPropertyList::Iter i(xPropList); - for (i.rewind(); i.next(); ) - { -- // filter out libwpd elements -- if (strncmp(i.key(), "libwpd", 6) != 0) -+ // filter out librevenge properties -+ if (strncmp(i.key(), "librevenge", 10) != 0) - { - PUTSTRING(" "); - PUTSTRING(i.key()); -@@ -91,14 +91,15 @@ void DiskOdfDocumentHandler::endElement(const char *psName) - } - } - --void DiskOdfDocumentHandler::characters(const WPXString &sCharacters) -+void DiskOdfDocumentHandler::characters(const librevenge::RVNGString &sCharacters) - { - if (mbIsTagOpened) - { - PUTSTRING(">"); - mbIsTagOpened = false; - } -- WPXString sEscapedCharacters(sCharacters, true); -+ librevenge::RVNGString sEscapedCharacters; -+ sEscapedCharacters.appendEscapedXML(sCharacters); - if (sEscapedCharacters.len() > 0) - PUTSTRING(sEscapedCharacters.cstr()); - } -diff --git a/filters/libodfhandler/DiskDocumentHandler.hxx b/filters/libodfhandler/DiskDocumentHandler.hxx -index 17f7eb7..d52a256 100644 ---- a/filters/libodfhandler/DiskDocumentHandler.hxx -+++ b/filters/libodfhandler/DiskDocumentHandler.hxx -@@ -23,7 +23,7 @@ - #ifndef _DISKDOCUMENTHANDLER_H - #define _DISKDOCUMENTHANDLER_H - --#include -+#include - - #ifdef HAVE_CONFIG_H - #include "config.h" -@@ -45,9 +45,9 @@ public: - #endif - virtual void startDocument() {} - virtual void endDocument(); -- virtual void startElement(const char *psName, const WPXPropertyList &xPropList); -+ virtual void startElement(const char *psName, const librevenge::RVNGPropertyList &xPropList); - virtual void endElement(const char *psName); -- virtual void characters(const WPXString &sCharacters); -+ virtual void characters(const librevenge::RVNGString &sCharacters); - - private: - DiskOdfDocumentHandler(DiskOdfDocumentHandler const &); -@@ -58,7 +58,7 @@ private: - FemtoZip *mpOutput; - #endif - bool mbIsTagOpened; -- WPXString msOpenedTagName; -+ librevenge::RVNGString msOpenedTagName; - }; - #endif - -diff --git a/filters/libodfhandler/OutputFileHelper.cxx b/filters/libodfhandler/OutputFileHelper.cxx -index 8786d4c..61e48e9 100644 ---- a/filters/libodfhandler/OutputFileHelper.cxx -+++ b/filters/libodfhandler/OutputFileHelper.cxx -@@ -37,7 +37,7 @@ - - #include "DiskDocumentHandler.hxx" - #include "StdOutHandler.hxx" --#include -+#include - - struct OutputFileHelperImpl - { -@@ -197,12 +197,12 @@ bool OutputFileHelper::writeChildFile(const char *childFileName, const char *str - - bool OutputFileHelper::writeConvertedContent(const char *childFileName, const char *inFileName, const OdfStreamType streamType) - { -- WPXFileStream input(inFileName); -+ librevenge::RVNGFileStream input(inFileName); - - if (!_isSupportedFormat(&input, m_impl->mpPassword)) - return false; - -- input.seek(0, WPX_SEEK_SET); -+ input.seek(0, librevenge::RVNG_SEEK_SET); - - OdfDocumentHandler *pHandler; - #ifdef USE_GSF_OUTPUT -diff --git a/filters/libodfhandler/OutputFileHelper.hxx b/filters/libodfhandler/OutputFileHelper.hxx -index a61b9a0..d2632a9 100644 ---- a/filters/libodfhandler/OutputFileHelper.hxx -+++ b/filters/libodfhandler/OutputFileHelper.hxx -@@ -22,9 +22,10 @@ - #ifndef _OUTPUTFILEHELPER_HXX - #define _OUTPUTFILEHELPER_HXX - --#include -+#include -+ -+#include - --class WPXInputStream; - struct OutputFileHelperImpl; - - class OutputFileHelper -@@ -38,8 +39,8 @@ public: - bool writeConvertedContent(const char *childFileName, const char *inFileName, const OdfStreamType streamType); - - private: -- virtual bool _isSupportedFormat(WPXInputStream *input, const char *password) = 0; -- virtual bool _convertDocument(WPXInputStream *input, const char *password, OdfDocumentHandler *handler, const OdfStreamType streamType) = 0; -+ virtual bool _isSupportedFormat(librevenge::RVNGInputStream *input, const char *password) = 0; -+ virtual bool _convertDocument(librevenge::RVNGInputStream *input, const char *password, OdfDocumentHandler *handler, const OdfStreamType streamType) = 0; - OutputFileHelperImpl *m_impl; - - private: -diff --git a/filters/libodfhandler/StdOutHandler.cxx b/filters/libodfhandler/StdOutHandler.cxx -index 6864266..16e19f0 100644 ---- a/filters/libodfhandler/StdOutHandler.cxx -+++ b/filters/libodfhandler/StdOutHandler.cxx -@@ -31,7 +31,7 @@ StdOutHandler::StdOutHandler() : - printf("\n"); - } - --void StdOutHandler::startElement(const char *psName, const WPXPropertyList &xPropList) -+void StdOutHandler::startElement(const char *psName, const librevenge::RVNGPropertyList &xPropList) - { - if (mbIsTagOpened) - { -@@ -39,11 +39,11 @@ void StdOutHandler::startElement(const char *psName, const WPXPropertyList &xPro - mbIsTagOpened = false; - } - printf("<%s", psName); -- WPXPropertyList::Iter i(xPropList); -+ librevenge::RVNGPropertyList::Iter i(xPropList); - for (i.rewind(); i.next(); ) - { -- // filter out libwpd elements -- if (strncmp(i.key(), "libwpd", 6) != 0) -+ // filter out librevenge properties -+ if (strncmp(i.key(), "librevenge", 10) != 0) - printf(" %s=\"%s\"", i.key(), i()->getStr().cstr()); - } - mbIsTagOpened = true; -@@ -73,15 +73,14 @@ void StdOutHandler::endElement(const char *psName) - } - } - --void StdOutHandler::characters(const WPXString &sCharacters) -+void StdOutHandler::characters(const librevenge::RVNGString &sCharacters) - { - if (mbIsTagOpened) - { - printf(">"); - mbIsTagOpened = false; - } -- WPXString sEscapedCharacters(sCharacters, true); -- printf("%s", sEscapedCharacters.cstr()); -+ printf("%s", librevenge::RVNGString::escapeXML(sCharacters).cstr()); - } - - void StdOutHandler::endDocument() -diff --git a/filters/libodfhandler/StdOutHandler.hxx b/filters/libodfhandler/StdOutHandler.hxx -index a18189a..44fa1e7 100644 ---- a/filters/libodfhandler/StdOutHandler.hxx -+++ b/filters/libodfhandler/StdOutHandler.hxx -@@ -23,7 +23,7 @@ - #ifndef _STDOUTHANDLER_H - #define _STDOUTHANDLER_H - --#include -+#include - - class StdOutHandler : public OdfDocumentHandler - { -@@ -31,12 +31,12 @@ public: - StdOutHandler(); - virtual void startDocument() {} - virtual void endDocument(); -- virtual void startElement(const char *psName, const WPXPropertyList &xPropList); -+ virtual void startElement(const char *psName, const librevenge::RVNGPropertyList &xPropList); - virtual void endElement(const char *psName); -- virtual void characters(const WPXString &sCharacters); -+ virtual void characters(const librevenge::RVNGString &sCharacters); - private: - bool mbIsTagOpened; -- WPXString msOpenedTagName; -+ librevenge::RVNGString msOpenedTagName; - }; - #endif - -diff --git a/filters/words/wordperfect/import/CMakeLists.txt b/filters/words/wordperfect/import/CMakeLists.txt -index 6a0e2d7..ffb3c70 100644 ---- a/filters/words/wordperfect/import/CMakeLists.txt -+++ b/filters/words/wordperfect/import/CMakeLists.txt -@@ -1,6 +1,7 @@ - include_directories( - ../../../libodfhandler/ - ${LIBODFGEN_INCLUDE_DIRS} -+ ${LIBREVENGE_INCLUDE_DIRS} - ${LIBWPD_INCLUDE_DIRS} - ${LIBWPG_INCLUDE_DIRS} - ${KOMAIN_INCLUDES} -@@ -17,7 +18,7 @@ set(wpd2odt_PART_SRCS - kde4_add_plugin(calligra_filter_wpd2odt ${wpd2odt_PART_SRCS}) - - target_link_libraries(calligra_filter_wpd2odt -- komain ${LIBODFGEN_LIBRARIES} ${LIBWPD_LIBRARIES} ${LIBWPG_LIBRARIES}) -+ komain ${LIBODFGEN_LIBRARIES} ${LIBREVENGE_LIBRARIES} ${LIBWPD_LIBRARIES} ${LIBWPG_LIBRARIES}) - - install(TARGETS calligra_filter_wpd2odt DESTINATION ${PLUGIN_INSTALL_DIR}) - -diff --git a/filters/words/wordperfect/import/WPDImport.cpp b/filters/words/wordperfect/import/WPDImport.cpp -index af9d9b6..edf1c91 100644 ---- a/filters/words/wordperfect/import/WPDImport.cpp -+++ b/filters/words/wordperfect/import/WPDImport.cpp -@@ -18,8 +18,7 @@ - - #include - #include --#include --#include -+#include - - #include - #include -@@ -31,6 +30,7 @@ - #include - #include - -+#include - #include - - class OdtOutputFileHelper : public OutputFileHelper -@@ -41,20 +41,20 @@ public: - ~OdtOutputFileHelper() {}; - - private: -- bool _isSupportedFormat(WPXInputStream *input, const char *password) -+ bool _isSupportedFormat(librevenge::RVNGInputStream *input, const char *password) - { -- WPDConfidence confidence = WPDocument::isFileFormatSupported(input); -- if (WPD_CONFIDENCE_EXCELLENT != confidence && WPD_CONFIDENCE_SUPPORTED_ENCRYPTION != confidence) -+ libwpd::WPDConfidence confidence = libwpd::WPDocument::isFileFormatSupported(input); -+ if (libwpd::WPD_CONFIDENCE_EXCELLENT != confidence && libwpd::WPD_CONFIDENCE_SUPPORTED_ENCRYPTION != confidence) - { - fprintf(stderr, "ERROR: We have no confidence that you are giving us a valid WordPerfect document.\n"); - return false; - } -- if (WPD_CONFIDENCE_SUPPORTED_ENCRYPTION == confidence && !password) -+ if (libwpd::WPD_CONFIDENCE_SUPPORTED_ENCRYPTION == confidence && !password) - { - fprintf(stderr, "ERROR: The WordPerfect document is encrypted and you did not give us a password.\n"); - return false; - } -- if (confidence == WPD_CONFIDENCE_SUPPORTED_ENCRYPTION && password && (WPD_PASSWORD_MATCH_OK != WPDocument::verifyPassword(input, password))) -+ if (confidence == libwpd::WPD_CONFIDENCE_SUPPORTED_ENCRYPTION && password && (libwpd::WPD_PASSWORD_MATCH_OK != libwpd::WPDocument::verifyPassword(input, password))) - { - fprintf(stderr, "ERROR: The WordPerfect document is encrypted and we either\n"); - fprintf(stderr, "ERROR: don't know how to decrypt it or the given password is wrong.\n"); -@@ -64,41 +64,47 @@ private: - return true; - } - -- static bool handleEmbeddedWPGObject(const WPXBinaryData &data, OdfDocumentHandler *pHandler, const OdfStreamType streamType) -+ static bool handleEmbeddedWPGObject(const librevenge::RVNGBinaryData &data, OdfDocumentHandler *pHandler, const OdfStreamType streamType) - { -- OdgGenerator exporter(pHandler, streamType); -+ OdgGenerator exporter; -+ exporter.addDocumentHandler(pHandler, streamType); - - libwpg::WPGFileFormat fileFormat = libwpg::WPG_AUTODETECT; - -- if (!libwpg::WPGraphics::isSupported(const_cast(data.getDataStream()))) -+ if (!libwpg::WPGraphics::isSupported(const_cast(data.getDataStream()))) - fileFormat = libwpg::WPG_WPG1; - -- return libwpg::WPGraphics::parse(const_cast(data.getDataStream()), &exporter, fileFormat); -+ return libwpg::WPGraphics::parse(const_cast(data.getDataStream()), &exporter, fileFormat); - } - -- static bool handleEmbeddedWPGImage(const WPXBinaryData &input, WPXBinaryData &output) -+ static bool handleEmbeddedWPGImage(const librevenge::RVNGBinaryData &input, librevenge::RVNGBinaryData &output) - { -- WPXString svgOutput; - libwpg::WPGFileFormat fileFormat = libwpg::WPG_AUTODETECT; - -- if (!libwpg::WPGraphics::isSupported(const_cast(input.getDataStream()))) -+ if (!libwpg::WPGraphics::isSupported(const_cast(input.getDataStream()))) - fileFormat = libwpg::WPG_WPG1; - -- if (!libwpg::WPGraphics::generateSVG(const_cast(input.getDataStream()), svgOutput, fileFormat)) -+ librevenge::RVNGStringVector svgOutput; -+ librevenge::RVNGSVGDrawingGenerator generator(svgOutput, ""); -+ if (!libwpg::WPGraphics::parse(const_cast(input.getDataStream()), &generator, fileFormat)) - return false; -+ assert(1 == svgOutput.size()); - - output.clear(); -- output.append((unsigned char *)svgOutput.cstr(), strlen(svgOutput.cstr())); -+ const librevenge::RVNGString svgPrefix("\n\n"); -+ output.append((unsigned char *)svgPrefix.cstr(), svgPrefix.size()); -+ output.append((unsigned char *)svgOutput[0].cstr(), svgOutput[0].size()); - - return true; - } - -- bool _convertDocument(WPXInputStream *input, const char *password, OdfDocumentHandler *handler, const OdfStreamType streamType) -+ bool _convertDocument(librevenge::RVNGInputStream *input, const char *password, OdfDocumentHandler *handler, const OdfStreamType streamType) - { -- OdtGenerator collector(handler, streamType); -+ OdtGenerator collector; -+ collector.addDocumentHandler(handler, streamType); - collector.registerEmbeddedObjectHandler("image/x-wpg", &handleEmbeddedWPGObject); - collector.registerEmbeddedImageHandler("image/x-wpg", &handleEmbeddedWPGImage); -- if (WPD_OK == WPDocument::parse(input, &collector, password)) -+ if (libwpd::WPD_OK == libwpd::WPDocument::parse(input, &collector, password)) - return true; - return false; - } -diff --git a/filters/words/works/import/CMakeLists.txt b/filters/words/works/import/CMakeLists.txt -index 76317ae..2c51937 100644 ---- a/filters/words/works/import/CMakeLists.txt -+++ b/filters/words/works/import/CMakeLists.txt -@@ -1,6 +1,7 @@ - include_directories( - ../../../libodfhandler/ - ${LIBODFGEN_INCLUDE_DIRS} -+ ${LIBREVENGE_INCLUDE_DIRS} - ${LIBWPS_INCLUDE_DIRS} - ${KOMAIN_INCLUDES} - ) -@@ -15,7 +16,7 @@ set(wps2odt_PART_SRCS - - kde4_add_plugin(calligra_filter_wps2odt ${wps2odt_PART_SRCS}) - --target_link_libraries(calligra_filter_wps2odt komain ${LIBODFGEN_LIBRARIES} ${LIBWPS_LIBRARIES}) -+target_link_libraries(calligra_filter_wps2odt komain ${LIBODFGEN_LIBRARIES} ${LIBREVENGE_LIBRARIES} ${LIBWPS_LIBRARIES}) - - install(TARGETS calligra_filter_wps2odt DESTINATION ${PLUGIN_INSTALL_DIR}) - install(FILES calligra_filter_wps2odt.desktop DESTINATION ${SERVICES_INSTALL_DIR}) -diff --git a/filters/words/works/import/WPSImport.cpp b/filters/words/works/import/WPSImport.cpp -index c2058e5..545daf3 100644 ---- a/filters/words/works/import/WPSImport.cpp -+++ b/filters/words/works/import/WPSImport.cpp -@@ -16,9 +16,9 @@ - - #include "WPSImport.h" - --#include -+#include - #include --#include -+#include - - #include "OutputFileHelper.hxx" - #include -@@ -40,10 +40,11 @@ public: - ~OdtOutputFileHelper() {}; - - private: -- bool _isSupportedFormat(WPXInputStream *input, const char * /* password */) -+ bool _isSupportedFormat(librevenge::RVNGInputStream *input, const char * /* password */) - { -- WPSConfidence confidence = WPSDocument::isFileFormatSupported(input); -- if (confidence == WPS_CONFIDENCE_NONE || confidence == WPS_CONFIDENCE_POOR) -+ libwps::WPSKind kind = libwps::WPS_TEXT; -+ libwps::WPSConfidence confidence = libwps::WPSDocument::isFileFormatSupported(input, kind); -+ if ((libwps::WPS_TEXT != kind) || (confidence != libwps::WPS_CONFIDENCE_EXCELLENT)) - { - fprintf(stderr, "ERROR: We have no confidence that you are giving us a valid Microsoft Works document.\n"); - return false; -@@ -52,10 +53,11 @@ private: - return true; - } - -- bool _convertDocument(WPXInputStream *input, const char * /* password */, OdfDocumentHandler *handler, const OdfStreamType streamType) -+ bool _convertDocument(librevenge::RVNGInputStream *input, const char * /* password */, OdfDocumentHandler *handler, const OdfStreamType streamType) - { -- OdtGenerator collector(handler, streamType); -- if (WPS_OK == WPSDocument::parse(input, &collector)) -+ OdtGenerator collector; -+ collector.addDocumentHandler(handler, streamType); -+ if (libwps::WPS_OK == libwps::WPSDocument::parse(input, &collector)) - return true; - return false; - } --- -1.9.3 - - From 8b811659bf1d5b2abb5e0ff500dacd3b05acebc8 Mon Sep 17 00:00:00 2001 From: Pascal Wittmann Date: Wed, 4 Nov 2015 21:47:15 +0100 Subject: [PATCH 135/162] perl-JSON-MaybeXS: 1.002005 -> 1.003005 --- pkgs/top-level/perl-packages.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 47c69218976f..dcb6807ed18f 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -5967,11 +5967,11 @@ let self = _self // overrides; _self = with self; { }; }; - JSONMaybeXS = buildPerlPackage { - name = "JSON-MaybeXS-1.002005"; + JSONMaybeXS = buildPerlPackage rec { + name = "JSON-MaybeXS-1.003005"; src = fetchurl { - url = mirror://cpan/authors/id/E/ET/ETHER/JSON-MaybeXS-1.002005.tar.gz; - sha256 = "f576caf2b10bf3a8eedaf05c0d65e7d3deb52f9c5e1894579ff9ffe71207157f"; + url = "mirror://cpan/authors/id/E/ET/ETHER/${name}.tar.gz"; + sha256 = "02n8dkj3qpzikkqyki8gvdk1pfdqrs9qcrdr96fla42gar5nkd5x"; }; buildInputs = [ TestWithoutModule ]; propagatedBuildInputs = [ JSONPP ]; From 1f624bafccd71adc165b6d4d9b690aeb1883f097 Mon Sep 17 00:00:00 2001 From: Pascal Wittmann Date: Wed, 4 Nov 2015 21:47:42 +0100 Subject: [PATCH 136/162] perl-Catalyst-View-JSON: 0.33 -> 0.35 --- pkgs/top-level/perl-packages.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index dcb6807ed18f..24c222cf4396 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -1284,11 +1284,11 @@ let self = _self // overrides; _self = with self; { }; }; - CatalystViewJSON = buildPerlPackage { - name = "Catalyst-View-JSON-0.33"; + CatalystViewJSON = buildPerlPackage rec { + name = "Catalyst-View-JSON-0.35"; src = fetchurl { - url = mirror://cpan/authors/id/M/MI/MIYAGAWA/Catalyst-View-JSON-0.33.tar.gz; - sha256 = "03yda9skcfnwkm4hf2a3y7g2rdjdia5hzfnll0h7z4wiyb8kxfii"; + url = "mirror://cpan/authors/id/J/JJ/JJNAPIORK//${name}.tar.gz"; + sha256 = "184pyghlrkl7p387bnyvswi2d9myvdg4v3lax6xrd59shskvpmkm"; }; buildInputs = [ JSON ]; propagatedBuildInputs = [ CatalystRuntime JSONAny MROCompat YAML ]; From 23c729f95847752b818ee11b5acb74a55202cfd6 Mon Sep 17 00:00:00 2001 From: Pascal Wittmann Date: Wed, 4 Nov 2015 22:00:29 +0100 Subject: [PATCH 137/162] perl-Catalyst-View-TT: 0.41 -> 0.44 --- pkgs/top-level/perl-packages.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 24c222cf4396..c099ae4b40c0 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -1299,11 +1299,11 @@ let self = _self // overrides; _self = with self; { }; }; - CatalystViewTT = buildPerlPackage { - name = "Catalyst-View-TT-0.41"; + CatalystViewTT = buildPerlPackage rec { + name = "Catalyst-View-TT-0.44"; src = fetchurl { - url = mirror://cpan/authors/id/J/JJ/JJNAPIORK/Catalyst-View-TT-0.41.tar.gz; - sha256 = "1yrigxqapxj4k1qkykiiqy6a30ljb7hlkaw80d7n0n5mpm67j1nb"; + url = "mirror://cpan/authors/id/E/ET/ETHER/${name}.tar.gz"; + sha256 = "06d1zg4nbb6kcyjbnyxrkf8z4zlscxr8650d94f7187jygfl8rvh"; }; propagatedBuildInputs = [ CatalystRuntime ClassAccessor MROCompat PathClass TemplateToolkit TemplateTimer ]; meta = { From 6d7273571c8f71e49e406227206b35312074a714 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Wed, 4 Nov 2015 22:01:15 +0100 Subject: [PATCH 138/162] stress-ng 0.04.20 -> 0.04.21 --- pkgs/tools/system/stress-ng/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/system/stress-ng/default.nix b/pkgs/tools/system/stress-ng/default.nix index 58f6f81da318..705fd5cb3c70 100644 --- a/pkgs/tools/system/stress-ng/default.nix +++ b/pkgs/tools/system/stress-ng/default.nix @@ -1,13 +1,13 @@ { stdenv, fetchurl, attr, keyutils }: let - version = "0.04.20"; + version = "0.04.21"; name = "stress-ng-${version}"; in stdenv.mkDerivation { inherit name; src = fetchurl { - sha256 = "0zzlnqmld804h08iabhcrj3ggm5wiry9g2jrdr33cqp44lrw402v"; + sha256 = "01308c31dx7ln7w3r74f18c473hz9236f118b27z1js94dsya0hw"; url = "http://kernel.ubuntu.com/~cking/tarballs/stress-ng/${name}.tar.gz"; }; From 486d58748f13111f0c72a111835ae41054ffc2b8 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Wed, 4 Nov 2015 22:04:45 +0100 Subject: [PATCH 139/162] vc: fix evaluation (licences -> licenses) --- pkgs/development/libraries/vc/0.7.nix | 2 +- pkgs/development/libraries/vc/default.nix | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/vc/0.7.nix b/pkgs/development/libraries/vc/0.7.nix index 932b7f50f351..7f774e2eb92a 100644 --- a/pkgs/development/libraries/vc/0.7.nix +++ b/pkgs/development/libraries/vc/0.7.nix @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Library for multiprecision complex arithmetic with exact rounding"; homepage = https://github.com/VcDevel/Vc; - license = licences.bsd3; + license = licenses.bsd3; platforms = platforms.all; maintainers = with maintainers; [ abbradar ]; }; diff --git a/pkgs/development/libraries/vc/default.nix b/pkgs/development/libraries/vc/default.nix index b019ad63cdf2..9d5a24c43713 100644 --- a/pkgs/development/libraries/vc/default.nix +++ b/pkgs/development/libraries/vc/default.nix @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Library for multiprecision complex arithmetic with exact rounding"; homepage = https://github.com/VcDevel/Vc; - license = licences.bsd3; + license = licenses.bsd3; platforms = platforms.all; maintainers = with maintainers; [ abbradar ]; }; From 0b1ddbfd6dc1acfa7b5bb46c096a804a1ea23c4f Mon Sep 17 00:00:00 2001 From: Nikolay Amiantov Date: Thu, 5 Nov 2015 00:08:23 +0300 Subject: [PATCH 140/162] sddm: 0.12.0 -> 0.13.0 --- pkgs/applications/display-managers/sddm/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/display-managers/sddm/default.nix b/pkgs/applications/display-managers/sddm/default.nix index 97bda43166aa..5851f1af6390 100644 --- a/pkgs/applications/display-managers/sddm/default.nix +++ b/pkgs/applications/display-managers/sddm/default.nix @@ -2,7 +2,7 @@ , libXdmcp, libXau, qtbase, qtdeclarative, qttools, pam, systemd }: let - version = "0.12.0"; + version = "0.13.0"; in stdenv.mkDerivation rec { name = "sddm-${version}"; @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { owner = "sddm"; repo = "sddm"; rev = "v${version}"; - sha256 = "09amr61srvl52nvxlqqgs9fzn33pc2gjv5hc83gxx43x6q2j19gg"; + sha256 = "0c3q8lpb123m9k5x3i71mm8lmyzhknw77zxh89yfl8qmn6zd61i1"; }; patches = [ ./sddm-ignore-config-mtime.patch ]; From 463b95c093bb6416bd065cc98d6e35c3f78ac91b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?St=C3=A9phane=20Jourdois?= Date: Wed, 4 Nov 2015 22:13:39 +0100 Subject: [PATCH 141/162] python openpyxl: 2.2.4 -> 2.2.6 --- pkgs/top-level/python-packages.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 48fd0fb246a9..6382f9290c6f 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -10438,13 +10438,13 @@ let }; openpyxl = buildPythonPackage rec { - version = "2.2.4"; + version = "2.2.6"; name = "openpyxl-${version}"; src = pkgs.fetchhg { url = "https://bitbucket.org/openpyxl/openpyxl"; rev = "${version}"; - sha256 = "1g9imbg4sjfyv5sqg2s7h4svhdmbnvq16hvc1a8jpaqq8nc2vjj2"; + sha256 = "159cg3njsybjdmwr0458qc5k0m7hbq41h3fczxflc0wnh7ancrdf"; }; buildInputs = with self; [ pytest ]; From 28abf148a70564ca4e493ea87a6e5a7912ca6606 Mon Sep 17 00:00:00 2001 From: Pascal Wittmann Date: Wed, 4 Nov 2015 22:30:47 +0100 Subject: [PATCH 142/162] perl-Class-C3: 0.28 -> 0.30 --- pkgs/top-level/perl-packages.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index c099ae4b40c0..80f6ebbf0347 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -1535,10 +1535,10 @@ let self = _self // overrides; _self = with self; { }; ClassC3 = buildPerlPackage rec { - name = "Class-C3-0.28"; + name = "Class-C3-0.30"; src = fetchurl { url = "mirror://cpan/authors/id/H/HA/HAARG/${name}.tar.gz"; - sha256 = "084d2cvfff3mi2fjycdvbgx797wkv1wsz97w3v8i14j8vhmfv4bg"; + sha256 = "0lmgiqv46x9lx8ip23qr8qprips21wiwaks17yb6pk7igvbgdjnc"; }; propagatedBuildInputs = [ AlgorithmC3 ]; meta = { From 3ee6baf7ee96515aa64b14f973d93c387cbb6172 Mon Sep 17 00:00:00 2001 From: Pascal Wittmann Date: Wed, 4 Nov 2015 23:29:26 +0100 Subject: [PATCH 143/162] perl-Clone: 0.36 -> 0.38 --- pkgs/top-level/perl-packages.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 80f6ebbf0347..ac6edb5bab17 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -1792,11 +1792,11 @@ let self = _self // overrides; _self = with self; { }; }; - Clone = buildPerlPackage { - name = "Clone-0.36"; + Clone = buildPerlPackage rec { + name = "Clone-0.38"; src = fetchurl { - url = mirror://cpan/authors/id/G/GA/GARU/Clone-0.36.tar.gz; - sha256 = "1i90l24l46dyadmdz82klyh3y1lhfn75wjjpfmgl1kbr4plgdph3"; + url = "mirror://cpan/authors/id/G/GA/GARU/${name}.tar.gz"; + sha256 = "1s5xrv9zlckqqzyhxi0l9lwj9m6na2bz5hqxrkva2v7gnx5m7c4z"; }; meta = { description = "Recursively copy Perl datatypes"; From 78615301aadcbba8e912eb28c865c80aac4a6ae9 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Mon, 2 Nov 2015 10:16:35 +0100 Subject: [PATCH 144/162] hackage-packages.nix: update Haskell package set This update was generated by hackage2nix v20150922-35-g816abb5 using the following inputs: - Nixpkgs: https://github.com/NixOS/nixpkgs/commit/f90e42f3826a522f4c182a65f1e54ef15de87c2d - Hackage: https://github.com/commercialhaskell/all-cabal-hashes/commit/96af3096ee3302efe0d4a4fa16519546b077b436 - LTS Haskell: https://github.com/fpco/lts-haskell/commit/71e581f8e49ab6210581b4fac45ec18445e1fa93 - Stackage Nightly: https://github.com/fpco/stackage-nightly/commit/97a0714af749868ff5b21f427cca523d59637360 --- .../haskell-modules/configuration-lts-0.0.nix | 39 + .../haskell-modules/configuration-lts-0.1.nix | 39 + .../haskell-modules/configuration-lts-0.2.nix | 39 + .../haskell-modules/configuration-lts-0.3.nix | 39 + .../haskell-modules/configuration-lts-0.4.nix | 39 + .../haskell-modules/configuration-lts-0.5.nix | 39 + .../haskell-modules/configuration-lts-0.6.nix | 39 + .../haskell-modules/configuration-lts-0.7.nix | 39 + .../haskell-modules/configuration-lts-1.0.nix | 39 + .../haskell-modules/configuration-lts-1.1.nix | 39 + .../configuration-lts-1.10.nix | 39 + .../configuration-lts-1.11.nix | 39 + .../configuration-lts-1.12.nix | 39 + .../configuration-lts-1.13.nix | 39 + .../configuration-lts-1.14.nix | 39 + .../configuration-lts-1.15.nix | 39 + .../haskell-modules/configuration-lts-1.2.nix | 39 + .../haskell-modules/configuration-lts-1.4.nix | 39 + .../haskell-modules/configuration-lts-1.5.nix | 39 + .../haskell-modules/configuration-lts-1.7.nix | 39 + .../haskell-modules/configuration-lts-1.8.nix | 39 + .../haskell-modules/configuration-lts-1.9.nix | 39 + .../haskell-modules/configuration-lts-2.0.nix | 39 + .../haskell-modules/configuration-lts-2.1.nix | 39 + .../configuration-lts-2.10.nix | 39 + .../configuration-lts-2.11.nix | 40 + .../configuration-lts-2.12.nix | 40 + .../configuration-lts-2.13.nix | 40 + .../configuration-lts-2.14.nix | 40 + .../configuration-lts-2.15.nix | 41 + .../configuration-lts-2.16.nix | 41 + .../configuration-lts-2.17.nix | 41 + .../configuration-lts-2.18.nix | 41 + .../configuration-lts-2.19.nix | 41 + .../haskell-modules/configuration-lts-2.2.nix | 39 + .../configuration-lts-2.20.nix | 41 + .../configuration-lts-2.21.nix | 41 + .../configuration-lts-2.22.nix | 41 + .../haskell-modules/configuration-lts-2.3.nix | 39 + .../haskell-modules/configuration-lts-2.4.nix | 39 + .../haskell-modules/configuration-lts-2.5.nix | 39 + .../haskell-modules/configuration-lts-2.6.nix | 39 + .../haskell-modules/configuration-lts-2.7.nix | 39 + .../haskell-modules/configuration-lts-2.8.nix | 39 + .../haskell-modules/configuration-lts-2.9.nix | 39 + .../haskell-modules/configuration-lts-3.0.nix | 46 + .../haskell-modules/configuration-lts-3.1.nix | 46 + .../configuration-lts-3.10.nix | 50 + .../configuration-lts-3.11.nix | 50 + .../configuration-lts-3.12.nix | 7850 +++++++++++++++++ .../haskell-modules/configuration-lts-3.2.nix | 46 + .../haskell-modules/configuration-lts-3.3.nix | 47 + .../haskell-modules/configuration-lts-3.4.nix | 47 + .../haskell-modules/configuration-lts-3.5.nix | 48 + .../haskell-modules/configuration-lts-3.6.nix | 50 + .../haskell-modules/configuration-lts-3.7.nix | 50 + .../haskell-modules/configuration-lts-3.8.nix | 50 + .../haskell-modules/configuration-lts-3.9.nix | 50 + .../haskell-modules/hackage-packages.nix | 1762 +++- 59 files changed, 11670 insertions(+), 297 deletions(-) create mode 100644 pkgs/development/haskell-modules/configuration-lts-3.12.nix diff --git a/pkgs/development/haskell-modules/configuration-lts-0.0.nix b/pkgs/development/haskell-modules/configuration-lts-0.0.nix index adaf80820d3e..ff4709ce4b03 100644 --- a/pkgs/development/haskell-modules/configuration-lts-0.0.nix +++ b/pkgs/development/haskell-modules/configuration-lts-0.0.nix @@ -515,6 +515,7 @@ self: super: { "HasGP" = dontDistribute super."HasGP"; "Haschoo" = dontDistribute super."Haschoo"; "Hashell" = dontDistribute super."Hashell"; + "HaskRel" = dontDistribute super."HaskRel"; "HaskellForMaths" = dontDistribute super."HaskellForMaths"; "HaskellLM" = dontDistribute super."HaskellLM"; "HaskellNN" = dontDistribute super."HaskellNN"; @@ -561,6 +562,7 @@ self: super: { "Hsed" = dontDistribute super."Hsed"; "Hsmtlib" = dontDistribute super."Hsmtlib"; "HueAPI" = dontDistribute super."HueAPI"; + "HulkImport" = dontDistribute super."HulkImport"; "Hungarian-Munkres" = dontDistribute super."Hungarian-Munkres"; "IDynamic" = dontDistribute super."IDynamic"; "IFS" = dontDistribute super."IFS"; @@ -1168,6 +1170,7 @@ self: super: { "afis" = dontDistribute super."afis"; "afv" = dontDistribute super."afv"; "agda-server" = dontDistribute super."agda-server"; + "agda-snippets" = dontDistribute super."agda-snippets"; "agentx" = dontDistribute super."agentx"; "agum" = dontDistribute super."agum"; "aig" = dontDistribute super."aig"; @@ -2004,6 +2007,7 @@ self: super: { "cipher-aes" = doDistribute super."cipher-aes_0_2_9"; "cipher-aes128" = dontDistribute super."cipher-aes128"; "cipher-rc5" = dontDistribute super."cipher-rc5"; + "ciphersaber2" = dontDistribute super."ciphersaber2"; "circ" = dontDistribute super."circ"; "circle-packing" = doDistribute super."circle-packing_0_1_0_3"; "cirru-parser" = dontDistribute super."cirru-parser"; @@ -2471,6 +2475,7 @@ self: super: { "dataflow" = dontDistribute super."dataflow"; "datalog" = dontDistribute super."datalog"; "datapacker" = dontDistribute super."datapacker"; + "dataurl" = dontDistribute super."dataurl"; "date-cache" = dontDistribute super."date-cache"; "dates" = dontDistribute super."dates"; "datetime" = dontDistribute super."datetime"; @@ -2886,6 +2891,7 @@ self: super: { "eros-client" = dontDistribute super."eros-client"; "eros-http" = dontDistribute super."eros-http"; "errno" = dontDistribute super."errno"; + "error-analyze" = dontDistribute super."error-analyze"; "error-continuations" = dontDistribute super."error-continuations"; "error-list" = dontDistribute super."error-list"; "error-loc" = dontDistribute super."error-loc"; @@ -2940,6 +2946,7 @@ self: super: { "exinst-deepseq" = dontDistribute super."exinst-deepseq"; "exinst-hashable" = dontDistribute super."exinst-hashable"; "exists" = dontDistribute super."exists"; + "exit-codes" = dontDistribute super."exit-codes"; "exp-pairs" = dontDistribute super."exp-pairs"; "expand" = dontDistribute super."expand"; "expat-enumerator" = dontDistribute super."expat-enumerator"; @@ -3063,6 +3070,7 @@ self: super: { "fingertree-psqueue" = dontDistribute super."fingertree-psqueue"; "fingertree-tf" = dontDistribute super."fingertree-tf"; "finite-field" = dontDistribute super."finite-field"; + "finite-typelits" = dontDistribute super."finite-typelits"; "first-and-last" = dontDistribute super."first-and-last"; "first-class-patterns" = dontDistribute super."first-class-patterns"; "firstify" = dontDistribute super."firstify"; @@ -3354,6 +3362,20 @@ self: super: { "ghclive" = dontDistribute super."ghclive"; "ghczdecode" = dontDistribute super."ghczdecode"; "ght" = dontDistribute super."ght"; + "gi-atk" = dontDistribute super."gi-atk"; + "gi-cairo" = dontDistribute super."gi-cairo"; + "gi-gdk" = dontDistribute super."gi-gdk"; + "gi-gdkpixbuf" = dontDistribute super."gi-gdkpixbuf"; + "gi-gio" = dontDistribute super."gi-gio"; + "gi-glib" = dontDistribute super."gi-glib"; + "gi-gobject" = dontDistribute super."gi-gobject"; + "gi-gtk" = dontDistribute super."gi-gtk"; + "gi-javascriptcore" = dontDistribute super."gi-javascriptcore"; + "gi-notify" = dontDistribute super."gi-notify"; + "gi-pango" = dontDistribute super."gi-pango"; + "gi-soup" = dontDistribute super."gi-soup"; + "gi-vte" = dontDistribute super."gi-vte"; + "gi-webkit" = dontDistribute super."gi-webkit"; "gimlh" = dontDistribute super."gimlh"; "ginger" = dontDistribute super."ginger"; "ginsu" = dontDistribute super."ginsu"; @@ -3367,6 +3389,7 @@ self: super: { "git-embed" = dontDistribute super."git-embed"; "git-freq" = dontDistribute super."git-freq"; "git-gpush" = dontDistribute super."git-gpush"; + "git-jump" = dontDistribute super."git-jump"; "git-monitor" = dontDistribute super."git-monitor"; "git-object" = dontDistribute super."git-object"; "git-repair" = dontDistribute super."git-repair"; @@ -3856,6 +3879,8 @@ self: super: { "haskell-formatter" = dontDistribute super."haskell-formatter"; "haskell-ftp" = dontDistribute super."haskell-ftp"; "haskell-generate" = dontDistribute super."haskell-generate"; + "haskell-gi" = dontDistribute super."haskell-gi"; + "haskell-gi-base" = dontDistribute super."haskell-gi-base"; "haskell-import-graph" = dontDistribute super."haskell-import-graph"; "haskell-in-space" = dontDistribute super."haskell-in-space"; "haskell-modbus" = dontDistribute super."haskell-modbus"; @@ -4064,6 +4089,7 @@ self: super: { "hfd" = dontDistribute super."hfd"; "hfiar" = dontDistribute super."hfiar"; "hflags" = dontDistribute super."hflags"; + "hfmt" = dontDistribute super."hfmt"; "hfoil" = dontDistribute super."hfoil"; "hfov" = dontDistribute super."hfov"; "hfractal" = dontDistribute super."hfractal"; @@ -4487,6 +4513,7 @@ self: super: { "hsx2hs" = dontDistribute super."hsx2hs"; "hsyscall" = dontDistribute super."hsyscall"; "hszephyr" = dontDistribute super."hszephyr"; + "htaglib" = dontDistribute super."htaglib"; "htags" = dontDistribute super."htags"; "htar" = dontDistribute super."htar"; "htiled" = dontDistribute super."htiled"; @@ -4940,6 +4967,7 @@ self: super: { "keera-hails-reactive-polling" = dontDistribute super."keera-hails-reactive-polling"; "keera-hails-reactive-wx" = dontDistribute super."keera-hails-reactive-wx"; "keera-hails-reactive-yampa" = dontDistribute super."keera-hails-reactive-yampa"; + "keera-hails-reactivelenses" = dontDistribute super."keera-hails-reactivelenses"; "keera-hails-reactivevalues" = dontDistribute super."keera-hails-reactivevalues"; "keera-posture" = dontDistribute super."keera-posture"; "keiretsu" = dontDistribute super."keiretsu"; @@ -5064,6 +5092,8 @@ self: super: { "lat" = dontDistribute super."lat"; "latest-npm-version" = dontDistribute super."latest-npm-version"; "latex" = dontDistribute super."latex"; + "latex-formulae-image" = dontDistribute super."latex-formulae-image"; + "latex-formulae-pandoc" = dontDistribute super."latex-formulae-pandoc"; "lattices" = dontDistribute super."lattices"; "launchpad-control" = dontDistribute super."launchpad-control"; "lax" = dontDistribute super."lax"; @@ -5439,6 +5469,7 @@ self: super: { "memexml" = dontDistribute super."memexml"; "memo-ptr" = dontDistribute super."memo-ptr"; "memo-sqlite" = dontDistribute super."memo-sqlite"; + "memoization-utils" = dontDistribute super."memoization-utils"; "memoize" = dontDistribute super."memoize"; "memory" = dontDistribute super."memory"; "memscript" = dontDistribute super."memscript"; @@ -5887,6 +5918,7 @@ self: super: { "nthable" = dontDistribute super."nthable"; "ntp-control" = dontDistribute super."ntp-control"; "null-canvas" = dontDistribute super."null-canvas"; + "nullary" = dontDistribute super."nullary"; "number" = dontDistribute super."number"; "numbering" = dontDistribute super."numbering"; "numerals" = dontDistribute super."numerals"; @@ -6116,6 +6148,7 @@ self: super: { "pcg-random" = dontDistribute super."pcg-random"; "pcre-heavy" = dontDistribute super."pcre-heavy"; "pcre-less" = dontDistribute super."pcre-less"; + "pcre-light" = doDistribute super."pcre-light_0_4_0_3"; "pcre-light-extra" = dontDistribute super."pcre-light-extra"; "pcre-utils" = dontDistribute super."pcre-utils"; "pdf-toolbox-content" = dontDistribute super."pdf-toolbox-content"; @@ -6494,6 +6527,7 @@ self: super: { "qc-oi-testgenerator" = dontDistribute super."qc-oi-testgenerator"; "qd" = dontDistribute super."qd"; "qd-vec" = dontDistribute super."qd-vec"; + "qed" = dontDistribute super."qed"; "qhull-simple" = dontDistribute super."qhull-simple"; "qrcode" = dontDistribute super."qrcode"; "qt" = dontDistribute super."qt"; @@ -6509,6 +6543,7 @@ self: super: { "queue" = dontDistribute super."queue"; "queuelike" = dontDistribute super."queuelike"; "quick-generator" = dontDistribute super."quick-generator"; + "quick-schema" = dontDistribute super."quick-schema"; "quickcheck-assertions" = doDistribute super."quickcheck-assertions_0_1_1"; "quickcheck-instances" = doDistribute super."quickcheck-instances_0_3_9"; "quickcheck-io" = doDistribute super."quickcheck-io_0_1_1"; @@ -7016,6 +7051,7 @@ self: super: { "servant" = dontDistribute super."servant"; "servant-JuicyPixels" = dontDistribute super."servant-JuicyPixels"; "servant-blaze" = dontDistribute super."servant-blaze"; + "servant-cassava" = dontDistribute super."servant-cassava"; "servant-client" = dontDistribute super."servant-client"; "servant-docs" = dontDistribute super."servant-docs"; "servant-ede" = dontDistribute super."servant-ede"; @@ -7029,6 +7065,7 @@ self: super: { "servant-response" = dontDistribute super."servant-response"; "servant-scotty" = dontDistribute super."servant-scotty"; "servant-server" = dontDistribute super."servant-server"; + "servant-swagger" = dontDistribute super."servant-swagger"; "servant-yaml" = dontDistribute super."servant-yaml"; "serversession" = dontDistribute super."serversession"; "serversession-backend-acid-state" = dontDistribute super."serversession-backend-acid-state"; @@ -8234,6 +8271,7 @@ self: super: { "verdict" = dontDistribute super."verdict"; "verdict-json" = dontDistribute super."verdict-json"; "verilog" = dontDistribute super."verilog"; + "versions" = dontDistribute super."versions"; "vhdl" = dontDistribute super."vhdl"; "views" = dontDistribute super."views"; "vigilance" = dontDistribute super."vigilance"; @@ -8691,6 +8729,7 @@ self: super: { "zendesk-api" = dontDistribute super."zendesk-api"; "zeno" = dontDistribute super."zeno"; "zero" = dontDistribute super."zero"; + "zerobin" = dontDistribute super."zerobin"; "zeromq-haskell" = dontDistribute super."zeromq-haskell"; "zeromq3-conduit" = dontDistribute super."zeromq3-conduit"; "zeromq3-haskell" = dontDistribute super."zeromq3-haskell"; diff --git a/pkgs/development/haskell-modules/configuration-lts-0.1.nix b/pkgs/development/haskell-modules/configuration-lts-0.1.nix index 8081c2aa099c..c9e3d4d706b5 100644 --- a/pkgs/development/haskell-modules/configuration-lts-0.1.nix +++ b/pkgs/development/haskell-modules/configuration-lts-0.1.nix @@ -515,6 +515,7 @@ self: super: { "HasGP" = dontDistribute super."HasGP"; "Haschoo" = dontDistribute super."Haschoo"; "Hashell" = dontDistribute super."Hashell"; + "HaskRel" = dontDistribute super."HaskRel"; "HaskellForMaths" = dontDistribute super."HaskellForMaths"; "HaskellLM" = dontDistribute super."HaskellLM"; "HaskellNN" = dontDistribute super."HaskellNN"; @@ -561,6 +562,7 @@ self: super: { "Hsed" = dontDistribute super."Hsed"; "Hsmtlib" = dontDistribute super."Hsmtlib"; "HueAPI" = dontDistribute super."HueAPI"; + "HulkImport" = dontDistribute super."HulkImport"; "Hungarian-Munkres" = dontDistribute super."Hungarian-Munkres"; "IDynamic" = dontDistribute super."IDynamic"; "IFS" = dontDistribute super."IFS"; @@ -1168,6 +1170,7 @@ self: super: { "afis" = dontDistribute super."afis"; "afv" = dontDistribute super."afv"; "agda-server" = dontDistribute super."agda-server"; + "agda-snippets" = dontDistribute super."agda-snippets"; "agentx" = dontDistribute super."agentx"; "agum" = dontDistribute super."agum"; "aig" = dontDistribute super."aig"; @@ -2004,6 +2007,7 @@ self: super: { "cipher-aes" = doDistribute super."cipher-aes_0_2_9"; "cipher-aes128" = dontDistribute super."cipher-aes128"; "cipher-rc5" = dontDistribute super."cipher-rc5"; + "ciphersaber2" = dontDistribute super."ciphersaber2"; "circ" = dontDistribute super."circ"; "circle-packing" = doDistribute super."circle-packing_0_1_0_3"; "cirru-parser" = dontDistribute super."cirru-parser"; @@ -2470,6 +2474,7 @@ self: super: { "dataflow" = dontDistribute super."dataflow"; "datalog" = dontDistribute super."datalog"; "datapacker" = dontDistribute super."datapacker"; + "dataurl" = dontDistribute super."dataurl"; "date-cache" = dontDistribute super."date-cache"; "dates" = dontDistribute super."dates"; "datetime" = dontDistribute super."datetime"; @@ -2885,6 +2890,7 @@ self: super: { "eros-client" = dontDistribute super."eros-client"; "eros-http" = dontDistribute super."eros-http"; "errno" = dontDistribute super."errno"; + "error-analyze" = dontDistribute super."error-analyze"; "error-continuations" = dontDistribute super."error-continuations"; "error-list" = dontDistribute super."error-list"; "error-loc" = dontDistribute super."error-loc"; @@ -2939,6 +2945,7 @@ self: super: { "exinst-deepseq" = dontDistribute super."exinst-deepseq"; "exinst-hashable" = dontDistribute super."exinst-hashable"; "exists" = dontDistribute super."exists"; + "exit-codes" = dontDistribute super."exit-codes"; "exp-pairs" = dontDistribute super."exp-pairs"; "expand" = dontDistribute super."expand"; "expat-enumerator" = dontDistribute super."expat-enumerator"; @@ -3062,6 +3069,7 @@ self: super: { "fingertree-psqueue" = dontDistribute super."fingertree-psqueue"; "fingertree-tf" = dontDistribute super."fingertree-tf"; "finite-field" = dontDistribute super."finite-field"; + "finite-typelits" = dontDistribute super."finite-typelits"; "first-and-last" = dontDistribute super."first-and-last"; "first-class-patterns" = dontDistribute super."first-class-patterns"; "firstify" = dontDistribute super."firstify"; @@ -3353,6 +3361,20 @@ self: super: { "ghclive" = dontDistribute super."ghclive"; "ghczdecode" = dontDistribute super."ghczdecode"; "ght" = dontDistribute super."ght"; + "gi-atk" = dontDistribute super."gi-atk"; + "gi-cairo" = dontDistribute super."gi-cairo"; + "gi-gdk" = dontDistribute super."gi-gdk"; + "gi-gdkpixbuf" = dontDistribute super."gi-gdkpixbuf"; + "gi-gio" = dontDistribute super."gi-gio"; + "gi-glib" = dontDistribute super."gi-glib"; + "gi-gobject" = dontDistribute super."gi-gobject"; + "gi-gtk" = dontDistribute super."gi-gtk"; + "gi-javascriptcore" = dontDistribute super."gi-javascriptcore"; + "gi-notify" = dontDistribute super."gi-notify"; + "gi-pango" = dontDistribute super."gi-pango"; + "gi-soup" = dontDistribute super."gi-soup"; + "gi-vte" = dontDistribute super."gi-vte"; + "gi-webkit" = dontDistribute super."gi-webkit"; "gimlh" = dontDistribute super."gimlh"; "ginger" = dontDistribute super."ginger"; "ginsu" = dontDistribute super."ginsu"; @@ -3366,6 +3388,7 @@ self: super: { "git-embed" = dontDistribute super."git-embed"; "git-freq" = dontDistribute super."git-freq"; "git-gpush" = dontDistribute super."git-gpush"; + "git-jump" = dontDistribute super."git-jump"; "git-monitor" = dontDistribute super."git-monitor"; "git-object" = dontDistribute super."git-object"; "git-repair" = dontDistribute super."git-repair"; @@ -3855,6 +3878,8 @@ self: super: { "haskell-formatter" = dontDistribute super."haskell-formatter"; "haskell-ftp" = dontDistribute super."haskell-ftp"; "haskell-generate" = dontDistribute super."haskell-generate"; + "haskell-gi" = dontDistribute super."haskell-gi"; + "haskell-gi-base" = dontDistribute super."haskell-gi-base"; "haskell-import-graph" = dontDistribute super."haskell-import-graph"; "haskell-in-space" = dontDistribute super."haskell-in-space"; "haskell-modbus" = dontDistribute super."haskell-modbus"; @@ -4063,6 +4088,7 @@ self: super: { "hfd" = dontDistribute super."hfd"; "hfiar" = dontDistribute super."hfiar"; "hflags" = dontDistribute super."hflags"; + "hfmt" = dontDistribute super."hfmt"; "hfoil" = dontDistribute super."hfoil"; "hfov" = dontDistribute super."hfov"; "hfractal" = dontDistribute super."hfractal"; @@ -4486,6 +4512,7 @@ self: super: { "hsx2hs" = dontDistribute super."hsx2hs"; "hsyscall" = dontDistribute super."hsyscall"; "hszephyr" = dontDistribute super."hszephyr"; + "htaglib" = dontDistribute super."htaglib"; "htags" = dontDistribute super."htags"; "htar" = dontDistribute super."htar"; "htiled" = dontDistribute super."htiled"; @@ -4939,6 +4966,7 @@ self: super: { "keera-hails-reactive-polling" = dontDistribute super."keera-hails-reactive-polling"; "keera-hails-reactive-wx" = dontDistribute super."keera-hails-reactive-wx"; "keera-hails-reactive-yampa" = dontDistribute super."keera-hails-reactive-yampa"; + "keera-hails-reactivelenses" = dontDistribute super."keera-hails-reactivelenses"; "keera-hails-reactivevalues" = dontDistribute super."keera-hails-reactivevalues"; "keera-posture" = dontDistribute super."keera-posture"; "keiretsu" = dontDistribute super."keiretsu"; @@ -5063,6 +5091,8 @@ self: super: { "lat" = dontDistribute super."lat"; "latest-npm-version" = dontDistribute super."latest-npm-version"; "latex" = dontDistribute super."latex"; + "latex-formulae-image" = dontDistribute super."latex-formulae-image"; + "latex-formulae-pandoc" = dontDistribute super."latex-formulae-pandoc"; "lattices" = dontDistribute super."lattices"; "launchpad-control" = dontDistribute super."launchpad-control"; "lax" = dontDistribute super."lax"; @@ -5438,6 +5468,7 @@ self: super: { "memexml" = dontDistribute super."memexml"; "memo-ptr" = dontDistribute super."memo-ptr"; "memo-sqlite" = dontDistribute super."memo-sqlite"; + "memoization-utils" = dontDistribute super."memoization-utils"; "memoize" = dontDistribute super."memoize"; "memory" = dontDistribute super."memory"; "memscript" = dontDistribute super."memscript"; @@ -5886,6 +5917,7 @@ self: super: { "nthable" = dontDistribute super."nthable"; "ntp-control" = dontDistribute super."ntp-control"; "null-canvas" = dontDistribute super."null-canvas"; + "nullary" = dontDistribute super."nullary"; "number" = dontDistribute super."number"; "numbering" = dontDistribute super."numbering"; "numerals" = dontDistribute super."numerals"; @@ -6115,6 +6147,7 @@ self: super: { "pcg-random" = dontDistribute super."pcg-random"; "pcre-heavy" = dontDistribute super."pcre-heavy"; "pcre-less" = dontDistribute super."pcre-less"; + "pcre-light" = doDistribute super."pcre-light_0_4_0_3"; "pcre-light-extra" = dontDistribute super."pcre-light-extra"; "pcre-utils" = dontDistribute super."pcre-utils"; "pdf-toolbox-content" = dontDistribute super."pdf-toolbox-content"; @@ -6493,6 +6526,7 @@ self: super: { "qc-oi-testgenerator" = dontDistribute super."qc-oi-testgenerator"; "qd" = dontDistribute super."qd"; "qd-vec" = dontDistribute super."qd-vec"; + "qed" = dontDistribute super."qed"; "qhull-simple" = dontDistribute super."qhull-simple"; "qrcode" = dontDistribute super."qrcode"; "qt" = dontDistribute super."qt"; @@ -6508,6 +6542,7 @@ self: super: { "queue" = dontDistribute super."queue"; "queuelike" = dontDistribute super."queuelike"; "quick-generator" = dontDistribute super."quick-generator"; + "quick-schema" = dontDistribute super."quick-schema"; "quickcheck-assertions" = doDistribute super."quickcheck-assertions_0_1_1"; "quickcheck-instances" = doDistribute super."quickcheck-instances_0_3_9"; "quickcheck-io" = doDistribute super."quickcheck-io_0_1_1"; @@ -7015,6 +7050,7 @@ self: super: { "servant" = dontDistribute super."servant"; "servant-JuicyPixels" = dontDistribute super."servant-JuicyPixels"; "servant-blaze" = dontDistribute super."servant-blaze"; + "servant-cassava" = dontDistribute super."servant-cassava"; "servant-client" = dontDistribute super."servant-client"; "servant-docs" = dontDistribute super."servant-docs"; "servant-ede" = dontDistribute super."servant-ede"; @@ -7028,6 +7064,7 @@ self: super: { "servant-response" = dontDistribute super."servant-response"; "servant-scotty" = dontDistribute super."servant-scotty"; "servant-server" = dontDistribute super."servant-server"; + "servant-swagger" = dontDistribute super."servant-swagger"; "servant-yaml" = dontDistribute super."servant-yaml"; "serversession" = dontDistribute super."serversession"; "serversession-backend-acid-state" = dontDistribute super."serversession-backend-acid-state"; @@ -8233,6 +8270,7 @@ self: super: { "verdict" = dontDistribute super."verdict"; "verdict-json" = dontDistribute super."verdict-json"; "verilog" = dontDistribute super."verilog"; + "versions" = dontDistribute super."versions"; "vhdl" = dontDistribute super."vhdl"; "views" = dontDistribute super."views"; "vigilance" = dontDistribute super."vigilance"; @@ -8690,6 +8728,7 @@ self: super: { "zendesk-api" = dontDistribute super."zendesk-api"; "zeno" = dontDistribute super."zeno"; "zero" = dontDistribute super."zero"; + "zerobin" = dontDistribute super."zerobin"; "zeromq-haskell" = dontDistribute super."zeromq-haskell"; "zeromq3-conduit" = dontDistribute super."zeromq3-conduit"; "zeromq3-haskell" = dontDistribute super."zeromq3-haskell"; diff --git a/pkgs/development/haskell-modules/configuration-lts-0.2.nix b/pkgs/development/haskell-modules/configuration-lts-0.2.nix index 89e59ad9b037..015dc72efa95 100644 --- a/pkgs/development/haskell-modules/configuration-lts-0.2.nix +++ b/pkgs/development/haskell-modules/configuration-lts-0.2.nix @@ -515,6 +515,7 @@ self: super: { "HasGP" = dontDistribute super."HasGP"; "Haschoo" = dontDistribute super."Haschoo"; "Hashell" = dontDistribute super."Hashell"; + "HaskRel" = dontDistribute super."HaskRel"; "HaskellForMaths" = dontDistribute super."HaskellForMaths"; "HaskellLM" = dontDistribute super."HaskellLM"; "HaskellNN" = dontDistribute super."HaskellNN"; @@ -561,6 +562,7 @@ self: super: { "Hsed" = dontDistribute super."Hsed"; "Hsmtlib" = dontDistribute super."Hsmtlib"; "HueAPI" = dontDistribute super."HueAPI"; + "HulkImport" = dontDistribute super."HulkImport"; "Hungarian-Munkres" = dontDistribute super."Hungarian-Munkres"; "IDynamic" = dontDistribute super."IDynamic"; "IFS" = dontDistribute super."IFS"; @@ -1168,6 +1170,7 @@ self: super: { "afis" = dontDistribute super."afis"; "afv" = dontDistribute super."afv"; "agda-server" = dontDistribute super."agda-server"; + "agda-snippets" = dontDistribute super."agda-snippets"; "agentx" = dontDistribute super."agentx"; "agum" = dontDistribute super."agum"; "aig" = dontDistribute super."aig"; @@ -2004,6 +2007,7 @@ self: super: { "cipher-aes" = doDistribute super."cipher-aes_0_2_9"; "cipher-aes128" = dontDistribute super."cipher-aes128"; "cipher-rc5" = dontDistribute super."cipher-rc5"; + "ciphersaber2" = dontDistribute super."ciphersaber2"; "circ" = dontDistribute super."circ"; "circle-packing" = doDistribute super."circle-packing_0_1_0_3"; "cirru-parser" = dontDistribute super."cirru-parser"; @@ -2470,6 +2474,7 @@ self: super: { "dataflow" = dontDistribute super."dataflow"; "datalog" = dontDistribute super."datalog"; "datapacker" = dontDistribute super."datapacker"; + "dataurl" = dontDistribute super."dataurl"; "date-cache" = dontDistribute super."date-cache"; "dates" = dontDistribute super."dates"; "datetime" = dontDistribute super."datetime"; @@ -2885,6 +2890,7 @@ self: super: { "eros-client" = dontDistribute super."eros-client"; "eros-http" = dontDistribute super."eros-http"; "errno" = dontDistribute super."errno"; + "error-analyze" = dontDistribute super."error-analyze"; "error-continuations" = dontDistribute super."error-continuations"; "error-list" = dontDistribute super."error-list"; "error-loc" = dontDistribute super."error-loc"; @@ -2939,6 +2945,7 @@ self: super: { "exinst-deepseq" = dontDistribute super."exinst-deepseq"; "exinst-hashable" = dontDistribute super."exinst-hashable"; "exists" = dontDistribute super."exists"; + "exit-codes" = dontDistribute super."exit-codes"; "exp-pairs" = dontDistribute super."exp-pairs"; "expand" = dontDistribute super."expand"; "expat-enumerator" = dontDistribute super."expat-enumerator"; @@ -3062,6 +3069,7 @@ self: super: { "fingertree-psqueue" = dontDistribute super."fingertree-psqueue"; "fingertree-tf" = dontDistribute super."fingertree-tf"; "finite-field" = dontDistribute super."finite-field"; + "finite-typelits" = dontDistribute super."finite-typelits"; "first-and-last" = dontDistribute super."first-and-last"; "first-class-patterns" = dontDistribute super."first-class-patterns"; "firstify" = dontDistribute super."firstify"; @@ -3353,6 +3361,20 @@ self: super: { "ghclive" = dontDistribute super."ghclive"; "ghczdecode" = dontDistribute super."ghczdecode"; "ght" = dontDistribute super."ght"; + "gi-atk" = dontDistribute super."gi-atk"; + "gi-cairo" = dontDistribute super."gi-cairo"; + "gi-gdk" = dontDistribute super."gi-gdk"; + "gi-gdkpixbuf" = dontDistribute super."gi-gdkpixbuf"; + "gi-gio" = dontDistribute super."gi-gio"; + "gi-glib" = dontDistribute super."gi-glib"; + "gi-gobject" = dontDistribute super."gi-gobject"; + "gi-gtk" = dontDistribute super."gi-gtk"; + "gi-javascriptcore" = dontDistribute super."gi-javascriptcore"; + "gi-notify" = dontDistribute super."gi-notify"; + "gi-pango" = dontDistribute super."gi-pango"; + "gi-soup" = dontDistribute super."gi-soup"; + "gi-vte" = dontDistribute super."gi-vte"; + "gi-webkit" = dontDistribute super."gi-webkit"; "gimlh" = dontDistribute super."gimlh"; "ginger" = dontDistribute super."ginger"; "ginsu" = dontDistribute super."ginsu"; @@ -3366,6 +3388,7 @@ self: super: { "git-embed" = dontDistribute super."git-embed"; "git-freq" = dontDistribute super."git-freq"; "git-gpush" = dontDistribute super."git-gpush"; + "git-jump" = dontDistribute super."git-jump"; "git-monitor" = dontDistribute super."git-monitor"; "git-object" = dontDistribute super."git-object"; "git-repair" = dontDistribute super."git-repair"; @@ -3855,6 +3878,8 @@ self: super: { "haskell-formatter" = dontDistribute super."haskell-formatter"; "haskell-ftp" = dontDistribute super."haskell-ftp"; "haskell-generate" = dontDistribute super."haskell-generate"; + "haskell-gi" = dontDistribute super."haskell-gi"; + "haskell-gi-base" = dontDistribute super."haskell-gi-base"; "haskell-import-graph" = dontDistribute super."haskell-import-graph"; "haskell-in-space" = dontDistribute super."haskell-in-space"; "haskell-modbus" = dontDistribute super."haskell-modbus"; @@ -4063,6 +4088,7 @@ self: super: { "hfd" = dontDistribute super."hfd"; "hfiar" = dontDistribute super."hfiar"; "hflags" = dontDistribute super."hflags"; + "hfmt" = dontDistribute super."hfmt"; "hfoil" = dontDistribute super."hfoil"; "hfov" = dontDistribute super."hfov"; "hfractal" = dontDistribute super."hfractal"; @@ -4486,6 +4512,7 @@ self: super: { "hsx2hs" = dontDistribute super."hsx2hs"; "hsyscall" = dontDistribute super."hsyscall"; "hszephyr" = dontDistribute super."hszephyr"; + "htaglib" = dontDistribute super."htaglib"; "htags" = dontDistribute super."htags"; "htar" = dontDistribute super."htar"; "htiled" = dontDistribute super."htiled"; @@ -4939,6 +4966,7 @@ self: super: { "keera-hails-reactive-polling" = dontDistribute super."keera-hails-reactive-polling"; "keera-hails-reactive-wx" = dontDistribute super."keera-hails-reactive-wx"; "keera-hails-reactive-yampa" = dontDistribute super."keera-hails-reactive-yampa"; + "keera-hails-reactivelenses" = dontDistribute super."keera-hails-reactivelenses"; "keera-hails-reactivevalues" = dontDistribute super."keera-hails-reactivevalues"; "keera-posture" = dontDistribute super."keera-posture"; "keiretsu" = dontDistribute super."keiretsu"; @@ -5063,6 +5091,8 @@ self: super: { "lat" = dontDistribute super."lat"; "latest-npm-version" = dontDistribute super."latest-npm-version"; "latex" = dontDistribute super."latex"; + "latex-formulae-image" = dontDistribute super."latex-formulae-image"; + "latex-formulae-pandoc" = dontDistribute super."latex-formulae-pandoc"; "lattices" = dontDistribute super."lattices"; "launchpad-control" = dontDistribute super."launchpad-control"; "lax" = dontDistribute super."lax"; @@ -5438,6 +5468,7 @@ self: super: { "memexml" = dontDistribute super."memexml"; "memo-ptr" = dontDistribute super."memo-ptr"; "memo-sqlite" = dontDistribute super."memo-sqlite"; + "memoization-utils" = dontDistribute super."memoization-utils"; "memoize" = dontDistribute super."memoize"; "memory" = dontDistribute super."memory"; "memscript" = dontDistribute super."memscript"; @@ -5886,6 +5917,7 @@ self: super: { "nthable" = dontDistribute super."nthable"; "ntp-control" = dontDistribute super."ntp-control"; "null-canvas" = dontDistribute super."null-canvas"; + "nullary" = dontDistribute super."nullary"; "number" = dontDistribute super."number"; "numbering" = dontDistribute super."numbering"; "numerals" = dontDistribute super."numerals"; @@ -6115,6 +6147,7 @@ self: super: { "pcg-random" = dontDistribute super."pcg-random"; "pcre-heavy" = dontDistribute super."pcre-heavy"; "pcre-less" = dontDistribute super."pcre-less"; + "pcre-light" = doDistribute super."pcre-light_0_4_0_3"; "pcre-light-extra" = dontDistribute super."pcre-light-extra"; "pcre-utils" = dontDistribute super."pcre-utils"; "pdf-toolbox-content" = dontDistribute super."pdf-toolbox-content"; @@ -6493,6 +6526,7 @@ self: super: { "qc-oi-testgenerator" = dontDistribute super."qc-oi-testgenerator"; "qd" = dontDistribute super."qd"; "qd-vec" = dontDistribute super."qd-vec"; + "qed" = dontDistribute super."qed"; "qhull-simple" = dontDistribute super."qhull-simple"; "qrcode" = dontDistribute super."qrcode"; "qt" = dontDistribute super."qt"; @@ -6508,6 +6542,7 @@ self: super: { "queue" = dontDistribute super."queue"; "queuelike" = dontDistribute super."queuelike"; "quick-generator" = dontDistribute super."quick-generator"; + "quick-schema" = dontDistribute super."quick-schema"; "quickcheck-assertions" = doDistribute super."quickcheck-assertions_0_1_1"; "quickcheck-instances" = doDistribute super."quickcheck-instances_0_3_9"; "quickcheck-io" = doDistribute super."quickcheck-io_0_1_1"; @@ -7015,6 +7050,7 @@ self: super: { "servant" = dontDistribute super."servant"; "servant-JuicyPixels" = dontDistribute super."servant-JuicyPixels"; "servant-blaze" = dontDistribute super."servant-blaze"; + "servant-cassava" = dontDistribute super."servant-cassava"; "servant-client" = dontDistribute super."servant-client"; "servant-docs" = dontDistribute super."servant-docs"; "servant-ede" = dontDistribute super."servant-ede"; @@ -7028,6 +7064,7 @@ self: super: { "servant-response" = dontDistribute super."servant-response"; "servant-scotty" = dontDistribute super."servant-scotty"; "servant-server" = dontDistribute super."servant-server"; + "servant-swagger" = dontDistribute super."servant-swagger"; "servant-yaml" = dontDistribute super."servant-yaml"; "serversession" = dontDistribute super."serversession"; "serversession-backend-acid-state" = dontDistribute super."serversession-backend-acid-state"; @@ -8233,6 +8270,7 @@ self: super: { "verdict" = dontDistribute super."verdict"; "verdict-json" = dontDistribute super."verdict-json"; "verilog" = dontDistribute super."verilog"; + "versions" = dontDistribute super."versions"; "vhdl" = dontDistribute super."vhdl"; "views" = dontDistribute super."views"; "vigilance" = dontDistribute super."vigilance"; @@ -8690,6 +8728,7 @@ self: super: { "zendesk-api" = dontDistribute super."zendesk-api"; "zeno" = dontDistribute super."zeno"; "zero" = dontDistribute super."zero"; + "zerobin" = dontDistribute super."zerobin"; "zeromq-haskell" = dontDistribute super."zeromq-haskell"; "zeromq3-conduit" = dontDistribute super."zeromq3-conduit"; "zeromq3-haskell" = dontDistribute super."zeromq3-haskell"; diff --git a/pkgs/development/haskell-modules/configuration-lts-0.3.nix b/pkgs/development/haskell-modules/configuration-lts-0.3.nix index 75d9e942472a..251babb2fb76 100644 --- a/pkgs/development/haskell-modules/configuration-lts-0.3.nix +++ b/pkgs/development/haskell-modules/configuration-lts-0.3.nix @@ -515,6 +515,7 @@ self: super: { "HasGP" = dontDistribute super."HasGP"; "Haschoo" = dontDistribute super."Haschoo"; "Hashell" = dontDistribute super."Hashell"; + "HaskRel" = dontDistribute super."HaskRel"; "HaskellForMaths" = dontDistribute super."HaskellForMaths"; "HaskellLM" = dontDistribute super."HaskellLM"; "HaskellNN" = dontDistribute super."HaskellNN"; @@ -561,6 +562,7 @@ self: super: { "Hsed" = dontDistribute super."Hsed"; "Hsmtlib" = dontDistribute super."Hsmtlib"; "HueAPI" = dontDistribute super."HueAPI"; + "HulkImport" = dontDistribute super."HulkImport"; "Hungarian-Munkres" = dontDistribute super."Hungarian-Munkres"; "IDynamic" = dontDistribute super."IDynamic"; "IFS" = dontDistribute super."IFS"; @@ -1168,6 +1170,7 @@ self: super: { "afis" = dontDistribute super."afis"; "afv" = dontDistribute super."afv"; "agda-server" = dontDistribute super."agda-server"; + "agda-snippets" = dontDistribute super."agda-snippets"; "agentx" = dontDistribute super."agentx"; "agum" = dontDistribute super."agum"; "aig" = dontDistribute super."aig"; @@ -2004,6 +2007,7 @@ self: super: { "cipher-aes" = doDistribute super."cipher-aes_0_2_9"; "cipher-aes128" = dontDistribute super."cipher-aes128"; "cipher-rc5" = dontDistribute super."cipher-rc5"; + "ciphersaber2" = dontDistribute super."ciphersaber2"; "circ" = dontDistribute super."circ"; "circle-packing" = doDistribute super."circle-packing_0_1_0_3"; "cirru-parser" = dontDistribute super."cirru-parser"; @@ -2470,6 +2474,7 @@ self: super: { "dataflow" = dontDistribute super."dataflow"; "datalog" = dontDistribute super."datalog"; "datapacker" = dontDistribute super."datapacker"; + "dataurl" = dontDistribute super."dataurl"; "date-cache" = dontDistribute super."date-cache"; "dates" = dontDistribute super."dates"; "datetime" = dontDistribute super."datetime"; @@ -2885,6 +2890,7 @@ self: super: { "eros-client" = dontDistribute super."eros-client"; "eros-http" = dontDistribute super."eros-http"; "errno" = dontDistribute super."errno"; + "error-analyze" = dontDistribute super."error-analyze"; "error-continuations" = dontDistribute super."error-continuations"; "error-list" = dontDistribute super."error-list"; "error-loc" = dontDistribute super."error-loc"; @@ -2939,6 +2945,7 @@ self: super: { "exinst-deepseq" = dontDistribute super."exinst-deepseq"; "exinst-hashable" = dontDistribute super."exinst-hashable"; "exists" = dontDistribute super."exists"; + "exit-codes" = dontDistribute super."exit-codes"; "exp-pairs" = dontDistribute super."exp-pairs"; "expand" = dontDistribute super."expand"; "expat-enumerator" = dontDistribute super."expat-enumerator"; @@ -3062,6 +3069,7 @@ self: super: { "fingertree-psqueue" = dontDistribute super."fingertree-psqueue"; "fingertree-tf" = dontDistribute super."fingertree-tf"; "finite-field" = dontDistribute super."finite-field"; + "finite-typelits" = dontDistribute super."finite-typelits"; "first-and-last" = dontDistribute super."first-and-last"; "first-class-patterns" = dontDistribute super."first-class-patterns"; "firstify" = dontDistribute super."firstify"; @@ -3353,6 +3361,20 @@ self: super: { "ghclive" = dontDistribute super."ghclive"; "ghczdecode" = dontDistribute super."ghczdecode"; "ght" = dontDistribute super."ght"; + "gi-atk" = dontDistribute super."gi-atk"; + "gi-cairo" = dontDistribute super."gi-cairo"; + "gi-gdk" = dontDistribute super."gi-gdk"; + "gi-gdkpixbuf" = dontDistribute super."gi-gdkpixbuf"; + "gi-gio" = dontDistribute super."gi-gio"; + "gi-glib" = dontDistribute super."gi-glib"; + "gi-gobject" = dontDistribute super."gi-gobject"; + "gi-gtk" = dontDistribute super."gi-gtk"; + "gi-javascriptcore" = dontDistribute super."gi-javascriptcore"; + "gi-notify" = dontDistribute super."gi-notify"; + "gi-pango" = dontDistribute super."gi-pango"; + "gi-soup" = dontDistribute super."gi-soup"; + "gi-vte" = dontDistribute super."gi-vte"; + "gi-webkit" = dontDistribute super."gi-webkit"; "gimlh" = dontDistribute super."gimlh"; "ginger" = dontDistribute super."ginger"; "ginsu" = dontDistribute super."ginsu"; @@ -3366,6 +3388,7 @@ self: super: { "git-embed" = dontDistribute super."git-embed"; "git-freq" = dontDistribute super."git-freq"; "git-gpush" = dontDistribute super."git-gpush"; + "git-jump" = dontDistribute super."git-jump"; "git-monitor" = dontDistribute super."git-monitor"; "git-object" = dontDistribute super."git-object"; "git-repair" = dontDistribute super."git-repair"; @@ -3855,6 +3878,8 @@ self: super: { "haskell-formatter" = dontDistribute super."haskell-formatter"; "haskell-ftp" = dontDistribute super."haskell-ftp"; "haskell-generate" = dontDistribute super."haskell-generate"; + "haskell-gi" = dontDistribute super."haskell-gi"; + "haskell-gi-base" = dontDistribute super."haskell-gi-base"; "haskell-import-graph" = dontDistribute super."haskell-import-graph"; "haskell-in-space" = dontDistribute super."haskell-in-space"; "haskell-modbus" = dontDistribute super."haskell-modbus"; @@ -4063,6 +4088,7 @@ self: super: { "hfd" = dontDistribute super."hfd"; "hfiar" = dontDistribute super."hfiar"; "hflags" = dontDistribute super."hflags"; + "hfmt" = dontDistribute super."hfmt"; "hfoil" = dontDistribute super."hfoil"; "hfov" = dontDistribute super."hfov"; "hfractal" = dontDistribute super."hfractal"; @@ -4486,6 +4512,7 @@ self: super: { "hsx2hs" = dontDistribute super."hsx2hs"; "hsyscall" = dontDistribute super."hsyscall"; "hszephyr" = dontDistribute super."hszephyr"; + "htaglib" = dontDistribute super."htaglib"; "htags" = dontDistribute super."htags"; "htar" = dontDistribute super."htar"; "htiled" = dontDistribute super."htiled"; @@ -4939,6 +4966,7 @@ self: super: { "keera-hails-reactive-polling" = dontDistribute super."keera-hails-reactive-polling"; "keera-hails-reactive-wx" = dontDistribute super."keera-hails-reactive-wx"; "keera-hails-reactive-yampa" = dontDistribute super."keera-hails-reactive-yampa"; + "keera-hails-reactivelenses" = dontDistribute super."keera-hails-reactivelenses"; "keera-hails-reactivevalues" = dontDistribute super."keera-hails-reactivevalues"; "keera-posture" = dontDistribute super."keera-posture"; "keiretsu" = dontDistribute super."keiretsu"; @@ -5063,6 +5091,8 @@ self: super: { "lat" = dontDistribute super."lat"; "latest-npm-version" = dontDistribute super."latest-npm-version"; "latex" = dontDistribute super."latex"; + "latex-formulae-image" = dontDistribute super."latex-formulae-image"; + "latex-formulae-pandoc" = dontDistribute super."latex-formulae-pandoc"; "lattices" = dontDistribute super."lattices"; "launchpad-control" = dontDistribute super."launchpad-control"; "lax" = dontDistribute super."lax"; @@ -5438,6 +5468,7 @@ self: super: { "memexml" = dontDistribute super."memexml"; "memo-ptr" = dontDistribute super."memo-ptr"; "memo-sqlite" = dontDistribute super."memo-sqlite"; + "memoization-utils" = dontDistribute super."memoization-utils"; "memoize" = dontDistribute super."memoize"; "memory" = dontDistribute super."memory"; "memscript" = dontDistribute super."memscript"; @@ -5886,6 +5917,7 @@ self: super: { "nthable" = dontDistribute super."nthable"; "ntp-control" = dontDistribute super."ntp-control"; "null-canvas" = dontDistribute super."null-canvas"; + "nullary" = dontDistribute super."nullary"; "number" = dontDistribute super."number"; "numbering" = dontDistribute super."numbering"; "numerals" = dontDistribute super."numerals"; @@ -6115,6 +6147,7 @@ self: super: { "pcg-random" = dontDistribute super."pcg-random"; "pcre-heavy" = dontDistribute super."pcre-heavy"; "pcre-less" = dontDistribute super."pcre-less"; + "pcre-light" = doDistribute super."pcre-light_0_4_0_3"; "pcre-light-extra" = dontDistribute super."pcre-light-extra"; "pcre-utils" = dontDistribute super."pcre-utils"; "pdf-toolbox-content" = dontDistribute super."pdf-toolbox-content"; @@ -6493,6 +6526,7 @@ self: super: { "qc-oi-testgenerator" = dontDistribute super."qc-oi-testgenerator"; "qd" = dontDistribute super."qd"; "qd-vec" = dontDistribute super."qd-vec"; + "qed" = dontDistribute super."qed"; "qhull-simple" = dontDistribute super."qhull-simple"; "qrcode" = dontDistribute super."qrcode"; "qt" = dontDistribute super."qt"; @@ -6508,6 +6542,7 @@ self: super: { "queue" = dontDistribute super."queue"; "queuelike" = dontDistribute super."queuelike"; "quick-generator" = dontDistribute super."quick-generator"; + "quick-schema" = dontDistribute super."quick-schema"; "quickcheck-assertions" = doDistribute super."quickcheck-assertions_0_1_1"; "quickcheck-instances" = doDistribute super."quickcheck-instances_0_3_9"; "quickcheck-io" = doDistribute super."quickcheck-io_0_1_1"; @@ -7015,6 +7050,7 @@ self: super: { "servant" = dontDistribute super."servant"; "servant-JuicyPixels" = dontDistribute super."servant-JuicyPixels"; "servant-blaze" = dontDistribute super."servant-blaze"; + "servant-cassava" = dontDistribute super."servant-cassava"; "servant-client" = dontDistribute super."servant-client"; "servant-docs" = dontDistribute super."servant-docs"; "servant-ede" = dontDistribute super."servant-ede"; @@ -7028,6 +7064,7 @@ self: super: { "servant-response" = dontDistribute super."servant-response"; "servant-scotty" = dontDistribute super."servant-scotty"; "servant-server" = dontDistribute super."servant-server"; + "servant-swagger" = dontDistribute super."servant-swagger"; "servant-yaml" = dontDistribute super."servant-yaml"; "serversession" = dontDistribute super."serversession"; "serversession-backend-acid-state" = dontDistribute super."serversession-backend-acid-state"; @@ -8233,6 +8270,7 @@ self: super: { "verdict" = dontDistribute super."verdict"; "verdict-json" = dontDistribute super."verdict-json"; "verilog" = dontDistribute super."verilog"; + "versions" = dontDistribute super."versions"; "vhdl" = dontDistribute super."vhdl"; "views" = dontDistribute super."views"; "vigilance" = dontDistribute super."vigilance"; @@ -8690,6 +8728,7 @@ self: super: { "zendesk-api" = dontDistribute super."zendesk-api"; "zeno" = dontDistribute super."zeno"; "zero" = dontDistribute super."zero"; + "zerobin" = dontDistribute super."zerobin"; "zeromq-haskell" = dontDistribute super."zeromq-haskell"; "zeromq3-conduit" = dontDistribute super."zeromq3-conduit"; "zeromq3-haskell" = dontDistribute super."zeromq3-haskell"; diff --git a/pkgs/development/haskell-modules/configuration-lts-0.4.nix b/pkgs/development/haskell-modules/configuration-lts-0.4.nix index 1e1c2dec4264..ebb6a54e6e2e 100644 --- a/pkgs/development/haskell-modules/configuration-lts-0.4.nix +++ b/pkgs/development/haskell-modules/configuration-lts-0.4.nix @@ -515,6 +515,7 @@ self: super: { "HasGP" = dontDistribute super."HasGP"; "Haschoo" = dontDistribute super."Haschoo"; "Hashell" = dontDistribute super."Hashell"; + "HaskRel" = dontDistribute super."HaskRel"; "HaskellForMaths" = dontDistribute super."HaskellForMaths"; "HaskellLM" = dontDistribute super."HaskellLM"; "HaskellNN" = dontDistribute super."HaskellNN"; @@ -561,6 +562,7 @@ self: super: { "Hsed" = dontDistribute super."Hsed"; "Hsmtlib" = dontDistribute super."Hsmtlib"; "HueAPI" = dontDistribute super."HueAPI"; + "HulkImport" = dontDistribute super."HulkImport"; "Hungarian-Munkres" = dontDistribute super."Hungarian-Munkres"; "IDynamic" = dontDistribute super."IDynamic"; "IFS" = dontDistribute super."IFS"; @@ -1168,6 +1170,7 @@ self: super: { "afis" = dontDistribute super."afis"; "afv" = dontDistribute super."afv"; "agda-server" = dontDistribute super."agda-server"; + "agda-snippets" = dontDistribute super."agda-snippets"; "agentx" = dontDistribute super."agentx"; "agum" = dontDistribute super."agum"; "aig" = dontDistribute super."aig"; @@ -2004,6 +2007,7 @@ self: super: { "cipher-aes" = doDistribute super."cipher-aes_0_2_9"; "cipher-aes128" = dontDistribute super."cipher-aes128"; "cipher-rc5" = dontDistribute super."cipher-rc5"; + "ciphersaber2" = dontDistribute super."ciphersaber2"; "circ" = dontDistribute super."circ"; "circle-packing" = doDistribute super."circle-packing_0_1_0_3"; "cirru-parser" = dontDistribute super."cirru-parser"; @@ -2470,6 +2474,7 @@ self: super: { "dataflow" = dontDistribute super."dataflow"; "datalog" = dontDistribute super."datalog"; "datapacker" = dontDistribute super."datapacker"; + "dataurl" = dontDistribute super."dataurl"; "date-cache" = dontDistribute super."date-cache"; "dates" = dontDistribute super."dates"; "datetime" = dontDistribute super."datetime"; @@ -2884,6 +2889,7 @@ self: super: { "eros-client" = dontDistribute super."eros-client"; "eros-http" = dontDistribute super."eros-http"; "errno" = dontDistribute super."errno"; + "error-analyze" = dontDistribute super."error-analyze"; "error-continuations" = dontDistribute super."error-continuations"; "error-list" = dontDistribute super."error-list"; "error-loc" = dontDistribute super."error-loc"; @@ -2938,6 +2944,7 @@ self: super: { "exinst-deepseq" = dontDistribute super."exinst-deepseq"; "exinst-hashable" = dontDistribute super."exinst-hashable"; "exists" = dontDistribute super."exists"; + "exit-codes" = dontDistribute super."exit-codes"; "exp-pairs" = dontDistribute super."exp-pairs"; "expand" = dontDistribute super."expand"; "expat-enumerator" = dontDistribute super."expat-enumerator"; @@ -3061,6 +3068,7 @@ self: super: { "fingertree-psqueue" = dontDistribute super."fingertree-psqueue"; "fingertree-tf" = dontDistribute super."fingertree-tf"; "finite-field" = dontDistribute super."finite-field"; + "finite-typelits" = dontDistribute super."finite-typelits"; "first-and-last" = dontDistribute super."first-and-last"; "first-class-patterns" = dontDistribute super."first-class-patterns"; "firstify" = dontDistribute super."firstify"; @@ -3352,6 +3360,20 @@ self: super: { "ghclive" = dontDistribute super."ghclive"; "ghczdecode" = dontDistribute super."ghczdecode"; "ght" = dontDistribute super."ght"; + "gi-atk" = dontDistribute super."gi-atk"; + "gi-cairo" = dontDistribute super."gi-cairo"; + "gi-gdk" = dontDistribute super."gi-gdk"; + "gi-gdkpixbuf" = dontDistribute super."gi-gdkpixbuf"; + "gi-gio" = dontDistribute super."gi-gio"; + "gi-glib" = dontDistribute super."gi-glib"; + "gi-gobject" = dontDistribute super."gi-gobject"; + "gi-gtk" = dontDistribute super."gi-gtk"; + "gi-javascriptcore" = dontDistribute super."gi-javascriptcore"; + "gi-notify" = dontDistribute super."gi-notify"; + "gi-pango" = dontDistribute super."gi-pango"; + "gi-soup" = dontDistribute super."gi-soup"; + "gi-vte" = dontDistribute super."gi-vte"; + "gi-webkit" = dontDistribute super."gi-webkit"; "gimlh" = dontDistribute super."gimlh"; "ginger" = dontDistribute super."ginger"; "ginsu" = dontDistribute super."ginsu"; @@ -3365,6 +3387,7 @@ self: super: { "git-embed" = dontDistribute super."git-embed"; "git-freq" = dontDistribute super."git-freq"; "git-gpush" = dontDistribute super."git-gpush"; + "git-jump" = dontDistribute super."git-jump"; "git-monitor" = dontDistribute super."git-monitor"; "git-object" = dontDistribute super."git-object"; "git-repair" = dontDistribute super."git-repair"; @@ -3852,6 +3875,8 @@ self: super: { "haskell-formatter" = dontDistribute super."haskell-formatter"; "haskell-ftp" = dontDistribute super."haskell-ftp"; "haskell-generate" = dontDistribute super."haskell-generate"; + "haskell-gi" = dontDistribute super."haskell-gi"; + "haskell-gi-base" = dontDistribute super."haskell-gi-base"; "haskell-import-graph" = dontDistribute super."haskell-import-graph"; "haskell-in-space" = dontDistribute super."haskell-in-space"; "haskell-modbus" = dontDistribute super."haskell-modbus"; @@ -4060,6 +4085,7 @@ self: super: { "hfd" = dontDistribute super."hfd"; "hfiar" = dontDistribute super."hfiar"; "hflags" = dontDistribute super."hflags"; + "hfmt" = dontDistribute super."hfmt"; "hfoil" = dontDistribute super."hfoil"; "hfov" = dontDistribute super."hfov"; "hfractal" = dontDistribute super."hfractal"; @@ -4483,6 +4509,7 @@ self: super: { "hsx2hs" = dontDistribute super."hsx2hs"; "hsyscall" = dontDistribute super."hsyscall"; "hszephyr" = dontDistribute super."hszephyr"; + "htaglib" = dontDistribute super."htaglib"; "htags" = dontDistribute super."htags"; "htar" = dontDistribute super."htar"; "htiled" = dontDistribute super."htiled"; @@ -4936,6 +4963,7 @@ self: super: { "keera-hails-reactive-polling" = dontDistribute super."keera-hails-reactive-polling"; "keera-hails-reactive-wx" = dontDistribute super."keera-hails-reactive-wx"; "keera-hails-reactive-yampa" = dontDistribute super."keera-hails-reactive-yampa"; + "keera-hails-reactivelenses" = dontDistribute super."keera-hails-reactivelenses"; "keera-hails-reactivevalues" = dontDistribute super."keera-hails-reactivevalues"; "keera-posture" = dontDistribute super."keera-posture"; "keiretsu" = dontDistribute super."keiretsu"; @@ -5060,6 +5088,8 @@ self: super: { "lat" = dontDistribute super."lat"; "latest-npm-version" = dontDistribute super."latest-npm-version"; "latex" = dontDistribute super."latex"; + "latex-formulae-image" = dontDistribute super."latex-formulae-image"; + "latex-formulae-pandoc" = dontDistribute super."latex-formulae-pandoc"; "lattices" = dontDistribute super."lattices"; "launchpad-control" = dontDistribute super."launchpad-control"; "lax" = dontDistribute super."lax"; @@ -5435,6 +5465,7 @@ self: super: { "memexml" = dontDistribute super."memexml"; "memo-ptr" = dontDistribute super."memo-ptr"; "memo-sqlite" = dontDistribute super."memo-sqlite"; + "memoization-utils" = dontDistribute super."memoization-utils"; "memoize" = dontDistribute super."memoize"; "memory" = dontDistribute super."memory"; "memscript" = dontDistribute super."memscript"; @@ -5883,6 +5914,7 @@ self: super: { "nthable" = dontDistribute super."nthable"; "ntp-control" = dontDistribute super."ntp-control"; "null-canvas" = dontDistribute super."null-canvas"; + "nullary" = dontDistribute super."nullary"; "number" = dontDistribute super."number"; "numbering" = dontDistribute super."numbering"; "numerals" = dontDistribute super."numerals"; @@ -6112,6 +6144,7 @@ self: super: { "pcg-random" = dontDistribute super."pcg-random"; "pcre-heavy" = dontDistribute super."pcre-heavy"; "pcre-less" = dontDistribute super."pcre-less"; + "pcre-light" = doDistribute super."pcre-light_0_4_0_3"; "pcre-light-extra" = dontDistribute super."pcre-light-extra"; "pcre-utils" = dontDistribute super."pcre-utils"; "pdf-toolbox-content" = dontDistribute super."pdf-toolbox-content"; @@ -6490,6 +6523,7 @@ self: super: { "qc-oi-testgenerator" = dontDistribute super."qc-oi-testgenerator"; "qd" = dontDistribute super."qd"; "qd-vec" = dontDistribute super."qd-vec"; + "qed" = dontDistribute super."qed"; "qhull-simple" = dontDistribute super."qhull-simple"; "qrcode" = dontDistribute super."qrcode"; "qt" = dontDistribute super."qt"; @@ -6505,6 +6539,7 @@ self: super: { "queue" = dontDistribute super."queue"; "queuelike" = dontDistribute super."queuelike"; "quick-generator" = dontDistribute super."quick-generator"; + "quick-schema" = dontDistribute super."quick-schema"; "quickcheck-assertions" = doDistribute super."quickcheck-assertions_0_1_1"; "quickcheck-instances" = doDistribute super."quickcheck-instances_0_3_9"; "quickcheck-io" = doDistribute super."quickcheck-io_0_1_1"; @@ -7011,6 +7046,7 @@ self: super: { "servant" = dontDistribute super."servant"; "servant-JuicyPixels" = dontDistribute super."servant-JuicyPixels"; "servant-blaze" = dontDistribute super."servant-blaze"; + "servant-cassava" = dontDistribute super."servant-cassava"; "servant-client" = dontDistribute super."servant-client"; "servant-docs" = dontDistribute super."servant-docs"; "servant-ede" = dontDistribute super."servant-ede"; @@ -7024,6 +7060,7 @@ self: super: { "servant-response" = dontDistribute super."servant-response"; "servant-scotty" = dontDistribute super."servant-scotty"; "servant-server" = dontDistribute super."servant-server"; + "servant-swagger" = dontDistribute super."servant-swagger"; "servant-yaml" = dontDistribute super."servant-yaml"; "serversession" = dontDistribute super."serversession"; "serversession-backend-acid-state" = dontDistribute super."serversession-backend-acid-state"; @@ -8228,6 +8265,7 @@ self: super: { "verdict" = dontDistribute super."verdict"; "verdict-json" = dontDistribute super."verdict-json"; "verilog" = dontDistribute super."verilog"; + "versions" = dontDistribute super."versions"; "vhdl" = dontDistribute super."vhdl"; "views" = dontDistribute super."views"; "vigilance" = dontDistribute super."vigilance"; @@ -8685,6 +8723,7 @@ self: super: { "zendesk-api" = dontDistribute super."zendesk-api"; "zeno" = dontDistribute super."zeno"; "zero" = dontDistribute super."zero"; + "zerobin" = dontDistribute super."zerobin"; "zeromq-haskell" = dontDistribute super."zeromq-haskell"; "zeromq3-conduit" = dontDistribute super."zeromq3-conduit"; "zeromq3-haskell" = dontDistribute super."zeromq3-haskell"; diff --git a/pkgs/development/haskell-modules/configuration-lts-0.5.nix b/pkgs/development/haskell-modules/configuration-lts-0.5.nix index 53b0cdc1c4c1..1cd799a59ca9 100644 --- a/pkgs/development/haskell-modules/configuration-lts-0.5.nix +++ b/pkgs/development/haskell-modules/configuration-lts-0.5.nix @@ -515,6 +515,7 @@ self: super: { "HasGP" = dontDistribute super."HasGP"; "Haschoo" = dontDistribute super."Haschoo"; "Hashell" = dontDistribute super."Hashell"; + "HaskRel" = dontDistribute super."HaskRel"; "HaskellForMaths" = dontDistribute super."HaskellForMaths"; "HaskellLM" = dontDistribute super."HaskellLM"; "HaskellNN" = dontDistribute super."HaskellNN"; @@ -561,6 +562,7 @@ self: super: { "Hsed" = dontDistribute super."Hsed"; "Hsmtlib" = dontDistribute super."Hsmtlib"; "HueAPI" = dontDistribute super."HueAPI"; + "HulkImport" = dontDistribute super."HulkImport"; "Hungarian-Munkres" = dontDistribute super."Hungarian-Munkres"; "IDynamic" = dontDistribute super."IDynamic"; "IFS" = dontDistribute super."IFS"; @@ -1168,6 +1170,7 @@ self: super: { "afis" = dontDistribute super."afis"; "afv" = dontDistribute super."afv"; "agda-server" = dontDistribute super."agda-server"; + "agda-snippets" = dontDistribute super."agda-snippets"; "agentx" = dontDistribute super."agentx"; "agum" = dontDistribute super."agum"; "aig" = dontDistribute super."aig"; @@ -2004,6 +2007,7 @@ self: super: { "cipher-aes" = doDistribute super."cipher-aes_0_2_9"; "cipher-aes128" = dontDistribute super."cipher-aes128"; "cipher-rc5" = dontDistribute super."cipher-rc5"; + "ciphersaber2" = dontDistribute super."ciphersaber2"; "circ" = dontDistribute super."circ"; "circle-packing" = doDistribute super."circle-packing_0_1_0_3"; "cirru-parser" = dontDistribute super."cirru-parser"; @@ -2470,6 +2474,7 @@ self: super: { "dataflow" = dontDistribute super."dataflow"; "datalog" = dontDistribute super."datalog"; "datapacker" = dontDistribute super."datapacker"; + "dataurl" = dontDistribute super."dataurl"; "date-cache" = dontDistribute super."date-cache"; "dates" = dontDistribute super."dates"; "datetime" = dontDistribute super."datetime"; @@ -2884,6 +2889,7 @@ self: super: { "eros-client" = dontDistribute super."eros-client"; "eros-http" = dontDistribute super."eros-http"; "errno" = dontDistribute super."errno"; + "error-analyze" = dontDistribute super."error-analyze"; "error-continuations" = dontDistribute super."error-continuations"; "error-list" = dontDistribute super."error-list"; "error-loc" = dontDistribute super."error-loc"; @@ -2938,6 +2944,7 @@ self: super: { "exinst-deepseq" = dontDistribute super."exinst-deepseq"; "exinst-hashable" = dontDistribute super."exinst-hashable"; "exists" = dontDistribute super."exists"; + "exit-codes" = dontDistribute super."exit-codes"; "exp-pairs" = dontDistribute super."exp-pairs"; "expand" = dontDistribute super."expand"; "expat-enumerator" = dontDistribute super."expat-enumerator"; @@ -3061,6 +3068,7 @@ self: super: { "fingertree-psqueue" = dontDistribute super."fingertree-psqueue"; "fingertree-tf" = dontDistribute super."fingertree-tf"; "finite-field" = dontDistribute super."finite-field"; + "finite-typelits" = dontDistribute super."finite-typelits"; "first-and-last" = dontDistribute super."first-and-last"; "first-class-patterns" = dontDistribute super."first-class-patterns"; "firstify" = dontDistribute super."firstify"; @@ -3352,6 +3360,20 @@ self: super: { "ghclive" = dontDistribute super."ghclive"; "ghczdecode" = dontDistribute super."ghczdecode"; "ght" = dontDistribute super."ght"; + "gi-atk" = dontDistribute super."gi-atk"; + "gi-cairo" = dontDistribute super."gi-cairo"; + "gi-gdk" = dontDistribute super."gi-gdk"; + "gi-gdkpixbuf" = dontDistribute super."gi-gdkpixbuf"; + "gi-gio" = dontDistribute super."gi-gio"; + "gi-glib" = dontDistribute super."gi-glib"; + "gi-gobject" = dontDistribute super."gi-gobject"; + "gi-gtk" = dontDistribute super."gi-gtk"; + "gi-javascriptcore" = dontDistribute super."gi-javascriptcore"; + "gi-notify" = dontDistribute super."gi-notify"; + "gi-pango" = dontDistribute super."gi-pango"; + "gi-soup" = dontDistribute super."gi-soup"; + "gi-vte" = dontDistribute super."gi-vte"; + "gi-webkit" = dontDistribute super."gi-webkit"; "gimlh" = dontDistribute super."gimlh"; "ginger" = dontDistribute super."ginger"; "ginsu" = dontDistribute super."ginsu"; @@ -3365,6 +3387,7 @@ self: super: { "git-embed" = dontDistribute super."git-embed"; "git-freq" = dontDistribute super."git-freq"; "git-gpush" = dontDistribute super."git-gpush"; + "git-jump" = dontDistribute super."git-jump"; "git-monitor" = dontDistribute super."git-monitor"; "git-object" = dontDistribute super."git-object"; "git-repair" = dontDistribute super."git-repair"; @@ -3852,6 +3875,8 @@ self: super: { "haskell-formatter" = dontDistribute super."haskell-formatter"; "haskell-ftp" = dontDistribute super."haskell-ftp"; "haskell-generate" = dontDistribute super."haskell-generate"; + "haskell-gi" = dontDistribute super."haskell-gi"; + "haskell-gi-base" = dontDistribute super."haskell-gi-base"; "haskell-import-graph" = dontDistribute super."haskell-import-graph"; "haskell-in-space" = dontDistribute super."haskell-in-space"; "haskell-modbus" = dontDistribute super."haskell-modbus"; @@ -4060,6 +4085,7 @@ self: super: { "hfd" = dontDistribute super."hfd"; "hfiar" = dontDistribute super."hfiar"; "hflags" = dontDistribute super."hflags"; + "hfmt" = dontDistribute super."hfmt"; "hfoil" = dontDistribute super."hfoil"; "hfov" = dontDistribute super."hfov"; "hfractal" = dontDistribute super."hfractal"; @@ -4483,6 +4509,7 @@ self: super: { "hsx2hs" = dontDistribute super."hsx2hs"; "hsyscall" = dontDistribute super."hsyscall"; "hszephyr" = dontDistribute super."hszephyr"; + "htaglib" = dontDistribute super."htaglib"; "htags" = dontDistribute super."htags"; "htar" = dontDistribute super."htar"; "htiled" = dontDistribute super."htiled"; @@ -4936,6 +4963,7 @@ self: super: { "keera-hails-reactive-polling" = dontDistribute super."keera-hails-reactive-polling"; "keera-hails-reactive-wx" = dontDistribute super."keera-hails-reactive-wx"; "keera-hails-reactive-yampa" = dontDistribute super."keera-hails-reactive-yampa"; + "keera-hails-reactivelenses" = dontDistribute super."keera-hails-reactivelenses"; "keera-hails-reactivevalues" = dontDistribute super."keera-hails-reactivevalues"; "keera-posture" = dontDistribute super."keera-posture"; "keiretsu" = dontDistribute super."keiretsu"; @@ -5060,6 +5088,8 @@ self: super: { "lat" = dontDistribute super."lat"; "latest-npm-version" = dontDistribute super."latest-npm-version"; "latex" = dontDistribute super."latex"; + "latex-formulae-image" = dontDistribute super."latex-formulae-image"; + "latex-formulae-pandoc" = dontDistribute super."latex-formulae-pandoc"; "lattices" = dontDistribute super."lattices"; "launchpad-control" = dontDistribute super."launchpad-control"; "lax" = dontDistribute super."lax"; @@ -5435,6 +5465,7 @@ self: super: { "memexml" = dontDistribute super."memexml"; "memo-ptr" = dontDistribute super."memo-ptr"; "memo-sqlite" = dontDistribute super."memo-sqlite"; + "memoization-utils" = dontDistribute super."memoization-utils"; "memoize" = dontDistribute super."memoize"; "memory" = dontDistribute super."memory"; "memscript" = dontDistribute super."memscript"; @@ -5883,6 +5914,7 @@ self: super: { "nthable" = dontDistribute super."nthable"; "ntp-control" = dontDistribute super."ntp-control"; "null-canvas" = dontDistribute super."null-canvas"; + "nullary" = dontDistribute super."nullary"; "number" = dontDistribute super."number"; "numbering" = dontDistribute super."numbering"; "numerals" = dontDistribute super."numerals"; @@ -6112,6 +6144,7 @@ self: super: { "pcg-random" = dontDistribute super."pcg-random"; "pcre-heavy" = dontDistribute super."pcre-heavy"; "pcre-less" = dontDistribute super."pcre-less"; + "pcre-light" = doDistribute super."pcre-light_0_4_0_3"; "pcre-light-extra" = dontDistribute super."pcre-light-extra"; "pcre-utils" = dontDistribute super."pcre-utils"; "pdf-toolbox-content" = dontDistribute super."pdf-toolbox-content"; @@ -6490,6 +6523,7 @@ self: super: { "qc-oi-testgenerator" = dontDistribute super."qc-oi-testgenerator"; "qd" = dontDistribute super."qd"; "qd-vec" = dontDistribute super."qd-vec"; + "qed" = dontDistribute super."qed"; "qhull-simple" = dontDistribute super."qhull-simple"; "qrcode" = dontDistribute super."qrcode"; "qt" = dontDistribute super."qt"; @@ -6505,6 +6539,7 @@ self: super: { "queue" = dontDistribute super."queue"; "queuelike" = dontDistribute super."queuelike"; "quick-generator" = dontDistribute super."quick-generator"; + "quick-schema" = dontDistribute super."quick-schema"; "quickcheck-assertions" = doDistribute super."quickcheck-assertions_0_1_1"; "quickcheck-instances" = doDistribute super."quickcheck-instances_0_3_9"; "quickcheck-io" = doDistribute super."quickcheck-io_0_1_1"; @@ -7011,6 +7046,7 @@ self: super: { "servant" = dontDistribute super."servant"; "servant-JuicyPixels" = dontDistribute super."servant-JuicyPixels"; "servant-blaze" = dontDistribute super."servant-blaze"; + "servant-cassava" = dontDistribute super."servant-cassava"; "servant-client" = dontDistribute super."servant-client"; "servant-docs" = dontDistribute super."servant-docs"; "servant-ede" = dontDistribute super."servant-ede"; @@ -7024,6 +7060,7 @@ self: super: { "servant-response" = dontDistribute super."servant-response"; "servant-scotty" = dontDistribute super."servant-scotty"; "servant-server" = dontDistribute super."servant-server"; + "servant-swagger" = dontDistribute super."servant-swagger"; "servant-yaml" = dontDistribute super."servant-yaml"; "serversession" = dontDistribute super."serversession"; "serversession-backend-acid-state" = dontDistribute super."serversession-backend-acid-state"; @@ -8227,6 +8264,7 @@ self: super: { "verdict" = dontDistribute super."verdict"; "verdict-json" = dontDistribute super."verdict-json"; "verilog" = dontDistribute super."verilog"; + "versions" = dontDistribute super."versions"; "vhdl" = dontDistribute super."vhdl"; "views" = dontDistribute super."views"; "vigilance" = dontDistribute super."vigilance"; @@ -8684,6 +8722,7 @@ self: super: { "zendesk-api" = dontDistribute super."zendesk-api"; "zeno" = dontDistribute super."zeno"; "zero" = dontDistribute super."zero"; + "zerobin" = dontDistribute super."zerobin"; "zeromq-haskell" = dontDistribute super."zeromq-haskell"; "zeromq3-conduit" = dontDistribute super."zeromq3-conduit"; "zeromq3-haskell" = dontDistribute super."zeromq3-haskell"; diff --git a/pkgs/development/haskell-modules/configuration-lts-0.6.nix b/pkgs/development/haskell-modules/configuration-lts-0.6.nix index 924a2d52df59..18fe8c45a895 100644 --- a/pkgs/development/haskell-modules/configuration-lts-0.6.nix +++ b/pkgs/development/haskell-modules/configuration-lts-0.6.nix @@ -515,6 +515,7 @@ self: super: { "HasGP" = dontDistribute super."HasGP"; "Haschoo" = dontDistribute super."Haschoo"; "Hashell" = dontDistribute super."Hashell"; + "HaskRel" = dontDistribute super."HaskRel"; "HaskellForMaths" = dontDistribute super."HaskellForMaths"; "HaskellLM" = dontDistribute super."HaskellLM"; "HaskellNN" = dontDistribute super."HaskellNN"; @@ -561,6 +562,7 @@ self: super: { "Hsed" = dontDistribute super."Hsed"; "Hsmtlib" = dontDistribute super."Hsmtlib"; "HueAPI" = dontDistribute super."HueAPI"; + "HulkImport" = dontDistribute super."HulkImport"; "Hungarian-Munkres" = dontDistribute super."Hungarian-Munkres"; "IDynamic" = dontDistribute super."IDynamic"; "IFS" = dontDistribute super."IFS"; @@ -1167,6 +1169,7 @@ self: super: { "afis" = dontDistribute super."afis"; "afv" = dontDistribute super."afv"; "agda-server" = dontDistribute super."agda-server"; + "agda-snippets" = dontDistribute super."agda-snippets"; "agentx" = dontDistribute super."agentx"; "agum" = dontDistribute super."agum"; "aig" = dontDistribute super."aig"; @@ -2001,6 +2004,7 @@ self: super: { "cipher-aes" = doDistribute super."cipher-aes_0_2_9"; "cipher-aes128" = dontDistribute super."cipher-aes128"; "cipher-rc5" = dontDistribute super."cipher-rc5"; + "ciphersaber2" = dontDistribute super."ciphersaber2"; "circ" = dontDistribute super."circ"; "circle-packing" = doDistribute super."circle-packing_0_1_0_3"; "cirru-parser" = dontDistribute super."cirru-parser"; @@ -2467,6 +2471,7 @@ self: super: { "dataflow" = dontDistribute super."dataflow"; "datalog" = dontDistribute super."datalog"; "datapacker" = dontDistribute super."datapacker"; + "dataurl" = dontDistribute super."dataurl"; "date-cache" = dontDistribute super."date-cache"; "dates" = dontDistribute super."dates"; "datetime" = dontDistribute super."datetime"; @@ -2881,6 +2886,7 @@ self: super: { "eros-client" = dontDistribute super."eros-client"; "eros-http" = dontDistribute super."eros-http"; "errno" = dontDistribute super."errno"; + "error-analyze" = dontDistribute super."error-analyze"; "error-continuations" = dontDistribute super."error-continuations"; "error-list" = dontDistribute super."error-list"; "error-loc" = dontDistribute super."error-loc"; @@ -2935,6 +2941,7 @@ self: super: { "exinst-deepseq" = dontDistribute super."exinst-deepseq"; "exinst-hashable" = dontDistribute super."exinst-hashable"; "exists" = dontDistribute super."exists"; + "exit-codes" = dontDistribute super."exit-codes"; "exp-pairs" = dontDistribute super."exp-pairs"; "expand" = dontDistribute super."expand"; "expat-enumerator" = dontDistribute super."expat-enumerator"; @@ -3058,6 +3065,7 @@ self: super: { "fingertree-psqueue" = dontDistribute super."fingertree-psqueue"; "fingertree-tf" = dontDistribute super."fingertree-tf"; "finite-field" = dontDistribute super."finite-field"; + "finite-typelits" = dontDistribute super."finite-typelits"; "first-and-last" = dontDistribute super."first-and-last"; "first-class-patterns" = dontDistribute super."first-class-patterns"; "firstify" = dontDistribute super."firstify"; @@ -3349,6 +3357,20 @@ self: super: { "ghclive" = dontDistribute super."ghclive"; "ghczdecode" = dontDistribute super."ghczdecode"; "ght" = dontDistribute super."ght"; + "gi-atk" = dontDistribute super."gi-atk"; + "gi-cairo" = dontDistribute super."gi-cairo"; + "gi-gdk" = dontDistribute super."gi-gdk"; + "gi-gdkpixbuf" = dontDistribute super."gi-gdkpixbuf"; + "gi-gio" = dontDistribute super."gi-gio"; + "gi-glib" = dontDistribute super."gi-glib"; + "gi-gobject" = dontDistribute super."gi-gobject"; + "gi-gtk" = dontDistribute super."gi-gtk"; + "gi-javascriptcore" = dontDistribute super."gi-javascriptcore"; + "gi-notify" = dontDistribute super."gi-notify"; + "gi-pango" = dontDistribute super."gi-pango"; + "gi-soup" = dontDistribute super."gi-soup"; + "gi-vte" = dontDistribute super."gi-vte"; + "gi-webkit" = dontDistribute super."gi-webkit"; "gimlh" = dontDistribute super."gimlh"; "ginger" = dontDistribute super."ginger"; "ginsu" = dontDistribute super."ginsu"; @@ -3362,6 +3384,7 @@ self: super: { "git-embed" = dontDistribute super."git-embed"; "git-freq" = dontDistribute super."git-freq"; "git-gpush" = dontDistribute super."git-gpush"; + "git-jump" = dontDistribute super."git-jump"; "git-monitor" = dontDistribute super."git-monitor"; "git-object" = dontDistribute super."git-object"; "git-repair" = dontDistribute super."git-repair"; @@ -3849,6 +3872,8 @@ self: super: { "haskell-formatter" = dontDistribute super."haskell-formatter"; "haskell-ftp" = dontDistribute super."haskell-ftp"; "haskell-generate" = dontDistribute super."haskell-generate"; + "haskell-gi" = dontDistribute super."haskell-gi"; + "haskell-gi-base" = dontDistribute super."haskell-gi-base"; "haskell-import-graph" = dontDistribute super."haskell-import-graph"; "haskell-in-space" = dontDistribute super."haskell-in-space"; "haskell-modbus" = dontDistribute super."haskell-modbus"; @@ -4056,6 +4081,7 @@ self: super: { "hfd" = dontDistribute super."hfd"; "hfiar" = dontDistribute super."hfiar"; "hflags" = dontDistribute super."hflags"; + "hfmt" = dontDistribute super."hfmt"; "hfoil" = dontDistribute super."hfoil"; "hfov" = dontDistribute super."hfov"; "hfractal" = dontDistribute super."hfractal"; @@ -4479,6 +4505,7 @@ self: super: { "hsx2hs" = dontDistribute super."hsx2hs"; "hsyscall" = dontDistribute super."hsyscall"; "hszephyr" = dontDistribute super."hszephyr"; + "htaglib" = dontDistribute super."htaglib"; "htags" = dontDistribute super."htags"; "htar" = dontDistribute super."htar"; "htiled" = dontDistribute super."htiled"; @@ -4932,6 +4959,7 @@ self: super: { "keera-hails-reactive-polling" = dontDistribute super."keera-hails-reactive-polling"; "keera-hails-reactive-wx" = dontDistribute super."keera-hails-reactive-wx"; "keera-hails-reactive-yampa" = dontDistribute super."keera-hails-reactive-yampa"; + "keera-hails-reactivelenses" = dontDistribute super."keera-hails-reactivelenses"; "keera-hails-reactivevalues" = dontDistribute super."keera-hails-reactivevalues"; "keera-posture" = dontDistribute super."keera-posture"; "keiretsu" = dontDistribute super."keiretsu"; @@ -5056,6 +5084,8 @@ self: super: { "lat" = dontDistribute super."lat"; "latest-npm-version" = dontDistribute super."latest-npm-version"; "latex" = dontDistribute super."latex"; + "latex-formulae-image" = dontDistribute super."latex-formulae-image"; + "latex-formulae-pandoc" = dontDistribute super."latex-formulae-pandoc"; "lattices" = dontDistribute super."lattices"; "launchpad-control" = dontDistribute super."launchpad-control"; "lax" = dontDistribute super."lax"; @@ -5431,6 +5461,7 @@ self: super: { "memexml" = dontDistribute super."memexml"; "memo-ptr" = dontDistribute super."memo-ptr"; "memo-sqlite" = dontDistribute super."memo-sqlite"; + "memoization-utils" = dontDistribute super."memoization-utils"; "memoize" = dontDistribute super."memoize"; "memory" = dontDistribute super."memory"; "memscript" = dontDistribute super."memscript"; @@ -5878,6 +5909,7 @@ self: super: { "nthable" = dontDistribute super."nthable"; "ntp-control" = dontDistribute super."ntp-control"; "null-canvas" = dontDistribute super."null-canvas"; + "nullary" = dontDistribute super."nullary"; "number" = dontDistribute super."number"; "numbering" = dontDistribute super."numbering"; "numerals" = dontDistribute super."numerals"; @@ -6107,6 +6139,7 @@ self: super: { "pcg-random" = dontDistribute super."pcg-random"; "pcre-heavy" = dontDistribute super."pcre-heavy"; "pcre-less" = dontDistribute super."pcre-less"; + "pcre-light" = doDistribute super."pcre-light_0_4_0_3"; "pcre-light-extra" = dontDistribute super."pcre-light-extra"; "pcre-utils" = dontDistribute super."pcre-utils"; "pdf-toolbox-content" = dontDistribute super."pdf-toolbox-content"; @@ -6485,6 +6518,7 @@ self: super: { "qc-oi-testgenerator" = dontDistribute super."qc-oi-testgenerator"; "qd" = dontDistribute super."qd"; "qd-vec" = dontDistribute super."qd-vec"; + "qed" = dontDistribute super."qed"; "qhull-simple" = dontDistribute super."qhull-simple"; "qrcode" = dontDistribute super."qrcode"; "qt" = dontDistribute super."qt"; @@ -6500,6 +6534,7 @@ self: super: { "queue" = dontDistribute super."queue"; "queuelike" = dontDistribute super."queuelike"; "quick-generator" = dontDistribute super."quick-generator"; + "quick-schema" = dontDistribute super."quick-schema"; "quickcheck-assertions" = doDistribute super."quickcheck-assertions_0_1_1"; "quickcheck-instances" = doDistribute super."quickcheck-instances_0_3_10"; "quickcheck-io" = doDistribute super."quickcheck-io_0_1_1"; @@ -7005,6 +7040,7 @@ self: super: { "servant" = dontDistribute super."servant"; "servant-JuicyPixels" = dontDistribute super."servant-JuicyPixels"; "servant-blaze" = dontDistribute super."servant-blaze"; + "servant-cassava" = dontDistribute super."servant-cassava"; "servant-client" = dontDistribute super."servant-client"; "servant-docs" = dontDistribute super."servant-docs"; "servant-ede" = dontDistribute super."servant-ede"; @@ -7018,6 +7054,7 @@ self: super: { "servant-response" = dontDistribute super."servant-response"; "servant-scotty" = dontDistribute super."servant-scotty"; "servant-server" = dontDistribute super."servant-server"; + "servant-swagger" = dontDistribute super."servant-swagger"; "servant-yaml" = dontDistribute super."servant-yaml"; "serversession" = dontDistribute super."serversession"; "serversession-backend-acid-state" = dontDistribute super."serversession-backend-acid-state"; @@ -8221,6 +8258,7 @@ self: super: { "verdict" = dontDistribute super."verdict"; "verdict-json" = dontDistribute super."verdict-json"; "verilog" = dontDistribute super."verilog"; + "versions" = dontDistribute super."versions"; "vhdl" = dontDistribute super."vhdl"; "views" = dontDistribute super."views"; "vigilance" = dontDistribute super."vigilance"; @@ -8674,6 +8712,7 @@ self: super: { "zendesk-api" = dontDistribute super."zendesk-api"; "zeno" = dontDistribute super."zeno"; "zero" = dontDistribute super."zero"; + "zerobin" = dontDistribute super."zerobin"; "zeromq-haskell" = dontDistribute super."zeromq-haskell"; "zeromq3-conduit" = dontDistribute super."zeromq3-conduit"; "zeromq3-haskell" = dontDistribute super."zeromq3-haskell"; diff --git a/pkgs/development/haskell-modules/configuration-lts-0.7.nix b/pkgs/development/haskell-modules/configuration-lts-0.7.nix index aa69451ffbc5..de2ee9bd08b7 100644 --- a/pkgs/development/haskell-modules/configuration-lts-0.7.nix +++ b/pkgs/development/haskell-modules/configuration-lts-0.7.nix @@ -515,6 +515,7 @@ self: super: { "HasGP" = dontDistribute super."HasGP"; "Haschoo" = dontDistribute super."Haschoo"; "Hashell" = dontDistribute super."Hashell"; + "HaskRel" = dontDistribute super."HaskRel"; "HaskellForMaths" = dontDistribute super."HaskellForMaths"; "HaskellLM" = dontDistribute super."HaskellLM"; "HaskellNN" = dontDistribute super."HaskellNN"; @@ -561,6 +562,7 @@ self: super: { "Hsed" = dontDistribute super."Hsed"; "Hsmtlib" = dontDistribute super."Hsmtlib"; "HueAPI" = dontDistribute super."HueAPI"; + "HulkImport" = dontDistribute super."HulkImport"; "Hungarian-Munkres" = dontDistribute super."Hungarian-Munkres"; "IDynamic" = dontDistribute super."IDynamic"; "IFS" = dontDistribute super."IFS"; @@ -1167,6 +1169,7 @@ self: super: { "afis" = dontDistribute super."afis"; "afv" = dontDistribute super."afv"; "agda-server" = dontDistribute super."agda-server"; + "agda-snippets" = dontDistribute super."agda-snippets"; "agentx" = dontDistribute super."agentx"; "agum" = dontDistribute super."agum"; "aig" = dontDistribute super."aig"; @@ -2001,6 +2004,7 @@ self: super: { "cipher-aes" = doDistribute super."cipher-aes_0_2_9"; "cipher-aes128" = dontDistribute super."cipher-aes128"; "cipher-rc5" = dontDistribute super."cipher-rc5"; + "ciphersaber2" = dontDistribute super."ciphersaber2"; "circ" = dontDistribute super."circ"; "circle-packing" = doDistribute super."circle-packing_0_1_0_3"; "cirru-parser" = dontDistribute super."cirru-parser"; @@ -2467,6 +2471,7 @@ self: super: { "dataflow" = dontDistribute super."dataflow"; "datalog" = dontDistribute super."datalog"; "datapacker" = dontDistribute super."datapacker"; + "dataurl" = dontDistribute super."dataurl"; "date-cache" = dontDistribute super."date-cache"; "dates" = dontDistribute super."dates"; "datetime" = dontDistribute super."datetime"; @@ -2881,6 +2886,7 @@ self: super: { "eros-client" = dontDistribute super."eros-client"; "eros-http" = dontDistribute super."eros-http"; "errno" = dontDistribute super."errno"; + "error-analyze" = dontDistribute super."error-analyze"; "error-continuations" = dontDistribute super."error-continuations"; "error-list" = dontDistribute super."error-list"; "error-loc" = dontDistribute super."error-loc"; @@ -2935,6 +2941,7 @@ self: super: { "exinst-deepseq" = dontDistribute super."exinst-deepseq"; "exinst-hashable" = dontDistribute super."exinst-hashable"; "exists" = dontDistribute super."exists"; + "exit-codes" = dontDistribute super."exit-codes"; "exp-pairs" = dontDistribute super."exp-pairs"; "expand" = dontDistribute super."expand"; "expat-enumerator" = dontDistribute super."expat-enumerator"; @@ -3058,6 +3065,7 @@ self: super: { "fingertree-psqueue" = dontDistribute super."fingertree-psqueue"; "fingertree-tf" = dontDistribute super."fingertree-tf"; "finite-field" = dontDistribute super."finite-field"; + "finite-typelits" = dontDistribute super."finite-typelits"; "first-and-last" = dontDistribute super."first-and-last"; "first-class-patterns" = dontDistribute super."first-class-patterns"; "firstify" = dontDistribute super."firstify"; @@ -3349,6 +3357,20 @@ self: super: { "ghclive" = dontDistribute super."ghclive"; "ghczdecode" = dontDistribute super."ghczdecode"; "ght" = dontDistribute super."ght"; + "gi-atk" = dontDistribute super."gi-atk"; + "gi-cairo" = dontDistribute super."gi-cairo"; + "gi-gdk" = dontDistribute super."gi-gdk"; + "gi-gdkpixbuf" = dontDistribute super."gi-gdkpixbuf"; + "gi-gio" = dontDistribute super."gi-gio"; + "gi-glib" = dontDistribute super."gi-glib"; + "gi-gobject" = dontDistribute super."gi-gobject"; + "gi-gtk" = dontDistribute super."gi-gtk"; + "gi-javascriptcore" = dontDistribute super."gi-javascriptcore"; + "gi-notify" = dontDistribute super."gi-notify"; + "gi-pango" = dontDistribute super."gi-pango"; + "gi-soup" = dontDistribute super."gi-soup"; + "gi-vte" = dontDistribute super."gi-vte"; + "gi-webkit" = dontDistribute super."gi-webkit"; "gimlh" = dontDistribute super."gimlh"; "ginger" = dontDistribute super."ginger"; "ginsu" = dontDistribute super."ginsu"; @@ -3362,6 +3384,7 @@ self: super: { "git-embed" = dontDistribute super."git-embed"; "git-freq" = dontDistribute super."git-freq"; "git-gpush" = dontDistribute super."git-gpush"; + "git-jump" = dontDistribute super."git-jump"; "git-monitor" = dontDistribute super."git-monitor"; "git-object" = dontDistribute super."git-object"; "git-repair" = dontDistribute super."git-repair"; @@ -3849,6 +3872,8 @@ self: super: { "haskell-formatter" = dontDistribute super."haskell-formatter"; "haskell-ftp" = dontDistribute super."haskell-ftp"; "haskell-generate" = dontDistribute super."haskell-generate"; + "haskell-gi" = dontDistribute super."haskell-gi"; + "haskell-gi-base" = dontDistribute super."haskell-gi-base"; "haskell-import-graph" = dontDistribute super."haskell-import-graph"; "haskell-in-space" = dontDistribute super."haskell-in-space"; "haskell-modbus" = dontDistribute super."haskell-modbus"; @@ -4056,6 +4081,7 @@ self: super: { "hfd" = dontDistribute super."hfd"; "hfiar" = dontDistribute super."hfiar"; "hflags" = dontDistribute super."hflags"; + "hfmt" = dontDistribute super."hfmt"; "hfoil" = dontDistribute super."hfoil"; "hfov" = dontDistribute super."hfov"; "hfractal" = dontDistribute super."hfractal"; @@ -4479,6 +4505,7 @@ self: super: { "hsx2hs" = dontDistribute super."hsx2hs"; "hsyscall" = dontDistribute super."hsyscall"; "hszephyr" = dontDistribute super."hszephyr"; + "htaglib" = dontDistribute super."htaglib"; "htags" = dontDistribute super."htags"; "htar" = dontDistribute super."htar"; "htiled" = dontDistribute super."htiled"; @@ -4932,6 +4959,7 @@ self: super: { "keera-hails-reactive-polling" = dontDistribute super."keera-hails-reactive-polling"; "keera-hails-reactive-wx" = dontDistribute super."keera-hails-reactive-wx"; "keera-hails-reactive-yampa" = dontDistribute super."keera-hails-reactive-yampa"; + "keera-hails-reactivelenses" = dontDistribute super."keera-hails-reactivelenses"; "keera-hails-reactivevalues" = dontDistribute super."keera-hails-reactivevalues"; "keera-posture" = dontDistribute super."keera-posture"; "keiretsu" = dontDistribute super."keiretsu"; @@ -5056,6 +5084,8 @@ self: super: { "lat" = dontDistribute super."lat"; "latest-npm-version" = dontDistribute super."latest-npm-version"; "latex" = dontDistribute super."latex"; + "latex-formulae-image" = dontDistribute super."latex-formulae-image"; + "latex-formulae-pandoc" = dontDistribute super."latex-formulae-pandoc"; "lattices" = dontDistribute super."lattices"; "launchpad-control" = dontDistribute super."launchpad-control"; "lax" = dontDistribute super."lax"; @@ -5431,6 +5461,7 @@ self: super: { "memexml" = dontDistribute super."memexml"; "memo-ptr" = dontDistribute super."memo-ptr"; "memo-sqlite" = dontDistribute super."memo-sqlite"; + "memoization-utils" = dontDistribute super."memoization-utils"; "memoize" = dontDistribute super."memoize"; "memory" = dontDistribute super."memory"; "memscript" = dontDistribute super."memscript"; @@ -5878,6 +5909,7 @@ self: super: { "nthable" = dontDistribute super."nthable"; "ntp-control" = dontDistribute super."ntp-control"; "null-canvas" = dontDistribute super."null-canvas"; + "nullary" = dontDistribute super."nullary"; "number" = dontDistribute super."number"; "numbering" = dontDistribute super."numbering"; "numerals" = dontDistribute super."numerals"; @@ -6107,6 +6139,7 @@ self: super: { "pcg-random" = dontDistribute super."pcg-random"; "pcre-heavy" = dontDistribute super."pcre-heavy"; "pcre-less" = dontDistribute super."pcre-less"; + "pcre-light" = doDistribute super."pcre-light_0_4_0_3"; "pcre-light-extra" = dontDistribute super."pcre-light-extra"; "pcre-utils" = dontDistribute super."pcre-utils"; "pdf-toolbox-content" = dontDistribute super."pdf-toolbox-content"; @@ -6485,6 +6518,7 @@ self: super: { "qc-oi-testgenerator" = dontDistribute super."qc-oi-testgenerator"; "qd" = dontDistribute super."qd"; "qd-vec" = dontDistribute super."qd-vec"; + "qed" = dontDistribute super."qed"; "qhull-simple" = dontDistribute super."qhull-simple"; "qrcode" = dontDistribute super."qrcode"; "qt" = dontDistribute super."qt"; @@ -6500,6 +6534,7 @@ self: super: { "queue" = dontDistribute super."queue"; "queuelike" = dontDistribute super."queuelike"; "quick-generator" = dontDistribute super."quick-generator"; + "quick-schema" = dontDistribute super."quick-schema"; "quickcheck-assertions" = doDistribute super."quickcheck-assertions_0_1_1"; "quickcheck-instances" = doDistribute super."quickcheck-instances_0_3_10"; "quickcheck-io" = doDistribute super."quickcheck-io_0_1_1"; @@ -7005,6 +7040,7 @@ self: super: { "servant" = dontDistribute super."servant"; "servant-JuicyPixels" = dontDistribute super."servant-JuicyPixels"; "servant-blaze" = dontDistribute super."servant-blaze"; + "servant-cassava" = dontDistribute super."servant-cassava"; "servant-client" = dontDistribute super."servant-client"; "servant-docs" = dontDistribute super."servant-docs"; "servant-ede" = dontDistribute super."servant-ede"; @@ -7018,6 +7054,7 @@ self: super: { "servant-response" = dontDistribute super."servant-response"; "servant-scotty" = dontDistribute super."servant-scotty"; "servant-server" = dontDistribute super."servant-server"; + "servant-swagger" = dontDistribute super."servant-swagger"; "servant-yaml" = dontDistribute super."servant-yaml"; "serversession" = dontDistribute super."serversession"; "serversession-backend-acid-state" = dontDistribute super."serversession-backend-acid-state"; @@ -8221,6 +8258,7 @@ self: super: { "verdict" = dontDistribute super."verdict"; "verdict-json" = dontDistribute super."verdict-json"; "verilog" = dontDistribute super."verilog"; + "versions" = dontDistribute super."versions"; "vhdl" = dontDistribute super."vhdl"; "views" = dontDistribute super."views"; "vigilance" = dontDistribute super."vigilance"; @@ -8674,6 +8712,7 @@ self: super: { "zendesk-api" = dontDistribute super."zendesk-api"; "zeno" = dontDistribute super."zeno"; "zero" = dontDistribute super."zero"; + "zerobin" = dontDistribute super."zerobin"; "zeromq-haskell" = dontDistribute super."zeromq-haskell"; "zeromq3-conduit" = dontDistribute super."zeromq3-conduit"; "zeromq3-haskell" = dontDistribute super."zeromq3-haskell"; diff --git a/pkgs/development/haskell-modules/configuration-lts-1.0.nix b/pkgs/development/haskell-modules/configuration-lts-1.0.nix index e518a1aa37a3..71c7049d421a 100644 --- a/pkgs/development/haskell-modules/configuration-lts-1.0.nix +++ b/pkgs/development/haskell-modules/configuration-lts-1.0.nix @@ -513,6 +513,7 @@ self: super: { "HasGP" = dontDistribute super."HasGP"; "Haschoo" = dontDistribute super."Haschoo"; "Hashell" = dontDistribute super."Hashell"; + "HaskRel" = dontDistribute super."HaskRel"; "HaskellForMaths" = dontDistribute super."HaskellForMaths"; "HaskellLM" = dontDistribute super."HaskellLM"; "HaskellNN" = dontDistribute super."HaskellNN"; @@ -559,6 +560,7 @@ self: super: { "Hsed" = dontDistribute super."Hsed"; "Hsmtlib" = dontDistribute super."Hsmtlib"; "HueAPI" = dontDistribute super."HueAPI"; + "HulkImport" = dontDistribute super."HulkImport"; "Hungarian-Munkres" = dontDistribute super."Hungarian-Munkres"; "IDynamic" = dontDistribute super."IDynamic"; "IFS" = dontDistribute super."IFS"; @@ -1163,6 +1165,7 @@ self: super: { "afis" = dontDistribute super."afis"; "afv" = dontDistribute super."afv"; "agda-server" = dontDistribute super."agda-server"; + "agda-snippets" = dontDistribute super."agda-snippets"; "agentx" = dontDistribute super."agentx"; "agum" = dontDistribute super."agum"; "aig" = dontDistribute super."aig"; @@ -1994,6 +1997,7 @@ self: super: { "cipher-aes" = doDistribute super."cipher-aes_0_2_9"; "cipher-aes128" = dontDistribute super."cipher-aes128"; "cipher-rc5" = dontDistribute super."cipher-rc5"; + "ciphersaber2" = dontDistribute super."ciphersaber2"; "circ" = dontDistribute super."circ"; "cirru-parser" = dontDistribute super."cirru-parser"; "citation-resolve" = dontDistribute super."citation-resolve"; @@ -2458,6 +2462,7 @@ self: super: { "dataflow" = dontDistribute super."dataflow"; "datalog" = dontDistribute super."datalog"; "datapacker" = dontDistribute super."datapacker"; + "dataurl" = dontDistribute super."dataurl"; "date-cache" = dontDistribute super."date-cache"; "dates" = dontDistribute super."dates"; "datetime" = dontDistribute super."datetime"; @@ -2870,6 +2875,7 @@ self: super: { "eros-client" = dontDistribute super."eros-client"; "eros-http" = dontDistribute super."eros-http"; "errno" = dontDistribute super."errno"; + "error-analyze" = dontDistribute super."error-analyze"; "error-continuations" = dontDistribute super."error-continuations"; "error-list" = dontDistribute super."error-list"; "error-loc" = dontDistribute super."error-loc"; @@ -2925,6 +2931,7 @@ self: super: { "exinst-deepseq" = dontDistribute super."exinst-deepseq"; "exinst-hashable" = dontDistribute super."exinst-hashable"; "exists" = dontDistribute super."exists"; + "exit-codes" = dontDistribute super."exit-codes"; "exp-pairs" = dontDistribute super."exp-pairs"; "expand" = dontDistribute super."expand"; "expat-enumerator" = dontDistribute super."expat-enumerator"; @@ -3048,6 +3055,7 @@ self: super: { "fingertree-psqueue" = dontDistribute super."fingertree-psqueue"; "fingertree-tf" = dontDistribute super."fingertree-tf"; "finite-field" = dontDistribute super."finite-field"; + "finite-typelits" = dontDistribute super."finite-typelits"; "first-and-last" = dontDistribute super."first-and-last"; "first-class-patterns" = dontDistribute super."first-class-patterns"; "firstify" = dontDistribute super."firstify"; @@ -3339,6 +3347,20 @@ self: super: { "ghclive" = dontDistribute super."ghclive"; "ghczdecode" = dontDistribute super."ghczdecode"; "ght" = dontDistribute super."ght"; + "gi-atk" = dontDistribute super."gi-atk"; + "gi-cairo" = dontDistribute super."gi-cairo"; + "gi-gdk" = dontDistribute super."gi-gdk"; + "gi-gdkpixbuf" = dontDistribute super."gi-gdkpixbuf"; + "gi-gio" = dontDistribute super."gi-gio"; + "gi-glib" = dontDistribute super."gi-glib"; + "gi-gobject" = dontDistribute super."gi-gobject"; + "gi-gtk" = dontDistribute super."gi-gtk"; + "gi-javascriptcore" = dontDistribute super."gi-javascriptcore"; + "gi-notify" = dontDistribute super."gi-notify"; + "gi-pango" = dontDistribute super."gi-pango"; + "gi-soup" = dontDistribute super."gi-soup"; + "gi-vte" = dontDistribute super."gi-vte"; + "gi-webkit" = dontDistribute super."gi-webkit"; "gimlh" = dontDistribute super."gimlh"; "ginger" = dontDistribute super."ginger"; "ginsu" = dontDistribute super."ginsu"; @@ -3351,6 +3373,7 @@ self: super: { "git-date" = dontDistribute super."git-date"; "git-freq" = dontDistribute super."git-freq"; "git-gpush" = dontDistribute super."git-gpush"; + "git-jump" = dontDistribute super."git-jump"; "git-monitor" = dontDistribute super."git-monitor"; "git-object" = dontDistribute super."git-object"; "git-repair" = dontDistribute super."git-repair"; @@ -3839,6 +3862,8 @@ self: super: { "haskell-formatter" = dontDistribute super."haskell-formatter"; "haskell-ftp" = dontDistribute super."haskell-ftp"; "haskell-generate" = dontDistribute super."haskell-generate"; + "haskell-gi" = dontDistribute super."haskell-gi"; + "haskell-gi-base" = dontDistribute super."haskell-gi-base"; "haskell-import-graph" = dontDistribute super."haskell-import-graph"; "haskell-in-space" = dontDistribute super."haskell-in-space"; "haskell-modbus" = dontDistribute super."haskell-modbus"; @@ -4045,6 +4070,7 @@ self: super: { "hfann" = dontDistribute super."hfann"; "hfd" = dontDistribute super."hfd"; "hfiar" = dontDistribute super."hfiar"; + "hfmt" = dontDistribute super."hfmt"; "hfoil" = dontDistribute super."hfoil"; "hfov" = dontDistribute super."hfov"; "hfractal" = dontDistribute super."hfractal"; @@ -4467,6 +4493,7 @@ self: super: { "hsx2hs" = dontDistribute super."hsx2hs"; "hsyscall" = dontDistribute super."hsyscall"; "hszephyr" = dontDistribute super."hszephyr"; + "htaglib" = dontDistribute super."htaglib"; "htags" = dontDistribute super."htags"; "htar" = dontDistribute super."htar"; "htiled" = dontDistribute super."htiled"; @@ -4920,6 +4947,7 @@ self: super: { "keera-hails-reactive-polling" = dontDistribute super."keera-hails-reactive-polling"; "keera-hails-reactive-wx" = dontDistribute super."keera-hails-reactive-wx"; "keera-hails-reactive-yampa" = dontDistribute super."keera-hails-reactive-yampa"; + "keera-hails-reactivelenses" = dontDistribute super."keera-hails-reactivelenses"; "keera-hails-reactivevalues" = dontDistribute super."keera-hails-reactivevalues"; "keera-posture" = dontDistribute super."keera-posture"; "keiretsu" = dontDistribute super."keiretsu"; @@ -5044,6 +5072,8 @@ self: super: { "lat" = dontDistribute super."lat"; "latest-npm-version" = dontDistribute super."latest-npm-version"; "latex" = dontDistribute super."latex"; + "latex-formulae-image" = dontDistribute super."latex-formulae-image"; + "latex-formulae-pandoc" = dontDistribute super."latex-formulae-pandoc"; "lattices" = dontDistribute super."lattices"; "launchpad-control" = dontDistribute super."launchpad-control"; "lax" = dontDistribute super."lax"; @@ -5419,6 +5449,7 @@ self: super: { "memexml" = dontDistribute super."memexml"; "memo-ptr" = dontDistribute super."memo-ptr"; "memo-sqlite" = dontDistribute super."memo-sqlite"; + "memoization-utils" = dontDistribute super."memoization-utils"; "memoize" = dontDistribute super."memoize"; "memory" = dontDistribute super."memory"; "memscript" = dontDistribute super."memscript"; @@ -5866,6 +5897,7 @@ self: super: { "nthable" = dontDistribute super."nthable"; "ntp-control" = dontDistribute super."ntp-control"; "null-canvas" = dontDistribute super."null-canvas"; + "nullary" = dontDistribute super."nullary"; "number" = dontDistribute super."number"; "numbering" = dontDistribute super."numbering"; "numerals" = dontDistribute super."numerals"; @@ -6094,6 +6126,7 @@ self: super: { "pcg-random" = dontDistribute super."pcg-random"; "pcre-heavy" = dontDistribute super."pcre-heavy"; "pcre-less" = dontDistribute super."pcre-less"; + "pcre-light" = doDistribute super."pcre-light_0_4_0_3"; "pcre-light-extra" = dontDistribute super."pcre-light-extra"; "pcre-utils" = dontDistribute super."pcre-utils"; "pdf-toolbox-content" = dontDistribute super."pdf-toolbox-content"; @@ -6472,6 +6505,7 @@ self: super: { "qc-oi-testgenerator" = dontDistribute super."qc-oi-testgenerator"; "qd" = dontDistribute super."qd"; "qd-vec" = dontDistribute super."qd-vec"; + "qed" = dontDistribute super."qed"; "qhull-simple" = dontDistribute super."qhull-simple"; "qrcode" = dontDistribute super."qrcode"; "qt" = dontDistribute super."qt"; @@ -6487,6 +6521,7 @@ self: super: { "queue" = dontDistribute super."queue"; "queuelike" = dontDistribute super."queuelike"; "quick-generator" = dontDistribute super."quick-generator"; + "quick-schema" = dontDistribute super."quick-schema"; "quickcheck-assertions" = doDistribute super."quickcheck-assertions_0_1_1"; "quickcheck-instances" = doDistribute super."quickcheck-instances_0_3_10"; "quickcheck-io" = doDistribute super."quickcheck-io_0_1_1"; @@ -6990,6 +7025,7 @@ self: super: { "servant" = dontDistribute super."servant"; "servant-JuicyPixels" = dontDistribute super."servant-JuicyPixels"; "servant-blaze" = dontDistribute super."servant-blaze"; + "servant-cassava" = dontDistribute super."servant-cassava"; "servant-client" = dontDistribute super."servant-client"; "servant-docs" = dontDistribute super."servant-docs"; "servant-ede" = dontDistribute super."servant-ede"; @@ -7003,6 +7039,7 @@ self: super: { "servant-response" = dontDistribute super."servant-response"; "servant-scotty" = dontDistribute super."servant-scotty"; "servant-server" = dontDistribute super."servant-server"; + "servant-swagger" = dontDistribute super."servant-swagger"; "servant-yaml" = dontDistribute super."servant-yaml"; "serversession" = dontDistribute super."serversession"; "serversession-backend-acid-state" = dontDistribute super."serversession-backend-acid-state"; @@ -8204,6 +8241,7 @@ self: super: { "verdict" = dontDistribute super."verdict"; "verdict-json" = dontDistribute super."verdict-json"; "verilog" = dontDistribute super."verilog"; + "versions" = dontDistribute super."versions"; "vhdl" = dontDistribute super."vhdl"; "views" = dontDistribute super."views"; "vigilance" = dontDistribute super."vigilance"; @@ -8657,6 +8695,7 @@ self: super: { "zendesk-api" = dontDistribute super."zendesk-api"; "zeno" = dontDistribute super."zeno"; "zero" = dontDistribute super."zero"; + "zerobin" = dontDistribute super."zerobin"; "zeromq-haskell" = dontDistribute super."zeromq-haskell"; "zeromq3-conduit" = dontDistribute super."zeromq3-conduit"; "zeromq3-haskell" = dontDistribute super."zeromq3-haskell"; diff --git a/pkgs/development/haskell-modules/configuration-lts-1.1.nix b/pkgs/development/haskell-modules/configuration-lts-1.1.nix index ef65b26277e2..9897350d78e2 100644 --- a/pkgs/development/haskell-modules/configuration-lts-1.1.nix +++ b/pkgs/development/haskell-modules/configuration-lts-1.1.nix @@ -513,6 +513,7 @@ self: super: { "HasGP" = dontDistribute super."HasGP"; "Haschoo" = dontDistribute super."Haschoo"; "Hashell" = dontDistribute super."Hashell"; + "HaskRel" = dontDistribute super."HaskRel"; "HaskellForMaths" = dontDistribute super."HaskellForMaths"; "HaskellLM" = dontDistribute super."HaskellLM"; "HaskellNN" = dontDistribute super."HaskellNN"; @@ -559,6 +560,7 @@ self: super: { "Hsed" = dontDistribute super."Hsed"; "Hsmtlib" = dontDistribute super."Hsmtlib"; "HueAPI" = dontDistribute super."HueAPI"; + "HulkImport" = dontDistribute super."HulkImport"; "Hungarian-Munkres" = dontDistribute super."Hungarian-Munkres"; "IDynamic" = dontDistribute super."IDynamic"; "IFS" = dontDistribute super."IFS"; @@ -1163,6 +1165,7 @@ self: super: { "afis" = dontDistribute super."afis"; "afv" = dontDistribute super."afv"; "agda-server" = dontDistribute super."agda-server"; + "agda-snippets" = dontDistribute super."agda-snippets"; "agentx" = dontDistribute super."agentx"; "agum" = dontDistribute super."agum"; "aig" = dontDistribute super."aig"; @@ -1991,6 +1994,7 @@ self: super: { "cipher-aes" = doDistribute super."cipher-aes_0_2_10"; "cipher-aes128" = dontDistribute super."cipher-aes128"; "cipher-rc5" = dontDistribute super."cipher-rc5"; + "ciphersaber2" = dontDistribute super."ciphersaber2"; "circ" = dontDistribute super."circ"; "cirru-parser" = dontDistribute super."cirru-parser"; "citation-resolve" = dontDistribute super."citation-resolve"; @@ -2453,6 +2457,7 @@ self: super: { "dataflow" = dontDistribute super."dataflow"; "datalog" = dontDistribute super."datalog"; "datapacker" = dontDistribute super."datapacker"; + "dataurl" = dontDistribute super."dataurl"; "date-cache" = dontDistribute super."date-cache"; "dates" = dontDistribute super."dates"; "datetime" = dontDistribute super."datetime"; @@ -2864,6 +2869,7 @@ self: super: { "eros-client" = dontDistribute super."eros-client"; "eros-http" = dontDistribute super."eros-http"; "errno" = dontDistribute super."errno"; + "error-analyze" = dontDistribute super."error-analyze"; "error-continuations" = dontDistribute super."error-continuations"; "error-list" = dontDistribute super."error-list"; "error-loc" = dontDistribute super."error-loc"; @@ -2919,6 +2925,7 @@ self: super: { "exinst-deepseq" = dontDistribute super."exinst-deepseq"; "exinst-hashable" = dontDistribute super."exinst-hashable"; "exists" = dontDistribute super."exists"; + "exit-codes" = dontDistribute super."exit-codes"; "exp-pairs" = dontDistribute super."exp-pairs"; "expand" = dontDistribute super."expand"; "expat-enumerator" = dontDistribute super."expat-enumerator"; @@ -3042,6 +3049,7 @@ self: super: { "fingertree-psqueue" = dontDistribute super."fingertree-psqueue"; "fingertree-tf" = dontDistribute super."fingertree-tf"; "finite-field" = dontDistribute super."finite-field"; + "finite-typelits" = dontDistribute super."finite-typelits"; "first-and-last" = dontDistribute super."first-and-last"; "first-class-patterns" = dontDistribute super."first-class-patterns"; "firstify" = dontDistribute super."firstify"; @@ -3333,6 +3341,20 @@ self: super: { "ghclive" = dontDistribute super."ghclive"; "ghczdecode" = dontDistribute super."ghczdecode"; "ght" = dontDistribute super."ght"; + "gi-atk" = dontDistribute super."gi-atk"; + "gi-cairo" = dontDistribute super."gi-cairo"; + "gi-gdk" = dontDistribute super."gi-gdk"; + "gi-gdkpixbuf" = dontDistribute super."gi-gdkpixbuf"; + "gi-gio" = dontDistribute super."gi-gio"; + "gi-glib" = dontDistribute super."gi-glib"; + "gi-gobject" = dontDistribute super."gi-gobject"; + "gi-gtk" = dontDistribute super."gi-gtk"; + "gi-javascriptcore" = dontDistribute super."gi-javascriptcore"; + "gi-notify" = dontDistribute super."gi-notify"; + "gi-pango" = dontDistribute super."gi-pango"; + "gi-soup" = dontDistribute super."gi-soup"; + "gi-vte" = dontDistribute super."gi-vte"; + "gi-webkit" = dontDistribute super."gi-webkit"; "gimlh" = dontDistribute super."gimlh"; "ginger" = dontDistribute super."ginger"; "ginsu" = dontDistribute super."ginsu"; @@ -3345,6 +3367,7 @@ self: super: { "git-date" = dontDistribute super."git-date"; "git-freq" = dontDistribute super."git-freq"; "git-gpush" = dontDistribute super."git-gpush"; + "git-jump" = dontDistribute super."git-jump"; "git-monitor" = dontDistribute super."git-monitor"; "git-object" = dontDistribute super."git-object"; "git-repair" = dontDistribute super."git-repair"; @@ -3831,6 +3854,8 @@ self: super: { "haskell-formatter" = dontDistribute super."haskell-formatter"; "haskell-ftp" = dontDistribute super."haskell-ftp"; "haskell-generate" = dontDistribute super."haskell-generate"; + "haskell-gi" = dontDistribute super."haskell-gi"; + "haskell-gi-base" = dontDistribute super."haskell-gi-base"; "haskell-import-graph" = dontDistribute super."haskell-import-graph"; "haskell-in-space" = dontDistribute super."haskell-in-space"; "haskell-modbus" = dontDistribute super."haskell-modbus"; @@ -4037,6 +4062,7 @@ self: super: { "hfann" = dontDistribute super."hfann"; "hfd" = dontDistribute super."hfd"; "hfiar" = dontDistribute super."hfiar"; + "hfmt" = dontDistribute super."hfmt"; "hfoil" = dontDistribute super."hfoil"; "hfov" = dontDistribute super."hfov"; "hfractal" = dontDistribute super."hfractal"; @@ -4456,6 +4482,7 @@ self: super: { "hsx2hs" = dontDistribute super."hsx2hs"; "hsyscall" = dontDistribute super."hsyscall"; "hszephyr" = dontDistribute super."hszephyr"; + "htaglib" = dontDistribute super."htaglib"; "htags" = dontDistribute super."htags"; "htar" = dontDistribute super."htar"; "htiled" = dontDistribute super."htiled"; @@ -4908,6 +4935,7 @@ self: super: { "keera-hails-reactive-polling" = dontDistribute super."keera-hails-reactive-polling"; "keera-hails-reactive-wx" = dontDistribute super."keera-hails-reactive-wx"; "keera-hails-reactive-yampa" = dontDistribute super."keera-hails-reactive-yampa"; + "keera-hails-reactivelenses" = dontDistribute super."keera-hails-reactivelenses"; "keera-hails-reactivevalues" = dontDistribute super."keera-hails-reactivevalues"; "keera-posture" = dontDistribute super."keera-posture"; "keiretsu" = dontDistribute super."keiretsu"; @@ -5032,6 +5060,8 @@ self: super: { "lat" = dontDistribute super."lat"; "latest-npm-version" = dontDistribute super."latest-npm-version"; "latex" = dontDistribute super."latex"; + "latex-formulae-image" = dontDistribute super."latex-formulae-image"; + "latex-formulae-pandoc" = dontDistribute super."latex-formulae-pandoc"; "lattices" = dontDistribute super."lattices"; "launchpad-control" = dontDistribute super."launchpad-control"; "lax" = dontDistribute super."lax"; @@ -5407,6 +5437,7 @@ self: super: { "memexml" = dontDistribute super."memexml"; "memo-ptr" = dontDistribute super."memo-ptr"; "memo-sqlite" = dontDistribute super."memo-sqlite"; + "memoization-utils" = dontDistribute super."memoization-utils"; "memoize" = dontDistribute super."memoize"; "memory" = dontDistribute super."memory"; "memscript" = dontDistribute super."memscript"; @@ -5853,6 +5884,7 @@ self: super: { "nthable" = dontDistribute super."nthable"; "ntp-control" = dontDistribute super."ntp-control"; "null-canvas" = dontDistribute super."null-canvas"; + "nullary" = dontDistribute super."nullary"; "number" = dontDistribute super."number"; "numbering" = dontDistribute super."numbering"; "numerals" = dontDistribute super."numerals"; @@ -6081,6 +6113,7 @@ self: super: { "pcg-random" = dontDistribute super."pcg-random"; "pcre-heavy" = dontDistribute super."pcre-heavy"; "pcre-less" = dontDistribute super."pcre-less"; + "pcre-light" = doDistribute super."pcre-light_0_4_0_3"; "pcre-light-extra" = dontDistribute super."pcre-light-extra"; "pcre-utils" = dontDistribute super."pcre-utils"; "pdf-toolbox-content" = dontDistribute super."pdf-toolbox-content"; @@ -6459,6 +6492,7 @@ self: super: { "qc-oi-testgenerator" = dontDistribute super."qc-oi-testgenerator"; "qd" = dontDistribute super."qd"; "qd-vec" = dontDistribute super."qd-vec"; + "qed" = dontDistribute super."qed"; "qhull-simple" = dontDistribute super."qhull-simple"; "qrcode" = dontDistribute super."qrcode"; "qt" = dontDistribute super."qt"; @@ -6474,6 +6508,7 @@ self: super: { "queue" = dontDistribute super."queue"; "queuelike" = dontDistribute super."queuelike"; "quick-generator" = dontDistribute super."quick-generator"; + "quick-schema" = dontDistribute super."quick-schema"; "quickcheck-assertions" = doDistribute super."quickcheck-assertions_0_1_1"; "quickcheck-instances" = doDistribute super."quickcheck-instances_0_3_10"; "quickcheck-io" = doDistribute super."quickcheck-io_0_1_1"; @@ -6977,6 +7012,7 @@ self: super: { "servant" = dontDistribute super."servant"; "servant-JuicyPixels" = dontDistribute super."servant-JuicyPixels"; "servant-blaze" = dontDistribute super."servant-blaze"; + "servant-cassava" = dontDistribute super."servant-cassava"; "servant-client" = dontDistribute super."servant-client"; "servant-docs" = dontDistribute super."servant-docs"; "servant-ede" = dontDistribute super."servant-ede"; @@ -6990,6 +7026,7 @@ self: super: { "servant-response" = dontDistribute super."servant-response"; "servant-scotty" = dontDistribute super."servant-scotty"; "servant-server" = dontDistribute super."servant-server"; + "servant-swagger" = dontDistribute super."servant-swagger"; "servant-yaml" = dontDistribute super."servant-yaml"; "serversession" = dontDistribute super."serversession"; "serversession-backend-acid-state" = dontDistribute super."serversession-backend-acid-state"; @@ -8185,6 +8222,7 @@ self: super: { "verdict" = dontDistribute super."verdict"; "verdict-json" = dontDistribute super."verdict-json"; "verilog" = dontDistribute super."verilog"; + "versions" = dontDistribute super."versions"; "vhdl" = dontDistribute super."vhdl"; "views" = dontDistribute super."views"; "vigilance" = dontDistribute super."vigilance"; @@ -8638,6 +8676,7 @@ self: super: { "zendesk-api" = dontDistribute super."zendesk-api"; "zeno" = dontDistribute super."zeno"; "zero" = dontDistribute super."zero"; + "zerobin" = dontDistribute super."zerobin"; "zeromq-haskell" = dontDistribute super."zeromq-haskell"; "zeromq3-conduit" = dontDistribute super."zeromq3-conduit"; "zeromq3-haskell" = dontDistribute super."zeromq3-haskell"; diff --git a/pkgs/development/haskell-modules/configuration-lts-1.10.nix b/pkgs/development/haskell-modules/configuration-lts-1.10.nix index 38d31290e69b..3841e019319f 100644 --- a/pkgs/development/haskell-modules/configuration-lts-1.10.nix +++ b/pkgs/development/haskell-modules/configuration-lts-1.10.nix @@ -512,6 +512,7 @@ self: super: { "HasGP" = dontDistribute super."HasGP"; "Haschoo" = dontDistribute super."Haschoo"; "Hashell" = dontDistribute super."Hashell"; + "HaskRel" = dontDistribute super."HaskRel"; "HaskellForMaths" = dontDistribute super."HaskellForMaths"; "HaskellLM" = dontDistribute super."HaskellLM"; "HaskellNN" = dontDistribute super."HaskellNN"; @@ -558,6 +559,7 @@ self: super: { "Hsed" = dontDistribute super."Hsed"; "Hsmtlib" = dontDistribute super."Hsmtlib"; "HueAPI" = dontDistribute super."HueAPI"; + "HulkImport" = dontDistribute super."HulkImport"; "Hungarian-Munkres" = dontDistribute super."Hungarian-Munkres"; "IDynamic" = dontDistribute super."IDynamic"; "IFS" = dontDistribute super."IFS"; @@ -1162,6 +1164,7 @@ self: super: { "afis" = dontDistribute super."afis"; "afv" = dontDistribute super."afv"; "agda-server" = dontDistribute super."agda-server"; + "agda-snippets" = dontDistribute super."agda-snippets"; "agentx" = dontDistribute super."agentx"; "agum" = dontDistribute super."agum"; "aig" = dontDistribute super."aig"; @@ -1986,6 +1989,7 @@ self: super: { "cipher-aes" = doDistribute super."cipher-aes_0_2_10"; "cipher-aes128" = dontDistribute super."cipher-aes128"; "cipher-rc5" = dontDistribute super."cipher-rc5"; + "ciphersaber2" = dontDistribute super."ciphersaber2"; "circ" = dontDistribute super."circ"; "cirru-parser" = dontDistribute super."cirru-parser"; "citation-resolve" = dontDistribute super."citation-resolve"; @@ -2447,6 +2451,7 @@ self: super: { "dataflow" = dontDistribute super."dataflow"; "datalog" = dontDistribute super."datalog"; "datapacker" = dontDistribute super."datapacker"; + "dataurl" = dontDistribute super."dataurl"; "date-cache" = dontDistribute super."date-cache"; "dates" = dontDistribute super."dates"; "datetime" = dontDistribute super."datetime"; @@ -2858,6 +2863,7 @@ self: super: { "eros-client" = dontDistribute super."eros-client"; "eros-http" = dontDistribute super."eros-http"; "errno" = dontDistribute super."errno"; + "error-analyze" = dontDistribute super."error-analyze"; "error-continuations" = dontDistribute super."error-continuations"; "error-list" = dontDistribute super."error-list"; "error-loc" = dontDistribute super."error-loc"; @@ -2913,6 +2919,7 @@ self: super: { "exinst-deepseq" = dontDistribute super."exinst-deepseq"; "exinst-hashable" = dontDistribute super."exinst-hashable"; "exists" = dontDistribute super."exists"; + "exit-codes" = dontDistribute super."exit-codes"; "exp-pairs" = dontDistribute super."exp-pairs"; "expand" = dontDistribute super."expand"; "expat-enumerator" = dontDistribute super."expat-enumerator"; @@ -3033,6 +3040,7 @@ self: super: { "fingertree-psqueue" = dontDistribute super."fingertree-psqueue"; "fingertree-tf" = dontDistribute super."fingertree-tf"; "finite-field" = dontDistribute super."finite-field"; + "finite-typelits" = dontDistribute super."finite-typelits"; "first-and-last" = dontDistribute super."first-and-last"; "first-class-patterns" = dontDistribute super."first-class-patterns"; "firstify" = dontDistribute super."firstify"; @@ -3322,6 +3330,20 @@ self: super: { "ghclive" = dontDistribute super."ghclive"; "ghczdecode" = dontDistribute super."ghczdecode"; "ght" = dontDistribute super."ght"; + "gi-atk" = dontDistribute super."gi-atk"; + "gi-cairo" = dontDistribute super."gi-cairo"; + "gi-gdk" = dontDistribute super."gi-gdk"; + "gi-gdkpixbuf" = dontDistribute super."gi-gdkpixbuf"; + "gi-gio" = dontDistribute super."gi-gio"; + "gi-glib" = dontDistribute super."gi-glib"; + "gi-gobject" = dontDistribute super."gi-gobject"; + "gi-gtk" = dontDistribute super."gi-gtk"; + "gi-javascriptcore" = dontDistribute super."gi-javascriptcore"; + "gi-notify" = dontDistribute super."gi-notify"; + "gi-pango" = dontDistribute super."gi-pango"; + "gi-soup" = dontDistribute super."gi-soup"; + "gi-vte" = dontDistribute super."gi-vte"; + "gi-webkit" = dontDistribute super."gi-webkit"; "gimlh" = dontDistribute super."gimlh"; "ginger" = dontDistribute super."ginger"; "ginsu" = dontDistribute super."ginsu"; @@ -3334,6 +3356,7 @@ self: super: { "git-date" = dontDistribute super."git-date"; "git-freq" = dontDistribute super."git-freq"; "git-gpush" = dontDistribute super."git-gpush"; + "git-jump" = dontDistribute super."git-jump"; "git-monitor" = dontDistribute super."git-monitor"; "git-object" = dontDistribute super."git-object"; "git-repair" = dontDistribute super."git-repair"; @@ -3819,6 +3842,8 @@ self: super: { "haskell-formatter" = dontDistribute super."haskell-formatter"; "haskell-ftp" = dontDistribute super."haskell-ftp"; "haskell-generate" = dontDistribute super."haskell-generate"; + "haskell-gi" = dontDistribute super."haskell-gi"; + "haskell-gi-base" = dontDistribute super."haskell-gi-base"; "haskell-import-graph" = dontDistribute super."haskell-import-graph"; "haskell-in-space" = dontDistribute super."haskell-in-space"; "haskell-modbus" = dontDistribute super."haskell-modbus"; @@ -4024,6 +4049,7 @@ self: super: { "hfann" = dontDistribute super."hfann"; "hfd" = dontDistribute super."hfd"; "hfiar" = dontDistribute super."hfiar"; + "hfmt" = dontDistribute super."hfmt"; "hfoil" = dontDistribute super."hfoil"; "hfov" = dontDistribute super."hfov"; "hfractal" = dontDistribute super."hfractal"; @@ -4442,6 +4468,7 @@ self: super: { "hsx2hs" = dontDistribute super."hsx2hs"; "hsyscall" = dontDistribute super."hsyscall"; "hszephyr" = dontDistribute super."hszephyr"; + "htaglib" = dontDistribute super."htaglib"; "htags" = dontDistribute super."htags"; "htar" = dontDistribute super."htar"; "htiled" = dontDistribute super."htiled"; @@ -4886,6 +4913,7 @@ self: super: { "keera-hails-reactive-polling" = dontDistribute super."keera-hails-reactive-polling"; "keera-hails-reactive-wx" = dontDistribute super."keera-hails-reactive-wx"; "keera-hails-reactive-yampa" = dontDistribute super."keera-hails-reactive-yampa"; + "keera-hails-reactivelenses" = dontDistribute super."keera-hails-reactivelenses"; "keera-hails-reactivevalues" = dontDistribute super."keera-hails-reactivevalues"; "keera-posture" = dontDistribute super."keera-posture"; "keiretsu" = dontDistribute super."keiretsu"; @@ -5010,6 +5038,8 @@ self: super: { "lat" = dontDistribute super."lat"; "latest-npm-version" = dontDistribute super."latest-npm-version"; "latex" = dontDistribute super."latex"; + "latex-formulae-image" = dontDistribute super."latex-formulae-image"; + "latex-formulae-pandoc" = dontDistribute super."latex-formulae-pandoc"; "lattices" = dontDistribute super."lattices"; "launchpad-control" = dontDistribute super."launchpad-control"; "lax" = dontDistribute super."lax"; @@ -5384,6 +5414,7 @@ self: super: { "memexml" = dontDistribute super."memexml"; "memo-ptr" = dontDistribute super."memo-ptr"; "memo-sqlite" = dontDistribute super."memo-sqlite"; + "memoization-utils" = dontDistribute super."memoization-utils"; "memoize" = dontDistribute super."memoize"; "memory" = dontDistribute super."memory"; "memscript" = dontDistribute super."memscript"; @@ -5828,6 +5859,7 @@ self: super: { "nthable" = dontDistribute super."nthable"; "ntp-control" = dontDistribute super."ntp-control"; "null-canvas" = dontDistribute super."null-canvas"; + "nullary" = dontDistribute super."nullary"; "number" = dontDistribute super."number"; "numbering" = dontDistribute super."numbering"; "numerals" = dontDistribute super."numerals"; @@ -6054,6 +6086,7 @@ self: super: { "pcg-random" = dontDistribute super."pcg-random"; "pcre-heavy" = dontDistribute super."pcre-heavy"; "pcre-less" = dontDistribute super."pcre-less"; + "pcre-light" = doDistribute super."pcre-light_0_4_0_3"; "pcre-light-extra" = dontDistribute super."pcre-light-extra"; "pcre-utils" = dontDistribute super."pcre-utils"; "pdf-toolbox-content" = dontDistribute super."pdf-toolbox-content"; @@ -6430,6 +6463,7 @@ self: super: { "qc-oi-testgenerator" = dontDistribute super."qc-oi-testgenerator"; "qd" = dontDistribute super."qd"; "qd-vec" = dontDistribute super."qd-vec"; + "qed" = dontDistribute super."qed"; "qhull-simple" = dontDistribute super."qhull-simple"; "qrcode" = dontDistribute super."qrcode"; "qt" = dontDistribute super."qt"; @@ -6445,6 +6479,7 @@ self: super: { "queue" = dontDistribute super."queue"; "queuelike" = dontDistribute super."queuelike"; "quick-generator" = dontDistribute super."quick-generator"; + "quick-schema" = dontDistribute super."quick-schema"; "quickcheck-assertions" = doDistribute super."quickcheck-assertions_0_1_1"; "quickcheck-instances" = doDistribute super."quickcheck-instances_0_3_10"; "quickcheck-io" = doDistribute super."quickcheck-io_0_1_1"; @@ -6946,6 +6981,7 @@ self: super: { "servant" = dontDistribute super."servant"; "servant-JuicyPixels" = dontDistribute super."servant-JuicyPixels"; "servant-blaze" = dontDistribute super."servant-blaze"; + "servant-cassava" = dontDistribute super."servant-cassava"; "servant-client" = dontDistribute super."servant-client"; "servant-docs" = dontDistribute super."servant-docs"; "servant-ede" = dontDistribute super."servant-ede"; @@ -6959,6 +6995,7 @@ self: super: { "servant-response" = dontDistribute super."servant-response"; "servant-scotty" = dontDistribute super."servant-scotty"; "servant-server" = dontDistribute super."servant-server"; + "servant-swagger" = dontDistribute super."servant-swagger"; "servant-yaml" = dontDistribute super."servant-yaml"; "serversession" = dontDistribute super."serversession"; "serversession-backend-acid-state" = dontDistribute super."serversession-backend-acid-state"; @@ -8146,6 +8183,7 @@ self: super: { "verdict" = dontDistribute super."verdict"; "verdict-json" = dontDistribute super."verdict-json"; "verilog" = dontDistribute super."verilog"; + "versions" = dontDistribute super."versions"; "vhdl" = dontDistribute super."vhdl"; "views" = dontDistribute super."views"; "vigilance" = dontDistribute super."vigilance"; @@ -8597,6 +8635,7 @@ self: super: { "zendesk-api" = dontDistribute super."zendesk-api"; "zeno" = dontDistribute super."zeno"; "zero" = dontDistribute super."zero"; + "zerobin" = dontDistribute super."zerobin"; "zeromq-haskell" = dontDistribute super."zeromq-haskell"; "zeromq3-conduit" = dontDistribute super."zeromq3-conduit"; "zeromq3-haskell" = dontDistribute super."zeromq3-haskell"; diff --git a/pkgs/development/haskell-modules/configuration-lts-1.11.nix b/pkgs/development/haskell-modules/configuration-lts-1.11.nix index 2bf6a1ac5b9d..b673fa70b771 100644 --- a/pkgs/development/haskell-modules/configuration-lts-1.11.nix +++ b/pkgs/development/haskell-modules/configuration-lts-1.11.nix @@ -512,6 +512,7 @@ self: super: { "HasGP" = dontDistribute super."HasGP"; "Haschoo" = dontDistribute super."Haschoo"; "Hashell" = dontDistribute super."Hashell"; + "HaskRel" = dontDistribute super."HaskRel"; "HaskellForMaths" = dontDistribute super."HaskellForMaths"; "HaskellLM" = dontDistribute super."HaskellLM"; "HaskellNN" = dontDistribute super."HaskellNN"; @@ -558,6 +559,7 @@ self: super: { "Hsed" = dontDistribute super."Hsed"; "Hsmtlib" = dontDistribute super."Hsmtlib"; "HueAPI" = dontDistribute super."HueAPI"; + "HulkImport" = dontDistribute super."HulkImport"; "Hungarian-Munkres" = dontDistribute super."Hungarian-Munkres"; "IDynamic" = dontDistribute super."IDynamic"; "IFS" = dontDistribute super."IFS"; @@ -1162,6 +1164,7 @@ self: super: { "afis" = dontDistribute super."afis"; "afv" = dontDistribute super."afv"; "agda-server" = dontDistribute super."agda-server"; + "agda-snippets" = dontDistribute super."agda-snippets"; "agentx" = dontDistribute super."agentx"; "agum" = dontDistribute super."agum"; "aig" = dontDistribute super."aig"; @@ -1986,6 +1989,7 @@ self: super: { "cipher-aes" = doDistribute super."cipher-aes_0_2_10"; "cipher-aes128" = dontDistribute super."cipher-aes128"; "cipher-rc5" = dontDistribute super."cipher-rc5"; + "ciphersaber2" = dontDistribute super."ciphersaber2"; "circ" = dontDistribute super."circ"; "cirru-parser" = dontDistribute super."cirru-parser"; "citation-resolve" = dontDistribute super."citation-resolve"; @@ -2447,6 +2451,7 @@ self: super: { "dataflow" = dontDistribute super."dataflow"; "datalog" = dontDistribute super."datalog"; "datapacker" = dontDistribute super."datapacker"; + "dataurl" = dontDistribute super."dataurl"; "date-cache" = dontDistribute super."date-cache"; "dates" = dontDistribute super."dates"; "datetime" = dontDistribute super."datetime"; @@ -2858,6 +2863,7 @@ self: super: { "eros-client" = dontDistribute super."eros-client"; "eros-http" = dontDistribute super."eros-http"; "errno" = dontDistribute super."errno"; + "error-analyze" = dontDistribute super."error-analyze"; "error-continuations" = dontDistribute super."error-continuations"; "error-list" = dontDistribute super."error-list"; "error-loc" = dontDistribute super."error-loc"; @@ -2913,6 +2919,7 @@ self: super: { "exinst-deepseq" = dontDistribute super."exinst-deepseq"; "exinst-hashable" = dontDistribute super."exinst-hashable"; "exists" = dontDistribute super."exists"; + "exit-codes" = dontDistribute super."exit-codes"; "exp-pairs" = dontDistribute super."exp-pairs"; "expand" = dontDistribute super."expand"; "expat-enumerator" = dontDistribute super."expat-enumerator"; @@ -3033,6 +3040,7 @@ self: super: { "fingertree-psqueue" = dontDistribute super."fingertree-psqueue"; "fingertree-tf" = dontDistribute super."fingertree-tf"; "finite-field" = dontDistribute super."finite-field"; + "finite-typelits" = dontDistribute super."finite-typelits"; "first-and-last" = dontDistribute super."first-and-last"; "first-class-patterns" = dontDistribute super."first-class-patterns"; "firstify" = dontDistribute super."firstify"; @@ -3321,6 +3329,20 @@ self: super: { "ghclive" = dontDistribute super."ghclive"; "ghczdecode" = dontDistribute super."ghczdecode"; "ght" = dontDistribute super."ght"; + "gi-atk" = dontDistribute super."gi-atk"; + "gi-cairo" = dontDistribute super."gi-cairo"; + "gi-gdk" = dontDistribute super."gi-gdk"; + "gi-gdkpixbuf" = dontDistribute super."gi-gdkpixbuf"; + "gi-gio" = dontDistribute super."gi-gio"; + "gi-glib" = dontDistribute super."gi-glib"; + "gi-gobject" = dontDistribute super."gi-gobject"; + "gi-gtk" = dontDistribute super."gi-gtk"; + "gi-javascriptcore" = dontDistribute super."gi-javascriptcore"; + "gi-notify" = dontDistribute super."gi-notify"; + "gi-pango" = dontDistribute super."gi-pango"; + "gi-soup" = dontDistribute super."gi-soup"; + "gi-vte" = dontDistribute super."gi-vte"; + "gi-webkit" = dontDistribute super."gi-webkit"; "gimlh" = dontDistribute super."gimlh"; "ginger" = dontDistribute super."ginger"; "ginsu" = dontDistribute super."ginsu"; @@ -3333,6 +3355,7 @@ self: super: { "git-date" = dontDistribute super."git-date"; "git-freq" = dontDistribute super."git-freq"; "git-gpush" = dontDistribute super."git-gpush"; + "git-jump" = dontDistribute super."git-jump"; "git-monitor" = dontDistribute super."git-monitor"; "git-object" = dontDistribute super."git-object"; "git-repair" = dontDistribute super."git-repair"; @@ -3818,6 +3841,8 @@ self: super: { "haskell-formatter" = dontDistribute super."haskell-formatter"; "haskell-ftp" = dontDistribute super."haskell-ftp"; "haskell-generate" = dontDistribute super."haskell-generate"; + "haskell-gi" = dontDistribute super."haskell-gi"; + "haskell-gi-base" = dontDistribute super."haskell-gi-base"; "haskell-import-graph" = dontDistribute super."haskell-import-graph"; "haskell-in-space" = dontDistribute super."haskell-in-space"; "haskell-modbus" = dontDistribute super."haskell-modbus"; @@ -4023,6 +4048,7 @@ self: super: { "hfann" = dontDistribute super."hfann"; "hfd" = dontDistribute super."hfd"; "hfiar" = dontDistribute super."hfiar"; + "hfmt" = dontDistribute super."hfmt"; "hfoil" = dontDistribute super."hfoil"; "hfov" = dontDistribute super."hfov"; "hfractal" = dontDistribute super."hfractal"; @@ -4441,6 +4467,7 @@ self: super: { "hsx2hs" = dontDistribute super."hsx2hs"; "hsyscall" = dontDistribute super."hsyscall"; "hszephyr" = dontDistribute super."hszephyr"; + "htaglib" = dontDistribute super."htaglib"; "htags" = dontDistribute super."htags"; "htar" = dontDistribute super."htar"; "htiled" = dontDistribute super."htiled"; @@ -4883,6 +4910,7 @@ self: super: { "keera-hails-reactive-polling" = dontDistribute super."keera-hails-reactive-polling"; "keera-hails-reactive-wx" = dontDistribute super."keera-hails-reactive-wx"; "keera-hails-reactive-yampa" = dontDistribute super."keera-hails-reactive-yampa"; + "keera-hails-reactivelenses" = dontDistribute super."keera-hails-reactivelenses"; "keera-hails-reactivevalues" = dontDistribute super."keera-hails-reactivevalues"; "keera-posture" = dontDistribute super."keera-posture"; "keiretsu" = dontDistribute super."keiretsu"; @@ -5007,6 +5035,8 @@ self: super: { "lat" = dontDistribute super."lat"; "latest-npm-version" = dontDistribute super."latest-npm-version"; "latex" = dontDistribute super."latex"; + "latex-formulae-image" = dontDistribute super."latex-formulae-image"; + "latex-formulae-pandoc" = dontDistribute super."latex-formulae-pandoc"; "lattices" = dontDistribute super."lattices"; "launchpad-control" = dontDistribute super."launchpad-control"; "lax" = dontDistribute super."lax"; @@ -5380,6 +5410,7 @@ self: super: { "memexml" = dontDistribute super."memexml"; "memo-ptr" = dontDistribute super."memo-ptr"; "memo-sqlite" = dontDistribute super."memo-sqlite"; + "memoization-utils" = dontDistribute super."memoization-utils"; "memoize" = dontDistribute super."memoize"; "memory" = dontDistribute super."memory"; "memscript" = dontDistribute super."memscript"; @@ -5824,6 +5855,7 @@ self: super: { "nthable" = dontDistribute super."nthable"; "ntp-control" = dontDistribute super."ntp-control"; "null-canvas" = dontDistribute super."null-canvas"; + "nullary" = dontDistribute super."nullary"; "number" = dontDistribute super."number"; "numbering" = dontDistribute super."numbering"; "numerals" = dontDistribute super."numerals"; @@ -6050,6 +6082,7 @@ self: super: { "pcg-random" = dontDistribute super."pcg-random"; "pcre-heavy" = dontDistribute super."pcre-heavy"; "pcre-less" = dontDistribute super."pcre-less"; + "pcre-light" = doDistribute super."pcre-light_0_4_0_3"; "pcre-light-extra" = dontDistribute super."pcre-light-extra"; "pcre-utils" = dontDistribute super."pcre-utils"; "pdf-toolbox-content" = dontDistribute super."pdf-toolbox-content"; @@ -6426,6 +6459,7 @@ self: super: { "qc-oi-testgenerator" = dontDistribute super."qc-oi-testgenerator"; "qd" = dontDistribute super."qd"; "qd-vec" = dontDistribute super."qd-vec"; + "qed" = dontDistribute super."qed"; "qhull-simple" = dontDistribute super."qhull-simple"; "qrcode" = dontDistribute super."qrcode"; "qt" = dontDistribute super."qt"; @@ -6441,6 +6475,7 @@ self: super: { "queue" = dontDistribute super."queue"; "queuelike" = dontDistribute super."queuelike"; "quick-generator" = dontDistribute super."quick-generator"; + "quick-schema" = dontDistribute super."quick-schema"; "quickcheck-assertions" = doDistribute super."quickcheck-assertions_0_1_1"; "quickcheck-instances" = doDistribute super."quickcheck-instances_0_3_10"; "quickcheck-io" = doDistribute super."quickcheck-io_0_1_1"; @@ -6941,6 +6976,7 @@ self: super: { "servant" = dontDistribute super."servant"; "servant-JuicyPixels" = dontDistribute super."servant-JuicyPixels"; "servant-blaze" = dontDistribute super."servant-blaze"; + "servant-cassava" = dontDistribute super."servant-cassava"; "servant-client" = dontDistribute super."servant-client"; "servant-docs" = dontDistribute super."servant-docs"; "servant-ede" = dontDistribute super."servant-ede"; @@ -6954,6 +6990,7 @@ self: super: { "servant-response" = dontDistribute super."servant-response"; "servant-scotty" = dontDistribute super."servant-scotty"; "servant-server" = dontDistribute super."servant-server"; + "servant-swagger" = dontDistribute super."servant-swagger"; "servant-yaml" = dontDistribute super."servant-yaml"; "serversession" = dontDistribute super."serversession"; "serversession-backend-acid-state" = dontDistribute super."serversession-backend-acid-state"; @@ -8141,6 +8178,7 @@ self: super: { "verdict" = dontDistribute super."verdict"; "verdict-json" = dontDistribute super."verdict-json"; "verilog" = dontDistribute super."verilog"; + "versions" = dontDistribute super."versions"; "vhdl" = dontDistribute super."vhdl"; "views" = dontDistribute super."views"; "vigilance" = dontDistribute super."vigilance"; @@ -8592,6 +8630,7 @@ self: super: { "zendesk-api" = dontDistribute super."zendesk-api"; "zeno" = dontDistribute super."zeno"; "zero" = dontDistribute super."zero"; + "zerobin" = dontDistribute super."zerobin"; "zeromq-haskell" = dontDistribute super."zeromq-haskell"; "zeromq3-conduit" = dontDistribute super."zeromq3-conduit"; "zeromq3-haskell" = dontDistribute super."zeromq3-haskell"; diff --git a/pkgs/development/haskell-modules/configuration-lts-1.12.nix b/pkgs/development/haskell-modules/configuration-lts-1.12.nix index 364ee886a35d..e6b4206838f8 100644 --- a/pkgs/development/haskell-modules/configuration-lts-1.12.nix +++ b/pkgs/development/haskell-modules/configuration-lts-1.12.nix @@ -512,6 +512,7 @@ self: super: { "HasGP" = dontDistribute super."HasGP"; "Haschoo" = dontDistribute super."Haschoo"; "Hashell" = dontDistribute super."Hashell"; + "HaskRel" = dontDistribute super."HaskRel"; "HaskellForMaths" = dontDistribute super."HaskellForMaths"; "HaskellLM" = dontDistribute super."HaskellLM"; "HaskellNN" = dontDistribute super."HaskellNN"; @@ -558,6 +559,7 @@ self: super: { "Hsed" = dontDistribute super."Hsed"; "Hsmtlib" = dontDistribute super."Hsmtlib"; "HueAPI" = dontDistribute super."HueAPI"; + "HulkImport" = dontDistribute super."HulkImport"; "Hungarian-Munkres" = dontDistribute super."Hungarian-Munkres"; "IDynamic" = dontDistribute super."IDynamic"; "IFS" = dontDistribute super."IFS"; @@ -1162,6 +1164,7 @@ self: super: { "afis" = dontDistribute super."afis"; "afv" = dontDistribute super."afv"; "agda-server" = dontDistribute super."agda-server"; + "agda-snippets" = dontDistribute super."agda-snippets"; "agentx" = dontDistribute super."agentx"; "agum" = dontDistribute super."agum"; "aig" = dontDistribute super."aig"; @@ -1986,6 +1989,7 @@ self: super: { "cipher-aes" = doDistribute super."cipher-aes_0_2_10"; "cipher-aes128" = dontDistribute super."cipher-aes128"; "cipher-rc5" = dontDistribute super."cipher-rc5"; + "ciphersaber2" = dontDistribute super."ciphersaber2"; "circ" = dontDistribute super."circ"; "cirru-parser" = dontDistribute super."cirru-parser"; "citation-resolve" = dontDistribute super."citation-resolve"; @@ -2447,6 +2451,7 @@ self: super: { "dataflow" = dontDistribute super."dataflow"; "datalog" = dontDistribute super."datalog"; "datapacker" = dontDistribute super."datapacker"; + "dataurl" = dontDistribute super."dataurl"; "date-cache" = dontDistribute super."date-cache"; "dates" = dontDistribute super."dates"; "datetime" = dontDistribute super."datetime"; @@ -2858,6 +2863,7 @@ self: super: { "eros-client" = dontDistribute super."eros-client"; "eros-http" = dontDistribute super."eros-http"; "errno" = dontDistribute super."errno"; + "error-analyze" = dontDistribute super."error-analyze"; "error-continuations" = dontDistribute super."error-continuations"; "error-list" = dontDistribute super."error-list"; "error-loc" = dontDistribute super."error-loc"; @@ -2913,6 +2919,7 @@ self: super: { "exinst-deepseq" = dontDistribute super."exinst-deepseq"; "exinst-hashable" = dontDistribute super."exinst-hashable"; "exists" = dontDistribute super."exists"; + "exit-codes" = dontDistribute super."exit-codes"; "exp-pairs" = dontDistribute super."exp-pairs"; "expand" = dontDistribute super."expand"; "expat-enumerator" = dontDistribute super."expat-enumerator"; @@ -3033,6 +3040,7 @@ self: super: { "fingertree-psqueue" = dontDistribute super."fingertree-psqueue"; "fingertree-tf" = dontDistribute super."fingertree-tf"; "finite-field" = dontDistribute super."finite-field"; + "finite-typelits" = dontDistribute super."finite-typelits"; "first-and-last" = dontDistribute super."first-and-last"; "first-class-patterns" = dontDistribute super."first-class-patterns"; "firstify" = dontDistribute super."firstify"; @@ -3321,6 +3329,20 @@ self: super: { "ghclive" = dontDistribute super."ghclive"; "ghczdecode" = dontDistribute super."ghczdecode"; "ght" = dontDistribute super."ght"; + "gi-atk" = dontDistribute super."gi-atk"; + "gi-cairo" = dontDistribute super."gi-cairo"; + "gi-gdk" = dontDistribute super."gi-gdk"; + "gi-gdkpixbuf" = dontDistribute super."gi-gdkpixbuf"; + "gi-gio" = dontDistribute super."gi-gio"; + "gi-glib" = dontDistribute super."gi-glib"; + "gi-gobject" = dontDistribute super."gi-gobject"; + "gi-gtk" = dontDistribute super."gi-gtk"; + "gi-javascriptcore" = dontDistribute super."gi-javascriptcore"; + "gi-notify" = dontDistribute super."gi-notify"; + "gi-pango" = dontDistribute super."gi-pango"; + "gi-soup" = dontDistribute super."gi-soup"; + "gi-vte" = dontDistribute super."gi-vte"; + "gi-webkit" = dontDistribute super."gi-webkit"; "gimlh" = dontDistribute super."gimlh"; "ginger" = dontDistribute super."ginger"; "ginsu" = dontDistribute super."ginsu"; @@ -3333,6 +3355,7 @@ self: super: { "git-date" = dontDistribute super."git-date"; "git-freq" = dontDistribute super."git-freq"; "git-gpush" = dontDistribute super."git-gpush"; + "git-jump" = dontDistribute super."git-jump"; "git-monitor" = dontDistribute super."git-monitor"; "git-object" = dontDistribute super."git-object"; "git-repair" = dontDistribute super."git-repair"; @@ -3818,6 +3841,8 @@ self: super: { "haskell-formatter" = dontDistribute super."haskell-formatter"; "haskell-ftp" = dontDistribute super."haskell-ftp"; "haskell-generate" = dontDistribute super."haskell-generate"; + "haskell-gi" = dontDistribute super."haskell-gi"; + "haskell-gi-base" = dontDistribute super."haskell-gi-base"; "haskell-import-graph" = dontDistribute super."haskell-import-graph"; "haskell-in-space" = dontDistribute super."haskell-in-space"; "haskell-modbus" = dontDistribute super."haskell-modbus"; @@ -4022,6 +4047,7 @@ self: super: { "hfann" = dontDistribute super."hfann"; "hfd" = dontDistribute super."hfd"; "hfiar" = dontDistribute super."hfiar"; + "hfmt" = dontDistribute super."hfmt"; "hfoil" = dontDistribute super."hfoil"; "hfov" = dontDistribute super."hfov"; "hfractal" = dontDistribute super."hfractal"; @@ -4440,6 +4466,7 @@ self: super: { "hsx2hs" = dontDistribute super."hsx2hs"; "hsyscall" = dontDistribute super."hsyscall"; "hszephyr" = dontDistribute super."hszephyr"; + "htaglib" = dontDistribute super."htaglib"; "htags" = dontDistribute super."htags"; "htar" = dontDistribute super."htar"; "htiled" = dontDistribute super."htiled"; @@ -4882,6 +4909,7 @@ self: super: { "keera-hails-reactive-polling" = dontDistribute super."keera-hails-reactive-polling"; "keera-hails-reactive-wx" = dontDistribute super."keera-hails-reactive-wx"; "keera-hails-reactive-yampa" = dontDistribute super."keera-hails-reactive-yampa"; + "keera-hails-reactivelenses" = dontDistribute super."keera-hails-reactivelenses"; "keera-hails-reactivevalues" = dontDistribute super."keera-hails-reactivevalues"; "keera-posture" = dontDistribute super."keera-posture"; "keiretsu" = dontDistribute super."keiretsu"; @@ -5006,6 +5034,8 @@ self: super: { "lat" = dontDistribute super."lat"; "latest-npm-version" = dontDistribute super."latest-npm-version"; "latex" = dontDistribute super."latex"; + "latex-formulae-image" = dontDistribute super."latex-formulae-image"; + "latex-formulae-pandoc" = dontDistribute super."latex-formulae-pandoc"; "lattices" = dontDistribute super."lattices"; "launchpad-control" = dontDistribute super."launchpad-control"; "lax" = dontDistribute super."lax"; @@ -5379,6 +5409,7 @@ self: super: { "memexml" = dontDistribute super."memexml"; "memo-ptr" = dontDistribute super."memo-ptr"; "memo-sqlite" = dontDistribute super."memo-sqlite"; + "memoization-utils" = dontDistribute super."memoization-utils"; "memoize" = dontDistribute super."memoize"; "memory" = dontDistribute super."memory"; "memscript" = dontDistribute super."memscript"; @@ -5823,6 +5854,7 @@ self: super: { "nthable" = dontDistribute super."nthable"; "ntp-control" = dontDistribute super."ntp-control"; "null-canvas" = dontDistribute super."null-canvas"; + "nullary" = dontDistribute super."nullary"; "number" = dontDistribute super."number"; "numbering" = dontDistribute super."numbering"; "numerals" = dontDistribute super."numerals"; @@ -6049,6 +6081,7 @@ self: super: { "pcg-random" = dontDistribute super."pcg-random"; "pcre-heavy" = dontDistribute super."pcre-heavy"; "pcre-less" = dontDistribute super."pcre-less"; + "pcre-light" = doDistribute super."pcre-light_0_4_0_3"; "pcre-light-extra" = dontDistribute super."pcre-light-extra"; "pcre-utils" = dontDistribute super."pcre-utils"; "pdf-toolbox-content" = dontDistribute super."pdf-toolbox-content"; @@ -6425,6 +6458,7 @@ self: super: { "qc-oi-testgenerator" = dontDistribute super."qc-oi-testgenerator"; "qd" = dontDistribute super."qd"; "qd-vec" = dontDistribute super."qd-vec"; + "qed" = dontDistribute super."qed"; "qhull-simple" = dontDistribute super."qhull-simple"; "qrcode" = dontDistribute super."qrcode"; "qt" = dontDistribute super."qt"; @@ -6440,6 +6474,7 @@ self: super: { "queue" = dontDistribute super."queue"; "queuelike" = dontDistribute super."queuelike"; "quick-generator" = dontDistribute super."quick-generator"; + "quick-schema" = dontDistribute super."quick-schema"; "quickcheck-assertions" = doDistribute super."quickcheck-assertions_0_1_1"; "quickcheck-instances" = doDistribute super."quickcheck-instances_0_3_10"; "quickcheck-io" = doDistribute super."quickcheck-io_0_1_1"; @@ -6940,6 +6975,7 @@ self: super: { "servant" = dontDistribute super."servant"; "servant-JuicyPixels" = dontDistribute super."servant-JuicyPixels"; "servant-blaze" = dontDistribute super."servant-blaze"; + "servant-cassava" = dontDistribute super."servant-cassava"; "servant-client" = dontDistribute super."servant-client"; "servant-docs" = dontDistribute super."servant-docs"; "servant-ede" = dontDistribute super."servant-ede"; @@ -6953,6 +6989,7 @@ self: super: { "servant-response" = dontDistribute super."servant-response"; "servant-scotty" = dontDistribute super."servant-scotty"; "servant-server" = dontDistribute super."servant-server"; + "servant-swagger" = dontDistribute super."servant-swagger"; "servant-yaml" = dontDistribute super."servant-yaml"; "serversession" = dontDistribute super."serversession"; "serversession-backend-acid-state" = dontDistribute super."serversession-backend-acid-state"; @@ -8138,6 +8175,7 @@ self: super: { "verdict" = dontDistribute super."verdict"; "verdict-json" = dontDistribute super."verdict-json"; "verilog" = dontDistribute super."verilog"; + "versions" = dontDistribute super."versions"; "vhdl" = dontDistribute super."vhdl"; "views" = dontDistribute super."views"; "vigilance" = dontDistribute super."vigilance"; @@ -8589,6 +8627,7 @@ self: super: { "zendesk-api" = dontDistribute super."zendesk-api"; "zeno" = dontDistribute super."zeno"; "zero" = dontDistribute super."zero"; + "zerobin" = dontDistribute super."zerobin"; "zeromq-haskell" = dontDistribute super."zeromq-haskell"; "zeromq3-conduit" = dontDistribute super."zeromq3-conduit"; "zeromq3-haskell" = dontDistribute super."zeromq3-haskell"; diff --git a/pkgs/development/haskell-modules/configuration-lts-1.13.nix b/pkgs/development/haskell-modules/configuration-lts-1.13.nix index b12f6f74a92a..381994143e2d 100644 --- a/pkgs/development/haskell-modules/configuration-lts-1.13.nix +++ b/pkgs/development/haskell-modules/configuration-lts-1.13.nix @@ -512,6 +512,7 @@ self: super: { "HasGP" = dontDistribute super."HasGP"; "Haschoo" = dontDistribute super."Haschoo"; "Hashell" = dontDistribute super."Hashell"; + "HaskRel" = dontDistribute super."HaskRel"; "HaskellForMaths" = dontDistribute super."HaskellForMaths"; "HaskellLM" = dontDistribute super."HaskellLM"; "HaskellNN" = dontDistribute super."HaskellNN"; @@ -558,6 +559,7 @@ self: super: { "Hsed" = dontDistribute super."Hsed"; "Hsmtlib" = dontDistribute super."Hsmtlib"; "HueAPI" = dontDistribute super."HueAPI"; + "HulkImport" = dontDistribute super."HulkImport"; "Hungarian-Munkres" = dontDistribute super."Hungarian-Munkres"; "IDynamic" = dontDistribute super."IDynamic"; "IFS" = dontDistribute super."IFS"; @@ -1162,6 +1164,7 @@ self: super: { "afis" = dontDistribute super."afis"; "afv" = dontDistribute super."afv"; "agda-server" = dontDistribute super."agda-server"; + "agda-snippets" = dontDistribute super."agda-snippets"; "agentx" = dontDistribute super."agentx"; "agum" = dontDistribute super."agum"; "aig" = dontDistribute super."aig"; @@ -1986,6 +1989,7 @@ self: super: { "cipher-aes" = doDistribute super."cipher-aes_0_2_10"; "cipher-aes128" = dontDistribute super."cipher-aes128"; "cipher-rc5" = dontDistribute super."cipher-rc5"; + "ciphersaber2" = dontDistribute super."ciphersaber2"; "circ" = dontDistribute super."circ"; "cirru-parser" = dontDistribute super."cirru-parser"; "citation-resolve" = dontDistribute super."citation-resolve"; @@ -2447,6 +2451,7 @@ self: super: { "dataflow" = dontDistribute super."dataflow"; "datalog" = dontDistribute super."datalog"; "datapacker" = dontDistribute super."datapacker"; + "dataurl" = dontDistribute super."dataurl"; "date-cache" = dontDistribute super."date-cache"; "dates" = dontDistribute super."dates"; "datetime" = dontDistribute super."datetime"; @@ -2857,6 +2862,7 @@ self: super: { "eros-client" = dontDistribute super."eros-client"; "eros-http" = dontDistribute super."eros-http"; "errno" = dontDistribute super."errno"; + "error-analyze" = dontDistribute super."error-analyze"; "error-continuations" = dontDistribute super."error-continuations"; "error-list" = dontDistribute super."error-list"; "error-loc" = dontDistribute super."error-loc"; @@ -2912,6 +2918,7 @@ self: super: { "exinst-deepseq" = dontDistribute super."exinst-deepseq"; "exinst-hashable" = dontDistribute super."exinst-hashable"; "exists" = dontDistribute super."exists"; + "exit-codes" = dontDistribute super."exit-codes"; "exp-pairs" = dontDistribute super."exp-pairs"; "expand" = dontDistribute super."expand"; "expat-enumerator" = dontDistribute super."expat-enumerator"; @@ -3032,6 +3039,7 @@ self: super: { "fingertree-psqueue" = dontDistribute super."fingertree-psqueue"; "fingertree-tf" = dontDistribute super."fingertree-tf"; "finite-field" = dontDistribute super."finite-field"; + "finite-typelits" = dontDistribute super."finite-typelits"; "first-and-last" = dontDistribute super."first-and-last"; "first-class-patterns" = dontDistribute super."first-class-patterns"; "firstify" = dontDistribute super."firstify"; @@ -3320,6 +3328,20 @@ self: super: { "ghclive" = dontDistribute super."ghclive"; "ghczdecode" = dontDistribute super."ghczdecode"; "ght" = dontDistribute super."ght"; + "gi-atk" = dontDistribute super."gi-atk"; + "gi-cairo" = dontDistribute super."gi-cairo"; + "gi-gdk" = dontDistribute super."gi-gdk"; + "gi-gdkpixbuf" = dontDistribute super."gi-gdkpixbuf"; + "gi-gio" = dontDistribute super."gi-gio"; + "gi-glib" = dontDistribute super."gi-glib"; + "gi-gobject" = dontDistribute super."gi-gobject"; + "gi-gtk" = dontDistribute super."gi-gtk"; + "gi-javascriptcore" = dontDistribute super."gi-javascriptcore"; + "gi-notify" = dontDistribute super."gi-notify"; + "gi-pango" = dontDistribute super."gi-pango"; + "gi-soup" = dontDistribute super."gi-soup"; + "gi-vte" = dontDistribute super."gi-vte"; + "gi-webkit" = dontDistribute super."gi-webkit"; "gimlh" = dontDistribute super."gimlh"; "ginger" = dontDistribute super."ginger"; "ginsu" = dontDistribute super."ginsu"; @@ -3332,6 +3354,7 @@ self: super: { "git-date" = dontDistribute super."git-date"; "git-freq" = dontDistribute super."git-freq"; "git-gpush" = dontDistribute super."git-gpush"; + "git-jump" = dontDistribute super."git-jump"; "git-monitor" = dontDistribute super."git-monitor"; "git-object" = dontDistribute super."git-object"; "git-repair" = dontDistribute super."git-repair"; @@ -3816,6 +3839,8 @@ self: super: { "haskell-formatter" = dontDistribute super."haskell-formatter"; "haskell-ftp" = dontDistribute super."haskell-ftp"; "haskell-generate" = dontDistribute super."haskell-generate"; + "haskell-gi" = dontDistribute super."haskell-gi"; + "haskell-gi-base" = dontDistribute super."haskell-gi-base"; "haskell-import-graph" = dontDistribute super."haskell-import-graph"; "haskell-in-space" = dontDistribute super."haskell-in-space"; "haskell-modbus" = dontDistribute super."haskell-modbus"; @@ -4020,6 +4045,7 @@ self: super: { "hfann" = dontDistribute super."hfann"; "hfd" = dontDistribute super."hfd"; "hfiar" = dontDistribute super."hfiar"; + "hfmt" = dontDistribute super."hfmt"; "hfoil" = dontDistribute super."hfoil"; "hfov" = dontDistribute super."hfov"; "hfractal" = dontDistribute super."hfractal"; @@ -4438,6 +4464,7 @@ self: super: { "hsx2hs" = dontDistribute super."hsx2hs"; "hsyscall" = dontDistribute super."hsyscall"; "hszephyr" = dontDistribute super."hszephyr"; + "htaglib" = dontDistribute super."htaglib"; "htags" = dontDistribute super."htags"; "htar" = dontDistribute super."htar"; "htiled" = dontDistribute super."htiled"; @@ -4880,6 +4907,7 @@ self: super: { "keera-hails-reactive-polling" = dontDistribute super."keera-hails-reactive-polling"; "keera-hails-reactive-wx" = dontDistribute super."keera-hails-reactive-wx"; "keera-hails-reactive-yampa" = dontDistribute super."keera-hails-reactive-yampa"; + "keera-hails-reactivelenses" = dontDistribute super."keera-hails-reactivelenses"; "keera-hails-reactivevalues" = dontDistribute super."keera-hails-reactivevalues"; "keera-posture" = dontDistribute super."keera-posture"; "keiretsu" = dontDistribute super."keiretsu"; @@ -5004,6 +5032,8 @@ self: super: { "lat" = dontDistribute super."lat"; "latest-npm-version" = dontDistribute super."latest-npm-version"; "latex" = dontDistribute super."latex"; + "latex-formulae-image" = dontDistribute super."latex-formulae-image"; + "latex-formulae-pandoc" = dontDistribute super."latex-formulae-pandoc"; "lattices" = dontDistribute super."lattices"; "launchpad-control" = dontDistribute super."launchpad-control"; "lax" = dontDistribute super."lax"; @@ -5377,6 +5407,7 @@ self: super: { "memexml" = dontDistribute super."memexml"; "memo-ptr" = dontDistribute super."memo-ptr"; "memo-sqlite" = dontDistribute super."memo-sqlite"; + "memoization-utils" = dontDistribute super."memoization-utils"; "memoize" = dontDistribute super."memoize"; "memory" = dontDistribute super."memory"; "memscript" = dontDistribute super."memscript"; @@ -5821,6 +5852,7 @@ self: super: { "nthable" = dontDistribute super."nthable"; "ntp-control" = dontDistribute super."ntp-control"; "null-canvas" = dontDistribute super."null-canvas"; + "nullary" = dontDistribute super."nullary"; "number" = dontDistribute super."number"; "numbering" = dontDistribute super."numbering"; "numerals" = dontDistribute super."numerals"; @@ -6047,6 +6079,7 @@ self: super: { "pcg-random" = dontDistribute super."pcg-random"; "pcre-heavy" = dontDistribute super."pcre-heavy"; "pcre-less" = dontDistribute super."pcre-less"; + "pcre-light" = doDistribute super."pcre-light_0_4_0_3"; "pcre-light-extra" = dontDistribute super."pcre-light-extra"; "pcre-utils" = dontDistribute super."pcre-utils"; "pdf-toolbox-content" = dontDistribute super."pdf-toolbox-content"; @@ -6423,6 +6456,7 @@ self: super: { "qc-oi-testgenerator" = dontDistribute super."qc-oi-testgenerator"; "qd" = dontDistribute super."qd"; "qd-vec" = dontDistribute super."qd-vec"; + "qed" = dontDistribute super."qed"; "qhull-simple" = dontDistribute super."qhull-simple"; "qrcode" = dontDistribute super."qrcode"; "qt" = dontDistribute super."qt"; @@ -6438,6 +6472,7 @@ self: super: { "queue" = dontDistribute super."queue"; "queuelike" = dontDistribute super."queuelike"; "quick-generator" = dontDistribute super."quick-generator"; + "quick-schema" = dontDistribute super."quick-schema"; "quickcheck-assertions" = doDistribute super."quickcheck-assertions_0_1_1"; "quickcheck-instances" = doDistribute super."quickcheck-instances_0_3_10"; "quickcheck-io" = doDistribute super."quickcheck-io_0_1_1"; @@ -6938,6 +6973,7 @@ self: super: { "servant" = dontDistribute super."servant"; "servant-JuicyPixels" = dontDistribute super."servant-JuicyPixels"; "servant-blaze" = dontDistribute super."servant-blaze"; + "servant-cassava" = dontDistribute super."servant-cassava"; "servant-client" = dontDistribute super."servant-client"; "servant-docs" = dontDistribute super."servant-docs"; "servant-ede" = dontDistribute super."servant-ede"; @@ -6951,6 +6987,7 @@ self: super: { "servant-response" = dontDistribute super."servant-response"; "servant-scotty" = dontDistribute super."servant-scotty"; "servant-server" = dontDistribute super."servant-server"; + "servant-swagger" = dontDistribute super."servant-swagger"; "servant-yaml" = dontDistribute super."servant-yaml"; "serversession" = dontDistribute super."serversession"; "serversession-backend-acid-state" = dontDistribute super."serversession-backend-acid-state"; @@ -8135,6 +8172,7 @@ self: super: { "verdict" = dontDistribute super."verdict"; "verdict-json" = dontDistribute super."verdict-json"; "verilog" = dontDistribute super."verilog"; + "versions" = dontDistribute super."versions"; "vhdl" = dontDistribute super."vhdl"; "views" = dontDistribute super."views"; "vigilance" = dontDistribute super."vigilance"; @@ -8586,6 +8624,7 @@ self: super: { "zendesk-api" = dontDistribute super."zendesk-api"; "zeno" = dontDistribute super."zeno"; "zero" = dontDistribute super."zero"; + "zerobin" = dontDistribute super."zerobin"; "zeromq-haskell" = dontDistribute super."zeromq-haskell"; "zeromq3-conduit" = dontDistribute super."zeromq3-conduit"; "zeromq3-haskell" = dontDistribute super."zeromq3-haskell"; diff --git a/pkgs/development/haskell-modules/configuration-lts-1.14.nix b/pkgs/development/haskell-modules/configuration-lts-1.14.nix index ca896092bf41..2304fdd84905 100644 --- a/pkgs/development/haskell-modules/configuration-lts-1.14.nix +++ b/pkgs/development/haskell-modules/configuration-lts-1.14.nix @@ -511,6 +511,7 @@ self: super: { "HasGP" = dontDistribute super."HasGP"; "Haschoo" = dontDistribute super."Haschoo"; "Hashell" = dontDistribute super."Hashell"; + "HaskRel" = dontDistribute super."HaskRel"; "HaskellForMaths" = dontDistribute super."HaskellForMaths"; "HaskellLM" = dontDistribute super."HaskellLM"; "HaskellNN" = dontDistribute super."HaskellNN"; @@ -557,6 +558,7 @@ self: super: { "Hsed" = dontDistribute super."Hsed"; "Hsmtlib" = dontDistribute super."Hsmtlib"; "HueAPI" = dontDistribute super."HueAPI"; + "HulkImport" = dontDistribute super."HulkImport"; "Hungarian-Munkres" = dontDistribute super."Hungarian-Munkres"; "IDynamic" = dontDistribute super."IDynamic"; "IFS" = dontDistribute super."IFS"; @@ -1161,6 +1163,7 @@ self: super: { "afis" = dontDistribute super."afis"; "afv" = dontDistribute super."afv"; "agda-server" = dontDistribute super."agda-server"; + "agda-snippets" = dontDistribute super."agda-snippets"; "agentx" = dontDistribute super."agentx"; "agum" = dontDistribute super."agum"; "aig" = dontDistribute super."aig"; @@ -1984,6 +1987,7 @@ self: super: { "cipher-aes" = doDistribute super."cipher-aes_0_2_10"; "cipher-aes128" = dontDistribute super."cipher-aes128"; "cipher-rc5" = dontDistribute super."cipher-rc5"; + "ciphersaber2" = dontDistribute super."ciphersaber2"; "circ" = dontDistribute super."circ"; "cirru-parser" = dontDistribute super."cirru-parser"; "citation-resolve" = dontDistribute super."citation-resolve"; @@ -2444,6 +2448,7 @@ self: super: { "dataflow" = dontDistribute super."dataflow"; "datalog" = dontDistribute super."datalog"; "datapacker" = dontDistribute super."datapacker"; + "dataurl" = dontDistribute super."dataurl"; "date-cache" = dontDistribute super."date-cache"; "dates" = dontDistribute super."dates"; "datetime" = dontDistribute super."datetime"; @@ -2854,6 +2859,7 @@ self: super: { "eros-client" = dontDistribute super."eros-client"; "eros-http" = dontDistribute super."eros-http"; "errno" = dontDistribute super."errno"; + "error-analyze" = dontDistribute super."error-analyze"; "error-continuations" = dontDistribute super."error-continuations"; "error-list" = dontDistribute super."error-list"; "error-loc" = dontDistribute super."error-loc"; @@ -2909,6 +2915,7 @@ self: super: { "exinst-deepseq" = dontDistribute super."exinst-deepseq"; "exinst-hashable" = dontDistribute super."exinst-hashable"; "exists" = dontDistribute super."exists"; + "exit-codes" = dontDistribute super."exit-codes"; "exp-pairs" = dontDistribute super."exp-pairs"; "expand" = dontDistribute super."expand"; "expat-enumerator" = dontDistribute super."expat-enumerator"; @@ -3029,6 +3036,7 @@ self: super: { "fingertree-psqueue" = dontDistribute super."fingertree-psqueue"; "fingertree-tf" = dontDistribute super."fingertree-tf"; "finite-field" = dontDistribute super."finite-field"; + "finite-typelits" = dontDistribute super."finite-typelits"; "first-and-last" = dontDistribute super."first-and-last"; "first-class-patterns" = dontDistribute super."first-class-patterns"; "firstify" = dontDistribute super."firstify"; @@ -3317,6 +3325,20 @@ self: super: { "ghclive" = dontDistribute super."ghclive"; "ghczdecode" = dontDistribute super."ghczdecode"; "ght" = dontDistribute super."ght"; + "gi-atk" = dontDistribute super."gi-atk"; + "gi-cairo" = dontDistribute super."gi-cairo"; + "gi-gdk" = dontDistribute super."gi-gdk"; + "gi-gdkpixbuf" = dontDistribute super."gi-gdkpixbuf"; + "gi-gio" = dontDistribute super."gi-gio"; + "gi-glib" = dontDistribute super."gi-glib"; + "gi-gobject" = dontDistribute super."gi-gobject"; + "gi-gtk" = dontDistribute super."gi-gtk"; + "gi-javascriptcore" = dontDistribute super."gi-javascriptcore"; + "gi-notify" = dontDistribute super."gi-notify"; + "gi-pango" = dontDistribute super."gi-pango"; + "gi-soup" = dontDistribute super."gi-soup"; + "gi-vte" = dontDistribute super."gi-vte"; + "gi-webkit" = dontDistribute super."gi-webkit"; "gimlh" = dontDistribute super."gimlh"; "ginger" = dontDistribute super."ginger"; "ginsu" = dontDistribute super."ginsu"; @@ -3329,6 +3351,7 @@ self: super: { "git-date" = dontDistribute super."git-date"; "git-freq" = dontDistribute super."git-freq"; "git-gpush" = dontDistribute super."git-gpush"; + "git-jump" = dontDistribute super."git-jump"; "git-monitor" = dontDistribute super."git-monitor"; "git-object" = dontDistribute super."git-object"; "git-repair" = dontDistribute super."git-repair"; @@ -3813,6 +3836,8 @@ self: super: { "haskell-formatter" = dontDistribute super."haskell-formatter"; "haskell-ftp" = dontDistribute super."haskell-ftp"; "haskell-generate" = dontDistribute super."haskell-generate"; + "haskell-gi" = dontDistribute super."haskell-gi"; + "haskell-gi-base" = dontDistribute super."haskell-gi-base"; "haskell-import-graph" = dontDistribute super."haskell-import-graph"; "haskell-in-space" = dontDistribute super."haskell-in-space"; "haskell-modbus" = dontDistribute super."haskell-modbus"; @@ -4016,6 +4041,7 @@ self: super: { "hfann" = dontDistribute super."hfann"; "hfd" = dontDistribute super."hfd"; "hfiar" = dontDistribute super."hfiar"; + "hfmt" = dontDistribute super."hfmt"; "hfoil" = dontDistribute super."hfoil"; "hfov" = dontDistribute super."hfov"; "hfractal" = dontDistribute super."hfractal"; @@ -4434,6 +4460,7 @@ self: super: { "hsx2hs" = dontDistribute super."hsx2hs"; "hsyscall" = dontDistribute super."hsyscall"; "hszephyr" = dontDistribute super."hszephyr"; + "htaglib" = dontDistribute super."htaglib"; "htags" = dontDistribute super."htags"; "htar" = dontDistribute super."htar"; "htiled" = dontDistribute super."htiled"; @@ -4875,6 +4902,7 @@ self: super: { "keera-hails-reactive-polling" = dontDistribute super."keera-hails-reactive-polling"; "keera-hails-reactive-wx" = dontDistribute super."keera-hails-reactive-wx"; "keera-hails-reactive-yampa" = dontDistribute super."keera-hails-reactive-yampa"; + "keera-hails-reactivelenses" = dontDistribute super."keera-hails-reactivelenses"; "keera-hails-reactivevalues" = dontDistribute super."keera-hails-reactivevalues"; "keera-posture" = dontDistribute super."keera-posture"; "keiretsu" = dontDistribute super."keiretsu"; @@ -4999,6 +5027,8 @@ self: super: { "lat" = dontDistribute super."lat"; "latest-npm-version" = dontDistribute super."latest-npm-version"; "latex" = dontDistribute super."latex"; + "latex-formulae-image" = dontDistribute super."latex-formulae-image"; + "latex-formulae-pandoc" = dontDistribute super."latex-formulae-pandoc"; "lattices" = dontDistribute super."lattices"; "launchpad-control" = dontDistribute super."launchpad-control"; "lax" = dontDistribute super."lax"; @@ -5372,6 +5402,7 @@ self: super: { "memexml" = dontDistribute super."memexml"; "memo-ptr" = dontDistribute super."memo-ptr"; "memo-sqlite" = dontDistribute super."memo-sqlite"; + "memoization-utils" = dontDistribute super."memoization-utils"; "memoize" = dontDistribute super."memoize"; "memory" = dontDistribute super."memory"; "memscript" = dontDistribute super."memscript"; @@ -5814,6 +5845,7 @@ self: super: { "nthable" = dontDistribute super."nthable"; "ntp-control" = dontDistribute super."ntp-control"; "null-canvas" = dontDistribute super."null-canvas"; + "nullary" = dontDistribute super."nullary"; "number" = dontDistribute super."number"; "numbering" = dontDistribute super."numbering"; "numerals" = dontDistribute super."numerals"; @@ -6040,6 +6072,7 @@ self: super: { "pcg-random" = dontDistribute super."pcg-random"; "pcre-heavy" = dontDistribute super."pcre-heavy"; "pcre-less" = dontDistribute super."pcre-less"; + "pcre-light" = doDistribute super."pcre-light_0_4_0_3"; "pcre-light-extra" = dontDistribute super."pcre-light-extra"; "pcre-utils" = dontDistribute super."pcre-utils"; "pdf-toolbox-content" = dontDistribute super."pdf-toolbox-content"; @@ -6416,6 +6449,7 @@ self: super: { "qc-oi-testgenerator" = dontDistribute super."qc-oi-testgenerator"; "qd" = dontDistribute super."qd"; "qd-vec" = dontDistribute super."qd-vec"; + "qed" = dontDistribute super."qed"; "qhull-simple" = dontDistribute super."qhull-simple"; "qrcode" = dontDistribute super."qrcode"; "qt" = dontDistribute super."qt"; @@ -6431,6 +6465,7 @@ self: super: { "queue" = dontDistribute super."queue"; "queuelike" = dontDistribute super."queuelike"; "quick-generator" = dontDistribute super."quick-generator"; + "quick-schema" = dontDistribute super."quick-schema"; "quickcheck-assertions" = doDistribute super."quickcheck-assertions_0_1_1"; "quickcheck-instances" = doDistribute super."quickcheck-instances_0_3_10"; "quickcheck-io" = doDistribute super."quickcheck-io_0_1_1"; @@ -6930,6 +6965,7 @@ self: super: { "servant" = dontDistribute super."servant"; "servant-JuicyPixels" = dontDistribute super."servant-JuicyPixels"; "servant-blaze" = dontDistribute super."servant-blaze"; + "servant-cassava" = dontDistribute super."servant-cassava"; "servant-client" = dontDistribute super."servant-client"; "servant-docs" = dontDistribute super."servant-docs"; "servant-ede" = dontDistribute super."servant-ede"; @@ -6943,6 +6979,7 @@ self: super: { "servant-response" = dontDistribute super."servant-response"; "servant-scotty" = dontDistribute super."servant-scotty"; "servant-server" = dontDistribute super."servant-server"; + "servant-swagger" = dontDistribute super."servant-swagger"; "servant-yaml" = dontDistribute super."servant-yaml"; "serversession" = dontDistribute super."serversession"; "serversession-backend-acid-state" = dontDistribute super."serversession-backend-acid-state"; @@ -8127,6 +8164,7 @@ self: super: { "verdict" = dontDistribute super."verdict"; "verdict-json" = dontDistribute super."verdict-json"; "verilog" = dontDistribute super."verilog"; + "versions" = dontDistribute super."versions"; "vhdl" = dontDistribute super."vhdl"; "views" = dontDistribute super."views"; "vigilance" = dontDistribute super."vigilance"; @@ -8578,6 +8616,7 @@ self: super: { "zendesk-api" = dontDistribute super."zendesk-api"; "zeno" = dontDistribute super."zeno"; "zero" = dontDistribute super."zero"; + "zerobin" = dontDistribute super."zerobin"; "zeromq-haskell" = dontDistribute super."zeromq-haskell"; "zeromq3-conduit" = dontDistribute super."zeromq3-conduit"; "zeromq3-haskell" = dontDistribute super."zeromq3-haskell"; diff --git a/pkgs/development/haskell-modules/configuration-lts-1.15.nix b/pkgs/development/haskell-modules/configuration-lts-1.15.nix index 58a3fde7d4e2..1fbd669eed42 100644 --- a/pkgs/development/haskell-modules/configuration-lts-1.15.nix +++ b/pkgs/development/haskell-modules/configuration-lts-1.15.nix @@ -511,6 +511,7 @@ self: super: { "HasGP" = dontDistribute super."HasGP"; "Haschoo" = dontDistribute super."Haschoo"; "Hashell" = dontDistribute super."Hashell"; + "HaskRel" = dontDistribute super."HaskRel"; "HaskellForMaths" = dontDistribute super."HaskellForMaths"; "HaskellLM" = dontDistribute super."HaskellLM"; "HaskellNN" = dontDistribute super."HaskellNN"; @@ -557,6 +558,7 @@ self: super: { "Hsed" = dontDistribute super."Hsed"; "Hsmtlib" = dontDistribute super."Hsmtlib"; "HueAPI" = dontDistribute super."HueAPI"; + "HulkImport" = dontDistribute super."HulkImport"; "Hungarian-Munkres" = dontDistribute super."Hungarian-Munkres"; "IDynamic" = dontDistribute super."IDynamic"; "IFS" = dontDistribute super."IFS"; @@ -1160,6 +1162,7 @@ self: super: { "afis" = dontDistribute super."afis"; "afv" = dontDistribute super."afv"; "agda-server" = dontDistribute super."agda-server"; + "agda-snippets" = dontDistribute super."agda-snippets"; "agentx" = dontDistribute super."agentx"; "agum" = dontDistribute super."agum"; "aig" = dontDistribute super."aig"; @@ -1982,6 +1985,7 @@ self: super: { "cipher-aes" = doDistribute super."cipher-aes_0_2_10"; "cipher-aes128" = dontDistribute super."cipher-aes128"; "cipher-rc5" = dontDistribute super."cipher-rc5"; + "ciphersaber2" = dontDistribute super."ciphersaber2"; "circ" = dontDistribute super."circ"; "cirru-parser" = dontDistribute super."cirru-parser"; "citation-resolve" = dontDistribute super."citation-resolve"; @@ -2440,6 +2444,7 @@ self: super: { "dataflow" = dontDistribute super."dataflow"; "datalog" = dontDistribute super."datalog"; "datapacker" = dontDistribute super."datapacker"; + "dataurl" = dontDistribute super."dataurl"; "date-cache" = dontDistribute super."date-cache"; "dates" = dontDistribute super."dates"; "datetime" = dontDistribute super."datetime"; @@ -2849,6 +2854,7 @@ self: super: { "eros-client" = dontDistribute super."eros-client"; "eros-http" = dontDistribute super."eros-http"; "errno" = dontDistribute super."errno"; + "error-analyze" = dontDistribute super."error-analyze"; "error-continuations" = dontDistribute super."error-continuations"; "error-list" = dontDistribute super."error-list"; "error-loc" = dontDistribute super."error-loc"; @@ -2904,6 +2910,7 @@ self: super: { "exinst-deepseq" = dontDistribute super."exinst-deepseq"; "exinst-hashable" = dontDistribute super."exinst-hashable"; "exists" = dontDistribute super."exists"; + "exit-codes" = dontDistribute super."exit-codes"; "exp-pairs" = dontDistribute super."exp-pairs"; "expand" = dontDistribute super."expand"; "expat-enumerator" = dontDistribute super."expat-enumerator"; @@ -3024,6 +3031,7 @@ self: super: { "fingertree-psqueue" = dontDistribute super."fingertree-psqueue"; "fingertree-tf" = dontDistribute super."fingertree-tf"; "finite-field" = dontDistribute super."finite-field"; + "finite-typelits" = dontDistribute super."finite-typelits"; "first-and-last" = dontDistribute super."first-and-last"; "first-class-patterns" = dontDistribute super."first-class-patterns"; "firstify" = dontDistribute super."firstify"; @@ -3312,6 +3320,20 @@ self: super: { "ghclive" = dontDistribute super."ghclive"; "ghczdecode" = dontDistribute super."ghczdecode"; "ght" = dontDistribute super."ght"; + "gi-atk" = dontDistribute super."gi-atk"; + "gi-cairo" = dontDistribute super."gi-cairo"; + "gi-gdk" = dontDistribute super."gi-gdk"; + "gi-gdkpixbuf" = dontDistribute super."gi-gdkpixbuf"; + "gi-gio" = dontDistribute super."gi-gio"; + "gi-glib" = dontDistribute super."gi-glib"; + "gi-gobject" = dontDistribute super."gi-gobject"; + "gi-gtk" = dontDistribute super."gi-gtk"; + "gi-javascriptcore" = dontDistribute super."gi-javascriptcore"; + "gi-notify" = dontDistribute super."gi-notify"; + "gi-pango" = dontDistribute super."gi-pango"; + "gi-soup" = dontDistribute super."gi-soup"; + "gi-vte" = dontDistribute super."gi-vte"; + "gi-webkit" = dontDistribute super."gi-webkit"; "gimlh" = dontDistribute super."gimlh"; "ginger" = dontDistribute super."ginger"; "ginsu" = dontDistribute super."ginsu"; @@ -3324,6 +3346,7 @@ self: super: { "git-date" = dontDistribute super."git-date"; "git-freq" = dontDistribute super."git-freq"; "git-gpush" = dontDistribute super."git-gpush"; + "git-jump" = dontDistribute super."git-jump"; "git-monitor" = dontDistribute super."git-monitor"; "git-object" = dontDistribute super."git-object"; "git-repair" = dontDistribute super."git-repair"; @@ -3808,6 +3831,8 @@ self: super: { "haskell-formatter" = dontDistribute super."haskell-formatter"; "haskell-ftp" = dontDistribute super."haskell-ftp"; "haskell-generate" = dontDistribute super."haskell-generate"; + "haskell-gi" = dontDistribute super."haskell-gi"; + "haskell-gi-base" = dontDistribute super."haskell-gi-base"; "haskell-import-graph" = dontDistribute super."haskell-import-graph"; "haskell-in-space" = dontDistribute super."haskell-in-space"; "haskell-modbus" = dontDistribute super."haskell-modbus"; @@ -4011,6 +4036,7 @@ self: super: { "hfann" = dontDistribute super."hfann"; "hfd" = dontDistribute super."hfd"; "hfiar" = dontDistribute super."hfiar"; + "hfmt" = dontDistribute super."hfmt"; "hfoil" = dontDistribute super."hfoil"; "hfov" = dontDistribute super."hfov"; "hfractal" = dontDistribute super."hfractal"; @@ -4429,6 +4455,7 @@ self: super: { "hsx2hs" = dontDistribute super."hsx2hs"; "hsyscall" = dontDistribute super."hsyscall"; "hszephyr" = dontDistribute super."hszephyr"; + "htaglib" = dontDistribute super."htaglib"; "htags" = dontDistribute super."htags"; "htar" = dontDistribute super."htar"; "htiled" = dontDistribute super."htiled"; @@ -4870,6 +4897,7 @@ self: super: { "keera-hails-reactive-polling" = dontDistribute super."keera-hails-reactive-polling"; "keera-hails-reactive-wx" = dontDistribute super."keera-hails-reactive-wx"; "keera-hails-reactive-yampa" = dontDistribute super."keera-hails-reactive-yampa"; + "keera-hails-reactivelenses" = dontDistribute super."keera-hails-reactivelenses"; "keera-hails-reactivevalues" = dontDistribute super."keera-hails-reactivevalues"; "keera-posture" = dontDistribute super."keera-posture"; "keiretsu" = dontDistribute super."keiretsu"; @@ -4994,6 +5022,8 @@ self: super: { "lat" = dontDistribute super."lat"; "latest-npm-version" = dontDistribute super."latest-npm-version"; "latex" = dontDistribute super."latex"; + "latex-formulae-image" = dontDistribute super."latex-formulae-image"; + "latex-formulae-pandoc" = dontDistribute super."latex-formulae-pandoc"; "lattices" = dontDistribute super."lattices"; "launchpad-control" = dontDistribute super."launchpad-control"; "lax" = dontDistribute super."lax"; @@ -5367,6 +5397,7 @@ self: super: { "memexml" = dontDistribute super."memexml"; "memo-ptr" = dontDistribute super."memo-ptr"; "memo-sqlite" = dontDistribute super."memo-sqlite"; + "memoization-utils" = dontDistribute super."memoization-utils"; "memoize" = dontDistribute super."memoize"; "memory" = dontDistribute super."memory"; "memscript" = dontDistribute super."memscript"; @@ -5807,6 +5838,7 @@ self: super: { "nthable" = dontDistribute super."nthable"; "ntp-control" = dontDistribute super."ntp-control"; "null-canvas" = dontDistribute super."null-canvas"; + "nullary" = dontDistribute super."nullary"; "number" = dontDistribute super."number"; "numbering" = dontDistribute super."numbering"; "numerals" = dontDistribute super."numerals"; @@ -6033,6 +6065,7 @@ self: super: { "pcg-random" = dontDistribute super."pcg-random"; "pcre-heavy" = dontDistribute super."pcre-heavy"; "pcre-less" = dontDistribute super."pcre-less"; + "pcre-light" = doDistribute super."pcre-light_0_4_0_3"; "pcre-light-extra" = dontDistribute super."pcre-light-extra"; "pcre-utils" = dontDistribute super."pcre-utils"; "pdf-toolbox-content" = dontDistribute super."pdf-toolbox-content"; @@ -6409,6 +6442,7 @@ self: super: { "qc-oi-testgenerator" = dontDistribute super."qc-oi-testgenerator"; "qd" = dontDistribute super."qd"; "qd-vec" = dontDistribute super."qd-vec"; + "qed" = dontDistribute super."qed"; "qhull-simple" = dontDistribute super."qhull-simple"; "qrcode" = dontDistribute super."qrcode"; "qt" = dontDistribute super."qt"; @@ -6424,6 +6458,7 @@ self: super: { "queue" = dontDistribute super."queue"; "queuelike" = dontDistribute super."queuelike"; "quick-generator" = dontDistribute super."quick-generator"; + "quick-schema" = dontDistribute super."quick-schema"; "quickcheck-assertions" = doDistribute super."quickcheck-assertions_0_1_1"; "quickcheck-io" = doDistribute super."quickcheck-io_0_1_1"; "quickcheck-poly" = dontDistribute super."quickcheck-poly"; @@ -6921,6 +6956,7 @@ self: super: { "servant" = dontDistribute super."servant"; "servant-JuicyPixels" = dontDistribute super."servant-JuicyPixels"; "servant-blaze" = dontDistribute super."servant-blaze"; + "servant-cassava" = dontDistribute super."servant-cassava"; "servant-client" = dontDistribute super."servant-client"; "servant-docs" = dontDistribute super."servant-docs"; "servant-ede" = dontDistribute super."servant-ede"; @@ -6934,6 +6970,7 @@ self: super: { "servant-response" = dontDistribute super."servant-response"; "servant-scotty" = dontDistribute super."servant-scotty"; "servant-server" = dontDistribute super."servant-server"; + "servant-swagger" = dontDistribute super."servant-swagger"; "servant-yaml" = dontDistribute super."servant-yaml"; "serversession" = dontDistribute super."serversession"; "serversession-backend-acid-state" = dontDistribute super."serversession-backend-acid-state"; @@ -8116,6 +8153,7 @@ self: super: { "verdict" = dontDistribute super."verdict"; "verdict-json" = dontDistribute super."verdict-json"; "verilog" = dontDistribute super."verilog"; + "versions" = dontDistribute super."versions"; "vhdl" = dontDistribute super."vhdl"; "views" = dontDistribute super."views"; "vigilance" = dontDistribute super."vigilance"; @@ -8566,6 +8604,7 @@ self: super: { "zendesk-api" = dontDistribute super."zendesk-api"; "zeno" = dontDistribute super."zeno"; "zero" = dontDistribute super."zero"; + "zerobin" = dontDistribute super."zerobin"; "zeromq-haskell" = dontDistribute super."zeromq-haskell"; "zeromq3-conduit" = dontDistribute super."zeromq3-conduit"; "zeromq3-haskell" = dontDistribute super."zeromq3-haskell"; diff --git a/pkgs/development/haskell-modules/configuration-lts-1.2.nix b/pkgs/development/haskell-modules/configuration-lts-1.2.nix index b94d90e61a79..f4a75202f8fe 100644 --- a/pkgs/development/haskell-modules/configuration-lts-1.2.nix +++ b/pkgs/development/haskell-modules/configuration-lts-1.2.nix @@ -513,6 +513,7 @@ self: super: { "HasGP" = dontDistribute super."HasGP"; "Haschoo" = dontDistribute super."Haschoo"; "Hashell" = dontDistribute super."Hashell"; + "HaskRel" = dontDistribute super."HaskRel"; "HaskellForMaths" = dontDistribute super."HaskellForMaths"; "HaskellLM" = dontDistribute super."HaskellLM"; "HaskellNN" = dontDistribute super."HaskellNN"; @@ -559,6 +560,7 @@ self: super: { "Hsed" = dontDistribute super."Hsed"; "Hsmtlib" = dontDistribute super."Hsmtlib"; "HueAPI" = dontDistribute super."HueAPI"; + "HulkImport" = dontDistribute super."HulkImport"; "Hungarian-Munkres" = dontDistribute super."Hungarian-Munkres"; "IDynamic" = dontDistribute super."IDynamic"; "IFS" = dontDistribute super."IFS"; @@ -1163,6 +1165,7 @@ self: super: { "afis" = dontDistribute super."afis"; "afv" = dontDistribute super."afv"; "agda-server" = dontDistribute super."agda-server"; + "agda-snippets" = dontDistribute super."agda-snippets"; "agentx" = dontDistribute super."agentx"; "agum" = dontDistribute super."agum"; "aig" = dontDistribute super."aig"; @@ -1990,6 +1993,7 @@ self: super: { "cipher-aes" = doDistribute super."cipher-aes_0_2_10"; "cipher-aes128" = dontDistribute super."cipher-aes128"; "cipher-rc5" = dontDistribute super."cipher-rc5"; + "ciphersaber2" = dontDistribute super."ciphersaber2"; "circ" = dontDistribute super."circ"; "cirru-parser" = dontDistribute super."cirru-parser"; "citation-resolve" = dontDistribute super."citation-resolve"; @@ -2451,6 +2455,7 @@ self: super: { "dataflow" = dontDistribute super."dataflow"; "datalog" = dontDistribute super."datalog"; "datapacker" = dontDistribute super."datapacker"; + "dataurl" = dontDistribute super."dataurl"; "date-cache" = dontDistribute super."date-cache"; "dates" = dontDistribute super."dates"; "datetime" = dontDistribute super."datetime"; @@ -2862,6 +2867,7 @@ self: super: { "eros-client" = dontDistribute super."eros-client"; "eros-http" = dontDistribute super."eros-http"; "errno" = dontDistribute super."errno"; + "error-analyze" = dontDistribute super."error-analyze"; "error-continuations" = dontDistribute super."error-continuations"; "error-list" = dontDistribute super."error-list"; "error-loc" = dontDistribute super."error-loc"; @@ -2917,6 +2923,7 @@ self: super: { "exinst-deepseq" = dontDistribute super."exinst-deepseq"; "exinst-hashable" = dontDistribute super."exinst-hashable"; "exists" = dontDistribute super."exists"; + "exit-codes" = dontDistribute super."exit-codes"; "exp-pairs" = dontDistribute super."exp-pairs"; "expand" = dontDistribute super."expand"; "expat-enumerator" = dontDistribute super."expat-enumerator"; @@ -3040,6 +3047,7 @@ self: super: { "fingertree-psqueue" = dontDistribute super."fingertree-psqueue"; "fingertree-tf" = dontDistribute super."fingertree-tf"; "finite-field" = dontDistribute super."finite-field"; + "finite-typelits" = dontDistribute super."finite-typelits"; "first-and-last" = dontDistribute super."first-and-last"; "first-class-patterns" = dontDistribute super."first-class-patterns"; "firstify" = dontDistribute super."firstify"; @@ -3330,6 +3338,20 @@ self: super: { "ghclive" = dontDistribute super."ghclive"; "ghczdecode" = dontDistribute super."ghczdecode"; "ght" = dontDistribute super."ght"; + "gi-atk" = dontDistribute super."gi-atk"; + "gi-cairo" = dontDistribute super."gi-cairo"; + "gi-gdk" = dontDistribute super."gi-gdk"; + "gi-gdkpixbuf" = dontDistribute super."gi-gdkpixbuf"; + "gi-gio" = dontDistribute super."gi-gio"; + "gi-glib" = dontDistribute super."gi-glib"; + "gi-gobject" = dontDistribute super."gi-gobject"; + "gi-gtk" = dontDistribute super."gi-gtk"; + "gi-javascriptcore" = dontDistribute super."gi-javascriptcore"; + "gi-notify" = dontDistribute super."gi-notify"; + "gi-pango" = dontDistribute super."gi-pango"; + "gi-soup" = dontDistribute super."gi-soup"; + "gi-vte" = dontDistribute super."gi-vte"; + "gi-webkit" = dontDistribute super."gi-webkit"; "gimlh" = dontDistribute super."gimlh"; "ginger" = dontDistribute super."ginger"; "ginsu" = dontDistribute super."ginsu"; @@ -3342,6 +3364,7 @@ self: super: { "git-date" = dontDistribute super."git-date"; "git-freq" = dontDistribute super."git-freq"; "git-gpush" = dontDistribute super."git-gpush"; + "git-jump" = dontDistribute super."git-jump"; "git-monitor" = dontDistribute super."git-monitor"; "git-object" = dontDistribute super."git-object"; "git-repair" = dontDistribute super."git-repair"; @@ -3828,6 +3851,8 @@ self: super: { "haskell-formatter" = dontDistribute super."haskell-formatter"; "haskell-ftp" = dontDistribute super."haskell-ftp"; "haskell-generate" = dontDistribute super."haskell-generate"; + "haskell-gi" = dontDistribute super."haskell-gi"; + "haskell-gi-base" = dontDistribute super."haskell-gi-base"; "haskell-import-graph" = dontDistribute super."haskell-import-graph"; "haskell-in-space" = dontDistribute super."haskell-in-space"; "haskell-modbus" = dontDistribute super."haskell-modbus"; @@ -4034,6 +4059,7 @@ self: super: { "hfann" = dontDistribute super."hfann"; "hfd" = dontDistribute super."hfd"; "hfiar" = dontDistribute super."hfiar"; + "hfmt" = dontDistribute super."hfmt"; "hfoil" = dontDistribute super."hfoil"; "hfov" = dontDistribute super."hfov"; "hfractal" = dontDistribute super."hfractal"; @@ -4453,6 +4479,7 @@ self: super: { "hsx2hs" = dontDistribute super."hsx2hs"; "hsyscall" = dontDistribute super."hsyscall"; "hszephyr" = dontDistribute super."hszephyr"; + "htaglib" = dontDistribute super."htaglib"; "htags" = dontDistribute super."htags"; "htar" = dontDistribute super."htar"; "htiled" = dontDistribute super."htiled"; @@ -4905,6 +4932,7 @@ self: super: { "keera-hails-reactive-polling" = dontDistribute super."keera-hails-reactive-polling"; "keera-hails-reactive-wx" = dontDistribute super."keera-hails-reactive-wx"; "keera-hails-reactive-yampa" = dontDistribute super."keera-hails-reactive-yampa"; + "keera-hails-reactivelenses" = dontDistribute super."keera-hails-reactivelenses"; "keera-hails-reactivevalues" = dontDistribute super."keera-hails-reactivevalues"; "keera-posture" = dontDistribute super."keera-posture"; "keiretsu" = dontDistribute super."keiretsu"; @@ -5029,6 +5057,8 @@ self: super: { "lat" = dontDistribute super."lat"; "latest-npm-version" = dontDistribute super."latest-npm-version"; "latex" = dontDistribute super."latex"; + "latex-formulae-image" = dontDistribute super."latex-formulae-image"; + "latex-formulae-pandoc" = dontDistribute super."latex-formulae-pandoc"; "lattices" = dontDistribute super."lattices"; "launchpad-control" = dontDistribute super."launchpad-control"; "lax" = dontDistribute super."lax"; @@ -5404,6 +5434,7 @@ self: super: { "memexml" = dontDistribute super."memexml"; "memo-ptr" = dontDistribute super."memo-ptr"; "memo-sqlite" = dontDistribute super."memo-sqlite"; + "memoization-utils" = dontDistribute super."memoization-utils"; "memoize" = dontDistribute super."memoize"; "memory" = dontDistribute super."memory"; "memscript" = dontDistribute super."memscript"; @@ -5850,6 +5881,7 @@ self: super: { "nthable" = dontDistribute super."nthable"; "ntp-control" = dontDistribute super."ntp-control"; "null-canvas" = dontDistribute super."null-canvas"; + "nullary" = dontDistribute super."nullary"; "number" = dontDistribute super."number"; "numbering" = dontDistribute super."numbering"; "numerals" = dontDistribute super."numerals"; @@ -6077,6 +6109,7 @@ self: super: { "pcg-random" = dontDistribute super."pcg-random"; "pcre-heavy" = dontDistribute super."pcre-heavy"; "pcre-less" = dontDistribute super."pcre-less"; + "pcre-light" = doDistribute super."pcre-light_0_4_0_3"; "pcre-light-extra" = dontDistribute super."pcre-light-extra"; "pcre-utils" = dontDistribute super."pcre-utils"; "pdf-toolbox-content" = dontDistribute super."pdf-toolbox-content"; @@ -6455,6 +6488,7 @@ self: super: { "qc-oi-testgenerator" = dontDistribute super."qc-oi-testgenerator"; "qd" = dontDistribute super."qd"; "qd-vec" = dontDistribute super."qd-vec"; + "qed" = dontDistribute super."qed"; "qhull-simple" = dontDistribute super."qhull-simple"; "qrcode" = dontDistribute super."qrcode"; "qt" = dontDistribute super."qt"; @@ -6470,6 +6504,7 @@ self: super: { "queue" = dontDistribute super."queue"; "queuelike" = dontDistribute super."queuelike"; "quick-generator" = dontDistribute super."quick-generator"; + "quick-schema" = dontDistribute super."quick-schema"; "quickcheck-assertions" = doDistribute super."quickcheck-assertions_0_1_1"; "quickcheck-instances" = doDistribute super."quickcheck-instances_0_3_10"; "quickcheck-io" = doDistribute super."quickcheck-io_0_1_1"; @@ -6971,6 +7006,7 @@ self: super: { "servant" = dontDistribute super."servant"; "servant-JuicyPixels" = dontDistribute super."servant-JuicyPixels"; "servant-blaze" = dontDistribute super."servant-blaze"; + "servant-cassava" = dontDistribute super."servant-cassava"; "servant-client" = dontDistribute super."servant-client"; "servant-docs" = dontDistribute super."servant-docs"; "servant-ede" = dontDistribute super."servant-ede"; @@ -6984,6 +7020,7 @@ self: super: { "servant-response" = dontDistribute super."servant-response"; "servant-scotty" = dontDistribute super."servant-scotty"; "servant-server" = dontDistribute super."servant-server"; + "servant-swagger" = dontDistribute super."servant-swagger"; "servant-yaml" = dontDistribute super."servant-yaml"; "serversession" = dontDistribute super."serversession"; "serversession-backend-acid-state" = dontDistribute super."serversession-backend-acid-state"; @@ -8179,6 +8216,7 @@ self: super: { "verdict" = dontDistribute super."verdict"; "verdict-json" = dontDistribute super."verdict-json"; "verilog" = dontDistribute super."verilog"; + "versions" = dontDistribute super."versions"; "vhdl" = dontDistribute super."vhdl"; "views" = dontDistribute super."views"; "vigilance" = dontDistribute super."vigilance"; @@ -8632,6 +8670,7 @@ self: super: { "zendesk-api" = dontDistribute super."zendesk-api"; "zeno" = dontDistribute super."zeno"; "zero" = dontDistribute super."zero"; + "zerobin" = dontDistribute super."zerobin"; "zeromq-haskell" = dontDistribute super."zeromq-haskell"; "zeromq3-conduit" = dontDistribute super."zeromq3-conduit"; "zeromq3-haskell" = dontDistribute super."zeromq3-haskell"; diff --git a/pkgs/development/haskell-modules/configuration-lts-1.4.nix b/pkgs/development/haskell-modules/configuration-lts-1.4.nix index 8ee72f2c61f7..ec4503f651c4 100644 --- a/pkgs/development/haskell-modules/configuration-lts-1.4.nix +++ b/pkgs/development/haskell-modules/configuration-lts-1.4.nix @@ -512,6 +512,7 @@ self: super: { "HasGP" = dontDistribute super."HasGP"; "Haschoo" = dontDistribute super."Haschoo"; "Hashell" = dontDistribute super."Hashell"; + "HaskRel" = dontDistribute super."HaskRel"; "HaskellForMaths" = dontDistribute super."HaskellForMaths"; "HaskellLM" = dontDistribute super."HaskellLM"; "HaskellNN" = dontDistribute super."HaskellNN"; @@ -558,6 +559,7 @@ self: super: { "Hsed" = dontDistribute super."Hsed"; "Hsmtlib" = dontDistribute super."Hsmtlib"; "HueAPI" = dontDistribute super."HueAPI"; + "HulkImport" = dontDistribute super."HulkImport"; "Hungarian-Munkres" = dontDistribute super."Hungarian-Munkres"; "IDynamic" = dontDistribute super."IDynamic"; "IFS" = dontDistribute super."IFS"; @@ -1162,6 +1164,7 @@ self: super: { "afis" = dontDistribute super."afis"; "afv" = dontDistribute super."afv"; "agda-server" = dontDistribute super."agda-server"; + "agda-snippets" = dontDistribute super."agda-snippets"; "agentx" = dontDistribute super."agentx"; "agum" = dontDistribute super."agum"; "aig" = dontDistribute super."aig"; @@ -1989,6 +1992,7 @@ self: super: { "cipher-aes" = doDistribute super."cipher-aes_0_2_10"; "cipher-aes128" = dontDistribute super."cipher-aes128"; "cipher-rc5" = dontDistribute super."cipher-rc5"; + "ciphersaber2" = dontDistribute super."ciphersaber2"; "circ" = dontDistribute super."circ"; "cirru-parser" = dontDistribute super."cirru-parser"; "citation-resolve" = dontDistribute super."citation-resolve"; @@ -2450,6 +2454,7 @@ self: super: { "dataflow" = dontDistribute super."dataflow"; "datalog" = dontDistribute super."datalog"; "datapacker" = dontDistribute super."datapacker"; + "dataurl" = dontDistribute super."dataurl"; "date-cache" = dontDistribute super."date-cache"; "dates" = dontDistribute super."dates"; "datetime" = dontDistribute super."datetime"; @@ -2861,6 +2866,7 @@ self: super: { "eros-client" = dontDistribute super."eros-client"; "eros-http" = dontDistribute super."eros-http"; "errno" = dontDistribute super."errno"; + "error-analyze" = dontDistribute super."error-analyze"; "error-continuations" = dontDistribute super."error-continuations"; "error-list" = dontDistribute super."error-list"; "error-loc" = dontDistribute super."error-loc"; @@ -2916,6 +2922,7 @@ self: super: { "exinst-deepseq" = dontDistribute super."exinst-deepseq"; "exinst-hashable" = dontDistribute super."exinst-hashable"; "exists" = dontDistribute super."exists"; + "exit-codes" = dontDistribute super."exit-codes"; "exp-pairs" = dontDistribute super."exp-pairs"; "expand" = dontDistribute super."expand"; "expat-enumerator" = dontDistribute super."expat-enumerator"; @@ -3038,6 +3045,7 @@ self: super: { "fingertree-psqueue" = dontDistribute super."fingertree-psqueue"; "fingertree-tf" = dontDistribute super."fingertree-tf"; "finite-field" = dontDistribute super."finite-field"; + "finite-typelits" = dontDistribute super."finite-typelits"; "first-and-last" = dontDistribute super."first-and-last"; "first-class-patterns" = dontDistribute super."first-class-patterns"; "firstify" = dontDistribute super."firstify"; @@ -3328,6 +3336,20 @@ self: super: { "ghclive" = dontDistribute super."ghclive"; "ghczdecode" = dontDistribute super."ghczdecode"; "ght" = dontDistribute super."ght"; + "gi-atk" = dontDistribute super."gi-atk"; + "gi-cairo" = dontDistribute super."gi-cairo"; + "gi-gdk" = dontDistribute super."gi-gdk"; + "gi-gdkpixbuf" = dontDistribute super."gi-gdkpixbuf"; + "gi-gio" = dontDistribute super."gi-gio"; + "gi-glib" = dontDistribute super."gi-glib"; + "gi-gobject" = dontDistribute super."gi-gobject"; + "gi-gtk" = dontDistribute super."gi-gtk"; + "gi-javascriptcore" = dontDistribute super."gi-javascriptcore"; + "gi-notify" = dontDistribute super."gi-notify"; + "gi-pango" = dontDistribute super."gi-pango"; + "gi-soup" = dontDistribute super."gi-soup"; + "gi-vte" = dontDistribute super."gi-vte"; + "gi-webkit" = dontDistribute super."gi-webkit"; "gimlh" = dontDistribute super."gimlh"; "ginger" = dontDistribute super."ginger"; "ginsu" = dontDistribute super."ginsu"; @@ -3340,6 +3362,7 @@ self: super: { "git-date" = dontDistribute super."git-date"; "git-freq" = dontDistribute super."git-freq"; "git-gpush" = dontDistribute super."git-gpush"; + "git-jump" = dontDistribute super."git-jump"; "git-monitor" = dontDistribute super."git-monitor"; "git-object" = dontDistribute super."git-object"; "git-repair" = dontDistribute super."git-repair"; @@ -3826,6 +3849,8 @@ self: super: { "haskell-formatter" = dontDistribute super."haskell-formatter"; "haskell-ftp" = dontDistribute super."haskell-ftp"; "haskell-generate" = dontDistribute super."haskell-generate"; + "haskell-gi" = dontDistribute super."haskell-gi"; + "haskell-gi-base" = dontDistribute super."haskell-gi-base"; "haskell-import-graph" = dontDistribute super."haskell-import-graph"; "haskell-in-space" = dontDistribute super."haskell-in-space"; "haskell-modbus" = dontDistribute super."haskell-modbus"; @@ -4031,6 +4056,7 @@ self: super: { "hfann" = dontDistribute super."hfann"; "hfd" = dontDistribute super."hfd"; "hfiar" = dontDistribute super."hfiar"; + "hfmt" = dontDistribute super."hfmt"; "hfoil" = dontDistribute super."hfoil"; "hfov" = dontDistribute super."hfov"; "hfractal" = dontDistribute super."hfractal"; @@ -4450,6 +4476,7 @@ self: super: { "hsx2hs" = dontDistribute super."hsx2hs"; "hsyscall" = dontDistribute super."hsyscall"; "hszephyr" = dontDistribute super."hszephyr"; + "htaglib" = dontDistribute super."htaglib"; "htags" = dontDistribute super."htags"; "htar" = dontDistribute super."htar"; "htiled" = dontDistribute super."htiled"; @@ -4902,6 +4929,7 @@ self: super: { "keera-hails-reactive-polling" = dontDistribute super."keera-hails-reactive-polling"; "keera-hails-reactive-wx" = dontDistribute super."keera-hails-reactive-wx"; "keera-hails-reactive-yampa" = dontDistribute super."keera-hails-reactive-yampa"; + "keera-hails-reactivelenses" = dontDistribute super."keera-hails-reactivelenses"; "keera-hails-reactivevalues" = dontDistribute super."keera-hails-reactivevalues"; "keera-posture" = dontDistribute super."keera-posture"; "keiretsu" = dontDistribute super."keiretsu"; @@ -5026,6 +5054,8 @@ self: super: { "lat" = dontDistribute super."lat"; "latest-npm-version" = dontDistribute super."latest-npm-version"; "latex" = dontDistribute super."latex"; + "latex-formulae-image" = dontDistribute super."latex-formulae-image"; + "latex-formulae-pandoc" = dontDistribute super."latex-formulae-pandoc"; "lattices" = dontDistribute super."lattices"; "launchpad-control" = dontDistribute super."launchpad-control"; "lax" = dontDistribute super."lax"; @@ -5401,6 +5431,7 @@ self: super: { "memexml" = dontDistribute super."memexml"; "memo-ptr" = dontDistribute super."memo-ptr"; "memo-sqlite" = dontDistribute super."memo-sqlite"; + "memoization-utils" = dontDistribute super."memoization-utils"; "memoize" = dontDistribute super."memoize"; "memory" = dontDistribute super."memory"; "memscript" = dontDistribute super."memscript"; @@ -5846,6 +5877,7 @@ self: super: { "nthable" = dontDistribute super."nthable"; "ntp-control" = dontDistribute super."ntp-control"; "null-canvas" = dontDistribute super."null-canvas"; + "nullary" = dontDistribute super."nullary"; "number" = dontDistribute super."number"; "numbering" = dontDistribute super."numbering"; "numerals" = dontDistribute super."numerals"; @@ -6073,6 +6105,7 @@ self: super: { "pcg-random" = dontDistribute super."pcg-random"; "pcre-heavy" = dontDistribute super."pcre-heavy"; "pcre-less" = dontDistribute super."pcre-less"; + "pcre-light" = doDistribute super."pcre-light_0_4_0_3"; "pcre-light-extra" = dontDistribute super."pcre-light-extra"; "pcre-utils" = dontDistribute super."pcre-utils"; "pdf-toolbox-content" = dontDistribute super."pdf-toolbox-content"; @@ -6450,6 +6483,7 @@ self: super: { "qc-oi-testgenerator" = dontDistribute super."qc-oi-testgenerator"; "qd" = dontDistribute super."qd"; "qd-vec" = dontDistribute super."qd-vec"; + "qed" = dontDistribute super."qed"; "qhull-simple" = dontDistribute super."qhull-simple"; "qrcode" = dontDistribute super."qrcode"; "qt" = dontDistribute super."qt"; @@ -6465,6 +6499,7 @@ self: super: { "queue" = dontDistribute super."queue"; "queuelike" = dontDistribute super."queuelike"; "quick-generator" = dontDistribute super."quick-generator"; + "quick-schema" = dontDistribute super."quick-schema"; "quickcheck-assertions" = doDistribute super."quickcheck-assertions_0_1_1"; "quickcheck-instances" = doDistribute super."quickcheck-instances_0_3_10"; "quickcheck-io" = doDistribute super."quickcheck-io_0_1_1"; @@ -6966,6 +7001,7 @@ self: super: { "servant" = dontDistribute super."servant"; "servant-JuicyPixels" = dontDistribute super."servant-JuicyPixels"; "servant-blaze" = dontDistribute super."servant-blaze"; + "servant-cassava" = dontDistribute super."servant-cassava"; "servant-client" = dontDistribute super."servant-client"; "servant-docs" = dontDistribute super."servant-docs"; "servant-ede" = dontDistribute super."servant-ede"; @@ -6979,6 +7015,7 @@ self: super: { "servant-response" = dontDistribute super."servant-response"; "servant-scotty" = dontDistribute super."servant-scotty"; "servant-server" = dontDistribute super."servant-server"; + "servant-swagger" = dontDistribute super."servant-swagger"; "servant-yaml" = dontDistribute super."servant-yaml"; "serversession" = dontDistribute super."serversession"; "serversession-backend-acid-state" = dontDistribute super."serversession-backend-acid-state"; @@ -8173,6 +8210,7 @@ self: super: { "verdict" = dontDistribute super."verdict"; "verdict-json" = dontDistribute super."verdict-json"; "verilog" = dontDistribute super."verilog"; + "versions" = dontDistribute super."versions"; "vhdl" = dontDistribute super."vhdl"; "views" = dontDistribute super."views"; "vigilance" = dontDistribute super."vigilance"; @@ -8626,6 +8664,7 @@ self: super: { "zendesk-api" = dontDistribute super."zendesk-api"; "zeno" = dontDistribute super."zeno"; "zero" = dontDistribute super."zero"; + "zerobin" = dontDistribute super."zerobin"; "zeromq-haskell" = dontDistribute super."zeromq-haskell"; "zeromq3-conduit" = dontDistribute super."zeromq3-conduit"; "zeromq3-haskell" = dontDistribute super."zeromq3-haskell"; diff --git a/pkgs/development/haskell-modules/configuration-lts-1.5.nix b/pkgs/development/haskell-modules/configuration-lts-1.5.nix index 1cc39d7046ec..cc9a3fa35905 100644 --- a/pkgs/development/haskell-modules/configuration-lts-1.5.nix +++ b/pkgs/development/haskell-modules/configuration-lts-1.5.nix @@ -512,6 +512,7 @@ self: super: { "HasGP" = dontDistribute super."HasGP"; "Haschoo" = dontDistribute super."Haschoo"; "Hashell" = dontDistribute super."Hashell"; + "HaskRel" = dontDistribute super."HaskRel"; "HaskellForMaths" = dontDistribute super."HaskellForMaths"; "HaskellLM" = dontDistribute super."HaskellLM"; "HaskellNN" = dontDistribute super."HaskellNN"; @@ -558,6 +559,7 @@ self: super: { "Hsed" = dontDistribute super."Hsed"; "Hsmtlib" = dontDistribute super."Hsmtlib"; "HueAPI" = dontDistribute super."HueAPI"; + "HulkImport" = dontDistribute super."HulkImport"; "Hungarian-Munkres" = dontDistribute super."Hungarian-Munkres"; "IDynamic" = dontDistribute super."IDynamic"; "IFS" = dontDistribute super."IFS"; @@ -1162,6 +1164,7 @@ self: super: { "afis" = dontDistribute super."afis"; "afv" = dontDistribute super."afv"; "agda-server" = dontDistribute super."agda-server"; + "agda-snippets" = dontDistribute super."agda-snippets"; "agentx" = dontDistribute super."agentx"; "agum" = dontDistribute super."agum"; "aig" = dontDistribute super."aig"; @@ -1988,6 +1991,7 @@ self: super: { "cipher-aes" = doDistribute super."cipher-aes_0_2_10"; "cipher-aes128" = dontDistribute super."cipher-aes128"; "cipher-rc5" = dontDistribute super."cipher-rc5"; + "ciphersaber2" = dontDistribute super."ciphersaber2"; "circ" = dontDistribute super."circ"; "cirru-parser" = dontDistribute super."cirru-parser"; "citation-resolve" = dontDistribute super."citation-resolve"; @@ -2449,6 +2453,7 @@ self: super: { "dataflow" = dontDistribute super."dataflow"; "datalog" = dontDistribute super."datalog"; "datapacker" = dontDistribute super."datapacker"; + "dataurl" = dontDistribute super."dataurl"; "date-cache" = dontDistribute super."date-cache"; "dates" = dontDistribute super."dates"; "datetime" = dontDistribute super."datetime"; @@ -2860,6 +2865,7 @@ self: super: { "eros-client" = dontDistribute super."eros-client"; "eros-http" = dontDistribute super."eros-http"; "errno" = dontDistribute super."errno"; + "error-analyze" = dontDistribute super."error-analyze"; "error-continuations" = dontDistribute super."error-continuations"; "error-list" = dontDistribute super."error-list"; "error-loc" = dontDistribute super."error-loc"; @@ -2915,6 +2921,7 @@ self: super: { "exinst-deepseq" = dontDistribute super."exinst-deepseq"; "exinst-hashable" = dontDistribute super."exinst-hashable"; "exists" = dontDistribute super."exists"; + "exit-codes" = dontDistribute super."exit-codes"; "exp-pairs" = dontDistribute super."exp-pairs"; "expand" = dontDistribute super."expand"; "expat-enumerator" = dontDistribute super."expat-enumerator"; @@ -3037,6 +3044,7 @@ self: super: { "fingertree-psqueue" = dontDistribute super."fingertree-psqueue"; "fingertree-tf" = dontDistribute super."fingertree-tf"; "finite-field" = dontDistribute super."finite-field"; + "finite-typelits" = dontDistribute super."finite-typelits"; "first-and-last" = dontDistribute super."first-and-last"; "first-class-patterns" = dontDistribute super."first-class-patterns"; "firstify" = dontDistribute super."firstify"; @@ -3327,6 +3335,20 @@ self: super: { "ghclive" = dontDistribute super."ghclive"; "ghczdecode" = dontDistribute super."ghczdecode"; "ght" = dontDistribute super."ght"; + "gi-atk" = dontDistribute super."gi-atk"; + "gi-cairo" = dontDistribute super."gi-cairo"; + "gi-gdk" = dontDistribute super."gi-gdk"; + "gi-gdkpixbuf" = dontDistribute super."gi-gdkpixbuf"; + "gi-gio" = dontDistribute super."gi-gio"; + "gi-glib" = dontDistribute super."gi-glib"; + "gi-gobject" = dontDistribute super."gi-gobject"; + "gi-gtk" = dontDistribute super."gi-gtk"; + "gi-javascriptcore" = dontDistribute super."gi-javascriptcore"; + "gi-notify" = dontDistribute super."gi-notify"; + "gi-pango" = dontDistribute super."gi-pango"; + "gi-soup" = dontDistribute super."gi-soup"; + "gi-vte" = dontDistribute super."gi-vte"; + "gi-webkit" = dontDistribute super."gi-webkit"; "gimlh" = dontDistribute super."gimlh"; "ginger" = dontDistribute super."ginger"; "ginsu" = dontDistribute super."ginsu"; @@ -3339,6 +3361,7 @@ self: super: { "git-date" = dontDistribute super."git-date"; "git-freq" = dontDistribute super."git-freq"; "git-gpush" = dontDistribute super."git-gpush"; + "git-jump" = dontDistribute super."git-jump"; "git-monitor" = dontDistribute super."git-monitor"; "git-object" = dontDistribute super."git-object"; "git-repair" = dontDistribute super."git-repair"; @@ -3825,6 +3848,8 @@ self: super: { "haskell-formatter" = dontDistribute super."haskell-formatter"; "haskell-ftp" = dontDistribute super."haskell-ftp"; "haskell-generate" = dontDistribute super."haskell-generate"; + "haskell-gi" = dontDistribute super."haskell-gi"; + "haskell-gi-base" = dontDistribute super."haskell-gi-base"; "haskell-import-graph" = dontDistribute super."haskell-import-graph"; "haskell-in-space" = dontDistribute super."haskell-in-space"; "haskell-modbus" = dontDistribute super."haskell-modbus"; @@ -4030,6 +4055,7 @@ self: super: { "hfann" = dontDistribute super."hfann"; "hfd" = dontDistribute super."hfd"; "hfiar" = dontDistribute super."hfiar"; + "hfmt" = dontDistribute super."hfmt"; "hfoil" = dontDistribute super."hfoil"; "hfov" = dontDistribute super."hfov"; "hfractal" = dontDistribute super."hfractal"; @@ -4449,6 +4475,7 @@ self: super: { "hsx2hs" = dontDistribute super."hsx2hs"; "hsyscall" = dontDistribute super."hsyscall"; "hszephyr" = dontDistribute super."hszephyr"; + "htaglib" = dontDistribute super."htaglib"; "htags" = dontDistribute super."htags"; "htar" = dontDistribute super."htar"; "htiled" = dontDistribute super."htiled"; @@ -4900,6 +4927,7 @@ self: super: { "keera-hails-reactive-polling" = dontDistribute super."keera-hails-reactive-polling"; "keera-hails-reactive-wx" = dontDistribute super."keera-hails-reactive-wx"; "keera-hails-reactive-yampa" = dontDistribute super."keera-hails-reactive-yampa"; + "keera-hails-reactivelenses" = dontDistribute super."keera-hails-reactivelenses"; "keera-hails-reactivevalues" = dontDistribute super."keera-hails-reactivevalues"; "keera-posture" = dontDistribute super."keera-posture"; "keiretsu" = dontDistribute super."keiretsu"; @@ -5024,6 +5052,8 @@ self: super: { "lat" = dontDistribute super."lat"; "latest-npm-version" = dontDistribute super."latest-npm-version"; "latex" = dontDistribute super."latex"; + "latex-formulae-image" = dontDistribute super."latex-formulae-image"; + "latex-formulae-pandoc" = dontDistribute super."latex-formulae-pandoc"; "lattices" = dontDistribute super."lattices"; "launchpad-control" = dontDistribute super."launchpad-control"; "lax" = dontDistribute super."lax"; @@ -5399,6 +5429,7 @@ self: super: { "memexml" = dontDistribute super."memexml"; "memo-ptr" = dontDistribute super."memo-ptr"; "memo-sqlite" = dontDistribute super."memo-sqlite"; + "memoization-utils" = dontDistribute super."memoization-utils"; "memoize" = dontDistribute super."memoize"; "memory" = dontDistribute super."memory"; "memscript" = dontDistribute super."memscript"; @@ -5844,6 +5875,7 @@ self: super: { "nthable" = dontDistribute super."nthable"; "ntp-control" = dontDistribute super."ntp-control"; "null-canvas" = dontDistribute super."null-canvas"; + "nullary" = dontDistribute super."nullary"; "number" = dontDistribute super."number"; "numbering" = dontDistribute super."numbering"; "numerals" = dontDistribute super."numerals"; @@ -6071,6 +6103,7 @@ self: super: { "pcg-random" = dontDistribute super."pcg-random"; "pcre-heavy" = dontDistribute super."pcre-heavy"; "pcre-less" = dontDistribute super."pcre-less"; + "pcre-light" = doDistribute super."pcre-light_0_4_0_3"; "pcre-light-extra" = dontDistribute super."pcre-light-extra"; "pcre-utils" = dontDistribute super."pcre-utils"; "pdf-toolbox-content" = dontDistribute super."pdf-toolbox-content"; @@ -6448,6 +6481,7 @@ self: super: { "qc-oi-testgenerator" = dontDistribute super."qc-oi-testgenerator"; "qd" = dontDistribute super."qd"; "qd-vec" = dontDistribute super."qd-vec"; + "qed" = dontDistribute super."qed"; "qhull-simple" = dontDistribute super."qhull-simple"; "qrcode" = dontDistribute super."qrcode"; "qt" = dontDistribute super."qt"; @@ -6463,6 +6497,7 @@ self: super: { "queue" = dontDistribute super."queue"; "queuelike" = dontDistribute super."queuelike"; "quick-generator" = dontDistribute super."quick-generator"; + "quick-schema" = dontDistribute super."quick-schema"; "quickcheck-assertions" = doDistribute super."quickcheck-assertions_0_1_1"; "quickcheck-instances" = doDistribute super."quickcheck-instances_0_3_10"; "quickcheck-io" = doDistribute super."quickcheck-io_0_1_1"; @@ -6964,6 +6999,7 @@ self: super: { "servant" = dontDistribute super."servant"; "servant-JuicyPixels" = dontDistribute super."servant-JuicyPixels"; "servant-blaze" = dontDistribute super."servant-blaze"; + "servant-cassava" = dontDistribute super."servant-cassava"; "servant-client" = dontDistribute super."servant-client"; "servant-docs" = dontDistribute super."servant-docs"; "servant-ede" = dontDistribute super."servant-ede"; @@ -6977,6 +7013,7 @@ self: super: { "servant-response" = dontDistribute super."servant-response"; "servant-scotty" = dontDistribute super."servant-scotty"; "servant-server" = dontDistribute super."servant-server"; + "servant-swagger" = dontDistribute super."servant-swagger"; "servant-yaml" = dontDistribute super."servant-yaml"; "serversession" = dontDistribute super."serversession"; "serversession-backend-acid-state" = dontDistribute super."serversession-backend-acid-state"; @@ -8169,6 +8206,7 @@ self: super: { "verdict" = dontDistribute super."verdict"; "verdict-json" = dontDistribute super."verdict-json"; "verilog" = dontDistribute super."verilog"; + "versions" = dontDistribute super."versions"; "vhdl" = dontDistribute super."vhdl"; "views" = dontDistribute super."views"; "vigilance" = dontDistribute super."vigilance"; @@ -8622,6 +8660,7 @@ self: super: { "zendesk-api" = dontDistribute super."zendesk-api"; "zeno" = dontDistribute super."zeno"; "zero" = dontDistribute super."zero"; + "zerobin" = dontDistribute super."zerobin"; "zeromq-haskell" = dontDistribute super."zeromq-haskell"; "zeromq3-conduit" = dontDistribute super."zeromq3-conduit"; "zeromq3-haskell" = dontDistribute super."zeromq3-haskell"; diff --git a/pkgs/development/haskell-modules/configuration-lts-1.7.nix b/pkgs/development/haskell-modules/configuration-lts-1.7.nix index 0484866743d5..9cf5b4539cc0 100644 --- a/pkgs/development/haskell-modules/configuration-lts-1.7.nix +++ b/pkgs/development/haskell-modules/configuration-lts-1.7.nix @@ -512,6 +512,7 @@ self: super: { "HasGP" = dontDistribute super."HasGP"; "Haschoo" = dontDistribute super."Haschoo"; "Hashell" = dontDistribute super."Hashell"; + "HaskRel" = dontDistribute super."HaskRel"; "HaskellForMaths" = dontDistribute super."HaskellForMaths"; "HaskellLM" = dontDistribute super."HaskellLM"; "HaskellNN" = dontDistribute super."HaskellNN"; @@ -558,6 +559,7 @@ self: super: { "Hsed" = dontDistribute super."Hsed"; "Hsmtlib" = dontDistribute super."Hsmtlib"; "HueAPI" = dontDistribute super."HueAPI"; + "HulkImport" = dontDistribute super."HulkImport"; "Hungarian-Munkres" = dontDistribute super."Hungarian-Munkres"; "IDynamic" = dontDistribute super."IDynamic"; "IFS" = dontDistribute super."IFS"; @@ -1162,6 +1164,7 @@ self: super: { "afis" = dontDistribute super."afis"; "afv" = dontDistribute super."afv"; "agda-server" = dontDistribute super."agda-server"; + "agda-snippets" = dontDistribute super."agda-snippets"; "agentx" = dontDistribute super."agentx"; "agum" = dontDistribute super."agum"; "aig" = dontDistribute super."aig"; @@ -1988,6 +1991,7 @@ self: super: { "cipher-aes" = doDistribute super."cipher-aes_0_2_10"; "cipher-aes128" = dontDistribute super."cipher-aes128"; "cipher-rc5" = dontDistribute super."cipher-rc5"; + "ciphersaber2" = dontDistribute super."ciphersaber2"; "circ" = dontDistribute super."circ"; "cirru-parser" = dontDistribute super."cirru-parser"; "citation-resolve" = dontDistribute super."citation-resolve"; @@ -2449,6 +2453,7 @@ self: super: { "dataflow" = dontDistribute super."dataflow"; "datalog" = dontDistribute super."datalog"; "datapacker" = dontDistribute super."datapacker"; + "dataurl" = dontDistribute super."dataurl"; "date-cache" = dontDistribute super."date-cache"; "dates" = dontDistribute super."dates"; "datetime" = dontDistribute super."datetime"; @@ -2860,6 +2865,7 @@ self: super: { "eros-client" = dontDistribute super."eros-client"; "eros-http" = dontDistribute super."eros-http"; "errno" = dontDistribute super."errno"; + "error-analyze" = dontDistribute super."error-analyze"; "error-continuations" = dontDistribute super."error-continuations"; "error-list" = dontDistribute super."error-list"; "error-loc" = dontDistribute super."error-loc"; @@ -2915,6 +2921,7 @@ self: super: { "exinst-deepseq" = dontDistribute super."exinst-deepseq"; "exinst-hashable" = dontDistribute super."exinst-hashable"; "exists" = dontDistribute super."exists"; + "exit-codes" = dontDistribute super."exit-codes"; "exp-pairs" = dontDistribute super."exp-pairs"; "expand" = dontDistribute super."expand"; "expat-enumerator" = dontDistribute super."expat-enumerator"; @@ -3037,6 +3044,7 @@ self: super: { "fingertree-psqueue" = dontDistribute super."fingertree-psqueue"; "fingertree-tf" = dontDistribute super."fingertree-tf"; "finite-field" = dontDistribute super."finite-field"; + "finite-typelits" = dontDistribute super."finite-typelits"; "first-and-last" = dontDistribute super."first-and-last"; "first-class-patterns" = dontDistribute super."first-class-patterns"; "firstify" = dontDistribute super."firstify"; @@ -3327,6 +3335,20 @@ self: super: { "ghclive" = dontDistribute super."ghclive"; "ghczdecode" = dontDistribute super."ghczdecode"; "ght" = dontDistribute super."ght"; + "gi-atk" = dontDistribute super."gi-atk"; + "gi-cairo" = dontDistribute super."gi-cairo"; + "gi-gdk" = dontDistribute super."gi-gdk"; + "gi-gdkpixbuf" = dontDistribute super."gi-gdkpixbuf"; + "gi-gio" = dontDistribute super."gi-gio"; + "gi-glib" = dontDistribute super."gi-glib"; + "gi-gobject" = dontDistribute super."gi-gobject"; + "gi-gtk" = dontDistribute super."gi-gtk"; + "gi-javascriptcore" = dontDistribute super."gi-javascriptcore"; + "gi-notify" = dontDistribute super."gi-notify"; + "gi-pango" = dontDistribute super."gi-pango"; + "gi-soup" = dontDistribute super."gi-soup"; + "gi-vte" = dontDistribute super."gi-vte"; + "gi-webkit" = dontDistribute super."gi-webkit"; "gimlh" = dontDistribute super."gimlh"; "ginger" = dontDistribute super."ginger"; "ginsu" = dontDistribute super."ginsu"; @@ -3339,6 +3361,7 @@ self: super: { "git-date" = dontDistribute super."git-date"; "git-freq" = dontDistribute super."git-freq"; "git-gpush" = dontDistribute super."git-gpush"; + "git-jump" = dontDistribute super."git-jump"; "git-monitor" = dontDistribute super."git-monitor"; "git-object" = dontDistribute super."git-object"; "git-repair" = dontDistribute super."git-repair"; @@ -3825,6 +3848,8 @@ self: super: { "haskell-formatter" = dontDistribute super."haskell-formatter"; "haskell-ftp" = dontDistribute super."haskell-ftp"; "haskell-generate" = dontDistribute super."haskell-generate"; + "haskell-gi" = dontDistribute super."haskell-gi"; + "haskell-gi-base" = dontDistribute super."haskell-gi-base"; "haskell-import-graph" = dontDistribute super."haskell-import-graph"; "haskell-in-space" = dontDistribute super."haskell-in-space"; "haskell-modbus" = dontDistribute super."haskell-modbus"; @@ -4030,6 +4055,7 @@ self: super: { "hfann" = dontDistribute super."hfann"; "hfd" = dontDistribute super."hfd"; "hfiar" = dontDistribute super."hfiar"; + "hfmt" = dontDistribute super."hfmt"; "hfoil" = dontDistribute super."hfoil"; "hfov" = dontDistribute super."hfov"; "hfractal" = dontDistribute super."hfractal"; @@ -4449,6 +4475,7 @@ self: super: { "hsx2hs" = dontDistribute super."hsx2hs"; "hsyscall" = dontDistribute super."hsyscall"; "hszephyr" = dontDistribute super."hszephyr"; + "htaglib" = dontDistribute super."htaglib"; "htags" = dontDistribute super."htags"; "htar" = dontDistribute super."htar"; "htiled" = dontDistribute super."htiled"; @@ -4894,6 +4921,7 @@ self: super: { "keera-hails-reactive-polling" = dontDistribute super."keera-hails-reactive-polling"; "keera-hails-reactive-wx" = dontDistribute super."keera-hails-reactive-wx"; "keera-hails-reactive-yampa" = dontDistribute super."keera-hails-reactive-yampa"; + "keera-hails-reactivelenses" = dontDistribute super."keera-hails-reactivelenses"; "keera-hails-reactivevalues" = dontDistribute super."keera-hails-reactivevalues"; "keera-posture" = dontDistribute super."keera-posture"; "keiretsu" = dontDistribute super."keiretsu"; @@ -5018,6 +5046,8 @@ self: super: { "lat" = dontDistribute super."lat"; "latest-npm-version" = dontDistribute super."latest-npm-version"; "latex" = dontDistribute super."latex"; + "latex-formulae-image" = dontDistribute super."latex-formulae-image"; + "latex-formulae-pandoc" = dontDistribute super."latex-formulae-pandoc"; "lattices" = dontDistribute super."lattices"; "launchpad-control" = dontDistribute super."launchpad-control"; "lax" = dontDistribute super."lax"; @@ -5393,6 +5423,7 @@ self: super: { "memexml" = dontDistribute super."memexml"; "memo-ptr" = dontDistribute super."memo-ptr"; "memo-sqlite" = dontDistribute super."memo-sqlite"; + "memoization-utils" = dontDistribute super."memoization-utils"; "memoize" = dontDistribute super."memoize"; "memory" = dontDistribute super."memory"; "memscript" = dontDistribute super."memscript"; @@ -5838,6 +5869,7 @@ self: super: { "nthable" = dontDistribute super."nthable"; "ntp-control" = dontDistribute super."ntp-control"; "null-canvas" = dontDistribute super."null-canvas"; + "nullary" = dontDistribute super."nullary"; "number" = dontDistribute super."number"; "numbering" = dontDistribute super."numbering"; "numerals" = dontDistribute super."numerals"; @@ -6065,6 +6097,7 @@ self: super: { "pcg-random" = dontDistribute super."pcg-random"; "pcre-heavy" = dontDistribute super."pcre-heavy"; "pcre-less" = dontDistribute super."pcre-less"; + "pcre-light" = doDistribute super."pcre-light_0_4_0_3"; "pcre-light-extra" = dontDistribute super."pcre-light-extra"; "pcre-utils" = dontDistribute super."pcre-utils"; "pdf-toolbox-content" = dontDistribute super."pdf-toolbox-content"; @@ -6442,6 +6475,7 @@ self: super: { "qc-oi-testgenerator" = dontDistribute super."qc-oi-testgenerator"; "qd" = dontDistribute super."qd"; "qd-vec" = dontDistribute super."qd-vec"; + "qed" = dontDistribute super."qed"; "qhull-simple" = dontDistribute super."qhull-simple"; "qrcode" = dontDistribute super."qrcode"; "qt" = dontDistribute super."qt"; @@ -6457,6 +6491,7 @@ self: super: { "queue" = dontDistribute super."queue"; "queuelike" = dontDistribute super."queuelike"; "quick-generator" = dontDistribute super."quick-generator"; + "quick-schema" = dontDistribute super."quick-schema"; "quickcheck-assertions" = doDistribute super."quickcheck-assertions_0_1_1"; "quickcheck-instances" = doDistribute super."quickcheck-instances_0_3_10"; "quickcheck-io" = doDistribute super."quickcheck-io_0_1_1"; @@ -6958,6 +6993,7 @@ self: super: { "servant" = dontDistribute super."servant"; "servant-JuicyPixels" = dontDistribute super."servant-JuicyPixels"; "servant-blaze" = dontDistribute super."servant-blaze"; + "servant-cassava" = dontDistribute super."servant-cassava"; "servant-client" = dontDistribute super."servant-client"; "servant-docs" = dontDistribute super."servant-docs"; "servant-ede" = dontDistribute super."servant-ede"; @@ -6971,6 +7007,7 @@ self: super: { "servant-response" = dontDistribute super."servant-response"; "servant-scotty" = dontDistribute super."servant-scotty"; "servant-server" = dontDistribute super."servant-server"; + "servant-swagger" = dontDistribute super."servant-swagger"; "servant-yaml" = dontDistribute super."servant-yaml"; "serversession" = dontDistribute super."serversession"; "serversession-backend-acid-state" = dontDistribute super."serversession-backend-acid-state"; @@ -8163,6 +8200,7 @@ self: super: { "verdict" = dontDistribute super."verdict"; "verdict-json" = dontDistribute super."verdict-json"; "verilog" = dontDistribute super."verilog"; + "versions" = dontDistribute super."versions"; "vhdl" = dontDistribute super."vhdl"; "views" = dontDistribute super."views"; "vigilance" = dontDistribute super."vigilance"; @@ -8616,6 +8654,7 @@ self: super: { "zendesk-api" = dontDistribute super."zendesk-api"; "zeno" = dontDistribute super."zeno"; "zero" = dontDistribute super."zero"; + "zerobin" = dontDistribute super."zerobin"; "zeromq-haskell" = dontDistribute super."zeromq-haskell"; "zeromq3-conduit" = dontDistribute super."zeromq3-conduit"; "zeromq3-haskell" = dontDistribute super."zeromq3-haskell"; diff --git a/pkgs/development/haskell-modules/configuration-lts-1.8.nix b/pkgs/development/haskell-modules/configuration-lts-1.8.nix index 0ae90e9762da..0fbfe1b84dc0 100644 --- a/pkgs/development/haskell-modules/configuration-lts-1.8.nix +++ b/pkgs/development/haskell-modules/configuration-lts-1.8.nix @@ -512,6 +512,7 @@ self: super: { "HasGP" = dontDistribute super."HasGP"; "Haschoo" = dontDistribute super."Haschoo"; "Hashell" = dontDistribute super."Hashell"; + "HaskRel" = dontDistribute super."HaskRel"; "HaskellForMaths" = dontDistribute super."HaskellForMaths"; "HaskellLM" = dontDistribute super."HaskellLM"; "HaskellNN" = dontDistribute super."HaskellNN"; @@ -558,6 +559,7 @@ self: super: { "Hsed" = dontDistribute super."Hsed"; "Hsmtlib" = dontDistribute super."Hsmtlib"; "HueAPI" = dontDistribute super."HueAPI"; + "HulkImport" = dontDistribute super."HulkImport"; "Hungarian-Munkres" = dontDistribute super."Hungarian-Munkres"; "IDynamic" = dontDistribute super."IDynamic"; "IFS" = dontDistribute super."IFS"; @@ -1162,6 +1164,7 @@ self: super: { "afis" = dontDistribute super."afis"; "afv" = dontDistribute super."afv"; "agda-server" = dontDistribute super."agda-server"; + "agda-snippets" = dontDistribute super."agda-snippets"; "agentx" = dontDistribute super."agentx"; "agum" = dontDistribute super."agum"; "aig" = dontDistribute super."aig"; @@ -1988,6 +1991,7 @@ self: super: { "cipher-aes" = doDistribute super."cipher-aes_0_2_10"; "cipher-aes128" = dontDistribute super."cipher-aes128"; "cipher-rc5" = dontDistribute super."cipher-rc5"; + "ciphersaber2" = dontDistribute super."ciphersaber2"; "circ" = dontDistribute super."circ"; "cirru-parser" = dontDistribute super."cirru-parser"; "citation-resolve" = dontDistribute super."citation-resolve"; @@ -2449,6 +2453,7 @@ self: super: { "dataflow" = dontDistribute super."dataflow"; "datalog" = dontDistribute super."datalog"; "datapacker" = dontDistribute super."datapacker"; + "dataurl" = dontDistribute super."dataurl"; "date-cache" = dontDistribute super."date-cache"; "dates" = dontDistribute super."dates"; "datetime" = dontDistribute super."datetime"; @@ -2860,6 +2865,7 @@ self: super: { "eros-client" = dontDistribute super."eros-client"; "eros-http" = dontDistribute super."eros-http"; "errno" = dontDistribute super."errno"; + "error-analyze" = dontDistribute super."error-analyze"; "error-continuations" = dontDistribute super."error-continuations"; "error-list" = dontDistribute super."error-list"; "error-loc" = dontDistribute super."error-loc"; @@ -2915,6 +2921,7 @@ self: super: { "exinst-deepseq" = dontDistribute super."exinst-deepseq"; "exinst-hashable" = dontDistribute super."exinst-hashable"; "exists" = dontDistribute super."exists"; + "exit-codes" = dontDistribute super."exit-codes"; "exp-pairs" = dontDistribute super."exp-pairs"; "expand" = dontDistribute super."expand"; "expat-enumerator" = dontDistribute super."expat-enumerator"; @@ -3035,6 +3042,7 @@ self: super: { "fingertree-psqueue" = dontDistribute super."fingertree-psqueue"; "fingertree-tf" = dontDistribute super."fingertree-tf"; "finite-field" = dontDistribute super."finite-field"; + "finite-typelits" = dontDistribute super."finite-typelits"; "first-and-last" = dontDistribute super."first-and-last"; "first-class-patterns" = dontDistribute super."first-class-patterns"; "firstify" = dontDistribute super."firstify"; @@ -3325,6 +3333,20 @@ self: super: { "ghclive" = dontDistribute super."ghclive"; "ghczdecode" = dontDistribute super."ghczdecode"; "ght" = dontDistribute super."ght"; + "gi-atk" = dontDistribute super."gi-atk"; + "gi-cairo" = dontDistribute super."gi-cairo"; + "gi-gdk" = dontDistribute super."gi-gdk"; + "gi-gdkpixbuf" = dontDistribute super."gi-gdkpixbuf"; + "gi-gio" = dontDistribute super."gi-gio"; + "gi-glib" = dontDistribute super."gi-glib"; + "gi-gobject" = dontDistribute super."gi-gobject"; + "gi-gtk" = dontDistribute super."gi-gtk"; + "gi-javascriptcore" = dontDistribute super."gi-javascriptcore"; + "gi-notify" = dontDistribute super."gi-notify"; + "gi-pango" = dontDistribute super."gi-pango"; + "gi-soup" = dontDistribute super."gi-soup"; + "gi-vte" = dontDistribute super."gi-vte"; + "gi-webkit" = dontDistribute super."gi-webkit"; "gimlh" = dontDistribute super."gimlh"; "ginger" = dontDistribute super."ginger"; "ginsu" = dontDistribute super."ginsu"; @@ -3337,6 +3359,7 @@ self: super: { "git-date" = dontDistribute super."git-date"; "git-freq" = dontDistribute super."git-freq"; "git-gpush" = dontDistribute super."git-gpush"; + "git-jump" = dontDistribute super."git-jump"; "git-monitor" = dontDistribute super."git-monitor"; "git-object" = dontDistribute super."git-object"; "git-repair" = dontDistribute super."git-repair"; @@ -3822,6 +3845,8 @@ self: super: { "haskell-formatter" = dontDistribute super."haskell-formatter"; "haskell-ftp" = dontDistribute super."haskell-ftp"; "haskell-generate" = dontDistribute super."haskell-generate"; + "haskell-gi" = dontDistribute super."haskell-gi"; + "haskell-gi-base" = dontDistribute super."haskell-gi-base"; "haskell-import-graph" = dontDistribute super."haskell-import-graph"; "haskell-in-space" = dontDistribute super."haskell-in-space"; "haskell-modbus" = dontDistribute super."haskell-modbus"; @@ -4027,6 +4052,7 @@ self: super: { "hfann" = dontDistribute super."hfann"; "hfd" = dontDistribute super."hfd"; "hfiar" = dontDistribute super."hfiar"; + "hfmt" = dontDistribute super."hfmt"; "hfoil" = dontDistribute super."hfoil"; "hfov" = dontDistribute super."hfov"; "hfractal" = dontDistribute super."hfractal"; @@ -4445,6 +4471,7 @@ self: super: { "hsx2hs" = dontDistribute super."hsx2hs"; "hsyscall" = dontDistribute super."hsyscall"; "hszephyr" = dontDistribute super."hszephyr"; + "htaglib" = dontDistribute super."htaglib"; "htags" = dontDistribute super."htags"; "htar" = dontDistribute super."htar"; "htiled" = dontDistribute super."htiled"; @@ -4890,6 +4917,7 @@ self: super: { "keera-hails-reactive-polling" = dontDistribute super."keera-hails-reactive-polling"; "keera-hails-reactive-wx" = dontDistribute super."keera-hails-reactive-wx"; "keera-hails-reactive-yampa" = dontDistribute super."keera-hails-reactive-yampa"; + "keera-hails-reactivelenses" = dontDistribute super."keera-hails-reactivelenses"; "keera-hails-reactivevalues" = dontDistribute super."keera-hails-reactivevalues"; "keera-posture" = dontDistribute super."keera-posture"; "keiretsu" = dontDistribute super."keiretsu"; @@ -5014,6 +5042,8 @@ self: super: { "lat" = dontDistribute super."lat"; "latest-npm-version" = dontDistribute super."latest-npm-version"; "latex" = dontDistribute super."latex"; + "latex-formulae-image" = dontDistribute super."latex-formulae-image"; + "latex-formulae-pandoc" = dontDistribute super."latex-formulae-pandoc"; "lattices" = dontDistribute super."lattices"; "launchpad-control" = dontDistribute super."launchpad-control"; "lax" = dontDistribute super."lax"; @@ -5388,6 +5418,7 @@ self: super: { "memexml" = dontDistribute super."memexml"; "memo-ptr" = dontDistribute super."memo-ptr"; "memo-sqlite" = dontDistribute super."memo-sqlite"; + "memoization-utils" = dontDistribute super."memoization-utils"; "memoize" = dontDistribute super."memoize"; "memory" = dontDistribute super."memory"; "memscript" = dontDistribute super."memscript"; @@ -5833,6 +5864,7 @@ self: super: { "nthable" = dontDistribute super."nthable"; "ntp-control" = dontDistribute super."ntp-control"; "null-canvas" = dontDistribute super."null-canvas"; + "nullary" = dontDistribute super."nullary"; "number" = dontDistribute super."number"; "numbering" = dontDistribute super."numbering"; "numerals" = dontDistribute super."numerals"; @@ -6060,6 +6092,7 @@ self: super: { "pcg-random" = dontDistribute super."pcg-random"; "pcre-heavy" = dontDistribute super."pcre-heavy"; "pcre-less" = dontDistribute super."pcre-less"; + "pcre-light" = doDistribute super."pcre-light_0_4_0_3"; "pcre-light-extra" = dontDistribute super."pcre-light-extra"; "pcre-utils" = dontDistribute super."pcre-utils"; "pdf-toolbox-content" = dontDistribute super."pdf-toolbox-content"; @@ -6437,6 +6470,7 @@ self: super: { "qc-oi-testgenerator" = dontDistribute super."qc-oi-testgenerator"; "qd" = dontDistribute super."qd"; "qd-vec" = dontDistribute super."qd-vec"; + "qed" = dontDistribute super."qed"; "qhull-simple" = dontDistribute super."qhull-simple"; "qrcode" = dontDistribute super."qrcode"; "qt" = dontDistribute super."qt"; @@ -6452,6 +6486,7 @@ self: super: { "queue" = dontDistribute super."queue"; "queuelike" = dontDistribute super."queuelike"; "quick-generator" = dontDistribute super."quick-generator"; + "quick-schema" = dontDistribute super."quick-schema"; "quickcheck-assertions" = doDistribute super."quickcheck-assertions_0_1_1"; "quickcheck-instances" = doDistribute super."quickcheck-instances_0_3_10"; "quickcheck-io" = doDistribute super."quickcheck-io_0_1_1"; @@ -6953,6 +6988,7 @@ self: super: { "servant" = dontDistribute super."servant"; "servant-JuicyPixels" = dontDistribute super."servant-JuicyPixels"; "servant-blaze" = dontDistribute super."servant-blaze"; + "servant-cassava" = dontDistribute super."servant-cassava"; "servant-client" = dontDistribute super."servant-client"; "servant-docs" = dontDistribute super."servant-docs"; "servant-ede" = dontDistribute super."servant-ede"; @@ -6966,6 +7002,7 @@ self: super: { "servant-response" = dontDistribute super."servant-response"; "servant-scotty" = dontDistribute super."servant-scotty"; "servant-server" = dontDistribute super."servant-server"; + "servant-swagger" = dontDistribute super."servant-swagger"; "servant-yaml" = dontDistribute super."servant-yaml"; "serversession" = dontDistribute super."serversession"; "serversession-backend-acid-state" = dontDistribute super."serversession-backend-acid-state"; @@ -8157,6 +8194,7 @@ self: super: { "verdict" = dontDistribute super."verdict"; "verdict-json" = dontDistribute super."verdict-json"; "verilog" = dontDistribute super."verilog"; + "versions" = dontDistribute super."versions"; "vhdl" = dontDistribute super."vhdl"; "views" = dontDistribute super."views"; "vigilance" = dontDistribute super."vigilance"; @@ -8610,6 +8648,7 @@ self: super: { "zendesk-api" = dontDistribute super."zendesk-api"; "zeno" = dontDistribute super."zeno"; "zero" = dontDistribute super."zero"; + "zerobin" = dontDistribute super."zerobin"; "zeromq-haskell" = dontDistribute super."zeromq-haskell"; "zeromq3-conduit" = dontDistribute super."zeromq3-conduit"; "zeromq3-haskell" = dontDistribute super."zeromq3-haskell"; diff --git a/pkgs/development/haskell-modules/configuration-lts-1.9.nix b/pkgs/development/haskell-modules/configuration-lts-1.9.nix index c5c6845d7f1b..84a1dbef324c 100644 --- a/pkgs/development/haskell-modules/configuration-lts-1.9.nix +++ b/pkgs/development/haskell-modules/configuration-lts-1.9.nix @@ -512,6 +512,7 @@ self: super: { "HasGP" = dontDistribute super."HasGP"; "Haschoo" = dontDistribute super."Haschoo"; "Hashell" = dontDistribute super."Hashell"; + "HaskRel" = dontDistribute super."HaskRel"; "HaskellForMaths" = dontDistribute super."HaskellForMaths"; "HaskellLM" = dontDistribute super."HaskellLM"; "HaskellNN" = dontDistribute super."HaskellNN"; @@ -558,6 +559,7 @@ self: super: { "Hsed" = dontDistribute super."Hsed"; "Hsmtlib" = dontDistribute super."Hsmtlib"; "HueAPI" = dontDistribute super."HueAPI"; + "HulkImport" = dontDistribute super."HulkImport"; "Hungarian-Munkres" = dontDistribute super."Hungarian-Munkres"; "IDynamic" = dontDistribute super."IDynamic"; "IFS" = dontDistribute super."IFS"; @@ -1162,6 +1164,7 @@ self: super: { "afis" = dontDistribute super."afis"; "afv" = dontDistribute super."afv"; "agda-server" = dontDistribute super."agda-server"; + "agda-snippets" = dontDistribute super."agda-snippets"; "agentx" = dontDistribute super."agentx"; "agum" = dontDistribute super."agum"; "aig" = dontDistribute super."aig"; @@ -1988,6 +1991,7 @@ self: super: { "cipher-aes" = doDistribute super."cipher-aes_0_2_10"; "cipher-aes128" = dontDistribute super."cipher-aes128"; "cipher-rc5" = dontDistribute super."cipher-rc5"; + "ciphersaber2" = dontDistribute super."ciphersaber2"; "circ" = dontDistribute super."circ"; "cirru-parser" = dontDistribute super."cirru-parser"; "citation-resolve" = dontDistribute super."citation-resolve"; @@ -2449,6 +2453,7 @@ self: super: { "dataflow" = dontDistribute super."dataflow"; "datalog" = dontDistribute super."datalog"; "datapacker" = dontDistribute super."datapacker"; + "dataurl" = dontDistribute super."dataurl"; "date-cache" = dontDistribute super."date-cache"; "dates" = dontDistribute super."dates"; "datetime" = dontDistribute super."datetime"; @@ -2860,6 +2865,7 @@ self: super: { "eros-client" = dontDistribute super."eros-client"; "eros-http" = dontDistribute super."eros-http"; "errno" = dontDistribute super."errno"; + "error-analyze" = dontDistribute super."error-analyze"; "error-continuations" = dontDistribute super."error-continuations"; "error-list" = dontDistribute super."error-list"; "error-loc" = dontDistribute super."error-loc"; @@ -2915,6 +2921,7 @@ self: super: { "exinst-deepseq" = dontDistribute super."exinst-deepseq"; "exinst-hashable" = dontDistribute super."exinst-hashable"; "exists" = dontDistribute super."exists"; + "exit-codes" = dontDistribute super."exit-codes"; "exp-pairs" = dontDistribute super."exp-pairs"; "expand" = dontDistribute super."expand"; "expat-enumerator" = dontDistribute super."expat-enumerator"; @@ -3035,6 +3042,7 @@ self: super: { "fingertree-psqueue" = dontDistribute super."fingertree-psqueue"; "fingertree-tf" = dontDistribute super."fingertree-tf"; "finite-field" = dontDistribute super."finite-field"; + "finite-typelits" = dontDistribute super."finite-typelits"; "first-and-last" = dontDistribute super."first-and-last"; "first-class-patterns" = dontDistribute super."first-class-patterns"; "firstify" = dontDistribute super."firstify"; @@ -3324,6 +3332,20 @@ self: super: { "ghclive" = dontDistribute super."ghclive"; "ghczdecode" = dontDistribute super."ghczdecode"; "ght" = dontDistribute super."ght"; + "gi-atk" = dontDistribute super."gi-atk"; + "gi-cairo" = dontDistribute super."gi-cairo"; + "gi-gdk" = dontDistribute super."gi-gdk"; + "gi-gdkpixbuf" = dontDistribute super."gi-gdkpixbuf"; + "gi-gio" = dontDistribute super."gi-gio"; + "gi-glib" = dontDistribute super."gi-glib"; + "gi-gobject" = dontDistribute super."gi-gobject"; + "gi-gtk" = dontDistribute super."gi-gtk"; + "gi-javascriptcore" = dontDistribute super."gi-javascriptcore"; + "gi-notify" = dontDistribute super."gi-notify"; + "gi-pango" = dontDistribute super."gi-pango"; + "gi-soup" = dontDistribute super."gi-soup"; + "gi-vte" = dontDistribute super."gi-vte"; + "gi-webkit" = dontDistribute super."gi-webkit"; "gimlh" = dontDistribute super."gimlh"; "ginger" = dontDistribute super."ginger"; "ginsu" = dontDistribute super."ginsu"; @@ -3336,6 +3358,7 @@ self: super: { "git-date" = dontDistribute super."git-date"; "git-freq" = dontDistribute super."git-freq"; "git-gpush" = dontDistribute super."git-gpush"; + "git-jump" = dontDistribute super."git-jump"; "git-monitor" = dontDistribute super."git-monitor"; "git-object" = dontDistribute super."git-object"; "git-repair" = dontDistribute super."git-repair"; @@ -3821,6 +3844,8 @@ self: super: { "haskell-formatter" = dontDistribute super."haskell-formatter"; "haskell-ftp" = dontDistribute super."haskell-ftp"; "haskell-generate" = dontDistribute super."haskell-generate"; + "haskell-gi" = dontDistribute super."haskell-gi"; + "haskell-gi-base" = dontDistribute super."haskell-gi-base"; "haskell-import-graph" = dontDistribute super."haskell-import-graph"; "haskell-in-space" = dontDistribute super."haskell-in-space"; "haskell-modbus" = dontDistribute super."haskell-modbus"; @@ -4026,6 +4051,7 @@ self: super: { "hfann" = dontDistribute super."hfann"; "hfd" = dontDistribute super."hfd"; "hfiar" = dontDistribute super."hfiar"; + "hfmt" = dontDistribute super."hfmt"; "hfoil" = dontDistribute super."hfoil"; "hfov" = dontDistribute super."hfov"; "hfractal" = dontDistribute super."hfractal"; @@ -4444,6 +4470,7 @@ self: super: { "hsx2hs" = dontDistribute super."hsx2hs"; "hsyscall" = dontDistribute super."hsyscall"; "hszephyr" = dontDistribute super."hszephyr"; + "htaglib" = dontDistribute super."htaglib"; "htags" = dontDistribute super."htags"; "htar" = dontDistribute super."htar"; "htiled" = dontDistribute super."htiled"; @@ -4888,6 +4915,7 @@ self: super: { "keera-hails-reactive-polling" = dontDistribute super."keera-hails-reactive-polling"; "keera-hails-reactive-wx" = dontDistribute super."keera-hails-reactive-wx"; "keera-hails-reactive-yampa" = dontDistribute super."keera-hails-reactive-yampa"; + "keera-hails-reactivelenses" = dontDistribute super."keera-hails-reactivelenses"; "keera-hails-reactivevalues" = dontDistribute super."keera-hails-reactivevalues"; "keera-posture" = dontDistribute super."keera-posture"; "keiretsu" = dontDistribute super."keiretsu"; @@ -5012,6 +5040,8 @@ self: super: { "lat" = dontDistribute super."lat"; "latest-npm-version" = dontDistribute super."latest-npm-version"; "latex" = dontDistribute super."latex"; + "latex-formulae-image" = dontDistribute super."latex-formulae-image"; + "latex-formulae-pandoc" = dontDistribute super."latex-formulae-pandoc"; "lattices" = dontDistribute super."lattices"; "launchpad-control" = dontDistribute super."launchpad-control"; "lax" = dontDistribute super."lax"; @@ -5386,6 +5416,7 @@ self: super: { "memexml" = dontDistribute super."memexml"; "memo-ptr" = dontDistribute super."memo-ptr"; "memo-sqlite" = dontDistribute super."memo-sqlite"; + "memoization-utils" = dontDistribute super."memoization-utils"; "memoize" = dontDistribute super."memoize"; "memory" = dontDistribute super."memory"; "memscript" = dontDistribute super."memscript"; @@ -5831,6 +5862,7 @@ self: super: { "nthable" = dontDistribute super."nthable"; "ntp-control" = dontDistribute super."ntp-control"; "null-canvas" = dontDistribute super."null-canvas"; + "nullary" = dontDistribute super."nullary"; "number" = dontDistribute super."number"; "numbering" = dontDistribute super."numbering"; "numerals" = dontDistribute super."numerals"; @@ -6057,6 +6089,7 @@ self: super: { "pcg-random" = dontDistribute super."pcg-random"; "pcre-heavy" = dontDistribute super."pcre-heavy"; "pcre-less" = dontDistribute super."pcre-less"; + "pcre-light" = doDistribute super."pcre-light_0_4_0_3"; "pcre-light-extra" = dontDistribute super."pcre-light-extra"; "pcre-utils" = dontDistribute super."pcre-utils"; "pdf-toolbox-content" = dontDistribute super."pdf-toolbox-content"; @@ -6434,6 +6467,7 @@ self: super: { "qc-oi-testgenerator" = dontDistribute super."qc-oi-testgenerator"; "qd" = dontDistribute super."qd"; "qd-vec" = dontDistribute super."qd-vec"; + "qed" = dontDistribute super."qed"; "qhull-simple" = dontDistribute super."qhull-simple"; "qrcode" = dontDistribute super."qrcode"; "qt" = dontDistribute super."qt"; @@ -6449,6 +6483,7 @@ self: super: { "queue" = dontDistribute super."queue"; "queuelike" = dontDistribute super."queuelike"; "quick-generator" = dontDistribute super."quick-generator"; + "quick-schema" = dontDistribute super."quick-schema"; "quickcheck-assertions" = doDistribute super."quickcheck-assertions_0_1_1"; "quickcheck-instances" = doDistribute super."quickcheck-instances_0_3_10"; "quickcheck-io" = doDistribute super."quickcheck-io_0_1_1"; @@ -6950,6 +6985,7 @@ self: super: { "servant" = dontDistribute super."servant"; "servant-JuicyPixels" = dontDistribute super."servant-JuicyPixels"; "servant-blaze" = dontDistribute super."servant-blaze"; + "servant-cassava" = dontDistribute super."servant-cassava"; "servant-client" = dontDistribute super."servant-client"; "servant-docs" = dontDistribute super."servant-docs"; "servant-ede" = dontDistribute super."servant-ede"; @@ -6963,6 +6999,7 @@ self: super: { "servant-response" = dontDistribute super."servant-response"; "servant-scotty" = dontDistribute super."servant-scotty"; "servant-server" = dontDistribute super."servant-server"; + "servant-swagger" = dontDistribute super."servant-swagger"; "servant-yaml" = dontDistribute super."servant-yaml"; "serversession" = dontDistribute super."serversession"; "serversession-backend-acid-state" = dontDistribute super."serversession-backend-acid-state"; @@ -8154,6 +8191,7 @@ self: super: { "verdict" = dontDistribute super."verdict"; "verdict-json" = dontDistribute super."verdict-json"; "verilog" = dontDistribute super."verilog"; + "versions" = dontDistribute super."versions"; "vhdl" = dontDistribute super."vhdl"; "views" = dontDistribute super."views"; "vigilance" = dontDistribute super."vigilance"; @@ -8607,6 +8645,7 @@ self: super: { "zendesk-api" = dontDistribute super."zendesk-api"; "zeno" = dontDistribute super."zeno"; "zero" = dontDistribute super."zero"; + "zerobin" = dontDistribute super."zerobin"; "zeromq-haskell" = dontDistribute super."zeromq-haskell"; "zeromq3-conduit" = dontDistribute super."zeromq3-conduit"; "zeromq3-haskell" = dontDistribute super."zeromq3-haskell"; diff --git a/pkgs/development/haskell-modules/configuration-lts-2.0.nix b/pkgs/development/haskell-modules/configuration-lts-2.0.nix index bebc7f680cc7..dedb5ab2093d 100644 --- a/pkgs/development/haskell-modules/configuration-lts-2.0.nix +++ b/pkgs/development/haskell-modules/configuration-lts-2.0.nix @@ -507,6 +507,7 @@ self: super: { "HasGP" = dontDistribute super."HasGP"; "Haschoo" = dontDistribute super."Haschoo"; "Hashell" = dontDistribute super."Hashell"; + "HaskRel" = dontDistribute super."HaskRel"; "HaskellForMaths" = dontDistribute super."HaskellForMaths"; "HaskellLM" = dontDistribute super."HaskellLM"; "HaskellNN" = dontDistribute super."HaskellNN"; @@ -552,6 +553,7 @@ self: super: { "Hsed" = dontDistribute super."Hsed"; "Hsmtlib" = dontDistribute super."Hsmtlib"; "HueAPI" = dontDistribute super."HueAPI"; + "HulkImport" = dontDistribute super."HulkImport"; "Hungarian-Munkres" = dontDistribute super."Hungarian-Munkres"; "IDynamic" = dontDistribute super."IDynamic"; "IFS" = dontDistribute super."IFS"; @@ -1151,6 +1153,7 @@ self: super: { "afis" = dontDistribute super."afis"; "afv" = dontDistribute super."afv"; "agda-server" = dontDistribute super."agda-server"; + "agda-snippets" = dontDistribute super."agda-snippets"; "agentx" = dontDistribute super."agentx"; "agum" = dontDistribute super."agum"; "aig" = dontDistribute super."aig"; @@ -1967,6 +1970,7 @@ self: super: { "cipher-aes" = doDistribute super."cipher-aes_0_2_10"; "cipher-aes128" = doDistribute super."cipher-aes128_0_6_4"; "cipher-rc5" = dontDistribute super."cipher-rc5"; + "ciphersaber2" = dontDistribute super."ciphersaber2"; "circ" = dontDistribute super."circ"; "cirru-parser" = dontDistribute super."cirru-parser"; "citation-resolve" = dontDistribute super."citation-resolve"; @@ -2421,6 +2425,7 @@ self: super: { "dataflow" = dontDistribute super."dataflow"; "datalog" = dontDistribute super."datalog"; "datapacker" = dontDistribute super."datapacker"; + "dataurl" = dontDistribute super."dataurl"; "date-cache" = dontDistribute super."date-cache"; "dates" = dontDistribute super."dates"; "datetime" = dontDistribute super."datetime"; @@ -2830,6 +2835,7 @@ self: super: { "eros-client" = dontDistribute super."eros-client"; "eros-http" = dontDistribute super."eros-http"; "errno" = dontDistribute super."errno"; + "error-analyze" = dontDistribute super."error-analyze"; "error-continuations" = dontDistribute super."error-continuations"; "error-list" = dontDistribute super."error-list"; "error-loc" = dontDistribute super."error-loc"; @@ -2883,6 +2889,7 @@ self: super: { "exinst-deepseq" = dontDistribute super."exinst-deepseq"; "exinst-hashable" = dontDistribute super."exinst-hashable"; "exists" = dontDistribute super."exists"; + "exit-codes" = dontDistribute super."exit-codes"; "exp-pairs" = dontDistribute super."exp-pairs"; "expand" = dontDistribute super."expand"; "expat-enumerator" = dontDistribute super."expat-enumerator"; @@ -3004,6 +3011,7 @@ self: super: { "fingertree-psqueue" = dontDistribute super."fingertree-psqueue"; "fingertree-tf" = dontDistribute super."fingertree-tf"; "finite-field" = dontDistribute super."finite-field"; + "finite-typelits" = dontDistribute super."finite-typelits"; "first-and-last" = dontDistribute super."first-and-last"; "first-class-patterns" = dontDistribute super."first-class-patterns"; "firstify" = dontDistribute super."firstify"; @@ -3289,6 +3297,20 @@ self: super: { "ghclive" = dontDistribute super."ghclive"; "ghczdecode" = dontDistribute super."ghczdecode"; "ght" = dontDistribute super."ght"; + "gi-atk" = dontDistribute super."gi-atk"; + "gi-cairo" = dontDistribute super."gi-cairo"; + "gi-gdk" = dontDistribute super."gi-gdk"; + "gi-gdkpixbuf" = dontDistribute super."gi-gdkpixbuf"; + "gi-gio" = dontDistribute super."gi-gio"; + "gi-glib" = dontDistribute super."gi-glib"; + "gi-gobject" = dontDistribute super."gi-gobject"; + "gi-gtk" = dontDistribute super."gi-gtk"; + "gi-javascriptcore" = dontDistribute super."gi-javascriptcore"; + "gi-notify" = dontDistribute super."gi-notify"; + "gi-pango" = dontDistribute super."gi-pango"; + "gi-soup" = dontDistribute super."gi-soup"; + "gi-vte" = dontDistribute super."gi-vte"; + "gi-webkit" = dontDistribute super."gi-webkit"; "gimlh" = dontDistribute super."gimlh"; "ginger" = dontDistribute super."ginger"; "ginsu" = dontDistribute super."ginsu"; @@ -3301,6 +3323,7 @@ self: super: { "git-date" = dontDistribute super."git-date"; "git-freq" = dontDistribute super."git-freq"; "git-gpush" = dontDistribute super."git-gpush"; + "git-jump" = dontDistribute super."git-jump"; "git-monitor" = dontDistribute super."git-monitor"; "git-object" = dontDistribute super."git-object"; "git-repair" = dontDistribute super."git-repair"; @@ -3780,6 +3803,8 @@ self: super: { "haskell-formatter" = dontDistribute super."haskell-formatter"; "haskell-ftp" = dontDistribute super."haskell-ftp"; "haskell-generate" = dontDistribute super."haskell-generate"; + "haskell-gi" = dontDistribute super."haskell-gi"; + "haskell-gi-base" = dontDistribute super."haskell-gi-base"; "haskell-import-graph" = dontDistribute super."haskell-import-graph"; "haskell-in-space" = dontDistribute super."haskell-in-space"; "haskell-modbus" = dontDistribute super."haskell-modbus"; @@ -3982,6 +4007,7 @@ self: super: { "hfann" = dontDistribute super."hfann"; "hfd" = dontDistribute super."hfd"; "hfiar" = dontDistribute super."hfiar"; + "hfmt" = dontDistribute super."hfmt"; "hfoil" = dontDistribute super."hfoil"; "hfov" = dontDistribute super."hfov"; "hfractal" = dontDistribute super."hfractal"; @@ -4398,6 +4424,7 @@ self: super: { "hsx2hs" = dontDistribute super."hsx2hs"; "hsyscall" = dontDistribute super."hsyscall"; "hszephyr" = dontDistribute super."hszephyr"; + "htaglib" = dontDistribute super."htaglib"; "htags" = dontDistribute super."htags"; "htar" = dontDistribute super."htar"; "htiled" = dontDistribute super."htiled"; @@ -4829,6 +4856,7 @@ self: super: { "keera-hails-reactive-polling" = dontDistribute super."keera-hails-reactive-polling"; "keera-hails-reactive-wx" = dontDistribute super."keera-hails-reactive-wx"; "keera-hails-reactive-yampa" = dontDistribute super."keera-hails-reactive-yampa"; + "keera-hails-reactivelenses" = dontDistribute super."keera-hails-reactivelenses"; "keera-hails-reactivevalues" = dontDistribute super."keera-hails-reactivevalues"; "keera-posture" = dontDistribute super."keera-posture"; "keiretsu" = dontDistribute super."keiretsu"; @@ -4951,6 +4979,8 @@ self: super: { "lat" = dontDistribute super."lat"; "latest-npm-version" = dontDistribute super."latest-npm-version"; "latex" = dontDistribute super."latex"; + "latex-formulae-image" = dontDistribute super."latex-formulae-image"; + "latex-formulae-pandoc" = dontDistribute super."latex-formulae-pandoc"; "lattices" = doDistribute super."lattices_1_2_1_1"; "launchpad-control" = dontDistribute super."launchpad-control"; "lax" = dontDistribute super."lax"; @@ -5318,6 +5348,7 @@ self: super: { "memexml" = dontDistribute super."memexml"; "memo-ptr" = dontDistribute super."memo-ptr"; "memo-sqlite" = dontDistribute super."memo-sqlite"; + "memoization-utils" = dontDistribute super."memoization-utils"; "memoize" = dontDistribute super."memoize"; "memory" = dontDistribute super."memory"; "memscript" = dontDistribute super."memscript"; @@ -5747,6 +5778,7 @@ self: super: { "nthable" = dontDistribute super."nthable"; "ntp-control" = dontDistribute super."ntp-control"; "null-canvas" = dontDistribute super."null-canvas"; + "nullary" = dontDistribute super."nullary"; "number" = dontDistribute super."number"; "numbering" = dontDistribute super."numbering"; "numerals" = dontDistribute super."numerals"; @@ -5972,6 +6004,7 @@ self: super: { "pcg-random" = dontDistribute super."pcg-random"; "pcre-heavy" = doDistribute super."pcre-heavy_0_2_2"; "pcre-less" = dontDistribute super."pcre-less"; + "pcre-light" = doDistribute super."pcre-light_0_4_0_3"; "pcre-light-extra" = dontDistribute super."pcre-light-extra"; "pcre-utils" = dontDistribute super."pcre-utils"; "pdf-toolbox-content" = dontDistribute super."pdf-toolbox-content"; @@ -6346,6 +6379,7 @@ self: super: { "qc-oi-testgenerator" = dontDistribute super."qc-oi-testgenerator"; "qd" = dontDistribute super."qd"; "qd-vec" = dontDistribute super."qd-vec"; + "qed" = dontDistribute super."qed"; "qhull-simple" = dontDistribute super."qhull-simple"; "qrcode" = dontDistribute super."qrcode"; "qt" = dontDistribute super."qt"; @@ -6361,6 +6395,7 @@ self: super: { "queue" = dontDistribute super."queue"; "queuelike" = dontDistribute super."queuelike"; "quick-generator" = dontDistribute super."quick-generator"; + "quick-schema" = dontDistribute super."quick-schema"; "quickcheck-io" = doDistribute super."quickcheck-io_0_1_1"; "quickcheck-poly" = dontDistribute super."quickcheck-poly"; "quickcheck-properties" = dontDistribute super."quickcheck-properties"; @@ -6856,6 +6891,7 @@ self: super: { "servant" = doDistribute super."servant_0_2_2"; "servant-JuicyPixels" = dontDistribute super."servant-JuicyPixels"; "servant-blaze" = dontDistribute super."servant-blaze"; + "servant-cassava" = dontDistribute super."servant-cassava"; "servant-client" = doDistribute super."servant-client_0_2_2"; "servant-docs" = doDistribute super."servant-docs_0_3_1"; "servant-ede" = dontDistribute super."servant-ede"; @@ -6869,6 +6905,7 @@ self: super: { "servant-response" = dontDistribute super."servant-response"; "servant-scotty" = dontDistribute super."servant-scotty"; "servant-server" = doDistribute super."servant-server_0_2_4"; + "servant-swagger" = dontDistribute super."servant-swagger"; "servant-yaml" = dontDistribute super."servant-yaml"; "serversession" = dontDistribute super."serversession"; "serversession-backend-acid-state" = dontDistribute super."serversession-backend-acid-state"; @@ -8042,6 +8079,7 @@ self: super: { "verdict" = dontDistribute super."verdict"; "verdict-json" = dontDistribute super."verdict-json"; "verilog" = dontDistribute super."verilog"; + "versions" = dontDistribute super."versions"; "vhdl" = dontDistribute super."vhdl"; "views" = dontDistribute super."views"; "vigilance" = dontDistribute super."vigilance"; @@ -8487,6 +8525,7 @@ self: super: { "zendesk-api" = dontDistribute super."zendesk-api"; "zeno" = dontDistribute super."zeno"; "zero" = dontDistribute super."zero"; + "zerobin" = dontDistribute super."zerobin"; "zeromq-haskell" = dontDistribute super."zeromq-haskell"; "zeromq3-conduit" = dontDistribute super."zeromq3-conduit"; "zeromq3-haskell" = dontDistribute super."zeromq3-haskell"; diff --git a/pkgs/development/haskell-modules/configuration-lts-2.1.nix b/pkgs/development/haskell-modules/configuration-lts-2.1.nix index 5ee5d91fd300..51111feef901 100644 --- a/pkgs/development/haskell-modules/configuration-lts-2.1.nix +++ b/pkgs/development/haskell-modules/configuration-lts-2.1.nix @@ -507,6 +507,7 @@ self: super: { "HasGP" = dontDistribute super."HasGP"; "Haschoo" = dontDistribute super."Haschoo"; "Hashell" = dontDistribute super."Hashell"; + "HaskRel" = dontDistribute super."HaskRel"; "HaskellForMaths" = dontDistribute super."HaskellForMaths"; "HaskellLM" = dontDistribute super."HaskellLM"; "HaskellNN" = dontDistribute super."HaskellNN"; @@ -552,6 +553,7 @@ self: super: { "Hsed" = dontDistribute super."Hsed"; "Hsmtlib" = dontDistribute super."Hsmtlib"; "HueAPI" = dontDistribute super."HueAPI"; + "HulkImport" = dontDistribute super."HulkImport"; "Hungarian-Munkres" = dontDistribute super."Hungarian-Munkres"; "IDynamic" = dontDistribute super."IDynamic"; "IFS" = dontDistribute super."IFS"; @@ -1151,6 +1153,7 @@ self: super: { "afis" = dontDistribute super."afis"; "afv" = dontDistribute super."afv"; "agda-server" = dontDistribute super."agda-server"; + "agda-snippets" = dontDistribute super."agda-snippets"; "agentx" = dontDistribute super."agentx"; "agum" = dontDistribute super."agum"; "aig" = dontDistribute super."aig"; @@ -1966,6 +1969,7 @@ self: super: { "cipher-aes" = doDistribute super."cipher-aes_0_2_10"; "cipher-aes128" = doDistribute super."cipher-aes128_0_6_4"; "cipher-rc5" = dontDistribute super."cipher-rc5"; + "ciphersaber2" = dontDistribute super."ciphersaber2"; "circ" = dontDistribute super."circ"; "cirru-parser" = dontDistribute super."cirru-parser"; "citation-resolve" = dontDistribute super."citation-resolve"; @@ -2420,6 +2424,7 @@ self: super: { "dataflow" = dontDistribute super."dataflow"; "datalog" = dontDistribute super."datalog"; "datapacker" = dontDistribute super."datapacker"; + "dataurl" = dontDistribute super."dataurl"; "date-cache" = dontDistribute super."date-cache"; "dates" = dontDistribute super."dates"; "datetime" = dontDistribute super."datetime"; @@ -2829,6 +2834,7 @@ self: super: { "eros-client" = dontDistribute super."eros-client"; "eros-http" = dontDistribute super."eros-http"; "errno" = dontDistribute super."errno"; + "error-analyze" = dontDistribute super."error-analyze"; "error-continuations" = dontDistribute super."error-continuations"; "error-list" = dontDistribute super."error-list"; "error-loc" = dontDistribute super."error-loc"; @@ -2882,6 +2888,7 @@ self: super: { "exinst-deepseq" = dontDistribute super."exinst-deepseq"; "exinst-hashable" = dontDistribute super."exinst-hashable"; "exists" = dontDistribute super."exists"; + "exit-codes" = dontDistribute super."exit-codes"; "exp-pairs" = dontDistribute super."exp-pairs"; "expand" = dontDistribute super."expand"; "expat-enumerator" = dontDistribute super."expat-enumerator"; @@ -3003,6 +3010,7 @@ self: super: { "fingertree-psqueue" = dontDistribute super."fingertree-psqueue"; "fingertree-tf" = dontDistribute super."fingertree-tf"; "finite-field" = dontDistribute super."finite-field"; + "finite-typelits" = dontDistribute super."finite-typelits"; "first-and-last" = dontDistribute super."first-and-last"; "first-class-patterns" = dontDistribute super."first-class-patterns"; "firstify" = dontDistribute super."firstify"; @@ -3288,6 +3296,20 @@ self: super: { "ghclive" = dontDistribute super."ghclive"; "ghczdecode" = dontDistribute super."ghczdecode"; "ght" = dontDistribute super."ght"; + "gi-atk" = dontDistribute super."gi-atk"; + "gi-cairo" = dontDistribute super."gi-cairo"; + "gi-gdk" = dontDistribute super."gi-gdk"; + "gi-gdkpixbuf" = dontDistribute super."gi-gdkpixbuf"; + "gi-gio" = dontDistribute super."gi-gio"; + "gi-glib" = dontDistribute super."gi-glib"; + "gi-gobject" = dontDistribute super."gi-gobject"; + "gi-gtk" = dontDistribute super."gi-gtk"; + "gi-javascriptcore" = dontDistribute super."gi-javascriptcore"; + "gi-notify" = dontDistribute super."gi-notify"; + "gi-pango" = dontDistribute super."gi-pango"; + "gi-soup" = dontDistribute super."gi-soup"; + "gi-vte" = dontDistribute super."gi-vte"; + "gi-webkit" = dontDistribute super."gi-webkit"; "gimlh" = dontDistribute super."gimlh"; "ginger" = dontDistribute super."ginger"; "ginsu" = dontDistribute super."ginsu"; @@ -3300,6 +3322,7 @@ self: super: { "git-date" = dontDistribute super."git-date"; "git-freq" = dontDistribute super."git-freq"; "git-gpush" = dontDistribute super."git-gpush"; + "git-jump" = dontDistribute super."git-jump"; "git-monitor" = dontDistribute super."git-monitor"; "git-object" = dontDistribute super."git-object"; "git-repair" = dontDistribute super."git-repair"; @@ -3779,6 +3802,8 @@ self: super: { "haskell-formatter" = dontDistribute super."haskell-formatter"; "haskell-ftp" = dontDistribute super."haskell-ftp"; "haskell-generate" = dontDistribute super."haskell-generate"; + "haskell-gi" = dontDistribute super."haskell-gi"; + "haskell-gi-base" = dontDistribute super."haskell-gi-base"; "haskell-import-graph" = dontDistribute super."haskell-import-graph"; "haskell-in-space" = dontDistribute super."haskell-in-space"; "haskell-modbus" = dontDistribute super."haskell-modbus"; @@ -3980,6 +4005,7 @@ self: super: { "hfann" = dontDistribute super."hfann"; "hfd" = dontDistribute super."hfd"; "hfiar" = dontDistribute super."hfiar"; + "hfmt" = dontDistribute super."hfmt"; "hfoil" = dontDistribute super."hfoil"; "hfov" = dontDistribute super."hfov"; "hfractal" = dontDistribute super."hfractal"; @@ -4396,6 +4422,7 @@ self: super: { "hsx2hs" = dontDistribute super."hsx2hs"; "hsyscall" = dontDistribute super."hsyscall"; "hszephyr" = dontDistribute super."hszephyr"; + "htaglib" = dontDistribute super."htaglib"; "htags" = dontDistribute super."htags"; "htar" = dontDistribute super."htar"; "htiled" = dontDistribute super."htiled"; @@ -4827,6 +4854,7 @@ self: super: { "keera-hails-reactive-polling" = dontDistribute super."keera-hails-reactive-polling"; "keera-hails-reactive-wx" = dontDistribute super."keera-hails-reactive-wx"; "keera-hails-reactive-yampa" = dontDistribute super."keera-hails-reactive-yampa"; + "keera-hails-reactivelenses" = dontDistribute super."keera-hails-reactivelenses"; "keera-hails-reactivevalues" = dontDistribute super."keera-hails-reactivevalues"; "keera-posture" = dontDistribute super."keera-posture"; "keiretsu" = dontDistribute super."keiretsu"; @@ -4949,6 +4977,8 @@ self: super: { "lat" = dontDistribute super."lat"; "latest-npm-version" = dontDistribute super."latest-npm-version"; "latex" = dontDistribute super."latex"; + "latex-formulae-image" = dontDistribute super."latex-formulae-image"; + "latex-formulae-pandoc" = dontDistribute super."latex-formulae-pandoc"; "lattices" = doDistribute super."lattices_1_2_1_1"; "launchpad-control" = dontDistribute super."launchpad-control"; "lax" = dontDistribute super."lax"; @@ -5316,6 +5346,7 @@ self: super: { "memexml" = dontDistribute super."memexml"; "memo-ptr" = dontDistribute super."memo-ptr"; "memo-sqlite" = dontDistribute super."memo-sqlite"; + "memoization-utils" = dontDistribute super."memoization-utils"; "memoize" = dontDistribute super."memoize"; "memory" = dontDistribute super."memory"; "memscript" = dontDistribute super."memscript"; @@ -5745,6 +5776,7 @@ self: super: { "nthable" = dontDistribute super."nthable"; "ntp-control" = dontDistribute super."ntp-control"; "null-canvas" = dontDistribute super."null-canvas"; + "nullary" = dontDistribute super."nullary"; "number" = dontDistribute super."number"; "numbering" = dontDistribute super."numbering"; "numerals" = dontDistribute super."numerals"; @@ -5970,6 +6002,7 @@ self: super: { "pcg-random" = dontDistribute super."pcg-random"; "pcre-heavy" = doDistribute super."pcre-heavy_0_2_2"; "pcre-less" = dontDistribute super."pcre-less"; + "pcre-light" = doDistribute super."pcre-light_0_4_0_3"; "pcre-light-extra" = dontDistribute super."pcre-light-extra"; "pcre-utils" = dontDistribute super."pcre-utils"; "pdf-toolbox-content" = dontDistribute super."pdf-toolbox-content"; @@ -6344,6 +6377,7 @@ self: super: { "qc-oi-testgenerator" = dontDistribute super."qc-oi-testgenerator"; "qd" = dontDistribute super."qd"; "qd-vec" = dontDistribute super."qd-vec"; + "qed" = dontDistribute super."qed"; "qhull-simple" = dontDistribute super."qhull-simple"; "qrcode" = dontDistribute super."qrcode"; "qt" = dontDistribute super."qt"; @@ -6359,6 +6393,7 @@ self: super: { "queue" = dontDistribute super."queue"; "queuelike" = dontDistribute super."queuelike"; "quick-generator" = dontDistribute super."quick-generator"; + "quick-schema" = dontDistribute super."quick-schema"; "quickcheck-io" = doDistribute super."quickcheck-io_0_1_1"; "quickcheck-poly" = dontDistribute super."quickcheck-poly"; "quickcheck-properties" = dontDistribute super."quickcheck-properties"; @@ -6854,6 +6889,7 @@ self: super: { "servant" = doDistribute super."servant_0_2_2"; "servant-JuicyPixels" = dontDistribute super."servant-JuicyPixels"; "servant-blaze" = dontDistribute super."servant-blaze"; + "servant-cassava" = dontDistribute super."servant-cassava"; "servant-client" = doDistribute super."servant-client_0_2_2"; "servant-docs" = doDistribute super."servant-docs_0_3_1"; "servant-ede" = dontDistribute super."servant-ede"; @@ -6867,6 +6903,7 @@ self: super: { "servant-response" = dontDistribute super."servant-response"; "servant-scotty" = dontDistribute super."servant-scotty"; "servant-server" = doDistribute super."servant-server_0_2_4"; + "servant-swagger" = dontDistribute super."servant-swagger"; "servant-yaml" = dontDistribute super."servant-yaml"; "serversession" = dontDistribute super."serversession"; "serversession-backend-acid-state" = dontDistribute super."serversession-backend-acid-state"; @@ -8039,6 +8076,7 @@ self: super: { "verdict" = dontDistribute super."verdict"; "verdict-json" = dontDistribute super."verdict-json"; "verilog" = dontDistribute super."verilog"; + "versions" = dontDistribute super."versions"; "vhdl" = dontDistribute super."vhdl"; "views" = dontDistribute super."views"; "vigilance" = dontDistribute super."vigilance"; @@ -8484,6 +8522,7 @@ self: super: { "zendesk-api" = dontDistribute super."zendesk-api"; "zeno" = dontDistribute super."zeno"; "zero" = dontDistribute super."zero"; + "zerobin" = dontDistribute super."zerobin"; "zeromq-haskell" = dontDistribute super."zeromq-haskell"; "zeromq3-conduit" = dontDistribute super."zeromq3-conduit"; "zeromq3-haskell" = dontDistribute super."zeromq3-haskell"; diff --git a/pkgs/development/haskell-modules/configuration-lts-2.10.nix b/pkgs/development/haskell-modules/configuration-lts-2.10.nix index 0a0184518ec8..ca53aa1a0443 100644 --- a/pkgs/development/haskell-modules/configuration-lts-2.10.nix +++ b/pkgs/development/haskell-modules/configuration-lts-2.10.nix @@ -506,6 +506,7 @@ self: super: { "HasGP" = dontDistribute super."HasGP"; "Haschoo" = dontDistribute super."Haschoo"; "Hashell" = dontDistribute super."Hashell"; + "HaskRel" = dontDistribute super."HaskRel"; "HaskellForMaths" = dontDistribute super."HaskellForMaths"; "HaskellLM" = dontDistribute super."HaskellLM"; "HaskellNN" = dontDistribute super."HaskellNN"; @@ -551,6 +552,7 @@ self: super: { "Hsed" = dontDistribute super."Hsed"; "Hsmtlib" = dontDistribute super."Hsmtlib"; "HueAPI" = dontDistribute super."HueAPI"; + "HulkImport" = dontDistribute super."HulkImport"; "Hungarian-Munkres" = dontDistribute super."Hungarian-Munkres"; "IDynamic" = dontDistribute super."IDynamic"; "IFS" = dontDistribute super."IFS"; @@ -1146,6 +1148,7 @@ self: super: { "afis" = dontDistribute super."afis"; "afv" = dontDistribute super."afv"; "agda-server" = dontDistribute super."agda-server"; + "agda-snippets" = dontDistribute super."agda-snippets"; "agentx" = dontDistribute super."agentx"; "agum" = dontDistribute super."agum"; "aig" = dontDistribute super."aig"; @@ -1954,6 +1957,7 @@ self: super: { "cipher-aes" = doDistribute super."cipher-aes_0_2_10"; "cipher-aes128" = doDistribute super."cipher-aes128_0_6_4"; "cipher-rc5" = dontDistribute super."cipher-rc5"; + "ciphersaber2" = dontDistribute super."ciphersaber2"; "circ" = dontDistribute super."circ"; "cirru-parser" = dontDistribute super."cirru-parser"; "citation-resolve" = dontDistribute super."citation-resolve"; @@ -2405,6 +2409,7 @@ self: super: { "dataflow" = dontDistribute super."dataflow"; "datalog" = dontDistribute super."datalog"; "datapacker" = dontDistribute super."datapacker"; + "dataurl" = dontDistribute super."dataurl"; "date-cache" = dontDistribute super."date-cache"; "dates" = dontDistribute super."dates"; "datetime" = dontDistribute super."datetime"; @@ -2812,6 +2817,7 @@ self: super: { "eros-client" = dontDistribute super."eros-client"; "eros-http" = dontDistribute super."eros-http"; "errno" = dontDistribute super."errno"; + "error-analyze" = dontDistribute super."error-analyze"; "error-continuations" = dontDistribute super."error-continuations"; "error-list" = dontDistribute super."error-list"; "error-loc" = dontDistribute super."error-loc"; @@ -2865,6 +2871,7 @@ self: super: { "exinst-deepseq" = dontDistribute super."exinst-deepseq"; "exinst-hashable" = dontDistribute super."exinst-hashable"; "exists" = dontDistribute super."exists"; + "exit-codes" = dontDistribute super."exit-codes"; "exp-pairs" = dontDistribute super."exp-pairs"; "expand" = dontDistribute super."expand"; "expat-enumerator" = dontDistribute super."expat-enumerator"; @@ -2985,6 +2992,7 @@ self: super: { "fingertree-psqueue" = dontDistribute super."fingertree-psqueue"; "fingertree-tf" = dontDistribute super."fingertree-tf"; "finite-field" = dontDistribute super."finite-field"; + "finite-typelits" = dontDistribute super."finite-typelits"; "first-and-last" = dontDistribute super."first-and-last"; "first-class-patterns" = dontDistribute super."first-class-patterns"; "firstify" = dontDistribute super."firstify"; @@ -3269,6 +3277,20 @@ self: super: { "ghclive" = dontDistribute super."ghclive"; "ghczdecode" = dontDistribute super."ghczdecode"; "ght" = dontDistribute super."ght"; + "gi-atk" = dontDistribute super."gi-atk"; + "gi-cairo" = dontDistribute super."gi-cairo"; + "gi-gdk" = dontDistribute super."gi-gdk"; + "gi-gdkpixbuf" = dontDistribute super."gi-gdkpixbuf"; + "gi-gio" = dontDistribute super."gi-gio"; + "gi-glib" = dontDistribute super."gi-glib"; + "gi-gobject" = dontDistribute super."gi-gobject"; + "gi-gtk" = dontDistribute super."gi-gtk"; + "gi-javascriptcore" = dontDistribute super."gi-javascriptcore"; + "gi-notify" = dontDistribute super."gi-notify"; + "gi-pango" = dontDistribute super."gi-pango"; + "gi-soup" = dontDistribute super."gi-soup"; + "gi-vte" = dontDistribute super."gi-vte"; + "gi-webkit" = dontDistribute super."gi-webkit"; "gimlh" = dontDistribute super."gimlh"; "ginger" = dontDistribute super."ginger"; "ginsu" = dontDistribute super."ginsu"; @@ -3280,6 +3302,7 @@ self: super: { "git-date" = dontDistribute super."git-date"; "git-freq" = dontDistribute super."git-freq"; "git-gpush" = dontDistribute super."git-gpush"; + "git-jump" = dontDistribute super."git-jump"; "git-monitor" = dontDistribute super."git-monitor"; "git-object" = dontDistribute super."git-object"; "git-repair" = dontDistribute super."git-repair"; @@ -3756,6 +3779,8 @@ self: super: { "haskell-formatter" = dontDistribute super."haskell-formatter"; "haskell-ftp" = dontDistribute super."haskell-ftp"; "haskell-generate" = dontDistribute super."haskell-generate"; + "haskell-gi" = dontDistribute super."haskell-gi"; + "haskell-gi-base" = dontDistribute super."haskell-gi-base"; "haskell-import-graph" = dontDistribute super."haskell-import-graph"; "haskell-in-space" = dontDistribute super."haskell-in-space"; "haskell-modbus" = dontDistribute super."haskell-modbus"; @@ -3957,6 +3982,7 @@ self: super: { "hfann" = dontDistribute super."hfann"; "hfd" = dontDistribute super."hfd"; "hfiar" = dontDistribute super."hfiar"; + "hfmt" = dontDistribute super."hfmt"; "hfoil" = dontDistribute super."hfoil"; "hfov" = dontDistribute super."hfov"; "hfractal" = dontDistribute super."hfractal"; @@ -4371,6 +4397,7 @@ self: super: { "hsx2hs" = dontDistribute super."hsx2hs"; "hsyscall" = dontDistribute super."hsyscall"; "hszephyr" = dontDistribute super."hszephyr"; + "htaglib" = dontDistribute super."htaglib"; "htags" = dontDistribute super."htags"; "htar" = dontDistribute super."htar"; "htiled" = dontDistribute super."htiled"; @@ -4795,6 +4822,7 @@ self: super: { "keera-hails-reactive-polling" = dontDistribute super."keera-hails-reactive-polling"; "keera-hails-reactive-wx" = dontDistribute super."keera-hails-reactive-wx"; "keera-hails-reactive-yampa" = dontDistribute super."keera-hails-reactive-yampa"; + "keera-hails-reactivelenses" = dontDistribute super."keera-hails-reactivelenses"; "keera-hails-reactivevalues" = dontDistribute super."keera-hails-reactivevalues"; "keera-posture" = dontDistribute super."keera-posture"; "keiretsu" = dontDistribute super."keiretsu"; @@ -4916,6 +4944,8 @@ self: super: { "lat" = dontDistribute super."lat"; "latest-npm-version" = dontDistribute super."latest-npm-version"; "latex" = dontDistribute super."latex"; + "latex-formulae-image" = dontDistribute super."latex-formulae-image"; + "latex-formulae-pandoc" = dontDistribute super."latex-formulae-pandoc"; "lattices" = doDistribute super."lattices_1_2_1_1"; "launchpad-control" = dontDistribute super."launchpad-control"; "lax" = dontDistribute super."lax"; @@ -5275,6 +5305,7 @@ self: super: { "memexml" = dontDistribute super."memexml"; "memo-ptr" = dontDistribute super."memo-ptr"; "memo-sqlite" = dontDistribute super."memo-sqlite"; + "memoization-utils" = dontDistribute super."memoization-utils"; "memoize" = dontDistribute super."memoize"; "memory" = dontDistribute super."memory"; "memscript" = dontDistribute super."memscript"; @@ -5703,6 +5734,7 @@ self: super: { "nthable" = dontDistribute super."nthable"; "ntp-control" = dontDistribute super."ntp-control"; "null-canvas" = dontDistribute super."null-canvas"; + "nullary" = dontDistribute super."nullary"; "number" = dontDistribute super."number"; "numbering" = dontDistribute super."numbering"; "numerals" = dontDistribute super."numerals"; @@ -5926,6 +5958,7 @@ self: super: { "pcg-random" = dontDistribute super."pcg-random"; "pcre-heavy" = doDistribute super."pcre-heavy_0_2_2"; "pcre-less" = dontDistribute super."pcre-less"; + "pcre-light" = doDistribute super."pcre-light_0_4_0_3"; "pcre-light-extra" = dontDistribute super."pcre-light-extra"; "pcre-utils" = dontDistribute super."pcre-utils"; "pdf-toolbox-content" = dontDistribute super."pdf-toolbox-content"; @@ -6296,6 +6329,7 @@ self: super: { "qc-oi-testgenerator" = dontDistribute super."qc-oi-testgenerator"; "qd" = dontDistribute super."qd"; "qd-vec" = dontDistribute super."qd-vec"; + "qed" = dontDistribute super."qed"; "qhull-simple" = dontDistribute super."qhull-simple"; "qrcode" = dontDistribute super."qrcode"; "qt" = dontDistribute super."qt"; @@ -6310,6 +6344,7 @@ self: super: { "queue" = dontDistribute super."queue"; "queuelike" = dontDistribute super."queuelike"; "quick-generator" = dontDistribute super."quick-generator"; + "quick-schema" = dontDistribute super."quick-schema"; "quickcheck-io" = doDistribute super."quickcheck-io_0_1_1"; "quickcheck-poly" = dontDistribute super."quickcheck-poly"; "quickcheck-properties" = dontDistribute super."quickcheck-properties"; @@ -6802,6 +6837,7 @@ self: super: { "servant" = doDistribute super."servant_0_2_2"; "servant-JuicyPixels" = dontDistribute super."servant-JuicyPixels"; "servant-blaze" = dontDistribute super."servant-blaze"; + "servant-cassava" = dontDistribute super."servant-cassava"; "servant-client" = doDistribute super."servant-client_0_2_2"; "servant-docs" = doDistribute super."servant-docs_0_3_1"; "servant-ede" = dontDistribute super."servant-ede"; @@ -6815,6 +6851,7 @@ self: super: { "servant-response" = dontDistribute super."servant-response"; "servant-scotty" = dontDistribute super."servant-scotty"; "servant-server" = doDistribute super."servant-server_0_2_4"; + "servant-swagger" = dontDistribute super."servant-swagger"; "servant-yaml" = dontDistribute super."servant-yaml"; "serversession" = dontDistribute super."serversession"; "serversession-backend-acid-state" = dontDistribute super."serversession-backend-acid-state"; @@ -7975,6 +8012,7 @@ self: super: { "verdict" = dontDistribute super."verdict"; "verdict-json" = dontDistribute super."verdict-json"; "verilog" = dontDistribute super."verilog"; + "versions" = dontDistribute super."versions"; "vhdl" = dontDistribute super."vhdl"; "views" = dontDistribute super."views"; "vigilance" = dontDistribute super."vigilance"; @@ -8417,6 +8455,7 @@ self: super: { "zendesk-api" = dontDistribute super."zendesk-api"; "zeno" = dontDistribute super."zeno"; "zero" = dontDistribute super."zero"; + "zerobin" = dontDistribute super."zerobin"; "zeromq-haskell" = dontDistribute super."zeromq-haskell"; "zeromq3-conduit" = dontDistribute super."zeromq3-conduit"; "zeromq3-haskell" = dontDistribute super."zeromq3-haskell"; diff --git a/pkgs/development/haskell-modules/configuration-lts-2.11.nix b/pkgs/development/haskell-modules/configuration-lts-2.11.nix index 22949587eee1..85c14420c900 100644 --- a/pkgs/development/haskell-modules/configuration-lts-2.11.nix +++ b/pkgs/development/haskell-modules/configuration-lts-2.11.nix @@ -506,6 +506,7 @@ self: super: { "HasGP" = dontDistribute super."HasGP"; "Haschoo" = dontDistribute super."Haschoo"; "Hashell" = dontDistribute super."Hashell"; + "HaskRel" = dontDistribute super."HaskRel"; "HaskellForMaths" = dontDistribute super."HaskellForMaths"; "HaskellLM" = dontDistribute super."HaskellLM"; "HaskellNN" = dontDistribute super."HaskellNN"; @@ -551,6 +552,7 @@ self: super: { "Hsed" = dontDistribute super."Hsed"; "Hsmtlib" = dontDistribute super."Hsmtlib"; "HueAPI" = dontDistribute super."HueAPI"; + "HulkImport" = dontDistribute super."HulkImport"; "Hungarian-Munkres" = dontDistribute super."Hungarian-Munkres"; "IDynamic" = dontDistribute super."IDynamic"; "IFS" = dontDistribute super."IFS"; @@ -1145,6 +1147,7 @@ self: super: { "afis" = dontDistribute super."afis"; "afv" = dontDistribute super."afv"; "agda-server" = dontDistribute super."agda-server"; + "agda-snippets" = dontDistribute super."agda-snippets"; "agentx" = dontDistribute super."agentx"; "agum" = dontDistribute super."agum"; "aig" = dontDistribute super."aig"; @@ -1953,6 +1956,7 @@ self: super: { "cipher-aes" = doDistribute super."cipher-aes_0_2_10"; "cipher-aes128" = doDistribute super."cipher-aes128_0_6_4"; "cipher-rc5" = dontDistribute super."cipher-rc5"; + "ciphersaber2" = dontDistribute super."ciphersaber2"; "circ" = dontDistribute super."circ"; "cirru-parser" = dontDistribute super."cirru-parser"; "citation-resolve" = dontDistribute super."citation-resolve"; @@ -2404,6 +2408,7 @@ self: super: { "dataflow" = dontDistribute super."dataflow"; "datalog" = dontDistribute super."datalog"; "datapacker" = dontDistribute super."datapacker"; + "dataurl" = dontDistribute super."dataurl"; "date-cache" = dontDistribute super."date-cache"; "dates" = dontDistribute super."dates"; "datetime" = dontDistribute super."datetime"; @@ -2811,6 +2816,7 @@ self: super: { "eros-client" = dontDistribute super."eros-client"; "eros-http" = dontDistribute super."eros-http"; "errno" = dontDistribute super."errno"; + "error-analyze" = dontDistribute super."error-analyze"; "error-continuations" = dontDistribute super."error-continuations"; "error-list" = dontDistribute super."error-list"; "error-loc" = dontDistribute super."error-loc"; @@ -2864,6 +2870,7 @@ self: super: { "exinst-deepseq" = dontDistribute super."exinst-deepseq"; "exinst-hashable" = dontDistribute super."exinst-hashable"; "exists" = dontDistribute super."exists"; + "exit-codes" = dontDistribute super."exit-codes"; "exp-pairs" = dontDistribute super."exp-pairs"; "expand" = dontDistribute super."expand"; "expat-enumerator" = dontDistribute super."expat-enumerator"; @@ -2984,6 +2991,7 @@ self: super: { "fingertree-psqueue" = dontDistribute super."fingertree-psqueue"; "fingertree-tf" = dontDistribute super."fingertree-tf"; "finite-field" = dontDistribute super."finite-field"; + "finite-typelits" = dontDistribute super."finite-typelits"; "first-and-last" = dontDistribute super."first-and-last"; "first-class-patterns" = dontDistribute super."first-class-patterns"; "firstify" = dontDistribute super."firstify"; @@ -3267,6 +3275,20 @@ self: super: { "ghclive" = dontDistribute super."ghclive"; "ghczdecode" = dontDistribute super."ghczdecode"; "ght" = dontDistribute super."ght"; + "gi-atk" = dontDistribute super."gi-atk"; + "gi-cairo" = dontDistribute super."gi-cairo"; + "gi-gdk" = dontDistribute super."gi-gdk"; + "gi-gdkpixbuf" = dontDistribute super."gi-gdkpixbuf"; + "gi-gio" = dontDistribute super."gi-gio"; + "gi-glib" = dontDistribute super."gi-glib"; + "gi-gobject" = dontDistribute super."gi-gobject"; + "gi-gtk" = dontDistribute super."gi-gtk"; + "gi-javascriptcore" = dontDistribute super."gi-javascriptcore"; + "gi-notify" = dontDistribute super."gi-notify"; + "gi-pango" = dontDistribute super."gi-pango"; + "gi-soup" = dontDistribute super."gi-soup"; + "gi-vte" = dontDistribute super."gi-vte"; + "gi-webkit" = dontDistribute super."gi-webkit"; "gimlh" = dontDistribute super."gimlh"; "ginger" = dontDistribute super."ginger"; "ginsu" = dontDistribute super."ginsu"; @@ -3278,6 +3300,7 @@ self: super: { "git-date" = dontDistribute super."git-date"; "git-freq" = dontDistribute super."git-freq"; "git-gpush" = dontDistribute super."git-gpush"; + "git-jump" = dontDistribute super."git-jump"; "git-monitor" = dontDistribute super."git-monitor"; "git-object" = dontDistribute super."git-object"; "git-repair" = dontDistribute super."git-repair"; @@ -3754,6 +3777,8 @@ self: super: { "haskell-formatter" = dontDistribute super."haskell-formatter"; "haskell-ftp" = dontDistribute super."haskell-ftp"; "haskell-generate" = dontDistribute super."haskell-generate"; + "haskell-gi" = dontDistribute super."haskell-gi"; + "haskell-gi-base" = dontDistribute super."haskell-gi-base"; "haskell-import-graph" = dontDistribute super."haskell-import-graph"; "haskell-in-space" = dontDistribute super."haskell-in-space"; "haskell-modbus" = dontDistribute super."haskell-modbus"; @@ -3954,6 +3979,7 @@ self: super: { "hfann" = dontDistribute super."hfann"; "hfd" = dontDistribute super."hfd"; "hfiar" = dontDistribute super."hfiar"; + "hfmt" = dontDistribute super."hfmt"; "hfoil" = dontDistribute super."hfoil"; "hfov" = dontDistribute super."hfov"; "hfractal" = dontDistribute super."hfractal"; @@ -4367,6 +4393,7 @@ self: super: { "hsx2hs" = dontDistribute super."hsx2hs"; "hsyscall" = dontDistribute super."hsyscall"; "hszephyr" = dontDistribute super."hszephyr"; + "htaglib" = dontDistribute super."htaglib"; "htags" = dontDistribute super."htags"; "htar" = dontDistribute super."htar"; "htiled" = dontDistribute super."htiled"; @@ -4790,6 +4817,7 @@ self: super: { "keera-hails-reactive-polling" = dontDistribute super."keera-hails-reactive-polling"; "keera-hails-reactive-wx" = dontDistribute super."keera-hails-reactive-wx"; "keera-hails-reactive-yampa" = dontDistribute super."keera-hails-reactive-yampa"; + "keera-hails-reactivelenses" = dontDistribute super."keera-hails-reactivelenses"; "keera-hails-reactivevalues" = dontDistribute super."keera-hails-reactivevalues"; "keera-posture" = dontDistribute super."keera-posture"; "keiretsu" = dontDistribute super."keiretsu"; @@ -4911,6 +4939,8 @@ self: super: { "lat" = dontDistribute super."lat"; "latest-npm-version" = dontDistribute super."latest-npm-version"; "latex" = dontDistribute super."latex"; + "latex-formulae-image" = dontDistribute super."latex-formulae-image"; + "latex-formulae-pandoc" = dontDistribute super."latex-formulae-pandoc"; "lattices" = doDistribute super."lattices_1_2_1_1"; "launchpad-control" = dontDistribute super."launchpad-control"; "lax" = dontDistribute super."lax"; @@ -5270,6 +5300,7 @@ self: super: { "memexml" = dontDistribute super."memexml"; "memo-ptr" = dontDistribute super."memo-ptr"; "memo-sqlite" = dontDistribute super."memo-sqlite"; + "memoization-utils" = dontDistribute super."memoization-utils"; "memoize" = dontDistribute super."memoize"; "memory" = doDistribute super."memory_0_6"; "memscript" = dontDistribute super."memscript"; @@ -5697,6 +5728,7 @@ self: super: { "nthable" = dontDistribute super."nthable"; "ntp-control" = dontDistribute super."ntp-control"; "null-canvas" = dontDistribute super."null-canvas"; + "nullary" = dontDistribute super."nullary"; "number" = dontDistribute super."number"; "numbering" = dontDistribute super."numbering"; "numerals" = dontDistribute super."numerals"; @@ -5919,6 +5951,7 @@ self: super: { "pcg-random" = dontDistribute super."pcg-random"; "pcre-heavy" = doDistribute super."pcre-heavy_0_2_2"; "pcre-less" = dontDistribute super."pcre-less"; + "pcre-light" = doDistribute super."pcre-light_0_4_0_3"; "pcre-light-extra" = dontDistribute super."pcre-light-extra"; "pcre-utils" = dontDistribute super."pcre-utils"; "pdf-toolbox-content" = dontDistribute super."pdf-toolbox-content"; @@ -6289,6 +6322,7 @@ self: super: { "qc-oi-testgenerator" = dontDistribute super."qc-oi-testgenerator"; "qd" = dontDistribute super."qd"; "qd-vec" = dontDistribute super."qd-vec"; + "qed" = dontDistribute super."qed"; "qhull-simple" = dontDistribute super."qhull-simple"; "qrcode" = dontDistribute super."qrcode"; "qt" = dontDistribute super."qt"; @@ -6303,6 +6337,7 @@ self: super: { "queue" = dontDistribute super."queue"; "queuelike" = dontDistribute super."queuelike"; "quick-generator" = dontDistribute super."quick-generator"; + "quick-schema" = dontDistribute super."quick-schema"; "quickcheck-io" = doDistribute super."quickcheck-io_0_1_1"; "quickcheck-poly" = dontDistribute super."quickcheck-poly"; "quickcheck-properties" = dontDistribute super."quickcheck-properties"; @@ -6794,6 +6829,7 @@ self: super: { "servant" = doDistribute super."servant_0_2_2"; "servant-JuicyPixels" = dontDistribute super."servant-JuicyPixels"; "servant-blaze" = dontDistribute super."servant-blaze"; + "servant-cassava" = dontDistribute super."servant-cassava"; "servant-client" = doDistribute super."servant-client_0_2_2"; "servant-docs" = doDistribute super."servant-docs_0_3_1"; "servant-ede" = dontDistribute super."servant-ede"; @@ -6807,6 +6843,7 @@ self: super: { "servant-response" = dontDistribute super."servant-response"; "servant-scotty" = dontDistribute super."servant-scotty"; "servant-server" = doDistribute super."servant-server_0_2_4"; + "servant-swagger" = dontDistribute super."servant-swagger"; "servant-yaml" = dontDistribute super."servant-yaml"; "serversession" = dontDistribute super."serversession"; "serversession-backend-acid-state" = dontDistribute super."serversession-backend-acid-state"; @@ -7431,6 +7468,7 @@ self: super: { "tensor" = dontDistribute super."tensor"; "term-rewriting" = dontDistribute super."term-rewriting"; "termbox-bindings" = dontDistribute super."termbox-bindings"; + "terminal-size" = doDistribute super."terminal-size_0_3_2"; "termination-combinators" = dontDistribute super."termination-combinators"; "terminfo-hs" = dontDistribute super."terminfo-hs"; "terrahs" = dontDistribute super."terrahs"; @@ -7964,6 +8002,7 @@ self: super: { "verdict" = dontDistribute super."verdict"; "verdict-json" = dontDistribute super."verdict-json"; "verilog" = dontDistribute super."verilog"; + "versions" = dontDistribute super."versions"; "vhdl" = dontDistribute super."vhdl"; "views" = dontDistribute super."views"; "vigilance" = dontDistribute super."vigilance"; @@ -8406,6 +8445,7 @@ self: super: { "zendesk-api" = dontDistribute super."zendesk-api"; "zeno" = dontDistribute super."zeno"; "zero" = dontDistribute super."zero"; + "zerobin" = dontDistribute super."zerobin"; "zeromq-haskell" = dontDistribute super."zeromq-haskell"; "zeromq3-conduit" = dontDistribute super."zeromq3-conduit"; "zeromq3-haskell" = dontDistribute super."zeromq3-haskell"; diff --git a/pkgs/development/haskell-modules/configuration-lts-2.12.nix b/pkgs/development/haskell-modules/configuration-lts-2.12.nix index 9bca7c5ea0f7..720c897bdf4e 100644 --- a/pkgs/development/haskell-modules/configuration-lts-2.12.nix +++ b/pkgs/development/haskell-modules/configuration-lts-2.12.nix @@ -506,6 +506,7 @@ self: super: { "HasGP" = dontDistribute super."HasGP"; "Haschoo" = dontDistribute super."Haschoo"; "Hashell" = dontDistribute super."Hashell"; + "HaskRel" = dontDistribute super."HaskRel"; "HaskellForMaths" = dontDistribute super."HaskellForMaths"; "HaskellLM" = dontDistribute super."HaskellLM"; "HaskellNN" = dontDistribute super."HaskellNN"; @@ -551,6 +552,7 @@ self: super: { "Hsed" = dontDistribute super."Hsed"; "Hsmtlib" = dontDistribute super."Hsmtlib"; "HueAPI" = dontDistribute super."HueAPI"; + "HulkImport" = dontDistribute super."HulkImport"; "Hungarian-Munkres" = dontDistribute super."Hungarian-Munkres"; "IDynamic" = dontDistribute super."IDynamic"; "IFS" = dontDistribute super."IFS"; @@ -1145,6 +1147,7 @@ self: super: { "afis" = dontDistribute super."afis"; "afv" = dontDistribute super."afv"; "agda-server" = dontDistribute super."agda-server"; + "agda-snippets" = dontDistribute super."agda-snippets"; "agentx" = dontDistribute super."agentx"; "agum" = dontDistribute super."agum"; "aig" = dontDistribute super."aig"; @@ -1953,6 +1956,7 @@ self: super: { "cipher-aes" = doDistribute super."cipher-aes_0_2_10"; "cipher-aes128" = doDistribute super."cipher-aes128_0_6_4"; "cipher-rc5" = dontDistribute super."cipher-rc5"; + "ciphersaber2" = dontDistribute super."ciphersaber2"; "circ" = dontDistribute super."circ"; "cirru-parser" = dontDistribute super."cirru-parser"; "citation-resolve" = dontDistribute super."citation-resolve"; @@ -2404,6 +2408,7 @@ self: super: { "dataflow" = dontDistribute super."dataflow"; "datalog" = dontDistribute super."datalog"; "datapacker" = dontDistribute super."datapacker"; + "dataurl" = dontDistribute super."dataurl"; "date-cache" = dontDistribute super."date-cache"; "dates" = dontDistribute super."dates"; "datetime" = dontDistribute super."datetime"; @@ -2811,6 +2816,7 @@ self: super: { "eros-client" = dontDistribute super."eros-client"; "eros-http" = dontDistribute super."eros-http"; "errno" = dontDistribute super."errno"; + "error-analyze" = dontDistribute super."error-analyze"; "error-continuations" = dontDistribute super."error-continuations"; "error-list" = dontDistribute super."error-list"; "error-loc" = dontDistribute super."error-loc"; @@ -2864,6 +2870,7 @@ self: super: { "exinst-deepseq" = dontDistribute super."exinst-deepseq"; "exinst-hashable" = dontDistribute super."exinst-hashable"; "exists" = dontDistribute super."exists"; + "exit-codes" = dontDistribute super."exit-codes"; "exp-pairs" = dontDistribute super."exp-pairs"; "expand" = dontDistribute super."expand"; "expat-enumerator" = dontDistribute super."expat-enumerator"; @@ -2984,6 +2991,7 @@ self: super: { "fingertree-psqueue" = dontDistribute super."fingertree-psqueue"; "fingertree-tf" = dontDistribute super."fingertree-tf"; "finite-field" = dontDistribute super."finite-field"; + "finite-typelits" = dontDistribute super."finite-typelits"; "first-and-last" = dontDistribute super."first-and-last"; "first-class-patterns" = dontDistribute super."first-class-patterns"; "firstify" = dontDistribute super."firstify"; @@ -3267,6 +3275,20 @@ self: super: { "ghclive" = dontDistribute super."ghclive"; "ghczdecode" = dontDistribute super."ghczdecode"; "ght" = dontDistribute super."ght"; + "gi-atk" = dontDistribute super."gi-atk"; + "gi-cairo" = dontDistribute super."gi-cairo"; + "gi-gdk" = dontDistribute super."gi-gdk"; + "gi-gdkpixbuf" = dontDistribute super."gi-gdkpixbuf"; + "gi-gio" = dontDistribute super."gi-gio"; + "gi-glib" = dontDistribute super."gi-glib"; + "gi-gobject" = dontDistribute super."gi-gobject"; + "gi-gtk" = dontDistribute super."gi-gtk"; + "gi-javascriptcore" = dontDistribute super."gi-javascriptcore"; + "gi-notify" = dontDistribute super."gi-notify"; + "gi-pango" = dontDistribute super."gi-pango"; + "gi-soup" = dontDistribute super."gi-soup"; + "gi-vte" = dontDistribute super."gi-vte"; + "gi-webkit" = dontDistribute super."gi-webkit"; "gimlh" = dontDistribute super."gimlh"; "ginger" = dontDistribute super."ginger"; "ginsu" = dontDistribute super."ginsu"; @@ -3278,6 +3300,7 @@ self: super: { "git-date" = dontDistribute super."git-date"; "git-freq" = dontDistribute super."git-freq"; "git-gpush" = dontDistribute super."git-gpush"; + "git-jump" = dontDistribute super."git-jump"; "git-monitor" = dontDistribute super."git-monitor"; "git-object" = dontDistribute super."git-object"; "git-repair" = dontDistribute super."git-repair"; @@ -3754,6 +3777,8 @@ self: super: { "haskell-formatter" = dontDistribute super."haskell-formatter"; "haskell-ftp" = dontDistribute super."haskell-ftp"; "haskell-generate" = dontDistribute super."haskell-generate"; + "haskell-gi" = dontDistribute super."haskell-gi"; + "haskell-gi-base" = dontDistribute super."haskell-gi-base"; "haskell-import-graph" = dontDistribute super."haskell-import-graph"; "haskell-in-space" = dontDistribute super."haskell-in-space"; "haskell-modbus" = dontDistribute super."haskell-modbus"; @@ -3954,6 +3979,7 @@ self: super: { "hfann" = dontDistribute super."hfann"; "hfd" = dontDistribute super."hfd"; "hfiar" = dontDistribute super."hfiar"; + "hfmt" = dontDistribute super."hfmt"; "hfoil" = dontDistribute super."hfoil"; "hfov" = dontDistribute super."hfov"; "hfractal" = dontDistribute super."hfractal"; @@ -4367,6 +4393,7 @@ self: super: { "hsx2hs" = dontDistribute super."hsx2hs"; "hsyscall" = dontDistribute super."hsyscall"; "hszephyr" = dontDistribute super."hszephyr"; + "htaglib" = dontDistribute super."htaglib"; "htags" = dontDistribute super."htags"; "htar" = dontDistribute super."htar"; "htiled" = dontDistribute super."htiled"; @@ -4790,6 +4817,7 @@ self: super: { "keera-hails-reactive-polling" = dontDistribute super."keera-hails-reactive-polling"; "keera-hails-reactive-wx" = dontDistribute super."keera-hails-reactive-wx"; "keera-hails-reactive-yampa" = dontDistribute super."keera-hails-reactive-yampa"; + "keera-hails-reactivelenses" = dontDistribute super."keera-hails-reactivelenses"; "keera-hails-reactivevalues" = dontDistribute super."keera-hails-reactivevalues"; "keera-posture" = dontDistribute super."keera-posture"; "keiretsu" = dontDistribute super."keiretsu"; @@ -4911,6 +4939,8 @@ self: super: { "lat" = dontDistribute super."lat"; "latest-npm-version" = dontDistribute super."latest-npm-version"; "latex" = dontDistribute super."latex"; + "latex-formulae-image" = dontDistribute super."latex-formulae-image"; + "latex-formulae-pandoc" = dontDistribute super."latex-formulae-pandoc"; "lattices" = doDistribute super."lattices_1_2_1_1"; "launchpad-control" = dontDistribute super."launchpad-control"; "lax" = dontDistribute super."lax"; @@ -5270,6 +5300,7 @@ self: super: { "memexml" = dontDistribute super."memexml"; "memo-ptr" = dontDistribute super."memo-ptr"; "memo-sqlite" = dontDistribute super."memo-sqlite"; + "memoization-utils" = dontDistribute super."memoization-utils"; "memoize" = dontDistribute super."memoize"; "memory" = doDistribute super."memory_0_7"; "memscript" = dontDistribute super."memscript"; @@ -5697,6 +5728,7 @@ self: super: { "nthable" = dontDistribute super."nthable"; "ntp-control" = dontDistribute super."ntp-control"; "null-canvas" = dontDistribute super."null-canvas"; + "nullary" = dontDistribute super."nullary"; "number" = dontDistribute super."number"; "numbering" = dontDistribute super."numbering"; "numerals" = dontDistribute super."numerals"; @@ -5919,6 +5951,7 @@ self: super: { "pcg-random" = dontDistribute super."pcg-random"; "pcre-heavy" = doDistribute super."pcre-heavy_0_2_2"; "pcre-less" = dontDistribute super."pcre-less"; + "pcre-light" = doDistribute super."pcre-light_0_4_0_3"; "pcre-light-extra" = dontDistribute super."pcre-light-extra"; "pcre-utils" = dontDistribute super."pcre-utils"; "pdf-toolbox-content" = dontDistribute super."pdf-toolbox-content"; @@ -6289,6 +6322,7 @@ self: super: { "qc-oi-testgenerator" = dontDistribute super."qc-oi-testgenerator"; "qd" = dontDistribute super."qd"; "qd-vec" = dontDistribute super."qd-vec"; + "qed" = dontDistribute super."qed"; "qhull-simple" = dontDistribute super."qhull-simple"; "qrcode" = dontDistribute super."qrcode"; "qt" = dontDistribute super."qt"; @@ -6303,6 +6337,7 @@ self: super: { "queue" = dontDistribute super."queue"; "queuelike" = dontDistribute super."queuelike"; "quick-generator" = dontDistribute super."quick-generator"; + "quick-schema" = dontDistribute super."quick-schema"; "quickcheck-io" = doDistribute super."quickcheck-io_0_1_1"; "quickcheck-poly" = dontDistribute super."quickcheck-poly"; "quickcheck-properties" = dontDistribute super."quickcheck-properties"; @@ -6793,6 +6828,7 @@ self: super: { "servant" = doDistribute super."servant_0_2_2"; "servant-JuicyPixels" = dontDistribute super."servant-JuicyPixels"; "servant-blaze" = dontDistribute super."servant-blaze"; + "servant-cassava" = dontDistribute super."servant-cassava"; "servant-client" = doDistribute super."servant-client_0_2_2"; "servant-docs" = doDistribute super."servant-docs_0_3_1"; "servant-ede" = dontDistribute super."servant-ede"; @@ -6806,6 +6842,7 @@ self: super: { "servant-response" = dontDistribute super."servant-response"; "servant-scotty" = dontDistribute super."servant-scotty"; "servant-server" = doDistribute super."servant-server_0_2_4"; + "servant-swagger" = dontDistribute super."servant-swagger"; "servant-yaml" = dontDistribute super."servant-yaml"; "serversession" = dontDistribute super."serversession"; "serversession-backend-acid-state" = dontDistribute super."serversession-backend-acid-state"; @@ -7430,6 +7467,7 @@ self: super: { "tensor" = dontDistribute super."tensor"; "term-rewriting" = dontDistribute super."term-rewriting"; "termbox-bindings" = dontDistribute super."termbox-bindings"; + "terminal-size" = doDistribute super."terminal-size_0_3_2"; "termination-combinators" = dontDistribute super."termination-combinators"; "terminfo-hs" = dontDistribute super."terminfo-hs"; "terrahs" = dontDistribute super."terrahs"; @@ -7963,6 +8001,7 @@ self: super: { "verdict" = dontDistribute super."verdict"; "verdict-json" = dontDistribute super."verdict-json"; "verilog" = dontDistribute super."verilog"; + "versions" = dontDistribute super."versions"; "vhdl" = dontDistribute super."vhdl"; "views" = dontDistribute super."views"; "vigilance" = dontDistribute super."vigilance"; @@ -8405,6 +8444,7 @@ self: super: { "zendesk-api" = dontDistribute super."zendesk-api"; "zeno" = dontDistribute super."zeno"; "zero" = dontDistribute super."zero"; + "zerobin" = dontDistribute super."zerobin"; "zeromq-haskell" = dontDistribute super."zeromq-haskell"; "zeromq3-conduit" = dontDistribute super."zeromq3-conduit"; "zeromq3-haskell" = dontDistribute super."zeromq3-haskell"; diff --git a/pkgs/development/haskell-modules/configuration-lts-2.13.nix b/pkgs/development/haskell-modules/configuration-lts-2.13.nix index 78059258c018..c6aeb5c34ce6 100644 --- a/pkgs/development/haskell-modules/configuration-lts-2.13.nix +++ b/pkgs/development/haskell-modules/configuration-lts-2.13.nix @@ -506,6 +506,7 @@ self: super: { "HasGP" = dontDistribute super."HasGP"; "Haschoo" = dontDistribute super."Haschoo"; "Hashell" = dontDistribute super."Hashell"; + "HaskRel" = dontDistribute super."HaskRel"; "HaskellForMaths" = dontDistribute super."HaskellForMaths"; "HaskellLM" = dontDistribute super."HaskellLM"; "HaskellNN" = dontDistribute super."HaskellNN"; @@ -551,6 +552,7 @@ self: super: { "Hsed" = dontDistribute super."Hsed"; "Hsmtlib" = dontDistribute super."Hsmtlib"; "HueAPI" = dontDistribute super."HueAPI"; + "HulkImport" = dontDistribute super."HulkImport"; "Hungarian-Munkres" = dontDistribute super."Hungarian-Munkres"; "IDynamic" = dontDistribute super."IDynamic"; "IFS" = dontDistribute super."IFS"; @@ -1145,6 +1147,7 @@ self: super: { "afis" = dontDistribute super."afis"; "afv" = dontDistribute super."afv"; "agda-server" = dontDistribute super."agda-server"; + "agda-snippets" = dontDistribute super."agda-snippets"; "agentx" = dontDistribute super."agentx"; "agum" = dontDistribute super."agum"; "aig" = dontDistribute super."aig"; @@ -1953,6 +1956,7 @@ self: super: { "cipher-aes" = doDistribute super."cipher-aes_0_2_10"; "cipher-aes128" = doDistribute super."cipher-aes128_0_6_4"; "cipher-rc5" = dontDistribute super."cipher-rc5"; + "ciphersaber2" = dontDistribute super."ciphersaber2"; "circ" = dontDistribute super."circ"; "cirru-parser" = dontDistribute super."cirru-parser"; "citation-resolve" = dontDistribute super."citation-resolve"; @@ -2404,6 +2408,7 @@ self: super: { "dataflow" = dontDistribute super."dataflow"; "datalog" = dontDistribute super."datalog"; "datapacker" = dontDistribute super."datapacker"; + "dataurl" = dontDistribute super."dataurl"; "date-cache" = dontDistribute super."date-cache"; "dates" = dontDistribute super."dates"; "datetime" = dontDistribute super."datetime"; @@ -2811,6 +2816,7 @@ self: super: { "eros-client" = dontDistribute super."eros-client"; "eros-http" = dontDistribute super."eros-http"; "errno" = dontDistribute super."errno"; + "error-analyze" = dontDistribute super."error-analyze"; "error-continuations" = dontDistribute super."error-continuations"; "error-list" = dontDistribute super."error-list"; "error-loc" = dontDistribute super."error-loc"; @@ -2864,6 +2870,7 @@ self: super: { "exinst-deepseq" = dontDistribute super."exinst-deepseq"; "exinst-hashable" = dontDistribute super."exinst-hashable"; "exists" = dontDistribute super."exists"; + "exit-codes" = dontDistribute super."exit-codes"; "exp-pairs" = dontDistribute super."exp-pairs"; "expand" = dontDistribute super."expand"; "expat-enumerator" = dontDistribute super."expat-enumerator"; @@ -2984,6 +2991,7 @@ self: super: { "fingertree-psqueue" = dontDistribute super."fingertree-psqueue"; "fingertree-tf" = dontDistribute super."fingertree-tf"; "finite-field" = dontDistribute super."finite-field"; + "finite-typelits" = dontDistribute super."finite-typelits"; "first-and-last" = dontDistribute super."first-and-last"; "first-class-patterns" = dontDistribute super."first-class-patterns"; "firstify" = dontDistribute super."firstify"; @@ -3267,6 +3275,20 @@ self: super: { "ghclive" = dontDistribute super."ghclive"; "ghczdecode" = dontDistribute super."ghczdecode"; "ght" = dontDistribute super."ght"; + "gi-atk" = dontDistribute super."gi-atk"; + "gi-cairo" = dontDistribute super."gi-cairo"; + "gi-gdk" = dontDistribute super."gi-gdk"; + "gi-gdkpixbuf" = dontDistribute super."gi-gdkpixbuf"; + "gi-gio" = dontDistribute super."gi-gio"; + "gi-glib" = dontDistribute super."gi-glib"; + "gi-gobject" = dontDistribute super."gi-gobject"; + "gi-gtk" = dontDistribute super."gi-gtk"; + "gi-javascriptcore" = dontDistribute super."gi-javascriptcore"; + "gi-notify" = dontDistribute super."gi-notify"; + "gi-pango" = dontDistribute super."gi-pango"; + "gi-soup" = dontDistribute super."gi-soup"; + "gi-vte" = dontDistribute super."gi-vte"; + "gi-webkit" = dontDistribute super."gi-webkit"; "gimlh" = dontDistribute super."gimlh"; "ginger" = dontDistribute super."ginger"; "ginsu" = dontDistribute super."ginsu"; @@ -3278,6 +3300,7 @@ self: super: { "git-date" = dontDistribute super."git-date"; "git-freq" = dontDistribute super."git-freq"; "git-gpush" = dontDistribute super."git-gpush"; + "git-jump" = dontDistribute super."git-jump"; "git-monitor" = dontDistribute super."git-monitor"; "git-object" = dontDistribute super."git-object"; "git-repair" = dontDistribute super."git-repair"; @@ -3753,6 +3776,8 @@ self: super: { "haskell-formatter" = dontDistribute super."haskell-formatter"; "haskell-ftp" = dontDistribute super."haskell-ftp"; "haskell-generate" = dontDistribute super."haskell-generate"; + "haskell-gi" = dontDistribute super."haskell-gi"; + "haskell-gi-base" = dontDistribute super."haskell-gi-base"; "haskell-import-graph" = dontDistribute super."haskell-import-graph"; "haskell-in-space" = dontDistribute super."haskell-in-space"; "haskell-modbus" = dontDistribute super."haskell-modbus"; @@ -3953,6 +3978,7 @@ self: super: { "hfann" = dontDistribute super."hfann"; "hfd" = dontDistribute super."hfd"; "hfiar" = dontDistribute super."hfiar"; + "hfmt" = dontDistribute super."hfmt"; "hfoil" = dontDistribute super."hfoil"; "hfov" = dontDistribute super."hfov"; "hfractal" = dontDistribute super."hfractal"; @@ -4366,6 +4392,7 @@ self: super: { "hsx2hs" = dontDistribute super."hsx2hs"; "hsyscall" = dontDistribute super."hsyscall"; "hszephyr" = dontDistribute super."hszephyr"; + "htaglib" = dontDistribute super."htaglib"; "htags" = dontDistribute super."htags"; "htar" = dontDistribute super."htar"; "htiled" = dontDistribute super."htiled"; @@ -4788,6 +4815,7 @@ self: super: { "keera-hails-reactive-polling" = dontDistribute super."keera-hails-reactive-polling"; "keera-hails-reactive-wx" = dontDistribute super."keera-hails-reactive-wx"; "keera-hails-reactive-yampa" = dontDistribute super."keera-hails-reactive-yampa"; + "keera-hails-reactivelenses" = dontDistribute super."keera-hails-reactivelenses"; "keera-hails-reactivevalues" = dontDistribute super."keera-hails-reactivevalues"; "keera-posture" = dontDistribute super."keera-posture"; "keiretsu" = dontDistribute super."keiretsu"; @@ -4909,6 +4937,8 @@ self: super: { "lat" = dontDistribute super."lat"; "latest-npm-version" = dontDistribute super."latest-npm-version"; "latex" = dontDistribute super."latex"; + "latex-formulae-image" = dontDistribute super."latex-formulae-image"; + "latex-formulae-pandoc" = dontDistribute super."latex-formulae-pandoc"; "lattices" = doDistribute super."lattices_1_2_1_1"; "launchpad-control" = dontDistribute super."launchpad-control"; "lax" = dontDistribute super."lax"; @@ -5268,6 +5298,7 @@ self: super: { "memexml" = dontDistribute super."memexml"; "memo-ptr" = dontDistribute super."memo-ptr"; "memo-sqlite" = dontDistribute super."memo-sqlite"; + "memoization-utils" = dontDistribute super."memoization-utils"; "memoize" = dontDistribute super."memoize"; "memory" = doDistribute super."memory_0_7"; "memscript" = dontDistribute super."memscript"; @@ -5694,6 +5725,7 @@ self: super: { "nthable" = dontDistribute super."nthable"; "ntp-control" = dontDistribute super."ntp-control"; "null-canvas" = dontDistribute super."null-canvas"; + "nullary" = dontDistribute super."nullary"; "number" = dontDistribute super."number"; "numbering" = dontDistribute super."numbering"; "numerals" = dontDistribute super."numerals"; @@ -5916,6 +5948,7 @@ self: super: { "pcg-random" = dontDistribute super."pcg-random"; "pcre-heavy" = doDistribute super."pcre-heavy_0_2_2"; "pcre-less" = dontDistribute super."pcre-less"; + "pcre-light" = doDistribute super."pcre-light_0_4_0_3"; "pcre-light-extra" = dontDistribute super."pcre-light-extra"; "pcre-utils" = dontDistribute super."pcre-utils"; "pdf-toolbox-content" = dontDistribute super."pdf-toolbox-content"; @@ -6286,6 +6319,7 @@ self: super: { "qc-oi-testgenerator" = dontDistribute super."qc-oi-testgenerator"; "qd" = dontDistribute super."qd"; "qd-vec" = dontDistribute super."qd-vec"; + "qed" = dontDistribute super."qed"; "qhull-simple" = dontDistribute super."qhull-simple"; "qrcode" = dontDistribute super."qrcode"; "qt" = dontDistribute super."qt"; @@ -6300,6 +6334,7 @@ self: super: { "queue" = dontDistribute super."queue"; "queuelike" = dontDistribute super."queuelike"; "quick-generator" = dontDistribute super."quick-generator"; + "quick-schema" = dontDistribute super."quick-schema"; "quickcheck-io" = doDistribute super."quickcheck-io_0_1_1"; "quickcheck-poly" = dontDistribute super."quickcheck-poly"; "quickcheck-properties" = dontDistribute super."quickcheck-properties"; @@ -6790,6 +6825,7 @@ self: super: { "servant" = doDistribute super."servant_0_2_2"; "servant-JuicyPixels" = dontDistribute super."servant-JuicyPixels"; "servant-blaze" = dontDistribute super."servant-blaze"; + "servant-cassava" = dontDistribute super."servant-cassava"; "servant-client" = doDistribute super."servant-client_0_2_2"; "servant-docs" = doDistribute super."servant-docs_0_3_1"; "servant-ede" = dontDistribute super."servant-ede"; @@ -6803,6 +6839,7 @@ self: super: { "servant-response" = dontDistribute super."servant-response"; "servant-scotty" = dontDistribute super."servant-scotty"; "servant-server" = doDistribute super."servant-server_0_2_4"; + "servant-swagger" = dontDistribute super."servant-swagger"; "servant-yaml" = dontDistribute super."servant-yaml"; "serversession" = dontDistribute super."serversession"; "serversession-backend-acid-state" = dontDistribute super."serversession-backend-acid-state"; @@ -7427,6 +7464,7 @@ self: super: { "tensor" = dontDistribute super."tensor"; "term-rewriting" = dontDistribute super."term-rewriting"; "termbox-bindings" = dontDistribute super."termbox-bindings"; + "terminal-size" = doDistribute super."terminal-size_0_3_2"; "termination-combinators" = dontDistribute super."termination-combinators"; "terminfo-hs" = dontDistribute super."terminfo-hs"; "terrahs" = dontDistribute super."terrahs"; @@ -7960,6 +7998,7 @@ self: super: { "verdict" = dontDistribute super."verdict"; "verdict-json" = dontDistribute super."verdict-json"; "verilog" = dontDistribute super."verilog"; + "versions" = dontDistribute super."versions"; "vhdl" = dontDistribute super."vhdl"; "views" = dontDistribute super."views"; "vigilance" = dontDistribute super."vigilance"; @@ -8402,6 +8441,7 @@ self: super: { "zendesk-api" = dontDistribute super."zendesk-api"; "zeno" = dontDistribute super."zeno"; "zero" = dontDistribute super."zero"; + "zerobin" = dontDistribute super."zerobin"; "zeromq-haskell" = dontDistribute super."zeromq-haskell"; "zeromq3-conduit" = dontDistribute super."zeromq3-conduit"; "zeromq3-haskell" = dontDistribute super."zeromq3-haskell"; diff --git a/pkgs/development/haskell-modules/configuration-lts-2.14.nix b/pkgs/development/haskell-modules/configuration-lts-2.14.nix index 1d0c9ce9cf32..3fb798ddb8fd 100644 --- a/pkgs/development/haskell-modules/configuration-lts-2.14.nix +++ b/pkgs/development/haskell-modules/configuration-lts-2.14.nix @@ -506,6 +506,7 @@ self: super: { "HasGP" = dontDistribute super."HasGP"; "Haschoo" = dontDistribute super."Haschoo"; "Hashell" = dontDistribute super."Hashell"; + "HaskRel" = dontDistribute super."HaskRel"; "HaskellForMaths" = dontDistribute super."HaskellForMaths"; "HaskellLM" = dontDistribute super."HaskellLM"; "HaskellNN" = dontDistribute super."HaskellNN"; @@ -551,6 +552,7 @@ self: super: { "Hsed" = dontDistribute super."Hsed"; "Hsmtlib" = dontDistribute super."Hsmtlib"; "HueAPI" = dontDistribute super."HueAPI"; + "HulkImport" = dontDistribute super."HulkImport"; "Hungarian-Munkres" = dontDistribute super."Hungarian-Munkres"; "IDynamic" = dontDistribute super."IDynamic"; "IFS" = dontDistribute super."IFS"; @@ -1145,6 +1147,7 @@ self: super: { "afis" = dontDistribute super."afis"; "afv" = dontDistribute super."afv"; "agda-server" = dontDistribute super."agda-server"; + "agda-snippets" = dontDistribute super."agda-snippets"; "agentx" = dontDistribute super."agentx"; "agum" = dontDistribute super."agum"; "aig" = dontDistribute super."aig"; @@ -1952,6 +1955,7 @@ self: super: { "cipher-aes" = doDistribute super."cipher-aes_0_2_10"; "cipher-aes128" = doDistribute super."cipher-aes128_0_6_4"; "cipher-rc5" = dontDistribute super."cipher-rc5"; + "ciphersaber2" = dontDistribute super."ciphersaber2"; "circ" = dontDistribute super."circ"; "cirru-parser" = dontDistribute super."cirru-parser"; "citation-resolve" = dontDistribute super."citation-resolve"; @@ -2403,6 +2407,7 @@ self: super: { "dataflow" = dontDistribute super."dataflow"; "datalog" = dontDistribute super."datalog"; "datapacker" = dontDistribute super."datapacker"; + "dataurl" = dontDistribute super."dataurl"; "date-cache" = dontDistribute super."date-cache"; "dates" = dontDistribute super."dates"; "datetime" = dontDistribute super."datetime"; @@ -2810,6 +2815,7 @@ self: super: { "eros-client" = dontDistribute super."eros-client"; "eros-http" = dontDistribute super."eros-http"; "errno" = dontDistribute super."errno"; + "error-analyze" = dontDistribute super."error-analyze"; "error-continuations" = dontDistribute super."error-continuations"; "error-list" = dontDistribute super."error-list"; "error-loc" = dontDistribute super."error-loc"; @@ -2863,6 +2869,7 @@ self: super: { "exinst-deepseq" = dontDistribute super."exinst-deepseq"; "exinst-hashable" = dontDistribute super."exinst-hashable"; "exists" = dontDistribute super."exists"; + "exit-codes" = dontDistribute super."exit-codes"; "exp-pairs" = dontDistribute super."exp-pairs"; "expand" = dontDistribute super."expand"; "expat-enumerator" = dontDistribute super."expat-enumerator"; @@ -2982,6 +2989,7 @@ self: super: { "fingertree-psqueue" = dontDistribute super."fingertree-psqueue"; "fingertree-tf" = dontDistribute super."fingertree-tf"; "finite-field" = dontDistribute super."finite-field"; + "finite-typelits" = dontDistribute super."finite-typelits"; "first-and-last" = dontDistribute super."first-and-last"; "first-class-patterns" = dontDistribute super."first-class-patterns"; "firstify" = dontDistribute super."firstify"; @@ -3265,6 +3273,20 @@ self: super: { "ghclive" = dontDistribute super."ghclive"; "ghczdecode" = dontDistribute super."ghczdecode"; "ght" = dontDistribute super."ght"; + "gi-atk" = dontDistribute super."gi-atk"; + "gi-cairo" = dontDistribute super."gi-cairo"; + "gi-gdk" = dontDistribute super."gi-gdk"; + "gi-gdkpixbuf" = dontDistribute super."gi-gdkpixbuf"; + "gi-gio" = dontDistribute super."gi-gio"; + "gi-glib" = dontDistribute super."gi-glib"; + "gi-gobject" = dontDistribute super."gi-gobject"; + "gi-gtk" = dontDistribute super."gi-gtk"; + "gi-javascriptcore" = dontDistribute super."gi-javascriptcore"; + "gi-notify" = dontDistribute super."gi-notify"; + "gi-pango" = dontDistribute super."gi-pango"; + "gi-soup" = dontDistribute super."gi-soup"; + "gi-vte" = dontDistribute super."gi-vte"; + "gi-webkit" = dontDistribute super."gi-webkit"; "gimlh" = dontDistribute super."gimlh"; "ginger" = dontDistribute super."ginger"; "ginsu" = dontDistribute super."ginsu"; @@ -3276,6 +3298,7 @@ self: super: { "git-date" = dontDistribute super."git-date"; "git-freq" = dontDistribute super."git-freq"; "git-gpush" = dontDistribute super."git-gpush"; + "git-jump" = dontDistribute super."git-jump"; "git-monitor" = dontDistribute super."git-monitor"; "git-object" = dontDistribute super."git-object"; "git-repair" = dontDistribute super."git-repair"; @@ -3751,6 +3774,8 @@ self: super: { "haskell-formatter" = dontDistribute super."haskell-formatter"; "haskell-ftp" = dontDistribute super."haskell-ftp"; "haskell-generate" = dontDistribute super."haskell-generate"; + "haskell-gi" = dontDistribute super."haskell-gi"; + "haskell-gi-base" = dontDistribute super."haskell-gi-base"; "haskell-import-graph" = dontDistribute super."haskell-import-graph"; "haskell-in-space" = dontDistribute super."haskell-in-space"; "haskell-modbus" = dontDistribute super."haskell-modbus"; @@ -3951,6 +3976,7 @@ self: super: { "hfann" = dontDistribute super."hfann"; "hfd" = dontDistribute super."hfd"; "hfiar" = dontDistribute super."hfiar"; + "hfmt" = dontDistribute super."hfmt"; "hfoil" = dontDistribute super."hfoil"; "hfov" = dontDistribute super."hfov"; "hfractal" = dontDistribute super."hfractal"; @@ -4363,6 +4389,7 @@ self: super: { "hsx2hs" = dontDistribute super."hsx2hs"; "hsyscall" = dontDistribute super."hsyscall"; "hszephyr" = dontDistribute super."hszephyr"; + "htaglib" = dontDistribute super."htaglib"; "htags" = dontDistribute super."htags"; "htar" = dontDistribute super."htar"; "htiled" = dontDistribute super."htiled"; @@ -4785,6 +4812,7 @@ self: super: { "keera-hails-reactive-polling" = dontDistribute super."keera-hails-reactive-polling"; "keera-hails-reactive-wx" = dontDistribute super."keera-hails-reactive-wx"; "keera-hails-reactive-yampa" = dontDistribute super."keera-hails-reactive-yampa"; + "keera-hails-reactivelenses" = dontDistribute super."keera-hails-reactivelenses"; "keera-hails-reactivevalues" = dontDistribute super."keera-hails-reactivevalues"; "keera-posture" = dontDistribute super."keera-posture"; "keiretsu" = dontDistribute super."keiretsu"; @@ -4906,6 +4934,8 @@ self: super: { "lat" = dontDistribute super."lat"; "latest-npm-version" = dontDistribute super."latest-npm-version"; "latex" = dontDistribute super."latex"; + "latex-formulae-image" = dontDistribute super."latex-formulae-image"; + "latex-formulae-pandoc" = dontDistribute super."latex-formulae-pandoc"; "lattices" = doDistribute super."lattices_1_2_1_1"; "launchpad-control" = dontDistribute super."launchpad-control"; "lax" = dontDistribute super."lax"; @@ -5265,6 +5295,7 @@ self: super: { "memexml" = dontDistribute super."memexml"; "memo-ptr" = dontDistribute super."memo-ptr"; "memo-sqlite" = dontDistribute super."memo-sqlite"; + "memoization-utils" = dontDistribute super."memoization-utils"; "memoize" = dontDistribute super."memoize"; "memory" = doDistribute super."memory_0_7"; "memscript" = dontDistribute super."memscript"; @@ -5691,6 +5722,7 @@ self: super: { "nthable" = dontDistribute super."nthable"; "ntp-control" = dontDistribute super."ntp-control"; "null-canvas" = dontDistribute super."null-canvas"; + "nullary" = dontDistribute super."nullary"; "number" = dontDistribute super."number"; "numbering" = dontDistribute super."numbering"; "numerals" = dontDistribute super."numerals"; @@ -5913,6 +5945,7 @@ self: super: { "pcg-random" = dontDistribute super."pcg-random"; "pcre-heavy" = doDistribute super."pcre-heavy_0_2_2"; "pcre-less" = dontDistribute super."pcre-less"; + "pcre-light" = doDistribute super."pcre-light_0_4_0_3"; "pcre-light-extra" = dontDistribute super."pcre-light-extra"; "pcre-utils" = dontDistribute super."pcre-utils"; "pdf-toolbox-content" = dontDistribute super."pdf-toolbox-content"; @@ -6282,6 +6315,7 @@ self: super: { "qc-oi-testgenerator" = dontDistribute super."qc-oi-testgenerator"; "qd" = dontDistribute super."qd"; "qd-vec" = dontDistribute super."qd-vec"; + "qed" = dontDistribute super."qed"; "qhull-simple" = dontDistribute super."qhull-simple"; "qrcode" = dontDistribute super."qrcode"; "qt" = dontDistribute super."qt"; @@ -6296,6 +6330,7 @@ self: super: { "queue" = dontDistribute super."queue"; "queuelike" = dontDistribute super."queuelike"; "quick-generator" = dontDistribute super."quick-generator"; + "quick-schema" = dontDistribute super."quick-schema"; "quickcheck-io" = doDistribute super."quickcheck-io_0_1_1"; "quickcheck-poly" = dontDistribute super."quickcheck-poly"; "quickcheck-properties" = dontDistribute super."quickcheck-properties"; @@ -6786,6 +6821,7 @@ self: super: { "servant" = doDistribute super."servant_0_2_2"; "servant-JuicyPixels" = dontDistribute super."servant-JuicyPixels"; "servant-blaze" = dontDistribute super."servant-blaze"; + "servant-cassava" = dontDistribute super."servant-cassava"; "servant-client" = doDistribute super."servant-client_0_2_2"; "servant-docs" = doDistribute super."servant-docs_0_3_1"; "servant-ede" = dontDistribute super."servant-ede"; @@ -6799,6 +6835,7 @@ self: super: { "servant-response" = dontDistribute super."servant-response"; "servant-scotty" = dontDistribute super."servant-scotty"; "servant-server" = doDistribute super."servant-server_0_2_4"; + "servant-swagger" = dontDistribute super."servant-swagger"; "servant-yaml" = dontDistribute super."servant-yaml"; "serversession" = dontDistribute super."serversession"; "serversession-backend-acid-state" = dontDistribute super."serversession-backend-acid-state"; @@ -7422,6 +7459,7 @@ self: super: { "tensor" = dontDistribute super."tensor"; "term-rewriting" = dontDistribute super."term-rewriting"; "termbox-bindings" = dontDistribute super."termbox-bindings"; + "terminal-size" = doDistribute super."terminal-size_0_3_2"; "termination-combinators" = dontDistribute super."termination-combinators"; "terminfo-hs" = dontDistribute super."terminfo-hs"; "terrahs" = dontDistribute super."terrahs"; @@ -7955,6 +7993,7 @@ self: super: { "verdict" = dontDistribute super."verdict"; "verdict-json" = dontDistribute super."verdict-json"; "verilog" = dontDistribute super."verilog"; + "versions" = dontDistribute super."versions"; "vhdl" = dontDistribute super."vhdl"; "views" = dontDistribute super."views"; "vigilance" = dontDistribute super."vigilance"; @@ -8394,6 +8433,7 @@ self: super: { "zendesk-api" = dontDistribute super."zendesk-api"; "zeno" = dontDistribute super."zeno"; "zero" = dontDistribute super."zero"; + "zerobin" = dontDistribute super."zerobin"; "zeromq-haskell" = dontDistribute super."zeromq-haskell"; "zeromq3-conduit" = dontDistribute super."zeromq3-conduit"; "zeromq3-haskell" = dontDistribute super."zeromq3-haskell"; diff --git a/pkgs/development/haskell-modules/configuration-lts-2.15.nix b/pkgs/development/haskell-modules/configuration-lts-2.15.nix index 36217dafb9c7..557f1d2b761a 100644 --- a/pkgs/development/haskell-modules/configuration-lts-2.15.nix +++ b/pkgs/development/haskell-modules/configuration-lts-2.15.nix @@ -506,6 +506,7 @@ self: super: { "HasGP" = dontDistribute super."HasGP"; "Haschoo" = dontDistribute super."Haschoo"; "Hashell" = dontDistribute super."Hashell"; + "HaskRel" = dontDistribute super."HaskRel"; "HaskellForMaths" = dontDistribute super."HaskellForMaths"; "HaskellLM" = dontDistribute super."HaskellLM"; "HaskellNN" = dontDistribute super."HaskellNN"; @@ -551,6 +552,7 @@ self: super: { "Hsed" = dontDistribute super."Hsed"; "Hsmtlib" = dontDistribute super."Hsmtlib"; "HueAPI" = dontDistribute super."HueAPI"; + "HulkImport" = dontDistribute super."HulkImport"; "Hungarian-Munkres" = dontDistribute super."Hungarian-Munkres"; "IDynamic" = dontDistribute super."IDynamic"; "IFS" = dontDistribute super."IFS"; @@ -1145,6 +1147,7 @@ self: super: { "afis" = dontDistribute super."afis"; "afv" = dontDistribute super."afv"; "agda-server" = dontDistribute super."agda-server"; + "agda-snippets" = dontDistribute super."agda-snippets"; "agentx" = dontDistribute super."agentx"; "agum" = dontDistribute super."agum"; "aig" = dontDistribute super."aig"; @@ -1952,6 +1955,7 @@ self: super: { "cipher-aes" = doDistribute super."cipher-aes_0_2_10"; "cipher-aes128" = doDistribute super."cipher-aes128_0_6_4"; "cipher-rc5" = dontDistribute super."cipher-rc5"; + "ciphersaber2" = dontDistribute super."ciphersaber2"; "circ" = dontDistribute super."circ"; "cirru-parser" = dontDistribute super."cirru-parser"; "citation-resolve" = dontDistribute super."citation-resolve"; @@ -2403,6 +2407,7 @@ self: super: { "dataflow" = dontDistribute super."dataflow"; "datalog" = dontDistribute super."datalog"; "datapacker" = dontDistribute super."datapacker"; + "dataurl" = dontDistribute super."dataurl"; "date-cache" = dontDistribute super."date-cache"; "dates" = dontDistribute super."dates"; "datetime" = dontDistribute super."datetime"; @@ -2591,6 +2596,7 @@ self: super: { "distributed-process-task" = doDistribute super."distributed-process-task_0_1_1"; "distributed-process-tests" = dontDistribute super."distributed-process-tests"; "distributed-process-zookeeper" = dontDistribute super."distributed-process-zookeeper"; + "distributed-static" = doDistribute super."distributed-static_0_3_2_0"; "distribution" = dontDistribute super."distribution"; "distribution-plot" = dontDistribute super."distribution-plot"; "diversity" = dontDistribute super."diversity"; @@ -2808,6 +2814,7 @@ self: super: { "eros-client" = dontDistribute super."eros-client"; "eros-http" = dontDistribute super."eros-http"; "errno" = dontDistribute super."errno"; + "error-analyze" = dontDistribute super."error-analyze"; "error-continuations" = dontDistribute super."error-continuations"; "error-list" = dontDistribute super."error-list"; "error-loc" = dontDistribute super."error-loc"; @@ -2861,6 +2868,7 @@ self: super: { "exinst-deepseq" = dontDistribute super."exinst-deepseq"; "exinst-hashable" = dontDistribute super."exinst-hashable"; "exists" = dontDistribute super."exists"; + "exit-codes" = dontDistribute super."exit-codes"; "exp-pairs" = dontDistribute super."exp-pairs"; "expand" = dontDistribute super."expand"; "expat-enumerator" = dontDistribute super."expat-enumerator"; @@ -2980,6 +2988,7 @@ self: super: { "fingertree-psqueue" = dontDistribute super."fingertree-psqueue"; "fingertree-tf" = dontDistribute super."fingertree-tf"; "finite-field" = dontDistribute super."finite-field"; + "finite-typelits" = dontDistribute super."finite-typelits"; "first-and-last" = dontDistribute super."first-and-last"; "first-class-patterns" = dontDistribute super."first-class-patterns"; "firstify" = dontDistribute super."firstify"; @@ -3263,6 +3272,20 @@ self: super: { "ghclive" = dontDistribute super."ghclive"; "ghczdecode" = dontDistribute super."ghczdecode"; "ght" = dontDistribute super."ght"; + "gi-atk" = dontDistribute super."gi-atk"; + "gi-cairo" = dontDistribute super."gi-cairo"; + "gi-gdk" = dontDistribute super."gi-gdk"; + "gi-gdkpixbuf" = dontDistribute super."gi-gdkpixbuf"; + "gi-gio" = dontDistribute super."gi-gio"; + "gi-glib" = dontDistribute super."gi-glib"; + "gi-gobject" = dontDistribute super."gi-gobject"; + "gi-gtk" = dontDistribute super."gi-gtk"; + "gi-javascriptcore" = dontDistribute super."gi-javascriptcore"; + "gi-notify" = dontDistribute super."gi-notify"; + "gi-pango" = dontDistribute super."gi-pango"; + "gi-soup" = dontDistribute super."gi-soup"; + "gi-vte" = dontDistribute super."gi-vte"; + "gi-webkit" = dontDistribute super."gi-webkit"; "gimlh" = dontDistribute super."gimlh"; "ginger" = dontDistribute super."ginger"; "ginsu" = dontDistribute super."ginsu"; @@ -3274,6 +3297,7 @@ self: super: { "git-date" = dontDistribute super."git-date"; "git-freq" = dontDistribute super."git-freq"; "git-gpush" = dontDistribute super."git-gpush"; + "git-jump" = dontDistribute super."git-jump"; "git-monitor" = dontDistribute super."git-monitor"; "git-object" = dontDistribute super."git-object"; "git-repair" = dontDistribute super."git-repair"; @@ -3749,6 +3773,8 @@ self: super: { "haskell-formatter" = dontDistribute super."haskell-formatter"; "haskell-ftp" = dontDistribute super."haskell-ftp"; "haskell-generate" = dontDistribute super."haskell-generate"; + "haskell-gi" = dontDistribute super."haskell-gi"; + "haskell-gi-base" = dontDistribute super."haskell-gi-base"; "haskell-import-graph" = dontDistribute super."haskell-import-graph"; "haskell-in-space" = dontDistribute super."haskell-in-space"; "haskell-modbus" = dontDistribute super."haskell-modbus"; @@ -3949,6 +3975,7 @@ self: super: { "hfann" = dontDistribute super."hfann"; "hfd" = dontDistribute super."hfd"; "hfiar" = dontDistribute super."hfiar"; + "hfmt" = dontDistribute super."hfmt"; "hfoil" = dontDistribute super."hfoil"; "hfov" = dontDistribute super."hfov"; "hfractal" = dontDistribute super."hfractal"; @@ -4361,6 +4388,7 @@ self: super: { "hsx2hs" = dontDistribute super."hsx2hs"; "hsyscall" = dontDistribute super."hsyscall"; "hszephyr" = dontDistribute super."hszephyr"; + "htaglib" = dontDistribute super."htaglib"; "htags" = dontDistribute super."htags"; "htar" = dontDistribute super."htar"; "htiled" = dontDistribute super."htiled"; @@ -4783,6 +4811,7 @@ self: super: { "keera-hails-reactive-polling" = dontDistribute super."keera-hails-reactive-polling"; "keera-hails-reactive-wx" = dontDistribute super."keera-hails-reactive-wx"; "keera-hails-reactive-yampa" = dontDistribute super."keera-hails-reactive-yampa"; + "keera-hails-reactivelenses" = dontDistribute super."keera-hails-reactivelenses"; "keera-hails-reactivevalues" = dontDistribute super."keera-hails-reactivevalues"; "keera-posture" = dontDistribute super."keera-posture"; "keiretsu" = dontDistribute super."keiretsu"; @@ -4904,6 +4933,8 @@ self: super: { "lat" = dontDistribute super."lat"; "latest-npm-version" = dontDistribute super."latest-npm-version"; "latex" = dontDistribute super."latex"; + "latex-formulae-image" = dontDistribute super."latex-formulae-image"; + "latex-formulae-pandoc" = dontDistribute super."latex-formulae-pandoc"; "lattices" = doDistribute super."lattices_1_2_1_1"; "launchpad-control" = dontDistribute super."launchpad-control"; "lax" = dontDistribute super."lax"; @@ -5263,6 +5294,7 @@ self: super: { "memexml" = dontDistribute super."memexml"; "memo-ptr" = dontDistribute super."memo-ptr"; "memo-sqlite" = dontDistribute super."memo-sqlite"; + "memoization-utils" = dontDistribute super."memoization-utils"; "memoize" = dontDistribute super."memoize"; "memory" = doDistribute super."memory_0_7"; "memscript" = dontDistribute super."memscript"; @@ -5686,6 +5718,7 @@ self: super: { "nthable" = dontDistribute super."nthable"; "ntp-control" = dontDistribute super."ntp-control"; "null-canvas" = dontDistribute super."null-canvas"; + "nullary" = dontDistribute super."nullary"; "number" = dontDistribute super."number"; "numbering" = dontDistribute super."numbering"; "numerals" = dontDistribute super."numerals"; @@ -5908,6 +5941,7 @@ self: super: { "pcg-random" = dontDistribute super."pcg-random"; "pcre-heavy" = doDistribute super."pcre-heavy_0_2_2"; "pcre-less" = dontDistribute super."pcre-less"; + "pcre-light" = doDistribute super."pcre-light_0_4_0_3"; "pcre-light-extra" = dontDistribute super."pcre-light-extra"; "pcre-utils" = dontDistribute super."pcre-utils"; "pdf-toolbox-content" = dontDistribute super."pdf-toolbox-content"; @@ -6277,6 +6311,7 @@ self: super: { "qc-oi-testgenerator" = dontDistribute super."qc-oi-testgenerator"; "qd" = dontDistribute super."qd"; "qd-vec" = dontDistribute super."qd-vec"; + "qed" = dontDistribute super."qed"; "qhull-simple" = dontDistribute super."qhull-simple"; "qrcode" = dontDistribute super."qrcode"; "qt" = dontDistribute super."qt"; @@ -6291,6 +6326,7 @@ self: super: { "queue" = dontDistribute super."queue"; "queuelike" = dontDistribute super."queuelike"; "quick-generator" = dontDistribute super."quick-generator"; + "quick-schema" = dontDistribute super."quick-schema"; "quickcheck-io" = doDistribute super."quickcheck-io_0_1_1"; "quickcheck-poly" = dontDistribute super."quickcheck-poly"; "quickcheck-properties" = dontDistribute super."quickcheck-properties"; @@ -6781,6 +6817,7 @@ self: super: { "servant" = doDistribute super."servant_0_2_2"; "servant-JuicyPixels" = dontDistribute super."servant-JuicyPixels"; "servant-blaze" = dontDistribute super."servant-blaze"; + "servant-cassava" = dontDistribute super."servant-cassava"; "servant-client" = doDistribute super."servant-client_0_2_2"; "servant-docs" = doDistribute super."servant-docs_0_3_1"; "servant-ede" = dontDistribute super."servant-ede"; @@ -6794,6 +6831,7 @@ self: super: { "servant-response" = dontDistribute super."servant-response"; "servant-scotty" = dontDistribute super."servant-scotty"; "servant-server" = doDistribute super."servant-server_0_2_4"; + "servant-swagger" = dontDistribute super."servant-swagger"; "servant-yaml" = dontDistribute super."servant-yaml"; "serversession" = dontDistribute super."serversession"; "serversession-backend-acid-state" = dontDistribute super."serversession-backend-acid-state"; @@ -7416,6 +7454,7 @@ self: super: { "tensor" = dontDistribute super."tensor"; "term-rewriting" = dontDistribute super."term-rewriting"; "termbox-bindings" = dontDistribute super."termbox-bindings"; + "terminal-size" = doDistribute super."terminal-size_0_3_2"; "termination-combinators" = dontDistribute super."termination-combinators"; "terminfo-hs" = dontDistribute super."terminfo-hs"; "terrahs" = dontDistribute super."terrahs"; @@ -7949,6 +7988,7 @@ self: super: { "verdict" = dontDistribute super."verdict"; "verdict-json" = dontDistribute super."verdict-json"; "verilog" = dontDistribute super."verilog"; + "versions" = dontDistribute super."versions"; "vhdl" = dontDistribute super."vhdl"; "views" = dontDistribute super."views"; "vigilance" = dontDistribute super."vigilance"; @@ -8387,6 +8427,7 @@ self: super: { "zendesk-api" = dontDistribute super."zendesk-api"; "zeno" = dontDistribute super."zeno"; "zero" = dontDistribute super."zero"; + "zerobin" = dontDistribute super."zerobin"; "zeromq-haskell" = dontDistribute super."zeromq-haskell"; "zeromq3-conduit" = dontDistribute super."zeromq3-conduit"; "zeromq3-haskell" = dontDistribute super."zeromq3-haskell"; diff --git a/pkgs/development/haskell-modules/configuration-lts-2.16.nix b/pkgs/development/haskell-modules/configuration-lts-2.16.nix index 53068356ef8a..4492be2dba01 100644 --- a/pkgs/development/haskell-modules/configuration-lts-2.16.nix +++ b/pkgs/development/haskell-modules/configuration-lts-2.16.nix @@ -504,6 +504,7 @@ self: super: { "HasGP" = dontDistribute super."HasGP"; "Haschoo" = dontDistribute super."Haschoo"; "Hashell" = dontDistribute super."Hashell"; + "HaskRel" = dontDistribute super."HaskRel"; "HaskellForMaths" = dontDistribute super."HaskellForMaths"; "HaskellLM" = dontDistribute super."HaskellLM"; "HaskellNN" = dontDistribute super."HaskellNN"; @@ -549,6 +550,7 @@ self: super: { "Hsed" = dontDistribute super."Hsed"; "Hsmtlib" = dontDistribute super."Hsmtlib"; "HueAPI" = dontDistribute super."HueAPI"; + "HulkImport" = dontDistribute super."HulkImport"; "Hungarian-Munkres" = dontDistribute super."Hungarian-Munkres"; "IDynamic" = dontDistribute super."IDynamic"; "IFS" = dontDistribute super."IFS"; @@ -1143,6 +1145,7 @@ self: super: { "afis" = dontDistribute super."afis"; "afv" = dontDistribute super."afv"; "agda-server" = dontDistribute super."agda-server"; + "agda-snippets" = dontDistribute super."agda-snippets"; "agentx" = dontDistribute super."agentx"; "agum" = dontDistribute super."agum"; "aig" = dontDistribute super."aig"; @@ -1949,6 +1952,7 @@ self: super: { "cio" = dontDistribute super."cio"; "cipher-aes128" = doDistribute super."cipher-aes128_0_6_4"; "cipher-rc5" = dontDistribute super."cipher-rc5"; + "ciphersaber2" = dontDistribute super."ciphersaber2"; "circ" = dontDistribute super."circ"; "cirru-parser" = dontDistribute super."cirru-parser"; "citation-resolve" = dontDistribute super."citation-resolve"; @@ -2399,6 +2403,7 @@ self: super: { "dataflow" = dontDistribute super."dataflow"; "datalog" = dontDistribute super."datalog"; "datapacker" = dontDistribute super."datapacker"; + "dataurl" = dontDistribute super."dataurl"; "date-cache" = dontDistribute super."date-cache"; "dates" = dontDistribute super."dates"; "datetime" = dontDistribute super."datetime"; @@ -2586,6 +2591,7 @@ self: super: { "distributed-process-task" = doDistribute super."distributed-process-task_0_1_1"; "distributed-process-tests" = dontDistribute super."distributed-process-tests"; "distributed-process-zookeeper" = dontDistribute super."distributed-process-zookeeper"; + "distributed-static" = doDistribute super."distributed-static_0_3_2_0"; "distribution" = dontDistribute super."distribution"; "distribution-plot" = dontDistribute super."distribution-plot"; "diversity" = dontDistribute super."diversity"; @@ -2803,6 +2809,7 @@ self: super: { "eros-client" = dontDistribute super."eros-client"; "eros-http" = dontDistribute super."eros-http"; "errno" = dontDistribute super."errno"; + "error-analyze" = dontDistribute super."error-analyze"; "error-continuations" = dontDistribute super."error-continuations"; "error-list" = dontDistribute super."error-list"; "error-loc" = dontDistribute super."error-loc"; @@ -2856,6 +2863,7 @@ self: super: { "exinst-deepseq" = dontDistribute super."exinst-deepseq"; "exinst-hashable" = dontDistribute super."exinst-hashable"; "exists" = dontDistribute super."exists"; + "exit-codes" = dontDistribute super."exit-codes"; "exp-pairs" = dontDistribute super."exp-pairs"; "expand" = dontDistribute super."expand"; "expat-enumerator" = dontDistribute super."expat-enumerator"; @@ -2973,6 +2981,7 @@ self: super: { "fingertree-psqueue" = dontDistribute super."fingertree-psqueue"; "fingertree-tf" = dontDistribute super."fingertree-tf"; "finite-field" = dontDistribute super."finite-field"; + "finite-typelits" = dontDistribute super."finite-typelits"; "first-and-last" = dontDistribute super."first-and-last"; "first-class-patterns" = dontDistribute super."first-class-patterns"; "firstify" = dontDistribute super."firstify"; @@ -3256,6 +3265,20 @@ self: super: { "ghclive" = dontDistribute super."ghclive"; "ghczdecode" = dontDistribute super."ghczdecode"; "ght" = dontDistribute super."ght"; + "gi-atk" = dontDistribute super."gi-atk"; + "gi-cairo" = dontDistribute super."gi-cairo"; + "gi-gdk" = dontDistribute super."gi-gdk"; + "gi-gdkpixbuf" = dontDistribute super."gi-gdkpixbuf"; + "gi-gio" = dontDistribute super."gi-gio"; + "gi-glib" = dontDistribute super."gi-glib"; + "gi-gobject" = dontDistribute super."gi-gobject"; + "gi-gtk" = dontDistribute super."gi-gtk"; + "gi-javascriptcore" = dontDistribute super."gi-javascriptcore"; + "gi-notify" = dontDistribute super."gi-notify"; + "gi-pango" = dontDistribute super."gi-pango"; + "gi-soup" = dontDistribute super."gi-soup"; + "gi-vte" = dontDistribute super."gi-vte"; + "gi-webkit" = dontDistribute super."gi-webkit"; "gimlh" = dontDistribute super."gimlh"; "ginger" = dontDistribute super."ginger"; "ginsu" = dontDistribute super."ginsu"; @@ -3267,6 +3290,7 @@ self: super: { "git-date" = dontDistribute super."git-date"; "git-freq" = dontDistribute super."git-freq"; "git-gpush" = dontDistribute super."git-gpush"; + "git-jump" = dontDistribute super."git-jump"; "git-monitor" = dontDistribute super."git-monitor"; "git-object" = dontDistribute super."git-object"; "git-repair" = dontDistribute super."git-repair"; @@ -3740,6 +3764,8 @@ self: super: { "haskell-formatter" = dontDistribute super."haskell-formatter"; "haskell-ftp" = dontDistribute super."haskell-ftp"; "haskell-generate" = dontDistribute super."haskell-generate"; + "haskell-gi" = dontDistribute super."haskell-gi"; + "haskell-gi-base" = dontDistribute super."haskell-gi-base"; "haskell-import-graph" = dontDistribute super."haskell-import-graph"; "haskell-in-space" = dontDistribute super."haskell-in-space"; "haskell-modbus" = dontDistribute super."haskell-modbus"; @@ -3940,6 +3966,7 @@ self: super: { "hfann" = dontDistribute super."hfann"; "hfd" = dontDistribute super."hfd"; "hfiar" = dontDistribute super."hfiar"; + "hfmt" = dontDistribute super."hfmt"; "hfoil" = dontDistribute super."hfoil"; "hfov" = dontDistribute super."hfov"; "hfractal" = dontDistribute super."hfractal"; @@ -4352,6 +4379,7 @@ self: super: { "hsx2hs" = dontDistribute super."hsx2hs"; "hsyscall" = dontDistribute super."hsyscall"; "hszephyr" = dontDistribute super."hszephyr"; + "htaglib" = dontDistribute super."htaglib"; "htags" = dontDistribute super."htags"; "htar" = dontDistribute super."htar"; "htiled" = dontDistribute super."htiled"; @@ -4774,6 +4802,7 @@ self: super: { "keera-hails-reactive-polling" = dontDistribute super."keera-hails-reactive-polling"; "keera-hails-reactive-wx" = dontDistribute super."keera-hails-reactive-wx"; "keera-hails-reactive-yampa" = dontDistribute super."keera-hails-reactive-yampa"; + "keera-hails-reactivelenses" = dontDistribute super."keera-hails-reactivelenses"; "keera-hails-reactivevalues" = dontDistribute super."keera-hails-reactivevalues"; "keera-posture" = dontDistribute super."keera-posture"; "keiretsu" = dontDistribute super."keiretsu"; @@ -4895,6 +4924,8 @@ self: super: { "lat" = dontDistribute super."lat"; "latest-npm-version" = dontDistribute super."latest-npm-version"; "latex" = dontDistribute super."latex"; + "latex-formulae-image" = dontDistribute super."latex-formulae-image"; + "latex-formulae-pandoc" = dontDistribute super."latex-formulae-pandoc"; "lattices" = doDistribute super."lattices_1_2_1_1"; "launchpad-control" = dontDistribute super."launchpad-control"; "lax" = dontDistribute super."lax"; @@ -5253,6 +5284,7 @@ self: super: { "memexml" = dontDistribute super."memexml"; "memo-ptr" = dontDistribute super."memo-ptr"; "memo-sqlite" = dontDistribute super."memo-sqlite"; + "memoization-utils" = dontDistribute super."memoization-utils"; "memoize" = dontDistribute super."memoize"; "memory" = doDistribute super."memory_0_7"; "memscript" = dontDistribute super."memscript"; @@ -5676,6 +5708,7 @@ self: super: { "nthable" = dontDistribute super."nthable"; "ntp-control" = dontDistribute super."ntp-control"; "null-canvas" = dontDistribute super."null-canvas"; + "nullary" = dontDistribute super."nullary"; "number" = dontDistribute super."number"; "numbering" = dontDistribute super."numbering"; "numerals" = dontDistribute super."numerals"; @@ -5898,6 +5931,7 @@ self: super: { "pcg-random" = dontDistribute super."pcg-random"; "pcre-heavy" = doDistribute super."pcre-heavy_0_2_2"; "pcre-less" = dontDistribute super."pcre-less"; + "pcre-light" = doDistribute super."pcre-light_0_4_0_3"; "pcre-light-extra" = dontDistribute super."pcre-light-extra"; "pcre-utils" = dontDistribute super."pcre-utils"; "pdf-toolbox-content" = dontDistribute super."pdf-toolbox-content"; @@ -6267,6 +6301,7 @@ self: super: { "qc-oi-testgenerator" = dontDistribute super."qc-oi-testgenerator"; "qd" = dontDistribute super."qd"; "qd-vec" = dontDistribute super."qd-vec"; + "qed" = dontDistribute super."qed"; "qhull-simple" = dontDistribute super."qhull-simple"; "qrcode" = dontDistribute super."qrcode"; "qt" = dontDistribute super."qt"; @@ -6281,6 +6316,7 @@ self: super: { "queue" = dontDistribute super."queue"; "queuelike" = dontDistribute super."queuelike"; "quick-generator" = dontDistribute super."quick-generator"; + "quick-schema" = dontDistribute super."quick-schema"; "quickcheck-io" = doDistribute super."quickcheck-io_0_1_1"; "quickcheck-poly" = dontDistribute super."quickcheck-poly"; "quickcheck-properties" = dontDistribute super."quickcheck-properties"; @@ -6771,6 +6807,7 @@ self: super: { "servant" = doDistribute super."servant_0_2_2"; "servant-JuicyPixels" = dontDistribute super."servant-JuicyPixels"; "servant-blaze" = dontDistribute super."servant-blaze"; + "servant-cassava" = dontDistribute super."servant-cassava"; "servant-client" = doDistribute super."servant-client_0_2_2"; "servant-docs" = doDistribute super."servant-docs_0_3_1"; "servant-ede" = dontDistribute super."servant-ede"; @@ -6784,6 +6821,7 @@ self: super: { "servant-response" = dontDistribute super."servant-response"; "servant-scotty" = dontDistribute super."servant-scotty"; "servant-server" = doDistribute super."servant-server_0_2_4"; + "servant-swagger" = dontDistribute super."servant-swagger"; "servant-yaml" = dontDistribute super."servant-yaml"; "serversession" = dontDistribute super."serversession"; "serversession-backend-acid-state" = dontDistribute super."serversession-backend-acid-state"; @@ -7405,6 +7443,7 @@ self: super: { "tensor" = dontDistribute super."tensor"; "term-rewriting" = dontDistribute super."term-rewriting"; "termbox-bindings" = dontDistribute super."termbox-bindings"; + "terminal-size" = doDistribute super."terminal-size_0_3_2"; "termination-combinators" = dontDistribute super."termination-combinators"; "terminfo-hs" = dontDistribute super."terminfo-hs"; "terrahs" = dontDistribute super."terrahs"; @@ -7938,6 +7977,7 @@ self: super: { "verdict" = dontDistribute super."verdict"; "verdict-json" = dontDistribute super."verdict-json"; "verilog" = dontDistribute super."verilog"; + "versions" = dontDistribute super."versions"; "vhdl" = dontDistribute super."vhdl"; "views" = dontDistribute super."views"; "vigilance" = dontDistribute super."vigilance"; @@ -8375,6 +8415,7 @@ self: super: { "zendesk-api" = dontDistribute super."zendesk-api"; "zeno" = dontDistribute super."zeno"; "zero" = dontDistribute super."zero"; + "zerobin" = dontDistribute super."zerobin"; "zeromq-haskell" = dontDistribute super."zeromq-haskell"; "zeromq3-conduit" = dontDistribute super."zeromq3-conduit"; "zeromq3-haskell" = dontDistribute super."zeromq3-haskell"; diff --git a/pkgs/development/haskell-modules/configuration-lts-2.17.nix b/pkgs/development/haskell-modules/configuration-lts-2.17.nix index bd80525feddd..a74e642d49ba 100644 --- a/pkgs/development/haskell-modules/configuration-lts-2.17.nix +++ b/pkgs/development/haskell-modules/configuration-lts-2.17.nix @@ -504,6 +504,7 @@ self: super: { "HasGP" = dontDistribute super."HasGP"; "Haschoo" = dontDistribute super."Haschoo"; "Hashell" = dontDistribute super."Hashell"; + "HaskRel" = dontDistribute super."HaskRel"; "HaskellForMaths" = dontDistribute super."HaskellForMaths"; "HaskellLM" = dontDistribute super."HaskellLM"; "HaskellNN" = dontDistribute super."HaskellNN"; @@ -549,6 +550,7 @@ self: super: { "Hsed" = dontDistribute super."Hsed"; "Hsmtlib" = dontDistribute super."Hsmtlib"; "HueAPI" = dontDistribute super."HueAPI"; + "HulkImport" = dontDistribute super."HulkImport"; "Hungarian-Munkres" = dontDistribute super."Hungarian-Munkres"; "IDynamic" = dontDistribute super."IDynamic"; "IFS" = dontDistribute super."IFS"; @@ -1143,6 +1145,7 @@ self: super: { "afis" = dontDistribute super."afis"; "afv" = dontDistribute super."afv"; "agda-server" = dontDistribute super."agda-server"; + "agda-snippets" = dontDistribute super."agda-snippets"; "agentx" = dontDistribute super."agentx"; "agum" = dontDistribute super."agum"; "aig" = dontDistribute super."aig"; @@ -1946,6 +1949,7 @@ self: super: { "cio" = dontDistribute super."cio"; "cipher-aes128" = doDistribute super."cipher-aes128_0_6_4"; "cipher-rc5" = dontDistribute super."cipher-rc5"; + "ciphersaber2" = dontDistribute super."ciphersaber2"; "circ" = dontDistribute super."circ"; "cirru-parser" = dontDistribute super."cirru-parser"; "citation-resolve" = dontDistribute super."citation-resolve"; @@ -2396,6 +2400,7 @@ self: super: { "dataflow" = dontDistribute super."dataflow"; "datalog" = dontDistribute super."datalog"; "datapacker" = dontDistribute super."datapacker"; + "dataurl" = dontDistribute super."dataurl"; "date-cache" = dontDistribute super."date-cache"; "dates" = dontDistribute super."dates"; "datetime" = dontDistribute super."datetime"; @@ -2583,6 +2588,7 @@ self: super: { "distributed-process-task" = doDistribute super."distributed-process-task_0_1_1"; "distributed-process-tests" = dontDistribute super."distributed-process-tests"; "distributed-process-zookeeper" = dontDistribute super."distributed-process-zookeeper"; + "distributed-static" = doDistribute super."distributed-static_0_3_2_0"; "distribution" = dontDistribute super."distribution"; "distribution-plot" = dontDistribute super."distribution-plot"; "diversity" = dontDistribute super."diversity"; @@ -2800,6 +2806,7 @@ self: super: { "eros-client" = dontDistribute super."eros-client"; "eros-http" = dontDistribute super."eros-http"; "errno" = dontDistribute super."errno"; + "error-analyze" = dontDistribute super."error-analyze"; "error-continuations" = dontDistribute super."error-continuations"; "error-list" = dontDistribute super."error-list"; "error-loc" = dontDistribute super."error-loc"; @@ -2852,6 +2859,7 @@ self: super: { "exinst-deepseq" = dontDistribute super."exinst-deepseq"; "exinst-hashable" = dontDistribute super."exinst-hashable"; "exists" = dontDistribute super."exists"; + "exit-codes" = dontDistribute super."exit-codes"; "exp-pairs" = dontDistribute super."exp-pairs"; "expand" = dontDistribute super."expand"; "expat-enumerator" = dontDistribute super."expat-enumerator"; @@ -2968,6 +2976,7 @@ self: super: { "fingertree-psqueue" = dontDistribute super."fingertree-psqueue"; "fingertree-tf" = dontDistribute super."fingertree-tf"; "finite-field" = dontDistribute super."finite-field"; + "finite-typelits" = dontDistribute super."finite-typelits"; "first-and-last" = dontDistribute super."first-and-last"; "first-class-patterns" = dontDistribute super."first-class-patterns"; "firstify" = dontDistribute super."firstify"; @@ -3249,6 +3258,20 @@ self: super: { "ghclive" = dontDistribute super."ghclive"; "ghczdecode" = dontDistribute super."ghczdecode"; "ght" = dontDistribute super."ght"; + "gi-atk" = dontDistribute super."gi-atk"; + "gi-cairo" = dontDistribute super."gi-cairo"; + "gi-gdk" = dontDistribute super."gi-gdk"; + "gi-gdkpixbuf" = dontDistribute super."gi-gdkpixbuf"; + "gi-gio" = dontDistribute super."gi-gio"; + "gi-glib" = dontDistribute super."gi-glib"; + "gi-gobject" = dontDistribute super."gi-gobject"; + "gi-gtk" = dontDistribute super."gi-gtk"; + "gi-javascriptcore" = dontDistribute super."gi-javascriptcore"; + "gi-notify" = dontDistribute super."gi-notify"; + "gi-pango" = dontDistribute super."gi-pango"; + "gi-soup" = dontDistribute super."gi-soup"; + "gi-vte" = dontDistribute super."gi-vte"; + "gi-webkit" = dontDistribute super."gi-webkit"; "gimlh" = dontDistribute super."gimlh"; "ginger" = dontDistribute super."ginger"; "ginsu" = dontDistribute super."ginsu"; @@ -3260,6 +3283,7 @@ self: super: { "git-date" = dontDistribute super."git-date"; "git-freq" = dontDistribute super."git-freq"; "git-gpush" = dontDistribute super."git-gpush"; + "git-jump" = dontDistribute super."git-jump"; "git-monitor" = dontDistribute super."git-monitor"; "git-object" = dontDistribute super."git-object"; "git-repair" = dontDistribute super."git-repair"; @@ -3733,6 +3757,8 @@ self: super: { "haskell-formatter" = dontDistribute super."haskell-formatter"; "haskell-ftp" = dontDistribute super."haskell-ftp"; "haskell-generate" = dontDistribute super."haskell-generate"; + "haskell-gi" = dontDistribute super."haskell-gi"; + "haskell-gi-base" = dontDistribute super."haskell-gi-base"; "haskell-import-graph" = dontDistribute super."haskell-import-graph"; "haskell-in-space" = dontDistribute super."haskell-in-space"; "haskell-modbus" = dontDistribute super."haskell-modbus"; @@ -3932,6 +3958,7 @@ self: super: { "hfann" = dontDistribute super."hfann"; "hfd" = dontDistribute super."hfd"; "hfiar" = dontDistribute super."hfiar"; + "hfmt" = dontDistribute super."hfmt"; "hfoil" = dontDistribute super."hfoil"; "hfov" = dontDistribute super."hfov"; "hfractal" = dontDistribute super."hfractal"; @@ -4344,6 +4371,7 @@ self: super: { "hsx2hs" = dontDistribute super."hsx2hs"; "hsyscall" = dontDistribute super."hsyscall"; "hszephyr" = dontDistribute super."hszephyr"; + "htaglib" = dontDistribute super."htaglib"; "htags" = dontDistribute super."htags"; "htar" = dontDistribute super."htar"; "htiled" = dontDistribute super."htiled"; @@ -4766,6 +4794,7 @@ self: super: { "keera-hails-reactive-polling" = dontDistribute super."keera-hails-reactive-polling"; "keera-hails-reactive-wx" = dontDistribute super."keera-hails-reactive-wx"; "keera-hails-reactive-yampa" = dontDistribute super."keera-hails-reactive-yampa"; + "keera-hails-reactivelenses" = dontDistribute super."keera-hails-reactivelenses"; "keera-hails-reactivevalues" = dontDistribute super."keera-hails-reactivevalues"; "keera-posture" = dontDistribute super."keera-posture"; "keiretsu" = dontDistribute super."keiretsu"; @@ -4887,6 +4916,8 @@ self: super: { "lat" = dontDistribute super."lat"; "latest-npm-version" = dontDistribute super."latest-npm-version"; "latex" = dontDistribute super."latex"; + "latex-formulae-image" = dontDistribute super."latex-formulae-image"; + "latex-formulae-pandoc" = dontDistribute super."latex-formulae-pandoc"; "lattices" = doDistribute super."lattices_1_2_1_1"; "launchpad-control" = dontDistribute super."launchpad-control"; "lax" = dontDistribute super."lax"; @@ -5245,6 +5276,7 @@ self: super: { "memexml" = dontDistribute super."memexml"; "memo-ptr" = dontDistribute super."memo-ptr"; "memo-sqlite" = dontDistribute super."memo-sqlite"; + "memoization-utils" = dontDistribute super."memoization-utils"; "memoize" = dontDistribute super."memoize"; "memory" = doDistribute super."memory_0_7"; "memscript" = dontDistribute super."memscript"; @@ -5667,6 +5699,7 @@ self: super: { "nthable" = dontDistribute super."nthable"; "ntp-control" = dontDistribute super."ntp-control"; "null-canvas" = dontDistribute super."null-canvas"; + "nullary" = dontDistribute super."nullary"; "number" = dontDistribute super."number"; "numbering" = dontDistribute super."numbering"; "numerals" = dontDistribute super."numerals"; @@ -5889,6 +5922,7 @@ self: super: { "pcg-random" = dontDistribute super."pcg-random"; "pcre-heavy" = doDistribute super."pcre-heavy_0_2_2"; "pcre-less" = dontDistribute super."pcre-less"; + "pcre-light" = doDistribute super."pcre-light_0_4_0_3"; "pcre-light-extra" = dontDistribute super."pcre-light-extra"; "pcre-utils" = dontDistribute super."pcre-utils"; "pdf-toolbox-content" = dontDistribute super."pdf-toolbox-content"; @@ -6258,6 +6292,7 @@ self: super: { "qc-oi-testgenerator" = dontDistribute super."qc-oi-testgenerator"; "qd" = dontDistribute super."qd"; "qd-vec" = dontDistribute super."qd-vec"; + "qed" = dontDistribute super."qed"; "qhull-simple" = dontDistribute super."qhull-simple"; "qrcode" = dontDistribute super."qrcode"; "qt" = dontDistribute super."qt"; @@ -6272,6 +6307,7 @@ self: super: { "queue" = dontDistribute super."queue"; "queuelike" = dontDistribute super."queuelike"; "quick-generator" = dontDistribute super."quick-generator"; + "quick-schema" = dontDistribute super."quick-schema"; "quickcheck-io" = doDistribute super."quickcheck-io_0_1_1"; "quickcheck-poly" = dontDistribute super."quickcheck-poly"; "quickcheck-properties" = dontDistribute super."quickcheck-properties"; @@ -6761,6 +6797,7 @@ self: super: { "servant" = doDistribute super."servant_0_2_2"; "servant-JuicyPixels" = dontDistribute super."servant-JuicyPixels"; "servant-blaze" = dontDistribute super."servant-blaze"; + "servant-cassava" = dontDistribute super."servant-cassava"; "servant-client" = doDistribute super."servant-client_0_2_2"; "servant-docs" = doDistribute super."servant-docs_0_3_1"; "servant-ede" = dontDistribute super."servant-ede"; @@ -6774,6 +6811,7 @@ self: super: { "servant-response" = dontDistribute super."servant-response"; "servant-scotty" = dontDistribute super."servant-scotty"; "servant-server" = doDistribute super."servant-server_0_2_4"; + "servant-swagger" = dontDistribute super."servant-swagger"; "servant-yaml" = dontDistribute super."servant-yaml"; "serversession" = dontDistribute super."serversession"; "serversession-backend-acid-state" = dontDistribute super."serversession-backend-acid-state"; @@ -7395,6 +7433,7 @@ self: super: { "tensor" = dontDistribute super."tensor"; "term-rewriting" = dontDistribute super."term-rewriting"; "termbox-bindings" = dontDistribute super."termbox-bindings"; + "terminal-size" = doDistribute super."terminal-size_0_3_2"; "termination-combinators" = dontDistribute super."termination-combinators"; "terminfo-hs" = dontDistribute super."terminfo-hs"; "terrahs" = dontDistribute super."terrahs"; @@ -7928,6 +7967,7 @@ self: super: { "verdict" = dontDistribute super."verdict"; "verdict-json" = dontDistribute super."verdict-json"; "verilog" = dontDistribute super."verilog"; + "versions" = dontDistribute super."versions"; "vhdl" = dontDistribute super."vhdl"; "views" = dontDistribute super."views"; "vigilance" = dontDistribute super."vigilance"; @@ -8364,6 +8404,7 @@ self: super: { "zendesk-api" = dontDistribute super."zendesk-api"; "zeno" = dontDistribute super."zeno"; "zero" = dontDistribute super."zero"; + "zerobin" = dontDistribute super."zerobin"; "zeromq-haskell" = dontDistribute super."zeromq-haskell"; "zeromq3-conduit" = dontDistribute super."zeromq3-conduit"; "zeromq3-haskell" = dontDistribute super."zeromq3-haskell"; diff --git a/pkgs/development/haskell-modules/configuration-lts-2.18.nix b/pkgs/development/haskell-modules/configuration-lts-2.18.nix index 5afb0f3ecdde..074462294bec 100644 --- a/pkgs/development/haskell-modules/configuration-lts-2.18.nix +++ b/pkgs/development/haskell-modules/configuration-lts-2.18.nix @@ -504,6 +504,7 @@ self: super: { "HasGP" = dontDistribute super."HasGP"; "Haschoo" = dontDistribute super."Haschoo"; "Hashell" = dontDistribute super."Hashell"; + "HaskRel" = dontDistribute super."HaskRel"; "HaskellForMaths" = dontDistribute super."HaskellForMaths"; "HaskellLM" = dontDistribute super."HaskellLM"; "HaskellNN" = dontDistribute super."HaskellNN"; @@ -548,6 +549,7 @@ self: super: { "Hsed" = dontDistribute super."Hsed"; "Hsmtlib" = dontDistribute super."Hsmtlib"; "HueAPI" = dontDistribute super."HueAPI"; + "HulkImport" = dontDistribute super."HulkImport"; "Hungarian-Munkres" = dontDistribute super."Hungarian-Munkres"; "IDynamic" = dontDistribute super."IDynamic"; "IFS" = dontDistribute super."IFS"; @@ -1142,6 +1144,7 @@ self: super: { "afis" = dontDistribute super."afis"; "afv" = dontDistribute super."afv"; "agda-server" = dontDistribute super."agda-server"; + "agda-snippets" = dontDistribute super."agda-snippets"; "agentx" = dontDistribute super."agentx"; "agum" = dontDistribute super."agum"; "aig" = dontDistribute super."aig"; @@ -1942,6 +1945,7 @@ self: super: { "cio" = dontDistribute super."cio"; "cipher-aes128" = doDistribute super."cipher-aes128_0_6_4"; "cipher-rc5" = dontDistribute super."cipher-rc5"; + "ciphersaber2" = dontDistribute super."ciphersaber2"; "circ" = dontDistribute super."circ"; "cirru-parser" = dontDistribute super."cirru-parser"; "citation-resolve" = dontDistribute super."citation-resolve"; @@ -2392,6 +2396,7 @@ self: super: { "dataflow" = dontDistribute super."dataflow"; "datalog" = dontDistribute super."datalog"; "datapacker" = dontDistribute super."datapacker"; + "dataurl" = dontDistribute super."dataurl"; "date-cache" = dontDistribute super."date-cache"; "dates" = dontDistribute super."dates"; "datetime" = dontDistribute super."datetime"; @@ -2579,6 +2584,7 @@ self: super: { "distributed-process-task" = doDistribute super."distributed-process-task_0_1_1"; "distributed-process-tests" = dontDistribute super."distributed-process-tests"; "distributed-process-zookeeper" = dontDistribute super."distributed-process-zookeeper"; + "distributed-static" = doDistribute super."distributed-static_0_3_2_0"; "distribution" = dontDistribute super."distribution"; "distribution-plot" = dontDistribute super."distribution-plot"; "diversity" = dontDistribute super."diversity"; @@ -2795,6 +2801,7 @@ self: super: { "eros-client" = dontDistribute super."eros-client"; "eros-http" = dontDistribute super."eros-http"; "errno" = dontDistribute super."errno"; + "error-analyze" = dontDistribute super."error-analyze"; "error-continuations" = dontDistribute super."error-continuations"; "error-list" = dontDistribute super."error-list"; "error-loc" = dontDistribute super."error-loc"; @@ -2847,6 +2854,7 @@ self: super: { "exinst-deepseq" = dontDistribute super."exinst-deepseq"; "exinst-hashable" = dontDistribute super."exinst-hashable"; "exists" = dontDistribute super."exists"; + "exit-codes" = dontDistribute super."exit-codes"; "exp-pairs" = dontDistribute super."exp-pairs"; "expand" = dontDistribute super."expand"; "expat-enumerator" = dontDistribute super."expat-enumerator"; @@ -2963,6 +2971,7 @@ self: super: { "fingertree-psqueue" = dontDistribute super."fingertree-psqueue"; "fingertree-tf" = dontDistribute super."fingertree-tf"; "finite-field" = dontDistribute super."finite-field"; + "finite-typelits" = dontDistribute super."finite-typelits"; "first-and-last" = dontDistribute super."first-and-last"; "first-class-patterns" = dontDistribute super."first-class-patterns"; "firstify" = dontDistribute super."firstify"; @@ -3244,6 +3253,20 @@ self: super: { "ghclive" = dontDistribute super."ghclive"; "ghczdecode" = dontDistribute super."ghczdecode"; "ght" = dontDistribute super."ght"; + "gi-atk" = dontDistribute super."gi-atk"; + "gi-cairo" = dontDistribute super."gi-cairo"; + "gi-gdk" = dontDistribute super."gi-gdk"; + "gi-gdkpixbuf" = dontDistribute super."gi-gdkpixbuf"; + "gi-gio" = dontDistribute super."gi-gio"; + "gi-glib" = dontDistribute super."gi-glib"; + "gi-gobject" = dontDistribute super."gi-gobject"; + "gi-gtk" = dontDistribute super."gi-gtk"; + "gi-javascriptcore" = dontDistribute super."gi-javascriptcore"; + "gi-notify" = dontDistribute super."gi-notify"; + "gi-pango" = dontDistribute super."gi-pango"; + "gi-soup" = dontDistribute super."gi-soup"; + "gi-vte" = dontDistribute super."gi-vte"; + "gi-webkit" = dontDistribute super."gi-webkit"; "gimlh" = dontDistribute super."gimlh"; "ginger" = dontDistribute super."ginger"; "ginsu" = dontDistribute super."ginsu"; @@ -3255,6 +3278,7 @@ self: super: { "git-date" = dontDistribute super."git-date"; "git-freq" = dontDistribute super."git-freq"; "git-gpush" = dontDistribute super."git-gpush"; + "git-jump" = dontDistribute super."git-jump"; "git-monitor" = dontDistribute super."git-monitor"; "git-object" = dontDistribute super."git-object"; "git-repair" = dontDistribute super."git-repair"; @@ -3727,6 +3751,8 @@ self: super: { "haskell-formatter" = dontDistribute super."haskell-formatter"; "haskell-ftp" = dontDistribute super."haskell-ftp"; "haskell-generate" = dontDistribute super."haskell-generate"; + "haskell-gi" = dontDistribute super."haskell-gi"; + "haskell-gi-base" = dontDistribute super."haskell-gi-base"; "haskell-import-graph" = dontDistribute super."haskell-import-graph"; "haskell-in-space" = dontDistribute super."haskell-in-space"; "haskell-modbus" = dontDistribute super."haskell-modbus"; @@ -3925,6 +3951,7 @@ self: super: { "hfann" = dontDistribute super."hfann"; "hfd" = dontDistribute super."hfd"; "hfiar" = dontDistribute super."hfiar"; + "hfmt" = dontDistribute super."hfmt"; "hfoil" = dontDistribute super."hfoil"; "hfov" = dontDistribute super."hfov"; "hfractal" = dontDistribute super."hfractal"; @@ -4337,6 +4364,7 @@ self: super: { "hsx2hs" = dontDistribute super."hsx2hs"; "hsyscall" = dontDistribute super."hsyscall"; "hszephyr" = dontDistribute super."hszephyr"; + "htaglib" = dontDistribute super."htaglib"; "htags" = dontDistribute super."htags"; "htar" = dontDistribute super."htar"; "htiled" = dontDistribute super."htiled"; @@ -4759,6 +4787,7 @@ self: super: { "keera-hails-reactive-polling" = dontDistribute super."keera-hails-reactive-polling"; "keera-hails-reactive-wx" = dontDistribute super."keera-hails-reactive-wx"; "keera-hails-reactive-yampa" = dontDistribute super."keera-hails-reactive-yampa"; + "keera-hails-reactivelenses" = dontDistribute super."keera-hails-reactivelenses"; "keera-hails-reactivevalues" = dontDistribute super."keera-hails-reactivevalues"; "keera-posture" = dontDistribute super."keera-posture"; "keiretsu" = dontDistribute super."keiretsu"; @@ -4880,6 +4909,8 @@ self: super: { "lat" = dontDistribute super."lat"; "latest-npm-version" = dontDistribute super."latest-npm-version"; "latex" = dontDistribute super."latex"; + "latex-formulae-image" = dontDistribute super."latex-formulae-image"; + "latex-formulae-pandoc" = dontDistribute super."latex-formulae-pandoc"; "lattices" = doDistribute super."lattices_1_2_1_1"; "launchpad-control" = dontDistribute super."launchpad-control"; "lax" = dontDistribute super."lax"; @@ -5238,6 +5269,7 @@ self: super: { "memexml" = dontDistribute super."memexml"; "memo-ptr" = dontDistribute super."memo-ptr"; "memo-sqlite" = dontDistribute super."memo-sqlite"; + "memoization-utils" = dontDistribute super."memoization-utils"; "memoize" = dontDistribute super."memoize"; "memory" = doDistribute super."memory_0_7"; "memscript" = dontDistribute super."memscript"; @@ -5659,6 +5691,7 @@ self: super: { "nthable" = dontDistribute super."nthable"; "ntp-control" = dontDistribute super."ntp-control"; "null-canvas" = dontDistribute super."null-canvas"; + "nullary" = dontDistribute super."nullary"; "number" = dontDistribute super."number"; "numbering" = dontDistribute super."numbering"; "numerals" = dontDistribute super."numerals"; @@ -5881,6 +5914,7 @@ self: super: { "pcg-random" = dontDistribute super."pcg-random"; "pcre-heavy" = doDistribute super."pcre-heavy_0_2_2"; "pcre-less" = dontDistribute super."pcre-less"; + "pcre-light" = doDistribute super."pcre-light_0_4_0_3"; "pcre-light-extra" = dontDistribute super."pcre-light-extra"; "pcre-utils" = dontDistribute super."pcre-utils"; "pdf-toolbox-content" = dontDistribute super."pdf-toolbox-content"; @@ -6249,6 +6283,7 @@ self: super: { "qc-oi-testgenerator" = dontDistribute super."qc-oi-testgenerator"; "qd" = dontDistribute super."qd"; "qd-vec" = dontDistribute super."qd-vec"; + "qed" = dontDistribute super."qed"; "qhull-simple" = dontDistribute super."qhull-simple"; "qrcode" = dontDistribute super."qrcode"; "qt" = dontDistribute super."qt"; @@ -6263,6 +6298,7 @@ self: super: { "queue" = dontDistribute super."queue"; "queuelike" = dontDistribute super."queuelike"; "quick-generator" = dontDistribute super."quick-generator"; + "quick-schema" = dontDistribute super."quick-schema"; "quickcheck-io" = doDistribute super."quickcheck-io_0_1_1"; "quickcheck-poly" = dontDistribute super."quickcheck-poly"; "quickcheck-properties" = dontDistribute super."quickcheck-properties"; @@ -6752,6 +6788,7 @@ self: super: { "servant" = doDistribute super."servant_0_2_2"; "servant-JuicyPixels" = dontDistribute super."servant-JuicyPixels"; "servant-blaze" = dontDistribute super."servant-blaze"; + "servant-cassava" = dontDistribute super."servant-cassava"; "servant-client" = doDistribute super."servant-client_0_2_2"; "servant-docs" = doDistribute super."servant-docs_0_3_1"; "servant-ede" = dontDistribute super."servant-ede"; @@ -6765,6 +6802,7 @@ self: super: { "servant-response" = dontDistribute super."servant-response"; "servant-scotty" = dontDistribute super."servant-scotty"; "servant-server" = doDistribute super."servant-server_0_2_4"; + "servant-swagger" = dontDistribute super."servant-swagger"; "servant-yaml" = dontDistribute super."servant-yaml"; "serversession" = dontDistribute super."serversession"; "serversession-backend-acid-state" = dontDistribute super."serversession-backend-acid-state"; @@ -7385,6 +7423,7 @@ self: super: { "tensor" = dontDistribute super."tensor"; "term-rewriting" = dontDistribute super."term-rewriting"; "termbox-bindings" = dontDistribute super."termbox-bindings"; + "terminal-size" = doDistribute super."terminal-size_0_3_2"; "termination-combinators" = dontDistribute super."termination-combinators"; "terminfo-hs" = dontDistribute super."terminfo-hs"; "terrahs" = dontDistribute super."terrahs"; @@ -7918,6 +7957,7 @@ self: super: { "verdict" = dontDistribute super."verdict"; "verdict-json" = dontDistribute super."verdict-json"; "verilog" = dontDistribute super."verilog"; + "versions" = dontDistribute super."versions"; "vhdl" = dontDistribute super."vhdl"; "views" = dontDistribute super."views"; "vigilance" = dontDistribute super."vigilance"; @@ -8352,6 +8392,7 @@ self: super: { "zendesk-api" = dontDistribute super."zendesk-api"; "zeno" = dontDistribute super."zeno"; "zero" = dontDistribute super."zero"; + "zerobin" = dontDistribute super."zerobin"; "zeromq-haskell" = dontDistribute super."zeromq-haskell"; "zeromq3-conduit" = dontDistribute super."zeromq3-conduit"; "zeromq3-haskell" = dontDistribute super."zeromq3-haskell"; diff --git a/pkgs/development/haskell-modules/configuration-lts-2.19.nix b/pkgs/development/haskell-modules/configuration-lts-2.19.nix index b5ab0d2b80b8..dbd1ab0fe5f9 100644 --- a/pkgs/development/haskell-modules/configuration-lts-2.19.nix +++ b/pkgs/development/haskell-modules/configuration-lts-2.19.nix @@ -504,6 +504,7 @@ self: super: { "HasGP" = dontDistribute super."HasGP"; "Haschoo" = dontDistribute super."Haschoo"; "Hashell" = dontDistribute super."Hashell"; + "HaskRel" = dontDistribute super."HaskRel"; "HaskellForMaths" = dontDistribute super."HaskellForMaths"; "HaskellLM" = dontDistribute super."HaskellLM"; "HaskellNN" = dontDistribute super."HaskellNN"; @@ -548,6 +549,7 @@ self: super: { "Hsed" = dontDistribute super."Hsed"; "Hsmtlib" = dontDistribute super."Hsmtlib"; "HueAPI" = dontDistribute super."HueAPI"; + "HulkImport" = dontDistribute super."HulkImport"; "Hungarian-Munkres" = dontDistribute super."Hungarian-Munkres"; "IDynamic" = dontDistribute super."IDynamic"; "IFS" = dontDistribute super."IFS"; @@ -1142,6 +1144,7 @@ self: super: { "afis" = dontDistribute super."afis"; "afv" = dontDistribute super."afv"; "agda-server" = dontDistribute super."agda-server"; + "agda-snippets" = dontDistribute super."agda-snippets"; "agentx" = dontDistribute super."agentx"; "agum" = dontDistribute super."agum"; "aig" = dontDistribute super."aig"; @@ -1942,6 +1945,7 @@ self: super: { "cio" = dontDistribute super."cio"; "cipher-aes128" = doDistribute super."cipher-aes128_0_6_4"; "cipher-rc5" = dontDistribute super."cipher-rc5"; + "ciphersaber2" = dontDistribute super."ciphersaber2"; "circ" = dontDistribute super."circ"; "cirru-parser" = dontDistribute super."cirru-parser"; "citation-resolve" = dontDistribute super."citation-resolve"; @@ -2392,6 +2396,7 @@ self: super: { "dataflow" = dontDistribute super."dataflow"; "datalog" = dontDistribute super."datalog"; "datapacker" = dontDistribute super."datapacker"; + "dataurl" = dontDistribute super."dataurl"; "date-cache" = dontDistribute super."date-cache"; "dates" = dontDistribute super."dates"; "datetime" = dontDistribute super."datetime"; @@ -2579,6 +2584,7 @@ self: super: { "distributed-process-task" = doDistribute super."distributed-process-task_0_1_1"; "distributed-process-tests" = dontDistribute super."distributed-process-tests"; "distributed-process-zookeeper" = dontDistribute super."distributed-process-zookeeper"; + "distributed-static" = doDistribute super."distributed-static_0_3_2_0"; "distribution" = dontDistribute super."distribution"; "distribution-plot" = dontDistribute super."distribution-plot"; "diversity" = dontDistribute super."diversity"; @@ -2795,6 +2801,7 @@ self: super: { "eros-client" = dontDistribute super."eros-client"; "eros-http" = dontDistribute super."eros-http"; "errno" = dontDistribute super."errno"; + "error-analyze" = dontDistribute super."error-analyze"; "error-continuations" = dontDistribute super."error-continuations"; "error-list" = dontDistribute super."error-list"; "error-loc" = dontDistribute super."error-loc"; @@ -2847,6 +2854,7 @@ self: super: { "exinst-deepseq" = dontDistribute super."exinst-deepseq"; "exinst-hashable" = dontDistribute super."exinst-hashable"; "exists" = dontDistribute super."exists"; + "exit-codes" = dontDistribute super."exit-codes"; "exp-pairs" = dontDistribute super."exp-pairs"; "expand" = dontDistribute super."expand"; "expat-enumerator" = dontDistribute super."expat-enumerator"; @@ -2963,6 +2971,7 @@ self: super: { "fingertree-psqueue" = dontDistribute super."fingertree-psqueue"; "fingertree-tf" = dontDistribute super."fingertree-tf"; "finite-field" = dontDistribute super."finite-field"; + "finite-typelits" = dontDistribute super."finite-typelits"; "first-and-last" = dontDistribute super."first-and-last"; "first-class-patterns" = dontDistribute super."first-class-patterns"; "firstify" = dontDistribute super."firstify"; @@ -3243,6 +3252,20 @@ self: super: { "ghclive" = dontDistribute super."ghclive"; "ghczdecode" = dontDistribute super."ghczdecode"; "ght" = dontDistribute super."ght"; + "gi-atk" = dontDistribute super."gi-atk"; + "gi-cairo" = dontDistribute super."gi-cairo"; + "gi-gdk" = dontDistribute super."gi-gdk"; + "gi-gdkpixbuf" = dontDistribute super."gi-gdkpixbuf"; + "gi-gio" = dontDistribute super."gi-gio"; + "gi-glib" = dontDistribute super."gi-glib"; + "gi-gobject" = dontDistribute super."gi-gobject"; + "gi-gtk" = dontDistribute super."gi-gtk"; + "gi-javascriptcore" = dontDistribute super."gi-javascriptcore"; + "gi-notify" = dontDistribute super."gi-notify"; + "gi-pango" = dontDistribute super."gi-pango"; + "gi-soup" = dontDistribute super."gi-soup"; + "gi-vte" = dontDistribute super."gi-vte"; + "gi-webkit" = dontDistribute super."gi-webkit"; "gimlh" = dontDistribute super."gimlh"; "ginger" = dontDistribute super."ginger"; "ginsu" = dontDistribute super."ginsu"; @@ -3254,6 +3277,7 @@ self: super: { "git-date" = dontDistribute super."git-date"; "git-freq" = dontDistribute super."git-freq"; "git-gpush" = dontDistribute super."git-gpush"; + "git-jump" = dontDistribute super."git-jump"; "git-monitor" = dontDistribute super."git-monitor"; "git-object" = dontDistribute super."git-object"; "git-repair" = dontDistribute super."git-repair"; @@ -3726,6 +3750,8 @@ self: super: { "haskell-formatter" = dontDistribute super."haskell-formatter"; "haskell-ftp" = dontDistribute super."haskell-ftp"; "haskell-generate" = dontDistribute super."haskell-generate"; + "haskell-gi" = dontDistribute super."haskell-gi"; + "haskell-gi-base" = dontDistribute super."haskell-gi-base"; "haskell-import-graph" = dontDistribute super."haskell-import-graph"; "haskell-in-space" = dontDistribute super."haskell-in-space"; "haskell-modbus" = dontDistribute super."haskell-modbus"; @@ -3924,6 +3950,7 @@ self: super: { "hfann" = dontDistribute super."hfann"; "hfd" = dontDistribute super."hfd"; "hfiar" = dontDistribute super."hfiar"; + "hfmt" = dontDistribute super."hfmt"; "hfoil" = dontDistribute super."hfoil"; "hfov" = dontDistribute super."hfov"; "hfractal" = dontDistribute super."hfractal"; @@ -4336,6 +4363,7 @@ self: super: { "hsx2hs" = dontDistribute super."hsx2hs"; "hsyscall" = dontDistribute super."hsyscall"; "hszephyr" = dontDistribute super."hszephyr"; + "htaglib" = dontDistribute super."htaglib"; "htags" = dontDistribute super."htags"; "htar" = dontDistribute super."htar"; "htiled" = dontDistribute super."htiled"; @@ -4758,6 +4786,7 @@ self: super: { "keera-hails-reactive-polling" = dontDistribute super."keera-hails-reactive-polling"; "keera-hails-reactive-wx" = dontDistribute super."keera-hails-reactive-wx"; "keera-hails-reactive-yampa" = dontDistribute super."keera-hails-reactive-yampa"; + "keera-hails-reactivelenses" = dontDistribute super."keera-hails-reactivelenses"; "keera-hails-reactivevalues" = dontDistribute super."keera-hails-reactivevalues"; "keera-posture" = dontDistribute super."keera-posture"; "keiretsu" = dontDistribute super."keiretsu"; @@ -4879,6 +4908,8 @@ self: super: { "lat" = dontDistribute super."lat"; "latest-npm-version" = dontDistribute super."latest-npm-version"; "latex" = dontDistribute super."latex"; + "latex-formulae-image" = dontDistribute super."latex-formulae-image"; + "latex-formulae-pandoc" = dontDistribute super."latex-formulae-pandoc"; "lattices" = doDistribute super."lattices_1_2_1_1"; "launchpad-control" = dontDistribute super."launchpad-control"; "lax" = dontDistribute super."lax"; @@ -5236,6 +5267,7 @@ self: super: { "memexml" = dontDistribute super."memexml"; "memo-ptr" = dontDistribute super."memo-ptr"; "memo-sqlite" = dontDistribute super."memo-sqlite"; + "memoization-utils" = dontDistribute super."memoization-utils"; "memoize" = dontDistribute super."memoize"; "memory" = doDistribute super."memory_0_7"; "memscript" = dontDistribute super."memscript"; @@ -5656,6 +5688,7 @@ self: super: { "nthable" = dontDistribute super."nthable"; "ntp-control" = dontDistribute super."ntp-control"; "null-canvas" = dontDistribute super."null-canvas"; + "nullary" = dontDistribute super."nullary"; "number" = dontDistribute super."number"; "numbering" = dontDistribute super."numbering"; "numerals" = dontDistribute super."numerals"; @@ -5878,6 +5911,7 @@ self: super: { "pcg-random" = dontDistribute super."pcg-random"; "pcre-heavy" = doDistribute super."pcre-heavy_0_2_2"; "pcre-less" = dontDistribute super."pcre-less"; + "pcre-light" = doDistribute super."pcre-light_0_4_0_3"; "pcre-light-extra" = dontDistribute super."pcre-light-extra"; "pcre-utils" = dontDistribute super."pcre-utils"; "pdf-toolbox-content" = dontDistribute super."pdf-toolbox-content"; @@ -6246,6 +6280,7 @@ self: super: { "qc-oi-testgenerator" = dontDistribute super."qc-oi-testgenerator"; "qd" = dontDistribute super."qd"; "qd-vec" = dontDistribute super."qd-vec"; + "qed" = dontDistribute super."qed"; "qhull-simple" = dontDistribute super."qhull-simple"; "qrcode" = dontDistribute super."qrcode"; "qt" = dontDistribute super."qt"; @@ -6260,6 +6295,7 @@ self: super: { "queue" = dontDistribute super."queue"; "queuelike" = dontDistribute super."queuelike"; "quick-generator" = dontDistribute super."quick-generator"; + "quick-schema" = dontDistribute super."quick-schema"; "quickcheck-io" = doDistribute super."quickcheck-io_0_1_1"; "quickcheck-poly" = dontDistribute super."quickcheck-poly"; "quickcheck-properties" = dontDistribute super."quickcheck-properties"; @@ -6749,6 +6785,7 @@ self: super: { "servant" = doDistribute super."servant_0_2_2"; "servant-JuicyPixels" = dontDistribute super."servant-JuicyPixels"; "servant-blaze" = dontDistribute super."servant-blaze"; + "servant-cassava" = dontDistribute super."servant-cassava"; "servant-client" = doDistribute super."servant-client_0_2_2"; "servant-docs" = doDistribute super."servant-docs_0_3_1"; "servant-ede" = dontDistribute super."servant-ede"; @@ -6762,6 +6799,7 @@ self: super: { "servant-response" = dontDistribute super."servant-response"; "servant-scotty" = dontDistribute super."servant-scotty"; "servant-server" = doDistribute super."servant-server_0_2_4"; + "servant-swagger" = dontDistribute super."servant-swagger"; "servant-yaml" = dontDistribute super."servant-yaml"; "serversession" = dontDistribute super."serversession"; "serversession-backend-acid-state" = dontDistribute super."serversession-backend-acid-state"; @@ -7380,6 +7418,7 @@ self: super: { "tensor" = dontDistribute super."tensor"; "term-rewriting" = dontDistribute super."term-rewriting"; "termbox-bindings" = dontDistribute super."termbox-bindings"; + "terminal-size" = doDistribute super."terminal-size_0_3_2"; "termination-combinators" = dontDistribute super."termination-combinators"; "terminfo-hs" = dontDistribute super."terminfo-hs"; "terrahs" = dontDistribute super."terrahs"; @@ -7913,6 +7952,7 @@ self: super: { "verdict" = dontDistribute super."verdict"; "verdict-json" = dontDistribute super."verdict-json"; "verilog" = dontDistribute super."verilog"; + "versions" = dontDistribute super."versions"; "vhdl" = dontDistribute super."vhdl"; "views" = dontDistribute super."views"; "vigilance" = dontDistribute super."vigilance"; @@ -8346,6 +8386,7 @@ self: super: { "zendesk-api" = dontDistribute super."zendesk-api"; "zeno" = dontDistribute super."zeno"; "zero" = dontDistribute super."zero"; + "zerobin" = dontDistribute super."zerobin"; "zeromq-haskell" = dontDistribute super."zeromq-haskell"; "zeromq3-conduit" = dontDistribute super."zeromq3-conduit"; "zeromq3-haskell" = dontDistribute super."zeromq3-haskell"; diff --git a/pkgs/development/haskell-modules/configuration-lts-2.2.nix b/pkgs/development/haskell-modules/configuration-lts-2.2.nix index d54e986912a9..168b47648d53 100644 --- a/pkgs/development/haskell-modules/configuration-lts-2.2.nix +++ b/pkgs/development/haskell-modules/configuration-lts-2.2.nix @@ -507,6 +507,7 @@ self: super: { "HasGP" = dontDistribute super."HasGP"; "Haschoo" = dontDistribute super."Haschoo"; "Hashell" = dontDistribute super."Hashell"; + "HaskRel" = dontDistribute super."HaskRel"; "HaskellForMaths" = dontDistribute super."HaskellForMaths"; "HaskellLM" = dontDistribute super."HaskellLM"; "HaskellNN" = dontDistribute super."HaskellNN"; @@ -552,6 +553,7 @@ self: super: { "Hsed" = dontDistribute super."Hsed"; "Hsmtlib" = dontDistribute super."Hsmtlib"; "HueAPI" = dontDistribute super."HueAPI"; + "HulkImport" = dontDistribute super."HulkImport"; "Hungarian-Munkres" = dontDistribute super."Hungarian-Munkres"; "IDynamic" = dontDistribute super."IDynamic"; "IFS" = dontDistribute super."IFS"; @@ -1150,6 +1152,7 @@ self: super: { "afis" = dontDistribute super."afis"; "afv" = dontDistribute super."afv"; "agda-server" = dontDistribute super."agda-server"; + "agda-snippets" = dontDistribute super."agda-snippets"; "agentx" = dontDistribute super."agentx"; "agum" = dontDistribute super."agum"; "aig" = dontDistribute super."aig"; @@ -1963,6 +1966,7 @@ self: super: { "cipher-aes" = doDistribute super."cipher-aes_0_2_10"; "cipher-aes128" = doDistribute super."cipher-aes128_0_6_4"; "cipher-rc5" = dontDistribute super."cipher-rc5"; + "ciphersaber2" = dontDistribute super."ciphersaber2"; "circ" = dontDistribute super."circ"; "cirru-parser" = dontDistribute super."cirru-parser"; "citation-resolve" = dontDistribute super."citation-resolve"; @@ -2417,6 +2421,7 @@ self: super: { "dataflow" = dontDistribute super."dataflow"; "datalog" = dontDistribute super."datalog"; "datapacker" = dontDistribute super."datapacker"; + "dataurl" = dontDistribute super."dataurl"; "date-cache" = dontDistribute super."date-cache"; "dates" = dontDistribute super."dates"; "datetime" = dontDistribute super."datetime"; @@ -2826,6 +2831,7 @@ self: super: { "eros-client" = dontDistribute super."eros-client"; "eros-http" = dontDistribute super."eros-http"; "errno" = dontDistribute super."errno"; + "error-analyze" = dontDistribute super."error-analyze"; "error-continuations" = dontDistribute super."error-continuations"; "error-list" = dontDistribute super."error-list"; "error-loc" = dontDistribute super."error-loc"; @@ -2879,6 +2885,7 @@ self: super: { "exinst-deepseq" = dontDistribute super."exinst-deepseq"; "exinst-hashable" = dontDistribute super."exinst-hashable"; "exists" = dontDistribute super."exists"; + "exit-codes" = dontDistribute super."exit-codes"; "exp-pairs" = dontDistribute super."exp-pairs"; "expand" = dontDistribute super."expand"; "expat-enumerator" = dontDistribute super."expat-enumerator"; @@ -3000,6 +3007,7 @@ self: super: { "fingertree-psqueue" = dontDistribute super."fingertree-psqueue"; "fingertree-tf" = dontDistribute super."fingertree-tf"; "finite-field" = dontDistribute super."finite-field"; + "finite-typelits" = dontDistribute super."finite-typelits"; "first-and-last" = dontDistribute super."first-and-last"; "first-class-patterns" = dontDistribute super."first-class-patterns"; "firstify" = dontDistribute super."firstify"; @@ -3285,6 +3293,20 @@ self: super: { "ghclive" = dontDistribute super."ghclive"; "ghczdecode" = dontDistribute super."ghczdecode"; "ght" = dontDistribute super."ght"; + "gi-atk" = dontDistribute super."gi-atk"; + "gi-cairo" = dontDistribute super."gi-cairo"; + "gi-gdk" = dontDistribute super."gi-gdk"; + "gi-gdkpixbuf" = dontDistribute super."gi-gdkpixbuf"; + "gi-gio" = dontDistribute super."gi-gio"; + "gi-glib" = dontDistribute super."gi-glib"; + "gi-gobject" = dontDistribute super."gi-gobject"; + "gi-gtk" = dontDistribute super."gi-gtk"; + "gi-javascriptcore" = dontDistribute super."gi-javascriptcore"; + "gi-notify" = dontDistribute super."gi-notify"; + "gi-pango" = dontDistribute super."gi-pango"; + "gi-soup" = dontDistribute super."gi-soup"; + "gi-vte" = dontDistribute super."gi-vte"; + "gi-webkit" = dontDistribute super."gi-webkit"; "gimlh" = dontDistribute super."gimlh"; "ginger" = dontDistribute super."ginger"; "ginsu" = dontDistribute super."ginsu"; @@ -3296,6 +3318,7 @@ self: super: { "git-date" = dontDistribute super."git-date"; "git-freq" = dontDistribute super."git-freq"; "git-gpush" = dontDistribute super."git-gpush"; + "git-jump" = dontDistribute super."git-jump"; "git-monitor" = dontDistribute super."git-monitor"; "git-object" = dontDistribute super."git-object"; "git-repair" = dontDistribute super."git-repair"; @@ -3775,6 +3798,8 @@ self: super: { "haskell-formatter" = dontDistribute super."haskell-formatter"; "haskell-ftp" = dontDistribute super."haskell-ftp"; "haskell-generate" = dontDistribute super."haskell-generate"; + "haskell-gi" = dontDistribute super."haskell-gi"; + "haskell-gi-base" = dontDistribute super."haskell-gi-base"; "haskell-import-graph" = dontDistribute super."haskell-import-graph"; "haskell-in-space" = dontDistribute super."haskell-in-space"; "haskell-modbus" = dontDistribute super."haskell-modbus"; @@ -3976,6 +4001,7 @@ self: super: { "hfann" = dontDistribute super."hfann"; "hfd" = dontDistribute super."hfd"; "hfiar" = dontDistribute super."hfiar"; + "hfmt" = dontDistribute super."hfmt"; "hfoil" = dontDistribute super."hfoil"; "hfov" = dontDistribute super."hfov"; "hfractal" = dontDistribute super."hfractal"; @@ -4392,6 +4418,7 @@ self: super: { "hsx2hs" = dontDistribute super."hsx2hs"; "hsyscall" = dontDistribute super."hsyscall"; "hszephyr" = dontDistribute super."hszephyr"; + "htaglib" = dontDistribute super."htaglib"; "htags" = dontDistribute super."htags"; "htar" = dontDistribute super."htar"; "htiled" = dontDistribute super."htiled"; @@ -4823,6 +4850,7 @@ self: super: { "keera-hails-reactive-polling" = dontDistribute super."keera-hails-reactive-polling"; "keera-hails-reactive-wx" = dontDistribute super."keera-hails-reactive-wx"; "keera-hails-reactive-yampa" = dontDistribute super."keera-hails-reactive-yampa"; + "keera-hails-reactivelenses" = dontDistribute super."keera-hails-reactivelenses"; "keera-hails-reactivevalues" = dontDistribute super."keera-hails-reactivevalues"; "keera-posture" = dontDistribute super."keera-posture"; "keiretsu" = dontDistribute super."keiretsu"; @@ -4945,6 +4973,8 @@ self: super: { "lat" = dontDistribute super."lat"; "latest-npm-version" = dontDistribute super."latest-npm-version"; "latex" = dontDistribute super."latex"; + "latex-formulae-image" = dontDistribute super."latex-formulae-image"; + "latex-formulae-pandoc" = dontDistribute super."latex-formulae-pandoc"; "lattices" = doDistribute super."lattices_1_2_1_1"; "launchpad-control" = dontDistribute super."launchpad-control"; "lax" = dontDistribute super."lax"; @@ -5312,6 +5342,7 @@ self: super: { "memexml" = dontDistribute super."memexml"; "memo-ptr" = dontDistribute super."memo-ptr"; "memo-sqlite" = dontDistribute super."memo-sqlite"; + "memoization-utils" = dontDistribute super."memoization-utils"; "memoize" = dontDistribute super."memoize"; "memory" = dontDistribute super."memory"; "memscript" = dontDistribute super."memscript"; @@ -5741,6 +5772,7 @@ self: super: { "nthable" = dontDistribute super."nthable"; "ntp-control" = dontDistribute super."ntp-control"; "null-canvas" = dontDistribute super."null-canvas"; + "nullary" = dontDistribute super."nullary"; "number" = dontDistribute super."number"; "numbering" = dontDistribute super."numbering"; "numerals" = dontDistribute super."numerals"; @@ -5965,6 +5997,7 @@ self: super: { "pcg-random" = dontDistribute super."pcg-random"; "pcre-heavy" = doDistribute super."pcre-heavy_0_2_2"; "pcre-less" = dontDistribute super."pcre-less"; + "pcre-light" = doDistribute super."pcre-light_0_4_0_3"; "pcre-light-extra" = dontDistribute super."pcre-light-extra"; "pcre-utils" = dontDistribute super."pcre-utils"; "pdf-toolbox-content" = dontDistribute super."pdf-toolbox-content"; @@ -6339,6 +6372,7 @@ self: super: { "qc-oi-testgenerator" = dontDistribute super."qc-oi-testgenerator"; "qd" = dontDistribute super."qd"; "qd-vec" = dontDistribute super."qd-vec"; + "qed" = dontDistribute super."qed"; "qhull-simple" = dontDistribute super."qhull-simple"; "qrcode" = dontDistribute super."qrcode"; "qt" = dontDistribute super."qt"; @@ -6354,6 +6388,7 @@ self: super: { "queue" = dontDistribute super."queue"; "queuelike" = dontDistribute super."queuelike"; "quick-generator" = dontDistribute super."quick-generator"; + "quick-schema" = dontDistribute super."quick-schema"; "quickcheck-io" = doDistribute super."quickcheck-io_0_1_1"; "quickcheck-poly" = dontDistribute super."quickcheck-poly"; "quickcheck-properties" = dontDistribute super."quickcheck-properties"; @@ -6849,6 +6884,7 @@ self: super: { "servant" = doDistribute super."servant_0_2_2"; "servant-JuicyPixels" = dontDistribute super."servant-JuicyPixels"; "servant-blaze" = dontDistribute super."servant-blaze"; + "servant-cassava" = dontDistribute super."servant-cassava"; "servant-client" = doDistribute super."servant-client_0_2_2"; "servant-docs" = doDistribute super."servant-docs_0_3_1"; "servant-ede" = dontDistribute super."servant-ede"; @@ -6862,6 +6898,7 @@ self: super: { "servant-response" = dontDistribute super."servant-response"; "servant-scotty" = dontDistribute super."servant-scotty"; "servant-server" = doDistribute super."servant-server_0_2_4"; + "servant-swagger" = dontDistribute super."servant-swagger"; "servant-yaml" = dontDistribute super."servant-yaml"; "serversession" = dontDistribute super."serversession"; "serversession-backend-acid-state" = dontDistribute super."serversession-backend-acid-state"; @@ -8034,6 +8071,7 @@ self: super: { "verdict" = dontDistribute super."verdict"; "verdict-json" = dontDistribute super."verdict-json"; "verilog" = dontDistribute super."verilog"; + "versions" = dontDistribute super."versions"; "vhdl" = dontDistribute super."vhdl"; "views" = dontDistribute super."views"; "vigilance" = dontDistribute super."vigilance"; @@ -8478,6 +8516,7 @@ self: super: { "zendesk-api" = dontDistribute super."zendesk-api"; "zeno" = dontDistribute super."zeno"; "zero" = dontDistribute super."zero"; + "zerobin" = dontDistribute super."zerobin"; "zeromq-haskell" = dontDistribute super."zeromq-haskell"; "zeromq3-conduit" = dontDistribute super."zeromq3-conduit"; "zeromq3-haskell" = dontDistribute super."zeromq3-haskell"; diff --git a/pkgs/development/haskell-modules/configuration-lts-2.20.nix b/pkgs/development/haskell-modules/configuration-lts-2.20.nix index c1d50e7d44b9..b68cc275df3a 100644 --- a/pkgs/development/haskell-modules/configuration-lts-2.20.nix +++ b/pkgs/development/haskell-modules/configuration-lts-2.20.nix @@ -504,6 +504,7 @@ self: super: { "HasGP" = dontDistribute super."HasGP"; "Haschoo" = dontDistribute super."Haschoo"; "Hashell" = dontDistribute super."Hashell"; + "HaskRel" = dontDistribute super."HaskRel"; "HaskellForMaths" = dontDistribute super."HaskellForMaths"; "HaskellLM" = dontDistribute super."HaskellLM"; "HaskellNN" = dontDistribute super."HaskellNN"; @@ -548,6 +549,7 @@ self: super: { "Hsed" = dontDistribute super."Hsed"; "Hsmtlib" = dontDistribute super."Hsmtlib"; "HueAPI" = dontDistribute super."HueAPI"; + "HulkImport" = dontDistribute super."HulkImport"; "Hungarian-Munkres" = dontDistribute super."Hungarian-Munkres"; "IDynamic" = dontDistribute super."IDynamic"; "IFS" = dontDistribute super."IFS"; @@ -1142,6 +1144,7 @@ self: super: { "afis" = dontDistribute super."afis"; "afv" = dontDistribute super."afv"; "agda-server" = dontDistribute super."agda-server"; + "agda-snippets" = dontDistribute super."agda-snippets"; "agentx" = dontDistribute super."agentx"; "agum" = dontDistribute super."agum"; "aig" = dontDistribute super."aig"; @@ -1942,6 +1945,7 @@ self: super: { "cio" = dontDistribute super."cio"; "cipher-aes128" = doDistribute super."cipher-aes128_0_6_4"; "cipher-rc5" = dontDistribute super."cipher-rc5"; + "ciphersaber2" = dontDistribute super."ciphersaber2"; "circ" = dontDistribute super."circ"; "cirru-parser" = dontDistribute super."cirru-parser"; "citation-resolve" = dontDistribute super."citation-resolve"; @@ -2390,6 +2394,7 @@ self: super: { "dataflow" = dontDistribute super."dataflow"; "datalog" = dontDistribute super."datalog"; "datapacker" = dontDistribute super."datapacker"; + "dataurl" = dontDistribute super."dataurl"; "date-cache" = dontDistribute super."date-cache"; "dates" = dontDistribute super."dates"; "datetime" = dontDistribute super."datetime"; @@ -2577,6 +2582,7 @@ self: super: { "distributed-process-task" = doDistribute super."distributed-process-task_0_1_1"; "distributed-process-tests" = dontDistribute super."distributed-process-tests"; "distributed-process-zookeeper" = dontDistribute super."distributed-process-zookeeper"; + "distributed-static" = doDistribute super."distributed-static_0_3_2_0"; "distribution" = dontDistribute super."distribution"; "distribution-plot" = dontDistribute super."distribution-plot"; "diversity" = dontDistribute super."diversity"; @@ -2793,6 +2799,7 @@ self: super: { "eros-client" = dontDistribute super."eros-client"; "eros-http" = dontDistribute super."eros-http"; "errno" = dontDistribute super."errno"; + "error-analyze" = dontDistribute super."error-analyze"; "error-continuations" = dontDistribute super."error-continuations"; "error-list" = dontDistribute super."error-list"; "error-loc" = dontDistribute super."error-loc"; @@ -2845,6 +2852,7 @@ self: super: { "exinst-deepseq" = dontDistribute super."exinst-deepseq"; "exinst-hashable" = dontDistribute super."exinst-hashable"; "exists" = dontDistribute super."exists"; + "exit-codes" = dontDistribute super."exit-codes"; "exp-pairs" = dontDistribute super."exp-pairs"; "expand" = dontDistribute super."expand"; "expat-enumerator" = dontDistribute super."expat-enumerator"; @@ -2960,6 +2968,7 @@ self: super: { "fingertree-psqueue" = dontDistribute super."fingertree-psqueue"; "fingertree-tf" = dontDistribute super."fingertree-tf"; "finite-field" = dontDistribute super."finite-field"; + "finite-typelits" = dontDistribute super."finite-typelits"; "first-and-last" = dontDistribute super."first-and-last"; "first-class-patterns" = dontDistribute super."first-class-patterns"; "firstify" = dontDistribute super."firstify"; @@ -3240,6 +3249,20 @@ self: super: { "ghclive" = dontDistribute super."ghclive"; "ghczdecode" = dontDistribute super."ghczdecode"; "ght" = dontDistribute super."ght"; + "gi-atk" = dontDistribute super."gi-atk"; + "gi-cairo" = dontDistribute super."gi-cairo"; + "gi-gdk" = dontDistribute super."gi-gdk"; + "gi-gdkpixbuf" = dontDistribute super."gi-gdkpixbuf"; + "gi-gio" = dontDistribute super."gi-gio"; + "gi-glib" = dontDistribute super."gi-glib"; + "gi-gobject" = dontDistribute super."gi-gobject"; + "gi-gtk" = dontDistribute super."gi-gtk"; + "gi-javascriptcore" = dontDistribute super."gi-javascriptcore"; + "gi-notify" = dontDistribute super."gi-notify"; + "gi-pango" = dontDistribute super."gi-pango"; + "gi-soup" = dontDistribute super."gi-soup"; + "gi-vte" = dontDistribute super."gi-vte"; + "gi-webkit" = dontDistribute super."gi-webkit"; "gimlh" = dontDistribute super."gimlh"; "ginger" = dontDistribute super."ginger"; "ginsu" = dontDistribute super."ginsu"; @@ -3251,6 +3274,7 @@ self: super: { "git-date" = dontDistribute super."git-date"; "git-freq" = dontDistribute super."git-freq"; "git-gpush" = dontDistribute super."git-gpush"; + "git-jump" = dontDistribute super."git-jump"; "git-monitor" = dontDistribute super."git-monitor"; "git-object" = dontDistribute super."git-object"; "git-repair" = dontDistribute super."git-repair"; @@ -3722,6 +3746,8 @@ self: super: { "haskell-formatter" = dontDistribute super."haskell-formatter"; "haskell-ftp" = dontDistribute super."haskell-ftp"; "haskell-generate" = dontDistribute super."haskell-generate"; + "haskell-gi" = dontDistribute super."haskell-gi"; + "haskell-gi-base" = dontDistribute super."haskell-gi-base"; "haskell-import-graph" = dontDistribute super."haskell-import-graph"; "haskell-in-space" = dontDistribute super."haskell-in-space"; "haskell-modbus" = dontDistribute super."haskell-modbus"; @@ -3920,6 +3946,7 @@ self: super: { "hfann" = dontDistribute super."hfann"; "hfd" = dontDistribute super."hfd"; "hfiar" = dontDistribute super."hfiar"; + "hfmt" = dontDistribute super."hfmt"; "hfoil" = dontDistribute super."hfoil"; "hfov" = dontDistribute super."hfov"; "hfractal" = dontDistribute super."hfractal"; @@ -4332,6 +4359,7 @@ self: super: { "hsx2hs" = dontDistribute super."hsx2hs"; "hsyscall" = dontDistribute super."hsyscall"; "hszephyr" = dontDistribute super."hszephyr"; + "htaglib" = dontDistribute super."htaglib"; "htags" = dontDistribute super."htags"; "htar" = dontDistribute super."htar"; "htiled" = dontDistribute super."htiled"; @@ -4754,6 +4782,7 @@ self: super: { "keera-hails-reactive-polling" = dontDistribute super."keera-hails-reactive-polling"; "keera-hails-reactive-wx" = dontDistribute super."keera-hails-reactive-wx"; "keera-hails-reactive-yampa" = dontDistribute super."keera-hails-reactive-yampa"; + "keera-hails-reactivelenses" = dontDistribute super."keera-hails-reactivelenses"; "keera-hails-reactivevalues" = dontDistribute super."keera-hails-reactivevalues"; "keera-posture" = dontDistribute super."keera-posture"; "keiretsu" = dontDistribute super."keiretsu"; @@ -4875,6 +4904,8 @@ self: super: { "lat" = dontDistribute super."lat"; "latest-npm-version" = dontDistribute super."latest-npm-version"; "latex" = dontDistribute super."latex"; + "latex-formulae-image" = dontDistribute super."latex-formulae-image"; + "latex-formulae-pandoc" = dontDistribute super."latex-formulae-pandoc"; "lattices" = doDistribute super."lattices_1_2_1_1"; "launchpad-control" = dontDistribute super."launchpad-control"; "lax" = dontDistribute super."lax"; @@ -5232,6 +5263,7 @@ self: super: { "memexml" = dontDistribute super."memexml"; "memo-ptr" = dontDistribute super."memo-ptr"; "memo-sqlite" = dontDistribute super."memo-sqlite"; + "memoization-utils" = dontDistribute super."memoization-utils"; "memoize" = dontDistribute super."memoize"; "memory" = doDistribute super."memory_0_7"; "memscript" = dontDistribute super."memscript"; @@ -5652,6 +5684,7 @@ self: super: { "nthable" = dontDistribute super."nthable"; "ntp-control" = dontDistribute super."ntp-control"; "null-canvas" = dontDistribute super."null-canvas"; + "nullary" = dontDistribute super."nullary"; "number" = dontDistribute super."number"; "numbering" = dontDistribute super."numbering"; "numerals" = dontDistribute super."numerals"; @@ -5874,6 +5907,7 @@ self: super: { "pcg-random" = dontDistribute super."pcg-random"; "pcre-heavy" = doDistribute super."pcre-heavy_0_2_2"; "pcre-less" = dontDistribute super."pcre-less"; + "pcre-light" = doDistribute super."pcre-light_0_4_0_3"; "pcre-light-extra" = dontDistribute super."pcre-light-extra"; "pcre-utils" = dontDistribute super."pcre-utils"; "pdf-toolbox-content" = dontDistribute super."pdf-toolbox-content"; @@ -6241,6 +6275,7 @@ self: super: { "qc-oi-testgenerator" = dontDistribute super."qc-oi-testgenerator"; "qd" = dontDistribute super."qd"; "qd-vec" = dontDistribute super."qd-vec"; + "qed" = dontDistribute super."qed"; "qhull-simple" = dontDistribute super."qhull-simple"; "qrcode" = dontDistribute super."qrcode"; "qt" = dontDistribute super."qt"; @@ -6255,6 +6290,7 @@ self: super: { "queue" = dontDistribute super."queue"; "queuelike" = dontDistribute super."queuelike"; "quick-generator" = dontDistribute super."quick-generator"; + "quick-schema" = dontDistribute super."quick-schema"; "quickcheck-io" = doDistribute super."quickcheck-io_0_1_1"; "quickcheck-poly" = dontDistribute super."quickcheck-poly"; "quickcheck-properties" = dontDistribute super."quickcheck-properties"; @@ -6744,6 +6780,7 @@ self: super: { "servant" = doDistribute super."servant_0_2_2"; "servant-JuicyPixels" = dontDistribute super."servant-JuicyPixels"; "servant-blaze" = dontDistribute super."servant-blaze"; + "servant-cassava" = dontDistribute super."servant-cassava"; "servant-client" = doDistribute super."servant-client_0_2_2"; "servant-docs" = doDistribute super."servant-docs_0_3_1"; "servant-ede" = dontDistribute super."servant-ede"; @@ -6757,6 +6794,7 @@ self: super: { "servant-response" = dontDistribute super."servant-response"; "servant-scotty" = dontDistribute super."servant-scotty"; "servant-server" = doDistribute super."servant-server_0_2_4"; + "servant-swagger" = dontDistribute super."servant-swagger"; "servant-yaml" = dontDistribute super."servant-yaml"; "serversession" = dontDistribute super."serversession"; "serversession-backend-acid-state" = dontDistribute super."serversession-backend-acid-state"; @@ -7374,6 +7412,7 @@ self: super: { "tensor" = dontDistribute super."tensor"; "term-rewriting" = dontDistribute super."term-rewriting"; "termbox-bindings" = dontDistribute super."termbox-bindings"; + "terminal-size" = doDistribute super."terminal-size_0_3_2"; "termination-combinators" = dontDistribute super."termination-combinators"; "terminfo-hs" = dontDistribute super."terminfo-hs"; "terrahs" = dontDistribute super."terrahs"; @@ -7907,6 +7946,7 @@ self: super: { "verdict" = dontDistribute super."verdict"; "verdict-json" = dontDistribute super."verdict-json"; "verilog" = dontDistribute super."verilog"; + "versions" = dontDistribute super."versions"; "vhdl" = dontDistribute super."vhdl"; "views" = dontDistribute super."views"; "vigilance" = dontDistribute super."vigilance"; @@ -8340,6 +8380,7 @@ self: super: { "zendesk-api" = dontDistribute super."zendesk-api"; "zeno" = dontDistribute super."zeno"; "zero" = dontDistribute super."zero"; + "zerobin" = dontDistribute super."zerobin"; "zeromq-haskell" = dontDistribute super."zeromq-haskell"; "zeromq3-conduit" = dontDistribute super."zeromq3-conduit"; "zeromq3-haskell" = dontDistribute super."zeromq3-haskell"; diff --git a/pkgs/development/haskell-modules/configuration-lts-2.21.nix b/pkgs/development/haskell-modules/configuration-lts-2.21.nix index 9703c38c837b..e808c657e59e 100644 --- a/pkgs/development/haskell-modules/configuration-lts-2.21.nix +++ b/pkgs/development/haskell-modules/configuration-lts-2.21.nix @@ -504,6 +504,7 @@ self: super: { "HasGP" = dontDistribute super."HasGP"; "Haschoo" = dontDistribute super."Haschoo"; "Hashell" = dontDistribute super."Hashell"; + "HaskRel" = dontDistribute super."HaskRel"; "HaskellForMaths" = dontDistribute super."HaskellForMaths"; "HaskellLM" = dontDistribute super."HaskellLM"; "HaskellNN" = dontDistribute super."HaskellNN"; @@ -548,6 +549,7 @@ self: super: { "Hsed" = dontDistribute super."Hsed"; "Hsmtlib" = dontDistribute super."Hsmtlib"; "HueAPI" = dontDistribute super."HueAPI"; + "HulkImport" = dontDistribute super."HulkImport"; "Hungarian-Munkres" = dontDistribute super."Hungarian-Munkres"; "IDynamic" = dontDistribute super."IDynamic"; "IFS" = dontDistribute super."IFS"; @@ -1142,6 +1144,7 @@ self: super: { "afis" = dontDistribute super."afis"; "afv" = dontDistribute super."afv"; "agda-server" = dontDistribute super."agda-server"; + "agda-snippets" = dontDistribute super."agda-snippets"; "agentx" = dontDistribute super."agentx"; "agum" = dontDistribute super."agum"; "aig" = dontDistribute super."aig"; @@ -1942,6 +1945,7 @@ self: super: { "cio" = dontDistribute super."cio"; "cipher-aes128" = doDistribute super."cipher-aes128_0_6_4"; "cipher-rc5" = dontDistribute super."cipher-rc5"; + "ciphersaber2" = dontDistribute super."ciphersaber2"; "circ" = dontDistribute super."circ"; "cirru-parser" = dontDistribute super."cirru-parser"; "citation-resolve" = dontDistribute super."citation-resolve"; @@ -2390,6 +2394,7 @@ self: super: { "dataflow" = dontDistribute super."dataflow"; "datalog" = dontDistribute super."datalog"; "datapacker" = dontDistribute super."datapacker"; + "dataurl" = dontDistribute super."dataurl"; "date-cache" = dontDistribute super."date-cache"; "dates" = dontDistribute super."dates"; "datetime" = dontDistribute super."datetime"; @@ -2577,6 +2582,7 @@ self: super: { "distributed-process-task" = doDistribute super."distributed-process-task_0_1_1"; "distributed-process-tests" = dontDistribute super."distributed-process-tests"; "distributed-process-zookeeper" = dontDistribute super."distributed-process-zookeeper"; + "distributed-static" = doDistribute super."distributed-static_0_3_2_0"; "distribution" = dontDistribute super."distribution"; "distribution-plot" = dontDistribute super."distribution-plot"; "diversity" = dontDistribute super."diversity"; @@ -2793,6 +2799,7 @@ self: super: { "eros-client" = dontDistribute super."eros-client"; "eros-http" = dontDistribute super."eros-http"; "errno" = dontDistribute super."errno"; + "error-analyze" = dontDistribute super."error-analyze"; "error-continuations" = dontDistribute super."error-continuations"; "error-list" = dontDistribute super."error-list"; "error-loc" = dontDistribute super."error-loc"; @@ -2845,6 +2852,7 @@ self: super: { "exinst-deepseq" = dontDistribute super."exinst-deepseq"; "exinst-hashable" = dontDistribute super."exinst-hashable"; "exists" = dontDistribute super."exists"; + "exit-codes" = dontDistribute super."exit-codes"; "exp-pairs" = dontDistribute super."exp-pairs"; "expand" = dontDistribute super."expand"; "expat-enumerator" = dontDistribute super."expat-enumerator"; @@ -2960,6 +2968,7 @@ self: super: { "fingertree-psqueue" = dontDistribute super."fingertree-psqueue"; "fingertree-tf" = dontDistribute super."fingertree-tf"; "finite-field" = dontDistribute super."finite-field"; + "finite-typelits" = dontDistribute super."finite-typelits"; "first-and-last" = dontDistribute super."first-and-last"; "first-class-patterns" = dontDistribute super."first-class-patterns"; "firstify" = dontDistribute super."firstify"; @@ -3240,6 +3249,20 @@ self: super: { "ghclive" = dontDistribute super."ghclive"; "ghczdecode" = dontDistribute super."ghczdecode"; "ght" = dontDistribute super."ght"; + "gi-atk" = dontDistribute super."gi-atk"; + "gi-cairo" = dontDistribute super."gi-cairo"; + "gi-gdk" = dontDistribute super."gi-gdk"; + "gi-gdkpixbuf" = dontDistribute super."gi-gdkpixbuf"; + "gi-gio" = dontDistribute super."gi-gio"; + "gi-glib" = dontDistribute super."gi-glib"; + "gi-gobject" = dontDistribute super."gi-gobject"; + "gi-gtk" = dontDistribute super."gi-gtk"; + "gi-javascriptcore" = dontDistribute super."gi-javascriptcore"; + "gi-notify" = dontDistribute super."gi-notify"; + "gi-pango" = dontDistribute super."gi-pango"; + "gi-soup" = dontDistribute super."gi-soup"; + "gi-vte" = dontDistribute super."gi-vte"; + "gi-webkit" = dontDistribute super."gi-webkit"; "gimlh" = dontDistribute super."gimlh"; "ginger" = dontDistribute super."ginger"; "ginsu" = dontDistribute super."ginsu"; @@ -3251,6 +3274,7 @@ self: super: { "git-date" = dontDistribute super."git-date"; "git-freq" = dontDistribute super."git-freq"; "git-gpush" = dontDistribute super."git-gpush"; + "git-jump" = dontDistribute super."git-jump"; "git-monitor" = dontDistribute super."git-monitor"; "git-object" = dontDistribute super."git-object"; "git-repair" = dontDistribute super."git-repair"; @@ -3721,6 +3745,8 @@ self: super: { "haskell-formatter" = dontDistribute super."haskell-formatter"; "haskell-ftp" = dontDistribute super."haskell-ftp"; "haskell-generate" = dontDistribute super."haskell-generate"; + "haskell-gi" = dontDistribute super."haskell-gi"; + "haskell-gi-base" = dontDistribute super."haskell-gi-base"; "haskell-import-graph" = dontDistribute super."haskell-import-graph"; "haskell-in-space" = dontDistribute super."haskell-in-space"; "haskell-modbus" = dontDistribute super."haskell-modbus"; @@ -3919,6 +3945,7 @@ self: super: { "hfann" = dontDistribute super."hfann"; "hfd" = dontDistribute super."hfd"; "hfiar" = dontDistribute super."hfiar"; + "hfmt" = dontDistribute super."hfmt"; "hfoil" = dontDistribute super."hfoil"; "hfov" = dontDistribute super."hfov"; "hfractal" = dontDistribute super."hfractal"; @@ -4331,6 +4358,7 @@ self: super: { "hsx2hs" = dontDistribute super."hsx2hs"; "hsyscall" = dontDistribute super."hsyscall"; "hszephyr" = dontDistribute super."hszephyr"; + "htaglib" = dontDistribute super."htaglib"; "htags" = dontDistribute super."htags"; "htar" = dontDistribute super."htar"; "htiled" = dontDistribute super."htiled"; @@ -4753,6 +4781,7 @@ self: super: { "keera-hails-reactive-polling" = dontDistribute super."keera-hails-reactive-polling"; "keera-hails-reactive-wx" = dontDistribute super."keera-hails-reactive-wx"; "keera-hails-reactive-yampa" = dontDistribute super."keera-hails-reactive-yampa"; + "keera-hails-reactivelenses" = dontDistribute super."keera-hails-reactivelenses"; "keera-hails-reactivevalues" = dontDistribute super."keera-hails-reactivevalues"; "keera-posture" = dontDistribute super."keera-posture"; "keiretsu" = dontDistribute super."keiretsu"; @@ -4873,6 +4902,8 @@ self: super: { "lat" = dontDistribute super."lat"; "latest-npm-version" = dontDistribute super."latest-npm-version"; "latex" = dontDistribute super."latex"; + "latex-formulae-image" = dontDistribute super."latex-formulae-image"; + "latex-formulae-pandoc" = dontDistribute super."latex-formulae-pandoc"; "lattices" = doDistribute super."lattices_1_2_1_1"; "launchpad-control" = dontDistribute super."launchpad-control"; "lax" = dontDistribute super."lax"; @@ -5230,6 +5261,7 @@ self: super: { "memexml" = dontDistribute super."memexml"; "memo-ptr" = dontDistribute super."memo-ptr"; "memo-sqlite" = dontDistribute super."memo-sqlite"; + "memoization-utils" = dontDistribute super."memoization-utils"; "memoize" = dontDistribute super."memoize"; "memory" = doDistribute super."memory_0_7"; "memscript" = dontDistribute super."memscript"; @@ -5650,6 +5682,7 @@ self: super: { "nthable" = dontDistribute super."nthable"; "ntp-control" = dontDistribute super."ntp-control"; "null-canvas" = dontDistribute super."null-canvas"; + "nullary" = dontDistribute super."nullary"; "number" = dontDistribute super."number"; "numbering" = dontDistribute super."numbering"; "numerals" = dontDistribute super."numerals"; @@ -5872,6 +5905,7 @@ self: super: { "pcg-random" = dontDistribute super."pcg-random"; "pcre-heavy" = doDistribute super."pcre-heavy_0_2_2"; "pcre-less" = dontDistribute super."pcre-less"; + "pcre-light" = doDistribute super."pcre-light_0_4_0_3"; "pcre-light-extra" = dontDistribute super."pcre-light-extra"; "pcre-utils" = dontDistribute super."pcre-utils"; "pdf-toolbox-content" = dontDistribute super."pdf-toolbox-content"; @@ -6237,6 +6271,7 @@ self: super: { "qc-oi-testgenerator" = dontDistribute super."qc-oi-testgenerator"; "qd" = dontDistribute super."qd"; "qd-vec" = dontDistribute super."qd-vec"; + "qed" = dontDistribute super."qed"; "qhull-simple" = dontDistribute super."qhull-simple"; "qrcode" = dontDistribute super."qrcode"; "qt" = dontDistribute super."qt"; @@ -6251,6 +6286,7 @@ self: super: { "queue" = dontDistribute super."queue"; "queuelike" = dontDistribute super."queuelike"; "quick-generator" = dontDistribute super."quick-generator"; + "quick-schema" = dontDistribute super."quick-schema"; "quickcheck-io" = doDistribute super."quickcheck-io_0_1_1"; "quickcheck-poly" = dontDistribute super."quickcheck-poly"; "quickcheck-properties" = dontDistribute super."quickcheck-properties"; @@ -6739,6 +6775,7 @@ self: super: { "servant" = doDistribute super."servant_0_2_2"; "servant-JuicyPixels" = dontDistribute super."servant-JuicyPixels"; "servant-blaze" = dontDistribute super."servant-blaze"; + "servant-cassava" = dontDistribute super."servant-cassava"; "servant-client" = doDistribute super."servant-client_0_2_2"; "servant-docs" = doDistribute super."servant-docs_0_3_1"; "servant-ede" = dontDistribute super."servant-ede"; @@ -6752,6 +6789,7 @@ self: super: { "servant-response" = dontDistribute super."servant-response"; "servant-scotty" = dontDistribute super."servant-scotty"; "servant-server" = doDistribute super."servant-server_0_2_4"; + "servant-swagger" = dontDistribute super."servant-swagger"; "servant-yaml" = dontDistribute super."servant-yaml"; "serversession" = dontDistribute super."serversession"; "serversession-backend-acid-state" = dontDistribute super."serversession-backend-acid-state"; @@ -7369,6 +7407,7 @@ self: super: { "tensor" = dontDistribute super."tensor"; "term-rewriting" = dontDistribute super."term-rewriting"; "termbox-bindings" = dontDistribute super."termbox-bindings"; + "terminal-size" = doDistribute super."terminal-size_0_3_2"; "termination-combinators" = dontDistribute super."termination-combinators"; "terminfo-hs" = dontDistribute super."terminfo-hs"; "terrahs" = dontDistribute super."terrahs"; @@ -7900,6 +7939,7 @@ self: super: { "verdict" = dontDistribute super."verdict"; "verdict-json" = dontDistribute super."verdict-json"; "verilog" = dontDistribute super."verilog"; + "versions" = dontDistribute super."versions"; "vhdl" = dontDistribute super."vhdl"; "views" = dontDistribute super."views"; "vigilance" = dontDistribute super."vigilance"; @@ -8332,6 +8372,7 @@ self: super: { "zendesk-api" = dontDistribute super."zendesk-api"; "zeno" = dontDistribute super."zeno"; "zero" = dontDistribute super."zero"; + "zerobin" = dontDistribute super."zerobin"; "zeromq-haskell" = dontDistribute super."zeromq-haskell"; "zeromq3-conduit" = dontDistribute super."zeromq3-conduit"; "zeromq3-haskell" = dontDistribute super."zeromq3-haskell"; diff --git a/pkgs/development/haskell-modules/configuration-lts-2.22.nix b/pkgs/development/haskell-modules/configuration-lts-2.22.nix index fd6dd18f6ab8..7119316a97d3 100644 --- a/pkgs/development/haskell-modules/configuration-lts-2.22.nix +++ b/pkgs/development/haskell-modules/configuration-lts-2.22.nix @@ -504,6 +504,7 @@ self: super: { "HasGP" = dontDistribute super."HasGP"; "Haschoo" = dontDistribute super."Haschoo"; "Hashell" = dontDistribute super."Hashell"; + "HaskRel" = dontDistribute super."HaskRel"; "HaskellForMaths" = dontDistribute super."HaskellForMaths"; "HaskellLM" = dontDistribute super."HaskellLM"; "HaskellNN" = dontDistribute super."HaskellNN"; @@ -548,6 +549,7 @@ self: super: { "Hsed" = dontDistribute super."Hsed"; "Hsmtlib" = dontDistribute super."Hsmtlib"; "HueAPI" = dontDistribute super."HueAPI"; + "HulkImport" = dontDistribute super."HulkImport"; "Hungarian-Munkres" = dontDistribute super."Hungarian-Munkres"; "IDynamic" = dontDistribute super."IDynamic"; "IFS" = dontDistribute super."IFS"; @@ -1141,6 +1143,7 @@ self: super: { "afis" = dontDistribute super."afis"; "afv" = dontDistribute super."afv"; "agda-server" = dontDistribute super."agda-server"; + "agda-snippets" = dontDistribute super."agda-snippets"; "agentx" = dontDistribute super."agentx"; "agum" = dontDistribute super."agum"; "aig" = dontDistribute super."aig"; @@ -1941,6 +1944,7 @@ self: super: { "cio" = dontDistribute super."cio"; "cipher-aes128" = doDistribute super."cipher-aes128_0_6_4"; "cipher-rc5" = dontDistribute super."cipher-rc5"; + "ciphersaber2" = dontDistribute super."ciphersaber2"; "circ" = dontDistribute super."circ"; "cirru-parser" = dontDistribute super."cirru-parser"; "citation-resolve" = dontDistribute super."citation-resolve"; @@ -2389,6 +2393,7 @@ self: super: { "dataflow" = dontDistribute super."dataflow"; "datalog" = dontDistribute super."datalog"; "datapacker" = dontDistribute super."datapacker"; + "dataurl" = dontDistribute super."dataurl"; "date-cache" = dontDistribute super."date-cache"; "dates" = dontDistribute super."dates"; "datetime" = dontDistribute super."datetime"; @@ -2576,6 +2581,7 @@ self: super: { "distributed-process-task" = doDistribute super."distributed-process-task_0_1_1"; "distributed-process-tests" = dontDistribute super."distributed-process-tests"; "distributed-process-zookeeper" = dontDistribute super."distributed-process-zookeeper"; + "distributed-static" = doDistribute super."distributed-static_0_3_2_0"; "distribution" = dontDistribute super."distribution"; "distribution-plot" = dontDistribute super."distribution-plot"; "diversity" = dontDistribute super."diversity"; @@ -2792,6 +2798,7 @@ self: super: { "eros-client" = dontDistribute super."eros-client"; "eros-http" = dontDistribute super."eros-http"; "errno" = dontDistribute super."errno"; + "error-analyze" = dontDistribute super."error-analyze"; "error-continuations" = dontDistribute super."error-continuations"; "error-list" = dontDistribute super."error-list"; "error-loc" = dontDistribute super."error-loc"; @@ -2844,6 +2851,7 @@ self: super: { "exinst-deepseq" = dontDistribute super."exinst-deepseq"; "exinst-hashable" = dontDistribute super."exinst-hashable"; "exists" = dontDistribute super."exists"; + "exit-codes" = dontDistribute super."exit-codes"; "exp-pairs" = dontDistribute super."exp-pairs"; "expand" = dontDistribute super."expand"; "expat-enumerator" = dontDistribute super."expat-enumerator"; @@ -2959,6 +2967,7 @@ self: super: { "fingertree-psqueue" = dontDistribute super."fingertree-psqueue"; "fingertree-tf" = dontDistribute super."fingertree-tf"; "finite-field" = dontDistribute super."finite-field"; + "finite-typelits" = dontDistribute super."finite-typelits"; "first-and-last" = dontDistribute super."first-and-last"; "first-class-patterns" = dontDistribute super."first-class-patterns"; "firstify" = dontDistribute super."firstify"; @@ -3239,6 +3248,20 @@ self: super: { "ghclive" = dontDistribute super."ghclive"; "ghczdecode" = dontDistribute super."ghczdecode"; "ght" = dontDistribute super."ght"; + "gi-atk" = dontDistribute super."gi-atk"; + "gi-cairo" = dontDistribute super."gi-cairo"; + "gi-gdk" = dontDistribute super."gi-gdk"; + "gi-gdkpixbuf" = dontDistribute super."gi-gdkpixbuf"; + "gi-gio" = dontDistribute super."gi-gio"; + "gi-glib" = dontDistribute super."gi-glib"; + "gi-gobject" = dontDistribute super."gi-gobject"; + "gi-gtk" = dontDistribute super."gi-gtk"; + "gi-javascriptcore" = dontDistribute super."gi-javascriptcore"; + "gi-notify" = dontDistribute super."gi-notify"; + "gi-pango" = dontDistribute super."gi-pango"; + "gi-soup" = dontDistribute super."gi-soup"; + "gi-vte" = dontDistribute super."gi-vte"; + "gi-webkit" = dontDistribute super."gi-webkit"; "gimlh" = dontDistribute super."gimlh"; "ginger" = dontDistribute super."ginger"; "ginsu" = dontDistribute super."ginsu"; @@ -3250,6 +3273,7 @@ self: super: { "git-date" = dontDistribute super."git-date"; "git-freq" = dontDistribute super."git-freq"; "git-gpush" = dontDistribute super."git-gpush"; + "git-jump" = dontDistribute super."git-jump"; "git-monitor" = dontDistribute super."git-monitor"; "git-object" = dontDistribute super."git-object"; "git-repair" = dontDistribute super."git-repair"; @@ -3720,6 +3744,8 @@ self: super: { "haskell-formatter" = dontDistribute super."haskell-formatter"; "haskell-ftp" = dontDistribute super."haskell-ftp"; "haskell-generate" = dontDistribute super."haskell-generate"; + "haskell-gi" = dontDistribute super."haskell-gi"; + "haskell-gi-base" = dontDistribute super."haskell-gi-base"; "haskell-import-graph" = dontDistribute super."haskell-import-graph"; "haskell-in-space" = dontDistribute super."haskell-in-space"; "haskell-modbus" = dontDistribute super."haskell-modbus"; @@ -3918,6 +3944,7 @@ self: super: { "hfann" = dontDistribute super."hfann"; "hfd" = dontDistribute super."hfd"; "hfiar" = dontDistribute super."hfiar"; + "hfmt" = dontDistribute super."hfmt"; "hfoil" = dontDistribute super."hfoil"; "hfov" = dontDistribute super."hfov"; "hfractal" = dontDistribute super."hfractal"; @@ -4329,6 +4356,7 @@ self: super: { "hsx2hs" = dontDistribute super."hsx2hs"; "hsyscall" = dontDistribute super."hsyscall"; "hszephyr" = dontDistribute super."hszephyr"; + "htaglib" = dontDistribute super."htaglib"; "htags" = dontDistribute super."htags"; "htar" = dontDistribute super."htar"; "htiled" = dontDistribute super."htiled"; @@ -4750,6 +4778,7 @@ self: super: { "keera-hails-reactive-polling" = dontDistribute super."keera-hails-reactive-polling"; "keera-hails-reactive-wx" = dontDistribute super."keera-hails-reactive-wx"; "keera-hails-reactive-yampa" = dontDistribute super."keera-hails-reactive-yampa"; + "keera-hails-reactivelenses" = dontDistribute super."keera-hails-reactivelenses"; "keera-hails-reactivevalues" = dontDistribute super."keera-hails-reactivevalues"; "keera-posture" = dontDistribute super."keera-posture"; "keiretsu" = dontDistribute super."keiretsu"; @@ -4870,6 +4899,8 @@ self: super: { "lat" = dontDistribute super."lat"; "latest-npm-version" = dontDistribute super."latest-npm-version"; "latex" = dontDistribute super."latex"; + "latex-formulae-image" = dontDistribute super."latex-formulae-image"; + "latex-formulae-pandoc" = dontDistribute super."latex-formulae-pandoc"; "lattices" = doDistribute super."lattices_1_2_1_1"; "launchpad-control" = dontDistribute super."launchpad-control"; "lax" = dontDistribute super."lax"; @@ -5227,6 +5258,7 @@ self: super: { "memexml" = dontDistribute super."memexml"; "memo-ptr" = dontDistribute super."memo-ptr"; "memo-sqlite" = dontDistribute super."memo-sqlite"; + "memoization-utils" = dontDistribute super."memoization-utils"; "memoize" = dontDistribute super."memoize"; "memory" = doDistribute super."memory_0_7"; "memscript" = dontDistribute super."memscript"; @@ -5646,6 +5678,7 @@ self: super: { "nthable" = dontDistribute super."nthable"; "ntp-control" = dontDistribute super."ntp-control"; "null-canvas" = dontDistribute super."null-canvas"; + "nullary" = dontDistribute super."nullary"; "number" = dontDistribute super."number"; "numbering" = dontDistribute super."numbering"; "numerals" = dontDistribute super."numerals"; @@ -5868,6 +5901,7 @@ self: super: { "pcg-random" = dontDistribute super."pcg-random"; "pcre-heavy" = doDistribute super."pcre-heavy_0_2_2"; "pcre-less" = dontDistribute super."pcre-less"; + "pcre-light" = doDistribute super."pcre-light_0_4_0_3"; "pcre-light-extra" = dontDistribute super."pcre-light-extra"; "pcre-utils" = dontDistribute super."pcre-utils"; "pdf-toolbox-content" = dontDistribute super."pdf-toolbox-content"; @@ -6233,6 +6267,7 @@ self: super: { "qc-oi-testgenerator" = dontDistribute super."qc-oi-testgenerator"; "qd" = dontDistribute super."qd"; "qd-vec" = dontDistribute super."qd-vec"; + "qed" = dontDistribute super."qed"; "qhull-simple" = dontDistribute super."qhull-simple"; "qrcode" = dontDistribute super."qrcode"; "qt" = dontDistribute super."qt"; @@ -6247,6 +6282,7 @@ self: super: { "queue" = dontDistribute super."queue"; "queuelike" = dontDistribute super."queuelike"; "quick-generator" = dontDistribute super."quick-generator"; + "quick-schema" = dontDistribute super."quick-schema"; "quickcheck-io" = doDistribute super."quickcheck-io_0_1_1"; "quickcheck-poly" = dontDistribute super."quickcheck-poly"; "quickcheck-properties" = dontDistribute super."quickcheck-properties"; @@ -6735,6 +6771,7 @@ self: super: { "servant" = doDistribute super."servant_0_2_2"; "servant-JuicyPixels" = dontDistribute super."servant-JuicyPixels"; "servant-blaze" = dontDistribute super."servant-blaze"; + "servant-cassava" = dontDistribute super."servant-cassava"; "servant-client" = doDistribute super."servant-client_0_2_2"; "servant-docs" = doDistribute super."servant-docs_0_3_1"; "servant-ede" = dontDistribute super."servant-ede"; @@ -6748,6 +6785,7 @@ self: super: { "servant-response" = dontDistribute super."servant-response"; "servant-scotty" = dontDistribute super."servant-scotty"; "servant-server" = doDistribute super."servant-server_0_2_4"; + "servant-swagger" = dontDistribute super."servant-swagger"; "servant-yaml" = dontDistribute super."servant-yaml"; "serversession" = dontDistribute super."serversession"; "serversession-backend-acid-state" = dontDistribute super."serversession-backend-acid-state"; @@ -7365,6 +7403,7 @@ self: super: { "tensor" = dontDistribute super."tensor"; "term-rewriting" = dontDistribute super."term-rewriting"; "termbox-bindings" = dontDistribute super."termbox-bindings"; + "terminal-size" = doDistribute super."terminal-size_0_3_2"; "termination-combinators" = dontDistribute super."termination-combinators"; "terminfo-hs" = dontDistribute super."terminfo-hs"; "terrahs" = dontDistribute super."terrahs"; @@ -7896,6 +7935,7 @@ self: super: { "verdict" = dontDistribute super."verdict"; "verdict-json" = dontDistribute super."verdict-json"; "verilog" = dontDistribute super."verilog"; + "versions" = dontDistribute super."versions"; "vhdl" = dontDistribute super."vhdl"; "views" = dontDistribute super."views"; "vigilance" = dontDistribute super."vigilance"; @@ -8328,6 +8368,7 @@ self: super: { "zendesk-api" = dontDistribute super."zendesk-api"; "zeno" = dontDistribute super."zeno"; "zero" = dontDistribute super."zero"; + "zerobin" = dontDistribute super."zerobin"; "zeromq-haskell" = dontDistribute super."zeromq-haskell"; "zeromq3-conduit" = dontDistribute super."zeromq3-conduit"; "zeromq3-haskell" = dontDistribute super."zeromq3-haskell"; diff --git a/pkgs/development/haskell-modules/configuration-lts-2.3.nix b/pkgs/development/haskell-modules/configuration-lts-2.3.nix index a710ef7e984e..1acaf4b81e69 100644 --- a/pkgs/development/haskell-modules/configuration-lts-2.3.nix +++ b/pkgs/development/haskell-modules/configuration-lts-2.3.nix @@ -507,6 +507,7 @@ self: super: { "HasGP" = dontDistribute super."HasGP"; "Haschoo" = dontDistribute super."Haschoo"; "Hashell" = dontDistribute super."Hashell"; + "HaskRel" = dontDistribute super."HaskRel"; "HaskellForMaths" = dontDistribute super."HaskellForMaths"; "HaskellLM" = dontDistribute super."HaskellLM"; "HaskellNN" = dontDistribute super."HaskellNN"; @@ -552,6 +553,7 @@ self: super: { "Hsed" = dontDistribute super."Hsed"; "Hsmtlib" = dontDistribute super."Hsmtlib"; "HueAPI" = dontDistribute super."HueAPI"; + "HulkImport" = dontDistribute super."HulkImport"; "Hungarian-Munkres" = dontDistribute super."Hungarian-Munkres"; "IDynamic" = dontDistribute super."IDynamic"; "IFS" = dontDistribute super."IFS"; @@ -1150,6 +1152,7 @@ self: super: { "afis" = dontDistribute super."afis"; "afv" = dontDistribute super."afv"; "agda-server" = dontDistribute super."agda-server"; + "agda-snippets" = dontDistribute super."agda-snippets"; "agentx" = dontDistribute super."agentx"; "agum" = dontDistribute super."agum"; "aig" = dontDistribute super."aig"; @@ -1963,6 +1966,7 @@ self: super: { "cipher-aes" = doDistribute super."cipher-aes_0_2_10"; "cipher-aes128" = doDistribute super."cipher-aes128_0_6_4"; "cipher-rc5" = dontDistribute super."cipher-rc5"; + "ciphersaber2" = dontDistribute super."ciphersaber2"; "circ" = dontDistribute super."circ"; "cirru-parser" = dontDistribute super."cirru-parser"; "citation-resolve" = dontDistribute super."citation-resolve"; @@ -2417,6 +2421,7 @@ self: super: { "dataflow" = dontDistribute super."dataflow"; "datalog" = dontDistribute super."datalog"; "datapacker" = dontDistribute super."datapacker"; + "dataurl" = dontDistribute super."dataurl"; "date-cache" = dontDistribute super."date-cache"; "dates" = dontDistribute super."dates"; "datetime" = dontDistribute super."datetime"; @@ -2826,6 +2831,7 @@ self: super: { "eros-client" = dontDistribute super."eros-client"; "eros-http" = dontDistribute super."eros-http"; "errno" = dontDistribute super."errno"; + "error-analyze" = dontDistribute super."error-analyze"; "error-continuations" = dontDistribute super."error-continuations"; "error-list" = dontDistribute super."error-list"; "error-loc" = dontDistribute super."error-loc"; @@ -2879,6 +2885,7 @@ self: super: { "exinst-deepseq" = dontDistribute super."exinst-deepseq"; "exinst-hashable" = dontDistribute super."exinst-hashable"; "exists" = dontDistribute super."exists"; + "exit-codes" = dontDistribute super."exit-codes"; "exp-pairs" = dontDistribute super."exp-pairs"; "expand" = dontDistribute super."expand"; "expat-enumerator" = dontDistribute super."expat-enumerator"; @@ -2999,6 +3006,7 @@ self: super: { "fingertree-psqueue" = dontDistribute super."fingertree-psqueue"; "fingertree-tf" = dontDistribute super."fingertree-tf"; "finite-field" = dontDistribute super."finite-field"; + "finite-typelits" = dontDistribute super."finite-typelits"; "first-and-last" = dontDistribute super."first-and-last"; "first-class-patterns" = dontDistribute super."first-class-patterns"; "firstify" = dontDistribute super."firstify"; @@ -3284,6 +3292,20 @@ self: super: { "ghclive" = dontDistribute super."ghclive"; "ghczdecode" = dontDistribute super."ghczdecode"; "ght" = dontDistribute super."ght"; + "gi-atk" = dontDistribute super."gi-atk"; + "gi-cairo" = dontDistribute super."gi-cairo"; + "gi-gdk" = dontDistribute super."gi-gdk"; + "gi-gdkpixbuf" = dontDistribute super."gi-gdkpixbuf"; + "gi-gio" = dontDistribute super."gi-gio"; + "gi-glib" = dontDistribute super."gi-glib"; + "gi-gobject" = dontDistribute super."gi-gobject"; + "gi-gtk" = dontDistribute super."gi-gtk"; + "gi-javascriptcore" = dontDistribute super."gi-javascriptcore"; + "gi-notify" = dontDistribute super."gi-notify"; + "gi-pango" = dontDistribute super."gi-pango"; + "gi-soup" = dontDistribute super."gi-soup"; + "gi-vte" = dontDistribute super."gi-vte"; + "gi-webkit" = dontDistribute super."gi-webkit"; "gimlh" = dontDistribute super."gimlh"; "ginger" = dontDistribute super."ginger"; "ginsu" = dontDistribute super."ginsu"; @@ -3295,6 +3317,7 @@ self: super: { "git-date" = dontDistribute super."git-date"; "git-freq" = dontDistribute super."git-freq"; "git-gpush" = dontDistribute super."git-gpush"; + "git-jump" = dontDistribute super."git-jump"; "git-monitor" = dontDistribute super."git-monitor"; "git-object" = dontDistribute super."git-object"; "git-repair" = dontDistribute super."git-repair"; @@ -3774,6 +3797,8 @@ self: super: { "haskell-formatter" = dontDistribute super."haskell-formatter"; "haskell-ftp" = dontDistribute super."haskell-ftp"; "haskell-generate" = dontDistribute super."haskell-generate"; + "haskell-gi" = dontDistribute super."haskell-gi"; + "haskell-gi-base" = dontDistribute super."haskell-gi-base"; "haskell-import-graph" = dontDistribute super."haskell-import-graph"; "haskell-in-space" = dontDistribute super."haskell-in-space"; "haskell-modbus" = dontDistribute super."haskell-modbus"; @@ -3975,6 +4000,7 @@ self: super: { "hfann" = dontDistribute super."hfann"; "hfd" = dontDistribute super."hfd"; "hfiar" = dontDistribute super."hfiar"; + "hfmt" = dontDistribute super."hfmt"; "hfoil" = dontDistribute super."hfoil"; "hfov" = dontDistribute super."hfov"; "hfractal" = dontDistribute super."hfractal"; @@ -4391,6 +4417,7 @@ self: super: { "hsx2hs" = dontDistribute super."hsx2hs"; "hsyscall" = dontDistribute super."hsyscall"; "hszephyr" = dontDistribute super."hszephyr"; + "htaglib" = dontDistribute super."htaglib"; "htags" = dontDistribute super."htags"; "htar" = dontDistribute super."htar"; "htiled" = dontDistribute super."htiled"; @@ -4821,6 +4848,7 @@ self: super: { "keera-hails-reactive-polling" = dontDistribute super."keera-hails-reactive-polling"; "keera-hails-reactive-wx" = dontDistribute super."keera-hails-reactive-wx"; "keera-hails-reactive-yampa" = dontDistribute super."keera-hails-reactive-yampa"; + "keera-hails-reactivelenses" = dontDistribute super."keera-hails-reactivelenses"; "keera-hails-reactivevalues" = dontDistribute super."keera-hails-reactivevalues"; "keera-posture" = dontDistribute super."keera-posture"; "keiretsu" = dontDistribute super."keiretsu"; @@ -4943,6 +4971,8 @@ self: super: { "lat" = dontDistribute super."lat"; "latest-npm-version" = dontDistribute super."latest-npm-version"; "latex" = dontDistribute super."latex"; + "latex-formulae-image" = dontDistribute super."latex-formulae-image"; + "latex-formulae-pandoc" = dontDistribute super."latex-formulae-pandoc"; "lattices" = doDistribute super."lattices_1_2_1_1"; "launchpad-control" = dontDistribute super."launchpad-control"; "lax" = dontDistribute super."lax"; @@ -5310,6 +5340,7 @@ self: super: { "memexml" = dontDistribute super."memexml"; "memo-ptr" = dontDistribute super."memo-ptr"; "memo-sqlite" = dontDistribute super."memo-sqlite"; + "memoization-utils" = dontDistribute super."memoization-utils"; "memoize" = dontDistribute super."memoize"; "memory" = dontDistribute super."memory"; "memscript" = dontDistribute super."memscript"; @@ -5739,6 +5770,7 @@ self: super: { "nthable" = dontDistribute super."nthable"; "ntp-control" = dontDistribute super."ntp-control"; "null-canvas" = dontDistribute super."null-canvas"; + "nullary" = dontDistribute super."nullary"; "number" = dontDistribute super."number"; "numbering" = dontDistribute super."numbering"; "numerals" = dontDistribute super."numerals"; @@ -5963,6 +5995,7 @@ self: super: { "pcg-random" = dontDistribute super."pcg-random"; "pcre-heavy" = doDistribute super."pcre-heavy_0_2_2"; "pcre-less" = dontDistribute super."pcre-less"; + "pcre-light" = doDistribute super."pcre-light_0_4_0_3"; "pcre-light-extra" = dontDistribute super."pcre-light-extra"; "pcre-utils" = dontDistribute super."pcre-utils"; "pdf-toolbox-content" = dontDistribute super."pdf-toolbox-content"; @@ -6337,6 +6370,7 @@ self: super: { "qc-oi-testgenerator" = dontDistribute super."qc-oi-testgenerator"; "qd" = dontDistribute super."qd"; "qd-vec" = dontDistribute super."qd-vec"; + "qed" = dontDistribute super."qed"; "qhull-simple" = dontDistribute super."qhull-simple"; "qrcode" = dontDistribute super."qrcode"; "qt" = dontDistribute super."qt"; @@ -6352,6 +6386,7 @@ self: super: { "queue" = dontDistribute super."queue"; "queuelike" = dontDistribute super."queuelike"; "quick-generator" = dontDistribute super."quick-generator"; + "quick-schema" = dontDistribute super."quick-schema"; "quickcheck-io" = doDistribute super."quickcheck-io_0_1_1"; "quickcheck-poly" = dontDistribute super."quickcheck-poly"; "quickcheck-properties" = dontDistribute super."quickcheck-properties"; @@ -6847,6 +6882,7 @@ self: super: { "servant" = doDistribute super."servant_0_2_2"; "servant-JuicyPixels" = dontDistribute super."servant-JuicyPixels"; "servant-blaze" = dontDistribute super."servant-blaze"; + "servant-cassava" = dontDistribute super."servant-cassava"; "servant-client" = doDistribute super."servant-client_0_2_2"; "servant-docs" = doDistribute super."servant-docs_0_3_1"; "servant-ede" = dontDistribute super."servant-ede"; @@ -6860,6 +6896,7 @@ self: super: { "servant-response" = dontDistribute super."servant-response"; "servant-scotty" = dontDistribute super."servant-scotty"; "servant-server" = doDistribute super."servant-server_0_2_4"; + "servant-swagger" = dontDistribute super."servant-swagger"; "servant-yaml" = dontDistribute super."servant-yaml"; "serversession" = dontDistribute super."serversession"; "serversession-backend-acid-state" = dontDistribute super."serversession-backend-acid-state"; @@ -8031,6 +8068,7 @@ self: super: { "verdict" = dontDistribute super."verdict"; "verdict-json" = dontDistribute super."verdict-json"; "verilog" = dontDistribute super."verilog"; + "versions" = dontDistribute super."versions"; "vhdl" = dontDistribute super."vhdl"; "views" = dontDistribute super."views"; "vigilance" = dontDistribute super."vigilance"; @@ -8475,6 +8513,7 @@ self: super: { "zendesk-api" = dontDistribute super."zendesk-api"; "zeno" = dontDistribute super."zeno"; "zero" = dontDistribute super."zero"; + "zerobin" = dontDistribute super."zerobin"; "zeromq-haskell" = dontDistribute super."zeromq-haskell"; "zeromq3-conduit" = dontDistribute super."zeromq3-conduit"; "zeromq3-haskell" = dontDistribute super."zeromq3-haskell"; diff --git a/pkgs/development/haskell-modules/configuration-lts-2.4.nix b/pkgs/development/haskell-modules/configuration-lts-2.4.nix index 0d6cca2a967f..3c24db4a00c0 100644 --- a/pkgs/development/haskell-modules/configuration-lts-2.4.nix +++ b/pkgs/development/haskell-modules/configuration-lts-2.4.nix @@ -507,6 +507,7 @@ self: super: { "HasGP" = dontDistribute super."HasGP"; "Haschoo" = dontDistribute super."Haschoo"; "Hashell" = dontDistribute super."Hashell"; + "HaskRel" = dontDistribute super."HaskRel"; "HaskellForMaths" = dontDistribute super."HaskellForMaths"; "HaskellLM" = dontDistribute super."HaskellLM"; "HaskellNN" = dontDistribute super."HaskellNN"; @@ -552,6 +553,7 @@ self: super: { "Hsed" = dontDistribute super."Hsed"; "Hsmtlib" = dontDistribute super."Hsmtlib"; "HueAPI" = dontDistribute super."HueAPI"; + "HulkImport" = dontDistribute super."HulkImport"; "Hungarian-Munkres" = dontDistribute super."Hungarian-Munkres"; "IDynamic" = dontDistribute super."IDynamic"; "IFS" = dontDistribute super."IFS"; @@ -1150,6 +1152,7 @@ self: super: { "afis" = dontDistribute super."afis"; "afv" = dontDistribute super."afv"; "agda-server" = dontDistribute super."agda-server"; + "agda-snippets" = dontDistribute super."agda-snippets"; "agentx" = dontDistribute super."agentx"; "agum" = dontDistribute super."agum"; "aig" = dontDistribute super."aig"; @@ -1962,6 +1965,7 @@ self: super: { "cipher-aes" = doDistribute super."cipher-aes_0_2_10"; "cipher-aes128" = doDistribute super."cipher-aes128_0_6_4"; "cipher-rc5" = dontDistribute super."cipher-rc5"; + "ciphersaber2" = dontDistribute super."ciphersaber2"; "circ" = dontDistribute super."circ"; "cirru-parser" = dontDistribute super."cirru-parser"; "citation-resolve" = dontDistribute super."citation-resolve"; @@ -2416,6 +2420,7 @@ self: super: { "dataflow" = dontDistribute super."dataflow"; "datalog" = dontDistribute super."datalog"; "datapacker" = dontDistribute super."datapacker"; + "dataurl" = dontDistribute super."dataurl"; "date-cache" = dontDistribute super."date-cache"; "dates" = dontDistribute super."dates"; "datetime" = dontDistribute super."datetime"; @@ -2825,6 +2830,7 @@ self: super: { "eros-client" = dontDistribute super."eros-client"; "eros-http" = dontDistribute super."eros-http"; "errno" = dontDistribute super."errno"; + "error-analyze" = dontDistribute super."error-analyze"; "error-continuations" = dontDistribute super."error-continuations"; "error-list" = dontDistribute super."error-list"; "error-loc" = dontDistribute super."error-loc"; @@ -2878,6 +2884,7 @@ self: super: { "exinst-deepseq" = dontDistribute super."exinst-deepseq"; "exinst-hashable" = dontDistribute super."exinst-hashable"; "exists" = dontDistribute super."exists"; + "exit-codes" = dontDistribute super."exit-codes"; "exp-pairs" = dontDistribute super."exp-pairs"; "expand" = dontDistribute super."expand"; "expat-enumerator" = dontDistribute super."expat-enumerator"; @@ -2998,6 +3005,7 @@ self: super: { "fingertree-psqueue" = dontDistribute super."fingertree-psqueue"; "fingertree-tf" = dontDistribute super."fingertree-tf"; "finite-field" = dontDistribute super."finite-field"; + "finite-typelits" = dontDistribute super."finite-typelits"; "first-and-last" = dontDistribute super."first-and-last"; "first-class-patterns" = dontDistribute super."first-class-patterns"; "firstify" = dontDistribute super."firstify"; @@ -3283,6 +3291,20 @@ self: super: { "ghclive" = dontDistribute super."ghclive"; "ghczdecode" = dontDistribute super."ghczdecode"; "ght" = dontDistribute super."ght"; + "gi-atk" = dontDistribute super."gi-atk"; + "gi-cairo" = dontDistribute super."gi-cairo"; + "gi-gdk" = dontDistribute super."gi-gdk"; + "gi-gdkpixbuf" = dontDistribute super."gi-gdkpixbuf"; + "gi-gio" = dontDistribute super."gi-gio"; + "gi-glib" = dontDistribute super."gi-glib"; + "gi-gobject" = dontDistribute super."gi-gobject"; + "gi-gtk" = dontDistribute super."gi-gtk"; + "gi-javascriptcore" = dontDistribute super."gi-javascriptcore"; + "gi-notify" = dontDistribute super."gi-notify"; + "gi-pango" = dontDistribute super."gi-pango"; + "gi-soup" = dontDistribute super."gi-soup"; + "gi-vte" = dontDistribute super."gi-vte"; + "gi-webkit" = dontDistribute super."gi-webkit"; "gimlh" = dontDistribute super."gimlh"; "ginger" = dontDistribute super."ginger"; "ginsu" = dontDistribute super."ginsu"; @@ -3294,6 +3316,7 @@ self: super: { "git-date" = dontDistribute super."git-date"; "git-freq" = dontDistribute super."git-freq"; "git-gpush" = dontDistribute super."git-gpush"; + "git-jump" = dontDistribute super."git-jump"; "git-monitor" = dontDistribute super."git-monitor"; "git-object" = dontDistribute super."git-object"; "git-repair" = dontDistribute super."git-repair"; @@ -3773,6 +3796,8 @@ self: super: { "haskell-formatter" = dontDistribute super."haskell-formatter"; "haskell-ftp" = dontDistribute super."haskell-ftp"; "haskell-generate" = dontDistribute super."haskell-generate"; + "haskell-gi" = dontDistribute super."haskell-gi"; + "haskell-gi-base" = dontDistribute super."haskell-gi-base"; "haskell-import-graph" = dontDistribute super."haskell-import-graph"; "haskell-in-space" = dontDistribute super."haskell-in-space"; "haskell-modbus" = dontDistribute super."haskell-modbus"; @@ -3974,6 +3999,7 @@ self: super: { "hfann" = dontDistribute super."hfann"; "hfd" = dontDistribute super."hfd"; "hfiar" = dontDistribute super."hfiar"; + "hfmt" = dontDistribute super."hfmt"; "hfoil" = dontDistribute super."hfoil"; "hfov" = dontDistribute super."hfov"; "hfractal" = dontDistribute super."hfractal"; @@ -4390,6 +4416,7 @@ self: super: { "hsx2hs" = dontDistribute super."hsx2hs"; "hsyscall" = dontDistribute super."hsyscall"; "hszephyr" = dontDistribute super."hszephyr"; + "htaglib" = dontDistribute super."htaglib"; "htags" = dontDistribute super."htags"; "htar" = dontDistribute super."htar"; "htiled" = dontDistribute super."htiled"; @@ -4820,6 +4847,7 @@ self: super: { "keera-hails-reactive-polling" = dontDistribute super."keera-hails-reactive-polling"; "keera-hails-reactive-wx" = dontDistribute super."keera-hails-reactive-wx"; "keera-hails-reactive-yampa" = dontDistribute super."keera-hails-reactive-yampa"; + "keera-hails-reactivelenses" = dontDistribute super."keera-hails-reactivelenses"; "keera-hails-reactivevalues" = dontDistribute super."keera-hails-reactivevalues"; "keera-posture" = dontDistribute super."keera-posture"; "keiretsu" = dontDistribute super."keiretsu"; @@ -4942,6 +4970,8 @@ self: super: { "lat" = dontDistribute super."lat"; "latest-npm-version" = dontDistribute super."latest-npm-version"; "latex" = dontDistribute super."latex"; + "latex-formulae-image" = dontDistribute super."latex-formulae-image"; + "latex-formulae-pandoc" = dontDistribute super."latex-formulae-pandoc"; "lattices" = doDistribute super."lattices_1_2_1_1"; "launchpad-control" = dontDistribute super."launchpad-control"; "lax" = dontDistribute super."lax"; @@ -5308,6 +5338,7 @@ self: super: { "memexml" = dontDistribute super."memexml"; "memo-ptr" = dontDistribute super."memo-ptr"; "memo-sqlite" = dontDistribute super."memo-sqlite"; + "memoization-utils" = dontDistribute super."memoization-utils"; "memoize" = dontDistribute super."memoize"; "memory" = dontDistribute super."memory"; "memscript" = dontDistribute super."memscript"; @@ -5737,6 +5768,7 @@ self: super: { "nthable" = dontDistribute super."nthable"; "ntp-control" = dontDistribute super."ntp-control"; "null-canvas" = dontDistribute super."null-canvas"; + "nullary" = dontDistribute super."nullary"; "number" = dontDistribute super."number"; "numbering" = dontDistribute super."numbering"; "numerals" = dontDistribute super."numerals"; @@ -5960,6 +5992,7 @@ self: super: { "pcg-random" = dontDistribute super."pcg-random"; "pcre-heavy" = doDistribute super."pcre-heavy_0_2_2"; "pcre-less" = dontDistribute super."pcre-less"; + "pcre-light" = doDistribute super."pcre-light_0_4_0_3"; "pcre-light-extra" = dontDistribute super."pcre-light-extra"; "pcre-utils" = dontDistribute super."pcre-utils"; "pdf-toolbox-content" = dontDistribute super."pdf-toolbox-content"; @@ -6333,6 +6366,7 @@ self: super: { "qc-oi-testgenerator" = dontDistribute super."qc-oi-testgenerator"; "qd" = dontDistribute super."qd"; "qd-vec" = dontDistribute super."qd-vec"; + "qed" = dontDistribute super."qed"; "qhull-simple" = dontDistribute super."qhull-simple"; "qrcode" = dontDistribute super."qrcode"; "qt" = dontDistribute super."qt"; @@ -6348,6 +6382,7 @@ self: super: { "queue" = dontDistribute super."queue"; "queuelike" = dontDistribute super."queuelike"; "quick-generator" = dontDistribute super."quick-generator"; + "quick-schema" = dontDistribute super."quick-schema"; "quickcheck-io" = doDistribute super."quickcheck-io_0_1_1"; "quickcheck-poly" = dontDistribute super."quickcheck-poly"; "quickcheck-properties" = dontDistribute super."quickcheck-properties"; @@ -6842,6 +6877,7 @@ self: super: { "servant" = doDistribute super."servant_0_2_2"; "servant-JuicyPixels" = dontDistribute super."servant-JuicyPixels"; "servant-blaze" = dontDistribute super."servant-blaze"; + "servant-cassava" = dontDistribute super."servant-cassava"; "servant-client" = doDistribute super."servant-client_0_2_2"; "servant-docs" = doDistribute super."servant-docs_0_3_1"; "servant-ede" = dontDistribute super."servant-ede"; @@ -6855,6 +6891,7 @@ self: super: { "servant-response" = dontDistribute super."servant-response"; "servant-scotty" = dontDistribute super."servant-scotty"; "servant-server" = doDistribute super."servant-server_0_2_4"; + "servant-swagger" = dontDistribute super."servant-swagger"; "servant-yaml" = dontDistribute super."servant-yaml"; "serversession" = dontDistribute super."serversession"; "serversession-backend-acid-state" = dontDistribute super."serversession-backend-acid-state"; @@ -8026,6 +8063,7 @@ self: super: { "verdict" = dontDistribute super."verdict"; "verdict-json" = dontDistribute super."verdict-json"; "verilog" = dontDistribute super."verilog"; + "versions" = dontDistribute super."versions"; "vhdl" = dontDistribute super."vhdl"; "views" = dontDistribute super."views"; "vigilance" = dontDistribute super."vigilance"; @@ -8470,6 +8508,7 @@ self: super: { "zendesk-api" = dontDistribute super."zendesk-api"; "zeno" = dontDistribute super."zeno"; "zero" = dontDistribute super."zero"; + "zerobin" = dontDistribute super."zerobin"; "zeromq-haskell" = dontDistribute super."zeromq-haskell"; "zeromq3-conduit" = dontDistribute super."zeromq3-conduit"; "zeromq3-haskell" = dontDistribute super."zeromq3-haskell"; diff --git a/pkgs/development/haskell-modules/configuration-lts-2.5.nix b/pkgs/development/haskell-modules/configuration-lts-2.5.nix index 84082f4e7f33..b81c72d40a07 100644 --- a/pkgs/development/haskell-modules/configuration-lts-2.5.nix +++ b/pkgs/development/haskell-modules/configuration-lts-2.5.nix @@ -507,6 +507,7 @@ self: super: { "HasGP" = dontDistribute super."HasGP"; "Haschoo" = dontDistribute super."Haschoo"; "Hashell" = dontDistribute super."Hashell"; + "HaskRel" = dontDistribute super."HaskRel"; "HaskellForMaths" = dontDistribute super."HaskellForMaths"; "HaskellLM" = dontDistribute super."HaskellLM"; "HaskellNN" = dontDistribute super."HaskellNN"; @@ -552,6 +553,7 @@ self: super: { "Hsed" = dontDistribute super."Hsed"; "Hsmtlib" = dontDistribute super."Hsmtlib"; "HueAPI" = dontDistribute super."HueAPI"; + "HulkImport" = dontDistribute super."HulkImport"; "Hungarian-Munkres" = dontDistribute super."Hungarian-Munkres"; "IDynamic" = dontDistribute super."IDynamic"; "IFS" = dontDistribute super."IFS"; @@ -1150,6 +1152,7 @@ self: super: { "afis" = dontDistribute super."afis"; "afv" = dontDistribute super."afv"; "agda-server" = dontDistribute super."agda-server"; + "agda-snippets" = dontDistribute super."agda-snippets"; "agentx" = dontDistribute super."agentx"; "agum" = dontDistribute super."agum"; "aig" = dontDistribute super."aig"; @@ -1962,6 +1965,7 @@ self: super: { "cipher-aes" = doDistribute super."cipher-aes_0_2_10"; "cipher-aes128" = doDistribute super."cipher-aes128_0_6_4"; "cipher-rc5" = dontDistribute super."cipher-rc5"; + "ciphersaber2" = dontDistribute super."ciphersaber2"; "circ" = dontDistribute super."circ"; "cirru-parser" = dontDistribute super."cirru-parser"; "citation-resolve" = dontDistribute super."citation-resolve"; @@ -2415,6 +2419,7 @@ self: super: { "dataflow" = dontDistribute super."dataflow"; "datalog" = dontDistribute super."datalog"; "datapacker" = dontDistribute super."datapacker"; + "dataurl" = dontDistribute super."dataurl"; "date-cache" = dontDistribute super."date-cache"; "dates" = dontDistribute super."dates"; "datetime" = dontDistribute super."datetime"; @@ -2824,6 +2829,7 @@ self: super: { "eros-client" = dontDistribute super."eros-client"; "eros-http" = dontDistribute super."eros-http"; "errno" = dontDistribute super."errno"; + "error-analyze" = dontDistribute super."error-analyze"; "error-continuations" = dontDistribute super."error-continuations"; "error-list" = dontDistribute super."error-list"; "error-loc" = dontDistribute super."error-loc"; @@ -2877,6 +2883,7 @@ self: super: { "exinst-deepseq" = dontDistribute super."exinst-deepseq"; "exinst-hashable" = dontDistribute super."exinst-hashable"; "exists" = dontDistribute super."exists"; + "exit-codes" = dontDistribute super."exit-codes"; "exp-pairs" = dontDistribute super."exp-pairs"; "expand" = dontDistribute super."expand"; "expat-enumerator" = dontDistribute super."expat-enumerator"; @@ -2997,6 +3004,7 @@ self: super: { "fingertree-psqueue" = dontDistribute super."fingertree-psqueue"; "fingertree-tf" = dontDistribute super."fingertree-tf"; "finite-field" = dontDistribute super."finite-field"; + "finite-typelits" = dontDistribute super."finite-typelits"; "first-and-last" = dontDistribute super."first-and-last"; "first-class-patterns" = dontDistribute super."first-class-patterns"; "firstify" = dontDistribute super."firstify"; @@ -3282,6 +3290,20 @@ self: super: { "ghclive" = dontDistribute super."ghclive"; "ghczdecode" = dontDistribute super."ghczdecode"; "ght" = dontDistribute super."ght"; + "gi-atk" = dontDistribute super."gi-atk"; + "gi-cairo" = dontDistribute super."gi-cairo"; + "gi-gdk" = dontDistribute super."gi-gdk"; + "gi-gdkpixbuf" = dontDistribute super."gi-gdkpixbuf"; + "gi-gio" = dontDistribute super."gi-gio"; + "gi-glib" = dontDistribute super."gi-glib"; + "gi-gobject" = dontDistribute super."gi-gobject"; + "gi-gtk" = dontDistribute super."gi-gtk"; + "gi-javascriptcore" = dontDistribute super."gi-javascriptcore"; + "gi-notify" = dontDistribute super."gi-notify"; + "gi-pango" = dontDistribute super."gi-pango"; + "gi-soup" = dontDistribute super."gi-soup"; + "gi-vte" = dontDistribute super."gi-vte"; + "gi-webkit" = dontDistribute super."gi-webkit"; "gimlh" = dontDistribute super."gimlh"; "ginger" = dontDistribute super."ginger"; "ginsu" = dontDistribute super."ginsu"; @@ -3293,6 +3315,7 @@ self: super: { "git-date" = dontDistribute super."git-date"; "git-freq" = dontDistribute super."git-freq"; "git-gpush" = dontDistribute super."git-gpush"; + "git-jump" = dontDistribute super."git-jump"; "git-monitor" = dontDistribute super."git-monitor"; "git-object" = dontDistribute super."git-object"; "git-repair" = dontDistribute super."git-repair"; @@ -3772,6 +3795,8 @@ self: super: { "haskell-formatter" = dontDistribute super."haskell-formatter"; "haskell-ftp" = dontDistribute super."haskell-ftp"; "haskell-generate" = dontDistribute super."haskell-generate"; + "haskell-gi" = dontDistribute super."haskell-gi"; + "haskell-gi-base" = dontDistribute super."haskell-gi-base"; "haskell-import-graph" = dontDistribute super."haskell-import-graph"; "haskell-in-space" = dontDistribute super."haskell-in-space"; "haskell-modbus" = dontDistribute super."haskell-modbus"; @@ -3973,6 +3998,7 @@ self: super: { "hfann" = dontDistribute super."hfann"; "hfd" = dontDistribute super."hfd"; "hfiar" = dontDistribute super."hfiar"; + "hfmt" = dontDistribute super."hfmt"; "hfoil" = dontDistribute super."hfoil"; "hfov" = dontDistribute super."hfov"; "hfractal" = dontDistribute super."hfractal"; @@ -4389,6 +4415,7 @@ self: super: { "hsx2hs" = dontDistribute super."hsx2hs"; "hsyscall" = dontDistribute super."hsyscall"; "hszephyr" = dontDistribute super."hszephyr"; + "htaglib" = dontDistribute super."htaglib"; "htags" = dontDistribute super."htags"; "htar" = dontDistribute super."htar"; "htiled" = dontDistribute super."htiled"; @@ -4819,6 +4846,7 @@ self: super: { "keera-hails-reactive-polling" = dontDistribute super."keera-hails-reactive-polling"; "keera-hails-reactive-wx" = dontDistribute super."keera-hails-reactive-wx"; "keera-hails-reactive-yampa" = dontDistribute super."keera-hails-reactive-yampa"; + "keera-hails-reactivelenses" = dontDistribute super."keera-hails-reactivelenses"; "keera-hails-reactivevalues" = dontDistribute super."keera-hails-reactivevalues"; "keera-posture" = dontDistribute super."keera-posture"; "keiretsu" = dontDistribute super."keiretsu"; @@ -4941,6 +4969,8 @@ self: super: { "lat" = dontDistribute super."lat"; "latest-npm-version" = dontDistribute super."latest-npm-version"; "latex" = dontDistribute super."latex"; + "latex-formulae-image" = dontDistribute super."latex-formulae-image"; + "latex-formulae-pandoc" = dontDistribute super."latex-formulae-pandoc"; "lattices" = doDistribute super."lattices_1_2_1_1"; "launchpad-control" = dontDistribute super."launchpad-control"; "lax" = dontDistribute super."lax"; @@ -5306,6 +5336,7 @@ self: super: { "memexml" = dontDistribute super."memexml"; "memo-ptr" = dontDistribute super."memo-ptr"; "memo-sqlite" = dontDistribute super."memo-sqlite"; + "memoization-utils" = dontDistribute super."memoization-utils"; "memoize" = dontDistribute super."memoize"; "memory" = dontDistribute super."memory"; "memscript" = dontDistribute super."memscript"; @@ -5735,6 +5766,7 @@ self: super: { "nthable" = dontDistribute super."nthable"; "ntp-control" = dontDistribute super."ntp-control"; "null-canvas" = dontDistribute super."null-canvas"; + "nullary" = dontDistribute super."nullary"; "number" = dontDistribute super."number"; "numbering" = dontDistribute super."numbering"; "numerals" = dontDistribute super."numerals"; @@ -5958,6 +5990,7 @@ self: super: { "pcg-random" = dontDistribute super."pcg-random"; "pcre-heavy" = doDistribute super."pcre-heavy_0_2_2"; "pcre-less" = dontDistribute super."pcre-less"; + "pcre-light" = doDistribute super."pcre-light_0_4_0_3"; "pcre-light-extra" = dontDistribute super."pcre-light-extra"; "pcre-utils" = dontDistribute super."pcre-utils"; "pdf-toolbox-content" = dontDistribute super."pdf-toolbox-content"; @@ -6331,6 +6364,7 @@ self: super: { "qc-oi-testgenerator" = dontDistribute super."qc-oi-testgenerator"; "qd" = dontDistribute super."qd"; "qd-vec" = dontDistribute super."qd-vec"; + "qed" = dontDistribute super."qed"; "qhull-simple" = dontDistribute super."qhull-simple"; "qrcode" = dontDistribute super."qrcode"; "qt" = dontDistribute super."qt"; @@ -6346,6 +6380,7 @@ self: super: { "queue" = dontDistribute super."queue"; "queuelike" = dontDistribute super."queuelike"; "quick-generator" = dontDistribute super."quick-generator"; + "quick-schema" = dontDistribute super."quick-schema"; "quickcheck-io" = doDistribute super."quickcheck-io_0_1_1"; "quickcheck-poly" = dontDistribute super."quickcheck-poly"; "quickcheck-properties" = dontDistribute super."quickcheck-properties"; @@ -6840,6 +6875,7 @@ self: super: { "servant" = doDistribute super."servant_0_2_2"; "servant-JuicyPixels" = dontDistribute super."servant-JuicyPixels"; "servant-blaze" = dontDistribute super."servant-blaze"; + "servant-cassava" = dontDistribute super."servant-cassava"; "servant-client" = doDistribute super."servant-client_0_2_2"; "servant-docs" = doDistribute super."servant-docs_0_3_1"; "servant-ede" = dontDistribute super."servant-ede"; @@ -6853,6 +6889,7 @@ self: super: { "servant-response" = dontDistribute super."servant-response"; "servant-scotty" = dontDistribute super."servant-scotty"; "servant-server" = doDistribute super."servant-server_0_2_4"; + "servant-swagger" = dontDistribute super."servant-swagger"; "servant-yaml" = dontDistribute super."servant-yaml"; "serversession" = dontDistribute super."serversession"; "serversession-backend-acid-state" = dontDistribute super."serversession-backend-acid-state"; @@ -8023,6 +8060,7 @@ self: super: { "verdict" = dontDistribute super."verdict"; "verdict-json" = dontDistribute super."verdict-json"; "verilog" = dontDistribute super."verilog"; + "versions" = dontDistribute super."versions"; "vhdl" = dontDistribute super."vhdl"; "views" = dontDistribute super."views"; "vigilance" = dontDistribute super."vigilance"; @@ -8467,6 +8505,7 @@ self: super: { "zendesk-api" = dontDistribute super."zendesk-api"; "zeno" = dontDistribute super."zeno"; "zero" = dontDistribute super."zero"; + "zerobin" = dontDistribute super."zerobin"; "zeromq-haskell" = dontDistribute super."zeromq-haskell"; "zeromq3-conduit" = dontDistribute super."zeromq3-conduit"; "zeromq3-haskell" = dontDistribute super."zeromq3-haskell"; diff --git a/pkgs/development/haskell-modules/configuration-lts-2.6.nix b/pkgs/development/haskell-modules/configuration-lts-2.6.nix index ec154121c037..4bddd28f2dfc 100644 --- a/pkgs/development/haskell-modules/configuration-lts-2.6.nix +++ b/pkgs/development/haskell-modules/configuration-lts-2.6.nix @@ -507,6 +507,7 @@ self: super: { "HasGP" = dontDistribute super."HasGP"; "Haschoo" = dontDistribute super."Haschoo"; "Hashell" = dontDistribute super."Hashell"; + "HaskRel" = dontDistribute super."HaskRel"; "HaskellForMaths" = dontDistribute super."HaskellForMaths"; "HaskellLM" = dontDistribute super."HaskellLM"; "HaskellNN" = dontDistribute super."HaskellNN"; @@ -552,6 +553,7 @@ self: super: { "Hsed" = dontDistribute super."Hsed"; "Hsmtlib" = dontDistribute super."Hsmtlib"; "HueAPI" = dontDistribute super."HueAPI"; + "HulkImport" = dontDistribute super."HulkImport"; "Hungarian-Munkres" = dontDistribute super."Hungarian-Munkres"; "IDynamic" = dontDistribute super."IDynamic"; "IFS" = dontDistribute super."IFS"; @@ -1148,6 +1150,7 @@ self: super: { "afis" = dontDistribute super."afis"; "afv" = dontDistribute super."afv"; "agda-server" = dontDistribute super."agda-server"; + "agda-snippets" = dontDistribute super."agda-snippets"; "agentx" = dontDistribute super."agentx"; "agum" = dontDistribute super."agum"; "aig" = dontDistribute super."aig"; @@ -1959,6 +1962,7 @@ self: super: { "cipher-aes" = doDistribute super."cipher-aes_0_2_10"; "cipher-aes128" = doDistribute super."cipher-aes128_0_6_4"; "cipher-rc5" = dontDistribute super."cipher-rc5"; + "ciphersaber2" = dontDistribute super."ciphersaber2"; "circ" = dontDistribute super."circ"; "cirru-parser" = dontDistribute super."cirru-parser"; "citation-resolve" = dontDistribute super."citation-resolve"; @@ -2412,6 +2416,7 @@ self: super: { "dataflow" = dontDistribute super."dataflow"; "datalog" = dontDistribute super."datalog"; "datapacker" = dontDistribute super."datapacker"; + "dataurl" = dontDistribute super."dataurl"; "date-cache" = dontDistribute super."date-cache"; "dates" = dontDistribute super."dates"; "datetime" = dontDistribute super."datetime"; @@ -2821,6 +2826,7 @@ self: super: { "eros-client" = dontDistribute super."eros-client"; "eros-http" = dontDistribute super."eros-http"; "errno" = dontDistribute super."errno"; + "error-analyze" = dontDistribute super."error-analyze"; "error-continuations" = dontDistribute super."error-continuations"; "error-list" = dontDistribute super."error-list"; "error-loc" = dontDistribute super."error-loc"; @@ -2874,6 +2880,7 @@ self: super: { "exinst-deepseq" = dontDistribute super."exinst-deepseq"; "exinst-hashable" = dontDistribute super."exinst-hashable"; "exists" = dontDistribute super."exists"; + "exit-codes" = dontDistribute super."exit-codes"; "exp-pairs" = dontDistribute super."exp-pairs"; "expand" = dontDistribute super."expand"; "expat-enumerator" = dontDistribute super."expat-enumerator"; @@ -2994,6 +3001,7 @@ self: super: { "fingertree-psqueue" = dontDistribute super."fingertree-psqueue"; "fingertree-tf" = dontDistribute super."fingertree-tf"; "finite-field" = dontDistribute super."finite-field"; + "finite-typelits" = dontDistribute super."finite-typelits"; "first-and-last" = dontDistribute super."first-and-last"; "first-class-patterns" = dontDistribute super."first-class-patterns"; "firstify" = dontDistribute super."firstify"; @@ -3279,6 +3287,20 @@ self: super: { "ghclive" = dontDistribute super."ghclive"; "ghczdecode" = dontDistribute super."ghczdecode"; "ght" = dontDistribute super."ght"; + "gi-atk" = dontDistribute super."gi-atk"; + "gi-cairo" = dontDistribute super."gi-cairo"; + "gi-gdk" = dontDistribute super."gi-gdk"; + "gi-gdkpixbuf" = dontDistribute super."gi-gdkpixbuf"; + "gi-gio" = dontDistribute super."gi-gio"; + "gi-glib" = dontDistribute super."gi-glib"; + "gi-gobject" = dontDistribute super."gi-gobject"; + "gi-gtk" = dontDistribute super."gi-gtk"; + "gi-javascriptcore" = dontDistribute super."gi-javascriptcore"; + "gi-notify" = dontDistribute super."gi-notify"; + "gi-pango" = dontDistribute super."gi-pango"; + "gi-soup" = dontDistribute super."gi-soup"; + "gi-vte" = dontDistribute super."gi-vte"; + "gi-webkit" = dontDistribute super."gi-webkit"; "gimlh" = dontDistribute super."gimlh"; "ginger" = dontDistribute super."ginger"; "ginsu" = dontDistribute super."ginsu"; @@ -3290,6 +3312,7 @@ self: super: { "git-date" = dontDistribute super."git-date"; "git-freq" = dontDistribute super."git-freq"; "git-gpush" = dontDistribute super."git-gpush"; + "git-jump" = dontDistribute super."git-jump"; "git-monitor" = dontDistribute super."git-monitor"; "git-object" = dontDistribute super."git-object"; "git-repair" = dontDistribute super."git-repair"; @@ -3767,6 +3790,8 @@ self: super: { "haskell-formatter" = dontDistribute super."haskell-formatter"; "haskell-ftp" = dontDistribute super."haskell-ftp"; "haskell-generate" = dontDistribute super."haskell-generate"; + "haskell-gi" = dontDistribute super."haskell-gi"; + "haskell-gi-base" = dontDistribute super."haskell-gi-base"; "haskell-import-graph" = dontDistribute super."haskell-import-graph"; "haskell-in-space" = dontDistribute super."haskell-in-space"; "haskell-modbus" = dontDistribute super."haskell-modbus"; @@ -3968,6 +3993,7 @@ self: super: { "hfann" = dontDistribute super."hfann"; "hfd" = dontDistribute super."hfd"; "hfiar" = dontDistribute super."hfiar"; + "hfmt" = dontDistribute super."hfmt"; "hfoil" = dontDistribute super."hfoil"; "hfov" = dontDistribute super."hfov"; "hfractal" = dontDistribute super."hfractal"; @@ -4384,6 +4410,7 @@ self: super: { "hsx2hs" = dontDistribute super."hsx2hs"; "hsyscall" = dontDistribute super."hsyscall"; "hszephyr" = dontDistribute super."hszephyr"; + "htaglib" = dontDistribute super."htaglib"; "htags" = dontDistribute super."htags"; "htar" = dontDistribute super."htar"; "htiled" = dontDistribute super."htiled"; @@ -4814,6 +4841,7 @@ self: super: { "keera-hails-reactive-polling" = dontDistribute super."keera-hails-reactive-polling"; "keera-hails-reactive-wx" = dontDistribute super."keera-hails-reactive-wx"; "keera-hails-reactive-yampa" = dontDistribute super."keera-hails-reactive-yampa"; + "keera-hails-reactivelenses" = dontDistribute super."keera-hails-reactivelenses"; "keera-hails-reactivevalues" = dontDistribute super."keera-hails-reactivevalues"; "keera-posture" = dontDistribute super."keera-posture"; "keiretsu" = dontDistribute super."keiretsu"; @@ -4936,6 +4964,8 @@ self: super: { "lat" = dontDistribute super."lat"; "latest-npm-version" = dontDistribute super."latest-npm-version"; "latex" = dontDistribute super."latex"; + "latex-formulae-image" = dontDistribute super."latex-formulae-image"; + "latex-formulae-pandoc" = dontDistribute super."latex-formulae-pandoc"; "lattices" = doDistribute super."lattices_1_2_1_1"; "launchpad-control" = dontDistribute super."launchpad-control"; "lax" = dontDistribute super."lax"; @@ -5301,6 +5331,7 @@ self: super: { "memexml" = dontDistribute super."memexml"; "memo-ptr" = dontDistribute super."memo-ptr"; "memo-sqlite" = dontDistribute super."memo-sqlite"; + "memoization-utils" = dontDistribute super."memoization-utils"; "memoize" = dontDistribute super."memoize"; "memory" = dontDistribute super."memory"; "memscript" = dontDistribute super."memscript"; @@ -5729,6 +5760,7 @@ self: super: { "nthable" = dontDistribute super."nthable"; "ntp-control" = dontDistribute super."ntp-control"; "null-canvas" = dontDistribute super."null-canvas"; + "nullary" = dontDistribute super."nullary"; "number" = dontDistribute super."number"; "numbering" = dontDistribute super."numbering"; "numerals" = dontDistribute super."numerals"; @@ -5952,6 +5984,7 @@ self: super: { "pcg-random" = dontDistribute super."pcg-random"; "pcre-heavy" = doDistribute super."pcre-heavy_0_2_2"; "pcre-less" = dontDistribute super."pcre-less"; + "pcre-light" = doDistribute super."pcre-light_0_4_0_3"; "pcre-light-extra" = dontDistribute super."pcre-light-extra"; "pcre-utils" = dontDistribute super."pcre-utils"; "pdf-toolbox-content" = dontDistribute super."pdf-toolbox-content"; @@ -6325,6 +6358,7 @@ self: super: { "qc-oi-testgenerator" = dontDistribute super."qc-oi-testgenerator"; "qd" = dontDistribute super."qd"; "qd-vec" = dontDistribute super."qd-vec"; + "qed" = dontDistribute super."qed"; "qhull-simple" = dontDistribute super."qhull-simple"; "qrcode" = dontDistribute super."qrcode"; "qt" = dontDistribute super."qt"; @@ -6340,6 +6374,7 @@ self: super: { "queue" = dontDistribute super."queue"; "queuelike" = dontDistribute super."queuelike"; "quick-generator" = dontDistribute super."quick-generator"; + "quick-schema" = dontDistribute super."quick-schema"; "quickcheck-io" = doDistribute super."quickcheck-io_0_1_1"; "quickcheck-poly" = dontDistribute super."quickcheck-poly"; "quickcheck-properties" = dontDistribute super."quickcheck-properties"; @@ -6834,6 +6869,7 @@ self: super: { "servant" = doDistribute super."servant_0_2_2"; "servant-JuicyPixels" = dontDistribute super."servant-JuicyPixels"; "servant-blaze" = dontDistribute super."servant-blaze"; + "servant-cassava" = dontDistribute super."servant-cassava"; "servant-client" = doDistribute super."servant-client_0_2_2"; "servant-docs" = doDistribute super."servant-docs_0_3_1"; "servant-ede" = dontDistribute super."servant-ede"; @@ -6847,6 +6883,7 @@ self: super: { "servant-response" = dontDistribute super."servant-response"; "servant-scotty" = dontDistribute super."servant-scotty"; "servant-server" = doDistribute super."servant-server_0_2_4"; + "servant-swagger" = dontDistribute super."servant-swagger"; "servant-yaml" = dontDistribute super."servant-yaml"; "serversession" = dontDistribute super."serversession"; "serversession-backend-acid-state" = dontDistribute super."serversession-backend-acid-state"; @@ -8015,6 +8052,7 @@ self: super: { "verdict" = dontDistribute super."verdict"; "verdict-json" = dontDistribute super."verdict-json"; "verilog" = dontDistribute super."verilog"; + "versions" = dontDistribute super."versions"; "vhdl" = dontDistribute super."vhdl"; "views" = dontDistribute super."views"; "vigilance" = dontDistribute super."vigilance"; @@ -8458,6 +8496,7 @@ self: super: { "zendesk-api" = dontDistribute super."zendesk-api"; "zeno" = dontDistribute super."zeno"; "zero" = dontDistribute super."zero"; + "zerobin" = dontDistribute super."zerobin"; "zeromq-haskell" = dontDistribute super."zeromq-haskell"; "zeromq3-conduit" = dontDistribute super."zeromq3-conduit"; "zeromq3-haskell" = dontDistribute super."zeromq3-haskell"; diff --git a/pkgs/development/haskell-modules/configuration-lts-2.7.nix b/pkgs/development/haskell-modules/configuration-lts-2.7.nix index f0b2c6cadc40..e1c7722174a4 100644 --- a/pkgs/development/haskell-modules/configuration-lts-2.7.nix +++ b/pkgs/development/haskell-modules/configuration-lts-2.7.nix @@ -506,6 +506,7 @@ self: super: { "HasGP" = dontDistribute super."HasGP"; "Haschoo" = dontDistribute super."Haschoo"; "Hashell" = dontDistribute super."Hashell"; + "HaskRel" = dontDistribute super."HaskRel"; "HaskellForMaths" = dontDistribute super."HaskellForMaths"; "HaskellLM" = dontDistribute super."HaskellLM"; "HaskellNN" = dontDistribute super."HaskellNN"; @@ -551,6 +552,7 @@ self: super: { "Hsed" = dontDistribute super."Hsed"; "Hsmtlib" = dontDistribute super."Hsmtlib"; "HueAPI" = dontDistribute super."HueAPI"; + "HulkImport" = dontDistribute super."HulkImport"; "Hungarian-Munkres" = dontDistribute super."Hungarian-Munkres"; "IDynamic" = dontDistribute super."IDynamic"; "IFS" = dontDistribute super."IFS"; @@ -1147,6 +1149,7 @@ self: super: { "afis" = dontDistribute super."afis"; "afv" = dontDistribute super."afv"; "agda-server" = dontDistribute super."agda-server"; + "agda-snippets" = dontDistribute super."agda-snippets"; "agentx" = dontDistribute super."agentx"; "agum" = dontDistribute super."agum"; "aig" = dontDistribute super."aig"; @@ -1958,6 +1961,7 @@ self: super: { "cipher-aes" = doDistribute super."cipher-aes_0_2_10"; "cipher-aes128" = doDistribute super."cipher-aes128_0_6_4"; "cipher-rc5" = dontDistribute super."cipher-rc5"; + "ciphersaber2" = dontDistribute super."ciphersaber2"; "circ" = dontDistribute super."circ"; "cirru-parser" = dontDistribute super."cirru-parser"; "citation-resolve" = dontDistribute super."citation-resolve"; @@ -2411,6 +2415,7 @@ self: super: { "dataflow" = dontDistribute super."dataflow"; "datalog" = dontDistribute super."datalog"; "datapacker" = dontDistribute super."datapacker"; + "dataurl" = dontDistribute super."dataurl"; "date-cache" = dontDistribute super."date-cache"; "dates" = dontDistribute super."dates"; "datetime" = dontDistribute super."datetime"; @@ -2820,6 +2825,7 @@ self: super: { "eros-client" = dontDistribute super."eros-client"; "eros-http" = dontDistribute super."eros-http"; "errno" = dontDistribute super."errno"; + "error-analyze" = dontDistribute super."error-analyze"; "error-continuations" = dontDistribute super."error-continuations"; "error-list" = dontDistribute super."error-list"; "error-loc" = dontDistribute super."error-loc"; @@ -2873,6 +2879,7 @@ self: super: { "exinst-deepseq" = dontDistribute super."exinst-deepseq"; "exinst-hashable" = dontDistribute super."exinst-hashable"; "exists" = dontDistribute super."exists"; + "exit-codes" = dontDistribute super."exit-codes"; "exp-pairs" = dontDistribute super."exp-pairs"; "expand" = dontDistribute super."expand"; "expat-enumerator" = dontDistribute super."expat-enumerator"; @@ -2993,6 +3000,7 @@ self: super: { "fingertree-psqueue" = dontDistribute super."fingertree-psqueue"; "fingertree-tf" = dontDistribute super."fingertree-tf"; "finite-field" = dontDistribute super."finite-field"; + "finite-typelits" = dontDistribute super."finite-typelits"; "first-and-last" = dontDistribute super."first-and-last"; "first-class-patterns" = dontDistribute super."first-class-patterns"; "firstify" = dontDistribute super."firstify"; @@ -3278,6 +3286,20 @@ self: super: { "ghclive" = dontDistribute super."ghclive"; "ghczdecode" = dontDistribute super."ghczdecode"; "ght" = dontDistribute super."ght"; + "gi-atk" = dontDistribute super."gi-atk"; + "gi-cairo" = dontDistribute super."gi-cairo"; + "gi-gdk" = dontDistribute super."gi-gdk"; + "gi-gdkpixbuf" = dontDistribute super."gi-gdkpixbuf"; + "gi-gio" = dontDistribute super."gi-gio"; + "gi-glib" = dontDistribute super."gi-glib"; + "gi-gobject" = dontDistribute super."gi-gobject"; + "gi-gtk" = dontDistribute super."gi-gtk"; + "gi-javascriptcore" = dontDistribute super."gi-javascriptcore"; + "gi-notify" = dontDistribute super."gi-notify"; + "gi-pango" = dontDistribute super."gi-pango"; + "gi-soup" = dontDistribute super."gi-soup"; + "gi-vte" = dontDistribute super."gi-vte"; + "gi-webkit" = dontDistribute super."gi-webkit"; "gimlh" = dontDistribute super."gimlh"; "ginger" = dontDistribute super."ginger"; "ginsu" = dontDistribute super."ginsu"; @@ -3289,6 +3311,7 @@ self: super: { "git-date" = dontDistribute super."git-date"; "git-freq" = dontDistribute super."git-freq"; "git-gpush" = dontDistribute super."git-gpush"; + "git-jump" = dontDistribute super."git-jump"; "git-monitor" = dontDistribute super."git-monitor"; "git-object" = dontDistribute super."git-object"; "git-repair" = dontDistribute super."git-repair"; @@ -3766,6 +3789,8 @@ self: super: { "haskell-formatter" = dontDistribute super."haskell-formatter"; "haskell-ftp" = dontDistribute super."haskell-ftp"; "haskell-generate" = dontDistribute super."haskell-generate"; + "haskell-gi" = dontDistribute super."haskell-gi"; + "haskell-gi-base" = dontDistribute super."haskell-gi-base"; "haskell-import-graph" = dontDistribute super."haskell-import-graph"; "haskell-in-space" = dontDistribute super."haskell-in-space"; "haskell-modbus" = dontDistribute super."haskell-modbus"; @@ -3967,6 +3992,7 @@ self: super: { "hfann" = dontDistribute super."hfann"; "hfd" = dontDistribute super."hfd"; "hfiar" = dontDistribute super."hfiar"; + "hfmt" = dontDistribute super."hfmt"; "hfoil" = dontDistribute super."hfoil"; "hfov" = dontDistribute super."hfov"; "hfractal" = dontDistribute super."hfractal"; @@ -4383,6 +4409,7 @@ self: super: { "hsx2hs" = dontDistribute super."hsx2hs"; "hsyscall" = dontDistribute super."hsyscall"; "hszephyr" = dontDistribute super."hszephyr"; + "htaglib" = dontDistribute super."htaglib"; "htags" = dontDistribute super."htags"; "htar" = dontDistribute super."htar"; "htiled" = dontDistribute super."htiled"; @@ -4813,6 +4840,7 @@ self: super: { "keera-hails-reactive-polling" = dontDistribute super."keera-hails-reactive-polling"; "keera-hails-reactive-wx" = dontDistribute super."keera-hails-reactive-wx"; "keera-hails-reactive-yampa" = dontDistribute super."keera-hails-reactive-yampa"; + "keera-hails-reactivelenses" = dontDistribute super."keera-hails-reactivelenses"; "keera-hails-reactivevalues" = dontDistribute super."keera-hails-reactivevalues"; "keera-posture" = dontDistribute super."keera-posture"; "keiretsu" = dontDistribute super."keiretsu"; @@ -4935,6 +4963,8 @@ self: super: { "lat" = dontDistribute super."lat"; "latest-npm-version" = dontDistribute super."latest-npm-version"; "latex" = dontDistribute super."latex"; + "latex-formulae-image" = dontDistribute super."latex-formulae-image"; + "latex-formulae-pandoc" = dontDistribute super."latex-formulae-pandoc"; "lattices" = doDistribute super."lattices_1_2_1_1"; "launchpad-control" = dontDistribute super."launchpad-control"; "lax" = dontDistribute super."lax"; @@ -5300,6 +5330,7 @@ self: super: { "memexml" = dontDistribute super."memexml"; "memo-ptr" = dontDistribute super."memo-ptr"; "memo-sqlite" = dontDistribute super."memo-sqlite"; + "memoization-utils" = dontDistribute super."memoization-utils"; "memoize" = dontDistribute super."memoize"; "memory" = dontDistribute super."memory"; "memscript" = dontDistribute super."memscript"; @@ -5728,6 +5759,7 @@ self: super: { "nthable" = dontDistribute super."nthable"; "ntp-control" = dontDistribute super."ntp-control"; "null-canvas" = dontDistribute super."null-canvas"; + "nullary" = dontDistribute super."nullary"; "number" = dontDistribute super."number"; "numbering" = dontDistribute super."numbering"; "numerals" = dontDistribute super."numerals"; @@ -5951,6 +5983,7 @@ self: super: { "pcg-random" = dontDistribute super."pcg-random"; "pcre-heavy" = doDistribute super."pcre-heavy_0_2_2"; "pcre-less" = dontDistribute super."pcre-less"; + "pcre-light" = doDistribute super."pcre-light_0_4_0_3"; "pcre-light-extra" = dontDistribute super."pcre-light-extra"; "pcre-utils" = dontDistribute super."pcre-utils"; "pdf-toolbox-content" = dontDistribute super."pdf-toolbox-content"; @@ -6324,6 +6357,7 @@ self: super: { "qc-oi-testgenerator" = dontDistribute super."qc-oi-testgenerator"; "qd" = dontDistribute super."qd"; "qd-vec" = dontDistribute super."qd-vec"; + "qed" = dontDistribute super."qed"; "qhull-simple" = dontDistribute super."qhull-simple"; "qrcode" = dontDistribute super."qrcode"; "qt" = dontDistribute super."qt"; @@ -6339,6 +6373,7 @@ self: super: { "queue" = dontDistribute super."queue"; "queuelike" = dontDistribute super."queuelike"; "quick-generator" = dontDistribute super."quick-generator"; + "quick-schema" = dontDistribute super."quick-schema"; "quickcheck-io" = doDistribute super."quickcheck-io_0_1_1"; "quickcheck-poly" = dontDistribute super."quickcheck-poly"; "quickcheck-properties" = dontDistribute super."quickcheck-properties"; @@ -6833,6 +6868,7 @@ self: super: { "servant" = doDistribute super."servant_0_2_2"; "servant-JuicyPixels" = dontDistribute super."servant-JuicyPixels"; "servant-blaze" = dontDistribute super."servant-blaze"; + "servant-cassava" = dontDistribute super."servant-cassava"; "servant-client" = doDistribute super."servant-client_0_2_2"; "servant-docs" = doDistribute super."servant-docs_0_3_1"; "servant-ede" = dontDistribute super."servant-ede"; @@ -6846,6 +6882,7 @@ self: super: { "servant-response" = dontDistribute super."servant-response"; "servant-scotty" = dontDistribute super."servant-scotty"; "servant-server" = doDistribute super."servant-server_0_2_4"; + "servant-swagger" = dontDistribute super."servant-swagger"; "servant-yaml" = dontDistribute super."servant-yaml"; "serversession" = dontDistribute super."serversession"; "serversession-backend-acid-state" = dontDistribute super."serversession-backend-acid-state"; @@ -8014,6 +8051,7 @@ self: super: { "verdict" = dontDistribute super."verdict"; "verdict-json" = dontDistribute super."verdict-json"; "verilog" = dontDistribute super."verilog"; + "versions" = dontDistribute super."versions"; "vhdl" = dontDistribute super."vhdl"; "views" = dontDistribute super."views"; "vigilance" = dontDistribute super."vigilance"; @@ -8457,6 +8495,7 @@ self: super: { "zendesk-api" = dontDistribute super."zendesk-api"; "zeno" = dontDistribute super."zeno"; "zero" = dontDistribute super."zero"; + "zerobin" = dontDistribute super."zerobin"; "zeromq-haskell" = dontDistribute super."zeromq-haskell"; "zeromq3-conduit" = dontDistribute super."zeromq3-conduit"; "zeromq3-haskell" = dontDistribute super."zeromq3-haskell"; diff --git a/pkgs/development/haskell-modules/configuration-lts-2.8.nix b/pkgs/development/haskell-modules/configuration-lts-2.8.nix index a5d89fa9eaa8..aa789e5e5810 100644 --- a/pkgs/development/haskell-modules/configuration-lts-2.8.nix +++ b/pkgs/development/haskell-modules/configuration-lts-2.8.nix @@ -506,6 +506,7 @@ self: super: { "HasGP" = dontDistribute super."HasGP"; "Haschoo" = dontDistribute super."Haschoo"; "Hashell" = dontDistribute super."Hashell"; + "HaskRel" = dontDistribute super."HaskRel"; "HaskellForMaths" = dontDistribute super."HaskellForMaths"; "HaskellLM" = dontDistribute super."HaskellLM"; "HaskellNN" = dontDistribute super."HaskellNN"; @@ -551,6 +552,7 @@ self: super: { "Hsed" = dontDistribute super."Hsed"; "Hsmtlib" = dontDistribute super."Hsmtlib"; "HueAPI" = dontDistribute super."HueAPI"; + "HulkImport" = dontDistribute super."HulkImport"; "Hungarian-Munkres" = dontDistribute super."Hungarian-Munkres"; "IDynamic" = dontDistribute super."IDynamic"; "IFS" = dontDistribute super."IFS"; @@ -1146,6 +1148,7 @@ self: super: { "afis" = dontDistribute super."afis"; "afv" = dontDistribute super."afv"; "agda-server" = dontDistribute super."agda-server"; + "agda-snippets" = dontDistribute super."agda-snippets"; "agentx" = dontDistribute super."agentx"; "agum" = dontDistribute super."agum"; "aig" = dontDistribute super."aig"; @@ -1957,6 +1960,7 @@ self: super: { "cipher-aes" = doDistribute super."cipher-aes_0_2_10"; "cipher-aes128" = doDistribute super."cipher-aes128_0_6_4"; "cipher-rc5" = dontDistribute super."cipher-rc5"; + "ciphersaber2" = dontDistribute super."ciphersaber2"; "circ" = dontDistribute super."circ"; "cirru-parser" = dontDistribute super."cirru-parser"; "citation-resolve" = dontDistribute super."citation-resolve"; @@ -2410,6 +2414,7 @@ self: super: { "dataflow" = dontDistribute super."dataflow"; "datalog" = dontDistribute super."datalog"; "datapacker" = dontDistribute super."datapacker"; + "dataurl" = dontDistribute super."dataurl"; "date-cache" = dontDistribute super."date-cache"; "dates" = dontDistribute super."dates"; "datetime" = dontDistribute super."datetime"; @@ -2819,6 +2824,7 @@ self: super: { "eros-client" = dontDistribute super."eros-client"; "eros-http" = dontDistribute super."eros-http"; "errno" = dontDistribute super."errno"; + "error-analyze" = dontDistribute super."error-analyze"; "error-continuations" = dontDistribute super."error-continuations"; "error-list" = dontDistribute super."error-list"; "error-loc" = dontDistribute super."error-loc"; @@ -2872,6 +2878,7 @@ self: super: { "exinst-deepseq" = dontDistribute super."exinst-deepseq"; "exinst-hashable" = dontDistribute super."exinst-hashable"; "exists" = dontDistribute super."exists"; + "exit-codes" = dontDistribute super."exit-codes"; "exp-pairs" = dontDistribute super."exp-pairs"; "expand" = dontDistribute super."expand"; "expat-enumerator" = dontDistribute super."expat-enumerator"; @@ -2992,6 +2999,7 @@ self: super: { "fingertree-psqueue" = dontDistribute super."fingertree-psqueue"; "fingertree-tf" = dontDistribute super."fingertree-tf"; "finite-field" = dontDistribute super."finite-field"; + "finite-typelits" = dontDistribute super."finite-typelits"; "first-and-last" = dontDistribute super."first-and-last"; "first-class-patterns" = dontDistribute super."first-class-patterns"; "firstify" = dontDistribute super."firstify"; @@ -3276,6 +3284,20 @@ self: super: { "ghclive" = dontDistribute super."ghclive"; "ghczdecode" = dontDistribute super."ghczdecode"; "ght" = dontDistribute super."ght"; + "gi-atk" = dontDistribute super."gi-atk"; + "gi-cairo" = dontDistribute super."gi-cairo"; + "gi-gdk" = dontDistribute super."gi-gdk"; + "gi-gdkpixbuf" = dontDistribute super."gi-gdkpixbuf"; + "gi-gio" = dontDistribute super."gi-gio"; + "gi-glib" = dontDistribute super."gi-glib"; + "gi-gobject" = dontDistribute super."gi-gobject"; + "gi-gtk" = dontDistribute super."gi-gtk"; + "gi-javascriptcore" = dontDistribute super."gi-javascriptcore"; + "gi-notify" = dontDistribute super."gi-notify"; + "gi-pango" = dontDistribute super."gi-pango"; + "gi-soup" = dontDistribute super."gi-soup"; + "gi-vte" = dontDistribute super."gi-vte"; + "gi-webkit" = dontDistribute super."gi-webkit"; "gimlh" = dontDistribute super."gimlh"; "ginger" = dontDistribute super."ginger"; "ginsu" = dontDistribute super."ginsu"; @@ -3287,6 +3309,7 @@ self: super: { "git-date" = dontDistribute super."git-date"; "git-freq" = dontDistribute super."git-freq"; "git-gpush" = dontDistribute super."git-gpush"; + "git-jump" = dontDistribute super."git-jump"; "git-monitor" = dontDistribute super."git-monitor"; "git-object" = dontDistribute super."git-object"; "git-repair" = dontDistribute super."git-repair"; @@ -3764,6 +3787,8 @@ self: super: { "haskell-formatter" = dontDistribute super."haskell-formatter"; "haskell-ftp" = dontDistribute super."haskell-ftp"; "haskell-generate" = dontDistribute super."haskell-generate"; + "haskell-gi" = dontDistribute super."haskell-gi"; + "haskell-gi-base" = dontDistribute super."haskell-gi-base"; "haskell-import-graph" = dontDistribute super."haskell-import-graph"; "haskell-in-space" = dontDistribute super."haskell-in-space"; "haskell-modbus" = dontDistribute super."haskell-modbus"; @@ -3965,6 +3990,7 @@ self: super: { "hfann" = dontDistribute super."hfann"; "hfd" = dontDistribute super."hfd"; "hfiar" = dontDistribute super."hfiar"; + "hfmt" = dontDistribute super."hfmt"; "hfoil" = dontDistribute super."hfoil"; "hfov" = dontDistribute super."hfov"; "hfractal" = dontDistribute super."hfractal"; @@ -4381,6 +4407,7 @@ self: super: { "hsx2hs" = dontDistribute super."hsx2hs"; "hsyscall" = dontDistribute super."hsyscall"; "hszephyr" = dontDistribute super."hszephyr"; + "htaglib" = dontDistribute super."htaglib"; "htags" = dontDistribute super."htags"; "htar" = dontDistribute super."htar"; "htiled" = dontDistribute super."htiled"; @@ -4809,6 +4836,7 @@ self: super: { "keera-hails-reactive-polling" = dontDistribute super."keera-hails-reactive-polling"; "keera-hails-reactive-wx" = dontDistribute super."keera-hails-reactive-wx"; "keera-hails-reactive-yampa" = dontDistribute super."keera-hails-reactive-yampa"; + "keera-hails-reactivelenses" = dontDistribute super."keera-hails-reactivelenses"; "keera-hails-reactivevalues" = dontDistribute super."keera-hails-reactivevalues"; "keera-posture" = dontDistribute super."keera-posture"; "keiretsu" = dontDistribute super."keiretsu"; @@ -4931,6 +4959,8 @@ self: super: { "lat" = dontDistribute super."lat"; "latest-npm-version" = dontDistribute super."latest-npm-version"; "latex" = dontDistribute super."latex"; + "latex-formulae-image" = dontDistribute super."latex-formulae-image"; + "latex-formulae-pandoc" = dontDistribute super."latex-formulae-pandoc"; "lattices" = doDistribute super."lattices_1_2_1_1"; "launchpad-control" = dontDistribute super."launchpad-control"; "lax" = dontDistribute super."lax"; @@ -5296,6 +5326,7 @@ self: super: { "memexml" = dontDistribute super."memexml"; "memo-ptr" = dontDistribute super."memo-ptr"; "memo-sqlite" = dontDistribute super."memo-sqlite"; + "memoization-utils" = dontDistribute super."memoization-utils"; "memoize" = dontDistribute super."memoize"; "memory" = dontDistribute super."memory"; "memscript" = dontDistribute super."memscript"; @@ -5724,6 +5755,7 @@ self: super: { "nthable" = dontDistribute super."nthable"; "ntp-control" = dontDistribute super."ntp-control"; "null-canvas" = dontDistribute super."null-canvas"; + "nullary" = dontDistribute super."nullary"; "number" = dontDistribute super."number"; "numbering" = dontDistribute super."numbering"; "numerals" = dontDistribute super."numerals"; @@ -5947,6 +5979,7 @@ self: super: { "pcg-random" = dontDistribute super."pcg-random"; "pcre-heavy" = doDistribute super."pcre-heavy_0_2_2"; "pcre-less" = dontDistribute super."pcre-less"; + "pcre-light" = doDistribute super."pcre-light_0_4_0_3"; "pcre-light-extra" = dontDistribute super."pcre-light-extra"; "pcre-utils" = dontDistribute super."pcre-utils"; "pdf-toolbox-content" = dontDistribute super."pdf-toolbox-content"; @@ -6320,6 +6353,7 @@ self: super: { "qc-oi-testgenerator" = dontDistribute super."qc-oi-testgenerator"; "qd" = dontDistribute super."qd"; "qd-vec" = dontDistribute super."qd-vec"; + "qed" = dontDistribute super."qed"; "qhull-simple" = dontDistribute super."qhull-simple"; "qrcode" = dontDistribute super."qrcode"; "qt" = dontDistribute super."qt"; @@ -6335,6 +6369,7 @@ self: super: { "queue" = dontDistribute super."queue"; "queuelike" = dontDistribute super."queuelike"; "quick-generator" = dontDistribute super."quick-generator"; + "quick-schema" = dontDistribute super."quick-schema"; "quickcheck-io" = doDistribute super."quickcheck-io_0_1_1"; "quickcheck-poly" = dontDistribute super."quickcheck-poly"; "quickcheck-properties" = dontDistribute super."quickcheck-properties"; @@ -6828,6 +6863,7 @@ self: super: { "servant" = doDistribute super."servant_0_2_2"; "servant-JuicyPixels" = dontDistribute super."servant-JuicyPixels"; "servant-blaze" = dontDistribute super."servant-blaze"; + "servant-cassava" = dontDistribute super."servant-cassava"; "servant-client" = doDistribute super."servant-client_0_2_2"; "servant-docs" = doDistribute super."servant-docs_0_3_1"; "servant-ede" = dontDistribute super."servant-ede"; @@ -6841,6 +6877,7 @@ self: super: { "servant-response" = dontDistribute super."servant-response"; "servant-scotty" = dontDistribute super."servant-scotty"; "servant-server" = doDistribute super."servant-server_0_2_4"; + "servant-swagger" = dontDistribute super."servant-swagger"; "servant-yaml" = dontDistribute super."servant-yaml"; "serversession" = dontDistribute super."serversession"; "serversession-backend-acid-state" = dontDistribute super."serversession-backend-acid-state"; @@ -8006,6 +8043,7 @@ self: super: { "verdict" = dontDistribute super."verdict"; "verdict-json" = dontDistribute super."verdict-json"; "verilog" = dontDistribute super."verilog"; + "versions" = dontDistribute super."versions"; "vhdl" = dontDistribute super."vhdl"; "views" = dontDistribute super."views"; "vigilance" = dontDistribute super."vigilance"; @@ -8449,6 +8487,7 @@ self: super: { "zendesk-api" = dontDistribute super."zendesk-api"; "zeno" = dontDistribute super."zeno"; "zero" = dontDistribute super."zero"; + "zerobin" = dontDistribute super."zerobin"; "zeromq-haskell" = dontDistribute super."zeromq-haskell"; "zeromq3-conduit" = dontDistribute super."zeromq3-conduit"; "zeromq3-haskell" = dontDistribute super."zeromq3-haskell"; diff --git a/pkgs/development/haskell-modules/configuration-lts-2.9.nix b/pkgs/development/haskell-modules/configuration-lts-2.9.nix index 6cd48db564d2..bc0a2c1e3e5a 100644 --- a/pkgs/development/haskell-modules/configuration-lts-2.9.nix +++ b/pkgs/development/haskell-modules/configuration-lts-2.9.nix @@ -506,6 +506,7 @@ self: super: { "HasGP" = dontDistribute super."HasGP"; "Haschoo" = dontDistribute super."Haschoo"; "Hashell" = dontDistribute super."Hashell"; + "HaskRel" = dontDistribute super."HaskRel"; "HaskellForMaths" = dontDistribute super."HaskellForMaths"; "HaskellLM" = dontDistribute super."HaskellLM"; "HaskellNN" = dontDistribute super."HaskellNN"; @@ -551,6 +552,7 @@ self: super: { "Hsed" = dontDistribute super."Hsed"; "Hsmtlib" = dontDistribute super."Hsmtlib"; "HueAPI" = dontDistribute super."HueAPI"; + "HulkImport" = dontDistribute super."HulkImport"; "Hungarian-Munkres" = dontDistribute super."Hungarian-Munkres"; "IDynamic" = dontDistribute super."IDynamic"; "IFS" = dontDistribute super."IFS"; @@ -1146,6 +1148,7 @@ self: super: { "afis" = dontDistribute super."afis"; "afv" = dontDistribute super."afv"; "agda-server" = dontDistribute super."agda-server"; + "agda-snippets" = dontDistribute super."agda-snippets"; "agentx" = dontDistribute super."agentx"; "agum" = dontDistribute super."agum"; "aig" = dontDistribute super."aig"; @@ -1954,6 +1957,7 @@ self: super: { "cipher-aes" = doDistribute super."cipher-aes_0_2_10"; "cipher-aes128" = doDistribute super."cipher-aes128_0_6_4"; "cipher-rc5" = dontDistribute super."cipher-rc5"; + "ciphersaber2" = dontDistribute super."ciphersaber2"; "circ" = dontDistribute super."circ"; "cirru-parser" = dontDistribute super."cirru-parser"; "citation-resolve" = dontDistribute super."citation-resolve"; @@ -2407,6 +2411,7 @@ self: super: { "dataflow" = dontDistribute super."dataflow"; "datalog" = dontDistribute super."datalog"; "datapacker" = dontDistribute super."datapacker"; + "dataurl" = dontDistribute super."dataurl"; "date-cache" = dontDistribute super."date-cache"; "dates" = dontDistribute super."dates"; "datetime" = dontDistribute super."datetime"; @@ -2814,6 +2819,7 @@ self: super: { "eros-client" = dontDistribute super."eros-client"; "eros-http" = dontDistribute super."eros-http"; "errno" = dontDistribute super."errno"; + "error-analyze" = dontDistribute super."error-analyze"; "error-continuations" = dontDistribute super."error-continuations"; "error-list" = dontDistribute super."error-list"; "error-loc" = dontDistribute super."error-loc"; @@ -2867,6 +2873,7 @@ self: super: { "exinst-deepseq" = dontDistribute super."exinst-deepseq"; "exinst-hashable" = dontDistribute super."exinst-hashable"; "exists" = dontDistribute super."exists"; + "exit-codes" = dontDistribute super."exit-codes"; "exp-pairs" = dontDistribute super."exp-pairs"; "expand" = dontDistribute super."expand"; "expat-enumerator" = dontDistribute super."expat-enumerator"; @@ -2987,6 +2994,7 @@ self: super: { "fingertree-psqueue" = dontDistribute super."fingertree-psqueue"; "fingertree-tf" = dontDistribute super."fingertree-tf"; "finite-field" = dontDistribute super."finite-field"; + "finite-typelits" = dontDistribute super."finite-typelits"; "first-and-last" = dontDistribute super."first-and-last"; "first-class-patterns" = dontDistribute super."first-class-patterns"; "firstify" = dontDistribute super."firstify"; @@ -3271,6 +3279,20 @@ self: super: { "ghclive" = dontDistribute super."ghclive"; "ghczdecode" = dontDistribute super."ghczdecode"; "ght" = dontDistribute super."ght"; + "gi-atk" = dontDistribute super."gi-atk"; + "gi-cairo" = dontDistribute super."gi-cairo"; + "gi-gdk" = dontDistribute super."gi-gdk"; + "gi-gdkpixbuf" = dontDistribute super."gi-gdkpixbuf"; + "gi-gio" = dontDistribute super."gi-gio"; + "gi-glib" = dontDistribute super."gi-glib"; + "gi-gobject" = dontDistribute super."gi-gobject"; + "gi-gtk" = dontDistribute super."gi-gtk"; + "gi-javascriptcore" = dontDistribute super."gi-javascriptcore"; + "gi-notify" = dontDistribute super."gi-notify"; + "gi-pango" = dontDistribute super."gi-pango"; + "gi-soup" = dontDistribute super."gi-soup"; + "gi-vte" = dontDistribute super."gi-vte"; + "gi-webkit" = dontDistribute super."gi-webkit"; "gimlh" = dontDistribute super."gimlh"; "ginger" = dontDistribute super."ginger"; "ginsu" = dontDistribute super."ginsu"; @@ -3282,6 +3304,7 @@ self: super: { "git-date" = dontDistribute super."git-date"; "git-freq" = dontDistribute super."git-freq"; "git-gpush" = dontDistribute super."git-gpush"; + "git-jump" = dontDistribute super."git-jump"; "git-monitor" = dontDistribute super."git-monitor"; "git-object" = dontDistribute super."git-object"; "git-repair" = dontDistribute super."git-repair"; @@ -3758,6 +3781,8 @@ self: super: { "haskell-formatter" = dontDistribute super."haskell-formatter"; "haskell-ftp" = dontDistribute super."haskell-ftp"; "haskell-generate" = dontDistribute super."haskell-generate"; + "haskell-gi" = dontDistribute super."haskell-gi"; + "haskell-gi-base" = dontDistribute super."haskell-gi-base"; "haskell-import-graph" = dontDistribute super."haskell-import-graph"; "haskell-in-space" = dontDistribute super."haskell-in-space"; "haskell-modbus" = dontDistribute super."haskell-modbus"; @@ -3959,6 +3984,7 @@ self: super: { "hfann" = dontDistribute super."hfann"; "hfd" = dontDistribute super."hfd"; "hfiar" = dontDistribute super."hfiar"; + "hfmt" = dontDistribute super."hfmt"; "hfoil" = dontDistribute super."hfoil"; "hfov" = dontDistribute super."hfov"; "hfractal" = dontDistribute super."hfractal"; @@ -4374,6 +4400,7 @@ self: super: { "hsx2hs" = dontDistribute super."hsx2hs"; "hsyscall" = dontDistribute super."hsyscall"; "hszephyr" = dontDistribute super."hszephyr"; + "htaglib" = dontDistribute super."htaglib"; "htags" = dontDistribute super."htags"; "htar" = dontDistribute super."htar"; "htiled" = dontDistribute super."htiled"; @@ -4801,6 +4828,7 @@ self: super: { "keera-hails-reactive-polling" = dontDistribute super."keera-hails-reactive-polling"; "keera-hails-reactive-wx" = dontDistribute super."keera-hails-reactive-wx"; "keera-hails-reactive-yampa" = dontDistribute super."keera-hails-reactive-yampa"; + "keera-hails-reactivelenses" = dontDistribute super."keera-hails-reactivelenses"; "keera-hails-reactivevalues" = dontDistribute super."keera-hails-reactivevalues"; "keera-posture" = dontDistribute super."keera-posture"; "keiretsu" = dontDistribute super."keiretsu"; @@ -4923,6 +4951,8 @@ self: super: { "lat" = dontDistribute super."lat"; "latest-npm-version" = dontDistribute super."latest-npm-version"; "latex" = dontDistribute super."latex"; + "latex-formulae-image" = dontDistribute super."latex-formulae-image"; + "latex-formulae-pandoc" = dontDistribute super."latex-formulae-pandoc"; "lattices" = doDistribute super."lattices_1_2_1_1"; "launchpad-control" = dontDistribute super."launchpad-control"; "lax" = dontDistribute super."lax"; @@ -5286,6 +5316,7 @@ self: super: { "memexml" = dontDistribute super."memexml"; "memo-ptr" = dontDistribute super."memo-ptr"; "memo-sqlite" = dontDistribute super."memo-sqlite"; + "memoization-utils" = dontDistribute super."memoization-utils"; "memoize" = dontDistribute super."memoize"; "memory" = dontDistribute super."memory"; "memscript" = dontDistribute super."memscript"; @@ -5714,6 +5745,7 @@ self: super: { "nthable" = dontDistribute super."nthable"; "ntp-control" = dontDistribute super."ntp-control"; "null-canvas" = dontDistribute super."null-canvas"; + "nullary" = dontDistribute super."nullary"; "number" = dontDistribute super."number"; "numbering" = dontDistribute super."numbering"; "numerals" = dontDistribute super."numerals"; @@ -5937,6 +5969,7 @@ self: super: { "pcg-random" = dontDistribute super."pcg-random"; "pcre-heavy" = doDistribute super."pcre-heavy_0_2_2"; "pcre-less" = dontDistribute super."pcre-less"; + "pcre-light" = doDistribute super."pcre-light_0_4_0_3"; "pcre-light-extra" = dontDistribute super."pcre-light-extra"; "pcre-utils" = dontDistribute super."pcre-utils"; "pdf-toolbox-content" = dontDistribute super."pdf-toolbox-content"; @@ -6308,6 +6341,7 @@ self: super: { "qc-oi-testgenerator" = dontDistribute super."qc-oi-testgenerator"; "qd" = dontDistribute super."qd"; "qd-vec" = dontDistribute super."qd-vec"; + "qed" = dontDistribute super."qed"; "qhull-simple" = dontDistribute super."qhull-simple"; "qrcode" = dontDistribute super."qrcode"; "qt" = dontDistribute super."qt"; @@ -6323,6 +6357,7 @@ self: super: { "queue" = dontDistribute super."queue"; "queuelike" = dontDistribute super."queuelike"; "quick-generator" = dontDistribute super."quick-generator"; + "quick-schema" = dontDistribute super."quick-schema"; "quickcheck-io" = doDistribute super."quickcheck-io_0_1_1"; "quickcheck-poly" = dontDistribute super."quickcheck-poly"; "quickcheck-properties" = dontDistribute super."quickcheck-properties"; @@ -6816,6 +6851,7 @@ self: super: { "servant" = doDistribute super."servant_0_2_2"; "servant-JuicyPixels" = dontDistribute super."servant-JuicyPixels"; "servant-blaze" = dontDistribute super."servant-blaze"; + "servant-cassava" = dontDistribute super."servant-cassava"; "servant-client" = doDistribute super."servant-client_0_2_2"; "servant-docs" = doDistribute super."servant-docs_0_3_1"; "servant-ede" = dontDistribute super."servant-ede"; @@ -6829,6 +6865,7 @@ self: super: { "servant-response" = dontDistribute super."servant-response"; "servant-scotty" = dontDistribute super."servant-scotty"; "servant-server" = doDistribute super."servant-server_0_2_4"; + "servant-swagger" = dontDistribute super."servant-swagger"; "servant-yaml" = dontDistribute super."servant-yaml"; "serversession" = dontDistribute super."serversession"; "serversession-backend-acid-state" = dontDistribute super."serversession-backend-acid-state"; @@ -7990,6 +8027,7 @@ self: super: { "verdict" = dontDistribute super."verdict"; "verdict-json" = dontDistribute super."verdict-json"; "verilog" = dontDistribute super."verilog"; + "versions" = dontDistribute super."versions"; "vhdl" = dontDistribute super."vhdl"; "views" = dontDistribute super."views"; "vigilance" = dontDistribute super."vigilance"; @@ -8432,6 +8470,7 @@ self: super: { "zendesk-api" = dontDistribute super."zendesk-api"; "zeno" = dontDistribute super."zeno"; "zero" = dontDistribute super."zero"; + "zerobin" = dontDistribute super."zerobin"; "zeromq-haskell" = dontDistribute super."zeromq-haskell"; "zeromq3-conduit" = dontDistribute super."zeromq3-conduit"; "zeromq3-haskell" = dontDistribute super."zeromq3-haskell"; diff --git a/pkgs/development/haskell-modules/configuration-lts-3.0.nix b/pkgs/development/haskell-modules/configuration-lts-3.0.nix index 50503c6a4daf..2f3c1110ab71 100644 --- a/pkgs/development/haskell-modules/configuration-lts-3.0.nix +++ b/pkgs/development/haskell-modules/configuration-lts-3.0.nix @@ -492,6 +492,7 @@ self: super: { "HasGP" = dontDistribute super."HasGP"; "Haschoo" = dontDistribute super."Haschoo"; "Hashell" = dontDistribute super."Hashell"; + "HaskRel" = dontDistribute super."HaskRel"; "HaskellForMaths" = dontDistribute super."HaskellForMaths"; "HaskellLM" = dontDistribute super."HaskellLM"; "HaskellNN" = dontDistribute super."HaskellNN"; @@ -536,6 +537,7 @@ self: super: { "Hsed" = dontDistribute super."Hsed"; "Hsmtlib" = dontDistribute super."Hsmtlib"; "HueAPI" = dontDistribute super."HueAPI"; + "HulkImport" = dontDistribute super."HulkImport"; "Hungarian-Munkres" = dontDistribute super."Hungarian-Munkres"; "IDynamic" = dontDistribute super."IDynamic"; "IFS" = dontDistribute super."IFS"; @@ -1115,6 +1117,7 @@ self: super: { "afis" = dontDistribute super."afis"; "afv" = dontDistribute super."afv"; "agda-server" = dontDistribute super."agda-server"; + "agda-snippets" = dontDistribute super."agda-snippets"; "agum" = dontDistribute super."agum"; "aig" = dontDistribute super."aig"; "air" = dontDistribute super."air"; @@ -1384,6 +1387,7 @@ self: super: { "awesomium" = dontDistribute super."awesomium"; "awesomium-glut" = dontDistribute super."awesomium-glut"; "awesomium-raw" = dontDistribute super."awesomium-raw"; + "aws" = doDistribute super."aws_0_12_1"; "aws-cloudfront-signer" = dontDistribute super."aws-cloudfront-signer"; "aws-configuration-tools" = dontDistribute super."aws-configuration-tools"; "aws-dynamodb-conduit" = dontDistribute super."aws-dynamodb-conduit"; @@ -1870,6 +1874,7 @@ self: super: { "cinvoke" = dontDistribute super."cinvoke"; "cio" = dontDistribute super."cio"; "cipher-rc5" = dontDistribute super."cipher-rc5"; + "ciphersaber2" = dontDistribute super."ciphersaber2"; "circ" = dontDistribute super."circ"; "cirru-parser" = dontDistribute super."cirru-parser"; "citation-resolve" = dontDistribute super."citation-resolve"; @@ -2127,6 +2132,7 @@ self: super: { "cpuid" = dontDistribute super."cpuid"; "cpuperf" = dontDistribute super."cpuperf"; "cpython" = dontDistribute super."cpython"; + "cql" = doDistribute super."cql_3_0_5"; "cqrs" = dontDistribute super."cqrs"; "cqrs-core" = dontDistribute super."cqrs-core"; "cqrs-example" = dontDistribute super."cqrs-example"; @@ -2306,6 +2312,7 @@ self: super: { "dataflow" = dontDistribute super."dataflow"; "datalog" = dontDistribute super."datalog"; "datapacker" = dontDistribute super."datapacker"; + "dataurl" = dontDistribute super."dataurl"; "date-cache" = dontDistribute super."date-cache"; "dates" = dontDistribute super."dates"; "datetime" = dontDistribute super."datetime"; @@ -2691,6 +2698,7 @@ self: super: { "eros-client" = dontDistribute super."eros-client"; "eros-http" = dontDistribute super."eros-http"; "errno" = dontDistribute super."errno"; + "error-analyze" = dontDistribute super."error-analyze"; "error-continuations" = dontDistribute super."error-continuations"; "error-list" = dontDistribute super."error-list"; "error-loc" = dontDistribute super."error-loc"; @@ -2741,6 +2749,7 @@ self: super: { "exinst-deepseq" = dontDistribute super."exinst-deepseq"; "exinst-hashable" = dontDistribute super."exinst-hashable"; "exists" = dontDistribute super."exists"; + "exit-codes" = dontDistribute super."exit-codes"; "exp-pairs" = dontDistribute super."exp-pairs"; "expand" = dontDistribute super."expand"; "expat-enumerator" = dontDistribute super."expat-enumerator"; @@ -2850,6 +2859,7 @@ self: super: { "find-conduit" = dontDistribute super."find-conduit"; "fingertree-tf" = dontDistribute super."fingertree-tf"; "finite-field" = dontDistribute super."finite-field"; + "finite-typelits" = dontDistribute super."finite-typelits"; "first-and-last" = dontDistribute super."first-and-last"; "first-class-patterns" = dontDistribute super."first-class-patterns"; "firstify" = dontDistribute super."firstify"; @@ -3122,17 +3132,33 @@ self: super: { "ghclive" = dontDistribute super."ghclive"; "ghczdecode" = dontDistribute super."ghczdecode"; "ght" = dontDistribute super."ght"; + "gi-atk" = dontDistribute super."gi-atk"; + "gi-cairo" = dontDistribute super."gi-cairo"; + "gi-gdk" = dontDistribute super."gi-gdk"; + "gi-gdkpixbuf" = dontDistribute super."gi-gdkpixbuf"; + "gi-gio" = dontDistribute super."gi-gio"; + "gi-glib" = dontDistribute super."gi-glib"; + "gi-gobject" = dontDistribute super."gi-gobject"; + "gi-gtk" = dontDistribute super."gi-gtk"; + "gi-javascriptcore" = dontDistribute super."gi-javascriptcore"; + "gi-notify" = dontDistribute super."gi-notify"; + "gi-pango" = dontDistribute super."gi-pango"; + "gi-soup" = dontDistribute super."gi-soup"; + "gi-vte" = dontDistribute super."gi-vte"; + "gi-webkit" = dontDistribute super."gi-webkit"; "gimlh" = dontDistribute super."gimlh"; "ginger" = dontDistribute super."ginger"; "ginsu" = dontDistribute super."ginsu"; "gipeda" = doDistribute super."gipeda_0_1_2_1"; "gist" = dontDistribute super."gist"; "git-all" = dontDistribute super."git-all"; + "git-annex" = doDistribute super."git-annex_5_20150727"; "git-checklist" = dontDistribute super."git-checklist"; "git-date" = dontDistribute super."git-date"; "git-embed" = dontDistribute super."git-embed"; "git-freq" = dontDistribute super."git-freq"; "git-gpush" = dontDistribute super."git-gpush"; + "git-jump" = dontDistribute super."git-jump"; "git-monitor" = dontDistribute super."git-monitor"; "git-object" = dontDistribute super."git-object"; "git-repair" = dontDistribute super."git-repair"; @@ -3595,6 +3621,8 @@ self: super: { "haskell-formatter" = dontDistribute super."haskell-formatter"; "haskell-ftp" = dontDistribute super."haskell-ftp"; "haskell-generate" = dontDistribute super."haskell-generate"; + "haskell-gi" = dontDistribute super."haskell-gi"; + "haskell-gi-base" = dontDistribute super."haskell-gi-base"; "haskell-import-graph" = dontDistribute super."haskell-import-graph"; "haskell-in-space" = dontDistribute super."haskell-in-space"; "haskell-modbus" = dontDistribute super."haskell-modbus"; @@ -3786,9 +3814,11 @@ self: super: { "hfann" = dontDistribute super."hfann"; "hfd" = dontDistribute super."hfd"; "hfiar" = dontDistribute super."hfiar"; + "hfmt" = dontDistribute super."hfmt"; "hfoil" = dontDistribute super."hfoil"; "hfov" = dontDistribute super."hfov"; "hfractal" = dontDistribute super."hfractal"; + "hfsevents" = doDistribute super."hfsevents_0_1_5"; "hfusion" = dontDistribute super."hfusion"; "hg-buildpackage" = dontDistribute super."hg-buildpackage"; "hgal" = dontDistribute super."hgal"; @@ -4185,6 +4215,7 @@ self: super: { "hsx2hs" = dontDistribute super."hsx2hs"; "hsyscall" = dontDistribute super."hsyscall"; "hszephyr" = dontDistribute super."hszephyr"; + "htaglib" = dontDistribute super."htaglib"; "htags" = dontDistribute super."htags"; "htar" = dontDistribute super."htar"; "htiled" = dontDistribute super."htiled"; @@ -4586,6 +4617,7 @@ self: super: { "keera-hails-reactive-polling" = dontDistribute super."keera-hails-reactive-polling"; "keera-hails-reactive-wx" = dontDistribute super."keera-hails-reactive-wx"; "keera-hails-reactive-yampa" = dontDistribute super."keera-hails-reactive-yampa"; + "keera-hails-reactivelenses" = dontDistribute super."keera-hails-reactivelenses"; "keera-hails-reactivevalues" = dontDistribute super."keera-hails-reactivevalues"; "keera-posture" = dontDistribute super."keera-posture"; "keiretsu" = dontDistribute super."keiretsu"; @@ -4692,6 +4724,8 @@ self: super: { "lat" = dontDistribute super."lat"; "latest-npm-version" = dontDistribute super."latest-npm-version"; "latex" = dontDistribute super."latex"; + "latex-formulae-image" = dontDistribute super."latex-formulae-image"; + "latex-formulae-pandoc" = dontDistribute super."latex-formulae-pandoc"; "lattices" = doDistribute super."lattices_1_3"; "launchpad-control" = dontDistribute super."launchpad-control"; "lax" = dontDistribute super."lax"; @@ -4720,6 +4754,7 @@ self: super: { "leksah" = dontDistribute super."leksah"; "leksah-server" = dontDistribute super."leksah-server"; "lendingclub" = dontDistribute super."lendingclub"; + "lens-action" = doDistribute super."lens-action_0_2_0_1"; "lens-aeson" = doDistribute super."lens-aeson_1_0_0_4"; "lens-datetime" = dontDistribute super."lens-datetime"; "lens-prelude" = dontDistribute super."lens-prelude"; @@ -5031,6 +5066,7 @@ self: super: { "memexml" = dontDistribute super."memexml"; "memo-ptr" = dontDistribute super."memo-ptr"; "memo-sqlite" = dontDistribute super."memo-sqlite"; + "memoization-utils" = dontDistribute super."memoization-utils"; "memory" = doDistribute super."memory_0_7"; "memscript" = dontDistribute super."memscript"; "mersenne-random" = dontDistribute super."mersenne-random"; @@ -5432,6 +5468,7 @@ self: super: { "nthable" = dontDistribute super."nthable"; "ntp-control" = dontDistribute super."ntp-control"; "null-canvas" = dontDistribute super."null-canvas"; + "nullary" = dontDistribute super."nullary"; "number" = dontDistribute super."number"; "numbering" = dontDistribute super."numbering"; "numerals" = dontDistribute super."numerals"; @@ -5645,6 +5682,7 @@ self: super: { "pcg-random" = dontDistribute super."pcg-random"; "pcre-heavy" = doDistribute super."pcre-heavy_0_2_2"; "pcre-less" = dontDistribute super."pcre-less"; + "pcre-light" = doDistribute super."pcre-light_0_4_0_3"; "pcre-light-extra" = dontDistribute super."pcre-light-extra"; "pcre-utils" = dontDistribute super."pcre-utils"; "pdf-toolbox-content" = dontDistribute super."pdf-toolbox-content"; @@ -5997,6 +6035,7 @@ self: super: { "qc-oi-testgenerator" = dontDistribute super."qc-oi-testgenerator"; "qd" = dontDistribute super."qd"; "qd-vec" = dontDistribute super."qd-vec"; + "qed" = dontDistribute super."qed"; "qhull-simple" = dontDistribute super."qhull-simple"; "qrcode" = dontDistribute super."qrcode"; "qt" = dontDistribute super."qt"; @@ -6011,6 +6050,7 @@ self: super: { "queue" = dontDistribute super."queue"; "queuelike" = dontDistribute super."queuelike"; "quick-generator" = dontDistribute super."quick-generator"; + "quick-schema" = dontDistribute super."quick-schema"; "quickcheck-io" = doDistribute super."quickcheck-io_0_1_1"; "quickcheck-poly" = dontDistribute super."quickcheck-poly"; "quickcheck-properties" = dontDistribute super."quickcheck-properties"; @@ -6489,6 +6529,7 @@ self: super: { "servant" = doDistribute super."servant_0_4_4"; "servant-JuicyPixels" = doDistribute super."servant-JuicyPixels_0_1_0_0"; "servant-blaze" = dontDistribute super."servant-blaze"; + "servant-cassava" = dontDistribute super."servant-cassava"; "servant-client" = doDistribute super."servant-client_0_4_4"; "servant-docs" = doDistribute super."servant-docs_0_4_4"; "servant-ede" = dontDistribute super."servant-ede"; @@ -6501,6 +6542,7 @@ self: super: { "servant-response" = dontDistribute super."servant-response"; "servant-scotty" = dontDistribute super."servant-scotty"; "servant-server" = doDistribute super."servant-server_0_4_4"; + "servant-swagger" = dontDistribute super."servant-swagger"; "servant-yaml" = dontDistribute super."servant-yaml"; "serversession-backend-acid-state" = doDistribute super."serversession-backend-acid-state_1_0_1"; "servius" = dontDistribute super."servius"; @@ -7024,6 +7066,7 @@ self: super: { "tag-bits" = dontDistribute super."tag-bits"; "tag-stream" = dontDistribute super."tag-stream"; "tagchup" = dontDistribute super."tagchup"; + "tagged" = doDistribute super."tagged_0_8_1"; "tagged-exception-core" = dontDistribute super."tagged-exception-core"; "tagged-list" = dontDistribute super."tagged-list"; "tagged-th" = dontDistribute super."tagged-th"; @@ -7093,6 +7136,7 @@ self: super: { "tensor" = dontDistribute super."tensor"; "term-rewriting" = dontDistribute super."term-rewriting"; "termbox-bindings" = dontDistribute super."termbox-bindings"; + "terminal-size" = doDistribute super."terminal-size_0_3_2"; "termination-combinators" = dontDistribute super."termination-combinators"; "terminfo" = doDistribute super."terminfo_0_4_0_1"; "terminfo-hs" = dontDistribute super."terminfo-hs"; @@ -7598,6 +7642,7 @@ self: super: { "verdict" = dontDistribute super."verdict"; "verdict-json" = dontDistribute super."verdict-json"; "verilog" = dontDistribute super."verilog"; + "versions" = dontDistribute super."versions"; "vhdl" = dontDistribute super."vhdl"; "views" = dontDistribute super."views"; "vigilance" = dontDistribute super."vigilance"; @@ -8011,6 +8056,7 @@ self: super: { "zendesk-api" = dontDistribute super."zendesk-api"; "zeno" = dontDistribute super."zeno"; "zero" = doDistribute super."zero_0_1_2"; + "zerobin" = dontDistribute super."zerobin"; "zeromq-haskell" = dontDistribute super."zeromq-haskell"; "zeromq3-conduit" = dontDistribute super."zeromq3-conduit"; "zeromq3-haskell" = dontDistribute super."zeromq3-haskell"; diff --git a/pkgs/development/haskell-modules/configuration-lts-3.1.nix b/pkgs/development/haskell-modules/configuration-lts-3.1.nix index 35a982ae85f3..deed58549033 100644 --- a/pkgs/development/haskell-modules/configuration-lts-3.1.nix +++ b/pkgs/development/haskell-modules/configuration-lts-3.1.nix @@ -492,6 +492,7 @@ self: super: { "HasGP" = dontDistribute super."HasGP"; "Haschoo" = dontDistribute super."Haschoo"; "Hashell" = dontDistribute super."Hashell"; + "HaskRel" = dontDistribute super."HaskRel"; "HaskellForMaths" = dontDistribute super."HaskellForMaths"; "HaskellLM" = dontDistribute super."HaskellLM"; "HaskellNN" = dontDistribute super."HaskellNN"; @@ -536,6 +537,7 @@ self: super: { "Hsed" = dontDistribute super."Hsed"; "Hsmtlib" = dontDistribute super."Hsmtlib"; "HueAPI" = dontDistribute super."HueAPI"; + "HulkImport" = dontDistribute super."HulkImport"; "Hungarian-Munkres" = dontDistribute super."Hungarian-Munkres"; "IDynamic" = dontDistribute super."IDynamic"; "IFS" = dontDistribute super."IFS"; @@ -1113,6 +1115,7 @@ self: super: { "afis" = dontDistribute super."afis"; "afv" = dontDistribute super."afv"; "agda-server" = dontDistribute super."agda-server"; + "agda-snippets" = dontDistribute super."agda-snippets"; "agum" = dontDistribute super."agum"; "aig" = dontDistribute super."aig"; "air" = dontDistribute super."air"; @@ -1382,6 +1385,7 @@ self: super: { "awesomium" = dontDistribute super."awesomium"; "awesomium-glut" = dontDistribute super."awesomium-glut"; "awesomium-raw" = dontDistribute super."awesomium-raw"; + "aws" = doDistribute super."aws_0_12_1"; "aws-cloudfront-signer" = dontDistribute super."aws-cloudfront-signer"; "aws-configuration-tools" = dontDistribute super."aws-configuration-tools"; "aws-dynamodb-conduit" = dontDistribute super."aws-dynamodb-conduit"; @@ -1867,6 +1871,7 @@ self: super: { "cinvoke" = dontDistribute super."cinvoke"; "cio" = dontDistribute super."cio"; "cipher-rc5" = dontDistribute super."cipher-rc5"; + "ciphersaber2" = dontDistribute super."ciphersaber2"; "circ" = dontDistribute super."circ"; "cirru-parser" = dontDistribute super."cirru-parser"; "citation-resolve" = dontDistribute super."citation-resolve"; @@ -2124,6 +2129,7 @@ self: super: { "cpuid" = dontDistribute super."cpuid"; "cpuperf" = dontDistribute super."cpuperf"; "cpython" = dontDistribute super."cpython"; + "cql" = doDistribute super."cql_3_0_5"; "cqrs" = dontDistribute super."cqrs"; "cqrs-core" = dontDistribute super."cqrs-core"; "cqrs-example" = dontDistribute super."cqrs-example"; @@ -2303,6 +2309,7 @@ self: super: { "dataflow" = dontDistribute super."dataflow"; "datalog" = dontDistribute super."datalog"; "datapacker" = dontDistribute super."datapacker"; + "dataurl" = dontDistribute super."dataurl"; "date-cache" = dontDistribute super."date-cache"; "dates" = dontDistribute super."dates"; "datetime" = dontDistribute super."datetime"; @@ -2688,6 +2695,7 @@ self: super: { "eros-client" = dontDistribute super."eros-client"; "eros-http" = dontDistribute super."eros-http"; "errno" = dontDistribute super."errno"; + "error-analyze" = dontDistribute super."error-analyze"; "error-continuations" = dontDistribute super."error-continuations"; "error-list" = dontDistribute super."error-list"; "error-loc" = dontDistribute super."error-loc"; @@ -2738,6 +2746,7 @@ self: super: { "exinst-deepseq" = dontDistribute super."exinst-deepseq"; "exinst-hashable" = dontDistribute super."exinst-hashable"; "exists" = dontDistribute super."exists"; + "exit-codes" = dontDistribute super."exit-codes"; "exp-pairs" = dontDistribute super."exp-pairs"; "expand" = dontDistribute super."expand"; "expat-enumerator" = dontDistribute super."expat-enumerator"; @@ -2844,6 +2853,7 @@ self: super: { "find-conduit" = dontDistribute super."find-conduit"; "fingertree-tf" = dontDistribute super."fingertree-tf"; "finite-field" = dontDistribute super."finite-field"; + "finite-typelits" = dontDistribute super."finite-typelits"; "first-and-last" = dontDistribute super."first-and-last"; "first-class-patterns" = dontDistribute super."first-class-patterns"; "firstify" = dontDistribute super."firstify"; @@ -3116,17 +3126,33 @@ self: super: { "ghclive" = dontDistribute super."ghclive"; "ghczdecode" = dontDistribute super."ghczdecode"; "ght" = dontDistribute super."ght"; + "gi-atk" = dontDistribute super."gi-atk"; + "gi-cairo" = dontDistribute super."gi-cairo"; + "gi-gdk" = dontDistribute super."gi-gdk"; + "gi-gdkpixbuf" = dontDistribute super."gi-gdkpixbuf"; + "gi-gio" = dontDistribute super."gi-gio"; + "gi-glib" = dontDistribute super."gi-glib"; + "gi-gobject" = dontDistribute super."gi-gobject"; + "gi-gtk" = dontDistribute super."gi-gtk"; + "gi-javascriptcore" = dontDistribute super."gi-javascriptcore"; + "gi-notify" = dontDistribute super."gi-notify"; + "gi-pango" = dontDistribute super."gi-pango"; + "gi-soup" = dontDistribute super."gi-soup"; + "gi-vte" = dontDistribute super."gi-vte"; + "gi-webkit" = dontDistribute super."gi-webkit"; "gimlh" = dontDistribute super."gimlh"; "ginger" = dontDistribute super."ginger"; "ginsu" = dontDistribute super."ginsu"; "gipeda" = doDistribute super."gipeda_0_1_2_1"; "gist" = dontDistribute super."gist"; "git-all" = dontDistribute super."git-all"; + "git-annex" = doDistribute super."git-annex_5_20150727"; "git-checklist" = dontDistribute super."git-checklist"; "git-date" = dontDistribute super."git-date"; "git-embed" = dontDistribute super."git-embed"; "git-freq" = dontDistribute super."git-freq"; "git-gpush" = dontDistribute super."git-gpush"; + "git-jump" = dontDistribute super."git-jump"; "git-monitor" = dontDistribute super."git-monitor"; "git-object" = dontDistribute super."git-object"; "git-repair" = dontDistribute super."git-repair"; @@ -3589,6 +3615,8 @@ self: super: { "haskell-formatter" = dontDistribute super."haskell-formatter"; "haskell-ftp" = dontDistribute super."haskell-ftp"; "haskell-generate" = dontDistribute super."haskell-generate"; + "haskell-gi" = dontDistribute super."haskell-gi"; + "haskell-gi-base" = dontDistribute super."haskell-gi-base"; "haskell-import-graph" = dontDistribute super."haskell-import-graph"; "haskell-in-space" = dontDistribute super."haskell-in-space"; "haskell-modbus" = dontDistribute super."haskell-modbus"; @@ -3779,9 +3807,11 @@ self: super: { "hfann" = dontDistribute super."hfann"; "hfd" = dontDistribute super."hfd"; "hfiar" = dontDistribute super."hfiar"; + "hfmt" = dontDistribute super."hfmt"; "hfoil" = dontDistribute super."hfoil"; "hfov" = dontDistribute super."hfov"; "hfractal" = dontDistribute super."hfractal"; + "hfsevents" = doDistribute super."hfsevents_0_1_5"; "hfusion" = dontDistribute super."hfusion"; "hg-buildpackage" = dontDistribute super."hg-buildpackage"; "hgal" = dontDistribute super."hgal"; @@ -4178,6 +4208,7 @@ self: super: { "hsx2hs" = dontDistribute super."hsx2hs"; "hsyscall" = dontDistribute super."hsyscall"; "hszephyr" = dontDistribute super."hszephyr"; + "htaglib" = dontDistribute super."htaglib"; "htags" = dontDistribute super."htags"; "htar" = dontDistribute super."htar"; "htiled" = dontDistribute super."htiled"; @@ -4579,6 +4610,7 @@ self: super: { "keera-hails-reactive-polling" = dontDistribute super."keera-hails-reactive-polling"; "keera-hails-reactive-wx" = dontDistribute super."keera-hails-reactive-wx"; "keera-hails-reactive-yampa" = dontDistribute super."keera-hails-reactive-yampa"; + "keera-hails-reactivelenses" = dontDistribute super."keera-hails-reactivelenses"; "keera-hails-reactivevalues" = dontDistribute super."keera-hails-reactivevalues"; "keera-posture" = dontDistribute super."keera-posture"; "keiretsu" = dontDistribute super."keiretsu"; @@ -4685,6 +4717,8 @@ self: super: { "lat" = dontDistribute super."lat"; "latest-npm-version" = dontDistribute super."latest-npm-version"; "latex" = dontDistribute super."latex"; + "latex-formulae-image" = dontDistribute super."latex-formulae-image"; + "latex-formulae-pandoc" = dontDistribute super."latex-formulae-pandoc"; "lattices" = doDistribute super."lattices_1_3"; "launchpad-control" = dontDistribute super."launchpad-control"; "lax" = dontDistribute super."lax"; @@ -4713,6 +4747,7 @@ self: super: { "leksah" = dontDistribute super."leksah"; "leksah-server" = dontDistribute super."leksah-server"; "lendingclub" = dontDistribute super."lendingclub"; + "lens-action" = doDistribute super."lens-action_0_2_0_1"; "lens-aeson" = doDistribute super."lens-aeson_1_0_0_4"; "lens-datetime" = dontDistribute super."lens-datetime"; "lens-prelude" = dontDistribute super."lens-prelude"; @@ -5023,6 +5058,7 @@ self: super: { "memexml" = dontDistribute super."memexml"; "memo-ptr" = dontDistribute super."memo-ptr"; "memo-sqlite" = dontDistribute super."memo-sqlite"; + "memoization-utils" = dontDistribute super."memoization-utils"; "memory" = doDistribute super."memory_0_7"; "memscript" = dontDistribute super."memscript"; "mersenne-random" = dontDistribute super."mersenne-random"; @@ -5423,6 +5459,7 @@ self: super: { "nthable" = dontDistribute super."nthable"; "ntp-control" = dontDistribute super."ntp-control"; "null-canvas" = dontDistribute super."null-canvas"; + "nullary" = dontDistribute super."nullary"; "number" = dontDistribute super."number"; "numbering" = dontDistribute super."numbering"; "numerals" = dontDistribute super."numerals"; @@ -5636,6 +5673,7 @@ self: super: { "pcg-random" = dontDistribute super."pcg-random"; "pcre-heavy" = doDistribute super."pcre-heavy_0_2_2"; "pcre-less" = dontDistribute super."pcre-less"; + "pcre-light" = doDistribute super."pcre-light_0_4_0_3"; "pcre-light-extra" = dontDistribute super."pcre-light-extra"; "pcre-utils" = dontDistribute super."pcre-utils"; "pdf-toolbox-content" = dontDistribute super."pdf-toolbox-content"; @@ -5987,6 +6025,7 @@ self: super: { "qc-oi-testgenerator" = dontDistribute super."qc-oi-testgenerator"; "qd" = dontDistribute super."qd"; "qd-vec" = dontDistribute super."qd-vec"; + "qed" = dontDistribute super."qed"; "qhull-simple" = dontDistribute super."qhull-simple"; "qrcode" = dontDistribute super."qrcode"; "qt" = dontDistribute super."qt"; @@ -6001,6 +6040,7 @@ self: super: { "queue" = dontDistribute super."queue"; "queuelike" = dontDistribute super."queuelike"; "quick-generator" = dontDistribute super."quick-generator"; + "quick-schema" = dontDistribute super."quick-schema"; "quickcheck-io" = doDistribute super."quickcheck-io_0_1_1"; "quickcheck-poly" = dontDistribute super."quickcheck-poly"; "quickcheck-properties" = dontDistribute super."quickcheck-properties"; @@ -6478,6 +6518,7 @@ self: super: { "servant" = doDistribute super."servant_0_4_4"; "servant-JuicyPixels" = doDistribute super."servant-JuicyPixels_0_1_0_0"; "servant-blaze" = dontDistribute super."servant-blaze"; + "servant-cassava" = dontDistribute super."servant-cassava"; "servant-client" = doDistribute super."servant-client_0_4_4"; "servant-docs" = doDistribute super."servant-docs_0_4_4"; "servant-ede" = dontDistribute super."servant-ede"; @@ -6490,6 +6531,7 @@ self: super: { "servant-response" = dontDistribute super."servant-response"; "servant-scotty" = dontDistribute super."servant-scotty"; "servant-server" = doDistribute super."servant-server_0_4_4"; + "servant-swagger" = dontDistribute super."servant-swagger"; "servant-yaml" = dontDistribute super."servant-yaml"; "serversession-backend-acid-state" = doDistribute super."serversession-backend-acid-state_1_0_1"; "servius" = dontDistribute super."servius"; @@ -7013,6 +7055,7 @@ self: super: { "tag-bits" = dontDistribute super."tag-bits"; "tag-stream" = dontDistribute super."tag-stream"; "tagchup" = dontDistribute super."tagchup"; + "tagged" = doDistribute super."tagged_0_8_1"; "tagged-exception-core" = dontDistribute super."tagged-exception-core"; "tagged-list" = dontDistribute super."tagged-list"; "tagged-th" = dontDistribute super."tagged-th"; @@ -7082,6 +7125,7 @@ self: super: { "tensor" = dontDistribute super."tensor"; "term-rewriting" = dontDistribute super."term-rewriting"; "termbox-bindings" = dontDistribute super."termbox-bindings"; + "terminal-size" = doDistribute super."terminal-size_0_3_2"; "termination-combinators" = dontDistribute super."termination-combinators"; "terminfo" = doDistribute super."terminfo_0_4_0_1"; "terminfo-hs" = dontDistribute super."terminfo-hs"; @@ -7586,6 +7630,7 @@ self: super: { "verdict" = dontDistribute super."verdict"; "verdict-json" = dontDistribute super."verdict-json"; "verilog" = dontDistribute super."verilog"; + "versions" = dontDistribute super."versions"; "vhdl" = dontDistribute super."vhdl"; "views" = dontDistribute super."views"; "vigilance" = dontDistribute super."vigilance"; @@ -7999,6 +8044,7 @@ self: super: { "zendesk-api" = dontDistribute super."zendesk-api"; "zeno" = dontDistribute super."zeno"; "zero" = doDistribute super."zero_0_1_2"; + "zerobin" = dontDistribute super."zerobin"; "zeromq-haskell" = dontDistribute super."zeromq-haskell"; "zeromq3-conduit" = dontDistribute super."zeromq3-conduit"; "zeromq3-haskell" = dontDistribute super."zeromq3-haskell"; diff --git a/pkgs/development/haskell-modules/configuration-lts-3.10.nix b/pkgs/development/haskell-modules/configuration-lts-3.10.nix index e12833090357..f6b9faad4b84 100644 --- a/pkgs/development/haskell-modules/configuration-lts-3.10.nix +++ b/pkgs/development/haskell-modules/configuration-lts-3.10.nix @@ -485,6 +485,7 @@ self: super: { "HasGP" = dontDistribute super."HasGP"; "Haschoo" = dontDistribute super."Haschoo"; "Hashell" = dontDistribute super."Hashell"; + "HaskRel" = dontDistribute super."HaskRel"; "HaskellForMaths" = dontDistribute super."HaskellForMaths"; "HaskellLM" = dontDistribute super."HaskellLM"; "HaskellNN" = dontDistribute super."HaskellNN"; @@ -529,6 +530,7 @@ self: super: { "Hsed" = dontDistribute super."Hsed"; "Hsmtlib" = dontDistribute super."Hsmtlib"; "HueAPI" = dontDistribute super."HueAPI"; + "HulkImport" = dontDistribute super."HulkImport"; "Hungarian-Munkres" = dontDistribute super."Hungarian-Munkres"; "IDynamic" = dontDistribute super."IDynamic"; "IFS" = dontDistribute super."IFS"; @@ -556,6 +558,7 @@ self: super: { "Javav" = dontDistribute super."Javav"; "JsContracts" = dontDistribute super."JsContracts"; "JsonGrammar" = dontDistribute super."JsonGrammar"; + "JuicyPixels" = doDistribute super."JuicyPixels_3_2_6_1"; "JuicyPixels-canvas" = dontDistribute super."JuicyPixels-canvas"; "JuicyPixels-repa" = dontDistribute super."JuicyPixels-repa"; "JuicyPixels-util" = dontDistribute super."JuicyPixels-util"; @@ -1100,6 +1103,7 @@ self: super: { "afis" = dontDistribute super."afis"; "afv" = dontDistribute super."afv"; "agda-server" = dontDistribute super."agda-server"; + "agda-snippets" = dontDistribute super."agda-snippets"; "agum" = dontDistribute super."agum"; "aig" = dontDistribute super."aig"; "air" = dontDistribute super."air"; @@ -1361,6 +1365,7 @@ self: super: { "awesomium" = dontDistribute super."awesomium"; "awesomium-glut" = dontDistribute super."awesomium-glut"; "awesomium-raw" = dontDistribute super."awesomium-raw"; + "aws" = doDistribute super."aws_0_12_1"; "aws-cloudfront-signer" = dontDistribute super."aws-cloudfront-signer"; "aws-configuration-tools" = dontDistribute super."aws-configuration-tools"; "aws-dynamodb-conduit" = dontDistribute super."aws-dynamodb-conduit"; @@ -1836,6 +1841,7 @@ self: super: { "cinvoke" = dontDistribute super."cinvoke"; "cio" = dontDistribute super."cio"; "cipher-rc5" = dontDistribute super."cipher-rc5"; + "ciphersaber2" = dontDistribute super."ciphersaber2"; "circ" = dontDistribute super."circ"; "cirru-parser" = dontDistribute super."cirru-parser"; "citation-resolve" = dontDistribute super."citation-resolve"; @@ -2087,6 +2093,7 @@ self: super: { "cpuid" = dontDistribute super."cpuid"; "cpuperf" = dontDistribute super."cpuperf"; "cpython" = dontDistribute super."cpython"; + "cql" = doDistribute super."cql_3_0_5"; "cqrs" = dontDistribute super."cqrs"; "cqrs-core" = dontDistribute super."cqrs-core"; "cqrs-example" = dontDistribute super."cqrs-example"; @@ -2265,6 +2272,7 @@ self: super: { "dataflow" = dontDistribute super."dataflow"; "datalog" = dontDistribute super."datalog"; "datapacker" = dontDistribute super."datapacker"; + "dataurl" = dontDistribute super."dataurl"; "date-cache" = dontDistribute super."date-cache"; "dates" = dontDistribute super."dates"; "datetime" = dontDistribute super."datetime"; @@ -2632,6 +2640,7 @@ self: super: { "eros-client" = dontDistribute super."eros-client"; "eros-http" = dontDistribute super."eros-http"; "errno" = dontDistribute super."errno"; + "error-analyze" = dontDistribute super."error-analyze"; "error-continuations" = dontDistribute super."error-continuations"; "error-list" = dontDistribute super."error-list"; "error-loc" = dontDistribute super."error-loc"; @@ -2655,6 +2664,7 @@ self: super: { "euler" = dontDistribute super."euler"; "euphoria" = dontDistribute super."euphoria"; "eurofxref" = dontDistribute super."eurofxref"; + "event" = doDistribute super."event_0_1_2"; "event-driven" = dontDistribute super."event-driven"; "event-handlers" = dontDistribute super."event-handlers"; "event-list" = dontDistribute super."event-list"; @@ -2678,6 +2688,7 @@ self: super: { "exinst-deepseq" = dontDistribute super."exinst-deepseq"; "exinst-hashable" = dontDistribute super."exinst-hashable"; "exists" = dontDistribute super."exists"; + "exit-codes" = dontDistribute super."exit-codes"; "exp-pairs" = dontDistribute super."exp-pairs"; "expand" = dontDistribute super."expand"; "expat-enumerator" = dontDistribute super."expat-enumerator"; @@ -2779,6 +2790,7 @@ self: super: { "find-conduit" = dontDistribute super."find-conduit"; "fingertree-tf" = dontDistribute super."fingertree-tf"; "finite-field" = dontDistribute super."finite-field"; + "finite-typelits" = dontDistribute super."finite-typelits"; "first-and-last" = dontDistribute super."first-and-last"; "first-class-patterns" = dontDistribute super."first-class-patterns"; "firstify" = dontDistribute super."firstify"; @@ -3046,17 +3058,33 @@ self: super: { "ghclive" = dontDistribute super."ghclive"; "ghczdecode" = dontDistribute super."ghczdecode"; "ght" = dontDistribute super."ght"; + "gi-atk" = dontDistribute super."gi-atk"; + "gi-cairo" = dontDistribute super."gi-cairo"; + "gi-gdk" = dontDistribute super."gi-gdk"; + "gi-gdkpixbuf" = dontDistribute super."gi-gdkpixbuf"; + "gi-gio" = dontDistribute super."gi-gio"; + "gi-glib" = dontDistribute super."gi-glib"; + "gi-gobject" = dontDistribute super."gi-gobject"; + "gi-gtk" = dontDistribute super."gi-gtk"; + "gi-javascriptcore" = dontDistribute super."gi-javascriptcore"; + "gi-notify" = dontDistribute super."gi-notify"; + "gi-pango" = dontDistribute super."gi-pango"; + "gi-soup" = dontDistribute super."gi-soup"; + "gi-vte" = dontDistribute super."gi-vte"; + "gi-webkit" = dontDistribute super."gi-webkit"; "gimlh" = dontDistribute super."gimlh"; "ginger" = dontDistribute super."ginger"; "ginsu" = dontDistribute super."ginsu"; "gipeda" = doDistribute super."gipeda_0_1_2_1"; "gist" = dontDistribute super."gist"; "git-all" = dontDistribute super."git-all"; + "git-annex" = doDistribute super."git-annex_5_20150727"; "git-checklist" = dontDistribute super."git-checklist"; "git-date" = dontDistribute super."git-date"; "git-embed" = dontDistribute super."git-embed"; "git-freq" = dontDistribute super."git-freq"; "git-gpush" = dontDistribute super."git-gpush"; + "git-jump" = dontDistribute super."git-jump"; "git-monitor" = dontDistribute super."git-monitor"; "git-object" = dontDistribute super."git-object"; "git-repair" = dontDistribute super."git-repair"; @@ -3514,6 +3542,8 @@ self: super: { "haskell-formatter" = dontDistribute super."haskell-formatter"; "haskell-ftp" = dontDistribute super."haskell-ftp"; "haskell-generate" = dontDistribute super."haskell-generate"; + "haskell-gi" = dontDistribute super."haskell-gi"; + "haskell-gi-base" = dontDistribute super."haskell-gi-base"; "haskell-import-graph" = dontDistribute super."haskell-import-graph"; "haskell-in-space" = dontDistribute super."haskell-in-space"; "haskell-modbus" = dontDistribute super."haskell-modbus"; @@ -3700,9 +3730,11 @@ self: super: { "hfann" = dontDistribute super."hfann"; "hfd" = dontDistribute super."hfd"; "hfiar" = dontDistribute super."hfiar"; + "hfmt" = dontDistribute super."hfmt"; "hfoil" = dontDistribute super."hfoil"; "hfov" = dontDistribute super."hfov"; "hfractal" = dontDistribute super."hfractal"; + "hfsevents" = doDistribute super."hfsevents_0_1_5"; "hfusion" = dontDistribute super."hfusion"; "hg-buildpackage" = dontDistribute super."hg-buildpackage"; "hgal" = dontDistribute super."hgal"; @@ -4093,6 +4125,7 @@ self: super: { "hsx2hs" = dontDistribute super."hsx2hs"; "hsyscall" = dontDistribute super."hsyscall"; "hszephyr" = dontDistribute super."hszephyr"; + "htaglib" = dontDistribute super."htaglib"; "htags" = dontDistribute super."htags"; "htar" = dontDistribute super."htar"; "htiled" = dontDistribute super."htiled"; @@ -4486,6 +4519,7 @@ self: super: { "keera-hails-reactive-polling" = dontDistribute super."keera-hails-reactive-polling"; "keera-hails-reactive-wx" = dontDistribute super."keera-hails-reactive-wx"; "keera-hails-reactive-yampa" = dontDistribute super."keera-hails-reactive-yampa"; + "keera-hails-reactivelenses" = dontDistribute super."keera-hails-reactivelenses"; "keera-hails-reactivevalues" = dontDistribute super."keera-hails-reactivevalues"; "keera-posture" = dontDistribute super."keera-posture"; "keiretsu" = dontDistribute super."keiretsu"; @@ -4589,6 +4623,8 @@ self: super: { "lat" = dontDistribute super."lat"; "latest-npm-version" = dontDistribute super."latest-npm-version"; "latex" = dontDistribute super."latex"; + "latex-formulae-image" = dontDistribute super."latex-formulae-image"; + "latex-formulae-pandoc" = dontDistribute super."latex-formulae-pandoc"; "lattices" = doDistribute super."lattices_1_3"; "launchpad-control" = dontDistribute super."launchpad-control"; "lax" = dontDistribute super."lax"; @@ -4617,6 +4653,7 @@ self: super: { "leksah" = dontDistribute super."leksah"; "leksah-server" = dontDistribute super."leksah-server"; "lendingclub" = dontDistribute super."lendingclub"; + "lens-action" = doDistribute super."lens-action_0_2_0_1"; "lens-datetime" = dontDistribute super."lens-datetime"; "lens-prelude" = dontDistribute super."lens-prelude"; "lens-properties" = dontDistribute super."lens-properties"; @@ -4920,6 +4957,7 @@ self: super: { "memexml" = dontDistribute super."memexml"; "memo-ptr" = dontDistribute super."memo-ptr"; "memo-sqlite" = dontDistribute super."memo-sqlite"; + "memoization-utils" = dontDistribute super."memoization-utils"; "memory" = doDistribute super."memory_0_7"; "memscript" = dontDistribute super."memscript"; "mersenne-random" = dontDistribute super."mersenne-random"; @@ -5311,6 +5349,7 @@ self: super: { "nthable" = dontDistribute super."nthable"; "ntp-control" = dontDistribute super."ntp-control"; "null-canvas" = dontDistribute super."null-canvas"; + "nullary" = dontDistribute super."nullary"; "number" = dontDistribute super."number"; "numbering" = dontDistribute super."numbering"; "numerals" = dontDistribute super."numerals"; @@ -5520,6 +5559,7 @@ self: super: { "pcg-random" = dontDistribute super."pcg-random"; "pcre-heavy" = doDistribute super."pcre-heavy_0_2_5"; "pcre-less" = dontDistribute super."pcre-less"; + "pcre-light" = doDistribute super."pcre-light_0_4_0_3"; "pcre-light-extra" = dontDistribute super."pcre-light-extra"; "pcre-utils" = dontDistribute super."pcre-utils"; "pdf-toolbox-content" = dontDistribute super."pdf-toolbox-content"; @@ -5857,6 +5897,7 @@ self: super: { "qc-oi-testgenerator" = dontDistribute super."qc-oi-testgenerator"; "qd" = dontDistribute super."qd"; "qd-vec" = dontDistribute super."qd-vec"; + "qed" = dontDistribute super."qed"; "qhull-simple" = dontDistribute super."qhull-simple"; "qrcode" = dontDistribute super."qrcode"; "qt" = dontDistribute super."qt"; @@ -5871,6 +5912,7 @@ self: super: { "queue" = dontDistribute super."queue"; "queuelike" = dontDistribute super."queuelike"; "quick-generator" = dontDistribute super."quick-generator"; + "quick-schema" = dontDistribute super."quick-schema"; "quickcheck-poly" = dontDistribute super."quickcheck-poly"; "quickcheck-properties" = dontDistribute super."quickcheck-properties"; "quickcheck-property-comb" = dontDistribute super."quickcheck-property-comb"; @@ -6339,6 +6381,7 @@ self: super: { "serialport" = dontDistribute super."serialport"; "servant-JuicyPixels" = doDistribute super."servant-JuicyPixels_0_1_0_0"; "servant-blaze" = dontDistribute super."servant-blaze"; + "servant-cassava" = dontDistribute super."servant-cassava"; "servant-ede" = dontDistribute super."servant-ede"; "servant-examples" = dontDistribute super."servant-examples"; "servant-lucid" = dontDistribute super."servant-lucid"; @@ -6347,6 +6390,7 @@ self: super: { "servant-postgresql" = dontDistribute super."servant-postgresql"; "servant-response" = dontDistribute super."servant-response"; "servant-scotty" = dontDistribute super."servant-scotty"; + "servant-swagger" = dontDistribute super."servant-swagger"; "servant-yaml" = dontDistribute super."servant-yaml"; "servius" = dontDistribute super."servius"; "ses-html" = dontDistribute super."ses-html"; @@ -6856,6 +6900,7 @@ self: super: { "tag-bits" = dontDistribute super."tag-bits"; "tag-stream" = dontDistribute super."tag-stream"; "tagchup" = dontDistribute super."tagchup"; + "tagged" = doDistribute super."tagged_0_8_1"; "tagged-exception-core" = dontDistribute super."tagged-exception-core"; "tagged-list" = dontDistribute super."tagged-list"; "tagged-th" = dontDistribute super."tagged-th"; @@ -6920,6 +6965,7 @@ self: super: { "tensor" = dontDistribute super."tensor"; "term-rewriting" = dontDistribute super."term-rewriting"; "termbox-bindings" = dontDistribute super."termbox-bindings"; + "terminal-size" = doDistribute super."terminal-size_0_3_2"; "termination-combinators" = dontDistribute super."termination-combinators"; "terminfo" = doDistribute super."terminfo_0_4_0_1"; "terminfo-hs" = dontDistribute super."terminfo-hs"; @@ -6983,6 +7029,7 @@ self: super: { "th-alpha" = dontDistribute super."th-alpha"; "th-build" = dontDistribute super."th-build"; "th-context" = dontDistribute super."th-context"; + "th-desugar" = doDistribute super."th-desugar_1_5_4_1"; "th-fold" = dontDistribute super."th-fold"; "th-inline-io-action" = dontDistribute super."th-inline-io-action"; "th-instance-reification" = dontDistribute super."th-instance-reification"; @@ -7415,6 +7462,7 @@ self: super: { "verdict" = dontDistribute super."verdict"; "verdict-json" = dontDistribute super."verdict-json"; "verilog" = dontDistribute super."verilog"; + "versions" = dontDistribute super."versions"; "vhdl" = dontDistribute super."vhdl"; "views" = dontDistribute super."views"; "vigilance" = dontDistribute super."vigilance"; @@ -7802,6 +7850,8 @@ self: super: { "zenc" = dontDistribute super."zenc"; "zendesk-api" = dontDistribute super."zendesk-api"; "zeno" = dontDistribute super."zeno"; + "zero" = doDistribute super."zero_0_1_3"; + "zerobin" = dontDistribute super."zerobin"; "zeromq-haskell" = dontDistribute super."zeromq-haskell"; "zeromq3-conduit" = dontDistribute super."zeromq3-conduit"; "zeromq3-haskell" = dontDistribute super."zeromq3-haskell"; diff --git a/pkgs/development/haskell-modules/configuration-lts-3.11.nix b/pkgs/development/haskell-modules/configuration-lts-3.11.nix index dfb50a843296..86ead241479c 100644 --- a/pkgs/development/haskell-modules/configuration-lts-3.11.nix +++ b/pkgs/development/haskell-modules/configuration-lts-3.11.nix @@ -485,6 +485,7 @@ self: super: { "HasGP" = dontDistribute super."HasGP"; "Haschoo" = dontDistribute super."Haschoo"; "Hashell" = dontDistribute super."Hashell"; + "HaskRel" = dontDistribute super."HaskRel"; "HaskellForMaths" = dontDistribute super."HaskellForMaths"; "HaskellLM" = dontDistribute super."HaskellLM"; "HaskellNN" = dontDistribute super."HaskellNN"; @@ -529,6 +530,7 @@ self: super: { "Hsed" = dontDistribute super."Hsed"; "Hsmtlib" = dontDistribute super."Hsmtlib"; "HueAPI" = dontDistribute super."HueAPI"; + "HulkImport" = dontDistribute super."HulkImport"; "Hungarian-Munkres" = dontDistribute super."Hungarian-Munkres"; "IDynamic" = dontDistribute super."IDynamic"; "IFS" = dontDistribute super."IFS"; @@ -556,6 +558,7 @@ self: super: { "Javav" = dontDistribute super."Javav"; "JsContracts" = dontDistribute super."JsContracts"; "JsonGrammar" = dontDistribute super."JsonGrammar"; + "JuicyPixels" = doDistribute super."JuicyPixels_3_2_6_1"; "JuicyPixels-canvas" = dontDistribute super."JuicyPixels-canvas"; "JuicyPixels-repa" = dontDistribute super."JuicyPixels-repa"; "JuicyPixels-util" = dontDistribute super."JuicyPixels-util"; @@ -1100,6 +1103,7 @@ self: super: { "afis" = dontDistribute super."afis"; "afv" = dontDistribute super."afv"; "agda-server" = dontDistribute super."agda-server"; + "agda-snippets" = dontDistribute super."agda-snippets"; "agum" = dontDistribute super."agum"; "aig" = dontDistribute super."aig"; "air" = dontDistribute super."air"; @@ -1360,6 +1364,7 @@ self: super: { "awesomium" = dontDistribute super."awesomium"; "awesomium-glut" = dontDistribute super."awesomium-glut"; "awesomium-raw" = dontDistribute super."awesomium-raw"; + "aws" = doDistribute super."aws_0_12_1"; "aws-cloudfront-signer" = dontDistribute super."aws-cloudfront-signer"; "aws-configuration-tools" = dontDistribute super."aws-configuration-tools"; "aws-dynamodb-conduit" = dontDistribute super."aws-dynamodb-conduit"; @@ -1833,6 +1838,7 @@ self: super: { "cinvoke" = dontDistribute super."cinvoke"; "cio" = dontDistribute super."cio"; "cipher-rc5" = dontDistribute super."cipher-rc5"; + "ciphersaber2" = dontDistribute super."ciphersaber2"; "circ" = dontDistribute super."circ"; "cirru-parser" = dontDistribute super."cirru-parser"; "citation-resolve" = dontDistribute super."citation-resolve"; @@ -2083,6 +2089,7 @@ self: super: { "cpuid" = dontDistribute super."cpuid"; "cpuperf" = dontDistribute super."cpuperf"; "cpython" = dontDistribute super."cpython"; + "cql" = doDistribute super."cql_3_0_5"; "cqrs" = dontDistribute super."cqrs"; "cqrs-core" = dontDistribute super."cqrs-core"; "cqrs-example" = dontDistribute super."cqrs-example"; @@ -2261,6 +2268,7 @@ self: super: { "dataflow" = dontDistribute super."dataflow"; "datalog" = dontDistribute super."datalog"; "datapacker" = dontDistribute super."datapacker"; + "dataurl" = dontDistribute super."dataurl"; "date-cache" = dontDistribute super."date-cache"; "dates" = dontDistribute super."dates"; "datetime" = dontDistribute super."datetime"; @@ -2628,6 +2636,7 @@ self: super: { "eros-client" = dontDistribute super."eros-client"; "eros-http" = dontDistribute super."eros-http"; "errno" = dontDistribute super."errno"; + "error-analyze" = dontDistribute super."error-analyze"; "error-continuations" = dontDistribute super."error-continuations"; "error-list" = dontDistribute super."error-list"; "error-loc" = dontDistribute super."error-loc"; @@ -2651,6 +2660,7 @@ self: super: { "euler" = dontDistribute super."euler"; "euphoria" = dontDistribute super."euphoria"; "eurofxref" = dontDistribute super."eurofxref"; + "event" = doDistribute super."event_0_1_2"; "event-driven" = dontDistribute super."event-driven"; "event-handlers" = dontDistribute super."event-handlers"; "event-list" = dontDistribute super."event-list"; @@ -2673,6 +2683,7 @@ self: super: { "exinst-deepseq" = dontDistribute super."exinst-deepseq"; "exinst-hashable" = dontDistribute super."exinst-hashable"; "exists" = dontDistribute super."exists"; + "exit-codes" = dontDistribute super."exit-codes"; "exp-pairs" = dontDistribute super."exp-pairs"; "expand" = dontDistribute super."expand"; "expat-enumerator" = dontDistribute super."expat-enumerator"; @@ -2774,6 +2785,7 @@ self: super: { "find-conduit" = dontDistribute super."find-conduit"; "fingertree-tf" = dontDistribute super."fingertree-tf"; "finite-field" = dontDistribute super."finite-field"; + "finite-typelits" = dontDistribute super."finite-typelits"; "first-and-last" = dontDistribute super."first-and-last"; "first-class-patterns" = dontDistribute super."first-class-patterns"; "firstify" = dontDistribute super."firstify"; @@ -3040,17 +3052,33 @@ self: super: { "ghclive" = dontDistribute super."ghclive"; "ghczdecode" = dontDistribute super."ghczdecode"; "ght" = dontDistribute super."ght"; + "gi-atk" = dontDistribute super."gi-atk"; + "gi-cairo" = dontDistribute super."gi-cairo"; + "gi-gdk" = dontDistribute super."gi-gdk"; + "gi-gdkpixbuf" = dontDistribute super."gi-gdkpixbuf"; + "gi-gio" = dontDistribute super."gi-gio"; + "gi-glib" = dontDistribute super."gi-glib"; + "gi-gobject" = dontDistribute super."gi-gobject"; + "gi-gtk" = dontDistribute super."gi-gtk"; + "gi-javascriptcore" = dontDistribute super."gi-javascriptcore"; + "gi-notify" = dontDistribute super."gi-notify"; + "gi-pango" = dontDistribute super."gi-pango"; + "gi-soup" = dontDistribute super."gi-soup"; + "gi-vte" = dontDistribute super."gi-vte"; + "gi-webkit" = dontDistribute super."gi-webkit"; "gimlh" = dontDistribute super."gimlh"; "ginger" = dontDistribute super."ginger"; "ginsu" = dontDistribute super."ginsu"; "gipeda" = doDistribute super."gipeda_0_1_2_1"; "gist" = dontDistribute super."gist"; "git-all" = dontDistribute super."git-all"; + "git-annex" = doDistribute super."git-annex_5_20150727"; "git-checklist" = dontDistribute super."git-checklist"; "git-date" = dontDistribute super."git-date"; "git-embed" = dontDistribute super."git-embed"; "git-freq" = dontDistribute super."git-freq"; "git-gpush" = dontDistribute super."git-gpush"; + "git-jump" = dontDistribute super."git-jump"; "git-monitor" = dontDistribute super."git-monitor"; "git-object" = dontDistribute super."git-object"; "git-repair" = dontDistribute super."git-repair"; @@ -3507,6 +3535,8 @@ self: super: { "haskell-formatter" = dontDistribute super."haskell-formatter"; "haskell-ftp" = dontDistribute super."haskell-ftp"; "haskell-generate" = dontDistribute super."haskell-generate"; + "haskell-gi" = dontDistribute super."haskell-gi"; + "haskell-gi-base" = dontDistribute super."haskell-gi-base"; "haskell-import-graph" = dontDistribute super."haskell-import-graph"; "haskell-in-space" = dontDistribute super."haskell-in-space"; "haskell-modbus" = dontDistribute super."haskell-modbus"; @@ -3693,9 +3723,11 @@ self: super: { "hfann" = dontDistribute super."hfann"; "hfd" = dontDistribute super."hfd"; "hfiar" = dontDistribute super."hfiar"; + "hfmt" = dontDistribute super."hfmt"; "hfoil" = dontDistribute super."hfoil"; "hfov" = dontDistribute super."hfov"; "hfractal" = dontDistribute super."hfractal"; + "hfsevents" = doDistribute super."hfsevents_0_1_5"; "hfusion" = dontDistribute super."hfusion"; "hg-buildpackage" = dontDistribute super."hg-buildpackage"; "hgal" = dontDistribute super."hgal"; @@ -4086,6 +4118,7 @@ self: super: { "hsx2hs" = dontDistribute super."hsx2hs"; "hsyscall" = dontDistribute super."hsyscall"; "hszephyr" = dontDistribute super."hszephyr"; + "htaglib" = dontDistribute super."htaglib"; "htags" = dontDistribute super."htags"; "htar" = dontDistribute super."htar"; "htiled" = dontDistribute super."htiled"; @@ -4478,6 +4511,7 @@ self: super: { "keera-hails-reactive-polling" = dontDistribute super."keera-hails-reactive-polling"; "keera-hails-reactive-wx" = dontDistribute super."keera-hails-reactive-wx"; "keera-hails-reactive-yampa" = dontDistribute super."keera-hails-reactive-yampa"; + "keera-hails-reactivelenses" = dontDistribute super."keera-hails-reactivelenses"; "keera-hails-reactivevalues" = dontDistribute super."keera-hails-reactivevalues"; "keera-posture" = dontDistribute super."keera-posture"; "keiretsu" = dontDistribute super."keiretsu"; @@ -4581,6 +4615,8 @@ self: super: { "lat" = dontDistribute super."lat"; "latest-npm-version" = dontDistribute super."latest-npm-version"; "latex" = dontDistribute super."latex"; + "latex-formulae-image" = dontDistribute super."latex-formulae-image"; + "latex-formulae-pandoc" = dontDistribute super."latex-formulae-pandoc"; "lattices" = doDistribute super."lattices_1_3"; "launchpad-control" = dontDistribute super."launchpad-control"; "lax" = dontDistribute super."lax"; @@ -4609,6 +4645,7 @@ self: super: { "leksah" = dontDistribute super."leksah"; "leksah-server" = dontDistribute super."leksah-server"; "lendingclub" = dontDistribute super."lendingclub"; + "lens-action" = doDistribute super."lens-action_0_2_0_1"; "lens-datetime" = dontDistribute super."lens-datetime"; "lens-prelude" = dontDistribute super."lens-prelude"; "lens-properties" = dontDistribute super."lens-properties"; @@ -4912,6 +4949,7 @@ self: super: { "memexml" = dontDistribute super."memexml"; "memo-ptr" = dontDistribute super."memo-ptr"; "memo-sqlite" = dontDistribute super."memo-sqlite"; + "memoization-utils" = dontDistribute super."memoization-utils"; "memory" = doDistribute super."memory_0_7"; "memscript" = dontDistribute super."memscript"; "mersenne-random" = dontDistribute super."mersenne-random"; @@ -5303,6 +5341,7 @@ self: super: { "nthable" = dontDistribute super."nthable"; "ntp-control" = dontDistribute super."ntp-control"; "null-canvas" = dontDistribute super."null-canvas"; + "nullary" = dontDistribute super."nullary"; "number" = dontDistribute super."number"; "numbering" = dontDistribute super."numbering"; "numerals" = dontDistribute super."numerals"; @@ -5513,6 +5552,7 @@ self: super: { "pcg-random" = dontDistribute super."pcg-random"; "pcre-heavy" = doDistribute super."pcre-heavy_0_2_5"; "pcre-less" = dontDistribute super."pcre-less"; + "pcre-light" = doDistribute super."pcre-light_0_4_0_3"; "pcre-light-extra" = dontDistribute super."pcre-light-extra"; "pcre-utils" = dontDistribute super."pcre-utils"; "pdf-toolbox-content" = dontDistribute super."pdf-toolbox-content"; @@ -5847,6 +5887,7 @@ self: super: { "qc-oi-testgenerator" = dontDistribute super."qc-oi-testgenerator"; "qd" = dontDistribute super."qd"; "qd-vec" = dontDistribute super."qd-vec"; + "qed" = dontDistribute super."qed"; "qhull-simple" = dontDistribute super."qhull-simple"; "qrcode" = dontDistribute super."qrcode"; "qt" = dontDistribute super."qt"; @@ -5861,6 +5902,7 @@ self: super: { "queue" = dontDistribute super."queue"; "queuelike" = dontDistribute super."queuelike"; "quick-generator" = dontDistribute super."quick-generator"; + "quick-schema" = dontDistribute super."quick-schema"; "quickcheck-poly" = dontDistribute super."quickcheck-poly"; "quickcheck-properties" = dontDistribute super."quickcheck-properties"; "quickcheck-property-comb" = dontDistribute super."quickcheck-property-comb"; @@ -6328,6 +6370,7 @@ self: super: { "serialport" = dontDistribute super."serialport"; "servant-JuicyPixels" = doDistribute super."servant-JuicyPixels_0_1_0_0"; "servant-blaze" = dontDistribute super."servant-blaze"; + "servant-cassava" = dontDistribute super."servant-cassava"; "servant-ede" = dontDistribute super."servant-ede"; "servant-examples" = dontDistribute super."servant-examples"; "servant-lucid" = dontDistribute super."servant-lucid"; @@ -6336,6 +6379,7 @@ self: super: { "servant-postgresql" = dontDistribute super."servant-postgresql"; "servant-response" = dontDistribute super."servant-response"; "servant-scotty" = dontDistribute super."servant-scotty"; + "servant-swagger" = dontDistribute super."servant-swagger"; "servant-yaml" = dontDistribute super."servant-yaml"; "servius" = dontDistribute super."servius"; "ses-html" = dontDistribute super."ses-html"; @@ -6844,6 +6888,7 @@ self: super: { "tag-bits" = dontDistribute super."tag-bits"; "tag-stream" = dontDistribute super."tag-stream"; "tagchup" = dontDistribute super."tagchup"; + "tagged" = doDistribute super."tagged_0_8_1"; "tagged-exception-core" = dontDistribute super."tagged-exception-core"; "tagged-list" = dontDistribute super."tagged-list"; "tagged-th" = dontDistribute super."tagged-th"; @@ -6907,6 +6952,7 @@ self: super: { "tensor" = dontDistribute super."tensor"; "term-rewriting" = dontDistribute super."term-rewriting"; "termbox-bindings" = dontDistribute super."termbox-bindings"; + "terminal-size" = doDistribute super."terminal-size_0_3_2"; "termination-combinators" = dontDistribute super."termination-combinators"; "terminfo" = doDistribute super."terminfo_0_4_0_1"; "terminfo-hs" = dontDistribute super."terminfo-hs"; @@ -6970,6 +7016,7 @@ self: super: { "th-alpha" = dontDistribute super."th-alpha"; "th-build" = dontDistribute super."th-build"; "th-context" = dontDistribute super."th-context"; + "th-desugar" = doDistribute super."th-desugar_1_5_4_1"; "th-fold" = dontDistribute super."th-fold"; "th-inline-io-action" = dontDistribute super."th-inline-io-action"; "th-instance-reification" = dontDistribute super."th-instance-reification"; @@ -7402,6 +7449,7 @@ self: super: { "verdict" = dontDistribute super."verdict"; "verdict-json" = dontDistribute super."verdict-json"; "verilog" = dontDistribute super."verilog"; + "versions" = dontDistribute super."versions"; "vhdl" = dontDistribute super."vhdl"; "views" = dontDistribute super."views"; "vigilance" = dontDistribute super."vigilance"; @@ -7788,6 +7836,8 @@ self: super: { "zenc" = dontDistribute super."zenc"; "zendesk-api" = dontDistribute super."zendesk-api"; "zeno" = dontDistribute super."zeno"; + "zero" = doDistribute super."zero_0_1_3"; + "zerobin" = dontDistribute super."zerobin"; "zeromq-haskell" = dontDistribute super."zeromq-haskell"; "zeromq3-conduit" = dontDistribute super."zeromq3-conduit"; "zeromq3-haskell" = dontDistribute super."zeromq3-haskell"; diff --git a/pkgs/development/haskell-modules/configuration-lts-3.12.nix b/pkgs/development/haskell-modules/configuration-lts-3.12.nix new file mode 100644 index 000000000000..a06ee12ae668 --- /dev/null +++ b/pkgs/development/haskell-modules/configuration-lts-3.12.nix @@ -0,0 +1,7850 @@ +{ pkgs }: + +with import ./lib.nix { inherit pkgs; }; + +self: super: { + + # core libraries provided by the compiler + Cabal = null; + array = null; + base = null; + bin-package-db = null; + binary = null; + bytestring = null; + containers = null; + deepseq = null; + directory = null; + filepath = null; + ghc-prim = null; + hoopl = null; + hpc = null; + integer-gmp = null; + pretty = null; + process = null; + rts = null; + template-haskell = null; + time = null; + transformers = null; + unix = null; + + # lts-3.12 packages + "3d-graphics-examples" = dontDistribute super."3d-graphics-examples"; + "3dmodels" = dontDistribute super."3dmodels"; + "4Blocks" = dontDistribute super."4Blocks"; + "AAI" = dontDistribute super."AAI"; + "ABList" = dontDistribute super."ABList"; + "AC-Angle" = dontDistribute super."AC-Angle"; + "AC-Boolean" = dontDistribute super."AC-Boolean"; + "AC-BuildPlatform" = dontDistribute super."AC-BuildPlatform"; + "AC-Colour" = dontDistribute super."AC-Colour"; + "AC-EasyRaster-GTK" = dontDistribute super."AC-EasyRaster-GTK"; + "AC-HalfInteger" = dontDistribute super."AC-HalfInteger"; + "AC-MiniTest" = dontDistribute super."AC-MiniTest"; + "AC-PPM" = dontDistribute super."AC-PPM"; + "AC-Random" = dontDistribute super."AC-Random"; + "AC-Terminal" = dontDistribute super."AC-Terminal"; + "AC-VanillaArray" = dontDistribute super."AC-VanillaArray"; + "AC-Vector-Fancy" = dontDistribute super."AC-Vector-Fancy"; + "ACME" = dontDistribute super."ACME"; + "ADPfusion" = dontDistribute super."ADPfusion"; + "AERN-Basics" = dontDistribute super."AERN-Basics"; + "AERN-Net" = dontDistribute super."AERN-Net"; + "AERN-Real" = dontDistribute super."AERN-Real"; + "AERN-Real-Double" = dontDistribute super."AERN-Real-Double"; + "AERN-Real-Interval" = dontDistribute super."AERN-Real-Interval"; + "AERN-RnToRm" = dontDistribute super."AERN-RnToRm"; + "AERN-RnToRm-Plot" = dontDistribute super."AERN-RnToRm-Plot"; + "AES" = dontDistribute super."AES"; + "AGI" = dontDistribute super."AGI"; + "ALUT" = dontDistribute super."ALUT"; + "AMI" = dontDistribute super."AMI"; + "ANum" = dontDistribute super."ANum"; + "ASN1" = dontDistribute super."ASN1"; + "AVar" = dontDistribute super."AVar"; + "AWin32Console" = dontDistribute super."AWin32Console"; + "AbortT-monadstf" = dontDistribute super."AbortT-monadstf"; + "AbortT-mtl" = dontDistribute super."AbortT-mtl"; + "AbortT-transformers" = dontDistribute super."AbortT-transformers"; + "ActionKid" = dontDistribute super."ActionKid"; + "Adaptive" = dontDistribute super."Adaptive"; + "Adaptive-Blaisorblade" = dontDistribute super."Adaptive-Blaisorblade"; + "Advgame" = dontDistribute super."Advgame"; + "AesonBson" = dontDistribute super."AesonBson"; + "Agata" = dontDistribute super."Agata"; + "Agda-executable" = dontDistribute super."Agda-executable"; + "AhoCorasick" = dontDistribute super."AhoCorasick"; + "AlgorithmW" = dontDistribute super."AlgorithmW"; + "AlignmentAlgorithms" = dontDistribute super."AlignmentAlgorithms"; + "Allure" = dontDistribute super."Allure"; + "AndroidViewHierarchyImporter" = dontDistribute super."AndroidViewHierarchyImporter"; + "Animas" = dontDistribute super."Animas"; + "Annotations" = dontDistribute super."Annotations"; + "Ansi2Html" = dontDistribute super."Ansi2Html"; + "ApplePush" = dontDistribute super."ApplePush"; + "AppleScript" = dontDistribute super."AppleScript"; + "ApproxFun-hs" = dontDistribute super."ApproxFun-hs"; + "ArrayRef" = dontDistribute super."ArrayRef"; + "ArrowVHDL" = dontDistribute super."ArrowVHDL"; + "AspectAG" = dontDistribute super."AspectAG"; + "AttoBencode" = dontDistribute super."AttoBencode"; + "AttoJson" = dontDistribute super."AttoJson"; + "Attrac" = dontDistribute super."Attrac"; + "Aurochs" = dontDistribute super."Aurochs"; + "AutoForms" = dontDistribute super."AutoForms"; + "AvlTree" = dontDistribute super."AvlTree"; + "BASIC" = dontDistribute super."BASIC"; + "BCMtools" = dontDistribute super."BCMtools"; + "BNFC" = dontDistribute super."BNFC"; + "BNFC-meta" = dontDistribute super."BNFC-meta"; + "Baggins" = dontDistribute super."Baggins"; + "Bang" = dontDistribute super."Bang"; + "Barracuda" = dontDistribute super."Barracuda"; + "Befunge93" = dontDistribute super."Befunge93"; + "BenchmarkHistory" = dontDistribute super."BenchmarkHistory"; + "BerkeleyDB" = dontDistribute super."BerkeleyDB"; + "BerkeleyDBXML" = dontDistribute super."BerkeleyDBXML"; + "BerlekampAlgorithm" = dontDistribute super."BerlekampAlgorithm"; + "BigPixel" = dontDistribute super."BigPixel"; + "Binpack" = dontDistribute super."Binpack"; + "Biobase" = dontDistribute super."Biobase"; + "BiobaseBlast" = dontDistribute super."BiobaseBlast"; + "BiobaseDotP" = dontDistribute super."BiobaseDotP"; + "BiobaseFR3D" = dontDistribute super."BiobaseFR3D"; + "BiobaseFasta" = dontDistribute super."BiobaseFasta"; + "BiobaseInfernal" = dontDistribute super."BiobaseInfernal"; + "BiobaseMAF" = dontDistribute super."BiobaseMAF"; + "BiobaseTrainingData" = dontDistribute super."BiobaseTrainingData"; + "BiobaseTurner" = dontDistribute super."BiobaseTurner"; + "BiobaseTypes" = dontDistribute super."BiobaseTypes"; + "BiobaseVienna" = dontDistribute super."BiobaseVienna"; + "BiobaseXNA" = dontDistribute super."BiobaseXNA"; + "BirdPP" = dontDistribute super."BirdPP"; + "BitSyntax" = dontDistribute super."BitSyntax"; + "Bitly" = dontDistribute super."Bitly"; + "Blobs" = dontDistribute super."Blobs"; + "BluePrintCSS" = dontDistribute super."BluePrintCSS"; + "Blueprint" = dontDistribute super."Blueprint"; + "Bookshelf" = dontDistribute super."Bookshelf"; + "Bravo" = dontDistribute super."Bravo"; + "BufferedSocket" = dontDistribute super."BufferedSocket"; + "Buster" = dontDistribute super."Buster"; + "CBOR" = dontDistribute super."CBOR"; + "CC-delcont" = dontDistribute super."CC-delcont"; + "CC-delcont-alt" = dontDistribute super."CC-delcont-alt"; + "CC-delcont-cxe" = dontDistribute super."CC-delcont-cxe"; + "CC-delcont-exc" = dontDistribute super."CC-delcont-exc"; + "CC-delcont-ref" = dontDistribute super."CC-delcont-ref"; + "CC-delcont-ref-tf" = dontDistribute super."CC-delcont-ref-tf"; + "CCA" = dontDistribute super."CCA"; + "CHXHtml" = dontDistribute super."CHXHtml"; + "CLASE" = dontDistribute super."CLASE"; + "CLI" = dontDistribute super."CLI"; + "CMCompare" = dontDistribute super."CMCompare"; + "CMQ" = dontDistribute super."CMQ"; + "COrdering" = dontDistribute super."COrdering"; + "CPBrainfuck" = dontDistribute super."CPBrainfuck"; + "CPL" = dontDistribute super."CPL"; + "CSPM-CoreLanguage" = dontDistribute super."CSPM-CoreLanguage"; + "CSPM-FiringRules" = dontDistribute super."CSPM-FiringRules"; + "CSPM-Frontend" = dontDistribute super."CSPM-Frontend"; + "CSPM-Interpreter" = dontDistribute super."CSPM-Interpreter"; + "CSPM-ToProlog" = dontDistribute super."CSPM-ToProlog"; + "CSPM-cspm" = dontDistribute super."CSPM-cspm"; + "CTRex" = dontDistribute super."CTRex"; + "CV" = dontDistribute super."CV"; + "CabalSearch" = dontDistribute super."CabalSearch"; + "Capabilities" = dontDistribute super."Capabilities"; + "Cardinality" = dontDistribute super."Cardinality"; + "CarneadesDSL" = dontDistribute super."CarneadesDSL"; + "CarneadesIntoDung" = dontDistribute super."CarneadesIntoDung"; + "Cartesian" = dontDistribute super."Cartesian"; + "Cascade" = dontDistribute super."Cascade"; + "Catana" = dontDistribute super."Catana"; + "Chart-gtk" = dontDistribute super."Chart-gtk"; + "Chart-simple" = dontDistribute super."Chart-simple"; + "CheatSheet" = dontDistribute super."CheatSheet"; + "Checked" = dontDistribute super."Checked"; + "Chitra" = dontDistribute super."Chitra"; + "ChristmasTree" = dontDistribute super."ChristmasTree"; + "CirruParser" = dontDistribute super."CirruParser"; + "ClassLaws" = dontDistribute super."ClassLaws"; + "ClassyPrelude" = dontDistribute super."ClassyPrelude"; + "Clean" = dontDistribute super."Clean"; + "Clipboard" = dontDistribute super."Clipboard"; + "ClustalParser" = dontDistribute super."ClustalParser"; + "Coadjute" = dontDistribute super."Coadjute"; + "Codec-Compression-LZF" = dontDistribute super."Codec-Compression-LZF"; + "Codec-Image-DevIL" = dontDistribute super."Codec-Image-DevIL"; + "Combinatorrent" = dontDistribute super."Combinatorrent"; + "Command" = dontDistribute super."Command"; + "Commando" = dontDistribute super."Commando"; + "ComonadSheet" = dontDistribute super."ComonadSheet"; + "ConcurrentUtils" = dontDistribute super."ConcurrentUtils"; + "Concurrential" = dontDistribute super."Concurrential"; + "Condor" = dontDistribute super."Condor"; + "ConfigFileTH" = dontDistribute super."ConfigFileTH"; + "Configger" = dontDistribute super."Configger"; + "Configurable" = dontDistribute super."Configurable"; + "ConsStream" = dontDistribute super."ConsStream"; + "Conscript" = dontDistribute super."Conscript"; + "ConstraintKinds" = dontDistribute super."ConstraintKinds"; + "Consumer" = dontDistribute super."Consumer"; + "ContArrow" = dontDistribute super."ContArrow"; + "ContextAlgebra" = dontDistribute super."ContextAlgebra"; + "Contract" = dontDistribute super."Contract"; + "Control-Engine" = dontDistribute super."Control-Engine"; + "Control-Monad-MultiPass" = dontDistribute super."Control-Monad-MultiPass"; + "Control-Monad-ST2" = dontDistribute super."Control-Monad-ST2"; + "CoreDump" = dontDistribute super."CoreDump"; + "CoreErlang" = dontDistribute super."CoreErlang"; + "CoreFoundation" = dontDistribute super."CoreFoundation"; + "Coroutine" = dontDistribute super."Coroutine"; + "CouchDB" = dontDistribute super."CouchDB"; + "Craft3e" = dontDistribute super."Craft3e"; + "Crypto" = dontDistribute super."Crypto"; + "CurryDB" = dontDistribute super."CurryDB"; + "DAG-Tournament" = dontDistribute super."DAG-Tournament"; + "DAV" = doDistribute super."DAV_1_0_7"; + "DBlimited" = dontDistribute super."DBlimited"; + "DBus" = dontDistribute super."DBus"; + "DCFL" = dontDistribute super."DCFL"; + "DMuCheck" = dontDistribute super."DMuCheck"; + "DOM" = dontDistribute super."DOM"; + "DP" = dontDistribute super."DP"; + "DPM" = dontDistribute super."DPM"; + "DSA" = dontDistribute super."DSA"; + "DSH" = dontDistribute super."DSH"; + "DSTM" = dontDistribute super."DSTM"; + "DTC" = dontDistribute super."DTC"; + "Dangerous" = dontDistribute super."Dangerous"; + "Dao" = dontDistribute super."Dao"; + "DarcsHelpers" = dontDistribute super."DarcsHelpers"; + "Data-Hash-Consistent" = dontDistribute super."Data-Hash-Consistent"; + "Data-Rope" = dontDistribute super."Data-Rope"; + "DataTreeView" = dontDistribute super."DataTreeView"; + "Deadpan-DDP" = dontDistribute super."Deadpan-DDP"; + "DebugTraceHelpers" = dontDistribute super."DebugTraceHelpers"; + "DecisionTree" = dontDistribute super."DecisionTree"; + "DeepArrow" = dontDistribute super."DeepArrow"; + "DefendTheKing" = dontDistribute super."DefendTheKing"; + "DescriptiveKeys" = dontDistribute super."DescriptiveKeys"; + "Dflow" = dontDistribute super."Dflow"; + "DifferenceLogic" = dontDistribute super."DifferenceLogic"; + "DifferentialEvolution" = dontDistribute super."DifferentialEvolution"; + "Digit" = dontDistribute super."Digit"; + "DigitalOcean" = dontDistribute super."DigitalOcean"; + "DimensionalHash" = dontDistribute super."DimensionalHash"; + "DirectSound" = dontDistribute super."DirectSound"; + "DisTract" = dontDistribute super."DisTract"; + "DiscussionSupportSystem" = dontDistribute super."DiscussionSupportSystem"; + "Dish" = dontDistribute super."Dish"; + "Dist" = dontDistribute super."Dist"; + "DistanceTransform" = dontDistribute super."DistanceTransform"; + "DistanceUnits" = dontDistribute super."DistanceUnits"; + "DnaProteinAlignment" = dontDistribute super."DnaProteinAlignment"; + "DocTest" = dontDistribute super."DocTest"; + "Docs" = dontDistribute super."Docs"; + "DrHylo" = dontDistribute super."DrHylo"; + "DrIFT" = dontDistribute super."DrIFT"; + "DrIFT-cabalized" = dontDistribute super."DrIFT-cabalized"; + "Dung" = dontDistribute super."Dung"; + "Dust" = dontDistribute super."Dust"; + "Dust-crypto" = dontDistribute super."Dust-crypto"; + "Dust-tools" = dontDistribute super."Dust-tools"; + "Dust-tools-pcap" = dontDistribute super."Dust-tools-pcap"; + "DynamicTimeWarp" = dontDistribute super."DynamicTimeWarp"; + "DysFRP" = dontDistribute super."DysFRP"; + "DysFRP-Cairo" = dontDistribute super."DysFRP-Cairo"; + "DysFRP-Craftwerk" = dontDistribute super."DysFRP-Craftwerk"; + "EEConfig" = dontDistribute super."EEConfig"; + "Earley" = doDistribute super."Earley_0_9_0"; + "Ebnf2ps" = dontDistribute super."Ebnf2ps"; + "EdisonAPI" = dontDistribute super."EdisonAPI"; + "EdisonCore" = dontDistribute super."EdisonCore"; + "EditTimeReport" = dontDistribute super."EditTimeReport"; + "EitherT" = dontDistribute super."EitherT"; + "Elm" = dontDistribute super."Elm"; + "Emping" = dontDistribute super."Emping"; + "Encode" = dontDistribute super."Encode"; + "EntrezHTTP" = dontDistribute super."EntrezHTTP"; + "EnumContainers" = dontDistribute super."EnumContainers"; + "EnumMap" = dontDistribute super."EnumMap"; + "Eq" = dontDistribute super."Eq"; + "EqualitySolver" = dontDistribute super."EqualitySolver"; + "EsounD" = dontDistribute super."EsounD"; + "EstProgress" = dontDistribute super."EstProgress"; + "EtaMOO" = dontDistribute super."EtaMOO"; + "Etage" = dontDistribute super."Etage"; + "Etage-Graph" = dontDistribute super."Etage-Graph"; + "Eternal10Seconds" = dontDistribute super."Eternal10Seconds"; + "Etherbunny" = dontDistribute super."Etherbunny"; + "EuroIT" = dontDistribute super."EuroIT"; + "Euterpea" = dontDistribute super."Euterpea"; + "EventSocket" = dontDistribute super."EventSocket"; + "Extra" = dontDistribute super."Extra"; + "FComp" = dontDistribute super."FComp"; + "FM-SBLEX" = dontDistribute super."FM-SBLEX"; + "FModExRaw" = dontDistribute super."FModExRaw"; + "FPretty" = dontDistribute super."FPretty"; + "FTGL" = dontDistribute super."FTGL"; + "FTGL-bytestring" = dontDistribute super."FTGL-bytestring"; + "FTPLine" = dontDistribute super."FTPLine"; + "Facts" = dontDistribute super."Facts"; + "FailureT" = dontDistribute super."FailureT"; + "FastxPipe" = dontDistribute super."FastxPipe"; + "FermatsLastMargin" = dontDistribute super."FermatsLastMargin"; + "FerryCore" = dontDistribute super."FerryCore"; + "Feval" = dontDistribute super."Feval"; + "FieldTrip" = dontDistribute super."FieldTrip"; + "FileManip" = dontDistribute super."FileManip"; + "FileManipCompat" = dontDistribute super."FileManipCompat"; + "FilePather" = dontDistribute super."FilePather"; + "FileSystem" = dontDistribute super."FileSystem"; + "Finance-Quote-Yahoo" = dontDistribute super."Finance-Quote-Yahoo"; + "Finance-Treasury" = dontDistribute super."Finance-Treasury"; + "FindBin" = dontDistribute super."FindBin"; + "FiniteMap" = dontDistribute super."FiniteMap"; + "FirstOrderTheory" = dontDistribute super."FirstOrderTheory"; + "FixedPoint-simple" = dontDistribute super."FixedPoint-simple"; + "Flippi" = dontDistribute super."Flippi"; + "Focus" = dontDistribute super."Focus"; + "Folly" = dontDistribute super."Folly"; + "ForSyDe" = dontDistribute super."ForSyDe"; + "ForkableT" = dontDistribute super."ForkableT"; + "FormalGrammars" = dontDistribute super."FormalGrammars"; + "Foster" = dontDistribute super."Foster"; + "FpMLv53" = dontDistribute super."FpMLv53"; + "Fractaler" = dontDistribute super."Fractaler"; + "Frames" = dontDistribute super."Frames"; + "Frank" = dontDistribute super."Frank"; + "FreeTypeGL" = dontDistribute super."FreeTypeGL"; + "FunGEn" = dontDistribute super."FunGEn"; + "Fungi" = dontDistribute super."Fungi"; + "GA" = dontDistribute super."GA"; + "GGg" = dontDistribute super."GGg"; + "GHood" = dontDistribute super."GHood"; + "GLFW" = dontDistribute super."GLFW"; + "GLFW-OGL" = dontDistribute super."GLFW-OGL"; + "GLFW-b" = dontDistribute super."GLFW-b"; + "GLFW-b-demo" = dontDistribute super."GLFW-b-demo"; + "GLFW-task" = dontDistribute super."GLFW-task"; + "GLHUI" = dontDistribute super."GLHUI"; + "GLM" = dontDistribute super."GLM"; + "GLMatrix" = dontDistribute super."GLMatrix"; + "GLURaw" = dontDistribute super."GLURaw"; + "GLUT" = dontDistribute super."GLUT"; + "GLUtil" = dontDistribute super."GLUtil"; + "GPX" = dontDistribute super."GPX"; + "GPipe" = dontDistribute super."GPipe"; + "GPipe-Collada" = dontDistribute super."GPipe-Collada"; + "GPipe-Examples" = dontDistribute super."GPipe-Examples"; + "GPipe-GLFW" = dontDistribute super."GPipe-GLFW"; + "GPipe-TextureLoad" = dontDistribute super."GPipe-TextureLoad"; + "GTALib" = dontDistribute super."GTALib"; + "Gamgine" = dontDistribute super."Gamgine"; + "Ganymede" = dontDistribute super."Ganymede"; + "GaussQuadIntegration" = dontDistribute super."GaussQuadIntegration"; + "GeBoP" = dontDistribute super."GeBoP"; + "GenI" = dontDistribute super."GenI"; + "GenSmsPdu" = dontDistribute super."GenSmsPdu"; + "Genbank" = dontDistribute super."Genbank"; + "GeneralTicTacToe" = dontDistribute super."GeneralTicTacToe"; + "GenussFold" = dontDistribute super."GenussFold"; + "GeoIp" = dontDistribute super."GeoIp"; + "GeocoderOpenCage" = dontDistribute super."GeocoderOpenCage"; + "Geodetic" = dontDistribute super."Geodetic"; + "GeomPredicates" = dontDistribute super."GeomPredicates"; + "GeomPredicates-SSE" = dontDistribute super."GeomPredicates-SSE"; + "GiST" = dontDistribute super."GiST"; + "GiveYouAHead" = dontDistribute super."GiveYouAHead"; + "GlomeTrace" = dontDistribute super."GlomeTrace"; + "GlomeVec" = dontDistribute super."GlomeVec"; + "GlomeView" = dontDistribute super."GlomeView"; + "GoogleChart" = dontDistribute super."GoogleChart"; + "GoogleDirections" = dontDistribute super."GoogleDirections"; + "GoogleSB" = dontDistribute super."GoogleSB"; + "GoogleSuggest" = dontDistribute super."GoogleSuggest"; + "GoogleTranslate" = dontDistribute super."GoogleTranslate"; + "GotoT-transformers" = dontDistribute super."GotoT-transformers"; + "GrammarProducts" = dontDistribute super."GrammarProducts"; + "Graph500" = dontDistribute super."Graph500"; + "GraphHammer" = dontDistribute super."GraphHammer"; + "GraphHammer-examples" = dontDistribute super."GraphHammer-examples"; + "Graphalyze" = dontDistribute super."Graphalyze"; + "Grempa" = dontDistribute super."Grempa"; + "GroteTrap" = dontDistribute super."GroteTrap"; + "Grow" = dontDistribute super."Grow"; + "GrowlNotify" = dontDistribute super."GrowlNotify"; + "Gtk2hsGenerics" = dontDistribute super."Gtk2hsGenerics"; + "GtkGLTV" = dontDistribute super."GtkGLTV"; + "GtkTV" = dontDistribute super."GtkTV"; + "GuiHaskell" = dontDistribute super."GuiHaskell"; + "GuiTV" = dontDistribute super."GuiTV"; + "H" = dontDistribute super."H"; + "HARM" = dontDistribute super."HARM"; + "HAppS-Data" = dontDistribute super."HAppS-Data"; + "HAppS-IxSet" = dontDistribute super."HAppS-IxSet"; + "HAppS-Server" = dontDistribute super."HAppS-Server"; + "HAppS-State" = dontDistribute super."HAppS-State"; + "HAppS-Util" = dontDistribute super."HAppS-Util"; + "HAppSHelpers" = dontDistribute super."HAppSHelpers"; + "HCL" = dontDistribute super."HCL"; + "HCard" = dontDistribute super."HCard"; + "HDBC" = dontDistribute super."HDBC"; + "HDBC-mysql" = dontDistribute super."HDBC-mysql"; + "HDBC-odbc" = dontDistribute super."HDBC-odbc"; + "HDBC-postgresql" = dontDistribute super."HDBC-postgresql"; + "HDBC-postgresql-hstore" = dontDistribute super."HDBC-postgresql-hstore"; + "HDBC-session" = dontDistribute super."HDBC-session"; + "HDBC-sqlite3" = dontDistribute super."HDBC-sqlite3"; + "HDRUtils" = dontDistribute super."HDRUtils"; + "HERA" = dontDistribute super."HERA"; + "HFrequencyQueue" = dontDistribute super."HFrequencyQueue"; + "HFuse" = dontDistribute super."HFuse"; + "HGL" = dontDistribute super."HGL"; + "HGamer3D" = dontDistribute super."HGamer3D"; + "HGamer3D-API" = dontDistribute super."HGamer3D-API"; + "HGamer3D-Audio" = dontDistribute super."HGamer3D-Audio"; + "HGamer3D-Bullet-Binding" = dontDistribute super."HGamer3D-Bullet-Binding"; + "HGamer3D-CAudio-Binding" = dontDistribute super."HGamer3D-CAudio-Binding"; + "HGamer3D-CEGUI-Binding" = dontDistribute super."HGamer3D-CEGUI-Binding"; + "HGamer3D-Common" = dontDistribute super."HGamer3D-Common"; + "HGamer3D-Data" = dontDistribute super."HGamer3D-Data"; + "HGamer3D-Enet-Binding" = dontDistribute super."HGamer3D-Enet-Binding"; + "HGamer3D-GUI" = dontDistribute super."HGamer3D-GUI"; + "HGamer3D-Graphics3D" = dontDistribute super."HGamer3D-Graphics3D"; + "HGamer3D-InputSystem" = dontDistribute super."HGamer3D-InputSystem"; + "HGamer3D-Network" = dontDistribute super."HGamer3D-Network"; + "HGamer3D-OIS-Binding" = dontDistribute super."HGamer3D-OIS-Binding"; + "HGamer3D-Ogre-Binding" = dontDistribute super."HGamer3D-Ogre-Binding"; + "HGamer3D-SDL2-Binding" = dontDistribute super."HGamer3D-SDL2-Binding"; + "HGamer3D-SFML-Binding" = dontDistribute super."HGamer3D-SFML-Binding"; + "HGamer3D-WinEvent" = dontDistribute super."HGamer3D-WinEvent"; + "HGamer3D-Wire" = dontDistribute super."HGamer3D-Wire"; + "HGraphStorage" = dontDistribute super."HGraphStorage"; + "HHDL" = dontDistribute super."HHDL"; + "HJScript" = dontDistribute super."HJScript"; + "HJVM" = dontDistribute super."HJVM"; + "HJavaScript" = dontDistribute super."HJavaScript"; + "HLearn-algebra" = dontDistribute super."HLearn-algebra"; + "HLearn-approximation" = dontDistribute super."HLearn-approximation"; + "HLearn-classification" = dontDistribute super."HLearn-classification"; + "HLearn-datastructures" = dontDistribute super."HLearn-datastructures"; + "HLearn-distributions" = dontDistribute super."HLearn-distributions"; + "HListPP" = dontDistribute super."HListPP"; + "HLogger" = dontDistribute super."HLogger"; + "HMM" = dontDistribute super."HMM"; + "HMap" = dontDistribute super."HMap"; + "HNM" = dontDistribute super."HNM"; + "HODE" = dontDistribute super."HODE"; + "HOpenCV" = dontDistribute super."HOpenCV"; + "HPDF" = dontDistribute super."HPDF"; + "HPath" = dontDistribute super."HPath"; + "HPi" = dontDistribute super."HPi"; + "HPlot" = dontDistribute super."HPlot"; + "HPong" = dontDistribute super."HPong"; + "HROOT" = dontDistribute super."HROOT"; + "HROOT-core" = dontDistribute super."HROOT-core"; + "HROOT-graf" = dontDistribute super."HROOT-graf"; + "HROOT-hist" = dontDistribute super."HROOT-hist"; + "HROOT-io" = dontDistribute super."HROOT-io"; + "HROOT-math" = dontDistribute super."HROOT-math"; + "HRay" = dontDistribute super."HRay"; + "HSFFIG" = dontDistribute super."HSFFIG"; + "HSGEP" = dontDistribute super."HSGEP"; + "HSH" = dontDistribute super."HSH"; + "HSHHelpers" = dontDistribute super."HSHHelpers"; + "HSlippyMap" = dontDistribute super."HSlippyMap"; + "HSmarty" = dontDistribute super."HSmarty"; + "HSoundFile" = dontDistribute super."HSoundFile"; + "HStringTemplateHelpers" = dontDistribute super."HStringTemplateHelpers"; + "HSvm" = dontDistribute super."HSvm"; + "HTTP-Simple" = dontDistribute super."HTTP-Simple"; + "HTab" = dontDistribute super."HTab"; + "HTicTacToe" = dontDistribute super."HTicTacToe"; + "HUnit-Diff" = dontDistribute super."HUnit-Diff"; + "HUnit-Plus" = dontDistribute super."HUnit-Plus"; + "HUnit-approx" = dontDistribute super."HUnit-approx"; + "HXMPP" = dontDistribute super."HXMPP"; + "HXQ" = dontDistribute super."HXQ"; + "HaLeX" = dontDistribute super."HaLeX"; + "HaMinitel" = dontDistribute super."HaMinitel"; + "HaPy" = dontDistribute super."HaPy"; + "HaRe" = dontDistribute super."HaRe"; + "HaTeX-meta" = dontDistribute super."HaTeX-meta"; + "HaTeX-qq" = dontDistribute super."HaTeX-qq"; + "HaVSA" = dontDistribute super."HaVSA"; + "Hach" = dontDistribute super."Hach"; + "HackMail" = dontDistribute super."HackMail"; + "Haggressive" = dontDistribute super."Haggressive"; + "HandlerSocketClient" = dontDistribute super."HandlerSocketClient"; + "Hangman" = dontDistribute super."Hangman"; + "HarmTrace" = dontDistribute super."HarmTrace"; + "HarmTrace-Base" = dontDistribute super."HarmTrace-Base"; + "HasGP" = dontDistribute super."HasGP"; + "Haschoo" = dontDistribute super."Haschoo"; + "Hashell" = dontDistribute super."Hashell"; + "HaskRel" = dontDistribute super."HaskRel"; + "HaskellForMaths" = dontDistribute super."HaskellForMaths"; + "HaskellLM" = dontDistribute super."HaskellLM"; + "HaskellNN" = dontDistribute super."HaskellNN"; + "HaskellNet-SSL" = dontDistribute super."HaskellNet-SSL"; + "HaskellTorrent" = dontDistribute super."HaskellTorrent"; + "HaskellTutorials" = dontDistribute super."HaskellTutorials"; + "Haskelloids" = dontDistribute super."Haskelloids"; + "Hawk" = dontDistribute super."Hawk"; + "Hayoo" = dontDistribute super."Hayoo"; + "Hclip" = dontDistribute super."Hclip"; + "Hedi" = dontDistribute super."Hedi"; + "HerbiePlugin" = dontDistribute super."HerbiePlugin"; + "Hermes" = dontDistribute super."Hermes"; + "Hieroglyph" = dontDistribute super."Hieroglyph"; + "HiggsSet" = dontDistribute super."HiggsSet"; + "Hipmunk" = dontDistribute super."Hipmunk"; + "HipmunkPlayground" = dontDistribute super."HipmunkPlayground"; + "Hish" = dontDistribute super."Hish"; + "Histogram" = dontDistribute super."Histogram"; + "Hmpf" = dontDistribute super."Hmpf"; + "Hoed" = dontDistribute super."Hoed"; + "HoleyMonoid" = dontDistribute super."HoleyMonoid"; + "Holumbus-Distribution" = dontDistribute super."Holumbus-Distribution"; + "Holumbus-MapReduce" = dontDistribute super."Holumbus-MapReduce"; + "Holumbus-Searchengine" = dontDistribute super."Holumbus-Searchengine"; + "Holumbus-Storage" = dontDistribute super."Holumbus-Storage"; + "Homology" = dontDistribute super."Homology"; + "HongoDB" = dontDistribute super."HongoDB"; + "HostAndPort" = dontDistribute super."HostAndPort"; + "Hricket" = dontDistribute super."Hricket"; + "Hs2lib" = dontDistribute super."Hs2lib"; + "HsASA" = dontDistribute super."HsASA"; + "HsHaruPDF" = dontDistribute super."HsHaruPDF"; + "HsHyperEstraier" = dontDistribute super."HsHyperEstraier"; + "HsJudy" = dontDistribute super."HsJudy"; + "HsOpenSSL-x509-system" = dontDistribute super."HsOpenSSL-x509-system"; + "HsParrot" = dontDistribute super."HsParrot"; + "HsPerl5" = dontDistribute super."HsPerl5"; + "HsSVN" = dontDistribute super."HsSVN"; + "HsSyck" = dontDistribute super."HsSyck"; + "HsTools" = dontDistribute super."HsTools"; + "Hsed" = dontDistribute super."Hsed"; + "Hsmtlib" = dontDistribute super."Hsmtlib"; + "HueAPI" = dontDistribute super."HueAPI"; + "HulkImport" = dontDistribute super."HulkImport"; + "Hungarian-Munkres" = dontDistribute super."Hungarian-Munkres"; + "IDynamic" = dontDistribute super."IDynamic"; + "IFS" = dontDistribute super."IFS"; + "INblobs" = dontDistribute super."INblobs"; + "IOR" = dontDistribute super."IOR"; + "IORefCAS" = dontDistribute super."IORefCAS"; + "IcoGrid" = dontDistribute super."IcoGrid"; + "Imlib" = dontDistribute super."Imlib"; + "ImperativeHaskell" = dontDistribute super."ImperativeHaskell"; + "IndentParser" = dontDistribute super."IndentParser"; + "IndexedList" = dontDistribute super."IndexedList"; + "InfixApplicative" = dontDistribute super."InfixApplicative"; + "Interpolation" = dontDistribute super."Interpolation"; + "Interpolation-maxs" = dontDistribute super."Interpolation-maxs"; + "IntervalMap" = dontDistribute super."IntervalMap"; + "Irc" = dontDistribute super."Irc"; + "IrrHaskell" = dontDistribute super."IrrHaskell"; + "IsNull" = dontDistribute super."IsNull"; + "JSON-Combinator" = dontDistribute super."JSON-Combinator"; + "JSON-Combinator-Examples" = dontDistribute super."JSON-Combinator-Examples"; + "JSONb" = dontDistribute super."JSONb"; + "JYU-Utils" = dontDistribute super."JYU-Utils"; + "JackMiniMix" = dontDistribute super."JackMiniMix"; + "Javasf" = dontDistribute super."Javasf"; + "Javav" = dontDistribute super."Javav"; + "JsContracts" = dontDistribute super."JsContracts"; + "JsonGrammar" = dontDistribute super."JsonGrammar"; + "JuicyPixels-canvas" = dontDistribute super."JuicyPixels-canvas"; + "JuicyPixels-repa" = dontDistribute super."JuicyPixels-repa"; + "JuicyPixels-util" = dontDistribute super."JuicyPixels-util"; + "JunkDB" = dontDistribute super."JunkDB"; + "JunkDB-driver-gdbm" = dontDistribute super."JunkDB-driver-gdbm"; + "JunkDB-driver-hashtables" = dontDistribute super."JunkDB-driver-hashtables"; + "JustParse" = dontDistribute super."JustParse"; + "KMP" = dontDistribute super."KMP"; + "KSP" = dontDistribute super."KSP"; + "Kalman" = dontDistribute super."Kalman"; + "KdTree" = dontDistribute super."KdTree"; + "Ketchup" = dontDistribute super."Ketchup"; + "KiCS" = dontDistribute super."KiCS"; + "KiCS-debugger" = dontDistribute super."KiCS-debugger"; + "KiCS-prophecy" = dontDistribute super."KiCS-prophecy"; + "Kleislify" = dontDistribute super."Kleislify"; + "Konf" = dontDistribute super."Konf"; + "KyotoCabinet" = dontDistribute super."KyotoCabinet"; + "L-seed" = dontDistribute super."L-seed"; + "LDAP" = dontDistribute super."LDAP"; + "LRU" = dontDistribute super."LRU"; + "LTree" = dontDistribute super."LTree"; + "LambdaCalculator" = dontDistribute super."LambdaCalculator"; + "LambdaHack" = dontDistribute super."LambdaHack"; + "LambdaINet" = dontDistribute super."LambdaINet"; + "LambdaNet" = dontDistribute super."LambdaNet"; + "LambdaPrettyQuote" = dontDistribute super."LambdaPrettyQuote"; + "LambdaShell" = dontDistribute super."LambdaShell"; + "Lambdaya" = dontDistribute super."Lambdaya"; + "LargeCardinalHierarchy" = dontDistribute super."LargeCardinalHierarchy"; + "Lastik" = dontDistribute super."Lastik"; + "Lattices" = dontDistribute super."Lattices"; + "LazyVault" = dontDistribute super."LazyVault"; + "Level0" = dontDistribute super."Level0"; + "LibClang" = dontDistribute super."LibClang"; + "LibZip" = dontDistribute super."LibZip"; + "Limit" = dontDistribute super."Limit"; + "LinearSplit" = dontDistribute super."LinearSplit"; + "LinkChecker" = dontDistribute super."LinkChecker"; + "ListTree" = dontDistribute super."ListTree"; + "ListWriter" = dontDistribute super."ListWriter"; + "ListZipper" = dontDistribute super."ListZipper"; + "Logic" = dontDistribute super."Logic"; + "LogicGrowsOnTrees" = dontDistribute super."LogicGrowsOnTrees"; + "LogicGrowsOnTrees-MPI" = dontDistribute super."LogicGrowsOnTrees-MPI"; + "LogicGrowsOnTrees-network" = dontDistribute super."LogicGrowsOnTrees-network"; + "LogicGrowsOnTrees-processes" = dontDistribute super."LogicGrowsOnTrees-processes"; + "LslPlus" = dontDistribute super."LslPlus"; + "Lucu" = dontDistribute super."Lucu"; + "MC-Fold-DP" = dontDistribute super."MC-Fold-DP"; + "MFlow" = dontDistribute super."MFlow"; + "MHask" = dontDistribute super."MHask"; + "MSQueue" = dontDistribute super."MSQueue"; + "MTGBuilder" = dontDistribute super."MTGBuilder"; + "MagicHaskeller" = dontDistribute super."MagicHaskeller"; + "MailchimpSimple" = dontDistribute super."MailchimpSimple"; + "MaybeT" = dontDistribute super."MaybeT"; + "MaybeT-monads-tf" = dontDistribute super."MaybeT-monads-tf"; + "MaybeT-transformers" = dontDistribute super."MaybeT-transformers"; + "MazesOfMonad" = dontDistribute super."MazesOfMonad"; + "MeanShift" = dontDistribute super."MeanShift"; + "Measure" = dontDistribute super."Measure"; + "MetaHDBC" = dontDistribute super."MetaHDBC"; + "MetaObject" = dontDistribute super."MetaObject"; + "Metrics" = dontDistribute super."Metrics"; + "Mhailist" = dontDistribute super."Mhailist"; + "Michelangelo" = dontDistribute super."Michelangelo"; + "MicrosoftTranslator" = dontDistribute super."MicrosoftTranslator"; + "MiniAgda" = dontDistribute super."MiniAgda"; + "MissingK" = dontDistribute super."MissingK"; + "MissingM" = dontDistribute super."MissingM"; + "MissingPy" = dontDistribute super."MissingPy"; + "Modulo" = dontDistribute super."Modulo"; + "Moe" = dontDistribute super."Moe"; + "MoeDict" = dontDistribute super."MoeDict"; + "MonadCatchIO-mtl" = dontDistribute super."MonadCatchIO-mtl"; + "MonadCatchIO-mtl-foreign" = dontDistribute super."MonadCatchIO-mtl-foreign"; + "MonadCatchIO-transformers-foreign" = dontDistribute super."MonadCatchIO-transformers-foreign"; + "MonadCompose" = dontDistribute super."MonadCompose"; + "MonadLab" = dontDistribute super."MonadLab"; + "MonadRandomLazy" = dontDistribute super."MonadRandomLazy"; + "MonadStack" = dontDistribute super."MonadStack"; + "Monadius" = dontDistribute super."Monadius"; + "Monaris" = dontDistribute super."Monaris"; + "Monatron" = dontDistribute super."Monatron"; + "Monatron-IO" = dontDistribute super."Monatron-IO"; + "Monocle" = dontDistribute super."Monocle"; + "MorseCode" = dontDistribute super."MorseCode"; + "MuCheck" = dontDistribute super."MuCheck"; + "MuCheck-HUnit" = dontDistribute super."MuCheck-HUnit"; + "MuCheck-Hspec" = dontDistribute super."MuCheck-Hspec"; + "MuCheck-QuickCheck" = dontDistribute super."MuCheck-QuickCheck"; + "MuCheck-SmallCheck" = dontDistribute super."MuCheck-SmallCheck"; + "Munkres" = dontDistribute super."Munkres"; + "Munkres-simple" = dontDistribute super."Munkres-simple"; + "MusicBrainz" = dontDistribute super."MusicBrainz"; + "MusicBrainz-libdiscid" = dontDistribute super."MusicBrainz-libdiscid"; + "MyPrimes" = dontDistribute super."MyPrimes"; + "NGrams" = dontDistribute super."NGrams"; + "NTRU" = dontDistribute super."NTRU"; + "NXT" = dontDistribute super."NXT"; + "NXTDSL" = dontDistribute super."NXTDSL"; + "NanoProlog" = dontDistribute super."NanoProlog"; + "NaturalLanguageAlphabets" = dontDistribute super."NaturalLanguageAlphabets"; + "NaturalSort" = dontDistribute super."NaturalSort"; + "NearContextAlgebra" = dontDistribute super."NearContextAlgebra"; + "Neks" = dontDistribute super."Neks"; + "NestedFunctor" = dontDistribute super."NestedFunctor"; + "NestedSampling" = dontDistribute super."NestedSampling"; + "NetSNMP" = dontDistribute super."NetSNMP"; + "NewBinary" = dontDistribute super."NewBinary"; + "Ninjas" = dontDistribute super."Ninjas"; + "NoSlow" = dontDistribute super."NoSlow"; + "NoTrace" = dontDistribute super."NoTrace"; + "Noise" = dontDistribute super."Noise"; + "Nomyx" = dontDistribute super."Nomyx"; + "Nomyx-Core" = dontDistribute super."Nomyx-Core"; + "Nomyx-Language" = dontDistribute super."Nomyx-Language"; + "Nomyx-Rules" = dontDistribute super."Nomyx-Rules"; + "Nomyx-Web" = dontDistribute super."Nomyx-Web"; + "NonEmpty" = dontDistribute super."NonEmpty"; + "NonEmptyList" = dontDistribute super."NonEmptyList"; + "NumLazyByteString" = dontDistribute super."NumLazyByteString"; + "NumberSieves" = dontDistribute super."NumberSieves"; + "Numbers" = dontDistribute super."Numbers"; + "Nussinov78" = dontDistribute super."Nussinov78"; + "Nutri" = dontDistribute super."Nutri"; + "OGL" = dontDistribute super."OGL"; + "OSM" = dontDistribute super."OSM"; + "OTP" = dontDistribute super."OTP"; + "Object" = dontDistribute super."Object"; + "ObjectIO" = dontDistribute super."ObjectIO"; + "ObjectName" = dontDistribute super."ObjectName"; + "Obsidian" = dontDistribute super."Obsidian"; + "OddWord" = dontDistribute super."OddWord"; + "Omega" = dontDistribute super."Omega"; + "OpenAFP" = dontDistribute super."OpenAFP"; + "OpenAFP-Utils" = dontDistribute super."OpenAFP-Utils"; + "OpenAL" = dontDistribute super."OpenAL"; + "OpenCL" = dontDistribute super."OpenCL"; + "OpenCLRaw" = dontDistribute super."OpenCLRaw"; + "OpenCLWrappers" = dontDistribute super."OpenCLWrappers"; + "OpenGL" = dontDistribute super."OpenGL"; + "OpenGLCheck" = dontDistribute super."OpenGLCheck"; + "OpenGLRaw" = dontDistribute super."OpenGLRaw"; + "OpenGLRaw21" = dontDistribute super."OpenGLRaw21"; + "OpenSCAD" = dontDistribute super."OpenSCAD"; + "OpenVG" = dontDistribute super."OpenVG"; + "OpenVGRaw" = dontDistribute super."OpenVGRaw"; + "Operads" = dontDistribute super."Operads"; + "OptDir" = dontDistribute super."OptDir"; + "OrPatterns" = dontDistribute super."OrPatterns"; + "OrchestrateDB" = dontDistribute super."OrchestrateDB"; + "OrderedBits" = dontDistribute super."OrderedBits"; + "Ordinals" = dontDistribute super."Ordinals"; + "PArrows" = dontDistribute super."PArrows"; + "PBKDF2" = dontDistribute super."PBKDF2"; + "PCLT" = dontDistribute super."PCLT"; + "PCLT-DB" = dontDistribute super."PCLT-DB"; + "PDBtools" = dontDistribute super."PDBtools"; + "PTQ" = dontDistribute super."PTQ"; + "PageIO" = dontDistribute super."PageIO"; + "Paillier" = dontDistribute super."Paillier"; + "PandocAgda" = dontDistribute super."PandocAgda"; + "Paraiso" = dontDistribute super."Paraiso"; + "Parry" = dontDistribute super."Parry"; + "ParsecTools" = dontDistribute super."ParsecTools"; + "ParserFunction" = dontDistribute super."ParserFunction"; + "PartialTypeSignatures" = dontDistribute super."PartialTypeSignatures"; + "PasswordGenerator" = dontDistribute super."PasswordGenerator"; + "PastePipe" = dontDistribute super."PastePipe"; + "Pathfinder" = dontDistribute super."Pathfinder"; + "Peano" = dontDistribute super."Peano"; + "PeanoWitnesses" = dontDistribute super."PeanoWitnesses"; + "PerfectHash" = dontDistribute super."PerfectHash"; + "PermuteEffects" = dontDistribute super."PermuteEffects"; + "Phsu" = dontDistribute super."Phsu"; + "Pipe" = dontDistribute super."Pipe"; + "Piso" = dontDistribute super."Piso"; + "PlayHangmanGame" = dontDistribute super."PlayHangmanGame"; + "PlayingCards" = dontDistribute super."PlayingCards"; + "Plot-ho-matic" = dontDistribute super."Plot-ho-matic"; + "PlslTools" = dontDistribute super."PlslTools"; + "Plural" = dontDistribute super."Plural"; + "Pollutocracy" = dontDistribute super."Pollutocracy"; + "PortFusion" = dontDistribute super."PortFusion"; + "PortMidi" = dontDistribute super."PortMidi"; + "PostgreSQL" = dontDistribute super."PostgreSQL"; + "PrimitiveArray" = dontDistribute super."PrimitiveArray"; + "Printf-TH" = dontDistribute super."Printf-TH"; + "PriorityChansConverger" = dontDistribute super."PriorityChansConverger"; + "ProbabilityMonads" = dontDistribute super."ProbabilityMonads"; + "PropLogic" = dontDistribute super."PropLogic"; + "Proper" = dontDistribute super."Proper"; + "ProxN" = dontDistribute super."ProxN"; + "Pugs" = dontDistribute super."Pugs"; + "Pup-Events" = dontDistribute super."Pup-Events"; + "Pup-Events-Client" = dontDistribute super."Pup-Events-Client"; + "Pup-Events-Demo" = dontDistribute super."Pup-Events-Demo"; + "Pup-Events-PQueue" = dontDistribute super."Pup-Events-PQueue"; + "Pup-Events-Server" = dontDistribute super."Pup-Events-Server"; + "QIO" = dontDistribute super."QIO"; + "QuadEdge" = dontDistribute super."QuadEdge"; + "QuadTree" = dontDistribute super."QuadTree"; + "QuickAnnotate" = dontDistribute super."QuickAnnotate"; + "QuickCheck-GenT" = dontDistribute super."QuickCheck-GenT"; + "Quickson" = dontDistribute super."Quickson"; + "R-pandoc" = dontDistribute super."R-pandoc"; + "RANSAC" = dontDistribute super."RANSAC"; + "RBTree" = dontDistribute super."RBTree"; + "RESTng" = dontDistribute super."RESTng"; + "RFC1751" = dontDistribute super."RFC1751"; + "RJson" = dontDistribute super."RJson"; + "RMP" = dontDistribute super."RMP"; + "RNAFold" = dontDistribute super."RNAFold"; + "RNAFoldProgs" = dontDistribute super."RNAFoldProgs"; + "RNAdesign" = dontDistribute super."RNAdesign"; + "RNAdraw" = dontDistribute super."RNAdraw"; + "RNAlien" = dontDistribute super."RNAlien"; + "RNAwolf" = dontDistribute super."RNAwolf"; + "RSA" = doDistribute super."RSA_2_1_0_3"; + "Raincat" = dontDistribute super."Raincat"; + "Random123" = dontDistribute super."Random123"; + "RandomDotOrg" = dontDistribute super."RandomDotOrg"; + "Randometer" = dontDistribute super."Randometer"; + "Range" = dontDistribute super."Range"; + "Ranged-sets" = dontDistribute super."Ranged-sets"; + "Ranka" = dontDistribute super."Ranka"; + "Rasenschach" = dontDistribute super."Rasenschach"; + "Redmine" = dontDistribute super."Redmine"; + "Ref" = dontDistribute super."Ref"; + "Referees" = dontDistribute super."Referees"; + "RepLib" = dontDistribute super."RepLib"; + "ReplicateEffects" = dontDistribute super."ReplicateEffects"; + "ReviewBoard" = dontDistribute super."ReviewBoard"; + "RichConditional" = dontDistribute super."RichConditional"; + "RollingDirectory" = dontDistribute super."RollingDirectory"; + "RoyalMonad" = dontDistribute super."RoyalMonad"; + "RxHaskell" = dontDistribute super."RxHaskell"; + "SBench" = dontDistribute super."SBench"; + "SConfig" = dontDistribute super."SConfig"; + "SDL" = dontDistribute super."SDL"; + "SDL-gfx" = dontDistribute super."SDL-gfx"; + "SDL-image" = dontDistribute super."SDL-image"; + "SDL-mixer" = dontDistribute super."SDL-mixer"; + "SDL-mpeg" = dontDistribute super."SDL-mpeg"; + "SDL-ttf" = dontDistribute super."SDL-ttf"; + "SDL2-ttf" = dontDistribute super."SDL2-ttf"; + "SFML" = dontDistribute super."SFML"; + "SFML-control" = dontDistribute super."SFML-control"; + "SFont" = dontDistribute super."SFont"; + "SG" = dontDistribute super."SG"; + "SGdemo" = dontDistribute super."SGdemo"; + "SHA2" = dontDistribute super."SHA2"; + "SMTPClient" = dontDistribute super."SMTPClient"; + "SNet" = dontDistribute super."SNet"; + "SQLDeps" = dontDistribute super."SQLDeps"; + "STL" = dontDistribute super."STL"; + "SVG2Q" = dontDistribute super."SVG2Q"; + "SVGPath" = dontDistribute super."SVGPath"; + "SWMMoutGetMB" = dontDistribute super."SWMMoutGetMB"; + "SableCC2Hs" = dontDistribute super."SableCC2Hs"; + "Safe" = dontDistribute super."Safe"; + "Salsa" = dontDistribute super."Salsa"; + "Saturnin" = dontDistribute super."Saturnin"; + "SciFlow" = dontDistribute super."SciFlow"; + "ScratchFs" = dontDistribute super."ScratchFs"; + "Scurry" = dontDistribute super."Scurry"; + "SegmentTree" = dontDistribute super."SegmentTree"; + "Semantique" = dontDistribute super."Semantique"; + "Semigroup" = dontDistribute super."Semigroup"; + "SeqAlign" = dontDistribute super."SeqAlign"; + "SessionLogger" = dontDistribute super."SessionLogger"; + "ShellCheck" = dontDistribute super."ShellCheck"; + "Shellac" = dontDistribute super."Shellac"; + "Shellac-compatline" = dontDistribute super."Shellac-compatline"; + "Shellac-editline" = dontDistribute super."Shellac-editline"; + "Shellac-haskeline" = dontDistribute super."Shellac-haskeline"; + "Shellac-readline" = dontDistribute super."Shellac-readline"; + "ShowF" = dontDistribute super."ShowF"; + "Shrub" = dontDistribute super."Shrub"; + "Shu-thing" = dontDistribute super."Shu-thing"; + "SimpleAES" = dontDistribute super."SimpleAES"; + "SimpleEA" = dontDistribute super."SimpleEA"; + "SimpleGL" = dontDistribute super."SimpleGL"; + "SimpleH" = dontDistribute super."SimpleH"; + "SimpleLog" = dontDistribute super."SimpleLog"; + "SizeCompare" = dontDistribute super."SizeCompare"; + "Slides" = dontDistribute super."Slides"; + "Smooth" = dontDistribute super."Smooth"; + "SmtLib" = dontDistribute super."SmtLib"; + "Snusmumrik" = dontDistribute super."Snusmumrik"; + "SoOSiM" = dontDistribute super."SoOSiM"; + "SoccerFun" = dontDistribute super."SoccerFun"; + "SoccerFunGL" = dontDistribute super."SoccerFunGL"; + "Sonnex" = dontDistribute super."Sonnex"; + "SourceGraph" = dontDistribute super."SourceGraph"; + "Southpaw" = dontDistribute super."Southpaw"; + "SpaceInvaders" = dontDistribute super."SpaceInvaders"; + "SpacePrivateers" = dontDistribute super."SpacePrivateers"; + "SpinCounter" = dontDistribute super."SpinCounter"; + "Spock" = doDistribute super."Spock_0_8_1_0"; + "Spock-auth" = dontDistribute super."Spock-auth"; + "Spock-digestive" = doDistribute super."Spock-digestive_0_1_0_1"; + "SpreadsheetML" = dontDistribute super."SpreadsheetML"; + "Sprig" = dontDistribute super."Sprig"; + "Stasis" = dontDistribute super."Stasis"; + "StateVar-transformer" = dontDistribute super."StateVar-transformer"; + "StatisticalMethods" = dontDistribute super."StatisticalMethods"; + "Stomp" = dontDistribute super."Stomp"; + "Strafunski-ATermLib" = dontDistribute super."Strafunski-ATermLib"; + "Strafunski-Sdf2Haskell" = dontDistribute super."Strafunski-Sdf2Haskell"; + "Strafunski-StrategyLib" = dontDistribute super."Strafunski-StrategyLib"; + "StrappedTemplates" = dontDistribute super."StrappedTemplates"; + "StrategyLib" = dontDistribute super."StrategyLib"; + "StrictBench" = dontDistribute super."StrictBench"; + "SuffixStructures" = dontDistribute super."SuffixStructures"; + "SybWidget" = dontDistribute super."SybWidget"; + "SyntaxMacros" = dontDistribute super."SyntaxMacros"; + "Sysmon" = dontDistribute super."Sysmon"; + "TBC" = dontDistribute super."TBC"; + "TBit" = dontDistribute super."TBit"; + "THEff" = dontDistribute super."THEff"; + "TTTAS" = dontDistribute super."TTTAS"; + "TV" = dontDistribute super."TV"; + "TYB" = dontDistribute super."TYB"; + "TableAlgebra" = dontDistribute super."TableAlgebra"; + "Tables" = dontDistribute super."Tables"; + "Tablify" = dontDistribute super."Tablify"; + "Tainted" = dontDistribute super."Tainted"; + "Takusen" = dontDistribute super."Takusen"; + "Tape" = dontDistribute super."Tape"; + "Taxonomy" = dontDistribute super."Taxonomy"; + "TaxonomyTools" = dontDistribute super."TaxonomyTools"; + "TeaHS" = dontDistribute super."TeaHS"; + "Tensor" = dontDistribute super."Tensor"; + "TernaryTrees" = dontDistribute super."TernaryTrees"; + "TestExplode" = dontDistribute super."TestExplode"; + "Theora" = dontDistribute super."Theora"; + "Thingie" = dontDistribute super."Thingie"; + "ThreadObjects" = dontDistribute super."ThreadObjects"; + "Thrift" = dontDistribute super."Thrift"; + "Tic-Tac-Toe" = dontDistribute super."Tic-Tac-Toe"; + "TicTacToe" = dontDistribute super."TicTacToe"; + "TigerHash" = dontDistribute super."TigerHash"; + "TimePiece" = dontDistribute super."TimePiece"; + "TinyLaunchbury" = dontDistribute super."TinyLaunchbury"; + "TinyURL" = dontDistribute super."TinyURL"; + "Titim" = dontDistribute super."Titim"; + "Top" = dontDistribute super."Top"; + "Tournament" = dontDistribute super."Tournament"; + "TraceUtils" = dontDistribute super."TraceUtils"; + "TransformersStepByStep" = dontDistribute super."TransformersStepByStep"; + "Transhare" = dontDistribute super."Transhare"; + "TreeCounter" = dontDistribute super."TreeCounter"; + "TreeStructures" = dontDistribute super."TreeStructures"; + "TreeT" = dontDistribute super."TreeT"; + "Treiber" = dontDistribute super."Treiber"; + "TrendGraph" = dontDistribute super."TrendGraph"; + "TrieMap" = dontDistribute super."TrieMap"; + "Twofish" = dontDistribute super."Twofish"; + "TypeClass" = dontDistribute super."TypeClass"; + "TypeCompose" = dontDistribute super."TypeCompose"; + "TypeIlluminator" = dontDistribute super."TypeIlluminator"; + "TypeNat" = dontDistribute super."TypeNat"; + "TypingTester" = dontDistribute super."TypingTester"; + "UISF" = dontDistribute super."UISF"; + "UMM" = dontDistribute super."UMM"; + "URLT" = dontDistribute super."URLT"; + "URLb" = dontDistribute super."URLb"; + "UTFTConverter" = dontDistribute super."UTFTConverter"; + "Unique" = dontDistribute super."Unique"; + "Unixutils-shadow" = dontDistribute super."Unixutils-shadow"; + "Updater" = dontDistribute super."Updater"; + "UrlDisp" = dontDistribute super."UrlDisp"; + "Useful" = dontDistribute super."Useful"; + "UtilityTM" = dontDistribute super."UtilityTM"; + "VKHS" = dontDistribute super."VKHS"; + "Validation" = dontDistribute super."Validation"; + "Vec" = dontDistribute super."Vec"; + "Vec-Boolean" = dontDistribute super."Vec-Boolean"; + "Vec-OpenGLRaw" = dontDistribute super."Vec-OpenGLRaw"; + "Vec-Transform" = dontDistribute super."Vec-Transform"; + "VecN" = dontDistribute super."VecN"; + "ViennaRNA-bindings" = dontDistribute super."ViennaRNA-bindings"; + "ViennaRNAParser" = dontDistribute super."ViennaRNAParser"; + "WAVE" = dontDistribute super."WAVE"; + "WL500gPControl" = dontDistribute super."WL500gPControl"; + "WL500gPLib" = dontDistribute super."WL500gPLib"; + "WMSigner" = dontDistribute super."WMSigner"; + "WURFL" = dontDistribute super."WURFL"; + "WXDiffCtrl" = dontDistribute super."WXDiffCtrl"; + "WashNGo" = dontDistribute super."WashNGo"; + "WaveFront" = dontDistribute super."WaveFront"; + "Weather" = dontDistribute super."Weather"; + "WebBits" = dontDistribute super."WebBits"; + "WebBits-Html" = dontDistribute super."WebBits-Html"; + "WebBits-multiplate" = dontDistribute super."WebBits-multiplate"; + "WebCont" = dontDistribute super."WebCont"; + "WeberLogic" = dontDistribute super."WeberLogic"; + "Webrexp" = dontDistribute super."Webrexp"; + "Wheb" = dontDistribute super."Wheb"; + "WikimediaParser" = dontDistribute super."WikimediaParser"; + "Win32-dhcp-server" = dontDistribute super."Win32-dhcp-server"; + "Win32-errors" = dontDistribute super."Win32-errors"; + "Win32-extras" = dontDistribute super."Win32-extras"; + "Win32-junction-point" = dontDistribute super."Win32-junction-point"; + "Win32-security" = dontDistribute super."Win32-security"; + "Win32-services" = dontDistribute super."Win32-services"; + "Win32-services-wrapper" = dontDistribute super."Win32-services-wrapper"; + "Wired" = dontDistribute super."Wired"; + "WordNet" = dontDistribute super."WordNet"; + "WordNet-ghc74" = dontDistribute super."WordNet-ghc74"; + "Wordlint" = dontDistribute super."Wordlint"; + "WxGeneric" = dontDistribute super."WxGeneric"; + "X11-extras" = dontDistribute super."X11-extras"; + "X11-rm" = dontDistribute super."X11-rm"; + "X11-xdamage" = dontDistribute super."X11-xdamage"; + "X11-xfixes" = dontDistribute super."X11-xfixes"; + "X11-xft" = dontDistribute super."X11-xft"; + "X11-xshape" = dontDistribute super."X11-xshape"; + "XAttr" = dontDistribute super."XAttr"; + "XInput" = dontDistribute super."XInput"; + "XMMS" = dontDistribute super."XMMS"; + "XMPP" = dontDistribute super."XMPP"; + "XSaiga" = dontDistribute super."XSaiga"; + "Xauth" = dontDistribute super."Xauth"; + "Xec" = dontDistribute super."Xec"; + "XmlHtmlWriter" = dontDistribute super."XmlHtmlWriter"; + "Xorshift128Plus" = dontDistribute super."Xorshift128Plus"; + "YACPong" = dontDistribute super."YACPong"; + "YFrob" = dontDistribute super."YFrob"; + "Yablog" = dontDistribute super."Yablog"; + "YamlReference" = dontDistribute super."YamlReference"; + "Yampa-core" = dontDistribute super."Yampa-core"; + "Yocto" = dontDistribute super."Yocto"; + "Yogurt" = dontDistribute super."Yogurt"; + "Yogurt-Standalone" = dontDistribute super."Yogurt-Standalone"; + "ZEBEDDE" = dontDistribute super."ZEBEDDE"; + "ZFS" = dontDistribute super."ZFS"; + "ZMachine" = dontDistribute super."ZMachine"; + "ZipFold" = dontDistribute super."ZipFold"; + "ZipperAG" = dontDistribute super."ZipperAG"; + "Zora" = dontDistribute super."Zora"; + "Zwaluw" = dontDistribute super."Zwaluw"; + "a50" = dontDistribute super."a50"; + "abacate" = dontDistribute super."abacate"; + "abc-puzzle" = dontDistribute super."abc-puzzle"; + "abcBridge" = dontDistribute super."abcBridge"; + "abcnotation" = dontDistribute super."abcnotation"; + "abeson" = dontDistribute super."abeson"; + "abstract-deque-tests" = dontDistribute super."abstract-deque-tests"; + "abstract-par-accelerate" = dontDistribute super."abstract-par-accelerate"; + "abt" = dontDistribute super."abt"; + "ac-machine" = dontDistribute super."ac-machine"; + "ac-machine-conduit" = dontDistribute super."ac-machine-conduit"; + "accelerate-arithmetic" = dontDistribute super."accelerate-arithmetic"; + "accelerate-cublas" = dontDistribute super."accelerate-cublas"; + "accelerate-cuda" = dontDistribute super."accelerate-cuda"; + "accelerate-cufft" = dontDistribute super."accelerate-cufft"; + "accelerate-examples" = dontDistribute super."accelerate-examples"; + "accelerate-fft" = dontDistribute super."accelerate-fft"; + "accelerate-fftw" = dontDistribute super."accelerate-fftw"; + "accelerate-fourier" = dontDistribute super."accelerate-fourier"; + "accelerate-fourier-benchmark" = dontDistribute super."accelerate-fourier-benchmark"; + "accelerate-io" = dontDistribute super."accelerate-io"; + "accelerate-random" = dontDistribute super."accelerate-random"; + "accelerate-utility" = dontDistribute super."accelerate-utility"; + "accentuateus" = dontDistribute super."accentuateus"; + "access-time" = dontDistribute super."access-time"; + "acid-state" = doDistribute super."acid-state_0_12_4"; + "acid-state-dist" = dontDistribute super."acid-state-dist"; + "acid-state-tls" = dontDistribute super."acid-state-tls"; + "acl2" = dontDistribute super."acl2"; + "acme-all-monad" = dontDistribute super."acme-all-monad"; + "acme-box" = dontDistribute super."acme-box"; + "acme-cadre" = dontDistribute super."acme-cadre"; + "acme-cofunctor" = dontDistribute super."acme-cofunctor"; + "acme-colosson" = dontDistribute super."acme-colosson"; + "acme-comonad" = dontDistribute super."acme-comonad"; + "acme-cutegirl" = dontDistribute super."acme-cutegirl"; + "acme-dont" = dontDistribute super."acme-dont"; + "acme-flipping-tables" = dontDistribute super."acme-flipping-tables"; + "acme-grawlix" = dontDistribute super."acme-grawlix"; + "acme-hq9plus" = dontDistribute super."acme-hq9plus"; + "acme-http" = dontDistribute super."acme-http"; + "acme-inator" = dontDistribute super."acme-inator"; + "acme-io" = dontDistribute super."acme-io"; + "acme-lolcat" = dontDistribute super."acme-lolcat"; + "acme-lookofdisapproval" = dontDistribute super."acme-lookofdisapproval"; + "acme-memorandom" = dontDistribute super."acme-memorandom"; + "acme-microwave" = dontDistribute super."acme-microwave"; + "acme-miscorder" = dontDistribute super."acme-miscorder"; + "acme-missiles" = dontDistribute super."acme-missiles"; + "acme-now" = dontDistribute super."acme-now"; + "acme-numbersystem" = dontDistribute super."acme-numbersystem"; + "acme-omitted" = dontDistribute super."acme-omitted"; + "acme-one" = dontDistribute super."acme-one"; + "acme-operators" = dontDistribute super."acme-operators"; + "acme-php" = dontDistribute super."acme-php"; + "acme-pointful-numbers" = dontDistribute super."acme-pointful-numbers"; + "acme-realworld" = dontDistribute super."acme-realworld"; + "acme-safe" = dontDistribute super."acme-safe"; + "acme-schoenfinkel" = dontDistribute super."acme-schoenfinkel"; + "acme-strfry" = dontDistribute super."acme-strfry"; + "acme-stringly-typed" = dontDistribute super."acme-stringly-typed"; + "acme-strtok" = dontDistribute super."acme-strtok"; + "acme-timemachine" = dontDistribute super."acme-timemachine"; + "acme-year" = dontDistribute super."acme-year"; + "acme-zero" = dontDistribute super."acme-zero"; + "activehs" = dontDistribute super."activehs"; + "activehs-base" = dontDistribute super."activehs-base"; + "activitystreams-aeson" = dontDistribute super."activitystreams-aeson"; + "actor" = dontDistribute super."actor"; + "adaptive-containers" = dontDistribute super."adaptive-containers"; + "adaptive-tuple" = dontDistribute super."adaptive-tuple"; + "adb" = dontDistribute super."adb"; + "adblock2privoxy" = dontDistribute super."adblock2privoxy"; + "addLicenseInfo" = dontDistribute super."addLicenseInfo"; + "adhoc-network" = dontDistribute super."adhoc-network"; + "adict" = dontDistribute super."adict"; + "adobe-swatch-exchange" = dontDistribute super."adobe-swatch-exchange"; + "adp-multi" = dontDistribute super."adp-multi"; + "adp-multi-monadiccp" = dontDistribute super."adp-multi-monadiccp"; + "aeson" = doDistribute super."aeson_0_8_0_2"; + "aeson-applicative" = dontDistribute super."aeson-applicative"; + "aeson-bson" = dontDistribute super."aeson-bson"; + "aeson-casing" = dontDistribute super."aeson-casing"; + "aeson-diff" = dontDistribute super."aeson-diff"; + "aeson-filthy" = dontDistribute super."aeson-filthy"; + "aeson-lens" = dontDistribute super."aeson-lens"; + "aeson-native" = dontDistribute super."aeson-native"; + "aeson-schema" = doDistribute super."aeson-schema_0_3_0_7"; + "aeson-serialize" = dontDistribute super."aeson-serialize"; + "aeson-smart" = dontDistribute super."aeson-smart"; + "aeson-streams" = dontDistribute super."aeson-streams"; + "aeson-t" = dontDistribute super."aeson-t"; + "aeson-toolkit" = dontDistribute super."aeson-toolkit"; + "aeson-value-parser" = dontDistribute super."aeson-value-parser"; + "aeson-yak" = dontDistribute super."aeson-yak"; + "affine-invariant-ensemble-mcmc" = dontDistribute super."affine-invariant-ensemble-mcmc"; + "afis" = dontDistribute super."afis"; + "afv" = dontDistribute super."afv"; + "agda-server" = dontDistribute super."agda-server"; + "agda-snippets" = dontDistribute super."agda-snippets"; + "agum" = dontDistribute super."agum"; + "aig" = dontDistribute super."aig"; + "air" = dontDistribute super."air"; + "air-extra" = dontDistribute super."air-extra"; + "air-spec" = dontDistribute super."air-spec"; + "air-th" = dontDistribute super."air-th"; + "airbrake" = dontDistribute super."airbrake"; + "airship" = dontDistribute super."airship"; + "aivika" = dontDistribute super."aivika"; + "aivika-experiment" = dontDistribute super."aivika-experiment"; + "aivika-experiment-cairo" = dontDistribute super."aivika-experiment-cairo"; + "aivika-experiment-chart" = dontDistribute super."aivika-experiment-chart"; + "aivika-experiment-diagrams" = dontDistribute super."aivika-experiment-diagrams"; + "aivika-transformers" = dontDistribute super."aivika-transformers"; + "ajhc" = dontDistribute super."ajhc"; + "al" = dontDistribute super."al"; + "alea" = dontDistribute super."alea"; + "alex-meta" = dontDistribute super."alex-meta"; + "alfred" = dontDistribute super."alfred"; + "algebra" = dontDistribute super."algebra"; + "algebra-dag" = dontDistribute super."algebra-dag"; + "algebra-sql" = dontDistribute super."algebra-sql"; + "algebraic" = dontDistribute super."algebraic"; + "algebraic-classes" = dontDistribute super."algebraic-classes"; + "align" = dontDistribute super."align"; + "align-text" = dontDistribute super."align-text"; + "aligned-foreignptr" = dontDistribute super."aligned-foreignptr"; + "allocated-processor" = dontDistribute super."allocated-processor"; + "alloy" = dontDistribute super."alloy"; + "alloy-proxy-fd" = dontDistribute super."alloy-proxy-fd"; + "almost-fix" = dontDistribute super."almost-fix"; + "alms" = dontDistribute super."alms"; + "alpha" = dontDistribute super."alpha"; + "alpino-tools" = dontDistribute super."alpino-tools"; + "alsa" = dontDistribute super."alsa"; + "alsa-core" = dontDistribute super."alsa-core"; + "alsa-gui" = dontDistribute super."alsa-gui"; + "alsa-midi" = dontDistribute super."alsa-midi"; + "alsa-mixer" = dontDistribute super."alsa-mixer"; + "alsa-pcm" = dontDistribute super."alsa-pcm"; + "alsa-pcm-tests" = dontDistribute super."alsa-pcm-tests"; + "alsa-seq" = dontDistribute super."alsa-seq"; + "alsa-seq-tests" = dontDistribute super."alsa-seq-tests"; + "altcomposition" = dontDistribute super."altcomposition"; + "alternative-io" = dontDistribute super."alternative-io"; + "altfloat" = dontDistribute super."altfloat"; + "alure" = dontDistribute super."alure"; + "amazon-emailer" = dontDistribute super."amazon-emailer"; + "amazon-emailer-client-snap" = dontDistribute super."amazon-emailer-client-snap"; + "amazon-products" = dontDistribute super."amazon-products"; + "amazonka" = doDistribute super."amazonka_0_3_6"; + "amazonka-apigateway" = dontDistribute super."amazonka-apigateway"; + "amazonka-autoscaling" = doDistribute super."amazonka-autoscaling_0_3_6"; + "amazonka-cloudformation" = doDistribute super."amazonka-cloudformation_0_3_6"; + "amazonka-cloudfront" = doDistribute super."amazonka-cloudfront_0_3_6"; + "amazonka-cloudhsm" = doDistribute super."amazonka-cloudhsm_0_3_6"; + "amazonka-cloudsearch" = doDistribute super."amazonka-cloudsearch_0_3_6"; + "amazonka-cloudsearch-domains" = doDistribute super."amazonka-cloudsearch-domains_0_3_6"; + "amazonka-cloudtrail" = doDistribute super."amazonka-cloudtrail_0_3_6"; + "amazonka-cloudwatch" = doDistribute super."amazonka-cloudwatch_0_3_6"; + "amazonka-cloudwatch-logs" = doDistribute super."amazonka-cloudwatch-logs_0_3_6"; + "amazonka-codecommit" = dontDistribute super."amazonka-codecommit"; + "amazonka-codedeploy" = doDistribute super."amazonka-codedeploy_0_3_6"; + "amazonka-codepipeline" = dontDistribute super."amazonka-codepipeline"; + "amazonka-cognito-identity" = doDistribute super."amazonka-cognito-identity_0_3_6"; + "amazonka-cognito-sync" = doDistribute super."amazonka-cognito-sync_0_3_6"; + "amazonka-config" = doDistribute super."amazonka-config_0_3_6"; + "amazonka-core" = doDistribute super."amazonka-core_0_3_6"; + "amazonka-datapipeline" = doDistribute super."amazonka-datapipeline_0_3_6"; + "amazonka-devicefarm" = dontDistribute super."amazonka-devicefarm"; + "amazonka-directconnect" = doDistribute super."amazonka-directconnect_0_3_6"; + "amazonka-ds" = dontDistribute super."amazonka-ds"; + "amazonka-dynamodb" = doDistribute super."amazonka-dynamodb_0_3_6"; + "amazonka-dynamodb-streams" = dontDistribute super."amazonka-dynamodb-streams"; + "amazonka-ec2" = doDistribute super."amazonka-ec2_0_3_6_1"; + "amazonka-ecs" = doDistribute super."amazonka-ecs_0_3_6"; + "amazonka-efs" = dontDistribute super."amazonka-efs"; + "amazonka-elasticache" = doDistribute super."amazonka-elasticache_0_3_6"; + "amazonka-elasticbeanstalk" = doDistribute super."amazonka-elasticbeanstalk_0_3_6"; + "amazonka-elasticsearch" = dontDistribute super."amazonka-elasticsearch"; + "amazonka-elastictranscoder" = doDistribute super."amazonka-elastictranscoder_0_3_6"; + "amazonka-elb" = doDistribute super."amazonka-elb_0_3_6"; + "amazonka-emr" = doDistribute super."amazonka-emr_0_3_6"; + "amazonka-glacier" = doDistribute super."amazonka-glacier_0_3_6"; + "amazonka-iam" = doDistribute super."amazonka-iam_0_3_6"; + "amazonka-importexport" = doDistribute super."amazonka-importexport_0_3_6"; + "amazonka-inspector" = dontDistribute super."amazonka-inspector"; + "amazonka-iot" = dontDistribute super."amazonka-iot"; + "amazonka-iot-dataplane" = dontDistribute super."amazonka-iot-dataplane"; + "amazonka-kinesis" = doDistribute super."amazonka-kinesis_0_3_6"; + "amazonka-kinesis-firehose" = dontDistribute super."amazonka-kinesis-firehose"; + "amazonka-kms" = doDistribute super."amazonka-kms_0_3_6"; + "amazonka-lambda" = doDistribute super."amazonka-lambda_0_3_6"; + "amazonka-marketplace-analytics" = dontDistribute super."amazonka-marketplace-analytics"; + "amazonka-ml" = doDistribute super."amazonka-ml_0_3_6"; + "amazonka-opsworks" = doDistribute super."amazonka-opsworks_0_3_6"; + "amazonka-rds" = doDistribute super."amazonka-rds_0_3_6"; + "amazonka-redshift" = doDistribute super."amazonka-redshift_0_3_6"; + "amazonka-route53" = doDistribute super."amazonka-route53_0_3_6_1"; + "amazonka-route53-domains" = doDistribute super."amazonka-route53-domains_0_3_6"; + "amazonka-s3" = doDistribute super."amazonka-s3_0_3_6"; + "amazonka-sdb" = doDistribute super."amazonka-sdb_0_3_6"; + "amazonka-ses" = doDistribute super."amazonka-ses_0_3_6"; + "amazonka-sns" = doDistribute super."amazonka-sns_0_3_6"; + "amazonka-sqs" = doDistribute super."amazonka-sqs_0_3_6"; + "amazonka-ssm" = doDistribute super."amazonka-ssm_0_3_6"; + "amazonka-storagegateway" = doDistribute super."amazonka-storagegateway_0_3_6"; + "amazonka-sts" = doDistribute super."amazonka-sts_0_3_6"; + "amazonka-support" = doDistribute super."amazonka-support_0_3_6"; + "amazonka-swf" = doDistribute super."amazonka-swf_0_3_6"; + "amazonka-test" = dontDistribute super."amazonka-test"; + "amazonka-waf" = dontDistribute super."amazonka-waf"; + "amazonka-workspaces" = doDistribute super."amazonka-workspaces_0_3_6"; + "ampersand" = dontDistribute super."ampersand"; + "amqp-conduit" = dontDistribute super."amqp-conduit"; + "amrun" = dontDistribute super."amrun"; + "analyze-client" = dontDistribute super."analyze-client"; + "anansi" = dontDistribute super."anansi"; + "anansi-hscolour" = dontDistribute super."anansi-hscolour"; + "anansi-pandoc" = dontDistribute super."anansi-pandoc"; + "anatomy" = dontDistribute super."anatomy"; + "android" = dontDistribute super."android"; + "android-lint-summary" = dontDistribute super."android-lint-summary"; + "animalcase" = dontDistribute super."animalcase"; + "annotated-wl-pprint" = doDistribute super."annotated-wl-pprint_0_6_0"; + "anonymous-sums-tests" = dontDistribute super."anonymous-sums-tests"; + "ansi-pretty" = dontDistribute super."ansi-pretty"; + "ansigraph" = dontDistribute super."ansigraph"; + "antagonist" = dontDistribute super."antagonist"; + "antfarm" = dontDistribute super."antfarm"; + "anticiv" = dontDistribute super."anticiv"; + "antigate" = dontDistribute super."antigate"; + "antimirov" = dontDistribute super."antimirov"; + "antiquoter" = dontDistribute super."antiquoter"; + "antisplice" = dontDistribute super."antisplice"; + "antlrc" = dontDistribute super."antlrc"; + "anydbm" = dontDistribute super."anydbm"; + "aosd" = dontDistribute super."aosd"; + "ap-reflect" = dontDistribute super."ap-reflect"; + "apache-md5" = dontDistribute super."apache-md5"; + "apelsin" = dontDistribute super."apelsin"; + "api-builder" = dontDistribute super."api-builder"; + "api-opentheory-unicode" = dontDistribute super."api-opentheory-unicode"; + "api-tools" = dontDistribute super."api-tools"; + "apiary-helics" = dontDistribute super."apiary-helics"; + "apiary-purescript" = dontDistribute super."apiary-purescript"; + "apis" = dontDistribute super."apis"; + "apotiki" = dontDistribute super."apotiki"; + "app-lens" = dontDistribute super."app-lens"; + "app-settings" = dontDistribute super."app-settings"; + "appc" = dontDistribute super."appc"; + "applicative-extras" = dontDistribute super."applicative-extras"; + "applicative-fail" = dontDistribute super."applicative-fail"; + "applicative-numbers" = dontDistribute super."applicative-numbers"; + "applicative-parsec" = dontDistribute super."applicative-parsec"; + "apportionment" = dontDistribute super."apportionment"; + "approx-rand-test" = dontDistribute super."approx-rand-test"; + "approximate-equality" = dontDistribute super."approximate-equality"; + "ar-timestamp-wiper" = dontDistribute super."ar-timestamp-wiper"; + "arb-fft" = dontDistribute super."arb-fft"; + "arbb-vm" = dontDistribute super."arbb-vm"; + "archive" = dontDistribute super."archive"; + "archiver" = dontDistribute super."archiver"; + "archlinux" = dontDistribute super."archlinux"; + "archlinux-web" = dontDistribute super."archlinux-web"; + "archnews" = dontDistribute super."archnews"; + "arff" = dontDistribute super."arff"; + "argon" = dontDistribute super."argon"; + "argparser" = dontDistribute super."argparser"; + "arguedit" = dontDistribute super."arguedit"; + "ariadne" = dontDistribute super."ariadne"; + "arion" = dontDistribute super."arion"; + "arith-encode" = dontDistribute super."arith-encode"; + "arithmatic" = dontDistribute super."arithmatic"; + "arithmetic" = dontDistribute super."arithmetic"; + "arithmoi" = dontDistribute super."arithmoi"; + "armada" = dontDistribute super."armada"; + "arpa" = dontDistribute super."arpa"; + "array-forth" = dontDistribute super."array-forth"; + "array-memoize" = dontDistribute super."array-memoize"; + "array-primops" = dontDistribute super."array-primops"; + "array-utils" = dontDistribute super."array-utils"; + "arrow-improve" = dontDistribute super."arrow-improve"; + "arrowapply-utils" = dontDistribute super."arrowapply-utils"; + "arrowp" = dontDistribute super."arrowp"; + "artery" = dontDistribute super."artery"; + "arx" = dontDistribute super."arx"; + "arxiv" = dontDistribute super."arxiv"; + "ascetic" = dontDistribute super."ascetic"; + "ascii" = dontDistribute super."ascii"; + "ascii-progress" = dontDistribute super."ascii-progress"; + "ascii-vector-avc" = dontDistribute super."ascii-vector-avc"; + "ascii85-conduit" = dontDistribute super."ascii85-conduit"; + "asic" = dontDistribute super."asic"; + "asil" = dontDistribute super."asil"; + "asn1-data" = dontDistribute super."asn1-data"; + "asn1dump" = dontDistribute super."asn1dump"; + "assembler" = dontDistribute super."assembler"; + "assert" = dontDistribute super."assert"; + "assert-failure" = dontDistribute super."assert-failure"; + "assertions" = dontDistribute super."assertions"; + "assimp" = dontDistribute super."assimp"; + "astar" = dontDistribute super."astar"; + "astrds" = dontDistribute super."astrds"; + "astview" = dontDistribute super."astview"; + "astview-utils" = dontDistribute super."astview-utils"; + "async-extras" = dontDistribute super."async-extras"; + "async-manager" = dontDistribute super."async-manager"; + "async-pool" = dontDistribute super."async-pool"; + "asynchronous-exceptions" = dontDistribute super."asynchronous-exceptions"; + "aterm" = dontDistribute super."aterm"; + "aterm-utils" = dontDistribute super."aterm-utils"; + "atl" = dontDistribute super."atl"; + "atlassian-connect-core" = dontDistribute super."atlassian-connect-core"; + "atlassian-connect-descriptor" = dontDistribute super."atlassian-connect-descriptor"; + "atmos" = dontDistribute super."atmos"; + "atmos-dimensional" = dontDistribute super."atmos-dimensional"; + "atmos-dimensional-tf" = dontDistribute super."atmos-dimensional-tf"; + "atom" = dontDistribute super."atom"; + "atom-basic" = dontDistribute super."atom-basic"; + "atom-conduit" = dontDistribute super."atom-conduit"; + "atom-msp430" = dontDistribute super."atom-msp430"; + "atomic-primops-foreign" = dontDistribute super."atomic-primops-foreign"; + "atomic-primops-vector" = dontDistribute super."atomic-primops-vector"; + "atomic-write" = dontDistribute super."atomic-write"; + "atomo" = dontDistribute super."atomo"; + "attempt" = dontDistribute super."attempt"; + "atto-lisp" = dontDistribute super."atto-lisp"; + "attoparsec" = doDistribute super."attoparsec_0_12_1_6"; + "attoparsec-arff" = dontDistribute super."attoparsec-arff"; + "attoparsec-binary" = dontDistribute super."attoparsec-binary"; + "attoparsec-conduit" = dontDistribute super."attoparsec-conduit"; + "attoparsec-csv" = dontDistribute super."attoparsec-csv"; + "attoparsec-iteratee" = dontDistribute super."attoparsec-iteratee"; + "attoparsec-parsec" = dontDistribute super."attoparsec-parsec"; + "attoparsec-text" = dontDistribute super."attoparsec-text"; + "attoparsec-text-enumerator" = dontDistribute super."attoparsec-text-enumerator"; + "attosplit" = dontDistribute super."attosplit"; + "atuin" = dontDistribute super."atuin"; + "audacity" = dontDistribute super."audacity"; + "audiovisual" = dontDistribute super."audiovisual"; + "augeas" = dontDistribute super."augeas"; + "augur" = dontDistribute super."augur"; + "aur" = dontDistribute super."aur"; + "authenticate-kerberos" = dontDistribute super."authenticate-kerberos"; + "authenticate-ldap" = dontDistribute super."authenticate-ldap"; + "authinfo-hs" = dontDistribute super."authinfo-hs"; + "authoring" = dontDistribute super."authoring"; + "autonix-deps" = dontDistribute super."autonix-deps"; + "autonix-deps-kf5" = dontDistribute super."autonix-deps-kf5"; + "autoproc" = dontDistribute super."autoproc"; + "avahi" = dontDistribute super."avahi"; + "avatar-generator" = dontDistribute super."avatar-generator"; + "average" = dontDistribute super."average"; + "avers" = dontDistribute super."avers"; + "avl-static" = dontDistribute super."avl-static"; + "avr-shake" = dontDistribute super."avr-shake"; + "awesomium" = dontDistribute super."awesomium"; + "awesomium-glut" = dontDistribute super."awesomium-glut"; + "awesomium-raw" = dontDistribute super."awesomium-raw"; + "aws" = doDistribute super."aws_0_12_1"; + "aws-cloudfront-signer" = dontDistribute super."aws-cloudfront-signer"; + "aws-configuration-tools" = dontDistribute super."aws-configuration-tools"; + "aws-dynamodb-conduit" = dontDistribute super."aws-dynamodb-conduit"; + "aws-dynamodb-streams" = dontDistribute super."aws-dynamodb-streams"; + "aws-ec2" = dontDistribute super."aws-ec2"; + "aws-elastic-transcoder" = dontDistribute super."aws-elastic-transcoder"; + "aws-general" = dontDistribute super."aws-general"; + "aws-kinesis" = dontDistribute super."aws-kinesis"; + "aws-kinesis-client" = dontDistribute super."aws-kinesis-client"; + "aws-kinesis-reshard" = dontDistribute super."aws-kinesis-reshard"; + "aws-lambda" = dontDistribute super."aws-lambda"; + "aws-performance-tests" = dontDistribute super."aws-performance-tests"; + "aws-route53" = dontDistribute super."aws-route53"; + "aws-sdk" = dontDistribute super."aws-sdk"; + "aws-sdk-text-converter" = dontDistribute super."aws-sdk-text-converter"; + "aws-sdk-xml-unordered" = dontDistribute super."aws-sdk-xml-unordered"; + "aws-sign4" = dontDistribute super."aws-sign4"; + "aws-sns" = dontDistribute super."aws-sns"; + "azure-acs" = dontDistribute super."azure-acs"; + "azure-service-api" = dontDistribute super."azure-service-api"; + "azure-servicebus" = dontDistribute super."azure-servicebus"; + "azurify" = dontDistribute super."azurify"; + "b-tree" = dontDistribute super."b-tree"; + "babylon" = dontDistribute super."babylon"; + "backdropper" = dontDistribute super."backdropper"; + "backtracking-exceptions" = dontDistribute super."backtracking-exceptions"; + "backward-state" = dontDistribute super."backward-state"; + "bacteria" = dontDistribute super."bacteria"; + "bag" = dontDistribute super."bag"; + "bamboo" = dontDistribute super."bamboo"; + "bamboo-launcher" = dontDistribute super."bamboo-launcher"; + "bamboo-plugin-highlight" = dontDistribute super."bamboo-plugin-highlight"; + "bamboo-plugin-photo" = dontDistribute super."bamboo-plugin-photo"; + "bamboo-theme-blueprint" = dontDistribute super."bamboo-theme-blueprint"; + "bamboo-theme-mini-html5" = dontDistribute super."bamboo-theme-mini-html5"; + "bamse" = dontDistribute super."bamse"; + "bamstats" = dontDistribute super."bamstats"; + "banwords" = dontDistribute super."banwords"; + "barchart" = dontDistribute super."barchart"; + "barcodes-code128" = dontDistribute super."barcodes-code128"; + "barecheck" = dontDistribute super."barecheck"; + "barley" = dontDistribute super."barley"; + "barrie" = dontDistribute super."barrie"; + "barrier" = dontDistribute super."barrier"; + "barrier-monad" = dontDistribute super."barrier-monad"; + "base-generics" = dontDistribute super."base-generics"; + "base-io-access" = dontDistribute super."base-io-access"; + "base-noprelude" = dontDistribute super."base-noprelude"; + "base32-bytestring" = dontDistribute super."base32-bytestring"; + "base58-bytestring" = dontDistribute super."base58-bytestring"; + "base58address" = dontDistribute super."base58address"; + "base64-conduit" = dontDistribute super."base64-conduit"; + "base91" = dontDistribute super."base91"; + "basex-client" = dontDistribute super."basex-client"; + "bash" = dontDistribute super."bash"; + "basic-lens" = dontDistribute super."basic-lens"; + "basic-sop" = dontDistribute super."basic-sop"; + "baskell" = dontDistribute super."baskell"; + "battlenet" = dontDistribute super."battlenet"; + "battlenet-yesod" = dontDistribute super."battlenet-yesod"; + "battleships" = dontDistribute super."battleships"; + "bayes-stack" = dontDistribute super."bayes-stack"; + "bbdb" = dontDistribute super."bbdb"; + "bcrypt" = doDistribute super."bcrypt_0_0_6"; + "bdd" = dontDistribute super."bdd"; + "bdelta" = dontDistribute super."bdelta"; + "bdo" = dontDistribute super."bdo"; + "beamable" = dontDistribute super."beamable"; + "beautifHOL" = dontDistribute super."beautifHOL"; + "bed-and-breakfast" = dontDistribute super."bed-and-breakfast"; + "bein" = dontDistribute super."bein"; + "benchmark-function" = dontDistribute super."benchmark-function"; + "benchpress" = dontDistribute super."benchpress"; + "bencoding" = dontDistribute super."bencoding"; + "berkeleydb" = dontDistribute super."berkeleydb"; + "berp" = dontDistribute super."berp"; + "bert" = dontDistribute super."bert"; + "besout" = dontDistribute super."besout"; + "bet" = dontDistribute super."bet"; + "betacode" = dontDistribute super."betacode"; + "between" = dontDistribute super."between"; + "bf-cata" = dontDistribute super."bf-cata"; + "bff" = dontDistribute super."bff"; + "bff-mono" = dontDistribute super."bff-mono"; + "bgmax" = dontDistribute super."bgmax"; + "bgzf" = dontDistribute super."bgzf"; + "bibtex" = dontDistribute super."bibtex"; + "bidirectionalization-combined" = dontDistribute super."bidirectionalization-combined"; + "bidispec" = dontDistribute super."bidispec"; + "bidispec-extras" = dontDistribute super."bidispec-extras"; + "billboard-parser" = dontDistribute super."billboard-parser"; + "billeksah-forms" = dontDistribute super."billeksah-forms"; + "billeksah-main" = dontDistribute super."billeksah-main"; + "billeksah-main-static" = dontDistribute super."billeksah-main-static"; + "billeksah-pane" = dontDistribute super."billeksah-pane"; + "billeksah-services" = dontDistribute super."billeksah-services"; + "bimap" = dontDistribute super."bimap"; + "bimap-server" = dontDistribute super."bimap-server"; + "bimaps" = dontDistribute super."bimaps"; + "binary-bits" = dontDistribute super."binary-bits"; + "binary-communicator" = dontDistribute super."binary-communicator"; + "binary-derive" = dontDistribute super."binary-derive"; + "binary-enum" = dontDistribute super."binary-enum"; + "binary-file" = dontDistribute super."binary-file"; + "binary-generic" = dontDistribute super."binary-generic"; + "binary-indexed-tree" = dontDistribute super."binary-indexed-tree"; + "binary-literal-qq" = dontDistribute super."binary-literal-qq"; + "binary-protocol" = dontDistribute super."binary-protocol"; + "binary-protocol-zmq" = dontDistribute super."binary-protocol-zmq"; + "binary-shared" = dontDistribute super."binary-shared"; + "binary-state" = dontDistribute super."binary-state"; + "binary-store" = dontDistribute super."binary-store"; + "binary-streams" = dontDistribute super."binary-streams"; + "binary-strict" = dontDistribute super."binary-strict"; + "binary-typed" = dontDistribute super."binary-typed"; + "binarydefer" = dontDistribute super."binarydefer"; + "bind-marshal" = dontDistribute super."bind-marshal"; + "binding-core" = dontDistribute super."binding-core"; + "binding-gtk" = dontDistribute super."binding-gtk"; + "binding-wx" = dontDistribute super."binding-wx"; + "bindings" = dontDistribute super."bindings"; + "bindings-EsounD" = dontDistribute super."bindings-EsounD"; + "bindings-GLFW" = dontDistribute super."bindings-GLFW"; + "bindings-K8055" = dontDistribute super."bindings-K8055"; + "bindings-apr" = dontDistribute super."bindings-apr"; + "bindings-apr-util" = dontDistribute super."bindings-apr-util"; + "bindings-audiofile" = dontDistribute super."bindings-audiofile"; + "bindings-bfd" = dontDistribute super."bindings-bfd"; + "bindings-cctools" = dontDistribute super."bindings-cctools"; + "bindings-codec2" = dontDistribute super."bindings-codec2"; + "bindings-common" = dontDistribute super."bindings-common"; + "bindings-dc1394" = dontDistribute super."bindings-dc1394"; + "bindings-directfb" = dontDistribute super."bindings-directfb"; + "bindings-eskit" = dontDistribute super."bindings-eskit"; + "bindings-fann" = dontDistribute super."bindings-fann"; + "bindings-fluidsynth" = dontDistribute super."bindings-fluidsynth"; + "bindings-friso" = dontDistribute super."bindings-friso"; + "bindings-glib" = dontDistribute super."bindings-glib"; + "bindings-gobject" = dontDistribute super."bindings-gobject"; + "bindings-gpgme" = dontDistribute super."bindings-gpgme"; + "bindings-gsl" = dontDistribute super."bindings-gsl"; + "bindings-gts" = dontDistribute super."bindings-gts"; + "bindings-hamlib" = dontDistribute super."bindings-hamlib"; + "bindings-hdf5" = dontDistribute super."bindings-hdf5"; + "bindings-levmar" = dontDistribute super."bindings-levmar"; + "bindings-libcddb" = dontDistribute super."bindings-libcddb"; + "bindings-libffi" = dontDistribute super."bindings-libffi"; + "bindings-libftdi" = dontDistribute super."bindings-libftdi"; + "bindings-librrd" = dontDistribute super."bindings-librrd"; + "bindings-libstemmer" = dontDistribute super."bindings-libstemmer"; + "bindings-libusb" = dontDistribute super."bindings-libusb"; + "bindings-libv4l2" = dontDistribute super."bindings-libv4l2"; + "bindings-libzip" = dontDistribute super."bindings-libzip"; + "bindings-linux-videodev2" = dontDistribute super."bindings-linux-videodev2"; + "bindings-lxc" = dontDistribute super."bindings-lxc"; + "bindings-mmap" = dontDistribute super."bindings-mmap"; + "bindings-mpdecimal" = dontDistribute super."bindings-mpdecimal"; + "bindings-nettle" = dontDistribute super."bindings-nettle"; + "bindings-parport" = dontDistribute super."bindings-parport"; + "bindings-portaudio" = dontDistribute super."bindings-portaudio"; + "bindings-posix" = dontDistribute super."bindings-posix"; + "bindings-potrace" = dontDistribute super."bindings-potrace"; + "bindings-ppdev" = dontDistribute super."bindings-ppdev"; + "bindings-saga-cmd" = dontDistribute super."bindings-saga-cmd"; + "bindings-sane" = dontDistribute super."bindings-sane"; + "bindings-sc3" = dontDistribute super."bindings-sc3"; + "bindings-sipc" = dontDistribute super."bindings-sipc"; + "bindings-sophia" = dontDistribute super."bindings-sophia"; + "bindings-sqlite3" = dontDistribute super."bindings-sqlite3"; + "bindings-svm" = dontDistribute super."bindings-svm"; + "bindings-uname" = dontDistribute super."bindings-uname"; + "bindings-yices" = dontDistribute super."bindings-yices"; + "bindynamic" = dontDistribute super."bindynamic"; + "binembed" = dontDistribute super."binembed"; + "binembed-example" = dontDistribute super."binembed-example"; + "bio" = dontDistribute super."bio"; + "biophd" = dontDistribute super."biophd"; + "biosff" = dontDistribute super."biosff"; + "biostockholm" = dontDistribute super."biostockholm"; + "bird" = dontDistribute super."bird"; + "bit-array" = dontDistribute super."bit-array"; + "bit-vector" = dontDistribute super."bit-vector"; + "bitarray" = dontDistribute super."bitarray"; + "bitcoin-rpc" = dontDistribute super."bitcoin-rpc"; + "bitly-cli" = dontDistribute super."bitly-cli"; + "bitmap" = dontDistribute super."bitmap"; + "bitmap-opengl" = dontDistribute super."bitmap-opengl"; + "bitmaps" = dontDistribute super."bitmaps"; + "bits-atomic" = dontDistribute super."bits-atomic"; + "bits-conduit" = dontDistribute super."bits-conduit"; + "bits-extras" = dontDistribute super."bits-extras"; + "bitset" = dontDistribute super."bitset"; + "bitspeak" = dontDistribute super."bitspeak"; + "bitstream" = dontDistribute super."bitstream"; + "bitstring" = dontDistribute super."bitstring"; + "bittorrent" = dontDistribute super."bittorrent"; + "bitvec" = dontDistribute super."bitvec"; + "bitx-bitcoin" = dontDistribute super."bitx-bitcoin"; + "bk-tree" = dontDistribute super."bk-tree"; + "bkr" = dontDistribute super."bkr"; + "bktrees" = dontDistribute super."bktrees"; + "bla" = dontDistribute super."bla"; + "black-jewel" = dontDistribute super."black-jewel"; + "blacktip" = dontDistribute super."blacktip"; + "blakesum" = dontDistribute super."blakesum"; + "blakesum-demo" = dontDistribute super."blakesum-demo"; + "blank-canvas" = dontDistribute super."blank-canvas"; + "blas" = dontDistribute super."blas"; + "blas-hs" = dontDistribute super."blas-hs"; + "blaze" = dontDistribute super."blaze"; + "blaze-bootstrap" = dontDistribute super."blaze-bootstrap"; + "blaze-builder-conduit" = dontDistribute super."blaze-builder-conduit"; + "blaze-from-html" = dontDistribute super."blaze-from-html"; + "blaze-html-contrib" = dontDistribute super."blaze-html-contrib"; + "blaze-html-hexpat" = dontDistribute super."blaze-html-hexpat"; + "blaze-html-truncate" = dontDistribute super."blaze-html-truncate"; + "blaze-json" = dontDistribute super."blaze-json"; + "blaze-shields" = dontDistribute super."blaze-shields"; + "blaze-textual-native" = dontDistribute super."blaze-textual-native"; + "blazeMarker" = dontDistribute super."blazeMarker"; + "blink1" = dontDistribute super."blink1"; + "blip" = dontDistribute super."blip"; + "bliplib" = dontDistribute super."bliplib"; + "blocking-transactions" = dontDistribute super."blocking-transactions"; + "blogination" = dontDistribute super."blogination"; + "bloodhound" = doDistribute super."bloodhound_0_7_0_1"; + "bloxorz" = dontDistribute super."bloxorz"; + "blubber" = dontDistribute super."blubber"; + "blubber-server" = dontDistribute super."blubber-server"; + "bluetile" = dontDistribute super."bluetile"; + "bluetileutils" = dontDistribute super."bluetileutils"; + "blunt" = dontDistribute super."blunt"; + "board-games" = dontDistribute super."board-games"; + "bogre-banana" = dontDistribute super."bogre-banana"; + "boolean-list" = dontDistribute super."boolean-list"; + "boolean-normal-forms" = dontDistribute super."boolean-normal-forms"; + "boolexpr" = dontDistribute super."boolexpr"; + "bools" = dontDistribute super."bools"; + "boolsimplifier" = dontDistribute super."boolsimplifier"; + "boomange" = dontDistribute super."boomange"; + "boomerang" = dontDistribute super."boomerang"; + "boomslang" = dontDistribute super."boomslang"; + "borel" = dontDistribute super."borel"; + "bot" = dontDistribute super."bot"; + "both" = dontDistribute super."both"; + "botpp" = dontDistribute super."botpp"; + "bound-gen" = dontDistribute super."bound-gen"; + "bounded-tchan" = dontDistribute super."bounded-tchan"; + "boundingboxes" = dontDistribute super."boundingboxes"; + "bpann" = dontDistribute super."bpann"; + "brainfuck-monad" = dontDistribute super."brainfuck-monad"; + "brainfuck-tut" = dontDistribute super."brainfuck-tut"; + "break" = dontDistribute super."break"; + "breakout" = dontDistribute super."breakout"; + "breve" = dontDistribute super."breve"; + "brians-brain" = dontDistribute super."brians-brain"; + "brick" = dontDistribute super."brick"; + "brillig" = dontDistribute super."brillig"; + "broccoli" = dontDistribute super."broccoli"; + "broker-haskell" = dontDistribute super."broker-haskell"; + "bsd-sysctl" = dontDistribute super."bsd-sysctl"; + "bson-generic" = dontDistribute super."bson-generic"; + "bson-generics" = dontDistribute super."bson-generics"; + "bson-lens" = dontDistribute super."bson-lens"; + "bson-mapping" = dontDistribute super."bson-mapping"; + "bspack" = dontDistribute super."bspack"; + "bsparse" = dontDistribute super."bsparse"; + "btree-concurrent" = dontDistribute super."btree-concurrent"; + "buffer-builder-aeson" = dontDistribute super."buffer-builder-aeson"; + "bugzilla" = dontDistribute super."bugzilla"; + "buildable" = dontDistribute super."buildable"; + "buildbox" = dontDistribute super."buildbox"; + "buildbox-tools" = dontDistribute super."buildbox-tools"; + "buildwrapper" = dontDistribute super."buildwrapper"; + "bullet" = dontDistribute super."bullet"; + "burst-detection" = dontDistribute super."burst-detection"; + "bus-pirate" = dontDistribute super."bus-pirate"; + "buster" = dontDistribute super."buster"; + "buster-gtk" = dontDistribute super."buster-gtk"; + "buster-network" = dontDistribute super."buster-network"; + "bustle" = dontDistribute super."bustle"; + "bv" = dontDistribute super."bv"; + "byline" = dontDistribute super."byline"; + "bytable" = dontDistribute super."bytable"; + "byteset" = dontDistribute super."byteset"; + "bytestring-arbitrary" = dontDistribute super."bytestring-arbitrary"; + "bytestring-class" = dontDistribute super."bytestring-class"; + "bytestring-csv" = dontDistribute super."bytestring-csv"; + "bytestring-delta" = dontDistribute super."bytestring-delta"; + "bytestring-from" = dontDistribute super."bytestring-from"; + "bytestring-nums" = dontDistribute super."bytestring-nums"; + "bytestring-plain" = dontDistribute super."bytestring-plain"; + "bytestring-rematch" = dontDistribute super."bytestring-rematch"; + "bytestring-short" = dontDistribute super."bytestring-short"; + "bytestring-show" = dontDistribute super."bytestring-show"; + "bytestringparser" = dontDistribute super."bytestringparser"; + "bytestringparser-temporary" = dontDistribute super."bytestringparser-temporary"; + "bytestringreadp" = dontDistribute super."bytestringreadp"; + "c-dsl" = dontDistribute super."c-dsl"; + "c-io" = dontDistribute super."c-io"; + "c-storable-deriving" = dontDistribute super."c-storable-deriving"; + "c0check" = dontDistribute super."c0check"; + "c0parser" = dontDistribute super."c0parser"; + "c10k" = dontDistribute super."c10k"; + "c2hs" = doDistribute super."c2hs_0_25_2"; + "c2hsc" = dontDistribute super."c2hsc"; + "cab" = dontDistribute super."cab"; + "cabal-audit" = dontDistribute super."cabal-audit"; + "cabal-bounds" = dontDistribute super."cabal-bounds"; + "cabal-cargs" = dontDistribute super."cabal-cargs"; + "cabal-constraints" = dontDistribute super."cabal-constraints"; + "cabal-db" = dontDistribute super."cabal-db"; + "cabal-debian" = doDistribute super."cabal-debian_4_30_2"; + "cabal-dependency-licenses" = dontDistribute super."cabal-dependency-licenses"; + "cabal-dev" = dontDistribute super."cabal-dev"; + "cabal-dir" = dontDistribute super."cabal-dir"; + "cabal-ghc-dynflags" = dontDistribute super."cabal-ghc-dynflags"; + "cabal-ghci" = dontDistribute super."cabal-ghci"; + "cabal-graphdeps" = dontDistribute super."cabal-graphdeps"; + "cabal-helper" = dontDistribute super."cabal-helper"; + "cabal-install-bundle" = dontDistribute super."cabal-install-bundle"; + "cabal-install-ghc72" = dontDistribute super."cabal-install-ghc72"; + "cabal-install-ghc74" = dontDistribute super."cabal-install-ghc74"; + "cabal-lenses" = dontDistribute super."cabal-lenses"; + "cabal-macosx" = dontDistribute super."cabal-macosx"; + "cabal-meta" = dontDistribute super."cabal-meta"; + "cabal-mon" = dontDistribute super."cabal-mon"; + "cabal-nirvana" = dontDistribute super."cabal-nirvana"; + "cabal-progdeps" = dontDistribute super."cabal-progdeps"; + "cabal-query" = dontDistribute super."cabal-query"; + "cabal-scripts" = dontDistribute super."cabal-scripts"; + "cabal-setup" = dontDistribute super."cabal-setup"; + "cabal-sign" = dontDistribute super."cabal-sign"; + "cabal-sort" = dontDistribute super."cabal-sort"; + "cabal-test" = dontDistribute super."cabal-test"; + "cabal-test-bin" = dontDistribute super."cabal-test-bin"; + "cabal-test-compat" = dontDistribute super."cabal-test-compat"; + "cabal-test-quickcheck" = dontDistribute super."cabal-test-quickcheck"; + "cabal-uninstall" = dontDistribute super."cabal-uninstall"; + "cabal-upload" = dontDistribute super."cabal-upload"; + "cabal2arch" = dontDistribute super."cabal2arch"; + "cabal2doap" = dontDistribute super."cabal2doap"; + "cabal2ebuild" = dontDistribute super."cabal2ebuild"; + "cabal2ghci" = dontDistribute super."cabal2ghci"; + "cabal2nix" = dontDistribute super."cabal2nix"; + "cabal2spec" = dontDistribute super."cabal2spec"; + "cabalQuery" = dontDistribute super."cabalQuery"; + "cabalg" = dontDistribute super."cabalg"; + "cabalgraph" = dontDistribute super."cabalgraph"; + "cabalmdvrpm" = dontDistribute super."cabalmdvrpm"; + "cabalrpmdeps" = dontDistribute super."cabalrpmdeps"; + "cabalvchk" = dontDistribute super."cabalvchk"; + "cabin" = dontDistribute super."cabin"; + "cabocha" = dontDistribute super."cabocha"; + "cached-io" = dontDistribute super."cached-io"; + "cached-traversable" = dontDistribute super."cached-traversable"; + "cacophony" = dontDistribute super."cacophony"; + "caf" = dontDistribute super."caf"; + "cafeteria-prelude" = dontDistribute super."cafeteria-prelude"; + "caffegraph" = dontDistribute super."caffegraph"; + "cairo-appbase" = dontDistribute super."cairo-appbase"; + "cake" = dontDistribute super."cake"; + "cake3" = dontDistribute super."cake3"; + "cakyrespa" = dontDistribute super."cakyrespa"; + "cal3d" = dontDistribute super."cal3d"; + "cal3d-examples" = dontDistribute super."cal3d-examples"; + "cal3d-opengl" = dontDistribute super."cal3d-opengl"; + "calc" = dontDistribute super."calc"; + "calculator" = dontDistribute super."calculator"; + "caldims" = dontDistribute super."caldims"; + "caledon" = dontDistribute super."caledon"; + "call" = dontDistribute super."call"; + "call-haskell-from-anything" = dontDistribute super."call-haskell-from-anything"; + "camh" = dontDistribute super."camh"; + "campfire" = dontDistribute super."campfire"; + "canonical-filepath" = dontDistribute super."canonical-filepath"; + "canteven-config" = dontDistribute super."canteven-config"; + "canteven-log" = dontDistribute super."canteven-log"; + "cantor" = dontDistribute super."cantor"; + "cao" = dontDistribute super."cao"; + "cap" = dontDistribute super."cap"; + "capped-list" = dontDistribute super."capped-list"; + "capri" = dontDistribute super."capri"; + "car-pool" = dontDistribute super."car-pool"; + "caramia" = dontDistribute super."caramia"; + "carboncopy" = dontDistribute super."carboncopy"; + "carettah" = dontDistribute super."carettah"; + "carray" = dontDistribute super."carray"; + "casadi-bindings" = dontDistribute super."casadi-bindings"; + "casadi-bindings-control" = dontDistribute super."casadi-bindings-control"; + "casadi-bindings-core" = dontDistribute super."casadi-bindings-core"; + "casadi-bindings-internal" = dontDistribute super."casadi-bindings-internal"; + "casadi-bindings-ipopt-interface" = dontDistribute super."casadi-bindings-ipopt-interface"; + "casadi-bindings-snopt-interface" = dontDistribute super."casadi-bindings-snopt-interface"; + "cascading" = dontDistribute super."cascading"; + "case-conversion" = dontDistribute super."case-conversion"; + "cased" = dontDistribute super."cased"; + "cash" = dontDistribute super."cash"; + "casing" = dontDistribute super."casing"; + "cassandra-cql" = dontDistribute super."cassandra-cql"; + "cassandra-thrift" = dontDistribute super."cassandra-thrift"; + "cassava-conduit" = dontDistribute super."cassava-conduit"; + "cassava-streams" = dontDistribute super."cassava-streams"; + "cassette" = dontDistribute super."cassette"; + "cassy" = dontDistribute super."cassy"; + "castle" = dontDistribute super."castle"; + "casui" = dontDistribute super."casui"; + "catamorphism" = dontDistribute super."catamorphism"; + "catch-fd" = dontDistribute super."catch-fd"; + "categorical-algebra" = dontDistribute super."categorical-algebra"; + "categories" = dontDistribute super."categories"; + "category-extras" = dontDistribute super."category-extras"; + "cblrepo" = dontDistribute super."cblrepo"; + "cci" = dontDistribute super."cci"; + "ccnx" = dontDistribute super."ccnx"; + "cctools-workqueue" = dontDistribute super."cctools-workqueue"; + "cedict" = dontDistribute super."cedict"; + "cef" = dontDistribute super."cef"; + "ceilometer-common" = dontDistribute super."ceilometer-common"; + "cellrenderer-cairo" = dontDistribute super."cellrenderer-cairo"; + "cereal-derive" = dontDistribute super."cereal-derive"; + "cereal-enumerator" = dontDistribute super."cereal-enumerator"; + "cereal-ieee754" = dontDistribute super."cereal-ieee754"; + "cereal-plus" = dontDistribute super."cereal-plus"; + "cereal-text" = dontDistribute super."cereal-text"; + "certificate" = dontDistribute super."certificate"; + "cf" = dontDistribute super."cf"; + "cfipu" = dontDistribute super."cfipu"; + "cflp" = dontDistribute super."cflp"; + "cfopu" = dontDistribute super."cfopu"; + "cg" = dontDistribute super."cg"; + "cgen" = dontDistribute super."cgen"; + "cgi-undecidable" = dontDistribute super."cgi-undecidable"; + "cgi-utils" = dontDistribute super."cgi-utils"; + "cgrep" = dontDistribute super."cgrep"; + "chain-codes" = dontDistribute super."chain-codes"; + "chalk" = dontDistribute super."chalk"; + "chalkboard" = dontDistribute super."chalkboard"; + "chalkboard-viewer" = dontDistribute super."chalkboard-viewer"; + "chalmers-lava2000" = dontDistribute super."chalmers-lava2000"; + "chan-split" = dontDistribute super."chan-split"; + "change-monger" = dontDistribute super."change-monger"; + "charade" = dontDistribute super."charade"; + "charsetdetect" = dontDistribute super."charsetdetect"; + "charsetdetect-ae" = dontDistribute super."charsetdetect-ae"; + "chart-histogram" = dontDistribute super."chart-histogram"; + "chaselev-deque" = dontDistribute super."chaselev-deque"; + "chatter" = dontDistribute super."chatter"; + "chatty" = dontDistribute super."chatty"; + "chatty-text" = dontDistribute super."chatty-text"; + "chatty-utils" = dontDistribute super."chatty-utils"; + "cheapskate" = dontDistribute super."cheapskate"; + "check-pvp" = dontDistribute super."check-pvp"; + "checked" = dontDistribute super."checked"; + "chell-hunit" = dontDistribute super."chell-hunit"; + "chesshs" = dontDistribute super."chesshs"; + "chevalier-common" = dontDistribute super."chevalier-common"; + "chp" = dontDistribute super."chp"; + "chp-mtl" = dontDistribute super."chp-mtl"; + "chp-plus" = dontDistribute super."chp-plus"; + "chp-spec" = dontDistribute super."chp-spec"; + "chp-transformers" = dontDistribute super."chp-transformers"; + "chronograph" = dontDistribute super."chronograph"; + "chu2" = dontDistribute super."chu2"; + "chuchu" = dontDistribute super."chuchu"; + "chunks" = dontDistribute super."chunks"; + "chunky" = dontDistribute super."chunky"; + "church-list" = dontDistribute super."church-list"; + "cil" = dontDistribute super."cil"; + "cinvoke" = dontDistribute super."cinvoke"; + "cio" = dontDistribute super."cio"; + "cipher-rc5" = dontDistribute super."cipher-rc5"; + "ciphersaber2" = dontDistribute super."ciphersaber2"; + "circ" = dontDistribute super."circ"; + "cirru-parser" = dontDistribute super."cirru-parser"; + "citation-resolve" = dontDistribute super."citation-resolve"; + "citeproc-hs" = dontDistribute super."citeproc-hs"; + "citeproc-hs-pandoc-filter" = dontDistribute super."citeproc-hs-pandoc-filter"; + "cityhash" = dontDistribute super."cityhash"; + "cjk" = dontDistribute super."cjk"; + "clac" = dontDistribute super."clac"; + "clafer" = dontDistribute super."clafer"; + "claferIG" = dontDistribute super."claferIG"; + "claferwiki" = dontDistribute super."claferwiki"; + "clanki" = dontDistribute super."clanki"; + "clash" = dontDistribute super."clash"; + "clash-ghc" = doDistribute super."clash-ghc_0_5_15"; + "clash-lib" = doDistribute super."clash-lib_0_5_13"; + "clash-prelude" = doDistribute super."clash-prelude_0_9_3"; + "clash-prelude-quickcheck" = dontDistribute super."clash-prelude-quickcheck"; + "clash-systemverilog" = doDistribute super."clash-systemverilog_0_5_10"; + "clash-verilog" = doDistribute super."clash-verilog_0_5_10"; + "clash-vhdl" = doDistribute super."clash-vhdl_0_5_12"; + "classify" = dontDistribute super."classify"; + "classy-parallel" = dontDistribute super."classy-parallel"; + "clckwrks" = dontDistribute super."clckwrks"; + "clckwrks-cli" = dontDistribute super."clckwrks-cli"; + "clckwrks-dot-com" = dontDistribute super."clckwrks-dot-com"; + "clckwrks-plugin-bugs" = dontDistribute super."clckwrks-plugin-bugs"; + "clckwrks-plugin-ircbot" = dontDistribute super."clckwrks-plugin-ircbot"; + "clckwrks-plugin-media" = dontDistribute super."clckwrks-plugin-media"; + "clckwrks-plugin-page" = dontDistribute super."clckwrks-plugin-page"; + "clckwrks-theme-bootstrap" = dontDistribute super."clckwrks-theme-bootstrap"; + "clckwrks-theme-clckwrks" = dontDistribute super."clckwrks-theme-clckwrks"; + "clckwrks-theme-geo-bootstrap" = dontDistribute super."clckwrks-theme-geo-bootstrap"; + "cld2" = dontDistribute super."cld2"; + "clean-home" = dontDistribute super."clean-home"; + "clean-unions" = dontDistribute super."clean-unions"; + "cless" = dontDistribute super."cless"; + "clevercss" = dontDistribute super."clevercss"; + "cli" = dontDistribute super."cli"; + "click-clack" = dontDistribute super."click-clack"; + "clifford" = dontDistribute super."clifford"; + "clippard" = dontDistribute super."clippard"; + "clipper" = dontDistribute super."clipper"; + "clippings" = dontDistribute super."clippings"; + "clist" = dontDistribute super."clist"; + "clocked" = dontDistribute super."clocked"; + "clogparse" = dontDistribute super."clogparse"; + "clone-all" = dontDistribute super."clone-all"; + "closure" = dontDistribute super."closure"; + "cloud-haskell" = dontDistribute super."cloud-haskell"; + "cloudfront-signer" = dontDistribute super."cloudfront-signer"; + "cloudyfs" = dontDistribute super."cloudyfs"; + "cltw" = dontDistribute super."cltw"; + "clua" = dontDistribute super."clua"; + "cluss" = dontDistribute super."cluss"; + "clustertools" = dontDistribute super."clustertools"; + "clutterhs" = dontDistribute super."clutterhs"; + "cmaes" = dontDistribute super."cmaes"; + "cmath" = dontDistribute super."cmath"; + "cmathml3" = dontDistribute super."cmathml3"; + "cmd-item" = dontDistribute super."cmd-item"; + "cmdargs-browser" = dontDistribute super."cmdargs-browser"; + "cmdlib" = dontDistribute super."cmdlib"; + "cmdtheline" = dontDistribute super."cmdtheline"; + "cml" = dontDistribute super."cml"; + "cmonad" = dontDistribute super."cmonad"; + "cmu" = dontDistribute super."cmu"; + "cnc-spec-compiler" = dontDistribute super."cnc-spec-compiler"; + "cndict" = dontDistribute super."cndict"; + "codec" = dontDistribute super."codec"; + "codec-libevent" = dontDistribute super."codec-libevent"; + "codec-mbox" = dontDistribute super."codec-mbox"; + "codecov-haskell" = dontDistribute super."codecov-haskell"; + "codemonitor" = dontDistribute super."codemonitor"; + "codepad" = dontDistribute super."codepad"; + "codex" = doDistribute super."codex_0_3_0_10"; + "codo-notation" = dontDistribute super."codo-notation"; + "cofunctor" = dontDistribute super."cofunctor"; + "cognimeta-utils" = dontDistribute super."cognimeta-utils"; + "coinbase-exchange" = dontDistribute super."coinbase-exchange"; + "colada" = dontDistribute super."colada"; + "colchis" = dontDistribute super."colchis"; + "collada-output" = dontDistribute super."collada-output"; + "collada-types" = dontDistribute super."collada-types"; + "collapse-util" = dontDistribute super."collapse-util"; + "collection-json" = dontDistribute super."collection-json"; + "collections" = dontDistribute super."collections"; + "collections-api" = dontDistribute super."collections-api"; + "collections-base-instances" = dontDistribute super."collections-base-instances"; + "colock" = dontDistribute super."colock"; + "colorize-haskell" = dontDistribute super."colorize-haskell"; + "colors" = dontDistribute super."colors"; + "coltrane" = dontDistribute super."coltrane"; + "com" = dontDistribute super."com"; + "combinat" = dontDistribute super."combinat"; + "combinat-diagrams" = dontDistribute super."combinat-diagrams"; + "combinator-interactive" = dontDistribute super."combinator-interactive"; + "combinatorial-problems" = dontDistribute super."combinatorial-problems"; + "combinatorics" = dontDistribute super."combinatorics"; + "combobuffer" = dontDistribute super."combobuffer"; + "comfort-graph" = dontDistribute super."comfort-graph"; + "command" = dontDistribute super."command"; + "command-qq" = dontDistribute super."command-qq"; + "commodities" = dontDistribute super."commodities"; + "commsec" = dontDistribute super."commsec"; + "commsec-keyexchange" = dontDistribute super."commsec-keyexchange"; + "commutative" = dontDistribute super."commutative"; + "comonad-extras" = dontDistribute super."comonad-extras"; + "comonad-random" = dontDistribute super."comonad-random"; + "compact-map" = dontDistribute super."compact-map"; + "compact-socket" = dontDistribute super."compact-socket"; + "compact-string" = dontDistribute super."compact-string"; + "compact-string-fix" = dontDistribute super."compact-string-fix"; + "compactmap" = dontDistribute super."compactmap"; + "compare-type" = dontDistribute super."compare-type"; + "compdata-automata" = dontDistribute super."compdata-automata"; + "compdata-dags" = dontDistribute super."compdata-dags"; + "compdata-param" = dontDistribute super."compdata-param"; + "compensated" = dontDistribute super."compensated"; + "competition" = dontDistribute super."competition"; + "compilation" = dontDistribute super."compilation"; + "complex-generic" = dontDistribute super."complex-generic"; + "complex-integrate" = dontDistribute super."complex-integrate"; + "complexity" = dontDistribute super."complexity"; + "compose-ltr" = dontDistribute super."compose-ltr"; + "compose-trans" = dontDistribute super."compose-trans"; + "composition-extra" = doDistribute super."composition-extra_1_1_0"; + "composition-tree" = dontDistribute super."composition-tree"; + "compression" = dontDistribute super."compression"; + "compstrat" = dontDistribute super."compstrat"; + "comptrans" = dontDistribute super."comptrans"; + "computational-algebra" = dontDistribute super."computational-algebra"; + "computations" = dontDistribute super."computations"; + "conceit" = dontDistribute super."conceit"; + "concorde" = dontDistribute super."concorde"; + "concraft" = dontDistribute super."concraft"; + "concraft-hr" = dontDistribute super."concraft-hr"; + "concraft-pl" = dontDistribute super."concraft-pl"; + "concrete-relaxng-parser" = dontDistribute super."concrete-relaxng-parser"; + "concrete-typerep" = dontDistribute super."concrete-typerep"; + "concurrent-barrier" = dontDistribute super."concurrent-barrier"; + "concurrent-dns-cache" = dontDistribute super."concurrent-dns-cache"; + "concurrent-machines" = dontDistribute super."concurrent-machines"; + "concurrent-output" = dontDistribute super."concurrent-output"; + "concurrent-sa" = dontDistribute super."concurrent-sa"; + "concurrent-split" = dontDistribute super."concurrent-split"; + "concurrent-state" = dontDistribute super."concurrent-state"; + "concurrent-utilities" = dontDistribute super."concurrent-utilities"; + "concurrentoutput" = dontDistribute super."concurrentoutput"; + "condor" = dontDistribute super."condor"; + "condorcet" = dontDistribute super."condorcet"; + "conductive-base" = dontDistribute super."conductive-base"; + "conductive-clock" = dontDistribute super."conductive-clock"; + "conductive-hsc3" = dontDistribute super."conductive-hsc3"; + "conductive-song" = dontDistribute super."conductive-song"; + "conduit-audio" = dontDistribute super."conduit-audio"; + "conduit-audio-lame" = dontDistribute super."conduit-audio-lame"; + "conduit-audio-samplerate" = dontDistribute super."conduit-audio-samplerate"; + "conduit-audio-sndfile" = dontDistribute super."conduit-audio-sndfile"; + "conduit-connection" = dontDistribute super."conduit-connection"; + "conduit-iconv" = dontDistribute super."conduit-iconv"; + "conduit-network-stream" = dontDistribute super."conduit-network-stream"; + "conduit-parse" = dontDistribute super."conduit-parse"; + "conduit-resumablesink" = dontDistribute super."conduit-resumablesink"; + "conf" = dontDistribute super."conf"; + "config-select" = dontDistribute super."config-select"; + "config-value" = dontDistribute super."config-value"; + "configifier" = dontDistribute super."configifier"; + "configuration" = dontDistribute super."configuration"; + "configuration-tools" = dontDistribute super."configuration-tools"; + "confsolve" = dontDistribute super."confsolve"; + "congruence-relation" = dontDistribute super."congruence-relation"; + "conjugateGradient" = dontDistribute super."conjugateGradient"; + "conjure" = dontDistribute super."conjure"; + "conlogger" = dontDistribute super."conlogger"; + "connection-pool" = dontDistribute super."connection-pool"; + "consistent" = dontDistribute super."consistent"; + "console-program" = dontDistribute super."console-program"; + "const-math-ghc-plugin" = dontDistribute super."const-math-ghc-plugin"; + "constrained-categories" = dontDistribute super."constrained-categories"; + "constrained-normal" = dontDistribute super."constrained-normal"; + "constructible" = dontDistribute super."constructible"; + "constructive-algebra" = dontDistribute super."constructive-algebra"; + "consumers" = dontDistribute super."consumers"; + "container-classes" = dontDistribute super."container-classes"; + "containers-benchmark" = dontDistribute super."containers-benchmark"; + "containers-deepseq" = dontDistribute super."containers-deepseq"; + "context-free-grammar" = dontDistribute super."context-free-grammar"; + "context-stack" = dontDistribute super."context-stack"; + "continue" = dontDistribute super."continue"; + "continued-fractions" = dontDistribute super."continued-fractions"; + "continuum" = dontDistribute super."continuum"; + "continuum-client" = dontDistribute super."continuum-client"; + "control-event" = dontDistribute super."control-event"; + "control-monad-attempt" = dontDistribute super."control-monad-attempt"; + "control-monad-exception" = dontDistribute super."control-monad-exception"; + "control-monad-exception-monadsfd" = dontDistribute super."control-monad-exception-monadsfd"; + "control-monad-exception-monadstf" = dontDistribute super."control-monad-exception-monadstf"; + "control-monad-exception-mtl" = dontDistribute super."control-monad-exception-mtl"; + "control-monad-failure" = dontDistribute super."control-monad-failure"; + "control-monad-failure-mtl" = dontDistribute super."control-monad-failure-mtl"; + "control-monad-omega" = dontDistribute super."control-monad-omega"; + "control-monad-queue" = dontDistribute super."control-monad-queue"; + "control-timeout" = dontDistribute super."control-timeout"; + "contstuff" = dontDistribute super."contstuff"; + "contstuff-monads-tf" = dontDistribute super."contstuff-monads-tf"; + "contstuff-transformers" = dontDistribute super."contstuff-transformers"; + "converge" = dontDistribute super."converge"; + "conversion" = dontDistribute super."conversion"; + "conversion-bytestring" = dontDistribute super."conversion-bytestring"; + "conversion-case-insensitive" = dontDistribute super."conversion-case-insensitive"; + "conversion-text" = dontDistribute super."conversion-text"; + "convert" = dontDistribute super."convert"; + "convertible-ascii" = dontDistribute super."convertible-ascii"; + "convertible-text" = dontDistribute super."convertible-text"; + "cookbook" = dontDistribute super."cookbook"; + "coordinate" = dontDistribute super."coordinate"; + "copilot" = dontDistribute super."copilot"; + "copilot-c99" = dontDistribute super."copilot-c99"; + "copilot-cbmc" = dontDistribute super."copilot-cbmc"; + "copilot-core" = dontDistribute super."copilot-core"; + "copilot-language" = dontDistribute super."copilot-language"; + "copilot-libraries" = dontDistribute super."copilot-libraries"; + "copilot-sbv" = dontDistribute super."copilot-sbv"; + "copilot-theorem" = dontDistribute super."copilot-theorem"; + "copr" = dontDistribute super."copr"; + "core" = dontDistribute super."core"; + "core-haskell" = dontDistribute super."core-haskell"; + "corebot-bliki" = dontDistribute super."corebot-bliki"; + "coroutine-enumerator" = dontDistribute super."coroutine-enumerator"; + "coroutine-iteratee" = dontDistribute super."coroutine-iteratee"; + "coroutine-object" = dontDistribute super."coroutine-object"; + "couch-hs" = dontDistribute super."couch-hs"; + "couch-simple" = dontDistribute super."couch-simple"; + "couchdb-conduit" = dontDistribute super."couchdb-conduit"; + "couchdb-enumerator" = dontDistribute super."couchdb-enumerator"; + "count" = dontDistribute super."count"; + "countable" = dontDistribute super."countable"; + "counter" = dontDistribute super."counter"; + "court" = dontDistribute super."court"; + "coverage" = dontDistribute super."coverage"; + "cpio-conduit" = dontDistribute super."cpio-conduit"; + "cplusplus-th" = dontDistribute super."cplusplus-th"; + "cprng-aes-effect" = dontDistribute super."cprng-aes-effect"; + "cpsa" = dontDistribute super."cpsa"; + "cpuid" = dontDistribute super."cpuid"; + "cpuperf" = dontDistribute super."cpuperf"; + "cpython" = dontDistribute super."cpython"; + "cql" = doDistribute super."cql_3_0_5"; + "cqrs" = dontDistribute super."cqrs"; + "cqrs-core" = dontDistribute super."cqrs-core"; + "cqrs-example" = dontDistribute super."cqrs-example"; + "cqrs-memory" = dontDistribute super."cqrs-memory"; + "cqrs-postgresql" = dontDistribute super."cqrs-postgresql"; + "cqrs-sqlite3" = dontDistribute super."cqrs-sqlite3"; + "cqrs-test" = dontDistribute super."cqrs-test"; + "cqrs-testkit" = dontDistribute super."cqrs-testkit"; + "cqrs-types" = dontDistribute super."cqrs-types"; + "cr" = dontDistribute super."cr"; + "crack" = dontDistribute super."crack"; + "craftwerk" = dontDistribute super."craftwerk"; + "craftwerk-cairo" = dontDistribute super."craftwerk-cairo"; + "craftwerk-gtk" = dontDistribute super."craftwerk-gtk"; + "crc16" = dontDistribute super."crc16"; + "crc16-table" = dontDistribute super."crc16-table"; + "creatur" = dontDistribute super."creatur"; + "crf-chain1" = dontDistribute super."crf-chain1"; + "crf-chain1-constrained" = dontDistribute super."crf-chain1-constrained"; + "crf-chain2-generic" = dontDistribute super."crf-chain2-generic"; + "crf-chain2-tiers" = dontDistribute super."crf-chain2-tiers"; + "critbit" = dontDistribute super."critbit"; + "criterion-plus" = dontDistribute super."criterion-plus"; + "criterion-to-html" = dontDistribute super."criterion-to-html"; + "crockford" = dontDistribute super."crockford"; + "crocodile" = dontDistribute super."crocodile"; + "cron" = doDistribute super."cron_0_3_0"; + "cron-compat" = dontDistribute super."cron-compat"; + "cruncher-types" = dontDistribute super."cruncher-types"; + "crunghc" = dontDistribute super."crunghc"; + "crypto-cipher-benchmarks" = dontDistribute super."crypto-cipher-benchmarks"; + "crypto-classical" = dontDistribute super."crypto-classical"; + "crypto-conduit" = dontDistribute super."crypto-conduit"; + "crypto-enigma" = dontDistribute super."crypto-enigma"; + "crypto-pubkey-openssh" = dontDistribute super."crypto-pubkey-openssh"; + "crypto-random-effect" = dontDistribute super."crypto-random-effect"; + "crypto-totp" = dontDistribute super."crypto-totp"; + "cryptonite" = doDistribute super."cryptonite_0_6"; + "cryptsy-api" = dontDistribute super."cryptsy-api"; + "crystalfontz" = dontDistribute super."crystalfontz"; + "cse-ghc-plugin" = dontDistribute super."cse-ghc-plugin"; + "csound-catalog" = dontDistribute super."csound-catalog"; + "csound-expression" = dontDistribute super."csound-expression"; + "csound-expression-dynamic" = dontDistribute super."csound-expression-dynamic"; + "csound-expression-opcodes" = dontDistribute super."csound-expression-opcodes"; + "csound-expression-typed" = dontDistribute super."csound-expression-typed"; + "csound-sampler" = dontDistribute super."csound-sampler"; + "csp" = dontDistribute super."csp"; + "cspmchecker" = dontDistribute super."cspmchecker"; + "css" = dontDistribute super."css"; + "css-syntax" = dontDistribute super."css-syntax"; + "csv-enumerator" = dontDistribute super."csv-enumerator"; + "csv-nptools" = dontDistribute super."csv-nptools"; + "csv-to-qif" = dontDistribute super."csv-to-qif"; + "ctemplate" = dontDistribute super."ctemplate"; + "ctkl" = dontDistribute super."ctkl"; + "ctpl" = dontDistribute super."ctpl"; + "ctrie" = dontDistribute super."ctrie"; + "cube" = dontDistribute super."cube"; + "cubical" = dontDistribute super."cubical"; + "cubicbezier" = dontDistribute super."cubicbezier"; + "cubicspline" = doDistribute super."cubicspline_0_1_1"; + "cublas" = dontDistribute super."cublas"; + "cuboid" = dontDistribute super."cuboid"; + "cuda" = dontDistribute super."cuda"; + "cudd" = dontDistribute super."cudd"; + "cufft" = dontDistribute super."cufft"; + "curl-aeson" = dontDistribute super."curl-aeson"; + "curlhs" = dontDistribute super."curlhs"; + "currency" = dontDistribute super."currency"; + "current-locale" = dontDistribute super."current-locale"; + "curry-base" = dontDistribute super."curry-base"; + "curry-frontend" = dontDistribute super."curry-frontend"; + "cursedcsv" = dontDistribute super."cursedcsv"; + "curve25519" = dontDistribute super."curve25519"; + "curves" = dontDistribute super."curves"; + "custom-prelude" = dontDistribute super."custom-prelude"; + "cv-combinators" = dontDistribute super."cv-combinators"; + "cyclotomic" = dontDistribute super."cyclotomic"; + "cypher" = dontDistribute super."cypher"; + "d-bus" = dontDistribute super."d-bus"; + "d3js" = dontDistribute super."d3js"; + "daemonize-doublefork" = dontDistribute super."daemonize-doublefork"; + "daemons" = dontDistribute super."daemons"; + "dag" = dontDistribute super."dag"; + "damnpacket" = dontDistribute super."damnpacket"; + "dao" = dontDistribute super."dao"; + "dapi" = dontDistribute super."dapi"; + "darcs" = dontDistribute super."darcs"; + "darcs-benchmark" = dontDistribute super."darcs-benchmark"; + "darcs-beta" = dontDistribute super."darcs-beta"; + "darcs-buildpackage" = dontDistribute super."darcs-buildpackage"; + "darcs-cabalized" = dontDistribute super."darcs-cabalized"; + "darcs-fastconvert" = dontDistribute super."darcs-fastconvert"; + "darcs-graph" = dontDistribute super."darcs-graph"; + "darcs-monitor" = dontDistribute super."darcs-monitor"; + "darcs-scripts" = dontDistribute super."darcs-scripts"; + "darcs2dot" = dontDistribute super."darcs2dot"; + "darcsden" = dontDistribute super."darcsden"; + "darcswatch" = dontDistribute super."darcswatch"; + "darkplaces-demo" = dontDistribute super."darkplaces-demo"; + "darkplaces-rcon" = dontDistribute super."darkplaces-rcon"; + "darkplaces-rcon-util" = dontDistribute super."darkplaces-rcon-util"; + "darkplaces-text" = dontDistribute super."darkplaces-text"; + "dash-haskell" = dontDistribute super."dash-haskell"; + "data-accessor-monadLib" = dontDistribute super."data-accessor-monadLib"; + "data-accessor-monads-fd" = dontDistribute super."data-accessor-monads-fd"; + "data-accessor-monads-tf" = dontDistribute super."data-accessor-monads-tf"; + "data-accessor-template" = dontDistribute super."data-accessor-template"; + "data-accessor-transformers" = dontDistribute super."data-accessor-transformers"; + "data-aviary" = dontDistribute super."data-aviary"; + "data-bword" = dontDistribute super."data-bword"; + "data-carousel" = dontDistribute super."data-carousel"; + "data-category" = dontDistribute super."data-category"; + "data-cell" = dontDistribute super."data-cell"; + "data-checked" = dontDistribute super."data-checked"; + "data-clist" = dontDistribute super."data-clist"; + "data-concurrent-queue" = dontDistribute super."data-concurrent-queue"; + "data-cycle" = dontDistribute super."data-cycle"; + "data-default-generics" = dontDistribute super."data-default-generics"; + "data-dispersal" = dontDistribute super."data-dispersal"; + "data-dword" = dontDistribute super."data-dword"; + "data-easy" = dontDistribute super."data-easy"; + "data-endian" = dontDistribute super."data-endian"; + "data-extra" = dontDistribute super."data-extra"; + "data-filepath" = dontDistribute super."data-filepath"; + "data-fin" = dontDistribute super."data-fin"; + "data-fin-simple" = dontDistribute super."data-fin-simple"; + "data-fix" = dontDistribute super."data-fix"; + "data-fix-cse" = dontDistribute super."data-fix-cse"; + "data-flags" = dontDistribute super."data-flags"; + "data-flagset" = dontDistribute super."data-flagset"; + "data-fresh" = dontDistribute super."data-fresh"; + "data-interval" = dontDistribute super."data-interval"; + "data-ivar" = dontDistribute super."data-ivar"; + "data-kiln" = dontDistribute super."data-kiln"; + "data-layout" = dontDistribute super."data-layout"; + "data-lens" = dontDistribute super."data-lens"; + "data-lens-fd" = dontDistribute super."data-lens-fd"; + "data-lens-ixset" = dontDistribute super."data-lens-ixset"; + "data-lens-template" = dontDistribute super."data-lens-template"; + "data-list-sequences" = dontDistribute super."data-list-sequences"; + "data-map-multikey" = dontDistribute super."data-map-multikey"; + "data-named" = dontDistribute super."data-named"; + "data-nat" = dontDistribute super."data-nat"; + "data-object" = dontDistribute super."data-object"; + "data-object-json" = dontDistribute super."data-object-json"; + "data-object-yaml" = dontDistribute super."data-object-yaml"; + "data-or" = dontDistribute super."data-or"; + "data-partition" = dontDistribute super."data-partition"; + "data-pprint" = dontDistribute super."data-pprint"; + "data-quotientref" = dontDistribute super."data-quotientref"; + "data-r-tree" = dontDistribute super."data-r-tree"; + "data-ref" = dontDistribute super."data-ref"; + "data-reify-cse" = dontDistribute super."data-reify-cse"; + "data-repr" = dontDistribute super."data-repr"; + "data-rev" = dontDistribute super."data-rev"; + "data-rope" = dontDistribute super."data-rope"; + "data-rtuple" = dontDistribute super."data-rtuple"; + "data-size" = dontDistribute super."data-size"; + "data-spacepart" = dontDistribute super."data-spacepart"; + "data-store" = dontDistribute super."data-store"; + "data-stringmap" = dontDistribute super."data-stringmap"; + "data-structure-inferrer" = dontDistribute super."data-structure-inferrer"; + "data-tensor" = dontDistribute super."data-tensor"; + "data-textual" = dontDistribute super."data-textual"; + "data-timeout" = dontDistribute super."data-timeout"; + "data-transform" = dontDistribute super."data-transform"; + "data-treify" = dontDistribute super."data-treify"; + "data-type" = dontDistribute super."data-type"; + "data-util" = dontDistribute super."data-util"; + "data-variant" = dontDistribute super."data-variant"; + "database-migrate" = dontDistribute super."database-migrate"; + "database-study" = dontDistribute super."database-study"; + "dataenc" = dontDistribute super."dataenc"; + "dataflow" = dontDistribute super."dataflow"; + "datalog" = dontDistribute super."datalog"; + "datapacker" = dontDistribute super."datapacker"; + "dataurl" = dontDistribute super."dataurl"; + "date-cache" = dontDistribute super."date-cache"; + "dates" = dontDistribute super."dates"; + "datetime" = dontDistribute super."datetime"; + "datetime-sb" = dontDistribute super."datetime-sb"; + "dawg" = dontDistribute super."dawg"; + "dbcleaner" = dontDistribute super."dbcleaner"; + "dbf" = dontDistribute super."dbf"; + "dbjava" = dontDistribute super."dbjava"; + "dbmigrations" = dontDistribute super."dbmigrations"; + "dbus-client" = dontDistribute super."dbus-client"; + "dbus-core" = dontDistribute super."dbus-core"; + "dbus-qq" = dontDistribute super."dbus-qq"; + "dbus-th" = dontDistribute super."dbus-th"; + "dclabel" = dontDistribute super."dclabel"; + "dclabel-eci11" = dontDistribute super."dclabel-eci11"; + "ddc-base" = dontDistribute super."ddc-base"; + "ddc-build" = dontDistribute super."ddc-build"; + "ddc-code" = dontDistribute super."ddc-code"; + "ddc-core" = dontDistribute super."ddc-core"; + "ddc-core-eval" = dontDistribute super."ddc-core-eval"; + "ddc-core-flow" = dontDistribute super."ddc-core-flow"; + "ddc-core-llvm" = dontDistribute super."ddc-core-llvm"; + "ddc-core-salt" = dontDistribute super."ddc-core-salt"; + "ddc-core-simpl" = dontDistribute super."ddc-core-simpl"; + "ddc-core-tetra" = dontDistribute super."ddc-core-tetra"; + "ddc-driver" = dontDistribute super."ddc-driver"; + "ddc-interface" = dontDistribute super."ddc-interface"; + "ddc-source-tetra" = dontDistribute super."ddc-source-tetra"; + "ddc-tools" = dontDistribute super."ddc-tools"; + "ddc-war" = dontDistribute super."ddc-war"; + "ddci-core" = dontDistribute super."ddci-core"; + "dead-code-detection" = dontDistribute super."dead-code-detection"; + "dead-simple-json" = dontDistribute super."dead-simple-json"; + "debian" = doDistribute super."debian_3_87_2"; + "debian-binary" = dontDistribute super."debian-binary"; + "debian-build" = dontDistribute super."debian-build"; + "debug-diff" = dontDistribute super."debug-diff"; + "decepticons" = dontDistribute super."decepticons"; + "declarative" = dontDistribute super."declarative"; + "decode-utf8" = dontDistribute super."decode-utf8"; + "decoder-conduit" = dontDistribute super."decoder-conduit"; + "dedukti" = dontDistribute super."dedukti"; + "deepcontrol" = dontDistribute super."deepcontrol"; + "deeplearning-hs" = dontDistribute super."deeplearning-hs"; + "deepseq-bounded" = dontDistribute super."deepseq-bounded"; + "deepseq-magic" = dontDistribute super."deepseq-magic"; + "deepseq-th" = dontDistribute super."deepseq-th"; + "deepzoom" = dontDistribute super."deepzoom"; + "defargs" = dontDistribute super."defargs"; + "definitive-base" = dontDistribute super."definitive-base"; + "definitive-filesystem" = dontDistribute super."definitive-filesystem"; + "definitive-graphics" = dontDistribute super."definitive-graphics"; + "definitive-parser" = dontDistribute super."definitive-parser"; + "definitive-reactive" = dontDistribute super."definitive-reactive"; + "definitive-sound" = dontDistribute super."definitive-sound"; + "deiko-config" = dontDistribute super."deiko-config"; + "dejafu" = dontDistribute super."dejafu"; + "deka" = dontDistribute super."deka"; + "deka-tests" = dontDistribute super."deka-tests"; + "delaunay" = dontDistribute super."delaunay"; + "delicious" = dontDistribute super."delicious"; + "delimited-text" = dontDistribute super."delimited-text"; + "delta" = dontDistribute super."delta"; + "delta-h" = dontDistribute super."delta-h"; + "demarcate" = dontDistribute super."demarcate"; + "denominate" = dontDistribute super."denominate"; + "depends" = dontDistribute super."depends"; + "dephd" = dontDistribute super."dephd"; + "dequeue" = dontDistribute super."dequeue"; + "derangement" = dontDistribute super."derangement"; + "derivation-trees" = dontDistribute super."derivation-trees"; + "derive-IG" = dontDistribute super."derive-IG"; + "derive-enumerable" = dontDistribute super."derive-enumerable"; + "derive-gadt" = dontDistribute super."derive-gadt"; + "derive-topdown" = dontDistribute super."derive-topdown"; + "derive-trie" = dontDistribute super."derive-trie"; + "deriving-compat" = dontDistribute super."deriving-compat"; + "derp" = dontDistribute super."derp"; + "derp-lib" = dontDistribute super."derp-lib"; + "descrilo" = dontDistribute super."descrilo"; + "despair" = dontDistribute super."despair"; + "deterministic-game-engine" = dontDistribute super."deterministic-game-engine"; + "detrospector" = dontDistribute super."detrospector"; + "deunicode" = dontDistribute super."deunicode"; + "devil" = dontDistribute super."devil"; + "dewdrop" = dontDistribute super."dewdrop"; + "dfrac" = dontDistribute super."dfrac"; + "dfsbuild" = dontDistribute super."dfsbuild"; + "dgim" = dontDistribute super."dgim"; + "dgs" = dontDistribute super."dgs"; + "dia-base" = dontDistribute super."dia-base"; + "dia-functions" = dontDistribute super."dia-functions"; + "diagrams-canvas" = dontDistribute super."diagrams-canvas"; + "diagrams-graphviz" = dontDistribute super."diagrams-graphviz"; + "diagrams-gtk" = dontDistribute super."diagrams-gtk"; + "diagrams-hsqml" = dontDistribute super."diagrams-hsqml"; + "diagrams-pandoc" = dontDistribute super."diagrams-pandoc"; + "diagrams-pdf" = dontDistribute super."diagrams-pdf"; + "diagrams-pgf" = dontDistribute super."diagrams-pgf"; + "diagrams-qrcode" = dontDistribute super."diagrams-qrcode"; + "diagrams-rubiks-cube" = dontDistribute super."diagrams-rubiks-cube"; + "diagrams-tikz" = dontDistribute super."diagrams-tikz"; + "dice-entropy-conduit" = dontDistribute super."dice-entropy-conduit"; + "dicom" = dontDistribute super."dicom"; + "dictparser" = dontDistribute super."dictparser"; + "diet" = dontDistribute super."diet"; + "diff-parse" = dontDistribute super."diff-parse"; + "diffarray" = dontDistribute super."diffarray"; + "diffcabal" = dontDistribute super."diffcabal"; + "diffdump" = dontDistribute super."diffdump"; + "digamma" = dontDistribute super."digamma"; + "digest-pure" = dontDistribute super."digest-pure"; + "digestive-bootstrap" = dontDistribute super."digestive-bootstrap"; + "digestive-foundation-lucid" = dontDistribute super."digestive-foundation-lucid"; + "digestive-functors-blaze" = dontDistribute super."digestive-functors-blaze"; + "digestive-functors-happstack" = dontDistribute super."digestive-functors-happstack"; + "digestive-functors-heist" = dontDistribute super."digestive-functors-heist"; + "digestive-functors-hsp" = dontDistribute super."digestive-functors-hsp"; + "digestive-functors-scotty" = dontDistribute super."digestive-functors-scotty"; + "digestive-functors-snap" = dontDistribute super."digestive-functors-snap"; + "digit" = dontDistribute super."digit"; + "digitalocean-kzs" = dontDistribute super."digitalocean-kzs"; + "dimensional" = doDistribute super."dimensional_0_13_0_2"; + "dimensional-tf" = dontDistribute super."dimensional-tf"; + "dingo-core" = dontDistribute super."dingo-core"; + "dingo-example" = dontDistribute super."dingo-example"; + "dingo-widgets" = dontDistribute super."dingo-widgets"; + "diophantine" = dontDistribute super."diophantine"; + "diplomacy" = dontDistribute super."diplomacy"; + "diplomacy-server" = dontDistribute super."diplomacy-server"; + "direct-binary-files" = dontDistribute super."direct-binary-files"; + "direct-daemonize" = dontDistribute super."direct-daemonize"; + "direct-fastcgi" = dontDistribute super."direct-fastcgi"; + "direct-http" = dontDistribute super."direct-http"; + "direct-murmur-hash" = dontDistribute super."direct-murmur-hash"; + "direct-plugins" = dontDistribute super."direct-plugins"; + "directed-cubical" = dontDistribute super."directed-cubical"; + "directory-layout" = dontDistribute super."directory-layout"; + "dirfiles" = dontDistribute super."dirfiles"; + "dirstream" = dontDistribute super."dirstream"; + "disassembler" = dontDistribute super."disassembler"; + "discordian-calendar" = dontDistribute super."discordian-calendar"; + "discount" = dontDistribute super."discount"; + "discrete-space-map" = dontDistribute super."discrete-space-map"; + "discrimination" = dontDistribute super."discrimination"; + "disjoint-set" = dontDistribute super."disjoint-set"; + "disjoint-sets-st" = dontDistribute super."disjoint-sets-st"; + "dist-upload" = dontDistribute super."dist-upload"; + "distributed-process" = dontDistribute super."distributed-process"; + "distributed-process-async" = dontDistribute super."distributed-process-async"; + "distributed-process-azure" = dontDistribute super."distributed-process-azure"; + "distributed-process-client-server" = dontDistribute super."distributed-process-client-server"; + "distributed-process-execution" = dontDistribute super."distributed-process-execution"; + "distributed-process-extras" = dontDistribute super."distributed-process-extras"; + "distributed-process-monad-control" = dontDistribute super."distributed-process-monad-control"; + "distributed-process-p2p" = dontDistribute super."distributed-process-p2p"; + "distributed-process-platform" = dontDistribute super."distributed-process-platform"; + "distributed-process-registry" = dontDistribute super."distributed-process-registry"; + "distributed-process-simplelocalnet" = dontDistribute super."distributed-process-simplelocalnet"; + "distributed-process-supervisor" = dontDistribute super."distributed-process-supervisor"; + "distributed-process-task" = dontDistribute super."distributed-process-task"; + "distributed-process-tests" = dontDistribute super."distributed-process-tests"; + "distributed-process-zookeeper" = dontDistribute super."distributed-process-zookeeper"; + "distributed-static" = dontDistribute super."distributed-static"; + "distribution" = dontDistribute super."distribution"; + "distribution-plot" = dontDistribute super."distribution-plot"; + "diversity" = dontDistribute super."diversity"; + "dixi" = dontDistribute super."dixi"; + "djinn" = dontDistribute super."djinn"; + "djinn-th" = dontDistribute super."djinn-th"; + "dnscache" = dontDistribute super."dnscache"; + "dnsrbl" = dontDistribute super."dnsrbl"; + "dnssd" = dontDistribute super."dnssd"; + "doc-review" = dontDistribute super."doc-review"; + "doccheck" = dontDistribute super."doccheck"; + "docidx" = dontDistribute super."docidx"; + "docker" = dontDistribute super."docker"; + "dockercook" = dontDistribute super."dockercook"; + "docopt" = dontDistribute super."docopt"; + "doctest-discover" = dontDistribute super."doctest-discover"; + "doctest-discover-configurator" = dontDistribute super."doctest-discover-configurator"; + "doctest-prop" = dontDistribute super."doctest-prop"; + "dom-lt" = dontDistribute super."dom-lt"; + "dom-selector" = dontDistribute super."dom-selector"; + "domain-auth" = dontDistribute super."domain-auth"; + "dominion" = dontDistribute super."dominion"; + "domplate" = dontDistribute super."domplate"; + "dot2graphml" = dontDistribute super."dot2graphml"; + "dotenv" = dontDistribute super."dotenv"; + "dotfs" = dontDistribute super."dotfs"; + "dotgen" = dontDistribute super."dotgen"; + "dove" = dontDistribute super."dove"; + "dow" = dontDistribute super."dow"; + "download" = dontDistribute super."download"; + "download-curl" = dontDistribute super."download-curl"; + "download-media-content" = dontDistribute super."download-media-content"; + "dozenal" = dontDistribute super."dozenal"; + "dozens" = dontDistribute super."dozens"; + "dph-base" = dontDistribute super."dph-base"; + "dph-examples" = dontDistribute super."dph-examples"; + "dph-lifted-base" = dontDistribute super."dph-lifted-base"; + "dph-lifted-copy" = dontDistribute super."dph-lifted-copy"; + "dph-lifted-vseg" = dontDistribute super."dph-lifted-vseg"; + "dph-par" = dontDistribute super."dph-par"; + "dph-prim-interface" = dontDistribute super."dph-prim-interface"; + "dph-prim-par" = dontDistribute super."dph-prim-par"; + "dph-prim-seq" = dontDistribute super."dph-prim-seq"; + "dph-seq" = dontDistribute super."dph-seq"; + "dpkg" = dontDistribute super."dpkg"; + "drClickOn" = dontDistribute super."drClickOn"; + "draw-poker" = dontDistribute super."draw-poker"; + "drawille" = dontDistribute super."drawille"; + "drifter" = dontDistribute super."drifter"; + "drifter-postgresql" = dontDistribute super."drifter-postgresql"; + "dropbox-sdk" = dontDistribute super."dropbox-sdk"; + "dropsolve" = dontDistribute super."dropsolve"; + "ds-kanren" = dontDistribute super."ds-kanren"; + "dsh-sql" = dontDistribute super."dsh-sql"; + "dsmc" = dontDistribute super."dsmc"; + "dsmc-tools" = dontDistribute super."dsmc-tools"; + "dson" = dontDistribute super."dson"; + "dson-parsec" = dontDistribute super."dson-parsec"; + "dsp" = dontDistribute super."dsp"; + "dstring" = dontDistribute super."dstring"; + "dtab" = dontDistribute super."dtab"; + "dtd" = dontDistribute super."dtd"; + "dtd-text" = dontDistribute super."dtd-text"; + "dtd-types" = dontDistribute super."dtd-types"; + "dtrace" = dontDistribute super."dtrace"; + "dtw" = dontDistribute super."dtw"; + "dump" = dontDistribute super."dump"; + "duplo" = dontDistribute super."duplo"; + "dvda" = dontDistribute super."dvda"; + "dvdread" = dontDistribute super."dvdread"; + "dvi-processing" = dontDistribute super."dvi-processing"; + "dvorak" = dontDistribute super."dvorak"; + "dwarf" = dontDistribute super."dwarf"; + "dwarf-el" = dontDistribute super."dwarf-el"; + "dwarfadt" = dontDistribute super."dwarfadt"; + "dx9base" = dontDistribute super."dx9base"; + "dx9d3d" = dontDistribute super."dx9d3d"; + "dx9d3dx" = dontDistribute super."dx9d3dx"; + "dynamic-cabal" = dontDistribute super."dynamic-cabal"; + "dynamic-graph" = dontDistribute super."dynamic-graph"; + "dynamic-linker-template" = dontDistribute super."dynamic-linker-template"; + "dynamic-loader" = dontDistribute super."dynamic-loader"; + "dynamic-mvector" = dontDistribute super."dynamic-mvector"; + "dynamic-object" = dontDistribute super."dynamic-object"; + "dynamic-plot" = dontDistribute super."dynamic-plot"; + "dynamic-pp" = dontDistribute super."dynamic-pp"; + "dynamic-state" = dontDistribute super."dynamic-state"; + "dynobud" = dontDistribute super."dynobud"; + "dyre" = dontDistribute super."dyre"; + "dywapitchtrack" = dontDistribute super."dywapitchtrack"; + "dzen-utils" = dontDistribute super."dzen-utils"; + "eager-sockets" = dontDistribute super."eager-sockets"; + "easy-api" = dontDistribute super."easy-api"; + "easy-bitcoin" = dontDistribute super."easy-bitcoin"; + "easyjson" = dontDistribute super."easyjson"; + "easyplot" = dontDistribute super."easyplot"; + "easyrender" = dontDistribute super."easyrender"; + "ebeats" = dontDistribute super."ebeats"; + "ebnf-bff" = dontDistribute super."ebnf-bff"; + "ec2-signature" = dontDistribute super."ec2-signature"; + "ecdsa" = dontDistribute super."ecdsa"; + "ecma262" = dontDistribute super."ecma262"; + "ecu" = dontDistribute super."ecu"; + "ed25519" = dontDistribute super."ed25519"; + "ed25519-donna" = dontDistribute super."ed25519-donna"; + "eddie" = dontDistribute super."eddie"; + "edenmodules" = dontDistribute super."edenmodules"; + "edenskel" = dontDistribute super."edenskel"; + "edentv" = dontDistribute super."edentv"; + "edge" = dontDistribute super."edge"; + "edit-distance-vector" = dontDistribute super."edit-distance-vector"; + "edit-lenses" = dontDistribute super."edit-lenses"; + "edit-lenses-demo" = dontDistribute super."edit-lenses-demo"; + "editable" = dontDistribute super."editable"; + "editline" = dontDistribute super."editline"; + "effect-monad" = dontDistribute super."effect-monad"; + "effective-aspects" = dontDistribute super."effective-aspects"; + "effective-aspects-mzv" = dontDistribute super."effective-aspects-mzv"; + "effects" = dontDistribute super."effects"; + "effects-parser" = dontDistribute super."effects-parser"; + "effin" = dontDistribute super."effin"; + "egison" = dontDistribute super."egison"; + "egison-quote" = dontDistribute super."egison-quote"; + "egison-tutorial" = dontDistribute super."egison-tutorial"; + "ehaskell" = dontDistribute super."ehaskell"; + "ehs" = dontDistribute super."ehs"; + "eibd-client-simple" = dontDistribute super."eibd-client-simple"; + "eigen" = dontDistribute super."eigen"; + "either-unwrap" = dontDistribute super."either-unwrap"; + "eithers" = dontDistribute super."eithers"; + "ekg" = dontDistribute super."ekg"; + "ekg-bosun" = dontDistribute super."ekg-bosun"; + "ekg-carbon" = dontDistribute super."ekg-carbon"; + "ekg-json" = dontDistribute super."ekg-json"; + "ekg-log" = dontDistribute super."ekg-log"; + "ekg-push" = dontDistribute super."ekg-push"; + "ekg-rrd" = dontDistribute super."ekg-rrd"; + "ekg-statsd" = dontDistribute super."ekg-statsd"; + "electrum-mnemonic" = dontDistribute super."electrum-mnemonic"; + "elerea" = dontDistribute super."elerea"; + "elerea-examples" = dontDistribute super."elerea-examples"; + "elerea-sdl" = dontDistribute super."elerea-sdl"; + "elevator" = dontDistribute super."elevator"; + "elf" = dontDistribute super."elf"; + "elm-bridge" = dontDistribute super."elm-bridge"; + "elm-build-lib" = dontDistribute super."elm-build-lib"; + "elm-compiler" = dontDistribute super."elm-compiler"; + "elm-get" = dontDistribute super."elm-get"; + "elm-init" = dontDistribute super."elm-init"; + "elm-make" = dontDistribute super."elm-make"; + "elm-package" = dontDistribute super."elm-package"; + "elm-reactor" = dontDistribute super."elm-reactor"; + "elm-repl" = dontDistribute super."elm-repl"; + "elm-server" = dontDistribute super."elm-server"; + "elm-yesod" = dontDistribute super."elm-yesod"; + "elo" = dontDistribute super."elo"; + "elocrypt" = dontDistribute super."elocrypt"; + "emacs-keys" = dontDistribute super."emacs-keys"; + "email" = dontDistribute super."email"; + "email-header" = dontDistribute super."email-header"; + "email-postmark" = dontDistribute super."email-postmark"; + "email-validator" = dontDistribute super."email-validator"; + "embeddock" = dontDistribute super."embeddock"; + "embeddock-example" = dontDistribute super."embeddock-example"; + "embroidery" = dontDistribute super."embroidery"; + "emgm" = dontDistribute super."emgm"; + "empty" = dontDistribute super."empty"; + "encoding" = dontDistribute super."encoding"; + "endo" = dontDistribute super."endo"; + "engine-io-snap" = dontDistribute super."engine-io-snap"; + "engine-io-wai" = dontDistribute super."engine-io-wai"; + "engine-io-yesod" = dontDistribute super."engine-io-yesod"; + "engineering-units" = dontDistribute super."engineering-units"; + "enumerable" = dontDistribute super."enumerable"; + "enumeration" = dontDistribute super."enumeration"; + "enumerator-fd" = dontDistribute super."enumerator-fd"; + "enumerator-tf" = dontDistribute super."enumerator-tf"; + "enumfun" = dontDistribute super."enumfun"; + "enummapmap" = dontDistribute super."enummapmap"; + "enummapset" = dontDistribute super."enummapset"; + "enummapset-th" = dontDistribute super."enummapset-th"; + "enumset" = dontDistribute super."enumset"; + "env-parser" = dontDistribute super."env-parser"; + "envparse" = dontDistribute super."envparse"; + "envy" = dontDistribute super."envy"; + "epanet-haskell" = dontDistribute super."epanet-haskell"; + "epass" = dontDistribute super."epass"; + "epic" = dontDistribute super."epic"; + "epoll" = dontDistribute super."epoll"; + "eprocess" = dontDistribute super."eprocess"; + "epub" = dontDistribute super."epub"; + "epub-metadata" = dontDistribute super."epub-metadata"; + "epub-tools" = dontDistribute super."epub-tools"; + "epubname" = dontDistribute super."epubname"; + "equal-files" = dontDistribute super."equal-files"; + "equational-reasoning" = dontDistribute super."equational-reasoning"; + "erd" = dontDistribute super."erd"; + "erf-native" = dontDistribute super."erf-native"; + "erlang" = dontDistribute super."erlang"; + "eros" = dontDistribute super."eros"; + "eros-client" = dontDistribute super."eros-client"; + "eros-http" = dontDistribute super."eros-http"; + "errno" = dontDistribute super."errno"; + "error-analyze" = dontDistribute super."error-analyze"; + "error-continuations" = dontDistribute super."error-continuations"; + "error-list" = dontDistribute super."error-list"; + "error-loc" = dontDistribute super."error-loc"; + "error-location" = dontDistribute super."error-location"; + "error-message" = dontDistribute super."error-message"; + "errorcall-eq-instance" = dontDistribute super."errorcall-eq-instance"; + "ersatz" = dontDistribute super."ersatz"; + "ersatz-toysat" = dontDistribute super."ersatz-toysat"; + "ert" = dontDistribute super."ert"; + "esotericbot" = dontDistribute super."esotericbot"; + "ess" = dontDistribute super."ess"; + "estimator" = dontDistribute super."estimator"; + "estimators" = dontDistribute super."estimators"; + "estreps" = dontDistribute super."estreps"; + "etcd" = dontDistribute super."etcd"; + "eternal" = dontDistribute super."eternal"; + "ethereum-client-haskell" = dontDistribute super."ethereum-client-haskell"; + "ethereum-merkle-patricia-db" = dontDistribute super."ethereum-merkle-patricia-db"; + "ethereum-rlp" = dontDistribute super."ethereum-rlp"; + "ety" = dontDistribute super."ety"; + "euler" = dontDistribute super."euler"; + "euphoria" = dontDistribute super."euphoria"; + "eurofxref" = dontDistribute super."eurofxref"; + "event-driven" = dontDistribute super."event-driven"; + "event-handlers" = dontDistribute super."event-handlers"; + "event-list" = dontDistribute super."event-list"; + "event-monad" = dontDistribute super."event-monad"; + "eventloop" = dontDistribute super."eventloop"; + "eventstore" = dontDistribute super."eventstore"; + "every-bit-counts" = dontDistribute super."every-bit-counts"; + "ewe" = dontDistribute super."ewe"; + "ex-pool" = dontDistribute super."ex-pool"; + "exact-combinatorics" = dontDistribute super."exact-combinatorics"; + "exact-pi" = dontDistribute super."exact-pi"; + "exception-mailer" = dontDistribute super."exception-mailer"; + "exception-monads-fd" = dontDistribute super."exception-monads-fd"; + "exception-monads-tf" = dontDistribute super."exception-monads-tf"; + "exherbo-cabal" = dontDistribute super."exherbo-cabal"; + "exif" = dontDistribute super."exif"; + "exinst" = dontDistribute super."exinst"; + "exinst-aeson" = dontDistribute super."exinst-aeson"; + "exinst-bytes" = dontDistribute super."exinst-bytes"; + "exinst-deepseq" = dontDistribute super."exinst-deepseq"; + "exinst-hashable" = dontDistribute super."exinst-hashable"; + "exists" = dontDistribute super."exists"; + "exit-codes" = dontDistribute super."exit-codes"; + "exp-pairs" = dontDistribute super."exp-pairs"; + "expand" = dontDistribute super."expand"; + "expat-enumerator" = dontDistribute super."expat-enumerator"; + "expiring-mvar" = dontDistribute super."expiring-mvar"; + "explain" = dontDistribute super."explain"; + "explicit-determinant" = dontDistribute super."explicit-determinant"; + "explicit-exception" = dontDistribute super."explicit-exception"; + "explicit-iomodes" = dontDistribute super."explicit-iomodes"; + "explicit-iomodes-bytestring" = dontDistribute super."explicit-iomodes-bytestring"; + "explicit-iomodes-text" = dontDistribute super."explicit-iomodes-text"; + "explicit-sharing" = dontDistribute super."explicit-sharing"; + "explore" = dontDistribute super."explore"; + "exposed-containers" = dontDistribute super."exposed-containers"; + "expression-parser" = dontDistribute super."expression-parser"; + "extcore" = dontDistribute super."extcore"; + "extemp" = dontDistribute super."extemp"; + "extended-categories" = dontDistribute super."extended-categories"; + "extended-reals" = dontDistribute super."extended-reals"; + "extensible" = dontDistribute super."extensible"; + "extensible-data" = dontDistribute super."extensible-data"; + "extensible-effects" = dontDistribute super."extensible-effects"; + "external-sort" = dontDistribute super."external-sort"; + "extractelf" = dontDistribute super."extractelf"; + "ez-couch" = dontDistribute super."ez-couch"; + "faceted" = dontDistribute super."faceted"; + "factory" = dontDistribute super."factory"; + "factual-api" = dontDistribute super."factual-api"; + "fad" = dontDistribute super."fad"; + "failable-list" = dontDistribute super."failable-list"; + "failure" = dontDistribute super."failure"; + "fair-predicates" = dontDistribute super."fair-predicates"; + "faker" = dontDistribute super."faker"; + "falling-turnip" = dontDistribute super."falling-turnip"; + "fallingblocks" = dontDistribute super."fallingblocks"; + "family-tree" = dontDistribute super."family-tree"; + "farmhash" = dontDistribute super."farmhash"; + "fast-digits" = dontDistribute super."fast-digits"; + "fast-math" = dontDistribute super."fast-math"; + "fast-tags" = dontDistribute super."fast-tags"; + "fast-tagsoup" = dontDistribute super."fast-tagsoup"; + "fast-tagsoup-utf8-only" = dontDistribute super."fast-tagsoup-utf8-only"; + "fasta" = dontDistribute super."fasta"; + "fastbayes" = dontDistribute super."fastbayes"; + "fastcgi" = dontDistribute super."fastcgi"; + "fastedit" = dontDistribute super."fastedit"; + "fastirc" = dontDistribute super."fastirc"; + "fault-tree" = dontDistribute super."fault-tree"; + "fay-geoposition" = dontDistribute super."fay-geoposition"; + "fay-hsx" = dontDistribute super."fay-hsx"; + "fay-ref" = dontDistribute super."fay-ref"; + "fca" = dontDistribute super."fca"; + "fcd" = dontDistribute super."fcd"; + "fckeditor" = dontDistribute super."fckeditor"; + "fclabels-monadlib" = dontDistribute super."fclabels-monadlib"; + "fdo-trash" = dontDistribute super."fdo-trash"; + "fec" = dontDistribute super."fec"; + "fedora-packages" = dontDistribute super."fedora-packages"; + "feed-cli" = dontDistribute super."feed-cli"; + "feed-collect" = dontDistribute super."feed-collect"; + "feed-crawl" = dontDistribute super."feed-crawl"; + "feed-translator" = dontDistribute super."feed-translator"; + "feed2lj" = dontDistribute super."feed2lj"; + "feed2twitter" = dontDistribute super."feed2twitter"; + "feldspar-compiler" = dontDistribute super."feldspar-compiler"; + "feldspar-language" = dontDistribute super."feldspar-language"; + "feldspar-signal" = dontDistribute super."feldspar-signal"; + "fen2s" = dontDistribute super."fen2s"; + "fences" = dontDistribute super."fences"; + "fenfire" = dontDistribute super."fenfire"; + "fez-conf" = dontDistribute super."fez-conf"; + "ffeed" = dontDistribute super."ffeed"; + "fficxx" = dontDistribute super."fficxx"; + "fficxx-runtime" = dontDistribute super."fficxx-runtime"; + "ffmpeg-light" = dontDistribute super."ffmpeg-light"; + "ffmpeg-tutorials" = dontDistribute super."ffmpeg-tutorials"; + "fft" = dontDistribute super."fft"; + "fftwRaw" = dontDistribute super."fftwRaw"; + "fgl-arbitrary" = dontDistribute super."fgl-arbitrary"; + "fgl-extras-decompositions" = dontDistribute super."fgl-extras-decompositions"; + "fgl-visualize" = dontDistribute super."fgl-visualize"; + "fibon" = dontDistribute super."fibon"; + "fibonacci" = dontDistribute super."fibonacci"; + "fields" = dontDistribute super."fields"; + "fields-json" = dontDistribute super."fields-json"; + "fieldwise" = dontDistribute super."fieldwise"; + "fig" = dontDistribute super."fig"; + "file-collection" = dontDistribute super."file-collection"; + "file-command-qq" = dontDistribute super."file-command-qq"; + "filecache" = dontDistribute super."filecache"; + "filediff" = dontDistribute super."filediff"; + "filepath-io-access" = dontDistribute super."filepath-io-access"; + "filepather" = dontDistribute super."filepather"; + "filestore" = dontDistribute super."filestore"; + "filesystem-conduit" = dontDistribute super."filesystem-conduit"; + "filesystem-enumerator" = dontDistribute super."filesystem-enumerator"; + "filesystem-trees" = dontDistribute super."filesystem-trees"; + "filtrable" = dontDistribute super."filtrable"; + "final" = dontDistribute super."final"; + "find-conduit" = dontDistribute super."find-conduit"; + "fingertree-tf" = dontDistribute super."fingertree-tf"; + "finite-field" = dontDistribute super."finite-field"; + "finite-typelits" = dontDistribute super."finite-typelits"; + "first-and-last" = dontDistribute super."first-and-last"; + "first-class-patterns" = dontDistribute super."first-class-patterns"; + "firstify" = dontDistribute super."firstify"; + "fishfood" = dontDistribute super."fishfood"; + "fit" = dontDistribute super."fit"; + "fitsio" = dontDistribute super."fitsio"; + "fix-imports" = dontDistribute super."fix-imports"; + "fix-parser-simple" = dontDistribute super."fix-parser-simple"; + "fix-symbols-gitit" = dontDistribute super."fix-symbols-gitit"; + "fixed-length" = dontDistribute super."fixed-length"; + "fixed-point" = dontDistribute super."fixed-point"; + "fixed-point-vector" = dontDistribute super."fixed-point-vector"; + "fixed-point-vector-space" = dontDistribute super."fixed-point-vector-space"; + "fixed-precision" = dontDistribute super."fixed-precision"; + "fixed-storable-array" = dontDistribute super."fixed-storable-array"; + "fixed-vector-binary" = dontDistribute super."fixed-vector-binary"; + "fixed-vector-cereal" = dontDistribute super."fixed-vector-cereal"; + "fixedprec" = dontDistribute super."fixedprec"; + "fixedwidth-hs" = dontDistribute super."fixedwidth-hs"; + "fixhs" = dontDistribute super."fixhs"; + "fixplate" = dontDistribute super."fixplate"; + "fixpoint" = dontDistribute super."fixpoint"; + "fixtime" = dontDistribute super."fixtime"; + "fizz-buzz" = dontDistribute super."fizz-buzz"; + "flaccuraterip" = dontDistribute super."flaccuraterip"; + "flamethrower" = dontDistribute super."flamethrower"; + "flamingra" = dontDistribute super."flamingra"; + "flat-mcmc" = dontDistribute super."flat-mcmc"; + "flat-tex" = dontDistribute super."flat-tex"; + "flexible-time" = dontDistribute super."flexible-time"; + "flexible-unlit" = dontDistribute super."flexible-unlit"; + "flexiwrap" = dontDistribute super."flexiwrap"; + "flexiwrap-smallcheck" = dontDistribute super."flexiwrap-smallcheck"; + "flickr" = dontDistribute super."flickr"; + "flippers" = dontDistribute super."flippers"; + "flite" = dontDistribute super."flite"; + "flo" = dontDistribute super."flo"; + "float-binstring" = dontDistribute super."float-binstring"; + "floating-bits" = dontDistribute super."floating-bits"; + "floatshow" = dontDistribute super."floatshow"; + "flow2dot" = dontDistribute super."flow2dot"; + "flowdock-api" = dontDistribute super."flowdock-api"; + "flowdock-rest" = dontDistribute super."flowdock-rest"; + "flower" = dontDistribute super."flower"; + "flowlocks-framework" = dontDistribute super."flowlocks-framework"; + "flowsim" = dontDistribute super."flowsim"; + "fltkhs" = dontDistribute super."fltkhs"; + "fltkhs-fluid-examples" = dontDistribute super."fltkhs-fluid-examples"; + "fluent-logger" = dontDistribute super."fluent-logger"; + "fluent-logger-conduit" = dontDistribute super."fluent-logger-conduit"; + "fluidsynth" = dontDistribute super."fluidsynth"; + "fmark" = dontDistribute super."fmark"; + "fn" = dontDistribute super."fn"; + "fn-extra" = dontDistribute super."fn-extra"; + "fold-debounce" = dontDistribute super."fold-debounce"; + "fold-debounce-conduit" = dontDistribute super."fold-debounce-conduit"; + "foldl-incremental" = dontDistribute super."foldl-incremental"; + "foldl-transduce" = dontDistribute super."foldl-transduce"; + "foldl-transduce-attoparsec" = dontDistribute super."foldl-transduce-attoparsec"; + "folds" = dontDistribute super."folds"; + "folds-common" = dontDistribute super."folds-common"; + "follower" = dontDistribute super."follower"; + "foma" = dontDistribute super."foma"; + "font-opengl-basic4x6" = dontDistribute super."font-opengl-basic4x6"; + "foo" = dontDistribute super."foo"; + "for-free" = dontDistribute super."for-free"; + "forbidden-fruit" = dontDistribute super."forbidden-fruit"; + "fordo" = dontDistribute super."fordo"; + "forecast-io" = dontDistribute super."forecast-io"; + "foreign-storable-asymmetric" = dontDistribute super."foreign-storable-asymmetric"; + "foreign-var" = dontDistribute super."foreign-var"; + "forger" = dontDistribute super."forger"; + "forkable-monad" = dontDistribute super."forkable-monad"; + "formal" = dontDistribute super."formal"; + "format" = dontDistribute super."format"; + "format-status" = dontDistribute super."format-status"; + "formattable" = dontDistribute super."formattable"; + "forml" = dontDistribute super."forml"; + "formlets" = dontDistribute super."formlets"; + "formlets-hsp" = dontDistribute super."formlets-hsp"; + "forth-hll" = dontDistribute super."forth-hll"; + "fountain" = dontDistribute super."fountain"; + "fpco-api" = dontDistribute super."fpco-api"; + "fpipe" = dontDistribute super."fpipe"; + "fpnla" = dontDistribute super."fpnla"; + "fpnla-examples" = dontDistribute super."fpnla-examples"; + "fptest" = dontDistribute super."fptest"; + "fquery" = dontDistribute super."fquery"; + "fractal" = dontDistribute super."fractal"; + "fractals" = dontDistribute super."fractals"; + "fraction" = dontDistribute super."fraction"; + "frag" = dontDistribute super."frag"; + "frame" = dontDistribute super."frame"; + "frame-markdown" = dontDistribute super."frame-markdown"; + "franchise" = dontDistribute super."franchise"; + "free-functors" = dontDistribute super."free-functors"; + "free-game" = dontDistribute super."free-game"; + "free-http" = dontDistribute super."free-http"; + "free-operational" = dontDistribute super."free-operational"; + "free-theorems" = dontDistribute super."free-theorems"; + "free-theorems-counterexamples" = dontDistribute super."free-theorems-counterexamples"; + "free-theorems-seq" = dontDistribute super."free-theorems-seq"; + "free-theorems-seq-webui" = dontDistribute super."free-theorems-seq-webui"; + "free-theorems-webui" = dontDistribute super."free-theorems-webui"; + "freekick2" = dontDistribute super."freekick2"; + "freenect" = doDistribute super."freenect_1_2"; + "freer" = dontDistribute super."freer"; + "freesect" = dontDistribute super."freesect"; + "freesound" = dontDistribute super."freesound"; + "freetype-simple" = dontDistribute super."freetype-simple"; + "freetype2" = dontDistribute super."freetype2"; + "fresh" = dontDistribute super."fresh"; + "friday" = dontDistribute super."friday"; + "friday-devil" = dontDistribute super."friday-devil"; + "friday-juicypixels" = dontDistribute super."friday-juicypixels"; + "friendly-time" = dontDistribute super."friendly-time"; + "frp-arduino" = dontDistribute super."frp-arduino"; + "frpnow" = dontDistribute super."frpnow"; + "frpnow-gloss" = dontDistribute super."frpnow-gloss"; + "frpnow-gtk" = dontDistribute super."frpnow-gtk"; + "frquotes" = dontDistribute super."frquotes"; + "fs-events" = dontDistribute super."fs-events"; + "fsharp" = dontDistribute super."fsharp"; + "fsmActions" = dontDistribute super."fsmActions"; + "fst" = dontDistribute super."fst"; + "fsutils" = dontDistribute super."fsutils"; + "fswatcher" = dontDistribute super."fswatcher"; + "ftdi" = dontDistribute super."ftdi"; + "ftp-conduit" = dontDistribute super."ftp-conduit"; + "ftphs" = dontDistribute super."ftphs"; + "ftree" = dontDistribute super."ftree"; + "ftshell" = dontDistribute super."ftshell"; + "fugue" = dontDistribute super."fugue"; + "full-sessions" = dontDistribute super."full-sessions"; + "full-text-search" = dontDistribute super."full-text-search"; + "fullstop" = dontDistribute super."fullstop"; + "funbot" = dontDistribute super."funbot"; + "funbot-client" = dontDistribute super."funbot-client"; + "funbot-ext-events" = dontDistribute super."funbot-ext-events"; + "funbot-git-hook" = dontDistribute super."funbot-git-hook"; + "funcmp" = dontDistribute super."funcmp"; + "function-combine" = dontDistribute super."function-combine"; + "function-instances-algebra" = dontDistribute super."function-instances-algebra"; + "functional-arrow" = dontDistribute super."functional-arrow"; + "functor-apply" = dontDistribute super."functor-apply"; + "functor-combo" = dontDistribute super."functor-combo"; + "functor-infix" = dontDistribute super."functor-infix"; + "functor-monadic" = dontDistribute super."functor-monadic"; + "functorm" = dontDistribute super."functorm"; + "functors" = dontDistribute super."functors"; + "funion" = dontDistribute super."funion"; + "funpat" = dontDistribute super."funpat"; + "funsat" = dontDistribute super."funsat"; + "fusion" = dontDistribute super."fusion"; + "futun" = dontDistribute super."futun"; + "future" = dontDistribute super."future"; + "future-resource" = dontDistribute super."future-resource"; + "fuzzy" = dontDistribute super."fuzzy"; + "fuzzy-timings" = dontDistribute super."fuzzy-timings"; + "fuzzytime" = dontDistribute super."fuzzytime"; + "fwgl" = dontDistribute super."fwgl"; + "fwgl-glfw" = dontDistribute super."fwgl-glfw"; + "fwgl-javascript" = dontDistribute super."fwgl-javascript"; + "g-npm" = dontDistribute super."g-npm"; + "gact" = dontDistribute super."gact"; + "game-of-life" = dontDistribute super."game-of-life"; + "game-probability" = dontDistribute super."game-probability"; + "game-tree" = dontDistribute super."game-tree"; + "gameclock" = dontDistribute super."gameclock"; + "gamma" = dontDistribute super."gamma"; + "gang-of-threads" = dontDistribute super."gang-of-threads"; + "garepinoh" = dontDistribute super."garepinoh"; + "garsia-wachs" = dontDistribute super."garsia-wachs"; + "gbu" = dontDistribute super."gbu"; + "gc" = dontDistribute super."gc"; + "gc-monitoring-wai" = dontDistribute super."gc-monitoring-wai"; + "gconf" = dontDistribute super."gconf"; + "gdiff" = dontDistribute super."gdiff"; + "gdiff-ig" = dontDistribute super."gdiff-ig"; + "gdiff-th" = dontDistribute super."gdiff-th"; + "gearbox" = dontDistribute super."gearbox"; + "geek" = dontDistribute super."geek"; + "geek-server" = dontDistribute super."geek-server"; + "gelatin" = dontDistribute super."gelatin"; + "gemstone" = dontDistribute super."gemstone"; + "gencheck" = dontDistribute super."gencheck"; + "gender" = dontDistribute super."gender"; + "genders" = dontDistribute super."genders"; + "general-prelude" = dontDistribute super."general-prelude"; + "generator" = dontDistribute super."generator"; + "generators" = dontDistribute super."generators"; + "generic-accessors" = dontDistribute super."generic-accessors"; + "generic-binary" = dontDistribute super."generic-binary"; + "generic-church" = dontDistribute super."generic-church"; + "generic-deepseq" = dontDistribute super."generic-deepseq"; + "generic-lucid-scaffold" = dontDistribute super."generic-lucid-scaffold"; + "generic-maybe" = dontDistribute super."generic-maybe"; + "generic-pretty" = dontDistribute super."generic-pretty"; + "generic-server" = dontDistribute super."generic-server"; + "generic-storable" = dontDistribute super."generic-storable"; + "generic-tree" = dontDistribute super."generic-tree"; + "generic-trie" = dontDistribute super."generic-trie"; + "generic-xml" = dontDistribute super."generic-xml"; + "generics-sop" = doDistribute super."generics-sop_0_1_1_2"; + "genericserialize" = dontDistribute super."genericserialize"; + "genetics" = dontDistribute super."genetics"; + "geni-gui" = dontDistribute super."geni-gui"; + "geni-util" = dontDistribute super."geni-util"; + "geniconvert" = dontDistribute super."geniconvert"; + "genifunctors" = dontDistribute super."genifunctors"; + "geniplate" = dontDistribute super."geniplate"; + "geniserver" = dontDistribute super."geniserver"; + "genprog" = dontDistribute super."genprog"; + "gentlemark" = dontDistribute super."gentlemark"; + "geo-resolver" = dontDistribute super."geo-resolver"; + "geocalc" = dontDistribute super."geocalc"; + "geocode-google" = dontDistribute super."geocode-google"; + "geodetic" = dontDistribute super."geodetic"; + "geodetics" = dontDistribute super."geodetics"; + "geohash" = dontDistribute super."geohash"; + "geoip2" = dontDistribute super."geoip2"; + "geojson" = dontDistribute super."geojson"; + "geom2d" = dontDistribute super."geom2d"; + "getemx" = dontDistribute super."getemx"; + "getflag" = dontDistribute super."getflag"; + "getopt-generics" = doDistribute super."getopt-generics_0_10_0_1"; + "getopt-simple" = dontDistribute super."getopt-simple"; + "gf" = dontDistribute super."gf"; + "ggtsTC" = dontDistribute super."ggtsTC"; + "ghc-core" = dontDistribute super."ghc-core"; + "ghc-core-html" = dontDistribute super."ghc-core-html"; + "ghc-datasize" = dontDistribute super."ghc-datasize"; + "ghc-dup" = dontDistribute super."ghc-dup"; + "ghc-events-analyze" = dontDistribute super."ghc-events-analyze"; + "ghc-events-parallel" = dontDistribute super."ghc-events-parallel"; + "ghc-exactprint" = dontDistribute super."ghc-exactprint"; + "ghc-gc-tune" = dontDistribute super."ghc-gc-tune"; + "ghc-generic-instances" = dontDistribute super."ghc-generic-instances"; + "ghc-heap-view" = dontDistribute super."ghc-heap-view"; + "ghc-imported-from" = dontDistribute super."ghc-imported-from"; + "ghc-make" = dontDistribute super."ghc-make"; + "ghc-man-completion" = dontDistribute super."ghc-man-completion"; + "ghc-mod" = dontDistribute super."ghc-mod"; + "ghc-parmake" = dontDistribute super."ghc-parmake"; + "ghc-pkg-autofix" = dontDistribute super."ghc-pkg-autofix"; + "ghc-pkg-lib" = dontDistribute super."ghc-pkg-lib"; + "ghc-prof-flamegraph" = dontDistribute super."ghc-prof-flamegraph"; + "ghc-server" = dontDistribute super."ghc-server"; + "ghc-simple" = dontDistribute super."ghc-simple"; + "ghc-srcspan-plugin" = dontDistribute super."ghc-srcspan-plugin"; + "ghc-syb" = dontDistribute super."ghc-syb"; + "ghc-time-alloc-prof" = dontDistribute super."ghc-time-alloc-prof"; + "ghc-typelits-extra" = dontDistribute super."ghc-typelits-extra"; + "ghc-vis" = dontDistribute super."ghc-vis"; + "ghci-diagrams" = dontDistribute super."ghci-diagrams"; + "ghci-haskeline" = dontDistribute super."ghci-haskeline"; + "ghci-lib" = dontDistribute super."ghci-lib"; + "ghci-ng" = dontDistribute super."ghci-ng"; + "ghci-pretty" = dontDistribute super."ghci-pretty"; + "ghcjs-codemirror" = dontDistribute super."ghcjs-codemirror"; + "ghcjs-dom" = dontDistribute super."ghcjs-dom"; + "ghcjs-dom-hello" = dontDistribute super."ghcjs-dom-hello"; + "ghcjs-websockets" = dontDistribute super."ghcjs-websockets"; + "ghclive" = dontDistribute super."ghclive"; + "ghczdecode" = dontDistribute super."ghczdecode"; + "ght" = dontDistribute super."ght"; + "gi-atk" = dontDistribute super."gi-atk"; + "gi-cairo" = dontDistribute super."gi-cairo"; + "gi-gdk" = dontDistribute super."gi-gdk"; + "gi-gdkpixbuf" = dontDistribute super."gi-gdkpixbuf"; + "gi-gio" = dontDistribute super."gi-gio"; + "gi-glib" = dontDistribute super."gi-glib"; + "gi-gobject" = dontDistribute super."gi-gobject"; + "gi-gtk" = dontDistribute super."gi-gtk"; + "gi-javascriptcore" = dontDistribute super."gi-javascriptcore"; + "gi-notify" = dontDistribute super."gi-notify"; + "gi-pango" = dontDistribute super."gi-pango"; + "gi-soup" = dontDistribute super."gi-soup"; + "gi-vte" = dontDistribute super."gi-vte"; + "gi-webkit" = dontDistribute super."gi-webkit"; + "gimlh" = dontDistribute super."gimlh"; + "ginger" = dontDistribute super."ginger"; + "ginsu" = dontDistribute super."ginsu"; + "gipeda" = doDistribute super."gipeda_0_1_2_1"; + "gist" = dontDistribute super."gist"; + "git-all" = dontDistribute super."git-all"; + "git-annex" = doDistribute super."git-annex_5_20150727"; + "git-checklist" = dontDistribute super."git-checklist"; + "git-date" = dontDistribute super."git-date"; + "git-embed" = dontDistribute super."git-embed"; + "git-freq" = dontDistribute super."git-freq"; + "git-gpush" = dontDistribute super."git-gpush"; + "git-jump" = dontDistribute super."git-jump"; + "git-monitor" = dontDistribute super."git-monitor"; + "git-object" = dontDistribute super."git-object"; + "git-repair" = dontDistribute super."git-repair"; + "git-sanity" = dontDistribute super."git-sanity"; + "git-vogue" = dontDistribute super."git-vogue"; + "gitcache" = dontDistribute super."gitcache"; + "gitdo" = dontDistribute super."gitdo"; + "github" = dontDistribute super."github"; + "github-backup" = dontDistribute super."github-backup"; + "github-post-receive" = dontDistribute super."github-post-receive"; + "github-types" = dontDistribute super."github-types"; + "github-utils" = dontDistribute super."github-utils"; + "github-webhook-handler" = dontDistribute super."github-webhook-handler"; + "github-webhook-handler-snap" = dontDistribute super."github-webhook-handler-snap"; + "gitignore" = dontDistribute super."gitignore"; + "gitit" = dontDistribute super."gitit"; + "gitlib-cmdline" = dontDistribute super."gitlib-cmdline"; + "gitlib-cross" = dontDistribute super."gitlib-cross"; + "gitlib-s3" = dontDistribute super."gitlib-s3"; + "gitlib-sample" = dontDistribute super."gitlib-sample"; + "gitlib-utils" = dontDistribute super."gitlib-utils"; + "gl-capture" = dontDistribute super."gl-capture"; + "glade" = dontDistribute super."glade"; + "gladexml-accessor" = dontDistribute super."gladexml-accessor"; + "glambda" = dontDistribute super."glambda"; + "glapp" = dontDistribute super."glapp"; + "glasso" = dontDistribute super."glasso"; + "glider-nlp" = dontDistribute super."glider-nlp"; + "glintcollider" = dontDistribute super."glintcollider"; + "gll" = dontDistribute super."gll"; + "global" = dontDistribute super."global"; + "global-config" = dontDistribute super."global-config"; + "global-lock" = dontDistribute super."global-lock"; + "global-variables" = dontDistribute super."global-variables"; + "glome-hs" = dontDistribute super."glome-hs"; + "gloss" = dontDistribute super."gloss"; + "gloss-accelerate" = dontDistribute super."gloss-accelerate"; + "gloss-algorithms" = dontDistribute super."gloss-algorithms"; + "gloss-banana" = dontDistribute super."gloss-banana"; + "gloss-devil" = dontDistribute super."gloss-devil"; + "gloss-examples" = dontDistribute super."gloss-examples"; + "gloss-game" = dontDistribute super."gloss-game"; + "gloss-juicy" = dontDistribute super."gloss-juicy"; + "gloss-raster" = dontDistribute super."gloss-raster"; + "gloss-raster-accelerate" = dontDistribute super."gloss-raster-accelerate"; + "gloss-rendering" = dontDistribute super."gloss-rendering"; + "gloss-sodium" = dontDistribute super."gloss-sodium"; + "glpk-hs" = dontDistribute super."glpk-hs"; + "glue" = dontDistribute super."glue"; + "glue-common" = dontDistribute super."glue-common"; + "glue-core" = dontDistribute super."glue-core"; + "glue-ekg" = dontDistribute super."glue-ekg"; + "glue-example" = dontDistribute super."glue-example"; + "gluturtle" = dontDistribute super."gluturtle"; + "gmap" = dontDistribute super."gmap"; + "gmndl" = dontDistribute super."gmndl"; + "gnome-desktop" = dontDistribute super."gnome-desktop"; + "gnome-keyring" = dontDistribute super."gnome-keyring"; + "gnomevfs" = dontDistribute super."gnomevfs"; + "gnuplot" = dontDistribute super."gnuplot"; + "goa" = dontDistribute super."goa"; + "goatee" = dontDistribute super."goatee"; + "goatee-gtk" = dontDistribute super."goatee-gtk"; + "gofer-prelude" = dontDistribute super."gofer-prelude"; + "gogol" = dontDistribute super."gogol"; + "gogol-adexchange-buyer" = dontDistribute super."gogol-adexchange-buyer"; + "gogol-adexchange-seller" = dontDistribute super."gogol-adexchange-seller"; + "gogol-admin-datatransfer" = dontDistribute super."gogol-admin-datatransfer"; + "gogol-admin-directory" = dontDistribute super."gogol-admin-directory"; + "gogol-admin-emailmigration" = dontDistribute super."gogol-admin-emailmigration"; + "gogol-admin-reports" = dontDistribute super."gogol-admin-reports"; + "gogol-adsense" = dontDistribute super."gogol-adsense"; + "gogol-adsense-host" = dontDistribute super."gogol-adsense-host"; + "gogol-affiliates" = dontDistribute super."gogol-affiliates"; + "gogol-analytics" = dontDistribute super."gogol-analytics"; + "gogol-android-enterprise" = dontDistribute super."gogol-android-enterprise"; + "gogol-android-publisher" = dontDistribute super."gogol-android-publisher"; + "gogol-appengine" = dontDistribute super."gogol-appengine"; + "gogol-apps-activity" = dontDistribute super."gogol-apps-activity"; + "gogol-apps-calendar" = dontDistribute super."gogol-apps-calendar"; + "gogol-apps-licensing" = dontDistribute super."gogol-apps-licensing"; + "gogol-apps-reseller" = dontDistribute super."gogol-apps-reseller"; + "gogol-apps-tasks" = dontDistribute super."gogol-apps-tasks"; + "gogol-appstate" = dontDistribute super."gogol-appstate"; + "gogol-autoscaler" = dontDistribute super."gogol-autoscaler"; + "gogol-bigquery" = dontDistribute super."gogol-bigquery"; + "gogol-billing" = dontDistribute super."gogol-billing"; + "gogol-blogger" = dontDistribute super."gogol-blogger"; + "gogol-books" = dontDistribute super."gogol-books"; + "gogol-civicinfo" = dontDistribute super."gogol-civicinfo"; + "gogol-classroom" = dontDistribute super."gogol-classroom"; + "gogol-cloudtrace" = dontDistribute super."gogol-cloudtrace"; + "gogol-compute" = dontDistribute super."gogol-compute"; + "gogol-container" = dontDistribute super."gogol-container"; + "gogol-core" = dontDistribute super."gogol-core"; + "gogol-customsearch" = dontDistribute super."gogol-customsearch"; + "gogol-dataflow" = dontDistribute super."gogol-dataflow"; + "gogol-datastore" = dontDistribute super."gogol-datastore"; + "gogol-debugger" = dontDistribute super."gogol-debugger"; + "gogol-deploymentmanager" = dontDistribute super."gogol-deploymentmanager"; + "gogol-dfareporting" = dontDistribute super."gogol-dfareporting"; + "gogol-discovery" = dontDistribute super."gogol-discovery"; + "gogol-dns" = dontDistribute super."gogol-dns"; + "gogol-doubleclick-bids" = dontDistribute super."gogol-doubleclick-bids"; + "gogol-doubleclick-search" = dontDistribute super."gogol-doubleclick-search"; + "gogol-drive" = dontDistribute super."gogol-drive"; + "gogol-fitness" = dontDistribute super."gogol-fitness"; + "gogol-fonts" = dontDistribute super."gogol-fonts"; + "gogol-freebasesearch" = dontDistribute super."gogol-freebasesearch"; + "gogol-fusiontables" = dontDistribute super."gogol-fusiontables"; + "gogol-games" = dontDistribute super."gogol-games"; + "gogol-games-configuration" = dontDistribute super."gogol-games-configuration"; + "gogol-games-management" = dontDistribute super."gogol-games-management"; + "gogol-genomics" = dontDistribute super."gogol-genomics"; + "gogol-gmail" = dontDistribute super."gogol-gmail"; + "gogol-groups-migration" = dontDistribute super."gogol-groups-migration"; + "gogol-groups-settings" = dontDistribute super."gogol-groups-settings"; + "gogol-identity-toolkit" = dontDistribute super."gogol-identity-toolkit"; + "gogol-latencytest" = dontDistribute super."gogol-latencytest"; + "gogol-logging" = dontDistribute super."gogol-logging"; + "gogol-maps-coordinate" = dontDistribute super."gogol-maps-coordinate"; + "gogol-maps-engine" = dontDistribute super."gogol-maps-engine"; + "gogol-mirror" = dontDistribute super."gogol-mirror"; + "gogol-monitoring" = dontDistribute super."gogol-monitoring"; + "gogol-oauth2" = dontDistribute super."gogol-oauth2"; + "gogol-pagespeed" = dontDistribute super."gogol-pagespeed"; + "gogol-partners" = dontDistribute super."gogol-partners"; + "gogol-play-moviespartner" = dontDistribute super."gogol-play-moviespartner"; + "gogol-plus" = dontDistribute super."gogol-plus"; + "gogol-plus-domains" = dontDistribute super."gogol-plus-domains"; + "gogol-prediction" = dontDistribute super."gogol-prediction"; + "gogol-proximitybeacon" = dontDistribute super."gogol-proximitybeacon"; + "gogol-pubsub" = dontDistribute super."gogol-pubsub"; + "gogol-qpxexpress" = dontDistribute super."gogol-qpxexpress"; + "gogol-replicapool" = dontDistribute super."gogol-replicapool"; + "gogol-replicapool-updater" = dontDistribute super."gogol-replicapool-updater"; + "gogol-resourcemanager" = dontDistribute super."gogol-resourcemanager"; + "gogol-resourceviews" = dontDistribute super."gogol-resourceviews"; + "gogol-shopping-content" = dontDistribute super."gogol-shopping-content"; + "gogol-siteverification" = dontDistribute super."gogol-siteverification"; + "gogol-spectrum" = dontDistribute super."gogol-spectrum"; + "gogol-sqladmin" = dontDistribute super."gogol-sqladmin"; + "gogol-storage" = dontDistribute super."gogol-storage"; + "gogol-storage-transfer" = dontDistribute super."gogol-storage-transfer"; + "gogol-tagmanager" = dontDistribute super."gogol-tagmanager"; + "gogol-taskqueue" = dontDistribute super."gogol-taskqueue"; + "gogol-translate" = dontDistribute super."gogol-translate"; + "gogol-urlshortener" = dontDistribute super."gogol-urlshortener"; + "gogol-useraccounts" = dontDistribute super."gogol-useraccounts"; + "gogol-webmaster-tools" = dontDistribute super."gogol-webmaster-tools"; + "gogol-youtube" = dontDistribute super."gogol-youtube"; + "gogol-youtube-analytics" = dontDistribute super."gogol-youtube-analytics"; + "gogol-youtube-reporting" = dontDistribute super."gogol-youtube-reporting"; + "gooey" = dontDistribute super."gooey"; + "google-cloud" = dontDistribute super."google-cloud"; + "google-dictionary" = dontDistribute super."google-dictionary"; + "google-drive" = dontDistribute super."google-drive"; + "google-html5-slide" = dontDistribute super."google-html5-slide"; + "google-mail-filters" = dontDistribute super."google-mail-filters"; + "google-oauth2" = dontDistribute super."google-oauth2"; + "google-search" = dontDistribute super."google-search"; + "google-translate" = dontDistribute super."google-translate"; + "googleplus" = dontDistribute super."googleplus"; + "googlepolyline" = dontDistribute super."googlepolyline"; + "gopherbot" = dontDistribute super."gopherbot"; + "gpah" = dontDistribute super."gpah"; + "gpcsets" = dontDistribute super."gpcsets"; + "gpolyline" = dontDistribute super."gpolyline"; + "gps" = dontDistribute super."gps"; + "gps2htmlReport" = dontDistribute super."gps2htmlReport"; + "gpx-conduit" = dontDistribute super."gpx-conduit"; + "graceful" = dontDistribute super."graceful"; + "grammar-combinators" = dontDistribute super."grammar-combinators"; + "grapefruit-examples" = dontDistribute super."grapefruit-examples"; + "grapefruit-frp" = dontDistribute super."grapefruit-frp"; + "grapefruit-records" = dontDistribute super."grapefruit-records"; + "grapefruit-ui" = dontDistribute super."grapefruit-ui"; + "grapefruit-ui-gtk" = dontDistribute super."grapefruit-ui-gtk"; + "graph-generators" = dontDistribute super."graph-generators"; + "graph-matchings" = dontDistribute super."graph-matchings"; + "graph-rewriting" = dontDistribute super."graph-rewriting"; + "graph-rewriting-cl" = dontDistribute super."graph-rewriting-cl"; + "graph-rewriting-gl" = dontDistribute super."graph-rewriting-gl"; + "graph-rewriting-lambdascope" = dontDistribute super."graph-rewriting-lambdascope"; + "graph-rewriting-layout" = dontDistribute super."graph-rewriting-layout"; + "graph-rewriting-ski" = dontDistribute super."graph-rewriting-ski"; + "graph-rewriting-strategies" = dontDistribute super."graph-rewriting-strategies"; + "graph-rewriting-trs" = dontDistribute super."graph-rewriting-trs"; + "graph-rewriting-ww" = dontDistribute super."graph-rewriting-ww"; + "graph-serialize" = dontDistribute super."graph-serialize"; + "graph-utils" = dontDistribute super."graph-utils"; + "graph-visit" = dontDistribute super."graph-visit"; + "graphbuilder" = dontDistribute super."graphbuilder"; + "graphene" = dontDistribute super."graphene"; + "graphics-drawingcombinators" = dontDistribute super."graphics-drawingcombinators"; + "graphics-formats-collada" = dontDistribute super."graphics-formats-collada"; + "graphicsFormats" = dontDistribute super."graphicsFormats"; + "graphicstools" = dontDistribute super."graphicstools"; + "graphmod" = dontDistribute super."graphmod"; + "graphql" = dontDistribute super."graphql"; + "graphtype" = dontDistribute super."graphtype"; + "graphviz" = dontDistribute super."graphviz"; + "gray-code" = dontDistribute super."gray-code"; + "gray-extended" = dontDistribute super."gray-extended"; + "greencard" = dontDistribute super."greencard"; + "greencard-lib" = dontDistribute super."greencard-lib"; + "greg-client" = dontDistribute super."greg-client"; + "grid" = dontDistribute super."grid"; + "gridland" = dontDistribute super."gridland"; + "grm" = dontDistribute super."grm"; + "groom" = dontDistribute super."groom"; + "groundhog-inspector" = dontDistribute super."groundhog-inspector"; + "group-with" = dontDistribute super."group-with"; + "grouped-list" = dontDistribute super."grouped-list"; + "groupoid" = dontDistribute super."groupoid"; + "gruff" = dontDistribute super."gruff"; + "gruff-examples" = dontDistribute super."gruff-examples"; + "gsc-weighting" = dontDistribute super."gsc-weighting"; + "gsl-random" = dontDistribute super."gsl-random"; + "gsl-random-fu" = dontDistribute super."gsl-random-fu"; + "gsmenu" = dontDistribute super."gsmenu"; + "gstreamer" = dontDistribute super."gstreamer"; + "gt-tools" = dontDistribute super."gt-tools"; + "gtfs" = dontDistribute super."gtfs"; + "gtk-helpers" = dontDistribute super."gtk-helpers"; + "gtk-jsinput" = dontDistribute super."gtk-jsinput"; + "gtk-largeTreeStore" = dontDistribute super."gtk-largeTreeStore"; + "gtk-mac-integration" = dontDistribute super."gtk-mac-integration"; + "gtk-serialized-event" = dontDistribute super."gtk-serialized-event"; + "gtk-simple-list-view" = dontDistribute super."gtk-simple-list-view"; + "gtk-toggle-button-list" = dontDistribute super."gtk-toggle-button-list"; + "gtk-toy" = dontDistribute super."gtk-toy"; + "gtk-traymanager" = dontDistribute super."gtk-traymanager"; + "gtk2hs-cast-glade" = dontDistribute super."gtk2hs-cast-glade"; + "gtk2hs-cast-glib" = dontDistribute super."gtk2hs-cast-glib"; + "gtk2hs-cast-gnomevfs" = dontDistribute super."gtk2hs-cast-gnomevfs"; + "gtk2hs-cast-gtk" = dontDistribute super."gtk2hs-cast-gtk"; + "gtk2hs-cast-gtkglext" = dontDistribute super."gtk2hs-cast-gtkglext"; + "gtk2hs-cast-gtksourceview2" = dontDistribute super."gtk2hs-cast-gtksourceview2"; + "gtk2hs-cast-th" = dontDistribute super."gtk2hs-cast-th"; + "gtk2hs-hello" = dontDistribute super."gtk2hs-hello"; + "gtk2hs-rpn" = dontDistribute super."gtk2hs-rpn"; + "gtk3-mac-integration" = dontDistribute super."gtk3-mac-integration"; + "gtkglext" = dontDistribute super."gtkglext"; + "gtkimageview" = dontDistribute super."gtkimageview"; + "gtkrsync" = dontDistribute super."gtkrsync"; + "gtksourceview2" = dontDistribute super."gtksourceview2"; + "gtksourceview3" = dontDistribute super."gtksourceview3"; + "guarded-rewriting" = dontDistribute super."guarded-rewriting"; + "guess-combinator" = dontDistribute super."guess-combinator"; + "gulcii" = dontDistribute super."gulcii"; + "gutenberg-fibonaccis" = dontDistribute super."gutenberg-fibonaccis"; + "gyah-bin" = dontDistribute super."gyah-bin"; + "h-booru" = dontDistribute super."h-booru"; + "h-gpgme" = dontDistribute super."h-gpgme"; + "h2048" = dontDistribute super."h2048"; + "hArduino" = dontDistribute super."hArduino"; + "hBDD" = dontDistribute super."hBDD"; + "hBDD-CMUBDD" = dontDistribute super."hBDD-CMUBDD"; + "hBDD-CUDD" = dontDistribute super."hBDD-CUDD"; + "hCsound" = dontDistribute super."hCsound"; + "hDFA" = dontDistribute super."hDFA"; + "hF2" = dontDistribute super."hF2"; + "hGelf" = dontDistribute super."hGelf"; + "hLLVM" = dontDistribute super."hLLVM"; + "hMollom" = dontDistribute super."hMollom"; + "hOpenPGP" = dontDistribute super."hOpenPGP"; + "hPDB-examples" = dontDistribute super."hPDB-examples"; + "hPushover" = dontDistribute super."hPushover"; + "hR" = dontDistribute super."hR"; + "hRESP" = dontDistribute super."hRESP"; + "hS3" = dontDistribute super."hS3"; + "hSimpleDB" = dontDistribute super."hSimpleDB"; + "hTalos" = dontDistribute super."hTalos"; + "hTensor" = dontDistribute super."hTensor"; + "hVOIDP" = dontDistribute super."hVOIDP"; + "hXmixer" = dontDistribute super."hXmixer"; + "haar" = dontDistribute super."haar"; + "hacanon-light" = dontDistribute super."hacanon-light"; + "hack" = dontDistribute super."hack"; + "hack-contrib" = dontDistribute super."hack-contrib"; + "hack-contrib-press" = dontDistribute super."hack-contrib-press"; + "hack-frontend-happstack" = dontDistribute super."hack-frontend-happstack"; + "hack-frontend-monadcgi" = dontDistribute super."hack-frontend-monadcgi"; + "hack-handler-cgi" = dontDistribute super."hack-handler-cgi"; + "hack-handler-epoll" = dontDistribute super."hack-handler-epoll"; + "hack-handler-evhttp" = dontDistribute super."hack-handler-evhttp"; + "hack-handler-fastcgi" = dontDistribute super."hack-handler-fastcgi"; + "hack-handler-happstack" = dontDistribute super."hack-handler-happstack"; + "hack-handler-hyena" = dontDistribute super."hack-handler-hyena"; + "hack-handler-kibro" = dontDistribute super."hack-handler-kibro"; + "hack-handler-simpleserver" = dontDistribute super."hack-handler-simpleserver"; + "hack-middleware-cleanpath" = dontDistribute super."hack-middleware-cleanpath"; + "hack-middleware-clientsession" = dontDistribute super."hack-middleware-clientsession"; + "hack-middleware-gzip" = dontDistribute super."hack-middleware-gzip"; + "hack-middleware-jsonp" = dontDistribute super."hack-middleware-jsonp"; + "hack2" = dontDistribute super."hack2"; + "hack2-contrib" = dontDistribute super."hack2-contrib"; + "hack2-contrib-extra" = dontDistribute super."hack2-contrib-extra"; + "hack2-handler-happstack-server" = dontDistribute super."hack2-handler-happstack-server"; + "hack2-handler-mongrel2-http" = dontDistribute super."hack2-handler-mongrel2-http"; + "hack2-handler-snap-server" = dontDistribute super."hack2-handler-snap-server"; + "hack2-handler-warp" = dontDistribute super."hack2-handler-warp"; + "hack2-interface-wai" = dontDistribute super."hack2-interface-wai"; + "hackage-diff" = dontDistribute super."hackage-diff"; + "hackage-plot" = dontDistribute super."hackage-plot"; + "hackage-proxy" = dontDistribute super."hackage-proxy"; + "hackage-repo-tool" = dontDistribute super."hackage-repo-tool"; + "hackage-security" = dontDistribute super."hackage-security"; + "hackage-security-HTTP" = dontDistribute super."hackage-security-HTTP"; + "hackage-server" = dontDistribute super."hackage-server"; + "hackage-sparks" = dontDistribute super."hackage-sparks"; + "hackage2hwn" = dontDistribute super."hackage2hwn"; + "hackage2twitter" = dontDistribute super."hackage2twitter"; + "hackager" = dontDistribute super."hackager"; + "hackernews" = dontDistribute super."hackernews"; + "hackertyper" = dontDistribute super."hackertyper"; + "hackmanager" = dontDistribute super."hackmanager"; + "hackport" = dontDistribute super."hackport"; + "hactor" = dontDistribute super."hactor"; + "hactors" = dontDistribute super."hactors"; + "haddock" = dontDistribute super."haddock"; + "haddock-leksah" = dontDistribute super."haddock-leksah"; + "haddocset" = dontDistribute super."haddocset"; + "hadoop-formats" = dontDistribute super."hadoop-formats"; + "hadoop-rpc" = dontDistribute super."hadoop-rpc"; + "hadoop-tools" = dontDistribute super."hadoop-tools"; + "haeredes" = dontDistribute super."haeredes"; + "haggis" = dontDistribute super."haggis"; + "haha" = dontDistribute super."haha"; + "hailgun" = dontDistribute super."hailgun"; + "hailgun-send" = dontDistribute super."hailgun-send"; + "hails" = dontDistribute super."hails"; + "hails-bin" = dontDistribute super."hails-bin"; + "hairy" = dontDistribute super."hairy"; + "hakaru" = dontDistribute super."hakaru"; + "hake" = dontDistribute super."hake"; + "hakismet" = dontDistribute super."hakismet"; + "hako" = dontDistribute super."hako"; + "hakyll-R" = dontDistribute super."hakyll-R"; + "hakyll-agda" = dontDistribute super."hakyll-agda"; + "hakyll-blaze-templates" = dontDistribute super."hakyll-blaze-templates"; + "hakyll-contrib" = dontDistribute super."hakyll-contrib"; + "hakyll-contrib-hyphenation" = dontDistribute super."hakyll-contrib-hyphenation"; + "hakyll-contrib-links" = dontDistribute super."hakyll-contrib-links"; + "hakyll-convert" = dontDistribute super."hakyll-convert"; + "hakyll-elm" = dontDistribute super."hakyll-elm"; + "hakyll-sass" = dontDistribute super."hakyll-sass"; + "halberd" = dontDistribute super."halberd"; + "halfs" = dontDistribute super."halfs"; + "halipeto" = dontDistribute super."halipeto"; + "halive" = dontDistribute super."halive"; + "halma" = dontDistribute super."halma"; + "haltavista" = dontDistribute super."haltavista"; + "hamid" = dontDistribute super."hamid"; + "hampp" = dontDistribute super."hampp"; + "hamtmap" = dontDistribute super."hamtmap"; + "hamusic" = dontDistribute super."hamusic"; + "handa-gdata" = dontDistribute super."handa-gdata"; + "handa-geodata" = dontDistribute super."handa-geodata"; + "handle-like" = dontDistribute super."handle-like"; + "handsy" = dontDistribute super."handsy"; + "hangman" = dontDistribute super."hangman"; + "hannahci" = dontDistribute super."hannahci"; + "hans" = dontDistribute super."hans"; + "hans-pcap" = dontDistribute super."hans-pcap"; + "hans-pfq" = dontDistribute super."hans-pfq"; + "hapistrano" = dontDistribute super."hapistrano"; + "happindicator" = dontDistribute super."happindicator"; + "happindicator3" = dontDistribute super."happindicator3"; + "happraise" = dontDistribute super."happraise"; + "happs-hsp" = dontDistribute super."happs-hsp"; + "happs-hsp-template" = dontDistribute super."happs-hsp-template"; + "happs-tutorial" = dontDistribute super."happs-tutorial"; + "happstack" = dontDistribute super."happstack"; + "happstack-auth" = dontDistribute super."happstack-auth"; + "happstack-authenticate" = dontDistribute super."happstack-authenticate"; + "happstack-clientsession" = dontDistribute super."happstack-clientsession"; + "happstack-contrib" = dontDistribute super."happstack-contrib"; + "happstack-data" = dontDistribute super."happstack-data"; + "happstack-dlg" = dontDistribute super."happstack-dlg"; + "happstack-facebook" = dontDistribute super."happstack-facebook"; + "happstack-fastcgi" = dontDistribute super."happstack-fastcgi"; + "happstack-fay" = dontDistribute super."happstack-fay"; + "happstack-fay-ajax" = dontDistribute super."happstack-fay-ajax"; + "happstack-foundation" = dontDistribute super."happstack-foundation"; + "happstack-hamlet" = dontDistribute super."happstack-hamlet"; + "happstack-heist" = dontDistribute super."happstack-heist"; + "happstack-helpers" = dontDistribute super."happstack-helpers"; + "happstack-hsp" = dontDistribute super."happstack-hsp"; + "happstack-hstringtemplate" = dontDistribute super."happstack-hstringtemplate"; + "happstack-ixset" = dontDistribute super."happstack-ixset"; + "happstack-jmacro" = dontDistribute super."happstack-jmacro"; + "happstack-lite" = dontDistribute super."happstack-lite"; + "happstack-monad-peel" = dontDistribute super."happstack-monad-peel"; + "happstack-plugins" = dontDistribute super."happstack-plugins"; + "happstack-server-tls" = dontDistribute super."happstack-server-tls"; + "happstack-server-tls-cryptonite" = dontDistribute super."happstack-server-tls-cryptonite"; + "happstack-state" = dontDistribute super."happstack-state"; + "happstack-static-routing" = dontDistribute super."happstack-static-routing"; + "happstack-util" = dontDistribute super."happstack-util"; + "happstack-yui" = dontDistribute super."happstack-yui"; + "happy-meta" = dontDistribute super."happy-meta"; + "happybara" = dontDistribute super."happybara"; + "happybara-webkit" = dontDistribute super."happybara-webkit"; + "happybara-webkit-server" = dontDistribute super."happybara-webkit-server"; + "har" = dontDistribute super."har"; + "harchive" = dontDistribute super."harchive"; + "hark" = dontDistribute super."hark"; + "harmony" = dontDistribute super."harmony"; + "haroonga" = dontDistribute super."haroonga"; + "haroonga-httpd" = dontDistribute super."haroonga-httpd"; + "harp" = dontDistribute super."harp"; + "harpy" = dontDistribute super."harpy"; + "has" = dontDistribute super."has"; + "has-th" = dontDistribute super."has-th"; + "hascal" = dontDistribute super."hascal"; + "hascat" = dontDistribute super."hascat"; + "hascat-lib" = dontDistribute super."hascat-lib"; + "hascat-setup" = dontDistribute super."hascat-setup"; + "hascat-system" = dontDistribute super."hascat-system"; + "hash" = dontDistribute super."hash"; + "hashable-generics" = dontDistribute super."hashable-generics"; + "hashable-time" = dontDistribute super."hashable-time"; + "hashabler" = dontDistribute super."hashabler"; + "hashed-storage" = dontDistribute super."hashed-storage"; + "hashids" = dontDistribute super."hashids"; + "hashring" = dontDistribute super."hashring"; + "hashtables-plus" = dontDistribute super."hashtables-plus"; + "hasim" = dontDistribute super."hasim"; + "hask" = dontDistribute super."hask"; + "hask-home" = dontDistribute super."hask-home"; + "haskades" = dontDistribute super."haskades"; + "haskakafka" = dontDistribute super."haskakafka"; + "haskanoid" = dontDistribute super."haskanoid"; + "haskarrow" = dontDistribute super."haskarrow"; + "haskbot-core" = dontDistribute super."haskbot-core"; + "haskdeep" = dontDistribute super."haskdeep"; + "haskdogs" = dontDistribute super."haskdogs"; + "haskeem" = dontDistribute super."haskeem"; + "haskeline" = doDistribute super."haskeline_0_7_2_1"; + "haskeline-class" = dontDistribute super."haskeline-class"; + "haskell-aliyun" = dontDistribute super."haskell-aliyun"; + "haskell-awk" = dontDistribute super."haskell-awk"; + "haskell-bcrypt" = dontDistribute super."haskell-bcrypt"; + "haskell-brainfuck" = dontDistribute super."haskell-brainfuck"; + "haskell-cnc" = dontDistribute super."haskell-cnc"; + "haskell-coffee" = dontDistribute super."haskell-coffee"; + "haskell-compression" = dontDistribute super."haskell-compression"; + "haskell-course-preludes" = dontDistribute super."haskell-course-preludes"; + "haskell-docs" = dontDistribute super."haskell-docs"; + "haskell-exp-parser" = dontDistribute super."haskell-exp-parser"; + "haskell-formatter" = dontDistribute super."haskell-formatter"; + "haskell-ftp" = dontDistribute super."haskell-ftp"; + "haskell-generate" = dontDistribute super."haskell-generate"; + "haskell-gi" = dontDistribute super."haskell-gi"; + "haskell-gi-base" = dontDistribute super."haskell-gi-base"; + "haskell-import-graph" = dontDistribute super."haskell-import-graph"; + "haskell-in-space" = dontDistribute super."haskell-in-space"; + "haskell-modbus" = dontDistribute super."haskell-modbus"; + "haskell-mpi" = dontDistribute super."haskell-mpi"; + "haskell-openflow" = dontDistribute super."haskell-openflow"; + "haskell-pdf-presenter" = dontDistribute super."haskell-pdf-presenter"; + "haskell-platform-test" = dontDistribute super."haskell-platform-test"; + "haskell-plot" = dontDistribute super."haskell-plot"; + "haskell-qrencode" = dontDistribute super."haskell-qrencode"; + "haskell-read-editor" = dontDistribute super."haskell-read-editor"; + "haskell-reflect" = dontDistribute super."haskell-reflect"; + "haskell-rules" = dontDistribute super."haskell-rules"; + "haskell-src-exts-qq" = dontDistribute super."haskell-src-exts-qq"; + "haskell-src-meta-mwotton" = dontDistribute super."haskell-src-meta-mwotton"; + "haskell-token-utils" = dontDistribute super."haskell-token-utils"; + "haskell-type-exts" = dontDistribute super."haskell-type-exts"; + "haskell-typescript" = dontDistribute super."haskell-typescript"; + "haskell-tyrant" = dontDistribute super."haskell-tyrant"; + "haskell-updater" = dontDistribute super."haskell-updater"; + "haskell-xmpp" = dontDistribute super."haskell-xmpp"; + "haskell2010" = dontDistribute super."haskell2010"; + "haskell98" = dontDistribute super."haskell98"; + "haskell98libraries" = dontDistribute super."haskell98libraries"; + "haskelldb" = dontDistribute super."haskelldb"; + "haskelldb-connect-hdbc" = dontDistribute super."haskelldb-connect-hdbc"; + "haskelldb-connect-hdbc-catchio-mtl" = dontDistribute super."haskelldb-connect-hdbc-catchio-mtl"; + "haskelldb-connect-hdbc-catchio-tf" = dontDistribute super."haskelldb-connect-hdbc-catchio-tf"; + "haskelldb-connect-hdbc-catchio-transformers" = dontDistribute super."haskelldb-connect-hdbc-catchio-transformers"; + "haskelldb-connect-hdbc-lifted" = dontDistribute super."haskelldb-connect-hdbc-lifted"; + "haskelldb-dynamic" = dontDistribute super."haskelldb-dynamic"; + "haskelldb-flat" = dontDistribute super."haskelldb-flat"; + "haskelldb-hdbc" = dontDistribute super."haskelldb-hdbc"; + "haskelldb-hdbc-mysql" = dontDistribute super."haskelldb-hdbc-mysql"; + "haskelldb-hdbc-odbc" = dontDistribute super."haskelldb-hdbc-odbc"; + "haskelldb-hdbc-postgresql" = dontDistribute super."haskelldb-hdbc-postgresql"; + "haskelldb-hdbc-sqlite3" = dontDistribute super."haskelldb-hdbc-sqlite3"; + "haskelldb-hsql" = dontDistribute super."haskelldb-hsql"; + "haskelldb-hsql-mysql" = dontDistribute super."haskelldb-hsql-mysql"; + "haskelldb-hsql-odbc" = dontDistribute super."haskelldb-hsql-odbc"; + "haskelldb-hsql-oracle" = dontDistribute super."haskelldb-hsql-oracle"; + "haskelldb-hsql-postgresql" = dontDistribute super."haskelldb-hsql-postgresql"; + "haskelldb-hsql-sqlite" = dontDistribute super."haskelldb-hsql-sqlite"; + "haskelldb-hsql-sqlite3" = dontDistribute super."haskelldb-hsql-sqlite3"; + "haskelldb-th" = dontDistribute super."haskelldb-th"; + "haskelldb-wx" = dontDistribute super."haskelldb-wx"; + "haskellscrabble" = dontDistribute super."haskellscrabble"; + "haskellscript" = dontDistribute super."haskellscript"; + "haskelm" = dontDistribute super."haskelm"; + "haskgame" = dontDistribute super."haskgame"; + "haskheap" = dontDistribute super."haskheap"; + "haskhol-core" = dontDistribute super."haskhol-core"; + "haskintex" = doDistribute super."haskintex_0_5_1_0"; + "haskmon" = dontDistribute super."haskmon"; + "haskoin" = dontDistribute super."haskoin"; + "haskoin-crypto" = dontDistribute super."haskoin-crypto"; + "haskoin-protocol" = dontDistribute super."haskoin-protocol"; + "haskoin-script" = dontDistribute super."haskoin-script"; + "haskoin-util" = dontDistribute super."haskoin-util"; + "haskoin-wallet" = dontDistribute super."haskoin-wallet"; + "haskoon" = dontDistribute super."haskoon"; + "haskoon-httpspec" = dontDistribute super."haskoon-httpspec"; + "haskoon-salvia" = dontDistribute super."haskoon-salvia"; + "haskore" = dontDistribute super."haskore"; + "haskore-realtime" = dontDistribute super."haskore-realtime"; + "haskore-supercollider" = dontDistribute super."haskore-supercollider"; + "haskore-synthesizer" = dontDistribute super."haskore-synthesizer"; + "haskore-vintage" = dontDistribute super."haskore-vintage"; + "hasktags" = dontDistribute super."hasktags"; + "haslo" = dontDistribute super."haslo"; + "hasloGUI" = dontDistribute super."hasloGUI"; + "hasparql-client" = dontDistribute super."hasparql-client"; + "haspell" = dontDistribute super."haspell"; + "hasql-postgres-options" = dontDistribute super."hasql-postgres-options"; + "hastache-aeson" = dontDistribute super."hastache-aeson"; + "haste" = dontDistribute super."haste"; + "haste-compiler" = dontDistribute super."haste-compiler"; + "haste-markup" = dontDistribute super."haste-markup"; + "haste-perch" = dontDistribute super."haste-perch"; + "hastily" = dontDistribute super."hastily"; + "hasty-hamiltonian" = dontDistribute super."hasty-hamiltonian"; + "hat" = dontDistribute super."hat"; + "hatex-guide" = dontDistribute super."hatex-guide"; + "hath" = dontDistribute super."hath"; + "hatt" = dontDistribute super."hatt"; + "haverer" = dontDistribute super."haverer"; + "hawitter" = dontDistribute super."hawitter"; + "haxl" = dontDistribute super."haxl"; + "haxl-facebook" = dontDistribute super."haxl-facebook"; + "haxparse" = dontDistribute super."haxparse"; + "haxr-th" = dontDistribute super."haxr-th"; + "haxy" = dontDistribute super."haxy"; + "hayland" = dontDistribute super."hayland"; + "hayoo-cli" = dontDistribute super."hayoo-cli"; + "hback" = dontDistribute super."hback"; + "hbayes" = dontDistribute super."hbayes"; + "hbb" = dontDistribute super."hbb"; + "hbcd" = dontDistribute super."hbcd"; + "hbeat" = dontDistribute super."hbeat"; + "hblas" = dontDistribute super."hblas"; + "hblock" = dontDistribute super."hblock"; + "hbro" = dontDistribute super."hbro"; + "hbro-contrib" = dontDistribute super."hbro-contrib"; + "hburg" = dontDistribute super."hburg"; + "hcc" = dontDistribute super."hcc"; + "hcg-minus" = dontDistribute super."hcg-minus"; + "hcg-minus-cairo" = dontDistribute super."hcg-minus-cairo"; + "hcheat" = dontDistribute super."hcheat"; + "hchesslib" = dontDistribute super."hchesslib"; + "hcltest" = dontDistribute super."hcltest"; + "hcron" = dontDistribute super."hcron"; + "hcube" = dontDistribute super."hcube"; + "hcwiid" = dontDistribute super."hcwiid"; + "hdaemonize-buildfix" = dontDistribute super."hdaemonize-buildfix"; + "hdbc-aeson" = dontDistribute super."hdbc-aeson"; + "hdbc-postgresql-hstore" = dontDistribute super."hdbc-postgresql-hstore"; + "hdbc-tuple" = dontDistribute super."hdbc-tuple"; + "hdbi" = dontDistribute super."hdbi"; + "hdbi-conduit" = dontDistribute super."hdbi-conduit"; + "hdbi-postgresql" = dontDistribute super."hdbi-postgresql"; + "hdbi-sqlite" = dontDistribute super."hdbi-sqlite"; + "hdbi-tests" = dontDistribute super."hdbi-tests"; + "hdf" = dontDistribute super."hdf"; + "hdigest" = dontDistribute super."hdigest"; + "hdirect" = dontDistribute super."hdirect"; + "hdis86" = dontDistribute super."hdis86"; + "hdiscount" = dontDistribute super."hdiscount"; + "hdm" = dontDistribute super."hdm"; + "hdph" = dontDistribute super."hdph"; + "hdph-closure" = dontDistribute super."hdph-closure"; + "headergen" = dontDistribute super."headergen"; + "heapsort" = dontDistribute super."heapsort"; + "hecc" = dontDistribute super."hecc"; + "hedis-config" = dontDistribute super."hedis-config"; + "hedis-monadic" = dontDistribute super."hedis-monadic"; + "hedis-pile" = dontDistribute super."hedis-pile"; + "hedis-simple" = dontDistribute super."hedis-simple"; + "hedis-tags" = dontDistribute super."hedis-tags"; + "hedn" = dontDistribute super."hedn"; + "hein" = dontDistribute super."hein"; + "heist-aeson" = dontDistribute super."heist-aeson"; + "heist-async" = dontDistribute super."heist-async"; + "helics" = dontDistribute super."helics"; + "helics-wai" = dontDistribute super."helics-wai"; + "helisp" = dontDistribute super."helisp"; + "helium" = dontDistribute super."helium"; + "hell" = dontDistribute super."hell"; + "hellage" = dontDistribute super."hellage"; + "hellnet" = dontDistribute super."hellnet"; + "hello" = dontDistribute super."hello"; + "helm" = dontDistribute super."helm"; + "help-esb" = dontDistribute super."help-esb"; + "hemkay" = dontDistribute super."hemkay"; + "hemkay-core" = dontDistribute super."hemkay-core"; + "hemokit" = dontDistribute super."hemokit"; + "hen" = dontDistribute super."hen"; + "henet" = dontDistribute super."henet"; + "hepevt" = dontDistribute super."hepevt"; + "her-lexer" = dontDistribute super."her-lexer"; + "her-lexer-parsec" = dontDistribute super."her-lexer-parsec"; + "herbalizer" = dontDistribute super."herbalizer"; + "hermit" = dontDistribute super."hermit"; + "hermit-syb" = dontDistribute super."hermit-syb"; + "heroku" = dontDistribute super."heroku"; + "heroku-persistent" = dontDistribute super."heroku-persistent"; + "herringbone" = dontDistribute super."herringbone"; + "herringbone-embed" = dontDistribute super."herringbone-embed"; + "herringbone-wai" = dontDistribute super."herringbone-wai"; + "hesql" = dontDistribute super."hesql"; + "hetero-map" = dontDistribute super."hetero-map"; + "hetris" = dontDistribute super."hetris"; + "heukarya" = dontDistribute super."heukarya"; + "hevolisa" = dontDistribute super."hevolisa"; + "hevolisa-dph" = dontDistribute super."hevolisa-dph"; + "hexdump" = dontDistribute super."hexdump"; + "hexif" = dontDistribute super."hexif"; + "hexpat-iteratee" = dontDistribute super."hexpat-iteratee"; + "hexpat-lens" = dontDistribute super."hexpat-lens"; + "hexpat-pickle" = dontDistribute super."hexpat-pickle"; + "hexpat-pickle-generic" = dontDistribute super."hexpat-pickle-generic"; + "hexpat-tagsoup" = dontDistribute super."hexpat-tagsoup"; + "hexpr" = dontDistribute super."hexpr"; + "hexquote" = dontDistribute super."hexquote"; + "heyefi" = dontDistribute super."heyefi"; + "hfann" = dontDistribute super."hfann"; + "hfd" = dontDistribute super."hfd"; + "hfiar" = dontDistribute super."hfiar"; + "hfmt" = dontDistribute super."hfmt"; + "hfoil" = dontDistribute super."hfoil"; + "hfov" = dontDistribute super."hfov"; + "hfractal" = dontDistribute super."hfractal"; + "hfsevents" = doDistribute super."hfsevents_0_1_5"; + "hfusion" = dontDistribute super."hfusion"; + "hg-buildpackage" = dontDistribute super."hg-buildpackage"; + "hgal" = dontDistribute super."hgal"; + "hgalib" = dontDistribute super."hgalib"; + "hgdbmi" = dontDistribute super."hgdbmi"; + "hgearman" = dontDistribute super."hgearman"; + "hgen" = dontDistribute super."hgen"; + "hgeometric" = dontDistribute super."hgeometric"; + "hgeometry" = dontDistribute super."hgeometry"; + "hgettext" = dontDistribute super."hgettext"; + "hgithub" = dontDistribute super."hgithub"; + "hgl-example" = dontDistribute super."hgl-example"; + "hgom" = dontDistribute super."hgom"; + "hgopher" = dontDistribute super."hgopher"; + "hgrev" = dontDistribute super."hgrev"; + "hgrib" = dontDistribute super."hgrib"; + "hharp" = dontDistribute super."hharp"; + "hi" = dontDistribute super."hi"; + "hiccup" = dontDistribute super."hiccup"; + "hichi" = dontDistribute super."hichi"; + "hidapi" = dontDistribute super."hidapi"; + "hieraclus" = dontDistribute super."hieraclus"; + "hierarchical-clustering" = dontDistribute super."hierarchical-clustering"; + "hierarchical-clustering-diagrams" = dontDistribute super."hierarchical-clustering-diagrams"; + "hierarchical-exceptions" = dontDistribute super."hierarchical-exceptions"; + "hierarchy" = dontDistribute super."hierarchy"; + "hiernotify" = dontDistribute super."hiernotify"; + "highWaterMark" = dontDistribute super."highWaterMark"; + "higher-leveldb" = dontDistribute super."higher-leveldb"; + "higherorder" = dontDistribute super."higherorder"; + "highlight-versions" = dontDistribute super."highlight-versions"; + "highlighter" = dontDistribute super."highlighter"; + "highlighter2" = dontDistribute super."highlighter2"; + "hills" = dontDistribute super."hills"; + "himerge" = dontDistribute super."himerge"; + "himg" = dontDistribute super."himg"; + "himpy" = dontDistribute super."himpy"; + "hinduce-associations-apriori" = dontDistribute super."hinduce-associations-apriori"; + "hinduce-classifier" = dontDistribute super."hinduce-classifier"; + "hinduce-classifier-decisiontree" = dontDistribute super."hinduce-classifier-decisiontree"; + "hinduce-examples" = dontDistribute super."hinduce-examples"; + "hinduce-missingh" = dontDistribute super."hinduce-missingh"; + "hinquire" = dontDistribute super."hinquire"; + "hinstaller" = dontDistribute super."hinstaller"; + "hint-server" = dontDistribute super."hint-server"; + "hinvaders" = dontDistribute super."hinvaders"; + "hinze-streams" = dontDistribute super."hinze-streams"; + "hipbot" = dontDistribute super."hipbot"; + "hipe" = dontDistribute super."hipe"; + "hips" = dontDistribute super."hips"; + "hircules" = dontDistribute super."hircules"; + "hirt" = dontDistribute super."hirt"; + "hissmetrics" = dontDistribute super."hissmetrics"; + "hist-pl" = dontDistribute super."hist-pl"; + "hist-pl-dawg" = dontDistribute super."hist-pl-dawg"; + "hist-pl-fusion" = dontDistribute super."hist-pl-fusion"; + "hist-pl-lexicon" = dontDistribute super."hist-pl-lexicon"; + "hist-pl-lmf" = dontDistribute super."hist-pl-lmf"; + "hist-pl-transliter" = dontDistribute super."hist-pl-transliter"; + "hist-pl-types" = dontDistribute super."hist-pl-types"; + "histogram-fill-binary" = dontDistribute super."histogram-fill-binary"; + "histogram-fill-cereal" = dontDistribute super."histogram-fill-cereal"; + "historian" = dontDistribute super."historian"; + "hjcase" = dontDistribute super."hjcase"; + "hjpath" = dontDistribute super."hjpath"; + "hjs" = dontDistribute super."hjs"; + "hjson" = dontDistribute super."hjson"; + "hjson-query" = dontDistribute super."hjson-query"; + "hjsonpointer" = dontDistribute super."hjsonpointer"; + "hjsonschema" = dontDistribute super."hjsonschema"; + "hlatex" = dontDistribute super."hlatex"; + "hlbfgsb" = dontDistribute super."hlbfgsb"; + "hlcm" = dontDistribute super."hlcm"; + "hledger" = doDistribute super."hledger_0_26"; + "hledger-chart" = dontDistribute super."hledger-chart"; + "hledger-diff" = dontDistribute super."hledger-diff"; + "hledger-interest" = dontDistribute super."hledger-interest"; + "hledger-irr" = dontDistribute super."hledger-irr"; + "hledger-lib" = doDistribute super."hledger-lib_0_26"; + "hledger-ui" = dontDistribute super."hledger-ui"; + "hledger-vty" = dontDistribute super."hledger-vty"; + "hledger-web" = doDistribute super."hledger-web_0_26"; + "hlibBladeRF" = dontDistribute super."hlibBladeRF"; + "hlibev" = dontDistribute super."hlibev"; + "hlibfam" = dontDistribute super."hlibfam"; + "hlogger" = dontDistribute super."hlogger"; + "hlongurl" = dontDistribute super."hlongurl"; + "hls" = dontDistribute super."hls"; + "hlwm" = dontDistribute super."hlwm"; + "hly" = dontDistribute super."hly"; + "hmark" = dontDistribute super."hmark"; + "hmarkup" = dontDistribute super."hmarkup"; + "hmatrix" = doDistribute super."hmatrix_0_16_1_5"; + "hmatrix-banded" = dontDistribute super."hmatrix-banded"; + "hmatrix-csv" = dontDistribute super."hmatrix-csv"; + "hmatrix-glpk" = dontDistribute super."hmatrix-glpk"; + "hmatrix-gsl" = doDistribute super."hmatrix-gsl_0_16_0_3"; + "hmatrix-gsl-stats" = doDistribute super."hmatrix-gsl-stats_0_4_1_1"; + "hmatrix-mmap" = dontDistribute super."hmatrix-mmap"; + "hmatrix-nipals" = dontDistribute super."hmatrix-nipals"; + "hmatrix-quadprogpp" = dontDistribute super."hmatrix-quadprogpp"; + "hmatrix-special" = dontDistribute super."hmatrix-special"; + "hmatrix-static" = dontDistribute super."hmatrix-static"; + "hmatrix-svdlibc" = dontDistribute super."hmatrix-svdlibc"; + "hmatrix-syntax" = dontDistribute super."hmatrix-syntax"; + "hmatrix-tests" = dontDistribute super."hmatrix-tests"; + "hmeap" = dontDistribute super."hmeap"; + "hmeap-utils" = dontDistribute super."hmeap-utils"; + "hmemdb" = dontDistribute super."hmemdb"; + "hmenu" = dontDistribute super."hmenu"; + "hmidi" = dontDistribute super."hmidi"; + "hmk" = dontDistribute super."hmk"; + "hmm" = dontDistribute super."hmm"; + "hmm-hmatrix" = dontDistribute super."hmm-hmatrix"; + "hmp3" = dontDistribute super."hmp3"; + "hmpfr" = dontDistribute super."hmpfr"; + "hmt" = dontDistribute super."hmt"; + "hmt-diagrams" = dontDistribute super."hmt-diagrams"; + "hmumps" = dontDistribute super."hmumps"; + "hnetcdf" = dontDistribute super."hnetcdf"; + "hnix" = dontDistribute super."hnix"; + "hnn" = dontDistribute super."hnn"; + "hnop" = dontDistribute super."hnop"; + "ho-rewriting" = dontDistribute super."ho-rewriting"; + "hoauth" = dontDistribute super."hoauth"; + "hob" = dontDistribute super."hob"; + "hobbes" = dontDistribute super."hobbes"; + "hobbits" = dontDistribute super."hobbits"; + "hoe" = dontDistribute super."hoe"; + "hofix-mtl" = dontDistribute super."hofix-mtl"; + "hog" = dontDistribute super."hog"; + "hogg" = dontDistribute super."hogg"; + "hogre" = dontDistribute super."hogre"; + "hogre-examples" = dontDistribute super."hogre-examples"; + "hois" = dontDistribute super."hois"; + "hoist-error" = dontDistribute super."hoist-error"; + "hold-em" = dontDistribute super."hold-em"; + "hole" = dontDistribute super."hole"; + "holey-format" = dontDistribute super."holey-format"; + "homeomorphic" = dontDistribute super."homeomorphic"; + "hommage" = dontDistribute super."hommage"; + "hommage-ds" = dontDistribute super."hommage-ds"; + "homplexity" = dontDistribute super."homplexity"; + "honi" = dontDistribute super."honi"; + "honk" = dontDistribute super."honk"; + "hoobuddy" = dontDistribute super."hoobuddy"; + "hood" = dontDistribute super."hood"; + "hood-off" = dontDistribute super."hood-off"; + "hood2" = dontDistribute super."hood2"; + "hoodie" = dontDistribute super."hoodie"; + "hoodle" = dontDistribute super."hoodle"; + "hoodle-builder" = dontDistribute super."hoodle-builder"; + "hoodle-core" = dontDistribute super."hoodle-core"; + "hoodle-extra" = dontDistribute super."hoodle-extra"; + "hoodle-parser" = dontDistribute super."hoodle-parser"; + "hoodle-publish" = dontDistribute super."hoodle-publish"; + "hoodle-render" = dontDistribute super."hoodle-render"; + "hoodle-types" = dontDistribute super."hoodle-types"; + "hoogle-index" = dontDistribute super."hoogle-index"; + "hooks-dir" = dontDistribute super."hooks-dir"; + "hoovie" = dontDistribute super."hoovie"; + "hopencc" = dontDistribute super."hopencc"; + "hopencl" = dontDistribute super."hopencl"; + "hopenpgp-tools" = dontDistribute super."hopenpgp-tools"; + "hopenssl" = dontDistribute super."hopenssl"; + "hopfield" = dontDistribute super."hopfield"; + "hopfield-networks" = dontDistribute super."hopfield-networks"; + "hopfli" = dontDistribute super."hopfli"; + "hops" = dontDistribute super."hops"; + "hoq" = dontDistribute super."hoq"; + "horizon" = dontDistribute super."horizon"; + "hosc" = dontDistribute super."hosc"; + "hosc-json" = dontDistribute super."hosc-json"; + "hosc-utils" = dontDistribute super."hosc-utils"; + "hosts-server" = dontDistribute super."hosts-server"; + "hothasktags" = dontDistribute super."hothasktags"; + "hotswap" = dontDistribute super."hotswap"; + "hourglass-fuzzy-parsing" = dontDistribute super."hourglass-fuzzy-parsing"; + "hp2any-core" = dontDistribute super."hp2any-core"; + "hp2any-graph" = dontDistribute super."hp2any-graph"; + "hp2any-manager" = dontDistribute super."hp2any-manager"; + "hp2html" = dontDistribute super."hp2html"; + "hp2pretty" = dontDistribute super."hp2pretty"; + "hpack" = dontDistribute super."hpack"; + "hpaco" = dontDistribute super."hpaco"; + "hpaco-lib" = dontDistribute super."hpaco-lib"; + "hpage" = dontDistribute super."hpage"; + "hpapi" = dontDistribute super."hpapi"; + "hpaste" = dontDistribute super."hpaste"; + "hpasteit" = dontDistribute super."hpasteit"; + "hpc-coveralls" = doDistribute super."hpc-coveralls_0_9_0"; + "hpc-strobe" = dontDistribute super."hpc-strobe"; + "hpc-tracer" = dontDistribute super."hpc-tracer"; + "hplayground" = dontDistribute super."hplayground"; + "hplaylist" = dontDistribute super."hplaylist"; + "hpodder" = dontDistribute super."hpodder"; + "hpp" = dontDistribute super."hpp"; + "hpqtypes" = dontDistribute super."hpqtypes"; + "hprotoc-fork" = dontDistribute super."hprotoc-fork"; + "hps" = dontDistribute super."hps"; + "hps-cairo" = dontDistribute super."hps-cairo"; + "hps-kmeans" = dontDistribute super."hps-kmeans"; + "hpuz" = dontDistribute super."hpuz"; + "hpygments" = dontDistribute super."hpygments"; + "hpylos" = dontDistribute super."hpylos"; + "hpyrg" = dontDistribute super."hpyrg"; + "hquantlib" = dontDistribute super."hquantlib"; + "hquery" = dontDistribute super."hquery"; + "hranker" = dontDistribute super."hranker"; + "hreader" = dontDistribute super."hreader"; + "hricket" = dontDistribute super."hricket"; + "hruby" = dontDistribute super."hruby"; + "hs-GeoIP" = dontDistribute super."hs-GeoIP"; + "hs-blake2" = dontDistribute super."hs-blake2"; + "hs-captcha" = dontDistribute super."hs-captcha"; + "hs-carbon" = dontDistribute super."hs-carbon"; + "hs-carbon-examples" = dontDistribute super."hs-carbon-examples"; + "hs-cdb" = dontDistribute super."hs-cdb"; + "hs-dotnet" = dontDistribute super."hs-dotnet"; + "hs-duktape" = dontDistribute super."hs-duktape"; + "hs-excelx" = dontDistribute super."hs-excelx"; + "hs-ffmpeg" = dontDistribute super."hs-ffmpeg"; + "hs-fltk" = dontDistribute super."hs-fltk"; + "hs-gchart" = dontDistribute super."hs-gchart"; + "hs-gen-iface" = dontDistribute super."hs-gen-iface"; + "hs-gizapp" = dontDistribute super."hs-gizapp"; + "hs-inspector" = dontDistribute super."hs-inspector"; + "hs-java" = dontDistribute super."hs-java"; + "hs-json-rpc" = dontDistribute super."hs-json-rpc"; + "hs-logo" = dontDistribute super."hs-logo"; + "hs-mesos" = dontDistribute super."hs-mesos"; + "hs-nombre-generator" = dontDistribute super."hs-nombre-generator"; + "hs-pgms" = dontDistribute super."hs-pgms"; + "hs-php-session" = dontDistribute super."hs-php-session"; + "hs-pkg-config" = dontDistribute super."hs-pkg-config"; + "hs-pkpass" = dontDistribute super."hs-pkpass"; + "hs-re" = dontDistribute super."hs-re"; + "hs-scrape" = dontDistribute super."hs-scrape"; + "hs-twitter" = dontDistribute super."hs-twitter"; + "hs-twitterarchiver" = dontDistribute super."hs-twitterarchiver"; + "hs-vcard" = dontDistribute super."hs-vcard"; + "hs2048" = dontDistribute super."hs2048"; + "hs2bf" = dontDistribute super."hs2bf"; + "hs2dot" = dontDistribute super."hs2dot"; + "hsConfigure" = dontDistribute super."hsConfigure"; + "hsSqlite3" = dontDistribute super."hsSqlite3"; + "hsXenCtrl" = dontDistribute super."hsXenCtrl"; + "hsay" = dontDistribute super."hsay"; + "hsb2hs" = dontDistribute super."hsb2hs"; + "hsbackup" = dontDistribute super."hsbackup"; + "hsbencher" = dontDistribute super."hsbencher"; + "hsbencher-codespeed" = dontDistribute super."hsbencher-codespeed"; + "hsbencher-fusion" = dontDistribute super."hsbencher-fusion"; + "hsc2hs" = dontDistribute super."hsc2hs"; + "hsc3" = dontDistribute super."hsc3"; + "hsc3-auditor" = dontDistribute super."hsc3-auditor"; + "hsc3-cairo" = dontDistribute super."hsc3-cairo"; + "hsc3-data" = dontDistribute super."hsc3-data"; + "hsc3-db" = dontDistribute super."hsc3-db"; + "hsc3-dot" = dontDistribute super."hsc3-dot"; + "hsc3-forth" = dontDistribute super."hsc3-forth"; + "hsc3-graphs" = dontDistribute super."hsc3-graphs"; + "hsc3-lang" = dontDistribute super."hsc3-lang"; + "hsc3-lisp" = dontDistribute super."hsc3-lisp"; + "hsc3-plot" = dontDistribute super."hsc3-plot"; + "hsc3-process" = dontDistribute super."hsc3-process"; + "hsc3-rec" = dontDistribute super."hsc3-rec"; + "hsc3-rw" = dontDistribute super."hsc3-rw"; + "hsc3-server" = dontDistribute super."hsc3-server"; + "hsc3-sf" = dontDistribute super."hsc3-sf"; + "hsc3-sf-hsndfile" = dontDistribute super."hsc3-sf-hsndfile"; + "hsc3-unsafe" = dontDistribute super."hsc3-unsafe"; + "hsc3-utils" = dontDistribute super."hsc3-utils"; + "hscamwire" = dontDistribute super."hscamwire"; + "hscassandra" = dontDistribute super."hscassandra"; + "hscd" = dontDistribute super."hscd"; + "hsclock" = dontDistribute super."hsclock"; + "hscope" = dontDistribute super."hscope"; + "hscrtmpl" = dontDistribute super."hscrtmpl"; + "hscuid" = dontDistribute super."hscuid"; + "hscurses" = dontDistribute super."hscurses"; + "hscurses-fish-ex" = dontDistribute super."hscurses-fish-ex"; + "hsdev" = dontDistribute super."hsdev"; + "hsdif" = dontDistribute super."hsdif"; + "hsdip" = dontDistribute super."hsdip"; + "hsdns" = dontDistribute super."hsdns"; + "hsdns-cache" = dontDistribute super."hsdns-cache"; + "hsemail-ns" = dontDistribute super."hsemail-ns"; + "hsenv" = dontDistribute super."hsenv"; + "hserv" = dontDistribute super."hserv"; + "hset" = dontDistribute super."hset"; + "hsexif" = dontDistribute super."hsexif"; + "hsfacter" = dontDistribute super."hsfacter"; + "hsfcsh" = dontDistribute super."hsfcsh"; + "hsfilt" = dontDistribute super."hsfilt"; + "hsgnutls" = dontDistribute super."hsgnutls"; + "hsgnutls-yj" = dontDistribute super."hsgnutls-yj"; + "hsgsom" = dontDistribute super."hsgsom"; + "hsgtd" = dontDistribute super."hsgtd"; + "hsharc" = dontDistribute super."hsharc"; + "hsignal" = doDistribute super."hsignal_0_2_7_1"; + "hsilop" = dontDistribute super."hsilop"; + "hsimport" = dontDistribute super."hsimport"; + "hsini" = dontDistribute super."hsini"; + "hskeleton" = dontDistribute super."hskeleton"; + "hslackbuilder" = dontDistribute super."hslackbuilder"; + "hslibsvm" = dontDistribute super."hslibsvm"; + "hslinks" = dontDistribute super."hslinks"; + "hslogger-reader" = dontDistribute super."hslogger-reader"; + "hslogger-template" = dontDistribute super."hslogger-template"; + "hslogger4j" = dontDistribute super."hslogger4j"; + "hslogstash" = dontDistribute super."hslogstash"; + "hsmagick" = dontDistribute super."hsmagick"; + "hsmisc" = dontDistribute super."hsmisc"; + "hsmtpclient" = dontDistribute super."hsmtpclient"; + "hsndfile" = dontDistribute super."hsndfile"; + "hsndfile-storablevector" = dontDistribute super."hsndfile-storablevector"; + "hsndfile-vector" = dontDistribute super."hsndfile-vector"; + "hsnock" = dontDistribute super."hsnock"; + "hsnoise" = dontDistribute super."hsnoise"; + "hsns" = dontDistribute super."hsns"; + "hsnsq" = dontDistribute super."hsnsq"; + "hsntp" = dontDistribute super."hsntp"; + "hsoptions" = dontDistribute super."hsoptions"; + "hsp" = dontDistribute super."hsp"; + "hsp-cgi" = dontDistribute super."hsp-cgi"; + "hsparklines" = dontDistribute super."hsparklines"; + "hsparql" = dontDistribute super."hsparql"; + "hspear" = dontDistribute super."hspear"; + "hspec" = doDistribute super."hspec_2_1_10"; + "hspec-checkers" = dontDistribute super."hspec-checkers"; + "hspec-core" = doDistribute super."hspec-core_2_1_10"; + "hspec-discover" = doDistribute super."hspec-discover_2_1_10"; + "hspec-expectations" = doDistribute super."hspec-expectations_0_7_1"; + "hspec-expectations-lens" = dontDistribute super."hspec-expectations-lens"; + "hspec-expectations-lifted" = dontDistribute super."hspec-expectations-lifted"; + "hspec-expectations-pretty" = dontDistribute super."hspec-expectations-pretty"; + "hspec-expectations-pretty-diff" = dontDistribute super."hspec-expectations-pretty-diff"; + "hspec-experimental" = dontDistribute super."hspec-experimental"; + "hspec-laws" = dontDistribute super."hspec-laws"; + "hspec-meta" = doDistribute super."hspec-meta_2_1_7"; + "hspec-monad-control" = dontDistribute super."hspec-monad-control"; + "hspec-server" = dontDistribute super."hspec-server"; + "hspec-shouldbe" = dontDistribute super."hspec-shouldbe"; + "hspec-smallcheck" = doDistribute super."hspec-smallcheck_0_3_0"; + "hspec-snap" = doDistribute super."hspec-snap_0_3_3_0"; + "hspec-structured-formatter" = dontDistribute super."hspec-structured-formatter"; + "hspec-test-framework" = dontDistribute super."hspec-test-framework"; + "hspec-test-framework-th" = dontDistribute super."hspec-test-framework-th"; + "hspec-test-sandbox" = dontDistribute super."hspec-test-sandbox"; + "hspec-webdriver" = doDistribute super."hspec-webdriver_1_0_3"; + "hspec2" = dontDistribute super."hspec2"; + "hspr-sh" = dontDistribute super."hspr-sh"; + "hspread" = dontDistribute super."hspread"; + "hspresent" = dontDistribute super."hspresent"; + "hsprocess" = dontDistribute super."hsprocess"; + "hsql" = dontDistribute super."hsql"; + "hsql-mysql" = dontDistribute super."hsql-mysql"; + "hsql-odbc" = dontDistribute super."hsql-odbc"; + "hsql-postgresql" = dontDistribute super."hsql-postgresql"; + "hsql-sqlite3" = dontDistribute super."hsql-sqlite3"; + "hsqml" = dontDistribute super."hsqml"; + "hsqml-datamodel" = dontDistribute super."hsqml-datamodel"; + "hsqml-datamodel-vinyl" = dontDistribute super."hsqml-datamodel-vinyl"; + "hsqml-demo-morris" = dontDistribute super."hsqml-demo-morris"; + "hsqml-demo-notes" = dontDistribute super."hsqml-demo-notes"; + "hsqml-demo-samples" = dontDistribute super."hsqml-demo-samples"; + "hsqml-morris" = dontDistribute super."hsqml-morris"; + "hsreadability" = dontDistribute super."hsreadability"; + "hsshellscript" = dontDistribute super."hsshellscript"; + "hssourceinfo" = dontDistribute super."hssourceinfo"; + "hssqlppp" = dontDistribute super."hssqlppp"; + "hstatistics" = doDistribute super."hstatistics_0_2_5_2"; + "hstats" = dontDistribute super."hstats"; + "hstest" = dontDistribute super."hstest"; + "hstidy" = dontDistribute super."hstidy"; + "hstorchat" = dontDistribute super."hstorchat"; + "hstradeking" = dontDistribute super."hstradeking"; + "hstyle" = dontDistribute super."hstyle"; + "hstzaar" = dontDistribute super."hstzaar"; + "hsubconvert" = dontDistribute super."hsubconvert"; + "hsverilog" = dontDistribute super."hsverilog"; + "hswip" = dontDistribute super."hswip"; + "hsx" = dontDistribute super."hsx"; + "hsx-jmacro" = dontDistribute super."hsx-jmacro"; + "hsx-xhtml" = dontDistribute super."hsx-xhtml"; + "hsx2hs" = dontDistribute super."hsx2hs"; + "hsyscall" = dontDistribute super."hsyscall"; + "hszephyr" = dontDistribute super."hszephyr"; + "htaglib" = dontDistribute super."htaglib"; + "htags" = dontDistribute super."htags"; + "htar" = dontDistribute super."htar"; + "htiled" = dontDistribute super."htiled"; + "htime" = dontDistribute super."htime"; + "html-email-validate" = dontDistribute super."html-email-validate"; + "html-entities" = dontDistribute super."html-entities"; + "html-kure" = dontDistribute super."html-kure"; + "html-minimalist" = dontDistribute super."html-minimalist"; + "html-rules" = dontDistribute super."html-rules"; + "html-tokenizer" = dontDistribute super."html-tokenizer"; + "html-truncate" = dontDistribute super."html-truncate"; + "html2hamlet" = dontDistribute super."html2hamlet"; + "html5-entity" = dontDistribute super."html5-entity"; + "htodo" = dontDistribute super."htodo"; + "htoml" = dontDistribute super."htoml"; + "htrace" = dontDistribute super."htrace"; + "hts" = dontDistribute super."hts"; + "htsn" = dontDistribute super."htsn"; + "htsn-common" = dontDistribute super."htsn-common"; + "htsn-import" = dontDistribute super."htsn-import"; + "http-accept" = dontDistribute super."http-accept"; + "http-attoparsec" = dontDistribute super."http-attoparsec"; + "http-client-auth" = dontDistribute super."http-client-auth"; + "http-client-conduit" = dontDistribute super."http-client-conduit"; + "http-client-lens" = dontDistribute super."http-client-lens"; + "http-client-multipart" = dontDistribute super."http-client-multipart"; + "http-client-openssl" = dontDistribute super."http-client-openssl"; + "http-client-request-modifiers" = dontDistribute super."http-client-request-modifiers"; + "http-client-streams" = dontDistribute super."http-client-streams"; + "http-conduit-browser" = dontDistribute super."http-conduit-browser"; + "http-conduit-downloader" = dontDistribute super."http-conduit-downloader"; + "http-encodings" = dontDistribute super."http-encodings"; + "http-enumerator" = dontDistribute super."http-enumerator"; + "http-kit" = dontDistribute super."http-kit"; + "http-link-header" = dontDistribute super."http-link-header"; + "http-listen" = dontDistribute super."http-listen"; + "http-monad" = dontDistribute super."http-monad"; + "http-proxy" = dontDistribute super."http-proxy"; + "http-querystring" = dontDistribute super."http-querystring"; + "http-server" = dontDistribute super."http-server"; + "http-shed" = dontDistribute super."http-shed"; + "http-test" = dontDistribute super."http-test"; + "http-wget" = dontDistribute super."http-wget"; + "http2" = doDistribute super."http2_1_0_4"; + "httpd-shed" = dontDistribute super."httpd-shed"; + "https-everywhere-rules" = dontDistribute super."https-everywhere-rules"; + "https-everywhere-rules-raw" = dontDistribute super."https-everywhere-rules-raw"; + "httpspec" = dontDistribute super."httpspec"; + "htune" = dontDistribute super."htune"; + "htzaar" = dontDistribute super."htzaar"; + "hub" = dontDistribute super."hub"; + "hubigraph" = dontDistribute super."hubigraph"; + "hubris" = dontDistribute super."hubris"; + "huffman" = dontDistribute super."huffman"; + "hugs2yc" = dontDistribute super."hugs2yc"; + "hulk" = dontDistribute super."hulk"; + "human-readable-duration" = dontDistribute super."human-readable-duration"; + "hums" = dontDistribute super."hums"; + "hunch" = dontDistribute super."hunch"; + "hunit-gui" = dontDistribute super."hunit-gui"; + "hunit-parsec" = dontDistribute super."hunit-parsec"; + "hunit-rematch" = dontDistribute super."hunit-rematch"; + "hunp" = dontDistribute super."hunp"; + "hunt-searchengine" = dontDistribute super."hunt-searchengine"; + "hunt-server" = dontDistribute super."hunt-server"; + "hunt-server-cli" = dontDistribute super."hunt-server-cli"; + "hurdle" = dontDistribute super."hurdle"; + "husk-scheme" = dontDistribute super."husk-scheme"; + "husk-scheme-libs" = dontDistribute super."husk-scheme-libs"; + "husky" = dontDistribute super."husky"; + "hutton" = dontDistribute super."hutton"; + "huttons-razor" = dontDistribute super."huttons-razor"; + "huzzy" = dontDistribute super."huzzy"; + "hvect" = doDistribute super."hvect_0_2_0_0"; + "hwall-auth-iitk" = dontDistribute super."hwall-auth-iitk"; + "hworker" = dontDistribute super."hworker"; + "hworker-ses" = dontDistribute super."hworker-ses"; + "hws" = dontDistribute super."hws"; + "hwsl2" = dontDistribute super."hwsl2"; + "hwsl2-bytevector" = dontDistribute super."hwsl2-bytevector"; + "hwsl2-reducers" = dontDistribute super."hwsl2-reducers"; + "hx" = dontDistribute super."hx"; + "hxmppc" = dontDistribute super."hxmppc"; + "hxournal" = dontDistribute super."hxournal"; + "hxt-binary" = dontDistribute super."hxt-binary"; + "hxt-cache" = dontDistribute super."hxt-cache"; + "hxt-extras" = dontDistribute super."hxt-extras"; + "hxt-filter" = dontDistribute super."hxt-filter"; + "hxt-xpath" = dontDistribute super."hxt-xpath"; + "hxt-xslt" = dontDistribute super."hxt-xslt"; + "hxthelper" = dontDistribute super."hxthelper"; + "hxweb" = dontDistribute super."hxweb"; + "hyahtzee" = dontDistribute super."hyahtzee"; + "hyakko" = dontDistribute super."hyakko"; + "hybrid" = dontDistribute super."hybrid"; + "hybrid-vectors" = dontDistribute super."hybrid-vectors"; + "hydra-hs" = dontDistribute super."hydra-hs"; + "hydra-print" = dontDistribute super."hydra-print"; + "hydrogen" = dontDistribute super."hydrogen"; + "hydrogen-cli" = dontDistribute super."hydrogen-cli"; + "hydrogen-cli-args" = dontDistribute super."hydrogen-cli-args"; + "hydrogen-data" = dontDistribute super."hydrogen-data"; + "hydrogen-multimap" = dontDistribute super."hydrogen-multimap"; + "hydrogen-parsing" = dontDistribute super."hydrogen-parsing"; + "hydrogen-prelude" = dontDistribute super."hydrogen-prelude"; + "hydrogen-prelude-parsec" = dontDistribute super."hydrogen-prelude-parsec"; + "hydrogen-syntax" = dontDistribute super."hydrogen-syntax"; + "hydrogen-util" = dontDistribute super."hydrogen-util"; + "hydrogen-version" = dontDistribute super."hydrogen-version"; + "hyena" = dontDistribute super."hyena"; + "hylolib" = dontDistribute super."hylolib"; + "hylotab" = dontDistribute super."hylotab"; + "hyloutils" = dontDistribute super."hyloutils"; + "hyperdrive" = dontDistribute super."hyperdrive"; + "hyperfunctions" = dontDistribute super."hyperfunctions"; + "hyperloglog" = doDistribute super."hyperloglog_0_3_4"; + "hyperpublic" = dontDistribute super."hyperpublic"; + "hyphenate" = dontDistribute super."hyphenate"; + "hypher" = dontDistribute super."hypher"; + "hzk" = dontDistribute super."hzk"; + "hzulip" = dontDistribute super."hzulip"; + "i18n" = dontDistribute super."i18n"; + "iCalendar" = dontDistribute super."iCalendar"; + "iException" = dontDistribute super."iException"; + "iap-verifier" = dontDistribute super."iap-verifier"; + "ib-api" = dontDistribute super."ib-api"; + "iban" = dontDistribute super."iban"; + "iconv" = dontDistribute super."iconv"; + "ideas" = dontDistribute super."ideas"; + "ideas-math" = dontDistribute super."ideas-math"; + "idempotent" = dontDistribute super."idempotent"; + "identifiers" = dontDistribute super."identifiers"; + "idiii" = dontDistribute super."idiii"; + "idna" = dontDistribute super."idna"; + "idna2008" = dontDistribute super."idna2008"; + "idris" = dontDistribute super."idris"; + "ieee" = dontDistribute super."ieee"; + "ieee-utils" = dontDistribute super."ieee-utils"; + "ieee-utils-tempfix" = dontDistribute super."ieee-utils-tempfix"; + "ieee754-parser" = dontDistribute super."ieee754-parser"; + "ifcxt" = dontDistribute super."ifcxt"; + "iff" = dontDistribute super."iff"; + "ifscs" = dontDistribute super."ifscs"; + "ig" = dontDistribute super."ig"; + "ige-mac-integration" = dontDistribute super."ige-mac-integration"; + "igraph" = dontDistribute super."igraph"; + "igrf" = dontDistribute super."igrf"; + "ihaskell" = doDistribute super."ihaskell_0_6_5_0"; + "ihaskell-display" = dontDistribute super."ihaskell-display"; + "ihaskell-inline-r" = dontDistribute super."ihaskell-inline-r"; + "ihaskell-parsec" = dontDistribute super."ihaskell-parsec"; + "ihaskell-plot" = dontDistribute super."ihaskell-plot"; + "ihaskell-widgets" = dontDistribute super."ihaskell-widgets"; + "ihttp" = dontDistribute super."ihttp"; + "illuminate" = dontDistribute super."illuminate"; + "image-type" = dontDistribute super."image-type"; + "imagefilters" = dontDistribute super."imagefilters"; + "imagemagick" = dontDistribute super."imagemagick"; + "imagepaste" = dontDistribute super."imagepaste"; + "imapget" = dontDistribute super."imapget"; + "imbib" = dontDistribute super."imbib"; + "imgurder" = dontDistribute super."imgurder"; + "imm" = dontDistribute super."imm"; + "imparse" = dontDistribute super."imparse"; + "imperative-edsl-vhdl" = dontDistribute super."imperative-edsl-vhdl"; + "implicit" = dontDistribute super."implicit"; + "implicit-params" = dontDistribute super."implicit-params"; + "imports" = dontDistribute super."imports"; + "improve" = dontDistribute super."improve"; + "inc-ref" = dontDistribute super."inc-ref"; + "inch" = dontDistribute super."inch"; + "incremental-computing" = dontDistribute super."incremental-computing"; + "incremental-sat-solver" = dontDistribute super."incremental-sat-solver"; + "increments" = dontDistribute super."increments"; + "indentation" = dontDistribute super."indentation"; + "indentparser" = dontDistribute super."indentparser"; + "index-core" = dontDistribute super."index-core"; + "indexed" = dontDistribute super."indexed"; + "indexed-do-notation" = dontDistribute super."indexed-do-notation"; + "indexed-extras" = dontDistribute super."indexed-extras"; + "indexed-free" = dontDistribute super."indexed-free"; + "indian-language-font-converter" = dontDistribute super."indian-language-font-converter"; + "indices" = dontDistribute super."indices"; + "indieweb-algorithms" = dontDistribute super."indieweb-algorithms"; + "infer-upstream" = dontDistribute super."infer-upstream"; + "infernu" = dontDistribute super."infernu"; + "infinite-search" = dontDistribute super."infinite-search"; + "infinity" = dontDistribute super."infinity"; + "infix" = dontDistribute super."infix"; + "inflist" = dontDistribute super."inflist"; + "influxdb" = dontDistribute super."influxdb"; + "informative" = dontDistribute super."informative"; + "inilist" = dontDistribute super."inilist"; + "inject" = dontDistribute super."inject"; + "inject-function" = dontDistribute super."inject-function"; + "inline-c" = dontDistribute super."inline-c"; + "inline-c-cpp" = dontDistribute super."inline-c-cpp"; + "inline-c-win32" = dontDistribute super."inline-c-win32"; + "inline-r" = dontDistribute super."inline-r"; + "inquire" = dontDistribute super."inquire"; + "inserts" = dontDistribute super."inserts"; + "inspection-proxy" = dontDistribute super."inspection-proxy"; + "instant-aeson" = dontDistribute super."instant-aeson"; + "instant-bytes" = dontDistribute super."instant-bytes"; + "instant-deepseq" = dontDistribute super."instant-deepseq"; + "instant-generics" = dontDistribute super."instant-generics"; + "instant-hashable" = dontDistribute super."instant-hashable"; + "instant-zipper" = dontDistribute super."instant-zipper"; + "instinct" = dontDistribute super."instinct"; + "instrument-chord" = dontDistribute super."instrument-chord"; + "int-cast" = dontDistribute super."int-cast"; + "integer-pure" = dontDistribute super."integer-pure"; + "intel-aes" = dontDistribute super."intel-aes"; + "interchangeable" = dontDistribute super."interchangeable"; + "interleavableGen" = dontDistribute super."interleavableGen"; + "interleavableIO" = dontDistribute super."interleavableIO"; + "interleave" = dontDistribute super."interleave"; + "interlude" = dontDistribute super."interlude"; + "intern" = dontDistribute super."intern"; + "internetmarke" = dontDistribute super."internetmarke"; + "interpol" = dontDistribute super."interpol"; + "interpolatedstring-qq" = dontDistribute super."interpolatedstring-qq"; + "interpolatedstring-qq-mwotton" = dontDistribute super."interpolatedstring-qq-mwotton"; + "interpolation" = dontDistribute super."interpolation"; + "intricacy" = dontDistribute super."intricacy"; + "intset" = dontDistribute super."intset"; + "invertible-syntax" = dontDistribute super."invertible-syntax"; + "io-capture" = dontDistribute super."io-capture"; + "io-reactive" = dontDistribute super."io-reactive"; + "io-region" = dontDistribute super."io-region"; + "io-storage" = dontDistribute super."io-storage"; + "io-streams-http" = dontDistribute super."io-streams-http"; + "io-throttle" = dontDistribute super."io-throttle"; + "ioctl" = dontDistribute super."ioctl"; + "ioref-stable" = dontDistribute super."ioref-stable"; + "iothread" = dontDistribute super."iothread"; + "iotransaction" = dontDistribute super."iotransaction"; + "ip-quoter" = dontDistribute super."ip-quoter"; + "ipatch" = dontDistribute super."ipatch"; + "ipc" = dontDistribute super."ipc"; + "ipcvar" = dontDistribute super."ipcvar"; + "ipopt-hs" = dontDistribute super."ipopt-hs"; + "ipprint" = dontDistribute super."ipprint"; + "iproute" = doDistribute super."iproute_1_5_0"; + "iptables-helpers" = dontDistribute super."iptables-helpers"; + "iptadmin" = dontDistribute super."iptadmin"; + "ipython-kernel" = doDistribute super."ipython-kernel_0_6_1_3"; + "irc" = dontDistribute super."irc"; + "irc-bytestring" = dontDistribute super."irc-bytestring"; + "irc-client" = dontDistribute super."irc-client"; + "irc-colors" = dontDistribute super."irc-colors"; + "irc-conduit" = dontDistribute super."irc-conduit"; + "irc-core" = dontDistribute super."irc-core"; + "irc-ctcp" = dontDistribute super."irc-ctcp"; + "irc-fun-bot" = dontDistribute super."irc-fun-bot"; + "irc-fun-client" = dontDistribute super."irc-fun-client"; + "irc-fun-color" = dontDistribute super."irc-fun-color"; + "irc-fun-messages" = dontDistribute super."irc-fun-messages"; + "ircbot" = dontDistribute super."ircbot"; + "ircbouncer" = dontDistribute super."ircbouncer"; + "ireal" = dontDistribute super."ireal"; + "iron-mq" = dontDistribute super."iron-mq"; + "ironforge" = dontDistribute super."ironforge"; + "is" = dontDistribute super."is"; + "isdicom" = dontDistribute super."isdicom"; + "isevaluated" = dontDistribute super."isevaluated"; + "isiz" = dontDistribute super."isiz"; + "ismtp" = dontDistribute super."ismtp"; + "iso8583-bitmaps" = dontDistribute super."iso8583-bitmaps"; + "iso8601-time" = dontDistribute super."iso8601-time"; + "isohunt" = dontDistribute super."isohunt"; + "itanium-abi" = dontDistribute super."itanium-abi"; + "iter-stats" = dontDistribute super."iter-stats"; + "iterIO" = dontDistribute super."iterIO"; + "iteratee" = dontDistribute super."iteratee"; + "iteratee-compress" = dontDistribute super."iteratee-compress"; + "iteratee-mtl" = dontDistribute super."iteratee-mtl"; + "iteratee-parsec" = dontDistribute super."iteratee-parsec"; + "iteratee-stm" = dontDistribute super."iteratee-stm"; + "iterio-server" = dontDistribute super."iterio-server"; + "ivar-simple" = dontDistribute super."ivar-simple"; + "ivor" = dontDistribute super."ivor"; + "ivory" = dontDistribute super."ivory"; + "ivory-backend-c" = dontDistribute super."ivory-backend-c"; + "ivory-bitdata" = dontDistribute super."ivory-bitdata"; + "ivory-examples" = dontDistribute super."ivory-examples"; + "ivory-hw" = dontDistribute super."ivory-hw"; + "ivory-opts" = dontDistribute super."ivory-opts"; + "ivory-quickcheck" = dontDistribute super."ivory-quickcheck"; + "ivory-stdlib" = dontDistribute super."ivory-stdlib"; + "ivy-web" = dontDistribute super."ivy-web"; + "ix-shapable" = dontDistribute super."ix-shapable"; + "ixdopp" = dontDistribute super."ixdopp"; + "ixmonad" = dontDistribute super."ixmonad"; + "ixset" = dontDistribute super."ixset"; + "ixset-typed" = dontDistribute super."ixset-typed"; + "iyql" = dontDistribute super."iyql"; + "j2hs" = dontDistribute super."j2hs"; + "ja-base-extra" = dontDistribute super."ja-base-extra"; + "jack" = dontDistribute super."jack"; + "jack-bindings" = dontDistribute super."jack-bindings"; + "jackminimix" = dontDistribute super."jackminimix"; + "jacobi-roots" = dontDistribute super."jacobi-roots"; + "jail" = dontDistribute super."jail"; + "jailbreak-cabal" = dontDistribute super."jailbreak-cabal"; + "jalaali" = dontDistribute super."jalaali"; + "jalla" = dontDistribute super."jalla"; + "jammittools" = dontDistribute super."jammittools"; + "jarfind" = dontDistribute super."jarfind"; + "java-bridge" = dontDistribute super."java-bridge"; + "java-bridge-extras" = dontDistribute super."java-bridge-extras"; + "java-character" = dontDistribute super."java-character"; + "java-reflect" = dontDistribute super."java-reflect"; + "javasf" = dontDistribute super."javasf"; + "javav" = dontDistribute super."javav"; + "jcdecaux-vls" = dontDistribute super."jcdecaux-vls"; + "jdi" = dontDistribute super."jdi"; + "jespresso" = dontDistribute super."jespresso"; + "jobqueue" = dontDistribute super."jobqueue"; + "join" = dontDistribute super."join"; + "joinlist" = dontDistribute super."joinlist"; + "jonathanscard" = dontDistribute super."jonathanscard"; + "jort" = dontDistribute super."jort"; + "jose" = dontDistribute super."jose"; + "jose-jwt" = doDistribute super."jose-jwt_0_6_2"; + "jpeg" = dontDistribute super."jpeg"; + "js-good-parts" = dontDistribute super."js-good-parts"; + "jsaddle" = dontDistribute super."jsaddle"; + "jsaddle-hello" = dontDistribute super."jsaddle-hello"; + "jsc" = dontDistribute super."jsc"; + "jsmw" = dontDistribute super."jsmw"; + "json-assertions" = dontDistribute super."json-assertions"; + "json-b" = dontDistribute super."json-b"; + "json-enumerator" = dontDistribute super."json-enumerator"; + "json-extra" = dontDistribute super."json-extra"; + "json-fu" = dontDistribute super."json-fu"; + "json-litobj" = dontDistribute super."json-litobj"; + "json-python" = dontDistribute super."json-python"; + "json-qq" = dontDistribute super."json-qq"; + "json-rpc" = dontDistribute super."json-rpc"; + "json-rpc-client" = dontDistribute super."json-rpc-client"; + "json-rpc-server" = dontDistribute super."json-rpc-server"; + "json-sop" = dontDistribute super."json-sop"; + "json-state" = dontDistribute super."json-state"; + "json-stream" = dontDistribute super."json-stream"; + "json-togo" = dontDistribute super."json-togo"; + "json-tools" = dontDistribute super."json-tools"; + "json-types" = dontDistribute super."json-types"; + "json2" = dontDistribute super."json2"; + "json2-hdbc" = dontDistribute super."json2-hdbc"; + "json2-types" = dontDistribute super."json2-types"; + "json2yaml" = dontDistribute super."json2yaml"; + "jsonresume" = dontDistribute super."jsonresume"; + "jsonrpc-conduit" = dontDistribute super."jsonrpc-conduit"; + "jsonschema-gen" = dontDistribute super."jsonschema-gen"; + "jsonsql" = dontDistribute super."jsonsql"; + "jsontsv" = dontDistribute super."jsontsv"; + "jspath" = dontDistribute super."jspath"; + "judy" = dontDistribute super."judy"; + "jukebox" = dontDistribute super."jukebox"; + "jumpthefive" = dontDistribute super."jumpthefive"; + "jvm-parser" = dontDistribute super."jvm-parser"; + "kademlia" = dontDistribute super."kademlia"; + "kafka-client" = dontDistribute super."kafka-client"; + "kangaroo" = dontDistribute super."kangaroo"; + "kansas-comet" = dontDistribute super."kansas-comet"; + "kansas-lava" = dontDistribute super."kansas-lava"; + "kansas-lava-cores" = dontDistribute super."kansas-lava-cores"; + "kansas-lava-papilio" = dontDistribute super."kansas-lava-papilio"; + "kansas-lava-shake" = dontDistribute super."kansas-lava-shake"; + "karakuri" = dontDistribute super."karakuri"; + "karver" = dontDistribute super."karver"; + "katt" = dontDistribute super."katt"; + "kbq-gu" = dontDistribute super."kbq-gu"; + "kd-tree" = dontDistribute super."kd-tree"; + "kdesrc-build-extra" = dontDistribute super."kdesrc-build-extra"; + "keera-callbacks" = dontDistribute super."keera-callbacks"; + "keera-hails-i18n" = dontDistribute super."keera-hails-i18n"; + "keera-hails-mvc-controller" = dontDistribute super."keera-hails-mvc-controller"; + "keera-hails-mvc-environment-gtk" = dontDistribute super."keera-hails-mvc-environment-gtk"; + "keera-hails-mvc-model-lightmodel" = dontDistribute super."keera-hails-mvc-model-lightmodel"; + "keera-hails-mvc-model-protectedmodel" = dontDistribute super."keera-hails-mvc-model-protectedmodel"; + "keera-hails-mvc-solutions-config" = dontDistribute super."keera-hails-mvc-solutions-config"; + "keera-hails-mvc-solutions-gtk" = dontDistribute super."keera-hails-mvc-solutions-gtk"; + "keera-hails-mvc-view" = dontDistribute super."keera-hails-mvc-view"; + "keera-hails-mvc-view-gtk" = dontDistribute super."keera-hails-mvc-view-gtk"; + "keera-hails-reactive-fs" = dontDistribute super."keera-hails-reactive-fs"; + "keera-hails-reactive-gtk" = dontDistribute super."keera-hails-reactive-gtk"; + "keera-hails-reactive-network" = dontDistribute super."keera-hails-reactive-network"; + "keera-hails-reactive-polling" = dontDistribute super."keera-hails-reactive-polling"; + "keera-hails-reactive-wx" = dontDistribute super."keera-hails-reactive-wx"; + "keera-hails-reactive-yampa" = dontDistribute super."keera-hails-reactive-yampa"; + "keera-hails-reactivelenses" = dontDistribute super."keera-hails-reactivelenses"; + "keera-hails-reactivevalues" = dontDistribute super."keera-hails-reactivevalues"; + "keera-posture" = dontDistribute super."keera-posture"; + "keiretsu" = dontDistribute super."keiretsu"; + "kevin" = dontDistribute super."kevin"; + "keyed" = dontDistribute super."keyed"; + "keyring" = dontDistribute super."keyring"; + "keystore" = dontDistribute super."keystore"; + "keyvaluehash" = dontDistribute super."keyvaluehash"; + "keyword-args" = dontDistribute super."keyword-args"; + "kibro" = dontDistribute super."kibro"; + "kicad-data" = dontDistribute super."kicad-data"; + "kickass-torrents-dump-parser" = dontDistribute super."kickass-torrents-dump-parser"; + "kickchan" = dontDistribute super."kickchan"; + "kif-parser" = dontDistribute super."kif-parser"; + "kinds" = dontDistribute super."kinds"; + "kit" = dontDistribute super."kit"; + "kmeans-par" = dontDistribute super."kmeans-par"; + "kmeans-vector" = dontDistribute super."kmeans-vector"; + "knots" = dontDistribute super."knots"; + "koellner-phonetic" = dontDistribute super."koellner-phonetic"; + "kontrakcja-templates" = dontDistribute super."kontrakcja-templates"; + "korfu" = dontDistribute super."korfu"; + "kqueue" = dontDistribute super."kqueue"; + "kraken" = dontDistribute super."kraken"; + "krpc" = dontDistribute super."krpc"; + "ks-test" = dontDistribute super."ks-test"; + "ktx" = dontDistribute super."ktx"; + "kure-your-boilerplate" = dontDistribute super."kure-your-boilerplate"; + "kyotocabinet" = dontDistribute super."kyotocabinet"; + "l-bfgs-b" = dontDistribute super."l-bfgs-b"; + "labeled-graph" = dontDistribute super."labeled-graph"; + "labeled-tree" = dontDistribute super."labeled-tree"; + "laborantin-hs" = dontDistribute super."laborantin-hs"; + "labyrinth" = dontDistribute super."labyrinth"; + "labyrinth-server" = dontDistribute super."labyrinth-server"; + "lackey" = dontDistribute super."lackey"; + "lagrangian" = dontDistribute super."lagrangian"; + "laika" = dontDistribute super."laika"; + "lambda-ast" = dontDistribute super."lambda-ast"; + "lambda-bridge" = dontDistribute super."lambda-bridge"; + "lambda-canvas" = dontDistribute super."lambda-canvas"; + "lambda-devs" = dontDistribute super."lambda-devs"; + "lambda-options" = dontDistribute super."lambda-options"; + "lambda-placeholders" = dontDistribute super."lambda-placeholders"; + "lambda-toolbox" = dontDistribute super."lambda-toolbox"; + "lambda2js" = dontDistribute super."lambda2js"; + "lambdaBase" = dontDistribute super."lambdaBase"; + "lambdaFeed" = dontDistribute super."lambdaFeed"; + "lambdaLit" = dontDistribute super."lambdaLit"; + "lambdabot-utils" = dontDistribute super."lambdabot-utils"; + "lambdacat" = dontDistribute super."lambdacat"; + "lambdacms-core" = dontDistribute super."lambdacms-core"; + "lambdacms-media" = dontDistribute super."lambdacms-media"; + "lambdacube" = dontDistribute super."lambdacube"; + "lambdacube-bullet" = dontDistribute super."lambdacube-bullet"; + "lambdacube-core" = dontDistribute super."lambdacube-core"; + "lambdacube-edsl" = dontDistribute super."lambdacube-edsl"; + "lambdacube-engine" = dontDistribute super."lambdacube-engine"; + "lambdacube-examples" = dontDistribute super."lambdacube-examples"; + "lambdacube-gl" = dontDistribute super."lambdacube-gl"; + "lambdacube-samples" = dontDistribute super."lambdacube-samples"; + "lambdatwit" = dontDistribute super."lambdatwit"; + "lambdiff" = dontDistribute super."lambdiff"; + "lame-tester" = dontDistribute super."lame-tester"; + "language-asn1" = dontDistribute super."language-asn1"; + "language-bash" = dontDistribute super."language-bash"; + "language-boogie" = dontDistribute super."language-boogie"; + "language-c-comments" = dontDistribute super."language-c-comments"; + "language-c-inline" = dontDistribute super."language-c-inline"; + "language-cil" = dontDistribute super."language-cil"; + "language-css" = dontDistribute super."language-css"; + "language-dot" = dontDistribute super."language-dot"; + "language-ecmascript-analysis" = dontDistribute super."language-ecmascript-analysis"; + "language-eiffel" = dontDistribute super."language-eiffel"; + "language-fortran" = dontDistribute super."language-fortran"; + "language-gcl" = dontDistribute super."language-gcl"; + "language-go" = dontDistribute super."language-go"; + "language-guess" = dontDistribute super."language-guess"; + "language-java-classfile" = dontDistribute super."language-java-classfile"; + "language-kort" = dontDistribute super."language-kort"; + "language-lua" = dontDistribute super."language-lua"; + "language-lua-qq" = dontDistribute super."language-lua-qq"; + "language-lua2" = dontDistribute super."language-lua2"; + "language-mixal" = dontDistribute super."language-mixal"; + "language-nix" = dontDistribute super."language-nix"; + "language-objc" = dontDistribute super."language-objc"; + "language-openscad" = dontDistribute super."language-openscad"; + "language-pig" = dontDistribute super."language-pig"; + "language-puppet" = dontDistribute super."language-puppet"; + "language-python" = dontDistribute super."language-python"; + "language-python-colour" = dontDistribute super."language-python-colour"; + "language-python-test" = dontDistribute super."language-python-test"; + "language-qux" = dontDistribute super."language-qux"; + "language-sh" = dontDistribute super."language-sh"; + "language-slice" = dontDistribute super."language-slice"; + "language-spelling" = dontDistribute super."language-spelling"; + "language-sqlite" = dontDistribute super."language-sqlite"; + "language-thrift" = dontDistribute super."language-thrift"; + "language-typescript" = dontDistribute super."language-typescript"; + "language-vhdl" = dontDistribute super."language-vhdl"; + "lat" = dontDistribute super."lat"; + "latest-npm-version" = dontDistribute super."latest-npm-version"; + "latex" = dontDistribute super."latex"; + "latex-formulae-image" = dontDistribute super."latex-formulae-image"; + "latex-formulae-pandoc" = dontDistribute super."latex-formulae-pandoc"; + "lattices" = doDistribute super."lattices_1_3"; + "launchpad-control" = dontDistribute super."launchpad-control"; + "lax" = dontDistribute super."lax"; + "layers" = dontDistribute super."layers"; + "layers-game" = dontDistribute super."layers-game"; + "layout" = dontDistribute super."layout"; + "layout-bootstrap" = dontDistribute super."layout-bootstrap"; + "lazy-io" = dontDistribute super."lazy-io"; + "lazyarray" = dontDistribute super."lazyarray"; + "lazyio" = dontDistribute super."lazyio"; + "lazysplines" = dontDistribute super."lazysplines"; + "lbfgs" = dontDistribute super."lbfgs"; + "lcs" = dontDistribute super."lcs"; + "lda" = dontDistribute super."lda"; + "ldap-client" = dontDistribute super."ldap-client"; + "ldif" = dontDistribute super."ldif"; + "leaf" = dontDistribute super."leaf"; + "leaky" = dontDistribute super."leaky"; + "leankit-api" = dontDistribute super."leankit-api"; + "leapseconds-announced" = dontDistribute super."leapseconds-announced"; + "learn" = dontDistribute super."learn"; + "learn-physics" = dontDistribute super."learn-physics"; + "learn-physics-examples" = dontDistribute super."learn-physics-examples"; + "learning-hmm" = dontDistribute super."learning-hmm"; + "leetify" = dontDistribute super."leetify"; + "leksah" = dontDistribute super."leksah"; + "leksah-server" = dontDistribute super."leksah-server"; + "lendingclub" = dontDistribute super."lendingclub"; + "lens-action" = doDistribute super."lens-action_0_2_0_1"; + "lens-datetime" = dontDistribute super."lens-datetime"; + "lens-prelude" = dontDistribute super."lens-prelude"; + "lens-properties" = dontDistribute super."lens-properties"; + "lens-regex" = dontDistribute super."lens-regex"; + "lens-sop" = dontDistribute super."lens-sop"; + "lens-text-encoding" = dontDistribute super."lens-text-encoding"; + "lens-time" = dontDistribute super."lens-time"; + "lens-tutorial" = dontDistribute super."lens-tutorial"; + "lenses" = dontDistribute super."lenses"; + "lensref" = dontDistribute super."lensref"; + "lentil" = dontDistribute super."lentil"; + "level-monad" = dontDistribute super."level-monad"; + "leveldb-haskell" = dontDistribute super."leveldb-haskell"; + "leveldb-haskell-fork" = dontDistribute super."leveldb-haskell-fork"; + "levmar" = dontDistribute super."levmar"; + "levmar-chart" = dontDistribute super."levmar-chart"; + "lgtk" = dontDistribute super."lgtk"; + "lha" = dontDistribute super."lha"; + "lhae" = dontDistribute super."lhae"; + "lhc" = dontDistribute super."lhc"; + "lhe" = dontDistribute super."lhe"; + "lhs2TeX-hl" = dontDistribute super."lhs2TeX-hl"; + "lhs2html" = dontDistribute super."lhs2html"; + "lhslatex" = dontDistribute super."lhslatex"; + "libGenI" = dontDistribute super."libGenI"; + "libarchive-conduit" = dontDistribute super."libarchive-conduit"; + "libconfig" = dontDistribute super."libconfig"; + "libcspm" = dontDistribute super."libcspm"; + "libexpect" = dontDistribute super."libexpect"; + "libffi" = dontDistribute super."libffi"; + "libgraph" = dontDistribute super."libgraph"; + "libhbb" = dontDistribute super."libhbb"; + "libinfluxdb" = dontDistribute super."libinfluxdb"; + "libjenkins" = dontDistribute super."libjenkins"; + "liblastfm" = dontDistribute super."liblastfm"; + "liblinear-enumerator" = dontDistribute super."liblinear-enumerator"; + "libltdl" = dontDistribute super."libltdl"; + "libmpd" = dontDistribute super."libmpd"; + "libnvvm" = dontDistribute super."libnvvm"; + "liboleg" = dontDistribute super."liboleg"; + "libpafe" = dontDistribute super."libpafe"; + "libpq" = dontDistribute super."libpq"; + "librandomorg" = dontDistribute super."librandomorg"; + "libravatar" = dontDistribute super."libravatar"; + "libssh2" = dontDistribute super."libssh2"; + "libssh2-conduit" = dontDistribute super."libssh2-conduit"; + "libstackexchange" = dontDistribute super."libstackexchange"; + "libsystemd-daemon" = dontDistribute super."libsystemd-daemon"; + "libsystemd-journal" = dontDistribute super."libsystemd-journal"; + "libtagc" = dontDistribute super."libtagc"; + "libvirt-hs" = dontDistribute super."libvirt-hs"; + "libvorbis" = dontDistribute super."libvorbis"; + "libxml" = dontDistribute super."libxml"; + "libxml-enumerator" = dontDistribute super."libxml-enumerator"; + "libxslt" = dontDistribute super."libxslt"; + "life" = dontDistribute super."life"; + "lifted-threads" = dontDistribute super."lifted-threads"; + "lifter" = dontDistribute super."lifter"; + "ligature" = dontDistribute super."ligature"; + "ligd" = dontDistribute super."ligd"; + "lighttpd-conf" = dontDistribute super."lighttpd-conf"; + "lighttpd-conf-qq" = dontDistribute super."lighttpd-conf-qq"; + "lilypond" = dontDistribute super."lilypond"; + "limp" = dontDistribute super."limp"; + "limp-cbc" = dontDistribute super."limp-cbc"; + "lin-alg" = dontDistribute super."lin-alg"; + "linda" = dontDistribute super."linda"; + "lindenmayer" = dontDistribute super."lindenmayer"; + "line-break" = dontDistribute super."line-break"; + "line2pdf" = dontDistribute super."line2pdf"; + "linear-algebra-cblas" = dontDistribute super."linear-algebra-cblas"; + "linear-circuit" = dontDistribute super."linear-circuit"; + "linear-grammar" = dontDistribute super."linear-grammar"; + "linear-maps" = dontDistribute super."linear-maps"; + "linear-opengl" = dontDistribute super."linear-opengl"; + "linear-vect" = dontDistribute super."linear-vect"; + "linearEqSolver" = dontDistribute super."linearEqSolver"; + "linearscan" = dontDistribute super."linearscan"; + "linearscan-hoopl" = dontDistribute super."linearscan-hoopl"; + "linebreak" = dontDistribute super."linebreak"; + "linguistic-ordinals" = dontDistribute super."linguistic-ordinals"; + "linkchk" = dontDistribute super."linkchk"; + "linkcore" = dontDistribute super."linkcore"; + "linkedhashmap" = dontDistribute super."linkedhashmap"; + "linklater" = dontDistribute super."linklater"; + "linux-blkid" = dontDistribute super."linux-blkid"; + "linux-cgroup" = dontDistribute super."linux-cgroup"; + "linux-evdev" = dontDistribute super."linux-evdev"; + "linux-inotify" = dontDistribute super."linux-inotify"; + "linux-kmod" = dontDistribute super."linux-kmod"; + "linux-mount" = dontDistribute super."linux-mount"; + "linux-perf" = dontDistribute super."linux-perf"; + "linux-ptrace" = dontDistribute super."linux-ptrace"; + "linux-xattr" = dontDistribute super."linux-xattr"; + "linx-gateway" = dontDistribute super."linx-gateway"; + "lio" = dontDistribute super."lio"; + "lio-eci11" = dontDistribute super."lio-eci11"; + "lio-fs" = dontDistribute super."lio-fs"; + "lio-simple" = dontDistribute super."lio-simple"; + "lipsum-gen" = dontDistribute super."lipsum-gen"; + "liquid-fixpoint" = dontDistribute super."liquid-fixpoint"; + "liquidhaskell" = dontDistribute super."liquidhaskell"; + "lispparser" = dontDistribute super."lispparser"; + "list-extras" = dontDistribute super."list-extras"; + "list-grouping" = dontDistribute super."list-grouping"; + "list-mux" = dontDistribute super."list-mux"; + "list-remote-forwards" = dontDistribute super."list-remote-forwards"; + "list-t-attoparsec" = dontDistribute super."list-t-attoparsec"; + "list-t-html-parser" = dontDistribute super."list-t-html-parser"; + "list-t-http-client" = dontDistribute super."list-t-http-client"; + "list-t-libcurl" = dontDistribute super."list-t-libcurl"; + "list-t-text" = dontDistribute super."list-t-text"; + "list-tries" = dontDistribute super."list-tries"; + "listlike-instances" = dontDistribute super."listlike-instances"; + "lists" = dontDistribute super."lists"; + "listsafe" = dontDistribute super."listsafe"; + "lit" = dontDistribute super."lit"; + "literals" = dontDistribute super."literals"; + "live-sequencer" = dontDistribute super."live-sequencer"; + "ll-picosat" = dontDistribute super."ll-picosat"; + "llrbtree" = dontDistribute super."llrbtree"; + "llsd" = dontDistribute super."llsd"; + "llvm" = dontDistribute super."llvm"; + "llvm-analysis" = dontDistribute super."llvm-analysis"; + "llvm-base" = dontDistribute super."llvm-base"; + "llvm-base-types" = dontDistribute super."llvm-base-types"; + "llvm-base-util" = dontDistribute super."llvm-base-util"; + "llvm-data-interop" = dontDistribute super."llvm-data-interop"; + "llvm-extra" = dontDistribute super."llvm-extra"; + "llvm-ffi" = dontDistribute super."llvm-ffi"; + "llvm-general" = dontDistribute super."llvm-general"; + "llvm-general-pure" = dontDistribute super."llvm-general-pure"; + "llvm-general-quote" = dontDistribute super."llvm-general-quote"; + "llvm-ht" = dontDistribute super."llvm-ht"; + "llvm-pkg-config" = dontDistribute super."llvm-pkg-config"; + "llvm-pretty" = dontDistribute super."llvm-pretty"; + "llvm-pretty-bc-parser" = dontDistribute super."llvm-pretty-bc-parser"; + "llvm-tf" = dontDistribute super."llvm-tf"; + "llvm-tools" = dontDistribute super."llvm-tools"; + "lmdb" = dontDistribute super."lmdb"; + "load-env" = dontDistribute super."load-env"; + "loadavg" = dontDistribute super."loadavg"; + "local-address" = dontDistribute super."local-address"; + "local-search" = dontDistribute super."local-search"; + "located-base" = dontDistribute super."located-base"; + "locators" = dontDistribute super."locators"; + "loch" = dontDistribute super."loch"; + "lock-file" = dontDistribute super."lock-file"; + "lockfree-queue" = dontDistribute super."lockfree-queue"; + "log" = dontDistribute super."log"; + "log-effect" = dontDistribute super."log-effect"; + "log2json" = dontDistribute super."log2json"; + "logfloat" = dontDistribute super."logfloat"; + "logger" = dontDistribute super."logger"; + "logging" = dontDistribute super."logging"; + "logging-facade-journald" = dontDistribute super."logging-facade-journald"; + "logic-TPTP" = dontDistribute super."logic-TPTP"; + "logic-classes" = dontDistribute super."logic-classes"; + "logicst" = dontDistribute super."logicst"; + "logsink" = dontDistribute super."logsink"; + "lojban" = dontDistribute super."lojban"; + "lojbanParser" = dontDistribute super."lojbanParser"; + "lojbanXiragan" = dontDistribute super."lojbanXiragan"; + "lojysamban" = dontDistribute super."lojysamban"; + "lol" = dontDistribute super."lol"; + "loli" = dontDistribute super."loli"; + "lookup-tables" = dontDistribute super."lookup-tables"; + "loop" = doDistribute super."loop_0_2_0"; + "loop-effin" = dontDistribute super."loop-effin"; + "loop-while" = dontDistribute super."loop-while"; + "loops" = dontDistribute super."loops"; + "loopy" = dontDistribute super."loopy"; + "lord" = dontDistribute super."lord"; + "lorem" = dontDistribute super."lorem"; + "loris" = dontDistribute super."loris"; + "loshadka" = dontDistribute super."loshadka"; + "lostcities" = dontDistribute super."lostcities"; + "lowgl" = dontDistribute super."lowgl"; + "ls-usb" = dontDistribute super."ls-usb"; + "lscabal" = dontDistribute super."lscabal"; + "lss" = dontDistribute super."lss"; + "lsystem" = dontDistribute super."lsystem"; + "ltk" = dontDistribute super."ltk"; + "ltl" = dontDistribute super."ltl"; + "lua-bytecode" = dontDistribute super."lua-bytecode"; + "luachunk" = dontDistribute super."luachunk"; + "luautils" = dontDistribute super."luautils"; + "lub" = dontDistribute super."lub"; + "lucid-foundation" = dontDistribute super."lucid-foundation"; + "lucienne" = dontDistribute super."lucienne"; + "luhn" = dontDistribute super."luhn"; + "lui" = dontDistribute super."lui"; + "luka" = dontDistribute super."luka"; + "luminance" = dontDistribute super."luminance"; + "luminance-samples" = dontDistribute super."luminance-samples"; + "lushtags" = dontDistribute super."lushtags"; + "luthor" = dontDistribute super."luthor"; + "lvish" = dontDistribute super."lvish"; + "lvmlib" = dontDistribute super."lvmlib"; + "lvmrun" = dontDistribute super."lvmrun"; + "lxc" = dontDistribute super."lxc"; + "lye" = dontDistribute super."lye"; + "lz4" = dontDistribute super."lz4"; + "lzma" = dontDistribute super."lzma"; + "lzma-clib" = dontDistribute super."lzma-clib"; + "lzma-enumerator" = dontDistribute super."lzma-enumerator"; + "lzma-streams" = dontDistribute super."lzma-streams"; + "maam" = dontDistribute super."maam"; + "mac" = dontDistribute super."mac"; + "maccatcher" = dontDistribute super."maccatcher"; + "machinecell" = dontDistribute super."machinecell"; + "machines-zlib" = dontDistribute super."machines-zlib"; + "macho" = dontDistribute super."macho"; + "maclight" = dontDistribute super."maclight"; + "macosx-make-standalone" = dontDistribute super."macosx-make-standalone"; + "mage" = dontDistribute super."mage"; + "magico" = dontDistribute super."magico"; + "magma" = dontDistribute super."magma"; + "mahoro" = dontDistribute super."mahoro"; + "maid" = dontDistribute super."maid"; + "mailbox-count" = dontDistribute super."mailbox-count"; + "mailchimp-subscribe" = dontDistribute super."mailchimp-subscribe"; + "mailgun" = dontDistribute super."mailgun"; + "majordomo" = dontDistribute super."majordomo"; + "majority" = dontDistribute super."majority"; + "make-hard-links" = dontDistribute super."make-hard-links"; + "make-package" = dontDistribute super."make-package"; + "makedo" = dontDistribute super."makedo"; + "manatee" = dontDistribute super."manatee"; + "manatee-all" = dontDistribute super."manatee-all"; + "manatee-anything" = dontDistribute super."manatee-anything"; + "manatee-browser" = dontDistribute super."manatee-browser"; + "manatee-core" = dontDistribute super."manatee-core"; + "manatee-curl" = dontDistribute super."manatee-curl"; + "manatee-editor" = dontDistribute super."manatee-editor"; + "manatee-filemanager" = dontDistribute super."manatee-filemanager"; + "manatee-imageviewer" = dontDistribute super."manatee-imageviewer"; + "manatee-ircclient" = dontDistribute super."manatee-ircclient"; + "manatee-mplayer" = dontDistribute super."manatee-mplayer"; + "manatee-pdfviewer" = dontDistribute super."manatee-pdfviewer"; + "manatee-processmanager" = dontDistribute super."manatee-processmanager"; + "manatee-reader" = dontDistribute super."manatee-reader"; + "manatee-template" = dontDistribute super."manatee-template"; + "manatee-terminal" = dontDistribute super."manatee-terminal"; + "manatee-welcome" = dontDistribute super."manatee-welcome"; + "mancala" = dontDistribute super."mancala"; + "mandrill" = doDistribute super."mandrill_0_3_0_0"; + "mandulia" = dontDistribute super."mandulia"; + "manifold-random" = dontDistribute super."manifold-random"; + "manifolds" = dontDistribute super."manifolds"; + "marionetta" = dontDistribute super."marionetta"; + "markdown-kate" = dontDistribute super."markdown-kate"; + "markdown-pap" = dontDistribute super."markdown-pap"; + "markdown-unlit" = dontDistribute super."markdown-unlit"; + "markdown2svg" = dontDistribute super."markdown2svg"; + "marked-pretty" = dontDistribute super."marked-pretty"; + "markov" = dontDistribute super."markov"; + "markov-chain" = dontDistribute super."markov-chain"; + "markov-processes" = dontDistribute super."markov-processes"; + "markup-preview" = dontDistribute super."markup-preview"; + "marmalade-upload" = dontDistribute super."marmalade-upload"; + "marquise" = dontDistribute super."marquise"; + "marxup" = dontDistribute super."marxup"; + "masakazu-bot" = dontDistribute super."masakazu-bot"; + "mastermind" = dontDistribute super."mastermind"; + "matchers" = dontDistribute super."matchers"; + "mathblog" = dontDistribute super."mathblog"; + "mathgenealogy" = dontDistribute super."mathgenealogy"; + "mathista" = dontDistribute super."mathista"; + "mathlink" = dontDistribute super."mathlink"; + "matlab" = dontDistribute super."matlab"; + "matrix-market" = dontDistribute super."matrix-market"; + "matrix-market-pure" = dontDistribute super."matrix-market-pure"; + "matsuri" = dontDistribute super."matsuri"; + "maude" = dontDistribute super."maude"; + "maxent" = dontDistribute super."maxent"; + "maxsharing" = dontDistribute super."maxsharing"; + "maybe-justify" = dontDistribute super."maybe-justify"; + "maybench" = dontDistribute super."maybench"; + "mbox-tools" = dontDistribute super."mbox-tools"; + "mcmaster-gloss-examples" = dontDistribute super."mcmaster-gloss-examples"; + "mcmc-samplers" = dontDistribute super."mcmc-samplers"; + "mcmc-synthesis" = dontDistribute super."mcmc-synthesis"; + "mcmc-types" = dontDistribute super."mcmc-types"; + "mcpi" = dontDistribute super."mcpi"; + "mdcat" = dontDistribute super."mdcat"; + "mdo" = dontDistribute super."mdo"; + "mecab" = dontDistribute super."mecab"; + "mecha" = dontDistribute super."mecha"; + "mediawiki" = dontDistribute super."mediawiki"; + "mediawiki2latex" = dontDistribute super."mediawiki2latex"; + "meep" = dontDistribute super."meep"; + "mega-sdist" = dontDistribute super."mega-sdist"; + "megaparsec" = dontDistribute super."megaparsec"; + "meldable-heap" = dontDistribute super."meldable-heap"; + "melody" = dontDistribute super."melody"; + "memcache" = dontDistribute super."memcache"; + "memcache-conduit" = dontDistribute super."memcache-conduit"; + "memcache-haskell" = dontDistribute super."memcache-haskell"; + "memcached" = dontDistribute super."memcached"; + "memexml" = dontDistribute super."memexml"; + "memo-ptr" = dontDistribute super."memo-ptr"; + "memo-sqlite" = dontDistribute super."memo-sqlite"; + "memoization-utils" = dontDistribute super."memoization-utils"; + "memory" = doDistribute super."memory_0_7"; + "memscript" = dontDistribute super."memscript"; + "mersenne-random" = dontDistribute super."mersenne-random"; + "messente" = dontDistribute super."messente"; + "meta-misc" = dontDistribute super."meta-misc"; + "meta-par" = dontDistribute super."meta-par"; + "meta-par-accelerate" = dontDistribute super."meta-par-accelerate"; + "metadata" = dontDistribute super."metadata"; + "metamorphic" = dontDistribute super."metamorphic"; + "metaplug" = dontDistribute super."metaplug"; + "metric" = dontDistribute super."metric"; + "metricsd-client" = dontDistribute super."metricsd-client"; + "metronome" = dontDistribute super."metronome"; + "mezzolens" = dontDistribute super."mezzolens"; + "mfsolve" = dontDistribute super."mfsolve"; + "mgeneric" = dontDistribute super."mgeneric"; + "mi" = dontDistribute super."mi"; + "microbench" = dontDistribute super."microbench"; + "microformats2-parser" = dontDistribute super."microformats2-parser"; + "microformats2-types" = dontDistribute super."microformats2-types"; + "microlens" = doDistribute super."microlens_0_2_0_0"; + "microlens-each" = dontDistribute super."microlens-each"; + "microlens-ghc" = doDistribute super."microlens-ghc_0_1_0_1"; + "microlens-mtl" = doDistribute super."microlens-mtl_0_1_4_0"; + "microlens-platform" = dontDistribute super."microlens-platform"; + "microlens-th" = doDistribute super."microlens-th_0_2_1_1"; + "microtimer" = dontDistribute super."microtimer"; + "mida" = dontDistribute super."mida"; + "midi" = dontDistribute super."midi"; + "midi-alsa" = dontDistribute super."midi-alsa"; + "midi-music-box" = dontDistribute super."midi-music-box"; + "midi-util" = dontDistribute super."midi-util"; + "midimory" = dontDistribute super."midimory"; + "midisurface" = dontDistribute super."midisurface"; + "mighttpd" = dontDistribute super."mighttpd"; + "mighttpd2" = dontDistribute super."mighttpd2"; + "mighty-metropolis" = dontDistribute super."mighty-metropolis"; + "mikmod" = dontDistribute super."mikmod"; + "miku" = dontDistribute super."miku"; + "milena" = dontDistribute super."milena"; + "mime" = dontDistribute super."mime"; + "mime-directory" = dontDistribute super."mime-directory"; + "mime-string" = dontDistribute super."mime-string"; + "mines" = dontDistribute super."mines"; + "minesweeper" = dontDistribute super."minesweeper"; + "miniball" = dontDistribute super."miniball"; + "miniforth" = dontDistribute super."miniforth"; + "minimal-configuration" = dontDistribute super."minimal-configuration"; + "minimorph" = dontDistribute super."minimorph"; + "minimung" = dontDistribute super."minimung"; + "minions" = dontDistribute super."minions"; + "minioperational" = dontDistribute super."minioperational"; + "miniplex" = dontDistribute super."miniplex"; + "minirotate" = dontDistribute super."minirotate"; + "minisat" = dontDistribute super."minisat"; + "ministg" = dontDistribute super."ministg"; + "miniutter" = dontDistribute super."miniutter"; + "minst-idx" = dontDistribute super."minst-idx"; + "mirror-tweet" = dontDistribute super."mirror-tweet"; + "missing-py2" = dontDistribute super."missing-py2"; + "mix-arrows" = dontDistribute super."mix-arrows"; + "mixed-strategies" = dontDistribute super."mixed-strategies"; + "mkbndl" = dontDistribute super."mkbndl"; + "mkcabal" = dontDistribute super."mkcabal"; + "ml-w" = dontDistribute super."ml-w"; + "mlist" = dontDistribute super."mlist"; + "mmtl" = dontDistribute super."mmtl"; + "mmtl-base" = dontDistribute super."mmtl-base"; + "moan" = dontDistribute super."moan"; + "modbus-tcp" = dontDistribute super."modbus-tcp"; + "modelicaparser" = dontDistribute super."modelicaparser"; + "modsplit" = dontDistribute super."modsplit"; + "modular-arithmetic" = dontDistribute super."modular-arithmetic"; + "modular-prelude" = dontDistribute super."modular-prelude"; + "modular-prelude-classy" = dontDistribute super."modular-prelude-classy"; + "module-management" = dontDistribute super."module-management"; + "modulespection" = dontDistribute super."modulespection"; + "modulo" = dontDistribute super."modulo"; + "moe" = dontDistribute super."moe"; + "moesocks" = dontDistribute super."moesocks"; + "mohws" = dontDistribute super."mohws"; + "mole" = dontDistribute super."mole"; + "monad-abort-fd" = dontDistribute super."monad-abort-fd"; + "monad-atom" = dontDistribute super."monad-atom"; + "monad-atom-simple" = dontDistribute super."monad-atom-simple"; + "monad-bool" = dontDistribute super."monad-bool"; + "monad-classes" = dontDistribute super."monad-classes"; + "monad-codec" = dontDistribute super."monad-codec"; + "monad-exception" = dontDistribute super."monad-exception"; + "monad-fork" = dontDistribute super."monad-fork"; + "monad-gen" = dontDistribute super."monad-gen"; + "monad-interleave" = dontDistribute super."monad-interleave"; + "monad-levels" = dontDistribute super."monad-levels"; + "monad-loops-stm" = dontDistribute super."monad-loops-stm"; + "monad-lrs" = dontDistribute super."monad-lrs"; + "monad-memo" = dontDistribute super."monad-memo"; + "monad-mersenne-random" = dontDistribute super."monad-mersenne-random"; + "monad-open" = dontDistribute super."monad-open"; + "monad-ox" = dontDistribute super."monad-ox"; + "monad-parallel-progressbar" = dontDistribute super."monad-parallel-progressbar"; + "monad-param" = dontDistribute super."monad-param"; + "monad-ran" = dontDistribute super."monad-ran"; + "monad-resumption" = dontDistribute super."monad-resumption"; + "monad-state" = dontDistribute super."monad-state"; + "monad-statevar" = dontDistribute super."monad-statevar"; + "monad-stlike-io" = dontDistribute super."monad-stlike-io"; + "monad-stlike-stm" = dontDistribute super."monad-stlike-stm"; + "monad-supply" = dontDistribute super."monad-supply"; + "monad-task" = dontDistribute super."monad-task"; + "monad-time" = dontDistribute super."monad-time"; + "monad-tx" = dontDistribute super."monad-tx"; + "monad-unify" = dontDistribute super."monad-unify"; + "monad-wrap" = dontDistribute super."monad-wrap"; + "monadIO" = dontDistribute super."monadIO"; + "monadLib-compose" = dontDistribute super."monadLib-compose"; + "monadacme" = dontDistribute super."monadacme"; + "monadbi" = dontDistribute super."monadbi"; + "monadcryptorandom" = doDistribute super."monadcryptorandom_0_6_1"; + "monadfibre" = dontDistribute super."monadfibre"; + "monadiccp" = dontDistribute super."monadiccp"; + "monadiccp-gecode" = dontDistribute super."monadiccp-gecode"; + "monadio-unwrappable" = dontDistribute super."monadio-unwrappable"; + "monadlist" = dontDistribute super."monadlist"; + "monadloc" = dontDistribute super."monadloc"; + "monadloc-pp" = dontDistribute super."monadloc-pp"; + "monadplus" = dontDistribute super."monadplus"; + "monads-fd" = dontDistribute super."monads-fd"; + "monadtransform" = dontDistribute super."monadtransform"; + "monarch" = dontDistribute super."monarch"; + "mongodb-queue" = dontDistribute super."mongodb-queue"; + "mongrel2-handler" = dontDistribute super."mongrel2-handler"; + "monitor" = dontDistribute super."monitor"; + "mono-foldable" = dontDistribute super."mono-foldable"; + "mono-traversable" = doDistribute super."mono-traversable_0_9_3"; + "monoid-absorbing" = dontDistribute super."monoid-absorbing"; + "monoid-owns" = dontDistribute super."monoid-owns"; + "monoid-record" = dontDistribute super."monoid-record"; + "monoid-statistics" = dontDistribute super."monoid-statistics"; + "monoid-transformer" = dontDistribute super."monoid-transformer"; + "monoidplus" = dontDistribute super."monoidplus"; + "monoids" = dontDistribute super."monoids"; + "monomorphic" = dontDistribute super."monomorphic"; + "montage" = dontDistribute super."montage"; + "montage-client" = dontDistribute super."montage-client"; + "monte-carlo" = dontDistribute super."monte-carlo"; + "moo" = dontDistribute super."moo"; + "moonshine" = dontDistribute super."moonshine"; + "morfette" = dontDistribute super."morfette"; + "morfeusz" = dontDistribute super."morfeusz"; + "morte" = dontDistribute super."morte"; + "mosaico-lib" = dontDistribute super."mosaico-lib"; + "mount" = dontDistribute super."mount"; + "mp" = dontDistribute super."mp"; + "mp3decoder" = dontDistribute super."mp3decoder"; + "mpdmate" = dontDistribute super."mpdmate"; + "mpppc" = dontDistribute super."mpppc"; + "mpretty" = dontDistribute super."mpretty"; + "mprover" = dontDistribute super."mprover"; + "mps" = dontDistribute super."mps"; + "mpvguihs" = dontDistribute super."mpvguihs"; + "mqtt-hs" = dontDistribute super."mqtt-hs"; + "ms" = dontDistribute super."ms"; + "msgpack" = dontDistribute super."msgpack"; + "msgpack-aeson" = dontDistribute super."msgpack-aeson"; + "msgpack-idl" = dontDistribute super."msgpack-idl"; + "msgpack-rpc" = dontDistribute super."msgpack-rpc"; + "msh" = dontDistribute super."msh"; + "msu" = dontDistribute super."msu"; + "mtgoxapi" = dontDistribute super."mtgoxapi"; + "mtl-c" = dontDistribute super."mtl-c"; + "mtl-evil-instances" = dontDistribute super."mtl-evil-instances"; + "mtl-tf" = dontDistribute super."mtl-tf"; + "mtl-unleashed" = dontDistribute super."mtl-unleashed"; + "mtlparse" = dontDistribute super."mtlparse"; + "mtlx" = dontDistribute super."mtlx"; + "mtp" = dontDistribute super."mtp"; + "mtree" = dontDistribute super."mtree"; + "mucipher" = dontDistribute super."mucipher"; + "mudbath" = dontDistribute super."mudbath"; + "muesli" = dontDistribute super."muesli"; + "multext-east-msd" = dontDistribute super."multext-east-msd"; + "multi-cabal" = dontDistribute super."multi-cabal"; + "multifocal" = dontDistribute super."multifocal"; + "multihash" = dontDistribute super."multihash"; + "multipart-names" = dontDistribute super."multipart-names"; + "multipass" = dontDistribute super."multipass"; + "multiplate" = dontDistribute super."multiplate"; + "multiplate-simplified" = dontDistribute super."multiplate-simplified"; + "multiplicity" = dontDistribute super."multiplicity"; + "multirec" = dontDistribute super."multirec"; + "multirec-alt-deriver" = dontDistribute super."multirec-alt-deriver"; + "multirec-binary" = dontDistribute super."multirec-binary"; + "multiset-comb" = dontDistribute super."multiset-comb"; + "multisetrewrite" = dontDistribute super."multisetrewrite"; + "multistate" = dontDistribute super."multistate"; + "muon" = dontDistribute super."muon"; + "murder" = dontDistribute super."murder"; + "murmur3" = dontDistribute super."murmur3"; + "murmurhash3" = dontDistribute super."murmurhash3"; + "music-articulation" = dontDistribute super."music-articulation"; + "music-diatonic" = dontDistribute super."music-diatonic"; + "music-dynamics" = dontDistribute super."music-dynamics"; + "music-dynamics-literal" = dontDistribute super."music-dynamics-literal"; + "music-graphics" = dontDistribute super."music-graphics"; + "music-parts" = dontDistribute super."music-parts"; + "music-pitch" = dontDistribute super."music-pitch"; + "music-pitch-literal" = dontDistribute super."music-pitch-literal"; + "music-preludes" = dontDistribute super."music-preludes"; + "music-score" = dontDistribute super."music-score"; + "music-sibelius" = dontDistribute super."music-sibelius"; + "music-suite" = dontDistribute super."music-suite"; + "music-util" = dontDistribute super."music-util"; + "musicbrainz-email" = dontDistribute super."musicbrainz-email"; + "musicxml" = dontDistribute super."musicxml"; + "musicxml2" = dontDistribute super."musicxml2"; + "mustache" = dontDistribute super."mustache"; + "mustache-haskell" = dontDistribute super."mustache-haskell"; + "mustache2hs" = dontDistribute super."mustache2hs"; + "mutable-iter" = dontDistribute super."mutable-iter"; + "mute-unmute" = dontDistribute super."mute-unmute"; + "mvc" = dontDistribute super."mvc"; + "mvc-updates" = dontDistribute super."mvc-updates"; + "mvclient" = dontDistribute super."mvclient"; + "mwc-probability" = dontDistribute super."mwc-probability"; + "mwc-random-monad" = dontDistribute super."mwc-random-monad"; + "myTestlll" = dontDistribute super."myTestlll"; + "mybitcoin-sci" = dontDistribute super."mybitcoin-sci"; + "myo" = dontDistribute super."myo"; + "mysnapsession" = dontDistribute super."mysnapsession"; + "mysnapsession-example" = dontDistribute super."mysnapsession-example"; + "mysql-effect" = dontDistribute super."mysql-effect"; + "mysql-simple-quasi" = dontDistribute super."mysql-simple-quasi"; + "mysql-simple-typed" = dontDistribute super."mysql-simple-typed"; + "mzv" = dontDistribute super."mzv"; + "n-m" = dontDistribute super."n-m"; + "nagios-check" = dontDistribute super."nagios-check"; + "nagios-perfdata" = dontDistribute super."nagios-perfdata"; + "nagios-plugin-ekg" = dontDistribute super."nagios-plugin-ekg"; + "named-formlet" = dontDistribute super."named-formlet"; + "named-lock" = dontDistribute super."named-lock"; + "named-records" = dontDistribute super."named-records"; + "namelist" = dontDistribute super."namelist"; + "names" = dontDistribute super."names"; + "names-th" = dontDistribute super."names-th"; + "nano-cryptr" = dontDistribute super."nano-cryptr"; + "nano-hmac" = dontDistribute super."nano-hmac"; + "nano-md5" = dontDistribute super."nano-md5"; + "nanoAgda" = dontDistribute super."nanoAgda"; + "nanocurses" = dontDistribute super."nanocurses"; + "nanomsg" = dontDistribute super."nanomsg"; + "nanomsg-haskell" = dontDistribute super."nanomsg-haskell"; + "nanoparsec" = dontDistribute super."nanoparsec"; + "narc" = dontDistribute super."narc"; + "nat" = dontDistribute super."nat"; + "nationstates" = doDistribute super."nationstates_0_2_0_3"; + "nats-queue" = dontDistribute super."nats-queue"; + "natural-number" = dontDistribute super."natural-number"; + "natural-numbers" = dontDistribute super."natural-numbers"; + "natural-sort" = dontDistribute super."natural-sort"; + "natural-transformation" = dontDistribute super."natural-transformation"; + "naturalcomp" = dontDistribute super."naturalcomp"; + "naturals" = dontDistribute super."naturals"; + "naver-translate" = dontDistribute super."naver-translate"; + "nbt" = dontDistribute super."nbt"; + "nc-indicators" = dontDistribute super."nc-indicators"; + "ncurses" = dontDistribute super."ncurses"; + "neat" = dontDistribute super."neat"; + "needle" = dontDistribute super."needle"; + "neet" = dontDistribute super."neet"; + "nehe-tuts" = dontDistribute super."nehe-tuts"; + "neil" = dontDistribute super."neil"; + "neither" = dontDistribute super."neither"; + "nemesis" = dontDistribute super."nemesis"; + "nemesis-titan" = dontDistribute super."nemesis-titan"; + "nerf" = dontDistribute super."nerf"; + "nero" = dontDistribute super."nero"; + "nero-wai" = dontDistribute super."nero-wai"; + "nero-warp" = dontDistribute super."nero-warp"; + "nested-routes" = dontDistribute super."nested-routes"; + "nested-sets" = dontDistribute super."nested-sets"; + "nestedmap" = dontDistribute super."nestedmap"; + "net-concurrent" = dontDistribute super."net-concurrent"; + "netclock" = dontDistribute super."netclock"; + "netcore" = dontDistribute super."netcore"; + "netlines" = dontDistribute super."netlines"; + "netlink" = dontDistribute super."netlink"; + "netlist" = dontDistribute super."netlist"; + "netlist-to-vhdl" = dontDistribute super."netlist-to-vhdl"; + "netpbm" = dontDistribute super."netpbm"; + "netrc" = dontDistribute super."netrc"; + "netspec" = dontDistribute super."netspec"; + "netstring-enumerator" = dontDistribute super."netstring-enumerator"; + "nettle" = dontDistribute super."nettle"; + "nettle-frp" = dontDistribute super."nettle-frp"; + "nettle-netkit" = dontDistribute super."nettle-netkit"; + "nettle-openflow" = dontDistribute super."nettle-openflow"; + "netwire" = dontDistribute super."netwire"; + "netwire-input" = dontDistribute super."netwire-input"; + "netwire-input-glfw" = dontDistribute super."netwire-input-glfw"; + "network-address" = dontDistribute super."network-address"; + "network-anonymous-tor" = doDistribute super."network-anonymous-tor_0_9_2"; + "network-api-support" = dontDistribute super."network-api-support"; + "network-bitcoin" = dontDistribute super."network-bitcoin"; + "network-builder" = dontDistribute super."network-builder"; + "network-bytestring" = dontDistribute super."network-bytestring"; + "network-conduit" = dontDistribute super."network-conduit"; + "network-connection" = dontDistribute super."network-connection"; + "network-data" = dontDistribute super."network-data"; + "network-dbus" = dontDistribute super."network-dbus"; + "network-dns" = dontDistribute super."network-dns"; + "network-enumerator" = dontDistribute super."network-enumerator"; + "network-fancy" = dontDistribute super."network-fancy"; + "network-house" = dontDistribute super."network-house"; + "network-interfacerequest" = dontDistribute super."network-interfacerequest"; + "network-ip" = dontDistribute super."network-ip"; + "network-metrics" = dontDistribute super."network-metrics"; + "network-minihttp" = dontDistribute super."network-minihttp"; + "network-msg" = dontDistribute super."network-msg"; + "network-netpacket" = dontDistribute super."network-netpacket"; + "network-pgi" = dontDistribute super."network-pgi"; + "network-rpca" = dontDistribute super."network-rpca"; + "network-server" = dontDistribute super."network-server"; + "network-service" = dontDistribute super."network-service"; + "network-simple-sockaddr" = dontDistribute super."network-simple-sockaddr"; + "network-simple-tls" = dontDistribute super."network-simple-tls"; + "network-socket-options" = dontDistribute super."network-socket-options"; + "network-stream" = dontDistribute super."network-stream"; + "network-topic-models" = dontDistribute super."network-topic-models"; + "network-transport-amqp" = dontDistribute super."network-transport-amqp"; + "network-transport-composed" = dontDistribute super."network-transport-composed"; + "network-transport-inmemory" = dontDistribute super."network-transport-inmemory"; + "network-transport-tcp" = dontDistribute super."network-transport-tcp"; + "network-transport-tests" = dontDistribute super."network-transport-tests"; + "network-transport-zeromq" = dontDistribute super."network-transport-zeromq"; + "network-uri-static" = dontDistribute super."network-uri-static"; + "network-wai-router" = dontDistribute super."network-wai-router"; + "network-websocket" = dontDistribute super."network-websocket"; + "networked-game" = dontDistribute super."networked-game"; + "newports" = dontDistribute super."newports"; + "newsynth" = dontDistribute super."newsynth"; + "newt" = dontDistribute super."newt"; + "newtype-deriving" = dontDistribute super."newtype-deriving"; + "newtype-th" = dontDistribute super."newtype-th"; + "newtyper" = dontDistribute super."newtyper"; + "nextstep-plist" = dontDistribute super."nextstep-plist"; + "nf" = dontDistribute super."nf"; + "ngrams-loader" = dontDistribute super."ngrams-loader"; + "nibblestring" = dontDistribute super."nibblestring"; + "nicify" = dontDistribute super."nicify"; + "nicify-lib" = dontDistribute super."nicify-lib"; + "nicovideo-translator" = dontDistribute super."nicovideo-translator"; + "nikepub" = dontDistribute super."nikepub"; + "nimber" = dontDistribute super."nimber"; + "nitro" = dontDistribute super."nitro"; + "nix-eval" = dontDistribute super."nix-eval"; + "nix-paths" = dontDistribute super."nix-paths"; + "nixfromnpm" = dontDistribute super."nixfromnpm"; + "nixos-types" = dontDistribute super."nixos-types"; + "nkjp" = dontDistribute super."nkjp"; + "nlp-scores" = dontDistribute super."nlp-scores"; + "nlp-scores-scripts" = dontDistribute super."nlp-scores-scripts"; + "nm" = dontDistribute super."nm"; + "nme" = dontDistribute super."nme"; + "nntp" = dontDistribute super."nntp"; + "no-buffering-workaround" = dontDistribute super."no-buffering-workaround"; + "no-role-annots" = dontDistribute super."no-role-annots"; + "nofib-analyze" = dontDistribute super."nofib-analyze"; + "noise" = dontDistribute super."noise"; + "non-empty" = dontDistribute super."non-empty"; + "non-negative" = dontDistribute super."non-negative"; + "nondeterminism" = dontDistribute super."nondeterminism"; + "nonfree" = dontDistribute super."nonfree"; + "nonlinear-optimization" = dontDistribute super."nonlinear-optimization"; + "nonlinear-optimization-ad" = dontDistribute super."nonlinear-optimization-ad"; + "noodle" = dontDistribute super."noodle"; + "normaldistribution" = dontDistribute super."normaldistribution"; + "not-gloss" = dontDistribute super."not-gloss"; + "not-gloss-examples" = dontDistribute super."not-gloss-examples"; + "not-in-base" = dontDistribute super."not-in-base"; + "notcpp" = dontDistribute super."notcpp"; + "notmuch-haskell" = dontDistribute super."notmuch-haskell"; + "notmuch-web" = dontDistribute super."notmuch-web"; + "notzero" = dontDistribute super."notzero"; + "np-extras" = dontDistribute super."np-extras"; + "np-linear" = dontDistribute super."np-linear"; + "nptools" = dontDistribute super."nptools"; + "nth-prime" = dontDistribute super."nth-prime"; + "nthable" = dontDistribute super."nthable"; + "ntp-control" = dontDistribute super."ntp-control"; + "null-canvas" = dontDistribute super."null-canvas"; + "nullary" = dontDistribute super."nullary"; + "number" = dontDistribute super."number"; + "numbering" = dontDistribute super."numbering"; + "numerals" = dontDistribute super."numerals"; + "numerals-base" = dontDistribute super."numerals-base"; + "numeric-extras" = doDistribute super."numeric-extras_0_0_3"; + "numeric-limits" = dontDistribute super."numeric-limits"; + "numeric-prelude" = dontDistribute super."numeric-prelude"; + "numeric-qq" = dontDistribute super."numeric-qq"; + "numeric-quest" = dontDistribute super."numeric-quest"; + "numeric-tools" = dontDistribute super."numeric-tools"; + "numericpeano" = dontDistribute super."numericpeano"; + "nums" = dontDistribute super."nums"; + "numtype-dk" = dontDistribute super."numtype-dk"; + "numtype-tf" = dontDistribute super."numtype-tf"; + "nurbs" = dontDistribute super."nurbs"; + "nvim-hs" = dontDistribute super."nvim-hs"; + "nvim-hs-contrib" = dontDistribute super."nvim-hs-contrib"; + "nyan" = dontDistribute super."nyan"; + "nylas" = dontDistribute super."nylas"; + "nymphaea" = dontDistribute super."nymphaea"; + "oauthenticated" = dontDistribute super."oauthenticated"; + "obdd" = dontDistribute super."obdd"; + "oberon0" = dontDistribute super."oberon0"; + "obj" = dontDistribute super."obj"; + "objectid" = dontDistribute super."objectid"; + "observable-sharing" = dontDistribute super."observable-sharing"; + "octohat" = dontDistribute super."octohat"; + "octopus" = dontDistribute super."octopus"; + "oculus" = dontDistribute super."oculus"; + "off-simple" = dontDistribute super."off-simple"; + "ofx" = dontDistribute super."ofx"; + "ohloh-hs" = dontDistribute super."ohloh-hs"; + "oi" = dontDistribute super."oi"; + "oidc-client" = dontDistribute super."oidc-client"; + "ois-input-manager" = dontDistribute super."ois-input-manager"; + "old-version" = dontDistribute super."old-version"; + "olwrapper" = dontDistribute super."olwrapper"; + "omaketex" = dontDistribute super."omaketex"; + "omega" = dontDistribute super."omega"; + "omnicodec" = dontDistribute super."omnicodec"; + "on-a-horse" = dontDistribute super."on-a-horse"; + "on-demand-ssh-tunnel" = dontDistribute super."on-demand-ssh-tunnel"; + "one-liner" = dontDistribute super."one-liner"; + "one-time-password" = dontDistribute super."one-time-password"; + "oneOfN" = dontDistribute super."oneOfN"; + "oneormore" = dontDistribute super."oneormore"; + "only" = dontDistribute super."only"; + "onu-course" = dontDistribute super."onu-course"; + "oo-prototypes" = dontDistribute super."oo-prototypes"; + "opaleye-classy" = dontDistribute super."opaleye-classy"; + "opaleye-sqlite" = dontDistribute super."opaleye-sqlite"; + "opaleye-trans" = dontDistribute super."opaleye-trans"; + "open-browser" = dontDistribute super."open-browser"; + "open-haddock" = dontDistribute super."open-haddock"; + "open-pandoc" = dontDistribute super."open-pandoc"; + "open-symbology" = dontDistribute super."open-symbology"; + "open-typerep" = dontDistribute super."open-typerep"; + "open-union" = dontDistribute super."open-union"; + "open-witness" = dontDistribute super."open-witness"; + "opencv-raw" = dontDistribute super."opencv-raw"; + "opendatatable" = dontDistribute super."opendatatable"; + "openexchangerates" = dontDistribute super."openexchangerates"; + "openflow" = dontDistribute super."openflow"; + "opengl-dlp-stereo" = dontDistribute super."opengl-dlp-stereo"; + "opengl-spacenavigator" = dontDistribute super."opengl-spacenavigator"; + "opengles" = dontDistribute super."opengles"; + "openid" = dontDistribute super."openid"; + "openpgp" = dontDistribute super."openpgp"; + "openpgp-Crypto" = dontDistribute super."openpgp-Crypto"; + "openpgp-crypto-api" = dontDistribute super."openpgp-crypto-api"; + "opensoundcontrol-ht" = dontDistribute super."opensoundcontrol-ht"; + "openssh-github-keys" = dontDistribute super."openssh-github-keys"; + "openssl-createkey" = dontDistribute super."openssl-createkey"; + "opentheory" = dontDistribute super."opentheory"; + "opentheory-bits" = dontDistribute super."opentheory-bits"; + "opentheory-byte" = dontDistribute super."opentheory-byte"; + "opentheory-char" = dontDistribute super."opentheory-char"; + "opentheory-divides" = dontDistribute super."opentheory-divides"; + "opentheory-fibonacci" = dontDistribute super."opentheory-fibonacci"; + "opentheory-parser" = dontDistribute super."opentheory-parser"; + "opentheory-prime" = dontDistribute super."opentheory-prime"; + "opentheory-primitive" = dontDistribute super."opentheory-primitive"; + "opentheory-probability" = dontDistribute super."opentheory-probability"; + "opentheory-stream" = dontDistribute super."opentheory-stream"; + "opentheory-unicode" = dontDistribute super."opentheory-unicode"; + "operational-alacarte" = dontDistribute super."operational-alacarte"; + "opml" = dontDistribute super."opml"; + "opml-conduit" = dontDistribute super."opml-conduit"; + "opn" = dontDistribute super."opn"; + "optimal-blocks" = dontDistribute super."optimal-blocks"; + "optimization" = dontDistribute super."optimization"; + "optimusprime" = dontDistribute super."optimusprime"; + "optional" = dontDistribute super."optional"; + "options-time" = dontDistribute super."options-time"; + "optparse-declarative" = dontDistribute super."optparse-declarative"; + "orc" = dontDistribute super."orc"; + "orchestrate" = dontDistribute super."orchestrate"; + "orchid" = dontDistribute super."orchid"; + "orchid-demo" = dontDistribute super."orchid-demo"; + "ord-adhoc" = dontDistribute super."ord-adhoc"; + "order-maintenance" = dontDistribute super."order-maintenance"; + "order-statistics" = dontDistribute super."order-statistics"; + "ordered" = dontDistribute super."ordered"; + "orders" = dontDistribute super."orders"; + "ordrea" = dontDistribute super."ordrea"; + "organize-imports" = dontDistribute super."organize-imports"; + "orgmode" = dontDistribute super."orgmode"; + "orgmode-parse" = dontDistribute super."orgmode-parse"; + "origami" = dontDistribute super."origami"; + "os-release" = dontDistribute super."os-release"; + "osc" = dontDistribute super."osc"; + "osm-download" = dontDistribute super."osm-download"; + "oso2pdf" = dontDistribute super."oso2pdf"; + "osx-ar" = dontDistribute super."osx-ar"; + "ot" = dontDistribute super."ot"; + "ottparse-pretty" = dontDistribute super."ottparse-pretty"; + "overture" = dontDistribute super."overture"; + "pack" = dontDistribute super."pack"; + "package-o-tron" = dontDistribute super."package-o-tron"; + "package-vt" = dontDistribute super."package-vt"; + "packdeps" = dontDistribute super."packdeps"; + "packed-dawg" = dontDistribute super."packed-dawg"; + "packedstring" = dontDistribute super."packedstring"; + "packer" = dontDistribute super."packer"; + "packunused" = dontDistribute super."packunused"; + "pacman-memcache" = dontDistribute super."pacman-memcache"; + "padKONTROL" = dontDistribute super."padKONTROL"; + "pagarme" = dontDistribute super."pagarme"; + "pagerduty" = doDistribute super."pagerduty_0_0_3_3"; + "pagure-hook-receiver" = dontDistribute super."pagure-hook-receiver"; + "palindromes" = dontDistribute super."palindromes"; + "pam" = dontDistribute super."pam"; + "panda" = dontDistribute super."panda"; + "pandoc" = doDistribute super."pandoc_1_15_1_1"; + "pandoc-citeproc" = doDistribute super."pandoc-citeproc_0_7_4"; + "pandoc-citeproc-preamble" = dontDistribute super."pandoc-citeproc-preamble"; + "pandoc-crossref" = dontDistribute super."pandoc-crossref"; + "pandoc-csv2table" = dontDistribute super."pandoc-csv2table"; + "pandoc-lens" = dontDistribute super."pandoc-lens"; + "pandoc-placetable" = dontDistribute super."pandoc-placetable"; + "pandoc-plantuml-diagrams" = dontDistribute super."pandoc-plantuml-diagrams"; + "pandoc-unlit" = dontDistribute super."pandoc-unlit"; + "papillon" = dontDistribute super."papillon"; + "pappy" = dontDistribute super."pappy"; + "para" = dontDistribute super."para"; + "paragon" = dontDistribute super."paragon"; + "parallel-tasks" = dontDistribute super."parallel-tasks"; + "parallel-tree-search" = dontDistribute super."parallel-tree-search"; + "parameterized-data" = dontDistribute super."parameterized-data"; + "parco" = dontDistribute super."parco"; + "parco-attoparsec" = dontDistribute super."parco-attoparsec"; + "parco-parsec" = dontDistribute super."parco-parsec"; + "parcom-lib" = dontDistribute super."parcom-lib"; + "parconc-examples" = dontDistribute super."parconc-examples"; + "parport" = dontDistribute super."parport"; + "parse-dimacs" = dontDistribute super."parse-dimacs"; + "parse-help" = dontDistribute super."parse-help"; + "parsec-extra" = dontDistribute super."parsec-extra"; + "parsec-numbers" = dontDistribute super."parsec-numbers"; + "parsec-parsers" = dontDistribute super."parsec-parsers"; + "parsec-permutation" = dontDistribute super."parsec-permutation"; + "parsec-tagsoup" = dontDistribute super."parsec-tagsoup"; + "parsec-trace" = dontDistribute super."parsec-trace"; + "parsec-utils" = dontDistribute super."parsec-utils"; + "parsec1" = dontDistribute super."parsec1"; + "parsec2" = dontDistribute super."parsec2"; + "parsec3" = dontDistribute super."parsec3"; + "parsec3-numbers" = dontDistribute super."parsec3-numbers"; + "parsedate" = dontDistribute super."parsedate"; + "parseerror-eq" = dontDistribute super."parseerror-eq"; + "parsek" = dontDistribute super."parsek"; + "parsely" = dontDistribute super."parsely"; + "parser-helper" = dontDistribute super."parser-helper"; + "parser241" = dontDistribute super."parser241"; + "parsergen" = dontDistribute super."parsergen"; + "parsestar" = dontDistribute super."parsestar"; + "parsimony" = dontDistribute super."parsimony"; + "partial" = dontDistribute super."partial"; + "partial-isomorphisms" = dontDistribute super."partial-isomorphisms"; + "partial-lens" = dontDistribute super."partial-lens"; + "partial-uri" = dontDistribute super."partial-uri"; + "partly" = dontDistribute super."partly"; + "passage" = dontDistribute super."passage"; + "passwords" = dontDistribute super."passwords"; + "pastis" = dontDistribute super."pastis"; + "pasty" = dontDistribute super."pasty"; + "patch-combinators" = dontDistribute super."patch-combinators"; + "patch-image" = dontDistribute super."patch-image"; + "patches-vector" = dontDistribute super."patches-vector"; + "pathfinding" = dontDistribute super."pathfinding"; + "pathfindingcore" = dontDistribute super."pathfindingcore"; + "pathtype" = dontDistribute super."pathtype"; + "pathwalk" = dontDistribute super."pathwalk"; + "patronscraper" = dontDistribute super."patronscraper"; + "patterns" = dontDistribute super."patterns"; + "paymill" = dontDistribute super."paymill"; + "paypal-adaptive-hoops" = dontDistribute super."paypal-adaptive-hoops"; + "paypal-api" = dontDistribute super."paypal-api"; + "pb" = dontDistribute super."pb"; + "pbc4hs" = dontDistribute super."pbc4hs"; + "pbkdf" = dontDistribute super."pbkdf"; + "pcap" = dontDistribute super."pcap"; + "pcap-conduit" = dontDistribute super."pcap-conduit"; + "pcap-enumerator" = dontDistribute super."pcap-enumerator"; + "pcd-loader" = dontDistribute super."pcd-loader"; + "pcf" = dontDistribute super."pcf"; + "pcg-random" = dontDistribute super."pcg-random"; + "pcre-heavy" = doDistribute super."pcre-heavy_0_2_5"; + "pcre-less" = dontDistribute super."pcre-less"; + "pcre-light" = doDistribute super."pcre-light_0_4_0_3"; + "pcre-light-extra" = dontDistribute super."pcre-light-extra"; + "pcre-utils" = dontDistribute super."pcre-utils"; + "pdf-toolbox-content" = dontDistribute super."pdf-toolbox-content"; + "pdf-toolbox-core" = dontDistribute super."pdf-toolbox-core"; + "pdf-toolbox-document" = dontDistribute super."pdf-toolbox-document"; + "pdf-toolbox-viewer" = dontDistribute super."pdf-toolbox-viewer"; + "pdf2line" = dontDistribute super."pdf2line"; + "pdfsplit" = dontDistribute super."pdfsplit"; + "pdynload" = dontDistribute super."pdynload"; + "peakachu" = dontDistribute super."peakachu"; + "peano" = dontDistribute super."peano"; + "peano-inf" = dontDistribute super."peano-inf"; + "pec" = dontDistribute super."pec"; + "pecoff" = dontDistribute super."pecoff"; + "peg" = dontDistribute super."peg"; + "peggy" = dontDistribute super."peggy"; + "pell" = dontDistribute super."pell"; + "penn-treebank" = dontDistribute super."penn-treebank"; + "penny" = dontDistribute super."penny"; + "penny-bin" = dontDistribute super."penny-bin"; + "penny-lib" = dontDistribute super."penny-lib"; + "peparser" = dontDistribute super."peparser"; + "perceptron" = dontDistribute super."perceptron"; + "perdure" = dontDistribute super."perdure"; + "period" = dontDistribute super."period"; + "perm" = dontDistribute super."perm"; + "permutation" = dontDistribute super."permutation"; + "permute" = dontDistribute super."permute"; + "persist2er" = dontDistribute super."persist2er"; + "persistable-record" = dontDistribute super."persistable-record"; + "persistent-cereal" = dontDistribute super."persistent-cereal"; + "persistent-equivalence" = dontDistribute super."persistent-equivalence"; + "persistent-hssqlppp" = dontDistribute super."persistent-hssqlppp"; + "persistent-instances-iproute" = dontDistribute super."persistent-instances-iproute"; + "persistent-map" = dontDistribute super."persistent-map"; + "persistent-mysql" = doDistribute super."persistent-mysql_2_2"; + "persistent-odbc" = dontDistribute super."persistent-odbc"; + "persistent-protobuf" = dontDistribute super."persistent-protobuf"; + "persistent-ratelimit" = dontDistribute super."persistent-ratelimit"; + "persistent-redis" = dontDistribute super."persistent-redis"; + "persistent-vector" = dontDistribute super."persistent-vector"; + "persistent-zookeeper" = dontDistribute super."persistent-zookeeper"; + "persona" = dontDistribute super."persona"; + "persona-idp" = dontDistribute super."persona-idp"; + "pesca" = dontDistribute super."pesca"; + "peyotls" = dontDistribute super."peyotls"; + "peyotls-codec" = dontDistribute super."peyotls-codec"; + "pez" = dontDistribute super."pez"; + "pg-harness" = dontDistribute super."pg-harness"; + "pg-harness-client" = dontDistribute super."pg-harness-client"; + "pg-harness-server" = dontDistribute super."pg-harness-server"; + "pgdl" = dontDistribute super."pgdl"; + "pgm" = dontDistribute super."pgm"; + "pgp-wordlist" = dontDistribute super."pgp-wordlist"; + "pgsql-simple" = dontDistribute super."pgsql-simple"; + "pgstream" = dontDistribute super."pgstream"; + "phasechange" = dontDistribute super."phasechange"; + "phizzle" = dontDistribute super."phizzle"; + "phone-numbers" = dontDistribute super."phone-numbers"; + "phone-push" = dontDistribute super."phone-push"; + "phonetic-code" = dontDistribute super."phonetic-code"; + "phooey" = dontDistribute super."phooey"; + "photoname" = dontDistribute super."photoname"; + "phraskell" = dontDistribute super."phraskell"; + "phybin" = dontDistribute super."phybin"; + "pi-calculus" = dontDistribute super."pi-calculus"; + "pia-forward" = dontDistribute super."pia-forward"; + "pianola" = dontDistribute super."pianola"; + "picologic" = dontDistribute super."picologic"; + "picosat" = dontDistribute super."picosat"; + "piet" = dontDistribute super."piet"; + "piki" = dontDistribute super."piki"; + "pinboard" = dontDistribute super."pinboard"; + "pipe-enumerator" = dontDistribute super."pipe-enumerator"; + "pipeclip" = dontDistribute super."pipeclip"; + "pipes-async" = dontDistribute super."pipes-async"; + "pipes-attoparsec-streaming" = dontDistribute super."pipes-attoparsec-streaming"; + "pipes-cellular" = dontDistribute super."pipes-cellular"; + "pipes-cellular-csv" = dontDistribute super."pipes-cellular-csv"; + "pipes-cereal" = dontDistribute super."pipes-cereal"; + "pipes-cereal-plus" = dontDistribute super."pipes-cereal-plus"; + "pipes-conduit" = dontDistribute super."pipes-conduit"; + "pipes-core" = dontDistribute super."pipes-core"; + "pipes-courier" = dontDistribute super."pipes-courier"; + "pipes-csv" = dontDistribute super."pipes-csv"; + "pipes-errors" = dontDistribute super."pipes-errors"; + "pipes-extra" = dontDistribute super."pipes-extra"; + "pipes-extras" = dontDistribute super."pipes-extras"; + "pipes-files" = dontDistribute super."pipes-files"; + "pipes-interleave" = dontDistribute super."pipes-interleave"; + "pipes-mongodb" = dontDistribute super."pipes-mongodb"; + "pipes-network-tls" = dontDistribute super."pipes-network-tls"; + "pipes-p2p" = dontDistribute super."pipes-p2p"; + "pipes-p2p-examples" = dontDistribute super."pipes-p2p-examples"; + "pipes-postgresql-simple" = dontDistribute super."pipes-postgresql-simple"; + "pipes-rt" = dontDistribute super."pipes-rt"; + "pipes-shell" = dontDistribute super."pipes-shell"; + "pipes-sqlite-simple" = dontDistribute super."pipes-sqlite-simple"; + "pipes-vector" = dontDistribute super."pipes-vector"; + "pipes-websockets" = dontDistribute super."pipes-websockets"; + "pipes-zeromq4" = dontDistribute super."pipes-zeromq4"; + "pipes-zlib" = dontDistribute super."pipes-zlib"; + "pisigma" = dontDistribute super."pisigma"; + "pit" = dontDistribute super."pit"; + "pitchtrack" = dontDistribute super."pitchtrack"; + "pivotal-tracker" = dontDistribute super."pivotal-tracker"; + "pkcs1" = dontDistribute super."pkcs1"; + "pkcs7" = dontDistribute super."pkcs7"; + "pkggraph" = dontDistribute super."pkggraph"; + "pktree" = dontDistribute super."pktree"; + "plailude" = dontDistribute super."plailude"; + "planar-graph" = dontDistribute super."planar-graph"; + "plat" = dontDistribute super."plat"; + "playlists" = dontDistribute super."playlists"; + "plist" = dontDistribute super."plist"; + "plivo" = dontDistribute super."plivo"; + "plot" = doDistribute super."plot_0_2_3_4"; + "plot-gtk" = doDistribute super."plot-gtk_0_2_0_2"; + "plot-gtk-ui" = dontDistribute super."plot-gtk-ui"; + "plot-gtk3" = doDistribute super."plot-gtk3_0_1_0_1"; + "plot-lab" = dontDistribute super."plot-lab"; + "plotfont" = dontDistribute super."plotfont"; + "plotserver-api" = dontDistribute super."plotserver-api"; + "plugins" = dontDistribute super."plugins"; + "plugins-auto" = dontDistribute super."plugins-auto"; + "plugins-multistage" = dontDistribute super."plugins-multistage"; + "plumbers" = dontDistribute super."plumbers"; + "ply-loader" = dontDistribute super."ply-loader"; + "png-file" = dontDistribute super."png-file"; + "pngload" = dontDistribute super."pngload"; + "pngload-fixed" = dontDistribute super."pngload-fixed"; + "pnm" = dontDistribute super."pnm"; + "pocket-dns" = dontDistribute super."pocket-dns"; + "pointedlist" = dontDistribute super."pointedlist"; + "pointfree" = dontDistribute super."pointfree"; + "pointful" = dontDistribute super."pointful"; + "pointless-fun" = dontDistribute super."pointless-fun"; + "pointless-haskell" = dontDistribute super."pointless-haskell"; + "pointless-lenses" = dontDistribute super."pointless-lenses"; + "pointless-rewrite" = dontDistribute super."pointless-rewrite"; + "poker-eval" = dontDistribute super."poker-eval"; + "pokitdok" = dontDistribute super."pokitdok"; + "polar" = dontDistribute super."polar"; + "polar-configfile" = dontDistribute super."polar-configfile"; + "polar-shader" = dontDistribute super."polar-shader"; + "polh-lexicon" = dontDistribute super."polh-lexicon"; + "polimorf" = dontDistribute super."polimorf"; + "poll" = dontDistribute super."poll"; + "polyToMonoid" = dontDistribute super."polyToMonoid"; + "polymap" = dontDistribute super."polymap"; + "polynomial" = dontDistribute super."polynomial"; + "polynomials-bernstein" = dontDistribute super."polynomials-bernstein"; + "polyseq" = dontDistribute super."polyseq"; + "polysoup" = dontDistribute super."polysoup"; + "polytypeable" = dontDistribute super."polytypeable"; + "polytypeable-utils" = dontDistribute super."polytypeable-utils"; + "ponder" = dontDistribute super."ponder"; + "pontarius-mediaserver" = dontDistribute super."pontarius-mediaserver"; + "pontarius-xmpp" = dontDistribute super."pontarius-xmpp"; + "pontarius-xpmn" = dontDistribute super."pontarius-xpmn"; + "pony" = dontDistribute super."pony"; + "pool" = dontDistribute super."pool"; + "pool-conduit" = dontDistribute super."pool-conduit"; + "pooled-io" = dontDistribute super."pooled-io"; + "pop3-client" = dontDistribute super."pop3-client"; + "popenhs" = dontDistribute super."popenhs"; + "poppler" = dontDistribute super."poppler"; + "populate-setup-exe-cache" = dontDistribute super."populate-setup-exe-cache"; + "portable-lines" = dontDistribute super."portable-lines"; + "portaudio" = dontDistribute super."portaudio"; + "porte" = dontDistribute super."porte"; + "porter" = dontDistribute super."porter"; + "ports" = dontDistribute super."ports"; + "ports-tools" = dontDistribute super."ports-tools"; + "positive" = dontDistribute super."positive"; + "posix-acl" = dontDistribute super."posix-acl"; + "posix-escape" = dontDistribute super."posix-escape"; + "posix-filelock" = dontDistribute super."posix-filelock"; + "posix-paths" = dontDistribute super."posix-paths"; + "posix-pty" = dontDistribute super."posix-pty"; + "posix-timer" = dontDistribute super."posix-timer"; + "posix-waitpid" = dontDistribute super."posix-waitpid"; + "possible" = dontDistribute super."possible"; + "post-mess-age" = doDistribute super."post-mess-age_0_1_0_0"; + "postcodes" = dontDistribute super."postcodes"; + "postgresql-config" = dontDistribute super."postgresql-config"; + "postgresql-copy-escape" = dontDistribute super."postgresql-copy-escape"; + "postgresql-cube" = dontDistribute super."postgresql-cube"; + "postgresql-orm" = dontDistribute super."postgresql-orm"; + "postgresql-query" = dontDistribute super."postgresql-query"; + "postgresql-schema" = dontDistribute super."postgresql-schema"; + "postgresql-simple-migration" = dontDistribute super."postgresql-simple-migration"; + "postgresql-simple-sop" = dontDistribute super."postgresql-simple-sop"; + "postgresql-simple-typed" = dontDistribute super."postgresql-simple-typed"; + "postgresql-typed" = dontDistribute super."postgresql-typed"; + "postgrest" = dontDistribute super."postgrest"; + "postie" = dontDistribute super."postie"; + "postmark" = dontDistribute super."postmark"; + "postmaster" = dontDistribute super."postmaster"; + "potato-tool" = dontDistribute super."potato-tool"; + "potrace" = dontDistribute super."potrace"; + "potrace-diagrams" = dontDistribute super."potrace-diagrams"; + "powermate" = dontDistribute super."powermate"; + "powerpc" = dontDistribute super."powerpc"; + "ppm" = dontDistribute super."ppm"; + "pqc" = dontDistribute super."pqc"; + "pqueue-mtl" = dontDistribute super."pqueue-mtl"; + "practice-room" = dontDistribute super."practice-room"; + "precis" = dontDistribute super."precis"; + "pred-trie" = doDistribute super."pred-trie_0_2_0"; + "predicates" = dontDistribute super."predicates"; + "prednote-test" = dontDistribute super."prednote-test"; + "prefork" = dontDistribute super."prefork"; + "pregame" = dontDistribute super."pregame"; + "prelude-generalize" = dontDistribute super."prelude-generalize"; + "prelude-plus" = dontDistribute super."prelude-plus"; + "prelude-prime" = dontDistribute super."prelude-prime"; + "prelude-safeenum" = dontDistribute super."prelude-safeenum"; + "preprocess-haskell" = dontDistribute super."preprocess-haskell"; + "preprocessor-tools" = dontDistribute super."preprocessor-tools"; + "present" = dontDistribute super."present"; + "press" = dontDistribute super."press"; + "presto-hdbc" = dontDistribute super."presto-hdbc"; + "prettify" = dontDistribute super."prettify"; + "pretty-compact" = dontDistribute super."pretty-compact"; + "pretty-error" = dontDistribute super."pretty-error"; + "pretty-hex" = dontDistribute super."pretty-hex"; + "pretty-ncols" = dontDistribute super."pretty-ncols"; + "pretty-sop" = dontDistribute super."pretty-sop"; + "pretty-tree" = dontDistribute super."pretty-tree"; + "prettyFunctionComposing" = dontDistribute super."prettyFunctionComposing"; + "prim-uniq" = dontDistribute super."prim-uniq"; + "primula-board" = dontDistribute super."primula-board"; + "primula-bot" = dontDistribute super."primula-bot"; + "printf-mauke" = dontDistribute super."printf-mauke"; + "printxosd" = dontDistribute super."printxosd"; + "priority-queue" = dontDistribute super."priority-queue"; + "priority-sync" = dontDistribute super."priority-sync"; + "privileged-concurrency" = dontDistribute super."privileged-concurrency"; + "prizm" = dontDistribute super."prizm"; + "probability" = dontDistribute super."probability"; + "probable" = dontDistribute super."probable"; + "proc" = dontDistribute super."proc"; + "process-conduit" = dontDistribute super."process-conduit"; + "process-iterio" = dontDistribute super."process-iterio"; + "process-leksah" = dontDistribute super."process-leksah"; + "process-listlike" = dontDistribute super."process-listlike"; + "process-progress" = dontDistribute super."process-progress"; + "process-qq" = dontDistribute super."process-qq"; + "process-streaming" = dontDistribute super."process-streaming"; + "processing" = dontDistribute super."processing"; + "processor-creative-kit" = dontDistribute super."processor-creative-kit"; + "procrastinating-structure" = dontDistribute super."procrastinating-structure"; + "procrastinating-variable" = dontDistribute super."procrastinating-variable"; + "procstat" = dontDistribute super."procstat"; + "proctest" = dontDistribute super."proctest"; + "prof2dot" = dontDistribute super."prof2dot"; + "prof2pretty" = dontDistribute super."prof2pretty"; + "profiteur" = dontDistribute super."profiteur"; + "progress" = dontDistribute super."progress"; + "progressbar" = dontDistribute super."progressbar"; + "progression" = dontDistribute super."progression"; + "progressive" = dontDistribute super."progressive"; + "proj4-hs-bindings" = dontDistribute super."proj4-hs-bindings"; + "projection" = dontDistribute super."projection"; + "prolog" = dontDistribute super."prolog"; + "prolog-graph" = dontDistribute super."prolog-graph"; + "prolog-graph-lib" = dontDistribute super."prolog-graph-lib"; + "prologue" = dontDistribute super."prologue"; + "promise" = dontDistribute super."promise"; + "promises" = dontDistribute super."promises"; + "prompt" = dontDistribute super."prompt"; + "propane" = dontDistribute super."propane"; + "propellor" = dontDistribute super."propellor"; + "properties" = dontDistribute super."properties"; + "property-list" = dontDistribute super."property-list"; + "proplang" = dontDistribute super."proplang"; + "props" = dontDistribute super."props"; + "prosper" = dontDistribute super."prosper"; + "proteaaudio" = dontDistribute super."proteaaudio"; + "protobuf" = dontDistribute super."protobuf"; + "protobuf-native" = dontDistribute super."protobuf-native"; + "protocol-buffers-descriptor-fork" = dontDistribute super."protocol-buffers-descriptor-fork"; + "protocol-buffers-fork" = dontDistribute super."protocol-buffers-fork"; + "proton-haskell" = dontDistribute super."proton-haskell"; + "prototype" = dontDistribute super."prototype"; + "prove-everywhere-server" = dontDistribute super."prove-everywhere-server"; + "proxy-kindness" = dontDistribute super."proxy-kindness"; + "psc-ide" = dontDistribute super."psc-ide"; + "pseudo-boolean" = dontDistribute super."pseudo-boolean"; + "pseudo-trie" = dontDistribute super."pseudo-trie"; + "pseudomacros" = dontDistribute super."pseudomacros"; + "pub" = dontDistribute super."pub"; + "publicsuffix" = dontDistribute super."publicsuffix"; + "publicsuffixlist" = dontDistribute super."publicsuffixlist"; + "publicsuffixlistcreate" = dontDistribute super."publicsuffixlistcreate"; + "pubnub" = dontDistribute super."pubnub"; + "pubsub" = dontDistribute super."pubsub"; + "puffytools" = dontDistribute super."puffytools"; + "pugixml" = dontDistribute super."pugixml"; + "pugs-DrIFT" = dontDistribute super."pugs-DrIFT"; + "pugs-HsSyck" = dontDistribute super."pugs-HsSyck"; + "pugs-compat" = dontDistribute super."pugs-compat"; + "pugs-hsregex" = dontDistribute super."pugs-hsregex"; + "pulse-simple" = dontDistribute super."pulse-simple"; + "punkt" = dontDistribute super."punkt"; + "punycode" = dontDistribute super."punycode"; + "puppetresources" = dontDistribute super."puppetresources"; + "pure-cdb" = dontDistribute super."pure-cdb"; + "pure-fft" = dontDistribute super."pure-fft"; + "pure-priority-queue" = dontDistribute super."pure-priority-queue"; + "pure-priority-queue-tests" = dontDistribute super."pure-priority-queue-tests"; + "pure-zlib" = dontDistribute super."pure-zlib"; + "purescript" = doDistribute super."purescript_0_7_5_3"; + "purescript-bundle-fast" = dontDistribute super."purescript-bundle-fast"; + "push-notify" = dontDistribute super."push-notify"; + "push-notify-ccs" = dontDistribute super."push-notify-ccs"; + "push-notify-general" = dontDistribute super."push-notify-general"; + "pusher-haskell" = dontDistribute super."pusher-haskell"; + "pusher-http-haskell" = dontDistribute super."pusher-http-haskell"; + "pushme" = dontDistribute super."pushme"; + "putlenses" = dontDistribute super."putlenses"; + "puzzle-draw" = dontDistribute super."puzzle-draw"; + "puzzle-draw-cmdline" = dontDistribute super."puzzle-draw-cmdline"; + "pvd" = dontDistribute super."pvd"; + "pwstore-cli" = dontDistribute super."pwstore-cli"; + "pwstore-purehaskell" = dontDistribute super."pwstore-purehaskell"; + "pxsl-tools" = dontDistribute super."pxsl-tools"; + "pyffi" = dontDistribute super."pyffi"; + "pyfi" = dontDistribute super."pyfi"; + "python-pickle" = dontDistribute super."python-pickle"; + "qc-oi-testgenerator" = dontDistribute super."qc-oi-testgenerator"; + "qd" = dontDistribute super."qd"; + "qd-vec" = dontDistribute super."qd-vec"; + "qed" = dontDistribute super."qed"; + "qhull-simple" = dontDistribute super."qhull-simple"; + "qrcode" = dontDistribute super."qrcode"; + "qt" = dontDistribute super."qt"; + "quadratic-irrational" = dontDistribute super."quadratic-irrational"; + "quantfin" = dontDistribute super."quantfin"; + "quantities" = dontDistribute super."quantities"; + "quantum-arrow" = dontDistribute super."quantum-arrow"; + "qudb" = dontDistribute super."qudb"; + "quenya-verb" = dontDistribute super."quenya-verb"; + "querystring-pickle" = dontDistribute super."querystring-pickle"; + "questioner" = dontDistribute super."questioner"; + "queue" = dontDistribute super."queue"; + "queuelike" = dontDistribute super."queuelike"; + "quick-generator" = dontDistribute super."quick-generator"; + "quick-schema" = dontDistribute super."quick-schema"; + "quickcheck-poly" = dontDistribute super."quickcheck-poly"; + "quickcheck-properties" = dontDistribute super."quickcheck-properties"; + "quickcheck-property-comb" = dontDistribute super."quickcheck-property-comb"; + "quickcheck-property-monad" = dontDistribute super."quickcheck-property-monad"; + "quickcheck-regex" = dontDistribute super."quickcheck-regex"; + "quickcheck-relaxng" = dontDistribute super."quickcheck-relaxng"; + "quickcheck-rematch" = dontDistribute super."quickcheck-rematch"; + "quickcheck-script" = dontDistribute super."quickcheck-script"; + "quickcheck-simple" = dontDistribute super."quickcheck-simple"; + "quickcheck-text" = dontDistribute super."quickcheck-text"; + "quickcheck-webdriver" = dontDistribute super."quickcheck-webdriver"; + "quicklz" = dontDistribute super."quicklz"; + "quickpull" = dontDistribute super."quickpull"; + "quickset" = dontDistribute super."quickset"; + "quickspec" = dontDistribute super."quickspec"; + "quicktest" = dontDistribute super."quicktest"; + "quickwebapp" = dontDistribute super."quickwebapp"; + "quiver" = dontDistribute super."quiver"; + "quiver-bytestring" = dontDistribute super."quiver-bytestring"; + "quiver-cell" = dontDistribute super."quiver-cell"; + "quiver-csv" = dontDistribute super."quiver-csv"; + "quiver-enumerator" = dontDistribute super."quiver-enumerator"; + "quiver-http" = dontDistribute super."quiver-http"; + "quoridor-hs" = dontDistribute super."quoridor-hs"; + "qux" = dontDistribute super."qux"; + "rabocsv2qif" = dontDistribute super."rabocsv2qif"; + "rad" = dontDistribute super."rad"; + "radian" = dontDistribute super."radian"; + "radium" = dontDistribute super."radium"; + "radium-formula-parser" = dontDistribute super."radium-formula-parser"; + "radix" = dontDistribute super."radix"; + "rados-haskell" = dontDistribute super."rados-haskell"; + "rail-compiler-editor" = dontDistribute super."rail-compiler-editor"; + "rainbow-tests" = dontDistribute super."rainbow-tests"; + "rake" = dontDistribute super."rake"; + "rakhana" = dontDistribute super."rakhana"; + "ralist" = dontDistribute super."ralist"; + "rallod" = dontDistribute super."rallod"; + "raml" = dontDistribute super."raml"; + "rand-vars" = dontDistribute super."rand-vars"; + "randfile" = dontDistribute super."randfile"; + "random-access-list" = dontDistribute super."random-access-list"; + "random-derive" = dontDistribute super."random-derive"; + "random-eff" = dontDistribute super."random-eff"; + "random-effin" = dontDistribute super."random-effin"; + "random-extras" = dontDistribute super."random-extras"; + "random-hypergeometric" = dontDistribute super."random-hypergeometric"; + "random-stream" = dontDistribute super."random-stream"; + "random-variates" = dontDistribute super."random-variates"; + "randomgen" = dontDistribute super."randomgen"; + "randproc" = dontDistribute super."randproc"; + "randsolid" = dontDistribute super."randsolid"; + "range-set-list" = dontDistribute super."range-set-list"; + "range-space" = dontDistribute super."range-space"; + "rangemin" = dontDistribute super."rangemin"; + "ranges" = dontDistribute super."ranges"; + "rank1dynamic" = dontDistribute super."rank1dynamic"; + "rascal" = dontDistribute super."rascal"; + "rate-limit" = dontDistribute super."rate-limit"; + "ratio-int" = dontDistribute super."ratio-int"; + "raven-haskell" = dontDistribute super."raven-haskell"; + "raven-haskell-scotty" = dontDistribute super."raven-haskell-scotty"; + "rawstring-qm" = dontDistribute super."rawstring-qm"; + "razom-text-util" = dontDistribute super."razom-text-util"; + "rbr" = dontDistribute super."rbr"; + "rclient" = dontDistribute super."rclient"; + "rcu" = dontDistribute super."rcu"; + "rdf4h" = dontDistribute super."rdf4h"; + "rdioh" = dontDistribute super."rdioh"; + "rdtsc" = dontDistribute super."rdtsc"; + "rdtsc-enolan" = dontDistribute super."rdtsc-enolan"; + "re2" = dontDistribute super."re2"; + "react-flux" = dontDistribute super."react-flux"; + "react-haskell" = dontDistribute super."react-haskell"; + "reaction-logic" = dontDistribute super."reaction-logic"; + "reactive" = dontDistribute super."reactive"; + "reactive-bacon" = dontDistribute super."reactive-bacon"; + "reactive-balsa" = dontDistribute super."reactive-balsa"; + "reactive-banana" = dontDistribute super."reactive-banana"; + "reactive-banana-sdl" = dontDistribute super."reactive-banana-sdl"; + "reactive-banana-threepenny" = dontDistribute super."reactive-banana-threepenny"; + "reactive-banana-wx" = dontDistribute super."reactive-banana-wx"; + "reactive-fieldtrip" = dontDistribute super."reactive-fieldtrip"; + "reactive-glut" = dontDistribute super."reactive-glut"; + "reactive-haskell" = dontDistribute super."reactive-haskell"; + "reactive-io" = dontDistribute super."reactive-io"; + "reactive-thread" = dontDistribute super."reactive-thread"; + "reactor" = dontDistribute super."reactor"; + "read-bounded" = dontDistribute super."read-bounded"; + "read-editor" = dontDistribute super."read-editor"; + "readable" = dontDistribute super."readable"; + "readline" = dontDistribute super."readline"; + "readline-statevar" = dontDistribute super."readline-statevar"; + "readpyc" = dontDistribute super."readpyc"; + "really-simple-xml-parser" = dontDistribute super."really-simple-xml-parser"; + "reasonable-lens" = dontDistribute super."reasonable-lens"; + "reasonable-operational" = dontDistribute super."reasonable-operational"; + "recaptcha" = dontDistribute super."recaptcha"; + "record" = dontDistribute super."record"; + "record-aeson" = dontDistribute super."record-aeson"; + "record-gl" = dontDistribute super."record-gl"; + "record-preprocessor" = dontDistribute super."record-preprocessor"; + "record-syntax" = dontDistribute super."record-syntax"; + "records" = dontDistribute super."records"; + "records-th" = dontDistribute super."records-th"; + "recursion-schemes" = dontDistribute super."recursion-schemes"; + "recursive-line-count" = dontDistribute super."recursive-line-count"; + "redHandlers" = dontDistribute super."redHandlers"; + "reddit" = dontDistribute super."reddit"; + "redis" = dontDistribute super."redis"; + "redis-hs" = dontDistribute super."redis-hs"; + "redis-job-queue" = dontDistribute super."redis-job-queue"; + "redis-simple" = dontDistribute super."redis-simple"; + "redo" = dontDistribute super."redo"; + "reducers" = doDistribute super."reducers_3_10_3_2"; + "reenact" = dontDistribute super."reenact"; + "reexport-crypto-random" = dontDistribute super."reexport-crypto-random"; + "ref" = dontDistribute super."ref"; + "ref-mtl" = dontDistribute super."ref-mtl"; + "ref-tf" = dontDistribute super."ref-tf"; + "refcount" = dontDistribute super."refcount"; + "reference" = dontDistribute super."reference"; + "references" = dontDistribute super."references"; + "refh" = dontDistribute super."refh"; + "refined" = dontDistribute super."refined"; + "reflection-extras" = dontDistribute super."reflection-extras"; + "reflection-without-remorse" = dontDistribute super."reflection-without-remorse"; + "reflex" = dontDistribute super."reflex"; + "reflex-animation" = dontDistribute super."reflex-animation"; + "reflex-dom" = dontDistribute super."reflex-dom"; + "reflex-dom-contrib" = dontDistribute super."reflex-dom-contrib"; + "reflex-gloss" = dontDistribute super."reflex-gloss"; + "reflex-gloss-scene" = dontDistribute super."reflex-gloss-scene"; + "reflex-transformers" = dontDistribute super."reflex-transformers"; + "reform" = dontDistribute super."reform"; + "reform-blaze" = dontDistribute super."reform-blaze"; + "reform-hamlet" = dontDistribute super."reform-hamlet"; + "reform-happstack" = dontDistribute super."reform-happstack"; + "reform-hsp" = dontDistribute super."reform-hsp"; + "regex-applicative-text" = dontDistribute super."regex-applicative-text"; + "regex-compat-tdfa" = dontDistribute super."regex-compat-tdfa"; + "regex-deriv" = dontDistribute super."regex-deriv"; + "regex-dfa" = dontDistribute super."regex-dfa"; + "regex-easy" = dontDistribute super."regex-easy"; + "regex-genex" = dontDistribute super."regex-genex"; + "regex-parsec" = dontDistribute super."regex-parsec"; + "regex-pderiv" = dontDistribute super."regex-pderiv"; + "regex-posix-unittest" = dontDistribute super."regex-posix-unittest"; + "regex-tdfa-pipes" = dontDistribute super."regex-tdfa-pipes"; + "regex-tdfa-quasiquoter" = dontDistribute super."regex-tdfa-quasiquoter"; + "regex-tdfa-text" = dontDistribute super."regex-tdfa-text"; + "regex-tdfa-unittest" = dontDistribute super."regex-tdfa-unittest"; + "regex-tdfa-utf8" = dontDistribute super."regex-tdfa-utf8"; + "regex-tre" = dontDistribute super."regex-tre"; + "regex-xmlschema" = dontDistribute super."regex-xmlschema"; + "regexchar" = dontDistribute super."regexchar"; + "regexdot" = dontDistribute super."regexdot"; + "regexp-tries" = dontDistribute super."regexp-tries"; + "regexpr" = dontDistribute super."regexpr"; + "regexpr-symbolic" = dontDistribute super."regexpr-symbolic"; + "regexqq" = dontDistribute super."regexqq"; + "regional-pointers" = dontDistribute super."regional-pointers"; + "regions" = dontDistribute super."regions"; + "regions-monadsfd" = dontDistribute super."regions-monadsfd"; + "regions-monadstf" = dontDistribute super."regions-monadstf"; + "regions-mtl" = dontDistribute super."regions-mtl"; + "regress" = dontDistribute super."regress"; + "regular" = dontDistribute super."regular"; + "regular-extras" = dontDistribute super."regular-extras"; + "regular-web" = dontDistribute super."regular-web"; + "regular-xmlpickler" = dontDistribute super."regular-xmlpickler"; + "reheat" = dontDistribute super."reheat"; + "rehoo" = dontDistribute super."rehoo"; + "rei" = dontDistribute super."rei"; + "reified-records" = dontDistribute super."reified-records"; + "reify" = dontDistribute super."reify"; + "reinterpret-cast" = dontDistribute super."reinterpret-cast"; + "relacion" = dontDistribute super."relacion"; + "relation" = dontDistribute super."relation"; + "relational-postgresql8" = dontDistribute super."relational-postgresql8"; + "relational-query" = dontDistribute super."relational-query"; + "relational-query-HDBC" = dontDistribute super."relational-query-HDBC"; + "relational-record" = dontDistribute super."relational-record"; + "relational-record-examples" = dontDistribute super."relational-record-examples"; + "relational-schemas" = dontDistribute super."relational-schemas"; + "relative-date" = dontDistribute super."relative-date"; + "relit" = dontDistribute super."relit"; + "rematch" = dontDistribute super."rematch"; + "rematch-text" = dontDistribute super."rematch-text"; + "remote" = dontDistribute super."remote"; + "remote-debugger" = dontDistribute super."remote-debugger"; + "remotion" = dontDistribute super."remotion"; + "renderable" = dontDistribute super."renderable"; + "reord" = dontDistribute super."reord"; + "reorderable" = dontDistribute super."reorderable"; + "repa" = doDistribute super."repa_3_4_0_1"; + "repa-algorithms" = doDistribute super."repa-algorithms_3_4_0_1"; + "repa-array" = dontDistribute super."repa-array"; + "repa-bytestring" = dontDistribute super."repa-bytestring"; + "repa-convert" = dontDistribute super."repa-convert"; + "repa-eval" = dontDistribute super."repa-eval"; + "repa-examples" = dontDistribute super."repa-examples"; + "repa-fftw" = dontDistribute super."repa-fftw"; + "repa-flow" = dontDistribute super."repa-flow"; + "repa-io" = doDistribute super."repa-io_3_4_0_1"; + "repa-linear-algebra" = dontDistribute super."repa-linear-algebra"; + "repa-plugin" = dontDistribute super."repa-plugin"; + "repa-scalar" = dontDistribute super."repa-scalar"; + "repa-series" = dontDistribute super."repa-series"; + "repa-sndfile" = dontDistribute super."repa-sndfile"; + "repa-stream" = dontDistribute super."repa-stream"; + "repa-v4l2" = dontDistribute super."repa-v4l2"; + "repl" = dontDistribute super."repl"; + "repl-toolkit" = dontDistribute super."repl-toolkit"; + "repline" = dontDistribute super."repline"; + "repo-based-blog" = dontDistribute super."repo-based-blog"; + "repr" = dontDistribute super."repr"; + "repr-tree-syb" = dontDistribute super."repr-tree-syb"; + "representable-functors" = dontDistribute super."representable-functors"; + "representable-profunctors" = dontDistribute super."representable-profunctors"; + "representable-tries" = dontDistribute super."representable-tries"; + "request-monad" = dontDistribute super."request-monad"; + "reserve" = dontDistribute super."reserve"; + "resistor-cube" = dontDistribute super."resistor-cube"; + "resolve-trivial-conflicts" = dontDistribute super."resolve-trivial-conflicts"; + "resource-effect" = dontDistribute super."resource-effect"; + "resource-embed" = dontDistribute super."resource-embed"; + "resource-pool-catchio" = dontDistribute super."resource-pool-catchio"; + "resource-pool-monad" = dontDistribute super."resource-pool-monad"; + "resource-simple" = dontDistribute super."resource-simple"; + "respond" = dontDistribute super."respond"; + "rest-core" = doDistribute super."rest-core_0_36_0_6"; + "rest-example" = dontDistribute super."rest-example"; + "rest-gen" = doDistribute super."rest-gen_0_17_1_3"; + "rest-happstack" = doDistribute super."rest-happstack_0_2_10_8"; + "rest-snap" = doDistribute super."rest-snap_0_1_17_18"; + "rest-wai" = doDistribute super."rest-wai_0_1_0_8"; + "restful-snap" = dontDistribute super."restful-snap"; + "restricted-workers" = dontDistribute super."restricted-workers"; + "restyle" = dontDistribute super."restyle"; + "resumable-exceptions" = dontDistribute super."resumable-exceptions"; + "rethinkdb" = dontDistribute super."rethinkdb"; + "rethinkdb-model" = dontDistribute super."rethinkdb-model"; + "rethinkdb-wereHamster" = dontDistribute super."rethinkdb-wereHamster"; + "retryer" = dontDistribute super."retryer"; + "revdectime" = dontDistribute super."revdectime"; + "reverse-apply" = dontDistribute super."reverse-apply"; + "reverse-geocoding" = dontDistribute super."reverse-geocoding"; + "reversi" = dontDistribute super."reversi"; + "rewrite" = dontDistribute super."rewrite"; + "rewriting" = dontDistribute super."rewriting"; + "rex" = dontDistribute super."rex"; + "rezoom" = dontDistribute super."rezoom"; + "rfc3339" = dontDistribute super."rfc3339"; + "rhythm-game-tutorial" = dontDistribute super."rhythm-game-tutorial"; + "riak" = dontDistribute super."riak"; + "riak-protobuf" = dontDistribute super."riak-protobuf"; + "richreports" = dontDistribute super."richreports"; + "riemann" = dontDistribute super."riemann"; + "riff" = dontDistribute super."riff"; + "ring-buffer" = dontDistribute super."ring-buffer"; + "riot" = dontDistribute super."riot"; + "ripple" = dontDistribute super."ripple"; + "ripple-federation" = dontDistribute super."ripple-federation"; + "risc386" = dontDistribute super."risc386"; + "rivers" = dontDistribute super."rivers"; + "rivet" = dontDistribute super."rivet"; + "rivet-core" = dontDistribute super."rivet-core"; + "rivet-migration" = dontDistribute super."rivet-migration"; + "rivet-simple-deploy" = dontDistribute super."rivet-simple-deploy"; + "rlglue" = dontDistribute super."rlglue"; + "rmonad" = dontDistribute super."rmonad"; + "rncryptor" = dontDistribute super."rncryptor"; + "rng-utils" = dontDistribute super."rng-utils"; + "robin" = dontDistribute super."robin"; + "robot" = dontDistribute super."robot"; + "robots-txt" = dontDistribute super."robots-txt"; + "rocksdb-haskell" = dontDistribute super."rocksdb-haskell"; + "roguestar" = dontDistribute super."roguestar"; + "roguestar-engine" = dontDistribute super."roguestar-engine"; + "roguestar-gl" = dontDistribute super."roguestar-gl"; + "roguestar-glut" = dontDistribute super."roguestar-glut"; + "rollbar" = dontDistribute super."rollbar"; + "roller" = dontDistribute super."roller"; + "rolling-queue" = dontDistribute super."rolling-queue"; + "roman-numerals" = dontDistribute super."roman-numerals"; + "romkan" = dontDistribute super."romkan"; + "roots" = dontDistribute super."roots"; + "rope" = dontDistribute super."rope"; + "rosa" = dontDistribute super."rosa"; + "rose-trees" = dontDistribute super."rose-trees"; + "rosezipper" = dontDistribute super."rosezipper"; + "roshask" = dontDistribute super."roshask"; + "rosso" = dontDistribute super."rosso"; + "rot13" = dontDistribute super."rot13"; + "rotating-log" = dontDistribute super."rotating-log"; + "rounding" = dontDistribute super."rounding"; + "roundtrip" = dontDistribute super."roundtrip"; + "roundtrip-aeson" = dontDistribute super."roundtrip-aeson"; + "roundtrip-string" = dontDistribute super."roundtrip-string"; + "roundtrip-xml" = dontDistribute super."roundtrip-xml"; + "route-generator" = dontDistribute super."route-generator"; + "route-planning" = dontDistribute super."route-planning"; + "rowrecord" = dontDistribute super."rowrecord"; + "rpc" = dontDistribute super."rpc"; + "rpc-framework" = dontDistribute super."rpc-framework"; + "rpf" = dontDistribute super."rpf"; + "rpm" = dontDistribute super."rpm"; + "rsagl" = dontDistribute super."rsagl"; + "rsagl-frp" = dontDistribute super."rsagl-frp"; + "rsagl-math" = dontDistribute super."rsagl-math"; + "rspp" = dontDistribute super."rspp"; + "rss" = dontDistribute super."rss"; + "rss2irc" = dontDistribute super."rss2irc"; + "rtld" = dontDistribute super."rtld"; + "rtlsdr" = dontDistribute super."rtlsdr"; + "rtorrent-rpc" = dontDistribute super."rtorrent-rpc"; + "rtorrent-state" = dontDistribute super."rtorrent-state"; + "rubberband" = dontDistribute super."rubberband"; + "ruby-marshal" = dontDistribute super."ruby-marshal"; + "ruby-qq" = dontDistribute super."ruby-qq"; + "ruff" = dontDistribute super."ruff"; + "ruler" = dontDistribute super."ruler"; + "ruler-core" = dontDistribute super."ruler-core"; + "rungekutta" = dontDistribute super."rungekutta"; + "runghc" = dontDistribute super."runghc"; + "rwlock" = dontDistribute super."rwlock"; + "rws" = dontDistribute super."rws"; + "s-cargot" = dontDistribute super."s-cargot"; + "s3-signer" = dontDistribute super."s3-signer"; + "safe-access" = dontDistribute super."safe-access"; + "safe-failure" = dontDistribute super."safe-failure"; + "safe-failure-cme" = dontDistribute super."safe-failure-cme"; + "safe-freeze" = dontDistribute super."safe-freeze"; + "safe-globals" = dontDistribute super."safe-globals"; + "safe-lazy-io" = dontDistribute super."safe-lazy-io"; + "safe-length" = dontDistribute super."safe-length"; + "safe-plugins" = dontDistribute super."safe-plugins"; + "safe-printf" = dontDistribute super."safe-printf"; + "safeint" = dontDistribute super."safeint"; + "safer-file-handles" = dontDistribute super."safer-file-handles"; + "safer-file-handles-bytestring" = dontDistribute super."safer-file-handles-bytestring"; + "safer-file-handles-text" = dontDistribute super."safer-file-handles-text"; + "saferoute" = dontDistribute super."saferoute"; + "sai-shape-syb" = dontDistribute super."sai-shape-syb"; + "saltine" = dontDistribute super."saltine"; + "saltine-quickcheck" = dontDistribute super."saltine-quickcheck"; + "salvia" = dontDistribute super."salvia"; + "salvia-demo" = dontDistribute super."salvia-demo"; + "salvia-extras" = dontDistribute super."salvia-extras"; + "salvia-protocol" = dontDistribute super."salvia-protocol"; + "salvia-sessions" = dontDistribute super."salvia-sessions"; + "salvia-websocket" = dontDistribute super."salvia-websocket"; + "sample-frame" = dontDistribute super."sample-frame"; + "sample-frame-np" = dontDistribute super."sample-frame-np"; + "samtools" = dontDistribute super."samtools"; + "samtools-conduit" = dontDistribute super."samtools-conduit"; + "samtools-enumerator" = dontDistribute super."samtools-enumerator"; + "samtools-iteratee" = dontDistribute super."samtools-iteratee"; + "sandlib" = dontDistribute super."sandlib"; + "sandman" = dontDistribute super."sandman"; + "sarasvati" = dontDistribute super."sarasvati"; + "sasl" = dontDistribute super."sasl"; + "sat" = dontDistribute super."sat"; + "sat-micro-hs" = dontDistribute super."sat-micro-hs"; + "satchmo" = dontDistribute super."satchmo"; + "satchmo-backends" = dontDistribute super."satchmo-backends"; + "satchmo-examples" = dontDistribute super."satchmo-examples"; + "satchmo-funsat" = dontDistribute super."satchmo-funsat"; + "satchmo-minisat" = dontDistribute super."satchmo-minisat"; + "satchmo-toysat" = dontDistribute super."satchmo-toysat"; + "sbp" = dontDistribute super."sbp"; + "sc3-rdu" = dontDistribute super."sc3-rdu"; + "scalable-server" = dontDistribute super."scalable-server"; + "scaleimage" = dontDistribute super."scaleimage"; + "scalp-webhooks" = dontDistribute super."scalp-webhooks"; + "scan" = dontDistribute super."scan"; + "scan-vector-machine" = dontDistribute super."scan-vector-machine"; + "scat" = dontDistribute super."scat"; + "scc" = dontDistribute super."scc"; + "scenegraph" = dontDistribute super."scenegraph"; + "scgi" = dontDistribute super."scgi"; + "schedevr" = dontDistribute super."schedevr"; + "schedule-planner" = dontDistribute super."schedule-planner"; + "schedyield" = dontDistribute super."schedyield"; + "scholdoc" = dontDistribute super."scholdoc"; + "scholdoc-citeproc" = dontDistribute super."scholdoc-citeproc"; + "scholdoc-texmath" = dontDistribute super."scholdoc-texmath"; + "scholdoc-types" = dontDistribute super."scholdoc-types"; + "schonfinkeling" = dontDistribute super."schonfinkeling"; + "sci-ratio" = dontDistribute super."sci-ratio"; + "science-constants" = dontDistribute super."science-constants"; + "science-constants-dimensional" = dontDistribute super."science-constants-dimensional"; + "scion" = dontDistribute super."scion"; + "scion-browser" = dontDistribute super."scion-browser"; + "scons2dot" = dontDistribute super."scons2dot"; + "scope" = dontDistribute super."scope"; + "scope-cairo" = dontDistribute super."scope-cairo"; + "scottish" = dontDistribute super."scottish"; + "scotty-binding-play" = dontDistribute super."scotty-binding-play"; + "scotty-blaze" = dontDistribute super."scotty-blaze"; + "scotty-cookie" = dontDistribute super."scotty-cookie"; + "scotty-fay" = dontDistribute super."scotty-fay"; + "scotty-hastache" = dontDistribute super."scotty-hastache"; + "scotty-rest" = dontDistribute super."scotty-rest"; + "scotty-session" = dontDistribute super."scotty-session"; + "scotty-tls" = dontDistribute super."scotty-tls"; + "scp-streams" = dontDistribute super."scp-streams"; + "scrabble-bot" = dontDistribute super."scrabble-bot"; + "scrobble" = dontDistribute super."scrobble"; + "scroll" = dontDistribute super."scroll"; + "scrypt" = dontDistribute super."scrypt"; + "scrz" = dontDistribute super."scrz"; + "scyther-proof" = dontDistribute super."scyther-proof"; + "sde-solver" = dontDistribute super."sde-solver"; + "sdf2p1-parser" = dontDistribute super."sdf2p1-parser"; + "sdl2" = doDistribute super."sdl2_1_3_1"; + "sdl2-cairo" = dontDistribute super."sdl2-cairo"; + "sdl2-compositor" = dontDistribute super."sdl2-compositor"; + "sdl2-image" = dontDistribute super."sdl2-image"; + "sdl2-ttf" = dontDistribute super."sdl2-ttf"; + "sdnv" = dontDistribute super."sdnv"; + "sdr" = dontDistribute super."sdr"; + "seacat" = dontDistribute super."seacat"; + "seal-module" = dontDistribute super."seal-module"; + "search" = dontDistribute super."search"; + "sec" = dontDistribute super."sec"; + "secdh" = dontDistribute super."secdh"; + "seclib" = dontDistribute super."seclib"; + "second-transfer" = doDistribute super."second-transfer_0_6_1_0"; + "secp256k1" = dontDistribute super."secp256k1"; + "secret-santa" = dontDistribute super."secret-santa"; + "secret-sharing" = dontDistribute super."secret-sharing"; + "secrm" = dontDistribute super."secrm"; + "secure-sockets" = dontDistribute super."secure-sockets"; + "sednaDBXML" = dontDistribute super."sednaDBXML"; + "select" = dontDistribute super."select"; + "selectors" = dontDistribute super."selectors"; + "selenium" = dontDistribute super."selenium"; + "selenium-server" = dontDistribute super."selenium-server"; + "selfrestart" = dontDistribute super."selfrestart"; + "selinux" = dontDistribute super."selinux"; + "semaphore-plus" = dontDistribute super."semaphore-plus"; + "semi-iso" = dontDistribute super."semi-iso"; + "semigroupoids-syntax" = dontDistribute super."semigroupoids-syntax"; + "semigroups-actions" = dontDistribute super."semigroups-actions"; + "semiring" = dontDistribute super."semiring"; + "semiring-simple" = dontDistribute super."semiring-simple"; + "semver-range" = dontDistribute super."semver-range"; + "sendgrid-haskell" = dontDistribute super."sendgrid-haskell"; + "sensenet" = dontDistribute super."sensenet"; + "sentry" = dontDistribute super."sentry"; + "senza" = dontDistribute super."senza"; + "separated" = dontDistribute super."separated"; + "seqaid" = dontDistribute super."seqaid"; + "seqid" = dontDistribute super."seqid"; + "seqid-streams" = dontDistribute super."seqid-streams"; + "seqloc-datafiles" = dontDistribute super."seqloc-datafiles"; + "sequence" = dontDistribute super."sequence"; + "sequent-core" = dontDistribute super."sequent-core"; + "sequential-index" = dontDistribute super."sequential-index"; + "sequor" = dontDistribute super."sequor"; + "serial" = dontDistribute super."serial"; + "serial-test-generators" = dontDistribute super."serial-test-generators"; + "serialport" = dontDistribute super."serialport"; + "servant-JuicyPixels" = doDistribute super."servant-JuicyPixels_0_1_0_0"; + "servant-blaze" = dontDistribute super."servant-blaze"; + "servant-cassava" = dontDistribute super."servant-cassava"; + "servant-ede" = dontDistribute super."servant-ede"; + "servant-examples" = dontDistribute super."servant-examples"; + "servant-lucid" = dontDistribute super."servant-lucid"; + "servant-mock" = dontDistribute super."servant-mock"; + "servant-pool" = dontDistribute super."servant-pool"; + "servant-postgresql" = dontDistribute super."servant-postgresql"; + "servant-response" = dontDistribute super."servant-response"; + "servant-scotty" = dontDistribute super."servant-scotty"; + "servant-swagger" = dontDistribute super."servant-swagger"; + "servant-yaml" = dontDistribute super."servant-yaml"; + "servius" = dontDistribute super."servius"; + "ses-html" = dontDistribute super."ses-html"; + "ses-html-snaplet" = dontDistribute super."ses-html-snaplet"; + "sessions" = dontDistribute super."sessions"; + "set-cover" = dontDistribute super."set-cover"; + "set-with" = dontDistribute super."set-with"; + "setdown" = dontDistribute super."setdown"; + "setops" = dontDistribute super."setops"; + "sets" = dontDistribute super."sets"; + "setters" = dontDistribute super."setters"; + "settings" = dontDistribute super."settings"; + "sexp" = dontDistribute super."sexp"; + "sexp-show" = dontDistribute super."sexp-show"; + "sexpr" = dontDistribute super."sexpr"; + "sext" = dontDistribute super."sext"; + "sfml-audio" = dontDistribute super."sfml-audio"; + "sfmt" = dontDistribute super."sfmt"; + "sgd" = dontDistribute super."sgd"; + "sgf" = dontDistribute super."sgf"; + "sgrep" = dontDistribute super."sgrep"; + "sha-streams" = dontDistribute super."sha-streams"; + "shadower" = dontDistribute super."shadower"; + "shadowsocks" = dontDistribute super."shadowsocks"; + "shady-gen" = dontDistribute super."shady-gen"; + "shady-graphics" = dontDistribute super."shady-graphics"; + "shake-cabal-build" = dontDistribute super."shake-cabal-build"; + "shake-extras" = dontDistribute super."shake-extras"; + "shake-minify" = dontDistribute super."shake-minify"; + "shake-pack" = dontDistribute super."shake-pack"; + "shaker" = dontDistribute super."shaker"; + "shakespeare-css" = dontDistribute super."shakespeare-css"; + "shakespeare-i18n" = dontDistribute super."shakespeare-i18n"; + "shakespeare-js" = dontDistribute super."shakespeare-js"; + "shakespeare-text" = dontDistribute super."shakespeare-text"; + "shana" = dontDistribute super."shana"; + "shapefile" = dontDistribute super."shapefile"; + "shapely-data" = dontDistribute super."shapely-data"; + "sharc-timbre" = dontDistribute super."sharc-timbre"; + "shared-buffer" = dontDistribute super."shared-buffer"; + "shared-fields" = dontDistribute super."shared-fields"; + "shared-memory" = dontDistribute super."shared-memory"; + "sharedio" = dontDistribute super."sharedio"; + "she" = dontDistribute super."she"; + "shelduck" = dontDistribute super."shelduck"; + "shell-escape" = dontDistribute super."shell-escape"; + "shell-monad" = dontDistribute super."shell-monad"; + "shell-pipe" = dontDistribute super."shell-pipe"; + "shellish" = dontDistribute super."shellish"; + "shellmate" = dontDistribute super."shellmate"; + "shelly-extra" = dontDistribute super."shelly-extra"; + "shivers-cfg" = dontDistribute super."shivers-cfg"; + "shoap" = dontDistribute super."shoap"; + "shortcircuit" = dontDistribute super."shortcircuit"; + "shorten-strings" = dontDistribute super."shorten-strings"; + "should-not-typecheck" = dontDistribute super."should-not-typecheck"; + "show-type" = dontDistribute super."show-type"; + "showdown" = dontDistribute super."showdown"; + "shpider" = dontDistribute super."shpider"; + "shplit" = dontDistribute super."shplit"; + "shqq" = dontDistribute super."shqq"; + "shuffle" = dontDistribute super."shuffle"; + "sieve" = dontDistribute super."sieve"; + "sifflet" = dontDistribute super."sifflet"; + "sifflet-lib" = dontDistribute super."sifflet-lib"; + "sign" = dontDistribute super."sign"; + "signal" = dontDistribute super."signal"; + "signals" = dontDistribute super."signals"; + "signed-multiset" = dontDistribute super."signed-multiset"; + "simd" = dontDistribute super."simd"; + "simgi" = dontDistribute super."simgi"; + "simple" = dontDistribute super."simple"; + "simple-actors" = dontDistribute super."simple-actors"; + "simple-atom" = dontDistribute super."simple-atom"; + "simple-bluetooth" = dontDistribute super."simple-bluetooth"; + "simple-c-value" = dontDistribute super."simple-c-value"; + "simple-conduit" = dontDistribute super."simple-conduit"; + "simple-config" = dontDistribute super."simple-config"; + "simple-css" = dontDistribute super."simple-css"; + "simple-eval" = dontDistribute super."simple-eval"; + "simple-firewire" = dontDistribute super."simple-firewire"; + "simple-form" = dontDistribute super."simple-form"; + "simple-genetic-algorithm" = dontDistribute super."simple-genetic-algorithm"; + "simple-genetic-algorithm-mr" = dontDistribute super."simple-genetic-algorithm-mr"; + "simple-get-opt" = dontDistribute super."simple-get-opt"; + "simple-index" = dontDistribute super."simple-index"; + "simple-log" = dontDistribute super."simple-log"; + "simple-log-syslog" = dontDistribute super."simple-log-syslog"; + "simple-neural-networks" = dontDistribute super."simple-neural-networks"; + "simple-nix" = dontDistribute super."simple-nix"; + "simple-observer" = dontDistribute super."simple-observer"; + "simple-pascal" = dontDistribute super."simple-pascal"; + "simple-pipe" = dontDistribute super."simple-pipe"; + "simple-postgresql-orm" = dontDistribute super."simple-postgresql-orm"; + "simple-rope" = dontDistribute super."simple-rope"; + "simple-server" = dontDistribute super."simple-server"; + "simple-session" = dontDistribute super."simple-session"; + "simple-sessions" = dontDistribute super."simple-sessions"; + "simple-smt" = dontDistribute super."simple-smt"; + "simple-sql-parser" = dontDistribute super."simple-sql-parser"; + "simple-stacked-vm" = dontDistribute super."simple-stacked-vm"; + "simple-tabular" = dontDistribute super."simple-tabular"; + "simple-templates" = dontDistribute super."simple-templates"; + "simple-vec3" = dontDistribute super."simple-vec3"; + "simpleargs" = dontDistribute super."simpleargs"; + "simpleirc" = dontDistribute super."simpleirc"; + "simpleirc-lens" = dontDistribute super."simpleirc-lens"; + "simplenote" = dontDistribute super."simplenote"; + "simpleprelude" = dontDistribute super."simpleprelude"; + "simplesmtpclient" = dontDistribute super."simplesmtpclient"; + "simplessh" = dontDistribute super."simplessh"; + "simplex" = dontDistribute super."simplex"; + "simplex-basic" = dontDistribute super."simplex-basic"; + "simseq" = dontDistribute super."simseq"; + "simtreelo" = dontDistribute super."simtreelo"; + "sindre" = dontDistribute super."sindre"; + "singleton-nats" = dontDistribute super."singleton-nats"; + "singletons" = doDistribute super."singletons_1_1_2_1"; + "sink" = dontDistribute super."sink"; + "sirkel" = dontDistribute super."sirkel"; + "sitemap" = dontDistribute super."sitemap"; + "sized" = dontDistribute super."sized"; + "sized-types" = dontDistribute super."sized-types"; + "sized-vector" = dontDistribute super."sized-vector"; + "sizes" = dontDistribute super."sizes"; + "sjsp" = dontDistribute super."sjsp"; + "skeleton" = dontDistribute super."skeleton"; + "skeletons" = dontDistribute super."skeletons"; + "skell" = dontDistribute super."skell"; + "skype4hs" = dontDistribute super."skype4hs"; + "skypelogexport" = dontDistribute super."skypelogexport"; + "slack" = dontDistribute super."slack"; + "slack-api" = dontDistribute super."slack-api"; + "slack-notify-haskell" = dontDistribute super."slack-notify-haskell"; + "slice-cpp-gen" = dontDistribute super."slice-cpp-gen"; + "slidemews" = dontDistribute super."slidemews"; + "sloane" = dontDistribute super."sloane"; + "slot-lambda" = dontDistribute super."slot-lambda"; + "sloth" = dontDistribute super."sloth"; + "smallarray" = dontDistribute super."smallarray"; + "smallcaps" = dontDistribute super."smallcaps"; + "smallcheck-laws" = dontDistribute super."smallcheck-laws"; + "smallcheck-lens" = dontDistribute super."smallcheck-lens"; + "smallcheck-series" = dontDistribute super."smallcheck-series"; + "smallpt-hs" = dontDistribute super."smallpt-hs"; + "smallstring" = dontDistribute super."smallstring"; + "smaoin" = dontDistribute super."smaoin"; + "smartGroup" = dontDistribute super."smartGroup"; + "smartcheck" = dontDistribute super."smartcheck"; + "smartconstructor" = dontDistribute super."smartconstructor"; + "smartword" = dontDistribute super."smartword"; + "sme" = dontDistribute super."sme"; + "smsaero" = dontDistribute super."smsaero"; + "smt-lib" = dontDistribute super."smt-lib"; + "smtlib2" = dontDistribute super."smtlib2"; + "smtp-mail-ng" = dontDistribute super."smtp-mail-ng"; + "smtp2mta" = dontDistribute super."smtp2mta"; + "smtps-gmail" = dontDistribute super."smtps-gmail"; + "snake-game" = dontDistribute super."snake-game"; + "snap-accept" = dontDistribute super."snap-accept"; + "snap-app" = dontDistribute super."snap-app"; + "snap-auth-cli" = dontDistribute super."snap-auth-cli"; + "snap-blaze" = dontDistribute super."snap-blaze"; + "snap-blaze-clay" = dontDistribute super."snap-blaze-clay"; + "snap-configuration-utilities" = dontDistribute super."snap-configuration-utilities"; + "snap-cors" = dontDistribute super."snap-cors"; + "snap-elm" = dontDistribute super."snap-elm"; + "snap-error-collector" = dontDistribute super."snap-error-collector"; + "snap-extras" = dontDistribute super."snap-extras"; + "snap-loader-dynamic" = dontDistribute super."snap-loader-dynamic"; + "snap-loader-static" = dontDistribute super."snap-loader-static"; + "snap-predicates" = dontDistribute super."snap-predicates"; + "snap-testing" = dontDistribute super."snap-testing"; + "snap-utils" = dontDistribute super."snap-utils"; + "snap-web-routes" = dontDistribute super."snap-web-routes"; + "snaplet-acid-state" = dontDistribute super."snaplet-acid-state"; + "snaplet-actionlog" = dontDistribute super."snaplet-actionlog"; + "snaplet-amqp" = dontDistribute super."snaplet-amqp"; + "snaplet-auth-acid" = dontDistribute super."snaplet-auth-acid"; + "snaplet-coffee" = dontDistribute super."snaplet-coffee"; + "snaplet-css-min" = dontDistribute super."snaplet-css-min"; + "snaplet-environments" = dontDistribute super."snaplet-environments"; + "snaplet-ghcjs" = dontDistribute super."snaplet-ghcjs"; + "snaplet-hasql" = dontDistribute super."snaplet-hasql"; + "snaplet-haxl" = dontDistribute super."snaplet-haxl"; + "snaplet-hdbc" = dontDistribute super."snaplet-hdbc"; + "snaplet-hslogger" = dontDistribute super."snaplet-hslogger"; + "snaplet-i18n" = dontDistribute super."snaplet-i18n"; + "snaplet-influxdb" = dontDistribute super."snaplet-influxdb"; + "snaplet-lss" = dontDistribute super."snaplet-lss"; + "snaplet-mandrill" = dontDistribute super."snaplet-mandrill"; + "snaplet-mongoDB" = dontDistribute super."snaplet-mongoDB"; + "snaplet-mongodb-minimalistic" = dontDistribute super."snaplet-mongodb-minimalistic"; + "snaplet-mysql-simple" = dontDistribute super."snaplet-mysql-simple"; + "snaplet-oauth" = dontDistribute super."snaplet-oauth"; + "snaplet-persistent" = dontDistribute super."snaplet-persistent"; + "snaplet-postgresql-simple" = dontDistribute super."snaplet-postgresql-simple"; + "snaplet-postmark" = dontDistribute super."snaplet-postmark"; + "snaplet-purescript" = dontDistribute super."snaplet-purescript"; + "snaplet-recaptcha" = dontDistribute super."snaplet-recaptcha"; + "snaplet-redis" = dontDistribute super."snaplet-redis"; + "snaplet-redson" = dontDistribute super."snaplet-redson"; + "snaplet-rest" = dontDistribute super."snaplet-rest"; + "snaplet-riak" = dontDistribute super."snaplet-riak"; + "snaplet-sass" = dontDistribute super."snaplet-sass"; + "snaplet-sedna" = dontDistribute super."snaplet-sedna"; + "snaplet-ses-html" = dontDistribute super."snaplet-ses-html"; + "snaplet-sqlite-simple" = dontDistribute super."snaplet-sqlite-simple"; + "snaplet-stripe" = dontDistribute super."snaplet-stripe"; + "snaplet-tasks" = dontDistribute super."snaplet-tasks"; + "snaplet-typed-sessions" = dontDistribute super."snaplet-typed-sessions"; + "snaplet-wordpress" = dontDistribute super."snaplet-wordpress"; + "snappy" = dontDistribute super."snappy"; + "snappy-conduit" = dontDistribute super."snappy-conduit"; + "snappy-framing" = dontDistribute super."snappy-framing"; + "snappy-iteratee" = dontDistribute super."snappy-iteratee"; + "sndfile-enumerators" = dontDistribute super."sndfile-enumerators"; + "sneakyterm" = dontDistribute super."sneakyterm"; + "sneathlane-haste" = dontDistribute super."sneathlane-haste"; + "snippet-extractor" = dontDistribute super."snippet-extractor"; + "snm" = dontDistribute super."snm"; + "snow-white" = dontDistribute super."snow-white"; + "snowball" = dontDistribute super."snowball"; + "snowglobe" = dontDistribute super."snowglobe"; + "soap" = dontDistribute super."soap"; + "soap-openssl" = dontDistribute super."soap-openssl"; + "soap-tls" = dontDistribute super."soap-tls"; + "sock2stream" = dontDistribute super."sock2stream"; + "sockaddr" = dontDistribute super."sockaddr"; + "socket" = dontDistribute super."socket"; + "socket-activation" = dontDistribute super."socket-activation"; + "socket-sctp" = dontDistribute super."socket-sctp"; + "socketio" = dontDistribute super."socketio"; + "soegtk" = dontDistribute super."soegtk"; + "sonic-visualiser" = dontDistribute super."sonic-visualiser"; + "sophia" = dontDistribute super."sophia"; + "sort-by-pinyin" = dontDistribute super."sort-by-pinyin"; + "sorted" = dontDistribute super."sorted"; + "sorted-list" = dontDistribute super."sorted-list"; + "sorting" = dontDistribute super."sorting"; + "sorty" = dontDistribute super."sorty"; + "sound-collage" = dontDistribute super."sound-collage"; + "sounddelay" = dontDistribute super."sounddelay"; + "source-code-server" = dontDistribute super."source-code-server"; + "sousit" = dontDistribute super."sousit"; + "sox" = dontDistribute super."sox"; + "soxlib" = dontDistribute super."soxlib"; + "soyuz" = dontDistribute super."soyuz"; + "spacefill" = dontDistribute super."spacefill"; + "spacepart" = dontDistribute super."spacepart"; + "spaceprobe" = dontDistribute super."spaceprobe"; + "spanout" = dontDistribute super."spanout"; + "sparse" = dontDistribute super."sparse"; + "sparse-lin-alg" = dontDistribute super."sparse-lin-alg"; + "sparsebit" = dontDistribute super."sparsebit"; + "sparsecheck" = dontDistribute super."sparsecheck"; + "sparser" = dontDistribute super."sparser"; + "spata" = dontDistribute super."spata"; + "spatial-math" = dontDistribute super."spatial-math"; + "spawn" = dontDistribute super."spawn"; + "spe" = dontDistribute super."spe"; + "special-functors" = dontDistribute super."special-functors"; + "special-keys" = dontDistribute super."special-keys"; + "specialize-th" = dontDistribute super."specialize-th"; + "species" = dontDistribute super."species"; + "speculation-transformers" = dontDistribute super."speculation-transformers"; + "speedy-slice" = dontDistribute super."speedy-slice"; + "spelling-suggest" = dontDistribute super."spelling-suggest"; + "sphero" = dontDistribute super."sphero"; + "sphinx-cli" = dontDistribute super."sphinx-cli"; + "spice" = dontDistribute super."spice"; + "spike" = dontDistribute super."spike"; + "spine" = dontDistribute super."spine"; + "spir-v" = dontDistribute super."spir-v"; + "splay" = dontDistribute super."splay"; + "splaytree" = dontDistribute super."splaytree"; + "spline3" = dontDistribute super."spline3"; + "splines" = dontDistribute super."splines"; + "split-channel" = dontDistribute super."split-channel"; + "split-record" = dontDistribute super."split-record"; + "split-tchan" = dontDistribute super."split-tchan"; + "splitter" = dontDistribute super."splitter"; + "splot" = dontDistribute super."splot"; + "spool" = dontDistribute super."spool"; + "spoonutil" = dontDistribute super."spoonutil"; + "spoty" = dontDistribute super."spoty"; + "spreadsheet" = dontDistribute super."spreadsheet"; + "spritz" = dontDistribute super."spritz"; + "spsa" = dontDistribute super."spsa"; + "spy" = dontDistribute super."spy"; + "sql-simple" = dontDistribute super."sql-simple"; + "sql-simple-mysql" = dontDistribute super."sql-simple-mysql"; + "sql-simple-pool" = dontDistribute super."sql-simple-pool"; + "sql-simple-postgresql" = dontDistribute super."sql-simple-postgresql"; + "sql-simple-sqlite" = dontDistribute super."sql-simple-sqlite"; + "sql-words" = dontDistribute super."sql-words"; + "sqlite" = dontDistribute super."sqlite"; + "sqlite-simple-typed" = dontDistribute super."sqlite-simple-typed"; + "sqlvalue-list" = dontDistribute super."sqlvalue-list"; + "squeeze" = dontDistribute super."squeeze"; + "sr-extra" = dontDistribute super."sr-extra"; + "srcinst" = dontDistribute super."srcinst"; + "srec" = dontDistribute super."srec"; + "sscgi" = dontDistribute super."sscgi"; + "ssh" = dontDistribute super."ssh"; + "sshd-lint" = dontDistribute super."sshd-lint"; + "sshtun" = dontDistribute super."sshtun"; + "sssp" = dontDistribute super."sssp"; + "sstable" = dontDistribute super."sstable"; + "ssv" = dontDistribute super."ssv"; + "stable-heap" = dontDistribute super."stable-heap"; + "stable-maps" = dontDistribute super."stable-maps"; + "stable-memo" = dontDistribute super."stable-memo"; + "stable-tree" = dontDistribute super."stable-tree"; + "stack-prism" = dontDistribute super."stack-prism"; + "stackage-curator" = dontDistribute super."stackage-curator"; + "standalone-derive-topdown" = dontDistribute super."standalone-derive-topdown"; + "standalone-haddock" = dontDistribute super."standalone-haddock"; + "star-to-star" = dontDistribute super."star-to-star"; + "star-to-star-contra" = dontDistribute super."star-to-star-contra"; + "starling" = dontDistribute super."starling"; + "starrover2" = dontDistribute super."starrover2"; + "stash" = dontDistribute super."stash"; + "state" = dontDistribute super."state"; + "state-plus" = dontDistribute super."state-plus"; + "state-record" = dontDistribute super."state-record"; + "stateWriter" = dontDistribute super."stateWriter"; + "statechart" = dontDistribute super."statechart"; + "stateful-mtl" = dontDistribute super."stateful-mtl"; + "statethread" = dontDistribute super."statethread"; + "statgrab" = dontDistribute super."statgrab"; + "static-hash" = dontDistribute super."static-hash"; + "static-resources" = dontDistribute super."static-resources"; + "staticanalysis" = dontDistribute super."staticanalysis"; + "statistics-dirichlet" = dontDistribute super."statistics-dirichlet"; + "statistics-fusion" = dontDistribute super."statistics-fusion"; + "statistics-hypergeometric-genvar" = dontDistribute super."statistics-hypergeometric-genvar"; + "stats" = dontDistribute super."stats"; + "statsd" = dontDistribute super."statsd"; + "statsd-datadog" = dontDistribute super."statsd-datadog"; + "statvfs" = dontDistribute super."statvfs"; + "stb-image" = dontDistribute super."stb-image"; + "stb-truetype" = dontDistribute super."stb-truetype"; + "stdata" = dontDistribute super."stdata"; + "stdf" = dontDistribute super."stdf"; + "steambrowser" = dontDistribute super."steambrowser"; + "steeloverseer" = dontDistribute super."steeloverseer"; + "stemmer" = dontDistribute super."stemmer"; + "step-function" = dontDistribute super."step-function"; + "stepwise" = dontDistribute super."stepwise"; + "stickyKeysHotKey" = dontDistribute super."stickyKeysHotKey"; + "stitch" = dontDistribute super."stitch"; + "stm-channelize" = dontDistribute super."stm-channelize"; + "stm-chunked-queues" = dontDistribute super."stm-chunked-queues"; + "stm-firehose" = dontDistribute super."stm-firehose"; + "stm-io-hooks" = dontDistribute super."stm-io-hooks"; + "stm-lifted" = dontDistribute super."stm-lifted"; + "stm-linkedlist" = dontDistribute super."stm-linkedlist"; + "stm-orelse-io" = dontDistribute super."stm-orelse-io"; + "stm-promise" = dontDistribute super."stm-promise"; + "stm-queue-extras" = dontDistribute super."stm-queue-extras"; + "stm-sbchan" = dontDistribute super."stm-sbchan"; + "stm-split" = dontDistribute super."stm-split"; + "stm-tlist" = dontDistribute super."stm-tlist"; + "stmcontrol" = dontDistribute super."stmcontrol"; + "stomp-conduit" = dontDistribute super."stomp-conduit"; + "stomp-patterns" = dontDistribute super."stomp-patterns"; + "stomp-queue" = dontDistribute super."stomp-queue"; + "stompl" = dontDistribute super."stompl"; + "stopwatch" = dontDistribute super."stopwatch"; + "storable" = dontDistribute super."storable"; + "storable-record" = dontDistribute super."storable-record"; + "storable-static-array" = dontDistribute super."storable-static-array"; + "storable-tuple" = dontDistribute super."storable-tuple"; + "storablevector" = dontDistribute super."storablevector"; + "storablevector-carray" = dontDistribute super."storablevector-carray"; + "storablevector-streamfusion" = dontDistribute super."storablevector-streamfusion"; + "str" = dontDistribute super."str"; + "stratum-tool" = dontDistribute super."stratum-tool"; + "stream-fusion" = dontDistribute super."stream-fusion"; + "stream-monad" = dontDistribute super."stream-monad"; + "streamed" = dontDistribute super."streamed"; + "streaming" = dontDistribute super."streaming"; + "streaming-bytestring" = dontDistribute super."streaming-bytestring"; + "streaming-histogram" = dontDistribute super."streaming-histogram"; + "streaming-utils" = dontDistribute super."streaming-utils"; + "streamproc" = dontDistribute super."streamproc"; + "strict-base-types" = dontDistribute super."strict-base-types"; + "strict-concurrency" = dontDistribute super."strict-concurrency"; + "strict-ghc-plugin" = dontDistribute super."strict-ghc-plugin"; + "strict-identity" = dontDistribute super."strict-identity"; + "strict-io" = dontDistribute super."strict-io"; + "strictify" = dontDistribute super."strictify"; + "strictly" = dontDistribute super."strictly"; + "string" = dontDistribute super."string"; + "string-conv" = dontDistribute super."string-conv"; + "string-convert" = dontDistribute super."string-convert"; + "string-qq" = dontDistribute super."string-qq"; + "string-quote" = dontDistribute super."string-quote"; + "string-similarity" = dontDistribute super."string-similarity"; + "stringlike" = dontDistribute super."stringlike"; + "stringprep" = dontDistribute super."stringprep"; + "strings" = dontDistribute super."strings"; + "stringtable-atom" = dontDistribute super."stringtable-atom"; + "strio" = dontDistribute super."strio"; + "stripe" = dontDistribute super."stripe"; + "stripe-core" = dontDistribute super."stripe-core"; + "stripe-haskell" = dontDistribute super."stripe-haskell"; + "stripe-http-streams" = dontDistribute super."stripe-http-streams"; + "strive" = dontDistribute super."strive"; + "strptime" = dontDistribute super."strptime"; + "structs" = dontDistribute super."structs"; + "structural-induction" = dontDistribute super."structural-induction"; + "structured-haskell-mode" = dontDistribute super."structured-haskell-mode"; + "structured-mongoDB" = dontDistribute super."structured-mongoDB"; + "structures" = dontDistribute super."structures"; + "stunclient" = dontDistribute super."stunclient"; + "stunts" = dontDistribute super."stunts"; + "stylized" = dontDistribute super."stylized"; + "sub-state" = dontDistribute super."sub-state"; + "subhask" = dontDistribute super."subhask"; + "subleq-toolchain" = dontDistribute super."subleq-toolchain"; + "subnet" = dontDistribute super."subnet"; + "subtitleParser" = dontDistribute super."subtitleParser"; + "subtitles" = dontDistribute super."subtitles"; + "suffixarray" = dontDistribute super."suffixarray"; + "suffixtree" = dontDistribute super."suffixtree"; + "sugarhaskell" = dontDistribute super."sugarhaskell"; + "suitable" = dontDistribute super."suitable"; + "sundown" = dontDistribute super."sundown"; + "sunlight" = dontDistribute super."sunlight"; + "sunroof-compiler" = dontDistribute super."sunroof-compiler"; + "sunroof-examples" = dontDistribute super."sunroof-examples"; + "sunroof-server" = dontDistribute super."sunroof-server"; + "super-user-spark" = dontDistribute super."super-user-spark"; + "supercollider-ht" = dontDistribute super."supercollider-ht"; + "supercollider-midi" = dontDistribute super."supercollider-midi"; + "superdoc" = dontDistribute super."superdoc"; + "supero" = dontDistribute super."supero"; + "supervisor" = dontDistribute super."supervisor"; + "suspend" = dontDistribute super."suspend"; + "svg2q" = dontDistribute super."svg2q"; + "svgcairo" = dontDistribute super."svgcairo"; + "svgutils" = dontDistribute super."svgutils"; + "svm" = dontDistribute super."svm"; + "svm-light-utils" = dontDistribute super."svm-light-utils"; + "svm-simple" = dontDistribute super."svm-simple"; + "svndump" = dontDistribute super."svndump"; + "swapper" = dontDistribute super."swapper"; + "swearjure" = dontDistribute super."swearjure"; + "swf" = dontDistribute super."swf"; + "swift-lda" = dontDistribute super."swift-lda"; + "swish" = dontDistribute super."swish"; + "sws" = dontDistribute super."sws"; + "syb-extras" = dontDistribute super."syb-extras"; + "syb-with-class" = dontDistribute super."syb-with-class"; + "syb-with-class-instances-text" = dontDistribute super."syb-with-class-instances-text"; + "sylvia" = dontDistribute super."sylvia"; + "sym" = dontDistribute super."sym"; + "sym-plot" = dontDistribute super."sym-plot"; + "sync" = dontDistribute super."sync"; + "sync-mht" = dontDistribute super."sync-mht"; + "synchronous-channels" = dontDistribute super."synchronous-channels"; + "syncthing-hs" = dontDistribute super."syncthing-hs"; + "synt" = dontDistribute super."synt"; + "syntactic" = dontDistribute super."syntactic"; + "syntactical" = dontDistribute super."syntactical"; + "syntax" = dontDistribute super."syntax"; + "syntax-attoparsec" = dontDistribute super."syntax-attoparsec"; + "syntax-example" = dontDistribute super."syntax-example"; + "syntax-example-json" = dontDistribute super."syntax-example-json"; + "syntax-pretty" = dontDistribute super."syntax-pretty"; + "syntax-printer" = dontDistribute super."syntax-printer"; + "syntax-trees" = dontDistribute super."syntax-trees"; + "syntax-trees-fork-bairyn" = dontDistribute super."syntax-trees-fork-bairyn"; + "synthesizer" = dontDistribute super."synthesizer"; + "synthesizer-alsa" = dontDistribute super."synthesizer-alsa"; + "synthesizer-core" = dontDistribute super."synthesizer-core"; + "synthesizer-dimensional" = dontDistribute super."synthesizer-dimensional"; + "synthesizer-filter" = dontDistribute super."synthesizer-filter"; + "synthesizer-inference" = dontDistribute super."synthesizer-inference"; + "synthesizer-llvm" = dontDistribute super."synthesizer-llvm"; + "synthesizer-midi" = dontDistribute super."synthesizer-midi"; + "sys-auth-smbclient" = dontDistribute super."sys-auth-smbclient"; + "sys-process" = dontDistribute super."sys-process"; + "system-canonicalpath" = dontDistribute super."system-canonicalpath"; + "system-command" = dontDistribute super."system-command"; + "system-gpio" = dontDistribute super."system-gpio"; + "system-inotify" = dontDistribute super."system-inotify"; + "system-lifted" = dontDistribute super."system-lifted"; + "system-random-effect" = dontDistribute super."system-random-effect"; + "system-time-monotonic" = dontDistribute super."system-time-monotonic"; + "system-util" = dontDistribute super."system-util"; + "system-uuid" = dontDistribute super."system-uuid"; + "systemd" = dontDistribute super."systemd"; + "syz" = dontDistribute super."syz"; + "t-regex" = dontDistribute super."t-regex"; + "ta" = dontDistribute super."ta"; + "table" = dontDistribute super."table"; + "table-tennis" = dontDistribute super."table-tennis"; + "tableaux" = dontDistribute super."tableaux"; + "tables" = dontDistribute super."tables"; + "tablestorage" = dontDistribute super."tablestorage"; + "tabloid" = dontDistribute super."tabloid"; + "taffybar" = dontDistribute super."taffybar"; + "tag-bits" = dontDistribute super."tag-bits"; + "tag-stream" = dontDistribute super."tag-stream"; + "tagchup" = dontDistribute super."tagchup"; + "tagged" = doDistribute super."tagged_0_8_1"; + "tagged-exception-core" = dontDistribute super."tagged-exception-core"; + "tagged-list" = dontDistribute super."tagged-list"; + "tagged-th" = dontDistribute super."tagged-th"; + "tagged-transformer" = dontDistribute super."tagged-transformer"; + "tagging" = dontDistribute super."tagging"; + "taggy" = dontDistribute super."taggy"; + "taggy-lens" = dontDistribute super."taggy-lens"; + "taglib" = dontDistribute super."taglib"; + "taglib-api" = dontDistribute super."taglib-api"; + "tagset-positional" = dontDistribute super."tagset-positional"; + "tagsoup-ht" = dontDistribute super."tagsoup-ht"; + "tagsoup-parsec" = dontDistribute super."tagsoup-parsec"; + "takahashi" = dontDistribute super."takahashi"; + "takusen-oracle" = dontDistribute super."takusen-oracle"; + "tamarin-prover" = dontDistribute super."tamarin-prover"; + "tamarin-prover-term" = dontDistribute super."tamarin-prover-term"; + "tamarin-prover-theory" = dontDistribute super."tamarin-prover-theory"; + "tamarin-prover-utils" = dontDistribute super."tamarin-prover-utils"; + "tamper" = dontDistribute super."tamper"; + "target" = dontDistribute super."target"; + "task" = dontDistribute super."task"; + "taskpool" = dontDistribute super."taskpool"; + "tasty" = doDistribute super."tasty_0_10_1_2"; + "tasty-expected-failure" = dontDistribute super."tasty-expected-failure"; + "tasty-html" = dontDistribute super."tasty-html"; + "tasty-hunit-adapter" = dontDistribute super."tasty-hunit-adapter"; + "tasty-integrate" = dontDistribute super."tasty-integrate"; + "tasty-laws" = dontDistribute super."tasty-laws"; + "tasty-lens" = dontDistribute super."tasty-lens"; + "tasty-program" = dontDistribute super."tasty-program"; + "tasty-tap" = dontDistribute super."tasty-tap"; + "tau" = dontDistribute super."tau"; + "tbox" = dontDistribute super."tbox"; + "tcache-AWS" = dontDistribute super."tcache-AWS"; + "tccli" = dontDistribute super."tccli"; + "tce-conf" = dontDistribute super."tce-conf"; + "tconfig" = dontDistribute super."tconfig"; + "tcp" = dontDistribute super."tcp"; + "tdd-util" = dontDistribute super."tdd-util"; + "tdoc" = dontDistribute super."tdoc"; + "teams" = dontDistribute super."teams"; + "teeth" = dontDistribute super."teeth"; + "telegram" = dontDistribute super."telegram"; + "tellbot" = dontDistribute super."tellbot"; + "template-default" = dontDistribute super."template-default"; + "template-haskell-util" = dontDistribute super."template-haskell-util"; + "template-hsml" = dontDistribute super."template-hsml"; + "template-yj" = dontDistribute super."template-yj"; + "templatepg" = dontDistribute super."templatepg"; + "templater" = dontDistribute super."templater"; + "tempodb" = dontDistribute super."tempodb"; + "temporal-csound" = dontDistribute super."temporal-csound"; + "temporal-media" = dontDistribute super."temporal-media"; + "temporal-music-notation" = dontDistribute super."temporal-music-notation"; + "temporal-music-notation-demo" = dontDistribute super."temporal-music-notation-demo"; + "temporal-music-notation-western" = dontDistribute super."temporal-music-notation-western"; + "temporary-resourcet" = dontDistribute super."temporary-resourcet"; + "tempus" = dontDistribute super."tempus"; + "tempus-fugit" = dontDistribute super."tempus-fugit"; + "tensor" = dontDistribute super."tensor"; + "term-rewriting" = dontDistribute super."term-rewriting"; + "termbox-bindings" = dontDistribute super."termbox-bindings"; + "termination-combinators" = dontDistribute super."termination-combinators"; + "terminfo" = doDistribute super."terminfo_0_4_0_1"; + "terminfo-hs" = dontDistribute super."terminfo-hs"; + "terrahs" = dontDistribute super."terrahs"; + "tersmu" = dontDistribute super."tersmu"; + "test-framework-doctest" = dontDistribute super."test-framework-doctest"; + "test-framework-golden" = dontDistribute super."test-framework-golden"; + "test-framework-program" = dontDistribute super."test-framework-program"; + "test-framework-quickcheck" = dontDistribute super."test-framework-quickcheck"; + "test-framework-sandbox" = dontDistribute super."test-framework-sandbox"; + "test-framework-skip" = dontDistribute super."test-framework-skip"; + "test-framework-smallcheck" = dontDistribute super."test-framework-smallcheck"; + "test-framework-testing-feat" = dontDistribute super."test-framework-testing-feat"; + "test-framework-th-prime" = dontDistribute super."test-framework-th-prime"; + "test-invariant" = dontDistribute super."test-invariant"; + "test-pkg" = dontDistribute super."test-pkg"; + "test-sandbox" = dontDistribute super."test-sandbox"; + "test-sandbox-compose" = dontDistribute super."test-sandbox-compose"; + "test-sandbox-hunit" = dontDistribute super."test-sandbox-hunit"; + "test-sandbox-quickcheck" = dontDistribute super."test-sandbox-quickcheck"; + "test-shouldbe" = dontDistribute super."test-shouldbe"; + "test-simple" = dontDistribute super."test-simple"; + "testPkg" = dontDistribute super."testPkg"; + "testing-type-modifiers" = dontDistribute super."testing-type-modifiers"; + "testloop" = dontDistribute super."testloop"; + "testpack" = dontDistribute super."testpack"; + "testpattern" = dontDistribute super."testpattern"; + "testrunner" = dontDistribute super."testrunner"; + "tetris" = dontDistribute super."tetris"; + "tex2txt" = dontDistribute super."tex2txt"; + "texrunner" = dontDistribute super."texrunner"; + "text-and-plots" = dontDistribute super."text-and-plots"; + "text-format-simple" = dontDistribute super."text-format-simple"; + "text-icu-translit" = dontDistribute super."text-icu-translit"; + "text-json-qq" = dontDistribute super."text-json-qq"; + "text-latin1" = dontDistribute super."text-latin1"; + "text-ldap" = dontDistribute super."text-ldap"; + "text-locale-encoding" = dontDistribute super."text-locale-encoding"; + "text-normal" = dontDistribute super."text-normal"; + "text-position" = dontDistribute super."text-position"; + "text-printer" = dontDistribute super."text-printer"; + "text-regex-replace" = dontDistribute super."text-regex-replace"; + "text-register-machine" = dontDistribute super."text-register-machine"; + "text-render" = dontDistribute super."text-render"; + "text-show" = doDistribute super."text-show_2"; + "text-show-instances" = dontDistribute super."text-show-instances"; + "text-stream-decode" = dontDistribute super."text-stream-decode"; + "text-utf7" = dontDistribute super."text-utf7"; + "text-xml-generic" = dontDistribute super."text-xml-generic"; + "text-xml-qq" = dontDistribute super."text-xml-qq"; + "text-zipper" = dontDistribute super."text-zipper"; + "text1" = dontDistribute super."text1"; + "textPlot" = dontDistribute super."textPlot"; + "textmatetags" = dontDistribute super."textmatetags"; + "textocat-api" = dontDistribute super."textocat-api"; + "texts" = dontDistribute super."texts"; + "tfp" = dontDistribute super."tfp"; + "tfp-th" = dontDistribute super."tfp-th"; + "tftp" = dontDistribute super."tftp"; + "tga" = dontDistribute super."tga"; + "th-alpha" = dontDistribute super."th-alpha"; + "th-build" = dontDistribute super."th-build"; + "th-context" = dontDistribute super."th-context"; + "th-fold" = dontDistribute super."th-fold"; + "th-inline-io-action" = dontDistribute super."th-inline-io-action"; + "th-instance-reification" = dontDistribute super."th-instance-reification"; + "th-instances" = dontDistribute super."th-instances"; + "th-kinds" = dontDistribute super."th-kinds"; + "th-lift-instances" = dontDistribute super."th-lift-instances"; + "th-printf" = dontDistribute super."th-printf"; + "th-sccs" = dontDistribute super."th-sccs"; + "th-traced" = dontDistribute super."th-traced"; + "th-typegraph" = dontDistribute super."th-typegraph"; + "themoviedb" = dontDistribute super."themoviedb"; + "themplate" = dontDistribute super."themplate"; + "theoremquest" = dontDistribute super."theoremquest"; + "theoremquest-client" = dontDistribute super."theoremquest-client"; + "these" = dontDistribute super."these"; + "thespian" = dontDistribute super."thespian"; + "theta-functions" = dontDistribute super."theta-functions"; + "thih" = dontDistribute super."thih"; + "thimk" = dontDistribute super."thimk"; + "thorn" = dontDistribute super."thorn"; + "thread-local-storage" = dontDistribute super."thread-local-storage"; + "threadPool" = dontDistribute super."threadPool"; + "threadmanager" = dontDistribute super."threadmanager"; + "threads-pool" = dontDistribute super."threads-pool"; + "threads-supervisor" = dontDistribute super."threads-supervisor"; + "threadscope" = dontDistribute super."threadscope"; + "threefish" = dontDistribute super."threefish"; + "threepenny-gui" = dontDistribute super."threepenny-gui"; + "thrift" = dontDistribute super."thrift"; + "thrist" = dontDistribute super."thrist"; + "throttle" = dontDistribute super."throttle"; + "thumbnail" = dontDistribute super."thumbnail"; + "tianbar" = dontDistribute super."tianbar"; + "tic-tac-toe" = dontDistribute super."tic-tac-toe"; + "tickle" = dontDistribute super."tickle"; + "tictactoe3d" = dontDistribute super."tictactoe3d"; + "tidal" = dontDistribute super."tidal"; + "tidal-midi" = dontDistribute super."tidal-midi"; + "tidal-vis" = dontDistribute super."tidal-vis"; + "tie-knot" = dontDistribute super."tie-knot"; + "tiempo" = dontDistribute super."tiempo"; + "tiger" = dontDistribute super."tiger"; + "tight-apply" = dontDistribute super."tight-apply"; + "tightrope" = dontDistribute super."tightrope"; + "tighttp" = dontDistribute super."tighttp"; + "tilings" = dontDistribute super."tilings"; + "timberc" = dontDistribute super."timberc"; + "time-extras" = dontDistribute super."time-extras"; + "time-exts" = dontDistribute super."time-exts"; + "time-http" = dontDistribute super."time-http"; + "time-interval" = dontDistribute super."time-interval"; + "time-io-access" = dontDistribute super."time-io-access"; + "time-patterns" = dontDistribute super."time-patterns"; + "time-qq" = dontDistribute super."time-qq"; + "time-recurrence" = dontDistribute super."time-recurrence"; + "time-series" = dontDistribute super."time-series"; + "time-units" = dontDistribute super."time-units"; + "time-w3c" = dontDistribute super."time-w3c"; + "timecalc" = dontDistribute super."timecalc"; + "timeconsole" = dontDistribute super."timeconsole"; + "timeless" = dontDistribute super."timeless"; + "timeout" = dontDistribute super."timeout"; + "timeout-control" = dontDistribute super."timeout-control"; + "timeout-with-results" = dontDistribute super."timeout-with-results"; + "timeparsers" = dontDistribute super."timeparsers"; + "timeplot" = dontDistribute super."timeplot"; + "timers" = dontDistribute super."timers"; + "timers-updatable" = dontDistribute super."timers-updatable"; + "timestamp-subprocess-lines" = dontDistribute super."timestamp-subprocess-lines"; + "timestamper" = dontDistribute super."timestamper"; + "timezone-olson-th" = dontDistribute super."timezone-olson-th"; + "timing-convenience" = dontDistribute super."timing-convenience"; + "tinyMesh" = dontDistribute super."tinyMesh"; + "tinytemplate" = dontDistribute super."tinytemplate"; + "tip-haskell-frontend" = dontDistribute super."tip-haskell-frontend"; + "tip-lib" = dontDistribute super."tip-lib"; + "titlecase" = dontDistribute super."titlecase"; + "tkhs" = dontDistribute super."tkhs"; + "tkyprof" = dontDistribute super."tkyprof"; + "tld" = dontDistribute super."tld"; + "tls" = doDistribute super."tls_1_3_2"; + "tls-debug" = doDistribute super."tls-debug_0_4_0"; + "tls-extra" = dontDistribute super."tls-extra"; + "tmpl" = dontDistribute super."tmpl"; + "tn" = dontDistribute super."tn"; + "tnet" = dontDistribute super."tnet"; + "to-haskell" = dontDistribute super."to-haskell"; + "to-string-class" = dontDistribute super."to-string-class"; + "to-string-instances" = dontDistribute super."to-string-instances"; + "todos" = dontDistribute super."todos"; + "tofromxml" = dontDistribute super."tofromxml"; + "toilet" = dontDistribute super."toilet"; + "tokenify" = dontDistribute super."tokenify"; + "tokenize" = dontDistribute super."tokenize"; + "toktok" = dontDistribute super."toktok"; + "tokyocabinet-haskell" = dontDistribute super."tokyocabinet-haskell"; + "tokyotyrant-haskell" = dontDistribute super."tokyotyrant-haskell"; + "tomato-rubato-openal" = dontDistribute super."tomato-rubato-openal"; + "toml" = dontDistribute super."toml"; + "toolshed" = dontDistribute super."toolshed"; + "topkata" = dontDistribute super."topkata"; + "torch" = dontDistribute super."torch"; + "total" = dontDistribute super."total"; + "total-map" = dontDistribute super."total-map"; + "total-maps" = dontDistribute super."total-maps"; + "touched" = dontDistribute super."touched"; + "toysolver" = dontDistribute super."toysolver"; + "tpdb" = dontDistribute super."tpdb"; + "trace" = dontDistribute super."trace"; + "trace-call" = dontDistribute super."trace-call"; + "trace-function-call" = dontDistribute super."trace-function-call"; + "traced" = dontDistribute super."traced"; + "tracer" = dontDistribute super."tracer"; + "tracker" = dontDistribute super."tracker"; + "trajectory" = dontDistribute super."trajectory"; + "transactional-events" = dontDistribute super."transactional-events"; + "transf" = dontDistribute super."transf"; + "transformations" = dontDistribute super."transformations"; + "transformers-abort" = dontDistribute super."transformers-abort"; + "transformers-compose" = dontDistribute super."transformers-compose"; + "transformers-convert" = dontDistribute super."transformers-convert"; + "transformers-free" = dontDistribute super."transformers-free"; + "transformers-runnable" = dontDistribute super."transformers-runnable"; + "transformers-supply" = dontDistribute super."transformers-supply"; + "transient" = dontDistribute super."transient"; + "translatable-intset" = dontDistribute super."translatable-intset"; + "translate" = dontDistribute super."translate"; + "travis" = dontDistribute super."travis"; + "travis-meta-yaml" = dontDistribute super."travis-meta-yaml"; + "trawl" = dontDistribute super."trawl"; + "traypoweroff" = dontDistribute super."traypoweroff"; + "tree-monad" = dontDistribute super."tree-monad"; + "treemap-html" = dontDistribute super."treemap-html"; + "treemap-html-tools" = dontDistribute super."treemap-html-tools"; + "treeviz" = dontDistribute super."treeviz"; + "tremulous-query" = dontDistribute super."tremulous-query"; + "trhsx" = dontDistribute super."trhsx"; + "triangulation" = dontDistribute super."triangulation"; + "tries" = dontDistribute super."tries"; + "trimpolya" = dontDistribute super."trimpolya"; + "trivia" = dontDistribute super."trivia"; + "trivial-constraint" = dontDistribute super."trivial-constraint"; + "tropical" = dontDistribute super."tropical"; + "true-name" = dontDistribute super."true-name"; + "truelevel" = dontDistribute super."truelevel"; + "trurl" = dontDistribute super."trurl"; + "truthful" = dontDistribute super."truthful"; + "tsession" = dontDistribute super."tsession"; + "tsession-happstack" = dontDistribute super."tsession-happstack"; + "tskiplist" = dontDistribute super."tskiplist"; + "tslogger" = dontDistribute super."tslogger"; + "tsp-viz" = dontDistribute super."tsp-viz"; + "tsparse" = dontDistribute super."tsparse"; + "tst" = dontDistribute super."tst"; + "tsvsql" = dontDistribute super."tsvsql"; + "ttrie" = dontDistribute super."ttrie"; + "tttool" = doDistribute super."tttool_1_4_0_5"; + "tubes" = dontDistribute super."tubes"; + "tuntap" = dontDistribute super."tuntap"; + "tup-functor" = dontDistribute super."tup-functor"; + "tuple-gen" = dontDistribute super."tuple-gen"; + "tuple-generic" = dontDistribute super."tuple-generic"; + "tuple-hlist" = dontDistribute super."tuple-hlist"; + "tuple-lenses" = dontDistribute super."tuple-lenses"; + "tuple-morph" = dontDistribute super."tuple-morph"; + "tuple-th" = dontDistribute super."tuple-th"; + "tupleinstances" = dontDistribute super."tupleinstances"; + "turing" = dontDistribute super."turing"; + "turing-music" = dontDistribute super."turing-music"; + "turkish-deasciifier" = dontDistribute super."turkish-deasciifier"; + "turni" = dontDistribute super."turni"; + "tweak" = dontDistribute super."tweak"; + "twentefp" = dontDistribute super."twentefp"; + "twentefp-eventloop-graphics" = dontDistribute super."twentefp-eventloop-graphics"; + "twentefp-eventloop-trees" = dontDistribute super."twentefp-eventloop-trees"; + "twentefp-graphs" = dontDistribute super."twentefp-graphs"; + "twentefp-number" = dontDistribute super."twentefp-number"; + "twentefp-rosetree" = dontDistribute super."twentefp-rosetree"; + "twentefp-trees" = dontDistribute super."twentefp-trees"; + "twentefp-websockets" = dontDistribute super."twentefp-websockets"; + "twhs" = dontDistribute super."twhs"; + "twidge" = dontDistribute super."twidge"; + "twilight-stm" = dontDistribute super."twilight-stm"; + "twilio" = dontDistribute super."twilio"; + "twill" = dontDistribute super."twill"; + "twiml" = dontDistribute super."twiml"; + "twine" = dontDistribute super."twine"; + "twisty" = dontDistribute super."twisty"; + "twitch" = dontDistribute super."twitch"; + "twitter" = dontDistribute super."twitter"; + "twitter-conduit" = dontDistribute super."twitter-conduit"; + "twitter-enumerator" = dontDistribute super."twitter-enumerator"; + "twitter-types" = dontDistribute super."twitter-types"; + "twitter-types-lens" = dontDistribute super."twitter-types-lens"; + "tx" = dontDistribute super."tx"; + "txt-sushi" = dontDistribute super."txt-sushi"; + "txt2rtf" = dontDistribute super."txt2rtf"; + "txtblk" = dontDistribute super."txtblk"; + "ty" = dontDistribute super."ty"; + "typalyze" = dontDistribute super."typalyze"; + "type-aligned" = dontDistribute super."type-aligned"; + "type-booleans" = dontDistribute super."type-booleans"; + "type-cereal" = dontDistribute super."type-cereal"; + "type-combinators" = dontDistribute super."type-combinators"; + "type-digits" = dontDistribute super."type-digits"; + "type-equality" = dontDistribute super."type-equality"; + "type-equality-check" = dontDistribute super."type-equality-check"; + "type-fun" = dontDistribute super."type-fun"; + "type-functions" = dontDistribute super."type-functions"; + "type-hint" = dontDistribute super."type-hint"; + "type-int" = dontDistribute super."type-int"; + "type-iso" = dontDistribute super."type-iso"; + "type-level" = dontDistribute super."type-level"; + "type-level-bst" = dontDistribute super."type-level-bst"; + "type-level-natural-number" = dontDistribute super."type-level-natural-number"; + "type-level-natural-number-induction" = dontDistribute super."type-level-natural-number-induction"; + "type-level-natural-number-operations" = dontDistribute super."type-level-natural-number-operations"; + "type-level-sets" = dontDistribute super."type-level-sets"; + "type-level-tf" = dontDistribute super."type-level-tf"; + "type-list" = doDistribute super."type-list_0_2_0_0"; + "type-natural" = dontDistribute super."type-natural"; + "type-ord" = dontDistribute super."type-ord"; + "type-ord-spine-cereal" = dontDistribute super."type-ord-spine-cereal"; + "type-prelude" = dontDistribute super."type-prelude"; + "type-settheory" = dontDistribute super."type-settheory"; + "type-spine" = dontDistribute super."type-spine"; + "type-structure" = dontDistribute super."type-structure"; + "type-sub-th" = dontDistribute super."type-sub-th"; + "type-unary" = dontDistribute super."type-unary"; + "typeable-th" = dontDistribute super."typeable-th"; + "typed-wire" = dontDistribute super."typed-wire"; + "typedquery" = dontDistribute super."typedquery"; + "typehash" = dontDistribute super."typehash"; + "typelevel" = dontDistribute super."typelevel"; + "typelevel-tensor" = dontDistribute super."typelevel-tensor"; + "typeof" = dontDistribute super."typeof"; + "typeparams" = dontDistribute super."typeparams"; + "typesafe-endian" = dontDistribute super."typesafe-endian"; + "typescript-docs" = dontDistribute super."typescript-docs"; + "typical" = dontDistribute super."typical"; + "typography-geometry" = dontDistribute super."typography-geometry"; + "tz" = dontDistribute super."tz"; + "tzdata" = dontDistribute super."tzdata"; + "uAgda" = dontDistribute super."uAgda"; + "ua-parser" = dontDistribute super."ua-parser"; + "uacpid" = dontDistribute super."uacpid"; + "uberlast" = dontDistribute super."uberlast"; + "uconv" = dontDistribute super."uconv"; + "udbus" = dontDistribute super."udbus"; + "udbus-model" = dontDistribute super."udbus-model"; + "udcode" = dontDistribute super."udcode"; + "udev" = dontDistribute super."udev"; + "uglymemo" = dontDistribute super."uglymemo"; + "uhc-light" = dontDistribute super."uhc-light"; + "uhc-util" = dontDistribute super."uhc-util"; + "uhexdump" = dontDistribute super."uhexdump"; + "uhttpc" = dontDistribute super."uhttpc"; + "ui-command" = dontDistribute super."ui-command"; + "uid" = dontDistribute super."uid"; + "una" = dontDistribute super."una"; + "unagi-chan" = dontDistribute super."unagi-chan"; + "unagi-streams" = dontDistribute super."unagi-streams"; + "unamb" = dontDistribute super."unamb"; + "unamb-custom" = dontDistribute super."unamb-custom"; + "unbound" = dontDistribute super."unbound"; + "unbounded-delays-units" = dontDistribute super."unbounded-delays-units"; + "unboxed-containers" = dontDistribute super."unboxed-containers"; + "unexceptionalio" = dontDistribute super."unexceptionalio"; + "unfoldable" = dontDistribute super."unfoldable"; + "ungadtagger" = dontDistribute super."ungadtagger"; + "uni-events" = dontDistribute super."uni-events"; + "uni-graphs" = dontDistribute super."uni-graphs"; + "uni-htk" = dontDistribute super."uni-htk"; + "uni-posixutil" = dontDistribute super."uni-posixutil"; + "uni-reactor" = dontDistribute super."uni-reactor"; + "uni-uDrawGraph" = dontDistribute super."uni-uDrawGraph"; + "uni-util" = dontDistribute super."uni-util"; + "unicode" = dontDistribute super."unicode"; + "unicode-names" = dontDistribute super."unicode-names"; + "unicode-normalization" = dontDistribute super."unicode-normalization"; + "unicode-prelude" = dontDistribute super."unicode-prelude"; + "unicode-properties" = dontDistribute super."unicode-properties"; + "unicode-symbols" = dontDistribute super."unicode-symbols"; + "unicoder" = dontDistribute super."unicoder"; + "unification-fd" = dontDistribute super."unification-fd"; + "uniform-io" = dontDistribute super."uniform-io"; + "uniform-pair" = dontDistribute super."uniform-pair"; + "union-find-array" = dontDistribute super."union-find-array"; + "union-map" = dontDistribute super."union-map"; + "unique" = dontDistribute super."unique"; + "unique-logic" = dontDistribute super."unique-logic"; + "unique-logic-tf" = dontDistribute super."unique-logic-tf"; + "uniqueid" = dontDistribute super."uniqueid"; + "unit" = dontDistribute super."unit"; + "units" = dontDistribute super."units"; + "units-attoparsec" = dontDistribute super."units-attoparsec"; + "units-defs" = dontDistribute super."units-defs"; + "units-parser" = dontDistribute super."units-parser"; + "unittyped" = dontDistribute super."unittyped"; + "universal-binary" = dontDistribute super."universal-binary"; + "universe" = dontDistribute super."universe"; + "universe-base" = dontDistribute super."universe-base"; + "universe-instances-base" = dontDistribute super."universe-instances-base"; + "universe-instances-extended" = dontDistribute super."universe-instances-extended"; + "universe-instances-trans" = dontDistribute super."universe-instances-trans"; + "universe-reverse-instances" = dontDistribute super."universe-reverse-instances"; + "universe-th" = dontDistribute super."universe-th"; + "unix-bytestring" = dontDistribute super."unix-bytestring"; + "unix-fcntl" = dontDistribute super."unix-fcntl"; + "unix-handle" = dontDistribute super."unix-handle"; + "unix-io-extra" = dontDistribute super."unix-io-extra"; + "unix-memory" = dontDistribute super."unix-memory"; + "unix-process-conduit" = dontDistribute super."unix-process-conduit"; + "unix-pty-light" = dontDistribute super."unix-pty-light"; + "unlit" = dontDistribute super."unlit"; + "unm-hip" = dontDistribute super."unm-hip"; + "unordered-containers-rematch" = dontDistribute super."unordered-containers-rematch"; + "unordered-graphs" = dontDistribute super."unordered-graphs"; + "unpack-funcs" = dontDistribute super."unpack-funcs"; + "unroll-ghc-plugin" = dontDistribute super."unroll-ghc-plugin"; + "unsafe" = dontDistribute super."unsafe"; + "unsafe-promises" = dontDistribute super."unsafe-promises"; + "unsafely" = dontDistribute super."unsafely"; + "unsafeperformst" = dontDistribute super."unsafeperformst"; + "unscramble" = dontDistribute super."unscramble"; + "unusable-pkg" = dontDistribute super."unusable-pkg"; + "uom-plugin" = dontDistribute super."uom-plugin"; + "up" = dontDistribute super."up"; + "up-grade" = dontDistribute super."up-grade"; + "uploadcare" = dontDistribute super."uploadcare"; + "upskirt" = dontDistribute super."upskirt"; + "ureader" = dontDistribute super."ureader"; + "urembed" = dontDistribute super."urembed"; + "uri" = dontDistribute super."uri"; + "uri-conduit" = dontDistribute super."uri-conduit"; + "uri-enumerator" = dontDistribute super."uri-enumerator"; + "uri-enumerator-file" = dontDistribute super."uri-enumerator-file"; + "uri-template" = dontDistribute super."uri-template"; + "url-generic" = dontDistribute super."url-generic"; + "urlcheck" = dontDistribute super."urlcheck"; + "urldecode" = dontDistribute super."urldecode"; + "urldisp-happstack" = dontDistribute super."urldisp-happstack"; + "urlencoded" = dontDistribute super."urlencoded"; + "urn" = dontDistribute super."urn"; + "urxml" = dontDistribute super."urxml"; + "usb" = dontDistribute super."usb"; + "usb-enumerator" = dontDistribute super."usb-enumerator"; + "usb-hid" = dontDistribute super."usb-hid"; + "usb-id-database" = dontDistribute super."usb-id-database"; + "usb-iteratee" = dontDistribute super."usb-iteratee"; + "usb-safe" = dontDistribute super."usb-safe"; + "userid" = dontDistribute super."userid"; + "utc" = dontDistribute super."utc"; + "utf8-env" = dontDistribute super."utf8-env"; + "utf8-prelude" = dontDistribute super."utf8-prelude"; + "utility-ht" = dontDistribute super."utility-ht"; + "uu-cco" = dontDistribute super."uu-cco"; + "uu-cco-examples" = dontDistribute super."uu-cco-examples"; + "uu-cco-hut-parsing" = dontDistribute super."uu-cco-hut-parsing"; + "uu-cco-uu-parsinglib" = dontDistribute super."uu-cco-uu-parsinglib"; + "uu-options" = dontDistribute super."uu-options"; + "uu-tc" = dontDistribute super."uu-tc"; + "uuagc" = dontDistribute super."uuagc"; + "uuagc-bootstrap" = dontDistribute super."uuagc-bootstrap"; + "uuagc-cabal" = dontDistribute super."uuagc-cabal"; + "uuagc-diagrams" = dontDistribute super."uuagc-diagrams"; + "uuagd" = dontDistribute super."uuagd"; + "uuid-aeson" = dontDistribute super."uuid-aeson"; + "uuid-le" = dontDistribute super."uuid-le"; + "uuid-orphans" = dontDistribute super."uuid-orphans"; + "uuid-quasi" = dontDistribute super."uuid-quasi"; + "uulib" = dontDistribute super."uulib"; + "uvector" = dontDistribute super."uvector"; + "uvector-algorithms" = dontDistribute super."uvector-algorithms"; + "uxadt" = dontDistribute super."uxadt"; + "uzbl-with-source" = dontDistribute super."uzbl-with-source"; + "v4l2" = dontDistribute super."v4l2"; + "v4l2-examples" = dontDistribute super."v4l2-examples"; + "vacuum" = dontDistribute super."vacuum"; + "vacuum-cairo" = dontDistribute super."vacuum-cairo"; + "vacuum-graphviz" = dontDistribute super."vacuum-graphviz"; + "vacuum-opengl" = dontDistribute super."vacuum-opengl"; + "vacuum-ubigraph" = dontDistribute super."vacuum-ubigraph"; + "vado" = dontDistribute super."vado"; + "valid-names" = dontDistribute super."valid-names"; + "validate" = dontDistribute super."validate"; + "validate-input" = doDistribute super."validate-input_0_2_0_0"; + "validated-literals" = dontDistribute super."validated-literals"; + "validation" = dontDistribute super."validation"; + "validations" = dontDistribute super."validations"; + "value-supply" = dontDistribute super."value-supply"; + "vampire" = dontDistribute super."vampire"; + "var" = dontDistribute super."var"; + "varan" = dontDistribute super."varan"; + "variable-precision" = dontDistribute super."variable-precision"; + "variables" = dontDistribute super."variables"; + "varying" = dontDistribute super."varying"; + "vaultaire-common" = dontDistribute super."vaultaire-common"; + "vcache" = dontDistribute super."vcache"; + "vcache-trie" = dontDistribute super."vcache-trie"; + "vcard" = dontDistribute super."vcard"; + "vcd" = dontDistribute super."vcd"; + "vcs-revision" = dontDistribute super."vcs-revision"; + "vcs-web-hook-parse" = dontDistribute super."vcs-web-hook-parse"; + "vcsgui" = dontDistribute super."vcsgui"; + "vcswrapper" = dontDistribute super."vcswrapper"; + "vect" = dontDistribute super."vect"; + "vect-floating" = dontDistribute super."vect-floating"; + "vect-floating-accelerate" = dontDistribute super."vect-floating-accelerate"; + "vect-opengl" = dontDistribute super."vect-opengl"; + "vector" = doDistribute super."vector_0_10_12_3"; + "vector-binary" = dontDistribute super."vector-binary"; + "vector-bytestring" = dontDistribute super."vector-bytestring"; + "vector-clock" = dontDistribute super."vector-clock"; + "vector-conduit" = dontDistribute super."vector-conduit"; + "vector-fftw" = dontDistribute super."vector-fftw"; + "vector-functorlazy" = dontDistribute super."vector-functorlazy"; + "vector-heterogenous" = dontDistribute super."vector-heterogenous"; + "vector-instances-collections" = dontDistribute super."vector-instances-collections"; + "vector-mmap" = dontDistribute super."vector-mmap"; + "vector-random" = dontDistribute super."vector-random"; + "vector-read-instances" = dontDistribute super."vector-read-instances"; + "vector-space-map" = dontDistribute super."vector-space-map"; + "vector-space-opengl" = dontDistribute super."vector-space-opengl"; + "vector-static" = dontDistribute super."vector-static"; + "vector-strategies" = dontDistribute super."vector-strategies"; + "verbalexpressions" = dontDistribute super."verbalexpressions"; + "verbosity" = dontDistribute super."verbosity"; + "verdict" = dontDistribute super."verdict"; + "verdict-json" = dontDistribute super."verdict-json"; + "verilog" = dontDistribute super."verilog"; + "versions" = dontDistribute super."versions"; + "vhdl" = dontDistribute super."vhdl"; + "views" = dontDistribute super."views"; + "vigilance" = dontDistribute super."vigilance"; + "vimeta" = dontDistribute super."vimeta"; + "vimus" = dontDistribute super."vimus"; + "vintage-basic" = dontDistribute super."vintage-basic"; + "vinyl" = dontDistribute super."vinyl"; + "vinyl-gl" = dontDistribute super."vinyl-gl"; + "vinyl-json" = dontDistribute super."vinyl-json"; + "vinyl-utils" = dontDistribute super."vinyl-utils"; + "virthualenv" = dontDistribute super."virthualenv"; + "vision" = dontDistribute super."vision"; + "visual-graphrewrite" = dontDistribute super."visual-graphrewrite"; + "visual-prof" = dontDistribute super."visual-prof"; + "vivid" = dontDistribute super."vivid"; + "vk-aws-route53" = dontDistribute super."vk-aws-route53"; + "vk-posix-pty" = dontDistribute super."vk-posix-pty"; + "vocabulary-kadma" = dontDistribute super."vocabulary-kadma"; + "vorbiscomment" = dontDistribute super."vorbiscomment"; + "vowpal-utils" = dontDistribute super."vowpal-utils"; + "voyeur" = dontDistribute super."voyeur"; + "vte" = dontDistribute super."vte"; + "vtegtk3" = dontDistribute super."vtegtk3"; + "vty" = dontDistribute super."vty"; + "vty-examples" = dontDistribute super."vty-examples"; + "vty-menu" = dontDistribute super."vty-menu"; + "vty-ui" = dontDistribute super."vty-ui"; + "vty-ui-extras" = dontDistribute super."vty-ui-extras"; + "waddle" = dontDistribute super."waddle"; + "wai-app-file-cgi" = dontDistribute super."wai-app-file-cgi"; + "wai-devel" = dontDistribute super."wai-devel"; + "wai-digestive-functors" = dontDistribute super."wai-digestive-functors"; + "wai-dispatch" = dontDistribute super."wai-dispatch"; + "wai-frontend-monadcgi" = dontDistribute super."wai-frontend-monadcgi"; + "wai-graceful" = dontDistribute super."wai-graceful"; + "wai-handler-devel" = dontDistribute super."wai-handler-devel"; + "wai-handler-fastcgi" = dontDistribute super."wai-handler-fastcgi"; + "wai-handler-scgi" = dontDistribute super."wai-handler-scgi"; + "wai-handler-snap" = dontDistribute super."wai-handler-snap"; + "wai-handler-webkit" = dontDistribute super."wai-handler-webkit"; + "wai-hastache" = dontDistribute super."wai-hastache"; + "wai-hmac-auth" = dontDistribute super."wai-hmac-auth"; + "wai-lens" = dontDistribute super."wai-lens"; + "wai-lite" = dontDistribute super."wai-lite"; + "wai-logger-prefork" = dontDistribute super."wai-logger-prefork"; + "wai-middleware-cache" = dontDistribute super."wai-middleware-cache"; + "wai-middleware-cache-redis" = dontDistribute super."wai-middleware-cache-redis"; + "wai-middleware-catch" = dontDistribute super."wai-middleware-catch"; + "wai-middleware-content-type" = dontDistribute super."wai-middleware-content-type"; + "wai-middleware-etag" = dontDistribute super."wai-middleware-etag"; + "wai-middleware-gunzip" = dontDistribute super."wai-middleware-gunzip"; + "wai-middleware-headers" = dontDistribute super."wai-middleware-headers"; + "wai-middleware-hmac" = dontDistribute super."wai-middleware-hmac"; + "wai-middleware-hmac-client" = dontDistribute super."wai-middleware-hmac-client"; + "wai-middleware-metrics" = dontDistribute super."wai-middleware-metrics"; + "wai-middleware-preprocessor" = dontDistribute super."wai-middleware-preprocessor"; + "wai-middleware-route" = dontDistribute super."wai-middleware-route"; + "wai-middleware-static" = doDistribute super."wai-middleware-static_0_7_0_1"; + "wai-middleware-static-caching" = dontDistribute super."wai-middleware-static-caching"; + "wai-middleware-verbs" = dontDistribute super."wai-middleware-verbs"; + "wai-request-spec" = dontDistribute super."wai-request-spec"; + "wai-responsible" = dontDistribute super."wai-responsible"; + "wai-router" = dontDistribute super."wai-router"; + "wai-routes" = doDistribute super."wai-routes_0_7_3"; + "wai-session-clientsession" = dontDistribute super."wai-session-clientsession"; + "wai-session-tokyocabinet" = dontDistribute super."wai-session-tokyocabinet"; + "wai-static-cache" = dontDistribute super."wai-static-cache"; + "wai-static-pages" = dontDistribute super."wai-static-pages"; + "wai-test" = dontDistribute super."wai-test"; + "wai-thrift" = dontDistribute super."wai-thrift"; + "wai-throttler" = dontDistribute super."wai-throttler"; + "wai-transformers" = dontDistribute super."wai-transformers"; + "wai-util" = dontDistribute super."wai-util"; + "wait-handle" = dontDistribute super."wait-handle"; + "waitfree" = dontDistribute super."waitfree"; + "warc" = dontDistribute super."warc"; + "warp" = doDistribute super."warp_3_1_3_1"; + "warp-dynamic" = dontDistribute super."warp-dynamic"; + "warp-static" = dontDistribute super."warp-static"; + "warp-tls" = doDistribute super."warp-tls_3_1_3"; + "warp-tls-uid" = dontDistribute super."warp-tls-uid"; + "watchdog" = dontDistribute super."watchdog"; + "watcher" = dontDistribute super."watcher"; + "watchit" = dontDistribute super."watchit"; + "wavconvert" = dontDistribute super."wavconvert"; + "wavefront" = dontDistribute super."wavefront"; + "wavesurfer" = dontDistribute super."wavesurfer"; + "wavy" = dontDistribute super."wavy"; + "wcwidth" = dontDistribute super."wcwidth"; + "weather-api" = dontDistribute super."weather-api"; + "web-browser-in-haskell" = dontDistribute super."web-browser-in-haskell"; + "web-css" = dontDistribute super."web-css"; + "web-encodings" = dontDistribute super."web-encodings"; + "web-mongrel2" = dontDistribute super."web-mongrel2"; + "web-page" = dontDistribute super."web-page"; + "web-plugins" = dontDistribute super."web-plugins"; + "web-routes" = dontDistribute super."web-routes"; + "web-routes-boomerang" = dontDistribute super."web-routes-boomerang"; + "web-routes-happstack" = dontDistribute super."web-routes-happstack"; + "web-routes-hsp" = dontDistribute super."web-routes-hsp"; + "web-routes-mtl" = dontDistribute super."web-routes-mtl"; + "web-routes-quasi" = dontDistribute super."web-routes-quasi"; + "web-routes-regular" = dontDistribute super."web-routes-regular"; + "web-routes-th" = dontDistribute super."web-routes-th"; + "web-routes-transformers" = dontDistribute super."web-routes-transformers"; + "web-routes-wai" = dontDistribute super."web-routes-wai"; + "webcrank" = dontDistribute super."webcrank"; + "webcrank-dispatch" = dontDistribute super."webcrank-dispatch"; + "webcrank-wai" = dontDistribute super."webcrank-wai"; + "webdriver" = doDistribute super."webdriver_0_6_3_1"; + "webdriver-snoy" = dontDistribute super."webdriver-snoy"; + "webidl" = dontDistribute super."webidl"; + "webify" = dontDistribute super."webify"; + "webkit" = dontDistribute super."webkit"; + "webkit-javascriptcore" = dontDistribute super."webkit-javascriptcore"; + "webkitgtk3" = dontDistribute super."webkitgtk3"; + "webkitgtk3-javascriptcore" = dontDistribute super."webkitgtk3-javascriptcore"; + "webrtc-vad" = dontDistribute super."webrtc-vad"; + "webserver" = dontDistribute super."webserver"; + "websnap" = dontDistribute super."websnap"; + "websockets-snap" = dontDistribute super."websockets-snap"; + "webwire" = dontDistribute super."webwire"; + "wedding-announcement" = dontDistribute super."wedding-announcement"; + "wedged" = dontDistribute super."wedged"; + "weighted-regexp" = dontDistribute super."weighted-regexp"; + "weighted-search" = dontDistribute super."weighted-search"; + "welshy" = dontDistribute super."welshy"; + "wheb-mongo" = dontDistribute super."wheb-mongo"; + "wheb-redis" = dontDistribute super."wheb-redis"; + "wheb-strapped" = dontDistribute super."wheb-strapped"; + "while-lang-parser" = dontDistribute super."while-lang-parser"; + "whim" = dontDistribute super."whim"; + "whiskers" = dontDistribute super."whiskers"; + "whitespace" = dontDistribute super."whitespace"; + "whois" = dontDistribute super."whois"; + "why3" = dontDistribute super."why3"; + "wigner-symbols" = dontDistribute super."wigner-symbols"; + "wikipedia4epub" = dontDistribute super."wikipedia4epub"; + "win-hp-path" = dontDistribute super."win-hp-path"; + "windowslive" = dontDistribute super."windowslive"; + "winerror" = dontDistribute super."winerror"; + "winio" = dontDistribute super."winio"; + "wiring" = dontDistribute super."wiring"; + "withdependencies" = dontDistribute super."withdependencies"; + "witness" = dontDistribute super."witness"; + "witty" = dontDistribute super."witty"; + "wkt" = dontDistribute super."wkt"; + "wl-pprint-ansiterm" = dontDistribute super."wl-pprint-ansiterm"; + "wlc-hs" = dontDistribute super."wlc-hs"; + "wobsurv" = dontDistribute super."wobsurv"; + "woffex" = dontDistribute super."woffex"; + "wol" = dontDistribute super."wol"; + "wolf" = dontDistribute super."wolf"; + "woot" = dontDistribute super."woot"; + "word-trie" = dontDistribute super."word-trie"; + "word24" = dontDistribute super."word24"; + "wordcloud" = dontDistribute super."wordcloud"; + "wordexp" = dontDistribute super."wordexp"; + "words" = dontDistribute super."words"; + "wordsearch" = dontDistribute super."wordsearch"; + "wordsetdiff" = dontDistribute super."wordsetdiff"; + "workflow-osx" = dontDistribute super."workflow-osx"; + "wp-archivebot" = dontDistribute super."wp-archivebot"; + "wraparound" = dontDistribute super."wraparound"; + "wraxml" = dontDistribute super."wraxml"; + "wreq-sb" = dontDistribute super."wreq-sb"; + "wright" = dontDistribute super."wright"; + "wsedit" = dontDistribute super."wsedit"; + "wtk" = dontDistribute super."wtk"; + "wtk-gtk" = dontDistribute super."wtk-gtk"; + "wumpus-basic" = dontDistribute super."wumpus-basic"; + "wumpus-core" = dontDistribute super."wumpus-core"; + "wumpus-drawing" = dontDistribute super."wumpus-drawing"; + "wumpus-microprint" = dontDistribute super."wumpus-microprint"; + "wumpus-tree" = dontDistribute super."wumpus-tree"; + "wuss" = dontDistribute super."wuss"; + "wx" = dontDistribute super."wx"; + "wxAsteroids" = dontDistribute super."wxAsteroids"; + "wxFruit" = dontDistribute super."wxFruit"; + "wxc" = dontDistribute super."wxc"; + "wxcore" = dontDistribute super."wxcore"; + "wxdirect" = dontDistribute super."wxdirect"; + "wxhnotepad" = dontDistribute super."wxhnotepad"; + "wxturtle" = dontDistribute super."wxturtle"; + "wybor" = dontDistribute super."wybor"; + "wyvern" = dontDistribute super."wyvern"; + "x-dsp" = dontDistribute super."x-dsp"; + "x11-xim" = dontDistribute super."x11-xim"; + "x11-xinput" = dontDistribute super."x11-xinput"; + "x509-util" = dontDistribute super."x509-util"; + "xattr" = dontDistribute super."xattr"; + "xbattbar" = dontDistribute super."xbattbar"; + "xcb-types" = dontDistribute super."xcb-types"; + "xcffib" = dontDistribute super."xcffib"; + "xchat-plugin" = dontDistribute super."xchat-plugin"; + "xcp" = dontDistribute super."xcp"; + "xdg-basedir" = dontDistribute super."xdg-basedir"; + "xdg-userdirs" = dontDistribute super."xdg-userdirs"; + "xdot" = dontDistribute super."xdot"; + "xfconf" = dontDistribute super."xfconf"; + "xhaskell-library" = dontDistribute super."xhaskell-library"; + "xhb" = dontDistribute super."xhb"; + "xhb-atom-cache" = dontDistribute super."xhb-atom-cache"; + "xhb-ewmh" = dontDistribute super."xhb-ewmh"; + "xhtml" = doDistribute super."xhtml_3000_2_1"; + "xhtml-combinators" = dontDistribute super."xhtml-combinators"; + "xilinx-lava" = dontDistribute super."xilinx-lava"; + "xine" = dontDistribute super."xine"; + "xing-api" = dontDistribute super."xing-api"; + "xinput-conduit" = dontDistribute super."xinput-conduit"; + "xkbcommon" = dontDistribute super."xkbcommon"; + "xkcd" = dontDistribute super."xkcd"; + "xlsx-templater" = dontDistribute super."xlsx-templater"; + "xml-basic" = dontDistribute super."xml-basic"; + "xml-catalog" = dontDistribute super."xml-catalog"; + "xml-conduit-parse" = dontDistribute super."xml-conduit-parse"; + "xml-conduit-writer" = dontDistribute super."xml-conduit-writer"; + "xml-enumerator" = dontDistribute super."xml-enumerator"; + "xml-enumerator-combinators" = dontDistribute super."xml-enumerator-combinators"; + "xml-extractors" = dontDistribute super."xml-extractors"; + "xml-helpers" = dontDistribute super."xml-helpers"; + "xml-html-conduit-lens" = dontDistribute super."xml-html-conduit-lens"; + "xml-monad" = dontDistribute super."xml-monad"; + "xml-parsec" = dontDistribute super."xml-parsec"; + "xml-picklers" = dontDistribute super."xml-picklers"; + "xml-pipe" = dontDistribute super."xml-pipe"; + "xml-prettify" = dontDistribute super."xml-prettify"; + "xml-push" = dontDistribute super."xml-push"; + "xml2html" = dontDistribute super."xml2html"; + "xml2json" = dontDistribute super."xml2json"; + "xml2x" = dontDistribute super."xml2x"; + "xmltv" = dontDistribute super."xmltv"; + "xmms2-client" = dontDistribute super."xmms2-client"; + "xmms2-client-glib" = dontDistribute super."xmms2-client-glib"; + "xmobar" = dontDistribute super."xmobar"; + "xmonad" = dontDistribute super."xmonad"; + "xmonad-bluetilebranch" = dontDistribute super."xmonad-bluetilebranch"; + "xmonad-contrib" = dontDistribute super."xmonad-contrib"; + "xmonad-contrib-bluetilebranch" = dontDistribute super."xmonad-contrib-bluetilebranch"; + "xmonad-contrib-gpl" = dontDistribute super."xmonad-contrib-gpl"; + "xmonad-entryhelper" = dontDistribute super."xmonad-entryhelper"; + "xmonad-eval" = dontDistribute super."xmonad-eval"; + "xmonad-extras" = dontDistribute super."xmonad-extras"; + "xmonad-screenshot" = dontDistribute super."xmonad-screenshot"; + "xmonad-utils" = dontDistribute super."xmonad-utils"; + "xmonad-wallpaper" = dontDistribute super."xmonad-wallpaper"; + "xmonad-windownames" = dontDistribute super."xmonad-windownames"; + "xmpipe" = dontDistribute super."xmpipe"; + "xorshift" = dontDistribute super."xorshift"; + "xosd" = dontDistribute super."xosd"; + "xournal-builder" = dontDistribute super."xournal-builder"; + "xournal-convert" = dontDistribute super."xournal-convert"; + "xournal-parser" = dontDistribute super."xournal-parser"; + "xournal-render" = dontDistribute super."xournal-render"; + "xournal-types" = dontDistribute super."xournal-types"; + "xsact" = dontDistribute super."xsact"; + "xsd" = dontDistribute super."xsd"; + "xsha1" = dontDistribute super."xsha1"; + "xslt" = dontDistribute super."xslt"; + "xtc" = dontDistribute super."xtc"; + "xtest" = dontDistribute super."xtest"; + "xturtle" = dontDistribute super."xturtle"; + "xxhash" = dontDistribute super."xxhash"; + "y0l0bot" = dontDistribute super."y0l0bot"; + "yabi" = dontDistribute super."yabi"; + "yabi-muno" = dontDistribute super."yabi-muno"; + "yahoo-finance-conduit" = dontDistribute super."yahoo-finance-conduit"; + "yahoo-web-search" = dontDistribute super."yahoo-web-search"; + "yajl" = dontDistribute super."yajl"; + "yajl-enumerator" = dontDistribute super."yajl-enumerator"; + "yall" = dontDistribute super."yall"; + "yamemo" = dontDistribute super."yamemo"; + "yaml-config" = dontDistribute super."yaml-config"; + "yaml-light" = dontDistribute super."yaml-light"; + "yaml-light-lens" = dontDistribute super."yaml-light-lens"; + "yaml-rpc" = dontDistribute super."yaml-rpc"; + "yaml-rpc-scotty" = dontDistribute super."yaml-rpc-scotty"; + "yaml-rpc-snap" = dontDistribute super."yaml-rpc-snap"; + "yaml2owl" = dontDistribute super."yaml2owl"; + "yamlkeysdiff" = dontDistribute super."yamlkeysdiff"; + "yampa-canvas" = dontDistribute super."yampa-canvas"; + "yampa-glfw" = dontDistribute super."yampa-glfw"; + "yampa-glut" = dontDistribute super."yampa-glut"; + "yampa2048" = dontDistribute super."yampa2048"; + "yaop" = dontDistribute super."yaop"; + "yap" = dontDistribute super."yap"; + "yarr" = dontDistribute super."yarr"; + "yarr-image-io" = dontDistribute super."yarr-image-io"; + "yate" = dontDistribute super."yate"; + "yavie" = dontDistribute super."yavie"; + "ycextra" = dontDistribute super."ycextra"; + "yeganesh" = dontDistribute super."yeganesh"; + "yeller" = dontDistribute super."yeller"; + "yes-precure5-command" = dontDistribute super."yes-precure5-command"; + "yesod-angular" = dontDistribute super."yesod-angular"; + "yesod-angular-ui" = dontDistribute super."yesod-angular-ui"; + "yesod-auth-account-fork" = dontDistribute super."yesod-auth-account-fork"; + "yesod-auth-bcrypt" = dontDistribute super."yesod-auth-bcrypt"; + "yesod-auth-kerberos" = dontDistribute super."yesod-auth-kerberos"; + "yesod-auth-ldap" = dontDistribute super."yesod-auth-ldap"; + "yesod-auth-ldap-mediocre" = dontDistribute super."yesod-auth-ldap-mediocre"; + "yesod-auth-ldap-native" = dontDistribute super."yesod-auth-ldap-native"; + "yesod-auth-pam" = dontDistribute super."yesod-auth-pam"; + "yesod-auth-smbclient" = dontDistribute super."yesod-auth-smbclient"; + "yesod-auth-zendesk" = dontDistribute super."yesod-auth-zendesk"; + "yesod-bootstrap" = dontDistribute super."yesod-bootstrap"; + "yesod-comments" = dontDistribute super."yesod-comments"; + "yesod-content-pdf" = dontDistribute super."yesod-content-pdf"; + "yesod-continuations" = dontDistribute super."yesod-continuations"; + "yesod-crud" = dontDistribute super."yesod-crud"; + "yesod-crud-persist" = dontDistribute super."yesod-crud-persist"; + "yesod-datatables" = dontDistribute super."yesod-datatables"; + "yesod-dsl" = dontDistribute super."yesod-dsl"; + "yesod-examples" = dontDistribute super."yesod-examples"; + "yesod-form-json" = dontDistribute super."yesod-form-json"; + "yesod-goodies" = dontDistribute super."yesod-goodies"; + "yesod-json" = dontDistribute super."yesod-json"; + "yesod-links" = dontDistribute super."yesod-links"; + "yesod-lucid" = dontDistribute super."yesod-lucid"; + "yesod-markdown" = dontDistribute super."yesod-markdown"; + "yesod-media-simple" = dontDistribute super."yesod-media-simple"; + "yesod-newsfeed" = doDistribute super."yesod-newsfeed_1_4_0_1"; + "yesod-paginate" = dontDistribute super."yesod-paginate"; + "yesod-pagination" = dontDistribute super."yesod-pagination"; + "yesod-paginator" = dontDistribute super."yesod-paginator"; + "yesod-platform" = dontDistribute super."yesod-platform"; + "yesod-pnotify" = dontDistribute super."yesod-pnotify"; + "yesod-pure" = dontDistribute super."yesod-pure"; + "yesod-purescript" = dontDistribute super."yesod-purescript"; + "yesod-raml" = dontDistribute super."yesod-raml"; + "yesod-recaptcha" = dontDistribute super."yesod-recaptcha"; + "yesod-routes" = dontDistribute super."yesod-routes"; + "yesod-routes-flow" = dontDistribute super."yesod-routes-flow"; + "yesod-routes-typescript" = dontDistribute super."yesod-routes-typescript"; + "yesod-rst" = dontDistribute super."yesod-rst"; + "yesod-s3" = dontDistribute super."yesod-s3"; + "yesod-sass" = dontDistribute super."yesod-sass"; + "yesod-session-redis" = dontDistribute super."yesod-session-redis"; + "yesod-table" = doDistribute super."yesod-table_1_0_6"; + "yesod-tableview" = dontDistribute super."yesod-tableview"; + "yesod-test" = doDistribute super."yesod-test_1_4_4"; + "yesod-test-json" = dontDistribute super."yesod-test-json"; + "yesod-tls" = dontDistribute super."yesod-tls"; + "yesod-transloadit" = dontDistribute super."yesod-transloadit"; + "yesod-vend" = dontDistribute super."yesod-vend"; + "yesod-websockets-extra" = dontDistribute super."yesod-websockets-extra"; + "yesod-worker" = dontDistribute super."yesod-worker"; + "yet-another-logger" = dontDistribute super."yet-another-logger"; + "yhccore" = dontDistribute super."yhccore"; + "yi" = dontDistribute super."yi"; + "yi-contrib" = dontDistribute super."yi-contrib"; + "yi-emacs-colours" = dontDistribute super."yi-emacs-colours"; + "yi-fuzzy-open" = dontDistribute super."yi-fuzzy-open"; + "yi-gtk" = dontDistribute super."yi-gtk"; + "yi-language" = dontDistribute super."yi-language"; + "yi-monokai" = dontDistribute super."yi-monokai"; + "yi-rope" = dontDistribute super."yi-rope"; + "yi-snippet" = dontDistribute super."yi-snippet"; + "yi-solarized" = dontDistribute super."yi-solarized"; + "yi-spolsky" = dontDistribute super."yi-spolsky"; + "yi-vty" = dontDistribute super."yi-vty"; + "yices" = dontDistribute super."yices"; + "yices-easy" = dontDistribute super."yices-easy"; + "yices-painless" = dontDistribute super."yices-painless"; + "yjftp" = dontDistribute super."yjftp"; + "yjftp-libs" = dontDistribute super."yjftp-libs"; + "yjsvg" = dontDistribute super."yjsvg"; + "yjtools" = dontDistribute super."yjtools"; + "yocto" = dontDistribute super."yocto"; + "yoko" = dontDistribute super."yoko"; + "york-lava" = dontDistribute super."york-lava"; + "youtube" = dontDistribute super."youtube"; + "yql" = dontDistribute super."yql"; + "yst" = dontDistribute super."yst"; + "yuiGrid" = dontDistribute super."yuiGrid"; + "yuuko" = dontDistribute super."yuuko"; + "yxdb-utils" = dontDistribute super."yxdb-utils"; + "z3" = dontDistribute super."z3"; + "zalgo" = dontDistribute super."zalgo"; + "zampolit" = dontDistribute super."zampolit"; + "zasni-gerna" = dontDistribute super."zasni-gerna"; + "zcache" = dontDistribute super."zcache"; + "zenc" = dontDistribute super."zenc"; + "zendesk-api" = dontDistribute super."zendesk-api"; + "zeno" = dontDistribute super."zeno"; + "zerobin" = dontDistribute super."zerobin"; + "zeromq-haskell" = dontDistribute super."zeromq-haskell"; + "zeromq3-conduit" = dontDistribute super."zeromq3-conduit"; + "zeromq3-haskell" = dontDistribute super."zeromq3-haskell"; + "zeroth" = dontDistribute super."zeroth"; + "zigbee-znet25" = dontDistribute super."zigbee-znet25"; + "zim-parser" = dontDistribute super."zim-parser"; + "zip-conduit" = dontDistribute super."zip-conduit"; + "zipedit" = dontDistribute super."zipedit"; + "zipper" = dontDistribute super."zipper"; + "zippers" = dontDistribute super."zippers"; + "zippo" = dontDistribute super."zippo"; + "zlib-conduit" = dontDistribute super."zlib-conduit"; + "zmcat" = dontDistribute super."zmcat"; + "zmidi-core" = dontDistribute super."zmidi-core"; + "zmidi-score" = dontDistribute super."zmidi-score"; + "zmqat" = dontDistribute super."zmqat"; + "zoneinfo" = dontDistribute super."zoneinfo"; + "zoom" = dontDistribute super."zoom"; + "zoom-cache" = dontDistribute super."zoom-cache"; + "zoom-cache-pcm" = dontDistribute super."zoom-cache-pcm"; + "zoom-cache-sndfile" = dontDistribute super."zoom-cache-sndfile"; + "zoom-refs" = dontDistribute super."zoom-refs"; + "zot" = dontDistribute super."zot"; + "zsh-battery" = dontDistribute super."zsh-battery"; + "ztail" = dontDistribute super."ztail"; + +} diff --git a/pkgs/development/haskell-modules/configuration-lts-3.2.nix b/pkgs/development/haskell-modules/configuration-lts-3.2.nix index 3a978a637a04..7d5ff5d2dac5 100644 --- a/pkgs/development/haskell-modules/configuration-lts-3.2.nix +++ b/pkgs/development/haskell-modules/configuration-lts-3.2.nix @@ -490,6 +490,7 @@ self: super: { "HasGP" = dontDistribute super."HasGP"; "Haschoo" = dontDistribute super."Haschoo"; "Hashell" = dontDistribute super."Hashell"; + "HaskRel" = dontDistribute super."HaskRel"; "HaskellForMaths" = dontDistribute super."HaskellForMaths"; "HaskellLM" = dontDistribute super."HaskellLM"; "HaskellNN" = dontDistribute super."HaskellNN"; @@ -534,6 +535,7 @@ self: super: { "Hsed" = dontDistribute super."Hsed"; "Hsmtlib" = dontDistribute super."Hsmtlib"; "HueAPI" = dontDistribute super."HueAPI"; + "HulkImport" = dontDistribute super."HulkImport"; "Hungarian-Munkres" = dontDistribute super."Hungarian-Munkres"; "IDynamic" = dontDistribute super."IDynamic"; "IFS" = dontDistribute super."IFS"; @@ -1111,6 +1113,7 @@ self: super: { "afis" = dontDistribute super."afis"; "afv" = dontDistribute super."afv"; "agda-server" = dontDistribute super."agda-server"; + "agda-snippets" = dontDistribute super."agda-snippets"; "agum" = dontDistribute super."agum"; "aig" = dontDistribute super."aig"; "air" = dontDistribute super."air"; @@ -1379,6 +1382,7 @@ self: super: { "awesomium" = dontDistribute super."awesomium"; "awesomium-glut" = dontDistribute super."awesomium-glut"; "awesomium-raw" = dontDistribute super."awesomium-raw"; + "aws" = doDistribute super."aws_0_12_1"; "aws-cloudfront-signer" = dontDistribute super."aws-cloudfront-signer"; "aws-configuration-tools" = dontDistribute super."aws-configuration-tools"; "aws-dynamodb-conduit" = dontDistribute super."aws-dynamodb-conduit"; @@ -1864,6 +1868,7 @@ self: super: { "cinvoke" = dontDistribute super."cinvoke"; "cio" = dontDistribute super."cio"; "cipher-rc5" = dontDistribute super."cipher-rc5"; + "ciphersaber2" = dontDistribute super."ciphersaber2"; "circ" = dontDistribute super."circ"; "cirru-parser" = dontDistribute super."cirru-parser"; "citation-resolve" = dontDistribute super."citation-resolve"; @@ -2121,6 +2126,7 @@ self: super: { "cpuid" = dontDistribute super."cpuid"; "cpuperf" = dontDistribute super."cpuperf"; "cpython" = dontDistribute super."cpython"; + "cql" = doDistribute super."cql_3_0_5"; "cqrs" = dontDistribute super."cqrs"; "cqrs-core" = dontDistribute super."cqrs-core"; "cqrs-example" = dontDistribute super."cqrs-example"; @@ -2300,6 +2306,7 @@ self: super: { "dataflow" = dontDistribute super."dataflow"; "datalog" = dontDistribute super."datalog"; "datapacker" = dontDistribute super."datapacker"; + "dataurl" = dontDistribute super."dataurl"; "date-cache" = dontDistribute super."date-cache"; "dates" = dontDistribute super."dates"; "datetime" = dontDistribute super."datetime"; @@ -2684,6 +2691,7 @@ self: super: { "eros-client" = dontDistribute super."eros-client"; "eros-http" = dontDistribute super."eros-http"; "errno" = dontDistribute super."errno"; + "error-analyze" = dontDistribute super."error-analyze"; "error-continuations" = dontDistribute super."error-continuations"; "error-list" = dontDistribute super."error-list"; "error-loc" = dontDistribute super."error-loc"; @@ -2734,6 +2742,7 @@ self: super: { "exinst-deepseq" = dontDistribute super."exinst-deepseq"; "exinst-hashable" = dontDistribute super."exinst-hashable"; "exists" = dontDistribute super."exists"; + "exit-codes" = dontDistribute super."exit-codes"; "exp-pairs" = dontDistribute super."exp-pairs"; "expand" = dontDistribute super."expand"; "expat-enumerator" = dontDistribute super."expat-enumerator"; @@ -2840,6 +2849,7 @@ self: super: { "find-conduit" = dontDistribute super."find-conduit"; "fingertree-tf" = dontDistribute super."fingertree-tf"; "finite-field" = dontDistribute super."finite-field"; + "finite-typelits" = dontDistribute super."finite-typelits"; "first-and-last" = dontDistribute super."first-and-last"; "first-class-patterns" = dontDistribute super."first-class-patterns"; "firstify" = dontDistribute super."firstify"; @@ -3111,17 +3121,33 @@ self: super: { "ghclive" = dontDistribute super."ghclive"; "ghczdecode" = dontDistribute super."ghczdecode"; "ght" = dontDistribute super."ght"; + "gi-atk" = dontDistribute super."gi-atk"; + "gi-cairo" = dontDistribute super."gi-cairo"; + "gi-gdk" = dontDistribute super."gi-gdk"; + "gi-gdkpixbuf" = dontDistribute super."gi-gdkpixbuf"; + "gi-gio" = dontDistribute super."gi-gio"; + "gi-glib" = dontDistribute super."gi-glib"; + "gi-gobject" = dontDistribute super."gi-gobject"; + "gi-gtk" = dontDistribute super."gi-gtk"; + "gi-javascriptcore" = dontDistribute super."gi-javascriptcore"; + "gi-notify" = dontDistribute super."gi-notify"; + "gi-pango" = dontDistribute super."gi-pango"; + "gi-soup" = dontDistribute super."gi-soup"; + "gi-vte" = dontDistribute super."gi-vte"; + "gi-webkit" = dontDistribute super."gi-webkit"; "gimlh" = dontDistribute super."gimlh"; "ginger" = dontDistribute super."ginger"; "ginsu" = dontDistribute super."ginsu"; "gipeda" = doDistribute super."gipeda_0_1_2_1"; "gist" = dontDistribute super."gist"; "git-all" = dontDistribute super."git-all"; + "git-annex" = doDistribute super."git-annex_5_20150727"; "git-checklist" = dontDistribute super."git-checklist"; "git-date" = dontDistribute super."git-date"; "git-embed" = dontDistribute super."git-embed"; "git-freq" = dontDistribute super."git-freq"; "git-gpush" = dontDistribute super."git-gpush"; + "git-jump" = dontDistribute super."git-jump"; "git-monitor" = dontDistribute super."git-monitor"; "git-object" = dontDistribute super."git-object"; "git-repair" = dontDistribute super."git-repair"; @@ -3583,6 +3609,8 @@ self: super: { "haskell-formatter" = dontDistribute super."haskell-formatter"; "haskell-ftp" = dontDistribute super."haskell-ftp"; "haskell-generate" = dontDistribute super."haskell-generate"; + "haskell-gi" = dontDistribute super."haskell-gi"; + "haskell-gi-base" = dontDistribute super."haskell-gi-base"; "haskell-import-graph" = dontDistribute super."haskell-import-graph"; "haskell-in-space" = dontDistribute super."haskell-in-space"; "haskell-modbus" = dontDistribute super."haskell-modbus"; @@ -3773,9 +3801,11 @@ self: super: { "hfann" = dontDistribute super."hfann"; "hfd" = dontDistribute super."hfd"; "hfiar" = dontDistribute super."hfiar"; + "hfmt" = dontDistribute super."hfmt"; "hfoil" = dontDistribute super."hfoil"; "hfov" = dontDistribute super."hfov"; "hfractal" = dontDistribute super."hfractal"; + "hfsevents" = doDistribute super."hfsevents_0_1_5"; "hfusion" = dontDistribute super."hfusion"; "hg-buildpackage" = dontDistribute super."hg-buildpackage"; "hgal" = dontDistribute super."hgal"; @@ -4172,6 +4202,7 @@ self: super: { "hsx2hs" = dontDistribute super."hsx2hs"; "hsyscall" = dontDistribute super."hsyscall"; "hszephyr" = dontDistribute super."hszephyr"; + "htaglib" = dontDistribute super."htaglib"; "htags" = dontDistribute super."htags"; "htar" = dontDistribute super."htar"; "htiled" = dontDistribute super."htiled"; @@ -4573,6 +4604,7 @@ self: super: { "keera-hails-reactive-polling" = dontDistribute super."keera-hails-reactive-polling"; "keera-hails-reactive-wx" = dontDistribute super."keera-hails-reactive-wx"; "keera-hails-reactive-yampa" = dontDistribute super."keera-hails-reactive-yampa"; + "keera-hails-reactivelenses" = dontDistribute super."keera-hails-reactivelenses"; "keera-hails-reactivevalues" = dontDistribute super."keera-hails-reactivevalues"; "keera-posture" = dontDistribute super."keera-posture"; "keiretsu" = dontDistribute super."keiretsu"; @@ -4678,6 +4710,8 @@ self: super: { "lat" = dontDistribute super."lat"; "latest-npm-version" = dontDistribute super."latest-npm-version"; "latex" = dontDistribute super."latex"; + "latex-formulae-image" = dontDistribute super."latex-formulae-image"; + "latex-formulae-pandoc" = dontDistribute super."latex-formulae-pandoc"; "lattices" = doDistribute super."lattices_1_3"; "launchpad-control" = dontDistribute super."launchpad-control"; "lax" = dontDistribute super."lax"; @@ -4706,6 +4740,7 @@ self: super: { "leksah" = dontDistribute super."leksah"; "leksah-server" = dontDistribute super."leksah-server"; "lendingclub" = dontDistribute super."lendingclub"; + "lens-action" = doDistribute super."lens-action_0_2_0_1"; "lens-aeson" = doDistribute super."lens-aeson_1_0_0_4"; "lens-datetime" = dontDistribute super."lens-datetime"; "lens-prelude" = dontDistribute super."lens-prelude"; @@ -5015,6 +5050,7 @@ self: super: { "memexml" = dontDistribute super."memexml"; "memo-ptr" = dontDistribute super."memo-ptr"; "memo-sqlite" = dontDistribute super."memo-sqlite"; + "memoization-utils" = dontDistribute super."memoization-utils"; "memory" = doDistribute super."memory_0_7"; "memscript" = dontDistribute super."memscript"; "mersenne-random" = dontDistribute super."mersenne-random"; @@ -5415,6 +5451,7 @@ self: super: { "nthable" = dontDistribute super."nthable"; "ntp-control" = dontDistribute super."ntp-control"; "null-canvas" = dontDistribute super."null-canvas"; + "nullary" = dontDistribute super."nullary"; "number" = dontDistribute super."number"; "numbering" = dontDistribute super."numbering"; "numerals" = dontDistribute super."numerals"; @@ -5628,6 +5665,7 @@ self: super: { "pcg-random" = dontDistribute super."pcg-random"; "pcre-heavy" = doDistribute super."pcre-heavy_0_2_3"; "pcre-less" = dontDistribute super."pcre-less"; + "pcre-light" = doDistribute super."pcre-light_0_4_0_3"; "pcre-light-extra" = dontDistribute super."pcre-light-extra"; "pcre-utils" = dontDistribute super."pcre-utils"; "pdf-toolbox-content" = dontDistribute super."pdf-toolbox-content"; @@ -5978,6 +6016,7 @@ self: super: { "qc-oi-testgenerator" = dontDistribute super."qc-oi-testgenerator"; "qd" = dontDistribute super."qd"; "qd-vec" = dontDistribute super."qd-vec"; + "qed" = dontDistribute super."qed"; "qhull-simple" = dontDistribute super."qhull-simple"; "qrcode" = dontDistribute super."qrcode"; "qt" = dontDistribute super."qt"; @@ -5992,6 +6031,7 @@ self: super: { "queue" = dontDistribute super."queue"; "queuelike" = dontDistribute super."queuelike"; "quick-generator" = dontDistribute super."quick-generator"; + "quick-schema" = dontDistribute super."quick-schema"; "quickcheck-poly" = dontDistribute super."quickcheck-poly"; "quickcheck-properties" = dontDistribute super."quickcheck-properties"; "quickcheck-property-comb" = dontDistribute super."quickcheck-property-comb"; @@ -6466,6 +6506,7 @@ self: super: { "servant" = doDistribute super."servant_0_4_4"; "servant-JuicyPixels" = doDistribute super."servant-JuicyPixels_0_1_0_0"; "servant-blaze" = dontDistribute super."servant-blaze"; + "servant-cassava" = dontDistribute super."servant-cassava"; "servant-client" = doDistribute super."servant-client_0_4_4"; "servant-docs" = doDistribute super."servant-docs_0_4_4"; "servant-ede" = dontDistribute super."servant-ede"; @@ -6478,6 +6519,7 @@ self: super: { "servant-response" = dontDistribute super."servant-response"; "servant-scotty" = dontDistribute super."servant-scotty"; "servant-server" = doDistribute super."servant-server_0_4_4_1"; + "servant-swagger" = dontDistribute super."servant-swagger"; "servant-yaml" = dontDistribute super."servant-yaml"; "serversession-backend-acid-state" = doDistribute super."serversession-backend-acid-state_1_0_1"; "servius" = dontDistribute super."servius"; @@ -6998,6 +7040,7 @@ self: super: { "tag-bits" = dontDistribute super."tag-bits"; "tag-stream" = dontDistribute super."tag-stream"; "tagchup" = dontDistribute super."tagchup"; + "tagged" = doDistribute super."tagged_0_8_1"; "tagged-exception-core" = dontDistribute super."tagged-exception-core"; "tagged-list" = dontDistribute super."tagged-list"; "tagged-th" = dontDistribute super."tagged-th"; @@ -7067,6 +7110,7 @@ self: super: { "tensor" = dontDistribute super."tensor"; "term-rewriting" = dontDistribute super."term-rewriting"; "termbox-bindings" = dontDistribute super."termbox-bindings"; + "terminal-size" = doDistribute super."terminal-size_0_3_2"; "termination-combinators" = dontDistribute super."termination-combinators"; "terminfo" = doDistribute super."terminfo_0_4_0_1"; "terminfo-hs" = dontDistribute super."terminfo-hs"; @@ -7571,6 +7615,7 @@ self: super: { "verdict" = dontDistribute super."verdict"; "verdict-json" = dontDistribute super."verdict-json"; "verilog" = dontDistribute super."verilog"; + "versions" = dontDistribute super."versions"; "vhdl" = dontDistribute super."vhdl"; "views" = dontDistribute super."views"; "vigilance" = dontDistribute super."vigilance"; @@ -7982,6 +8027,7 @@ self: super: { "zendesk-api" = dontDistribute super."zendesk-api"; "zeno" = dontDistribute super."zeno"; "zero" = doDistribute super."zero_0_1_2"; + "zerobin" = dontDistribute super."zerobin"; "zeromq-haskell" = dontDistribute super."zeromq-haskell"; "zeromq3-conduit" = dontDistribute super."zeromq3-conduit"; "zeromq3-haskell" = dontDistribute super."zeromq3-haskell"; diff --git a/pkgs/development/haskell-modules/configuration-lts-3.3.nix b/pkgs/development/haskell-modules/configuration-lts-3.3.nix index 3b42a33a23df..71b02033829c 100644 --- a/pkgs/development/haskell-modules/configuration-lts-3.3.nix +++ b/pkgs/development/haskell-modules/configuration-lts-3.3.nix @@ -490,6 +490,7 @@ self: super: { "HasGP" = dontDistribute super."HasGP"; "Haschoo" = dontDistribute super."Haschoo"; "Hashell" = dontDistribute super."Hashell"; + "HaskRel" = dontDistribute super."HaskRel"; "HaskellForMaths" = dontDistribute super."HaskellForMaths"; "HaskellLM" = dontDistribute super."HaskellLM"; "HaskellNN" = dontDistribute super."HaskellNN"; @@ -534,6 +535,7 @@ self: super: { "Hsed" = dontDistribute super."Hsed"; "Hsmtlib" = dontDistribute super."Hsmtlib"; "HueAPI" = dontDistribute super."HueAPI"; + "HulkImport" = dontDistribute super."HulkImport"; "Hungarian-Munkres" = dontDistribute super."Hungarian-Munkres"; "IDynamic" = dontDistribute super."IDynamic"; "IFS" = dontDistribute super."IFS"; @@ -561,6 +563,7 @@ self: super: { "Javav" = dontDistribute super."Javav"; "JsContracts" = dontDistribute super."JsContracts"; "JsonGrammar" = dontDistribute super."JsonGrammar"; + "JuicyPixels" = doDistribute super."JuicyPixels_3_2_6_1"; "JuicyPixels-canvas" = dontDistribute super."JuicyPixels-canvas"; "JuicyPixels-repa" = dontDistribute super."JuicyPixels-repa"; "JuicyPixels-util" = dontDistribute super."JuicyPixels-util"; @@ -1110,6 +1113,7 @@ self: super: { "afis" = dontDistribute super."afis"; "afv" = dontDistribute super."afv"; "agda-server" = dontDistribute super."agda-server"; + "agda-snippets" = dontDistribute super."agda-snippets"; "agum" = dontDistribute super."agum"; "aig" = dontDistribute super."aig"; "air" = dontDistribute super."air"; @@ -1377,6 +1381,7 @@ self: super: { "awesomium" = dontDistribute super."awesomium"; "awesomium-glut" = dontDistribute super."awesomium-glut"; "awesomium-raw" = dontDistribute super."awesomium-raw"; + "aws" = doDistribute super."aws_0_12_1"; "aws-cloudfront-signer" = dontDistribute super."aws-cloudfront-signer"; "aws-configuration-tools" = dontDistribute super."aws-configuration-tools"; "aws-dynamodb-conduit" = dontDistribute super."aws-dynamodb-conduit"; @@ -1862,6 +1867,7 @@ self: super: { "cinvoke" = dontDistribute super."cinvoke"; "cio" = dontDistribute super."cio"; "cipher-rc5" = dontDistribute super."cipher-rc5"; + "ciphersaber2" = dontDistribute super."ciphersaber2"; "circ" = dontDistribute super."circ"; "cirru-parser" = dontDistribute super."cirru-parser"; "citation-resolve" = dontDistribute super."citation-resolve"; @@ -2116,6 +2122,7 @@ self: super: { "cpuid" = dontDistribute super."cpuid"; "cpuperf" = dontDistribute super."cpuperf"; "cpython" = dontDistribute super."cpython"; + "cql" = doDistribute super."cql_3_0_5"; "cqrs" = dontDistribute super."cqrs"; "cqrs-core" = dontDistribute super."cqrs-core"; "cqrs-example" = dontDistribute super."cqrs-example"; @@ -2295,6 +2302,7 @@ self: super: { "dataflow" = dontDistribute super."dataflow"; "datalog" = dontDistribute super."datalog"; "datapacker" = dontDistribute super."datapacker"; + "dataurl" = dontDistribute super."dataurl"; "date-cache" = dontDistribute super."date-cache"; "dates" = dontDistribute super."dates"; "datetime" = dontDistribute super."datetime"; @@ -2679,6 +2687,7 @@ self: super: { "eros-client" = dontDistribute super."eros-client"; "eros-http" = dontDistribute super."eros-http"; "errno" = dontDistribute super."errno"; + "error-analyze" = dontDistribute super."error-analyze"; "error-continuations" = dontDistribute super."error-continuations"; "error-list" = dontDistribute super."error-list"; "error-loc" = dontDistribute super."error-loc"; @@ -2729,6 +2738,7 @@ self: super: { "exinst-deepseq" = dontDistribute super."exinst-deepseq"; "exinst-hashable" = dontDistribute super."exinst-hashable"; "exists" = dontDistribute super."exists"; + "exit-codes" = dontDistribute super."exit-codes"; "exp-pairs" = dontDistribute super."exp-pairs"; "expand" = dontDistribute super."expand"; "expat-enumerator" = dontDistribute super."expat-enumerator"; @@ -2835,6 +2845,7 @@ self: super: { "find-conduit" = dontDistribute super."find-conduit"; "fingertree-tf" = dontDistribute super."fingertree-tf"; "finite-field" = dontDistribute super."finite-field"; + "finite-typelits" = dontDistribute super."finite-typelits"; "first-and-last" = dontDistribute super."first-and-last"; "first-class-patterns" = dontDistribute super."first-class-patterns"; "firstify" = dontDistribute super."firstify"; @@ -3105,17 +3116,33 @@ self: super: { "ghclive" = dontDistribute super."ghclive"; "ghczdecode" = dontDistribute super."ghczdecode"; "ght" = dontDistribute super."ght"; + "gi-atk" = dontDistribute super."gi-atk"; + "gi-cairo" = dontDistribute super."gi-cairo"; + "gi-gdk" = dontDistribute super."gi-gdk"; + "gi-gdkpixbuf" = dontDistribute super."gi-gdkpixbuf"; + "gi-gio" = dontDistribute super."gi-gio"; + "gi-glib" = dontDistribute super."gi-glib"; + "gi-gobject" = dontDistribute super."gi-gobject"; + "gi-gtk" = dontDistribute super."gi-gtk"; + "gi-javascriptcore" = dontDistribute super."gi-javascriptcore"; + "gi-notify" = dontDistribute super."gi-notify"; + "gi-pango" = dontDistribute super."gi-pango"; + "gi-soup" = dontDistribute super."gi-soup"; + "gi-vte" = dontDistribute super."gi-vte"; + "gi-webkit" = dontDistribute super."gi-webkit"; "gimlh" = dontDistribute super."gimlh"; "ginger" = dontDistribute super."ginger"; "ginsu" = dontDistribute super."ginsu"; "gipeda" = doDistribute super."gipeda_0_1_2_1"; "gist" = dontDistribute super."gist"; "git-all" = dontDistribute super."git-all"; + "git-annex" = doDistribute super."git-annex_5_20150727"; "git-checklist" = dontDistribute super."git-checklist"; "git-date" = dontDistribute super."git-date"; "git-embed" = dontDistribute super."git-embed"; "git-freq" = dontDistribute super."git-freq"; "git-gpush" = dontDistribute super."git-gpush"; + "git-jump" = dontDistribute super."git-jump"; "git-monitor" = dontDistribute super."git-monitor"; "git-object" = dontDistribute super."git-object"; "git-repair" = dontDistribute super."git-repair"; @@ -3577,6 +3604,8 @@ self: super: { "haskell-formatter" = dontDistribute super."haskell-formatter"; "haskell-ftp" = dontDistribute super."haskell-ftp"; "haskell-generate" = dontDistribute super."haskell-generate"; + "haskell-gi" = dontDistribute super."haskell-gi"; + "haskell-gi-base" = dontDistribute super."haskell-gi-base"; "haskell-import-graph" = dontDistribute super."haskell-import-graph"; "haskell-in-space" = dontDistribute super."haskell-in-space"; "haskell-modbus" = dontDistribute super."haskell-modbus"; @@ -3767,9 +3796,11 @@ self: super: { "hfann" = dontDistribute super."hfann"; "hfd" = dontDistribute super."hfd"; "hfiar" = dontDistribute super."hfiar"; + "hfmt" = dontDistribute super."hfmt"; "hfoil" = dontDistribute super."hfoil"; "hfov" = dontDistribute super."hfov"; "hfractal" = dontDistribute super."hfractal"; + "hfsevents" = doDistribute super."hfsevents_0_1_5"; "hfusion" = dontDistribute super."hfusion"; "hg-buildpackage" = dontDistribute super."hg-buildpackage"; "hgal" = dontDistribute super."hgal"; @@ -4164,6 +4195,7 @@ self: super: { "hsx2hs" = dontDistribute super."hsx2hs"; "hsyscall" = dontDistribute super."hsyscall"; "hszephyr" = dontDistribute super."hszephyr"; + "htaglib" = dontDistribute super."htaglib"; "htags" = dontDistribute super."htags"; "htar" = dontDistribute super."htar"; "htiled" = dontDistribute super."htiled"; @@ -4565,6 +4597,7 @@ self: super: { "keera-hails-reactive-polling" = dontDistribute super."keera-hails-reactive-polling"; "keera-hails-reactive-wx" = dontDistribute super."keera-hails-reactive-wx"; "keera-hails-reactive-yampa" = dontDistribute super."keera-hails-reactive-yampa"; + "keera-hails-reactivelenses" = dontDistribute super."keera-hails-reactivelenses"; "keera-hails-reactivevalues" = dontDistribute super."keera-hails-reactivevalues"; "keera-posture" = dontDistribute super."keera-posture"; "keiretsu" = dontDistribute super."keiretsu"; @@ -4670,6 +4703,8 @@ self: super: { "lat" = dontDistribute super."lat"; "latest-npm-version" = dontDistribute super."latest-npm-version"; "latex" = dontDistribute super."latex"; + "latex-formulae-image" = dontDistribute super."latex-formulae-image"; + "latex-formulae-pandoc" = dontDistribute super."latex-formulae-pandoc"; "lattices" = doDistribute super."lattices_1_3"; "launchpad-control" = dontDistribute super."launchpad-control"; "lax" = dontDistribute super."lax"; @@ -4698,6 +4733,7 @@ self: super: { "leksah" = dontDistribute super."leksah"; "leksah-server" = dontDistribute super."leksah-server"; "lendingclub" = dontDistribute super."lendingclub"; + "lens-action" = doDistribute super."lens-action_0_2_0_1"; "lens-aeson" = doDistribute super."lens-aeson_1_0_0_4"; "lens-datetime" = dontDistribute super."lens-datetime"; "lens-prelude" = dontDistribute super."lens-prelude"; @@ -5007,6 +5043,7 @@ self: super: { "memexml" = dontDistribute super."memexml"; "memo-ptr" = dontDistribute super."memo-ptr"; "memo-sqlite" = dontDistribute super."memo-sqlite"; + "memoization-utils" = dontDistribute super."memoization-utils"; "memory" = doDistribute super."memory_0_7"; "memscript" = dontDistribute super."memscript"; "mersenne-random" = dontDistribute super."mersenne-random"; @@ -5406,6 +5443,7 @@ self: super: { "nthable" = dontDistribute super."nthable"; "ntp-control" = dontDistribute super."ntp-control"; "null-canvas" = dontDistribute super."null-canvas"; + "nullary" = dontDistribute super."nullary"; "number" = dontDistribute super."number"; "numbering" = dontDistribute super."numbering"; "numerals" = dontDistribute super."numerals"; @@ -5619,6 +5657,7 @@ self: super: { "pcg-random" = dontDistribute super."pcg-random"; "pcre-heavy" = doDistribute super."pcre-heavy_0_2_5"; "pcre-less" = dontDistribute super."pcre-less"; + "pcre-light" = doDistribute super."pcre-light_0_4_0_3"; "pcre-light-extra" = dontDistribute super."pcre-light-extra"; "pcre-utils" = dontDistribute super."pcre-utils"; "pdf-toolbox-content" = dontDistribute super."pdf-toolbox-content"; @@ -5969,6 +6008,7 @@ self: super: { "qc-oi-testgenerator" = dontDistribute super."qc-oi-testgenerator"; "qd" = dontDistribute super."qd"; "qd-vec" = dontDistribute super."qd-vec"; + "qed" = dontDistribute super."qed"; "qhull-simple" = dontDistribute super."qhull-simple"; "qrcode" = dontDistribute super."qrcode"; "qt" = dontDistribute super."qt"; @@ -5983,6 +6023,7 @@ self: super: { "queue" = dontDistribute super."queue"; "queuelike" = dontDistribute super."queuelike"; "quick-generator" = dontDistribute super."quick-generator"; + "quick-schema" = dontDistribute super."quick-schema"; "quickcheck-poly" = dontDistribute super."quickcheck-poly"; "quickcheck-properties" = dontDistribute super."quickcheck-properties"; "quickcheck-property-comb" = dontDistribute super."quickcheck-property-comb"; @@ -6456,6 +6497,7 @@ self: super: { "servant" = doDistribute super."servant_0_4_4_2"; "servant-JuicyPixels" = doDistribute super."servant-JuicyPixels_0_1_0_0"; "servant-blaze" = dontDistribute super."servant-blaze"; + "servant-cassava" = dontDistribute super."servant-cassava"; "servant-client" = doDistribute super."servant-client_0_4_4_2"; "servant-docs" = doDistribute super."servant-docs_0_4_4_2"; "servant-ede" = dontDistribute super."servant-ede"; @@ -6468,6 +6510,7 @@ self: super: { "servant-response" = dontDistribute super."servant-response"; "servant-scotty" = dontDistribute super."servant-scotty"; "servant-server" = doDistribute super."servant-server_0_4_4_2"; + "servant-swagger" = dontDistribute super."servant-swagger"; "servant-yaml" = dontDistribute super."servant-yaml"; "serversession-backend-acid-state" = doDistribute super."serversession-backend-acid-state_1_0_1"; "servius" = dontDistribute super."servius"; @@ -6987,6 +7030,7 @@ self: super: { "tag-bits" = dontDistribute super."tag-bits"; "tag-stream" = dontDistribute super."tag-stream"; "tagchup" = dontDistribute super."tagchup"; + "tagged" = doDistribute super."tagged_0_8_1"; "tagged-exception-core" = dontDistribute super."tagged-exception-core"; "tagged-list" = dontDistribute super."tagged-list"; "tagged-th" = dontDistribute super."tagged-th"; @@ -7055,6 +7099,7 @@ self: super: { "tensor" = dontDistribute super."tensor"; "term-rewriting" = dontDistribute super."term-rewriting"; "termbox-bindings" = dontDistribute super."termbox-bindings"; + "terminal-size" = doDistribute super."terminal-size_0_3_2"; "termination-combinators" = dontDistribute super."termination-combinators"; "terminfo" = doDistribute super."terminfo_0_4_0_1"; "terminfo-hs" = dontDistribute super."terminfo-hs"; @@ -7558,6 +7603,7 @@ self: super: { "verdict" = dontDistribute super."verdict"; "verdict-json" = dontDistribute super."verdict-json"; "verilog" = dontDistribute super."verilog"; + "versions" = dontDistribute super."versions"; "vhdl" = dontDistribute super."vhdl"; "views" = dontDistribute super."views"; "vigilance" = dontDistribute super."vigilance"; @@ -7968,6 +8014,7 @@ self: super: { "zendesk-api" = dontDistribute super."zendesk-api"; "zeno" = dontDistribute super."zeno"; "zero" = doDistribute super."zero_0_1_2"; + "zerobin" = dontDistribute super."zerobin"; "zeromq-haskell" = dontDistribute super."zeromq-haskell"; "zeromq3-conduit" = dontDistribute super."zeromq3-conduit"; "zeromq3-haskell" = dontDistribute super."zeromq3-haskell"; diff --git a/pkgs/development/haskell-modules/configuration-lts-3.4.nix b/pkgs/development/haskell-modules/configuration-lts-3.4.nix index 79e7816ae103..7a687555bcb0 100644 --- a/pkgs/development/haskell-modules/configuration-lts-3.4.nix +++ b/pkgs/development/haskell-modules/configuration-lts-3.4.nix @@ -490,6 +490,7 @@ self: super: { "HasGP" = dontDistribute super."HasGP"; "Haschoo" = dontDistribute super."Haschoo"; "Hashell" = dontDistribute super."Hashell"; + "HaskRel" = dontDistribute super."HaskRel"; "HaskellForMaths" = dontDistribute super."HaskellForMaths"; "HaskellLM" = dontDistribute super."HaskellLM"; "HaskellNN" = dontDistribute super."HaskellNN"; @@ -534,6 +535,7 @@ self: super: { "Hsed" = dontDistribute super."Hsed"; "Hsmtlib" = dontDistribute super."Hsmtlib"; "HueAPI" = dontDistribute super."HueAPI"; + "HulkImport" = dontDistribute super."HulkImport"; "Hungarian-Munkres" = dontDistribute super."Hungarian-Munkres"; "IDynamic" = dontDistribute super."IDynamic"; "IFS" = dontDistribute super."IFS"; @@ -561,6 +563,7 @@ self: super: { "Javav" = dontDistribute super."Javav"; "JsContracts" = dontDistribute super."JsContracts"; "JsonGrammar" = dontDistribute super."JsonGrammar"; + "JuicyPixels" = doDistribute super."JuicyPixels_3_2_6_1"; "JuicyPixels-canvas" = dontDistribute super."JuicyPixels-canvas"; "JuicyPixels-repa" = dontDistribute super."JuicyPixels-repa"; "JuicyPixels-util" = dontDistribute super."JuicyPixels-util"; @@ -1110,6 +1113,7 @@ self: super: { "afis" = dontDistribute super."afis"; "afv" = dontDistribute super."afv"; "agda-server" = dontDistribute super."agda-server"; + "agda-snippets" = dontDistribute super."agda-snippets"; "agum" = dontDistribute super."agum"; "aig" = dontDistribute super."aig"; "air" = dontDistribute super."air"; @@ -1377,6 +1381,7 @@ self: super: { "awesomium" = dontDistribute super."awesomium"; "awesomium-glut" = dontDistribute super."awesomium-glut"; "awesomium-raw" = dontDistribute super."awesomium-raw"; + "aws" = doDistribute super."aws_0_12_1"; "aws-cloudfront-signer" = dontDistribute super."aws-cloudfront-signer"; "aws-configuration-tools" = dontDistribute super."aws-configuration-tools"; "aws-dynamodb-conduit" = dontDistribute super."aws-dynamodb-conduit"; @@ -1861,6 +1866,7 @@ self: super: { "cinvoke" = dontDistribute super."cinvoke"; "cio" = dontDistribute super."cio"; "cipher-rc5" = dontDistribute super."cipher-rc5"; + "ciphersaber2" = dontDistribute super."ciphersaber2"; "circ" = dontDistribute super."circ"; "cirru-parser" = dontDistribute super."cirru-parser"; "citation-resolve" = dontDistribute super."citation-resolve"; @@ -2115,6 +2121,7 @@ self: super: { "cpuid" = dontDistribute super."cpuid"; "cpuperf" = dontDistribute super."cpuperf"; "cpython" = dontDistribute super."cpython"; + "cql" = doDistribute super."cql_3_0_5"; "cqrs" = dontDistribute super."cqrs"; "cqrs-core" = dontDistribute super."cqrs-core"; "cqrs-example" = dontDistribute super."cqrs-example"; @@ -2294,6 +2301,7 @@ self: super: { "dataflow" = dontDistribute super."dataflow"; "datalog" = dontDistribute super."datalog"; "datapacker" = dontDistribute super."datapacker"; + "dataurl" = dontDistribute super."dataurl"; "date-cache" = dontDistribute super."date-cache"; "dates" = dontDistribute super."dates"; "datetime" = dontDistribute super."datetime"; @@ -2678,6 +2686,7 @@ self: super: { "eros-client" = dontDistribute super."eros-client"; "eros-http" = dontDistribute super."eros-http"; "errno" = dontDistribute super."errno"; + "error-analyze" = dontDistribute super."error-analyze"; "error-continuations" = dontDistribute super."error-continuations"; "error-list" = dontDistribute super."error-list"; "error-loc" = dontDistribute super."error-loc"; @@ -2728,6 +2737,7 @@ self: super: { "exinst-deepseq" = dontDistribute super."exinst-deepseq"; "exinst-hashable" = dontDistribute super."exinst-hashable"; "exists" = dontDistribute super."exists"; + "exit-codes" = dontDistribute super."exit-codes"; "exp-pairs" = dontDistribute super."exp-pairs"; "expand" = dontDistribute super."expand"; "expat-enumerator" = dontDistribute super."expat-enumerator"; @@ -2834,6 +2844,7 @@ self: super: { "find-conduit" = dontDistribute super."find-conduit"; "fingertree-tf" = dontDistribute super."fingertree-tf"; "finite-field" = dontDistribute super."finite-field"; + "finite-typelits" = dontDistribute super."finite-typelits"; "first-and-last" = dontDistribute super."first-and-last"; "first-class-patterns" = dontDistribute super."first-class-patterns"; "firstify" = dontDistribute super."firstify"; @@ -3104,17 +3115,33 @@ self: super: { "ghclive" = dontDistribute super."ghclive"; "ghczdecode" = dontDistribute super."ghczdecode"; "ght" = dontDistribute super."ght"; + "gi-atk" = dontDistribute super."gi-atk"; + "gi-cairo" = dontDistribute super."gi-cairo"; + "gi-gdk" = dontDistribute super."gi-gdk"; + "gi-gdkpixbuf" = dontDistribute super."gi-gdkpixbuf"; + "gi-gio" = dontDistribute super."gi-gio"; + "gi-glib" = dontDistribute super."gi-glib"; + "gi-gobject" = dontDistribute super."gi-gobject"; + "gi-gtk" = dontDistribute super."gi-gtk"; + "gi-javascriptcore" = dontDistribute super."gi-javascriptcore"; + "gi-notify" = dontDistribute super."gi-notify"; + "gi-pango" = dontDistribute super."gi-pango"; + "gi-soup" = dontDistribute super."gi-soup"; + "gi-vte" = dontDistribute super."gi-vte"; + "gi-webkit" = dontDistribute super."gi-webkit"; "gimlh" = dontDistribute super."gimlh"; "ginger" = dontDistribute super."ginger"; "ginsu" = dontDistribute super."ginsu"; "gipeda" = doDistribute super."gipeda_0_1_2_1"; "gist" = dontDistribute super."gist"; "git-all" = dontDistribute super."git-all"; + "git-annex" = doDistribute super."git-annex_5_20150727"; "git-checklist" = dontDistribute super."git-checklist"; "git-date" = dontDistribute super."git-date"; "git-embed" = dontDistribute super."git-embed"; "git-freq" = dontDistribute super."git-freq"; "git-gpush" = dontDistribute super."git-gpush"; + "git-jump" = dontDistribute super."git-jump"; "git-monitor" = dontDistribute super."git-monitor"; "git-object" = dontDistribute super."git-object"; "git-repair" = dontDistribute super."git-repair"; @@ -3576,6 +3603,8 @@ self: super: { "haskell-formatter" = dontDistribute super."haskell-formatter"; "haskell-ftp" = dontDistribute super."haskell-ftp"; "haskell-generate" = dontDistribute super."haskell-generate"; + "haskell-gi" = dontDistribute super."haskell-gi"; + "haskell-gi-base" = dontDistribute super."haskell-gi-base"; "haskell-import-graph" = dontDistribute super."haskell-import-graph"; "haskell-in-space" = dontDistribute super."haskell-in-space"; "haskell-modbus" = dontDistribute super."haskell-modbus"; @@ -3766,9 +3795,11 @@ self: super: { "hfann" = dontDistribute super."hfann"; "hfd" = dontDistribute super."hfd"; "hfiar" = dontDistribute super."hfiar"; + "hfmt" = dontDistribute super."hfmt"; "hfoil" = dontDistribute super."hfoil"; "hfov" = dontDistribute super."hfov"; "hfractal" = dontDistribute super."hfractal"; + "hfsevents" = doDistribute super."hfsevents_0_1_5"; "hfusion" = dontDistribute super."hfusion"; "hg-buildpackage" = dontDistribute super."hg-buildpackage"; "hgal" = dontDistribute super."hgal"; @@ -4163,6 +4194,7 @@ self: super: { "hsx2hs" = dontDistribute super."hsx2hs"; "hsyscall" = dontDistribute super."hsyscall"; "hszephyr" = dontDistribute super."hszephyr"; + "htaglib" = dontDistribute super."htaglib"; "htags" = dontDistribute super."htags"; "htar" = dontDistribute super."htar"; "htiled" = dontDistribute super."htiled"; @@ -4564,6 +4596,7 @@ self: super: { "keera-hails-reactive-polling" = dontDistribute super."keera-hails-reactive-polling"; "keera-hails-reactive-wx" = dontDistribute super."keera-hails-reactive-wx"; "keera-hails-reactive-yampa" = dontDistribute super."keera-hails-reactive-yampa"; + "keera-hails-reactivelenses" = dontDistribute super."keera-hails-reactivelenses"; "keera-hails-reactivevalues" = dontDistribute super."keera-hails-reactivevalues"; "keera-posture" = dontDistribute super."keera-posture"; "keiretsu" = dontDistribute super."keiretsu"; @@ -4669,6 +4702,8 @@ self: super: { "lat" = dontDistribute super."lat"; "latest-npm-version" = dontDistribute super."latest-npm-version"; "latex" = dontDistribute super."latex"; + "latex-formulae-image" = dontDistribute super."latex-formulae-image"; + "latex-formulae-pandoc" = dontDistribute super."latex-formulae-pandoc"; "lattices" = doDistribute super."lattices_1_3"; "launchpad-control" = dontDistribute super."launchpad-control"; "lax" = dontDistribute super."lax"; @@ -4697,6 +4732,7 @@ self: super: { "leksah" = dontDistribute super."leksah"; "leksah-server" = dontDistribute super."leksah-server"; "lendingclub" = dontDistribute super."lendingclub"; + "lens-action" = doDistribute super."lens-action_0_2_0_1"; "lens-aeson" = doDistribute super."lens-aeson_1_0_0_4"; "lens-datetime" = dontDistribute super."lens-datetime"; "lens-prelude" = dontDistribute super."lens-prelude"; @@ -5006,6 +5042,7 @@ self: super: { "memexml" = dontDistribute super."memexml"; "memo-ptr" = dontDistribute super."memo-ptr"; "memo-sqlite" = dontDistribute super."memo-sqlite"; + "memoization-utils" = dontDistribute super."memoization-utils"; "memory" = doDistribute super."memory_0_7"; "memscript" = dontDistribute super."memscript"; "mersenne-random" = dontDistribute super."mersenne-random"; @@ -5405,6 +5442,7 @@ self: super: { "nthable" = dontDistribute super."nthable"; "ntp-control" = dontDistribute super."ntp-control"; "null-canvas" = dontDistribute super."null-canvas"; + "nullary" = dontDistribute super."nullary"; "number" = dontDistribute super."number"; "numbering" = dontDistribute super."numbering"; "numerals" = dontDistribute super."numerals"; @@ -5618,6 +5656,7 @@ self: super: { "pcg-random" = dontDistribute super."pcg-random"; "pcre-heavy" = doDistribute super."pcre-heavy_0_2_5"; "pcre-less" = dontDistribute super."pcre-less"; + "pcre-light" = doDistribute super."pcre-light_0_4_0_3"; "pcre-light-extra" = dontDistribute super."pcre-light-extra"; "pcre-utils" = dontDistribute super."pcre-utils"; "pdf-toolbox-content" = dontDistribute super."pdf-toolbox-content"; @@ -5968,6 +6007,7 @@ self: super: { "qc-oi-testgenerator" = dontDistribute super."qc-oi-testgenerator"; "qd" = dontDistribute super."qd"; "qd-vec" = dontDistribute super."qd-vec"; + "qed" = dontDistribute super."qed"; "qhull-simple" = dontDistribute super."qhull-simple"; "qrcode" = dontDistribute super."qrcode"; "qt" = dontDistribute super."qt"; @@ -5982,6 +6022,7 @@ self: super: { "queue" = dontDistribute super."queue"; "queuelike" = dontDistribute super."queuelike"; "quick-generator" = dontDistribute super."quick-generator"; + "quick-schema" = dontDistribute super."quick-schema"; "quickcheck-poly" = dontDistribute super."quickcheck-poly"; "quickcheck-properties" = dontDistribute super."quickcheck-properties"; "quickcheck-property-comb" = dontDistribute super."quickcheck-property-comb"; @@ -6454,6 +6495,7 @@ self: super: { "servant" = doDistribute super."servant_0_4_4_2"; "servant-JuicyPixels" = doDistribute super."servant-JuicyPixels_0_1_0_0"; "servant-blaze" = dontDistribute super."servant-blaze"; + "servant-cassava" = dontDistribute super."servant-cassava"; "servant-client" = doDistribute super."servant-client_0_4_4_2"; "servant-docs" = doDistribute super."servant-docs_0_4_4_2"; "servant-ede" = dontDistribute super."servant-ede"; @@ -6466,6 +6508,7 @@ self: super: { "servant-response" = dontDistribute super."servant-response"; "servant-scotty" = dontDistribute super."servant-scotty"; "servant-server" = doDistribute super."servant-server_0_4_4_2"; + "servant-swagger" = dontDistribute super."servant-swagger"; "servant-yaml" = dontDistribute super."servant-yaml"; "serversession-backend-acid-state" = doDistribute super."serversession-backend-acid-state_1_0_1"; "servius" = dontDistribute super."servius"; @@ -6984,6 +7027,7 @@ self: super: { "tag-bits" = dontDistribute super."tag-bits"; "tag-stream" = dontDistribute super."tag-stream"; "tagchup" = dontDistribute super."tagchup"; + "tagged" = doDistribute super."tagged_0_8_1"; "tagged-exception-core" = dontDistribute super."tagged-exception-core"; "tagged-list" = dontDistribute super."tagged-list"; "tagged-th" = dontDistribute super."tagged-th"; @@ -7052,6 +7096,7 @@ self: super: { "tensor" = dontDistribute super."tensor"; "term-rewriting" = dontDistribute super."term-rewriting"; "termbox-bindings" = dontDistribute super."termbox-bindings"; + "terminal-size" = doDistribute super."terminal-size_0_3_2"; "termination-combinators" = dontDistribute super."termination-combinators"; "terminfo" = doDistribute super."terminfo_0_4_0_1"; "terminfo-hs" = dontDistribute super."terminfo-hs"; @@ -7555,6 +7600,7 @@ self: super: { "verdict" = dontDistribute super."verdict"; "verdict-json" = dontDistribute super."verdict-json"; "verilog" = dontDistribute super."verilog"; + "versions" = dontDistribute super."versions"; "vhdl" = dontDistribute super."vhdl"; "views" = dontDistribute super."views"; "vigilance" = dontDistribute super."vigilance"; @@ -7964,6 +8010,7 @@ self: super: { "zendesk-api" = dontDistribute super."zendesk-api"; "zeno" = dontDistribute super."zeno"; "zero" = doDistribute super."zero_0_1_2"; + "zerobin" = dontDistribute super."zerobin"; "zeromq-haskell" = dontDistribute super."zeromq-haskell"; "zeromq3-conduit" = dontDistribute super."zeromq3-conduit"; "zeromq3-haskell" = dontDistribute super."zeromq3-haskell"; diff --git a/pkgs/development/haskell-modules/configuration-lts-3.5.nix b/pkgs/development/haskell-modules/configuration-lts-3.5.nix index 9452454355ce..71d9ef9038d1 100644 --- a/pkgs/development/haskell-modules/configuration-lts-3.5.nix +++ b/pkgs/development/haskell-modules/configuration-lts-3.5.nix @@ -490,6 +490,7 @@ self: super: { "HasGP" = dontDistribute super."HasGP"; "Haschoo" = dontDistribute super."Haschoo"; "Hashell" = dontDistribute super."Hashell"; + "HaskRel" = dontDistribute super."HaskRel"; "HaskellForMaths" = dontDistribute super."HaskellForMaths"; "HaskellLM" = dontDistribute super."HaskellLM"; "HaskellNN" = dontDistribute super."HaskellNN"; @@ -534,6 +535,7 @@ self: super: { "Hsed" = dontDistribute super."Hsed"; "Hsmtlib" = dontDistribute super."Hsmtlib"; "HueAPI" = dontDistribute super."HueAPI"; + "HulkImport" = dontDistribute super."HulkImport"; "Hungarian-Munkres" = dontDistribute super."Hungarian-Munkres"; "IDynamic" = dontDistribute super."IDynamic"; "IFS" = dontDistribute super."IFS"; @@ -561,6 +563,7 @@ self: super: { "Javav" = dontDistribute super."Javav"; "JsContracts" = dontDistribute super."JsContracts"; "JsonGrammar" = dontDistribute super."JsonGrammar"; + "JuicyPixels" = doDistribute super."JuicyPixels_3_2_6_1"; "JuicyPixels-canvas" = dontDistribute super."JuicyPixels-canvas"; "JuicyPixels-repa" = dontDistribute super."JuicyPixels-repa"; "JuicyPixels-util" = dontDistribute super."JuicyPixels-util"; @@ -1110,6 +1113,7 @@ self: super: { "afis" = dontDistribute super."afis"; "afv" = dontDistribute super."afv"; "agda-server" = dontDistribute super."agda-server"; + "agda-snippets" = dontDistribute super."agda-snippets"; "agum" = dontDistribute super."agum"; "aig" = dontDistribute super."aig"; "air" = dontDistribute super."air"; @@ -1376,6 +1380,7 @@ self: super: { "awesomium" = dontDistribute super."awesomium"; "awesomium-glut" = dontDistribute super."awesomium-glut"; "awesomium-raw" = dontDistribute super."awesomium-raw"; + "aws" = doDistribute super."aws_0_12_1"; "aws-cloudfront-signer" = dontDistribute super."aws-cloudfront-signer"; "aws-configuration-tools" = dontDistribute super."aws-configuration-tools"; "aws-dynamodb-conduit" = dontDistribute super."aws-dynamodb-conduit"; @@ -1859,6 +1864,7 @@ self: super: { "cinvoke" = dontDistribute super."cinvoke"; "cio" = dontDistribute super."cio"; "cipher-rc5" = dontDistribute super."cipher-rc5"; + "ciphersaber2" = dontDistribute super."ciphersaber2"; "circ" = dontDistribute super."circ"; "cirru-parser" = dontDistribute super."cirru-parser"; "citation-resolve" = dontDistribute super."citation-resolve"; @@ -2112,6 +2118,7 @@ self: super: { "cpuid" = dontDistribute super."cpuid"; "cpuperf" = dontDistribute super."cpuperf"; "cpython" = dontDistribute super."cpython"; + "cql" = doDistribute super."cql_3_0_5"; "cqrs" = dontDistribute super."cqrs"; "cqrs-core" = dontDistribute super."cqrs-core"; "cqrs-example" = dontDistribute super."cqrs-example"; @@ -2291,6 +2298,7 @@ self: super: { "dataflow" = dontDistribute super."dataflow"; "datalog" = dontDistribute super."datalog"; "datapacker" = dontDistribute super."datapacker"; + "dataurl" = dontDistribute super."dataurl"; "date-cache" = dontDistribute super."date-cache"; "dates" = dontDistribute super."dates"; "datetime" = dontDistribute super."datetime"; @@ -2675,6 +2683,7 @@ self: super: { "eros-client" = dontDistribute super."eros-client"; "eros-http" = dontDistribute super."eros-http"; "errno" = dontDistribute super."errno"; + "error-analyze" = dontDistribute super."error-analyze"; "error-continuations" = dontDistribute super."error-continuations"; "error-list" = dontDistribute super."error-list"; "error-loc" = dontDistribute super."error-loc"; @@ -2725,6 +2734,7 @@ self: super: { "exinst-deepseq" = dontDistribute super."exinst-deepseq"; "exinst-hashable" = dontDistribute super."exinst-hashable"; "exists" = dontDistribute super."exists"; + "exit-codes" = dontDistribute super."exit-codes"; "exp-pairs" = dontDistribute super."exp-pairs"; "expand" = dontDistribute super."expand"; "expat-enumerator" = dontDistribute super."expat-enumerator"; @@ -2829,6 +2839,7 @@ self: super: { "find-conduit" = dontDistribute super."find-conduit"; "fingertree-tf" = dontDistribute super."fingertree-tf"; "finite-field" = dontDistribute super."finite-field"; + "finite-typelits" = dontDistribute super."finite-typelits"; "first-and-last" = dontDistribute super."first-and-last"; "first-class-patterns" = dontDistribute super."first-class-patterns"; "firstify" = dontDistribute super."firstify"; @@ -3099,17 +3110,33 @@ self: super: { "ghclive" = dontDistribute super."ghclive"; "ghczdecode" = dontDistribute super."ghczdecode"; "ght" = dontDistribute super."ght"; + "gi-atk" = dontDistribute super."gi-atk"; + "gi-cairo" = dontDistribute super."gi-cairo"; + "gi-gdk" = dontDistribute super."gi-gdk"; + "gi-gdkpixbuf" = dontDistribute super."gi-gdkpixbuf"; + "gi-gio" = dontDistribute super."gi-gio"; + "gi-glib" = dontDistribute super."gi-glib"; + "gi-gobject" = dontDistribute super."gi-gobject"; + "gi-gtk" = dontDistribute super."gi-gtk"; + "gi-javascriptcore" = dontDistribute super."gi-javascriptcore"; + "gi-notify" = dontDistribute super."gi-notify"; + "gi-pango" = dontDistribute super."gi-pango"; + "gi-soup" = dontDistribute super."gi-soup"; + "gi-vte" = dontDistribute super."gi-vte"; + "gi-webkit" = dontDistribute super."gi-webkit"; "gimlh" = dontDistribute super."gimlh"; "ginger" = dontDistribute super."ginger"; "ginsu" = dontDistribute super."ginsu"; "gipeda" = doDistribute super."gipeda_0_1_2_1"; "gist" = dontDistribute super."gist"; "git-all" = dontDistribute super."git-all"; + "git-annex" = doDistribute super."git-annex_5_20150727"; "git-checklist" = dontDistribute super."git-checklist"; "git-date" = dontDistribute super."git-date"; "git-embed" = dontDistribute super."git-embed"; "git-freq" = dontDistribute super."git-freq"; "git-gpush" = dontDistribute super."git-gpush"; + "git-jump" = dontDistribute super."git-jump"; "git-monitor" = dontDistribute super."git-monitor"; "git-object" = dontDistribute super."git-object"; "git-repair" = dontDistribute super."git-repair"; @@ -3571,6 +3598,8 @@ self: super: { "haskell-formatter" = dontDistribute super."haskell-formatter"; "haskell-ftp" = dontDistribute super."haskell-ftp"; "haskell-generate" = dontDistribute super."haskell-generate"; + "haskell-gi" = dontDistribute super."haskell-gi"; + "haskell-gi-base" = dontDistribute super."haskell-gi-base"; "haskell-import-graph" = dontDistribute super."haskell-import-graph"; "haskell-in-space" = dontDistribute super."haskell-in-space"; "haskell-modbus" = dontDistribute super."haskell-modbus"; @@ -3760,9 +3789,11 @@ self: super: { "hfann" = dontDistribute super."hfann"; "hfd" = dontDistribute super."hfd"; "hfiar" = dontDistribute super."hfiar"; + "hfmt" = dontDistribute super."hfmt"; "hfoil" = dontDistribute super."hfoil"; "hfov" = dontDistribute super."hfov"; "hfractal" = dontDistribute super."hfractal"; + "hfsevents" = doDistribute super."hfsevents_0_1_5"; "hfusion" = dontDistribute super."hfusion"; "hg-buildpackage" = dontDistribute super."hg-buildpackage"; "hgal" = dontDistribute super."hgal"; @@ -4155,6 +4186,7 @@ self: super: { "hsx2hs" = dontDistribute super."hsx2hs"; "hsyscall" = dontDistribute super."hsyscall"; "hszephyr" = dontDistribute super."hszephyr"; + "htaglib" = dontDistribute super."htaglib"; "htags" = dontDistribute super."htags"; "htar" = dontDistribute super."htar"; "htiled" = dontDistribute super."htiled"; @@ -4553,6 +4585,7 @@ self: super: { "keera-hails-reactive-polling" = dontDistribute super."keera-hails-reactive-polling"; "keera-hails-reactive-wx" = dontDistribute super."keera-hails-reactive-wx"; "keera-hails-reactive-yampa" = dontDistribute super."keera-hails-reactive-yampa"; + "keera-hails-reactivelenses" = dontDistribute super."keera-hails-reactivelenses"; "keera-hails-reactivevalues" = dontDistribute super."keera-hails-reactivevalues"; "keera-posture" = dontDistribute super."keera-posture"; "keiretsu" = dontDistribute super."keiretsu"; @@ -4658,6 +4691,8 @@ self: super: { "lat" = dontDistribute super."lat"; "latest-npm-version" = dontDistribute super."latest-npm-version"; "latex" = dontDistribute super."latex"; + "latex-formulae-image" = dontDistribute super."latex-formulae-image"; + "latex-formulae-pandoc" = dontDistribute super."latex-formulae-pandoc"; "lattices" = doDistribute super."lattices_1_3"; "launchpad-control" = dontDistribute super."launchpad-control"; "lax" = dontDistribute super."lax"; @@ -4686,6 +4721,7 @@ self: super: { "leksah" = dontDistribute super."leksah"; "leksah-server" = dontDistribute super."leksah-server"; "lendingclub" = dontDistribute super."lendingclub"; + "lens-action" = doDistribute super."lens-action_0_2_0_1"; "lens-aeson" = doDistribute super."lens-aeson_1_0_0_4"; "lens-datetime" = dontDistribute super."lens-datetime"; "lens-prelude" = dontDistribute super."lens-prelude"; @@ -4994,6 +5030,7 @@ self: super: { "memexml" = dontDistribute super."memexml"; "memo-ptr" = dontDistribute super."memo-ptr"; "memo-sqlite" = dontDistribute super."memo-sqlite"; + "memoization-utils" = dontDistribute super."memoization-utils"; "memory" = doDistribute super."memory_0_7"; "memscript" = dontDistribute super."memscript"; "mersenne-random" = dontDistribute super."mersenne-random"; @@ -5392,6 +5429,7 @@ self: super: { "nthable" = dontDistribute super."nthable"; "ntp-control" = dontDistribute super."ntp-control"; "null-canvas" = dontDistribute super."null-canvas"; + "nullary" = dontDistribute super."nullary"; "number" = dontDistribute super."number"; "numbering" = dontDistribute super."numbering"; "numerals" = dontDistribute super."numerals"; @@ -5604,6 +5642,7 @@ self: super: { "pcg-random" = dontDistribute super."pcg-random"; "pcre-heavy" = doDistribute super."pcre-heavy_0_2_5"; "pcre-less" = dontDistribute super."pcre-less"; + "pcre-light" = doDistribute super."pcre-light_0_4_0_3"; "pcre-light-extra" = dontDistribute super."pcre-light-extra"; "pcre-utils" = dontDistribute super."pcre-utils"; "pdf-toolbox-content" = dontDistribute super."pdf-toolbox-content"; @@ -5951,6 +5990,7 @@ self: super: { "qc-oi-testgenerator" = dontDistribute super."qc-oi-testgenerator"; "qd" = dontDistribute super."qd"; "qd-vec" = dontDistribute super."qd-vec"; + "qed" = dontDistribute super."qed"; "qhull-simple" = dontDistribute super."qhull-simple"; "qrcode" = dontDistribute super."qrcode"; "qt" = dontDistribute super."qt"; @@ -5965,6 +6005,7 @@ self: super: { "queue" = dontDistribute super."queue"; "queuelike" = dontDistribute super."queuelike"; "quick-generator" = dontDistribute super."quick-generator"; + "quick-schema" = dontDistribute super."quick-schema"; "quickcheck-poly" = dontDistribute super."quickcheck-poly"; "quickcheck-properties" = dontDistribute super."quickcheck-properties"; "quickcheck-property-comb" = dontDistribute super."quickcheck-property-comb"; @@ -6437,6 +6478,7 @@ self: super: { "servant" = doDistribute super."servant_0_4_4_2"; "servant-JuicyPixels" = doDistribute super."servant-JuicyPixels_0_1_0_0"; "servant-blaze" = dontDistribute super."servant-blaze"; + "servant-cassava" = dontDistribute super."servant-cassava"; "servant-client" = doDistribute super."servant-client_0_4_4_2"; "servant-docs" = doDistribute super."servant-docs_0_4_4_2"; "servant-ede" = dontDistribute super."servant-ede"; @@ -6449,6 +6491,7 @@ self: super: { "servant-response" = dontDistribute super."servant-response"; "servant-scotty" = dontDistribute super."servant-scotty"; "servant-server" = doDistribute super."servant-server_0_4_4_2"; + "servant-swagger" = dontDistribute super."servant-swagger"; "servant-yaml" = dontDistribute super."servant-yaml"; "servius" = dontDistribute super."servius"; "ses-html" = dontDistribute super."ses-html"; @@ -6966,6 +7009,7 @@ self: super: { "tag-bits" = dontDistribute super."tag-bits"; "tag-stream" = dontDistribute super."tag-stream"; "tagchup" = dontDistribute super."tagchup"; + "tagged" = doDistribute super."tagged_0_8_1"; "tagged-exception-core" = dontDistribute super."tagged-exception-core"; "tagged-list" = dontDistribute super."tagged-list"; "tagged-th" = dontDistribute super."tagged-th"; @@ -7032,6 +7076,7 @@ self: super: { "tensor" = dontDistribute super."tensor"; "term-rewriting" = dontDistribute super."term-rewriting"; "termbox-bindings" = dontDistribute super."termbox-bindings"; + "terminal-size" = doDistribute super."terminal-size_0_3_2"; "termination-combinators" = dontDistribute super."termination-combinators"; "terminfo" = doDistribute super."terminfo_0_4_0_1"; "terminfo-hs" = dontDistribute super."terminfo-hs"; @@ -7096,6 +7141,7 @@ self: super: { "th-alpha" = dontDistribute super."th-alpha"; "th-build" = dontDistribute super."th-build"; "th-context" = dontDistribute super."th-context"; + "th-desugar" = doDistribute super."th-desugar_1_5_4_1"; "th-fold" = dontDistribute super."th-fold"; "th-inline-io-action" = dontDistribute super."th-inline-io-action"; "th-instance-reification" = dontDistribute super."th-instance-reification"; @@ -7533,6 +7579,7 @@ self: super: { "verdict" = dontDistribute super."verdict"; "verdict-json" = dontDistribute super."verdict-json"; "verilog" = dontDistribute super."verilog"; + "versions" = dontDistribute super."versions"; "vhdl" = dontDistribute super."vhdl"; "views" = dontDistribute super."views"; "vigilance" = dontDistribute super."vigilance"; @@ -7937,6 +7984,7 @@ self: super: { "zendesk-api" = dontDistribute super."zendesk-api"; "zeno" = dontDistribute super."zeno"; "zero" = doDistribute super."zero_0_1_2"; + "zerobin" = dontDistribute super."zerobin"; "zeromq-haskell" = dontDistribute super."zeromq-haskell"; "zeromq3-conduit" = dontDistribute super."zeromq3-conduit"; "zeromq3-haskell" = dontDistribute super."zeromq3-haskell"; diff --git a/pkgs/development/haskell-modules/configuration-lts-3.6.nix b/pkgs/development/haskell-modules/configuration-lts-3.6.nix index 6c91cb3816b7..cd6216211174 100644 --- a/pkgs/development/haskell-modules/configuration-lts-3.6.nix +++ b/pkgs/development/haskell-modules/configuration-lts-3.6.nix @@ -490,6 +490,7 @@ self: super: { "HasGP" = dontDistribute super."HasGP"; "Haschoo" = dontDistribute super."Haschoo"; "Hashell" = dontDistribute super."Hashell"; + "HaskRel" = dontDistribute super."HaskRel"; "HaskellForMaths" = dontDistribute super."HaskellForMaths"; "HaskellLM" = dontDistribute super."HaskellLM"; "HaskellNN" = dontDistribute super."HaskellNN"; @@ -534,6 +535,7 @@ self: super: { "Hsed" = dontDistribute super."Hsed"; "Hsmtlib" = dontDistribute super."Hsmtlib"; "HueAPI" = dontDistribute super."HueAPI"; + "HulkImport" = dontDistribute super."HulkImport"; "Hungarian-Munkres" = dontDistribute super."Hungarian-Munkres"; "IDynamic" = dontDistribute super."IDynamic"; "IFS" = dontDistribute super."IFS"; @@ -561,6 +563,7 @@ self: super: { "Javav" = dontDistribute super."Javav"; "JsContracts" = dontDistribute super."JsContracts"; "JsonGrammar" = dontDistribute super."JsonGrammar"; + "JuicyPixels" = doDistribute super."JuicyPixels_3_2_6_1"; "JuicyPixels-canvas" = dontDistribute super."JuicyPixels-canvas"; "JuicyPixels-repa" = dontDistribute super."JuicyPixels-repa"; "JuicyPixels-util" = dontDistribute super."JuicyPixels-util"; @@ -1108,6 +1111,7 @@ self: super: { "afis" = dontDistribute super."afis"; "afv" = dontDistribute super."afv"; "agda-server" = dontDistribute super."agda-server"; + "agda-snippets" = dontDistribute super."agda-snippets"; "agum" = dontDistribute super."agum"; "aig" = dontDistribute super."aig"; "air" = dontDistribute super."air"; @@ -1374,6 +1378,7 @@ self: super: { "awesomium" = dontDistribute super."awesomium"; "awesomium-glut" = dontDistribute super."awesomium-glut"; "awesomium-raw" = dontDistribute super."awesomium-raw"; + "aws" = doDistribute super."aws_0_12_1"; "aws-cloudfront-signer" = dontDistribute super."aws-cloudfront-signer"; "aws-configuration-tools" = dontDistribute super."aws-configuration-tools"; "aws-dynamodb-conduit" = dontDistribute super."aws-dynamodb-conduit"; @@ -1856,6 +1861,7 @@ self: super: { "cinvoke" = dontDistribute super."cinvoke"; "cio" = dontDistribute super."cio"; "cipher-rc5" = dontDistribute super."cipher-rc5"; + "ciphersaber2" = dontDistribute super."ciphersaber2"; "circ" = dontDistribute super."circ"; "cirru-parser" = dontDistribute super."cirru-parser"; "citation-resolve" = dontDistribute super."citation-resolve"; @@ -2109,6 +2115,7 @@ self: super: { "cpuid" = dontDistribute super."cpuid"; "cpuperf" = dontDistribute super."cpuperf"; "cpython" = dontDistribute super."cpython"; + "cql" = doDistribute super."cql_3_0_5"; "cqrs" = dontDistribute super."cqrs"; "cqrs-core" = dontDistribute super."cqrs-core"; "cqrs-example" = dontDistribute super."cqrs-example"; @@ -2288,6 +2295,7 @@ self: super: { "dataflow" = dontDistribute super."dataflow"; "datalog" = dontDistribute super."datalog"; "datapacker" = dontDistribute super."datapacker"; + "dataurl" = dontDistribute super."dataurl"; "date-cache" = dontDistribute super."date-cache"; "dates" = dontDistribute super."dates"; "datetime" = dontDistribute super."datetime"; @@ -2670,6 +2678,7 @@ self: super: { "eros-client" = dontDistribute super."eros-client"; "eros-http" = dontDistribute super."eros-http"; "errno" = dontDistribute super."errno"; + "error-analyze" = dontDistribute super."error-analyze"; "error-continuations" = dontDistribute super."error-continuations"; "error-list" = dontDistribute super."error-list"; "error-loc" = dontDistribute super."error-loc"; @@ -2694,6 +2703,7 @@ self: super: { "euler" = dontDistribute super."euler"; "euphoria" = dontDistribute super."euphoria"; "eurofxref" = dontDistribute super."eurofxref"; + "event" = doDistribute super."event_0_1_2"; "event-driven" = dontDistribute super."event-driven"; "event-handlers" = dontDistribute super."event-handlers"; "event-list" = dontDistribute super."event-list"; @@ -2718,6 +2728,7 @@ self: super: { "exinst-deepseq" = dontDistribute super."exinst-deepseq"; "exinst-hashable" = dontDistribute super."exinst-hashable"; "exists" = dontDistribute super."exists"; + "exit-codes" = dontDistribute super."exit-codes"; "exp-pairs" = dontDistribute super."exp-pairs"; "expand" = dontDistribute super."expand"; "expat-enumerator" = dontDistribute super."expat-enumerator"; @@ -2821,6 +2832,7 @@ self: super: { "find-conduit" = dontDistribute super."find-conduit"; "fingertree-tf" = dontDistribute super."fingertree-tf"; "finite-field" = dontDistribute super."finite-field"; + "finite-typelits" = dontDistribute super."finite-typelits"; "first-and-last" = dontDistribute super."first-and-last"; "first-class-patterns" = dontDistribute super."first-class-patterns"; "firstify" = dontDistribute super."firstify"; @@ -3090,17 +3102,33 @@ self: super: { "ghclive" = dontDistribute super."ghclive"; "ghczdecode" = dontDistribute super."ghczdecode"; "ght" = dontDistribute super."ght"; + "gi-atk" = dontDistribute super."gi-atk"; + "gi-cairo" = dontDistribute super."gi-cairo"; + "gi-gdk" = dontDistribute super."gi-gdk"; + "gi-gdkpixbuf" = dontDistribute super."gi-gdkpixbuf"; + "gi-gio" = dontDistribute super."gi-gio"; + "gi-glib" = dontDistribute super."gi-glib"; + "gi-gobject" = dontDistribute super."gi-gobject"; + "gi-gtk" = dontDistribute super."gi-gtk"; + "gi-javascriptcore" = dontDistribute super."gi-javascriptcore"; + "gi-notify" = dontDistribute super."gi-notify"; + "gi-pango" = dontDistribute super."gi-pango"; + "gi-soup" = dontDistribute super."gi-soup"; + "gi-vte" = dontDistribute super."gi-vte"; + "gi-webkit" = dontDistribute super."gi-webkit"; "gimlh" = dontDistribute super."gimlh"; "ginger" = dontDistribute super."ginger"; "ginsu" = dontDistribute super."ginsu"; "gipeda" = doDistribute super."gipeda_0_1_2_1"; "gist" = dontDistribute super."gist"; "git-all" = dontDistribute super."git-all"; + "git-annex" = doDistribute super."git-annex_5_20150727"; "git-checklist" = dontDistribute super."git-checklist"; "git-date" = dontDistribute super."git-date"; "git-embed" = dontDistribute super."git-embed"; "git-freq" = dontDistribute super."git-freq"; "git-gpush" = dontDistribute super."git-gpush"; + "git-jump" = dontDistribute super."git-jump"; "git-monitor" = dontDistribute super."git-monitor"; "git-object" = dontDistribute super."git-object"; "git-repair" = dontDistribute super."git-repair"; @@ -3559,6 +3587,8 @@ self: super: { "haskell-formatter" = dontDistribute super."haskell-formatter"; "haskell-ftp" = dontDistribute super."haskell-ftp"; "haskell-generate" = dontDistribute super."haskell-generate"; + "haskell-gi" = dontDistribute super."haskell-gi"; + "haskell-gi-base" = dontDistribute super."haskell-gi-base"; "haskell-import-graph" = dontDistribute super."haskell-import-graph"; "haskell-in-space" = dontDistribute super."haskell-in-space"; "haskell-modbus" = dontDistribute super."haskell-modbus"; @@ -3748,9 +3778,11 @@ self: super: { "hfann" = dontDistribute super."hfann"; "hfd" = dontDistribute super."hfd"; "hfiar" = dontDistribute super."hfiar"; + "hfmt" = dontDistribute super."hfmt"; "hfoil" = dontDistribute super."hfoil"; "hfov" = dontDistribute super."hfov"; "hfractal" = dontDistribute super."hfractal"; + "hfsevents" = doDistribute super."hfsevents_0_1_5"; "hfusion" = dontDistribute super."hfusion"; "hg-buildpackage" = dontDistribute super."hg-buildpackage"; "hgal" = dontDistribute super."hgal"; @@ -4142,6 +4174,7 @@ self: super: { "hsx2hs" = dontDistribute super."hsx2hs"; "hsyscall" = dontDistribute super."hsyscall"; "hszephyr" = dontDistribute super."hszephyr"; + "htaglib" = dontDistribute super."htaglib"; "htags" = dontDistribute super."htags"; "htar" = dontDistribute super."htar"; "htiled" = dontDistribute super."htiled"; @@ -4538,6 +4571,7 @@ self: super: { "keera-hails-reactive-polling" = dontDistribute super."keera-hails-reactive-polling"; "keera-hails-reactive-wx" = dontDistribute super."keera-hails-reactive-wx"; "keera-hails-reactive-yampa" = dontDistribute super."keera-hails-reactive-yampa"; + "keera-hails-reactivelenses" = dontDistribute super."keera-hails-reactivelenses"; "keera-hails-reactivevalues" = dontDistribute super."keera-hails-reactivevalues"; "keera-posture" = dontDistribute super."keera-posture"; "keiretsu" = dontDistribute super."keiretsu"; @@ -4642,6 +4676,8 @@ self: super: { "lat" = dontDistribute super."lat"; "latest-npm-version" = dontDistribute super."latest-npm-version"; "latex" = dontDistribute super."latex"; + "latex-formulae-image" = dontDistribute super."latex-formulae-image"; + "latex-formulae-pandoc" = dontDistribute super."latex-formulae-pandoc"; "lattices" = doDistribute super."lattices_1_3"; "launchpad-control" = dontDistribute super."launchpad-control"; "lax" = dontDistribute super."lax"; @@ -4670,6 +4706,7 @@ self: super: { "leksah" = dontDistribute super."leksah"; "leksah-server" = dontDistribute super."leksah-server"; "lendingclub" = dontDistribute super."lendingclub"; + "lens-action" = doDistribute super."lens-action_0_2_0_1"; "lens-datetime" = dontDistribute super."lens-datetime"; "lens-prelude" = dontDistribute super."lens-prelude"; "lens-properties" = dontDistribute super."lens-properties"; @@ -4976,6 +5013,7 @@ self: super: { "memexml" = dontDistribute super."memexml"; "memo-ptr" = dontDistribute super."memo-ptr"; "memo-sqlite" = dontDistribute super."memo-sqlite"; + "memoization-utils" = dontDistribute super."memoization-utils"; "memory" = doDistribute super."memory_0_7"; "memscript" = dontDistribute super."memscript"; "mersenne-random" = dontDistribute super."mersenne-random"; @@ -5372,6 +5410,7 @@ self: super: { "nthable" = dontDistribute super."nthable"; "ntp-control" = dontDistribute super."ntp-control"; "null-canvas" = dontDistribute super."null-canvas"; + "nullary" = dontDistribute super."nullary"; "number" = dontDistribute super."number"; "numbering" = dontDistribute super."numbering"; "numerals" = dontDistribute super."numerals"; @@ -5584,6 +5623,7 @@ self: super: { "pcg-random" = dontDistribute super."pcg-random"; "pcre-heavy" = doDistribute super."pcre-heavy_0_2_5"; "pcre-less" = dontDistribute super."pcre-less"; + "pcre-light" = doDistribute super."pcre-light_0_4_0_3"; "pcre-light-extra" = dontDistribute super."pcre-light-extra"; "pcre-utils" = dontDistribute super."pcre-utils"; "pdf-toolbox-content" = dontDistribute super."pdf-toolbox-content"; @@ -5927,6 +5967,7 @@ self: super: { "qc-oi-testgenerator" = dontDistribute super."qc-oi-testgenerator"; "qd" = dontDistribute super."qd"; "qd-vec" = dontDistribute super."qd-vec"; + "qed" = dontDistribute super."qed"; "qhull-simple" = dontDistribute super."qhull-simple"; "qrcode" = dontDistribute super."qrcode"; "qt" = dontDistribute super."qt"; @@ -5941,6 +5982,7 @@ self: super: { "queue" = dontDistribute super."queue"; "queuelike" = dontDistribute super."queuelike"; "quick-generator" = dontDistribute super."quick-generator"; + "quick-schema" = dontDistribute super."quick-schema"; "quickcheck-poly" = dontDistribute super."quickcheck-poly"; "quickcheck-properties" = dontDistribute super."quickcheck-properties"; "quickcheck-property-comb" = dontDistribute super."quickcheck-property-comb"; @@ -6413,6 +6455,7 @@ self: super: { "servant" = doDistribute super."servant_0_4_4_2"; "servant-JuicyPixels" = doDistribute super."servant-JuicyPixels_0_1_0_0"; "servant-blaze" = dontDistribute super."servant-blaze"; + "servant-cassava" = dontDistribute super."servant-cassava"; "servant-client" = doDistribute super."servant-client_0_4_4_2"; "servant-docs" = doDistribute super."servant-docs_0_4_4_2"; "servant-ede" = dontDistribute super."servant-ede"; @@ -6425,6 +6468,7 @@ self: super: { "servant-response" = dontDistribute super."servant-response"; "servant-scotty" = dontDistribute super."servant-scotty"; "servant-server" = doDistribute super."servant-server_0_4_4_2"; + "servant-swagger" = dontDistribute super."servant-swagger"; "servant-yaml" = dontDistribute super."servant-yaml"; "servius" = dontDistribute super."servius"; "ses-html" = dontDistribute super."ses-html"; @@ -6942,6 +6986,7 @@ self: super: { "tag-bits" = dontDistribute super."tag-bits"; "tag-stream" = dontDistribute super."tag-stream"; "tagchup" = dontDistribute super."tagchup"; + "tagged" = doDistribute super."tagged_0_8_1"; "tagged-exception-core" = dontDistribute super."tagged-exception-core"; "tagged-list" = dontDistribute super."tagged-list"; "tagged-th" = dontDistribute super."tagged-th"; @@ -7008,6 +7053,7 @@ self: super: { "tensor" = dontDistribute super."tensor"; "term-rewriting" = dontDistribute super."term-rewriting"; "termbox-bindings" = dontDistribute super."termbox-bindings"; + "terminal-size" = doDistribute super."terminal-size_0_3_2"; "termination-combinators" = dontDistribute super."termination-combinators"; "terminfo" = doDistribute super."terminfo_0_4_0_1"; "terminfo-hs" = dontDistribute super."terminfo-hs"; @@ -7072,6 +7118,7 @@ self: super: { "th-alpha" = dontDistribute super."th-alpha"; "th-build" = dontDistribute super."th-build"; "th-context" = dontDistribute super."th-context"; + "th-desugar" = doDistribute super."th-desugar_1_5_4_1"; "th-fold" = dontDistribute super."th-fold"; "th-inline-io-action" = dontDistribute super."th-inline-io-action"; "th-instance-reification" = dontDistribute super."th-instance-reification"; @@ -7508,6 +7555,7 @@ self: super: { "verdict" = dontDistribute super."verdict"; "verdict-json" = dontDistribute super."verdict-json"; "verilog" = dontDistribute super."verilog"; + "versions" = dontDistribute super."versions"; "vhdl" = dontDistribute super."vhdl"; "views" = dontDistribute super."views"; "vigilance" = dontDistribute super."vigilance"; @@ -7908,6 +7956,8 @@ self: super: { "zenc" = dontDistribute super."zenc"; "zendesk-api" = dontDistribute super."zendesk-api"; "zeno" = dontDistribute super."zeno"; + "zero" = doDistribute super."zero_0_1_3"; + "zerobin" = dontDistribute super."zerobin"; "zeromq-haskell" = dontDistribute super."zeromq-haskell"; "zeromq3-conduit" = dontDistribute super."zeromq3-conduit"; "zeromq3-haskell" = dontDistribute super."zeromq3-haskell"; diff --git a/pkgs/development/haskell-modules/configuration-lts-3.7.nix b/pkgs/development/haskell-modules/configuration-lts-3.7.nix index 8d90e3b6d07e..c5b1b7f11bad 100644 --- a/pkgs/development/haskell-modules/configuration-lts-3.7.nix +++ b/pkgs/development/haskell-modules/configuration-lts-3.7.nix @@ -489,6 +489,7 @@ self: super: { "HasGP" = dontDistribute super."HasGP"; "Haschoo" = dontDistribute super."Haschoo"; "Hashell" = dontDistribute super."Hashell"; + "HaskRel" = dontDistribute super."HaskRel"; "HaskellForMaths" = dontDistribute super."HaskellForMaths"; "HaskellLM" = dontDistribute super."HaskellLM"; "HaskellNN" = dontDistribute super."HaskellNN"; @@ -533,6 +534,7 @@ self: super: { "Hsed" = dontDistribute super."Hsed"; "Hsmtlib" = dontDistribute super."Hsmtlib"; "HueAPI" = dontDistribute super."HueAPI"; + "HulkImport" = dontDistribute super."HulkImport"; "Hungarian-Munkres" = dontDistribute super."Hungarian-Munkres"; "IDynamic" = dontDistribute super."IDynamic"; "IFS" = dontDistribute super."IFS"; @@ -560,6 +562,7 @@ self: super: { "Javav" = dontDistribute super."Javav"; "JsContracts" = dontDistribute super."JsContracts"; "JsonGrammar" = dontDistribute super."JsonGrammar"; + "JuicyPixels" = doDistribute super."JuicyPixels_3_2_6_1"; "JuicyPixels-canvas" = dontDistribute super."JuicyPixels-canvas"; "JuicyPixels-repa" = dontDistribute super."JuicyPixels-repa"; "JuicyPixels-util" = dontDistribute super."JuicyPixels-util"; @@ -1107,6 +1110,7 @@ self: super: { "afis" = dontDistribute super."afis"; "afv" = dontDistribute super."afv"; "agda-server" = dontDistribute super."agda-server"; + "agda-snippets" = dontDistribute super."agda-snippets"; "agum" = dontDistribute super."agum"; "aig" = dontDistribute super."aig"; "air" = dontDistribute super."air"; @@ -1369,6 +1373,7 @@ self: super: { "awesomium" = dontDistribute super."awesomium"; "awesomium-glut" = dontDistribute super."awesomium-glut"; "awesomium-raw" = dontDistribute super."awesomium-raw"; + "aws" = doDistribute super."aws_0_12_1"; "aws-cloudfront-signer" = dontDistribute super."aws-cloudfront-signer"; "aws-configuration-tools" = dontDistribute super."aws-configuration-tools"; "aws-dynamodb-conduit" = dontDistribute super."aws-dynamodb-conduit"; @@ -1851,6 +1856,7 @@ self: super: { "cinvoke" = dontDistribute super."cinvoke"; "cio" = dontDistribute super."cio"; "cipher-rc5" = dontDistribute super."cipher-rc5"; + "ciphersaber2" = dontDistribute super."ciphersaber2"; "circ" = dontDistribute super."circ"; "cirru-parser" = dontDistribute super."cirru-parser"; "citation-resolve" = dontDistribute super."citation-resolve"; @@ -2103,6 +2109,7 @@ self: super: { "cpuid" = dontDistribute super."cpuid"; "cpuperf" = dontDistribute super."cpuperf"; "cpython" = dontDistribute super."cpython"; + "cql" = doDistribute super."cql_3_0_5"; "cqrs" = dontDistribute super."cqrs"; "cqrs-core" = dontDistribute super."cqrs-core"; "cqrs-example" = dontDistribute super."cqrs-example"; @@ -2282,6 +2289,7 @@ self: super: { "dataflow" = dontDistribute super."dataflow"; "datalog" = dontDistribute super."datalog"; "datapacker" = dontDistribute super."datapacker"; + "dataurl" = dontDistribute super."dataurl"; "date-cache" = dontDistribute super."date-cache"; "dates" = dontDistribute super."dates"; "datetime" = dontDistribute super."datetime"; @@ -2660,6 +2668,7 @@ self: super: { "eros-client" = dontDistribute super."eros-client"; "eros-http" = dontDistribute super."eros-http"; "errno" = dontDistribute super."errno"; + "error-analyze" = dontDistribute super."error-analyze"; "error-continuations" = dontDistribute super."error-continuations"; "error-list" = dontDistribute super."error-list"; "error-loc" = dontDistribute super."error-loc"; @@ -2684,6 +2693,7 @@ self: super: { "euler" = dontDistribute super."euler"; "euphoria" = dontDistribute super."euphoria"; "eurofxref" = dontDistribute super."eurofxref"; + "event" = doDistribute super."event_0_1_2"; "event-driven" = dontDistribute super."event-driven"; "event-handlers" = dontDistribute super."event-handlers"; "event-list" = dontDistribute super."event-list"; @@ -2708,6 +2718,7 @@ self: super: { "exinst-deepseq" = dontDistribute super."exinst-deepseq"; "exinst-hashable" = dontDistribute super."exinst-hashable"; "exists" = dontDistribute super."exists"; + "exit-codes" = dontDistribute super."exit-codes"; "exp-pairs" = dontDistribute super."exp-pairs"; "expand" = dontDistribute super."expand"; "expat-enumerator" = dontDistribute super."expat-enumerator"; @@ -2810,6 +2821,7 @@ self: super: { "find-conduit" = dontDistribute super."find-conduit"; "fingertree-tf" = dontDistribute super."fingertree-tf"; "finite-field" = dontDistribute super."finite-field"; + "finite-typelits" = dontDistribute super."finite-typelits"; "first-and-last" = dontDistribute super."first-and-last"; "first-class-patterns" = dontDistribute super."first-class-patterns"; "firstify" = dontDistribute super."firstify"; @@ -3078,17 +3090,33 @@ self: super: { "ghclive" = dontDistribute super."ghclive"; "ghczdecode" = dontDistribute super."ghczdecode"; "ght" = dontDistribute super."ght"; + "gi-atk" = dontDistribute super."gi-atk"; + "gi-cairo" = dontDistribute super."gi-cairo"; + "gi-gdk" = dontDistribute super."gi-gdk"; + "gi-gdkpixbuf" = dontDistribute super."gi-gdkpixbuf"; + "gi-gio" = dontDistribute super."gi-gio"; + "gi-glib" = dontDistribute super."gi-glib"; + "gi-gobject" = dontDistribute super."gi-gobject"; + "gi-gtk" = dontDistribute super."gi-gtk"; + "gi-javascriptcore" = dontDistribute super."gi-javascriptcore"; + "gi-notify" = dontDistribute super."gi-notify"; + "gi-pango" = dontDistribute super."gi-pango"; + "gi-soup" = dontDistribute super."gi-soup"; + "gi-vte" = dontDistribute super."gi-vte"; + "gi-webkit" = dontDistribute super."gi-webkit"; "gimlh" = dontDistribute super."gimlh"; "ginger" = dontDistribute super."ginger"; "ginsu" = dontDistribute super."ginsu"; "gipeda" = doDistribute super."gipeda_0_1_2_1"; "gist" = dontDistribute super."gist"; "git-all" = dontDistribute super."git-all"; + "git-annex" = doDistribute super."git-annex_5_20150727"; "git-checklist" = dontDistribute super."git-checklist"; "git-date" = dontDistribute super."git-date"; "git-embed" = dontDistribute super."git-embed"; "git-freq" = dontDistribute super."git-freq"; "git-gpush" = dontDistribute super."git-gpush"; + "git-jump" = dontDistribute super."git-jump"; "git-monitor" = dontDistribute super."git-monitor"; "git-object" = dontDistribute super."git-object"; "git-repair" = dontDistribute super."git-repair"; @@ -3547,6 +3575,8 @@ self: super: { "haskell-formatter" = dontDistribute super."haskell-formatter"; "haskell-ftp" = dontDistribute super."haskell-ftp"; "haskell-generate" = dontDistribute super."haskell-generate"; + "haskell-gi" = dontDistribute super."haskell-gi"; + "haskell-gi-base" = dontDistribute super."haskell-gi-base"; "haskell-import-graph" = dontDistribute super."haskell-import-graph"; "haskell-in-space" = dontDistribute super."haskell-in-space"; "haskell-modbus" = dontDistribute super."haskell-modbus"; @@ -3734,9 +3764,11 @@ self: super: { "hfann" = dontDistribute super."hfann"; "hfd" = dontDistribute super."hfd"; "hfiar" = dontDistribute super."hfiar"; + "hfmt" = dontDistribute super."hfmt"; "hfoil" = dontDistribute super."hfoil"; "hfov" = dontDistribute super."hfov"; "hfractal" = dontDistribute super."hfractal"; + "hfsevents" = doDistribute super."hfsevents_0_1_5"; "hfusion" = dontDistribute super."hfusion"; "hg-buildpackage" = dontDistribute super."hg-buildpackage"; "hgal" = dontDistribute super."hgal"; @@ -4128,6 +4160,7 @@ self: super: { "hsx2hs" = dontDistribute super."hsx2hs"; "hsyscall" = dontDistribute super."hsyscall"; "hszephyr" = dontDistribute super."hszephyr"; + "htaglib" = dontDistribute super."htaglib"; "htags" = dontDistribute super."htags"; "htar" = dontDistribute super."htar"; "htiled" = dontDistribute super."htiled"; @@ -4522,6 +4555,7 @@ self: super: { "keera-hails-reactive-polling" = dontDistribute super."keera-hails-reactive-polling"; "keera-hails-reactive-wx" = dontDistribute super."keera-hails-reactive-wx"; "keera-hails-reactive-yampa" = dontDistribute super."keera-hails-reactive-yampa"; + "keera-hails-reactivelenses" = dontDistribute super."keera-hails-reactivelenses"; "keera-hails-reactivevalues" = dontDistribute super."keera-hails-reactivevalues"; "keera-posture" = dontDistribute super."keera-posture"; "keiretsu" = dontDistribute super."keiretsu"; @@ -4626,6 +4660,8 @@ self: super: { "lat" = dontDistribute super."lat"; "latest-npm-version" = dontDistribute super."latest-npm-version"; "latex" = dontDistribute super."latex"; + "latex-formulae-image" = dontDistribute super."latex-formulae-image"; + "latex-formulae-pandoc" = dontDistribute super."latex-formulae-pandoc"; "lattices" = doDistribute super."lattices_1_3"; "launchpad-control" = dontDistribute super."launchpad-control"; "lax" = dontDistribute super."lax"; @@ -4654,6 +4690,7 @@ self: super: { "leksah" = dontDistribute super."leksah"; "leksah-server" = dontDistribute super."leksah-server"; "lendingclub" = dontDistribute super."lendingclub"; + "lens-action" = doDistribute super."lens-action_0_2_0_1"; "lens-datetime" = dontDistribute super."lens-datetime"; "lens-prelude" = dontDistribute super."lens-prelude"; "lens-properties" = dontDistribute super."lens-properties"; @@ -4958,6 +4995,7 @@ self: super: { "memexml" = dontDistribute super."memexml"; "memo-ptr" = dontDistribute super."memo-ptr"; "memo-sqlite" = dontDistribute super."memo-sqlite"; + "memoization-utils" = dontDistribute super."memoization-utils"; "memory" = doDistribute super."memory_0_7"; "memscript" = dontDistribute super."memscript"; "mersenne-random" = dontDistribute super."mersenne-random"; @@ -5354,6 +5392,7 @@ self: super: { "nthable" = dontDistribute super."nthable"; "ntp-control" = dontDistribute super."ntp-control"; "null-canvas" = dontDistribute super."null-canvas"; + "nullary" = dontDistribute super."nullary"; "number" = dontDistribute super."number"; "numbering" = dontDistribute super."numbering"; "numerals" = dontDistribute super."numerals"; @@ -5565,6 +5604,7 @@ self: super: { "pcg-random" = dontDistribute super."pcg-random"; "pcre-heavy" = doDistribute super."pcre-heavy_0_2_5"; "pcre-less" = dontDistribute super."pcre-less"; + "pcre-light" = doDistribute super."pcre-light_0_4_0_3"; "pcre-light-extra" = dontDistribute super."pcre-light-extra"; "pcre-utils" = dontDistribute super."pcre-utils"; "pdf-toolbox-content" = dontDistribute super."pdf-toolbox-content"; @@ -5905,6 +5945,7 @@ self: super: { "qc-oi-testgenerator" = dontDistribute super."qc-oi-testgenerator"; "qd" = dontDistribute super."qd"; "qd-vec" = dontDistribute super."qd-vec"; + "qed" = dontDistribute super."qed"; "qhull-simple" = dontDistribute super."qhull-simple"; "qrcode" = dontDistribute super."qrcode"; "qt" = dontDistribute super."qt"; @@ -5919,6 +5960,7 @@ self: super: { "queue" = dontDistribute super."queue"; "queuelike" = dontDistribute super."queuelike"; "quick-generator" = dontDistribute super."quick-generator"; + "quick-schema" = dontDistribute super."quick-schema"; "quickcheck-poly" = dontDistribute super."quickcheck-poly"; "quickcheck-properties" = dontDistribute super."quickcheck-properties"; "quickcheck-property-comb" = dontDistribute super."quickcheck-property-comb"; @@ -6390,6 +6432,7 @@ self: super: { "servant" = doDistribute super."servant_0_4_4_4"; "servant-JuicyPixels" = doDistribute super."servant-JuicyPixels_0_1_0_0"; "servant-blaze" = dontDistribute super."servant-blaze"; + "servant-cassava" = dontDistribute super."servant-cassava"; "servant-client" = doDistribute super."servant-client_0_4_4_4"; "servant-docs" = doDistribute super."servant-docs_0_4_4_4"; "servant-ede" = dontDistribute super."servant-ede"; @@ -6402,6 +6445,7 @@ self: super: { "servant-response" = dontDistribute super."servant-response"; "servant-scotty" = dontDistribute super."servant-scotty"; "servant-server" = doDistribute super."servant-server_0_4_4_4"; + "servant-swagger" = dontDistribute super."servant-swagger"; "servant-yaml" = dontDistribute super."servant-yaml"; "servius" = dontDistribute super."servius"; "ses-html" = dontDistribute super."ses-html"; @@ -6916,6 +6960,7 @@ self: super: { "tag-bits" = dontDistribute super."tag-bits"; "tag-stream" = dontDistribute super."tag-stream"; "tagchup" = dontDistribute super."tagchup"; + "tagged" = doDistribute super."tagged_0_8_1"; "tagged-exception-core" = dontDistribute super."tagged-exception-core"; "tagged-list" = dontDistribute super."tagged-list"; "tagged-th" = dontDistribute super."tagged-th"; @@ -6982,6 +7027,7 @@ self: super: { "tensor" = dontDistribute super."tensor"; "term-rewriting" = dontDistribute super."term-rewriting"; "termbox-bindings" = dontDistribute super."termbox-bindings"; + "terminal-size" = doDistribute super."terminal-size_0_3_2"; "termination-combinators" = dontDistribute super."termination-combinators"; "terminfo" = doDistribute super."terminfo_0_4_0_1"; "terminfo-hs" = dontDistribute super."terminfo-hs"; @@ -7046,6 +7092,7 @@ self: super: { "th-alpha" = dontDistribute super."th-alpha"; "th-build" = dontDistribute super."th-build"; "th-context" = dontDistribute super."th-context"; + "th-desugar" = doDistribute super."th-desugar_1_5_4_1"; "th-fold" = dontDistribute super."th-fold"; "th-inline-io-action" = dontDistribute super."th-inline-io-action"; "th-instance-reification" = dontDistribute super."th-instance-reification"; @@ -7481,6 +7528,7 @@ self: super: { "verdict" = dontDistribute super."verdict"; "verdict-json" = dontDistribute super."verdict-json"; "verilog" = dontDistribute super."verilog"; + "versions" = dontDistribute super."versions"; "vhdl" = dontDistribute super."vhdl"; "views" = dontDistribute super."views"; "vigilance" = dontDistribute super."vigilance"; @@ -7877,6 +7925,8 @@ self: super: { "zenc" = dontDistribute super."zenc"; "zendesk-api" = dontDistribute super."zendesk-api"; "zeno" = dontDistribute super."zeno"; + "zero" = doDistribute super."zero_0_1_3"; + "zerobin" = dontDistribute super."zerobin"; "zeromq-haskell" = dontDistribute super."zeromq-haskell"; "zeromq3-conduit" = dontDistribute super."zeromq3-conduit"; "zeromq3-haskell" = dontDistribute super."zeromq3-haskell"; diff --git a/pkgs/development/haskell-modules/configuration-lts-3.8.nix b/pkgs/development/haskell-modules/configuration-lts-3.8.nix index 50a91e7a85ec..5b75ea08917e 100644 --- a/pkgs/development/haskell-modules/configuration-lts-3.8.nix +++ b/pkgs/development/haskell-modules/configuration-lts-3.8.nix @@ -489,6 +489,7 @@ self: super: { "HasGP" = dontDistribute super."HasGP"; "Haschoo" = dontDistribute super."Haschoo"; "Hashell" = dontDistribute super."Hashell"; + "HaskRel" = dontDistribute super."HaskRel"; "HaskellForMaths" = dontDistribute super."HaskellForMaths"; "HaskellLM" = dontDistribute super."HaskellLM"; "HaskellNN" = dontDistribute super."HaskellNN"; @@ -533,6 +534,7 @@ self: super: { "Hsed" = dontDistribute super."Hsed"; "Hsmtlib" = dontDistribute super."Hsmtlib"; "HueAPI" = dontDistribute super."HueAPI"; + "HulkImport" = dontDistribute super."HulkImport"; "Hungarian-Munkres" = dontDistribute super."Hungarian-Munkres"; "IDynamic" = dontDistribute super."IDynamic"; "IFS" = dontDistribute super."IFS"; @@ -560,6 +562,7 @@ self: super: { "Javav" = dontDistribute super."Javav"; "JsContracts" = dontDistribute super."JsContracts"; "JsonGrammar" = dontDistribute super."JsonGrammar"; + "JuicyPixels" = doDistribute super."JuicyPixels_3_2_6_1"; "JuicyPixels-canvas" = dontDistribute super."JuicyPixels-canvas"; "JuicyPixels-repa" = dontDistribute super."JuicyPixels-repa"; "JuicyPixels-util" = dontDistribute super."JuicyPixels-util"; @@ -1106,6 +1109,7 @@ self: super: { "afis" = dontDistribute super."afis"; "afv" = dontDistribute super."afv"; "agda-server" = dontDistribute super."agda-server"; + "agda-snippets" = dontDistribute super."agda-snippets"; "agum" = dontDistribute super."agum"; "aig" = dontDistribute super."aig"; "air" = dontDistribute super."air"; @@ -1368,6 +1372,7 @@ self: super: { "awesomium" = dontDistribute super."awesomium"; "awesomium-glut" = dontDistribute super."awesomium-glut"; "awesomium-raw" = dontDistribute super."awesomium-raw"; + "aws" = doDistribute super."aws_0_12_1"; "aws-cloudfront-signer" = dontDistribute super."aws-cloudfront-signer"; "aws-configuration-tools" = dontDistribute super."aws-configuration-tools"; "aws-dynamodb-conduit" = dontDistribute super."aws-dynamodb-conduit"; @@ -1846,6 +1851,7 @@ self: super: { "cinvoke" = dontDistribute super."cinvoke"; "cio" = dontDistribute super."cio"; "cipher-rc5" = dontDistribute super."cipher-rc5"; + "ciphersaber2" = dontDistribute super."ciphersaber2"; "circ" = dontDistribute super."circ"; "cirru-parser" = dontDistribute super."cirru-parser"; "citation-resolve" = dontDistribute super."citation-resolve"; @@ -2097,6 +2103,7 @@ self: super: { "cpuid" = dontDistribute super."cpuid"; "cpuperf" = dontDistribute super."cpuperf"; "cpython" = dontDistribute super."cpython"; + "cql" = doDistribute super."cql_3_0_5"; "cqrs" = dontDistribute super."cqrs"; "cqrs-core" = dontDistribute super."cqrs-core"; "cqrs-example" = dontDistribute super."cqrs-example"; @@ -2275,6 +2282,7 @@ self: super: { "dataflow" = dontDistribute super."dataflow"; "datalog" = dontDistribute super."datalog"; "datapacker" = dontDistribute super."datapacker"; + "dataurl" = dontDistribute super."dataurl"; "date-cache" = dontDistribute super."date-cache"; "dates" = dontDistribute super."dates"; "datetime" = dontDistribute super."datetime"; @@ -2646,6 +2654,7 @@ self: super: { "eros-client" = dontDistribute super."eros-client"; "eros-http" = dontDistribute super."eros-http"; "errno" = dontDistribute super."errno"; + "error-analyze" = dontDistribute super."error-analyze"; "error-continuations" = dontDistribute super."error-continuations"; "error-list" = dontDistribute super."error-list"; "error-loc" = dontDistribute super."error-loc"; @@ -2670,6 +2679,7 @@ self: super: { "euler" = dontDistribute super."euler"; "euphoria" = dontDistribute super."euphoria"; "eurofxref" = dontDistribute super."eurofxref"; + "event" = doDistribute super."event_0_1_2"; "event-driven" = dontDistribute super."event-driven"; "event-handlers" = dontDistribute super."event-handlers"; "event-list" = dontDistribute super."event-list"; @@ -2694,6 +2704,7 @@ self: super: { "exinst-deepseq" = dontDistribute super."exinst-deepseq"; "exinst-hashable" = dontDistribute super."exinst-hashable"; "exists" = dontDistribute super."exists"; + "exit-codes" = dontDistribute super."exit-codes"; "exp-pairs" = dontDistribute super."exp-pairs"; "expand" = dontDistribute super."expand"; "expat-enumerator" = dontDistribute super."expat-enumerator"; @@ -2796,6 +2807,7 @@ self: super: { "find-conduit" = dontDistribute super."find-conduit"; "fingertree-tf" = dontDistribute super."fingertree-tf"; "finite-field" = dontDistribute super."finite-field"; + "finite-typelits" = dontDistribute super."finite-typelits"; "first-and-last" = dontDistribute super."first-and-last"; "first-class-patterns" = dontDistribute super."first-class-patterns"; "firstify" = dontDistribute super."firstify"; @@ -3064,17 +3076,33 @@ self: super: { "ghclive" = dontDistribute super."ghclive"; "ghczdecode" = dontDistribute super."ghczdecode"; "ght" = dontDistribute super."ght"; + "gi-atk" = dontDistribute super."gi-atk"; + "gi-cairo" = dontDistribute super."gi-cairo"; + "gi-gdk" = dontDistribute super."gi-gdk"; + "gi-gdkpixbuf" = dontDistribute super."gi-gdkpixbuf"; + "gi-gio" = dontDistribute super."gi-gio"; + "gi-glib" = dontDistribute super."gi-glib"; + "gi-gobject" = dontDistribute super."gi-gobject"; + "gi-gtk" = dontDistribute super."gi-gtk"; + "gi-javascriptcore" = dontDistribute super."gi-javascriptcore"; + "gi-notify" = dontDistribute super."gi-notify"; + "gi-pango" = dontDistribute super."gi-pango"; + "gi-soup" = dontDistribute super."gi-soup"; + "gi-vte" = dontDistribute super."gi-vte"; + "gi-webkit" = dontDistribute super."gi-webkit"; "gimlh" = dontDistribute super."gimlh"; "ginger" = dontDistribute super."ginger"; "ginsu" = dontDistribute super."ginsu"; "gipeda" = doDistribute super."gipeda_0_1_2_1"; "gist" = dontDistribute super."gist"; "git-all" = dontDistribute super."git-all"; + "git-annex" = doDistribute super."git-annex_5_20150727"; "git-checklist" = dontDistribute super."git-checklist"; "git-date" = dontDistribute super."git-date"; "git-embed" = dontDistribute super."git-embed"; "git-freq" = dontDistribute super."git-freq"; "git-gpush" = dontDistribute super."git-gpush"; + "git-jump" = dontDistribute super."git-jump"; "git-monitor" = dontDistribute super."git-monitor"; "git-object" = dontDistribute super."git-object"; "git-repair" = dontDistribute super."git-repair"; @@ -3533,6 +3561,8 @@ self: super: { "haskell-formatter" = dontDistribute super."haskell-formatter"; "haskell-ftp" = dontDistribute super."haskell-ftp"; "haskell-generate" = dontDistribute super."haskell-generate"; + "haskell-gi" = dontDistribute super."haskell-gi"; + "haskell-gi-base" = dontDistribute super."haskell-gi-base"; "haskell-import-graph" = dontDistribute super."haskell-import-graph"; "haskell-in-space" = dontDistribute super."haskell-in-space"; "haskell-modbus" = dontDistribute super."haskell-modbus"; @@ -3719,9 +3749,11 @@ self: super: { "hfann" = dontDistribute super."hfann"; "hfd" = dontDistribute super."hfd"; "hfiar" = dontDistribute super."hfiar"; + "hfmt" = dontDistribute super."hfmt"; "hfoil" = dontDistribute super."hfoil"; "hfov" = dontDistribute super."hfov"; "hfractal" = dontDistribute super."hfractal"; + "hfsevents" = doDistribute super."hfsevents_0_1_5"; "hfusion" = dontDistribute super."hfusion"; "hg-buildpackage" = dontDistribute super."hg-buildpackage"; "hgal" = dontDistribute super."hgal"; @@ -4113,6 +4145,7 @@ self: super: { "hsx2hs" = dontDistribute super."hsx2hs"; "hsyscall" = dontDistribute super."hsyscall"; "hszephyr" = dontDistribute super."hszephyr"; + "htaglib" = dontDistribute super."htaglib"; "htags" = dontDistribute super."htags"; "htar" = dontDistribute super."htar"; "htiled" = dontDistribute super."htiled"; @@ -4507,6 +4540,7 @@ self: super: { "keera-hails-reactive-polling" = dontDistribute super."keera-hails-reactive-polling"; "keera-hails-reactive-wx" = dontDistribute super."keera-hails-reactive-wx"; "keera-hails-reactive-yampa" = dontDistribute super."keera-hails-reactive-yampa"; + "keera-hails-reactivelenses" = dontDistribute super."keera-hails-reactivelenses"; "keera-hails-reactivevalues" = dontDistribute super."keera-hails-reactivevalues"; "keera-posture" = dontDistribute super."keera-posture"; "keiretsu" = dontDistribute super."keiretsu"; @@ -4611,6 +4645,8 @@ self: super: { "lat" = dontDistribute super."lat"; "latest-npm-version" = dontDistribute super."latest-npm-version"; "latex" = dontDistribute super."latex"; + "latex-formulae-image" = dontDistribute super."latex-formulae-image"; + "latex-formulae-pandoc" = dontDistribute super."latex-formulae-pandoc"; "lattices" = doDistribute super."lattices_1_3"; "launchpad-control" = dontDistribute super."launchpad-control"; "lax" = dontDistribute super."lax"; @@ -4639,6 +4675,7 @@ self: super: { "leksah" = dontDistribute super."leksah"; "leksah-server" = dontDistribute super."leksah-server"; "lendingclub" = dontDistribute super."lendingclub"; + "lens-action" = doDistribute super."lens-action_0_2_0_1"; "lens-datetime" = dontDistribute super."lens-datetime"; "lens-prelude" = dontDistribute super."lens-prelude"; "lens-properties" = dontDistribute super."lens-properties"; @@ -4942,6 +4979,7 @@ self: super: { "memexml" = dontDistribute super."memexml"; "memo-ptr" = dontDistribute super."memo-ptr"; "memo-sqlite" = dontDistribute super."memo-sqlite"; + "memoization-utils" = dontDistribute super."memoization-utils"; "memory" = doDistribute super."memory_0_7"; "memscript" = dontDistribute super."memscript"; "mersenne-random" = dontDistribute super."mersenne-random"; @@ -5337,6 +5375,7 @@ self: super: { "nthable" = dontDistribute super."nthable"; "ntp-control" = dontDistribute super."ntp-control"; "null-canvas" = dontDistribute super."null-canvas"; + "nullary" = dontDistribute super."nullary"; "number" = dontDistribute super."number"; "numbering" = dontDistribute super."numbering"; "numerals" = dontDistribute super."numerals"; @@ -5548,6 +5587,7 @@ self: super: { "pcg-random" = dontDistribute super."pcg-random"; "pcre-heavy" = doDistribute super."pcre-heavy_0_2_5"; "pcre-less" = dontDistribute super."pcre-less"; + "pcre-light" = doDistribute super."pcre-light_0_4_0_3"; "pcre-light-extra" = dontDistribute super."pcre-light-extra"; "pcre-utils" = dontDistribute super."pcre-utils"; "pdf-toolbox-content" = dontDistribute super."pdf-toolbox-content"; @@ -5886,6 +5926,7 @@ self: super: { "qc-oi-testgenerator" = dontDistribute super."qc-oi-testgenerator"; "qd" = dontDistribute super."qd"; "qd-vec" = dontDistribute super."qd-vec"; + "qed" = dontDistribute super."qed"; "qhull-simple" = dontDistribute super."qhull-simple"; "qrcode" = dontDistribute super."qrcode"; "qt" = dontDistribute super."qt"; @@ -5900,6 +5941,7 @@ self: super: { "queue" = dontDistribute super."queue"; "queuelike" = dontDistribute super."queuelike"; "quick-generator" = dontDistribute super."quick-generator"; + "quick-schema" = dontDistribute super."quick-schema"; "quickcheck-poly" = dontDistribute super."quickcheck-poly"; "quickcheck-properties" = dontDistribute super."quickcheck-properties"; "quickcheck-property-comb" = dontDistribute super."quickcheck-property-comb"; @@ -6370,6 +6412,7 @@ self: super: { "servant" = doDistribute super."servant_0_4_4_4"; "servant-JuicyPixels" = doDistribute super."servant-JuicyPixels_0_1_0_0"; "servant-blaze" = dontDistribute super."servant-blaze"; + "servant-cassava" = dontDistribute super."servant-cassava"; "servant-client" = doDistribute super."servant-client_0_4_4_4"; "servant-docs" = doDistribute super."servant-docs_0_4_4_4"; "servant-ede" = dontDistribute super."servant-ede"; @@ -6382,6 +6425,7 @@ self: super: { "servant-response" = dontDistribute super."servant-response"; "servant-scotty" = dontDistribute super."servant-scotty"; "servant-server" = doDistribute super."servant-server_0_4_4_4"; + "servant-swagger" = dontDistribute super."servant-swagger"; "servant-yaml" = dontDistribute super."servant-yaml"; "servius" = dontDistribute super."servius"; "ses-html" = dontDistribute super."ses-html"; @@ -6894,6 +6938,7 @@ self: super: { "tag-bits" = dontDistribute super."tag-bits"; "tag-stream" = dontDistribute super."tag-stream"; "tagchup" = dontDistribute super."tagchup"; + "tagged" = doDistribute super."tagged_0_8_1"; "tagged-exception-core" = dontDistribute super."tagged-exception-core"; "tagged-list" = dontDistribute super."tagged-list"; "tagged-th" = dontDistribute super."tagged-th"; @@ -6958,6 +7003,7 @@ self: super: { "tensor" = dontDistribute super."tensor"; "term-rewriting" = dontDistribute super."term-rewriting"; "termbox-bindings" = dontDistribute super."termbox-bindings"; + "terminal-size" = doDistribute super."terminal-size_0_3_2"; "termination-combinators" = dontDistribute super."termination-combinators"; "terminfo" = doDistribute super."terminfo_0_4_0_1"; "terminfo-hs" = dontDistribute super."terminfo-hs"; @@ -7022,6 +7068,7 @@ self: super: { "th-alpha" = dontDistribute super."th-alpha"; "th-build" = dontDistribute super."th-build"; "th-context" = dontDistribute super."th-context"; + "th-desugar" = doDistribute super."th-desugar_1_5_4_1"; "th-fold" = dontDistribute super."th-fold"; "th-inline-io-action" = dontDistribute super."th-inline-io-action"; "th-instance-reification" = dontDistribute super."th-instance-reification"; @@ -7456,6 +7503,7 @@ self: super: { "verdict" = dontDistribute super."verdict"; "verdict-json" = dontDistribute super."verdict-json"; "verilog" = dontDistribute super."verilog"; + "versions" = dontDistribute super."versions"; "vhdl" = dontDistribute super."vhdl"; "views" = dontDistribute super."views"; "vigilance" = dontDistribute super."vigilance"; @@ -7850,6 +7898,8 @@ self: super: { "zenc" = dontDistribute super."zenc"; "zendesk-api" = dontDistribute super."zendesk-api"; "zeno" = dontDistribute super."zeno"; + "zero" = doDistribute super."zero_0_1_3"; + "zerobin" = dontDistribute super."zerobin"; "zeromq-haskell" = dontDistribute super."zeromq-haskell"; "zeromq3-conduit" = dontDistribute super."zeromq3-conduit"; "zeromq3-haskell" = dontDistribute super."zeromq3-haskell"; diff --git a/pkgs/development/haskell-modules/configuration-lts-3.9.nix b/pkgs/development/haskell-modules/configuration-lts-3.9.nix index f670c3fa8e44..88bd04f4806d 100644 --- a/pkgs/development/haskell-modules/configuration-lts-3.9.nix +++ b/pkgs/development/haskell-modules/configuration-lts-3.9.nix @@ -488,6 +488,7 @@ self: super: { "HasGP" = dontDistribute super."HasGP"; "Haschoo" = dontDistribute super."Haschoo"; "Hashell" = dontDistribute super."Hashell"; + "HaskRel" = dontDistribute super."HaskRel"; "HaskellForMaths" = dontDistribute super."HaskellForMaths"; "HaskellLM" = dontDistribute super."HaskellLM"; "HaskellNN" = dontDistribute super."HaskellNN"; @@ -532,6 +533,7 @@ self: super: { "Hsed" = dontDistribute super."Hsed"; "Hsmtlib" = dontDistribute super."Hsmtlib"; "HueAPI" = dontDistribute super."HueAPI"; + "HulkImport" = dontDistribute super."HulkImport"; "Hungarian-Munkres" = dontDistribute super."Hungarian-Munkres"; "IDynamic" = dontDistribute super."IDynamic"; "IFS" = dontDistribute super."IFS"; @@ -559,6 +561,7 @@ self: super: { "Javav" = dontDistribute super."Javav"; "JsContracts" = dontDistribute super."JsContracts"; "JsonGrammar" = dontDistribute super."JsonGrammar"; + "JuicyPixels" = doDistribute super."JuicyPixels_3_2_6_1"; "JuicyPixels-canvas" = dontDistribute super."JuicyPixels-canvas"; "JuicyPixels-repa" = dontDistribute super."JuicyPixels-repa"; "JuicyPixels-util" = dontDistribute super."JuicyPixels-util"; @@ -1103,6 +1106,7 @@ self: super: { "afis" = dontDistribute super."afis"; "afv" = dontDistribute super."afv"; "agda-server" = dontDistribute super."agda-server"; + "agda-snippets" = dontDistribute super."agda-snippets"; "agum" = dontDistribute super."agum"; "aig" = dontDistribute super."aig"; "air" = dontDistribute super."air"; @@ -1365,6 +1369,7 @@ self: super: { "awesomium" = dontDistribute super."awesomium"; "awesomium-glut" = dontDistribute super."awesomium-glut"; "awesomium-raw" = dontDistribute super."awesomium-raw"; + "aws" = doDistribute super."aws_0_12_1"; "aws-cloudfront-signer" = dontDistribute super."aws-cloudfront-signer"; "aws-configuration-tools" = dontDistribute super."aws-configuration-tools"; "aws-dynamodb-conduit" = dontDistribute super."aws-dynamodb-conduit"; @@ -1841,6 +1846,7 @@ self: super: { "cinvoke" = dontDistribute super."cinvoke"; "cio" = dontDistribute super."cio"; "cipher-rc5" = dontDistribute super."cipher-rc5"; + "ciphersaber2" = dontDistribute super."ciphersaber2"; "circ" = dontDistribute super."circ"; "cirru-parser" = dontDistribute super."cirru-parser"; "citation-resolve" = dontDistribute super."citation-resolve"; @@ -2092,6 +2098,7 @@ self: super: { "cpuid" = dontDistribute super."cpuid"; "cpuperf" = dontDistribute super."cpuperf"; "cpython" = dontDistribute super."cpython"; + "cql" = doDistribute super."cql_3_0_5"; "cqrs" = dontDistribute super."cqrs"; "cqrs-core" = dontDistribute super."cqrs-core"; "cqrs-example" = dontDistribute super."cqrs-example"; @@ -2270,6 +2277,7 @@ self: super: { "dataflow" = dontDistribute super."dataflow"; "datalog" = dontDistribute super."datalog"; "datapacker" = dontDistribute super."datapacker"; + "dataurl" = dontDistribute super."dataurl"; "date-cache" = dontDistribute super."date-cache"; "dates" = dontDistribute super."dates"; "datetime" = dontDistribute super."datetime"; @@ -2639,6 +2647,7 @@ self: super: { "eros-client" = dontDistribute super."eros-client"; "eros-http" = dontDistribute super."eros-http"; "errno" = dontDistribute super."errno"; + "error-analyze" = dontDistribute super."error-analyze"; "error-continuations" = dontDistribute super."error-continuations"; "error-list" = dontDistribute super."error-list"; "error-loc" = dontDistribute super."error-loc"; @@ -2663,6 +2672,7 @@ self: super: { "euler" = dontDistribute super."euler"; "euphoria" = dontDistribute super."euphoria"; "eurofxref" = dontDistribute super."eurofxref"; + "event" = doDistribute super."event_0_1_2"; "event-driven" = dontDistribute super."event-driven"; "event-handlers" = dontDistribute super."event-handlers"; "event-list" = dontDistribute super."event-list"; @@ -2686,6 +2696,7 @@ self: super: { "exinst-deepseq" = dontDistribute super."exinst-deepseq"; "exinst-hashable" = dontDistribute super."exinst-hashable"; "exists" = dontDistribute super."exists"; + "exit-codes" = dontDistribute super."exit-codes"; "exp-pairs" = dontDistribute super."exp-pairs"; "expand" = dontDistribute super."expand"; "expat-enumerator" = dontDistribute super."expat-enumerator"; @@ -2788,6 +2799,7 @@ self: super: { "find-conduit" = dontDistribute super."find-conduit"; "fingertree-tf" = dontDistribute super."fingertree-tf"; "finite-field" = dontDistribute super."finite-field"; + "finite-typelits" = dontDistribute super."finite-typelits"; "first-and-last" = dontDistribute super."first-and-last"; "first-class-patterns" = dontDistribute super."first-class-patterns"; "firstify" = dontDistribute super."firstify"; @@ -3055,17 +3067,33 @@ self: super: { "ghclive" = dontDistribute super."ghclive"; "ghczdecode" = dontDistribute super."ghczdecode"; "ght" = dontDistribute super."ght"; + "gi-atk" = dontDistribute super."gi-atk"; + "gi-cairo" = dontDistribute super."gi-cairo"; + "gi-gdk" = dontDistribute super."gi-gdk"; + "gi-gdkpixbuf" = dontDistribute super."gi-gdkpixbuf"; + "gi-gio" = dontDistribute super."gi-gio"; + "gi-glib" = dontDistribute super."gi-glib"; + "gi-gobject" = dontDistribute super."gi-gobject"; + "gi-gtk" = dontDistribute super."gi-gtk"; + "gi-javascriptcore" = dontDistribute super."gi-javascriptcore"; + "gi-notify" = dontDistribute super."gi-notify"; + "gi-pango" = dontDistribute super."gi-pango"; + "gi-soup" = dontDistribute super."gi-soup"; + "gi-vte" = dontDistribute super."gi-vte"; + "gi-webkit" = dontDistribute super."gi-webkit"; "gimlh" = dontDistribute super."gimlh"; "ginger" = dontDistribute super."ginger"; "ginsu" = dontDistribute super."ginsu"; "gipeda" = doDistribute super."gipeda_0_1_2_1"; "gist" = dontDistribute super."gist"; "git-all" = dontDistribute super."git-all"; + "git-annex" = doDistribute super."git-annex_5_20150727"; "git-checklist" = dontDistribute super."git-checklist"; "git-date" = dontDistribute super."git-date"; "git-embed" = dontDistribute super."git-embed"; "git-freq" = dontDistribute super."git-freq"; "git-gpush" = dontDistribute super."git-gpush"; + "git-jump" = dontDistribute super."git-jump"; "git-monitor" = dontDistribute super."git-monitor"; "git-object" = dontDistribute super."git-object"; "git-repair" = dontDistribute super."git-repair"; @@ -3524,6 +3552,8 @@ self: super: { "haskell-formatter" = dontDistribute super."haskell-formatter"; "haskell-ftp" = dontDistribute super."haskell-ftp"; "haskell-generate" = dontDistribute super."haskell-generate"; + "haskell-gi" = dontDistribute super."haskell-gi"; + "haskell-gi-base" = dontDistribute super."haskell-gi-base"; "haskell-import-graph" = dontDistribute super."haskell-import-graph"; "haskell-in-space" = dontDistribute super."haskell-in-space"; "haskell-modbus" = dontDistribute super."haskell-modbus"; @@ -3710,9 +3740,11 @@ self: super: { "hfann" = dontDistribute super."hfann"; "hfd" = dontDistribute super."hfd"; "hfiar" = dontDistribute super."hfiar"; + "hfmt" = dontDistribute super."hfmt"; "hfoil" = dontDistribute super."hfoil"; "hfov" = dontDistribute super."hfov"; "hfractal" = dontDistribute super."hfractal"; + "hfsevents" = doDistribute super."hfsevents_0_1_5"; "hfusion" = dontDistribute super."hfusion"; "hg-buildpackage" = dontDistribute super."hg-buildpackage"; "hgal" = dontDistribute super."hgal"; @@ -4103,6 +4135,7 @@ self: super: { "hsx2hs" = dontDistribute super."hsx2hs"; "hsyscall" = dontDistribute super."hsyscall"; "hszephyr" = dontDistribute super."hszephyr"; + "htaglib" = dontDistribute super."htaglib"; "htags" = dontDistribute super."htags"; "htar" = dontDistribute super."htar"; "htiled" = dontDistribute super."htiled"; @@ -4497,6 +4530,7 @@ self: super: { "keera-hails-reactive-polling" = dontDistribute super."keera-hails-reactive-polling"; "keera-hails-reactive-wx" = dontDistribute super."keera-hails-reactive-wx"; "keera-hails-reactive-yampa" = dontDistribute super."keera-hails-reactive-yampa"; + "keera-hails-reactivelenses" = dontDistribute super."keera-hails-reactivelenses"; "keera-hails-reactivevalues" = dontDistribute super."keera-hails-reactivevalues"; "keera-posture" = dontDistribute super."keera-posture"; "keiretsu" = dontDistribute super."keiretsu"; @@ -4601,6 +4635,8 @@ self: super: { "lat" = dontDistribute super."lat"; "latest-npm-version" = dontDistribute super."latest-npm-version"; "latex" = dontDistribute super."latex"; + "latex-formulae-image" = dontDistribute super."latex-formulae-image"; + "latex-formulae-pandoc" = dontDistribute super."latex-formulae-pandoc"; "lattices" = doDistribute super."lattices_1_3"; "launchpad-control" = dontDistribute super."launchpad-control"; "lax" = dontDistribute super."lax"; @@ -4629,6 +4665,7 @@ self: super: { "leksah" = dontDistribute super."leksah"; "leksah-server" = dontDistribute super."leksah-server"; "lendingclub" = dontDistribute super."lendingclub"; + "lens-action" = doDistribute super."lens-action_0_2_0_1"; "lens-datetime" = dontDistribute super."lens-datetime"; "lens-prelude" = dontDistribute super."lens-prelude"; "lens-properties" = dontDistribute super."lens-properties"; @@ -4932,6 +4969,7 @@ self: super: { "memexml" = dontDistribute super."memexml"; "memo-ptr" = dontDistribute super."memo-ptr"; "memo-sqlite" = dontDistribute super."memo-sqlite"; + "memoization-utils" = dontDistribute super."memoization-utils"; "memory" = doDistribute super."memory_0_7"; "memscript" = dontDistribute super."memscript"; "mersenne-random" = dontDistribute super."mersenne-random"; @@ -5326,6 +5364,7 @@ self: super: { "nthable" = dontDistribute super."nthable"; "ntp-control" = dontDistribute super."ntp-control"; "null-canvas" = dontDistribute super."null-canvas"; + "nullary" = dontDistribute super."nullary"; "number" = dontDistribute super."number"; "numbering" = dontDistribute super."numbering"; "numerals" = dontDistribute super."numerals"; @@ -5536,6 +5575,7 @@ self: super: { "pcg-random" = dontDistribute super."pcg-random"; "pcre-heavy" = doDistribute super."pcre-heavy_0_2_5"; "pcre-less" = dontDistribute super."pcre-less"; + "pcre-light" = doDistribute super."pcre-light_0_4_0_3"; "pcre-light-extra" = dontDistribute super."pcre-light-extra"; "pcre-utils" = dontDistribute super."pcre-utils"; "pdf-toolbox-content" = dontDistribute super."pdf-toolbox-content"; @@ -5874,6 +5914,7 @@ self: super: { "qc-oi-testgenerator" = dontDistribute super."qc-oi-testgenerator"; "qd" = dontDistribute super."qd"; "qd-vec" = dontDistribute super."qd-vec"; + "qed" = dontDistribute super."qed"; "qhull-simple" = dontDistribute super."qhull-simple"; "qrcode" = dontDistribute super."qrcode"; "qt" = dontDistribute super."qt"; @@ -5888,6 +5929,7 @@ self: super: { "queue" = dontDistribute super."queue"; "queuelike" = dontDistribute super."queuelike"; "quick-generator" = dontDistribute super."quick-generator"; + "quick-schema" = dontDistribute super."quick-schema"; "quickcheck-poly" = dontDistribute super."quickcheck-poly"; "quickcheck-properties" = dontDistribute super."quickcheck-properties"; "quickcheck-property-comb" = dontDistribute super."quickcheck-property-comb"; @@ -6357,6 +6399,7 @@ self: super: { "servant" = doDistribute super."servant_0_4_4_4"; "servant-JuicyPixels" = doDistribute super."servant-JuicyPixels_0_1_0_0"; "servant-blaze" = dontDistribute super."servant-blaze"; + "servant-cassava" = dontDistribute super."servant-cassava"; "servant-client" = doDistribute super."servant-client_0_4_4_4"; "servant-docs" = doDistribute super."servant-docs_0_4_4_4"; "servant-ede" = dontDistribute super."servant-ede"; @@ -6369,6 +6412,7 @@ self: super: { "servant-response" = dontDistribute super."servant-response"; "servant-scotty" = dontDistribute super."servant-scotty"; "servant-server" = doDistribute super."servant-server_0_4_4_4"; + "servant-swagger" = dontDistribute super."servant-swagger"; "servant-yaml" = dontDistribute super."servant-yaml"; "servius" = dontDistribute super."servius"; "ses-html" = dontDistribute super."ses-html"; @@ -6881,6 +6925,7 @@ self: super: { "tag-bits" = dontDistribute super."tag-bits"; "tag-stream" = dontDistribute super."tag-stream"; "tagchup" = dontDistribute super."tagchup"; + "tagged" = doDistribute super."tagged_0_8_1"; "tagged-exception-core" = dontDistribute super."tagged-exception-core"; "tagged-list" = dontDistribute super."tagged-list"; "tagged-th" = dontDistribute super."tagged-th"; @@ -6945,6 +6990,7 @@ self: super: { "tensor" = dontDistribute super."tensor"; "term-rewriting" = dontDistribute super."term-rewriting"; "termbox-bindings" = dontDistribute super."termbox-bindings"; + "terminal-size" = doDistribute super."terminal-size_0_3_2"; "termination-combinators" = dontDistribute super."termination-combinators"; "terminfo" = doDistribute super."terminfo_0_4_0_1"; "terminfo-hs" = dontDistribute super."terminfo-hs"; @@ -7009,6 +7055,7 @@ self: super: { "th-alpha" = dontDistribute super."th-alpha"; "th-build" = dontDistribute super."th-build"; "th-context" = dontDistribute super."th-context"; + "th-desugar" = doDistribute super."th-desugar_1_5_4_1"; "th-fold" = dontDistribute super."th-fold"; "th-inline-io-action" = dontDistribute super."th-inline-io-action"; "th-instance-reification" = dontDistribute super."th-instance-reification"; @@ -7443,6 +7490,7 @@ self: super: { "verdict" = dontDistribute super."verdict"; "verdict-json" = dontDistribute super."verdict-json"; "verilog" = dontDistribute super."verilog"; + "versions" = dontDistribute super."versions"; "vhdl" = dontDistribute super."vhdl"; "views" = dontDistribute super."views"; "vigilance" = dontDistribute super."vigilance"; @@ -7835,6 +7883,8 @@ self: super: { "zenc" = dontDistribute super."zenc"; "zendesk-api" = dontDistribute super."zendesk-api"; "zeno" = dontDistribute super."zeno"; + "zero" = doDistribute super."zero_0_1_3"; + "zerobin" = dontDistribute super."zerobin"; "zeromq-haskell" = dontDistribute super."zeromq-haskell"; "zeromq3-conduit" = dontDistribute super."zeromq3-conduit"; "zeromq3-haskell" = dontDistribute super."zeromq3-haskell"; diff --git a/pkgs/development/haskell-modules/hackage-packages.nix b/pkgs/development/haskell-modules/hackage-packages.nix index 7e6ad2338f1c..d6890b42d313 100644 --- a/pkgs/development/haskell-modules/hackage-packages.nix +++ b/pkgs/development/haskell-modules/hackage-packages.nix @@ -17,6 +17,7 @@ self: { homepage = "http://darcs.wolfgang.jeltsch.info/haskell/3d-graphics-examples"; description = "Examples of 3D graphics programming with OpenGL"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = [ "i686-linux" "x86_64-linux" ]; }) {}; "3dmodels" = callPackage @@ -1328,6 +1329,7 @@ self: { homepage = "https://github.com/mchakravarty/BigPixel"; description = "Image editor for pixel art"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = [ "i686-linux" "x86_64-linux" ]; }) {}; "Binpack" = callPackage @@ -4754,23 +4756,6 @@ self: { }) {}; "Earley" = callPackage - ({ mkDerivation, base, ListLike, tasty, tasty-hunit - , tasty-quickcheck, unordered-containers - }: - mkDerivation { - pname = "Earley"; - version = "0.10.0"; - sha256 = "6e018d7465cc3c2f9b34a3dd53502e5bffdb62aaf1e70da71065d175f7cf3e09"; - isLibrary = true; - isExecutable = true; - libraryHaskellDepends = [ base ListLike ]; - executableHaskellDepends = [ base unordered-containers ]; - testHaskellDepends = [ base tasty tasty-hunit tasty-quickcheck ]; - description = "Parsing all context-free grammars using Earley's algorithm"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "Earley_0_10_0_1" = callPackage ({ mkDerivation, base, ListLike, tasty, tasty-hunit , tasty-quickcheck, unordered-containers }: @@ -4785,7 +4770,6 @@ self: { testHaskellDepends = [ base tasty tasty-hunit tasty-quickcheck ]; description = "Parsing all context-free grammars using Earley's algorithm"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "Ebnf2ps" = callPackage @@ -5953,6 +5937,7 @@ self: { homepage = "http://joyful.com/fungen"; description = "A lightweight, cross-platform, OpenGL/GLUT-based game engine"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = [ "i686-linux" "x86_64-linux" ]; }) {}; "Fungi" = callPackage @@ -6026,6 +6011,7 @@ self: { homepage = "http://haskell.org/haskellwiki/GLFW"; description = "A Haskell binding for GLFW"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = [ "i686-linux" "x86_64-linux" ]; }) {inherit (pkgs.xorg) libX11; inherit (pkgs) mesa;}; "GLFW-OGL" = callPackage @@ -6057,6 +6043,7 @@ self: { doCheck = false; description = "Bindings to GLFW OpenGL library"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = [ "i686-linux" "x86_64-linux" ]; }) {}; "GLFW-b-demo" = callPackage @@ -6075,6 +6062,7 @@ self: { jailbreak = true; description = "GLFW-b demo"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = [ "i686-linux" "x86_64-linux" ]; }) {}; "GLFW-task" = callPackage @@ -6090,6 +6078,7 @@ self: { homepage = "http://github.com/ninegua/GLFW-task"; description = "GLFW utility functions to use together with monad-task"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = [ "i686-linux" "x86_64-linux" ]; }) {}; "GLHUI" = callPackage @@ -6102,6 +6091,7 @@ self: { librarySystemDepends = [ libX11 mesa ]; description = "Open OpenGL context windows in X11 with libX11"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = [ "i686-linux" "x86_64-linux" ]; }) {inherit (pkgs.xorg) libX11; inherit (pkgs) mesa;}; "GLM" = callPackage @@ -6216,6 +6206,7 @@ self: { homepage = "http://www.haskell.org/haskellwiki/Opengl"; description = "A raw binding for the OpenGL graphics system"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = [ "i686-linux" "x86_64-linux" ]; }) {inherit (pkgs) freeglut; inherit (pkgs) mesa;}; "GLUT_2_5_1_1" = callPackage @@ -6289,6 +6280,7 @@ self: { homepage = "http://www.haskell.org/haskellwiki/Opengl"; description = "A binding for the OpenGL Utility Toolkit"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = [ "i686-linux" "x86_64-linux" ]; }) {inherit (pkgs) freeglut; inherit (pkgs) mesa;}; "GLUtil" = callPackage @@ -6306,6 +6298,7 @@ self: { ]; description = "Miscellaneous OpenGL utilities"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = [ "i686-linux" "x86_64-linux" ]; }) {}; "GPX" = callPackage @@ -6328,23 +6321,6 @@ self: { }) {}; "GPipe" = callPackage - ({ mkDerivation, base, Boolean, containers, exception-transformers - , gl, hashtables, linear, transformers - }: - mkDerivation { - pname = "GPipe"; - version = "2.1.2"; - sha256 = "44efc37ca3adf9457dfa07a46e10ff7887d004a887dd403b874549f296982888"; - libraryHaskellDepends = [ - base Boolean containers exception-transformers gl hashtables linear - transformers - ]; - homepage = "http://tobbebex.blogspot.se/"; - description = "Typesafe functional GPU graphics programming"; - license = stdenv.lib.licenses.mit; - }) {}; - - "GPipe_2_1_3" = callPackage ({ mkDerivation, base, Boolean, containers, exception-transformers , gl, hashtables, linear, transformers }: @@ -6359,7 +6335,6 @@ self: { homepage = "http://tobbebex.blogspot.se/"; description = "Typesafe functional GPU graphics programming"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "GPipe-Collada" = callPackage @@ -6406,6 +6381,7 @@ self: { homepage = "https://github.com/plredmond/GPipe-GLFW"; description = "GLFW OpenGL context creation for GPipe"; license = stdenv.lib.licenses.mit; + hydraPlatforms = [ "i686-linux" "x86_64-linux" ]; }) {}; "GPipe-TextureLoad" = callPackage @@ -6460,6 +6436,7 @@ self: { jailbreak = true; description = "Some kind of game library or set of utilities"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = [ "i686-linux" "x86_64-linux" ]; }) {}; "Ganymede" = callPackage @@ -9510,6 +9487,23 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "HaskRel" = callPackage + ({ mkDerivation, base, containers, directory, ghc-prim, HList, lens + , tagged + }: + mkDerivation { + pname = "HaskRel"; + version = "0.1.0.0"; + sha256 = "6e15acca665e82e9eb757ac7d648284372a62f2faa563fa81da386d8cbc9d5f8"; + revision = "2"; + editedCabalFile = "7366533c524f20f57e05df8c7299156bbc1b302ad2885fe3522ba6bea1680de1"; + libraryHaskellDepends = [ + base containers directory ghc-prim HList lens tagged + ]; + description = "HaskRel, Haskell as a DBMS with support for the relational algebra"; + license = stdenv.lib.licenses.gpl2; + }) {}; + "HaskellForMaths" = callPackage ({ mkDerivation, array, base, containers, random }: mkDerivation { @@ -9865,6 +9859,7 @@ self: { homepage = "https://github.com/meteficha/Hipmunk"; description = "A Haskell binding for Chipmunk"; license = "unknown"; + hydraPlatforms = [ "i686-linux" "x86_64-linux" ]; }) {}; "HipmunkPlayground" = callPackage @@ -9884,6 +9879,7 @@ self: { homepage = "https://github.com/meteficha/HipmunkPlayground"; description = "A playground for testing Hipmunk"; license = "unknown"; + hydraPlatforms = [ "i686-linux" "x86_64-linux" ]; }) {}; "Hish" = callPackage @@ -10358,6 +10354,24 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "HulkImport" = callPackage + ({ mkDerivation, attoparsec, base, pretty, tasty, tasty-golden + , text + }: + mkDerivation { + pname = "HulkImport"; + version = "0.1.0.2"; + sha256 = "41fd2d9fb6b474298421fbe5d951585fb9bf6a3501892570b107ad2b6f5ba1e4"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ attoparsec base pretty text ]; + executableHaskellDepends = [ base text ]; + testHaskellDepends = [ base tasty tasty-golden ]; + homepage = "http://github.com/tobs169/HulkImport#readme"; + description = "Easily bulk import CSV data to SQL Server"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "Hungarian-Munkres" = callPackage ({ mkDerivation, array, base, Munkres, random, tasty , tasty-quickcheck @@ -11031,7 +11045,7 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; - "JuicyPixels" = callPackage + "JuicyPixels_3_2_6_1" = callPackage ({ mkDerivation, base, binary, bytestring, containers, deepseq, mtl , primitive, transformers, vector, zlib }: @@ -11046,9 +11060,10 @@ self: { homepage = "https://github.com/Twinside/Juicy.Pixels"; description = "Picture loading/serialization (in png, jpeg, bitmap, gif, tga, tiff and radiance)"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; - "JuicyPixels_3_2_6_2" = callPackage + "JuicyPixels" = callPackage ({ mkDerivation, base, binary, bytestring, containers, deepseq, mtl , primitive, transformers, vector, zlib }: @@ -11063,7 +11078,6 @@ self: { homepage = "https://github.com/Twinside/Juicy.Pixels"; description = "Picture loading/serialization (in png, jpeg, bitmap, gif, tga, tiff and radiance)"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "JuicyPixels-canvas" = callPackage @@ -11646,6 +11660,7 @@ self: { homepage = "http://quasimal.com/projects/level_0.html"; description = "A Snake II clone written using SDL"; license = stdenv.lib.licenses.gpl3; + hydraPlatforms = [ "i686-linux" "x86_64-linux" ]; }) {}; "LibClang" = callPackage @@ -12336,6 +12351,7 @@ self: { ]; description = "OpenGL for dummies"; license = stdenv.lib.licenses.mit; + hydraPlatforms = [ "i686-linux" "x86_64-linux" ]; }) {}; "MicrosoftTranslator" = callPackage @@ -12466,6 +12482,7 @@ self: { executableHaskellDepends = [ base GLUT random ]; description = "A FRP library based on signal functions"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = [ "i686-linux" "x86_64-linux" ]; }) {}; "MoeDict" = callPackage @@ -13677,6 +13694,7 @@ self: { homepage = "http://www.gekkou.co.uk/"; description = "Provides a wrapper for deriving word types with fewer bits"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = [ "x86_64-darwin" "x86_64-linux" ]; }) {}; "Omega" = callPackage @@ -13873,6 +13891,7 @@ self: { homepage = "http://www.haskell.org/haskellwiki/Opengl"; description = "A binding for the OpenGL graphics system"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = [ "i686-linux" "x86_64-linux" ]; }) {}; "OpenGLCheck" = callPackage @@ -14541,16 +14560,16 @@ self: { }: mkDerivation { pname = "Plot-ho-matic"; - version = "0.5.0.5"; - sha256 = "e38dd7fc405384ccd085b939aa376801b9d9338e46ceda090e4b7a64c6c11575"; + version = "0.6.0.0"; + sha256 = "b78ef18527546825ba965ae6373b6d999a2ba7140b64517869273619abaaf73b"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ base cairo Chart Chart-cairo containers data-default-class generic-accessors glib gtk lens text time ]; - executableHaskellDepends = [ base containers ]; - description = "Real-time line plotter for protobuf-like data"; + executableHaskellDepends = [ base containers generic-accessors ]; + description = "Real-time line plotter for generic data"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; }) {}; @@ -14597,6 +14616,7 @@ self: { executableHaskellDepends = [ array base clock GLUT random ]; description = "An imaginary world"; license = "GPL"; + hydraPlatforms = [ "i686-linux" "x86_64-linux" ]; }) {}; "PortFusion" = callPackage @@ -15460,6 +15480,7 @@ self: { homepage = "http://hub.darcs.net/martingw/Rasenschach"; description = "Soccer simulation"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = [ "i686-linux" "x86_64-linux" ]; }) {}; "Rasterific_0_4" = callPackage @@ -15875,6 +15896,7 @@ self: { librarySystemDepends = [ SDL ]; description = "Binding to libSDL"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = [ "i686-linux" "x86_64-linux" ]; }) {inherit (pkgs) SDL;}; "SDL-gfx" = callPackage @@ -15886,6 +15908,7 @@ self: { libraryHaskellDepends = [ base SDL ]; description = "Binding to libSDL_gfx"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = [ "i686-linux" "x86_64-linux" ]; }) {}; "SDL-image" = callPackage @@ -15897,21 +15920,21 @@ self: { libraryHaskellDepends = [ base SDL ]; description = "Binding to libSDL_image"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = [ "i686-linux" "x86_64-linux" ]; }) {}; "SDL-mixer" = callPackage - ({ mkDerivation, base, SDL }: + ({ mkDerivation, base, SDL, SDL_mixer }: mkDerivation { pname = "SDL-mixer"; - version = "0.6.1.1"; - sha256 = "5ff4e4b795aa04a8979610c88d2be948b4b1c69b83d0a3d2ea359d0ed110a355"; - revision = "1"; - editedCabalFile = "53f7f1e750f01e8095a95548c76a8ac1fef8298aa197dbc08bf82e939a4bbe64"; + version = "0.6.2.0"; + sha256 = "1969170ee9d20811697f1f3d3150d388d45a809ea3d72495980da0968e5719ba"; libraryHaskellDepends = [ base SDL ]; + librarySystemDepends = [ SDL_mixer ]; description = "Binding to libSDL_mixer"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = [ "i686-linux" "x86_64-linux" ]; - }) {}; + }) {inherit (pkgs) SDL_mixer;}; "SDL-mpeg" = callPackage ({ mkDerivation, base, SDL, smpeg }: @@ -15923,6 +15946,7 @@ self: { librarySystemDepends = [ smpeg ]; description = "Binding to the SMPEG library"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = [ "i686-linux" "x86_64-linux" ]; }) {inherit (pkgs) smpeg;}; "SDL-ttf" = callPackage @@ -15934,6 +15958,7 @@ self: { libraryHaskellDepends = [ base SDL ]; description = "Binding to libSDL_ttf"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = [ "i686-linux" "x86_64-linux" ]; }) {}; "SDL2-ttf" = callPackage @@ -16567,6 +16592,7 @@ self: { homepage = "http://www.geocities.jp/takascience/index_en.html"; description = "A vector shooter game"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = [ "i686-linux" "x86_64-linux" ]; }) {}; "SimpleAES" = callPackage @@ -18228,6 +18254,7 @@ self: { homepage = "http://haskell.cs.yale.edu/"; description = "Library for Arrowized Graphical User Interfaces"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = [ "i686-linux" "x86_64-linux" ]; }) {}; "UMM" = callPackage @@ -18350,6 +18377,7 @@ self: { homepage = "http://src.seereason.com/haskell-unixutils-shadow"; description = "A simple interface to shadow passwords (aka, shadow.h)"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = [ "i686-linux" "x86_64-linux" ]; }) {}; "Updater" = callPackage @@ -18658,6 +18686,7 @@ self: { ]; description = "Parsers and utilities for the OBJ WaveFront 3D model format"; license = stdenv.lib.licenses.mit; + hydraPlatforms = [ "i686-linux" "x86_64-linux" ]; }) {}; "Weather" = callPackage @@ -18972,6 +19001,7 @@ self: { homepage = "http://www.cse.chalmers.se/~emax/wired/"; description = "Wire-aware hardware description"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = [ "i686-linux" "x86_64-linux" ]; }) {}; "WordNet" = callPackage @@ -19066,6 +19096,7 @@ self: { homepage = "http://www.haskell.org/haskellwiki/WxGeneric"; description = "Generic (SYB3) construction of wxHaskell widgets"; license = "LGPL"; + hydraPlatforms = [ "i686-linux" "x86_64-linux" ]; }) {}; "X11" = callPackage @@ -19688,6 +19719,7 @@ self: { homepage = "https://github.com/pa-ba/abc-puzzle"; description = "Generate instances of the ABC Logic Puzzle"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = [ "i686-linux" "x86_64-linux" ]; }) {}; "abcBridge" = callPackage @@ -21909,6 +21941,23 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "agda-snippets" = callPackage + ({ mkDerivation, Agda, base, containers, mtl, network-uri, xhtml }: + mkDerivation { + pname = "agda-snippets"; + version = "2.4.2.4"; + sha256 = "c1bba563fe1c2ecceaa21545565ad2678675682ed97518c2c2bebde8692963c0"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + Agda base containers mtl network-uri xhtml + ]; + executableHaskellDepends = [ Agda base network-uri ]; + homepage = "http://github.com/liamoc/agda-snippets#readme"; + description = "Render just the Agda snippets of a literate Agda file to HTML"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "agentx" = callPackage ({ mkDerivation, base, binary, bitwise, bytestring, containers , data-default, Diff, fclabels, mtl, network, pipes @@ -27991,8 +28040,8 @@ self: { }: mkDerivation { pname = "argon"; - version = "0.3.1.2"; - sha256 = "b809458adf9d811e549d09a356e9f33281922f5552799add60a852131d5f30eb"; + version = "0.3.2.0"; + sha256 = "5cd7e3b493dd7b4739126b466efbd08addd8e6beb750a5c0a29bb9e874085e21"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -28010,6 +28059,35 @@ self: { license = stdenv.lib.licenses.isc; }) {}; + "argon_0_4_0_0" = callPackage + ({ mkDerivation, aeson, ansi-terminal, base, bytestring, Cabal + , containers, directory, docopt, filepath, ghc, ghc-paths + , ghc-syb-utils, hlint, hspec, lens-simple, pathwalk, pipes + , pipes-group, QuickCheck, syb + }: + mkDerivation { + pname = "argon"; + version = "0.4.0.0"; + sha256 = "49cd357e23dc8aaf1d055bde5030ea12ed4e0b18edc4550a595028e26e582899"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + aeson ansi-terminal base bytestring Cabal containers directory + filepath ghc ghc-paths ghc-syb-utils lens-simple pathwalk pipes + pipes-group syb + ]; + executableHaskellDepends = [ base docopt pipes ]; + testHaskellDepends = [ + aeson ansi-terminal base bytestring Cabal containers directory + docopt filepath ghc ghc-paths ghc-syb-utils hlint hspec lens-simple + pathwalk pipes pipes-group QuickCheck syb + ]; + homepage = "http://github.com/rubik/argon"; + description = "Measure your code's complexity"; + license = stdenv.lib.licenses.isc; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "argparser" = callPackage ({ mkDerivation, base, containers, HTF, HUnit }: mkDerivation { @@ -29110,17 +29188,18 @@ self: { }) {}; "atmos" = callPackage - ({ mkDerivation, base, HUnit, test-framework, test-framework-hunit + ({ mkDerivation, base, dimensional, dimensional-tf, HUnit + , test-framework, test-framework-hunit }: mkDerivation { pname = "atmos"; - version = "0.2.0.0"; - sha256 = "666b33d5105c46feb5b40389643a79ccf7e3e070abdee5a90b5c76f59b51a563"; - libraryHaskellDepends = [ base ]; + version = "0.3.0.0"; + sha256 = "6d53dff23edae529d31084bcb9606ac0b2268c2b8664f693e9841af670883ed4"; + libraryHaskellDepends = [ base dimensional dimensional-tf ]; testHaskellDepends = [ base HUnit test-framework test-framework-hunit ]; - description = "1976 US Standard Atmosphere"; + description = "1976 US Standard Atmosphere Model"; license = stdenv.lib.licenses.publicDomain; }) {}; @@ -29255,6 +29334,7 @@ self: { homepage = "https://github.com/rrnewton/haskell-lockfree/wiki"; description = "An atomic counter implemented using the FFI"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = [ "i686-linux" "x86_64-linux" ]; }) {}; "atomic-primops-vector" = callPackage @@ -29777,8 +29857,8 @@ self: { }: mkDerivation { pname = "aur"; - version = "4.0.1"; - sha256 = "335e7779feb1ca331bca1004fb21f507c037975eb0fdd47fc8745f4029d7f0cf"; + version = "4.0.2"; + sha256 = "918c575536b17ce232e023b0c7e408f1c156a580cc770f78be2953190a465d8e"; libraryHaskellDepends = [ aeson aeson-pretty base filepath lens lens-aeson mtl text vector wreq @@ -30319,7 +30399,7 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; - "aws" = callPackage + "aws_0_12_1" = callPackage ({ mkDerivation, aeson, attoparsec, base, base16-bytestring , base64-bytestring, blaze-builder, byteable, bytestring , case-insensitive, cereal, conduit, conduit-extra, containers @@ -30356,9 +30436,10 @@ self: { homepage = "http://github.com/aristidb/aws"; description = "Amazon Web Services (AWS) for Haskell"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; - "aws_0_13_0" = callPackage + "aws" = callPackage ({ mkDerivation, aeson, attoparsec, base, base16-bytestring , base64-bytestring, blaze-builder, byteable, bytestring , case-insensitive, cereal, conduit, conduit-extra, containers @@ -30388,10 +30469,10 @@ self: { mtl QuickCheck quickcheck-instances resourcet tagged tasty tasty-quickcheck text time transformers transformers-base ]; + doCheck = false; homepage = "http://github.com/aristidb/aws"; description = "Amazon Web Services (AWS) for Haskell"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "aws-cloudfront-signer" = callPackage @@ -30445,6 +30526,7 @@ self: { aeson attoparsec-trans aws base bytestring conduit containers http-conduit http-types json-togo resourcet text transformers ]; + jailbreak = true; homepage = "https://github.com/srijs/haskell-aws-dynamodb-query"; description = "Conduit-based interface for AWS DynamoDB"; license = stdenv.lib.licenses.mit; @@ -31094,6 +31176,7 @@ self: { ]; description = "An implementation of a simple 2-player board game"; license = "GPL"; + hydraPlatforms = [ "i686-linux" "x86_64-linux" ]; }) {}; "backdropper" = callPackage @@ -31861,6 +31944,7 @@ self: { homepage = "https://github.com/pxqr/base32-bytestring"; description = "Fast base32 and base32hex codec for ByteStrings"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = [ "i686-linux" "x86_64-linux" ]; }) {}; "base32string" = callPackage @@ -33223,6 +33307,8 @@ self: { pname = "binary-orphans"; version = "0.1.2.0"; sha256 = "7f83406c0b9c08df9d0d731f9616333f74422d5559fa1b1dc7c56aaf415605ab"; + revision = "1"; + editedCabalFile = "59c5a80316379f3d17a5b06e2ca47e04505c2dedc4bc0d06c7d2bfb9eb6c8661"; libraryHaskellDepends = [ aeson base binary hashable scientific tagged text text-binary time unordered-containers vector vector-binary-instances @@ -33533,6 +33619,7 @@ self: { homepage = "https://bitbucket.org/accursoft/binding"; description = "Data Binding in WxHaskell"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = [ "i686-linux" "x86_64-linux" ]; }) {}; "bindings" = callPackage @@ -33618,6 +33705,7 @@ self: { doCheck = false; description = "Low-level bindings to GLFW OpenGL library"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = [ "i686-linux" "x86_64-linux" ]; }) {inherit (pkgs.xorg) libX11; inherit (pkgs.xorg) libXcursor; inherit (pkgs.xorg) libXext; inherit (pkgs.xorg) libXfixes; inherit (pkgs.xorg) libXi; inherit (pkgs.xorg) libXinerama; @@ -33679,6 +33767,7 @@ self: { homepage = "http://cielonegro.org/Bindings-AudioFile.html"; description = "Low level bindings to audiofile"; license = stdenv.lib.licenses.publicDomain; + hydraPlatforms = [ "i686-linux" "x86_64-linux" ]; }) {inherit (pkgs) audiofile;}; "bindings-bfd" = callPackage @@ -33814,6 +33903,7 @@ self: { homepage = "http://github.com/bgamari/bindings-fluidsynth"; description = "Haskell FFI bindings for fluidsynth software synthesizer"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = [ "i686-linux" "x86_64-linux" ]; }) {inherit (pkgs) fluidsynth;}; "bindings-friso" = callPackage @@ -33945,6 +34035,7 @@ self: { homepage = "http://bitbucket.org/mauricio/bindings-libcddb"; description = "Low level binding to libcddb"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = [ "i686-linux" "x86_64-linux" ]; }) {inherit (pkgs) libcddb;}; "bindings-libffi" = callPackage @@ -34135,6 +34226,7 @@ self: { libraryPkgconfigDepends = [ portaudio ]; description = "Low-level bindings to portaudio library"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = [ "i686-linux" "x86_64-linux" ]; }) {inherit (pkgs) portaudio;}; "bindings-posix" = callPackage @@ -34170,6 +34262,7 @@ self: { libraryHaskellDepends = [ base bindings-DSL ioctl ]; description = "PPDev bindings"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = [ "i686-linux" "x86_64-linux" ]; }) {}; "bindings-saga-cmd" = callPackage @@ -34271,6 +34364,7 @@ self: { homepage = "http://github.com/tanimoto/bindings-svm"; description = "Low level bindings to libsvm"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = [ "i686-linux" "x86_64-linux" ]; }) {}; "bindings-uname" = callPackage @@ -34343,6 +34437,7 @@ self: { homepage = "http://code.mathr.co.uk/binembed"; description = "Example project using binembed to embed data in object files"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = [ "i686-linux" "x86_64-linux" ]; }) {}; "bio" = callPackage @@ -34810,6 +34905,7 @@ self: { homepage = "http://code.haskell.org/~bkomuves/"; description = "OpenGL support for Data.Bitmap."; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = [ "i686-linux" "x86_64-linux" ]; }) {}; "bitmaps" = callPackage @@ -34885,6 +34981,7 @@ self: { librarySystemDepends = [ gcc_s ]; description = "Efficient high-level bit operations not found in Data.Bits"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = [ "i686-linux" "x86_64-linux" ]; }) {gcc_s = null;}; "bitset" = callPackage @@ -34906,7 +35003,7 @@ self: { "bitspeak" = callPackage ({ mkDerivation, base, bindings-DSL, bindings-glib - , bindings-gobject, gtk, pango + , bindings-gobject, gdk2, gtk, pango }: mkDerivation { pname = "bitspeak"; @@ -34917,12 +35014,13 @@ self: { executableHaskellDepends = [ base bindings-DSL bindings-glib bindings-gobject ]; - executablePkgconfigDepends = [ gtk pango ]; + executablePkgconfigDepends = [ gdk2 gtk pango ]; jailbreak = true; description = "Proof-of-concept tool for writing using binary choices"; license = "GPL"; hydraPlatforms = stdenv.lib.platforms.none; - }) {inherit (pkgs.gnome) gtk; inherit (pkgs.gnome) pango;}; + }) {gdk2 = null; inherit (pkgs.gnome) gtk; + inherit (pkgs.gnome) pango;}; "bitstream" = callPackage ({ mkDerivation, base, base-unicode-symbols, bytestring, QuickCheck @@ -36033,6 +36131,7 @@ self: { executableHaskellDepends = [ base GLFW OpenGL ]; description = "OpenGL Logic Game"; license = "GPL"; + hydraPlatforms = [ "i686-linux" "x86_64-linux" ]; }) {}; "blubber" = callPackage @@ -36051,6 +36150,7 @@ self: { homepage = "https://secure.plaimi.net/games/blubber.html"; description = "The blubber client; connects to the blubber server"; license = stdenv.lib.licenses.gpl3; + hydraPlatforms = [ "i686-linux" "x86_64-linux" ]; }) {}; "blubber-server" = callPackage @@ -36884,6 +36984,7 @@ self: { homepage = "https://github.com/redneb/hs-btrfs"; description = "Bindings to the btrfs API"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = [ "i686-linux" "x86_64-linux" ]; }) {}; "buffer-builder" = callPackage @@ -36917,8 +37018,10 @@ self: { }: mkDerivation { pname = "buffer-builder-aeson"; - version = "0.2.0.3"; - sha256 = "17257cba865dd09e49e287115e226be1cfc549713501f4cc57a89a0078d91245"; + version = "0.2.0.4"; + sha256 = "7aa47be52be4a264bbbabc38a1d51f24b3176e32263a6e795daa96d12f545c4e"; + revision = "1"; + editedCabalFile = "09657c97cf5ad79da78f230540398a9a99a8bb6cd99bba89a24d741372444b84"; libraryHaskellDepends = [ aeson base buffer-builder bytestring integer-gmp scientific unordered-containers vector @@ -36928,7 +37031,6 @@ self: { QuickCheck scientific tasty tasty-hunit tasty-quickcheck tasty-th text unordered-containers vector ]; - jailbreak = true; description = "Serialize Aeson values with Data.BufferBuilder"; license = stdenv.lib.licenses.mit; hydraPlatforms = [ "x86_64-darwin" "x86_64-linux" ]; @@ -39501,6 +39603,28 @@ self: { license = stdenv.lib.licenses.publicDomain; }) {}; + "cacophony_0_2_0" = callPackage + ({ mkDerivation, base, bytestring, cryptonite, directory, doctest + , filepath, hlint, lens, memory, mtl, QuickCheck, tasty + , tasty-quickcheck + }: + mkDerivation { + pname = "cacophony"; + version = "0.2.0"; + sha256 = "5825a01a93e959e1da25d095e1b79c28f44abfba3e8fbc3eefac21423f953bb5"; + libraryHaskellDepends = [ + base bytestring cryptonite lens memory mtl + ]; + testHaskellDepends = [ + base bytestring directory doctest filepath hlint mtl QuickCheck + tasty tasty-quickcheck + ]; + homepage = "https://github.com/centromere/cacophony"; + description = "A library implementing the Noise protocol"; + license = stdenv.lib.licenses.publicDomain; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "caf" = callPackage ({ mkDerivation, base }: mkDerivation { @@ -40027,8 +40151,8 @@ self: { }: mkDerivation { pname = "car-pool"; - version = "0.0.0.1"; - sha256 = "91428f7fb6f056227281d510777a0f55ac8adc5181ccdeddb5af2c862333ee24"; + version = "0.0.1"; + sha256 = "30aaf499ee387edfc52256638077f190b9fbbbdee3efb53da166d61e2d26c7f8"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -40037,7 +40161,6 @@ self: { explicit-exception happstack-server non-empty spreadsheet text transformers utility-ht ]; - jailbreak = true; homepage = "http://hub.darcs.net/thielema/car-pool/"; description = "Simple web-server for organizing car-pooling for an event"; license = stdenv.lib.licenses.bsd3; @@ -40109,15 +40232,17 @@ self: { }) {}; "carray" = callPackage - ({ mkDerivation, array, base, binary, bytestring, ix-shapable, syb + ({ mkDerivation, array, base, binary, ix-shapable, QuickCheck, syb }: mkDerivation { pname = "carray"; - version = "0.1.5.2"; - sha256 = "60b9e7261d7887ee2f49a3d7629774a14be3b57da1be259c94d7c2aaacec584e"; + version = "0.1.6"; + sha256 = "5999fb2985be337b0d8a823c513bc59847dd025869d818a7546cf7f76be342b0"; libraryHaskellDepends = [ - array base binary bytestring ix-shapable syb + array base binary ix-shapable QuickCheck syb ]; + testHaskellDepends = [ array base ix-shapable QuickCheck ]; + jailbreak = true; description = "A C-compatible array library"; license = stdenv.lib.licenses.bsd3; }) {}; @@ -40175,8 +40300,8 @@ self: { }: mkDerivation { pname = "casadi-bindings"; - version = "2.4.1.2"; - sha256 = "ced56e7203c78207866f98ceae2a36a60fd8b01dd9e174dc35d0b19a915daaca"; + version = "2.4.1.3"; + sha256 = "0fd77702edacc58260f555cf77c8225662717cbf69f4f0755c0339ec754d8c48"; libraryHaskellDepends = [ base binary casadi-bindings-core casadi-bindings-internal cereal containers linear vector vector-binary-instances @@ -41123,6 +41248,27 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "cereal_0_5_0_0" = callPackage + ({ mkDerivation, array, base, bytestring, containers, ghc-prim + , QuickCheck, test-framework, test-framework-quickcheck2 + }: + mkDerivation { + pname = "cereal"; + version = "0.5.0.0"; + sha256 = "2c17fd0b8e72be4f32e148e18cd7190424aa631d11d6db8420bbb2faa0202a66"; + libraryHaskellDepends = [ + array base bytestring containers ghc-prim + ]; + testHaskellDepends = [ + base bytestring QuickCheck test-framework + test-framework-quickcheck2 + ]; + homepage = "https://github.com/GaloisInc/cereal"; + description = "A binary serialization library"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "cereal-conduit" = callPackage ({ mkDerivation, base, bytestring, cereal, conduit, HUnit, mtl , resourcet, transformers @@ -41606,6 +41752,7 @@ self: { homepage = "http://www.github.com/batterseapower/charsetdetect"; description = "Character set detection using Mozilla's Universal Character Set Detector"; license = "LGPL"; + hydraPlatforms = [ "i686-linux" "x86_64-linux" ]; }) {}; "charsetdetect-ae" = callPackage @@ -41618,6 +41765,7 @@ self: { homepage = "http://github.com/aelve/charsetdetect-ae"; description = "Character set detection using Mozilla's Universal Character Set Detector"; license = "LGPL"; + hydraPlatforms = [ "i686-linux" "x86_64-linux" ]; }) {}; "chart-histogram" = callPackage @@ -42407,6 +42555,21 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "ciphersaber2" = callPackage + ({ mkDerivation, array, base, bytestring, parseargs }: + mkDerivation { + pname = "ciphersaber2"; + version = "0.1.0.0"; + sha256 = "448fa27fa1a0888ac05f7572df88dea1073685a69b1bedb6b83f26fcd82f4dcf"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ array base bytestring ]; + executableHaskellDepends = [ array base bytestring parseargs ]; + homepage = "http://github.com/BartMassey/ciphersaber"; + description = "Implementation of CipherSaber2 RC4 cryptography"; + license = stdenv.lib.licenses.mit; + }) {}; + "circ" = callPackage ({ mkDerivation, base, directory, mtl }: mkDerivation { @@ -42535,6 +42698,7 @@ self: { homepage = "http://github.com/thoughtpolice/hs-cityhash"; description = "Bindings to CityHash"; license = stdenv.lib.licenses.mit; + hydraPlatforms = [ "i686-linux" "x86_64-linux" ]; }) {}; "cjk" = callPackage @@ -44265,6 +44429,7 @@ self: { homepage = "https://github.com/dfoxfranke/haskell-cld2"; description = "Haskell bindings to Google's Compact Language Detector 2"; license = stdenv.lib.licenses.asl20; + hydraPlatforms = [ "i686-linux" "x86_64-linux" ]; }) {}; "clean-home" = callPackage @@ -46717,16 +46882,16 @@ self: { }) {}; "concurrent-output" = callPackage - ({ mkDerivation, ansi-terminal, async, base, bytestring, directory - , exceptions, process, stm, terminal-size, text, transformers, unix + ({ mkDerivation, ansi-terminal, async, base, directory, exceptions + , process, stm, terminal-size, text, transformers, unix }: mkDerivation { pname = "concurrent-output"; - version = "1.1.0"; - sha256 = "3339267b1658769d6ad9c37e4c23e3931ebaf9d970334d85ffa4642f3081b2e1"; + version = "1.5.0"; + sha256 = "f64c08a30c78c177d67ccc52d9718eda72fa610774b3166ef9dd1e8c79af4464"; libraryHaskellDepends = [ - ansi-terminal async base bytestring directory exceptions process - stm terminal-size text transformers unix + ansi-terminal async base directory exceptions process stm + terminal-size text transformers unix ]; description = "Ungarble output from several threads"; license = stdenv.lib.licenses.bsd2; @@ -48200,6 +48365,7 @@ self: { homepage = "https://github.com/scrive/consumers"; description = "Concurrent PostgreSQL data consumers"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = [ "i686-linux" "x86_64-linux" ]; }) {}; "container-classes" = callPackage @@ -49872,7 +50038,7 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {python34 = null;}; - "cql" = callPackage + "cql_3_0_5" = callPackage ({ mkDerivation, base, bytestring, cereal, Decimal, iproute , network, QuickCheck, tasty, tasty-quickcheck, template-haskell , text, time, transformers, uuid, vector @@ -49892,6 +50058,29 @@ self: { homepage = "https://github.com/twittner/cql/"; description = "Cassandra CQL binary protocol"; license = stdenv.lib.licenses.mpl20; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + + "cql" = callPackage + ({ mkDerivation, base, bytestring, cereal, Decimal, iproute + , network, QuickCheck, tasty, tasty-quickcheck, template-haskell + , text, time, transformers, uuid, vector + }: + mkDerivation { + pname = "cql"; + version = "3.0.6"; + sha256 = "072dec36887b4d51023f056e987e0c30d89b55e98562c0658f01f9d52c959ed9"; + libraryHaskellDepends = [ + base bytestring cereal Decimal iproute network template-haskell + text time transformers uuid vector + ]; + testHaskellDepends = [ + base bytestring cereal Decimal iproute network QuickCheck tasty + tasty-quickcheck text time uuid + ]; + homepage = "https://github.com/twittner/cql/"; + description = "Cassandra CQL binary protocol"; + license = stdenv.lib.licenses.mpl20; }) {}; "cql-io" = callPackage @@ -51736,6 +51925,7 @@ self: { executableHaskellDepends = [ base GLUT Yampa ]; description = "3D Yampa/GLUT Puzzle Game"; license = stdenv.lib.licenses.mit; + hydraPlatforms = [ "i686-linux" "x86_64-linux" ]; }) {}; "cuda" = callPackage @@ -52091,6 +52281,7 @@ self: { homepage = "https://github.com/scvalex/daemons"; description = "Daemons in Haskell made fun and easy"; license = stdenv.lib.licenses.gpl3; + hydraPlatforms = [ "x86_64-darwin" "x86_64-linux" ]; }) {}; "dag" = callPackage @@ -53878,6 +54069,25 @@ self: { license = "GPL"; }) {}; + "dataurl" = callPackage + ({ mkDerivation, attoparsec, base, base64-bytestring, bytestring + , HTF, text + }: + mkDerivation { + pname = "dataurl"; + version = "0.1.0.0"; + sha256 = "b1e72b48dbe72520f0b43b06ae75cb025e9750213982583f527e16b605660fb2"; + libraryHaskellDepends = [ + attoparsec base base64-bytestring bytestring text + ]; + testHaskellDepends = [ + attoparsec base base64-bytestring bytestring HTF text + ]; + homepage = "http://github.com/agrafix/dataurl#readme"; + description = "Handle data-urls"; + license = stdenv.lib.licenses.mit; + }) {}; + "date-cache" = callPackage ({ mkDerivation, base, bytestring }: mkDerivation { @@ -55183,6 +55393,7 @@ self: { homepage = "https://github.com/kryoxide/delta"; description = "A library for detecting file changes"; license = stdenv.lib.licenses.gpl3; + hydraPlatforms = [ "i686-linux" "x86_64-linux" ]; }) {}; "delta-h" = callPackage @@ -55762,6 +55973,7 @@ self: { homepage = "https://github.com/luanzhu/devil"; description = "A small tool to make it easier to update program managed by Angel"; license = stdenv.lib.licenses.mit; + hydraPlatforms = [ "i686-linux" "x86_64-linux" ]; }) {}; "dewdrop" = callPackage @@ -59263,7 +59475,7 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; - "distributed-static" = callPackage + "distributed-static_0_3_2_0" = callPackage ({ mkDerivation, base, binary, bytestring, containers, deepseq , rank1dynamic }: @@ -59277,6 +59489,23 @@ self: { homepage = "http://haskell-distributed.github.com"; description = "Compositional, type-safe, polymorphic static values and closures"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + + "distributed-static" = callPackage + ({ mkDerivation, base, binary, bytestring, containers, deepseq + , rank1dynamic + }: + mkDerivation { + pname = "distributed-static"; + version = "0.3.3.0"; + sha256 = "57ac042377d0cf0ca0dca3952b92ddd4a9c1f5a3b1ddf3cab0b59c212489a1c9"; + libraryHaskellDepends = [ + base binary bytestring containers deepseq rank1dynamic + ]; + homepage = "http://haskell-distributed.github.com"; + description = "Compositional, type-safe, polymorphic static values and closures"; + license = stdenv.lib.licenses.bsd3; }) {}; "distribution" = callPackage @@ -59355,26 +59584,34 @@ self: { }) {}; "dixi" = callPackage - ({ mkDerivation, acid-state, aeson, base, blaze-html, blaze-markup - , bytestring, composition-tree, containers, data-default, directory - , either, lens, network-uri, pandoc, pandoc-types, patches-vector - , safecopy, servant, servant-blaze, servant-server, shakespeare + ({ mkDerivation, acid-state, aeson, aeson-pretty, attoparsec, base + , blaze-html, blaze-markup, bytestring, composition-tree + , containers, data-default, directory, either, filepath, heredoc + , lens, network-uri, pandoc, pandoc-types, patches-vector, safecopy + , servant, servant-blaze, servant-docs, servant-server, shakespeare , template-haskell, text, time, time-locale-compat, timezone-olson , timezone-series, transformers, vector, warp, yaml }: mkDerivation { pname = "dixi"; - version = "0.5.1.1"; - sha256 = "2c39acabdf742f4a9ed568c10ab7bbed6de24852fe79edb3c13f50c8474e36b2"; - isLibrary = false; + version = "0.6.0.1"; + sha256 = "eb8ba7bc3b13b03db747750a444f84a8d09af2ed5f0472a4188107540b8ec87c"; + isLibrary = true; isExecutable = true; - executableHaskellDepends = [ + libraryHaskellDepends = [ acid-state aeson base blaze-html blaze-markup bytestring - composition-tree containers data-default directory either lens + composition-tree containers data-default either heredoc lens network-uri pandoc pandoc-types patches-vector safecopy servant servant-blaze servant-server shakespeare template-haskell text time time-locale-compat timezone-olson timezone-series transformers - vector warp yaml + vector + ]; + executableHaskellDepends = [ + acid-state base directory filepath servant-server text warp yaml + ]; + testHaskellDepends = [ + aeson aeson-pretty attoparsec base bytestring lens patches-vector + servant servant-blaze servant-docs shakespeare text time vector ]; homepage = "https://github.com/liamoc/dixi"; description = "A wiki implemented with a firm theoretical foundation"; @@ -60161,6 +60398,7 @@ self: { ]; description = "Dungeons of Wor"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = [ "i686-linux" "x86_64-linux" ]; }) {}; "download" = callPackage @@ -61076,6 +61314,7 @@ self: { homepage = "https://github.com/adamwalker/dynamic-graph"; description = "Draw and update graphs in real time with OpenGL"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = [ "i686-linux" "x86_64-linux" ]; }) {}; "dynamic-linker-template" = callPackage @@ -62120,6 +62359,7 @@ self: { homepage = "https://github.com/osidorkin/haskell-eigen"; description = "Eigen C++ library (linear algebra: matrices, sparse matrices, vectors, numerical solvers)"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = [ "i686-linux" "x86_64-linux" ]; }) {}; "either_4_3_2" = callPackage @@ -62483,6 +62723,7 @@ self: { executableHaskellDepends = [ base elerea GLFW OpenGL ]; description = "Example applications for Elerea"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = [ "i686-linux" "x86_64-linux" ]; }) {}; "elerea-sdl" = callPackage @@ -62495,6 +62736,7 @@ self: { homepage = "http://github.com/singpolyma/elerea-sdl"; description = "Elerea FRP wrapper for SDL"; license = "unknown"; + hydraPlatforms = [ "i686-linux" "x86_64-linux" ]; }) {}; "elevator" = callPackage @@ -62959,6 +63201,7 @@ self: { homepage = "https://github.com/cocreature/emacs-keys"; description = "library to parse emacs style keybinding into the modifiers and the chars"; license = stdenv.lib.licenses.isc; + hydraPlatforms = [ "i686-linux" "x86_64-linux" ]; }) {}; "email" = callPackage @@ -63616,6 +63859,7 @@ self: { homepage = "http://epanet.de/developer/haskell.html"; description = "Haskell binding for EPANET"; license = stdenv.lib.licenses.gpl3; + hydraPlatforms = [ "i686-linux" "x86_64-linux" ]; }) {}; "epass" = callPackage @@ -63646,6 +63890,7 @@ self: { homepage = "http://www.dcs.st-and.ac.uk/~eb/epic.php"; description = "Compiler for a simple functional language"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = [ "i686-linux" "x86_64-linux" ]; }) {}; "epoll" = callPackage @@ -63949,6 +64194,18 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "error-analyze" = callPackage + ({ mkDerivation, base, HUnit, tasty, tasty-hunit, text }: + mkDerivation { + pname = "error-analyze"; + version = "0.0.1"; + sha256 = "7e944f26c934f38e7baed53def81900188e9593dc119baef355bd2cd98350c75"; + libraryHaskellDepends = [ base text ]; + testHaskellDepends = [ base HUnit tasty tasty-hunit text ]; + description = "Parse ghc and cabal error messages and give their causes for easier resolution"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "error-continuations" = callPackage ({ mkDerivation, base, either, mtl, transformers }: mkDerivation { @@ -64462,8 +64719,8 @@ self: { }: mkDerivation { pname = "eternal"; - version = "0.1.1"; - sha256 = "697304817feb5c9c3aeb053ec6619813c0f0488149130f6c8f1b40df184e2b94"; + version = "0.1.3"; + sha256 = "9db1f4e585dab1a838310d746799dc59db6840575c9c3b82e7fca0b1f939ecef"; libraryHaskellDepends = [ base base-unicode-symbols transformers utf8-string ]; @@ -64682,7 +64939,7 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; - "event" = callPackage + "event_0_1_2" = callPackage ({ mkDerivation, base, containers, semigroups, transformers }: mkDerivation { pname = "event"; @@ -64693,6 +64950,20 @@ self: { ]; description = "Monoidal, monadic and first-class events"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + + "event" = callPackage + ({ mkDerivation, base, containers, semigroups, transformers }: + mkDerivation { + pname = "event"; + version = "0.1.2.1"; + sha256 = "2a14209d4788d810181bed2fc13f534c51399cfbe29f648d6a44edd9a3db4c22"; + libraryHaskellDepends = [ + base containers semigroups transformers + ]; + description = "Monoidal, monadic and first-class events"; + license = stdenv.lib.licenses.bsd3; }) {}; "event-driven" = callPackage @@ -64868,6 +65139,19 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "exact-pi_0_3_1_0" = callPackage + ({ mkDerivation, base, numtype-dk }: + mkDerivation { + pname = "exact-pi"; + version = "0.3.1.0"; + sha256 = "bb10c3c9954445cef3af7ba4b6f3d59e8231ca2c76671d690a5fd453c6881776"; + libraryHaskellDepends = [ base numtype-dk ]; + homepage = "https://github.com/dmcclean/exact-pi"; + description = "Exact rational multiples of pi (and integer powers of pi)"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "exception-mailer" = callPackage ({ mkDerivation, base, hslogger, mime-mail, text }: mkDerivation { @@ -65258,6 +65542,18 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "exit-codes" = callPackage + ({ mkDerivation, base }: + mkDerivation { + pname = "exit-codes"; + version = "0.1.0.0"; + sha256 = "772877d26bf513f0954c7ea31b18832fa378f483e6c03baf12d9f9d6f0483239"; + libraryHaskellDepends = [ base ]; + homepage = "http://github.com/JustusAdam/exit-codes"; + description = "Exit codes as defined by BSD"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "exp-pairs" = callPackage ({ mkDerivation, base, deepseq, generic-deriving, ghc-prim, matrix , memoize, QuickCheck, random, smallcheck, tasty, tasty-hunit @@ -65829,6 +66125,7 @@ self: { homepage = "http://functionalley.eu/Factory/factory.html"; description = "Rational arithmetic in an irrational world"; license = "GPL"; + hydraPlatforms = [ "i686-linux" "x86_64-darwin" ]; }) {}; "factual-api" = callPackage @@ -65979,6 +66276,7 @@ self: { homepage = "https://github.com/abhinav/farmhash"; description = "Fast hash functions"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = [ "i686-linux" "x86_64-linux" ]; }) {}; "fast-builder" = callPackage @@ -65994,6 +66292,7 @@ self: { homepage = "http://github.com/takano-akio/fast-builder"; description = "Fast ByteString Builder"; license = stdenv.lib.licenses.publicDomain; + hydraPlatforms = [ "i686-linux" "x86_64-linux" ]; }) {}; "fast-digits" = callPackage @@ -67558,6 +67857,7 @@ self: { ]; description = "Minimal bindings to the FFmpeg library"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = [ "i686-linux" "x86_64-linux" ]; }) {inherit (pkgs) ffmpeg; libavcodec = null; libavformat = null; libswscale = null;}; @@ -68016,6 +68316,7 @@ self: { homepage = "https://github.com/gregwebs/FileLocation.hs"; description = "common functions that show file location information"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = [ "i686-linux" "x86_64-linux" ]; }) {}; "filecache" = callPackage @@ -68403,6 +68704,18 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "finite-typelits" = callPackage + ({ mkDerivation, base }: + mkDerivation { + pname = "finite-typelits"; + version = "0.1.0.0"; + sha256 = "1729a66604cf852f1370f3575ac7cd74777df17106929c2afa57cf6c8fc78c58"; + libraryHaskellDepends = [ base ]; + homepage = "https://github.com/mniip/finite-typelits"; + description = "A type inhabited by finitely many values, indexed by type-level naturals"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "first-and-last" = callPackage ({ mkDerivation, base, doctest }: mkDerivation { @@ -68467,6 +68780,7 @@ self: { homepage = "http://functionalley.eu"; description = "Calculates file-size frequency-distribution"; license = "GPL"; + hydraPlatforms = [ "i686-linux" "x86_64-darwin" ]; }) {}; "fit" = callPackage @@ -69423,6 +69737,7 @@ self: { homepage = "https://github.com/MostAwesomeDude/hsfluidsynth"; description = "Haskell bindings to FluidSynth"; license = stdenv.lib.licenses.mit; + hydraPlatforms = [ "i686-linux" "x86_64-linux" ]; }) {inherit (pkgs) fluidsynth;}; "fmark" = callPackage @@ -69461,8 +69776,8 @@ self: { }: mkDerivation { pname = "fn"; - version = "0.1.3.1"; - sha256 = "d9ea2a4c39a0185cddb5ca11fcd5489dd18487ea6ef1a81c32ea43333e4eb8df"; + version = "0.1.4.0"; + sha256 = "980cee1b30251c06650f2d357217aa3d8d86de1c9dd4b49353e98028515e4c13"; libraryHaskellDepends = [ base blaze-builder bytestring http-types text wai ]; @@ -69530,6 +69845,7 @@ self: { homepage = "https://github.com/debug-ito/fold-debounce"; description = "Fold multiple events that happen in a given period of time"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = [ "i686-linux" "x86_64-linux" ]; }) {}; "fold-debounce-conduit" = callPackage @@ -69551,6 +69867,7 @@ self: { homepage = "https://github.com/debug-ito/fold-debounce-conduit"; description = "Regulate input traffic from conduit Source with Control.FoldDebounce"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = [ "i686-linux" "x86_64-linux" ]; }) {}; "foldl_1_0_7" = callPackage @@ -71137,6 +71454,7 @@ self: { homepage = "https://github.com/atzeus/FRPNow"; description = "Program awesome stuff with Gloss and frpnow!"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = [ "i686-linux" "x86_64-linux" ]; }) {}; "frpnow-gtk" = callPackage @@ -71880,6 +72198,7 @@ self: { homepage = "https://github.com/ziocroc/FWGL"; description = "FWGL GLFW backend"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = [ "i686-linux" "x86_64-linux" ]; }) {}; "fwgl-javascript" = callPackage @@ -72187,6 +72506,7 @@ self: { homepage = "http://code.mathr.co.uk/gearbox"; description = "zooming rotating fractal gears graphics demo"; license = stdenv.lib.licenses.gpl3; + hydraPlatforms = [ "i686-linux" "x86_64-linux" ]; }) {}; "geek" = callPackage @@ -72372,14 +72692,14 @@ self: { }) {}; "generic-accessors" = callPackage - ({ mkDerivation, base, HUnit, linear, QuickCheck, spatial-math - , test-framework, test-framework-hunit + ({ mkDerivation, base, HUnit, lens, linear, QuickCheck + , spatial-math, test-framework, test-framework-hunit }: mkDerivation { pname = "generic-accessors"; - version = "0.4.2.0"; - sha256 = "b1ee291607909663a2693189a63d1e8015cec543e550f3478a0d383d41334de8"; - libraryHaskellDepends = [ base linear spatial-math ]; + version = "0.5.0.0"; + sha256 = "7a9098afd6db14a5f75ef250cac5cb770eb4b10c9ed13bbdf029892d244ddf3b"; + libraryHaskellDepends = [ base lens linear spatial-math ]; testHaskellDepends = [ base HUnit QuickCheck test-framework test-framework-hunit ]; @@ -73431,6 +73751,7 @@ self: { ]; description = "ExactPrint for GHC"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = [ "i686-linux" "x86_64-linux" ]; }) {}; "ghc-gc-tune" = callPackage @@ -74090,6 +74411,8 @@ self: { pname = "ghcid"; version = "0.3.4"; sha256 = "584e71e58d4958bd53bc43a4acb48be82dacb5cacae3168bdedaa54ef3e857f5"; + revision = "1"; + editedCabalFile = "37edb88b54678d5a6a3aa49b877f71fd149902e5b8e12538ae4156cc846b85c1"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -74120,6 +74443,8 @@ self: { pname = "ghcid"; version = "0.3.6"; sha256 = "a8cabaa91386004cf8ca1a38419b62956aea26ace0ffd25e8db640e406d64a95"; + revision = "1"; + editedCabalFile = "3a403a6f170cbec00720138692973989a06bd52b2abc4144d52133275be01f09"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -74149,6 +74474,8 @@ self: { pname = "ghcid"; version = "0.5"; sha256 = "d44c8f82aa51ec69dd1ff840d0951a17732cca32b6b1da91e55408121c38adac"; + revision = "1"; + editedCabalFile = "b0d70ae396ce2d8adcec06901c032b2a4f6b689f5b0f6c852902b0d8b534d3f8"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -74292,6 +74619,263 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "gi-atk" = callPackage + ({ mkDerivation, atk, base, bytestring, containers, gi-glib + , gi-gobject, haskell-gi-base, text, transformers + }: + mkDerivation { + pname = "gi-atk"; + version = "0.2.16.9"; + sha256 = "d82f7f78319a9f384af27fd3816dc160f39362d7a30d2c0e1dec04245c334615"; + libraryHaskellDepends = [ + base bytestring containers gi-glib gi-gobject haskell-gi-base text + transformers + ]; + libraryPkgconfigDepends = [ atk ]; + homepage = "https://github.com/haskell-gi/haskell-gi"; + description = "Atk bindings"; + license = stdenv.lib.licenses.lgpl21; + }) {inherit (pkgs) atk;}; + + "gi-cairo" = callPackage + ({ mkDerivation, base, bytestring, cairo-gobject, containers + , haskell-gi-base, text, transformers + }: + mkDerivation { + pname = "gi-cairo"; + version = "0.1.14.9"; + sha256 = "61f530c14f857a822b98a690ee968320cbf1cec8e7b50391d910bf9160492d3f"; + libraryHaskellDepends = [ + base bytestring containers haskell-gi-base text transformers + ]; + libraryPkgconfigDepends = [ cairo-gobject ]; + homepage = "https://github.com/haskell-gi/haskell-gi"; + description = "cairo bindings"; + license = stdenv.lib.licenses.lgpl21; + }) {cairo-gobject = null;}; + + "gi-gdk" = callPackage + ({ mkDerivation, base, bytestring, containers, gdk3, gi-cairo + , gi-gdkpixbuf, gi-gio, gi-glib, gi-gobject, gi-pango + , haskell-gi-base, text, transformers + }: + mkDerivation { + pname = "gi-gdk"; + version = "0.3.16.9"; + sha256 = "d882662ba2bab5e4f44ed847061e7c9448e66b2e46e5a8f8da6505dc2339420f"; + libraryHaskellDepends = [ + base bytestring containers gi-cairo gi-gdkpixbuf gi-gio gi-glib + gi-gobject gi-pango haskell-gi-base text transformers + ]; + libraryPkgconfigDepends = [ gdk3 ]; + homepage = "https://github.com/haskell-gi/haskell-gi"; + description = "Gdk bindings"; + license = stdenv.lib.licenses.lgpl21; + }) {gdk3 = null;}; + + "gi-gdkpixbuf" = callPackage + ({ mkDerivation, base, bytestring, containers, gdk_pixbuf, gi-gio + , gi-glib, gi-gobject, haskell-gi-base, text, transformers + }: + mkDerivation { + pname = "gi-gdkpixbuf"; + version = "0.2.31.9"; + sha256 = "a142b0ad576b8a5490aa44db1dd0292cd747074ccaf32e6172388ea8dfc8c69a"; + libraryHaskellDepends = [ + base bytestring containers gi-gio gi-glib gi-gobject + haskell-gi-base text transformers + ]; + libraryPkgconfigDepends = [ gdk_pixbuf ]; + homepage = "https://github.com/haskell-gi/haskell-gi"; + description = "GdkPixbuf bindings"; + license = stdenv.lib.licenses.lgpl21; + }) {inherit (pkgs) gdk_pixbuf;}; + + "gi-gio" = callPackage + ({ mkDerivation, base, bytestring, containers, gi-glib, gi-gobject + , glib, haskell-gi-base, text, transformers + }: + mkDerivation { + pname = "gi-gio"; + version = "0.2.44.9"; + sha256 = "8b0380d217a5426bc13941ad9512cdf08c6dc9e5c3fb61d8e65edb91e5fa63ef"; + libraryHaskellDepends = [ + base bytestring containers gi-glib gi-gobject haskell-gi-base text + transformers + ]; + libraryPkgconfigDepends = [ glib ]; + homepage = "https://github.com/haskell-gi/haskell-gi"; + description = "Gio bindings"; + license = stdenv.lib.licenses.lgpl21; + }) {inherit (pkgs) glib;}; + + "gi-glib" = callPackage + ({ mkDerivation, base, bytestring, containers, glib + , haskell-gi-base, text, transformers + }: + mkDerivation { + pname = "gi-glib"; + version = "0.2.44.9"; + sha256 = "c55d6cd8c7884e420ce748fdbb87a5c60661c50cd647c2b20c3de23656151894"; + libraryHaskellDepends = [ + base bytestring containers haskell-gi-base text transformers + ]; + libraryPkgconfigDepends = [ glib ]; + homepage = "https://github.com/haskell-gi/haskell-gi"; + description = "GLib bindings"; + license = stdenv.lib.licenses.lgpl21; + }) {inherit (pkgs) glib;}; + + "gi-gobject" = callPackage + ({ mkDerivation, base, bytestring, containers, gi-glib, glib + , haskell-gi-base, text, transformers + }: + mkDerivation { + pname = "gi-gobject"; + version = "0.2.44.9"; + sha256 = "dbe16d9fca123c53b4afe0d29e1dc9b8939ac81ac7639d7a6377d921dd401791"; + libraryHaskellDepends = [ + base bytestring containers gi-glib haskell-gi-base text + transformers + ]; + libraryPkgconfigDepends = [ glib ]; + homepage = "https://github.com/haskell-gi/haskell-gi"; + description = "GObject bindings"; + license = stdenv.lib.licenses.lgpl21; + }) {inherit (pkgs) glib;}; + + "gi-gtk" = callPackage + ({ mkDerivation, base, bytestring, containers, gi-atk, gi-cairo + , gi-gdk, gi-gdkpixbuf, gi-gio, gi-glib, gi-gobject, gi-pango, gtk3 + , haskell-gi-base, text, transformers + }: + mkDerivation { + pname = "gi-gtk"; + version = "0.3.16.9"; + sha256 = "aac77cd286e623c13bafe83849dc3ea53f6b240fb3070b1414c2f6c977ddb2aa"; + libraryHaskellDepends = [ + base bytestring containers gi-atk gi-cairo gi-gdk gi-gdkpixbuf + gi-gio gi-glib gi-gobject gi-pango haskell-gi-base text + transformers + ]; + libraryPkgconfigDepends = [ gtk3 ]; + homepage = "https://github.com/haskell-gi/haskell-gi"; + description = "Gtk bindings"; + license = stdenv.lib.licenses.lgpl21; + }) {gtk3 = null;}; + + "gi-javascriptcore" = callPackage + ({ mkDerivation, base, bytestring, containers, haskell-gi-base + , javascriptcoregtk, text, transformers + }: + mkDerivation { + pname = "gi-javascriptcore"; + version = "0.2.4.9"; + sha256 = "d84ed46dea9483f3d69bab029944a3c3c088d97e69c4c428ed87eff4aefd6c0d"; + libraryHaskellDepends = [ + base bytestring containers haskell-gi-base text transformers + ]; + libraryPkgconfigDepends = [ javascriptcoregtk ]; + homepage = "https://github.com/haskell-gi/haskell-gi"; + description = "JavaScriptCore bindings"; + license = stdenv.lib.licenses.lgpl21; + }) {javascriptcoregtk = null;}; + + "gi-notify" = callPackage + ({ mkDerivation, base, bytestring, containers, gdk_pixbuf + , gi-gdkpixbuf, gi-glib, gi-gobject, haskell-gi-base, text + , transformers + }: + mkDerivation { + pname = "gi-notify"; + version = "0.2.31.9"; + sha256 = "ad771c5ad5689572f5732b0588729abee25b5f6e464f790a8c4736eaeaab7919"; + libraryHaskellDepends = [ + base bytestring containers gi-gdkpixbuf gi-glib gi-gobject + haskell-gi-base text transformers + ]; + libraryPkgconfigDepends = [ gdk_pixbuf ]; + homepage = "https://github.com/haskell-gi/haskell-gi"; + description = "Notify bindings"; + license = stdenv.lib.licenses.lgpl21; + }) {inherit (pkgs) gdk_pixbuf;}; + + "gi-pango" = callPackage + ({ mkDerivation, base, bytestring, containers, gi-glib, gi-gobject + , haskell-gi-base, pango, text, transformers + }: + mkDerivation { + pname = "gi-pango"; + version = "0.1.36.9"; + sha256 = "46b6b87e368d93bc0193538c928f140036318acf0eaf4bd1b2340bd9e51333ce"; + libraryHaskellDepends = [ + base bytestring containers gi-glib gi-gobject haskell-gi-base text + transformers + ]; + libraryPkgconfigDepends = [ pango ]; + homepage = "https://github.com/haskell-gi/haskell-gi"; + description = "Pango bindings"; + license = stdenv.lib.licenses.lgpl21; + }) {inherit (pkgs.gnome) pango;}; + + "gi-soup" = callPackage + ({ mkDerivation, base, bytestring, containers, gi-gio, gi-glib + , gi-gobject, haskell-gi-base, libsoup, text, transformers + }: + mkDerivation { + pname = "gi-soup"; + version = "0.2.50.9"; + sha256 = "afaac211d7d43d4630cb0a22896331dc9905edbaa4073e2be99c34006ac75102"; + libraryHaskellDepends = [ + base bytestring containers gi-gio gi-glib gi-gobject + haskell-gi-base text transformers + ]; + libraryPkgconfigDepends = [ libsoup ]; + homepage = "https://github.com/haskell-gi/haskell-gi"; + description = "Soup bindings"; + license = stdenv.lib.licenses.lgpl21; + }) {inherit (pkgs.gnome) libsoup;}; + + "gi-vte" = callPackage + ({ mkDerivation, base, bytestring, containers, gi-atk, gi-gdk + , gi-gio, gi-glib, gi-gobject, gi-gtk, gi-pango, haskell-gi-base + , text, transformers, vte + }: + mkDerivation { + pname = "gi-vte"; + version = "0.0.40.9"; + sha256 = "c3c8a8ba97d3a1e6e7c06037a84b03f7fd23bd9e8cad8f758f18448181d27a39"; + libraryHaskellDepends = [ + base bytestring containers gi-atk gi-gdk gi-gio gi-glib gi-gobject + gi-gtk gi-pango haskell-gi-base text transformers + ]; + libraryPkgconfigDepends = [ vte ]; + homepage = "https://github.com/haskell-gi/haskell-gi"; + description = "Vte bindings"; + license = stdenv.lib.licenses.lgpl21; + }) {inherit (pkgs.gnome) vte;}; + + "gi-webkit" = callPackage + ({ mkDerivation, base, bytestring, containers, gi-atk, gi-cairo + , gi-gdk, gi-gdkpixbuf, gi-gio, gi-glib, gi-gobject, gi-gtk + , gi-javascriptcore, gi-soup, haskell-gi-base, text, transformers + , webkit + }: + mkDerivation { + pname = "gi-webkit"; + version = "0.2.4.9"; + sha256 = "da6b56d293cbb8ae6c6e10ffa283edf48f691d04258ec1abe87fb4871189b0c8"; + libraryHaskellDepends = [ + base bytestring containers gi-atk gi-cairo gi-gdk gi-gdkpixbuf + gi-gio gi-glib gi-gobject gi-gtk gi-javascriptcore gi-soup + haskell-gi-base text transformers + ]; + libraryPkgconfigDepends = [ webkit ]; + homepage = "https://github.com/haskell-gi/haskell-gi"; + description = "WebKit bindings"; + license = stdenv.lib.licenses.lgpl21; + }) {inherit (pkgs) webkit;}; + "gimlh" = callPackage ({ mkDerivation, base, split }: mkDerivation { @@ -74538,7 +75122,7 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; - "git-annex" = callPackage + "git-annex_5_20150727" = callPackage ({ mkDerivation, aeson, async, aws, base, blaze-builder , bloomfilter, bup, byteable, bytestring, case-insensitive , clientsession, conduit, conduit-extra, containers, crypto-api @@ -74591,13 +75175,14 @@ self: { homepage = "http://git-annex.branchable.com/"; description = "manage files with git, without checking their contents into git"; license = stdenv.lib.licenses.gpl3; + hydraPlatforms = stdenv.lib.platforms.none; maintainers = with stdenv.lib.maintainers; [ simons ]; }) {inherit (pkgs) bup; inherit (pkgs) curl; inherit (pkgs) git; inherit (pkgs) gnupg; inherit (pkgs) lsof; inherit (pkgs) openssh; inherit (pkgs) perl; inherit (pkgs) rsync; inherit (pkgs) wget; inherit (pkgs) which;}; - "git-annex_5_20151019" = callPackage + "git-annex" = callPackage ({ mkDerivation, aeson, async, aws, base, blaze-builder , bloomfilter, bup, byteable, bytestring, case-insensitive , clientsession, conduit, conduit-extra, containers, crypto-api @@ -74618,8 +75203,8 @@ self: { }: mkDerivation { pname = "git-annex"; - version = "5.20151019"; - sha256 = "ec40c5e61a7e8d6f4a47da4cdc8c9861a6938565b39ddc6c0a53ac8f8477fabc"; + version = "5.20151102.1"; + sha256 = "270592b61fe3e46b2b643e3eec2bdd85f7c343e4442ec41ffb2a06baf080bed5"; configureFlags = [ "-fassistant" "-fproduction" ]; isLibrary = false; isExecutable = true; @@ -74650,7 +75235,6 @@ self: { homepage = "http://git-annex.branchable.com/"; description = "manage files with git, without checking their contents into git"; license = stdenv.lib.licenses.gpl3; - hydraPlatforms = stdenv.lib.platforms.none; maintainers = with stdenv.lib.maintainers; [ simons ]; }) {inherit (pkgs) bup; inherit (pkgs) curl; inherit (pkgs) git; inherit (pkgs) gnupg; inherit (pkgs) lsof; inherit (pkgs) openssh; @@ -74757,6 +75341,20 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "git-jump" = callPackage + ({ mkDerivation, base, base-compat, process }: + mkDerivation { + pname = "git-jump"; + version = "0.1.0.2"; + sha256 = "4ce380d2500a7099e1d9fcc5b31860bcdb8a286b74759d3979961a63ea59ffb7"; + isLibrary = false; + isExecutable = true; + executableHaskellDepends = [ base base-compat process ]; + homepage = "https://github.com/Peaker/git-jump"; + description = "Move a git branch"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "git-monitor" = callPackage ({ mkDerivation, base, bytestring, containers, directory, filepath , gitlib, gitlib-libgit2, lifted-async, logging, old-locale @@ -75621,6 +76219,7 @@ self: { libraryHaskellDepends = [ base bytestring OpenGL ]; description = "simple image capture from OpenGL"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = [ "i686-linux" "x86_64-linux" ]; }) {}; "glade" = callPackage @@ -75692,6 +76291,7 @@ self: { homepage = "zyghost.com"; description = "An OpenGL micro framework"; license = stdenv.lib.licenses.gpl2; + hydraPlatforms = [ "i686-linux" "x86_64-linux" ]; }) {}; "glasso" = callPackage @@ -75971,6 +76571,7 @@ self: { homepage = "http://gloss.ouroborus.net"; description = "Painless 2D vector graphics, animations and simulations"; license = stdenv.lib.licenses.mit; + hydraPlatforms = [ "i686-linux" "x86_64-linux" ]; }) {}; "gloss-accelerate" = callPackage @@ -75984,6 +76585,7 @@ self: { libraryHaskellDepends = [ accelerate base gloss gloss-rendering ]; description = "Extras to interface Gloss and Accelerate"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = [ "i686-linux" "x86_64-linux" ]; }) {}; "gloss-algorithms" = callPackage @@ -75996,6 +76598,7 @@ self: { homepage = "http://gloss.ouroborus.net"; description = "Data structures and algorithms for working with 2D graphics"; license = stdenv.lib.licenses.mit; + hydraPlatforms = [ "i686-linux" "x86_64-linux" ]; }) {}; "gloss-banana" = callPackage @@ -76046,6 +76649,7 @@ self: { homepage = "http://gloss.ouroborus.net"; description = "Examples using the gloss library"; license = stdenv.lib.licenses.mit; + hydraPlatforms = [ "i686-linux" "x86_64-linux" ]; }) {}; "gloss-game" = callPackage @@ -76058,6 +76662,7 @@ self: { homepage = "https://github.com/mchakravarty/gloss-game"; description = "Gloss wrapper that simplifies writing games"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = [ "i686-linux" "x86_64-linux" ]; }) {}; "gloss-juicy" = callPackage @@ -76078,6 +76683,7 @@ self: { homepage = "http://github.com/alpmestan/gloss-juicy"; description = "Load any image supported by Juicy.Pixels in your gloss application"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = [ "i686-linux" "x86_64-linux" ]; }) {}; "gloss-raster" = callPackage @@ -76094,6 +76700,7 @@ self: { homepage = "http://gloss.ouroborus.net"; description = "Parallel rendering of raster images"; license = stdenv.lib.licenses.mit; + hydraPlatforms = [ "i686-linux" "x86_64-linux" ]; }) {}; "gloss-raster-accelerate" = callPackage @@ -76124,6 +76731,7 @@ self: { jailbreak = true; description = "Gloss picture data types and rendering functions"; license = stdenv.lib.licenses.mit; + hydraPlatforms = [ "i686-linux" "x86_64-linux" ]; }) {}; "gloss-sodium" = callPackage @@ -76137,6 +76745,7 @@ self: { homepage = "https://github.com/Twey/gloss-sodium"; description = "A Sodium interface to the Gloss drawing package"; license = stdenv.lib.licenses.agpl3; + hydraPlatforms = [ "i686-linux" "x86_64-linux" ]; }) {}; "glpk-hs" = callPackage @@ -76279,6 +76888,7 @@ self: { ]; description = "turtle like LOGO with glut"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = [ "i686-linux" "x86_64-linux" ]; }) {}; "gmap" = callPackage @@ -79110,8 +79720,8 @@ self: { }: mkDerivation { pname = "grouped-list"; - version = "0.2.0.0"; - sha256 = "01e4a1f3b7031e38a37b271cf6ad00380678ba9f79df2e625f339ac5bd68f19c"; + version = "0.2.1.0"; + sha256 = "cd6275388415de0b0940f0d12a380b9fd4e196c356719f0574cc94e73ec6d004"; libraryHaskellDepends = [ base containers deepseq pointed ]; testHaskellDepends = [ base QuickCheck tasty tasty-quickcheck ]; homepage = "https://github.com/Daniel-Diaz/grouped-list/blob/master/README.md"; @@ -79533,7 +80143,8 @@ self: { }) {gtk-mac-integration-gtk2 = null;}; "gtk-serialized-event" = callPackage - ({ mkDerivation, array, base, containers, glib, gtk, haskell98, mtl + ({ mkDerivation, array, base, containers, gdk2, glib, gtk + , haskell98, mtl }: mkDerivation { pname = "gtk-serialized-event"; @@ -79542,12 +80153,13 @@ self: { libraryHaskellDepends = [ array base containers glib gtk haskell98 mtl ]; + libraryPkgconfigDepends = [ gdk2 ]; jailbreak = true; homepage = "http://www.haskell.org/gtk2hs/"; description = "GTK+ Serialized event"; license = stdenv.lib.licenses.lgpl21; hydraPlatforms = stdenv.lib.platforms.none; - }) {}; + }) {gdk2 = null;}; "gtk-simple-list-view" = callPackage ({ mkDerivation, base, gtk }: @@ -85000,8 +85612,8 @@ self: { ({ mkDerivation, base, template-haskell }: mkDerivation { pname = "haskell-exp-parser"; - version = "0.1"; - sha256 = "5096177d0d8f8ee1cf213ad73ad243220b8d84d17df81357c82f59aaeba2cd3a"; + version = "0.1.1"; + sha256 = "a53cfae87b679f24b5c0a14a72be35760525bcad28b2fc0c870c19c09f2f975c"; libraryHaskellDepends = [ base template-haskell ]; testHaskellDepends = [ base template-haskell ]; homepage = "https://github.com/emilaxelsson/haskell-exp-parser"; @@ -85086,6 +85698,43 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "haskell-gi" = callPackage + ({ mkDerivation, base, bytestring, c2hs, containers, directory + , file-embed, filepath, free, glib, gobjectIntrospection + , haskell-gi-base, mtl, pretty-show, process, safe, text + , transformers, xdg-basedir, xml-conduit + }: + mkDerivation { + pname = "haskell-gi"; + version = "0.9"; + sha256 = "7e4cf5b14db2143e4e6176fa7353dd1d21c7363979162de554710ac6d0e040f2"; + isLibrary = false; + isExecutable = true; + executableHaskellDepends = [ + base bytestring containers directory file-embed filepath free + haskell-gi-base mtl pretty-show process safe text transformers + xdg-basedir xml-conduit + ]; + executablePkgconfigDepends = [ glib gobjectIntrospection ]; + executableToolDepends = [ c2hs ]; + homepage = "https://github.com/haskell-gi/haskell-gi"; + description = "Generate Haskell bindings for GObject Introspection capable libraries"; + license = stdenv.lib.licenses.lgpl21; + }) {inherit (pkgs) glib; inherit (pkgs) gobjectIntrospection;}; + + "haskell-gi-base" = callPackage + ({ mkDerivation, base, bytestring, containers, glib, text }: + mkDerivation { + pname = "haskell-gi-base"; + version = "0.9"; + sha256 = "dfce7237cf2430dadffb833369b29079174196620199d0ec872ec5c45fdc2ae7"; + libraryHaskellDepends = [ base bytestring containers text ]; + libraryPkgconfigDepends = [ glib ]; + homepage = "https://github.com/haskell-gi/haskell-gi-base"; + description = "Foundation for libraries generated by haskell-gi"; + license = stdenv.lib.licenses.lgpl21; + }) {inherit (pkgs) glib;}; + "haskell-import-graph" = callPackage ({ mkDerivation, base, classy-prelude, ghc, graphviz, process, text , transformers @@ -90270,6 +90919,33 @@ self: { license = "unknown"; }) {}; + "hfmt" = callPackage + ({ mkDerivation, ansi-wl-pprint, base, Cabal, Diff, directory + , filepath, haskell-src-exts, hindent, hlint, HUnit + , optparse-applicative, pipes, pretty, stylish-haskell + , test-framework, test-framework-hunit, text + }: + mkDerivation { + pname = "hfmt"; + version = "0.0.1.0"; + sha256 = "78bd30bd0990c0145799a7abbd5e0ad66dfd62757bff898077b9e8adcab8661d"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + base Cabal Diff directory filepath haskell-src-exts hindent hlint + HUnit pipes pretty stylish-haskell text + ]; + executableHaskellDepends = [ + ansi-wl-pprint base Diff optparse-applicative pipes pretty + ]; + testHaskellDepends = [ + base HUnit test-framework test-framework-hunit + ]; + homepage = "http://github.com/danstiner/hfmt"; + description = "Haskell source code formatter"; + license = stdenv.lib.licenses.mit; + }) {}; + "hfoil" = callPackage ({ mkDerivation, base, directory, haskeline, hmatrix, HTTP, linear , not-gloss, parsec, transformers @@ -90323,7 +90999,7 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; - "hfsevents" = callPackage + "hfsevents_0_1_5" = callPackage ({ mkDerivation, base, bytestring, cereal, mtl, text, unix }: mkDerivation { pname = "hfsevents"; @@ -90333,7 +91009,21 @@ self: { homepage = "http://github.com/luite/hfsevents"; description = "File/folder watching for OS X"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = [ "x86_64-darwin" ]; + platforms = [ "x86_64-darwin" ]; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + + "hfsevents" = callPackage + ({ mkDerivation, base, bytestring, cereal, mtl, text, unix }: + mkDerivation { + pname = "hfsevents"; + version = "0.1.6"; + sha256 = "74c3f3f3a5e55fff320c352a2d481069ff915860a0ab970864c6a0e6b65d3f05"; + libraryHaskellDepends = [ base bytestring cereal mtl text unix ]; + homepage = "http://github.com/luite/hfsevents"; + description = "File/folder watching for OS X"; + license = stdenv.lib.licenses.bsd3; + platforms = [ "x86_64-darwin" ]; }) {}; "hfusion" = callPackage @@ -90867,6 +91557,7 @@ self: { homepage = "https://github.com/jeremyjh/higher-leveldb"; description = "A rich monadic API for working with leveldb databases"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = [ "i686-linux" "x86_64-linux" ]; }) {}; "higherorder" = callPackage @@ -93834,8 +94525,8 @@ self: { }: mkDerivation { pname = "ho-rewriting"; - version = "0.1"; - sha256 = "43a5f101e44d18779d95ab5f72635d2129470542c8bd094898b0163426c3b6c2"; + version = "0.2"; + sha256 = "c962e3c2b5e7943bfbc7c781070b35cb81d4c39d2afc221c207dc4bb38785acd"; libraryHaskellDepends = [ base compdata containers mtl patch-combinators ]; @@ -94387,6 +95078,7 @@ self: { homepage = "https://lambda.xyz/honk/"; description = "Cross-platform interface to the PC speaker"; license = stdenv.lib.licenses.asl20; + hydraPlatforms = [ "i686-linux" "x86_64-linux" ]; }) {}; "hoobuddy" = callPackage @@ -95884,6 +96576,7 @@ self: { homepage = "https://github.com/scrive/hpqtypes"; description = "Haskell bindings to libpqtypes"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = [ "i686-linux" "x86_64-linux" ]; }) {inherit (pkgs) postgresql;}; "hprotoc_2_1_4" = callPackage @@ -100442,6 +101135,25 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {com_err = null; zephyr = null;}; + "htaglib" = callPackage + ({ mkDerivation, base, directory, filepath, HUnit, taglib + , test-framework, test-framework-hunit + }: + mkDerivation { + pname = "htaglib"; + version = "0.1.1"; + sha256 = "8e0a2a4e7074fec8b2dd5b48c39abe95ffbab50b56b1dd7443ed4f7cd43d28e4"; + libraryHaskellDepends = [ base ]; + librarySystemDepends = [ taglib ]; + testHaskellDepends = [ + base directory filepath HUnit test-framework test-framework-hunit + ]; + doCheck = false; + homepage = "https://github.com/mrkkrp/htaglib"; + description = "Bindings to TagLib, audio meta-data library"; + license = stdenv.lib.licenses.bsd3; + }) {inherit (pkgs) taglib;}; + "htags" = callPackage ({ mkDerivation, base, directory, filepath, haskell-src, mtl }: mkDerivation { @@ -102640,6 +103352,7 @@ self: { homepage = "http://tomahawkins.org"; description = "A two player abstract strategy game"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = [ "i686-linux" "x86_64-linux" ]; }) {}; "hub" = callPackage @@ -103161,8 +103874,8 @@ self: { }: mkDerivation { pname = "hworker"; - version = "0.1.0.0"; - sha256 = "2af1e6cd3e8b6f7245176c31ded7c8b544fb9cfc4a20efd5b3a2b08995f9ec00"; + version = "0.1.0.1"; + sha256 = "34cbcc4db8f190ab0dc02a072adcf1fc75b7beab7e545982872bf265a1223f1d"; libraryHaskellDepends = [ aeson attoparsec base bytestring hedis text time uuid ]; @@ -106843,6 +107556,7 @@ self: { testHaskellDepends = [ base ]; description = "Lets you embed C++ code into Haskell"; license = stdenv.lib.licenses.mit; + hydraPlatforms = [ "i686-linux" "x86_64-linux" ]; }) {}; "inline-c-win32" = callPackage @@ -108037,8 +108751,8 @@ self: { }: mkDerivation { pname = "irc-client"; - version = "0.2.4.0"; - sha256 = "66ef501a42bda9d6a84b006bfbc470bbafede3f87460a56cd922792c7ae8f18c"; + version = "0.2.5.0"; + sha256 = "4a2a10eafd82e3c1e049068bb1d37ae09db7832ac5941765935ab763ea51bd0c"; libraryHaskellDepends = [ base bytestring conduit data-default-class irc-conduit irc-ctcp old-locale stm stm-conduit text time transformers @@ -108939,6 +109653,7 @@ self: { homepage = "http://www.haskell.org/haskellwiki/JACK"; description = "Bindings for the JACK Audio Connection Kit"; license = "GPL"; + hydraPlatforms = [ "i686-linux" "x86_64-linux" ]; }) {inherit (pkgs) libjack2;}; "jack-bindings" = callPackage @@ -110800,6 +111515,7 @@ self: { executableToolDepends = [ alex ]; description = "A first-order reasoning toolbox"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = [ "i686-linux" "x86_64-linux" ]; }) {}; "jumpthefive" = callPackage @@ -110900,6 +111616,7 @@ self: { homepage = "https://github.com/abhinav/kafka-client"; description = "Low-level Haskell client library for Apache Kafka 0.7."; license = stdenv.lib.licenses.mit; + hydraPlatforms = [ "i686-linux" "x86_64-linux" ]; }) {}; "kan-extensions_4_1_1" = callPackage @@ -111486,6 +112203,7 @@ self: { homepage = "http://www.keera.es/blog/community/"; description = "Haskell on Rails - Reactive Fields for WX widgets"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = [ "i686-linux" "x86_64-linux" ]; }) {}; "keera-hails-reactive-yampa" = callPackage @@ -111504,13 +112222,32 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "keera-hails-reactivelenses" = callPackage + ({ mkDerivation, base, keera-hails-reactivevalues, lens }: + mkDerivation { + pname = "keera-hails-reactivelenses"; + version = "0.0.0.1"; + sha256 = "73b271e0a353b4d7d9c861da23792272191725cc85433590ac19aa0cd77256f3"; + libraryHaskellDepends = [ base keera-hails-reactivevalues lens ]; + homepage = "http://www.keera.es/blog/community/"; + description = "Haskell on Gtk rails - Lenses applied to Reactive Values"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "keera-hails-reactivevalues" = callPackage - ({ mkDerivation, base, contravariant }: + ({ mkDerivation, base, contravariant, directory, filepath, hlint + , HUnit, mtl, process, QuickCheck, regex-posix, tasty, tasty-hunit + , tasty-quickcheck + }: mkDerivation { pname = "keera-hails-reactivevalues"; - version = "0.2.0.0"; - sha256 = "79f88ebd5b1902f37bfc2aa74f414fd4fabc9cba997e778395817c7ae51e9616"; + version = "0.2.2.0"; + sha256 = "27756d64d0b275d9556f0ffbefdad8e1bb9942f5fc17d585e6148cfc31496e8b"; libraryHaskellDepends = [ base contravariant ]; + testHaskellDepends = [ + base directory filepath hlint HUnit mtl process QuickCheck + regex-posix tasty tasty-hunit tasty-quickcheck + ]; homepage = "http://www.keera.es/blog/community/"; description = "Haskell on Rails - Reactive Values"; license = stdenv.lib.licenses.bsd3; @@ -111525,12 +112262,12 @@ self: { , keera-hails-mvc-solutions-config, keera-hails-mvc-solutions-gtk , keera-hails-mvc-view-gtk, keera-hails-reactive-gtk , keera-hails-reactivevalues, MissingK, mtl, network, process, SDL - , SDL-mixer, setlocale, time, utf8-string + , SDL-mixer, SDL_mixer, setlocale, time, utf8-string }: mkDerivation { pname = "keera-posture"; - version = "0.2.1"; - sha256 = "92e6f62e463822164fe1f74db8747f11cbe46f443723c0258f326c2b41c99197"; + version = "0.2.3"; + sha256 = "ab35dd2ebf2cd49602cc47e40a35d79f3a2f113214689ad2306ac09d0aee6952"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -111544,11 +112281,12 @@ self: { keera-hails-reactivevalues MissingK mtl network process SDL SDL-mixer setlocale time utf8-string ]; + executableSystemDepends = [ SDL_mixer ]; homepage = "http://keera.co.uk/projects/keera-posture"; description = "Get notifications when your sitting posture is inappropriate"; license = "unknown"; hydraPlatforms = stdenv.lib.platforms.none; - }) {}; + }) {inherit (pkgs) SDL_mixer;}; "keiretsu" = callPackage ({ mkDerivation, aeson, ansi-terminal, async, base, bytestring @@ -112428,6 +113166,7 @@ self: { homepage = "https://github.com/corngood/ktx"; description = "A binding for libktx from Khronos"; license = stdenv.lib.licenses.mit; + hydraPlatforms = [ "i686-linux" "x86_64-linux" ]; }) {egl = null; inherit (pkgs) glew;}; "kure_2_4_10" = callPackage @@ -112751,6 +113490,7 @@ self: { jailbreak = true; description = "Educational drawing canvas for FP explorers"; license = stdenv.lib.licenses.mit; + hydraPlatforms = [ "i686-linux" "x86_64-linux" ]; }) {}; "lambda-devs" = callPackage @@ -114613,6 +115353,45 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "latex-formulae-image" = callPackage + ({ mkDerivation, base, directory, errors, filepath, JuicyPixels + , process, temporary, transformers + }: + mkDerivation { + pname = "latex-formulae-image"; + version = "0.1.0.1"; + sha256 = "77535f8b1bb9e0cea2269d43db79c78ad621345dc077d1ce0199ca2a451ec218"; + libraryHaskellDepends = [ + base directory errors filepath JuicyPixels process temporary + transformers + ]; + homepage = "http://github.com/liamoc/latex-formulae#readme"; + description = "A library for rendering LaTeX formulae as images using an actual LaTeX installation"; + license = stdenv.lib.licenses.bsd3; + }) {}; + + "latex-formulae-pandoc" = callPackage + ({ mkDerivation, base, base64-bytestring, bytestring, directory + , filepath, JuicyPixels, latex-formulae-image, pandoc-types + }: + mkDerivation { + pname = "latex-formulae-pandoc"; + version = "0.1.0.1"; + sha256 = "0123717456b0a32260a16bac6b11d8b85c05f36ffdadf0a5d4a4dd24c1ddf46b"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + base base64-bytestring bytestring directory filepath JuicyPixels + latex-formulae-image pandoc-types + ]; + executableHaskellDepends = [ + base latex-formulae-image pandoc-types + ]; + homepage = "http://github.com/liamoc/latex-formulae#readme"; + description = "Render LaTeX formulae in pandoc documents to images with an actual LaTeX installation"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "lattices_1_2_1_1" = callPackage ({ mkDerivation, base, containers }: mkDerivation { @@ -114730,6 +115509,7 @@ self: { jailbreak = true; description = "A prototypical 2d platform game"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = [ "i686-linux" "x86_64-linux" ]; }) {}; "layout" = callPackage @@ -115362,6 +116142,31 @@ self: { pname = "lens-action"; version = "0.1.0.1"; sha256 = "2feeeb3a74af809923709ffb22f20eefc86f4375136199ddd883e1c997d38a79"; + revision = "1"; + editedCabalFile = "64e5700d04fc9c94b70620642f50b908d2032b75d3736c3b5be2a692e6506d81"; + libraryHaskellDepends = [ + base comonad contravariant lens mtl profunctors semigroupoids + semigroups transformers + ]; + testHaskellDepends = [ base directory doctest filepath ]; + jailbreak = true; + homepage = "http://github.com/ekmett/lens-action/"; + description = "Monadic Getters and Folds"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + + "lens-action_0_2_0_1" = callPackage + ({ mkDerivation, base, comonad, contravariant, directory, doctest + , filepath, lens, mtl, profunctors, semigroupoids, semigroups + , transformers + }: + mkDerivation { + pname = "lens-action"; + version = "0.2.0.1"; + sha256 = "36d5ae806d8d28cab983c11bbb31915874fbeab4d44f683bfc62fc3c879a8e98"; + revision = "1"; + editedCabalFile = "9865cfb30d56a5931766070532961ef10295adcfb0dca84dd588b173c9cef24c"; libraryHaskellDepends = [ base comonad contravariant lens mtl profunctors semigroupoids semigroups transformers @@ -115381,8 +116186,8 @@ self: { }: mkDerivation { pname = "lens-action"; - version = "0.2.0.1"; - sha256 = "36d5ae806d8d28cab983c11bbb31915874fbeab4d44f683bfc62fc3c879a8e98"; + version = "0.2.0.2"; + sha256 = "e26c70b2de68a7cfbce97bcdabdcdfb45b2c50708207a14f8dd24c3e29c6d371"; libraryHaskellDepends = [ base comonad contravariant lens mtl profunctors semigroupoids semigroups transformers @@ -115753,6 +116558,7 @@ self: { homepage = "http://github.com/kim/leveldb-haskell"; description = "Haskell bindings to LevelDB"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = [ "i686-linux" "x86_64-linux" ]; }) {inherit (pkgs) leveldb;}; "leveldb-haskell-fork" = callPackage @@ -115794,6 +116600,7 @@ self: { homepage = "https://github.com/basvandijk/levmar"; description = "An implementation of the Levenberg-Marquardt algorithm"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = [ "i686-linux" "x86_64-darwin" ]; }) {}; "levmar-chart" = callPackage @@ -116275,6 +117082,7 @@ self: { homepage = "http://github.com/NathanHowell/liblinear-enumerator"; description = "liblinear iteratee"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = [ "i686-linux" "x86_64-linux" ]; }) {}; "libltdl" = callPackage @@ -116652,6 +117460,7 @@ self: { homepage = "http://github.com/sproingie/haskell-cells/"; description = "Conway's Life cellular automaton"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = [ "i686-linux" "x86_64-linux" ]; }) {}; "lifted-async_0_2_0_2" = callPackage @@ -117302,6 +118111,7 @@ self: { homepage = "http://www.github.com/bgamari/linear-opengl"; description = "Isomorphisms between linear and OpenGL types"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = [ "i686-linux" "x86_64-linux" ]; }) {}; "linear-vect" = callPackage @@ -117502,6 +118312,7 @@ self: { homepage = "http://github.com/bgamari/linux-evdev"; description = "Bindings to Linux evdev input device interface"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = [ "i686-linux" "x86_64-linux" ]; }) {}; "linux-file-extents" = callPackage @@ -117516,6 +118327,7 @@ self: { homepage = "https://github.com/redneb/linux-file-extents"; description = "Retrieve file fragmentation information under Linux"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = [ "i686-linux" "x86_64-linux" ]; }) {}; "linux-inotify" = callPackage @@ -117527,6 +118339,7 @@ self: { libraryHaskellDepends = [ base bytestring hashable unix ]; description = "Thinner binding to the Linux Kernel's inotify interface"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = [ "i686-linux" "x86_64-linux" ]; }) {}; "linux-kmod" = callPackage @@ -117553,6 +118366,7 @@ self: { homepage = "https://github.com/tensor5/linux-mount"; description = "Mount and unmount filesystems"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = [ "i686-linux" "x86_64-linux" ]; }) {}; "linux-namespaces" = callPackage @@ -117565,6 +118379,7 @@ self: { homepage = "https://github.com/redneb/hs-linux-namespaces"; description = "Create new or enter an existing linux namespaces"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = [ "i686-linux" "x86_64-linux" ]; }) {}; "linux-perf" = callPackage @@ -117683,6 +118498,7 @@ self: { ]; description = "Labeled File System interface for LIO"; license = "GPL"; + hydraPlatforms = [ "i686-linux" "x86_64-linux" ]; }) {}; "lio-simple" = callPackage @@ -118662,6 +119478,7 @@ self: { homepage = "http://github.com/dmbarbour/haskell-lmdb"; description = "Lightning MDB bindings"; license = stdenv.lib.licenses.bsd2; + hydraPlatforms = [ "i686-linux" "x86_64-linux" ]; }) {inherit (pkgs) lmdb;}; "load-env" = callPackage @@ -118838,6 +119655,7 @@ self: { homepage = "https://github.com/scrive/log"; description = "Structured logging solution with multiple backends"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = [ "i686-linux" "x86_64-linux" ]; }) {}; "log-domain_0_9_3" = callPackage @@ -119331,6 +120149,7 @@ self: { homepage = "https://github.com/cpeikert/Lol"; description = "A library for lattice cryptography"; license = stdenv.lib.licenses.gpl2; + hydraPlatforms = [ "x86_64-darwin" "x86_64-linux" ]; }) {}; "loli" = callPackage @@ -119967,14 +120786,14 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "luminance_0_6_0_3" = callPackage + "luminance_0_6_0_5" = callPackage ({ mkDerivation, base, containers, contravariant, dlist, gl, linear , mtl, resourcet, semigroups, transformers, vector, void }: mkDerivation { pname = "luminance"; - version = "0.6.0.3"; - sha256 = "8925df1bf702aefda923402e279bd568533fccfcfeb4a358cd4a1388c1fc0323"; + version = "0.6.0.5"; + sha256 = "2dd5fce0374e01c0310ed00c130f8318074b89e2bd318998258e3abc3dd53853"; libraryHaskellDepends = [ base containers contravariant dlist gl linear mtl resourcet semigroups transformers vector void @@ -120002,6 +120821,7 @@ self: { homepage = "https://github.com/phaazon/luminance-samples"; description = "Luminance samples"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = [ "i686-linux" "x86_64-linux" ]; }) {}; "luminance-samples_0_6_0_1" = callPackage @@ -121635,15 +122455,12 @@ self: { }: mkDerivation { pname = "manifolds"; - version = "0.1.5.0"; - sha256 = "de75b6d7105fcec37259fe4e8945056887a92c4441adc2d1921eac992c03acff"; - revision = "2"; - editedCabalFile = "16d1c676e2c50b7bce215171efd8888b99efcbd1217bd0b81e1254d70a2d10fe"; + version = "0.1.5.1"; + sha256 = "12117662e62796ac16c38e707b8cd5da3e40e542cf2caae99f72f3fafb3c34d8"; libraryHaskellDepends = [ base comonad constrained-categories containers deepseq hmatrix MemoTrie semigroups tagged transformers vector vector-space void ]; - jailbreak = true; homepage = "https://github.com/leftaroundabout/manifolds"; description = "Coordinate-free hypersurfaces"; license = stdenv.lib.licenses.gpl3; @@ -122529,6 +123346,7 @@ self: { jailbreak = true; homepage = "http://www.cas.mcmaster.ca/~anand/"; license = stdenv.lib.licenses.mit; + hydraPlatforms = [ "i686-linux" "x86_64-linux" ]; }) {}; "mcmc-samplers" = callPackage @@ -122760,6 +123578,27 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "megaparsec_4_2_0" = callPackage + ({ mkDerivation, base, bytestring, HUnit, mtl, QuickCheck + , test-framework, test-framework-hunit, test-framework-quickcheck2 + , text, transformers + }: + mkDerivation { + pname = "megaparsec"; + version = "4.2.0"; + sha256 = "de76c7e946cc73fcdafc4c78697e4312b1c68a052332d2b34859a176f115a493"; + libraryHaskellDepends = [ base bytestring mtl text transformers ]; + testHaskellDepends = [ + base HUnit mtl QuickCheck test-framework test-framework-hunit + test-framework-quickcheck2 transformers + ]; + jailbreak = true; + homepage = "https://github.com/mrkkrp/megaparsec"; + description = "Monadic parser combinators"; + license = stdenv.lib.licenses.bsd2; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "meldable-heap" = callPackage ({ mkDerivation, base }: mkDerivation { @@ -122940,6 +123779,23 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "memoization-utils" = callPackage + ({ mkDerivation, base, containers, hspec, lrucache, time + , time-units + }: + mkDerivation { + pname = "memoization-utils"; + version = "0.1.0.0"; + sha256 = "250199ba9357b71434d687c48c2989b9ddae4b9cd376c101aeb651589a0367c5"; + libraryHaskellDepends = [ + base containers lrucache time time-units + ]; + testHaskellDepends = [ base hspec time time-units ]; + homepage = "http://github.com/yamadapc/haskell-memoization-utils"; + description = "Utilities for memoizing functions"; + license = stdenv.lib.licenses.mit; + }) {}; + "memoize" = callPackage ({ mkDerivation, base, template-haskell }: mkDerivation { @@ -123077,19 +123933,20 @@ self: { license = stdenv.lib.licenses.mit; }) {}; - "messagepack_0_5_0" = callPackage + "messagepack_0_5_1" = callPackage ({ mkDerivation, base, bytestring, cereal, containers, QuickCheck , test-framework, test-framework-quickcheck2, test-framework-th }: mkDerivation { pname = "messagepack"; - version = "0.5.0"; - sha256 = "6f1900a0df65cede2134a51c6bbe5084aa5a991777698cbeb2cd283b36a93ed8"; + version = "0.5.1"; + sha256 = "e12c22991bd4265e3a52642d0e5970182ecd931afdf8552088d49a524c49625d"; libraryHaskellDepends = [ base bytestring cereal containers ]; testHaskellDepends = [ base bytestring cereal containers QuickCheck test-framework test-framework-quickcheck2 test-framework-th ]; + jailbreak = true; homepage = "https://github.com/rodrigosetti/messagepack"; description = "Serialize instance for Message Pack Object"; license = stdenv.lib.licenses.mit; @@ -123129,6 +123986,24 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "messagepack-rpc_0_5_1" = callPackage + ({ mkDerivation, base, bytestring, cereal, containers, messagepack + , network-simple + }: + mkDerivation { + pname = "messagepack-rpc"; + version = "0.5.1"; + sha256 = "aa7960644668284e6add36e5c305af2c6d3ebf0a9a2c3fcd62529554a049a0bc"; + libraryHaskellDepends = [ + base bytestring cereal containers messagepack network-simple + ]; + jailbreak = true; + homepage = "http://github.com/rodrigosetti/messagepack-rpc"; + description = "Message Pack RPC over TCP"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "messente" = callPackage ({ mkDerivation, base, bytestring, HTTP, http-conduit, network }: mkDerivation { @@ -123588,8 +124463,8 @@ self: { ({ mkDerivation, base, containers, microlens, template-haskell }: mkDerivation { pname = "microlens-th"; - version = "0.2.1.2"; - sha256 = "ea17fb111790953667cd75e1e29823107eb2123ce41c27a77a71d5c7102a39f9"; + version = "0.2.1.3"; + sha256 = "5701a5775e5204729d619dcedd81666dbd94c76574930beebb81cc943805d9a5"; libraryHaskellDepends = [ base containers microlens template-haskell ]; @@ -123835,6 +124710,7 @@ self: { homepage = "https://github.com/evanrinehart/mikmod"; description = "MikMod bindings"; license = "LGPL"; + hydraPlatforms = [ "i686-linux" "x86_64-linux" ]; }) {}; "miku" = callPackage @@ -124376,6 +125252,7 @@ self: { libraryHaskellDepends = [ async base ]; description = "A Haskell bundle of the Minisat SAT solver"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = [ "i686-linux" "x86_64-linux" ]; }) {}; "ministg" = callPackage @@ -126470,6 +127347,7 @@ self: { executableHaskellDepends = [ base filepath hinotify process ]; description = "Do things when files change"; license = stdenv.lib.licenses.mit; + hydraPlatforms = [ "i686-linux" "x86_64-linux" ]; }) {}; "mono-foldable" = callPackage @@ -129776,6 +130654,7 @@ self: { ]; description = "Port of the NeHe OpenGL tutorials to Haskell"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = [ "i686-linux" "x86_64-linux" ]; }) {}; "neil" = callPackage @@ -130333,6 +131212,7 @@ self: { homepage = "https://www.github.com/Mokosha/netwire-input-glfw"; description = "GLFW instance of netwire-input"; license = stdenv.lib.licenses.mit; + hydraPlatforms = [ "i686-linux" "x86_64-linux" ]; }) {}; "network_2_5_0_0" = callPackage @@ -130974,6 +131854,7 @@ self: { jailbreak = true; description = "Haskell bindings for the ifreq structure"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = [ "i686-linux" "x86_64-linux" ]; }) {}; "network-ip" = callPackage @@ -131084,6 +131965,7 @@ self: { jailbreak = true; description = "Haskell bindings for low-level packet sockets (AF_PACKET)"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = [ "i686-linux" "x86_64-linux" ]; }) {}; "network-pgi" = callPackage @@ -131392,8 +132274,8 @@ self: { }: mkDerivation { pname = "network-transport-inmemory"; - version = "0.5.0"; - sha256 = "86bb65576e9a913f4fc802e1fffb95e78ca9b6df62bb8bf236f167656627ccfe"; + version = "0.5.1"; + sha256 = "e34ae4169e91739851b31eda9750d3df711389279961290fd006a79b51a70bdd"; libraryHaskellDepends = [ base bytestring containers data-accessor network-transport stm ]; @@ -132316,6 +133198,7 @@ self: { ]; description = "Painless 3D graphics, no affiliation with gloss"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = [ "i686-linux" "x86_64-linux" ]; }) {}; "not-gloss-examples" = callPackage @@ -132600,6 +133483,18 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "nullary" = callPackage + ({ mkDerivation, base }: + mkDerivation { + pname = "nullary"; + version = "0.1.0.0"; + sha256 = "0cd4f880627ea551167c981feff890c656f560d515296addab99d0c8b47f7ca7"; + libraryHaskellDepends = [ base ]; + homepage = "https://github.com/derekelkins/nullary"; + description = "A package for working with nullary type classes"; + license = stdenv.lib.licenses.bsd2; + }) {}; + "number" = callPackage ({ mkDerivation, base }: mkDerivation { @@ -133282,23 +134177,23 @@ self: { }) {}; "oidc-client" = callPackage - ({ mkDerivation, aeson, attoparsec, base, bytestring, crypto-random - , exceptions, hspec, http-client, http-client-tls, jose-jwt + ({ mkDerivation, aeson, attoparsec, base, bytestring, exceptions + , hspec, http-client, http-client-tls, http-types, jose-jwt , network, network-uri, text, time, tls }: mkDerivation { pname = "oidc-client"; - version = "0.1.0.1"; - sha256 = "53eb07c9e188ff017c10248694ffc9c297b5c8cfdf2bb2992c15caba8c3e9c34"; + version = "0.2.0.0"; + sha256 = "b2d7daa84844d0cc1057bbaffc836bb52ff2992b98a17b4b285778bacdefc03c"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ - aeson attoparsec base bytestring crypto-random exceptions - http-client http-client-tls jose-jwt network network-uri text time - tls + aeson attoparsec base bytestring exceptions http-client + http-client-tls jose-jwt network network-uri text time tls + ]; + testHaskellDepends = [ + base bytestring hspec http-client http-client-tls http-types text ]; - testHaskellDepends = [ base hspec ]; - jailbreak = true; homepage = "https://github.com/krdlab/haskell-oidc-client"; description = "OpenID Connect 1.0 library for RP"; license = stdenv.lib.licenses.mit; @@ -133725,6 +134620,8 @@ self: { pname = "opaleye"; version = "0.4.2.0"; sha256 = "b924c4d0fa7151c0dbaee5ddcd89adfa569614204a805392625752ea6dc13c20"; + revision = "1"; + editedCabalFile = "64de3c71480e306843b335e7672e38548c4c6396222a466901096fa72c49fc17"; libraryHaskellDepends = [ aeson attoparsec base base16-bytestring bytestring case-insensitive contravariant postgresql-simple pretty product-profunctors @@ -135484,6 +136381,34 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "pagerduty_0_0_3_3" = callPackage + ({ mkDerivation, aeson, base, bifunctors, bytestring + , bytestring-conversion, conduit, data-default-class, exceptions + , generics-sop, http-client, http-types, lens, lens-aeson, mmorph + , monad-control, mtl, template-haskell, text, time + , time-locale-compat, transformers, transformers-base + , transformers-compat, unordered-containers + }: + mkDerivation { + pname = "pagerduty"; + version = "0.0.3.3"; + sha256 = "f55d80029003f6748dd00e3dc6b3b38dc99c3d9d4c62f617e3ee93cd25113477"; + revision = "1"; + editedCabalFile = "a73a38fe2e6123a228be6e506783a057ef6a734efe7676184b22becd2d5da938"; + libraryHaskellDepends = [ + aeson base bifunctors bytestring bytestring-conversion conduit + data-default-class exceptions generics-sop http-client http-types + lens lens-aeson mmorph monad-control mtl template-haskell text time + time-locale-compat transformers transformers-base + transformers-compat unordered-containers + ]; + jailbreak = true; + homepage = "http://github.com/brendanhay/pagerduty"; + description = "Client library for PagerDuty Integration and REST APIs"; + license = "unknown"; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "pagerduty" = callPackage ({ mkDerivation, aeson, base, bifunctors, bytestring , bytestring-conversion, conduit, data-default-class, exceptions @@ -136627,6 +137552,7 @@ self: { libraryHaskellDepends = [ array base ]; description = "Simply interfacing the parallel port on linux"; license = "GPL"; + hydraPlatforms = [ "i686-linux" "x86_64-linux" ]; }) {}; "parse-dimacs" = callPackage @@ -136790,12 +137716,12 @@ self: { }) {}; "parsec-trace" = callPackage - ({ mkDerivation, base, containers, mtl, parsec, rosezipper }: + ({ mkDerivation, base, containers, mtl, parsec }: mkDerivation { pname = "parsec-trace"; - version = "0.0.0.1"; - sha256 = "545958904a02ce4277ee428092c159abdd264e711daa1263863f40446f0c3619"; - libraryHaskellDepends = [ base containers mtl parsec rosezipper ]; + version = "0.0.0.2"; + sha256 = "fc55e1feb6ec0247c52c4bdc533924688c4d5dbd29bf5f5a714e9fec6f4aa820"; + libraryHaskellDepends = [ base containers mtl parsec ]; homepage = "http://github.com/sleepomeno/parsec-trace#readme"; description = "Add a hierarchical trace to Parsec parsers"; license = stdenv.lib.licenses.mit; @@ -137296,8 +138222,8 @@ self: { }: mkDerivation { pname = "patches-vector"; - version = "0.1.4.0"; - sha256 = "28694082916c56c5b2c8f74d51cea6babff0e946dfade5b6832edd3977cdb995"; + version = "0.1.4.2"; + sha256 = "39e1784b8e1177c72abc74a7db90210aa317f0aafc8c69defea216ed99d3c70d"; libraryHaskellDepends = [ base edit-distance-vector microlens vector ]; @@ -137779,7 +138705,7 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "pcre-light" = callPackage + "pcre-light_0_4_0_3" = callPackage ({ mkDerivation, base, bytestring, pcre }: mkDerivation { pname = "pcre-light"; @@ -137790,6 +138716,20 @@ self: { homepage = "https://github.com/Daniel-Diaz/pcre-light"; description = "A small, efficient and portable regex library for Perl 5 compatible regular expressions"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {inherit (pkgs) pcre;}; + + "pcre-light" = callPackage + ({ mkDerivation, base, bytestring, pcre }: + mkDerivation { + pname = "pcre-light"; + version = "0.4.0.4"; + sha256 = "02c97e39263d18fd26aa63d52c88c4bfbb5c3f66ab40564552e7f11d5d889e75"; + libraryHaskellDepends = [ base bytestring ]; + libraryPkgconfigDepends = [ pcre ]; + homepage = "https://github.com/Daniel-Diaz/pcre-light"; + description = "Portable regex library for Perl 5 compatible regular expressions"; + license = stdenv.lib.licenses.bsd3; }) {inherit (pkgs) pcre;}; "pcre-light-extra" = callPackage @@ -139856,6 +140796,8 @@ self: { pname = "persistent-template"; version = "2.1.4"; sha256 = "ed9e415d49288c7857febf978e4d97195c95113b9def30655894b48560999bce"; + revision = "1"; + editedCabalFile = "ecb26fe04083fc0e1e9abb16639b60195a49abac88e93b69360cae6c12a488b5"; libraryHaskellDepends = [ aeson aeson-extra base bytestring containers ghc-prim http-api-data monad-control monad-logger path-pieces persistent tagged @@ -142911,7 +143853,7 @@ self: { }) {}; "poppler" = callPackage - ({ mkDerivation, array, base, bytestring, cairo, containers + ({ mkDerivation, array, base, bytestring, cairo, containers, gdk2 , gdk_pixbuf, glib, gtk, gtk2hs-buildtools, mtl, pango, poppler }: mkDerivation { @@ -142921,14 +143863,14 @@ self: { libraryHaskellDepends = [ array base bytestring cairo containers glib gtk mtl ]; - libraryPkgconfigDepends = [ gdk_pixbuf pango poppler ]; + libraryPkgconfigDepends = [ gdk2 gdk_pixbuf pango poppler ]; libraryToolDepends = [ gtk2hs-buildtools ]; homepage = "http://projects.haskell.org/gtk2hs"; description = "Binding to the Poppler"; license = stdenv.lib.licenses.gpl2; hydraPlatforms = stdenv.lib.platforms.none; - }) {inherit (pkgs) gdk_pixbuf; inherit (pkgs.gnome) pango; - inherit (pkgs) poppler;}; + }) {gdk2 = null; inherit (pkgs) gdk_pixbuf; + inherit (pkgs.gnome) pango; inherit (pkgs) poppler;}; "populate-setup-exe-cache" = callPackage ({ mkDerivation, base }: @@ -142964,6 +143906,7 @@ self: { homepage = "http://code.haskell.org/portaudio"; description = "Haskell bindings for the PortAudio library"; license = "unknown"; + hydraPlatforms = [ "i686-linux" "x86_64-linux" ]; }) {inherit (pkgs) portaudio;}; "porte" = callPackage @@ -143112,6 +144055,7 @@ self: { libraryHaskellDepends = [ base unix ]; description = "POSIX Realtime functionality"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = [ "i686-linux" "x86_64-linux" ]; }) {}; "posix-timer" = callPackage @@ -144794,12 +145738,12 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; - "process_1_3_0_0" = callPackage + "process_1_4_0_0" = callPackage ({ mkDerivation, base, deepseq, directory, filepath, unix }: mkDerivation { pname = "process"; - version = "1.3.0.0"; - sha256 = "709b77b7a2a5768c61759fdd000e3b9c47e05cbee7987abf82954fd15d80c3f8"; + version = "1.4.0.0"; + sha256 = "0fdc2a3a593f182f398e7359723240242be1dc9735ca2265e2d90e0be227c4cd"; libraryHaskellDepends = [ base deepseq directory filepath unix ]; testHaskellDepends = [ base ]; description = "Process libraries"; @@ -146108,8 +147052,8 @@ self: { ({ mkDerivation, base, filepath, hspec, template-haskell }: mkDerivation { pname = "publicsuffix"; - version = "0.20151011"; - sha256 = "7497e7242297ee90af9a817302977f6d25539785c352b6bf3088a55181fa5759"; + version = "0.20151102"; + sha256 = "7dae06c884fd6348d0ac76382752a5ee72b42d0efe780d0eb611333956e5deda"; libraryHaskellDepends = [ base filepath template-haskell ]; testHaskellDepends = [ base hspec ]; homepage = "https://github.com/wereHamster/publicsuffix-haskell/"; @@ -146260,6 +147204,7 @@ self: { homepage = "https://github.com/philopon/pugixml-hs"; description = "pugixml binding"; license = stdenv.lib.licenses.mit; + hydraPlatforms = [ "i686-linux" "x86_64-linux" ]; }) {}; "pugs-DrIFT" = callPackage @@ -146339,6 +147284,7 @@ self: { librarySystemDepends = [ libpulseaudio ]; description = "binding to Simple API of pulseaudio"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = [ "i686-linux" "x86_64-linux" ]; }) {inherit (pkgs) libpulseaudio;}; "punkt" = callPackage @@ -146626,7 +147572,7 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; - "purescript" = callPackage + "purescript_0_7_5_3" = callPackage ({ mkDerivation, aeson, aeson-better-errors, ansi-wl-pprint, base , bower-json, boxes, bytestring, containers, directory, dlist , filepath, Glob, haskeline, HUnit, language-javascript @@ -146662,6 +147608,45 @@ self: { homepage = "http://www.purescript.org/"; description = "PureScript Programming Language Compiler"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + + "purescript" = callPackage + ({ mkDerivation, aeson, aeson-better-errors, ansi-wl-pprint, base + , bower-json, boxes, bytestring, containers, directory, dlist + , filepath, Glob, haskeline, HUnit, language-javascript + , lifted-base, monad-control, mtl, optparse-applicative, parsec + , pattern-arrows, process, safe, semigroups, split, syb, text, time + , transformers, transformers-base, transformers-compat + , unordered-containers, utf8-string, vector + }: + mkDerivation { + pname = "purescript"; + version = "0.7.5.4"; + sha256 = "36e3301e0f7d3cce24272b853acc93bba826f42dc3071dc4f7a7a65d1c7cddb5"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + aeson aeson-better-errors base bower-json boxes bytestring + containers directory dlist filepath Glob language-javascript + lifted-base monad-control mtl parsec pattern-arrows process safe + semigroups split syb text time transformers transformers-base + transformers-compat unordered-containers utf8-string vector + ]; + executableHaskellDepends = [ + aeson ansi-wl-pprint base bytestring containers directory filepath + Glob haskeline mtl optparse-applicative parsec process split time + transformers transformers-compat + ]; + testHaskellDepends = [ + base containers directory filepath Glob haskeline HUnit mtl + optparse-applicative parsec process time transformers + transformers-compat + ]; + doCheck = false; + homepage = "http://www.purescript.org/"; + description = "PureScript Programming Language Compiler"; + license = stdenv.lib.licenses.mit; }) {}; "purescript-bundle-fast" = callPackage @@ -147075,6 +148060,24 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "qed" = callPackage + ({ mkDerivation, base, deepseq, directory, exceptions, extra + , filepath, haskell-src-exts, transformers, uniplate + }: + mkDerivation { + pname = "qed"; + version = "0.0"; + sha256 = "282422e8e277ef9dd3175f1b9a97f6843187a12928886c8783f0eeb5a1819ace"; + libraryHaskellDepends = [ + base deepseq directory exceptions extra filepath haskell-src-exts + transformers uniplate + ]; + testHaskellDepends = [ base transformers ]; + homepage = "https://github.com/ndmitchell/qed#readme"; + description = "Simple prover"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "qhull-simple" = callPackage ({ mkDerivation, base, qhull, vector }: mkDerivation { @@ -147346,6 +148349,26 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "quick-schema" = callPackage + ({ mkDerivation, aeson, base, hashable, hspec, QuickCheck + , scientific, text, unordered-containers, vector + }: + mkDerivation { + pname = "quick-schema"; + version = "0.1.0.0"; + sha256 = "99d2e8e25a822063c997681180c4bcb602895785c9740a9756f92c9f5bdc8e6d"; + libraryHaskellDepends = [ + aeson base hashable scientific text unordered-containers vector + ]; + testHaskellDepends = [ + aeson base hspec QuickCheck scientific text unordered-containers + vector + ]; + homepage = "https://github.com/benweitzman/quick-schema"; + description = "Slimmed down json schema language and validator"; + license = stdenv.lib.licenses.mit; + }) {}; + "quickcheck-assertions_0_1_1" = callPackage ({ mkDerivation, base, hspec, ieee754, QuickCheck }: mkDerivation { @@ -148442,6 +149465,7 @@ self: { homepage = "https://bitbucket.org/kpratt/random-variate"; description = "\"Uniform RNG => Non-Uniform RNGs\""; license = stdenv.lib.licenses.mit; + hydraPlatforms = [ "x86_64-darwin" "x86_64-linux" ]; }) {}; "randomgen" = callPackage @@ -148507,13 +149531,17 @@ self: { }) {}; "range-set-list" = callPackage - ({ mkDerivation, base, containers, tasty, tasty-quickcheck }: + ({ mkDerivation, base, containers, deepseq, hashable, semigroups + , tasty, tasty-quickcheck + }: mkDerivation { pname = "range-set-list"; - version = "0.1.0.0"; - sha256 = "c5edb5773ca6df108625f1bf9002b5f71868bab43d0ef9b7c84cb3fc2e0529a9"; - libraryHaskellDepends = [ base ]; - testHaskellDepends = [ base containers tasty tasty-quickcheck ]; + version = "0.1.1.0"; + sha256 = "091b01e7b98b232fcaae126c8b5701e63c08064ff5c29174c85c2a4d5a2cef3c"; + libraryHaskellDepends = [ base deepseq hashable semigroups ]; + testHaskellDepends = [ + base containers deepseq hashable semigroups tasty tasty-quickcheck + ]; homepage = "https://github.com/phadej/range-set-list#readme"; description = "Memory efficient sets with continuous ranges of elements"; license = stdenv.lib.licenses.mit; @@ -148874,8 +149902,8 @@ self: { }: mkDerivation { pname = "rdf4h"; - version = "1.3.4"; - sha256 = "27a34de1a2ce13dc0c9d91a79de5d53484a1209450d4bdc370ae4db56e5a01f3"; + version = "1.3.5"; + sha256 = "dfbe6dd5f6e26e7af696981bd2a9b51a601ba86779cbeb9da67552d923160f7e"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -148955,6 +149983,7 @@ self: { homepage = "https://john-millikin.com/software/haskell-re2/"; description = "Bindings to the re2 regular expression library"; license = stdenv.lib.licenses.mit; + hydraPlatforms = [ "i686-linux" "x86_64-linux" ]; }) {}; "react-flux" = callPackage @@ -149138,6 +150167,7 @@ self: { homepage = "http://wiki.haskell.org/Reactive-banana"; description = "Examples for the reactive-banana library, using wxHaskell"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = [ "i686-linux" "x86_64-linux" ]; }) {}; "reactive-fieldtrip" = callPackage @@ -150119,24 +151149,23 @@ self: { "reflex-dom-contrib" = callPackage ({ mkDerivation, aeson, base, bifunctors, bytestring, containers - , data-default, ghcjs-base, ghcjs-dom, http-types, lens, mtl - , readable, reflex, reflex-dom, string-conv, text, time + , data-default, ghcjs-dom, http-types, lens, mtl, readable, reflex + , reflex-dom, safe, string-conv, text, time }: mkDerivation { pname = "reflex-dom-contrib"; - version = "0.1"; - sha256 = "8c4e997bb3832f6f82c814ded1895cb6c100c0e0cb9dadbcacca35ca4b0c1cf7"; + version = "0.2"; + sha256 = "82a6b1ade13773dc0ed573d4086f75c15971e416f1b11e1d7141b7fc4079ecc5"; libraryHaskellDepends = [ - aeson base bifunctors bytestring containers data-default ghcjs-base - ghcjs-dom http-types lens mtl readable reflex reflex-dom - string-conv text time + aeson base bifunctors bytestring containers data-default ghcjs-dom + http-types lens mtl readable reflex reflex-dom safe string-conv + text time ]; jailbreak = true; homepage = "https://github.com/reflex-frp/reflex-dom-contrib"; description = "A playground for experimenting with infrastructure and common code for reflex applications"; license = stdenv.lib.licenses.bsd3; - broken = true; - }) {ghcjs-base = null;}; + }) {}; "reflex-gloss" = callPackage ({ mkDerivation, base, dependent-sum, gloss, reflex, transformers @@ -150179,6 +151208,7 @@ self: { homepage = "https://github.com/saulzar/reflex-gloss-scene"; description = "A simple scene-graph using reflex and gloss"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = [ "i686-linux" "x86_64-linux" ]; }) {}; "reflex-transformers" = callPackage @@ -150976,16 +152006,16 @@ self: { "rei" = callPackage ({ mkDerivation, attoparsec, base, bytestring, containers - , directory, regex-posix, split + , directory, regex-tdfa, split }: mkDerivation { pname = "rei"; - version = "0.3.2.0"; - sha256 = "703dbda6815d7427f35ccf2c8d4f37bd3f2a3863c7aa01d9bd098cfce90ffdda"; + version = "0.3.3.0"; + sha256 = "b2e70b57846a93e00b8e478c21143d4ed3bcbb855634845e5de658a83b9a91dc"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ - attoparsec base bytestring containers directory regex-posix split + attoparsec base bytestring containers directory regex-tdfa split ]; jailbreak = true; homepage = "https://github.com/kerkomen/rei"; @@ -153858,6 +154888,7 @@ self: { base bytestring containers HUnit QuickCheck test-framework test-framework-hunit test-framework-quickcheck2 text ]; + doCheck = false; homepage = "http://github.com/markhibberd/riak-haskell-client"; description = "A Haskell client for the Riak decentralized data store"; license = "unknown"; @@ -154346,8 +155377,8 @@ self: { }: mkDerivation { pname = "roller"; - version = "0.1.4"; - sha256 = "369a39d93d125550bc5ffc3dd21e89e2b04a611c7200935afbd303042b254fb6"; + version = "0.1.6"; + sha256 = "47d5308161cf067474f8e65f73ad7292a777d4749f5132dd92daf3d7fb43bdb3"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -155868,6 +156899,7 @@ self: { homepage = "https://github.com/tokiwoousaka/Sarasvati"; description = "audio library"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = [ "i686-linux" "x86_64-linux" ]; }) {}; "sasl" = callPackage @@ -155938,6 +156970,7 @@ self: { homepage = "https://github.com/jwaldmann/satchmo"; description = "SAT encoding monad"; license = "GPL"; + hydraPlatforms = [ "i686-linux" "x86_64-linux" ]; }) {}; "satchmo-backends" = callPackage @@ -156019,6 +157052,7 @@ self: { homepage = "https://github.com/msakai/satchmo-toysat"; description = "toysat driver as backend for satchmo"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = [ "i686-linux" "x86_64-linux" ]; }) {}; "sbp" = callPackage @@ -157309,25 +158343,6 @@ self: { }) {inherit (pkgs) SDL2;}; "sdl2" = callPackage - ({ mkDerivation, base, bytestring, exceptions, linear, SDL2 - , StateVar, text, transformers, vector - }: - mkDerivation { - pname = "sdl2"; - version = "2.0.0"; - sha256 = "d6acf9bd5ac10a9a47f2823ac8773afb5e82a6b85cc9e83a89de819e51bf8411"; - isLibrary = true; - isExecutable = true; - libraryHaskellDepends = [ - base bytestring exceptions linear StateVar text transformers vector - ]; - librarySystemDepends = [ SDL2 ]; - libraryPkgconfigDepends = [ SDL2 ]; - description = "Both high- and low-level bindings to the SDL library (version 2.0.3)."; - license = stdenv.lib.licenses.bsd3; - }) {inherit (pkgs) SDL2;}; - - "sdl2_2_1_0" = callPackage ({ mkDerivation, base, bytestring, exceptions, linear, SDL2 , StateVar, text, transformers, vector }: @@ -157344,7 +158359,7 @@ self: { libraryPkgconfigDepends = [ SDL2 ]; description = "Both high- and low-level bindings to the SDL library (version 2.0.3)."; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + hydraPlatforms = [ "i686-linux" "x86_64-linux" ]; }) {inherit (pkgs) SDL2;}; "sdl2-cairo" = callPackage @@ -157358,17 +158373,26 @@ self: { libraryHaskellDepends = [ base cairo linear mtl random sdl2 time ]; description = "Render with Cairo on SDL textures. Includes optional convenience drawing API."; license = stdenv.lib.licenses.mit; + hydraPlatforms = [ "i686-linux" "x86_64-linux" ]; }) {}; "sdl2-compositor" = callPackage - ({ mkDerivation, base, linear, sdl2, transformers }: + ({ mkDerivation, base, lens, linear, lrucache, QuickCheck, sdl2 + , sdl2-ttf, StateVar, stm, text, transformers + }: mkDerivation { pname = "sdl2-compositor"; - version = "1.1"; - sha256 = "020d61ce6bd9dff14b18352d90d56310d3b7e7fad50ac8d82961cf2c6889f991"; - libraryHaskellDepends = [ base linear sdl2 transformers ]; + version = "1.2.0.1"; + sha256 = "55d3242e8b119b2cd0b4a5d198fb52c38bf36931aef30b6d250334373931a4a3"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + base lens linear lrucache QuickCheck sdl2 sdl2-ttf StateVar stm + text transformers + ]; description = "image compositing with sdl2 - declarative style"; license = stdenv.lib.licenses.gpl3; + hydraPlatforms = [ "i686-linux" "x86_64-linux" ]; }) {}; "sdl2-image" = callPackage @@ -157830,6 +158854,7 @@ self: { homepage = "http://nonempty.org/software/haskell-select"; description = "Wrap the select(2) POSIX function"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = [ "i686-linux" "x86_64-linux" ]; }) {}; "selectors" = callPackage @@ -158840,6 +159865,18 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "servant-cassava" = callPackage + ({ mkDerivation, base, cassava, http-media, servant, vector }: + mkDerivation { + pname = "servant-cassava"; + version = "0.4.4.5"; + sha256 = "2db20898f6dc5bc6847247ad0bf5fd797fe70f6f31bac3716846fad1f5a44b6d"; + libraryHaskellDepends = [ base cassava http-media servant vector ]; + homepage = "http://haskell-servant.github.io/"; + description = "Servant CSV content-type for cassava"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "servant-client_0_2_2" = callPackage ({ mkDerivation, aeson, attoparsec, base, bytestring, deepseq , either, exceptions, hspec, http-client, http-client-tls @@ -159590,6 +160627,22 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "servant-swagger" = callPackage + ({ mkDerivation, aeson, base, bytestring, containers, hashable + , lens, servant, text, unordered-containers, uuid + }: + mkDerivation { + pname = "servant-swagger"; + version = "0.0.0.1"; + sha256 = "7c9b93912cc6aa617b4d068624c3b927f58f8dfb3f153c8be51c7fc5c22c0b4e"; + libraryHaskellDepends = [ + aeson base bytestring containers hashable lens servant text + unordered-containers uuid + ]; + description = "Swagger"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "servant-yaml" = callPackage ({ mkDerivation, aeson, base, base-compat, bytestring, http-media , servant, servant-server, wai, warp, yaml @@ -163659,8 +164712,8 @@ self: { }: mkDerivation { pname = "smsaero"; - version = "0.3"; - sha256 = "18b18032c6f898446ec462cc25b64e38a7e2e46125742b30babffece8c4bcff4"; + version = "0.4"; + sha256 = "0069050ab5427a44b89d12aead64205d04e5ac421cf39acf1ee19a835a3a690a"; libraryHaskellDepends = [ aeson base either lens servant servant-client servant-docs text time @@ -165415,6 +166468,7 @@ self: { homepage = "http://github.com/bos/snappy"; description = "Bindings to the Google Snappy library for fast compression/decompression"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = [ "i686-linux" "x86_64-linux" ]; }) {inherit (pkgs) snappy;}; "snappy-conduit" = callPackage @@ -165428,6 +166482,7 @@ self: { homepage = "http://github.com/tatac1/snappy-conduit/"; description = "Conduit bindings for Snappy (see snappy package)"; license = stdenv.lib.licenses.mit; + hydraPlatforms = [ "i686-linux" "x86_64-linux" ]; }) {}; "snappy-framing" = callPackage @@ -165440,6 +166495,7 @@ self: { homepage = "https://github.com/kim/snappy-framing"; description = "Snappy Framing Format in Haskell"; license = "unknown"; + hydraPlatforms = [ "i686-linux" "x86_64-linux" ]; }) {}; "snappy-iteratee" = callPackage @@ -165643,6 +166699,7 @@ self: { homepage = "http://code.mathr.co.uk/snowglobe"; description = "randomized fractal snowflakes demo"; license = stdenv.lib.licenses.gpl3; + hydraPlatforms = [ "i686-linux" "x86_64-linux" ]; }) {}; "soap_0_2_2_5" = callPackage @@ -166627,6 +167684,7 @@ self: { homepage = "http://github.com/crockeo/spice"; description = "An FRP-based game engine written in Haskell"; license = stdenv.lib.licenses.mit; + hydraPlatforms = [ "i686-linux" "x86_64-linux" ]; }) {}; "spike" = callPackage @@ -169684,6 +170742,7 @@ self: { homepage = "https://github.com/debug-ito/stopwatch"; description = "A simple stopwatch utility"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = [ "i686-linux" "x86_64-linux" ]; }) {}; "storable" = callPackage @@ -169925,8 +170984,8 @@ self: { }: mkDerivation { pname = "streaming"; - version = "0.1.2.0"; - sha256 = "0d87f29d78856604c4ce3ebe6d62a5c5ed1726a25e68a929be0520b94c6834d1"; + version = "0.1.2.2"; + sha256 = "1d67401731689b4904fff6fa45ed7257c0c076e4e619714c48443804b6e94beb"; libraryHaskellDepends = [ base bytestring mmorph mtl time transformers ]; @@ -169941,8 +171000,8 @@ self: { }: mkDerivation { pname = "streaming-bytestring"; - version = "0.1.2.0"; - sha256 = "8a99afb8fbed135a4ac90044b34831decde7c62b3189c828ee075ca45983f23d"; + version = "0.1.2.2"; + sha256 = "db5ab6c378458e57c4441f49b8564b9acfb5e64079b2c5c651d116ad0908c48d"; libraryHaskellDepends = [ base bytestring deepseq mmorph mtl streaming transformers ]; @@ -170233,16 +171292,16 @@ self: { }: mkDerivation { pname = "streaming-utils"; - version = "0.1.2.0"; - sha256 = "c79efd9323e48362522751c1c6d6affe77b400078515bcd77e1c364b11e2e7e8"; + version = "0.1.2.2"; + sha256 = "98aa08e5fb3665b7aa39934f657daf9473553a54946dd3102833e66c7cc65e4e"; libraryHaskellDepends = [ aeson attoparsec base bytestring http-client http-client-tls json-stream mtl pipes streaming streaming-bytestring transformers ]; - jailbreak = true; homepage = "https://github.com/michaelt/streaming-utils"; description = "http, attoparsec, pipes and conduit utilities for the streaming libraries"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = [ "x86_64-darwin" "x86_64-linux" ]; }) {}; "streamproc" = callPackage @@ -170674,8 +171733,8 @@ self: { }: mkDerivation { pname = "stripe-core"; - version = "2.0.1"; - sha256 = "5b4bda9b0d6ad787f58f86a0c4959247a2e1f27346a71c227bd6ecae2c4b2f2e"; + version = "2.0.2"; + sha256 = "73ecdfae962260b4db665149c4836e5caec80dfa18be534e8d088df69cac0a94"; libraryHaskellDepends = [ aeson base bytestring mtl text time transformers unordered-containers @@ -170689,8 +171748,8 @@ self: { ({ mkDerivation, base, stripe-core, stripe-http-streams }: mkDerivation { pname = "stripe-haskell"; - version = "2.0.1"; - sha256 = "255a813512a564ddcdd82c502b1ed1899cfb7ee729db4c82f9c50e0dd3aa7e3f"; + version = "2.0.2"; + sha256 = "7320b4650523b8c481543bd66c7e287c8e390722bc3a923cc2734384a39d7b50"; libraryHaskellDepends = [ base stripe-core stripe-http-streams ]; homepage = "https://github.com/dmjio/stripe"; description = "Stripe API for Haskell"; @@ -170703,8 +171762,8 @@ self: { }: mkDerivation { pname = "stripe-http-streams"; - version = "2.0.1"; - sha256 = "28c96ecb38d31d04d6fc96334229d079a4dbebc1aaf149df42197bb42fa47c63"; + version = "2.0.2"; + sha256 = "0de3899464bc77aec508c3f45335493795d97e1e0b12c8e867189853bd8bc717"; libraryHaskellDepends = [ aeson base bytestring HsOpenSSL http-streams io-streams stripe-core text @@ -172077,36 +173136,35 @@ self: { }) {}; "sync-mht" = callPackage - ({ mkDerivation, array, base, base16-bytestring, byteable + ({ mkDerivation, array, base, base16-bytestring, byteable, bytes , bytestring, cereal, containers, cryptohash, directory, exceptions , filepath, HUnit, io-streams, mtl, process, random, regex-compat , temporary, text, time, transformers, unix, zlib }: mkDerivation { pname = "sync-mht"; - version = "0.3.7.0"; - sha256 = "ffabd97017d74f64adce7fc4b0ca55e8833ea957327c7eb09ae3daa7a12c3838"; + version = "0.3.8.0"; + sha256 = "4d30bf2e5b80b7961eeb3f758ffc28025eaf4afc54cfc9d18647f5aac543b51d"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ - array base base16-bytestring byteable bytestring cereal containers - cryptohash directory exceptions filepath HUnit io-streams mtl - process random regex-compat temporary text time transformers unix - zlib + array base base16-bytestring byteable bytes bytestring cereal + containers cryptohash directory exceptions filepath HUnit + io-streams mtl process random regex-compat temporary text time + transformers unix zlib ]; executableHaskellDepends = [ - array base base16-bytestring byteable bytestring cereal containers - cryptohash directory exceptions filepath HUnit io-streams mtl - process random regex-compat temporary text time transformers unix - zlib + array base base16-bytestring byteable bytes bytestring cereal + containers cryptohash directory exceptions filepath HUnit + io-streams mtl process random regex-compat temporary text time + transformers unix zlib ]; testHaskellDepends = [ - array base base16-bytestring byteable bytestring cereal containers - cryptohash directory exceptions filepath HUnit io-streams mtl - process random regex-compat temporary text time transformers unix - zlib + array base base16-bytestring byteable bytes bytestring cereal + containers cryptohash directory exceptions filepath HUnit + io-streams mtl process random regex-compat temporary text time + transformers unix zlib ]; - jailbreak = true; homepage = "https://github.com/ekarayel/sync-mht"; description = "Fast incremental file transfer using Merkle-Hash-Trees"; license = stdenv.lib.licenses.mit; @@ -172987,6 +174045,7 @@ self: { homepage = "https://github.com/joeyadams/haskell-system-time-monotonic"; description = "Simple library for using the system's monotonic clock"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = [ "i686-linux" "x86_64-linux" ]; }) {}; "system-util" = callPackage @@ -173330,7 +174389,7 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; - "tagged" = callPackage + "tagged_0_8_1" = callPackage ({ mkDerivation, base, template-haskell }: mkDerivation { pname = "tagged"; @@ -173340,6 +174399,19 @@ self: { homepage = "http://github.com/ekmett/tagged"; description = "Haskell 98 phantom types to avoid unsafely passing dummy arguments"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + + "tagged" = callPackage + ({ mkDerivation, base, deepseq, template-haskell }: + mkDerivation { + pname = "tagged"; + version = "0.8.2"; + sha256 = "e415d83329dba6c6b604cdf7ab331d321fa62d396f15e79439caa58279d6b77c"; + libraryHaskellDepends = [ base deepseq template-haskell ]; + homepage = "http://github.com/ekmett/tagged"; + description = "Haskell 98 phantom types to avoid unsafely passing dummy arguments"; + license = stdenv.lib.licenses.bsd3; }) {}; "tagged-binary" = callPackage @@ -173834,6 +174906,8 @@ self: { pname = "tar"; version = "0.4.2.2"; sha256 = "4242573a8d0b4df721177ae36d277b4be68616ba7d8da645dab999d1e1464ced"; + revision = "1"; + editedCabalFile = "fcb87aaed6a22fef908468f008f39507fa1d22282c23dfb6ddb6837b794c2a30"; libraryHaskellDepends = [ array base bytestring directory filepath time ]; @@ -174666,26 +175740,6 @@ self: { }) {}; "tellbot" = callPackage - ({ mkDerivation, base, bifunctors, bytestring, containers - , http-conduit, mtl, network, regex-pcre, split, tagsoup, text - , time, transformers - }: - mkDerivation { - pname = "tellbot"; - version = "0.6.0.3"; - sha256 = "98687019cc8a813f0f19adb3d501f1e16ad7deed6bf6df0d38b968ac3b8e2578"; - isLibrary = false; - isExecutable = true; - executableHaskellDepends = [ - base bifunctors bytestring containers http-conduit mtl network - regex-pcre split tagsoup text time transformers - ]; - homepage = "https://github.com/phaazon/tellbot"; - description = "IRC tellbot"; - license = stdenv.lib.licenses.gpl3; - }) {}; - - "tellbot_0_6_0_4" = callPackage ({ mkDerivation, base, bifunctors, bytestring, containers , http-conduit, mtl, network, regex-pcre, split, tagsoup, text , time, transformers @@ -174703,7 +175757,6 @@ self: { homepage = "https://github.com/phaazon/tellbot"; description = "IRC tellbot"; license = stdenv.lib.licenses.gpl3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "template" = callPackage @@ -175094,7 +176147,7 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; - "terminal-size" = callPackage + "terminal-size_0_3_2" = callPackage ({ mkDerivation, base }: mkDerivation { pname = "terminal-size"; @@ -175105,6 +176158,18 @@ self: { libraryHaskellDepends = [ base ]; description = "Get terminal window height and width"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + + "terminal-size" = callPackage + ({ mkDerivation, base }: + mkDerivation { + pname = "terminal-size"; + version = "0.3.2.1"; + sha256 = "b5c23e964756bc13914649a67d63233f59ad0a813abe7cadeb2fc9d586dc9658"; + libraryHaskellDepends = [ base ]; + description = "Get terminal window height and width"; + license = stdenv.lib.licenses.bsd3; }) {}; "termination-combinators" = callPackage @@ -176722,6 +177787,7 @@ self: { homepage = "http://github.com/sheyll/tftp"; description = "A library for building tftp servers"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = [ "i686-linux" "x86_64-linux" ]; }) {}; "tga" = callPackage @@ -176880,7 +177946,7 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; - "th-desugar" = callPackage + "th-desugar_1_5_4_1" = callPackage ({ mkDerivation, base, containers, hspec, HUnit, mtl, syb , template-haskell, th-lift, th-orphans }: @@ -176898,9 +177964,10 @@ self: { homepage = "http://www.cis.upenn.edu/~eir/packages/th-desugar"; description = "Functions to desugar Template Haskell"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; - "th-desugar_1_5_5" = callPackage + "th-desugar" = callPackage ({ mkDerivation, base, containers, hspec, HUnit, mtl, syb , template-haskell, th-lift, th-orphans }: @@ -176918,7 +177985,6 @@ self: { homepage = "http://www.cis.upenn.edu/~eir/packages/th-desugar"; description = "Functions to desugar Template Haskell"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "th-expand-syns_0_3_0_4" = callPackage @@ -177166,6 +178232,23 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "th-orphans_0_13_0" = callPackage + ({ mkDerivation, base, hspec, mtl, template-haskell, th-lift + , th-reify-many + }: + mkDerivation { + pname = "th-orphans"; + version = "0.13.0"; + sha256 = "bdaeee2a3588e0622f2036481974dfe1bd135a3d71004393c94201d8d700be80"; + libraryHaskellDepends = [ + base mtl template-haskell th-lift th-reify-many + ]; + testHaskellDepends = [ base hspec template-haskell ]; + description = "Orphan instances for TH datatypes"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "th-printf" = callPackage ({ mkDerivation, attoparsec, base, bytestring, hspec, HUnit , QuickCheck, template-haskell, text, transformers @@ -177605,10 +178688,8 @@ self: { }: mkDerivation { pname = "threepenny-gui"; - version = "0.6.0.3"; - sha256 = "cd515ba8a3743c67eaae62374a0c0f3ba303a77abb38b4b042ba80f3ffe61913"; - revision = "1"; - editedCabalFile = "5d40d3aa73af1e9183ce2e878f4cd8d3e4f0e0f317d45f99bc014370f63927b0"; + version = "0.6.0.4"; + sha256 = "e334bcdb0a09c590b161df6cfe8e79bfd3b5f798711e83705e9d7c6e9dd1eaad"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -177617,7 +178698,6 @@ self: { template-haskell text transformers unordered-containers vault vector websockets websockets-snap ]; - jailbreak = true; homepage = "http://wiki.haskell.org/Threepenny-gui"; description = "GUI framework that uses the web browser as a display"; license = stdenv.lib.licenses.bsd3; @@ -178721,12 +179801,11 @@ self: { }: mkDerivation { pname = "tld"; - version = "0.1.0.1"; - sha256 = "abbb0d689b6ce1fcd319107e3834e1652eaf8c9ca1b9696187b6ce15110caad1"; + version = "0.2.0.0"; + sha256 = "3d02c17a2f330e21e840177fccc539d78347340125992aaa6238ab9f2b2456e9"; libraryHaskellDepends = [ base containers network-uri template-haskell text ]; - jailbreak = true; description = "This project separates subdomains, domains, and top-level-domains from URLs"; license = stdenv.lib.licenses.mit; }) {}; @@ -180549,8 +181628,8 @@ self: { }: mkDerivation { pname = "tttool"; - version = "1.5"; - sha256 = "f5e2f15a6d93bd4cf5f3e93d2616d891423b985f5a731e087743f211b9e2cadd"; + version = "1.5.0.1"; + sha256 = "cc1e6e18e9c6ec09e4ad313246a20096e7a152359ac09fc891a2a31b051e1080"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -180857,6 +181936,7 @@ self: { libraryHaskellDepends = [ base gloss parsec time ]; description = "Lab Assignments Environment at Univeriteit Twente"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = [ "i686-linux" "x86_64-linux" ]; }) {}; "twentefp-eventloop-graphics" = callPackage @@ -181465,13 +182545,17 @@ self: { }) {}; "type-combinators" = callPackage - ({ mkDerivation, base }: + ({ mkDerivation, base, containers, mtl, template-haskell + , transformers + }: mkDerivation { pname = "type-combinators"; - version = "0.1.0.1"; - sha256 = "33e2ae3af0db672119821b4084728a8a120dc2bbf98d102c228f32bbbdbf233e"; - libraryHaskellDepends = [ base ]; - homepage = "http://github.com/kylcarte/type-combinators"; + version = "0.1.2.1"; + sha256 = "67e8b5b1a92a4e578ab741d11ad883587dbf4451dc5a14774733181e0e570420"; + libraryHaskellDepends = [ + base containers mtl template-haskell transformers + ]; + homepage = "https://github.com/kylcarte/type-combinators"; description = "A collection of data types for type-level programming"; license = stdenv.lib.licenses.bsd3; }) {}; @@ -181934,8 +183018,8 @@ self: { }: mkDerivation { pname = "typed-wire"; - version = "0.2.1.1"; - sha256 = "b2d13a6b02074748ed0daed2be38c754cad2b9499826b14d83e582bdab72c481"; + version = "0.2.1.3"; + sha256 = "733ca272fee3a4e36c35e92fd34628a0db6076ea371724ce8046f8389f2cdcdc"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -185289,6 +186373,25 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "validate-input_0_4_0_0" = callPackage + ({ mkDerivation, base, bytestring, either, hspec, mtl, pcre-heavy + , QuickCheck, semigroups, string-conversions, text + }: + mkDerivation { + pname = "validate-input"; + version = "0.4.0.0"; + sha256 = "20fae24b17429df923b835968720b76c581dc2c5037a2df9374b98a3fa41a1f9"; + libraryHaskellDepends = [ + base bytestring either mtl pcre-heavy semigroups string-conversions + text + ]; + testHaskellDepends = [ base hspec QuickCheck ]; + homepage = "https://github.com/agrafix/validate-input"; + description = "Input validation combinator library"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "validated-literals" = callPackage ({ mkDerivation, base, bytestring, template-haskell }: mkDerivation { @@ -185533,6 +186636,7 @@ self: { homepage = "http://github.com/dmbarbour/haskell-vcache"; description = "semi-transparent persistence for Haskell using LMDB, STM"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = [ "i686-linux" "x86_64-linux" ]; }) {}; "vcache-trie" = callPackage @@ -185549,6 +186653,7 @@ self: { homepage = "http://github.com/dmbarbour/haskell-vcache-trie"; description = "patricia tries modeled above VCache"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = [ "i686-linux" "x86_64-linux" ]; }) {}; "vcard" = callPackage @@ -185698,6 +186803,7 @@ self: { homepage = "http://code.haskell.org/~bkomuves/"; description = "OpenGL support for the `vect' low-dimensional linear algebra library"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = [ "i686-linux" "x86_64-linux" ]; }) {}; "vector_0_10_9_3" = callPackage @@ -186361,6 +187467,22 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "versions" = callPackage + ({ mkDerivation, base, either, extra, parsec, semigroups, tasty + , tasty-hunit, text, text-show + }: + mkDerivation { + pname = "versions"; + version = "1.0.1"; + sha256 = "f4a573dac612543d0cce24338cd127a7cb17c98cfdc3bd353792f21584e083ed"; + libraryHaskellDepends = [ base parsec semigroups text text-show ]; + testHaskellDepends = [ + base either extra semigroups tasty tasty-hunit text text-show + ]; + description = "Types and parsers for software version numbers"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "vhd" = callPackage ({ mkDerivation, base, byteable, bytestring, cereal, cipher-aes , cryptohash, directory, filepath, mmap, QuickCheck, random @@ -186559,6 +187681,7 @@ self: { ]; description = "Utilities for working with OpenGL's GLSL shading language and vinyl records"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = [ "i686-linux" "x86_64-linux" ]; }) {}; "vinyl-json" = callPackage @@ -192921,6 +194044,7 @@ self: { homepage = "https://wiki.haskell.org/WxHaskell"; description = "wxHaskell"; license = "unknown"; + hydraPlatforms = [ "i686-linux" "x86_64-linux" ]; }) {}; "wxAsteroids" = callPackage @@ -192970,6 +194094,7 @@ self: { homepage = "https://wiki.haskell.org/WxHaskell"; description = "wxHaskell C++ wrapper"; license = "unknown"; + hydraPlatforms = [ "i686-linux" "x86_64-linux" ]; }) {inherit (pkgs.xorg) libX11; inherit (pkgs) mesa; inherit (pkgs) wxGTK;}; @@ -192989,6 +194114,7 @@ self: { homepage = "https://wiki.haskell.org/WxHaskell"; description = "wxHaskell core"; license = "unknown"; + hydraPlatforms = [ "i686-linux" "x86_64-linux" ]; }) {inherit (pkgs) wxGTK;}; "wxdirect" = callPackage @@ -193515,6 +194641,7 @@ self: { ]; description = "Haskell extended file attributes interface"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = [ "i686-linux" "x86_64-linux" ]; }) {inherit (pkgs) attr;}; "xbattbar" = callPackage @@ -193529,6 +194656,7 @@ self: { homepage = "https://github.com/polachok/xbattbar"; description = "Simple battery indicator"; license = stdenv.lib.licenses.mit; + hydraPlatforms = [ "i686-linux" "x86_64-linux" ]; }) {}; "xcb-types" = callPackage @@ -193883,6 +195011,7 @@ self: { testHaskellDepends = [ base unix ]; description = "Haskell bindings for libxkbcommon"; license = stdenv.lib.licenses.mit; + hydraPlatforms = [ "i686-linux" "x86_64-linux" ]; }) {inherit (pkgs) libxkbcommon;}; "xkcd" = callPackage @@ -195086,6 +196215,7 @@ self: { homepage = "https://github.com/LeifW/xmonad-utils"; description = "A small collection of X utilities"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = [ "i686-linux" "x86_64-linux" ]; }) {}; "xmonad-wallpaper" = callPackage @@ -195392,6 +196522,7 @@ self: { homepage = "http://github.com/alanz/xtc"; description = "eXtended & Typed Controls for wxHaskell"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = [ "i686-linux" "x86_64-linux" ]; }) {}; "xtest" = callPackage @@ -196094,6 +197225,7 @@ self: { homepage = "https://github.com/ksaveljev/yampa-2048"; description = "2048 game clone using Yampa/Gloss"; license = stdenv.lib.licenses.mit; + hydraPlatforms = [ "i686-linux" "x86_64-linux" ]; }) {}; "yaop" = callPackage @@ -199866,12 +200998,11 @@ self: { }: mkDerivation { pname = "yesod-paginator"; - version = "0.9.1"; - sha256 = "b5a81db2f2263f81e4cd6ef32bdb3bebe7ab1ebe3eb2cab91dcab66ddc4b2176"; + version = "0.10.0"; + sha256 = "d5316cc72b8c59fc5cac5b4b31deb4597d3ea9c86a5e58b914d38e07ca34af65"; libraryHaskellDepends = [ base persistent resourcet text transformers yesod ]; - jailbreak = true; homepage = "http://github.com/pbrisbin/yesod-paginator"; description = "A pagination approach for yesod"; license = stdenv.lib.licenses.bsd3; @@ -201217,6 +202348,7 @@ self: { ]; description = "A rope data structure used by Yi"; license = stdenv.lib.licenses.gpl2; + hydraPlatforms = [ "i686-linux" "x86_64-linux" ]; }) {}; "yi-snippet" = callPackage @@ -201580,6 +202712,7 @@ self: { homepage = "http://bitbucket.org/iago/z3-haskell"; description = "Bindings for the Z3 Theorem Prover"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = [ "i686-linux" "x86_64-linux" ]; }) {gomp = null; inherit (pkgs) z3;}; "zalgo" = callPackage @@ -201708,7 +202841,7 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; - "zero" = callPackage + "zero_0_1_3" = callPackage ({ mkDerivation, base, semigroups }: mkDerivation { pname = "zero"; @@ -201718,6 +202851,41 @@ self: { homepage = "https://github.com/phaazon/zero"; description = "Semigroups with absorption"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + + "zero" = callPackage + ({ mkDerivation, base, semigroups }: + mkDerivation { + pname = "zero"; + version = "0.1.3.1"; + sha256 = "ff37a60d48c7c6fa648699c7f0d2a6b923b6565d6843e2f90e50218e098bb85b"; + libraryHaskellDepends = [ base semigroups ]; + homepage = "https://github.com/phaazon/zero"; + description = "Semigroups with absorption"; + license = stdenv.lib.licenses.bsd3; + }) {}; + + "zerobin" = callPackage + ({ mkDerivation, aeson, base, base64-bytestring, bytestring + , cryptonite, docopt, http-conduit, memory, raw-strings-qq + }: + mkDerivation { + pname = "zerobin"; + version = "1.2.0"; + sha256 = "0e4194c0d3061bbb2a6f1affd836164b52746a5227844d62835c3e0185bf5fe5"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + aeson base base64-bytestring bytestring cryptonite http-conduit + memory + ]; + executableHaskellDepends = [ + base bytestring docopt raw-strings-qq + ]; + jailbreak = true; + description = "Post to 0bin services"; + license = stdenv.lib.licenses.mit; }) {}; "zeromq-haskell" = callPackage From cdc4c4f906eab61cac3ff39fcbaacd15292774a2 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Mon, 2 Nov 2015 17:51:19 +0100 Subject: [PATCH 145/162] LTS Haskell: add version 3.12 --- pkgs/top-level/haskell-packages.nix | 3 +++ 1 file changed, 3 insertions(+) diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix index 421bba24568f..5842cc3331f6 100644 --- a/pkgs/top-level/haskell-packages.nix +++ b/pkgs/top-level/haskell-packages.nix @@ -282,6 +282,9 @@ rec { lts-3_11 = packages.ghc7102.override { packageSetConfig = callPackage ../development/haskell-modules/configuration-lts-3.11.nix { }; }; + lts-3_12 = packages.ghc7102.override { + packageSetConfig = callPackage ../development/haskell-modules/configuration-lts-3.12.nix { }; + }; }; } From 2b3485181f89649f0066c53cc762ec92aa786368 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Tue, 3 Nov 2015 13:30:37 +0100 Subject: [PATCH 146/162] git-annex: update overrides --- pkgs/development/haskell-modules/configuration-common.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix index f372030b38ec..bc3284bcf2bc 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -64,7 +64,7 @@ self: super: { # all required dependencies are part of Stackage. To comply with Stackage, we # make 'git-annex-without-assistant' our default version, but offer another # build which has the assistant to be used in the top-level. - git-annex_5_20151019 = (disableCabalFlag super.git-annex_5_20151019 "assistant").override { + git-annex_5_20150727 = (disableCabalFlag super.git-annex_5_20150727 "assistant").override { dbus = if pkgs.stdenv.isLinux then self.dbus else null; fdo-notify = if pkgs.stdenv.isLinux then self.fdo-notify else null; hinotify = if pkgs.stdenv.isLinux then self.hinotify else self.fsnotify; From f119c9d43d1c13edc57875a9959ae2237f850f4f Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Wed, 4 Nov 2015 15:02:43 +0100 Subject: [PATCH 147/162] configuration-hackage2nix.yaml: update list of broken builds --- .../configuration-hackage2nix.yaml | 331 +++++++++++++----- 1 file changed, 252 insertions(+), 79 deletions(-) diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml index 6ca05c89143f..8f9bc69518bd 100644 --- a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml +++ b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml @@ -139,9 +139,11 @@ dont-distribute-packages: yices-painless: [ i686-linux, x86_64-linux, x86_64-darwin ] # soft restrictions because of build errors + 3d-graphics-examples: [ x86_64-darwin ] 3dmodels: [ i686-linux, x86_64-linux, x86_64-darwin ] 4Blocks: [ i686-linux, x86_64-linux, x86_64-darwin ] abcBridge: [ i686-linux, x86_64-linux, x86_64-darwin ] + abc-puzzle: [ x86_64-darwin ] abstract-par-accelerate: [ i686-linux, x86_64-linux, x86_64-darwin ] AC-BuildPlatform: [ i686-linux, x86_64-linux, x86_64-darwin ] accelerate-arithmetic: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -174,6 +176,7 @@ dont-distribute-packages: adhoc-network: [ i686-linux, x86_64-linux, x86_64-darwin ] adict: [ i686-linux, x86_64-linux, x86_64-darwin ] adobe-swatch-exchange: [ i686-linux, x86_64-linux, x86_64-darwin ] + ADPfusion: [ i686-linux, x86_64-linux, x86_64-darwin ] adp-multi: [ i686-linux, x86_64-linux, x86_64-darwin ] adp-multi-monadiccp: [ i686-linux, x86_64-linux, x86_64-darwin ] Advgame: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -198,6 +201,7 @@ dont-distribute-packages: ajhc: [ i686-linux, x86_64-linux, x86_64-darwin ] alea: [ i686-linux, x86_64-linux, x86_64-darwin ] algebraic: [ i686-linux, x86_64-linux, x86_64-darwin ] + AlignmentAlgorithms: [ i686-linux, x86_64-linux, x86_64-darwin ] Allure: [ i686-linux, x86_64-linux, x86_64-darwin ] alms: [ i686-linux, x86_64-linux, x86_64-darwin ] alpha: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -279,6 +283,8 @@ dont-distribute-packages: aterm-utils: [ i686-linux, x86_64-linux, x86_64-darwin ] atlassian-connect-core: [ i686-linux, x86_64-linux, x86_64-darwin ] atlassian-connect-descriptor: [ i686-linux, x86_64-linux, x86_64-darwin ] + atomic-primops-foreign: [ x86_64-darwin ] + atomic-primops-vector: [ i686-linux, x86_64-linux, x86_64-darwin ] atom-msp430: [ i686-linux, x86_64-linux, x86_64-darwin ] atomo: [ i686-linux, x86_64-linux, x86_64-darwin ] AttoJson: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -318,6 +324,7 @@ dont-distribute-packages: aws-sns: [ i686-linux, x86_64-linux, x86_64-darwin ] azure-service-api: [ i686-linux, x86_64-linux, x86_64-darwin ] azurify: [ i686-linux, x86_64-linux, x86_64-darwin ] + babylon: [ x86_64-darwin ] backdropper: [ i686-linux, x86_64-linux, x86_64-darwin ] Baggins: [ i686-linux, x86_64-linux, x86_64-darwin ] bag: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -333,6 +340,7 @@ dont-distribute-packages: Barracuda: [ i686-linux, x86_64-linux, x86_64-darwin ] barrie: [ i686-linux, x86_64-linux, x86_64-darwin ] barrier-monad: [ i686-linux, x86_64-linux, x86_64-darwin ] + base32-bytestring: [ x86_64-darwin ] BASIC: [ i686-linux, x86_64-linux, x86_64-darwin ] baskell: [ i686-linux, x86_64-linux, x86_64-darwin ] battleships: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -350,6 +358,7 @@ dont-distribute-packages: bgzf: [ i686-linux, x86_64-linux, x86_64-darwin ] bidirectionalization-combined: [ i686-linux, x86_64-linux, x86_64-darwin ] bidispec: [ i686-linux, x86_64-linux, x86_64-darwin ] + BigPixel: [ x86_64-darwin ] billboard-parser: [ i686-linux, x86_64-linux, x86_64-darwin ] billeksah-forms: [ i686-linux, x86_64-linux, x86_64-darwin ] billeksah-main: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -364,6 +373,7 @@ dont-distribute-packages: binding-gtk: [ i686-linux, x86_64-linux, x86_64-darwin ] bindings-apr: [ i686-linux, x86_64-linux, x86_64-darwin ] bindings-apr-util: [ i686-linux, x86_64-linux, x86_64-darwin ] + bindings-audiofile: [ x86_64-darwin ] bindings-bfd: [ i686-linux, x86_64-linux, x86_64-darwin ] bindings-cctools: [ i686-linux, x86_64-linux, x86_64-darwin ] bindings-codec2: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -373,10 +383,13 @@ dont-distribute-packages: bindings-eskit: [ i686-linux, x86_64-linux, x86_64-darwin ] bindings-EsounD: [ i686-linux, x86_64-linux, x86_64-darwin ] bindings-fann: [ i686-linux, x86_64-linux, x86_64-darwin ] + bindings-fluidsynth: [ x86_64-darwin ] bindings-friso: [ i686-linux, x86_64-linux, x86_64-darwin ] + bindings-GLFW: [ x86_64-darwin ] bindings-gts: [ i686-linux, x86_64-linux, x86_64-darwin ] bindings-hdf5: [ i686-linux, x86_64-linux, x86_64-darwin ] bindings-K8055: [ i686-linux, x86_64-linux, x86_64-darwin ] + bindings-libcddb: [ x86_64-darwin ] bindings-libftdi: [ i686-linux, x86_64-linux, x86_64-darwin ] bindings-librrd: [ i686-linux, x86_64-linux, x86_64-darwin ] bindings-libstemmer: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -384,10 +397,15 @@ dont-distribute-packages: bindings-linux-videodev2: [ i686-linux, x86_64-linux, x86_64-darwin ] bindings-lxc: [ x86_64-darwin ] bindings-mpdecimal: [ i686-linux, x86_64-linux, x86_64-darwin ] + bindings-portaudio: [ x86_64-darwin ] + bindings-ppdev: [ x86_64-darwin ] bindings-sane: [ x86_64-darwin ] bindings-sc3: [ i686-linux, x86_64-linux, x86_64-darwin ] bindings-sipc: [ i686-linux, x86_64-linux, x86_64-darwin ] + bindings-svm: [ x86_64-darwin ] + binding-wx: [ x86_64-darwin ] bind-marshal: [ i686-linux, x86_64-linux, x86_64-darwin ] + binembed-example: [ x86_64-darwin ] BiobaseBlast: [ i686-linux, x86_64-linux, x86_64-darwin ] BiobaseDotP: [ i686-linux, x86_64-linux, x86_64-darwin ] BiobaseFasta: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -397,7 +415,9 @@ dont-distribute-packages: BiobaseMAF: [ i686-linux, x86_64-linux, x86_64-darwin ] BiobaseTrainingData: [ i686-linux, x86_64-linux, x86_64-darwin ] BiobaseTurner: [ i686-linux, x86_64-linux, x86_64-darwin ] + BiobaseTypes: [ i686-linux, x86_64-linux, x86_64-darwin ] BiobaseVienna: [ i686-linux, x86_64-linux, x86_64-darwin ] + BiobaseXNA: [ i686-linux, x86_64-linux, x86_64-darwin ] bio: [ i686-linux, x86_64-linux, x86_64-darwin ] biosff: [ i686-linux, x86_64-linux, x86_64-darwin ] biostockholm: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -407,11 +427,15 @@ dont-distribute-packages: bitcoin-rpc: [ i686-linux, x86_64-linux, x86_64-darwin ] bitly-cli: [ i686-linux, x86_64-linux, x86_64-darwin ] Bitly: [ i686-linux, x86_64-linux, x86_64-darwin ] + bitmap-opengl: [ x86_64-darwin ] bits-conduit: [ i686-linux, x86_64-linux, x86_64-darwin ] bitset: [ i686-linux, x86_64-linux, x86_64-darwin ] + bits-extras: [ x86_64-darwin ] bitspeak: [ i686-linux, x86_64-linux, x86_64-darwin ] + bitstream: [ i686-linux, x86_64-linux, x86_64-darwin ] BitSyntax: [ i686-linux, x86_64-linux, x86_64-darwin ] bittorrent: [ i686-linux, x86_64-linux, x86_64-darwin ] + bitvec: [ i686-linux, x86_64-linux, x86_64-darwin ] bit-vector: [ i686-linux ] bkr: [ i686-linux, x86_64-linux, x86_64-darwin ] black-jewel: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -428,6 +452,8 @@ dont-distribute-packages: blip: [ i686-linux, x86_64-linux, x86_64-darwin ] Blobs: [ i686-linux, x86_64-linux, x86_64-darwin ] blogination: [ i686-linux, x86_64-linux, x86_64-darwin ] + bloxorz: [ x86_64-darwin ] + blubber: [ x86_64-darwin ] Blueprint: [ i686-linux, x86_64-linux, x86_64-darwin ] bluetile: [ i686-linux, x86_64-linux, x86_64-darwin ] bluetileutils: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -448,6 +474,7 @@ dont-distribute-packages: bson-generics: [ i686-linux, x86_64-linux, x86_64-darwin ] bson-mapping: [ i686-linux, x86_64-linux, x86_64-darwin ] btree-concurrent: [ i686-linux, x86_64-linux, x86_64-darwin ] + btrfs: [ x86_64-darwin ] buffer-builder-aeson: [ i686-linux ] buffer-builder: [ i686-linux ] buildbox-tools: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -548,6 +575,8 @@ dont-distribute-packages: chalkboard: [ i686-linux, x86_64-linux, x86_64-darwin ] chalkboard-viewer: [ i686-linux, x86_64-linux, x86_64-darwin ] charade: [ i686-linux, x86_64-linux, x86_64-darwin ] + charsetdetect-ae: [ x86_64-darwin ] + charsetdetect: [ x86_64-darwin ] Chart-gtk: [ i686-linux, x86_64-linux, x86_64-darwin ] Chart-simple: [ i686-linux, x86_64-linux, x86_64-darwin ] chatter: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -570,6 +599,7 @@ dont-distribute-packages: citation-resolve: [ i686-linux, x86_64-linux, x86_64-darwin ] citeproc-hs: [ i686-linux, x86_64-linux, x86_64-darwin ] citeproc-hs-pandoc-filter: [ i686-linux, x86_64-linux, x86_64-darwin ] + cityhash: [ x86_64-darwin ] cjk: [ i686-linux, x86_64-linux, x86_64-darwin ] clac: [ i686-linux, x86_64-linux, x86_64-darwin ] clafer: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -582,6 +612,7 @@ dont-distribute-packages: ClassyPrelude: [ i686-linux, x86_64-linux, x86_64-darwin ] clckwrks-plugin-bugs: [ i686-linux, x86_64-linux, x86_64-darwin ] clckwrks-theme-geo-bootstrap: [ i686-linux, x86_64-linux, x86_64-darwin ] + cld2: [ x86_64-darwin ] Clean: [ i686-linux, x86_64-linux, x86_64-darwin ] clevercss: [ i686-linux, x86_64-linux, x86_64-darwin ] click-clack: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -635,6 +666,7 @@ dont-distribute-packages: comonad-random: [ i686-linux, x86_64-linux, x86_64-darwin ] compact-map: [ i686-linux, x86_64-linux, x86_64-darwin ] compact-string: [ i686-linux, x86_64-linux, x86_64-darwin ] + compensated: [ i686-linux, x86_64-linux, x86_64-darwin ] compilation: [ i686-linux, x86_64-linux, x86_64-darwin ] complexity: [ i686-linux, x86_64-linux, x86_64-darwin ] compose-ltr: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -656,6 +688,7 @@ dont-distribute-packages: conductive-hsc3: [ i686-linux, x86_64-linux, x86_64-darwin ] conduit-audio-lame: [ i686-linux, x86_64-linux, x86_64-darwin ] conduit-audio-samplerate: [ i686-linux, x86_64-linux, x86_64-darwin ] + conduit-audio-sndfile: [ i686-linux, x86_64-linux, x86_64-darwin ] conduit-iconv: [ i686-linux, x86_64-linux, x86_64-darwin ] conduit-network-stream: [ i686-linux, x86_64-linux, x86_64-darwin ] conduit-resumablesink: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -668,6 +701,7 @@ dont-distribute-packages: constructible: [ i686-linux ] constructive-algebra: [ i686-linux, x86_64-linux, x86_64-darwin ] Consumer: [ i686-linux, x86_64-linux, x86_64-darwin ] + consumers: [ x86_64-darwin ] context-stack: [ i686-linux, x86_64-linux, x86_64-darwin ] continue: [ i686-linux, x86_64-linux, x86_64-darwin ] continuum-client: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -748,6 +782,7 @@ dont-distribute-packages: ctkl: [ i686-linux, x86_64-linux, x86_64-darwin ] ctpl: [ i686-linux, x86_64-linux, x86_64-darwin ] cubicbezier: [ i686-linux, x86_64-linux, x86_64-darwin ] + cuboid: [ x86_64-darwin ] cudd: [ i686-linux, x86_64-linux, x86_64-darwin ] curry-base: [ i686-linux, x86_64-linux, x86_64-darwin ] CurryDB: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -758,6 +793,7 @@ dont-distribute-packages: CV: [ i686-linux, x86_64-linux, x86_64-darwin ] cyclotomic: [ i686-linux ] cypher: [ i686-linux, x86_64-linux, x86_64-darwin ] + daemons: [ i686-linux ] DAG-Tournament: [ i686-linux, x86_64-linux, x86_64-darwin ] Dangerous: [ i686-linux, x86_64-linux, x86_64-darwin ] dao: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -831,6 +867,7 @@ dont-distribute-packages: deka-tests: [ i686-linux, x86_64-linux, x86_64-darwin ] delicious: [ i686-linux, x86_64-linux, x86_64-darwin ] delta-h: [ i686-linux, x86_64-linux, x86_64-darwin ] + delta: [ x86_64-darwin ] demarcate: [ i686-linux, x86_64-linux, x86_64-darwin ] denominate: [ i686-linux, x86_64-linux, x86_64-darwin ] depends: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -843,6 +880,7 @@ dont-distribute-packages: derive-topdown: [ i686-linux, x86_64-linux, x86_64-darwin ] derive-trie: [ i686-linux, x86_64-linux, x86_64-darwin ] derp-lib: [ i686-linux, x86_64-linux, x86_64-darwin ] + devil: [ x86_64-darwin ] dewdrop: [ i686-linux, x86_64-linux, x86_64-darwin ] Dflow: [ i686-linux, x86_64-linux, x86_64-darwin ] dfsbuild: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -905,11 +943,13 @@ dont-distribute-packages: dotfs: [ x86_64-darwin ] download: [ i686-linux, x86_64-linux, x86_64-darwin ] download-media-content: [ i686-linux, x86_64-linux, x86_64-darwin ] + dow: [ x86_64-darwin ] dph-examples: [ i686-linux, x86_64-linux, x86_64-darwin ] dph-lifted-base: [ i686-linux, x86_64-linux, x86_64-darwin ] dph-lifted-copy: [ i686-linux, x86_64-linux, x86_64-darwin ] dph-lifted-vseg: [ i686-linux, x86_64-linux, x86_64-darwin ] dph-prim-par: [ i686-linux, x86_64-linux, x86_64-darwin ] + dph-prim-seq: [ i686-linux, x86_64-linux, x86_64-darwin ] DP: [ i686-linux, x86_64-linux, x86_64-darwin ] dpkg: [ i686-linux, x86_64-linux, x86_64-darwin ] DPM: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -938,6 +978,7 @@ dont-distribute-packages: Dust-tools-pcap: [ i686-linux, x86_64-linux, x86_64-darwin ] dvda: [ i686-linux, x86_64-linux, x86_64-darwin ] dvdread: [ i686-linux, x86_64-linux, x86_64-darwin ] + dynamic-graph: [ x86_64-darwin ] dynamic-object: [ i686-linux, x86_64-linux, x86_64-darwin ] dynamic-plot: [ i686-linux, x86_64-linux, x86_64-darwin ] dynamic-pp: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -969,9 +1010,13 @@ dont-distribute-packages: ehaskell: [ i686-linux, x86_64-linux, x86_64-darwin ] ehs: [ i686-linux, x86_64-linux, x86_64-darwin ] eibd-client-simple: [ i686-linux, x86_64-linux, x86_64-darwin ] + eigen: [ x86_64-darwin ] EitherT: [ i686-linux, x86_64-linux, x86_64-darwin ] ekg-rrd: [ i686-linux ] electrum-mnemonic: [ i686-linux ] + elerea-examples: [ x86_64-darwin ] + elerea-sdl: [ x86_64-darwin ] + emacs-keys: [ x86_64-darwin ] email-header: [ i686-linux, x86_64-linux, x86_64-darwin ] email: [ i686-linux, x86_64-linux, x86_64-darwin ] email-postmark: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -986,6 +1031,8 @@ dont-distribute-packages: EnumMap: [ i686-linux, x86_64-linux, x86_64-darwin ] enummapmap: [ i686-linux, x86_64-linux, x86_64-darwin ] env-parser: [ i686-linux, x86_64-linux, x86_64-darwin ] + epanet-haskell: [ x86_64-darwin ] + epic: [ x86_64-darwin ] epoll: [ i686-linux, x86_64-linux, x86_64-darwin ] epubname: [ i686-linux, x86_64-linux, x86_64-darwin ] Eq: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -1011,6 +1058,7 @@ dont-distribute-packages: eurofxref: [ i686-linux, x86_64-linux, x86_64-darwin ] Euterpea: [ i686-linux, x86_64-linux, x86_64-darwin ] event-driven: [ i686-linux, x86_64-linux, x86_64-darwin ] + eventloop: [ i686-linux, x86_64-linux, x86_64-darwin ] event-monad: [ i686-linux, x86_64-linux, x86_64-darwin ] EventSocket: [ i686-linux, x86_64-linux, x86_64-darwin ] every-bit-counts: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -1030,10 +1078,15 @@ dont-distribute-packages: external-sort: [ i686-linux, x86_64-linux, x86_64-darwin ] ez-couch: [ i686-linux, x86_64-linux, x86_64-darwin ] faceted: [ i686-linux, x86_64-linux, x86_64-darwin ] + factory: [ i686-linux ] + factory: [ x86_64-linux ] factual-api: [ i686-linux, x86_64-linux, x86_64-darwin ] FailureT: [ i686-linux, x86_64-linux, x86_64-darwin ] fallingblocks: [ i686-linux, x86_64-linux, x86_64-darwin ] falling-turnip: [ i686-linux, x86_64-linux, x86_64-darwin ] + farmhash: [ x86_64-darwin ] + fastbayes: [ i686-linux, x86_64-linux, x86_64-darwin ] + fast-builder: [ x86_64-darwin ] fastirc: [ i686-linux, x86_64-linux, x86_64-darwin ] fast-tags: [ i686-linux, x86_64-linux, x86_64-darwin ] fault-tree: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -1052,11 +1105,13 @@ dont-distribute-packages: FermatsLastMargin: [ i686-linux, x86_64-linux, x86_64-darwin ] FerryCore: [ i686-linux, x86_64-linux, x86_64-darwin ] ffeed: [ i686-linux, x86_64-linux, x86_64-darwin ] + ffmpeg-light: [ x86_64-darwin ] ffmpeg-tutorials: [ i686-linux, x86_64-linux, x86_64-darwin ] fibon: [ i686-linux, x86_64-linux, x86_64-darwin ] fields: [ i686-linux, x86_64-linux, x86_64-darwin ] FieldTrip: [ i686-linux, x86_64-linux, x86_64-darwin ] fieldwise: [ i686-linux, x86_64-linux, x86_64-darwin ] + file-location: [ x86_64-darwin ] FileManipCompat: [ i686-linux, x86_64-linux, x86_64-darwin ] FileManip: [ i686-linux, x86_64-linux, x86_64-darwin ] filesystem-conduit: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -1068,6 +1123,8 @@ dont-distribute-packages: FiniteMap: [ i686-linux, x86_64-linux, x86_64-darwin ] firstify: [ i686-linux, x86_64-linux, x86_64-darwin ] FirstOrderTheory: [ i686-linux, x86_64-linux, x86_64-darwin ] + fishfood: [ i686-linux ] + fishfood: [ x86_64-linux ] fit: [ i686-linux, x86_64-linux, x86_64-darwin ] fitsio: [ i686-linux, x86_64-linux, x86_64-darwin ] fixed-point: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -1086,12 +1143,16 @@ dont-distribute-packages: floating-bits: [ i686-linux, x86_64-linux, x86_64-darwin ] flow2dot: [ i686-linux, x86_64-linux, x86_64-darwin ] flowdock-api: [ i686-linux, x86_64-linux, x86_64-darwin ] + flowdock-rest: [ i686-linux, x86_64-linux, x86_64-darwin ] flower: [ i686-linux, x86_64-linux, x86_64-darwin ] flowlocks-framework: [ i686-linux, x86_64-linux, x86_64-darwin ] flowsim: [ i686-linux, x86_64-linux, x86_64-darwin ] fltkhs: [ i686-linux, x86_64-linux, x86_64-darwin ] + fluidsynth: [ x86_64-darwin ] FModExRaw: [ i686-linux, x86_64-linux, x86_64-darwin ] FM-SBLEX: [ i686-linux, x86_64-linux, x86_64-darwin ] + fold-debounce-conduit: [ x86_64-darwin ] + fold-debounce: [ x86_64-darwin ] foldl-incremental: [ i686-linux, x86_64-linux, x86_64-darwin ] foldl-transduce-attoparsec: [ i686-linux, x86_64-linux, x86_64-darwin ] foldl-transduce: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -1104,6 +1165,7 @@ dont-distribute-packages: forbidden-fruit: [ i686-linux, x86_64-linux, x86_64-darwin ] fordo: [ i686-linux, x86_64-linux, x86_64-darwin ] for-free: [ i686-linux, x86_64-linux, x86_64-darwin ] + FormalGrammars: [ i686-linux, x86_64-linux, x86_64-darwin ] formal: [ i686-linux, x86_64-linux, x86_64-darwin ] format: [ i686-linux, x86_64-linux, x86_64-darwin ] format-status: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -1136,6 +1198,7 @@ dont-distribute-packages: FreeTypeGL: [ i686-linux, x86_64-linux, x86_64-darwin ] friday-juicypixels: [ i686-linux, x86_64-linux, x86_64-darwin ] frp-arduino: [ i686-linux, x86_64-linux, x86_64-darwin ] + frpnow-gloss: [ x86_64-darwin ] frpnow-gtk: [ i686-linux, x86_64-linux, x86_64-darwin ] fs-events: [ i686-linux, x86_64-linux, x86_64-darwin ] fsmActions: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -1146,23 +1209,28 @@ dont-distribute-packages: ftshell: [ i686-linux, x86_64-linux, x86_64-darwin ] full-sessions: [ i686-linux, x86_64-linux, x86_64-darwin ] fullstop: [ i686-linux, x86_64-linux, x86_64-darwin ] + full-text-search: [ i686-linux, x86_64-linux, x86_64-darwin ] funbot: [ i686-linux, x86_64-linux, x86_64-darwin ] functional-arrow: [ i686-linux, x86_64-linux, x86_64-darwin ] function-combine: [ i686-linux, x86_64-linux, x86_64-darwin ] functorm: [ i686-linux, x86_64-linux, x86_64-darwin ] + FunGEn: [ x86_64-darwin ] funion: [ i686-linux, x86_64-linux, x86_64-darwin ] funsat: [ i686-linux, x86_64-linux, x86_64-darwin ] future: [ i686-linux, x86_64-linux, x86_64-darwin ] fuzzytime: [ i686-linux, x86_64-linux, x86_64-darwin ] fuzzy-timings: [ i686-linux, x86_64-linux, x86_64-darwin ] + fwgl-glfw: [ x86_64-darwin ] gact: [ i686-linux, x86_64-linux, x86_64-darwin ] gameclock: [ i686-linux, x86_64-linux, x86_64-darwin ] game-of-life: [ i686-linux, x86_64-linux, x86_64-darwin ] + Gamgine: [ x86_64-darwin ] Ganymede: [ i686-linux, x86_64-linux, x86_64-darwin ] gbu: [ i686-linux, x86_64-linux, x86_64-darwin ] gc-monitoring-wai: [ i686-linux, x86_64-linux, x86_64-darwin ] gdiff-ig: [ i686-linux, x86_64-linux, x86_64-darwin ] gdiff-th: [ i686-linux, x86_64-linux, x86_64-darwin ] + gearbox: [ x86_64-darwin ] GeBoP: [ i686-linux, x86_64-linux, x86_64-darwin ] geek: [ i686-linux, x86_64-linux, x86_64-darwin ] geek-server: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -1186,6 +1254,8 @@ dont-distribute-packages: geni-util: [ i686-linux, x86_64-linux, x86_64-darwin ] GenSmsPdu: [ i686-linux, x86_64-linux, x86_64-darwin ] GenussFold: [ i686-linux ] + GenussFold: [ i686-linux, x86_64-linux, x86_64-darwin ] + GeocoderOpenCage: [ i686-linux, x86_64-linux, x86_64-darwin ] geodetics: [ i686-linux, x86_64-linux, x86_64-darwin ] geoip2: [ i686-linux ] GeoIp: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -1198,6 +1268,7 @@ dont-distribute-packages: ghc-dup: [ i686-linux, x86_64-linux, x86_64-darwin ] ghc-events-analyze: [ i686-linux, x86_64-linux, x86_64-darwin ] ghc-events-parallel: [ i686-linux, x86_64-linux, x86_64-darwin ] + ghc-exactprint: [ x86_64-darwin ] ghci-diagrams: [ i686-linux, x86_64-linux, x86_64-darwin ] ghci-haskeline: [ i686-linux, x86_64-linux, x86_64-darwin ] ghc-imported-from: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -1225,14 +1296,35 @@ dont-distribute-packages: git-vogue: [ i686-linux, x86_64-linux, x86_64-darwin ] glade: [ i686-linux, x86_64-linux, x86_64-darwin ] gladexml-accessor: [ i686-linux, x86_64-linux, x86_64-darwin ] + glapp: [ x86_64-darwin ] + gl-capture: [ x86_64-darwin ] + GLFW-b-demo: [ x86_64-darwin ] + GLFW-b: [ x86_64-darwin ] GLFW-OGL: [ i686-linux, x86_64-linux, x86_64-darwin ] + GLFW-task: [ x86_64-darwin ] + GLFW: [ x86_64-darwin ] + GLHUI: [ x86_64-darwin ] glider-nlp: [ i686-linux, x86_64-linux, x86_64-darwin ] GLM: [ i686-linux, x86_64-linux, x86_64-darwin ] global: [ i686-linux, x86_64-linux, x86_64-darwin ] glome-hs: [ i686-linux, x86_64-linux, x86_64-darwin ] GlomeTrace: [ i686-linux, x86_64-linux, x86_64-darwin ] GlomeView: [ i686-linux, x86_64-linux, x86_64-darwin ] + gloss-accelerate: [ x86_64-darwin ] + gloss-algorithms: [ x86_64-darwin ] + gloss-banana: [ i686-linux, x86_64-linux, x86_64-darwin ] gloss-devil: [ i686-linux, x86_64-linux, x86_64-darwin ] + gloss-examples: [ x86_64-darwin ] + gloss-game: [ x86_64-darwin ] + gloss-juicy: [ x86_64-darwin ] + gloss-raster: [ x86_64-darwin ] + gloss-rendering: [ x86_64-darwin ] + gloss-sodium: [ x86_64-darwin ] + gloss: [ x86_64-darwin ] + GLURaw: [ x86_64-darwin ] + GLUtil: [ x86_64-darwin ] + gluturtle: [ x86_64-darwin ] + GLUT: [ x86_64-darwin ] gmap: [ i686-linux, x86_64-linux, x86_64-darwin ] gmndl: [ i686-linux, x86_64-linux, x86_64-darwin ] gnome-desktop: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -1252,12 +1344,14 @@ dont-distribute-packages: gpah: [ i686-linux, x86_64-linux, x86_64-darwin ] GPipe-Collada: [ i686-linux, x86_64-linux, x86_64-darwin ] GPipe-Examples: [ i686-linux, x86_64-linux, x86_64-darwin ] + GPipe-GLFW: [ x86_64-darwin ] GPipe-TextureLoad: [ i686-linux, x86_64-linux, x86_64-darwin ] gps2htmlReport: [ i686-linux, x86_64-linux, x86_64-darwin ] gps: [ i686-linux, x86_64-linux, x86_64-darwin ] gpx-conduit: [ i686-linux, x86_64-linux, x86_64-darwin ] GPX: [ i686-linux, x86_64-linux, x86_64-darwin ] grammar-combinators: [ i686-linux, x86_64-linux, x86_64-darwin ] + GrammarProducts: [ i686-linux, x86_64-linux, x86_64-darwin ] grapefruit-examples: [ i686-linux, x86_64-linux, x86_64-darwin ] grapefruit-frp: [ i686-linux, x86_64-linux, x86_64-darwin ] grapefruit-records: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -1458,9 +1552,12 @@ dont-distribute-packages: haskelldb-hsql-sqlite3: [ i686-linux, x86_64-linux, x86_64-darwin ] haskelldb-wx: [ i686-linux, x86_64-linux, x86_64-darwin ] haskell-docs: [ i686-linux, x86_64-linux, x86_64-darwin ] + haskell-exp-parser: [ i686-linux, x86_64-linux, x86_64-darwin ] haskell-formatter: [ i686-linux, x86_64-linux, x86_64-darwin ] haskell-ftp: [ i686-linux, x86_64-linux, x86_64-darwin ] haskell-in-space: [ i686-linux, x86_64-linux, x86_64-darwin ] + HaskellLM: [ i686-linux, x86_64-linux, x86_64-darwin ] + haskell-mpi: [ i686-linux, x86_64-linux, x86_64-darwin ] HaskellNN: [ i686-linux, x86_64-linux, x86_64-darwin ] Haskelloids: [ i686-linux, x86_64-linux, x86_64-darwin ] haskell-openflow: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -1584,6 +1681,7 @@ dont-distribute-packages: hfann: [ i686-linux, x86_64-linux, x86_64-darwin ] hfd: [ i686-linux, x86_64-linux, x86_64-darwin ] hfiar: [ i686-linux, x86_64-linux, x86_64-darwin ] + hfoil: [ i686-linux, x86_64-linux, x86_64-darwin ] hfractal: [ i686-linux, x86_64-linux, x86_64-darwin ] HFrequencyQueue: [ i686-linux, x86_64-linux, x86_64-darwin ] HFuse: [ x86_64-darwin ] @@ -1630,6 +1728,7 @@ dont-distribute-packages: hiernotify: [ i686-linux, x86_64-linux, x86_64-darwin ] Hieroglyph: [ i686-linux, x86_64-linux, x86_64-darwin ] HiggsSet: [ i686-linux, x86_64-linux, x86_64-darwin ] + higher-leveldb: [ x86_64-darwin ] higherorder: [ i686-linux, x86_64-linux, x86_64-darwin ] highjson: [ i686-linux ] highWaterMark: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -1642,6 +1741,8 @@ dont-distribute-packages: hinze-streams: [ i686-linux, x86_64-linux, x86_64-darwin ] hipbot: [ i686-linux, x86_64-linux, x86_64-darwin ] hipe: [ i686-linux, x86_64-linux, x86_64-darwin ] + HipmunkPlayground: [ x86_64-darwin ] + Hipmunk: [ x86_64-darwin ] hircules: [ i686-linux, x86_64-linux, x86_64-darwin ] hirt: [ i686-linux, x86_64-linux, x86_64-darwin ] hissmetrics: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -1672,9 +1773,13 @@ dont-distribute-packages: hmatrix-banded: [ i686-linux, x86_64-linux, x86_64-darwin ] hmatrix-glpk: [ i686-linux, x86_64-linux, x86_64-darwin ] hmatrix-gsl-stats: [ i686-linux, x86_64-linux, x86_64-darwin ] + hmatrix-mmap: [ i686-linux, x86_64-linux, x86_64-darwin ] + hmatrix-nipals: [ i686-linux, x86_64-linux, x86_64-darwin ] hmatrix-quadprogpp: [ i686-linux, x86_64-linux, x86_64-darwin ] + hmatrix-repa: [ i686-linux, x86_64-linux, x86_64-darwin ] hmatrix-special: [ i686-linux, x86_64-linux, x86_64-darwin ] hmatrix-static: [ i686-linux, x86_64-linux, x86_64-darwin ] + hmatrix-svdlibc: [ i686-linux, x86_64-linux, x86_64-darwin ] hmatrix-syntax: [ i686-linux, x86_64-linux, x86_64-darwin ] hmatrix-tests: [ i686-linux, x86_64-linux, x86_64-darwin ] hmeap: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -1689,6 +1794,7 @@ dont-distribute-packages: Hmpf: [ i686-linux, x86_64-linux, x86_64-darwin ] hmpfr: [ i686-linux, x86_64-linux, x86_64-darwin ] hmumps: [ i686-linux, x86_64-linux, x86_64-darwin ] + hnetcdf: [ i686-linux, x86_64-linux, x86_64-darwin ] HNM: [ i686-linux, x86_64-linux, x86_64-darwin ] hnn: [ i686-linux, x86_64-linux, x86_64-darwin ] hoauth: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -1711,6 +1817,7 @@ dont-distribute-packages: hommage: [ i686-linux, x86_64-linux, x86_64-darwin ] HongoDB: [ i686-linux, x86_64-linux, x86_64-darwin ] honi: [ i686-linux, x86_64-linux, x86_64-darwin ] + honk: [ x86_64-darwin ] hoodie: [ i686-linux, x86_64-linux, x86_64-darwin ] hoodle-builder: [ i686-linux, x86_64-linux, x86_64-darwin ] hoodle-core: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -1748,6 +1855,7 @@ dont-distribute-packages: HPlot: [ i686-linux, x86_64-linux, x86_64-darwin ] hpodder: [ i686-linux, x86_64-linux, x86_64-darwin ] HPong: [ i686-linux, x86_64-linux, x86_64-darwin ] + hpqtypes: [ x86_64-darwin ] hprotoc-fork: [ i686-linux, x86_64-linux, x86_64-darwin ] hps-cairo: [ i686-linux, x86_64-linux, x86_64-darwin ] hpygments: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -1770,6 +1878,7 @@ dont-distribute-packages: hsbackup: [ i686-linux, x86_64-linux, x86_64-darwin ] hs-blake2: [ i686-linux, x86_64-linux, x86_64-darwin ] hsc2hs: [ i686-linux, x86_64-linux, x86_64-darwin ] + hsc3-auditor: [ i686-linux, x86_64-linux, x86_64-darwin ] hsc3-cairo: [ i686-linux, x86_64-linux, x86_64-darwin ] hsc3-data: [ i686-linux, x86_64-linux, x86_64-darwin ] hsc3-forth: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -1779,6 +1888,7 @@ dont-distribute-packages: hsc3-plot: [ i686-linux, x86_64-linux, x86_64-darwin ] hsc3-rec: [ i686-linux, x86_64-linux, x86_64-darwin ] hsc3-server: [ i686-linux, x86_64-linux, x86_64-darwin ] + hsc3-sf-hsndfile: [ i686-linux, x86_64-linux, x86_64-darwin ] hsc3-unsafe: [ i686-linux, x86_64-linux, x86_64-darwin ] hscamwire: [ i686-linux, x86_64-linux, x86_64-darwin ] hs-carbon-examples: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -1791,6 +1901,7 @@ dont-distribute-packages: hsdip: [ i686-linux, x86_64-linux, x86_64-darwin ] hsdns-cache: [ i686-linux, x86_64-linux, x86_64-darwin ] hs-dotnet: [ i686-linux, x86_64-linux, x86_64-darwin ] + hs-duktape: [ i686-linux, x86_64-linux, x86_64-darwin ] Hsed: [ i686-linux, x86_64-linux, x86_64-darwin ] hsfacter: [ i686-linux, x86_64-linux, x86_64-darwin ] HSFFIG: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -1820,7 +1931,9 @@ dont-distribute-packages: hs-mesos: [ i686-linux, x86_64-linux, x86_64-darwin ] Hsmtlib: [ i686-linux, x86_64-linux, x86_64-darwin ] hsmtpclient: [ i686-linux, x86_64-linux, x86_64-darwin ] + hsndfile: [ i686-linux, x86_64-linux, x86_64-darwin ] hsndfile-storablevector: [ i686-linux, x86_64-linux, x86_64-darwin ] + hsndfile-vector: [ i686-linux, x86_64-linux, x86_64-darwin ] hsnock: [ i686-linux, x86_64-linux, x86_64-darwin ] hs-nombre-generator: [ i686-linux, x86_64-linux, x86_64-darwin ] hsns: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -1887,6 +2000,7 @@ dont-distribute-packages: httpspec: [ i686-linux, x86_64-linux, x86_64-darwin ] http-test: [ i686-linux, x86_64-linux, x86_64-darwin ] htune: [ i686-linux, x86_64-linux, x86_64-darwin ] + htzaar: [ x86_64-darwin ] hubris: [ i686-linux, x86_64-linux, x86_64-darwin ] hugs2yc: [ i686-linux, x86_64-linux, x86_64-darwin ] hulk: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -1904,6 +2018,8 @@ dont-distribute-packages: hutton: [ i686-linux, x86_64-linux, x86_64-darwin ] huzzy: [ i686-linux, x86_64-linux, x86_64-darwin ] hVOIDP: [ i686-linux, x86_64-linux, x86_64-darwin ] + hworker: [ i686-linux, x86_64-linux, x86_64-darwin ] + hworker-ses: [ i686-linux, x86_64-linux, x86_64-darwin ] hws: [ i686-linux, x86_64-linux, x86_64-darwin ] hXmixer: [ i686-linux, x86_64-linux, x86_64-darwin ] hxmppc: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -1953,6 +2069,7 @@ dont-distribute-packages: imgurder: [ i686-linux, x86_64-linux, x86_64-darwin ] imm: [ i686-linux, x86_64-linux, x86_64-darwin ] imparse: [ i686-linux, x86_64-linux, x86_64-darwin ] + imperative-edsl-vhdl: [ i686-linux, x86_64-linux, x86_64-darwin ] ImperativeHaskell: [ i686-linux, x86_64-linux, x86_64-darwin ] improve: [ i686-linux, x86_64-linux, x86_64-darwin ] INblobs: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -1971,7 +2088,9 @@ dont-distribute-packages: inflist: [ i686-linux, x86_64-linux, x86_64-darwin ] informative: [ i686-linux, x86_64-linux, x86_64-darwin ] inilist: [ i686-linux, x86_64-linux, x86_64-darwin ] + inline-c-cpp: [ x86_64-darwin ] inline-r: [ i686-linux ] + inline-r: [ i686-linux, x86_64-linux, x86_64-darwin ] instant-zipper: [ i686-linux, x86_64-linux, x86_64-darwin ] integer-pure: [ i686-linux, x86_64-linux, x86_64-darwin ] intel-aes: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -2020,7 +2139,9 @@ dont-distribute-packages: jack-bindings: [ i686-linux, x86_64-linux, x86_64-darwin ] jackminimix: [ i686-linux, x86_64-linux, x86_64-darwin ] JackMiniMix: [ i686-linux, x86_64-linux, x86_64-darwin ] + jack: [ x86_64-darwin ] jacobi-roots: [ i686-linux ] + jacobi-roots: [ i686-linux, x86_64-linux, x86_64-darwin ] jalla: [ i686-linux, x86_64-linux, x86_64-darwin ] jarfind: [ i686-linux, x86_64-linux, x86_64-darwin ] java-bridge-extras: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -2057,8 +2178,10 @@ dont-distribute-packages: json-tools: [ i686-linux, x86_64-linux, x86_64-darwin ] jspath: [ i686-linux, x86_64-linux, x86_64-darwin ] judy: [ i686-linux, x86_64-linux, x86_64-darwin ] + jukebox: [ x86_64-darwin ] JunkDB-driver-gdbm: [ i686-linux, x86_64-linux, x86_64-darwin ] JYU-Utils: [ i686-linux, x86_64-linux, x86_64-darwin ] + kafka-client: [ x86_64-darwin ] kangaroo: [ i686-linux, x86_64-linux, x86_64-darwin ] kansas-comet: [ i686-linux, x86_64-linux, x86_64-darwin ] kansas-lava-cores: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -2073,6 +2196,7 @@ dont-distribute-packages: keera-hails-mvc-view-gtk: [ i686-linux, x86_64-linux, x86_64-darwin ] keera-hails-reactive-fs: [ i686-linux, x86_64-linux, x86_64-darwin ] keera-hails-reactive-gtk: [ i686-linux, x86_64-linux, x86_64-darwin ] + keera-hails-reactive-wx: [ x86_64-darwin ] keera-posture: [ i686-linux, x86_64-linux, x86_64-darwin ] keiretsu: [ i686-linux, x86_64-linux, x86_64-darwin ] Ketchup: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -2091,18 +2215,21 @@ dont-distribute-packages: Konf: [ i686-linux, x86_64-linux, x86_64-darwin ] korfu: [ i686-linux, x86_64-linux, x86_64-darwin ] kqueue: [ i686-linux, x86_64-linux, x86_64-darwin ] + ktx: [ x86_64-darwin ] kure-your-boilerplate: [ i686-linux, x86_64-linux, x86_64-darwin ] KyotoCabinet: [ i686-linux, x86_64-linux, x86_64-darwin ] labeled-graph: [ i686-linux, x86_64-linux, x86_64-darwin ] laborantin-hs: [ i686-linux, x86_64-linux, x86_64-darwin ] labyrinth: [ i686-linux, x86_64-linux, x86_64-darwin ] labyrinth-server: [ i686-linux, x86_64-linux, x86_64-darwin ] + lagrangian: [ i686-linux, x86_64-linux, x86_64-darwin ] laika: [ i686-linux, x86_64-linux, x86_64-darwin ] lambda2js: [ i686-linux, x86_64-linux, x86_64-darwin ] lambdaBase: [ i686-linux, x86_64-linux, x86_64-darwin ] lambdabot-utils: [ i686-linux, x86_64-linux, x86_64-darwin ] lambda-bridge: [ i686-linux, x86_64-linux, x86_64-darwin ] LambdaCalculator: [ i686-linux, x86_64-linux, x86_64-darwin ] + lambda-canvas: [ x86_64-darwin ] lambdacat: [ i686-linux, x86_64-linux, x86_64-darwin ] lambdacube-bullet: [ i686-linux, x86_64-linux, x86_64-darwin ] lambdacube-engine: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -2114,6 +2241,7 @@ dont-distribute-packages: LambdaHack: [ i686-linux, x86_64-linux, x86_64-darwin ] LambdaINet: [ i686-linux, x86_64-linux, x86_64-darwin ] lambdaLit: [ i686-linux, x86_64-linux, x86_64-darwin ] + LambdaNet: [ i686-linux, x86_64-linux, x86_64-darwin ] LambdaPrettyQuote: [ i686-linux, x86_64-linux, x86_64-darwin ] LambdaShell: [ i686-linux, x86_64-linux, x86_64-darwin ] lambda-toolbox: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -2140,6 +2268,7 @@ dont-distribute-packages: latest-npm-version: [ i686-linux, x86_64-linux, x86_64-darwin ] lat: [ i686-linux, x86_64-linux, x86_64-darwin ] launchpad-control: [ i686-linux, x86_64-linux, x86_64-darwin ] + layers-game: [ x86_64-darwin ] layers: [ i686-linux, x86_64-linux, x86_64-darwin ] layout-bootstrap: [ i686-linux, x86_64-linux, x86_64-darwin ] layout: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -2155,8 +2284,12 @@ dont-distribute-packages: learn-physics: [ i686-linux, x86_64-linux, x86_64-darwin ] leksah: [ i686-linux, x86_64-linux, x86_64-darwin ] leksah-server: [ i686-linux, x86_64-linux, x86_64-darwin ] + Level0: [ x86_64-darwin ] leveldb-haskell-fork: [ i686-linux, x86_64-linux, x86_64-darwin ] + leveldb-haskell: [ x86_64-darwin ] levmar-chart: [ i686-linux, x86_64-linux, x86_64-darwin ] + levmar: [ i686-linux ] + levmar: [ x86_64-linux ] lgtk: [ i686-linux, x86_64-linux, x86_64-darwin ] lhae: [ i686-linux, x86_64-linux, x86_64-darwin ] lha: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -2168,17 +2301,20 @@ dont-distribute-packages: libGenI: [ i686-linux, x86_64-linux, x86_64-darwin ] libhbb: [ i686-linux, x86_64-linux, x86_64-darwin ] libjenkins: [ i686-linux, x86_64-linux, x86_64-darwin ] + liblinear-enumerator: [ x86_64-darwin ] libltdl: [ i686-linux, x86_64-linux, x86_64-darwin ] libnotify: [ i686-linux, x86_64-linux, x86_64-darwin ] liboleg: [ i686-linux, x86_64-linux, x86_64-darwin ] libpafe: [ i686-linux, x86_64-linux, x86_64-darwin ] libpq: [ i686-linux, x86_64-linux, x86_64-darwin ] libssh2-conduit: [ i686-linux, x86_64-linux, x86_64-darwin ] + libssh2: [ i686-linux, x86_64-linux, x86_64-darwin ] libsystemd-daemon: [ i686-linux, x86_64-linux, x86_64-darwin ] libsystemd-journal: [ x86_64-darwin ] libvirt-hs: [ i686-linux, x86_64-linux, x86_64-darwin ] libxml: [ i686-linux, x86_64-linux, x86_64-darwin ] libxslt: [ i686-linux, x86_64-linux, x86_64-darwin ] + life: [ x86_64-darwin ] lifter: [ i686-linux, x86_64-linux, x86_64-darwin ] lighttpd-conf: [ i686-linux, x86_64-linux, x86_64-darwin ] lighttpd-conf-qq: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -2186,8 +2322,11 @@ dont-distribute-packages: Limit: [ i686-linux, x86_64-linux, x86_64-darwin ] limp-cbc: [ i686-linux, x86_64-linux, x86_64-darwin ] lin-alg: [ i686-linux, x86_64-linux, x86_64-darwin ] + linda: [ i686-linux, x86_64-linux, x86_64-darwin ] linear-algebra-cblas: [ i686-linux, x86_64-linux, x86_64-darwin ] + linear-circuit: [ i686-linux, x86_64-linux, x86_64-darwin ] linear-maps: [ i686-linux, x86_64-linux, x86_64-darwin ] + linear-opengl: [ x86_64-darwin ] linearscan-hoopl: [ i686-linux, x86_64-linux, x86_64-darwin ] linearscan: [ i686-linux, x86_64-linux, x86_64-darwin ] LinearSplit: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -2195,10 +2334,16 @@ dont-distribute-packages: linkchk: [ i686-linux, x86_64-linux, x86_64-darwin ] linkcore: [ i686-linux, x86_64-linux, x86_64-darwin ] linux-blkid: [ i686-linux, x86_64-linux, x86_64-darwin ] + linux-evdev: [ x86_64-darwin ] + linux-file-extents: [ x86_64-darwin ] + linux-inotify: [ x86_64-darwin ] linux-kmod: [ i686-linux, x86_64-linux, x86_64-darwin ] + linux-mount: [ x86_64-darwin ] + linux-namespaces: [ x86_64-darwin ] linux-perf: [ i686-linux, x86_64-linux, x86_64-darwin ] linux-ptrace: [ i686-linux, x86_64-linux, x86_64-darwin ] lio-eci11: [ i686-linux, x86_64-linux, x86_64-darwin ] + lio-fs: [ x86_64-darwin ] lio-simple: [ i686-linux, x86_64-linux, x86_64-darwin ] listlike-instances: [ i686-linux, x86_64-linux, x86_64-darwin ] list-t-html-parser: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -2219,6 +2364,7 @@ dont-distribute-packages: llvm: [ i686-linux, x86_64-linux, x86_64-darwin ] llvm-tf: [ i686-linux, x86_64-linux, x86_64-darwin ] llvm-tools: [ i686-linux, x86_64-linux, x86_64-darwin ] + lmdb: [ x86_64-darwin ] local-search: [ i686-linux, x86_64-linux, x86_64-darwin ] loch: [ i686-linux, x86_64-linux, x86_64-darwin ] log2json: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -2229,10 +2375,12 @@ dont-distribute-packages: LogicGrowsOnTrees-MPI: [ i686-linux, x86_64-linux, x86_64-darwin ] LogicGrowsOnTrees-network: [ i686-linux, x86_64-linux, x86_64-darwin ] LogicGrowsOnTrees-processes: [ i686-linux, x86_64-linux, x86_64-darwin ] + log: [ x86_64-darwin ] lojban: [ i686-linux, x86_64-linux, x86_64-darwin ] lojbanParser: [ i686-linux, x86_64-linux, x86_64-darwin ] lojbanXiragan: [ i686-linux, x86_64-linux, x86_64-darwin ] lojysamban: [ i686-linux, x86_64-linux, x86_64-darwin ] + lol: [ i686-linux ] loli: [ i686-linux, x86_64-linux, x86_64-darwin ] loop-effin: [ i686-linux, x86_64-linux, x86_64-darwin ] loopy: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -2250,6 +2398,7 @@ dont-distribute-packages: Lucu: [ i686-linux, x86_64-linux, x86_64-darwin ] lui: [ i686-linux, x86_64-linux, x86_64-darwin ] luka: [ i686-linux, x86_64-linux, x86_64-darwin ] + luminance-samples: [ x86_64-darwin ] lushtags: [ i686-linux, x86_64-linux, x86_64-darwin ] luthor: [ i686-linux, x86_64-linux, x86_64-darwin ] lvish: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -2261,6 +2410,7 @@ dont-distribute-packages: maam: [ i686-linux, x86_64-linux, x86_64-darwin ] mage: [ i686-linux, x86_64-linux, x86_64-darwin ] MagicHaskeller: [ i686-linux, x86_64-linux, x86_64-darwin ] + magico: [ i686-linux, x86_64-linux, x86_64-darwin ] mahoro: [ i686-linux, x86_64-linux, x86_64-darwin ] majordomo: [ i686-linux, x86_64-linux, x86_64-darwin ] majority: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -2282,6 +2432,8 @@ dont-distribute-packages: manatee-terminal: [ i686-linux, x86_64-linux, x86_64-darwin ] manatee-welcome: [ i686-linux, x86_64-linux, x86_64-darwin ] mandulia: [ i686-linux, x86_64-linux, x86_64-darwin ] + manifold-random: [ i686-linux, x86_64-linux, x86_64-darwin ] + manifolds: [ i686-linux, x86_64-linux, x86_64-darwin ] marionetta: [ i686-linux, x86_64-linux, x86_64-darwin ] markdown2svg: [ i686-linux, x86_64-linux, x86_64-darwin ] markdown-kate: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -2308,6 +2460,7 @@ dont-distribute-packages: MazesOfMonad: [ i686-linux, x86_64-linux, x86_64-darwin ] mbox-tools: [ i686-linux, x86_64-linux, x86_64-darwin ] MC-Fold-DP: [ i686-linux, x86_64-linux, x86_64-darwin ] + mcmaster-gloss-examples: [ x86_64-darwin ] mcmc-samplers: [ i686-linux, x86_64-linux, x86_64-darwin ] mdcat: [ i686-linux, x86_64-linux, x86_64-darwin ] Measure: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -2325,11 +2478,13 @@ dont-distribute-packages: mfsolve: [ i686-linux, x86_64-linux, x86_64-darwin ] Mhailist: [ i686-linux, x86_64-linux, x86_64-darwin ] MHask: [ i686-linux, x86_64-linux, x86_64-darwin ] + Michelangelo: [ x86_64-darwin ] mida: [ i686-linux, x86_64-linux, x86_64-darwin ] midi-alsa: [ x86_64-darwin ] midimory: [ x86_64-darwin ] midisurface: [ i686-linux, x86_64-linux, x86_64-darwin ] mighttpd: [ i686-linux, x86_64-linux, x86_64-darwin ] + mikmod: [ x86_64-darwin ] mime-directory: [ i686-linux, x86_64-linux, x86_64-darwin ] mime-string: [ i686-linux, x86_64-linux, x86_64-darwin ] minesweeper: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -2340,6 +2495,7 @@ dont-distribute-packages: minioperational: [ i686-linux, x86_64-linux, x86_64-darwin ] miniplex: [ i686-linux, x86_64-linux, x86_64-darwin ] minirotate: [ i686-linux, x86_64-linux, x86_64-darwin ] + minisat: [ x86_64-darwin ] ministg: [ i686-linux, x86_64-linux, x86_64-darwin ] mirror-tweet: [ i686-linux, x86_64-linux, x86_64-darwin ] missing-py2: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -2356,6 +2512,7 @@ dont-distribute-packages: modular-prelude-classy: [ i686-linux, x86_64-linux, x86_64-darwin ] modular-prelude: [ i686-linux, x86_64-linux, x86_64-darwin ] module-management: [ i686-linux, x86_64-linux, x86_64-darwin ] + Moe: [ x86_64-darwin ] mohws: [ i686-linux, x86_64-linux, x86_64-darwin ] monad-abort-fd: [ i686-linux, x86_64-linux, x86_64-darwin ] monadacme: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -2385,6 +2542,7 @@ dont-distribute-packages: Monatron-IO: [ i686-linux, x86_64-linux, x86_64-darwin ] mongodb-queue: [ i686-linux, x86_64-linux, x86_64-darwin ] mongrel2-handler: [ i686-linux, x86_64-linux, x86_64-darwin ] + monitor: [ x86_64-darwin ] Monocle: [ i686-linux, x86_64-linux, x86_64-darwin ] mono-foldable: [ i686-linux, x86_64-linux, x86_64-darwin ] monoid-owns: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -2456,6 +2614,7 @@ dont-distribute-packages: nc-indicators: [ i686-linux, x86_64-linux, x86_64-darwin ] neat: [ i686-linux, x86_64-linux, x86_64-darwin ] needle: [ i686-linux, x86_64-linux, x86_64-darwin ] + nehe-tuts: [ x86_64-darwin ] nerf: [ i686-linux, x86_64-linux, x86_64-darwin ] nero: [ i686-linux, x86_64-linux, x86_64-darwin ] nero-wai: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -2463,18 +2622,22 @@ dont-distribute-packages: nested-routes: [ i686-linux, x86_64-linux, x86_64-darwin ] netcore: [ i686-linux, x86_64-linux, x86_64-darwin ] netlines: [ i686-linux, x86_64-linux, x86_64-darwin ] + netlink: [ i686-linux, x86_64-linux, x86_64-darwin ] NetSNMP: [ i686-linux, x86_64-linux, x86_64-darwin ] netspec: [ i686-linux, x86_64-linux, x86_64-darwin ] nettle-frp: [ i686-linux, x86_64-linux, x86_64-darwin ] nettle: [ i686-linux, x86_64-linux, x86_64-darwin ] nettle-netkit: [ i686-linux, x86_64-linux, x86_64-darwin ] nettle-openflow: [ i686-linux, x86_64-linux, x86_64-darwin ] + netwire-input-glfw: [ x86_64-darwin ] network-address: [ i686-linux, x86_64-linux, x86_64-darwin ] network-builder: [ i686-linux, x86_64-linux, x86_64-darwin ] network-bytestring: [ i686-linux, x86_64-linux, x86_64-darwin ] network-connection: [ i686-linux, x86_64-linux, x86_64-darwin ] network-fancy: [ i686-linux ] + network-interfacerequest: [ x86_64-darwin ] network-minihttp: [ i686-linux, x86_64-linux, x86_64-darwin ] + network-netpacket: [ x86_64-darwin ] network-rpca: [ i686-linux, x86_64-linux, x86_64-darwin ] network-server: [ i686-linux, x86_64-linux, x86_64-darwin ] network-simple-tls: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -2492,6 +2655,7 @@ dont-distribute-packages: Ninjas: [ i686-linux, x86_64-linux, x86_64-darwin ] nitro: [ i686-linux, x86_64-linux, x86_64-darwin ] nix-eval: [ i686-linux, x86_64-linux, x86_64-darwin ] + nixfromnpm: [ i686-linux, x86_64-linux, x86_64-darwin ] nkjp: [ i686-linux, x86_64-linux, x86_64-darwin ] nme: [ i686-linux, x86_64-linux, x86_64-darwin ] nm: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -2507,6 +2671,7 @@ dont-distribute-packages: noodle: [ i686-linux, x86_64-linux, x86_64-darwin ] NoSlow: [ i686-linux, x86_64-linux, x86_64-darwin ] not-gloss-examples: [ i686-linux, x86_64-linux, x86_64-darwin ] + not-gloss: [ x86_64-darwin ] notmuch-haskell: [ i686-linux, x86_64-linux, x86_64-darwin ] notmuch-web: [ i686-linux, x86_64-linux, x86_64-darwin ] np-linear: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -2531,10 +2696,12 @@ dont-distribute-packages: obj: [ i686-linux, x86_64-linux, x86_64-darwin ] octopus: [ i686-linux, x86_64-linux, x86_64-darwin ] oculus: [ i686-linux, x86_64-linux, x86_64-darwin ] + OddWord: [ i686-linux ] ofx: [ i686-linux, x86_64-linux, x86_64-darwin ] OGL: [ i686-linux, x86_64-linux, x86_64-darwin ] ohloh-hs: [ i686-linux, x86_64-linux, x86_64-darwin ] oidc-client: [ i686-linux ] + oidc-client: [ i686-linux, x86_64-linux, x86_64-darwin ] oi: [ i686-linux, x86_64-linux, x86_64-darwin ] ois-input-manager: [ i686-linux, x86_64-linux, x86_64-darwin ] omaketex: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -2555,6 +2722,7 @@ dont-distribute-packages: openflow: [ i686-linux, x86_64-linux, x86_64-darwin ] OpenGLCheck: [ i686-linux, x86_64-linux, x86_64-darwin ] opengles: [ i686-linux, x86_64-linux, x86_64-darwin ] + OpenGL: [ x86_64-darwin ] openid: [ i686-linux, x86_64-linux, x86_64-darwin ] open-pandoc: [ i686-linux, x86_64-linux, x86_64-darwin ] openpgp-crypto-api: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -2573,6 +2741,7 @@ dont-distribute-packages: OrchestrateDB: [ i686-linux, x86_64-linux, x86_64-darwin ] orchid-demo: [ i686-linux, x86_64-linux, x86_64-darwin ] orchid: [ i686-linux, x86_64-linux, x86_64-darwin ] + OrderedBits: [ i686-linux, x86_64-linux, x86_64-darwin ] order-maintenance: [ i686-linux, x86_64-linux, x86_64-darwin ] orgmode-parse: [ i686-linux, x86_64-linux, x86_64-darwin ] origami: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -2598,10 +2767,12 @@ dont-distribute-packages: parco: [ i686-linux, x86_64-linux, x86_64-darwin ] parconc-examples: [ i686-linux, x86_64-linux, x86_64-darwin ] parco-parsec: [ i686-linux, x86_64-linux, x86_64-darwin ] + parport: [ x86_64-darwin ] Parry: [ i686-linux, x86_64-linux, x86_64-darwin ] parsec2: [ i686-linux, x86_64-linux, x86_64-darwin ] parse-help: [ i686-linux, x86_64-linux, x86_64-darwin ] parsely: [ i686-linux, x86_64-linux, x86_64-darwin ] + parser241: [ i686-linux, x86_64-linux, x86_64-darwin ] parser-helper: [ i686-linux, x86_64-linux, x86_64-darwin ] parsestar: [ i686-linux, x86_64-linux, x86_64-darwin ] partial-lens: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -2645,6 +2816,7 @@ dont-distribute-packages: pgsql-simple: [ i686-linux, x86_64-linux, x86_64-darwin ] pgstream: [ i686-linux, x86_64-linux, x86_64-darwin ] phasechange: [ i686-linux, x86_64-linux, x86_64-darwin ] + phone-numbers: [ i686-linux, x86_64-linux, x86_64-darwin ] phone-push: [ i686-linux, x86_64-linux, x86_64-darwin ] phooey: [ i686-linux, x86_64-linux, x86_64-darwin ] photoname: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -2679,6 +2851,7 @@ dont-distribute-packages: plugins: [ i686-linux, x86_64-linux, x86_64-darwin ] plugins-multistage: [ i686-linux, x86_64-linux, x86_64-darwin ] plumbers: [ i686-linux, x86_64-linux, x86_64-darwin ] + ply-loader: [ i686-linux, x86_64-linux, x86_64-darwin ] png-file: [ i686-linux, x86_64-linux, x86_64-darwin ] pngload-fixed: [ i686-linux, x86_64-linux, x86_64-darwin ] pngload: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -2687,8 +2860,10 @@ dont-distribute-packages: pointless-rewrite: [ i686-linux, x86_64-linux, x86_64-darwin ] polar-configfile: [ i686-linux, x86_64-linux, x86_64-darwin ] polh-lexicon: [ i686-linux, x86_64-linux, x86_64-darwin ] + Pollutocracy: [ x86_64-darwin ] polynomials-bernstein: [ i686-linux, x86_64-linux, x86_64-darwin ] polyseq: [ i686-linux, x86_64-linux, x86_64-darwin ] + polysoup: [ i686-linux, x86_64-linux, x86_64-darwin ] polytypeable: [ i686-linux, x86_64-linux, x86_64-darwin ] polytypeable-utils: [ i686-linux, x86_64-linux, x86_64-darwin ] pontarius-mediaserver: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -2698,11 +2873,13 @@ dont-distribute-packages: pool: [ i686-linux, x86_64-linux, x86_64-darwin ] popenhs: [ i686-linux, x86_64-linux, x86_64-darwin ] poppler: [ i686-linux, x86_64-linux, x86_64-darwin ] + portaudio: [ x86_64-darwin ] porte: [ i686-linux, x86_64-linux, x86_64-darwin ] porter: [ i686-linux, x86_64-linux, x86_64-darwin ] PortMidi: [ x86_64-darwin ] ports: [ i686-linux, x86_64-linux, x86_64-darwin ] posix-acl: [ i686-linux, x86_64-linux, x86_64-darwin ] + posix-realtime: [ x86_64-darwin ] posix-waitpid: [ i686-linux, x86_64-linux, x86_64-darwin ] PostgreSQL: [ i686-linux, x86_64-linux, x86_64-darwin ] postgresql-schema: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -2723,6 +2900,7 @@ dont-distribute-packages: prelude-plus: [ i686-linux, x86_64-linux, x86_64-darwin ] preprocess-haskell: [ i686-linux, x86_64-linux, x86_64-darwin ] press: [ i686-linux, x86_64-linux, x86_64-darwin ] + PrimitiveArray: [ i686-linux, x86_64-linux, x86_64-darwin ] primula-board: [ i686-linux, x86_64-linux, x86_64-darwin ] primula-bot: [ i686-linux, x86_64-linux, x86_64-darwin ] printf-mauke: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -2750,6 +2928,7 @@ dont-distribute-packages: prolog-graph: [ i686-linux, x86_64-linux, x86_64-darwin ] prolog-graph-lib: [ i686-linux, x86_64-linux, x86_64-darwin ] prolog: [ i686-linux, x86_64-linux, x86_64-darwin ] + prologue: [ i686-linux, x86_64-linux, x86_64-darwin ] propane: [ i686-linux, x86_64-linux, x86_64-darwin ] Proper: [ i686-linux, x86_64-linux, x86_64-darwin ] proplang: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -2764,9 +2943,11 @@ dont-distribute-packages: pubnub: [ i686-linux, x86_64-linux, x86_64-darwin ] pubsub: [ i686-linux, x86_64-linux, x86_64-darwin ] puffytools: [ i686-linux, x86_64-linux, x86_64-darwin ] + pugixml: [ x86_64-darwin ] pugs-hsregex: [ i686-linux, x86_64-linux, x86_64-darwin ] pugs-HsSyck: [ i686-linux, x86_64-linux, x86_64-darwin ] Pugs: [ i686-linux, x86_64-linux, x86_64-darwin ] + pulse-simple: [ x86_64-darwin ] punkt: [ i686-linux, x86_64-linux, x86_64-darwin ] Pup-Events-Demo: [ i686-linux, x86_64-linux, x86_64-darwin ] puppetresources: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -2783,6 +2964,8 @@ dont-distribute-packages: qd-vec: [ i686-linux, x86_64-linux, x86_64-darwin ] qhull-simple: [ i686-linux, x86_64-linux, x86_64-darwin ] QIO: [ i686-linux, x86_64-linux, x86_64-darwin ] + qt: [ i686-linux, x86_64-linux, x86_64-darwin ] + QuadEdge: [ i686-linux, x86_64-linux, x86_64-darwin ] quadratic-irrational: [ i686-linux, x86_64-linux, x86_64-darwin ] quantum-arrow: [ i686-linux, x86_64-linux, x86_64-darwin ] qudb: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -2812,26 +2995,31 @@ dont-distribute-packages: rakhana: [ i686-linux, x86_64-linux, x86_64-darwin ] ralist: [ i686-linux, x86_64-linux, x86_64-darwin ] rallod: [ i686-linux, x86_64-linux, x86_64-darwin ] + randfile: [ i686-linux, x86_64-linux, x86_64-darwin ] random-access-list: [ i686-linux, x86_64-linux, x86_64-darwin ] RandomDotOrg: [ i686-linux, x86_64-linux, x86_64-darwin ] random-eff: [ i686-linux, x86_64-linux, x86_64-darwin ] random-effin: [ i686-linux, x86_64-linux, x86_64-darwin ] random-hypergeometric: [ i686-linux, x86_64-linux, x86_64-darwin ] random-stream: [ i686-linux, x86_64-linux, x86_64-darwin ] + random-variates: [ i686-linux ] rand-vars: [ i686-linux, x86_64-linux, x86_64-darwin ] rangemin: [ i686-linux, x86_64-linux, x86_64-darwin ] Ranka: [ i686-linux, x86_64-linux, x86_64-darwin ] + Rasenschach: [ x86_64-darwin ] raven-haskell: [ i686-linux, x86_64-linux, x86_64-darwin ] raven-haskell-scotty: [ i686-linux, x86_64-linux, x86_64-darwin ] rbr: [ i686-linux, x86_64-linux, x86_64-darwin ] rcu: [ i686-linux, x86_64-linux, x86_64-darwin ] rdf4h: [ i686-linux, x86_64-linux, x86_64-darwin ] rdioh: [ i686-linux, x86_64-linux, x86_64-darwin ] + re2: [ x86_64-darwin ] reaction-logic: [ i686-linux, x86_64-linux, x86_64-darwin ] reactive-bacon: [ i686-linux, x86_64-linux, x86_64-darwin ] reactive-balsa: [ i686-linux, x86_64-linux, x86_64-darwin ] reactive-banana-sdl: [ i686-linux, x86_64-linux, x86_64-darwin ] reactive-banana-threepenny: [ i686-linux, x86_64-linux, x86_64-darwin ] + reactive-banana-wx: [ x86_64-darwin ] reactive-fieldtrip: [ i686-linux, x86_64-linux, x86_64-darwin ] reactive-glut: [ i686-linux, x86_64-linux, x86_64-darwin ] reactive: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -2852,6 +3040,7 @@ dont-distribute-packages: Ref: [ i686-linux, x86_64-linux, x86_64-darwin ] reflection-extras: [ i686-linux, x86_64-linux, x86_64-darwin ] reflex-dom: [ i686-linux, x86_64-linux, x86_64-darwin ] + reflex-gloss-scene: [ x86_64-darwin ] regex-deriv: [ i686-linux, x86_64-linux, x86_64-darwin ] regex-dfa: [ i686-linux, x86_64-linux, x86_64-darwin ] regex-genex: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -2882,12 +3071,15 @@ dont-distribute-packages: repa-flow: [ i686-linux, x86_64-linux, x86_64-darwin ] repa-plugin: [ i686-linux, x86_64-linux, x86_64-darwin ] repa-series: [ i686-linux, x86_64-linux, x86_64-darwin ] + repa-sndfile: [ i686-linux, x86_64-linux, x86_64-darwin ] + repa-stream: [ i686-linux, x86_64-linux, x86_64-darwin ] repa-v4l2: [ i686-linux, x86_64-linux, x86_64-darwin ] repl: [ i686-linux, x86_64-linux, x86_64-darwin ] repo-based-blog: [ i686-linux, x86_64-linux, x86_64-darwin ] representable-functors: [ i686-linux, x86_64-linux, x86_64-darwin ] representable-tries: [ i686-linux, x86_64-linux, x86_64-darwin ] repr: [ i686-linux, x86_64-linux, x86_64-darwin ] + resistor-cube: [ i686-linux, x86_64-linux, x86_64-darwin ] resource-embed: [ i686-linux, x86_64-linux, x86_64-darwin ] resource-simple: [ i686-linux, x86_64-linux, x86_64-darwin ] respond: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -2967,11 +3159,14 @@ dont-distribute-packages: salvia-sessions: [ i686-linux, x86_64-linux, x86_64-darwin ] salvia-websocket: [ i686-linux, x86_64-linux, x86_64-darwin ] samtools-iteratee: [ i686-linux, x86_64-linux, x86_64-darwin ] + sarasvati: [ x86_64-darwin ] sasl: [ i686-linux, x86_64-linux, x86_64-darwin ] satchmo-backends: [ i686-linux, x86_64-linux, x86_64-darwin ] satchmo-examples: [ i686-linux, x86_64-linux, x86_64-darwin ] satchmo-funsat: [ i686-linux, x86_64-linux, x86_64-darwin ] satchmo-minisat: [ i686-linux, x86_64-linux, x86_64-darwin ] + satchmo-toysat: [ x86_64-darwin ] + satchmo: [ x86_64-darwin ] sat: [ i686-linux, x86_64-linux, x86_64-darwin ] sat-micro-hs: [ i686-linux, x86_64-linux, x86_64-darwin ] SBench: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -2984,6 +3179,7 @@ dont-distribute-packages: schedevr: [ i686-linux, x86_64-linux, x86_64-darwin ] scholdoc-citeproc: [ i686-linux, x86_64-linux, x86_64-darwin ] scholdoc: [ i686-linux, x86_64-linux, x86_64-darwin ] + science-constants-dimensional: [ i686-linux, x86_64-linux, x86_64-darwin ] scion-browser: [ i686-linux, x86_64-linux, x86_64-darwin ] scion: [ i686-linux, x86_64-linux, x86_64-darwin ] scope-cairo: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -2999,10 +3195,20 @@ dont-distribute-packages: scroll: [ i686-linux, x86_64-linux, x86_64-darwin ] scrz: [ i686-linux, x86_64-linux, x86_64-darwin ] Scurry: [ i686-linux, x86_64-linux, x86_64-darwin ] + sde-solver: [ i686-linux, x86_64-linux, x86_64-darwin ] + sdl2-cairo: [ x86_64-darwin ] + sdl2-compositor: [ x86_64-darwin ] sdl2-image: [ i686-linux, x86_64-linux, x86_64-darwin ] sdl2-ttf: [ i686-linux, x86_64-linux, x86_64-darwin ] + sdl2: [ x86_64-darwin ] + SDL-gfx: [ x86_64-darwin ] + SDL-image: [ x86_64-darwin ] SDL-mixer: [ x86_64-darwin ] + SDL-mpeg: [ x86_64-darwin ] + SDL-ttf: [ x86_64-darwin ] + SDL: [ x86_64-darwin ] sdr: [ i686-linux, x86_64-darwin ] + sdr: [ i686-linux, x86_64-linux, x86_64-darwin ] seacat: [ i686-linux, x86_64-linux, x86_64-darwin ] search: [ i686-linux, x86_64-linux, x86_64-darwin ] secdh: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -3012,6 +3218,7 @@ dont-distribute-packages: secrm: [ i686-linux, x86_64-linux, x86_64-darwin ] sednaDBXML: [ i686-linux, x86_64-linux, x86_64-darwin ] selectors: [ i686-linux, x86_64-linux, x86_64-darwin ] + select: [ x86_64-darwin ] selenium: [ i686-linux, x86_64-linux, x86_64-darwin ] selenium-server: [ i686-linux, x86_64-linux, x86_64-darwin ] selinux: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -3019,6 +3226,7 @@ dont-distribute-packages: semigroups-actions: [ i686-linux, x86_64-linux, x86_64-darwin ] semi-iso: [ i686-linux, x86_64-linux, x86_64-darwin ] semiring: [ i686-linux, x86_64-linux, x86_64-darwin ] + semver-range: [ i686-linux, x86_64-linux, x86_64-darwin ] sensenet: [ i686-linux, x86_64-linux, x86_64-darwin ] sentry: [ i686-linux, x86_64-linux, x86_64-darwin ] seqaid: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -3064,6 +3272,7 @@ dont-distribute-packages: shell-pipe: [ i686-linux, x86_64-linux, x86_64-darwin ] showdown: [ i686-linux, x86_64-linux, x86_64-darwin ] shpider: [ i686-linux, x86_64-linux, x86_64-darwin ] + Shu-thing: [ x86_64-darwin ] sifflet: [ i686-linux, x86_64-linux, x86_64-darwin ] sifflet-lib: [ i686-linux, x86_64-linux, x86_64-darwin ] signals: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -3099,6 +3308,7 @@ dont-distribute-packages: skype4hs: [ i686-linux, x86_64-linux, x86_64-darwin ] slack: [ i686-linux, x86_64-linux, x86_64-darwin ] slidemews: [ i686-linux, x86_64-linux, x86_64-darwin ] + Slides: [ i686-linux, x86_64-linux, x86_64-darwin ] sloth: [ i686-linux, x86_64-linux, x86_64-darwin ] smallarray: [ i686-linux, x86_64-linux, x86_64-darwin ] smallpt-hs: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -3133,13 +3343,17 @@ dont-distribute-packages: snaplet-typed-sessions: [ i686-linux, x86_64-linux, x86_64-darwin ] snaplet-wordpress: [ i686-linux, x86_64-linux, x86_64-darwin ] snap-predicates: [ i686-linux, x86_64-linux, x86_64-darwin ] + snappy-conduit: [ x86_64-darwin ] + snappy-framing: [ x86_64-darwin ] snappy-iteratee: [ i686-linux, x86_64-linux, x86_64-darwin ] + snappy: [ x86_64-darwin ] snap-testing: [ i686-linux, x86_64-linux, x86_64-darwin ] snap-utils: [ i686-linux, x86_64-linux, x86_64-darwin ] sndfile-enumerators: [ i686-linux, x86_64-linux, x86_64-darwin ] sneathlane-haste: [ i686-linux, x86_64-linux, x86_64-darwin ] SNet: [ i686-linux, x86_64-linux, x86_64-darwin ] snm: [ i686-linux, x86_64-linux, x86_64-darwin ] + snowglobe: [ x86_64-darwin ] snow-white: [ i686-linux, x86_64-linux, x86_64-darwin ] Snusmumrik: [ i686-linux, x86_64-linux, x86_64-darwin ] SoccerFunGL: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -3167,6 +3381,7 @@ dont-distribute-packages: specialize-th: [ i686-linux, x86_64-linux, x86_64-darwin ] sphero: [ i686-linux, x86_64-linux, x86_64-darwin ] sphinx-cli: [ i686-linux, x86_64-linux, x86_64-darwin ] + spice: [ x86_64-darwin ] spike: [ i686-linux, x86_64-linux, x86_64-darwin ] splaytree: [ i686-linux, x86_64-linux, x86_64-darwin ] spline3: [ i686-linux ] @@ -3178,6 +3393,7 @@ dont-distribute-packages: spoty: [ i686-linux, x86_64-linux, x86_64-darwin ] Sprig: [ i686-linux, x86_64-linux, x86_64-darwin ] spsa: [ i686-linux ] + spsa: [ i686-linux, x86_64-linux, x86_64-darwin ] spy: [ i686-linux, x86_64-linux, x86_64-darwin ] sqlite-simple-typed: [ i686-linux, x86_64-linux, x86_64-darwin ] sql-simple: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -3205,6 +3421,7 @@ dont-distribute-packages: stmcontrol: [ i686-linux, x86_64-linux, x86_64-darwin ] stm-firehose: [ i686-linux, x86_64-linux, x86_64-darwin ] Stomp: [ i686-linux, x86_64-linux, x86_64-darwin ] + stopwatch: [ x86_64-darwin ] storable-static-array: [ i686-linux, x86_64-linux, x86_64-darwin ] storablevector-carray: [ i686-linux, x86_64-linux, x86_64-darwin ] storablevector: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -3213,6 +3430,7 @@ dont-distribute-packages: stratum-tool: [ i686-linux, x86_64-linux, x86_64-darwin ] streamed: [ i686-linux, x86_64-linux, x86_64-darwin ] stream-fusion: [ i686-linux, x86_64-linux, x86_64-darwin ] + streaming-utils: [ i686-linux ] StrictBench: [ i686-linux, x86_64-linux, x86_64-darwin ] strict-concurrency: [ i686-linux, x86_64-linux, x86_64-darwin ] stringlike: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -3220,6 +3438,8 @@ dont-distribute-packages: structures: [ i686-linux, x86_64-linux, x86_64-darwin ] stunts: [ i686-linux, x86_64-linux, x86_64-darwin ] subhask: [ i686-linux ] + subhask: [ i686-linux, x86_64-linux, x86_64-darwin ] + subleq-toolchain: [ i686-linux, x86_64-linux, x86_64-darwin ] sub-state: [ i686-linux, x86_64-linux, x86_64-darwin ] suitable: [ i686-linux, x86_64-linux, x86_64-darwin ] sunlight: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -3265,6 +3485,7 @@ dont-distribute-packages: system-canonicalpath: [ i686-linux, x86_64-linux, x86_64-darwin ] system-lifted: [ i686-linux, x86_64-linux, x86_64-darwin ] system-random-effect: [ i686-linux, x86_64-linux, x86_64-darwin ] + system-time-monotonic: [ x86_64-darwin ] Tables: [ i686-linux, x86_64-linux, x86_64-darwin ] tablestorage: [ i686-linux, x86_64-linux, x86_64-darwin ] tabloid: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -3284,6 +3505,7 @@ dont-distribute-packages: tasty-expected-failure: [ i686-linux, x86_64-linux, x86_64-darwin ] tasty-integrate: [ i686-linux, x86_64-linux, x86_64-darwin ] TBC: [ i686-linux, x86_64-linux, x86_64-darwin ] + TBit: [ i686-linux, x86_64-linux, x86_64-darwin ] tbox: [ i686-linux, x86_64-linux, x86_64-darwin ] tccli: [ i686-linux, x86_64-linux, x86_64-darwin ] tcp: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -3295,6 +3517,7 @@ dont-distribute-packages: template-haskell-util: [ i686-linux, x86_64-linux, x86_64-darwin ] template-hsml: [ i686-linux, x86_64-linux, x86_64-darwin ] templatepg: [ i686-linux, x86_64-linux, x86_64-darwin ] + template-yj: [ i686-linux, x86_64-linux, x86_64-darwin ] tempodb: [ i686-linux, x86_64-linux, x86_64-darwin ] temporal-csound: [ i686-linux, x86_64-linux, x86_64-darwin ] tempus: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -3321,6 +3544,7 @@ dont-distribute-packages: text-xml-generic: [ i686-linux, x86_64-linux, x86_64-darwin ] text-xml-qq: [ i686-linux, x86_64-linux, x86_64-darwin ] tfp-th: [ i686-linux, x86_64-linux, x86_64-darwin ] + tftp: [ x86_64-darwin ] th-context: [ i686-linux, x86_64-linux, x86_64-darwin ] Theora: [ i686-linux, x86_64-linux, x86_64-darwin ] theoremquest-client: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -3355,6 +3579,8 @@ dont-distribute-packages: time-w3c: [ i686-linux, x86_64-linux, x86_64-darwin ] TinyLaunchbury: [ i686-linux, x86_64-linux, x86_64-darwin ] TinyURL: [ i686-linux, x86_64-linux, x86_64-darwin ] + tip-haskell-frontend: [ i686-linux, x86_64-linux, x86_64-darwin ] + tip-lib: [ i686-linux, x86_64-linux, x86_64-darwin ] Titim: [ i686-linux, x86_64-linux, x86_64-darwin ] tkhs: [ i686-linux, x86_64-linux, x86_64-darwin ] tkyprof: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -3378,6 +3604,7 @@ dont-distribute-packages: transactional-events: [ i686-linux, x86_64-linux, x86_64-darwin ] transformers-convert: [ i686-linux, x86_64-linux, x86_64-darwin ] transformers-runnable: [ i686-linux, x86_64-linux, x86_64-darwin ] + transient: [ i686-linux, x86_64-linux, x86_64-darwin ] translate: [ i686-linux, x86_64-linux, x86_64-darwin ] traypoweroff: [ i686-linux, x86_64-linux, x86_64-darwin ] treeviz: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -3399,7 +3626,9 @@ dont-distribute-packages: tupleinstances: [ i686-linux, x86_64-linux, x86_64-darwin ] tuple-morph: [ i686-linux, x86_64-linux, x86_64-darwin ] turing-music: [ x86_64-darwin ] + twentefp-eventloop-trees: [ i686-linux, x86_64-linux, x86_64-darwin ] twentefp-rosetree: [ i686-linux, x86_64-linux, x86_64-darwin ] + twentefp: [ x86_64-darwin ] twhs: [ i686-linux, x86_64-linux, x86_64-darwin ] twidge: [ i686-linux, x86_64-linux, x86_64-darwin ] twilight-stm: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -3422,6 +3651,7 @@ dont-distribute-packages: TypeClass: [ i686-linux, x86_64-linux, x86_64-darwin ] type-digits: [ i686-linux, x86_64-linux, x86_64-darwin ] typedquery: [ i686-linux, x86_64-linux, x86_64-darwin ] + typed-wire: [ i686-linux, x86_64-linux, x86_64-darwin ] type-equality-check: [ i686-linux, x86_64-linux, x86_64-darwin ] typehash: [ i686-linux, x86_64-linux, x86_64-darwin ] TypeIlluminator: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -3441,6 +3671,7 @@ dont-distribute-packages: type-structure: [ i686-linux, x86_64-linux, x86_64-darwin ] type-sub-th: [ i686-linux, x86_64-linux, x86_64-darwin ] typography-geometry: [ i686-linux, x86_64-linux, x86_64-darwin ] + tz: [ i686-linux, x86_64-linux, x86_64-darwin ] uAgda: [ i686-linux, x86_64-linux, x86_64-darwin ] uberlast: [ i686-linux, x86_64-linux, x86_64-darwin ] uconv: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -3448,6 +3679,7 @@ dont-distribute-packages: udbus-model: [ i686-linux, x86_64-linux, x86_64-darwin ] udev: [ i686-linux, x86_64-linux, x86_64-darwin ] ui-command: [ i686-linux, x86_64-linux, x86_64-darwin ] + UISF: [ x86_64-darwin ] UMM: [ i686-linux, x86_64-linux, x86_64-darwin ] unamb-custom: [ i686-linux, x86_64-linux, x86_64-darwin ] unbounded-delays-units: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -3461,6 +3693,7 @@ dont-distribute-packages: unittyped: [ i686-linux, x86_64-linux, x86_64-darwin ] universe-th: [ i686-linux, x86_64-linux, x86_64-darwin ] unix-process-conduit: [ i686-linux, x86_64-linux, x86_64-darwin ] + Unixutils-shadow: [ x86_64-darwin ] unlit: [ i686-linux, x86_64-linux, x86_64-darwin ] unordered-containers-rematch: [ i686-linux, x86_64-linux, x86_64-darwin ] unpack-funcs: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -3499,10 +3732,13 @@ dont-distribute-packages: vampire: [ i686-linux, x86_64-linux, x86_64-darwin ] var: [ i686-linux, x86_64-linux, x86_64-darwin ] vaultaire-common: [ i686-linux, x86_64-linux, x86_64-darwin ] + vcache-trie: [ x86_64-darwin ] + vcache: [ x86_64-darwin ] vcard: [ i686-linux, x86_64-linux, x86_64-darwin ] vcsgui: [ i686-linux, x86_64-linux, x86_64-darwin ] Vec-Boolean: [ i686-linux, x86_64-linux, x86_64-darwin ] Vec-OpenGLRaw: [ i686-linux, x86_64-linux, x86_64-darwin ] + vect-opengl: [ x86_64-darwin ] vector-bytestring: [ i686-linux, x86_64-linux, x86_64-darwin ] vector-clock: [ i686-linux, x86_64-linux, x86_64-darwin ] vector-conduit: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -3517,6 +3753,7 @@ dont-distribute-packages: vigilance: [ i686-linux, x86_64-linux, x86_64-darwin ] vimus: [ i686-linux, x86_64-linux, x86_64-darwin ] vintage-basic: [ i686-linux, x86_64-linux, x86_64-darwin ] + vinyl-gl: [ x86_64-darwin ] vinyl-json: [ i686-linux, x86_64-linux, x86_64-darwin ] virthualenv: [ i686-linux, x86_64-linux, x86_64-darwin ] vision: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -3560,6 +3797,7 @@ dont-distribute-packages: watchdog: [ i686-linux, x86_64-linux, x86_64-darwin ] watcher: [ i686-linux, x86_64-linux, x86_64-darwin ] watchit: [ i686-linux, x86_64-linux, x86_64-darwin ] + WaveFront: [ x86_64-darwin ] wavesurfer: [ i686-linux, x86_64-linux, x86_64-darwin ] weather-api: [ i686-linux, x86_64-linux, x86_64-darwin ] WebBits-Html: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -3596,6 +3834,7 @@ dont-distribute-packages: windowslive: [ i686-linux, x86_64-linux, x86_64-darwin ] winerror: [ i686-linux, x86_64-linux, x86_64-darwin ] winio: [ i686-linux, x86_64-linux, x86_64-darwin ] + Wired: [ x86_64-darwin ] WL500gPControl: [ i686-linux, x86_64-linux, x86_64-darwin ] wlc-hs: [ i686-linux, x86_64-linux, x86_64-darwin ] WMSigner: [ i686-linux ] @@ -3620,10 +3859,14 @@ dont-distribute-packages: wumpus-tree: [ i686-linux, x86_64-linux, x86_64-darwin ] WURFL: [ i686-linux, x86_64-linux, x86_64-darwin ] wxAsteroids: [ i686-linux, x86_64-linux, x86_64-darwin ] + wxcore: [ x86_64-darwin ] + wxc: [ x86_64-darwin ] WXDiffCtrl: [ i686-linux, x86_64-linux, x86_64-darwin ] wxFruit: [ i686-linux, x86_64-linux, x86_64-darwin ] + WxGeneric: [ x86_64-darwin ] wxhnotepad: [ i686-linux, x86_64-linux, x86_64-darwin ] wxturtle: [ i686-linux, x86_64-linux, x86_64-darwin ] + wx: [ x86_64-darwin ] wyvern: [ i686-linux, x86_64-linux, x86_64-darwin ] X11-extras: [ i686-linux, x86_64-linux, x86_64-darwin ] X11-rm: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -3631,6 +3874,8 @@ dont-distribute-packages: X11-xfixes: [ i686-linux, x86_64-linux, x86_64-darwin ] x11-xinput: [ i686-linux, x86_64-linux, x86_64-darwin ] x509-util: [ i686-linux, x86_64-linux, x86_64-darwin ] + xattr: [ x86_64-darwin ] + xbattbar: [ x86_64-darwin ] xchat-plugin: [ i686-linux, x86_64-linux, x86_64-darwin ] xdot: [ i686-linux, x86_64-linux, x86_64-darwin ] x-dsp: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -3640,6 +3885,7 @@ dont-distribute-packages: xhb-ewmh: [ i686-linux, x86_64-linux, x86_64-darwin ] xine: [ i686-linux, x86_64-linux, x86_64-darwin ] xing-api: [ i686-linux, x86_64-linux, x86_64-darwin ] + xkbcommon: [ x86_64-darwin ] xkcd: [ i686-linux, x86_64-linux, x86_64-darwin ] xlsx-templater: [ i686-linux, x86_64-linux, x86_64-darwin ] xml2json: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -3661,6 +3907,7 @@ dont-distribute-packages: xmonad-contrib-bluetilebranch: [ i686-linux, x86_64-linux, x86_64-darwin ] xmonad-eval: [ i686-linux, x86_64-linux, x86_64-darwin ] xmonad-screenshot: [ i686-linux, x86_64-linux, x86_64-darwin ] + xmonad-utils: [ x86_64-darwin ] xmpipe: [ i686-linux, x86_64-linux, x86_64-darwin ] XMPP: [ i686-linux, x86_64-linux, x86_64-darwin ] xosd: [ x86_64-darwin ] @@ -3672,6 +3919,7 @@ dont-distribute-packages: xsact: [ i686-linux, x86_64-linux, x86_64-darwin ] XSaiga: [ i686-linux, x86_64-linux, x86_64-darwin ] xslt: [ i686-linux, x86_64-linux, x86_64-darwin ] + xtc: [ x86_64-darwin ] y0l0bot: [ i686-linux, x86_64-linux, x86_64-darwin ] Yablog: [ i686-linux, x86_64-linux, x86_64-darwin ] YACPong: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -3683,6 +3931,7 @@ dont-distribute-packages: yaml-rpc: [ i686-linux, x86_64-linux, x86_64-darwin ] yaml-rpc-scotty: [ i686-linux, x86_64-linux, x86_64-darwin ] yaml-rpc-snap: [ i686-linux, x86_64-linux, x86_64-darwin ] + yampa2048: [ x86_64-darwin ] yampa-canvas: [ i686-linux, x86_64-linux, x86_64-darwin ] yampa-glfw: [ i686-linux, x86_64-linux, x86_64-darwin ] yampa-glut: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -3699,6 +3948,7 @@ dont-distribute-packages: yesod-auth-pam: [ i686-linux, x86_64-linux, x86_64-darwin ] yesod-auth-smbclient: [ i686-linux, x86_64-linux, x86_64-darwin ] yesod-comments: [ i686-linux, x86_64-linux, x86_64-darwin ] + yesod-content-pdf: [ i686-linux, x86_64-linux, x86_64-darwin ] yesod-continuations: [ i686-linux, x86_64-linux, x86_64-darwin ] yesod-datatables: [ i686-linux, x86_64-linux, x86_64-darwin ] yesod-examples: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -3726,6 +3976,7 @@ dont-distribute-packages: yi-fuzzy-open: [ i686-linux, x86_64-linux, x86_64-darwin ] yi: [ i686-linux, x86_64-linux, x86_64-darwin ] yi-monokai: [ i686-linux, x86_64-linux, x86_64-darwin ] + yi-rope: [ x86_64-darwin ] yi-snippet: [ i686-linux, x86_64-linux, x86_64-darwin ] yi-solarized: [ i686-linux, x86_64-linux, x86_64-darwin ] yi-spolsky: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -3739,6 +3990,7 @@ dont-distribute-packages: yuuko: [ i686-linux, x86_64-linux, x86_64-darwin ] yxdb-utils: [ i686-linux ] yxdb-utils: [ i686-linux, x86_64-linux, x86_64-darwin ] + z3: [ x86_64-darwin ] zampolit: [ i686-linux, x86_64-linux, x86_64-darwin ] zasni-gerna: [ i686-linux, x86_64-linux, x86_64-darwin ] zendesk-api: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -3762,82 +4014,3 @@ dont-distribute-packages: zsh-battery: [ i686-linux, x86_64-linux, x86_64-darwin ] ztail: [ i686-linux, x86_64-linux, x86_64-darwin ] Zwaluw: [ i686-linux, x86_64-linux, x86_64-darwin ] - ADPfusion: [ i686-linux, x86_64-linux, x86_64-darwin ] - AlignmentAlgorithms: [ i686-linux, x86_64-linux, x86_64-darwin ] - BiobaseTypes: [ i686-linux, x86_64-linux, x86_64-darwin ] - BiobaseXNA: [ i686-linux, x86_64-linux, x86_64-darwin ] - FormalGrammars: [ i686-linux, x86_64-linux, x86_64-darwin ] - GenussFold: [ i686-linux, x86_64-linux, x86_64-darwin ] - GeocoderOpenCage: [ i686-linux, x86_64-linux, x86_64-darwin ] - GrammarProducts: [ i686-linux, x86_64-linux, x86_64-darwin ] - HaskellLM: [ i686-linux, x86_64-linux, x86_64-darwin ] - LambdaNet: [ i686-linux, x86_64-linux, x86_64-darwin ] - OrderedBits: [ i686-linux, x86_64-linux, x86_64-darwin ] - PrimitiveArray: [ i686-linux, x86_64-linux, x86_64-darwin ] - QuadEdge: [ i686-linux, x86_64-linux, x86_64-darwin ] - Slides: [ i686-linux, x86_64-linux, x86_64-darwin ] - TBit: [ i686-linux, x86_64-linux, x86_64-darwin ] - atomic-primops-vector: [ i686-linux, x86_64-linux, x86_64-darwin ] - bitstream: [ i686-linux, x86_64-linux, x86_64-darwin ] - bitvec: [ i686-linux, x86_64-linux, x86_64-darwin ] - compensated: [ i686-linux, x86_64-linux, x86_64-darwin ] - conduit-audio-sndfile: [ i686-linux, x86_64-linux, x86_64-darwin ] - dph-prim-seq: [ i686-linux, x86_64-linux, x86_64-darwin ] - eventloop: [ i686-linux, x86_64-linux, x86_64-darwin ] - fastbayes: [ i686-linux, x86_64-linux, x86_64-darwin ] - flowdock-rest: [ i686-linux, x86_64-linux, x86_64-darwin ] - full-text-search: [ i686-linux, x86_64-linux, x86_64-darwin ] - gloss-banana: [ i686-linux, x86_64-linux, x86_64-darwin ] - haskell-exp-parser: [ i686-linux, x86_64-linux, x86_64-darwin ] - haskell-mpi: [ i686-linux, x86_64-linux, x86_64-darwin ] - hfoil: [ i686-linux, x86_64-linux, x86_64-darwin ] - hmatrix-mmap: [ i686-linux, x86_64-linux, x86_64-darwin ] - hmatrix-nipals: [ i686-linux, x86_64-linux, x86_64-darwin ] - hmatrix-repa: [ i686-linux, x86_64-linux, x86_64-darwin ] - hmatrix-svdlibc: [ i686-linux, x86_64-linux, x86_64-darwin ] - hnetcdf: [ i686-linux, x86_64-linux, x86_64-darwin ] - hs-duktape: [ i686-linux, x86_64-linux, x86_64-darwin ] - hsc3-auditor: [ i686-linux, x86_64-linux, x86_64-darwin ] - hsc3-sf-hsndfile: [ i686-linux, x86_64-linux, x86_64-darwin ] - hsndfile-vector: [ i686-linux, x86_64-linux, x86_64-darwin ] - hsndfile: [ i686-linux, x86_64-linux, x86_64-darwin ] - hworker-ses: [ i686-linux, x86_64-linux, x86_64-darwin ] - hworker: [ i686-linux, x86_64-linux, x86_64-darwin ] - imperative-edsl-vhdl: [ i686-linux, x86_64-linux, x86_64-darwin ] - inline-r: [ i686-linux, x86_64-linux, x86_64-darwin ] - jacobi-roots: [ i686-linux, x86_64-linux, x86_64-darwin ] - lagrangian: [ i686-linux, x86_64-linux, x86_64-darwin ] - libssh2: [ i686-linux, x86_64-linux, x86_64-darwin ] - linda: [ i686-linux, x86_64-linux, x86_64-darwin ] - linear-circuit: [ i686-linux, x86_64-linux, x86_64-darwin ] - magico: [ i686-linux, x86_64-linux, x86_64-darwin ] - manifold-random: [ i686-linux, x86_64-linux, x86_64-darwin ] - manifolds: [ i686-linux, x86_64-linux, x86_64-darwin ] - netlink: [ i686-linux, x86_64-linux, x86_64-darwin ] - nixfromnpm: [ i686-linux, x86_64-linux, x86_64-darwin ] - oidc-client: [ i686-linux, x86_64-linux, x86_64-darwin ] - parser241: [ i686-linux, x86_64-linux, x86_64-darwin ] - phone-numbers: [ i686-linux, x86_64-linux, x86_64-darwin ] - ply-loader: [ i686-linux, x86_64-linux, x86_64-darwin ] - polysoup: [ i686-linux, x86_64-linux, x86_64-darwin ] - prologue: [ i686-linux, x86_64-linux, x86_64-darwin ] - qt: [ i686-linux, x86_64-linux, x86_64-darwin ] - randfile: [ i686-linux, x86_64-linux, x86_64-darwin ] - repa-sndfile: [ i686-linux, x86_64-linux, x86_64-darwin ] - repa-stream: [ i686-linux, x86_64-linux, x86_64-darwin ] - resistor-cube: [ i686-linux, x86_64-linux, x86_64-darwin ] - science-constants-dimensional: [ i686-linux, x86_64-linux, x86_64-darwin ] - sde-solver: [ i686-linux, x86_64-linux, x86_64-darwin ] - sdr: [ i686-linux, x86_64-linux, x86_64-darwin ] - semver-range: [ i686-linux, x86_64-linux, x86_64-darwin ] - spsa: [ i686-linux, x86_64-linux, x86_64-darwin ] - subhask: [ i686-linux, x86_64-linux, x86_64-darwin ] - subleq-toolchain: [ i686-linux, x86_64-linux, x86_64-darwin ] - template-yj: [ i686-linux, x86_64-linux, x86_64-darwin ] - tip-haskell-frontend: [ i686-linux, x86_64-linux, x86_64-darwin ] - tip-lib: [ i686-linux, x86_64-linux, x86_64-darwin ] - transient: [ i686-linux, x86_64-linux, x86_64-darwin ] - twentefp-eventloop-trees: [ i686-linux, x86_64-linux, x86_64-darwin ] - typed-wire: [ i686-linux, x86_64-linux, x86_64-darwin ] - tz: [ i686-linux, x86_64-linux, x86_64-darwin ] - yesod-content-pdf: [ i686-linux, x86_64-linux, x86_64-darwin ] From 43147bedaba012a970dfcd22948b99d1d833ecfa Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Thu, 5 Nov 2015 13:48:22 +0100 Subject: [PATCH 148/162] blender: Update to 2.76b --- pkgs/applications/misc/blender/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/misc/blender/default.nix b/pkgs/applications/misc/blender/default.nix index 149cd05bd7b7..0b9cbe029998 100644 --- a/pkgs/applications/misc/blender/default.nix +++ b/pkgs/applications/misc/blender/default.nix @@ -10,11 +10,11 @@ with lib; stdenv.mkDerivation rec { - name = "blender-2.76"; + name = "blender-2.76b"; src = fetchurl { url = "http://download.blender.org/source/${name}.tar.gz"; - sha256 = "0daqirvlr0bwgrgrr7igyl8rcgjvpvrgns76z2z57kdxi6d696av"; + sha256 = "0pb0mlj4vj0iir528ifqq67nsh3ca1942933d9cwlbpcja2jm1dx"; }; buildInputs = From 452dbfd2886038f230cd182e601b9d311312e0b0 Mon Sep 17 00:00:00 2001 From: Nikolay Amiantov Date: Thu, 5 Nov 2015 16:21:47 +0300 Subject: [PATCH 149/162] nixos/tlp: workaround early build trigger --- nixos/modules/services/hardware/tlp.nix | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/nixos/modules/services/hardware/tlp.nix b/nixos/modules/services/hardware/tlp.nix index f221c82e2eda..9bd246bfb637 100644 --- a/nixos/modules/services/hardware/tlp.nix +++ b/nixos/modules/services/hardware/tlp.nix @@ -8,7 +8,16 @@ cfg = config.services.tlp; tlp = pkgs.tlp.override { kmod = config.system.sbin.modprobe; }; -confFile = pkgs.writeText "tlp" (builtins.readFile "${tlp}/etc/default/tlp" + cfg.extraConfig); +# XXX: We can't use writeTextFile + readFile here because it triggers +# TLP build to get the .drv (even on --dry-run). +confFile = pkgs.runCommand "tlp" + { config = cfg.extraConfig; + passAsFile = [ "config" ]; + } + '' + cat ${tlp}/etc/default/tlp > $out + cat $configPath >> $out + ''; in From 73e9dbfe86660969f0d595c267ab105548b307f2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Llu=C3=ADs=20Batlle=20i=20Rossell?= Date: Wed, 4 Nov 2015 21:56:15 +0100 Subject: [PATCH 150/162] Updating homebank to 5.0.6. The old 5.0.0 is not available anymore. I use the gtk33 hook to get proper icons, but still some icons are broken (open, save, ...) (cherry picked from commit 5e432c047e131da402d040c67dd9f6e3b5153681) --- pkgs/applications/office/homebank/default.nix | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/pkgs/applications/office/homebank/default.nix b/pkgs/applications/office/homebank/default.nix index 8ab2d8fedcc2..b1eb4ddf021c 100644 --- a/pkgs/applications/office/homebank/default.nix +++ b/pkgs/applications/office/homebank/default.nix @@ -1,8 +1,9 @@ -{ fetchurl, stdenv, gtk, pkgconfig, libofx, intltool }: +{ fetchurl, stdenv, gtk, pkgconfig, libofx, intltool, wrapGAppsHook +, hicolor_icon_theme}: let download_root = "http://homebank.free.fr/public/"; - name = "homebank-5.0.0"; + name = "homebank-5.0.6"; lastrelease = download_root + name + ".tar.gz"; oldrelease = download_root + "old/" + name + ".tar.gz"; in @@ -12,10 +13,10 @@ stdenv.mkDerivation { src = fetchurl { urls = [ lastrelease oldrelease ]; - sha256 = "062r61ryn2v1sxyw6zymhxnvnhk19wsr4nyzmiiwx5wrk0nk9m18"; + sha256 = "1r1rn8lgnqnlwkspx230gly5f4i90ij0a3ddrvw51kdc41xfylja"; }; - buildInputs = [ pkgconfig gtk libofx intltool ]; + buildInputs = [ pkgconfig gtk libofx intltool hicolor_icon_theme wrapGAppsHook ]; meta = { description = "Free, easy, personal accounting for everyone"; From 6f37d11e8c2cfdc25f2a1bb6d64765326e27fc58 Mon Sep 17 00:00:00 2001 From: Pascal Wittmann Date: Thu, 5 Nov 2015 14:42:34 +0100 Subject: [PATCH 151/162] perl-DBD-Pg: 3.0.0 -> 3.5.3 --- pkgs/development/perl-modules/DBD-Pg/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/perl-modules/DBD-Pg/default.nix b/pkgs/development/perl-modules/DBD-Pg/default.nix index 6dbefa7111fd..3cf6880050b4 100644 --- a/pkgs/development/perl-modules/DBD-Pg/default.nix +++ b/pkgs/development/perl-modules/DBD-Pg/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, buildPerlPackage, DBI, postgresql }: buildPerlPackage rec { - name = "DBD-Pg-3.0.0"; + name = "DBD-Pg-3.5.3"; src = fetchurl { url = "mirror://cpan/authors/id/T/TU/TURNSTEP/${name}.tar.gz"; - sha256 = "10s1dhpxxqfl421388l6gzfdm1gzxf5iah42i1w6yji9mgkz8hf8"; + sha256 = "03m9w1cd0yyrbqwkwcl92j1cpmasmm69f3hwvcrlfsi5fnwsk63y"; }; buildInputs = [ postgresql ]; From 44af3d438dd758c3c38b246af077c2114b5a1d73 Mon Sep 17 00:00:00 2001 From: Pascal Wittmann Date: Thu, 5 Nov 2015 14:49:04 +0100 Subject: [PATCH 152/162] perl-DBD-mysql: 4.031 -> 4.033 --- pkgs/development/perl-modules/DBD-mysql/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/perl-modules/DBD-mysql/default.nix b/pkgs/development/perl-modules/DBD-mysql/default.nix index 273cc0e44f22..14ed14e34afd 100644 --- a/pkgs/development/perl-modules/DBD-mysql/default.nix +++ b/pkgs/development/perl-modules/DBD-mysql/default.nix @@ -1,11 +1,11 @@ { fetchurl, buildPerlPackage, DBI, mysql }: buildPerlPackage rec { - name = "DBD-mysql-4.031"; + name = "DBD-mysql-4.033"; src = fetchurl { url = "mirror://cpan/authors/id/C/CA/CAPTTOFU/${name}.tar.gz"; - sha256 = "1lngnkfi71gcpfk93xhil2x9i3w3rqjpxlvn5n92jd5ikwry8bmf"; + sha256 = "0769xakykps0cx368g4vaips4w3bjk383rianiavq7sq6g6bp66c"; }; buildInputs = [ mysql.lib ] ; From 499be4736fdcb17ab5f70c9610a7b7df623e9c60 Mon Sep 17 00:00:00 2001 From: Pascal Wittmann Date: Thu, 5 Nov 2015 14:56:05 +0100 Subject: [PATCH 153/162] perl-DBI: 1.633 -> 1.634 --- pkgs/top-level/perl-packages.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index ac6edb5bab17..573e879a5883 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -3096,10 +3096,10 @@ let self = _self // overrides; _self = with self; { }; DBI = buildPerlPackage rec { - name = "DBI-1.633"; + name = "DBI-1.634"; src = fetchurl { url = "mirror://cpan/authors/id/T/TI/TIMB/${name}.tar.gz"; - sha256 = "1rsyrzmykl7fxpvxmrjmy3dh9szp639fqdhbccqvywpnr7fbmhg2"; + sha256 = "0l0ldpl5wjh5klaqbb3krkqn3vnr2q6l42d4zfmihj46hpri41r5"; }; meta = { homepage = http://dbi.perl.org/; From 9f346896584b6da351fd644212c015fd480f3a32 Mon Sep 17 00:00:00 2001 From: michael bishop Date: Thu, 5 Nov 2015 10:10:36 -0400 Subject: [PATCH 154/162] ipxe: add undionly.kpxe so the output its needed to chainload iPXE from normal PXE --- pkgs/tools/misc/ipxe/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/tools/misc/ipxe/default.nix b/pkgs/tools/misc/ipxe/default.nix index 345e36fed711..ec9458e70aeb 100644 --- a/pkgs/tools/misc/ipxe/default.nix +++ b/pkgs/tools/misc/ipxe/default.nix @@ -26,7 +26,7 @@ stdenv.mkDerivation { installPhase = '' mkdir $out - cp bin/ipxe.dsk bin/ipxe.usb bin/ipxe.iso bin/ipxe.lkrn $out + cp bin/ipxe.dsk bin/ipxe.usb bin/ipxe.iso bin/ipxe.lkrn bin/undionly.kpxe $out ''; meta = with stdenv.lib; From 0c5bdf68c2f78ba299b8207c82aab09cf93d8467 Mon Sep 17 00:00:00 2001 From: Pascal Wittmann Date: Thu, 5 Nov 2015 15:14:04 +0100 Subject: [PATCH 155/162] fix: substitute path to bc in math.fish closes #10141 --- pkgs/shells/fish/default.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/shells/fish/default.nix b/pkgs/shells/fish/default.nix index 12cd864ca7c4..3031d397875b 100644 --- a/pkgs/shells/fish/default.nix +++ b/pkgs/shells/fish/default.nix @@ -20,7 +20,8 @@ stdenv.mkDerivation rec { postInstall = '' sed -e "s|bc|${bc}/bin/bc|" \ -e "s|/usr/bin/seq|${coreutils}/bin/seq|" \ - -i "$out/share/fish/functions/seq.fish" + -i "$out/share/fish/functions/seq.fish" \ + "$out/share/fish/functions/math.fish" sed -i "s|which |${which}/bin/which |" "$out/share/fish/functions/type.fish" sed -i "s|nroff |${groff}/bin/nroff |" "$out/share/fish/functions/__fish_print_help.fish" sed -e "s|gettext |${gettext}/bin/gettext |" \ From ac2582baeab3d33d764add20087729a7d5a1dc1f Mon Sep 17 00:00:00 2001 From: Ilya Novoselov Date: Mon, 26 Oct 2015 18:39:30 +0500 Subject: [PATCH 156/162] live555: added package --- .../development/libraries/live555/default.nix | 36 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 38 insertions(+) create mode 100644 pkgs/development/libraries/live555/default.nix diff --git a/pkgs/development/libraries/live555/default.nix b/pkgs/development/libraries/live555/default.nix new file mode 100644 index 000000000000..ea88233812bb --- /dev/null +++ b/pkgs/development/libraries/live555/default.nix @@ -0,0 +1,36 @@ +{ stdenv, fetchurl }: + +# Based on https://projects.archlinux.org/svntogit/packages.git/tree/trunk/PKGBUILD + +stdenv.mkDerivation rec { + name = "live555-2015.10.12"; + + src = fetchurl { + url = "http://www.live555.com/liveMedia/public/live.2015.10.12.tar.gz"; + md5 = "bcbe18f0b4eb65ee0157333684d6c551"; + }; + + buildInputs = []; + + configurePhase = '' + sed \ + -e 's/$(INCLUDES) -I. -O2 -DSOCKLEN_T/$(INCLUDES) -I. -O2 -I. -fPIC -DRTSPCLIENT_SYNCHRONOUS_INTERFACE=1 -DSOCKLEN_T/g' \ + -i config.linux + ./genMakefiles linux + ''; + + installPhase = '' + for dir in BasicUsageEnvironment groupsock liveMedia UsageEnvironment; do + install -dm755 $out/{bin,lib,include/$dir} + install -m644 $dir/*.a "$out/lib" + install -m644 $dir/include/*.h* "$out/include/$dir" + done + ''; + + meta = with stdenv.lib; { + description = "Set of C++ libraries for multimedia streaming, using open standard protocols (RTP/RTCP, RTSP, SIP)"; + homepage = http://www.live555.com/liveMedia/; + license = licenses.lgpl21Plus; + platforms = platforms.linux; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 1d3ee52932d7..db8ca976a54d 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -7580,6 +7580,8 @@ let liquidfun = callPackage ../development/libraries/liquidfun { }; + live555 = callPackage ../development/libraries/live555 { }; + log4cpp = callPackage ../development/libraries/log4cpp { }; log4cxx = callPackage ../development/libraries/log4cxx { }; From 398611fb6c738d3c326e9d6fd6f4c6f501795230 Mon Sep 17 00:00:00 2001 From: Ilya Novoselov Date: Mon, 26 Oct 2015 18:40:23 +0500 Subject: [PATCH 157/162] vlc: added live555 dependency --- pkgs/applications/video/vlc/default.nix | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/video/vlc/default.nix b/pkgs/applications/video/vlc/default.nix index e5db4c0b2db8..9f2ed3c3c5d1 100644 --- a/pkgs/applications/video/vlc/default.nix +++ b/pkgs/applications/video/vlc/default.nix @@ -6,7 +6,7 @@ , mpeg2dec, udev, gnutls, avahi, libcddb, libjack2, SDL, SDL_image , libmtp, unzip, taglib, libkate, libtiger, libv4l, samba, liboggz , libass, libva, libdvbpsi, libdc1394, libraw1394, libopus -, libvdpau, libsamplerate +, libvdpau, libsamplerate, live555 , onlyLibVLC ? false , qt4 ? null , withQt5 ? false, qtbase ? null @@ -34,13 +34,15 @@ stdenv.mkDerivation rec { udev gnutls avahi libcddb SDL SDL_image libmtp unzip taglib libkate libtiger libv4l samba liboggz libass libdvbpsi libva xorg.xlibsWrapper xorg.libXv xorg.libXvMC xorg.libXpm xorg.xcbutilkeysyms - libdc1394 libraw1394 libopus libebml libmatroska libvdpau libsamplerate + libdc1394 libraw1394 libopus libebml libmatroska libvdpau libsamplerate live555 ] ++ [(if withQt5 then qtbase else qt4)] ++ optional jackSupport libjack2; nativeBuildInputs = [ pkgconfig ]; + LIVE555_PREFIX = live555; + configureFlags = [ "--enable-alsa" "--with-kde-solid=$out/share/apps/solid/actions" From 58585de213a7e2293ff2cec9660ff6e23445a437 Mon Sep 17 00:00:00 2001 From: makefu Date: Thu, 5 Nov 2015 15:49:59 +0100 Subject: [PATCH 158/162] pythonPackages.python_magic: fix hardcode find_library("magic") --- pkgs/top-level/python-packages.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 6382f9290c6f..7408206bdd7b 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -8663,7 +8663,7 @@ let propagatedBuildInputs = with self; [ pkgs.file ]; patchPhase = '' - substituteInPlace magic.py --replace "ctypes.CDLL(dll)" "ctypes.CDLL('${pkgs.file}/lib/libmagic.so')" + substituteInPlace magic.py --replace "ctypes.util.find_library('magic')" "'${pkgs.file}/lib/libmagic.so'" ''; doCheck = false; From 68eb1b59c47721e3a74be190f2e6cae2f942eb5a Mon Sep 17 00:00:00 2001 From: makefu Date: Thu, 5 Nov 2015 15:36:54 +0100 Subject: [PATCH 159/162] pythonPackages.python_magic: 0.4.6 -> 0.4.10 --- pkgs/top-level/python-packages.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 6382f9290c6f..e1583c172d1b 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -8653,11 +8653,11 @@ let python_magic = buildPythonPackage rec { - name = "python-magic-0.4.6"; + name = "python-magic-0.4.10"; src = pkgs.fetchurl { url = "http://pypi.python.org/packages/source/p/python-magic/${name}.tar.gz"; - md5 = "07e7a0fea78dd81ed609414c3484df58"; + sha256 = "1hx2sjd4fdswswj3yydn2azxb59rjmi9b7jzh94lf1wnxijjizbr"; }; propagatedBuildInputs = with self; [ pkgs.file ]; From fa7d863af03bff47fefb2be0d30d91f16864e87b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= Date: Thu, 5 Nov 2015 16:07:24 +0100 Subject: [PATCH 160/162] goPackages: include buildFromGithub to fix #10805 --- pkgs/top-level/go-packages.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/top-level/go-packages.nix b/pkgs/top-level/go-packages.nix index 1ff61a6041a2..0cb03b3cbfb0 100644 --- a/pkgs/top-level/go-packages.nix +++ b/pkgs/top-level/go-packages.nix @@ -6,16 +6,16 @@ let isGo14 = go.meta.branch == "1.4"; + self = _self // overrides; _self = with self; { + + inherit go buildGoPackage; + buildFromGitHub = { rev, date ? null, owner, repo, sha256, name ? repo, goPackagePath ? "github.com/${owner}/${repo}", ... }@args: buildGoPackage (args // { inherit rev goPackagePath; name = "${name}-${if date != null then date else if builtins.stringLength rev != 40 then rev else stdenv.lib.strings.substring 0 7 rev}"; src = fetchFromGitHub { inherit rev owner repo sha256; }; }); - self = _self // overrides; _self = with self; { - - inherit go buildGoPackage; - ## OFFICIAL GO PACKAGES crypto = buildFromGitHub { From 53c60a0ce401d281d80b582b8e0c755587ee2033 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= Date: Thu, 5 Nov 2015 16:56:47 +0100 Subject: [PATCH 161/162] live555: fixup after accidental merge, close #10624 Use a URL that works (checked md5 was the same) but use a stronger hash. --- .../development/libraries/live555/default.nix | 19 +++++++++++-------- 1 file changed, 11 insertions(+), 8 deletions(-) diff --git a/pkgs/development/libraries/live555/default.nix b/pkgs/development/libraries/live555/default.nix index ea88233812bb..f61f2723752d 100644 --- a/pkgs/development/libraries/live555/default.nix +++ b/pkgs/development/libraries/live555/default.nix @@ -1,22 +1,25 @@ { stdenv, fetchurl }: # Based on https://projects.archlinux.org/svntogit/packages.git/tree/trunk/PKGBUILD +let + version = "2015.10.12"; +in +stdenv.mkDerivation { + name = "live555-${version}"; -stdenv.mkDerivation rec { - name = "live555-2015.10.12"; - - src = fetchurl { - url = "http://www.live555.com/liveMedia/public/live.2015.10.12.tar.gz"; - md5 = "bcbe18f0b4eb65ee0157333684d6c551"; + src = fetchurl { # the upstream doesn't provide a stable URL + url = "mirror://sourceforge/slackbuildsdirectlinks/live.${version}.tar.gz"; + sha256 = "05qwws4hda4x3l4ym22k55cc9j07w7g5vj3r18dancgf0fla40j4"; }; - buildInputs = []; + postPatch = "sed 's,/bin/rm,rm,g' -i genMakefiles"; configurePhase = '' sed \ -e 's/$(INCLUDES) -I. -O2 -DSOCKLEN_T/$(INCLUDES) -I. -O2 -I. -fPIC -DRTSPCLIENT_SYNCHRONOUS_INTERFACE=1 -DSOCKLEN_T/g' \ -i config.linux - ./genMakefiles linux + + ./genMakefiles linux ''; installPhase = '' From 3d87c5f9c3104739c5c47c2d387101afba2b0089 Mon Sep 17 00:00:00 2001 From: Thomas Tuegel Date: Thu, 5 Nov 2015 10:24:31 -0600 Subject: [PATCH 162/162] openblas: 0.2.14 -> 0.2.15 --- .../development/libraries/science/math/openblas/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/libraries/science/math/openblas/default.nix b/pkgs/development/libraries/science/math/openblas/default.nix index 7a1a860b9e4c..6694399b8b93 100644 --- a/pkgs/development/libraries/science/math/openblas/default.nix +++ b/pkgs/development/libraries/science/math/openblas/default.nix @@ -22,13 +22,13 @@ let local = config.openblas.preferLocalBuild or false; optionals (hasAttr "target" config.openblas) [ "TARGET=${config.openblas.target}" ]; blas64 = if blas64_ != null then blas64_ else hasPrefix "x86_64" stdenv.system; - version = "0.2.14"; + version = "0.2.15"; in stdenv.mkDerivation { name = "openblas-${version}"; src = fetchurl { - url = "https://github.com/xianyi/OpenBLAS/tarball/v${version}"; - sha256 = "0av3pd96j8rx5i65f652xv9wqfkaqn0w4ma1gvbyz73i6j2hi9db"; + url = "https://github.com/xianyi/OpenBLAS/archive/v${version}.tar.gz"; + sha256 = "0i4hrjx622vw5ff35wm6cnga3ic8hcfa88p1wlj24a3qb770mi3k"; name = "openblas-${version}.tar.gz"; };