summaryrefslogtreecommitdiffstats
path: root/lass
diff options
context:
space:
mode:
authorlassulus <lassulus@lassul.us>2022-12-29 17:39:12 +0100
committerlassulus <lassulus@lassul.us>2022-12-29 17:39:12 +0100
commit89152b599d3e568370223146e9b9bfe435b1f3bb (patch)
tree29680b14a085804a4b12513a854c31310eb68158 /lass
parent0a3e56ddf7f267cac008ab5421d796816d0ed2fa (diff)
parentcc29be2d206e1093e036ef619c08e6d536257760 (diff)
Merge remote-tracking branch 'kmein/master'
Diffstat (limited to 'lass')
-rw-r--r--lass/1systems/yellow/config.nix12
-rw-r--r--lass/5pkgs/bruellwuerfel/default.nix26
2 files changed, 10 insertions, 28 deletions
diff --git a/lass/1systems/yellow/config.nix b/lass/1systems/yellow/config.nix
index c8077e5ea..ecf0337ed 100644
--- a/lass/1systems/yellow/config.nix
+++ b/lass/1systems/yellow/config.nix
@@ -138,7 +138,15 @@ in {
};
};
- systemd.services.bruellwuerfel = {
+ systemd.services.bruellwuerfel =
+ let
+ bruellwuerfelSrc = pkgs.fetchFromGitHub {
+ owner = "krebs";
+ repo = "bruellwuerfel";
+ rev = "dc73adf69249fb63a4b024f1f3fbc9e541b27015";
+ sha256 = "078jp1gbavdp8lnwa09xa5m6bbbd05fi4x5ldkkgin5z04hwlhmd";
+ };
+ in {
wantedBy = [ "multi-user.target" ];
environment = {
IRC_CHANNEL = "#flix";
@@ -147,7 +155,7 @@ in {
IRC_HISTORY_FILE = "/tmp/bruelli.history";
};
serviceConfig = {
- ExecStart = "${pkgs.bruellwuerfel}/bin/bruellwuerfel";
+ ExecStart = "${pkgs.deno}/bin/deno run -A ${bruellwuerfelSrc}/src/index.ts";
};
};
diff --git a/lass/5pkgs/bruellwuerfel/default.nix b/lass/5pkgs/bruellwuerfel/default.nix
deleted file mode 100644
index cb8f08fa8..000000000
--- a/lass/5pkgs/bruellwuerfel/default.nix
+++ /dev/null
@@ -1,26 +0,0 @@
-{ yarn2nix-moretea, fetchFromGitHub, nodePackages, nodejs }: let
- #src = ~/src/bruellwuerfel;
- src = fetchFromGitHub {
- owner = "krebs";
- repo = "bruellwuerfel";
- rev = "57e20e630f732ce4e15b495ec5f9bf72a121b959";
- sha256 = "08zwwl24sq21r497a03lqpy2x10az8frrsh6d38xm92snd1yf85b";
- };
-
-in yarn2nix-moretea.mkYarnModules rec {
- pname = "bruellwuerfel";
- version = "1.0";
- name = "${pname}-${version}";
- packageJSON = "${src}/package.json";
- yarnLock = "${src}/yarn.lock";
- postBuild = ''
- cp -r ${src}/{src,tsconfig.json} $out/
- cd $out
- ${nodePackages.typescript}/bin/tsc || :
- mkdir -p $out/bin
- echo '#!/bin/sh' > $out/bin/bruellwuerfel
- echo "export NODE_PATH=$out/dist" >> $out/bin/bruellwuerfel
- echo "${nodejs}/bin/node $out/dist/index.js" >> $out/bin/bruellwuerfel
- chmod +x $out/bin/bruellwuerfel
- '';
-}