diff --git a/pkgs/desktops/pantheon/apps/elementary-calendar/default.nix b/pkgs/desktops/pantheon/apps/elementary-calendar/default.nix index c537825a4c87..9c763e477993 100644 --- a/pkgs/desktops/pantheon/apps/elementary-calendar/default.nix +++ b/pkgs/desktops/pantheon/apps/elementary-calendar/default.nix @@ -24,13 +24,13 @@ stdenv.mkDerivation rec { pname = "elementary-calendar"; - version = "8.0.0"; + version = "8.0.1"; src = fetchFromGitHub { owner = "elementary"; repo = "calendar"; - rev = version; - sha256 = "sha256-gBQfrRSaw3TKcsSAQh/hcTpBoEQstGdLbppoZ1/Z1q8="; + tag = version; + hash = "sha256-kkdz82eCc9dKemUtCaz9OUObeICU5W1Ino4JNUvmhAw="; }; nativeBuildInputs = [ diff --git a/pkgs/desktops/pantheon/apps/elementary-feedback/default.nix b/pkgs/desktops/pantheon/apps/elementary-feedback/default.nix index 37868bf85613..7613602ec31c 100644 --- a/pkgs/desktops/pantheon/apps/elementary-feedback/default.nix +++ b/pkgs/desktops/pantheon/apps/elementary-feedback/default.nix @@ -18,13 +18,13 @@ stdenv.mkDerivation rec { pname = "elementary-feedback"; - version = "8.0.1"; + version = "8.1.0"; src = fetchFromGitHub { owner = "elementary"; repo = "feedback"; - rev = version; - sha256 = "sha256-D0x0jKYEB6Bo8ETgVCjgdOItc+VJYlrr8N9lI/Z3eXU="; + tag = version; + hash = "sha256-FvlSfcP/Qdo9zBFm2XiEqaxYGILe4BCNPyCELS43pew="; }; patches = [ diff --git a/pkgs/desktops/pantheon/apps/elementary-feedback/fix-metadata-path.patch b/pkgs/desktops/pantheon/apps/elementary-feedback/fix-metadata-path.patch index cc56b7e0d035..f4f00ba6bec5 100644 --- a/pkgs/desktops/pantheon/apps/elementary-feedback/fix-metadata-path.patch +++ b/pkgs/desktops/pantheon/apps/elementary-feedback/fix-metadata-path.patch @@ -1,20 +1,12 @@ diff --git a/src/MainWindow.vala b/src/MainWindow.vala -index 14b0701..13638a5 100644 +index 8f407bf..32db5fb 100644 --- a/src/MainWindow.vala +++ b/src/MainWindow.vala -@@ -82,6 +82,7 @@ public class Feedback.MainWindow : Gtk.ApplicationWindow { +@@ -124,6 +124,7 @@ public class Feedback.MainWindow : Gtk.ApplicationWindow { AppStream.PoolFlags.LOAD_FLATPAK | AppStream.PoolFlags.RESOLVE_ADDONS ); + appstream_pool.add_extra_data_location ("/run/current-system/sw/share/metainfo/", AppStream.FormatStyle.METAINFO); - #else - appstream_pool.clear_metadata_locations (); - // flatpak's appstream files exists only inside they sandbox -@@ -89,6 +90,7 @@ public class Feedback.MainWindow : Gtk.ApplicationWindow { - foreach (var app in app_entries) { - appstream_pool.add_metadata_location (appdata_dir.printf (app)); - } -+ appstream_pool.add_metadata_location ("/run/current-system/sw/share/metainfo/"); - #endif - try { + appstream_pool.load_async.begin (null, (obj, res) => { + try { diff --git a/pkgs/desktops/pantheon/apps/sideload/default.nix b/pkgs/desktops/pantheon/apps/sideload/default.nix index e45664e658d6..938dcd045a4b 100644 --- a/pkgs/desktops/pantheon/apps/sideload/default.nix +++ b/pkgs/desktops/pantheon/apps/sideload/default.nix @@ -19,13 +19,13 @@ stdenv.mkDerivation rec { pname = "sideload"; - version = "6.3.0"; + version = "6.3.1"; src = fetchFromGitHub { owner = "elementary"; repo = "sideload"; - rev = version; - sha256 = "sha256-2tYdcHx77XN2iu2PKXAKwOtb4TOFt3Igv17w2zIxqT4="; + tag = version; + hash = "sha256-mFaMKY4SdnSdRsHy5vIbJFdMx2FGxYCWmSAWkb99yUI="; }; nativeBuildInputs = [ diff --git a/pkgs/desktops/pantheon/apps/switchboard-plugs/about/default.nix b/pkgs/desktops/pantheon/apps/switchboard-plugs/about/default.nix index fe14c2553960..4e9c55aeed5d 100644 --- a/pkgs/desktops/pantheon/apps/switchboard-plugs/about/default.nix +++ b/pkgs/desktops/pantheon/apps/switchboard-plugs/about/default.nix @@ -27,13 +27,13 @@ stdenv.mkDerivation rec { pname = "switchboard-plug-about"; - version = "8.2.1"; + version = "8.2.2"; src = fetchFromGitHub { owner = "elementary"; - repo = "switchboard-plug-about"; - rev = version; - sha256 = "sha256-H4BDLP3yzQi+ougpvBvnv1R1TImzUjSOVDGbOqw9hvg="; + repo = "settings-system"; + tag = version; + hash = "sha256-SPFCBsk4tVR+5Q6uuDG/fTIn+4TXdeAobfQxkmxMiW0="; }; nativeBuildInputs = [ @@ -68,7 +68,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "Switchboard About Plug"; - homepage = "https://github.com/elementary/switchboard-plug-about"; + homepage = "https://github.com/elementary/settings-system"; license = licenses.gpl3Plus; platforms = platforms.linux; teams = [ teams.pantheon ]; diff --git a/pkgs/desktops/pantheon/apps/switchboard-plugs/mouse-touchpad/default.nix b/pkgs/desktops/pantheon/apps/switchboard-plugs/mouse-touchpad/default.nix index 9c8d0274dec2..3c7613cf34a0 100644 --- a/pkgs/desktops/pantheon/apps/switchboard-plugs/mouse-touchpad/default.nix +++ b/pkgs/desktops/pantheon/apps/switchboard-plugs/mouse-touchpad/default.nix @@ -22,13 +22,13 @@ stdenv.mkDerivation rec { pname = "switchboard-plug-mouse-touchpad"; - version = "8.0.2"; + version = "8.0.3"; src = fetchFromGitHub { owner = "elementary"; - repo = "switchboard-plug-mouse-touchpad"; - rev = version; - sha256 = "sha256-332y3D3T90G6bDVacRm3a1p4mLK3vsW8sBvre5lW/mk="; + repo = "settings-mouse-touchpad"; + tag = version; + hash = "sha256-Txm6iVwhuqfLrmAVgXeNB0p6PVEenvSSHurMrXoeHoY="; }; patches = [ @@ -63,7 +63,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "Switchboard Mouse & Touchpad Plug"; - homepage = "https://github.com/elementary/switchboard-plug-mouse-touchpad"; + homepage = "https://github.com/elementary/settings-mouse-touchpad"; license = licenses.gpl3Plus; platforms = platforms.linux; teams = [ teams.pantheon ]; diff --git a/pkgs/desktops/pantheon/apps/switchboard-plugs/notifications/default.nix b/pkgs/desktops/pantheon/apps/switchboard-plugs/notifications/default.nix index 47e52524b0f2..d7f776ba971e 100644 --- a/pkgs/desktops/pantheon/apps/switchboard-plugs/notifications/default.nix +++ b/pkgs/desktops/pantheon/apps/switchboard-plugs/notifications/default.nix @@ -19,13 +19,13 @@ stdenv.mkDerivation rec { pname = "switchboard-plug-notifications"; - version = "8.0.0"; + version = "8.0.1"; src = fetchFromGitHub { owner = "elementary"; - repo = "switchboard-plug-notifications"; - rev = version; - sha256 = "sha256-53rpnp1RWdPofY00XWKiz8WDPC7RNMaGQFHBDzjsIt4="; + repo = "settings-notifications"; + tag = version; + hash = "sha256-MYvSru/78jMhc1Rk8YuztajEdmRRssCFN7IMUHWzW78="; }; nativeBuildInputs = [ @@ -52,7 +52,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "Switchboard Notifications Plug"; - homepage = "https://github.com/elementary/switchboard-plug-notifications"; + homepage = "https://github.com/elementary/settings-notifications"; license = licenses.gpl2Plus; platforms = platforms.linux; teams = [ teams.pantheon ]; diff --git a/pkgs/desktops/pantheon/apps/switchboard-plugs/pantheon-shell/default.nix b/pkgs/desktops/pantheon/apps/switchboard-plugs/pantheon-shell/default.nix index 72b5668cdaee..40c853c35cfe 100644 --- a/pkgs/desktops/pantheon/apps/switchboard-plugs/pantheon-shell/default.nix +++ b/pkgs/desktops/pantheon/apps/switchboard-plugs/pantheon-shell/default.nix @@ -25,13 +25,13 @@ stdenv.mkDerivation rec { pname = "switchboard-plug-pantheon-shell"; - version = "8.2.0"; + version = "8.2.1"; src = fetchFromGitHub { owner = "elementary"; repo = "settings-desktop"; - rev = version; - sha256 = "sha256-TYwiL6+VjfSDiFAlMe482gB8a/OtCYHl5r8gh9Hcvfg="; + tag = version; + hash = "sha256-8NPMZfOQIZtMiGrsFXYPOwNbPU+d9CgPBsT36VJsvHw="; }; nativeBuildInputs = [ diff --git a/pkgs/desktops/pantheon/apps/switchboard-plugs/printers/default.nix b/pkgs/desktops/pantheon/apps/switchboard-plugs/printers/default.nix index 1b948098b82e..83b0ae0826d3 100644 --- a/pkgs/desktops/pantheon/apps/switchboard-plugs/printers/default.nix +++ b/pkgs/desktops/pantheon/apps/switchboard-plugs/printers/default.nix @@ -18,13 +18,13 @@ stdenv.mkDerivation rec { pname = "switchboard-plug-printers"; - version = "8.0.1"; + version = "8.0.2"; src = fetchFromGitHub { owner = "elementary"; - repo = "switchboard-plug-printers"; - rev = version; - sha256 = "sha256-1znz8B4CGQGDiJC4Mt61XAh9wWAV8J0+K3AIpFcffXQ="; + repo = "settings-printers"; + tag = version; + hash = "sha256-oqdmARZamTbMwpKKmyVZflYLCd0Qf5iE5lHSMfdPGA8="; }; nativeBuildInputs = [ @@ -50,7 +50,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "Switchboard Printers Plug"; - homepage = "https://github.com/elementary/switchboard-plug-printers"; + homepage = "https://github.com/elementary/settings-printers"; license = licenses.gpl3Plus; platforms = platforms.linux; teams = [ teams.pantheon ]; diff --git a/pkgs/desktops/pantheon/apps/switchboard-plugs/security-privacy/default.nix b/pkgs/desktops/pantheon/apps/switchboard-plugs/security-privacy/default.nix index a7a1dae6c70e..51d8af92db2d 100644 --- a/pkgs/desktops/pantheon/apps/switchboard-plugs/security-privacy/default.nix +++ b/pkgs/desktops/pantheon/apps/switchboard-plugs/security-privacy/default.nix @@ -22,13 +22,13 @@ stdenv.mkDerivation rec { pname = "switchboard-plug-security-privacy"; - version = "8.0.1"; + version = "8.0.2"; src = fetchFromGitHub { owner = "elementary"; - repo = "switchboard-plug-security-privacy"; - rev = version; - sha256 = "sha256-k6dSiiBqqbhH7rmhpBu83LX8at/qJ4gkrg4Xc+VbkIE="; + repo = "settings-security-privacy"; + tag = version; + hash = "sha256-OlLeeS0b4IMCvOMyHlIRaQl11ivn4Y2+vYdXOzIlvaw="; }; nativeBuildInputs = [ @@ -58,7 +58,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "Switchboard Security & Privacy Plug"; - homepage = "https://github.com/elementary/switchboard-plug-security-privacy"; + homepage = "https://github.com/elementary/settings-security-privacy"; license = licenses.gpl3Plus; platforms = platforms.linux; teams = [ teams.pantheon ];