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鈥檒l occasionally send you account related emails.

Already on GitHub? Sign in to your account

rcu: init at 2024.001n #287775

Merged
merged 1 commit into from Mar 30, 2024
Merged

rcu: init at 2024.001n #287775

merged 1 commit into from Mar 30, 2024

Conversation

OPNA2608
Copy link
Contributor

@OPNA2608 OPNA2608 commented Feb 10, 2024

Description of changes

Adds a package for the development version of reMarkable Connection Utility (RCU). It's FLOSS software, but not gratis, so purchased & downloaded source code must be provided by the user.

Bildschirmfoto_2024-02-10_12-30-06

  • The intended way of building it seems incompatible with how we package python applications (Makefile constructs a venv & runs pyinstaller to bundle everything into a single binary), so I'm just patching & moving the code to a separate directory. Seems to work fine.

  • A patch is needed to make it compatible with our packaged version of paramiko (3.x), due to the following upstream changes:

  • I'm symlinking several non-code data files from the unpacked source into the final derivation, in an attempt to keep the src from being GC'd between system rebuilds: The download is quite slow, so I'd like to avoid redownloads as conveniently as possible.

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/)
  • 24.05 Release Notes (or backporting 23.05 and 23.11 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.

Add a 馃憤 reaction to pull requests you find important.

Copy link
Member

@SuperSandro2000 SuperSandro2000 left a comment

Choose a reason for hiding this comment

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

We could squash the commits together.

pkgs/by-name/rc/rcu/package.nix Outdated Show resolved Hide resolved
pkgs/by-name/rc/rcu/package.nix Show resolved Hide resolved
pkgs/by-name/rc/rcu/package.nix Outdated Show resolved Hide resolved
Comment on lines 128 to 130
# Move post-wrapping shebanged main script to final location, replace with symlink
mv $out/bin/.rcu-wrapped $out/share/rcu/main.py
ln -s $out/share/rcu/main.py $out/bin/.rcu-wrapped
Copy link
Member

Choose a reason for hiding this comment

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

Why not create the wrapper manually and directly point to the main.py script?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Implemented what I think you were asking for.

@SuperSandro2000
Copy link
Member

@ofborg build rcu

@SuperSandro2000 SuperSandro2000 merged commit 8b152a2 into NixOS:master Mar 30, 2024
25 of 27 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

2 participants