Merge branch '395-dev-ps-0.15-update' of...

Merge branch '395-dev-ps-0.15-update' of ssh://gitlab.iscpif.fr:20022/gargantext/purescript-gargantext into 395-dev-ps-0.15-update

Merge branch '395-dev-ps-0.15-update' of...
Merge branch '395-dev-ps-0.15-update' of ssh://gitlab.iscpif.fr:20022/gargantext/purescript-gargantext into 395-dev-ps-0.15-update
71ccda8c · Przemyslaw Kaminski · bb0f1dfa · f95436f0 · 71ccda8c · 71ccda8c
Commit 71ccda8c authored Sep 01, 2022 by Przemyslaw Kaminski
Show whitespace changes
Inline Side-by-side

Showing with 269 additions and 357 deletions

easy-ps.nix nix/easy-ps.nix +4 -3

packages.dhall packages.dhall +264 -353

shell.nix shell.nix +1 -1

No files found.
--- a/nix/easy-ps.nix
+++ b/nix/easy-ps.nix
@@ -3,10 +3,11 @@
 import
  (
    pkgs.fetchFromGitHub {
-      owner = "justinwoo";
+      #owner = "justinwoo";
+      owner = "cgenie";
      repo = "easy-purescript-nix";
-      rev = "5dca2f0f3b9ec0bceabb23fa1fd2b5f8ec30fa53";
+      rev = "0d34a62a0bc531baa5350dc305fe56317f706be2";
-      sha256 = "mkHIyWk5Xh54FqCU7CT3G/tnHF7mLbQt3EfnNCMCTO8=";
+      sha256 = "0brdkkp60l3ggirab0zvhd7q11vk906gaxml7kmbg6gy029j7l5v";
    }
  ) {
  inherit pkgs;

--- a/packages.dhall
+++ b/packages.dhall
 let upstream =
-      https://github.com/purescript/package-sets/releases/download/psc-0.15.4-20220808/packages.dhall sha256:60eee64b04ca0013fae3e02a69fc3b176105c6baa2f31865c67cd5f881a412fd
+      https://github.com/purescript/package-sets/releases/download/psc-0.15.4-20220821/packages.dhall sha256:a2f8f83c1a195dc641089d5e3efe9ff997d487b570fd8a2e12994a73942711e5
 let overrides =
      { globals =
-          { dependencies =
+        { dependencies = [ "functions", "maybe" ]
-              [ "functions", "maybe" ]
+        , repo = "https://github.com/purescript/purescript-globals"
-          , repo =
+        , version = "v4.1.0"
-              "https://github.com/purescript/purescript-globals"
-          , version =
-              "v4.1.0"
        }
      , graphql-client =
        { dependencies =
@@ -27,7 +24,6 @@ let overrides =
          , "exceptions"
          , "foldable-traversable"
          , "foreign"
-              , "foreign-generic"
          , "foreign-object"
          , "functions"
          , "halogen-subscriptions"
@@ -62,8 +58,7 @@ let overrides =
          ]
        , repo =
            "https://github.com/OxfordAbstracts/purescript-graphql-client.git"
-          , version =
+        , version = "update-package-set-#73"
-              "update-package-set-#73"
        }
      , smolder =
        { dependencies =
@@ -77,52 +72,43 @@ let overrides =
          , "transformers"
          , "tuples"
          ]
-          , repo =
+        , repo = "https://github.com/bodil/purescript-smolder"
-              "https://github.com/bodil/purescript-smolder"
+        , version = "v12.3.0"
-          , version =
-              "v12.3.0"
        }
      }
 let additions =
-      {
+      { sequences =
-        convertable-options =
        { dependencies =
-              [ "console", "effect", "maybe", "record" ]
+          [ "prelude"
-          , repo =
+          , "unsafe-coerce"
-              "https://github.com/natefaubion/purescript-convertable-options"
+          , "partial"
-          , version =
+          , "unfoldable"
-              "v1.0.0"
+          , "lazy"
-          }
+          , "arrays"
-      , d3 =
+          , "profunctor"
-          { dependencies =
-              [ "aff"
-              , "aff-promise"
-              , "dom-simple"
-              , "easy-ffi"
-              , "effect"
-              , "exceptions"
-              , "foreign"
-              , "functions"
-              , "js-date"
          , "maybe"
-              , "prelude"
-              , "psci-support"
          , "tuples"
-              , "web-dom"
+          , "newtype"
          ]
-          , repo =
+        , repo = "https://github.com/hdgarrood/purescript-sequences.git"
-              "https://github.com/cgenie/purescript-d3"
+        , version = "v3.0.2"
-          , version =
-              "v0.9.1"
        }
-      , dom-filereader =
+      , spec-discovery =
+        { dependencies = [ "prelude", "effect", "arrays", "spec", "node-fs" ]
+        , repo = "https://github.com/purescript-spec/purescript-spec-discovery"
+        , version = "v4.0.0"
+        }
+      , spec-quickcheck =
+        { dependencies = [ "prelude", "aff", "random", "quickcheck", "spec" ]
+        , repo = "https://github.com/purescript-spec/purescript-spec-quickcheck"
+        , version = "v3.1.0"
+        }
+      , ffi-simple =
        { dependencies =
-              [ "aff", "arraybuffer-types", "web-file", "web-html" ]
+          [ "functions", "maybe", "nullable", "prelude", "unsafe-coerce" ]
-          , repo =
+        , repo = "https://github.com/garganscript/purescript-ffi-simple"
-              "https://github.com/nwolverson/purescript-dom-filereader"
+        , version = "v0.3.2"
-          , version =
-              "v5.0.0"
        }
      , dom-simple =
        { dependencies =
@@ -133,29 +119,13 @@ let additions =
          , "prelude"
          , "unsafe-coerce"
          ]
-          , repo =
+        , repo = "https://github.com/garganscript/purescript-dom-simple"
-              "https://github.com/garganscript/purescript-dom-simple"
+        , version = "ps-15.0-upgrade"
-          , version =
-              "ps-15.0-upgrade"
        }
-      , easy-ffi =
+      , dom-filereader =
-        { dependencies =
+        { dependencies = [ "aff", "arraybuffer-types", "web-file", "web-html" ]
-          [ "arrays"
+        , repo = "https://github.com/nwolverson/purescript-dom-filereader"
-          , "console"
+        , version = "v5.0.0"
-          , "effect"
-          , "prelude"
-          , "quickcheck"
-          ]
-        , repo = "https://github.com/pelotom/purescript-easy-ffi"
-        , version = "b8b6891277839167cd65af0857315acce0e9c6b6"
-        }
-      , ffi-simple =
-          { dependencies =
-              [ "functions", "maybe", "nullable", "prelude", "unsafe-coerce" ]
-          , repo =
-              "https://github.com/garganscript/purescript-ffi-simple"
-          , version =
-              "v0.3.2"
        }
      , formula =
        { dependencies =
@@ -168,37 +138,19 @@ let additions =
          , "typelevel-prelude"
          , "typisch"
          ]
-          , repo =
+        , repo = "https://github.com/garganscript/purescript-formula"
-              "https://github.com/garganscript/purescript-formula"
+        , version = "v0.2.1"
-          , version =
-              "v0.2.1"
        }
      , markdown =
-          { dependencies =
+        { dependencies = [ "precise" ]
-              [ "precise" ]
+        , repo = "https://github.com/garganscript/purescript-markdown"
-          , repo =
+        , version = "2021-06-22"
-              "https://github.com/garganscript/purescript-markdown"
-          , version =
-              "2021-06-22"
        }
      , markdown-smolder =
-          { dependencies =
+        { dependencies = [ "markdown", "smolder" ]
-              [ "markdown", "smolder" ]
+        , repo = "https://github.com/hgiasac/purescript-markdown-smolder"
-          , repo =
+        , version = "v2.2.0"
-              "https://github.com/hgiasac/purescript-markdown-smolder"
-          , version =
-              "v2.2.0"
        }
-      , milkis =
-        { dependencies =
-          [ "aff-promise"
-          , "arraybuffer-types"
-          , "foreign-object"
-          , "prelude"
-          , "typelevel-prelude"
-          ]
-        , repo = "https://github.com/justinwoo/purescript-milkis"
-        , version = "v9.0.0" }
      , reactix =
        { dependencies =
          [ "dom-simple"
@@ -213,36 +165,8 @@ let additions =
          , "tuples"
          , "unsafe-coerce"
          ]
-          , repo =
+        , repo = "https://github.com/garganscript/purescript-reactix"
-              "https://github.com/garganscript/purescript-reactix"
+        , version = "v0.5.0"
-          , version =
-              "v0.5.0"
-          }
-      , read =
-          { dependencies =
-              [ "prelude", "maybe", "strings" ]
-          , repo =
-              "https://github.com/truqu/purescript-read"
-          , version =
-              "v1.0.1"
-          }
-      , sequences =
-          { dependencies =
-              [ "prelude"
-              , "unsafe-coerce"
-              , "partial"
-              , "unfoldable"
-              , "lazy"
-              , "arrays"
-              , "profunctor"
-              , "maybe"
-              , "tuples"
-              , "newtype"
-              ]
-          , repo =
-              "https://github.com/hdgarrood/purescript-sequences.git"
-          , version =
-              "v3.0.2"
        }
      , simple-json =
        { dependencies =
@@ -271,42 +195,13 @@ let additions =
          , "typelevel-prelude"
          , "variant"
          ]
-          , repo =
+        , repo = "https://github.com/cgenie/purescript-simple-json"
-              "https://github.com/cgenie/purescript-simple-json"
+        , version = "ps-0.15.0-upgrade"
-          , version =
-              "ps-0.15.0-upgrade"
        }
      , simple-json-generics =
-          { dependencies =
+        { dependencies = [ "simple-json" ]
-              [ "simple-json" ]
+        , repo = "https://github.com/justinwoo/purescript-simple-json-generics"
-          , repo =
+        , version = "v0.1.0"
-              "https://github.com/justinwoo/purescript-simple-json-generics"
-          , version =
-              "v0.1.0"
-          }
-      , simplecrypto =
-          { dependencies =
-              [ "prelude", "maybe", "node-buffer" ]
-          , repo =
-              "https://github.com/alpacaaa/purescript-simplecrypto"
-          , version =
-              "v1.0.1"
-          }
-      , spec-discovery =
-          { dependencies =
-              [ "prelude", "effect", "arrays", "spec", "node-fs" ]
-          , repo =
-              "https://github.com/purescript-spec/purescript-spec-discovery"
-          , version =
-              "v4.0.0"
-          }
-      , spec-quickcheck =
-          { dependencies =
-              [ "prelude", "aff", "random", "quickcheck", "spec" ]
-          , repo =
-              "https://github.com/purescript-spec/purescript-spec-quickcheck"
-          , version =
-              "v3.1.0"
        }
      , toestand =
        { dependencies =
@@ -320,34 +215,23 @@ let additions =
          , "typelevel-prelude"
          , "typisch"
          ]
-          , repo =
+        , repo = "https://github.com/garganscript/purescript-toestand"
-              "https://github.com/garganscript/purescript-toestand"
+        , version = "v0.7.0"
-          , version =
-              "v0.7.0"
-          }
-      , tuples-native =
-          { dependencies =
-              [ "prelude", "typelevel", "unsafe-coerce" ]
-          , repo =
-              "https://github.com/garganscript/purescript-tuples-native"
-          , version =
-              "v2.2.0"
        }
      , typisch =
-          { dependencies =
+        { dependencies = [ "prelude" ]
-              [ "prelude" ]
+        , repo = "https://github.com/garganscript/purescript-typisch"
-          , repo =
+        , version = "v0.3.0"
-              "https://github.com/garganscript/purescript-typisch"
+        }
-          , version =
+      , tuples-native =
-              "v0.3.0"
+        { dependencies = [ "prelude", "typelevel", "unsafe-coerce" ]
+        , repo = "https://github.com/garganscript/purescript-tuples-native"
+        , version = "v2.2.0"
        }
      , uint =
-          { dependencies =
+        { dependencies = [ "maybe" ]
-              [ "maybe" ]
+        , repo = "https://github.com/zaquest/purescript-uint"
-          , repo =
+        , version = "v5.1.1"
-              "https://github.com/zaquest/purescript-uint"
-          , version =
-              "v5.1.1"
        }
      , uri =
        { dependencies =
@@ -359,26 +243,53 @@ let additions =
          , "integers"
          , "globals"
          ]
-          , repo =
+        , repo = "https://github.com/slamdata/purescript-uri"
-              "https://github.com/slamdata/purescript-uri"
+        , version = "v8.0.1"
-          , version =
+        }
-              "v8.0.1"
+      , read =
+        { dependencies = [ "prelude", "maybe", "strings" ]
+        , repo = "https://github.com/truqu/purescript-read"
+        , version = "v1.0.1"
        }
      , versions =
-          { dependencies =
+        { dependencies = [ "prelude" ]
-              [ "prelude" ]
+        , repo = "https://github.com/hdgarrood/purescript-versions.git"
-          , repo =
+        , version = "v6.0.0"
-              "https://github.com/hdgarrood/purescript-versions.git"
+        }
-          , version =
+      , simplecrypto =
-              "v6.0.0"
+        { dependencies = [ "prelude", "maybe", "node-buffer" ]
+        , repo = "https://github.com/alpacaaa/purescript-simplecrypto"
+        , version = "v1.0.1"
        }
      , web-url =
+        { dependencies = [ "prelude" ]
+        , repo = "https://github.com/mjepronk/purescript-web-url"
+        , version = "v1.0.2"
+        }
+      , convertable-options =
+        { dependencies = [ "console", "effect", "maybe", "record" ]
+        , repo = "https://github.com/natefaubion/purescript-convertable-options"
+        , version = "v1.0.0"
+        }
+      , d3 =
        { dependencies =
-              [ "prelude" ]
+          [ "aff"
-          , repo =
+          , "aff-promise"
-              "https://github.com/mjepronk/purescript-web-url"
+          , "dom-simple"
-          , version =
+          , "easy-ffi"
-              "v1.0.2"
+          , "effect"
+          , "exceptions"
+          , "foreign"
+          , "functions"
+          , "js-date"
+          , "maybe"
+          , "prelude"
+          , "psci-support"
+          , "tuples"
+          , "web-dom"
+          ]
+        , repo = "https://github.com/cgenie/purescript-d3"
+        , version = "v0.9.1"
        }
      }

--- a/shell.nix
+++ b/shell.nix
@@ -108,7 +108,7 @@ let
 in
 pkgs.mkShell {
  buildInputs = [
-    easy-ps.purs-0_15_2
+    easy-ps.purs-0_15_4
    easy-ps.psc-package
    easy-ps.dhall-json-simple
    easy-ps.zephyr