diff --git a/pkgs/by-name/op/opengist/package.nix b/pkgs/by-name/op/opengist/package.nix index 459b7b2d29d6..000823c3d3ba 100644 --- a/pkgs/by-name/op/opengist/package.nix +++ b/pkgs/by-name/op/opengist/package.nix @@ -12,12 +12,12 @@ let # finalAttrs when 🥺 (buildGoModule does not support them) # https://github.com/NixOS/nixpkgs/issues/273815 - version = "1.8.4"; + version = "1.9.1"; src = fetchFromGitHub { owner = "thomiceli"; repo = "opengist"; tag = "v${version}"; - hash = "sha256-vpl3ztLHeVZndAwDgobfiI+3Xu3CFU38qgXy83p06As="; + hash = "sha256-Zjn38OGnDtgD2OfIhgUxWo0Cx+ZmNv6UjJanASbjiYU="; }; frontend = buildNpmPackage { @@ -40,13 +40,13 @@ let cp -R public $out ''; - npmDepsHash = "sha256-l09TPGBGhWcsl3x14ovilDd1zZWv4XzFCAmAfapKtAE="; + npmDepsHash = "sha256-Uh+oXd//G/lPAMXRxijjEOpQNmeXK/XCIU7DJN3ujaY="; }; in buildGoModule { pname = "opengist"; inherit version src; - vendorHash = "sha256-mLFjRL4spAWuPLVOtt88KH+p2g9lGCYzaHokVxdrLOw="; + vendorHash = "sha256-aqfr3yGyTXDtZDU8d1lbWWvFfY4fo6/PsSDwpiDtM90="; tags = [ "fs_embed" ]; ldflags = [ "-s" diff --git a/pkgs/by-name/op/opengist/update.sh b/pkgs/by-name/op/opengist/update.sh index ad3ac9ca639a..219894eb27ef 100755 --- a/pkgs/by-name/op/opengist/update.sh +++ b/pkgs/by-name/op/opengist/update.sh @@ -1,11 +1,12 @@ #!/usr/bin/env nix-shell -#!nix-shell -i bash -p bash curl coreutils jq git prefetch-npm-deps moreutils common-updater-scripts common-updater-scripts +#!nix-shell -i bash -p bash curl coreutils jq git prefetch-npm-deps moreutils common-updater-scripts # shellcheck shell=bash set -eou pipefail +set -x -NIXPKGS_DIR="$PWD" +NIXPKGS_DIR="$(git rev-parse --show-toplevel)" SCRIPT_DIR="$(dirname "${BASH_SOURCE[0]}")" # Get latest release @@ -27,7 +28,9 @@ fi echo "Updating opengist $oldVersion -> $latestVersion" +pushd "$NIXPKGS_DIR" >/dev/null || exit 1 update-source-version opengist "${latestVersion}" +popd >/dev/null pushd "$SCRIPT_DIR" >/dev/null || exit 1 @@ -43,7 +46,7 @@ popd >/dev/null # nix-prefetch broken due to ninja finalAttrs.src.rev # nix-update with goModules broken for this package -setKV () { +setKV() { sed -i "s|$1 = \".*\"|$1 = \"${2:-}\"|" "${SCRIPT_DIR}/package.nix" }