ocis-bin5: rename from ocis-bin

doc/release-notes/rl-2505.section.md

@@ -52,6 +52,8 @@
 
 - `i3status-rust`-package no longer enables `notmuch` by default. It can be enabled via `withNotmuch`.
 
+- `ocis-bin` has been renamed to `ocis_5-bin`. Future versions will have the major version suffix.
+
 - Default ICU version updated from 74 to 76
 
 - Apache Kafka was updated to `>= 4.0.0`. Please note that this is the first release which operates

pkgs/by-name/oc/ocis-bin/update.py

@@ -1,215 +0,0 @@
-#!/usr/bin/env nix-shell
-##!nix-shell -I nixpkgs=./. -i python3 -p common-updater-scripts gnused nix coreutils python312
-"""
-Updater script for the ocis-bin package.
-
-This script fetches an HTML table from a specified URL and parses it to determine the release type
-(either "Rolling" or "Production") of a given software version. It uses the built-in urllib.request
-for fetching the HTML content and the built-in html.parser for parsing the HTML. By relying only on
-standard library modules, we avoid dependencies on third-party libraries, which simplifies deployment
-and improves portability.
-"""
-import urllib.request
-import os
-import subprocess
-import json
-import sys
-from datetime import datetime
-from html.parser import HTMLParser
-
-TRACKING_CHANNEL = "Production"  # Either Rolling or Production
-
-GITHUB_TOKEN = os.getenv("GITHUB_TOKEN", None)
-
-
-class TableParser(HTMLParser):
-    def __init__(self, version):
-        super().__init__()
-        self.version = version
-        self.in_td = False
-        self.current_row = []
-        self.release_type = None
-        self.in_target_row = False
-
-    def handle_starttag(self, tag, attrs):
-        if tag == "td":
-            self.in_td = True
-
-        if tag == "a":
-            href = dict(attrs).get("href", "")
-            if self.version in href:
-                self.in_target_row = True
-
-    def handle_endtag(self, tag):
-        if tag == "td":
-            self.in_td = False
-
-        if tag == "tr" and self.in_target_row:
-            self.release_type = self.current_row[1]
-            self.in_target_row = False
-
-        if tag == "tr":
-            self.current_row = []
-
-    def handle_data(self, data):
-        if self.in_td:
-            self.current_row.append(data.strip())
-
-
-def get_release_type(content, version):
-    parser = TableParser(version)
-    parser.feed(content)
-    return parser.release_type
-
-
-def get_latest_version():
-    url = "https://api.github.com/repos/owncloud/ocis/releases?per_page=1"
-    req = urllib.request.Request(url)
-
-    if GITHUB_TOKEN:
-        req.add_header("Authorization", f"Bearer {GITHUB_TOKEN}")
-
-    with urllib.request.urlopen(req) as response:
-        if response.status != 200:
-            raise Exception(f"HTTP request failed with status {response.status}")
-
-        data = response.read()
-        releases = json.loads(data)
-        latest_version = releases[0]["tag_name"].lstrip("v")
-
-    return latest_version
-
-
-def get_all_versions():
-    url = "https://api.github.com/repos/owncloud/ocis/releases"
-    req = urllib.request.Request(url)
-
-    if GITHUB_TOKEN:
-        req.add_header("Authorization", f"Bearer {GITHUB_TOKEN}")
-
-    with urllib.request.urlopen(req) as response:
-        if response.status != 200:
-            raise Exception(f"HTTP request failed with status {response.status}")
-
-        data = response.read()
-        releases = json.loads(data)
-
-        versions = []
-        for release in releases:
-            version = release["tag_name"].lstrip("v")
-            published_date = datetime.strptime(
-                release["published_at"], "%Y-%m-%dT%H:%M:%SZ"
-            )
-            versions.append({"version": version, "published_date": published_date})
-
-    return versions
-
-
-def get_current_version():
-    result = subprocess.run(
-        [
-            "nix-instantiate",
-            "--eval",
-            "-E",
-            "with import ./. {}; ocis-bin.version or (lib.getVersion ocis-bin)",
-        ],
-        capture_output=True,
-        text=True,
-    )
-    result.check_returncode()
-    return result.stdout.strip().strip('"')
-
-
-def get_hash(os_name, arch, version):
-    url = f"https://github.com/owncloud/ocis/releases/download/v{version}/ocis-{version}-{os_name}-{arch}"
-    result = subprocess.run(
-        ["nix-prefetch-url", "--type", "sha256", url], capture_output=True, text=True
-    )
-    result.check_returncode()
-    pkg_hash = result.stdout.strip()
-    result = subprocess.run(
-        ["nix", "hash", "to-sri", f"sha256:{pkg_hash}"], capture_output=True, text=True
-    )
-    result.check_returncode()
-    return result.stdout.strip()
-
-
-def update_source_version(pkg_name, version, hash_value, system):
-    subprocess.run(
-        [
-            "update-source-version",
-            pkg_name,
-            version,
-            hash_value,
-            f"--system={system}",
-            "--ignore-same-version",
-        ],
-        check=True,
-    )
-
-
-def main():
-    all_versions = get_all_versions()
-    latest_version = all_versions[0]
-    nix_current_version = get_current_version()
-
-    current_version = None
-    for version in all_versions:
-        if nix_current_version == version["version"]:
-            current_version = version
-            break
-
-    if not current_version:
-        print(
-            f"error: cannot find github release for current nix version of ocis-bin {nix_current_version}"
-        )
-        sys.exit(1)
-
-    if current_version == latest_version:
-        print(f"ocis-bin is up-to-date: {current_version}")
-        return
-
-    roadmap_url = "https://owncloud.dev/ocis/release_roadmap/"
-    response = urllib.request.urlopen(roadmap_url)
-    content = response.read().decode("utf-8")
-    latest_version_channel = get_release_type(content, latest_version["version"])
-    current_version_channel = get_release_type(content, current_version["version"])
-
-    target_version = None
-    if latest_version_channel == TRACKING_CHANNEL:
-        target_version = latest_version
-    elif latest_version_channel != TRACKING_CHANNEL:
-        for version in all_versions:
-            channel = get_release_type(content, version["version"])
-            if (
-                channel == TRACKING_CHANNEL
-                and version["published_date"] > current_version["published_date"]
-            ):
-                target_version = version
-                print(
-                    f"ocis-bin found newer version {version['version']} in channel {TRACKING_CHANNEL}"
-                )
-                break
-
-    if not target_version:
-        print(
-            f"ocis-bin could not find newer version in {TRACKING_CHANNEL} than the current {current_version['version']}"
-        )
-        return
-
-    systems = [
-        ("darwin", "arm64", "aarch64-darwin"),
-        ("darwin", "amd64", "x86_64-darwin"),
-        ("linux", "arm64", "aarch64-linux"),
-        ("linux", "arm", "armv7l-linux"),
-        ("linux", "amd64", "x86_64-linux"),
-        ("linux", "386", "i686-linux"),
-    ]
-
-    for os_name, arch, system in systems:
-        hash_value = get_hash(os_name, arch, target_version["version"])
-        update_source_version("ocis-bin", target_version["version"], hash_value, system)
-
-
-if __name__ == "__main__":
-    main()

pkgs/by-name/oc/ocis_5-bin/package.nix

@@ -27,18 +27,18 @@ let
 
   hash =
     {
-      hash_386-linux = "sha256-4yEgg0Ve8tjNn2weH9d91tfRaU1TE569VvZLxzuzXsw=";
+      hash_386-linux = "sha256-2RtkxtVk7YN7CfsIBpMP85g84MNTzrnEgk10eFdfyyw=";
-      hash_amd64-linux = "sha256-YAIhtHv/cO4yFpkWoRNMf6t4+ifMtGPTcYu84ZMvfD4=";
+      hash_amd64-linux = "sha256-tmUfDKLO35qCs1hauJQKhJhcnMhqOpcqDFtAggMFhLE=";
-      hash_arm64-linux = "sha256-OdtT9NOhh0Fkk+8CDic0NWWbGflk3FcuKB60OycJU5E=";
+      hash_arm64-linux = "sha256-ggRDW1cnTHMQKvOvCDH3eptH3O3PgYaondlzOGHTjio=";
-      hash_arm-linux = "sha256-foMsZ8Nq+Q5lqt2XZCDvQ+/sFM8/1/rPfogzsyrQHqs=";
+      hash_arm-linux = "sha256-uMLRow1NeHufSI5B4k5qSIfH3lTxg+WxzLxgdedAz40=";
-      hash_amd64-darwin = "sha256-6jaX9iqyqztykeXZX3YqwRV/silFiyfeB9gJyreAfF8=";
+      hash_amd64-darwin = "sha256-LZ6n/f2MdbFaPnBCoJqZZ7HQiLG3Z6ZoatgFsxaFvMc=";
-      hash_arm64-darwin = "sha256-KJqMJct7YWocE4eVjMF36adqTIf7WcutZlG3QEoMhCI=";
+      hash_arm64-darwin = "sha256-k5X2ZInFS/HlToOZPX23TRJqlx/XM1ZG++Xr4BHn8SY=";
     }
     ."hash_${arch}-${os}";
 in
 stdenv.mkDerivation (finalAttrs: {
-  pname = "ocis-bin";
+  pname = "ocis_5-bin";
-  version = "5.0.5";
+  version = "5.0.9";
 
   src = fetchurl {
     url = "https://github.com/owncloud/ocis/releases/download/v${finalAttrs.version}/ocis-${finalAttrs.version}-${os}-${arch}";

pkgs/by-name/oc/ocis_5-bin/update.py

@@ -0,0 +1,271 @@
+#!/usr/bin/env nix-shell
+#!nix-shell -I nixpkgs=./. -i python3 -p common-updater-scripts gnused nix coreutils python312
+"""
+Updater script for the ocis_5-bin package.
+
+This script fetches an HTML table from a specified URL and parses it to determine the release type
+(either "Rolling" or "Production") of a given software version. It uses the built-in urllib.request
+for fetching the HTML content and the built-in html.parser for parsing the HTML. By relying only on
+standard library modules, we avoid dependencies on third-party libraries, which simplifies deployment
+and improves portability.
+"""
+import urllib.request
+import os
+import subprocess
+import json
+import sys
+from datetime import datetime
+from html.parser import HTMLParser
+
+TRACKING_CHANNEL = "Production"  # Either Rolling or Production
+
+GITHUB_TOKEN = os.getenv("GITHUB_TOKEN", None)
+
+MAJOR_VERSION = 5
+PKG_NAME = f"ocis_{MAJOR_VERSION}-5"
+
+class TableParser(HTMLParser):
+    def __init__(self, version):
+        super().__init__()
+        self.version = version
+        self.in_td = False
+        self.current_row = []
+        self.release_type = None
+        self.in_target_row = False
+
+    def handle_starttag(self, tag, attrs):
+        if tag == "td":
+            self.in_td = True
+
+        if tag == "a":
+            href = dict(attrs).get("href", "")
+            if self.version in href:
+                self.in_target_row = True
+
+    def handle_endtag(self, tag):
+        if tag == "td":
+            self.in_td = False
+
+        if tag == "tr" and self.in_target_row:
+            self.release_type = self.current_row[1]
+            self.in_target_row = False
+
+        if tag == "tr":
+            self.current_row = []
+
+    def handle_data(self, data):
+        if self.in_td:
+            self.current_row.append(data.strip())
+
+
+def get_release_type(content, version):
+    parser = TableParser(version)
+    parser.feed(content)
+    return parser.release_type
+
+
+def get_all_versions():
+    """Get versions from GitHub releases with pagination (up to 10 pages)."""
+    versions = []
+    page = 1
+    max_pages = 10
+    per_page = 30
+
+    while page <= max_pages:
+        url = f"https://api.github.com/repos/owncloud/ocis/releases?page={page}&per_page={per_page}"
+        req = urllib.request.Request(url)
+
+        if GITHUB_TOKEN:
+            req.add_header("Authorization", f"Bearer {GITHUB_TOKEN}")
+
+        req.add_header("Accept", "application/vnd.github.v3+json")
+        req.add_header("User-Agent", "ocis-bin-updater-script")
+
+        with urllib.request.urlopen(req) as response:
+            if response.status != 200:
+                raise Exception(f"HTTP request failed with status {response.status}")
+
+            data = response.read()
+            releases = json.loads(data)
+
+            if not releases:
+                break
+
+            for release in releases:
+                version = release["tag_name"].lstrip("v")
+                published_date = datetime.strptime(
+                    release["published_at"], "%Y-%m-%dT%H:%M:%SZ"
+                )
+                versions.append({"version": version, "published_date": published_date})
+
+            page += 1
+
+            if len(releases) < per_page:
+                break
+
+    if not versions:
+        raise Exception("No releases found in GitHub API response")
+
+    return versions
+
+
+def get_current_version():
+    result = subprocess.run(
+        [
+            "nix-instantiate",
+            "--eval",
+            "-E",
+            f"with import ./. {{}}; {PKG_NAME}.version or (lib.getVersion {PKG_NAME})",
+        ],
+        capture_output=True,
+        text=True,
+    )
+    result.check_returncode()
+    return result.stdout.strip().strip('"')
+
+
+def get_hash(os_name, arch, version):
+    url = f"https://github.com/owncloud/ocis/releases/download/v{version}/ocis-{version}-{os_name}-{arch}"
+    result = subprocess.run(
+        ["nix-prefetch-url", "--type", "sha256", url], capture_output=True, text=True
+    )
+    result.check_returncode()
+    pkg_hash = result.stdout.strip()
+    result = subprocess.run(
+        ["nix", "hash", "to-sri", f"sha256:{pkg_hash}"], capture_output=True, text=True
+    )
+    result.check_returncode()
+    return result.stdout.strip()
+
+
+def update_source_version(pkg_name, version, hash_value, system):
+    subprocess.run(
+        [
+            "update-source-version",
+            pkg_name,
+            version,
+            hash_value,
+            f"--system={system}",
+            "--ignore-same-version",
+        ],
+        check=True,
+    )
+
+
+def main():
+    print("Fetching all versions from GitHub API (with pagination)...")
+    all_versions = get_all_versions()
+    print(f"Found {len(all_versions)} versions across multiple pages")
+
+    if not all_versions:
+        print("Error: No versions fetched from GitHub API")
+        sys.exit(1)
+
+    # We depend on the fact that versions are sorted reverse chronologically
+    for version in all_versions:
+        if version["version"].startswith(str(MAJOR_VERSION)):
+            latest_version = version
+            break
+    print(f"Latest version from GitHub: {latest_version['version']}")
+
+    nix_current_version = get_current_version()
+    print(f"Current nix version: {nix_current_version}")
+
+    current_version = None
+    for version in all_versions:
+        if nix_current_version == version["version"]:
+            current_version = version
+            break
+
+    if not current_version:
+        available_versions = [v["version"] for v in all_versions]
+        print(
+            f"Error: Cannot find GitHub release for current nix version {nix_current_version}"
+        )
+        print(
+            f"Available versions (searched {len(available_versions)} across multiple pages): {', '.join(available_versions[:10])}..."
+        )
+        sys.exit(1)
+
+    print(f"Found current version {current_version['version']} in GitHub releases")
+
+    if current_version == latest_version:
+        print(f"{PKG_NAME} is already up-to-date: {current_version['version']}")
+        return
+
+    print("Fetching release roadmap information...")
+    roadmap_url = "https://owncloud.dev/ocis/release_roadmap/"
+    try:
+        response = urllib.request.urlopen(roadmap_url)
+        content = response.read().decode("utf-8")
+
+        latest_version_channel = get_release_type(content, latest_version["version"])
+        current_version_channel = get_release_type(content, current_version["version"])
+
+        print(
+            f"Latest version {latest_version['version']} is in channel: {latest_version_channel}"
+        )
+        print(
+            f"Current version {current_version['version']} is in channel: {current_version_channel}"
+        )
+    except Exception as e:
+        print(f"Warning: Failed to fetch release roadmap information: {e}")
+        print("Proceeding with update using latest version")
+        latest_version_channel = TRACKING_CHANNEL
+        current_version_channel = TRACKING_CHANNEL
+
+    target_version = None
+    if latest_version_channel == TRACKING_CHANNEL:
+        target_version = latest_version
+        print(
+            f"Using latest version {latest_version['version']} as it is in the {TRACKING_CHANNEL} channel"
+        )
+    elif latest_version_channel != TRACKING_CHANNEL:
+        print(f"Looking for a newer version in the {TRACKING_CHANNEL} channel...")
+        for version in all_versions:
+            try:
+                channel = get_release_type(content, version["version"])
+                if (
+                    channel == TRACKING_CHANNEL
+                    and version["published_date"] > current_version["published_date"]
+                ):
+                    target_version = version
+                    print(
+                        f"{PKG_NAME} found newer version {version['version']} in channel {TRACKING_CHANNEL}"
+                    )
+                    break
+            except Exception as e:
+                print(
+                    f"Warning: Failed to determine channel for version {version['version']}: {e}"
+                )
+
+    if not target_version:
+        print(
+            f"{PKG_NAME} could not find newer version in {TRACKING_CHANNEL} than the current {current_version['version']}"
+        )
+        return
+
+    print(
+        f"Updating {PKG_NAME} from {current_version['version']} to {target_version['version']}"
+    )
+
+    systems = [
+        ("darwin", "arm64", "aarch64-darwin"),
+        ("darwin", "amd64", "x86_64-darwin"),
+        ("linux", "arm64", "aarch64-linux"),
+        ("linux", "arm", "armv7l-linux"),
+        ("linux", "amd64", "x86_64-linux"),
+        ("linux", "386", "i686-linux"),
+    ]
+
+    for os_name, arch, system in systems:
+        print(f"Calculating hash for {os_name}-{arch}...")
+        hash_value = get_hash(os_name, arch, target_version["version"])
+        print(f"Updating package for {system}...")
+        update_source_version(PKG_NAME, target_version["version"], hash_value, system)
+
+    print(f"Successfully updated {PKG_NAME} to version {target_version['version']}")
+
+
+if __name__ == "__main__":
+    main()

pkgs/top-level/aliases.nix

@@ -1136,6 +1136,7 @@ mapAliases {
   o = orbiton; # Added 2023-04-09
   oathToolkit = oath-toolkit; # Added 2022-04-04
   oauth2_proxy = throw "'oauth2_proxy' has been renamed to/replaced by 'oauth2-proxy'"; # Converted to throw 2024-10-17
+  ocis-bin = throw "ocis-bin has been renamed to ocis_5-bin'. Future major.minor versions will be made available as separate packages"; # Added 2025-03-30
   oil = lib.warnOnInstantiate "Oil has been replaced with the faster native C++ version and renamed to 'oils-for-unix'. See also https://github.com/oils-for-unix/oils/wiki/Oils-Deployments" oils-for-unix; # Added 2024-10-22
   onevpl-intel-gpu = lib.warnOnInstantiate "onevpl-intel-gpu has been renamed to vpl-gpu-rt" vpl-gpu-rt; # Added 2024-06-04
   openai-whisper-cpp = whisper-cpp; # Added 2024-12-13