commit c876db629d2c05acb8adcf80feabc6d8758842f5 · pyrox.dev/nixpkgs

+18 -37

pkgs/development/libraries/mbedtls/default.nix

···

       1
       1
       -
       { stdenv, fetchFromGitHub, perl }:

     

       1
       1
       +
       { stdenv

     

       2
       2
       +
       , fetchFromGitHub

     

       3
       3
       +
       

     

       4
       4
       +
       , cmake

     

       5
       5
       +
       , ninja

     

       6
       6
       +
       , perl # Project uses Perl for scripting and testing

     

       7
       7
       +
       

     

       8
       8
       +
       , enableThreading ? true # Threading can be disabled to increase security https://tls.mbed.org/kb/development/thread-safety-and-multi-threading

     

       9
       9
       +
       }:

     

       2
       10
        
       

     

       3
       11
        
       stdenv.mkDerivation rec {

     

       4
       4
       -
         name = "mbedtls-2.11.0";

     

       12
       12
       +
         name = "mbedtls-${version}";

     

       13
       13
       +
         version = "2.11.0";

     

       5
       14
        
       

     

       6
       15
        
         src = fetchFromGitHub {

     

       7
       16
        
           owner = "ARMmbed";

     
···

       10
       19
        
           sha256 = "1d4a0jc08q3h051amv8hhh3hmqp4f1rk5z7ffyfs2g8dassm78ir";

     

       11
       20
        
         };

     

       12
       21
        
       

     

       13
       13
       -
         nativeBuildInputs = [ perl ];

     

       22
       22
       +
         nativeBuildInputs = [ cmake ninja perl ];

     

       14
       23
        
       

     

       15
       15
       -
         postPatch = ''

     

       16
       16
       -
           patchShebangs .

     

       17
       17
       -
         '' + stdenv.lib.optionalString stdenv.isDarwin ''

     

       18
       18
       -
           substituteInPlace library/Makefile --replace "-soname" "-install_name"

     

       19
       19
       -
           substituteInPlace tests/scripts/run-test-suites.pl --replace "LD_LIBRARY_PATH" "DYLD_LIBRARY_PATH"

     

       20
       20
       -
           # Necessary for install_name_tool below

     

       21
       21
       -
           echo "LOCAL_LDFLAGS += -headerpad_max_install_names" >> programs/Makefile

     

       24
       24
       +
         postConfigure = stdenv.lib.optionals enableThreading ''

     

       25
       25
       +
           perl scripts/config.pl set MBEDTLS_THREADING_C    # Threading abstraction layer

     

       26
       26
       +
           perl scripts/config.pl set MBEDTLS_THREADING_PTHREAD    # POSIX thread wrapper layer for the threading layer.

     

       22
       27
        
         '';

     

       23
       28
        
       

     

       24
       24
       -
         makeFlags = [

     

       25
       25
       -
           "SHARED=1"

     

       26
       26
       -
         ] ++ stdenv.lib.optionals stdenv.isDarwin [

     

       27
       27
       -
           "DLEXT=dylib"

     

       28
       28
       -
         ];

     

       29
       29
       -
       

     

       30
       30
       -
         installFlags = [

     

       31
       31
       -
           "DESTDIR=\${out}"

     

       32
       32
       -
         ];

     

       33
       33
       -
       

     

       34
       34
       -
         postInstall = stdenv.lib.optionalString stdenv.isDarwin ''

     

       35
       35
       -
           install_name_tool -change libmbedcrypto.dylib $out/lib/libmbedcrypto.dylib $out/lib/libmbedtls.dylib

     

       36
       36
       -
           install_name_tool -change libmbedcrypto.dylib $out/lib/libmbedcrypto.dylib $out/lib/libmbedx509.dylib

     

       37
       37
       -
           install_name_tool -change libmbedx509.dylib $out/lib/libmbedx509.dylib $out/lib/libmbedtls.dylib

     

       38
       38
       -
       

     

       39
       39
       -
           for exe in $out/bin/*; do

     

       40
       40
       -
             if [[ $exe != *.sh ]]; then

     

       41
       41
       -
               install_name_tool -change libmbedtls.dylib $out/lib/libmbedtls.dylib $exe

     

       42
       42
       -
               install_name_tool -change libmbedx509.dylib $out/lib/libmbedx509.dylib $exe

     

       43
       43
       -
               install_name_tool -change libmbedcrypto.dylib $out/lib/libmbedcrypto.dylib $exe

     

       44
       44
       -
             fi

     

       45
       45
       -
           done

     

       46
       46
       -
         '';

     

       47
       47
       -
       

     

       48
       48
       -
         doCheck = true;

     

       29
       29
       +
         cmakeFlags = [ "-DUSE_SHARED_MBEDTLS_LIBRARY=on" ];

     

       49
       30
        
       

     

       50
       31
        
         meta = with stdenv.lib; {

     

       51
       32
        
           homepage = https://tls.mbed.org/;

     

       52
       52
       -
           description = "Portable cryptographic and SSL/TLS library, aka polarssl";

     

       53
       53
       -
           license = licenses.gpl3;

     

       33
       33
       +
           description = "Portable cryptographic and TLS library, formerly known as PolarSSL";

     

       34
       34
       +
           license = licenses.asl20;

     

       54
       35
        
           platforms = platforms.all;

     

       55
       36
        
           maintainers = with maintainers; [ wkennington fpletz ];

     

       56
       37
        
         };

+21 -20

pkgs/servers/http/hiawatha/default.nix

···

       3
       3
        
       

     

       4
       4
        
       , cmake

     

       5
       5
        
       , ninja

     

       6
       6
       +
       , mbedtls

     

       6
       7
        
       

     

       7
       7
       -
       , libxslt

     

       8
       8
       -
       , libxml2

     

       9
       9
       -
       

     

       10
       10
       -
       , enableSSL ? true

     

       11
       11
       -
       , enableMonitor ? false

     

       12
       12
       -
       , enableRproxy ? true

     

       13
       13
       -
       , enableTomahawk ? false

     

       14
       14
       -
       , enableXSLT ? true

     

       15
       15
       -
       , enableToolkit ? true

     

       8
       8
       +
       , enableCache     ? true     # Internal cache support.

     

       9
       9
       +
       , enableIpV6      ? true

     

       10
       10
       +
       , enableTls       ? true

     

       11
       11
       +
       , enableMonitor   ? false    # Support for the Hiawatha Monitor.

     

       12
       12
       +
       , enableRproxy    ? true     # Reverse proxy support.

     

       13
       13
       +
       , enableTomahawk  ? false    # Tomahawk, the Hiawatha command shell.

     

       14
       14
       +
       , enableXslt      ? true, libxml2 ? null, libxslt ? null

     

       15
       15
       +
       , enableToolkit   ? true     # The URL Toolkit.

     

       16
       16
        
       }:

     

       17
       17
        
       

     

       18
       18
        
       stdenv.mkDerivation rec {

     
···

       27
       27
        
         };

     

       28
       28
        
       

     

       29
       29
        
         nativeBuildInputs = [ cmake ninja ];

     

       30
       30
       -
         buildInputs = [ libxslt libxml2 ];

     

       30
       30
       +
         buildInputs = [ mbedtls ] ++ stdenv.lib.optionals enableXslt [ libxslt libxml2 ];

     

       31
       31
        
       

     

       32
       32
        
         prePatch = ''

     

       33
       33
        
           substituteInPlace CMakeLists.txt --replace SETUID ""

     

       34
       34
        
         '';

     

       35
       35
        
       

     

       36
       36
        
         cmakeFlags = [

     

       37
       37
       -
           (

     

       38
       38
       -
             # FIXME: 2018-06-08: Uses bundled library, with external ("-DUSE_SYSTEM_MBEDTLS=on") asks:

     

       39
       39
       -
             # ../src/tls.c:46:2: error: #error "The mbed TLS library must be compiled with MBEDTLS_THREADING_PTHREAD and MBEDTLS_THREADING_C enabled."

     

       40
       40
       -
             if enableSSL then "-DENABLE_TLS=on" else "-DENABLE_TLS=off" )

     

       41
       41
       -
           ( if enableMonitor then "-DENABLE_MONITOR=on" else "-DENABLE_MONITOR=off" )

     

       42
       42
       -
           ( if enableRproxy then "-DENABLE_RPROXY=on" else "-DENABLE_RPROXY=off" )

     

       43
       43
       -
           ( if enableTomahawk then "-DENABLE_TOMAHAWK=on" else "-DENABLE_TOMAHAWK=off" )

     

       44
       44
       -
           ( if enableXSLT then "-DENABLE_XSLT=on" else "-DENABLE_XSLT=off" )

     

       45
       45
       -
           ( if enableToolkit then "-DENABLE_TOOLKIT=on" else "-DENABLE_TOOLKIT=off" )

     

       37
       37
       +
           "-DUSE_SYSTEM_MBEDTLS=on" # Policy to use Nix deps, and Nix uses up to date deps

     

       38
       38
       +
           ( if enableCache     then "-DENABLE_CACHE=on"       else "-DENABLE_CACHE=off"       )

     

       39
       39
       +
           ( if enableIpV6      then "-DENABLE_IPV6=on"        else "-DENABLE_IPV6=off"        )

     

       40
       40
       +
           ( if enableTls       then "-DENABLE_TLS=on"         else "-DENABLE_TLS=off"         )

     

       41
       41
       +
           ( if enableMonitor   then "-DENABLE_MONITOR=on"     else "-DENABLE_MONITOR=off"     )

     

       42
       42
       +
           ( if enableRproxy    then "-DENABLE_RPROXY=on"      else "-DENABLE_RPROXY=off"      )

     

       43
       43
       +
           ( if enableTomahawk  then "-DENABLE_TOMAHAWK=on"    else "-DENABLE_TOMAHAWK=off"    )

     

       44
       44
       +
           ( if enableXslt      then "-DENABLE_XSLT=on"        else "-DENABLE_XSLT=off"        )

     

       45
       45
       +
           ( if enableToolkit   then "-DENABLE_TOOLKIT=on"     else "-DENABLE_TOOLKIT=off"     )

     

       46
       46
        
         ];

     

       47
       47
        
       

     

       48
       48
        
         meta = with stdenv.lib; {

     

       49
       49
       +
           homepage = https://www.hiawatha-webserver.org;

     

       49
       50
        
           description = "An advanced and secure webserver";

     

       50
       51
        
           license = licenses.gpl2;

     

       51
       51
       -
           homepage = https://www.hiawatha-webserver.org;

     

       52
       52
       +
           platforms = platforms.unix;    # "Hiawatha runs perfectly on Linux, BSD and MacOS X"

     

       52
       53
        
           maintainers = [ maintainers.ndowens ];

     

       53
       54
        
         };

     

       54
       55