Unverified Commit dc23466a authored by Bobby Rong's avatar Bobby Rong Committed by GitHub
Browse files

Merge pull request #336934 from bobby285271/upd/pantheon 

Pantheon updates 2024-08-24 (switchboard 8.0.0)
parents a9cb9aca 8e75a28e

nixos/tests/pantheon.nix

+5 −2
Original line number Diff line number Diff line
@@ -10,6 +10,9 @@ import ./make-test-python.nix ({ pkgs, lib, ...} : 
  {

    imports = [ ./common/user-account.nix ];



    # Workaround ".gala-wrapped invoked oom-killer"

    virtualisation.memorySize = 2047;



    services.xserver.enable = true;

    services.xserver.desktopManager.pantheon.enable = true;
@@ -83,10 +86,10 @@ import ./make-test-python.nix ({ pkgs, lib, ...} : 
        machine.wait_for_window("io.elementary.calendar")



    with subtest("Open system settings"):

        machine.execute("su - ${user.name} -c 'DISPLAY=:0 io.elementary.switchboard >&2 &'")

        machine.execute("su - ${user.name} -c 'DISPLAY=:0 io.elementary.settings >&2 &'")

        # Wait for all plugins to be loaded before we check if the window is still there.

        machine.sleep(5)

        machine.wait_for_window("io.elementary.switchboard")

        machine.wait_for_window("io.elementary.settings")



    with subtest("Open elementary terminal"):

        machine.execute("su - ${user.name} -c 'DISPLAY=:0 io.elementary.terminal >&2 &'")

pkgs/desktops/pantheon/apps/switchboard-plugs/about/default.nix

+14 −23
Original line number Diff line number Diff line 
{ lib

, stdenv

, fetchFromGitHub

, fetchpatch

, nix-update-script

, meson

, ninja

, pkg-config

, vala

, libadwaita

, libgee

, libgtop

, libgudev

, libhandy

, granite

, gtk3

, granite7

, gtk4

, packagekit

, polkit

, switchboard

, udisks2

, fwupd

, appstream

, elementary-settings-daemon

}:



stdenv.mkDerivation rec {

  pname = "switchboard-plug-about";

  version = "6.2.0";

  version = "8.0.0";



  src = fetchFromGitHub {

    owner = "elementary";

    repo = pname;

    rev = version;

    sha256 = "sha256-MJybc2yAchU6qMqkoRz45QdhR7bj/UFk2nyxcBivsHI=";

    sha256 = "sha256-6b6nuOp4pEufHEmTraSfKpbtPuO3Z9hQJfvKuuyy7as=";

  };



  patches = [

    # Add support for AppStream 1.0

    # https://github.com/elementary/switchboard-plug-about/pull/275

    (fetchpatch {

      url = "https://github.com/elementary/switchboard-plug-about/commit/72d7da13da2824812908276751fd3024db2dd0f8.patch";

      hash = "sha256-R7oW3mL77/JNqxuMiqxtdMlHWMJgGRQBBzVeRiqx8PY=";

    })

  ];



  nativeBuildInputs = [

    meson

    ninja
@@ -48,22 +41,20 @@ stdenv.mkDerivation rec { 


  buildInputs = [

    appstream

    elementary-settings-daemon # for gsettings schemas

    fwupd

    granite

    gtk3

    granite7

    gtk4

    libadwaita

    libgee

    libgtop

    libgudev

    libhandy

    packagekit

    polkit

    switchboard

    udisks2

  ];



  mesonFlags = [

    # Does not play nice with the nix-snowflake logo

    "-Dwallpaper=false"

  ];



  passthru = {

    updateScript = nix-update-script { };

  };

pkgs/desktops/pantheon/apps/switchboard-plugs/applications/default.nix

+8 −8
Original line number Diff line number Diff line
@@ -6,23 +6,23 @@ 
, ninja

, pkg-config

, vala

, libadwaita

, libgee

, libhandy

, granite

, gtk3

, granite7

, gtk4

, switchboard

, flatpak

}:



stdenv.mkDerivation rec {

  pname = "switchboard-plug-applications";

  version = "7.0.1";

  version = "8.0.0";



  src = fetchFromGitHub {

    owner = "elementary";

    repo = pname;

    rev = version;

    sha256 = "sha256-r2JKiTewsLQSZPriC0w72CFevRQXytrFcO2VfA9BKHA=";

    sha256 = "sha256-dExMuPZJl/l7lRIY8kkmuRcQaPS39VBfE0dRrINLWx8=";

  };



  nativeBuildInputs = [
@@ -34,10 +34,10 @@ stdenv.mkDerivation rec { 


  buildInputs = [

    flatpak

    granite

    gtk3

    granite7

    gtk4

    libadwaita

    libgee

    libhandy

    switchboard

  ];

pkgs/desktops/pantheon/apps/switchboard-plugs/bluetooth/default.nix

+8 −16
Original line number Diff line number Diff line 
{ lib

, stdenv

, fetchFromGitHub

, fetchpatch

, nix-update-script

, meson

, ninja

, pkg-config

, vala

, libadwaita

, libgee

, granite

, gtk3

, granite7

, gtk4

, bluez

, switchboard

, wingpanel-indicator-bluetooth
@@ -17,24 +17,15 @@ 


stdenv.mkDerivation rec {

  pname = "switchboard-plug-bluetooth";

  version = "2.3.6";

  version = "8.0.0";



  src = fetchFromGitHub {

    owner = "elementary";

    repo = pname;

    rev = version;

    sha256 = "0n9fhi9g0ww341bjk6lpc5ppnl7qj9b3d63j9a7iqnap57bgks9y";

    sha256 = "sha256-A55VCyQi+LBe3hxKp/xsVtXyPHuLPaCOi78Zv6MiwIw=";

  };



  patches = [

    # Upstream code not respecting our localedir

    # https://github.com/elementary/switchboard-plug-bluetooth/pull/182

    (fetchpatch {

      url = "https://github.com/elementary/switchboard-plug-bluetooth/commit/031dd5660b4bcb0bb4e82ebe6d8bcdaa1791c385.patch";

      sha256 = "1g01ad6md7pqp1fx00avbra8yfnr8ipg8y6zhfg35fgjakj4aags";

    })

  ];



  nativeBuildInputs = [

    meson

    ninja
@@ -44,8 +35,9 @@ stdenv.mkDerivation rec { 


  buildInputs = [

    bluez

    granite

    gtk3

    granite7

    gtk4

    libadwaita

    libgee

    switchboard

    wingpanel-indicator-bluetooth # settings schema

pkgs/desktops/pantheon/apps/switchboard-plugs/datetime/default.nix

+8 −13
Original line number Diff line number Diff line 
{ lib

, stdenv

, fetchFromGitHub

, fetchpatch

, nix-update-script

, meson

, ninja

, substituteAll

, pkg-config

, vala

, libadwaita

, libgee

, granite

, gtk3

, granite7

, gtk4

, libxml2

, switchboard

, tzdata
@@ -18,13 +18,13 @@ 


stdenv.mkDerivation rec {

  pname = "switchboard-plug-datetime";

  version = "2.2.0";

  version = "8.0.0";



  src = fetchFromGitHub {

    owner = "elementary";

    repo = pname;

    rev = version;

    sha256 = "10rqhxsqbl1xnz5n84d7m39c3vb71k153989xvyc55djia1wjx96";

    sha256 = "sha256-PE1ig8p9H4MfipIpN3ubXAJNzLwGVW89adn+SF3rEuQ=";

  };



  patches = [
@@ -32,12 +32,6 @@ stdenv.mkDerivation rec { 
      src = ./fix-paths.patch;

      tzdata = tzdata;

    })

    # Upstream code not respecting our localedir

    # https://github.com/elementary/switchboard-plug-datetime/pull/100

    (fetchpatch {

      url = "https://github.com/elementary/switchboard-plug-datetime/commit/a90639ed4f185f50d4ae448cd9503203dc24b3f4.patch";

      sha256 = "0dz0s02ccnds62dqil44k652pc5icka2rfhcx0a5bj1wi5sifnp7";

    })

  ];



  nativeBuildInputs = [
@@ -49,8 +43,9 @@ stdenv.mkDerivation rec { 
  ];



  buildInputs = [

    granite

    gtk3

    granite7

    gtk4

    libadwaita

    libgee

    switchboard

  ];