Skip to content

Commit

Permalink
removed yarn.lock
Browse files Browse the repository at this point in the history
  • Loading branch information
MarcelCoding committed Oct 27, 2023
1 parent 0a72a08 commit 430ced4
Show file tree
Hide file tree
Showing 6 changed files with 69 additions and 7,779 deletions.
4 changes: 2 additions & 2 deletions angular.json
Original file line number Diff line number Diff line change
Expand Up @@ -100,8 +100,8 @@
},
"defaultConfiguration": "development",
"options": {
"sslCert": "G:\\Work\\tools\\scripts\\tlm.cer",
"sslKey": "G:\\Work\\tools\\scripts\\tlm.key"
"sslCert": "/home/marcel/OneDrive/Backup/Daten_G/tools/scripts/tlm.cer",
"sslKey": "/home/marcel/OneDrive/Backup/Daten_G/tools/scripts/tlm.key"
}
},
"extract-i18n": {
Expand Down
31 changes: 10 additions & 21 deletions derivation.nix
Original file line number Diff line number Diff line change
@@ -1,32 +1,21 @@
{ pkgs, lib, config, domain, mkYarnPackage, yarn }:
mkYarnPackage {
name = "kindergarten";
{ domain, mkPnpmPackage }:

mkPnpmPackage {
src = ./.;

buildInputs = [ yarn ];
installInPlace = true;

postPatch = ''
substituteInPlace src/app/data/api.domain.ts \
--replace 'staging.tlm.solutions' '${domain}'
'';

buildPhase = ''
FILE=$(readlink ./deps/kindergarten/node_modules)
rm ./deps/kindergarten/node_modules
mkdir ./deps/kindergarten/node_modules
cp -r $FILE/ ./deps/kindergarten/
chmod -R 777 ./deps/kindergarten
cp -r ./node_modules/* ./deps/kindergarten/node_modules/
yarn run build:ci
'';
script = "build:ci";

installPhase = ''
mkdir -p $out/bin/en
mkdir -p $out/bin/de
cp -r ./deps/kindergarten/dist/en-US/* $out/bin/en/
cp -r ./deps/kindergarten/dist/de-DE/* $out/bin/de/
mkdir -p $out/en
mkdir -p $out/de
cp -r ./dist/en-US/* $out/en/
cp -r ./dist/de-DE/* $out/de/
'';

doDist = false;
}
68 changes: 46 additions & 22 deletions flake.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

13 changes: 10 additions & 3 deletions flake.nix
Original file line number Diff line number Diff line change
@@ -1,20 +1,27 @@
{
inputs = {
nixpkgs.url = "github:NixOS/nixpkgs/nixos-23.05";
pnpm2nix = {
url = "github:MarcelCoding/pnpm2nix-nzbr";
inputs.nixpkgs.follows = "nixpkgs";
inputs.flake-utils.follows = "flake-utils";
};

utils.url = "github:numtide/flake-utils";
flake-utils.url = "github:numtide/flake-utils";
};

outputs = { self, nixpkgs, utils, ... }:
utils.lib.eachDefaultSystem
outputs = { self, nixpkgs, pnpm2nix, flake-utils, ... }:
flake-utils.lib.eachDefaultSystem
(system:
let
pkgs = nixpkgs.legacyPackages.${system};
package-production = pkgs.callPackage ./derivation.nix {
domain = "tlm.solutions";
mkPnpmPackage = pnpm2nix.packages."${system}".mkPnpmPackage;
};
package-staging = pkgs.callPackage ./derivation.nix {
domain = "staging.tlm.solutions";
mkPnpmPackage = pnpm2nix.packages."${system}".mkPnpmPackage;
};
in
rec {
Expand Down
11 changes: 1 addition & 10 deletions pnpm-lock.yaml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading

0 comments on commit 430ced4

Please sign in to comment.