From b9f2405fdf68a9d04359f8efafb544df11528668 Mon Sep 17 00:00:00 2001 From: stuebinm Date: Tue, 14 Nov 2023 21:43:06 +0100 Subject: bahnhof.name haskell rewrite --- pkgs/overlay.nix | 42 +++++++++++++++++++++++++++++++----------- 1 file changed, 31 insertions(+), 11 deletions(-) (limited to 'pkgs') diff --git a/pkgs/overlay.nix b/pkgs/overlay.nix index 7449786..71ee3b4 100644 --- a/pkgs/overlay.nix +++ b/pkgs/overlay.nix @@ -84,17 +84,37 @@ in isabelle-rust-utils = self.isabelle-utils; }; - bahnhof-name = let - inherit (self.callPackage "${inputs.nix-gleam.outPath}/builder/default.nix" {}) buildGleamApplication; - in buildGleamApplication { - version = "0.1"; - pname = "bahnhof.name"; - src = inputs.bahnhof-name; - - postInstall = '' - cp -r $src/data $out - ''; - }; + bahnhof-name = + let + haskellPkgs = self.haskellPackages.override (old: { + overrides = self': super': with self.haskell.lib; { + fuzzyfind = unmarkBroken (doJailbreak super'.fuzzyfind); + }; + }); + pkg = { mkDerivation, base, bytestring, cassava, containers + , fuzzyfind, fuzzyset, http-client, http-client-openssl, http-types + , lib, stm, text, time, vector, wai, wai-extra, warp + }: + mkDerivation { + pname = "bahnhof.name"; + version = "0.2.0.0"; + src = inputs.bahnhof-name; + isLibrary = false; + isExecutable = true; + executableHaskellDepends = [ + base bytestring cassava containers fuzzyfind fuzzyset http-client + http-client-openssl http-types stm text time vector wai wai-extra + warp + ]; + mainProgram = "bahnhof-name"; + license = lib.licenses.eupl12; + postInstall = '' + cp -r $src/data $out + ''; + }; + in + haskellPkgs.callPackage pkg {}; + #### sporadically maintained / updated #### -- cgit v1.2.3