Skip to content

Commit e426879

Browse files
committed
refactor(flake.nix): replace "version = manifest.version" with "inherit version"
1 parent 9cb305f commit e426879

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.
@@ -88,23 +89,19 @@
8889
};
8990

9091
mkWin64RustPackage = pkgs.callPackage ./nix/win64-package.nix {
91-
inherit naersk system fenixPkgs;
92-
version = manifest.version;
92+
inherit naersk system fenixPkgs version;
9393
};
9494

9595
mkWin32RustPackage = pkgs.callPackage ./nix/win32-package.nix {
96-
inherit naersk system fenixPkgs;
97-
version = manifest.version;
96+
inherit naersk system fenixPkgs version;
9897
};
9998

10099
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;
103101
};
104102

105103
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;
108105
};
109106

110107
mkAndroidPackages = arch:
@@ -128,7 +125,7 @@
128125
"deltachat-rpc-server-${arch}-wheel" = mkWheel { inherit rpc-server; arch = "${arch}"; };
129126
};
130127

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

163160
# 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; };
165162

166163
libdeltachat = pkgs.callPackage ./nix/libdeltachat.nix {
167-
inherit fenixToolchain rustSrc cargoLock fenixPkgs;
168-
version = manifest.version;
164+
inherit fenixToolchain rustSrc cargoLock fenixPkgs version;
169165
};
170166

171167
deltachat-rpc-client = pkgs.callPackage ./nix/deltachat-rpc-client.nix {
172-
version = manifest.version;
168+
inherit version;
173169
};
174170

175171
deltachat-python =
176172
pkgs.python3Packages.buildPythonPackage {
177173
pname = "deltachat-python";
178-
version = manifest.version;
174+
inherit version;
179175
src = pkgs.lib.cleanSource ./python;
180176
format = "pyproject";
181177
buildInputs = [
@@ -194,8 +190,7 @@
194190
];
195191
};
196192
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;
199194
};
200195
};
201196

0 commit comments

Comments
 (0)