From e9f89e0fb6546532df9872e68dd7668341cd66df Mon Sep 17 00:00:00 2001 From: Anders Kaseorg Date: Mon, 2 Mar 2020 02:47:42 -0800 Subject: [PATCH] haskellPackages.nixfmt: Unbreak Signed-off-by: Anders Kaseorg --- pkgs/development/haskell-modules/configuration-common.nix | 3 +++ .../development/haskell-modules/configuration-hackage2nix.yaml | 1 - 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix index 55eb4f47cda..d0a1929c00e 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -1444,4 +1444,7 @@ self: super: { }) ]; + # https://github.com/serokell/nixfmt/pull/62 + nixfmt = doJailbreak super.nixfmt; + } // import ./configuration-tensorflow.nix {inherit pkgs haskellLib;} self super diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml index 4c75b2141cf..cbedb9fcb71 100644 --- a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml +++ b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml @@ -7813,7 +7813,6 @@ broken-packages: - nix-eval - nix-freeze-tree - nix-tools - - nixfmt - nixfromnpm - nixpkgs-update - nkjp