diff options
author | Alyssa Ross <hi@alyssa.is> | 2021-01-15 10:30:44 +0000 |
---|---|---|
committer | Alyssa Ross <hi@alyssa.is> | 2021-01-15 10:30:44 +0000 |
commit | e0794be8a0d11e90461e5a9c85012a36b93ec976 (patch) | |
tree | efd9cbc55ea3322867bf601c4d536758a3dd5fcc /nixpkgs/pkgs/desktops/xfce | |
parent | 3538874082ded7647b1ccec0343c7c1e882cfef3 (diff) | |
parent | 1a57d96edd156958b12782e8c8b6a374142a7248 (diff) | |
download | nixlib-e0794be8a0d11e90461e5a9c85012a36b93ec976.tar nixlib-e0794be8a0d11e90461e5a9c85012a36b93ec976.tar.gz nixlib-e0794be8a0d11e90461e5a9c85012a36b93ec976.tar.bz2 nixlib-e0794be8a0d11e90461e5a9c85012a36b93ec976.tar.lz nixlib-e0794be8a0d11e90461e5a9c85012a36b93ec976.tar.xz nixlib-e0794be8a0d11e90461e5a9c85012a36b93ec976.tar.zst nixlib-e0794be8a0d11e90461e5a9c85012a36b93ec976.zip |
Merge commit '1a57d96edd156958b12782e8c8b6a374142a7248'
Diffstat (limited to 'nixpkgs/pkgs/desktops/xfce')
9 files changed, 71 insertions, 38 deletions
diff --git a/nixpkgs/pkgs/desktops/xfce/applications/mousepad/default.nix b/nixpkgs/pkgs/desktops/xfce/applications/mousepad/default.nix index 6f841958c795..3c84f5558a11 100644 --- a/nixpkgs/pkgs/desktops/xfce/applications/mousepad/default.nix +++ b/nixpkgs/pkgs/desktops/xfce/applications/mousepad/default.nix @@ -4,6 +4,7 @@ mkXfceDerivation { category = "apps"; pname = "mousepad"; version = "0.4.2"; + odd-unstable = false; sha256 = "0a35vaq4l0d8vzw7hqpvbgkr3wj1sqr2zvj7bc5z4ikz2cppqj7p"; diff --git a/nixpkgs/pkgs/desktops/xfce/applications/orage/default.nix b/nixpkgs/pkgs/desktops/xfce/applications/orage/default.nix index 08b78ec40067..3af6c0a6bbab 100644 --- a/nixpkgs/pkgs/desktops/xfce/applications/orage/default.nix +++ b/nixpkgs/pkgs/desktops/xfce/applications/orage/default.nix @@ -1,18 +1,23 @@ -{ lib, fetchpatch, mkXfceDerivation, dbus-glib, gtk2, libical, libnotify, tzdata -, popt, libxfce4ui, xfce4-panel, withPanelPlugin ? true }: +{ stdenv, fetchurl, fetchpatch, pkg-config, intltool, dbus-glib, gtk2, libical, libnotify, tzdata +, popt, libxfce4ui, xfce4-panel, withPanelPlugin ? true, wrapGAppsHook, xfce }: assert withPanelPlugin -> libxfce4ui != null && xfce4-panel != null; let - inherit (lib) optionals; + inherit (stdenv.lib) optionals; in -mkXfceDerivation { - category = "archive"; +stdenv.mkDerivation rec { pname = "orage"; version = "4.12.1"; - sha256 = "04z6y1vfaz1im1zq1zr7cf8pjibjhj9zkyanbp7vn30q520yxa0m"; + src = fetchurl { + url = "https://archive.xfce.org/src/apps/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.bz2"; + sha256 = "0qlhvnl2m33vfxqlbkic2nmfpwyd4mq230jzhs48cg78392amy9w"; + }; + + nativeBuildInputs = [ pkg-config intltool wrapGAppsHook ]; + buildInputs = [ dbus-glib gtk2 libical libnotify popt ] ++ optionals withPanelPlugin [ libxfce4ui xfce4-panel ]; @@ -28,12 +33,21 @@ mkXfceDerivation { # Fix build with libical 3.0 (fetchpatch { name = "fix-libical3.patch"; - url = "https://git.archlinux.org/svntogit/packages.git/plain/trunk/libical3.patch?h=packages/orage&id=7b1b06c42dda034d538977b9f3550b28e370057f"; + url = "https://aur.archlinux.org/cgit/aur.git/plain/libical3.patch?h=orage-4.10"; sha256 = "1l8s106mcidmbx2p8c2pi8v9ngbv2x3fsgv36j8qk8wyd4qd1jbf"; }) ]; - meta = { - description = "A simple calendar application with reminders"; + passthru.updateScript = xfce.updateScript { + inherit pname version; + attrPath = "xfce.${pname}"; + versionLister = xfce.archiveLister "apps" pname; + }; + + meta = with stdenv.lib; { + description = "Simple calendar application with reminders"; + homepage = "https://git.xfce.org/archive/orage/"; + license = licenses.gpl2Plus; + platforms = platforms.linux; }; } diff --git a/nixpkgs/pkgs/desktops/xfce/core/exo/default.nix b/nixpkgs/pkgs/desktops/xfce/core/exo/default.nix index ee58c76ea02b..17da815534ce 100644 --- a/nixpkgs/pkgs/desktops/xfce/core/exo/default.nix +++ b/nixpkgs/pkgs/desktops/xfce/core/exo/default.nix @@ -1,5 +1,5 @@ -{ mkXfceDerivation, docbook_xsl, glib, libxslt, perlPackages, gtk2, gtk3 -, libxfce4ui, libxfce4util }: +{ mkXfceDerivation, docbook_xsl, glib, libxslt, gtk2, gtk3 +, libxfce4ui, libxfce4util, perl }: mkXfceDerivation { category = "xfce"; @@ -10,7 +10,6 @@ mkXfceDerivation { nativeBuildInputs = [ libxslt - perlPackages.URI docbook_xsl ]; @@ -20,6 +19,8 @@ mkXfceDerivation { glib libxfce4ui libxfce4util + + (perl.withPackages(ps: with ps; [ URI ])) # for $out/lib/xfce4/exo/exo-compose-mail ]; # Workaround https://bugzilla.xfce.org/show_bug.cgi?id=15825 diff --git a/nixpkgs/pkgs/desktops/xfce/core/thunar/wrapper.nix b/nixpkgs/pkgs/desktops/xfce/core/thunar/wrapper.nix index cc44e6624571..b0b4268db6ec 100644 --- a/nixpkgs/pkgs/desktops/xfce/core/thunar/wrapper.nix +++ b/nixpkgs/pkgs/desktops/xfce/core/thunar/wrapper.nix @@ -14,7 +14,14 @@ symlinkJoin { wrapProgram "$out/bin/thunar-settings" \ --set "THUNARX_MODULE_DIR" "$out/lib/thunarx-3" - for file in "lib/systemd/user/thunar.service" "share/dbus-1/services/org.xfce.FileManager.service" \ + # NOTE: we need to remove the folder symlink itself and create + # a new folder before trying to substitute any file below. + rm -f "$out/lib/systemd/user" + mkdir -p "$out/lib/systemd/user" + + # point to wrapped binary in all service files + for file in "lib/systemd/user/thunar.service" \ + "share/dbus-1/services/org.xfce.FileManager.service" \ "share/dbus-1/services/org.xfce.Thunar.FileManager1.service" \ "share/dbus-1/services/org.xfce.Thunar.service" do @@ -24,7 +31,7 @@ symlinkJoin { done ''; - meta = with lib; { + meta = with lib; { inherit (thunar.meta) homepage license platforms maintainers; description = thunar.meta.description + optionalString diff --git a/nixpkgs/pkgs/desktops/xfce/core/xfwm4/default.nix b/nixpkgs/pkgs/desktops/xfce/core/xfwm4/default.nix index 7ab12461046b..df46a80c4b7b 100644 --- a/nixpkgs/pkgs/desktops/xfce/core/xfwm4/default.nix +++ b/nixpkgs/pkgs/desktops/xfce/core/xfwm4/default.nix @@ -5,9 +5,9 @@ mkXfceDerivation { category = "xfce"; pname = "xfwm4"; - version = "4.14.5"; + version = "4.14.6"; - sha256 = "0xxprhs8g00ysrl25y6z9agih6wb7n29v5f5m2icaz7yjvj1k9iv"; + sha256 = "1ml5b4nn8laqhjihfqqsbjn66525abhin5d32bplh1k9yfxw4xi4"; nativeBuildInputs = [ exo librsvg ]; diff --git a/nixpkgs/pkgs/desktops/xfce/mkXfceDerivation.nix b/nixpkgs/pkgs/desktops/xfce/mkXfceDerivation.nix index 4c6edf99b611..8709b84820c4 100644 --- a/nixpkgs/pkgs/desktops/xfce/mkXfceDerivation.nix +++ b/nixpkgs/pkgs/desktops/xfce/mkXfceDerivation.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchgit, pkgconfig, xfce4-dev-tools, hicolor-icon-theme, xfce, wrapGAppsHook }: +{ stdenv, fetchFromGitLab, pkgconfig, xfce4-dev-tools, hicolor-icon-theme, xfce, wrapGAppsHook }: { category , pname @@ -23,14 +23,16 @@ let zipAttrsWithNames (filterAttrNames isList (head attrsets)) (_: concatLists) attrsets; template = rec { - name = "${pname}-${version}"; + inherit pname version; nativeBuildInputs = [ pkgconfig xfce4-dev-tools wrapGAppsHook ]; buildInputs = [ hicolor-icon-theme ]; configureFlags = [ "--enable-maintainer-mode" ]; - src = fetchgit { - url = "git://git.xfce.org/${category}/${pname}"; + src = fetchFromGitLab { + domain = "gitlab.xfce.org"; + owner = category; + repo = pname; inherit rev sha256; }; @@ -41,11 +43,11 @@ let passthru.updateScript = xfce.updateScript { inherit pname version attrPath rev-prefix odd-unstable patchlevel-unstable; - versionLister = xfce.gitLister src.url; + versionLister = xfce.gitLister src.meta.homepage; }; meta = with stdenv.lib; { - homepage = "https://git.xfce.org/${category}/${pname}/about"; + homepage = "https://gitlab.xfce.org/${category}/${pname}/about"; license = licenses.gpl2; # some libraries are under LGPLv2+ platforms = platforms.linux; }; diff --git a/nixpkgs/pkgs/desktops/xfce/panel-plugins/xfce4-namebar-plugin.nix b/nixpkgs/pkgs/desktops/xfce/panel-plugins/xfce4-namebar-plugin.nix index affc957c51df..5575bf585fce 100644 --- a/nixpkgs/pkgs/desktops/xfce/panel-plugins/xfce4-namebar-plugin.nix +++ b/nixpkgs/pkgs/desktops/xfce/panel-plugins/xfce4-namebar-plugin.nix @@ -1,29 +1,36 @@ -{ stdenv, pkgconfig, fetchFromGitHub, python2, vala_0_40 -, gtk2, libwnck, libxfce4util, xfce4-panel, wafHook }: +{ stdenv, pkgconfig, fetchFromGitHub, python3, vala_0_46 +, gtk3, libwnck3, libxfce4util, xfce4-panel, wafHook, xfce }: stdenv.mkDerivation rec { - ver = "0.3.1"; - rev = "07a23b3"; - name = "xfce4-namebar-plugin-${ver}"; + pname = "xfce4-namebar-plugin"; + version = "1.0.0"; src = fetchFromGitHub { - owner = "TiZ-EX1"; - repo = "xfce4-namebar-plugin"; - rev = rev; - sha256 = "1sl4qmjywfvv53ch7hyfysjfd91zl38y7gdw2y3k69vkzd3h18ad"; + owner = "HugLifeTiZ"; + repo = pname; + rev = "v${version}"; + sha256 = "0l70f6mzkscsj4wr43wp5c0l2qnf85vj24cv02bjrh3bzz6wkak8"; }; - nativeBuildInputs = [ pkgconfig wafHook ]; - buildInputs = [ python2 vala_0_40 gtk2 libwnck libxfce4util xfce4-panel ]; + nativeBuildInputs = [ pkgconfig vala_0_46 wafHook python3 ]; + buildInputs = [ gtk3 libwnck3 libxfce4util xfce4-panel ]; postPatch = '' - substituteInPlace src/preferences.vala --replace 'Environment.get_system_data_dirs()' "{ \"$out/share\" }" - substituteInPlace src/namebar.vala --replace 'Environment.get_system_data_dirs()' "{ \"$out/share\" }" + for f in src/preferences.vala src/namebar.vala; do + substituteInPlace $f --replace 'var dirs = Environment.get_system_data_dirs()' "string[] dirs = { \"$out/share\" }" + done ''; + passthru.updateScript = xfce.updateScript { + inherit pname version; + attrPath = "xfce.${pname}"; + versionLister = xfce.gitLister src.meta.homepage; + rev-prefix = "v"; + }; + meta = with stdenv.lib; { - homepage = "https://github.com/TiZ-EX1/xfce4-namebar-plugin"; - description = "A plugins which integrates titlebar and window controls into the xfce4-panel"; + 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 = [ maintainers.volth ]; diff --git a/nixpkgs/pkgs/desktops/xfce/panel-plugins/xfce4-netload-plugin/default.nix b/nixpkgs/pkgs/desktops/xfce/panel-plugins/xfce4-netload-plugin/default.nix index 8d258220175b..4ee50a07a34b 100644 --- a/nixpkgs/pkgs/desktops/xfce/panel-plugins/xfce4-netload-plugin/default.nix +++ b/nixpkgs/pkgs/desktops/xfce/panel-plugins/xfce4-netload-plugin/default.nix @@ -11,6 +11,6 @@ mkXfceDerivation { buildInputs = [ gtk3 libxfce4ui libxfce4util xfce4-panel xfconf ]; meta = { - description = "Battery plugin for Xfce panel"; + description = "Internet load speed plugin for Xfce4 panel"; }; } diff --git a/nixpkgs/pkgs/desktops/xfce/panel-plugins/xfce4-whiskermenu-plugin/default.nix b/nixpkgs/pkgs/desktops/xfce/panel-plugins/xfce4-whiskermenu-plugin/default.nix index ac9f22a9a0cc..ef269d64e04c 100644 --- a/nixpkgs/pkgs/desktops/xfce/panel-plugins/xfce4-whiskermenu-plugin/default.nix +++ b/nixpkgs/pkgs/desktops/xfce/panel-plugins/xfce4-whiskermenu-plugin/default.nix @@ -5,6 +5,7 @@ mkXfceDerivation { pname = "xfce4-whiskermenu-plugin"; version = "2.4.6"; rev-prefix = "v"; + odd-unstable = false; sha256 = "03asfaxqbhawzb3870az7qgid5y7cg3ip8h6r4z8kavcd0b7x4ii"; nativeBuildInputs = [ cmake ]; |