From eace2eb3c906b9bb8ec10aca08060a8606ecb5ac Mon Sep 17 00:00:00 2001
From: Wolfgang Walther <walther@technowledgy.de>
Date: Mon, 31 Jan 2022 08:19:49 +0100
Subject: [PATCH] nix: upgrade packages

---
 nix/nixpkgs-version.nix                       |  6 ++---
 nix/overlays/postgresql-legacy.nix            | 27 +++++++++----------
 ...untime-dependencies-of-static-builds.patch | 16 +++++------
 3 files changed, 24 insertions(+), 25 deletions(-)

diff --git a/nix/nixpkgs-version.nix b/nix/nixpkgs-version.nix
index 805169bebc..390f52b328 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 = "2021-11-02";
-  rev = "7053541084bf5ce2921ef307e5585d39d7ba8b3f";
-  tarballHash = "1flhh5d4zy43x6060hvzjb5hi5cmc51ivc0nwmija9n8d35kcc4x";
+  date = "2022-01-31";
+  rev = "5efc8ca954272c4376ac929f4c5ffefcc20551d5";
+  tarballHash = "15xncc1afq8v78acrcv8xbfkd3ii147mv9a55823pdbqffzg0x54";
 }
diff --git a/nix/overlays/postgresql-legacy.nix b/nix/overlays/postgresql-legacy.nix
index 6e3afbdd61..248f9f4248 100644
--- a/nix/overlays/postgresql-legacy.nix
+++ b/nix/overlays/postgresql-legacy.nix
@@ -2,19 +2,18 @@ self: super:
 # Overlay that adds legacy versions of PostgreSQL that are supported by
 # PostgREST.
 {
-  # PostgreSQL 9.5 was removed from Nixpkgs with
-  # https://github.com/NixOS/nixpkgs/commit/72ab382fb6b729b0d654f2c03f5eb25b39f11fbb
+  # PostgreSQL 9.6 was removed from Nixpkgs with
+  # https://github.com/NixOS/nixpkgs/commit/757dd008b2f2926fc0f7688fa8189f930ea47521
   # We pin its parent commit to get the last version that was available.
-  # postgresql_9_5 =
-  #  let
-  #    rev = "55ac7d4580c9ab67848c98cb9519317a1cc399c8";
-  #    tarballHash = "02ffj9f8s1hwhmxj85nx04sv64qb6jm7w0122a1dz9n32fymgklj";
-  #
-  #    pinnedPkgs =
-  #      builtins.fetchTarball {
-  #        url = "https://github.com/nixos/nixpkgs/archive/${rev}.tar.gz";
-  #        sha256 = tarballHash;
-  #      };
-  #  in
-  #  (import pinnedPkgs { }).pkgs.postgresql_9_5;
+  postgresql_9_6 =
+    let
+      rev = "571cbf3d1db477058303cef8754fb85a14e90eb7";
+      tarballHash = "0q74wn418i1bn5sssacmw8ykpmqvzr0s93sj6pbs3rf6bf134fkz";
+      pinnedPkgs =
+        builtins.fetchTarball {
+          url = "https://github.com/nixos/nixpkgs/archive/${rev}.tar.gz";
+          sha256 = tarballHash;
+        };
+    in
+    (import pinnedPkgs { }).pkgs.postgresql_9_6;
 }
diff --git a/nix/patches/nixpkgs-openssl-split-runtime-dependencies-of-static-builds.patch b/nix/patches/nixpkgs-openssl-split-runtime-dependencies-of-static-builds.patch
index 43b58f8d61..e92f656385 100644
--- a/nix/patches/nixpkgs-openssl-split-runtime-dependencies-of-static-builds.patch
+++ b/nix/patches/nixpkgs-openssl-split-runtime-dependencies-of-static-builds.patch
@@ -2,11 +2,11 @@ diff --git a/pkgs/development/libraries/openssl/default.nix b/pkgs/development/l
 index d4be8cc2428..3979698711f 100644
 --- a/pkgs/development/libraries/openssl/default.nix
 +++ b/pkgs/development/libraries/openssl/default.nix
-@@ -50,9 +50,21 @@ let
+@@ -43,9 +43,21 @@ let
        substituteInPlace crypto/async/arch/async_posix.h \
          --replace '!defined(__ANDROID__) && !defined(__OpenBSD__)' \
                    '!defined(__ANDROID__) && !defined(__OpenBSD__) && 0'
-+    '' + optionalString static
++    '' + lib.optionalString static
 +    # On static builds, the ENGINESDIR will be empty, but its path will be
 +    # compiled into the library. In order to minimize the runtime dependencies
 +    # of packages that statically link openssl, we move it into the OPENSSLDIR,
@@ -17,15 +17,15 @@ index d4be8cc2428..3979698711f 100644
 +                  'ENGINESDIR=$(OPENSSLDIR)/engines-{- $sover_dirname -}'
      '';
  
--    outputs = [ "bin" "dev" "out" "man" ] ++ optional withDocs "doc";
+-    outputs = [ "bin" "dev" "out" "man" ] ++ lib.optional withDocs "doc";
 +    outputs = [ "bin" "dev" "out" "man" ]
-+      ++ optional withDocs "doc"
++      ++ lib.optional withDocs "doc"
 +      # Separate output for the runtime dependencies of the static build.
-+      ++ optional static "etc";
++      ++ lib.optional static "etc";
      setOutputFlags = false;
      separateDebugInfo =
        !stdenv.hostPlatform.isDarwin &&
-@@ -101,7 +113,17 @@ let
+@@ -95,7 +107,17 @@ let
      configureFlags = [
        "shared" # "shared" builds both shared and static libraries
        "--libdir=lib"
@@ -44,7 +44,7 @@ index d4be8cc2428..3979698711f 100644
      ] ++ lib.optionals withCryptodev [
        "-DHAVE_CRYPTODEV"
        "-DUSE_CRYPTODEV_DIGESTS"
-@@ -131,6 +153,9 @@ let
+@@ -126,6 +148,9 @@ let
        if [ -n "$(echo $out/lib/*.so $out/lib/*.dylib $out/lib/*.dll)" ]; then
            rm "$out/lib/"*.a
        fi
@@ -54,7 +54,7 @@ index d4be8cc2428..3979698711f 100644
      '' + lib.optionalString (!stdenv.hostPlatform.isWindows)
        # Fix bin/c_rehash's perl interpreter line
        #
-@@ -152,14 +177,15 @@ let
+@@ -147,14 +172,15 @@ let
        mv $out/include $dev/
  
        # remove dependency on Perl at runtime