commit 4a511911bbb04d15d704dfe8c3811c40c8421289 · pyrox.dev/nixpkgs

+2 -2

nixos/modules/misc/ids.nix

···

       136
       136
        
             kippo = 108;

     

       137
       137
        
             jenkins = 109;

     

       138
       138
        
             systemd-journal-gateway = 110;

     

       139
       139
       -
             notbit = 111;

     

       139
       139
       +
             #notbit = 111; # unused

     

       140
       140
        
             ngircd = 112;

     

       141
       141
        
             btsync = 113;

     

       142
       142
        
             minecraft = 114;

     
···

       356
       356
        
             kippo = 108;

     

       357
       357
        
             jenkins = 109;

     

       358
       358
        
             systemd-journal-gateway = 110;

     

       359
       359
       -
             notbit = 111;

     

       359
       359
       +
             #notbit = 111; # unused

     

       360
       360
        
             #ngircd = 112; # unused

     

       361
       361
        
             btsync = 113;

     

       362
       362
        
             #minecraft = 114; # unused

-1

nixos/modules/module-list.nix

···

       322
       322
        
         ./services/networking/networkmanager.nix

     

       323
       323
        
         ./services/networking/ngircd.nix

     

       324
       324
        
         ./services/networking/nix-serve.nix

     

       325
       325
       -
         ./services/networking/notbit.nix

     

       326
       325
        
         ./services/networking/nsd.nix

     

       327
       326
        
         ./services/networking/ntopng.nix

     

       328
       327
        
         ./services/networking/ntpd.nix

-130

nixos/modules/services/networking/notbit.nix

···

       1
       1
       -
       { config, lib, pkgs, ... }:

     

       2
       2
       -
       

     

       3
       3
       -
       with lib;

     

       4
       4
       -
       let

     

       5
       5
       -
         cfg = config.services.notbit;

     

       6
       6
       -
         varDir = "/var/lib/notbit";

     

       7
       7
       -
         

     

       8
       8
       -
         sendmail = pkgs.stdenv.mkDerivation {

     

       9
       9
       -
           name = "notbit-wrapper";

     

       10
       10
       -
           buildInputs = [ pkgs.makeWrapper ];

     

       11
       11
       -
           propagatedBuildInputs = [ pkgs.notbit ];

     

       12
       12
       -
           buildCommand = ''

     

       13
       13
       -
             mkdir -p $out/bin

     

       14
       14
       -
             makeWrapper ${pkgs.notbit}/bin/notbit-sendmail $out/bin/notbit-system-sendmail \

     

       15
       15
       -
               --set XDG_RUNTIME_DIR ${varDir}

     

       16
       16
       -
           '';

     

       17
       17
       -
         };

     

       18
       18
       -
         opts = "${optionalString cfg.allowPrivateAddresses "-L"} ${optionalString cfg.noBootstrap "-b"} ${optionalString cfg.specifiedPeersOnly "-e"}";

     

       19
       19
       -
         peers = concatStringsSep " " (map (str: "-P \"${str}\"") cfg.peers);

     

       20
       20
       -
         listen = if cfg.listenAddress == [] then "-p ${toString cfg.port}" else

     

       21
       21
       -
           concatStringsSep " " (map (addr: "-a \"${addr}:${toString cfg.port}\"") cfg.listenAddress);

     

       22
       22
       -
       in

     

       23
       23
       -
       

     

       24
       24
       -
       with lib;

     

       25
       25
       -
       {

     

       26
       26
       -
       

     

       27
       27
       -
         ### configuration

     

       28
       28
       -
       

     

       29
       29
       -
         options = {

     

       30
       30
       -
       

     

       31
       31
       -
           services.notbit = {

     

       32
       32
       -
       

     

       33
       33
       -
             enable = mkOption {

     

       34
       34
       -
               type = types.bool;

     

       35
       35
       -
               default = false;

     

       36
       36
       -
               description = ''

     

       37
       37
       -
                 Enables the notbit daemon and provides a sendmail binary named `notbit-system-sendmail` for sending mail over the system instance of notbit. Users must be in the notbit group in order to send mail over the system notbit instance. Currently mail recipt is not supported.

     

       38
       38
       -
               '';

     

       39
       39
       -
             };

     

       40
       40
       -
       

     

       41
       41
       -
             port = mkOption {

     

       42
       42
       -
               type = types.int;

     

       43
       43
       -
               default = 8444;

     

       44
       44
       -
               description = "The port which the daemon listens for other bitmessage clients";

     

       45
       45
       -
             };

     

       46
       46
       -
       

     

       47
       47
       -
             nice = mkOption {

     

       48
       48
       -
               type = types.int;

     

       49
       49
       -
               default = 10;

     

       50
       50
       -
               description = "Set the nice level for the notbit daemon";

     

       51
       51
       -
             };

     

       52
       52
       -
       

     

       53
       53
       -
             listenAddress = mkOption {

     

       54
       54
       -
               type = types.listOf types.str;

     

       55
       55
       -
               default = [ ];

     

       56
       56
       -
               example = [ "localhost" "myhostname" ];

     

       57
       57
       -
               description = "The addresses which notbit will use to listen for incoming connections. These addresses are advertised to connecting clients.";

     

       58
       58
       -
             };

     

       59
       59
       -
       

     

       60
       60
       -
             peers = mkOption {

     

       61
       61
       -
               type = types.listOf types.str;

     

       62
       62
       -
               default = [ ];

     

       63
       63
       -
               example = [ "bitmessage.org:8877" ];

     

       64
       64
       -
               description = "The initial set of peers notbit will connect to.";

     

       65
       65
       -
             };

     

       66
       66
       -
       

     

       67
       67
       -
             specifiedPeersOnly = mkOption {

     

       68
       68
       -
               type = types.bool;

     

       69
       69
       -
               default = false;

     

       70
       70
       -
               description = "If true, notbit will only connect to peers specified by the peers option.";

     

       71
       71
       -
             };

     

       72
       72
       -
       

     

       73
       73
       -
             allowPrivateAddresses = mkOption {

     

       74
       74
       -
               type = types.bool;

     

       75
       75
       -
               default = false;

     

       76
       76
       -
               description = "If true, notbit will allow connections to to RFC 1918 addresses.";

     

       77
       77
       -
             };

     

       78
       78
       -
       

     

       79
       79
       -
             noBootstrap = mkOption {

     

       80
       80
       -
               type = types.bool;

     

       81
       81
       -
               default = false;

     

       82
       82
       -
               description = "If true, notbit will not bootstrap an initial peerlist from bitmessage.org servers";

     

       83
       83
       -
             };

     

       84
       84
       -
       

     

       85
       85
       -
           };

     

       86
       86
       -
       

     

       87
       87
       -
         };

     

       88
       88
       -
       

     

       89
       89
       -
         ### implementation

     

       90
       90
       -
       

     

       91
       91
       -
         config = mkIf cfg.enable {

     

       92
       92
       -
       

     

       93
       93
       -
           environment.systemPackages = [ sendmail ];

     

       94
       94
       -
       

     

       95
       95
       -
           systemd.services.notbit = {

     

       96
       96
       -
             description = "Notbit daemon";

     

       97
       97
       -
             after = [ "network.target" ];

     

       98
       98
       -
             wantedBy = [ "multi-user.target" ];

     

       99
       99
       -
             path = [ pkgs.notbit ];

     

       100
       100
       -
             environment = { XDG_RUNTIME_DIR = varDir; };

     

       101
       101
       -
       

     

       102
       102
       -
             postStart = ''

     

       103
       103
       -
               [ ! -f "${varDir}/addr" ] && notbit-keygen > ${varDir}/addr

     

       104
       104
       -
               chmod 0640 ${varDir}/{addr,notbit/notbit-ipc.lock}

     

       105
       105
       -
               chmod 0750 ${varDir}/notbit/{,notbit-ipc}

     

       106
       106
       -
             '';

     

       107
       107
       -
       

     

       108
       108
       -
             serviceConfig = {

     

       109
       109
       -
               Type = "forking";

     

       110
       110
       -
               ExecStart = "${pkgs.notbit}/bin/notbit -d ${listen} ${peers} ${opts}";

     

       111
       111
       -
               User = "notbit";

     

       112
       112
       -
               Group = "notbit";

     

       113
       113
       -
               UMask = "0077";

     

       114
       114
       -
               WorkingDirectory = varDir;

     

       115
       115
       -
               Nice = cfg.nice;

     

       116
       116
       -
             };

     

       117
       117
       -
           };

     

       118
       118
       -
       

     

       119
       119
       -
           users.extraUsers.notbit = {

     

       120
       120
       -
             group = "notbit";

     

       121
       121
       -
             description = "Notbit daemon user";

     

       122
       122
       -
             home = varDir;

     

       123
       123
       -
             createHome = true;

     

       124
       124
       -
             uid = config.ids.uids.notbit;

     

       125
       125
       -
           };

     

       126
       126
       -
       

     

       127
       127
       -
           users.extraGroups.notbit.gid = config.ids.gids.notbit;

     

       128
       128
       -
         };

     

       129
       129
       -
       

     

       130
       130
       -
       }

-24

pkgs/applications/networking/notbit/default.nix

···

       1
       1
       -
       { stdenv, fetchgit, autoconf, automake, pkgconfig, openssl }:

     

       2
       2
       -
       

     

       3
       3
       -
       stdenv.mkDerivation rec {

     

       4
       4
       -
         name = "notbit-git-6f1ca59";

     

       5
       5
       -
       

     

       6
       6
       -
         src = fetchgit {

     

       7
       7
       -
           url = "git://github.com/bpeel/notbit";

     

       8
       8
       -
           rev = "6f1ca5987c7f217c9c3dd27adf6ac995004c29a1";

     

       9
       9
       -
           sha256 = "0h9nzm248pw9wrdsfkr580ghiqvh6mk6vx7r2r752awrc13wvgis";

     

       10
       10
       -
         };

     

       11
       11
       -
       

     

       12
       12
       -
         buildInputs = [ autoconf automake pkgconfig openssl ];

     

       13
       13
       -
       

     

       14
       14
       -
         preConfigure = "autoreconf -vfi";

     

       15
       15
       -
       

     

       16
       16
       -
         meta = with stdenv.lib; { 

     

       17
       17
       -
           homepage = http://busydoingnothing.co.uk/notbit/;

     

       18
       18
       -
           description = "A minimal bitmessage client";

     

       19
       19
       -
           license = licenses.mit;

     

       20
       20
       -
       

     

       21
       21
       -
           # This is planned to change when the project officially supports other platforms

     

       22
       22
       -
           platforms = platforms.linux;

     

       23
       23
       -
         };

     

       24
       24
       -
       }

-2

pkgs/top-level/all-packages.nix

···

       2463
       2463
        
           graphicalSupport = true;

     

       2464
       2464
        
         };

     

       2465
       2465
        
       

     

       2466
       2466
       -
         notbit = callPackage ../applications/networking/notbit { };

     

       2467
       2467
       -
       

     

       2468
       2466
        
         notify-osd = callPackage ../applications/misc/notify-osd { };

     

       2469
       2467
        
       

     

       2470
       2468
        
         nox = callPackage ../tools/package-management/nox {