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

shorter names

Browse Source
This commit is contained in:
Quinn Dougherty 2022-08-16 02:08:51 -07:00
parent 49a3af156a
commit 94729fb656
2 changed files with 16 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
flake.nix
View File

@ -46,15 +46,15 @@
in { in {
# validating # validating
checks = flake-utils.lib.flattenTree { checks = flake-utils.lib.flattenTree {
lang-lint = lang.lang-lint; lang-lint = lang.lint;
lang-test = lang.lang-test; lang-test = lang.test;
components-lint = components.components-lint; components-lint = components.components-lint;
docusaurus-lint = website.website-lint; docusaurus-lint = website.website-lint;
}; };
# building # building
packages = flake-utils.lib.flattenTree { packages = flake-utils.lib.flattenTree {
default = website.website; default = website.website;
lang-bundle = lang.lang-bundle; lang-bundle = lang.bundle;
components = components.components-package-build; components = components.components-package-build;
storybook = components.components-site-build; storybook = components.components-site-build;
docs-site = website.website; docs-site = website.website;
@ -79,10 +79,10 @@
ciSystems = [ hciSystem ]; ciSystems = [ hciSystem ];
onPush = { onPush = {
lang.outputs = { lang.outputs = {
squiggle-lang-lint = lang.lang-lint; squiggle-lang-lint = lang.lint;
squiggle-lang-build = lang.lang-build; squiggle-lang-build = lang.build;
squiggle-lang-test = lang.lang-test; squiggle-lang-test = lang.test;
squiggle-lang-bundle = lang.lang-bundle; squiggle-lang-bundle = lang.bundle;
}; };
components.outputs = { components.outputs = {
squiggle-components = components.components-package-build; squiggle-components = components.components-package-build;

18
nix/squiggle-lang.nix
View File

@ -2,7 +2,7 @@
rec { rec {
common = commonFn pkgs; common = commonFn pkgs;
lang-yarnPackage = pkgs.mkYarnPackage { yarn-source = pkgs.mkYarnPackage {
name = "squiggle-lang_source"; name = "squiggle-lang_source";
src = ../packages/squiggle-lang; src = ../packages/squiggle-lang;
packageJSON = ../packages/squiggle-lang/package.json; packageJSON = ../packages/squiggle-lang/package.json;
@ -39,9 +39,9 @@ rec {
}; };
}; };
}; };
lang-lint = pkgs.stdenv.mkDerivation { lint = pkgs.stdenv.mkDerivation {
name = "squiggle-lang-lint"; name = "squiggle-lang-lint";
src = lang-yarnPackage 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 = ''
@ -50,10 +50,10 @@ rec {
''; '';
installPhase = "mkdir -p $out"; installPhase = "mkdir -p $out";
}; };
lang-build = pkgs.stdenv.mkDerivation { build = pkgs.stdenv.mkDerivation {
name = "squiggle-lang-build"; name = "squiggle-lang-build";
# `peggy` is in the `node_modules` that's adjacent to `deps`. # `peggy` is in the `node_modules` that's adjacent to `deps`.
src = lang-yarnPackage + "/libexec/@quri/squiggle-lang"; src = yarn-source + "/libexec/@quri/squiggle-lang";
buildInputs = common.buildInputs; buildInputs = common.buildInputs;
buildPhase = '' buildPhase = ''
# so that the path to ppx doesn't need to be patched. # so that the path to ppx doesn't need to be patched.
@ -88,9 +88,9 @@ rec {
cp -r deps/@quri/squiggle-lang/. $out cp -r deps/@quri/squiggle-lang/. $out
''; '';
}; };
lang-test = pkgs.stdenv.mkDerivation { test = pkgs.stdenv.mkDerivation {
name = "squiggle-lang-test"; name = "squiggle-lang-test";
src = lang-build; src = build;
buildInputs = common.buildInputs; buildInputs = common.buildInputs;
buildPhase = '' buildPhase = ''
yarn --offline test yarn --offline test
@ -100,9 +100,9 @@ rec {
cp -r . $out cp -r . $out
''; '';
}; };
lang-bundle = pkgs.stdenv.mkDerivation { bundle = pkgs.stdenv.mkDerivation {
name = "squiggle-lang-bundle"; name = "squiggle-lang-bundle";
src = lang-test; src = test;
buildInputs = common.buildInputs; buildInputs = common.buildInputs;
buildPhase = '' buildPhase = ''
yarn --offline bundle yarn --offline bundle