Merge pull request #107742 from romildo/upd.xfce

xfce: update src to use new git repository

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";
 

pkgs/desktops/xfce/applications/orage/default.nix

@@ -1,18 +1,23 @@
-{ lib, fetchpatch, mkXfceDerivation, dbus-glib, gtk2, libical, libnotify, tzdata
+{ stdenv, fetchurl, fetchpatch, pkg-config, intltool, dbus-glib, gtk2, libical, libnotify, tzdata
-, popt, libxfce4ui, xfce4-panel, withPanelPlugin ? true }:
+, 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 {
+stdenv.mkDerivation rec {
-  category = "archive";
   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 ];
 
@@ -33,7 +38,16 @@ mkXfceDerivation {
     })
   ];
 
-  meta = {
+  passthru.updateScript = xfce.updateScript {
-    description = "A simple calendar application with reminders";
+    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;
   };
 }

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 ];
 

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 {
+    src = fetchFromGitLab {
-      url = "git://git.xfce.org/${category}/${pname}";
+      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;
     };

pkgs/desktops/xfce/panel-plugins/xfce4-namebar-plugin.nix

@@ -1,29 +1,36 @@
-{ stdenv, pkgconfig, fetchFromGitHub, python2, vala_0_40
+{ stdenv, pkgconfig, fetchFromGitHub, python2, vala_0_46
-, gtk2, libwnck, libxfce4util, xfce4-panel, wafHook }:
+, gtk3, libwnck3, libxfce4util, xfce4-panel, wafHook, xfce }:
 
 stdenv.mkDerivation rec {
-  ver = "0.3.1";
+  pname = "xfce4-namebar-plugin";
-  rev = "07a23b3";
+  version = "1.0.0";
-  name = "xfce4-namebar-plugin-${ver}";
 
   src = fetchFromGitHub {
-    owner = "TiZ-EX1";
+    owner = "HugLifeTiZ";
-    repo = "xfce4-namebar-plugin";
+    repo = pname;
-    rev = rev;
+    rev = "v${version}";
-    sha256 = "1sl4qmjywfvv53ch7hyfysjfd91zl38y7gdw2y3k69vkzd3h18ad";
+    sha256 = "0l70f6mzkscsj4wr43wp5c0l2qnf85vj24cv02bjrh3bzz6wkak8";
   };
 
-  nativeBuildInputs = [ pkgconfig wafHook ];
+  nativeBuildInputs = [ pkgconfig vala_0_46 wafHook ];
-  buildInputs = [ python2 vala_0_40 gtk2 libwnck libxfce4util xfce4-panel ];
+  buildInputs = [ gtk3 libwnck3 libxfce4util xfce4-panel ];
 
   postPatch = ''
-    substituteInPlace src/preferences.vala --replace 'Environment.get_system_data_dirs()' "{ \"$out/share\" }"
+    for f in src/preferences.vala src/namebar.vala; do
-    substituteInPlace src/namebar.vala     --replace 'Environment.get_system_data_dirs()' "{ \"$out/share\" }"
+      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";
+    homepage = "https://github.com/HugLifeTiZ/xfce4-namebar-plugin";
-    description = "A plugins which integrates titlebar and window controls into the xfce4-panel";
+    description = "Plugin which integrates titlebar and window controls into the xfce4-panel";
     license = licenses.mit;
     platforms = platforms.linux;
     maintainers = [ maintainers.volth ];

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 ];