From 7444fb8d4a3ca7e0abfcda686edb4f9f7e5f42df Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= Date: Fri, 1 Jan 2021 19:12:13 +0100 Subject: [PATCH] Revert "Merge pull request #309 from crazazy/master" This reverts commit 1624a8756dc6cb724ee0c424d35374cd4da7a8d2, reversing changes made to 6a07a28a78d679782164eead3bae3afa0b25c632. --- nur/index.py | 15 --------------- 1 file changed, 15 deletions(-) diff --git a/nur/index.py b/nur/index.py index 4e87ee9e6..92bc97a6b 100644 --- a/nur/index.py +++ b/nur/index.py @@ -42,22 +42,7 @@ callPackage (nur.repo-sources."%s" + "/%s") {} if position is not None and position.startswith("/nix/store"): path_str, line = position.rsplit(":", 1) path = Path(path_str) - # I've decided to just take these 2 repositories, - # update this whenever someone decided to use a recipe source other than - # NUR or nixpkgs to override packages on. right now this is about as accurate as - # `nix edit` is - # TODO find commit hash - prefixes = { - "nixpkgs": "https://github.com/nixos/nixpkgs/tree/master/", - "nur": "https://github.com/nix-community/nur-combined/tree/master/", - } stripped = path.parts[4:] - attrPath = "/".join(stripped[1:]) - location = f"{prefixes[stripped[0]]}{attrPath}" - pkg["meta"]["position"] = f"{location}#L{line}" - elif position is not None and position.find("nur-combined") > -1: - path_str, line = position.rsplit(":", 1) - stripped = path_str.partition(f"nur-combined/repos/{repo}")[2] pkg["meta"]["position"] = f"{prefix}{stripped}#L{line}" else: pkg["meta"]["position"] = prefix