Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: c21c6fcd7a14
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: d42ed2dcf396
Choose a head ref
  • 3 commits
  • 2 files changed
  • 1 contributor

Commits on Jun 14, 2019

  1. babl: 0.1.62 → 0.1.66 

    https://gitlab.gnome.org/GNOME/babl/blob/BABL_0_1_66/NEWS
    @jtojnar
    jtojnar committed Jun 14, 2019
    Copy the full SHA
    b5c9e8c View commit details

  2. gimp: 2.10.10 → 2.10.12 

    https://www.gimp.org/news/2019/06/12/gimp-2-10-12-released/
    @jtojnar
    jtojnar committed Jun 14, 2019
    Copy the full SHA
    c421767 View commit details

  3. gimp: 2.10.10 → 2.10.12 (#63115) 

    gimp: 2.10.10 → 2.10.12
    @jtojnar
    jtojnar authored Jun 14, 2019
    Copy the full SHA
    d42ed2d View commit details
Showing with 6 additions and 5 deletions.
  1. +2 −2 pkgs/applications/graphics/gimp/default.nix
  2. +4 −3 pkgs/development/libraries/babl/default.nix
4 changes: 2 additions & 2 deletions pkgs/applications/graphics/gimp/default.nix
View file
Original file line number Diff line number Diff line change
@@ -9,11 +9,11 @@ let
inherit (python2Packages) pygtk wrapPython python;
in stdenv.mkDerivation rec {
pname = "gimp";
version = "2.10.10";
version = "2.10.12";

src = fetchurl {
url = "http://download.gimp.org/pub/gimp/v${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.bz2";
sha256 = "0xwck5nbpb945s1cyij3kfqw1pchbhx8i5vf5hgywyjw4r1z5l8j";
sha256 = "0wdcr8d2ink4swn5r4v13bsiya6s3xm4ya97sdbhs4l40y7bb03x";
};

nativeBuildInputs = [ pkgconfig intltool gettext wrapPython ];
7 changes: 4 additions & 3 deletions pkgs/development/libraries/babl/default.nix
View file
Original file line number Diff line number Diff line change
@@ -1,11 +1,12 @@
{ stdenv, fetchurl }:

stdenv.mkDerivation rec {
name = "babl-0.1.62";
pname = "babl";
version = "0.1.66";

src = fetchurl {
url = "https://ftp.gtk.org/pub/babl/0.1/${name}.tar.bz2";
sha256 = "047msfzj8v4sfl61a2xhd69r9rh2pjq4lzpk3j10ijyv9qbry9yw";
url = "https://ftp.gtk.org/pub/babl/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.bz2";
sha256 = "0qx1dwbinxihwl2lmxi60qiqi402jlrdcnixx14kk6j88n9xi79n";
};

doCheck = true;