M-Labs
/
defenestrate
2
0
Fork 1
Code Issues 2 Pull Requests 1 Projects Releases Wiki Activity

Add booster add-on configuration #4

Open
esavkin wants to merge 2 commits from esavkin/defenestrate:booster-addon into master
pull from: esavkin/defenestrate:booster-addon
merge into: M-Labs:master
Conversation 0 Commits 2 Files Changed 6
esavkin commented 2023-06-20 16:19:57 +08:00
There is no content yet.
sb10q reviewed 2023-06-29 10:05:35 +08:00
booster/booster_shell.nix Outdated
@ -0,0 +16,4 @@
gmqtt
miniconf
]))
pkgs.libtool
sb10q commented 2023-06-29 10:05:35 +08:00
Owner

What would one need libtool for?

What would one need libtool for?
sb10q reviewed 2023-06-29 10:05:56 +08:00
booster/miniconf.nix Outdated
@ -0,0 +2,4 @@
let
gmqtt = callPackage /opt/booster/gmqtt.nix {};
in
sb10q commented 2023-06-29 10:05:56 +08:00
Owner

indentation

indentation
sb10q reviewed 2023-06-29 10:06:34 +08:00
README Outdated
@ -34,0 +35,4 @@
Add-on for Boosters:
* copy `booster` to the /opt
* mkdir -p ~/.config/nixpkgs && echo '{permittedInsecurePackages = ["electron-9*"];}' > ~/.config/nixpkgs/config.nix
* echo 'For Booster-related apps, use `nix-shell /opt/booster/booster_shell.nix`' > ~/README.md
sb10q commented 2023-06-29 10:06:34 +08:00
Owner

Just install everything system-wide. And don't use /opt

Just install everything system-wide. And don't use `/opt`
👍 1
sb10q reviewed 2023-06-29 10:07:06 +08:00
booster/booster_shell.nix Outdated
@ -0,0 +4,4 @@
mqtt-explorer = pkgs.callPackage /opt/booster/mqtt-explorer.nix {} ;
gmqtt = pkgs.callPackage /opt/booster/gmqtt.nix {};
miniconf = pkgs.callPackage /opt/booster/miniconf.nix {};
sb10q commented 2023-06-29 10:07:06 +08:00
Owner

Use relative paths.

Use relative paths.
👍 1
sb10q reviewed 2023-06-29 10:07:30 +08:00
booster/gmqtt.nix Outdated
@ -0,0 +4,4 @@
name = "gmqtt";
version = "v0.6.12";
src = fetchFromGitHub {
owner = "wialon" ;
sb10q commented 2023-06-29 10:07:30 +08:00
Owner

inconsistent indentation

inconsistent indentation
👍 1
sb10q reviewed 2023-06-29 10:08:38 +08:00
README Outdated
@ -34,0 +34,4 @@
Add-on for Boosters:
* copy `booster` to the /opt
* mkdir -p ~/.config/nixpkgs && echo '{permittedInsecurePackages = ["electron-9*"];}' > ~/.config/nixpkgs/config.nix
sb10q commented 2023-06-29 10:08:38 +08:00
Owner

Why *? Can you limit it to one or a few specific packages? Or just use the newer electron with fewer security problems?

Why `*`? Can you limit it to one or a few specific packages? Or just use the newer electron with fewer security problems?
esavkin commented 2023-06-29 10:13:25 +08:00
Poster

I tried newer electrons, but the latest working version is 9. All newer have blank screen for this app

I tried newer electrons, but the latest working version is 9. All newer have blank screen for this app
sb10q reviewed 2023-06-29 10:09:33 +08:00
booster/mqtt-explorer.nix Outdated
@ -0,0 +15,4 @@
install -m 444 -D resources/app.asar $out/libexec/app.asar
install -m 444 -D mqtt-explorer.png $out/share/icons/mqtt-explorer.png
install -m 444 -D mqtt-explorer.desktop $out/share/applications/mqtt-explorer.desktop
makeWrapper ${electron_9}/bin/electron $out/bin/mqtt-explorer --add-flags $out/libexec/app.asar
sb10q commented 2023-06-29 10:09:33 +08:00
Owner

Isn't the electron bloatware already included in the appimage binary? Is using the nixpkgs version instead the recommended way?

Isn't the electron bloatware already included in the appimage binary? Is using the nixpkgs version instead the recommended way?
esavkin commented 2023-07-13 17:47:02 +08:00
Poster

Not sure about recommended way, but changed to appimage-run

Not sure about recommended way, but changed to appimage-run
sb10q reviewed 2023-06-29 10:10:12 +08:00
booster/mqtt-explorer.nix Outdated
@ -0,0 +14,4 @@
installPhase = ''
install -m 444 -D resources/app.asar $out/libexec/app.asar
install -m 444 -D mqtt-explorer.png $out/share/icons/mqtt-explorer.png
install -m 444 -D mqtt-explorer.desktop $out/share/applications/mqtt-explorer.desktop
sb10q commented 2023-06-29 10:10:12 +08:00
Owner

Does this work?

Does this work?
sb10q reviewed 2023-06-29 10:10:35 +08:00
booster/mqtt-explorer.nix Outdated
@ -0,0 +1,20 @@
{ stdenv, lib, fetchurl, appimageTools, electron_9, makeWrapper }:
stdenv.mkDerivation rec {
sb10q commented 2023-06-29 10:10:35 +08:00
Owner

stdenvNoCC?

stdenvNoCC?
esavkin force-pushed booster-addon from fb31a00dc8 to 2b5e037a47 2023-07-13 17:45:27 +08:00 Compare
This pull request has changes conflicting with the target branch.
  • final/configuration.nix
You can also view command line instructions.

Step 1:

From your project repository, check out a new branch and test the changes.
git checkout -b esavkin-booster-addon master
git pull booster-addon

Step 2:

Merge the changes and update on Gitea.
git checkout master
git merge --no-ff esavkin-booster-addon
git push origin master
Sign in to join this conversation.
Reviewers
No reviewers
Labels
Clear labels
No items
No Label
Milestone
Clear milestone
No items
No Milestone
Projects
Clear projects
No project
Assignees
Clear assignees
No Assignees
2 Participants
Notifications
Due Date
The due date is invalid or out of range. Please use the format 'yyyy-mm-dd'.

No due date set.

Dependencies

No dependencies set.

Reference: M-Labs/defenestrate#4
There is no content yet.
Delete Branch "esavkin/defenestrate:booster-addon"

Deleting a branch is permanent. Although the deleted branch may exist for a short time before cleaning up, in most cases it CANNOT be undone. Continue?