diff options
author | Alyssa Ross <hi@alyssa.is> | 2024-03-22 16:41:59 +0100 |
---|---|---|
committer | Alyssa Ross <hi@alyssa.is> | 2024-03-22 16:41:59 +0100 |
commit | 46a88117a05c3469af5d99433af140c3de8ca088 (patch) | |
tree | d7f0557756d8f07a3081b3498c05ddc5a8ad429d /nixpkgs/pkgs/desktops/xfce | |
parent | e97457545cea0b2ca421da257c83d8f1ef451d85 (diff) | |
parent | a343533bccc62400e8a9560423486a3b6c11a23b (diff) | |
download | nixlib-46a88117a05c3469af5d99433af140c3de8ca088.tar nixlib-46a88117a05c3469af5d99433af140c3de8ca088.tar.gz nixlib-46a88117a05c3469af5d99433af140c3de8ca088.tar.bz2 nixlib-46a88117a05c3469af5d99433af140c3de8ca088.tar.lz nixlib-46a88117a05c3469af5d99433af140c3de8ca088.tar.xz nixlib-46a88117a05c3469af5d99433af140c3de8ca088.tar.zst nixlib-46a88117a05c3469af5d99433af140c3de8ca088.zip |
Merge commit 'a343533bccc62400e8a9560423486a3b6c11a23b'
Diffstat (limited to 'nixpkgs/pkgs/desktops/xfce')
5 files changed, 18 insertions, 11 deletions
diff --git a/nixpkgs/pkgs/desktops/xfce/applications/xfce4-screensaver/default.nix b/nixpkgs/pkgs/desktops/xfce/applications/xfce4-screensaver/default.nix index 791c8ecbde52..8422f6661e02 100644 --- a/nixpkgs/pkgs/desktops/xfce/applications/xfce4-screensaver/default.nix +++ b/nixpkgs/pkgs/desktops/xfce/applications/xfce4-screensaver/default.nix @@ -25,9 +25,9 @@ in mkXfceDerivation { category = "apps"; pname = "xfce4-screensaver"; - version = "4.18.2"; + version = "4.18.3"; - sha256 = "sha256-j5K5i+hl/miyHste73akZL62K6YTxXmN8mmFK9BCecs="; + sha256 = "sha256-hOhWJoiKoeRgkhXaR8rnDpcJpStMD4BBdll4nwSA+EQ="; nativeBuildInputs = [ gobject-introspection diff --git a/nixpkgs/pkgs/desktops/xfce/applications/xfce4-taskmanager/default.nix b/nixpkgs/pkgs/desktops/xfce/applications/xfce4-taskmanager/default.nix index dc2412b329c8..5336d5ce41f3 100644 --- a/nixpkgs/pkgs/desktops/xfce/applications/xfce4-taskmanager/default.nix +++ b/nixpkgs/pkgs/desktops/xfce/applications/xfce4-taskmanager/default.nix @@ -13,10 +13,10 @@ mkXfceDerivation { category = "apps"; pname = "xfce4-taskmanager"; - version = "1.5.6"; + version = "1.5.7"; odd-unstable = false; - sha256 = "sha256-2NkjaK6xXsrMimriO2/gTOZowt9KTX4MrWJpPXM0w68="; + sha256 = "sha256-znadP7rrP/IxH22U1D9p6IHZ1J1JfXoCVk8iKUgrkJw="; nativeBuildInputs = [ exo diff --git a/nixpkgs/pkgs/desktops/xfce/applications/xfce4-terminal/default.nix b/nixpkgs/pkgs/desktops/xfce/applications/xfce4-terminal/default.nix index 58abe3229e8b..ac1d8f96ea39 100644 --- a/nixpkgs/pkgs/desktops/xfce/applications/xfce4-terminal/default.nix +++ b/nixpkgs/pkgs/desktops/xfce/applications/xfce4-terminal/default.nix @@ -17,10 +17,10 @@ mkXfceDerivation { category = "apps"; pname = "xfce4-terminal"; - version = "1.1.2"; + version = "1.1.3"; odd-unstable = false; - sha256 = "sha256-9RJmHYT9yYhtyzyTcg3nnD2hlCgENyi/3TNOGUto494="; + sha256 = "sha256-CUIQf22Lmb6MNPd2wk8LlHFNUhdIoC1gzVV6RDP2PfY="; nativeBuildInputs = [ libxslt diff --git a/nixpkgs/pkgs/desktops/xfce/core/xfce4-panel/default.nix b/nixpkgs/pkgs/desktops/xfce/core/xfce4-panel/default.nix index fe7306deb483..3d96f682dbca 100644 --- a/nixpkgs/pkgs/desktops/xfce/core/xfce4-panel/default.nix +++ b/nixpkgs/pkgs/desktops/xfce/core/xfce4-panel/default.nix @@ -16,9 +16,9 @@ mkXfceDerivation { category = "xfce"; pname = "xfce4-panel"; - version = "4.18.5"; + version = "4.18.6"; - sha256 = "sha256-1oh9C2ZlpcUulqhxUEPLhX22R7tko0rMmDixgkgaU9o="; + sha256 = "sha256-eQLz/LJIx2WkzcSLytRdJdhtGv0woT48mdqG7eHB0U4="; nativeBuildInputs = [ gobject-introspection @@ -44,7 +44,7 @@ mkXfceDerivation { postPatch = '' substituteInPlace plugins/clock/clock.c \ - --replace "/usr/share/zoneinfo" "${tzdata}/share/zoneinfo" + --replace-fail "/usr/share/zoneinfo" "${tzdata}/share/zoneinfo" ''; meta = with lib; { diff --git a/nixpkgs/pkgs/desktops/xfce/panel-plugins/xfce4-clipman-plugin/default.nix b/nixpkgs/pkgs/desktops/xfce/panel-plugins/xfce4-clipman-plugin/default.nix index 16f08da23deb..74ff2d171044 100644 --- a/nixpkgs/pkgs/desktops/xfce/panel-plugins/xfce4-clipman-plugin/default.nix +++ b/nixpkgs/pkgs/desktops/xfce/panel-plugins/xfce4-clipman-plugin/default.nix @@ -1,5 +1,6 @@ { lib , mkXfceDerivation +, wayland-scanner , glib , gtk3 , libX11 @@ -10,13 +11,18 @@ , xfce4-panel , xfconf , wayland +, wlr-protocols }: mkXfceDerivation { category = "panel-plugins"; pname = "xfce4-clipman-plugin"; - version = "1.6.5"; - sha256 = "sha256-aKcIwlNlaJEHgIq0S7+VG/os49+zRqkZXsQVse4B9oE="; + version = "1.6.6"; + sha256 = "sha256-wdEoM4etco+s0+dULkBvWJZ3WBCW3Ph2bdY0E/l5VRc="; + + nativeBuildInputs = [ + wayland-scanner + ]; buildInputs = [ glib @@ -29,6 +35,7 @@ mkXfceDerivation { xfce4-panel xfconf wayland + wlr-protocols ]; meta = with lib; { |