From 04bcb883323b6d5d9368fadab64d9e77d3295108 Mon Sep 17 00:00:00 2001 From: Joachim Fasting Date: Thu, 24 Mar 2016 23:57:54 +0100 Subject: [PATCH] hugs: fix build & meta fixups Fix build by applying a patch from Arch Linux. See https://hydra.nixos.org/build/33247205/log/raw Meta fixups - The license is actually 3-clause BSD license. - Use HTTPS homepage - Adopt the package - Convert src.sha256 to base32 --- .../development/interpreters/hugs/default.nix | 21 +++++++++++++------ 1 file changed, 15 insertions(+), 6 deletions(-) diff --git a/pkgs/development/interpreters/hugs/default.nix b/pkgs/development/interpreters/hugs/default.nix index b1c3df28d1f2..14afe0279c38 100644 --- a/pkgs/development/interpreters/hugs/default.nix +++ b/pkgs/development/interpreters/hugs/default.nix @@ -6,10 +6,18 @@ stdenv.mkDerivation { src = fetchurl { url = http://cvs.haskell.org/Hugs/downloads/2006-09/hugs98-Sep2006.tar.gz; - sha256 = "3cf4d27673564cffe691bd14032369f646233f14daf2bc37c6c6df9f062b46b6"; + sha256 = "1dj65c39zpy6qqvvrwns2hzj6ipnd4ih655xj7kgyk2nfdvd5x1w"; }; - buildInputs = [ bison ]; + patches = + [ (fetchurl { + url = https://aur.archlinux.org/cgit/aur.git/plain/hsbase_inline.patch?h=hugs; + name = "hsbase_inline.patch"; + sha256 = "1h0sp16d17hlm6gj7zdbgwrjwi2l4q02m8p0wd60dp4gn9i9js0v"; + }) + ]; + + nativeBuildInputs = [ bison ]; postUnpack = "find -type f -exec sed -i 's@/bin/cp@cp@' {} +"; @@ -29,10 +37,11 @@ stdenv.mkDerivation { "--enable-pthreads" # build Hugs using POSIX threads C library ]; - meta = { - homepage = http://www.haskell.org/hugs; + meta = with stdenv.lib; { + homepage = https://www.haskell.org/hugs; description = "Haskell interpreter"; - license = "as-is"; # gentoo labels it this way - platforms = stdenv.lib.platforms.unix; # arbitrary choice + maintainers = with maintainers; [ joachifm ]; + license = licenses.bsd3; + platforms = platforms.all; }; }