|
15 | 15 | nixpkgs, |
16 | 16 | flake-utils, |
17 | 17 | 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 { |
22 | 22 | pname = "objset"; |
23 | 23 | version = "v0.1.0"; |
24 | 24 |
|
|
29 | 29 | lockFile = ./Cargo.lock; |
30 | 30 | }; |
31 | 31 | }; |
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"; |
36 | 36 |
|
37 | | - src = ./.; |
| 37 | + src = ./.; |
38 | 38 |
|
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 | + }; |
43 | 43 |
|
44 | | - format = "pyproject"; |
| 44 | + format = "pyproject"; |
45 | 45 |
|
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"'']; |
48 | 48 |
|
49 | | - nativeBuildInputs = with pkgs.rustPlatform; [ cargoSetupHook maturinBuildHook ]; |
| 49 | + nativeBuildInputs = with pkgs.rustPlatform; [cargoSetupHook maturinBuildHook]; |
50 | 50 |
|
51 | | - # needed for maturin |
52 | | - propagatedBuildInputs = with pkgs.python3Packages; [ cffi ]; |
| 51 | + # needed for maturin |
| 52 | + propagatedBuildInputs = with pkgs.python3Packages; [cffi]; |
53 | 53 | }; |
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 |
66 | 65 | flake-utils.lib.eachDefaultSystem ( |
67 | 66 | system: let |
68 | 67 | overlays = [(import rust-overlay)]; |
|
90 | 89 | ]; |
91 | 90 | buildInputs = with pkgs; [ |
92 | 91 | maturin |
93 | | - (pkgs.python3.withPackages (p: with p; [ |
94 | | - cffi |
95 | | - ])) |
| 92 | + (pkgs.python3.withPackages (p: |
| 93 | + with p; [ |
| 94 | + cffi |
| 95 | + ])) |
96 | 96 | ]; |
97 | 97 | LD_LIBRARY_PATH = pkgs.lib.makeLibraryPath buildNativeInputs; |
98 | 98 | }; |
99 | 99 | devShells.python = pkgs.mkShell rec { |
100 | 100 | 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 | + ])) |
104 | 105 | ]; |
105 | 106 | }; |
106 | 107 | } |
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 | + }; |
113 | 115 | }; |
114 | | - }; |
115 | 116 | } |
0 commit comments