From ef2eaa937346d9a7dedeff176671a7fcb5ed6efa Mon Sep 17 00:00:00 2001 From: Jappie Klooster Date: Fri, 9 Oct 2020 23:16:54 +0200 Subject: [PATCH 1/2] cut-the-crap: Mark unbroken I fixed this by adding c2hs to cabal as a built tool. --- pkgs/development/haskell-modules/configuration-hackage2nix.yaml | 1 - 1 file changed, 1 deletion(-) diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml index fe19ca322a3..c77ce2f8742 100644 --- a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml +++ b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml @@ -4235,7 +4235,6 @@ broken-packages: - curve25519 - curves - custom-prelude - - cut-the-crap - CV - cv-combinators - cypher From 2005dbf5a83bac383776c719c051266dd012580d Mon Sep 17 00:00:00 2001 From: Jappie Klooster Date: Sat, 10 Oct 2020 12:58:11 +0200 Subject: [PATCH 2/2] Add youtube-dl to path for version 2 --- pkgs/development/haskell-modules/configuration-nix.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/haskell-modules/configuration-nix.nix b/pkgs/development/haskell-modules/configuration-nix.nix index 9be62568373..ad9e33042a0 100644 --- a/pkgs/development/haskell-modules/configuration-nix.nix +++ b/pkgs/development/haskell-modules/configuration-nix.nix @@ -731,7 +731,7 @@ self: super: builtins.intersectAttrs super { primitive = dontCheck super.primitive; cut-the-crap = - let path = pkgs.stdenv.lib.makeBinPath [ pkgs.ffmpeg_3 ]; + let path = pkgs.stdenv.lib.makeBinPath [ pkgs.ffmpeg_3 pkgs.youtube-dl ]; in overrideCabal (addBuildTool super.cut-the-crap pkgs.makeWrapper) (_drv: { postInstall = '' wrapProgram $out/bin/cut-the-crap \