dev/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions 2 Packages Projects Releases Wiki Activity

Merge pull request #211600 from LibreCybernetics/update-gmic

Browse Source 
gmic: 3.1.6 → 3.2.0
This commit is contained in:
Ninjatrappeur 2023-01-25 09:13:26 +01:00 committed by GitHub
commit 973699b349
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 6 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
pkgs/tools/graphics/gmic-qt/default.nix
View File

@ -2,7 +2,6 @@
, mkDerivation
, variant ? "standalone"
, fetchFromGitHub
, fetchpatch
, cmake
, pkg-config
, ninja
@ -59,13 +58,13 @@ assert lib.assertMsg (builtins.all (d: d != null) variants.${variant}.extraDeps
mkDerivation rec {
pname = "gmic-qt${lib.optionalString (variant != "standalone") "-${variant}"}";
version = "3.1.6";
version = "3.2.0";
src = fetchFromGitHub {
owner = "c-koi";
repo = "gmic-qt";
rev = "v.${version}";
sha256 = "sha256-/5wDHvJSMgEheg8YV4W40wUiHz25emIoFnGdfO8i92g=";
sha256 = "sha256-I5XC7zbDyBPFj4zul9rshoyeVV0hRQQ3aZQzEvYrgdc=";
};
nativeBuildInputs = [
@ -95,15 +94,6 @@ mkDerivation rec {
"-DENABLE_SYSTEM_GMIC:BOOL=ON"
];
patches = [
# NOTE: this should be removed when a new version is released.
(fetchpatch {
name = "fix_filter_translation_scripts.patch";
url = "https://github.com/c-koi/gmic-qt/commit/ccb9f29eda239d0c80663593cd90a6548c935b39.patch";
sha256 = "sha256-OzuJ6yGuDJweQ+1uin/pmJqZV79bN9E1Zuo+0iciwzg=";
})
];
postPatch = ''
patchShebangs \
translations/filters/csv2ts.sh \

8
pkgs/tools/graphics/gmic/default.nix
View File

@ -25,15 +25,15 @@
stdenv.mkDerivation rec {
pname = "gmic";
version = "3.1.6";
version = "3.2.0";
outputs = [ "out" "lib" "dev" "man" ];
src = fetchFromGitHub {
owner = "dtschump";
repo = "gmic";
rev = "326ea9b7dc320b3624fe660d7b7d81669ca12e6d";
sha256 = "RRCzYMN/IXViiUNnacJV3DNpku3hIHQkHbIrtixExT0=";
rev = "v.${version}";
hash = "sha256-lrIlzxXWqv046G5uRkBQnjvysaIcv+iDKxjuUEJWqcs=";
};
# TODO: build this from source
@ -41,7 +41,7 @@ stdenv.mkDerivation rec {
gmic_stdlib = fetchurl {
name = "gmic_stdlib.h";
url = "http://gmic.eu/gmic_stdlib${lib.replaceStrings ["."] [""] version}.h";
sha256 = "adObp8s+2TWaS+X/bQSphWRK6o85h+DGwlIDol6XN/4=";
hash = "sha256-kWHzA1Dk7F4IROq/gk+RJllry3BABMbssJxhkQ6Cp2M=";
};
nativeBuildInputs = [