From fa2aacff8ca15903f33fba6290bd7c7baa92ecf9 Mon Sep 17 00:00:00 2001 From: Bobby Rong Date: Thu, 1 Aug 2024 21:05:19 +0800 Subject: [PATCH 1/5] pantheon.appcenter: 7.4.0-unstable-2024-02-07 -> 8.0.0 https://github.com/elementary/appcenter/compare/fce55d9373bfb82953191b32e276a2129ffcb8c1...8.0.0 --- .../pantheon/apps/appcenter/default.nix | 71 +++++++++---------- 1 file changed, 34 insertions(+), 37 deletions(-) diff --git a/pkgs/desktops/pantheon/apps/appcenter/default.nix b/pkgs/desktops/pantheon/apps/appcenter/default.nix index 053a8ff4ae3b..cddec98892f4 100644 --- a/pkgs/desktops/pantheon/apps/appcenter/default.nix +++ b/pkgs/desktops/pantheon/apps/appcenter/default.nix @@ -1,69 +1,66 @@ -{ 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" ]; From 3e74d14b0a990ea21d04b14f417e2f11396d8da1 Mon Sep 17 00:00:00 2001 From: Bobby Rong Date: Thu, 22 Aug 2024 23:03:51 +0800 Subject: [PATCH 2/5] pantheon.wingpanel-indicator-datetime: 2.4.1 -> 2.4.2 https://github.com/elementary/wingpanel-indicator-datetime/compare/2.4.1...2.4.2 --- .../desktop/wingpanel-indicators/datetime/default.nix | 11 ++--------- 1 file changed, 2 insertions(+), 9 deletions(-) diff --git a/pkgs/desktops/pantheon/desktop/wingpanel-indicators/datetime/default.nix b/pkgs/desktops/pantheon/desktop/wingpanel-indicators/datetime/default.nix index 1fdd91a79945..c9e8de572ed4 100644 --- a/pkgs/desktops/pantheon/desktop/wingpanel-indicators/datetime/default.nix +++ b/pkgs/desktops/pantheon/desktop/wingpanel-indicators/datetime/default.nix @@ -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 { }; }; From 551735b16e9ae4d779c9a1e24a512137b51888dd Mon Sep 17 00:00:00 2001 From: Bobby Rong Date: Thu, 22 Aug 2024 23:04:58 +0800 Subject: [PATCH 3/5] pantheon.wingpanel-indicator-keyboard: 2.4.1 -> 2.4.2 https://github.com/elementary/wingpanel-indicator-keyboard/compare/2.4.1...2.4.2 --- .../desktop/wingpanel-indicators/keyboard/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/desktops/pantheon/desktop/wingpanel-indicators/keyboard/default.nix b/pkgs/desktops/pantheon/desktop/wingpanel-indicators/keyboard/default.nix index 9cdc3e0000b3..a714b1de065d 100644 --- a/pkgs/desktops/pantheon/desktop/wingpanel-indicators/keyboard/default.nix +++ b/pkgs/desktops/pantheon/desktop/wingpanel-indicators/keyboard/default.nix @@ -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 = [ From 22df830519635d3503dce5e030306a6ac65529b4 Mon Sep 17 00:00:00 2001 From: Bobby Rong Date: Thu, 22 Aug 2024 23:06:21 +0800 Subject: [PATCH 4/5] pantheon.wingpanel-indicator-nightlight: 2.1.2 -> 2.1.3 https://github.com/elementary/wingpanel-indicator-nightlight/compare/2.1.2...2.1.3 --- .../desktop/wingpanel-indicators/nightlight/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/desktops/pantheon/desktop/wingpanel-indicators/nightlight/default.nix b/pkgs/desktops/pantheon/desktop/wingpanel-indicators/nightlight/default.nix index 83138f856353..ca7459d07dfe 100644 --- a/pkgs/desktops/pantheon/desktop/wingpanel-indicators/nightlight/default.nix +++ b/pkgs/desktops/pantheon/desktop/wingpanel-indicators/nightlight/default.nix @@ -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 = [ From fb105c395e0e3265bb6be276c1fb5a73a1ab8d57 Mon Sep 17 00:00:00 2001 From: Bobby Rong Date: Thu, 22 Aug 2024 23:07:41 +0800 Subject: [PATCH 5/5] pantheon.wingpanel-indicator-network: 7.1.0 -> 7.1.1 https://github.com/elementary/wingpanel-indicator-network/compare/7.1.0...7.1.1 --- .../desktop/wingpanel-indicators/network/default.nix | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/pkgs/desktops/pantheon/desktop/wingpanel-indicators/network/default.nix b/pkgs/desktops/pantheon/desktop/wingpanel-indicators/network/default.nix index 1f3b40097dde..dcb30a6a2d5b 100644 --- a/pkgs/desktops/pantheon/desktop/wingpanel-indicators/network/default.nix +++ b/pkgs/desktops/pantheon/desktop/wingpanel-indicators/network/default.nix @@ -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 ];