From 38401aed72cb7f57046ebe9a9529adcd7affe190 Mon Sep 17 00:00:00 2001 From: figsoda Date: Mon, 17 Apr 2023 16:27:54 -0400 Subject: [PATCH] treewide: remove file-wide `with rustPlatform;`s --- pkgs/applications/networking/cluster/click/default.nix | 4 +--- pkgs/applications/networking/dyndns/cfdyndns/default.nix | 4 +--- pkgs/development/misc/loc/default.nix | 4 +--- pkgs/development/tools/chit/default.nix | 4 +--- pkgs/development/tools/clog-cli/default.nix | 4 +--- pkgs/development/tools/pax-rs/default.nix | 3 +-- pkgs/servers/tarssh/default.nix | 4 +--- pkgs/tools/misc/ffsend/default.nix | 4 +--- pkgs/tools/security/ripasso/cursive.nix | 3 +-- 9 files changed, 9 insertions(+), 25 deletions(-) diff --git a/pkgs/applications/networking/cluster/click/default.nix b/pkgs/applications/networking/cluster/click/default.nix index 2d76e0a26cb9..79dae1d1344a 100644 --- a/pkgs/applications/networking/cluster/click/default.nix +++ b/pkgs/applications/networking/cluster/click/default.nix @@ -1,8 +1,6 @@ { darwin, fetchFromGitHub, rustPlatform, lib, stdenv }: -with rustPlatform; - -buildRustPackage rec { +rustPlatform.buildRustPackage rec { pname = "click"; version = "0.4.2"; diff --git a/pkgs/applications/networking/dyndns/cfdyndns/default.nix b/pkgs/applications/networking/dyndns/cfdyndns/default.nix index afddb6be875e..eb7d1bf5c8d9 100644 --- a/pkgs/applications/networking/dyndns/cfdyndns/default.nix +++ b/pkgs/applications/networking/dyndns/cfdyndns/default.nix @@ -1,8 +1,6 @@ { lib, fetchFromGitHub, rustPlatform, pkg-config, openssl }: -with rustPlatform; - -buildRustPackage rec { +rustPlatform.buildRustPackage rec { pname = "cfdyndns"; version = "0.0.3"; src = fetchFromGitHub { diff --git a/pkgs/development/misc/loc/default.nix b/pkgs/development/misc/loc/default.nix index ce262d946a80..9f6286d14f4c 100644 --- a/pkgs/development/misc/loc/default.nix +++ b/pkgs/development/misc/loc/default.nix @@ -1,8 +1,6 @@ { lib, fetchFromGitHub, rustPlatform }: -with rustPlatform; - -buildRustPackage rec { +rustPlatform.buildRustPackage rec { version = "0.4.1"; pname = "loc"; diff --git a/pkgs/development/tools/chit/default.nix b/pkgs/development/tools/chit/default.nix index dd37efb506d6..41839f9e2625 100644 --- a/pkgs/development/tools/chit/default.nix +++ b/pkgs/development/tools/chit/default.nix @@ -2,9 +2,7 @@ , darwin }: -with rustPlatform; - -buildRustPackage rec { +rustPlatform.buildRustPackage rec { pname = "chit"; version = "0.1.15"; diff --git a/pkgs/development/tools/clog-cli/default.nix b/pkgs/development/tools/clog-cli/default.nix index feedbd2ab261..077eac32aa20 100644 --- a/pkgs/development/tools/clog-cli/default.nix +++ b/pkgs/development/tools/clog-cli/default.nix @@ -1,8 +1,6 @@ { fetchFromGitHub, rustPlatform, lib }: -with rustPlatform; - -buildRustPackage rec { +rustPlatform.buildRustPackage rec { pname = "clog-cli"; version = "0.9.3"; diff --git a/pkgs/development/tools/pax-rs/default.nix b/pkgs/development/tools/pax-rs/default.nix index 1731dabf3704..d89221da8fea 100644 --- a/pkgs/development/tools/pax-rs/default.nix +++ b/pkgs/development/tools/pax-rs/default.nix @@ -1,7 +1,6 @@ { lib, fetchFromGitHub, fetchurl, rustPlatform, runCommand } : -with rustPlatform; -buildRustPackage rec { +rustPlatform.buildRustPackage rec { pname = "pax-rs"; version = "0.4.0"; diff --git a/pkgs/servers/tarssh/default.nix b/pkgs/servers/tarssh/default.nix index 446e187e467a..051ebe964ee2 100644 --- a/pkgs/servers/tarssh/default.nix +++ b/pkgs/servers/tarssh/default.nix @@ -1,8 +1,6 @@ { fetchFromGitHub, rustPlatform, lib }: -with rustPlatform; - -buildRustPackage rec { +rustPlatform.buildRustPackage rec { pname = "tarssh"; version = "0.7.0"; diff --git a/pkgs/tools/misc/ffsend/default.nix b/pkgs/tools/misc/ffsend/default.nix index 1aedac7ca16f..a96492246d21 100644 --- a/pkgs/tools/misc/ffsend/default.nix +++ b/pkgs/tools/misc/ffsend/default.nix @@ -13,9 +13,7 @@ in assert (x11Support && usesX11) -> xclip != null || xsel != null; -with rustPlatform; - -buildRustPackage rec { +rustPlatform.buildRustPackage rec { pname = "ffsend"; version = "0.2.76"; diff --git a/pkgs/tools/security/ripasso/cursive.nix b/pkgs/tools/security/ripasso/cursive.nix index d808e344aceb..ab2498980f69 100644 --- a/pkgs/tools/security/ripasso/cursive.nix +++ b/pkgs/tools/security/ripasso/cursive.nix @@ -17,8 +17,7 @@ , installShellFiles }: -with rustPlatform; -buildRustPackage rec { +rustPlatform.buildRustPackage rec { version = "0.6.4"; pname = "ripasso-cursive";