From 0ab949dc44e4651b02b1d4be05e38cb12ad89ff5 Mon Sep 17 00:00:00 2001 From: Bobby Rong Date: Wed, 14 May 2025 20:47:57 +0800 Subject: [PATCH 1/5] pantheon.gala: 8.1.0 -> 8.2.2 https://github.com/elementary/gala/compare/8.1.0...8.2.2 --- pkgs/desktops/pantheon/desktop/gala/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/desktops/pantheon/desktop/gala/default.nix b/pkgs/desktops/pantheon/desktop/gala/default.nix index f5a1a89121cc..63186bebd97d 100644 --- a/pkgs/desktops/pantheon/desktop/gala/default.nix +++ b/pkgs/desktops/pantheon/desktop/gala/default.nix @@ -29,13 +29,13 @@ stdenv.mkDerivation rec { pname = "gala"; - version = "8.1.0"; + version = "8.2.2"; src = fetchFromGitHub { owner = "elementary"; repo = pname; rev = version; - hash = "sha256-C0Vct2xuGHd/G5x0Faif0DfpyNyCLJDxki+O9697c2s="; + hash = "sha256-S71NryqJjWXZgyBj6q088bdjt/NnAEJ6oeUO2OMJ3Z4="; }; patches = [ From c8243d58592ceed70412fc316d7da3eae8c48f48 Mon Sep 17 00:00:00 2001 From: Bobby Rong Date: Wed, 14 May 2025 20:48:26 +0800 Subject: [PATCH 2/5] pantheon.elementary-dock: 8.0.2 -> 8.1.1 https://github.com/elementary/dock/compare/8.0.2...8.1.1 --- pkgs/desktops/pantheon/apps/elementary-dock/default.nix | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/pkgs/desktops/pantheon/apps/elementary-dock/default.nix b/pkgs/desktops/pantheon/apps/elementary-dock/default.nix index ceae7fc7decf..40cae8d9d62e 100644 --- a/pkgs/desktops/pantheon/apps/elementary-dock/default.nix +++ b/pkgs/desktops/pantheon/apps/elementary-dock/default.nix @@ -18,7 +18,7 @@ stdenv.mkDerivation (finalAttrs: { pname = "elementary-dock"; - version = "8.0.2"; + version = "8.1.1"; outputs = [ "out" @@ -29,7 +29,7 @@ stdenv.mkDerivation (finalAttrs: { owner = "elementary"; repo = "dock"; rev = finalAttrs.version; - hash = "sha256-bixNYpPdWU2FndiCPX7SxNTz2MEttRuj35NaWn3GJrI="; + hash = "sha256-Z6Y/UR6B4tygmetfZq5sOyn5nfq8+CmuR3NpegzCyo8="; }; depsBuildBuild = [ pkg-config ]; @@ -51,6 +51,10 @@ stdenv.mkDerivation (finalAttrs: { wayland ]; + # Fix building with GCC 14 + # https://github.com/elementary/dock/issues/418 + env.NIX_CFLAGS_COMPILE = "-Wno-error=int-conversion"; + passthru = { updateScript = nix-update-script { }; }; From bd552e360ccada4ce21c3aee4868e4ed133877c4 Mon Sep 17 00:00:00 2001 From: Bobby Rong Date: Wed, 14 May 2025 20:48:41 +0800 Subject: [PATCH 3/5] pantheon.switchboard-plug-keyboard: 8.0.1 -> 8.0.2 https://github.com/elementary/switchboard-plug-keyboard/compare/8.0.1...8.0.2 --- .../apps/switchboard-plugs/keyboard/default.nix | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/desktops/pantheon/apps/switchboard-plugs/keyboard/default.nix b/pkgs/desktops/pantheon/apps/switchboard-plugs/keyboard/default.nix index a4f327a67fb0..032758e1fb27 100644 --- a/pkgs/desktops/pantheon/apps/switchboard-plugs/keyboard/default.nix +++ b/pkgs/desktops/pantheon/apps/switchboard-plugs/keyboard/default.nix @@ -25,18 +25,18 @@ stdenv.mkDerivation rec { pname = "switchboard-plug-keyboard"; - version = "8.0.1"; + version = "8.0.2"; src = fetchFromGitHub { owner = "elementary"; - repo = pname; + repo = "settings-keyboard"; rev = version; - sha256 = "sha256-/jfUftlNL+B4570ajropS7/2fqro380kZzpPwm+A9fA="; + sha256 = "sha256-j2D6NSwHTZQJaHm664fHF4VkcExpYwoq/J3SXus30nw="; }; patches = [ # This will try to install packages with apt. - # https://github.com/elementary/switchboard-plug-keyboard/issues/324 + # https://github.com/elementary/settings-keyboard/issues/324 ./hide-install-unlisted-engines-button.patch (replaceVars ./fix-paths.patch { @@ -71,7 +71,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "Switchboard Keyboard Plug"; - homepage = "https://github.com/elementary/switchboard-plug-keyboard"; + homepage = "https://github.com/elementary/settings-keyboard"; license = licenses.gpl2Plus; platforms = platforms.linux; teams = [ teams.pantheon ]; From 33b0b0752ae4e93b2b735799ca205c6f5ba816de Mon Sep 17 00:00:00 2001 From: Bobby Rong Date: Wed, 14 May 2025 20:48:54 +0800 Subject: [PATCH 4/5] pantheon.elementary-default-settings: 8.0.3 -> 8.1.0 https://github.com/elementary/default-settings/compare/8.0.3...8.1.0 --- .../desktop/elementary-default-settings/default.nix | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/pkgs/desktops/pantheon/desktop/elementary-default-settings/default.nix b/pkgs/desktops/pantheon/desktop/elementary-default-settings/default.nix index f47b34d97a2e..15a269cd84f9 100644 --- a/pkgs/desktops/pantheon/desktop/elementary-default-settings/default.nix +++ b/pkgs/desktops/pantheon/desktop/elementary-default-settings/default.nix @@ -15,13 +15,13 @@ stdenv.mkDerivation rec { pname = "elementary-default-settings"; - version = "8.0.3"; + version = "8.1.0"; src = fetchFromGitHub { owner = "elementary"; repo = "default-settings"; rev = version; - sha256 = "sha256-V8jzebnMD41U0ycu66xIZmssoqrKVS+4L70mqc3GEzg="; + sha256 = "sha256-GUq7kXaidzvqbyeVh4ihcxRqZXOzZO3WMXEe8lf477I="; }; nativeBuildInputs = [ @@ -40,6 +40,9 @@ stdenv.mkDerivation rec { mesonFlags = [ "--sysconfdir=${placeholder "out"}/etc" "-Ddefault-wallpaper=${nixos-artwork.wallpapers.simple-dark-gray.gnomeFilePath}" + # Do not ship elementary OS specific config files. + "-Dapparmor-profiles=false" + "-Dgeoclue=false" ]; postFixup = '' From 813b03125f025c9ea83d0052a02705f21c4ce17f Mon Sep 17 00:00:00 2001 From: Bobby Rong Date: Sat, 17 May 2025 20:57:36 +0800 Subject: [PATCH 5/5] pantheon.switchboard-plug-pantheon-shell: 8.1.0 -> 8.2.0 https://github.com/elementary/switchboard-plug-pantheon-shell/compare/8.1.0...8.2.0 --- .../apps/switchboard-plugs/pantheon-shell/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) 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 6d3c26248385..72b5668cdaee 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.1.0"; + version = "8.2.0"; src = fetchFromGitHub { owner = "elementary"; - repo = pname; + repo = "settings-desktop"; rev = version; - sha256 = "sha256-S6EJGF9jRiCzH0f7WNrbLtAX23fjD/Hzd8YLEzkXesw="; + sha256 = "sha256-TYwiL6+VjfSDiFAlMe482gB8a/OtCYHl5r8gh9Hcvfg="; }; nativeBuildInputs = [ @@ -64,7 +64,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "Switchboard Desktop Plug"; - homepage = "https://github.com/elementary/switchboard-plug-pantheon-shell"; + homepage = "https://github.com/elementary/settings-desktop"; license = licenses.gpl3Plus; platforms = platforms.linux; teams = [ teams.pantheon ];