Merge branch 'master' into staging

This commit is contained in:
Orivej Desh
2020-03-23 00:53:16 +00:00
802 changed files with 31592 additions and 15462 deletions
@@ -3,14 +3,14 @@
let
version = "1.959";
in fetchzip rec {
name = "latinmodern-math-${version}";
name = "lmmath-${version}";
url = "http://www.gust.org.pl/projects/e-foundry/lm-math/download/latinmodern-math-1959.zip";
postFetch = ''
mkdir -p $out/share/fonts/opentype/
mkdir -p $out/share/doc/${name}/
unzip -f $downloadedFile otf/*.otf -d $out/share/fonts/opentype/
unzip -f $downloadedFile doc/*.txt -d $out/share/doc/${name}/
mkdir -p $out/share/doc/latinmodern-math-${version}/
unzip -j $downloadedFile "*/otf/*.otf" -d $out/share/fonts/opentype/
unzip -j $downloadedFile "*/doc/*.txt" -d $out/share/doc/latinmodern-math-${version}/
'';
sha256 = "05k145bxgxjh7i9gx1ahigxfpc2v2vwzsy2mc41jvvg51kjr8fnn";
-26
View File
@@ -1,26 +0,0 @@
{ fetchzip }:
fetchzip {
name = "lmmath-0.903";
url = "http://www.gust.org.pl/projects/e-foundry/lm-math/download/lmmath0903otf";
postFetch = ''
unzip $downloadedFile
mkdir -p $out/texmf-dist/fonts/opentype
mkdir -p $out/share/fonts/opentype
cp *.{OTF,otf} $out/texmf-dist/fonts/opentype/lmmath-regular.otf
cp *.{OTF,otf} $out/share/fonts/opentype/lmmath-regular.otf
ln -s -r $out/texmf* $out/share/
'';
sha256 = "19821d4vbd6z20jzsw24zh0hhwayglhrfw8larg2w6alhdqi7rln";
meta = {
description = "Latin Modern font";
};
}
+2 -2
View File
@@ -13,10 +13,10 @@ fetchFromGitHub {
find . -name '*.ttf' -exec install -Dt $out/share/fonts/truetype {} \;
find . -name '*.bdf' -exec install -Dt $out/share/fonts/bdf {} \;
find . -name '*.pcf.gz' -exec install -Dt $out/share/fonts/pcf {} \;
find . -name '*.psf.gz' -exec install -Dt $out/share/fonts/psf {} \;
find . -name '*.psf.gz' -exec install -Dt $out/share/consolefonts {} \;
'';
sha256 = "0irifak86gn7hawzgxcy53s22y215mxc2kjncv37h7q44jsqdqww";
sha256 = "0r8p4z3db17f5p8jr7sv80nglmjxhg83ncfvwg1dszldswr0dhvr";
meta = with lib; {
homepage = https://github.com/powerline/fonts;
@@ -5,11 +5,11 @@
stdenv.mkDerivation rec {
pname = "unicode-character-database";
version = "12.1.0";
version = "13.0.0";
src = fetchurl {
url = "https://www.unicode.org/Public/zipped/${version}/UCD.zip";
sha256 = "19m06iw0jl7lhlggcmghi12p6jld0qrmfpksgc243yn6sjh53fi5";
sha256 = "0ld97ppkb5f8d5b3mlkxfwnr6f3inijyqias9xc4bbin9lxrfxig";
};
nativeBuildInputs = [
+40
View File
@@ -0,0 +1,40 @@
{ stdenv, fetchurl, gtk-engine-murrine }:
let
themeName = "Ant-Bloody";
in
stdenv.mkDerivation rec {
pname = "ant-bloody-theme";
version = "1.3.0";
src = fetchurl {
url = "https://github.com/EliverLara/${themeName}/releases/download/v${version}/${themeName}.tar";
sha256 = "0rrz50kmzjmqj17hvrw67pbaclwxv85i5m08s7842iky6dnn5z8s";
};
propagatedUserEnvPkgs = [
gtk-engine-murrine
];
dontBuild = true;
installPhase = ''
runHook preInstall
mkdir -p $out/share/themes/${themeName}
cp -a * $out/share/themes/${themeName}
rm -r $out/share/themes/${themeName}/{Art,LICENSE,README.md,gtk-2.0/render-assets.sh}
runHook postInstall
'';
outputHashAlgo = "sha256";
outputHashMode = "recursive";
outputHash = "0v5pdhysa2460sh400cpq11smcfsi9g1lbfzx8nj1w5a21d811cz";
meta = with stdenv.lib; {
description = "Bloody variant of the Ant theme";
homepage = "https://github.com/EliverLara/${themeName}";
license = licenses.gpl3;
platforms = platforms.all;
maintainers = with maintainers; [ alexarice ];
};
}
@@ -0,0 +1,40 @@
{ stdenv, fetchurl, gtk-engine-murrine }:
let
themeName = "Ant-Dracula";
in
stdenv.mkDerivation rec {
pname = "ant-dracula-theme";
version = "1.3.0";
src = fetchurl {
url = "https://github.com/EliverLara/${themeName}/releases/download/v${version}/${themeName}.tar";
sha256 = "00b8w69xapqy8kc7zqwlfz1xpld6hibbh35djvhcnd905gzzymkd";
};
propagatedUserEnvPkgs = [
gtk-engine-murrine
];
dontBuild = true;
installPhase = ''
runHook preInstall
mkdir -p $out/share/themes/${themeName}
cp -a * $out/share/themes/${themeName}
rm -r $out/share/themes/${themeName}/{Art,LICENSE,README.md,gtk-2.0/render-assets.sh}
runHook postInstall
'';
outputHashAlgo = "sha256";
outputHashMode = "recursive";
outputHash = "1a9mkxfb0zixx8s05h15lhnnzygh2qzc8k2q10i0khx90bf72x14";
meta = with stdenv.lib; {
description = "Dracula variant of the Ant theme";
homepage = "https://github.com/EliverLara/${themeName}";
license = licenses.gpl3;
platforms = platforms.all;
maintainers = with maintainers; [ alexarice ];
};
}
+40
View File
@@ -0,0 +1,40 @@
{ stdenv, fetchurl, gtk-engine-murrine }:
let
themeName = "Ant-Nebula";
in
stdenv.mkDerivation rec {
pname = "ant-nebula-theme";
version = "1.3.0";
src = fetchurl {
url = "https://github.com/EliverLara/${themeName}/releases/download/v${version}/${themeName}.tar";
sha256 = "1xpgw577nmgjk547mg2vvv0gdai60srgncykm5pb1w8dnlk69jbz";
};
propagatedUserEnvPkgs = [
gtk-engine-murrine
];
dontBuild = true;
installPhase = ''
runHook preInstall
mkdir -p $out/share/themes/${themeName}
cp -a * $out/share/themes/${themeName}
rm -r $out/share/themes/${themeName}/{Art,LICENSE,README.md,gtk-2.0/render-assets.sh}
runHook postInstall
'';
outputHashAlgo = "sha256";
outputHashMode = "recursive";
outputHash = "1lmlc4fvjnp05gshc0arfysh8r1xxzpzdv3j0bk40mjf3d59814c";
meta = with stdenv.lib; {
description = "Nebula variant of the Ant theme";
homepage = "https://github.com/EliverLara/${themeName}";
license = licenses.gpl3;
platforms = platforms.all;
maintainers = with maintainers; [ alexarice ];
};
}
@@ -1,11 +1,14 @@
{ stdenv, fetchurl, gtk-engine-murrine }:
let
themeName = "Ant";
in
stdenv.mkDerivation rec {
pname = "ant-theme";
version = "1.3.0";
src = fetchurl {
url = "https://github.com/EliverLara/Ant/releases/download/v${version}/Ant.tar";
url = "https://github.com/EliverLara/${themeName}/releases/download/v${version}/${themeName}.tar";
sha256 = "1r795v96ywzcb4dq08q2fdbmfia32g36cc512mhy41s8fb1a47dz";
};
@@ -17,21 +20,21 @@ stdenv.mkDerivation rec {
installPhase = ''
runHook preInstall
mkdir -p $out/share/themes/Ant
cp -a * $out/share/themes/Ant
rm -r $out/share/themes/Ant/{Art,LICENSE,README.md,gtk-2.0/render-assets.sh}
mkdir -p $out/share/themes/${themeName}
cp -a * $out/share/themes/${themeName}
rm -r $out/share/themes/${themeName}/{Art,LICENSE,README.md,gtk-2.0/render-assets.sh}
runHook postInstall
'';
outputHashAlgo = "sha256";
outputHashMode = "recursive";
outputHash = "1gpacrmi5y87shp39jgy78n0ca2xdpvbqfh0mgldlxx99ca9rvvy";
outputHash = "07iv4jangqnzrvjr749vl3x31z7dxds51bq1bhz5acbjbwf25wjf";
meta = with stdenv.lib; {
description = "A flat and light theme with a modern look";
homepage = https://github.com/EliverLara/Ant;
homepage = "https://github.com/EliverLara/${themeName}";
license = licenses.gpl3;
platforms = platforms.all;
maintainers = [ ];
maintainers = with maintainers; [ alexarice ];
};
}
+2 -2
View File
@@ -2,13 +2,13 @@
stdenv.mkDerivation rec {
pname = "matcha";
version = "2020-03-11";
version = "2020-03-15";
src = fetchFromGitHub {
owner = "vinceliuice";
repo = pname;
rev = version;
sha256 = "1np2964g5f0vwdvfmi8gidsk9jj7v43nkshiqnfdbvmwa85ldpfl";
sha256 = "0hj1hpg9p46hyfcssd5ac7m599zkq7nrbwdwfbp98g5rw4fq8jaw";
};
buildInputs = [ gdk-pixbuf librsvg ];
+24 -4
View File
@@ -1,15 +1,15 @@
{ stdenv, fetchFromGitHub, fetchurl, gtk_engines, gtk-engine-murrine }:
{ stdenv, fetchFromGitHub, fetchurl, glib, gtk-engine-murrine, gtk_engines, inkscape, optipng, sassc, which }:
stdenv.mkDerivation rec {
pname = "mojave-gtk-theme";
version = "2020-02-20";
version = "2020-03-19";
srcs = [
(fetchFromGitHub {
owner = "vinceliuice";
repo = pname;
rev = version;
sha256 = "0fbpjfdx53g4qicr97jl1dssykjwwca9xzrfyh53dmd81vr6znpy";
sha256 = "1f120sx092i56q4dx2b8d3nnn9pdw67656446nw702rix7zc5jpx";
})
(fetchurl {
url = "https://github.com/vinceliuice/Mojave-gtk-theme/raw/11741a99d96953daf9c27e44c94ae50a7247c0ed/macOS_Mojave_Wallpapers.tar.xz";
@@ -19,12 +19,32 @@ stdenv.mkDerivation rec {
sourceRoot = "source";
nativeBuildInputs = [ glib inkscape optipng sassc which ];
buildInputs = [ gtk_engines ];
propagatedUserEnvPkgs = [ gtk-engine-murrine ];
installPhase = ''
postPatch = ''
patchShebangs .
for f in render-assets.sh \
src/assets/gtk-2.0/render-assets.sh \
src/assets/gtk-3.0/common-assets/render-assets.sh \
src/assets/gtk-3.0/windows-assets/render-assets.sh \
src/assets/metacity-1/render-assets.sh \
src/assets/xfwm4/render-assets.sh
do
substituteInPlace $f \
--replace /usr/bin/inkscape ${inkscape}/bin/inkscape \
--replace /usr/bin/optipng ${optipng}/bin/optipng
done
# Shut up inkscape's warnings
export HOME="$NIX_BUILD_ROOT"
'';
installPhase = ''
name= ./install.sh -d $out/share/themes
install -D -t $out/share/wallpapers ../"macOS Mojave Wallpapers"/*
'';