diff options
author | Sander van der Burg <svanderburg@gmail.com> | 2016-09-01 20:50:08 +0000 |
---|---|---|
committer | Sander van der Burg <svanderburg@gmail.com> | 2016-09-01 20:50:08 +0000 |
commit | 8bedff0e9208a763a6c85b53446b5dcc0e4c55e8 (patch) | |
tree | 8b4181794f958eaee41190f56e8ce56c6a00d1b6 /pkgs | |
parent | 7c71a897dd0c641e047d6e713dca85764b577c4e (diff) |
wring: use node2nix generated package
Diffstat (limited to 'pkgs')
-rw-r--r-- | pkgs/development/node-packages/default-v4.nix | 2 | ||||
-rw-r--r-- | pkgs/tools/text/wring/default.nix | 26 | ||||
-rw-r--r-- | pkgs/tools/text/wring/node-packages.json | 1 | ||||
-rw-r--r-- | pkgs/tools/text/wring/node-packages.nix | 24 | ||||
-rw-r--r-- | pkgs/top-level/all-packages.nix | 2 |
5 files changed, 2 insertions, 53 deletions
diff --git a/pkgs/development/node-packages/default-v4.nix b/pkgs/development/node-packages/default-v4.nix index 38f39fe917b13..5d724034201b1 100644 --- a/pkgs/development/node-packages/default-v4.nix +++ b/pkgs/development/node-packages/default-v4.nix @@ -31,7 +31,7 @@ nodePackages // { ''; }); - wring = nodePackages.phantomjs.override (oldAttrs: { + wring = nodePackages.wring.override (oldAttrs: { buildInputs = oldAttrs.buildInputs ++ [ pkgs.phantomjs2 ]; }); diff --git a/pkgs/tools/text/wring/default.nix b/pkgs/tools/text/wring/default.nix deleted file mode 100644 index 038456f82c5bd..0000000000000 --- a/pkgs/tools/text/wring/default.nix +++ /dev/null @@ -1,26 +0,0 @@ -{ stdenv, callPackage, makeWrapper, nodejs, phantomjs2 }: - -let - self = ( - callPackage ../../../top-level/node-packages.nix { - generated = callPackage ./node-packages.nix { inherit self; }; - overrides = { - "wring" = { - buildInputs = [ makeWrapper phantomjs2 ]; - - postInstall = '' - wrapProgram "$out/bin/wring" \ - --prefix PATH : ${phantomjs2}/bin - ''; - - meta = with stdenv.lib; { - description = "Command-line tool for extracting content from webpages using CSS Selectors, XPath, and JS expressions"; - homepage = https://github.com/osener/wring; - license = licenses.mit; - platforms = platforms.darwin ++ platforms.linux; - maintainers = [ maintainers.osener ]; - }; - }; - }; - }); -in self.wring diff --git a/pkgs/tools/text/wring/node-packages.json b/pkgs/tools/text/wring/node-packages.json deleted file mode 100644 index 9c0e17129286a..0000000000000 --- a/pkgs/tools/text/wring/node-packages.json +++ /dev/null @@ -1 +0,0 @@ -[ "wring" ] diff --git a/pkgs/tools/text/wring/node-packages.nix b/pkgs/tools/text/wring/node-packages.nix deleted file mode 100644 index b3761bd33cb69..0000000000000 --- a/pkgs/tools/text/wring/node-packages.nix +++ /dev/null @@ -1,24 +0,0 @@ -{ self, fetchurl, fetchgit ? null, lib }: - -{ - by-spec."wring"."*" = - self.by-version."wring"."1.0.0"; - by-version."wring"."1.0.0" = self.buildNodePackage { - name = "wring-1.0.0"; - version = "1.0.0"; - bin = true; - src = fetchurl { - url = "http://registry.npmjs.org/wring/-/wring-1.0.0.tgz"; - name = "wring-1.0.0.tgz"; - sha1 = "3d8ebe894545bf0b42946fdc84c61e37ae657ce1"; - }; - deps = { - }; - optionalDependencies = { - }; - peerDependencies = []; - os = [ ]; - cpu = [ ]; - }; - "wring" = self.by-version."wring"."1.0.0"; -} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 9f6870697d1ce..351d96a35ae06 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -4115,7 +4115,7 @@ in wml = callPackage ../development/web/wml { }; - wring = callPackage ../tools/text/wring { }; + wring = nodePackages.wring; wrk = callPackage ../tools/networking/wrk { }; |