git.iko.soy/typeable/cabal2nix
on master help sign in
update-nixpkgs.sh, GNUmakefile: adapt to recent re-factoring
commit245103f26074f8bbcead463ececce0ebc48339f4 authorPeter Simons <simons@cryp.to> dateSun 30 Aug 2015, 21:08 (11 years ago) parentc619fff
2 files changed+8−14
GNUmakefile+7−13 hackage2nix/update-nixpkgs.sh+1−1
GNUmakefile+7−13
@@ -1,20 +1,10 @@
11# GNUmakefile
22
3−srcdir := $(PWD)
3+srcdir := $(CURDIR)
44
55.PHONY: all check clean release hlint
66
7−all:: lens-construction-helper/lens-construction-helper.cabal \
8− language-nix/language-nix.cabal \
9− distribution-nixpkgs/distribution-nixpkgs.cabal \
10− cabal2nix/cabal2nix.cabal \
11− hackage2nix/hackage2nix.cabal \
12− lens-construction-helper/cabal.sandbox.config \
13− language-nix/cabal.sandbox.config \
14− distribution-nixpkgs/cabal.sandbox.config \
15− cabal2nix/cabal.sandbox.config \
16− hackage2nix/cabal.sandbox.config \
17− lens-construction-helper/dist/setup-config \
7+all:: lens-construction-helper/dist/setup-config \
188 language-nix/dist/setup-config \
199 distribution-nixpkgs/dist/setup-config \
2010 cabal2nix/dist/setup-config \
@@ -56,7 +46,11 @@ lens-construction-helper/lens-construction-helper.cabal : lens-construction-help
5646 cd $(dir $@) && hpack && cabal check
5747 touch $@
5848
59−.sandbox/cabal.sandbox.config:
49+.sandbox/cabal.sandbox.config: lens-construction-helper/lens-construction-helper.cabal \
50+ language-nix/language-nix.cabal \
51+ distribution-nixpkgs/distribution-nixpkgs.cabal \
52+ cabal2nix/cabal2nix.cabal \
53+ hackage2nix/hackage2nix.cabal
6054 mkdir $(dir $@) && cd $(dir $@) && cabal sandbox init && cabal sandbox add-source $(srcdir)/lens-construction-helper $(srcdir)/language-nix $(srcdir)/distribution-nixpkgs $(srcdir)/cabal2nix $(srcdir)/hackage2nix
6155
6256lens-construction-helper/cabal.sandbox.config : .sandbox/cabal.sandbox.config
hackage2nix/update-nixpkgs.sh+1−1
@@ -36,7 +36,7 @@ gzip -k "$TAR"
3636hackage=$(git rev-parse --verify HEAD)
3737cd ..
3838
39−make --quiet configure
39+make -C .. all
4040cabal run -v0 -j hackage2nix >hackage-packages.nix
4141
4242cd nixpkgs