forked from NixOS/nixpkgs
-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
- Loading branch information
Showing
95 changed files
with
1,100 additions
and
7,522 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -16554,6 +16554,18 @@ | |
| githubId = 3521180; | ||
| name = "Tom Sydney Kerckhove"; | ||
| }; | ||
| normalcea = { | ||
| name = "normalcea"; | ||
| email = "[email protected]"; | ||
| github = "normalcea"; | ||
| githubId = 190049873; | ||
| keys = [ | ||
| { | ||
| fingerprint = "6057 1155 7BA4 B922 66D6 2064 3DE3 BCB2 142A 8C71"; | ||
| } | ||
| ]; | ||
| matrix = "@normalcea:matrix.org"; | ||
| }; | ||
| nosewings = { | ||
| name = "Nicholas Coltharp"; | ||
| email = "[email protected]"; | ||
|
|
||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
150 changes: 101 additions & 49 deletions
150
pkgs/by-name/au/auto-cpufreq/prevent-install-and-copy.patch
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,49 +1,101 @@ | ||
| diff --git a/auto_cpufreq/bin/auto_cpufreq.py b/auto_cpufreq/bin/auto_cpufreq.py | ||
| index d9fcd37..7436a7e 100755 | ||
| --- a/auto_cpufreq/bin/auto_cpufreq.py | ||
| +++ b/auto_cpufreq/bin/auto_cpufreq.py | ||
| @@ -136,20 +136,7 @@ def main(monitor, live, daemon, install, update, remove, force, config, stats, g | ||
| except KeyboardInterrupt: break | ||
| conf.notifier.stop() | ||
| elif install: | ||
| - root_check() | ||
| - if IS_INSTALLED_WITH_SNAP: | ||
| - running_daemon_check() | ||
| - gnome_power_detect_snap() | ||
| - tlp_service_detect_snap() | ||
| - bluetooth_notif_snap() | ||
| - gov_check() | ||
| - run("snapctl set daemon=enabled", shell=True) | ||
| - run("snapctl start --enable auto-cpufreq", shell=True) | ||
| - else: | ||
| - running_daemon_check() | ||
| - gov_check() | ||
| - deploy_daemon() | ||
| - deploy_complete_msg() | ||
| + print("install is disabled in the nix package") | ||
| elif update: | ||
| root_check() | ||
| custom_dir = "/opt/auto-cpufreq/source" | ||
| @@ -187,21 +174,7 @@ def main(monitor, live, daemon, install, update, remove, force, config, stats, g | ||
| run(["auto-cpufreq", "--version"]) | ||
| else: print("Aborted") | ||
| elif remove: | ||
| - root_check() | ||
| - if IS_INSTALLED_WITH_SNAP: | ||
| - run("snapctl set daemon=disabled", shell=True) | ||
| - run("snapctl stop --disable auto-cpufreq", shell=True) | ||
| - if auto_cpufreq_stats_path.exists(): | ||
| - if auto_cpufreq_stats_file is not None: | ||
| - auto_cpufreq_stats_file.close() | ||
| - | ||
| - auto_cpufreq_stats_path.unlink() | ||
| - # ToDo: | ||
| - # {the following snippet also used in --update, update it there too(if required)} | ||
| - # * undo bluetooth boot disable | ||
| - gnome_power_rm_reminder_snap() | ||
| - else: remove_daemon() | ||
| - remove_complete_msg() | ||
| + print("remove is disabled in the nix package") | ||
| elif stats: | ||
| not_running_daemon_check() | ||
| config_info_dialog() | ||
| diff --git a/auto_cpufreq/core.py b/auto_cpufreq/core.py | ||
| index f03e7de..2dff5fb 100755 | ||
| --- a/auto_cpufreq/core.py | ||
| +++ b/auto_cpufreq/core.py | ||
| @@ -277,19 +277,12 @@ def get_current_gov(): | ||
| ) | ||
|
|
||
| def cpufreqctl(): | ||
| - """ | ||
| - deploy cpufreqctl.auto-cpufreq script | ||
| - """ | ||
| - if not (IS_INSTALLED_WITH_SNAP or os.path.isfile("/usr/local/bin/cpufreqctl.auto-cpufreq")): | ||
| - copy(SCRIPTS_DIR / "cpufreqctl.sh", "/usr/local/bin/cpufreqctl.auto-cpufreq") | ||
| - call(["chmod", "a+x", "/usr/local/bin/cpufreqctl.auto-cpufreq"]) | ||
| + # scripts are already in the correct place | ||
| + pass | ||
|
|
||
| def cpufreqctl_restore(): | ||
| - """ | ||
| - remove cpufreqctl.auto-cpufreq script | ||
| - """ | ||
| - if not IS_INSTALLED_WITH_SNAP and os.path.isfile("/usr/local/bin/cpufreqctl.auto-cpufreq"): | ||
| - os.remove("/usr/local/bin/cpufreqctl.auto-cpufreq") | ||
| + #no need to restore | ||
| + pass | ||
|
|
||
| def footer(l=79): print("\n" + "-" * l + "\n") | ||
|
|
||
| @@ -307,31 +300,8 @@ def remove_complete_msg(): | ||
| footer() | ||
|
|
||
| def deploy_daemon(): | ||
| - print("\n" + "-" * 21 + " Deploying auto-cpufreq as a daemon " + "-" * 22 + "\n") | ||
| - | ||
| - cpufreqctl() # deploy cpufreqctl script func call | ||
| - | ||
| - bluetooth_disable() # turn off bluetooth on boot | ||
| - | ||
| - auto_cpufreq_stats_path.touch(exist_ok=True) | ||
| - | ||
| - print("\n* Deploy auto-cpufreq install script") | ||
| - copy(SCRIPTS_DIR / "auto-cpufreq-install.sh", "/usr/local/bin/auto-cpufreq-install") | ||
| - call(["chmod", "a+x", "/usr/local/bin/auto-cpufreq-install"]) | ||
| - | ||
| - print("\n* Deploy auto-cpufreq remove script") | ||
| - copy(SCRIPTS_DIR / "auto-cpufreq-remove.sh", "/usr/local/bin/auto-cpufreq-remove") | ||
| - call(["chmod", "a+x", "/usr/local/bin/auto-cpufreq-remove"]) | ||
| - | ||
| - # output warning if gnome power profile is running | ||
| - gnome_power_detect_install() | ||
| - gnome_power_svc_disable() | ||
| - | ||
| - tuned_svc_disable() | ||
| - | ||
| - tlp_service_detect() # output warning if TLP service is detected | ||
| - | ||
| - call("/usr/local/bin/auto-cpufreq-install", shell=True) | ||
| + # prevent needless copying and system changes | ||
| + pass | ||
|
|
||
| def deploy_daemon_performance(): | ||
| print("\n" + "-" * 21 + " Deploying auto-cpufreq as a daemon (performance) " + "-" * 22 + "\n") | ||
| @@ -363,37 +333,7 @@ def deploy_daemon_performance(): | ||
|
|
||
| call("/usr/local/bin/auto-cpufreq-install", shell=True) | ||
|
|
||
| -def remove_daemon(): | ||
| - # check if auto-cpufreq is installed | ||
| - if not os.path.exists("/usr/local/bin/auto-cpufreq-remove"): | ||
| - print("\nauto-cpufreq daemon is not installed.\n") | ||
| - sys.exit(1) | ||
| - | ||
| - print("\n" + "-" * 21 + " Removing auto-cpufreq daemon " + "-" * 22 + "\n") | ||
| - | ||
| - bluetooth_enable() # turn on bluetooth on boot | ||
| - | ||
| - # output warning if gnome power profile is stopped | ||
| - gnome_power_rm_reminder() | ||
| - gnome_power_svc_enable() | ||
| - | ||
| - tuned_svc_enable() | ||
| - | ||
| - # run auto-cpufreq daemon remove script | ||
| - call("/usr/local/bin/auto-cpufreq-remove", shell=True) | ||
| - | ||
| - # remove auto-cpufreq-remove | ||
| - os.remove("/usr/local/bin/auto-cpufreq-remove") | ||
| - | ||
| - # delete override pickle if it exists | ||
| - if os.path.exists(governor_override_state): os.remove(governor_override_state) | ||
| - | ||
| - # delete stats file | ||
| - if auto_cpufreq_stats_path.exists(): | ||
| - if auto_cpufreq_stats_file is not None: auto_cpufreq_stats_file.close() | ||
| - auto_cpufreq_stats_path.unlink() | ||
| - | ||
| - cpufreqctl_restore() # restore original cpufrectl script | ||
| +def remove_daemon(): pass | ||
|
|
||
| def gov_check(): | ||
| for gov in AVAILABLE_GOVERNORS: |
Oops, something went wrong.