From dd5d7704fd3f1ac39768721e3c2c9ee0fbdd4de0 Mon Sep 17 00:00:00 2001 From: Athan Clark Date: Fri, 13 Mar 2020 22:23:09 -0700 Subject: [PATCH 1/2] upgraded dependencies to be consistent with purescript-react-mui v3.9.313 --- bower.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/bower.json b/bower.json index a1332b9..c7ec658 100644 --- a/bower.json +++ b/bower.json @@ -13,8 +13,8 @@ }, "dependencies": { "purescript-prelude": "^4.1.0", - "purescript-react": "^6.1.0", - "purescript-typelevel-prelude": "^3.0.0" + "purescript-react": "^7.0.1", + "purescript-typelevel-prelude": "^5.0.0" }, "devDependencies": { "purescript-psci-support": "^4.0.0", From 7b17ffc8952d3f9052393c66f894933679b49d6e Mon Sep 17 00:00:00 2001 From: Athan Clark Date: Sat, 2 May 2020 11:32:02 -0700 Subject: [PATCH 2/2] spago support --- .gitignore | 1 + packages.dhall | 128 +++++++++++++++++++++++++++++++++++++++++++++++++ spago.dhall | 15 ++++++ 3 files changed, 144 insertions(+) create mode 100644 packages.dhall create mode 100644 spago.dhall diff --git a/.gitignore b/.gitignore index 20e090a..5e1fd31 100644 --- a/.gitignore +++ b/.gitignore @@ -7,3 +7,4 @@ /.psc* /.purs* /.psa* +/.spago/ diff --git a/packages.dhall b/packages.dhall new file mode 100644 index 0000000..e69cdcf --- /dev/null +++ b/packages.dhall @@ -0,0 +1,128 @@ +{- +Welcome to your new Dhall package-set! + +Below are instructions for how to edit this file for most use +cases, so that you don't need to know Dhall to use it. + +## Warning: Don't Move This Top-Level Comment! + +Due to how `dhall format` currently works, this comment's +instructions cannot appear near corresponding sections below +because `dhall format` will delete the comment. However, +it will not delete a top-level comment like this one. + +## Use Cases + +Most will want to do one or both of these options: +1. Override/Patch a package's dependency +2. Add a package not already in the default package set + +This file will continue to work whether you use one or both options. +Instructions for each option are explained below. + +### Overriding/Patching a package + +Purpose: +- Change a package's dependency to a newer/older release than the + default package set's release +- Use your own modified version of some dependency that may + include new API, changed API, removed API by + using your custom git repo of the library rather than + the package set's repo + +Syntax: +Replace the overrides' "{=}" (an empty record) with the following idea +The "//" or "⫽" means "merge these two records and + when they have the same value, use the one on the right:" +------------------------------- +let overrides = + { packageName = + upstream.packageName // { updateEntity1 = "new value", updateEntity2 = "new value" } + , packageName = + upstream.packageName // { version = "v4.0.0" } + , packageName = + upstream.packageName // { repo = "https://www.example.com/path/to/new/repo.git" } + } +------------------------------- + +Example: +------------------------------- +let overrides = + { halogen = + upstream.halogen // { version = "master" } + , halogen-vdom = + upstream.halogen-vdom // { version = "v4.0.0" } + } +------------------------------- + +### Additions + +Purpose: +- Add packages that aren't already included in the default package set + +Syntax: +Replace the additions' "{=}" (an empty record) with the following idea: +------------------------------- +let additions = + { package-name = + { dependencies = + [ "dependency1" + , "dependency2" + ] + , repo = + "https://example.com/path/to/git/repo.git" + , version = + "tag ('v4.0.0') or branch ('master')" + } + , package-name = + { dependencies = + [ "dependency1" + , "dependency2" + ] + , repo = + "https://example.com/path/to/git/repo.git" + , version = + "tag ('v4.0.0') or branch ('master')" + } + , etc. + } +------------------------------- + +Example: +------------------------------- +let additions = + { benchotron = + { dependencies = + [ "arrays" + , "exists" + , "profunctor" + , "strings" + , "quickcheck" + , "lcg" + , "transformers" + , "foldable-traversable" + , "exceptions" + , "node-fs" + , "node-buffer" + , "node-readline" + , "datetime" + , "now" + ] + , repo = + "https://github.com/hdgarrood/purescript-benchotron.git" + , version = + "v7.0.0" + } + } +------------------------------- +-} + + +let upstream = + https://github.com/purescript/package-sets/releases/download/psc-0.13.6-20200502/packages.dhall sha256:1e1ecbf222c709b76cc7e24cf63af3c2089ffd22bbb1e3379dfd3c07a1787694 + +let overrides = {=} + +let additions = {=} + +in upstream // overrides // additions diff --git a/spago.dhall b/spago.dhall new file mode 100644 index 0000000..6d441eb --- /dev/null +++ b/spago.dhall @@ -0,0 +1,15 @@ +{- +Welcome to a Spago project! +You can edit this file as you like. +-} +{ name = "tscompat" +, dependencies = + [ "react" + , "lists" + , "strings" + , "typelevel-prelude" + , "console" + ] +, packages = ./packages.dhall +, sources = [ "src/**/*.purs", "test/**/*.purs" ] +}