diff options
Diffstat (limited to 'infra/libkookie/nixpkgs/pkgs/desktops/pantheon/desktop/wingpanel-indicators')
3 files changed, 13 insertions, 19 deletions
diff --git a/infra/libkookie/nixpkgs/pkgs/desktops/pantheon/desktop/wingpanel-indicators/applications-menu/default.nix b/infra/libkookie/nixpkgs/pkgs/desktops/pantheon/desktop/wingpanel-indicators/applications-menu/default.nix index 94d91329e3d8..27e6215b7873 100644 --- a/infra/libkookie/nixpkgs/pkgs/desktops/pantheon/desktop/wingpanel-indicators/applications-menu/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/desktops/pantheon/desktop/wingpanel-indicators/applications-menu/default.nix @@ -1,5 +1,6 @@ { stdenv , fetchFromGitHub +, fetchpatch , nix-update-script , pantheon , substituteAll @@ -82,6 +83,12 @@ stdenv.mkDerivation rec { ]; patches = [ + # Port to Libhandy-1 + (fetchpatch { + url = "https://github.com/elementary/applications-menu/commit/8eb2430e8513e9d37f875c5c9b8b15a968c27127.patch"; + sha256 = "8Uw9mUw7U5nrAwUDGVpAwoRqb9ah503wQCr9kPbBJIo="; + }) + (substituteAll { src = ./fix-paths.patch; bc = "${bc}/bin/bc"; diff --git a/infra/libkookie/nixpkgs/pkgs/desktops/pantheon/desktop/wingpanel-indicators/bluetooth/default.nix b/infra/libkookie/nixpkgs/pkgs/desktops/pantheon/desktop/wingpanel-indicators/bluetooth/default.nix index 51c87d5f34b2..995577b80d06 100644 --- a/infra/libkookie/nixpkgs/pkgs/desktops/pantheon/desktop/wingpanel-indicators/bluetooth/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/desktops/pantheon/desktop/wingpanel-indicators/bluetooth/default.nix @@ -18,13 +18,13 @@ stdenv.mkDerivation rec { pname = "wingpanel-indicator-bluetooth"; - version = "2.1.5"; + version = "unstable-2020-10-01"; src = fetchFromGitHub { owner = "elementary"; repo = pname; - rev = version; - sha256 = "sha256-txEjChutJCse/WjgQEfo+MSeeGWdpHUABGCsAqK6i3o="; + rev = "2b59d646ea0d66ae45dafc851374f24dcd98c064"; + sha256 = "sha256-selp70P+7RhbdHF6iiNmcNbMf/c+B9zZ6nlxwRSZGn4="; }; passthru = { diff --git a/infra/libkookie/nixpkgs/pkgs/desktops/pantheon/desktop/wingpanel-indicators/session/default.nix b/infra/libkookie/nixpkgs/pkgs/desktops/pantheon/desktop/wingpanel-indicators/session/default.nix index 4812e2bc91df..914db6cc8a94 100644 --- a/infra/libkookie/nixpkgs/pkgs/desktops/pantheon/desktop/wingpanel-indicators/session/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/desktops/pantheon/desktop/wingpanel-indicators/session/default.nix @@ -16,28 +16,15 @@ stdenv.mkDerivation rec { pname = "wingpanel-indicator-session"; - version = "2.2.8"; + version = "unstable-2020-09-13"; src = fetchFromGitHub { owner = "elementary"; repo = pname; - rev = version; - sha256 = "sha256-iBbYOeGlv2lUFSK1qcd+4UJlCP/KCtdkx6i73jq6Ngo="; + rev = "e65c95f46adbfd598ad61933394d7bc3c5998278"; + sha256 = "sha256-QKOfgAc6pDQYpETrFunZB6+rF1P8XIf0pjft/t9aWW0="; }; - patches = [ - # build failure in vala 0.48.7 - # https://github.com/elementary/gala/pull/869#issuecomment-657147695 - (fetchpatch { - url = "https://github.com/elementary/wingpanel-indicator-session/commit/ead6971c708eed8b844bd9acd7eed2ab8a97e803.patch"; - sha256 = "1v7w7zdia82d38ycr5zhckaxgf7gr15hsv05cv5khlki8frryn2x"; - }) - (fetchpatch { - url = "https://github.com/elementary/wingpanel-indicator-session/commit/85347e676054635ac878fc542bd057398ca70d3e.patch"; - sha256 = "1vw4zx0qbhxmfzqhdcmwdp4fxvij7n3f5lwcplf5v3k9qsr3wm0n"; - }) - ]; - passthru = { updateScript = nix-update-script { attrPath = "pantheon.${pname}"; |