From 66396630ec659d0434189f6a31b14a2ac3f92787 Mon Sep 17 00:00:00 2001 From: Lei Zhu Date: Sat, 22 Apr 2023 22:12:44 +0800 Subject: [PATCH] nix build fix --- configuration-ghc-96.nix | 1 + flake.lock | 13 +++++++++++++ flake.nix | 5 +++++ 3 files changed, 19 insertions(+) diff --git a/configuration-ghc-96.nix b/configuration-ghc-96.nix index 1ad169ed03..ee606bcb89 100644 --- a/configuration-ghc-96.nix +++ b/configuration-ghc-96.nix @@ -42,6 +42,7 @@ let ptr-poker = hself.callCabal2nix "ptr-poker" inputs.ptr-poker { }; ormolu = hself.ormolu_0_5_3_0; + fourmolu = hself.callCabal2nix "fourmolu" inputs.fourmolu-012 { }; stylish-haskell = appendConfigureFlag hsuper.stylish-haskell "-fghc-lib"; diff --git a/flake.lock b/flake.lock index 2f40cff401..effcb4756d 100644 --- a/flake.lock +++ b/flake.lock @@ -31,6 +31,18 @@ "type": "github" } }, + "fourmolu-012": { + "flake": false, + "locked": { + "narHash": "sha256-yru8ls67DMM6WSeVU6xDmmwa48I8S9CUv9NBaxSQ29M=", + "type": "tarball", + "url": "https://hackage.haskell.org/package/fourmolu-0.12.0.0/fourmolu-0.12.0.0.tar.gz" + }, + "original": { + "type": "tarball", + "url": "https://hackage.haskell.org/package/fourmolu-0.12.0.0/fourmolu-0.12.0.0.tar.gz" + } + }, "ghc-lib-parser-94": { "flake": false, "locked": { @@ -181,6 +193,7 @@ "inputs": { "flake-compat": "flake-compat", "flake-utils": "flake-utils", + "fourmolu-012": "fourmolu-012", "ghc-lib-parser-94": "ghc-lib-parser-94", "gitignore": "gitignore", "haskell-ghc-exactprint": "haskell-ghc-exactprint", diff --git a/flake.nix b/flake.nix index ed08e47a72..3cd93b5942 100644 --- a/flake.nix +++ b/flake.nix @@ -59,6 +59,11 @@ url = "github:alanz/ghc-exactprint/ghc-9.6"; flake = false; }; + + fourmolu-012 = { + url = "https://hackage.haskell.org/package/fourmolu-0.12.0.0/fourmolu-0.12.0.0.tar.gz"; + flake = false; + }; }; outputs = inputs@{ self, nixpkgs, flake-compat, flake-utils, gitignore, ... }: