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

Commits on Mar 8, 2019

  1. fixup! gnome3.gnome-contacts: 3.30.2 -> 3.31.90

    @hedning
    hedning committed Mar 8, 2019

    Verified

    This commit was signed with the committer’s verified signature.
    vszakats Viktor Szakats
    GPG key ID: B5ABD165E2AEF201
    Verified
    Learn about vigilant mode
    Copy the full SHA
    4c66de3 View commit details

  2. fixup! gnome3.epiphany: 3.30.3 -> 3.31.92

    @hedning
    hedning committed Mar 8, 2019

    Verified

    This commit was signed with the committer’s verified signature.
    vszakats Viktor Szakats
    GPG key ID: B5ABD165E2AEF201
    Verified
    Learn about vigilant mode
    Copy the full SHA
    dac5259 View commit details

  3. squash! gnome3.gnome-control-center: 3.30.3 -> 3.31.92 

    add libhandy
    @hedning
    hedning committed Mar 8, 2019

    Verified

    This commit was signed with the committer’s verified signature.
    vszakats Viktor Szakats
    GPG key ID: B5ABD165E2AEF201
    Verified
    Learn about vigilant mode
    Copy the full SHA
    5cc1569 View commit details
4 changes: 2 additions & 2 deletions pkgs/desktops/gnome-3/core/epiphany/default.nix
View file
Original file line number Diff line number Diff line change
@@ -2,7 +2,7 @@
, wrapGAppsHook, gnome3, libxml2, libxslt, itstool
, webkitgtk, libsoup, glib-networking, libsecret, gnome-desktop, libnotify, p11-kit
, sqlite, gcr, isocodes, desktop-file-utils, python3
, gdk_pixbuf, gst_all_1, json-glib, libdazzle }:
, gdk_pixbuf, gst_all_1, json-glib, libdazzle, libhandy }:

stdenv.mkDerivation rec {
name = "epiphany-${version}";
@@ -22,7 +22,7 @@ stdenv.mkDerivation rec {

buildInputs = [
gtk3 glib webkitgtk libsoup libxml2 libsecret gnome-desktop libnotify
sqlite isocodes p11-kit icu
sqlite isocodes p11-kit icu libhandy
gdk_pixbuf gnome3.adwaita-icon-theme gcr
glib-networking gst_all_1.gstreamer gst_all_1.gst-plugins-base
gst_all_1.gst-plugins-good gst_all_1.gst-plugins-bad gst_all_1.gst-plugins-ugly
5 changes: 2 additions & 3 deletions pkgs/desktops/gnome-3/core/gnome-contacts/default.nix
View file
Original file line number Diff line number Diff line change
@@ -2,7 +2,7 @@
, pkgconfig, libxslt, docbook_xsl, docbook_xml_dtd_42, python3, gtk3, glib, cheese
, libchamplain, clutter-gtk, geocode-glib, gnome-desktop, gnome-online-accounts
, wrapGAppsHook, folks, libxml2, gnome3, telepathy-glib
, vala, meson, ninja, libsoup }:
, vala, meson, ninja, libhandy }:

let
version = "3.31.90";
@@ -22,10 +22,9 @@ in stdenv.mkDerivation rec {

buildInputs = [
gtk3 glib evolution-data-server gnome3.gsettings-desktop-schemas
folks gnome-desktop telepathy-glib
folks gnome-desktop telepathy-glib libhandy
libxml2 gnome-online-accounts cheese
gnome3.adwaita-icon-theme libchamplain clutter-gtk geocode-glib
libsoup # for some reason now needed through folks_eds
];

mesonFlags = [
4 changes: 2 additions & 2 deletions pkgs/desktops/gnome-3/core/gnome-control-center/default.nix
View file
Original file line number Diff line number Diff line change
@@ -9,7 +9,7 @@
, gtk3, glib, glib-networking, gsettings-desktop-schemas
, gnome-desktop, gnome-settings-daemon, gnome-online-accounts
, vino, gnome-bluetooth, tracker, adwaita-icon-theme
, udisks2, gsound }:
, udisks2, gsound, libhandy }:

let
pname = "gnome-control-center";
@@ -35,7 +35,7 @@ in stdenv.mkDerivation rec {
grilo libpwquality cracklib vino libcanberra-gtk3 libgudev libsecret
gdk_pixbuf adwaita-icon-theme librsvg clutter clutter-gtk cheese
networkmanager modemmanager gnome-bluetooth tracker
udisks2 gsound
udisks2 gsound libhandy
];

patches = [