From 1f892619d5c1440db305fd2bd9dfe7d4ad2f15f8 Mon Sep 17 00:00:00 2001 From: Michael Adler Date: Wed, 19 Jul 2023 09:57:10 +0200 Subject: [PATCH] microsoft-edge: ensure stable order for upstream sources This commit addresses the issue of unstable key ordering in default.nix. Previously, the keys could appear in different orders such as "stable, beta, dev" or "beta, stable, dev". To simplify the reviewing process and minimize merge conflicts, this commit introduces the use of OrderedDict, ensuring consistent key ordering for upstream sources. Also, the gzip import was unused, so just drop it. --- .../networking/browsers/microsoft-edge/update.py | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/networking/browsers/microsoft-edge/update.py b/pkgs/applications/networking/browsers/microsoft-edge/update.py index 4d068862fe31..0e9bfa8fe89a 100755 --- a/pkgs/applications/networking/browsers/microsoft-edge/update.py +++ b/pkgs/applications/networking/browsers/microsoft-edge/update.py @@ -2,14 +2,13 @@ #! nix-shell -i python3 -p python3Packages.packaging python3Packages.debian import base64 -import gzip import textwrap from urllib import request +from collections import OrderedDict from debian.deb822 import Packages from debian.debian_support import Version - def packages(): packages_url = 'https://packages.microsoft.com/repos/edge/dists/stable/main/binary-amd64/Packages' handle = request.urlopen(packages_url) @@ -17,7 +16,7 @@ def packages(): def latest_packages(packages: bytes): - latest_packages: dict[str, Packages] = {} + latest_packages: OrderedDict[str, Packages] = {} for package in Packages.iter_paragraphs(packages, use_apt_pkg=False): name: str = package['Package'] if not name.startswith('microsoft-edge-'):