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: d2678e64e939
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 6ea74976ddab
Choose a head ref
  • 3 commits
  • 3 files changed
  • 1 contributor

Commits on Nov 5, 2020

  1. Revert "libical: disable rest of failing tests" 

    This reverts commit d2678e6.

The commit was masking a real problem.

See #102946:

    The tzdata default format has changed, breaking some packages.
    We'll want to stick to the old format until the libraries and
    applications actually support the new format.
    @roberth
    roberth committed Nov 5, 2020

    Verified

    This commit was signed with the committer’s verified signature.
    bagder Daniel Stenberg
    GPG key ID: 5CC908FDB71E12C2
    Verified
    Learn about vigilant mode
    Copy the full SHA
    4080cda View commit details

  2. Revert "go_bootstrap: disable failing timezone tests" 

    This reverts commit 2b5cfa7.

The commit was masking a real problem.

See #102946:

    The tzdata default format has changed, breaking some packages.
    We'll want to stick to the old format until the libraries and
    applications actually support the new format.
    @roberth
    roberth committed Nov 5, 2020
    Copy the full SHA
    103001f View commit details

  3. Revert "tzdata: 2019c -> 2020c" 

    This reverts commit 4fc485e.

TBD. Out of scope for current staging.
    @roberth
    roberth committed Nov 5, 2020
    Copy the full SHA
    6ea7497 View commit details
Showing with 13 additions and 6 deletions.
  1. +3 −3 pkgs/data/misc/tzdata/default.nix
  2. +9 −2 pkgs/development/compilers/go/1.4.nix
  3. +1 −1 pkgs/development/libraries/libical/default.nix
6 changes: 3 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 = "2020c";
version = "2019c";

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

11 changes: 9 additions & 2 deletions pkgs/development/compilers/go/1.4.nix
View file
Original file line number Diff line number Diff line change
@@ -43,8 +43,6 @@ stdenv.mkDerivation rec {
cd go
patchShebangs ./ # replace /bin/bash
# Disable timezone tests (these fail when `tzdata` is updated)
rm src/time/{example,format}_test.go
# Disabling the 'os/http/net' tests (they want files not available in
# chroot builds)
rm src/net/{multicast_test.go,parse_test.go,port_test.go}
@@ -58,6 +56,8 @@ stdenv.mkDerivation rec {
sed -i '/TestDialTimeout/areturn' src/net/dial_test.go
# Disable the hostname test
sed -i '/TestHostname/areturn' src/os/os_test.go
# ParseInLocation fails the test
sed -i '/TestParseInSydney/areturn' src/time/format_test.go
sed -i 's,/etc/protocols,${iana-etc}/etc/protocols,' src/net/lookup_unix.go
'' + lib.optionalString stdenv.isLinux ''
@@ -119,6 +119,13 @@ stdenv.mkDerivation rec {
patches = [
./remove-tools-1.4.patch
./creds-test-1.4.patch

# This test checks for the wrong thing with recent tzdata. It's been fixed in master but the patch
# actually works on old versions too.
(fetchpatch {
url = "https://github.com/golang/go/commit/91563ced5897faf729a34be7081568efcfedda31.patch";
sha256 = "1ny5l3f8a9dpjjrnjnsplb66308a0x13sa0wwr4j6yrkc8j4qxqi";
})
];

GOOS = if stdenv.isDarwin then "darwin" else "linux";
2 changes: 1 addition & 1 deletion pkgs/development/libraries/libical/default.nix
View file
Original file line number Diff line number Diff line change
@@ -71,7 +71,7 @@ stdenv.mkDerivation rec {
runHook preInstallCheck
export TZDIR=${tzdata}/share/zoneinfo
ctest --output-on-failure --exclude-regex 'regression|recur|timezones|libical-glib-array|libical-glib-component|libical-glib-timezone'
ctest --output-on-failure
runHook postInstallCheck
'';