refactor: fix shell.nix interface

This commit is contained in:
Kiana Sheibani 2025-11-26 16:53:43 -05:00
parent 1e7ccb7acf
commit 2225d6a02c
Signed by: toki
GPG key ID: 6CB106C25E86A9F7
8 changed files with 24 additions and 18 deletions

View file

@ -1,5 +1,6 @@
{ stdenvNoCC {
, bash stdenvNoCC,
bash,
}: }:
stdenvNoCC.mkDerivation { stdenvNoCC.mkDerivation {

View file

@ -1,5 +1,6 @@
{ stdenvNoCC {
, fish stdenvNoCC,
fish,
}: }:
stdenvNoCC.mkDerivation { stdenvNoCC.mkDerivation {

View file

@ -17,7 +17,7 @@
devShells = eachSystem (system: devShells = eachSystem (system:
let pkgs = nixpkgs.legacyPackages.${system}; let pkgs = nixpkgs.legacyPackages.${system};
in { in {
default = pkgs.callPackage ./shell.nix {}; default = import ./shell.nix { inherit pkgs; };
}); });
}; };
} }

View file

@ -1,4 +1,5 @@
{ python3 {
python3,
}: }:
python3.pkgs.buildPythonPackage { python3.pkgs.buildPythonPackage {

View file

@ -1,8 +1,9 @@
{ mkShell { pkgs ? import <nixpkgs> {} }:
, python3 let inherit (pkgs)
}: mkShellNoCC
python3
mkShell { ;
in mkShellNoCC {
inputsFrom = [ python3.buildEnv.env ]; inputsFrom = [ python3.buildEnv.env ];
packages = [ python3.pkgs.python-lsp-server ]; packages = [ python3.pkgs.python-lsp-server ];
} }

View file

@ -17,7 +17,7 @@
devShells = eachSystem (system: devShells = eachSystem (system:
let pkgs = nixpkgs.legacyPackages.${system}; let pkgs = nixpkgs.legacyPackages.${system};
in { in {
default = pkgs.callPackage ./shell.nix {}; default = import ./shell.nix { inherit pkgs; };
}); });
}; };
} }

View file

@ -1,4 +1,5 @@
{ python3 {
python3,
}: }:
python3.pkgs.buildPythonApplication { python3.pkgs.buildPythonApplication {

View file

@ -1,8 +1,9 @@
{ mkShell { pkgs ? import <nixpkgs> {} }:
, python3 let inherit (pkgs)
}: mkShellNoCC
python3
mkShell { ;
in mkShellNoCC {
inputsFrom = [ python3.buildEnv.env ]; inputsFrom = [ python3.buildEnv.env ];
packages = [ python3.pkgs.python-lsp-server ]; packages = [ python3.pkgs.python-lsp-server ];
} }