From a69e139242faa63290cafb7cd70cdcc9bcdd996c Mon Sep 17 00:00:00 2001 From: Sean Gillespie Date: Mon, 8 Jan 2024 10:15:09 -0500 Subject: [PATCH] fix: Add curl to cabal wrapper (#119) --- cross-js.nix | 2 +- cross-windows.nix | 2 +- dynamic.nix | 2 +- static.nix | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/cross-js.nix b/cross-js.nix index 318c9b8a..8dcf9213 100644 --- a/cross-js.nix +++ b/cross-js.nix @@ -9,7 +9,7 @@ let tool-version-map = import ./tool-map.nix; # A cabal-install wrapper that sets the appropriate static flags wrapped-cabal = pkgs.writeShellApplication { name = "cabal"; - runtimeInputs = [ cabal-install ]; + runtimeInputs = [ cabal-install pkgs.curl ]; text = with pkgs; '' # We do not want to quote NIX_CABAL_FLAGS # it will leave an empty argument, if they are empty. diff --git a/cross-windows.nix b/cross-windows.nix index a6ed2e0f..ab4e3d38 100644 --- a/cross-windows.nix +++ b/cross-windows.nix @@ -56,7 +56,7 @@ let tool-version-map = import ./tool-map.nix; # A cabal-install wrapper that sets the appropriate static flags wrapped-cabal = pkgs.pkgsBuildBuild.writeShellApplication { name = "cabal"; - runtimeInputs = [ cabal-install ]; + runtimeInputs = [ cabal-install pkgs.curl ]; text = '' # We do not want to quote NIX_CABAL_FLAGS # it will leave an empty argument, if they are empty. diff --git a/dynamic.nix b/dynamic.nix index c3ea356d..13a72126 100644 --- a/dynamic.nix +++ b/dynamic.nix @@ -33,7 +33,7 @@ let tool-version-map = import ./tool-map.nix; # here. wrapped-cabal = pkgs.writeShellApplication { name = "cabal"; - runtimeInputs = [ cabal-install ]; + runtimeInputs = [ cabal-install pkgs.curl ]; text = '' case "$1" in build) cabal "$@" diff --git a/static.nix b/static.nix index 46467b36..39127d64 100644 --- a/static.nix +++ b/static.nix @@ -25,7 +25,7 @@ let tool-version-map = import ./tool-map.nix; # A cabal-install wrapper that sets the appropriate static flags wrapped-cabal = pkgs.writeShellApplication { name = "cabal"; - runtimeInputs = [ cabal-install ]; + runtimeInputs = [ cabal-install pkgs.curl ]; text = with pkgs; '' # We do not want to quote NIX_CABAL_FLAGS # it will leave an empty argument, if they are empty.