diff options
| author | github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> | 2022-06-20 00:12:24 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-06-20 00:12:24 +0000 |
| commit | fe2a5e2ebb786d134dc942e1a09ed8557a856312 (patch) | |
| tree | 6cd666853f6f65c03a84ba5ed2ed2f5388b9f9e8 /pkgs/data | |
| parent | 076cf3c73c1a0c8ab784a8c6942e28445b78c38f (diff) | |
| parent | bf97f8474aaf2fd8f00cdd48ac926e32970dace1 (diff) | |
Merge master into haskell-updates
Diffstat (limited to 'pkgs/data')
| -rw-r--r-- | pkgs/data/misc/mailcap/default.nix | 22 | ||||
| -rw-r--r-- | pkgs/data/misc/mobile-broadband-provider-info/default.nix | 4 |
2 files changed, 14 insertions, 12 deletions
diff --git a/pkgs/data/misc/mailcap/default.nix b/pkgs/data/misc/mailcap/default.nix index 3519b01f54ba0..06c8047e1cab2 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; { diff --git a/pkgs/data/misc/mobile-broadband-provider-info/default.nix b/pkgs/data/misc/mobile-broadband-provider-info/default.nix index 234016175d260..8f5ce0d02025f 100644 --- a/pkgs/data/misc/mobile-broadband-provider-info/default.nix +++ b/pkgs/data/misc/mobile-broadband-provider-info/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "mobile-broadband-provider-info"; - version = "20220315"; + version = "20220511"; src = fetchurl { url = "mirror://gnome/sources/${pname}/${version}/${pname}-${version}.tar.xz"; - sha256 = "sha256-H82sctF52xQnl4Nm9wG+HDx1Nf1aZYvFzIKCR8b2RcY="; + sha256 = "sha256-dfk+iGZh8DWYMsPigjyvqG505AgEJbjOCpw7DQqyp3Q="; }; nativeBuildInputs = [ |