minor cleanup
This commit is contained in:
parent
83ee5dfb63
commit
4b6a565c33
|
@ -67,6 +67,7 @@
|
|||
# building
|
||||
packages = flake-utils.lib.flattenTree {
|
||||
default = components.build;
|
||||
lang = lang.build;
|
||||
lang-bundle = lang.bundle;
|
||||
lang-test = lang.test;
|
||||
components = components.build;
|
||||
|
|
|
@ -2,24 +2,24 @@
|
|||
|
||||
rec {
|
||||
common = commonFn pkgs;
|
||||
# lang = langFn pkgs;
|
||||
# components = componentsFn pkgs;
|
||||
# websitePackageJson = let
|
||||
# raw = pkgs.lib.importJSON ../packages/website/package.json;
|
||||
# modified = pkgs.lib.recursiveUpdate raw {
|
||||
# dependencies.postcss-import = "^14.1.0";
|
||||
# dependencies.tailwindcss = "^3.1.8";
|
||||
# };
|
||||
# packageJsonString = builtins.toJSON modified;
|
||||
# in pkgs.writeText "packages/website/patched-package.json" packageJsonString;
|
||||
# yarn-source = pkgs.mkYarnPackage {
|
||||
# name = "squiggle-website_yarnsource";
|
||||
# src = ../packages/website;
|
||||
# packageJSON = websitePackageJson;
|
||||
# yarnLock = ../yarn.lock;
|
||||
# packageResolutions."@quri/squiggle-lang" = lang.build;
|
||||
# packageResolutions."@quri/squiggle-components" = components.build;
|
||||
# };
|
||||
lang = langFn pkgs;
|
||||
components = componentsFn pkgs;
|
||||
websitePackageJson = let
|
||||
raw = pkgs.lib.importJSON ../packages/website/package.json;
|
||||
modified = pkgs.lib.recursiveUpdate raw {
|
||||
dependencies.postcss-import = "^14.1.0";
|
||||
dependencies.tailwindcss = "^3.1.8";
|
||||
};
|
||||
packageJsonString = builtins.toJSON modified;
|
||||
in pkgs.writeText "packages/website/patched-package.json" packageJsonString;
|
||||
yarn-source = pkgs.mkYarnPackage {
|
||||
name = "squiggle-website_yarnsource";
|
||||
src = ../packages/website;
|
||||
packageJSON = websitePackageJson;
|
||||
yarnLock = ../yarn.lock;
|
||||
packageResolutions."@quri/squiggle-lang" = lang.build;
|
||||
packageResolutions."@quri/squiggle-components" = components.build;
|
||||
};
|
||||
lint = pkgs.stdenv.mkDerivation {
|
||||
name = "squiggle-website-lint";
|
||||
buildInputs = common.buildInputs ++ common.prettier;
|
||||
|
|
Loading…
Reference in New Issue
Block a user