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

minor cleanup

Browse Source
This commit is contained in:
Quinn Dougherty 2022-08-30 17:12:50 +08:00
parent 83ee5dfb63
commit 4b6a565c33
2 changed files with 19 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
flake.nix
View File

@ -67,6 +67,7 @@
# building # building
packages = flake-utils.lib.flattenTree { packages = flake-utils.lib.flattenTree {
default = components.build; default = components.build;
lang = lang.build;
lang-bundle = lang.bundle; lang-bundle = lang.bundle;
lang-test = lang.test; lang-test = lang.test;
components = components.build; components = components.build;

36
nix/squiggle-website.nix
View File

@ -2,24 +2,24 @@
rec { rec {
common = commonFn pkgs; common = commonFn pkgs;
# lang = langFn pkgs; lang = langFn pkgs;
# components = componentsFn pkgs; components = componentsFn pkgs;
# websitePackageJson = let websitePackageJson = let
# raw = pkgs.lib.importJSON ../packages/website/package.json; raw = pkgs.lib.importJSON ../packages/website/package.json;
# modified = pkgs.lib.recursiveUpdate raw { modified = pkgs.lib.recursiveUpdate raw {
# dependencies.postcss-import = "^14.1.0"; dependencies.postcss-import = "^14.1.0";
# dependencies.tailwindcss = "^3.1.8"; dependencies.tailwindcss = "^3.1.8";
# }; };
# 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;
# yarn-source = pkgs.mkYarnPackage { yarn-source = pkgs.mkYarnPackage {
# name = "squiggle-website_yarnsource"; name = "squiggle-website_yarnsource";
# src = ../packages/website; src = ../packages/website;
# packageJSON = websitePackageJson; packageJSON = websitePackageJson;
# yarnLock = ../yarn.lock; yarnLock = ../yarn.lock;
# packageResolutions."@quri/squiggle-lang" = lang.build; packageResolutions."@quri/squiggle-lang" = lang.build;
# packageResolutions."@quri/squiggle-components" = components.build; packageResolutions."@quri/squiggle-components" = components.build;
# }; };
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;