Skip to content

apx: 1.8.2 -> 2.0.0#266262

Merged
NickCao merged 1 commit intoNixOS:masterfrom
chewblacka:update-apx
Nov 10, 2023
Merged

apx: 1.8.2 -> 2.0.0#266262
NickCao merged 1 commit intoNixOS:masterfrom
chewblacka:update-apx

Conversation

@chewblacka
Copy link
Copy Markdown
Contributor

@chewblacka chewblacka commented Nov 8, 2023

Description of changes

Ping @LennyLizowzskiy for testing

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.

@chewblacka chewblacka marked this pull request as ready for review November 8, 2023 12:44
@chewblacka chewblacka requested review from dit7ya and fabaff November 8, 2023 12:46
@ofborg ofborg bot added 11.by: package-maintainer This PR was created by a maintainer of all the package it changes. 10.rebuild-darwin: 1-10 This PR causes between 1 and 10 packages to rebuild on Darwin. 10.rebuild-darwin: 1 This PR causes 1 package to rebuild on Darwin. 10.rebuild-linux: 1-10 This PR causes between 1 and 10 packages to rebuild on Linux. 10.rebuild-linux: 1 This PR causes 1 package to rebuild on Linux. labels Nov 8, 2023
@chewblacka chewblacka requested review from fabaff and removed request for fabaff November 8, 2023 18:46
@chewblacka chewblacka requested a review from NickCao November 9, 2023 14:42
@NickCao
Copy link
Copy Markdown
Member

NickCao commented Nov 10, 2023

overall LGTM, still missing a fix for #249727 though.

@chewblacka
Copy link
Copy Markdown
Contributor Author

overall LGTM, still missing a fix for #249727 though.

I only got that error with the previous version (1.8.2) which seemed to be broken. I don't know what the issue was, but upgrading to 2.0.0 seems to fix it. At least I haven't encountered it since.

@NickCao
Copy link
Copy Markdown
Member

NickCao commented Nov 10, 2023

I can partly reproduce the issue on my system:

/result/bin/apx --version
Unable to read config file:
        Config File "apx" Not Found in "[/home/nickcao/Projects/nixpkgs/config /home/nickcao/Projects/config /home/nickcao/.config/apx /etc/apx /usr/share/apx]"

Maybe you have some leftover configuration files?

@NickCao
Copy link
Copy Markdown
Member

NickCao commented Nov 10, 2023

This helps:

--- a/pkgs/tools/package-management/apx/default.nix
+++ b/pkgs/tools/package-management/apx/default.nix
@@ -23,10 +23,13 @@ buildGoModule rec {
     substituteInPlace config/apx.json \
     --replace "/usr/share/apx/distrobox" "${distrobox}/bin/distrobox" \
     --replace "/usr/share/apx" "$out/bin/apx"
+
+    substituteInPlace settings/config.go \
+    --replace "/usr/share/apx/" "$out/share/apx/"
   '';

   postInstall = ''
-    install -D config/apx.json -t $out/etc/apx/
+    install -D config/apx.json -t $out/share/apx/
     install -D man/man1/apx.1 -t $out/man/man1/
   '';

@NickCao

This comment was marked as resolved.

@chewblacka
Copy link
Copy Markdown
Contributor Author

This helps:

Thanks. I had a local config file installed which stopped me from realising the global config wasn't being picked up. Thanks for the fix - that works well! Have pushed the changes.

@chewblacka chewblacka requested a review from NickCao November 10, 2023 18:46
Copy link
Copy Markdown
Member

@NickCao NickCao left a comment

Choose a reason for hiding this comment

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

Tested basic functionality following the instructions in Vanilla-OS/apx#261

@delroth delroth added the 12.approvals: 1 This PR was reviewed and approved by one person. label Nov 10, 2023
@NickCao NickCao merged commit 0881862 into NixOS:master Nov 10, 2023
@chewblacka chewblacka deleted the update-apx branch November 12, 2023 16:20
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

10.rebuild-darwin: 1-10 This PR causes between 1 and 10 packages to rebuild on Darwin. 10.rebuild-darwin: 1 This PR causes 1 package to rebuild on Darwin. 10.rebuild-linux: 1-10 This PR causes between 1 and 10 packages to rebuild on Linux. 10.rebuild-linux: 1 This PR causes 1 package to rebuild on Linux. 11.by: package-maintainer This PR was created by a maintainer of all the package it changes. 12.approvals: 1 This PR was reviewed and approved by one person.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

Update request: apx 1.8.2 → 2.0.0

3 participants