Unverified Commit 231170aa authored by Austin Horstman's avatar Austin Horstman
Browse files

nixpkgs-plugin-update: use nix-prefetch-github

parent ad763e44

pkgs/applications/editors/vim/plugins/utils/updater.nix

+2 −0
Original line number Diff line number Diff line
@@ -3,6 +3,7 @@ 
  buildPythonApplication,

  makeWrapper,

  nix,

  nix-prefetch-github,

  nix-prefetch-git,

  nurl,

  python3Packages,
@@ -37,6 +38,7 @@ buildPythonApplication { 
    makeWrapperArgs+=( --prefix PATH : "${

      lib.makeBinPath [

        nix

        nix-prefetch-github

        nix-prefetch-git

        neovim-unwrapped

        nurl

pkgs/development/python-modules/nixpkgs-plugin-update/nixpkgs-plugin-update/src/nixpkgs_plugin_update/__init__.py

+3 −10
Original line number Diff line number Diff line
@@ -420,18 +420,11 @@ class RepoGitHub(Repo): 
        return sha256



    def prefetch_github(self, ref: str) -> str:

        quoted_ref = quote(ref, safe="")

        safe_name = re.sub(r"[^A-Za-z0-9._+-]", "-", f"{self.repo}-{ref}.tar.gz")

        cmd = [

            "nix-prefetch-url",

            "--unpack",

            "--name",

            safe_name,

            self.url(f"archive/{quoted_ref}.tar.gz"),

        ]

        cmd = ["nix-prefetch-github", self.owner, self.repo, "--rev", ref, "--json"]

        log.debug("Running %s", cmd)

        data = subprocess.check_output(cmd)

        return data.strip().decode("utf-8")

        loaded = json.loads(data)

        return loaded["hash"]



    def as_nix(self, plugin: "Plugin") -> str:

        if plugin.has_submodules: