commit ebb42ada24c4641d6a2efc8d8fd7aa5baf96710a · pyrox.dev/nixpkgs

+6 -15
pkgs/tools/networking/unbound/default.nix
···

       47
       47
        
       , gnutls

     

       48
       48
        
       }:

     

       49
       49
        
       

     

       50
       50
       -
       stdenv.mkDerivation rec {

     

       50
       50
       +
       stdenv.mkDerivation (finalAttrs: {

     

       51
       51
        
         pname = "unbound";

     

       52
       52
       -
         version = "1.18.0";

     

       52
       52
       +
         version = "1.19.0";

     

       53
       53
        
       

     

       54
       54
        
         src = fetchurl {

     

       55
       55
       -
           url = "https://nlnetlabs.nl/downloads/unbound/unbound-${version}.tar.gz";

     

       56
       56
       -
           hash = "sha256-PalUkKhc/2Qg8m+uC4Skn1ES3xvxt/w0+HJPAggstxI=";

     

       55
       55
       +
           url = "https://nlnetlabs.nl/downloads/unbound/unbound-${finalAttrs.version}.tar.gz";

     

       56
       56
       +
           hash = "sha256-qXUyRohUxhwt5IykFw3oVP07yVyAQ7sM+w/iZgWWZiQ=";

     

       57
       57
        
         };

     

       58
       58
       -
       

     

       59
       59
       -
         patches = [

     

       60
       60
       -
           # Backport: fix libunbound with nettle.

     

       61
       61
       -
           (fetchpatch {

     

       62
       62
       -
             url = "https://github.com/NLnetLabs/unbound/commit/654a7eab62cbd1844d483cc4a0f2cf2fbcbaf00a.patch";

     

       63
       63
       -
             excludes = [ "doc/Changelog" ];

     

       64
       64
       -
             hash = "sha256-n3FCeZESFrrn6Wcf28Hb8WZs1eMHWjbsf2WCFOXU3lI=";

     

       65
       65
       -
           })

     

       66
       66
       -
         ];

     

       67
       58
        
       

     

       68
       59
        
         outputs = [ "out" "lib" "man" ]; # "dev" would only split ~20 kB

     

       69
       60
        
       

     
···

       157
       148
        
         + ''substituteInPlace "$lib/lib/libunbound.la" ''

     

       158
       149
        
         + lib.concatMapStrings

     

       159
       150
        
           (pkg: lib.optionalString (pkg ? dev) " --replace '-L${pkg.dev}/lib' '-L${pkg.out}/lib' --replace '-R${pkg.dev}/lib' '-R${pkg.out}/lib'")

     

       160
       160
       -
           (builtins.filter (p: p != null) buildInputs);

     

       151
       151
       +
           (builtins.filter (p: p != null) finalAttrs.buildInputs);

     

       161
       152
        
       

     

       162
       153
        
         passthru.tests = {

     

       163
       154
        
           inherit gnutls;

     
···

       172
       163
        
           maintainers = with maintainers; [ ajs124 ];

     

       173
       164
        
           platforms = platforms.unix;

     

       174
       165
        
         };

     

       175
       175
       -
       }

     

       166
       166
       +
       })