From 02124bbb7ea70ecec0add1a0036abf0c6127298c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= <sandro.jaeckel@gmail.com>
Date: Wed, 15 Feb 2023 21:41:18 +0100
Subject: [PATCH 1/4] rsstail: don't run cppcheck linter, little cleanup

---
 .../networking/feedreaders/rsstail/default.nix     | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/pkgs/applications/networking/feedreaders/rsstail/default.nix b/pkgs/applications/networking/feedreaders/rsstail/default.nix
index 1cd83cda77a9..af2dbd1a9a4f 100644
--- a/pkgs/applications/networking/feedreaders/rsstail/default.nix
+++ b/pkgs/applications/networking/feedreaders/rsstail/default.nix
@@ -1,18 +1,17 @@
-{ lib, stdenv, fetchFromGitHub, cppcheck, libmrss, libiconv }:
+{ lib, stdenv, fetchFromGitHub, libmrss, libiconv }:
 
 stdenv.mkDerivation {
   pname = "rsstail";
   version = "2.1";
 
   src = fetchFromGitHub {
-    sha256 = "12p69i3g1fwlw0bds9jqsdmzkid3k5a41w31d227i7vm12wcvjf6";
-    rev = "6f2436185372b3f945a4989406c4b6a934fe8a95";
-    repo = "rsstail";
     owner = "folkertvanheusden";
+    repo = "rsstail";
+    rev = "6f2436185372b3f945a4989406c4b6a934fe8a95";
+    sha256 = "12p69i3g1fwlw0bds9jqsdmzkid3k5a41w31d227i7vm12wcvjf6";
   };
 
   buildInputs = [ libmrss ] ++ lib.optionals stdenv.isDarwin [ libiconv ];
-  nativeCheckInputs = [ cppcheck ];
 
   postPatch = ''
     substituteInPlace Makefile --replace -liconv_hook ""
@@ -21,7 +20,8 @@ stdenv.mkDerivation {
   makeFlags = [ "prefix=$(out)" ];
   enableParallelBuilding = true;
 
-  doCheck = true;
+  # just runs cppcheck linter
+  doCheck = false;
 
   meta = with lib; {
     description = "Monitor RSS feeds for new entries";
@@ -29,7 +29,7 @@ stdenv.mkDerivation {
       RSSTail is more or less an RSS reader: it monitors an RSS feed and if it
       detects a new entry it'll emit only that new entry.
     '';
-    homepage = "http://www.vanheusden.com/rsstail/";
+    homepage = "https://www.vanheusden.com/rsstail/";
     license = licenses.gpl2Plus;
     maintainers = [ maintainers.Necior ];
     platforms = platforms.unix;

From e4c2a7ceb39d2adf3892dd06a62cf0b10079ebde Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= <sandro.jaeckel@gmail.com>
Date: Wed, 15 Feb 2023 22:02:37 +0100
Subject: [PATCH 2/4] sqlitecpp: don't run cppcheck linter

---
 pkgs/development/libraries/sqlitecpp/default.nix | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/sqlitecpp/default.nix b/pkgs/development/libraries/sqlitecpp/default.nix
index f4b2ee9e9a95..aad1ee34e5c4 100644
--- a/pkgs/development/libraries/sqlitecpp/default.nix
+++ b/pkgs/development/libraries/sqlitecpp/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, fetchFromGitHub, cmake, sqlite, cppcheck, gtest }:
+{ lib, stdenv, fetchFromGitHub, cmake, sqlite, gtest }:
 
 stdenv.mkDerivation rec {
   pname = "sqlitecpp";
@@ -12,7 +12,6 @@ stdenv.mkDerivation rec {
   };
 
   nativeBuildInputs = [ cmake ];
-  nativeCheckInputs = [ cppcheck ];
   buildInputs = [ sqlite gtest ];
   doCheck = true;
 

From 2f97cda1f8108ed2d7a5b43ca47c758831fc800e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= <sandro.jaeckel@gmail.com>
Date: Wed, 15 Feb 2023 22:12:24 +0100
Subject: [PATCH 3/4] freeorion: use boost that builds with python3, remove
 cppcheck linter

---
 pkgs/games/freeorion/default.nix | 10 ++++------
 1 file changed, 4 insertions(+), 6 deletions(-)

diff --git a/pkgs/games/freeorion/default.nix b/pkgs/games/freeorion/default.nix
index 5b4407038015..9f9075d75a4d 100644
--- a/pkgs/games/freeorion/default.nix
+++ b/pkgs/games/freeorion/default.nix
@@ -5,8 +5,7 @@
 , doxygen
 , graphviz
 , makeWrapper
-, cppcheck
-, boost16x
+, boost17x
 , SDL2
 , python3
 , freetype
@@ -24,8 +23,8 @@
 }:
 
 stdenv.mkDerivation rec {
-  version = "0.4.10.2";
   pname = "freeorion";
+  version = "0.4.10.2";
 
   src = fetchFromGitHub {
     owner = "freeorion";
@@ -35,7 +34,7 @@ stdenv.mkDerivation rec {
   };
 
   buildInputs = [
-    (boost16x.override { enablePython = true; python = python3; })
+    (boost17x.override { enablePython = true; python = python3; })
     (python3.withPackages (p: with p; [ pycodestyle ]))
     SDL2
     freetype
@@ -53,7 +52,6 @@ stdenv.mkDerivation rec {
 
   nativeBuildInputs = [
     cmake
-    cppcheck
     doxygen
     graphviz
     makeWrapper
@@ -81,7 +79,7 @@ stdenv.mkDerivation rec {
 
   meta = with lib; {
     description = "A free, open source, turn-based space empire and galactic conquest (4X) computer game";
-    homepage = "http://www.freeorion.org";
+    homepage = "https://www.freeorion.org/";
     license = with licenses; [ gpl2 cc-by-sa-30 ];
     platforms = platforms.linux;
     maintainers = with maintainers; [ tex ];

From d382e6d1bdd91581a766f05f393b5d8c2e1fb05d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= <sandro.jaeckel@gmail.com>
Date: Wed, 15 Feb 2023 23:38:17 +0100
Subject: [PATCH 4/4] migraphx: remove cppcheck linter

---
 pkgs/development/libraries/migraphx/default.nix | 2 --
 1 file changed, 2 deletions(-)

diff --git a/pkgs/development/libraries/migraphx/default.nix b/pkgs/development/libraries/migraphx/default.nix
index 27caa1f94137..15581e00e528 100644
--- a/pkgs/development/libraries/migraphx/default.nix
+++ b/pkgs/development/libraries/migraphx/default.nix
@@ -7,7 +7,6 @@
 , rocm-cmake
 , hip
 , clang-tools-extra
-, cppcheck
 , openmp
 , rocblas
 , rocmlir
@@ -70,7 +69,6 @@ in stdenv.mkDerivation (finalAttrs: {
     rocm-cmake
     hip
     clang-tools-extra
-    cppcheck
     python3Packages.python
   ] ++ lib.optionals buildDocs [
     latex