nordic-dev.net/nixpkgs
nordic-dev.net/nixpkgs
2
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2024-11-23 15:33:13 +00:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source 
Merge into staging-24.05.
This commit is contained in:
Vladimír Čunát 2024-09-11 09:27:45 +02:00
commit 90de4369db
No known key found for this signature in database
GPG Key ID: E747DF1F9575A3AA
1 changed files with 6 additions and 7 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: { stdenv.mkDerivation (finalAttrs: {
pname = "tzdata"; pname = "tzdata";
version = "2024a"; version = "2024b";
srcs = [ srcs = [
(fetchurl { (fetchurl {
url = "https://data.iana.org/time-zones/releases/tzdata${finalAttrs.version}.tar.gz"; url = "https://data.iana.org/time-zones/releases/tzdata${finalAttrs.version}.tar.gz";
hash = "sha256-DQQ0RZrL0gWaeo2h8zBKhKhlkfbtacYkj/+lArbt/+M="; hash = "sha256-cOdU2xJqjQ2z0W1rTLX37B4E1fJhJV5FWKZ/6S055VA=";
}) })
(fetchurl { (fetchurl {
url = "https://data.iana.org/time-zones/releases/tzcode${finalAttrs.version}.tar.gz"; url = "https://data.iana.org/time-zones/releases/tzcode${finalAttrs.version}.tar.gz";
hash = "sha256-gAcolK3/WkWPHRQ+FuTKHYsqEiycU5naSCy2jLpqH/g="; hash = "sha256-XkOPxEliSQavFqGP9Fc3OfDNqYYuXsKNO8sZy67Q9nI=";
}) })
]; ];
@ -45,11 +45,10 @@ stdenv.mkDerivation (finalAttrs: {
"CFLAGS+=-DRESERVE_STD_EXT_IDS" "CFLAGS+=-DRESERVE_STD_EXT_IDS"
]; ];
enableParallelBuilding = true;
doCheck = true; doCheck = true;
# everything except for: checkTarget = "check";
# - 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) [ installFlags = lib.optionals (stdenv.buildPlatform != stdenv.hostPlatform) [
"zic=${buildPackages.tzdata.bin}/bin/zic" "zic=${buildPackages.tzdata.bin}/bin/zic"