From 9fc607d9fe93052363b00a2ec02c2a9d18d2efd6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jos=C3=A9=20Romildo=20Malaquias?= Date: Wed, 1 May 2019 17:32:39 -0300 Subject: [PATCH 1/2] tetra-gtk-theme: 201903 -> 201905 --- pkgs/misc/themes/tetra/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/misc/themes/tetra/default.nix b/pkgs/misc/themes/tetra/default.nix index 3f36ea8f01b..2a7b6e595c4 100644 --- a/pkgs/misc/themes/tetra/default.nix +++ b/pkgs/misc/themes/tetra/default.nix @@ -1,14 +1,14 @@ { stdenv, fetchFromGitHub, gtk3, sassc }: stdenv.mkDerivation rec { - name = "tetra-gtk-theme-${version}"; - version = "201903"; + pname = "tetra-gtk-theme"; + version = "201905"; src = fetchFromGitHub { owner = "hrdwrrsk"; - repo = "tetra-gtk-theme"; + repo = pname; rev = version; - sha256 = "0ycxvz16gg8rjlg71dzbfnqlh0y62v35j8dvgs8rckfb48xm0xvs"; + sha256 = "1j2w8na564f5yjm5am7843hq5qk28h1rq8rcbak4xsygdc3lbsfi"; }; preBuild = '' From 00b1b116ac9872b2d4006abd9630587cf653cf01 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jos=C3=A9=20Romildo=20Malaquias?= Date: Wed, 1 May 2019 17:36:10 -0300 Subject: [PATCH 2/2] tetra-gtk-theme: move to pkgs/data/themes --- pkgs/{misc => data}/themes/tetra/default.nix | 0 pkgs/top-level/all-packages.nix | 4 ++-- 2 files changed, 2 insertions(+), 2 deletions(-) rename pkgs/{misc => data}/themes/tetra/default.nix (100%) diff --git a/pkgs/misc/themes/tetra/default.nix b/pkgs/data/themes/tetra/default.nix similarity index 100% rename from pkgs/misc/themes/tetra/default.nix rename to pkgs/data/themes/tetra/default.nix diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index e4517eebcfa..4d6105a11e5 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -16394,6 +16394,8 @@ in termtekst = callPackage ../misc/emulators/termtekst { }; + tetra-gtk-theme = callPackage ../data/themes/tetra { }; + tex-gyre = callPackages ../data/fonts/tex-gyre { }; tex-gyre-math = callPackages ../data/fonts/tex-gyre-math { }; @@ -23459,8 +23461,6 @@ in tetex = callPackage ../tools/typesetting/tex/tetex { libpng = libpng12; }; - tetra-gtk-theme = callPackage ../misc/themes/tetra { }; - tewi-font = callPackage ../data/fonts/tewi {}; texFunctions = callPackage ../tools/typesetting/tex/nix pkgs;