|
8 | 8 | cardano-node.url = "github:intersectmbo/cardano-node/10.1.4";
|
9 | 9 | flake-parts.url = "github:hercules-ci/flake-parts";
|
10 | 10 | haskellNix.url = "github:input-output-hk/haskell.nix";
|
11 |
| - hydra-coding-standards.url = "github:cardano-scaling/hydra-coding-standards/0.5.0"; |
| 11 | + hydra-coding-standards.url = "github:cardano-scaling/hydra-coding-standards/0.6.0"; |
12 | 12 | hydra-spec.url = "github:cardano-scaling/hydra-formal-specification";
|
13 | 13 | iohk-nix.url = "github:input-output-hk/iohk-nix";
|
14 | 14 | lint-utils = {
|
|
36 | 36 | "aarch64-darwin"
|
37 | 37 | "aarch64-linux"
|
38 | 38 | ];
|
39 |
| - perSystem = { pkgs, config, lib, system, ... }: |
| 39 | + perSystem = { config, lib, system, ... }: |
40 | 40 | let
|
41 | 41 | compiler = "ghc966";
|
42 | 42 |
|
|
59 | 59 | (import ./nix/static-libs.nix)
|
60 | 60 | inputs.nix-npm-buildpackage.overlays.default
|
61 | 61 | # Specific versions of tools we require
|
62 |
| - (final: prev: { |
| 62 | + (final: _prev: { |
63 | 63 | inherit (inputs.aiken.packages.${system}) aiken;
|
64 |
| - apply-refact = pkgs.haskell-nix.tool compiler "apply-refact" "0.15.0.0"; |
65 |
| - cabal-install = pkgs.haskell-nix.tool compiler "cabal-install" "3.10.3.0"; |
66 |
| - cabal-plan = pkgs.haskell-nix.tool compiler "cabal-plan" "0.7.5.0"; |
| 64 | + apply-refact = final.haskell-nix.tool compiler "apply-refact" "0.15.0.0"; |
| 65 | + cabal-install = final.haskell-nix.tool compiler "cabal-install" "3.10.3.0"; |
| 66 | + cabal-plan = final.haskell-nix.tool compiler "cabal-plan" "0.7.5.0"; |
67 | 67 | cabal-fmt = config.treefmt.programs.cabal-fmt.package;
|
68 | 68 | fourmolu = config.treefmt.programs.fourmolu.package;
|
69 |
| - haskell-language-server = pkgs.haskell-nix.tool compiler "haskell-language-server" "2.9.0.0"; |
70 |
| - weeder = pkgs.haskell-nix.tool compiler "weeder" "2.9.0"; |
| 69 | + haskell-language-server = final.haskell-nix.tool compiler "haskell-language-server" "2.9.0.0"; |
| 70 | + weeder = final.haskell-nix.tool compiler "weeder" "2.9.0"; |
71 | 71 | inherit (inputs.cardano-node.packages.${system}) cardano-cli;
|
72 | 72 | inherit (inputs.cardano-node.packages.${system}) cardano-node;
|
73 | 73 | inherit (inputs.mithril.packages.${system}) mithril-client-cli;
|
74 | 74 | mithril-client-cli-unstable =
|
75 |
| - pkgs.writeShellScriptBin "mithril-client-unstable" '' |
| 75 | + final.writeShellScriptBin "mithril-client-unstable" '' |
76 | 76 | exec ${inputs.mithril-unstable.packages.${system}.mithril-client-cli}/bin/mithril-client "$@"
|
77 | 77 | '';
|
78 | 78 | })
|
|
92 | 92 | };
|
93 | 93 |
|
94 | 94 | tx-cost-diff =
|
95 |
| - let |
96 |
| - pyEnv = pkgs.python3.withPackages (ps: with ps; [ pandas html5lib beautifulsoup4 tabulate ]); |
97 |
| - in |
98 | 95 | pkgs.writers.writeHaskellBin
|
99 | 96 | "tx-cost-diff"
|
100 | 97 | {
|
|
122 | 119 | inherit tx-cost-diff;
|
123 | 120 | };
|
124 | 121 |
|
125 |
| - treefmt.programs.typos = { |
126 |
| - enable = true; |
127 |
| - includes = [ |
128 |
| - "*.md" |
129 |
| - "*.hs" |
130 |
| - "*.cabal" |
131 |
| - ]; |
132 |
| - }; |
133 | 122 | coding.standards.hydra = {
|
134 | 123 | enable = true;
|
135 | 124 | haskellPackages = with hsPkgs; builtins.concatMap allComponents [
|
|
0 commit comments