Skip to content

Commit a899fb8

Browse files
authored
Merge pull request #46 from input-output-hk/rvl/cabal
Remove Nix build, just use Cabal
2 parents 38bf6fd + cd2ead8 commit a899fb8

File tree

16 files changed

+44
-1423
lines changed

16 files changed

+44
-1423
lines changed

.buildkite/build.sh

Lines changed: 38 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,38 @@
1+
#! /usr/bin/env nix-shell
2+
#! nix-shell --pure -i bash -p nix cabal-install ghc nix-prefetch-scripts
3+
4+
export NIX_PATH="nixpkgs=channel:nixos-19.03"
5+
6+
set -euo pipefail
7+
8+
# This file can interfere with the build.
9+
# https://github.com/input-output-hk/haskell.nix/issues/57
10+
rm -f .nix-tools.cache
11+
12+
echo "+++ Cabal configure"
13+
cabal new-update
14+
cabal new-configure
15+
16+
echo
17+
echo "+++ Run stable version of plan-to-nix"
18+
nix build -f https://github.com/input-output-hk/haskell.nix/archive/master.tar.gz nix-tools -o nt
19+
./nt/bin/plan-to-nix --output nix1 --plan-json dist-newstyle/cache/plan.json
20+
21+
echo
22+
echo "+++ Build project"
23+
nix build -f nix1 nix-tools.components.exes --no-link
24+
25+
echo
26+
echo "+++ Run tests"
27+
echo "There are no tests -- https://github.com/input-output-hk/haskell.nix/issues/51"
28+
29+
echo
30+
echo "+++ Run plan-to-nix again"
31+
32+
nix build -f nix1 nix-tools.components.exes.plan-to-nix
33+
./result/bin/plan-to-nix --output nix2 --plan-json dist-newstyle/cache/plan.json
34+
35+
echo
36+
echo "+++ Build project"
37+
38+
nix build -f nix2 nix-tools.components.exes --no-link

.buildkite/pipeline.yml

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
steps:
2+
- label: 'Build'
3+
command: ./.buildkite/build.sh
4+
agents:
5+
system: x86_64-linux

.stack-to-nix.cache

Lines changed: 0 additions & 3 deletions
This file was deleted.

.travis.yml

Lines changed: 0 additions & 45 deletions
This file was deleted.

README.org

Lines changed: 1 addition & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -29,15 +29,7 @@ started with your own project.
2929

3030
* Building
3131

32-
To build all of the ~nix-tools~ using Nix:
33-
34-
#+begin_example
35-
nix-build -A nix-tools-all-execs
36-
./result/bin/stack-to-nix --help
37-
#+end_example
38-
39-
If you are making changes to the Haskell code, then build the Cabal
40-
project with:
32+
To build all of the ~nix-tools~ using Cabal:
4133

4234
#+begin_example
4335
cabal new-build

default.nix

Lines changed: 0 additions & 21 deletions
This file was deleted.

hackage-db.nix

Lines changed: 0 additions & 78 deletions
This file was deleted.

haskell-src-meta.nix

Lines changed: 0 additions & 50 deletions
This file was deleted.

0 commit comments

Comments
 (0)