|
29 | 29 | rustc = fenixToolchain; |
30 | 30 | }; |
31 | 31 | manifest = (pkgs.lib.importTOML ./Cargo.toml).package; |
| 32 | + version = manifest.version; |
32 | 33 |
|
33 | 34 | rustSrc = nix-filter.lib { |
34 | 35 | root = ./.; |
|
78 | 79 | naersk'.buildPackage { |
79 | 80 | pname = packageName; |
80 | 81 | cargoBuildOptions = x: x ++ [ "--package" packageName ]; |
81 | | - version = manifest.version; |
| 82 | + inherit version; |
82 | 83 | src = pkgs.lib.cleanSource ./.; |
83 | 84 | nativeBuildInputs = [ |
84 | 85 | pkgs.perl # Needed to build vendored OpenSSL. |
|
88 | 89 | }; |
89 | 90 |
|
90 | 91 | mkWin64RustPackage = pkgs.callPackage ./nix/win64-package.nix { |
91 | | - inherit naersk system fenixPkgs; |
92 | | - version = manifest.version; |
| 92 | + inherit naersk system fenixPkgs version; |
93 | 93 | }; |
94 | 94 |
|
95 | 95 | mkWin32RustPackage = pkgs.callPackage ./nix/win32-package.nix { |
96 | | - inherit naersk system fenixPkgs; |
97 | | - version = manifest.version; |
| 96 | + inherit naersk system fenixPkgs version; |
98 | 97 | }; |
99 | 98 |
|
100 | 99 | mkCrossRustPackage = pkgs.callPackage ./nix/cross-rust-package.nix { |
101 | | - inherit nixpkgs arch2targets naersk fenixPkgs system rustSrc; |
102 | | - version = manifest.version; |
| 100 | + inherit nixpkgs arch2targets naersk fenixPkgs system rustSrc version; |
103 | 101 | }; |
104 | 102 |
|
105 | 103 | mkAndroidRustPackage = pkgs.callPackage ./nix/android-package.nix { |
106 | | - inherit naersk fenixPkgs system rustSrc android; |
107 | | - version = manifest.version; |
| 104 | + inherit naersk fenixPkgs system rustSrc android version; |
108 | 105 | }; |
109 | 106 |
|
110 | 107 | mkAndroidPackages = arch: |
|
128 | 125 | "deltachat-rpc-server-${arch}-wheel" = mkWheel { inherit rpc-server; arch = "${arch}"; }; |
129 | 126 | }; |
130 | 127 |
|
131 | | - mkWheel = pkgs.callPackage ./nix/wheel.nix { inherit nix-filter; version = manifest.version; root = ./.; }; |
| 128 | + mkWheel = pkgs.callPackage ./nix/wheel.nix { inherit nix-filter version; root = ./.; }; |
132 | 129 | in |
133 | 130 | { |
134 | 131 | formatter = pkgs.nixpkgs-fmt; |
|
161 | 158 | { rpc-server = deltachat-rpc-server-win32; arch = "win32"; binaryName = "deltachat-rpc-server.exe"; }; |
162 | 159 |
|
163 | 160 | # Run `nix build .#docs` to get C docs generated in `./result/`. |
164 | | - docs = pkgs.callPackage ./nix/c-docs.nix { version = manifest.version; }; |
| 161 | + docs = pkgs.callPackage ./nix/c-docs.nix { inherit version; }; |
165 | 162 |
|
166 | 163 | libdeltachat = pkgs.callPackage ./nix/libdeltachat.nix { |
167 | | - inherit fenixToolchain rustSrc cargoLock fenixPkgs; |
168 | | - version = manifest.version; |
| 164 | + inherit fenixToolchain rustSrc cargoLock fenixPkgs version; |
169 | 165 | }; |
170 | 166 |
|
171 | 167 | deltachat-rpc-client = pkgs.callPackage ./nix/deltachat-rpc-client.nix { |
172 | | - version = manifest.version; |
| 168 | + inherit version; |
173 | 169 | }; |
174 | 170 |
|
175 | 171 | deltachat-python = |
176 | 172 | pkgs.python3Packages.buildPythonPackage { |
177 | 173 | pname = "deltachat-python"; |
178 | | - version = manifest.version; |
| 174 | + inherit version; |
179 | 175 | src = pkgs.lib.cleanSource ./python; |
180 | 176 | format = "pyproject"; |
181 | 177 | buildInputs = [ |
|
194 | 190 | ]; |
195 | 191 | }; |
196 | 192 | python-docs = pkgs.callPackage ./nix/python-docs.nix { |
197 | | - inherit deltachat-python deltachat-rpc-client; |
198 | | - version = manifest.version; |
| 193 | + inherit deltachat-python deltachat-rpc-client version; |
199 | 194 | }; |
200 | 195 | }; |
201 | 196 |
|
|
0 commit comments