diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix index 122ab08bfa15..ed57d05be239 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -2645,4 +2645,10 @@ in { # 2022-10-04: Needs newer tasty-dejafu than (currently) in stackage rec-def = super.rec-def.override { tasty-dejafu = self.tasty-dejafu_2_1_0_0; }; + + # 2022-11-04: The situation around heist-emanote is quite terrible. + # It‘s simply a heist fork because heist is unmaintained. + # Upstream jailbreak is unreleased: https://github.com/srid/heist/commit/988692ea850b3cbe966c7dc4dd26ba1d49647706 + heist-emanote = doJailbreak (dontCheck super.heist-emanote); + }) diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix/broken.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix/broken.yaml index 7610a82814dc..224810b8a21e 100644 --- a/pkgs/development/haskell-modules/configuration-hackage2nix/broken.yaml +++ b/pkgs/development/haskell-modules/configuration-hackage2nix/broken.yaml @@ -2137,7 +2137,6 @@ broken-packages: - heidi - hein - heist-async - - heist-emanote - helisp - helix - hell @@ -5027,7 +5026,6 @@ broken-packages: - tagsoup-selection - tai - tai64 - - tailwind - tak - takahashi - Takusen diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix/main.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix/main.yaml index 51e58be7f3d7..94b1b2af3c0e 100644 --- a/pkgs/development/haskell-modules/configuration-hackage2nix/main.yaml +++ b/pkgs/development/haskell-modules/configuration-hackage2nix/main.yaml @@ -290,6 +290,7 @@ package-maintainers: maralorn: - cabal-fmt - ema + - emanote - generic-optics - ghcid - ghcide diff --git a/pkgs/development/haskell-modules/configuration-nix.nix b/pkgs/development/haskell-modules/configuration-nix.nix index e30a5aa17c4e..8f9e6d0ce185 100644 --- a/pkgs/development/haskell-modules/configuration-nix.nix +++ b/pkgs/development/haskell-modules/configuration-nix.nix @@ -1102,6 +1102,20 @@ self: super: builtins.intersectAttrs super { broken = false; }) super.cabal-install; + tailwind = addBuildDepend + # Overrides for tailwindcss copied from: + # https://github.com/EmaApps/emanote/blob/master/nix/tailwind.nix + (pkgs.nodePackages.tailwindcss.overrideAttrs (oa: { + plugins = [ + pkgs.nodePackages."@tailwindcss/aspect-ratio" + pkgs.nodePackages."@tailwindcss/forms" + pkgs.nodePackages."@tailwindcss/line-clamp" + pkgs.nodePackages."@tailwindcss/typography" + ]; + })) super.tailwind; + + emanote = addBuildDepend pkgs.stork super.emanote; + keid-render-basic = addBuildTool pkgs.glslang super.keid-render-basic; # ghcide-bench tests need network diff --git a/pkgs/development/haskell-modules/hackage-packages.nix b/pkgs/development/haskell-modules/hackage-packages.nix index 698e92c2aaf2..5b0bc92568c3 100644 --- a/pkgs/development/haskell-modules/hackage-packages.nix +++ b/pkgs/development/haskell-modules/hackage-packages.nix @@ -90499,6 +90499,7 @@ self: { description = "Emanate a structured view of your plain-text notes"; license = lib.licenses.agpl3Only; mainProgram = "emanote"; + maintainers = [ lib.maintainers.maralorn ]; }) {}; "embed-config" = callPackage @@ -135822,8 +135823,6 @@ self: { ]; description = "An Haskell template system supporting both HTML5 and XML"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "heist-extra" = callPackage @@ -278895,9 +278894,7 @@ self: { ]; description = "Tailwind wrapped in Haskell"; license = lib.licenses.mit; - hydraPlatforms = lib.platforms.none; mainProgram = "tailwind-run"; - broken = true; }) {}; "tak" = callPackage diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 4c07bbac3ca0..6c644960fc75 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -18567,6 +18567,8 @@ with pkgs; elfio = callPackage ../development/libraries/elfio { }; + emanote = haskell.lib.compose.justStaticExecutables haskellPackages.emanote; + enchant1 = callPackage ../development/libraries/enchant/1.x.nix { }; enchant2 = callPackage ../development/libraries/enchant/2.x.nix { };