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

Commits on Mar 25, 2021

  1. fixup! gnome3.gnome-color-manager: 3.32.0 → 3.36.0

    @jtojnar
    jtojnar committed Mar 25, 2021
    Copy the full SHA
    0ccab8d View commit details

  2. fixup! gnome3.aisleriot: 3.22.13 → 3.22.9

    @jtojnar
    jtojnar committed Mar 25, 2021
    Copy the full SHA
    52864f0 View commit details

  3. fixup! gnome3.accerciser: 3.38.0 → 3.39.1

    @jtojnar
    jtojnar committed Mar 25, 2021
    Copy the full SHA
    8515dd0 View commit details

  4. fixup! gnome-online-accounts: 3.38.1 → 3.39.92

    @jtojnar
    jtojnar committed Mar 25, 2021

    Verified

    This commit was created on GitHub.com and signed with GitHub’s verified signature.
    GPG key ID: B5690EEEBB952194
    Verified
    Learn about vigilant mode
    Copy the full SHA
    d5828cc View commit details

  5. gjs: fix installed tests 

    They were already failing on master (with pango 1.47 and gjs 1.66):

	(process:1186): Gjs-CRITICAL **: 12:36:09.500: JS ERROR: Error: Requiring Gtk, version 3.0: Typelib file for namespace 'HarfBuzz', version '0.0' not found
machine # @/nix/store/mca5jqi26f3h3s78p54bp59x4klyrch5-gjs-1.66.2-installedTests/libexec/installed-tests/gjs/js/testLegacyGObject.js:9:13

HarfBuzz is likely pulled in through Pango. Possibly introduced in #93799. But then why did not I notice that in GNOME 3.38 bump?
    @jtojnar
    jtojnar committed Mar 25, 2021
    Copy the full SHA
    debb51b View commit details
4 changes: 2 additions & 2 deletions pkgs/desktops/gnome-3/apps/accerciser/default.nix
View file
Original file line number Diff line number Diff line change
@@ -17,13 +17,13 @@

python3.pkgs.buildPythonApplication rec {
pname = "accerciser";
version = "3.39.1";
version = "3.38.0";

format = "other";

src = fetchurl {
url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
sha256 = "142ahm9bam99dq8k7qcavnwhakmvv647z53s3hza6ccqg4mzc7kx";
sha256 = "0fd9vv2abd2if2qj4nlfy7mpd7rc4sx18zhmxd5ijlnfhkpggbp5";
};

nativeBuildInputs = [
4 changes: 2 additions & 2 deletions pkgs/desktops/gnome-3/core/gnome-color-manager/default.nix
View file
Original file line number Diff line number Diff line change
@@ -21,11 +21,11 @@

stdenv.mkDerivation rec {
pname = "gnome-color-manager";
version = "3.36.0";
version = "3.32.0";

src = fetchurl {
url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
sha256 = "0fxdng74d8hwhfx1nwl1i4jx9h9f6c2hkyc12f01kqbjcimrxnwx";
sha256 = "1vpxa2zjz3lkq9ldjg0fl65db9s6b4kcs8nyaqfz3jygma7ifg3w";
};

nativeBuildInputs = [
4 changes: 2 additions & 2 deletions pkgs/desktops/gnome-3/games/aisleriot/default.nix
View file
Original file line number Diff line number Diff line change
@@ -19,14 +19,14 @@

stdenv.mkDerivation rec {
pname = "aisleriot";
version = "3.22.9";
version = "3.22.13";

src = fetchFromGitLab {
domain = "gitlab.gnome.org";
owner = "GNOME";
repo = pname;
rev = version;
sha256 = "1rsh41mhcrp3k23lqsnyc5yyfp184ks5p2idkwjyxry547mddyrk";
sha256 = "05k84bbgrrxchxg08l1jjcz384kpjdmxd24g0wnf731aa9zcnp5k";
};

nativeBuildInputs = [
3 changes: 2 additions & 1 deletion pkgs/development/libraries/gjs/default.nix
View file
Original file line number Diff line number Diff line change
@@ -16,6 +16,7 @@
, libxml2
, dbus
, gdk-pixbuf
, harfbuzz
, makeWrapper
, which
, xvfb_run
@@ -25,7 +26,7 @@
let
testDeps = [
gobject-introspection # for Gio and cairo typelibs
gtk3 atk pango.out gdk-pixbuf
gtk3 atk pango.out gdk-pixbuf harfbuzz
];
in stdenv.mkDerivation rec {
pname = "gjs";
1 change: 0 additions & 1 deletion pkgs/development/libraries/gnome-online-accounts/default.nix
View file
Original file line number Diff line number Diff line change
@@ -46,7 +46,6 @@ stdenv.mkDerivation rec {
mesonFlags = [
"-Dfedora=false" # not useful in NixOS or for NixOS users.
"-Dgtk_doc=true"
"-Dlastfm=true"
"-Dman=true"
"-Dmedia_server=true"
];