Skip to content

Commit ad3c314

Browse files
committedMar 3, 2024·
Fix snap build
1 parent 55be454 commit ad3c314

File tree

2 files changed

+9
-23
lines changed

2 files changed

+9
-23
lines changed
 

‎.snapsquid.conf

-14
This file was deleted.

‎snap/snapcraft.yaml

+9-9
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ description: |
2323
# snap connect shellcheck:removable-media
2424
2525
version: git
26-
base: core18
26+
base: core20
2727
grade: stable
2828
confinement: strict
2929

@@ -40,16 +40,16 @@ parts:
4040
source: .
4141
build-packages:
4242
- cabal-install
43-
- squid
43+
stage-packages:
44+
- libatomic1
4445
override-build: |
45-
# See comments in .snapsquid.conf
46-
[ "$http_proxy" ] && {
47-
squid3 -f .snapsquid.conf
48-
export http_proxy="http://localhost:8888"
49-
sleep 3
50-
}
46+
# Give ourselves enough memory to build
47+
dd if=/dev/zero of=/tmp/swap bs=1M count=2000
48+
mkswap /tmp/swap
49+
swapon /tmp/swap
50+
5151
cabal sandbox init
52-
cabal update || cat /var/log/squid/*
52+
cabal update
5353
cabal install -j
5454
5555
install -d $SNAPCRAFT_PART_INSTALL/usr/bin

0 commit comments

Comments
 (0)
Please sign in to comment.