regenerating yarn.lock got the goods

This commit is contained in:
Quinn Dougherty 2022-08-16 00:55:19 -07:00
parent a5e9e26a15
commit 07d739d3db
4 changed files with 14120 additions and 15215 deletions

View File

@ -38,11 +38,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1660628617, "lastModified": 1660630689,
"narHash": "sha256-swFuey10pJV/TFcPv9pMf9xuXf/BDuJ1xzZ57jpfkrA=", "narHash": "sha256-oM21qcr+VtI69GIm56UDy6oGiupq2GkZDIaKXWWnM8k=",
"owner": "quinn-dougherty", "owner": "quinn-dougherty",
"repo": "genType", "repo": "genType",
"rev": "e4374399178976de0c4fc41f64dde913c3bed5dd", "rev": "c2a022cfec32b5a61d575205daa93416a9a9309c",
"type": "github" "type": "github"
}, },
"original": { "original": {

View File

@ -19,13 +19,15 @@
outputs = { self, nixpkgs, gentype, hercules-ci-effects, flake-utils, ... }: outputs = { self, nixpkgs, gentype, hercules-ci-effects, flake-utils, ... }:
let let
version = builtins.substring 0 8 self.lastModifiedDate;
commonFn = pkgs: { commonFn = pkgs: {
buildInputs = with pkgs; [ nodejs yarn ]; buildInputs = with pkgs; [ nodejs yarn ];
prettier = with pkgs.nodePackages; [ prettier ]; prettier = with pkgs.nodePackages; [ prettier ];
which = [ pkgs.which ]; which = [ pkgs.which ];
}; };
gentypeOutputFn = pkgs: gentype.outputs.packages.${pkgs.system}.default;
langFn = { pkgs, ... }: langFn = { pkgs, ... }:
import ./nix/squiggle-lang.nix { inherit pkgs commonFn gentype; }; import ./nix/squiggle-lang.nix { inherit pkgs commonFn gentypeOutputFn; };
componentsFn = { pkgs, ... }: componentsFn = { pkgs, ... }:
import ./nix/squiggle-components.nix { inherit pkgs commonFn langFn; }; import ./nix/squiggle-components.nix { inherit pkgs commonFn langFn; };
websiteFn = { pkgs, ... }: websiteFn = { pkgs, ... }:
@ -34,7 +36,7 @@
}; };
# local machines # local machines
localFlake = { pkgs }: localFlake = { pkgs, ... }:
let let
lang = langFn pkgs; lang = langFn pkgs;
components = componentsFn pkgs; components = componentsFn pkgs;
@ -86,7 +88,7 @@
squiggle-components-lint = squiggle-components-lint =
components.components-lint; components.components-lint;
squiggle-components-storybook = squiggle-components-storybook =
components.storybook; components.components-site-build;
}; };
docs-site.outputs = { docs-site.outputs = {
squiggle-website = website.website; squiggle-website = website.website;
@ -96,19 +98,19 @@
}; };
}; };
in flake-utils.lib.eachSystem [ "x86_64-linux" ] (system: in flake-utils.lib.eachDefaultSystem (system:
let let
# globals # globals
pkgs = import nixpkgs { pkgs = import nixpkgs {
system = system; inherit system;
overlays = [ overlays = [
(final: prev: { (final: prev: {
# set the node version here # set the node version here
nodejs = prev.nodejs-16_x; nodejs = prev.nodejs-18_x;
# The override is the only way to get it into mkYarnModules # The override is the only way to get it into mkYarnModules
}) })
]; ];
}; };
in (localFlake { inherit pkgs; } )) // herc; in localFlake pkgs) // herc;
} }

View File

@ -1,14 +1,12 @@
{ pkgs, commonFn, gentype }: { pkgs, commonFn, gentypeOutputFn }:
rec { rec {
common = commonFn pkgs; common = commonFn pkgs;
# packages in subrepos
lang-yarnPackage = pkgs.mkYarnPackage { lang-yarnPackage = 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;
yarnLock = ../yarn.lock; yarnLock = ../yarn.lock;
# extraBuildInputs = prettierCommon;
pkgConfig = { pkgConfig = {
rescript = { rescript = {
buildInputs = common.which ++ [ pkgs.gcc_multi ]; buildInputs = common.which ++ [ pkgs.gcc_multi ];
@ -37,8 +35,8 @@ rec {
postInstall = '' postInstall = ''
mv gentype.exe ELFLESS-gentype.exe mv gentype.exe ELFLESS-gentype.exe
cp ${ cp ${
gentype.outputs.defaultPackage."${pkgs.system}" gentypeOutputFn pkgs
}/GenType.exe gentype.exe }/src/GenType.exe gentype.exe
''; '';
}; };
}; };

29305
yarn.lock

File diff suppressed because it is too large Load Diff