Skip to content

Commit 5c4c2c6

Browse files
rvlangerman
authored andcommitted
Fix Buildkite CI (input-output-hk#47)
Resolved input-output-hk#47
1 parent 4557641 commit 5c4c2c6

File tree

2 files changed

+11
-2
lines changed

2 files changed

+11
-2
lines changed

nix-tools/.buildkite/build.sh

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
#! /usr/bin/env nix-shell
2-
#! nix-shell --pure -i bash -p nix cabal-install ghc nix-prefetch-scripts
2+
#! nix-shell -I "nixpkgs=channel:nixos-19.03" --pure -i bash -p nix cabal-install ghc nix-prefetch-scripts git
33

44
export NIX_PATH="nixpkgs=channel:nixos-19.03"
55

@@ -10,7 +10,7 @@ set -euo pipefail
1010
rm -f .nix-tools.cache
1111

1212
echo "+++ Cabal configure"
13-
cabal new-update
13+
cabal new-update hackage.haskell.org,2019-03-15T00:00:00Z
1414
cabal new-configure
1515

1616
echo
@@ -29,6 +29,10 @@ echo "There are no tests -- https://github.com/input-output-hk/haskell.nix/issue
2929
echo
3030
echo "+++ Run plan-to-nix again"
3131

32+
# This file can interfere with the build.
33+
# https://github.com/input-output-hk/haskell.nix/issues/57
34+
rm -f .nix-tools.cache
35+
3236
nix build -f nix1 nix-tools.components.exes.plan-to-nix
3337
./result/bin/plan-to-nix --output nix2 --plan-json dist-newstyle/cache/plan.json
3438

nix-tools/README.org

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,8 @@
22

33
* ~nix-tools~
44

5+
[[https://buildkite.com/input-output-hk/nix-tools][https://badge.buildkite.com/8c5ed154c28db5d7184560c8000e57180b2b362b7a0431602e.svg]]
6+
57
~nix-tools~ is a set of Haskell → Nix tools to integrate Haskell
68
projects into Nix build environments.
79

@@ -42,3 +44,6 @@ umbrella there are a few [[https://github.com/input-output-hk/haskell.nix/projec
4244
for tracking completion of the project goals. If you would like to
4345
follow or contribute to this effort then that would be a good place to
4446
start.
47+
48+
Please open bug reports in the
49+
[[https://github.com/input-output-hk/haskell.nix/issues][Haskell.nix issue tracker]].

0 commit comments

Comments
 (0)