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: 9127ca25469b
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 589044a71c1f
Choose a head ref
  • 3 commits
  • 3 files changed
  • 1 contributor

Commits on Jan 22, 2020

  1. babl: 0.1.72 → 0.1.74 

    https://gitlab.gnome.org/GNOME/babl/blob/BABL_0_1_74/NEWS#L6-7
    @jtojnar
    jtojnar committed Jan 22, 2020
    Copy the full SHA
    208e761 View commit details

  2. gegl_0_4: 0.4.18 → 0.4.20 

    https://gitlab.gnome.org/GNOME/gegl/blob/GEGL_0_4_20/docs/NEWS.txt#L1-36
    @jtojnar
    jtojnar committed Jan 22, 2020
    Copy the full SHA
    ee9d4c5 View commit details

Commits on Jan 23, 2020

  1. Merge pull request #78269 from jtojnar/gimp-deps 

    gegl_0_4: 0.4.18 → 0.4.20
    @jtojnar
    jtojnar authored Jan 23, 2020
    Copy the full SHA
    589044a View commit details
Showing with 4 additions and 46 deletions.
  1. +2 −8 pkgs/development/libraries/babl/default.nix
  2. +0 −16 pkgs/development/libraries/babl/fix-darwin.patch
  3. +2 −22 pkgs/development/libraries/gegl/4.0.nix
10 changes: 2 additions & 8 deletions pkgs/development/libraries/babl/default.nix
View file
Original file line number Diff line number Diff line change
@@ -9,21 +9,15 @@

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

outputs = [ "out" "dev" ];

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

patches = [
# Apple linker does not know --version-script flag
# https://gitlab.gnome.org/GNOME/babl/merge_requests/26
./fix-darwin.patch
];

nativeBuildInputs = [
meson
ninja
16 changes: 0 additions & 16 deletions pkgs/development/libraries/babl/fix-darwin.patch
View file

This file was deleted.

24 changes: 2 additions & 22 deletions pkgs/development/libraries/gegl/4.0.nix
View file
Original file line number Diff line number Diff line change
@@ -33,37 +33,17 @@

stdenv.mkDerivation rec {
pname = "gegl";
version = "0.4.18";
version = "0.4.20";

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 = "0r6akqnrkvxizyhyi8sv40mxm7j4bcwjb6mqjpxy0zzbbfsdyin9";
sha256 = "1zrxnxlhn0jmshg4n2m2xlgi886w059ynkiiihm7rpi05fs8pg93";
};

patches = [
# Fix arch detection.
# https://gitlab.gnome.org/GNOME/gegl/merge_requests/53
(fetchpatch {
url = "https://gitlab.gnome.org/GNOME/gegl/commit/6bcf95fd0f32cf5e8b1ddbe17b14d9ad049bded8.patch";
sha256 = "0aqdr3y5mr47wq44jnhp97188bvpjlf56zrlmn8aazdf07r2apma";
})

# Fix Darwin build.
# https://gitlab.gnome.org/GNOME/gegl/merge_requests/54
(fetchpatch {
url = "https://gitlab.gnome.org/GNOME/gegl/commit/2bc06bfedee4fb25f6a966c8235b75292e24e55f.patch";
sha256 = "1psls61wsrdq5pzpvj22mrm46lpzrw3wkx6li7dv6fyb65wz2n4d";
})

# Fix test timeout. Downstream debian patch.
(fetchpatch {
url = "https://salsa.debian.org/gnome-team/gegl/raw/9b7520b38d87cd8ad4b39bf0b8c62d011da25169/debian/patches/increase_test_timeout.patch";
sha256 = "1prc1h1aipjd9db0i1j7nzga4zvk3vl8qsjpz1jzv1wwvz02isly";
})

# Remove gegl:simple / backend-file test that times out frequently
./patches/no-simple-backend-file-test.patch
];