Merge branch 'master' into staging

This commit is contained in:
Robert Schütz
2019-05-03 16:01:49 +02:00
187 changed files with 2862 additions and 1404 deletions
@@ -1,12 +1,13 @@
{ stdenv, fetchFromGitHub, inkscape, imagemagick, potrace, svgo, scfbuild }:
stdenv.mkDerivation rec {
name = "twemoji-color-font-${meta.version}";
pname = "twemoji-color-font";
version = "12.0.1";
src = fetchFromGitHub {
owner = "eosrei";
repo = "twemoji-color-font";
rev = "v${meta.version}";
sha256 = "07yawvbdkk15d7ac9dj7drs1rqln9sba1fd6jx885ms7ww2sfm7r";
rev = "v${version}";
sha256 = "00pbgqpkq21wl8fs0q1xp49xb10m48b9sz8cdc58flkd2vqfssw2";
};
nativeBuildInputs = [ inkscape imagemagick potrace svgo scfbuild ];
@@ -21,7 +22,6 @@ stdenv.mkDerivation rec {
'';
meta = with stdenv.lib; {
version = "11.2.0";
description = "Color emoji SVGinOT font using Twitter Unicode 10 emoji with diversity and country flags";
longDescription = ''
A color and B&W emoji SVGinOT font built from the Twitter Emoji for
+2 -2
View File
@@ -1,6 +1,6 @@
{ fetchurl }:
fetchurl {
url = "https://github.com/commercialhaskell/all-cabal-hashes/archive/179aac2faddbba8921029ca9851ad97bcaa79991.tar.gz";
sha256 = "17cbapnvpasdpza2r1y7lf4y4b31k094jqsnx89dn8zwp8n862lv";
url = "https://github.com/commercialhaskell/all-cabal-hashes/archive/3f0c3944190bf34286e4e80620fede11dd688f68.tar.gz";
sha256 = "1i4k4wjm6w8hgwia1axwdr3ij0ckxh3ikc1f0nlk8sb0j3yrmxa6";
}
+36
View File
@@ -0,0 +1,36 @@
{ stdenv, fetchFromGitHub, gtk3, sassc }:
stdenv.mkDerivation rec {
pname = "tetra-gtk-theme";
version = "201905";
src = fetchFromGitHub {
owner = "hrdwrrsk";
repo = pname;
rev = version;
sha256 = "1j2w8na564f5yjm5am7843hq5qk28h1rq8rcbak4xsygdc3lbsfi";
};
preBuild = ''
# Shut up inkscape's warnings
export HOME="$NIX_BUILD_ROOT"
'';
nativeBuildInputs = [ sassc ];
buildInputs = [ gtk3 ];
postPatch = "patchShebangs .";
installPhase = ''
mkdir -p $out/share/themes
./install.sh -d $out/share/themes
'';
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;
license = licenses.gpl3;
maintainers = with maintainers; [ dtzWill ];
platforms = platforms.linux;
};
}