about summary refs log tree commit diff
path: root/pkgs/desktops
diff options
context:
space:
mode:
authorgithub-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>2020-12-16 12:21:16 +0000
committerGitHub <noreply@github.com>2020-12-16 12:21:16 +0000
commit4fa9e3f59f0abac74c4c9d4485c454bb5bb7d130 (patch)
tree77c4b87889780d574337ca13d569c037257c7ea7 /pkgs/desktops
parent41d1ebd7df5d6bc4c5b0035d14ab185a60f8033c (diff)
parente17d4b05a12fe1b567ef4d55d2f01c23ff48228d (diff)
downloadnixlib-4fa9e3f59f0abac74c4c9d4485c454bb5bb7d130.tar
nixlib-4fa9e3f59f0abac74c4c9d4485c454bb5bb7d130.tar.gz
nixlib-4fa9e3f59f0abac74c4c9d4485c454bb5bb7d130.tar.bz2
nixlib-4fa9e3f59f0abac74c4c9d4485c454bb5bb7d130.tar.lz
nixlib-4fa9e3f59f0abac74c4c9d4485c454bb5bb7d130.tar.xz
nixlib-4fa9e3f59f0abac74c4c9d4485c454bb5bb7d130.tar.zst
nixlib-4fa9e3f59f0abac74c4c9d4485c454bb5bb7d130.zip
Merge master into staging-next
Diffstat (limited to 'pkgs/desktops')
-rw-r--r--pkgs/desktops/gnome-3/core/gnome-disk-utility/default.nix4
-rw-r--r--pkgs/desktops/lxqt/default.nix2
2 files changed, 3 insertions, 3 deletions
diff --git a/pkgs/desktops/gnome-3/core/gnome-disk-utility/default.nix b/pkgs/desktops/gnome-3/core/gnome-disk-utility/default.nix
index 444fcfc4f685..d4972fb0a291 100644
--- a/pkgs/desktops/gnome-3/core/gnome-disk-utility/default.nix
+++ b/pkgs/desktops/gnome-3/core/gnome-disk-utility/default.nix
@@ -5,11 +5,11 @@
 
 stdenv.mkDerivation rec {
   pname = "gnome-disk-utility";
-  version = "3.38.0";
+  version = "3.38.1";
 
   src = fetchurl {
     url = "mirror://gnome/sources/gnome-disk-utility/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
-    sha256 = "08sj1csd1jsmph2lyw2lpj7jh40236alz56pmf315hwyimkcwd3p";
+    sha256 = "1TuF3BMDobXOHkIcH1xqwLMY4HzZqVk50uHwlZpe19k=";
   };
 
   nativeBuildInputs = [
diff --git a/pkgs/desktops/lxqt/default.nix b/pkgs/desktops/lxqt/default.nix
index 1292da151acf..088b4e335ea8 100644
--- a/pkgs/desktops/lxqt/default.nix
+++ b/pkgs/desktops/lxqt/default.nix
@@ -107,7 +107,7 @@ let
       qlipper
 
       ### Default icon theme
-      pkgs.oxygen-icons5
+      pkgs.kdeFrameworks.oxygen-icons5
 
       ### Screen saver
       pkgs.xscreensaver