Unverified Commit a801d7b2 authored by Lily Foster's avatar Lily Foster Committed by GitHub
Browse files

Merge pull request #320329 from mjoerg/gmic-3.4.0 

gmic{,-qt}: 3.3.6 -> 3.4.0
parents 5bbede52 a58896d4

pkgs/by-name/gm/gmic-qt/package.nix

+2 −2
Original line number Diff line number Diff line
@@ -49,13 +49,13 @@ assert lib.assertMsg 


stdenv.mkDerivation (finalAttrs: {

  pname = "gmic-qt${lib.optionalString (variant != "standalone") "-${variant}"}";

  version = "3.3.6";

  version = "3.4.0";



  src = fetchFromGitHub {

    owner = "c-koi";

    repo = "gmic-qt";

    rev = "v.${finalAttrs.version}";

    hash = "sha256-0MtQTc2nUF8N1IDIcRxGqfXKULl9ZjnqDt4q84jA5ow=";

    hash = "sha256-IZMvvhWQwbnyxF3CkvEjySl3o3DB6UucpjqOFR9NjQ0=";

  };



  nativeBuildInputs = [

pkgs/by-name/gm/gmic/package.nix

+3 −3
Original line number Diff line number Diff line
@@ -26,7 +26,7 @@ 


stdenv.mkDerivation (finalAttrs: {

  pname = "gmic";

  version = "3.3.6";

  version = "3.4.0";



  outputs = [ "out" "lib" "dev" "man" ];
@@ -34,7 +34,7 @@ stdenv.mkDerivation (finalAttrs: { 
    owner = "GreycLab";

    repo = "gmic";

    rev = "v.${finalAttrs.version}";

    hash = "sha256-gyQP+ulXLMVkNn1Bss7zlQINcTunwbP+MAsftADqtOk=";

    hash = "sha256-uK/kgzlUvEAxRB8Wc3Inspv4/8vnjXrCilP1g/QMuCs=";

  };



  # TODO: build this from source
@@ -42,7 +42,7 @@ stdenv.mkDerivation (finalAttrs: { 
  gmic_stdlib = fetchurl {

    name = "gmic_stdlib_community.h";

    url = "http://gmic.eu/gmic_stdlib_community${lib.replaceStrings ["."] [""] finalAttrs.version}.h";

    hash = "sha256-mj6yOGc+CGY6oFDv9PJ7y9KABdn9DG32m2IVlLAhrsc=";

    hash = "sha256-wq8yQ0pxEGH3sOmwmgQfRVluHAC4JBYgs2mto1PNLP4=";

  };



  nativeBuildInputs = [