From 4e3eb5a44fcc7a87ae9b2e5f95fe64023c5467cb Mon Sep 17 00:00:00 2001 From: Alex Tunstall Date: Mon, 15 Sep 2025 23:40:35 +0100 Subject: [PATCH] hugs: Fix build failure We change to Lennart Augustsson's branch in preparation for booting MicroHs via Hugs. --- pkgs/by-name/hu/hugs/package.nix | 26 ++++++++++++-------------- 1 file changed, 12 insertions(+), 14 deletions(-) diff --git a/pkgs/by-name/hu/hugs/package.nix b/pkgs/by-name/hu/hugs/package.nix index 4bc39894a6fb..d256e99d76a1 100644 --- a/pkgs/by-name/hu/hugs/package.nix +++ b/pkgs/by-name/hu/hugs/package.nix @@ -1,29 +1,28 @@ { lib, stdenv, - fetchurl, + fetchFromGitHub, bison, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation { pname = "hugs98"; version = "2006-09"; - src = fetchurl { - url = "https://www.haskell.org/hugs/downloads/${version}/hugs98-Sep2006.tar.gz"; - sha256 = "1dj65c39zpy6qqvvrwns2hzj6ipnd4ih655xj7kgyk2nfdvd5x1w"; + src = fetchFromGitHub { + owner = "augustss"; + repo = "hugs98-plus-Sep2006"; + rev = "1f7b60e05b12df00d715d535bb01c189bc1b9b3c"; + hash = "sha256-g6/4kmdWKGDIu5PXVfP8O6Fl3v4bstXWAVkoxZiS6qo="; }; - patches = [ - (fetchurl { - url = "https://aur.archlinux.org/cgit/aur.git/plain/hsbase_inline.patch?h=hugs"; - name = "hsbase_inline.patch"; - sha256 = "1h0sp16d17hlm6gj7zdbgwrjwi2l4q02m8p0wd60dp4gn9i9js0v"; - }) - ]; - nativeBuildInputs = [ bison ]; + NIX_CFLAGS_COMPILE = [ + "-Wno-error=implicit-int" + "-Wno-error=implicit-function-declaration" + ]; + postUnpack = "find -type f -exec sed -i 's@/bin/cp@cp@' {} +"; preConfigure = "unset STRIP"; @@ -45,7 +44,6 @@ stdenv.mkDerivation rec { ]; meta = with lib; { - broken = stdenv.hostPlatform.isDarwin; mainProgram = "hugs"; homepage = "https://www.haskell.org/hugs"; description = "Haskell interpreter";