From 385e15fc22f48a1f8d40b8263a54155fdab499ea Mon Sep 17 00:00:00 2001
From: stuebinm
Date: Wed, 17 Apr 2024 01:21:33 +0200
Subject: replace protocol-buffers with proto-lens

I do not really like either option, but at least the second one seems
more likely to be maintained (and a little less clunky to use, too, for
what it's worth).
---
 default.nix | 40 ++++++++++++++++------------------------
 1 file changed, 16 insertions(+), 24 deletions(-)

(limited to 'default.nix')

diff --git a/default.nix b/default.nix
index 06ff967..d6ce56c 100644
--- a/default.nix
+++ b/default.nix
@@ -10,8 +10,8 @@ let
       , directory, either, exceptions, extra, fmt, hoauth2, http-api-data
       , http-media, insert-ordered-containers, lens, lib, monad-logger
       , mtl, path-pieces, persistent, persistent-postgresql
-      , prometheus-client, prometheus-metrics-ghc, protocol-buffers
-      , protocol-buffers-descriptor, regex-tdfa, resource-pool, servant
+      , prometheus-client, prometheus-metrics-ghc, proto-lens
+      , proto-lens-runtime, regex-tdfa, resource-pool, servant
       , servant-docs, servant-server, servant-swagger, servant-websockets
       , shakespeare, stm, swagger2, text, time, timezone-olson
       , timezone-series, transformers, unliftio-core, uri-bytestring
@@ -23,34 +23,33 @@ let
         pname = "tracktrain";
         version = "0.1.0.0";
         src = ./.;
-        isLibrary = false;
+        isLibrary = true;
         isExecutable = true;
         libraryHaskellDepends = [
           aeson base blaze-html blaze-markup bytestring cassava conduit
           conferer conferer-warp containers either exceptions extra fmt
           hoauth2 http-api-data http-media insert-ordered-containers lens
           monad-logger mtl path-pieces persistent persistent-postgresql
-          prometheus-client prometheus-metrics-ghc protocol-buffers
-          protocol-buffers-descriptor regex-tdfa resource-pool servant
-          servant-docs servant-server servant-swagger servant-websockets
-          shakespeare stm swagger2 text time timezone-olson timezone-series
-          transformers unliftio-core uri-bytestring uuid vector
-          vector-algorithms warp websockets yesod yesod-auth
-          yesod-auth-oauth2 yesod-core yesod-form zip-archive
+          prometheus-client prometheus-metrics-ghc proto-lens
+          proto-lens-runtime regex-tdfa resource-pool servant servant-docs
+          servant-server servant-swagger servant-websockets shakespeare stm
+          swagger2 text time timezone-olson timezone-series transformers
+          unliftio-core uri-bytestring uuid vector vector-algorithms warp
+          websockets yesod yesod-auth yesod-auth-oauth2 yesod-core yesod-form
+          zip-archive
         ];
         executableHaskellDepends = [
           aeson base bytestring conferer conferer-aeson conferer-yaml
           data-default-class directory extra fmt monad-logger
-          persistent-postgresql protocol-buffers time wai-extra warp
+          persistent-postgresql proto-lens time wai-extra warp
         ];
         doHaddock = false;
-        description = "tracktrain tracks trains on their traintracks";
-        license = "unknown";
-        mainProgram = "tracktrain";
         postInstall = ''
           cp -r $src/assets $out/assets
         '';
-        jailbreak = true;
+        description = "tracktrain tracks trains on their traintracks";
+        license = "unknown";
+        mainProgram = "tracktrain";
       };
 
   haskellPackages = if compiler == "default"
@@ -61,17 +60,10 @@ let
 
   # we can override haskell packages in nix here; but attempt to minimise that
   # since builds get pretty expensive when we do.
+  # (currently kept as a dummy)
   hpkgs = haskellPackages.override {
     overrides = self: super: with pkgs.haskell.lib.compose; {
-      conferer-warp = markUnbroken super.conferer-warp;
-      protocol-buffers = markUnbroken (overrideSrc {
-          src = pkgs.fetchFromGitHub {
-            owner = "k-bx";
-            repo = "protocol-buffers";
-            sha256 = "sha256-Olp02L6ztDkG9sUOQf+kOcaQEMbdhIJyPRkpvxU9v7I=";
-            rev = "ae8084f115fbdb699da2b2a163776b1a1167bf0f";
-          };
-        } super.protocol-buffers);
+      # conferer-warp = markUnbroken super.conferer-warp;
     };
   };
 
-- 
cgit v1.2.3