Merge pull request #705 from Rexcrazy804/fix-nix-shell

fix(nix): fix shell.nix for non flake `nix-shell` invocation
This commit is contained in:
Lysec
2025-11-10 19:37:27 +01:00
committed by GitHub
3 changed files with 33 additions and 32 deletions
+1 -1
View File
@@ -42,7 +42,7 @@
system: let
pkgs = nixpkgs.legacyPackages.${system};
in {
default = pkgs.callPackage ./shell.nix {};
default = pkgs.callPackage ./nix/shell.nix {};
}
);
+31
View File
@@ -0,0 +1,31 @@
{
alejandra,
statix,
deadnix,
shfmt,
shellcheck,
jsonfmt,
lefthook,
kdePackages,
mkShellNoCC,
}:
mkShellNoCC {
#it's faster than mkDerivation / mkShell
packages = [
# nix
alejandra # formatter
statix # linter
deadnix # linter
# shell
shfmt # formatter
shellcheck # linter
# json
jsonfmt # formatter
# CoC
lefthook # githooks
kdePackages.qtdeclarative # qmlfmt, qmllint, qmlls and etc; Qt6
];
}
+1 -31
View File
@@ -1,31 +1 @@
{
alejandra,
statix,
deadnix,
shfmt,
shellcheck,
jsonfmt,
lefthook,
kdePackages,
mkShellNoCC,
}:
mkShellNoCC {
#it's faster than mkDerivation / mkShell
packages = [
# nix
alejandra # formatter
statix # linter
deadnix # linter
# shell
shfmt # formatter
shellcheck # linter
# json
jsonfmt # formatter
# CoC
lefthook # githooks
kdePackages.qtdeclarative # qmlfmt, qmllint, qmlls and etc; Qt6
];
}
(import <nixpkgs> {}).callPackage ./nix/shell.nix {}