archi: init at 4.7.1 #103355

earldouglas · 2020-11-10T22:28:53Z

Motivation for this change

Add a derivation for Archi.

Things done

earldouglas · 2020-11-10T23:09:31Z

This isn't quite working yet; looks like the binary might need to be patched for NixOS paths.

pkgs/tools/misc/Archi/default.nix

pkgs/top-level/all-packages.nix

Co-authored-by: Sandro <sandro.jaeckel@gmail.com>

SuperSandro2000 · 2020-11-24T19:50:51Z

Darwin patch:

diff --git a/pkgs/tools/misc/Archi/default.nix b/pkgs/tools/misc/Archi/default.nix
index 137f679b1da0..fa2db41760a8 100644
--- a/pkgs/tools/misc/Archi/default.nix
+++ b/pkgs/tools/misc/Archi/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl }:
+{ stdenv, fetchurl, fetchzip }:
 
 stdenv.mkDerivation rec {
 
@@ -11,22 +11,21 @@ stdenv.mkDerivation rec {
         url = "https://www.archimatetool.com/downloads/archi/Archi-Linux64-${version}.tgz";
         sha256 = "0sd57cfnh5q2p17sd86c8wgmqyipg29rz6iaa5brq8mwn8ps2fdw";
       }
-    else if stdenv.hostPlatform.system == "x86_64-linux" then
-      throw "Unsupported system"
-      /*
-       * A Mac version is available; needs to be tested on a Mac system:
-       * fetchurl {
-       *   url = "https://www.archimatetool.com/downloads/archi/Archi-Mac-${version}.zip";
-       *   sha256 = "0zg0bs9i2kkr11bbssfxhrp4ym2zzhb2bk7m38z9cj99h7pmgyhr";
-       * }
-       */
+    else if stdenv.hostPlatform.system == "x86_64-darwin" then
+      fetchzip {
+        url = "https://www.archimatetool.com/downloads/archi/Archi-Mac-${version}.zip";
+        sha256 = "1h05lal5jnjwm30dbqvd6gisgrmf1an8xf34f01gs9pwqvqfvmxc";
+      }
     else
        throw "Unsupported system";
 
-  installPhase = ''
+  installPhase = if stdenv.hostPlatform.system == "x86_64-darwin" then ''
+    mkdir -p "$out/Applications"
+    mv Archi.app "$out/Applications/"
+  '' else ''
+    install -Dm755 Archi $out/bin/Archi
+    rm Archi
     cp -r . $out
-    mkdir -p $out/bin
-    ln -s $out/Archi $out/bin/Archi
   '';
 
   meta = with stdenv.lib; {
@@ -37,7 +36,7 @@ stdenv.mkDerivation rec {
     '';
     homepage = "https://www.archimatetool.com/";
     license = licenses.mit;
-    platforms = platforms.linux;
+    platforms = platforms.unix;
     maintainers = with maintainers; [ earldouglas ];
   };
 }

Also please squash the commits together.

This gets us a little closer, but we're not correctly including/patching dependencies: ``` java.lang.UnsatisfiedLinkError: Could not load SWT library. Reasons: no swt-pi4-gtk-4932r18 in java.library.path no swt-pi4-gtk in java.library.path Can't load library: /home/james/.swt/lib/linux/x86_64/libswt-pi4-gtk-4932r18.so Can't load library: /home/james/.swt/lib/linux/x86_64/libswt-pi4-gtk.so ```

pkgs/tools/misc/archi/default.nix

SuperSandro2000 · 2020-12-01T00:03:25Z

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

1 package built:

archi

Co-authored-by: Sandro <sandro.jaeckel@gmail.com>

SuperSandro2000 · 2020-12-01T17:54:59Z

Result of nixpkgs-review pr 103355 run on x86_64-darwin 1

1 package built:

archi

## Changelog for nixpkgs: Commits: [NixOS/nixpkgs@24eb3f87...29679363](NixOS/nixpkgs@24eb3f8...2967936) * [`2d55b8de`](NixOS/nixpkgs@2d55b8d) containerd: update commit id for version indicator * [`1a3557f7`](NixOS/nixpkgs@1a3557f) archi: init at 4.7.1 (NixOS/nixpkgs#103355) * [`fb063991`](NixOS/nixpkgs@fb06399) macdylibbundler: Should propagate dependency on otool (NixOS/nixpkgs#103163) * [`919648ae`](NixOS/nixpkgs@919648a) pylance: init at 2020.11.2 (NixOS/nixpkgs#105601) * [`faf720d4`](NixOS/nixpkgs@faf720d) pythonPackage.lexid: init at 2020.1005 * [`025b6d50`](NixOS/nixpkgs@025b6d5) bumpver: init at 2020.1107 * [`83a901b8`](NixOS/nixpkgs@83a901b) unifont_upper: 12.1.03 -> 13.0.04 * [`a58e4242`](NixOS/nixpkgs@a58e424) dasel: 1.6.2 -> 1.8.0 * [`1590c530`](NixOS/nixpkgs@1590c53) fly: 6.7.0 -> 6.7.2 * [`602ee1b2`](NixOS/nixpkgs@602ee1b) deja-dup: 42.5 -> 42.6 * [`ee7d83e6`](NixOS/nixpkgs@ee7d83e) ants: unbreak on Darwin * [`2d1b0c3e`](NixOS/nixpkgs@2d1b0c3) nixUnstable: pre20201118_79aa7d9 -> pre20201201_5a6ddb3 * [`b02dbec0`](NixOS/nixpkgs@b02dbec) cinnamon.cinnamon-translations: 4.6.2 -> 4.8.0 * [`4f68a774`](NixOS/nixpkgs@4f68a77) imgbrd-grabber: use pname instead of name; add meta * [`4617fcd6`](NixOS/nixpkgs@4617fcd) edk2: 201911 -> 202011 (NixOS/nixpkgs#105582) * [`93662596`](NixOS/nixpkgs@9366259) coqPackages.coq-ext-lib: refactor * [`4569be3b`](NixOS/nixpkgs@4569be3) coqPackages.coq-ext-lib: 0.11.2 → 0.11.3 * [`11c35305`](NixOS/nixpkgs@11c3530) ocamlPackages.ke: use Dune 2 * [`38a91dff`](NixOS/nixpkgs@38a91df) ocamlPackages.earlybird: use Dune 2 * [`9e66b4e8`](NixOS/nixpkgs@9e66b4e) ocamlPackages.angstrom: use Dune 2 * [`8b64dfce`](NixOS/nixpkgs@8b64dfc) ocamlPackages.bigstringaf: 0.6.0 → 0.7.0 * [`50b6c206`](NixOS/nixpkgs@50b6c20) cinnamon.cinnamon-desktop: 4.6.4 -> 4.8.0 * [`087c22d8`](NixOS/nixpkgs@087c22d) clipgrab: 3.9.2 -> 3.9.5 * [`14cd4982`](NixOS/nixpkgs@14cd498) cinnamon.cinnamon-menus: 4.6.1 -> 4.8.1 * [`54eed8ab`](NixOS/nixpkgs@54eed8a) cinnamon.cinnamon-session: 4.6.2 -> 4.8.0 * [`a992accb`](NixOS/nixpkgs@a992acc) daemon: 0.6.4 -> 0.7 * [`154e01b2`](NixOS/nixpkgs@154e01b) broot: 1.0.6 -> 1.0.7 * [`bc1ed39f`](NixOS/nixpkgs@bc1ed39) youtube-dl: 2020.11.29 -> 2020.12.02 * [`06f096ad`](NixOS/nixpkgs@06f096a) feh: 3.5 -> 3.6 * [`9e311226`](NixOS/nixpkgs@9e31122) exodus: 20.11.21 -> 20.11.23 * [`e9b758a6`](NixOS/nixpkgs@e9b758a) Update pkgs/applications/graphics/imgbrd-grabber/default.nix * [`9752b475`](NixOS/nixpkgs@9752b47) daemon: switch to pname, version; cleanups * [`ed368f0f`](NixOS/nixpkgs@ed368f0) flyctl: 0.0.150 -> 0.0.151 * [`9a0933df`](NixOS/nixpkgs@9a0933d) fava: 1.16 -> 1.17 * [`060eb8e5`](NixOS/nixpkgs@060eb8e) fluent-bit: 1.6.5 -> 1.6.6 * [`b8ad3d4e`](NixOS/nixpkgs@b8ad3d4) pbgopy: init at 0.1.1 * [`01dbdd13`](NixOS/nixpkgs@01dbdd1) flyway: 7.2.1 -> 7.3.0 * [`76e79467`](NixOS/nixpkgs@76e7946) freeciv: 2.6.2 -> 2.6.2.1 * [`f9a69410`](NixOS/nixpkgs@f9a6941) gretl: 2020b -> 2020e * [`e68bef9c`](NixOS/nixpkgs@e68bef9) maintainers: add ethancedwards8 * [`4a636081`](NixOS/nixpkgs@4a63608) tmuxPlugins.dracula: init at unstable-2020-12-2 * [`cf89444f`](NixOS/nixpkgs@cf89444) gmsh: 4.7.0 -> 4.7.1 * [`a26d53ab`](NixOS/nixpkgs@a26d53a) git-secret: 0.3.2 -> 0.3.3 * [`011d5940`](NixOS/nixpkgs@011d594) geekbench: 5.3.0 -> 5.3.1 * [`4aa43335`](NixOS/nixpkgs@4aa4333) ruffle: init at nightly-2020-11-30 * [`120ec5f9`](NixOS/nixpkgs@120ec5f) python3Packages.pyosf: init at 1.0.5 * [`466daa42`](NixOS/nixpkgs@466daa4) gitlab-pages: 1.28.0 -> 1.30.0 * [`a1e8e2f0`](NixOS/nixpkgs@a1e8e2f) python37Packages.goobook: 3.5 -> 3.5.1 * [`67650f71`](NixOS/nixpkgs@67650f7) nixos/tests/docker-tools.nix: Fix format * [`d14c0d0b`](NixOS/nixpkgs@d14c0d0) gitkraken: 7.4.0 -> 7.4.1 * [`ce9e06d3`](NixOS/nixpkgs@ce9e06d) python37Packages.flake8-debugger: 3.2.1 -> 4.0.0 * [`fcee6d40`](NixOS/nixpkgs@fcee6d4) nbxplorer: 2.1.42 -> 2.1.46 * [`4ad4f395`](NixOS/nixpkgs@4ad4f39) btcpayserver: 1.0.5.5 -> 1.0.5.9 * [`7a114e59`](NixOS/nixpkgs@7a114e5) python3Packages.transformers: 3.5.1 -> 4.0.0 * [`20c4760d`](NixOS/nixpkgs@20c4760) ocamlPackages.integers: 0.3.0 -> 0.4.0 * [`6f850ae4`](NixOS/nixpkgs@6f850ae) ocamlPackages.ctypes: 0.16.0 -> 0.17.1 * [`d668ebf1`](NixOS/nixpkgs@d668ebf) tridactyl-native: 1.20.2 -> 1.20.3 * [`0c5e9403`](NixOS/nixpkgs@0c5e940) ocamlPackages.stdlib-shims: 0.1.0 -> 0.2.0 * [`b9998792`](NixOS/nixpkgs@b999879) docker: 19.03.13 -> 19.03.14 * [`c16c63c7`](NixOS/nixpkgs@c16c63c) imgp: 2.7 -> 2.8 * [`345299c5`](NixOS/nixpkgs@345299c) istioctl: 1.7.5 -> 1.8.0 * [`e76e8cf2`](NixOS/nixpkgs@e76e8cf) openresty: 1.17.8 -> 1.19.3 * [`eedee46f`](NixOS/nixpkgs@eedee46) Adding nix firefox extension support * [`397597f7`](NixOS/nixpkgs@397597f) Added fetchfirefoxaddon * [`5f8eca54`](NixOS/nixpkgs@5f8eca5) Added missing sha1 and sha512 flags * [`cc421679`](NixOS/nixpkgs@cc42167) Update pkgs/applications/networking/browsers/firefox/wrapper.nix * [`b89c0fce`](NixOS/nixpkgs@b89c0fc) fetchFirefoxAddon: rename to use camelCase * [`9712bbdf`](NixOS/nixpkgs@9712bbd) firefoxaddon: formatting nitpicks * [`6f50c5b1`](NixOS/nixpkgs@6f50c5b) hmmer: 3.3.1 -> 3.3.2 * [`7c8994e4`](NixOS/nixpkgs@7c8994e) doc/firefox: initial documentation * [`1c67400f`](NixOS/nixpkgs@1c67400) pdftk: mark broken on darwin * [`043c667f`](NixOS/nixpkgs@043c667) sqlite-analyzer: remove separate file * [`d8327743`](NixOS/nixpkgs@d832774) flood: init at 4.1.2 * [`dbdcc1da`](NixOS/nixpkgs@dbdcc1d) guile-cairo: 1.11.1 -> 1.11.2 * [`d1fa04d4`](NixOS/nixpkgs@d1fa04d) trivy: 0.13.0 -> 0.14.0 * [`7352db0f`](NixOS/nixpkgs@7352db0) gitRepo: 2.9 -> 2.10 * [`8eb2551e`](NixOS/nixpkgs@8eb2551) chromiumDev: 88.0.4324.11 -> 88.0.4324.27 * [`fc7f72e1`](NixOS/nixpkgs@fc7f72e) aml: Mark as broken on Darwin * [`f56a31f1`](NixOS/nixpkgs@f56a31f) tdlib: 1.6.9 -> 1.7.0 * [`cc9e0dba`](NixOS/nixpkgs@cc9e0db) icon-lang: 9.5.1 -> unstable-2020-02-05 * [`99addb8b`](NixOS/nixpkgs@99addb8) icon-lang: refactor doc location * [`dc798e96`](NixOS/nixpkgs@dc798e9) hatari: 2.2.1 -> 2.3.0 * [`68b7bb0a`](NixOS/nixpkgs@68b7bb0) plexRaw: 1.20.5.3600-47c0d9038 -> 1.21.0.3711-b509cc236 * [`e313c7d2`](NixOS/nixpkgs@e313c7d) gollum: 5.1.1 -> 5.1.2 * [`36ae358e`](NixOS/nixpkgs@36ae358) intel-media-driver: 2.4.1 -> 2.4.2 * [`5faf8cbf`](NixOS/nixpkgs@5faf8cb) mindustry,mindustry-server: mark as broken for darwin * [`298ddbb0`](NixOS/nixpkgs@298ddbb) mindustry,mindustry-server: 120 -> 120.2 * [`e6017581`](NixOS/nixpkgs@e601758) abc-verifier: 2020.06.22 -> 2020.11.24 * [`56d78833`](NixOS/nixpkgs@56d7883) yosys: 0.9+3675 -> 0.9+3715 * [`c9325119`](NixOS/nixpkgs@c932511) trellis: 2020.11.07 -> 2020.11.25 * [`ad11ff12`](NixOS/nixpkgs@ad11ff1) nextpnr: 2020.11.10 -> 2020.12.01 * [`d24639b3`](NixOS/nixpkgs@d24639b) GH action: merge staging(-next): fix cron * [`3eb7f016`](NixOS/nixpkgs@3eb7f01) jetbrains: updates * [`78a8cb4f`](NixOS/nixpkgs@78a8cb4) i2pd: 2.34.0 -> 2.35.0 * [`f7ee2706`](NixOS/nixpkgs@f7ee270) dockerTools.fakeNss: init * [`e0546949`](NixOS/nixpkgs@e054694) dockerTools.binSh: init * [`16dd1c90`](NixOS/nixpkgs@16dd1c9) gitea: 1.12.6 -> 1.13.0 * [`affb72ec`](NixOS/nixpkgs@affb72e) nixos/tests/gitea: increase memory for VM * [`8c8f0117`](NixOS/nixpkgs@8c8f011) python3Packages.openrazer: 2.8.0 -> 2.9.0 * [`acae9f16`](NixOS/nixpkgs@acae9f1) Revert "ocamlPackages.stdlib-shims: 0.1.0 -> 0.2.0" * [`b0c181bc`](NixOS/nixpkgs@b0c181b) ocamlPackages.astring: 0.8.3 -> 0.8.5 * [`e1c319de`](NixOS/nixpkgs@e1c319d) lighttpd: 1.4.55 -> 1.4.56 * [`47b99769`](NixOS/nixpkgs@47b9976) rustc: Improve musl support * [`8eb28a1d`](NixOS/nixpkgs@8eb28a1) syncthing: 1.11.1 -> 1.12.0 * [`b4517f9f`](NixOS/nixpkgs@b4517f9) libfprint: 1.90.3 -> 1.90.4 * [`bcb24219`](NixOS/nixpkgs@bcb2421) python3Packages.ircstates: 0.11.5 -> 0.11.6 * [`500490a5`](NixOS/nixpkgs@500490a) python3Packages.ircrobots: 0.3.5 -> 0.3.6 * [`f6e974e7`](NixOS/nixpkgs@f6e974e) cassandra: remove maintainer cransom * [`30c6b979`](NixOS/nixpkgs@30c6b97) littlegptracker: use unstableGitUpdater * [`86e91a15`](NixOS/nixpkgs@86e91a1) meme: use unstableGitUpdater * [`0c6492b9`](NixOS/nixpkgs@0c6492b) lobster: use unstableGitUpdater * [`ff8e2db0`](NixOS/nixpkgs@ff8e2db) qbe: remove stray newline * [`26b2ced5`](NixOS/nixpkgs@26b2ced) cht-sh: use unstableGitUpdater * [`20eb5c38`](NixOS/nixpkgs@20eb5c3) bash-supergenpass: use unstableGitUpdater * [`5e7ca518`](NixOS/nixpkgs@5e7ca51) nano: 5.3 -> 5.4 * [`6710213c`](NixOS/nixpkgs@6710213) haproxy: 2.3.1 -> 2.3.2 * [`bfabe2a1`](NixOS/nixpkgs@bfabe2a) zulip: 5.4.3 → 5.5.0 * [`ebaa967a`](NixOS/nixpkgs@ebaa967) hatari: switch to pname, version * [`6646a8f7`](NixOS/nixpkgs@6646a8f) openmpt123: 0.5.3 -> 0.5.4 * [`fc281f7b`](NixOS/nixpkgs@fc281f7) libmanette: 0.2.5 -> 0.2.6 * [`58baa3f3`](NixOS/nixpkgs@58baa3f) convert nginx documentation to common mark * [`48b7dc80`](NixOS/nixpkgs@48b7dc8) pythonPackages.goobook: Switch to importsCheck * [`16492963`](NixOS/nixpkgs@1649296) makeBootstrapTools: set schedulingPriority * [`2eb6c718`](NixOS/nixpkgs@2eb6c71) linux: 4.14.209 -> 4.14.210 * [`28a9fa46`](NixOS/nixpkgs@28a9fa4) linux: 4.19.160 -> 4.19.161 * [`454b3703`](NixOS/nixpkgs@454b370) linux: 4.4.246 -> 4.4.247 * [`d9aa6d1f`](NixOS/nixpkgs@d9aa6d1) linux: 4.9.246 -> 4.9.247 * [`ef35646b`](NixOS/nixpkgs@ef35646) linux: 5.4.80 -> 5.4.81 * [`c47fca9f`](NixOS/nixpkgs@c47fca9) linux: 5.9.11 -> 5.9.12 * [`adc43671`](NixOS/nixpkgs@adc4367) shfmt: 3.2.0 -> 3.2.1 * [`f3e31716`](NixOS/nixpkgs@f3e3171) libusbmuxd: Add darwin support. * [`8fc1f6af`](NixOS/nixpkgs@8fc1f6a) libplist: Add darwin support. * [`7c183747`](NixOS/nixpkgs@7c18374) libirecovery: Add darwin support. * [`cbd8d2bb`](NixOS/nixpkgs@cbd8d2b) libimobiledevice: Add darwin support. * [`7319dc20`](NixOS/nixpkgs@7319dc2) idevicerestore: Add darwin support. * [`552ac655`](NixOS/nixpkgs@552ac65) lyx: 2.3.5.2 -> 2.3.6 * [`11ee5430`](NixOS/nixpkgs@11ee543) sd-image: fix resizing if root is not the second partition. * [`222966a7`](NixOS/nixpkgs@222966a) obelisk: 0.4.0 → 0.5.2 * [`b421c618`](NixOS/nixpkgs@b421c61) gnomeExtensions.gsconnect: fix installed tests * [`5a2abecc`](NixOS/nixpkgs@5a2abec) nco: 4.9.5 -> 4.9.6 * [`6e36faa8`](NixOS/nixpkgs@6e36faa) oil: 0.8.4 -> 0.8.5 * [`cb912fe2`](NixOS/nixpkgs@cb912fe) docs: convert packages/linux docbook -> commonmark * [`543f084d`](NixOS/nixpkgs@543f084) doc: TeX Live to CommonMark * [`4aabd257`](NixOS/nixpkgs@4aabd25) postsrsd: 1.6 -> 1.7 * [`d642818a`](NixOS/nixpkgs@d642818) php73Packages.phpstan: 0.12.57 -> 0.12.58 * [`069e414a`](NixOS/nixpkgs@069e414) pounce: 2.0 -> 2.1p1 * [`bc35b79f`](NixOS/nixpkgs@bc35b79) php73Extensions.yaml: 2.1.0 -> 2.2.0 * [`19f9b87e`](NixOS/nixpkgs@19f9b87) ocamlPackages.mirage-types: init at 3.9.0 * [`4dfe04a9`](NixOS/nixpkgs@4dfe04a) ocamlPackages.mirage-types-lwt: init at 3.9.0 * [`a7786e29`](NixOS/nixpkgs@a7786e2) ocamlPackages.mirage{,-runtime}: 3.9.0 -> 3.10.0

ofborg bot added 8.has: package (new) 11.by: package-maintainer 10.rebuild-darwin: 0 10.rebuild-linux: 1-10 10.rebuild-linux: 1 labels Nov 10, 2020

Archi: init at 4.7.1

053d440

SuperSandro2000 requested changes Nov 11, 2020

View reviewed changes

earldouglas and others added 3 commits November 11, 2020 06:04

Update pkgs/tools/misc/Archi/default.nix

928e983

Co-authored-by: Sandro <sandro.jaeckel@gmail.com>

Update pkgs/tools/misc/Archi/default.nix

b2189f1

Co-authored-by: Sandro <sandro.jaeckel@gmail.com>

Update pkgs/top-level/all-packages.nix

5544e42

Co-authored-by: Sandro <sandro.jaeckel@gmail.com>

SuperSandro2000 changed the title ~~Archi: init at 4.7.1~~ archi: init at 4.7.1 Nov 24, 2020

earldouglas added 3 commits November 29, 2020 08:37

Incorporate Darwin patch by SuperSandro2000

f923948

Rename Archi dir to archi

71866d5

ofborg bot requested a review from SuperSandro2000 November 29, 2020 16:21

SuperSandro2000 requested changes Nov 30, 2020

View reviewed changes

Apply suggestions from code review

e503532

Co-authored-by: Sandro <sandro.jaeckel@gmail.com>

ofborg bot requested a review from SuperSandro2000 December 1, 2020 00:32

ofborg bot added 10.rebuild-darwin: 1-10 10.rebuild-darwin: 1 and removed 10.rebuild-darwin: 0 labels Dec 1, 2020

SuperSandro2000 merged commit 1a3557f into NixOS:master Dec 1, 2020

github-actions bot mentioned this pull request Dec 4, 2020

niv nixpkgs: update 24eb3f87 -> 29679363 andir/nixos.cloud#7

Merged

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

archi: init at 4.7.1 #103355

archi: init at 4.7.1 #103355

earldouglas commented Nov 10, 2020

earldouglas commented Nov 10, 2020

SuperSandro2000 commented Nov 24, 2020

SuperSandro2000 commented Dec 1, 2020

SuperSandro2000 commented Dec 1, 2020

archi: init at 4.7.1 #103355

archi: init at 4.7.1 #103355

Conversation

earldouglas commented Nov 10, 2020

Motivation for this change

Things done

earldouglas commented Nov 10, 2020

SuperSandro2000 commented Nov 24, 2020

SuperSandro2000 commented Dec 1, 2020

SuperSandro2000 commented Dec 1, 2020