From 6322b5f020ac8cea2f6cb010dccfc5900e46a262 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Gutyina=20Gerg=C5=91?= Date: Tue, 25 Mar 2025 15:32:50 +0100 Subject: [PATCH 1/4] tantivy-go: move to toplevel --- pkgs/by-name/an/anytype/anytype-heart/default.nix | 3 +-- .../by-name/{an/anytype => ta}/tantivy-go/add-Cargo.lock.patch | 0 .../tantivy-go/default.nix => ta/tantivy-go/package.nix} | 0 3 files changed, 1 insertion(+), 2 deletions(-) rename pkgs/by-name/{an/anytype => ta}/tantivy-go/add-Cargo.lock.patch (100%) rename pkgs/by-name/{an/anytype/tantivy-go/default.nix => ta/tantivy-go/package.nix} (100%) diff --git a/pkgs/by-name/an/anytype/anytype-heart/default.nix b/pkgs/by-name/an/anytype/anytype-heart/default.nix index 8f8fe2b3586c..7ce887fae541 100644 --- a/pkgs/by-name/an/anytype/anytype-heart/default.nix +++ b/pkgs/by-name/an/anytype/anytype-heart/default.nix @@ -1,16 +1,15 @@ { stdenv, lib, - callPackage, fetchFromGitHub, buildGoModule, protoc-gen-grpc-web, protoc-gen-js, protobuf, + tantivy-go, }: let - tantivy-go = callPackage ../tantivy-go { }; pname = "anytype-heart"; version = "0.39.11"; src = fetchFromGitHub { diff --git a/pkgs/by-name/an/anytype/tantivy-go/add-Cargo.lock.patch b/pkgs/by-name/ta/tantivy-go/add-Cargo.lock.patch similarity index 100% rename from pkgs/by-name/an/anytype/tantivy-go/add-Cargo.lock.patch rename to pkgs/by-name/ta/tantivy-go/add-Cargo.lock.patch diff --git a/pkgs/by-name/an/anytype/tantivy-go/default.nix b/pkgs/by-name/ta/tantivy-go/package.nix similarity index 100% rename from pkgs/by-name/an/anytype/tantivy-go/default.nix rename to pkgs/by-name/ta/tantivy-go/package.nix From ffbb4690e76a7e663c66e645af3fb058f8b71e9f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Gutyina=20Gerg=C5=91?= Date: Tue, 25 Mar 2025 17:04:17 +0100 Subject: [PATCH 2/4] anytype: remove unnecessary files --- pkgs/by-name/an/anytype/package.nix | 15 +++++++++++---- 1 file changed, 11 insertions(+), 4 deletions(-) diff --git a/pkgs/by-name/an/anytype/package.nix b/pkgs/by-name/an/anytype/package.nix index a2d4afef8054..d1b95e425f1c 100644 --- a/pkgs/by-name/an/anytype/package.nix +++ b/pkgs/by-name/an/anytype/package.nix @@ -74,13 +74,20 @@ buildNpmPackage { runHook postBuild ''; + # remove unnecessary files + preInstall = '' + npm prune --omit=dev + chmod u+w -R dist + find -type f \( -name "*.ts" -o -name "*.map" \) -exec rm -rf {} + + ''; + installPhase = '' runHook preInstall - mkdir -p $out/lib/node_modules/anytype - cp -r electron.js electron dist node_modules package.json $out/lib/node_modules/anytype/ + mkdir -p $out/lib/anytype + cp -r electron.js electron dist node_modules package.json $out/lib/anytype/ - for icon in $out/lib/node_modules/anytype/electron/img/icons/*.png; do + for icon in $out/lib/anytype/electron/img/icons/*.png; do mkdir -p "$out/share/icons/hicolor/$(basename $icon .png)/apps" ln -s "$icon" "$out/share/icons/hicolor/$(basename $icon .png)/apps/anytype.png" done @@ -90,7 +97,7 @@ buildNpmPackage { makeWrapper '${lib.getExe electron}' $out/bin/anytype \ --set-default ELECTRON_IS_DEV 0 \ --add-flags "\''${NIXOS_OZONE_WL:+\''${WAYLAND_DISPLAY:+--ozone-platform-hint=auto --enable-features=WaylandWindowDecorations --enable-wayland-ime=true}}" \ - --add-flags $out/lib/node_modules/anytype/ \ + --add-flags $out/lib/anytype/ \ --add-flags ${lib.escapeShellArg commandLineArgs} runHook postInstall From b992b1742852537f9669c303eba2b6df70e6ca94 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Gutyina=20Gerg=C5=91?= Date: Tue, 25 Mar 2025 17:55:12 +0100 Subject: [PATCH 3/4] anytype-heart: move to toplevel --- .../anytype-heart/default.nix => anytype-heart/package.nix} | 0 pkgs/by-name/an/anytype/package.nix | 3 +-- 2 files changed, 1 insertion(+), 2 deletions(-) rename pkgs/by-name/an/{anytype/anytype-heart/default.nix => anytype-heart/package.nix} (100%) diff --git a/pkgs/by-name/an/anytype/anytype-heart/default.nix b/pkgs/by-name/an/anytype-heart/package.nix similarity index 100% rename from pkgs/by-name/an/anytype/anytype-heart/default.nix rename to pkgs/by-name/an/anytype-heart/package.nix diff --git a/pkgs/by-name/an/anytype/package.nix b/pkgs/by-name/an/anytype/package.nix index d1b95e425f1c..ddfdd44db8b6 100644 --- a/pkgs/by-name/an/anytype/package.nix +++ b/pkgs/by-name/an/anytype/package.nix @@ -1,10 +1,10 @@ { lib, - callPackage, runCommand, fetchFromGitHub, buildNpmPackage, pkg-config, + anytype-heart, libsecret, electron, makeDesktopItem, @@ -14,7 +14,6 @@ }: let - anytype-heart = callPackage ./anytype-heart { }; pname = "anytype"; version = "0.45.3"; From 3fbf6d8a562116ff642b5dd65cfab350e22b213e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Gutyina=20Gerg=C5=91?= Date: Wed, 26 Mar 2025 10:57:46 +0100 Subject: [PATCH 4/4] anytype-heart: disable tests --- pkgs/by-name/an/anytype-heart/package.nix | 3 +++ 1 file changed, 3 insertions(+) diff --git a/pkgs/by-name/an/anytype-heart/package.nix b/pkgs/by-name/an/anytype-heart/package.nix index 7ce887fae541..894390f86e33 100644 --- a/pkgs/by-name/an/anytype-heart/package.nix +++ b/pkgs/by-name/an/anytype-heart/package.nix @@ -75,6 +75,9 @@ buildGoModule { cp LICENSE.md $out/share ''; + # disable tests to save time, as it's mostly built by users, not CI + doCheck = false; + meta = { description = "Shared library for Anytype clients"; homepage = "https://anytype.io/";