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

Commits on Nov 11, 2020

  1. gnome3.mutter334: Use full sysprof 

    Commit 56b9441 (#101528) incorrectly
switched mutter and mutter334 from full sysprof to libsysprof-capture,
causing channel-blocking build failures:

https://hydra.nixos.org/build/129977355 (mutter)
https://hydra.nixos.org/build/130019098 (mutter334)

Commit 752773e (#103142) reverted only
the mutter part.  This reverts the mutter334 part.

Signed-off-by: Anders Kaseorg <andersk@mit.edu>
    @andersk
    andersk committed Nov 11, 2020

    Verified

    This commit was signed with the committer’s verified signature. The key has expired.
    mweinelt Martin Weinelt
    GPG key ID: BD4AA0528F63F17E
    Expired
    Verified
    Learn about vigilant mode
    Copy the full SHA
    49bd665 View commit details

  2. Merge pull request #103400 from andersk/mutter334 

    gnome3.mutter334: Use full sysprof
    @hedning
    hedning authored Nov 11, 2020

    Verified

    This commit was signed with the committer’s verified signature. The key has expired.
    mweinelt Martin Weinelt
    GPG key ID: BD4AA0528F63F17E
    Expired
    Verified
    Learn about vigilant mode
    Copy the full SHA
    7fb6d5e View commit details
Showing with 2 additions and 2 deletions.
  1. +2 −2 pkgs/desktops/gnome-3/core/mutter/3.34/default.nix
4 changes: 2 additions & 2 deletions pkgs/desktops/gnome-3/core/mutter/3.34/default.nix
View file
Original file line number Diff line number Diff line change
@@ -35,7 +35,7 @@
, xorgserver
, python3
, wrapGAppsHook
, libsysprof-capture
, sysprof
, desktop-file-utils
, libcap_ng
, egl-wayland
@@ -96,7 +96,7 @@ stdenv.mkDerivation rec {
libxkbfile
pango
pipewire_0_2 # TODO: backport pipewire 0.3 support
libsysprof-capture
sysprof
upower
xkeyboard_config
xwayland