From ddd4c3c7ba95283282cf7e5a79a1a91050a496ac Mon Sep 17 00:00:00 2001 From: Winter Date: Sun, 11 May 2025 17:08:33 -0400 Subject: [PATCH 1/3] ma: fix license I cannot be the only one to have missed where this was declared. (Thanks to anonymous catgirl for spotting.) --- pkgs/by-name/ma/ma/package.nix | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/pkgs/by-name/ma/ma/package.nix b/pkgs/by-name/ma/ma/package.nix index 50063cca5c35..63690ba17a9d 100644 --- a/pkgs/by-name/ma/ma/package.nix +++ b/pkgs/by-name/ma/ma/package.nix @@ -40,7 +40,9 @@ stdenv.mkDerivation { homepage = "http://call-with-current-continuation.org/ma/ma.html"; mainProgram = "ma"; maintainers = with lib.maintainers; [ ehmry ]; - license = lib.licenses.free; + # Per the README: + # > All of MA's source code is hereby placed in the public domain + license = lib.licenses.publicDomain; inherit (tclPackages.tk.meta) platforms; }; } From 50375a51b5012bbe3eaf66dbf97c0a0131500f11 Mon Sep 17 00:00:00 2001 From: Winter Date: Sun, 11 May 2025 17:09:46 -0400 Subject: [PATCH 2/3] ma: use IA URL for src The URL provided by upstream is not stable. --- pkgs/by-name/ma/ma/package.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/by-name/ma/ma/package.nix b/pkgs/by-name/ma/ma/package.nix index 63690ba17a9d..ae70df114fc1 100644 --- a/pkgs/by-name/ma/ma/package.nix +++ b/pkgs/by-name/ma/ma/package.nix @@ -10,7 +10,7 @@ stdenv.mkDerivation { version = "11"; src = fetchurl { - url = "http://call-with-current-continuation.org/ma/ma.tar.gz"; + url = "https://web.archive.org/web/20250511210225/http://call-with-current-continuation.org/ma/ma.tar.gz"; hash = "sha256-1UVxXbN2jSNm13BjyoN3jbKtkO3DUEEHaDOC2Ibbxf4="; }; From c0f97aca24214410ed4f9445ab671dc8cf19ee8d Mon Sep 17 00:00:00 2001 From: Winter Date: Sun, 11 May 2025 17:15:31 -0400 Subject: [PATCH 3/3] ma: fix build on non-gcc stdenvs Notably fixes Darwin support, which this package originally advertised when it didn't actually build. --- pkgs/by-name/ma/ma/package.nix | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/pkgs/by-name/ma/ma/package.nix b/pkgs/by-name/ma/ma/package.nix index ae70df114fc1..3a6e00774344 100644 --- a/pkgs/by-name/ma/ma/package.nix +++ b/pkgs/by-name/ma/ma/package.nix @@ -14,6 +14,10 @@ stdenv.mkDerivation { hash = "sha256-1UVxXbN2jSNm13BjyoN3jbKtkO3DUEEHaDOC2Ibbxf4="; }; + postPatch = '' + substituteInPlace ./build --replace-fail gcc ${lib.getExe stdenv.cc} + ''; + buildInputs = [ tclPackages.tk ];