Merge branch 'master' into staging-next

This commit is contained in:
Jan Tojnar
2019-11-30 19:44:51 +01:00
66 changed files with 572 additions and 163 deletions

View File

@@ -2,11 +2,11 @@
stdenv.mkDerivation rec {
pname = "man-pages";
version = "5.03";
version = "5.04";
src = fetchurl {
url = "mirror://kernel/linux/docs/man-pages/${pname}-${version}.tar.xz";
sha256 = "082i9258rl9xxjgpxpz3v8jcwk96dsk704ki9h9lq7q8z7m3mqbz";
sha256 = "1bx4ws24bjq6iyfyilg7aih5f0qrhy9l97ksrwcd4yxvjh8gn13x";
};
makeFlags = [ "MANDIR=$(out)/share/man" ];

View File

@@ -2,7 +2,7 @@
let
pname = "cascadia-code";
version = "1910.04";
version = "1911.20";
in
fetchurl {
name = "${pname}-${version}";
@@ -15,7 +15,7 @@ fetchurl {
install -Dm444 $downloadedFile $out/share/fonts/truetype/Cascadia.ttf
'';
sha256 = "124zbv7xwirwwxrm988h3plwd2vynqxyx7p2gijqrnw69q9pf67q";
sha256 = "1dfd3g7cf2h0z2gxvk4pxy46xswd3wyqz3p8ypxcv2dkz4ri6l0j";
meta = with lib; {
description = "Monospaced font that includes programming ligatures and is designed to enhance the modern look and feel of the Windows Terminal";

View File

@@ -19,13 +19,13 @@
stdenv.mkDerivation rec {
pname = "plata-theme";
version = "0.9.0";
version = "0.9.1";
src = fetchFromGitLab {
owner = "tista500";
repo = "plata-theme";
rev = version;
sha256 = "1bcjrnh6bm7pxyqrr39yx5zykf3yzxrsydd5xcawjfihnph3yrlg";
sha256 = "0rva56xdvsj6vwwvrn55137mw83c9p4xy00i3mq0ryh43imyj4mg";
};
preferLocalBuild = true;