diff options
| author | Frederik Rietdijk <fridh@fridh.nl> | 2019-01-04 21:13:19 +0100 |
|---|---|---|
| committer | Frederik Rietdijk <fridh@fridh.nl> | 2019-01-04 21:13:19 +0100 |
| commit | 9618abe87c966250ecd7e0156a298cc07b35ba51 (patch) | |
| tree | f5734612a231bab92e74364d914e52bef3676826 /pkgs/applications/graphics | |
| parent | 030f66400db0ce32f988045e5b35b27d75f2fe33 (diff) | |
| parent | 1a7d28e31f3f66f5806b9b150b978aef9b5fbe7e (diff) | |
| download | nixlib-9618abe87c966250ecd7e0156a298cc07b35ba51.tar nixlib-9618abe87c966250ecd7e0156a298cc07b35ba51.tar.gz nixlib-9618abe87c966250ecd7e0156a298cc07b35ba51.tar.bz2 nixlib-9618abe87c966250ecd7e0156a298cc07b35ba51.tar.lz nixlib-9618abe87c966250ecd7e0156a298cc07b35ba51.tar.xz nixlib-9618abe87c966250ecd7e0156a298cc07b35ba51.tar.zst nixlib-9618abe87c966250ecd7e0156a298cc07b35ba51.zip | |
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/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 ]; |