switch from alejandra -> nixpkgs-fmt
alejandra has someone questionable choices for formatting that no one would apply to there code if they would format manually. nixpkgs-fmt seems to produce more readable results.
This commit is contained in:
@@ -1,11 +1,11 @@
|
||||
{
|
||||
pkgs ? import <nixpkgs> {},
|
||||
|
||||
lib ? pkgs.lib,
|
||||
python3 ? pkgs.python3,
|
||||
ruff ? pkgs.ruff,
|
||||
runCommand ? pkgs.runCommand,
|
||||
}: let
|
||||
{ pkgs ? import <nixpkgs> { }
|
||||
, lib ? pkgs.lib
|
||||
, python3 ? pkgs.python3
|
||||
, ruff ? pkgs.ruff
|
||||
, runCommand ? pkgs.runCommand
|
||||
,
|
||||
}:
|
||||
let
|
||||
pyproject = builtins.fromTOML (builtins.readFile ./pyproject.toml);
|
||||
name = pyproject.project.name;
|
||||
|
||||
@@ -37,14 +37,14 @@
|
||||
];
|
||||
propagatedBuildInputs =
|
||||
dependencies
|
||||
++ [];
|
||||
passthru.tests = {inherit check;};
|
||||
++ [ ];
|
||||
passthru.tests = { inherit check; };
|
||||
passthru.devDependencies = devDependencies;
|
||||
};
|
||||
|
||||
checkPython = python3.withPackages (ps: devDependencies ++ dependencies);
|
||||
|
||||
check = runCommand "${name}-check" {} ''
|
||||
check = runCommand "${name}-check" { } ''
|
||||
cp -r ${src} ./src
|
||||
chmod +w -R ./src
|
||||
cd src
|
||||
@@ -59,4 +59,4 @@
|
||||
'';
|
||||
|
||||
in
|
||||
package
|
||||
package
|
||||
|
||||
@@ -1,10 +1,12 @@
|
||||
{
|
||||
perSystem = {pkgs, ...}: let
|
||||
pyproject = builtins.fromTOML (builtins.readFile ./pyproject.toml);
|
||||
name = pyproject.project.name;
|
||||
package = pkgs.callPackage ./default.nix {};
|
||||
in {
|
||||
# packages.${name} = package;
|
||||
checks.python-template = package.tests.check;
|
||||
};
|
||||
perSystem = { pkgs, ... }:
|
||||
let
|
||||
pyproject = builtins.fromTOML (builtins.readFile ./pyproject.toml);
|
||||
name = pyproject.project.name;
|
||||
package = pkgs.callPackage ./default.nix { };
|
||||
in
|
||||
{
|
||||
# packages.${name} = package;
|
||||
checks.python-template = package.tests.check;
|
||||
};
|
||||
}
|
||||
|
||||
@@ -1,7 +1,8 @@
|
||||
{
|
||||
pkgs ? import <nixpkgs> {},
|
||||
system ? builtins.currentSystem,
|
||||
}: let
|
||||
{ pkgs ? import <nixpkgs> { }
|
||||
, system ? builtins.currentSystem
|
||||
,
|
||||
}:
|
||||
let
|
||||
lib = pkgs.lib;
|
||||
python3 = pkgs.python3;
|
||||
package = import ./default.nix {
|
||||
@@ -9,11 +10,11 @@
|
||||
};
|
||||
pythonWithDeps = python3.withPackages (
|
||||
ps:
|
||||
package.propagatedBuildInputs
|
||||
++ package.devDependencies
|
||||
++ [
|
||||
ps.pip
|
||||
]
|
||||
package.propagatedBuildInputs
|
||||
++ package.devDependencies
|
||||
++ [
|
||||
ps.pip
|
||||
]
|
||||
);
|
||||
checkScript = pkgs.writeScriptBin "check" ''
|
||||
nix build -f . tests.check -L "$@"
|
||||
@@ -43,4 +44,4 @@
|
||||
'';
|
||||
};
|
||||
in
|
||||
devShell
|
||||
devShell
|
||||
|
||||
Reference in New Issue
Block a user