quantified.uncertainty/squiggle
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

we took a step backwards somewhere, somehow.

Browse Source
This commit is contained in:
Quinn Dougherty 2022-08-16 01:02:53 -07:00
parent 07d739d3db
commit 5f7b8f1c07
4 changed files with 15 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
flake.lock
View File

@ -73,16 +73,16 @@
}, },
"nixpkgs": { "nixpkgs": {
"locked": { "locked": {
"lastModified": 1660496378, "lastModified": 1660485612,
"narHash": "sha256-sgAhmrC1iSnl5T2VPPiMpciH1aRw5c7PYEdXX6jd6Gk=", "narHash": "sha256-sSLW1KaB1adKTJn9+Ja3h3AaS7QCZyhUKiSUStcLg80=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "879121648fe522b38cc1cf75aef160a14a1f2e7b", "rev": "6512b21eabb4d52e87ea2edcf31a288e67b2e4f8",
"type": "github" "type": "github"
}, },
"original": { "original": {
"id": "nixpkgs", "id": "nixpkgs",
"ref": "nixos-22.05", "ref": "nixos-unstable",
"type": "indirect" "type": "indirect"
} }
}, },

14
flake.nix
View File

@ -2,7 +2,7 @@
description = "Squiggle CI"; description = "Squiggle CI";
inputs = { inputs = {
nixpkgs.url = "nixpkgs/nixos-22.05"; nixpkgs.url = "nixpkgs/nixos-unstable";
gentype = { gentype = {
url = "github:quinn-dougherty/genType"; url = "github:quinn-dougherty/genType";
inputs.nixpkgs.follows = "nixpkgs"; inputs.nixpkgs.follows = "nixpkgs";
@ -27,7 +27,9 @@
}; };
gentypeOutputFn = pkgs: gentype.outputs.packages.${pkgs.system}.default; gentypeOutputFn = pkgs: gentype.outputs.packages.${pkgs.system}.default;
langFn = { pkgs, ... }: langFn = { pkgs, ... }:
import ./nix/squiggle-lang.nix { inherit pkgs commonFn gentypeOutputFn; }; import ./nix/squiggle-lang.nix {
inherit pkgs commonFn gentypeOutputFn;
};
componentsFn = { pkgs, ... }: componentsFn = { pkgs, ... }:
import ./nix/squiggle-components.nix { inherit pkgs commonFn langFn; }; import ./nix/squiggle-components.nix { inherit pkgs commonFn langFn; };
websiteFn = { pkgs, ... }: websiteFn = { pkgs, ... }:
@ -85,10 +87,8 @@
}; };
components.outputs = { components.outputs = {
squiggle-components = components.components-package-build; squiggle-components = components.components-package-build;
squiggle-components-lint = squiggle-components-lint = components.components-lint;
components.components-lint; squiggle-components-storybook = components.components-site-build;
squiggle-components-storybook =
components.components-site-build;
}; };
docs-site.outputs = { docs-site.outputs = {
squiggle-website = website.website; squiggle-website = website.website;
@ -98,7 +98,7 @@
}; };
}; };
in flake-utils.lib.eachDefaultSystem (system: in flake-utils.lib.eachDefaultSystem (system:
let let
# globals # globals
pkgs = import nixpkgs { pkgs = import nixpkgs {

3
nix/shell.nix
View File

@ -1,6 +1,5 @@
{ pkgs }: { pkgs }:
with pkgs; with pkgs; {
{
shell = mkShell { shell = mkShell {
name = "SQUIGGLE_yarn-wasm-devshell"; name = "SQUIGGLE_yarn-wasm-devshell";
buildInputs = buildInputs =

6
nix/squiggle-lang.nix
View File

@ -34,9 +34,7 @@ rec {
gentype = { gentype = {
postInstall = '' postInstall = ''
mv gentype.exe ELFLESS-gentype.exe mv gentype.exe ELFLESS-gentype.exe
cp ${ cp ${gentypeOutputFn pkgs}/src/GenType.exe gentype.exe
gentypeOutputFn pkgs
}/src/GenType.exe gentype.exe
''; '';
}; };
}; };
@ -58,7 +56,9 @@ rec {
src = lang-yarnPackage + "/libexec/@quri/squiggle-lang"; src = lang-yarnPackage + "/libexec/@quri/squiggle-lang";
buildInputs = common.buildInputs; buildInputs = common.buildInputs;
buildPhase = '' buildPhase = ''
# so that the path to ppx doesn't need to be patched.
mv node_modules deps mv node_modules deps
pushd deps/@quri/squiggle-lang pushd deps/@quri/squiggle-lang
yarn --offline build:peggy yarn --offline build:peggy
yarn --offline build:rescript yarn --offline build:rescript