From 7f9ced7bfd6faa2db58bb809bbae8b1054f491e3 Mon Sep 17 00:00:00 2001
From: shadeyg56 <31134255+shadeyg56@users.noreply.github.com>
Date: Wed, 4 Oct 2023 04:51:54 -0500
Subject: [PATCH] nix: replace local derivation with nixpkgs derivation (#572)

---
 flake.lock                             |  6 +++---
 nix/default.nix                        |  8 +-------
 nix/pkgs/setuptools-git-versioning.nix | 11 -----------
 3 files changed, 4 insertions(+), 21 deletions(-)
 delete mode 100644 nix/pkgs/setuptools-git-versioning.nix

diff --git a/flake.lock b/flake.lock
index 12a3286e..53422db9 100644
--- a/flake.lock
+++ b/flake.lock
@@ -2,11 +2,11 @@
   "nodes": {
     "nixpkgs": {
       "locked": {
-        "lastModified": 1693355128,
-        "narHash": "sha256-+ZoAny3ZxLcfMaUoLVgL9Ywb/57wP+EtsdNGuXUJrwg=",
+        "lastModified": 1696261572,
+        "narHash": "sha256-s8TtSYJ1LBpuITXjbPLUPyxzAKw35LhETcajJjCS5f0=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "a63a64b593dcf2fe05f7c5d666eb395950f36bc9",
+        "rev": "0c7ffbc66e6d78c50c38e717ec91a2a14e0622fb",
         "type": "github"
       },
       "original": {
diff --git a/nix/default.nix b/nix/default.nix
index 0ad17acc..74eaaf39 100644
--- a/nix/default.nix
+++ b/nix/default.nix
@@ -4,19 +4,13 @@ python310Packages.buildPythonPackage rec {
   pname = "auto-cpufreq";
   inherit version;
 
-  # src = fetchFromGitHub {
-  #   owner = "AdnanHodzic";
-  #   repo = pname;
-  #   rev = "v${version}";
-  #   sha256 = "sha256-ElYzVteBnoz7BevA6j/730BMG0RsmhBQ4PNl9+0Kw4k=";
-  # };
   src = ../.;
 
   nativeBuildInputs = with pkgs; [ wrapGAppsHook gobject-introspection ];
 
   buildInputs = with pkgs; [ gtk3 ];
 
-  propagatedBuildInputs = with python310Packages; [ requests pygobject3 click distro psutil setuptools (callPackage ./pkgs/setuptools-git-versioning.nix {})];
+  propagatedBuildInputs = with python310Packages; [ requests pygobject3 click distro psutil setuptools setuptools-git-versioning ];
 
   doCheck = false;
   pythonImportsCheck = [ "auto_cpufreq" ];
diff --git a/nix/pkgs/setuptools-git-versioning.nix b/nix/pkgs/setuptools-git-versioning.nix
deleted file mode 100644
index 12de6b44..00000000
--- a/nix/pkgs/setuptools-git-versioning.nix
+++ /dev/null
@@ -1,11 +0,0 @@
-{ fetchPypi, python310Packages}:
-
-python310Packages.buildPythonPackage rec {
-    pname = "setuptools-git-versioning";
-    version = "1.13.5";
-    src = fetchPypi {
-        inherit pname version;
-        sha256 = "af9ad1e8103b5abb5b128c2db4fef99407328ac9c12f65d3ff9550c4bb39ad1c";
-    };
-    propagatedBuildInputs = with python310Packages; [ toml packaging];
-}
\ No newline at end of file