diff options
| author | Alyssa Ross <hi@alyssa.is> | 2023-11-05 16:15:01 +0100 |
|---|---|---|
| committer | Alyssa Ross <hi@alyssa.is> | 2023-11-05 16:15:01 +0100 |
| commit | a2c1eff83c3118a9aee8076c7f84f58137416b6e (patch) | |
| tree | 4668c9ad2bba229a0eb3ccc8adbe78402e04ab07 /nixpkgs/pkgs/desktops | |
| parent | fa7e5142244bb8fd1c51b66df6e623a7f41cc0d3 (diff) | |
| parent | 85f1ba3e51676fa8cc604a3d863d729026a6b8eb (diff) | |
| download | nixlib-a2c1eff83c3118a9aee8076c7f84f58137416b6e.tar nixlib-a2c1eff83c3118a9aee8076c7f84f58137416b6e.tar.gz nixlib-a2c1eff83c3118a9aee8076c7f84f58137416b6e.tar.bz2 nixlib-a2c1eff83c3118a9aee8076c7f84f58137416b6e.tar.lz nixlib-a2c1eff83c3118a9aee8076c7f84f58137416b6e.tar.xz nixlib-a2c1eff83c3118a9aee8076c7f84f58137416b6e.tar.zst nixlib-a2c1eff83c3118a9aee8076c7f84f58137416b6e.zip | |
Merge branch 'nixos-unstable' of https://github.com/NixOS/nixpkgs into HEAD
Diffstat (limited to 'nixpkgs/pkgs/desktops')
| -rw-r--r-- | nixpkgs/pkgs/desktops/xfce/core/xfconf/default.nix | 15 | ||||
| -rw-r--r-- | nixpkgs/pkgs/desktops/xfce/thunar-plugins/archive/default.nix | 4 |
2 files changed, 4 insertions, 15 deletions
diff --git a/nixpkgs/pkgs/desktops/xfce/core/xfconf/default.nix b/nixpkgs/pkgs/desktops/xfce/core/xfconf/default.nix index 16e6fb320928..459044eb2a5d 100644 --- a/nixpkgs/pkgs/desktops/xfce/core/xfconf/default.nix +++ b/nixpkgs/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/nixpkgs/pkgs/desktops/xfce/thunar-plugins/archive/default.nix b/nixpkgs/pkgs/desktops/xfce/thunar-plugins/archive/default.nix index 53a74684cb86..99285b53cb61 100644 --- a/nixpkgs/pkgs/desktops/xfce/thunar-plugins/archive/default.nix +++ b/nixpkgs/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 |