From b41af857ae5357ecfd4b4dd15d297ce8ab5ae2ea Mon Sep 17 00:00:00 2001 From: Profpatsch Date: Sun, 6 Aug 2023 12:47:20 +0200 Subject: chore(users/Profpatsch/whatcd-resolver): build with nix Change-Id: I2d6ee30671bb60a96bcbfede1fd7a17fcf7c3ca8 Reviewed-on: https://cl.tvl.fyi/c/depot/+/9012 Reviewed-by: Profpatsch Autosubmit: Profpatsch Tested-by: BuildkiteCI --- users/Profpatsch/whatcd-resolver/default.nix | 47 ++++++++++++++++++++++ .../whatcd-resolver/src/WhatcdResolver.hs | 4 +- .../whatcd-resolver/whatcd-resolver.cabal | 2 + 3 files changed, 51 insertions(+), 2 deletions(-) create mode 100644 users/Profpatsch/whatcd-resolver/default.nix diff --git a/users/Profpatsch/whatcd-resolver/default.nix b/users/Profpatsch/whatcd-resolver/default.nix new file mode 100644 index 000000000000..2135ad7cbc1d --- /dev/null +++ b/users/Profpatsch/whatcd-resolver/default.nix @@ -0,0 +1,47 @@ +{ depot, pkgs, lib, ... }: + +let + # bins = depot.nix.getBins pkgs.sqlite ["sqlite3"]; + + whatcd-resolver = pkgs.haskellPackages.mkDerivation { + pname = "whatcd-resolver"; + version = "0.1.0"; + + src = depot.users.Profpatsch.exactSource ./. [ + ./whatcd-resolver.cabal + ./src/Multipart2.hs + ./src/WhatcdResolver.hs + ]; + + libraryHaskellDepends = [ + depot.users.Profpatsch.my-prelude + pkgs.haskellPackages.pa-prelude + pkgs.haskellPackages.pa-label + pkgs.haskellPackages.pa-json + pkgs.haskellPackages.pa-error-tree + pkgs.haskellPackages.pa-field-parser + pkgs.haskellPackages.pa-pretty + pkgs.haskellPackages.pa-run-command + pkgs.haskellPackages.aeson-better-errors + pkgs.haskellPackages.blaze-html + pkgs.haskellPackages.dlist + pkgs.haskellPackages.http-conduit + pkgs.haskellPackages.http-types + pkgs.haskellPackages.ihp-hsx + pkgs.haskellPackages.monad-logger + pkgs.haskellPackages.resource-pool + pkgs.haskellPackages.postgresql-simple + pkgs.haskellPackages.selective + pkgs.haskellPackages.tmp-postgres + pkgs.haskellPackages.unliftio + pkgs.haskellPackages.wai-extra + pkgs.haskellPackages.warp + ]; + + isExecutable = true; + isLibrary = false; + license = lib.licenses.mit; + }; + +in +whatcd-resolver diff --git a/users/Profpatsch/whatcd-resolver/src/WhatcdResolver.hs b/users/Profpatsch/whatcd-resolver/src/WhatcdResolver.hs index 6af1f1d5d080..e37521b51e90 100644 --- a/users/Profpatsch/whatcd-resolver/src/WhatcdResolver.hs +++ b/users/Profpatsch/whatcd-resolver/src/WhatcdResolver.hs @@ -44,7 +44,7 @@ import PossehlAnalyticsPrelude import Postgres.Decoder qualified as Dec import Postgres.MonadPostgres import Pretty -import RunCommand +import RunCommand (runCommandExpect0) import System.Directory qualified as Dir import System.Directory qualified as Xdg import System.FilePath (()) @@ -514,7 +514,7 @@ doTransmissionRequest dat (req, parser) = do ] <> (req.tag & maybe [] (\t -> [("tag", t & Enc.int)])) ) - logDebug [fmt|transmission request: {showPrettyJsonEncoding body.unEnc}|] + logDebug [fmt|transmission request: {Pretty.showPrettyJsonEncoding body.unEnc}|] let httpReq = [fmt|http://{dat.host}:{dat.port}/transmission/rpc|] & Http.setRequestMethod "POST" diff --git a/users/Profpatsch/whatcd-resolver/whatcd-resolver.cabal b/users/Profpatsch/whatcd-resolver/whatcd-resolver.cabal index 86a19a7cedfe..1c595eb2e2c4 100644 --- a/users/Profpatsch/whatcd-resolver/whatcd-resolver.cabal +++ b/users/Profpatsch/whatcd-resolver/whatcd-resolver.cabal @@ -69,6 +69,8 @@ library pa-label, pa-json, pa-field-parser, + pa-pretty, + pa-run-command, aeson-better-errors, aeson, blaze-html, -- cgit 1.4.1