diff options
author | Weijia Wang <9713184+wegank@users.noreply.github.com> | 2024-03-14 12:07:18 +0100 |
---|---|---|
committer | GitHub <noreply@github.com> | 2024-03-14 12:07:18 +0100 |
commit | 3e33aea56df04bfb498f7ccbc76b1f4f87390de7 (patch) | |
tree | 9c584d4e2a065090c3e9f78f755985543d2d6eec | |
parent | 272ba9d42ad697404de29ecc1b2550976ef3b7dc (diff) | |
parent | 229322f28fc1b58cfb442b4287bc0bfa9ad06bf0 (diff) |
Merge pull request #295719 from wegank/gmic-bump
gmic: 3.3.1 -> 3.3.5
-rw-r--r-- | pkgs/by-name/ci/cimg/package.nix | 4 | ||||
-rw-r--r-- | pkgs/by-name/gm/gmic/package.nix | 17 |
2 files changed, 9 insertions, 12 deletions
diff --git a/pkgs/by-name/ci/cimg/package.nix b/pkgs/by-name/ci/cimg/package.nix index 3763fcc90912b..1f2bb7f10a771 100644 --- a/pkgs/by-name/ci/cimg/package.nix +++ b/pkgs/by-name/ci/cimg/package.nix @@ -7,13 +7,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "cimg"; - version = "3.3.4"; + version = "3.3.5"; src = fetchFromGitHub { owner = "GreycLab"; repo = "CImg"; rev = "v.${finalAttrs.version}"; - hash = "sha256-qo/k5NpTqu+o2WUEOThozuBJVPMMy8OvIMo2DfJUE8g="; + hash = "sha256-QdQhMEY6Zl3qdvRIeDv/12TL4HMrNJSAQ66vQymOrBU="; }; outputs = [ "out" "doc" ]; diff --git a/pkgs/by-name/gm/gmic/package.nix b/pkgs/by-name/gm/gmic/package.nix index d505faa8f4b64..6efd3154d88ea 100644 --- a/pkgs/by-name/gm/gmic/package.nix +++ b/pkgs/by-name/gm/gmic/package.nix @@ -26,7 +26,7 @@ stdenv.mkDerivation (finalAttrs: { pname = "gmic"; - version = "3.3.1"; + version = "3.3.5"; outputs = [ "out" "lib" "dev" "man" ]; @@ -34,15 +34,15 @@ stdenv.mkDerivation (finalAttrs: { owner = "GreycLab"; repo = "gmic"; rev = "v.${finalAttrs.version}"; - hash = "sha256-HagGabJ1jkg5SkMlr0Y5rGFw64jPW8QLuR0I2idM1N0="; + hash = "sha256-881+o6Wz4yNf92JNNLQn9x44SSjXAp/cZLkBGCfM6DY="; }; # TODO: build this from source - # Reference: src/Makefile, directive gmic_stdlib.h + # Reference: src/Makefile, directive gmic_stdlib_community.h gmic_stdlib = fetchurl { - name = "gmic_stdlib.h"; - url = "http://gmic.eu/gmic_stdlib${lib.replaceStrings ["."] [""] finalAttrs.version}.h"; - hash = "sha256-7JzFU4HvAtC5Nz5vusKCnJ8VMuKfSi1yFmjj0Hh+vA4="; + name = "gmic_stdlib_community.h"; + url = "http://gmic.eu/gmic_stdlib_community${lib.replaceStrings ["."] [""] finalAttrs.version}.h"; + hash = "sha256-UZzCAs+x9dVMeaeEvPgyVZ5S6UO0yhJWVMgBvBiW2ME="; }; nativeBuildInputs = [ @@ -71,10 +71,7 @@ stdenv.mkDerivation (finalAttrs: { ]; postPatch = '' - cp -r ${finalAttrs.gmic_stdlib} src/gmic_stdlib.h - - # CMake build files were moved to subdirectory. - mv resources/CMakeLists.txt resources/cmake . + cp -r ${finalAttrs.gmic_stdlib} src/gmic_stdlib_community.h '' + lib.optionalString stdenv.isDarwin '' substituteInPlace CMakeLists.txt \ |