diff options
author | github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> | 2022-05-09 00:02:27 +0000 |
---|---|---|
committer | GitHub <noreply@github.com> | 2022-05-09 00:02:27 +0000 |
commit | f39e774f11735e00cf90bc9eb9c6ab3fcf9a7998 (patch) | |
tree | e3b1221ef08fa7c9b964f1da589a4377241ea4e6 /pkgs/applications/graphics | |
parent | e92815729dc9bfb56b23826715df01a453e442da (diff) | |
parent | 806344b3e2d5001743064e0bc79775d4526a6db3 (diff) |
Merge master into staging-next
Diffstat (limited to 'pkgs/applications/graphics')
-rw-r--r-- | pkgs/applications/graphics/ImageMagick/7.0.nix | 4 | ||||
-rw-r--r-- | pkgs/applications/graphics/hydrus/default.nix | 4 | ||||
-rw-r--r-- | pkgs/applications/graphics/jpegrescan/default.nix | 29 |
3 files changed, 19 insertions, 18 deletions
diff --git a/pkgs/applications/graphics/ImageMagick/7.0.nix b/pkgs/applications/graphics/ImageMagick/7.0.nix index 53b271b4d2960..44d540149768d 100644 --- a/pkgs/applications/graphics/ImageMagick/7.0.nix +++ b/pkgs/applications/graphics/ImageMagick/7.0.nix @@ -45,13 +45,13 @@ in stdenv.mkDerivation rec { pname = "imagemagick"; - version = "7.1.0-32"; + version = "7.1.0-33"; src = fetchFromGitHub { owner = "ImageMagick"; repo = "ImageMagick"; rev = version; - hash = "sha256-blDdNZJCyBdPEgdZXwgNUGSdSIwnqRaVLsLdFeA4JzQ="; + hash = "sha256-qiXTSQcc48IIzz7RUcyOH2w8JUOTdU1zg43gJhoELXo="; }; outputs = [ "out" "dev" "doc" ]; # bin/ isn't really big diff --git a/pkgs/applications/graphics/hydrus/default.nix b/pkgs/applications/graphics/hydrus/default.nix index 5a25ad3998f71..39eefb0034520 100644 --- a/pkgs/applications/graphics/hydrus/default.nix +++ b/pkgs/applications/graphics/hydrus/default.nix @@ -10,14 +10,14 @@ python3Packages.buildPythonPackage rec { pname = "hydrus"; - version = "482"; + version = "483"; format = "other"; src = fetchFromGitHub { owner = "hydrusnetwork"; repo = "hydrus"; rev = "refs/tags/v${version}"; - sha256 = "sha256-b7zMHwsyZv4dCn4Gd/2a+MHhT3IHISJup/zm95pEcQ4="; + sha256 = "sha256-UU3XQ0NC/apJ0S/uDDNG+8DOD+sRyX98yMcjtL2Htig="; }; nativeBuildInputs = [ diff --git a/pkgs/applications/graphics/jpegrescan/default.nix b/pkgs/applications/graphics/jpegrescan/default.nix index f96742e6c067b..7ec0e478a9b95 100644 --- a/pkgs/applications/graphics/jpegrescan/default.nix +++ b/pkgs/applications/graphics/jpegrescan/default.nix @@ -1,15 +1,17 @@ -{ lib, stdenv, fetchFromGitHub, makeWrapper, libjpeg_turbo, perl, perlPackages }: +{ lib, stdenv, fetchFromGitHub, makeWrapper, perl, perlPackages, libjpeg_original }: stdenv.mkDerivation rec { pname = "jpegrescan"; - date = "2016-06-01"; - name = "${pname}-${date}"; + version = "unstable-2019-03-27"; + + dontBuild = true; + dontConfigure = true; src = fetchFromGitHub { owner = "kud"; repo = pname; - rev = "e5e39cd972b48ccfb2cba4da6855c511385c05f9"; - sha256 = "0jbx1vzkzif6yjx1fnsm7fjsmq166sh7mn22lf01ll7s245nmpdp"; + rev = "3a7de06feabeb3c3235c3decbe2557893c1abe51"; + sha256 = "0cnl46z28lkqc5x27b8rpghvagahivrqcfvhzcsv9w1qs8qbd6dm"; }; patchPhase = '' @@ -23,24 +25,23 @@ stdenv.mkDerivation rec { mv jpegrescan $out/bin chmod +x $out/bin/jpegrescan - wrapProgram $out/bin/jpegrescan --prefix PERL5LIB : $PERL5LIB + wrapProgram $out/bin/jpegrescan \ + --prefix PATH : "${libjpeg_original}/bin:" \ + --prefix PERL5LIB : $PERL5LIB ''; propagatedBuildInputs = [ perlPackages.FileSlurp ]; - nativeBuildInputs = [ - makeWrapper - ]; + nativeBuildInputs = [ makeWrapper ]; - buildInputs = [ - perl libjpeg_turbo - ]; + buildInputs = [ perl ]; meta = with lib; { - description = "losslessly shrink any JPEG file"; + description = "Losslessly shrink any JPEG file"; homepage = "https://github.com/kud/jpegrescan"; license = licenses.publicDomain; - maintainers = [ maintainers.ramkromberg ]; + maintainers = with maintainers; [ ramkromberg ]; platforms = platforms.all; + mainProgram = "jpegrescan"; }; } |