n/zorigami: new user who dis 👀

still failing; gonna see why tomorrow

nixos/zorigami/default.nix

@@ -137,8 +137,8 @@
 
   systemd.services.minecraft-overviewer = {
     script = ''
-      ${pkgs.python3Packages.minecraft-overviewer}/bin/overviewer.py -p 12 -c "/srv/minecraft-overviewer/survival/config.py"
-      ${pkgs.python3Packages.minecraft-overviewer}/bin/overviewer.py -p 12 -c "/srv/minecraft-overviewer/survival/config.py" --genpoi
+      ${pkgs.python311Packages.minecraft-overviewer}/bin/overviewer.py -p 12 -c "/srv/minecraft-overviewer/survival/config.py"
+      ${pkgs.python311Packages.minecraft-overviewer}/bin/overviewer.py -p 12 -c "/srv/minecraft-overviewer/survival/config.py" --genpoi
     '';
     serviceConfig = {
       User = "minecraft";
@@ -691,4 +691,57 @@
       "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIImhJ+2pw5c1Tzx/g+S04on5bUXhwzloqRaiXti5UC7A domi@zork"
     ];
   };
+  users.groups.linus = { gid = 1005; };
+  users.users.linus = {
+    isNormalUser = true;
+    uid = 1005;
+    group = "linus";
+    extraGroups = [ "users" ];
+    openssh.authorizedKeys.keys = [
+      "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIORvG6x/lWsQZA7ZAsnwBe1RBzzLwBeMoQCpOD0ig9R5 linus@linus-framework"
+      "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIEowH/uY8eqQ+Q4G3oST9CM7my6uxicDr++7adqgrINP linus@linus-desktop"
+      "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIOm/JXQzPnjZfxmuRZAypcp6Vosp+HJJiV1F/AyoniSu linus@linus.dev"
+      "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIH4ssDo0VL6l16vj+SIjPx+bU2biCuhDCEJQqGPYvjT/ linus@sakamoto"
+      "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIOQdbF6qHTzdSXKiMTlmljw/UHXQ+M++JGMwT56844Ab ConnectBot@FP3"
+      "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAICr7oqFHkwPMV67PhjdLomvcfdQfZ4W+KncQ86ywjtrt Termius@iPhone"
+    ];
+  };
+
+  programs.nix-ld.enable = true;
+  programs.nix-ld.libraries = [
+    (lib.getLib pkgs.stdenv.cc.cc)
+  ];
+  age.secrets.github-runner-test262.file = ../../secrets/github-runner-token-test262.age;
+  services.github-runners."test262" = {
+    enable = true;
+    url = "https://github.com/arachnist/test262.fyi";
+    tokenFile = config.age.secrets.github-runner-token.path;
+
+    # list of debian packages from Linus
+    # git nodejs make build-essential unzip zip jq rsync python3 python3-pip python3-virtualenv python3-wheel cargo rustc liblttng-ust1 librust-openssl-dev npm openjdk-8-jre
+    extraPackages =  (with pkgs.python311Packages; [
+      pip
+      virtualenv
+      wheel
+    ]) ++ (with pkgs; [
+      python311
+      git
+      nodejs # also includes npm
+      gnumake
+      stdenv
+      unzip
+      zip
+      jq
+      rsync
+      cargo
+      rustc
+      lttng-ust
+      openssl # ?
+      openjdk8
+    ]);
+    extraEnvironment = {
+      NIX_LD = "/run/current-system/sw/share/nix-ld/lib/ld.so";
+      NIX_LD_LIBRARY_PATH = "/run/current-system/sw/share/nix-ld/lib";
+    };
+  };
 }

overlays/nibylandia.nix

@@ -21,7 +21,7 @@ in {
     inherit (emoji-reactions) patches;
   };
 
-  python3 = super.python3.override {
+  python311 = super.python311.override {
     packageOverrides = self: super: {
       pillow_with_headers =
         self.callPackage ../pkgs/pillow-with-headers.nix { };
@@ -29,5 +29,5 @@ in {
         self.callPackage ../pkgs/minecraft-overviewer.nix { };
     };
   };
-  python3Packages = self.python3.pkgs;
+  python311Packages = self.python311.pkgs;
 }

pkgs/minecraft-overviewer.nix

@@ -1,12 +1,21 @@
-{ fetchFromGitHub, pkgs, buildPythonPackage, python3Packages, python3, ... }:
+{ callPackage, fetchFromGitHub, pkgs, buildPythonPackage, python311, pythonOlder, ... }:
 
+let
+  python3 = python311;
+  python3Packages = pkgs.python311Packages;
+  pillow_with_headers = callPackage ./pillow-with-headers.nix {
+    inherit python3Packages;
+  };
+in
 buildPythonPackage {
   pname = "Minecraft-Overviewer";
   version = "2024-03-15";
   format = "other";
 
-  propagatedBuildInputs = [ pkgs.pipreqs ] ++ (with python3Packages; [
+  propagatedBuildInputs = [
+    (pkgs.pipreqs.override { inherit python3; })
     pillow_with_headers
+  ] ++ (with python3Packages; [
     altgraph
     certifi
     charset-normalizer
@@ -26,7 +35,7 @@ buildPythonPackage {
   buildInputs = with python3Packages; [ setuptools ];
 
   buildPhase = ''
-    export CFLAGS="-I${python3Packages.pillow_with_headers}/include/libImaging"
+    export CFLAGS="-I${pillow_with_headers}/include/libImaging"
     ${python3.interpreter} setup.py build
   '';
 
@@ -34,6 +43,8 @@ buildPythonPackage {
     ${python3.interpreter} setup.py install --prefix=$out --install-lib=$out/${python3.sitePackages}
   '';
 
+  doCheck = pythonOlder "3.12";
+
   src = fetchFromGitHub {
     owner = "GregoryAM-SP";
     repo = "The-Minecraft-Overviewer";

secrets.nix

@@ -105,4 +105,6 @@ in {
     ++ [ meta.hosts.zorigami.publicKey ];
   "secrets/automata.of-a.cat-matrix_env.age".publicKeys = meta.users.ar
     ++ [ meta.hosts.zorigami.publicKey ];
+  "secrets/github-runner-token-test262.age".publicKeys = meta.users.ar
+    ++ [ meta.hosts.zorigami.publicKey ];
 }