diff options
author | Vladimír Čunát <v@cunat.cz> | 2024-01-04 15:07:44 +0100 |
---|---|---|
committer | Vladimír Čunát <v@cunat.cz> | 2024-01-04 15:07:44 +0100 |
commit | 8a839514de0e209f779dd9b8347f5855fbb1d77f (patch) | |
tree | 464e7ba0102a7b71b2519d49d2b7c3379d617bf8 /pkgs/applications/graphics | |
parent | c33b4961cbd4b71a8d9de7e28bb79c648d161f2d (diff) | |
parent | 4cdde2bb35340a5b33e4a04e3e5b28d219985b7e (diff) |
Merge branch 'master' into staging-next
Diffstat (limited to 'pkgs/applications/graphics')
-rw-r--r-- | pkgs/applications/graphics/ImageMagick/default.nix | 4 | ||||
-rw-r--r-- | pkgs/applications/graphics/drawio/default.nix | 6 | ||||
-rw-r--r-- | pkgs/applications/graphics/lutgen/default.nix | 26 | ||||
-rw-r--r-- | pkgs/applications/graphics/monado/default.nix | 6 |
4 files changed, 8 insertions, 34 deletions
diff --git a/pkgs/applications/graphics/ImageMagick/default.nix b/pkgs/applications/graphics/ImageMagick/default.nix index 8d6bcce59254a..8ac0496488895 100644 --- a/pkgs/applications/graphics/ImageMagick/default.nix +++ b/pkgs/applications/graphics/ImageMagick/default.nix @@ -49,13 +49,13 @@ in stdenv.mkDerivation (finalAttrs: { pname = "imagemagick"; - version = "7.1.1-24"; + version = "7.1.1-25"; src = fetchFromGitHub { owner = "ImageMagick"; repo = "ImageMagick"; rev = finalAttrs.version; - hash = "sha256-oQ/g2/OhZWKvh//QevYsyi8uNwgo1yuihT5728eVKF8="; + hash = "sha256-HKDeeh8DNj0y7wS4DqctXhmNaOqZ02JeBXRFrEpH0M4="; }; outputs = [ "out" "dev" "doc" ]; # bin/ isn't really big diff --git a/pkgs/applications/graphics/drawio/default.nix b/pkgs/applications/graphics/drawio/default.nix index 688b61a86d0c9..d9e6978d06a0f 100644 --- a/pkgs/applications/graphics/drawio/default.nix +++ b/pkgs/applications/graphics/drawio/default.nix @@ -13,19 +13,19 @@ stdenv.mkDerivation rec { pname = "drawio"; - version = "22.1.2"; + version = "22.1.16"; src = fetchFromGitHub { owner = "jgraph"; repo = "drawio-desktop"; rev = "v${version}"; fetchSubmodules = true; - hash = "sha256-4S4N7vfDwzlNutPfHozy/z0LOAr8q8EepXV4tsy+yAU="; + hash = "sha256-97y6AdU5Pb1zK9m7ny3sd7DCuul3RpYFVR6cLXP8NLA="; }; offlineCache = fetchYarnDeps { yarnLock = src + "/yarn.lock"; - hash = "sha256-QM7qazr8Iv4gjO7vF5Wj564D/yB+ZWmMGQDtTFytK00="; + hash = "sha256-RXTsGxoRnkpu4fArSMkwDAOsEFCFY2OPjh6uTZCuR/M="; }; nativeBuildInputs = [ diff --git a/pkgs/applications/graphics/lutgen/default.nix b/pkgs/applications/graphics/lutgen/default.nix deleted file mode 100644 index be93d964337a9..0000000000000 --- a/pkgs/applications/graphics/lutgen/default.nix +++ /dev/null @@ -1,26 +0,0 @@ -{ lib -, fetchFromGitHub -, rustPlatform -}: - -rustPlatform.buildRustPackage rec { - pname = "lutgen"; - version = "0.9.0"; - - src = fetchFromGitHub { - owner = "ozwaldorf"; - repo = "lutgen-rs"; - rev = "v${version}"; - hash = "sha256-tKSPk0V11pnKFV4E08H4CUnjw9nAonTRI6W3mGipd9I="; - }; - - cargoHash = "sha256-DiorrgTH9lIdmaZL7451uCXj9X7M6eHf4MQc85MpU7s="; - - meta = with lib; { - description = "A blazingly fast interpolated LUT generator and applicator for arbitrary and popular color palettes"; - homepage = "https://github.com/ozwaldorf/lutgen-rs"; - maintainers = with maintainers; [ zzzsy ]; - mainProgram = "lutgen"; - license = licenses.mit; - }; -} diff --git a/pkgs/applications/graphics/monado/default.nix b/pkgs/applications/graphics/monado/default.nix index d6109079f2aed..40e5f916f3f3d 100644 --- a/pkgs/applications/graphics/monado/default.nix +++ b/pkgs/applications/graphics/monado/default.nix @@ -50,14 +50,14 @@ stdenv.mkDerivation { pname = "monado"; - version = "unstable-2023-11-09"; + version = "unstable-2024-01-02"; src = fetchFromGitLab { domain = "gitlab.freedesktop.org"; owner = "monado"; repo = "monado"; - rev = "e983eecd73b1b91d2dfb356e1bc054e9202b2a7f"; - hash = "sha256-a4ukfmJbDkhr7P3NMTfbuhXjyOta3WCc5gswX7KUAw0="; + rev = "bfa1c16ff9fc759327ca251a5d086b958b1a3b8a"; + hash = "sha256-wXRwOs9MkDre/VeW686DzmvKjX0qCSS13MILbYQD6OY="; }; nativeBuildInputs = [ |