From 143aa5aa17cfb80758951ba79deb5beef455c8f3 Mon Sep 17 00:00:00 2001
From: Thomas Tuegel <ttuegel@gmail.com>
Date: Sun, 22 Mar 2015 17:04:53 -0500
Subject: [PATCH] remove jsoncpp-0.6.0-rc2

---
 pkgs/development/libraries/jsoncpp/1.6.nix    | 31 ----------------
 .../development/libraries/jsoncpp/default.nix | 37 +++++++++----------
 pkgs/top-level/all-packages.nix               |  5 +--
 3 files changed, 19 insertions(+), 54 deletions(-)
 delete mode 100644 pkgs/development/libraries/jsoncpp/1.6.nix

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";
   };
 }
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 30f787041160..e23c22f9c57a 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -4910,9 +4910,7 @@ let
 
   ctodo = callPackage ../applications/misc/ctodo { };
 
-  cmake = callPackage ../development/tools/build-managers/cmake {
-    jsoncpp = jsoncpp-1_6;
-  };
+  cmake = callPackage ../development/tools/build-managers/cmake { };
 
   cmakeCurses = cmake.override { useNcurses = true; };
 
@@ -6072,7 +6070,6 @@ let
   json_c = callPackage ../development/libraries/json-c { };
 
   jsoncpp = callPackage ../development/libraries/jsoncpp { };
-  jsoncpp-1_6 = callPackage ../development/libraries/jsoncpp/1.6.nix { };
 
   libjson = callPackage ../development/libraries/libjson { };