From 0046d4239767f7586eafa1a9c503ad97f1edb542 Mon Sep 17 00:00:00 2001 From: Uli Baum Date: Fri, 1 Jun 2018 01:53:54 +0200 Subject: [PATCH] cargo-edit: remove reference to ... it broke nixpkgs.tarball --- pkgs/tools/package-management/cargo-edit/cargo-edit.nix | 4 +++- pkgs/tools/package-management/cargo-edit/default.nix | 4 ++-- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/package-management/cargo-edit/cargo-edit.nix b/pkgs/tools/package-management/cargo-edit/cargo-edit.nix index c37ef373ac24..042c999be0df 100644 --- a/pkgs/tools/package-management/cargo-edit/cargo-edit.nix +++ b/pkgs/tools/package-management/cargo-edit/cargo-edit.nix @@ -1,5 +1,7 @@ # Generated by carnix 0.6.6: carnix -o cargo-edit.nix --src ./. Cargo.lock --standalone -with import {}; +{ pkgs }: + +with pkgs; let kernel = buildPlatform.parsed.kernel.name; abi = buildPlatform.parsed.abi.name; include = includedFiles: src: builtins.filterSource (path: type: diff --git a/pkgs/tools/package-management/cargo-edit/default.nix b/pkgs/tools/package-management/cargo-edit/default.nix index 933d41278583..37f543b66b64 100644 --- a/pkgs/tools/package-management/cargo-edit/default.nix +++ b/pkgs/tools/package-management/cargo-edit/default.nix @@ -1,6 +1,6 @@ -{ stdenv, darwin, defaultCrateOverrides, fetchFromGitHub }: +{ stdenv, pkgs, darwin, defaultCrateOverrides, fetchFromGitHub }: -((import ./cargo-edit.nix).cargo_edit {}).override { +((import ./cargo-edit.nix { inherit pkgs; }).cargo_edit {}).override { crateOverrides = defaultCrateOverrides // { cargo-edit = attrs: rec { name = "cargo-edit-${version}";