summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorWill Thompson <will@willthompson.co.uk>2018-07-10 12:25:45 +0000
committerWill Thompson <will@willthompson.co.uk>2018-07-10 12:25:45 +0000
commitc217929d04a3b46e45035bd40763d6b1a1d65d97 (patch)
tree5505d0a87b11210299344871c2de0ec09a9a6d2d
parente8124873631579c7a5526bdf71da0809d927f100 (diff)
parent9d19f35db925f3770aa4871ddc41e50e1a59b3e3 (diff)
Merge branch 'lc/stack' into 'master'
Bump to nightly-2018-07-09 See merge request bustle/bustle!4
-rw-r--r--.gitlab-ci.yml2
-rw-r--r--stack.yaml4
2 files changed, 2 insertions, 4 deletions
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 4723a15..ff4dd63 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -1,4 +1,4 @@
-image: zenhaskell/gtk:nightly-2018-06-29
+image: zenhaskell/gtk:nightly-2018-07-09
before_script:
- apt install -y libpcap-dev
diff --git a/stack.yaml b/stack.yaml
index 6d13ece..476c596 100644
--- a/stack.yaml
+++ b/stack.yaml
@@ -1,10 +1,8 @@
-resolver: nightly-2018-06-29
+resolver: nightly-2018-07-09
packages:
- .
allow-newer: true
extra-deps:
-- gio-0.13.5.0
-- gtk3-0.14.9
- hgettext-0.1.31.0
- pcap-0.4.5.2