diff --git a/pkgs/development/libraries/fastjson/default.nix b/pkgs/development/libraries/fastjson/default.nix new file mode 100644 index 00000000000..4c325198547 --- /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 ae800662444..01b76785acb 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 { };