From 87d6708fd4f436c1813f7d56b7cbfefb12098a39 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Mon, 24 Feb 2025 17:54:54 +0100 Subject: [PATCH] logseq: remove Last updated in 2024-04 and stuck on Electron 27, which went EOL in in the same month. It has since blocked the Electron 27 removal. --- pkgs/by-name/lo/logseq/package.nix | 102 ----------------------------- pkgs/top-level/aliases.nix | 1 + 2 files changed, 1 insertion(+), 102 deletions(-) delete mode 100644 pkgs/by-name/lo/logseq/package.nix diff --git a/pkgs/by-name/lo/logseq/package.nix b/pkgs/by-name/lo/logseq/package.nix deleted file mode 100644 index 892b1dc33beb..000000000000 --- a/pkgs/by-name/lo/logseq/package.nix +++ /dev/null @@ -1,102 +0,0 @@ -{ lib -, stdenv -, fetchurl -, appimageTools -, unzip -, makeWrapper - # Notice: graphs will not sync without matching upstream's major electron version - # the specific electron version is set at top-level file to preserve override interface. - # whenever updating this package also sync electron version at top-level file. -, electron_27 -, autoPatchelfHook -, git -, nix-update-script -}: - -stdenv.mkDerivation (finalAttrs: -let - inherit (finalAttrs) pname version src; - inherit (stdenv.hostPlatform) system; - selectSystem = attrs: attrs.${system} or (throw "Unsupported system: ${system}"); - suffix = selectSystem { - x86_64-linux = "linux-x64-${version}.AppImage"; - x86_64-darwin = "darwin-x64-${version}.zip"; - aarch64-darwin = "darwin-arm64-${version}.zip"; - }; - hash = selectSystem { - x86_64-linux = "sha256-XROuY2RlKnGvK1VNvzauHuLJiveXVKrIYPppoz8fCmc="; - x86_64-darwin = "sha256-0i9ozqBSeV/y8v+YEmQkbY0V6JHOv6tKub4O5Fdx2fQ="; - aarch64-darwin = "sha256-Uvv96XWxpFj14wPH0DwPT+mlf3Z2dy1g/z8iBt5Te7Q="; - }; -in -{ - pname = "logseq"; - version = "0.10.9"; - src = fetchurl { - inherit hash; - url = "https://github.com/logseq/logseq/releases/download/${version}/logseq-${suffix}"; - name = lib.optionalString stdenv.hostPlatform.isLinux "logseq-${version}.AppImage"; - }; - - nativeBuildInputs = [ makeWrapper ] - ++ lib.optionals stdenv.hostPlatform.isLinux [ autoPatchelfHook ] - ++ lib.optionals stdenv.hostPlatform.isDarwin [ unzip ]; - buildInputs = [ (lib.getLib stdenv.cc.cc) ]; - - dontUnpack = stdenv.hostPlatform.isLinux; - dontConfigure = true; - dontBuild = true; - - installPhase = '' - runHook preInstall - '' + lib.optionalString stdenv.hostPlatform.isLinux ( - let - appimageContents = appimageTools.extract { inherit pname src version; }; - in - '' - mkdir -p $out/bin $out/share/logseq $out/share/applications - cp -a ${appimageContents}/{locales,resources} $out/share/logseq - cp -a ${appimageContents}/Logseq.desktop $out/share/applications/logseq.desktop - - # remove the `git` in `dugite` because we want the `git` in `nixpkgs` - chmod +w -R $out/share/logseq/resources/app/node_modules/dugite/git - chmod +w $out/share/logseq/resources/app/node_modules/dugite - rm -rf $out/share/logseq/resources/app/node_modules/dugite/git - chmod -w $out/share/logseq/resources/app/node_modules/dugite - - mkdir -p $out/share/pixmaps - ln -s $out/share/logseq/resources/app/icons/logseq.png $out/share/pixmaps/logseq.png - - substituteInPlace $out/share/applications/logseq.desktop \ - --replace Exec=Logseq Exec=logseq \ - --replace Icon=Logseq Icon=logseq - '' - ) + lib.optionalString stdenv.hostPlatform.isDarwin '' - mkdir -p $out/{Applications/Logseq.app,bin} - cp -R . $out/Applications/Logseq.app - makeWrapper $out/Applications/Logseq.app/Contents/MacOS/Logseq $out/bin/logseq - '' + '' - runHook postInstall - ''; - - postFixup = lib.optionalString stdenv.hostPlatform.isLinux '' - # set the env "LOCAL_GIT_DIRECTORY" for dugite so that we can use the git in nixpkgs - makeWrapper ${electron_27}/bin/electron $out/bin/logseq \ - --set "LOCAL_GIT_DIRECTORY" ${git} \ - --add-flags $out/share/logseq/resources/app \ - --add-flags "\''${NIXOS_OZONE_WL:+\''${WAYLAND_DISPLAY:+--ozone-platform-hint=auto --enable-features=WaylandWindowDecorations --enable-wayland-ime=true}}" - ''; - - passthru.updateScript = nix-update-script { }; - - meta = { - description = "Local-first, non-linear, outliner notebook for organizing and sharing your personal knowledge base"; - homepage = "https://github.com/logseq/logseq"; - changelog = "https://github.com/logseq/logseq/releases/tag/${version}"; - license = lib.licenses.agpl3Plus; - sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ]; - maintainers = with lib.maintainers; [ cheeseecake ]; - platforms = [ "x86_64-linux" ] ++ lib.platforms.darwin; - mainProgram = "logseq"; - }; -}) diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index 2f12b0bbc463..ccd29144fd9f 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -898,6 +898,7 @@ mapAliases { lobster-two = throw "'lobster-two' has been renamed to/replaced by 'google-fonts'"; # Converted to throw 2024-10-17 loc = throw "'loc' has been removed due to lack of upstream maintenance. Consider 'tokei' as an alternative."; # Added 2025-01-25 loco-cli = loco; # Added 2025-02-24 + logseq = throw "logseq has been removed, due to lack of maintenance and blocking the Electron 27 removal."; # Added 2025-02-24 loop = throw "'loop' has been removed due to lack of upstream maintenance"; # Added 2025-01-25 luna-icons = throw "luna-icons has been removed as it was removed upstream"; # Added 2024-10-29 lv_img_conv = throw "'lv_img_conv' has been removed from nixpkgs as it is broken"; # Added 2024-06-18