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

Merge pull request #336559 from bobby285271/upd/pantheon 

Pantheon updates 2024-08-22
parents 7f871ed0 fb105c39

pkgs/desktops/pantheon/apps/appcenter/default.nix

+34 −37
Original line number Diff line number Diff line 
{ lib

, stdenv

, nix-update-script

, appstream

, dbus

, fetchFromGitHub

, flatpak

, glib

, granite

, gtk3

, json-glib

, libgee

, libhandy

, libportal-gtk3

, libsoup_3

, libxml2

, meson

, ninja

, pkg-config

, vala

, polkit

, wrapGAppsHook3

{

  stdenv,

  lib,

  fetchFromGitHub,

  meson,

  ninja,

  pkg-config,

  sassc,

  vala,

  wrapGAppsHook4,

  appstream,

  dbus,

  flatpak,

  glib,

  granite7,

  gtk4,

  json-glib,

  libadwaita,

  libgee,

  libportal-gtk4,

  libsoup_3,

  libxml2,

  polkit,

  nix-update-script,

}:



stdenv.mkDerivation rec {

  pname = "appcenter";

  version = "7.4.0-unstable-2024-02-07";

  version = "8.0.0";



  src = fetchFromGitHub {

    owner = "elementary";

    repo = pname;

    # Add support for AppStream 1.0.

    # https://github.com/elementary/appcenter/pull/2099

    # nixpkgs-update: no auto update

    rev = "fce55d9373bfb82953191b32e276a2129ffcb8c1";

    hash = "sha256-7VYiE1RkaqN1Yg4pFUBs6k8QjoljYFDgQ9jCTLG3uyk=";

    rev = version;

    hash = "sha256-j2S8E/sdtkir3lhN1yg4qOjcvxlriXpapsPuANPqhcc=";

  };



  nativeBuildInputs = [

    dbus # for pkg-config

    meson

    ninja

    pkg-config

    sassc

    vala

    wrapGAppsHook3

    wrapGAppsHook4

  ];



  buildInputs = [

    appstream

    dbus

    flatpak

    glib

    granite

    gtk3

    granite7

    gtk4

    json-glib

    libadwaita

    libgee

    libhandy

    libportal-gtk3

    libportal-gtk4

    libsoup_3

    libxml2

    polkit

  ];



  mesonFlags = [

    # We don't have a working nix packagekit backend yet.

    "-Dpackagekit_backend=false"

    "-Dubuntu_drivers_backend=false"

    "-Dpayments=false"

    "-Dcurated=false"

  ];

pkgs/desktops/pantheon/desktop/wingpanel-indicators/datetime/default.nix

+2 −9
Original line number Diff line number Diff line
@@ -5,7 +5,6 @@ 
, substituteAll

, pkg-config

, meson

, python3

, ninja

, vala

, gtk3
@@ -23,13 +22,13 @@ 


stdenv.mkDerivation rec {

  pname = "wingpanel-indicator-datetime";

  version = "2.4.1";

  version = "2.4.2";



  src = fetchFromGitHub {

    owner = "elementary";

    repo = pname;

    rev = version;

    sha256 = "sha256-5hg0TH12bEeEPhUUmZz7vS4YTB6t779CXyOCf0c4/X4=";

    sha256 = "sha256-iR80pF3KUe0WboFm2/f1ZK9/wER2LfmRBd92e8jGTHs=";

  };



  patches = [
@@ -44,7 +43,6 @@ stdenv.mkDerivation rec { 
    meson

    ninja

    pkg-config

    python3

    vala

  ];
@@ -59,11 +57,6 @@ stdenv.mkDerivation rec { 
    wingpanel

  ];



  postPatch = ''

    chmod +x meson/post_install.py

    patchShebangs meson/post_install.py

  '';



  passthru = {

    updateScript = nix-update-script { };

  };

pkgs/desktops/pantheon/desktop/wingpanel-indicators/keyboard/default.nix

+2 −2
Original line number Diff line number Diff line
@@ -19,13 +19,13 @@ 


stdenv.mkDerivation rec {

  pname = "wingpanel-indicator-keyboard";

  version = "2.4.1";

  version = "2.4.2";



  src = fetchFromGitHub {

    owner = "elementary";

    repo = pname;

    rev = version;

    sha256 = "sha256-AmTAl7N+2zYRUgmnuP+S+m0n6nUIihcB5kisWoPPlTQ=";

    sha256 = "sha256-vPQ+Bt7ggeT3Zzsvbie8Wpu3D2WMEIh8GDOI3frnedM=";

  };



  patches = [

pkgs/desktops/pantheon/desktop/wingpanel-indicators/network/default.nix

+4 −2
Original line number Diff line number Diff line
@@ -10,6 +10,7 @@ 
, gtk3

, granite

, networkmanager

, polkit

, libnma

, wingpanel

, libgee
@@ -17,13 +18,13 @@ 


stdenv.mkDerivation rec {

  pname = "wingpanel-indicator-network";

  version = "7.1.0";

  version = "7.1.1";



  src = fetchFromGitHub {

    owner = "elementary";

    repo = pname;

    rev = version;

    sha256 = "sha256-eCWse/rEuAG5YSW+/EOB/aAvikyof0KwbVtLthCGqRQ=";

    sha256 = "sha256-B3loX1yAUQktqNztikUCOHM1DgIu48fMFFol1N4BN7A=";

  };



  nativeBuildInputs = [
@@ -38,6 +39,7 @@ stdenv.mkDerivation rec { 
    gtk3

    libgee

    networkmanager

    polkit

    libnma

    wingpanel

  ];

pkgs/desktops/pantheon/desktop/wingpanel-indicators/nightlight/default.nix

+2 −2
Original line number Diff line number Diff line
@@ -15,13 +15,13 @@ 


stdenv.mkDerivation rec {

  pname = "wingpanel-indicator-nightlight";

  version = "2.1.2";

  version = "2.1.3";



  src = fetchFromGitHub {

    owner = "elementary";

    repo = pname;

    rev = version;

    sha256 = "sha256-2ez7sDCA3cnSNaT3Oe0Mm2MbtSxmkRF/hCklThtHuq0=";

    sha256 = "sha256-77+JGJ0/Y9UJwOuKfJAqjNnmZfBy/YiEwCybx6yoVwM=";

  };



  nativeBuildInputs = [