|
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. |
|
87 | 88 | doCheck = false; # Disable test as it requires network access. |
88 | 89 | }; |
89 | 90 | mkWin64RustPackage = pkgs.callPackage ./nix/win64-package.nix { |
90 | | - inherit naersk system fenixPkgs; |
91 | | - version = manifest.version; |
| 91 | + inherit naersk system fenixPkgs version; |
92 | 92 | }; |
93 | 93 |
|
94 | 94 | mkWin32RustPackage = pkgs.callPackage ./nix/win32-package.nix { |
95 | | - inherit naersk system fenixPkgs; |
96 | | - version = manifest.version; |
| 95 | + inherit naersk system fenixPkgs version; |
97 | 96 | }; |
98 | 97 |
|
99 | 98 | mkCrossRustPackage = pkgs.callPackage ./nix/cross-rust-package.nix { |
100 | | - inherit nixpkgs arch2targets naersk fenixPkgs system rustSrc; |
101 | | - version = manifest.version; |
| 99 | + inherit nixpkgs arch2targets naersk fenixPkgs system rustSrc version; |
102 | 100 | }; |
103 | 101 |
|
104 | 102 | mkAndroidRustPackage = pkgs.callPackage ./nix/android-package.nix { |
105 | | - inherit naersk fenixPkgs system rustSrc android; |
106 | | - version = manifest.version; |
| 103 | + inherit naersk fenixPkgs system rustSrc android version; |
107 | 104 | }; |
108 | 105 |
|
109 | 106 | mkAndroidPackages = arch: |
|
127 | 124 | "deltachat-rpc-server-${arch}-wheel" = mkWheel { inherit rpc-server; arch = "${arch}"; }; |
128 | 125 | }; |
129 | 126 |
|
130 | | - mkWheel = pkgs.callPackage ./nix/wheel.nix { inherit nix-filter; version = manifest.version; root = ./.; }; |
| 127 | + mkWheel = pkgs.callPackage ./nix/wheel.nix { inherit nix-filter version; root = ./.; }; |
131 | 128 | in |
132 | 129 | { |
133 | 130 | formatter = pkgs.nixpkgs-fmt; |
|
160 | 157 | { rpc-server = deltachat-rpc-server-win32; arch = "win32"; binaryName = "deltachat-rpc-server.exe"; }; |
161 | 158 |
|
162 | 159 | # Run `nix build .#docs` to get C docs generated in `./result/`. |
163 | | - docs = pkgs.callPackage ./nix/c-docs.nix { version = manifest.version; }; |
| 160 | + docs = pkgs.callPackage ./nix/c-docs.nix { inherit version; }; |
164 | 161 |
|
165 | 162 | libdeltachat = pkgs.callPackage ./nix/libdeltachat.nix { |
166 | | - inherit fenixToolchain rustSrc cargoLock fenixPkgs; |
167 | | - version = manifest.version; |
| 163 | + inherit fenixToolchain rustSrc cargoLock fenixPkgs version; |
168 | 164 | }; |
169 | 165 |
|
170 | 166 | deltachat-rpc-client = pkgs.callPackage ./nix/deltachat-rpc-client.nix { |
171 | | - version = manifest.version; |
| 167 | + inherit version; |
172 | 168 | }; |
173 | 169 |
|
174 | 170 | deltachat-python = |
175 | 171 | pkgs.python3Packages.buildPythonPackage { |
176 | 172 | pname = "deltachat-python"; |
177 | | - version = manifest.version; |
| 173 | + inherit version; |
178 | 174 | src = pkgs.lib.cleanSource ./python; |
179 | 175 | format = "pyproject"; |
180 | 176 | buildInputs = [ |
|
193 | 189 | ]; |
194 | 190 | }; |
195 | 191 | python-docs = pkgs.callPackage ./nix/python-docs.nix { |
196 | | - inherit deltachat-python deltachat-rpc-client; |
197 | | - version = manifest.version; |
| 192 | + inherit deltachat-python deltachat-rpc-client version; |
198 | 193 | }; |
199 | 194 | }; |
200 | 195 |
|
|
0 commit comments