From 0dd0b2103a25d2068462895faa852d535666a977 Mon Sep 17 00:00:00 2001 From: IndeedNotJames Date: Wed, 5 Apr 2023 23:04:35 +0200 Subject: [PATCH 1/2] forgejo: use "predictable URLs" as src Not sure how long codeberg.org already supports this. I only just found out about them after a maintainer mentioned them in https://matrix.to/#/#forgejo-chat:matrix.org Similar URLs are also used at https://forgejo.org/download/ --- pkgs/applications/version-management/forgejo/default.nix | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/pkgs/applications/version-management/forgejo/default.nix b/pkgs/applications/version-management/forgejo/default.nix index 346d17d8c794..c6164f5251b3 100644 --- a/pkgs/applications/version-management/forgejo/default.nix +++ b/pkgs/applications/version-management/forgejo/default.nix @@ -28,9 +28,7 @@ buildGoModule rec { version = "1.19.0-2"; src = fetchurl { - name = "${pname}-src-${version}.tar.gz"; - # see https://codeberg.org/forgejo/forgejo/releases - url = "https://codeberg.org/attachments/2bf497db-fa91-4260-9c98-5c791b6b397c"; + url = "https://codeberg.org/forgejo/forgejo/releases/download/v${version}/forgejo-src-${version}.tar.gz"; hash = "sha256-neDIT+V3qHR8xgP4iy4TJQ6PCWO3svpSA7FLCacQSMI="; }; @@ -105,7 +103,6 @@ buildGoModule rec { | { $version, html_url } + (.assets | map(select(.name | startswith($filename)) | {(.name | split(".") | last): .browser_download_url}) | add)' \ <<< "$releases") - archive_url=$(jq -r .gz <<< "$stable") checksum_url=$(jq -r .sha256 <<< "$stable") release_url=$(jq -r .html_url <<< "$stable") version=$(jq -r .version <<< "$stable") @@ -120,7 +117,7 @@ buildGoModule rec { sha256=$(curl "$checksum_url" --silent | cut --delimiter " " --fields 1) sri_hash=$(nix hash to-sri --type sha256 "$sha256") - update-source-version "${pname}" "$version" "$sri_hash" "$archive_url" + update-source-version "${pname}" "$version" "$sri_hash" ''; }); }; From 9f1a1b9373cb1fe754bbcd318a1789ec1f691398 Mon Sep 17 00:00:00 2001 From: IndeedNotJames Date: Wed, 5 Apr 2023 23:04:35 +0200 Subject: [PATCH 2/2] forgejo: 1.19.0-2 -> 1.19.0-3 https://codeberg.org/forgejo/forgejo/src/commit/4c132e77ea2cba9a1161f4cfc18b82b9e2e1b35f/RELEASE-NOTES.md#1-19-0-3 --- pkgs/applications/version-management/forgejo/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/version-management/forgejo/default.nix b/pkgs/applications/version-management/forgejo/default.nix index c6164f5251b3..25cce789bc88 100644 --- a/pkgs/applications/version-management/forgejo/default.nix +++ b/pkgs/applications/version-management/forgejo/default.nix @@ -25,11 +25,11 @@ buildGoModule rec { pname = "forgejo"; - version = "1.19.0-2"; + version = "1.19.0-3"; src = fetchurl { url = "https://codeberg.org/forgejo/forgejo/releases/download/v${version}/forgejo-src-${version}.tar.gz"; - hash = "sha256-neDIT+V3qHR8xgP4iy4TJQ6PCWO3svpSA7FLCacQSMI="; + hash = "sha256-u27DDw3JUtVJ2nvkKfaGzpYP8bpRnwc1LUVra8Epkjc="; }; vendorHash = null;