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

Merge remote-tracking branch 'origin/staging' into mb-cross-fixes-march-2020

Browse Source
This commit is contained in:
Matthew Bauer
2020-03-16 14:34:03 -04:00
parent e9c2957c14 b8cff61c33
commit 67b0ddf3f3
765 changed files with 16014 additions and 9655 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkgs/data/fonts/jetbrains-mono/default.nix
+3 -2
View File
@@ -1,18 +1,19 @@
{ lib, fetchzip }:
let
version = "1.0.3";
version = "1.0.4";
in
fetchzip rec {
name = "JetBrainsMono-${version}";
url = "https://github.com/JetBrains/JetBrainsMono/releases/download/v${version}/JetBrainsMono-${version}.zip";
sha256 = "16am5fxvda24jfl8lb9jf8mkcqfc97scj8hvwgd3m771db0dpflf";
sha256 = "1m6wppz6mrh7475d92yvwrjgbwkkcfq444v0im90f5c7fsf3dzbd";
postFetch = ''
mkdir -p $out/share/fonts
unzip -j $downloadedFile \*.ttf -d $out/share/fonts/truetype
unzip -j $downloadedFile \*.eot -d $out/share/fonts/eot
unzip -j $downloadedFile \*.woff -d $out/share/fonts/woff
unzip -j $downloadedFile \*.woff2 -d $out/share/fonts/woff2
'';
pkgs/data/fonts/jost/default.nix
+2 -2
View File
@@ -1,7 +1,7 @@
{stdenv, fetchzip}:
let
version = "3.3";
version = "3.5";
in fetchzip {
name = "jost-${version}";
url = "https://github.com/indestructible-type/Jost/releases/download/${version}/Jost.zip";
@@ -11,7 +11,7 @@ in fetchzip {
unzip -j $downloadedFile \*.otf -d $out/share/fonts/opentype
'';
sha256="00nrhs3aif2hc4yhjhbn9ywmydl2w0g0hv5m5is8gv7wx8yi2j9z";
sha256="0l78vhmbsyfmrva5wc76pskhxqryyg8q5xddpj9g5wqsddy525dq";
meta = with stdenv.lib; {
homepage = https://github.com/indestructible-type/Jost;
pkgs/data/fonts/recursive/default.nix
+2 -2
View File
@@ -1,7 +1,7 @@
{ lib, fetchzip }:
let
version = "1.042";
version = "1.043";
in
fetchzip {
name = "recursive-${version}";
@@ -14,7 +14,7 @@ fetchzip {
unzip -j $downloadedFile \*.woff2 -d $out/share/fonts/woff2
'';
sha256 = "1zcrvnzwd39fim2jxa3by6jgdrx7fdp64iw2bd181iwzinv1yqsa";
sha256 = "0y7wg3ssr4j0r8dyxd0i0ji8bjvipzsqf0l6wznl5sfxk41mvjvd";
meta = with lib; {
homepage = "https://recursive.design/";
pkgs/data/icons/capitaine-cursors/default.nix
+10 -7
View File
@@ -1,15 +1,15 @@
{ stdenv, fetchFromGitHub
, inkscape, xcursorgen }:
, inkscape, xcursorgen, bc }:
stdenv.mkDerivation rec {
pname = "capitaine-cursors";
version = "3";
version = "4";
src = fetchFromGitHub {
owner = "keeferrourke";
repo = pname;
rev = "r${version}";
sha256 = "0pnfbmrn9nv8pryv6cbjcq5hl9366hzvz1kd8vsdkgb2nlfv5gdv";
sha256 = "0652ydy73x29z7wc6ccyqihmfg4bk0ksl7yryycln6c7i0iqfmc9";
};
postPatch = ''
@@ -19,24 +19,27 @@ stdenv.mkDerivation rec {
buildInputs =[
inkscape
xcursorgen
bc
];
buildPhase = ''
for variant in dark light ; do
# https://github.com/NixOS/nixpkgs/blob/master/pkgs/data/fonts/emojione/default.nix#L16
HOME="$NIX_BUILD_ROOT" ./build.sh
HOME="$NIX_BUILD_ROOT" ./build.sh --max-dpi xhd --type $variant
done
'';
installPhase = ''
install -dm 0755 $out/share/icons
cp -pr dist $out/share/icons/capitaine-cursors
cp -pr dist-white $out/share/icons/capitaine-cursors-white
cp -pr dist/dark $out/share/icons/capitaine-cursors
cp -pr dist/light $out/share/icons/capitaine-cursors-white
'';
meta = with stdenv.lib; {
description = ''
An x-cursor theme inspired by macOS and based on KDE Breeze
'';
homepage = https://github.com/keeferrourke/capitaine-cursors;
homepage = "https://github.com/keeferrourke/capitaine-cursors";
license = licenses.lgpl3;
platforms = platforms.linux;
maintainers = with maintainers; [
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/3ff0be5c9ee1ead33e07158b9a4a579fa2fb7a7f.tar.gz";
sha256 = "15jqdjxyzcmg50zvl7szv6s2zi4k82as5wi6mkiwwpbdricg50pl";
url = "https://github.com/commercialhaskell/all-cabal-hashes/archive/fcb0ed924c8504d54870d6dc2092b9dab8305732.tar.gz";
sha256 = "0b7dxgj40y9svddrx14scnxls20ww4f717zhz3lwigb16dm4crpi";
}
pkgs/data/misc/osinfo-db/default.nix
+3 -3
View File
@@ -2,11 +2,11 @@
stdenv.mkDerivation rec {
pname = "osinfo-db";
version = "20200203";
version = "20200214";
src = fetchurl {
url = "https://releases.pagure.org/libosinfo/${pname}-${version}.tar.xz";
sha256 = "1zjq1dhlci00j17dij7s3l30hybzmaykpk5b6bd5xbllp745njn5";
sha256 = "1fpdb8r8kzwp1k5dc9xyy9jr2jr3haq7n9b6spamm599zvzf8nb6";
};
nativeBuildInputs = [ osinfo-db-tools intltool libxml2 ];
@@ -19,7 +19,7 @@ stdenv.mkDerivation rec {
meta = with stdenv.lib; {
description = "Osinfo database of information about operating systems for virtualization provisioning tools";
homepage = https://libosinfo.org/;
homepage = "https://libosinfo.org/";
license = licenses.gpl2Plus;
platforms = platforms.linux;
maintainers = [ maintainers.bjornfor ];
pkgs/data/themes/matcha/default.nix
+2 -2
View File
@@ -2,13 +2,13 @@
stdenv.mkDerivation rec {
pname = "matcha";
version = "2020-03-01";
version = "2020-03-11";
src = fetchFromGitHub {
owner = "vinceliuice";
repo = pname;
rev = version;
sha256 = "09nb6xsysfg477zcm9y49iaczxksxrd4zh3n8dp7rlzc2h2kicpn";
sha256 = "1np2964g5f0vwdvfmi8gidsk9jj7v43nkshiqnfdbvmwa85ldpfl";
};
buildInputs = [ gdk-pixbuf librsvg ];
pkgs/data/themes/plata/default.nix
+3 -3
View File
@@ -19,13 +19,13 @@
stdenv.mkDerivation rec {
pname = "plata-theme";
version = "0.9.2";
version = "0.9.3";
src = fetchFromGitLab {
owner = "tista500";
repo = "plata-theme";
rev = version;
sha256 = "1z8kiac3gb4hsyq92p5dd8fyjv7bad55q65kbnjiskpm4ircg4ja";
sha256 = "183kas7b5vxm6l2m5c4yh8cnq05sfa82afcp9h6cfj2rh2iv6kqy";
};
preferLocalBuild = true;
@@ -83,7 +83,7 @@ stdenv.mkDerivation rec {
meta = with stdenv.lib; {
description = "A GTK theme based on Material Design Refresh";
homepage = https://gitlab.com/tista500/plata-theme;
homepage = "https://gitlab.com/tista500/plata-theme";
license = with licenses; [ gpl2 cc-by-sa-40 ];
platforms = platforms.linux;
maintainers = [ maintainers.tadfisher ];