25.11: Formatting: nixfmt-classic → nixfmt-rfc-style

[pinch] / default.nix

diff --git a/default.nix b/default.nix
index 62798c154dc5150ad2ffbe7bfa36e35d6c22f9cf..35299ae3e6a0bd6ccc7e6331ceeb8dc6420d0f67 100644 (file)
--- a/default.nix
+++ b/default.nix
@@ -1,32 +1,83 @@
-{ pkgs ? import <nixpkgs> { }, lint ? false }:
+{
+  pkgs ? import <nixpkgs> { },
+  lint ? false,
+}:

 
 let
 
 let

-  git-cache-fallback = { buildPythonPackage, fetchgit, git, mypy, }:
+  checkInputsAreNative = pkgs.lib.hasInfix "nativeCheckInputs" (
+    builtins.readFile <nixpkgs/doc/stdenv/stdenv.chapter.md>
+  );
+  checkInputsName = if checkInputsAreNative then "nativeCheckInputs" else "checkInputs";
+
+  git-cache-fallback =
+    {
+      buildPythonPackage,
+      setuptools,
+      fetchgit,
+      git,
+      backoff,
+      mypy,
+    }:

     buildPythonPackage rec {
       pname = "git-cache";
     buildPythonPackage rec {
       pname = "git-cache";

-      version = "1.0.0";
+      version = "1.5.0";

       src = fetchgit {
       src = fetchgit {

-        url = "https://scottworley.com/git-cache.git";
+        url = "https://git.scottworley.com/pub/git/git-cache";

         rev = "v${version}";
         rev = "v${version}";

-        sha256 = "06mzjc424988n2s1h25x2bi3mxbk2pnba31zkjljgw4cgw2p9036";
+        hash = "sha256-g4TS/zX3e29Q3ThsCAX2wLLlYbi8fdux5uqAc+b/Oww=";

       };
       };

-      checkInputs = [ git mypy ];
+      pyproject = true;
+      build-system = [ setuptools ];
+      propagatedBuildInputs = [ backoff ];
+      "${checkInputsName}" = [
+        git
+        mypy
+      ];

       doCheck = true;
       checkPhase = "./test.sh";
     };
 
       doCheck = true;
       checkPhase = "./test.sh";
     };
 

-in pkgs.python3Packages.callPackage
-({ lib, buildPythonPackage, nix, git, autopep8, mypy, pylint, git-cache, }:
-  buildPythonPackage rec {
-    pname = "pinch";
-    version = "3.0.0";
-    src = lib.cleanSource ./.;
-    propagatedBuildInputs = [ git-cache ];
-    checkInputs = [ nix git mypy ] ++ lib.optionals lint [ autopep8 pylint ];
-    doCheck = true;
-    checkPhase = "./test.sh";
-  }) {
+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 =
     git-cache =

-      pkgs.python3Packages.git-cache or (pkgs.python3Packages.callPackage
-        git-cache-fallback { });
+      pkgs.python3Packages.git-cache or (pkgs.python3Packages.callPackage git-cache-fallback { });

   }
   }