From ec5a9db64aaeb99e13326216a03b1b3753b40a05 Mon Sep 17 00:00:00 2001 From: sternenseemann Date: Thu, 18 Sep 2025 20:19:59 +0200 Subject: [PATCH] emanote: remove at 1.4.0.0 The former maintainer and upstream author of this package has been banned from Nixpkgs f03d404df9c59a2cbb7f6f902247841245c97c3c6ad90. I have zero interest in keeping this working. ema happens to work without overrides, so let's leave that enabled until it breaks. --- pkgs/development/haskell-modules/configuration-common.nix | 3 --- .../haskell-modules/configuration-hackage2nix/main.yaml | 1 - pkgs/development/haskell-modules/configuration-nix.nix | 2 -- pkgs/development/haskell-modules/hackage-packages.nix | 1 - pkgs/top-level/aliases.nix | 1 + pkgs/top-level/all-packages.nix | 3 --- pkgs/top-level/release-haskell.nix | 1 - 7 files changed, 1 insertion(+), 11 deletions(-) diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix index 9ac0952076b6..b0661e9fcb03 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -2454,9 +2454,6 @@ with haskellLib; )) ]; - # 2025-02-11: Too strict bounds on base < 4.17 - ema = doJailbreak super.ema; - # Too strict bounds on text and tls # https://github.com/barrucadu/irc-conduit/issues/54 # Use crypton-connection instead of connection diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix/main.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix/main.yaml index 396ea2325743..7fe0f4f2366a 100644 --- a/pkgs/development/haskell-modules/configuration-hackage2nix/main.yaml +++ b/pkgs/development/haskell-modules/configuration-hackage2nix/main.yaml @@ -698,7 +698,6 @@ unsupported-platforms: Codec-Image-DevIL: [ platforms.darwin ] # depends on mesa coinor-clp: [ aarch64-linux ] # aarch64-linux is not supported by required system dependency clp cut-the-crap: [ platforms.darwin ] - emanote: [ x86_64-darwin ] # Depends on stork which is broken on macOS sdk < 10.14 essence-of-live-coding-PortMidi: [ platforms.darwin ] Euterpea: [ platforms.darwin ] follow-file: [ platforms.darwin ] diff --git a/pkgs/development/haskell-modules/configuration-nix.nix b/pkgs/development/haskell-modules/configuration-nix.nix index dc5a276ecd6d..aa50419b3c7a 100644 --- a/pkgs/development/haskell-modules/configuration-nix.nix +++ b/pkgs/development/haskell-modules/configuration-nix.nix @@ -1824,8 +1824,6 @@ builtins.intersectAttrs super { })) super.tailwind; - emanote = addBuildDepend pkgs.stork super.emanote; - keid-render-basic = addBuildTool pkgs.glslang super.keid-render-basic; # Disable checks to break dependency loop with SCalendar diff --git a/pkgs/development/haskell-modules/hackage-packages.nix b/pkgs/development/haskell-modules/hackage-packages.nix index cd719b95d2f8..c6d66c4c6c4c 100644 --- a/pkgs/development/haskell-modules/hackage-packages.nix +++ b/pkgs/development/haskell-modules/hackage-packages.nix @@ -213621,7 +213621,6 @@ self: { ]; description = "Emanate a structured view of your plain-text notes"; license = lib.licenses.agpl3Only; - badPlatforms = [ "x86_64-darwin" ]; hydraPlatforms = lib.platforms.none; mainProgram = "emanote"; broken = true; diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index 9ba7cf1ac206..4ba17489d45e 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -858,6 +858,7 @@ mapAliases { emacsNativeComp = emacs; # Added 2022-06-08 emacsWithPackages = throw "'emacsWithPackages' has been renamed to/replaced by 'emacs.pkgs.withPackages'"; # Converted to throw 2024-10-17 emacsPackages = emacs.pkgs; # Added 2025-03-02 + emanote = throw "'emanote' has been removed due to lack of a Nixpkgs maintainer"; # Added 2025-09-18 embree2 = throw "embree2 has been removed, as it is unmaintained upstream and depended on tbb_2020"; # Added 2025-09-14 EmptyEpsilon = empty-epsilon; # Added 2024-07-14 diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 8281b6bd355f..aa4b5063f916 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -7178,9 +7178,6 @@ with pkgs; vapoursynth-editor = libsForQt5.callPackage ../by-name/va/vapoursynth/editor.nix { }; - # TODO: Fix references and add justStaticExecutables https://github.com/NixOS/nixpkgs/issues/318013 - emanote = haskellPackages.emanote; - enchant2 = callPackage ../development/libraries/enchant/2.x.nix { }; enchant = enchant2; diff --git a/pkgs/top-level/release-haskell.nix b/pkgs/top-level/release-haskell.nix index 05ba89e2706a..a41d6a042079 100644 --- a/pkgs/top-level/release-haskell.nix +++ b/pkgs/top-level/release-haskell.nix @@ -271,7 +271,6 @@ let diagrams-builder echidna elm2nix - emanote fffuu futhark ghcid