Update dependencies, Remove Nix build system

flake.lock

@@ -1,12 +1,15 @@
 {
   "nodes": {
     "flake-utils": {
+      "inputs": {
+        "systems": "systems"
+      },
       "locked": {
-        "lastModified": 1653893745,
+        "lastModified": 1681202837,
-        "narHash": "sha256-0jntwV3Z8//YwuOjzhV2sgJJPt+HY6KhU7VZUL0fKZQ=",
+        "narHash": "sha256-H+Rh19JDwRtpVPAWp64F+rlEtxUWBAQW28eAi3SRSzg=",
         "owner": "numtide",
         "repo": "flake-utils",
-        "rev": "1ed9fb1935d260de5fe1c2f7ee0ebaae17ed2fa1",
+        "rev": "cfacdce06f30d2b68473a46042957675eebb3401",
         "type": "github"
       },
       "original": {
@@ -17,11 +20,11 @@
     },
     "nixpkgs": {
       "locked": {
-        "lastModified": 1654953433,
+        "lastModified": 1683408522,
-        "narHash": "sha256-TwEeh4r50NdWHFAHQSyjCk2cZxgwUfcCCAJOhPdXB28=",
+        "narHash": "sha256-9kcPh6Uxo17a3kK3XCHhcWiV1Yu1kYj22RHiymUhMkU=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "90cd5459a1fd707819b9a3fb9c852beaaac3b79a",
+        "rev": "897876e4c484f1e8f92009fd11b7d988a121a4e7",
         "type": "github"
       },
       "original": {
@@ -35,6 +38,21 @@
         "flake-utils": "flake-utils",
         "nixpkgs": "nixpkgs"
       }
+    },
+    "systems": {
+      "locked": {
+        "lastModified": 1681028828,
+        "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=",
+        "owner": "nix-systems",
+        "repo": "default",
+        "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e",
+        "type": "github"
+      },
+      "original": {
+        "owner": "nix-systems",
+        "repo": "default",
+        "type": "github"
+      }
     }
   },
   "root": "root",

flake.nix

@@ -1,150 +1,70 @@
 {
-	description = "Angestöpselt Homepage";
+  description = "Angestöpselt Homepage";
 
-	inputs.nixpkgs.url = "nixpkgs/nixos-unstable";
+  inputs.nixpkgs.url = "nixpkgs/nixos-unstable";
-	inputs.flake-utils.url = "github:numtide/flake-utils";
+  inputs.flake-utils.url = "github:numtide/flake-utils";
 
-	outputs = {self, nixpkgs, flake-utils }: let
+  outputs = {
-		base = flake-utils.lib.eachDefaultSystem (system:
+    self,
-			let
+    nixpkgs,
-				pkgs = import nixpkgs { inherit system; };
+    flake-utils,
+  }:
+    flake-utils.lib.eachDefaultSystem (system: let
+      pkgs = import nixpkgs {inherit system;};
 
-				nodejs = pkgs.nodejs-16_x;
+      nodejs = pkgs.nodejs-18_x;
-				nodePackages = import ./nix/default.nix { inherit pkgs system nodejs; };
+      nodePackages = import ./nix/default.nix {inherit pkgs system nodejs;};
-				nodeDependencies = nodePackages.nodeDependencies.override {
+      nodeDependencies = nodePackages.nodeDependencies.override {
-					nativeBuildInputs = with pkgs; [ pkg-config ];
+        src = pkgs.runCommand "angestoepselt-homepage-package-json" {} ''
-					buildInputs = with pkgs; [ vips ];
+          mkdir -p "$out"
-					dontNpmInstall = true;
+          cp ${./package.json} "$out/package.json"
-				};
+          cp ${./package-lock.json} "$out/package-lock.json"
+        '';
+        nativeBuildInputs = [pkgs.pkg-config];
+        buildInputs = [pkgs.vips pkgs.glib];
+      };
 
-				python = pkgs.python310.withPackages (ps: with ps; [
+      python = pkgs.python310.withPackages (ps:
-					itsdangerous
+        with ps; [
-					requests
+          itsdangerous
-				]);
+          requests
-			in
+        ]);
-			rec {
+    in rec {
-				packages = {
+      packages = {
-					site = pkgs.stdenv.mkDerivation {
+        devEnv = pkgs.symlinkJoin {
-						name = "angestoepselt-site";
+          name = "angestoepselt-homepage-dev";
-						src = self;
+          paths = [
+            pkgs.lighttpd
+            nodejs
+            nodeDependencies
+            python
+          ];
 
-						buildInputs = [ nodejs nodeDependencies ];
+          buildInputs = [pkgs.makeWrapper];
+          postBuild = ''
+            wrapProgram "$out/bin/node" \
+            	--prefix PATH : "$out/lib/node_modules/.bin" \
+            	--prefix NODE_PATH : "$out/lib/node_modules"
+          '';
 
-						SITE = "angestoepselt";
+          shellHook = ''
-						buildPhase = ''
+            echo ""
-							npm run build
+            echo "  To start editing content, run:"
-						'';
+            echo ""
+            echo "npm run build:styles"
+            echo "npm run dev:site"
+            echo ""
+            echo "  The site will be available under http://localhost:8080/ for"
+            echo "  local development and rebuilds automatically when content"
+            echo "  changes."
+            echo ""
+          '';
+        };
+      };
 
-						installPhase = ''
+      devShells.default = pkgs.mkShell {
-							mv dist $out
+        name = "angestoepselt-homepage-shell";
-						'';
+        packages = [packages.devEnv];
-					};
+      };
-
+    });
-					lighttpdConfig = pkgs.substituteAll {
-						src = ./sites/angestoepselt/httpd.conf;
-						inherit (packages) site;
-						inherit python;
-						mimetypes = "${pkgs.lighttpd}/share/lighttpd/doc/config/conf.d/mime.conf";
-						cgibin = pkgs.copyPathToStore ./cgi-bin;
-					};
-
-					container = pkgs.dockerTools.buildLayeredImage {
-						name = "angestoepselt-site";
-						tag = "latest";
-  					created = "now";
-
-						# See here for the documentation on this option:
-						# https://github.com/moby/moby/blob/master/image/spec/v1.2.md#image-json-field-descriptions
-						config = {
-							Env = [
-								# We need to provide these default variables because otherwise
-								# lighttpd doesn't even parse its configuration file:
-								"ZAMMAD_URL=https://ticket.z31.it"
-								"ZAMMAD_GROUP="
-							];
-							ExposedPorts = {
-								"80/tcp" = {};
-							};
-							# See here for the stdout redirection:
-							# https://redmine.lighttpd.net/boards/2/topics/8382
-							Cmd = [ (pkgs.writeShellScript "angestoepselt-site" ''
-								${pkgs.coreutils}/bin/mkdir -p /var/tmp
-								exec 3>&1
-								${pkgs.lighttpd}/bin/lighttpd -Df ${packages.lighttpdConfig}
-							'') ];
-							Healthcheck = {
-								Test = [
-									"CMD"
-									"${pkgs.curl}/bin/curl" "--fail" "localhost"
-								];
-								Interval = 30000000000;  # 30 seconds
-								Timeout = 10000000000;  # 10 seconds
-								Retries = 3;
-							};
-						};
-					};
-
-					# This package isn't actually the fully-built site, but rather a
-					# derivation that contains the relevant programs (with correctly set up
-					# environment) to develop and build the site. It can either be used with
-					# `nix develop` – see the repository's readme for details – or compiled
-					# with `nix build`. The latter will output a folder which contains node
-					# and npm binaries that can be used in an IDE.
-					devEnv = pkgs.symlinkJoin {
-						name = "devEnv";
-
-						buildInputs = [ pkgs.makeWrapper ];
-						paths = [
-							pkgs.lighttpd
-							nodejs
-							nodeDependencies
-							python
-						];
-
-						postBuild = ''
-							wrapProgram "$out/bin/node" \
-								--prefix PATH : "$out/lib/node_modules/.bin" \
-								--prefix NODE_PATH : "$out/lib/node_modules"
-						'';
-
-						shellHook = ''
-							export NODE_PATH=${nodeDependencies}/lib/node_modules
-							export PATH="${pkgs.lighttpd}/bin:${nodeDependencies}/bin:${nodejs}/bin:${pkgs.nodePackages.npm-check-updates}/bin:${python}/bin:$PATH"
-
-							echo ""
-							echo "  To start editing content, run:"
-							echo ""
-							echo "npm run build:styles"
-							echo "npm run dev:site"
-							echo ""
-							echo "  The site will be available under http://localhost:8080/ for"
-							echo "  local development and rebuilds automatically when content"
-							echo "  changes."
-							echo ""
-						'';
-					};
-
-					deployToProduction = pkgs.writeShellScript "deploy-to-production" ''
-						echo "Deploying ${packages.container} ..."
-						${pkgs.curl}/bin/curl 62.146.78.173:9337/hooks/angestoepselt_homepage
-					'';
-				};
-				defaultPackage = packages.angestoepseltSite;
-
-				devShell = packages.devEnv;
-			});
-		in (base // {
-			hydraJobs = rec {
-				inherit (base.packages.x86_64-linux) site;
-
-				container = let
-					pkgs = import nixpkgs { system = "x86_64-linux"; };
-					containerFile = base.packages.x86_64-linux.container;
-				in pkgs.runCommand "container" {} ''
-					mkdir -p $out/nix-support
-					ln -s ${containerFile} $out/angestoepselt-site.tar.gz
-					echo "file oci $out/angestoepselt-site.tar.gz" > $out/nix-support/hydra-build-products
-				'';
-			};
-		});
 }

nix/default.nix

@@ -1,8 +1,8 @@
-# This file has been generated by node2nix 1.9.0. Do not edit!
+# This file has been generated by node2nix 1.11.1. Do not edit!
 
 {pkgs ? import <nixpkgs> {
     inherit system;
-  }, system ? builtins.currentSystem, nodejs ? pkgs."nodejs-12_x"}:
+  }, system ? builtins.currentSystem, nodejs ? pkgs."nodejs-18_x"}:
 
 let
   nodeEnv = import ./node-env.nix {

nix/node-env.nix

@@ -98,7 +98,7 @@ let
       ''
       + (lib.concatMapStrings (dependency:
         ''
-          if [ ! -e "${dependency.name}" ]; then
+          if [ ! -e "${dependency.packageName}" ]; then
               ${composePackage dependency}
           fi
         ''
@@ -165,7 +165,11 @@ let
           if(process.argv[2] == "development") {
               replaceDependencies(packageObj.devDependencies);
           }
+          else {
+              packageObj.devDependencies = {};
+          }
           replaceDependencies(packageObj.optionalDependencies);
+          replaceDependencies(packageObj.peerDependencies);
 
           /* Write the fixed package.json file */
           fs.writeFileSync("package.json", JSON.stringify(packageObj, null, 2));
@@ -257,8 +261,8 @@ let
           var packageLock = JSON.parse(fs.readFileSync("./package-lock.json"));
 
           if(![1, 2].includes(packageLock.lockfileVersion)) {
-             process.stderr.write("Sorry, I only understand lock file versions 1 and 2!\n");
+            process.stderr.write("Sorry, I only understand lock file versions 1 and 2!\n");
-             process.exit(1);
+            process.exit(1);
           }
 
           if(packageLock.dependencies !== undefined) {
@@ -270,7 +274,7 @@ let
 
   # Reconstructs a package-lock file from the node_modules/ folder structure and package.json files with dummy sha1 hashes
   reconstructPackageLock = writeTextFile {
-    name = "addintegrityfields.js";
+    name = "reconstructpackagelock.js";
     text = ''
       var fs = require('fs');
       var path = require('path');
@@ -280,25 +284,43 @@ let
       var lockObj = {
           name: packageObj.name,
           version: packageObj.version,
-          lockfileVersion: 1,
+          lockfileVersion: 2,
           requires: true,
+          packages: {
+              "": {
+                  name: packageObj.name,
+                  version: packageObj.version,
+                  license: packageObj.license,
+                  bin: packageObj.bin,
+                  dependencies: packageObj.dependencies,
+                  engines: packageObj.engines,
+                  optionalDependencies: packageObj.optionalDependencies
+              }
+          },
           dependencies: {}
       };
 
-      function augmentPackageJSON(filePath, dependencies) {
+      function augmentPackageJSON(filePath, packages, dependencies) {
           var packageJSON = path.join(filePath, "package.json");
           if(fs.existsSync(packageJSON)) {
               var packageObj = JSON.parse(fs.readFileSync(packageJSON));
+              packages[filePath] = {
+                  version: packageObj.version,
+                  integrity: "sha1-000000000000000000000000000=",
+                  dependencies: packageObj.dependencies,
+                  engines: packageObj.engines,
+                  optionalDependencies: packageObj.optionalDependencies
+              };
               dependencies[packageObj.name] = {
                   version: packageObj.version,
                   integrity: "sha1-000000000000000000000000000=",
                   dependencies: {}
               };
-              processDependencies(path.join(filePath, "node_modules"), dependencies[packageObj.name].dependencies);
+              processDependencies(path.join(filePath, "node_modules"), packages, dependencies[packageObj.name].dependencies);
           }
       }
 
-      function processDependencies(dir, dependencies) {
+      function processDependencies(dir, packages, dependencies) {
           if(fs.existsSync(dir)) {
               var files = fs.readdirSync(dir);
 
@@ -314,23 +336,84 @@ let
                           pkgFiles.forEach(function(entry) {
                               if(stats.isDirectory()) {
                                   var pkgFilePath = path.join(filePath, entry);
-                                  augmentPackageJSON(pkgFilePath, dependencies);
+                                  augmentPackageJSON(pkgFilePath, packages, dependencies);
                               }
                           });
                       } else {
-                          augmentPackageJSON(filePath, dependencies);
+                          augmentPackageJSON(filePath, packages, dependencies);
                       }
                   }
               });
           }
       }
 
-      processDependencies("node_modules", lockObj.dependencies);
+      processDependencies("node_modules", lockObj.packages, lockObj.dependencies);
 
       fs.writeFileSync("package-lock.json", JSON.stringify(lockObj, null, 2));
     '';
   };
 
+  # Script that links bins defined in package.json to the node_modules bin directory
+  # NPM does not do this for top-level packages itself anymore as of v7
+  linkBinsScript = writeTextFile {
+    name = "linkbins.js";
+    text = ''
+      var fs = require('fs');
+      var path = require('path');
+
+      var packageObj = JSON.parse(fs.readFileSync("package.json"));
+
+      var nodeModules = Array(packageObj.name.split("/").length).fill("..").join(path.sep);
+
+      if(packageObj.bin !== undefined) {
+          fs.mkdirSync(path.join(nodeModules, ".bin"))
+
+          if(typeof packageObj.bin == "object") {
+              Object.keys(packageObj.bin).forEach(function(exe) {
+                  if(fs.existsSync(packageObj.bin[exe])) {
+                      console.log("linking bin '" + exe + "'");
+                      fs.symlinkSync(
+                          path.join("..", packageObj.name, packageObj.bin[exe]),
+                          path.join(nodeModules, ".bin", exe)
+                      );
+                  }
+                  else {
+                      console.log("skipping non-existent bin '" + exe + "'");
+                  }
+              })
+          }
+          else {
+              if(fs.existsSync(packageObj.bin)) {
+                  console.log("linking bin '" + packageObj.bin + "'");
+                  fs.symlinkSync(
+                      path.join("..", packageObj.name, packageObj.bin),
+                      path.join(nodeModules, ".bin", packageObj.name.split("/").pop())
+                  );
+              }
+              else {
+                  console.log("skipping non-existent bin '" + packageObj.bin + "'");
+              }
+          }
+      }
+      else if(packageObj.directories !== undefined && packageObj.directories.bin !== undefined) {
+          fs.mkdirSync(path.join(nodeModules, ".bin"))
+
+          fs.readdirSync(packageObj.directories.bin).forEach(function(exe) {
+              if(fs.existsSync(path.join(packageObj.directories.bin, exe))) {
+                  console.log("linking bin '" + exe + "'");
+                  fs.symlinkSync(
+                      path.join("..", packageObj.name, packageObj.directories.bin, exe),
+                      path.join(nodeModules, ".bin", exe)
+                  );
+              }
+              else {
+                  console.log("skipping non-existent bin '" + exe + "'");
+              }
+          })
+      }
+    '';
+  };
+
   prepareAndInvokeNPM = {packageName, bypassCache, reconstructLock, npmFlags, production}:
     let
       forceOfflineFlag = if bypassCache then "--offline" else "--registry http://www.example.com";
@@ -377,20 +460,25 @@ let
 
         npm ${forceOfflineFlag} --nodedir=${nodeSources} ${npmFlags} ${lib.optionalString production "--production"} rebuild
 
+        runHook postRebuild
+
         if [ "''${dontNpmInstall-}" != "1" ]
         then
             # NPM tries to download packages even when they already exist if npm-shrinkwrap is used.
             rm -f npm-shrinkwrap.json
 
-            npm ${forceOfflineFlag} --nodedir=${nodeSources} ${npmFlags} ${lib.optionalString production "--production"} install
+            npm ${forceOfflineFlag} --nodedir=${nodeSources} --no-bin-links --ignore-scripts ${npmFlags} ${lib.optionalString production "--production"} install
         fi
+
+        # Link executables defined in package.json
+        node ${linkBinsScript}
     '';
 
   # Builds and composes an NPM package including all its dependencies
   buildNodePackage =
     { name
     , packageName
-    , version
+    , version ? null
     , dependencies ? []
     , buildInputs ? []
     , production ? true
@@ -409,7 +497,7 @@ let
       extraArgs = removeAttrs args [ "name" "dependencies" "buildInputs" "dontStrip" "dontNpmInstall" "preRebuild" "unpackPhase" "buildPhase" "meta" ];
     in
     stdenv.mkDerivation ({
-      name = "${name}-${version}";
+      name = "${name}${if version == null then "" else "-${version}"}";
       buildInputs = [ tarWrapper python nodejs ]
         ++ lib.optional (stdenv.isLinux) utillinux
         ++ lib.optional (stdenv.isDarwin) libtool
@@ -441,6 +529,17 @@ let
         if [ -d "$out/lib/node_modules/.bin" ]
         then
             ln -s $out/lib/node_modules/.bin $out/bin
+
+            # Fixup all executables
+            ls $out/bin/* | while read i
+            do
+                file="$(readlink -f "$i")"
+                chmod u+rwx "$file"
+                if isScript "$file"
+                then
+                    sed -i 's/\r$//' "$file"  # convert crlf to lf
+                fi
+            done
         fi
 
         # Create symlinks to the deployed manual page folders, if applicable
@@ -471,7 +570,7 @@ let
   buildNodeDependencies =
     { name
     , packageName
-    , version
+    , version ? null
     , src
     , dependencies ? []
     , buildInputs ? []
@@ -489,7 +588,7 @@ let
       extraArgs = removeAttrs args [ "name" "dependencies" "buildInputs" ];
     in
       stdenv.mkDerivation ({
-        name = "node-dependencies-${name}-${version}";
+        name = "node-dependencies-${name}${if version == null then "" else "-${version}"}";
 
         buildInputs = [ tarWrapper python nodejs ]
           ++ lib.optional (stdenv.isLinux) utillinux
@@ -519,6 +618,7 @@ let
             if [ -f ${src}/package-lock.json ]
             then
                 cp ${src}/package-lock.json .
+                chmod 644 package-lock.json
             fi
           ''}
 
@@ -541,7 +641,7 @@ let
   buildNodeShell =
     { name
     , packageName
-    , version
+    , version ? null
     , src
     , dependencies ? []
     , buildInputs ? []
@@ -557,9 +657,10 @@ let
 
     let
       nodeDependencies = buildNodeDependencies args;
+      extraArgs = removeAttrs args [ "name" "dependencies" "buildInputs" "dontStrip" "dontNpmInstall" "unpackPhase" "buildPhase" ];
     in
-    stdenv.mkDerivation {
+    stdenv.mkDerivation ({
-      name = "node-shell-${name}-${version}";
+      name = "node-shell-${name}${if version == null then "" else "-${version}"}";
 
       buildInputs = [ python nodejs ] ++ lib.optional (stdenv.isLinux) utillinux ++ buildInputs;
       buildCommand = ''
@@ -578,7 +679,7 @@ let
         export NODE_PATH=${nodeDependencies}/lib/node_modules
         export PATH="${nodeDependencies}/bin:$PATH"
       '';
-    };
+    } // extraArgs);
 in
 {
   buildNodeSourceDist = lib.makeOverridable buildNodeSourceDist;

package.json

@@ -11,16 +11,17 @@
 	},
 	"license": "MIT",
 	"devDependencies": {
-		"@11ty/eleventy": "^1.0.0",
+		"@11ty/eleventy": "^2.0.1",
-		"@11ty/eleventy-img": "^2.0.0",
+		"@11ty/eleventy-img": "^3.1.0",
-		"@11ty/eleventy-navigation": "^0.3.2",
+		"@11ty/eleventy-navigation": "^0.3.5",
-		"@11ty/eleventy-plugin-rss": "^1.1.2",
+		"@11ty/eleventy-plugin-rss": "^1.2.0",
-		"@11ty/eleventy-plugin-syntaxhighlight": "^4.0.0",
+		"@11ty/eleventy-plugin-syntaxhighlight": "^5.0.0",
-		"luxon": "^2.3.1",
+		"luxon": "^3.3.0",
-		"markdown-it": "^12.3.2",
+		"markdown-it": "^13.0.1",
-		"markdown-it-anchor": "^8.4.1",
+		"markdown-it-anchor": "^8.6.7",
-		"markdown-it-attrs": "^4.1.3",
+		"markdown-it-attrs": "^4.1.6",
-		"prettier": "^2.6.0",
+		"node-gyp-build": "^4.6.0",
-		"sass": "^1.49.9"
+		"prettier": "^2.8.8",
+		"sass": "^1.62.1"
 	}
 }