mirror of
https://github.com/NixOS/nixpkgs.git
synced 2026-10-04 14:00:04 +00:00
571c71e6f7
We are migrating packages that meet below requirements:
1. using `callPackage`
2. called path is a directory
3. overriding set is empty (`{ }`)
4. not containing path expressions other than relative path (to
makenixpkgs-vet happy)
5. not referenced by nix files outside of the directory, other
than`pkgs/top-level/all-packages.nix`
6. not referencing nix files outside of the directory
7. not referencing `default.nix` (since it's changed to `package.nix`)
8. `outPath` doesn't change after migration
The tool is here: https://github.com/Aleksanaa/by-name-migrate.
27 lines
745 B
Diff
27 lines
745 B
Diff
diff --git a/xbattbar.c b/xbattbar.c
|
|
index 1e26019..cb3eab5 100644
|
|
--- a/xbattbar.c
|
|
+++ b/xbattbar.c
|
|
@@ -75,9 +75,8 @@ char *ONOUT_C = "olive drab";
|
|
char *OFFIN_C = "blue";
|
|
char *OFFOUT_C = "red";
|
|
|
|
-char *EXTERNAL_CHECK = "/usr/lib/xbattbar/xbattbar-check-apm";
|
|
+char *EXTERNAL_CHECK = "/usr/lib/xbattbar/xbattbar-check-sys";
|
|
char *EXTERNAL_CHECK_ACPI = "/usr/lib/xbattbar/xbattbar-check-acpi";
|
|
-char *EXTERNAL_CHECK_SYS = "/usr/lib/xbattbar/xbattbar-check-sys";
|
|
|
|
int alwaysontop = False;
|
|
|
|
@@ -245,10 +244,6 @@ main(int argc, char **argv)
|
|
EXTERNAL_CHECK = EXTERNAL_CHECK_ACPI;
|
|
break;
|
|
|
|
- case 'r':
|
|
- EXTERNAL_CHECK = EXTERNAL_CHECK_SYS;
|
|
- break;
|
|
-
|
|
case 's':
|
|
EXTERNAL_CHECK = optarg;
|
|
break;
|