From 6dc461e2941facea15849c6ebdff34bc2d5dcf86 Mon Sep 17 00:00:00 2001
From: Guy Chronister <guychronister@outlook.com>
Date: Tue, 10 Jun 2025 22:03:36 +0000
Subject: [PATCH 1/2] potassco: Migrate to by-name

---
 .../potassco/clingcon.nix => by-name/cl/clingcon/package.nix} | 0
 .../potassco/clingo.nix => by-name/cl/clingo/package.nix}     | 0
 pkgs/top-level/all-packages.nix                               | 4 ----
 3 files changed, 4 deletions(-)
 rename pkgs/{applications/science/logic/potassco/clingcon.nix => by-name/cl/clingcon/package.nix} (100%)
 rename pkgs/{applications/science/logic/potassco/clingo.nix => by-name/cl/clingo/package.nix} (100%)

diff --git a/pkgs/applications/science/logic/potassco/clingcon.nix b/pkgs/by-name/cl/clingcon/package.nix
similarity index 100%
rename from pkgs/applications/science/logic/potassco/clingcon.nix
rename to pkgs/by-name/cl/clingcon/package.nix
diff --git a/pkgs/applications/science/logic/potassco/clingo.nix b/pkgs/by-name/cl/clingo/package.nix
similarity index 100%
rename from pkgs/applications/science/logic/potassco/clingo.nix
rename to pkgs/by-name/cl/clingo/package.nix
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index b49bb3710bbe..90f99db48cb2 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -2029,10 +2029,6 @@ with pkgs;
 
   cloud-init = callPackage ../tools/virtualization/cloud-init { inherit systemd; };
 
-  clingo = callPackage ../applications/science/logic/potassco/clingo.nix { };
-
-  clingcon = callPackage ../applications/science/logic/potassco/clingcon.nix { };
-
   coloredlogs = with python3Packages; toPythonApplication coloredlogs;
 
   czkawka-full = czkawka.wrapper.override {

From 221fbe69e16edd915d9029d238f51048215f5793 Mon Sep 17 00:00:00 2001
From: Guy Chronister <guychronister@outlook.com>
Date: Tue, 10 Jun 2025 22:34:02 +0000
Subject: [PATCH 2/2] potassco: refactor rev to tag and switch to finalAttrs

potassco: add finalAttrs.version

potassco: hardcode repo name
---
 pkgs/by-name/cl/clingcon/package.nix | 10 +++++-----
 pkgs/by-name/cl/clingo/package.nix   |  6 +++---
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/pkgs/by-name/cl/clingcon/package.nix b/pkgs/by-name/cl/clingcon/package.nix
index 33521fc0248d..53d0cbdd2a9c 100644
--- a/pkgs/by-name/cl/clingcon/package.nix
+++ b/pkgs/by-name/cl/clingcon/package.nix
@@ -7,14 +7,14 @@
   catch2,
 }:
 
-stdenv.mkDerivation rec {
+stdenv.mkDerivation (finalAttrs: {
   pname = "clingcon";
   version = "5.2.1";
 
   src = fetchFromGitHub {
     owner = "potassco";
-    repo = pname;
-    rev = "v${version}";
+    repo = "clingcon";
+    tag = "v${finalAttrs.version}";
     sha256 = "sha256-R2kgcw8VUwhOdvPXnsahT5gnoUd5DXLqfdH++8rFoAA=";
   };
 
@@ -42,6 +42,6 @@ stdenv.mkDerivation rec {
     platforms = lib.platforms.unix;
     homepage = "https://potassco.org/";
     downloadPage = "https://github.com/potassco/clingcon/releases/";
-    changelog = "https://github.com/potassco/clingcon/releases/tag/v${version}";
+    changelog = "https://github.com/potassco/clingcon/releases/tag/v${finalAttrs.version}";
   };
-}
+})
diff --git a/pkgs/by-name/cl/clingo/package.nix b/pkgs/by-name/cl/clingo/package.nix
index bc799bf8ba04..28474d20c47f 100644
--- a/pkgs/by-name/cl/clingo/package.nix
+++ b/pkgs/by-name/cl/clingo/package.nix
@@ -5,14 +5,14 @@
   cmake,
 }:
 
-stdenv.mkDerivation rec {
+stdenv.mkDerivation (finalAttrs: {
   pname = "clingo";
   version = "5.8.0";
 
   src = fetchFromGitHub {
     owner = "potassco";
     repo = "clingo";
-    rev = "v${version}";
+    tag = "v${finalAttrs.version}";
     sha256 = "sha256-VhfWGAcrq4aN5Tgz84v7vLOWexsA89vRaang58SXVyI=";
   };
 
@@ -28,4 +28,4 @@ stdenv.mkDerivation rec {
     homepage = "https://potassco.org/";
     downloadPage = "https://github.com/potassco/clingo/releases/";
   };
-}
+})