Skip to content

Commit d4bae6e

Browse files
Try #1574:
2 parents a354f61 + 265de95 commit d4bae6e

File tree

3 files changed

+8
-7
lines changed

3 files changed

+8
-7
lines changed

flake.lock

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

flake.nix

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
flake-utils = { url = "github:numtide/flake-utils"; };
1212
hydra.url = "hydra";
1313
hackage = {
14-
url = "github:input-output-hk/hackage.nix";
14+
url = "github:input-output-hk/hackage.nix/hkm/nixify";
1515
flake = false;
1616
};
1717
stackage = {

modules/hackage.nix

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ let
66
# { "a.b.c.d" =
77
# rec { sha256 = $pkgVersionSha256;
88
# revisions =
9-
# { r0 = { outPath = ./hackage/...; revNum = 0; sha256 = $revisionSha256; };
9+
# { r0 = { nix = import ../hackage/...; revNum = 0; sha256 = $revisionSha256; };
1010
# default = revisions.r0; };
1111
# };
1212
# };
@@ -24,7 +24,7 @@ let
2424
# { "a.b.c.d" =
2525
# rec { sha256 = $packageVersionSha256;
2626
# revisions =
27-
# { r0 = { outPath = ./hackage/...;
27+
# { r0 = { nix = import ../hackage/...;
2828
# sha256 = $packageVersionSha256;
2929
# revision = $revNum;
3030
# revisionSha256 = $revisionSha256; };
@@ -45,7 +45,7 @@ let
4545
inherit (version) sha256;
4646
revision = rev.revNum;
4747
revisionSha256 = rev.sha256;
48-
} // import rev modArgs;
48+
} // (x: (rev.nix or (import rev)) x) modArgs;
4949
f = rev: acc: acc // {
5050
# If there's a collision (e.g. a revision was
5151
# reverted), pick the one with the smaller

0 commit comments

Comments
 (0)