fixes and docs

packages/cockpit-podman/default.nix

@@ -1,55 +1,55 @@
 {
   fetchFromGitHub,
   lib,
+  namespace,
   nodejs,
   stdenv,
 }:
+let
+  inherit (lib.trivial) importJSON;
+  inherit (lib.${namespace}) mkAllSources selectVariant;
 
-stdenv.mkDerivation (finalAttrs: {
+  versionSpec = importJSON ./version.json;
+  selected = selectVariant versionSpec null null;
+  sources = mkAllSources selected;
+  inherit (selected.variables) version;
+in
+stdenv.mkDerivation {
   pname = "cockpit-podman";
-  version = "123";
+  inherit version;
 
-  src = fetchFromGitHub {
-    owner = "cockpit-project";
-    repo = "cockpit-podman";
-    tag = finalAttrs.version;
-    hash = "sha256-N5nhJU9XUsxLWq3mk3bSyorHEM4zSLHt9I+zkdgU2Vk=";
-  };
+  src = sources.src;
 
   # Pre-vendored node_modules from cockpit-project/node-cache, pinned via the
   # node_modules submodule reference in the source tree.
-  nodeModules = fetchFromGitHub {
-    owner = "cockpit-project";
-    repo = "node-cache";
-    rev = "e39ef3621b5aefa5bf1c2de7e66a5918fcef620c";
-    hash = "sha256-+yhHsGEN1IqIxPY7vQysp1ZczcHzXRoNIVN3DyVgwB8=";
-  };
+  inherit (sources) nodeModules;
 
-  # pkg/lib is checked out from the main cockpit repo at the pinned commit
-  # referenced in the Makefile (COCKPIT_REPO_COMMIT).
-  cockpitLib = fetchFromGitHub {
-    owner = "cockpit-project";
-    repo = "cockpit";
-    rev = "5fb84eaefbc5ff4433a21bc452270af8d09e1ab7";
-    hash = "sha256-FR6TIKQ+3GuDMOMEivDxEx6E/SVIAXh9Cg36JJ694Wc=";
-  };
+  # pkg/lib checked out from the main cockpit repo at the commit pinned in
+  # the Makefile (COCKPIT_REPO_COMMIT).
+  inherit (sources) cockpitLib;
 
   nativeBuildInputs = [ nodejs ];
 
-  # cockpit-podman uses passthru.cockpitPath for the NixOS cockpit module to
-  # add runtime dependencies to the cockpit service's PATH.
+  # passthru.cockpitPath is used by the NixOS cockpit module to add runtime
+  # dependencies to the cockpit service's PATH.
   passthru.cockpitPath = [ ];
 
   configurePhase = ''
     runHook preConfigure
 
-    # Wire up the vendored node_modules
-    cp -r ${finalAttrs.nodeModules} node_modules
+    # Replace the empty git submodule placeholder with the real vendored modules.
+    # Use dotglob so hidden entries (.bin, .package-lock.json, etc.) are included.
+    rm -rf node_modules
+    mkdir node_modules
+    (shopt -s dotglob; cp -r $nodeModules/* node_modules/)
     chmod -R u+w node_modules
 
-    # Wire up pkg/lib from the pinned cockpit repo
+    # Node needs package-lock.json at the project root to resolve modules.
+    cp node_modules/.package-lock.json package-lock.json
+
+    # Wire up pkg/lib from the pinned cockpit repo.
     mkdir -p pkg
-    cp -r ${finalAttrs.cockpitLib}/pkg/lib pkg/lib
+    cp -r $cockpitLib/pkg/lib pkg/lib
     chmod -R u+w pkg
 
     runHook postConfigure
@@ -75,9 +75,9 @@ stdenv.mkDerivation (finalAttrs: {
   meta = {
     description = "Cockpit UI for Podman containers";
     homepage = "https://github.com/cockpit-project/cockpit-podman";
-    changelog = "https://github.com/cockpit-project/cockpit-podman/releases/tag/${finalAttrs.version}";
+    changelog = "https://github.com/cockpit-project/cockpit-podman/releases/tag/${version}";
     license = lib.licenses.lgpl21Plus;
     platforms = lib.platforms.linux;
     maintainers = [ ];
   };
-})
+}