diff options
Diffstat (limited to 'infra/libkookie/nixpkgs/pkgs/desktops/pantheon')
9 files changed, 54 insertions, 25 deletions
diff --git a/infra/libkookie/nixpkgs/pkgs/desktops/pantheon/apps/appcenter/default.nix b/infra/libkookie/nixpkgs/pkgs/desktops/pantheon/apps/appcenter/default.nix index 18ee7bdd844a..ca7ace8e79df 100644 --- a/infra/libkookie/nixpkgs/pkgs/desktops/pantheon/apps/appcenter/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/desktops/pantheon/apps/appcenter/default.nix @@ -25,13 +25,13 @@ , python3 , vala , polkit -, libhandy +, libhandy_0 , wrapGAppsHook }: stdenv.mkDerivation rec { pname = "appcenter"; - version = "3.4.2"; + version = "3.5.1"; src = fetchFromGitHub { owner = "elementary"; @@ -69,7 +69,7 @@ stdenv.mkDerivation rec { gtk3 json-glib libgee - libhandy + libhandy_0 # doesn't support libhandy-1 yet libsoup libxml2 packagekit diff --git a/infra/libkookie/nixpkgs/pkgs/desktops/pantheon/apps/elementary-calendar/default.nix b/infra/libkookie/nixpkgs/pkgs/desktops/pantheon/apps/elementary-calendar/default.nix index e8f0e37620e5..66bba6dfe793 100644 --- a/infra/libkookie/nixpkgs/pkgs/desktops/pantheon/apps/elementary-calendar/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/desktops/pantheon/apps/elementary-calendar/default.nix @@ -26,7 +26,7 @@ stdenv.mkDerivation rec { pname = "elementary-calendar"; - version = "5.1.0"; + version = "5.1.1"; repoName = "calendar"; @@ -34,7 +34,7 @@ stdenv.mkDerivation rec { owner = "elementary"; repo = repoName; rev = version; - sha256 = "sha256-b72BmChl/Ql0ljLRcPMNbJcOV4cVqz5D2j+5BGUi4Go="; + sha256 = "18npf4zzf2dywr1zkr6fqzcbb70297yvdp5wxw7zyam1xwa86v07"; }; passthru = { diff --git a/infra/libkookie/nixpkgs/pkgs/desktops/pantheon/apps/switchboard-plugs/about/default.nix b/infra/libkookie/nixpkgs/pkgs/desktops/pantheon/apps/switchboard-plugs/about/default.nix index 86db11a3dc31..f174c41abc7b 100644 --- a/infra/libkookie/nixpkgs/pkgs/desktops/pantheon/apps/switchboard-plugs/about/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/desktops/pantheon/apps/switchboard-plugs/about/default.nix @@ -1,5 +1,6 @@ { stdenv , fetchFromGitHub +, fetchpatch , nix-update-script , pantheon , substituteAll @@ -47,6 +48,20 @@ stdenv.mkDerivation rec { ]; patches = [ + # Get OS Info from GLib.Environment + # https://github.com/elementary/switchboard-plug-about/pull/128 + (fetchpatch { + url = "https://github.com/elementary/switchboard-plug-about/commit/5ed29988e3a895b2df66e5529df0f12a94d5517c.patch"; + sha256 = "1ipDxnpDZjpSEzZdtOeNe5U+QOXiB5M+hC3yDAsl/rQ="; + }) + + # Use Pretty Name + # https://github.com/elementary/switchboard-plug-about/pull/134 + (fetchpatch { + url = "https://github.com/elementary/switchboard-plug-about/commit/653d131dc8fac10ae7523f2bf6b179ffffa9c0fd.patch"; + sha256 = "AsM49Dc9/yn2tG6fqjfedeOlDXUu+iEoyNUmNYLH+zE="; + }) + (substituteAll { src = ./fix-paths.patch; inherit pciutils; diff --git a/infra/libkookie/nixpkgs/pkgs/desktops/pantheon/apps/switchboard-plugs/onlineaccounts/default.nix b/infra/libkookie/nixpkgs/pkgs/desktops/pantheon/apps/switchboard-plugs/onlineaccounts/default.nix index 16e8c7e66c17..913fa58e2871 100644 --- a/infra/libkookie/nixpkgs/pkgs/desktops/pantheon/apps/switchboard-plugs/onlineaccounts/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/desktops/pantheon/apps/switchboard-plugs/onlineaccounts/default.nix @@ -62,6 +62,12 @@ stdenv.mkDerivation rec { url = "https://github.com/elementary/switchboard-plug-onlineaccounts/commit/5fa2882f765076d20c6ef4886198a34a05159f8a.patch"; sha256 = "1szryyy7shdmbvx9yhpi0bhzaayg7hl6pq2c456j1qf9kfv0m4hf"; }) + + # fix build with vala 0.48.9 + (fetchpatch { + url = "https://github.com/elementary/switchboard-plug-onlineaccounts/commit/b1853b7427102b8dd94774e1e2cc455f50902263.patch"; + sha256 = "J3C71GyEHEZWSghGXlwXPHFJRhrvx6i0yvi8NIDb4WE="; + }) ]; PKG_CONFIG_LIBACCOUNTS_GLIB_PROVIDERFILESDIR = "${placeholder "out"}/share/accounts/providers"; diff --git a/infra/libkookie/nixpkgs/pkgs/desktops/pantheon/apps/switchboard/wrapper.nix b/infra/libkookie/nixpkgs/pkgs/desktops/pantheon/apps/switchboard/wrapper.nix index 67f4105ff3d1..7953105951c6 100644 --- a/infra/libkookie/nixpkgs/pkgs/desktops/pantheon/apps/switchboard/wrapper.nix +++ b/infra/libkookie/nixpkgs/pkgs/desktops/pantheon/apps/switchboard/wrapper.nix @@ -8,15 +8,18 @@ , plugs # Only useful to disable for development testing. , useDefaultPlugs ? true +, testName ? null }: let selectedPlugs = if plugs == null then switchboardPlugs else plugs ++ (lib.optionals useDefaultPlugs switchboardPlugs); + + testingName = lib.optionalString (testName != null) "${testName}-"; in stdenv.mkDerivation rec { - name = "${switchboard.name}-with-plugs"; + name = "${testingName}${switchboard.name}-with-plugs"; src = null; diff --git a/infra/libkookie/nixpkgs/pkgs/desktops/pantheon/desktop/elementary-onboarding/default.nix b/infra/libkookie/nixpkgs/pkgs/desktops/pantheon/desktop/elementary-onboarding/default.nix index 31ed7f3672a9..73de43594bdd 100644 --- a/infra/libkookie/nixpkgs/pkgs/desktops/pantheon/desktop/elementary-onboarding/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/desktops/pantheon/desktop/elementary-onboarding/default.nix @@ -32,6 +32,17 @@ stdenv.mkDerivation rec { sha256 = "sha256-tLTwXA2miHqYqCUbIiBjb2nQB+uN/WzuE4F9m3fVCbM="; }; + patches = [ + # Port to Libhandy-1 + (fetchpatch { + url = "https://github.com/elementary/onboarding/commit/8af6b7d9216f8cbf725f708b36ef4d4f6c400c78.patch"; + sha256 = "cnSCSSFEQlNd9Ncw5VCJ32stZ8D4vhl3f+derAk/Cas="; + excludes = [ + ".github/workflows/main.yml" + ]; + }) + ]; + passthru = { updateScript = nix-update-script { attrPath = "pantheon.${pname}"; 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}"; |