pyrox.dev / nixpkgs
lol
fork atom

Merge pull request #295719 from wegank/gmic-bump

gmic: 3.3.1 -> 3.3.5

authored by

Weijia Wang and committed by
GitHub 3e33aea5 272ba9d4

+9 -12
unified split
+2 -2
pkgs/by-name/ci/cimg/package.nix
··· 7 8 stdenv.mkDerivation (finalAttrs: { 9 pname = "cimg"; 10 - version = "3.3.4"; 11 12 src = fetchFromGitHub { 13 owner = "GreycLab"; 14 repo = "CImg"; 15 rev = "v.${finalAttrs.version}"; 16 - hash = "sha256-qo/k5NpTqu+o2WUEOThozuBJVPMMy8OvIMo2DfJUE8g="; 17 }; 18 19 outputs = [ "out" "doc" ];
··· 7 8 stdenv.mkDerivation (finalAttrs: { 9 pname = "cimg"; 10 + version = "3.3.5"; 11 12 src = fetchFromGitHub { 13 owner = "GreycLab"; 14 repo = "CImg"; 15 rev = "v.${finalAttrs.version}"; 16 + hash = "sha256-QdQhMEY6Zl3qdvRIeDv/12TL4HMrNJSAQ66vQymOrBU="; 17 }; 18 19 outputs = [ "out" "doc" ];
+7 -10
pkgs/by-name/gm/gmic/package.nix
··· 26 27 stdenv.mkDerivation (finalAttrs: { 28 pname = "gmic"; 29 - version = "3.3.1"; 30 31 outputs = [ "out" "lib" "dev" "man" ]; 32 ··· 34 owner = "GreycLab"; 35 repo = "gmic"; 36 rev = "v.${finalAttrs.version}"; 37 - hash = "sha256-HagGabJ1jkg5SkMlr0Y5rGFw64jPW8QLuR0I2idM1N0="; 38 }; 39 40 # TODO: build this from source 41 - # Reference: src/Makefile, directive gmic_stdlib.h 42 gmic_stdlib = fetchurl { 43 - name = "gmic_stdlib.h"; 44 - url = "http://gmic.eu/gmic_stdlib${lib.replaceStrings ["."] [""] finalAttrs.version}.h"; 45 - hash = "sha256-7JzFU4HvAtC5Nz5vusKCnJ8VMuKfSi1yFmjj0Hh+vA4="; 46 }; 47 48 nativeBuildInputs = [ ··· 71 ]; 72 73 postPatch = '' 74 - cp -r ${finalAttrs.gmic_stdlib} src/gmic_stdlib.h 75 - 76 - # CMake build files were moved to subdirectory. 77 - mv resources/CMakeLists.txt resources/cmake . 78 '' 79 + lib.optionalString stdenv.isDarwin '' 80 substituteInPlace CMakeLists.txt \
··· 26 27 stdenv.mkDerivation (finalAttrs: { 28 pname = "gmic"; 29 + version = "3.3.5"; 30 31 outputs = [ "out" "lib" "dev" "man" ]; 32 ··· 34 owner = "GreycLab"; 35 repo = "gmic"; 36 rev = "v.${finalAttrs.version}"; 37 + hash = "sha256-881+o6Wz4yNf92JNNLQn9x44SSjXAp/cZLkBGCfM6DY="; 38 }; 39 40 # TODO: build this from source 41 + # Reference: src/Makefile, directive gmic_stdlib_community.h 42 gmic_stdlib = fetchurl { 43 + name = "gmic_stdlib_community.h"; 44 + url = "http://gmic.eu/gmic_stdlib_community${lib.replaceStrings ["."] [""] finalAttrs.version}.h"; 45 + hash = "sha256-UZzCAs+x9dVMeaeEvPgyVZ5S6UO0yhJWVMgBvBiW2ME="; 46 }; 47 48 nativeBuildInputs = [ ··· 71 ]; 72 73 postPatch = '' 74 + cp -r ${finalAttrs.gmic_stdlib} src/gmic_stdlib_community.h 75 '' 76 + lib.optionalString stdenv.isDarwin '' 77 substituteInPlace CMakeLists.txt \