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

Commits on Nov 6, 2020

  1. 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.
    @roberth @FRidh
    roberth authored and FRidh committed Nov 6, 2020
    Copy the full SHA
    d328ba1 View commit details

  2. Revert "libical: skip timezone tests" 

    This reverts commit 9c5154b.
    @roberth @FRidh
    roberth authored and FRidh committed Nov 6, 2020
    Copy the full SHA
    5e1cf83 View commit details
Showing with 2 additions and 1 deletion.
  1. +1 −0 pkgs/data/misc/tzdata/default.nix
  2. +1 −1 pkgs/development/libraries/libical/default.nix
1 change: 1 addition & 0 deletions pkgs/data/misc/tzdata/default.nix
View file
Original file line number Diff line number Diff line change
@@ -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"
];
2 changes: 1 addition & 1 deletion pkgs/development/libraries/libical/default.nix
View file
Original file line number Diff line number Diff line change
@@ -91,7 +91,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
'';