Nixpkgs update

default.nix

@@ -22,18 +22,12 @@ let
 
  # Nix files that describe the Nixpkgs repository. We evaluate the expression
  # using `import` below.
- nixpkgs =
+ nixpkgs = with nixpkgsVersion;
  builtins.fetchTarball {
- url = "https://github.com/nixos/nixpkgs/archive/${nixpkgsVersion.rev}.tar.gz";
- sha256 = nixpkgsVersion.tarballHash;
+ url = "https://github.com/${owner}/${repo}/archive/${rev}.tar.gz";
+ sha256 = tarballHash;
  };
 
- nixpkgs-patched = (import nixpkgs { inherit overlays system; }).applyPatches {
- name = "nixpkgs-patched";
- src = nixpkgs;
- patches = [ nix/split-sections-cross.patch ];
- };
-
  allOverlays =
  import nix/overlays;
 
@@ -52,7 +46,7 @@ let
 
  # Evaluated expression of the Nixpkgs repository.
  pkgs =
- import nixpkgs-patched { inherit overlays system; };
+ import nixpkgs { inherit overlays system; };
 
  postgresqlVersions =
  [
@@ -88,7 +82,7 @@ let
  inherit (pkgs.haskell) lib;
 in
 rec {
- inherit nixpkgs-patched pkgs;
+ inherit nixpkgs pkgs;
 
  # Derivation for the PostgREST Haskell package, including the executable,
  # libraries and documentation. We disable running the test suite on Nix

nix/nixpkgs-version.nix

@@ -1,6 +1,8 @@
 # Pinned version of Nixpkgs, generated with postgrest-nixpkgs-upgrade.
 {
- date = "2024-01-06";
- rev = "4bbf5a2eb6046c54f7a29a0964c642ebfe912cbc";
- tarballHash = "03p45qdcxqxc41mmzmmyzbkff29vv95vv643z0kd3mf1s2nnsy5b";
+ owner = "NixOS";
+ repo = "nixpkgs";
+ date = "2024-04-20";
+ rev = "92d295f588631b0db2da509f381b4fb1e74173c5";
+ tarballHash = "162w28y4i5c8g5qhjvs827qxphf2a8n4c8fwhcywzl1j1a35h2im";
 }

nix/overlays/haskell-packages.nix

@@ -44,37 +44,21 @@ let
  # + For stack.yml.lock, CI should report an error with the correct lock, copy/paste that one into the file
  # - To modify and try packages locally, see "Working with locally modified Haskell packages" in the Nix README.
 
- configurator-pg =
- prev.callHackageDirect
- {
- pkg = "configurator-pg";
- ver = "0.2.9";
- sha256 = "sha256-UqFiOgPlksbIdHBVO0wYhCnboB+mxKJcXVhY9C1V7Hg=";
- }
- { };
-
  # Before upgrading fuzzyset to 0.3, check: https://github.com/PostgREST/postgrest/issues/3329
- fuzzyset =
- prev.callHackageDirect
+ # jailbreak, because hspec limit for tests
+ fuzzyset = lib.doJailbreak
+ (prev.callHackageDirect
  {
  pkg = "fuzzyset";
  ver = "0.2.4";
  sha256 = "sha256-lpkrTFcR0B4rT/P6x7ui31Twgq7BBj6KIvjKyqXKdpc=";
  }
- { };
+ { });
 
- hasql-pool =
- lib.dontCheck (prev.callHackageDirect
- {
- pkg = "hasql-pool";
- ver = "1.0.1";
- sha256 = "sha256-Hf1f7lX0LWkjrb25SDBovCYPRdmUP1H6pAxzi7kT4Gg=";
- }
- { }
- );
+ hasql-pool = lib.dontCheck prev.hasql-pool_1_0_1;
 
  postgresql-libpq = lib.dontCheck
- (prev.postgresql-libpq_0_10_0_0.override {
+ (prev.postgresql-libpq.override {
  postgresql = super.libpq;
  });
 

nix/tools/nixpkgsTools.nix

@@ -40,6 +40,8 @@ let
  cat > nix/nixpkgs-version.nix << EOF
  # Pinned version of Nixpkgs, generated with ${name}.
  {
+ owner = "NixOS";
+ repo = "nixpkgs";
  date = "$currentDate";
  rev = "$commitHash";
  tarballHash = "$tarballHash";

postgrest.cabal

@@ -121,7 +121,7 @@ library
  , mtl >= 2.2.2 && < 2.4
  , network >= 2.6 && < 3.2
  , network-uri >= 2.6.1 && < 2.8
- , optparse-applicative >= 0.13 && < 0.18
+ , optparse-applicative >= 0.13 && < 0.19
  , parsec >= 3.1.11 && < 3.2
  , postgresql-libpq >= 0.10
  , protolude >= 0.3.1 && < 0.4