From a035b224431261f45b12092aa3124778c645c428 Mon Sep 17 00:00:00 2001
From: Sam Willcocks <sam@wlcx.cc>
Date: Thu, 13 Mar 2025 17:27:36 +0000
Subject: [PATCH 1/2] cannelloni: 1.1.0 -> 1.2.0

---
 pkgs/by-name/ca/cannelloni/package.nix | 15 ++++++++++++---
 1 file changed, 12 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/ca/cannelloni/package.nix b/pkgs/by-name/ca/cannelloni/package.nix
index d86ea862d935..b0e5a9395a8e 100644
--- a/pkgs/by-name/ca/cannelloni/package.nix
+++ b/pkgs/by-name/ca/cannelloni/package.nix
@@ -5,16 +5,18 @@
   cmake,
   lksctp-tools,
   sctpSupport ? true,
+  versionCheckHook,
+  nix-update-script,
 }:
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "cannelloni";
-  version = "1.1.0";
+  version = "1.2.0";
   src = fetchFromGitHub {
     owner = "mguentner";
     repo = "cannelloni";
-    rev = "v${finalAttrs.version}";
-    hash = "sha256-pAXHo9NCXMFKYcIJogytBiPkQE0nK6chU5TKiDNCKA8=";
+    tag = "v${finalAttrs.version}";
+    hash = "sha256-Qvmb3w0yv5BQqS/taV7BbZxjvcmWlHsdnzk00a6G1ZU=";
   };
 
   nativeBuildInputs = [
@@ -27,6 +29,13 @@ stdenv.mkDerivation (finalAttrs: {
     "-DSCTP_SUPPORT=${lib.boolToString sctpSupport}"
   ];
 
+  nativeInstallInputs = [
+    versionCheckHook
+  ];
+  doInstallCheck = true;
+
+  passthru.updateScript = nix-update-script { };
+
   meta = with lib; {
     description = "SocketCAN over Ethernet tunnel";
     mainProgram = "cannelloni";

From 79c054fa294fc8dcbd2fc31a8952d91ffd01463e Mon Sep 17 00:00:00 2001
From: Sam Willcocks <sam@wlcx.cc>
Date: Thu, 13 Mar 2025 17:43:25 +0000
Subject: [PATCH 2/2] cannelloni: 1.2.0 -> 1.2.1

---
 pkgs/by-name/ca/cannelloni/package.nix | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/pkgs/by-name/ca/cannelloni/package.nix b/pkgs/by-name/ca/cannelloni/package.nix
index b0e5a9395a8e..ad67a463313a 100644
--- a/pkgs/by-name/ca/cannelloni/package.nix
+++ b/pkgs/by-name/ca/cannelloni/package.nix
@@ -11,12 +11,12 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "cannelloni";
-  version = "1.2.0";
+  version = "1.2.1";
   src = fetchFromGitHub {
     owner = "mguentner";
     repo = "cannelloni";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-Qvmb3w0yv5BQqS/taV7BbZxjvcmWlHsdnzk00a6G1ZU=";
+    hash = "sha256-dhrB3qg/ljAP7nX+WpX+g7HaUEGj5pTPdDhY2Mi7pUo=";
   };
 
   nativeBuildInputs = [
@@ -36,12 +36,12 @@ stdenv.mkDerivation (finalAttrs: {
 
   passthru.updateScript = nix-update-script { };
 
-  meta = with lib; {
+  meta = {
     description = "SocketCAN over Ethernet tunnel";
     mainProgram = "cannelloni";
     homepage = "https://github.com/mguentner/cannelloni";
-    platforms = platforms.linux;
-    license = licenses.gpl2Only;
-    maintainers = [ maintainers.samw ];
+    platforms = lib.platforms.linux;
+    license = lib.licenses.gpl2Only;
+    maintainers = [ lib.maintainers.samw ];
   };
 })