public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge master into staging-next

Browse Source
This commit is contained in:
Frederik Rietdijk
2019-05-25 12:38:00 +02:00
parent dae72e7e7d fa05f332eb
commit b2ab860db3
381 changed files with 9647 additions and 5560 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkgs/data/documentation/std-man-pages/default.nix
+6 -6
View File
@@ -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;
};
}
pkgs/data/fonts/hanazono/default.nix
+14 -7
View File
@@ -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.
pkgs/data/fonts/redhat-official/default.nix
+22
View File
@@ -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 ];
};
}
pkgs/data/misc/hackage/default.nix
+2 -2
View File
@@ -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";
}
pkgs/data/themes/mojave/default.nix
+3 -3
View File
@@ -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 ];
pkgs/data/themes/plata/default.nix
+16 -4
View File
@@ -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;
pkgs/data/themes/stilo/default.nix
+27
View File
@@ -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 ];
};
}
pkgs/data/themes/zuki/default.nix
+6 -9
View File
@@ -1,25 +1,22 @@
{ 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-4";
src = fetchFromGitHub {
owner = "lassekongo83";
repo = pname;
rev = "v${version}";
sha256 = "0x6ghc7n5y7p0agm2yp7rygz9154f58s891zxzhd07wc2c4mzp0s";
sha256 = "0kqhk9qy5hwsd6g0bmq2dg6yj9gbv7l514ripsfiqyllmf4h818h";
};
buildInputs = [ gdk_pixbuf librsvg ];
nativeBuildInputs = [ meson ninja sassc ];
buildInputs = [ gdk_pixbuf librsvg gtk_engines ];
propagatedUserEnvPkgs = [ gtk-engine-murrine ];
installPhase = ''
install -dm 755 $out/share/themes
cp -a Zuki* $out/share/themes/
'';
meta = with stdenv.lib; {
description = "Themes for GTK3, gnome-shell and more";
homepage = https://github.com/lassekongo83/zuki-themes;