From 82997068f8eb11eba6bdd1203431440ec784b632 Mon Sep 17 00:00:00 2001 From: Max Date: Sun, 4 Jul 2021 18:54:04 +0200 Subject: [PATCH] packages: unpatch deploy-rs --- packages/patched-inputs.nix | 2 +- .../deploy-rs/deploy-rs-no-emojis.patch | 51 ------------------- 2 files changed, 1 insertion(+), 52 deletions(-) delete mode 100644 patches/custom/deploy-rs/deploy-rs-no-emojis.patch diff --git a/packages/patched-inputs.nix b/packages/patched-inputs.nix index 774ee67..0597483 100644 --- a/packages/patched-inputs.nix +++ b/packages/patched-inputs.nix @@ -1,7 +1,7 @@ let tools = import ./lib/tools.nix; in with tools; { inputs, pkgs, ... }: rec { - deploy-rs = patch inputs.deploy-rs.packages.x86_64-linux.deploy-rs "patches/custom/deploy-rs"; + deploy-rs = inputs.deploy-rs.packages.x86_64-linux.deploy-rs; nix-super-unstable = let system = "x86_64-linux"; diff --git a/patches/custom/deploy-rs/deploy-rs-no-emojis.patch b/patches/custom/deploy-rs/deploy-rs-no-emojis.patch deleted file mode 100644 index 381b1c9..0000000 --- a/patches/custom/deploy-rs/deploy-rs-no-emojis.patch +++ /dev/null @@ -1,51 +0,0 @@ -diff --git a/src/lib.rs b/src/lib.rs -index b93b9ae..9081214 100644 ---- a/src/lib.rs -+++ b/src/lib.rs -@@ -17,16 +17,6 @@ pub fn make_lock_path(temp_path: &str, closure: &str) -> String { - format!("{}/deploy-rs-canary-{}", temp_path, lock_hash) - } - --fn make_emoji(level: log::Level) -> &'static str { -- match level { -- log::Level::Error => "❌", -- log::Level::Warn => "⚠️", -- log::Level::Info => "ℹ️", -- log::Level::Debug => "❓", -- log::Level::Trace => "🖊️", -- } --} -- - pub fn logger_formatter_activate( - w: &mut dyn std::io::Write, - _now: &mut DeferredNow, -@@ -36,8 +26,7 @@ pub fn logger_formatter_activate( - - write!( - w, -- "⭐ {} [activate] [{}] {}", -- make_emoji(level), -+ "[activate] [{}] {}", - style(level, level.to_string()), - record.args() - ) -@@ -52,8 +41,7 @@ pub fn logger_formatter_wait( - - write!( - w, -- "👀 {} [wait] [{}] {}", -- make_emoji(level), -+ "[wait] [{}] {}", - style(level, level.to_string()), - record.args() - ) -@@ -68,8 +56,7 @@ pub fn logger_formatter_deploy( - - write!( - w, -- "🚀 {} [deploy] [{}] {}", -- make_emoji(level), -+ "[deploy] [{}] {}", - style(level, level.to_string()), - record.args() - )