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