Gentoo Archives: gentoo-commits

From: Zac Medico <zmedico@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: app-shells/nushell/files/
Date: Sun, 07 Aug 2022 22:11:07
Message-Id: 1659910228.984725f2230efa8aa77dbce98cb6d7881675bfe3.zmedico@gentoo
1 commit: 984725f2230efa8aa77dbce98cb6d7881675bfe3
2 Author: Michael Mair-Keimberger <mmk <AT> levelnine <DOT> at>
3 AuthorDate: Sun Aug 7 09:56:10 2022 +0000
4 Commit: Zac Medico <zmedico <AT> gentoo <DOT> org>
5 CommitDate: Sun Aug 7 22:10:28 2022 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=984725f2
7
8 app-shells/nushell: remove unused patch(es)
9
10 Closes: https://github.com/gentoo/gentoo/pull/26768
11 Signed-off-by: Michael Mair-Keimberger <mmk <AT> levelnine.at>
12 Signed-off-by: Zac Medico <zmedico <AT> gentoo.org>
13
14 .../nushell-0.63.1-reedline-from-crates.io.patch | 73 ----------------------
15 1 file changed, 73 deletions(-)
16
17 diff --git a/app-shells/nushell/files/nushell-0.63.1-reedline-from-crates.io.patch b/app-shells/nushell/files/nushell-0.63.1-reedline-from-crates.io.patch
18 deleted file mode 100644
19 index 51f1f7705d2e..000000000000
20 --- a/app-shells/nushell/files/nushell-0.63.1-reedline-from-crates.io.patch
21 +++ /dev/null
22 @@ -1,73 +0,0 @@
23 -From f17582e6e7ce4fbed13a3b490f06041b56882cf4 Mon Sep 17 00:00:00 2001
24 -From: Randy Barlow <randy@×××××××××××××××××.com>
25 -Date: Mon, 30 May 2022 14:59:44 -0400
26 -Subject: [PATCH] Use reedline from crates.io instead of git
27 -
28 -I believe reedline was left on a git URL for a nushell release by
29 -mistake. For Gentoo, we need it to use a version from crates.io, so this
30 -patch makes that adjustment.
31 -
32 -Signed-off-by: Randy Barlow <randy@×××××××××××××××××.com>
33 ----
34 - Cargo.lock | 3 ++-
35 - Cargo.toml | 2 +-
36 - crates/nu-cli/Cargo.toml | 2 +-
37 - crates/nu-command/Cargo.toml | 2 +-
38 - 4 files changed, 5 insertions(+), 4 deletions(-)
39 -
40 -diff --git a/Cargo.lock b/Cargo.lock
41 -index bed0c1c50..578c55b74 100644
42 ---- a/Cargo.lock
43 -+++ b/Cargo.lock
44 -@@ -3794,7 +3794,8 @@ dependencies = [
45 - [[package]]
46 - name = "reedline"
47 - version = "0.6.0"
48 --source = "git+https://github.com/nushell/reedline?branch=main#fe795caabc5401d811006b93d5a6d4f220a049ff"
49 -+source = "registry+https://github.com/rust-lang/crates.io-index"
50 -+checksum = "422f144c06f679da4ab4f082a6d1d43e28bfabb68d009100e6e5520728f99fec"
51 - dependencies = [
52 - "chrono",
53 - "crossterm",
54 -diff --git a/Cargo.toml b/Cargo.toml
55 -index 26df23417..cbfb290b8 100644
56 ---- a/Cargo.toml
57 -+++ b/Cargo.toml
58 -@@ -54,7 +54,7 @@ nu-term-grid = { path = "./crates/nu-term-grid", version = "0.63.1" }
59 - nu-utils = { path = "./crates/nu-utils", version = "0.63.1" }
60 - pretty_env_logger = "0.4.0"
61 - rayon = "1.5.1"
62 --reedline = { git = "https://github.com/nushell/reedline", branch = "main", features = ["bashisms"]}
63 -+reedline = { version = "0.6.0", features = ["bashisms"]}
64 - is_executable = "1.0.1"
65 -
66 - [target.'cfg(not(target_os = "windows"))'.dependencies]
67 -diff --git a/crates/nu-cli/Cargo.toml b/crates/nu-cli/Cargo.toml
68 -index 9c5dcb00c..fe4d5c263 100644
69 ---- a/crates/nu-cli/Cargo.toml
70 -+++ b/crates/nu-cli/Cargo.toml
71 -@@ -17,7 +17,7 @@ nu-parser = { path = "../nu-parser", version = "0.63.1" }
72 - nu-protocol = { path = "../nu-protocol", version = "0.63.1" }
73 - nu-utils = { path = "../nu-utils", version = "0.63.1" }
74 - nu-ansi-term = "0.45.1"
75 --reedline = { git = "https://github.com/nushell/reedline", branch = "main", features = ["bashisms"]}
76 -+reedline = { version = "0.6.0", features = ["bashisms"]}
77 - nu-color-config = { path = "../nu-color-config", version = "0.63.1" }
78 - crossterm = "0.23.0"
79 - miette = { version = "4.5.0", features = ["fancy"] }
80 -diff --git a/crates/nu-command/Cargo.toml b/crates/nu-command/Cargo.toml
81 -index 806772156..ac1283ab3 100644
82 ---- a/crates/nu-command/Cargo.toml
83 -+++ b/crates/nu-command/Cargo.toml
84 -@@ -82,7 +82,7 @@ unicode-segmentation = "1.8.0"
85 - url = "2.2.1"
86 - uuid = { version = "0.8.2", features = ["v4"] }
87 - which = { version = "4.2.2", optional = true }
88 --reedline = { git = "https://github.com/nushell/reedline", branch = "main", features = ["bashisms"]}
89 -+reedline = { version = "0.6.0", features = ["bashisms"]}
90 - wax = { version = "0.4.0", features = ["diagnostics"] }
91 - rusqlite = { version = "0.27.0", features = ["bundled"], optional = true }
92 - sqlparser = { version = "0.16.0", features = ["serde"], optional = true }
93 ---
94 -2.35.3
95 -