From 095bce73ea057ac592871adf6910a4bcb6787806 Mon Sep 17 00:00:00 2001
From: Mutsuha Asada <me@momee.mt>
Date: Sun, 22 Sep 2024 22:20:07 +0900
Subject: [PATCH 1/3] smatch: modernize derivation - Removed `rec` - Removed
 `with lib;`

---
 .../tools/analysis/smatch/default.nix            | 16 +++++++++-------
 1 file changed, 9 insertions(+), 7 deletions(-)

diff --git a/pkgs/development/tools/analysis/smatch/default.nix b/pkgs/development/tools/analysis/smatch/default.nix
index ef5b3ab2d1d5..e6e92cc96041 100644
--- a/pkgs/development/tools/analysis/smatch/default.nix
+++ b/pkgs/development/tools/analysis/smatch/default.nix
@@ -9,10 +9,12 @@
 , libllvm
 , libxml2
 }:
-
-stdenv.mkDerivation rec {
-  pname = "smatch";
+let
   version = "1.73";
+in
+stdenv.mkDerivation {
+  pname = "smatch";
+  inherit version;
 
   src = fetchFromGitHub {
     owner = "error27";
@@ -33,11 +35,11 @@ stdenv.mkDerivation rec {
 
   makeFlags = [ "PREFIX=${placeholder "out"}" "CXX=${stdenv.cc.targetPrefix}c++" ];
 
-  meta = with lib; {
+  meta = {
     description = "Semantic analysis tool for C";
     homepage = "https://sparse.docs.kernel.org/";
-    maintainers = [ ];
-    license = licenses.gpl2Plus;
-    platforms = platforms.all;
+    maintainers = with lib.maintainers; [ momeemt ];
+    license = lib.licenses.gpl2Plus;
+    platforms = lib.platforms.all;
   };
 }

From 5b6dbd8eda210d22c900d33d8359c043d3728399 Mon Sep 17 00:00:00 2001
From: Mutsuha Asada <me@momee.mt>
Date: Sun, 22 Sep 2024 22:20:34 +0900
Subject: [PATCH 2/3] smatch: formatted via nixfmt-rfc-style

---
 .../tools/analysis/smatch/default.nix         | 33 +++++++++++--------
 1 file changed, 19 insertions(+), 14 deletions(-)

diff --git a/pkgs/development/tools/analysis/smatch/default.nix b/pkgs/development/tools/analysis/smatch/default.nix
index e6e92cc96041..6acf05652319 100644
--- a/pkgs/development/tools/analysis/smatch/default.nix
+++ b/pkgs/development/tools/analysis/smatch/default.nix
@@ -1,13 +1,14 @@
-{ lib
-, stdenv
-, fetchFromGitHub
-, pkg-config
-, sqlite
-, openssl
-, buildllvmsparse ? false
-, buildc2xml ? false
-, libllvm
-, libxml2
+{
+  lib,
+  stdenv,
+  fetchFromGitHub,
+  pkg-config,
+  sqlite,
+  openssl,
+  buildllvmsparse ? false,
+  buildc2xml ? false,
+  libllvm,
+  libxml2,
 }:
 let
   version = "1.73";
@@ -29,11 +30,15 @@ stdenv.mkDerivation {
 
   nativeBuildInputs = [ pkg-config ];
 
-  buildInputs = [ sqlite openssl ]
-    ++ lib.optionals buildllvmsparse [ libllvm ]
-    ++ lib.optionals buildc2xml [ libxml2.dev ];
+  buildInputs = [
+    sqlite
+    openssl
+  ] ++ lib.optionals buildllvmsparse [ libllvm ] ++ lib.optionals buildc2xml [ libxml2.dev ];
 
-  makeFlags = [ "PREFIX=${placeholder "out"}" "CXX=${stdenv.cc.targetPrefix}c++" ];
+  makeFlags = [
+    "PREFIX=${placeholder "out"}"
+    "CXX=${stdenv.cc.targetPrefix}c++"
+  ];
 
   meta = {
     description = "Semantic analysis tool for C";

From 75901da793b398f87eeb62ddb92eb8bed461956c Mon Sep 17 00:00:00 2001
From: Mutsuha Asada <me@momee.mt>
Date: Sun, 22 Sep 2024 22:21:39 +0900
Subject: [PATCH 3/3] smatch: move to by-name

---
 .../smatch/default.nix => by-name/sm/smatch/package.nix}        | 0
 pkgs/top-level/all-packages.nix                                 | 2 --
 2 files changed, 2 deletions(-)
 rename pkgs/{development/tools/analysis/smatch/default.nix => by-name/sm/smatch/package.nix} (100%)

diff --git a/pkgs/development/tools/analysis/smatch/default.nix b/pkgs/by-name/sm/smatch/package.nix
similarity index 100%
rename from pkgs/development/tools/analysis/smatch/default.nix
rename to pkgs/by-name/sm/smatch/package.nix
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 587c69d8ed05..2c8f4e00ee95 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -18630,8 +18630,6 @@ with pkgs;
 
   sloc = nodePackages.sloc;
 
-  smatch = callPackage ../development/tools/analysis/smatch { };
-
   smc = callPackage ../tools/misc/smc { };
 
   snakemake = callPackage ../applications/science/misc/snakemake { };