Skip to content

Commit a306bc1

Browse files
committed
style: Format .nix files using alejandra
1 parent 68a6afe commit a306bc1

File tree

1 file changed

+45
-44
lines changed

1 file changed

+45
-44
lines changed

flake.nix

Lines changed: 45 additions & 44 deletions
Original file line numberDiff line numberDiff line change
@@ -15,10 +15,10 @@
1515
nixpkgs,
1616
flake-utils,
1717
rust-overlay,
18-
}:
19-
let
20-
emptyOverlay = final: prev: {};
21-
objset-drv = pkgs: pkgs.rustPlatform.buildRustPackage {
18+
}: let
19+
emptyOverlay = final: prev: {};
20+
objset-drv = pkgs:
21+
pkgs.rustPlatform.buildRustPackage {
2222
pname = "objset";
2323
version = "v0.1.0";
2424

@@ -29,40 +29,39 @@
2929
lockFile = ./Cargo.lock;
3030
};
3131
};
32-
objset-python-drv = pkgs: pythonPackages:
33-
pythonPackages.buildPythonPackage rec {
34-
pname = "objset";
35-
version = "v0.1.0";
32+
objset-python-drv = pkgs: pythonPackages:
33+
pythonPackages.buildPythonPackage rec {
34+
pname = "objset";
35+
version = "v0.1.0";
3636

37-
src = ./.;
37+
src = ./.;
3838

39-
cargoDeps = pkgs.rustPlatform.importCargoLock {
40-
# Why I yes, I would like not writing the hash of my Cargo.lock very much.
41-
lockFile = ./Cargo.lock;
42-
};
39+
cargoDeps = pkgs.rustPlatform.importCargoLock {
40+
# Why I yes, I would like not writing the hash of my Cargo.lock very much.
41+
lockFile = ./Cargo.lock;
42+
};
4343

44-
format = "pyproject";
44+
format = "pyproject";
4545

46-
# HACK: maturinBuildHook is dumb and doesn't read pyproject.toml for some reason
47-
maturinBuildFlags = [ ''--cargo-extra-args="--all-features"'' ];
46+
# HACK: maturinBuildHook is dumb and doesn't read pyproject.toml for some reason
47+
maturinBuildFlags = [''--cargo-extra-args="--all-features"''];
4848

49-
nativeBuildInputs = with pkgs.rustPlatform; [ cargoSetupHook maturinBuildHook ];
49+
nativeBuildInputs = with pkgs.rustPlatform; [cargoSetupHook maturinBuildHook];
5050

51-
# needed for maturin
52-
propagatedBuildInputs = with pkgs.python3Packages; [ cffi ];
51+
# needed for maturin
52+
propagatedBuildInputs = with pkgs.python3Packages; [cffi];
5353
};
54-
pythonOverride = prev: (prevArgs: {
55-
packageOverrides =
56-
let
57-
ourOverlay = new: old: {
58-
objset = objset-python-drv prev old;
59-
};
60-
in
61-
prev.lib.composeExtensions
62-
prevArgs.packageOverrides or emptyOverlay
63-
ourOverlay;
64-
});
65-
in
54+
pythonOverride = prev: (prevArgs: {
55+
packageOverrides = let
56+
ourOverlay = new: old: {
57+
objset = objset-python-drv prev old;
58+
};
59+
in
60+
prev.lib.composeExtensions
61+
prevArgs.packageOverrides or emptyOverlay
62+
ourOverlay;
63+
});
64+
in
6665
flake-utils.lib.eachDefaultSystem (
6766
system: let
6867
overlays = [(import rust-overlay)];
@@ -90,26 +89,28 @@
9089
];
9190
buildInputs = with pkgs; [
9291
maturin
93-
(pkgs.python3.withPackages (p: with p; [
94-
cffi
95-
]))
92+
(pkgs.python3.withPackages (p:
93+
with p; [
94+
cffi
95+
]))
9696
];
9797
LD_LIBRARY_PATH = pkgs.lib.makeLibraryPath buildNativeInputs;
9898
};
9999
devShells.python = pkgs.mkShell rec {
100100
buildInputs = with pkgs; [
101-
(pkgs.python3.withPackages (p: with p; [
102-
packages.objset-python
103-
]))
101+
(pkgs.python3.withPackages (p:
102+
with p; [
103+
packages.objset-python
104+
]))
104105
];
105106
};
106107
}
107-
) // {
108-
overlays.default = final: prev:
109-
rec {
110-
objset = objset-drv prev;
111-
python310 = prev.python310.override (pythonOverride prev);
112-
python39 = prev.python39.override (pythonOverride prev);
108+
)
109+
// {
110+
overlays.default = final: prev: rec {
111+
objset = objset-drv prev;
112+
python310 = prev.python310.override (pythonOverride prev);
113+
python39 = prev.python39.override (pythonOverride prev);
114+
};
113115
};
114-
};
115116
}

0 commit comments

Comments
 (0)