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: 1733d517a931
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: e68b46c31458
Choose a head ref
  • 3 commits
  • 2 files changed
  • 2 contributors

Commits on Nov 11, 2020

  1. Revert "thunderbird: set build timeout at eight hours" 

    The default timeout is 10h on Hydra currently, so this timeout
setting is pointless or counterproductive.
This commit seems to have been made in error
#96767 (comment)

This reverts commit 1733d51.
    @roberth
    roberth committed Nov 11, 2020
    Copy the full SHA
    cd3a665 View commit details

  2. tzdata: Revert to the "fat" "bloated" format 

    The timezone dumps have switched to a "slim" format since 2020b.
This has broken various packages, including
 - go 1.4 (used for bootstrapping)
 - haskellPackages.tz
 - libical

The "fat" format can still be generated, as this commit shows.
It seems to create files that are *mostly* the slim versions with
some more data attached.

(cherry picked from commit d328ba1)
    @roberth
    roberth committed Nov 11, 2020
    Copy the full SHA
    0f3eac5 View commit details

  3. tzdata: 2019c -> 2020c 

    (cherry picked from commit 8904ce2)
    @ajs124 @roberth
    ajs124 authored and roberth committed Nov 11, 2020
    Copy the full SHA
    e68b46c View commit details
Showing with 4 additions and 4 deletions.
  1. +0 −1 pkgs/applications/networking/mailreaders/thunderbird/default.nix
  2. +4 −3 pkgs/data/misc/tzdata/default.nix
1 change: 0 additions & 1 deletion pkgs/applications/networking/mailreaders/thunderbird/default.nix
View file
Original file line number Diff line number Diff line change
@@ -332,6 +332,5 @@ stdenv.mkDerivation rec {
];
platforms = platforms.linux;
license = licenses.mpl20;
timeout = 28800; # eight hours
};
}
7 changes: 4 additions & 3 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 {
pname = "tzdata";
version = "2019c";
version = "2020c";

srcs =
[ (fetchurl {
url = "https://data.iana.org/time-zones/releases/tzdata${version}.tar.gz";
sha256 = "0z7w1yv37cfk8yhix2cillam091vgp1j4g8fv84261q9mdnq1ivr";
sha256 = "1nab36g5ibs88wg2mzpzygi1wh5gh2al1qjvbk8sb90sbw8ar43q";
})
(fetchurl {
url = "https://data.iana.org/time-zones/releases/tzcode${version}.tar.gz";
sha256 = "1m3y2rnf1nggxxhxplab5zdd5whvar3ijyrv7lifvm82irkd7szn";
sha256 = "1r5zrk1k3jhhilkhrx82fd19rvysji8jk05gq5v0rndmyx07zacs";
})
];

@@ -31,6 +31,7 @@ stdenv.mkDerivation rec {
"MANDIR=$(man)/share/man"
"AWK=awk"
"CFLAGS=-DHAVE_LINK=0"
"CFLAGS+=-DZIC_BLOAT_DEFAULT=\\\"fat\\\""
"cc=${stdenv.cc.targetPrefix}cc"
"AR=${stdenv.cc.targetPrefix}ar"
];