summary refs log tree commit diff
diff options
context:
space:
mode:
authorLily Foster <lily@lily.flowers>2023-03-17 14:44:50 -0400
committerAnderson Torres <torres.anderson.85@protonmail.com>2023-03-21 13:52:49 -0300
commit6d5359557f3841310af4b7fd74226264d4e663e3 (patch)
treef3051309e3b7b941f64b93c98f51b316170d2671
parentcbb7ab9b791879604e303cd7ba25cde07bf02ee0 (diff)
downloadnixpkgs-6d5359557f3841310af4b7fd74226264d4e663e3.tar
nixpkgs-6d5359557f3841310af4b7fd74226264d4e663e3.tar.gz
nixpkgs-6d5359557f3841310af4b7fd74226264d4e663e3.tar.bz2
nixpkgs-6d5359557f3841310af4b7fd74226264d4e663e3.tar.lz
nixpkgs-6d5359557f3841310af4b7fd74226264d4e663e3.tar.xz
nixpkgs-6d5359557f3841310af4b7fd74226264d4e663e3.tar.zst
nixpkgs-6d5359557f3841310af4b7fd74226264d4e663e3.zip
gmic: 3.2.1 -> 3.2.2
Also perform drive-by change to fix repo owner, since the repository was
moved a while ago.
-rw-r--r--pkgs/tools/graphics/gmic/default.nix17
1 files changed, 4 insertions, 13 deletions
diff --git a/pkgs/tools/graphics/gmic/default.nix b/pkgs/tools/graphics/gmic/default.nix
index 68d07ed734b..78652f26ab1 100644
--- a/pkgs/tools/graphics/gmic/default.nix
+++ b/pkgs/tools/graphics/gmic/default.nix
@@ -1,7 +1,6 @@
 { stdenv
 , lib
 , fetchFromGitHub
-, fetchpatch
 , fetchurl
 , cmake
 , ninja
@@ -27,31 +26,23 @@
 
 stdenv.mkDerivation rec {
   pname = "gmic";
-  version = "3.2.1";
+  version = "3.2.2";
 
   outputs = [ "out" "lib" "dev" "man" ];
 
   src = fetchFromGitHub {
-    owner = "dtschump";
+    owner = "GreycLab";
     repo = "gmic";
     rev = "v.${version}";
-    hash = "sha256-oEH4GlSV+642TGSJJhV4yzydh1hAQZfzwaiPAZFNQtI=";
+    hash = "sha256-XLDnIs7IRIhQtz+qgdNypJODk6WJRPQ2M6LU6DJ+T7I=";
   };
 
-  patches = [
-    (fetchpatch {
-      name = "gmic-3.2.1-fix-system-gmic.patch";
-      url = "https://github.com/GreycLab/gmic/commit/9db3f6a39d9ed67b4279654da88993a8057575ff.patch";
-      hash = "sha256-JznKCs56t6cJ4HLqlhMZjSOupEB8cdkn3j6RgZpcpzo=";
-    })
-  ];
-
   # TODO: build this from source
   # https://github.com/dtschump/gmic/blob/b36b2428db5926af5eea5454f822f369c2d9907e/src/Makefile#L675-L729
   gmic_stdlib = fetchurl {
     name = "gmic_stdlib.h";
     url = "http://gmic.eu/gmic_stdlib${lib.replaceStrings ["."] [""] version}.h";
-    hash = "sha256-f8d9jTVnHwSoyMuiM+Qv86e/BYX9SSx9cl3borihxnc=";
+    hash = "sha256-lABUPhwlzoRODX7z8arOEU0JJszcXREhZ20WRToKNY4=";
   };
 
   nativeBuildInputs = [