diff options
author | schnusch <schnusch@users.noreply.github.com> | 2022-02-16 18:29:28 +0100 |
---|---|---|
committer | schnusch <schnusch@users.noreply.github.com> | 2022-10-27 12:53:17 +0200 |
commit | 63227b483fb65b03f72ad31db9a4eb9bba5c294f (patch) | |
tree | 9c8ddc179f55d1cfad9a27fb5e37adb5da4b70ed /pkgs/tools/security/oath-toolkit | |
parent | f0c470f5eb80e484efd694451862ea8a56083b95 (diff) |
oath-toolkit: replace update script with nix-update
nix-update supports GNU Savannah see https://github.com/Mic92/nix-update/releases/tag/0.5.0
Diffstat (limited to 'pkgs/tools/security/oath-toolkit')
-rw-r--r-- | pkgs/tools/security/oath-toolkit/default.nix | 4 | ||||
-rwxr-xr-x | pkgs/tools/security/oath-toolkit/update.sh | 50 |
2 files changed, 2 insertions, 52 deletions
diff --git a/pkgs/tools/security/oath-toolkit/default.nix b/pkgs/tools/security/oath-toolkit/default.nix index e542a2ae7140d..20cfd11b7629b 100644 --- a/pkgs/tools/security/oath-toolkit/default.nix +++ b/pkgs/tools/security/oath-toolkit/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, pam, xmlsec }: +{ lib, stdenv, fetchurl, nix-update-script, pam, xmlsec }: let # TODO: Switch to OpenPAM once https://gitlab.com/oath-toolkit/oath-toolkit/-/issues/26 is addressed upstream @@ -19,7 +19,7 @@ in stdenv.mkDerivation rec { configureFlags = lib.optionals stdenv.isDarwin [ "--disable-pam" ]; - passthru.updateScript = ./update.sh; + passthru.updateScript = nix-update-script { attrPath = pname; }; meta = with lib; { description = "Components for building one-time password authentication systems"; diff --git a/pkgs/tools/security/oath-toolkit/update.sh b/pkgs/tools/security/oath-toolkit/update.sh deleted file mode 100755 index 9f56ae412323d..0000000000000 --- a/pkgs/tools/security/oath-toolkit/update.sh +++ /dev/null @@ -1,50 +0,0 @@ -#!/usr/bin/env nix-shell -#!nix-shell -i bash -p curl git gnugrep nix - -set -euo pipefail - -nixfile='default.nix' -release_url='https://download.savannah.nongnu.org/releases/oath-toolkit/' -attr='oath-toolkit' -command='oathtool --version' - -color() { - printf '%s: \033[%sm%s\033[39m\n' "$0" "$1" "$2" >&2 || true -} - -color 32 "downloading $release_url..." -if ! release_page=$(curl -Lf "$release_url"); then - color 31 "cannot download release page" - exit 1 -fi - -tarball_name=$(printf '%s\n' "$release_page" \ - | grep -Po '(?<=href=").*?\.tar\.gz(?=")' \ - | sort -n | tail -n1) -tarball_version="${tarball_name%.tar.*}" -tarball_version="${tarball_version##*-}" -tarball_url="mirror://savannah${release_url#https://*/releases}$tarball_name" - -color 32 "nix-prefetch-url $tarball_url..." -if ! tarball_sha256=$(nix-prefetch-url --type sha256 "$tarball_url"); then - color 31 "cannot prefetch $tarball_url" - exit 1 -fi - -old_version=$(grep -Pom1 '(?<=version = ").*?(?=";)' "$nixfile") - -version=$(printf 'version = "%s";\n' "$tarball_version") -sha256=$(printf 'sha256 = "%s";\n' "$tarball_sha256") -sed -e "s,version = .*,$version," -e "s,sha256 = .*,$sha256," -i "$nixfile" - -if git diff --exit-code "$nixfile" > /dev/stderr; then - printf '\n' >&2 || true - color 32 "$tarball_version is up to date" -else - color 32 "running '$command' with nix-shell..." - nix-shell -p "callPackage ./$nixfile {}" --run "$command" - msg="$attr: $old_version -> $tarball_version" - printf '\n' >&2 || true - color 31 "$msg" - git commit -m "$msg" "$nixfile" -fi |