X-Git-Url: http://git.scottworley.com/pinch/blobdiff_plain/5c37f57d00651bde2fa1d80e8eb1ecb2e76f50db..5f16846e67119dcd28dfc66327a10cf2f1119e20:/default.nix?ds=inline

diff --git a/default.nix b/default.nix
index e9cf252..35299ae 100644
--- a/default.nix
+++ b/default.nix
@@ -1,50 +1,83 @@
-{ pkgs ? import <nixpkgs> { }, lint ? false }:
+{
+  pkgs ? import <nixpkgs> { },
+  lint ? false,
+}:
 
 let
-  checkInputsAreNative = pkgs.lib.hasInfix "nativeCheckInputs"
-    (builtins.readFile <nixpkgs/doc/stdenv/stdenv.chapter.md>);
-  checkInputsName =
-    if checkInputsAreNative then "nativeCheckInputs" else "checkInputs";
+  checkInputsAreNative = pkgs.lib.hasInfix "nativeCheckInputs" (
+    builtins.readFile <nixpkgs/doc/stdenv/stdenv.chapter.md>
+  );
+  checkInputsName = if checkInputsAreNative then "nativeCheckInputs" else "checkInputs";
 
-  git-cache-fallback = { buildPythonPackage, fetchgit, git, backoff, mypy, }:
+  git-cache-fallback =
+    {
+      buildPythonPackage,
+      setuptools,
+      fetchgit,
+      git,
+      backoff,
+      mypy,
+    }:
     buildPythonPackage rec {
       pname = "git-cache";
-      version = "1.4.3";
+      version = "1.5.0";
       src = fetchgit {
         url = "https://git.scottworley.com/pub/git/git-cache";
         rev = "v${version}";
-        hash = "sha256-Qr62bGdlFFkzYTl6ot34UiOJxbP1Eeelx2OEd96vrqI=";
+        hash = "sha256-g4TS/zX3e29Q3ThsCAX2wLLlYbi8fdux5uqAc+b/Oww=";
       };
+      pyproject = true;
+      build-system = [ setuptools ];
       propagatedBuildInputs = [ backoff ];
-      "${checkInputsName}" = [ git mypy ];
+      "${checkInputsName}" = [
+        git
+        mypy
+      ];
       doCheck = true;
       checkPhase = "./test.sh";
     };
 
-in pkgs.python3Packages.callPackage ({ lib, buildPythonPackage, nix_2_3, git
-  , autopep8, makeWrapper, mypy, pylint, git-cache, }:
-  buildPythonPackage rec {
-    pname = "pinch";
-    version = "3.0.11";
-    src = lib.cleanSource ./.;
-    buildInputs = [ makeWrapper ];
-    propagatedBuildInputs = [ git-cache ];
-    "${checkInputsName}" = [ nix_2_3 git mypy ]
-      ++ lib.optionals lint [ autopep8 pylint ];
-    postInstall = ''
-      wrapProgram "$out/bin/pinch" --prefix PATH : ${nix_2_3}/bin
-    '';
-    doCheck = true;
-    checkPhase = "./test.sh";
-    meta = {
-      description = "A replacement for `nix-channel --update`";
-      homepage = "https://git.scottworley.com/pinch";
-      license = pkgs.lib.licenses.gpl3;
-      maintainers = with pkgs.lib.maintainers; [ chkno ];
-    };
-  }) {
+in
+pkgs.python3Packages.callPackage
+  (
+    {
+      lib,
+      buildPythonPackage,
+      setuptools,
+      nix,
+      git,
+      autopep8,
+      mypy,
+      pylint,
+      git-cache,
+    }:
+    buildPythonPackage rec {
+      pname = "pinch";
+      version = "3.3.2";
+      src = lib.cleanSource ./.;
+      pyproject = true;
+      build-system = [ setuptools ];
+      propagatedBuildInputs = [ git-cache ];
+      "${checkInputsName}" = [
+        nix
+        git
+        mypy
+      ]
+      ++ lib.optionals lint [
+        autopep8
+        pylint
+      ];
+      doCheck = true;
+      checkPhase = "./test.sh";
+      meta = {
+        description = "A replacement for `nix-channel --update`";
+        homepage = "https://git.scottworley.com/pinch";
+        license = pkgs.lib.licenses.gpl3;
+        maintainers = with pkgs.lib.maintainers; [ chkno ];
+      };
+    }
+  )
+  {
     git-cache =
-      pkgs.python3Packages.git-cache or (pkgs.python3Packages.callPackage
-        git-cache-fallback { });
-    nix_2_3 = pkgs.nix_2_3 or pkgs.nix;
+      pkgs.python3Packages.git-cache or (pkgs.python3Packages.callPackage git-cache-fallback { });
   }