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
2020-10-25 09:47:04 +01:00
parent 8d6bd565a1 4bd836b381
commit 2f6b00b15e
418 changed files with 7056 additions and 3808 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -9,7 +9,7 @@ in fetchFromGitLab {
domain = "salsa.debian.org";
owner = "fonts-team";
repo = "fonts-open-sans";
rev = "debian%2F1.11-1"; # URL-encoded form of "debian/1.11-1" tag
rev = "debian/1.11-1";
postFetch = ''
tar xf $downloadedFile --strip=1
mkdir -p $out/share/fonts/truetype

6
pkgs/data/misc/tzdata/default.nix
View File

@@ -2,16 +2,16 @@
stdenv.mkDerivation rec {
pname = "tzdata";
version = "2020c";
version = "2019c";
srcs =
[ (fetchurl {
url = "https://data.iana.org/time-zones/releases/tzdata${version}.tar.gz";
sha256 = "1nab36g5ibs88wg2mzpzygi1wh5gh2al1qjvbk8sb90sbw8ar43q";
sha256 = "0z7w1yv37cfk8yhix2cillam091vgp1j4g8fv84261q9mdnq1ivr";
})
(fetchurl {
url = "https://data.iana.org/time-zones/releases/tzcode${version}.tar.gz";
sha256 = "1r5zrk1k3jhhilkhrx82fd19rvysji8jk05gq5v0rndmyx07zacs";
sha256 = "1m3y2rnf1nggxxhxplab5zdd5whvar3ijyrv7lifvm82irkd7szn";
})
];