diff options
| author | ajs124 <git@ajs124.de> | 2024-02-01 20:50:27 +0100 |
|---|---|---|
| committer | ajs124 <git@ajs124.de> | 2024-02-01 20:50:27 +0100 |
| commit | 17a860e8dc94d0a455d7d819f3f912c17d681c6a (patch) | |
| tree | cd075ff6ba2620535c108df3e9a28b2bcdad94ba /pkgs/data | |
| parent | e81e82cdccfc40966f4905aafb5f2d19cdc0f4c0 (diff) | |
| download | nixlib-17a860e8dc94d0a455d7d819f3f912c17d681c6a.tar nixlib-17a860e8dc94d0a455d7d819f3f912c17d681c6a.tar.gz nixlib-17a860e8dc94d0a455d7d819f3f912c17d681c6a.tar.bz2 nixlib-17a860e8dc94d0a455d7d819f3f912c17d681c6a.tar.lz nixlib-17a860e8dc94d0a455d7d819f3f912c17d681c6a.tar.xz nixlib-17a860e8dc94d0a455d7d819f3f912c17d681c6a.tar.zst nixlib-17a860e8dc94d0a455d7d819f3f912c17d681c6a.zip | |
tzdata: misc changes and reformats
Diffstat (limited to 'pkgs/data')
| -rw-r--r-- | pkgs/data/misc/tzdata/default.nix | 22 |
1 files changed, 11 insertions, 11 deletions
diff --git a/pkgs/data/misc/tzdata/default.nix b/pkgs/data/misc/tzdata/default.nix index 85bd63d60723..6dd818939d22 100644 --- a/pkgs/data/misc/tzdata/default.nix +++ b/pkgs/data/misc/tzdata/default.nix @@ -1,16 +1,16 @@ { lib, stdenv, fetchurl, buildPackages }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "tzdata"; version = "2024a"; srcs = [ (fetchurl { - url = "https://data.iana.org/time-zones/releases/tzdata${version}.tar.gz"; + url = "https://data.iana.org/time-zones/releases/tzdata${finalAttrs.version}.tar.gz"; hash = "sha256-DQQ0RZrL0gWaeo2h8zBKhKhlkfbtacYkj/+lArbt/+M="; }) (fetchurl { - url = "https://data.iana.org/time-zones/releases/tzcode${version}.tar.gz"; + url = "https://data.iana.org/time-zones/releases/tzcode${finalAttrs.version}.tar.gz"; hash = "sha256-gAcolK3/WkWPHRQ+FuTKHYsqEiycU5naSCy2jLpqH/g="; }) ]; @@ -25,14 +25,14 @@ stdenv.mkDerivation rec { propagatedBuildOutputs = [ ]; makeFlags = [ - "TOPDIR=$(out)" - "TZDIR=$(out)/share/zoneinfo" - "BINDIR=$(bin)/bin" - "ZICDIR=$(bin)/bin" + "TOPDIR=${placeholder "out"}" + "TZDIR=${placeholder "out"}/share/zoneinfo" + "BINDIR=${placeholder "bin"}/bin" + "ZICDIR=${placeholder "bin"}/bin" "ETCDIR=$(TMPDIR)/etc" "TZDEFAULT=tzdefault-to-remove" - "LIBDIR=$(dev)/lib" - "MANDIR=$(man)/share/man" + "LIBDIR=${placeholder "dev"}/lib" + "MANDIR=${placeholder "man"}/share/man" "AWK=awk" "CFLAGS=-DHAVE_LINK=0" "CFLAGS+=-DZIC_BLOAT_DEFAULT=\\\"fat\\\"" @@ -70,7 +70,7 @@ stdenv.mkDerivation rec { meta = with lib; { homepage = "http://www.iana.org/time-zones"; description = "Database of current and historical time zones"; - changelog = "https://github.com/eggert/tz/blob/${version}/NEWS"; + changelog = "https://github.com/eggert/tz/blob/${finalAttrs.version}/NEWS"; license = with licenses; [ bsd3 # tzcode publicDomain # tzdata @@ -78,4 +78,4 @@ stdenv.mkDerivation rec { platforms = platforms.all; maintainers = with maintainers; [ ajs124 fpletz ]; }; -} +}) |