diff options
author | github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> | 2024-01-05 18:00:58 +0000 |
---|---|---|
committer | GitHub <noreply@github.com> | 2024-01-05 18:00:58 +0000 |
commit | 76201c62e0719461b9ed205d2d0ee9e377e8cf3a (patch) | |
tree | f95d71aefa071df2a0f840ff5bfb70b01dc117df /pkgs/applications/graphics | |
parent | 4a887669bd93a80b40111cd337745d33be35e046 (diff) | |
parent | ad41959648854b127ff78f734d6d16376691f137 (diff) |
Merge master into staging-next
Diffstat (limited to 'pkgs/applications/graphics')
-rw-r--r-- | pkgs/applications/graphics/emulsion/default.nix | 6 | ||||
-rw-r--r-- | pkgs/applications/graphics/graphicsmagick/default.nix | 2 | ||||
-rw-r--r-- | pkgs/applications/graphics/hydrus/default.nix | 4 |
3 files changed, 6 insertions, 6 deletions
diff --git a/pkgs/applications/graphics/emulsion/default.nix b/pkgs/applications/graphics/emulsion/default.nix index 3012250b9ce36..4964d258c11a4 100644 --- a/pkgs/applications/graphics/emulsion/default.nix +++ b/pkgs/applications/graphics/emulsion/default.nix @@ -37,16 +37,16 @@ let in rustPlatform.buildRustPackage rec { pname = "emulsion"; - version = "9.0"; + version = "10.4"; src = fetchFromGitHub { owner = "ArturKovacs"; repo = pname; rev = "v${version}"; - sha256 = "sha256-Cdi+PQDHxMQG7t7iwDi6UWfDwQjjA2yiOf9p/ahBlOw="; + sha256 = "sha256-9M9FyDehony5+1UwtEk7bRjBAlV4GvhtABi0MpjYcIA="; }; - cargoSha256 = "sha256-2wiLamnGqACx1r4WJbWPCN3tvhww/rRWz8fcvAbjYE0="; + cargoHash = "sha256-fcZCFD4XBHFIhwZtpYLkv8oDe+TmhvUEKFY3iJAMdFI="; nativeBuildInputs = [ installShellFiles diff --git a/pkgs/applications/graphics/graphicsmagick/default.nix b/pkgs/applications/graphics/graphicsmagick/default.nix index 55e57ac01e4c2..989edd2584386 100644 --- a/pkgs/applications/graphics/graphicsmagick/default.nix +++ b/pkgs/applications/graphics/graphicsmagick/default.nix @@ -48,7 +48,7 @@ stdenv.mkDerivation rec { issue-157920 = runCommand "issue-157920-regression-test" { buildInputs = [ graphicsmagick ]; } '' - gm convert ${graphviz}/share/graphviz/doc/pdf/neatoguide.pdf jpg:$out + gm convert ${graphviz}/share/doc/graphviz/neatoguide.pdf jpg:$out ''; }; }; diff --git a/pkgs/applications/graphics/hydrus/default.nix b/pkgs/applications/graphics/hydrus/default.nix index 544b67fe26c2c..1792c6355862a 100644 --- a/pkgs/applications/graphics/hydrus/default.nix +++ b/pkgs/applications/graphics/hydrus/default.nix @@ -12,14 +12,14 @@ python3Packages.buildPythonPackage rec { pname = "hydrus"; - version = "554"; + version = "557"; format = "other"; src = fetchFromGitHub { owner = "hydrusnetwork"; repo = "hydrus"; rev = "refs/tags/v${version}"; - hash = "sha256-BNAEM9XFkdKLQUAWerM6IWts04FWdd8SSCJZaymmxGo="; + hash = "sha256-upijLCj+mxTQ9EO2mfvnfPjqIvRaAqtByeRY/N1ANlU="; }; nativeBuildInputs = [ |