From 063f5e3d0bcaf19f1853ea72d44ce3ae83aa9612 Mon Sep 17 00:00:00 2001
From: Thomas Tuegel <ttuegel@gmail.com>
Date: Wed, 27 Jan 2016 06:26:14 -0600
Subject: [PATCH 1/3] remove autonix

---
 pkgs/build-support/autonix/default.nix | 136 -------------------------
 pkgs/build-support/autonix/manifest.sh |  44 --------
 pkgs/top-level/all-packages.nix        |   2 -
 3 files changed, 182 deletions(-)
 delete mode 100644 pkgs/build-support/autonix/default.nix
 delete mode 100755 pkgs/build-support/autonix/manifest.sh

diff --git a/pkgs/build-support/autonix/default.nix b/pkgs/build-support/autonix/default.nix
deleted file mode 100644
index 1f71d2cbb3b..00000000000
--- a/pkgs/build-support/autonix/default.nix
+++ /dev/null
@@ -1,136 +0,0 @@
-{ pkgs }:
-
-let inherit (pkgs) bash coreutils findutils nix wget;
-    inherit (pkgs) callPackage fetchurl runCommand stdenv substituteAll writeText;
-in
-
-/* autonix is a collection of tools to automate packaging large collections
- * of software, particularly KDE. It consists of three components:
- *   1. a script (manifest) to download and hash the packages
- *   2. a dependency scanner (autonix-deps) written in Haskell that examines
- *      the package sources and tries to guess their dependencies
- *   3. a library of Nix routines (generateCollection) to generate Nix
- *      expressions from the output of the previous steps.
- */
-
-let inherit (stdenv) lib; in
-
-let
-
-  resolveDeps = scope: deps:
-    let resolve = dep:
-          let res = scope."${dep}" or [];
-          in if lib.isList res then res else [res];
-    in lib.concatMap resolve deps;
-
-in rec {
-
-  /* Download the packages into the Nix store, compute their hashes,
-   * and generate a package manifest in ./manifest.nix.
-   */
-  manifest =
-    let
-      script =
-        substituteAll
-          {
-            src = ./manifest.sh;
-            inherit bash coreutils findutils nix wget;
-          };
-    in
-      runCommand "autonix-manifest" {}
-        ''
-          cp ${script} $out
-          chmod +x $out
-        '';
-
-  mkPackage = callPackage: defaultOverride: name: pkg: let drv =
-    { mkDerivation, fetchurl, scope }:
-
-    mkDerivation (defaultOverride {
-      inherit (pkg) name;
-
-      src = fetchurl pkg.src;
-
-      buildInputs = resolveDeps scope pkg.buildInputs;
-      nativeBuildInputs = resolveDeps scope pkg.nativeBuildInputs;
-      propagatedBuildInputs = resolveDeps scope pkg.propagatedBuildInputs;
-      propagatedNativeBuildInputs =
-        resolveDeps scope pkg.propagatedNativeBuildInputs;
-      propagatedUserEnvPkgs = resolveDeps scope pkg.propagatedUserEnvPkgs;
-
-      enableParallelBuilding = true;
-    });
-  in callPackage drv {};
-
-  renameDeps = renames: lib.mapAttrs (name: pkg:
-    let breakCycles = lib.filter (dep: dep != name);
-        rename = dep: renames."${dep}" or dep;
-    in pkg // {
-      buildInputs = breakCycles (map rename pkg.buildInputs);
-      nativeBuildInputs = breakCycles (map rename pkg.nativeBuildInputs);
-      propagatedBuildInputs = breakCycles (map rename pkg.propagatedBuildInputs);
-      propagatedNativeBuildInputs =
-        breakCycles (map rename pkg.propagatedNativeBuildInputs);
-      propagatedUserEnvPkgs = breakCycles (map rename pkg.propagatedUserEnvPkgs);
-    });
-
-  propagateDeps = propagated: lib.mapAttrs (name: pkg:
-    let isPropagated = dep: lib.elem dep propagated;
-        isNotPropagated = dep: !(isPropagated dep);
-    in pkg // {
-      buildInputs = lib.filter isNotPropagated pkg.buildInputs;
-      nativeBuildInputs = lib.filter isNotPropagated pkg.nativeBuildInputs;
-      propagatedBuildInputs =
-        pkg.propagatedBuildInputs
-        ++ lib.filter isPropagated pkg.buildInputs;
-      propagatedNativeBuildInputs =
-        pkg.propagatedNativeBuildInputs
-        ++ lib.filter isPropagated pkg.nativeBuildInputs;
-    });
-
-  nativeDeps = native: lib.mapAttrs (name: pkg:
-    let isNative = dep: lib.elem dep native;
-        isNotNative = dep: !(isNative dep);
-    in pkg // {
-      buildInputs = lib.filter isNotNative pkg.buildInputs;
-      nativeBuildInputs =
-        pkg.nativeBuildInputs
-        ++ lib.filter isNative pkg.buildInputs;
-      propagatedBuildInputs = lib.filter isNotNative pkg.propagatedBuildInputs;
-      propagatedNativeBuildInputs =
-        pkg.propagatedNativeBuildInputs
-        ++ lib.filter isNative pkg.propagatedBuildInputs;
-    });
-
-  userEnvDeps = user: lib.mapAttrs (name: pkg:
-    let allDeps = with pkg; lib.concatLists [
-          buildInputs
-          nativeBuildInputs
-          propagatedBuildInputs
-          propagatedNativeBuildInputs
-        ];
-    in assert (lib.isList allDeps); pkg // {
-      propagatedUserEnvPkgs = lib.filter (dep: lib.elem dep user) allDeps;
-    });
-
-  overrideDerivation = pkg: f: pkg.override (super: super // {
-    mkDerivation = drv: super.mkDerivation (drv // f drv);
-  });
-
-  extendDerivation = pkg: attrs:
-    let mergeAttrBy = lib.mergeAttrBy // {
-          propagatedNativeBuildInputs = a: b: a ++ b;
-          NIX_CFLAGS_COMPILE = a: b: "${a} ${b}";
-          cmakeFlags = a: b: a ++ b;
-        };
-        mergeAttrsByFunc = sets:
-          let merged = lib.foldl lib.mergeAttrByFunc { inherit mergeAttrBy; } sets;
-          in builtins.removeAttrs merged ["mergeAttrBy"];
-    in overrideDerivation pkg (drv: mergeAttrsByFunc [ drv attrs ]);
-
-  overrideScope = pkg: fnOrSet: pkg.override (super: super // {
-    scope = if builtins.isFunction fnOrSet
-              then super.scope // fnOrSet super.scope
-            else super.scope // fnOrSet;
-  });
-}
diff --git a/pkgs/build-support/autonix/manifest.sh b/pkgs/build-support/autonix/manifest.sh
deleted file mode 100755
index 5be69cc6175..00000000000
--- a/pkgs/build-support/autonix/manifest.sh
+++ /dev/null
@@ -1,44 +0,0 @@
-#!@bash@/bin/bash
-
-@coreutils@/bin/mkdir tmp; cd tmp
-
-@wget@/bin/wget -nH -r -c --no-parent $*
-
-cat >../manifest.json <<EOF
-[
-EOF
-
-workdir=$(pwd)
-sep=""
-
-@findutils@/bin/find . | while read path; do
-    if [[ -f "${path}" ]]; then
-        [[ -n "${sep}" ]] && echo "$sep" >>../manifest.json
-        url="${path:2}"
-        # Sanitize file name
-        filename=$(@coreutils@/bin/basename "${path}" | tr '@' '_')
-        nameversion="${filename%.tar.*}"
-        name="${nameversion%-*}"
-        dirname=$(@coreutils@/bin/dirname "${path}")
-        mv "${workdir}/${path}" "${workdir}/${dirname}/${filename}"
-        # Prefetch and hash source file
-        sha256=$(@nix@/bin/nix-prefetch-url "file://${workdir}/${dirname}/${filename}")
-        store=$(@nix@/bin/nix-store --print-fixed-path sha256 "$sha256" "$filename")
-        cat >>../manifest.json <<EOF
-  {
-    "name": "${nameversion}",
-    "store": "${store}",
-    "src": {
-      "url": "${url}",
-      "sha256": "${sha256}",
-      "name": "${filename}"
-    }
-  }
-EOF
-        sep=","
-    fi
-done
-
-echo "]" >>../manifest.json
-
-cd ..
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 5582341a9b1..ccabbaa7bd9 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -255,8 +255,6 @@ let
     theAttrSet = arg;
   };
 
-  autonix = import ../build-support/autonix { inherit pkgs; };
-
   autoreconfHook = makeSetupHook
     { substitutions = { inherit autoconf automake gettext libtool; }; }
     ../build-support/setup-hooks/autoreconf.sh;

From c5c3082e4e149fa04db5f4f5027d9be1e626c9ee Mon Sep 17 00:00:00 2001
From: Thomas Tuegel <ttuegel@gmail.com>
Date: Wed, 27 Jan 2016 06:29:19 -0600
Subject: [PATCH 2/3] kde5.plasma: 5.5.3 -> 5.5.4

---
 pkgs/desktops/plasma-5.5/fetchsrcs.sh |   2 +-
 pkgs/desktops/plasma-5.5/srcs.nix     | 304 +++++++++++++-------------
 2 files changed, 153 insertions(+), 153 deletions(-)

diff --git a/pkgs/desktops/plasma-5.5/fetchsrcs.sh b/pkgs/desktops/plasma-5.5/fetchsrcs.sh
index 7d80ec7890d..714e0fc7509 100755
--- a/pkgs/desktops/plasma-5.5/fetchsrcs.sh
+++ b/pkgs/desktops/plasma-5.5/fetchsrcs.sh
@@ -4,7 +4,7 @@
 set -x
 
 # The trailing slash at the end is necessary!
-RELEASE_URL="http://download.kde.org/stable/plasma/5.5.3/"
+RELEASE_URL="http://download.kde.org/stable/plasma/5.5.4/"
 EXTRA_WGET_ARGS='-A *.tar.xz'
 
 mkdir tmp; cd tmp
diff --git a/pkgs/desktops/plasma-5.5/srcs.nix b/pkgs/desktops/plasma-5.5/srcs.nix
index a96450b482d..3b63c864045 100644
--- a/pkgs/desktops/plasma-5.5/srcs.nix
+++ b/pkgs/desktops/plasma-5.5/srcs.nix
@@ -3,307 +3,307 @@
 
 {
   bluedevil = {
-    version = "5.5.3";
+    version = "5.5.4";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.5.3/bluedevil-5.5.3.tar.xz";
-      sha256 = "079bj1s86w9xycijs7imfwkhbg6k8sw22dh6p52q0kzsbz4sh7mk";
-      name = "bluedevil-5.5.3.tar.xz";
+      url = "${mirror}/stable/plasma/5.5.4/bluedevil-5.5.4.tar.xz";
+      sha256 = "1r20dlsg83d3lrnbdb92cpd7h0s2fmh0vjv3xi5z6rf741463p14";
+      name = "bluedevil-5.5.4.tar.xz";
     };
   };
   breeze = {
-    version = "5.5.3";
+    version = "5.5.4";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.5.3/breeze-5.5.3.tar.xz";
-      sha256 = "1kaw4mv86lw0igqhbl7v60k11s9az2cj14rs6yqrl96k2ki3931x";
-      name = "breeze-5.5.3.tar.xz";
+      url = "${mirror}/stable/plasma/5.5.4/breeze-5.5.4.tar.xz";
+      sha256 = "0chlp5z5zz19rh9k4ffjr92hn07dmavfcwx0wwffy8qhiw6qw7w3";
+      name = "breeze-5.5.4.tar.xz";
     };
   };
   breeze-gtk = {
-    version = "5.5.3";
+    version = "5.5.4";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.5.3/breeze-gtk-5.5.3.tar.xz";
-      sha256 = "0ph3n77s37rklcjmh5g9rj047hmiym6h4dn27zxmfnfybr52zfjv";
-      name = "breeze-gtk-5.5.3.tar.xz";
+      url = "${mirror}/stable/plasma/5.5.4/breeze-gtk-5.5.4.tar.xz";
+      sha256 = "1r6ihmpgha1s4hvgr4jliqvbraw06fnaa4sjrhzqbx9dh00y5d8v";
+      name = "breeze-gtk-5.5.4.tar.xz";
     };
   };
   discover = {
-    version = "5.5.3";
+    version = "5.5.4";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.5.3/discover-5.5.3.tar.xz";
-      sha256 = "0qhhgnjpwdir3y6i3z4cvfvgigbrmsblwkxhsafg015ralklgcnd";
-      name = "discover-5.5.3.tar.xz";
+      url = "${mirror}/stable/plasma/5.5.4/discover-5.5.4.tar.xz";
+      sha256 = "0d5s8b9f5az40ajviijc67rz5l2345wlrqacjm4pdi8fqvxivb1v";
+      name = "discover-5.5.4.tar.xz";
     };
   };
   kde-cli-tools = {
-    version = "5.5.3";
+    version = "5.5.4";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.5.3/kde-cli-tools-5.5.3.tar.xz";
-      sha256 = "0aw936amj3jigi3n8ldhlihmp4v9m7mbjbxlhp8s7643963f3n3w";
-      name = "kde-cli-tools-5.5.3.tar.xz";
+      url = "${mirror}/stable/plasma/5.5.4/kde-cli-tools-5.5.4.tar.xz";
+      sha256 = "1w9l8lh05k6xjdz0nccfygp76lp3wf3xa6pizmgv27wq21pw4wxy";
+      name = "kde-cli-tools-5.5.4.tar.xz";
     };
   };
   kdecoration = {
-    version = "5.5.3";
+    version = "5.5.4";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.5.3/kdecoration-5.5.3.tar.xz";
-      sha256 = "1lhzbk9bwn7biilqbk7n8dd453a7580n50571lyxxr6b7kfs6ikv";
-      name = "kdecoration-5.5.3.tar.xz";
+      url = "${mirror}/stable/plasma/5.5.4/kdecoration-5.5.4.tar.xz";
+      sha256 = "1ghgvg0lfjjlgl3a9ryw1y8aqihdwrkr7qjph4v3p9brlpqm5326";
+      name = "kdecoration-5.5.4.tar.xz";
     };
   };
   kde-gtk-config = {
-    version = "5.5.3";
+    version = "5.5.4";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.5.3/kde-gtk-config-5.5.3.tar.xz";
-      sha256 = "0dk2gda8qc1mg8fra3lgb4mizl5q2bx8zx5j2w3r8gqrw2g6vk5v";
-      name = "kde-gtk-config-5.5.3.tar.xz";
+      url = "${mirror}/stable/plasma/5.5.4/kde-gtk-config-5.5.4.tar.xz";
+      sha256 = "062jgc2sqd93yz5n1z4n7h50k7zsiayi3z901y2rq0x62nndff1m";
+      name = "kde-gtk-config-5.5.4.tar.xz";
     };
   };
   kdeplasma-addons = {
-    version = "5.5.3";
+    version = "5.5.4";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.5.3/kdeplasma-addons-5.5.3.tar.xz";
-      sha256 = "0i2j5m51dlbrh54ndspk9zl4ggwpfampsbdjs6kzwisxa4ksyz1s";
-      name = "kdeplasma-addons-5.5.3.tar.xz";
+      url = "${mirror}/stable/plasma/5.5.4/kdeplasma-addons-5.5.4.tar.xz";
+      sha256 = "0yrrjkh632q3ns068j7avaf2rkn2n54sf594jyl30q5fxc22mhq1";
+      name = "kdeplasma-addons-5.5.4.tar.xz";
     };
   };
   kgamma5 = {
-    version = "5.5.3";
+    version = "5.5.4";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.5.3/kgamma5-5.5.3.tar.xz";
-      sha256 = "0pm41wfihayp980z4zb5jdsh7qvyd93bql36jzicv8mmj2z7p3g4";
-      name = "kgamma5-5.5.3.tar.xz";
+      url = "${mirror}/stable/plasma/5.5.4/kgamma5-5.5.4.tar.xz";
+      sha256 = "0w63m1sxq2fa0wabyyry4prbzc2c54adc56hfhkh84rflccfbnc2";
+      name = "kgamma5-5.5.4.tar.xz";
     };
   };
   khelpcenter = {
-    version = "5.5.3";
+    version = "5.5.4";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.5.3/khelpcenter-5.5.3.tar.xz";
-      sha256 = "0gazbv5z1145zv0d7zrm41byqs9blis2x6ij2yha7h8i0vf748rc";
-      name = "khelpcenter-5.5.3.tar.xz";
+      url = "${mirror}/stable/plasma/5.5.4/khelpcenter-5.5.4.tar.xz";
+      sha256 = "01kw97p1xz2gghghykkv953bvypcyd080fxknjrzn4v9gl5mrjv0";
+      name = "khelpcenter-5.5.4.tar.xz";
     };
   };
   khotkeys = {
-    version = "5.5.3";
+    version = "5.5.4";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.5.3/khotkeys-5.5.3.tar.xz";
-      sha256 = "0mmszjnwcza30b5npd6ddkj88g4zy3nhnpw7bdghz053cn1lb1m0";
-      name = "khotkeys-5.5.3.tar.xz";
+      url = "${mirror}/stable/plasma/5.5.4/khotkeys-5.5.4.tar.xz";
+      sha256 = "1jlpzqrww2n9zf5cwlvpyvxcz0wv0cyln1xjhm49ayl5iin3m9yn";
+      name = "khotkeys-5.5.4.tar.xz";
     };
   };
   kinfocenter = {
-    version = "5.5.3";
+    version = "5.5.4";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.5.3/kinfocenter-5.5.3.tar.xz";
-      sha256 = "1c5bbvkfmdizkmd4n0mqbg6mpixkxvmahprsrlczh4fyd12j1r00";
-      name = "kinfocenter-5.5.3.tar.xz";
+      url = "${mirror}/stable/plasma/5.5.4/kinfocenter-5.5.4.tar.xz";
+      sha256 = "10qhq76ha1mahpmgrj4kw660zf92k7ys3mz2dkiid7ib6gsimir4";
+      name = "kinfocenter-5.5.4.tar.xz";
     };
   };
   kmenuedit = {
-    version = "5.5.3";
+    version = "5.5.4";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.5.3/kmenuedit-5.5.3.tar.xz";
-      sha256 = "1vihqqc431na4b29hliflcv61lhw1r43l0m4bficcy0l6xkmiyxz";
-      name = "kmenuedit-5.5.3.tar.xz";
+      url = "${mirror}/stable/plasma/5.5.4/kmenuedit-5.5.4.tar.xz";
+      sha256 = "0scsr3isf4d0hlk85pk0snn6j5cwm7qlqnl6iqs0df32g8ysirs6";
+      name = "kmenuedit-5.5.4.tar.xz";
     };
   };
   kscreen = {
-    version = "5.5.3";
+    version = "5.5.4";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.5.3/kscreen-5.5.3.tar.xz";
-      sha256 = "12r4k9ihlx62wgra7aw3pj5gjscg3jw1akkjrw9dkjy1vbpdxmpg";
-      name = "kscreen-5.5.3.tar.xz";
+      url = "${mirror}/stable/plasma/5.5.4/kscreen-5.5.4.tar.xz";
+      sha256 = "0ax67gqfjw59jk3wh3sflk3q10xqrjwf2qmvx6jky6q2x4kdixvv";
+      name = "kscreen-5.5.4.tar.xz";
     };
   };
   kscreenlocker = {
-    version = "5.5.3";
+    version = "5.5.4";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.5.3/kscreenlocker-5.5.3.tar.xz";
-      sha256 = "1crgnq6hwi7hy1yx2brs8hln57ib889ifz5ba72v9j4wk0439p49";
-      name = "kscreenlocker-5.5.3.tar.xz";
+      url = "${mirror}/stable/plasma/5.5.4/kscreenlocker-5.5.4.tar.xz";
+      sha256 = "18r53f5vri8xaj53zskadnxqxs60akxmwkq54xnb4lvg5cks9hrr";
+      name = "kscreenlocker-5.5.4.tar.xz";
     };
   };
   ksshaskpass = {
-    version = "5.5.3";
+    version = "5.5.4";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.5.3/ksshaskpass-5.5.3.tar.xz";
-      sha256 = "14xlvbb411vc3rfkdfcyx7jdgdnaf9gwy6xd6bivvdlj9hq2nikb";
-      name = "ksshaskpass-5.5.3.tar.xz";
+      url = "${mirror}/stable/plasma/5.5.4/ksshaskpass-5.5.4.tar.xz";
+      sha256 = "0hlgf7896qksivmf79ks0xcqndjvmmq13ywrkc0l43pcj50ydhj2";
+      name = "ksshaskpass-5.5.4.tar.xz";
     };
   };
   ksysguard = {
-    version = "5.5.3";
+    version = "5.5.4";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.5.3/ksysguard-5.5.3.tar.xz";
-      sha256 = "1y5x3n1rqncnzvs7j1icb4k3i2254l5mvvw6rrr6ymd1mvl8h1hx";
-      name = "ksysguard-5.5.3.tar.xz";
+      url = "${mirror}/stable/plasma/5.5.4/ksysguard-5.5.4.tar.xz";
+      sha256 = "1hbq8ppz9ijkk032aldrxyfwk1yrpjchfy6w6mg836bi8f69i1kc";
+      name = "ksysguard-5.5.4.tar.xz";
     };
   };
   kwallet-pam = {
-    version = "5.5.3";
+    version = "5.5.4";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.5.3/kwallet-pam-5.5.3.tar.xz";
-      sha256 = "0nlzrvdzf339pjcvm359brf0dmlx983gamjr75wm4277hhxwmphd";
-      name = "kwallet-pam-5.5.3.tar.xz";
+      url = "${mirror}/stable/plasma/5.5.4/kwallet-pam-5.5.4.tar.xz";
+      sha256 = "0cj9iq7ba24lccgj3h4fpa97bcm3lw3yz43hfhldiwdkzl1pydhl";
+      name = "kwallet-pam-5.5.4.tar.xz";
     };
   };
   kwayland = {
-    version = "5.5.3";
+    version = "5.5.4";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.5.3/kwayland-5.5.3.tar.xz";
-      sha256 = "0jmv4zphy2fb1pnkxcgsy1qcd926llqgqcdqn0kiwlxaznll0lnz";
-      name = "kwayland-5.5.3.tar.xz";
+      url = "${mirror}/stable/plasma/5.5.4/kwayland-5.5.4.tar.xz";
+      sha256 = "1cprg187h8pny86910m08pzyvknbcqa9x3xbqh7flrpw0rvrg5wp";
+      name = "kwayland-5.5.4.tar.xz";
     };
   };
   kwayland-integration = {
-    version = "5.5.3";
+    version = "5.5.4";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.5.3/kwayland-integration-5.5.3.tar.xz";
-      sha256 = "1yyp8vq6b544gbphpfcdayn1n0g4i3lyb5n1pnxb71nvv2j5ji95";
-      name = "kwayland-integration-5.5.3.tar.xz";
+      url = "${mirror}/stable/plasma/5.5.4/kwayland-integration-5.5.4.tar.xz";
+      sha256 = "07vv7gjqgmgn766p6nifn2i835rdhs6kvp24a5fqnh8ad24m8fjy";
+      name = "kwayland-integration-5.5.4.tar.xz";
     };
   };
   kwin = {
-    version = "5.5.3";
+    version = "5.5.4";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.5.3/kwin-5.5.3.tar.xz";
-      sha256 = "1hjgxm8l25vdc7zfv6kivgdwhbjvjfia7lqdsv8r4rf110f4an70";
-      name = "kwin-5.5.3.tar.xz";
+      url = "${mirror}/stable/plasma/5.5.4/kwin-5.5.4.tar.xz";
+      sha256 = "1015a0d3yi5b4isfkrl3w3mdslh0r1xyhvy9z8liz3wnxgrajwj8";
+      name = "kwin-5.5.4.tar.xz";
     };
   };
   kwrited = {
-    version = "5.5.3";
+    version = "5.5.4";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.5.3/kwrited-5.5.3.tar.xz";
-      sha256 = "1bggps8icam3ngkzxz6hkf8r5slz4x25wd1c47651y8prvqdagx9";
-      name = "kwrited-5.5.3.tar.xz";
+      url = "${mirror}/stable/plasma/5.5.4/kwrited-5.5.4.tar.xz";
+      sha256 = "01d8q3hj5frhmafsavgvyz2nlbd4ma4fsx12dhjyxqsgxdvvgffh";
+      name = "kwrited-5.5.4.tar.xz";
     };
   };
   libkscreen = {
-    version = "5.5.3";
+    version = "5.5.4";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.5.3/libkscreen-5.5.3.tar.xz";
-      sha256 = "04gm7sqpij0mnivrhx7n2y0y1dpsffsvbn5l5l754q5bis6f182y";
-      name = "libkscreen-5.5.3.tar.xz";
+      url = "${mirror}/stable/plasma/5.5.4/libkscreen-5.5.4.tar.xz";
+      sha256 = "15q7x844x8cz15b3mkh4lwygvrx66s0fl706b221p3my54n63ymf";
+      name = "libkscreen-5.5.4.tar.xz";
     };
   };
   libksysguard = {
-    version = "5.5.3";
+    version = "5.5.4";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.5.3/libksysguard-5.5.3.tar.xz";
-      sha256 = "1p35agppwplfz396irdprsjgqjqpin4vbcigzylxflbvp7yp5sgl";
-      name = "libksysguard-5.5.3.tar.xz";
+      url = "${mirror}/stable/plasma/5.5.4/libksysguard-5.5.4.tar.xz";
+      sha256 = "1irrb3im0gr8yhkp570bqipbqz8igpxr2k4kxb2c04111npkqmw1";
+      name = "libksysguard-5.5.4.tar.xz";
     };
   };
   milou = {
-    version = "5.5.3";
+    version = "5.5.4";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.5.3/milou-5.5.3.tar.xz";
-      sha256 = "0sddp3x8hm5d300bxn2m6j0vvy49kw8hidqmc7yim5gvimipzn92";
-      name = "milou-5.5.3.tar.xz";
+      url = "${mirror}/stable/plasma/5.5.4/milou-5.5.4.tar.xz";
+      sha256 = "0dc8jbk0yihqv5jxd4i12rmvfyyp63b6hx9q22qjrj5gkda1cddl";
+      name = "milou-5.5.4.tar.xz";
     };
   };
   oxygen = {
-    version = "5.5.3";
+    version = "5.5.4";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.5.3/oxygen-5.5.3.tar.xz";
-      sha256 = "1rynv9scc4pm682imjc8w8czcf4yryzkwvsviyl86iqx1v14jydn";
-      name = "oxygen-5.5.3.tar.xz";
+      url = "${mirror}/stable/plasma/5.5.4/oxygen-5.5.4.tar.xz";
+      sha256 = "10fjwk1aznpkrnal961kfwpjjil2iy2n0x96h26bh91l4insix1v";
+      name = "oxygen-5.5.4.tar.xz";
     };
   };
   plasma-desktop = {
-    version = "5.5.3";
+    version = "5.5.4";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.5.3/plasma-desktop-5.5.3.tar.xz";
-      sha256 = "1w5bphy231722ly2f8ybpgdck0sbrlibjjxvkby2r2pynzsgbr0m";
-      name = "plasma-desktop-5.5.3.tar.xz";
+      url = "${mirror}/stable/plasma/5.5.4/plasma-desktop-5.5.4.tar.xz";
+      sha256 = "0lkjgbqinxy40w6z01akpihljqpm7bachmxqmcp6fjnzawql2xqd";
+      name = "plasma-desktop-5.5.4.tar.xz";
     };
   };
   plasma-mediacenter = {
-    version = "5.5.3";
+    version = "5.5.4";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.5.3/plasma-mediacenter-5.5.3.tar.xz";
-      sha256 = "15sisk0pyggrirfkvbq2qcy17m1jgxn43vznfnbzp8dp9yrz0wbv";
-      name = "plasma-mediacenter-5.5.3.tar.xz";
+      url = "${mirror}/stable/plasma/5.5.4/plasma-mediacenter-5.5.4.tar.xz";
+      sha256 = "1rn7qffd11dljx1il7cw74wbqf4lwmmlcv19yxj08fdrp5ylqr8a";
+      name = "plasma-mediacenter-5.5.4.tar.xz";
     };
   };
   plasma-nm = {
-    version = "5.5.3";
+    version = "5.5.4";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.5.3/plasma-nm-5.5.3.tar.xz";
-      sha256 = "1ijqx0aphdhk5zffy4mnc1lbkkzdhj0qng0v4978kkxxjdq7g26q";
-      name = "plasma-nm-5.5.3.tar.xz";
+      url = "${mirror}/stable/plasma/5.5.4/plasma-nm-5.5.4.tar.xz";
+      sha256 = "0bjfcsavrqx4i4c0ynfmdna7fnmabm8970h3dnx7ihwsqgjf5q31";
+      name = "plasma-nm-5.5.4.tar.xz";
     };
   };
   plasma-pa = {
-    version = "5.5.3";
+    version = "5.5.4";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.5.3/plasma-pa-5.5.3.tar.xz";
-      sha256 = "0hpdf9vhsys0jbv8fya2dqdnig8bvbnaxp01x0zwa59lxb6b3czf";
-      name = "plasma-pa-5.5.3.tar.xz";
+      url = "${mirror}/stable/plasma/5.5.4/plasma-pa-5.5.4.tar.xz";
+      sha256 = "0d1cdixgxa2vsgv47hinh5nsbf2bln3ppdlrnzz9vglian0z7879";
+      name = "plasma-pa-5.5.4.tar.xz";
     };
   };
   plasma-sdk = {
-    version = "5.5.3";
+    version = "5.5.4";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.5.3/plasma-sdk-5.5.3.tar.xz";
-      sha256 = "0cqg8a3gmmifgicca7fg559didqmr7hgpfybw7j8rlibsh8wdlk5";
-      name = "plasma-sdk-5.5.3.tar.xz";
+      url = "${mirror}/stable/plasma/5.5.4/plasma-sdk-5.5.4.tar.xz";
+      sha256 = "0fdx4f8z00276s1p1v1bkbrhy59jswk2dj8kcj96r2rk3xzcg0ax";
+      name = "plasma-sdk-5.5.4.tar.xz";
     };
   };
   plasma-workspace = {
-    version = "5.5.3";
+    version = "5.5.4";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.5.3/plasma-workspace-5.5.3.tar.xz";
-      sha256 = "0wpsmw1rbidr8fc4zcfp84h05gs6cfxcl6cn0azb8lc2zh3v4ja9";
-      name = "plasma-workspace-5.5.3.tar.xz";
+      url = "${mirror}/stable/plasma/5.5.4/plasma-workspace-5.5.4.tar.xz";
+      sha256 = "0zh96qq0nl1c6bni7vnciba548f3cjacsi06n2rv05356j1fp87h";
+      name = "plasma-workspace-5.5.4.tar.xz";
     };
   };
   plasma-workspace-wallpapers = {
-    version = "5.5.3";
+    version = "5.5.4";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.5.3/plasma-workspace-wallpapers-5.5.3.tar.xz";
-      sha256 = "1i1gysw489spvpbfr654yncf8yjpg29aggk21ykmmmyc2qpz1jxp";
-      name = "plasma-workspace-wallpapers-5.5.3.tar.xz";
+      url = "${mirror}/stable/plasma/5.5.4/plasma-workspace-wallpapers-5.5.4.tar.xz";
+      sha256 = "0p111f95di11k4v19c1mg694c71825najmi8dzj2qrif5sb2vvsn";
+      name = "plasma-workspace-wallpapers-5.5.4.tar.xz";
     };
   };
   polkit-kde-agent = {
-    version = "1-5.5.3";
+    version = "1-5.5.4";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.5.3/polkit-kde-agent-1-5.5.3.tar.xz";
-      sha256 = "1hh3i0chc817bvxaydb2ak1wq65wzrqyj7dl3q1wl4l7a4yyh8ab";
-      name = "polkit-kde-agent-1-5.5.3.tar.xz";
+      url = "${mirror}/stable/plasma/5.5.4/polkit-kde-agent-1-5.5.4.tar.xz";
+      sha256 = "116sj9s45n3qcgfsdz5hh6a73b0hldgcnxbpvi4320xpny316vh2";
+      name = "polkit-kde-agent-1-5.5.4.tar.xz";
     };
   };
   powerdevil = {
-    version = "5.5.3";
+    version = "5.5.4";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.5.3/powerdevil-5.5.3.tar.xz";
-      sha256 = "0ilx44rhy0z8c0kv439nypr5rrs7wk30a1hnhdzssqbhc4d43kzy";
-      name = "powerdevil-5.5.3.tar.xz";
+      url = "${mirror}/stable/plasma/5.5.4/powerdevil-5.5.4.tar.xz";
+      sha256 = "0i0i55g72yb9z8agv1yyrx98l3s0fs5wn51kz571vqqrw6m3wn7l";
+      name = "powerdevil-5.5.4.tar.xz";
     };
   };
   sddm-kcm = {
-    version = "5.5.3";
+    version = "5.5.4";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.5.3/sddm-kcm-5.5.3.tar.xz";
-      sha256 = "0gijb75bzqih7h4m6r6kqg16p5l7rj4nb1cc959gqqkkqxghgfd0";
-      name = "sddm-kcm-5.5.3.tar.xz";
+      url = "${mirror}/stable/plasma/5.5.4/sddm-kcm-5.5.4.tar.xz";
+      sha256 = "04vh4f2hg5584acb5ywf1i8z6lvz0fcs7zh085bm7pkx5l60l59b";
+      name = "sddm-kcm-5.5.4.tar.xz";
     };
   };
   systemsettings = {
-    version = "5.5.3";
+    version = "5.5.4";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.5.3/systemsettings-5.5.3.tar.xz";
-      sha256 = "1wcbgs10shhgip1dxz80wxpgxifrcal863h6ygzpqwj9jb53dj7x";
-      name = "systemsettings-5.5.3.tar.xz";
+      url = "${mirror}/stable/plasma/5.5.4/systemsettings-5.5.4.tar.xz";
+      sha256 = "1i7ljxsnwf2kwd05kzxirbyaxj3w5kyr0jq9j0iy3jlz97p4jkpv";
+      name = "systemsettings-5.5.4.tar.xz";
     };
   };
   user-manager = {
-    version = "5.5.3";
+    version = "5.5.4";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.5.3/user-manager-5.5.3.tar.xz";
-      sha256 = "1v421xfy089m6kj7x5175lvvsaqjk9y9zr7s33jsnhg8zd1hwwcm";
-      name = "user-manager-5.5.3.tar.xz";
+      url = "${mirror}/stable/plasma/5.5.4/user-manager-5.5.4.tar.xz";
+      sha256 = "17lki4y77rq1n100p74q4n6sm3l5dxvv996wf4w1j2n2aiw89p4j";
+      name = "user-manager-5.5.4.tar.xz";
     };
   };
 }

From 7683f3e8eb46fd174f4949c4443a73b504e70068 Mon Sep 17 00:00:00 2001
From: Thomas Tuegel <ttuegel@gmail.com>
Date: Wed, 27 Jan 2016 06:30:42 -0600
Subject: [PATCH 3/3] bluedevil: propagated bluez-qt

---
 pkgs/desktops/plasma-5.5/bluedevil.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/desktops/plasma-5.5/bluedevil.nix b/pkgs/desktops/plasma-5.5/bluedevil.nix
index d099e95a16b..dc11ee170b3 100644
--- a/pkgs/desktops/plasma-5.5/bluedevil.nix
+++ b/pkgs/desktops/plasma-5.5/bluedevil.nix
@@ -16,6 +16,7 @@ plasmaPackage {
   propagatedBuildInputs = [
     bluez-qt ki18n kio kwindowsystem plasma-framework qtdeclarative
   ];
+  propagatedUserEnvPkgs = [ bluez-qt ];
   postInstall = ''
     wrapQtProgram "$out/bin/bluedevil-wizard"
     wrapQtProgram "$out/bin/bluedevil-sendfile"