public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

remove jsoncpp-0.6.0-rc2

Browse Source
This commit is contained in:
Thomas Tuegel 2015-03-22 17:04:53 -05:00
parent f47af9b2c8
commit 143aa5aa17
3 changed files with 19 additions and 54 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
pkgs/development/libraries/jsoncpp/1.6.nix
View File

@ -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";
};
}

35
pkgs/development/libraries/jsoncpp/default.nix
View File

@ -1,32 +1,31 @@
{ stdenv, fetchurl, scons}: { stdenv, fetchurl, cmake, python }:
let let
basename = "jsoncpp"; basename = "jsoncpp";
version = "0.6.0-rc2"; version = "1.6.0";
pkgname = "${basename}-src-${version}.tar.gz";
in in
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "${basename}-${version}"; name = "${basename}-${version}";
src = fetchurl { src = fetchurl {
url = "mirror://sourceforge/${basename}/${pkgname}"; url = "https://github.com/open-source-parsers/${basename}/archive/${version}.tar.gz";
sha256 = "10xj15nziqpwc6r3yznpb49wm4jqc5wakjsmj65v087mcg8r7lfl"; sha256 = "0ff1niks3y41gr6z13q9m391na70abqyi9rj4z3y2fz69cwm6sgz";
}; };
buildInputs = [ scons ]; nativeBuildInputs =
[
buildPhase = '' # cmake can be built with the system jsoncpp, or its own bundled version.
mkdir -p $out # Obviously we cannot build it against the system jsoncpp that doesn't yet exist, so
scons platform=linux-gcc check # we make a bootstrapping build with the bundled version.
''; (cmake.override { jsoncpp = null; })
python
installPhase = '' ];
cp -r include $out
cp -r libs/* $out/lib
'';
meta = { meta = {
homepage = http://jsoncpp.sourceforge.net; inherit version;
repositories.svn = svn://svn.code.sf.net/p/jsoncpp/code; homepage = https://github.com/open-source-parsers/jsoncpp;
description = "A simple API to manipulate JSON data in C++"; 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";
}; };
} }

5
pkgs/top-level/all-packages.nix
View File

@ -4910,9 +4910,7 @@ let
ctodo = callPackage ../applications/misc/ctodo { }; ctodo = callPackage ../applications/misc/ctodo { };
cmake = callPackage ../development/tools/build-managers/cmake { cmake = callPackage ../development/tools/build-managers/cmake { };
jsoncpp = jsoncpp-1_6;
};
cmakeCurses = cmake.override { useNcurses = true; }; cmakeCurses = cmake.override { useNcurses = true; };
@ -6072,7 +6070,6 @@ let
json_c = callPackage ../development/libraries/json-c { }; json_c = callPackage ../development/libraries/json-c { };
jsoncpp = callPackage ../development/libraries/jsoncpp { }; jsoncpp = callPackage ../development/libraries/jsoncpp { };
jsoncpp-1_6 = callPackage ../development/libraries/jsoncpp/1.6.nix { };
libjson = callPackage ../development/libraries/libjson { }; libjson = callPackage ../development/libraries/libjson { };