From ec61a9ea5a83bf5ccabf6233a139777a068f567a Mon Sep 17 00:00:00 2001
From: Austin Seipp <aseipp@pobox.com>
Date: Thu, 8 Jan 2015 04:16:02 -0600
Subject: [PATCH] nixpkgs: coccinelle 1.0.0-rc15 -> 1.0.0-rc23, and adopt

Signed-off-by: Austin Seipp <aseipp@pobox.com>
---
 .../tools/misc/coccinelle/default.nix         | 44 ++++++++-----------
 1 file changed, 19 insertions(+), 25 deletions(-)

diff --git a/pkgs/development/tools/misc/coccinelle/default.nix b/pkgs/development/tools/misc/coccinelle/default.nix
index 3ec898e04598..f21808d28f7c 100644
--- a/pkgs/development/tools/misc/coccinelle/default.nix
+++ b/pkgs/development/tools/misc/coccinelle/default.nix
@@ -1,16 +1,12 @@
 { fetchurl, stdenv, python, ncurses, ocamlPackages, pkgconfig, makeWrapper }:
 
-let
-
-  name = "coccinelle-1.0.0-rc15";
-  sha256 = "07fab4e17512925b958890bb13c0809797074f2e44a1107b0074bdcc156b9596";
-
-in stdenv.mkDerivation {
-  inherit name;
+stdenv.mkDerivation rec {
+  name    = "coccinelle-${version}";
+  version = "1.0.0-rc23";
 
   src = fetchurl {
     url = "http://coccinelle.lip6.fr/distrib/${name}.tgz";
-    inherit sha256;
+    sha256 = "1qrd4kr3wc0hm4l60fwn19iwzwqcjsx85mm3k4gm3cdhljjma82p";
   };
 
   buildInputs = with ocamlPackages; [
@@ -38,25 +34,23 @@ in stdenv.mkDerivation {
 
   meta = {
     description = "Program to apply semantic patches to C code";
-
-    longDescription =
-      '' Coccinelle is a program matching and transformation engine which
-         provides the language SmPL (Semantic Patch Language) for specifying
-         desired matches and transformations in C code.  Coccinelle was
-         initially targeted towards performing collateral evolutions in
-         Linux.  Such evolutions comprise the changes that are needed in
-         client code in response to evolutions in library APIs, and may
-         include modifications such as renaming a function, adding a function
-         argument whose value is somehow context-dependent, and reorganizing
-         a data structure.  Beyond collateral evolutions, Coccinelle is
-         successfully used (by us and others) for finding and fixing bugs in
-         systems code.
-      '';
+    longDescription = ''
+      Coccinelle is a program matching and transformation engine which
+      provides the language SmPL (Semantic Patch Language) for
+      specifying desired matches and transformations in C code.
+      Coccinelle was initially targeted towards performing collateral
+      evolutions in Linux.  Such evolutions comprise the changes that
+      are needed in client code in response to evolutions in library
+      APIs, and may include modifications such as renaming a function,
+      adding a function argument whose value is somehow
+      context-dependent, and reorganizing a data structure.  Beyond
+      collateral evolutions, Coccinelle is successfully used (by us
+      and others) for finding and fixing bugs in systems code.
+    '';
 
     homepage = http://coccinelle.lip6.fr/;
     license = stdenv.lib.licenses.gpl2;
-
-    maintainers = [ ];
-    platforms = stdenv.lib.platforms.gnu;  # arbitrary choice
+    platforms = stdenv.lib.platforms.unix;
+    maintainers = [ stdenv.lib.maintainers.thoughtpolice ];
   };
 }