colin/nix-files
1
0
Fork 1
Code Issues Pull Requests Projects Releases Wiki Activity

directoryListingUpdater2: align with upstream nixpkgs PR

Browse Source
This commit is contained in:
Colin
2024-10-09 23:29:57 +00:00
parent f7a21243da
commit 9aa5e82d93
2 changed files with 4 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
pkgs/by-name/directoryListingUpdater2/list-directory-versions
View File

@@ -62,7 +62,7 @@ if __name__ == "__main__":
link_url = link.get("href", None) link_url = link.get("href", None)
if link_url is not None: if link_url is not None:
match = re.fullmatch( match = re.fullmatch(
rf"(.*/)?{args.pname}_([\d.]+?(-[\d\w.-]+?)?)(\.tar)?(\.[^.]*)", link_url rf"(.*/)?{args.pname}[-_]([\d.]+?(-[\d\w.-]+?)?)(\.tar)?(\.[^.]*)", link_url
) )
if match: if match:
version = match.group(2) version = match.group(2)

3
pkgs/by-name/directoryListingUpdater2/package.nix
View File

@@ -1,6 +1,9 @@
# heavily based on <repo:nixos/nixpkgs:pkgs/common-updater/scripts.nix> # heavily based on <repo:nixos/nixpkgs:pkgs/common-updater/scripts.nix>
# and <repo:nixos/nixpkgs:pkgs/common-updater/scripts/list-directory-versions>. # and <repo:nixos/nixpkgs:pkgs/common-updater/scripts/list-directory-versions>.
# main difference is that it does fuzzier matching. # main difference is that it does fuzzier matching.
#
# remove this package once this PR lands:
# - <https://github.com/NixOS/nixpkgs/pull/347619>
{ {
lib, lib,
genericUpdater, genericUpdater,