nix-community/dream2nix
1
1
Fork 0
mirror of https://github.com/nix-community/dream2nix.git synced 2024-11-26 22:31:39 +03:00
Code Issues Projects Releases Wiki Activity

fix(rust-crane): actually pull craneSource from config.deps (#688)

Browse Source
This commit is contained in:
Yusuf Bera Ertan 2023-09-18 00:01:48 +00:00 committed by GitHub
parent fbefb96a81
commit d6f2f567ad
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 37 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

71
modules/dream2nix/rust-crane/default.nix
View File

@ -79,16 +79,11 @@
crane = import ./crane.nix {
inherit lib;
craneSource = config.deps.fetchFromGitHub {
owner = "ipetkov";
repo = "crane";
rev = "v0.12.2";
sha256 = "sha256-looLH5MdY4erLiJw0XwQohGdr0fJL9y6TJY3898RA2U=";
};
inherit
(config.deps)
stdenv
cargo
craneSource
jq
zstd
remarshal
@ -218,32 +213,40 @@ in {
};
deps = {nixpkgs, ...}:
(l.mapAttrs (_: l.mkDefault) {
cargo = nixpkgs.cargo;
})
# maybe it would be better to put these under `options.rust-crane.deps` instead of this `deps`
# since it conflicts with a lot of stuff?
// (l.mapAttrs (_: l.mkOverride 999) {
inherit
(nixpkgs)
stdenv
fetchurl
jq
zstd
remarshal
moreutils
python3Packages
makeSetupHook
runCommandLocal
runCommand
writeText
fetchFromGitHub
libiconv
mkShell
;
inherit
(nixpkgs.writers)
writePython3
;
});
l.mkMerge [
(l.mapAttrs (_: l.mkDefault) {
cargo = nixpkgs.cargo;
craneSource = config.deps.fetchFromGitHub {
owner = "ipetkov";
repo = "crane";
rev = "v0.12.2";
sha256 = "sha256-looLH5MdY4erLiJw0XwQohGdr0fJL9y6TJY3898RA2U=";
};
})
# maybe it would be better to put these under `options.rust-crane.deps` instead of this `deps`
# since it conflicts with a lot of stuff?
(l.mapAttrs (_: l.mkOverride 999) {
inherit
(nixpkgs)
stdenv
fetchurl
jq
zstd
remarshal
moreutils
python3Packages
makeSetupHook
runCommandLocal
runCommand
writeText
fetchFromGitHub
libiconv
mkShell
;
inherit
(nixpkgs.writers)
writePython3
;
})
];
}