diff options
| author | John Ericson <John.Ericson@Obsidian.Systems> | 2018-05-11 14:33:12 -0400 |
|---|---|---|
| committer | John Ericson <John.Ericson@Obsidian.Systems> | 2018-05-11 14:36:08 -0400 |
| commit | ee4b56edd364922c6a20a8d7b21a5a72497b4bc2 (patch) | |
| tree | 42bd2a09efe21aa446e411201d4974d39f8a8a4f /pkgs/data | |
| parent | 73833ee4465369c9eead8e00ce699053e010de2f (diff) | |
| parent | 62ee7b7b4713c90048ec7063ca4f4cd7677eeb53 (diff) | |
| download | nixpkgs-ee4b56edd364922c6a20a8d7b21a5a72497b4bc2.tar nixpkgs-ee4b56edd364922c6a20a8d7b21a5a72497b4bc2.tar.gz nixpkgs-ee4b56edd364922c6a20a8d7b21a5a72497b4bc2.tar.bz2 nixpkgs-ee4b56edd364922c6a20a8d7b21a5a72497b4bc2.tar.lz nixpkgs-ee4b56edd364922c6a20a8d7b21a5a72497b4bc2.tar.xz nixpkgs-ee4b56edd364922c6a20a8d7b21a5a72497b4bc2.tar.zst nixpkgs-ee4b56edd364922c6a20a8d7b21a5a72497b4bc2.zip | |
Merge remote-tracking branch 'upstream/master' into staging
Diffstat (limited to 'pkgs/data')
| -rw-r--r-- | pkgs/data/misc/scowl/default.nix | 4 | ||||
| -rw-r--r-- | pkgs/data/misc/tzdata/default.nix | 16 |
2 files changed, 12 insertions, 8 deletions
diff --git a/pkgs/data/misc/scowl/default.nix b/pkgs/data/misc/scowl/default.nix index e54dc3fa9fe..c90b8aa7e37 100644 --- a/pkgs/data/misc/scowl/default.nix +++ b/pkgs/data/misc/scowl/default.nix @@ -5,13 +5,13 @@ stdenv.mkDerivation rec { name = "${pname}-${version}"; pname = "scowl"; - version = "2017.08.24"; + version = "2018.04.16"; src = fetchFromGitHub { owner = "en-wl"; repo = "wordlist"; rev = "rel-${version}"; - sha256 = "16mgk6scbw8i38g63kh60bsnzgzfs8gvvz2n5jh4x5didbwly8nz"; + sha256 = "0p0hgg5y88bb802z210cdk1c4fjwlpxxkci6yph3fk7g6s9xc73g"; }; postPatch = '' diff --git a/pkgs/data/misc/tzdata/default.nix b/pkgs/data/misc/tzdata/default.nix index 2c22bfe93b9..0f790f78f19 100644 --- a/pkgs/data/misc/tzdata/default.nix +++ b/pkgs/data/misc/tzdata/default.nix @@ -2,28 +2,31 @@ stdenv.mkDerivation rec { name = "tzdata-${version}"; - version = "2017c"; + version = "2018e"; srcs = [ (fetchurl { url = "http://www.iana.org/time-zones/repository/releases/tzdata${version}.tar.gz"; - sha256 = "02yrrfj0p7ar885ja41ylijzbr8wc6kz6kzlw8c670i9m693ym6n"; + sha256 = "0bk97fv2i5ns42prpmlaadsswdjwv0ifi7whj2s4q6l44rcqwa3b"; }) (fetchurl { url = "http://www.iana.org/time-zones/repository/releases/tzcode${version}.tar.gz"; - sha256 = "1dvrq0b2hz7cjqdyd7x21wpy4qcng3rvysr61ij0c2g64fyb9s41"; + sha256 = "1kpb02631s58i068mwq63xlamcv1ffj4p6y4wpb9kdl01vr0qd6a"; }) ]; sourceRoot = "."; - outputs = [ "out" "man" "dev" ]; + outputs = [ "out" "bin" "man" "dev" ]; propagatedBuildOutputs = []; makeFlags = [ "TOPDIR=$(out)" "TZDIR=$(out)/share/zoneinfo" + "BINDIR=$(bin)/bin" + "ZICDIR=$(bin)/bin" "ETCDIR=$(TMPDIR)/etc" + "TZDEFAULT=$(TMPDIR)/etc" "LIBDIR=$(dev)/lib" "MANDIR=$(man)/share/man" "AWK=awk" @@ -60,9 +63,10 @@ stdenv.mkDerivation rec { setupHook = ./tzdata-setup-hook.sh; - meta = { + meta = with stdenv.lib; { homepage = http://www.iana.org/time-zones; description = "Database of current and historical time zones"; - platforms = stdenv.lib.platforms.all; + platforms = platforms.all; + maintainers = with maintainers; [ fpletz ]; }; } |