commit d56bce1f04ef025729b332857d8c92e058b4be25 · pyrox.dev/nixpkgs

+5 -3

pkgs/by-name/bm/bmake/package.nix

···

       11
       11
        
       

     

       12
       12
        
       stdenv.mkDerivation (finalAttrs: {

     

       13
       13
        
         pname = "bmake";

     

       14
       14
       -
         version = "20240722";

     

       14
       14
       +
         version = "20240808";

     

       15
       15
        
       

     

       16
       16
        
         src = fetchurl {

     

       17
       17
        
           url = "https://www.crufty.net/ftp/pub/sjg/bmake-${finalAttrs.version}.tar.gz";

     

       18
       18
       -
           hash = "sha256-FlS9DK0oQ2CElmmh6amTGB/tE3iWqsJpS4LqmjX3CeQ=";

     

       18
       18
       +
           hash = "sha256-tZGJJRtIPezUSS8fdDh7KlhMA9WqRjfNSLOOxiucCEg=";

     

       19
       19
        
         };

     

       20
       20
        
       

     

       21
       21
        
         patches = [

     
···

       29
       29
        
       

     

       30
       30
        
         outputs = [ "out" "man" ];

     

       31
       31
        
       

     

       32
       32
       -
         nativeBuildInputs = [ getopt ];

     

       32
       32
       +
         nativeBuildInputs = [

     

       33
       33
       +
           getopt

     

       34
       34
       +
         ];

     

       33
       35
        
       

     

       34
       36
        
         nativeCheckInputs = [

     

       35
       37
        
           bc

+9 -5

pkgs/by-name/bm/bmake/setup-hook.sh

···

       17
       17
        
           )

     

       18
       18
        
           concatTo flagsArray makeFlags makeFlagsArray buildFlags buildFlagsArray

     

       19
       19
        
       

     

       20
       20
       -
           echoCmd 'build flags' "${flagsArray[@]}"

     

       20
       20
       +
           nixInfoLog "${FUNCNAME[0]}: flagsArray: ${flagsArray[@]}"

     

       21
       21
        
           bmake ${makefile:+-f $makefile} "${flagsArray[@]}"

     

       22
       22
        
       

     

       23
       23
        
           runHook postBuild

     
···

       36
       36
        
           fi

     

       37
       37
        
       

     

       38
       38
        
           if [ -z "${checkTarget:-}" ]; then

     

       39
       39
       -
               echo "no test target found in bmake, doing nothing"

     

       39
       39
       +
               nixInfoLog "${FUNCNAME[0]}: no test target found in bmake, doing nothing"

     

       40
       40
        
           else

     

       41
       41
        
               local flagsArray=(

     

       42
       42
        
                   ${enableParallelChecking:+-j${NIX_BUILD_CORES}}

     
···

       44
       44
        
               )

     

       45
       45
        
               concatTo flagsArray makeFlags makeFlagsArray checkFlags=VERBOSE=y checkFlagsArray checkTarget

     

       46
       46
        
       

     

       47
       47
       -
               echoCmd 'check flags' "${flagsArray[@]}"

     

       47
       47
       +
               nixInfoLog "${FUNCNAME[0]}: flagsArray: ${flagsArray[@]}"

     

       48
       48
        
               bmake ${makefile:+-f $makefile} "${flagsArray[@]}"

     

       49
       49
        
           fi

     

       50
       50
        
       

     
···

       64
       64
        
           )

     

       65
       65
        
           concatTo flagsArray makeFlags makeFlagsArray installFlags installFlagsArray installTargets=install

     

       66
       66
        
       

     

       67
       67
       -
           echoCmd 'install flags' "${flagsArray[@]}"

     

       67
       67
       +
           nixInfoLog "${FUNCNAME[0]}: flagsArray: ${flagsArray[@]}"

     

       68
       68
        
           bmake ${makefile:+-f $makefile} "${flagsArray[@]}"

     

       69
       69
        
       

     

       70
       70
        
           runHook postInstall

     
···

       80
       80
        
           local flagsArray=()

     

       81
       81
        
           concatTo flagsArray distFlags distFlagsArray distTarget=dist

     

       82
       82
        
       

     

       83
       83
       -
           echo 'dist flags: %q' "${flagsArray[@]}"

     

       83
       83
       +
           nixInfoLog "${FUNCNAME[0]}: flagsArray: ${flagsArray[@]}"

     

       84
       84
        
           bmake ${makefile:+-f $makefile} "${flagsArray[@]}"

     

       85
       85
        
       

     

       86
       86
        
           if [ "${dontCopyDist:-0}" != 1 ]; then

     
···

       98
       98
        
       

     

       99
       99
        
       if [ -z "${dontUseBmakeBuild-}" ] && [ -z "${buildPhase-}" ]; then

     

       100
       100
        
           buildPhase=bmakeBuildPhase

     

       101
       101
       +
           nixInfoLog "${FUNCNAME[0]}: set buildPhase to bmakeBuildPhase"

     

       101
       102
        
       fi

     

       102
       103
        
       

     

       103
       104
        
       if [ -z "${dontUseBmakeCheck-}" ] && [ -z "${checkPhase-}" ]; then

     

       104
       105
        
           checkPhase=bmakeCheckPhase

     

       106
       106
       +
           nixInfoLog "${FUNCNAME[0]}: set checkPhase to bmakeCheckPhase"

     

       105
       107
        
       fi

     

       106
       108
        
       

     

       107
       109
        
       if [ -z "${dontUseBmakeInstall-}" ] && [ -z "${installPhase-}" ]; then

     

       108
       110
        
           installPhase=bmakeInstallPhase

     

       111
       111
       +
           nixInfoLog "${FUNCNAME[0]}: set installPhase to bmakeInstallPhase"

     

       109
       112
        
       fi

     

       110
       113
        
       

     

       111
       114
        
       if [ -z "${dontUseBmakeDist-}" ] && [ -z "${distPhase-}" ]; then

     

       112
       115
        
           distPhase=bmakeDistPhase

     

       116
       116
       +
           nixInfoLog "${FUNCNAME[0]}: set distPhase to bmakeDistPhase"

     

       113
       117
        
       fi

+107

pkgs/by-name/bo/bozohttpd/package.nix

···

       1
       1
       +
       {

     

       2
       2
       +
         lib,

     

       3
       3
       +
         bmake,

     

       4
       4
       +
         fetchurl,

     

       5
       5
       +
         groff,

     

       6
       6
       +
         inetutils,

     

       7
       7
       +
         libxcrypt,

     

       8
       8
       +
         lua,

     

       9
       9
       +
         openssl,

     

       10
       10
       +
         stdenv,

     

       11
       11
       +
         wget,

     

       12
       12
       +
         # Boolean flags

     

       13
       13
       +
         minimal ? false,

     

       14
       14
       +
         userSupport ? !minimal,

     

       15
       15
       +
         cgiSupport ? !minimal,

     

       16
       16
       +
         dirIndexSupport ? !minimal,

     

       17
       17
       +
         dynamicContentSupport ? !minimal,

     

       18
       18
       +
         sslSupport ? !minimal,

     

       19
       19
       +
         luaSupport ? !minimal,

     

       20
       20
       +
         htpasswdSupport ? !minimal,

     

       21
       21
       +
       }:

     

       22
       22
       +
       

     

       23
       23
       +
       stdenv.mkDerivation (finalAttrs: {

     

       24
       24
       +
         pname = "bozohttpd";

     

       25
       25
       +
         version = "20240126";

     

       26
       26
       +
       

     

       27
       27
       +
         # bozohttpd is developed in-tree in pkgsrc, canonical hashes can be found at:

     

       28
       28
       +
         # http://cvsweb.netbsd.org/bsdweb.cgi/pkgsrc/www/bozohttpd/distinfo

     

       29
       29
       +
         src = fetchurl {

     

       30
       30
       +
           url = "http://eterna23.net/bozohttpd/bozohttpd-${finalAttrs.version}.tar.bz2";

     

       31
       31
       +
           hash = "sha512-fr1PnyYAS3wkpmj/npRC3A87UL9LIXw4thlM4GfrtlJbuX5EkWGVJnHJW/EmYp7z+N91dcdRJgdO79l6WJsKpg==";

     

       32
       32
       +
         };

     

       33
       33
       +
       

     

       34
       34
       +
         buildInputs = [

     

       35
       35
       +
           libxcrypt

     

       36
       36
       +
           openssl

     

       37
       37
       +
         ] ++ lib.optionals (luaSupport) [ lua ];

     

       38
       38
       +
       

     

       39
       39
       +
         nativeBuildInputs = [

     

       40
       40
       +
           bmake

     

       41
       41
       +
           groff

     

       42
       42
       +
         ];

     

       43
       43
       +
       

     

       44
       44
       +
         nativeCheckInputs = [

     

       45
       45
       +
           inetutils

     

       46
       46
       +
           wget

     

       47
       47
       +
         ];

     

       48
       48
       +
       

     

       49
       49
       +
         env = {

     

       50
       50
       +
           COPTS = lib.concatStringsSep " " (

     

       51
       51
       +
             [

     

       52
       52
       +
               "-D_DEFAULT_SOURCE"

     

       53
       53
       +
               "-D_GNU_SOURCE"

     

       54
       54
       +
       

     

       55
       55
       +
               # ensure that we can serve >2GB files even on 32-bit systems.

     

       56
       56
       +
               "-D_LARGEFILE_SOURCE"

     

       57
       57
       +
               "-D_FILE_OFFSET_BITS=64"

     

       58
       58
       +
       

     

       59
       59
       +
               # unpackaged dependency: https://man.netbsd.org/blocklist.3

     

       60
       60
       +
               "-DNO_BLOCKLIST_SUPPORT"

     

       61
       61
       +
             ]

     

       62
       62
       +
             ++ lib.optionals (htpasswdSupport) [ "-DDO_HTPASSWD" ]

     

       63
       63
       +
             ++ lib.optionals (!cgiSupport) [ "-DNO_CGIBIN_SUPPORT" ]

     

       64
       64
       +
             ++ lib.optionals (!dirIndexSupport) [ "-DNO_DIRINDEX_SUPPORT" ]

     

       65
       65
       +
             ++ lib.optionals (!dynamicContentSupport) [ "-DNO_DYNAMIC_CONTENT" ]

     

       66
       66
       +
             ++ lib.optionals (!luaSupport) [ "-DNO_LUA_SUPPORT" ]

     

       67
       67
       +
             ++ lib.optionals (!sslSupport) [ "-DNO_SSL_SUPPORT" ]

     

       68
       68
       +
             ++ lib.optionals (!userSupport) [ "-DNO_USER_SUPPORT" ]

     

       69
       69
       +
           );

     

       70
       70
       +
       

     

       71
       71
       +
           _LDADD = lib.concatStringsSep " " (

     

       72
       72
       +
             [ "-lm" ]

     

       73
       73
       +
             ++ lib.optionals (stdenv.hostPlatform.libc != "libSystem") [ "-lcrypt" ]

     

       74
       74
       +
             ++ lib.optionals (luaSupport) [ "-llua" ]

     

       75
       75
       +
             ++ lib.optionals (sslSupport) [

     

       76
       76
       +
               "-lcrypto"

     

       77
       77
       +
               "-lssl"

     

       78
       78
       +
             ]

     

       79
       79
       +
           );

     

       80
       80
       +
         };

     

       81
       81
       +
       

     

       82
       82
       +
         makeFlags = [ "LDADD=$(_LDADD)" ];

     

       83
       83
       +
       

     

       84
       84
       +
         checkFlags = lib.optionals (!cgiSupport) [ "CGITESTS=" ];

     

       85
       85
       +
       

     

       86
       86
       +
         doCheck = true;

     

       87
       87
       +
       

     

       88
       88
       +
         meta = {

     

       89
       89
       +
           homepage = "http://www.eterna23.net/bozohttpd/";

     

       90
       90
       +
           description = "Bozotic HTTP server; small and secure";

     

       91
       91
       +
           longDescription = ''

     

       92
       92
       +
             bozohttpd is a small and secure HTTP version 1.1 server. Its main

     

       93
       93
       +
             feature is the lack of features, reducing the code size and improving

     

       94
       94
       +
             verifiability.

     

       95
       95
       +
       

     

       96
       96
       +
             It supports CGI/1.1, HTTP/1.1, HTTP/1.0, HTTP/0.9, ~user translations,

     

       97
       97
       +
             virtual hosting support, as well as multiple IP-based servers on a

     

       98
       98
       +
             single machine. It is capable of servicing pages via the IPv6 protocol.

     

       99
       99
       +
             It has SSL support. It has no configuration file by design.

     

       100
       100
       +
           '';

     

       101
       101
       +
           changelog = "http://www.eterna23.net/bozohttpd/CHANGES";

     

       102
       102
       +
           license = lib.licenses.bsd2;

     

       103
       103
       +
           mainProgram = "bozohttpd";

     

       104
       104
       +
           maintainers = [ lib.maintainers.embr ];

     

       105
       105
       +
           platforms = lib.platforms.all;

     

       106
       106
       +
         };

     

       107
       107
       +
       })

-84

pkgs/servers/http/bozohttpd/default.nix

···

       1
       1
       -
       { lib

     

       2
       2
       -
       , stdenv

     

       3
       3
       -
       , fetchurl

     

       4
       4
       -
       , bmake

     

       5
       5
       -
       , groff

     

       6
       6
       -
       , inetutils

     

       7
       7
       -
       , wget

     

       8
       8
       -
       , openssl

     

       9
       9
       -
       , libxcrypt

     

       10
       10
       -
       , minimal ? false

     

       11
       11
       -
       , userSupport ? !minimal

     

       12
       12
       -
       , cgiSupport ? !minimal

     

       13
       13
       -
       , dirIndexSupport ? !minimal

     

       14
       14
       -
       , dynamicContentSupport ? !minimal

     

       15
       15
       -
       , sslSupport ? !minimal

     

       16
       16
       -
       , luaSupport ? !minimal

     

       17
       17
       -
       , lua

     

       18
       18
       -
       , htpasswdSupport ? !minimal

     

       19
       19
       -
       }:

     

       20
       20
       -
       

     

       21
       21
       -
       let inherit (lib) optional optionals;

     

       22
       22
       -
       in

     

       23
       23
       -
       stdenv.mkDerivation rec {

     

       24
       24
       -
         pname = "bozohttpd";

     

       25
       25
       -
         version = "20240126";

     

       26
       26
       -
       

     

       27
       27
       -
         # bozohttpd is developed in-tree in pkgsrc, canonical hashes can be found at:

     

       28
       28
       -
         # http://cvsweb.netbsd.org/bsdweb.cgi/pkgsrc/www/bozohttpd/distinfo

     

       29
       29
       -
         src = fetchurl {

     

       30
       30
       -
           url = "http://eterna23.net/${pname}/${pname}-${version}.tar.bz2";

     

       31
       31
       -
           hash = "sha512-fr1PnyYAS3wkpmj/npRC3A87UL9LIXw4thlM4GfrtlJbuX5EkWGVJnHJW/EmYp7z+N91dcdRJgdO79l6WJsKpg==";

     

       32
       32
       -
         };

     

       33
       33
       -
       

     

       34
       34
       -
         buildInputs = [ openssl libxcrypt ] ++ optional (luaSupport) lua;

     

       35
       35
       -
         nativeBuildInputs = [ bmake groff ];

     

       36
       36
       -
       

     

       37
       37
       -
         COPTS = [

     

       38
       38
       -
           "-D_DEFAULT_SOURCE"

     

       39
       39
       -
           "-D_GNU_SOURCE"

     

       40
       40
       -
       

     

       41
       41
       -
           # ensure that we can serve >2GB files even on 32-bit systems.

     

       42
       42
       -
           "-D_LARGEFILE_SOURCE"

     

       43
       43
       -
           "-D_FILE_OFFSET_BITS=64"

     

       44
       44
       -
       

     

       45
       45
       -
           # unpackaged dependency: https://man.netbsd.org/blocklist.3

     

       46
       46
       -
           "-DNO_BLOCKLIST_SUPPORT"

     

       47
       47
       -
         ]

     

       48
       48
       -
         ++ optional (!userSupport) "-DNO_USER_SUPPORT"

     

       49
       49
       -
         ++ optional (!dirIndexSupport) "-DNO_DIRINDEX_SUPPORT"

     

       50
       50
       -
         ++ optional (!dynamicContentSupport) "-DNO_DYNAMIC_CONTENT"

     

       51
       51
       -
         ++ optional (!luaSupport) "-DNO_LUA_SUPPORT"

     

       52
       52
       -
         ++ optional (!sslSupport) "-DNO_SSL_SUPPORT"

     

       53
       53
       -
         ++ optional (!cgiSupport) "-DNO_CGIBIN_SUPPORT"

     

       54
       54
       -
         ++ optional (htpasswdSupport) "-DDO_HTPASSWD";

     

       55
       55
       -
       

     

       56
       56
       -
         _LDADD = [ "-lm" ]

     

       57
       57
       -
           ++ optional (stdenv.hostPlatform.libc != "libSystem") "-lcrypt"

     

       58
       58
       -
           ++ optional (luaSupport) "-llua"

     

       59
       59
       -
           ++ optionals (sslSupport) [ "-lssl" "-lcrypto" ];

     

       60
       60
       -
         makeFlags = [ "LDADD=$(_LDADD)" ];

     

       61
       61
       -
       

     

       62
       62
       -
         doCheck = true;

     

       63
       63
       -
         nativeCheckInputs = [ inetutils wget ];

     

       64
       64
       -
         checkFlags = optional (!cgiSupport) "CGITESTS=";

     

       65
       65
       -
       

     

       66
       66
       -
         meta = with lib; {

     

       67
       67
       -
           description = "Bozotic HTTP server; small and secure";

     

       68
       68
       -
           longDescription = ''

     

       69
       69
       -
             bozohttpd is a small and secure HTTP version 1.1 server. Its main

     

       70
       70
       -
             feature is the lack of features, reducing the code size and improving

     

       71
       71
       -
             verifiability.

     

       72
       72
       -
       

     

       73
       73
       -
             It supports CGI/1.1, HTTP/1.1, HTTP/1.0, HTTP/0.9, ~user translations,

     

       74
       74
       -
             virtual hosting support, as well as multiple IP-based servers on a

     

       75
       75
       -
             single machine. It is capable of servicing pages via the IPv6 protocol.

     

       76
       76
       -
             It has SSL support. It has no configuration file by design.

     

       77
       77
       -
           '';

     

       78
       78
       -
           homepage = "http://www.eterna.com.au/bozohttpd/";

     

       79
       79
       -
           changelog = "http://www.eterna.com.au/bozohttpd/CHANGES";

     

       80
       80
       -
           license = licenses.bsd2;

     

       81
       81
       -
           maintainers = [ maintainers.embr ];

     

       82
       82
       -
           platforms = platforms.all;

     

       83
       83
       -
         };

     

       84
       84
       -
       }

+1 -2

pkgs/top-level/all-packages.nix

···

       4226
       4226
        
       

     

       4227
       4227
        
         boxfs = callPackage ../tools/filesystems/boxfs { };

     

       4228
       4228
        
       

     

       4229
       4229
       -
         bozohttpd = callPackage ../servers/http/bozohttpd { };

     

       4230
       4230
       -
         bozohttpd-minimal = callPackage ../servers/http/bozohttpd { minimal = true; };

     

       4229
       4229
       +
         bozohttpd-minimal = bozohttpd.override { minimal = true; };

     

       4231
       4230
        
       

     

       4232
       4231
        
         brasero-original = lowPrio (callPackage ../tools/cd-dvd/brasero { });

     

       4233
       4232