summaryrefslogtreecommitdiffstats
path: root/lass/5pkgs
diff options
context:
space:
mode:
authorlassulus <lass@aidsballs.de>2015-11-13 14:53:26 +0100
committerlassulus <lass@aidsballs.de>2015-11-13 14:53:26 +0100
commit07dca519636f07ee4887e14e0e9a9739ec9f8034 (patch)
treed59000b61794da01738c84a7c71d1a088856fc0e /lass/5pkgs
parenta204949071a964584bf27889277c8890ed724979 (diff)
l 5 go -> k 5 go
Diffstat (limited to 'lass/5pkgs')
-rw-r--r--lass/5pkgs/default.nix7
-rw-r--r--lass/5pkgs/go/default.nix57
-rw-r--r--lass/5pkgs/go/packages.nix44
3 files changed, 3 insertions, 105 deletions
diff --git a/lass/5pkgs/default.nix b/lass/5pkgs/default.nix
index 844d68a45..b3857ce97 100644
--- a/lass/5pkgs/default.nix
+++ b/lass/5pkgs/default.nix
@@ -5,15 +5,14 @@ let
in
rec {
- bitlbee-dev = callPackage ./bitlbee-dev.nix {};
- bitlbee-steam = callPackage ./bitlbee-steam.nix { inherit bitlbee-dev; };
- bitlbee = callPackage ./bitlbee.nix { inherit bitlbee-steam; };
+ #bitlbee-dev = callPackage ./bitlbee-dev.nix {};
+ #bitlbee-steam = callPackage ./bitlbee-steam.nix { inherit bitlbee-dev; };
+ #bitlbee = callPackage ./bitlbee.nix { inherit bitlbee-steam; };
firefoxPlugins = {
noscript = callPackage ./firefoxPlugins/noscript.nix {};
ublock = callPackage ./firefoxPlugins/ublock.nix {};
vimperator = callPackage ./firefoxPlugins/vimperator.nix {};
};
- go = callPackage ./go/default.nix {};
newsbot-js = callPackage ./newsbot-js/default.nix {};
xmonad-lass =
let src = pkgs.writeNixFromCabal "xmonad-lass.nix" ./xmonad-lass; in
diff --git a/lass/5pkgs/go/default.nix b/lass/5pkgs/go/default.nix
deleted file mode 100644
index 9dd166adc..000000000
--- a/lass/5pkgs/go/default.nix
+++ /dev/null
@@ -1,57 +0,0 @@
-{ stdenv, makeWrapper, lib, buildEnv, fetchgit, nodePackages, nodejs }:
-
-with lib;
-
-let
- np = nodePackages.override {
- generated = ./packages.nix;
- self = np;
- };
-
- node_env = buildEnv {
- name = "node_env";
- paths = [
- np.redis
- np."formidable"
- ];
- pathsToLink = [ "/lib" ];
- ignoreCollisions = true;
- };
-
-in nodePackages.buildNodePackage {
- name = "go";
-
- src = fetchgit {
- url = "http://cgit.echelon/go/";
- rev = "05d02740e0adbb36cc461323647f0c1e7f493156";
- sha256 = "6015c9a93317375ae8099c7ab982df0aa93a59ec2b48972e253887bb6ca0004f";
- };
-
- phases = [
- "unpackPhase"
- "installPhase"
- ];
-
- deps = (filter (v: nixType v == "derivation") (attrValues np));
-
- buildInputs = [
- nodejs
- makeWrapper
- ];
-
- installPhase = ''
- mkdir -p $out/bin
-
- cp index.js $out/
- cat > $out/go << EOF
- ${nodejs}/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/lass/5pkgs/go/packages.nix b/lass/5pkgs/go/packages.nix
deleted file mode 100644
index 9acfd7658..000000000
--- a/lass/5pkgs/go/packages.nix
+++ /dev/null
@@ -1,44 +0,0 @@
-{ self, fetchurl, fetchgit ? null, lib }:
-
-{
- by-spec."formidable"."*" =
- self.by-version."formidable"."1.0.17";
- by-version."formidable"."1.0.17" = self.buildNodePackage {
- name = "formidable-1.0.17";
- version = "1.0.17";
- bin = false;
- src = fetchurl {
- url = "http://registry.npmjs.org/formidable/-/formidable-1.0.17.tgz";
- name = "formidable-1.0.17.tgz";
- sha1 = "ef5491490f9433b705faa77249c99029ae348559";
- };
- deps = {
- };
- optionalDependencies = {
- };
- peerDependencies = [];
- os = [ ];
- cpu = [ ];
- };
- "formidable" = self.by-version."formidable"."1.0.17";
- by-spec."redis"."*" =
- self.by-version."redis"."2.1.0";
- by-version."redis"."2.1.0" = self.buildNodePackage {
- name = "redis-2.1.0";
- version = "2.1.0";
- bin = false;
- src = fetchurl {
- url = "http://registry.npmjs.org/redis/-/redis-2.1.0.tgz";
- name = "redis-2.1.0.tgz";
- sha1 = "38acb208f90750250f9451219b73ff08ae907f94";
- };
- deps = {
- };
- optionalDependencies = {
- };
- peerDependencies = [];
- os = [ ];
- cpu = [ ];
- };
- "redis" = self.by-version."redis"."2.1.0";
-}