mirror of
https://github.com/hasura/graphql-engine.git
synced 2024-08-16 22:21:06 +03:00
Upgrade nixpkgs to get GHC 9.6.4.
GHC 9.6.4 has finally been merged into nixpkgs! (This took far longer than anticipated.) We can now upgrade to get our hands on it. I had to remove the console dev tools from the Nix shell because node.js 16 is EOL and not available in the latest nixpkgs. PR-URL: https://github.com/hasura/graphql-engine-mono/pull/10729 GitOrigin-RevId: f7236c9e284a467bfac4897afb9d452dd103786d
This commit is contained in:
parent
249b86b328
commit
4b1cf9bee7
12
flake.lock
12
flake.lock
@ -5,11 +5,11 @@
|
|||||||
"systems": "systems"
|
"systems": "systems"
|
||||||
},
|
},
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1694529238,
|
"lastModified": 1710146030,
|
||||||
"narHash": "sha256-zsNZZGTGnMOf9YpHKJqMSsa0dXbfmxeoJ7xHlrt+xmY=",
|
"narHash": "sha256-SZ5L6eA7HJ/nmkzGG7/ISclqe6oZdOZTNoesiInkXPQ=",
|
||||||
"owner": "numtide",
|
"owner": "numtide",
|
||||||
"repo": "flake-utils",
|
"repo": "flake-utils",
|
||||||
"rev": "ff7b65b44d01cf9ba6a71320833626af21126384",
|
"rev": "b1d9ab70662946ef0850d488da1c9019f3a9752a",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
@ -20,11 +20,11 @@
|
|||||||
},
|
},
|
||||||
"nixpkgs": {
|
"nixpkgs": {
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1699914561,
|
"lastModified": 1710754590,
|
||||||
"narHash": "sha256-b296O45c3Jgj8GEFg/NN7ZOJjBBCHr1o2iA4yoJ3OKE=",
|
"narHash": "sha256-9LA94zYvr5a6NawEftuSdTP8HYMV0ZYdB5WG6S9Z7tI=",
|
||||||
"owner": "NixOS",
|
"owner": "NixOS",
|
||||||
"repo": "nixpkgs",
|
"repo": "nixpkgs",
|
||||||
"rev": "2f8742189e9ef86961ab90a30c68eb844565578a",
|
"rev": "a089e2dc4cf2421ca29f2d5ced81badd5911fcdf",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
|
@ -5,11 +5,7 @@ final: prev: {
|
|||||||
overrides = prev.lib.composeExtensions
|
overrides = prev.lib.composeExtensions
|
||||||
(old.overrides or (_: _: { }))
|
(old.overrides or (_: _: { }))
|
||||||
(hfinal: hprev: {
|
(hfinal: hprev: {
|
||||||
graphql-parser = (final.haskell.packages.${prev.ghcName}.callCabal2nix "graphql-parser" ../../server/lib/graphql-parser-hs { }).overrideScope (
|
graphql-parser = (final.haskell.packages.${prev.ghcName}.callCabal2nix "graphql-parser" ../../server/lib/graphql-parser { });
|
||||||
final: prev: {
|
|
||||||
hedgehog = final.hedgehog_1_2;
|
|
||||||
}
|
|
||||||
);
|
|
||||||
});
|
});
|
||||||
});
|
});
|
||||||
};
|
};
|
||||||
|
@ -78,17 +78,12 @@ let
|
|||||||
pkgs.jq
|
pkgs.jq
|
||||||
];
|
];
|
||||||
|
|
||||||
consoleInputs = [
|
|
||||||
pkgs.google-cloud-sdk
|
|
||||||
pkgs."nodejs-${versions.nodejsVersion}_x"
|
|
||||||
pkgs."nodejs-${versions.nodejsVersion}_x".pkgs.typescript-language-server
|
|
||||||
];
|
|
||||||
|
|
||||||
docsInputs = [
|
docsInputs = [
|
||||||
pkgs.yarn
|
pkgs.yarn
|
||||||
];
|
];
|
||||||
|
|
||||||
integrationTestInputs = [
|
integrationTestInputs = [
|
||||||
|
pkgs.nodejs
|
||||||
pkgs.python3
|
pkgs.python3
|
||||||
pkgs.pyright # Python type checker
|
pkgs.pyright # Python type checker
|
||||||
];
|
];
|
||||||
@ -101,7 +96,7 @@ let
|
|||||||
hls
|
hls
|
||||||
|
|
||||||
pkgs.haskell.packages.${pkgs.ghcName}.alex
|
pkgs.haskell.packages.${pkgs.ghcName}.alex
|
||||||
# pkgs.haskell.packages.${pkgs.ghcName}.apply-refact
|
pkgs.haskell.packages.${pkgs.ghcName}.apply-refact
|
||||||
(versions.ensureVersion pkgs.haskell.packages.${pkgs.ghcName}.cabal-install)
|
(versions.ensureVersion pkgs.haskell.packages.${pkgs.ghcName}.cabal-install)
|
||||||
(pkgs.haskell.lib.dontCheck (pkgs.haskell.packages.${pkgs.ghcName}.ghcid))
|
(pkgs.haskell.lib.dontCheck (pkgs.haskell.packages.${pkgs.ghcName}.ghcid))
|
||||||
pkgs.haskell.packages.${pkgs.ghcName}.happy
|
pkgs.haskell.packages.${pkgs.ghcName}.happy
|
||||||
@ -163,7 +158,7 @@ let
|
|||||||
++ integrationTestInputs;
|
++ integrationTestInputs;
|
||||||
in
|
in
|
||||||
pkgs.mkShell ({
|
pkgs.mkShell ({
|
||||||
buildInputs = baseInputs ++ consoleInputs ++ docsInputs ++ serverDeps ++ devInputs ++ ciInputs;
|
buildInputs = baseInputs ++ docsInputs ++ serverDeps ++ devInputs ++ ciInputs;
|
||||||
} // pkgs.lib.optionalAttrs pkgs.stdenv.isDarwin {
|
} // pkgs.lib.optionalAttrs pkgs.stdenv.isDarwin {
|
||||||
shellHook = ''
|
shellHook = ''
|
||||||
export DYLD_LIBRARY_PATH='${dynamicLibraryPath}'
|
export DYLD_LIBRARY_PATH='${dynamicLibraryPath}'
|
||||||
|
@ -11,6 +11,4 @@ in
|
|||||||
else throw "Invalid version for package ${package.pname}: expected ${expected}, got ${package.version}";
|
else throw "Invalid version for package ${package.pname}: expected ${expected}, got ${package.version}";
|
||||||
|
|
||||||
ghcVersion = pkgs.lib.strings.fileContents ../.ghcversion;
|
ghcVersion = pkgs.lib.strings.fileContents ../.ghcversion;
|
||||||
|
|
||||||
nodejsVersion = pkgs.lib.strings.fileContents ../.nvmrc;
|
|
||||||
}
|
}
|
||||||
|
@ -1,5 +1,5 @@
|
|||||||
{
|
{
|
||||||
"cabal-install": "3.10.1.0",
|
"cabal-install": "3.10.2.1",
|
||||||
"ghc": "9.6.4",
|
"ghc": "9.6.4",
|
||||||
"hlint": "3.6.1",
|
"hlint": "3.6.1",
|
||||||
"ormolu": "0.7.2.0"
|
"ormolu": "0.7.2.0"
|
||||||
|
Loading…
Reference in New Issue
Block a user