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

Commits on Nov 11, 2019

  1. pantheon.switchboard: 2.3.6 -> 2.3.7 

    Drops libunity elementary/switchboard#109.

https://github.com/elementary/switchboard/releases/tag/2.3.7
    @worldofpeace
    worldofpeace committed Nov 11, 2019
    Copy the full SHA
    58f9fcd View commit details

  2. pantheon.wingpanel-indicator-keyboard: 2.1.2 -> 2.2.0 

    https://github.com/elementary/wingpanel-indicator-keyboard/releases/tag/2.2.0
    @worldofpeace
    worldofpeace committed Nov 11, 2019
    Copy the full SHA
    251a560 View commit details
6 changes: 2 additions & 4 deletions pkgs/desktops/pantheon/apps/switchboard/default.nix
View file
Original file line number Diff line number Diff line change
@@ -11,20 +11,19 @@
, granite
, gettext
, clutter-gtk
, libunity
, elementary-icon-theme
, wrapGAppsHook
}:

stdenv.mkDerivation rec {
pname = "switchboard";
version = "2.3.6";
version = "2.3.7";

src = fetchFromGitHub {
owner = "elementary";
repo = pname;
rev = version;
sha256 = "0lsrn636b0f9a58jbid6mlhgrf8ajnh7phwmhgxz55sz7k7qa58g";
sha256 = "160aar5dqd019vn28cm0d0ijj1i6mwpqkl7a1l4lpasw12drxwxz";
};

passthru = {
@@ -49,7 +48,6 @@ stdenv.mkDerivation rec {
granite
gtk3
libgee
libunity
];

patches = [
10 changes: 3 additions & 7 deletions pkgs/desktops/pantheon/apps/switchboard/plugs-path-env.patch
View file
Original file line number Diff line number Diff line change
@@ -1,13 +1,9 @@
diff --git a/lib/PlugsManager.vala b/lib/PlugsManager.vala
index 75d0eaf..c227908 100644
index 8b21e7b..bc36321 100644
--- a/lib/PlugsManager.vala
+++ b/lib/PlugsManager.vala
@@ -34,10 +34,18 @@ public class Switchboard.PlugsManager : GLib.Object {
private Gee.LinkedList<Switchboard.Plug> plugs;

public signal void plug_added (Switchboard.Plug plug);
-
+
@@ -36,7 +36,15 @@ public class Switchboard.PlugsManager : GLib.Object {

private PlugsManager () {
plugs = new Gee.LinkedList<Switchboard.Plug> ();
- var base_folder = File.new_for_path (Build.PLUGS_DIR);
4 changes: 2 additions & 2 deletions pkgs/desktops/pantheon/desktop/wingpanel-indicators/keyboard/default.nix
View file
Original file line number Diff line number Diff line change
@@ -17,13 +17,13 @@

stdenv.mkDerivation rec {
pname = "wingpanel-indicator-keyboard";
version = "2.1.2";
version = "2.2.0";

src = fetchFromGitHub {
owner = "elementary";
repo = pname;
rev = version;
sha256 = "0lrd474m6p8di73hqjilqnnl7qg72ky5narkgcvm4lk8dyi78mz0";
sha256 = "0jc12xfaj3micpjssxc7m6hzssvyq26ln5az05x5f1j6v8lccbyn";
};

passthru = {