From a3edb2443ecf4f1317ff708c9099c07f2b393e72 Mon Sep 17 00:00:00 2001 From: Aliaksandr Date: Thu, 4 Sep 2025 16:43:52 +0300 Subject: [PATCH 1/2] ee: 1.5.2 -> 1.5.2-unstable-2024-06-20, fix update script --- pkgs/by-name/ee/ee/package.nix | 20 ++++++++++---------- pkgs/by-name/ee/ee/update.sh | 30 ++++++++++++++++++++++++++++++ 2 files changed, 40 insertions(+), 10 deletions(-) create mode 100755 pkgs/by-name/ee/ee/update.sh diff --git a/pkgs/by-name/ee/ee/package.nix b/pkgs/by-name/ee/ee/package.nix index 8be454f4b069..efe71101b186 100644 --- a/pkgs/by-name/ee/ee/package.nix +++ b/pkgs/by-name/ee/ee/package.nix @@ -1,23 +1,23 @@ { lib, stdenv, - nix-update-script, - fetchgit, + fetchFromGitHub, ncurses, }: -stdenv.mkDerivation (finalAttrs: { +stdenv.mkDerivation { pname = "ee"; - version = "1.5.2"; + version = "1.5.2-unstable-2024-06-20"; - src = fetchgit { - url = "https://git.freebsd.org/src.git"; - tag = "release/14.3.0"; - outputHash = "sha256-nMhHXeoam9VtUuhhi0eoGZfcW9zZhpYQKVYbkAbfgc0="; + src = fetchFromGitHub { + owner = "freebsd"; + repo = "freebsd-src"; + rev = "0667538b888c1171932c6cf28b62fc19d393e119"; + hash = "sha256-nMhHXeoam9VtUuhhi0eoGZfcW9zZhpYQKVYbkAbfgc0="; rootDir = "contrib/ee"; }; - passthru.updateScript = nix-update-script { }; + passthru.updateScript = ./update.sh; buildInputs = [ ncurses ]; @@ -49,4 +49,4 @@ stdenv.mkDerivation (finalAttrs: { platforms = lib.platforms.unix; mainProgram = "ee"; }; -}) +} diff --git a/pkgs/by-name/ee/ee/update.sh b/pkgs/by-name/ee/ee/update.sh new file mode 100755 index 000000000000..29a5460e7daf --- /dev/null +++ b/pkgs/by-name/ee/ee/update.sh @@ -0,0 +1,30 @@ +#!/usr/bin/env nix-shell +#! nix-shell -i bash -p curl jq common-updater-scripts +set -euo pipefail + +owner=freebsd +repo=freebsd-src +path=contrib/ee +pkg_file=./pkgs/by-name/ee/ee/package.nix + +api_url_latest="https://api.github.com/repos/$owner/$repo/commits?path=$path&per_page=1" +json_latest=$(curl -sSfL -H "Accept: application/vnd.github+json" ${GITHUB_TOKEN:+-u ":$GITHUB_TOKEN"} "$api_url_latest") +latest_rev=$(printf '%s' "$json_latest" | jq -r '.[0].sha') +latest_date=$(printf '%s' "$json_latest" | jq -r '.[0].commit.committer.date' | cut -dT -f1) + +if [[ -z "${latest_rev:-}" || "$latest_rev" == "null" ]]; then + echo "Failed to fetch latest commit for path $path" >&2 + exit 1 +fi + +# Fetch EE_VERSION from that commit +raw_url="https://raw.githubusercontent.com/$owner/$repo/$latest_rev/$path/ee_version.h" +ee_version=$(curl -sSfL ${GITHUB_TOKEN:+-u ":$GITHUB_TOKEN"} "$raw_url" | sed -n 's/^#define[[:space:]]*EE_VERSION[[:space:]]*"\([^"]*\)".*/\1/p') +if [[ -z "${ee_version:-}" ]]; then + echo "Failed to parse EE_VERSION from ee_version.h at $latest_rev" >&2 + exit 1 +fi + +new_version="${ee_version}-unstable-${latest_date}" + +update-source-version ee "$new_version" --rev="$latest_rev" --file="$pkg_file" --ignore-same-version --print-changes From 500ec2fc673da5e0d670129dff04b50c94c4038d Mon Sep 17 00:00:00 2001 From: Aliaksandr Date: Mon, 13 Oct 2025 23:05:40 +0300 Subject: [PATCH 2/2] ee: adopt --- pkgs/by-name/ee/ee/package.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/by-name/ee/ee/package.nix b/pkgs/by-name/ee/ee/package.nix index efe71101b186..0b4707c79499 100644 --- a/pkgs/by-name/ee/ee/package.nix +++ b/pkgs/by-name/ee/ee/package.nix @@ -48,5 +48,6 @@ stdenv.mkDerivation { license = lib.licenses.bsd2; platforms = lib.platforms.unix; mainProgram = "ee"; + maintainers = with lib.maintainers; [ qweered ]; }; }