From 9cb46bf1cdc53acb771ef1c82a1dc9e95bf96a8d Mon Sep 17 00:00:00 2001
From: Qubasa <consulting@qube.email>
Date: Mon, 6 Nov 2023 17:35:09 +0100
Subject: [PATCH] Flake: Added python package deal as dependency

---
 flake.lock                     | 17 +++++++++++++++++
 flake.nix                      |  3 +++
 pkgs/clan-cli/default.nix      |  2 ++
 pkgs/clan-cli/flake-module.nix |  3 ++-
 4 files changed, 24 insertions(+), 1 deletion(-)

diff --git a/flake.lock b/flake.lock
index 26bd6815..06a001f2 100644
--- a/flake.lock
+++ b/flake.lock
@@ -60,6 +60,22 @@
         "type": "github"
       }
     },
+    "luispkgs": {
+      "locked": {
+        "lastModified": 1699286483,
+        "narHash": "sha256-gzY56MbP3UTztI7Ra69RCNq81fKlsQu79LZ2gGss3Eg=",
+        "owner": "Luis-Hebendanz",
+        "repo": "nixpkgs",
+        "rev": "b59438a5a3b4d50e117081d41ed6f8833f65934d",
+        "type": "github"
+      },
+      "original": {
+        "owner": "Luis-Hebendanz",
+        "ref": "fix_python_deal",
+        "repo": "nixpkgs",
+        "type": "github"
+      }
+    },
     "nixlib": {
       "locked": {
         "lastModified": 1693701915,
@@ -117,6 +133,7 @@
         "disko": "disko",
         "flake-parts": "flake-parts",
         "floco": "floco",
+        "luispkgs": "luispkgs",
         "nixos-generators": "nixos-generators",
         "nixpkgs": "nixpkgs",
         "sops-nix": "sops-nix",
diff --git a/flake.nix b/flake.nix
index 5175410f..a222e4f7 100644
--- a/flake.nix
+++ b/flake.nix
@@ -6,6 +6,9 @@
 
   inputs = {
     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";
     floco.url = "github:aakropotkin/floco";
     floco.inputs.nixpkgs.follows = "nixpkgs";
     disko.url = "github:nix-community/disko";
diff --git a/pkgs/clan-cli/default.nix b/pkgs/clan-cli/default.nix
index 8fcca79d..9cf55b12 100644
--- a/pkgs/clan-cli/default.nix
+++ b/pkgs/clan-cli/default.nix
@@ -35,6 +35,7 @@
 , e2fsprogs
 , mypy
 , cntr
+, deal
 }:
 let
 
@@ -56,6 +57,7 @@ let
     git
     gnupg
     stdenv.cc
+    deal
   ];
 
   # Optional dependencies for clan cli, we re-expose them here to make sure they all build.
diff --git a/pkgs/clan-cli/flake-module.nix b/pkgs/clan-cli/flake-module.nix
index 2f912d0a..afba1380 100644
--- a/pkgs/clan-cli/flake-module.nix
+++ b/pkgs/clan-cli/flake-module.nix
@@ -1,6 +1,6 @@
 { inputs, ... }:
 {
-  perSystem = { self', pkgs, ... }: {
+  perSystem = { self', pkgs, system, ... }: {
     devShells.clan-cli = pkgs.callPackage ./shell.nix {
       inherit (self'.packages) clan-cli ui-assets nix-unit;
     };
@@ -8,6 +8,7 @@
       clan-cli = pkgs.python3.pkgs.callPackage ./default.nix {
         inherit (self'.packages) ui-assets;
         inherit (inputs) nixpkgs;
+        deal = inputs.luispkgs.legacyPackages.${system}.python3Packages.deal;
       };
       inherit (self'.packages.clan-cli) clan-openapi;
       default = self'.packages.clan-cli;