From 0256e1da7d74da6a7dce27423b673bf7e0fffbd7 Mon Sep 17 00:00:00 2001
From: Samir Talwar <samir.talwar@hasura.io>
Date: Fri, 24 Mar 2023 21:34:55 +0100
Subject: [PATCH] nix: Switch to nixpkgs-unstable.

I am making this change for two reasons:

  * We expect to upgrade to GHC 9.2.7 imminently, which is not available on the nixos-22.11 branch.
  * We need to upgrade unixODBC, which has stagnated on nixos-22.11.

While we expect a new NixOS release in a month or two, we can't really afford to wait that long. In addition, we might need to upgrade GHC again soon after that.

I removed `hpack` because we don't actually use it any more.

PR-URL: https://github.com/hasura/graphql-engine-mono/pull/8483
GitOrigin-RevId: 9a7ef1a97599a218e34dfde1ad4f6a7279d2ba0e
---
 flake.lock              | 7 +++----
 flake.nix               | 2 +-
 nix/overlays/dc-api.nix | 1 -
 nix/shell.nix           | 1 -
 server/CONTRIBUTING.md  | 1 -
 server/VERSIONS.json    | 1 -
 6 files changed, 4 insertions(+), 9 deletions(-)

diff --git a/flake.lock b/flake.lock
index 75da8a34de7..fc9fa9ef691 100644
--- a/flake.lock
+++ b/flake.lock
@@ -17,16 +17,15 @@
     },
     "nixpkgs": {
       "locked": {
-        "lastModified": 1677543769,
-        "narHash": "sha256-LwbqS8vGisXl2WHpK9r5+kodr0zoIT8F2YB0R4y1TsA=",
+        "lastModified": 1679661381,
+        "narHash": "sha256-5rtB59ikMSpxPPJmwVMkHhIN8yzTkWP//Wk6iaXoLyw=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "b26d52c9feb6476580016e78935cbf96eb3e2115",
+        "rev": "1a16c75b7ade83993792d385631f7b2fd540a3cc",
         "type": "github"
       },
       "original": {
         "owner": "NixOS",
-        "ref": "nixos-22.11",
         "repo": "nixpkgs",
         "type": "github"
       }
diff --git a/flake.nix b/flake.nix
index f4b674b8615..3a4b726a190 100644
--- a/flake.nix
+++ b/flake.nix
@@ -19,7 +19,7 @@
     };
 
     nixpkgs = {
-      url = github:NixOS/nixpkgs/nixos-22.11;
+      url = github:NixOS/nixpkgs;
     };
   };
 
diff --git a/nix/overlays/dc-api.nix b/nix/overlays/dc-api.nix
index 3f69a9e1046..4454876e2dc 100644
--- a/nix/overlays/dc-api.nix
+++ b/nix/overlays/dc-api.nix
@@ -7,7 +7,6 @@ final: prev: {
           (hfinal: hprev: {
             # Tests don't compile as extra-source-files are missing
             dc-api = prev.haskell.lib.dontCheck (final.haskell.packages."${prev.ghcName}".callCabal2nix "dc-api" ../../server/lib/dc-api { });
-            lens-aeson = prev.haskell.packages."${prev.ghcName}".lens-aeson_1_2_2;
           });
       });
     };
diff --git a/nix/shell.nix b/nix/shell.nix
index c93a728ad28..3ef614ddb15 100644
--- a/nix/shell.nix
+++ b/nix/shell.nix
@@ -61,7 +61,6 @@ let
     pkgs.haskell.packages.${pkgs.ghcName}.happy
     pkgs.haskell.packages.${pkgs.ghcName}.haskell-language-server
     (versions.ensureVersion pkgs.haskell.packages.${pkgs.ghcName}.hlint)
-    (versions.ensureVersion pkgs.haskell.packages.${pkgs.ghcName}.hpack)
     pkgs.haskell.packages.${pkgs.ghcName}.hoogle
     pkgs.haskell.packages.${pkgs.ghcName}.hspec-discover
     (versions.ensureVersion pkgs.haskell.packages.${pkgs.ghcName}.ormolu)
diff --git a/server/CONTRIBUTING.md b/server/CONTRIBUTING.md
index b2b65e01acb..b588c17d527 100644
--- a/server/CONTRIBUTING.md
+++ b/server/CONTRIBUTING.md
@@ -9,7 +9,6 @@ This guide explains how to set up the graphql-engine server for development on y
 - There are few system packages required like `libpq-dev`, `libssl-dev`, etc. The best place to get the entire list is from the [Dockerfile](../packaging/graphql-engine-base/ubuntu.dockerfile)
 - Additional Haskell tools (expected versions can be found in _VERSIONS.json_):
   - [HLint](https://github.com/ndmitchell/hlint), for linting Haskell code
-  - [hpack](https://github.com/sol/hpack), for generating Cabal files
   - [Ormolu](https://github.com/tweag/ormolu), for formatting Haskell code
 - [Docker](https://www.docker.com/get-started/)
 - [Docker Compose](https://docs.docker.com/compose/install/)
diff --git a/server/VERSIONS.json b/server/VERSIONS.json
index 77c9b23858c..164887b64d7 100644
--- a/server/VERSIONS.json
+++ b/server/VERSIONS.json
@@ -1,6 +1,5 @@
 {
   "ghc": "9.2.5",
   "hlint": "3.4.1",
-  "hpack": "0.34.7",
   "ormolu": "0.5.0.1"
 }