diff --git a/dep/gitignore.nix/github.json b/dep/gitignore.nix/github.json index b8d48c778..a6d7f3af1 100644 --- a/dep/gitignore.nix/github.json +++ b/dep/gitignore.nix/github.json @@ -3,6 +3,6 @@ "repo": "gitignore.nix", "branch": "master", "private": false, - "rev": "7415c4feb127845553943a3856cbc5cb967ee5e0", - "sha256": "1zd1ylgkndbb5szji32ivfhwh04mr1sbgrnvbrqpmfb67g2g3r9i" + "rev": "637db329424fd7e46cf4185293b9cc8c88c95394", + "sha256": "02wxkdpbhlm3yk5mhkhsp3kwakc16xpmsf2baw57nz1dg459qv8w" } diff --git a/haskell-overlays/misc-deps.nix b/haskell-overlays/misc-deps.nix index 1debcc8d9..5ce5782c5 100644 --- a/haskell-overlays/misc-deps.nix +++ b/haskell-overlays/misc-deps.nix @@ -85,7 +85,7 @@ rec { modern-uri = haskellLib.doJailbreak super.modern-uri; monad-logger = self.callHackage "monad-logger" "0.3.36" { }; neat-interpolation = haskellLib.doJailbreak super.neat-interpolation; - nix-thunk = (import ../dep/nix-thunk { }).makeRunnableNixThunk (haskellLib.doJailbreak (self.callCabal2nix "nix-thunk" (hackGet ../dep/nix-thunk) { })); + nix-thunk = (import ../dep/nix-thunk { inherit pkgs; }).makeRunnableNixThunk (haskellLib.doJailbreak (self.callCabal2nix "nix-thunk" (hackGet ../dep/nix-thunk) { })); cli-extras = haskellLib.doJailbreak (self.callCabal2nix "cli-extras" (hackGet ../dep/cli-extras) { }); cli-git = haskellLib.doJailbreak (haskellLib.overrideCabal (self.callCabal2nix "cli-git" (hackGet ../dep/cli-git) { }) { librarySystemDepends = with pkgs; [