Merge pull request #217187 from jtojnar/gmic-qt-fix

gmic,gmic-qt: 3.2.0 → 3.2.1, mark the latter as broken

pkgs/development/libraries/cimg/default.nix

@@ -1,6 +1,8 @@
 { lib
 , stdenv
 , fetchFromGitHub
+, gmic
+, gmic-qt
 }:
 
 stdenv.mkDerivation rec {
@@ -28,6 +30,11 @@ stdenv.mkDerivation rec {
     runHook postInstall
   '';
 
+  passthru.tests = {
+    # Need to update in lockstep.
+    inherit gmic gmic-qt;
+  };
+
   meta = with lib; {
     homepage = "http://cimg.eu/";
     description = "A small, open source, C++ toolkit for image processing";

pkgs/tools/graphics/gmic-qt/default.nix

@@ -25,6 +25,8 @@
 , gnused
 , coreutils
 , jq
+, nix-update-script
+, gimpPlugins
 }:
 
 let
@@ -50,13 +52,13 @@ assert lib.assertMsg (builtins.all (d: d != null) variants.${variant}.extraDeps
 
 mkDerivation rec {
   pname = "gmic-qt${lib.optionalString (variant != "standalone") "-${variant}"}";
-  version = "3.2.0";
+  version = "3.2.1";
 
   src = fetchFromGitHub {
     owner = "c-koi";
     repo = "gmic-qt";
     rev = "v.${version}";
-    sha256 = "sha256-I5XC7zbDyBPFj4zul9rshoyeVV0hRQQ3aZQzEvYrgdc=";
+    sha256 = "sha256-z+GtYLBcHVufXwdeSd8WKmPmU1+/EKMv26kNaEgyt5w=";
   };
 
   nativeBuildInputs = [
@@ -97,7 +99,17 @@ mkDerivation rec {
     wrapQtApp "$out/${gimp.targetPluginDir}/gmic_gimp_qt/gmic_gimp_qt"
   '';
 
+  passthru = {
+    tests = {
+      gimp-plugin = gimpPlugins.gmic;
+    };
+
+    updateScript = nix-update-script { };
+  };
+
   meta = with lib; {
+    # Broken since 3.2.0 update, cannot handle system gmic and cimg.
+    broken = true;
     description = variants.${variant}.description;
     homepage = "http://gmic.eu/";
     license = licenses.gpl3Plus;

pkgs/tools/graphics/gmic/default.nix

@@ -21,11 +21,12 @@
 , gnused
 , coreutils
 , jq
+, gmic-qt
 }:
 
 stdenv.mkDerivation rec {
   pname = "gmic";
-  version = "3.2.0";
+  version = "3.2.1";
 
   outputs = [ "out" "lib" "dev" "man" ];
 
@@ -33,7 +34,7 @@ stdenv.mkDerivation rec {
     owner = "dtschump";
     repo = "gmic";
     rev = "v.${version}";
-    hash = "sha256-lrIlzxXWqv046G5uRkBQnjvysaIcv+iDKxjuUEJWqcs=";
+    hash = "sha256-oEH4GlSV+642TGSJJhV4yzydh1hAQZfzwaiPAZFNQtI=";
   };
 
   # TODO: build this from source
@@ -41,7 +42,7 @@ stdenv.mkDerivation rec {
   gmic_stdlib = fetchurl {
     name = "gmic_stdlib.h";
     url = "http://gmic.eu/gmic_stdlib${lib.replaceStrings ["."] [""] version}.h";
-    hash = "sha256-kWHzA1Dk7F4IROq/gk+RJllry3BABMbssJxhkQ6Cp2M=";
+    hash = "sha256-f8d9jTVnHwSoyMuiM+Qv86e/BYX9SSx9cl3borihxnc=";
   };
 
   nativeBuildInputs = [
@@ -81,6 +82,11 @@ stdenv.mkDerivation rec {
   '';
 
   passthru = {
+    tests = {
+      # Needs to update in lockstep.
+      inherit gmic-qt;
+    };
+
     updateScript = writeShellScript "${pname}-update-script" ''
       set -o errexit
       PATH=${lib.makeBinPath [ common-updater-scripts curl gnugrep gnused coreutils jq ]}
@@ -95,7 +101,7 @@ stdenv.mkDerivation rec {
       for component in src gmic_stdlib; do
           # The script will not perform an update when the version attribute is up to date from previous platform run
           # We need to clear it before each run
-          update-source-version "--source-key=$component" "gmic" 0 "$(printf '0%.0s' {1..64})"
+          update-source-version "--source-key=$component" "gmic" 0 "${lib.fakeHash}"
           update-source-version "--source-key=$component" "gmic" $latestVersion
       done
     '';