Merge remote-tracking branch 'lass/master'

4 files changed, 0 insertions, 152 deletions

diff --git a/krebs/5pkgs/simple/go-shortener/default.nix b/krebs/5pkgs/simple/go-shortener/default.nix
deleted file mode 100644
index 5e734553b..000000000
--- a/krebs/5pkgs/simple/go-shortener/default.nix
+++ /dev/null
@@ -1,56 +0,0 @@
-{ stdenv, makeWrapper, lib, buildEnv, fetchgit, nodejs-12_x, pkgs }:
-
-with lib;
-
-let
-  nodeEnv = import <nixpkgs/pkgs/development/node-packages/node-env.nix> {
-    inherit (pkgs) stdenv python2 utillinux runCommand writeTextFile;
-    nodejs = nodejs-12_x;
-    libtool = if pkgs.stdenv.isDarwin then pkgs.darwin.cctools else null;
-  };
-
-  node_env = pkgs.buildEnv {
-    name = "go-node_env";
-    paths = attrValues (import ./node-packages.nix {
-      inherit (pkgs) fetchurl fetchgit;
-      inherit nodeEnv;
-    });
-  };
-
-in stdenv.mkDerivation {
-  packageName = "go";
-  name = "go-shortener";
-  version = "0.0.0";
-
-  src = fetchgit {
-    url = "http://cgit.lassul.us/go/";
-    rev = "05d02740e0adbb36cc461323647f0c1e7f493156";
-    sha256 = "6015c9a93317375ae8099c7ab982df0aa93a59ec2b48972e253887bb6ca0004f";
-  };
-
-  phases = [
-    "unpackPhase"
-    "installPhase"
-  ];
-
-  buildInputs = [
-    nodejs-12_x
-    makeWrapper
-  ];
-
-  installPhase = ''
-    mkdir -p $out/bin
-
-    cp index.js $out/
-    cat > $out/go << EOF
-      ${nodejs-12_x}/bin/node $out/index.js
-    EOF
-    chmod +x $out/go
-
-    wrapProgram $out/go \
-      --prefix NODE_PATH : ${node_env}/lib/node_modules
-
-    ln -s $out/go /$out/bin/go
-  '';
-
-}
diff --git a/krebs/5pkgs/simple/go-shortener/node-packages.nix b/krebs/5pkgs/simple/go-shortener/node-packages.nix
deleted file mode 100644
index 613e31ba0..000000000
--- a/krebs/5pkgs/simple/go-shortener/node-packages.nix
+++ /dev/null
@@ -1,88 +0,0 @@
-# This file has been generated by node2nix 1.7.0. Do not edit!
-
-{nodeEnv, fetchurl, fetchgit, globalBuildInputs ? []}:
-
-let
-  sources = {
-    "denque-1.4.1" = {
-      name = "denque";
-      packageName = "denque";
-      version = "1.4.1";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/denque/-/denque-1.4.1.tgz";
-        sha512 = "OfzPuSZKGcgr96rf1oODnfjqBFmr1DVoc/TrItj3Ohe0Ah1C5WX5Baquw/9U9KovnQ88EqmJbD66rKYUQYN1tQ==";
-      };
-    };
-    "redis-commands-1.5.0" = {
-      name = "redis-commands";
-      packageName = "redis-commands";
-      version = "1.5.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/redis-commands/-/redis-commands-1.5.0.tgz";
-        sha512 = "6KxamqpZ468MeQC3bkWmCB1fp56XL64D4Kf0zJSwDZbVLLm7KFkoIcHrgRvQ+sk8dnhySs7+yBg94yIkAK7aJg==";
-      };
-    };
-    "redis-errors-1.2.0" = {
-      name = "redis-errors";
-      packageName = "redis-errors";
-      version = "1.2.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/redis-errors/-/redis-errors-1.2.0.tgz";
-        sha1 = "eb62d2adb15e4eaf4610c04afe1529384250abad";
-      };
-    };
-    "redis-parser-3.0.0" = {
-      name = "redis-parser";
-      packageName = "redis-parser";
-      version = "3.0.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/redis-parser/-/redis-parser-3.0.0.tgz";
-        sha1 = "b66d828cdcafe6b4b8a428a7def4c6bcac31c8b4";
-      };
-    };
-  };
-in
-{
-  formidable = nodeEnv.buildNodePackage {
-    name = "formidable";
-    packageName = "formidable";
-    version = "1.2.2";
-    src = fetchurl {
-      url = "https://registry.npmjs.org/formidable/-/formidable-1.2.2.tgz";
-      sha512 = "V8gLm+41I/8kguQ4/o1D3RIHRmhYFG4pnNyonvua+40rqcEmT4+V71yaZ3B457xbbgCsCfjSPi65u/W6vK1U5Q==";
-    };
-    buildInputs = globalBuildInputs;
-    meta = {
-      description = "A node.js module for parsing form data, especially file uploads.";
-      homepage = https://github.com/node-formidable/formidable;
-      license = "MIT";
-    };
-    production = true;
-    bypassCache = true;
-    reconstructLock = true;
-  };
-  redis = nodeEnv.buildNodePackage {
-    name = "redis";
-    packageName = "redis";
-    version = "3.0.2";
-    src = fetchurl {
-      url = "https://registry.npmjs.org/redis/-/redis-3.0.2.tgz";
-      sha512 = "PNhLCrjU6vKVuMOyFu7oSP296mwBkcE6lrAjruBYG5LgdSqtRBoVQIylrMyVZD/lkF24RSNNatzvYag6HRBHjQ==";
-    };
-    dependencies = [
-      sources."denque-1.4.1"
-      sources."redis-commands-1.5.0"
-      sources."redis-errors-1.2.0"
-      sources."redis-parser-3.0.0"
-    ];
-    buildInputs = globalBuildInputs;
-    meta = {
-      description = "A high performance Redis client.";
-      homepage = https://github.com/NodeRedis/node-redis;
-      license = "MIT";
-    };
-    production = true;
-    bypassCache = true;
-    reconstructLock = true;
-  };
-}
\ No newline at end of file
diff --git a/krebs/5pkgs/simple/go-shortener/pkgs.json b/krebs/5pkgs/simple/go-shortener/pkgs.json
deleted file mode 100644
index f53ce3745..000000000
--- a/krebs/5pkgs/simple/go-shortener/pkgs.json
+++ /dev/null
@@ -1,4 +0,0 @@
-[
-  "formidable",
-  "redis"
-]
diff --git a/krebs/5pkgs/simple/go-shortener/update.sh b/krebs/5pkgs/simple/go-shortener/update.sh
deleted file mode 100755
index 1a58d0367..000000000
--- a/krebs/5pkgs/simple/go-shortener/update.sh
+++ /dev/null
@@ -1,4 +0,0 @@
-#!/usr/bin/env nix-shell
-#! nix-shell -i bash -p nodePackages_10_x.node2nix
-node2nix -10 -i pkgs.json -c combine.nix
-rm node-env.nix combine.nix