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

Commits on Mar 30, 2021

  1. gcr: 3.38.1 → 3.40.0

    jtojnar committed Mar 30, 2021
    Copy the full SHA
    d406fdc View commit details
  2. gnome3.gdm: 40.rc → 40.0

    jtojnar committed Mar 30, 2021

    Verified

    This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
    Copy the full SHA
    4afd899 View commit details
  3. Verified

    This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
    Copy the full SHA
    068d486 View commit details
  4. Verified

    This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
    Copy the full SHA
    7412fef View commit details

Commits on Mar 31, 2021

  1. Copy the full SHA
    7ff717b View commit details
4 changes: 2 additions & 2 deletions pkgs/desktops/gnome-3/core/gdm/default.nix
Original file line number Diff line number Diff line change
@@ -42,13 +42,13 @@ in

stdenv.mkDerivation rec {
pname = "gdm";
version = "40.rc";
version = "40.0";

outputs = [ "out" "dev" ];

src = fetchurl {
url = "mirror://gnome/sources/gdm/${lib.versions.major version}/${pname}-${version}.tar.xz";
sha256 = "1h136d5q7q44wm9kxgnzxc7bl7mxzp3s6aghic471ipb11hjzmvy";
sha256 = "XtdLc506Iy/7HkoTK8+WW9/pVdmVtSh3NYh3WwLylQ4=";
};

mesonFlags = [
3 changes: 3 additions & 0 deletions pkgs/desktops/gnome-3/core/mutter/default.nix
Original file line number Diff line number Diff line change
@@ -71,6 +71,9 @@ let self = stdenv.mkDerivation rec {
# This should be auto detected, but it looks like it manages a false
# positive.
"-Dxwayland_initfd=disabled"
# We are not running tests and building them causes non-deterministic build failure:
# https://gitlab.gnome.org/GNOME/mutter/-/issues/1682
"-Dtests=false"
];

propagatedBuildInputs = [
4 changes: 2 additions & 2 deletions pkgs/desktops/gnome-3/misc/gnome-tweaks/default.nix
Original file line number Diff line number Diff line change
@@ -20,13 +20,13 @@

python3Packages.buildPythonApplication rec {
pname = "gnome-tweaks";
version = "40.beta";
version = "40.0";
format = "other";
strictDeps = false; # https://github.com/NixOS/nixpkgs/issues/56943

src = fetchurl {
url = "mirror://gnome/sources/${pname}/${lib.versions.major version}/${pname}-${version}.tar.xz";
sha256 = "0spl5ivdyp390x1ydy35b5drp6aq1965lj76jwvjwby4k5lggjqq";
sha256 = "+V8/4DGwsBwC95oWWfiJFS03cq4+RN+EA9FGC6Xuw2o=";
};

nativeBuildInputs = [
4 changes: 2 additions & 2 deletions pkgs/development/libraries/gcr/default.nix
Original file line number Diff line number Diff line change
@@ -22,11 +22,11 @@

stdenv.mkDerivation rec {
pname = "gcr";
version = "3.38.1";
version = "3.40.0";

src = fetchurl {
url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
sha256 = "F/yvnEqTpl+xxyuCZDuxAsEzRAhGh9WIbqZjE4aNnsk=";
sha256 = "udNkWl/ZU6VChcxk1PwEZzZGPb1NzCXK9ce1m+0wJ/U=";
};

postPatch = ''
13 changes: 11 additions & 2 deletions pkgs/development/libraries/gtksourceview/4.x.nix
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
{ lib, stdenv, fetchurl, pkg-config, atk, cairo, glib, gtk3, pango, fribidi, vala
{ lib, stdenv, fetchurl, fetchpatch, pkg-config, atk, cairo, glib, gtk3, pango, fribidi, vala
, libxml2, perl, gettext, gnome3, gobject-introspection, dbus, xvfb_run, shared-mime-info
, meson, ninja }:

@@ -26,7 +26,16 @@ stdenv.mkDerivation rec {

buildInputs = [ atk cairo glib pango fribidi libxml2 ];

patches = [ ./4.x-nix_share_path.patch ];
patches = [
./4.x-nix_share_path.patch

# fixes intermittent "gtksourceview-gresources.h: no such file" errors
(fetchpatch {
name = "ensure-access-to-resources-in-corelib-build.patch";
url = "https://gitlab.gnome.org/GNOME/gtksourceview/-/commit/9bea9d1c4a56310701717bb106c52a5324ee392a.patch";
sha256 = "sha256-rSB6lOFEyz58HfOSj7ZM48/tHxhqbtWWbh60JuySAZ0=";
})
];

enableParallelBuilding = true;