treewide: move patches to their respective categories

This commit is contained in:
raf 2024-03-18 17:03:40 +03:00
commit 96e2530eaf
No known key found for this signature in database
GPG key ID: 02D1DD3FA08B6B29
7 changed files with 7 additions and 115 deletions

View file

@ -0,0 +1,44 @@
diff --git a/src/alejandra_cli/src/cli.rs b/src/alejandra_cli/src/cli.rs
index bab102c..b90bf1d 100644
--- a/src/alejandra_cli/src/cli.rs
+++ b/src/alejandra_cli/src/cli.rs
@@ -7,7 +7,6 @@ use futures::future::RemoteHandle;
use futures::stream::FuturesUnordered;
use futures::task::SpawnExt;
-use crate::ads::random_ad;
use crate::verbosity::Verbosity;
/// The Uncompromising Nix Code Formatter.
@@ -203,11 +202,6 @@ pub fn main() -> std::io::Result<()> {
(true, false) => "requires formatting",
}
);
-
- if in_place {
- eprintln!();
- eprint!("{}", random_ad());
- }
}
std::process::exit(if in_place { 0 } else { 2 });
@@ -218,8 +212,6 @@ pub fn main() -> std::io::Result<()> {
eprintln!(
"Congratulations! Your code complies with the Alejandra style."
);
- eprintln!();
- eprint!("{}", random_ad());
}
std::process::exit(0);
diff --git a/src/alejandra_cli/src/lib.rs b/src/alejandra_cli/src/lib.rs
index fd49ce8..258f656 100644
--- a/src/alejandra_cli/src/lib.rs
+++ b/src/alejandra_cli/src/lib.rs
@@ -1,4 +1,3 @@
-mod ads;
pub mod cli;
mod find;
mod verbosity;

View file

@ -1,4 +1,4 @@
{alejandra, ...}:
alejandra.overrideAttrs (prev: {
patches = (prev.patches or []) ++ [../patches/0003-alejandra-remove-ads.patch];
patches = (prev.patches or []) ++ [./0001-no-ads.patch];
})