diff --git a/flake.nix b/flake.nix index 517bdcfd..9faa3548 100644 --- a/flake.nix +++ b/flake.nix @@ -2,7 +2,7 @@ description = "Squiggle CI"; inputs = { - nixpkgs.url = "nixpkgs/nixos-unstable"; + nixpkgs.url = "nixpkgs/nixos-22.05"; gentype = { url = "github:quinn-dougherty/genType"; inputs.nixpkgs.follows = "nixpkgs"; @@ -75,7 +75,6 @@ components = componentsFn hciPkgs; website = websiteFn hciPkgs; in { - # herc herculesCI = { ciSystems = [ hciSystem ]; onPush = { @@ -92,11 +91,10 @@ }; docs-site.outputs = { squiggle-website = website.website; - docusaurus-lint = website.docusaurus-lint; + docusaurus-lint = website.website-lint; }; }; }; - }; in flake-utils.lib.eachDefaultSystem (system: let diff --git a/packages/squiggle-lang/bsconfig.json b/packages/squiggle-lang/bsconfig.json index 1fa663ac..ff1268d8 100644 --- a/packages/squiggle-lang/bsconfig.json +++ b/packages/squiggle-lang/bsconfig.json @@ -37,6 +37,6 @@ "number": "+A-42-48-9-30-4" }, "ppx-flags": [ - ["../../node_modules/bisect_ppx/ppx", "--exclude-files", ".*_test\\.res$$"] + ["../../node_modules/bisect_ppx/bin/linux/ppx", "--exclude-files", ".*_test\\.res$$"] ] } diff --git a/packages/squiggle-lang/package.json b/packages/squiggle-lang/package.json index a94197f8..73db9a42 100644 --- a/packages/squiggle-lang/package.json +++ b/packages/squiggle-lang/package.json @@ -51,6 +51,7 @@ "@glennsl/rescript-jest": "^0.9.0", "@istanbuljs/nyc-config-typescript": "^1.0.2", "@types/jest": "^27.5.0", + "@types/lodash": "^4.14.182", "babel-plugin-transform-es2015-modules-commonjs": "^6.26.2", "bisect_ppx": "^2.7.1", "chalk": "^5.0.1", diff --git a/yarn.lock b/yarn.lock index bb707c65..1a41e7dd 100644 --- a/yarn.lock +++ b/yarn.lock @@ -19340,16 +19340,16 @@ y18n@^5.0.5: resolved "https://registry.yarnpkg.com/y18n/-/y18n-5.0.8.tgz#7f4934d0f7ca8c56f95314939ddcd2dd91ce1d55" integrity sha512-0pfFzegeDWJHJIAmTLRP2DwHjdF5s7jo9tuztdQxAhINCdvS+3nGINqPd00AphqJR/0LhANUS6/+7SCb98YOfA== -yallist@*, yallist@^4.0.0: - version "4.0.0" - resolved "https://registry.yarnpkg.com/yallist/-/yallist-4.0.0.tgz#9bb92790d9c0effec63be73519e11a35019a3a72" - integrity sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A== - yallist@^3.0.2: version "3.1.1" resolved "https://registry.yarnpkg.com/yallist/-/yallist-3.1.1.tgz#dbb7daf9bfd8bac9ab45ebf602b8cbad0d5d08fd" integrity sha512-a4UGQaWPH59mOXUYnAG2ewncQS4i4F43Tv3JoAM+s2VDAmS9NsK8GpDMLrCHPksFT7h3K6TOoUNn2pb7RoXx4g== +yallist@^4.0.0: + version "4.0.0" + resolved "https://registry.yarnpkg.com/yallist/-/yallist-4.0.0.tgz#9bb92790d9c0effec63be73519e11a35019a3a72" + integrity sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A== + yaml@^1.10.0, yaml@^1.10.2, yaml@^1.7.2: version "1.10.2" resolved "https://registry.yarnpkg.com/yaml/-/yaml-1.10.2.tgz#2301c5ffbf12b467de8da2333a459e29e7920e4b"