From 65d289c8e27b06d63106d8552e4ae4363d8b5292 Mon Sep 17 00:00:00 2001 From: José Romildo Malaquias Date: Sun, 19 May 2019 08:52:12 -0300 Subject: zuki-themes: 3.32-1 -> 3.32-3 --- pkgs/data/themes/zuki/default.nix | 15 ++++++--------- 1 file changed, 6 insertions(+), 9 deletions(-) (limited to 'pkgs/data') diff --git a/pkgs/data/themes/zuki/default.nix b/pkgs/data/themes/zuki/default.nix index 2e74e2819e38..69399bdb0eb5 100644 --- a/pkgs/data/themes/zuki/default.nix +++ b/pkgs/data/themes/zuki/default.nix @@ -1,24 +1,21 @@ -{ stdenv, fetchFromGitHub, gdk_pixbuf, librsvg, gtk-engine-murrine }: +{ stdenv, fetchFromGitHub, meson, ninja, sassc, gdk_pixbuf, librsvg, gtk_engines, gtk-engine-murrine }: stdenv.mkDerivation rec { pname = "zuki-themes"; - version = "3.32-1"; + version = "3.32-3"; src = fetchFromGitHub { owner = "lassekongo83"; repo = pname; rev = "v${version}"; - sha256 = "0x6ghc7n5y7p0agm2yp7rygz9154f58s891zxzhd07wc2c4mzp0s"; + sha256 = "1al1fb7pqrcdi4g6llz8ka4sc9hsprv2ba0kkc21r6vajs0qp83n"; }; - buildInputs = [ gdk_pixbuf librsvg ]; + nativeBuildInputs = [ meson ninja sassc ]; - propagatedUserEnvPkgs = [ gtk-engine-murrine ]; + buildInputs = [ gdk_pixbuf librsvg gtk_engines ]; - installPhase = '' - install -dm 755 $out/share/themes - cp -a Zuki* $out/share/themes/ - ''; + propagatedUserEnvPkgs = [ gtk-engine-murrine ]; meta = with stdenv.lib; { description = "Themes for GTK3, gnome-shell and more"; -- cgit 1.4.1 From 1f44657241b0d8df2a4c4c677d5573b673e8ee2a Mon Sep 17 00:00:00 2001 From: José Romildo Malaquias Date: Sun, 19 May 2019 09:36:08 -0300 Subject: stilo-themes: init at 3.32-3 --- pkgs/data/themes/stilo/default.nix | 27 +++++++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 29 insertions(+) create mode 100644 pkgs/data/themes/stilo/default.nix (limited to 'pkgs/data') diff --git a/pkgs/data/themes/stilo/default.nix b/pkgs/data/themes/stilo/default.nix new file mode 100644 index 000000000000..48f29ad31113 --- /dev/null +++ b/pkgs/data/themes/stilo/default.nix @@ -0,0 +1,27 @@ +{ stdenv, fetchFromGitHub, meson, ninja, sassc, gdk_pixbuf, librsvg, gtk_engines, gtk-engine-murrine }: + +stdenv.mkDerivation rec { + pname = "stilo-themes"; + version = "3.32-3"; + + src = fetchFromGitHub { + owner = "lassekongo83"; + repo = pname; + rev = "v${version}"; + sha256 = "0xcndr5mfa91f0ln0az3m79pidjy882v65w5fi5w05kykrmvv81z"; + }; + + nativeBuildInputs = [ meson ninja sassc ]; + + buildInputs = [ gdk_pixbuf librsvg gtk_engines ]; + + propagatedUserEnvPkgs = [ gtk-engine-murrine ]; + + meta = with stdenv.lib; { + description = "Minimalistic GTK themes"; + homepage = https://github.com/lassekongo83/stilo-themes; + license = licenses.gpl3; + platforms = platforms.linux; + maintainers = [ maintainers.romildo ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 4ea68589358b..380789a96bbe 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -16515,6 +16515,8 @@ in spleen = callPackage ../data/fonts/spleen { }; + stilo-themes = callPackage ../data/themes/stilo { }; + sudo-font = callPackage ../data/fonts/sudo { }; inherit (callPackages ../data/fonts/tai-languages { }) tai-ahom; -- cgit 1.4.1 From c03630a579acb251bfe710d2eabbac9cab255b72 Mon Sep 17 00:00:00 2001 From: Will Dietz Date: Sun, 19 May 2019 20:35:41 -0500 Subject: redhat-official-fonts: init at 2.2.0 --- pkgs/data/fonts/redhat-official/default.nix | 22 ++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 24 insertions(+) create mode 100644 pkgs/data/fonts/redhat-official/default.nix (limited to 'pkgs/data') diff --git a/pkgs/data/fonts/redhat-official/default.nix b/pkgs/data/fonts/redhat-official/default.nix new file mode 100644 index 000000000000..c05b9c69aef5 --- /dev/null +++ b/pkgs/data/fonts/redhat-official/default.nix @@ -0,0 +1,22 @@ +{ lib, fetchzip }: + +let version = "2.2.0"; in +fetchzip rec { + name = "redhat-official-${version}"; + url = "https://github.com/RedHatOfficial/RedHatFont/archive/${version}.zip"; + + postFetch = '' + mkdir -p $out/share/fonts/opentype + unzip -j $downloadedFile \*.otf -d $out/share/fonts/opentype + ''; + + sha256 = "0yb6shgq6jrv3kq9faky66qpdbv4g580c3jl942844grwyngymyj"; + + meta = with lib; { + homepage = https://github.com/RedHatOfficial/RedHatFont; + description = "Red Hat's Open Source Fonts - Red Hat Display and Red Hat Text"; + license = licenses.ofl; + platforms = platforms.all; + maintainers = with maintainers; [ dtzWill ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 4f89abd88584..0619b5660358 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -16420,6 +16420,8 @@ in qogir-theme = callPackage ../data/themes/qogir { }; + redhat-official-fonts = callPackage ../data/fonts/redhat-official { }; + route159 = callPackage ../data/fonts/route159 { }; sampradaya = callPackage ../data/fonts/sampradaya { }; -- cgit 1.4.1 From d41747e38f1ae4eafa34288bc18fe0a1cf6a9828 Mon Sep 17 00:00:00 2001 From: José Romildo Malaquias Date: Tue, 21 May 2019 10:49:07 -0300 Subject: mojave-gtk-theme: 2019-01-02 -> 2019-05-21 --- pkgs/data/themes/mojave/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'pkgs/data') diff --git a/pkgs/data/themes/mojave/default.nix b/pkgs/data/themes/mojave/default.nix index 7c3c852e6afd..1fc82e8aca2b 100644 --- a/pkgs/data/themes/mojave/default.nix +++ b/pkgs/data/themes/mojave/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "mojave-gtk-theme"; - version = "2019-01-02"; + version = "2019-05-21"; src = fetchFromGitHub { owner = "vinceliuice"; repo = pname; - rev = version; - sha256 = "053bfc5pslwpqhn05dzznh236g1z4cnn2dzwvb914f6m855fbxfg"; + rev = "f6167740b308715b38567ec660aa5241d964af1b"; + sha256 = "1k57f5vimdrciskjgxqz7k0xybc7b8pwcsii0p6kc8klmyrjrr9c"; }; buildInputs = [ gtk_engines ]; -- cgit 1.4.1 From 5af438b9836052064c35c926620f82a7597bb7b1 Mon Sep 17 00:00:00 2001 From: José Romildo Malaquias Date: Tue, 21 May 2019 15:44:04 -0300 Subject: zuki-themes: 3.32-3 -> 3.32-4 --- pkgs/data/themes/zuki/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'pkgs/data') diff --git a/pkgs/data/themes/zuki/default.nix b/pkgs/data/themes/zuki/default.nix index 69399bdb0eb5..f55ed31c1cef 100644 --- a/pkgs/data/themes/zuki/default.nix +++ b/pkgs/data/themes/zuki/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "zuki-themes"; - version = "3.32-3"; + version = "3.32-4"; src = fetchFromGitHub { owner = "lassekongo83"; repo = pname; rev = "v${version}"; - sha256 = "1al1fb7pqrcdi4g6llz8ka4sc9hsprv2ba0kkc21r6vajs0qp83n"; + sha256 = "0kqhk9qy5hwsd6g0bmq2dg6yj9gbv7l514ripsfiqyllmf4h818h"; }; nativeBuildInputs = [ meson ninja sassc ]; -- cgit 1.4.1 From 87783a2900ba49a120730fc85fea7f268c38e528 Mon Sep 17 00:00:00 2001 From: Tad Fisher Date: Tue, 21 May 2019 17:26:00 -0700 Subject: plata-theme: 0.7.6 -> 0.8.0 --- pkgs/data/themes/plata/default.nix | 20 ++++++++++++++++---- 1 file changed, 16 insertions(+), 4 deletions(-) (limited to 'pkgs/data') diff --git a/pkgs/data/themes/plata/default.nix b/pkgs/data/themes/plata/default.nix index b43a6e35ab25..3b80c60044bd 100644 --- a/pkgs/data/themes/plata/default.nix +++ b/pkgs/data/themes/plata/default.nix @@ -8,23 +8,26 @@ , xfceSupport ? true , gtkNextSupport ? false , plankSupport ? false +, steamSupport ? false , telegramSupport ? false -, tweetdeckSupport ? false +, tweetdeckSupport ? false, zip ? null , selectionColor ? null # Primary color for 'selected-items' (Default: #3F51B5 = Indigo500) , accentColor ? null # Secondary color for notifications and OSDs (Default: #7986CB = Indigo300) , suggestionColor ? null # Secondary color for 'suggested' buttons (Default: #673AB7 = DPurple500) , destructionColor ? null # Tertiary color for 'destructive' buttons (Default: #F44336 = Red500) }: +assert tweetdeckSupport -> zip != null; + stdenv.mkDerivation rec { name = "plata-theme-${version}"; - version = "0.7.6"; + version = "0.8.0"; src = fetchFromGitLab { owner = "tista500"; repo = "plata-theme"; rev = version; - sha256 = "1jllsl2h3zdvlp3k2dy3h4jyccrzzymwbqz43jhnm6mxxabxzijg"; + sha256 = "10xvfrc945zqlgzlx8zjyg0gnkwmq9vfjk0yqjy3gg62i65s8sch"; }; preferLocalBuild = true; @@ -37,7 +40,8 @@ stdenv.mkDerivation rec { inkscape libxml2 gnome2.glib.dev - ]; + ] + ++ stdenv.lib.optional tweetdeckSupport zip; buildInputs = [ gdk_pixbuf @@ -62,6 +66,7 @@ stdenv.mkDerivation rec { (enableFeature xfceSupport "xfce") (enableFeature gtkNextSupport "gtk_next") (enableFeature plankSupport "plank") + (enableFeature steamSupport "airforsteam") (enableFeature telegramSupport "telegram") (enableFeature tweetdeckSupport "tweetdeck") ] @@ -70,6 +75,13 @@ stdenv.mkDerivation rec { ++ (withOptional suggestionColor "suggestion_color") ++ (withOptional destructionColor "destruction_color"); + postInstall = '' + for dest in $out/share/gtksourceview-{3.0,4}/styles; do + mkdir -p $dest + cp $out/share/themes/Plata-{Noir,Lumine}/gtksourceview/*.xml $dest + done + ''; + meta = with stdenv.lib; { description = "A Gtk+ theme based on Material Design Refresh"; homepage = https://gitlab.com/tista500/plata-theme; -- cgit 1.4.1 From a4a5e9c65d705da870e5cbf173c08a4b8bed701c Mon Sep 17 00:00:00 2001 From: Mario Rodas Date: Wed, 22 May 2019 21:00:00 -0500 Subject: hanazono: 20141012 -> 20170904 --- pkgs/data/fonts/hanazono/default.nix | 21 ++++++++++++++------- 1 file changed, 14 insertions(+), 7 deletions(-) (limited to 'pkgs/data') diff --git a/pkgs/data/fonts/hanazono/default.nix b/pkgs/data/fonts/hanazono/default.nix index 4def0b44b143..cc219b74179d 100644 --- a/pkgs/data/fonts/hanazono/default.nix +++ b/pkgs/data/fonts/hanazono/default.nix @@ -1,23 +1,30 @@ { lib, fetchzip }: let - version = "20141012"; + version = "20170904"; in fetchzip { name = "hanazono-${version}"; - url = "mirror://sourceforgejp/hanazono-font/62072/hanazono-${version}.zip"; + url = "mirror://sourceforgejp/hanazono-font/68253/hanazono-${version}.zip"; postFetch = '' - mkdir -p $out/share/fonts/hanazono $out/share/doc/hanazono - unzip -j $downloadedFile \*.ttf -d $out/share/fonts/hanazono + mkdir -p $out/share/{doc,fonts} + unzip -j $downloadedFile \*.ttf -d $out/share/fonts/truetype unzip -j $downloadedFile \*.txt -d $out/share/doc/hanazono ''; - sha256 = "0z0fgrjzp0hqqnhfisivciqpxd2br2w2q9mvxkglj44np2q889w2"; + sha256 = "0qiyd1vk3w8kqmwc6xi5d390wdr4ln8xhfbx3n8r1hhad9iz14p6"; meta = with lib; { - description = "Free kanji font containing 96,327 characters"; - homepage = http://fonts.jp/hanazono/; + description = "Japanese Mincho-typeface TrueType font"; + homepage = "https://fonts.jp/hanazono/"; + longDescription = '' + Hanazono Mincho typeface is a Japanese TrueType font that developed with a + support of Grant-in-Aid for Publication of Scientific Research Results + from Japan Society for the Promotion of Science and the International + Research Institute for Zen Buddhism (IRIZ), Hanazono University. also with + volunteers who work together on glyphwiki.org. + ''; # Dual-licensed under OFL and the following: # This font is a free software. -- cgit 1.4.1 From b93138e17418f3f4103cac0b90bcff8b9adfa0c3 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Fri, 24 May 2019 17:37:03 +0200 Subject: all-cabal-hashes: update to Hackage at 2019-05-24T00:09:15Z --- pkgs/data/misc/hackage/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'pkgs/data') diff --git a/pkgs/data/misc/hackage/default.nix b/pkgs/data/misc/hackage/default.nix index d1652be90d6b..78f660ae4431 100644 --- a/pkgs/data/misc/hackage/default.nix +++ b/pkgs/data/misc/hackage/default.nix @@ -1,6 +1,6 @@ { fetchurl }: fetchurl { - url = "https://github.com/commercialhaskell/all-cabal-hashes/archive/00d16ba60110e6956b6f7d31d520d0a34377b047.tar.gz"; - sha256 = "1f6d0a06g51r01mgg6fm9b8nd2bzkijf6jm6ljm5c62qgi4fkc7k"; + url = "https://github.com/commercialhaskell/all-cabal-hashes/archive/85d71d5231521c70b961570dbbee953253fb379b.tar.gz"; + sha256 = "1mdp2ivnx7wvd63bq1li9gpsm5sv1s167crv1jjlqw578lbi8hv7"; } -- cgit 1.4.1 From e5f2bea31bb1b1b75debadcf9bf5577e90c4fc82 Mon Sep 17 00:00:00 2001 From: Daniel Schaefer Date: Fri, 24 May 2019 19:51:50 +0200 Subject: stdmanpages: Use correct fdl12Plus license See: https://gcc.gnu.org/onlinedocs/libstdc++/ --- pkgs/data/documentation/std-man-pages/default.nix | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) (limited to 'pkgs/data') diff --git a/pkgs/data/documentation/std-man-pages/default.nix b/pkgs/data/documentation/std-man-pages/default.nix index 345971355001..d90fa99dd702 100644 --- a/pkgs/data/documentation/std-man-pages/default.nix +++ b/pkgs/data/documentation/std-man-pages/default.nix @@ -1,4 +1,4 @@ -{stdenv, fetchurl}: +{ stdenv, lib, fetchurl }: stdenv.mkDerivation rec { name = "std-man-pages-4.4.0"; @@ -15,10 +15,10 @@ stdenv.mkDerivation rec { cp -R * $out/share/man ''; - meta = { - description = "C++ STD manual pages"; - homepage = https://gcc.gnu.org/; - license = "GPL/LGPL"; - platforms = stdenv.lib.platforms.unix; + meta = with lib; { + description = "GCC C++ STD manual pages"; + homepage = "https://gcc.gnu.org/"; + license = with licenses; [ fdl12Plus ]; + platforms = platforms.unix; }; } -- cgit 1.4.1