about summary refs log tree commit diff
path: root/pkgs/desktops
diff options
context:
space:
mode:
authorJonathan Ringer <jonringer117@gmail.com>2021-11-19 08:44:33 -0800
committerJonathan Ringer <jonringer117@gmail.com>2021-11-19 08:44:33 -0800
commit6ede9cd761fce7572706d2a05da73ec3c4edc5d7 (patch)
treed78fb59b6ab49f9f09da48aee2c249dcd7005d37 /pkgs/desktops
parent9d44a614de8958de1f02519fe031b81eb23bb16d (diff)
parentc0068424f7818d8f284cbf0ea7302417cc76e261 (diff)
Merge remote-tracking branch 'origin/master' into staging-next
Conflicts:
  pkgs/applications/audio/hybridreverb2/default.nix
Diffstat (limited to 'pkgs/desktops')
-rw-r--r--pkgs/desktops/xfce/panel-plugins/xfce4-sensors-plugin/default.nix4
-rw-r--r--pkgs/desktops/xfce/panel-plugins/xfce4-whiskermenu-plugin/default.nix4
-rw-r--r--pkgs/desktops/xfce/thunar-plugins/media-tags/default.nix1
3 files changed, 5 insertions, 4 deletions
diff --git a/pkgs/desktops/xfce/panel-plugins/xfce4-sensors-plugin/default.nix b/pkgs/desktops/xfce/panel-plugins/xfce4-sensors-plugin/default.nix
index 3e592b60f1413..db6c50f07dee7 100644
--- a/pkgs/desktops/xfce/panel-plugins/xfce4-sensors-plugin/default.nix
+++ b/pkgs/desktops/xfce/panel-plugins/xfce4-sensors-plugin/default.nix
@@ -8,11 +8,11 @@ in
 
 stdenv.mkDerivation rec {
   pname  = "xfce4-sensors-plugin";
-  version = "1.4.1";
+  version = "1.4.2";
 
   src = fetchurl {
     url = "mirror://xfce/src/${category}/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.bz2";
-    sha256 = "sha256-N9DcVp5zXkgqGFRcJOsc4CKdaRDjpNTB3uBoCZkjS+I=";
+    sha256 = "sha256-2pDxLmrplbzRyBvjVHmnqdMjCMZezWTlaLqMlZLTn8s=";
   };
 
   nativeBuildInputs = [
diff --git a/pkgs/desktops/xfce/panel-plugins/xfce4-whiskermenu-plugin/default.nix b/pkgs/desktops/xfce/panel-plugins/xfce4-whiskermenu-plugin/default.nix
index 8291687a0d1e3..be59429fe1bb5 100644
--- a/pkgs/desktops/xfce/panel-plugins/xfce4-whiskermenu-plugin/default.nix
+++ b/pkgs/desktops/xfce/panel-plugins/xfce4-whiskermenu-plugin/default.nix
@@ -3,10 +3,10 @@
 mkXfceDerivation {
   category = "panel-plugins";
   pname = "xfce4-whiskermenu-plugin";
-  version = "2.6.1";
+  version = "2.6.2";
   rev-prefix = "v";
   odd-unstable = false;
-  sha256 = "sha256-LdvrGpgy96IbL4t4jSJk2d5DBpSPBATHZO1SkpdtjC4=";
+  sha256 = "sha256-Tg6jK2yvODvNykTRePmHWu3safgyKAd3tCMWGXuMhPM=";
 
   nativeBuildInputs = [ cmake ];
 
diff --git a/pkgs/desktops/xfce/thunar-plugins/media-tags/default.nix b/pkgs/desktops/xfce/thunar-plugins/media-tags/default.nix
index 0ae0c35233650..5b97bb3066fd4 100644
--- a/pkgs/desktops/xfce/thunar-plugins/media-tags/default.nix
+++ b/pkgs/desktops/xfce/thunar-plugins/media-tags/default.nix
@@ -13,6 +13,7 @@ mkXfceDerivation {
   category = "thunar-plugins";
   pname = "thunar-media-tags-plugin";
   version = "0.3.0";
+  odd-unstable = false;
 
   sha256 = "sha256-jtgcHH5U5GOvzDVUwPEreMtTdk5DT6sXvFPDbzbF684=";