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: bd414cc9fe5d
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 8fdb4c283630
Choose a head ref
  • 2 commits
  • 1 file changed
  • 1 contributor

Commits on Sep 4, 2019

  1. glib: 2.60.6 -> 2.60.7 

    https://gitlab.gnome.org/GNOME/glib/-/tags/2.60.7
    @dtzWill
    dtzWill committed Sep 4, 2019
    Copy the full SHA
    59ed1d9 View commit details

Commits on Sep 5, 2019

  1. Merge pull request #68052 from dtzWill/update/glib-2.60.7 

    glib: 2.60.6 -> 2.60.7
    @dtzWill
    dtzWill authored Sep 5, 2019
    Copy the full SHA
    8fdb4c2 View commit details
Showing with 2 additions and 3 deletions.
  1. +2 −3 pkgs/development/libraries/glib/default.nix
5 changes: 2 additions & 3 deletions pkgs/development/libraries/glib/default.nix
View file
Original file line number Diff line number Diff line change
@@ -46,16 +46,15 @@ let
'';

binPrograms = optional (!stdenv.isDarwin) "gapplication" ++ [ "gdbus" "gio" "gsettings" ];
version = "2.60.6";
in

stdenv.mkDerivation rec {
pname = "glib";
inherit version;
version = "2.60.7";

src = fetchurl {
url = "mirror://gnome/sources/glib/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
sha256 = "0v7vpx2md1gn0wwiirn7g4bhf2csfvcr03y96q2zv97ain6sp3zz";
sha256 = "0433m0na8nc4cf0gidf4gfzz8k5d3dsssmh541qkpzcsaspw04lb";
};

patches = optional stdenv.isDarwin ./darwin-compilation.patch