From 81c57a8407e943526cc5ba445ed2b65c87038b2d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Sat, 4 Jun 2022 22:55:26 +0200 Subject: [PATCH 1/2] cacert: use buildcatrust build with python3Minimal to avoid inifinite recursion with mailcap Co-authored-by: Artturi --- pkgs/top-level/all-packages.nix | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 8a397005774a..38e182ec05c1 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -24120,7 +24120,10 @@ with pkgs; brise = callPackage ../data/misc/brise { }; - cacert = callPackage ../data/misc/cacert { }; + cacert = callPackage ../data/misc/cacert { + # avoid an infinite recursion through mailcap + buildcatrust = with python3Minimal.pkgs; toPythonApplication buildcatrust; + }; caladea = callPackage ../data/fonts/caladea {}; From 80f9a78c01df1fafc4e0743a8ca763018bc0ff45 Mon Sep 17 00:00:00 2001 From: Artturin Date: Sun, 5 Jun 2022 00:08:12 +0300 Subject: [PATCH 2/2] mailcap: fix build and prevent future inf rec issues --- pkgs/data/misc/mailcap/default.nix | 22 ++++++++++++---------- 1 file changed, 12 insertions(+), 10 deletions(-) diff --git a/pkgs/data/misc/mailcap/default.nix b/pkgs/data/misc/mailcap/default.nix index 3519b01f54ba..06c8047e1cab 100644 --- a/pkgs/data/misc/mailcap/default.nix +++ b/pkgs/data/misc/mailcap/default.nix @@ -1,23 +1,25 @@ -{ lib, fetchzip }: +{ lib, stdenv, fetchurl }: -let +stdenv.mkDerivation rec { + pname = "mailcap"; version = "2.1.53"; -in fetchzip { - name = "mailcap-${version}"; + src = fetchurl { + url = "https://releases.pagure.org/mailcap/mailcap-${version}.tar.xz"; + sha256 = "sha256-Xuou8XswSXe6PsuHr61DGfoEQPgl5Pb7puj6L/64h4U="; + }; - url = "https://releases.pagure.org/mailcap/mailcap-${version}.tar.xz"; - sha256 = "sha256-6JPj2tZgoTEZ8hNEi9ZZhElBNm9SRTSXifMmCicwiLo="; + installPhase = '' + runHook preInstall - postFetch = '' - tar -xavf $downloadedFile --strip-components=1 substituteInPlace mailcap --replace "/usr/bin/" "" - gzip mailcap.5 sh generate-nginx-mimetypes.sh < mime.types > nginx-mime.types install -D -m0644 nginx-mime.types $out/etc/nginx/mime.types install -D -m0644 -t $out/etc mailcap mime.types - install -D -m0644 -t $out/share/man/man5 mailcap.5.gz + install -D -m0644 -t $out/share/man/man5 mailcap.5 + + runHook postInstall ''; meta = with lib; {