diff --git a/pkgs/applications/blockchains/bisq-desktop/default.nix b/pkgs/applications/blockchains/bisq-desktop/default.nix deleted file mode 100644 index 3f3bbfe80ff8..000000000000 --- a/pkgs/applications/blockchains/bisq-desktop/default.nix +++ /dev/null @@ -1,128 +0,0 @@ -{ stdenv -, lib -, makeWrapper -, fetchurl -, makeDesktopItem -, copyDesktopItems -, imagemagick -, openjdk11 -, dpkg -, writeScript -, bash -, stripJavaArchivesHook -, tor -, zip -, xz -, findutils -}: - -let - bisq-launcher = args: writeScript "bisq-launcher" '' - #! ${bash}/bin/bash - - # This is just a comment to convince Nix that Tor is a - # runtime dependency; The Tor binary is in a *.jar file, - # whereas Nix only scans for hashes in uncompressed text. - # ${bisq-tor} - - classpath=@out@/lib/desktop.jar:@out@/lib/* - - exec "${openjdk11}/bin/java" -Djpackage.app-version=@version@ -XX:MaxRAM=8g -Xss1280k -XX:+UseG1GC -XX:MaxHeapFreeRatio=10 -XX:MinHeapFreeRatio=5 -XX:+UseStringDeduplication -Djava.net.preferIPv4Stack=true -classpath $classpath ${args} bisq.desktop.app.BisqAppMain "$@" - ''; - - bisq-tor = writeScript "bisq-tor" '' - #! ${bash}/bin/bash - - exec ${tor}/bin/tor "$@" - ''; -in -stdenv.mkDerivation rec { - pname = "bisq-desktop"; - version = "1.9.17"; - - src = fetchurl { - url = "https://github.com/bisq-network/bisq/releases/download/v${version}/Bisq-64bit-${version}.deb"; - sha256 = "1wqzgxsm9p6lh0bmvw0byaxx1r5v64d024jf1pg9mykb1dnnx0wy"; - }; - - nativeBuildInputs = [ - copyDesktopItems - dpkg - imagemagick - makeWrapper - stripJavaArchivesHook - xz - zip - findutils - ]; - - desktopItems = [ - (makeDesktopItem { - name = "Bisq"; - exec = "bisq-desktop"; - icon = "bisq"; - desktopName = "Bisq ${version}"; - genericName = "Decentralized bitcoin exchange"; - categories = [ "Network" "P2P" ]; - }) - - (makeDesktopItem { - name = "Bisq-hidpi"; - exec = "bisq-desktop-hidpi"; - icon = "bisq"; - desktopName = "Bisq ${version} (HiDPI)"; - genericName = "Decentralized bitcoin exchange"; - categories = [ "Network" "P2P" ]; - }) - ]; - - unpackPhase = '' - dpkg -x $src . - ''; - - buildPhase = '' - # Replace the embedded Tor binary (which is in a Tar archive) - # with one from Nixpkgs. - - mkdir -p native/linux/x64/ - cp ${bisq-tor} ./tor - tar --sort=name --mtime="@$SOURCE_DATE_EPOCH" -cJf native/linux/x64/tor.tar.xz tor - tor_jar_file=$(find ./opt/bisq/lib/app -name "tor-binary-linux64-*.jar") - zip -r $tor_jar_file native - ''; - - installPhase = '' - runHook preInstall - - mkdir -p $out $out/bin - cp -r opt/bisq/lib/app $out/lib - - install -D -m 777 ${bisq-launcher ""} $out/bin/bisq-desktop - substituteAllInPlace $out/bin/bisq-desktop - - install -D -m 777 ${bisq-launcher "-Dglass.gtk.uiScale=2.0"} $out/bin/bisq-desktop-hidpi - substituteAllInPlace $out/bin/bisq-desktop-hidpi - - for n in 16 24 32 48 64 96 128 256; do - size=$n"x"$n - convert opt/bisq/lib/Bisq.png -resize $size bisq.png - install -Dm644 -t $out/share/icons/hicolor/$size/apps bisq.png - done; - - runHook postInstall - ''; - - passthru.updateScript = ./update.sh; - - meta = with lib; { - description = "Decentralized bitcoin exchange network"; - homepage = "https://bisq.network"; - changelog = "https://github.com/bisq-network/bisq/releases/tag/v${version}"; - sourceProvenance = with sourceTypes; [ binaryBytecode ]; - license = licenses.mit; - maintainers = with maintainers; [ juaningan emmanuelrosa ]; - platforms = [ "x86_64-linux" ]; - # Requires OpenJFX 11 or 16, which are both EOL. - broken = true; - }; -} diff --git a/pkgs/applications/blockchains/bisq-desktop/update.sh b/pkgs/applications/blockchains/bisq-desktop/update.sh deleted file mode 100755 index c65e04e3de40..000000000000 --- a/pkgs/applications/blockchains/bisq-desktop/update.sh +++ /dev/null @@ -1,21 +0,0 @@ -#!/usr/bin/env nix-shell -#!nix-shell -i bash -p curl jq gnused gnupg common-updater-scripts - -set -eu -o pipefail - -version="$(curl -s https://api.github.com/repos/bisq-network/bisq/releases| jq '.[] | {name,prerelease} | select(.prerelease==false) | limit(1;.[])' | sed 's/[\"v]//g' | head -n 1)" -depname="Bisq-64bit-$version.deb" -src="https://github.com/bisq-network/bisq/releases/download/v$version/$depname" -signature="$src.asc" - -pushd $(mktemp -d --suffix=-bisq-updater) -export GNUPGHOME=$PWD/gnupg -mkdir -m 700 -p "$GNUPGHOME" -curl -L -o "$depname" -- "$src" -curl -L -o signature.asc -- "$signature" -curl https://bisq.network/pubkey/E222AA02.asc | gpg --import -gpg --batch --verify signature.asc "$depname" -sha256=$(nix-prefetch-url --type sha256 "file://$PWD/$depname") -popd - -update-source-version bisq-desktop "$version" "$sha256" diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index 091cea94d4ab..fcf2aa78d7f4 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -143,6 +143,7 @@ mapAliases { bitcoin-unlimited = throw "bitcoin-unlimited has been removed as it was broken and unmaintained"; # Added 2024-07-15 bitcoind-unlimited = throw "bitcoind-unlimited has been removed as it was broken and unmaintained"; # Added 2024-07-15 bird2 = bird; # Added 2022-02-21 + bisq-desktop = throw "bisq-desktop has been removed because OpenJFX 11 was removed"; # Added 2024-11-17 bitwarden = bitwarden-desktop; # Added 2024-02-25 blender-with-packages = args: lib.warn "blender-with-packages is deprecated in favor of blender.withPackages, e.g. `blender.withPackages(ps: [ ps.foobar ])`" diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 5831a254e7c8..691601e3aa3f 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -1749,8 +1749,6 @@ with pkgs; python3Packages = python311Packages; }; - bisq-desktop = callPackage ../applications/blockchains/bisq-desktop { }; - inherit (callPackages ../tools/security/bitwarden-directory-connector { }) bitwarden-directory-connector-cli bitwarden-directory-connector; bitwarden-menu = python3Packages.callPackage ../applications/misc/bitwarden-menu { };