diff options
author | Vladimír Čunát <v@cunat.cz> | 2019-06-09 13:43:10 +0200 |
---|---|---|
committer | Vladimír Čunát <v@cunat.cz> | 2019-06-09 13:43:10 +0200 |
commit | 308706fe9edf12ebb29d3e4da7d7ea96b1ea6c07 (patch) | |
tree | 966117e4776ae207584a42dc6b8eeaa828f7446d | |
parent | c5194a2c550194f63b8dab63b66cef1e865d270e (diff) | |
parent | b2ccf38d60757b74801ff03cdffcff19457de3cd (diff) | |
download | nixlib-308706fe9edf12ebb29d3e4da7d7ea96b1ea6c07.tar nixlib-308706fe9edf12ebb29d3e4da7d7ea96b1ea6c07.tar.gz nixlib-308706fe9edf12ebb29d3e4da7d7ea96b1ea6c07.tar.bz2 nixlib-308706fe9edf12ebb29d3e4da7d7ea96b1ea6c07.tar.lz nixlib-308706fe9edf12ebb29d3e4da7d7ea96b1ea6c07.tar.xz nixlib-308706fe9edf12ebb29d3e4da7d7ea96b1ea6c07.tar.zst nixlib-308706fe9edf12ebb29d3e4da7d7ea96b1ea6c07.zip |
Merge #62132: tetra-gtk-theme: 201905 -> 201905r1
And rename, without an alias (probably fine for this, I think).
-rw-r--r-- | pkgs/data/themes/adementary/default.nix (renamed from pkgs/data/themes/tetra/default.nix) | 8 | ||||
-rw-r--r-- | pkgs/top-level/all-packages.nix | 4 |
2 files changed, 6 insertions, 6 deletions
diff --git a/pkgs/data/themes/tetra/default.nix b/pkgs/data/themes/adementary/default.nix index 2a7b6e595c45..40190d65d5ed 100644 --- a/pkgs/data/themes/tetra/default.nix +++ b/pkgs/data/themes/adementary/default.nix @@ -1,14 +1,14 @@ { stdenv, fetchFromGitHub, gtk3, sassc }: stdenv.mkDerivation rec { - pname = "tetra-gtk-theme"; - version = "201905"; + pname = "adementary-theme"; + version = "201905r1"; src = fetchFromGitHub { owner = "hrdwrrsk"; repo = pname; rev = version; - sha256 = "1j2w8na564f5yjm5am7843hq5qk28h1rq8rcbak4xsygdc3lbsfi"; + sha256 = "14y5s18g9r2c1ciw1skfksn09gvqgy8vjvwbr0z8gacf0jc2apqk"; }; preBuild = '' @@ -28,7 +28,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Adwaita-based gtk+ theme with design influence from elementary OS and Vertex gtk+ theme"; - homepage = https://github.com/hrdwrrsk/tetra-gtk-theme; + homepage = https://github.com/hrdwrrsk/adementary-theme; license = licenses.gpl3; maintainers = with maintainers; [ dtzWill ]; platforms = platforms.linux; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index b46d8c3612ca..bdaffbc7d3ce 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -16082,6 +16082,8 @@ in adapta-backgrounds = callPackage ../data/misc/adapta-backgrounds { }; + adementary-theme = callPackage ../data/themes/adementary { }; + agave = callPackage ../data/fonts/agave { }; aileron = callPackage ../data/fonts/aileron { }; @@ -16660,8 +16662,6 @@ 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 { }; |