diff options
| author | lassulus <lassulus@lassul.us> | 2020-12-30 13:00:28 +0100 |
|---|---|---|
| committer | lassulus <lassulus@lassul.us> | 2020-12-30 13:00:28 +0100 |
| commit | 50a3903825c8932b87b3fb6be77245688be76534 (patch) | |
| tree | 7cafca39fc1d805259afc5f52dbad51f21e81932 /krebs/5pkgs | |
| parent | 053044834c1af30a90ced1338ae4342a445a2946 (diff) | |
| parent | 9c2529b2910bdb3b73bcd69ed958d82e01bf7943 (diff) | |
Merge remote-tracking branch 'ni/master'
Diffstat (limited to 'krebs/5pkgs')
| -rw-r--r-- | krebs/5pkgs/simple/cabal-read.nix | 4 | ||||
| -rw-r--r-- | krebs/5pkgs/simple/htgen/default.nix | 22 |
2 files changed, 14 insertions, 12 deletions
diff --git a/krebs/5pkgs/simple/cabal-read.nix b/krebs/5pkgs/simple/cabal-read.nix index f8fc71e05..03b42ef2c 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 -> diff --git a/krebs/5pkgs/simple/htgen/default.nix b/krebs/5pkgs/simple/htgen/default.nix index c3f6d1779..9ed97242c 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 |