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.

Sign up for GitHub

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

Jump to bottom

adds aarch64-darwin to jameica #351309

Closed
wants to merge 2,179 commits into from
Closed

adds aarch64-darwin to jameica #351309

wants to merge 2,179 commits into from

Conversation

fbettag
Copy link
Contributor

@fbettag fbettag commented Oct 26, 2024

adds aarch64-darwin to jameica

@NixOSInfra NixOSInfra added the 12. first-time contribution This PR is the author's first one; please be gentle! label Oct 26, 2024
DontEatOreo
DontEatOreo suggested changes Oct 26, 2024
View reviewed changes
Copy link
Member

@DontEatOreo DontEatOreo left a comment

Choose a reason for hiding this comment

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

Adding aarch64-darwin to the meta.platforms isn't enough; you need to extend swtSystem by adding a check for aarch64-darwin so it can copy the native jar file instead of using the x86_darwin, which requires Rosetta

This is what you will need to do:

diff --git a/pkgs/applications/office/jameica/default.nix b/pkgs/applications/office/jameica/default.nix
index 32cbcf088c51..adb3d91c828b 100644
--- a/pkgs/applications/office/jameica/default.nix
+++ b/pkgs/applications/office/jameica/default.nix
@@ -24,6 +24,7 @@ let
     else if stdenv.hostPlatform.system == "x86_64-linux" then "linux64"
     else if stdenv.hostPlatform.system == "aarch64-linux" then "linux-arm64"
     else if stdenv.hostPlatform.system == "x86_64-darwin" then "macos64"
+    else if stdenv.hostPlatform.system == "aarch64-darwin" then "macos-aarch64"
     else throw "Unsupported system: ${stdenv.hostPlatform.system}";
 
   desktopItem = makeDesktopItem {

DontEatOreo
DontEatOreo suggested changes Oct 26, 2024
View reviewed changes
pkgs/applications/office/jameica/default.nix Outdated
@@ -101,7 +101,7 @@ stdenv.mkDerivation rec {
binaryBytecode # source bundles dependencies as jars
];
license = licenses.gpl2Plus;
platforms = [ "x86_64-linux" "i686-linux" "x86_64-darwin" "aarch64-linux" ];
platforms = [ "x86_64-linux" "i686-linux" "x86_64-darwin" "aarch64-linux" "aarch64-darwin" ];
Copy link
Member

Choose a reason for hiding this comment

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

Suggested change
platforms = [ "x86_64-linux" "i686-linux" "x86_64-darwin" "aarch64-linux" "aarch64-darwin" ];
platforms = platforms.unix;

@DontEatOreo
Copy link
Member

Please rebase and reword your commit to follow Commit conventions

In your case you can reword your commit to:

jameica: add `arch64-darwin` support

@ofborg ofborg bot added the 6.topic: darwin Running or building packages on Darwin label Oct 26, 2024
@fbettag fbettag force-pushed the fbettag-jameica-aarch64 branch from 37da9a7 to 1e4bd18 Compare October 26, 2024 08:24
@fbettag
Copy link
Contributor Author

fbettag commented Oct 26, 2024

@DontEatOreo thanks for taking the time!

@fbettag
Copy link
Contributor Author

fbettag commented Oct 26, 2024

i was wondeering if i can also get .app from the dmg so it gets nicely linked into ~/Applications/Nix\ Home\ Manager

@ryand56
Copy link
Member

ryand56 commented Oct 27, 2024 •
edited
Loading

Also change base branch to master and rebase.

markuskowa and others added 21 commits October 29, 2024 13:34
@markuskowa
slurm: 24.05.3.1 -> 24.05.4.1 (NixOS#351672)
3f97349
@nartsisss
telegram-bot-api: refactor meta, format using nixfmt-rfc-style
bc50b93
@Aleksanaa
tdlib: 1.8.37 -> 1.8.38 (NixOS#350879)
684a8fe
gui-for-clash: init at 1.8.9
1477a97
@jtrees
next-ls: 0.23.1 -> 0.23.2
ba41bea
@r-ryantm
ansible: 2.17.4 -> 2.17.5
3486ea1
@adamcstephens
audiobookshelf: 2.16.0 -> 2.16.1
35071f0 
https://github.com/advplyr/audiobookshelf/releases/tag/v2.16.1
@GaetanLepage
python312Packages.cohere: 5.11.1 -> 5.11.2 (NixOS#352053)
edc46e4
@philiptaron
fetchFromSavannah: add passthru.gitRepoUrl (NixOS#352067)
29d18ed
@felixsinger
redmine: Update vulnerable gems where possible
abb64f7 
Update gems in order to fix vulnerable dependencies. The following CVEs
are fixed:

  * CVE-2024-45614
  * CVE-2024-39908
  * CVE-2024-41123
  * CVE-2024-41946
  * CVE-2024-43398
  * CVE-2024-49761
  * CVE-2024-47220

The following CVEs remain since related gems have pinned versions in
Redmine.

  * CVE-2024-34459
  * CVE-2024-47888
  * CVE-2024-47887
  * CVE-2024-41128
  * CVE-2024-47889

Signed-off-by: Felix Singer <felixsinger@posteo.net>
@Aleksanaa
theattyr: remove leading indefinite article in description (NixOS#352058
6a1c602 
)
@PapayaJackal
python3Packages.stix2-patterns: fix dependency on incorrect version o…
454faa3 
…f antlr4
@nartsisss
cargo-modules: 0.16.8 -> 0.19.1
6e6270a
@Pablito2020
python312Packages.insightface: disable tests on aarch64 (NixOS#351917)
213114a 
* python312Packages.insightface: enable package for aarch64-linux

* python312Packages.insightface: disable passhtru tests for aarch64

* python312Packages.insightface: refactor
@nartsisss
cargo-modules: move to pkgs/by-name
b03b98b
@nartsisss
cargo-modules: refactor meta, format using nixfmt-rfc-style
5cee7bf
@emilazy
Add licenses to moby and c-util (NixOS#351233)
57f2153
@GaetanLepage
mud: init at 1.0.1 (NixOS#350895)
6868113
@MatthewCroughan
Mumps: add variant mumps_par with mpi support (NixOS#351476)
ec7caab
@Jappie3
cfssl: add meta.mainProgram
8f1aaaa
@prusnak
lightning-loop: 0.24.1 -> 0.28.8 (NixOS#352114)
20d6dcd
@fbettag fbettag force-pushed the fbettag-jameica-aarch64 branch from 1e4bd18 to 3db5e3d Compare October 30, 2024 12:12
@github-actions github-actions bot added 6.topic: python 6.topic: nixos Issues or PRs affecting NixOS modules, or package usability issues specific to NixOS 8.has: documentation This PR adds or changes documentation 8.has: changelog 8.has: module (update) This PR changes an existing module in `nixos/` 6.topic: emacs Text editor 6.topic: printing 6.topic: policy discussion 6.topic: vim 6.topic: ocaml 6.topic: fetch 6.topic: nodejs 6.topic: pantheon The Pantheon desktop environment 6.topic: TeX Issues regarding texlive and TeX in general 6.topic: lua 6.topic: testing Tooling for automated testing of packages and modules 6.topic: nim Nim programing language 6.topic: vscode 6.topic: lib The Nixpkgs function library 6.topic: php 8.has: maintainer-list (update) This PR changes `maintainers/maintainer-list.nix` 6.topic: llvm/clang Issues related to llvmPackages, clangStdenv and related 6.topic: flutter labels Oct 30, 2024
@fbettag
Copy link
Contributor Author

fbettag commented Oct 30, 2024

gonna retry on a different pr.. this went sideways fast.

@fbettag fbettag closed this Oct 30, 2024
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@DontEatOreo DontEatOreo DontEatOreo requested changes

Assignees
No one assigned
Labels
6.topic: darwin Running or building packages on Darwin 6.topic: emacs Text editor 6.topic: fetch 6.topic: flutter 6.topic: lib The Nixpkgs function library 6.topic: llvm/clang Issues related to llvmPackages, clangStdenv and related 6.topic: lua 6.topic: nim Nim programing language 6.topic: nixos Issues or PRs affecting NixOS modules, or package usability issues specific to NixOS 6.topic: nodejs 6.topic: ocaml 6.topic: pantheon The Pantheon desktop environment 6.topic: php 6.topic: policy discussion 6.topic: printing 6.topic: python 6.topic: testing Tooling for automated testing of packages and modules 6.topic: TeX Issues regarding texlive and TeX in general 6.topic: vim 6.topic: vscode 8.has: changelog 8.has: documentation This PR adds or changes documentation 8.has: maintainer-list (update) This PR changes `maintainers/maintainer-list.nix` 8.has: module (update) This PR changes an existing module in `nixos/` 12. first-time contribution This PR is the author's first one; please be gentle!
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.