summary refs log tree commit diff
path: root/pkgs/desktops
diff options
context:
space:
mode:
authorBobby Rong <rjl931189261@126.com>2023-11-02 20:49:59 +0800
committerGitHub <noreply@github.com>2023-11-02 20:49:59 +0800
commit74ff760203e0ce094fa853d0467f65489ee09310 (patch)
tree77a0d1b57cca9bac181ee3c61819175f11e00357 /pkgs/desktops
parent779e7f4f6b19247ab90ed5a2a5e6615c65261395 (diff)
parentff97a5cb6f9b6c02887aa500658be794af46ab8a (diff)
downloadnixpkgs-74ff760203e0ce094fa853d0467f65489ee09310.tar
nixpkgs-74ff760203e0ce094fa853d0467f65489ee09310.tar.gz
nixpkgs-74ff760203e0ce094fa853d0467f65489ee09310.tar.bz2
nixpkgs-74ff760203e0ce094fa853d0467f65489ee09310.tar.lz
nixpkgs-74ff760203e0ce094fa853d0467f65489ee09310.tar.xz
nixpkgs-74ff760203e0ce094fa853d0467f65489ee09310.tar.zst
nixpkgs-74ff760203e0ce094fa853d0467f65489ee09310.zip
Merge pull request #264816 from bobby285271/upd/xfce
Xfce updates 2023-11-01
Diffstat (limited to 'pkgs/desktops')
-rw-r--r--pkgs/desktops/xfce/core/xfconf/default.nix15
-rw-r--r--pkgs/desktops/xfce/thunar-plugins/archive/default.nix4
2 files changed, 4 insertions, 15 deletions
diff --git a/pkgs/desktops/xfce/core/xfconf/default.nix b/pkgs/desktops/xfce/core/xfconf/default.nix
index 16e6fb32092..459044eb2a5 100644
--- a/pkgs/desktops/xfce/core/xfconf/default.nix
+++ b/pkgs/desktops/xfce/core/xfconf/default.nix
@@ -1,6 +1,5 @@
 { lib
 , mkXfceDerivation
-, fetchpatch
 , libxfce4util
 , gobject-introspection
 , vala
@@ -9,19 +8,9 @@
 mkXfceDerivation {
   category = "xfce";
   pname = "xfconf";
-  version = "4.18.2";
+  version = "4.18.3";
 
-  sha256 = "sha256-FVNkcwOS4feMocx3vYhuWNs1EkXDrM1FaKkMhIOuPHI=";
-
-  patches = [
-    # fixes a segfault, can likely be removed with 4.18.3,
-    # see https://gitlab.xfce.org/xfce/xfconf/-/issues/35#note_81151
-    (fetchpatch {
-      name = "cache-fix-uncached-value.patch";
-      url = "https://gitlab.xfce.org/xfce/xfconf/-/commit/03f7ff961fd46c9141aba624a278e19de0bf3211.diff";
-      hash = "sha256-n9Wvt7NfKMxs2AcjUWgs4vZgzLUG9jyEVTZxINko4h8=";
-    })
-  ];
+  sha256 = "sha256-Iu/LHyk/lOvu8uJuJRDxIkabiX0vZB4H99vVKRiugVo=";
 
   nativeBuildInputs = [ gobject-introspection vala ];
 
diff --git a/pkgs/desktops/xfce/thunar-plugins/archive/default.nix b/pkgs/desktops/xfce/thunar-plugins/archive/default.nix
index 53a74684cb8..99285b53cb6 100644
--- a/pkgs/desktops/xfce/thunar-plugins/archive/default.nix
+++ b/pkgs/desktops/xfce/thunar-plugins/archive/default.nix
@@ -11,10 +11,10 @@
 mkXfceDerivation {
   category = "thunar-plugins";
   pname  = "thunar-archive-plugin";
-  version = "0.5.1";
+  version = "0.5.2";
   odd-unstable = false;
 
-  sha256 = "sha256-TV70IaZClIyQnMGsJEPN0VxHzZAS5F5jSTLm8VwYuwI=";
+  sha256 = "sha256-vbuFosj2qxDus7vu9WfRiFpLwnTRnmLVGCDa0tNQecU=";
 
   nativeBuildInputs = [
     intltool