Update package set to latest version and use newer syntax for additions

packages.dhall

@@ -1,146 +1,28 @@
-{-
-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 override =
-  { 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" =
-       mkPackage
-         [ "dependency1"
-         , "dependency2"
-         ]
-         "https://example.com/path/to/git/repo.git"
-         "tag ('v4.0.0') or branch ('master')"
-  , "package-name" =
-       mkPackage
-         [ "dependency1"
-         , "dependency2"
-         ]
-         "https://example.com/path/to/git/repo.git"
-         "tag ('v4.0.0') or branch ('master')"
-  , etc.
-  }
--------------------------------
-
-Example:
--------------------------------
-let additions =
-  { benchotron =
-      mkPackage
-        [ "arrays"
-        , "exists"
-        , "profunctor"
-        , "strings"
-        , "quickcheck"
-        , "lcg"
-        , "transformers"
-        , "foldable-traversable"
-        , "exceptions"
-        , "node-fs"
-        , "node-buffer"
-        , "node-readline"
-        , "datetime"
-        , "now"
-        ]
-        "https://github.com/hdgarrood/purescript-benchotron.git"
-        "v7.0.0"
-  }
--------------------------------
--}
-
-let mkPackage =
-      https://raw.githubusercontent.com/purescript/package-sets/psc-0.13.2-20190725/src/mkPackage.dhall sha256:0b197efa1d397ace6eb46b243ff2d73a3da5638d8d0ac8473e8e4a8fc528cf57
-
 let upstream =
-      https://raw.githubusercontent.com/purescript/package-sets/psc-0.13.2-20190725/src/packages.dhall sha256:60cc03d2c3a99a0e5eeebb16a22aac219fa76fe6a1686e8c2bd7a11872527ea3
+      https://github.com/purescript/package-sets/releases/download/psc-0.14.1-20210506/packages.dhall sha256:d199e142515f9cc15838d8e6d724a98cd0ca776ceb426b7b36e841311643e3ef
 
-let overrides = {=}
-
-let polyform = mkPackage
-  [ "debug", "foreign", "foreign-object", "generics-rep", "invariant", "newtype"
-  , "ordered-collections", "parsing", "psci-support", "profunctor", "quickcheck-laws"
-  , "run", "test-unit", "transformers", "validation", "variant"
-  ]
-  "https://github.com/purescript-polyform/polyform.git"
-  "master"
-
-let polyform-batteries = mkPackage
-  [ "affjax", "argonaut", "debug", "decimals", "filterable"
-  , "numbers", "polyform", "prelude", "record-extra"
-  , "test-unit"
-  ]
-  "https://github.com/purescript-polyform/batteries.git"
-  "master"
-
-let polyform-batteries-env = mkPackage
-  [ "polyform-batteries" ]
-  "https://github.com/purescript-polyform/batteries-env.git"
-  "master"
-
-let additions =
-  { polyform = polyform
-  , polyform-batteries = polyform-batteries
-  , polyform-batteries-env = polyform-batteries-env
-  }
-
-in  upstream // overrides // additions
+in  upstream
+    with polyform =
+      { dependencies =
+        [ "debug", "foreign", "foreign-object", "invariant", "newtype"
+        , "ordered-collections", "parsing", "psci-support", "profunctor", "quickcheck-laws"
+        , "run", "test-unit", "transformers", "validation", "variant"
+        ]
+      , repo = "https://github.com/purescript-polyform/polyform.git"
+      , version = "master"
+      }
+    with polyform-batteries =
+      { dependencies =
+        [ "affjax", "argonaut", "debug", "decimals", "filterable"
+        , "numbers", "polyform", "prelude", "record-extra"
+        , "test-unit"
+        ]
+      , repo = "https://github.com/purescript-polyform/batteries.git"
+      , version = "master"
+      }
+    with polyform-batteries-env =
+      { dependencies =
+        [ "polyform-batteries" ]
+      , repo = "https://github.com/purescript-polyform/batteries-env.git"
+      , version = "master"
+      }