diff options
| author | John Ericson <John.Ericson@Obsidian.Systems> | 2018-05-03 16:24:30 -0400 |
|---|---|---|
| committer | John Ericson <John.Ericson@Obsidian.Systems> | 2018-05-03 16:35:36 -0400 |
| commit | cf06e42d1cad2732ca23264dee19bbc0d7172b3b (patch) | |
| tree | 624d0854c8f07c4d3ba2eb28590076b0486684a3 /pkgs/applications/graphics | |
| parent | cbe21ac614285160a18fe21b8a804f3a2f80c51b (diff) | |
| parent | b45ef79b74d267891a11c1775a473c610ecebe78 (diff) | |
| download | nixlib-cf06e42d1cad2732ca23264dee19bbc0d7172b3b.tar nixlib-cf06e42d1cad2732ca23264dee19bbc0d7172b3b.tar.gz nixlib-cf06e42d1cad2732ca23264dee19bbc0d7172b3b.tar.bz2 nixlib-cf06e42d1cad2732ca23264dee19bbc0d7172b3b.tar.lz nixlib-cf06e42d1cad2732ca23264dee19bbc0d7172b3b.tar.xz nixlib-cf06e42d1cad2732ca23264dee19bbc0d7172b3b.tar.zst nixlib-cf06e42d1cad2732ca23264dee19bbc0d7172b3b.zip | |
Merge remote-tracking branch 'upstream/master' 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/draftsight/default.nix | 4 |
2 files changed, 3 insertions, 5 deletions
diff --git a/pkgs/applications/graphics/ImageMagick/7.0.nix b/pkgs/applications/graphics/ImageMagick/7.0.nix index 410c74ac6cfa..65a3238ef571 100644 --- a/pkgs/applications/graphics/ImageMagick/7.0.nix +++ b/pkgs/applications/graphics/ImageMagick/7.0.nix @@ -14,8 +14,8 @@ let else throw "ImageMagick is not supported on this platform."; cfg = { - version = "7.0.7-27"; - sha256 = "04v7m1s2a89xi57fpxbq30hzxqg3fawr3lms6wfmaq4j2ax0qw6k"; + version = "7.0.7-29"; + sha256 = "0jfpfydz50zxs776knz6w2f5g0l4nhivp9g1fz4cf5clgjcpa3z6"; patches = []; }; in diff --git a/pkgs/applications/graphics/draftsight/default.nix b/pkgs/applications/graphics/draftsight/default.nix index 9ab43ff94337..b604099096ff 100644 --- a/pkgs/applications/graphics/draftsight/default.nix +++ b/pkgs/applications/graphics/draftsight/default.nix @@ -4,8 +4,6 @@ libX11, libXcursor, libXrandr, libxcb, libXi, libSM, libICE, libXrender, libXcomposite }: -assert stdenv.system == "x86_64-linux"; - let version = "2017-SP2"; in stdenv.mkDerivation { name = "draftsight-${version}"; @@ -71,6 +69,6 @@ stdenv.mkDerivation { homepage = https://www.3ds.com/products-services/draftsight-cad-software/; license = stdenv.lib.licenses.unfree; maintainers = with maintainers; [ hodapp ]; - platforms = platforms.linux; + platforms = [ "x86_64-linux" ]; }; } |