From 76b36fcb17d9686620032bbfe7eb7f60eadfb057 Mon Sep 17 00:00:00 2001 From: John MacFarlane Date: Wed, 13 Jan 2021 09:51:45 -0800 Subject: Use simple default.nix. Remove nix makefile targets. --- Makefile | 8 +------- default.nix | 13 +++++++++++++ 2 files changed, 14 insertions(+), 7 deletions(-) create mode 100644 default.nix diff --git a/Makefile b/Makefile index 495539701..f27272b08 100644 --- a/Makefile +++ b/Makefile @@ -91,12 +91,6 @@ README.md: README.template MANUAL.txt tools/update-readme.lua pandoc --lua-filter tools/update-readme.lua \ --reference-location=section -t gfm $< -o $@ -project.nix: pandoc.cabal - nix-shell --pure -p cabal2nix --run "cabal2nix ." > $@ - -nix-shell: project.nix - nix-shell --attr env release.nix - download_stats: curl https://api.github.com/repos/jgm/pandoc/releases | \ jq -r '.[] | .assets | .[] | "\(.download_count)\t\(.name)"' @@ -130,4 +124,4 @@ sdist-files.txt: .FORCE git-files.txt: .FORCE git ls-tree -r --name-only HEAD | grep '^\(test\|data\)\/' | sort > $@ -.PHONY: .FORCE deps quick full haddock install clean test bench changes_github dist prof download_stats reformat lint weigh doc/lua-filters.md pandoc-templates trypandoc update-website debpkg checkdocs ghcid ghci fix_spacing hlint check check-cabal nix-shell +.PHONY: .FORCE deps quick full haddock install clean test bench changes_github dist prof download_stats reformat lint weigh doc/lua-filters.md pandoc-templates trypandoc update-website debpkg checkdocs ghcid ghci fix_spacing hlint check check-cabal diff --git a/default.nix b/default.nix new file mode 100644 index 000000000..0aa98f022 --- /dev/null +++ b/default.nix @@ -0,0 +1,13 @@ +# default.nix +let + pkgs = import { }; +in + pkgs.haskellPackages.developPackage { + root = ./.; + modifier = drv: + pkgs.haskell.lib.addBuildTools drv (with pkgs.haskellPackages; + [ cabal-install + ghcid + ]); + } + -- cgit v1.2.3