diff --git a/flake.nix b/flake.nix index 9faa3548..38f8e4fe 100644 --- a/flake.nix +++ b/flake.nix @@ -46,15 +46,15 @@ in { # validating checks = flake-utils.lib.flattenTree { - lang-lint = lang.lang-lint; - lang-test = lang.lang-test; + lang-lint = lang.lint; + lang-test = lang.test; components-lint = components.components-lint; docusaurus-lint = website.website-lint; }; # building packages = flake-utils.lib.flattenTree { default = website.website; - lang-bundle = lang.lang-bundle; + lang-bundle = lang.bundle; components = components.components-package-build; storybook = components.components-site-build; docs-site = website.website; @@ -79,10 +79,10 @@ ciSystems = [ hciSystem ]; onPush = { lang.outputs = { - squiggle-lang-lint = lang.lang-lint; - squiggle-lang-build = lang.lang-build; - squiggle-lang-test = lang.lang-test; - squiggle-lang-bundle = lang.lang-bundle; + squiggle-lang-lint = lang.lint; + squiggle-lang-build = lang.build; + squiggle-lang-test = lang.test; + squiggle-lang-bundle = lang.bundle; }; components.outputs = { squiggle-components = components.components-package-build; diff --git a/nix/squiggle-lang.nix b/nix/squiggle-lang.nix index de5298b0..0826cb41 100644 --- a/nix/squiggle-lang.nix +++ b/nix/squiggle-lang.nix @@ -2,7 +2,7 @@ rec { common = commonFn pkgs; - lang-yarnPackage = pkgs.mkYarnPackage { + yarn-source = pkgs.mkYarnPackage { name = "squiggle-lang_source"; src = ../packages/squiggle-lang; packageJSON = ../packages/squiggle-lang/package.json; @@ -39,9 +39,9 @@ rec { }; }; }; - lang-lint = pkgs.stdenv.mkDerivation { + lint = pkgs.stdenv.mkDerivation { name = "squiggle-lang-lint"; - src = lang-yarnPackage + src = yarn-source + "/libexec/@quri/squiggle-lang/deps/@quri/squiggle-lang"; buildInputs = common.buildInputs ++ common.prettier; buildPhase = '' @@ -50,10 +50,10 @@ rec { ''; installPhase = "mkdir -p $out"; }; - lang-build = pkgs.stdenv.mkDerivation { + build = pkgs.stdenv.mkDerivation { name = "squiggle-lang-build"; # `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; buildPhase = '' # so that the path to ppx doesn't need to be patched. @@ -88,9 +88,9 @@ rec { cp -r deps/@quri/squiggle-lang/. $out ''; }; - lang-test = pkgs.stdenv.mkDerivation { + test = pkgs.stdenv.mkDerivation { name = "squiggle-lang-test"; - src = lang-build; + src = build; buildInputs = common.buildInputs; buildPhase = '' yarn --offline test @@ -100,9 +100,9 @@ rec { cp -r . $out ''; }; - lang-bundle = pkgs.stdenv.mkDerivation { + bundle = pkgs.stdenv.mkDerivation { name = "squiggle-lang-bundle"; - src = lang-test; + src = test; buildInputs = common.buildInputs; buildPhase = '' yarn --offline bundle