Unverified Commit a9cd1718 authored by nixpkgs-ci[bot]'s avatar nixpkgs-ci[bot] Committed by GitHub
Browse files

Merge master into staging-next

parents def52327 dede83c7
Loading
Loading
Loading
Loading
+2 −0
Original line number Diff line number Diff line
@@ -92,6 +92,8 @@

- `forgejo` main program has been renamed to `bin/forgejo` from the previous `bin/gitea`.

- `wayclip` now uses the `ext-data-control-v1` Wayland protocol instead of `wlr-data-control-unstable-v1`.

- `cudaPackages.cudatoolkit-legacy-runfile` has been removed.

- `conduwuit` was removed due to upstream ceasing development and deleting their repository. For existing data, a migration to `matrix-conduit`, `matrix-continuwuity` or `matrix-tuwunel` may be possible.
+19 −12
Original line number Diff line number Diff line
@@ -5316,12 +5316,6 @@
    githubId = 1957293;
    name = "Casey Ransom";
  };
  CrazedProgrammer = {
    email = "crazedprogrammer@gmail.com";
    github = "CrazedProgrammer";
    githubId = 12202789;
    name = "CrazedProgrammer";
  };
  creator54 = {
    email = "hi.creator54@gmail.com";
    github = "Creator54";
@@ -5859,6 +5853,12 @@
      { fingerprint = "E8F9 0B80 908E 723D 0EDF  0916 5803 CDA5 9C26 A96A"; }
    ];
  };
  datosh = {
    email = "fabian@kammel.dev";
    github = "datosh";
    githubId = 6423339;
    name = "Fabian Kammel";
  };
  dav-wolff = {
    email = "nixpkgs@dav.dev";
    github = "dav-wolff";
@@ -14712,6 +14712,13 @@
    githubId = 67327023;
    keys = [ { fingerprint = "8185 29F9 BB4C 33F0 69BB  9782 D1AC CDCF 2B9B 9799"; } ];
  };
  lillecarl = {
    name = "Carl Andersson";
    github = "lillecarl";
    githubId = 207073;
    email = "nixos@lillecarl.com";
    matrix = "@lillecarl:matrix.org";
  };
  lillycham = {
    email = "lillycat332@gmail.com";
    github = "lillycham";
@@ -15879,6 +15886,12 @@
    githubId = 1913876;
    name = "Markus Scherer";
  };
  MarkusZoppelt = {
    email = "markus@zoppelt.net";
    github = "MarkusZoppelt";
    githubId = 2495125;
    name = "Markus Zoppelt";
  };
  marmolak = {
    email = "hack.robin@gmail.com";
    github = "marmolak";
@@ -23057,12 +23070,6 @@
    githubId = 73446695;
    name = "Savinien Petitjean";
  };
  savannidgerinel = {
    email = "savanni@luminescent-dreams.com";
    github = "savannidgerinel";
    githubId = 8534888;
    name = "Savanni D'Gerinel";
  };
  savedra1 = {
    email = "michaelsavedra@gmail.com";
    github = "savedra1";
+25 −10
Original line number Diff line number Diff line
@@ -78,6 +78,13 @@ class TypstPackage:
            "nix-command",
        ]
        result = subprocess.run(cmd + [url], capture_output=True, text=True)
        # We currently rely on Typst Universe's github repository to
        # track package dependencies. However, there might be an
        # inconsistency between the registry and the repository. We
        # skip packages that cannot be fetched from the registry.
        if re.search(r"error: unable to download", result.stderr):
            return url, None
        else:
            hash = re.search(r"hash\s+\'(sha256-.{44})\'", result.stderr).groups()[0]
        return url, hash

@@ -86,10 +93,14 @@ class TypstPackage:

    def to_attrs(self):
        deps = set()
        excludes = list(map(
        excludes = list(
            map(
                lambda e: os.path.join(self.path, e),
            self.meta["package"]["exclude"] if "exclude" in self.meta["package"] else [],
        ))
                self.meta["package"]["exclude"]
                if "exclude" in self.meta["package"]
                else [],
            )
        )
        for root, _, files in os.walk(self.path):
            for file in filter(lambda f: f.split(".")[-1] == "typ", files):
                file_path = os.path.join(root, file)
@@ -110,6 +121,9 @@ class TypstPackage:
        )
        source_url, source_hash = self.source()

        if not source_hash:
            return None

        return dict(
            url=source_url,
            hash=source_hash,
@@ -152,11 +166,12 @@ def generate_typst_packages(preview_dir, output_file):
        def generate_package(pname, package_subtree):
            sorted_keys = sorted(package_subtree.keys(), key=Version, reverse=True)
            print(f"Generating metadata for {pname}")
            return {
                pname: OrderedDict(
                    (k, package_subtree[k].to_attrs()) for k in sorted_keys
            version_set = OrderedDict(
                (k, a)
                for k, a in [(k, package_subtree[k].to_attrs()) for k in sorted_keys]
                if a is not None
            )
            }
            return {pname: version_set} if len(version_set) > 0 else {}

        with concurrent.futures.ThreadPoolExecutor(max_workers=100) as executor:
            sorted_packages = sorted(package_tree.items(), key=lambda x: x[0])
+10 −0
Original line number Diff line number Diff line
@@ -358,6 +358,16 @@ have a predefined type and string generator already declared under

    :   Outputs the xml with header.

`pkgs.formats.plist` { escape ? true }

:   A function taking an attribute set with values

    `escape`

    :   Whether to escape XML special characters in string values and keys.

    It returns a set with Property list (plist) specific attributes `type` and `generate` as specified [below](#pkgs-formats-result).

`pkgs.formats.pythonVars` { }

:   A function taking an empty attribute set (for future extensibility)
+2 −0
Original line number Diff line number Diff line
@@ -1296,6 +1296,7 @@
  ./services/networking/openconnect.nix
  ./services/networking/opengfw.nix
  ./services/networking/openvpn.nix
  ./services/networking/opkssh/opkssh.nix
  ./services/networking/ostinato.nix
  ./services/networking/owamp.nix
  ./services/networking/pangolin.nix
@@ -1634,6 +1635,7 @@
  ./services/web-apps/lasuite-docs.nix
  ./services/web-apps/lasuite-meet.nix
  ./services/web-apps/lemmy.nix
  ./services/web-apps/librespeed.nix
  ./services/web-apps/libretranslate.nix
  ./services/web-apps/limesurvey.nix
  ./services/web-apps/linkwarden.nix
Loading