summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authortv <tv@krebsco.de>2016-02-27 13:16:24 +0100
committertv <tv@krebsco.de>2016-02-27 13:16:24 +0100
commitf7165409a511582507f465162609676c7b6ef0df (patch)
tree9fb52905f69deaee7d43643fd41746f6e6ca32d4
parent2ea539c80f48060aeb86b3522fde73c832b793cd (diff)
jq: rip
-rw-r--r--krebs/5pkgs/default.nix2
-rw-r--r--krebs/5pkgs/jq/default.nix33
2 files changed, 1 insertions, 34 deletions
diff --git a/krebs/5pkgs/default.nix b/krebs/5pkgs/default.nix
index d395fe00a..f7997dd63 100644
--- a/krebs/5pkgs/default.nix
+++ b/krebs/5pkgs/default.nix
@@ -17,7 +17,7 @@ with config.krebs.lib;
};
push = pkgs.callPackage ./push {
- inherit (subdirs) get jq;
+ inherit (subdirs) get;
};
ReaktorPlugins = pkgs.callPackage ./Reaktor/plugins.nix {};
diff --git a/krebs/5pkgs/jq/default.nix b/krebs/5pkgs/jq/default.nix
deleted file mode 100644
index 41db0f284..000000000
--- a/krebs/5pkgs/jq/default.nix
+++ /dev/null
@@ -1,33 +0,0 @@
-{stdenv, fetchurl}:
-let
- s = # Generated upstream information
- rec {
- baseName="jq";
- version="1.5";
- name="${baseName}-${version}";
- url=https://github.com/stedolan/jq/releases/download/jq-1.5/jq-1.5.tar.gz;
- sha256="0g29kyz4ykasdcrb0zmbrp2jqs9kv1wz9swx849i2d1ncknbzln4";
- };
- buildInputs = [
- ];
-in
-stdenv.mkDerivation {
- inherit (s) name version;
- inherit buildInputs;
- src = fetchurl {
- inherit (s) url sha256;
- };
-
- # jq is linked to libjq:
- configureFlags = [
- "LDFLAGS=-Wl,-rpath,\\\${libdir}"
- ];
- meta = {
- inherit (s) version;
- description = ''A lightweight and flexible command-line JSON processor'';
- license = stdenv.lib.licenses.mit ;
- maintainers = [stdenv.lib.maintainers.raskin];
- platforms = stdenv.lib.platforms.linux ++ stdenv.lib.platforms.darwin;
- };
-}
-