From 7c8ea4a87b50c2ffe982a1ba0c70579bea7cb4dd Mon Sep 17 00:00:00 2001 From: lassulus Date: Mon, 5 Oct 2015 14:48:42 +0200 Subject: move realwallpaper to krebs 5 --- lass/5pkgs/default.nix | 1 - lass/5pkgs/realwallpaper.nix | 28 ---------------------------- 2 files changed, 29 deletions(-) delete mode 100644 lass/5pkgs/realwallpaper.nix (limited to 'lass/5pkgs') diff --git a/lass/5pkgs/default.nix b/lass/5pkgs/default.nix index 6954c6a2c..7427cb620 100644 --- a/lass/5pkgs/default.nix +++ b/lass/5pkgs/default.nix @@ -13,5 +13,4 @@ rec { ublock = callPackage ./firefoxPlugins/ublock.nix {}; vimperator = callPackage ./firefoxPlugins/vimperator.nix {}; }; - realwallpaper = callPackage ./realwallpaper.nix {}; } diff --git a/lass/5pkgs/realwallpaper.nix b/lass/5pkgs/realwallpaper.nix deleted file mode 100644 index 4fea977ec..000000000 --- a/lass/5pkgs/realwallpaper.nix +++ /dev/null @@ -1,28 +0,0 @@ -{ stdenv, fetchgit, xplanet, imagemagick, curl, file }: - -stdenv.mkDerivation { - name = "realwallpaper"; - - src = fetchgit { - url = https://github.com/Lassulus/realwallpaper; - rev = "c2778c3c235fc32edc8115d533a0d0853ab101c5"; - sha256 = "0yhbjz19zk8sj5dsvccm6skkqq2vardn1yi70qmd5li7qvp17mvs"; - }; - - phases = [ - "unpackPhase" - "installPhase" - ]; - - buildInputs = [ - xplanet - imagemagick - curl - file - ]; - - installPhase = '' - mkdir -p $out - cp realwallpaper.sh $out/realwallpaper.sh - ''; -} -- cgit v1.2.3 From d2720415ac5404f3261a4dafbd97092c282dd169 Mon Sep 17 00:00:00 2001 From: lassulus Date: Fri, 9 Oct 2015 01:06:22 +0200 Subject: lass 5: add go url shortener --- lass/5pkgs/default.nix | 1 + lass/5pkgs/go/default.nix | 61 ++++++++++++++++++++++++++++++++++++++++++++++ lass/5pkgs/go/packages.nix | 44 +++++++++++++++++++++++++++++++++ lass/5pkgs/go/result | 1 + 4 files changed, 107 insertions(+) create mode 100644 lass/5pkgs/go/default.nix create mode 100644 lass/5pkgs/go/packages.nix create mode 120000 lass/5pkgs/go/result (limited to 'lass/5pkgs') diff --git a/lass/5pkgs/default.nix b/lass/5pkgs/default.nix index 7427cb620..e3e49e37e 100644 --- a/lass/5pkgs/default.nix +++ b/lass/5pkgs/default.nix @@ -13,4 +13,5 @@ rec { ublock = callPackage ./firefoxPlugins/ublock.nix {}; vimperator = callPackage ./firefoxPlugins/vimperator.nix {}; }; + go = callPackage ./go/default.nix {}; } diff --git a/lass/5pkgs/go/default.nix b/lass/5pkgs/go/default.nix new file mode 100644 index 000000000..2ac809c33 --- /dev/null +++ b/lass/5pkgs/go/default.nix @@ -0,0 +1,61 @@ +{ 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 + nodePackages.redis + np.formidable + makeWrapper + ]; + + installPhase = '' + mkdir -p $out/bin + + find ${node_env} + + 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 new file mode 100644 index 000000000..9acfd7658 --- /dev/null +++ b/lass/5pkgs/go/packages.nix @@ -0,0 +1,44 @@ +{ 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"; +} diff --git a/lass/5pkgs/go/result b/lass/5pkgs/go/result new file mode 120000 index 000000000..14893ca34 --- /dev/null +++ b/lass/5pkgs/go/result @@ -0,0 +1 @@ +/nix/store/nizallgwxcx4fz9awyfp9i17avfymlvx-nodejs-go \ No newline at end of file -- cgit v1.2.3 From 4072a32f89b9cc1c1e7c3583ac5b9ce5dcb004af Mon Sep 17 00:00:00 2001 From: lassulus Date: Fri, 9 Oct 2015 01:31:42 +0200 Subject: lass 5 go: remove debug stuff --- lass/5pkgs/go/default.nix | 2 -- lass/5pkgs/go/result | 1 - 2 files changed, 3 deletions(-) delete mode 120000 lass/5pkgs/go/result (limited to 'lass/5pkgs') diff --git a/lass/5pkgs/go/default.nix b/lass/5pkgs/go/default.nix index 2ac809c33..3b4468d18 100644 --- a/lass/5pkgs/go/default.nix +++ b/lass/5pkgs/go/default.nix @@ -44,8 +44,6 @@ in nodePackages.buildNodePackage { installPhase = '' mkdir -p $out/bin - find ${node_env} - cp index.js $out/ cat > $out/go << EOF ${nodejs}/bin/node $out/index.js diff --git a/lass/5pkgs/go/result b/lass/5pkgs/go/result deleted file mode 120000 index 14893ca34..000000000 --- a/lass/5pkgs/go/result +++ /dev/null @@ -1 +0,0 @@ -/nix/store/nizallgwxcx4fz9awyfp9i17avfymlvx-nodejs-go \ No newline at end of file -- cgit v1.2.3