mirror of
https://github.com/hasura/graphql-engine.git
synced 2024-10-26 10:20:54 +03:00
Upgrade the Nix lockfile and fix ghcid on macOS.
I was experiencing issues trying to install ghcid on macOS + aarch64. Turns out there's a patch for that but it's not enabled for GHC 9.4. I have added it. We may want to push this upstream. This also upgrades Ormolu, with only a tiny change. PR-URL: https://github.com/hasura/graphql-engine-mono/pull/10062 GitOrigin-RevId: 09d0bf115155267584e91c6a21caf8afc7d744a8
This commit is contained in:
parent
a2353f5a35
commit
71c31755c1
12
flake.lock
12
flake.lock
@ -5,11 +5,11 @@
|
||||
"systems": "systems"
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1685518550,
|
||||
"narHash": "sha256-o2d0KcvaXzTrPRIo0kOLV0/QXHhDQ5DTi+OxcjO8xqY=",
|
||||
"lastModified": 1689068808,
|
||||
"narHash": "sha256-6ixXo3wt24N/melDWjq70UuHQLxGV8jZvooRanIHXw0=",
|
||||
"owner": "numtide",
|
||||
"repo": "flake-utils",
|
||||
"rev": "a1720a10a6cfe8234c0e93907ffe81be440f4cef",
|
||||
"rev": "919d646de7be200f3bf08cb76ae1f09402b6f9b4",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
@ -20,11 +20,11 @@
|
||||
},
|
||||
"nixpkgs": {
|
||||
"locked": {
|
||||
"lastModified": 1685534442,
|
||||
"narHash": "sha256-NoxAjHiGsmnCeIY3SlMRA3DT/n+cACm+TPtaFR6hD+M=",
|
||||
"lastModified": 1691076334,
|
||||
"narHash": "sha256-c431cY0bDr6IosR6dtrVeZ4mblF/NpqQybjBMDsngn8=",
|
||||
"owner": "NixOS",
|
||||
"repo": "nixpkgs",
|
||||
"rev": "d4438bded890ecd5179cf366839b26ea0b505a87",
|
||||
"rev": "626827822f4a370e0f30b496037c7a95950f1ddf",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
@ -6,11 +6,11 @@ import nixpkgs {
|
||||
config = {
|
||||
allowUnfree = true;
|
||||
permittedInsecurePackages = [
|
||||
"nodejs-16.20.0" # until we upgrade our node.js version in .nvmrc
|
||||
"nodejs-16.20.1" # until we upgrade our node.js version in .nvmrc
|
||||
];
|
||||
};
|
||||
overlays = [
|
||||
(import ./overlays/ghc.nix)
|
||||
(import ./overlays/ghc.nix { inherit nixpkgs; })
|
||||
(import ./overlays/ormolu.nix)
|
||||
(import ./overlays/msodbcsql18.nix)
|
||||
(import ./overlays/graphql-parser.nix)
|
||||
|
@ -1,3 +1,4 @@
|
||||
{ nixpkgs }:
|
||||
self: super:
|
||||
let
|
||||
versions = import ../versions.nix { pkgs = super; };
|
||||
@ -13,6 +14,11 @@ let
|
||||
# Without this, we get the following error on macOS:
|
||||
# ghc: loadArchive: Neither an archive, nor a fat archive: `/path/to/clang++'
|
||||
./ghc-9.4-macOS-loadArchive-fix.patch
|
||||
# On macOS + aarch64, there's an issue where the `bin` output depends on
|
||||
# the `out` output, and vice versa. This patch fixes the problem.
|
||||
# For some reason we don't apply it for GHC 9.4 in nixpkgs, even though
|
||||
# it's needed.
|
||||
"${nixpkgs}/pkgs/development/compilers/ghc/Cabal-3.6-paths-fix-cycle-aarch64-darwin.patch"
|
||||
] else [ ];
|
||||
in
|
||||
{
|
||||
@ -22,15 +28,6 @@ in
|
||||
patches = (if oldAttrs ? patches then oldAttrs.patches else [ ]) ++ ghcPatches;
|
||||
});
|
||||
};
|
||||
|
||||
packages = super.haskell.packages // {
|
||||
${ghcName} = super.haskell.packages.${ghcName}.override {
|
||||
overrides = hself: hsuper: {
|
||||
# ghcid tests are broken on GHC 9.4
|
||||
ghcid = super.haskell.lib.dontCheck hsuper.ghcid;
|
||||
};
|
||||
};
|
||||
};
|
||||
};
|
||||
|
||||
inherit (versions) ghcVersion;
|
||||
|
@ -9,7 +9,7 @@ self: super:
|
||||
packages = super.haskell.packages // {
|
||||
${self.ghcName} = super.haskell.packages.${self.ghcName}.override {
|
||||
overrides = hself: hsuper: {
|
||||
ormolu_0_7_0_0 = hsuper.ormolu_0_7_0_0.override {
|
||||
ormolu_0_7_1_0 = hsuper.ormolu_0_7_1_0.override {
|
||||
Cabal-syntax = hsuper.Cabal-syntax_3_10_1_0;
|
||||
ghc-lib-parser = hsuper.ghc-lib-parser_9_6_2_20230523;
|
||||
};
|
||||
|
@ -108,7 +108,7 @@ let
|
||||
(versions.ensureVersion pkgs.haskell.packages.${pkgs.ghcName}.hlint)
|
||||
pkgs.haskell.packages.${pkgs.ghcName}.hoogle
|
||||
pkgs.haskell.packages.${pkgs.ghcName}.hspec-discover
|
||||
(versions.ensureVersion pkgs.haskell.packages.${pkgs.ghcName}.ormolu_0_7_0_0)
|
||||
(versions.ensureVersion pkgs.haskell.packages.${pkgs.ghcName}.ormolu_0_7_1_0)
|
||||
];
|
||||
|
||||
devInputs = [
|
||||
|
@ -2,5 +2,5 @@
|
||||
"cabal-install": "3.10.1.0",
|
||||
"ghc": "9.4.5",
|
||||
"hlint": "3.5",
|
||||
"ormolu": "0.7.0.0"
|
||||
"ormolu": "0.7.1.0"
|
||||
}
|
||||
|
@ -79,5 +79,5 @@ runMultipleUpdates TestBuilder {..} =
|
||||
. toSQLTxt
|
||||
<$> ctes
|
||||
`shouldBe` SI.fromText
|
||||
<$> expectedSQL
|
||||
<$> expectedSQL
|
||||
_ -> assertFailure "expected update_many, got single update"
|
||||
|
Loading…
Reference in New Issue
Block a user