Merge remote-tracking branch 'origin/master' into staging

This commit is contained in:
Matthew Bauer
2019-09-20 23:25:24 -04:00
211 changed files with 6656 additions and 2892 deletions
+2 -3
View File
@@ -3,7 +3,7 @@
fetchzip {
name = "vista-fonts-1";
url = http://download.microsoft.com/download/f/5/a/f5a3df76-d856-4a61-a6bd-722f52a5be26/PowerPointViewer.exe;
url = https://web.archive.org/web/20171225132744/http://download.microsoft.com/download/E/6/7/E675FFFC-2A6D-4AB0-B3EB-27C9F8C8F696/PowerPointViewer.exe;
postFetch = ''
${cabextract}/bin/cabextract --lowercase --filter ppviewer.cab $downloadedFile
@@ -21,7 +21,7 @@ fetchzip {
done
'';
sha256 = "1q2d24c203vkl6pwk86frmaj6jra49hr9mydq7cnlx4hilqslw3g";
sha256 = "1l27zg5jraa16zm11d3qz1w7m6f1ih3xy5avww454ylm50fw6z11";
meta = {
description = "Some TrueType fonts from Microsoft Windows Vista (Calibri, Cambria, Candara, Consolas, Constantia, Corbel)";
@@ -31,6 +31,5 @@ fetchzip {
# Set a non-zero priority to allow easy overriding of the
# fontconfig configuration files.
priority = 5;
broken = true; # source url is 404
};
}
@@ -0,0 +1,36 @@
{ stdenv, fetchFromGitHub, cmake, gtk3 }:
stdenv.mkDerivation rec {
pname = "papirus-maia-icon-theme";
version = "2019-07-26";
src = fetchFromGitHub {
owner = "Ste74";
repo = pname;
rev = "90d47c817cc0edeed8b5a90335e669948ff4a116";
sha256 = "0d6lvdg5nw5wfaq8lxszcws174vg12ywkrqzn6czimhmhp48jf5p";
};
nativeBuildInputs = [
cmake
gtk3
];
postPatch = ''
substituteInPlace CMakeLists.txt --replace /usr "$out"
'';
postFixup = ''
for theme in $out/share/icons/*; do
gtk-update-icon-cache $theme
done
'';
meta = with stdenv.lib; {
description = "Manjaro variation of Papirus icon theme";
homepage = https://github.com/Ste74/papirus-maia-icon-theme;
license = licenses.lgpl3;
platforms = platforms.linux;
maintainers = with maintainers; [ romildo ];
};
}
+2 -2
View File
@@ -3,13 +3,13 @@
stdenv.mkDerivation rec {
pname = "arc-theme";
version = "20190910";
version = "20190917";
src = fetchFromGitHub {
owner = "arc-design";
repo = pname;
rev = version;
sha256 = "161kx9ii5ij1503nvhgn3pyqfj7cj03l1di2yf8kwwfczbi4mq3j";
sha256 = "1qgpk4p2hi5hd4yy0hj93kq1vs0b32wb8qkaj1wi90c8gwddq5wa";
};
nativeBuildInputs = [