From 86665d0744761790af4fd71354dcb9087ce0dd87 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jos=C3=A9=20Romildo=20Malaquias?= Date: Mon, 6 May 2019 23:22:44 -0300 Subject: [PATCH 1/2] sierra-gtk-theme: 2018-10-12 -> 2019-05-07 --- pkgs/misc/themes/sierra/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/misc/themes/sierra/default.nix b/pkgs/misc/themes/sierra/default.nix index d5082821bee..b845522a28a 100644 --- a/pkgs/misc/themes/sierra/default.nix +++ b/pkgs/misc/themes/sierra/default.nix @@ -1,14 +1,14 @@ { stdenv, fetchFromGitHub, libxml2, gdk_pixbuf, librsvg, gtk-engine-murrine }: stdenv.mkDerivation rec { - name = "sierra-gtk-theme-${version}"; - version = "2018-10-12"; + pname = "sierra-gtk-theme"; + version = "2019-05-07"; src = fetchFromGitHub { owner = "vinceliuice"; - repo = "sierra-gtk-theme"; + repo = pname; rev = version; - sha256 = "0l8mhdy7x8nh5aqsvkk0maqg1cnfds7824g439f6cmifdiyksbgg"; + sha256 = "0rm9lcwp89ljxqrya9bi882qcs339pc1l945cr1xq2rganqyk9cq"; }; nativeBuildInputs = [ libxml2 ]; From eb19fdace742e4998576c0b4e1133f2120485f48 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jos=C3=A9=20Romildo=20Malaquias?= Date: Mon, 6 May 2019 23:25:32 -0300 Subject: [PATCH 2/2] sierra-gtk-theme: mv to pkgs/data/themes --- pkgs/{misc => data}/themes/sierra/default.nix | 0 pkgs/top-level/all-packages.nix | 4 ++-- 2 files changed, 2 insertions(+), 2 deletions(-) rename pkgs/{misc => data}/themes/sierra/default.nix (100%) diff --git a/pkgs/misc/themes/sierra/default.nix b/pkgs/data/themes/sierra/default.nix similarity index 100% rename from pkgs/misc/themes/sierra/default.nix rename to pkgs/data/themes/sierra/default.nix diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 821ea264dfa..2bd02dc5116 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -16312,6 +16312,8 @@ in signwriting = callPackage ../data/fonts/signwriting { }; + sierra-gtk-theme = callPackage ../data/themes/sierra { }; + soundfont-fluid = callPackage ../data/soundfonts/fluid { }; stdmanpages = callPackage ../data/documentation/std-man-pages { }; @@ -23426,8 +23428,6 @@ in libsemanage = libsemanage.override { python = python3; }; }; - sierra-gtk-theme = callPackage ../misc/themes/sierra { }; - slock = callPackage ../misc/screensavers/slock { conf = config.slock.conf or null; };