Merge commit 'b3c692172e5b5241b028a98e1977f9fb12eeaf42'

1 files changed, 22 insertions, 14 deletions

diff --git a/nixpkgs/pkgs/development/libraries/kdsoap/default.nix b/nixpkgs/pkgs/development/libraries/kdsoap/default.nix
index a4dd9cbaa45d..0d3c20651c75 100644
--- a/nixpkgs/pkgs/development/libraries/kdsoap/default.nix
+++ b/nixpkgs/pkgs/development/libraries/kdsoap/default.nix
@@ -1,30 +1,25 @@
-{ mkDerivation, lib, fetchurl
+{ mkDerivation
+, lib
+, fetchurl
 , cmake
 , qtbase
 }:
 
 mkDerivation rec {
   pname = "kdsoap";
-  version = "1.10.0";
-  meta = {
-    description = "A Qt-based client-side and server-side SOAP component";
-    longDescription = ''
-      KD Soap is a Qt-based client-side and server-side SOAP component.
+  version = "2.0.0";
 
-      It can be used to create client applications for web services and also
-      provides the means to create web services without the need for any further
-      component such as a dedicated web server.
-    '';
-    license = with lib.licenses; [ gpl2 gpl3 lgpl21 ];
-    maintainers = [ lib.maintainers.ttuegel ];
-  };
   src = fetchurl {
     url = "https://github.com/KDAB/KDSoap/releases/download/kdsoap-${version}/kdsoap-${version}.tar.gz";
-    sha256 = "sha256-DGBuzENEZtutsoKYIMoWOvYMx8oib1U7XUAyGWc3M48=";
+    sha256 = "sha256-0YljEE+m99ArBEYxzdvnjxj3DgbGB69oDHrOBNbPBO4=";
   };
+
   outputs = [ "out" "dev" ];
+
   nativeBuildInputs = [ cmake ];
+
   buildInputs = [ qtbase ];
+
   postInstall = ''
     moveToOutput bin/kdwsdl2cpp "$dev"
     sed -i "$out/lib/cmake/KDSoap/KDSoapTargets.cmake" \
@@ -32,4 +27,17 @@ mkDerivation rec {
     sed -i "$out/lib/cmake/KDSoap/KDSoapTargets-release.cmake" \
         -e "s@$out/bin@$dev/bin@"
   '';
+
+  meta = with lib; {
+    description = "A Qt-based client-side and server-side SOAP component";
+    longDescription = ''
+      KD Soap is a Qt-based client-side and server-side SOAP component.
+
+      It can be used to create client applications for web services and also
+      provides the means to create web services without the need for any further
+      component such as a dedicated web server.
+    '';
+    license = with licenses; [ gpl2 gpl3 lgpl21 ];
+    maintainers = [ maintainers.ttuegel ];
+  };
 }