summary refs log tree commit diff
diff options
context:
space:
mode:
authorJoachim F <joachifm@users.noreply.github.com>2017-07-01 12:51:14 +0100
committerGitHub <noreply@github.com>2017-07-01 12:51:14 +0100
commit4e548d2717ed9ba0aa005d00922bf4dbaeee9a8e (patch)
tree074041f905584fad3541d714282981252dd38904
parent07aca910d57f148ee991c47f3801eb8a3a841959 (diff)
parentc5ff68b3c28effb17e686d9d8d2bac1ec6577a1b (diff)
downloadnixlib-4e548d2717ed9ba0aa005d00922bf4dbaeee9a8e.tar
nixlib-4e548d2717ed9ba0aa005d00922bf4dbaeee9a8e.tar.gz
nixlib-4e548d2717ed9ba0aa005d00922bf4dbaeee9a8e.tar.bz2
nixlib-4e548d2717ed9ba0aa005d00922bf4dbaeee9a8e.tar.lz
nixlib-4e548d2717ed9ba0aa005d00922bf4dbaeee9a8e.tar.xz
nixlib-4e548d2717ed9ba0aa005d00922bf4dbaeee9a8e.tar.zst
nixlib-4e548d2717ed9ba0aa005d00922bf4dbaeee9a8e.zip
Merge pull request #26964 from romildo/upd.lumina
lumina: 1.2.0-p1 -> 1.3.0
-rw-r--r--nixos/modules/services/x11/desktop-managers/lumina.nix1
-rw-r--r--pkgs/desktops/lumina/default.nix7
2 files changed, 3 insertions, 5 deletions
diff --git a/nixos/modules/services/x11/desktop-managers/lumina.nix b/nixos/modules/services/x11/desktop-managers/lumina.nix
index ec5fbb13b323..5fe84cfb82ec 100644
--- a/nixos/modules/services/x11/desktop-managers/lumina.nix
+++ b/nixos/modules/services/x11/desktop-managers/lumina.nix
@@ -33,7 +33,6 @@ in
     environment.systemPackages = [
       pkgs.fluxbox
       pkgs.libsForQt5.kwindowsystem
-      pkgs.kdeFrameworks.oxygen-icons5
       pkgs.lumina
       pkgs.numlockx
       pkgs.qt5.qtsvg
diff --git a/pkgs/desktops/lumina/default.nix b/pkgs/desktops/lumina/default.nix
index 81ced85d4620..77b47533d537 100644
--- a/pkgs/desktops/lumina/default.nix
+++ b/pkgs/desktops/lumina/default.nix
@@ -1,16 +1,16 @@
 { stdenv, fetchFromGitHub, fluxbox, xscreensaver, desktop_file_utils, numlockx,
-  xorg, qtbase, qtsvg, qtmultimedia, qtx11extras, qmake, qttools, oxygen-icons5
+  xorg, qtbase, qtsvg, qtmultimedia, qtx11extras, qmake, qttools
 }:
 
 stdenv.mkDerivation rec {
   name = "lumina-${version}";
-  version = "1.2.0-p1";
+  version = "1.3.0";
 
   src = fetchFromGitHub {
     owner = "trueos";
     repo = "lumina";
     rev = "v${version}";
-    sha256 = "0k16lcpxp9avwkadbbyqficd1wxsmwian5ji38wyax76v22yq7p6";
+    sha256 = "13kwlhv2qscrn52xvx0n1sqbl96fkcb5r1ixa0wazflx8dfl9ndn";
   };
 
   nativeBuildInputs = [
@@ -26,7 +26,6 @@ stdenv.mkDerivation rec {
     qtsvg
     qtmultimedia
     qtx11extras
-    oxygen-icons5
     fluxbox
     xscreensaver
     desktop_file_utils