From 3b9574b5573ed4fc0648256e183d5be9ad23080f Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Sun, 7 Apr 2024 00:52:31 +0200 Subject: [PATCH] bustle: remove The Haskell version is abandoned and no longer compiles. --- .../haskell-modules/configuration-common.nix | 16 ---------------- pkgs/top-level/all-packages.nix | 2 -- pkgs/top-level/release-haskell.nix | 1 - 3 files changed, 19 deletions(-) diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix index 00dcc3b7a5d8..2f20dfbc448c 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -940,22 +940,6 @@ self: super: { # https://github.com/Euterpea/Euterpea2/issues/40 Euterpea = doJailbreak super.Euterpea; - # Install icons, metadata and cli program. - bustle = appendPatches [ - # Fix build with libpcap 1.10.2 - # https://gitlab.freedesktop.org/bustle/bustle/-/merge_requests/21 - (pkgs.fetchpatch { - url = "https://gitlab.freedesktop.org/bustle/bustle/-/commit/77e2de892cd359f779c84739682431a66eb8cf31.patch"; - hash = "sha256-sPb6/Z/ANids53aL9VsMHa/v5y+TA1ZY3jwAXlEH3Ec="; - }) - ] (overrideCabal (drv: { - buildDepends = [ pkgs.libpcap ]; - buildTools = with pkgs.buildPackages; [ gettext perl help2man ]; - postInstall = '' - make install PREFIX=$out - ''; - }) super.bustle); - # Byte-compile elisp code for Emacs. ghc-mod = overrideCabal (drv: { preCheck = "export HOME=$TMPDIR"; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 7d6ad9c7dc3b..dce9d199aeee 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -4464,8 +4464,6 @@ with pkgs; bundletool = callPackage ../development/tools/bundletool { }; - bustle = haskellPackages.bustle; - bwm_ng = callPackage ../tools/networking/bwm-ng { }; bwbasic = callPackage ../development/interpreters/bwbasic { }; diff --git a/pkgs/top-level/release-haskell.nix b/pkgs/top-level/release-haskell.nix index ed1d3240d1cf..f9faf6ac89c8 100644 --- a/pkgs/top-level/release-haskell.nix +++ b/pkgs/top-level/release-haskell.nix @@ -266,7 +266,6 @@ let agda arion bench - bustle blucontrol cabal-install cabal2nix