Merge branch 'rm-notbit' of git://github.com/jgillich/nixpkgs

nixos/modules/misc/ids.nix

@@ -136,7 +136,7 @@
       kippo = 108;
       jenkins = 109;
       systemd-journal-gateway = 110;
-      notbit = 111;
+      #notbit = 111; # unused
       ngircd = 112;
       btsync = 113;
       minecraft = 114;
@@ -356,7 +356,7 @@
       kippo = 108;
       jenkins = 109;
       systemd-journal-gateway = 110;
-      notbit = 111;
+      #notbit = 111; # unused
       #ngircd = 112; # unused
       btsync = 113;
       #minecraft = 114; # unused

nixos/modules/module-list.nix

@@ -322,7 +322,6 @@
   ./services/networking/networkmanager.nix
   ./services/networking/ngircd.nix
   ./services/networking/nix-serve.nix
-  ./services/networking/notbit.nix
   ./services/networking/nsd.nix
   ./services/networking/ntopng.nix
   ./services/networking/ntpd.nix

nixos/modules/services/networking/notbit.nix

@@ -1,130 +0,0 @@
-{ config, lib, pkgs, ... }:
-
-with lib;
-let
-  cfg = config.services.notbit;
-  varDir = "/var/lib/notbit";
-  
-  sendmail = pkgs.stdenv.mkDerivation {
-    name = "notbit-wrapper";
-    buildInputs = [ pkgs.makeWrapper ];
-    propagatedBuildInputs = [ pkgs.notbit ];
-    buildCommand = ''
-      mkdir -p $out/bin
-      makeWrapper ${pkgs.notbit}/bin/notbit-sendmail $out/bin/notbit-system-sendmail \
-        --set XDG_RUNTIME_DIR ${varDir}
-    '';
-  };
-  opts = "${optionalString cfg.allowPrivateAddresses "-L"} ${optionalString cfg.noBootstrap "-b"} ${optionalString cfg.specifiedPeersOnly "-e"}";
-  peers = concatStringsSep " " (map (str: "-P \"${str}\"") cfg.peers);
-  listen = if cfg.listenAddress == [] then "-p ${toString cfg.port}" else
-    concatStringsSep " " (map (addr: "-a \"${addr}:${toString cfg.port}\"") cfg.listenAddress);
-in
-
-with lib;
-{
-
-  ### configuration
-
-  options = {
-
-    services.notbit = {
-
-      enable = mkOption {
-        type = types.bool;
-        default = false;
-        description = ''
-          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.
-        '';
-      };
-
-      port = mkOption {
-        type = types.int;
-        default = 8444;
-        description = "The port which the daemon listens for other bitmessage clients";
-      };
-
-      nice = mkOption {
-        type = types.int;
-        default = 10;
-        description = "Set the nice level for the notbit daemon";
-      };
-
-      listenAddress = mkOption {
-        type = types.listOf types.str;
-        default = [ ];
-        example = [ "localhost" "myhostname" ];
-        description = "The addresses which notbit will use to listen for incoming connections. These addresses are advertised to connecting clients.";
-      };
-
-      peers = mkOption {
-        type = types.listOf types.str;
-        default = [ ];
-        example = [ "bitmessage.org:8877" ];
-        description = "The initial set of peers notbit will connect to.";
-      };
-
-      specifiedPeersOnly = mkOption {
-        type = types.bool;
-        default = false;
-        description = "If true, notbit will only connect to peers specified by the peers option.";
-      };
-
-      allowPrivateAddresses = mkOption {
-        type = types.bool;
-        default = false;
-        description = "If true, notbit will allow connections to to RFC 1918 addresses.";
-      };
-
-      noBootstrap = mkOption {
-        type = types.bool;
-        default = false;
-        description = "If true, notbit will not bootstrap an initial peerlist from bitmessage.org servers";
-      };
-
-    };
-
-  };
-
-  ### implementation
-
-  config = mkIf cfg.enable {
-
-    environment.systemPackages = [ sendmail ];
-
-    systemd.services.notbit = {
-      description = "Notbit daemon";
-      after = [ "network.target" ];
-      wantedBy = [ "multi-user.target" ];
-      path = [ pkgs.notbit ];
-      environment = { XDG_RUNTIME_DIR = varDir; };
-
-      postStart = ''
-        [ ! -f "${varDir}/addr" ] && notbit-keygen > ${varDir}/addr
-        chmod 0640 ${varDir}/{addr,notbit/notbit-ipc.lock}
-        chmod 0750 ${varDir}/notbit/{,notbit-ipc}
-      '';
-
-      serviceConfig = {
-        Type = "forking";
-        ExecStart = "${pkgs.notbit}/bin/notbit -d ${listen} ${peers} ${opts}";
-        User = "notbit";
-        Group = "notbit";
-        UMask = "0077";
-        WorkingDirectory = varDir;
-        Nice = cfg.nice;
-      };
-    };
-
-    users.extraUsers.notbit = {
-      group = "notbit";
-      description = "Notbit daemon user";
-      home = varDir;
-      createHome = true;
-      uid = config.ids.uids.notbit;
-    };
-
-    users.extraGroups.notbit.gid = config.ids.gids.notbit;
-  };
-
-}

pkgs/applications/networking/notbit/default.nix

@@ -1,24 +0,0 @@
-{ stdenv, fetchgit, autoconf, automake, pkgconfig, openssl }:
-
-stdenv.mkDerivation rec {
-  name = "notbit-git-6f1ca59";
-
-  src = fetchgit {
-    url = "git://github.com/bpeel/notbit";
-    rev = "6f1ca5987c7f217c9c3dd27adf6ac995004c29a1";
-    sha256 = "0h9nzm248pw9wrdsfkr580ghiqvh6mk6vx7r2r752awrc13wvgis";
-  };
-
-  buildInputs = [ autoconf automake pkgconfig openssl ];
-
-  preConfigure = "autoreconf -vfi";
-
-  meta = with stdenv.lib; { 
-    homepage = http://busydoingnothing.co.uk/notbit/;
-    description = "A minimal bitmessage client";
-    license = licenses.mit;
-
-    # This is planned to change when the project officially supports other platforms
-    platforms = platforms.linux;
-  };
-}

pkgs/top-level/all-packages.nix

@@ -2463,8 +2463,6 @@ let
     graphicalSupport = true;
   };
 
-  notbit = callPackage ../applications/networking/notbit { };
-
   notify-osd = callPackage ../applications/misc/notify-osd { };
 
   nox = callPackage ../tools/package-management/nox {