summaryrefslogtreecommitdiffstats
path: root/pkgs/tools/graphics
diff options
context:
space:
mode:
authorgithub-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>2024-03-14 00:02:16 +0000
committerGitHub <noreply@github.com>2024-03-14 00:02:16 +0000
commitcc92370007888ab722eba45d20efcb66727e4165 (patch)
tree6e7c5950554a752934b6515431228831f5f4418b /pkgs/tools/graphics
parentf4c4bfc9fccaa79ce6a3eafe401daced8285945b (diff)
parentc61d0920a3478578ba4d84fb19e4bdd6f4762b7f (diff)
Merge master into staging-next
Diffstat (limited to 'pkgs/tools/graphics')
-rw-r--r--pkgs/tools/graphics/gromit-mpx/default.nix4
-rw-r--r--pkgs/tools/graphics/netpbm/default.nix6
2 files changed, 5 insertions, 5 deletions
diff --git a/pkgs/tools/graphics/gromit-mpx/default.nix b/pkgs/tools/graphics/gromit-mpx/default.nix
index 0a54626419b5..7fdbe3b13f64 100644
--- a/pkgs/tools/graphics/gromit-mpx/default.nix
+++ b/pkgs/tools/graphics/gromit-mpx/default.nix
@@ -6,13 +6,13 @@
stdenv.mkDerivation rec {
pname = "gromit-mpx";
- version = "1.5.1";
+ version = "1.6.0";
src = fetchFromGitHub {
owner = "bk138";
repo = "gromit-mpx";
rev = version;
- sha256 = "sha256-6sjps0wbB0sTaQtehRmz2KBWxqk3pqJmQs9htqxmJwo=";
+ sha256 = "sha256-olDQGw0qDWwXpqRopVoEPDXLRpFiiBo+/jiVeL7R6QA=";
};
nativeBuildInputs = [ cmake pkg-config wrapGAppsHook ];
diff --git a/pkgs/tools/graphics/netpbm/default.nix b/pkgs/tools/graphics/netpbm/default.nix
index 14002fe65096..99aeb576939e 100644
--- a/pkgs/tools/graphics/netpbm/default.nix
+++ b/pkgs/tools/graphics/netpbm/default.nix
@@ -20,14 +20,14 @@ stdenv.mkDerivation {
# Determine version and revision from:
# https://sourceforge.net/p/netpbm/code/HEAD/log/?path=/advanced
pname = "netpbm";
- version = "11.5.2";
+ version = "11.5.3";
outputs = [ "bin" "out" "dev" ];
src = fetchsvn {
url = "https://svn.code.sf.net/p/netpbm/code/advanced";
- rev = "4839";
- sha256 = "tK9HGERr8UejswZTW3NdXa7OGpzqDTCegGQVaB4RK+I=";
+ rev = "4867";
+ sha256 = "JCJW6BBdxoYWMpZoJp6ovHNqyuU4a1FIvjLB2poDGGM=";
};
nativeBuildInputs = [