Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Trim transitive tracing dependencies #5289

Closed
wants to merge 6 commits into from
Closed

Trim transitive tracing dependencies #5289

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
a7eec68
Trim transitive tracing dependencies
mtth Apr 4, 2020
551069d
Follow redirects
snoyberg Apr 4, 2020
221bf7b
Add ulid
ad-si Apr 4, 2020
1f0daee
Merge pull request #5290 from ad-si/patch-1
snoyberg Apr 5, 2020
a001947
Add back mpi-hs (closes #5278)
snoyberg Apr 5, 2020
eafcd20
Merge branch 'master' of https://github.com/mtth/stackage into mtth-m…
snoyberg Apr 5, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions automated/build.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -63,12 +63,12 @@ BINDIR=$(cd $ROOT/work/bin ; pwd)
cd $BINDIR
rm -f curator stack *.bz2

curl "https://download.fpcomplete.com/stackage-curator-2/curator-85b021a53833ff310fc66b3fdc5ca3f7828ce18b.bz2" | bunzip2 > curator
curl -L "https://download.fpcomplete.com/stackage-curator-2/curator-85b021a53833ff310fc66b3fdc5ca3f7828ce18b.bz2" | bunzip2 > curator
chmod +x curator
echo -n "curator version: "
docker run --rm -v $(pwd)/curator:/exe $IMAGE /exe --version

curl "https://download.fpcomplete.com/stackage-curator-2/stack-4033c93815477e5b565d9a2a61b54e04da0863ef.bz2" | bunzip2 > stack
curl -L "https://download.fpcomplete.com/stackage-curator-2/stack-4033c93815477e5b565d9a2a61b54e04da0863ef.bz2" | bunzip2 > stack
chmod +x stack
echo -n "stack version: "
docker run --rm -v $(pwd)/stack:/exe $IMAGE /exe --version
Expand Down
16 changes: 5 additions & 11 deletions build-constraints.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -59,16 +59,6 @@ packages:
- flags-applicative
- more-containers
- tracing
# transitive dependencies for tracing
- ip
- byteslice
- bytesmith
- contiguous
- natural-arithmetic
- primitive-offset
- primitive-unlifted
- run-st
- small-bytearray-builder

"Robert Vollmert <[email protected]> @robx":
- configurator-pg
Expand Down Expand Up @@ -133,7 +123,7 @@ packages:
- PyF

"Erik Schnetter <[email protected]> @eschnett":
- mpi-hs < 0 # https://github.com/commercialhaskell/stackage/issues/5278
- mpi-hs

"Yang Bo <[email protected]> @Atry":
- control-dsl < 0 # via doctest-discover
Expand Down Expand Up @@ -1072,6 +1062,7 @@ packages:
"Andrew Thaddeus Martin <[email protected]> @andrewthad":
- colonnade < 0 # via profunctors-5.5
- blaze-colonnade < 0 # via profunctors-5.5
- ip

"Chris Allen <[email protected]> @bitemyapp":
- machines-directory < 0 # via machines-0.7
Expand Down Expand Up @@ -4187,6 +4178,9 @@ packages:
"Vaclav Svejcar <[email protected]> @vaclavsvejcar":
- headroom

"Adrian Sieber <[email protected]> @ad-si":
- ulid

"Grandfathered dependencies":
- network
- Boolean
Expand Down
2 changes: 1 addition & 1 deletion etc/check.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ export PATH=$HOME/.local/bin:$PATH
curl -L https://www.stackage.org/stack/linux-x86_64 | tar xz --wildcards --strip-components=1 -C ~/.local/bin '*/stack'

# Get new Stackage curator
curl "https://download.fpcomplete.com/stackage-curator-2/curator-85b021a53833ff310fc66b3fdc5ca3f7828ce18b.bz2" | bunzip2 > curator
curl -L "https://download.fpcomplete.com/stackage-curator-2/curator-85b021a53833ff310fc66b3fdc5ca3f7828ce18b.bz2" | bunzip2 > curator
chmod +x curator

# Install GHC
Expand Down