diff options
Diffstat (limited to 'pkgs/desktops')
12 files changed, 63 insertions, 73 deletions
diff --git a/pkgs/desktops/lxqt/libfm-qt/default.nix b/pkgs/desktops/lxqt/libfm-qt/default.nix index 0ef27be05d2b6..694c4452b45aa 100644 --- a/pkgs/desktops/lxqt/libfm-qt/default.nix +++ b/pkgs/desktops/lxqt/libfm-qt/default.nix @@ -15,7 +15,7 @@ , qttools , wrapQtAppsHook , gitUpdater -, version ? "2.0.0" +, version ? "2.0.2" , qtx11extras ? null }: @@ -29,7 +29,7 @@ stdenv.mkDerivation rec { rev = version; hash = { "1.4.0" = "sha256-QxPYSA7537K+/dRTxIYyg+Q/kj75rZOdzlUsmSdQcn4="; - "2.0.0" = "sha256-vWkuPdG5KaT6KMr1NJGt7JBUd1z3wROKY79otsrRsuI="; + "2.0.2" = "sha256-Ntj+yixGGGgL8ylRv2IJsWtapxE71JNl9cC9K0JToNU="; }."${version}"; }; diff --git a/pkgs/desktops/lxqt/lximage-qt/default.nix b/pkgs/desktops/lxqt/lximage-qt/default.nix index 3ff33af9d4c56..e5972344abcba 100644 --- a/pkgs/desktops/lxqt/lximage-qt/default.nix +++ b/pkgs/desktops/lxqt/lximage-qt/default.nix @@ -20,13 +20,13 @@ stdenv.mkDerivation rec { pname = "lximage-qt"; - version = "2.0.0"; + version = "2.0.1"; src = fetchFromGitHub { owner = "lxqt"; repo = pname; rev = version; - hash = "sha256-yjsdXVV/EOgpNI5kY12lNH9Wpru8A6eWxayslFdioiQ="; + hash = "sha256-I0DyC8i+OnHxHcpp/xPsKjr3UgvUHlVO8h9Tjhg7Pg8="; }; nativeBuildInputs = [ diff --git a/pkgs/desktops/lxqt/lxqt-notificationd/default.nix b/pkgs/desktops/lxqt/lxqt-notificationd/default.nix index 0ca6d4fe61fe9..df5f6ed911ca7 100644 --- a/pkgs/desktops/lxqt/lxqt-notificationd/default.nix +++ b/pkgs/desktops/lxqt/lxqt-notificationd/default.nix @@ -17,13 +17,13 @@ stdenv.mkDerivation rec { pname = "lxqt-notificationd"; - version = "2.0.0"; + version = "2.0.1"; src = fetchFromGitHub { owner = "lxqt"; repo = pname; rev = version; - hash = "sha256-zEoTjDD65bBJBbvAZVtov8HyiN1G6CqYkmcPH4T8Jhc="; + hash = "sha256-qmBHeXKBJD97Me2zNSn7bNr0UrObGmvj8Pn19GQGktI="; }; nativeBuildInputs = [ diff --git a/pkgs/desktops/lxqt/lxqt-panel/default.nix b/pkgs/desktops/lxqt/lxqt-panel/default.nix index dda96380a3eb3..a2072702ad7c1 100644 --- a/pkgs/desktops/lxqt/lxqt-panel/default.nix +++ b/pkgs/desktops/lxqt/lxqt-panel/default.nix @@ -35,13 +35,13 @@ stdenv.mkDerivation rec { pname = "lxqt-panel"; - version = "2.0.0"; + version = "2.0.1"; src = fetchFromGitHub { owner = "lxqt"; repo = pname; rev = version; - hash = "sha256-2I7I3AiLptKbBXiTPbbpcj16zuIx0e9SQnvbalpoFvM="; + hash = "sha256-m+LUG7hnkIJj48HJIy6pMyv3YZ/RfuSXbdBKJ9mi764="; }; nativeBuildInputs = [ diff --git a/pkgs/desktops/lxqt/pcmanfm-qt/default.nix b/pkgs/desktops/lxqt/pcmanfm-qt/default.nix index 466c365d2c3b9..2b52e53755e50 100644 --- a/pkgs/desktops/lxqt/pcmanfm-qt/default.nix +++ b/pkgs/desktops/lxqt/pcmanfm-qt/default.nix @@ -13,6 +13,7 @@ , qtimageformats , qttools , qtwayland +, qtsvg , wrapQtAppsHook , gitUpdater }: @@ -45,6 +46,7 @@ stdenv.mkDerivation rec { qtbase qtimageformats # add-on module to support more image file formats qtwayland + qtsvg ]; passthru.updateScript = gitUpdater { }; diff --git a/pkgs/desktops/lxqt/xdg-desktop-portal-lxqt/default.nix b/pkgs/desktops/lxqt/xdg-desktop-portal-lxqt/default.nix index 6f668abb7ea5f..f88f32fb11fc5 100644 --- a/pkgs/desktops/lxqt/xdg-desktop-portal-lxqt/default.nix +++ b/pkgs/desktops/lxqt/xdg-desktop-portal-lxqt/default.nix @@ -15,13 +15,13 @@ stdenv.mkDerivation rec { pname = "xdg-desktop-portal-lxqt"; - version = "1.0.1"; + version = "1.0.2"; src = fetchFromGitHub { owner = "lxqt"; repo = pname; rev = version; - hash = "sha256-JSbFZ7R1Cu5VPPb50fRVSAsaE0LE15BbbHpvJZP6+w0="; + hash = "sha256-zXZ0Un56uz1hKoPvZitJgQpJ7ko0LrSSFxl+agiqZ4A="; }; nativeBuildInputs = [ 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/granite/7/default.nix b/pkgs/desktops/pantheon/granite/7/default.nix index 5abffc0cc6778..747e24a705ac0 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 = [ 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"; diff --git a/pkgs/desktops/xfce/applications/xfce4-panel-profiles/default.nix b/pkgs/desktops/xfce/applications/xfce4-panel-profiles/default.nix index e223f8bc66632..2e25e686ccd56 100644 --- a/pkgs/desktops/xfce/applications/xfce4-panel-profiles/default.nix +++ b/pkgs/desktops/xfce/applications/xfce4-panel-profiles/default.nix @@ -1,31 +1,63 @@ -{ mkXfceDerivation, lib, python3, intltool, gettext, - gtk3, libxfce4ui, libxfce4util, pango, harfbuzz, gdk-pixbuf, atk }: +{ stdenv +, lib +, fetchFromGitLab +, gettext +, gobject-introspection +, intltool +, wrapGAppsHook3 +, glib +, gtk3 +, libxfce4ui +, python3 +, gitUpdater +}: let - pythonEnv = python3.withPackages(ps: [ ps.pygobject3 ps.psutil ]); - makeTypelibPath = lib.makeSearchPathOutput "lib/girepository-1.0" "lib/girepository-1.0"; -in mkXfceDerivation { - category = "apps"; + pythonEnv = python3.withPackages (ps: [ + ps.pygobject3 + ps.psutil + ]); +in +stdenv.mkDerivation (finalAttrs: { pname = "xfce4-panel-profiles"; version = "1.0.14"; - sha256 = "sha256-mGA70t2U4mqEbcrj/DDsPl++EKWyZ8YXzKzzVOrH5h8="; + src = fetchFromGitLab { + domain = "gitlab.xfce.org"; + owner = "apps"; + repo = "xfce4-panel-profiles"; + rev = "xfce4-panel-profiles-${finalAttrs.version}"; + sha256 = "sha256-mGA70t2U4mqEbcrj/DDsPl++EKWyZ8YXzKzzVOrH5h8="; + }; + + nativeBuildInputs = [ + gettext + gobject-introspection + intltool + wrapGAppsHook3 + ]; - nativeBuildInputs = [ intltool gettext ]; - propagatedBuildInputs = [ pythonEnv ]; + buildInputs = [ + glib + gtk3 + libxfce4ui + pythonEnv + ]; configurePhase = '' + runHook preConfigure + # This is just a handcrafted script and does not accept additional arguments. ./configure --prefix=$out + runHook postConfigure ''; - postFixup = '' - wrapProgram $out/bin/xfce4-panel-profiles \ - --set GI_TYPELIB_PATH ${makeTypelibPath [ gtk3 libxfce4ui libxfce4util pango harfbuzz gdk-pixbuf atk ]} - ''; + passthru.updateScript = gitUpdater { rev-prefix = "xfce4-panel-profiles-"; }; meta = with lib; { + homepage = "https://docs.xfce.org/apps/xfce4-panel-profiles/start"; description = "Simple application to manage Xfce panel layouts"; mainProgram = "xfce4-panel-profiles"; maintainers = with maintainers; [ ] ++ teams.xfce.members; + platforms = platforms.linux; }; -} +}) diff --git a/pkgs/desktops/xfce/default.nix b/pkgs/desktops/xfce/default.nix index a1416426a32a1..77d783cd9039d 100644 --- a/pkgs/desktops/xfce/default.nix +++ b/pkgs/desktops/xfce/default.nix @@ -132,8 +132,6 @@ makeScopeWithSplicing' { xfce4-i3-workspaces-plugin = callPackage ./panel-plugins/xfce4-i3-workspaces-plugin { }; - xfce4-namebar-plugin = callPackage ./panel-plugins/xfce4-namebar-plugin { }; - xfce4-netload-plugin = callPackage ./panel-plugins/xfce4-netload-plugin { }; xfce4-notes-plugin = callPackage ./panel-plugins/xfce4-notes-plugin { }; @@ -172,5 +170,6 @@ makeScopeWithSplicing' { thunar-bare = self.thunar.override { thunarPlugins = [ ]; }; # added 2019-11-04 xfce4-hardware-monitor-plugin = throw "xfce.xfce4-hardware-monitor-plugin has been removed: abandoned by upstream and does not build"; # added 2023-01-15 + xfce4-namebar-plugin = throw "xfce.xfce4-namebar-plugin has been removed: abandoned by upstream and does not build"; # added 2024-05-08 }); } diff --git a/pkgs/desktops/xfce/panel-plugins/xfce4-namebar-plugin/default.nix b/pkgs/desktops/xfce/panel-plugins/xfce4-namebar-plugin/default.nix deleted file mode 100644 index 032b29eaef3d4..0000000000000 --- a/pkgs/desktops/xfce/panel-plugins/xfce4-namebar-plugin/default.nix +++ /dev/null @@ -1,43 +0,0 @@ -{ lib, stdenv, pkg-config, fetchFromGitHub, python3, vala -, gtk3, libwnck, libxfce4util, xfce4-panel, wafHook, xfce -, gitUpdater -}: - -stdenv.mkDerivation rec { - pname = "xfce4-namebar-plugin"; - version = "1.0.0"; - - src = fetchFromGitHub { - owner = "HugLifeTiZ"; - repo = pname; - rev = "v${version}"; - sha256 = "sha256-aKrJzf9rwCyXAJsRIXdBzmJBASuXD5I5kZrp+atx4FA="; - }; - - nativeBuildInputs = [ pkg-config vala wafHook python3 ]; - buildInputs = [ gtk3 libwnck libxfce4util xfce4-panel ]; - - postPatch = '' - substituteInPlace src/namebar.vala --replace 'var dirs = Environment.get_system_data_dirs()' "string[] dirs = { \"$out/share\" }" - substituteInPlace src/preferences.vala --replace 'var dir_strings = Environment.get_system_data_dirs()' "string[] dir_strings = { \"$out/share\" }" - ''; - - passthru.updateScript = gitUpdater { - rev-prefix = "v"; - }; - - meta = with lib; { - homepage = "https://github.com/HugLifeTiZ/xfce4-namebar-plugin"; - description = "Plugin which integrates titlebar and window controls into the xfce4-panel"; - license = licenses.mit; - platforms = platforms.linux; - maintainers = with maintainers; [ ] ++ teams.xfce.members; - # Does not build with vala 0.48 or later - # libxfce4panel-2.0.vapi:92.3-92.41: error: overriding method `Xfce.PanelPlugin.remote_event' is incompatible - # with base method `bool Xfce.PanelPluginProvider.remote_event (string, GLib.Value, uint)': too few parameters. - # public virtual signal bool remote_event (string name, GLib.Value value); - # ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ - # Upstream has no activity since 20 May 2020 - broken = true; - }; -} |