X-Git-Url: http://git.scottworley.com/pinch/blobdiff_plain/53a27350551844e1ed1a9257690294767389ef0d..05a3d87bd6dfd31c10f42c04ccc57f2e480c47f3:/default.nix?ds=inline diff --git a/default.nix b/default.nix index 6ad80df..e62e1d3 100644 --- a/default.nix +++ b/default.nix @@ -1,11 +1,45 @@ { pkgs ? import { }, lint ? false }: -pkgs.python3Packages.callPackage -({ lib, buildPythonPackage, nix, git, autopep8, mypy, pylint, }: + +let + + git-cache-fallback = { buildPythonPackage, fetchgit, git, backoff, mypy, }: + buildPythonPackage rec { + pname = "git-cache"; + version = "1.4.2"; + src = fetchgit { + url = "https://git.scottworley.com/pub/git/git-cache"; + rev = "v${version}"; + hash = "sha256-Z9daNCmjzaVdeG3mITRWdNM+ewUEcKy5N4/Xpdotsg0="; + }; + propagatedBuildInputs = [ backoff ]; + checkInputs = [ 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 = "2.1.1"; + version = "3.0.10"; src = lib.cleanSource ./.; - checkInputs = [ nix git mypy ] ++ lib.optionals lint [ autopep8 pylint ]; + buildInputs = [ makeWrapper ]; + propagatedBuildInputs = [ git-cache ]; + checkInputs = [ 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/pinc"; + 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; + }