From c8e1acac2bc268795567a642f82c831cff852e2b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= <joerg@thalheim.io>
Date: Fri, 10 Nov 2023 13:14:06 +0100
Subject: [PATCH] rename luispkgs to nixpkgs-for-deal

---
 flake.lock                     | 34 +++++++++++++++++-----------------
 flake.nix                      |  2 +-
 pkgs/clan-cli/flake-module.nix |  4 +---
 3 files changed, 19 insertions(+), 21 deletions(-)

diff --git a/flake.lock b/flake.lock
index 0cdd6082..a89039e1 100644
--- a/flake.lock
+++ b/flake.lock
@@ -60,22 +60,6 @@
         "type": "github"
       }
     },
-    "luispkgs": {
-      "locked": {
-        "lastModified": 1699470058,
-        "narHash": "sha256-//c1SEENoNFEDtp8x5lokNxsU9lZjyNkEf5k3OJADTs=",
-        "owner": "Luis-Hebendanz",
-        "repo": "nixpkgs",
-        "rev": "842a157b727ad9712d41a80d1e1564e4e6bbe697",
-        "type": "github"
-      },
-      "original": {
-        "owner": "Luis-Hebendanz",
-        "ref": "fix_python_deal",
-        "repo": "nixpkgs",
-        "type": "github"
-      }
-    },
     "nixlib": {
       "locked": {
         "lastModified": 1693701915,
@@ -128,14 +112,30 @@
         "type": "github"
       }
     },
+    "nixpkgs-for-deal": {
+      "locked": {
+        "lastModified": 1699470058,
+        "narHash": "sha256-//c1SEENoNFEDtp8x5lokNxsU9lZjyNkEf5k3OJADTs=",
+        "owner": "Luis-Hebendanz",
+        "repo": "nixpkgs",
+        "rev": "842a157b727ad9712d41a80d1e1564e4e6bbe697",
+        "type": "github"
+      },
+      "original": {
+        "owner": "Luis-Hebendanz",
+        "ref": "fix_python_deal",
+        "repo": "nixpkgs",
+        "type": "github"
+      }
+    },
     "root": {
       "inputs": {
         "disko": "disko",
         "flake-parts": "flake-parts",
         "floco": "floco",
-        "luispkgs": "luispkgs",
         "nixos-generators": "nixos-generators",
         "nixpkgs": "nixpkgs",
+        "nixpkgs-for-deal": "nixpkgs-for-deal",
         "sops-nix": "sops-nix",
         "treefmt-nix": "treefmt-nix"
       }
diff --git a/flake.nix b/flake.nix
index cebc496b..28c3244d 100644
--- a/flake.nix
+++ b/flake.nix
@@ -8,7 +8,7 @@
     nixpkgs.url = "github:NixOS/nixpkgs/nixos-unstable-small";
     #nixpkgs.url = "github:NixOS/nixpkgs/nixos-unstable-small";
     # https://github.com/NixOS/nixpkgs/pull/265872
-    luispkgs.url = "github:Luis-Hebendanz/nixpkgs/fix_python_deal";
+    nixpkgs-for-deal.url = "github:Luis-Hebendanz/nixpkgs/fix_python_deal";
 
     floco.url = "github:aakropotkin/floco";
     floco.inputs.nixpkgs.follows = "nixpkgs";
diff --git a/pkgs/clan-cli/flake-module.nix b/pkgs/clan-cli/flake-module.nix
index 7b1e383a..9bcfc7dc 100644
--- a/pkgs/clan-cli/flake-module.nix
+++ b/pkgs/clan-cli/flake-module.nix
@@ -2,7 +2,6 @@
 {
   perSystem = { self', pkgs, system, ... }:
     let
-      luisPythonPkgs = inputs.luispkgs.legacyPackages.${system}.python3Packages;
       flakeLock = lib.importJSON (self + /flake.lock);
       flakeInputs = (builtins.removeAttrs inputs [ "self" ]);
       flakeLockVendoredDeps = flakeLock // {
@@ -37,8 +36,7 @@
         clan-cli = pkgs.python3.pkgs.callPackage ./default.nix {
           inherit (self'.packages) ui-assets;
           inherit (inputs) nixpkgs;
-          deal = luisPythonPkgs.deal;
-          schemathesis = luisPythonPkgs.schemathesis;
+          inherit (inputs.nixpkgs-for-deal.legacyPackages.${system}.python3Packages) deal schemathesis;
           clan-core-path = clanCoreWithVendoredDeps;
         };
         inherit (self'.packages.clan-cli) clan-openapi;