commit 598f83ebeb2235435189cf84d844b8b73e858e0f · pyrox.dev/nixpkgs

+7 -5
pkgs/tools/networking/libreswan/default.nix
···

       30
       30
        
       , docbook_xml_dtd_412

     

       31
       31
        
       , docbook_xsl

     

       32
       32
        
       , findXMLCatalogs

     

       33
       33
       +
       , dns-root-data

     

       33
       34
        
       }:

     

       34
       35
        
       

     

       35
       36
        
       let

     
···

       43
       44
        
       

     

       44
       45
        
       stdenv.mkDerivation rec {

     

       45
       46
        
         pname = "libreswan";

     

       46
       46
       -
         version = "4.7";

     

       47
       47
       +
         version = "4.8";

     

       47
       48
        
       

     

       48
       49
        
         src = fetchurl {

     

       49
       50
        
           url = "https://download.libreswan.org/${pname}-${version}.tar.gz";

     

       50
       50
       -
           sha256 = "0i7wyfgkaq6kcfhh1yshb1v7q42n3zvdkhq10f3ks1h075xk7mnx";

     

       51
       51
       +
           sha256 = "sha256-gEy5EX1/tBGYE7FVrJF+NFZY41ehOBim9t/Oikch4gs=";

     

       51
       52
        
         };

     

       52
       53
        
       

     

       53
       54
        
         strictDeps = true;

     
···

       77
       78
        
               -e 's|/bin/bash|${runtimeShell}|g' \

     

       78
       79
        
               -i initsystems/systemd/ipsec.service.in \

     

       79
       80
        
                  programs/barf/barf.in \

     

       80
       80
       -
                  programs/verify/verify.in

     

       81
       81
       +
                  programs/verify.linux/verify.in

     

       81
       82
        
           sed -e 's|\([[:blank:]]\)\(ip6\?tables\(-save\)\? -\)|\1${iptables}/bin/\2|' \

     

       82
       82
       -
               -i programs/verify/verify.in

     

       83
       83
       +
               -i programs/verify.linux/verify.in

     

       83
       84
        
       

     

       84
       85
        
           # Prevent the makefile from trying to

     

       85
       86
        
           # reload the systemd daemon or create tmpfiles

     
···

       92
       93
        
       

     

       93
       94
        
           # Fix python script to use the correct python

     

       94
       95
        
           sed -e 's/^\(\W*\)installstartcheck()/\1sscmd = "ss"\n\0/' \

     

       95
       95
       -
               -i programs/verify/verify.in

     

       96
       96
       +
               -i programs/verify.linux/verify.in

     

       96
       97
        
       

     

       97
       98
        
           # Replace wget with curl to save a dependency

     

       98
       99
        
           curlArgs='-s --remote-name-all --output-dir'

     
···

       113
       114
        
           "UNITDIR=$(out)/etc/systemd/system/"

     

       114
       115
        
           "TMPFILESDIR=$(out)/lib/tmpfiles.d/"

     

       115
       116
        
           "LINUX_VARIANT=nixos"

     

       117
       117
       +
           "DEFAULT_DNSSEC_ROOTKEY_FILE=${dns-root-data}/root.key"

     

       116
       118
        
         ];

     

       117
       119
        
       

     

       118
       120
        
         # Hack to make install work