diff options
| author | Frederik Rietdijk <fridh@fridh.nl> | 2019-01-05 10:15:00 +0100 |
|---|---|---|
| committer | Frederik Rietdijk <fridh@fridh.nl> | 2019-01-05 10:15:00 +0100 |
| commit | 60a3973a55f0574bf3f11303cb1dbc20a8bb6d70 (patch) | |
| tree | 2040f2d41050694da9b2431eb1b7adc8719a425c /pkgs/applications/graphics | |
| parent | aca57f1aed4068ee374d51b211844972dcb0192f (diff) | |
| parent | d9707792b5e1af8999ddcb790b8b1b06305dd186 (diff) | |
| download | nixlib-60a3973a55f0574bf3f11303cb1dbc20a8bb6d70.tar nixlib-60a3973a55f0574bf3f11303cb1dbc20a8bb6d70.tar.gz nixlib-60a3973a55f0574bf3f11303cb1dbc20a8bb6d70.tar.bz2 nixlib-60a3973a55f0574bf3f11303cb1dbc20a8bb6d70.tar.lz nixlib-60a3973a55f0574bf3f11303cb1dbc20a8bb6d70.tar.xz nixlib-60a3973a55f0574bf3f11303cb1dbc20a8bb6d70.tar.zst nixlib-60a3973a55f0574bf3f11303cb1dbc20a8bb6d70.zip | |
Merge staging-next into staging
Diffstat (limited to 'pkgs/applications/graphics')
| -rw-r--r-- | pkgs/applications/graphics/ImageMagick/7.0.nix | 4 | ||||
| -rw-r--r-- | pkgs/applications/graphics/goxel/default.nix | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/pkgs/applications/graphics/ImageMagick/7.0.nix b/pkgs/applications/graphics/ImageMagick/7.0.nix index 8fb21e65c951..10cc55d3d2bb 100644 --- a/pkgs/applications/graphics/ImageMagick/7.0.nix +++ b/pkgs/applications/graphics/ImageMagick/7.0.nix @@ -13,8 +13,8 @@ let else throw "ImageMagick is not supported on this platform."; cfg = { - version = "7.0.8-14"; - sha256 = "0pbrmzsjc8l4klfsz739rnmw61m712r82ryjl8ycvbxdzxwnwm9v"; + version = "7.0.8-22"; + sha256 = "1ivljgf192xh7pq1apdic923pvcb3aq74mx8d4hi65hhc9748gv7"; patches = []; }; in diff --git a/pkgs/applications/graphics/goxel/default.nix b/pkgs/applications/graphics/goxel/default.nix index 27dd37d1803a..c553b7cf60c4 100644 --- a/pkgs/applications/graphics/goxel/default.nix +++ b/pkgs/applications/graphics/goxel/default.nix @@ -3,13 +3,13 @@ stdenv.mkDerivation rec { name = "goxel-${version}"; - version = "0.8.1"; + version = "0.8.2"; src = fetchFromGitHub { owner = "guillaumechereau"; repo = "goxel"; rev = "v${version}"; - sha256 = "0g6jkihjmsx6lyfl301qrq26gwvq89sk7xkkba6vrpklfs2jafkb"; + sha256 = "14rycn6sd3wp90c9ghpif1al3rv1fdgvhmpldmwap0pk790kfxs1"; }; patches = [ ./disable-imgui_ini.patch ]; |