Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

safeeyes: use the installed share files #269445

Merged
merged 2 commits into from
Dec 6, 2023
Merged

safeeyes: use the installed share files #269445

merged 2 commits into from
Dec 6, 2023

Conversation

linsui
Copy link
Contributor

@linsui linsui commented Nov 23, 2023

Description of changes

Upstream uses absolute path for data_files which is not supported since at least 10 years ago. See pypa/wheel#92. It produces a share directories in lib/python3.11/site-packages/nix/store/qp5zys77biz7imbk6yy85q5pdv7qk84j-python3-3.11.6/share/.

Things done

  • Built on platform(s)
    • x86_64-linux
    • aarch64-linux
    • x86_64-darwin
    • aarch64-darwin
  • For non-Linux: Is sandboxing enabled in nix.conf? (See Nix manual)
    • sandbox = relaxed
    • sandbox = true
  • Tested, as applicable:
  • Tested compilation of all packages that depend on this change using nix-shell -p nixpkgs-review --run "nixpkgs-review rev HEAD". Note: all changes have to be committed, also see nixpkgs-review usage
  • Tested basic functionality of all binary files (usually in ./result/bin/)
  • 23.11 Release Notes (or backporting 23.05 Release notes)
    • (Package updates) Added a release notes entry if the change is major or breaking
    • (Module updates) Added a release notes entry if the change is significant
    • (Module addition) Added a release notes entry if adding a new NixOS module
  • Fits CONTRIBUTING.md.

Priorities

Add a 👍 reaction to pull requests you find important.

@ofborg ofborg bot requested a review from srghma November 23, 2023 17:20
@ofborg ofborg bot added 10.rebuild-darwin: 0 This PR does not cause any packages to rebuild on Darwin 10.rebuild-linux: 1-10 10.rebuild-linux: 1 labels Nov 23, 2023
@nixos-discourse
Copy link

This pull request has been mentioned on NixOS Discourse. There might be relevant details there:

https://discourse.nixos.org/t/prs-ready-for-review/3032/3000

Copy link
Contributor

@onemoresuza onemoresuza left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Reviewed points

Result of nixpkgs-review pr 269445 run on x86_64-linux 1

2 packages built:
  • safeeyes
  • safeeyes.dist
  • package name fits guidelines
  • package version fits guidelines
  • package builds on x86_64-linux
  • executables tested on x86_64-linux
  • all depending packages build

Co-authored-by: Peder Bergebakken Sundt <pbsds@hotmail.com>
@pbsds
Copy link
Member

pbsds commented Dec 6, 2023

diff <(fd . result | sort) <(fd . results/safeeyes | sd 'results/safeeyes' 'result' | sd -s python3.11 python3.10 | sd 311 310 | sort)
--- /dev/fd/63	2023-12-06 01:14:24.368556927 +0100
+++ /dev/fd/62	2023-12-06 01:14:24.369556913 +0100
@@ -3,57 +3,14 @@
 result/lib/
 result/lib/python3.10/
 result/lib/python3.10/site-packages/
-result/lib/python3.10/site-packages/nix/
-result/lib/python3.10/site-packages/nix/store/
-result/lib/python3.10/site-packages/nix/store/bc45k1n0pkrdkr3xa6w84w1xhkl1kkyp-python3-3.10.12/
-result/lib/python3.10/site-packages/nix/store/bc45k1n0pkrdkr3xa6w84w1xhkl1kkyp-python3-3.10.12/share/
-result/lib/python3.10/site-packages/nix/store/bc45k1n0pkrdkr3xa6w84w1xhkl1kkyp-python3-3.10.12/share/applications/
-result/lib/python3.10/site-packages/nix/store/bc45k1n0pkrdkr3xa6w84w1xhkl1kkyp-python3-3.10.12/share/applications/safeeyes.desktop
-result/lib/python3.10/site-packages/nix/store/bc45k1n0pkrdkr3xa6w84w1xhkl1kkyp-python3-3.10.12/share/icons/
-result/lib/python3.10/site-packages/nix/store/bc45k1n0pkrdkr3xa6w84w1xhkl1kkyp-python3-3.10.12/share/icons/hicolor/
-result/lib/python3.10/site-packages/nix/store/bc45k1n0pkrdkr3xa6w84w1xhkl1kkyp-python3-3.10.12/share/icons/hicolor/128x128/
-result/lib/python3.10/site-packages/nix/store/bc45k1n0pkrdkr3xa6w84w1xhkl1kkyp-python3-3.10.12/share/icons/hicolor/128x128/apps/
-result/lib/python3.10/site-packages/nix/store/bc45k1n0pkrdkr3xa6w84w1xhkl1kkyp-python3-3.10.12/share/icons/hicolor/128x128/apps/safeeyes.png
-result/lib/python3.10/site-packages/nix/store/bc45k1n0pkrdkr3xa6w84w1xhkl1kkyp-python3-3.10.12/share/icons/hicolor/16x16/
-result/lib/python3.10/site-packages/nix/store/bc45k1n0pkrdkr3xa6w84w1xhkl1kkyp-python3-3.10.12/share/icons/hicolor/16x16/apps/
-result/lib/python3.10/site-packages/nix/store/bc45k1n0pkrdkr3xa6w84w1xhkl1kkyp-python3-3.10.12/share/icons/hicolor/16x16/apps/safeeyes.png
-result/lib/python3.10/site-packages/nix/store/bc45k1n0pkrdkr3xa6w84w1xhkl1kkyp-python3-3.10.12/share/icons/hicolor/16x16/status/
-result/lib/python3.10/site-packages/nix/store/bc45k1n0pkrdkr3xa6w84w1xhkl1kkyp-python3-3.10.12/share/icons/hicolor/16x16/status/safeeyes_disabled.png
-result/lib/python3.10/site-packages/nix/store/bc45k1n0pkrdkr3xa6w84w1xhkl1kkyp-python3-3.10.12/share/icons/hicolor/16x16/status/safeeyes_enabled.png
-result/lib/python3.10/site-packages/nix/store/bc45k1n0pkrdkr3xa6w84w1xhkl1kkyp-python3-3.10.12/share/icons/hicolor/16x16/status/safeeyes_timer.png
-result/lib/python3.10/site-packages/nix/store/bc45k1n0pkrdkr3xa6w84w1xhkl1kkyp-python3-3.10.12/share/icons/hicolor/24x24/
-result/lib/python3.10/site-packages/nix/store/bc45k1n0pkrdkr3xa6w84w1xhkl1kkyp-python3-3.10.12/share/icons/hicolor/24x24/apps/
-result/lib/python3.10/site-packages/nix/store/bc45k1n0pkrdkr3xa6w84w1xhkl1kkyp-python3-3.10.12/share/icons/hicolor/24x24/apps/safeeyes.png
-result/lib/python3.10/site-packages/nix/store/bc45k1n0pkrdkr3xa6w84w1xhkl1kkyp-python3-3.10.12/share/icons/hicolor/24x24/status/
-result/lib/python3.10/site-packages/nix/store/bc45k1n0pkrdkr3xa6w84w1xhkl1kkyp-python3-3.10.12/share/icons/hicolor/24x24/status/safeeyes_disabled.png
-result/lib/python3.10/site-packages/nix/store/bc45k1n0pkrdkr3xa6w84w1xhkl1kkyp-python3-3.10.12/share/icons/hicolor/24x24/status/safeeyes_enabled.png
-result/lib/python3.10/site-packages/nix/store/bc45k1n0pkrdkr3xa6w84w1xhkl1kkyp-python3-3.10.12/share/icons/hicolor/24x24/status/safeeyes_timer.png
-result/lib/python3.10/site-packages/nix/store/bc45k1n0pkrdkr3xa6w84w1xhkl1kkyp-python3-3.10.12/share/icons/hicolor/32x32/
-result/lib/python3.10/site-packages/nix/store/bc45k1n0pkrdkr3xa6w84w1xhkl1kkyp-python3-3.10.12/share/icons/hicolor/32x32/apps/
-result/lib/python3.10/site-packages/nix/store/bc45k1n0pkrdkr3xa6w84w1xhkl1kkyp-python3-3.10.12/share/icons/hicolor/32x32/apps/safeeyes.png
-result/lib/python3.10/site-packages/nix/store/bc45k1n0pkrdkr3xa6w84w1xhkl1kkyp-python3-3.10.12/share/icons/hicolor/32x32/status/
-result/lib/python3.10/site-packages/nix/store/bc45k1n0pkrdkr3xa6w84w1xhkl1kkyp-python3-3.10.12/share/icons/hicolor/32x32/status/safeeyes_disabled.png
-result/lib/python3.10/site-packages/nix/store/bc45k1n0pkrdkr3xa6w84w1xhkl1kkyp-python3-3.10.12/share/icons/hicolor/32x32/status/safeeyes_enabled.png
-result/lib/python3.10/site-packages/nix/store/bc45k1n0pkrdkr3xa6w84w1xhkl1kkyp-python3-3.10.12/share/icons/hicolor/48x48/
-result/lib/python3.10/site-packages/nix/store/bc45k1n0pkrdkr3xa6w84w1xhkl1kkyp-python3-3.10.12/share/icons/hicolor/48x48/apps/
-result/lib/python3.10/site-packages/nix/store/bc45k1n0pkrdkr3xa6w84w1xhkl1kkyp-python3-3.10.12/share/icons/hicolor/48x48/apps/safeeyes.png
-result/lib/python3.10/site-packages/nix/store/bc45k1n0pkrdkr3xa6w84w1xhkl1kkyp-python3-3.10.12/share/icons/hicolor/48x48/status/
-result/lib/python3.10/site-packages/nix/store/bc45k1n0pkrdkr3xa6w84w1xhkl1kkyp-python3-3.10.12/share/icons/hicolor/48x48/status/safeeyes_disabled.png
-result/lib/python3.10/site-packages/nix/store/bc45k1n0pkrdkr3xa6w84w1xhkl1kkyp-python3-3.10.12/share/icons/hicolor/48x48/status/safeeyes_enabled.png
-result/lib/python3.10/site-packages/nix/store/bc45k1n0pkrdkr3xa6w84w1xhkl1kkyp-python3-3.10.12/share/icons/hicolor/64x64/
-result/lib/python3.10/site-packages/nix/store/bc45k1n0pkrdkr3xa6w84w1xhkl1kkyp-python3-3.10.12/share/icons/hicolor/64x64/apps/
-result/lib/python3.10/site-packages/nix/store/bc45k1n0pkrdkr3xa6w84w1xhkl1kkyp-python3-3.10.12/share/icons/hicolor/64x64/apps/safeeyes.png
 result/lib/python3.10/site-packages/safeeyes/
-result/lib/python3.10/site-packages/safeeyes-2.1.5.dist-info/
-result/lib/python3.10/site-packages/safeeyes-2.1.5.dist-info/direct_url.json
-result/lib/python3.10/site-packages/safeeyes-2.1.5.dist-info/entry_points.txt
-result/lib/python3.10/site-packages/safeeyes-2.1.5.dist-info/INSTALLER
-result/lib/python3.10/site-packages/safeeyes-2.1.5.dist-info/LICENSE
-result/lib/python3.10/site-packages/safeeyes-2.1.5.dist-info/METADATA
-result/lib/python3.10/site-packages/safeeyes-2.1.5.dist-info/RECORD
-result/lib/python3.10/site-packages/safeeyes-2.1.5.dist-info/REQUESTED
-result/lib/python3.10/site-packages/safeeyes-2.1.5.dist-info/top_level.txt
-result/lib/python3.10/site-packages/safeeyes-2.1.5.dist-info/WHEEL
+result/lib/python3.10/site-packages/safeeyes-2.1.6.dist-info/
+result/lib/python3.10/site-packages/safeeyes-2.1.6.dist-info/entry_points.txt
+result/lib/python3.10/site-packages/safeeyes-2.1.6.dist-info/LICENSE
+result/lib/python3.10/site-packages/safeeyes-2.1.6.dist-info/METADATA
+result/lib/python3.10/site-packages/safeeyes-2.1.6.dist-info/RECORD
+result/lib/python3.10/site-packages/safeeyes-2.1.6.dist-info/top_level.txt
+result/lib/python3.10/site-packages/safeeyes-2.1.6.dist-info/WHEEL
 result/lib/python3.10/site-packages/safeeyes/config/
 result/lib/python3.10/site-packages/safeeyes/config/locale/
 result/lib/python3.10/site-packages/safeeyes/config/locale/ar/
@@ -245,37 +202,38 @@
 result/lib/python3.10/site-packages/safeeyes/platform/icons/hicolor/
 result/lib/python3.10/site-packages/safeeyes/platform/icons/hicolor/128x128/
 result/lib/python3.10/site-packages/safeeyes/platform/icons/hicolor/128x128/apps/
-result/lib/python3.10/site-packages/safeeyes/platform/icons/hicolor/128x128/apps/safeeyes.png
+result/lib/python3.10/site-packages/safeeyes/platform/icons/hicolor/128x128/apps/io.github.slgobinath.SafeEyes.png
 result/lib/python3.10/site-packages/safeeyes/platform/icons/hicolor/16x16/
 result/lib/python3.10/site-packages/safeeyes/platform/icons/hicolor/16x16/apps/
-result/lib/python3.10/site-packages/safeeyes/platform/icons/hicolor/16x16/apps/safeeyes.png
+result/lib/python3.10/site-packages/safeeyes/platform/icons/hicolor/16x16/apps/io.github.slgobinath.SafeEyes.png
 result/lib/python3.10/site-packages/safeeyes/platform/icons/hicolor/16x16/status/
-result/lib/python3.10/site-packages/safeeyes/platform/icons/hicolor/16x16/status/safeeyes_disabled.png
-result/lib/python3.10/site-packages/safeeyes/platform/icons/hicolor/16x16/status/safeeyes_enabled.png
-result/lib/python3.10/site-packages/safeeyes/platform/icons/hicolor/16x16/status/safeeyes_timer.png
+result/lib/python3.10/site-packages/safeeyes/platform/icons/hicolor/16x16/status/io.github.slgobinath.SafeEyes-disabled.png
+result/lib/python3.10/site-packages/safeeyes/platform/icons/hicolor/16x16/status/io.github.slgobinath.SafeEyes-enabled.png
+result/lib/python3.10/site-packages/safeeyes/platform/icons/hicolor/16x16/status/io.github.slgobinath.SafeEyes-timer.png
 result/lib/python3.10/site-packages/safeeyes/platform/icons/hicolor/24x24/
 result/lib/python3.10/site-packages/safeeyes/platform/icons/hicolor/24x24/apps/
-result/lib/python3.10/site-packages/safeeyes/platform/icons/hicolor/24x24/apps/safeeyes.png
+result/lib/python3.10/site-packages/safeeyes/platform/icons/hicolor/24x24/apps/io.github.slgobinath.SafeEyes.png
 result/lib/python3.10/site-packages/safeeyes/platform/icons/hicolor/24x24/status/
-result/lib/python3.10/site-packages/safeeyes/platform/icons/hicolor/24x24/status/safeeyes_disabled.png
-result/lib/python3.10/site-packages/safeeyes/platform/icons/hicolor/24x24/status/safeeyes_enabled.png
-result/lib/python3.10/site-packages/safeeyes/platform/icons/hicolor/24x24/status/safeeyes_timer.png
+result/lib/python3.10/site-packages/safeeyes/platform/icons/hicolor/24x24/status/io.github.slgobinath.SafeEyes-disabled.png
+result/lib/python3.10/site-packages/safeeyes/platform/icons/hicolor/24x24/status/io.github.slgobinath.SafeEyes-enabled.png
+result/lib/python3.10/site-packages/safeeyes/platform/icons/hicolor/24x24/status/io.github.slgobinath.SafeEyes-timer.png
 result/lib/python3.10/site-packages/safeeyes/platform/icons/hicolor/32x32/
 result/lib/python3.10/site-packages/safeeyes/platform/icons/hicolor/32x32/apps/
-result/lib/python3.10/site-packages/safeeyes/platform/icons/hicolor/32x32/apps/safeeyes.png
+result/lib/python3.10/site-packages/safeeyes/platform/icons/hicolor/32x32/apps/io.github.slgobinath.SafeEyes.png
 result/lib/python3.10/site-packages/safeeyes/platform/icons/hicolor/32x32/status/
-result/lib/python3.10/site-packages/safeeyes/platform/icons/hicolor/32x32/status/safeeyes_disabled.png
-result/lib/python3.10/site-packages/safeeyes/platform/icons/hicolor/32x32/status/safeeyes_enabled.png
+result/lib/python3.10/site-packages/safeeyes/platform/icons/hicolor/32x32/status/io.github.slgobinath.SafeEyes-disabled.png
+result/lib/python3.10/site-packages/safeeyes/platform/icons/hicolor/32x32/status/io.github.slgobinath.SafeEyes-enabled.png
 result/lib/python3.10/site-packages/safeeyes/platform/icons/hicolor/48x48/
 result/lib/python3.10/site-packages/safeeyes/platform/icons/hicolor/48x48/apps/
-result/lib/python3.10/site-packages/safeeyes/platform/icons/hicolor/48x48/apps/safeeyes.png
+result/lib/python3.10/site-packages/safeeyes/platform/icons/hicolor/48x48/apps/io.github.slgobinath.SafeEyes.png
 result/lib/python3.10/site-packages/safeeyes/platform/icons/hicolor/48x48/status/
-result/lib/python3.10/site-packages/safeeyes/platform/icons/hicolor/48x48/status/safeeyes_disabled.png
-result/lib/python3.10/site-packages/safeeyes/platform/icons/hicolor/48x48/status/safeeyes_enabled.png
+result/lib/python3.10/site-packages/safeeyes/platform/icons/hicolor/48x48/status/io.github.slgobinath.SafeEyes-disabled.png
+result/lib/python3.10/site-packages/safeeyes/platform/icons/hicolor/48x48/status/io.github.slgobinath.SafeEyes-enabled.png
 result/lib/python3.10/site-packages/safeeyes/platform/icons/hicolor/64x64/
 result/lib/python3.10/site-packages/safeeyes/platform/icons/hicolor/64x64/apps/
-result/lib/python3.10/site-packages/safeeyes/platform/icons/hicolor/64x64/apps/safeeyes.png
-result/lib/python3.10/site-packages/safeeyes/platform/safeeyes.desktop
+result/lib/python3.10/site-packages/safeeyes/platform/icons/hicolor/64x64/apps/io.github.slgobinath.SafeEyes.png
+result/lib/python3.10/site-packages/safeeyes/platform/io.github.slgobinath.SafeEyes.desktop
+result/lib/python3.10/site-packages/safeeyes/platform/io.github.slgobinath.SafeEyes.metainfo.xml
 result/lib/python3.10/site-packages/safeeyes/plugin_manager.py
 result/lib/python3.10/site-packages/safeeyes/plugins/
 result/lib/python3.10/site-packages/safeeyes/plugins/audiblealert/
@@ -283,6 +241,7 @@
 result/lib/python3.10/site-packages/safeeyes/plugins/audiblealert/icon.png
 result/lib/python3.10/site-packages/safeeyes/plugins/audiblealert/plugin.py
 result/lib/python3.10/site-packages/safeeyes/plugins/audiblealert/__pycache__/
+result/lib/python3.10/site-packages/safeeyes/plugins/audiblealert/__pycache__/plugin.cpython-310.opt-1.pyc
 result/lib/python3.10/site-packages/safeeyes/plugins/audiblealert/__pycache__/plugin.cpython-310.pyc
 result/lib/python3.10/site-packages/safeeyes/plugins/donotdisturb/
 result/lib/python3.10/site-packages/safeeyes/plugins/donotdisturb/config.json
@@ -290,7 +249,9 @@
 result/lib/python3.10/site-packages/safeeyes/plugins/donotdisturb/icon.png
 result/lib/python3.10/site-packages/safeeyes/plugins/donotdisturb/plugin.py
 result/lib/python3.10/site-packages/safeeyes/plugins/donotdisturb/__pycache__/
+result/lib/python3.10/site-packages/safeeyes/plugins/donotdisturb/__pycache__/dependency_checker.cpython-310.opt-1.pyc
 result/lib/python3.10/site-packages/safeeyes/plugins/donotdisturb/__pycache__/dependency_checker.cpython-310.pyc
+result/lib/python3.10/site-packages/safeeyes/plugins/donotdisturb/__pycache__/plugin.cpython-310.opt-1.pyc
 result/lib/python3.10/site-packages/safeeyes/plugins/donotdisturb/__pycache__/plugin.cpython-310.pyc
 result/lib/python3.10/site-packages/safeeyes/plugins/healthstats/
 result/lib/python3.10/site-packages/safeeyes/plugins/healthstats/config.json
@@ -298,13 +259,16 @@
 result/lib/python3.10/site-packages/safeeyes/plugins/healthstats/icon.png
 result/lib/python3.10/site-packages/safeeyes/plugins/healthstats/plugin.py
 result/lib/python3.10/site-packages/safeeyes/plugins/healthstats/__pycache__/
+result/lib/python3.10/site-packages/safeeyes/plugins/healthstats/__pycache__/dependency_checker.cpython-310.opt-1.pyc
 result/lib/python3.10/site-packages/safeeyes/plugins/healthstats/__pycache__/dependency_checker.cpython-310.pyc
+result/lib/python3.10/site-packages/safeeyes/plugins/healthstats/__pycache__/plugin.cpython-310.opt-1.pyc
 result/lib/python3.10/site-packages/safeeyes/plugins/healthstats/__pycache__/plugin.cpython-310.pyc
 result/lib/python3.10/site-packages/safeeyes/plugins/mediacontrol/
 result/lib/python3.10/site-packages/safeeyes/plugins/mediacontrol/config.json
 result/lib/python3.10/site-packages/safeeyes/plugins/mediacontrol/icon.png
 result/lib/python3.10/site-packages/safeeyes/plugins/mediacontrol/plugin.py
 result/lib/python3.10/site-packages/safeeyes/plugins/mediacontrol/__pycache__/
+result/lib/python3.10/site-packages/safeeyes/plugins/mediacontrol/__pycache__/plugin.cpython-310.opt-1.pyc
 result/lib/python3.10/site-packages/safeeyes/plugins/mediacontrol/__pycache__/plugin.cpython-310.pyc
 result/lib/python3.10/site-packages/safeeyes/plugins/mediacontrol/resource/
 result/lib/python3.10/site-packages/safeeyes/plugins/mediacontrol/resource/pause.png
@@ -313,12 +277,14 @@
 result/lib/python3.10/site-packages/safeeyes/plugins/notification/icon.png
 result/lib/python3.10/site-packages/safeeyes/plugins/notification/plugin.py
 result/lib/python3.10/site-packages/safeeyes/plugins/notification/__pycache__/
+result/lib/python3.10/site-packages/safeeyes/plugins/notification/__pycache__/plugin.cpython-310.opt-1.pyc
 result/lib/python3.10/site-packages/safeeyes/plugins/notification/__pycache__/plugin.cpython-310.pyc
 result/lib/python3.10/site-packages/safeeyes/plugins/screensaver/
 result/lib/python3.10/site-packages/safeeyes/plugins/screensaver/config.json
 result/lib/python3.10/site-packages/safeeyes/plugins/screensaver/icon.png
 result/lib/python3.10/site-packages/safeeyes/plugins/screensaver/plugin.py
 result/lib/python3.10/site-packages/safeeyes/plugins/screensaver/__pycache__/
+result/lib/python3.10/site-packages/safeeyes/plugins/screensaver/__pycache__/plugin.cpython-310.opt-1.pyc
 result/lib/python3.10/site-packages/safeeyes/plugins/screensaver/__pycache__/plugin.cpython-310.pyc
 result/lib/python3.10/site-packages/safeeyes/plugins/screensaver/resource/
 result/lib/python3.10/site-packages/safeeyes/plugins/screensaver/resource/lock.png
@@ -328,22 +294,33 @@
 result/lib/python3.10/site-packages/safeeyes/plugins/smartpause/icon.png
 result/lib/python3.10/site-packages/safeeyes/plugins/smartpause/plugin.py
 result/lib/python3.10/site-packages/safeeyes/plugins/smartpause/__pycache__/
+result/lib/python3.10/site-packages/safeeyes/plugins/smartpause/__pycache__/dependency_checker.cpython-310.opt-1.pyc
 result/lib/python3.10/site-packages/safeeyes/plugins/smartpause/__pycache__/dependency_checker.cpython-310.pyc
+result/lib/python3.10/site-packages/safeeyes/plugins/smartpause/__pycache__/plugin.cpython-310.opt-1.pyc
 result/lib/python3.10/site-packages/safeeyes/plugins/smartpause/__pycache__/plugin.cpython-310.pyc
 result/lib/python3.10/site-packages/safeeyes/plugins/trayicon/
 result/lib/python3.10/site-packages/safeeyes/plugins/trayicon/config.json
 result/lib/python3.10/site-packages/safeeyes/plugins/trayicon/icon.png
 result/lib/python3.10/site-packages/safeeyes/plugins/trayicon/plugin.py
 result/lib/python3.10/site-packages/safeeyes/plugins/trayicon/__pycache__/
+result/lib/python3.10/site-packages/safeeyes/plugins/trayicon/__pycache__/plugin.cpython-310.opt-1.pyc
 result/lib/python3.10/site-packages/safeeyes/plugins/trayicon/__pycache__/plugin.cpython-310.pyc
 result/lib/python3.10/site-packages/safeeyes/__pycache__/
+result/lib/python3.10/site-packages/safeeyes/__pycache__/core.cpython-310.opt-1.pyc
 result/lib/python3.10/site-packages/safeeyes/__pycache__/core.cpython-310.pyc
+result/lib/python3.10/site-packages/safeeyes/__pycache__/__init__.cpython-310.opt-1.pyc
 result/lib/python3.10/site-packages/safeeyes/__pycache__/__init__.cpython-310.pyc
+result/lib/python3.10/site-packages/safeeyes/__pycache__/__main__.cpython-310.opt-1.pyc
 result/lib/python3.10/site-packages/safeeyes/__pycache__/__main__.cpython-310.pyc
+result/lib/python3.10/site-packages/safeeyes/__pycache__/model.cpython-310.opt-1.pyc
 result/lib/python3.10/site-packages/safeeyes/__pycache__/model.cpython-310.pyc
+result/lib/python3.10/site-packages/safeeyes/__pycache__/plugin_manager.cpython-310.opt-1.pyc
 result/lib/python3.10/site-packages/safeeyes/__pycache__/plugin_manager.cpython-310.pyc
+result/lib/python3.10/site-packages/safeeyes/__pycache__/rpc.cpython-310.opt-1.pyc
 result/lib/python3.10/site-packages/safeeyes/__pycache__/rpc.cpython-310.pyc
+result/lib/python3.10/site-packages/safeeyes/__pycache__/safeeyes.cpython-310.opt-1.pyc
 result/lib/python3.10/site-packages/safeeyes/__pycache__/safeeyes.cpython-310.pyc
+result/lib/python3.10/site-packages/safeeyes/__pycache__/utility.cpython-310.opt-1.pyc
 result/lib/python3.10/site-packages/safeeyes/__pycache__/utility.cpython-310.pyc
 result/lib/python3.10/site-packages/safeeyes/resource/
 result/lib/python3.10/site-packages/safeeyes/resource/ic_plugin.png
@@ -357,9 +334,13 @@
 result/lib/python3.10/site-packages/safeeyes/ui/break_screen.py
 result/lib/python3.10/site-packages/safeeyes/ui/__init__.py
 result/lib/python3.10/site-packages/safeeyes/ui/__pycache__/
+result/lib/python3.10/site-packages/safeeyes/ui/__pycache__/about_dialog.cpython-310.opt-1.pyc
 result/lib/python3.10/site-packages/safeeyes/ui/__pycache__/about_dialog.cpython-310.pyc
+result/lib/python3.10/site-packages/safeeyes/ui/__pycache__/break_screen.cpython-310.opt-1.pyc
 result/lib/python3.10/site-packages/safeeyes/ui/__pycache__/break_screen.cpython-310.pyc
+result/lib/python3.10/site-packages/safeeyes/ui/__pycache__/__init__.cpython-310.opt-1.pyc
 result/lib/python3.10/site-packages/safeeyes/ui/__pycache__/__init__.cpython-310.pyc
+result/lib/python3.10/site-packages/safeeyes/ui/__pycache__/settings_dialog.cpython-310.opt-1.pyc
 result/lib/python3.10/site-packages/safeeyes/ui/__pycache__/settings_dialog.cpython-310.pyc
 result/lib/python3.10/site-packages/safeeyes/ui/settings_dialog.py
 result/lib/python3.10/site-packages/safeeyes/utility.py
@@ -367,38 +348,38 @@
 result/nix-support/propagated-build-inputs
 result/share/
 result/share/applications/
-result/share/applications/safeeyes.desktop
+result/share/applications/io.github.slgobinath.SafeEyes.desktop
 result/share/icons/
 result/share/icons/hicolor/
 result/share/icons/hicolor/128x128/
 result/share/icons/hicolor/128x128/apps/
-result/share/icons/hicolor/128x128/apps/safeeyes.png
+result/share/icons/hicolor/128x128/apps/io.github.slgobinath.SafeEyes.png
 result/share/icons/hicolor/16x16/
 result/share/icons/hicolor/16x16/apps/
-result/share/icons/hicolor/16x16/apps/safeeyes.png
+result/share/icons/hicolor/16x16/apps/io.github.slgobinath.SafeEyes.png
 result/share/icons/hicolor/16x16/status/
-result/share/icons/hicolor/16x16/status/safeeyes_disabled.png
-result/share/icons/hicolor/16x16/status/safeeyes_enabled.png
-result/share/icons/hicolor/16x16/status/safeeyes_timer.png
+result/share/icons/hicolor/16x16/status/io.github.slgobinath.SafeEyes-disabled.png
+result/share/icons/hicolor/16x16/status/io.github.slgobinath.SafeEyes-enabled.png
+result/share/icons/hicolor/16x16/status/io.github.slgobinath.SafeEyes-timer.png
 result/share/icons/hicolor/24x24/
 result/share/icons/hicolor/24x24/apps/
-result/share/icons/hicolor/24x24/apps/safeeyes.png
+result/share/icons/hicolor/24x24/apps/io.github.slgobinath.SafeEyes.png
 result/share/icons/hicolor/24x24/status/
-result/share/icons/hicolor/24x24/status/safeeyes_disabled.png
-result/share/icons/hicolor/24x24/status/safeeyes_enabled.png
-result/share/icons/hicolor/24x24/status/safeeyes_timer.png
+result/share/icons/hicolor/24x24/status/io.github.slgobinath.SafeEyes-disabled.png
+result/share/icons/hicolor/24x24/status/io.github.slgobinath.SafeEyes-enabled.png
+result/share/icons/hicolor/24x24/status/io.github.slgobinath.SafeEyes-timer.png
 result/share/icons/hicolor/32x32/
 result/share/icons/hicolor/32x32/apps/
-result/share/icons/hicolor/32x32/apps/safeeyes.png
+result/share/icons/hicolor/32x32/apps/io.github.slgobinath.SafeEyes.png
 result/share/icons/hicolor/32x32/status/
-result/share/icons/hicolor/32x32/status/safeeyes_disabled.png
-result/share/icons/hicolor/32x32/status/safeeyes_enabled.png
+result/share/icons/hicolor/32x32/status/io.github.slgobinath.SafeEyes-disabled.png
+result/share/icons/hicolor/32x32/status/io.github.slgobinath.SafeEyes-enabled.png
 result/share/icons/hicolor/48x48/
 result/share/icons/hicolor/48x48/apps/
-result/share/icons/hicolor/48x48/apps/safeeyes.png
+result/share/icons/hicolor/48x48/apps/io.github.slgobinath.SafeEyes.png
 result/share/icons/hicolor/48x48/status/
-result/share/icons/hicolor/48x48/status/safeeyes_disabled.png
-result/share/icons/hicolor/48x48/status/safeeyes_enabled.png
+result/share/icons/hicolor/48x48/status/io.github.slgobinath.SafeEyes-disabled.png
+result/share/icons/hicolor/48x48/status/io.github.slgobinath.SafeEyes-enabled.png
 result/share/icons/hicolor/64x64/
 result/share/icons/hicolor/64x64/apps/
-result/share/icons/hicolor/64x64/apps/safeeyes.png
+result/share/icons/hicolor/64x64/apps/io.github.slgobinath.SafeEyes.png

The Icon in the desktop entry properly points at io.github.slgobinath.SafeEyes, LGTM.

Thanks!

@pbsds pbsds merged commit 745ee32 into NixOS:master Dec 6, 2023
22 checks passed
@linsui linsui deleted the safeeyes branch December 6, 2023 04:56
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
10.rebuild-darwin: 0 This PR does not cause any packages to rebuild on Darwin 10.rebuild-linux: 1-10 10.rebuild-linux: 1
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants