Fixups

src/expression.rs

@@ -40,7 +40,7 @@ fn fetch_block(fetcher: &Fetcher) -> (&'static str, &'static str) {
             "fetchFromGitHub",
             "  @doc:fetcher@src = fetchFromGitHub {
     owner = \"@owner@\";
-    repo = finalAttrs.pname;
+    repo = \"@pname@\";
     rev = @rev@;
     sha256 = \"@src_sha@\";
   };",
@@ -49,7 +49,7 @@ fn fetch_block(fetcher: &Fetcher) -> (&'static str, &'static str) {
             "fetchFromGitLab",
             "  @doc:fetcher@src = fetchFromGitLab {
     owner = \"@owner@\";
-    repo = finalAttrs.pname;
+    repo = \"@pname@\";
     rev = @rev@;
     sha256 = \"@src_sha@\";
   };",
@@ -59,7 +59,7 @@ fn fetch_block(fetcher: &Fetcher) -> (&'static str, &'static str) {
             "  @doc:fetcher@src = fetchFromGitea {
     domain = \"@domain@\";
     owner = \"@owner@\";
-    repo = finalAttrs.pname;
+    repo = \"@pname@\";
     rev = @rev@;
     sha256 = \"@src_sha@\";
   };",
@@ -80,8 +80,9 @@ fn fetch_block(fetcher: &Fetcher) -> (&'static str, &'static str) {
         ),
         Fetcher::pypi => (
             "fetchPypi",
-            "  @doc:fetcher@src = fetchPypi {
-    inherit (finalAttrs) pname version;
+            "  @doc:fetcherPypi@src = fetchPypi {
+    pname = \"@pname@\";
+    inherit (finalAttrs) version;
     sha256 = \"@src_sha@\";
   };",
         ),
@@ -160,7 +161,8 @@ fn build_inputs(info: &ExpressionInfo) -> String {
   ];
 
   pnpmDeps = fetchPnpmDeps {
-    inherit (finalAttrs) pname version src;
+    pname = \"@pname@\";
+    inherit (finalAttrs) version src;
     fetcherVersion = 3;
     hash = \"@pnpm_deps_hash@\";
   };".to_owned()

src/types/mod.rs

@@ -37,6 +37,10 @@ lazy_static! {
             "fetcher",
             "https://nixos.org/nixpkgs/manual/#chap-pkgs-fetchers\n  ",
         );
+        m.insert(
+            "fetcherPypi",
+            "https://nixos.org/nixpkgs/manual/#chap-pkgs-fetchers\n  # NOTE: fetchPypi is discouraged in nixpkgs; prefer fetching from the original source (GitHub, GitLab, etc.)\n  ",
+        );
         m.insert("meta", "https://nixos.org/nixpkgs/manual/#chap-meta\n  ");
         // Template-specific documentation
         m.insert(

tests/integration_tests.rs

@@ -602,7 +602,8 @@ fn test_dotnet_template_basic() {
     assert!(stdout.contains("buildDotnetModule (finalAttrs: {"));
     assert!(stdout.contains("projectFile = \"CHANGE\";"));
     assert!(stdout.contains("nugetDeps = ./deps.json;"));
-    assert!(stdout.contains("finalAttrs.pname"));
+    // pname should be a string literal, only version uses finalAttrs
+    assert!(stdout.contains("repo = \"example\";"));
     assert!(stdout.contains("finalAttrs.version"));
 
     // Verify proper spacing (blank lines between sections)

tests/snapshots/integration_tests__dotnet_basic_template.snap

@@ -13,7 +13,7 @@ buildDotnetModule (finalAttrs: {
 
   src = fetchFromGitHub {
     owner = "CHANGE";
-    repo = finalAttrs.pname;
+    repo = "example";
     rev = finalAttrs.version;
     sha256 = "0000000000000000000000000000000000000000000000000000";
   };

tests/snapshots/integration_tests__npm_basic_template.snap

@@ -1,6 +1,5 @@
 ---
 source: tests/integration_tests.rs
-assertion_line: 554
 expression: stdout
 ---
 { lib
@@ -14,7 +13,7 @@ buildNpmPackage (finalAttrs: {
 
   src = fetchFromGitHub {
     owner = "CHANGE";
-    repo = finalAttrs.pname;
+    repo = "example";
     rev = finalAttrs.version;
     sha256 = "0000000000000000000000000000000000000000000000000000";
   };

tests/snapshots/integration_tests__pnpm_basic_template.snap

@@ -1,6 +1,5 @@
 ---
 source: tests/integration_tests.rs
-assertion_line: 584
 expression: stdout
 ---
 { lib
@@ -18,7 +17,7 @@ stdenv.mkDerivation (finalAttrs: {
 
   src = fetchFromGitHub {
     owner = "CHANGE";
-    repo = finalAttrs.pname;
+    repo = "example";
     rev = finalAttrs.version;
     sha256 = "0000000000000000000000000000000000000000000000000000";
   };
@@ -30,7 +29,8 @@ stdenv.mkDerivation (finalAttrs: {
   ];
 
   pnpmDeps = fetchPnpmDeps {
-    inherit (finalAttrs) pname version src;
+    pname = "example";
+    inherit (finalAttrs) version src;
     fetcherVersion = 3;
     hash = "sha256-AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA=";
   };

tests/snapshots/integration_tests__python_basic_template.snap

@@ -1,6 +1,5 @@
 ---
 source: tests/integration_tests.rs
-assertion_line: 32
 expression: stdout
 ---
 { lib
@@ -14,7 +13,8 @@ buildPythonPackage (finalAttrs: {
   format = "setuptools";
 
   src = fetchPypi {
-    inherit (finalAttrs) pname version;
+    pname = "requests";
+    inherit (finalAttrs) version;
     sha256 = "0000000000000000000000000000000000000000000000000000";
   };
 

tests/snapshots/integration_tests__python_github_override_package.snap

@@ -1,7 +1,6 @@
 ---
 source: tests/integration_tests.rs
-assertion_line: 199
-expression: package_nix
+expression: stdout
 ---
 { lib
 , buildPythonPackage
@@ -15,7 +14,7 @@ buildPythonPackage (finalAttrs: {
 
   src = fetchFromGitHub {
     owner = "CHANGE";
-    repo = finalAttrs.pname;
+    repo = "requests";
     rev = finalAttrs.version;
     sha256 = "0000000000000000000000000000000000000000000000000000";
   };

tests/snapshots/integration_tests__python_pypi_explicit_package.snap

@@ -1,7 +1,6 @@
 ---
 source: tests/integration_tests.rs
-assertion_line: 139
-expression: package_nix
+expression: stdout
 ---
 { lib
 , buildPythonPackage
@@ -14,7 +13,8 @@ buildPythonPackage (finalAttrs: {
   format = "setuptools";
 
   src = fetchPypi {
-    inherit (finalAttrs) pname version;
+    pname = "requests";
+    inherit (finalAttrs) version;
     sha256 = "0000000000000000000000000000000000000000000000000000";
   };