From 20fe96061cacbbb2a93fe6c8a0a1b65ecfb3bed2 Mon Sep 17 00:00:00 2001 From: K900 Date: Wed, 19 Feb 2025 12:58:07 +0300 Subject: [PATCH 1/2] maintainers/scripts/kde: handle duplicate tarballs properly --- maintainers/scripts/kde/generate-sources.py | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/maintainers/scripts/kde/generate-sources.py b/maintainers/scripts/kde/generate-sources.py index b03ef3cc5f6b..e4241cced120 100755 --- a/maintainers/scripts/kde/generate-sources.py +++ b/maintainers/scripts/kde/generate-sources.py @@ -1,5 +1,5 @@ #!/usr/bin/env nix-shell -#!nix-shell -i python3 -p "python3.withPackages(ps: [ ps.beautifulsoup4 ps.click ps.httpx ps.jinja2 ps.pyyaml ])" +#!nix-shell -i python3 -p "python3.withPackages(ps: [ ps.beautifulsoup4 ps.click ps.httpx ps.jinja2 ps.packaging ps.pyyaml ])" import base64 import binascii import json @@ -11,6 +11,7 @@ import bs4 import click import httpx import jinja2 +import packaging.version as v import utils @@ -104,6 +105,12 @@ def main(set: str, version: str, nixpkgs: pathlib.Path, sources_url: Optional[st hash = client.get(url + ".sha256").text.split(" ", maxsplit=1)[0] assert hash + if existing := results.get(project_name): + old_version = existing["version"] + if v.parse(old_version) > v.parse(version): + print(f"{project_name} {old_version} is newer than {version}, skipping...") + continue + results[project_name] = { "version": version, "url": "mirror://kde" + urlparse(url).path, From 8ddfa70f499ffb7dfcbe8a988b1ab4c73567cf88 Mon Sep 17 00:00:00 2001 From: K900 Date: Wed, 19 Feb 2025 12:58:27 +0300 Subject: [PATCH 2/2] kdePackages.spectacle: 6.3.1 -> 6.3.1.2 --- pkgs/kde/generated/sources/plasma.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/kde/generated/sources/plasma.json b/pkgs/kde/generated/sources/plasma.json index 9b10cdc176d1..ce5a54b7fa28 100644 --- a/pkgs/kde/generated/sources/plasma.json +++ b/pkgs/kde/generated/sources/plasma.json @@ -315,9 +315,9 @@ "hash": "sha256-vy5JcIKk5bYpa4NZKYkNI9qbobPbSU+GEjfWlvbEmb8=" }, "spectacle": { - "version": "6.3.1", - "url": "mirror://kde/stable/plasma/6.3.1/spectacle-6.3.1.tar.xz", - "hash": "sha256-DzZLBd/MDGPB62luWTGPg6nIPUFi9WVrT6X+KdrMgU4=" + "version": "6.3.1.2", + "url": "mirror://kde/stable/plasma/6.3.1/spectacle-6.3.1.2.tar.xz", + "hash": "sha256-g35ejQ745SL01qN9pInk+G2DZJkfz3lsWP0FJvgc+go=" }, "systemsettings": { "version": "6.3.1",