Skip to content

P
purescript-gargantext
Commit b528c1b7 authored by Alexandre Delanoë's avatar Alexandre Delanoë
Browse files
Options

[FIX] merges

parents 0ebcd871 1a7dcf0b
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 507 additions and 226 deletions
.psc-package/local/.set/packages.json
View file @ b528c1b7
This diff is collapsed.
nix/generate-packages-json.bash 0 → 100755
View file @ b528c1b7
#!/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 deleted 100755 → 0
View file @ 0ebcd871
#!/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
View file @ b528c1b7
...@@ -2,8 +2,10 @@ ...@@ -2,8 +2,10 @@
"name": "Gargantext", "name": "Gargantext",
"version": "0.0.2.7.1", "version": "0.0.2.7.1",
"scripts": { "scripts": {
"rebase-set": "spago package-set-upgrade && spago psc-package-insdhall", "generate-purs-packages-nix": "./nix/generate-purs-packages.nix",
"rebuild-set": "spago psc-package-insdhall", "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", "install-ps": "psc-package install",
"compile": "pulp build", "compile": "pulp build",
"build": "pulp browserify -t dist/bundle.js", "build": "pulp browserify -t dist/bundle.js",
...@@ -51,7 +53,7 @@ ...@@ -51,7 +53,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"
} }
......
packages.dhall
View file @ b528c1b7
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 =
{ globals = { thermite =
{ dependencies = [ "functions", "maybe" ] { dependencies =
, repo = "https://github.com/purescript/purescript-globals" [ "aff"
, version = "v4.1.0" , "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"
}
} }
let additions = let additions =
{ dom-simple = { sequences =
{ dependencies = { dependencies =
[ "arrays" [ "prelude"
, "console" , "unsafe-coerce"
, "effect" , "partial"
, "ffi-simple" , "unfoldable"
, "functions" , "lazy"
, "nullable" , "arrays"
, "prelude" , "profunctor"
, "unsafe-coerce" , "maybe"
] , "tuples"
, repo = "https://github.com/poorscript/purescript-dom-simple" , "newtype"
, version = "v0.2.7" ]
} , repo = "https://github.com/hdgarrood/purescript-sequences.git"
, dom-filereader = , version = "v2.1.0"
{ dependencies = }
[ "aff", "arraybuffer-types", "web-file", "web-html" ] , spec-discovery =
, repo = "https://github.com/nwolverson/purescript-dom-filereader" { dependencies = [ "prelude", "effect", "arrays", "spec", "node-fs" ]
, version = "v5.0.0" , 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 = , ffi-simple =
{ dependencies = { dependencies =
[ "prelude" [ "prelude"
, "effect" , "effect"
, "maybe" , "maybe"
, "functions" , "functions"
, "nullable" , "nullable"
, "unsafe-coerce" , "unsafe-coerce"
] ]
, repo = "https://github.com/poorscript/purescript-ffi-simple" , repo = "https://github.com/irresponsible/purescript-ffi-simple"
, version = "v0.2.10" , version = "v0.2.10"
} }
, formula = , dom-simple =
{ dependencies = { dependencies =
[ "prelude", "reactix", "toestand", "typisch" ] [ "arrays"
, repo = "https://github.com/poorscript/purescript-formula" , "console"
, version = "v0.2.1" , "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 = , 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"
, "tuples" , "unsafe-coerce"
, "unsafe-coerce" ]
] , repo = "https://github.com/irresponsible/purescript-reactix"
, repo = "https://github.com/poorscript/purescript-reactix" , version = "v0.4.6"
, 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"
}
, 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 =
{ dependencies = [ "prelude", "maybe", "strings" ]
, repo = "https://github.com/truqu/purescript-read"
, 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 =
{ 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
View file @ b528c1b7
...@@ -43,6 +43,7 @@ pkgs.mkShell { ...@@ -43,6 +43,7 @@ pkgs.mkShell {
buildInputs = [ buildInputs = [
easy-ps.purs easy-ps.purs
easy-ps.psc-package easy-ps.psc-package
easy-ps.dhall-json-simple
build-purs build-purs
build build
repl repl
......
yarn.lock
View file @ b528c1b7
...@@ -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==
...@@ -6107,12 +6107,12 @@ sourcemap-codec@^1.3.0: ...@@ -6107,12 +6107,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