X-Git-Url: http://git.scottworley.com/auto-upgrade-with-pinch/blobdiff_plain/7e0a35744ed90b43d0bc3df8d926fd9327885415..a4ddb4117429b8bb2cfb6f23e8733a7b97edeac9:/overlays/pinch.nix?ds=sidebyside diff --git a/overlays/pinch.nix b/overlays/pinch.nix index 1277423..8e9633f 100644 --- a/overlays/pinch.nix +++ b/overlays/pinch.nix @@ -1,54 +1,36 @@ self: super: let - - # Pending upstream inclusion in https://github.com/NixOS/nixpkgs/pull/93377 - fallback-backoff = self.python3Packages.callPackage ({ lib, buildPythonPackage - , fetchFromGitHub, pytestCheckHook, poetry, pytest-asyncio, }: - buildPythonPackage rec { - pname = "backoff"; - version = "1.10.0"; - src = fetchFromGitHub { - owner = "litl"; - repo = pname; - rev = "v${version}"; - sha256 = "1jj0l6pjx747d2yyvnzd3qbm4qr73sq6cc56dhvd8wqfbp5279x0"; - }; - format = "pyproject"; - nativeBuildInputs = [ poetry ]; - checkInputs = [ pytestCheckHook pytest-asyncio ]; - }) { }; - fallback-git-cache = self.python3Packages.callPackage ({ buildPythonPackage, fetchgit, git, backoff, mypy, }: buildPythonPackage rec { pname = "git-cache"; - version = "1.3.1"; + version = "1.5.0"; src = fetchgit { - url = "https://scottworley.com/git-cache.git"; + url = "https://git.scottworley.com/pub/git/git-cache"; rev = "v${version}"; - sha256 = "0awz7f6avzw9fk9gp1kadj0nbmf1s60qic9zb6ww92zig3khg12k"; + hash = "sha256-g4TS/zX3e29Q3ThsCAX2wLLlYbi8fdux5uqAc+b/Oww="; }; propagatedBuildInputs = [ backoff ]; - checkInputs = [ git mypy ]; + nativeCheckInputs = [ git mypy ]; doCheck = true; checkPhase = "./test.sh"; - }) { backoff = self.python3Packages.backoff or fallback-backoff; }; + }) { }; fallback-pinch = self.python3Packages.callPackage - ({ buildPythonPackage, fetchgit, nix, git, makeWrapper, mypy, git-cache, }: + ({ buildPythonPackage, fetchgit, nix_2_3, git, makeWrapper, mypy, git-cache, }: buildPythonPackage rec { pname = "pinch"; - version = "3.0.4"; + version = "3.1.0"; src = fetchgit { - url = "https://scottworley.com/pinch.git"; + url = "https://git.scottworley.com/pub/git/pinch"; rev = "v${version}"; - sha256 = "1i7v9vcjk599ffzwf3nq38y811cm6rnxriarqgpp3kwy52r91mi2"; + hash = "sha256-qwbYDSGE6p1YU3AnOatXNoTUc284D1xPQs/tRS++VOM="; }; buildInputs = [ makeWrapper ]; propagatedBuildInputs = [ git-cache ]; - checkInputs = [ nix git mypy ]; + nativeCheckInputs = [ nix_2_3 git mypy ]; postInstall = '' - wrapProgram "$out/bin/pinch" --prefix PATH : ${nix}/bin + wrapProgram "$out/bin/pinch" --prefix PATH : ${nix_2_3}/bin ''; doCheck = true; checkPhase = "./test.sh";