diff options
Diffstat (limited to 'pkgs/desktops/pantheon')
36 files changed, 121 insertions, 234 deletions
diff --git a/pkgs/desktops/pantheon/apps/appcenter/default.nix b/pkgs/desktops/pantheon/apps/appcenter/default.nix index bf99163a54144..053a8ff4ae3bb 100644 --- a/pkgs/desktops/pantheon/apps/appcenter/default.nix +++ b/pkgs/desktops/pantheon/apps/appcenter/default.nix @@ -19,7 +19,7 @@ , pkg-config , vala , polkit -, wrapGAppsHook +, wrapGAppsHook3 }: stdenv.mkDerivation rec { @@ -42,7 +42,7 @@ stdenv.mkDerivation rec { ninja pkg-config vala - wrapGAppsHook + wrapGAppsHook3 ]; buildInputs = [ @@ -74,7 +74,7 @@ stdenv.mkDerivation rec { meta = with lib; { homepage = "https://github.com/elementary/appcenter"; - description = "An open, pay-what-you-want app store for indie developers, designed for elementary OS"; + description = "Open, pay-what-you-want app store for indie developers, designed for elementary OS"; license = licenses.gpl3Plus; platforms = platforms.linux; maintainers = teams.pantheon.members; diff --git a/pkgs/desktops/pantheon/apps/elementary-calculator/default.nix b/pkgs/desktops/pantheon/apps/elementary-calculator/default.nix index dda264380dbc8..12857b8946a7a 100644 --- a/pkgs/desktops/pantheon/apps/elementary-calculator/default.nix +++ b/pkgs/desktops/pantheon/apps/elementary-calculator/default.nix @@ -16,13 +16,13 @@ stdenv.mkDerivation rec { pname = "elementary-calculator"; - version = "2.0.3"; + version = "8.0.0"; src = fetchFromGitHub { owner = "elementary"; repo = "calculator"; rev = version; - sha256 = "sha256-VPxCW2lVA/nS2aJsjLgkuEM9wnAzyEr864XY8tfLQAY="; + sha256 = "sha256-QEs83hSv9Kupj2p/OTnuPZsC8tdm+IqgpeObBVrPRas="; }; nativeBuildInputs = [ diff --git a/pkgs/desktops/pantheon/apps/elementary-calendar/default.nix b/pkgs/desktops/pantheon/apps/elementary-calendar/default.nix index 4f50def6cbd61..24deffaa01ec7 100644 --- a/pkgs/desktops/pantheon/apps/elementary-calendar/default.nix +++ b/pkgs/desktops/pantheon/apps/elementary-calendar/default.nix @@ -7,7 +7,7 @@ , pkg-config , python3 , vala -, wrapGAppsHook +, wrapGAppsHook3 , clutter , evolution-data-server , folks @@ -39,7 +39,7 @@ stdenv.mkDerivation rec { pkg-config python3 vala - wrapGAppsHook + wrapGAppsHook3 ]; buildInputs = [ diff --git a/pkgs/desktops/pantheon/apps/elementary-camera/default.nix b/pkgs/desktops/pantheon/apps/elementary-camera/default.nix index b1bb55f1d39b4..7b0747407e9a3 100644 --- a/pkgs/desktops/pantheon/apps/elementary-camera/default.nix +++ b/pkgs/desktops/pantheon/apps/elementary-camera/default.nix @@ -7,7 +7,7 @@ , pkg-config , python3 , vala -, wrapGAppsHook +, wrapGAppsHook3 , glib , granite , gst_all_1 @@ -34,7 +34,7 @@ stdenv.mkDerivation rec { pkg-config python3 vala - wrapGAppsHook + wrapGAppsHook3 ]; buildInputs = [ diff --git a/pkgs/desktops/pantheon/apps/elementary-code/default.nix b/pkgs/desktops/pantheon/apps/elementary-code/default.nix index 9ecf59d2db6fc..d9837b83676ea 100644 --- a/pkgs/desktops/pantheon/apps/elementary-code/default.nix +++ b/pkgs/desktops/pantheon/apps/elementary-code/default.nix @@ -9,7 +9,7 @@ , pkg-config , polkit , vala -, wrapGAppsHook +, wrapGAppsHook3 , editorconfig-core-c , granite , gtk3 @@ -43,7 +43,7 @@ stdenv.mkDerivation rec { pkg-config polkit # needed for ITS rules vala - wrapGAppsHook + wrapGAppsHook3 ]; buildInputs = [ diff --git a/pkgs/desktops/pantheon/apps/elementary-dock/default.nix b/pkgs/desktops/pantheon/apps/elementary-dock/default.nix index b564060d06bf8..17c0e12969eb3 100644 --- a/pkgs/desktops/pantheon/apps/elementary-dock/default.nix +++ b/pkgs/desktops/pantheon/apps/elementary-dock/default.nix @@ -19,7 +19,7 @@ , libdbusmenu-gtk3 , gnome-menus , libgee -, wrapGAppsHook +, wrapGAppsHook3 , meson , ninja , granite @@ -44,7 +44,7 @@ stdenv.mkDerivation rec { libxml2 # xmllint pkg-config vala - wrapGAppsHook + wrapGAppsHook3 ]; buildInputs = [ diff --git a/pkgs/desktops/pantheon/apps/elementary-files/default.nix b/pkgs/desktops/pantheon/apps/elementary-files/default.nix index a77e440bfe392..04711a791463b 100644 --- a/pkgs/desktops/pantheon/apps/elementary-files/default.nix +++ b/pkgs/desktops/pantheon/apps/elementary-files/default.nix @@ -19,7 +19,7 @@ , zeitgeist , libcloudproviders , libgit2-glib -, wrapGAppsHook +, wrapGAppsHook3 , systemd }: @@ -42,7 +42,7 @@ stdenv.mkDerivation rec { ninja pkg-config vala - wrapGAppsHook + wrapGAppsHook3 ]; buildInputs = [ diff --git a/pkgs/desktops/pantheon/apps/elementary-mail/default.nix b/pkgs/desktops/pantheon/apps/elementary-mail/default.nix index ca672cadae9b1..ee4d259d18e1b 100644 --- a/pkgs/desktops/pantheon/apps/elementary-mail/default.nix +++ b/pkgs/desktops/pantheon/apps/elementary-mail/default.nix @@ -5,7 +5,6 @@ , pkg-config , meson , ninja -, python3 , vala , gtk3 , libxml2 @@ -18,19 +17,19 @@ , glib-networking , granite , evolution-data-server -, wrapGAppsHook +, wrapGAppsHook3 , libgee }: stdenv.mkDerivation rec { pname = "elementary-mail"; - version = "7.2.0"; + version = "8.0.0"; src = fetchFromGitHub { owner = "elementary"; repo = "mail"; rev = version; - sha256 = "sha256-hBOogZ9ZNS9KnuNn+jNhTtlupBxZL2DG/CiuBR1kFu0="; + sha256 = "sha256-6T/OTiuDVAPBqp8BPawf/MVEuWTPrLa3/N1Blvt/7Q8="; }; nativeBuildInputs = [ @@ -38,9 +37,8 @@ stdenv.mkDerivation rec { meson ninja pkg-config - python3 vala - wrapGAppsHook + wrapGAppsHook3 ]; buildInputs = [ @@ -56,11 +54,6 @@ stdenv.mkDerivation rec { webkitgtk_4_1 ]; - postPatch = '' - chmod +x meson/post_install.py - patchShebangs meson/post_install.py - ''; - preFixup = '' gappsWrapperArgs+=( # The GTK theme is hardcoded. diff --git a/pkgs/desktops/pantheon/apps/elementary-photos/default.nix b/pkgs/desktops/pantheon/apps/elementary-photos/default.nix index 5170940c91381..8d7a4afb69de2 100644 --- a/pkgs/desktops/pantheon/apps/elementary-photos/default.nix +++ b/pkgs/desktops/pantheon/apps/elementary-photos/default.nix @@ -1,17 +1,16 @@ { lib , stdenv , fetchFromGitHub -, fetchpatch , nix-update-script , meson , ninja , pkg-config , vala -, desktop-file-utils , gtk3 , libexif , libgee , libhandy +, libportal-gtk3 , geocode-glib_2 , gexiv2 , libgphoto2 @@ -22,56 +21,27 @@ , sqlite , python3 , libwebp -, appstream -, wrapGAppsHook +, wrapGAppsHook3 }: stdenv.mkDerivation rec { pname = "elementary-photos"; - version = "2.8.0"; + version = "8.0.0"; src = fetchFromGitHub { owner = "elementary"; repo = "photos"; rev = version; - sha256 = "sha256-VhJggQMy1vk21zNA5pR4uAPGCwnIxLUHVO58AZs+h6s="; + sha256 = "sha256-EULNLtoZ8M68cp1DT11G6O2TONH/0DXWNX0k4AUqa/w="; }; - patches = [ - # The following 5 patches allow building this without webkit2gtk-4.0. - # https://github.com/elementary/photos/pull/743, https://github.com/elementary/photos/pull/746 - (fetchpatch { - url = "https://github.com/elementary/photos/commit/c48f49869bbf44aa37e64c0c1e25aff887783a02.patch"; - hash = "sha256-CeKRONVevJqVEIchgxyPqnM16Y2zUJ1+wnL2jLdJqec="; - }) - (fetchpatch { - url = "https://github.com/elementary/photos/commit/d7a8265ecb562e439d003b61b0823de8348fb10d.patch"; - hash = "sha256-6M3t0l8BUhoaowUSfaiz6xjQBHliO13i+qi5cgfEY04="; - }) - (fetchpatch { - url = "https://github.com/elementary/photos/commit/d8e13e8e803ed7ab1bd23527866567d998744f57.patch"; - hash = "sha256-BGBDIHR5iYtd+rJG9sur1oWa4FK/lF0vLdjyPbyNbdU="; - }) - (fetchpatch { - url = "https://github.com/elementary/photos/commit/075f983a65e9c6d4e80ee07f0c05309badef526a.patch"; - excludes = [ ".github/workflows/ci.yml" ]; - hash = "sha256-QOtssVwwHxFdtfhcVyaN33LMZdOkg/DoAC+UAbrkmDk="; - }) - (fetchpatch { - url = "https://github.com/elementary/photos/commit/ea11cf23db6945df6cc3495fd698456054389371.patch"; - hash = "sha256-4a/CRx7Dmyyda6SUr0QF++R73v7FBzjXfyxvspynnG0="; - }) - ]; - nativeBuildInputs = [ - appstream - desktop-file-utils meson ninja pkg-config python3 vala - wrapGAppsHook + wrapGAppsHook3 ]; buildInputs = [ @@ -84,6 +54,7 @@ stdenv.mkDerivation rec { libgphoto2 libgudev libhandy + libportal-gtk3 libraw libwebp sqlite diff --git a/pkgs/desktops/pantheon/apps/elementary-screenshot/default.nix b/pkgs/desktops/pantheon/apps/elementary-screenshot/default.nix index 1ac5d6979ebb2..f8ca0fe62cd7b 100644 --- a/pkgs/desktops/pantheon/apps/elementary-screenshot/default.nix +++ b/pkgs/desktops/pantheon/apps/elementary-screenshot/default.nix @@ -13,7 +13,7 @@ , libgee , libhandy , libcanberra -, wrapGAppsHook +, wrapGAppsHook3 }: stdenv.mkDerivation rec { @@ -34,7 +34,7 @@ stdenv.mkDerivation rec { pkg-config python3 vala - wrapGAppsHook + wrapGAppsHook3 ]; buildInputs = [ diff --git a/pkgs/desktops/pantheon/apps/elementary-tasks/default.nix b/pkgs/desktops/pantheon/apps/elementary-tasks/default.nix index d33242b77df2d..21065a55a2a7c 100644 --- a/pkgs/desktops/pantheon/apps/elementary-tasks/default.nix +++ b/pkgs/desktops/pantheon/apps/elementary-tasks/default.nix @@ -7,7 +7,7 @@ , pkg-config , python3 , vala -, wrapGAppsHook +, wrapGAppsHook3 , clutter-gtk , evolution-data-server , granite @@ -38,7 +38,7 @@ stdenv.mkDerivation rec { pkg-config python3 vala - wrapGAppsHook + wrapGAppsHook3 ]; buildInputs = [ diff --git a/pkgs/desktops/pantheon/apps/elementary-terminal/default.nix b/pkgs/desktops/pantheon/apps/elementary-terminal/default.nix index efa672c71142b..7109b8372b7d5 100644 --- a/pkgs/desktops/pantheon/apps/elementary-terminal/default.nix +++ b/pkgs/desktops/pantheon/apps/elementary-terminal/default.nix @@ -15,7 +15,7 @@ , vte , libgee , pcre2 -, wrapGAppsHook +, wrapGAppsHook3 , xvfb-run }: @@ -37,7 +37,7 @@ stdenv.mkDerivation rec { pkg-config python3 vala - wrapGAppsHook + wrapGAppsHook3 xvfb-run ]; diff --git a/pkgs/desktops/pantheon/apps/elementary-videos/default.nix b/pkgs/desktops/pantheon/apps/elementary-videos/default.nix index 6411971fdb05e..7fb642ce7b7d1 100644 --- a/pkgs/desktops/pantheon/apps/elementary-videos/default.nix +++ b/pkgs/desktops/pantheon/apps/elementary-videos/default.nix @@ -11,7 +11,7 @@ , libgee , libhandy , gst_all_1 -, wrapGAppsHook +, wrapGAppsHook3 }: stdenv.mkDerivation rec { @@ -30,7 +30,7 @@ stdenv.mkDerivation rec { ninja pkg-config vala - wrapGAppsHook + wrapGAppsHook3 ]; buildInputs = [ diff --git a/pkgs/desktops/pantheon/apps/switchboard/default.nix b/pkgs/desktops/pantheon/apps/switchboard/default.nix index f13d90bd088aa..a8a0c34853dca 100644 --- a/pkgs/desktops/pantheon/apps/switchboard/default.nix +++ b/pkgs/desktops/pantheon/apps/switchboard/default.nix @@ -11,7 +11,7 @@ , libgee , libhandy , granite -, wrapGAppsHook +, wrapGAppsHook3 }: stdenv.mkDerivation rec { @@ -31,7 +31,7 @@ stdenv.mkDerivation rec { pkg-config python3 vala - wrapGAppsHook + wrapGAppsHook3 ]; buildInputs = [ diff --git a/pkgs/desktops/pantheon/apps/switchboard/wrapper.nix b/pkgs/desktops/pantheon/apps/switchboard/wrapper.nix index e42df9bee0605..2702b438f0ec2 100644 --- a/pkgs/desktops/pantheon/apps/switchboard/wrapper.nix +++ b/pkgs/desktops/pantheon/apps/switchboard/wrapper.nix @@ -1,4 +1,4 @@ -{ wrapGAppsHook +{ wrapGAppsHook3 , glib , lib , stdenv @@ -32,7 +32,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ glib - wrapGAppsHook + wrapGAppsHook3 ]; buildInputs = lib.forEach selectedPlugs (x: x.buildInputs) diff --git a/pkgs/desktops/pantheon/artwork/elementary-gtk-theme/default.nix b/pkgs/desktops/pantheon/artwork/elementary-gtk-theme/default.nix index f2946f4992028..dbc6b6d060c80 100644 --- a/pkgs/desktops/pantheon/artwork/elementary-gtk-theme/default.nix +++ b/pkgs/desktops/pantheon/artwork/elementary-gtk-theme/default.nix @@ -11,13 +11,13 @@ stdenvNoCC.mkDerivation rec { pname = "elementary-gtk-theme"; - version = "7.3.0"; + version = "8.0.0"; src = fetchFromGitHub { owner = "elementary"; repo = "stylesheet"; rev = version; - sha256 = "sha256-KrpeDQH43n7seeSPVYKETxy1g0JuUowZerjgktLQg/4="; + sha256 = "sha256-O0Zu/ZxVANfWKcCkOF7jeJa3oG1ut56px7jeFK7LdKA="; }; nativeBuildInputs = [ diff --git a/pkgs/desktops/pantheon/artwork/elementary-icon-theme/default.nix b/pkgs/desktops/pantheon/artwork/elementary-icon-theme/default.nix index ff93bb62379d9..8f875620141f4 100644 --- a/pkgs/desktops/pantheon/artwork/elementary-icon-theme/default.nix +++ b/pkgs/desktops/pantheon/artwork/elementary-icon-theme/default.nix @@ -3,7 +3,6 @@ , fetchFromGitHub , nix-update-script , meson -, python3 , ninja , hicolor-icon-theme , gtk3 @@ -13,13 +12,13 @@ stdenvNoCC.mkDerivation rec { pname = "elementary-icon-theme"; - version = "7.3.1"; + version = "8.0.0"; src = fetchFromGitHub { owner = "elementary"; repo = "icons"; rev = version; - sha256 = "sha256-3qvbpY1O8E3sX+66yBoZXEOeWQrgyNu2rOT6PPbli58="; + sha256 = "sha256-EPmQgE33+HBI78SlCBV3WlyLCP6AggvqsQa7gZuOMRM="; }; nativeBuildInputs = [ @@ -27,7 +26,6 @@ stdenvNoCC.mkDerivation rec { librsvg meson ninja - python3 xcursorgen ]; @@ -42,11 +40,6 @@ stdenvNoCC.mkDerivation rec { "-Dpalettes=false" # Don't install gimp and inkscape palette files ]; - postPatch = '' - chmod +x meson/symlink.py - patchShebangs meson/symlink.py - ''; - postFixup = "gtk-update-icon-cache $out/share/icons/elementary"; passthru = { diff --git a/pkgs/desktops/pantheon/artwork/elementary-sound-theme/default.nix b/pkgs/desktops/pantheon/artwork/elementary-sound-theme/default.nix index 69d391f679cf3..7f7279a9df1f0 100644 --- a/pkgs/desktops/pantheon/artwork/elementary-sound-theme/default.nix +++ b/pkgs/desktops/pantheon/artwork/elementary-sound-theme/default.nix @@ -29,7 +29,7 @@ stdenv.mkDerivation rec { }; meta = with lib; { - description = "A set of system sounds for elementary"; + description = "Set of system sounds for elementary"; homepage = "https://github.com/elementary/sound-theme"; license = licenses.unlicense; platforms = platforms.linux; diff --git a/pkgs/desktops/pantheon/default.nix b/pkgs/desktops/pantheon/default.nix index d7bd9c926edea..58a4ba65f1acf 100644 --- a/pkgs/desktops/pantheon/default.nix +++ b/pkgs/desktops/pantheon/default.nix @@ -221,10 +221,8 @@ lib.makeScope pkgs.newScope (self: with self; { ### THIRD-PARTY - # Put packages that ONLY works with Pantheon in pkgs/desktops/pantheon/third-party, - # specifically third party switchboard plugins and wingpanel indicators. - # Please call these packages in pkgs/top-level/all-packages.nix instead of this file. - # https://github.com/NixOS/nixpkgs/issues/115222#issuecomment-906868654 + # As suggested in https://github.com/NixOS/nixpkgs/issues/115222#issuecomment-906868654 + # please avoid putting third-party packages in the `pantheon` scope. }) // lib.optionalAttrs config.allowAliases { diff --git a/pkgs/desktops/pantheon/desktop/elementary-greeter/default.nix b/pkgs/desktops/pantheon/desktop/elementary-greeter/default.nix index c3f31624fff21..f4d7451835f03 100644 --- a/pkgs/desktops/pantheon/desktop/elementary-greeter/default.nix +++ b/pkgs/desktops/pantheon/desktop/elementary-greeter/default.nix @@ -25,7 +25,7 @@ , gdk-pixbuf , dbus , accountsservice -, wrapGAppsHook +, wrapGAppsHook3 }: stdenv.mkDerivation rec { @@ -54,7 +54,7 @@ stdenv.mkDerivation rec { ninja pkg-config vala - wrapGAppsHook + wrapGAppsHook3 ]; buildInputs = [ @@ -72,7 +72,7 @@ stdenv.mkDerivation rec { ]; mesonFlags = [ - # A hook does this but after wrapGAppsHook so the files never get wrapped. + # A hook does this but after wrapGAppsHook3 so the files never get wrapped. "--sbindir=${placeholder "out"}/bin" # baked into the program for discovery of the greeter configuration "--sysconfdir=/etc" diff --git a/pkgs/desktops/pantheon/desktop/elementary-shortcut-overlay/default.nix b/pkgs/desktops/pantheon/desktop/elementary-shortcut-overlay/default.nix index f249a091572b6..5d6e43bf12fb6 100644 --- a/pkgs/desktops/pantheon/desktop/elementary-shortcut-overlay/default.nix +++ b/pkgs/desktops/pantheon/desktop/elementary-shortcut-overlay/default.nix @@ -7,22 +7,26 @@ , ninja , vala , desktop-file-utils +, gala +, gsettings-desktop-schemas , gtk4 , glib +, gnome-settings-daemon , granite7 , libgee +, mutter , wrapGAppsHook4 }: stdenv.mkDerivation rec { pname = "elementary-shortcut-overlay"; - version = "2.0.1"; + version = "8.0.0"; src = fetchFromGitHub { owner = "elementary"; repo = "shortcut-overlay"; rev = version; - sha256 = "sha256-YVeCO7mZmf+FEY4d8tvC76lW/HkOwQ6kw7nvmzAFEtw="; + sha256 = "sha256-HqF2eSNwAzgzwyfNQIeumaGkPYiSc+2OfaD3JRQp4/4="; }; nativeBuildInputs = [ @@ -35,10 +39,14 @@ stdenv.mkDerivation rec { ]; buildInputs = [ + gala # org.pantheon.desktop.gala.keybindings + gsettings-desktop-schemas # org.gnome.desktop.wm.keybindings glib + gnome-settings-daemon # org.gnome.settings-daemon.plugins.media-keys granite7 gtk4 libgee + mutter # org.gnome.mutter.keybindings ]; passthru = { @@ -46,7 +54,7 @@ stdenv.mkDerivation rec { }; meta = with lib; { - description = "A native OS-wide shortcut overlay to be launched by Gala"; + description = "Native OS-wide shortcut overlay to be launched by Gala"; homepage = "https://github.com/elementary/shortcut-overlay"; license = licenses.gpl3Plus; platforms = platforms.linux; diff --git a/pkgs/desktops/pantheon/desktop/file-roller-contract/default.nix b/pkgs/desktops/pantheon/desktop/file-roller-contract/default.nix index c9a24b4906c77..6a2a22ddf83a6 100644 --- a/pkgs/desktops/pantheon/desktop/file-roller-contract/default.nix +++ b/pkgs/desktops/pantheon/desktop/file-roller-contract/default.nix @@ -8,7 +8,7 @@ stdenv.mkDerivation rec { pname = "file-roller-contract"; - version = "unstable-2021-02-22"; + version = "0-unstable-2021-02-22"; src = fetchFromGitHub { owner = "elementary"; diff --git a/pkgs/desktops/pantheon/desktop/gala/default.nix b/pkgs/desktops/pantheon/desktop/gala/default.nix index 3cf8a67e9539b..3864fa39ed494 100644 --- a/pkgs/desktops/pantheon/desktop/gala/default.nix +++ b/pkgs/desktops/pantheon/desktop/gala/default.nix @@ -20,7 +20,7 @@ , mesa , mutter , gnome-settings-daemon -, wrapGAppsHook +, wrapGAppsHook3 , gexiv2 , systemd }: @@ -47,6 +47,13 @@ stdenv.mkDerivation rec { url = "https://github.com/elementary/gala/commit/351722c5a4fded46992b725e03dc94971c5bd31f.patch"; hash = "sha256-RvdVHQjCUNmLrROBZTF+m1vE2XudtQZjk/YW28P/vKc="; }) + + # InternalUtils: Fix window placement + # https://github.com/elementary/gala/pull/1913 + (fetchpatch { + url = "https://github.com/elementary/gala/commit/2d30bee678788c5a853721d16b5b39c997b23c02.patch"; + hash = "sha256-vhGFaLpJZFx1VTfjY1BahQiOUvBPi0dBSXLGhYc7r8A="; + }) ]; nativeBuildInputs = [ @@ -58,7 +65,7 @@ stdenv.mkDerivation rec { pkg-config python3 vala - wrapGAppsHook + wrapGAppsHook3 ]; buildInputs = [ @@ -85,7 +92,7 @@ stdenv.mkDerivation rec { }; meta = with lib; { - description = "A window & compositing manager based on mutter and designed by elementary for use with Pantheon"; + description = "Window & compositing manager based on mutter and designed by elementary for use with Pantheon"; homepage = "https://github.com/elementary/gala"; license = licenses.gpl3Plus; platforms = platforms.linux; diff --git a/pkgs/desktops/pantheon/desktop/wingpanel/default.nix b/pkgs/desktops/pantheon/desktop/wingpanel/default.nix index 8b24dba707c39..3734a0dcc07f9 100644 --- a/pkgs/desktops/pantheon/desktop/wingpanel/default.nix +++ b/pkgs/desktops/pantheon/desktop/wingpanel/default.nix @@ -2,7 +2,7 @@ , stdenv , fetchFromGitHub , nix-update-script -, wrapGAppsHook +, wrapGAppsHook3 , pkg-config , meson , ninja @@ -40,7 +40,7 @@ stdenv.mkDerivation rec { ninja pkg-config vala - wrapGAppsHook + wrapGAppsHook3 ]; buildInputs = [ @@ -69,7 +69,7 @@ stdenv.mkDerivation rec { }; meta = with lib; { - description = "The extensible top panel for Pantheon"; + description = "Extensible top panel for Pantheon"; longDescription = '' Wingpanel is an empty container that accepts indicators as extensions, including the applications menu. diff --git a/pkgs/desktops/pantheon/desktop/wingpanel/wrapper.nix b/pkgs/desktops/pantheon/desktop/wingpanel/wrapper.nix index 89a359a4c9d29..da6d61cd1337f 100644 --- a/pkgs/desktops/pantheon/desktop/wingpanel/wrapper.nix +++ b/pkgs/desktops/pantheon/desktop/wingpanel/wrapper.nix @@ -1,5 +1,5 @@ { lib -, wrapGAppsHook +, wrapGAppsHook3 , glib , stdenv , xorg @@ -30,7 +30,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ glib - wrapGAppsHook + wrapGAppsHook3 ]; buildInputs = lib.forEach selectedIndicators (x: x.buildInputs) diff --git a/pkgs/desktops/pantheon/granite/7/default.nix b/pkgs/desktops/pantheon/granite/7/default.nix index 5abffc0cc6778..2c266b8ab152f 100644 --- a/pkgs/desktops/pantheon/granite/7/default.nix +++ b/pkgs/desktops/pantheon/granite/7/default.nix @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { pname = "granite"; - version = "7.4.0"; + version = "7.5.0"; outputs = [ "out" "dev" ]; @@ -27,7 +27,7 @@ stdenv.mkDerivation rec { owner = "elementary"; repo = pname; rev = version; - sha256 = "sha256-z/6GxWfbsngySv2ziNwzhcEfTamxP1DnJ2ld9fft/1U="; + sha256 = "sha256-mwivme79zsPcS+Ol8iApECjpQz+fYcBLZwkULagXVvI="; }; nativeBuildInputs = [ @@ -59,7 +59,7 @@ stdenv.mkDerivation rec { }; meta = with lib; { - description = "An extension to GTK used by elementary OS"; + description = "Extension to GTK used by elementary OS"; longDescription = '' Granite is a companion library for GTK and GLib. Among other things, it provides complex widgets and convenience functions designed for use in apps built for elementary OS. diff --git a/pkgs/desktops/pantheon/granite/default.nix b/pkgs/desktops/pantheon/granite/default.nix index f817a3017b7a1..52eb6602efff3 100644 --- a/pkgs/desktops/pantheon/granite/default.nix +++ b/pkgs/desktops/pantheon/granite/default.nix @@ -12,7 +12,7 @@ , gettext , gsettings-desktop-schemas , gobject-introspection -, wrapGAppsHook +, wrapGAppsHook3 }: stdenv.mkDerivation rec { @@ -36,7 +36,7 @@ stdenv.mkDerivation rec { pkg-config python3 vala - wrapGAppsHook + wrapGAppsHook3 ]; propagatedBuildInputs = [ @@ -52,7 +52,7 @@ stdenv.mkDerivation rec { ''; meta = with lib; { - description = "An extension to GTK used by elementary OS"; + description = "Extension to GTK used by elementary OS"; longDescription = '' Granite is a companion library for GTK and GLib. Among other things, it provides complex widgets and convenience functions designed for use in apps built for elementary OS. diff --git a/pkgs/desktops/pantheon/services/contractor/default.nix b/pkgs/desktops/pantheon/services/contractor/default.nix index f4ce10df84ccf..eed8755143c6c 100644 --- a/pkgs/desktops/pantheon/services/contractor/default.nix +++ b/pkgs/desktops/pantheon/services/contractor/default.nix @@ -11,7 +11,7 @@ , libgee , dbus , glib-networking -, wrapGAppsHook +, wrapGAppsHook3 }: stdenv.mkDerivation rec { @@ -32,7 +32,7 @@ stdenv.mkDerivation rec { pkg-config python3 vala - wrapGAppsHook + wrapGAppsHook3 ]; buildInputs = [ @@ -48,7 +48,7 @@ stdenv.mkDerivation rec { }; meta = with lib; { - description = "A desktop-wide extension service used by elementary OS"; + description = "Desktop-wide extension service used by elementary OS"; homepage = "https://github.com/elementary/contractor"; license = licenses.gpl3Plus; platforms = platforms.linux; diff --git a/pkgs/desktops/pantheon/services/elementary-capnet-assist/default.nix b/pkgs/desktops/pantheon/services/elementary-capnet-assist/default.nix index 4b88ea3e5abd0..62bf5c5b8dee6 100644 --- a/pkgs/desktops/pantheon/services/elementary-capnet-assist/default.nix +++ b/pkgs/desktops/pantheon/services/elementary-capnet-assist/default.nix @@ -4,60 +4,51 @@ , nix-update-script , pkg-config , meson -, python3 , ninja , vala -, desktop-file-utils -, gtk3 -, granite +, gtk4 +, granite7 +, libadwaita , libgee -, libhandy -, gcr -, webkitgtk_4_1 -, wrapGAppsHook +, gcr_4 +, webkitgtk_6_0 +, wrapGAppsHook4 }: stdenv.mkDerivation rec { pname = "elementary-capnet-assist"; - version = "2.4.4"; + version = "8.0.0"; src = fetchFromGitHub { owner = "elementary"; repo = "capnet-assist"; rev = version; - sha256 = "sha256-vnFrGHt/rtrDmXokYRoebVpNLfkZPe5IShRsXCWWsXs="; + sha256 = "sha256-xYywiI8hFjS7ODEhLGVwrlAY8I0pvUHfg6UkDhUsglU="; }; nativeBuildInputs = [ - desktop-file-utils meson ninja pkg-config - python3 vala - wrapGAppsHook + wrapGAppsHook4 ]; buildInputs = [ - gcr - granite - gtk3 + gcr_4 + granite7 + gtk4 + libadwaita libgee - libhandy - webkitgtk_4_1 + webkitgtk_6_0 ]; - postPatch = '' - chmod +x meson/post_install.py - patchShebangs meson/post_install.py - ''; - passthru = { updateScript = nix-update-script { }; }; meta = with lib; { - description = "A small WebKit app that assists a user with login when a captive portal is detected"; + description = "Small WebKit app that assists a user with login when a captive portal is detected"; homepage = "https://github.com/elementary/capnet-assist"; license = licenses.gpl3Plus; platforms = platforms.linux; diff --git a/pkgs/desktops/pantheon/services/elementary-notifications/default.nix b/pkgs/desktops/pantheon/services/elementary-notifications/default.nix index 475503bfe4209..f21115fd0dab7 100644 --- a/pkgs/desktops/pantheon/services/elementary-notifications/default.nix +++ b/pkgs/desktops/pantheon/services/elementary-notifications/default.nix @@ -12,7 +12,7 @@ , libgee , libhandy , libcanberra-gtk3 -, wrapGAppsHook +, wrapGAppsHook3 }: stdenv.mkDerivation rec { @@ -32,7 +32,7 @@ stdenv.mkDerivation rec { ninja pkg-config vala - wrapGAppsHook + wrapGAppsHook3 ]; buildInputs = [ @@ -44,6 +44,12 @@ stdenv.mkDerivation rec { libhandy ]; + postPatch = '' + # https://github.com/elementary/notifications/issues/222 + substituteInPlace src/FdoActionGroup.vala \ + --replace-fail "out VariantType" "out unowned VariantType" + ''; + passthru = { updateScript = nix-update-script { }; }; diff --git a/pkgs/desktops/pantheon/services/elementary-settings-daemon/default.nix b/pkgs/desktops/pantheon/services/elementary-settings-daemon/default.nix index 805956d332792..ed9da11815145 100644 --- a/pkgs/desktops/pantheon/services/elementary-settings-daemon/default.nix +++ b/pkgs/desktops/pantheon/services/elementary-settings-daemon/default.nix @@ -18,7 +18,7 @@ , granite , libgee , systemd -, wrapGAppsHook +, wrapGAppsHook3 }: stdenv.mkDerivation rec { @@ -40,7 +40,7 @@ stdenv.mkDerivation rec { pkg-config python3 vala - wrapGAppsHook + wrapGAppsHook3 ]; buildInputs = [ diff --git a/pkgs/desktops/pantheon/services/pantheon-agent-geoclue2/default.nix b/pkgs/desktops/pantheon/services/pantheon-agent-geoclue2/default.nix index 942e53aaf8a4f..20c28133d234b 100644 --- a/pkgs/desktops/pantheon/services/pantheon-agent-geoclue2/default.nix +++ b/pkgs/desktops/pantheon/services/pantheon-agent-geoclue2/default.nix @@ -12,7 +12,7 @@ , desktop-file-utils , geoclue2 , granite -, wrapGAppsHook +, wrapGAppsHook3 }: stdenv.mkDerivation rec { @@ -32,7 +32,7 @@ stdenv.mkDerivation rec { ninja pkg-config vala - wrapGAppsHook + wrapGAppsHook3 ]; buildInputs = [ diff --git a/pkgs/desktops/pantheon/services/pantheon-agent-polkit/default.nix b/pkgs/desktops/pantheon/services/pantheon-agent-polkit/default.nix index 9e1c3464dad7d..e427bfc2fea54 100644 --- a/pkgs/desktops/pantheon/services/pantheon-agent-polkit/default.nix +++ b/pkgs/desktops/pantheon/services/pantheon-agent-polkit/default.nix @@ -6,22 +6,23 @@ , meson , ninja , vala -, gtk3 +, gtk4 +, libadwaita , libgee -, granite +, granite7 , polkit -, wrapGAppsHook +, wrapGAppsHook4 }: stdenv.mkDerivation rec { pname = "pantheon-agent-polkit"; - version = "1.0.5"; + version = "8.0.0"; src = fetchFromGitHub { owner = "elementary"; repo = pname; rev = version; - sha256 = "sha256-sC+Ec8a/17EfHsSRKQflBlzv9XAFjUVhjX691gIVa2A="; + hash = "sha256-Hm4vEubj2VjObD2t7wBHGrjnp6Nza6Ze7AOcJ0n5Dmc="; }; nativeBuildInputs = [ @@ -29,12 +30,13 @@ stdenv.mkDerivation rec { ninja pkg-config vala - wrapGAppsHook + wrapGAppsHook4 ]; buildInputs = [ - granite - gtk3 + granite7 + gtk4 + libadwaita libgee polkit ]; diff --git a/pkgs/desktops/pantheon/third-party/pantheon-tweaks/default.nix b/pkgs/desktops/pantheon/third-party/pantheon-tweaks/default.nix deleted file mode 100644 index c05c4b9b0a251..0000000000000 --- a/pkgs/desktops/pantheon/third-party/pantheon-tweaks/default.nix +++ /dev/null @@ -1,69 +0,0 @@ -{ lib -, stdenv -, fetchFromGitHub -, nix-update-script -, meson -, ninja -, pkg-config -, python3 -, vala -, gtk3 -, libgee -, pantheon -}: - -stdenv.mkDerivation rec { - pname = "pantheon-tweaks"; - version = "1.1.2"; - - src = fetchFromGitHub { - owner = "pantheon-tweaks"; - repo = pname; - rev = version; - sha256 = "sha256-E9YSRfh9bLAHn2y4p3aKwR5NOtexKokLWj3RwtDnLsQ="; - }; - - patches = [ - ./fix-paths.patch - ]; - - nativeBuildInputs = [ - meson - ninja - pkg-config - python3 - vala - ]; - - buildInputs = [ - gtk3 - libgee - ] ++ (with pantheon; [ - elementary-files # settings schemas - elementary-terminal # settings schemas - granite - switchboard - ]); - - postPatch = '' - chmod +x meson/post_install.py - patchShebangs meson/post_install.py - ''; - - passthru = { - updateScript = nix-update-script { }; - }; - - meta = with lib; { - description = "Unofficial system settings panel for Pantheon"; - longDescription = '' - Unofficial system settings panel for Pantheon - that lets you easily and safely customise your desktop's appearance. - Use programs.pantheon-tweaks.enable to add this to your switchboard. - ''; - homepage = "https://github.com/pantheon-tweaks/pantheon-tweaks"; - license = licenses.gpl3Plus; - platforms = platforms.linux; - maintainers = teams.pantheon.members; - }; -} diff --git a/pkgs/desktops/pantheon/third-party/pantheon-tweaks/fix-paths.patch b/pkgs/desktops/pantheon/third-party/pantheon-tweaks/fix-paths.patch deleted file mode 100644 index b2e0e0a7b4c8b..0000000000000 --- a/pkgs/desktops/pantheon/third-party/pantheon-tweaks/fix-paths.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/src/Settings/ThemeSettings.vala b/src/Settings/ThemeSettings.vala -index 589121b..8e9c81e 100644 ---- a/src/Settings/ThemeSettings.vala -+++ b/src/Settings/ThemeSettings.vala -@@ -29,7 +29,7 @@ public class PantheonTweaks.ThemeSettings { - var themes = new Gee.ArrayList<string> (); - - string[] dirs = { -- "/usr/share/" + path + "/", -+ "/run/current-system/sw/share/" + path + "/", - Environment.get_home_dir () + "/." + path + "/", - Environment.get_home_dir () + "/.local/share/" + path + "/"}; - diff --git a/pkgs/desktops/pantheon/third-party/wingpanel-indicator-ayatana/default.nix b/pkgs/desktops/pantheon/third-party/wingpanel-indicator-ayatana/default.nix index f199894d924b9..c3c24b02401aa 100644 --- a/pkgs/desktops/pantheon/third-party/wingpanel-indicator-ayatana/default.nix +++ b/pkgs/desktops/pantheon/third-party/wingpanel-indicator-ayatana/default.nix @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { pname = "wingpanel-indicator-ayatana"; - version = "unstable-2023-04-18"; + version = "2.0.7-unstable-2023-04-18"; src = fetchFromGitHub { owner = "Lafydev"; |