.gitignore

@@ -1,2 +1,3 @@
-/server/target
+/packages/server/target
 /result
+.dream2nix

flake.nix

@@ -2,7 +2,7 @@
   description = "tlater.net web server";
 
   inputs = {
-    nixpkgs.url = "github:nixos/nixpkgs/nixos-23.05";
+    nixpkgs.url = "github:nixos/nixpkgs/nixos-23.11";
     dream2nix.url = "github:nix-community/dream2nix";
 
     fenix = {
@@ -16,21 +16,28 @@
     nixpkgs,
     dream2nix,
     fenix,
-  } @ flake-inputs: let
+  }: let
     # At the moment, we only deploy to x86_64-linux. Update when we
     # care about another platform.
     system = "x86_64-linux";
-    flakeOutputs = nixpkgs.lib.callPackageWith flake-inputs (import ./nix/packages.nix) {inherit system;};
+    pkgs = nixpkgs.legacyPackages.${system};
+    fenixPkgs = fenix.packages.${system};
+    ownPkgs = self.packages.${system};
   in {
-    packages.${system} = {
+    packages.${system} = dream2nix.lib.importPackages {
-      server = flakeOutputs.packages.${system}.tlaternet-webserver;
+      projectRoot = ./.;
-      templates = flakeOutputs.packages.${system}.tlaternet;
+      projectRootFile = "flake.nix";
+      packagesDir = ./packages;
+      packageSets = {
+        nixpkgs = pkgs;
+        fenix = fenixPkgs;
+      };
     };
 
     apps.${system} = {
       default = let
-        inherit (self.packages.${system}) server templates;
+        inherit (ownPkgs) server templates;
-        inherit (nixpkgs.legacyPackages.${system}) writeShellScript;
+        inherit (pkgs) writeShellScript;
       in {
         type = "app";
         program = builtins.toString (writeShellScript "tlaternet-webserver" ''
@@ -39,11 +46,7 @@
       };
 
       update = let
-        update-script = nixpkgs.legacyPackages.${system}.callPackage ./nix/update.nix {
+        update-script = pkgs.callPackage ./nix/update.nix {inherit self;};
-          cargo = flakeOutputs.rust-toolchain.cargo;
-          npm = nixpkgs.legacyPackages.${system}.nodePackages_latest.npm;
-          npm-check-updates = self.packages.${system}.templates.dependencies.npm-check-updates;
-        };
       in {
         type = "app";
         program = "${update-script}/bin/update";
@@ -53,17 +56,9 @@
     nixosModules.default = import ./nix/module.nix {inherit self system;};
 
     devShells.${system} = {
-      templates = flakeOutputs.devShells.${system}.tlaternet.overrideAttrs (old: {
+      server = pkgs.mkShell {
-        buildInputs = with nixpkgs.legacyPackages.${system};
-          [
-            yj
-          ]
-          ++ old.buildInputs;
-      });
-
-      server = nixpkgs.legacyPackages.${system}.mkShell {
         packages = [
-          (flakeOutputs.rust-toolchain.withComponents [
+          (fenixPkgs.stable.withComponents [
             "rustc"
             "cargo"
             "rustfmt"
@@ -73,14 +68,13 @@
             "rust-src"
             "rust-analysis"
           ])
-          fenix.packages.${system}.rust-analyzer
+          fenixPkgs.rust-analyzer
         ];
       };
     };
 
     checks.${system} = import ./nix/checks {
-      inherit self system;
+      inherit self system pkgs;
-      pkgs = nixpkgs.legacyPackages.${system};
     };
   };
 }

nix/packages.nix

@@ -1,57 +0,0 @@
-{
-  self,
-  nixpkgs,
-  dream2nix,
-  fenix,
-  system,
-  ...
-}: let
-  inherit (nixpkgs.legacyPackages.${system}) runCommandLocal yj;
-
-  rust-toolchain = fenix.packages.${system}.stable;
-in
-  dream2nix.lib.makeFlakeOutputs {
-    systems = [system];
-    config.projectRoot = self;
-    projects = ../projects.toml;
-
-    source = runCommandLocal "source" {nativeBuildInputs = [yj];} ''
-      cp -r ${self} $out/
-      chmod -R u+w $out
-      yj < $out/templates/package.yaml > $out/templates/package.json
-    '';
-
-    packageOverrides = {
-      tlaternet-webserver.set-toolchain.overrideRustToolchain = old: {
-        cargo = rust-toolchain.minimalToolchain;
-        rustc = rust-toolchain.minimalToolchain;
-      };
-
-      tlaternet-webserver-deps.set-toolchain.overrideRustToolchain = old: {
-        cargo = rust-toolchain.minimalToolchain;
-        rustc = rust-toolchain.minimalToolchain;
-      };
-
-      tlaternet = {
-        install-only-dist = {
-          installPhase = ''
-            cp -r $nodeModules/tlaternet/dist $out
-          '';
-        };
-      };
-
-      sharp = {
-        add-libvips = {
-          buildInputs = old:
-            old
-            ++ (with nixpkgs.legacyPackages.${system}; [
-              vips
-              pkg-config
-            ]);
-        };
-      };
-    };
-  }
-  // {
-    inherit rust-toolchain;
-  }

nix/scripts/update.sh

@@ -10,7 +10,7 @@ echo 'Note: Update the flake inputs with `nix flake update --commit-lockfile *fi
 cd "$(git rev-parse --show-toplevel)" || exit
 
 # Update cargo deps
-cd server || exit
+cd packages/server || exit
 cargo update
 
 if ! git diff --quiet Cargo.lock Cargo.toml; then

nix/update.nix

@@ -1,12 +1,23 @@
 {
+  lib,
+  self,
+  system,
   writeShellApplication,
-  cargo,
   git,
   nix,
-  npm,
-  npm-check-updates,
   yq-go,
-}:
+}: let
+  selfPackages = self.packages.${system};
+  inherit (selfPackages.server.config.deps) cargo;
+  inherit (selfPackages.templates.config.deps) npm;
+
+  npm-check-updates =
+    (builtins.elemAt (lib.attrValues
+      selfPackages.templates.config.nodejs-granular-v3.deps.npm-check-updates)
+    0)
+    .package-func
+    .result;
+in
   writeShellApplication {
     name = "update";
     runtimeInputs = [cargo git nix npm npm-check-updates yq-go];

packages/server/default.nix

@@ -0,0 +1,17 @@
+{dream2nix, ...}: {
+  imports = [
+    dream2nix.modules.dream2nix.rust-cargo-lock
+    dream2nix.modules.dream2nix.rust-crane
+  ];
+
+  deps = {fenix, ...}: {
+    deps.cargo = fenix.stable.minimalToolchain;
+  };
+
+  name = "tlaternet-webserver";
+  version = "0.1.0";
+
+  mkDerivation = {
+    src = ./.;
+  };
+}

packages/templates/default.nix

@@ -0,0 +1,44 @@
+{
+  dream2nix,
+  config,
+  lib,
+  ...
+}: {
+  imports = [
+    dream2nix.modules.dream2nix.nodejs-package-json-v3
+    dream2nix.modules.dream2nix.nodejs-granular-v3
+  ];
+
+  deps = {nixpkgs, ...}: {
+    inherit (nixpkgs) pkg-config runCommandLocal rsync vips yj;
+  };
+
+  name = "tlaternet-templates";
+  version = "0.1.0";
+
+  mkDerivation = {
+    src = config.deps.runCommandLocal "source" {nativeBuildInputs = [config.deps.yj];} ''
+      cp -r ${./.} $out/
+      chmod -R u+w $out
+      yj < $out/package.yaml > $out/package.json
+    '';
+
+    # The default phase (which is hidden in `preInstallPhases`) will
+    # copy the full node_modules directory to the output, and symlink
+    # executables and whatnot.
+    #
+    # Since this package's output is static HTML/JS, we do not want
+    # that.
+    preInstallPhases = lib.mkForce [];
+    installPhase = ''
+      cp -r dist $out
+    '';
+  };
+
+  nodejs-granular-v3.deps = {
+    sharp."0.28.3".mkDerivation.buildInputs = with config.deps; [
+      vips
+      pkg-config
+    ];
+  };
+}

projects.toml

@@ -1,31 +0,0 @@
-# projects.toml file describing inputs for dream2nix
-#
-# To re-generate this file, run:
-#   nix run .#detect-projects $source
-# ... where `$source` points to the source of your project.
-#
-# If the local flake is unavailable, alternatively execute the app from the
-# upstream dream2nix flake:
-#   nix run github:nix-community/dream2nix#detect-projects $source
-[tlaternet]
-name = "tlaternet"
-relPath = "templates"
-subsystem = "nodejs"
-translator = "package-lock"
-translators = [ "package-lock", "package-json",]
-
-[tlaternet.subsystemInfo]
-
-[tlaternet-webserver]
-name = "tlaternet-webserver"
-relPath = "server"
-subsystem = "rust"
-translator = "cargo-lock"
-translators = [ "cargo-lock", "cargo-toml",]
-
-[tlaternet-webserver.subsystemInfo]
-workspaceMembers = []
-[[tlaternet-webserver.subsystemInfo.crates]]
-name = "tlaternet-webserver"
-relPath = "server"
-version = "0.1.0"

templates/.envrc

@@ -1,10 +0,0 @@
-nix_direnv_watch_file package-lock.json
-use flake ..#templates
-
-# Update package.json
-if ! cmp --silent .checksum-package.yaml <(sha256sum package.yaml); then
-    echo "Updating package.json"
-    unlink ./package.json
-    yj < ./package.yaml > ./package.json
-    sha256sum package.yaml > .checksum-package.yaml
-fi