From eff0cf020fa5fe93b7ee8ac968537cbbd34d85a5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jos=C3=A9=20Romildo=20Malaquias?= Date: Tue, 4 Dec 2018 00:30:12 -0200 Subject: [PATCH 1/2] materia-theme: 20181115 -> 20181125 --- pkgs/misc/themes/materia-theme/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/misc/themes/materia-theme/default.nix b/pkgs/misc/themes/materia-theme/default.nix index e96e3ce895f..f081078d3af 100644 --- a/pkgs/misc/themes/materia-theme/default.nix +++ b/pkgs/misc/themes/materia-theme/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { name = "materia-theme-${version}"; - version = "20181115"; + version = "20181125"; src = fetchFromGitHub { owner = "nana-4"; repo = "materia-theme"; rev = "v${version}"; - sha256 = "1vfwzvzbs4336vjg6y4asm21p64xc5f7cfsld5l159174ikcz5fp"; + sha256 = "17gsgll2m534lwvpffqisdmhhmn0da419wnpq39wv5cjnmk0q3by"; }; nativeBuildInputs = [ gnome3.glib libxml2 bc ]; From c46915c9c1604c057026547a64014f430bbc15ad Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jos=C3=A9=20Romildo=20Malaquias?= Date: Tue, 4 Dec 2018 10:56:57 -0200 Subject: [PATCH 2/2] materia-theme: move to pkgs/data/themes --- pkgs/{misc => data}/themes/materia-theme/default.nix | 0 pkgs/top-level/all-packages.nix | 5 ++--- 2 files changed, 2 insertions(+), 3 deletions(-) rename pkgs/{misc => data}/themes/materia-theme/default.nix (100%) diff --git a/pkgs/misc/themes/materia-theme/default.nix b/pkgs/data/themes/materia-theme/default.nix similarity index 100% rename from pkgs/misc/themes/materia-theme/default.nix rename to pkgs/data/themes/materia-theme/default.nix diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index c4354acf0ca..e2e08ee676d 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -15438,6 +15438,8 @@ in man-pages = callPackage ../data/documentation/man-pages { }; + materia-theme = callPackage ../data/themes/materia-theme { }; + material-icons = callPackage ../data/fonts/material-icons { }; meslo-lg = callPackage ../data/fonts/meslo-lg {}; @@ -22197,9 +22199,6 @@ in matcha = callPackage ../misc/themes/matcha { }; - # previously known as flat-plat - materia-theme = callPackage ../misc/themes/materia-theme { }; - mess = callPackage ../misc/emulators/mess { inherit (pkgs.gnome2) GConf; };