Skip to content

Commit aed759e

Browse files
committed
bump
1 parent 793fc47 commit aed759e

File tree

3 files changed

+66
-30
lines changed

3 files changed

+66
-30
lines changed

dynamic.nix

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
# define a development shell for dynamically linked applications (default)
22
{ self, pkgs, compiler, compiler-nix-name, toolsModule, withHLS ? true, withHlint ? true, withIOG ? true, withIOGFull ? false, withGHCTooling ? false }:
3-
let tool-version-map = (import ./tool-map.nix) self;
3+
let tool-version-map = (import ./tool-map.nix) (self // { inputs = self.inputs // {cabal = if withGHCTooling then self.inputs.cabal-experimental else self.inputs.cabal;}; });
44
tool = tool-name: pkgs.pkgsBuildBuild.haskell-nix.tool compiler-nix-name tool-name [(tool-version-map compiler-nix-name tool-name) toolsModule];
55
cabal-install = tool "cabal";
66
haskell-tools =

flake.lock

Lines changed: 62 additions & 28 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

flake.nix

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,10 @@
55
inputs.nixpkgs.follows = "haskellNix/nixpkgs-2411";
66
inputs.flake-utils.url = "github:numtide/flake-utils";
77
inputs.iohk-nix.url = "github:input-output-hk/iohk-nix";
8-
inputs.cabal.url = "github:stable-haskell/cabal?ref=wip/make-build";
8+
inputs.cabal.url = "github:stable-haskell/cabal";
99
inputs.cabal.flake = false;
10+
inputs.cabal-experimental.url = "github:stable-haskell/cabal?ref=angerman/cross";
11+
inputs.cabal-experimental.flake = false;
1012

1113
outputs = { self, nixpkgs, flake-utils, haskellNix, iohk-nix, ... }:
1214
let overlays = {

0 commit comments

Comments
 (0)