mirror of
https://github.com/NotAShelf/nyxexprs.git
synced 2025-10-03 07:23:32 +00:00
treewide: move patches to their respective categories
This commit is contained in:
parent
557e694c0e
commit
96e2530eaf
7 changed files with 7 additions and 115 deletions
|
@ -0,0 +1,26 @@
|
|||
From 0eaef67b683683fb423fcb2d5096b3cdf9a4a9cd Mon Sep 17 00:00:00 2001
|
||||
From: =?UTF-8?q?Maciej=20Kr=C3=BCger?= <mkg20001@gmail.com>
|
||||
Date: Sun, 22 Mar 2020 12:26:10 +0100
|
||||
Subject: [PATCH] Patch plugindir to output
|
||||
|
||||
---
|
||||
configure.ac | 2 +-
|
||||
1 file changed, 1 insertion(+), 1 deletion(-)
|
||||
|
||||
diff --git a/configure.ac b/configure.ac
|
||||
index 50edb74..639ee86 100644
|
||||
--- a/configure.ac
|
||||
+++ b/configure.ac
|
||||
@@ -50,7 +50,7 @@ PKG_CHECK_MODULES([glib], [glib-2.0 >= 2.40 gio-unix-2.0 gmodule-2.0 ])
|
||||
PKG_CHECK_MODULES([cairo], [cairo])
|
||||
PKG_CHECK_MODULES([rofi], [rofi >= 1.5.4])
|
||||
|
||||
-[rofi_PLUGIN_INSTALL_DIR]="`$PKG_CONFIG --variable=pluginsdir rofi`"
|
||||
+[rofi_PLUGIN_INSTALL_DIR]="`echo $out/lib/rofi`"
|
||||
AC_SUBST([rofi_PLUGIN_INSTALL_DIR])
|
||||
|
||||
LT_INIT([disable-static])
|
||||
--
|
||||
2.25.1
|
||||
|
||||
|
|
@ -40,7 +40,7 @@ in
|
|||
];
|
||||
|
||||
patches = [
|
||||
../../patches/0002-patch-plugin-dir.patch
|
||||
../patches/0001-patch-plugin-dir.patch
|
||||
];
|
||||
|
||||
postPatch = ''
|
|
@ -42,7 +42,7 @@ in
|
|||
];
|
||||
|
||||
patches = [
|
||||
../../patches/0002-patch-plugin-dir.patch
|
||||
../patches/0001-patch-plugin-dir.patch
|
||||
];
|
||||
|
||||
postPatch = ''
|
44
pkgs/tools/nix/alejandra-no-ads/0001-no-ads.patch
Normal file
44
pkgs/tools/nix/alejandra-no-ads/0001-no-ads.patch
Normal 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;
|
||||
|
||||
|
|
@ -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];
|
||||
})
|
||||
|
|
|
@ -8,8 +8,8 @@
|
|||
# they can be updated via npins
|
||||
ani-cli = mkPackage ./applications/misc/ani-cli;
|
||||
rat = mkPackage ./applications/misc/rat;
|
||||
rofi-calc-wayland = mkPackage ./applications/misc/rofi-calc-wayland;
|
||||
rofi-emoji-wayland = mkPackage ./applications/misc/rofi-emoji-wayland;
|
||||
rofi-calc-wayland = mkPackage ./applications/misc/rofi-plugins/rofi-calc-wayland;
|
||||
rofi-emoji-wayland = mkPackage ./applications/misc/rofi-plugins/rofi-emoji-wayland;
|
||||
|
||||
# static packages
|
||||
# need manual intervention with each update
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue