diff options
author | Thomas Tuegel <ttuegel@gmail.com> | 2015-03-22 17:04:53 -0500 |
---|---|---|
committer | Thomas Tuegel <ttuegel@gmail.com> | 2015-03-22 17:05:12 -0500 |
commit | 143aa5aa17cfb80758951ba79deb5beef455c8f3 (patch) | |
tree | 3b329c011326942235d21f900b638cf55e1d883d /pkgs/development/libraries/jsoncpp | |
parent | f47af9b2c81d92e60d7eeb14954bfd9d9fefac52 (diff) | |
download | nixlib-143aa5aa17cfb80758951ba79deb5beef455c8f3.tar nixlib-143aa5aa17cfb80758951ba79deb5beef455c8f3.tar.gz nixlib-143aa5aa17cfb80758951ba79deb5beef455c8f3.tar.bz2 nixlib-143aa5aa17cfb80758951ba79deb5beef455c8f3.tar.lz nixlib-143aa5aa17cfb80758951ba79deb5beef455c8f3.tar.xz nixlib-143aa5aa17cfb80758951ba79deb5beef455c8f3.tar.zst nixlib-143aa5aa17cfb80758951ba79deb5beef455c8f3.zip |
remove jsoncpp-0.6.0-rc2
Diffstat (limited to 'pkgs/development/libraries/jsoncpp')
-rw-r--r-- | pkgs/development/libraries/jsoncpp/1.6.nix | 31 | ||||
-rw-r--r-- | pkgs/development/libraries/jsoncpp/default.nix | 37 |
2 files changed, 18 insertions, 50 deletions
diff --git a/pkgs/development/libraries/jsoncpp/1.6.nix b/pkgs/development/libraries/jsoncpp/1.6.nix deleted file mode 100644 index d8b85847975b..000000000000 --- a/pkgs/development/libraries/jsoncpp/1.6.nix +++ /dev/null @@ -1,31 +0,0 @@ -{ stdenv, fetchurl, cmake, python }: - -let - basename = "jsoncpp"; - version = "1.6.0"; -in -stdenv.mkDerivation rec { - name = "${basename}-${version}"; - src = fetchurl { - url = "https://github.com/open-source-parsers/${basename}/archive/${version}.tar.gz"; - sha256 = "0ff1niks3y41gr6z13q9m391na70abqyi9rj4z3y2fz69cwm6sgz"; - }; - - nativeBuildInputs = - [ - # cmake can be built with the system jsoncpp, or its own bundled version. - # Obviously we cannot build it against the system jsoncpp that doesn't yet exist, so - # we make a bootstrapping build with the bundled version. - (cmake.override { jsoncpp = null; }) - python - ]; - - meta = { - inherit version; - homepage = https://github.com/open-source-parsers/jsoncpp; - description = "A simple API to manipulate JSON data in C++"; - maintainers = with stdenv.lib.maintainers; [ ttuegel ]; - license = with stdenv.lib.licenses; [ mit ]; - branch = "1.6"; - }; -} diff --git a/pkgs/development/libraries/jsoncpp/default.nix b/pkgs/development/libraries/jsoncpp/default.nix index b1aa03991bd9..d8b85847975b 100644 --- a/pkgs/development/libraries/jsoncpp/default.nix +++ b/pkgs/development/libraries/jsoncpp/default.nix @@ -1,32 +1,31 @@ -{ stdenv, fetchurl, scons}: +{ stdenv, fetchurl, cmake, python }: let basename = "jsoncpp"; - version = "0.6.0-rc2"; - pkgname = "${basename}-src-${version}.tar.gz"; -in + version = "1.6.0"; +in stdenv.mkDerivation rec { name = "${basename}-${version}"; src = fetchurl { - url = "mirror://sourceforge/${basename}/${pkgname}"; - sha256 = "10xj15nziqpwc6r3yznpb49wm4jqc5wakjsmj65v087mcg8r7lfl"; + url = "https://github.com/open-source-parsers/${basename}/archive/${version}.tar.gz"; + sha256 = "0ff1niks3y41gr6z13q9m391na70abqyi9rj4z3y2fz69cwm6sgz"; }; - buildInputs = [ scons ]; - - buildPhase = '' - mkdir -p $out - scons platform=linux-gcc check - ''; - - installPhase = '' - cp -r include $out - cp -r libs/* $out/lib - ''; + nativeBuildInputs = + [ + # cmake can be built with the system jsoncpp, or its own bundled version. + # Obviously we cannot build it against the system jsoncpp that doesn't yet exist, so + # we make a bootstrapping build with the bundled version. + (cmake.override { jsoncpp = null; }) + python + ]; meta = { - homepage = http://jsoncpp.sourceforge.net; - repositories.svn = svn://svn.code.sf.net/p/jsoncpp/code; + inherit version; + homepage = https://github.com/open-source-parsers/jsoncpp; description = "A simple API to manipulate JSON data in C++"; + maintainers = with stdenv.lib.maintainers; [ ttuegel ]; + license = with stdenv.lib.licenses; [ mit ]; + branch = "1.6"; }; } |