hasura/graphql-engine
1
0
Fork 0
mirror of https://github.com/hasura/graphql-engine.git synced 2025-01-05 22:34:22 +03:00
Code Issues Projects Releases Wiki Activity

nix: Switch to nixpkgs-unstable.

Browse Source 
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
This commit is contained in:
Samir Talwar 2023-03-24 21:34:55 +01:00 committed by hasura-bot
parent 3d071f96b9
commit 0256e1da7d
6 changed files with 4 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
flake.lock generated
View File

@ -17,16 +17,15 @@
}, },
"nixpkgs": { "nixpkgs": {
"locked": { "locked": {
"lastModified": 1677543769, "lastModified": 1679661381,
"narHash": "sha256-LwbqS8vGisXl2WHpK9r5+kodr0zoIT8F2YB0R4y1TsA=", "narHash": "sha256-5rtB59ikMSpxPPJmwVMkHhIN8yzTkWP//Wk6iaXoLyw=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "b26d52c9feb6476580016e78935cbf96eb3e2115", "rev": "1a16c75b7ade83993792d385631f7b2fd540a3cc",
"type": "github" "type": "github"
}, },
"original": { "original": {
"owner": "NixOS", "owner": "NixOS",
"ref": "nixos-22.11",
"repo": "nixpkgs", "repo": "nixpkgs",
"type": "github" "type": "github"
} }

2
flake.nix
View File

@ -19,7 +19,7 @@
}; };
nixpkgs = { nixpkgs = {
url = github:NixOS/nixpkgs/nixos-22.11; url = github:NixOS/nixpkgs;
}; };
}; };

1
nix/overlays/dc-api.nix
View File

@ -7,7 +7,6 @@ final: prev: {
(hfinal: hprev: { (hfinal: hprev: {
# Tests don't compile as extra-source-files are missing # 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 { }); 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;
}); });
}); });
}; };

1
nix/shell.nix
View File

@ -61,7 +61,6 @@ let
pkgs.haskell.packages.${pkgs.ghcName}.happy pkgs.haskell.packages.${pkgs.ghcName}.happy
pkgs.haskell.packages.${pkgs.ghcName}.haskell-language-server pkgs.haskell.packages.${pkgs.ghcName}.haskell-language-server
(versions.ensureVersion pkgs.haskell.packages.${pkgs.ghcName}.hlint) (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}.hoogle
pkgs.haskell.packages.${pkgs.ghcName}.hspec-discover pkgs.haskell.packages.${pkgs.ghcName}.hspec-discover
(versions.ensureVersion pkgs.haskell.packages.${pkgs.ghcName}.ormolu) (versions.ensureVersion pkgs.haskell.packages.${pkgs.ghcName}.ormolu)

1
server/CONTRIBUTING.md
View File

@ -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) - 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_): - Additional Haskell tools (expected versions can be found in _VERSIONS.json_):
- [HLint](https://github.com/ndmitchell/hlint), for linting Haskell code - [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 - [Ormolu](https://github.com/tweag/ormolu), for formatting Haskell code
- [Docker](https://www.docker.com/get-started/) - [Docker](https://www.docker.com/get-started/)
- [Docker Compose](https://docs.docker.com/compose/install/) - [Docker Compose](https://docs.docker.com/compose/install/)

1
server/VERSIONS.json
View File

@ -1,6 +1,5 @@
{ {
"ghc": "9.2.5", "ghc": "9.2.5",
"hlint": "3.4.1", "hlint": "3.4.1",
"hpack": "0.34.7",
"ormolu": "0.5.0.1" "ormolu": "0.5.0.1"
} }