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

Merge branch 'staging-next' into staging

Browse Source
This commit is contained in:
Vladimír Čunát
2019-02-01 09:42:53 +01:00
parent d00ca4476c 5effa4e0f9
commit 8ba516664b
458 changed files with 9823 additions and 5655 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
pkgs/data/fonts/source-code-pro/default.nix
View File

@@ -18,7 +18,7 @@ in fetchzip {
description = "A set of monospaced OpenType fonts designed for coding environments";
maintainers = with stdenv.lib.maintainers; [ relrod ];
platforms = with stdenv.lib.platforms; all;
homepage = https://blog.typekit.com/2012/09/24/source-code-pro/;
homepage = https://adobe-fonts.github.io/source-code-pro/;
license = stdenv.lib.licenses.ofl;
};
}

2
pkgs/data/fonts/source-sans-pro/default.nix
View File

@@ -15,7 +15,7 @@ fetchzip {
sha256 = "0xjdp226ybdcfylbpfsdgnz2bf4pj4qv1wfs6fv22hjxlzqfixf3";
meta = with stdenv.lib; {
homepage = https://sourceforge.net/adobe/sourcesans;
homepage = https://adobe-fonts.github.io/source-sans-pro/;
description = "A set of OpenType fonts designed by Adobe for UIs";
license = licenses.ofl;
platforms = platforms.all;

14
pkgs/data/fonts/source-serif-pro/default.nix
View File

@@ -1,21 +1,23 @@
{ stdenv, fetchzip }:
let
version = "1.017";
version = "2.010";
in fetchzip {
name = "source-serif-pro-${version}";
url = "https://github.com/adobe-fonts/source-serif-pro/archive/${version}R.zip";
url = "https://github.com/adobe-fonts/source-serif-pro/releases/download/${version}R-ro%2F1.010R-it/source-serif-pro-${version}R-ro-1.010R-it.zip";
postFetch = ''
mkdir -p $out/share/fonts/opentype
unzip -j $downloadedFile \*.otf -d $out/share/fonts/opentype
mkdir -p $out/share/fonts/{opentype,truetype,variable}
unzip -j $downloadedFile "*/OTF/*.otf" -d $out/share/fonts/opentype
unzip -j $downloadedFile "*/TTF/*.ttf" -d $out/share/fonts/truetype
unzip -j $downloadedFile "*/VAR/*.otf" -d $out/share/fonts/variable
'';
sha256 = "04447fbj7lwr2qmmvy7d7624qdh4in7hp627nsc8vbpxmb7bbmn1";
sha256 = "1a3lmqk7hyxpfkb30s9z73lhs823dmq6xr5llp9w23g6bh332x2h";
meta = with stdenv.lib; {
homepage = https://sourceforge.net/adobe/sourceserifpro;
homepage = https://adobe-fonts.github.io/source-serif-pro/;
description = "A set of OpenType fonts to complement Source Sans Pro";
license = licenses.ofl;
platforms = platforms.all;

4
pkgs/data/icons/zafiro-icons/default.nix
View File

@@ -2,13 +2,13 @@
stdenv.mkDerivation rec {
pname = "zafiro-icons";
version = "0.8.3";
version = "0.8.4";
src = fetchFromGitHub {
owner = "zayronxio";
repo = pname;
rev = "v${version}";
sha256 = "1hflpnliww5fkk7bsgmi8hlrbqvkijjjmbzjqnnl991nqsqxqxpl";
sha256 = "1jdijiccazn2g42x1w1m4hl94ach9b2kl3rwb0mpy7ykdzmj6vj0";
};
nativeBuildInputs = [ gtk3 ];

4
pkgs/data/misc/hackage/default.nix
View File

@@ -1,6 +1,6 @@
{ fetchurl }:
fetchurl {
url = "https://github.com/commercialhaskell/all-cabal-hashes/archive/79e6c7e847ee9ff93fff64a4081251f3bbfb7ca7.tar.gz";
sha256 = "19ypss73lb3zwhzpw9sxdmgy7dha798ism77vm3ccyxg66qav41n";
url = "https://github.com/commercialhaskell/all-cabal-hashes/archive/c400563a55894c34ae0d7dec415ac8994aa74aa0.tar.gz";
sha256 = "0mqgfw8sc0h4p031gcs4m3n6rbd31zrqx2lh1xgplhxldhw5gg8p";
}