diff options
| author | Frederik Rietdijk <fridh@fridh.nl> | 2019-04-11 07:50:23 +0200 |
|---|---|---|
| committer | Frederik Rietdijk <fridh@fridh.nl> | 2019-04-11 07:50:23 +0200 |
| commit | 230c67f43bc36f6327163a603256278c71431688 (patch) | |
| tree | 50ba027cf075f05588194acf13ad5d1374ea64a4 /pkgs/applications/graphics | |
| parent | 932f1086a9a66885d57c7428540fc6731af58c61 (diff) | |
| parent | 99eddf32dca502ea35589c4e2faf847e373c8f44 (diff) | |
| download | nixpkgs-230c67f43bc36f6327163a603256278c71431688.tar nixpkgs-230c67f43bc36f6327163a603256278c71431688.tar.gz nixpkgs-230c67f43bc36f6327163a603256278c71431688.tar.bz2 nixpkgs-230c67f43bc36f6327163a603256278c71431688.tar.lz nixpkgs-230c67f43bc36f6327163a603256278c71431688.tar.xz nixpkgs-230c67f43bc36f6327163a603256278c71431688.tar.zst nixpkgs-230c67f43bc36f6327163a603256278c71431688.zip | |
Merge master into staging-next
Diffstat (limited to 'pkgs/applications/graphics')
| -rw-r--r-- | pkgs/applications/graphics/drawpile/default.nix | 1 | ||||
| -rw-r--r-- | pkgs/applications/graphics/gimp/default.nix | 8 |
2 files changed, 5 insertions, 4 deletions
diff --git a/pkgs/applications/graphics/drawpile/default.nix b/pkgs/applications/graphics/drawpile/default.nix index 8a2657c3f5c..8c547359820 100644 --- a/pkgs/applications/graphics/drawpile/default.nix +++ b/pkgs/applications/graphics/drawpile/default.nix @@ -48,6 +48,7 @@ stdenv.mkDerivation rec { downloadPage = https://drawpile.net/download/; license = licenses.gpl3; maintainers = with maintainers; [ fgaz ]; + platforms = platforms.unix; }; } diff --git a/pkgs/applications/graphics/gimp/default.nix b/pkgs/applications/graphics/gimp/default.nix index 4d835e6590e..9e4aec16db8 100644 --- a/pkgs/applications/graphics/gimp/default.nix +++ b/pkgs/applications/graphics/gimp/default.nix @@ -8,12 +8,12 @@ let inherit (python2Packages) pygtk wrapPython python; in stdenv.mkDerivation rec { - name = "gimp-${version}"; - version = "2.10.8"; + pname = "gimp"; + version = "2.10.10"; src = fetchurl { - url = "http://download.gimp.org/pub/gimp/v${stdenv.lib.versions.majorMinor version}/${name}.tar.bz2"; - sha256 = "16sb4kslwin2jbgdb4nhks78pd0af8mvj8g5hap3hj946p7w2jfq"; + url = "http://download.gimp.org/pub/gimp/v${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.bz2"; + sha256 = "0xwck5nbpb945s1cyij3kfqw1pchbhx8i5vf5hgywyjw4r1z5l8j"; }; nativeBuildInputs = [ pkgconfig intltool gettext wrapPython ]; |