From 5188ec80c10340dcab43909d1b9105a5797152c6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jos=C3=A9=20Romildo=20Malaquias?= Date: Sat, 2 Nov 2019 10:05:41 -0300 Subject: [PATCH 1/2] theme-jade1: 3.3 -> 1.5 --- pkgs/misc/themes/jade1/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/misc/themes/jade1/default.nix b/pkgs/misc/themes/jade1/default.nix index ebeb7f2d8665..01221d450142 100644 --- a/pkgs/misc/themes/jade1/default.nix +++ b/pkgs/misc/themes/jade1/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "theme-jade1"; - version = "3.3"; + version = "1.5"; src = fetchFromGitHub { owner = "madmaxms"; repo = "theme-jade-1"; rev = "v${version}"; - sha256 = "06w06dvzs1llmzpyz3c5yycsw3gslsgikalfcq5l92d72z4kzfw7"; + sha256 = "1m3150iyk8421mkwj4x2pv29wjzqdcnvvnp3bsg11k5kszsm27a8"; }; propagatedUserEnvPkgs = [ gtk-engine-murrine ]; @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { ''; meta = with stdenv.lib; { - description = "A fork of the original Linux Mint theme with dark menus, more intensive green and some other modifications"; + description = "Fork of the original Linux Mint theme with dark menus, more intensive green and some other modifications"; homepage = https://github.com/madmaxms/theme-jade-1; license = with licenses; [ gpl3 ]; platforms = platforms.linux; From 51c4691bb50bc56ea7c2ff2155b94886d9c0c30e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jos=C3=A9=20Romildo=20Malaquias?= Date: Sat, 2 Nov 2019 10:09:42 -0300 Subject: [PATCH 2/2] theme-jade1: move to data/themes --- pkgs/{misc => data}/themes/jade1/default.nix | 0 pkgs/top-level/all-packages.nix | 4 ++-- 2 files changed, 2 insertions(+), 2 deletions(-) rename pkgs/{misc => data}/themes/jade1/default.nix (100%) diff --git a/pkgs/misc/themes/jade1/default.nix b/pkgs/data/themes/jade1/default.nix similarity index 100% rename from pkgs/misc/themes/jade1/default.nix rename to pkgs/data/themes/jade1/default.nix diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 764333fd1224..2cececaeab16 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -17469,6 +17469,8 @@ in gtk = res.gtk2; }; + theme-jade1 = callPackage ../data/themes/jade1 { }; + theme-obsidian2 = callPackage ../data/themes/obsidian2 { }; themes = name: callPackage (../data/misc/themes + ("/" + name + ".nix")) {}; @@ -23154,8 +23156,6 @@ in onestepback = callPackage ../misc/themes/onestepback { }; - theme-jade1 = callPackage ../misc/themes/jade1 { }; - theme-vertex = callPackage ../misc/themes/vertex { }; rox-filer = callPackage ../desktops/rox/rox-filer {