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

finished renamings.

Browse Source
This commit is contained in:
Quinn Dougherty 2022-08-16 02:15:55 -07:00
parent 94729fb656
commit 25c9cdc7f2
4 changed files with 27 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
flake.nix
View File

@ -48,16 +48,16 @@
checks = flake-utils.lib.flattenTree { checks = flake-utils.lib.flattenTree {
lang-lint = lang.lint; lang-lint = lang.lint;
lang-test = lang.test; lang-test = lang.test;
components-lint = components.components-lint; components-lint = components.lint;
docusaurus-lint = website.website-lint; docusaurus-lint = website.lint;
}; };
# building # building
packages = flake-utils.lib.flattenTree { packages = flake-utils.lib.flattenTree {
default = website.website; default = website.website;
lang-bundle = lang.bundle; lang-bundle = lang.bundle;
components = components.components-package-build; components = components.package-build;
storybook = components.components-site-build; storybook = components.site-build;
docs-site = website.website; docs-site = website.docusaurus;
}; };
# developing # developing
@ -85,13 +85,13 @@
squiggle-lang-bundle = lang.bundle; squiggle-lang-bundle = lang.bundle;
}; };
components.outputs = { components.outputs = {
squiggle-components = components.components-package-build; squiggle-components = components.package-build;
squiggle-components-lint = components.components-lint; squiggle-components-lint = components.lint;
squiggle-components-storybook = components.components-site-build; squiggle-components-storybook = components.site-build;
}; };
docs-site.outputs = { docs-site.outputs = {
squiggle-website = website.website; squiggle-website = website.docusaurus;
docusaurus-lint = website.website-lint; docusaurus-lint = website.lint;
}; };
}; };
}; };

16
nix/squiggle-components.nix
View File

@ -10,25 +10,25 @@ rec {
packageJsonString = builtins.toJSON modified; packageJsonString = builtins.toJSON modified;
in pkgs.writeText "packages/components/patched-package.json" in pkgs.writeText "packages/components/patched-package.json"
packageJsonString; packageJsonString;
components-yarnPackage = pkgs.mkYarnPackage { yarn-source = pkgs.mkYarnPackage {
name = "squiggle-components_source"; name = "squiggle-components_source";
buildInputs = common.buildInputs; buildInputs = common.buildInputs;
src = ../packages/components; src = ../packages/components;
packageJSON = componentsPackageJson; packageJSON = componentsPackageJson;
yarnLock = ../yarn.lock; yarnLock = ../yarn.lock;
packageResolutions."@quri/squiggle-lang" = lang.lang-build; packageResolutions."@quri/squiggle-lang" = lang.build;
}; };
components-lint = pkgs.stdenv.mkDerivation { lint = pkgs.stdenv.mkDerivation {
name = "squiggle-components-lint"; name = "squiggle-components-lint";
src = components-yarnPackage src = yarn-source
+ "/libexec/@quri/squiggle-components/deps/@quri/squiggle-components"; + "/libexec/@quri/squiggle-components/deps/@quri/squiggle-components";
buildInputs = common.buildInputs ++ common.prettier; buildInputs = common.buildInputs ++ common.prettier;
buildPhase = "yarn lint"; buildPhase = "yarn lint";
installPhase = "mkdir -p $out"; installPhase = "mkdir -p $out";
}; };
components-package-build = pkgs.stdenv.mkDerivation { package-build = pkgs.stdenv.mkDerivation {
name = "squiggle-components-package-build"; name = "squiggle-components-package-build";
src = components-yarnPackage + "/libexec/@quri/squiggle-components"; src = yarn-source + "/libexec/@quri/squiggle-components";
buildInputs = common.buildInputs; buildInputs = common.buildInputs;
buildPhase = '' buildPhase = ''
cp -r node_modules/@quri/squiggle-lang deps/@quri cp -r node_modules/@quri/squiggle-lang deps/@quri
@ -50,9 +50,9 @@ rec {
cp -r deps/@quri/squiggle-components/. $out cp -r deps/@quri/squiggle-components/. $out
''; '';
}; };
components-site-build = pkgs.stdenv.mkDerivation { site-build = pkgs.stdenv.mkDerivation {
name = "squiggle-components-storybook"; name = "squiggle-components-storybook";
src = components-package-build; src = package-build;
buildInputs = common.buildInputs; buildInputs = common.buildInputs;
buildPhase = "yarn build:storybook"; buildPhase = "yarn build:storybook";
installPhase = '' installPhase = ''

3
nix/squiggle-lang.nix
View File

@ -41,8 +41,7 @@ rec {
}; };
lint = pkgs.stdenv.mkDerivation { lint = pkgs.stdenv.mkDerivation {
name = "squiggle-lang-lint"; name = "squiggle-lang-lint";
src = yarn-source src = yarn-source + "/libexec/@quri/squiggle-lang/deps/@quri/squiggle-lang";
+ "/libexec/@quri/squiggle-lang/deps/@quri/squiggle-lang";
buildInputs = common.buildInputs ++ common.prettier; buildInputs = common.buildInputs ++ common.prettier;
buildPhase = '' buildPhase = ''
yarn lint:prettier yarn lint:prettier

19
nix/squiggle-website.nix
View File

@ -12,29 +12,26 @@ rec {
}; };
packageJsonString = builtins.toJSON modified; packageJsonString = builtins.toJSON modified;
in pkgs.writeText "packages/website/patched-package.json" packageJsonString; in pkgs.writeText "packages/website/patched-package.json" packageJsonString;
website-yarnPackage = pkgs.mkYarnPackage { yarn-source = pkgs.mkYarnPackage {
name = "squiggle-website_source"; name = "squiggle-website_source";
src = ../packages/website; src = ../packages/website;
packageJSON = websitePackageJson; packageJSON = websitePackageJson;
yarnLock = ../yarn.lock; yarnLock = ../yarn.lock;
packageResolutions."@quri/squiggle-lang" = lang.lang-build; packageResolutions."@quri/squiggle-lang" = lang.build;
packageResolutions."@quri/squiggle-components" = packageResolutions."@quri/squiggle-components" = components.package-build;
components.components-package-build; workspaceDependencies = [ lang.yarn-source components.yarn-source ];
workspaceDependencies =
[ lang.lang-yarnPackage components.components-yarnPackage ];
}; };
website-lint = pkgs.stdenv.mkDerivation { lint = pkgs.stdenv.mkDerivation {
name = "squiggle-website-lint"; name = "squiggle-website-lint";
buildInputs = common.buildInputs ++ common.prettier; buildInputs = common.buildInputs ++ common.prettier;
src = website-yarnPackage src = yarn-source + "/libexec/squiggle-website/deps/squiggle-website";
+ "/libexec/squiggle-website/deps/squiggle-website";
buildPhase = "yarn --offline lint"; buildPhase = "yarn --offline lint";
installPhase = "mkdir -p $out"; installPhase = "mkdir -p $out";
}; };
website = pkgs.stdenv.mkDerivation { docusaurus = pkgs.stdenv.mkDerivation {
name = "squiggle-website"; name = "squiggle-website";
buildInputs = common.buildInputs; buildInputs = common.buildInputs;
src = website-yarnPackage + "/libexec/squiggle-website"; src = yarn-source + "/libexec/squiggle-website";
buildPhase = '' buildPhase = ''
pushd deps/squiggle-website pushd deps/squiggle-website
yarn --offline build yarn --offline build