mirrors/nixpkgs
1
0
Fork 1
mirror of https://github.com/NixOS/nixpkgs.git synced 2024-09-11 15:08:33 +01:00
Code Issues Wiki Activity

Revert "tzdata: 2024a -> 2024b (#340296)"

Browse source 
This reverts commit 90de4369db, reversing
changes made to 012ba86a5a.

It's quite broken; even blocking stdenv on aarch64-darwin.
This commit is contained in:
Vladimír Čunát 2024-09-11 15:12:13 +02:00
parent c91a4e2d71
commit 5dd3a70bbc
No known key found for this signature in database
GPG key ID: E747DF1F9575A3AA
1 changed files with 7 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
pkgs/data/misc/tzdata/default.nix
View file

@ -2,16 +2,16 @@
stdenv.mkDerivation (finalAttrs: {
pname = "tzdata";
version = "2024b";
version = "2024a";
srcs = [
(fetchurl {
url = "https://data.iana.org/time-zones/releases/tzdata${finalAttrs.version}.tar.gz";
hash = "sha256-cOdU2xJqjQ2z0W1rTLX37B4E1fJhJV5FWKZ/6S055VA=";
hash = "sha256-DQQ0RZrL0gWaeo2h8zBKhKhlkfbtacYkj/+lArbt/+M=";
})
(fetchurl {
url = "https://data.iana.org/time-zones/releases/tzcode${finalAttrs.version}.tar.gz";
hash = "sha256-XkOPxEliSQavFqGP9Fc3OfDNqYYuXsKNO8sZy67Q9nI=";
hash = "sha256-gAcolK3/WkWPHRQ+FuTKHYsqEiycU5naSCy2jLpqH/g=";
})
];
@ -45,10 +45,11 @@ stdenv.mkDerivation (finalAttrs: {
"CFLAGS+=-DRESERVE_STD_EXT_IDS"
];
enableParallelBuilding = true;
doCheck = true;
checkTarget = "check";
# everything except for:
# - check_web, because that needs curl and wants to talk to https://validator.w3.org
# - check_now, because that depends on the current time
checkTarget = "check_back check_character_set check_white_space check_links check_name_lengths check_slashed_abbrs check_sorted check_tables check_ziguard check_zishrink check_tzs";
installFlags = lib.optionals (stdenv.buildPlatform != stdenv.hostPlatform) [
"zic=${buildPackages.tzdata.bin}/bin/zic"