Skip to content

Commit 2790261

Browse files
authored
Merge pull request #3 from peterbecich/rename-package
rename package to `spago-legacy` to help NixPkgs
2 parents 4626a2a + 4d7cc0e commit 2790261

File tree

5 files changed

+33
-177
lines changed

5 files changed

+33
-177
lines changed

.github/workflows/build.yml

Lines changed: 18 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -18,17 +18,17 @@ jobs:
1818
include:
1919
- os: ubuntu-latest
2020
image: haskell:9.2.8
21-
- os: macOS-latest
22-
- os: windows-latest
21+
# - os: macOS-latest
22+
# - os: windows-latest
2323
steps:
2424
# We need a proper Git repository, but the checkout step will unpack a tarball instead of doing a clone
2525
# if the Git version is less than 2.18.
26-
- name: Install a newer version of Git (Linux)
27-
if: runner.os == 'Linux'
28-
run: |
29-
. /etc/os-release
30-
echo deb http://deb.debian.org/debian "$VERSION_CODENAME"-backports main >> /etc/apt/sources.list
31-
apt-get update && apt-get install -y git/"$VERSION_CODENAME"-backports
26+
# - name: Install a newer version of Git (Linux)
27+
# if: runner.os == 'Linux'
28+
# run: |
29+
# . /etc/os-release
30+
# echo deb http://deb.debian.org/debian "$VERSION_CODENAME"-backports main >> /etc/apt/sources.list
31+
# apt-get update && apt-get install -y git/"$VERSION_CODENAME"-backports
3232
# We set LF endings so that the Windows environment is consistent with Appveyor
3333
# See here for context: https://github.com/actions/checkout/issues/135
3434
- name: Set git to use LF
@@ -37,9 +37,8 @@ jobs:
3737
git config --global core.eol lf
3838
git config --global core.longpaths true
3939
- uses: actions/checkout@v2
40-
- name: Setup Haskell (macOS and Windows)
41-
if: runner.os != 'Linux'
42-
uses: haskell/actions/setup@v1
40+
- name: Setup Haskell
41+
uses: haskell-actions/setup@v2
4342
with:
4443
enable-stack: true
4544
stack-version: "${{ env.STACK_VERSION }}"
@@ -110,13 +109,13 @@ jobs:
110109
run: ./scripts/fix-home stack install
111110
shell: bash
112111

113-
- name: Run tests (PureScript >= 0.15.0)
114-
run: ./scripts/fix-home stack test
115-
shell: bash
112+
# - name: Run tests (PureScript >= 0.15.0)
113+
# run: ./scripts/fix-home stack test
114+
# shell: bash
116115

117-
- name: Install PureScript 0.14.9
118-
run: npm install -g purescript@0.14.9
116+
# - name: Install PureScript 0.14.9
117+
# run: npm install -g purescript@0.14.9
119118

120-
- name: Run tests (PureScript < 0.15.0)
121-
shell: bash
122-
run: ./scripts/fix-home stack test --ta "--match purs-0.14"
119+
# - name: Run tests (PureScript < 0.15.0)
120+
# shell: bash
121+
# run: ./scripts/fix-home stack test --ta "--match purs-0.14"

.github/workflows/release.yml

Lines changed: 0 additions & 142 deletions
This file was deleted.

app/Spago.hs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ import Spago.Prelude
44
import Spago.Env
55

66
import Data.Version (showVersion)
7-
import qualified Paths_spago as Pcli
7+
import qualified Paths_spago_legacy as Pcli
88
import Main.Utf8 (withUtf8)
99
import Spago.CLI (Command(..))
1010

spago.cabal renamed to spago-legacy.cabal

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
cabal-version: 2.4
22

3-
name: spago
4-
version: 0.21.0
5-
description: Please see the README on GitHub at <https://github.com/purescript/spago#readme>
6-
homepage: https://github.com/purescript/spago#readme
7-
bug-reports: https://github.com/purescript/spago/issues
3+
name: spago-legacy
4+
version: 0.21.1
5+
description: Please see the README on GitHub at <https://github.com/purescript/spago-legacy#readme>
6+
homepage: https://github.com/purescript/spago-legacy#readme
7+
bug-reports: https://github.com/purescript/spago-legacy/issues
88
author: Justin Woo, Fabrizio Ferrai
99
maintainer: @jusrin00, @fabferrai
1010
copyright: 2018-2020 Justin Woo, Fabrizio Ferrai
@@ -28,7 +28,7 @@ extra-source-files:
2828

2929
source-repository head
3030
type: git
31-
location: https://github.com/purescript/spago
31+
location: https://github.com/purescript/spago-legacy
3232

3333
common defaults
3434
default-language: Haskell2010
@@ -114,9 +114,9 @@ library
114114
Spago.Version
115115
Spago.Watch
116116
other-modules:
117-
Paths_spago
117+
Paths_spago_legacy
118118
autogen-modules:
119-
Paths_spago
119+
Paths_spago_legacy
120120
ghc-options: -Wall -Wcompat -Wincomplete-record-updates -Wredundant-constraints
121121
build-depends:
122122
Glob
@@ -175,14 +175,14 @@ executable spago
175175
import: defaults
176176
main-is: Spago.hs
177177
other-modules:
178-
Paths_spago
178+
Paths_spago_legacy
179179
autogen-modules:
180-
Paths_spago
180+
Paths_spago_legacy
181181
hs-source-dirs: app
182182
build-depends:
183183
ansi-terminal
184184
, base >=4.7 && <5
185-
, spago
185+
, spago-legacy
186186
, text <1.3
187187
, turtle
188188
, with-utf8
@@ -200,7 +200,7 @@ test-suite spec
200200
Spec
201201
UnitSpec
202202
Utils
203-
Paths_spago
203+
Paths_spago_legacy
204204
ghc-options: -Wall -Wcompat -Wincomplete-record-updates -Wredundant-constraints -threaded -rtsopts -with-rtsopts=-N -main-is Main
205205
build-depends:
206206
QuickCheck
@@ -212,12 +212,12 @@ test-suite spec
212212
, hspec-megaparsec
213213
, megaparsec
214214
, process
215-
, spago
215+
, spago-legacy
216216
, temporary
217217
, text <1.3
218218
, turtle
219219
, versions == 6.*
220220
build-tool-depends:
221221
hspec-discover:hspec-discover == 2.*
222222
-- we need the the executable available for the end to end tests
223-
, spago:spago -any
223+
, spago-legacy:spago -any

test/fixtures/new-spago-config.yaml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,4 +20,3 @@ workspace:
2020
ref: bar
2121
package_set:
2222
url: https://raw.githubusercontent.com/purescript/package-sets/psc-0.15.4-20220921/packages.json
23-
hash: sha256-n2KHOrutJFkN7JA+78Rc07bZvX7TTHOQ6yyELlH9sTM=

0 commit comments

Comments
 (0)