From c983d7bc802f0112aa644b90b8215ad6142c91c2 Mon Sep 17 00:00:00 2001 From: Emily Date: Sun, 24 Nov 2024 06:58:06 +0000 Subject: [PATCH 1/2] libbitcoin{,-client,-explorer,-network,-protocol}: drop MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit These are the last packages in the tree that depend on Boost 1.75. There hasn’t been a release since 2023; upstream have stated in that they do not plan to maintain the current version, and are currently working on a backwards‐incompatible major update. Nothing in the tree uses these libraries. The only other software distributions on Repology packaging them are YACP and the AUR, neither of which has had an update since 2019. They were removed from Ubuntu after 16.04, and have more recently been removed from [SlackBuilds.org] and [Homebrew] with the same reasoning that they’re keeping Boost 1.75 around unnecessarily and no packaged software wants them. [SlackBuilds.org]: https://github.com/SlackBuildsOrg/slackbuilds/commit/17c7d0e430eadaab2ea02d435b0f48977961eba9 [Homebrew]: https://github.com/Homebrew/homebrew-core/pull/157427 Since these packages are also unmaintained in Nixpkgs, let’s just drop them and if anyone wants to package the 4.x version when it’s out they can re‐add it. --- .../misc/libbitcoin/libbitcoin-client.nix | 35 ------------------ .../misc/libbitcoin/libbitcoin-explorer.nix | 37 ------------------- .../misc/libbitcoin/libbitcoin-network.nix | 35 ------------------ .../misc/libbitcoin/libbitcoin-protocol.nix | 36 ------------------ pkgs/tools/misc/libbitcoin/libbitcoin.nix | 35 ------------------ pkgs/top-level/aliases.nix | 5 +++ pkgs/top-level/all-packages.nix | 16 -------- 7 files changed, 5 insertions(+), 194 deletions(-) delete mode 100644 pkgs/tools/misc/libbitcoin/libbitcoin-client.nix delete mode 100644 pkgs/tools/misc/libbitcoin/libbitcoin-explorer.nix delete mode 100644 pkgs/tools/misc/libbitcoin/libbitcoin-network.nix delete mode 100644 pkgs/tools/misc/libbitcoin/libbitcoin-protocol.nix delete mode 100644 pkgs/tools/misc/libbitcoin/libbitcoin.nix diff --git a/pkgs/tools/misc/libbitcoin/libbitcoin-client.nix b/pkgs/tools/misc/libbitcoin/libbitcoin-client.nix deleted file mode 100644 index baaba9164769..000000000000 --- a/pkgs/tools/misc/libbitcoin/libbitcoin-client.nix +++ /dev/null @@ -1,35 +0,0 @@ -{ lib, stdenv, fetchFromGitHub, pkg-config, autoreconfHook -, boost, libbitcoin, libbitcoin-protocol }: - -stdenv.mkDerivation rec { - pname = "libbitcoin-client"; - version = "3.8.0"; - - src = fetchFromGitHub { - owner = "libbitcoin"; - repo = pname; - rev = "v${version}"; - hash = "sha256-5qbxixaozHFsOcBxnuGEfNJyGL8UaYCOPwPakfc0bAg="; - }; - - nativeBuildInputs = [ autoreconfHook pkg-config ]; - propagatedBuildInputs = [ libbitcoin libbitcoin-protocol ]; - - enableParallelBuilding = true; - - configureFlags = [ - "--with-tests=no" - "--with-boost=${boost.dev}" - "--with-boost-libdir=${boost.out}/lib" - ]; - - meta = with lib; { - description = "Bitcoin client query library"; - homepage = "https://github.com/libbitcoin/libbitcoin-client"; - platforms = platforms.linux ++ platforms.darwin; - maintainers = [ ]; - - # AGPL with a lesser clause - license = licenses.agpl3Plus; - }; -} diff --git a/pkgs/tools/misc/libbitcoin/libbitcoin-explorer.nix b/pkgs/tools/misc/libbitcoin/libbitcoin-explorer.nix deleted file mode 100644 index f14c19e0e474..000000000000 --- a/pkgs/tools/misc/libbitcoin/libbitcoin-explorer.nix +++ /dev/null @@ -1,37 +0,0 @@ -{ lib, stdenv, fetchFromGitHub, pkg-config, autoreconfHook -, boost, libbitcoin-client, libbitcoin-network }: - -stdenv.mkDerivation rec { - pname = "libbitcoin-explorer"; - version = "3.8.0"; - - src = fetchFromGitHub { - owner = "libbitcoin"; - repo = pname; - rev = "v${version}"; - hash = "sha256-NUAtjrfRbZg5ewQo4PZ1HEoG8GRrsPcNb78UYMHqdyo="; - }; - - nativeBuildInputs = [ autoreconfHook pkg-config ]; - buildInputs = [ libbitcoin-client libbitcoin-network ]; - - enableParallelBuilding = true; - - configureFlags = [ - "--with-tests=no" - "--with-boost=${boost.dev}" - "--with-boost-libdir=${boost.out}/lib" - "--with-bash-completiondir=$out/share/bash-completion/completions" - ]; - - meta = with lib; { - description = "Bitcoin command line tool"; - mainProgram = "bx"; - homepage = "https://github.com/libbitcoin/libbitcoin-explorer"; - platforms = platforms.linux ++ platforms.darwin; - maintainers = with maintainers; [ asymmetric ]; - - # AGPL with a lesser clause - license = licenses.agpl3Plus; - }; -} diff --git a/pkgs/tools/misc/libbitcoin/libbitcoin-network.nix b/pkgs/tools/misc/libbitcoin/libbitcoin-network.nix deleted file mode 100644 index bc4186c9b8e7..000000000000 --- a/pkgs/tools/misc/libbitcoin/libbitcoin-network.nix +++ /dev/null @@ -1,35 +0,0 @@ -{ lib, stdenv, fetchFromGitHub, pkg-config, autoreconfHook -, boost, libbitcoin, zeromq }: - -stdenv.mkDerivation rec { - pname = "libbitcoin-network"; - version = "3.8.0"; - - src = fetchFromGitHub { - owner = "libbitcoin"; - repo = pname; - rev = "v${version}"; - hash = "sha256-zDT92bvA779mzTodpKugCoxapB6vY2jCMSGZEkJLTXQ="; - }; - - nativeBuildInputs = [ autoreconfHook pkg-config ]; - buildInputs = [ libbitcoin zeromq ]; - - enableParallelBuilding = true; - - configureFlags = [ - "--with-tests=no" - "--with-boost=${boost.dev}" - "--with-boost-libdir=${boost.out}/lib" - ]; - - meta = with lib; { - description = "Bitcoin P2P Network Library"; - homepage = "https://libbitcoin.info/"; - platforms = platforms.linux ++ platforms.darwin; - maintainers = with maintainers; [ asymmetric ]; - - # AGPL with a lesser clause - license = licenses.agpl3Plus; - }; -} diff --git a/pkgs/tools/misc/libbitcoin/libbitcoin-protocol.nix b/pkgs/tools/misc/libbitcoin/libbitcoin-protocol.nix deleted file mode 100644 index 6014c6c5c779..000000000000 --- a/pkgs/tools/misc/libbitcoin/libbitcoin-protocol.nix +++ /dev/null @@ -1,36 +0,0 @@ -{ lib, stdenv, fetchFromGitHub, pkg-config, autoreconfHook -, boost, libbitcoin, secp256k1, zeromq }: - -stdenv.mkDerivation rec { - pname = "libbitcoin-protocol"; - version = "3.8.0"; - - src = fetchFromGitHub { - owner = "libbitcoin"; - repo = pname; - rev = "v${version}"; - hash = "sha256-xf0qQQnZ8h6ent1sgkVTo55+9drZM8Zbx0deYZnLBho="; - }; - - nativeBuildInputs = [ autoreconfHook pkg-config ]; - buildInputs = [ libbitcoin secp256k1 ]; - propagatedBuildInputs = [ zeromq ]; - - enableParallelBuilding = true; - - configureFlags = [ - "--with-tests=no" - "--with-boost=${boost.dev}" - "--with-boost-libdir=${boost.out}/lib" - ]; - - meta = with lib; { - description = "Bitcoin Blockchain Query Protocol"; - homepage = "https://libbitcoin.info/"; - platforms = platforms.linux ++ platforms.darwin; - maintainers = with maintainers; [ asymmetric ]; - - # AGPL with a lesser clause - license = licenses.agpl3Plus; - }; -} diff --git a/pkgs/tools/misc/libbitcoin/libbitcoin.nix b/pkgs/tools/misc/libbitcoin/libbitcoin.nix deleted file mode 100644 index b7162ede7e5a..000000000000 --- a/pkgs/tools/misc/libbitcoin/libbitcoin.nix +++ /dev/null @@ -1,35 +0,0 @@ -{ lib, stdenv, fetchFromGitHub, pkg-config, autoreconfHook -, boost, secp256k1 }: - -stdenv.mkDerivation rec { - pname = "libbitcoin"; - version = "3.8.0"; - - src = fetchFromGitHub { - owner = pname; - repo = pname; - rev = "v${version}"; - hash = "sha256-7fxj2hnuGRUS4QSQ1w0s3looe9pMvE2U50/yhNyBMf0="; - }; - - nativeBuildInputs = [ autoreconfHook pkg-config ]; - - propagatedBuildInputs = [ secp256k1 ]; - - enableParallelBuilding = true; - - configureFlags = [ - "--with-tests=no" - "--with-boost=${boost.dev}" - "--with-boost-libdir=${boost.out}/lib" - ]; - - meta = with lib; { - description = "C++ library for building bitcoin applications"; - homepage = "https://libbitcoin.info/"; - platforms = platforms.linux ++ platforms.darwin; - maintainers = [ ]; - # AGPL with a lesser clause - license = licenses.agpl3Plus; - }; -} diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index 4efab55ea533..1344501bb529 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -622,6 +622,11 @@ mapAliases { libbencodetools = bencodetools; # Added 2022-07-30 libbpf_1 = libbpf; # Added 2022-12-06 libbson = mongoc; # Added 2024-03-11 + libbitcoin = throw "libbitcoin has been removed as it required an obsolete version of Boost and had no maintainer in Nixpkgs"; # Added 2024-11-24 + libbitcoin-client = throw "libbitcoin-client has been removed as it required an obsolete version of Boost and had no maintainer in Nixpkgs"; # Added 2024-11-24 + libbitcoin-explorer = throw "libbitcoin-explorer has been removed as it required an obsolete version of Boost and had no maintainer in Nixpkgs"; # Added 2024-11-24 + libbitcoin-network = throw "libbitcoin-network has been removed as it required an obsolete version of Boost and had no maintainer in Nixpkgs"; # Added 2024-11-24 + libbitcoin-protocol = throw "libbitcoin-protocol has been removed as it required an obsolete version of Boost and had no maintainer in Nixpkgs"; # Added 2024-11-24 libgme = game-music-emu; # Added 2022-07-20 libgnome-keyring3 = libgnome-keyring; # Added 2024-06-22 libgpgerror = throw "'libgpgerror' has been renamed to/replaced by 'libgpg-error'"; # Converted to throw 2024-10-17 diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 5fc418283c33..1bd1c0259b95 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -13415,22 +13415,6 @@ with pkgs; inherit (darwin.apple_sdk.frameworks) Cocoa; }; - libbitcoin = callPackage ../tools/misc/libbitcoin/libbitcoin.nix { - boost = boost175; # fatal error: 'boost/interprocess/detail/posix_time_types_wrk.hpp' file not found - }; - libbitcoin-protocol = callPackage ../tools/misc/libbitcoin/libbitcoin-protocol.nix { - boost = boost175; - }; - libbitcoin-client = callPackage ../tools/misc/libbitcoin/libbitcoin-client.nix { - boost = boost175; - }; - libbitcoin-network = callPackage ../tools/misc/libbitcoin/libbitcoin-network.nix { - boost = boost175; - }; - libbitcoin-explorer = callPackage ../tools/misc/libbitcoin/libbitcoin-explorer.nix { - boost = boost175; - }; - ausweisapp = qt6Packages.callPackage ../applications/misc/ausweisapp { }; avidemux = libsForQt5.callPackage ../applications/video/avidemux { }; From fb2dd4aed7c3e95fc31473f540fa07355cd7ac73 Mon Sep 17 00:00:00 2001 From: Emily Date: Sun, 24 Nov 2024 07:00:55 +0000 Subject: [PATCH 2/2] boost175: drop Obsolete version with no remaining users in the tree. Already removed by other distributions. --- pkgs/development/libraries/boost/1.75.nix | 15 --------------- pkgs/development/libraries/boost/default.nix | 1 - pkgs/top-level/aliases.nix | 1 + pkgs/top-level/all-packages.nix | 1 - 4 files changed, 1 insertion(+), 17 deletions(-) delete mode 100644 pkgs/development/libraries/boost/1.75.nix diff --git a/pkgs/development/libraries/boost/1.75.nix b/pkgs/development/libraries/boost/1.75.nix deleted file mode 100644 index c8971119c992..000000000000 --- a/pkgs/development/libraries/boost/1.75.nix +++ /dev/null @@ -1,15 +0,0 @@ -{ callPackage, fetchurl, ... } @ args: - -callPackage ./generic.nix (args // rec { - version = "1.75.0"; - - src = fetchurl { - urls = [ - "mirror://sourceforge/boost/boost_${builtins.replaceStrings ["."] ["_"] version}.tar.bz2" - "https://boostorg.jfrog.io/artifactory/main/release/${version}/source/boost_${builtins.replaceStrings ["."] ["_"] version}.tar.bz2" - ]; - # SHA256 from http://www.boost.org/users/history/version_1_75_0.html - sha256 = "953db31e016db7bb207f11432bef7df100516eeb746843fa0486a222e3fd49cb"; - }; -}) - diff --git a/pkgs/development/libraries/boost/default.nix b/pkgs/development/libraries/boost/default.nix index fed5dbe834c3..8e1b3593162d 100644 --- a/pkgs/development/libraries/boost/default.nix +++ b/pkgs/development/libraries/boost/default.nix @@ -16,7 +16,6 @@ let } ); in { - boost175 = makeBoost ./1.75.nix; boost177 = makeBoost ./1.77.nix; boost178 = makeBoost ./1.78.nix; boost179 = makeBoost ./1.79.nix; diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index 1344501bb529..c96f57807c0f 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -153,6 +153,7 @@ mapAliases { blockbench-electron = blockbench; # Added 2024-03-16 bloom = throw "'bloom' has been removed because it was unmaintained upstream."; # Added 2024-11-02 bmap-tools = bmaptool; # Added 2024-08-05 + boost175 = throw "Boost 1.75 has been removed as it is obsolete and no longer used by anything in Nixpkgs"; # Added 2024-11-24 boost_process = throw "boost_process has been removed as it is included in regular boost"; # Added 2024-05-01 bpb = throw "bpb has been removed as it is unmaintained and not compatible with recent Rust versions"; # Added 2024-04-30 bpftool = throw "'bpftool' has been renamed to/replaced by 'bpftools'"; # Converted to throw 2024-10-17 diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 1bd1c0259b95..cf4f78f18d24 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -8868,7 +8868,6 @@ with pkgs; else callPackage ../os-specific/linux/bionic-prebuilt { }; inherit (callPackage ../development/libraries/boost { inherit (buildPackages) boost-build; }) - boost175 boost177 boost178 boost179