Commit 9133c5d1 authored by Jan Tojnar's avatar Jan Tojnar
Browse files

generic-updater: Allow filtering tags ending with suffix 

Needed for ashpd-demo, which has tags ending with `-demo`: https://github.com/bilelmoussaoui/ashpd/releases
parent 2e2cab78

pkgs/common-updater/directory-listing-updater.nix

+2 −0
Original line number Diff line number Diff line
@@ -11,6 +11,7 @@ 
  allowedVersions ? "",

  ignoredVersions ? "",

  rev-prefix ? "",

  rev-suffix ? "",

  odd-unstable ? false,

  patchlevel-unstable ? false,

  url ? null,
@@ -25,6 +26,7 @@ genericUpdater { 
    allowedVersions

    ignoredVersions

    rev-prefix

    rev-suffix

    odd-unstable

    patchlevel-unstable

    ;

pkgs/common-updater/generic-updater.nix

+10 −2
Original line number Diff line number Diff line
@@ -18,6 +18,7 @@ 
  allowedVersions ? "",

  ignoredVersions ? "",

  rev-prefix ? "",

  rev-suffix ? "",

  odd-unstable ? false,

  patchlevel-unstable ? false,

}:
@@ -43,8 +44,9 @@ let 
    allowed_versions="$6"

    ignored_versions="$7"

    rev_prefix="$8"

    odd_unstable="$9"

    patchlevel_unstable="''${10}"

    rev_suffix="$9"

    odd_unstable="''${10}"

    patchlevel_unstable="''${11}"



    [[ -n "$name" ]] || name="$UPDATE_NIX_NAME"

    [[ -n "$pname" ]] || pname="$UPDATE_NIX_PNAME"
@@ -89,6 +91,11 @@ let 
      tags=$(echo "$tags" | ${grep} "^$rev_prefix")

      tags=$(echo "$tags" | ${sed} -e "s,^$rev_prefix,,")

    fi

    # cut any revision suffix not used in the NixOS package version

    if [ -n "$rev_suffix" ]; then

      tags=$(echo "$tags" | ${grep} -- "$rev_suffix$")

      tags=$(echo "$tags" | ${sed} -e "s,$rev_suffix\$,,")

    fi

    tags=$(echo "$tags" | ${grep} "^[0-9]")

    if [ -n "$allowed_versions" ]; then

      tags=$(echo "$tags" | ${grep} -E -e "$allowed_versions")
@@ -145,6 +152,7 @@ in 
    allowedVersions

    ignoredVersions

    rev-prefix

    rev-suffix

    odd-unstable

    patchlevel-unstable

  ];

pkgs/common-updater/git-updater.nix

+2 −0
Original line number Diff line number Diff line
@@ -11,6 +11,7 @@ 
  allowedVersions ? "",

  ignoredVersions ? "",

  rev-prefix ? "",

  rev-suffix ? "",

  odd-unstable ? false,

  patchlevel-unstable ? false,

  # an explicit url is needed when src.meta.homepage or src.url don't
@@ -26,6 +27,7 @@ genericUpdater { 
    allowedVersions

    ignoredVersions

    rev-prefix

    rev-suffix

    odd-unstable

    patchlevel-unstable

    ;

pkgs/common-updater/http-two-levels-updater.nix

+2 −0
Original line number Diff line number Diff line
@@ -11,6 +11,7 @@ 
  allowedVersions ? "",

  ignoredVersions ? "",

  rev-prefix ? "",

  rev-suffix ? "",

  odd-unstable ? false,

  patchlevel-unstable ? false,

  url ? null,
@@ -24,6 +25,7 @@ genericUpdater { 
    allowedVersions

    ignoredVersions

    rev-prefix

    rev-suffix

    odd-unstable

    patchlevel-unstable

    ;