Skip to content

Commit dca5bea

Browse files
committed
fix nix build
1 parent ba116c9 commit dca5bea

File tree

5 files changed

+20
-5
lines changed

5 files changed

+20
-5
lines changed

nix/packages.nix

+1-1
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ let
55
nix-inclusive = pkgs.callPackage "${pkgs.sources.nix-inclusive}/inclusive.nix" {};
66
cardano-graphql = self.callPackage ./cardano-graphql.nix {};
77
hasura-cli-ext = self.callPackage ./hasura-cli-ext/impure.nix {};
8-
persistgraphql = (self.callPackage ./persistgraphql {}).persistgraphql;
8+
persistgraphql = (self.callPackage ./persistgraphql { nodejs = pkgs.nodejs-14_x; }).persistgraphql;
99
hasura-cli = pkgs.hasura-cli.overrideAttrs (_: rec {
1010
src = pkgs.sources.graphql-engine;
1111
name = "hasura-${version}";

nix/pkgs.nix

+5-2
Original file line numberDiff line numberDiff line change
@@ -14,9 +14,12 @@ let
1414
sources.nixpkgs)
1515
else (import sources.iohk-nix {}).nixpkgs;
1616

17+
nixpkgs2205 = import sources."nixpkgs-22.05" {};
18+
1719
overlay = self: super: {
18-
packages = self.callPackages ./packages.nix {};
19-
nodejs = super.nodejs-14_x;
20+
packages = self.callPackages ./packages.nix { };
21+
#nodejs = super.nodejs-14_x;
22+
nodejs = nixpkgs2205.nodejs-16_x;
2023
inherit sources;
2124
};
2225
pkgs = import nixpkgs {

nix/sources.json

+12
Original file line numberDiff line numberDiff line change
@@ -62,6 +62,18 @@
6262
"url": "https://github.com/input-output-hk/nix-inclusive/archive/11d05e4f1ca04fd250a9734e27970ad73bbd872d.tar.gz",
6363
"url_template": "https://github.com/<owner>/<repo>/archive/<rev>.tar.gz"
6464
},
65+
"nixpkgs-22.05": {
66+
"branch": "nixos-22.05",
67+
"description": "Nix Packages collection",
68+
"homepage": "",
69+
"owner": "NixOS",
70+
"repo": "nixpkgs",
71+
"rev": "b82ccafb54163ab9024e893e578d840577785fea",
72+
"sha256": "0jr9gjpxrmgxc12y2883rcdlkhbv1qwghgcqz2w7mjnpp11l36b4",
73+
"type": "tarball",
74+
"url": "https://github.com/NixOS/nixpkgs/archive/b82ccafb54163ab9024e893e578d840577785fea.tar.gz",
75+
"url_template": "https://github.com/<owner>/<repo>/archive/<rev>.tar.gz"
76+
},
6577
"pg-client-hs": {
6678
"branch": "master",
6779
"builtin": false,

release.nix

+1-1
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ lib.fix (self: {
2727
required = releaseTools.aggregate {
2828
name = "required";
2929
constituents = with self; [
30-
cardano-graphql
30+
self.cardano-graphql
3131
graphql-engine
3232
hasura-cli
3333
hasura-cli-ext

shell.nix

+1-1
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ let
2121
nodejs # Event-driven I/O framework for the V8 JavaScript engine
2222
packages.cardano-graphql
2323
pkgconfig # Allows packages to find out information about other packages
24-
persistgraphql
24+
packages.persistgraphql
2525
hasura-cli
2626
python # The Python Programming language
2727
tmux # Terminal multiplexer

0 commit comments

Comments
 (0)