about summary refs log tree commit diff
path: root/pkgs
diff options
context:
space:
mode:
authorTim Steinbach <tim.steinbach@exinda.com>2016-04-04 14:24:44 -0400
committerTim Steinbach <tim.steinbach@exinda.com>2016-04-04 14:25:37 -0400
commit74eee1f306358780dd8f3050a5ebfbc172fed525 (patch)
tree1631a3764d7f47665e75ad6aec5b6a32565273d8 /pkgs
parentb375260adde0d0c5acd3037800a9a3b47a522200 (diff)
downloadnixlib-74eee1f306358780dd8f3050a5ebfbc172fed525.tar
nixlib-74eee1f306358780dd8f3050a5ebfbc172fed525.tar.gz
nixlib-74eee1f306358780dd8f3050a5ebfbc172fed525.tar.bz2
nixlib-74eee1f306358780dd8f3050a5ebfbc172fed525.tar.lz
nixlib-74eee1f306358780dd8f3050a5ebfbc172fed525.tar.xz
nixlib-74eee1f306358780dd8f3050a5ebfbc172fed525.tar.zst
nixlib-74eee1f306358780dd8f3050a5ebfbc172fed525.zip
libfastjson: init at v0.99.2
Diffstat (limited to 'pkgs')
-rw-r--r--pkgs/development/libraries/fastjson/default.nix25
-rw-r--r--pkgs/top-level/all-packages.nix12
2 files changed, 32 insertions, 5 deletions
diff --git a/pkgs/development/libraries/fastjson/default.nix b/pkgs/development/libraries/fastjson/default.nix
new file mode 100644
index 000000000000..4c3251985470
--- /dev/null
+++ b/pkgs/development/libraries/fastjson/default.nix
@@ -0,0 +1,25 @@
+{ stdenv, fetchFromGitHub, libtool, autoconf, automake }:
+
+stdenv.mkDerivation rec {
+  version = "v0.99.2";
+  name = "fastjson-${version}";
+  src = fetchFromGitHub {
+    repo = "libfastjson";
+    owner = "rsyslog";
+    rev = "eabae907c9d991143e17da278a239819f2e8ae1c";
+    sha256 = "17fhaqdn0spc4p0848ahcy68swm6l5yd3bx6bdzxmmwj1jdrmvzk";
+  };
+
+  buildInputs = [ autoconf automake libtool ];
+
+  preConfigure = ''
+    sh autogen.sh
+  '';
+
+  meta = with stdenv.lib; {
+    description = "A fast json library for C";
+    homepage = "https://github.com/rsyslog/libfastjson";
+    license = licenses.mit;
+    maintainers = with maintainers; [ nequissimus ];
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index ae800662444a..01b76785acb5 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -755,6 +755,8 @@ in
 
   fasd = callPackage ../tools/misc/fasd { };
 
+  fastJson = callPackage ../development/libraries/fastjson { };
+
   fop = callPackage ../tools/typesetting/fop { };
 
   fzf = goPackages.fzf.bin // { outputs = [ "bin" ]; };
@@ -1590,11 +1592,11 @@ in
     gazebo6-headless = callPackage ../applications/science/robotics/gazebo/6.nix { withHeadless = true;  };
 
     gazebo7 = callPackage ../applications/science/robotics/gazebo { };
-  
+
     gazebo7-headless = callPackage ../applications/science/robotics/gazebo { withHeadless = true; };
 
   };
-  
+
   # at present, Gazebo 7.0.0 does not match Gazebo 6.5.1 for compatibility
   gazebo = gazeboSimulator.gazebo6;
 
@@ -1936,12 +1938,12 @@ in
 
   ifuse = callPackage ../tools/filesystems/ifuse/default.nix { };
 
-  ignition = recurseIntoAttrs { 
+  ignition = recurseIntoAttrs {
 
     math = callPackage ../development/libraries/ignition-math { };
-  
+
     math2 = ignition.math;
-  
+
     transport0 = callPackage ../development/libraries/ignition-transport/0.9.0.nix { };
 
     transport1 = callPackage ../development/libraries/ignition-transport/1.0.1.nix { };