From 29827720520b6a4885dbdcb3237070e6e45dd910 Mon Sep 17 00:00:00 2001
From: tv <tv@krebsco.de>
Date: Tue, 1 Dec 2020 23:11:59 +0100
Subject: cabal-read: make compatible with Cabal >=3.0.0

---
 krebs/5pkgs/simple/cabal-read.nix | 4 ++++
 1 file changed, 4 insertions(+)

(limited to 'krebs/5pkgs')

diff --git a/krebs/5pkgs/simple/cabal-read.nix b/krebs/5pkgs/simple/cabal-read.nix
index f8fc71e0..03b42ef2 100644
--- a/krebs/5pkgs/simple/cabal-read.nix
+++ b/krebs/5pkgs/simple/cabal-read.nix
@@ -5,6 +5,7 @@ writeHaskellPackage "cabal-read" {
   executables.ghc-options = {
     extra-depends = ["Cabal"];
     text = /* haskell */ ''
+      {-# LANGUAGE CPP #-}
       module Main (main) where
       import Data.List
       import Data.Maybe
@@ -26,6 +27,9 @@ writeHaskellPackage "cabal-read" {
           case lookup (mkUnqualComponentName name) (condExecutables desc) of
             Just exe ->
               putStrLn . intercalate " " . fromMaybe [] . lookup GHC
+      #if MIN_VERSION_Cabal(3,0,0)
+                       . perCompilerFlavorToList
+      #endif
                        . options . buildInfo . condTreeData $ exe
 
             Nothing ->
-- 
cgit v1.2.3


From 9c2529b2910bdb3b73bcd69ed958d82e01bf7943 Mon Sep 17 00:00:00 2001
From: tv <tv@krebsco.de>
Date: Wed, 30 Dec 2020 11:58:05 +0100
Subject: htgen: 1.2.8 -> 1.3.0

---
 krebs/5pkgs/simple/htgen/default.nix | 22 ++++++++++------------
 1 file changed, 10 insertions(+), 12 deletions(-)

(limited to 'krebs/5pkgs')

diff --git a/krebs/5pkgs/simple/htgen/default.nix b/krebs/5pkgs/simple/htgen/default.nix
index c3f6d177..9ed97242 100644
--- a/krebs/5pkgs/simple/htgen/default.nix
+++ b/krebs/5pkgs/simple/htgen/default.nix
@@ -1,24 +1,22 @@
-{ coreutils, dash, fetchgit, gnused, stdenv, ucspi-tcp }:
-with import <stockholm/lib>;
-let
-  version = "1.2.8";
-in stdenv.mkDerivation {
-  name = "htgen-${version}";
+{ fetchgit, lib, pkgs, stdenv }:
+stdenv.mkDerivation rec {
+  pname = "htgen";
+  version = "1.3.0";
 
   src = fetchgit {
     url = "http://cgit.krebsco.de/htgen";
     rev = "refs/tags/v${version}";
-    sha256 = "046c05jswar2agagqixad3idqxca494aaf199h6bdn02cyzygnpq";
+    sha256 = "0p3517wkfpvip4z0axh0b4v1jm1nqpppldnhq4806c0p33vrjxnf";
   };
 
   installPhase = ''
     mkdir -p $out/bin
     {
-      echo '#! ${dash}/bin/dash'
-      echo 'export PATH=${makeBinPath [
-        coreutils
-        gnused
-        ucspi-tcp
+      echo '#! ${pkgs.dash}/bin/dash'
+      echo 'export PATH=${lib.makeBinPath [
+        pkgs.coreutils
+        pkgs.jq
+        pkgs.ucspi-tcp
       ]}''${PATH+":$PATH"}'
       sed 's:^Server=htgen$:&/${version}:' htgen
     } > $out/bin/htgen
-- 
cgit v1.2.3