From fc5bfd684498383bedaf8151c7103b34b2819b85 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Mon, 23 Aug 2021 23:08:21 +0200 Subject: [PATCH] unbound: unify unbound and pyunbound source and also update both at the same time --- pkgs/tools/networking/unbound/default.nix | 2 +- pkgs/tools/networking/unbound/python.nix | 9 ++------- 2 files changed, 3 insertions(+), 8 deletions(-) diff --git a/pkgs/tools/networking/unbound/default.nix b/pkgs/tools/networking/unbound/default.nix index 2e31fadba377..249376abbb06 100644 --- a/pkgs/tools/networking/unbound/default.nix +++ b/pkgs/tools/networking/unbound/default.nix @@ -29,7 +29,7 @@ stdenv.mkDerivation rec { version = "1.13.1"; src = fetchurl { - url = "https://unbound.net/downloads/${pname}-${version}.tar.gz"; + url = "https://nlnetlabs.nl/downloads/unbound/unbound-${version}.tar.gz"; sha256 = "sha256-hQTZe4/FvYlzRcldEW4O4N34yP+ZWQqytL0TJ4yfULg="; }; diff --git a/pkgs/tools/networking/unbound/python.nix b/pkgs/tools/networking/unbound/python.nix index 921254be2a7d..067f5d2b417b 100644 --- a/pkgs/tools/networking/unbound/python.nix +++ b/pkgs/tools/networking/unbound/python.nix @@ -1,16 +1,11 @@ -{ lib, stdenv, fetchurl, openssl, expat, libevent, swig, pythonPackages }: +{ lib, stdenv, unbound, openssl, expat, libevent, swig, pythonPackages }: let inherit (pythonPackages) python; in stdenv.mkDerivation rec { pname = "pyunbound"; - version = "1.13.2"; - - src = fetchurl { - url = "https://nlnetlabs.nl/downloads/unbound/unbound-${version}.tar.gz"; - sha256 = "sha256-ChO1R/O5KgJrXr0EI/VMmR5XGAN/2fckRYF/agQOGoM="; - }; + inherit (unbound) version src; nativeBuildInputs = [ swig ];