From 41d97e57cf17a495592366d4c58cf6c93c7df63c Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 6 Aug 2023 12:34:33 +0000 Subject: [PATCH 1/2] stunnel: 5.69 -> 5.70 --- pkgs/tools/networking/stunnel/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/networking/stunnel/default.nix b/pkgs/tools/networking/stunnel/default.nix index 5240302c1f6c..61e6386445ed 100644 --- a/pkgs/tools/networking/stunnel/default.nix +++ b/pkgs/tools/networking/stunnel/default.nix @@ -6,13 +6,13 @@ stdenv.mkDerivation rec { pname = "stunnel"; - version = "5.69"; + version = "5.70"; outputs = [ "out" "doc" "man" ]; src = fetchurl { url = "https://www.stunnel.org/archive/${lib.versions.major version}.x/${pname}-${version}.tar.gz"; - sha256 = "sha256-H/fZ8wiEx1uYyKCk4VNPp5rcraIyJjXmeHM3tOOP24E="; + sha256 = "sha256-e7x7npqYjXYwEyXbTBEOw2Cpj/uKIhx6zL/5wKi64vM="; # please use the contents of "https://www.stunnel.org/downloads/stunnel-${version}.tar.gz.sha256", # not the output of `nix-prefetch-url` }; From 7d08c76d39558b41083fdf8e65941bfc943adf4f Mon Sep 17 00:00:00 2001 From: Pol Dellaiera Date: Sun, 6 Aug 2023 19:29:32 +0200 Subject: [PATCH 2/2] stunnel: use `finalAttrs` pattern --- pkgs/tools/networking/stunnel/default.nix | 24 +++++++++++++---------- 1 file changed, 14 insertions(+), 10 deletions(-) diff --git a/pkgs/tools/networking/stunnel/default.nix b/pkgs/tools/networking/stunnel/default.nix index 61e6386445ed..958c784c74a6 100644 --- a/pkgs/tools/networking/stunnel/default.nix +++ b/pkgs/tools/networking/stunnel/default.nix @@ -1,18 +1,22 @@ -{ lib, stdenv, fetchurl, openssl -, systemdSupport ? lib.meta.availableOn stdenv.hostPlatform systemd, systemd +{ + fetchurl +, lib , nixosTests +, openssl +, stdenv +, systemd +, systemdSupport ? lib.meta.availableOn stdenv.hostPlatform systemd }: - -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "stunnel"; version = "5.70"; outputs = [ "out" "doc" "man" ]; src = fetchurl { - url = "https://www.stunnel.org/archive/${lib.versions.major version}.x/${pname}-${version}.tar.gz"; - sha256 = "sha256-e7x7npqYjXYwEyXbTBEOw2Cpj/uKIhx6zL/5wKi64vM="; + url = "https://www.stunnel.org/archive/${lib.versions.major finalAttrs.version}.x/stunnel-${finalAttrs.version}.tar.gz"; + hash = "sha256-e7x7npqYjXYwEyXbTBEOw2Cpj/uKIhx6zL/5wKi64vM="; # please use the contents of "https://www.stunnel.org/downloads/stunnel-${version}.tar.gz.sha256", # not the output of `nix-prefetch-url` }; @@ -48,9 +52,9 @@ stdenv.mkDerivation rec { meta = { description = "Universal tls/ssl wrapper"; - homepage = "https://www.stunnel.org/"; - license = lib.licenses.gpl2Plus; - platforms = lib.platforms.unix; + homepage = "https://www.stunnel.org/"; + license = lib.licenses.gpl2Plus; maintainers = [ lib.maintainers.thoughtpolice ]; + platforms = lib.platforms.unix; }; -} +})