diff options
| author | github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> | 2022-10-03 12:01:27 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-10-03 12:01:27 +0000 |
| commit | a46be8f23df4cc4875c37504a74589c0bb90c4d7 (patch) | |
| tree | c9d064efcbbcdfd4f9a65a366cadc621115a27b3 /pkgs/tools | |
| parent | 793b7f618d79295eed7ef55ab3f6f8290e8c19bc (diff) | |
| parent | 5f53dac66aa7df8d2837b60f87aa1fcefb5f3ad1 (diff) | |
| download | nixpkgs-a46be8f23df4cc4875c37504a74589c0bb90c4d7.tar nixpkgs-a46be8f23df4cc4875c37504a74589c0bb90c4d7.tar.gz nixpkgs-a46be8f23df4cc4875c37504a74589c0bb90c4d7.tar.bz2 nixpkgs-a46be8f23df4cc4875c37504a74589c0bb90c4d7.tar.lz nixpkgs-a46be8f23df4cc4875c37504a74589c0bb90c4d7.tar.xz nixpkgs-a46be8f23df4cc4875c37504a74589c0bb90c4d7.tar.zst nixpkgs-a46be8f23df4cc4875c37504a74589c0bb90c4d7.zip | |
Merge master into staging-next
Diffstat (limited to 'pkgs/tools')
| -rw-r--r-- | pkgs/tools/misc/panoply/default.nix | 4 | ||||
| -rw-r--r-- | pkgs/tools/networking/uwimap/default.nix | 14 |
2 files changed, 10 insertions, 8 deletions
diff --git a/pkgs/tools/misc/panoply/default.nix b/pkgs/tools/misc/panoply/default.nix index 611874ab768..31a9e3a7f04 100644 --- a/pkgs/tools/misc/panoply/default.nix +++ b/pkgs/tools/misc/panoply/default.nix @@ -2,11 +2,11 @@ stdenvNoCC.mkDerivation rec { pname = "panoply"; - version = "5.2.0"; + version = "5.2.1"; src = fetchurl { url = "https://www.giss.nasa.gov/tools/panoply/download/PanoplyJ-${version}.tgz"; - sha256 = "sha256-ko2UB7jy2sob5i/TAjjJVBuVyvqgh4awB1jEv8DplM0="; + sha256 = "sha256-ukIH6hiWg8GMq28chfxIb2uHZaaymL9x/BhbFnIzw0Y="; }; nativeBuildInputs = [ makeWrapper ]; diff --git a/pkgs/tools/networking/uwimap/default.nix b/pkgs/tools/networking/uwimap/default.nix index a10a779097a..4bd2f872caf 100644 --- a/pkgs/tools/networking/uwimap/default.nix +++ b/pkgs/tools/networking/uwimap/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, fetchpatch, pam, openssl }: +{ lib, stdenv, fetchurl, fetchpatch, pam, openssl, libkrb5 }: stdenv.mkDerivation rec { pname = "uw-imap"; @@ -18,8 +18,10 @@ stdenv.mkDerivation rec { hardeningDisable = [ "format" ]; - buildInputs = [ openssl ] - ++ lib.optional (!stdenv.isDarwin) pam; + buildInputs = [ + openssl + (if stdenv.isDarwin then libkrb5 else pam) # Matches the make target. + ]; patches = [ (fetchpatch { url = "https://salsa.debian.org/holmgren/uw-imap/raw/dcb42981201ea14c2d71c01ebb4a61691b6f68b3/debian/patches/1006_openssl1.1_autoverify.patch"; @@ -43,11 +45,11 @@ stdenv.mkDerivation rec { tools/{an,ua} $out/bin ''; - meta = { + meta = with lib; { homepage = "https://www.washington.edu/imap/"; description = "UW IMAP toolkit - IMAP-supporting software developed by the UW"; - license = lib.licenses.asl20; - platforms = with lib.platforms; linux; + license = licenses.asl20; + platforms = platforms.unix; }; passthru = { |