From 83653f2bb61f0aef93149c76d2cc3bd5ff86aca4 Mon Sep 17 00:00:00 2001 From: EuAndreh Date: Fri, 15 Nov 2019 09:00:55 -0300 Subject: utils.nix: Use nixfmt from nixpkgs --- utils.nix | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/utils.nix b/utils.nix index 7e3a6db..5bcbb10 100644 --- a/utils.nix +++ b/utils.nix @@ -1,8 +1,4 @@ -{ pkgs, src, baseName }: -let - nixfmt = import (builtins.fetchTarball - "https://github.com/serokell/nixfmt/archive/master.tar.gz") { }; -in rec { +{ pkgs, src, baseName }: rec { baseTask = pkgs.stdenv.mkDerivation { name = "${baseName}-task"; src = src; @@ -26,7 +22,7 @@ in rec { }); formatNix = baseTask.overrideAttrs (baseAttrs: { name = "${baseAttrs.name}-nixfmt"; - buildInputs = baseAttrs.buildInputs ++ [ nixfmt ]; + buildInputs = baseAttrs.buildInputs ++ [ pkgs.nixfmt ]; buildPhase = '' format() { nix_file="$1" -- cgit v1.2.3