Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

gimp: 2.10.18 -> 2.10.20 #90154

Merged
merged 3 commits into from Jun 12, 2020
Merged

gimp: 2.10.18 -> 2.10.20 #90154

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
badb955
babl: 0.1.74 -> 0.1.78
adisbladis Jun 11, 2020
5a53432
gegl: 0.4.22 -> 0.4.24
adisbladis Jun 11, 2020
d7ffb5f
gimp: 2.10.18 -> 2.10.20
adisbladis Jun 11, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
4 changes: 2 additions & 2 deletions pkgs/applications/graphics/gimp/default.nix
View file
Open in desktop
Expand Up @@ -50,13 +50,13 @@ let
inherit (python2Packages) pygtk wrapPython python;
in stdenv.mkDerivation rec {
pname = "gimp";
version = "2.10.18";
version = "2.10.20";

outputs = [ "out" "dev" ];

src = fetchurl {
url = "http://download.gimp.org/pub/gimp/v${lib.versions.majorMinor version}/${pname}-${version}.tar.bz2";
sha256 = "05np26g61fyr72s7qjfrcck8v57r0yswq5ihvqyzvgzfx08y3gv5";
sha256 = "4S+fh0saAHxCd7YKqB4LZzML5+YVPldJ6tg5uQL8ezw=";
};

nativeBuildInputs = [
Expand Down
6 changes: 4 additions & 2 deletions pkgs/development/libraries/babl/default.nix
View file
Open in desktop
Expand Up @@ -5,24 +5,26 @@
, pkgconfig
, gobject-introspection
, lcms2
, vala
}:

stdenv.mkDerivation rec {
pname = "babl";
version = "0.1.74";
version = "0.1.78";

outputs = [ "out" "dev" ];

src = fetchurl {
url = "https://download.gimp.org/pub/babl/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
sha256 = "03nfcvy3453xkfvsfcnsfcjf2vg2pin09qnr9jlssdysa1lhnwcs";
sha256 = "F9VJNjO/9VhdnzdbxN9ZJRV80ccMzXwipjW+dcFyUjo=";
};

nativeBuildInputs = [
meson
ninja
pkgconfig
gobject-introspection
vala
];

buildInputs = [
Expand Down
14 changes: 2 additions & 12 deletions pkgs/development/libraries/gegl/4.0.nix
View file
Open in desktop
Expand Up @@ -35,26 +35,16 @@

stdenv.mkDerivation rec {
pname = "gegl";
version = "0.4.22";
version = "0.4.24";

outputs = [ "out" "dev" "devdoc" ];
outputBin = "dev";

src = fetchurl {
url = "https://download.gimp.org/pub/gegl/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
sha256 = "0q9cckf90fb82qc5d496fjz459f1xw4j4p3rff1f57yivx0yr20q";
sha256 = "d2VJnyc0Gw0WAy5mUxnLwSh2SD/2qUT83ySpxY4+JUo=";
};

patches = [
# Prevent deadlock making tests time-out
# https://gitlab.gnome.org/GNOME/gegl/issues/226
# https://gitlab.gnome.org/GNOME/glib/issues/1941
(fetchpatch {
url = "https://gitlab.gnome.org/GNOME/gegl/commit/1d530816266b52c8788bbe1504c5b2d6eceba036.patch";
sha256 = "1d8nhrzvwq35c5ws00xy9y6bfd9wsj3dm0301hiwkfi4niq59ygh";
})
];

nativeBuildInputs = [
pkgconfig
gettext
Expand Down