diff --git a/nixos/modules/services/desktops/gsignond.nix b/nixos/modules/services/desktops/gsignond.nix index c21d3f0aafd8..ef7f3b1e763a 100644 --- a/nixos/modules/services/desktops/gsignond.nix +++ b/nixos/modules/services/desktops/gsignond.nix @@ -5,7 +5,7 @@ let in { - meta.maintainers = lib.teams.pantheon.members; + meta.maintainers = [ ]; ###### interface diff --git a/nixos/modules/services/x11/desktop-managers/pantheon.nix b/nixos/modules/services/x11/desktop-managers/pantheon.nix index 2b707f61da08..14e7e25252de 100644 --- a/nixos/modules/services/x11/desktop-managers/pantheon.nix +++ b/nixos/modules/services/x11/desktop-managers/pantheon.nix @@ -154,8 +154,6 @@ in services.gnome.gnome-keyring.enable = true; services.gvfs.enable = true; services.gnome.rygel.enable = mkDefault true; - services.gsignond.enable = mkDefault true; - services.gsignond.plugins = with pkgs.gsignondPlugins; [ lastfm mail oauth ]; services.udisks2.enable = true; services.upower.enable = config.powerManagement.enable; services.libinput.enable = mkDefault true; diff --git a/pkgs/desktops/pantheon/apps/appcenter/default.nix b/pkgs/desktops/pantheon/apps/appcenter/default.nix index cddec98892f4..eebd9fc55bdc 100644 --- a/pkgs/desktops/pantheon/apps/appcenter/default.nix +++ b/pkgs/desktops/pantheon/apps/appcenter/default.nix @@ -26,13 +26,13 @@ stdenv.mkDerivation rec { pname = "appcenter"; - version = "8.0.0"; + version = "8.0.1"; src = fetchFromGitHub { owner = "elementary"; repo = pname; rev = version; - hash = "sha256-j2S8E/sdtkir3lhN1yg4qOjcvxlriXpapsPuANPqhcc="; + hash = "sha256-1YZ7vtPPTYI4w9zTxXVzmcdDJNOLqFlSRfnxy5aBZTo="; }; nativeBuildInputs = [ diff --git a/pkgs/desktops/pantheon/apps/elementary-feedback/default.nix b/pkgs/desktops/pantheon/apps/elementary-feedback/default.nix index 636a3bf93ddd..10ef5782fb74 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.0"; + version = "8.0.1"; src = fetchFromGitHub { owner = "elementary"; repo = "feedback"; rev = version; - sha256 = "sha256-BW7el8Fc3VPHE8OSb8BaOa+O82lSgsSK64bQolo9xcA="; + sha256 = "sha256-D0x0jKYEB6Bo8ETgVCjgdOItc+VJYlrr8N9lI/Z3eXU="; }; patches = [ diff --git a/pkgs/desktops/pantheon/apps/switchboard-plugs/about/default.nix b/pkgs/desktops/pantheon/apps/switchboard-plugs/about/default.nix index d2fc9ed07eec..be8a879d7288 100644 --- a/pkgs/desktops/pantheon/apps/switchboard-plugs/about/default.nix +++ b/pkgs/desktops/pantheon/apps/switchboard-plugs/about/default.nix @@ -2,7 +2,6 @@ lib, stdenv, fetchFromGitHub, - fetchpatch, nix-update-script, meson, ninja, @@ -12,6 +11,7 @@ libgee, libgtop, libgudev, + libsoup_3, granite7, gtk4, packagekit, @@ -25,24 +25,15 @@ stdenv.mkDerivation rec { pname = "switchboard-plug-about"; - version = "8.0.0"; + version = "8.1.0"; src = fetchFromGitHub { owner = "elementary"; repo = pname; rev = version; - sha256 = "sha256-6b6nuOp4pEufHEmTraSfKpbtPuO3Z9hQJfvKuuyy7as="; + sha256 = "sha256-Z+dhNUGDDLxzPLAaFkvWA+d6YvfM5NayOMu3SKjswLs="; }; - patches = [ - # Fix build with fwupd 2.0.0 - # https://github.com/elementary/switchboard-plug-about/pull/343 - (fetchpatch { - url = "https://github.com/elementary/switchboard-plug-about/commit/6f8ba61cb3d82229e19358ede81b77f66dbb06a2.patch"; - hash = "sha256-E9itq/KGzw36S1dAFoCowa/A2/f6Shx9F379nEIM2qI="; - }) - ]; - nativeBuildInputs = [ meson ninja @@ -60,6 +51,7 @@ stdenv.mkDerivation rec { libgee libgtop libgudev + libsoup_3 packagekit polkit switchboard diff --git a/pkgs/desktops/pantheon/apps/switchboard-plugs/power/default.nix b/pkgs/desktops/pantheon/apps/switchboard-plugs/power/default.nix index 228dfe5cfe60..8c89bae1d427 100644 --- a/pkgs/desktops/pantheon/apps/switchboard-plugs/power/default.nix +++ b/pkgs/desktops/pantheon/apps/switchboard-plugs/power/default.nix @@ -21,13 +21,13 @@ stdenv.mkDerivation rec { pname = "switchboard-plug-power"; - version = "8.0.0"; + version = "8.0.1"; src = fetchFromGitHub { owner = "elementary"; repo = pname; rev = version; - sha256 = "sha256-TNwq3APXXnKlYuJ8K/5KRREbGWTC25r1i+vqPJzf0v8="; + sha256 = "sha256-GKZouuWdWl1JDCmzPImeW/hStyFQA6NOAFFmAhiiFe8="; }; nativeBuildInputs = [ diff --git a/pkgs/desktops/pantheon/apps/switchboard-plugs/sharing/default.nix b/pkgs/desktops/pantheon/apps/switchboard-plugs/sharing/default.nix index 2578ce6e3dab..c0e342dd0088 100644 --- a/pkgs/desktops/pantheon/apps/switchboard-plugs/sharing/default.nix +++ b/pkgs/desktops/pantheon/apps/switchboard-plugs/sharing/default.nix @@ -16,13 +16,13 @@ stdenv.mkDerivation rec { pname = "switchboard-plug-sharing"; - version = "8.0.0"; + version = "8.0.1"; src = fetchFromGitHub { owner = "elementary"; repo = pname; rev = version; - sha256 = "sha256-0XfXxN1hI1Qak0J43lnNA/D0suqeKbYLjo+a+Peu6Us="; + sha256 = "sha256-BWlQrM13gI6FXoqfOKoeqtE1+HVBUB09NDatGraTYtY="; }; nativeBuildInputs = [ diff --git a/pkgs/desktops/pantheon/default.nix b/pkgs/desktops/pantheon/default.nix index cde3255eb46f..f22a11cd7d7b 100644 --- a/pkgs/desktops/pantheon/default.nix +++ b/pkgs/desktops/pantheon/default.nix @@ -111,9 +111,11 @@ lib.makeScope pkgs.newScope (self: with self; { #### LIBRARIES - granite = callPackage ./granite { }; + granite = callPackage ./libraries/granite { }; - granite7 = callPackage ./granite/7 { }; + granite7 = callPackage ./libraries/granite/7 { }; + + pantheon-wayland = callPackage ./libraries/pantheon-wayland { }; #### SERVICES diff --git a/pkgs/desktops/pantheon/granite/7/default.nix b/pkgs/desktops/pantheon/libraries/granite/7/default.nix similarity index 100% rename from pkgs/desktops/pantheon/granite/7/default.nix rename to pkgs/desktops/pantheon/libraries/granite/7/default.nix diff --git a/pkgs/desktops/pantheon/granite/default.nix b/pkgs/desktops/pantheon/libraries/granite/default.nix similarity index 100% rename from pkgs/desktops/pantheon/granite/default.nix rename to pkgs/desktops/pantheon/libraries/granite/default.nix diff --git a/pkgs/desktops/pantheon/libraries/pantheon-wayland/default.nix b/pkgs/desktops/pantheon/libraries/pantheon-wayland/default.nix new file mode 100644 index 000000000000..e3977713aa1e --- /dev/null +++ b/pkgs/desktops/pantheon/libraries/pantheon-wayland/default.nix @@ -0,0 +1,59 @@ +{ + stdenv, + lib, + fetchFromGitHub, + gobject-introspection, + meson, + ninja, + pkg-config, + vala, + wayland-scanner, + glib, + gtk4, + nix-update-script, +}: + +stdenv.mkDerivation (finalAttrs: { + pname = "pantheon-wayland"; + version = "1.0.0"; + + src = fetchFromGitHub { + owner = "elementary"; + repo = "pantheon-wayland"; + rev = finalAttrs.version; + hash = "sha256-UKGgz3G960dPmcDaFwLjDy55x+mDPdQQv2Ejs7BujLg="; + }; + + outputs = [ + "out" + "dev" + ]; + + depsBuildBuild = [ pkg-config ]; + + nativeBuildInputs = [ + gobject-introspection + meson + ninja + pkg-config + vala + wayland-scanner + ]; + + propagatedBuildInputs = [ + glib + gtk4 + ]; + + passthru = { + updateScript = nix-update-script { }; + }; + + meta = { + description = "Wayland integration library to the Pantheon Desktop"; + homepage = "https://github.com/elementary/pantheon-wayland"; + license = lib.licenses.lgpl3Plus; + maintainers = lib.teams.pantheon.members; + platforms = lib.platforms.linux; + }; +}) diff --git a/pkgs/desktops/pantheon/services/elementary-bluetooth-daemon/default.nix b/pkgs/desktops/pantheon/services/elementary-bluetooth-daemon/default.nix index 3cf021affcd2..5945fa4c798e 100644 --- a/pkgs/desktops/pantheon/services/elementary-bluetooth-daemon/default.nix +++ b/pkgs/desktops/pantheon/services/elementary-bluetooth-daemon/default.nix @@ -14,13 +14,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "elementary-bluetooth-daemon"; - version = "1.0.0"; + version = "1.0.1"; src = fetchFromGitHub { owner = "elementary"; repo = "bluetooth-daemon"; rev = finalAttrs.version; - hash = "sha256-09udSmd51l7zPe83RBg+AihpwsELclEF+Jn+5DKdJUI="; + hash = "sha256-XRskwLtQKlG96fpIxNZKWG7kn3HR0ngjAUwyn7fnxdY="; }; nativeBuildInputs = [ diff --git a/pkgs/desktops/pantheon/services/elementary-capnet-assist/default.nix b/pkgs/desktops/pantheon/services/elementary-capnet-assist/default.nix index d0447169ef83..797c57dee9d9 100644 --- a/pkgs/desktops/pantheon/services/elementary-capnet-assist/default.nix +++ b/pkgs/desktops/pantheon/services/elementary-capnet-assist/default.nix @@ -18,13 +18,13 @@ stdenv.mkDerivation rec { pname = "elementary-capnet-assist"; - version = "8.0.0"; + version = "8.0.1"; src = fetchFromGitHub { owner = "elementary"; repo = "capnet-assist"; rev = version; - sha256 = "sha256-xYywiI8hFjS7ODEhLGVwrlAY8I0pvUHfg6UkDhUsglU="; + sha256 = "sha256-u+JYJ5J5Cx27MrVlhh6AXAtpKGw7Kf1+MyJEEHqgod0="; }; nativeBuildInputs = [ diff --git a/pkgs/desktops/pantheon/services/elementary-settings-daemon/default.nix b/pkgs/desktops/pantheon/services/elementary-settings-daemon/default.nix index 3252834c8433..5d2052b055f7 100644 --- a/pkgs/desktops/pantheon/services/elementary-settings-daemon/default.nix +++ b/pkgs/desktops/pantheon/services/elementary-settings-daemon/default.nix @@ -2,7 +2,6 @@ lib, stdenv, fetchFromGitHub, - fetchpatch, nix-update-script, meson, ninja, @@ -27,24 +26,15 @@ stdenv.mkDerivation rec { pname = "elementary-settings-daemon"; - version = "8.1.0"; + version = "8.1.1"; src = fetchFromGitHub { owner = "elementary"; repo = "settings-daemon"; rev = version; - sha256 = "sha256-w5dRQPRsM52wqusTLLPmKmVwoBFS+pHOokfDmCDxVWM="; + sha256 = "sha256-HOmV3RBVn8xah/Bzt7OOXVE145uwn1SEFzvcVSLMHtE="; }; - patches = [ - # Fix build with fwupd 2.0.0 - # https://github.com/elementary/settings-daemon/pull/169 - (fetchpatch { - url = "https://github.com/elementary/settings-daemon/commit/f9f9e6c49ef89451ad45aa8314769a0358a5e481.patch"; - hash = "sha256-zLONUqRwODK3JXaoymztEfOIJONJpwcTp5AWv0Vl+EI="; - }) - ]; - nativeBuildInputs = [ desktop-file-utils gobject-introspection