Skip to content

Commit

Permalink
Update PureScript dep to 0.15.6 (#475)
Browse files Browse the repository at this point in the history
* Update license generator instructions

* Update PS dep to 0.15.6

* Regenerat license

* Update changelog
  • Loading branch information
JordanMartinez committed Oct 18, 2022
1 parent 2dc4161 commit 4a1b372
Show file tree
Hide file tree
Showing 6 changed files with 41 additions and 23 deletions.
6 changes: 6 additions & 0 deletions CHANGELOG.md
Expand Up @@ -5,6 +5,12 @@ the most up-to-date version of this file.

## Unreleased

## v0.9.4

- Fix license generation (@JordanMartinez)

- Update `purescript` to `0.15.6` (@JordanMartinez)

## v0.9.3

- Fix license generation (@andys8)
Expand Down
29 changes: 15 additions & 14 deletions LICENSE

Large diffs are not rendered by default.

15 changes: 13 additions & 2 deletions license-generator/generate
Expand Up @@ -9,20 +9,31 @@ set -e # exit on error
set -u # exit on undefined variable
set -o pipefail # propagate nonzero exit codes through pipelines

# Ensure Cabal knows of the new PureScript package
# (and any deps needed by 'cabal-plan' if it's not already installed)
cabal update

if ! which cabal-plan >/dev/null; then
echo "$0: the program 'cabal-plan' is required." >&2
echo "$0: The program 'cabal-plan' is required." >&2
echo "$0: see Hackage: https://hackage.haskell.org/package/cabal-plan" >&2
echo "$0: repo: https://github.com/haskell-hvr/cabal-plan" >&2
echo "$0: git clone the repo and run 'cabal build' or 'cabal install' and make sure cabal-plan is on the PATH (cabal >=3.6, ghc >= 9.2)" >&2
echo "$0:" >&2
echo "$0: In a new directory:"
echo "$0: 1. Run 'git clone https://github.com/haskell-hvr/cabal-plan.git && cabal build'"
echo "$0: 2. Make sure 'cabal-plan' (cabal >=3.6, ghc >= 9.2) is on the PATH by adding it manually or running `cabal install`" >&2
exit 1
fi

# Create "dist-newstyle" for cabal-plan using cabal and the same compiler version as stack
echo "Building Pursuit"
ghc=$(stack path --compiler-exe)
cabal build --with-compiler="$ghc"

echo "Regenerating LICENSE"
{
cat license-generator/header.txt
echo ""
cabal-plan license-report exe:pursuit | sed 's/## /### /; s/# /## /;'
} > LICENSE

echo "Done!"
4 changes: 2 additions & 2 deletions pursuit.cabal
@@ -1,5 +1,5 @@
name: pursuit
version: 0.9.3
version: 0.9.4
cabal-version: >= 1.8
build-type: Simple
license: MIT
Expand Down Expand Up @@ -102,7 +102,7 @@ library
, containers
, vector
, time
, purescript == 0.15.4
, purescript ==0.15.6
, bower-json
, blaze-builder
, blaze-markup
Expand Down
2 changes: 1 addition & 1 deletion stack.yaml
Expand Up @@ -12,7 +12,7 @@ extra-deps:
- bytestring-trie-0.2.7@sha256:f78e9d1dba699ce56080824693787918e9e8904db99d04d3470941420b1dd3ed,9010
- classy-prelude-yesod-1.5.0
- language-javascript-0.7.0.0
- purescript-0.15.4
- purescript-0.15.6
- monoidal-containers-0.6.2.0
- protolude-0.3.1
- process-1.6.13.1
Expand Down
8 changes: 4 additions & 4 deletions stack.yaml.lock
Expand Up @@ -37,12 +37,12 @@ packages:
original:
hackage: language-javascript-0.7.0.0
- completed:
hackage: purescript-0.15.4@sha256:29fcb37f227a475a4357de52962f3564da6c881c146a679a514086d9883b1599,20642
hackage: purescript-0.15.6@sha256:d06964345d46009b0a2d5f610f9e0394912da682f508458e7c059a4d6b0299c1,20800
pantry-tree:
size: 151335
sha256: 6432cafb3d7b3334654d3e5c584eeada632e4c767403ede43953f2d3f33aa8ee
size: 153963
sha256: 8a43be3726b172e8cfeebfb05462f17eeb3af932576c5e48cf366c0751f1fdf8
original:
hackage: purescript-0.15.4
hackage: purescript-0.15.6
- completed:
hackage: monoidal-containers-0.6.2.0@sha256:97289baf716f22fdae04b4fcbee066453d2f4c630ef3f631aeeab61ee713841e,2309
pantry-tree:
Expand Down

0 comments on commit 4a1b372

Please sign in to comment.