[FIX] merges

nix/generate-packages-json.bash

+#!/usr/bin/env bash
+set -e
+
+## You should use the `shell.nix` file in our project, or install dhall-to-json yourself: https://github.com/dhall-lang/dhall-haskell/releases
+dhall-to-json --file packages.dhall --output ./.psc-package/local/.set/packages.json
+echo "generated packages.json"

nix/generate-packages-json.nix

-#!/usr/bin/env nix-shell
-#!nix-shell ./generate-packages-json.nix --run 'exit'
-{ pkgs ? import ./pinned.nix { } }:
-let
-  easy-dhall = import (
-    pkgs.fetchFromGitHub {
-      owner = "justinwoo";
-      repo = "easy-dhall-nix";
-      rev = "90957969850a44481c6e150350c56e8b53b29e1e";
-      sha256 = "1hsmp3cb0k554kh0jlfzpdzx2b8ndyh2gdykmw9hw41haaw16mmi";
-    }
-  ) {
-    inherit pkgs;
-  };
-in
-pkgs.mkShell {
-  buildInputs = [ easy-dhall.dhall-simple easy-dhall.dhall-json-simple ];
-
-  shellHook = ''
-    dhall-to-json --file packages.dhall --output ./.psc-package/local/.set/packages.json
-    echo "generated packages.json"
-  '';
-}

package.json

@@ -2,8 +2,10 @@
     "name": "Gargantext",
     "version": "0.0.2.7.1",
     "scripts": {
-        "rebase-set": "spago package-set-upgrade && spago psc-package-insdhall",
-        "rebuild-set": "spago psc-package-insdhall",
+        "generate-purs-packages-nix": "./nix/generate-purs-packages.nix",
+        "generate-psc-packages-nix": "./nix/generate-packages-json.bash",
+        "rebase-set": "spago upgrade-set && yarn generate-psc-packages-nix",
+        "rebuild-set": "yarn generate-psc-packages-nix",
         "install-ps": "psc-package install",
         "compile": "pulp build",
         "build": "pulp browserify -t dist/bundle.js",
@@ -51,7 +53,7 @@
         "react-testing-library": "^6.1.2",
         "sass": "^1.23.7",
         "serve": "^11.3.1",
-        "spago": "^0.10.0",
+        "spago": "^0.19.1",
         "vscode-languageserver": "^6.0.0",
         "xhr2": "^0.1.4"
     }

packages.dhall

 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 =
-      { globals =
+      { thermite =
+        { dependencies =
+          [ "aff"
+          , "coroutines"
+          , "web-dom"
+          , "freet"
+          , "profunctor-lenses"
+          , "react"
+          , "react-dom"
+          ]
+        , repo = "https://github.com/poorscript/purescript-thermite.git"
+        , version = "hide-2020-03-04"
+        }
+      , globals =
         { dependencies = [ "functions", "maybe" ]
         , repo = "https://github.com/purescript/purescript-globals"
         , version = "v4.1.0"
@@ -10,25 +23,31 @@ let overrides =
       }
 
 let additions =
-      { dom-simple =
+      { sequences =
         { dependencies =
-            [ "arrays"
-            , "console"
-            , "effect"
-            , "ffi-simple"
-            , "functions"
-            , "nullable"
-            , "prelude"
+          [ "prelude"
           , "unsafe-coerce"
+          , "partial"
+          , "unfoldable"
+          , "lazy"
+          , "arrays"
+          , "profunctor"
+          , "maybe"
+          , "tuples"
+          , "newtype"
           ]
-          , repo = "https://github.com/poorscript/purescript-dom-simple"
-          , version = "v0.2.7"
+        , repo = "https://github.com/hdgarrood/purescript-sequences.git"
+        , version = "v2.1.0"
         }
-      , dom-filereader =
-          { dependencies =
-            [ "aff", "arraybuffer-types", "web-file", "web-html" ]
-          , repo = "https://github.com/nwolverson/purescript-dom-filereader"
-          , version = "v5.0.0"
+      , 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 =
@@ -39,30 +58,40 @@ let additions =
           , "nullable"
           , "unsafe-coerce"
           ]
-          , repo = "https://github.com/poorscript/purescript-ffi-simple"
+        , repo = "https://github.com/irresponsible/purescript-ffi-simple"
         , version = "v0.2.10"
         }
-      , formula =
+      , dom-simple =
         { dependencies =
-            [ "prelude", "reactix", "toestand", "typisch" ]
-          , repo = "https://github.com/poorscript/purescript-formula"
-          , version = "v0.2.1"
+          [ "arrays"
+          , "console"
+          , "effect"
+          , "ffi-simple"
+          , "functions"
+          , "nullable"
+          , "prelude"
+          , "unsafe-coerce"
+          ]
+        , repo = "https://github.com/irresponsible/purescript-dom-simple"
+        , version = "v0.2.7"
+        }
+      , dom-filereader =
+        { dependencies = [ "aff", "arraybuffer-types", "web-file", "web-html" ]
+        , repo = "https://github.com/nwolverson/purescript-dom-filereader"
+        , version = "v5.0.0"
         }
       , markdown =
-          { dependencies =
-            [ "precise" ]
+        { dependencies = [ "precise" ]
         , repo = "https://github.com/poorscript/purescript-markdown"
         , version = "2020-03-04"
         }
       , markdown-smolder =
-          { dependencies =
-            [ "markdown", "smolder" ]
+        { dependencies = [ "markdown", "smolder" ]
         , repo = "https://github.com/poorscript/purescript-markdown-smolder"
         , version = "2020-03-04"
         }
       , precise =
-          { dependencies =
-            [ "prelude" ]
+        { dependencies = [ "prelude" ]
         , repo = "https://github.com/purescript-contrib/purescript-precise"
         , version = "v4.0.0"
         }
@@ -75,63 +104,10 @@ let additions =
           , "functions"
           , "nullable"
           , "prelude"
-            , "tuples"
           , "unsafe-coerce"
           ]
-          , repo = "https://github.com/poorscript/purescript-reactix"
-          , version = "v0.4.11"
-          }
-      , 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 = "v2.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 =
-            [ "prelude", "effect", "foldable-traversable", "reactix"
-            , "record", "tuples", "typelevel-prelude" ]
-          , repo = "https://github.com/poorscript/purescript-toestand"
-          , version = "v0.6.1"
-          }
-      , typisch =
-          { dependencies = [ "prelude" ]
-          , repo = "https://github.com/poorscript/purescript-typisch"
-          , version = "v0.2.1"
+        , repo = "https://github.com/irresponsible/purescript-reactix"
+        , version = "v0.4.6"
         }
       , tuples-native =
         { dependencies =
@@ -140,8 +116,7 @@ let additions =
         , version = "v2.0.1"
         }
       , uint =
-          { dependencies =
-            [ "maybe", "math", "generics-rep" ]
+        { dependencies = [ "maybe", "math", "generics-rep" ]
         , repo = "https://github.com/zaquest/purescript-uint"
         , version = "v5.1.1"
         }
@@ -159,12 +134,21 @@ let additions =
         , repo = "https://github.com/slamdata/purescript-uri"
         , version = "v7.0.0"
         }
+      , read =
+        { dependencies = [ "prelude", "maybe", "strings" ]
+        , repo = "https://github.com/truqu/purescript-read"
+        , version = "v1.0.1"
+        }
       , versions =
-          { dependencies =
-            [ "prelude" ]
+        { dependencies = [ "prelude" ]
         , repo = "https://github.com/hdgarrood/purescript-versions.git"
         , version = "v5.0.1"
         }
+      , simplecrypto =
+        { dependencies = [ "prelude", "maybe", "node-buffer" ]
+        , repo = "https://github.com/alpacaaa/purescript-simplecrypto"
+        , version = "v1.0.1"
+        }
       }
 
-in  upstream ⫽ overrides ⫽ additions
+in  upstream // overrides // additions

shell.nix

@@ -43,6 +43,7 @@ pkgs.mkShell {
   buildInputs = [
     easy-ps.purs
     easy-ps.psc-package
+    easy-ps.dhall-json-simple
     build-purs
     build
     repl

yarn.lock

@@ -3028,7 +3028,7 @@ flush-write-stream@^1.0.0:
     inherits "^2.0.3"
     readable-stream "^2.3.6"
 
-follow-redirects@^1.5.9, follow-redirects@^1.7.0:
+follow-redirects@^1.5.9:
   version "1.13.2"
   resolved "https://registry.yarnpkg.com/follow-redirects/-/follow-redirects-1.13.2.tgz#dd73c8effc12728ba5cf4259d760ea5fb83e3147"
   integrity sha512-6mPTgLxYm3r6Bkkg0vNM0HTjfGrOEtsfbhagQvbxDEsEkpNhw582upBaoRZylzen6krEmxXJgt9Ju6HiI4O7BA==
@@ -6107,12 +6107,12 @@ sourcemap-codec@^1.3.0:
   resolved "https://registry.yarnpkg.com/sourcemap-codec/-/sourcemap-codec-1.4.8.tgz#ea804bd94857402e6992d05a38ef1ae35a9ab4c4"
   integrity sha512-9NykojV5Uih4lgo5So5dtw+f0JgJX30KCNI8gwhz2J9A15wD0Ml6tjHKwf6fTSa6fAdVBdZeNOs9eJ71qCk8vA==
 
-spago@^0.10.0:
-  version "0.10.0"
-  resolved "https://registry.yarnpkg.com/spago/-/spago-0.10.0.tgz#8783febe6e701122cdc90e4a509ecf0dfa646bd7"
-  integrity sha512-hcyAVObO+ZgXZaqy0EMCZgw8+Yr+PAGpYfV77C1EuL5gcSaly4snCY6dFBIdcUq0/vYhkCuUpBUGi6Dx+rnxiw==
+spago@^0.19.1:
+  version "0.19.1"
+  resolved "https://registry.yarnpkg.com/spago/-/spago-0.19.1.tgz#7a5da507f347bba441f4acbd63bf6eaed1624990"
+  integrity sha512-OD/yopJZ9Ub+XsFtayDeLAWLT4kLdMxosJEyyp8W5OkyJVVSbCrvYacsO7iq3lSuHJmmNny/TEZdyb7uSyupng==
   dependencies:
-    follow-redirects "^1.7.0"
+    request "^2.88.0"
     tar "^4.4.8"
 
 split-string@^3.0.1, split-string@^3.0.2: