diff --git a/nix/nixpkgs-version.nix b/nix/nixpkgs-version.nix index 4d0a3947f..6f83145e3 100644 --- a/nix/nixpkgs-version.nix +++ b/nix/nixpkgs-version.nix @@ -1,6 +1,6 @@ # Pinned version of Nixpkgs, generated with postgrest-nixpkgs-upgrade. { - date = "2022-09-30"; - rev = "8ba120420fbdd9bd35b3a5366fa0206d8c99ade3"; - tarballHash = "0hfaagh0jnkk85gyj07y3daszfbz8mlafrn3wc3z9875f36810xi"; + date = "2022-10-28"; + rev = "f44ba1be526c8da9e79a5759feca2365204003f6"; + tarballHash = "0npbwsdjw88py5w2pjflwh94wgi4jmnmls0k1n7q8m6h94w1y1ps"; } diff --git a/nix/overlays/haskell-packages.nix b/nix/overlays/haskell-packages.nix index 263585458..5b84a64b0 100644 --- a/nix/overlays/haskell-packages.nix +++ b/nix/overlays/haskell-packages.nix @@ -29,14 +29,14 @@ let # To fill in the sha256: # update-nix-fetchgit nix/overlays/haskell-packages.nix - hashtables = lib.dontCheck prev.hashtables_1_3; - hasql = lib.dontCheck prev.hasql_1_6_1_3; + hashtables = lib.dontCheck prev.hashtables_1_3_1; + hasql = lib.dontCheck prev.hasql_1_6_1_4; hasql-dynamic-statements = lib.dontCheck prev.hasql-dynamic-statements_0_3_1_2; - hasql-pool = lib.dontCheck prev.hasql-pool_0_8_0_3; + hasql-pool = lib.dontCheck prev.hasql-pool_0_8_0_4; hasql-transaction = lib.dontCheck prev.hasql-transaction_1_0_1_2; isomorphism-class = lib.unmarkBroken prev.isomorphism-class; lens = lib.dontCheck prev.lens_5_2; - postgresql-binary = lib.dontCheck prev.postgresql-binary_0_13; + postgresql-binary = lib.dontCheck prev.postgresql-binary_0_13_1; text-builder = lib.dontCheck prev.text-builder_0_6_7; text-builder-dev = lib.dontCheck prev.text-builder-dev_0_3_3; diff --git a/nix/overlays/postgresql-legacy.nix b/nix/overlays/postgresql-legacy.nix index 248f9f424..cb2c5940f 100644 --- a/nix/overlays/postgresql-legacy.nix +++ b/nix/overlays/postgresql-legacy.nix @@ -16,4 +16,19 @@ self: super: }; in (import pinnedPkgs { }).pkgs.postgresql_9_6; + + # PostgreSQL 10 was removed from Nixpkgs with + # https://github.com/NixOS/nixpkgs/commit/aa1483114bb329fee7e1266100b8d8921ed4723f + # We pin its parent commit to get the last version that was available. + postgresql_10 = + let + rev = "79661ba7e2fb96ebefbb537458a5bbae9dc5bd1a"; + tarballHash = "0rn796pfn4sg90ai9fdnwmr10a2s835p1arazzgz46h6s5cxvq97"; + pinnedPkgs = + builtins.fetchTarball { + url = "https://github.com/nixos/nixpkgs/archive/${rev}.tar.gz"; + sha256 = tarballHash; + }; + in + (import pinnedPkgs { }).pkgs.postgresql_10; }