Commit 1a7dcf0b authored by Justin Woo's avatar Justin Woo

upgrade spago so its package set update "works correctly"

parent cefde8c5
This diff is collapsed.
...@@ -4,7 +4,7 @@ ...@@ -4,7 +4,7 @@
"scripts": { "scripts": {
"generate-purs-packages-nix": "./nix/generate-purs-packages.nix", "generate-purs-packages-nix": "./nix/generate-purs-packages.nix",
"generate-psc-packages-nix": "./nix/generate-packages-json.bash", "generate-psc-packages-nix": "./nix/generate-packages-json.bash",
"rebase-set": "spago package-set-upgrade && yarn generate-psc-packages-nix", "rebase-set": "spago upgrade-set && yarn generate-psc-packages-nix",
"rebuild-set": "yarn generate-psc-packages-nix", "rebuild-set": "yarn generate-psc-packages-nix",
"install-ps": "psc-package install", "install-ps": "psc-package install",
"compile": "pulp build", "compile": "pulp build",
...@@ -51,7 +51,7 @@ ...@@ -51,7 +51,7 @@
"react-testing-library": "^6.1.2", "react-testing-library": "^6.1.2",
"sass": "^1.23.7", "sass": "^1.23.7",
"serve": "^11.3.1", "serve": "^11.3.1",
"spago": "^0.10.0", "spago": "^0.19.1",
"vscode-languageserver": "^6.0.0", "vscode-languageserver": "^6.0.0",
"xhr2": "^0.1.4" "xhr2": "^0.1.4"
} }
......
let upstream = let upstream =
https://github.com/purescript/package-sets/releases/download/psc-0.13.8-20201021/packages.dhall https://github.com/purescript/package-sets/releases/download/psc-0.13.8-20210226/packages.dhall sha256:7e973070e323137f27e12af93bc2c2f600d53ce4ae73bb51f34eb7d7ce0a43ea
let overrides = let overrides =
{ thermite = { thermite =
{ dependencies = { dependencies =
[ "aff" [ "aff"
, "coroutines" , "coroutines"
, "web-dom" , "web-dom"
, "freet" , "freet"
, "profunctor-lenses" , "profunctor-lenses"
, "react" , "react"
, "react-dom" , "react-dom"
] ]
, repo = "https://github.com/poorscript/purescript-thermite.git" , repo = "https://github.com/poorscript/purescript-thermite.git"
, version = "hide-2020-03-04" , version = "hide-2020-03-04"
} }
, globals = , globals =
{ dependencies = [ "functions", "maybe" ] { dependencies = [ "functions", "maybe" ]
, repo = "https://github.com/purescript/purescript-globals" , repo = "https://github.com/purescript/purescript-globals"
, version = "v4.1.0" , version = "v4.1.0"
} }
} }
let additions = let additions =
{ sequences = { sequences =
{ dependencies = { dependencies =
[ "prelude" [ "prelude"
, "unsafe-coerce" , "unsafe-coerce"
, "partial" , "partial"
, "unfoldable" , "unfoldable"
, "lazy" , "lazy"
, "arrays" , "arrays"
, "profunctor" , "profunctor"
, "maybe" , "maybe"
, "tuples" , "tuples"
, "newtype" , "newtype"
] ]
, repo = "https://github.com/hdgarrood/purescript-sequences.git" , repo = "https://github.com/hdgarrood/purescript-sequences.git"
, version = "v2.1.0" , version = "v2.1.0"
} }
, spec-discovery = , spec-discovery =
{ dependencies = { dependencies = [ "prelude", "effect", "arrays", "spec", "node-fs" ]
[ "prelude", "effect", "arrays", "spec", "node-fs" ] , repo = "https://github.com/purescript-spec/purescript-spec-discovery"
, repo = "https://github.com/purescript-spec/purescript-spec-discovery" , version = "v4.0.0"
, version = "v4.0.0" }
}
, spec-quickcheck = , spec-quickcheck =
{ dependencies = { dependencies = [ "prelude", "aff", "random", "quickcheck", "spec" ]
[ "prelude", "aff", "random", "quickcheck", "spec" ] , repo = "https://github.com/purescript-spec/purescript-spec-quickcheck"
, repo = "https://github.com/purescript-spec/purescript-spec-quickcheck" , version = "v3.1.0"
, version = "v3.1.0" }
}
, ffi-simple = , ffi-simple =
{ dependencies = { dependencies =
[ "prelude" [ "prelude"
, "effect" , "effect"
, "maybe" , "maybe"
, "functions" , "functions"
, "nullable" , "nullable"
, "unsafe-coerce" , "unsafe-coerce"
] ]
, repo = "https://github.com/irresponsible/purescript-ffi-simple" , repo = "https://github.com/irresponsible/purescript-ffi-simple"
, version = "v0.2.10" , version = "v0.2.10"
} }
, dom-simple = , dom-simple =
{ dependencies = { dependencies =
[ "arrays" [ "arrays"
, "console" , "console"
, "effect" , "effect"
, "ffi-simple" , "ffi-simple"
, "functions" , "functions"
, "nullable" , "nullable"
, "prelude" , "prelude"
, "unsafe-coerce" , "unsafe-coerce"
] ]
, repo = "https://github.com/irresponsible/purescript-dom-simple" , repo = "https://github.com/irresponsible/purescript-dom-simple"
, version = "v0.2.7" , version = "v0.2.7"
} }
, dom-filereader = , dom-filereader =
{ dependencies = { dependencies = [ "aff", "arraybuffer-types", "web-file", "web-html" ]
[ "aff", "arraybuffer-types", "web-file", "web-html" ] , repo = "https://github.com/nwolverson/purescript-dom-filereader"
, repo = "https://github.com/nwolverson/purescript-dom-filereader" , version = "v5.0.0"
, version = "v5.0.0" }
}
, markdown = , markdown =
{ dependencies = { dependencies = [ "precise" ]
[ "precise" ] , repo = "https://github.com/poorscript/purescript-markdown"
, repo = "https://github.com/poorscript/purescript-markdown" , version = "2020-03-04"
, version = "2020-03-04" }
}
, markdown-smolder = , markdown-smolder =
{ dependencies = { dependencies = [ "markdown", "smolder" ]
[ "markdown", "smolder" ] , repo = "https://github.com/poorscript/purescript-markdown-smolder"
, repo = "https://github.com/poorscript/purescript-markdown-smolder" , version = "2020-03-04"
, version = "2020-03-04" }
}
, precise = , precise =
{ dependencies = { dependencies = [ "prelude" ]
[ "prelude" ] , repo = "https://github.com/purescript-contrib/purescript-precise"
, repo = "https://github.com/purescript-contrib/purescript-precise" , version = "v4.0.0"
, version = "v4.0.0" }
}
, reactix = , reactix =
{ dependencies = { dependencies =
[ "aff" [ "aff"
, "dom-simple" , "dom-simple"
, "effect" , "effect"
, "ffi-simple" , "ffi-simple"
, "functions" , "functions"
, "nullable" , "nullable"
, "prelude" , "prelude"
, "unsafe-coerce" , "unsafe-coerce"
] ]
, repo = "https://github.com/irresponsible/purescript-reactix" , repo = "https://github.com/irresponsible/purescript-reactix"
, version = "v0.4.6" , version = "v0.4.6"
} }
, tuples-native = , tuples-native =
{ dependencies = { dependencies =
[ "generics-rep", "prelude", "typelevel", "unsafe-coerce" ] [ "generics-rep", "prelude", "typelevel", "unsafe-coerce" ]
, repo = "https://github.com/athanclark/purescript-tuples-native" , repo = "https://github.com/athanclark/purescript-tuples-native"
, version = "v2.0.1" , version = "v2.0.1"
} }
, uint = , uint =
{ dependencies = { dependencies = [ "maybe", "math", "generics-rep" ]
[ "maybe", "math", "generics-rep" ] , repo = "https://github.com/zaquest/purescript-uint"
, repo = "https://github.com/zaquest/purescript-uint" , version = "v5.1.1"
, version = "v5.1.1" }
}
, uri = , uri =
{ dependencies = { dependencies =
[ "these" [ "these"
, "arrays" , "arrays"
, "profunctor-lenses" , "profunctor-lenses"
, "unfoldable" , "unfoldable"
, "parsing" , "parsing"
, "integers" , "integers"
, "globals" , "globals"
, "generics-rep" , "generics-rep"
] ]
, repo = "https://github.com/slamdata/purescript-uri" , repo = "https://github.com/slamdata/purescript-uri"
, version = "v7.0.0" , version = "v7.0.0"
} }
, read = , read =
{ dependencies = { dependencies = [ "prelude", "maybe", "strings" ]
[ "prelude", "maybe", "strings" ] , repo = "https://github.com/truqu/purescript-read"
, repo = "https://github.com/truqu/purescript-read" , version = "v1.0.1"
, version = "v1.0.1" }
}
, versions = , versions =
{ dependencies = { dependencies = [ "prelude" ]
[ "prelude" ] , repo = "https://github.com/hdgarrood/purescript-versions.git"
, repo = "https://github.com/hdgarrood/purescript-versions.git" , version = "v5.0.1"
, version = "v5.0.1" }
}
, simplecrypto = , simplecrypto =
{ dependencies = { dependencies = [ "prelude", "maybe", "node-buffer" ]
[ "prelude", "maybe", "node-buffer"] , repo = "https://github.com/alpacaaa/purescript-simplecrypto"
, repo = "https://github.com/alpacaaa/purescript-simplecrypto" , version = "v1.0.1"
, version = "v1.0.1" }
}
} }
in upstream ⫽ overrides ⫽ additions in upstream // overrides // additions
...@@ -3028,7 +3028,7 @@ flush-write-stream@^1.0.0: ...@@ -3028,7 +3028,7 @@ flush-write-stream@^1.0.0:
inherits "^2.0.3" inherits "^2.0.3"
readable-stream "^2.3.6" readable-stream "^2.3.6"
follow-redirects@^1.5.9, follow-redirects@^1.7.0: follow-redirects@^1.5.9:
version "1.13.2" version "1.13.2"
resolved "https://registry.yarnpkg.com/follow-redirects/-/follow-redirects-1.13.2.tgz#dd73c8effc12728ba5cf4259d760ea5fb83e3147" resolved "https://registry.yarnpkg.com/follow-redirects/-/follow-redirects-1.13.2.tgz#dd73c8effc12728ba5cf4259d760ea5fb83e3147"
integrity sha512-6mPTgLxYm3r6Bkkg0vNM0HTjfGrOEtsfbhagQvbxDEsEkpNhw582upBaoRZylzen6krEmxXJgt9Ju6HiI4O7BA== integrity sha512-6mPTgLxYm3r6Bkkg0vNM0HTjfGrOEtsfbhagQvbxDEsEkpNhw582upBaoRZylzen6krEmxXJgt9Ju6HiI4O7BA==
...@@ -6102,12 +6102,12 @@ sourcemap-codec@^1.3.0: ...@@ -6102,12 +6102,12 @@ sourcemap-codec@^1.3.0:
resolved "https://registry.yarnpkg.com/sourcemap-codec/-/sourcemap-codec-1.4.8.tgz#ea804bd94857402e6992d05a38ef1ae35a9ab4c4" resolved "https://registry.yarnpkg.com/sourcemap-codec/-/sourcemap-codec-1.4.8.tgz#ea804bd94857402e6992d05a38ef1ae35a9ab4c4"
integrity sha512-9NykojV5Uih4lgo5So5dtw+f0JgJX30KCNI8gwhz2J9A15wD0Ml6tjHKwf6fTSa6fAdVBdZeNOs9eJ71qCk8vA== integrity sha512-9NykojV5Uih4lgo5So5dtw+f0JgJX30KCNI8gwhz2J9A15wD0Ml6tjHKwf6fTSa6fAdVBdZeNOs9eJ71qCk8vA==
spago@^0.10.0: spago@^0.19.1:
version "0.10.0" version "0.19.1"
resolved "https://registry.yarnpkg.com/spago/-/spago-0.10.0.tgz#8783febe6e701122cdc90e4a509ecf0dfa646bd7" resolved "https://registry.yarnpkg.com/spago/-/spago-0.19.1.tgz#7a5da507f347bba441f4acbd63bf6eaed1624990"
integrity sha512-hcyAVObO+ZgXZaqy0EMCZgw8+Yr+PAGpYfV77C1EuL5gcSaly4snCY6dFBIdcUq0/vYhkCuUpBUGi6Dx+rnxiw== integrity sha512-OD/yopJZ9Ub+XsFtayDeLAWLT4kLdMxosJEyyp8W5OkyJVVSbCrvYacsO7iq3lSuHJmmNny/TEZdyb7uSyupng==
dependencies: dependencies:
follow-redirects "^1.7.0" request "^2.88.0"
tar "^4.4.8" tar "^4.4.8"
split-string@^3.0.1, split-string@^3.0.2: split-string@^3.0.1, split-string@^3.0.2:
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment