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

input-remapper: 1.5.0 -> 2.0.1 #249777

Merged
merged 1 commit into from
Dec 4, 2023
Merged

Conversation

LunNova
Copy link
Member

@LunNova LunNova commented Aug 17, 2023

Corrected data path replacement and moved to python 3.10 as pydbus
doesn't support 3.11

https://github.com/sezanzeb/input-remapper/releases/tag/2.0.0
https://github.com/sezanzeb/input-remapper/releases/tag/2.0.1

Description of changes

Things done

  • Built on platform(s)
    • x86_64-linux
    • aarch64-linux
    • x86_64-darwin
    • aarch64-darwin
  • For non-Linux: Is sandbox = true set in nix.conf? (See Nix manual)
  • 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.

@LunNova LunNova mentioned this pull request Aug 17, 2023
13 tasks
@ofborg ofborg bot added 11.by: package-maintainer This PR was created by the maintainer of the package it changes 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 Aug 17, 2023
@LunNova LunNova force-pushed the lunnova/input-remapper-2.x branch 2 times, most recently from 164feb2 to 4ea81cf Compare October 22, 2023 08:04
@LunNova LunNova changed the title input-remapper: 1.5.0 -> 2.0.0 input-remapper: 1.5.0 -> 2.0.1 Oct 22, 2023
@LunNova
Copy link
Member Author

LunNova commented Oct 22, 2023

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

2 packages built:
  • input-remapper
  • input-remapper.dist

@LunNova LunNova marked this pull request as ready for review October 22, 2023 08:09
@LunNova

This comment was marked as outdated.

@LunNova LunNova marked this pull request as draft October 22, 2023 08:21
@ofborg ofborg bot added the 8.has: package (new) This PR adds a new package label Oct 22, 2023
@LunNova LunNova force-pushed the lunnova/input-remapper-2.x branch from 4ea81cf to 5d7710b Compare October 22, 2023 13:31
@github-actions github-actions bot added the 6.topic: nixos Issues or PRs affecting NixOS modules, or package usability issues specific to NixOS label Oct 22, 2023
@LunNova LunNova marked this pull request as ready for review October 22, 2023 13:32
@LunNova
Copy link
Member Author

LunNova commented Oct 22, 2023

@ofborg build input-remapper.tests input-remapper

@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/2822

@Slabity
Copy link
Contributor

Slabity commented Nov 11, 2023

I've been using this fix for my system for about a week without any major issues.

Anything that I can do/test to help this get merged?

@LunNova
Copy link
Member Author

LunNova commented Nov 11, 2023

I'm happy with it, just needs approved and merged!

Comment on lines 9431 to 9432
#python310 as pydbus does not build on 3.11
input-remapper = python310Packages.callPackage ../tools/inputmethods/input-remapper { };
Copy link

Choose a reason for hiding this comment

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

pydbus supports python3.11 as of #263669

Suggested change
#python310 as pydbus does not build on 3.11
input-remapper = python310Packages.callPackage ../tools/inputmethods/input-remapper { };
input-remapper = python3Packages.callPackage ../tools/inputmethods/input-remapper { };

Copy link
Member Author

Choose a reason for hiding this comment

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

oh nice

Copy link
Member Author

Choose a reason for hiding this comment

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

reverting that might have made the nixos test hang or this laptop i tested on is just way too slow, asked ofborg to run them

Copy link
Member Author

Choose a reason for hiding this comment

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

looks like it passed on ofborg

@LunNova LunNova force-pushed the lunnova/input-remapper-2.x branch from 5d7710b to a95b6e1 Compare November 11, 2023 11:00
@LunNova
Copy link
Member Author

LunNova commented Nov 11, 2023

@ofborg build input-remapper.tests input-remapper

@LunNova LunNova requested a review from a user November 11, 2023 11:03
Copy link

@ghost ghost left a comment

Choose a reason for hiding this comment

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

LGTM
Result of nixpkgs-review pr 249777 run on x86_64-linux 1

2 packages built:
  • input-remapper
  • input-remapper.dist

@LunNova
Copy link
Member Author

LunNova commented Nov 19, 2023

@SuperSandro2000 can you rereview?

@LunNova LunNova force-pushed the lunnova/input-remapper-2.x branch from 9552fd4 to 1356903 Compare November 19, 2023 19:02
@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/2997

@pbsds pbsds merged commit 58ffd55 into NixOS:master Dec 4, 2023
};

postPatch = ''
# fix FHS paths
substituteInPlace inputremapper/configs/data.py \
--replace "/usr/share/input-remapper" "$out/usr/share/input-remapper"
--replace "/usr/share" "$out/usr/share"
Copy link
Contributor

Choose a reason for hiding this comment

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

Why is it $out/usr/share instead of $out/share?

Just notice this when resolving merge conflicts for #271387.

Copy link
Member

Choose a reason for hiding this comment

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

Good question, the default path in nixpkgs would be just $out/share

Copy link
Member Author

@LunNova LunNova Dec 4, 2023

Choose a reason for hiding this comment

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

The setup.py in the input-remapper repo ends up placing data there. Could change it, means patching more places.

https://github.com/sezanzeb/input-remapper/blob/8f79c25bd966f2ea0fd60c8928df6773911c49f9/setup.py#L115-L130

*these are absolute paths in setup.py, the way nixpkgs buildPythonApplication builds these results in them going under $out rather than the build failing.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
6.topic: nixos Issues or PRs affecting NixOS modules, or package usability issues specific to NixOS 8.has: package (new) This PR adds a new package 10.rebuild-darwin: 0 This PR does not cause any packages to rebuild on Darwin 10.rebuild-linux: 1-10 10.rebuild-linux: 1 11.by: package-maintainer This PR was created by the maintainer of the package it changes
Projects
None yet
Development

Successfully merging this pull request may close these issues.

6 participants