From 789dbe2b2657760a5cebcf320f6807847d4fba64 Mon Sep 17 00:00:00 2001 From: makefu Date: Thu, 20 Oct 2016 08:49:22 +0200 Subject: m 5 go: buildNodePackage via callPackage --- krebs/5pkgs/go/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'krebs/5pkgs') diff --git a/krebs/5pkgs/go/default.nix b/krebs/5pkgs/go/default.nix index fb8b65ea..2871e5a9 100644 --- a/krebs/5pkgs/go/default.nix +++ b/krebs/5pkgs/go/default.nix @@ -1,9 +1,9 @@ -{ stdenv, makeWrapper, lib, buildEnv, fetchgit, nodePackages, nodejs }: +{ stdenv, makeWrapper, callPackage, lib, buildEnv, fetchgit, nodePackages, nodejs }: with lib; let - np = nodePackages.override { + np = (callPackage ) { generated = ./packages.nix; self = np; }; @@ -18,7 +18,7 @@ let ignoreCollisions = true; }; -in nodePackages.buildNodePackage { +in np.buildNodePackage { name = "go"; src = fetchgit { -- cgit v1.2.3 From bb2d4b10d3a1a835711e6b4fa459f9b0aaba4a88 Mon Sep 17 00:00:00 2001 From: lassulus Date: Thu, 20 Oct 2016 09:13:15 +0200 Subject: m 5 newsbot-js: buildNodePackage via callPackage --- krebs/5pkgs/newsbot-js/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'krebs/5pkgs') diff --git a/krebs/5pkgs/newsbot-js/default.nix b/krebs/5pkgs/newsbot-js/default.nix index 9e4a5130..b52454ca 100644 --- a/krebs/5pkgs/newsbot-js/default.nix +++ b/krebs/5pkgs/newsbot-js/default.nix @@ -1,9 +1,9 @@ -{ stdenv, makeWrapper, lib, buildEnv, fetchgit, nodePackages, nodejs }: +{ stdenv, makeWrapper, callPackage, lib, buildEnv, fetchgit, nodePackages, nodejs }: with lib; let - np = nodePackages.override { + np = (callPackage ) { generated = ./packages.nix; self = np; }; @@ -21,7 +21,7 @@ let ignoreCollisions = true; }; -in nodePackages.buildNodePackage { +in np.buildNodePackage { name = "newsbot-js"; src = fetchgit { -- cgit v1.2.3 From 0f2a9778315c3126794c0f1ad63710d38e7a67f7 Mon Sep 17 00:00:00 2001 From: lassulus Date: Thu, 20 Oct 2016 09:48:42 +0200 Subject: remove haskellPackges.megaparsec --- krebs/5pkgs/haskell-overrides/megaparsec.nix | 20 -------------------- 1 file changed, 20 deletions(-) delete mode 100644 krebs/5pkgs/haskell-overrides/megaparsec.nix (limited to 'krebs/5pkgs') diff --git a/krebs/5pkgs/haskell-overrides/megaparsec.nix b/krebs/5pkgs/haskell-overrides/megaparsec.nix deleted file mode 100644 index 5ade6006..00000000 --- a/krebs/5pkgs/haskell-overrides/megaparsec.nix +++ /dev/null @@ -1,20 +0,0 @@ -{ mkDerivation, base, bytestring, fetchzip, HUnit, mtl, QuickCheck -, stdenv, test-framework, test-framework-hunit -, test-framework-quickcheck2, text, transformers -}: -mkDerivation { - pname = "megaparsec"; - version = "4.1.0"; - src = fetchzip { - url = "https://hackage.haskell.org/package/megaparsec-4.1.0/megaparsec-4.1.0.tar.gz"; - sha256 = "1a1ka53a3r91lwnlvzaa8nyk1dxvfd1ij1i5x5vp83q2r9z9dcmi"; - }; - libraryHaskellDepends = [ base bytestring mtl text transformers ]; - testHaskellDepends = [ - base HUnit mtl QuickCheck test-framework test-framework-hunit - test-framework-quickcheck2 transformers - ]; - homepage = "https://github.com/mrkkrp/megaparsec"; - description = "Monadic parser combinators"; - license = stdenv.lib.licenses.bsd3; -} -- cgit v1.2.3