aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJohn MacFarlane <jgm@berkeley.edu>2021-01-12 22:32:26 -0800
committerJohn MacFarlane <jgm@berkeley.edu>2021-01-12 22:32:26 -0800
commit2787083b7625e6a0e16f65edb06781da0c9afe84 (patch)
tree081e775fcadc7a18cd6084410ab4f80c297e1b57
parentbd3b7c2e2c5ecb08c1ab3cd6c1176c883a124af3 (diff)
downloadpandoc-2787083b7625e6a0e16f65edb06781da0c9afe84.tar.gz
Use project.nix instead of default.nix for generated file.
-rw-r--r--Makefile4
-rw-r--r--release.nix2
2 files changed, 3 insertions, 3 deletions
diff --git a/Makefile b/Makefile
index 1f7fd98b4..495539701 100644
--- a/Makefile
+++ b/Makefile
@@ -91,10 +91,10 @@ README.md: README.template MANUAL.txt tools/update-readme.lua
pandoc --lua-filter tools/update-readme.lua \
--reference-location=section -t gfm $< -o $@
-default.nix: pandoc.cabal
+project.nix: pandoc.cabal
nix-shell --pure -p cabal2nix --run "cabal2nix ." > $@
-nix-shell: default.nix
+nix-shell: project.nix
nix-shell --attr env release.nix
download_stats:
diff --git a/release.nix b/release.nix
index e28be9ac3..857ea3286 100644
--- a/release.nix
+++ b/release.nix
@@ -1,4 +1,4 @@
let
pkgs = import <nixpkgs> { };
in
- pkgs.haskellPackages.callPackage ./default.nix { }
+ pkgs.haskellPackages.callPackage ./project.nix { }