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

Commits on Aug 4, 2019

  1. glib: 2.60.4 -> 2.60.6

    Semi-automatic update generated by
    https://github.com/ryantm/nixpkgs-update tools. This update was made
    based on information from
    https://repology.org/metapackage/glib/versions
    r-ryantm committed Aug 4, 2019

    Unverified

    This commit is not signed, but one or more authors requires that any commit attributed to them is signed.
    Copy the full SHA
    f2d6a19 View commit details

Commits on Aug 5, 2019

  1. Merge pull request #65930 from r-ryantm/auto-update/glib

    glib: 2.60.4 -> 2.60.6
    worldofpeace authored Aug 5, 2019

    Unverified

    This commit is not signed, but one or more authors requires that any commit attributed to them is signed.
    Copy the full SHA
    b951301 View commit details
Showing with 2 additions and 2 deletions.
  1. +2 −2 pkgs/development/libraries/glib/default.nix
4 changes: 2 additions & 2 deletions pkgs/development/libraries/glib/default.nix
Original file line number Diff line number Diff line change
@@ -46,15 +46,15 @@ let
'';

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

stdenv.mkDerivation rec {
name = "glib-${version}";

src = fetchurl {
url = "mirror://gnome/sources/glib/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz";
sha256 = "1p9k8z83272mkm4d4fhm5jhwhyw2basrwbz47yl5wbmrvk2ix51b";
sha256 = "0v7vpx2md1gn0wwiirn7g4bhf2csfvcr03y96q2zv97ain6sp3zz";
};

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