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

Commits on Nov 4, 2020

  1. haskell.compiler.integer-simple: Exclude ghc8102Binary* 

    (cherry picked from commit fc15626)
    @roberth
    roberth committed Nov 4, 2020
    Copy the full SHA
    f73df04 View commit details

  2. postgresql: Fix timetz test failure 

    A recent addition to the test suite turned out to be sensitive to
DST. The main code is ok. Patch only required to make test succeed.

See https://git.postgresql.org/gitweb/?p=postgresql.git;a=commit;h=4a071afbd056282746a5bc9362e87f579a56402d
    @roberth @FRidh
    roberth authored and FRidh committed Nov 4, 2020
    Copy the full SHA
    83163b4 View commit details

  3. Merge staging-next into staging

    @FRidh
    FRidh committed Nov 4, 2020
    Copy the full SHA
    9eb00b9 View commit details
Showing with 121 additions and 1 deletion.
  1. +3 −1 pkgs/servers/sql/postgresql/default.nix
  2. +117 −0 pkgs/servers/sql/postgresql/patches/stabilize-timetz-dst.patch
  3. +1 −0 pkgs/top-level/haskell-packages.nix
4 changes: 3 additions & 1 deletion pkgs/servers/sql/postgresql/default.nix
View file
Original file line number Diff line number Diff line change
@@ -64,7 +64,9 @@ let
(if atLeast "9.6" then ./patches/hardcode-pgxs-path-96.patch else ./patches/hardcode-pgxs-path.patch)
./patches/specify_pkglibdir_at_runtime.patch
./patches/findstring.patch
] ++ lib.optional stdenv.isLinux (if atLeast "13" then ./patches/socketdir-in-run-13.patch else ./patches/socketdir-in-run.patch);
]
++ lib.optional (atLeast "10") ./patches/stabilize-timetz-dst.patch
++ lib.optional stdenv.isLinux (if atLeast "13" then ./patches/socketdir-in-run-13.patch else ./patches/socketdir-in-run.patch);

installTargets = [ "install-world" ];

117 changes: 117 additions & 0 deletions pkgs/servers/sql/postgresql/patches/stabilize-timetz-dst.patch
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,117 @@
From 4a071afbd056282746a5bc9362e87f579a56402d Mon Sep 17 00:00:00 2001
From: Tom Lane <tgl@sss.pgh.pa.us>
Date: Thu, 29 Oct 2020 15:28:14 -0400
Subject: [PATCH 1/1] Stabilize timetz test across DST transitions.

The timetz test cases I added in commit a9632830b were unintentionally
sensitive to whether or not DST is active in the PST8PDT time zone.
Thus, they'll start failing this coming weekend, as reported by
Bernhard M. Wiedemann in bug #16689. Fortunately, DST-awareness is
not significant to the purpose of these test cases, so we can just
force them all to PDT (DST hours) to preserve stability of the
results.

Back-patch to v10, as the prior patch was.

Discussion: https://postgr.es/m/16689-57701daa23b377bf@postgresql.org
Git viewer: https://git.postgresql.org/gitweb/?p=postgresql.git;a=commitdiff;h=4a071afbd056282746a5bc9362e87f579a56402d;hp=f90149e6285aaae6b48559afce1bd638ee26c33e
---
src/test/regress/expected/timetz.out | 32 ++++++++++++++--------------
src/test/regress/sql/timetz.sql | 16 +++++++-------
2 files changed, 24 insertions(+), 24 deletions(-)

diff --git a/src/test/regress/expected/timetz.out b/src/test/regress/expected/timetz.out
index 038bb5fa09..1ab5ed5105 100644
--- a/src/test/regress/expected/timetz.out
+++ b/src/test/regress/expected/timetz.out
@@ -91,45 +91,45 @@ SELECT f1 AS "Ten" FROM TIMETZ_TBL WHERE f1 >= '00:00-07';
(12 rows)

-- Check edge cases
-SELECT '23:59:59.999999'::timetz;
+SELECT '23:59:59.999999 PDT'::timetz;
timetz
--------------------
23:59:59.999999-07
(1 row)

-SELECT '23:59:59.9999999'::timetz; -- rounds up
+SELECT '23:59:59.9999999 PDT'::timetz; -- rounds up
timetz
-------------
24:00:00-07
(1 row)

-SELECT '23:59:60'::timetz; -- rounds up
+SELECT '23:59:60 PDT'::timetz; -- rounds up
timetz
-------------
24:00:00-07
(1 row)

-SELECT '24:00:00'::timetz; -- allowed
+SELECT '24:00:00 PDT'::timetz; -- allowed
timetz
-------------
24:00:00-07
(1 row)

-SELECT '24:00:00.01'::timetz; -- not allowed
-ERROR: date/time field value out of range: "24:00:00.01"
-LINE 1: SELECT '24:00:00.01'::timetz;
+SELECT '24:00:00.01 PDT'::timetz; -- not allowed
+ERROR: date/time field value out of range: "24:00:00.01 PDT"
+LINE 1: SELECT '24:00:00.01 PDT'::timetz;
^
-SELECT '23:59:60.01'::timetz; -- not allowed
-ERROR: date/time field value out of range: "23:59:60.01"
-LINE 1: SELECT '23:59:60.01'::timetz;
+SELECT '23:59:60.01 PDT'::timetz; -- not allowed
+ERROR: date/time field value out of range: "23:59:60.01 PDT"
+LINE 1: SELECT '23:59:60.01 PDT'::timetz;
^
-SELECT '24:01:00'::timetz; -- not allowed
-ERROR: date/time field value out of range: "24:01:00"
-LINE 1: SELECT '24:01:00'::timetz;
+SELECT '24:01:00 PDT'::timetz; -- not allowed
+ERROR: date/time field value out of range: "24:01:00 PDT"
+LINE 1: SELECT '24:01:00 PDT'::timetz;
^
-SELECT '25:00:00'::timetz; -- not allowed
-ERROR: date/time field value out of range: "25:00:00"
-LINE 1: SELECT '25:00:00'::timetz;
+SELECT '25:00:00 PDT'::timetz; -- not allowed
+ERROR: date/time field value out of range: "25:00:00 PDT"
+LINE 1: SELECT '25:00:00 PDT'::timetz;
^
--
-- TIME simple math
diff --git a/src/test/regress/sql/timetz.sql b/src/test/regress/sql/timetz.sql
index b699e4b03c..ce763d89e8 100644
--- a/src/test/regress/sql/timetz.sql
+++ b/src/test/regress/sql/timetz.sql
@@ -36,14 +36,14 @@ SELECT f1 AS "None" FROM TIMETZ_TBL WHERE f1 < '00:00-07';
SELECT f1 AS "Ten" FROM TIMETZ_TBL WHERE f1 >= '00:00-07';

-- Check edge cases
-SELECT '23:59:59.999999'::timetz;
-SELECT '23:59:59.9999999'::timetz; -- rounds up
-SELECT '23:59:60'::timetz; -- rounds up
-SELECT '24:00:00'::timetz; -- allowed
-SELECT '24:00:00.01'::timetz; -- not allowed
-SELECT '23:59:60.01'::timetz; -- not allowed
-SELECT '24:01:00'::timetz; -- not allowed
-SELECT '25:00:00'::timetz; -- not allowed
+SELECT '23:59:59.999999 PDT'::timetz;
+SELECT '23:59:59.9999999 PDT'::timetz; -- rounds up
+SELECT '23:59:60 PDT'::timetz; -- rounds up
+SELECT '24:00:00 PDT'::timetz; -- allowed
+SELECT '24:00:00.01 PDT'::timetz; -- not allowed
+SELECT '23:59:60.01 PDT'::timetz; -- not allowed
+SELECT '24:01:00 PDT'::timetz; -- not allowed
+SELECT '25:00:00 PDT'::timetz; -- not allowed

--
-- TIME simple math
--
2.20.1
1 change: 1 addition & 0 deletions pkgs/top-level/haskell-packages.nix
View file
Original file line number Diff line number Diff line change
@@ -6,6 +6,7 @@ let
"ghc822Binary"
"ghc865Binary"
"ghc8102Binary"
"ghc8102BinaryMinimal"
"ghcjs"
"ghcjs86"
"integer-simple"