kde5.calamares: 1.0 -> 1.1.4.2

fixes build and removes obsolete PIC handling

pkgs/tools/misc/calamares/default.nix

@@ -1,15 +1,16 @@
-{ stdenv, fetchgit, cmake, polkit-qt, libyamlcpp, python, boost, parted
+{ stdenv, fetchurl, cmake, polkit-qt, libyamlcpp, python, boost, parted
 , extra-cmake-modules, kconfig, ki18n, kcoreaddons, solid, utillinux, libatasmart
 , ckbcomp, glibc, tzdata, xkeyboard_config, qtbase, qtquick1, qtsvg, qttools }:
 
 stdenv.mkDerivation rec {
-  name = "calamares-${version}";
+  name = "${pname}-${version}";
-  version = "1.0";
+  pname = "calamares";
-
+  version = "1.1.4.2";
-  src = fetchgit {
+
-    url = "https://github.com/calamares/calamares.git";
+  # release including submodule
-    rev = "dabfb68a68cb012a90cd7b94a22e1ea08f7dd8ad";
+  src = fetchurl {
-    sha256 = "2851ce487aaac61d2df342a47f91ec87fe52ff036227ef697caa7056fe5f188c";
+    url = "https://github.com/${pname}/${pname}/releases/download/v${version}/${name}.tar.gz";
+    sha256 = "1mh0nmzc3i1aqcj79q2s3vpccn0mirlfbj26sfyb0v6gcrvf707d";
   };
 
   buildInputs = [

pkgs/top-level/all-packages.nix

@@ -14964,18 +14964,17 @@ let
 
     calamares = callPackage ../tools/misc/calamares rec {
       python = python3;
-      boost = pkgs.boost.override { python=python3; };
+      boost = pkgs.boost.override { python = python3; };
-      libyamlcpp = callPackage ../development/libraries/libyaml-cpp { makePIC=true; boost=boost; };
+      libyamlcpp = callPackage ../development/libraries/libyaml-cpp { boost = boost; };
     };
 
     dfilemanager = callPackage ../applications/misc/dfilemanager { };
 
     fcitx-qt5 = callPackage ../tools/inputmethods/fcitx/fcitx-qt5.nix { };
 
-    k9copy = callPackage ../applications/video/k9copy {};
+    k9copy = callPackage ../applications/video/k9copy { };
 
-    konversation = callPackage ../applications/networking/irc/konversation/1.6.nix {
+    konversation = callPackage ../applications/networking/irc/konversation/1.6.nix { };
-    };
 
     quassel = callPackage ../applications/networking/irc/quassel/qt-5.nix {
       monolithic = true;