about summary refs log tree commit diff
path: root/pkgs/development/tools/misc/coccinelle/default.nix
diff options
context:
space:
mode:
Diffstat (limited to 'pkgs/development/tools/misc/coccinelle/default.nix')
-rw-r--r--pkgs/development/tools/misc/coccinelle/default.nix57
1 files changed, 6 insertions, 51 deletions
diff --git a/pkgs/development/tools/misc/coccinelle/default.nix b/pkgs/development/tools/misc/coccinelle/default.nix
index 6eca9b7f8fa9e..5e97e8486a63b 100644
--- a/pkgs/development/tools/misc/coccinelle/default.nix
+++ b/pkgs/development/tools/misc/coccinelle/default.nix
@@ -1,67 +1,22 @@
 { stdenv
 , lib
 , fetchFromGitHub
-, fetchpatch
 , ocamlPackages
 , pkg-config
 , autoreconfHook
 }:
 
-stdenv.mkDerivation rec {
+stdenv.mkDerivation (finalAttrs: {
   pname = "coccinelle";
-  version = "1.1.1";
+  version = "1.2";
 
   src = fetchFromGitHub {
-    repo = pname;
-    rev = version;
+    repo = "coccinelle";
+    rev = finalAttrs.version;
     owner = "coccinelle";
-    hash = "sha256-rS9Ktp/YcXF0xUtT4XZtH5F9huvde0vRztY7vGtyuqY=";
+    hash = "sha256-v51KQLMJENLrlstCsP3DAuJJFMyjFyOZPJ7cRW5ovws=";
   };
 
-  patches = [
-    # Fix data path lookup.
-    # https://github.com/coccinelle/coccinelle/pull/270
-    (fetchpatch {
-      url = "https://github.com/coccinelle/coccinelle/commit/540888ff426e0b1f7907b63ce26e712d1fc172cc.patch";
-      sha256 = "sha256-W8RNIWDAC3lQ5bG+gD50r7x919JIcZRpt3QSOSMWpW4=";
-    })
-
-    # Fix attaching code before declarations.
-    # https://github.com/coccinelle/coccinelle/issues/282
-    (fetchpatch {
-      url = "https://github.com/coccinelle/coccinelle/commit/cd33db143416d820f547bf5869482cfcfc0ea9d0.patch";
-      sha256 = "q7wbxbB9Ob0fSJwCjRtDPO3Xg4RO9yrQZG9G0/LGunI=";
-    })
-
-    # Fix attaching declaration metavariables.
-    # https://github.com/coccinelle/coccinelle/issues/281
-    (fetchpatch {
-      url = "https://github.com/coccinelle/coccinelle/commit/df71c5c0fe2a73c7358f73f45a550b57a7e30d85.patch";
-      sha256 = "qrYfligJnXP7J5G/hfzyaKg9aFn74VExtc/Rs/DI2gc=";
-    })
-
-    # Support GLib’s autocleanup macros.
-    # https://github.com/coccinelle/coccinelle/issues/275
-    (fetchpatch {
-      url = "https://github.com/coccinelle/coccinelle/commit/6d5602aca8775c3c5c503939c3dcf0637649d09b.patch";
-      sha256 = "NACf8joOOvN32H/sIfI+oqiT3289zXXQVVfXbRfbIe8=";
-    })
-
-    # Exit with non-zero status on failure.
-    (fetchpatch {
-      url = "https://github.com/coccinelle/coccinelle/commit/6c0a855af14d41864e1e522b93dc39646a3b83c7.patch";
-      sha256 = "6yfK8arB0GDW7o4cXsv0Y9TMvqgGf3/P1ebXrFFUC80=";
-    })
-    (fetchpatch {
-      url = "https://github.com/coccinelle/coccinelle/commit/5448bb2bd03491ffec356bf7bd6ddcdbf4d36bc9.patch";
-      sha256 = "fyyxw2BNZUpyLBieIhOKeWbLFGP1tjULH70w/hU+jKw=";
-    })
-    (fetchpatch {
-      url = "https://github.com/coccinelle/coccinelle/commit/b8b1937657765e991195a10fcd7b8f7a300fc60b.patch";
-      sha256 = "ergWJF6BKrhmJhx1aiVYDHztgjaQvaJ5iZRAmC9i22s=";
-    })
-  ];
-
   nativeBuildInputs = with ocamlPackages; [
     autoreconfHook
     pkg-config
@@ -105,4 +60,4 @@ stdenv.mkDerivation rec {
     platforms = lib.platforms.unix;
     maintainers = [ lib.maintainers.thoughtpolice ];
   };
-}
+})