From 2225d6a02c56613f71ea61dccb55acd73730e421 Mon Sep 17 00:00:00 2001
From: Kiana Sheibani <kiana.a.sheibani@gmail.com>
Date: Wed, 26 Nov 2025 16:53:43 -0500
Subject: [PATCH] refactor: fix `shell.nix` interface

---
 bash/script/nixpkgs/package.nix            |  5 +++--
 fish/script/nixpkgs/package.nix            |  5 +++--
 python/pyproject/nixpkgs/basic/flake.nix   |  2 +-
 python/pyproject/nixpkgs/basic/package.nix |  3 ++-
 python/pyproject/nixpkgs/basic/shell.nix   | 11 ++++++-----
 python/pyproject/nixpkgs/cli/flake.nix     |  2 +-
 python/pyproject/nixpkgs/cli/package.nix   |  3 ++-
 python/pyproject/nixpkgs/cli/shell.nix     | 11 ++++++-----
 8 files changed, 24 insertions(+), 18 deletions(-)

diff --git a/bash/script/nixpkgs/package.nix b/bash/script/nixpkgs/package.nix
index 458a1ce..8c36ba4 100644
--- a/bash/script/nixpkgs/package.nix
+++ b/bash/script/nixpkgs/package.nix
@@ -1,5 +1,6 @@
-{ stdenvNoCC
-, bash
+{
+  stdenvNoCC,
+  bash,
 }:
 
 stdenvNoCC.mkDerivation {
diff --git a/fish/script/nixpkgs/package.nix b/fish/script/nixpkgs/package.nix
index 6e6dcde..a15fe80 100644
--- a/fish/script/nixpkgs/package.nix
+++ b/fish/script/nixpkgs/package.nix
@@ -1,5 +1,6 @@
-{ stdenvNoCC
-, fish
+{
+  stdenvNoCC,
+  fish,
 }:
 
 stdenvNoCC.mkDerivation {
diff --git a/python/pyproject/nixpkgs/basic/flake.nix b/python/pyproject/nixpkgs/basic/flake.nix
index 0c2dc0d..9b0c8a8 100644
--- a/python/pyproject/nixpkgs/basic/flake.nix
+++ b/python/pyproject/nixpkgs/basic/flake.nix
@@ -17,7 +17,7 @@
       devShells = eachSystem (system:
         let pkgs = nixpkgs.legacyPackages.${system};
         in {
-          default = pkgs.callPackage ./shell.nix {};
+          default = import ./shell.nix { inherit pkgs; };
         });
     };
 }
diff --git a/python/pyproject/nixpkgs/basic/package.nix b/python/pyproject/nixpkgs/basic/package.nix
index 9919aa3..af627a8 100644
--- a/python/pyproject/nixpkgs/basic/package.nix
+++ b/python/pyproject/nixpkgs/basic/package.nix
@@ -1,4 +1,5 @@
-{ python3
+{
+  python3,
 }:
 
 python3.pkgs.buildPythonPackage {
diff --git a/python/pyproject/nixpkgs/basic/shell.nix b/python/pyproject/nixpkgs/basic/shell.nix
index 4a7e9e5..dca9c0a 100644
--- a/python/pyproject/nixpkgs/basic/shell.nix
+++ b/python/pyproject/nixpkgs/basic/shell.nix
@@ -1,8 +1,9 @@
-{ mkShell
-, python3
-}:
-
-mkShell {
+{ pkgs ? import <nixpkgs> {} }:
+let inherit (pkgs)
+  mkShellNoCC
+  python3
+;
+in mkShellNoCC {
   inputsFrom = [ python3.buildEnv.env ];
   packages = [ python3.pkgs.python-lsp-server ];
 }
diff --git a/python/pyproject/nixpkgs/cli/flake.nix b/python/pyproject/nixpkgs/cli/flake.nix
index 0c2dc0d..9b0c8a8 100644
--- a/python/pyproject/nixpkgs/cli/flake.nix
+++ b/python/pyproject/nixpkgs/cli/flake.nix
@@ -17,7 +17,7 @@
       devShells = eachSystem (system:
         let pkgs = nixpkgs.legacyPackages.${system};
         in {
-          default = pkgs.callPackage ./shell.nix {};
+          default = import ./shell.nix { inherit pkgs; };
         });
     };
 }
diff --git a/python/pyproject/nixpkgs/cli/package.nix b/python/pyproject/nixpkgs/cli/package.nix
index ce28631..54c02ad 100644
--- a/python/pyproject/nixpkgs/cli/package.nix
+++ b/python/pyproject/nixpkgs/cli/package.nix
@@ -1,4 +1,5 @@
-{ python3
+{
+  python3,
 }:
 
 python3.pkgs.buildPythonApplication {
diff --git a/python/pyproject/nixpkgs/cli/shell.nix b/python/pyproject/nixpkgs/cli/shell.nix
index 4a7e9e5..dca9c0a 100644
--- a/python/pyproject/nixpkgs/cli/shell.nix
+++ b/python/pyproject/nixpkgs/cli/shell.nix
@@ -1,8 +1,9 @@
-{ mkShell
-, python3
-}:
-
-mkShell {
+{ pkgs ? import <nixpkgs> {} }:
+let inherit (pkgs)
+  mkShellNoCC
+  python3
+;
+in mkShellNoCC {
   inputsFrom = [ python3.buildEnv.env ];
   packages = [ python3.pkgs.python-lsp-server ];
 }