From fe5219cf42fdd3814cb3311a3e997aa42c48fbf1 Mon Sep 17 00:00:00 2001
From: Weijia Wang <9713184+wegank@users.noreply.github.com>
Date: Wed, 6 Nov 2024 01:24:23 +0100
Subject: [PATCH 1/2] quickder: move to pkgs/by-name, reformat

---
 .../qu/quickder/package.nix}                  | 40 ++++++++++---------
 pkgs/top-level/all-packages.nix               |  2 -
 2 files changed, 21 insertions(+), 21 deletions(-)
 rename pkgs/{development/libraries/quickder/default.nix => by-name/qu/quickder/package.nix} (72%)

diff --git a/pkgs/development/libraries/quickder/default.nix b/pkgs/by-name/qu/quickder/package.nix
similarity index 72%
rename from pkgs/development/libraries/quickder/default.nix
rename to pkgs/by-name/qu/quickder/package.nix
index c3de38398084..4e66ebf5f360 100644
--- a/pkgs/development/libraries/quickder/default.nix
+++ b/pkgs/by-name/qu/quickder/package.nix
@@ -1,14 +1,15 @@
-{ lib
-, stdenv
-, fetchFromGitLab
-, python3
-, cmake
-, doxygen
-, graphviz
-, quickmem
-, arpa2common
-, arpa2cm
-, ensureNewerSourcesForZipFilesHook
+{
+  lib,
+  stdenv,
+  fetchFromGitLab,
+  python3,
+  cmake,
+  doxygen,
+  graphviz,
+  quickmem,
+  arpa2common,
+  arpa2cm,
+  ensureNewerSourcesForZipFilesHook,
 }:
 
 stdenv.mkDerivation rec {
@@ -32,17 +33,18 @@ stdenv.mkDerivation rec {
   buildInputs = [
     arpa2cm
     arpa2common
-    (python3.withPackages (ps: with ps; [
-      asn1ate
-      colored
-      pyparsing
-      setuptools
-      six
-    ]))
+    (python3.withPackages (
+      ps: with ps; [
+        asn1ate
+        colored
+        pyparsing
+        setuptools
+        six
+      ]
+    ))
     quickmem
   ];
 
-
   postPatch = ''
     substituteInPlace setup.py --replace 'pyparsing==' 'pyparsing>='
   '';
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 8cc0cbc90f96..945ab085d9c5 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -22489,8 +22489,6 @@ with pkgs;
 
   quesoglc = callPackage ../development/libraries/quesoglc { };
 
-  quickder = callPackage ../development/libraries/quickder { };
-
   quickmem = callPackage ../development/libraries/quickmem { };
 
   quicksynergy = callPackage ../applications/misc/quicksynergy { };

From a26b3a3bc27a3e05e9cf0e78f1038539ae1b95f3 Mon Sep 17 00:00:00 2001
From: Weijia Wang <9713184+wegank@users.noreply.github.com>
Date: Wed, 6 Nov 2024 01:27:17 +0100
Subject: [PATCH 2/2] quickder: pin pyparsing to 3.1.2

---
 pkgs/by-name/qu/quickder/package.nix | 23 ++++++++++++++++++++++-
 1 file changed, 22 insertions(+), 1 deletion(-)

diff --git a/pkgs/by-name/qu/quickder/package.nix b/pkgs/by-name/qu/quickder/package.nix
index 4e66ebf5f360..981fa635a30b 100644
--- a/pkgs/by-name/qu/quickder/package.nix
+++ b/pkgs/by-name/qu/quickder/package.nix
@@ -1,6 +1,7 @@
 {
   lib,
   stdenv,
+  fetchFromGitHub,
   fetchFromGitLab,
   python3,
   cmake,
@@ -12,6 +13,26 @@
   ensureNewerSourcesForZipFilesHook,
 }:
 
+let
+  python =
+    let
+      packageOverrides = self: super: {
+        pyparsing = super.pyparsing.overridePythonAttrs (old: rec {
+          version = "3.1.2";
+          src = fetchFromGitHub {
+            owner = "pyparsing";
+            repo = "pyparsing";
+            rev = "refs/tags/${version}";
+            hash = "sha256-0B8DjO4kLgvt4sYsk8CZI+5icdKy73XE2tWeqVLqO5A=";
+          };
+        });
+      };
+    in
+    python3.override {
+      inherit packageOverrides;
+      self = python;
+    };
+in
 stdenv.mkDerivation rec {
   pname = "quickder";
   version = "1.7.1";
@@ -33,7 +54,7 @@ stdenv.mkDerivation rec {
   buildInputs = [
     arpa2cm
     arpa2common
-    (python3.withPackages (
+    (python.withPackages (
       ps: with ps; [
         asn1ate
         colored