Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: 261bf90fb965
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: d54a4accc7ff
Choose a head ref
  • 2 commits
  • 1 file changed
  • 2 contributors

Commits on Dec 5, 2018

  1. tzdata: 2018e -> 2018g 

    Notable changes:
  - Morocco switched to permanent +01 on 2018-10-27
  - Volgograd moved from +03 to +04 on 2018-10-28
  - Fiji ends DST 2019-01-13, not 2019-01-20
  - Most of Chile changes DST dates, effective 2019-04-06

tzdata: fetch over https
(cherry picked from commit 7c25174)
    @fpletz @c0bw3b
    fpletz authored and c0bw3b committed Dec 5, 2018

    Verified

    This commit was signed with the committer’s verified signature.
    costrouc Christopher Ostrouchov
    GPG key ID: 9ED59B0AB1EAF573
    Verified
    Learn about vigilant mode
    Copy the full SHA
    b57b9b7 View commit details

  2. Merge pull request #51591 from c0bw3b/data/1809/tzdata 

    [18.09] tzdata: 2018e -> 2018g
    @c0bw3b
    c0bw3b authored Dec 5, 2018

    Verified

    This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
    GPG key ID: 4AEE18F83AFDEB23
    Expired
    Verified
    Learn about vigilant mode
    Copy the full SHA
    d54a4ac View commit details
Showing with 5 additions and 5 deletions.
  1. +5 −5 pkgs/data/misc/tzdata/default.nix
10 changes: 5 additions & 5 deletions pkgs/data/misc/tzdata/default.nix
View file
Original file line number Diff line number Diff line change
@@ -2,16 +2,16 @@

stdenv.mkDerivation rec {
name = "tzdata-${version}";
version = "2018e";
version = "2018g";

srcs =
[ (fetchurl {
url = "http://www.iana.org/time-zones/repository/releases/tzdata${version}.tar.gz";
sha256 = "0bk97fv2i5ns42prpmlaadsswdjwv0ifi7whj2s4q6l44rcqwa3b";
url = "https://data.iana.org/time-zones/releases/tzdata${version}.tar.gz";
sha256 = "05kayi3w9pvhj6ljx1hvwd0r8mxfzn436fjmwhx53xkj919xxpq2";
})
(fetchurl {
url = "http://www.iana.org/time-zones/repository/releases/tzcode${version}.tar.gz";
sha256 = "1kpb02631s58i068mwq63xlamcv1ffj4p6y4wpb9kdl01vr0qd6a";
url = "https://data.iana.org/time-zones/releases/tzcode${version}.tar.gz";
sha256 = "09y44fzcdq3c06saa8iqqa0a59cyw6ni3p31ps0j1w3hcpxz8lxa";
})
];