{shout, quassel-webserver}: move to nodePackages

both packages are available at the default NPM registry.

related to #31032

pkgs/applications/networking/irc/quassel-webserver/default.nix

@@ -1,43 +0,0 @@
-{ stdenv, lib, fetchFromGitHub, callPackage, python, utillinux}:
-
-with lib;
-
-let
-  nodePackages = callPackage ../../../../top-level/node-packages.nix {
-    neededNatives = [ python ];
-    self = nodePackages;
-    generated = ./quassel-webserver.nix;
-  };
-
-in nodePackages.buildNodePackage rec {
-  name = "quassel-webserver-${version}";
-  version = "2.1.1";
-  src = fetchFromGitHub {
-    owner  = "magne4000";
-    repo   = "quassel-webserver";
-    rev    = "dda457f38795d15565557a8629085063fa6a7378";
-    sha256 = "0syglfdmjnssxdiak1dw8cns5f736v58zmlsh81dvxww90gx3k7h";
-  };
-  buildInputs = nodePackages.nativeDeps."quassel-webserver" or [];
-  deps = [ nodePackages.by-spec."body-parser"."^1.15.2"
-           nodePackages.by-spec."commander"."^2.9.0"
-           nodePackages.by-spec."cookie-parser"."~1.4.3"
-           nodePackages.by-spec."express"."^4.14.0"
-           nodePackages.by-spec."jade"."~1.11.0"
-           nodePackages.by-spec."less"."^2.7.1"
-           nodePackages.by-spec."less-middleware"."^2.2.0"
-           nodePackages.by-spec."libquassel"."~2.0.5"
-           nodePackages.by-spec."morgan"."^1.7.0"
-           nodePackages.by-spec."net-browserify-alt"."^1.0.0"
-           nodePackages.by-spec."serve-favicon"."~2.3.0"
-         ];
-  peerDependencies = [];
-
-  meta = {
-    description = "A web server/client for Quassel";
-    license = licenses.mit;
-    homepage = https://github.com/magne4000/quassel-webserver;
-    maintainers = with maintainers; [ uwap ];
-    platforms = platforms.unix;
-  }; 
-}

pkgs/applications/networking/irc/shout/default.nix

@@ -1,49 +0,0 @@
-{ stdenv, fetchFromGitHub, callPackage, python, utillinux }:
-
-with stdenv.lib;
-
-let
-  nodePackages = callPackage (import ../../../../top-level/node-packages.nix) {
-    neededNatives = [ python ] ++ optional (stdenv.isLinux) utillinux;
-    self = nodePackages;
-    generated = ./package.nix;
-  };
-
-in nodePackages.buildNodePackage rec {
-  name = "shout-${version}";
-  version = "0.53.0";
-
-  src = fetchFromGitHub {
-    owner = "erming";
-    repo = "shout";
-    rev = "2cee0ea6ef5ee51de0190332f976934b55bbc8e4";
-    sha256 = "1kci1qha1csb9sqb4ig487q612hgdn5lycbcpad7m9r6chn835qg";
-  };
-
-  buildInputs = nodePackages.nativeDeps."shout" or [];
-
-  deps = [
-    nodePackages.by-spec."bcrypt-nodejs"."0.0.3"
-    nodePackages.by-spec."cheerio"."^0.17.0"
-    nodePackages.by-spec."commander"."^2.3.0"
-    nodePackages.by-spec."event-stream"."^3.1.7"
-    nodePackages.by-spec."express"."^4.9.5"
-    nodePackages.by-spec."lodash"."~2.4.1"
-    nodePackages.by-spec."mkdirp"."^0.5.0"
-    nodePackages.by-spec."moment"."~2.7.0"
-    nodePackages.by-spec."read"."^1.0.5"
-    nodePackages.by-spec."request"."^2.51.0"
-    nodePackages.by-spec."slate-irc"."~0.7.3"
-    nodePackages.by-spec."socket.io"."~1.0.6"
-  ];
-
-  peerDependencies = [];
-
-  meta = {
-    description = "Web IRC client that you host on your own server";
-    license = licenses.mit;
-    homepage = http://shout-irc.com/;
-    maintainers = with maintainers; [ benley ];
-    platforms = platforms.unix;
-  };
-}

pkgs/development/node-packages/node-packages-v6.json

@@ -67,10 +67,12 @@
 , "phantomjs"
 , "prettier"
 , "pulp"
+, "quassel-webserver"
 , "react-tools"
 , "s3http"
 , "semver"
 , "serve"
+, "shout"
 , "sinopia"
 , "sloc"
 , "smartdc"

pkgs/top-level/all-packages.nix

@@ -4380,7 +4380,7 @@ with pkgs;
 
   shotwell = callPackage ../applications/graphics/shotwell { };
 
-  shout = callPackage ../applications/networking/irc/shout { };
+  shout = nodePackages.shout;
 
   shellinabox = callPackage ../servers/shellinabox { };
 
@@ -16324,7 +16324,7 @@ with pkgs;
     withKDE = false;
   };
 
-  quassel-webserver = callPackage ../applications/networking/irc/quassel-webserver { };
+  quassel-webserver = nodePackages.quassel-webserver;
 
   quirc = callPackage ../tools/graphics/quirc {};