aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJohn MacFarlane <jgm@berkeley.edu>2021-01-13 09:51:45 -0800
committerJohn MacFarlane <jgm@berkeley.edu>2021-01-13 09:52:09 -0800
commit76b36fcb17d9686620032bbfe7eb7f60eadfb057 (patch)
treed5506609002c44e7facfd55b36b886a6d8e95da0
parent2787083b7625e6a0e16f65edb06781da0c9afe84 (diff)
downloadpandoc-76b36fcb17d9686620032bbfe7eb7f60eadfb057.tar.gz
Use simple default.nix.
Remove nix makefile targets.
-rw-r--r--Makefile8
-rw-r--r--default.nix13
2 files changed, 14 insertions, 7 deletions
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 <nixpkgs> { };
+in
+ pkgs.haskellPackages.developPackage {
+ root = ./.;
+ modifier = drv:
+ pkgs.haskell.lib.addBuildTools drv (with pkgs.haskellPackages;
+ [ cabal-install
+ ghcid
+ ]);
+ }
+