Skip to content

Commit 81df158

Browse files
committed
inherit version
1 parent fbc21f3 commit 81df158

1 file changed

Lines changed: 12 additions & 17 deletions

File tree

flake.nix

Lines changed: 12 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,7 @@
2929
rustc = fenixToolchain;
3030
};
3131
manifest = (pkgs.lib.importTOML ./Cargo.toml).package;
32+
version = manifest.version;
3233

3334
rustSrc = nix-filter.lib {
3435
root = ./.;
@@ -78,7 +79,7 @@
7879
naersk'.buildPackage {
7980
pname = packageName;
8081
cargoBuildOptions = x: x ++ [ "--package" packageName ];
81-
version = manifest.version;
82+
inherit version;
8283
src = pkgs.lib.cleanSource ./.;
8384
nativeBuildInputs = [
8485
pkgs.perl # Needed to build vendored OpenSSL.
@@ -87,23 +88,19 @@
8788
doCheck = false; # Disable test as it requires network access.
8889
};
8990
mkWin64RustPackage = pkgs.callPackage ./nix/win64-package.nix {
90-
inherit naersk system fenixPkgs;
91-
version = manifest.version;
91+
inherit naersk system fenixPkgs version;
9292
};
9393

9494
mkWin32RustPackage = pkgs.callPackage ./nix/win32-package.nix {
95-
inherit naersk system fenixPkgs;
96-
version = manifest.version;
95+
inherit naersk system fenixPkgs version;
9796
};
9897

9998
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;
102100
};
103101

104102
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;
107104
};
108105

109106
mkAndroidPackages = arch:
@@ -127,7 +124,7 @@
127124
"deltachat-rpc-server-${arch}-wheel" = mkWheel { inherit rpc-server; arch = "${arch}"; };
128125
};
129126

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 = ./.; };
131128
in
132129
{
133130
formatter = pkgs.nixpkgs-fmt;
@@ -160,21 +157,20 @@
160157
{ rpc-server = deltachat-rpc-server-win32; arch = "win32"; binaryName = "deltachat-rpc-server.exe"; };
161158

162159
# 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; };
164161

165162
libdeltachat = pkgs.callPackage ./nix/libdeltachat.nix {
166-
inherit fenixToolchain rustSrc cargoLock fenixPkgs;
167-
version = manifest.version;
163+
inherit fenixToolchain rustSrc cargoLock fenixPkgs version;
168164
};
169165

170166
deltachat-rpc-client = pkgs.callPackage ./nix/deltachat-rpc-client.nix {
171-
version = manifest.version;
167+
inherit version;
172168
};
173169

174170
deltachat-python =
175171
pkgs.python3Packages.buildPythonPackage {
176172
pname = "deltachat-python";
177-
version = manifest.version;
173+
inherit version;
178174
src = pkgs.lib.cleanSource ./python;
179175
format = "pyproject";
180176
buildInputs = [
@@ -193,8 +189,7 @@
193189
];
194190
};
195191
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;
198193
};
199194
};
200195

0 commit comments

Comments
 (0)