diff options
| author | Efraim Flashner <efraim@flashner.co.il> | 2023-01-30 11:33:18 +0200 |
|---|---|---|
| committer | Efraim Flashner <efraim@flashner.co.il> | 2023-01-30 12:39:40 +0200 |
| commit | 4cf1acc7f3033b50b0bf19e02c9f522d522d338c (patch) | |
| tree | 9fd64956ee60304c15387eb394cd649e49f01467 /gnu/packages/patches/rust-shell2batch-lint-fix.patch | |
| parent | edb8c09addd186d9538d43b12af74d6c7aeea082 (diff) | |
| parent | 595b53b74e3ef57a1c0c96108ba86d38a170a241 (diff) | |
| download | guix-4cf1acc7f3033b50b0bf19e02c9f522d522d338c.tar.gz | |
Merge remote-tracking branch 'origin/master' into core-updates
Conflicts: doc/guix.texi gnu/local.mk gnu/packages/admin.scm gnu/packages/base.scm gnu/packages/chromium.scm gnu/packages/compression.scm gnu/packages/databases.scm gnu/packages/diffoscope.scm gnu/packages/freedesktop.scm gnu/packages/gnome.scm gnu/packages/gnupg.scm gnu/packages/guile.scm gnu/packages/inkscape.scm gnu/packages/llvm.scm gnu/packages/openldap.scm gnu/packages/pciutils.scm gnu/packages/ruby.scm gnu/packages/samba.scm gnu/packages/sqlite.scm gnu/packages/statistics.scm gnu/packages/syndication.scm gnu/packages/tex.scm gnu/packages/tls.scm gnu/packages/version-control.scm gnu/packages/xml.scm guix/build-system/copy.scm guix/scripts/home.scm
Diffstat (limited to 'gnu/packages/patches/rust-shell2batch-lint-fix.patch')
| -rw-r--r-- | gnu/packages/patches/rust-shell2batch-lint-fix.patch | 25 |
1 files changed, 0 insertions, 25 deletions
diff --git a/gnu/packages/patches/rust-shell2batch-lint-fix.patch b/gnu/packages/patches/rust-shell2batch-lint-fix.patch deleted file mode 100644 index 7c160b6cca..0000000000 --- a/gnu/packages/patches/rust-shell2batch-lint-fix.patch +++ /dev/null @@ -1,25 +0,0 @@ -Resolves the following error that was most likely introduced in new version of -rust as this package is from 2019: - -error: unnecessary parentheses around type - --> src/converter.rs:108:61 - | -108 | fn add_arguments(arguments: &str, additional_arguments: Vec<(String)>, pre: bool) -> String { - | ^^^^^^^^ help: remove these parentheses - -Reported upstream at https://github.com/sagiegurari/shell2batch/issues/17. - -diff --git a/src/converter.rs b/src/converter.rs -index fc87d68..af309d2 100644 ---- a/src/converter.rs -+++ b/src/converter.rs -@@ -105,7 +105,7 @@ fn replace_vars(arguments: &str) -> String { - updated_arguments - } - --fn add_arguments(arguments: &str, additional_arguments: Vec<(String)>, pre: bool) -> String { -+fn add_arguments(arguments: &str, additional_arguments: Vec<String>, pre: bool) -> String { - let mut windows_arguments = if pre { - "".to_string() - } else { - |