From e9162b92502a3bdd8031ee901491cf6345237da6 Mon Sep 17 00:00:00 2001 From: chayleaf Date: Wed, 25 Oct 2023 21:05:26 +0700 Subject: [PATCH 001/230] gitignore: remove redundant /result entry --- .gitignore | 1 - 1 file changed, 1 deletion(-) diff --git a/.gitignore b/.gitignore index f0807473f06b..e9d2f987259d 100644 --- a/.gitignore +++ b/.gitignore @@ -16,7 +16,6 @@ repl-result-* /doc/NEWS.txt /doc/manual.html /doc/manual.pdf -/result /source/ .version-suffix From 12afc8f19ee09147e6592fa23c3bde7aecc90042 Mon Sep 17 00:00:00 2001 From: RadovanSk Date: Wed, 15 Nov 2023 22:26:02 +0100 Subject: [PATCH 002/230] xp-pen-deco-01-v2-driver: 3.2.3.230215-1 -> 3.4.9-231023 --- .../linux/xp-pen-drivers/deco-01-v2/default.nix | 15 +++++++-------- 1 file changed, 7 insertions(+), 8 deletions(-) diff --git a/pkgs/os-specific/linux/xp-pen-drivers/deco-01-v2/default.nix b/pkgs/os-specific/linux/xp-pen-drivers/deco-01-v2/default.nix index 8ae426269a86..18aa86282567 100644 --- a/pkgs/os-specific/linux/xp-pen-drivers/deco-01-v2/default.nix +++ b/pkgs/os-specific/linux/xp-pen-drivers/deco-01-v2/default.nix @@ -21,12 +21,12 @@ let in stdenv.mkDerivation rec { pname = "xp-pen-deco-01-v2-driver"; - version = "3.2.3.230215-1"; + version = "3.4.9-231023"; src = fetchzip { - url = "https://download01.xp-pen.com/file/2023/03/XPPen-pentablet-${version}.x86_64.tar.gz"; + url = "https://www.xp-pen.com/download/file/id/1936/pid/440/ext/gz.html#.tar.gz"; name = "xp-pen-deco-01-v2-driver-${version}.tar.gz"; - sha256 = "sha256-CV4ZaGCFFcfy2J0O8leYgcyzFVwJQFQJsShOv9B7jfI="; + sha256 = "sha256-A/dv6DpelH0NHjlGj32tKv37S+9q3F8cYByiYlMuqLg="; }; nativeBuildInputs = [ @@ -56,16 +56,16 @@ stdenv.mkDerivation rec { runHook preInstall mkdir -p $out/{opt,bin} - cp -r App/usr/lib/pentablet/{pentablet,resource.rcc,conf} $out/opt - chmod +x $out/opt/pentablet + cp -r App/usr/lib/pentablet/{PenTablet,resource.rcc,conf} $out/opt + chmod +x $out/opt/PenTablet cp -r App/lib $out/lib - sed -i 's#usr/lib/pentablet#${dataDir}#g' $out/opt/pentablet + sed -i 's#usr/lib/pentablet#${dataDir}#g' $out/opt/PenTablet runHook postInstall ''; postFixup = '' - makeWrapper $out/opt/pentablet $out/bin/xp-pen-deco-01-v2-driver \ + makeWrapper $out/opt/PenTablet $out/bin/xp-pen-deco-01-v2-driver \ "''${qtWrapperArgs[@]}" \ --run 'if [ "$EUID" -ne 0 ]; then echo "Please run as root."; exit 1; fi' \ --run 'if [ ! -d /${dataDir} ]; then mkdir -p /${dataDir}; cp -r '$out'/opt/conf /${dataDir}; chmod u+w -R /${dataDir}; fi' @@ -80,4 +80,3 @@ stdenv.mkDerivation rec { license = licenses.unfree; }; } - From 8d06988a1a76f17d7f9df9a81c3a32f04550990e Mon Sep 17 00:00:00 2001 From: Ryan Horiguchi Date: Thu, 7 Dec 2023 18:02:10 +0100 Subject: [PATCH 003/230] tautulli: 2.13.2 -> 2.13.4 --- pkgs/servers/tautulli/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/tautulli/default.nix b/pkgs/servers/tautulli/default.nix index 2bab6f742316..fb2a67353606 100644 --- a/pkgs/servers/tautulli/default.nix +++ b/pkgs/servers/tautulli/default.nix @@ -2,7 +2,7 @@ buildPythonApplication rec { pname = "Tautulli"; - version = "2.13.2"; + version = "2.13.4"; format = "other"; pythonPath = [ setuptools ]; @@ -12,7 +12,7 @@ buildPythonApplication rec { owner = "Tautulli"; repo = pname; rev = "v${version}"; - sha256 = "sha256-G1YNOJ2snddhFOWDkRQikQ1qC3G1BHg+qb2j5ffIR8k="; + sha256 = "sha256-cOHirjYdfPPv7O9o3vnsKBffvqxoaRN32NaUOK0SmQ8="; }; installPhase = '' From 5068ae6e15cdc0af9359969f9d22dec89b4ae9e1 Mon Sep 17 00:00:00 2001 From: MakiseKurisu Date: Sat, 28 Oct 2023 23:27:12 +0800 Subject: [PATCH 004/230] ch9344: 1.9 -> 2.0 --- pkgs/os-specific/linux/ch9344/default.nix | 10 +++---- .../fix-incompatible-pointer-types.patch | 26 +++++++------------ .../fix-incompatible-pointer-types_6_3.patch | 13 ---------- 3 files changed, 13 insertions(+), 36 deletions(-) delete mode 100644 pkgs/os-specific/linux/ch9344/fix-incompatible-pointer-types_6_3.patch diff --git a/pkgs/os-specific/linux/ch9344/default.nix b/pkgs/os-specific/linux/ch9344/default.nix index e7da864b90c1..42c26503ea15 100644 --- a/pkgs/os-specific/linux/ch9344/default.nix +++ b/pkgs/os-specific/linux/ch9344/default.nix @@ -2,20 +2,16 @@ stdenv.mkDerivation rec { pname = "ch9344"; - version = "1.9"; + version = "2.0"; src = fetchzip { name = "CH9344SER_LINUX.zip"; url = "https://www.wch.cn/downloads/file/386.html#CH9344SER_LINUX.zip"; - hash = "sha256-g55ftAfjKKlUFzGhI1a/O7Eqbz6rkGf1vWuEJjBZxBE="; + hash = "sha256-YKNMYpap7CjhgTIpd/M9+nB11NtpwGYT/P14J6q3XZg="; }; - patches = lib.optionals (lib.versionAtLeast kernel.modDirVersion "6.1") [ - # https://github.com/torvalds/linux/commit/a8c11c1520347be74b02312d10ef686b01b525f1 + patches = [ ./fix-incompatible-pointer-types.patch - ] ++ lib.optionals (lib.versionAtLeast kernel.modDirVersion "6.3") [ - # https://github.com/torvalds/linux/commit/5d420399073770134d2b03e004b2c0201c7fa26f - ./fix-incompatible-pointer-types_6_3.patch ]; sourceRoot = "${src.name}/driver"; diff --git a/pkgs/os-specific/linux/ch9344/fix-incompatible-pointer-types.patch b/pkgs/os-specific/linux/ch9344/fix-incompatible-pointer-types.patch index 31088538733e..89c95347ed65 100644 --- a/pkgs/os-specific/linux/ch9344/fix-incompatible-pointer-types.patch +++ b/pkgs/os-specific/linux/ch9344/fix-incompatible-pointer-types.patch @@ -1,22 +1,16 @@ diff --git a/ch9344.c b/ch9344.c -index 1e37293..a16af82 100644 +index bfa10bb..76a94a7 100644 --- a/ch9344.c +++ b/ch9344.c -@@ -79,7 +79,7 @@ static DEFINE_IDR(ch9344_minors); - static DEFINE_MUTEX(ch9344_minors_lock); - - static void ch9344_tty_set_termios(struct tty_struct *tty, -- struct ktermios *termios_old); -+ const struct ktermios *termios_old); - - static int ch9344_get_portnum(int index); - -@@ -1597,7 +1597,7 @@ u8 cal_recv_tmt(__le32 bd) +@@ -837,7 +837,11 @@ static void ch9344_tty_close(struct tty_struct *tty, struct file *filp) + } } - static void ch9344_tty_set_termios(struct tty_struct *tty, -- struct ktermios *termios_old) -+ const struct ktermios *termios_old) ++#if (LINUX_VERSION_CODE >= KERNEL_VERSION(6, 6, 0)) ++static ssize_t ch9344_tty_write(struct tty_struct *tty, const u8 *buf, size_t count) ++#else + static int ch9344_tty_write(struct tty_struct *tty, const unsigned char *buf, int count) ++#endif { - struct ch9344 *ch9344 = tty->driver_data; - struct ktermios *termios = &tty->termios; + struct ch9344 *ch9344 = tty->driver_data; + int stat; diff --git a/pkgs/os-specific/linux/ch9344/fix-incompatible-pointer-types_6_3.patch b/pkgs/os-specific/linux/ch9344/fix-incompatible-pointer-types_6_3.patch deleted file mode 100644 index b4cf265daac9..000000000000 --- a/pkgs/os-specific/linux/ch9344/fix-incompatible-pointer-types_6_3.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/ch9344.c b/ch9344.c -index a16af82..8922ed9 100644 ---- a/ch9344.c -+++ b/ch9344.c -@@ -774,7 +774,7 @@ static inline void *tty_get_portdata(struct ch9344_ttyport *port) - return (port->portdata); - } - --static void ch9344_port_dtr_rts(struct tty_port *port, int raise) -+static void ch9344_port_dtr_rts(struct tty_port *port, bool raise) - { - struct ch9344_ttyport *ttyport = container_of(port, struct ch9344_ttyport, port); - struct ch9344 *ch9344 = tty_get_portdata(ttyport); From ef321a0ed68ccc8b0babaca977303ff5528e8fa5 Mon Sep 17 00:00:00 2001 From: MayNiklas Date: Mon, 26 Feb 2024 10:14:59 +0100 Subject: [PATCH 005/230] papermc: provide multiple versions --- pkgs/games/papermc/default.nix | 63 +++---------- pkgs/games/papermc/derivation.nix | 50 +++++++++++ pkgs/games/papermc/update.py | 145 ++++++++++++++++++++++++++++++ pkgs/games/papermc/versions.json | 50 +++++++++++ pkgs/top-level/all-packages.nix | 4 +- 5 files changed, 262 insertions(+), 50 deletions(-) create mode 100644 pkgs/games/papermc/derivation.nix create mode 100755 pkgs/games/papermc/update.py create mode 100644 pkgs/games/papermc/versions.json diff --git a/pkgs/games/papermc/default.nix b/pkgs/games/papermc/default.nix index aa16e51a7ac8..29d5c6b85203 100644 --- a/pkgs/games/papermc/default.nix +++ b/pkgs/games/papermc/default.nix @@ -1,50 +1,15 @@ -{ - lib, - stdenvNoCC, - fetchurl, - jre, - makeBinaryWrapper, -}: -stdenvNoCC.mkDerivation (finalAttrs: { - pname = "papermc"; - version = "1.20.4.435"; - - src = - let - mcVersion = lib.versions.pad 3 finalAttrs.version; - buildNum = builtins.elemAt (lib.splitVersion finalAttrs.version) 3; - in - fetchurl { - url = "https://papermc.io/api/v2/projects/paper/versions/${mcVersion}/builds/${buildNum}/downloads/paper-${mcVersion}-${buildNum}.jar"; - hash = "sha256-NrIsYLoAAWORw/S26NDFjYBVwpNITJxuWGZow3696wM="; - }; - - installPhase = '' - runHook preInstall - - install -D $src $out/share/papermc/papermc.jar - - makeWrapper ${lib.getExe jre} "$out/bin/minecraft-server" \ - --append-flags "-jar $out/share/papermc/papermc.jar nogui" - - runHook postInstall - ''; - - nativeBuildInputs = [ - makeBinaryWrapper - ]; - - dontUnpack = true; - preferLocalBuild = true; - allowSubstitutes = false; - - meta = { - description = "High-performance Minecraft Server"; - homepage = "https://papermc.io/"; - sourceProvenance = with lib.sourceTypes; [ binaryBytecode ]; - license = lib.licenses.gpl3Only; - platforms = lib.platforms.unix; - maintainers = with lib.maintainers; [ aaronjanse neonfuz ]; - mainProgram = "minecraft-server"; - }; +{ callPackage, lib, ... }: +let + versions = lib.importJSON ./versions.json; + latestVersion = lib.last (builtins.sort lib.versionOlder (builtins.attrNames versions)); + escapeVersion = builtins.replaceStrings [ "." ] [ "_" ]; + packages = lib.mapAttrs' + (version: value: { + name = "papermc-${escapeVersion version}"; + value = callPackage ./derivation.nix { inherit (value) version hash; }; + }) + versions; +in +lib.recurseIntoAttrs (packages // { + papermc = builtins.getAttr "papermc-${escapeVersion latestVersion}" packages; }) diff --git a/pkgs/games/papermc/derivation.nix b/pkgs/games/papermc/derivation.nix new file mode 100644 index 000000000000..f244031f0590 --- /dev/null +++ b/pkgs/games/papermc/derivation.nix @@ -0,0 +1,50 @@ +{ lib, stdenvNoCC, fetchurl, makeBinaryWrapper, jre, version, hash }: + +stdenvNoCC.mkDerivation { + pname = "papermc"; + inherit version; + + src = + let + version-split = lib.strings.splitString "-" version; + mcVersion = builtins.elemAt version-split 0; + buildNum = builtins.elemAt version-split 1; + in + fetchurl { + url = "https://papermc.io/api/v2/projects/paper/versions/${mcVersion}/builds/${buildNum}/downloads/paper-${version}.jar"; + inherit hash; + }; + + installPhase = '' + runHook preInstall + + install -D $src $out/share/papermc/papermc.jar + + makeWrapper ${lib.getExe jre} "$out/bin/minecraft-server" \ + --append-flags "-jar $out/share/papermc/papermc.jar nogui" + + runHook postInstall + ''; + + nativeBuildInputs = [ + makeBinaryWrapper + ]; + + dontUnpack = true; + preferLocalBuild = true; + allowSubstitutes = false; + + passthru = { + updateScript = ./update.py; + }; + + meta = { + description = "High-performance Minecraft Server"; + homepage = "https://papermc.io/"; + sourceProvenance = with lib.sourceTypes; [ binaryBytecode ]; + license = lib.licenses.gpl3Only; + platforms = lib.platforms.unix; + maintainers = with lib.maintainers; [ aaronjanse neonfuz MayNiklas ]; + mainProgram = "minecraft-server"; + }; +} diff --git a/pkgs/games/papermc/update.py b/pkgs/games/papermc/update.py new file mode 100755 index 000000000000..6e2d0ec9274e --- /dev/null +++ b/pkgs/games/papermc/update.py @@ -0,0 +1,145 @@ +#!/usr/bin/env nix-shell +#! nix-shell -i python -p "python3.withPackages (ps: with ps; [ps.requests ])" + +import hashlib +import base64 +import json + +import requests + + +class Version: + def __init__(self, name: str): + self.name: str = name + self.hash: str | None = None + self.build_number: int | None = None + + @property + def full_name(self): + v_name = f"{self.name}-{self.build_number}" + + # this will probably never happen because the download of a build with NoneType in URL would fail + if not self.name or not self.build_number: + print(f"Warning: version '{v_name}' contains NoneType!") + + return v_name + + +class VersionManager: + def __init__(self, base_url: str = "https://api.papermc.io/v2/projects/paper"): + self.versions: list[Version] = [] + self.base_url: str = base_url + + def fetch_versions(self, not_before_minor_version: int = 18): + """ + Fetch all versions after given minor release + """ + + response = requests.get(self.base_url) + + try: + response.raise_for_status() + + except requests.exceptions.HTTPError as e: + print(e) + return + + # we only want versions that are no pre-releases + release_versions = filter( + lambda v_name: 'pre' not in v_name, response.json()["versions"]) + + for version_name in release_versions: + + # split version string, convert to list ot int + version_split = version_name.split(".") + version_split = list(map(int, version_split)) + + # check if version is higher than 1. + if (version_split[0] > 1) or (version_split[0] == 1 and version_split[1] >= not_before_minor_version): + self.versions.append(Version(version_name)) + + def fetch_latest_version_builds(self): + """ + Set latest build number to each version + """ + + for version in self.versions: + url = f"{self.base_url}/versions/{version.name}" + response = requests.get(url) + + # check that we've got a good response + try: + response.raise_for_status() + + except requests.exceptions.HTTPError as e: + print(e) + return + + # the highest build in response.json()['builds']: + latest_build = response.json()['builds'][-1] + version.build_number = latest_build + + def generate_version_hashes(self): + """ + Generate and set the hashes for all registered versions (versions will are downloaded to memory) + """ + + for version in self.versions: + url = f"{self.base_url}/versions/{version.name}/builds/{version.build_number}/downloads/paper-{version.full_name}.jar" + version.hash = self.download_and_generate_sha256_hash(url) + + def versions_to_json(self): + return json.dumps( + {version.name: {'hash': version.hash, 'version': version.full_name} + for version in self.versions}, + indent=4 + ) + + def write_versions(self, file_name: str): + """ write all processed versions to json """ + # save json to versions.json + with open(file_name, 'w') as f: + f.write(self.versions_to_json() + "\n") + + @staticmethod + def download_and_generate_sha256_hash(url: str) -> str | None: + """ + Fetch the tarball from the given URL. + Then generate a sha256 hash of the tarball. + """ + + try: + # Download the file from the URL + response = requests.get(url) + response.raise_for_status() + + except requests.exceptions.RequestException as e: + print(f"Error: {e}") + return None + + # Create a new SHA-256 hash object + sha256_hash = hashlib.sha256() + + # Update the hash object with chunks of the downloaded content + for byte_block in response.iter_content(4096): + sha256_hash.update(byte_block) + + # Get the hexadecimal representation of the hash + hash_value = sha256_hash.digest() + + # Encode the hash value in base64 + base64_hash = base64.b64encode(hash_value).decode('utf-8') + + # Format it as "sha256-{base64_hash}" + sri_representation = f"sha256-{base64_hash}" + + return sri_representation + + +if __name__ == '__main__': + version_manager = VersionManager() + + version_manager.fetch_versions() + version_manager.fetch_latest_version_builds() + version_manager.generate_version_hashes() + version_manager.write_versions(file_name="versions.json") diff --git a/pkgs/games/papermc/versions.json b/pkgs/games/papermc/versions.json new file mode 100644 index 000000000000..0fa4bad8ba04 --- /dev/null +++ b/pkgs/games/papermc/versions.json @@ -0,0 +1,50 @@ +{ + "1.18": { + "hash": "sha256-PJlfINrk5OIdVVT6yVegqKXIW9W/NJFfrEtPFuDvEBs=", + "version": "1.18-66" + }, + "1.18.1": { + "hash": "sha256-qUkXpEcsLLyZB6FcZmu7eE+V7Ne1PHe8CP5xED5Uh/U=", + "version": "1.18.1-216" + }, + "1.18.2": { + "hash": "sha256-BXjxj01jK0lLRo7FaztBS1tW/qCH7n05z23N9MnQHwU=", + "version": "1.18.2-388" + }, + "1.19": { + "hash": "sha256-DTnKzFGneysHHhzoYvy/C0pL1mjMfosxNZjYT6Cfq6w=", + "version": "1.19-81" + }, + "1.19.1": { + "hash": "sha256-Wv4jofreksVHEk+odLx9kI+mdvSfCYefqHYiS2Lp1Rs=", + "version": "1.19.1-111" + }, + "1.19.2": { + "hash": "sha256-LrXHRZ7JS83Fl+1xHVSaOrSw/aE+QSoHkqGgabWQOGQ=", + "version": "1.19.2-307" + }, + "1.19.3": { + "hash": "sha256-MAfyxjjV8E7TK2raozBT/jY0zPp0NFyD0+pJgtONtdw=", + "version": "1.19.3-448" + }, + "1.19.4": { + "hash": "sha256-5YfXjLo+me+MS8JM8gzDvbvonjOwtXIHBEavTra+XM8=", + "version": "1.19.4-550" + }, + "1.20": { + "hash": "sha256-HkzPwFmfSR7m/uRFXTciMyrF14WE/M1Vy7O1HhFQRQU=", + "version": "1.20-17" + }, + "1.20.1": { + "hash": "sha256-I0qbMgmBAMb8EWZk1k42zNtYtbZJrw+AvMywiwJV6uo=", + "version": "1.20.1-196" + }, + "1.20.2": { + "hash": "sha256-ujQKg1rEC4Vjqn7aHNZHmhGnYjQJyJosNc2ddJDtF6c=", + "version": "1.20.2-318" + }, + "1.20.4": { + "hash": "sha256-NrIsYLoAAWORw/S26NDFjYBVwpNITJxuWGZow3696wM=", + "version": "1.20.4-435" + } +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 26533c85ad7a..d99006718427 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -37850,7 +37850,9 @@ with pkgs; pacvim = callPackage ../games/pacvim { }; - papermc = callPackage ../games/papermc { }; + papermcServers = callPackages ../games/papermc { }; + + papermc = papermcServers.papermc; path-of-building = qt6Packages.callPackage ../games/path-of-building {}; From 51e91568e305831263561be491893addf5a86d00 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 28 Feb 2024 05:21:52 +0000 Subject: [PATCH 006/230] rshim-user-space: 2.0.12 -> 2.0.20 --- pkgs/tools/misc/rshim-user-space/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/misc/rshim-user-space/default.nix b/pkgs/tools/misc/rshim-user-space/default.nix index a8bdd356a2cc..67cf3b6895e0 100644 --- a/pkgs/tools/misc/rshim-user-space/default.nix +++ b/pkgs/tools/misc/rshim-user-space/default.nix @@ -15,13 +15,13 @@ stdenv.mkDerivation rec { pname = "rshim-user-space"; - version = "2.0.12"; + version = "2.0.20"; src = fetchFromGitHub { owner = "Mellanox"; repo = pname; rev = "rshim-${version}"; - hash = "sha256-jR9Q1i2p4weKuGPTAylNIVglgcZH0UtvXBVVCEquxu8="; + hash = "sha256-zm1cMTna9o8edl0M7tjUhbnElbUkQZSkh3KOI6tbE6I="; }; nativeBuildInputs = [ From ad2f55dc4e95f2740c9543b98ef341a0c21cb6fc Mon Sep 17 00:00:00 2001 From: RaHoni Date: Fri, 22 Dec 2023 14:29:12 +0100 Subject: [PATCH 007/230] nixos/bacula: Add support for TLS Added the majority of TLS options used for transport encryption. This uses a submodule since all resources share the same settings. The documentation can be found under: https://www.bacula.org/13.0.x-manuals/en/main/Bacula_TLS_Communications_E.html --- .../manual/release-notes/rl-2405.section.md | 3 + nixos/modules/services/backup/bacula.nix | 146 +++++++++++++++++- 2 files changed, 146 insertions(+), 3 deletions(-) diff --git a/nixos/doc/manual/release-notes/rl-2405.section.md b/nixos/doc/manual/release-notes/rl-2405.section.md index 8f6dd2fc74cc..20c60ea8500d 100644 --- a/nixos/doc/manual/release-notes/rl-2405.section.md +++ b/nixos/doc/manual/release-notes/rl-2405.section.md @@ -98,6 +98,9 @@ The pre-existing [services.ankisyncd](#opt-services.ankisyncd.enable) has been m - [Nginx virtual hosts](#opt-services.nginx.virtualHosts) using `forceSSL` or `globalRedirect` can now have redirect codes other than 301 through + +- `bacula` now allows to configure `TLS` for encrypted communication. + `redirectCode`. - [](#opt-boot.kernel.sysctl._net.core.wmem_max_) changed from a string to an integer because of the addition of a custom merge option (taking the highest value defined to avoid conflicts between 2 services trying to set that value), just as [](#opt-boot.kernel.sysctl._net.core.rmem_max_) since 22.11. diff --git a/nixos/modules/services/backup/bacula.nix b/nixos/modules/services/backup/bacula.nix index 5a75a46e5259..4c8513447b38 100644 --- a/nixos/modules/services/backup/bacula.nix +++ b/nixos/modules/services/backup/bacula.nix @@ -9,6 +9,21 @@ with lib; let libDir = "/var/lib/bacula"; + yes_no = bool: if bool then "yes" else "no"; + tls_conf = tls_cfg: optionalString tls_cfg.enable ( + concatStringsSep + "\n" + ( + ["TLS Enable = yes;"] + ++ optional (tls_cfg.require != null) "TLS Require = ${yes_no tls_cfg.require};" + ++ optional (tls_cfg.certificate != null) ''TLS Certificate = "${tls_cfg.certificate}";'' + ++ [''TLS Key = "${tls_cfg.key}";''] + ++ optional (tls_cfg.verifyPeer != null) "TLS Verify Peer = ${yes_no tls_cfg.verifyPeer};" + ++ optional (tls_cfg.allowedCN != [ ]) "TLS Allowed CN = ${concatStringsSep " " (tls_cfg.allowedCN)};" + ++ optional (tls_cfg.caCertificateFile != null) ''TLS CA Certificate File = "${tls_cfg.caCertificateFile}";'' + ) + ); + fd_cfg = config.services.bacula-fd; fd_conf = pkgs.writeText "bacula-fd.conf" '' @@ -18,6 +33,7 @@ let WorkingDirectory = ${libDir}; Pid Directory = /run; ${fd_cfg.extraClientConfig} + ${tls_conf fd_cfg.tls} } ${concatStringsSep "\n" (mapAttrsToList (name: value: '' @@ -25,6 +41,7 @@ let Name = "${name}"; Password = ${value.password}; Monitor = ${value.monitor}; + ${tls_conf value.tls} } '') fd_cfg.director)} @@ -44,6 +61,7 @@ let WorkingDirectory = ${libDir}; Pid Directory = /run; ${sd_cfg.extraStorageConfig} + ${tls_conf sd_cfg.tls} } ${concatStringsSep "\n" (mapAttrsToList (name: value: '' @@ -70,6 +88,7 @@ let Name = "${name}"; Password = ${value.password}; Monitor = ${value.monitor}; + ${tls_conf value.tls} } '') sd_cfg.director)} @@ -90,6 +109,7 @@ let Working Directory = ${libDir}; Pid Directory = /run/; QueryFile = ${pkgs.bacula}/etc/query.sql; + ${tls_conf dir_cfg.tls} ${dir_cfg.extraDirectorConfig} } @@ -108,7 +128,93 @@ let ${dir_cfg.extraConfig} ''; - directorOptions = {...}: + linkOption = name: destination: "[${name}](#opt-${builtins.replaceStrings [ "<" ">"] ["_" "_"] destination})"; + tlsLink = destination: submodulePath: linkOption "${submodulePath}.${destination}" "${submodulePath}.${destination}"; + + tlsOptions = submodulePath: {...}: + { + options = { + enable = mkOption { + type = types.bool; + default = false; + description = mdDoc '' + Specifies if TLS should be enabled. + If this set to `false` TLS will be completely disabled, even if ${tlsLink "tls.require" submodulePath} is true. + ''; + }; + require = mkOption { + type = types.nullOr types.bool; + default = null; + description = mdDoc '' + Require TLS or TLS-PSK encryption. + This directive is ignored unless one of ${tlsLink "tls.enable" submodulePath} is true or TLS PSK Enable is set to `yes`. + If TLS is not required while TLS or TLS-PSK are enabled, then the Bacula component + will connect with other components either with or without TLS or TLS-PSK + + If ${tlsLink "tls.enable" submodulePath} or TLS-PSK is enabled and TLS is required, then the Bacula + component will refuse any connection request that does not use TLS. + ''; + }; + certificate = mkOption { + type = types.nullOr types.path; + default = null; + description = mdDoc '' + The full path to the PEM encoded TLS certificate. + It will be used as either a client or server certificate, + depending on the connection direction. + This directive is required in a server context, but it may + not be specified in a client context if ${tlsLink "tls.verifyPeer" submodulePath} is + `false` in the corresponding server context. + ''; + }; + key = mkOption { + type = types.path; + description = mdDoc '' + The path of a PEM encoded TLS private key. + It must correspond to the TLS certificate. + ''; + }; + verifyPeer = mkOption { + type = types.nullOr types.bool; + default = null; + description = mdDoc '' + Verify peer certificate. + Instructs server to request and verify the client's X.509 certificate. + Any client certificate signed by a known-CA will be accepted. + Additionally, the client's X509 certificate Common Name must meet the value of the Address directive. + If ${tlsLink "tls.allowedCN" submodulePath} is used, + the client's x509 certificate Common Name must also correspond to + one of the CN specified in the ${tlsLink "tls.allowedCN" submodulePath} directive. + This directive is valid only for a server and not in client context. + + Standard from Bacula is `true`. + ''; + }; + allowedCN = mkOption { + type = types.listOf types.str; + default = [ ]; + description = mdDoc '' + Common name attribute of allowed peer certificates. + This directive is valid for a server and in a client context. + If this directive is specified, the peer certificate will be verified against this list. + In the case this directive is configured on a server side, the allowed + CN list will not be checked if ${tlsLink "tls.verifyPeer" submodulePath} is false. + ''; + }; + caCertificateFile = mkOption { + type = types.nullOr types.path; + default = null; + description = mdDoc '' + The path specifying a PEM encoded TLS CA certificate(s). + Multiple certificates are permitted in the file. + One of TLS CA Certificate File or TLS CA Certificate Dir are required in a server context, unless + ${tlsLink "tls.verifyPeer" submodulePath} is false, and are always required in a client context. + ''; + }; + }; + }; + + directorOptions = submodulePath:{...}: { options = { password = mkOption { @@ -146,6 +252,13 @@ let security problems. ''; }; + + tls = mkOption { + type = types.submodule (tlsOptions "${submodulePath}.director."); + description = mdDoc '' + TLS Options for the Director in this Configuration. + ''; + }; }; }; @@ -327,9 +440,19 @@ in { description = lib.mdDoc '' This option defines director resources in Bacula File Daemon. ''; - type = with types; attrsOf (submodule directorOptions); + type = with types; attrsOf (submodule (directorOptions "services.bacula-fd")); }; + + tls = mkOption { + type = types.submodule (tlsOptions "services.bacula-fd"); + default = { }; + description = mdDoc '' + TLS Options for the File Daemon. + Important notice: The backup won't be encrypted. + ''; + }; + extraClientConfig = mkOption { default = ""; type = types.lines; @@ -386,7 +509,7 @@ in { description = lib.mdDoc '' This option defines Director resources in Bacula Storage Daemon. ''; - type = with types; attrsOf (submodule directorOptions); + type = with types; attrsOf (submodule (directorOptions "services.bacula-sd")); }; device = mkOption { @@ -427,6 +550,14 @@ in { console = all ''; }; + tls = mkOption { + type = types.submodule (tlsOptions "services.bacula-sd"); + default = { }; + description = mdDoc '' + TLS Options for the Storage Daemon. + Important notice: The backup won't be encrypted. + ''; + }; }; @@ -503,6 +634,15 @@ in { TODO ''; }; + + tls = mkOption { + type = types.submodule (tlsOptions "services.bacula-dir"); + default = { }; + description = mdDoc '' + TLS Options for the Director. + Important notice: The backup won't be encrypted. + ''; + }; }; }; From 2af073f716056bbf0d1997edd002807cc4def83e Mon Sep 17 00:00:00 2001 From: RaHoni Date: Fri, 22 Dec 2023 14:34:33 +0100 Subject: [PATCH 008/230] nixos/bacula: refactor option generation The generation of the descriptions always used lib explicitly even thoughit was already specified with 'with'. Since using `with lib` is discouraged this was also changed to inherit. --- nixos/modules/services/backup/bacula.nix | 80 +++++++++++++----------- 1 file changed, 45 insertions(+), 35 deletions(-) diff --git a/nixos/modules/services/backup/bacula.nix b/nixos/modules/services/backup/bacula.nix index 4c8513447b38..39975adf5909 100644 --- a/nixos/modules/services/backup/bacula.nix +++ b/nixos/modules/services/backup/bacula.nix @@ -4,9 +4,19 @@ # TODO: test configuration when building nixexpr (use -t parameter) # TODO: support sqlite3 (it's deprecate?) and mysql -with lib; let + inherit (lib) + concatStringsSep + literalExpression + mapAttrsToList + mdDoc + mkIf + mkOption + optional + optionalString + types + ; libDir = "/var/lib/bacula"; yes_no = bool: if bool then "yes" else "no"; @@ -220,7 +230,7 @@ let password = mkOption { type = types.str; # TODO: required? - description = lib.mdDoc '' + description = mdDoc '' Specifies the password that must be supplied for the default Bacula Console to be authorized. The same password must appear in the Director resource of the Console configuration file. For added @@ -241,7 +251,7 @@ let type = types.enum [ "no" "yes" ]; default = "no"; example = "yes"; - description = lib.mdDoc '' + description = mdDoc '' If Monitor is set to `no`, this director will have full access to this Storage daemon. If Monitor is set to `yes`, this director will only be able to fetch the @@ -267,7 +277,7 @@ let options = { changerDevice = mkOption { type = types.str; - description = lib.mdDoc '' + description = mdDoc '' The specified name-string must be the generic SCSI device name of the autochanger that corresponds to the normal read/write Archive Device specified in the Device resource. This generic SCSI device name @@ -286,7 +296,7 @@ let changerCommand = mkOption { type = types.str; - description = lib.mdDoc '' + description = mdDoc '' The name-string specifies an external program to be called that will automatically change volumes as required by Bacula. Normally, this directive will be specified only in the AutoChanger resource, which @@ -308,14 +318,14 @@ let }; devices = mkOption { - description = lib.mdDoc ""; + description = mdDoc ""; type = types.listOf types.str; }; extraAutochangerConfig = mkOption { default = ""; type = types.lines; - description = lib.mdDoc '' + description = mdDoc '' Extra configuration to be passed in Autochanger directive. ''; example = '' @@ -332,7 +342,7 @@ let archiveDevice = mkOption { # TODO: required? type = types.str; - description = lib.mdDoc '' + description = mdDoc '' The specified name-string gives the system file name of the storage device managed by this storage daemon. This will usually be the device file name of a removable storage device (tape drive), for @@ -349,7 +359,7 @@ let mediaType = mkOption { # TODO: required? type = types.str; - description = lib.mdDoc '' + description = mdDoc '' The specified name-string names the type of media supported by this device, for example, `DLT7000`. Media type names are arbitrary in that you set them to anything you want, but they must be @@ -387,7 +397,7 @@ let extraDeviceConfig = mkOption { default = ""; type = types.lines; - description = lib.mdDoc '' + description = mdDoc '' Extra configuration to be passed in Device directive. ''; example = '' @@ -408,7 +418,7 @@ in { enable = mkOption { type = types.bool; default = false; - description = lib.mdDoc '' + description = mdDoc '' Whether to enable the Bacula File Daemon. ''; }; @@ -417,7 +427,7 @@ in { default = "${config.networking.hostName}-fd"; defaultText = literalExpression ''"''${config.networking.hostName}-fd"''; type = types.str; - description = lib.mdDoc '' + description = mdDoc '' The client name that must be used by the Director when connecting. Generally, it is a good idea to use a name related to the machine so that error messages can be easily identified if you have multiple @@ -428,7 +438,7 @@ in { port = mkOption { default = 9102; type = types.port; - description = lib.mdDoc '' + description = mdDoc '' This specifies the port number on which the Client listens for Director connections. It must agree with the FDPort specified in the Client resource of the Director's configuration file. @@ -437,10 +447,10 @@ in { director = mkOption { default = {}; - description = lib.mdDoc '' + description = mdDoc '' This option defines director resources in Bacula File Daemon. ''; - type = with types; attrsOf (submodule (directorOptions "services.bacula-fd")); + type = types.attrsOf (types.submodule (directorOptions "services.bacula-fd")); }; @@ -456,7 +466,7 @@ in { extraClientConfig = mkOption { default = ""; type = types.lines; - description = lib.mdDoc '' + description = mdDoc '' Extra configuration to be passed in Client directive. ''; example = '' @@ -468,7 +478,7 @@ in { extraMessagesConfig = mkOption { default = ""; type = types.lines; - description = lib.mdDoc '' + description = mdDoc '' Extra configuration to be passed in Messages directive. ''; example = '' @@ -481,7 +491,7 @@ in { enable = mkOption { type = types.bool; default = false; - description = lib.mdDoc '' + description = mdDoc '' Whether to enable Bacula Storage Daemon. ''; }; @@ -490,7 +500,7 @@ in { default = "${config.networking.hostName}-sd"; defaultText = literalExpression ''"''${config.networking.hostName}-sd"''; type = types.str; - description = lib.mdDoc '' + description = mdDoc '' Specifies the Name of the Storage daemon. ''; }; @@ -498,7 +508,7 @@ in { port = mkOption { default = 9103; type = types.port; - description = lib.mdDoc '' + description = mdDoc '' Specifies port number on which the Storage daemon listens for Director connections. ''; @@ -506,32 +516,32 @@ in { director = mkOption { default = {}; - description = lib.mdDoc '' + description = mdDoc '' This option defines Director resources in Bacula Storage Daemon. ''; - type = with types; attrsOf (submodule (directorOptions "services.bacula-sd")); + type = types.attrsOf (types.submodule (directorOptions "services.bacula-sd")); }; device = mkOption { default = {}; - description = lib.mdDoc '' + description = mdDoc '' This option defines Device resources in Bacula Storage Daemon. ''; - type = with types; attrsOf (submodule deviceOptions); + type = types.attrsOf (types.submodule deviceOptions); }; autochanger = mkOption { default = {}; - description = lib.mdDoc '' + description = mdDoc '' This option defines Autochanger resources in Bacula Storage Daemon. ''; - type = with types; attrsOf (submodule autochangerOptions); + type = types.attrsOf (types.submodule autochangerOptions); }; extraStorageConfig = mkOption { default = ""; type = types.lines; - description = lib.mdDoc '' + description = mdDoc '' Extra configuration to be passed in Storage directive. ''; example = '' @@ -543,7 +553,7 @@ in { extraMessagesConfig = mkOption { default = ""; type = types.lines; - description = lib.mdDoc '' + description = mdDoc '' Extra configuration to be passed in Messages directive. ''; example = '' @@ -565,7 +575,7 @@ in { enable = mkOption { type = types.bool; default = false; - description = lib.mdDoc '' + description = mdDoc '' Whether to enable Bacula Director Daemon. ''; }; @@ -574,7 +584,7 @@ in { default = "${config.networking.hostName}-dir"; defaultText = literalExpression ''"''${config.networking.hostName}-dir"''; type = types.str; - description = lib.mdDoc '' + description = mdDoc '' The director name used by the system administrator. This directive is required. ''; @@ -583,7 +593,7 @@ in { port = mkOption { default = 9101; type = types.port; - description = lib.mdDoc '' + description = mdDoc '' Specify the port (a positive integer) on which the Director daemon will listen for Bacula Console connections. This same port number must be specified in the Director resource of the Console @@ -596,7 +606,7 @@ in { password = mkOption { # TODO: required? type = types.str; - description = lib.mdDoc '' + description = mdDoc '' Specifies the password that must be supplied for a Director. ''; }; @@ -604,7 +614,7 @@ in { extraMessagesConfig = mkOption { default = ""; type = types.lines; - description = lib.mdDoc '' + description = mdDoc '' Extra configuration to be passed in Messages directive. ''; example = '' @@ -615,7 +625,7 @@ in { extraDirectorConfig = mkOption { default = ""; type = types.lines; - description = lib.mdDoc '' + description = mdDoc '' Extra configuration to be passed in Director directive. ''; example = '' @@ -627,7 +637,7 @@ in { extraConfig = mkOption { default = ""; type = types.lines; - description = lib.mdDoc '' + description = mdDoc '' Extra configuration for Bacula Director Daemon. ''; example = '' From 2735157bd91b2caeca304ab43ac28b8682f2bfd0 Mon Sep 17 00:00:00 2001 From: Sergey Date: Sat, 2 Mar 2024 22:29:37 +0000 Subject: [PATCH 009/230] maintainer-list: add kuznetsss --- maintainers/maintainer-list.nix | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index 766a1985abfa..beda679ca36a 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -10538,6 +10538,12 @@ githubId = 449813; name = "Roman Kuznetsov"; }; + kuznetsss = { + email = "kuzzz99@gmail.com"; + github = "kuznetsss"; + githubId = 15742918; + name = "Sergey Kuznetsov"; + }; kwohlfahrt = { email = "kai.wohlfahrt@gmail.com"; github = "kwohlfahrt"; From 5c792c8dabc8dd940b1b69ec69423f4a6aa78414 Mon Sep 17 00:00:00 2001 From: Simon Hollingshead Date: Sun, 3 Mar 2024 01:49:34 +0000 Subject: [PATCH 010/230] musescore: Remove 'broken' for aarch64-linux. --- pkgs/applications/audio/musescore/default.nix | 3 --- 1 file changed, 3 deletions(-) diff --git a/pkgs/applications/audio/musescore/default.nix b/pkgs/applications/audio/musescore/default.nix index 71ae712c9f67..d6c90f896dfd 100644 --- a/pkgs/applications/audio/musescore/default.nix +++ b/pkgs/applications/audio/musescore/default.nix @@ -142,9 +142,6 @@ in stdenv'.mkDerivation (finalAttrs: { homepage = "https://musescore.org/"; license = licenses.gpl3Only; maintainers = with maintainers; [ vandenoever doronbehar ]; - # on aarch64-linux: - # error: cannot convert '' to 'float32x4_t' in assignment - broken = (stdenv.isLinux && stdenv.isAarch64); mainProgram = "mscore"; }; }) From a83f50c7203322dfd31c09d967ed8e2ab4afa511 Mon Sep 17 00:00:00 2001 From: Harsh Shandilya Date: Sun, 3 Mar 2024 14:07:44 +0530 Subject: [PATCH 011/230] scrcpy: 2.3.1 -> 2.4 --- pkgs/misc/scrcpy/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/misc/scrcpy/default.nix b/pkgs/misc/scrcpy/default.nix index a1c8fb43c20f..6f2fde718dce 100644 --- a/pkgs/misc/scrcpy/default.nix +++ b/pkgs/misc/scrcpy/default.nix @@ -16,12 +16,12 @@ }: let - version = "2.3.1"; + version = "2.4"; prebuilt_server = fetchurl { name = "scrcpy-server"; inherit version; url = "https://github.com/Genymobile/scrcpy/releases/download/v${version}/scrcpy-server-v${version}"; - hash = "sha256-9oFIIvwwinpTLyU0hckDgYPGKWpsXfRwqeODtPjnYFs="; + hash = "sha256-k8Jyt0OGBcBV4Sf3REBk7Xj6nKSfgRVnd/0gHnnOe6M="; }; in stdenv.mkDerivation rec { @@ -32,7 +32,7 @@ stdenv.mkDerivation rec { owner = "Genymobile"; repo = "scrcpy"; rev = "refs/tags/v${version}"; - hash = "sha256-RM29WjzsYnn26x/Xr2RKp0p87/v+Jl8skEcAwxhZEtU="; + hash = "sha256-x1feZgCR3ZUi40/YZSjDULYk4W9Pjo17cn8RqcOoeoE="; }; # display.c: When run without a hardware accelerator, this allows the command to continue working rather than failing unexpectedly. From 4d3910b48038067a9a3c9c8586b83de325680089 Mon Sep 17 00:00:00 2001 From: Marco Rebhan Date: Mon, 18 Dec 2023 03:10:46 +0100 Subject: [PATCH 012/230] gnustep: replace custom builder with hooks --- .../graphics/pikopixel/default.nix | 8 +- .../window-managers/owl/default.nix | 8 +- pkgs/desktops/gnustep/back/default.nix | 21 ++- pkgs/desktops/gnustep/base/default.nix | 44 ++++-- pkgs/desktops/gnustep/default.nix | 17 ++- pkgs/desktops/gnustep/gorm/default.nix | 24 +++- pkgs/desktops/gnustep/gui/default.nix | 23 +++- pkgs/desktops/gnustep/gworkspace/default.nix | 28 +++- pkgs/desktops/gnustep/libobjc2/default.nix | 16 ++- pkgs/desktops/gnustep/make/builder.sh | 127 ------------------ pkgs/desktops/gnustep/make/default.nix | 23 ++-- .../gnustep/make/gsmakeDerivation.nix | 19 --- pkgs/desktops/gnustep/make/setup-hook.sh | 96 ++++++------- pkgs/desktops/gnustep/make/wrapper.sh | 4 - .../gnustep/projectcenter/default.nix | 33 +++-- .../gnustep/systempreferences/default.nix | 32 +++-- pkgs/desktops/gnustep/wrapGNUstepAppsHook.nix | 8 ++ pkgs/desktops/gnustep/wrapGNUstepAppsHook.sh | 96 +++++++++++++ 18 files changed, 345 insertions(+), 282 deletions(-) delete mode 100644 pkgs/desktops/gnustep/make/builder.sh delete mode 100644 pkgs/desktops/gnustep/make/gsmakeDerivation.nix delete mode 100644 pkgs/desktops/gnustep/make/wrapper.sh create mode 100644 pkgs/desktops/gnustep/wrapGNUstepAppsHook.nix create mode 100644 pkgs/desktops/gnustep/wrapGNUstepAppsHook.sh diff --git a/pkgs/applications/graphics/pikopixel/default.nix b/pkgs/applications/graphics/pikopixel/default.nix index 816d9af62aa3..f8719cc0a4cd 100644 --- a/pkgs/applications/graphics/pikopixel/default.nix +++ b/pkgs/applications/graphics/pikopixel/default.nix @@ -1,9 +1,10 @@ { lib +, clangStdenv , fetchurl , gnustep }: -gnustep.gsmakeDerivation rec { +clangStdenv.mkDerivation rec { pname = "pikopixel"; version = "1.0-b10"; @@ -14,6 +15,11 @@ gnustep.gsmakeDerivation rec { sourceRoot = "PikoPixel.Sources.${version}/PikoPixel"; + nativeBuildInputs = [ + gnustep.make + gnustep.wrapGNUstepAppsHook + ]; + buildInputs = [ gnustep.base gnustep.gui diff --git a/pkgs/applications/window-managers/owl/default.nix b/pkgs/applications/window-managers/owl/default.nix index fa9ea8e8b6a1..d3f018eb1202 100644 --- a/pkgs/applications/window-managers/owl/default.nix +++ b/pkgs/applications/window-managers/owl/default.nix @@ -1,5 +1,5 @@ { lib -, stdenv +, clangStdenv , fetchFromGitHub , gnustep , libxkbcommon @@ -12,9 +12,10 @@ assert wayland.withLibraries; let - mkDerivation = if stdenv.isDarwin then stdenv.mkDerivation else gnustep.gsmakeDerivation; + stdenv = clangStdenv; in -mkDerivation { + +stdenv.mkDerivation { pname = "owl-compositor"; version = "unstable-2021-11-10"; @@ -43,6 +44,7 @@ mkDerivation { darwin.bootstrap_cmds ] ++ lib.optionals (!stdenv.isDarwin) [ gnustep.make + gnustep.wrapGNUstepAppsHook ]; buildInputs = [ diff --git a/pkgs/desktops/gnustep/back/default.nix b/pkgs/desktops/gnustep/back/default.nix index 867c82881c1a..370143e1269f 100644 --- a/pkgs/desktops/gnustep/back/default.nix +++ b/pkgs/desktops/gnustep/back/default.nix @@ -1,7 +1,11 @@ -{ gsmakeDerivation +{ lib +, stdenv +, make +, wrapGNUstepAppsHook , cairo , fetchzip -, base, gui +, base +, gui , fontconfig , freetype , pkg-config @@ -9,18 +13,23 @@ , libXmu }: -gsmakeDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "gnustep-back"; version = "0.30.0"; src = fetchzip { - url = "ftp://ftp.gnustep.org/pub/gnustep/core/${pname}-${version}.tar.gz"; + url = "ftp://ftp.gnustep.org/pub/gnustep/core/gnustep-back-${finalAttrs.version}.tar.gz"; sha256 = "sha256-HD4PLdkE573nPWqFwffUmcHw8VYIl5rLiPKWrbnwpCI="; }; - nativeBuildInputs = [ pkg-config ]; + nativeBuildInputs = [ make pkg-config wrapGNUstepAppsHook ]; buildInputs = [ cairo base gui fontconfig freetype libXft libXmu ]; + meta = { description = "A generic backend for GNUstep"; + homepage = "https://gnustep.github.io/"; + license = lib.licenses.lgpl2Plus; + maintainers = with lib.maintainers; [ ashalkhakov matthewbauer dblsaiko ]; + platforms = lib.platforms.linux; }; -} +}) diff --git a/pkgs/desktops/gnustep/base/default.nix b/pkgs/desktops/gnustep/base/default.nix index 3803a88ce191..acda20c817d6 100644 --- a/pkgs/desktops/gnustep/base/default.nix +++ b/pkgs/desktops/gnustep/base/default.nix @@ -1,26 +1,40 @@ -{ aspell, audiofile -, gsmakeDerivation +{ lib +, stdenv +, aspell +, audiofile +, make +, wrapGNUstepAppsHook , cups , fetchzip , fetchpatch -, gmp, gnutls -, libffi, binutils-unwrapped -, libjpeg, libtiff, libpng, giflib -, libxml2, libxslt, libiconv -, libobjc, libgcrypt +, gmp +, gnutls +, libffi +, binutils-unwrapped +, libjpeg +, libtiff +, libpng +, giflib +, libxml2 +, libxslt +, libiconv +, libobjc +, libgcrypt , icu -, pkg-config, portaudio +, pkg-config +, portaudio , libiberty }: -gsmakeDerivation rec { + +stdenv.mkDerivation (finalAttrs: { pname = "gnustep-base"; version = "1.29.0"; src = fetchzip { - url = "ftp://ftp.gnustep.org/pub/gnustep/core/${pname}-${version}.tar.gz"; + url = "ftp://ftp.gnustep.org/pub/gnustep/core/gnustep-base-${finalAttrs.version}.tar.gz"; hash = "sha256-4fjdsLBsYEDxLOFrq17dKii2sLKvOaFCu0cw3qQtM5U="; }; outputs = [ "out" "dev" "lib" ]; - nativeBuildInputs = [ pkg-config ]; + nativeBuildInputs = [ pkg-config make wrapGNUstepAppsHook ]; propagatedBuildInputs = [ aspell audiofile cups @@ -55,7 +69,11 @@ gsmakeDerivation rec { ]; meta = { + changelog = "https://github.com/gnustep/libs-base/releases/tag/base-${builtins.replaceStrings [ "." ] [ "_" ] finalAttrs.version}"; description = "An implementation of AppKit and Foundation libraries of OPENSTEP and Cocoa"; - changelog = "https://github.com/gnustep/libs-base/releases/tag/base-${builtins.replaceStrings [ "." ] [ "_" ] version}"; + homepage = "https://gnustep.github.io/"; + license = lib.licenses.lgpl2Plus; + maintainers = with lib.maintainers; [ ashalkhakov matthewbauer dblsaiko ]; + platforms = lib.platforms.linux; }; -} +}) diff --git a/pkgs/desktops/gnustep/default.nix b/pkgs/desktops/gnustep/default.nix index d337512dceca..53040ace672d 100644 --- a/pkgs/desktops/gnustep/default.nix +++ b/pkgs/desktops/gnustep/default.nix @@ -5,18 +5,21 @@ let callPackage = newScope self; - self = rec { + self = { stdenv = llvmPackages.stdenv; - gsmakeDerivation = callPackage ./make/gsmakeDerivation.nix {}; + wrapGNUstepAppsHook = callPackage ./wrapGNUstepAppsHook.nix {}; + + make = callPackage ./make {}; + + libobjc = callPackage ./libobjc2 {}; + base = callPackage ./base {}; + back = callPackage ./back {}; + gui = callPackage ./gui {}; + gorm = callPackage ./gorm {}; projectcenter = callPackage ./projectcenter {}; system_preferences = callPackage ./systempreferences {}; - libobjc = callPackage ./libobjc2 {}; - make = callPackage ./make {}; - back = callPackage ./back {}; - base = callPackage ./base { }; - gui = callPackage ./gui {}; gworkspace = callPackage ./gworkspace {}; }; diff --git a/pkgs/desktops/gnustep/gorm/default.nix b/pkgs/desktops/gnustep/gorm/default.nix index 0897ceefdba6..f48600263447 100644 --- a/pkgs/desktops/gnustep/gorm/default.nix +++ b/pkgs/desktops/gnustep/gorm/default.nix @@ -1,15 +1,31 @@ -{ fetchzip, base, back, gsmakeDerivation, gui }: -gsmakeDerivation rec { +{ lib +, stdenv +, fetchzip +, base +, back +, make +, wrapGNUstepAppsHook +, gui +}: + +stdenv.mkDerivation (finalAttrs: { pname = "gorm"; version = "1.3.1"; src = fetchzip { - url = "ftp://ftp.gnustep.org/pub/gnustep/dev-apps/gorm-${version}.tar.gz"; + url = "ftp://ftp.gnustep.org/pub/gnustep/dev-apps/gorm-${finalAttrs.version}.tar.gz"; sha256 = "sha256-W+NgbvLjt1PpDiauhzWFaU1/CUhmDACQz+GoyRUyWB8="; }; + + nativeBuildInputs = [ make wrapGNUstepAppsHook ]; buildInputs = [ base back gui ]; meta = { description = "Graphical Object Relationship Modeller is an easy-to-use interface designer for GNUstep"; + homepage = "https://gnustep.github.io/"; + license = lib.licenses.lgpl2Plus; + mainProgram = "Gorm"; + maintainers = with lib.maintainers; [ ashalkhakov matthewbauer dblsaiko ]; + platforms = lib.platforms.linux; }; -} +}) diff --git a/pkgs/desktops/gnustep/gui/default.nix b/pkgs/desktops/gnustep/gui/default.nix index 962d6eef7fde..448f4c60136a 100644 --- a/pkgs/desktops/gnustep/gui/default.nix +++ b/pkgs/desktops/gnustep/gui/default.nix @@ -1,19 +1,32 @@ -{ gsmakeDerivation, fetchzip, base }: +{ lib +, stdenv +, make +, wrapGNUstepAppsHook +, fetchzip +, base +}: -gsmakeDerivation rec { +stdenv.mkDerivation (finalAttrs: { version = "0.30.0"; pname = "gnustep-gui"; src = fetchzip { - url = "ftp://ftp.gnustep.org/pub/gnustep/core/${pname}-${version}.tar.gz"; + url = "ftp://ftp.gnustep.org/pub/gnustep/core/gnustep-gui-${finalAttrs.version}.tar.gz"; sha256 = "sha256-24hL4TeIY6izlhQUcxKI0nXITysAPfRrncRqsDm2zNk="; }; + + nativeBuildInputs = [ make wrapGNUstepAppsHook ]; buildInputs = [ base ]; + patches = [ ./fixup-all.patch ]; meta = { + changelog = "https://github.com/gnustep/libs-gui/releases/tag/gui-${builtins.replaceStrings [ "." ] [ "_" ] finalAttrs.version}"; description = "A GUI class library of GNUstep"; - changelog = "https://github.com/gnustep/libs-gui/releases/tag/gui-${builtins.replaceStrings [ "." ] [ "_" ] version}"; + homepage = "https://gnustep.github.io/"; + license = lib.licenses.lgpl2Plus; + maintainers = with lib.maintainers; [ ashalkhakov matthewbauer dblsaiko ]; + platforms = lib.platforms.linux; }; -} +}) diff --git a/pkgs/desktops/gnustep/gworkspace/default.nix b/pkgs/desktops/gnustep/gworkspace/default.nix index cdc6612d1c06..d2343dfb0113 100644 --- a/pkgs/desktops/gnustep/gworkspace/default.nix +++ b/pkgs/desktops/gnustep/gworkspace/default.nix @@ -1,22 +1,36 @@ -{ back, base, gui, gsmakeDerivation +{ lib +, stdenv +, back +, base +, gui +, make +, wrapGNUstepAppsHook , fetchurl , system_preferences }: -let + +stdenv.mkDerivation (finalAttrs: { + pname = "gworkspace"; version = "1.0.0"; -in -gsmakeDerivation { - name = "gworkspace-${version}"; + src = fetchurl { - url = "ftp://ftp.gnustep.org/pub/gnustep/usr-apps/gworkspace-${version}.tar.gz"; + url = "ftp://ftp.gnustep.org/pub/gnustep/usr-apps/gworkspace-${finalAttrs.version}.tar.gz"; sha256 = "sha256-M7dV7RVatw8gdYHQlRi5wNBd6MGT9GqW04R/DoKNu6I="; }; + # additional dependencies: # - PDFKit framework from http://gap.nongnu.org/ # - TODO: to --enable-gwmetadata, need libDBKit as well as sqlite! + nativeBuildInputs = [ make wrapGNUstepAppsHook ]; buildInputs = [ back base gui system_preferences ]; configureFlags = [ "--with-inotify" ]; + meta = { description = "A workspace manager for GNUstep"; + homepage = "https://gnustep.github.io/"; + license = lib.licenses.lgpl2Plus; + mainProgram = "GWorkspace"; + maintainers = with lib.maintainers; [ ashalkhakov matthewbauer dblsaiko ]; + platforms = lib.platforms.linux; }; -} +}) diff --git a/pkgs/desktops/gnustep/libobjc2/default.nix b/pkgs/desktops/gnustep/libobjc2/default.nix index b44e60ce233d..2e487fddf431 100644 --- a/pkgs/desktops/gnustep/libobjc2/default.nix +++ b/pkgs/desktops/gnustep/libobjc2/default.nix @@ -1,13 +1,17 @@ -{ stdenv, lib, fetchFromGitHub, cmake }: +{ lib +, stdenv +, fetchFromGitHub +, cmake +}: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "libobjc2"; version = "2.1"; src = fetchFromGitHub { owner = "gnustep"; repo = "libobjc2"; - rev = "v${version}"; + rev = "v${finalAttrs.version}"; hash = "sha256-iDOVEDnTAfg9r3/kdHp7hzX2oIjO1ovaqgrlIV7V68M="; fetchSubmodules = true; }; @@ -19,9 +23,9 @@ stdenv.mkDerivation rec { meta = with lib; { broken = stdenv.isDarwin; description = "Objective-C runtime for use with GNUstep"; - homepage = "http://gnustep.org/"; + homepage = "https://gnustep.github.io/"; license = licenses.mit; - maintainers = with maintainers; [ ashalkhakov matthewbauer ]; + maintainers = with lib.maintainers; [ ashalkhakov matthewbauer dblsaiko ]; platforms = platforms.unix; }; -} +}) diff --git a/pkgs/desktops/gnustep/make/builder.sh b/pkgs/desktops/gnustep/make/builder.sh deleted file mode 100644 index 79ead3f7b729..000000000000 --- a/pkgs/desktops/gnustep/make/builder.sh +++ /dev/null @@ -1,127 +0,0 @@ -if [ -e "$NIX_ATTRS_SH_FILE" ]; then . "$NIX_ATTRS_SH_FILE"; elif [ -f .attrs.sh ]; then . .attrs.sh; fi -source $stdenv/setup - -providedPreConfigure="$preConfigure"; - -preConfigure() { - eval "$providedPreConfigure" - - . $GNUSTEP_MAKEFILES/GNUstep.sh -} - -wrapGSMake() { - local program="$1" - local config="$2" - local wrapped="$(dirname $program)/.$(basename $program)-wrapped" - - mv "$program" "$wrapped" - - cat > "$program"<> $conf - if [ -n "$NIX_GNUSTEP_SYSTEM_APPS" ]; then - echo NIX_GNUSTEP_SYSTEM_APPS="$NIX_GNUSTEP_SYSTEM_APPS" - fi - if [ -n "$NIX_GNUSTEP_SYSTEM_ADMIN_APPS" ]; then - echo NIX_GNUSTEP_SYSTEM_ADMIN_APPS="$NIX_GNUSTEP_SYSTEM_ADMIN_APPS" >> $conf - fi - if [ -n "$NIX_GNUSTEP_SYSTEM_WEB_APPS" ]; then - echo NIX_GNUSTEP_SYSTEM_WEB_APPS="$NIX_GNUSTEP_SYSTEM_WEB_APPS" >> $conf - fi - if [ -n "$NIX_GNUSTEP_SYSTEM_TOOLS" ]; then - echo NIX_GNUSTEP_SYSTEM_TOOLS="$NIX_GNUSTEP_SYSTEM_TOOLS" >> $conf - fi - if [ -n "$NIX_GNUSTEP_SYSTEM_ADMIN_TOOLS" ]; then - echo NIX_GNUSTEP_SYSTEM_ADMIN_TOOLS="$NIX_GNUSTEP_SYSTEM_ADMIN_TOOLS" >> $conf - fi - if [ -n "$NIX_GNUSTEP_SYSTEM_LIBRARY" ]; then - echo NIX_GNUSTEP_SYSTEM_LIBRARY="$NIX_GNUSTEP_SYSTEM_LIBRARY" >> $conf - fi - if [ -n "$NIX_GNUSTEP_SYSTEM_HEADERS" ]; then - echo NIX_GNUSTEP_SYSTEM_HEADERS="$NIX_GNUSTEP_SYSTEM_HEADERS" >> $conf - fi - if [ -n "$NIX_GNUSTEP_SYSTEM_LIBRARIES" ]; then - echo NIX_GNUSTEP_SYSTEM_LIBRARIES="$NIX_GNUSTEP_SYSTEM_LIBRARIES" >> $conf - fi - if [ -n "$NIX_GNUSTEP_SYSTEM_DOC" ]; then - echo NIX_GNUSTEP_SYSTEM_DOC="$NIX_GNUSTEP_SYSTEM_DOC" >> $conf - fi - if [ -n "$NIX_GNUSTEP_SYSTEM_DOC_MAN" ]; then - echo NIX_GNUSTEP_SYSTEM_DOC_MAN="$NIX_GNUSTEP_SYSTEM_DOC_MAN" >> $conf - fi - if [ -n "$NIX_GNUSTEP_SYSTEM_DOC_INFO" ]; then - echo NIX_GNUSTEP_SYSTEM_DOC_INFO="$NIX_GNUSTEP_SYSTEM_DOC_INFO" >> $conf - fi - - for i in $out/bin/*; do - echo "wrapping $(basename $i)" - wrapGSMake "$i" "$out/share/.GNUstep.conf" - done -} - -genericBuild diff --git a/pkgs/desktops/gnustep/make/default.nix b/pkgs/desktops/gnustep/make/default.nix index f9b4ae553c85..290e3004497f 100644 --- a/pkgs/desktops/gnustep/make/default.nix +++ b/pkgs/desktops/gnustep/make/default.nix @@ -1,11 +1,16 @@ -{ lib, stdenv, fetchurl, clang, which, libobjc }: +{ lib +, stdenv +, fetchurl +, which +, libobjc +}: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "gnustep-make"; version = "2.9.1"; src = fetchurl { - url = "ftp://ftp.gnustep.org/pub/gnustep/core/gnustep-make-${version}.tar.gz"; + url = "ftp://ftp.gnustep.org/pub/gnustep/core/gnustep-make-${finalAttrs.version}.tar.gz"; sha256 = "sha256-w9bnDPFWsn59HtJQHFffP5bidIjOLzUbk+R5xYwB6uc="; }; @@ -22,17 +27,19 @@ stdenv.mkDerivation rec { "GNUSTEP_INSTALLATION_DOMAIN=SYSTEM" ]; - nativeBuildInputs = [ clang which ]; buildInputs = [ libobjc ]; + propagatedBuildInputs = [ which ]; + patches = [ ./fixup-paths.patch ]; setupHook = ./setup-hook.sh; + meta = { + changelog = "https://github.com/gnustep/tools-make/releases/tag/make-${builtins.replaceStrings [ "." ] [ "_" ] finalAttrs.version}"; description = "A build manager for GNUstep"; - homepage = "http://gnustep.org/"; - changelog = "https://github.com/gnustep/tools-make/releases/tag/make-${builtins.replaceStrings [ "." ] [ "_" ] version}"; + homepage = "https://gnustep.github.io/"; license = lib.licenses.lgpl2Plus; - maintainers = with lib.maintainers; [ ashalkhakov matthewbauer ]; + maintainers = with lib.maintainers; [ ashalkhakov matthewbauer dblsaiko ]; platforms = lib.platforms.unix; }; -} +}) diff --git a/pkgs/desktops/gnustep/make/gsmakeDerivation.nix b/pkgs/desktops/gnustep/make/gsmakeDerivation.nix deleted file mode 100644 index 04cfcc1ca343..000000000000 --- a/pkgs/desktops/gnustep/make/gsmakeDerivation.nix +++ /dev/null @@ -1,19 +0,0 @@ -{ lib, stdenv, make, makeWrapper, which }: -{ nativeBuildInputs ? [], ...} @ args: -stdenv.mkDerivation (args // { - nativeBuildInputs = [ makeWrapper make which ] ++ nativeBuildInputs; - - builder = ./builder.sh; - setupHook = ./setup-hook.sh; - - GNUSTEP_MAKEFILES = "${make}/share/GNUstep/Makefiles"; - - meta = { - homepage = "http://gnustep.org/"; - - license = lib.licenses.lgpl2Plus; - - maintainers = with lib.maintainers; [ ashalkhakov matthewbauer ]; - platforms = lib.platforms.linux; - } // (lib.optionalAttrs (builtins.hasAttr "meta" args) args.meta); -}) diff --git a/pkgs/desktops/gnustep/make/setup-hook.sh b/pkgs/desktops/gnustep/make/setup-hook.sh index 83adfefc10cd..0bfbd35f45f5 100644 --- a/pkgs/desktops/gnustep/make/setup-hook.sh +++ b/pkgs/desktops/gnustep/make/setup-hook.sh @@ -20,62 +20,52 @@ addGnustepInstallFlags() { preInstallPhases+=" addGnustepInstallFlags" -addEnvVars() { +addGNUstepEnvVars() { local filename + gsAddToSearchPath() { + if [[ -d "$2" && "${!1-}" != *"$2"* ]]; then + addToSearchPath "$1" "$2" + fi + } + + gsAddToIncludeSearchPath() { + local -n ref="$1" + + # NOTE: contrary to the one in wrapGNUstepAppsHook, use -e here instead of -d since it's also used for the makefiles + if [[ -e "$2" && "${ref-}" != *"$2"* ]]; then + if [[ "${ref-}" != "" ]]; then + ref+=" " + fi + + ref+="$2" + fi + } + for filename in $1/share/GNUstep/Makefiles/Additional/*.make ; do - if case "${NIX_GNUSTEP_MAKEFILES_ADDITIONAL-}" in *"{$filename}"*) false;; *) true;; esac; then - export NIX_GNUSTEP_MAKEFILES_ADDITIONAL+=" $filename" - fi + gsAddToIncludeSearchPath NIX_GNUSTEP_MAKEFILES_ADDITIONAL "$filename" done - local tmp="$1/lib/GNUstep/Applications" - if [ -d "$tmp" ] && case "${NIX_GNUSTEP_SYSTEM_APPS-}" in *"${tmp}"*) false;; *) true;; esac; then - addToSearchPath NIX_GNUSTEP_SYSTEM_APPS "$tmp" - fi - tmp="$1/lib/GNUstep/Applications" - if [ -d "$tmp" ] && case "${NIX_GNUSTEP_SYSTEM_ADMIN_APPS-}" in *"${tmp}"*) false;; *) true;; esac; then - addToSearchPath NIX_GNUSTEP_SYSTEM_ADMIN_APPS "$tmp" - fi - tmp="$1/lib/GNUstep/WebApplications" - if [ -d "$tmp" ] && case "${NIX_GNUSTEP_SYSTEM_WEB_APPS-}" in *"${tmp}"*) false;; *) true;; esac; then - addToSearchPath NIX_GNUSTEP_SYSTEM_WEB_APPS "$tmp" - fi - tmp="$1/bin" - if [ -d "$tmp" ] && case "${NIX_GNUSTEP_SYSTEM_TOOLS-}" in *"${tmp}"*) false;; *) true;; esac; then - addToSearchPath NIX_GNUSTEP_SYSTEM_TOOLS "$tmp" - fi - tmp="$1/sbin" - if [ -d "$tmp" ] && case "${NIX_GNUSTEP_SYSTEM_ADMIN_TOOLS-}" in *"${tmp}"*) false;; *) true;; esac; then - addToSearchPath NIX_GNUSTEP_SYSTEM_ADMIN_TOOLS "$tmp" - fi - tmp="$1/lib/GNUstep" - if [ -d "$tmp" ] && case "${NIX_GNUSTEP_SYSTEM_LIBRARY-}" in *"${tmp}"*) false;; *) true;; esac; then - addToSearchPath NIX_GNUSTEP_SYSTEM_LIBRARY "$tmp" - fi - tmp="$1/include" - if [ -d "$tmp" ] && case "${NIX_GNUSTEP_SYSTEM_HEADERS-}" in *"${tmp}"*) false;; *) true;; esac; then - if [ -z "${NIX_GNUSTEP_SYSTEM_HEADERS-}" ]; then - export NIX_GNUSTEP_SYSTEM_HEADERS="$tmp" - else - export NIX_GNUSTEP_SYSTEM_HEADERS+=" $tmp" - fi - fi - tmp="$1/lib" - if [ -d "$tmp" ] && case "${NIX_GNUSTEP_SYSTEM_LIBRARIES-}" in *"${tmp}"*) false;; *) true;; esac; then - addToSearchPath NIX_GNUSTEP_SYSTEM_LIBRARIES "$tmp" - fi - tmp="$1/share/GNUstep/Documentation" - if [ -d "$tmp" ] && case "${NIX_GNUSTEP_SYSTEM_DOC-}" in *"${tmp}"*) false;; *) true;; esac; then - addToSearchPath NIX_GNUSTEP_SYSTEM_DOC "$tmp" - fi - tmp="$1/share/man" - if [ -d "$tmp" ] && case "${NIX_GNUSTEP_SYSTEM_DOC_MAN-}" in *"${tmp}"*) false;; *) true;; esac; then - addToSearchPath NIX_GNUSTEP_SYSTEM_DOC_MAN "$tmp" - fi - tmp="$1/share/info" - if [ -d "$tmp" ] && case "${NIX_GNUSTEP_SYSTEM_DOC_INFO-}" in *"${tmp}"*) false;; *) true;; esac; then - addToSearchPath NIX_GNUSTEP_SYSTEM_DOC_INFO "$tmp" - fi + export NIX_GNUSTEP_MAKEFILES_ADDITIONAL + + gsAddToSearchPath NIX_GNUSTEP_SYSTEM_APPS "$1/lib/GNUstep/Applications" + gsAddToSearchPath NIX_GNUSTEP_SYSTEM_ADMIN_APPS "$1/lib/GNUstep/Applications" + gsAddToSearchPath NIX_GNUSTEP_SYSTEM_WEB_APPS "$1/lib/GNUstep/WebApplications" + gsAddToSearchPath NIX_GNUSTEP_SYSTEM_TOOLS "$1/bin" + gsAddToSearchPath NIX_GNUSTEP_SYSTEM_ADMIN_TOOLS "$1/sbin" + gsAddToSearchPath NIX_GNUSTEP_SYSTEM_LIBRARY "$1/lib/GNUstep" + gsAddToIncludeSearchPath NIX_GNUSTEP_SYSTEM_HEADERS "$1/include" + gsAddToSearchPath NIX_GNUSTEP_SYSTEM_LIBRARIES "$1/lib" + gsAddToSearchPath NIX_GNUSTEP_SYSTEM_DOC "$1/share/GNUstep/Documentation" + gsAddToSearchPath NIX_GNUSTEP_SYSTEM_DOC_MAN "$1/share/man" + gsAddToSearchPath NIX_GNUSTEP_SYSTEM_DOC_INFO "$1/share/info" } -addEnvHooks "$targetOffset" addEnvVars +addEnvHooks "$targetOffset" addGNUstepEnvVars + +gsmakeSetup() { + export GNUSTEP_MAKEFILES="$(gnustep-config --variable=GNUSTEP_MAKEFILES)" + + . $GNUSTEP_MAKEFILES/GNUstep.sh +} + +preConfigureHooks+=(gsmakeSetup) diff --git a/pkgs/desktops/gnustep/make/wrapper.sh b/pkgs/desktops/gnustep/make/wrapper.sh deleted file mode 100644 index 1bc2e130d88d..000000000000 --- a/pkgs/desktops/gnustep/make/wrapper.sh +++ /dev/null @@ -1,4 +0,0 @@ -#!/bin/sh - -. $GNUSTEP_MAKEFILES/GNUstep.sh -$1 diff --git a/pkgs/desktops/gnustep/projectcenter/default.nix b/pkgs/desktops/gnustep/projectcenter/default.nix index b535365b25d9..89f2e769a066 100644 --- a/pkgs/desktops/gnustep/projectcenter/default.nix +++ b/pkgs/desktops/gnustep/projectcenter/default.nix @@ -1,21 +1,29 @@ -{ lib, fetchFromGitHub -, base, back, gsmakeDerivation, gui, gorm -, gnumake, gdb +{ lib +, stdenv +, fetchFromGitHub +, make +, wrapGNUstepAppsHook +, base +, back +, gui +, gorm +, gnumake +, gdb }: -let - version = "0.7.0"; -in -gsmakeDerivation { + +stdenv.mkDerivation (finalAttrs: { pname = "projectcenter"; - inherit version; + version = "0.7.0"; src = fetchFromGitHub { owner = "gnustep"; repo = "apps-projectcenter"; - rev = "projectcenter-${lib.replaceStrings [ "." ] [ "_" ] version}"; + rev = "projectcenter-${lib.replaceStrings [ "." ] [ "_" ] finalAttrs.version}"; hash = "sha256-uXT2UUvMZNc6Fqi2BUXQimbZk8b3IqXzB+A2btBOmms="; }; + nativeBuildInputs = [ make wrapGNUstepAppsHook ]; + # NOTE: need a patch for ProjectCenter to help it locate some necessary tools: # 1. Framework/PCProjectLauncher.m, locate gdb (say among NIX_GNUSTEP_SYSTEM_TOOLS) # 2. Framework/PCProjectBuilder.m, locate gmake (similar) @@ -23,5 +31,10 @@ gsmakeDerivation { meta = { description = "GNUstep's integrated development environment"; + homepage = "https://gnustep.github.io/"; + license = lib.licenses.lgpl2Plus; + mainProgram = "ProjectCenter"; + maintainers = with lib.maintainers; [ ashalkhakov matthewbauer dblsaiko ]; + platforms = lib.platforms.linux; }; -} +}) diff --git a/pkgs/desktops/gnustep/systempreferences/default.nix b/pkgs/desktops/gnustep/systempreferences/default.nix index 096520f08f36..c08ad0fc8dbc 100644 --- a/pkgs/desktops/gnustep/systempreferences/default.nix +++ b/pkgs/desktops/gnustep/systempreferences/default.nix @@ -1,17 +1,31 @@ -{ back, base, gui, gsmakeDerivation, fetchurl }: -let +{ lib +, stdenv +, fetchurl +, make +, wrapGNUstepAppsHook +, back +, base +, gui +}: + +stdenv.mkDerivation (finalAttrs: { + pname = "system-preferences"; version = "1.2.0"; -in -gsmakeDerivation { - name = "system_preferences-${version}"; + src = fetchurl { - url = "ftp://ftp.gnustep.org/pub/gnustep/usr-apps/SystemPreferences-${version}.tar.gz"; + url = "ftp://ftp.gnustep.org/pub/gnustep/usr-apps/SystemPreferences-${finalAttrs.version}.tar.gz"; sha256 = "1fg7c3ihfgvl6n21rd17fs9ivx3l8ps874m80vz86n1callgs339"; }; -# GNUSTEP_MAKEFILES = "${gnustep_make}/share/GNUstep/Makefiles"; + + nativeBuildInputs = [ make wrapGNUstepAppsHook ]; buildInputs = [ back base gui ]; -# propagatedBuildInputs = [ gnustep_back gnustep_base gnustep_gui ]; + meta = { description = "The settings manager for the GNUstep environment and its applications"; + homepage = "https://gnustep.github.io/"; + license = lib.licenses.lgpl2Plus; + mainProgram = "SystemPreferences"; + maintainers = with lib.maintainers; [ ashalkhakov matthewbauer dblsaiko ]; + platforms = lib.platforms.linux; }; -} +}) diff --git a/pkgs/desktops/gnustep/wrapGNUstepAppsHook.nix b/pkgs/desktops/gnustep/wrapGNUstepAppsHook.nix new file mode 100644 index 000000000000..8a2339ddeb52 --- /dev/null +++ b/pkgs/desktops/gnustep/wrapGNUstepAppsHook.nix @@ -0,0 +1,8 @@ +{makeBinaryWrapper, makeSetupHook}: + +makeSetupHook + { + name = "wrapGNUstepAppsHook"; + propagatedBuildInputs = [makeBinaryWrapper]; + } + ./wrapGNUstepAppsHook.sh diff --git a/pkgs/desktops/gnustep/wrapGNUstepAppsHook.sh b/pkgs/desktops/gnustep/wrapGNUstepAppsHook.sh new file mode 100644 index 000000000000..8218ff1e7746 --- /dev/null +++ b/pkgs/desktops/gnustep/wrapGNUstepAppsHook.sh @@ -0,0 +1,96 @@ +if [[ -z "${__nix_wrapGNUstepAppsHook-}" ]]; then + __nix_wrapGNUstepAppsHook=1 # Don't run this hook more than once. + + # Inherit arguments given in mkDerivation + gnustepWrapperArgs=(${gnustepWrapperArgs-}) + + gnustepConfigVars+=( + GNUSTEP_MAKEFILES + NIX_GNUSTEP_SYSTEM_APPS + NIX_GNUSTEP_SYSTEM_ADMIN_APPS + NIX_GNUSTEP_SYSTEM_WEB_APPS + NIX_GNUSTEP_SYSTEM_TOOLS + NIX_GNUSTEP_SYSTEM_ADMIN_TOOLS + NIX_GNUSTEP_SYSTEM_LIBRARY + NIX_GNUSTEP_SYSTEM_HEADERS + NIX_GNUSTEP_SYSTEM_LIBRARIES + NIX_GNUSTEP_SYSTEM_DOC + NIX_GNUSTEP_SYSTEM_DOC_MAN + NIX_GNUSTEP_SYSTEM_DOC_INFO + ) + + wrapGNUstepApp() { + wrapProgram "$1" \ + --set GNUSTEP_CONFIG_FILE "$out/GNUstep.conf" \ + "${gnustepWrapperArgs[@]}" + } + + ensureGNUstepConfig() ( + if [[ -f "$out/GNUstep.conf" ]]; then + return + fi + + echo "writing GNUstep config file" + + gsAddToSearchPath() { + if [[ -d "$2" && "${!1-}" != *"$2"* ]]; then + addToSearchPath "$1" "$2" + fi + } + + gsAddToIncludeSearchPath() { + local -n ref="$1" + + if [[ -d "$2" && "${ref-}" != *"$2"* ]]; then + if [[ "${ref-}" != "" ]]; then + ref+=" " + fi + + ref+="$2" + fi + } + + gsAddToSearchPath NIX_GNUSTEP_SYSTEM_APPS "$out/lib/GNUstep/Applications" + gsAddToSearchPath NIX_GNUSTEP_SYSTEM_ADMIN_APPS "$out/lib/GNUstep/Applications" + gsAddToSearchPath NIX_GNUSTEP_SYSTEM_WEB_APPS "$out/lib/GNUstep/WebApplications" + gsAddToSearchPath NIX_GNUSTEP_SYSTEM_TOOLS "$out/bin" + gsAddToSearchPath NIX_GNUSTEP_SYSTEM_ADMIN_TOOLS "$out/sbin" + gsAddToSearchPath NIX_GNUSTEP_SYSTEM_LIBRARY "$out/lib/GNUstep" + gsAddToIncludeSearchPath NIX_GNUSTEP_SYSTEM_HEADERS "$out/include" + gsAddToSearchPath NIX_GNUSTEP_SYSTEM_LIBRARIES "$out/lib" + gsAddToSearchPath NIX_GNUSTEP_SYSTEM_DOC "$out/share/GNUstep/Documentation" + gsAddToSearchPath NIX_GNUSTEP_SYSTEM_DOC_MAN "$out/share/man" + gsAddToSearchPath NIX_GNUSTEP_SYSTEM_DOC_INFO "$out/share/info" + + for var in "${gnustepConfigVars[@]}"; do + if [[ -n "${!var-}" ]]; then + printf '%s="%s"\n' "$var" "${!var}" + fi + done > "$out/GNUstep.conf" + ) + + # Note: $gnustepWrapperArgs still gets defined even if ${dontWrapGNUstepApps-} is set. + wrapGNUstepAppsHook() { + # skip this hook when requested + [[ -z "${dontWrapGNUstepApps-}" ]] || return 0 + + # guard against running multiple times (e.g. due to propagation) + [[ -z "$wrapGNUstepAppsHookHasRun" ]] || return 0 + wrapGNUstepAppsHookHasRun=1 + + local targetDirs=("$prefix/bin") + echo "wrapping GNUstep applications in ${targetDirs[@]}" + + for targetDir in "${targetDirs[@]}"; do + [[ -d "$targetDir" ]] || continue + + while IFS= read -r -d '' file; do + ensureGNUstepConfig + echo "wrapping $file" + wrapGNUstepApp "$file" + done < <(find "$targetDir" ! -type d -executable -print0) + done + } + + fixupOutputHooks+=(wrapGNUstepAppsHook) +fi From c295ef8fb1082c94d7a67248ec613bf25c5456a7 Mon Sep 17 00:00:00 2001 From: adisbladis Date: Mon, 4 Mar 2024 13:47:44 +1300 Subject: [PATCH 013/230] citrix-workspace: Add opencv 4.7.0 compatibility soname's The expected soname's no longer match since opencv was updated to 4.9.0. This adds another derivation that links the expected names. --- .../networking/remote/citrix-workspace/generic.nix | 14 +++++++++++++- 1 file changed, 13 insertions(+), 1 deletion(-) diff --git a/pkgs/applications/networking/remote/citrix-workspace/generic.nix b/pkgs/applications/networking/remote/citrix-workspace/generic.nix index bf14b0321943..ff945e3aeed2 100644 --- a/pkgs/applications/networking/remote/citrix-workspace/generic.nix +++ b/pkgs/applications/networking/remote/citrix-workspace/generic.nix @@ -22,6 +22,18 @@ let ln -sf $out/lib/libssl.so $out/lib/libssl.so.1.0.0 ''; }; + + opencv4' = symlinkJoin { + name = "opencv4-compat"; + nativeBuildInputs = [ makeWrapper ]; + paths = [ opencv4 ]; + postBuild = '' + for so in ${opencv4}/lib/*.so; do + ln -s "$so" $out/lib/$(basename "$so").407 + done + ''; + }; + in stdenv.mkDerivation rec { @@ -98,7 +110,7 @@ stdenv.mkDerivation rec { mesa nspr nss - opencv4 + opencv4' openssl' pango speex From d3bc8092063b7c03fe480957e13a474557357fbc Mon Sep 17 00:00:00 2001 From: Ivan Mincik Date: Mon, 4 Mar 2024 13:36:37 +0100 Subject: [PATCH 014/230] python3Packages.shapely: 2.0.2 -> 2.0.3 --- pkgs/development/python-modules/shapely/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/shapely/default.nix b/pkgs/development/python-modules/shapely/default.nix index 7f87ddf6befa..822cab758328 100644 --- a/pkgs/development/python-modules/shapely/default.nix +++ b/pkgs/development/python-modules/shapely/default.nix @@ -14,14 +14,14 @@ buildPythonPackage rec { pname = "shapely"; - version = "2.0.2"; + version = "2.0.3"; format = "pyproject"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-FxPMBMFxuv/Fslm6hTHFiswqMBcHt/Ah2IoV7QkGSec="; + hash = "sha256-TWXQqnkQr3Hvpy/WRH4CqOXdRNqBqYPenXNtbmzL5nQ="; }; nativeBuildInputs = [ From fdc2bb0e982d28cb73cc4f46b08251e7a9e14198 Mon Sep 17 00:00:00 2001 From: Ivan Mincik Date: Mon, 4 Mar 2024 13:46:57 +0100 Subject: [PATCH 015/230] python3Packages.shapely: alphabetical ordering of parameters --- pkgs/development/python-modules/shapely/default.nix | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/shapely/default.nix b/pkgs/development/python-modules/shapely/default.nix index 822cab758328..785cacb320ae 100644 --- a/pkgs/development/python-modules/shapely/default.nix +++ b/pkgs/development/python-modules/shapely/default.nix @@ -1,15 +1,16 @@ { lib , stdenv , buildPythonPackage -, pythonOlder , fetchPypi +, pytestCheckHook +, pythonOlder + , cython , geos +, numpy , oldest-supported-numpy , setuptools , wheel -, numpy -, pytestCheckHook }: buildPythonPackage rec { From a402b1c53d62c46fc403a2f4b8d70340bf9378d7 Mon Sep 17 00:00:00 2001 From: Sergey Date: Sat, 2 Mar 2024 22:30:05 +0000 Subject: [PATCH 016/230] git-agecrypt: init at unstable-2023-07-14 --- pkgs/by-name/gi/git-agecrypt/package.nix | 38 ++++++++++++++++++++++++ 1 file changed, 38 insertions(+) create mode 100644 pkgs/by-name/gi/git-agecrypt/package.nix diff --git a/pkgs/by-name/gi/git-agecrypt/package.nix b/pkgs/by-name/gi/git-agecrypt/package.nix new file mode 100644 index 000000000000..62760315484b --- /dev/null +++ b/pkgs/by-name/gi/git-agecrypt/package.nix @@ -0,0 +1,38 @@ +{ lib +, stdenv +, fetchFromGitHub +, rustPlatform +, darwin +, libgit2 +, git +, pkg-config +, zlib +}: + +rustPlatform.buildRustPackage { + pname = "git-agecrypt"; + version = "unstable-2023-07-14"; + + src = fetchFromGitHub { + owner = "vlaci"; + repo = "git-agecrypt"; + rev = "945b80556d8848f6e85a8cc0053f9020bdc8b359"; + hash = "sha256-6FjyJRYGyZt+uvYjXWvXI7DGq/+BNZHSSAT/DhOsF/E="; + }; + + cargoHash = "sha256-QCV0DT0kcDRMzVc+9uTn9FYPpf+xvKJbakP6CHRcibo="; + + nativeBuildInputs = [ pkg-config git ]; + + buildInputs = [ libgit2 zlib ] + ++ lib.optional stdenv.isDarwin darwin.apple_sdk.frameworks.Security; + + + meta = with lib; { + description = "Alternative to git-crypt using age instead of GPG."; + homepage = "https://github.com/vlaci/git-agecrypt"; + license = licenses.mpl20; + maintainers = with maintainers; [ kuznetsss ]; + mainProgram = "git-agecrypt"; + }; +} From c5eaf0ed83f9865133ecbbba3c29a75250fd4a61 Mon Sep 17 00:00:00 2001 From: adisbladis Date: Wed, 6 Mar 2024 13:11:32 +1300 Subject: [PATCH 017/230] bambu-studio: Fix build It was broken by a cgal bump in https://github.com/NixOS/nixpkgs/pull/292492 --- .../misc/bambu-studio/default.nix | 2 ++ .../misc/bambu-studio/meshboolean-const.patch | 21 +++++++++++++++++++ 2 files changed, 23 insertions(+) create mode 100644 pkgs/applications/misc/bambu-studio/meshboolean-const.patch diff --git a/pkgs/applications/misc/bambu-studio/default.nix b/pkgs/applications/misc/bambu-studio/default.nix index 1455558dcc2e..60559768994e 100644 --- a/pkgs/applications/misc/bambu-studio/default.nix +++ b/pkgs/applications/misc/bambu-studio/default.nix @@ -113,6 +113,8 @@ stdenv.mkDerivation rec { patches = [ # Fix for webkitgtk linking ./0001-not-for-upstream-CMakeLists-Link-against-webkit2gtk-.patch + # Fix build with cgal-5.6.1+ + ./meshboolean-const.patch ]; doCheck = true; diff --git a/pkgs/applications/misc/bambu-studio/meshboolean-const.patch b/pkgs/applications/misc/bambu-studio/meshboolean-const.patch new file mode 100644 index 000000000000..68e72591d8f4 --- /dev/null +++ b/pkgs/applications/misc/bambu-studio/meshboolean-const.patch @@ -0,0 +1,21 @@ +Fix build with cgal 5.6.1+ + +diff --git a/src/libslic3r/MeshBoolean.cpp b/src/libslic3r/MeshBoolean.cpp +index 50bbc099..b05245d3 100644 +--- a/src/libslic3r/MeshBoolean.cpp ++++ b/src/libslic3r/MeshBoolean.cpp +@@ -200,12 +200,12 @@ indexed_triangle_set cgal_to_indexed_triangle_set(const _Mesh &cgalmesh) + const auto &vertices = cgalmesh.vertices(); + int vsize = int(vertices.size()); + +- for (auto &vi : vertices) { ++ for (const auto &vi : vertices) { + auto &v = cgalmesh.point(vi); // Don't ask... + its.vertices.emplace_back(to_vec3f(v)); + } + +- for (auto &face : faces) { ++ for (const auto &face : faces) { + auto vtc = cgalmesh.vertices_around_face(cgalmesh.halfedge(face)); + + int i = 0; From ec758e1f6fb3dbc812f40cb1be4e23d5c9853bcd Mon Sep 17 00:00:00 2001 From: Silvan Mosberger Date: Wed, 6 Mar 2024 05:33:01 +0100 Subject: [PATCH 018/230] check-by-name: Update pinned tooling Includes https://github.com/NixOS/nixpkgs/pull/290743 --- pkgs/test/nixpkgs-check-by-name/scripts/pinned-tool.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/test/nixpkgs-check-by-name/scripts/pinned-tool.json b/pkgs/test/nixpkgs-check-by-name/scripts/pinned-tool.json index e20a11baadaf..350e71bffc79 100644 --- a/pkgs/test/nixpkgs-check-by-name/scripts/pinned-tool.json +++ b/pkgs/test/nixpkgs-check-by-name/scripts/pinned-tool.json @@ -1,4 +1,4 @@ { - "rev": "d934204a0f8d9198e1e4515dd6fec76a139c87f0", - "ci-path": "/nix/store/5fjdmbiziyp47gfc9kmfgvxdlzd6bba1-nixpkgs-check-by-name" + "rev": "b8697e57f10292a6165a20f03d2f42920dfaf973", + "ci-path": "/nix/store/w6w7khwfq6qzm4bsyijhg7m2kqv9f9jl-nixpkgs-check-by-name" } From 1937f7859fc4b3ff3e807bf3dd998b875985f843 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= Date: Wed, 6 Mar 2024 08:28:52 +0100 Subject: [PATCH 019/230] sysdig: 0.35.1 -> 0.35.3 Diff: https://github.com/draios/sysdig/compare/0.35.1...0.35.3 --- pkgs/os-specific/linux/sysdig/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/os-specific/linux/sysdig/default.nix b/pkgs/os-specific/linux/sysdig/default.nix index 0dbfbd29b6c3..302404b38e12 100644 --- a/pkgs/os-specific/linux/sysdig/default.nix +++ b/pkgs/os-specific/linux/sysdig/default.nix @@ -1,6 +1,6 @@ { lib, stdenv, fetchFromGitHub, cmake, kernel, installShellFiles, pkg-config , luajit, ncurses, perl, jsoncpp, openssl, curl, jq, gcc, elfutils, tbb, protobuf, grpc -, yaml-cpp, nlohmann_json, re2, zstd, uthash, fetchpatch, fetchurl +, yaml-cpp, nlohmann_json, re2, zstd, uthash }: let @@ -26,13 +26,13 @@ let in stdenv.mkDerivation rec { pname = "sysdig"; - version = "0.35.1"; + version = "0.35.3"; src = fetchFromGitHub { owner = "draios"; repo = "sysdig"; rev = version; - hash = "sha256-nSCkKwhdEduepyvcyWEKMQtQ6TfhF3GnTSreRVoarsw="; + hash = "sha256-wvCnWzQbkkM8qEG93li22P67WX1bGX9orTk+2vsBHZY="; }; nativeBuildInputs = [ cmake perl installShellFiles pkg-config ]; From a2c86c862fbac18a213a182936ba54a97bf9069c Mon Sep 17 00:00:00 2001 From: savedram Date: Wed, 6 Mar 2024 13:23:42 +0000 Subject: [PATCH 020/230] maintainers: add savedra1 --- maintainers/maintainer-list.nix | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index 114f836bc9bf..cef81deddf5f 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -17130,6 +17130,12 @@ githubId = 8534888; name = "Savanni D'Gerinel"; }; + savedra1 = { + email = "michaelsavedra@gmail.com"; + github = "savedra1"; + githubId = 99875823; + name = "Michael Savedra"; + }; savyajha = { email = "savya.jha@hawkradius.com"; github = "savyajha"; From 37e3d62849712ac04b7a02216b22f047d8a451ab Mon Sep 17 00:00:00 2001 From: aleksana Date: Thu, 29 Feb 2024 01:15:34 +0800 Subject: [PATCH 021/230] kana: init at 1.4 --- pkgs/by-name/ka/kana/package.nix | 74 ++++++++++++++++++++++++++++++++ 1 file changed, 74 insertions(+) create mode 100644 pkgs/by-name/ka/kana/package.nix diff --git a/pkgs/by-name/ka/kana/package.nix b/pkgs/by-name/ka/kana/package.nix new file mode 100644 index 000000000000..3fc7e8d3c257 --- /dev/null +++ b/pkgs/by-name/ka/kana/package.nix @@ -0,0 +1,74 @@ +{ lib +, stdenv +, fetchFromGitLab +, rustPlatform +, meson +, ninja +, pkg-config +, rustc +, cargo +, wrapGAppsHook4 +, desktop-file-utils +, libadwaita +, gst_all_1 +, darwin +}: + +stdenv.mkDerivation rec { + pname = "kana"; + version = "1.4"; + + src = fetchFromGitLab { + domain = "gitlab.gnome.org"; + owner = "fkinoshita"; + repo = "Kana"; + rev = "v${version}"; + hash = "sha256-/Ri723ub8LMlhbPObC83bay63JuWIQpgxAT5UUYuwZI="; + }; + + cargoDeps = rustPlatform.fetchCargoTarball { + inherit src; + name = "kana-${version}"; + hash = "sha256-Z7DpPe8/Tt8AcLjCwKbwzQTsLe6YvWBCG7DlDkkklew="; + }; + + nativeBuildInputs = [ + meson + ninja + pkg-config + rustPlatform.cargoSetupHook + rustc + cargo + wrapGAppsHook4 + desktop-file-utils + ]; + + buildInputs = [ + libadwaita + ] ++ (with gst_all_1; [ + gstreamer + gst-plugins-base + gst-plugins-bad + gst-plugins-good + ]) ++ lib.optionals stdenv.isDarwin [ + darwin.apple_sdk.frameworks.Foundation + ]; + + # Workaround for the gettext-sys issue + # https://github.com/Koka/gettext-rs/issues/114 + env.NIX_CFLAGS_COMPILE = lib.optionalString + ( + stdenv.cc.isClang && + lib.versionAtLeast stdenv.cc.version "16" + ) + "-Wno-error=incompatible-function-pointer-types"; + + meta = with lib; { + description = "Learn Japanese hiragana and katakana characters"; + homepage = "https://gitlab.gnome.org/fkinoshita/kana"; + license = licenses.gpl3Plus; + mainProgram = "kana"; + maintainers = with maintainers; [ aleksana ]; + platforms = platforms.unix; + }; +} From 72e550dbcc437cef869a0c9bcaf79485b73b9e1e Mon Sep 17 00:00:00 2001 From: Diogo Correia Date: Mon, 26 Feb 2024 10:52:06 +0000 Subject: [PATCH 022/230] rustPlatform: fix `override` on hooks Previously, trying to use `.override {}` on one of the hooks, specifically `bindgenHook` would yield in an error. By replacing `callPackage` with `callPackages`, this error is fixed and the overrides are propagated to the hooks. Co-Authored-By: Atemu --- pkgs/development/compilers/rust/make-rust-platform.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/compilers/rust/make-rust-platform.nix b/pkgs/development/compilers/rust/make-rust-platform.nix index e22cb6d594af..6ed724aae821 100644 --- a/pkgs/development/compilers/rust/make-rust-platform.nix +++ b/pkgs/development/compilers/rust/make-rust-platform.nix @@ -1,4 +1,4 @@ -{ lib, buildPackages, callPackage, cargo-auditable, stdenv, runCommand }@prev: +{ lib, buildPackages, callPackage, callPackages, cargo-auditable, stdenv, runCommand }@prev: { rustc , cargo @@ -34,7 +34,7 @@ rec { }; # Hooks - inherit (callPackage ../../../build-support/rust/hooks { + inherit (callPackages ../../../build-support/rust/hooks { inherit stdenv cargo rustc; }) cargoBuildHook cargoCheckHook cargoInstallHook cargoNextestHook cargoSetupHook maturinBuildHook bindgenHook; } From ed9afea01260da46a169105421489f24e26ce96e Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 7 Mar 2024 17:04:56 +0000 Subject: [PATCH 023/230] gridcoin-research: 5.4.5.0 -> 5.4.6.0-hotfix-1 --- pkgs/applications/blockchains/gridcoin-research/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/blockchains/gridcoin-research/default.nix b/pkgs/applications/blockchains/gridcoin-research/default.nix index 2e1b6563afe4..50c39da09867 100644 --- a/pkgs/applications/blockchains/gridcoin-research/default.nix +++ b/pkgs/applications/blockchains/gridcoin-research/default.nix @@ -20,13 +20,13 @@ stdenv.mkDerivation rec { pname = "gridcoin-research"; - version = "5.4.5.0"; + version = "5.4.6.0-hotfix-1"; src = fetchFromGitHub { owner = "gridcoin-community"; repo = "Gridcoin-Research"; rev = "${version}"; - sha256 = "1a174m7821c7d3yh9lyh0r3ds6qn06x16aa1qxcbrqyxxc127yky"; + sha256 = "sha256-fFxHJJ+EMnv0CterTwJbAfybF9WCzaSP7ynlxx2hE5A="; }; nativeBuildInputs = [ From 05c721c665bffa4006f5b0eb2a5366f4fc304dd2 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 8 Mar 2024 04:09:00 +0000 Subject: [PATCH 024/230] wt: 4.10.0 -> 4.10.4 --- pkgs/development/libraries/wt/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/wt/default.nix b/pkgs/development/libraries/wt/default.nix index f9dd1d06ee33..a58a8ca6b3ec 100644 --- a/pkgs/development/libraries/wt/default.nix +++ b/pkgs/development/libraries/wt/default.nix @@ -46,7 +46,7 @@ let }; in { wt4 = generic { - version = "4.10.0"; - sha256 = "sha256-05WZnyUIwXwJA24mQi5ATCqRZ6PE/tiw2/MO1qYHRsY="; + version = "4.10.4"; + sha256 = "sha256-O2waUKGTw8kZw+6qBMqG9tNN92aGL+WCrcPOGAG7HO0="; }; } From 5b233fd6aed6c39f0d37855d7bc4d8a807b36f8c Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 8 Mar 2024 04:52:52 +0000 Subject: [PATCH 025/230] discord-canary: 0.0.285 -> 0.0.294 --- .../networking/instant-messengers/discord/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/instant-messengers/discord/default.nix b/pkgs/applications/networking/instant-messengers/discord/default.nix index 3392aff89add..e038a7f5ddb5 100644 --- a/pkgs/applications/networking/instant-messengers/discord/default.nix +++ b/pkgs/applications/networking/instant-messengers/discord/default.nix @@ -4,7 +4,7 @@ let if stdenv.isLinux then { stable = "0.0.43"; ptb = "0.0.72"; - canary = "0.0.285"; + canary = "0.0.294"; development = "0.0.13"; } else { stable = "0.0.294"; @@ -25,7 +25,7 @@ let }; canary = fetchurl { url = "https://dl-canary.discordapp.net/apps/linux/${version}/discord-canary-${version}.tar.gz"; - hash = "sha256-dfBwe/YOzUUAfBrf51mNXtpyGL3Mp235e6TfQM4h04s="; + hash = "sha256-3D48+eg8hqToGepFdQznUTTUu37WRcZJ9kgG+wpxFAE="; }; development = fetchurl { url = "https://dl-development.discordapp.net/apps/linux/${version}/discord-development-${version}.tar.gz"; From 0825add7bd8beec313e0ea3a57c97f40b32cc839 Mon Sep 17 00:00:00 2001 From: Vincent Laporte Date: Thu, 7 Mar 2024 17:15:39 +0100 Subject: [PATCH 026/230] =?UTF-8?q?ocamlPackages.eliom:=2010.1.2=20?= =?UTF-8?q?=E2=86=92=2010.3.1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pkgs/development/ocaml-modules/eliom/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/ocaml-modules/eliom/default.nix b/pkgs/development/ocaml-modules/eliom/default.nix index d1c0462c4dca..48b9a153f5b3 100644 --- a/pkgs/development/ocaml-modules/eliom/default.nix +++ b/pkgs/development/ocaml-modules/eliom/default.nix @@ -17,13 +17,13 @@ buildDunePackage rec { pname = "eliom"; - version = "10.1.2"; + version = "10.3.1"; src = fetchFromGitHub { owner = "ocsigen"; repo = "eliom"; rev = version; - hash = "sha256-Cxwp534ADUO7AHnxZnGsrqxGDkhcJ314M5wytO4e8/0="; + hash = "sha256-REOyxwnQqWOKywVYwN/WP22cNKZv5Nv0OpFVbNBPJN8="; }; nativeBuildInputs = [ From 9a14560bd964dd9b9d14d5bb8a0185594c1603db Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 8 Mar 2024 06:19:53 +0000 Subject: [PATCH 027/230] dovecot_fts_xapian: 1.7.4 -> 1.7.6 --- pkgs/servers/mail/dovecot/plugins/fts_xapian/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/mail/dovecot/plugins/fts_xapian/default.nix b/pkgs/servers/mail/dovecot/plugins/fts_xapian/default.nix index 59c306beedd9..0a6e690bf385 100644 --- a/pkgs/servers/mail/dovecot/plugins/fts_xapian/default.nix +++ b/pkgs/servers/mail/dovecot/plugins/fts_xapian/default.nix @@ -1,13 +1,13 @@ { lib, stdenv, fetchFromGitHub, autoconf, automake, sqlite, pkg-config, dovecot, libtool, xapian, icu64 }: stdenv.mkDerivation rec { pname = "dovecot-fts-xapian"; - version = "1.7.4"; + version = "1.7.6"; src = fetchFromGitHub { owner = "grosjo"; repo = "fts-xapian"; rev = version; - sha256 = "sha256-Jc8rk/g+dzCpSWsn/Rt5qjhDr5nxO9wmi7rgfyyTSTU="; + sha256 = "sha256-QF+RFw1wNBGKDrNpEEJDPyX1pzKEMeI9Stsco1ivh/4="; }; buildInputs = [ dovecot xapian icu64 sqlite ]; From 9e570d09eb38fee56645ffbfb27dcce34c2e158a Mon Sep 17 00:00:00 2001 From: savedram Date: Wed, 6 Mar 2024 10:16:12 +0000 Subject: [PATCH 028/230] clipse: init at 0.0.6 clipse: removed trailing whitespace from package.nix clipse: refactored nix package clipse: updated maintainer and license in package.nix clipse: removed trailing whitespace from package.nix clipse: updated application hash in package.nix clipse: reformatted package.nix clipse: reformatted package.nix maintainer clipse: reformatted package.nix maintainer clipse: removed superflous line from package.nix and reworded description --- pkgs/by-name/cl/clipse/package.nix | 26 ++++++++++++++++++++++++++ 1 file changed, 26 insertions(+) create mode 100644 pkgs/by-name/cl/clipse/package.nix diff --git a/pkgs/by-name/cl/clipse/package.nix b/pkgs/by-name/cl/clipse/package.nix new file mode 100644 index 000000000000..af4b96385d16 --- /dev/null +++ b/pkgs/by-name/cl/clipse/package.nix @@ -0,0 +1,26 @@ +{ lib +, buildGoModule +, fetchFromGitHub +}: + +buildGoModule rec { + pname = "clipse"; + version = "0.0.6"; + + src = fetchFromGitHub { + owner = "savedra1"; + repo = "clipse"; + rev = "v${version}"; + hash = "sha256-DLvYTPlLkp98zCzmbeL68B7mHl7RY3ee9rL30vYm5Ow="; + }; + + vendorHash = "sha256-GIUEx4h3xvLySjBAQKajby2cdH8ioHkv8aPskHN0V+w="; + + meta = { + description = "Useful clipboard manager TUI for Unix"; + homepage = "https://github.com/savedra1/clipse"; + license = lib.licenses.mit; + mainProgram = "clipse"; + maintainers = [ lib.maintainers.savedra1 ]; + }; +} From 49653ab9dd63d30d1d80caba68c3c0a86e36328b Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 8 Mar 2024 08:43:45 +0000 Subject: [PATCH 029/230] aerospike: 7.0.0.4 -> 7.0.0.5 --- pkgs/servers/nosql/aerospike/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/nosql/aerospike/default.nix b/pkgs/servers/nosql/aerospike/default.nix index dc2ed8c79ec1..5dda0767c639 100644 --- a/pkgs/servers/nosql/aerospike/default.nix +++ b/pkgs/servers/nosql/aerospike/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "aerospike-server"; - version = "7.0.0.4"; + version = "7.0.0.5"; src = fetchFromGitHub { owner = "aerospike"; repo = "aerospike-server"; rev = version; - hash = "sha256-CyDGJ0fM9mDNOG1CV/noaSDIh8x/duM3NhgLTnANNKA="; + hash = "sha256-NTZW/pBCrwhmqMNXBS34HUKENy+TJKmoFWS7LhcLM4k="; fetchSubmodules = true; }; From fbad683c26cd7723eb8ad8c7fd50ae73338794b1 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 8 Mar 2024 12:25:00 +0000 Subject: [PATCH 030/230] rune: 0.13.1 -> 0.13.2 --- pkgs/development/interpreters/rune/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/interpreters/rune/default.nix b/pkgs/development/interpreters/rune/default.nix index 510ab71bdc68..c07cc5577fe6 100644 --- a/pkgs/development/interpreters/rune/default.nix +++ b/pkgs/development/interpreters/rune/default.nix @@ -7,15 +7,15 @@ rustPlatform.buildRustPackage rec { pname = "rune"; - version = "0.13.1"; + version = "0.13.2"; src = fetchCrate { pname = "rune-cli"; inherit version; - hash = "sha256-7GScETlQ/rl9vOB9zSfsCM1ay1F5YV6OAxKe82lMU1I="; + hash = "sha256-Xk4gUBxDdnW2AIEvMaEjzVsqCQFK9B/Wyg7RpJ/hbrA="; }; - cargoHash = "sha256-T6uYe+ZgXgsGN1714Ka+fxeVDoXgjVdfrrw5Rj/95cE="; + cargoHash = "sha256-hpJ++mzP2QFE/iHZQvcjT03xPnyPYw7EgsL8NwxrZVQ="; buildInputs = lib.optionals stdenv.isDarwin [ darwin.apple_sdk.frameworks.CoreServices From 0cf64325cff9acff376e77e4cd37dd51c390fe54 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 8 Mar 2024 13:05:28 +0000 Subject: [PATCH 031/230] conftest: 0.49.1 -> 0.50.0 --- pkgs/development/tools/conftest/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/tools/conftest/default.nix b/pkgs/development/tools/conftest/default.nix index 0f0b14e44bfd..2f1386e9d5af 100644 --- a/pkgs/development/tools/conftest/default.nix +++ b/pkgs/development/tools/conftest/default.nix @@ -6,15 +6,15 @@ buildGoModule rec { pname = "conftest"; - version = "0.49.1"; + version = "0.50.0"; src = fetchFromGitHub { owner = "open-policy-agent"; repo = "conftest"; rev = "refs/tags/v${version}"; - hash = "sha256-k7wmWfBm/MYMCya6G+Iu12hqXTYthvnD26SVku3BZfU="; + hash = "sha256-DqZl16CQR88n5etJvX+5wxpOQsyWq/UWjJou23pjpWk="; }; - vendorHash = "sha256-qdJK6uoXp8dsgqj3q/pM3xKgUcqDJ+oxuKYwCJR3Xq0="; + vendorHash = "sha256-9afq6ccgiaeZqyM3Le1NQ0ADB/wmBW+qdT+uVtbARC8="; ldflags = [ "-s" From 7f8c5d43d6727403dfb249e2f19c3d5859f189ee Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 8 Mar 2024 14:09:46 +0000 Subject: [PATCH 032/230] discordo: unstable-2024-03-03 -> unstable-2024-03-07 --- pkgs/applications/networking/discordo/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/applications/networking/discordo/default.nix b/pkgs/applications/networking/discordo/default.nix index 8930e5d99891..20ff35764d13 100644 --- a/pkgs/applications/networking/discordo/default.nix +++ b/pkgs/applications/networking/discordo/default.nix @@ -3,16 +3,16 @@ buildGoModule rec { pname = "discordo"; - version = "unstable-2024-03-03"; + version = "unstable-2024-03-07"; src = fetchFromGitHub { owner = "ayn2op"; repo = pname; - rev = "ce2091d566f2d999d83b3c9463860b73f1d163ae"; - hash = "sha256-71i/8t768RtD0Gk2cpSdznERSNf1gErQrrOGYiZz05g="; + rev = "23cb3a146a8567526b35807c6f16120163c40f98"; + hash = "sha256-1ov9SEyXdRTg9HEN2ASC5QY8ZKlWDdrc9TCMfFHIhCc="; }; - vendorHash = "sha256-dBJYTe8aZtNuBwmcpXb3OEHoLVCa/GbGExLIRc8cVbo="; + vendorHash = "sha256-6pCQHr/O2pfR1v8YI+htwGZ8RFStEEUctIEpgblXvjY="; CGO_ENABLED = 0; From 67c1193fab6649cc788641411a64e34ca6ab3672 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Fri, 8 Mar 2024 15:34:00 +0100 Subject: [PATCH 033/230] nixos/unbound: disable checkconf when remote-control is used Closes #293001 --- nixos/modules/services/networking/unbound.nix | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/nixos/modules/services/networking/unbound.nix b/nixos/modules/services/networking/unbound.nix index 8438e472e11e..17c6789827b9 100644 --- a/nixos/modules/services/networking/unbound.nix +++ b/nixos/modules/services/networking/unbound.nix @@ -76,12 +76,13 @@ in { checkconf = mkOption { type = types.bool; - default = !cfg.settings ? include; - defaultText = "!config.services.unbound.settings ? include"; + default = !cfg.settings ? include && !cfg.settings ? remote-control; + defaultText = "!services.unbound.settings ? include && !services.unbound.settings ? remote-control"; description = lib.mdDoc '' Wether to check the resulting config file with unbound checkconf for syntax errors. - If settings.include is used, then this options is disabled, as the import can likely not be resolved at build time. + If settings.include is used, this options is disabled, as the import can likely not be accessed at build time. + If settings.remote-control is used, this option is disabled, too as the control-key-file, server-cert-file and server-key-file cannot be accessed at build time. ''; }; From 1d2030ab5b42af6341b4b78750257f00e11f9044 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 8 Mar 2024 15:21:53 +0000 Subject: [PATCH 034/230] dolt: 1.35.0 -> 1.35.1 --- pkgs/servers/sql/dolt/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/servers/sql/dolt/default.nix b/pkgs/servers/sql/dolt/default.nix index fc725e6b084c..418b4b7f7155 100644 --- a/pkgs/servers/sql/dolt/default.nix +++ b/pkgs/servers/sql/dolt/default.nix @@ -2,18 +2,18 @@ buildGoModule rec { pname = "dolt"; - version = "1.35.0"; + version = "1.35.1"; src = fetchFromGitHub { owner = "dolthub"; repo = "dolt"; rev = "v${version}"; - sha256 = "sha256-h1ypyhslsqGrYFXzAdhoviXQwy8ub31+CNQaXMjKSB0="; + sha256 = "sha256-UtyLC+rPft4g4ENO3IzQDBmsyJg38zPxTVDWiuf7Kc8="; }; modRoot = "./go"; subPackages = [ "cmd/dolt" ]; - vendorHash = "sha256-kC/+zCuIVUZ7Fpq2WfjYa3tG0vYGkUibK926yh3DCp4="; + vendorHash = "sha256-VQVpKgqzfnRCoHnZSCq2RZywNYcLyBycz74Ir48QwCk="; proxyVendor = true; doCheck = false; From b25ebe535b738f6bfab5f03fdb42fdc70b996efa Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 8 Mar 2024 15:21:55 +0000 Subject: [PATCH 035/230] rootlesskit: 2.0.1 -> 2.0.2 --- pkgs/tools/virtualization/rootlesskit/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/virtualization/rootlesskit/default.nix b/pkgs/tools/virtualization/rootlesskit/default.nix index 18360fc7e212..4dea9b153d85 100644 --- a/pkgs/tools/virtualization/rootlesskit/default.nix +++ b/pkgs/tools/virtualization/rootlesskit/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "rootlesskit"; - version = "2.0.1"; + version = "2.0.2"; src = fetchFromGitHub { owner = "rootless-containers"; repo = "rootlesskit"; rev = "v${version}"; - hash = "sha256-qcVgLhBUVZTvXz5/QytYWzYtCKscBab/Iy25KAgzExo="; + hash = "sha256-L8UdT3hQO4IrXkpOL0bjpy6OwNJQR8EG0+MgXVXzoBU="; }; - vendorHash = "sha256-ctZt0jkBhQPryEKCrd1a+ymnVKkGasZV6gOtR5U0L0I="; + vendorHash = "sha256-TGLxcH6wg8fObLsSKKdBgIbb7t4YBP+pUWNNHlEZtaw="; passthru = { updateScript = nix-update-script { }; From 631b5f64fcde4b0df6667c46d919d6fed493cf03 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 7 Mar 2024 01:23:33 +0000 Subject: [PATCH 036/230] flannel: 0.24.2 -> 0.24.3 --- pkgs/tools/networking/flannel/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/networking/flannel/default.nix b/pkgs/tools/networking/flannel/default.nix index 9bd20bb090f3..95dda1485ed6 100644 --- a/pkgs/tools/networking/flannel/default.nix +++ b/pkgs/tools/networking/flannel/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "flannel"; - version = "0.24.2"; + version = "0.24.3"; rev = "v${version}"; - vendorHash = "sha256-vxzcFVFbbXeBb9kAJaAkvk26ptGo8CdnPJdcuC9qdF0="; + vendorHash = "sha256-YCedMUxcME0NFEtYhLA4G1WZU8SMBvDOBZ/U7X7Tx3k="; src = fetchFromGitHub { inherit rev; owner = "flannel-io"; repo = "flannel"; - sha256 = "sha256-pCgrIVB29OhegUuSuWVUaDWcLVI54FH5YlLjDcRf3j8="; + sha256 = "sha256-f6jHK0h0NVgHaWT6l+WS9P9WXVLzxxujdjXND01lLNM="; }; ldflags = [ "-X github.com/flannel-io/flannel/pkg/version.Version=${rev}" ]; From 62a7cc559f1bad91f951903760d03eae52182655 Mon Sep 17 00:00:00 2001 From: 0x4A6F <0x4A6F@users.noreply.github.com> Date: Fri, 8 Mar 2024 20:47:05 +0100 Subject: [PATCH 037/230] nixfmt-rfc-style: apply serokell/nixfmt#133 --- pkgs/by-name/ni/nixfmt-rfc-style/package.nix | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/pkgs/by-name/ni/nixfmt-rfc-style/package.nix b/pkgs/by-name/ni/nixfmt-rfc-style/package.nix index a11e2d29ff69..90e6dbf2e25d 100644 --- a/pkgs/by-name/ni/nixfmt-rfc-style/package.nix +++ b/pkgs/by-name/ni/nixfmt-rfc-style/package.nix @@ -4,6 +4,7 @@ lib, runCommand, nixfmt-rfc-style, + fetchpatch, }: let inherit (haskell.lib.compose) overrideCabal justStaticExecutables; @@ -13,6 +14,13 @@ let passthru.updateScript = ./update.sh; + patches = [ + (fetchpatch { + url = "https://github.com/serokell/nixfmt/commit/ca9c8975ed671112fdfce94f2e9e2ad3de480c9a.patch"; + hash = "sha256-UOSAYahSKBsqPMVcQJ3H26Eg2xpPAsNOjYMI6g+WTYU="; + }) + ]; + maintainers = lib.teams.formatter.members; # These tests can be run with the following command. From 91b3db13093b1aecdba07041eb44b7103c235d94 Mon Sep 17 00:00:00 2001 From: Yueh-Shun Li Date: Sat, 9 Mar 2024 01:04:40 +0800 Subject: [PATCH 038/230] treewide: fix sourceRoot for fetchgit-based src According to Nixpkgs manual[1] and NixOS 23.11 Release Note[2], the `sourceRoot` attribute passed to `stdenv.mkDerivation` should be specified as `"${src.name}"` or `"${src.name}/subdir"` when `src` is produced using `fetchgit`-based fetchers. `sourceRoot = "source"` or `sourceRoot = "source/subdir"` is based on the assumption that the `name` attribute of these pre-unpacked fetchers are always `"source"`, which is not the case. Expecting constant `name` also makes the source FODs prone to irrelevent hashes during version bumps. [1]: https://nixos.org/manual/nixpkgs/unstable/#var-stdenv-sourceRoot [2]: https://nixos.org/manual/nixos/stable/release-notes#sec-release-23.11 --- pkgs/applications/editors/vim/plugins/overrides.nix | 2 +- pkgs/applications/graphics/awesomebump/default.nix | 2 +- pkgs/applications/networking/geph/default.nix | 4 ++-- pkgs/applications/networking/localsend/default.nix | 10 +++++----- .../science/chemistry/autodock-vina/default.nix | 8 ++++---- pkgs/applications/science/misc/openrefine/default.nix | 2 +- .../video/anilibria-winmaclinux/default.nix | 2 +- pkgs/by-name/c2/c2fmzq/package.nix | 2 +- pkgs/by-name/fr/frankenphp/package.nix | 2 +- pkgs/by-name/in/intiface-central/package.nix | 2 +- pkgs/by-name/la/lanzaboote-tool/package.nix | 2 +- pkgs/by-name/li/liana/package.nix | 2 +- pkgs/by-name/li/linien-gui/package.nix | 2 +- pkgs/by-name/me/mercure/package.nix | 2 +- pkgs/by-name/mo/monophony/package.nix | 2 +- pkgs/by-name/ru/rustdesk-flutter/package.nix | 4 ++-- pkgs/by-name/sn/snippetexpanderx/package.nix | 2 +- pkgs/by-name/sv/svix-server/package.nix | 2 +- pkgs/by-name/sy/syn2mas/package.nix | 2 +- pkgs/by-name/to/torrentstream/package.nix | 2 +- pkgs/development/compilers/flutter/flutter-tools.nix | 2 +- pkgs/development/coq-modules/vcfloat/default.nix | 7 ++++--- pkgs/development/libraries/mpfi/default.nix | 2 +- .../development/php-packages/opentelemetry/default.nix | 4 ++-- .../python-modules/bootstrap/flit-core/default.nix | 4 ++-- pkgs/development/python-modules/catboost/default.nix | 4 ++-- pkgs/development/python-modules/daqp/default.nix | 4 ++-- pkgs/development/python-modules/flit-core/default.nix | 2 +- pkgs/development/python-modules/kanidm/default.nix | 4 ++-- .../python-modules/linien-client/default.nix | 2 +- .../python-modules/linien-common/default.nix | 2 +- .../python-modules/openllm-client/default.nix | 2 +- .../python-modules/openllm-core/default.nix | 2 +- pkgs/development/python-modules/openllm/default.nix | 2 +- pkgs/development/python-modules/pendulum/3.nix | 2 +- pkgs/development/python-modules/prophet/default.nix | 2 +- .../development/python-modules/sudachidict/default.nix | 2 +- pkgs/development/tools/electron/common.nix | 6 ++++-- pkgs/development/tools/gendef/default.nix | 2 +- pkgs/os-specific/linux/opensnitch-ebpf/default.nix | 2 +- pkgs/os-specific/linux/tailor-gui/default.nix | 2 +- pkgs/servers/monitoring/openobserve/default.nix | 2 +- .../tools/misc/SP800-90B_EntropyAssessment/default.nix | 2 +- pkgs/tools/misc/mpremote/default.nix | 2 +- 44 files changed, 64 insertions(+), 61 deletions(-) diff --git a/pkgs/applications/editors/vim/plugins/overrides.nix b/pkgs/applications/editors/vim/plugins/overrides.nix index f278070e4550..546f1f6f2cca 100644 --- a/pkgs/applications/editors/vim/plugins/overrides.nix +++ b/pkgs/applications/editors/vim/plugins/overrides.nix @@ -996,7 +996,7 @@ spectre_oxi = rustPlatform.buildRustPackage { pname = "spectre_oxi"; inherit (old) version src; - sourceRoot = "source/spectre_oxi"; + sourceRoot = "${old.src.name}/spectre_oxi"; cargoHash = "sha256-gCGuD5kipgfR0Le8npNmyBxNsUq0PavXvKkxkiPx13E="; diff --git a/pkgs/applications/graphics/awesomebump/default.nix b/pkgs/applications/graphics/awesomebump/default.nix index a5debbc21b02..ef9a2f7c7766 100644 --- a/pkgs/applications/graphics/awesomebump/default.nix +++ b/pkgs/applications/graphics/awesomebump/default.nix @@ -14,7 +14,7 @@ let qtnproperty = mkDerivation { name = "qtnproperty"; inherit src; - sourceRoot = "AwesomeBump/Sources/utils/QtnProperty"; + sourceRoot = "${src.name}/Sources/utils/QtnProperty"; patches = [ ./qtnproperty-parallel-building.patch ]; buildInputs = [ qtscript qtbase qtdeclarative ]; nativeBuildInputs = [ qmake flex bison ]; diff --git a/pkgs/applications/networking/geph/default.nix b/pkgs/applications/networking/geph/default.nix index 1b839d748477..45e3b1ae373b 100644 --- a/pkgs/applications/networking/geph/default.nix +++ b/pkgs/applications/networking/geph/default.nix @@ -64,7 +64,7 @@ in pname = "${pname}-pnpm-deps"; inherit src version; - sourceRoot = "source/gephgui-wry/gephgui"; + sourceRoot = "${src.name}/gephgui-wry/gephgui"; nativeBuildInputs = [ jq @@ -95,7 +95,7 @@ in pname = "gephgui-wry"; inherit version src; - sourceRoot = "source/gephgui-wry"; + sourceRoot = "${src.name}/gephgui-wry"; cargoLock = { lockFile = ./Cargo.lock; diff --git a/pkgs/applications/networking/localsend/default.nix b/pkgs/applications/networking/localsend/default.nix index 95506e98dc9a..6bff0e0fbc6c 100644 --- a/pkgs/applications/networking/localsend/default.nix +++ b/pkgs/applications/networking/localsend/default.nix @@ -13,7 +13,7 @@ let pname = "localsend"; version = "1.14.0"; - linux = flutter313.buildFlutterApplication { + linux = flutter313.buildFlutterApplication rec { inherit pname version; src = fetchFromGitHub { @@ -23,7 +23,7 @@ let hash = "sha256-CO0uFcZnOfE31EZxRUpgtod3+1lyXPpbytHB45DEM98="; }; - sourceRoot = "source/app"; + sourceRoot = "${src.name}/app"; pubspecLock = lib.importJSON ./pubspec.lock.json; @@ -59,7 +59,7 @@ let passthru.updateScript = ./update.sh; - meta = meta // { + meta = metaCommon // { mainProgram = "localsend_app"; }; }; @@ -81,13 +81,13 @@ let cp -r *.app $out/Applications ''; - meta = meta // { + meta = metaCommon // { sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ]; platforms = [ "x86_64-darwin" "aarch64-darwin" ]; }; }; - meta = with lib; { + metaCommon = with lib; { description = "An open source cross-platform alternative to AirDrop"; homepage = "https://localsend.org/"; license = licenses.mit; diff --git a/pkgs/applications/science/chemistry/autodock-vina/default.nix b/pkgs/applications/science/chemistry/autodock-vina/default.nix index 499bedb929ff..d56b8a02a20d 100644 --- a/pkgs/applications/science/chemistry/autodock-vina/default.nix +++ b/pkgs/applications/science/chemistry/autodock-vina/default.nix @@ -20,10 +20,10 @@ stdenv.mkDerivation (finalAttrs: { hash = "sha256-yguUMEX0tn75wKrPKyqlCYbBFaEwC5b1s3k9xept1Fw="; }; - sourceRoot = - if stdenv.isDarwin - then "source/build/mac/release" - else "source/build/linux/release"; + sourceRoot = "${finalAttrs.src.name}/build/${ + if stdenv.hostPlatform.isDarwin then "mac" + else "linux" + }/release"; buildInputs = [ boost' diff --git a/pkgs/applications/science/misc/openrefine/default.nix b/pkgs/applications/science/misc/openrefine/default.nix index 2ad67027ade4..9f2ef0f29b31 100644 --- a/pkgs/applications/science/misc/openrefine/default.nix +++ b/pkgs/applications/science/misc/openrefine/default.nix @@ -27,7 +27,7 @@ let inherit src version; pname = "openrefine-npm"; - sourceRoot = "source/main/webapp"; + sourceRoot = "${src.name}/main/webapp"; npmDepsHash = "sha256-8GhcL4tohQ5u2HeYN6JyTMMobUOqAL8ETCLiP1SoDSk="; diff --git a/pkgs/applications/video/anilibria-winmaclinux/default.nix b/pkgs/applications/video/anilibria-winmaclinux/default.nix index ee6c34965200..32872e98bebf 100644 --- a/pkgs/applications/video/anilibria-winmaclinux/default.nix +++ b/pkgs/applications/video/anilibria-winmaclinux/default.nix @@ -25,7 +25,7 @@ mkDerivation rec { sha256 = "sha256-G4KlYAjOT1UV29vcX7Q8dMTj0BX0rsJcLtK2MQag5nU="; }; - sourceRoot = "source/src"; + sourceRoot = "${src.name}/src"; qmakeFlags = [ "PREFIX=${placeholder "out"}" "CONFIG+=unixvlc" ]; diff --git a/pkgs/by-name/c2/c2fmzq/package.nix b/pkgs/by-name/c2/c2fmzq/package.nix index 42069150d468..1efd3dd52ca2 100644 --- a/pkgs/by-name/c2/c2fmzq/package.nix +++ b/pkgs/by-name/c2/c2fmzq/package.nix @@ -17,7 +17,7 @@ buildGoModule rec { ldflags = [ "-s" "-w" ]; - sourceRoot = "source/c2FmZQ"; + sourceRoot = "${src.name}/c2FmZQ"; vendorHash = "sha256-cTXSFwWGHV2QJM4mX/Z+ZxCXKwr+59lEPvJa/PTA1wU="; diff --git a/pkgs/by-name/fr/frankenphp/package.nix b/pkgs/by-name/fr/frankenphp/package.nix index 423a1dd1f2e5..90d10fc87f40 100644 --- a/pkgs/by-name/fr/frankenphp/package.nix +++ b/pkgs/by-name/fr/frankenphp/package.nix @@ -35,7 +35,7 @@ in buildGoModule rec { hash = "sha256-tQ35GZuw7Ag1YfmOUarVY45yk4yugNLJetEV4m2w3GE="; }; - sourceRoot = "source/caddy"; + sourceRoot = "${src.name}/caddy"; # frankenphp requires C code that would be removed with `go mod tidy` # https://github.com/golang/go/issues/26366 diff --git a/pkgs/by-name/in/intiface-central/package.nix b/pkgs/by-name/in/intiface-central/package.nix index 889ef7a874d0..180d4feefc66 100644 --- a/pkgs/by-name/in/intiface-central/package.nix +++ b/pkgs/by-name/in/intiface-central/package.nix @@ -27,7 +27,7 @@ flutter.buildFlutterApplication rec { cargoDeps = rustPlatform.fetchCargoTarball { name = "${pname}-${version}-cargo-deps"; inherit src; - sourceRoot = "source/intiface-engine-flutter-bridge"; + sourceRoot = "${src.name}/intiface-engine-flutter-bridge"; hash = "sha256-0sCHa3rMaLYaUG3E3fmsLi0dSdb9vGyv7qNR3JQkXuU="; }; cargoRoot = "intiface-engine-flutter-bridge"; diff --git a/pkgs/by-name/la/lanzaboote-tool/package.nix b/pkgs/by-name/la/lanzaboote-tool/package.nix index 919ab7d68f2c..05ea3e4391eb 100644 --- a/pkgs/by-name/la/lanzaboote-tool/package.nix +++ b/pkgs/by-name/la/lanzaboote-tool/package.nix @@ -18,7 +18,7 @@ rustPlatform.buildRustPackage rec { hash = "sha256-Fb5TeRTdvUlo/5Yi2d+FC8a6KoRLk2h1VE0/peMhWPs="; }; - sourceRoot = "source/rust/tool"; + sourceRoot = "${src.name}/rust/tool"; cargoHash = "sha256-g4WzqfH6DZVUuNb0jV3MFdm3h7zy2bQ6d3agrXesWgc="; env.TEST_SYSTEMD = systemd; diff --git a/pkgs/by-name/li/liana/package.nix b/pkgs/by-name/li/liana/package.nix index 043c35770955..8082161ce930 100644 --- a/pkgs/by-name/li/liana/package.nix +++ b/pkgs/by-name/li/liana/package.nix @@ -61,7 +61,7 @@ rustPlatform.buildRustPackage rec { systemd ]; - sourceRoot = "source/gui"; + sourceRoot = "${src.name}/gui"; postInstall = '' install -Dm0644 ./ui/static/logos/liana-app-icon.svg $out/share/icons/hicolor/scalable/apps/liana.svg diff --git a/pkgs/by-name/li/linien-gui/package.nix b/pkgs/by-name/li/linien-gui/package.nix index ba6f6d6b5893..972070afc3ac 100644 --- a/pkgs/by-name/li/linien-gui/package.nix +++ b/pkgs/by-name/li/linien-gui/package.nix @@ -9,7 +9,7 @@ python3.pkgs.buildPythonApplication rec { inherit (python3.pkgs.linien-common) src version; - sourceRoot = "source/linien-gui"; + sourceRoot = "${src.name}/linien-gui"; nativeBuildInputs = with python3.pkgs; [ setuptools diff --git a/pkgs/by-name/me/mercure/package.nix b/pkgs/by-name/me/mercure/package.nix index f489155b4c25..dc4c67c4362b 100644 --- a/pkgs/by-name/me/mercure/package.nix +++ b/pkgs/by-name/me/mercure/package.nix @@ -17,7 +17,7 @@ buildGoModule rec { hash = "sha256-4Y+yZSZrBDLPbQXaOCSKk/EY20Ka8CS4ivUg1TEaqXo="; }; - sourceRoot = "source/caddy"; + sourceRoot = "${src.name}/caddy"; vendorHash = "sha256-N0RmvhBlTiWmBb4TzLmaThD9jVkKgcIO9vPWxJAvLRQ="; diff --git a/pkgs/by-name/mo/monophony/package.nix b/pkgs/by-name/mo/monophony/package.nix index 1924267126a5..4265b910aeea 100644 --- a/pkgs/by-name/mo/monophony/package.nix +++ b/pkgs/by-name/mo/monophony/package.nix @@ -15,7 +15,7 @@ python3Packages.buildPythonApplication rec { version = "2.7.0"; format = "other"; - sourceRoot = "source/source"; + sourceRoot = "${src.name}/source"; src = fetchFromGitLab { owner = "zehkira"; repo = "monophony"; diff --git a/pkgs/by-name/ru/rustdesk-flutter/package.nix b/pkgs/by-name/ru/rustdesk-flutter/package.nix index dc24dad68e47..2c82eade26da 100644 --- a/pkgs/by-name/ru/rustdesk-flutter/package.nix +++ b/pkgs/by-name/ru/rustdesk-flutter/package.nix @@ -39,7 +39,7 @@ sharedLibraryExt = rustc.stdenv.hostPlatform.extensions.sharedLibrary; -in flutter316.buildFlutterApplication { +in flutter316.buildFlutterApplication rec { pname = "rustdesk"; version = "1.2.3-unstable-2024-02-11"; src = fetchFromGitHub { @@ -52,7 +52,7 @@ in flutter316.buildFlutterApplication { strictDeps = true; # Configure the Flutter/Dart build - sourceRoot = "source/flutter"; + sourceRoot = "${src.name}/flutter"; # curl https://raw.githubusercontent.com/rustdesk/rustdesk/16db977fd81e14af62ec5ac7760a7661a5c24be8/flutter/pubspec.lock | yq pubspecLock = lib.importJSON ./pubspec.lock.json; gitHashes = { diff --git a/pkgs/by-name/sn/snippetexpanderx/package.nix b/pkgs/by-name/sn/snippetexpanderx/package.nix index 3c91adbbbc0c..bb7ad94f51c9 100644 --- a/pkgs/by-name/sn/snippetexpanderx/package.nix +++ b/pkgs/by-name/sn/snippetexpanderx/package.nix @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { pname = "snippetexpanderx"; - sourceRoot = "source/cmd/snippetexpanderx"; + sourceRoot = "${src.name}/cmd/snippetexpanderx"; nativeBuildInputs = [ pkg-config diff --git a/pkgs/by-name/sv/svix-server/package.nix b/pkgs/by-name/sv/svix-server/package.nix index e7de972488e2..7ccdf1f6b3f2 100644 --- a/pkgs/by-name/sv/svix-server/package.nix +++ b/pkgs/by-name/sv/svix-server/package.nix @@ -12,7 +12,7 @@ rustPlatform.buildRustPackage rec { hash = "sha256-6758ej7bTvwZPWifl239rQMazM8uw+Y4+3EbjE8XsTg="; }; - sourceRoot = "source/server"; + sourceRoot = "${src.name}/server"; cargoLock = { lockFile = ./Cargo.lock; diff --git a/pkgs/by-name/sy/syn2mas/package.nix b/pkgs/by-name/sy/syn2mas/package.nix index 6a147a2d647e..75fefef93689 100644 --- a/pkgs/by-name/sy/syn2mas/package.nix +++ b/pkgs/by-name/sy/syn2mas/package.nix @@ -14,7 +14,7 @@ buildNpmPackage rec { hash = "sha256-DPGigs6DifTRa7VQVHgizZ3BUy3FPX3YhZi++yoBFBA="; }; - sourceRoot = "source/tools/syn2mas"; + sourceRoot = "${src.name}/tools/syn2mas"; npmDepsHash = "sha256-HvBFuRyP1APg5V+yhvlODAJ02MEkdpuLfNjWB/UT2vg="; diff --git a/pkgs/by-name/to/torrentstream/package.nix b/pkgs/by-name/to/torrentstream/package.nix index 44a92c7d850a..b59c17dd59c6 100644 --- a/pkgs/by-name/to/torrentstream/package.nix +++ b/pkgs/by-name/to/torrentstream/package.nix @@ -16,7 +16,7 @@ buildDotnetModule rec { hash = "sha256-41zlzrQ+YGY2wEvq4Su/lp6lOmGW4u0F37ub2a3z+7o="; }; - sourceRoot = "source/src"; + sourceRoot = "${src.name}/src"; projectFile = "TorrentStream.sln"; nugetDeps = ./deps.nix; diff --git a/pkgs/development/compilers/flutter/flutter-tools.nix b/pkgs/development/compilers/flutter/flutter-tools.nix index 6f8d1b3c1a8f..f4bf84ad366f 100644 --- a/pkgs/development/compilers/flutter/flutter-tools.nix +++ b/pkgs/development/compilers/flutter/flutter-tools.nix @@ -18,7 +18,7 @@ buildDartApplication.override { inherit dart; } rec { dartOutputType = "jit-snapshot"; src = flutterSrc; - sourceRoot = "source/packages/flutter_tools"; + sourceRoot = "${src.name}/packages/flutter_tools"; postUnpack = ''chmod -R u+w "$NIX_BUILD_TOP/source"''; inherit patches; diff --git a/pkgs/development/coq-modules/vcfloat/default.nix b/pkgs/development/coq-modules/vcfloat/default.nix index 5d1805c2573f..452cc0a59e83 100644 --- a/pkgs/development/coq-modules/vcfloat/default.nix +++ b/pkgs/development/coq-modules/vcfloat/default.nix @@ -1,10 +1,10 @@ { lib, mkCoqDerivation, coq, interval, compcert, flocq, bignums, version ? null }: -with lib; mkCoqDerivation { +let self = with lib; mkCoqDerivation { pname = "vcfloat"; owner = "VeriNum"; inherit version; - sourceRoot = "source/vcfloat"; + sourceRoot = "${self.src.name}/vcfloat"; postPatch = '' coq_makefile -o Makefile -f _CoqProject *.v ''; @@ -21,4 +21,5 @@ with lib; mkCoqDerivation { maintainers = with maintainers; [ quinn-dougherty ]; license = licenses.lgpl3Plus; }; -} +}; +in self diff --git a/pkgs/development/libraries/mpfi/default.nix b/pkgs/development/libraries/mpfi/default.nix index 4bc568523c9f..54abf134d366 100644 --- a/pkgs/development/libraries/mpfi/default.nix +++ b/pkgs/development/libraries/mpfi/default.nix @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { sha256 = "sha256-aj/QmJ38ifsW36JFQcbp55aIQRvOpiqLHwEh/aFXsgo="; }; - sourceRoot = "source/mpfi"; + sourceRoot = "${src.name}/mpfi"; nativeBuildInputs = [ autoreconfHook texinfo ]; buildInputs = [ mpfr ]; diff --git a/pkgs/development/php-packages/opentelemetry/default.nix b/pkgs/development/php-packages/opentelemetry/default.nix index 38dfa86e1ce7..06bbe263860f 100644 --- a/pkgs/development/php-packages/opentelemetry/default.nix +++ b/pkgs/development/php-packages/opentelemetry/default.nix @@ -2,7 +2,7 @@ let version = "1.0.1"; -in buildPecl { +in buildPecl rec { inherit version; pname = "opentelemetry"; @@ -13,7 +13,7 @@ in buildPecl { hash = "sha256-VHUzRhTtHygHoW+poItaphV+mxe4rmmSfGgesUgPz8Q="; }; - sourceRoot = "source/ext"; + sourceRoot = "${src.name}/ext"; doCheck = true; diff --git a/pkgs/development/python-modules/bootstrap/flit-core/default.nix b/pkgs/development/python-modules/bootstrap/flit-core/default.nix index ab9e52538d34..43fec03901cd 100644 --- a/pkgs/development/python-modules/bootstrap/flit-core/default.nix +++ b/pkgs/development/python-modules/bootstrap/flit-core/default.nix @@ -4,11 +4,11 @@ , flit-core }: -stdenv.mkDerivation { +stdenv.mkDerivation rec { pname = "${python.libPrefix}-bootstrap-${flit-core.pname}"; inherit (flit-core) version src patches meta; - sourceRoot = "source/flit_core"; + sourceRoot = "${src.name}/flit_core"; buildPhase = '' runHook preBuild diff --git a/pkgs/development/python-modules/catboost/default.nix b/pkgs/development/python-modules/catboost/default.nix index 840c01d876a1..6795655f4840 100644 --- a/pkgs/development/python-modules/catboost/default.nix +++ b/pkgs/development/python-modules/catboost/default.nix @@ -13,11 +13,11 @@ , wheel }: -buildPythonPackage { +buildPythonPackage rec { inherit (catboost) pname version src meta; format = "pyproject"; - sourceRoot = "source/catboost/python-package"; + sourceRoot = "${src.name}/catboost/python-package"; nativeBuildInputs = [ setuptools diff --git a/pkgs/development/python-modules/daqp/default.nix b/pkgs/development/python-modules/daqp/default.nix index 9ef1d3eee877..2b134f9f723d 100644 --- a/pkgs/development/python-modules/daqp/default.nix +++ b/pkgs/development/python-modules/daqp/default.nix @@ -8,7 +8,7 @@ , wheel , numpy }: -buildPythonPackage { +buildPythonPackage rec { pname = "daqp"; version = "0.5.1"; format = "pyproject"; @@ -20,7 +20,7 @@ buildPythonPackage { hash = "sha256-in7Ci/wM7i0csJ4XVfo1lboWOyfuuU+8E+TzGmMV3x0="; }; - sourceRoot = "source/interfaces/daqp-python"; + sourceRoot = "${src.name}/interfaces/daqp-python"; postPatch = '' sed -i 's|../../../daqp|../..|' setup.py diff --git a/pkgs/development/python-modules/flit-core/default.nix b/pkgs/development/python-modules/flit-core/default.nix index fc4d6479caee..a4e0716cf344 100644 --- a/pkgs/development/python-modules/flit-core/default.nix +++ b/pkgs/development/python-modules/flit-core/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { inherit (flit) src patches; - sourceRoot = "source/flit_core"; + sourceRoot = "${src.name}/flit_core"; # Tests are run in the "flit" package. doCheck = false; diff --git a/pkgs/development/python-modules/kanidm/default.nix b/pkgs/development/python-modules/kanidm/default.nix index fc53fc81ed70..88b98a1b5e79 100644 --- a/pkgs/development/python-modules/kanidm/default.nix +++ b/pkgs/development/python-modules/kanidm/default.nix @@ -22,7 +22,7 @@ let pname = "kanidm"; version = "0.0.3-unstable-2023-08-23"; in -buildPythonPackage { +buildPythonPackage rec { inherit pname version; pyproject = true; @@ -35,7 +35,7 @@ buildPythonPackage { hash = "sha256-5qQb+Itguw2v1Wdvc2vp00zglfvNd3LFEDvaweRJcOc="; }; - sourceRoot = "source/pykanidm"; + sourceRoot = "${src.name}/pykanidm"; nativeBuildInputs = [ poetry-core diff --git a/pkgs/development/python-modules/linien-client/default.nix b/pkgs/development/python-modules/linien-client/default.nix index 0cbd9b2d9adb..8997c3454a38 100644 --- a/pkgs/development/python-modules/linien-client/default.nix +++ b/pkgs/development/python-modules/linien-client/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { inherit (linien-common) src version; - sourceRoot = "source/linien-client"; + sourceRoot = "${src.name}/linien-client"; preBuild = '' export HOME=$(mktemp -d) diff --git a/pkgs/development/python-modules/linien-common/default.nix b/pkgs/development/python-modules/linien-common/default.nix index 605fdd6f740e..f0fd4b920707 100644 --- a/pkgs/development/python-modules/linien-common/default.nix +++ b/pkgs/development/python-modules/linien-common/default.nix @@ -22,7 +22,7 @@ buildPythonPackage rec { hash = "sha256-ZgAp1SEiHijyjK74VZyRLYY3Hzfc3BQ6cnoO3hZzvbE="; }; - sourceRoot = "source/linien-common"; + sourceRoot = "${src.name}/linien-common"; preBuild = '' export HOME=$(mktemp -d) diff --git a/pkgs/development/python-modules/openllm-client/default.nix b/pkgs/development/python-modules/openllm-client/default.nix index 08ac4e9ae02e..0b1e74212104 100644 --- a/pkgs/development/python-modules/openllm-client/default.nix +++ b/pkgs/development/python-modules/openllm-client/default.nix @@ -21,7 +21,7 @@ buildPythonPackage rec { disabled = pythonOlder "3.8"; - sourceRoot = "source/openllm-client"; + sourceRoot = "${src.name}/openllm-client"; postPatch = '' substituteInPlace pyproject.toml \ diff --git a/pkgs/development/python-modules/openllm-core/default.nix b/pkgs/development/python-modules/openllm-core/default.nix index c87e75fbc4d1..f5fb0ad6e6bf 100644 --- a/pkgs/development/python-modules/openllm-core/default.nix +++ b/pkgs/development/python-modules/openllm-core/default.nix @@ -36,7 +36,7 @@ buildPythonPackage rec { hash = "sha256-kRR715Vnt9ZAmxuWvtH0z093crH0JFrEKPtbjO3QMRc="; }; - sourceRoot = "source/openllm-core"; + sourceRoot = "${src.name}/openllm-core"; nativeBuildInputs = [ pythonRelaxDepsHook diff --git a/pkgs/development/python-modules/openllm/default.nix b/pkgs/development/python-modules/openllm/default.nix index ae2cedd9ce1a..8a37e257ffa9 100644 --- a/pkgs/development/python-modules/openllm/default.nix +++ b/pkgs/development/python-modules/openllm/default.nix @@ -51,7 +51,7 @@ buildPythonPackage rec { disabled = pythonOlder "3.8"; - sourceRoot = "source/openllm-python"; + sourceRoot = "${src.name}/openllm-python"; nativeBuildInputs = [ pythonRelaxDepsHook diff --git a/pkgs/development/python-modules/pendulum/3.nix b/pkgs/development/python-modules/pendulum/3.nix index 78e9c675ea8d..31e15af6de52 100644 --- a/pkgs/development/python-modules/pendulum/3.nix +++ b/pkgs/development/python-modules/pendulum/3.nix @@ -44,7 +44,7 @@ buildPythonPackage rec { cargoRoot = "rust"; cargoDeps = rustPlatform.fetchCargoTarball { inherit src; - sourceRoot = "source/rust"; + sourceRoot = "${src.name}/rust"; name = "${pname}-${version}"; hash = "sha256-6fw0KgnPIMfdseWcunsGjvjVB+lJNoG3pLDqkORPJ0I="; postPatch = '' diff --git a/pkgs/development/python-modules/prophet/default.nix b/pkgs/development/python-modules/prophet/default.nix index 07ee3e76021b..5c1e07961204 100644 --- a/pkgs/development/python-modules/prophet/default.nix +++ b/pkgs/development/python-modules/prophet/default.nix @@ -32,7 +32,7 @@ buildPythonPackage rec { hash = "sha256-liTg5Hm+FPpRQajBnnJKBh3JPGyu0Hflntf0isj1FiQ="; }; - sourceRoot = "source/python"; + sourceRoot = "${src.name}/python"; env.PROPHET_REPACKAGE_CMDSTAN = "false"; diff --git a/pkgs/development/python-modules/sudachidict/default.nix b/pkgs/development/python-modules/sudachidict/default.nix index 41a359110474..65f5d4630d06 100644 --- a/pkgs/development/python-modules/sudachidict/default.nix +++ b/pkgs/development/python-modules/sudachidict/default.nix @@ -17,7 +17,7 @@ buildPythonPackage rec { hash = "sha256-xJ/iPywOZA2kzHaVU43Bc8TUboj3OpDg1kLFMIc/T90="; }; - sourceRoot = "source/python"; + sourceRoot = "${src.name}/python"; # setup script tries to get data from the network but we use the nixpkgs' one postPatch = '' diff --git a/pkgs/development/tools/electron/common.nix b/pkgs/development/tools/electron/common.nix index 823b45971139..4cfb464078ff 100644 --- a/pkgs/development/tools/electron/common.nix +++ b/pkgs/development/tools/electron/common.nix @@ -34,9 +34,11 @@ in (chromium.override { upstream-info = info.chromium; }).mkDerivation (base: { yarnLock = (fetchdep info.deps."src/electron") + "/yarn.lock"; sha256 = info.electron_yarn_hash; }; - npmDeps = fetchNpmDeps { + npmDeps = fetchNpmDeps rec { src = fetchdep info.deps."src"; - sourceRoot = "source/third_party/node"; + # Assume that the fetcher always unpack the source, + # based on update.py + sourceRoot = "${src.name}/third_party/node"; hash = info.chromium_npm_hash; }; diff --git a/pkgs/development/tools/gendef/default.nix b/pkgs/development/tools/gendef/default.nix index 9b2418486f17..d799a33f3127 100644 --- a/pkgs/development/tools/gendef/default.nix +++ b/pkgs/development/tools/gendef/default.nix @@ -10,7 +10,7 @@ stdenv.mkDerivation (finalAttrs: { hash = "sha256-0vbAHSN+uwxoXXZtbuycP67PxjcB8Ftxd/Oij1gqE3Y="; }; - sourceRoot = "mingw-w64/mingw-w64-tools/gendef"; + sourceRoot = "${finalAttrs.src.name}/mingw-w64-tools/gendef"; meta = { description = "A tool which generate def files from DLLs"; diff --git a/pkgs/os-specific/linux/opensnitch-ebpf/default.nix b/pkgs/os-specific/linux/opensnitch-ebpf/default.nix index 70332abbe6ef..e012819254d7 100644 --- a/pkgs/os-specific/linux/opensnitch-ebpf/default.nix +++ b/pkgs/os-specific/linux/opensnitch-ebpf/default.nix @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { inherit (opensnitch) src; - sourceRoot = "source/ebpf_prog"; + sourceRoot = "${src.name}/ebpf_prog"; nativeBuildInputs = with llvmPackages; [ bc diff --git a/pkgs/os-specific/linux/tailor-gui/default.nix b/pkgs/os-specific/linux/tailor-gui/default.nix index d8aace99e4ef..69367ca6c255 100644 --- a/pkgs/os-specific/linux/tailor-gui/default.nix +++ b/pkgs/os-specific/linux/tailor-gui/default.nix @@ -15,7 +15,7 @@ }: let src = tuxedo-rs.src; - sourceRoot = "source/tailor_gui"; + sourceRoot = "${src.name}/tailor_gui"; pname = "tailor_gui"; version = "0.2.3"; in diff --git a/pkgs/servers/monitoring/openobserve/default.nix b/pkgs/servers/monitoring/openobserve/default.nix index 0f1bb02d55f2..5a99d017b601 100644 --- a/pkgs/servers/monitoring/openobserve/default.nix +++ b/pkgs/servers/monitoring/openobserve/default.nix @@ -27,7 +27,7 @@ let inherit src version; pname = "openobserve-ui"; - sourceRoot = "source/web"; + sourceRoot = "${src.name}/web"; npmDepsHash = "sha256-RNUCR80ewFt9F/VHv7kXLa87h0fz0YBp+9gSOUhtrdU="; diff --git a/pkgs/tools/misc/SP800-90B_EntropyAssessment/default.nix b/pkgs/tools/misc/SP800-90B_EntropyAssessment/default.nix index f2ff558168d5..7647d2b9f0b0 100644 --- a/pkgs/tools/misc/SP800-90B_EntropyAssessment/default.nix +++ b/pkgs/tools/misc/SP800-90B_EntropyAssessment/default.nix @@ -26,7 +26,7 @@ stdenv.mkDerivation rec { --replace "-march=native" "" ''; - sourceRoot = "source/cpp"; + sourceRoot = "${src.name}/cpp"; makeFlags = [ "CROSS_COMPILE=${stdenv.cc.targetPrefix}" diff --git a/pkgs/tools/misc/mpremote/default.nix b/pkgs/tools/misc/mpremote/default.nix index 892ee9756dbc..149e3c9686ac 100644 --- a/pkgs/tools/misc/mpremote/default.nix +++ b/pkgs/tools/misc/mpremote/default.nix @@ -17,7 +17,7 @@ buildPythonApplication rec { rev = "refs/tags/v${version}"; hash = "sha256-67CAR34VrMOzvNkukDeGRnUfoOLO66R37wsrRHjpp5E="; }; - sourceRoot = "source/tools/mpremote"; + sourceRoot = "${src.name}/tools/mpremote"; format = "pyproject"; nativeBuildInputs = [ From fc3a993440a18b7b66e7652e4502c417c8ecfa2e Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 9 Mar 2024 01:31:34 +0000 Subject: [PATCH 039/230] zotero: 6.0.30 -> 6.0.35 --- pkgs/applications/office/zotero/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/office/zotero/default.nix b/pkgs/applications/office/zotero/default.nix index a5c49591f086..e343790da2c7 100644 --- a/pkgs/applications/office/zotero/default.nix +++ b/pkgs/applications/office/zotero/default.nix @@ -41,12 +41,12 @@ stdenv.mkDerivation rec { pname = "zotero"; - version = "6.0.30"; + version = "6.0.35"; src = fetchurl { url = "https://download.zotero.org/client/release/${version}/Zotero-${version}_linux-x86_64.tar.bz2"; - hash = "sha256-4XQZ1xw9Qtk3SzHMsEUk+HuIYtHDAOMgpwzbAd5QQpU="; + hash = "sha256-HAVLmamEPuFf0548/iEXes+f4XnQ7kU1u9hyOYhVyZ0="; }; nativeBuildInputs = [ wrapGAppsHook ]; From 23af5dd096c92ec56efdb8a6300b0d96d5602b34 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 9 Mar 2024 04:09:26 +0000 Subject: [PATCH 040/230] schismtracker: 20240129 -> 20240308 --- pkgs/applications/audio/schismtracker/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/audio/schismtracker/default.nix b/pkgs/applications/audio/schismtracker/default.nix index 46f6237ce322..94b082fd84a4 100644 --- a/pkgs/applications/audio/schismtracker/default.nix +++ b/pkgs/applications/audio/schismtracker/default.nix @@ -11,13 +11,13 @@ stdenv.mkDerivation rec { pname = "schismtracker"; - version = "20240129"; + version = "20240308"; src = fetchFromGitHub { owner = pname; repo = pname; rev = version; - sha256 = "sha256-msi638LQM0LPfUineINRW8l8BcPKIeRBEDtV5L6anGk="; + sha256 = "sha256-6MzMmeD4HCS/7VTFTAcOhyKjz5NvzvDEzcSpHGUwFvM="; }; configureFlags = [ "--enable-dependency-tracking" ] From fb611d3f5ad92b26f446497fe52c6d6081b710c7 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 9 Mar 2024 04:11:03 +0000 Subject: [PATCH 041/230] sesh: 0.12.0 -> 0.15.0 --- pkgs/by-name/se/sesh/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/se/sesh/package.nix b/pkgs/by-name/se/sesh/package.nix index fb9d4ab2930f..ccfc53274e2c 100644 --- a/pkgs/by-name/se/sesh/package.nix +++ b/pkgs/by-name/se/sesh/package.nix @@ -5,13 +5,13 @@ }: buildGoModule rec { pname = "sesh"; - version = "0.12.0"; + version = "0.15.0"; src = fetchFromGitHub { owner = "joshmedeski"; repo = "sesh"; rev = "v${version}"; - hash = "sha256-m/EcWh4wfna9PB/NN+MCRUsz5Er0OZ70AAumlKdrm/s="; + hash = "sha256-vV1b0YhDBt/dJJCrxvVV/FIuOIleTg4mI496n4/Y/Hk="; }; vendorHash = "sha256-zt1/gE4bVj+3yr9n0kT2FMYMEmiooy3k1lQ77rN6sTk="; From 83b66d995ff8546c3bf9e6244472b76ecc1a2bee Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 9 Mar 2024 04:21:19 +0000 Subject: [PATCH 042/230] pocketbase: 0.22.2 -> 0.22.3 --- pkgs/servers/pocketbase/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/servers/pocketbase/default.nix b/pkgs/servers/pocketbase/default.nix index 9820fbab7dc2..094f501f783b 100644 --- a/pkgs/servers/pocketbase/default.nix +++ b/pkgs/servers/pocketbase/default.nix @@ -6,16 +6,16 @@ buildGoModule rec { pname = "pocketbase"; - version = "0.22.2"; + version = "0.22.3"; src = fetchFromGitHub { owner = "pocketbase"; repo = "pocketbase"; rev = "v${version}"; - hash = "sha256-y+8mBfMZI6FF8nzmlN0NaAP4Jbr69DYQnvle0TWt2kY="; + hash = "sha256-cJ/+A7gFPWkp8BxLWmEQaR1SloU4M1+cI3bV3VOkrD4="; }; - vendorHash = "sha256-Q3DlOKaE3fUlRMSfi8Ta9ZyyOE+viiONVUO8x4JACDg="; + vendorHash = "sha256-C4sipr1rxNIFY5FA94ogNhryGntLGIJStRJHy7NZjAs="; # This is the released subpackage from upstream repo subPackages = [ "examples/base" ]; From 3fafcf0683f662f4197598533979f12e6cd0a3c4 Mon Sep 17 00:00:00 2001 From: Nikolay Korotkiy Date: Fri, 2 Feb 2024 22:34:46 +0400 Subject: [PATCH 043/230] =?UTF-8?q?reproxy:=201.0.0=20=E2=86=92=201.1.1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pkgs/servers/reproxy/default.nix | 30 +++++++++++------------------- 1 file changed, 11 insertions(+), 19 deletions(-) diff --git a/pkgs/servers/reproxy/default.nix b/pkgs/servers/reproxy/default.nix index 21077aa83d1c..f90ad1246cf8 100644 --- a/pkgs/servers/reproxy/default.nix +++ b/pkgs/servers/reproxy/default.nix @@ -2,42 +2,34 @@ buildGoModule rec { pname = "reproxy"; - version = "1.0.0"; + version = "1.1.1"; src = fetchFromGitHub { owner = "umputun"; - repo = pname; + repo = "reproxy"; rev = "v${version}"; - hash = "sha256-ac4fOOMht2WGlrXLN95NEIA8ivqghhVuxHnBumvajx0="; + hash = "sha256-/ydpqi7O4z41YxYb/RngPWk/79h3MIxAopzqIDMgw1g="; }; - postPatch = '' - # Requires network access - substituteInPlace app/main_test.go \ - --replace "Test_Main" "Skip_Main" - substituteInPlace app/proxy/proxy_test.go \ - --replace "TestHttp_matchHandler" "SkipHttp_matchHandler" - '' + lib.optionalString stdenv.isDarwin '' - # Fails on Darwin. - # https://github.com/umputun/reproxy/issues/77 - substituteInPlace app/discovery/provider/file_test.go \ - --replace "TestFile_Events" "SkipFile_Events" \ - --replace "TestFile_Events_BusyListener" "SkipFile_Events_BusyListener" - ''; - vendorHash = null; ldflags = [ "-s" "-w" "-X main.revision=${version}" ]; - installPhase = '' - install -Dm755 $GOPATH/bin/app $out/bin/reproxy + checkFlags = [ + # Requires network access or fluky + "-skip=^Test(_MainWithPlugin|_MainWithSSL|_Main|Http_matchHandler|Http_withBasicAuth|File_Events|File_Events_BusyListener)$" + ]; + + postInstall = '' + mv $out/bin/{app,reproxy} ''; meta = with lib; { description = "Simple edge server / reverse proxy"; homepage = "https://reproxy.io/"; + changelog = "https://github.com/umputun/reproxy/releases/tag/${src.rev}"; license = licenses.mit; maintainers = with maintainers; [ sikmir ]; mainProgram = "reproxy"; From 0ac49e81be86cff7e061409570a3f3bb5f196d23 Mon Sep 17 00:00:00 2001 From: Nikolay Korotkiy Date: Sat, 17 Feb 2024 23:48:26 +0400 Subject: [PATCH 044/230] reproxy: migrate to by-name --- .../reproxy/default.nix => by-name/re/reproxy/package.nix} | 0 pkgs/top-level/all-packages.nix | 2 -- 2 files changed, 2 deletions(-) rename pkgs/{servers/reproxy/default.nix => by-name/re/reproxy/package.nix} (100%) diff --git a/pkgs/servers/reproxy/default.nix b/pkgs/by-name/re/reproxy/package.nix similarity index 100% rename from pkgs/servers/reproxy/default.nix rename to pkgs/by-name/re/reproxy/package.nix diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index ae6de2f99b33..ac21cffaed95 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -26936,8 +26936,6 @@ with pkgs; redstore = callPackage ../servers/http/redstore { }; - reproxy = callPackage ../servers/reproxy { }; - repro-get = callPackage ../tools/package-management/repro-get { }; restic = callPackage ../tools/backup/restic { }; From 9aabf7a485eb5bd0e831457147441381cbf102cf Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 9 Mar 2024 10:55:40 +0000 Subject: [PATCH 045/230] frugal: 3.17.8 -> 3.17.9 --- pkgs/development/tools/frugal/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/tools/frugal/default.nix b/pkgs/development/tools/frugal/default.nix index 27ea8143e7d0..8e8db3bc2045 100644 --- a/pkgs/development/tools/frugal/default.nix +++ b/pkgs/development/tools/frugal/default.nix @@ -2,18 +2,18 @@ buildGoModule rec { pname = "frugal"; - version = "3.17.8"; + version = "3.17.9"; src = fetchFromGitHub { owner = "Workiva"; repo = pname; rev = "v${version}"; - sha256 = "sha256-R9v/qWR+XuirMT2wM6UR2LrSpehkEtoRG73bBlni03k="; + sha256 = "sha256-VNzTrJ5sY6JHfUXLlY3LOQYfzoWPYltPQBZWx9FopSU="; }; subPackages = [ "." ]; - vendorHash = "sha256-BC8G41SWWecNiqj/8iez3debvpU9+PWHUya8V77zKj8="; + vendorHash = "sha256-5o2r392gT5mNvO7mFVRgOGgoy5d+1K2kIitBo+dzhFQ="; meta = with lib; { description = "Thrift improved"; From b861b89ba1bd48c0718dcd3317e1aeca5a7f47fc Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 9 Mar 2024 11:29:56 +0000 Subject: [PATCH 046/230] mitmproxy: 10.2.3 -> 10.2.4 --- pkgs/development/python-modules/mitmproxy/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/mitmproxy/default.nix b/pkgs/development/python-modules/mitmproxy/default.nix index 64b6602e04ec..860900902794 100644 --- a/pkgs/development/python-modules/mitmproxy/default.nix +++ b/pkgs/development/python-modules/mitmproxy/default.nix @@ -45,7 +45,7 @@ buildPythonPackage rec { pname = "mitmproxy"; - version = "10.2.3"; + version = "10.2.4"; pyproject = true; disabled = pythonOlder "3.9"; @@ -54,7 +54,7 @@ buildPythonPackage rec { owner = "mitmproxy"; repo = "mitmproxy"; rev = "refs/tags/${version}"; - hash = "sha256-hlZ5d4J3SDQp80C8lhwZkms/rc0uj8LslRmBqB5eIEw="; + hash = "sha256-6TPhxprrP6Bgc1yAhN3pBdr98WpvfGnVNvkNtFxROgE="; }; nativeBuildInputs = [ From f72b809df5c05774a21177395e94b71be8f9e88d Mon Sep 17 00:00:00 2001 From: Ben Price Date: Sat, 9 Mar 2024 11:36:29 +0000 Subject: [PATCH 047/230] rnix-lsp: remove package Upstream has been archived. The current package is not installable by default, since it depends on nix 2.15 which is marked as insecure. --- pkgs/README.md | 2 +- .../language-servers/rnix-lsp/default.nix | 24 ------------------- pkgs/top-level/aliases.nix | 1 + pkgs/top-level/all-packages.nix | 4 ---- 4 files changed, 2 insertions(+), 29 deletions(-) delete mode 100644 pkgs/development/tools/language-servers/rnix-lsp/default.nix diff --git a/pkgs/README.md b/pkgs/README.md index 837a99f07e7f..87bfeef62f04 100644 --- a/pkgs/README.md +++ b/pkgs/README.md @@ -176,7 +176,7 @@ For example, the `libxml2` package builds both a library and some tools; but it - **If it’s a _language server_:** - - `development/tools/language-servers` (e.g. `ccls` or `rnix-lsp`) + - `development/tools/language-servers` (e.g. `ccls` or `nil`) - **Else:** diff --git a/pkgs/development/tools/language-servers/rnix-lsp/default.nix b/pkgs/development/tools/language-servers/rnix-lsp/default.nix deleted file mode 100644 index 41b50afb01d9..000000000000 --- a/pkgs/development/tools/language-servers/rnix-lsp/default.nix +++ /dev/null @@ -1,24 +0,0 @@ -{ stdenv, lib, fetchFromGitHub, rustPlatform, nix }: - -rustPlatform.buildRustPackage rec { - pname = "rnix-lsp"; - version = "unstable-2022-11-27"; - - src = fetchFromGitHub { - owner = "nix-community"; - repo = "rnix-lsp"; - rev = "95d40673fe43642e2e1144341e86d0036abd95d9"; - sha256 = "sha256-F0s0m62S5bHNVWNHLZD6SeHiLrsDx98VQbRjDyIu+qQ="; - }; - - cargoSha256 = "sha256-RKHBp+/bEH9FEPLcf1MKmTugk1A8rQU447mNm9Le3DE="; - - nativeCheckInputs = lib.optional (!stdenv.isDarwin) nix; - - meta = with lib; { - description = "A work-in-progress language server for Nix, with syntax checking and basic completion"; - license = licenses.mit; - maintainers = with maintainers; [ ]; - mainProgram = "rnix-lsp"; - }; -} diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index 5ab7f14a911b..1ec3571efb0c 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -969,6 +969,7 @@ mapAliases ({ ricochet = throw "ricochet has been deprecated in favor of ricochet-refresh"; # Added 2024-02-26 rigsofrods = rigsofrods-bin; # Added 2023-03-22 ring-daemon = jami-daemon; # Added 2021-10-26 + rnix-lsp = throw "'rnix-lsp' has been removed as it is unmaintained"; # Added 2024-03-09 rockbox_utility = rockbox-utility; # Added 2022-03-17 rocalution = throw "'rocalution' has been replaced with 'rocmPackages.rocalution'"; # Added 2023-10-08 rocblas = throw "'rocblas' has been replaced with 'rocmPackages.rocblas'"; # Added 2023-10-08 diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 208d30b4f96d..5dad9d38c0da 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -18198,10 +18198,6 @@ with pkgs; pylyzer = callPackage ../development/tools/language-servers/pylyzer { }; - rnix-lsp = callPackage ../development/tools/language-servers/rnix-lsp { - nix = nixVersions.nix_2_15; - }; - ruff-lsp = python3Packages.callPackage ../development/tools/language-servers/ruff-lsp { }; rune-languageserver = callPackage ../development/tools/language-servers/rune-languageserver { }; From 5f6cea4c872a81f9ca84f5b88d23a42bac50ebf8 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 9 Mar 2024 12:30:12 +0000 Subject: [PATCH 048/230] dmarc-report-converter: 0.6.5 -> 0.7.0 --- pkgs/by-name/dm/dmarc-report-converter/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/dm/dmarc-report-converter/package.nix b/pkgs/by-name/dm/dmarc-report-converter/package.nix index 54c19d90d0d1..993c70c2c2ed 100644 --- a/pkgs/by-name/dm/dmarc-report-converter/package.nix +++ b/pkgs/by-name/dm/dmarc-report-converter/package.nix @@ -7,13 +7,13 @@ buildGoModule rec { pname = "dmarc-report-converter"; - version = "0.6.5"; + version = "0.7.0"; src = fetchFromGitHub { owner = "tierpod"; repo = "dmarc-report-converter"; rev = "v${version}"; - hash = "sha256-4rAQhZmqYldilCKomBfuyqS0vcUg5yS4nqp84XSjam4="; + hash = "sha256-doipM3SZmU/QUglN0UA2IpRgrhdMnuCmMPRs0OWRxPE="; }; vendorHash = null; From 986f5ee428396f667dd45f473daaebf9f5ffc40f Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 9 Mar 2024 12:37:51 +0000 Subject: [PATCH 049/230] oha: 1.3.0 -> 1.4.0 --- pkgs/tools/networking/oha/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/networking/oha/default.nix b/pkgs/tools/networking/oha/default.nix index 2ba7a62152db..28a35929696a 100644 --- a/pkgs/tools/networking/oha/default.nix +++ b/pkgs/tools/networking/oha/default.nix @@ -9,16 +9,16 @@ rustPlatform.buildRustPackage rec { pname = "oha"; - version = "1.3.0"; + version = "1.4.0"; src = fetchFromGitHub { owner = "hatoo"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-UZPC1Arp7/u8XafBvupAAwVu7lx5/F1Ahp944pfe2gw="; + hash = "sha256-mjQyeotXKF1hohSmPisshR8Cap9K/IEE55cYSk/QxQE="; }; - cargoHash = "sha256-6uGJ6cuMXFLJ6vvUNmUwc+r/4jRHEH5jiOTNb6Fkf6Y="; + cargoHash = "sha256-JZIuKUky8D9Q+1JZQ4Vg8GF6Qkh9hG/FebpqyRzPOcA="; nativeBuildInputs = lib.optionals stdenv.isLinux [ pkg-config From 131439ff2e6ef054cac603c1e52737111c0559c2 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 9 Mar 2024 16:03:45 +0000 Subject: [PATCH 050/230] python311Packages.google-cloud-asset: 3.24.3 -> 3.25.0 --- .../development/python-modules/google-cloud-asset/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/google-cloud-asset/default.nix b/pkgs/development/python-modules/google-cloud-asset/default.nix index 3fa39efec8d5..9adf04e4344f 100644 --- a/pkgs/development/python-modules/google-cloud-asset/default.nix +++ b/pkgs/development/python-modules/google-cloud-asset/default.nix @@ -19,14 +19,14 @@ buildPythonPackage rec { pname = "google-cloud-asset"; - version = "3.24.3"; + version = "3.25.0"; pyproject = true; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-owRdxr4Kr6VehuHl/mZuZo7XqixX2glWwJ3F/tq82bc="; + hash = "sha256-JiPKFOew9Pd2NuY7wDlFQ/N06m9IRutWO+d/YJspry0="; }; nativeBuildInputs = [ From 33df4307c0dd834d965966607ec2185aa56d35f5 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 9 Mar 2024 16:45:56 +0000 Subject: [PATCH 051/230] python311Packages.google-cloud-websecurityscanner: 1.14.2 -> 1.14.3 --- .../google-cloud-websecurityscanner/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/google-cloud-websecurityscanner/default.nix b/pkgs/development/python-modules/google-cloud-websecurityscanner/default.nix index 3188af54d1de..4703ba3aadb0 100644 --- a/pkgs/development/python-modules/google-cloud-websecurityscanner/default.nix +++ b/pkgs/development/python-modules/google-cloud-websecurityscanner/default.nix @@ -13,14 +13,14 @@ buildPythonPackage rec { pname = "google-cloud-websecurityscanner"; - version = "1.14.2"; + version = "1.14.3"; pyproject = true; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-loiKMV7guByukm9XBohVbCDsV607i8PXiQaJ8GZS6Go="; + hash = "sha256-Wp88cJqlAaAkaemHzkgKuhU4v4dFpgn5Sf+uqGKTeWQ="; }; nativeBuildInputs = [ From e6f565c80d155ae2fb049962a06fb37e9c69c98b Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 9 Mar 2024 19:05:25 +0000 Subject: [PATCH 052/230] miriway: unstable-2024-02-14 -> unstable-2024-03-06 --- pkgs/applications/window-managers/miriway/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/window-managers/miriway/default.nix b/pkgs/applications/window-managers/miriway/default.nix index b8528a374125..b1d60032db36 100644 --- a/pkgs/applications/window-managers/miriway/default.nix +++ b/pkgs/applications/window-managers/miriway/default.nix @@ -11,13 +11,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "miriway"; - version = "unstable-2024-02-14"; + version = "unstable-2024-03-06"; src = fetchFromGitHub { owner = "Miriway"; repo = "Miriway"; - rev = "ad4d311269dc25789f7412211ddddad383d9700c"; - hash = "sha256-kPrsyrAHvwrktBFITuhpFKyjmedv04ONFhuxiBDlAJA="; + rev = "d58ec46b38aa1c18bbe5c3a0ba2ccdf73b069ee9"; + hash = "sha256-0zbiSAF0T/OwRn5CYv2fLL4J3K5gUOmy3GK70RfXv5Y="; }; strictDeps = true; From cdc62d93a5713951da41cef441312625281adfec Mon Sep 17 00:00:00 2001 From: Gaetan Lepage Date: Sat, 9 Mar 2024 19:41:25 +0100 Subject: [PATCH 053/230] magic-enum: 0.8.5 -> 0.9.5 Diff: https://github.com/Neargye/magic_enum/compare/refs/tags/v0.8.5...v0.9.5 Changelog: https://github.com/Neargye/magic_enum/releases/tag/v0.9.5 --- .../libraries/magic-enum/default.nix | 17 ++++++++++------- 1 file changed, 10 insertions(+), 7 deletions(-) diff --git a/pkgs/development/libraries/magic-enum/default.nix b/pkgs/development/libraries/magic-enum/default.nix index ccf439ca9190..ac8afa938ea8 100644 --- a/pkgs/development/libraries/magic-enum/default.nix +++ b/pkgs/development/libraries/magic-enum/default.nix @@ -5,26 +5,29 @@ }: stdenv.mkDerivation rec{ pname = "magic-enum"; - version = "0.8.2"; + version = "0.9.5"; + src = fetchFromGitHub { owner = "Neargye"; repo = "magic_enum"; - rev = "v${version}"; - sha256 = "sha256-k4zCEQxO0N/o1hDYxw5p9u0BMwP/5oIoe/4yw7oqEo0="; + rev = "refs/tags/v${version}"; + hash = "sha256-Q82HdlEMXpiGISnqdjFd0rxiLgsobsoWiqqGLawu2pM="; }; nativeBuildInputs = [ cmake ]; - # disable tests until upstream fixes build issues with gcc 12 - # see https://github.com/Neargye/magic_enum/issues/235 - doCheck = false; cmakeFlags = [ - "-DMAGIC_ENUM_OPT_BUILD_TESTS=OFF" + # the cmake package does not handle absolute CMAKE_INSTALL_INCLUDEDIR correctly + # (setting it to an absolute path causes include files to go to $out/$out/include, + # because the absolute path is interpreted with root at $out). + "-DCMAKE_INSTALL_INCLUDEDIR=include" + "-DCMAKE_INSTALL_LIBDIR=lib" ]; meta = with lib;{ description = "Static reflection for enums (to string, from string, iteration) for modern C++"; homepage = "https://github.com/Neargye/magic_enum"; + changelog = "https://github.com/Neargye/magic_enum/releases/tag/v${version}"; license = licenses.mit; maintainers = with maintainers; [ Alper-Celik ]; }; From 8082302cfa19f9546c60d6d42fdbd19bd34f3009 Mon Sep 17 00:00:00 2001 From: Mathew Polzin Date: Sat, 9 Mar 2024 15:09:58 -0600 Subject: [PATCH 054/230] idris2Packages.idris2Lsp: Add metadata to derivation --- pkgs/development/compilers/idris2/idris2-lsp.nix | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/pkgs/development/compilers/idris2/idris2-lsp.nix b/pkgs/development/compilers/idris2/idris2-lsp.nix index d73f2d70d6d0..a9587588417a 100644 --- a/pkgs/development/compilers/idris2/idris2-lsp.nix +++ b/pkgs/development/compilers/idris2/idris2-lsp.nix @@ -1,4 +1,4 @@ -{ fetchFromGitHub, idris2Packages, makeWrapper }: +{ lib, fetchFromGitHub, idris2Packages, makeWrapper }: let globalLibraries = let @@ -40,5 +40,12 @@ let wrapProgram $out/bin/idris2-lsp \ --suffix IDRIS2_PACKAGE_PATH ':' "${globalLibrariesPath}" ''; + + meta = with lib; { + description = "Language Server for Idris2"; + homepage = "https://github.com/idris-community/idris2-lsp"; + license = licenses.bsd3; + maintainers = with maintainers; [ mattpolzin ]; + }; }; in lspPkg.executable From caaf070e773a14cf214a789afa1a11d8b0a22f8a Mon Sep 17 00:00:00 2001 From: Funkeleinhorn Date: Mon, 4 Mar 2024 16:59:49 +0100 Subject: [PATCH 055/230] python312Packages.pytest-examples: fix add patches due failing tests Added the patches: https://github.com/pydantic/pytest-examples/commit/3bef5d644fe3fdb076270833768e4c6df9148530 https://github.com/pydantic/pytest-examples/commit/551ba911713c2859caabc91b664723dd6bc800c5 as some tests where failing without them and prevented the package from building. --- .../python-modules/pytest-examples/default.nix | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/pkgs/development/python-modules/pytest-examples/default.nix b/pkgs/development/python-modules/pytest-examples/default.nix index 8a53bc17f12b..03df14e8c7b9 100644 --- a/pkgs/development/python-modules/pytest-examples/default.nix +++ b/pkgs/development/python-modules/pytest-examples/default.nix @@ -2,6 +2,7 @@ , black , buildPythonPackage , fetchFromGitHub +, fetchpatch , hatchling , pytest , pytestCheckHook @@ -24,6 +25,17 @@ buildPythonPackage rec { hash = "sha256-jCxOGDJlFkMH9VtaaPsE5zt+p3Z/mrVzhdNSI51/nVM="; }; + patches = [ + (fetchpatch { + url = "https://github.com/pydantic/pytest-examples/commit/551ba911713c2859caabc91b664723dd6bc800c5.patch"; + hash = "sha256-Y3OU4fNyLADhBQGwX2jY0gagVV2q2dcn3kJRLUyCtZI="; + }) + (fetchpatch { + url = "https://github.com/pydantic/pytest-examples/commit/3bef5d644fe3fdb076270833768e4c6df9148530.patch"; + hash = "sha256-pf+WKzZNqgjbJiblMMLHWk23kjg4W9nm+KBmC8rG8Lw="; + }) + ]; + postPatch = '' # ruff binary is used directly, the ruff Python package is not needed substituteInPlace pytest_examples/lint.py \ From e590114712b0e3674524696bd5dbf67f7464f927 Mon Sep 17 00:00:00 2001 From: Blake Smith Date: Sat, 9 Mar 2024 15:15:01 -0600 Subject: [PATCH 056/230] gotosocial: 0.13.3 -> 0.14.1 --- pkgs/servers/gotosocial/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/servers/gotosocial/default.nix b/pkgs/servers/gotosocial/default.nix index 3113ed59fc2e..4b2808138003 100644 --- a/pkgs/servers/gotosocial/default.nix +++ b/pkgs/servers/gotosocial/default.nix @@ -9,11 +9,11 @@ let owner = "superseriousbusiness"; repo = "gotosocial"; - version = "0.13.3"; + version = "0.14.1"; web-assets = fetchurl { url = "https://github.com/${owner}/${repo}/releases/download/v${version}/${repo}_${version}_web-assets.tar.gz"; - hash = "sha256-xC1Acm/CJHXTblV8E63vZB+r/ktBH7EytL7x4eWGko8="; + hash = "sha256-cNO0LuTzgx3CAP+qjTBZ9Fgs4jrH3ypZREpKKipOJDA="; }; in buildGoModule rec { @@ -23,7 +23,7 @@ buildGoModule rec { src = fetchFromGitHub { inherit owner repo; rev = "refs/tags/v${version}"; - hash = "sha256-zjmIa25veVL0ruFow4c1oV+VtgJGgWrRL99GPdaNc4g"; + hash = "sha256-gXriCpLPFBzIWm0xKE2LdT3+VWLNwJAHtT9ZuYO3sDI="; }; vendorHash = null; From 75c085f6c22aac3d29a279f908b08be51b61a174 Mon Sep 17 00:00:00 2001 From: David McFarland Date: Sat, 9 Mar 2024 17:32:31 -0400 Subject: [PATCH 057/230] dotnet: strip native symbols from runtime This reduces the output size of dotnet_9.vmr from 4.2GiB to 1.9GiB. --- pkgs/development/compilers/dotnet/vmr.nix | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/pkgs/development/compilers/dotnet/vmr.nix b/pkgs/development/compilers/dotnet/vmr.nix index 36b75c40e6c8..c51791e32484 100644 --- a/pkgs/development/compilers/dotnet/vmr.nix +++ b/pkgs/development/compilers/dotnet/vmr.nix @@ -187,6 +187,14 @@ in stdenv.mkDerivation rec { substituteInPlace \ src/runtime/src/native/libs/CMakeLists.txt \ --replace-fail 'add_compile_options(-Weverything)' 'add_compile_options(-Wall)' + + # strip native symbols in runtime + # see: https://github.com/dotnet/source-build/issues/2543 + xmlstarlet ed \ + --inplace \ + -s //Project -t elem -n PropertyGroup \ + -s \$prev -t elem -n KeepNativeSymbols -v false \ + src/runtime/Directory.Build.props '' + lib.optionalString isLinux '' substituteInPlace \ From 9f7c981becdaf5db54b43a2ac22a70feee0162c8 Mon Sep 17 00:00:00 2001 From: Jeremy Fleischman Date: Mon, 26 Feb 2024 20:25:56 -0800 Subject: [PATCH 058/230] kikit: 1.4.0 -> 1.5.0 This includes support for KiCad 8 (see complete changelog [here](https://github.com/yaqwsx/KiKit/releases/tag/v1.5.0)), which should unblock https://github.com/NixOS/nixpkgs/pull/291134. With this upgrade, a test started failing: $ nix build .#kikit ... kikit> not ok 40 Steel stencils kikit> # (in test file /build/source/test/system/stencil.bats, line 6) kikit> # `kikit stencil create --jigsize 60 60 $RES/conn.kicad_pcb steelStencil' failed kikit> # 04:32:16: Error: Directory '/homeless-shelter' couldn't be created (error 13: Permission denied) kikit> # An error occurred: OpenSCAD is not available. kikit> # Did you install it? Program `openscad` has to be in PATH kikit> # No output files produced kikit> not ok 41 Steel stencils with cutout kikit> # (in test file /build/source/test/system/stencil.bats, line 10) kikit> # `kikit stencil create --jigsize 60 60 --cutout J4 $RES/conn.kicad_pcb steelStencil' failed kikit> # 04:32:17: Error: Directory '/homeless-shelter' couldn't be created (error 13: Permission denied) kikit> # An error occurred: OpenSCAD is not available. kikit> # Did you install it? Program `openscad` has to be in PATH kikit> # No output files produced kikit> not ok 42 Printed stencils kikit> # (in test file /build/source/test/system/stencil.bats, line 14) kikit> # `kikit stencil createprinted \' failed kikit> # 04:32:17: Error: Directory '/homeless-shelter' couldn't be created (error 13: Permission denied) kikit> # An error occurred: OpenSCAD is not available. kikit> # Did you install it? Program `openscad` has to be in PATH kikit> # No output files produced kikit> make: *** [Makefile:40: test-system] Error 1 kikit> /nix/store/3qnm3nwjajgqa771dmi2dnwxrw0kzq5m-stdenv-linux/setup: line 131: pop_var_context: head of shell_variables not a function context error: builder for '/nix/store/f3klmz0qvi6yr3qfy7cww434f2z4kjx5-kikit-1.5.0.drv' failed with exit code 2; This is failing in some pretty old kikit code, so I think this is just failing due to kikit now having more complete code coverage. While researching this, I discovered kikit's documentation about [optional dependencies], which I suppose we don't have good support for right now. Rather than invent a new option for that, I've opted to preserve the existing behavior and just do the bare minimum to keep the build passing. [optional dependencies]: https://github.com/yaqwsx/KiKit/blob/v1.5.0/docs/installation/intro.md#optional-dependencies --- pkgs/by-name/ki/kikit/default.nix | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/ki/kikit/default.nix b/pkgs/by-name/ki/kikit/default.nix index e34f12652ede..e8356fd0a0ff 100644 --- a/pkgs/by-name/ki/kikit/default.nix +++ b/pkgs/by-name/ki/kikit/default.nix @@ -10,6 +10,7 @@ , numpy , click , markdown2 +, openscad , pytestCheckHook , commentjson , wxpython @@ -23,7 +24,7 @@ let in buildPythonApplication rec { pname = "kikit"; - version = "1.4.0"; + version = "1.5.0"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -32,7 +33,7 @@ buildPythonApplication rec { owner = "yaqwsx"; repo = "KiKit"; rev = "refs/tags/v${version}"; - hash = "sha256-88/1bL3MtawR/8P8U1jHatMbq+JxF1qb+plH3rYh1qU="; + hash = "sha256-f8FB6EEy9Ch4LcMKd9PADXV9QrSb7e22Ui86G6AnQKE="; }; propagatedBuildInputs = [ @@ -40,6 +41,9 @@ buildPythonApplication rec { numpy click markdown2 + # OpenSCAD is an optional dependency (see + # https://github.com/yaqwsx/KiKit/blob/v1.5.0/docs/installation/intro.md#optional-dependencies). + openscad commentjson # https://github.com/yaqwsx/KiKit/issues/575 wxpython From 571a9f40b8586dbc0a6417ccd3c9d9bd13f69e23 Mon Sep 17 00:00:00 2001 From: Mario Rodas Date: Sun, 10 Mar 2024 04:20:00 +0000 Subject: [PATCH 059/230] uv: 0.1.16 -> 0.1.17 Diff: https://github.com/astral-sh/uv/compare/0.1.16...0.1.17 Changelog: https://github.com/astral-sh/uv/blob/0.1.17/CHANGELOG.md --- pkgs/by-name/uv/uv/Cargo.lock | 31 +++++++++++++++++-------------- pkgs/by-name/uv/uv/package.nix | 4 ++-- 2 files changed, 19 insertions(+), 16 deletions(-) diff --git a/pkgs/by-name/uv/uv/Cargo.lock b/pkgs/by-name/uv/uv/Cargo.lock index cbab9d550a88..c3898d12ea70 100644 --- a/pkgs/by-name/uv/uv/Cargo.lock +++ b/pkgs/by-name/uv/uv/Cargo.lock @@ -915,6 +915,7 @@ version = "0.0.1" dependencies = [ "anyhow", "cache-key", + "chrono", "data-encoding", "distribution-filename", "fs-err", @@ -972,6 +973,15 @@ dependencies = [ "cfg-if", ] +[[package]] +name = "encoding_rs_io" +version = "0.1.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1cc3c5651fb62ab8aa3103998dade57efdd028544bd300516baa31840c252a83" +dependencies = [ + "encoding_rs", +] + [[package]] name = "equivalent" version = "1.0.1" @@ -2882,16 +2892,6 @@ dependencies = [ "thiserror", ] -[[package]] -name = "reqwest-netrc" -version = "0.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "eca0c58cd4b2978f9697dea94302e772399f559cd175356eb631cb6daaa0b6db" -dependencies = [ - "reqwest-middleware", - "rust-netrc", -] - [[package]] name = "reqwest-retry" version = "0.3.0" @@ -4179,13 +4179,14 @@ checksum = "f00cc9702ca12d3c81455259621e676d0f7251cec66a21e98fe2e9a37db93b2a" [[package]] name = "uv" -version = "0.1.16" +version = "0.1.17" dependencies = [ "anstream", "anyhow", "assert_cmd", "assert_fs", "base64 0.21.7", + "byteorder", "chrono", "clap", "clap_complete_command", @@ -4282,7 +4283,6 @@ dependencies = [ "tokio", "toml", "tracing", - "uv-extract", "uv-fs", "uv-interpreter", "uv-traits", @@ -4318,6 +4318,7 @@ dependencies = [ "async-trait", "async_http_range_reader", "async_zip", + "base64 0.21.7", "cache-key", "chrono", "distribution-filename", @@ -4335,10 +4336,10 @@ dependencies = [ "pypi-types", "reqwest", "reqwest-middleware", - "reqwest-netrc", "reqwest-retry", "rkyv", "rmp-serde", + "rust-netrc", "rustc-hash", "serde", "serde_json", @@ -4500,10 +4501,12 @@ name = "uv-fs" version = "0.0.1" dependencies = [ "dunce", + "encoding_rs_io", "fs-err", "fs2", "junction", "tempfile", + "tokio", "tracing", "urlencoding", "uv-warnings", @@ -4688,7 +4691,7 @@ dependencies = [ [[package]] name = "uv-version" -version = "0.1.16" +version = "0.1.17" [[package]] name = "uv-virtualenv" diff --git a/pkgs/by-name/uv/uv/package.nix b/pkgs/by-name/uv/uv/package.nix index aec7d7dc3716..25d0e7360e19 100644 --- a/pkgs/by-name/uv/uv/package.nix +++ b/pkgs/by-name/uv/uv/package.nix @@ -10,13 +10,13 @@ rustPlatform.buildRustPackage rec { pname = "uv"; - version = "0.1.16"; + version = "0.1.17"; src = fetchFromGitHub { owner = "astral-sh"; repo = "uv"; rev = version; - hash = "sha256-CvaYXtgd8eqzPNoXukjPwaoT/QOlUVKYNzD8Db6on9Q="; + hash = "sha256-nXH/9/c2UeG7LOJo0ZnozdI9df5cmVwICvgi0kRjgMU="; }; cargoLock = { From 1dc508f72cc6515f0f78f221e8682c0ed8899c6d Mon Sep 17 00:00:00 2001 From: Mario Rodas Date: Sun, 10 Mar 2024 04:20:00 +0000 Subject: [PATCH 060/230] yt-dlp: 2023.12.30 -> 2024.3.10 Changelog: https://github.com/yt-dlp/yt-dlp/releases/tag/2024.03.10 --- pkgs/tools/misc/yt-dlp/default.nix | 19 +++++++++++++++---- 1 file changed, 15 insertions(+), 4 deletions(-) diff --git a/pkgs/tools/misc/yt-dlp/default.nix b/pkgs/tools/misc/yt-dlp/default.nix index eeb05dd4012e..03998332eda2 100644 --- a/pkgs/tools/misc/yt-dlp/default.nix +++ b/pkgs/tools/misc/yt-dlp/default.nix @@ -2,6 +2,7 @@ , buildPythonPackage , fetchPypi , brotli +, hatchling , certifi , ffmpeg , rtmpdump @@ -9,7 +10,9 @@ , pycryptodomex , websockets , mutagen +, requests , secretstorage +, urllib3 , atomicparsleySupport ? true , ffmpegSupport ? true , rtmpSupport ? true @@ -22,19 +25,27 @@ buildPythonPackage rec { # The websites yt-dlp deals with are a very moving target. That means that # downloads break constantly. Because of that, updates should always be backported # to the latest stable release. - version = "2023.12.30"; + version = "2024.3.10"; + pyproject = true; src = fetchPypi { - inherit pname version; - hash = "sha256-oRhi5XchsKDwiD3+taTXm6ITotTEXhiA6f1w+OZXDDg="; + inherit version; + pname = "yt_dlp"; + hash = "sha256-bnTLFKadvrhyyO9OC4u+0u6EbsYzUTzzEkp0wfrtwHs="; }; + nativeBuildInputs = [ + hatchling + ]; + propagatedBuildInputs = [ brotli certifi mutagen pycryptodomex + requests secretstorage # "optional", as in not in requirements.txt, needed for `--cookies-from-browser` + urllib3 websockets ]; @@ -48,7 +59,7 @@ buildPythonPackage rec { ++ lib.optional atomicparsleySupport atomicparsley ++ lib.optional ffmpegSupport ffmpeg ++ lib.optional rtmpSupport rtmpdump; - in lib.optionalString (packagesToBinPath != []) + in lib.optionals (packagesToBinPath != []) [ ''--prefix PATH : "${lib.makeBinPath packagesToBinPath}"'' ]; setupPyBuildFlags = [ From 2c96816018036396d1f8befaed8303a715678eb8 Mon Sep 17 00:00:00 2001 From: Bruno Rodrigues Date: Sun, 10 Mar 2024 10:17:25 +0100 Subject: [PATCH 061/230] rPackages.gpg: fixed build --- pkgs/development/r-modules/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/development/r-modules/default.nix b/pkgs/development/r-modules/default.nix index 2082dff7a3a5..c51494b4428f 100644 --- a/pkgs/development/r-modules/default.nix +++ b/pkgs/development/r-modules/default.nix @@ -541,6 +541,7 @@ let bayesWatch = [ pkgs.boost.dev ]; clustermq = [ pkgs.pkg-config ]; coga = [ pkgs.gsl.dev ]; + gpg = [ pkgs.gpgme ]; webp = [ pkgs.libwebp ]; RMark = [ pkgs.which ]; RPushbullet = [ pkgs.which ]; From ea5e24ebd106e3bd9661bd92691ee33f718b2973 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sun, 10 Mar 2024 10:49:45 +0100 Subject: [PATCH 062/230] python311Packages.types-psutil: 5.9.5.17 -> 5.9.5.20240205 --- pkgs/development/python-modules/types-psutil/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/types-psutil/default.nix b/pkgs/development/python-modules/types-psutil/default.nix index fcfd7f5d0a65..0d51f30d12aa 100644 --- a/pkgs/development/python-modules/types-psutil/default.nix +++ b/pkgs/development/python-modules/types-psutil/default.nix @@ -5,12 +5,12 @@ buildPythonPackage rec { pname = "types-psutil"; - version = "5.9.5.17"; + version = "5.9.5.20240205"; format = "setuptools"; src = fetchPypi { inherit pname version; - hash = "sha256-99h2mBLXKktRPX7J61WA/i9gE/wnA5SmA8tlNIEfPk0="; + hash = "sha256-Ud82o2GqWXv0g9zFtY8qt6qHRSo20tqXyQmU1qge90M="; }; # Module doesn't have tests From 12f779bcd52b7d862937d815a65c3ed3e917db52 Mon Sep 17 00:00:00 2001 From: OPNA2608 Date: Sun, 10 Mar 2024 12:36:09 +0100 Subject: [PATCH 063/230] maintainers/scripts/bootstrap-files: Add powerpc64 to CROSS_TARGETS --- maintainers/scripts/bootstrap-files/refresh-tarballs.bash | 1 + 1 file changed, 1 insertion(+) diff --git a/maintainers/scripts/bootstrap-files/refresh-tarballs.bash b/maintainers/scripts/bootstrap-files/refresh-tarballs.bash index 21c43ade27f1..775d7ef1379d 100755 --- a/maintainers/scripts/bootstrap-files/refresh-tarballs.bash +++ b/maintainers/scripts/bootstrap-files/refresh-tarballs.bash @@ -93,6 +93,7 @@ CROSS_TARGETS=( mips64el-unknown-linux-gnuabi64 mips64el-unknown-linux-gnuabin32 mipsel-unknown-linux-gnu + powerpc64-unknown-linux-gnuabielfv2 powerpc64le-unknown-linux-gnu riscv64-unknown-linux-gnu ) From 5ec7dcd7c55dfd23f7b38c2f28e48034148fefdf Mon Sep 17 00:00:00 2001 From: OPNA2608 Date: Sun, 10 Mar 2024 12:36:34 +0100 Subject: [PATCH 064/230] pkgs/stdenv/linux: init powerpc64-unknown-linux-gnuabielfv2 bootstrap-files sha256sum of files to be uploaded: $ sha256sum /nix/store/8frm8kk8gzpv31r289ai5jgkwfikmpm4-stdenv-bootstrap-tools-powerpc64-unknown-linux-gnuabielfv2/on-server/* 0af311476b54b399f3024b92e9c518363acd2b15f713e83d0bb4fb3f8f26d98b /nix/store/8frm8kk8gzpv31r289ai5jgkwfikmpm4-stdenv-bootstrap-tools-powerpc64-unknown-linux-gnuabielfv2/on-server/bootstrap-tools.tar.xz 529a053a8022e89357aaa608e57aaddaa7c3ded93d633916ddca92bb81e22125 /nix/store/8frm8kk8gzpv31r289ai5jgkwfikmpm4-stdenv-bootstrap-tools-powerpc64-unknown-linux-gnuabielfv2/on-server/busybox Suggested commands to upload files to 'tarballs.nixos.org': $ nix-store --realize /nix/store/8frm8kk8gzpv31r289ai5jgkwfikmpm4-stdenv-bootstrap-tools-powerpc64-unknown-linux-gnuabielfv2 $ aws s3 cp --recursive --acl public-read /nix/store/8frm8kk8gzpv31r289ai5jgkwfikmpm4-stdenv-bootstrap-tools-powerpc64-unknown-linux-gnuabielfv2/on-server/ s3://nixpkgs-tarballs/stdenv/powerpc64-unknown-linux-gnuabielfv2/57cf2e0b24fb52344cc718913eaed78f389b1319 $ aws s3 cp --recursive s3://nixpkgs-tarballs/stdenv/powerpc64-unknown-linux-gnuabielfv2/57cf2e0b24fb52344cc718913eaed78f389b1319 ./ $ sha256sum bootstrap-tools.tar.xz busybox $ sha256sum /nix/store/8frm8kk8gzpv31r289ai5jgkwfikmpm4-stdenv-bootstrap-tools-powerpc64-unknown-linux-gnuabielfv2/on-server/* --- .../powerpc64-unknown-linux-gnuabielfv2.nix | 21 +++++++++++++++++++ pkgs/stdenv/linux/default.nix | 1 + 2 files changed, 22 insertions(+) create mode 100644 pkgs/stdenv/linux/bootstrap-files/powerpc64-unknown-linux-gnuabielfv2.nix diff --git a/pkgs/stdenv/linux/bootstrap-files/powerpc64-unknown-linux-gnuabielfv2.nix b/pkgs/stdenv/linux/bootstrap-files/powerpc64-unknown-linux-gnuabielfv2.nix new file mode 100644 index 000000000000..ac7c948664a3 --- /dev/null +++ b/pkgs/stdenv/linux/bootstrap-files/powerpc64-unknown-linux-gnuabielfv2.nix @@ -0,0 +1,21 @@ +# Autogenerated by maintainers/scripts/bootstrap-files/refresh-tarballs.bash as: +# $ ./refresh-tarballs.bash --targets=powerpc64-unknown-linux-gnuabielfv2 +# +# Metadata: +# - nixpkgs revision: 57cf2e0b24fb52344cc718913eaed78f389b1319 +# - hydra build: https://hydra.nixos.org/job/nixpkgs/cross-trunk/bootstrapTools.powerpc64-unknown-linux-gnuabielfv2.build/latest +# - resolved hydra build: https://hydra.nixos.org/build/252872323 +# - instantiated derivation: /nix/store/yaa735jz1r1n863gzv3c8szl77lsgg8d-stdenv-bootstrap-tools-powerpc64-unknown-linux-gnuabielfv2.drv +# - output directory: /nix/store/8frm8kk8gzpv31r289ai5jgkwfikmpm4-stdenv-bootstrap-tools-powerpc64-unknown-linux-gnuabielfv2 +# - build time: Sat, 09 Mar 2024 11:26:00 +0000 +{ + bootstrapTools = import { + url = "http://tarballs.nixos.org/stdenv/powerpc64-unknown-linux-gnuabielfv2/57cf2e0b24fb52344cc718913eaed78f389b1319/bootstrap-tools.tar.xz"; + hash = "sha256-CvMRR2tUs5nzAkuS6cUYNjrNKxX3E+g9C7T7P48m2Ys="; + }; + busybox = import { + url = "http://tarballs.nixos.org/stdenv/powerpc64-unknown-linux-gnuabielfv2/57cf2e0b24fb52344cc718913eaed78f389b1319/busybox"; + hash = "sha256-+vnQrVBHg793JIdQR4Y9KuqdmNZ+Ic0FZvVqrPOKnOY="; + executable = true; + }; +} diff --git a/pkgs/stdenv/linux/default.nix b/pkgs/stdenv/linux/default.nix index d2f3cc31ca08..9d13eb0b8e17 100644 --- a/pkgs/stdenv/linux/default.nix +++ b/pkgs/stdenv/linux/default.nix @@ -70,6 +70,7 @@ (if localSystem.isMips64n32 then ./bootstrap-files/mips64el-unknown-linux-gnuabin32.nix else ./bootstrap-files/mips64el-unknown-linux-gnuabi64.nix); + powerpc64-linux = import ./bootstrap-files/powerpc64-unknown-linux-gnuabielfv2.nix; powerpc64le-linux = import ./bootstrap-files/powerpc64le-unknown-linux-gnu.nix; riscv64-linux = import ./bootstrap-files/riscv64-unknown-linux-gnu.nix; }; From 6814bef1edd88dc31eea863320fffc2cd00738c5 Mon Sep 17 00:00:00 2001 From: Sefa Eyeoglu Date: Sun, 10 Mar 2024 12:53:23 +0100 Subject: [PATCH 065/230] gimpPlugins.gap: 2.6.0 -> 2.6.0-unstable-2023-05-20 Fixes https://github.com/NixOS/nixpkgs/issues/294707 Signed-off-by: Sefa Eyeoglu --- .../graphics/gimp/plugins/default.nix | 15 ++++++++++----- 1 file changed, 10 insertions(+), 5 deletions(-) diff --git a/pkgs/applications/graphics/gimp/plugins/default.nix b/pkgs/applications/graphics/gimp/plugins/default.nix index 4ef13e7ad312..16d5ab6d33c1 100644 --- a/pkgs/applications/graphics/gimp/plugins/default.nix +++ b/pkgs/applications/graphics/gimp/plugins/default.nix @@ -5,7 +5,7 @@ { config, lib, pkgs }: let - inherit (pkgs) stdenv fetchurl fetchpatch pkg-config intltool glib fetchFromGitHub; + inherit (pkgs) stdenv fetchurl fetchpatch pkg-config intltool glib fetchFromGitHub fetchFromGitLab; in lib.makeScope pkgs.newScope (self: @@ -111,13 +111,18 @@ in Video */ pname = "gap"; - version = "2.6.0"; + version = "2.6.0-unstable-2023-05-20"; - src = fetchurl { - url = "https://ftp.gimp.org/pub/gimp/plug-ins/v2.6/gap/gimp-gap-2.6.0.tar.bz2"; - sha256 = "1jic7ixcmsn4kx2cn32nc5087rk6g8xsrz022xy11yfmgvhzb0ql"; + src = fetchFromGitLab { + domain = "gitlab.gnome.org"; + owner = "Archive"; + repo = "gimp-gap"; + rev = "b2aa06cc7ee4ae1938f14640fe46b75ef5b15982"; + hash = "sha256-q5TgCy0+iIfxyqJRXsKxiFrWMFSzBqC0SA9MBGTHXcA="; }; + nativeBuildInputs = with pkgs; [autoreconfHook]; + hardeningDisable = [ "format" ]; env = { From 7928bc1aa67f2dc11c8dd35cac5b13569f7b1fe3 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 10 Mar 2024 12:20:23 +0000 Subject: [PATCH 066/230] python312Packages.pypinyin: 0.50.0 -> 0.51.0 --- pkgs/development/python-modules/pypinyin/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pypinyin/default.nix b/pkgs/development/python-modules/pypinyin/default.nix index f42315c33198..a109612fd75e 100644 --- a/pkgs/development/python-modules/pypinyin/default.nix +++ b/pkgs/development/python-modules/pypinyin/default.nix @@ -7,7 +7,7 @@ buildPythonPackage rec { pname = "pypinyin"; - version = "0.50.0"; + version = "0.51.0"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -16,7 +16,7 @@ buildPythonPackage rec { owner = "mozillazg"; repo = "python-pinyin"; rev = "refs/tags/v${version}"; - hash = "sha256-9RnuC9AvTlUtZqep6kn5y1xQcq/dzA9jTZXAsMpKZWc="; + hash = "sha256-kbUVif3a3L7BHj1b37FME5wicalK/iild0pvwPawr6Q="; }; postPatch = '' From 5be59e2a5f6a700114d8f503a2db7efbdd86e52a Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 10 Mar 2024 13:06:51 +0000 Subject: [PATCH 067/230] python312Packages.grpcio-testing: 1.62.0 -> 1.62.1 --- pkgs/development/python-modules/grpcio-testing/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/grpcio-testing/default.nix b/pkgs/development/python-modules/grpcio-testing/default.nix index d6ecbe9d3aa5..a5696d3fc73c 100644 --- a/pkgs/development/python-modules/grpcio-testing/default.nix +++ b/pkgs/development/python-modules/grpcio-testing/default.nix @@ -9,14 +9,14 @@ buildPythonPackage rec { pname = "grpcio-testing"; - version = "1.62.0"; + version = "1.62.1"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-T/CiuWYEuwA9Oa1v8li3XVVa13lePMFEr+2yDa/erJk="; + hash = "sha256-yyaVEAqykAtRz9vbVv4SEA1JWA8QrgZ6LKsRfo/HRu0="; }; postPatch = '' From a7016c1016f6a157d28a690c185483fedb0967ce Mon Sep 17 00:00:00 2001 From: Andrea Ciceri Date: Sun, 10 Mar 2024 12:01:16 +0100 Subject: [PATCH 068/230] tuya-device-sharing-sdk: init at 0.2.0 --- .../tuya-device-sharing-sdk/default.nix | 44 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 + 2 files changed, 46 insertions(+) create mode 100644 pkgs/development/python-modules/tuya-device-sharing-sdk/default.nix diff --git a/pkgs/development/python-modules/tuya-device-sharing-sdk/default.nix b/pkgs/development/python-modules/tuya-device-sharing-sdk/default.nix new file mode 100644 index 000000000000..dd95baba855d --- /dev/null +++ b/pkgs/development/python-modules/tuya-device-sharing-sdk/default.nix @@ -0,0 +1,44 @@ +{ lib +, buildPythonPackage +, fetchPypi +, setuptools +, requests +, paho-mqtt +, cryptography +}: +let + pname = "tuya-device-sharing-sdk"; + version = "0.2.0"; +in +buildPythonPackage { + inherit pname version; + + src = fetchPypi { + inherit pname version; + hash = "sha256-fu8zh59wlnxtstNbNL8mIm10tiXy22oPbi6oUy5x8c8="; + }; + + # workaround needed, upstream issue: https://github.com/tuya/tuya-device-sharing-sdk/issues/10 + postPatch = '' + touch requirements.txt + ''; + + build-system = [ + setuptools + ]; + + dependencies = [ + requests + paho-mqtt + cryptography + ]; + + doCheck = false; # no tests + + meta = with lib; { + description = "Tuya Device Sharing SDK"; + homepage = "https://github.com/tuya/tuya-device-sharing-sdk"; + license = licenses.mit; + maintainers = with maintainers; [ aciceri ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 2bdd593bd59a..1fb2ea4e2a18 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -15030,6 +15030,8 @@ self: super: with self; { turnt = callPackage ../development/python-modules/turnt { }; + tuya-device-sharing-sdk = callPackage ../development/python-modules/tuya-device-sharing-sdk { }; + tuya-iot-py-sdk = callPackage ../development/python-modules/tuya-iot-py-sdk { }; tuyaha = callPackage ../development/python-modules/tuyaha { }; From bde386aa1e44583cf9167c0edbddb69915854a88 Mon Sep 17 00:00:00 2001 From: Andrea Ciceri Date: Sun, 10 Mar 2024 12:17:22 +0100 Subject: [PATCH 069/230] home-assistant: typo --- pkgs/servers/home-assistant/parse-requirements.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/servers/home-assistant/parse-requirements.py b/pkgs/servers/home-assistant/parse-requirements.py index 5ff1510f2351..4a54f351ac49 100755 --- a/pkgs/servers/home-assistant/parse-requirements.py +++ b/pkgs/servers/home-assistant/parse-requirements.py @@ -1,5 +1,5 @@ #! /usr/bin/env nix-shell -#! nix-shell -i python3 -p "python3.withPackages (ps: with ps; [ packaging rich ])" -p nodePackages.pyright ruff isort" +#! nix-shell -i python3 -p "python3.withPackages (ps: with ps; [ packaging rich ])" -p nodePackages.pyright ruff isort # # This script downloads Home Assistant's source tarball. # Inside the homeassistant/components directory, each integration has an associated manifest.json, From 3ffe0ebddd402ab6ad20b982cdb603a447cba124 Mon Sep 17 00:00:00 2001 From: Andrea Ciceri Date: Sun, 10 Mar 2024 12:18:54 +0100 Subject: [PATCH 070/230] home-assistant: update component-packages --- pkgs/servers/home-assistant/component-packages.nix | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/pkgs/servers/home-assistant/component-packages.nix b/pkgs/servers/home-assistant/component-packages.nix index b9fc857f211c..78fbdbadeae2 100644 --- a/pkgs/servers/home-assistant/component-packages.nix +++ b/pkgs/servers/home-assistant/component-packages.nix @@ -5265,7 +5265,8 @@ ]; "tuya" = ps: with ps; [ ha-ffmpeg - ]; # missing inputs: tuya-device-sharing-sdk + tuya-device-sharing-sdk + ]; "twentemilieu" = ps: with ps; [ twentemilieu ]; @@ -6574,6 +6575,7 @@ "transport_nsw" "trend" "tts" + "tuya" "twentemilieu" "twilio" "twinkly" From 87a4f1321fd8519860b065f824eed97b4b44b18e Mon Sep 17 00:00:00 2001 From: Paul Meyer <49727155+katexochen@users.noreply.github.com> Date: Thu, 8 Feb 2024 16:09:22 +0100 Subject: [PATCH 071/230] dnf4: 4.18.2 -> 4.19.0 --- pkgs/development/python-modules/dnf4/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/dnf4/default.nix b/pkgs/development/python-modules/dnf4/default.nix index 87bd9a1b7d45..c9b7e5113b8c 100644 --- a/pkgs/development/python-modules/dnf4/default.nix +++ b/pkgs/development/python-modules/dnf4/default.nix @@ -16,7 +16,7 @@ in buildPythonPackage rec { pname = "dnf4"; - version = "4.18.2"; + version = "4.19.0"; format = "other"; outputs = [ "out" "man" "py" ]; @@ -25,7 +25,7 @@ buildPythonPackage rec { owner = "rpm-software-management"; repo = "dnf"; rev = version; - hash = "sha256-WOLVKsrHp0V0wMXXRf1hrxsxuVv2bFOKIw8Aitz0cac="; + hash = "sha256-LY2D3A3la58/8V2zKqPZWbR5iAMkrsG36gP8EvwANaA="; }; patches = [ From 7c467f63632a1e68e780a27cabd7f6d617306767 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 10 Mar 2024 14:05:56 +0000 Subject: [PATCH 072/230] python312Packages.aiopvpc: 4.2.2 -> 4.3.0 --- pkgs/development/python-modules/aiopvpc/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/aiopvpc/default.nix b/pkgs/development/python-modules/aiopvpc/default.nix index 602128265fdc..4fea39d1ca93 100644 --- a/pkgs/development/python-modules/aiopvpc/default.nix +++ b/pkgs/development/python-modules/aiopvpc/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { pname = "aiopvpc"; - version = "4.2.2"; + version = "4.3.0"; format = "pyproject"; disabled = pythonOlder "3.8"; @@ -23,7 +23,7 @@ buildPythonPackage rec { owner = "azogue"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-k02lNjFjOcMfHa1jLJlMFUOOVrdTrACNoEXDSZ693K8="; + hash = "sha256-8CNmrE3EMFg/bCrdI+K/8f0MRzKtGI74ILFMuSg1Ivo="; }; postPatch = '' From a69527ffec035b48b6f9bcdef93c742a6a8b6b30 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 10 Mar 2024 14:14:40 +0000 Subject: [PATCH 073/230] python311Packages.dissect-executable: 1.4 -> 1.5 --- .../development/python-modules/dissect-executable/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/dissect-executable/default.nix b/pkgs/development/python-modules/dissect-executable/default.nix index 7b3757d0f3ad..340d6ce66b84 100644 --- a/pkgs/development/python-modules/dissect-executable/default.nix +++ b/pkgs/development/python-modules/dissect-executable/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { pname = "dissect-executable"; - version = "1.4"; + version = "1.5"; format = "pyproject"; disabled = pythonOlder "3.7"; @@ -19,7 +19,7 @@ buildPythonPackage rec { owner = "fox-it"; repo = "dissect.executable"; rev = "refs/tags/${version}"; - hash = "sha256-h9eOTWJR0Bd3DY8WDYWqLCl1jYJcqP6cRTgWubf/rKI="; + hash = "sha256-aAalU0TUqXc13WnxJvirG3QzQyMstecOfnXMdFT8IzU="; }; nativeBuildInputs = [ From e662ea95f50aa8aebc13b2172a9ea171a0453d24 Mon Sep 17 00:00:00 2001 From: Nick Cao Date: Sun, 10 Mar 2024 11:19:40 -0400 Subject: [PATCH 074/230] v2ray-domain-list-community: 20240221053250 -> 20240310062737 Diff: https://github.com/v2fly/domain-list-community/compare/20240221053250...20240310062737 --- pkgs/data/misc/v2ray-domain-list-community/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/data/misc/v2ray-domain-list-community/default.nix b/pkgs/data/misc/v2ray-domain-list-community/default.nix index 1533cd089228..5d6895da7125 100644 --- a/pkgs/data/misc/v2ray-domain-list-community/default.nix +++ b/pkgs/data/misc/v2ray-domain-list-community/default.nix @@ -3,12 +3,12 @@ let generator = pkgsBuildBuild.buildGoModule rec { pname = "v2ray-domain-list-community"; - version = "20240221053250"; + version = "20240310062737"; src = fetchFromGitHub { owner = "v2fly"; repo = "domain-list-community"; rev = version; - hash = "sha256-oPffStUx2CD4gfSNIYqCzLLj+IAhm3aGQknRsrauD+k="; + hash = "sha256-KJSa5qDNGokNin0M2BppRks1qyMg19o+EOxu5OsCeOg="; }; vendorHash = "sha256-azvMUi8eLNoNofRa2X4SKTTiMd6aOyO6H/rOiKjkpIY="; meta = with lib; { From 431a9ea23c90bcfaf9666aece0cc776a6adc9b0a Mon Sep 17 00:00:00 2001 From: Locochoco Date: Mon, 4 Mar 2024 11:23:15 -0300 Subject: [PATCH 075/230] opengv: init at 0-unstable-2020-08-06 --- pkgs/by-name/op/opengv/package.nix | 45 ++++++++++++++++++++++++++++++ 1 file changed, 45 insertions(+) create mode 100644 pkgs/by-name/op/opengv/package.nix diff --git a/pkgs/by-name/op/opengv/package.nix b/pkgs/by-name/op/opengv/package.nix new file mode 100644 index 000000000000..ffe10a4d732b --- /dev/null +++ b/pkgs/by-name/op/opengv/package.nix @@ -0,0 +1,45 @@ +{ lib +, stdenv +, eigen +, fetchFromGitHub +, cmake +}: +stdenv.mkDerivation (finalAttrs: { + pname = "opengv"; + version = "0-unstable-2020-08-06"; + + src = fetchFromGitHub { + owner = "laurentkneip"; + repo = "opengv"; + rev = "91f4b19c73450833a40e463ad3648aae80b3a7f3"; + hash = "sha256-LfnylJ9NCHlqjT76Tgku4NwxULJ+WDAcJQ2lDKGWSI4="; + }; + + nativeBuildInputs = [ + cmake + ]; + + buildInputs = [ + eigen + ]; + + cmakeFlakes = [ + (lib.cmakeFeature "CMAKE_BUILD_TYPE" "Release") + ]; + + meta = { + description = "A collection of computer vision methods for solving geometric vision problems"; + homepage = "https://github.com/laurentkneip/opengv"; + license = lib.licenses.bsd2; + longDescription = ''OpenGV is a collection of computer vision methods for solving + geometric vision problems. It contains absolute-pose, relative-pose, + triangulation, and point-cloud alignment methods for the calibrated + case. All problems can be solved with central or non-central cameras, + and embedded into a random sample consensus or nonlinear optimization + context. Matlab and Python interfaces are implemented as well. The link + to the above pages also shows links to precompiled Matlab mex-libraries. + Please consult the documentation for more information.''; + maintainers = [ lib.maintainers.locochoco ]; + platforms = lib.platforms.all; + }; +}) From cc13881d2e241ac35959b8a99c191ff3022d6fff Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 10 Mar 2024 17:04:30 +0000 Subject: [PATCH 076/230] granted: 0.21.0 -> 0.21.1 --- pkgs/tools/admin/granted/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/admin/granted/default.nix b/pkgs/tools/admin/granted/default.nix index 57eaec1acf38..4761d49e8bec 100644 --- a/pkgs/tools/admin/granted/default.nix +++ b/pkgs/tools/admin/granted/default.nix @@ -12,13 +12,13 @@ buildGoModule rec { pname = "granted"; - version = "0.21.0"; + version = "0.21.1"; src = fetchFromGitHub { owner = "common-fate"; repo = pname; rev = "v${version}"; - sha256 = "sha256-hNbn1bBC9dNiThwi1+Mh45s/9DAwoI8XC4ZjB6Ls8sw="; + sha256 = "sha256-aHqMsEqlD/a/qQEjRKQU/+9Ov5BTnptExuO0eEXvf9k="; }; vendorHash = "sha256-I4sds5r61oGop+EtOpDgTYwLbSVBBSBmNbRU56sCYjo="; From cdebbedd64ce5207f65be2f30ede15a290c3a45c Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 10 Mar 2024 17:14:42 +0000 Subject: [PATCH 077/230] python311Packages.persim: 0.3.2 -> 0.3.5 --- pkgs/development/python-modules/persim/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/persim/default.nix b/pkgs/development/python-modules/persim/default.nix index 869fb6146f2e..45114af407c4 100644 --- a/pkgs/development/python-modules/persim/default.nix +++ b/pkgs/development/python-modules/persim/default.nix @@ -16,14 +16,14 @@ buildPythonPackage rec { pname = "persim"; - version = "0.3.2"; + version = "0.3.5"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-p6Vumfr+vRDr0D9PnEZItp9vNlCLIb59HpBg1KdyHGE="; + hash = "sha256-qyly3kIx9HQ7zDT0SfUlsqZGqibdXsfW1dL9HNpQZJg="; }; propagatedBuildInputs = [ From 672e2c013f384f575636946b4d59a98fcc6dd353 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 10 Mar 2024 17:30:59 +0000 Subject: [PATCH 078/230] scli: 0.7.3 -> 0.7.4 --- pkgs/applications/misc/scli/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/misc/scli/default.nix b/pkgs/applications/misc/scli/default.nix index 2cfc8b6a3265..e493b0188032 100644 --- a/pkgs/applications/misc/scli/default.nix +++ b/pkgs/applications/misc/scli/default.nix @@ -10,13 +10,13 @@ python3.pkgs.buildPythonApplication rec { pname = "scli"; - version = "0.7.3"; + version = "0.7.4"; src = fetchFromGitHub { owner = "isamert"; repo = pname; rev = "refs/tags/v${version}"; - sha256 = "sha256-x5NLYqA/sdQkT/8oG/ija/+4+KjRHa1q0T3mqymAuV8="; + sha256 = "sha256-GC19iJYdNUdC4UEBWWdlzl0Ha6Y3knB1dG+6spwdYQ0="; }; propagatedBuildInputs = with python3.pkgs; [ From f7ed1663f3ee34178872c35c3a0f1521ea13258e Mon Sep 17 00:00:00 2001 From: Hraban Luyat Date: Fri, 1 Mar 2024 20:09:39 -0500 Subject: [PATCH 079/230] sbcl: assert coreCompression -> !purgeNixReferences --- pkgs/development/compilers/sbcl/default.nix | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/pkgs/development/compilers/sbcl/default.nix b/pkgs/development/compilers/sbcl/default.nix index e8933d045e37..0262584c3e37 100644 --- a/pkgs/development/compilers/sbcl/default.nix +++ b/pkgs/development/compilers/sbcl/default.nix @@ -94,7 +94,14 @@ stdenv.mkDerivation (self: rec { strace ] ); - buildInputs = lib.optionals coreCompression [ zstd ]; + buildInputs = lib.optionals coreCompression ( + # Declare at the point of actual use in case the caller wants to override + # buildInputs to sidestep this. + assert lib.assertMsg (!purgeNixReferences) '' + Cannot enable coreCompression when purging Nix references, because compression requires linking in zlib + ''; + [ zstd ] + ); patches = lib.optionals (lib.versionOlder self.version "2.4.2") [ # Fixed in 2.4.2 From bbf6991aa5fded31c4050331f557ebc559d6b13e Mon Sep 17 00:00:00 2001 From: aleksana Date: Mon, 11 Mar 2024 03:35:20 +0800 Subject: [PATCH 080/230] folio: init at 24.05 --- pkgs/by-name/fo/folio/package.nix | 51 +++++++++++++++++++++++++++++++ 1 file changed, 51 insertions(+) create mode 100644 pkgs/by-name/fo/folio/package.nix diff --git a/pkgs/by-name/fo/folio/package.nix b/pkgs/by-name/fo/folio/package.nix new file mode 100644 index 000000000000..27cd08ba1b9c --- /dev/null +++ b/pkgs/by-name/fo/folio/package.nix @@ -0,0 +1,51 @@ +{ lib +, stdenv +, fetchFromGitHub +, meson +, ninja +, pkg-config +, vala +, blueprint-compiler +, wrapGAppsHook4 +, desktop-file-utils +, libadwaita +, libgee +, gtksourceview5 +}: + +stdenv.mkDerivation rec { + pname = "folio"; + version = "24.05"; + + src = fetchFromGitHub { + owner = "toolstack"; + repo = "Folio"; + rev = version; + hash = "sha256-8FU7xYidKXtrSLVT9t+i0O8eYlUYIpq7rVU5Cm10CWE="; + }; + + nativeBuildInputs = [ + meson + ninja + pkg-config + vala + blueprint-compiler + wrapGAppsHook4 + desktop-file-utils + ]; + + buildInputs = [ + libadwaita + libgee + gtksourceview5 + ]; + + meta = with lib; { + description = "A beautiful markdown note-taking app for GNOME (forked from Paper)"; + homepage = "https://github.com/toolstack/Folio"; + license = licenses.gpl3Only; + mainProgram = "com.toolstack.Folio"; + maintainers = with maintainers; [ aleksana ]; + platforms = platforms.unix; + }; +} From 2383e873f915088bb53a79576b1d555cc558f0de Mon Sep 17 00:00:00 2001 From: Felix Buehler Date: Thu, 7 Mar 2024 21:29:31 +0100 Subject: [PATCH 081/230] python312Packages.ipy: normalize pname and folder --- pkgs/development/python-modules/{IPy => ipy}/default.nix | 5 +++-- pkgs/top-level/python-packages.nix | 2 +- 2 files changed, 4 insertions(+), 3 deletions(-) rename pkgs/development/python-modules/{IPy => ipy}/default.nix (90%) diff --git a/pkgs/development/python-modules/IPy/default.nix b/pkgs/development/python-modules/ipy/default.nix similarity index 90% rename from pkgs/development/python-modules/IPy/default.nix rename to pkgs/development/python-modules/ipy/default.nix index f8291ee8ac5b..8a2f64ce3638 100644 --- a/pkgs/development/python-modules/IPy/default.nix +++ b/pkgs/development/python-modules/ipy/default.nix @@ -1,12 +1,13 @@ { lib, buildPythonPackage, fetchPypi, nose }: buildPythonPackage rec { - pname = "IPy"; + pname = "ipy"; version = "1.01"; format = "setuptools"; src = fetchPypi { - inherit pname version; + pname = "IPy"; + inherit version; sha256 = "edeca741dea2d54aca568fa23740288c3fe86c0f3ea700344571e9ef14a7cc1a"; }; diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 35757d65166e..1bdf545f9b26 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -5742,7 +5742,7 @@ self: super: with self; { ipwhois = callPackage ../development/python-modules/ipwhois { }; - ipy = callPackage ../development/python-modules/IPy { }; + ipy = callPackage ../development/python-modules/ipy { }; ipycanvas = callPackage ../development/python-modules/ipycanvas { }; From 6b592238cdb1b6341b95d95cb45f1f26f3a62077 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 10 Mar 2024 19:45:33 +0000 Subject: [PATCH 082/230] moon: 1.22.4 -> 1.22.6 --- pkgs/development/tools/build-managers/moon/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/tools/build-managers/moon/default.nix b/pkgs/development/tools/build-managers/moon/default.nix index 69d067c9439b..b3261ee08f3b 100644 --- a/pkgs/development/tools/build-managers/moon/default.nix +++ b/pkgs/development/tools/build-managers/moon/default.nix @@ -9,16 +9,16 @@ rustPlatform.buildRustPackage rec { pname = "moon"; - version = "1.22.4"; + version = "1.22.6"; src = fetchFromGitHub { owner = "moonrepo"; repo = pname; rev = "v${version}"; - hash = "sha256-Hx31oEvf6irURxtLBPaY2unCgW0tBurhSjhBNI1ifng="; + hash = "sha256-xVjY9lrnNMFU97FLOQgwb/GKQNVtSBcFTY27KA0Iyns="; }; - cargoHash = "sha256-DKktU8w+4TeGSzidjovK9xgis98Gz7BretrO+bpfnTc="; + cargoHash = "sha256-UHKRPb15H+91jmKyHy7OGiKfCCVVhir4aHITldAl0RA="; env = { RUSTFLAGS = "-C strip=symbols"; From 574ccc1256059141f2931f6e5bf112a8c04d8d88 Mon Sep 17 00:00:00 2001 From: Felix Buehler Date: Thu, 7 Mar 2024 21:27:38 +0100 Subject: [PATCH 083/230] python312Packages.pyqt6-charts: normalize pname --- .../{pyqt6-charts.nix => pyqt6-charts/default.nix} | 5 +++-- pkgs/top-level/python-packages.nix | 2 +- 2 files changed, 4 insertions(+), 3 deletions(-) rename pkgs/development/python-modules/{pyqt6-charts.nix => pyqt6-charts/default.nix} (95%) diff --git a/pkgs/development/python-modules/pyqt6-charts.nix b/pkgs/development/python-modules/pyqt6-charts/default.nix similarity index 95% rename from pkgs/development/python-modules/pyqt6-charts.nix rename to pkgs/development/python-modules/pyqt6-charts/default.nix index 258a9c2eb8f4..fd969f6a805a 100644 --- a/pkgs/development/python-modules/pyqt6-charts.nix +++ b/pkgs/development/python-modules/pyqt6-charts/default.nix @@ -10,14 +10,15 @@ }: buildPythonPackage rec { - pname = "PyQt6_Charts"; + pname = "pyqt6-charts"; version = "6.6.0"; format = "pyproject"; disabled = pythonOlder "3.6"; src = fetchPypi { - inherit pname version; + pname = "PyQt6_Charts"; + inherit version; sha256 = "sha256-FMxuXRnK6AEpUkpC+mMy0NXa2kKCqUI0Jea5rhtrxW0="; }; diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 35757d65166e..42d327d3a181 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -11317,7 +11317,7 @@ self: super: with self; { pyqt6 = callPackage ../development/python-modules/pyqt/6.x.nix { }; - pyqt6-charts = callPackage ../development/python-modules/pyqt6-charts.nix { }; + pyqt6-charts = callPackage ../development/python-modules/pyqt6-charts { }; pyqt6-sip = callPackage ../development/python-modules/pyqt/pyqt6-sip.nix { }; From c98936865da51654138466b3b9e195bf060dcb29 Mon Sep 17 00:00:00 2001 From: Evan Richter Date: Fri, 8 Mar 2024 23:31:44 -0700 Subject: [PATCH 084/230] gitu: init at 0.5.4 --- pkgs/by-name/gi/gitu/package.nix | 50 ++++++++++++++++++++++++++++++++ 1 file changed, 50 insertions(+) create mode 100644 pkgs/by-name/gi/gitu/package.nix diff --git a/pkgs/by-name/gi/gitu/package.nix b/pkgs/by-name/gi/gitu/package.nix new file mode 100644 index 000000000000..8f0a02fa24ba --- /dev/null +++ b/pkgs/by-name/gi/gitu/package.nix @@ -0,0 +1,50 @@ +{ lib +, rustPlatform +, fetchFromGitHub +, pkg-config +, libgit2 +, openssl +, zlib +, stdenv +, darwin +, git +}: + +rustPlatform.buildRustPackage rec { + pname = "gitu"; + version = "0.5.4"; + + src = fetchFromGitHub { + owner = "altsem"; + repo = "gitu"; + rev = "v${version}"; + hash = "sha256-a4hNgEizxanYE3XuHSCmbV6CkOqhXkznP3Sp0KLFFQs="; + }; + + cargoHash = "sha256-+CA3UG32oZedzRbt7b0wOlhH/subuym4BCL5SMNzrr8="; + + nativeBuildInputs = [ + pkg-config + ]; + + buildInputs = [ + libgit2 + openssl + zlib + ] ++ lib.optionals stdenv.isDarwin [ + darwin.apple_sdk.frameworks.Security + ]; + + nativeCheckInputs = [ + git + ]; + + meta = with lib; { + description = "A TUI Git client inspired by Magit"; + homepage = "https://github.com/altsem/gitu"; + changelog = "https://github.com/altsem/gitu/blob/${src.rev}/CHANGELOG.md"; + license = licenses.mit; + maintainers = with maintainers; [ evanrichter ]; + mainProgram = "gitu"; + }; +} From 434e4065af7f8439c6af7ca7a2a08ba04488acac Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sun, 10 Mar 2024 21:12:15 +0100 Subject: [PATCH 085/230] python311Packages.dissect-executable: refactor --- pkgs/development/python-modules/dissect-executable/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/python-modules/dissect-executable/default.nix b/pkgs/development/python-modules/dissect-executable/default.nix index 340d6ce66b84..8511b2df9448 100644 --- a/pkgs/development/python-modules/dissect-executable/default.nix +++ b/pkgs/development/python-modules/dissect-executable/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { pname = "dissect-executable"; version = "1.5"; - format = "pyproject"; + pyproject = true; disabled = pythonOlder "3.7"; From 2f8f308c950679873d1bbe7aacaf5072e2af2d78 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sun, 10 Mar 2024 21:13:43 +0100 Subject: [PATCH 086/230] python312Packages.aiopvpc: refactor --- pkgs/development/python-modules/aiopvpc/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/development/python-modules/aiopvpc/default.nix b/pkgs/development/python-modules/aiopvpc/default.nix index 4fea39d1ca93..853d01257740 100644 --- a/pkgs/development/python-modules/aiopvpc/default.nix +++ b/pkgs/development/python-modules/aiopvpc/default.nix @@ -15,20 +15,20 @@ buildPythonPackage rec { pname = "aiopvpc"; version = "4.3.0"; - format = "pyproject"; + pyproject = true; disabled = pythonOlder "3.8"; src = fetchFromGitHub { owner = "azogue"; - repo = pname; + repo = "aiopvpc"; rev = "refs/tags/v${version}"; hash = "sha256-8CNmrE3EMFg/bCrdI+K/8f0MRzKtGI74ILFMuSg1Ivo="; }; postPatch = '' - substituteInPlace pyproject.toml --replace \ - " --cov --cov-report term --cov-report html" "" + substituteInPlace pyproject.toml \ + --replace-fail " --cov --cov-report term --cov-report html" "" ''; nativeBuildInputs = [ From 2f2192235a3a1e617a2578127cae147aeb37b3d8 Mon Sep 17 00:00:00 2001 From: Felix Buehler Date: Sun, 10 Mar 2024 21:17:32 +0100 Subject: [PATCH 087/230] python312Packages.imread: normalize pname --- pkgs/development/python-modules/imread/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/python-modules/imread/default.nix b/pkgs/development/python-modules/imread/default.nix index 69eb79ddbcaa..8d2823356e32 100644 --- a/pkgs/development/python-modules/imread/default.nix +++ b/pkgs/development/python-modules/imread/default.nix @@ -12,7 +12,7 @@ }: buildPythonPackage rec { - pname = "python-imread"; + pname = "imread"; version = "0.7.5"; pyproject = true; From cec84c2febbdc25b03c0bf0e1a2ac6335490c99e Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Tue, 5 Mar 2024 23:34:47 +0100 Subject: [PATCH 088/230] python311Packages.universal-pathlib: 0.1.4 -> 0.2.2 Changelog: https://github.com/fsspec/universal_pathlib/releases/tag/v0.2.2 --- pkgs/development/python-modules/universal-pathlib/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/universal-pathlib/default.nix b/pkgs/development/python-modules/universal-pathlib/default.nix index 23667d02c283..195d6cbfe2a8 100644 --- a/pkgs/development/python-modules/universal-pathlib/default.nix +++ b/pkgs/development/python-modules/universal-pathlib/default.nix @@ -9,7 +9,7 @@ buildPythonPackage rec { pname = "universal-pathlib"; - version = "0.1.4"; + version = "0.2.2"; format = "pyproject"; disabled = pythonOlder "3.8"; @@ -17,7 +17,7 @@ buildPythonPackage rec { src = fetchPypi { pname = "universal_pathlib"; inherit version; - hash = "sha256-guXYbRaifg6hrcfYisvLqdAtWkVIgWMXT5bZrCidsuQ="; + hash = "sha256-a8IVVIeSrV2zVTcIscGbr9ni+hZn3JJe1ATJXlKuLxM="; }; nativeBuildInputs = [ From 0e17e41a702160f32e89e08cdbee0a6f4c3efa95 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Tue, 5 Mar 2024 23:34:53 +0100 Subject: [PATCH 089/230] python311Packages.textual-universal-directorytree: 1.0.2 -> 1.1.0 Diff: https://github.com/juftin/textual-universal-directorytree/compare/refs/tags/v1.0.2...v1.1.0 Changelog: https://github.com/juftin/textual-universal-directorytree/releases/tag/refs/tags/v1.1.0 --- .../textual-universal-directorytree/default.nix | 14 ++------------ 1 file changed, 2 insertions(+), 12 deletions(-) diff --git a/pkgs/development/python-modules/textual-universal-directorytree/default.nix b/pkgs/development/python-modules/textual-universal-directorytree/default.nix index b36ce6ed84e9..0e9e3e6d002c 100644 --- a/pkgs/development/python-modules/textual-universal-directorytree/default.nix +++ b/pkgs/development/python-modules/textual-universal-directorytree/default.nix @@ -1,7 +1,6 @@ { lib , buildPythonPackage , fetchFromGitHub -, fetchpatch , hatchling , textual , universal-pathlib @@ -16,7 +15,7 @@ buildPythonPackage rec { pname = "textual-universal-directorytree"; - version = "1.0.2"; + version = "1.1.0"; pyproject = true; disabled = pythonOlder "3.8"; @@ -25,18 +24,9 @@ buildPythonPackage rec { owner = "juftin"; repo = "textual-universal-directorytree"; rev = "refs/tags/v${version}"; - hash = "sha256-FL2bwPGqBmDn33Rhj7+VEpuqB4znEAw+GGAODTs25oo="; + hash = "sha256-ncQ3IRaZaCv1rMUWT9dkUKo6OAEC5pziMCM7adIBGWo="; }; - patches = [ - # universal-pathlib upgrade, https://github.com/juftin/textual-universal-directorytree/pull/2 - (fetchpatch { - name = "universal-pathlib-upgrade.patch"; - url = "https://github.com/juftin/textual-universal-directorytree/commit/e445aff21ddf756e3f180c8308a75c41487667c3.patch"; - hash = "sha256-Fftx8rrLPb6lQ+HBdB5Ai55LHMWEO6XftmFfZXbXIyk="; - }) - ]; - nativeBuildInputs = [ hatchling ]; From c04673860963501ead2b1d8cf16be3a125a0b446 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sun, 10 Mar 2024 21:22:38 +0100 Subject: [PATCH 090/230] browsr: 1.18.0 -> 1.19.0 Diff: https://github.com/juftin/browsr/compare/refs/tags/v1.18.0...v1.19.0 Changelog: https://github.com/juftin/browsr/releases/tag/refs/tags/v1.19.0 --- pkgs/applications/file-managers/browsr/default.nix | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/file-managers/browsr/default.nix b/pkgs/applications/file-managers/browsr/default.nix index b859ab8d7e11..a772dfa71750 100644 --- a/pkgs/applications/file-managers/browsr/default.nix +++ b/pkgs/applications/file-managers/browsr/default.nix @@ -6,14 +6,14 @@ python3.pkgs.buildPythonApplication rec { pname = "browsr"; - version = "1.18.0"; + version = "1.19.0"; pyproject = true; src = fetchFromGitHub { owner = "juftin"; repo = "browsr"; rev = "refs/tags/v${version}"; - hash = "sha256-Ygqoz1rNQwhU1/8NsHwQsSCqQ8gYwHEaAuIaVMCtKKA="; + hash = "sha256-V5B+/zfUlpF0TMTHqzyjapW93/DoJKgbJkTMX2NZyIQ="; }; nativeBuildInputs = with python3.pkgs; [ @@ -27,6 +27,7 @@ python3.pkgs.buildPythonApplication rec { pandas pillow pymupdf + pyperclip rich rich-click rich-pixels @@ -75,6 +76,9 @@ python3.pkgs.buildPythonApplication rec { "test_github_screenshot" "test_github_screenshot_license" "test_textual_app_context_path_github" + "test_mkdocs_screenshot" + # Different output + "test_textual_app_context_path" ]; meta = with lib; { From 81da691379a28e1922f18157a69ba40f71117e57 Mon Sep 17 00:00:00 2001 From: Felix Buehler Date: Sun, 10 Mar 2024 21:33:09 +0100 Subject: [PATCH 091/230] python312Packages.xstatic-jquery-ui: normalize pname --- .../development/python-modules/xstatic-jquery-ui/default.nix | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/xstatic-jquery-ui/default.nix b/pkgs/development/python-modules/xstatic-jquery-ui/default.nix index f5509676d114..0f74a49f929c 100644 --- a/pkgs/development/python-modules/xstatic-jquery-ui/default.nix +++ b/pkgs/development/python-modules/xstatic-jquery-ui/default.nix @@ -5,11 +5,12 @@ }: buildPythonPackage rec { - pname = "XStatic-jquery-ui"; + pname = "xstatic-jquery-ui"; version = "1.13.0.1"; src = fetchPypi { - inherit version pname; + pname = "XStatic-jquery-ui"; + inherit version; sha256 = "3697e5f0ef355b8f4a1c724221592683c2db031935cbb57b46224eef474bd294"; }; From 46fd4cceb873f50edb9f4cfc46fab71146b91726 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sun, 10 Mar 2024 21:33:31 +0100 Subject: [PATCH 092/230] python311Packages.html-sanitizer: 2.3 -> 2.3.1 Diff: https://github.com/matthiask/html-sanitizer/compare/refs/tags/2.3...2.3.1 Changelog: https://github.com/matthiask/html-sanitizer/blob/2.3.1/CHANGELOG.rst --- pkgs/development/python-modules/html-sanitizer/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/html-sanitizer/default.nix b/pkgs/development/python-modules/html-sanitizer/default.nix index c859952214ef..6d40e5f19070 100644 --- a/pkgs/development/python-modules/html-sanitizer/default.nix +++ b/pkgs/development/python-modules/html-sanitizer/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { pname = "html-sanitizer"; - version = "2.3"; + version = "2.3.1"; format = "pyproject"; disabled = pythonOlder "3.7"; @@ -19,7 +19,7 @@ buildPythonPackage rec { owner = "matthiask"; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-lQ8E3hdHX0YR3HJUTz1pVBegLo4lhvyiylLVFMDY1+s="; + hash = "sha256-NWJLD70783Ie6efyCvGopxMIlP3rLz0uM/D1rLQwBXE="; }; nativeBuildInputs = [ From 683a3ed54e99b6e2d156870f8aaa79cd55d7f6e3 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sun, 10 Mar 2024 21:34:27 +0100 Subject: [PATCH 093/230] python311Packages.html-sanitizer: refactor --- pkgs/development/python-modules/html-sanitizer/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/html-sanitizer/default.nix b/pkgs/development/python-modules/html-sanitizer/default.nix index 6d40e5f19070..e1ecf2764e4f 100644 --- a/pkgs/development/python-modules/html-sanitizer/default.nix +++ b/pkgs/development/python-modules/html-sanitizer/default.nix @@ -11,13 +11,13 @@ buildPythonPackage rec { pname = "html-sanitizer"; version = "2.3.1"; - format = "pyproject"; + pyproject = true; disabled = pythonOlder "3.7"; src = fetchFromGitHub { owner = "matthiask"; - repo = pname; + repo = "html-sanitizer"; rev = "refs/tags/${version}"; hash = "sha256-NWJLD70783Ie6efyCvGopxMIlP3rLz0uM/D1rLQwBXE="; }; From 715a29acad2a205ef56020344f3fd372c04926cd Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sun, 10 Mar 2024 21:36:29 +0100 Subject: [PATCH 094/230] checkov: 3.2.33 -> 3.2.34 Diff: https://github.com/bridgecrewio/checkov/compare/refs/tags/3.2.33...3.2.34 Changelog: https://github.com/bridgecrewio/checkov/releases/tag/3.2.34 --- pkgs/development/tools/analysis/checkov/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/analysis/checkov/default.nix b/pkgs/development/tools/analysis/checkov/default.nix index 81ddda28e9fd..e47b9a0fdeed 100644 --- a/pkgs/development/tools/analysis/checkov/default.nix +++ b/pkgs/development/tools/analysis/checkov/default.nix @@ -5,14 +5,14 @@ python3.pkgs.buildPythonApplication rec { pname = "checkov"; - version = "3.2.33"; + version = "3.2.34"; pyproject = true; src = fetchFromGitHub { owner = "bridgecrewio"; repo = "checkov"; rev = "refs/tags/${version}"; - hash = "sha256-OI5c1L4wWM9C+wKJCY+VIoIyxoNVAdlZoeu3zbWSNPY="; + hash = "sha256-L6fk9eRgzazHEQ8C06kjCi/or/x6bVZY6dienl94cDQ="; }; patches = [ From b005277b9190cd54098639d6a8533d9437f3cf8e Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sun, 10 Mar 2024 21:40:48 +0100 Subject: [PATCH 095/230] python312Packages.grpcio-testing: refactor --- .../python-modules/grpcio-testing/default.nix | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/grpcio-testing/default.nix b/pkgs/development/python-modules/grpcio-testing/default.nix index a5696d3fc73c..c5cdf76a5ef6 100644 --- a/pkgs/development/python-modules/grpcio-testing/default.nix +++ b/pkgs/development/python-modules/grpcio-testing/default.nix @@ -5,12 +5,13 @@ , protobuf , pythonOlder , pythonRelaxDepsHook +, setuptools }: buildPythonPackage rec { pname = "grpcio-testing"; version = "1.62.1"; - format = "setuptools"; + pyproject = true; disabled = pythonOlder "3.7"; @@ -21,9 +22,13 @@ buildPythonPackage rec { postPatch = '' substituteInPlace setup.py \ - --replace '"grpcio>={version}".format(version=grpc_version.VERSION)' '"grpcio"' + --replace-fail '"grpcio>={version}".format(version=grpc_version.VERSION)' '"grpcio"' ''; + nativeBuildInputs = [ + setuptools + ]; + propagatedBuildInputs = [ grpcio protobuf From 39a7f3380aebda5be400b97b10fd61a70e95aaeb Mon Sep 17 00:00:00 2001 From: sodiboo Date: Sun, 10 Mar 2024 21:49:38 +0100 Subject: [PATCH 096/230] maintainers: add sodiboo --- maintainers/maintainer-list.nix | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index 681e68781e55..c3b6bc1320e2 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -18104,6 +18104,12 @@ githubId = 55726; name = "Stanislav Ochotnický"; }; + sodiboo = { + name = "sodiboo"; + github = "sodiboo"; + githubId = 37938646; + matrix = "@sodiboo:arcticfoxes.net"; + }; softinio = { email = "code@softinio.com"; github = "softinio"; From 5e2f90e7a02c6b6733d271b617c4d3be1bb35f87 Mon Sep 17 00:00:00 2001 From: sodiboo Date: Sun, 10 Mar 2024 22:02:52 +0100 Subject: [PATCH 097/230] niri: add sodiboo as maintainer --- pkgs/by-name/ni/niri/package.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/by-name/ni/niri/package.nix b/pkgs/by-name/ni/niri/package.nix index e8bf2773b3b3..d9aeac8818ac 100644 --- a/pkgs/by-name/ni/niri/package.nix +++ b/pkgs/by-name/ni/niri/package.nix @@ -83,7 +83,7 @@ rustPlatform.buildRustPackage rec { description = "A scrollable-tiling Wayland compositor"; homepage = "https://github.com/YaLTeR/niri"; license = licenses.gpl3Only; - maintainers = with maintainers; [ iogamaster foo-dogsquared ]; + maintainers = with maintainers; [ iogamaster foo-dogsquared sodiboo ]; mainProgram = "niri"; platforms = platforms.linux; }; From 7b78f6a375ea49be7f379ac5452057e8f350d01f Mon Sep 17 00:00:00 2001 From: sodiboo Date: Sun, 10 Mar 2024 22:04:10 +0100 Subject: [PATCH 098/230] niri: cherry-pick patch a regression was introduced in the release of v0.1.3 and it is advised that packagers include this patch --- pkgs/by-name/ni/niri/package.nix | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/pkgs/by-name/ni/niri/package.nix b/pkgs/by-name/ni/niri/package.nix index d9aeac8818ac..e198d0585d2f 100644 --- a/pkgs/by-name/ni/niri/package.nix +++ b/pkgs/by-name/ni/niri/package.nix @@ -16,6 +16,7 @@ , libclang , autoPatchelfHook , clang +, fetchpatch }: rustPlatform.buildRustPackage rec { @@ -29,6 +30,14 @@ rustPlatform.buildRustPackage rec { hash = "sha256-VTtXEfxc3OCdtdYiEdtftOQ7gDJNb679Yw8v1Lu3lhY="; }; + patches = [ + (fetchpatch { + name = "revert-viewporter.patch"; + url = "https://github.com/YaLTeR/niri/commit/40cec34aa4a7f99ab12b30cba1a0ee83a706a413.patch"; + hash = "sha256-3fg8v0eotfjUQY6EVFEPK5BBIBrr6vQpXbjDcsw2E8Q="; + }) + ]; + cargoLock = { lockFile = ./Cargo.lock; outputHashes = { From c6baec71f5dfc1d7f4b01a894654f5e2e8ab3ff1 Mon Sep 17 00:00:00 2001 From: Patka Date: Sun, 10 Mar 2024 21:14:12 +0100 Subject: [PATCH 099/230] phpPackages.castor: 0.13.1 -> 0.14.0 Release notes: https://github.com/jolicode/castor/releases/tag/v0.14.0 --- pkgs/development/php-packages/castor/default.nix | 16 +++++++++++++--- 1 file changed, 13 insertions(+), 3 deletions(-) diff --git a/pkgs/development/php-packages/castor/default.nix b/pkgs/development/php-packages/castor/default.nix index 241980e93d6f..1b6b3f6be9d4 100644 --- a/pkgs/development/php-packages/castor/default.nix +++ b/pkgs/development/php-packages/castor/default.nix @@ -1,5 +1,6 @@ { lib , fetchFromGitHub +, fetchpatch , installShellFiles , php , nix-update-script @@ -8,16 +9,25 @@ php.buildComposerProject (finalAttrs: { pname = "castor"; - version = "0.13.1"; + version = "0.14.0"; src = fetchFromGitHub { owner = "jolicode"; repo = "castor"; rev = "v${finalAttrs.version}"; - hash = "sha256-Sm6I306iKVr66sBp+ADeTZAKGToVMc+Y/BCymUdszNc="; + hash = "sha256-sSIkXNW6RR1mx15dKouQLMaHBr5FEkTTc/0QIkWV8sg="; }; - vendorHash = "sha256-KbmovAnejShyVclF4IcZ9ckUOWysfEz3DFqE8OxlzI0="; + patches = [ + # Upstream lock is invalid. https://github.com/jolicode/castor/issues/319 + (fetchpatch { + name = "fix-invalid-lock.patch"; + url = "https://github.com/jolicode/castor/commit/5ff0c3ecbdddad20146adbc2f055b83f5aadba0f.patch"; + hash = "sha256-1a3Dpk/UXp92Ugw9zSoLPsbWOJEuP2FBWc/pQ/EKwaM="; + }) + ]; + + vendorHash = "sha256-HfEjwlkozeuT4LDnYwiCu7T0spcf4GLhkd7Kc1VRnro="; nativeBuildInputs = [ installShellFiles ]; From 2827e12204ca7a2c99c10533c2f62a86c25ebc38 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 10 Mar 2024 21:10:16 +0000 Subject: [PATCH 100/230] libretro.mupen64plus: unstable-2024-02-06 -> unstable-2024-03-07 --- pkgs/applications/emulators/retroarch/hashes.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/emulators/retroarch/hashes.json b/pkgs/applications/emulators/retroarch/hashes.json index 558c24a2ed88..a7c3ec887c15 100644 --- a/pkgs/applications/emulators/retroarch/hashes.json +++ b/pkgs/applications/emulators/retroarch/hashes.json @@ -539,10 +539,10 @@ "src": { "owner": "libretro", "repo": "mupen64plus-libretro-nx", - "rev": "fa55ddca926d3c3ad2285911646919def4aa6fa3", - "hash": "sha256-Fn/qSQDR8FuHG9eLE0I24wUa0sdosrl6+lhnf9cD+yQ=" + "rev": "3f794eec4dc4af2f22ecce507f2da324381d3d92", + "hash": "sha256-xO01TAjW8otnoU8fzmK69BufoQn3eY9BPamc3ISqBn8=" }, - "version": "unstable-2024-02-06" + "version": "unstable-2024-03-07" }, "neocd": { "fetcher": "fetchFromGitHub", From c855b309b5ee195547cdb8aab123c00b9cb483c5 Mon Sep 17 00:00:00 2001 From: TheMaxMur Date: Mon, 11 Mar 2024 00:19:43 +0300 Subject: [PATCH 101/230] maintainers: add themaxmur --- maintainers/maintainer-list.nix | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index 681e68781e55..c05fef0e2b7e 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -19221,6 +19221,12 @@ githubId = 3105057; name = "Jan Beinke"; }; + themaxmur = { + name = "Maxim Muravev"; + email = "muravjev.mak@yandex.ru"; + github = "TheMaxMur"; + githubId = 31189199; + }; thenonameguy = { email = "thenonameguy24@gmail.com"; name = "Krisztian Szabo"; From 7155f29c4512222ce39e1da4933704b3a74898d7 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 10 Mar 2024 21:31:36 +0000 Subject: [PATCH 102/230] libretro.beetle-psx-hw: unstable-2024-03-01 -> unstable-2024-03-08 --- pkgs/applications/emulators/retroarch/hashes.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/emulators/retroarch/hashes.json b/pkgs/applications/emulators/retroarch/hashes.json index 558c24a2ed88..3367df6c5b02 100644 --- a/pkgs/applications/emulators/retroarch/hashes.json +++ b/pkgs/applications/emulators/retroarch/hashes.json @@ -85,10 +85,10 @@ "src": { "owner": "libretro", "repo": "beetle-psx-libretro", - "rev": "680bbf0e2a4f9bc2b534d213416456baa9c95212", - "hash": "sha256-QmiCokeMtQC2+cwWFovve2+c3pahD+IdOFBRAXEPV0k=" + "rev": "b9018ad9776de0d92d05f6d6c1017f1ac07e9238", + "hash": "sha256-1xxJ33IiTgmqbH4vzEGBc3eKe1Wz67TI1RTiipr9/Cg=" }, - "version": "unstable-2024-03-01" + "version": "unstable-2024-03-08" }, "beetle-saturn": { "fetcher": "fetchFromGitHub", From 1098a08904988a1af362b46eb14f8eb133181c17 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 10 Mar 2024 21:35:35 +0000 Subject: [PATCH 103/230] libretro.stella: unstable-2024-03-03 -> unstable-2024-03-08 --- pkgs/applications/emulators/retroarch/hashes.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/emulators/retroarch/hashes.json b/pkgs/applications/emulators/retroarch/hashes.json index 558c24a2ed88..23d817263019 100644 --- a/pkgs/applications/emulators/retroarch/hashes.json +++ b/pkgs/applications/emulators/retroarch/hashes.json @@ -793,10 +793,10 @@ "src": { "owner": "stella-emu", "repo": "stella", - "rev": "a311e1d714db3837ae4c05e2fab0abcf092a2e54", - "hash": "sha256-QJirSJleSPezNoyH2DKkaoNmGY3r/5J64IHBp+MeFvI=" + "rev": "8e8549c1c441e62c2bac0ae5a6489ba3e15412c6", + "hash": "sha256-gcIBtLpfmjPHxnixMOF/onNyIclC8sDrmgTi3zHW0Mc=" }, - "version": "unstable-2024-03-03" + "version": "unstable-2024-03-08" }, "stella2014": { "fetcher": "fetchFromGitHub", From 9831409f2cc1eb1394b28c26415540003a2ead23 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 10 Mar 2024 22:10:13 +0000 Subject: [PATCH 104/230] tippecanoe: 2.49.0 -> 2.51.0 --- pkgs/by-name/ti/tippecanoe/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/ti/tippecanoe/package.nix b/pkgs/by-name/ti/tippecanoe/package.nix index 056391f5119e..9c1960eb2220 100644 --- a/pkgs/by-name/ti/tippecanoe/package.nix +++ b/pkgs/by-name/ti/tippecanoe/package.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "tippecanoe"; - version = "2.49.0"; + version = "2.51.0"; src = fetchFromGitHub { owner = "felt"; repo = "tippecanoe"; rev = finalAttrs.version; - hash = "sha256-Wu6TSld/mxCb4CFXf2oIZpDvX/j3Ujm7Vli4kp04u7c="; + hash = "sha256-5Cu+0Tn+ExxJTO5AjeTnIJtnpBNKR7nxudD77X696H0="; }; buildInputs = [ sqlite zlib ]; From d5294127e9990086f4c8be15c69210ab1977991c Mon Sep 17 00:00:00 2001 From: Elian Doran Date: Sun, 31 Dec 2023 00:55:16 +0200 Subject: [PATCH 105/230] frequest: init at 1.2a --- pkgs/by-name/fr/frequest/package.nix | 60 ++++++++++++++++++++++++++++ 1 file changed, 60 insertions(+) create mode 100644 pkgs/by-name/fr/frequest/package.nix diff --git a/pkgs/by-name/fr/frequest/package.nix b/pkgs/by-name/fr/frequest/package.nix new file mode 100644 index 000000000000..cd157115ecfa --- /dev/null +++ b/pkgs/by-name/fr/frequest/package.nix @@ -0,0 +1,60 @@ +{ lib, stdenv, fetchFromGitHub, qt5 }: + +stdenv.mkDerivation (finalAttrs: { + pname = "frequest"; + version = "1.2a"; + + srcs = [ + (fetchFromGitHub { + owner = "fabiobento512"; + name = "frequest"; + repo = "FRequest"; + rev = "v${finalAttrs.version}"; + hash = "sha256-fdn3MK5GWBOhJjpMtRaytO9EsVzz6KJknDhqWtAyXCc="; + }) + # The application depends on hard-coded relative paths to ../CommonLibs and ../CommonUtils. + # See https://github.com/fabiobento512/FRequest/wiki/Building-FRequest for more info. + # Upstream provides no tags for these dependencies, use latest commit on their `master` branch. + # Changing the name of these srcs will break the build. + (fetchFromGitHub { + owner = "fabiobento512"; + name = "CommonLibs"; + repo = "CommonLibs"; + rev = "d3906931bb06ddf4194ff711a59e1dcff80fa82f"; + hash = "sha256-iLJJ95yJ+VjNPuk8fNEDvYBI0db0rcfJF12a9azGv1Y="; + }) + (fetchFromGitHub { + owner = "fabiobento512"; + name = "CommonUtils"; + repo = "CommonUtils"; + rev = "53970984f6538d78350be1b9426032bcb5bcf818"; + hash = "sha256-nRv9DriSOuAiWhy+KkOVNEz5oSgNNNJZqk8sNwgbx8U="; + }) + ]; + sourceRoot = "frequest"; + + buildInputs = [ + qt5.qtbase + ]; + + nativeBuildInputs = [ + qt5.wrapQtAppsHook + qt5.qmake + ]; + + # Without this, nothing gets installed in $out. + postInstall = '' + install -D FRequest $out/bin/FRequest + install -D LinuxAppImageDeployment/frequest.desktop $out/share/applications/frequest.desktop + install -D LinuxAppImageDeployment/frequest_icon.png $out/share/icons/hicolor/128x128/apps/frequest_icon.png + ''; + + meta = { + description = "A fast, lightweight and opensource desktop application to make HTTP(s) requests"; + homepage = "https://fabiobento512.github.io/FRequest"; + license = lib.licenses.gpl3Plus; + maintainers = with lib.maintainers; [ eliandoran ]; + platforms = lib.platforms.linux; + mainProgram = "frequest"; + }; +}) From 289e8bb83454a0ceaff1539ef3e6e7765c785017 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 10 Mar 2024 22:29:45 +0000 Subject: [PATCH 106/230] libretro.beetle-pce-fast: unstable-2024-03-01 -> unstable-2024-03-08 --- pkgs/applications/emulators/retroarch/hashes.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/emulators/retroarch/hashes.json b/pkgs/applications/emulators/retroarch/hashes.json index 558c24a2ed88..1607954f8860 100644 --- a/pkgs/applications/emulators/retroarch/hashes.json +++ b/pkgs/applications/emulators/retroarch/hashes.json @@ -65,10 +65,10 @@ "src": { "owner": "libretro", "repo": "beetle-pce-fast-libretro", - "rev": "28180934e9d7f1a6ec655adde0b81f0b167732ad", - "hash": "sha256-Kt1Bh32zoJynbqp/0ARngPTYHlvp6k/Ya09l8/736gk=" + "rev": "f450a7118a3b4e8524cdd915aa610bd364e64dde", + "hash": "sha256-VHW+MJT68wIoSV8H24484uyGK7/cySFMITcpu6zqo3A=" }, - "version": "unstable-2024-03-01" + "version": "unstable-2024-03-08" }, "beetle-pcfx": { "fetcher": "fetchFromGitHub", From 8b89583aa4d7e8314e798ac41377adceb26054d3 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 10 Mar 2024 22:43:09 +0000 Subject: [PATCH 107/230] libretro.beetle-pce: unstable-2024-03-01 -> unstable-2024-03-08 --- pkgs/applications/emulators/retroarch/hashes.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/emulators/retroarch/hashes.json b/pkgs/applications/emulators/retroarch/hashes.json index 558c24a2ed88..ee0a1e8140d4 100644 --- a/pkgs/applications/emulators/retroarch/hashes.json +++ b/pkgs/applications/emulators/retroarch/hashes.json @@ -55,10 +55,10 @@ "src": { "owner": "libretro", "repo": "beetle-pce-libretro", - "rev": "95b5ea18a694f5a05b1c0cda20928c825d981238", - "hash": "sha256-4Y2dyELUGWycCQ1UA0Ov6Ijh1t+KgSL1AtDefbRmjbA=" + "rev": "96a654ae2b2df1cc12dc7f1f2d1822db562aa51f", + "hash": "sha256-Tz9FA2Kqu8R2pXSTgbr5Mxu4VKrURWWpy+J3R3/CHpk=" }, - "version": "unstable-2024-03-01" + "version": "unstable-2024-03-08" }, "beetle-pce-fast": { "fetcher": "fetchFromGitHub", From b19234393fdd0c4879cb91847dbf2b64ebb976b0 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 10 Mar 2024 22:47:17 +0000 Subject: [PATCH 108/230] libretro.beetle-supergrafx: unstable-2024-03-01 -> unstable-2024-03-08 --- pkgs/applications/emulators/retroarch/hashes.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/emulators/retroarch/hashes.json b/pkgs/applications/emulators/retroarch/hashes.json index 558c24a2ed88..c4c4966cf94f 100644 --- a/pkgs/applications/emulators/retroarch/hashes.json +++ b/pkgs/applications/emulators/retroarch/hashes.json @@ -115,10 +115,10 @@ "src": { "owner": "libretro", "repo": "beetle-supergrafx-libretro", - "rev": "29ff9e00a85db3d462cca42543a84597c421c99c", - "hash": "sha256-UZt1yFcwgdY/TbDs+GQ73Nu5KRA1R8gdKs73IQC1mCg=" + "rev": "239d25f4c2bbb6e66d3e48502907d3d611119a22", + "hash": "sha256-8SP/SOJR/5tDkpysYTAuDPeQJCaAVgXE9CieSj1H4ZQ=" }, - "version": "unstable-2024-03-01" + "version": "unstable-2024-03-08" }, "beetle-vb": { "fetcher": "fetchFromGitHub", From b2fc260cabcff7ea451a5449c00c0e5991c389fd Mon Sep 17 00:00:00 2001 From: Weijia Wang <9713184+wegank@users.noreply.github.com> Date: Tue, 23 Jan 2024 09:09:50 +0100 Subject: [PATCH 109/230] bazel_4: drop --- .../bazel/bazel_4/actions_path.patch | 41 - .../build-managers/bazel/bazel_4/default.nix | 662 ------- .../build-managers/bazel/bazel_4/no-arc.patch | 34 - .../bazel/bazel_4/src-deps.json | 1585 ----------------- .../bazel/bazel_4/upb-clang16.patch | 57 - .../bazel/bazel_4/update-srcDeps.py | 54 - pkgs/top-level/aliases.nix | 1 + pkgs/top-level/all-packages.nix | 12 - 8 files changed, 1 insertion(+), 2445 deletions(-) delete mode 100644 pkgs/development/tools/build-managers/bazel/bazel_4/actions_path.patch delete mode 100644 pkgs/development/tools/build-managers/bazel/bazel_4/default.nix delete mode 100644 pkgs/development/tools/build-managers/bazel/bazel_4/no-arc.patch delete mode 100644 pkgs/development/tools/build-managers/bazel/bazel_4/src-deps.json delete mode 100644 pkgs/development/tools/build-managers/bazel/bazel_4/upb-clang16.patch delete mode 100755 pkgs/development/tools/build-managers/bazel/bazel_4/update-srcDeps.py diff --git a/pkgs/development/tools/build-managers/bazel/bazel_4/actions_path.patch b/pkgs/development/tools/build-managers/bazel/bazel_4/actions_path.patch deleted file mode 100644 index 1fa1e5748333..000000000000 --- a/pkgs/development/tools/build-managers/bazel/bazel_4/actions_path.patch +++ /dev/null @@ -1,41 +0,0 @@ -diff --git a/src/main/java/com/google/devtools/build/lib/exec/local/PosixLocalEnvProvider.java b/src/main/java/com/google/devtools/build/lib/exec/local/PosixLocalEnvProvider.java -index 6fff2af..7e2877e 100644 ---- a/src/main/java/com/google/devtools/build/lib/exec/local/PosixLocalEnvProvider.java -+++ b/src/main/java/com/google/devtools/build/lib/exec/local/PosixLocalEnvProvider.java -@@ -47,6 +47,16 @@ public final class PosixLocalEnvProvider implements LocalEnvProvider { - Map env, BinTools binTools, String fallbackTmpDir) { - ImmutableMap.Builder result = ImmutableMap.builder(); - result.putAll(Maps.filterKeys(env, k -> !k.equals("TMPDIR"))); -+ -+ // In case we are running on NixOS. -+ // If bash is called with an unset PATH on this platform, -+ // it will set it to /no-such-path and default tools will be missings. -+ // See, https://github.com/NixOS/nixpkgs/issues/94222 -+ // So we ensure that minimal dependencies are present. -+ if (!env.containsKey("PATH")){ -+ result.put("PATH", "@actionsPathPatch@"); -+ } -+ - String p = clientEnv.get("TMPDIR"); - if (Strings.isNullOrEmpty(p)) { - // Do not use `fallbackTmpDir`, use `/tmp` instead. This way if the user didn't export TMPDIR -index 95642767c6..39d3c62461 100644 ---- a/src/main/java/com/google/devtools/build/lib/exec/local/XcodeLocalEnvProvider.java -+++ b/src/main/java/com/google/devtools/build/lib/exec/local/XcodeLocalEnvProvider.java -@@ -74,6 +74,16 @@ public final class XcodeLocalEnvProvider implements LocalEnvProvider { - - ImmutableMap.Builder newEnvBuilder = ImmutableMap.builder(); - newEnvBuilder.putAll(Maps.filterKeys(env, k -> !k.equals("TMPDIR"))); -+ -+ // In case we are running on NixOS. -+ // If bash is called with an unset PATH on this platform, -+ // it will set it to /no-such-path and default tools will be missings. -+ // See, https://github.com/NixOS/nixpkgs/issues/94222 -+ // So we ensure that minimal dependencies are present. -+ if (!env.containsKey("PATH")){ -+ newEnvBuilder.put("PATH", "@actionsPathPatch@"); -+ } -+ - String p = clientEnv.get("TMPDIR"); - if (Strings.isNullOrEmpty(p)) { - // Do not use `fallbackTmpDir`, use `/tmp` instead. This way if the user didn't export TMPDIR diff --git a/pkgs/development/tools/build-managers/bazel/bazel_4/default.nix b/pkgs/development/tools/build-managers/bazel/bazel_4/default.nix deleted file mode 100644 index f4fee72f6bf3..000000000000 --- a/pkgs/development/tools/build-managers/bazel/bazel_4/default.nix +++ /dev/null @@ -1,662 +0,0 @@ -{ stdenv, callPackage, lib, fetchurl, fetchpatch, fetchFromGitHub, installShellFiles -, runCommand, runCommandCC, makeWrapper, recurseIntoAttrs -# this package (through the fixpoint glass) -, bazel_self -, lr, xe, zip, unzip, bash, writeCBin, coreutils -, which, gawk, gnused, gnutar, gnugrep, gzip, findutils -# updater -, python3, writeScript -# Apple dependencies -, cctools, libcxx, CoreFoundation, CoreServices, Foundation -# Allow to independently override the jdks used to build and run respectively -, buildJdk, runJdk -, buildJdkName -, runtimeShell -# Always assume all markers valid (this is needed because we remove markers; they are non-deterministic). -# Also, don't clean up environment variables (so that NIX_ environment variables are passed to compilers). -, enableNixHacks ? false -, gcc-unwrapped -, autoPatchelfHook -, file -, substituteAll -, writeTextFile -}: - -let - version = "4.2.2"; - sourceRoot = "."; - - src = fetchurl { - url = "https://github.com/bazelbuild/bazel/releases/download/${version}/bazel-${version}-dist.zip"; - sha256 = "mYHQ1To1bE6HlihHdQqXyegFTkYIVHSABsgPDX4rLTM="; - }; - - # Update with `eval $(nix-build -A bazel.updater)`, - # then add new dependencies from the dict in ./src-deps.json as required. - srcDeps = lib.attrsets.attrValues srcDepsSet; - srcDepsSet = - let - srcs = lib.importJSON ./src-deps.json; - toFetchurl = d: lib.attrsets.nameValuePair d.name (fetchurl { - urls = d.urls; - sha256 = d.sha256; - }); - in builtins.listToAttrs (map toFetchurl [ - srcs.desugar_jdk_libs - srcs.io_bazel_skydoc - srcs.bazel_skylib - srcs.io_bazel_rules_sass - srcs.platforms - (if stdenv.hostPlatform.isDarwin - then srcs."java_tools_javac11_darwin-v10.6.zip" - else srcs."java_tools_javac11_linux-v10.6.zip") - srcs."coverage_output_generator-v2.5.zip" - srcs.build_bazel_rules_nodejs - srcs."android_tools_pkg-0.23.0.tar.gz" - srcs.bazel_toolchains - srcs.com_github_grpc_grpc - srcs.upb - srcs.com_google_protobuf - srcs.rules_pkg - srcs.rules_cc - srcs.rules_java - srcs.rules_proto - srcs.com_google_absl - srcs.com_github_google_re2 - srcs.com_github_cares_cares - ]); - - distDir = runCommand "bazel-deps" {} '' - mkdir -p $out - for i in ${builtins.toString srcDeps}; do cp $i $out/$(stripHash $i); done - ''; - - defaultShellUtils = - # Keep this list conservative. For more exotic tools, prefer to use - # @rules_nixpkgs to pull in tools from the nix repository. Example: - # - # WORKSPACE: - # - # nixpkgs_git_repository( - # name = "nixpkgs", - # revision = "def5124ec8367efdba95a99523dd06d918cb0ae8", - # ) - # - # # This defines an external Bazel workspace. - # nixpkgs_package( - # name = "bison", - # repositories = { "nixpkgs": "@nixpkgs//:default.nix" }, - # ) - # - # some/BUILD.bazel: - # - # genrule( - # ... - # cmd = "$(location @bison//:bin/bison) -other -args", - # tools = [ - # ... - # "@bison//:bin/bison", - # ], - # ) - [ - bash - coreutils - file - findutils - gawk - gnugrep - gnused - gnutar - gzip - python3 - unzip - which - zip - ]; - - defaultShellPath = lib.makeBinPath defaultShellUtils; - - # Java toolchain used for the build and tests - javaToolchain = "@bazel_tools//tools/jdk:toolchain_${buildJdkName}"; - - platforms = lib.platforms.linux ++ lib.platforms.darwin; - - # This repository is fetched by bazel at runtime - # however it contains prebuilt java binaries, with wrong interpreter - # and libraries path. - # We prefetch it, patch it, and override it in a global bazelrc. - system = if stdenv.hostPlatform.isDarwin then "darwin" else "linux"; - - # on aarch64 Darwin, `uname -m` returns "arm64" - arch = with stdenv.hostPlatform; if isDarwin && isAarch64 then "arm64" else parsed.cpu.name; - - remote_java_tools = stdenv.mkDerivation { - name = "remote_java_tools_${system}"; - - src = srcDepsSet."java_tools_javac11_${system}-v10.6.zip"; - - nativeBuildInputs = [ unzip ] - ++ lib.optional stdenv.isLinux autoPatchelfHook; - buildInputs = [ gcc-unwrapped ]; - - sourceRoot = "."; - - buildPhase = '' - runHook preBuild - - mkdir $out; - - runHook postBuild - ''; - - installPhase = '' - runHook preInstall - - cp -Ra * $out/ - touch $out/WORKSPACE - - runHook postInstall - ''; - }; - - bazelRC = writeTextFile { - name = "bazel-rc"; - text = '' - startup --server_javabase=${runJdk} - - # Can't use 'common'; https://github.com/bazelbuild/bazel/issues/3054 - # Most commands inherit from 'build' anyway. - build --distdir=${distDir} - fetch --distdir=${distDir} - query --distdir=${distDir} - - build --override_repository=${remote_java_tools.name}=${remote_java_tools} - fetch --override_repository=${remote_java_tools.name}=${remote_java_tools} - query --override_repository=${remote_java_tools.name}=${remote_java_tools} - - # Provide a default java toolchain, this will be the same as ${runJdk} - build --host_javabase='@local_jdk//:jdk' - - # load default location for the system wide configuration - try-import /etc/bazel.bazelrc - ''; - }; - -in -stdenv.mkDerivation rec { - pname = "bazel"; - inherit version; - - meta = with lib; { - homepage = "https://github.com/bazelbuild/bazel/"; - description = "Build tool that builds code quickly and reliably"; - sourceProvenance = with sourceTypes; [ - fromSource - binaryBytecode # source bundles dependencies as jars - ]; - license = licenses.asl20; - maintainers = lib.teams.bazel.members; - inherit platforms; - }; - - inherit src; - inherit sourceRoot; - patches = [ - ./upb-clang16.patch - - # On Darwin, the last argument to gcc is coming up as an empty string. i.e: '' - # This is breaking the build of any C target. This patch removes the last - # argument if it's found to be an empty string. - ../trim-last-argument-to-gcc-if-empty.patch - - # On Darwin, using clang 6 to build fails because of a linker error (see #105573), - # but using clang 7 fails because libarclite_macosx.a cannot be found when linking - # the xcode_locator tool. - # This patch removes using the -fobjc-arc compiler option and makes the code - # compile without automatic reference counting. Caveat: this leaks memory, but - # we accept this fact because xcode_locator is only a short-lived process used during the build. - ./no-arc.patch - - # --experimental_strict_action_env (which may one day become the default - # see bazelbuild/bazel#2574) hardcodes the default - # action environment to a non hermetic value (e.g. "/usr/local/bin"). - # This is non hermetic on non-nixos systems. On NixOS, bazel cannot find the required binaries. - # So we are replacing this bazel paths by defaultShellPath, - # improving hermeticity and making it work in nixos. - (substituteAll { - src = ../strict_action_env.patch; - strictActionEnvPatch = defaultShellPath; - }) - - (substituteAll { - src = ./actions_path.patch; - actionsPathPatch = defaultShellPath; - }) - - # bazel reads its system bazelrc in /etc - # override this path to a builtin one - (substituteAll { - src = ../bazel_rc.patch; - bazelSystemBazelRCPath = bazelRC; - }) - - # disable suspend detection during a build inside Nix as this is - # not available inside the darwin sandbox - ../bazel_darwin_sandbox.patch - ] ++ lib.optional enableNixHacks ../nix-hacks.patch; - - - # Additional tests that check bazel’s functionality. Execute - # - # nix-build . -A bazel.tests - # - # in the nixpkgs checkout root to exercise them locally. - passthru.tests = - let - runLocal = name: attrs: script: - let - attrs' = removeAttrs attrs [ "buildInputs" ]; - buildInputs = attrs.buildInputs or []; - in - runCommandCC name ({ - inherit buildInputs; - preferLocalBuild = true; - meta.platforms = platforms; - } // attrs') script; - - # bazel wants to extract itself into $install_dir/install every time it runs, - # so let’s do that only once. - extracted = bazelPkg: - let install_dir = - # `install_base` field printed by `bazel info`, minus the hash. - # yes, this path is kinda magic. Sorry. - "$HOME/.cache/bazel/_bazel_nixbld"; - in runLocal "bazel-extracted-homedir" { passthru.install_dir = install_dir; } '' - export HOME=$(mktemp -d) - touch WORKSPACE # yeah, everything sucks - install_base="$(${bazelPkg}/bin/bazel info | grep install_base)" - # assert it’s actually below install_dir - [[ "$install_base" =~ ${install_dir} ]] \ - || (echo "oh no! $install_base but we are \ - trying to copy ${install_dir} to $out instead!"; exit 1) - cp -R ${install_dir} $out - ''; - - bazelTest = { name, bazelScript, workspaceDir, bazelPkg, buildInputs ? [] }: - let - be = extracted bazelPkg; - in runLocal name { inherit buildInputs; } ( - # skip extraction caching on Darwin, because nobody knows how Darwin works - (lib.optionalString (!stdenv.hostPlatform.isDarwin) '' - # set up home with pre-unpacked bazel - export HOME=$(mktemp -d) - mkdir -p ${be.install_dir} - cp -R ${be}/install ${be.install_dir} - - # https://stackoverflow.com/questions/47775668/bazel-how-to-skip-corrupt-installation-on-centos6 - # Bazel checks whether the mtime of the install dir files - # is >9 years in the future, otherwise it extracts itself again. - # see PosixFileMTime::IsUntampered in src/main/cpp/util - # What the hell bazel. - ${lr}/bin/lr -0 -U ${be.install_dir} | ${xe}/bin/xe -N0 -0 touch --date="9 years 6 months" {} - '') - + - '' - # Note https://github.com/bazelbuild/bazel/issues/5763#issuecomment-456374609 - # about why to create a subdir for the workspace. - cp -r ${workspaceDir} wd && chmod u+w wd && cd wd - - ${bazelScript} - - touch $out - ''); - - bazelWithNixHacks = bazel_self.override { enableNixHacks = true; }; - - bazel-examples = fetchFromGitHub { - owner = "bazelbuild"; - repo = "examples"; - rev = "4183fc709c26a00366665e2d60d70521dc0b405d"; - sha256 = "1mm4awx6sa0myiz9j4hwp71rpr7yh8vihf3zm15n2ii6xb82r31k"; - }; - - in (lib.optionalAttrs (!stdenv.hostPlatform.isDarwin) { - # `extracted` doesn’t work on darwin - shebang = callPackage ../shebang-test.nix { inherit runLocal extracted bazelTest distDir; bazel = bazel_self; }; - }) // { - bashTools = callPackage ../bash-tools-test.nix { inherit runLocal bazelTest distDir; bazel = bazel_self; }; - cpp = callPackage ../cpp-test.nix { inherit runLocal bazelTest bazel-examples distDir; bazel = bazel_self; }; - java = callPackage ../java-test.nix { inherit runLocal bazelTest bazel-examples distDir; bazel = bazel_self; }; - protobuf = callPackage ../protobuf-test.nix { inherit runLocal bazelTest distDir; bazel = bazel_self; }; - pythonBinPath = callPackage ../python-bin-path-test.nix { inherit runLocal bazelTest distDir; bazel = bazel_self; }; - - bashToolsWithNixHacks = callPackage ../bash-tools-test.nix { inherit runLocal bazelTest distDir; bazel = bazelWithNixHacks; }; - - cppWithNixHacks = callPackage ../cpp-test.nix { inherit runLocal bazelTest bazel-examples distDir; bazel = bazelWithNixHacks; }; - javaWithNixHacks = callPackage ../java-test.nix { inherit runLocal bazelTest bazel-examples distDir; bazel = bazelWithNixHacks; }; - protobufWithNixHacks = callPackage ../protobuf-test.nix { inherit runLocal bazelTest distDir; bazel = bazelWithNixHacks; }; - pythonBinPathWithNixHacks = callPackage ../python-bin-path-test.nix { inherit runLocal bazelTest distDir; bazel = bazelWithNixHacks; }; - }; - - src_for_updater = stdenv.mkDerivation rec { - name = "updater-sources"; - inherit src; - nativeBuildInputs = [ unzip ]; - inherit sourceRoot; - installPhase = '' - runHook preInstall - - cp -r . "$out" - - runHook postInstall - ''; - }; - # update the list of workspace dependencies - passthru.updater = writeScript "update-bazel-deps.sh" '' - #!${runtimeShell} - (cd "${src_for_updater}" && - BAZEL_USE_CPP_ONLY_TOOLCHAIN=1 \ - "${bazel_self}"/bin/bazel \ - query 'kind(http_archive, //external:all) + kind(http_file, //external:all) + kind(distdir_tar, //external:all) + kind(git_repository, //external:all)' \ - --loading_phase_threads=1 \ - --output build) \ - | "${python3}"/bin/python3 "${./update-srcDeps.py}" \ - "${builtins.toString ./src-deps.json}" - ''; - - # Necessary for the tests to pass on Darwin with sandbox enabled. - # Bazel starts a local server and needs to bind a local address. - __darwinAllowLocalNetworking = true; - - postPatch = let - - darwinPatches = '' - bazelLinkFlags () { - eval set -- "$NIX_LDFLAGS" - local flag - for flag in "$@"; do - printf ' -Wl,%s' "$flag" - done - } - - # Disable Bazel's Xcode toolchain detection which would configure compilers - # and linkers from Xcode instead of from PATH - export BAZEL_USE_CPP_ONLY_TOOLCHAIN=1 - - # Explicitly configure gcov since we don't have it on Darwin, so autodetection fails - export GCOV=${coreutils}/bin/false - - # Framework search paths aren't added by bintools hook - # https://github.com/NixOS/nixpkgs/pull/41914 - export NIX_LDFLAGS+=" -F${CoreFoundation}/Library/Frameworks -F${CoreServices}/Library/Frameworks -F${Foundation}/Library/Frameworks" - - # libcxx includes aren't added by libcxx hook - # https://github.com/NixOS/nixpkgs/pull/41589 - export NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE -isystem ${lib.getDev libcxx}/include/c++/v1" - # for CLang 16 compatibility in third_party/{zlib}, external/{upb} dependencies - export NIX_CFLAGS_COMPILE+=" -Wno-implicit-function-declaration -Wno-gnu-offsetof-extensions" - - # don't use system installed Xcode to run clang, use Nix clang instead - sed -i -E "s;/usr/bin/xcrun (--sdk macosx )?clang;${stdenv.cc}/bin/clang $NIX_CFLAGS_COMPILE $(bazelLinkFlags) -framework CoreFoundation;g" \ - scripts/bootstrap/compile.sh \ - src/tools/xcode/realpath/BUILD \ - src/tools/xcode/stdredirect/BUILD \ - tools/osx/BUILD - - substituteInPlace scripts/bootstrap/compile.sh --replace ' -mmacosx-version-min=10.9' "" - - # nixpkgs's libSystem cannot use pthread headers directly, must import GCD headers instead - sed -i -e "/#include /i #include " src/main/cpp/blaze_util_darwin.cc - - # clang installed from Xcode has a compatibility wrapper that forwards - # invocations of gcc to clang, but vanilla clang doesn't - sed -i -e 's;_find_generic(repository_ctx, "gcc", "CC", overriden_tools);_find_generic(repository_ctx, "clang", "CC", overriden_tools);g' tools/cpp/unix_cc_configure.bzl - - sed -i -e 's;/usr/bin/libtool;${cctools}/bin/libtool;g' tools/cpp/unix_cc_configure.bzl - wrappers=( tools/cpp/osx_cc_wrapper.sh tools/cpp/osx_cc_wrapper.sh.tpl ) - for wrapper in "''${wrappers[@]}"; do - sed -i -e "s,/usr/bin/install_name_tool,${cctools}/bin/install_name_tool,g" $wrapper - done - ''; - - genericPatches = '' - # Substitute j2objc and objc wrapper's python shebang to plain python path. - substituteInPlace tools/j2objc/j2objc_header_map.py --replace "$!/usr/bin/python2.7" "#!${python3.interpreter}" - substituteInPlace tools/j2objc/j2objc_wrapper.py --replace "$!/usr/bin/python2.7" "#!${python3.interpreter}" - substituteInPlace tools/objc/j2objc_dead_code_pruner.py --replace "$!/usr/bin/python2.7" "#!${python3.interpreter}" - - # md5sum is part of coreutils - sed -i 's|/sbin/md5|md5sum|g' \ - src/BUILD third_party/ijar/test/testenv.sh tools/objc/libtool.sh - - # replace initial value of pythonShebang variable in BazelPythonSemantics.java - substituteInPlace src/main/java/com/google/devtools/build/lib/bazel/rules/python/BazelPythonSemantics.java \ - --replace '"#!/usr/bin/env " + pythonExecutableName' "\"#!${python3}/bin/python\"" - - # substituteInPlace is rather slow, so prefilter the files with grep - grep -rlZ /bin/ src/main/java/com/google/devtools | while IFS="" read -r -d "" path; do - # If you add more replacements here, you must change the grep above! - # Only files containing /bin are taken into account. - substituteInPlace "$path" \ - --replace /bin/bash ${bash}/bin/bash \ - --replace "/usr/bin/env bash" ${bash}/bin/bash \ - --replace "/usr/bin/env python" ${python3}/bin/python \ - --replace /usr/bin/env ${coreutils}/bin/env \ - --replace /bin/true ${coreutils}/bin/true - done - - # bazel test runner include references to /bin/bash - substituteInPlace tools/build_rules/test_rules.bzl \ - --replace /bin/bash ${bash}/bin/bash - - for i in $(find tools/cpp/ -type f) - do - substituteInPlace $i \ - --replace /bin/bash ${bash}/bin/bash - done - - # Fixup scripts that generate scripts. Not fixed up by patchShebangs below. - substituteInPlace scripts/bootstrap/compile.sh \ - --replace /bin/bash ${bash}/bin/bash - - # add nix environment vars to .bazelrc - cat >> .bazelrc <> runfiles.bash.tmp - cat tools/bash/runfiles/runfiles.bash >> runfiles.bash.tmp - mv runfiles.bash.tmp tools/bash/runfiles/runfiles.bash - - patchShebangs . - ''; - in lib.optionalString stdenv.hostPlatform.isDarwin darwinPatches - + genericPatches; - - buildInputs = [buildJdk] ++ defaultShellUtils; - - # when a command can’t be found in a bazel build, you might also - # need to add it to `defaultShellPath`. - nativeBuildInputs = [ - installShellFiles - makeWrapper - python3 - unzip - which - zip - python3.pkgs.absl-py # Needed to build fish completion - ] ++ lib.optionals (stdenv.isDarwin) [ cctools libcxx CoreFoundation CoreServices Foundation ]; - - # Bazel makes extensive use of symlinks in the WORKSPACE. - # This causes problems with infinite symlinks if the build output is in the same location as the - # Bazel WORKSPACE. This is why before executing the build, the source code is moved into a - # subdirectory. - # Failing to do this causes "infinite symlink expansion detected" - preBuildPhases = ["preBuildPhase"]; - preBuildPhase = '' - mkdir bazel_src - shopt -s dotglob extglob - mv !(bazel_src) bazel_src - ''; - buildPhase = '' - runHook preBuild - - # Increasing memory during compilation might be necessary. - # export BAZEL_JAVAC_OPTS="-J-Xmx2g -J-Xms200m" - - # If EMBED_LABEL isn't set, it'd be auto-detected from CHANGELOG.md - # and `git rev-parse --short HEAD` which would result in - # "3.7.0- (@non-git)" due to non-git build and incomplete changelog. - # Actual bazel releases use scripts/release/common.sh which is based - # on branch/tag information which we don't have with tarball releases. - # Note that .bazelversion is always correct and is based on bazel-* - # executable name, version checks should work fine - export EMBED_LABEL="${version}- (@non-git)" - ${bash}/bin/bash ./bazel_src/compile.sh - ./bazel_src/scripts/generate_bash_completion.sh \ - --bazel=./bazel_src/output/bazel \ - --output=./bazel_src/output/bazel-complete.bash \ - --prepend=./bazel_src/scripts/bazel-complete-header.bash \ - --prepend=./bazel_src/scripts/bazel-complete-template.bash - ${python3}/bin/python3 ./bazel_src/scripts/generate_fish_completion.py \ - --bazel=./bazel_src/output/bazel \ - --output=./bazel_src/output/bazel-complete.fish - - # need to change directory for bazel to find the workspace - cd ./bazel_src - # build execlog tooling - export HOME=$(mktemp -d) - ./output/bazel build src/tools/execlog:parser_deploy.jar - cd - - - runHook postBuild - ''; - - installPhase = '' - runHook preInstall - - mkdir -p $out/bin - - # official wrapper scripts that searches for $WORKSPACE_ROOT/tools/bazel - # if it can’t find something in tools, it calls $out/bin/bazel-{version}-{os_arch} - # The binary _must_ exist with this naming if your project contains a .bazelversion - # file. - cp ./bazel_src/scripts/packages/bazel.sh $out/bin/bazel - wrapProgram $out/bin/bazel $wrapperfile --suffix PATH : ${defaultShellPath} - mv ./bazel_src/output/bazel $out/bin/bazel-${version}-${system}-${arch} - - mkdir $out/share - cp ./bazel_src/bazel-bin/src/tools/execlog/parser_deploy.jar $out/share/parser_deploy.jar - cat < $out/bin/bazel-execlog - #!${runtimeShell} -e - ${runJdk}/bin/java -jar $out/share/parser_deploy.jar \$@ - EOF - chmod +x $out/bin/bazel-execlog - - # shell completion files - installShellCompletion --bash \ - --name bazel.bash \ - ./bazel_src/output/bazel-complete.bash - installShellCompletion --zsh \ - --name _bazel \ - ./bazel_src/scripts/zsh_completion/_bazel - installShellCompletion --fish \ - --name bazel.fish \ - ./bazel_src/output/bazel-complete.fish - ''; - - # Install check fails on `aarch64-darwin` - # https://github.com/NixOS/nixpkgs/issues/145587 - doInstallCheck = stdenv.hostPlatform.system != "aarch64-darwin"; - installCheckPhase = '' - export TEST_TMPDIR=$(pwd) - - hello_test () { - $out/bin/bazel test \ - --test_output=errors \ - --java_toolchain='${javaToolchain}' \ - examples/cpp:hello-success_test \ - examples/java-native/src/test/java/com/example/myproject:hello - } - - cd ./bazel_src - - # test whether $WORKSPACE_ROOT/tools/bazel works - - mkdir -p tools - cat > tools/bazel <<"EOF" - #!${runtimeShell} -e - exit 1 - EOF - chmod +x tools/bazel - - # first call should fail if tools/bazel is used - ! hello_test - - cat > tools/bazel <<"EOF" - #!${runtimeShell} -e - exec "$BAZEL_REAL" "$@" - EOF - - # second call succeeds because it defers to $out/bin/bazel-{version}-{os_arch} - hello_test - - runHook postInstall - ''; - - # Save paths to hardcoded dependencies so Nix can detect them. - # This is needed because the templates get tar’d up into a .jar. - postFixup = '' - mkdir -p $out/nix-support - echo "${defaultShellPath}" >> $out/nix-support/depends - # The string literal specifying the path to the bazel-rc file is sometimes - # stored non-contiguously in the binary due to gcc optimisations, which leads - # Nix to miss the hash when scanning for dependencies - echo "${bazelRC}" >> $out/nix-support/depends - '' + lib.optionalString stdenv.isDarwin '' - echo "${cctools}" >> $out/nix-support/depends - ''; - - dontStrip = true; - dontPatchELF = true; -} diff --git a/pkgs/development/tools/build-managers/bazel/bazel_4/no-arc.patch b/pkgs/development/tools/build-managers/bazel/bazel_4/no-arc.patch deleted file mode 100644 index 012e613c2f19..000000000000 --- a/pkgs/development/tools/build-managers/bazel/bazel_4/no-arc.patch +++ /dev/null @@ -1,34 +0,0 @@ ---- a/tools/osx/xcode_locator.m 2020-12-10 13:27:29.000000000 +0100 -+++ b/tools/osx/xcode_locator.m 2021-02-01 09:09:32.159557051 +0100 -@@ -21,10 +21,6 @@ - // 6,6.4,6.4.1 = 6.4.1 - // 6.3,6.3.0 = 6.3 - --#if !defined(__has_feature) || !__has_feature(objc_arc) --#error "This file requires ARC support." --#endif -- - #import - #import - ---- a/tools/osx/xcode_configure.bzl 1980-01-01 01:00:00.000000000 +0100 -+++ b/tools/osx/xcode_configure.bzl 2021-02-01 09:36:57.773418444 +0100 -@@ -123,7 +123,6 @@ - "macosx", - "clang", - "-mmacosx-version-min=10.9", -- "-fobjc-arc", - "-framework", - "CoreServices", - "-framework", ---- a/tools/osx/BUILD 2021-02-01 11:01:02.191659553 +0100 -+++ b/tools/osx/BUILD 2021-02-01 11:04:29.735071019 +0100 -@@ -27,7 +27,7 @@ - ]) - - DARWIN_XCODE_LOCATOR_COMPILE_COMMAND = """ -- /usr/bin/xcrun --sdk macosx clang -mmacosx-version-min=10.9 -fobjc-arc -framework CoreServices \ -+ /usr/bin/xcrun --sdk macosx clang -mmacosx-version-min=10.9 -framework CoreServices \ - -framework Foundation -o $@ $< - """ - diff --git a/pkgs/development/tools/build-managers/bazel/bazel_4/src-deps.json b/pkgs/development/tools/build-managers/bazel/bazel_4/src-deps.json deleted file mode 100644 index 4496343ec691..000000000000 --- a/pkgs/development/tools/build-managers/bazel/bazel_4/src-deps.json +++ /dev/null @@ -1,1585 +0,0 @@ -{ - "1.25.0.zip": { - "name": "1.25.0.zip", - "sha256": "c78be58f5e0a29a04686b628cf54faaee0094322ae0ac99da5a8a8afca59a647", - "urls": [ - "https://mirror.bazel.build/github.com/bazelbuild/rules_sass/archive/1.25.0.zip", - "https://github.com/bazelbuild/rules_sass/archive/1.25.0.zip" - ] - }, - "1ef781ced3b1443dca3ed05dec1989eca1a4e1cd.tar.gz": { - "name": "1ef781ced3b1443dca3ed05dec1989eca1a4e1cd.tar.gz", - "sha256": "5a725b777976b77aa122b707d1b6f0f39b6020f66cd427bb111a585599c857b1", - "urls": [ - "https://mirror.bazel.build/github.com/bazelbuild/stardoc/archive/1ef781ced3b1443dca3ed05dec1989eca1a4e1cd.tar.gz", - "https://github.com/bazelbuild/stardoc/archive/1ef781ced3b1443dca3ed05dec1989eca1a4e1cd.tar.gz" - ] - }, - "382d5afc60e05470c23e8de19b19fc5ad231e732.tar.gz": { - "name": "382d5afc60e05470c23e8de19b19fc5ad231e732.tar.gz", - "sha256": "7992217989f3156f8109931c1fc6db3434b7414957cb82371552377beaeb9d6c", - "urls": [ - "https://mirror.bazel.build/github.com/protocolbuffers/upb/archive/382d5afc60e05470c23e8de19b19fc5ad231e732.tar.gz", - "https://github.com/protocolbuffers/upb/archive/382d5afc60e05470c23e8de19b19fc5ad231e732.tar.gz" - ] - }, - "7cf3cefd652008d0a64a419c34c13bdca6c8f178.zip": { - "name": "7cf3cefd652008d0a64a419c34c13bdca6c8f178.zip", - "sha256": "bc81f1ba47ef5cc68ad32225c3d0e70b8c6f6077663835438da8d5733f917598", - "urls": [ - "https://mirror.bazel.build/github.com/bazelbuild/rules_java/archive/7cf3cefd652008d0a64a419c34c13bdca6c8f178.zip", - "https://github.com/bazelbuild/rules_java/archive/7cf3cefd652008d0a64a419c34c13bdca6c8f178.zip" - ] - }, - "7e4afce6fe62dbff0a4a03450143146f9f2d7488.tar.gz": { - "name": "7e4afce6fe62dbff0a4a03450143146f9f2d7488.tar.gz", - "sha256": "8e7d59a5b12b233be5652e3d29f42fba01c7cbab09f6b3a8d0a57ed6d1e9a0da", - "urls": [ - "https://mirror.bazel.build/github.com/bazelbuild/rules_proto/archive/7e4afce6fe62dbff0a4a03450143146f9f2d7488.tar.gz", - "https://github.com/bazelbuild/rules_proto/archive/7e4afce6fe62dbff0a4a03450143146f9f2d7488.tar.gz" - ] - }, - "aecba11114cf1fac5497aeb844b6966106de3eb6.tar.gz": { - "name": "aecba11114cf1fac5497aeb844b6966106de3eb6.tar.gz", - "sha256": "9f385e146410a8150b6f4cb1a57eab7ec806ced48d427554b1e754877ff26c3e", - "urls": [ - "https://mirror.bazel.build/github.com/google/re2/archive/aecba11114cf1fac5497aeb844b6966106de3eb6.tar.gz", - "https://github.com/google/re2/archive/aecba11114cf1fac5497aeb844b6966106de3eb6.tar.gz" - ] - }, - "android_tools": { - "name": "android_tools", - "sha256": "ea5c0589a01e2a9f43c20e5c145d3530e3b3bdbe7322789bc5da38d0ca49b837", - "url": "https://mirror.bazel.build/bazel_android_tools/android_tools_pkg-0.19.0rc3.tar.gz" - }, - "android_tools_for_testing": { - "name": "android_tools_for_testing", - "patch_cmds": [ - "test -f BUILD && chmod u+w BUILD || true", - "echo >> BUILD", - "echo 'exports_files([\"WORKSPACE\"], visibility = [\"//visibility:public\"])' >> BUILD" - ], - "patch_cmds_win": [ - "Add-Content -Path BUILD -Value \"`nexports_files([`\"WORKSPACE`\"], visibility = [`\"//visibility:public`\"])`n\" -Force" - ], - "sha256": "ed5290594244c2eeab41f0104519bcef51e27c699ff4b379fcbd25215270513e", - "url": "https://mirror.bazel.build/bazel_android_tools/android_tools_pkg-0.23.0.tar.gz" - }, - "android_tools_pkg-0.23.0.tar.gz": { - "name": "android_tools_pkg-0.23.0.tar.gz", - "sha256": "ed5290594244c2eeab41f0104519bcef51e27c699ff4b379fcbd25215270513e", - "urls": [ - "https://mirror.bazel.build/bazel_android_tools/android_tools_pkg-0.23.0.tar.gz" - ] - }, - "b1c40e1de81913a3c40e5948f78719c28152486d.zip": { - "name": "b1c40e1de81913a3c40e5948f78719c28152486d.zip", - "sha256": "d0c573b94a6ef20ef6ff20154a23d0efcb409fb0e1ff0979cec318dfe42f0cdd", - "urls": [ - "https://mirror.bazel.build/github.com/bazelbuild/rules_cc/archive/b1c40e1de81913a3c40e5948f78719c28152486d.zip", - "https://github.com/bazelbuild/rules_cc/archive/b1c40e1de81913a3c40e5948f78719c28152486d.zip" - ] - }, - "bazel-skylib-1.0.3.tar.gz": { - "name": "bazel-skylib-1.0.3.tar.gz", - "sha256": "1c531376ac7e5a180e0237938a2536de0c54d93f5c278634818e0efc952dd56c", - "urls": [ - "https://mirror.bazel.build/github.com/bazelbuild/bazel-skylib/releases/download/1.0.3/bazel-skylib-1.0.3.tar.gz", - "https://github.com/bazelbuild/bazel-skylib/releases/download/1.0.3/bazel-skylib-1.0.3.tar.gz" - ] - }, - "bazel-toolchains-3.1.0.tar.gz": { - "name": "bazel-toolchains-3.1.0.tar.gz", - "sha256": "726b5423e1c7a3866a3a6d68e7123b4a955e9fcbe912a51e0f737e6dab1d0af2", - "urls": [ - "https://mirror.bazel.build/github.com/bazelbuild/bazel-toolchains/releases/download/3.1.0/bazel-toolchains-3.1.0.tar.gz", - "https://github.com/bazelbuild/bazel-toolchains/releases/download/3.1.0/bazel-toolchains-3.1.0.tar.gz" - ] - }, - "bazel_j2objc": { - "name": "bazel_j2objc", - "sha256": "8d3403b5b7db57e347c943d214577f6879e5b175c2b59b7e075c0b6453330e9b", - "strip_prefix": "j2objc-2.5", - "urls": [ - "https://mirror.bazel.build/github.com/google/j2objc/releases/download/2.5/j2objc-2.5.zip", - "https://github.com/google/j2objc/releases/download/2.5/j2objc-2.5.zip" - ] - }, - "bazel_skylib": { - "name": "bazel_skylib", - "patch_cmds": [ - "test -f BUILD && chmod u+w BUILD || true", - "echo >> BUILD", - "echo 'exports_files([\"WORKSPACE\"], visibility = [\"//visibility:public\"])' >> BUILD" - ], - "patch_cmds_win": [ - "Add-Content -Path BUILD -Value \"`nexports_files([`\"WORKSPACE`\"], visibility = [`\"//visibility:public`\"])`n\" -Force" - ], - "sha256": "1c531376ac7e5a180e0237938a2536de0c54d93f5c278634818e0efc952dd56c", - "urls": [ - "https://mirror.bazel.build/github.com/bazelbuild/bazel-skylib/releases/download/1.0.3/bazel-skylib-1.0.3.tar.gz", - "https://github.com/bazelbuild/bazel-skylib/releases/download/1.0.3/bazel-skylib-1.0.3.tar.gz" - ] - }, - "bazel_toolchains": { - "name": "bazel_toolchains", - "patch_cmds": [ - "test -f BUILD && chmod u+w BUILD || true", - "echo >> BUILD", - "echo 'exports_files([\"WORKSPACE\"], visibility = [\"//visibility:public\"])' >> BUILD" - ], - "patch_cmds_win": [ - "Add-Content -Path BUILD -Value \"`nexports_files([`\"WORKSPACE`\"], visibility = [`\"//visibility:public`\"])`n\" -Force" - ], - "sha256": "726b5423e1c7a3866a3a6d68e7123b4a955e9fcbe912a51e0f737e6dab1d0af2", - "strip_prefix": "bazel-toolchains-3.1.0", - "urls": [ - "https://mirror.bazel.build/github.com/bazelbuild/bazel-toolchains/releases/download/3.1.0/bazel-toolchains-3.1.0.tar.gz", - "https://github.com/bazelbuild/bazel-toolchains/releases/download/3.1.0/bazel-toolchains-3.1.0.tar.gz" - ] - }, - "bazel_website": { - "build_file_content": "\nexports_files([\"_sass/style.scss\"])\n", - "name": "bazel_website", - "sha256": "a5f531dd1d62e6947dcfc279656ffc2fdf6f447c163914c5eabf7961b4cb6eb4", - "strip_prefix": "bazel-website-c174fa288aa079b68416d2ce2cc97268fa172f42", - "urls": [ - "https://github.com/bazelbuild/bazel-website/archive/c174fa288aa079b68416d2ce2cc97268fa172f42.tar.gz" - ] - }, - "boringssl": { - "generator_function": "grpc_deps", - "generator_name": "boringssl", - "name": "boringssl", - "sha256": "cb0fd3eda612d4ae4be21108938800a19b015717a7627ea7f530e3469d207707", - "strip_prefix": "boringssl-88aeb757f1a415c71fb4cbf5af936ecae4bc8179", - "urls": [ - "https://storage.googleapis.com/grpc-bazel-mirror/github.com/google/boringssl/archive/88aeb757f1a415c71fb4cbf5af936ecae4bc8179.tar.gz", - "https://github.com/google/boringssl/archive/88aeb757f1a415c71fb4cbf5af936ecae4bc8179.tar.gz" - ] - }, - "build_bazel_apple_support": { - "generator_function": "grpc_deps", - "generator_name": "build_bazel_apple_support", - "name": "build_bazel_apple_support", - "sha256": "122ebf7fe7d1c8e938af6aeaee0efe788a3a2449ece5a8d6a428cb18d6f88033", - "urls": [ - "https://storage.googleapis.com/grpc-bazel-mirror/github.com/bazelbuild/apple_support/releases/download/0.7.1/apple_support.0.7.1.tar.gz", - "https://github.com/bazelbuild/apple_support/releases/download/0.7.1/apple_support.0.7.1.tar.gz" - ] - }, - "build_bazel_rules_apple": { - "generator_function": "grpc_deps", - "generator_name": "build_bazel_rules_apple", - "name": "build_bazel_rules_apple", - "sha256": "bdc8e66e70b8a75da23b79f1f8c6207356df07d041d96d2189add7ee0780cf4e", - "strip_prefix": "rules_apple-b869b0d3868d78a1d4ffd866ccb304fb68aa12c3", - "urls": [ - "https://storage.googleapis.com/grpc-bazel-mirror/github.com/bazelbuild/rules_apple/archive/b869b0d3868d78a1d4ffd866ccb304fb68aa12c3.tar.gz", - "https://github.com/bazelbuild/rules_apple/archive/b869b0d3868d78a1d4ffd866ccb304fb68aa12c3.tar.gz" - ] - }, - "build_bazel_rules_nodejs": { - "name": "build_bazel_rules_nodejs", - "sha256": "f2194102720e662dbf193546585d705e645314319554c6ce7e47d8b59f459e9c", - "urls": [ - "https://mirror.bazel.build/github.com/bazelbuild/rules_nodejs/releases/download/2.2.2/rules_nodejs-2.2.2.tar.gz", - "https://github.com/bazelbuild/rules_nodejs/releases/download/2.2.2/rules_nodejs-2.2.2.tar.gz" - ] - }, - "com_github_cares_cares": { - "build_file": "@com_github_grpc_grpc//third_party:cares/cares.BUILD", - "generator_function": "grpc_deps", - "generator_name": "com_github_cares_cares", - "name": "com_github_cares_cares", - "sha256": "e8c2751ddc70fed9dc6f999acd92e232d5846f009ee1674f8aee81f19b2b915a", - "strip_prefix": "c-ares-e982924acee7f7313b4baa4ee5ec000c5e373c30", - "urls": [ - "https://storage.googleapis.com/grpc-bazel-mirror/github.com/c-ares/c-ares/archive/e982924acee7f7313b4baa4ee5ec000c5e373c30.tar.gz", - "https://github.com/c-ares/c-ares/archive/e982924acee7f7313b4baa4ee5ec000c5e373c30.tar.gz" - ] - }, - "com_github_gflags_gflags": { - "generator_function": "grpc_deps", - "generator_name": "com_github_gflags_gflags", - "name": "com_github_gflags_gflags", - "sha256": "63ae70ea3e05780f7547d03503a53de3a7d2d83ad1caaa443a31cb20aea28654", - "strip_prefix": "gflags-28f50e0fed19872e0fd50dd23ce2ee8cd759338e", - "urls": [ - "https://storage.googleapis.com/grpc-bazel-mirror/github.com/gflags/gflags/archive/28f50e0fed19872e0fd50dd23ce2ee8cd759338e.tar.gz", - "https://github.com/gflags/gflags/archive/28f50e0fed19872e0fd50dd23ce2ee8cd759338e.tar.gz" - ] - }, - "com_github_google_benchmark": { - "generator_function": "grpc_deps", - "generator_name": "com_github_google_benchmark", - "name": "com_github_google_benchmark", - "sha256": "f68aec93154d010324c05bcd8c5cc53468b87af88d87acb5ddcfaa1bba044837", - "strip_prefix": "benchmark-090faecb454fbd6e6e17a75ef8146acb037118d4", - "urls": [ - "https://storage.googleapis.com/grpc-bazel-mirror/github.com/google/benchmark/archive/090faecb454fbd6e6e17a75ef8146acb037118d4.tar.gz", - "https://github.com/google/benchmark/archive/090faecb454fbd6e6e17a75ef8146acb037118d4.tar.gz" - ] - }, - "com_github_google_re2": { - "generator_function": "grpc_deps", - "generator_name": "com_github_google_re2", - "name": "com_github_google_re2", - "sha256": "9f385e146410a8150b6f4cb1a57eab7ec806ced48d427554b1e754877ff26c3e", - "strip_prefix": "re2-aecba11114cf1fac5497aeb844b6966106de3eb6", - "urls": [ - "https://storage.googleapis.com/grpc-bazel-mirror/github.com/google/re2/archive/aecba11114cf1fac5497aeb844b6966106de3eb6.tar.gz", - "https://github.com/google/re2/archive/aecba11114cf1fac5497aeb844b6966106de3eb6.tar.gz" - ] - }, - "com_github_grpc_grpc": { - "name": "com_github_grpc_grpc", - "patch_args": [ - "-p1" - ], - "patches": [ - "//third_party/grpc:grpc_1.33.1.patch" - ], - "sha256": "58eaee5c0f1bd0b92ebe1fa0606ec8f14798500620e7444726afcaf65041cb63", - "strip_prefix": "grpc-1.33.1", - "urls": [ - "https://mirror.bazel.build/github.com/grpc/grpc/archive/v1.33.1.tar.gz", - "https://github.com/grpc/grpc/archive/v1.33.1.tar.gz" - ] - }, - "com_google_absl": { - "generator_function": "grpc_deps", - "generator_name": "com_google_absl", - "name": "com_google_absl", - "sha256": "f368a8476f4e2e0eccf8a7318b98dafbe30b2600f4e3cf52636e5eb145aba06a", - "strip_prefix": "abseil-cpp-df3ea785d8c30a9503321a3d35ee7d35808f190d", - "urls": [ - "https://storage.googleapis.com/grpc-bazel-mirror/github.com/abseil/abseil-cpp/archive/df3ea785d8c30a9503321a3d35ee7d35808f190d.tar.gz", - "https://github.com/abseil/abseil-cpp/archive/df3ea785d8c30a9503321a3d35ee7d35808f190d.tar.gz" - ] - }, - "com_google_googletest": { - "name": "com_google_googletest", - "sha256": "9dc9157a9a1551ec7a7e43daea9a694a0bb5fb8bec81235d8a1e6ef64c716dcb", - "strip_prefix": "googletest-release-1.10.0", - "urls": [ - "https://mirror.bazel.build/github.com/google/googletest/archive/release-1.10.0.tar.gz", - "https://github.com/google/googletest/archive/release-1.10.0.tar.gz" - ] - }, - "com_google_protobuf": { - "name": "com_google_protobuf", - "patch_args": [ - "-p1" - ], - "patch_cmds": [ - "test -f BUILD && chmod u+w BUILD || true", - "echo >> BUILD", - "echo 'exports_files([\"WORKSPACE\"], visibility = [\"//visibility:public\"])' >> BUILD" - ], - "patch_cmds_win": [ - "Add-Content -Path BUILD -Value \"`nexports_files([`\"WORKSPACE`\"], visibility = [`\"//visibility:public`\"])`n\" -Force" - ], - "patches": [ - "//third_party/protobuf:3.13.0.patch" - ], - "sha256": "9b4ee22c250fe31b16f1a24d61467e40780a3fbb9b91c3b65be2a376ed913a1a", - "strip_prefix": "protobuf-3.13.0", - "urls": [ - "https://mirror.bazel.build/github.com/protocolbuffers/protobuf/archive/v3.13.0.tar.gz", - "https://github.com/protocolbuffers/protobuf/archive/v3.13.0.tar.gz" - ] - }, - "coverage_output_generator-v2.5.zip": { - "name": "coverage_output_generator-v2.5.zip", - "sha256": "cd14f1cb4559e4723e63b7e7b06d09fcc3bd7ba58d03f354cdff1439bd936a7d", - "urls": [ - "https://mirror.bazel.build/bazel_coverage_output_generator/releases/coverage_output_generator-v2.5.zip" - ] - }, - "cython": { - "build_file": "@com_github_grpc_grpc//third_party:cython.BUILD", - "generator_function": "grpc_deps", - "generator_name": "cython", - "name": "cython", - "sha256": "d68138a2381afbdd0876c3cb2a22389043fa01c4badede1228ee073032b07a27", - "strip_prefix": "cython-c2b80d87658a8525ce091cbe146cb7eaa29fed5c", - "urls": [ - "https://github.com/cython/cython/archive/c2b80d87658a8525ce091cbe146cb7eaa29fed5c.tar.gz" - ] - }, - "desugar_jdk_libs": { - "name": "desugar_jdk_libs", - "sha256": "fe2e04f91ce8c59d49d91b8102edc6627c6fa2906c1b0e7346f01419ec4f419d", - "strip_prefix": "desugar_jdk_libs-e0b0291b2c51fbe5a7cfa14473a1ae850f94f021", - "urls": [ - "https://mirror.bazel.build/github.com/google/desugar_jdk_libs/archive/e0b0291b2c51fbe5a7cfa14473a1ae850f94f021.zip", - "https://github.com/google/desugar_jdk_libs/archive/e0b0291b2c51fbe5a7cfa14473a1ae850f94f021.zip" - ] - }, - "df3ea785d8c30a9503321a3d35ee7d35808f190d.tar.gz": { - "name": "df3ea785d8c30a9503321a3d35ee7d35808f190d.tar.gz", - "sha256": "f368a8476f4e2e0eccf8a7318b98dafbe30b2600f4e3cf52636e5eb145aba06a", - "urls": [ - "https://mirror.bazel.build/github.com/abseil/abseil-cpp/archive/df3ea785d8c30a9503321a3d35ee7d35808f190d.tar.gz", - "https://github.com/abseil/abseil-cpp/archive/df3ea785d8c30a9503321a3d35ee7d35808f190d.tar.gz" - ] - }, - "e0b0291b2c51fbe5a7cfa14473a1ae850f94f021.zip": { - "name": "e0b0291b2c51fbe5a7cfa14473a1ae850f94f021.zip", - "sha256": "fe2e04f91ce8c59d49d91b8102edc6627c6fa2906c1b0e7346f01419ec4f419d", - "urls": [ - "https://mirror.bazel.build/github.com/google/desugar_jdk_libs/archive/e0b0291b2c51fbe5a7cfa14473a1ae850f94f021.zip", - "https://github.com/google/desugar_jdk_libs/archive/e0b0291b2c51fbe5a7cfa14473a1ae850f94f021.zip" - ] - }, - "e982924acee7f7313b4baa4ee5ec000c5e373c30.tar.gz": { - "name": "e982924acee7f7313b4baa4ee5ec000c5e373c30.tar.gz", - "sha256": "e8c2751ddc70fed9dc6f999acd92e232d5846f009ee1674f8aee81f19b2b915a", - "urls": [ - "https://mirror.bazel.build/github.com/c-ares/c-ares/archive/e982924acee7f7313b4baa4ee5ec000c5e373c30.tar.gz", - "https://github.com/c-ares/c-ares/archive/e982924acee7f7313b4baa4ee5ec000c5e373c30.tar.gz" - ] - }, - "enum34": { - "build_file": "@com_github_grpc_grpc//third_party:enum34.BUILD", - "generator_function": "grpc_deps", - "generator_name": "enum34", - "name": "enum34", - "sha256": "8ad8c4783bf61ded74527bffb48ed9b54166685e4230386a9ed9b1279e2df5b1", - "strip_prefix": "enum34-1.1.6", - "urls": [ - "https://files.pythonhosted.org/packages/bf/3e/31d502c25302814a7c2f1d3959d2a3b3f78e509002ba91aea64993936876/enum34-1.1.6.tar.gz" - ] - }, - "envoy_api": { - "generator_function": "grpc_deps", - "generator_name": "envoy_api", - "name": "envoy_api", - "sha256": "466585f253471259ce17641348149f458270316e81ec6702fdd8bf0b1b681256", - "strip_prefix": "data-plane-api-9997e1137cdb59e622af13e57ca915a2f3c9f84f", - "urls": [ - "https://storage.googleapis.com/grpc-bazel-mirror/github.com/envoyproxy/data-plane-api/archive/9997e1137cdb59e622af13e57ca915a2f3c9f84f.tar.gz", - "https://github.com/envoyproxy/data-plane-api/archive/9997e1137cdb59e622af13e57ca915a2f3c9f84f.tar.gz" - ] - }, - "futures": { - "build_file": "@com_github_grpc_grpc//third_party:futures.BUILD", - "generator_function": "grpc_deps", - "generator_name": "futures", - "name": "futures", - "sha256": "7e033af76a5e35f58e56da7a91e687706faf4e7bdfb2cbc3f2cca6b9bcda9794", - "strip_prefix": "futures-3.3.0", - "urls": [ - "https://files.pythonhosted.org/packages/47/04/5fc6c74ad114032cd2c544c575bffc17582295e9cd6a851d6026ab4b2c00/futures-3.3.0.tar.gz" - ] - }, - "io_bazel_rules_go": { - "generator_function": "grpc_deps", - "generator_name": "io_bazel_rules_go", - "name": "io_bazel_rules_go", - "sha256": "a82a352bffae6bee4e95f68a8d80a70e87f42c4741e6a448bec11998fcc82329", - "urls": [ - "https://storage.googleapis.com/grpc-bazel-mirror/github.com/bazelbuild/rules_go/releases/download/0.18.5/rules_go-0.18.5.tar.gz", - "https://github.com/bazelbuild/rules_go/releases/download/0.18.5/rules_go-0.18.5.tar.gz" - ] - }, - "io_bazel_rules_python": { - "generator_function": "grpc_deps", - "generator_name": "io_bazel_rules_python", - "name": "io_bazel_rules_python", - "sha256": "aa96a691d3a8177f3215b14b0edc9641787abaaa30363a080165d06ab65e1161", - "url": "https://github.com/bazelbuild/rules_python/releases/download/0.0.1/rules_python-0.0.1.tar.gz" - }, - "io_bazel_rules_sass": { - "name": "io_bazel_rules_sass", - "sha256": "c78be58f5e0a29a04686b628cf54faaee0094322ae0ac99da5a8a8afca59a647", - "strip_prefix": "rules_sass-1.25.0", - "urls": [ - "https://mirror.bazel.build/github.com/bazelbuild/rules_sass/archive/1.25.0.zip", - "https://github.com/bazelbuild/rules_sass/archive/1.25.0.zip" - ] - }, - "io_bazel_skydoc": { - "name": "io_bazel_skydoc", - "sha256": "5a725b777976b77aa122b707d1b6f0f39b6020f66cd427bb111a585599c857b1", - "strip_prefix": "stardoc-1ef781ced3b1443dca3ed05dec1989eca1a4e1cd", - "urls": [ - "https://mirror.bazel.build/github.com/bazelbuild/stardoc/archive/1ef781ced3b1443dca3ed05dec1989eca1a4e1cd.tar.gz", - "https://github.com/bazelbuild/stardoc/archive/1ef781ced3b1443dca3ed05dec1989eca1a4e1cd.tar.gz" - ] - }, - "io_opencensus_cpp": { - "generator_function": "grpc_deps", - "generator_name": "io_opencensus_cpp", - "name": "io_opencensus_cpp", - "sha256": "90d6fafa8b1a2ea613bf662731d3086e1c2ed286f458a95c81744df2dbae41b1", - "strip_prefix": "opencensus-cpp-c9a4da319bc669a772928ffc55af4a61be1a1176", - "urls": [ - "https://storage.googleapis.com/grpc-bazel-mirror/github.com/census-instrumentation/opencensus-cpp/archive/c9a4da319bc669a772928ffc55af4a61be1a1176.tar.gz", - "https://github.com/census-instrumentation/opencensus-cpp/archive/c9a4da319bc669a772928ffc55af4a61be1a1176.tar.gz" - ] - }, - "java_tools_javac11_darwin-v10.6.zip": { - "name": "java_tools_javac11_darwin-v10.6.zip", - "sha256": "d15b05d2061382748f779dc566537ea567a46bcba6fa34b56d7cb6e6d668adab", - "urls": [ - "https://mirror.bazel.build/bazel_java_tools/releases/javac11/v10.6/java_tools_javac11_darwin-v10.6.zip" - ] - }, - "java_tools_javac11_linux-v10.6.zip": { - "name": "java_tools_javac11_linux-v10.6.zip", - "sha256": "085c0ba53ba764e81d4c195524f3c596085cbf9cdc01dd8e6d2ae677e726af35", - "urls": [ - "https://mirror.bazel.build/bazel_java_tools/releases/javac11/v10.6/java_tools_javac11_linux-v10.6.zip" - ] - }, - "java_tools_javac11_windows-v10.6.zip": { - "name": "java_tools_javac11_windows-v10.6.zip", - "sha256": "873f1e53d1fa9c8e46b717673816cd822bb7acc474a194a18ff849fd8fa6ff00", - "urls": [ - "https://mirror.bazel.build/bazel_java_tools/releases/javac11/v10.6/java_tools_javac11_windows-v10.6.zip" - ] - }, - "java_tools_langtools_javac11": { - "name": "java_tools_langtools_javac11", - "sha256": "cf0814fa002ef3d794582bb086516d8c9ed0958f83f19799cdb08949019fe4c7", - "urls": [ - "https://mirror.bazel.build/bazel_java_tools/jdk_langtools/langtools_jdk11_v2.zip" - ] - }, - "jekyll_tree_0_17_1": { - "name": "jekyll_tree_0_17_1", - "sha256": "02256ddd20eeaf70cf8fcfe9b2cdddd7be87aedd5848d549474fb0358e0031d3", - "urls": [ - "https://mirror.bazel.build/bazel_versioned_docs/jekyll-tree-0.17.1.tar" - ] - }, - "jekyll_tree_0_17_2": { - "name": "jekyll_tree_0_17_2", - "sha256": "13b35dd309a0d52f0a2518a1193f42729c75255f5fae40cea68e4d4224bfaa2e", - "urls": [ - "https://mirror.bazel.build/bazel_versioned_docs/jekyll-tree-0.17.2.tar" - ] - }, - "jekyll_tree_0_18_1": { - "name": "jekyll_tree_0_18_1", - "sha256": "98b77f48e37a50fc6f83100bf53f661e10732bb3ddbc226e02d0225cb7a9a7d8", - "urls": [ - "https://mirror.bazel.build/bazel_versioned_docs/jekyll-tree-0.18.1.tar" - ] - }, - "jekyll_tree_0_19_1": { - "name": "jekyll_tree_0_19_1", - "sha256": "ec892c59ba18bb8de1f9ae2bde937db144e45f28d6d1c32a2cee847ee81b134d", - "urls": [ - "https://mirror.bazel.build/bazel_versioned_docs/jekyll-tree-0.19.1.tar" - ] - }, - "jekyll_tree_0_19_2": { - "name": "jekyll_tree_0_19_2", - "sha256": "3c2d9f21ec2fd1c0b8a310f6eb6043027c838810cdfc2457d4346a0e5cdcaa7a", - "urls": [ - "https://mirror.bazel.build/bazel_versioned_docs/jekyll-tree-0.19.2.tar" - ] - }, - "jekyll_tree_0_20_0": { - "name": "jekyll_tree_0_20_0", - "sha256": "bb79a63810bf1b0aa1f89bd3bbbeb4a547a30ab9af70c9be656cc6866f4b015b", - "urls": [ - "https://mirror.bazel.build/bazel_versioned_docs/jekyll-tree-0.20.0.tar" - ] - }, - "jekyll_tree_0_21_0": { - "name": "jekyll_tree_0_21_0", - "sha256": "23ec39c0138d358c544151e5c81586716d5d1c6124f10a742bead70516e6eb93", - "urls": [ - "https://mirror.bazel.build/bazel_versioned_docs/jekyll-tree-0.21.0.tar" - ] - }, - "jekyll_tree_0_22_0": { - "name": "jekyll_tree_0_22_0", - "sha256": "bec5cfaa5560e082e41e33bde276cf93f0f7bcfd2914a3e868f921df8b3ab725", - "urls": [ - "https://mirror.bazel.build/bazel_versioned_docs/jekyll-tree-0.22.0.tar" - ] - }, - "jekyll_tree_0_23_0": { - "name": "jekyll_tree_0_23_0", - "sha256": "56c80fcf49dc606fab8ed5e737a7409e9a486585b7b98673be69b5a4984dd774", - "urls": [ - "https://mirror.bazel.build/bazel_versioned_docs/jekyll-tree-0.23.0.tar" - ] - }, - "jekyll_tree_0_24_0": { - "name": "jekyll_tree_0_24_0", - "sha256": "988fa567906a73e50d3669909285187ef88c76ecd4aa277f4d1f355fc06a90c8", - "urls": [ - "https://mirror.bazel.build/bazel_versioned_docs/jekyll-tree-0.24.0.tar" - ] - }, - "jekyll_tree_0_25_0": { - "name": "jekyll_tree_0_25_0", - "sha256": "e8ab61c047225e808982a564ecd692fd63bd243dccc88a8768ed069a5362a685", - "urls": [ - "https://mirror.bazel.build/bazel_versioned_docs/jekyll-tree-0.25.0.tar" - ] - }, - "jekyll_tree_0_26_0": { - "name": "jekyll_tree_0_26_0", - "sha256": "3907dfc6fb27d246e67877e553e8951fac239bb49f2dec7e06b6b09cb0b98b8d", - "urls": [ - "https://mirror.bazel.build/bazel_versioned_docs/jekyll-tree-0.26.0.tar" - ] - }, - "jekyll_tree_0_27_0": { - "name": "jekyll_tree_0_27_0", - "sha256": "97e2633fefee389daade775da43907aa68699b32212f4e48cb095abe18aa7e65", - "urls": [ - "https://mirror.bazel.build/bazel_versioned_docs/jekyll-tree-0.27.0.tar" - ] - }, - "jekyll_tree_0_28_0": { - "name": "jekyll_tree_0_28_0", - "sha256": "64b3fc267fb1f4c56345d96f0ad9f07a2efe43bd15361f818368849cf941b3b7", - "urls": [ - "https://mirror.bazel.build/bazel_versioned_docs/jekyll-tree-0.28.0.tar" - ] - }, - "jekyll_tree_0_29_0": { - "name": "jekyll_tree_0_29_0", - "sha256": "99d7a6bf9ef0145c59c54b4319fb31cb855681782080a5490909c4a5463c7215", - "urls": [ - "https://mirror.bazel.build/bazel_versioned_docs/jekyll-tree-0.29.0.tar" - ] - }, - "jekyll_tree_0_29_1": { - "name": "jekyll_tree_0_29_1", - "sha256": "cf0a517f1660a7c4fd26a7ef6f3594bbefcf2b670bc0ed610bf3bb6ec3a9fdc3", - "urls": [ - "https://mirror.bazel.build/bazel_versioned_docs/jekyll-tree-0.29.1.tar" - ] - }, - "jekyll_tree_1_0_0": { - "name": "jekyll_tree_1_0_0", - "sha256": "61ef65c738a8cd65059f58f2ee5f7eef493136ac4d5e5c3464787d17043febdf", - "urls": [ - "https://mirror.bazel.build/bazel_versioned_docs/jekyll-tree-1.0.0.tar" - ] - }, - "jekyll_tree_1_1_0": { - "name": "jekyll_tree_1_1_0", - "sha256": "46d82c9249896903ee6be2295fc52a1346a9ee82f61f89b8a2181232c3bd999b", - "urls": [ - "https://mirror.bazel.build/bazel_versioned_docs/jekyll-tree-1.1.0.tar" - ] - }, - "jekyll_tree_1_2_0": { - "name": "jekyll_tree_1_2_0", - "sha256": "d402a8391ca2624673f124ff42ba8d0d40d4139e5d23111f3995dc6c5f70f63d", - "urls": [ - "https://mirror.bazel.build/bazel_versioned_docs/jekyll-tree-1.2.0.tar" - ] - }, - "jekyll_tree_2_0_0": { - "name": "jekyll_tree_2_0_0", - "sha256": "7d7c424ede503856c61b645d8fdc2513ec6ea8600d76c5e87c45a9a45c16de3e", - "urls": [ - "https://mirror.bazel.build/bazel_versioned_docs/jekyll-tree-2.0.0.tar" - ] - }, - "jekyll_tree_2_1_0": { - "name": "jekyll_tree_2_1_0", - "sha256": "b0fd257b1d6b1b05705742d55a13b9a20d3e99f49c89334750c872d620e5b88f", - "urls": [ - "https://mirror.bazel.build/bazel_versioned_docs/jekyll-tree-2.1.0.tar" - ] - }, - "jekyll_tree_2_2_0": { - "name": "jekyll_tree_2_2_0", - "sha256": "4c1506786ab98df8039ec7354b82da7b586b2ae4ab7f7e7d08f3caf74ff28e3d", - "urls": [ - "https://mirror.bazel.build/bazel_versioned_docs/jekyll-tree-2.2.0.tar" - ] - }, - "jekyll_tree_3_0_0": { - "name": "jekyll_tree_3_0_0", - "sha256": "bd1096ad609c253fa7b1473edf4a3aa51f36243e188dbb62c68d8ed4aca2419d", - "urls": [ - "https://mirror.bazel.build/bazel_versioned_docs/jekyll-tree-3.0.0.tar" - ] - }, - "jekyll_tree_3_1_0": { - "name": "jekyll_tree_3_1_0", - "sha256": "f9d2e22e24af426d6c9de163d91abe6d8af7eb1eabb1d7ff5e9cf4bededf465a", - "urls": [ - "https://mirror.bazel.build/bazel_versioned_docs/jekyll-tree-3.1.0-807b377.tar" - ] - }, - "jekyll_tree_3_2_0": { - "name": "jekyll_tree_3_2_0", - "sha256": "6cff8654e739a0c3062183a5a6cc82fcf9a77323051f8c007866d7f4101052a6", - "urls": [ - "https://mirror.bazel.build/bazel_versioned_docs/jekyll-tree-3.2.0.tar" - ] - }, - "jekyll_tree_3_3_0": { - "name": "jekyll_tree_3_3_0", - "sha256": "36b81e8ddf4f3caccf41acc82d9e49f000c1be9e92c9cc82793d60ff70636176", - "urls": [ - "https://mirror.bazel.build/bazel_versioned_docs/jekyll-tree-3.3.0.tar" - ] - }, - "jekyll_tree_3_4_0": { - "name": "jekyll_tree_3_4_0", - "sha256": "af82e775d911135bcff76e500bb003c4a9fccb949f8ddf4d93c58eca195bf5e8", - "urls": [ - "https://mirror.bazel.build/bazel_versioned_docs/jekyll-tree-3.4.0.tar" - ] - }, - "jekyll_tree_3_5_0": { - "name": "jekyll_tree_3_5_0", - "sha256": "aa96cbad14cfab0b422d1d17eac3107a75eb05854d40ab4f1379a6fc87b2e1f8", - "urls": [ - "https://mirror.bazel.build/bazel_versioned_docs/jekyll-tree-3.5.0.tar" - ] - }, - "jekyll_tree_3_5_1": { - "name": "jekyll_tree_3_5_1", - "sha256": "1c949ba8da353c93c74a70638e5cb321ea1cd5582eda1b6ad88c6d2d0b569f2f", - "urls": [ - "https://mirror.bazel.build/bazel_versioned_docs/jekyll-tree-3.5.1.tar" - ] - }, - "jekyll_tree_3_6_0": { - "name": "jekyll_tree_3_6_0", - "sha256": "1b7a16a2098ca0c290c208a11db886e950d6c523b2cac2d0a0cba4a04aa832f3", - "urls": [ - "https://mirror.bazel.build/bazel_versioned_docs/jekyll-tree-3.6.0.tar" - ] - }, - "jekyll_tree_3_7_0": { - "name": "jekyll_tree_3_7_0", - "sha256": "a534d37ef3867c92fae8692852f92820a34f63a5f9092bbbec6505c0f69d8094", - "urls": [ - "https://mirror.bazel.build/bazel_versioned_docs/jekyll-tree-3.7.0.tar" - ] - }, - "openjdk11_darwin_aarch64_archive": { - "build_file_content": "\njava_runtime(name = 'runtime', srcs = glob(['**']), visibility = ['//visibility:public'])\nexports_files([\"WORKSPACE\"], visibility = [\"//visibility:public\"])\n", - "name": "openjdk11_darwin_aarch64_archive", - "sha256": "3dcc636e64ae58b922269c2dc9f20f6f967bee90e3f6847d643c4a566f1e8d8a", - "strip_prefix": "zulu11.45.27-ca-jdk11.0.10-macosx_aarch64", - "urls": [ - "https://mirror.bazel.build/cdn.azul.com/zulu/bin/zulu11.45.27-ca-jdk11.0.10-macosx_aarch64.tar.gz", - "https://cdn.azul.com/zulu/bin/zulu11.45.27-ca-jdk11.0.10-macosx_aarch64.tar.gz" - ] - }, - "openjdk11_darwin_archive": { - "build_file_content": "\njava_runtime(name = 'runtime', srcs = glob(['**']), visibility = ['//visibility:public'])\nexports_files([\"WORKSPACE\"], visibility = [\"//visibility:public\"])\n", - "name": "openjdk11_darwin_archive", - "sha256": "e1fe56769f32e2aaac95e0a8f86b5a323da5af3a3b4bba73f3086391a6cc056f", - "strip_prefix": "zulu11.37.17-ca-jdk11.0.6-macosx_x64", - "urls": [ - "https://mirror.bazel.build/openjdk/azul-zulu11.37.17-ca-jdk11.0.6/zulu11.37.17-ca-jdk11.0.6-macosx_x64.tar.gz" - ] - }, - "openjdk11_linux_archive": { - "build_file_content": "\njava_runtime(name = 'runtime', srcs = glob(['**']), visibility = ['//visibility:public'])\nexports_files([\"WORKSPACE\"], visibility = [\"//visibility:public\"])\n", - "name": "openjdk11_linux_archive", - "sha256": "360626cc19063bc411bfed2914301b908a8f77a7919aaea007a977fa8fb3cde1", - "strip_prefix": "zulu11.37.17-ca-jdk11.0.6-linux_x64", - "urls": [ - "https://mirror.bazel.build/openjdk/azul-zulu11.37.17-ca-jdk11.0.6/zulu11.37.17-ca-jdk11.0.6-linux_x64.tar.gz" - ] - }, - "openjdk11_windows_archive": { - "build_file_content": "\njava_runtime(name = 'runtime', srcs = glob(['**']), visibility = ['//visibility:public'])\nexports_files([\"WORKSPACE\"], visibility = [\"//visibility:public\"])\n", - "name": "openjdk11_windows_archive", - "sha256": "a9695617b8374bfa171f166951214965b1d1d08f43218db9a2a780b71c665c18", - "strip_prefix": "zulu11.37.17-ca-jdk11.0.6-win_x64", - "urls": [ - "https://mirror.bazel.build/openjdk/azul-zulu11.37.17-ca-jdk11.0.6/zulu11.37.17-ca-jdk11.0.6-win_x64.zip" - ] - }, - "openjdk14_darwin_archive": { - "build_file_content": "\njava_runtime(name = 'runtime', srcs = glob(['**']), visibility = ['//visibility:public'])\nexports_files([\"WORKSPACE\"], visibility = [\"//visibility:public\"])\n", - "name": "openjdk14_darwin_archive", - "sha256": "088bd4d0890acc9f032b738283bf0f26b2a55c50b02d1c8a12c451d8ddf080dd", - "strip_prefix": "zulu14.28.21-ca-jdk14.0.1-macosx_x64", - "urls": [ - "https://mirror.bazel.build/cdn.azul.com/zulu/bin/zulu14.28.21-ca-jdk14.0.1-macosx_x64.tar.gz" - ] - }, - "openjdk14_linux_archive": { - "build_file_content": "\njava_runtime(name = 'runtime', srcs = glob(['**']), visibility = ['//visibility:public'])\nexports_files([\"WORKSPACE\"], visibility = [\"//visibility:public\"])\n", - "name": "openjdk14_linux_archive", - "sha256": "48bb8947034cd079ad1ef83335e7634db4b12a26743a0dc314b6b861480777aa", - "strip_prefix": "zulu14.28.21-ca-jdk14.0.1-linux_x64", - "urls": [ - "https://mirror.bazel.build/cdn.azul.com/zulu/bin/zulu14.28.21-ca-jdk14.0.1-linux_x64.tar.gz" - ] - }, - "openjdk14_windows_archive": { - "build_file_content": "\njava_runtime(name = 'runtime', srcs = glob(['**']), visibility = ['//visibility:public'])\nexports_files([\"WORKSPACE\"], visibility = [\"//visibility:public\"])\n", - "name": "openjdk14_windows_archive", - "sha256": "9cb078b5026a900d61239c866161f0d9558ec759aa15c5b4c7e905370e868284", - "strip_prefix": "zulu14.28.21-ca-jdk14.0.1-win_x64", - "urls": [ - "https://mirror.bazel.build/cdn.azul.com/zulu/bin/zulu14.28.21-ca-jdk14.0.1-win_x64.zip" - ] - }, - "openjdk15_darwin_aarch64_archive": { - "build_file_content": "\njava_runtime(name = 'runtime', srcs = glob(['**']), visibility = ['//visibility:public'])\nexports_files([\"WORKSPACE\"], visibility = [\"//visibility:public\"])\n", - "name": "openjdk15_darwin_aarch64_archive", - "sha256": "2613c3f15eef6b6ecd0fd102da92282b985e4573905dc902f1783d8059c1efc5", - "strip_prefix": "zulu15.29.15-ca-jdk15.0.2-macosx_aarch64", - "urls": [ - "https://mirror.bazel.build/cdn.azul.com/zulu/bin/zulu15.29.15-ca-jdk15.0.2-macosx_aarch64.tar.gz", - "https://cdn.azul.com/zulu/bin/zulu15.29.15-ca-jdk15.0.2-macosx_aarch64.tar.gz" - ] - }, - "openjdk15_darwin_archive": { - "build_file_content": "\njava_runtime(name = 'runtime', srcs = glob(['**']), visibility = ['//visibility:public'])\nexports_files([\"WORKSPACE\"], visibility = [\"//visibility:public\"])\n", - "name": "openjdk15_darwin_archive", - "sha256": "f80b2e0512d9d8a92be24497334c974bfecc8c898fc215ce0e76594f00437482", - "strip_prefix": "zulu15.27.17-ca-jdk15.0.0-macosx_x64", - "urls": [ - "https://mirror.bazel.build/cdn.azul.com/zulu/bin/zulu15.27.17-ca-jdk15.0.0-macosx_x64.tar.gz", - "https://cdn.azul.com/zulu/bin/zulu15.27.17-ca-jdk15.0.0-macosx_x64.tar.gz" - ] - }, - "openjdk15_linux_archive": { - "build_file_content": "\njava_runtime(name = 'runtime', srcs = glob(['**']), visibility = ['//visibility:public'])\nexports_files([\"WORKSPACE\"], visibility = [\"//visibility:public\"])\n", - "name": "openjdk15_linux_archive", - "sha256": "0a38f1138c15a4f243b75eb82f8ef40855afcc402e3c2a6de97ce8235011b1ad", - "strip_prefix": "zulu15.27.17-ca-jdk15.0.0-linux_x64", - "urls": [ - "https://mirror.bazel.build/cdn.azul.com/zulu/bin/zulu15.27.17-ca-jdk15.0.0-linux_x64.tar.gz", - "https://cdn.azul.com/zulu/bin/zulu15.27.17-ca-jdk15.0.0-linux_x64.tar.gz" - ] - }, - "openjdk15_windows_archive": { - "build_file_content": "\njava_runtime(name = 'runtime', srcs = glob(['**']), visibility = ['//visibility:public'])\nexports_files([\"WORKSPACE\"], visibility = [\"//visibility:public\"])\n", - "name": "openjdk15_windows_archive", - "sha256": "f535a530151e6c20de8a3078057e332b08887cb3ba1a4735717357e72765cad6", - "strip_prefix": "zulu15.27.17-ca-jdk15.0.0-win_x64", - "urls": [ - "https://mirror.bazel.build/cdn.azul.com/zulu/bin/zulu15.27.17-ca-jdk15.0.0-win_x64.zip", - "https://cdn.azul.com/zulu/bin/zulu15.27.17-ca-jdk15.0.0-win_x64.zip" - ] - }, - "openjdk_linux": { - "downloaded_file_path": "zulu-linux.tar.gz", - "name": "openjdk_linux", - "sha256": "65bfe4e0ffa74a680ee4410db46b17e30cd9397b664a92a886599fe1f3530969", - "urls": [ - "https://mirror.bazel.build/openjdk/azul-zulu11.37.17-ca-jdk11.0.6/zulu11.37.17-ca-jdk11.0.6-linux_x64-linux_x64-allmodules-b23d4e05466f2aa1fdcd72d3d3a8e962206b64bf-1581689070.tar.gz" - ] - }, - "openjdk_linux_aarch64": { - "downloaded_file_path": "zulu-linux-aarch64.tar.gz", - "name": "openjdk_linux_aarch64", - "sha256": "6b245793087300db3ee82ab0d165614f193a73a60f2f011e347756c1e6ca5bac", - "urls": [ - "https://mirror.bazel.build/openjdk/azul-zulu11.37.48-ca-jdk11.0.6/zulu11.37.48-ca-jdk11.0.6-linux_aarch64-allmodules-b23d4e05466f2aa1fdcd72d3d3a8e962206b64bf-1581690750.tar.gz" - ] - }, - "openjdk_linux_aarch64_minimal": { - "downloaded_file_path": "zulu-linux-aarch64-minimal.tar.gz", - "name": "openjdk_linux_aarch64_minimal", - "sha256": "06f6520a877704c77614bcfc4f846cc7cbcbf5eaad149bf7f19f4f16e285c9de", - "urls": [ - "https://mirror.bazel.build/openjdk/azul-zulu11.37.48-ca-jdk11.0.6/zulu11.37.48-ca-jdk11.0.6-linux_aarch64-minimal-b23d4e05466f2aa1fdcd72d3d3a8e962206b64bf-1581690750.tar.gz" - ] - }, - "openjdk_linux_aarch64_vanilla": { - "downloaded_file_path": "zulu-linux-aarch64-vanilla.tar.gz", - "name": "openjdk_linux_aarch64_vanilla", - "sha256": "a452f1b9682d9f83c1c14e54d1446e1c51b5173a3a05dcb013d380f9508562e4", - "urls": [ - "https://mirror.bazel.build/openjdk/azul-zulu11.37.48-ca-jdk11.0.6/zulu11.37.48-ca-jdk11.0.6-linux_aarch64.tar.gz" - ] - }, - "openjdk_linux_minimal": { - "downloaded_file_path": "zulu-linux-minimal.tar.gz", - "name": "openjdk_linux_minimal", - "sha256": "91f7d52f695c681d4e21499b4319d548aadef249a6b3053e306308992e1e29ae", - "urls": [ - "https://mirror.bazel.build/openjdk/azul-zulu11.37.17-ca-jdk11.0.6/zulu11.37.17-ca-jdk11.0.6-linux_x64-minimal-b23d4e05466f2aa1fdcd72d3d3a8e962206b64bf-1581689068.tar.gz" - ] - }, - "openjdk_linux_ppc64le_vanilla": { - "downloaded_file_path": "adoptopenjdk-ppc64le-vanilla.tar.gz", - "name": "openjdk_linux_ppc64le_vanilla", - "sha256": "a417db0295b1f4b538ecbaf7c774f3a177fab9657a665940170936c0eca4e71a", - "urls": [ - "https://mirror.bazel.build/openjdk/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk-11.0.7+10/OpenJDK11U-jdk_ppc64le_linux_hotspot_11.0.7_10.tar.gz", - "https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk-11.0.7+10/OpenJDK11U-jdk_ppc64le_linux_hotspot_11.0.7_10.tar.gz" - ] - }, - "openjdk_linux_s390x_vanilla": { - "downloaded_file_path": "adoptopenjdk-s390x-vanilla.tar.gz", - "name": "openjdk_linux_s390x_vanilla", - "sha256": "d9b72e87a1d3ebc0c9552f72ae5eb150fffc0298a7cb841f1ce7bfc70dcd1059", - "urls": [ - "https://mirror.bazel.build/github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk-11.0.7+10/OpenJDK11U-jdk_s390x_linux_hotspot_11.0.7_10.tar.gz", - "https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk-11.0.7+10/OpenJDK11U-jdk_s390x_linux_hotspot_11.0.7_10.tar.gz" - ] - }, - "openjdk_linux_vanilla": { - "downloaded_file_path": "zulu-linux-vanilla.tar.gz", - "name": "openjdk_linux_vanilla", - "sha256": "360626cc19063bc411bfed2914301b908a8f77a7919aaea007a977fa8fb3cde1", - "urls": [ - "https://mirror.bazel.build/openjdk/azul-zulu11.37.17-ca-jdk11.0.6/zulu11.37.17-ca-jdk11.0.6-linux_x64.tar.gz" - ] - }, - "openjdk_macos_aarch64": { - "downloaded_file_path": "zulu-macos-aarch64.tar.gz", - "name": "openjdk_macos_aarch64", - "sha256": "a900ef793cb34b03ac5d93ea2f67291b6842e99d500934e19393a8d8f9bfa6ff", - "urls": [ - "https://mirror.bazel.build/openjdk/azul-zulu11.45.27-ca-jdk11.0.10/zulu11.45.27-ca-jdk11.0.10-macosx_aarch64-allmodules-1611665569.tar.gz" - ] - }, - "openjdk_macos_aarch64_minimal": { - "downloaded_file_path": "zulu-macos-aarch64-minimal.tar.gz", - "name": "openjdk_macos_aarch64_minimal", - "sha256": "f4f606926e6deeaa8b8397e299313d9df87642fe464b0ccf1ed0432aeb00640b", - "urls": [ - "https://mirror.bazel.build/openjdk/azul-zulu11.45.27-ca-jdk11.0.10/zulu11.45.27-ca-jdk11.0.10-macosx_aarch64-minimal-1611665562.tar.gz" - ] - }, - "openjdk_macos_aarch64_vanilla": { - "downloaded_file_path": "zulu-macos-aarch64-vanilla.tar.gz", - "name": "openjdk_macos_aarch64_vanilla", - "sha256": "3dcc636e64ae58b922269c2dc9f20f6f967bee90e3f6847d643c4a566f1e8d8a", - "urls": [ - "https://mirror.bazel.build/cdn.azul.com/zulu/bin/zulu11.45.27-ca-jdk11.0.10-macosx_aarch64.tar.gz", - "https://cdn.azul.com/zulu/bin/zulu11.45.27-ca-jdk11.0.10-macosx_aarch64.tar.gz" - ] - }, - "openjdk_macos_x86_64": { - "downloaded_file_path": "zulu-macos.tar.gz", - "name": "openjdk_macos_x86_64", - "sha256": "8e283cfd23c7555be8e17295ed76eb8f00324c88ab904b8de37bbe08f90e569b", - "urls": [ - "https://mirror.bazel.build/openjdk/azul-zulu11.37.17-ca-jdk11.0.6/zulu11.37.17-ca-jdk11.0.6-macosx_x64-allmodules-b23d4e05466f2aa1fdcd72d3d3a8e962206b64bf-1581689066.tar.gz" - ] - }, - "openjdk_macos_x86_64_minimal": { - "downloaded_file_path": "zulu-macos-minimal.tar.gz", - "name": "openjdk_macos_x86_64_minimal", - "sha256": "1bacb1c07035d4066d79f0b65b4ea0ebd1954f3662bdfe3618da382ac8fd23a6", - "urls": [ - "https://mirror.bazel.build/openjdk/azul-zulu11.37.17-ca-jdk11.0.6/zulu11.37.17-ca-jdk11.0.6-macosx_x64-minimal-b23d4e05466f2aa1fdcd72d3d3a8e962206b64bf-1581689063.tar.gz" - ] - }, - "openjdk_macos_x86_64_vanilla": { - "downloaded_file_path": "zulu-macos-vanilla.tar.gz", - "name": "openjdk_macos_x86_64_vanilla", - "sha256": "e1fe56769f32e2aaac95e0a8f86b5a323da5af3a3b4bba73f3086391a6cc056f", - "urls": [ - "https://mirror.bazel.build/openjdk/azul-zulu11.37.17-ca-jdk11.0.6/zulu11.37.17-ca-jdk11.0.6-macosx_x64.tar.gz" - ] - }, - "openjdk_win": { - "downloaded_file_path": "zulu-win.zip", - "name": "openjdk_win", - "sha256": "8e1604b3a27dcf639bc6d1a73103f1211848139e4cceb081d0a74a99e1e6f995", - "urls": [ - "https://mirror.bazel.build/openjdk/azul-zulu11.37.17-ca-jdk11.0.6/zulu11.37.17-ca-jdk11.0.6-win_x64-allmodules-b23d4e05466f2aa1fdcd72d3d3a8e962206b64bf-1581689080.zip" - ] - }, - "openjdk_win_minimal": { - "downloaded_file_path": "zulu-win-minimal.zip", - "name": "openjdk_win_minimal", - "sha256": "b90a713c9c2d9ea23cad44d2c2dfcc9af22faba9bde55dedc1c3bb9f556ac1ae", - "urls": [ - "https://mirror.bazel.build/openjdk/azul-zulu11.37.17-ca-jdk11.0.6/zulu11.37.17-ca-jdk11.0.6-win_x64-minimal-b23d4e05466f2aa1fdcd72d3d3a8e962206b64bf-1581689080.zip" - ] - }, - "openjdk_win_vanilla": { - "downloaded_file_path": "zulu-win-vanilla.zip", - "name": "openjdk_win_vanilla", - "sha256": "a9695617b8374bfa171f166951214965b1d1d08f43218db9a2a780b71c665c18", - "urls": [ - "https://mirror.bazel.build/openjdk/azul-zulu11.37.17-ca-jdk11.0.6/zulu11.37.17-ca-jdk11.0.6-win_x64.zip" - ] - }, - "platforms": { - "name": "platforms", - "sha256": "079945598e4b6cc075846f7fd6a9d0857c33a7afc0de868c2ccb96405225135d", - "urls": [ - "https://mirror.bazel.build/github.com/bazelbuild/platforms/releases/download/0.0.4/platforms-0.0.4.tar.gz", - "https://github.com/bazelbuild/platforms/releases/download/0.0.4/platforms-0.0.4.tar.gz" - ] - }, - "platforms-0.0.4.tar.gz": { - "name": "platforms-0.0.4.tar.gz", - "sha256": "079945598e4b6cc075846f7fd6a9d0857c33a7afc0de868c2ccb96405225135d", - "urls": [ - "https://mirror.bazel.build/github.com/bazelbuild/platforms/releases/download/0.0.4/platforms-0.0.4.tar.gz", - "https://github.com/bazelbuild/platforms/releases/download/0.0.4/platforms-0.0.4.tar.gz" - ] - }, - "remote_coverage_tools": { - "name": "remote_coverage_tools", - "sha256": "cd14f1cb4559e4723e63b7e7b06d09fcc3bd7ba58d03f354cdff1439bd936a7d", - "urls": [ - "https://mirror.bazel.build/bazel_coverage_output_generator/releases/coverage_output_generator-v2.5.zip" - ] - }, - "remote_coverage_tools_for_testing": { - "name": "remote_coverage_tools_for_testing", - "patch_cmds": [ - "test -f BUILD && chmod u+w BUILD || true", - "echo >> BUILD", - "echo 'exports_files([\"WORKSPACE\"], visibility = [\"//visibility:public\"])' >> BUILD" - ], - "patch_cmds_win": [ - "Add-Content -Path BUILD -Value \"`nexports_files([`\"WORKSPACE`\"], visibility = [`\"//visibility:public`\"])`n\" -Force" - ], - "sha256": "cd14f1cb4559e4723e63b7e7b06d09fcc3bd7ba58d03f354cdff1439bd936a7d", - "urls": [ - "https://mirror.bazel.build/bazel_coverage_output_generator/releases/coverage_output_generator-v2.5.zip" - ] - }, - "remote_java_tools_darwin": { - "generator_function": "maybe", - "generator_name": "remote_java_tools_darwin", - "name": "remote_java_tools_darwin", - "sha256": "64e5de2175dfccb96831573946b80d106edf3801d9db38b564514bf3581d466b", - "urls": [ - "https://mirror.bazel.build/bazel_java_tools/releases/javac11/v10.0/java_tools_javac11_darwin-v10.0.zip", - "https://github.com/bazelbuild/java_tools/releases/download/javac11_v10.0/java_tools_javac11_darwin-v10.0.zip" - ] - }, - "remote_java_tools_darwin_for_testing": { - "name": "remote_java_tools_darwin_for_testing", - "patch_cmds": [ - "test -f BUILD && chmod u+w BUILD || true", - "echo >> BUILD", - "echo 'exports_files([\"WORKSPACE\"], visibility = [\"//visibility:public\"])' >> BUILD" - ], - "patch_cmds_win": [ - "Add-Content -Path BUILD -Value \"`nexports_files([`\"WORKSPACE`\"], visibility = [`\"//visibility:public`\"])`n\" -Force" - ], - "sha256": "d15b05d2061382748f779dc566537ea567a46bcba6fa34b56d7cb6e6d668adab", - "urls": [ - "https://mirror.bazel.build/bazel_java_tools/releases/javac11/v10.6/java_tools_javac11_darwin-v10.6.zip", - "https://github.com/bazelbuild/java_tools/releases/download/javac11_v10.6/java_tools_javac11_darwin-v10.6.zip" - ] - }, - "remote_java_tools_javac11_test_darwin": { - "name": "remote_java_tools_javac11_test_darwin", - "patch_cmds": [ - "test -f BUILD && chmod u+w BUILD || true", - "echo >> BUILD", - "echo 'exports_files([\"WORKSPACE\"], visibility = [\"//visibility:public\"])' >> BUILD" - ], - "patch_cmds_win": [ - "Add-Content -Path BUILD -Value \"`nexports_files([`\"WORKSPACE`\"], visibility = [`\"//visibility:public`\"])`n\" -Force" - ], - "sha256": "d15b05d2061382748f779dc566537ea567a46bcba6fa34b56d7cb6e6d668adab", - "urls": [ - "https://mirror.bazel.build/bazel_java_tools/releases/javac11/v10.6/java_tools_javac11_darwin-v10.6.zip" - ] - }, - "remote_java_tools_javac11_test_linux": { - "name": "remote_java_tools_javac11_test_linux", - "patch_cmds": [ - "test -f BUILD && chmod u+w BUILD || true", - "echo >> BUILD", - "echo 'exports_files([\"WORKSPACE\"], visibility = [\"//visibility:public\"])' >> BUILD" - ], - "patch_cmds_win": [ - "Add-Content -Path BUILD -Value \"`nexports_files([`\"WORKSPACE`\"], visibility = [`\"//visibility:public`\"])`n\" -Force" - ], - "sha256": "085c0ba53ba764e81d4c195524f3c596085cbf9cdc01dd8e6d2ae677e726af35", - "urls": [ - "https://mirror.bazel.build/bazel_java_tools/releases/javac11/v10.6/java_tools_javac11_linux-v10.6.zip" - ] - }, - "remote_java_tools_javac11_test_windows": { - "name": "remote_java_tools_javac11_test_windows", - "patch_cmds": [ - "test -f BUILD && chmod u+w BUILD || true", - "echo >> BUILD", - "echo 'exports_files([\"WORKSPACE\"], visibility = [\"//visibility:public\"])' >> BUILD" - ], - "patch_cmds_win": [ - "Add-Content -Path BUILD -Value \"`nexports_files([`\"WORKSPACE`\"], visibility = [`\"//visibility:public`\"])`n\" -Force" - ], - "sha256": "873f1e53d1fa9c8e46b717673816cd822bb7acc474a194a18ff849fd8fa6ff00", - "urls": [ - "https://mirror.bazel.build/bazel_java_tools/releases/javac11/v10.6/java_tools_javac11_windows-v10.6.zip" - ] - }, - "remote_java_tools_linux": { - "generator_function": "maybe", - "generator_name": "remote_java_tools_linux", - "name": "remote_java_tools_linux", - "sha256": "69e65353c2cd65780abcbcce4daae973599298273b0f8b4d469eed822cb220d1", - "urls": [ - "https://mirror.bazel.build/bazel_java_tools/releases/javac11/v10.0/java_tools_javac11_linux-v10.0.zip", - "https://github.com/bazelbuild/java_tools/releases/download/javac11_v10.0/java_tools_javac11_linux-v10.0.zip" - ] - }, - "remote_java_tools_linux_for_testing": { - "name": "remote_java_tools_linux_for_testing", - "patch_cmds": [ - "test -f BUILD && chmod u+w BUILD || true", - "echo >> BUILD", - "echo 'exports_files([\"WORKSPACE\"], visibility = [\"//visibility:public\"])' >> BUILD" - ], - "patch_cmds_win": [ - "Add-Content -Path BUILD -Value \"`nexports_files([`\"WORKSPACE`\"], visibility = [`\"//visibility:public`\"])`n\" -Force" - ], - "sha256": "085c0ba53ba764e81d4c195524f3c596085cbf9cdc01dd8e6d2ae677e726af35", - "urls": [ - "https://mirror.bazel.build/bazel_java_tools/releases/javac11/v10.6/java_tools_javac11_linux-v10.6.zip", - "https://github.com/bazelbuild/java_tools/releases/download/javac11_v10.6/java_tools_javac11_linux-v10.6.zip" - ] - }, - "remote_java_tools_windows": { - "generator_function": "maybe", - "generator_name": "remote_java_tools_windows", - "name": "remote_java_tools_windows", - "sha256": "d2f62af8daa0a3d55789b605f6582e37038329c64843337c71e64515468e55c4", - "urls": [ - "https://mirror.bazel.build/bazel_java_tools/releases/javac11/v10.0/java_tools_javac11_windows-v10.0.zip", - "https://github.com/bazelbuild/java_tools/releases/download/javac11_v10.0/java_tools_javac11_windows-v10.0.zip" - ] - }, - "remote_java_tools_windows_for_testing": { - "name": "remote_java_tools_windows_for_testing", - "patch_cmds": [ - "test -f BUILD && chmod u+w BUILD || true", - "echo >> BUILD", - "echo 'exports_files([\"WORKSPACE\"], visibility = [\"//visibility:public\"])' >> BUILD" - ], - "patch_cmds_win": [ - "Add-Content -Path BUILD -Value \"`nexports_files([`\"WORKSPACE`\"], visibility = [`\"//visibility:public`\"])`n\" -Force" - ], - "sha256": "873f1e53d1fa9c8e46b717673816cd822bb7acc474a194a18ff849fd8fa6ff00", - "urls": [ - "https://mirror.bazel.build/bazel_java_tools/releases/javac11/v10.6/java_tools_javac11_windows-v10.6.zip", - "https://github.com/bazelbuild/java_tools/releases/download/javac11_v10.6/java_tools_javac11_windows-v10.6.zip" - ] - }, - "remotejdk11_linux": { - "build_file": "@bazel_tools//tools/jdk:jdk.BUILD", - "generator_function": "maybe", - "generator_name": "remotejdk11_linux", - "name": "remotejdk11_linux", - "sha256": "360626cc19063bc411bfed2914301b908a8f77a7919aaea007a977fa8fb3cde1", - "strip_prefix": "zulu11.37.17-ca-jdk11.0.6-linux_x64", - "urls": [ - "https://mirror.bazel.build/openjdk/azul-zulu11.37.17-ca-jdk11.0.6/zulu11.37.17-ca-jdk11.0.6-linux_x64.tar.gz" - ] - }, - "remotejdk11_linux_aarch64": { - "build_file": "@bazel_tools//tools/jdk:jdk.BUILD", - "generator_function": "maybe", - "generator_name": "remotejdk11_linux_aarch64", - "name": "remotejdk11_linux_aarch64", - "sha256": "a452f1b9682d9f83c1c14e54d1446e1c51b5173a3a05dcb013d380f9508562e4", - "strip_prefix": "zulu11.37.48-ca-jdk11.0.6-linux_aarch64", - "urls": [ - "https://mirror.bazel.build/openjdk/azul-zulu11.37.48-ca-jdk11.0.6/zulu11.37.48-ca-jdk11.0.6-linux_aarch64.tar.gz" - ] - }, - "remotejdk11_linux_aarch64_for_testing": { - "build_file": "@local_jdk//:BUILD.bazel", - "name": "remotejdk11_linux_aarch64_for_testing", - "patch_cmds": [ - "test -f BUILD.bazel && chmod u+w BUILD.bazel || true", - "echo >> BUILD.bazel", - "echo 'exports_files([\"WORKSPACE\"], visibility = [\"//visibility:public\"])' >> BUILD.bazel" - ], - "patch_cmds_win": [ - "Add-Content -Path BUILD.bazel -Value \"`nexports_files([`\"WORKSPACE`\"], visibility = [`\"//visibility:public`\"])`n\" -Force" - ], - "sha256": "a452f1b9682d9f83c1c14e54d1446e1c51b5173a3a05dcb013d380f9508562e4", - "strip_prefix": "zulu11.37.48-ca-jdk11.0.6-linux_aarch64", - "urls": [ - "https://mirror.bazel.build/openjdk/azul-zulu11.37.48-ca-jdk11.0.6/zulu11.37.48-ca-jdk11.0.6-linux_aarch64.tar.gz" - ] - }, - "remotejdk11_linux_for_testing": { - "build_file": "@local_jdk//:BUILD.bazel", - "name": "remotejdk11_linux_for_testing", - "patch_cmds": [ - "test -f BUILD.bazel && chmod u+w BUILD.bazel || true", - "echo >> BUILD.bazel", - "echo 'exports_files([\"WORKSPACE\"], visibility = [\"//visibility:public\"])' >> BUILD.bazel" - ], - "patch_cmds_win": [ - "Add-Content -Path BUILD.bazel -Value \"`nexports_files([`\"WORKSPACE`\"], visibility = [`\"//visibility:public`\"])`n\" -Force" - ], - "sha256": "360626cc19063bc411bfed2914301b908a8f77a7919aaea007a977fa8fb3cde1", - "strip_prefix": "zulu11.37.17-ca-jdk11.0.6-linux_x64", - "urls": [ - "https://mirror.bazel.build/openjdk/azul-zulu11.37.17-ca-jdk11.0.6/zulu11.37.17-ca-jdk11.0.6-linux_x64.tar.gz" - ] - }, - "remotejdk11_linux_ppc64le": { - "build_file": "@bazel_tools//tools/jdk:jdk.BUILD", - "generator_function": "maybe", - "generator_name": "remotejdk11_linux_ppc64le", - "name": "remotejdk11_linux_ppc64le", - "sha256": "a417db0295b1f4b538ecbaf7c774f3a177fab9657a665940170936c0eca4e71a", - "strip_prefix": "jdk-11.0.7+10", - "urls": [ - "https://mirror.bazel.build/openjdk/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk-11.0.7+10/OpenJDK11U-jdk_ppc64le_linux_hotspot_11.0.7_10.tar.gz", - "https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk-11.0.7+10/OpenJDK11U-jdk_ppc64le_linux_hotspot_11.0.7_10.tar.gz" - ] - }, - "remotejdk11_linux_ppc64le_for_testing": { - "build_file": "@local_jdk//:BUILD.bazel", - "name": "remotejdk11_linux_ppc64le_for_testing", - "patch_cmds": [ - "test -f BUILD.bazel && chmod u+w BUILD.bazel || true", - "echo >> BUILD.bazel", - "echo 'exports_files([\"WORKSPACE\"], visibility = [\"//visibility:public\"])' >> BUILD.bazel" - ], - "patch_cmds_win": [ - "Add-Content -Path BUILD.bazel -Value \"`nexports_files([`\"WORKSPACE`\"], visibility = [`\"//visibility:public`\"])`n\" -Force" - ], - "sha256": "a417db0295b1f4b538ecbaf7c774f3a177fab9657a665940170936c0eca4e71a", - "strip_prefix": "jdk-11.0.7+10", - "urls": [ - "https://mirror.bazel.build/openjdk/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk-11.0.7+10/OpenJDK11U-jdk_ppc64le_linux_hotspot_11.0.7_10.tar.gz", - "https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk-11.0.7+10/OpenJDK11U-jdk_ppc64le_linux_hotspot_11.0.7_10.tar.gz" - ] - }, - "remotejdk11_linux_s390x": { - "build_file": "@bazel_tools//tools/jdk:jdk.BUILD", - "generator_function": "maybe", - "generator_name": "remotejdk11_linux_s390x", - "name": "remotejdk11_linux_s390x", - "sha256": "d9b72e87a1d3ebc0c9552f72ae5eb150fffc0298a7cb841f1ce7bfc70dcd1059", - "strip_prefix": "jdk-11.0.7+10", - "urls": [ - "https://mirror.bazel.build/github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk-11.0.7+10/OpenJDK11U-jdk_s390x_linux_hotspot_11.0.7_10.tar.gz", - "https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk-11.0.7+10/OpenJDK11U-jdk_s390x_linux_hotspot_11.0.7_10.tar.gz" - ] - }, - "remotejdk11_linux_s390x_for_testing": { - "build_file": "@local_jdk//:BUILD.bazel", - "name": "remotejdk11_linux_s390x_for_testing", - "patch_cmds": [ - "test -f BUILD.bazel && chmod u+w BUILD.bazel || true", - "echo >> BUILD.bazel", - "echo 'exports_files([\"WORKSPACE\"], visibility = [\"//visibility:public\"])' >> BUILD.bazel" - ], - "patch_cmds_win": [ - "Add-Content -Path BUILD.bazel -Value \"`nexports_files([`\"WORKSPACE`\"], visibility = [`\"//visibility:public`\"])`n\" -Force" - ], - "sha256": "d9b72e87a1d3ebc0c9552f72ae5eb150fffc0298a7cb841f1ce7bfc70dcd1059", - "strip_prefix": "jdk-11.0.7+10", - "urls": [ - "https://mirror.bazel.build/github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk-11.0.7+10/OpenJDK11U-jdk_s390x_linux_hotspot_11.0.7_10.tar.gz", - "https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk-11.0.7+10/OpenJDK11U-jdk_s390x_linux_hotspot_11.0.7_10.tar.gz" - ] - }, - "remotejdk11_macos": { - "build_file": "@bazel_tools//tools/jdk:jdk.BUILD", - "generator_function": "maybe", - "generator_name": "remotejdk11_macos", - "name": "remotejdk11_macos", - "sha256": "e1fe56769f32e2aaac95e0a8f86b5a323da5af3a3b4bba73f3086391a6cc056f", - "strip_prefix": "zulu11.37.17-ca-jdk11.0.6-macosx_x64", - "urls": [ - "https://mirror.bazel.build/openjdk/azul-zulu11.37.17-ca-jdk11.0.6/zulu11.37.17-ca-jdk11.0.6-macosx_x64.tar.gz" - ] - }, - "remotejdk11_macos_aarch64_for_testing": { - "build_file": "@local_jdk//:BUILD.bazel", - "name": "remotejdk11_macos_aarch64_for_testing", - "patch_cmds": [ - "test -f BUILD.bazel && chmod u+w BUILD.bazel || true", - "echo >> BUILD.bazel", - "echo 'exports_files([\"WORKSPACE\"], visibility = [\"//visibility:public\"])' >> BUILD.bazel" - ], - "patch_cmds_win": [ - "Add-Content -Path BUILD.bazel -Value \"`nexports_files([`\"WORKSPACE`\"], visibility = [`\"//visibility:public`\"])`n\" -Force" - ], - "sha256": "3dcc636e64ae58b922269c2dc9f20f6f967bee90e3f6847d643c4a566f1e8d8a", - "strip_prefix": "zulu11.45.27-ca-jdk11.0.10-macosx_aarch64", - "urls": [ - "https://mirror.bazel.build/cdn.azul.com/zulu/bin/zulu11.45.27-ca-jdk11.0.10-macosx_aarch64.tar.gz", - "https://cdn.azul.com/zulu/bin/zulu11.45.27-ca-jdk11.0.10-macosx_aarch64.tar.gz" - ] - }, - "remotejdk11_macos_for_testing": { - "build_file": "@local_jdk//:BUILD.bazel", - "name": "remotejdk11_macos_for_testing", - "patch_cmds": [ - "test -f BUILD.bazel && chmod u+w BUILD.bazel || true", - "echo >> BUILD.bazel", - "echo 'exports_files([\"WORKSPACE\"], visibility = [\"//visibility:public\"])' >> BUILD.bazel" - ], - "patch_cmds_win": [ - "Add-Content -Path BUILD.bazel -Value \"`nexports_files([`\"WORKSPACE`\"], visibility = [`\"//visibility:public`\"])`n\" -Force" - ], - "sha256": "e1fe56769f32e2aaac95e0a8f86b5a323da5af3a3b4bba73f3086391a6cc056f", - "strip_prefix": "zulu11.37.17-ca-jdk11.0.6-macosx_x64", - "urls": [ - "https://mirror.bazel.build/openjdk/azul-zulu11.37.17-ca-jdk11.0.6/zulu11.37.17-ca-jdk11.0.6-macosx_x64.tar.gz" - ] - }, - "remotejdk11_win": { - "build_file": "@bazel_tools//tools/jdk:jdk.BUILD", - "generator_function": "maybe", - "generator_name": "remotejdk11_win", - "name": "remotejdk11_win", - "sha256": "a9695617b8374bfa171f166951214965b1d1d08f43218db9a2a780b71c665c18", - "strip_prefix": "zulu11.37.17-ca-jdk11.0.6-win_x64", - "urls": [ - "https://mirror.bazel.build/openjdk/azul-zulu11.37.17-ca-jdk11.0.6/zulu11.37.17-ca-jdk11.0.6-win_x64.zip" - ] - }, - "remotejdk11_win_for_testing": { - "build_file": "@local_jdk//:BUILD.bazel", - "name": "remotejdk11_win_for_testing", - "patch_cmds": [ - "test -f BUILD.bazel && chmod u+w BUILD.bazel || true", - "echo >> BUILD.bazel", - "echo 'exports_files([\"WORKSPACE\"], visibility = [\"//visibility:public\"])' >> BUILD.bazel" - ], - "patch_cmds_win": [ - "Add-Content -Path BUILD.bazel -Value \"`nexports_files([`\"WORKSPACE`\"], visibility = [`\"//visibility:public`\"])`n\" -Force" - ], - "sha256": "a9695617b8374bfa171f166951214965b1d1d08f43218db9a2a780b71c665c18", - "strip_prefix": "zulu11.37.17-ca-jdk11.0.6-win_x64", - "urls": [ - "https://mirror.bazel.build/openjdk/azul-zulu11.37.17-ca-jdk11.0.6/zulu11.37.17-ca-jdk11.0.6-win_x64.zip" - ] - }, - "remotejdk14_linux": { - "build_file": "@bazel_tools//tools/jdk:jdk.BUILD", - "generator_function": "maybe", - "generator_name": "remotejdk14_linux", - "name": "remotejdk14_linux", - "sha256": "48bb8947034cd079ad1ef83335e7634db4b12a26743a0dc314b6b861480777aa", - "strip_prefix": "zulu14.28.21-ca-jdk14.0.1-linux_x64", - "urls": [ - "https://mirror.bazel.build/cdn.azul.com/zulu/bin/zulu14.28.21-ca-jdk14.0.1-linux_x64.tar.gz" - ] - }, - "remotejdk14_linux_for_testing": { - "build_file": "@local_jdk//:BUILD.bazel", - "name": "remotejdk14_linux_for_testing", - "patch_cmds": [ - "test -f BUILD.bazel && chmod u+w BUILD.bazel || true", - "echo >> BUILD.bazel", - "echo 'exports_files([\"WORKSPACE\"], visibility = [\"//visibility:public\"])' >> BUILD.bazel" - ], - "patch_cmds_win": [ - "Add-Content -Path BUILD.bazel -Value \"`nexports_files([`\"WORKSPACE`\"], visibility = [`\"//visibility:public`\"])`n\" -Force" - ], - "sha256": "48bb8947034cd079ad1ef83335e7634db4b12a26743a0dc314b6b861480777aa", - "strip_prefix": "zulu14.28.21-ca-jdk14.0.1-linux_x64", - "urls": [ - "https://mirror.bazel.build/cdn.azul.com/zulu/bin/zulu14.28.21-ca-jdk14.0.1-linux_x64.tar.gz" - ] - }, - "remotejdk14_macos": { - "build_file": "@bazel_tools//tools/jdk:jdk.BUILD", - "generator_function": "maybe", - "generator_name": "remotejdk14_macos", - "name": "remotejdk14_macos", - "sha256": "088bd4d0890acc9f032b738283bf0f26b2a55c50b02d1c8a12c451d8ddf080dd", - "strip_prefix": "zulu14.28.21-ca-jdk14.0.1-macosx_x64", - "urls": [ - "https://mirror.bazel.build/cdn.azul.com/zulu/bin/zulu14.28.21-ca-jdk14.0.1-macosx_x64.tar.gz" - ] - }, - "remotejdk14_macos_for_testing": { - "build_file": "@local_jdk//:BUILD.bazel", - "name": "remotejdk14_macos_for_testing", - "patch_cmds": [ - "test -f BUILD.bazel && chmod u+w BUILD.bazel || true", - "echo >> BUILD.bazel", - "echo 'exports_files([\"WORKSPACE\"], visibility = [\"//visibility:public\"])' >> BUILD.bazel" - ], - "patch_cmds_win": [ - "Add-Content -Path BUILD.bazel -Value \"`nexports_files([`\"WORKSPACE`\"], visibility = [`\"//visibility:public`\"])`n\" -Force" - ], - "sha256": "088bd4d0890acc9f032b738283bf0f26b2a55c50b02d1c8a12c451d8ddf080dd", - "strip_prefix": "zulu14.28.21-ca-jdk14.0.1-macosx_x64", - "urls": [ - "https://mirror.bazel.build/cdn.azul.com/zulu/bin/zulu14.28.21-ca-jdk14.0.1-macosx_x64.tar.gz" - ] - }, - "remotejdk14_win": { - "build_file": "@bazel_tools//tools/jdk:jdk.BUILD", - "generator_function": "maybe", - "generator_name": "remotejdk14_win", - "name": "remotejdk14_win", - "sha256": "9cb078b5026a900d61239c866161f0d9558ec759aa15c5b4c7e905370e868284", - "strip_prefix": "zulu14.28.21-ca-jdk14.0.1-win_x64", - "urls": [ - "https://mirror.bazel.build/cdn.azul.com/zulu/bin/zulu14.28.21-ca-jdk14.0.1-win_x64.zip" - ] - }, - "remotejdk14_win_for_testing": { - "build_file": "@local_jdk//:BUILD.bazel", - "name": "remotejdk14_win_for_testing", - "patch_cmds": [ - "test -f BUILD.bazel && chmod u+w BUILD.bazel || true", - "echo >> BUILD.bazel", - "echo 'exports_files([\"WORKSPACE\"], visibility = [\"//visibility:public\"])' >> BUILD.bazel" - ], - "patch_cmds_win": [ - "Add-Content -Path BUILD.bazel -Value \"`nexports_files([`\"WORKSPACE`\"], visibility = [`\"//visibility:public`\"])`n\" -Force" - ], - "sha256": "9cb078b5026a900d61239c866161f0d9558ec759aa15c5b4c7e905370e868284", - "strip_prefix": "zulu14.28.21-ca-jdk14.0.1-win_x64", - "urls": [ - "https://mirror.bazel.build/cdn.azul.com/zulu/bin/zulu14.28.21-ca-jdk14.0.1-win_x64.zip" - ] - }, - "remotejdk15_linux_for_testing": { - "build_file": "@local_jdk//:BUILD.bazel", - "name": "remotejdk15_linux_for_testing", - "patch_cmds": [ - "test -f BUILD.bazel && chmod u+w BUILD.bazel || true", - "echo >> BUILD.bazel", - "echo 'exports_files([\"WORKSPACE\"], visibility = [\"//visibility:public\"])' >> BUILD.bazel" - ], - "patch_cmds_win": [ - "Add-Content -Path BUILD.bazel -Value \"`nexports_files([`\"WORKSPACE`\"], visibility = [`\"//visibility:public`\"])`n\" -Force" - ], - "sha256": "0a38f1138c15a4f243b75eb82f8ef40855afcc402e3c2a6de97ce8235011b1ad", - "strip_prefix": "zulu15.27.17-ca-jdk15.0.0-linux_x64", - "urls": [ - "https://mirror.bazel.build/cdn.azul.com/zulu/bin/zulu15.27.17-ca-jdk15.0.0-linux_x64.tar.gz", - "https://cdn.azul.com/zulu/bin/zulu15.27.17-ca-jdk15.0.0-linux_x64.tar.gz" - ] - }, - "remotejdk15_macos_aarch64_for_testing": { - "build_file": "@local_jdk//:BUILD.bazel", - "name": "remotejdk15_macos_aarch64_for_testing", - "patch_cmds": [ - "test -f BUILD.bazel && chmod u+w BUILD.bazel || true", - "echo >> BUILD.bazel", - "echo 'exports_files([\"WORKSPACE\"], visibility = [\"//visibility:public\"])' >> BUILD.bazel" - ], - "patch_cmds_win": [ - "Add-Content -Path BUILD.bazel -Value \"`nexports_files([`\"WORKSPACE`\"], visibility = [`\"//visibility:public`\"])`n\" -Force" - ], - "sha256": "2613c3f15eef6b6ecd0fd102da92282b985e4573905dc902f1783d8059c1efc5", - "strip_prefix": "zulu15.29.15-ca-jdk15.0.2-macosx_aarch64", - "urls": [ - "https://mirror.bazel.build/cdn.azul.com/zulu/bin/zulu15.29.15-ca-jdk15.0.2-macosx_aarch64.tar.gz", - "https://cdn.azul.com/zulu/bin/zulu15.29.15-ca-jdk15.0.2-macosx_aarch64.tar.gz" - ] - }, - "remotejdk15_macos_for_testing": { - "build_file": "@local_jdk//:BUILD.bazel", - "name": "remotejdk15_macos_for_testing", - "patch_cmds": [ - "test -f BUILD.bazel && chmod u+w BUILD.bazel || true", - "echo >> BUILD.bazel", - "echo 'exports_files([\"WORKSPACE\"], visibility = [\"//visibility:public\"])' >> BUILD.bazel" - ], - "patch_cmds_win": [ - "Add-Content -Path BUILD.bazel -Value \"`nexports_files([`\"WORKSPACE`\"], visibility = [`\"//visibility:public`\"])`n\" -Force" - ], - "sha256": "f80b2e0512d9d8a92be24497334c974bfecc8c898fc215ce0e76594f00437482", - "strip_prefix": "zulu15.27.17-ca-jdk15.0.0-macosx_x64", - "urls": [ - "https://mirror.bazel.build/cdn.azul.com/zulu/bin/zulu15.27.17-ca-jdk15.0.0-macosx_x64.tar.gz", - "https://cdn.azul.com/zulu/bin/zulu15.27.17-ca-jdk15.0.0-macosx_x64.tar.gz" - ] - }, - "remotejdk15_win_for_testing": { - "build_file": "@local_jdk//:BUILD.bazel", - "name": "remotejdk15_win_for_testing", - "patch_cmds": [ - "test -f BUILD.bazel && chmod u+w BUILD.bazel || true", - "echo >> BUILD.bazel", - "echo 'exports_files([\"WORKSPACE\"], visibility = [\"//visibility:public\"])' >> BUILD.bazel" - ], - "patch_cmds_win": [ - "Add-Content -Path BUILD.bazel -Value \"`nexports_files([`\"WORKSPACE`\"], visibility = [`\"//visibility:public`\"])`n\" -Force" - ], - "sha256": "f535a530151e6c20de8a3078057e332b08887cb3ba1a4735717357e72765cad6", - "strip_prefix": "zulu15.27.17-ca-jdk15.0.0-win_x64", - "urls": [ - "https://mirror.bazel.build/cdn.azul.com/zulu/bin/zulu15.27.17-ca-jdk15.0.0-win_x64.zip", - "https://cdn.azul.com/zulu/bin/zulu15.27.17-ca-jdk15.0.0-win_x64.zip" - ] - }, - "rules_cc": { - "name": "rules_cc", - "patch_cmds": [ - "test -f BUILD && chmod u+w BUILD || true", - "echo >> BUILD", - "echo 'exports_files([\"WORKSPACE\"], visibility = [\"//visibility:public\"])' >> BUILD" - ], - "patch_cmds_win": [ - "Add-Content -Path BUILD -Value \"`nexports_files([`\"WORKSPACE`\"], visibility = [`\"//visibility:public`\"])`n\" -Force" - ], - "sha256": "d0c573b94a6ef20ef6ff20154a23d0efcb409fb0e1ff0979cec318dfe42f0cdd", - "strip_prefix": "rules_cc-b1c40e1de81913a3c40e5948f78719c28152486d", - "urls": [ - "https://mirror.bazel.build/github.com/bazelbuild/rules_cc/archive/b1c40e1de81913a3c40e5948f78719c28152486d.zip", - "https://github.com/bazelbuild/rules_cc/archive/b1c40e1de81913a3c40e5948f78719c28152486d.zip" - ] - }, - "rules_java": { - "name": "rules_java", - "patch_cmds": [ - "test -f BUILD && chmod u+w BUILD || true", - "echo >> BUILD", - "echo 'exports_files([\"WORKSPACE\"], visibility = [\"//visibility:public\"])' >> BUILD" - ], - "patch_cmds_win": [ - "Add-Content -Path BUILD -Value \"`nexports_files([`\"WORKSPACE`\"], visibility = [`\"//visibility:public`\"])`n\" -Force" - ], - "sha256": "bc81f1ba47ef5cc68ad32225c3d0e70b8c6f6077663835438da8d5733f917598", - "strip_prefix": "rules_java-7cf3cefd652008d0a64a419c34c13bdca6c8f178", - "urls": [ - "https://mirror.bazel.build/github.com/bazelbuild/rules_java/archive/7cf3cefd652008d0a64a419c34c13bdca6c8f178.zip", - "https://github.com/bazelbuild/rules_java/archive/7cf3cefd652008d0a64a419c34c13bdca6c8f178.zip" - ] - }, - "rules_nodejs-2.2.2.tar.gz": { - "name": "rules_nodejs-2.2.2.tar.gz", - "sha256": "f2194102720e662dbf193546585d705e645314319554c6ce7e47d8b59f459e9c", - "urls": [ - "https://mirror.bazel.build/github.com/bazelbuild/rules_nodejs/releases/download/2.2.2/rules_nodejs-2.2.2.tar.gz", - "https://github.com/bazelbuild/rules_nodejs/releases/download/2.2.2/rules_nodejs-2.2.2.tar.gz" - ] - }, - "rules_pkg": { - "name": "rules_pkg", - "patch_cmds": [ - "test -f BUILD && chmod u+w BUILD || true", - "echo >> BUILD", - "echo 'exports_files([\"WORKSPACE\"], visibility = [\"//visibility:public\"])' >> BUILD" - ], - "patch_cmds_win": [ - "Add-Content -Path BUILD -Value \"`nexports_files([`\"WORKSPACE`\"], visibility = [`\"//visibility:public`\"])`n\" -Force" - ], - "sha256": "4ba8f4ab0ff85f2484287ab06c0d871dcb31cc54d439457d28fd4ae14b18450a", - "urls": [ - "https://mirror.bazel.build/github.com/bazelbuild/rules_pkg/releases/download/0.2.4/rules_pkg-0.2.4.tar.gz", - "https://github.com/bazelbuild/rules_pkg/releases/download/0.2.4/rules_pkg-0.2.4.tar.gz" - ] - }, - "rules_pkg-0.2.4.tar.gz": { - "name": "rules_pkg-0.2.4.tar.gz", - "sha256": "4ba8f4ab0ff85f2484287ab06c0d871dcb31cc54d439457d28fd4ae14b18450a", - "urls": [ - "https://mirror.bazel.build/github.com/bazelbuild/rules_pkg/releases/download/0.2.4/rules_pkg-0.2.4.tar.gz", - "https://github.com/bazelbuild/rules_pkg/releases/download/0.2.4/rules_pkg-0.2.4.tar.gz" - ] - }, - "rules_proto": { - "name": "rules_proto", - "patch_cmds": [ - "test -f BUILD.bazel && chmod u+w BUILD.bazel || true", - "echo >> BUILD.bazel", - "echo 'exports_files([\"WORKSPACE\"], visibility = [\"//visibility:public\"])' >> BUILD.bazel" - ], - "patch_cmds_win": [ - "Add-Content -Path BUILD.bazel -Value \"`nexports_files([`\"WORKSPACE`\"], visibility = [`\"//visibility:public`\"])`n\" -Force" - ], - "sha256": "8e7d59a5b12b233be5652e3d29f42fba01c7cbab09f6b3a8d0a57ed6d1e9a0da", - "strip_prefix": "rules_proto-7e4afce6fe62dbff0a4a03450143146f9f2d7488", - "urls": [ - "https://mirror.bazel.build/github.com/bazelbuild/rules_proto/archive/7e4afce6fe62dbff0a4a03450143146f9f2d7488.tar.gz", - "https://github.com/bazelbuild/rules_proto/archive/7e4afce6fe62dbff0a4a03450143146f9f2d7488.tar.gz" - ] - }, - "six": { - "build_file": "@com_github_grpc_grpc//third_party:six.BUILD", - "generator_function": "grpc_deps", - "generator_name": "six", - "name": "six", - "sha256": "d16a0141ec1a18405cd4ce8b4613101da75da0e9a7aec5bdd4fa804d0e0eba73", - "urls": [ - "https://files.pythonhosted.org/packages/dd/bf/4138e7bfb757de47d1f4b6994648ec67a51efe58fa907c1e11e350cddfca/six-1.12.0.tar.gz" - ] - }, - "upb": { - "generator_function": "grpc_deps", - "generator_name": "upb", - "name": "upb", - "sha256": "7992217989f3156f8109931c1fc6db3434b7414957cb82371552377beaeb9d6c", - "strip_prefix": "upb-382d5afc60e05470c23e8de19b19fc5ad231e732", - "urls": [ - "https://storage.googleapis.com/grpc-bazel-mirror/github.com/protocolbuffers/upb/archive/382d5afc60e05470c23e8de19b19fc5ad231e732.tar.gz", - "https://github.com/protocolbuffers/upb/archive/382d5afc60e05470c23e8de19b19fc5ad231e732.tar.gz" - ] - }, - "v1.33.1.tar.gz": { - "name": "v1.33.1.tar.gz", - "sha256": "58eaee5c0f1bd0b92ebe1fa0606ec8f14798500620e7444726afcaf65041cb63", - "urls": [ - "https://mirror.bazel.build/github.com/grpc/grpc/archive/v1.33.1.tar.gz", - "https://github.com/grpc/grpc/archive/v1.33.1.tar.gz" - ] - }, - "v3.13.0.tar.gz": { - "name": "v3.13.0.tar.gz", - "sha256": "9b4ee22c250fe31b16f1a24d61467e40780a3fbb9b91c3b65be2a376ed913a1a", - "urls": [ - "https://mirror.bazel.build/github.com/protocolbuffers/protobuf/archive/v3.13.0.tar.gz", - "https://github.com/protocolbuffers/protobuf/archive/v3.13.0.tar.gz" - ] - }, - "zlib": { - "build_file": "@com_github_grpc_grpc//third_party:zlib.BUILD", - "generator_function": "grpc_deps", - "generator_name": "zlib", - "name": "zlib", - "sha256": "6d4d6640ca3121620995ee255945161821218752b551a1a180f4215f7d124d45", - "strip_prefix": "zlib-cacf7f1d4e3d44d871b605da3b647f07d718623f", - "urls": [ - "https://storage.googleapis.com/grpc-bazel-mirror/github.com/madler/zlib/archive/cacf7f1d4e3d44d871b605da3b647f07d718623f.tar.gz", - "https://github.com/madler/zlib/archive/cacf7f1d4e3d44d871b605da3b647f07d718623f.tar.gz" - ] - }, - "zulu11.37.17-ca-jdk11.0.6-linux_x64.tar.gz": { - "name": "zulu11.37.17-ca-jdk11.0.6-linux_x64.tar.gz", - "sha256": "360626cc19063bc411bfed2914301b908a8f77a7919aaea007a977fa8fb3cde1", - "urls": [ - "https://mirror.bazel.build/openjdk/azul-zulu11.37.17-ca-jdk11.0.6/zulu11.37.17-ca-jdk11.0.6-linux_x64.tar.gz" - ] - }, - "zulu11.37.17-ca-jdk11.0.6-macosx_x64.tar.gz": { - "name": "zulu11.37.17-ca-jdk11.0.6-macosx_x64.tar.gz", - "sha256": "e1fe56769f32e2aaac95e0a8f86b5a323da5af3a3b4bba73f3086391a6cc056f", - "urls": [ - "https://mirror.bazel.build/openjdk/azul-zulu11.37.17-ca-jdk11.0.6/zulu11.37.17-ca-jdk11.0.6-macosx_x64.tar.gz" - ] - }, - "zulu11.37.17-ca-jdk11.0.6-win_x64.zip": { - "name": "zulu11.37.17-ca-jdk11.0.6-win_x64.zip", - "sha256": "a9695617b8374bfa171f166951214965b1d1d08f43218db9a2a780b71c665c18", - "urls": [ - "https://mirror.bazel.build/openjdk/azul-zulu11.37.17-ca-jdk11.0.6/zulu11.37.17-ca-jdk11.0.6-win_x64.zip" - ] - }, - "zulu11.37.48-ca-jdk11.0.6-linux_aarch64.tar.gz": { - "name": "zulu11.37.48-ca-jdk11.0.6-linux_aarch64.tar.gz", - "sha256": "a452f1b9682d9f83c1c14e54d1446e1c51b5173a3a05dcb013d380f9508562e4", - "urls": [ - "https://mirror.bazel.build/openjdk/azul-zulu11.37.48-ca-jdk11.0.6/zulu11.37.48-ca-jdk11.0.6-linux_aarch64.tar.gz" - ] - }, - "zulu11.45.27-ca-jdk11.0.10-macosx_aarch64.tar.gz": { - "name": "zulu11.45.27-ca-jdk11.0.10-macosx_aarch64.tar.gz", - "sha256": "3dcc636e64ae58b922269c2dc9f20f6f967bee90e3f6847d643c4a566f1e8d8a", - "urls": [ - "https://mirror.bazel.build/cdn.azul.com/zulu/bin/zulu11.45.27-ca-jdk11.0.10-macosx_aarch64.tar.gz" - ] - } -} diff --git a/pkgs/development/tools/build-managers/bazel/bazel_4/upb-clang16.patch b/pkgs/development/tools/build-managers/bazel/bazel_4/upb-clang16.patch deleted file mode 100644 index 34bb71747b17..000000000000 --- a/pkgs/development/tools/build-managers/bazel/bazel_4/upb-clang16.patch +++ /dev/null @@ -1,57 +0,0 @@ -diff --git a/WORKSPACE b/WORKSPACE -index 2d995f095e..55fddef663 100644 ---- a/WORKSPACE -+++ b/WORKSPACE -@@ -1232,7 +1232,7 @@ register_toolchains("//src/main/res:empty_rc_toolchain") - http_archive( - name = "com_github_grpc_grpc", - patch_args = ["-p1"], -- patches = ["//third_party/grpc:grpc_1.33.1.patch"], -+ patches = ["//third_party/grpc:grpc_1.33.1.patch", "//:grpc-upb-clang16.patch"], - sha256 = "58eaee5c0f1bd0b92ebe1fa0606ec8f14798500620e7444726afcaf65041cb63", - strip_prefix = "grpc-1.33.1", - urls = [ -diff --git a/grpc-upb-clang16.patch b/grpc-upb-clang16.patch -new file mode 100644 -index 0000000000..ae6a7ad0e0 ---- /dev/null -+++ b/grpc-upb-clang16.patch -@@ -0,0 +1,13 @@ -+diff -r -u a/bazel/grpc_deps.bzl b/bazel/grpc_deps.bzl -+--- a/bazel/grpc_deps.bzl -++++ b/bazel/grpc_deps.bzl -+@@ -285,6 +285,8 @@ -+ name = "upb", -+ sha256 = "7992217989f3156f8109931c1fc6db3434b7414957cb82371552377beaeb9d6c", -+ strip_prefix = "upb-382d5afc60e05470c23e8de19b19fc5ad231e732", -++ patches = ["//:upb-clang16.patch"], -++ patch_args = ["-p1"], -+ urls = [ -+ "https://storage.googleapis.com/grpc-bazel-mirror/github.com/protocolbuffers/upb/archive/382d5afc60e05470c23e8de19b19fc5ad231e732.tar.gz", -+ "https://github.com/protocolbuffers/upb/archive/382d5afc60e05470c23e8de19b19fc5ad231e732.tar.gz", -+ -diff --git a/upb-clang16.patch b/upb-clang16.patch -new file mode 100644 -index 0000000000..b799737fac ---- /dev/null -+++ b/upb-clang16.patch -@@ -0,0 +1,18 @@ -+--- a/BUILD -++++ b/BUILD -+@@ -34,6 +34,7 @@ -+ "-Wextra", -+ # "-Wshorten-64-to-32", # not in GCC (and my Kokoro images doesn't have Clang) -+ "-Werror", -++ "-Wno-gnu-offsetof-extensions", -+ "-Wno-long-long", -+ # copybara:strip_end -+ ] -+@@ -42,6 +43,7 @@ -+ # copybara:strip_for_google3_begin -+ "-pedantic", -+ "-Werror=pedantic", -++ "-Wno-gnu-offsetof-extensions", -+ "-Wstrict-prototypes", -+ # copybara:strip_end -+ ] - diff --git a/pkgs/development/tools/build-managers/bazel/bazel_4/update-srcDeps.py b/pkgs/development/tools/build-managers/bazel/bazel_4/update-srcDeps.py deleted file mode 100755 index 9e998e05875e..000000000000 --- a/pkgs/development/tools/build-managers/bazel/bazel_4/update-srcDeps.py +++ /dev/null @@ -1,54 +0,0 @@ -#!/usr/bin/env python3 -import sys -import json - -if len(sys.argv) != 2: - print("usage: ./this-script src-deps.json < WORKSPACE", file=sys.stderr) - print("Takes the bazel WORKSPACE file and reads all archives into a json dict (by evaling it as python code)", file=sys.stderr) - print("Hail Eris.", file=sys.stderr) - sys.exit(1) - -http_archives = [] - -# just the kw args are the dict { name, sha256, urls … } -def http_archive(**kw): - http_archives.append(kw) -# like http_file -def http_file(**kw): - http_archives.append(kw) - -# this is inverted from http_archive/http_file and bundles multiple archives -def distdir_tar(**kw): - for archive_name in kw['archives']: - http_archives.append({ - "name": archive_name, - "sha256": kw['sha256'][archive_name], - "urls": kw['urls'][archive_name] - }) - -# TODO? -def git_repository(**kw): - print(json.dumps(kw, sort_keys=True, indent=4), file=sys.stderr) - sys.exit(1) - -# execute the WORKSPACE like it was python code in this module, -# using all the function stubs from above. -exec(sys.stdin.read()) - -# transform to a dict with the names as keys -d = { el['name']: el for el in http_archives } - -def has_urls(el): - return ('url' in el and el['url']) or ('urls' in el and el['urls']) -def has_sha256(el): - return 'sha256' in el and el['sha256'] -bad_archives = list(filter(lambda el: not has_urls(el) or not has_sha256(el), d.values())) -if bad_archives: - print('Following bazel dependencies are missing url or sha256', file=sys.stderr) - print('Check bazel sources for master or non-checksummed dependencies', file=sys.stderr) - for el in bad_archives: - print(json.dumps(el, sort_keys=True, indent=4), file=sys.stderr) - sys.exit(1) - -with open(sys.argv[1], "w") as f: - print(json.dumps(d, sort_keys=True, indent=4), file=f) diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index e9ac017bf1b5..28ee46900ded 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -97,6 +97,7 @@ mapAliases ({ bashInteractive_5 = bashInteractive; # Added 2021-08-20 bash_5 = bash; # Added 2021-08-20 bazel_3 = throw "bazel 3 is past end of life as it is not an lts version"; # Added 2023-02-02 + bazel_4 = throw "'bazel_4' has been removed from nixpkgs as it has reached end of life"; # Added 2024-01-23 bedup = throw "bedup was removed because it was broken and abandoned upstream"; # added 2023-02-04 bee-unstable = throw "bee-unstable has been removed, use 'bee' instead"; # Added 2024-02-12 bee-clef = throw "bee-clef has been removed as the upstream project was archived"; # Added 2024-02-12 diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 5b688c8bcf2c..0af8fa29174d 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -18338,18 +18338,6 @@ with pkgs; bazel = bazel_6; - bazel_4 = callPackage ../development/tools/build-managers/bazel/bazel_4 { - inherit (darwin) cctools; - inherit (darwin.apple_sdk.frameworks) CoreFoundation CoreServices Foundation; - buildJdk = jdk11_headless; - buildJdkName = "java11"; - runJdk = jdk11_headless; - stdenv = if stdenv.cc.isClang then llvmPackages.stdenv - else if stdenv.cc.isGNU then gcc10Stdenv - else stdenv; - bazel_self = bazel_4; - }; - bazel_5 = callPackage ../development/tools/build-managers/bazel/bazel_5 { inherit (darwin) cctools sigtool; inherit (darwin.apple_sdk.frameworks) CoreFoundation CoreServices Foundation; From ed15ce139f188e3d102efed2679df997a9b6f451 Mon Sep 17 00:00:00 2001 From: Weijia Wang <9713184+wegank@users.noreply.github.com> Date: Sun, 10 Mar 2024 23:54:13 +0100 Subject: [PATCH 110/230] wordpress: 6.4.2 -> 6.4.3 --- pkgs/servers/web-apps/wordpress/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/web-apps/wordpress/default.nix b/pkgs/servers/web-apps/wordpress/default.nix index f4a9d05e8d94..f1a73feab865 100644 --- a/pkgs/servers/web-apps/wordpress/default.nix +++ b/pkgs/servers/web-apps/wordpress/default.nix @@ -5,7 +5,7 @@ hash = "sha256-Jo2/Vlm4Ml24ucPI6ZHs2mkbpY2rZB1dofmGXNPweA8="; }; wordpress6_4 = { - version = "6.4.2"; - hash = "sha256-m4KJELf5zs3gwAQPmAhoPe2rhopZFsYN6OzAv6Wzo6c="; + version = "6.4.3"; + hash = "sha256-PwjHHRlwhEH9q94bPq34NnQv3uhm1kOpjRAu0/ECaYY="; }; } From 6cdf65ea14c6e638f796ca32ef9e8f9f82ce2e50 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 10 Mar 2024 22:56:31 +0000 Subject: [PATCH 111/230] libretro.ppsspp: unstable-2024-02-28 -> unstable-2024-03-10 --- pkgs/applications/emulators/retroarch/hashes.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/emulators/retroarch/hashes.json b/pkgs/applications/emulators/retroarch/hashes.json index 558c24a2ed88..c7ea6eb758bc 100644 --- a/pkgs/applications/emulators/retroarch/hashes.json +++ b/pkgs/applications/emulators/retroarch/hashes.json @@ -662,11 +662,11 @@ "src": { "owner": "hrydgard", "repo": "ppsspp", - "rev": "0159102a191d43de7ae51775a79846efa2635988", - "hash": "sha256-b7QOOpeoVJUComVOlMtZK8B5w5vkE6rxJVEHecJE19k=", + "rev": "a0aaab9c47bae66fd834354977a562baec581a54", + "hash": "sha256-N+s4BzOsXUMqdOnfy0Th8euaD2EvRoYEie706RNuIoo=", "fetchSubmodules": true }, - "version": "unstable-2024-02-28" + "version": "unstable-2024-03-10" }, "prboom": { "fetcher": "fetchFromGitHub", From 0fb8f21862f7a67433e5d28496fd0085fea2d935 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 10 Mar 2024 23:20:03 +0000 Subject: [PATCH 112/230] files-cli: 2.12.40 -> 2.12.41 --- pkgs/by-name/fi/files-cli/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/fi/files-cli/package.nix b/pkgs/by-name/fi/files-cli/package.nix index 67919148083f..22f5ed5fe60b 100644 --- a/pkgs/by-name/fi/files-cli/package.nix +++ b/pkgs/by-name/fi/files-cli/package.nix @@ -7,16 +7,16 @@ buildGoModule rec { pname = "files-cli"; - version = "2.12.40"; + version = "2.12.41"; src = fetchFromGitHub { repo = "files-cli"; owner = "files-com"; rev = "v${version}"; - hash = "sha256-dtHmBpszacoKHOg5PXrIQ2oPPCk1zzhvxAWULzxm3C4="; + hash = "sha256-Z/lkVZln5MBh5ETtAK9ohkDQE2leObHeVlskvsvicPc="; }; - vendorHash = "sha256-yaDc2o0vzgb0KDn3dGiXxPjEXyPNcCCQ+bEu/X1Cs3Q="; + vendorHash = "sha256-ZySp/JKFEIhWNjqSYpSvCQyJRqVmsXL8du/77XQcFMM="; ldflags = [ "-s" From 501ed2e91a47bb4c2e907ad78c8df8473976e4bf Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 10 Mar 2024 23:20:16 +0000 Subject: [PATCH 113/230] cargo-deny: 0.14.15 -> 0.14.16 --- pkgs/development/tools/rust/cargo-deny/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/tools/rust/cargo-deny/default.nix b/pkgs/development/tools/rust/cargo-deny/default.nix index c3bc211a9c0e..0d7edc5227fb 100644 --- a/pkgs/development/tools/rust/cargo-deny/default.nix +++ b/pkgs/development/tools/rust/cargo-deny/default.nix @@ -9,16 +9,16 @@ rustPlatform.buildRustPackage rec { pname = "cargo-deny"; - version = "0.14.15"; + version = "0.14.16"; src = fetchFromGitHub { owner = "EmbarkStudios"; repo = "cargo-deny"; rev = version; - hash = "sha256-soDLgxEbeNk8mQHwUzBZK5QqTURzXQKZb2LtJA6fnhc="; + hash = "sha256-Evvr9In/ny+yQP77u47uTCWCtRqg/l9B5y79va8oMbw="; }; - cargoHash = "sha256-XblrLV3AMmFFXOr3K/Sq4Vb6MknI7H92H/bDvUEUOko="; + cargoHash = "sha256-JgI4Tbl0C0lJEOMRwVjo9h6fuUL0u0mICGLsx8/0dMc="; nativeBuildInputs = [ pkg-config From d8f724631ccd20aaf04fcb682f1d0e62de443ad0 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 10 Mar 2024 23:20:18 +0000 Subject: [PATCH 114/230] libretro.fbneo: unstable-2024-03-03 -> unstable-2024-03-06 --- pkgs/applications/emulators/retroarch/hashes.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/emulators/retroarch/hashes.json b/pkgs/applications/emulators/retroarch/hashes.json index 558c24a2ed88..7349b0ed8038 100644 --- a/pkgs/applications/emulators/retroarch/hashes.json +++ b/pkgs/applications/emulators/retroarch/hashes.json @@ -287,10 +287,10 @@ "src": { "owner": "libretro", "repo": "fbneo", - "rev": "a9c41d1e1132b1a7aad48c0f8e94fcf9c7ba0f9f", - "hash": "sha256-H4pJruHqJ4p3tBykm015U+wApHrAeVaZO9nLJ9Rc0NQ=" + "rev": "6fc8060a75fd75c5b292fbef488ed8dd37c7bc34", + "hash": "sha256-Wjh6ab5kLlfX4QVv+d6YgnuvWtDat9wgJ8dQdl7MH2A=" }, - "version": "unstable-2024-03-03" + "version": "unstable-2024-03-06" }, "fceumm": { "fetcher": "fetchFromGitHub", From 946f8157d26f1839bb49e4cb6ef0613feea4f296 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 10 Mar 2024 23:20:43 +0000 Subject: [PATCH 115/230] libretro.mame2003-plus: unstable-2024-03-02 -> unstable-2024-03-10 --- pkgs/applications/emulators/retroarch/hashes.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/emulators/retroarch/hashes.json b/pkgs/applications/emulators/retroarch/hashes.json index 558c24a2ed88..8bca65c413ba 100644 --- a/pkgs/applications/emulators/retroarch/hashes.json +++ b/pkgs/applications/emulators/retroarch/hashes.json @@ -438,10 +438,10 @@ "src": { "owner": "libretro", "repo": "mame2003-plus-libretro", - "rev": "a7cb863de48247c771a0fcc71d519131eae4e9c6", - "hash": "sha256-Y/Zyfck5tJ6oVsL/WjNXJZdPE5THeyBD5tNzJQaLSn8=" + "rev": "f8b0565fd3278f2efbc3e68fc929a912645e211b", + "hash": "sha256-jOQxPUTbKQH0PKJSOItEpSHaNPzMlYOJ2CUgzSLHti4=" }, - "version": "unstable-2024-03-02" + "version": "unstable-2024-03-10" }, "mame2010": { "fetcher": "fetchFromGitHub", From 22575c852a34f67ebc33a3af429d649d120ffa0a Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 10 Mar 2024 23:47:36 +0000 Subject: [PATCH 116/230] libretro.genesis-plus-gx: unstable-2024-03-02 -> unstable-2024-03-09 --- pkgs/applications/emulators/retroarch/hashes.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/emulators/retroarch/hashes.json b/pkgs/applications/emulators/retroarch/hashes.json index 558c24a2ed88..364383810342 100644 --- a/pkgs/applications/emulators/retroarch/hashes.json +++ b/pkgs/applications/emulators/retroarch/hashes.json @@ -358,10 +358,10 @@ "src": { "owner": "libretro", "repo": "Genesis-Plus-GX", - "rev": "d434ad9ee418247490a8560b52e0651d25304f35", - "hash": "sha256-v6IYku+9hLlGD0sgkzoatdD7Glp/3pgwBE2K4hdsFec=" + "rev": "541229daa9e8f706135531c28c7abec4efd08d48", + "hash": "sha256-0yytgnO6bBt2ssapOu+6S488peeCzKS1fE7Znyk51HA=" }, - "version": "unstable-2024-03-02" + "version": "unstable-2024-03-09" }, "gpsp": { "fetcher": "fetchFromGitHub", From a601b1370b10766bbfe11e8d3efe1979808983de Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 10 Mar 2024 23:48:02 +0000 Subject: [PATCH 117/230] libretro.bsnes: unstable-2024-03-01 -> unstable-2024-03-09 --- pkgs/applications/emulators/retroarch/hashes.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/emulators/retroarch/hashes.json b/pkgs/applications/emulators/retroarch/hashes.json index 558c24a2ed88..47952fdbf529 100644 --- a/pkgs/applications/emulators/retroarch/hashes.json +++ b/pkgs/applications/emulators/retroarch/hashes.json @@ -165,10 +165,10 @@ "src": { "owner": "libretro", "repo": "bsnes-libretro", - "rev": "9e9b928e0153f663cf4802f266315ab092067b7e", - "hash": "sha256-Fn1bz3TC+8CEmGDNcll0yfzBpDPvfS1vknf49ogNCIQ=" + "rev": "9c688ea5cbbb0e8c586414e07305cfbdffbf83e2", + "hash": "sha256-tte90wZfrkkNzjsUhmGGf/eKj6vwskcQAQTdqxg9wkE=" }, - "version": "unstable-2024-03-01" + "version": "unstable-2024-03-09" }, "bsnes-hd": { "fetcher": "fetchFromGitHub", From 7cc250b5fccc316caa350f225fcc21d6f341865b Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 10 Mar 2024 23:48:08 +0000 Subject: [PATCH 118/230] libretro.flycast: unstable-2024-03-04 -> unstable-2024-03-10 --- pkgs/applications/emulators/retroarch/hashes.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/emulators/retroarch/hashes.json b/pkgs/applications/emulators/retroarch/hashes.json index 558c24a2ed88..0cabe193641a 100644 --- a/pkgs/applications/emulators/retroarch/hashes.json +++ b/pkgs/applications/emulators/retroarch/hashes.json @@ -307,11 +307,11 @@ "src": { "owner": "flyinghead", "repo": "flycast", - "rev": "391da7023f63c2afd32af72ac9f2cfb02bbc7eb6", - "hash": "sha256-fcNpFl6VwaoL2mWZOgyVoJWX9CV2KbWctukdxxo797I=", + "rev": "464defe0d791795553a6cd2f0dbe05b437ecd068", + "hash": "sha256-Gnp8MMerKweUnDg8fIoAF3vkIFVVbQdn3qjxZYLBTEY=", "fetchSubmodules": true }, - "version": "unstable-2024-03-04" + "version": "unstable-2024-03-10" }, "fmsx": { "fetcher": "fetchFromGitHub", From 74299dcad7c034fa984efbe0c4ca8d0394abc3d7 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 10 Mar 2024 23:48:27 +0000 Subject: [PATCH 119/230] libretro.gambatte: unstable-2024-03-01 -> unstable-2024-03-08 --- pkgs/applications/emulators/retroarch/hashes.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/emulators/retroarch/hashes.json b/pkgs/applications/emulators/retroarch/hashes.json index 558c24a2ed88..7bb30bed2c6a 100644 --- a/pkgs/applications/emulators/retroarch/hashes.json +++ b/pkgs/applications/emulators/retroarch/hashes.json @@ -348,10 +348,10 @@ "src": { "owner": "libretro", "repo": "gambatte-libretro", - "rev": "9806d3f12bc3a831fad3f71c6fbad6f93d83581c", - "hash": "sha256-EdqS410TZyRqE/nd/oLJt7dauN0DCtNnhB6k6CPd/tc=" + "rev": "76c875138f6ffe1b1cf983b49758004cd53785ce", + "hash": "sha256-HcZY/0JK+tqvrI70xzzEkDH8hX4Xk7ojLsSp/a3EWnk=" }, - "version": "unstable-2024-03-01" + "version": "unstable-2024-03-08" }, "genesis-plus-gx": { "fetcher": "fetchFromGitHub", From f07aebf95a8e7e83d977e7dd848f50f2230ddf81 Mon Sep 17 00:00:00 2001 From: Austin Horstman Date: Sun, 10 Mar 2024 19:05:39 -0500 Subject: [PATCH 120/230] wttrbar: 0.9.0 -> 0.9.2 --- pkgs/applications/misc/wttrbar/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/misc/wttrbar/default.nix b/pkgs/applications/misc/wttrbar/default.nix index 773c5583da93..044c617ae38b 100644 --- a/pkgs/applications/misc/wttrbar/default.nix +++ b/pkgs/applications/misc/wttrbar/default.nix @@ -7,18 +7,18 @@ rustPlatform.buildRustPackage rec { pname = "wttrbar"; - version = "0.9.0"; + version = "0.9.2"; src = fetchFromGitHub { owner = "bjesus"; repo = "wttrbar"; rev = version; - hash = "sha256-8ahXRKpVbGFX+SrR8bjUw5POzpCqmlunM5CiRzDE/IM="; + hash = "sha256-2oUj9G82+aGXU+qB37f+lRz5rctZNnb3bK8IETrt/4g="; }; buildInputs = lib.optionals stdenv.isDarwin (with darwin.apple_sdk_11_0.frameworks; [ Security SystemConfiguration ]); - cargoHash = "sha256-SsZRD6FmeB5Hz6Hs+I+5SBGazm8/mntK3Eb2FNw27Bg="; + cargoHash = "sha256-yvgqvcOxl/AmvUg6jTFtYh13sgqAWKPt2uMFHaX5OMM="; meta = { description = "A simple but detailed weather indicator for Waybar using wttr.in"; From 2013794371e75b6ca1f168c54268a3702a13ade3 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 11 Mar 2024 00:28:24 +0000 Subject: [PATCH 121/230] mkvtoolnix-cli: 82.0 -> 83.0 --- pkgs/applications/video/mkvtoolnix/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/video/mkvtoolnix/default.nix b/pkgs/applications/video/mkvtoolnix/default.nix index b6d79695f5d3..2802ed8a5b96 100644 --- a/pkgs/applications/video/mkvtoolnix/default.nix +++ b/pkgs/applications/video/mkvtoolnix/default.nix @@ -49,13 +49,13 @@ let in stdenv.mkDerivation rec { pname = "mkvtoolnix"; - version = "82.0"; + version = "83.0"; src = fetchFromGitLab { owner = "mbunkus"; repo = "mkvtoolnix"; rev = "release-${version}"; - hash = "sha256-3WULzEkjMH4PUETJeKmDKn9PdanWf581O2mI/IqN8YM="; + hash = "sha256-MHi3ewxCn560vpVfOucV34CNj/95U2OFd6bxAjtMBoc="; }; nativeBuildInputs = [ From 1711b429524c7b392296931b709b6a63bcc6c8e2 Mon Sep 17 00:00:00 2001 From: Jonas Wunderlich Date: Mon, 11 Mar 2024 01:52:27 +0100 Subject: [PATCH 122/230] maintainers: add jonas-w --- maintainers/maintainer-list.nix | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index f174f302c323..56b0f4830ea0 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -9423,6 +9423,13 @@ githubId = 392720; name = "Jon Banafato"; }; + jonas-w = { + email = "nixpkgs@03j.de"; + github = "jonas-w"; + githubId = 32615971; + name = "Jonas Wunderlich"; + matrix = "@matrix:03j.de"; + }; jonathanmarler = { email = "johnnymarler@gmail.com"; github = "marler8997"; From 8f4aac3e180413f1b0389081d48ee12c97faf124 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 11 Mar 2024 00:54:25 +0000 Subject: [PATCH 123/230] sarasa-gothic: 1.0.5 -> 1.0.6 --- pkgs/data/fonts/sarasa-gothic/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/data/fonts/sarasa-gothic/default.nix b/pkgs/data/fonts/sarasa-gothic/default.nix index 35f098442c22..f3a6b242b595 100644 --- a/pkgs/data/fonts/sarasa-gothic/default.nix +++ b/pkgs/data/fonts/sarasa-gothic/default.nix @@ -2,13 +2,13 @@ stdenvNoCC.mkDerivation rec { pname = "sarasa-gothic"; - version = "1.0.5"; + version = "1.0.6"; src = fetchurl { # Use the 'ttc' files here for a smaller closure size. # (Using 'ttf' files gives a closure size about 15x larger, as of November 2021.) url = "https://github.com/be5invis/Sarasa-Gothic/releases/download/v${version}/Sarasa-TTC-${version}.7z"; - hash = "sha256-OPoX6GNCilA8Lj9kLO6RHapU7mpZTiNa/8LL72TG1Wk="; + hash = "sha256-zoQilSAd5BpLCbTxU0Baupdc1VUxENvNEc9phFVFUoo="; }; sourceRoot = "."; From 3060321978100042f57b1593791e3d5917f589f8 Mon Sep 17 00:00:00 2001 From: Diogo Correia Date: Mon, 15 Jan 2024 18:54:10 +0100 Subject: [PATCH 124/230] pgvecto.rs: init at 0.2.1 Co-Authored-By: Daniel Albert Co-Authored-By: rina --- ...001-read-clang-flags-from-environment.diff | 19 + .../sql/postgresql/ext/pgvecto-rs/Cargo.lock | 3626 +++++++++++++++++ .../sql/postgresql/ext/pgvecto-rs/default.nix | 112 + pkgs/servers/sql/postgresql/packages.nix | 2 + 4 files changed, 3759 insertions(+) create mode 100644 pkgs/servers/sql/postgresql/ext/pgvecto-rs/0001-read-clang-flags-from-environment.diff create mode 100644 pkgs/servers/sql/postgresql/ext/pgvecto-rs/Cargo.lock create mode 100644 pkgs/servers/sql/postgresql/ext/pgvecto-rs/default.nix diff --git a/pkgs/servers/sql/postgresql/ext/pgvecto-rs/0001-read-clang-flags-from-environment.diff b/pkgs/servers/sql/postgresql/ext/pgvecto-rs/0001-read-clang-flags-from-environment.diff new file mode 100644 index 000000000000..2b145445cf15 --- /dev/null +++ b/pkgs/servers/sql/postgresql/ext/pgvecto-rs/0001-read-clang-flags-from-environment.diff @@ -0,0 +1,19 @@ +diff --git a/crates/c/build.rs b/crates/c/build.rs +index 8d822e5..8b7e371 100644 +--- a/crates/c/build.rs ++++ b/crates/c/build.rs +@@ -1,9 +1,13 @@ + fn main() { + println!("cargo:rerun-if-changed=src/c.h"); + println!("cargo:rerun-if-changed=src/c.c"); ++ println!("cargo:rerun-if-env-changed=BINDGEN_EXTRA_CLANG_ARGS"); + cc::Build::new() +- .compiler("clang-16") ++ .compiler("@clang@") + .file("./src/c.c") ++ // read env var set by rustPlatform.bindgenHook ++ .try_flags_from_environment("BINDGEN_EXTRA_CLANG_ARGS") ++ .expect("the BINDGEN_EXTRA_CLANG_ARGS environment variable must be specified and UTF-8") + .opt_level(3) + .debug(true) + .compile("pgvectorsc"); diff --git a/pkgs/servers/sql/postgresql/ext/pgvecto-rs/Cargo.lock b/pkgs/servers/sql/postgresql/ext/pgvecto-rs/Cargo.lock new file mode 100644 index 000000000000..a52b9787460e --- /dev/null +++ b/pkgs/servers/sql/postgresql/ext/pgvecto-rs/Cargo.lock @@ -0,0 +1,3626 @@ +# This file is automatically @generated by Cargo. +# It is not intended for manual editing. +version = 3 + +[[package]] +name = "addr2line" +version = "0.21.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8a30b2e23b9e17a9f90641c7ab1549cd9b44f296d3ccbf309d2863cfe398a0cb" +dependencies = [ + "gimli", +] + +[[package]] +name = "adler" +version = "1.0.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f26201604c87b1e01bd3d98f8d5d9a8fcbb815e8cedb41ffccbeb4bf593a35fe" + +[[package]] +name = "aho-corasick" +version = "1.1.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b2969dcb958b36655471fc61f7e416fa76033bdd4bfed0678d8fee1e2d07a1f0" +dependencies = [ + "memchr", +] + +[[package]] +name = "anstyle" +version = "1.0.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7079075b41f533b8c61d2a4d073c4676e1f8b249ff94a393b0595db304e0dd87" + +[[package]] +name = "anyhow" +version = "1.0.77" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c9d19de80eff169429ac1e9f48fffb163916b448a44e8e046186232046d9e1f9" + +[[package]] +name = "arc-swap" +version = "1.6.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bddcadddf5e9015d310179a59bb28c4d4b9920ad0f11e8e14dbadf654890c9a6" + +[[package]] +name = "arrayvec" +version = "0.7.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "96d30a06541fbafbc7f82ed10c06164cfbd2c401138f6addd8404629c4b16711" +dependencies = [ + "serde", +] + +[[package]] +name = "ascii-canvas" +version = "3.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8824ecca2e851cec16968d54a01dd372ef8f95b244fb84b84e70128be347c3c6" +dependencies = [ + "term", +] + +[[package]] +name = "assert-json-diff" +version = "2.0.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "47e4f2b81832e72834d7518d8487a0396a28cc408186a2e8854c0f98011faf12" +dependencies = [ + "serde", + "serde_json", +] + +[[package]] +name = "async-channel" +version = "1.9.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "81953c529336010edd6d8e358f886d9581267795c61b19475b71314bffa46d35" +dependencies = [ + "concurrent-queue", + "event-listener 2.5.3", + "futures-core", +] + +[[package]] +name = "async-channel" +version = "2.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1ca33f4bc4ed1babef42cad36cc1f51fa88be00420404e5b1e80ab1b18f7678c" +dependencies = [ + "concurrent-queue", + "event-listener 4.0.1", + "event-listener-strategy", + "futures-core", + "pin-project-lite", +] + +[[package]] +name = "async-executor" +version = "1.8.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "17ae5ebefcc48e7452b4987947920dac9450be1110cadf34d1b8c116bdbaf97c" +dependencies = [ + "async-lock 3.2.0", + "async-task", + "concurrent-queue", + "fastrand 2.0.1", + "futures-lite 2.1.0", + "slab", +] + +[[package]] +name = "async-global-executor" +version = "2.4.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "05b1b633a2115cd122d73b955eadd9916c18c8f510ec9cd1686404c60ad1c29c" +dependencies = [ + "async-channel 2.1.1", + "async-executor", + "async-io 2.2.2", + "async-lock 3.2.0", + "blocking", + "futures-lite 2.1.0", + "once_cell", +] + +[[package]] +name = "async-io" +version = "1.13.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0fc5b45d93ef0529756f812ca52e44c221b35341892d3dcc34132ac02f3dd2af" +dependencies = [ + "async-lock 2.8.0", + "autocfg", + "cfg-if", + "concurrent-queue", + "futures-lite 1.13.0", + "log", + "parking", + "polling 2.8.0", + "rustix 0.37.27", + "slab", + "socket2 0.4.10", + "waker-fn", +] + +[[package]] +name = "async-io" +version = "2.2.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6afaa937395a620e33dc6a742c593c01aced20aa376ffb0f628121198578ccc7" +dependencies = [ + "async-lock 3.2.0", + "cfg-if", + "concurrent-queue", + "futures-io", + "futures-lite 2.1.0", + "parking", + "polling 3.3.1", + "rustix 0.38.28", + "slab", + "tracing", + "windows-sys 0.52.0", +] + +[[package]] +name = "async-lock" +version = "2.8.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "287272293e9d8c41773cec55e365490fe034813a2f172f502d6ddcf75b2f582b" +dependencies = [ + "event-listener 2.5.3", +] + +[[package]] +name = "async-lock" +version = "3.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7125e42787d53db9dd54261812ef17e937c95a51e4d291373b670342fa44310c" +dependencies = [ + "event-listener 4.0.1", + "event-listener-strategy", + "pin-project-lite", +] + +[[package]] +name = "async-object-pool" +version = "0.1.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "aeb901c30ebc2fc4ab46395bbfbdba9542c16559d853645d75190c3056caf3bc" +dependencies = [ + "async-std", +] + +[[package]] +name = "async-process" +version = "1.8.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ea6438ba0a08d81529c69b36700fa2f95837bfe3e776ab39cde9c14d9149da88" +dependencies = [ + "async-io 1.13.0", + "async-lock 2.8.0", + "async-signal", + "blocking", + "cfg-if", + "event-listener 3.1.0", + "futures-lite 1.13.0", + "rustix 0.38.28", + "windows-sys 0.48.0", +] + +[[package]] +name = "async-signal" +version = "0.2.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9e47d90f65a225c4527103a8d747001fc56e375203592b25ad103e1ca13124c5" +dependencies = [ + "async-io 2.2.2", + "async-lock 2.8.0", + "atomic-waker", + "cfg-if", + "futures-core", + "futures-io", + "rustix 0.38.28", + "signal-hook-registry", + "slab", + "windows-sys 0.48.0", +] + +[[package]] +name = "async-std" +version = "1.12.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "62565bb4402e926b29953c785397c6dc0391b7b446e45008b0049eb43cec6f5d" +dependencies = [ + "async-channel 1.9.0", + "async-global-executor", + "async-io 1.13.0", + "async-lock 2.8.0", + "async-process", + "crossbeam-utils", + "futures-channel", + "futures-core", + "futures-io", + "futures-lite 1.13.0", + "gloo-timers", + "kv-log-macro", + "log", + "memchr", + "once_cell", + "pin-project-lite", + "pin-utils", + "slab", + "wasm-bindgen-futures", +] + +[[package]] +name = "async-task" +version = "4.6.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e1d90cd0b264dfdd8eb5bad0a2c217c1f88fa96a8573f40e7b12de23fb468f46" + +[[package]] +name = "async-trait" +version = "0.1.75" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fdf6721fb0140e4f897002dd086c06f6c27775df19cfe1fccb21181a48fd2c98" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.43", +] + +[[package]] +name = "atomic-polyfill" +version = "1.0.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8cf2bce30dfe09ef0bfaef228b9d414faaf7e563035494d7fe092dba54b300f4" +dependencies = [ + "critical-section", +] + +[[package]] +name = "atomic-traits" +version = "0.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b29ec3788e96fb4fdb275ccb9d62811f2fa903d76c5eb4dd6fe7d09a7ed5871f" +dependencies = [ + "cfg-if", + "rustc_version 0.3.3", +] + +[[package]] +name = "atomic-waker" +version = "1.1.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1505bd5d3d116872e7271a6d4e16d81d0c8570876c8de68093a09ac269d8aac0" + +[[package]] +name = "autocfg" +version = "1.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d468802bab17cbc0cc575e9b053f41e72aa36bfa6b7f55e3529ffa43161b97fa" + +[[package]] +name = "backtrace" +version = "0.3.69" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2089b7e3f35b9dd2d0ed921ead4f6d318c27680d4a5bd167b3ee120edb105837" +dependencies = [ + "addr2line", + "cc", + "cfg-if", + "libc", + "miniz_oxide", + "object", + "rustc-demangle", +] + +[[package]] +name = "base64" +version = "0.21.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "35636a1494ede3b646cc98f74f8e62c773a38a659ebc777a2cf26b9b74171df9" + +[[package]] +name = "basic-cookies" +version = "0.1.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cb53b6b315f924c7f113b162e53b3901c05fc9966baf84d201dfcc7432a4bb38" +dependencies = [ + "lalrpop", + "lalrpop-util", + "regex", +] + +[[package]] +name = "bincode" +version = "1.3.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b1f45e9417d87227c7a56d22e471c6206462cba514c7590c09aff4cf6d1ddcad" +dependencies = [ + "serde", +] + +[[package]] +name = "bindgen" +version = "0.68.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "726e4313eb6ec35d2730258ad4e15b547ee75d6afaa1361a922e78e59b7d8078" +dependencies = [ + "bitflags 2.4.1", + "cexpr", + "clang-sys", + "lazy_static", + "lazycell", + "peeking_take_while", + "proc-macro2", + "quote", + "regex", + "rustc-hash", + "shlex", + "syn 2.0.43", +] + +[[package]] +name = "bit-set" +version = "0.5.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0700ddab506f33b20a03b13996eccd309a48e5ff77d0d95926aa0210fb4e95f1" +dependencies = [ + "bit-vec", +] + +[[package]] +name = "bit-vec" +version = "0.6.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "349f9b6a179ed607305526ca489b34ad0a41aed5f7980fa90eb03160b69598fb" + +[[package]] +name = "bitflags" +version = "1.3.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a" + +[[package]] +name = "bitflags" +version = "2.4.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "327762f6e5a765692301e5bb513e0d9fef63be86bbc14528052b1cd3e6f03e07" + +[[package]] +name = "bitvec" +version = "1.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1bc2832c24239b0141d5674bb9174f9d68a8b5b3f2753311927c172ca46f7e9c" +dependencies = [ + "funty", + "radium", + "tap", + "wyz", +] + +[[package]] +name = "block-buffer" +version = "0.10.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3078c7629b62d3f0439517fa394996acacc5cbc91c5a20d8c658e77abd503a71" +dependencies = [ + "generic-array", +] + +[[package]] +name = "blocking" +version = "1.5.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6a37913e8dc4ddcc604f0c6d3bf2887c995153af3611de9e23c352b44c1b9118" +dependencies = [ + "async-channel 2.1.1", + "async-lock 3.2.0", + "async-task", + "fastrand 2.0.1", + "futures-io", + "futures-lite 2.1.0", + "piper", + "tracing", +] + +[[package]] +name = "bumpalo" +version = "3.14.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7f30e7476521f6f8af1a1c4c0b8cc94f0bee37d91763d0ca2665f299b6cd8aec" + +[[package]] +name = "bytemuck" +version = "1.14.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "374d28ec25809ee0e23827c2ab573d729e293f281dfe393500e7ad618baa61c6" +dependencies = [ + "bytemuck_derive", +] + +[[package]] +name = "bytemuck_derive" +version = "1.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "965ab7eb5f8f97d2a083c799f3a1b994fc397b2fe2da5d1da1626ce15a39f2b1" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.43", +] + +[[package]] +name = "byteorder" +version = "1.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1fd0f2584146f6f2ef48085050886acf353beff7305ebd1ae69500e27c67f64b" + +[[package]] +name = "bytes" +version = "1.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a2bd12c1caf447e69cd4528f47f94d203fd2582878ecb9e9465484c4148a8223" + +[[package]] +name = "c" +version = "0.0.0" +dependencies = [ + "cc", + "detect", + "half 2.3.1", + "rand", +] + +[[package]] +name = "cargo_toml" +version = "0.16.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e3f9629bc6c4388ea699781dc988c2b99766d7679b151c81990b4fa1208fafd3" +dependencies = [ + "serde", + "toml", +] + +[[package]] +name = "castaway" +version = "0.1.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a2698f953def977c68f935bb0dfa959375ad4638570e969e2f1e9f433cbf1af6" + +[[package]] +name = "cc" +version = "1.0.83" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f1174fb0b6ec23863f8b971027804a42614e347eafb0a95bf0b12cdae21fc4d0" +dependencies = [ + "libc", +] + +[[package]] +name = "cexpr" +version = "0.6.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6fac387a98bb7c37292057cffc56d62ecb629900026402633ae9160df93a8766" +dependencies = [ + "nom", +] + +[[package]] +name = "cfg-if" +version = "1.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd" + +[[package]] +name = "clang-sys" +version = "1.6.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c688fc74432808e3eb684cae8830a86be1d66a2bd58e1f248ed0960a590baf6f" +dependencies = [ + "glob", + "libc", + "libloading", +] + +[[package]] +name = "clap" +version = "4.4.12" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "dcfab8ba68f3668e89f6ff60f5b205cea56aa7b769451a59f34b8682f51c056d" +dependencies = [ + "clap_builder", + "clap_derive", +] + +[[package]] +name = "clap-cargo" +version = "0.11.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "25122ca6ebad5f53578c26638afd9f0160426969970dc37ec6c363ff6b082ebd" +dependencies = [ + "clap", + "doc-comment", +] + +[[package]] +name = "clap_builder" +version = "4.4.12" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fb7fb5e4e979aec3be7791562fcba452f94ad85e954da024396433e0e25a79e9" +dependencies = [ + "anstyle", + "clap_lex", +] + +[[package]] +name = "clap_derive" +version = "4.4.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cf9804afaaf59a91e75b022a30fb7229a7901f60c755489cc61c9b423b836442" +dependencies = [ + "heck", + "proc-macro2", + "quote", + "syn 2.0.43", +] + +[[package]] +name = "clap_lex" +version = "0.6.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "702fc72eb24e5a1e48ce58027a675bc24edd52096d5397d4aea7c6dd9eca0bd1" + +[[package]] +name = "concurrent-queue" +version = "2.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d16048cd947b08fa32c24458a22f5dc5e835264f689f4f5653210c69fd107363" +dependencies = [ + "crossbeam-utils", +] + +[[package]] +name = "convert_case" +version = "0.6.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ec182b0ca2f35d8fc196cf3404988fd8b8c739a4d270ff118a398feb0cbec1ca" +dependencies = [ + "unicode-segmentation", +] + +[[package]] +name = "core-foundation-sys" +version = "0.8.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "06ea2b9bc92be3c2baa9334a323ebca2d6f074ff852cd1d7b11064035cd3868f" + +[[package]] +name = "cpufeatures" +version = "0.2.11" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ce420fe07aecd3e67c5f910618fe65e94158f6dcc0adf44e00d69ce2bdfe0fd0" +dependencies = [ + "libc", +] + +[[package]] +name = "crc32fast" +version = "1.3.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b540bd8bc810d3885c6ea91e2018302f68baba2129ab3e88f32389ee9370880d" +dependencies = [ + "cfg-if", +] + +[[package]] +name = "critical-section" +version = "1.1.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7059fff8937831a9ae6f0fe4d658ffabf58f2ca96aa9dec1c889f936f705f216" + +[[package]] +name = "crossbeam" +version = "0.8.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6eb9105919ca8e40d437fc9cbb8f1975d916f1bd28afe795a48aae32a2cc8920" +dependencies = [ + "cfg-if", + "crossbeam-channel", + "crossbeam-deque", + "crossbeam-epoch", + "crossbeam-queue", + "crossbeam-utils", +] + +[[package]] +name = "crossbeam-channel" +version = "0.5.10" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "82a9b73a36529d9c47029b9fb3a6f0ea3cc916a261195352ba19e770fc1748b2" +dependencies = [ + "cfg-if", + "crossbeam-utils", +] + +[[package]] +name = "crossbeam-deque" +version = "0.8.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fca89a0e215bab21874660c67903c5f143333cab1da83d041c7ded6053774751" +dependencies = [ + "cfg-if", + "crossbeam-epoch", + "crossbeam-utils", +] + +[[package]] +name = "crossbeam-epoch" +version = "0.9.17" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0e3681d554572a651dda4186cd47240627c3d0114d45a95f6ad27f2f22e7548d" +dependencies = [ + "autocfg", + "cfg-if", + "crossbeam-utils", +] + +[[package]] +name = "crossbeam-queue" +version = "0.3.10" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "adc6598521bb5a83d491e8c1fe51db7296019d2ca3cb93cc6c2a20369a4d78a2" +dependencies = [ + "cfg-if", + "crossbeam-utils", +] + +[[package]] +name = "crossbeam-utils" +version = "0.8.18" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c3a430a770ebd84726f584a90ee7f020d28db52c6d02138900f22341f866d39c" +dependencies = [ + "cfg-if", +] + +[[package]] +name = "crunchy" +version = "0.2.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7a81dae078cea95a014a339291cec439d2f232ebe854a9d672b796c6afafa9b7" + +[[package]] +name = "crypto-common" +version = "0.1.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1bfb12502f3fc46cca1bb51ac28df9d618d813cdc3d2f25b9fe775a34af26bb3" +dependencies = [ + "generic-array", + "typenum", +] + +[[package]] +name = "ctor" +version = "0.2.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "30d2b3721e861707777e3195b0158f950ae6dc4a27e4d02ff9f67e3eb3de199e" +dependencies = [ + "quote", + "syn 2.0.43", +] + +[[package]] +name = "cty" +version = "0.2.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b365fabc795046672053e29c954733ec3b05e4be654ab130fe8f1f94d7051f35" + +[[package]] +name = "curl" +version = "0.4.44" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "509bd11746c7ac09ebd19f0b17782eae80aadee26237658a6b4808afb5c11a22" +dependencies = [ + "curl-sys", + "libc", + "openssl-probe", + "openssl-sys", + "schannel", + "socket2 0.4.10", + "winapi", +] + +[[package]] +name = "curl-sys" +version = "0.4.70+curl-8.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3c0333d8849afe78a4c8102a429a446bfdd055832af071945520e835ae2d841e" +dependencies = [ + "cc", + "libc", + "libnghttp2-sys", + "libz-sys", + "openssl-sys", + "pkg-config", + "vcpkg", + "windows-sys 0.48.0", +] + +[[package]] +name = "dashmap" +version = "5.5.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "978747c1d849a7d2ee5e8adc0159961c48fb7e5db2f06af6723b80123bb53856" +dependencies = [ + "cfg-if", + "hashbrown", + "lock_api", + "once_cell", + "parking_lot_core", +] + +[[package]] +name = "detect" +version = "0.0.0" +dependencies = [ + "ctor", + "rustix 0.38.28", + "std_detect", +] + +[[package]] +name = "diff" +version = "0.1.13" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "56254986775e3233ffa9c4d7d3faaf6d36a2c09d30b20687e9f88bc8bafc16c8" + +[[package]] +name = "digest" +version = "0.10.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9ed9a281f7bc9b7576e61468ba615a66a5c8cfdff42420a70aa82701a3b1e292" +dependencies = [ + "block-buffer", + "crypto-common", + "subtle", +] + +[[package]] +name = "dirs" +version = "5.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "44c45a9d03d6676652bcb5e724c7e988de1acad23a711b5217ab9cbecbec2225" +dependencies = [ + "dirs-sys", +] + +[[package]] +name = "dirs-next" +version = "2.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b98cf8ebf19c3d1b223e151f99a4f9f0690dca41414773390fc824184ac833e1" +dependencies = [ + "cfg-if", + "dirs-sys-next", +] + +[[package]] +name = "dirs-sys" +version = "0.4.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "520f05a5cbd335fae5a99ff7a6ab8627577660ee5cfd6a94a6a929b52ff0321c" +dependencies = [ + "libc", + "option-ext", + "redox_users", + "windows-sys 0.48.0", +] + +[[package]] +name = "dirs-sys-next" +version = "0.1.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4ebda144c4fe02d1f7ea1a7d9641b6fc6b580adcfa024ae48797ecdeb6825b4d" +dependencies = [ + "libc", + "redox_users", + "winapi", +] + +[[package]] +name = "doc-comment" +version = "0.3.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fea41bba32d969b513997752735605054bc0dfa92b4c56bf1189f2e174be7a10" + +[[package]] +name = "downcast" +version = "0.11.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1435fa1053d8b2fbbe9be7e97eca7f33d37b28409959813daefc1446a14247f1" + +[[package]] +name = "either" +version = "1.9.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a26ae43d7bcc3b814de94796a5e736d4029efb0ee900c12e2d54c993ad1a1e07" + +[[package]] +name = "ena" +version = "0.14.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c533630cf40e9caa44bd91aadc88a75d75a4c3a12b4cfde353cbed41daa1e1f1" +dependencies = [ + "log", +] + +[[package]] +name = "encoding_rs" +version = "0.8.33" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7268b386296a025e474d5140678f75d6de9493ae55a5d709eeb9dd08149945e1" +dependencies = [ + "cfg-if", +] + +[[package]] +name = "enum-map" +version = "2.7.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6866f3bfdf8207509a033af1a75a7b08abda06bbaaeae6669323fd5a097df2e9" +dependencies = [ + "enum-map-derive", +] + +[[package]] +name = "enum-map-derive" +version = "0.17.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f282cfdfe92516eb26c2af8589c274c7c17681f5ecc03c18255fe741c6aa64eb" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.43", +] + +[[package]] +name = "env_logger" +version = "0.10.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "95b3f3e67048839cb0d0781f445682a35113da7121f7c949db0e2be96a4fbece" +dependencies = [ + "humantime", + "is-terminal", + "log", + "regex", + "termcolor", +] + +[[package]] +name = "equivalent" +version = "1.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5443807d6dff69373d433ab9ef5378ad8df50ca6298caf15de6e52e24aaf54d5" + +[[package]] +name = "errno" +version = "0.3.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a258e46cdc063eb8519c00b9fc845fc47bcfca4130e2f08e88665ceda8474245" +dependencies = [ + "libc", + "windows-sys 0.52.0", +] + +[[package]] +name = "event-listener" +version = "2.5.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0206175f82b8d6bf6652ff7d71a1e27fd2e4efde587fd368662814d6ec1d9ce0" + +[[package]] +name = "event-listener" +version = "3.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d93877bcde0eb80ca09131a08d23f0a5c18a620b01db137dba666d18cd9b30c2" +dependencies = [ + "concurrent-queue", + "parking", + "pin-project-lite", +] + +[[package]] +name = "event-listener" +version = "4.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "84f2cdcf274580f2d63697192d744727b3198894b1bf02923643bf59e2c26712" +dependencies = [ + "concurrent-queue", + "parking", + "pin-project-lite", +] + +[[package]] +name = "event-listener-strategy" +version = "0.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "958e4d70b6d5e81971bebec42271ec641e7ff4e170a6fa605f2b8a8b65cb97d3" +dependencies = [ + "event-listener 4.0.1", + "pin-project-lite", +] + +[[package]] +name = "eyre" +version = "0.6.11" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b6267a1fa6f59179ea4afc8e50fd8612a3cc60bc858f786ff877a4a8cb042799" +dependencies = [ + "indenter", + "once_cell", +] + +[[package]] +name = "fallible-iterator" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4443176a9f2c162692bd3d352d745ef9413eec5782a80d8fd6f8a1ac692a07f7" + +[[package]] +name = "fastrand" +version = "1.9.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e51093e27b0797c359783294ca4f0a911c270184cb10f85783b118614a1501be" +dependencies = [ + "instant", +] + +[[package]] +name = "fastrand" +version = "2.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "25cbce373ec4653f1a01a31e8a5e5ec0c622dc27ff9c4e6606eefef5cbbed4a5" + +[[package]] +name = "finl_unicode" +version = "1.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8fcfdc7a0362c9f4444381a9e697c79d435fe65b52a37466fc2c1184cee9edc6" + +[[package]] +name = "fixedbitset" +version = "0.4.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0ce7134b9999ecaf8bcd65542e436736ef32ddca1b3e06094cb6ec5755203b80" + +[[package]] +name = "flate2" +version = "1.0.28" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "46303f565772937ffe1d394a4fac6f411c6013172fadde9dcdb1e147a086940e" +dependencies = [ + "crc32fast", + "miniz_oxide", +] + +[[package]] +name = "fnv" +version = "1.0.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3f9eec918d3f24069decb9af1554cad7c880e2da24a9afd88aca000531ab82c1" + +[[package]] +name = "form_urlencoded" +version = "1.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e13624c2627564efccf4934284bdd98cbaa14e79b0b5a141218e507b3a823456" +dependencies = [ + "percent-encoding", +] + +[[package]] +name = "fragile" +version = "2.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6c2141d6d6c8512188a7891b4b01590a45f6dac67afb4f255c4124dbb86d4eaa" + +[[package]] +name = "funty" +version = "2.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e6d5a32815ae3f33302d95fdcb2ce17862f8c65363dcfd29360480ba1001fc9c" + +[[package]] +name = "futures-channel" +version = "0.3.30" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "eac8f7d7865dcb88bd4373ab671c8cf4508703796caa2b1985a9ca867b3fcb78" +dependencies = [ + "futures-core", + "futures-sink", +] + +[[package]] +name = "futures-core" +version = "0.3.30" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "dfc6580bb841c5a68e9ef15c77ccc837b40a7504914d52e47b8b0e9bbda25a1d" + +[[package]] +name = "futures-io" +version = "0.3.30" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a44623e20b9681a318efdd71c299b6b222ed6f231972bfe2f224ebad6311f0c1" + +[[package]] +name = "futures-lite" +version = "1.13.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "49a9d51ce47660b1e808d3c990b4709f2f415d928835a17dfd16991515c46bce" +dependencies = [ + "fastrand 1.9.0", + "futures-core", + "futures-io", + "memchr", + "parking", + "pin-project-lite", + "waker-fn", +] + +[[package]] +name = "futures-lite" +version = "2.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "aeee267a1883f7ebef3700f262d2d54de95dfaf38189015a74fdc4e0c7ad8143" +dependencies = [ + "fastrand 2.0.1", + "futures-core", + "futures-io", + "parking", + "pin-project-lite", +] + +[[package]] +name = "futures-macro" +version = "0.3.30" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "87750cf4b7a4c0625b1529e4c543c2182106e4dedc60a2a6455e00d212c489ac" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.43", +] + +[[package]] +name = "futures-sink" +version = "0.3.30" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9fb8e00e87438d937621c1c6269e53f536c14d3fbd6a042bb24879e57d474fb5" + +[[package]] +name = "futures-task" +version = "0.3.30" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "38d84fa142264698cdce1a9f9172cf383a0c82de1bddcf3092901442c4097004" + +[[package]] +name = "futures-util" +version = "0.3.30" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3d6401deb83407ab3da39eba7e33987a73c3df0c82b4bb5813ee871c19c41d48" +dependencies = [ + "futures-core", + "futures-macro", + "futures-sink", + "futures-task", + "pin-project-lite", + "pin-utils", + "slab", +] + +[[package]] +name = "generic-array" +version = "0.14.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "85649ca51fd72272d7821adaf274ad91c288277713d9c18820d8499a7ff69e9a" +dependencies = [ + "typenum", + "version_check", +] + +[[package]] +name = "getrandom" +version = "0.2.11" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fe9006bed769170c11f845cf00c7c1e9092aeb3f268e007c3e760ac68008070f" +dependencies = [ + "cfg-if", + "libc", + "wasi", +] + +[[package]] +name = "gimli" +version = "0.28.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4271d37baee1b8c7e4b708028c57d816cf9d2434acb33a549475f78c181f6253" + +[[package]] +name = "glob" +version = "0.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d2fabcfbdc87f4758337ca535fb41a6d701b65693ce38287d856d1674551ec9b" + +[[package]] +name = "gloo-timers" +version = "0.2.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9b995a66bb87bebce9a0f4a95aed01daca4872c050bfcb21653361c03bc35e5c" +dependencies = [ + "futures-channel", + "futures-core", + "js-sys", + "wasm-bindgen", +] + +[[package]] +name = "half" +version = "1.8.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "eabb4a44450da02c90444cf74558da904edde8fb4e9035a9a6a4e15445af0bd7" + +[[package]] +name = "half" +version = "2.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bc52e53916c08643f1b56ec082790d1e86a32e58dc5268f897f313fbae7b4872" +dependencies = [ + "bytemuck", + "cfg-if", + "crunchy", + "num-traits", + "rand", + "rand_distr", + "serde", +] + +[[package]] +name = "hash32" +version = "0.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b0c35f58762feb77d74ebe43bdbc3210f09be9fe6742234d573bacc26ed92b67" +dependencies = [ + "byteorder", +] + +[[package]] +name = "hashbrown" +version = "0.14.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "290f1a1d9242c78d09ce40a5e87e7554ee637af1351968159f4952f028f75604" + +[[package]] +name = "heapless" +version = "0.7.17" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cdc6457c0eb62c71aac4bc17216026d8410337c4126773b9c5daba343f17964f" +dependencies = [ + "atomic-polyfill", + "hash32", + "rustc_version 0.4.0", + "spin", + "stable_deref_trait", +] + +[[package]] +name = "heck" +version = "0.4.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "95505c38b4572b2d910cecb0281560f54b440a19336cbbcb27bf6ce6adc6f5a8" + +[[package]] +name = "hermit-abi" +version = "0.3.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d77f7ec81a6d05a3abb01ab6eb7590f6083d08449fe5a1c8b1e620283546ccb7" + +[[package]] +name = "hmac" +version = "0.12.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6c49c37c09c17a53d937dfbb742eb3a961d65a994e6bcdcf37e7399d0cc8ab5e" +dependencies = [ + "digest", +] + +[[package]] +name = "http" +version = "0.2.11" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8947b1a6fad4393052c7ba1f4cd97bed3e953a95c79c92ad9b051a04611d9fbb" +dependencies = [ + "bytes", + "fnv", + "itoa", +] + +[[package]] +name = "http-body" +version = "0.4.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7ceab25649e9960c0311ea418d17bee82c0dcec1bd053b5f9a66e265a693bed2" +dependencies = [ + "bytes", + "http", + "pin-project-lite", +] + +[[package]] +name = "httparse" +version = "1.8.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d897f394bad6a705d5f4104762e116a75639e470d80901eed05a860a95cb1904" + +[[package]] +name = "httpdate" +version = "1.0.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "df3b46402a9d5adb4c86a0cf463f42e19994e3ee891101b1841f30a545cb49a9" + +[[package]] +name = "httpmock" +version = "0.6.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4b02e044d3b4c2f94936fb05f9649efa658ca788f44eb6b87554e2033fc8ce93" +dependencies = [ + "assert-json-diff", + "async-object-pool", + "async-trait", + "base64", + "basic-cookies", + "crossbeam-utils", + "form_urlencoded", + "futures-util", + "hyper", + "isahc", + "lazy_static", + "levenshtein", + "log", + "regex", + "serde", + "serde_json", + "serde_regex", + "similar", + "tokio", + "url", +] + +[[package]] +name = "humantime" +version = "2.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9a3a5bfb195931eeb336b2a7b4d761daec841b97f947d34394601737a7bba5e4" + +[[package]] +name = "hyper" +version = "0.14.28" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bf96e135eb83a2a8ddf766e426a841d8ddd7449d5f00d34ea02b41d2f19eef80" +dependencies = [ + "bytes", + "futures-channel", + "futures-core", + "futures-util", + "http", + "http-body", + "httparse", + "httpdate", + "itoa", + "pin-project-lite", + "socket2 0.5.5", + "tokio", + "tower-service", + "tracing", + "want", +] + +[[package]] +name = "idna" +version = "0.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7d20d6b07bfbc108882d88ed8e37d39636dcc260e15e30c45e6ba089610b917c" +dependencies = [ + "unicode-bidi", + "unicode-normalization", +] + +[[package]] +name = "idna" +version = "0.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "634d9b1461af396cad843f47fdba5597a4f9e6ddd4bfb6ff5d85028c25cb12f6" +dependencies = [ + "unicode-bidi", + "unicode-normalization", +] + +[[package]] +name = "if_chain" +version = "1.0.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cb56e1aa765b4b4f3aadfab769793b7087bb03a4ea4920644a6d238e2df5b9ed" + +[[package]] +name = "indenter" +version = "0.3.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ce23b50ad8242c51a442f3ff322d56b02f08852c77e4c0b4d3fd684abc89c683" + +[[package]] +name = "indexmap" +version = "2.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d530e1a18b1cb4c484e6e34556a0d948706958449fca0cab753d649f2bce3d1f" +dependencies = [ + "equivalent", + "hashbrown", +] + +[[package]] +name = "instant" +version = "0.1.12" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7a5bbe824c507c5da5956355e86a746d82e0e1464f65d862cc5e71da70e94b2c" +dependencies = [ + "cfg-if", +] + +[[package]] +name = "io-lifetimes" +version = "1.0.11" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "eae7b9aee968036d54dce06cebaefd919e4472e753296daccd6d344e3e2df0c2" +dependencies = [ + "hermit-abi", + "libc", + "windows-sys 0.48.0", +] + +[[package]] +name = "is-terminal" +version = "0.4.10" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0bad00257d07be169d870ab665980b06cdb366d792ad690bf2e76876dc503455" +dependencies = [ + "hermit-abi", + "rustix 0.38.28", + "windows-sys 0.52.0", +] + +[[package]] +name = "isahc" +version = "1.7.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "334e04b4d781f436dc315cb1e7515bd96826426345d498149e4bde36b67f8ee9" +dependencies = [ + "async-channel 1.9.0", + "castaway", + "crossbeam-utils", + "curl", + "curl-sys", + "encoding_rs", + "event-listener 2.5.3", + "futures-lite 1.13.0", + "http", + "log", + "mime", + "once_cell", + "polling 2.8.0", + "slab", + "sluice", + "tracing", + "tracing-futures", + "url", + "waker-fn", +] + +[[package]] +name = "itertools" +version = "0.10.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b0fd2260e829bddf4cb6ea802289de2f86d6a7a690192fbe91b3f46e0f2c8473" +dependencies = [ + "either", +] + +[[package]] +name = "itertools" +version = "0.11.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b1c173a5686ce8bfa551b3563d0c2170bf24ca44da99c7ca4bfdab5418c3fe57" +dependencies = [ + "either", +] + +[[package]] +name = "itoa" +version = "1.0.10" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b1a46d1a171d865aa5f83f92695765caa047a9b4cbae2cbf37dbd613a793fd4c" + +[[package]] +name = "js-sys" +version = "0.3.66" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cee9c64da59eae3b50095c18d3e74f8b73c0b86d2792824ff01bbce68ba229ca" +dependencies = [ + "wasm-bindgen", +] + +[[package]] +name = "kv-log-macro" +version = "1.0.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0de8b303297635ad57c9f5059fd9cee7a47f8e8daa09df0fcd07dd39fb22977f" +dependencies = [ + "log", +] + +[[package]] +name = "lalrpop" +version = "0.19.12" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0a1cbf952127589f2851ab2046af368fd20645491bb4b376f04b7f94d7a9837b" +dependencies = [ + "ascii-canvas", + "bit-set", + "diff", + "ena", + "is-terminal", + "itertools 0.10.5", + "lalrpop-util", + "petgraph", + "regex", + "regex-syntax 0.6.29", + "string_cache", + "term", + "tiny-keccak", + "unicode-xid", +] + +[[package]] +name = "lalrpop-util" +version = "0.19.12" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d3c48237b9604c5a4702de6b824e02006c3214327564636aef27c1028a8fa0ed" +dependencies = [ + "regex", +] + +[[package]] +name = "lazy_static" +version = "1.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e2abad23fbc42b3700f2f279844dc832adb2b2eb069b2df918f455c4e18cc646" + +[[package]] +name = "lazycell" +version = "1.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "830d08ce1d1d941e6b30645f1a0eb5643013d835ce3779a5fc208261dbe10f55" + +[[package]] +name = "levenshtein" +version = "1.0.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "db13adb97ab515a3691f56e4dbab09283d0b86cb45abd991d8634a9d6f501760" + +[[package]] +name = "libc" +version = "0.2.151" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "302d7ab3130588088d277783b1e2d2e10c9e9e4a16dd9050e6ec93fb3e7048f4" + +[[package]] +name = "libloading" +version = "0.7.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b67380fd3b2fbe7527a606e18729d21c6f3951633d0500574c4dc22d2d638b9f" +dependencies = [ + "cfg-if", + "winapi", +] + +[[package]] +name = "libm" +version = "0.2.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4ec2a862134d2a7d32d7983ddcdd1c4923530833c9f2ea1a44fc5fa473989058" + +[[package]] +name = "libnghttp2-sys" +version = "0.1.8+1.55.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4fae956c192dadcdb5dace96db71fa0b827333cce7c7b38dc71446f024d8a340" +dependencies = [ + "cc", + "libc", +] + +[[package]] +name = "libredox" +version = "0.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "85c833ca1e66078851dba29046874e38f08b2c883700aa29a03ddd3b23814ee8" +dependencies = [ + "bitflags 2.4.1", + "libc", + "redox_syscall", +] + +[[package]] +name = "libz-sys" +version = "1.1.12" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d97137b25e321a73eef1418d1d5d2eda4d77e12813f8e6dead84bc52c5870a7b" +dependencies = [ + "cc", + "libc", + "pkg-config", + "vcpkg", +] + +[[package]] +name = "linux-raw-sys" +version = "0.3.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ef53942eb7bf7ff43a617b3e2c1c4a5ecf5944a7c1bc12d7ee39bbb15e5c1519" + +[[package]] +name = "linux-raw-sys" +version = "0.4.12" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c4cd1a83af159aa67994778be9070f0ae1bd732942279cabb14f86f986a21456" + +[[package]] +name = "lock_api" +version = "0.4.11" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3c168f8615b12bc01f9c17e2eb0cc07dcae1940121185446edc3744920e8ef45" +dependencies = [ + "autocfg", + "scopeguard", +] + +[[package]] +name = "log" +version = "0.4.20" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b5e6163cb8c49088c2c36f57875e58ccd8c87c7427f7fbd50ea6710b2f3f2e8f" +dependencies = [ + "value-bag", +] + +[[package]] +name = "md-5" +version = "0.10.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d89e7ee0cfbedfc4da3340218492196241d89eefb6dab27de5df917a6d2e78cf" +dependencies = [ + "cfg-if", + "digest", +] + +[[package]] +name = "memchr" +version = "2.7.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "523dc4f511e55ab87b694dc30d0f820d60906ef06413f93d4d7a1385599cc149" + +[[package]] +name = "memmap2" +version = "0.9.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "45fd3a57831bf88bc63f8cebc0cf956116276e97fef3966103e96416209f7c92" +dependencies = [ + "libc", +] + +[[package]] +name = "memoffset" +version = "0.9.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5a634b1c61a95585bd15607c6ab0c4e5b226e695ff2800ba0cdccddf208c406c" +dependencies = [ + "autocfg", +] + +[[package]] +name = "mime" +version = "0.3.17" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6877bb514081ee2a7ff5ef9de3281f14a4dd4bceac4c09388074a6b5df8a139a" + +[[package]] +name = "minimal-lexical" +version = "0.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "68354c5c6bd36d73ff3feceb05efa59b6acb7626617f4962be322a825e61f79a" + +[[package]] +name = "miniz_oxide" +version = "0.7.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e7810e0be55b428ada41041c41f32c9f1a42817901b4ccf45fa3d4b6561e74c7" +dependencies = [ + "adler", +] + +[[package]] +name = "mio" +version = "0.8.10" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8f3d0b296e374a4e6f3c7b0a1f5a51d748a0d34c85e7dc48fc3fa9a87657fe09" +dependencies = [ + "libc", + "wasi", + "windows-sys 0.48.0", +] + +[[package]] +name = "mockall" +version = "0.12.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "43766c2b5203b10de348ffe19f7e54564b64f3d6018ff7648d1e2d6d3a0f0a48" +dependencies = [ + "cfg-if", + "downcast", + "fragile", + "lazy_static", + "mockall_derive", + "predicates", + "predicates-tree", +] + +[[package]] +name = "mockall_derive" +version = "0.12.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "af7cbce79ec385a1d4f54baa90a76401eb15d9cab93685f62e7e9f942aa00ae2" +dependencies = [ + "cfg-if", + "proc-macro2", + "quote", + "syn 2.0.43", +] + +[[package]] +name = "multiversion" +version = "0.7.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b2c7b9d7fe61760ce5ea19532ead98541f6b4c495d87247aff9826445cf6872a" +dependencies = [ + "multiversion-macros", + "target-features", +] + +[[package]] +name = "multiversion-macros" +version = "0.7.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "26a83d8500ed06d68877e9de1dde76c1dbb83885dcdbda4ef44ccbc3fbda2ac8" +dependencies = [ + "proc-macro2", + "quote", + "syn 1.0.109", + "target-features", +] + +[[package]] +name = "new_debug_unreachable" +version = "1.0.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e4a24736216ec316047a1fc4252e27dabb04218aa4a3f37c6e7ddbf1f9782b54" + +[[package]] +name = "nom" +version = "7.1.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d273983c5a657a70a3e8f2a01329822f3b8c8172b73826411a55751e404a0a4a" +dependencies = [ + "memchr", + "minimal-lexical", +] + +[[package]] +name = "ntapi" +version = "0.4.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e8a3895c6391c39d7fe7ebc444a87eb2991b2a0bc718fdabd071eec617fc68e4" +dependencies = [ + "winapi", +] + +[[package]] +name = "num-traits" +version = "0.2.17" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "39e3200413f237f41ab11ad6d161bc7239c84dcb631773ccd7de3dfe4b5c267c" +dependencies = [ + "autocfg", + "libm", +] + +[[package]] +name = "num_cpus" +version = "1.16.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4161fcb6d602d4d2081af7c3a45852d875a03dd337a6bfdd6e06407b61342a43" +dependencies = [ + "hermit-abi", + "libc", +] + +[[package]] +name = "object" +version = "0.32.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a6a622008b6e321afc04970976f62ee297fdbaa6f95318ca343e3eebb9648441" +dependencies = [ + "memchr", +] + +[[package]] +name = "once_cell" +version = "1.19.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3fdb12b2476b595f9358c5161aa467c2438859caa136dec86c26fdd2efe17b92" + +[[package]] +name = "openai_api_rust" +version = "0.1.8" +source = "git+https://github.com/tensorchord/openai-api.git?rev=228d54b6002e98257b3c81501a054942342f585f#228d54b6002e98257b3c81501a054942342f585f" +dependencies = [ + "log", + "mime", + "rand", + "serde", + "serde_json", + "ureq", +] + +[[package]] +name = "openssl-probe" +version = "0.1.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ff011a302c396a5197692431fc1948019154afc178baf7d8e37367442a4601cf" + +[[package]] +name = "openssl-sys" +version = "0.9.98" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c1665caf8ab2dc9aef43d1c0023bd904633a6a05cb30b0ad59bec2ae986e57a7" +dependencies = [ + "cc", + "libc", + "pkg-config", + "vcpkg", +] + +[[package]] +name = "option-ext" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "04744f49eae99ab78e0d5c0b603ab218f515ea8cfe5a456d7629ad883a3b6e7d" + +[[package]] +name = "owo-colors" +version = "3.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c1b04fb49957986fdce4d6ee7a65027d55d4b6d2265e5848bbb507b58ccfdb6f" + +[[package]] +name = "parking" +version = "2.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bb813b8af86854136c6922af0598d719255ecb2179515e6e7730d468f05c9cae" + +[[package]] +name = "parking_lot" +version = "0.12.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3742b2c103b9f06bc9fff0a37ff4912935851bee6d36f3c02bcc755bcfec228f" +dependencies = [ + "lock_api", + "parking_lot_core", +] + +[[package]] +name = "parking_lot_core" +version = "0.9.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4c42a9226546d68acdd9c0a280d17ce19bfe27a46bf68784e4066115788d008e" +dependencies = [ + "cfg-if", + "libc", + "redox_syscall", + "smallvec", + "windows-targets 0.48.5", +] + +[[package]] +name = "pathsearch" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "da983bc5e582ab17179c190b4b66c7d76c5943a69c6d34df2a2b6bf8a2977b05" +dependencies = [ + "anyhow", + "libc", +] + +[[package]] +name = "peeking_take_while" +version = "0.1.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "19b17cddbe7ec3f8bc800887bab5e717348c95ea2ca0b1bf0837fb964dc67099" + +[[package]] +name = "percent-encoding" +version = "2.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e3148f5046208a5d56bcfc03053e3ca6334e51da8dfb19b6cdc8b306fae3283e" + +[[package]] +name = "pest" +version = "2.7.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ae9cee2a55a544be8b89dc6848072af97a20f2422603c10865be2a42b580fff5" +dependencies = [ + "memchr", + "thiserror", + "ucd-trie", +] + +[[package]] +name = "petgraph" +version = "0.6.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e1d3afd2628e69da2be385eb6f2fd57c8ac7977ceeff6dc166ff1657b0e386a9" +dependencies = [ + "fixedbitset", + "indexmap", +] + +[[package]] +name = "pgrx" +version = "0.11.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cb44171122605250e719ca2ae49afb357bdb2fce4b3c876fcf2225165237328a" +dependencies = [ + "atomic-traits", + "bitflags 2.4.1", + "bitvec", + "enum-map", + "heapless", + "libc", + "once_cell", + "pgrx-macros", + "pgrx-pg-sys", + "pgrx-sql-entity-graph", + "seahash", + "seq-macro", + "serde", + "serde_cbor", + "serde_json", + "thiserror", + "uuid", +] + +[[package]] +name = "pgrx-macros" +version = "0.11.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a18ac8628b7de2f29a93d0abdbdcaee95a0e0ef4b59fd4de99cc117e166e843b" +dependencies = [ + "pgrx-sql-entity-graph", + "proc-macro2", + "quote", + "syn 1.0.109", +] + +[[package]] +name = "pgrx-pg-config" +version = "0.11.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "acd45ac6eb1142c5690df63c4e0bdfb74f27c9f93a7af84f064dc2c0a2c2d6f7" +dependencies = [ + "cargo_toml", + "dirs", + "eyre", + "owo-colors", + "pathsearch", + "serde", + "serde_derive", + "serde_json", + "toml", + "url", +] + +[[package]] +name = "pgrx-pg-sys" +version = "0.11.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "81c6207939582934fc26fceb651cb5338e363c06ddc6b2d50ca71867f7c70ffe" +dependencies = [ + "bindgen", + "clang-sys", + "eyre", + "libc", + "memoffset", + "once_cell", + "pgrx-macros", + "pgrx-pg-config", + "pgrx-sql-entity-graph", + "proc-macro2", + "quote", + "serde", + "shlex", + "sptr", + "syn 1.0.109", + "walkdir", +] + +[[package]] +name = "pgrx-sql-entity-graph" +version = "0.11.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a50083de83b1fac2484e8f2c2a7da5fed0193904e2578fa6c4ce02262c455c2b" +dependencies = [ + "convert_case", + "eyre", + "petgraph", + "proc-macro2", + "quote", + "syn 1.0.109", + "unescape", +] + +[[package]] +name = "pgrx-tests" +version = "0.11.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6ba0115cd80d9e3ca1d5d2a8ab8b7320d6ed614a53d025b86152696a8b3caa75" +dependencies = [ + "clap-cargo", + "eyre", + "libc", + "once_cell", + "owo-colors", + "pgrx", + "pgrx-macros", + "pgrx-pg-config", + "postgres", + "proptest", + "rand", + "regex", + "serde", + "serde_json", + "sysinfo", + "thiserror", +] + +[[package]] +name = "phf" +version = "0.11.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ade2d8b8f33c7333b51bcf0428d37e217e9f32192ae4772156f65063b8ce03dc" +dependencies = [ + "phf_shared 0.11.2", +] + +[[package]] +name = "phf_shared" +version = "0.10.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b6796ad771acdc0123d2a88dc428b5e38ef24456743ddb1744ed628f9815c096" +dependencies = [ + "siphasher", +] + +[[package]] +name = "phf_shared" +version = "0.11.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "90fcb95eef784c2ac79119d1dd819e162b5da872ce6f3c3abe1e8ca1c082f72b" +dependencies = [ + "siphasher", +] + +[[package]] +name = "pin-project" +version = "1.1.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fda4ed1c6c173e3fc7a83629421152e01d7b1f9b7f65fb301e490e8cfc656422" +dependencies = [ + "pin-project-internal", +] + +[[package]] +name = "pin-project-internal" +version = "1.1.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4359fd9c9171ec6e8c62926d6faaf553a8dc3f64e1507e76da7911b4f6a04405" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.43", +] + +[[package]] +name = "pin-project-lite" +version = "0.2.13" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8afb450f006bf6385ca15ef45d71d2288452bc3683ce2e2cacc0d18e4be60b58" + +[[package]] +name = "pin-utils" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8b870d8c151b6f2fb93e84a13146138f05d02ed11c7e7c54f8826aaaf7c9f184" + +[[package]] +name = "piper" +version = "0.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "668d31b1c4eba19242f2088b2bf3316b82ca31082a8335764db4e083db7485d4" +dependencies = [ + "atomic-waker", + "fastrand 2.0.1", + "futures-io", +] + +[[package]] +name = "pkg-config" +version = "0.3.28" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "69d3587f8a9e599cc7ec2c00e331f71c4e69a5f9a4b8a6efd5b07466b9736f9a" + +[[package]] +name = "polling" +version = "2.8.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4b2d323e8ca7996b3e23126511a523f7e62924d93ecd5ae73b333815b0eb3dce" +dependencies = [ + "autocfg", + "bitflags 1.3.2", + "cfg-if", + "concurrent-queue", + "libc", + "log", + "pin-project-lite", + "windows-sys 0.48.0", +] + +[[package]] +name = "polling" +version = "3.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cf63fa624ab313c11656b4cda960bfc46c410187ad493c41f6ba2d8c1e991c9e" +dependencies = [ + "cfg-if", + "concurrent-queue", + "pin-project-lite", + "rustix 0.38.28", + "tracing", + "windows-sys 0.52.0", +] + +[[package]] +name = "postgres" +version = "0.19.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7915b33ed60abc46040cbcaa25ffa1c7ec240668e0477c4f3070786f5916d451" +dependencies = [ + "bytes", + "fallible-iterator", + "futures-util", + "log", + "tokio", + "tokio-postgres", +] + +[[package]] +name = "postgres-protocol" +version = "0.6.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "49b6c5ef183cd3ab4ba005f1ca64c21e8bd97ce4699cfea9e8d9a2c4958ca520" +dependencies = [ + "base64", + "byteorder", + "bytes", + "fallible-iterator", + "hmac", + "md-5", + "memchr", + "rand", + "sha2", + "stringprep", +] + +[[package]] +name = "postgres-types" +version = "0.2.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8d2234cdee9408b523530a9b6d2d6b373d1db34f6a8e51dc03ded1828d7fb67c" +dependencies = [ + "bytes", + "fallible-iterator", + "postgres-protocol", +] + +[[package]] +name = "ppv-lite86" +version = "0.2.17" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5b40af805b3121feab8a3c29f04d8ad262fa8e0561883e7653e024ae4479e6de" + +[[package]] +name = "precomputed-hash" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "925383efa346730478fb4838dbe9137d2a47675ad789c546d150a6e1dd4ab31c" + +[[package]] +name = "predicates" +version = "3.0.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6dfc28575c2e3f19cb3c73b93af36460ae898d426eba6fc15b9bd2a5220758a0" +dependencies = [ + "anstyle", + "itertools 0.11.0", + "predicates-core", +] + +[[package]] +name = "predicates-core" +version = "1.0.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b794032607612e7abeb4db69adb4e33590fa6cf1149e95fd7cb00e634b92f174" + +[[package]] +name = "predicates-tree" +version = "1.0.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "368ba315fb8c5052ab692e68a0eefec6ec57b23a36959c14496f0b0df2c0cecf" +dependencies = [ + "predicates-core", + "termtree", +] + +[[package]] +name = "proc-macro-error" +version = "1.0.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "da25490ff9892aab3fcf7c36f08cfb902dd3e71ca0f9f9517bea02a73a5ce38c" +dependencies = [ + "proc-macro-error-attr", + "proc-macro2", + "quote", + "syn 1.0.109", + "version_check", +] + +[[package]] +name = "proc-macro-error-attr" +version = "1.0.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a1be40180e52ecc98ad80b184934baf3d0d29f979574e439af5a55274b35f869" +dependencies = [ + "proc-macro2", + "quote", + "version_check", +] + +[[package]] +name = "proc-macro2" +version = "1.0.71" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "75cb1540fadbd5b8fbccc4dddad2734eba435053f725621c070711a14bb5f4b8" +dependencies = [ + "unicode-ident", +] + +[[package]] +name = "proptest" +version = "1.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "31b476131c3c86cb68032fdc5cb6d5a1045e3e42d96b69fa599fd77701e1f5bf" +dependencies = [ + "bit-set", + "bit-vec", + "bitflags 2.4.1", + "lazy_static", + "num-traits", + "rand", + "rand_chacha", + "rand_xorshift", + "regex-syntax 0.8.2", + "rusty-fork", + "tempfile", + "unarray", +] + +[[package]] +name = "quick-error" +version = "1.2.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a1d01941d82fa2ab50be1e79e6714289dd7cde78eba4c074bc5a4374f650dfe0" + +[[package]] +name = "quote" +version = "1.0.33" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5267fca4496028628a95160fc423a33e8b2e6af8a5302579e322e4b520293cae" +dependencies = [ + "proc-macro2", +] + +[[package]] +name = "radium" +version = "0.7.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "dc33ff2d4973d518d823d61aa239014831e521c75da58e3df4840d3f47749d09" + +[[package]] +name = "rand" +version = "0.8.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "34af8d1a0e25924bc5b7c43c079c942339d8f0a8b57c39049bef581b46327404" +dependencies = [ + "libc", + "rand_chacha", + "rand_core", +] + +[[package]] +name = "rand_chacha" +version = "0.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e6c10a63a0fa32252be49d21e7709d4d4baf8d231c2dbce1eaa8141b9b127d88" +dependencies = [ + "ppv-lite86", + "rand_core", +] + +[[package]] +name = "rand_core" +version = "0.6.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ec0be4795e2f6a28069bec0b5ff3e2ac9bafc99e6a9a7dc3547996c5c816922c" +dependencies = [ + "getrandom", +] + +[[package]] +name = "rand_distr" +version = "0.4.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "32cb0b9bc82b0a0876c2dd994a7e7a2683d3e7390ca40e6886785ef0c7e3ee31" +dependencies = [ + "num-traits", + "rand", +] + +[[package]] +name = "rand_xorshift" +version = "0.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d25bf25ec5ae4a3f1b92f929810509a2f53d7dca2f50b794ff57e3face536c8f" +dependencies = [ + "rand_core", +] + +[[package]] +name = "rayon" +version = "1.8.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9c27db03db7734835b3f53954b534c91069375ce6ccaa2e065441e07d9b6cdb1" +dependencies = [ + "either", + "rayon-core", +] + +[[package]] +name = "rayon-core" +version = "1.12.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5ce3fb6ad83f861aac485e76e1985cd109d9a3713802152be56c3b1f0e0658ed" +dependencies = [ + "crossbeam-deque", + "crossbeam-utils", +] + +[[package]] +name = "redox_syscall" +version = "0.4.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4722d768eff46b75989dd134e5c353f0d6296e5aaa3132e776cbdb56be7731aa" +dependencies = [ + "bitflags 1.3.2", +] + +[[package]] +name = "redox_users" +version = "0.4.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a18479200779601e498ada4e8c1e1f50e3ee19deb0259c25825a98b5603b2cb4" +dependencies = [ + "getrandom", + "libredox", + "thiserror", +] + +[[package]] +name = "regex" +version = "1.10.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "380b951a9c5e80ddfd6136919eef32310721aa4aacd4889a8d39124b026ab343" +dependencies = [ + "aho-corasick", + "memchr", + "regex-automata", + "regex-syntax 0.8.2", +] + +[[package]] +name = "regex-automata" +version = "0.4.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5f804c7828047e88b2d32e2d7fe5a105da8ee3264f01902f796c8e067dc2483f" +dependencies = [ + "aho-corasick", + "memchr", + "regex-syntax 0.8.2", +] + +[[package]] +name = "regex-syntax" +version = "0.6.29" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f162c6dd7b008981e4d40210aca20b4bd0f9b60ca9271061b07f78537722f2e1" + +[[package]] +name = "regex-syntax" +version = "0.8.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c08c74e62047bb2de4ff487b251e4a92e24f48745648451635cec7d591162d9f" + +[[package]] +name = "ring" +version = "0.17.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "688c63d65483050968b2a8937f7995f443e27041a0f7700aa59b0822aedebb74" +dependencies = [ + "cc", + "getrandom", + "libc", + "spin", + "untrusted", + "windows-sys 0.48.0", +] + +[[package]] +name = "rustc-demangle" +version = "0.1.23" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d626bb9dae77e28219937af045c257c28bfd3f69333c512553507f5f9798cb76" + +[[package]] +name = "rustc-hash" +version = "1.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "08d43f7aa6b08d49f382cde6a7982047c3426db949b1424bc4b7ec9ae12c6ce2" + +[[package]] +name = "rustc_version" +version = "0.3.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f0dfe2087c51c460008730de8b57e6a320782fbfb312e1f4d520e6c6fae155ee" +dependencies = [ + "semver 0.11.0", +] + +[[package]] +name = "rustc_version" +version = "0.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bfa0f585226d2e68097d4f95d113b15b83a82e819ab25717ec0590d9584ef366" +dependencies = [ + "semver 1.0.20", +] + +[[package]] +name = "rustix" +version = "0.37.27" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fea8ca367a3a01fe35e6943c400addf443c0f57670e6ec51196f71a4b8762dd2" +dependencies = [ + "bitflags 1.3.2", + "errno", + "io-lifetimes", + "libc", + "linux-raw-sys 0.3.8", + "windows-sys 0.48.0", +] + +[[package]] +name = "rustix" +version = "0.38.28" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "72e572a5e8ca657d7366229cdde4bd14c4eb5499a9573d4d366fe1b599daa316" +dependencies = [ + "bitflags 2.4.1", + "errno", + "libc", + "linux-raw-sys 0.4.12", + "windows-sys 0.52.0", +] + +[[package]] +name = "rustls" +version = "0.21.10" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f9d5a6813c0759e4609cd494e8e725babae6a2ca7b62a5536a13daaec6fcb7ba" +dependencies = [ + "log", + "ring", + "rustls-webpki", + "sct", +] + +[[package]] +name = "rustls-webpki" +version = "0.101.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8b6275d1ee7a1cd780b64aca7726599a1dbc893b1e64144529e55c3c2f745765" +dependencies = [ + "ring", + "untrusted", +] + +[[package]] +name = "rustversion" +version = "1.0.14" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7ffc183a10b4478d04cbbbfc96d0873219d962dd5accaff2ffbd4ceb7df837f4" + +[[package]] +name = "rusty-fork" +version = "0.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cb3dcc6e454c328bb824492db107ab7c0ae8fcffe4ad210136ef014458c1bc4f" +dependencies = [ + "fnv", + "quick-error", + "tempfile", + "wait-timeout", +] + +[[package]] +name = "ryu" +version = "1.0.16" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f98d2aa92eebf49b69786be48e4477826b256916e84a57ff2a4f21923b48eb4c" + +[[package]] +name = "same-file" +version = "1.0.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "93fc1dc3aaa9bfed95e02e6eadabb4baf7e3078b0bd1b4d7b6b0b68378900502" +dependencies = [ + "winapi-util", +] + +[[package]] +name = "schannel" +version = "0.1.23" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fbc91545643bcf3a0bbb6569265615222618bdf33ce4ffbbd13c4bbd4c093534" +dependencies = [ + "windows-sys 0.52.0", +] + +[[package]] +name = "scopeguard" +version = "1.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "94143f37725109f92c262ed2cf5e59bce7498c01bcc1502d7b9afe439a4e9f49" + +[[package]] +name = "sct" +version = "0.7.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "da046153aa2352493d6cb7da4b6e5c0c057d8a1d0a9aa8560baffdd945acd414" +dependencies = [ + "ring", + "untrusted", +] + +[[package]] +name = "seahash" +version = "4.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1c107b6f4780854c8b126e228ea8869f4d7b71260f962fefb57b996b8959ba6b" + +[[package]] +name = "semver" +version = "0.11.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f301af10236f6df4160f7c3f04eec6dbc70ace82d23326abad5edee88801c6b6" +dependencies = [ + "semver-parser", +] + +[[package]] +name = "semver" +version = "1.0.20" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "836fa6a3e1e547f9a2c4040802ec865b5d85f4014efe00555d7090a3dcaa1090" + +[[package]] +name = "semver-parser" +version = "0.10.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "00b0bef5b7f9e0df16536d3961cfb6e84331c065b4066afb39768d0e319411f7" +dependencies = [ + "pest", +] + +[[package]] +name = "seq-macro" +version = "0.3.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a3f0bf26fd526d2a95683cd0f87bf103b8539e2ca1ef48ce002d67aad59aa0b4" + +[[package]] +name = "serde" +version = "1.0.193" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "25dd9975e68d0cb5aa1120c288333fc98731bd1dd12f561e468ea4728c042b89" +dependencies = [ + "serde_derive", +] + +[[package]] +name = "serde_cbor" +version = "0.11.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2bef2ebfde456fb76bbcf9f59315333decc4fda0b2b44b420243c11e0f5ec1f5" +dependencies = [ + "half 1.8.2", + "serde", +] + +[[package]] +name = "serde_derive" +version = "1.0.193" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "43576ca501357b9b071ac53cdc7da8ef0cbd9493d8df094cd821777ea6e894d3" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.43", +] + +[[package]] +name = "serde_json" +version = "1.0.108" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3d1c7e3eac408d115102c4c24ad393e0821bb3a5df4d506a80f85f7a742a526b" +dependencies = [ + "itoa", + "ryu", + "serde", +] + +[[package]] +name = "serde_regex" +version = "1.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a8136f1a4ea815d7eac4101cfd0b16dc0cb5e1fe1b8609dfd728058656b7badf" +dependencies = [ + "regex", + "serde", +] + +[[package]] +name = "serde_spanned" +version = "0.6.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "eb3622f419d1296904700073ea6cc23ad690adbd66f13ea683df73298736f0c1" +dependencies = [ + "serde", +] + +[[package]] +name = "service" +version = "0.0.0" +dependencies = [ + "arc-swap", + "arrayvec", + "bincode", + "bytemuck", + "byteorder", + "c", + "crc32fast", + "crossbeam", + "dashmap", + "detect", + "half 2.3.1", + "libc", + "log", + "memmap2", + "memoffset", + "multiversion", + "num-traits", + "parking_lot", + "rand", + "rayon", + "rustix 0.38.28", + "serde", + "serde_json", + "thiserror", + "ulock-sys", + "uuid", + "validator", +] + +[[package]] +name = "sha2" +version = "0.10.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "793db75ad2bcafc3ffa7c68b215fee268f537982cd901d132f89c6343f3a3dc8" +dependencies = [ + "cfg-if", + "cpufeatures", + "digest", +] + +[[package]] +name = "shlex" +version = "1.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a7cee0529a6d40f580e7a5e6c495c8fbfe21b7b52795ed4bb5e62cdf92bc6380" + +[[package]] +name = "signal-hook-registry" +version = "1.4.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d8229b473baa5980ac72ef434c4415e70c4b5e71b423043adb4ba059f89c99a1" +dependencies = [ + "libc", +] + +[[package]] +name = "similar" +version = "2.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2aeaf503862c419d66959f5d7ca015337d864e9c49485d771b732e2a20453597" + +[[package]] +name = "siphasher" +version = "0.3.11" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "38b58827f4464d87d377d175e90bf58eb00fd8716ff0a62f80356b5e61555d0d" + +[[package]] +name = "slab" +version = "0.4.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8f92a496fb766b417c996b9c5e57daf2f7ad3b0bebe1ccfca4856390e3d3bb67" +dependencies = [ + "autocfg", +] + +[[package]] +name = "sluice" +version = "0.5.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6d7400c0eff44aa2fcb5e31a5f24ba9716ed90138769e4977a2ba6014ae63eb5" +dependencies = [ + "async-channel 1.9.0", + "futures-core", + "futures-io", +] + +[[package]] +name = "smallvec" +version = "1.11.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4dccd0940a2dcdf68d092b8cbab7dc0ad8fa938bf95787e1b916b0e3d0e8e970" + +[[package]] +name = "socket2" +version = "0.4.10" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9f7916fc008ca5542385b89a3d3ce689953c143e9304a9bf8beec1de48994c0d" +dependencies = [ + "libc", + "winapi", +] + +[[package]] +name = "socket2" +version = "0.5.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7b5fac59a5cb5dd637972e5fca70daf0523c9067fcdc4842f053dae04a18f8e9" +dependencies = [ + "libc", + "windows-sys 0.48.0", +] + +[[package]] +name = "spin" +version = "0.9.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6980e8d7511241f8acf4aebddbb1ff938df5eebe98691418c4468d0b72a96a67" +dependencies = [ + "lock_api", +] + +[[package]] +name = "sptr" +version = "0.3.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3b9b39299b249ad65f3b7e96443bad61c02ca5cd3589f46cb6d610a0fd6c0d6a" + +[[package]] +name = "stable_deref_trait" +version = "1.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a8f112729512f8e442d81f95a8a7ddf2b7c6b8a1a6f509a95864142b30cab2d3" + +[[package]] +name = "std_detect" +version = "0.1.5" +source = "git+https://github.com/tensorchord/stdarch.git?branch=avx512fp16#db0cdbc9b02074bfddabfd23a4a681f21640eada" +dependencies = [ + "cfg-if", + "libc", +] + +[[package]] +name = "string_cache" +version = "0.8.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f91138e76242f575eb1d3b38b4f1362f10d3a43f47d182a5b359af488a02293b" +dependencies = [ + "new_debug_unreachable", + "once_cell", + "parking_lot", + "phf_shared 0.10.0", + "precomputed-hash", +] + +[[package]] +name = "stringprep" +version = "0.1.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bb41d74e231a107a1b4ee36bd1214b11285b77768d2e3824aedafa988fd36ee6" +dependencies = [ + "finl_unicode", + "unicode-bidi", + "unicode-normalization", +] + +[[package]] +name = "subtle" +version = "2.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "81cdd64d312baedb58e21336b31bc043b77e01cc99033ce76ef539f78e965ebc" + +[[package]] +name = "syn" +version = "1.0.109" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "72b64191b275b66ffe2469e8af2c1cfe3bafa67b529ead792a6d0160888b4237" +dependencies = [ + "proc-macro2", + "quote", + "unicode-ident", +] + +[[package]] +name = "syn" +version = "2.0.43" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ee659fb5f3d355364e1f3e5bc10fb82068efbf824a1e9d1c9504244a6469ad53" +dependencies = [ + "proc-macro2", + "quote", + "unicode-ident", +] + +[[package]] +name = "sysinfo" +version = "0.29.11" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cd727fc423c2060f6c92d9534cef765c65a6ed3f428a03d7def74a8c4348e666" +dependencies = [ + "cfg-if", + "core-foundation-sys", + "libc", + "ntapi", + "once_cell", + "rayon", + "winapi", +] + +[[package]] +name = "tap" +version = "1.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "55937e1799185b12863d447f42597ed69d9928686b8d88a1df17376a097d8369" + +[[package]] +name = "target-features" +version = "0.1.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cfb5fa503293557c5158bd215fdc225695e567a77e453f5d4452a50a193969bd" + +[[package]] +name = "tempfile" +version = "3.9.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "01ce4141aa927a6d1bd34a041795abd0db1cccba5d5f24b009f694bdf3a1f3fa" +dependencies = [ + "cfg-if", + "fastrand 2.0.1", + "redox_syscall", + "rustix 0.38.28", + "windows-sys 0.52.0", +] + +[[package]] +name = "term" +version = "0.7.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c59df8ac95d96ff9bede18eb7300b0fda5e5d8d90960e76f8e14ae765eedbf1f" +dependencies = [ + "dirs-next", + "rustversion", + "winapi", +] + +[[package]] +name = "termcolor" +version = "1.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ff1bc3d3f05aff0403e8ac0d92ced918ec05b666a43f83297ccef5bea8a3d449" +dependencies = [ + "winapi-util", +] + +[[package]] +name = "termtree" +version = "0.4.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3369f5ac52d5eb6ab48c6b4ffdc8efbcad6b89c765749064ba298f2c68a16a76" + +[[package]] +name = "thiserror" +version = "1.0.52" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "83a48fd946b02c0a526b2e9481c8e2a17755e47039164a86c4070446e3a4614d" +dependencies = [ + "thiserror-impl", +] + +[[package]] +name = "thiserror-impl" +version = "1.0.52" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e7fbe9b594d6568a6a1443250a7e67d80b74e1e96f6d1715e1e21cc1888291d3" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.43", +] + +[[package]] +name = "tiny-keccak" +version = "2.0.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2c9d3793400a45f954c52e73d068316d76b6f4e36977e3fcebb13a2721e80237" +dependencies = [ + "crunchy", +] + +[[package]] +name = "tinyvec" +version = "1.6.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "87cc5ceb3875bb20c2890005a4e226a4651264a5c75edb2421b52861a0a0cb50" +dependencies = [ + "tinyvec_macros", +] + +[[package]] +name = "tinyvec_macros" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1f3ccbac311fea05f86f61904b462b55fb3df8837a366dfc601a0161d0532f20" + +[[package]] +name = "tokio" +version = "1.35.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c89b4efa943be685f629b149f53829423f8f5531ea21249408e8e2f8671ec104" +dependencies = [ + "backtrace", + "bytes", + "libc", + "mio", + "num_cpus", + "pin-project-lite", + "signal-hook-registry", + "socket2 0.5.5", + "tokio-macros", + "windows-sys 0.48.0", +] + +[[package]] +name = "tokio-macros" +version = "2.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5b8a1e28f2deaa14e508979454cb3a223b10b938b45af148bc0986de36f1923b" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.43", +] + +[[package]] +name = "tokio-postgres" +version = "0.7.10" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d340244b32d920260ae7448cb72b6e238bddc3d4f7603394e7dd46ed8e48f5b8" +dependencies = [ + "async-trait", + "byteorder", + "bytes", + "fallible-iterator", + "futures-channel", + "futures-util", + "log", + "parking_lot", + "percent-encoding", + "phf", + "pin-project-lite", + "postgres-protocol", + "postgres-types", + "rand", + "socket2 0.5.5", + "tokio", + "tokio-util", + "whoami", +] + +[[package]] +name = "tokio-util" +version = "0.7.10" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5419f34732d9eb6ee4c3578b7989078579b7f039cbbb9ca2c4da015749371e15" +dependencies = [ + "bytes", + "futures-core", + "futures-sink", + "pin-project-lite", + "tokio", + "tracing", +] + +[[package]] +name = "toml" +version = "0.8.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a1a195ec8c9da26928f773888e0742ca3ca1040c6cd859c919c9f59c1954ab35" +dependencies = [ + "serde", + "serde_spanned", + "toml_datetime", + "toml_edit", +] + +[[package]] +name = "toml_datetime" +version = "0.6.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3550f4e9685620ac18a50ed434eb3aec30db8ba93b0287467bca5826ea25baf1" +dependencies = [ + "serde", +] + +[[package]] +name = "toml_edit" +version = "0.21.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d34d383cd00a163b4a5b85053df514d45bc330f6de7737edfe0a93311d1eaa03" +dependencies = [ + "indexmap", + "serde", + "serde_spanned", + "toml_datetime", + "winnow", +] + +[[package]] +name = "tower-service" +version = "0.3.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b6bc1c9ce2b5135ac7f93c72918fc37feb872bdc6a5533a8b85eb4b86bfdae52" + +[[package]] +name = "tracing" +version = "0.1.40" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c3523ab5a71916ccf420eebdf5521fcef02141234bbc0b8a49f2fdc4544364ef" +dependencies = [ + "log", + "pin-project-lite", + "tracing-attributes", + "tracing-core", +] + +[[package]] +name = "tracing-attributes" +version = "0.1.27" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "34704c8d6ebcbc939824180af020566b01a7c01f80641264eba0999f6c2b6be7" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.43", +] + +[[package]] +name = "tracing-core" +version = "0.1.32" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c06d3da6113f116aaee68e4d601191614c9053067f9ab7f6edbcb161237daa54" +dependencies = [ + "once_cell", +] + +[[package]] +name = "tracing-futures" +version = "0.2.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "97d095ae15e245a057c8e8451bab9b3ee1e1f68e9ba2b4fbc18d0ac5237835f2" +dependencies = [ + "pin-project", + "tracing", +] + +[[package]] +name = "try-lock" +version = "0.2.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e421abadd41a4225275504ea4d6566923418b7f05506fbc9c0fe86ba7396114b" + +[[package]] +name = "typenum" +version = "1.17.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "42ff0bf0c66b8238c6f3b578df37d0b7848e55df8577b3f74f92a69acceeb825" + +[[package]] +name = "ucd-trie" +version = "0.1.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ed646292ffc8188ef8ea4d1e0e0150fb15a5c2e12ad9b8fc191ae7a8a7f3c4b9" + +[[package]] +name = "ulock-sys" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "32ad66e1a230c3dd9e07cf0065e3f6afef1fc270716f2ba419b2ddb19971ccfa" +dependencies = [ + "cty", +] + +[[package]] +name = "unarray" +version = "0.1.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "eaea85b334db583fe3274d12b4cd1880032beab409c0d774be044d4480ab9a94" + +[[package]] +name = "unescape" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ccb97dac3243214f8d8507998906ca3e2e0b900bf9bf4870477f125b82e68f6e" + +[[package]] +name = "unicode-bidi" +version = "0.3.14" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6f2528f27a9eb2b21e69c95319b30bd0efd85d09c379741b0f78ea1d86be2416" + +[[package]] +name = "unicode-ident" +version = "1.0.12" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3354b9ac3fae1ff6755cb6db53683adb661634f67557942dea4facebec0fee4b" + +[[package]] +name = "unicode-normalization" +version = "0.1.22" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5c5713f0fc4b5db668a2ac63cdb7bb4469d8c9fed047b1d0292cc7b0ce2ba921" +dependencies = [ + "tinyvec", +] + +[[package]] +name = "unicode-segmentation" +version = "1.10.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1dd624098567895118886609431a7c3b8f516e41d30e0643f03d94592a147e36" + +[[package]] +name = "unicode-xid" +version = "0.2.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f962df74c8c05a667b5ee8bcf162993134c104e96440b663c8daa176dc772d8c" + +[[package]] +name = "untrusted" +version = "0.9.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8ecb6da28b8a351d773b68d5825ac39017e680750f980f3a1a85cd8dd28a47c1" + +[[package]] +name = "ureq" +version = "2.9.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f8cdd25c339e200129fe4de81451814e5228c9b771d57378817d6117cc2b3f97" +dependencies = [ + "base64", + "flate2", + "log", + "once_cell", + "rustls", + "rustls-webpki", + "serde", + "serde_json", + "url", + "webpki-roots", +] + +[[package]] +name = "url" +version = "2.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "31e6302e3bb753d46e83516cae55ae196fc0c309407cf11ab35cc51a4c2a4633" +dependencies = [ + "form_urlencoded", + "idna 0.5.0", + "percent-encoding", +] + +[[package]] +name = "uuid" +version = "1.6.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5e395fcf16a7a3d8127ec99782007af141946b4795001f876d54fb0d55978560" +dependencies = [ + "getrandom", + "serde", +] + +[[package]] +name = "validator" +version = "0.16.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b92f40481c04ff1f4f61f304d61793c7b56ff76ac1469f1beb199b1445b253bd" +dependencies = [ + "idna 0.4.0", + "lazy_static", + "regex", + "serde", + "serde_derive", + "serde_json", + "url", + "validator_derive", +] + +[[package]] +name = "validator_derive" +version = "0.16.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bc44ca3088bb3ba384d9aecf40c6a23a676ce23e09bdaca2073d99c207f864af" +dependencies = [ + "if_chain", + "lazy_static", + "proc-macro-error", + "proc-macro2", + "quote", + "regex", + "syn 1.0.109", + "validator_types", +] + +[[package]] +name = "validator_types" +version = "0.16.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "111abfe30072511849c5910134e8baf8dc05de4c0e5903d681cbd5c9c4d611e3" +dependencies = [ + "proc-macro2", + "syn 1.0.109", +] + +[[package]] +name = "value-bag" +version = "1.4.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4a72e1902dde2bd6441347de2b70b7f5d59bf157c6c62f0c44572607a1d55bbe" + +[[package]] +name = "vcpkg" +version = "0.2.15" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "accd4ea62f7bb7a82fe23066fb0957d48ef677f6eeb8215f372f52e48bb32426" + +[[package]] +name = "vectors" +version = "0.0.0" +dependencies = [ + "bincode", + "bytemuck", + "byteorder", + "detect", + "env_logger", + "half 2.3.1", + "httpmock", + "libc", + "log", + "mockall", + "num-traits", + "openai_api_rust", + "pgrx", + "pgrx-tests", + "rand", + "rustix 0.38.28", + "serde", + "serde_json", + "service", + "thiserror", + "toml", + "validator", +] + +[[package]] +name = "version_check" +version = "0.9.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "49874b5167b65d7193b8aba1567f5c7d93d001cafc34600cee003eda787e483f" + +[[package]] +name = "wait-timeout" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9f200f5b12eb75f8c1ed65abd4b2db8a6e1b138a20de009dacee265a2498f3f6" +dependencies = [ + "libc", +] + +[[package]] +name = "waker-fn" +version = "1.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f3c4517f54858c779bbcbf228f4fca63d121bf85fbecb2dc578cdf4a39395690" + +[[package]] +name = "walkdir" +version = "2.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d71d857dc86794ca4c280d616f7da00d2dbfd8cd788846559a6813e6aa4b54ee" +dependencies = [ + "same-file", + "winapi-util", +] + +[[package]] +name = "want" +version = "0.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bfa7760aed19e106de2c7c0b581b509f2f25d3dacaf737cb82ac61bc6d760b0e" +dependencies = [ + "try-lock", +] + +[[package]] +name = "wasi" +version = "0.11.0+wasi-snapshot-preview1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9c8d87e72b64a3b4db28d11ce29237c246188f4f51057d65a7eab63b7987e423" + +[[package]] +name = "wasm-bindgen" +version = "0.2.89" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0ed0d4f68a3015cc185aff4db9506a015f4b96f95303897bfa23f846db54064e" +dependencies = [ + "cfg-if", + "wasm-bindgen-macro", +] + +[[package]] +name = "wasm-bindgen-backend" +version = "0.2.89" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1b56f625e64f3a1084ded111c4d5f477df9f8c92df113852fa5a374dbda78826" +dependencies = [ + "bumpalo", + "log", + "once_cell", + "proc-macro2", + "quote", + "syn 2.0.43", + "wasm-bindgen-shared", +] + +[[package]] +name = "wasm-bindgen-futures" +version = "0.4.39" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ac36a15a220124ac510204aec1c3e5db8a22ab06fd6706d881dc6149f8ed9a12" +dependencies = [ + "cfg-if", + "js-sys", + "wasm-bindgen", + "web-sys", +] + +[[package]] +name = "wasm-bindgen-macro" +version = "0.2.89" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0162dbf37223cd2afce98f3d0785506dcb8d266223983e4b5b525859e6e182b2" +dependencies = [ + "quote", + "wasm-bindgen-macro-support", +] + +[[package]] +name = "wasm-bindgen-macro-support" +version = "0.2.89" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f0eb82fcb7930ae6219a7ecfd55b217f5f0893484b7a13022ebb2b2bf20b5283" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.43", + "wasm-bindgen-backend", + "wasm-bindgen-shared", +] + +[[package]] +name = "wasm-bindgen-shared" +version = "0.2.89" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7ab9b36309365056cd639da3134bf87fa8f3d86008abf99e612384a6eecd459f" + +[[package]] +name = "web-sys" +version = "0.3.66" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "50c24a44ec86bb68fbecd1b3efed7e85ea5621b39b35ef2766b66cd984f8010f" +dependencies = [ + "js-sys", + "wasm-bindgen", +] + +[[package]] +name = "webpki-roots" +version = "0.25.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1778a42e8b3b90bff8d0f5032bf22250792889a5cdc752aa0020c84abe3aaf10" + +[[package]] +name = "whoami" +version = "1.4.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "22fc3756b8a9133049b26c7f61ab35416c130e8c09b660f5b3958b446f52cc50" +dependencies = [ + "wasm-bindgen", + "web-sys", +] + +[[package]] +name = "winapi" +version = "0.3.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5c839a674fcd7a98952e593242ea400abe93992746761e38641405d28b00f419" +dependencies = [ + "winapi-i686-pc-windows-gnu", + "winapi-x86_64-pc-windows-gnu", +] + +[[package]] +name = "winapi-i686-pc-windows-gnu" +version = "0.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ac3b87c63620426dd9b991e5ce0329eff545bccbbb34f3be09ff6fb6ab51b7b6" + +[[package]] +name = "winapi-util" +version = "0.1.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f29e6f9198ba0d26b4c9f07dbe6f9ed633e1f3d5b8b414090084349e46a52596" +dependencies = [ + "winapi", +] + +[[package]] +name = "winapi-x86_64-pc-windows-gnu" +version = "0.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f" + +[[package]] +name = "windows-sys" +version = "0.48.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "677d2418bec65e3338edb076e806bc1ec15693c5d0104683f2efe857f61056a9" +dependencies = [ + "windows-targets 0.48.5", +] + +[[package]] +name = "windows-sys" +version = "0.52.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "282be5f36a8ce781fad8c8ae18fa3f9beff57ec1b52cb3de0789201425d9a33d" +dependencies = [ + "windows-targets 0.52.0", +] + +[[package]] +name = "windows-targets" +version = "0.48.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9a2fa6e2155d7247be68c096456083145c183cbbbc2764150dda45a87197940c" +dependencies = [ + "windows_aarch64_gnullvm 0.48.5", + "windows_aarch64_msvc 0.48.5", + "windows_i686_gnu 0.48.5", + "windows_i686_msvc 0.48.5", + "windows_x86_64_gnu 0.48.5", + "windows_x86_64_gnullvm 0.48.5", + "windows_x86_64_msvc 0.48.5", +] + +[[package]] +name = "windows-targets" +version = "0.52.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8a18201040b24831fbb9e4eb208f8892e1f50a37feb53cc7ff887feb8f50e7cd" +dependencies = [ + "windows_aarch64_gnullvm 0.52.0", + "windows_aarch64_msvc 0.52.0", + "windows_i686_gnu 0.52.0", + "windows_i686_msvc 0.52.0", + "windows_x86_64_gnu 0.52.0", + "windows_x86_64_gnullvm 0.52.0", + "windows_x86_64_msvc 0.52.0", +] + +[[package]] +name = "windows_aarch64_gnullvm" +version = "0.48.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2b38e32f0abccf9987a4e3079dfb67dcd799fb61361e53e2882c3cbaf0d905d8" + +[[package]] +name = "windows_aarch64_gnullvm" +version = "0.52.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cb7764e35d4db8a7921e09562a0304bf2f93e0a51bfccee0bd0bb0b666b015ea" + +[[package]] +name = "windows_aarch64_msvc" +version = "0.48.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "dc35310971f3b2dbbf3f0690a219f40e2d9afcf64f9ab7cc1be722937c26b4bc" + +[[package]] +name = "windows_aarch64_msvc" +version = "0.52.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bbaa0368d4f1d2aaefc55b6fcfee13f41544ddf36801e793edbbfd7d7df075ef" + +[[package]] +name = "windows_i686_gnu" +version = "0.48.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a75915e7def60c94dcef72200b9a8e58e5091744960da64ec734a6c6e9b3743e" + +[[package]] +name = "windows_i686_gnu" +version = "0.52.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a28637cb1fa3560a16915793afb20081aba2c92ee8af57b4d5f28e4b3e7df313" + +[[package]] +name = "windows_i686_msvc" +version = "0.48.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8f55c233f70c4b27f66c523580f78f1004e8b5a8b659e05a4eb49d4166cca406" + +[[package]] +name = "windows_i686_msvc" +version = "0.52.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ffe5e8e31046ce6230cc7215707b816e339ff4d4d67c65dffa206fd0f7aa7b9a" + +[[package]] +name = "windows_x86_64_gnu" +version = "0.48.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "53d40abd2583d23e4718fddf1ebec84dbff8381c07cae67ff7768bbf19c6718e" + +[[package]] +name = "windows_x86_64_gnu" +version = "0.52.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3d6fa32db2bc4a2f5abeacf2b69f7992cd09dca97498da74a151a3132c26befd" + +[[package]] +name = "windows_x86_64_gnullvm" +version = "0.48.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0b7b52767868a23d5bab768e390dc5f5c55825b6d30b86c844ff2dc7414044cc" + +[[package]] +name = "windows_x86_64_gnullvm" +version = "0.52.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1a657e1e9d3f514745a572a6846d3c7aa7dbe1658c056ed9c3344c4109a6949e" + +[[package]] +name = "windows_x86_64_msvc" +version = "0.48.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ed94fce61571a4006852b7389a063ab983c02eb1bb37b47f8272ce92d06d9538" + +[[package]] +name = "windows_x86_64_msvc" +version = "0.52.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "dff9641d1cd4be8d1a070daf9e3773c5f67e78b4d9d42263020c057706765c04" + +[[package]] +name = "winnow" +version = "0.5.31" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "97a4882e6b134d6c28953a387571f1acdd3496830d5e36c5e3a1075580ea641c" +dependencies = [ + "memchr", +] + +[[package]] +name = "wyz" +version = "0.5.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "05f360fc0b24296329c78fda852a1e9ae82de9cf7b27dae4b7f62f118f77b9ed" +dependencies = [ + "tap", +] diff --git a/pkgs/servers/sql/postgresql/ext/pgvecto-rs/default.nix b/pkgs/servers/sql/postgresql/ext/pgvecto-rs/default.nix new file mode 100644 index 000000000000..d348bcf87b1c --- /dev/null +++ b/pkgs/servers/sql/postgresql/ext/pgvecto-rs/default.nix @@ -0,0 +1,112 @@ +{ lib +, buildPgrxExtension +, cargo-pgrx +, clang_16 +, fetchCrate +, fetchFromGitHub +, nix-update-script +, openssl +, pkg-config +, postgresql +, rustPlatform +, stdenv +, substituteAll +}: + +let + # Upstream only works with clang 16, so we're pinning it here to + # avoid future incompatibility. + # See https://docs.pgvecto.rs/developers/development.html#environment, step 4 + clang = clang_16; + rustPlatform' = rustPlatform // { + bindgenHook = rustPlatform.bindgenHook.override { inherit clang; }; + }; + + # Upstream only works with a fixed version of cargo-pgrx for each release, + # so we're pinning it here to avoid future incompatibility. + # See https://docs.pgvecto.rs/developers/development.html#environment, step 6 + cargo-pgrx_0_11_2 = cargo-pgrx.overrideAttrs (old: rec { + pname = "cargo-pgrx"; + version = "0.11.2"; + + src = fetchCrate { + pname = "cargo-pgrx"; + inherit version; + hash = "sha256-8NlpMDFaltTIA8G4JioYm8LaPJ2RGKH5o6sd6lBHmmM="; + }; + + cargoDeps = old.cargoDeps.overrideAttrs (_: { + inherit src; + outputHash = "sha256-qTb3JV3u42EilaK2jP9oa5D09mkuHyRbGGRs9Rg4TzI="; + }); + }); + +in +(buildPgrxExtension.override { + cargo-pgrx = cargo-pgrx_0_11_2; + rustPlatform = rustPlatform'; +}) rec { + inherit postgresql; + + pname = "pgvecto-rs"; + version = "0.2.1"; + + buildInputs = [ openssl ]; + nativeBuildInputs = [ pkg-config ]; + + patches = [ + # Tell the `c` crate to use the flags from the rust bindgen hook + (substituteAll { + src = ./0001-read-clang-flags-from-environment.diff; + clang = lib.getExe clang; + }) + ]; + + src = fetchFromGitHub { + owner = "tensorchord"; + repo = "pgvecto.rs"; + rev = "v${version}"; + hash = "sha256-kwaGHerEVh6Oxb9jQupSapm7CsKl5CoH6jCv+zbi4FE="; + }; + + # Package has git dependencies on Cargo.lock (instead of just crate.io dependencies), + # so cargoHash does not work, therefore we have to include Cargo.lock in nixpkgs. + cargoLock = { + lockFile = ./Cargo.lock; + outputHashes = { + "openai_api_rust-0.1.8" = "sha256-os5Y8KIWXJEYEcNzzT57wFPpEXdZ2Uy9W3j5+hJhhR4="; + "std_detect-0.1.5" = "sha256-RwWejfqyGOaeU9zWM4fbb/hiO1wMpxYPKEjLO0rtRmU="; + }; + }; + + # Set appropriate version on vectors.control, otherwise it won't show up on PostgreSQL + postPatch = '' + substituteInPlace ./vectors.control --subst-var-by CARGO_VERSION ${version} + ''; + + # Include upgrade scripts in the final package + # https://github.com/tensorchord/pgvecto.rs/blob/v0.2.0/scripts/ci_package.sh#L6-L8 + postInstall = '' + cp sql/upgrade/* $out/share/postgresql/extension/ + ''; + + env = { + # Needed to get openssl-sys to use pkg-config. + OPENSSL_NO_VENDOR = 1; + + # Bypass rust nightly features not being available on rust stable + RUSTC_BOOTSTRAP = 1; + }; + + passthru.updateScript = nix-update-script { }; + + meta = with lib; { + # The pgrx 0.11.2 dependency is broken in aarch64-linux: https://github.com/pgcentralfoundation/pgrx/issues/1429 + # It is fixed in pgrx 0.11.3, but upstream is still using pgrx 0.11.2 + broken = (stdenv.isLinux && stdenv.isAarch64) || stdenv.isDarwin; + description = "Scalable, Low-latency and Hybrid-enabled Vector Search in Postgres"; + homepage = "https://github.com/tensorchord/pgvecto.rs"; + license = licenses.asl20; + maintainers = with maintainers; [ diogotcorreia esclear ]; + }; +} diff --git a/pkgs/servers/sql/postgresql/packages.nix b/pkgs/servers/sql/postgresql/packages.nix index 3b1c855e0de9..9cc83118c526 100644 --- a/pkgs/servers/sql/postgresql/packages.nix +++ b/pkgs/servers/sql/postgresql/packages.nix @@ -44,6 +44,8 @@ self: super: { pgsql-http = super.callPackage ./ext/pgsql-http.nix { }; + pgvecto-rs = super.callPackage ./ext/pgvecto-rs { }; + pgvector = super.callPackage ./ext/pgvector.nix { }; plpgsql_check = super.callPackage ./ext/plpgsql_check.nix { }; From 6b97ba66a4672642c5b6c1ed195511d10fc0a2ea Mon Sep 17 00:00:00 2001 From: Diogo Correia Date: Sun, 18 Feb 2024 16:53:15 +0100 Subject: [PATCH 125/230] nixos/tests/pgvecto-rs: init --- nixos/tests/all-tests.nix | 1 + nixos/tests/pgvecto-rs.nix | 76 +++++++++++++++++++ .../sql/postgresql/ext/pgvecto-rs/default.nix | 8 +- 3 files changed, 84 insertions(+), 1 deletion(-) create mode 100644 nixos/tests/pgvecto-rs.nix diff --git a/nixos/tests/all-tests.nix b/nixos/tests/all-tests.nix index 7376cd40b910..6c188593a97a 100644 --- a/nixos/tests/all-tests.nix +++ b/nixos/tests/all-tests.nix @@ -686,6 +686,7 @@ in { pgbouncer = handleTest ./pgbouncer.nix {}; pgjwt = handleTest ./pgjwt.nix {}; pgmanage = handleTest ./pgmanage.nix {}; + pgvecto-rs = handleTest ./pgvecto-rs.nix {}; phosh = handleTest ./phosh.nix {}; photoprism = handleTest ./photoprism.nix {}; php = handleTest ./php {}; diff --git a/nixos/tests/pgvecto-rs.nix b/nixos/tests/pgvecto-rs.nix new file mode 100644 index 000000000000..cd871dab6a0f --- /dev/null +++ b/nixos/tests/pgvecto-rs.nix @@ -0,0 +1,76 @@ +# mostly copied from ./timescaledb.nix which was copied from ./postgresql.nix +# as it seemed unapproriate to test additional extensions for postgresql there. + +{ system ? builtins.currentSystem +, config ? { } +, pkgs ? import ../.. { inherit system config; } +}: + +with import ../lib/testing-python.nix { inherit system pkgs; }; +with pkgs.lib; + +let + postgresql-versions = import ../../pkgs/servers/sql/postgresql pkgs; + # Test cases from https://docs.pgvecto.rs/use-cases/hybrid-search.html + test-sql = pkgs.writeText "postgresql-test" '' + CREATE EXTENSION vectors; + + CREATE TABLE items ( + id bigserial PRIMARY KEY, + content text NOT NULL, + embedding vectors.vector(3) NOT NULL -- 3 dimensions + ); + + INSERT INTO items (content, embedding) VALUES + ('a fat cat sat on a mat and ate a fat rat', '[1, 2, 3]'), + ('a fat dog sat on a mat and ate a fat rat', '[4, 5, 6]'), + ('a thin cat sat on a mat and ate a thin rat', '[7, 8, 9]'), + ('a thin dog sat on a mat and ate a thin rat', '[10, 11, 12]'); + ''; + make-postgresql-test = postgresql-name: postgresql-package: makeTest { + name = postgresql-name; + meta = with pkgs.lib.maintainers; { + maintainers = [ diogotcorreia ]; + }; + + nodes.machine = { ... }: + { + services.postgresql = { + enable = true; + package = postgresql-package; + extraPlugins = ps: with ps; [ + pgvecto-rs + ]; + settings.shared_preload_libraries = "vectors"; + }; + }; + + testScript = '' + def check_count(statement, lines): + return 'test $(sudo -u postgres psql postgres -tAc "{}"|wc -l) -eq {}'.format( + statement, lines + ) + + + machine.start() + machine.wait_for_unit("postgresql") + + with subtest("Postgresql with extension vectors is available just after unit start"): + machine.succeed(check_count("SELECT * FROM pg_available_extensions WHERE name = 'vectors' AND default_version = '${postgresql-package.pkgs.pgvecto-rs.version}';", 1)) + + machine.succeed("sudo -u postgres psql -f ${test-sql}") + + machine.succeed(check_count("SELECT content, embedding FROM items WHERE to_tsvector('english', content) @@ 'cat & rat'::tsquery;", 2)) + + machine.shutdown() + ''; + + }; + applicablePostgresqlVersions = filterAttrs (_: value: versionAtLeast value.version "12") postgresql-versions; +in +mapAttrs' + (name: package: { + inherit name; + value = make-postgresql-test name package; + }) + applicablePostgresqlVersions diff --git a/pkgs/servers/sql/postgresql/ext/pgvecto-rs/default.nix b/pkgs/servers/sql/postgresql/ext/pgvecto-rs/default.nix index d348bcf87b1c..23d4499029ea 100644 --- a/pkgs/servers/sql/postgresql/ext/pgvecto-rs/default.nix +++ b/pkgs/servers/sql/postgresql/ext/pgvecto-rs/default.nix @@ -5,6 +5,7 @@ , fetchCrate , fetchFromGitHub , nix-update-script +, nixosTests , openssl , pkg-config , postgresql @@ -98,7 +99,12 @@ in RUSTC_BOOTSTRAP = 1; }; - passthru.updateScript = nix-update-script { }; + passthru = { + updateScript = nix-update-script { }; + tests = { + pgvecto-rs = nixosTests.pgvecto-rs; + }; + }; meta = with lib; { # The pgrx 0.11.2 dependency is broken in aarch64-linux: https://github.com/pgcentralfoundation/pgrx/issues/1429 From 7f4037b826c872c0b1a45e73481adf1f0bcc3b71 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 11 Mar 2024 01:06:11 +0000 Subject: [PATCH 126/230] python312Packages.xiaomi-ble: 0.26.1 -> 0.27.0 --- pkgs/development/python-modules/xiaomi-ble/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/xiaomi-ble/default.nix b/pkgs/development/python-modules/xiaomi-ble/default.nix index 18de691f5398..8264a5b9fb17 100644 --- a/pkgs/development/python-modules/xiaomi-ble/default.nix +++ b/pkgs/development/python-modules/xiaomi-ble/default.nix @@ -17,7 +17,7 @@ buildPythonPackage rec { pname = "xiaomi-ble"; - version = "0.26.1"; + version = "0.27.0"; pyproject = true; disabled = pythonOlder "3.9"; @@ -26,7 +26,7 @@ buildPythonPackage rec { owner = "Bluetooth-Devices"; repo = "xiaomi-ble"; rev = "refs/tags/v${version}"; - hash = "sha256-ENs+n8YgOSQpN+UpYU6CI1McWPyh8hKKMUjPDUYRWjI="; + hash = "sha256-D1LqIdnusCs7vzVCPnbhXqRER/+uPKWoVsfeGe2M6b8="; }; postPatch = '' From 883bd5b8a7edbcbd4441b75f9a4b31987f7155cf Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 11 Mar 2024 01:07:05 +0000 Subject: [PATCH 127/230] simdjson: 3.7.0 -> 3.8.0 --- pkgs/development/libraries/simdjson/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/simdjson/default.nix b/pkgs/development/libraries/simdjson/default.nix index cf56180551fd..9e28ea4eed38 100644 --- a/pkgs/development/libraries/simdjson/default.nix +++ b/pkgs/development/libraries/simdjson/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "simdjson"; - version = "3.7.0"; + version = "3.8.0"; src = fetchFromGitHub { owner = "simdjson"; repo = "simdjson"; rev = "v${version}"; - sha256 = "sha256-0fizP+j06NAp4CJynjzHG25OBmTa7wjkLZ2MBs1NxG4="; + sha256 = "sha256-1WxQU9WAIZKVoNTYJRnwxLAloBfW1g5XSPH4b29x9rE="; }; nativeBuildInputs = [ cmake ]; From 30e455e73fd82efd2f0d855daf67b1b2f7bb9756 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 11 Mar 2024 01:11:00 +0000 Subject: [PATCH 128/230] whistle: 2.9.65 -> 2.9.66 --- pkgs/by-name/wh/whistle/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/wh/whistle/package.nix b/pkgs/by-name/wh/whistle/package.nix index 3963889583ec..9f1adad1ef72 100644 --- a/pkgs/by-name/wh/whistle/package.nix +++ b/pkgs/by-name/wh/whistle/package.nix @@ -2,16 +2,16 @@ buildNpmPackage rec { pname = "whistle"; - version = "2.9.65"; + version = "2.9.66"; src = fetchFromGitHub { owner = "avwo"; repo = "whistle"; rev = "v${version}"; - hash = "sha256-vF81Nt0gx3k7b6VO6aBpeUSnZ8Op91dYOGZRO9cdleM="; + hash = "sha256-bKHpbTdKFbeQGPl2HFcXi6y27s0JylyUXKg9oAcuSXo="; }; - npmDepsHash = "sha256-LzetbeIqfcFbLzie4GXkNOGLTdwqYMnwZ236V5R2TNc="; + npmDepsHash = "sha256-34KrqF534igGsLfOUxJN5dhtj2rrKGbkUUWr6p7V/Go="; dontNpmBuild = true; From d953181668c65fc7b1eb9e935706b966846b1d7e Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 11 Mar 2024 01:12:39 +0000 Subject: [PATCH 129/230] cargo-chef: 0.1.65 -> 0.1.66 --- pkgs/development/tools/rust/cargo-chef/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/tools/rust/cargo-chef/default.nix b/pkgs/development/tools/rust/cargo-chef/default.nix index 19591518b445..030450d454d3 100644 --- a/pkgs/development/tools/rust/cargo-chef/default.nix +++ b/pkgs/development/tools/rust/cargo-chef/default.nix @@ -2,14 +2,14 @@ rustPlatform.buildRustPackage rec { pname = "cargo-chef"; - version = "0.1.65"; + version = "0.1.66"; src = fetchCrate { inherit pname version; - sha256 = "sha256-3G2mgQDSj+IL6gqdhr3Sov9FHwLA6B+MRazLNF+zKZk="; + sha256 = "sha256-I4lD3+WFaW0kPmw5lPybDCRkG/at6VQH6l7pmngwoLU="; }; - cargoHash = "sha256-hWkUvUFYAOqRkoU52bKzEmvNaqASfWLlnWtIuFLMDc8="; + cargoHash = "sha256-tSr4m10zS+/JynGmNY0+aoiYDATYwuyfr1VGKmIkHg4="; meta = with lib; { description = "A cargo-subcommand to speed up Rust Docker builds using Docker layer caching"; From 271b23cc2ca1336e29bea638ffe7fb5417ffd3af Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 11 Mar 2024 01:30:36 +0000 Subject: [PATCH 130/230] feather: 2.6.3 -> 2.6.4 --- pkgs/by-name/fe/feather/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/fe/feather/package.nix b/pkgs/by-name/fe/feather/package.nix index 67b0770d65c7..de680e74caf2 100644 --- a/pkgs/by-name/fe/feather/package.nix +++ b/pkgs/by-name/fe/feather/package.nix @@ -21,13 +21,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "feather"; - version = "2.6.3"; + version = "2.6.4"; src = fetchFromGitHub { owner = "feather-wallet"; repo = "feather"; rev = finalAttrs.version; - hash = "sha256-pQnaJbKznK1i8wn7t8ZnxLVu1LV/D47krxZZ0j6Mw6g="; + hash = "sha256-NFFIpHyie8jABfmiJP38VbPFjZgaNc+i5JcpbRr+mBU="; fetchSubmodules = true; }; From f7cfc1e03abc8917fd08be233e2442ef30ee4f83 Mon Sep 17 00:00:00 2001 From: Peder Bergebakken Sundt Date: Mon, 11 Mar 2024 03:04:46 +0100 Subject: [PATCH 131/230] vscode-extensions.shd101wyy.markdown-preview-enhanced: 0.8.10 -> 0.8.12 --- pkgs/applications/editors/vscode/extensions/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/editors/vscode/extensions/default.nix b/pkgs/applications/editors/vscode/extensions/default.nix index e2fdd0ed37ee..a4ede1ca3859 100644 --- a/pkgs/applications/editors/vscode/extensions/default.nix +++ b/pkgs/applications/editors/vscode/extensions/default.nix @@ -3447,8 +3447,8 @@ let mktplcRef = { publisher = "shd101wyy"; name = "markdown-preview-enhanced"; - version = "0.8.10"; - sha256 = "sha256-BjTV2uH9QqCS1VJ94XXgzNMJb4FB4Ee+t/5uAQfJCuM="; + version = "0.8.12"; + sha256 = "sha256-4Iq6idux029i7cBV3x79ZRAbSk3ymqx+Q2jv0zV9ZTI="; }; meta = { description = "Provides a live preview of markdown using either markdown-it or pandoc"; From 69cf89d97eddbb84da6b4d6020e9daaa65e58310 Mon Sep 17 00:00:00 2001 From: Philip Taron Date: Sun, 10 Mar 2024 18:57:35 -0700 Subject: [PATCH 132/230] ren-find: init at 0-unstable-2024-01-11 --- pkgs/by-name/re/ren-find/package.nix | 26 ++++++++++++++++++++++++++ 1 file changed, 26 insertions(+) create mode 100644 pkgs/by-name/re/ren-find/package.nix diff --git a/pkgs/by-name/re/ren-find/package.nix b/pkgs/by-name/re/ren-find/package.nix new file mode 100644 index 000000000000..caddd17ae1d5 --- /dev/null +++ b/pkgs/by-name/re/ren-find/package.nix @@ -0,0 +1,26 @@ +{ lib +, rustPlatform +, fetchFromGitHub +}: + +rustPlatform.buildRustPackage rec { + pname = "ren-find"; + version = "0-unstable-2024-01-11"; + + src = fetchFromGitHub { + owner = "robenkleene"; + repo = "ren-find"; + rev = "50c40172e354caffee48932266edd7c7a76a20f"; + hash = "sha256-zVIt6Xp+Mvym6gySvHIZJt1QgzKVP/wbTGTubWk6kzI="; + }; + + cargoHash = "sha256-pUy8850v4m9P5OuL15qxmDDQYYyae9HFXRbg3b4f3Lw="; + + meta = with lib; { + description = "A command-line utility that takes find-formatted lines and batch renames them."; + homepage = "https://github.com/robenkleene/ren-find"; + license = licenses.mit; + maintainers = with maintainers; [ philiptaron ]; + mainProgram = "ren"; + }; +} From 7d5aa3998f670ca0c0840288dc635d61efc32d89 Mon Sep 17 00:00:00 2001 From: Philip Taron Date: Sun, 10 Mar 2024 19:07:20 -0700 Subject: [PATCH 133/230] rep-grep: init at 0-unstable-2024-02-06 --- pkgs/by-name/re/rep-grep/package.nix | 26 ++++++++++++++++++++++++++ 1 file changed, 26 insertions(+) create mode 100644 pkgs/by-name/re/rep-grep/package.nix diff --git a/pkgs/by-name/re/rep-grep/package.nix b/pkgs/by-name/re/rep-grep/package.nix new file mode 100644 index 000000000000..1869938cb55b --- /dev/null +++ b/pkgs/by-name/re/rep-grep/package.nix @@ -0,0 +1,26 @@ +{ lib +, rustPlatform +, fetchFromGitHub +}: + +rustPlatform.buildRustPackage rec { + pname = "rep-grep"; + version = "0-unstable-2024-02-06"; + + src = fetchFromGitHub { + owner = "robenkleene"; + repo = "rep-grep"; + rev = "10510d47e392cb9d30a861c69f702fd194b3fa88"; + hash = "sha256-/dH+mNtNHaYFndVhoqmz4Sc3HeemoQt1HGD98mb9Qhw="; + }; + + cargoHash = "sha256-ch+RMLc+xogL0gkrnw+n+bmUVIcixdPTaNPHPuJ0/EI="; + + meta = with lib; { + description = "A command-line utility that takes grep-formatted lines and performs a find-and-replace on them."; + homepage = "https://github.com/robenkleene/rep-grep"; + license = licenses.mit; + maintainers = with maintainers; [ philiptaron ]; + mainProgram = "rep"; + }; +} From 4ae9084ddd02925c361b86a7b5ceef1df71132ec Mon Sep 17 00:00:00 2001 From: TheMaxMur Date: Mon, 11 Mar 2024 05:33:41 +0300 Subject: [PATCH 134/230] vscode-extensions.naumovs.theme-oceanicnext: init 0.0.4 --- .../editors/vscode/extensions/default.nix | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) diff --git a/pkgs/applications/editors/vscode/extensions/default.nix b/pkgs/applications/editors/vscode/extensions/default.nix index e2fdd0ed37ee..7cee28c2a569 100644 --- a/pkgs/applications/editors/vscode/extensions/default.nix +++ b/pkgs/applications/editors/vscode/extensions/default.nix @@ -2971,6 +2971,23 @@ let }; }; + naumovs.theme-oceanicnext = buildVscodeMarketplaceExtension { + mktplcRef = { + name = "theme-oceanicnext"; + publisher = "naumovs"; + version = "0.0.4"; + sha256 = "sha256-romhWL3s0NVZ3kptSNT4/X9WkgakgNNfFElaBCo6jj4="; + }; + meta = { + description = "Oceanic Next theme for VSCode + dimmed bg version for better looking UI"; + downloadPage = "https://marketplace.visualstudio.com/items?itemName=naumovs.theme-oceanicnext"; + homepage = "https://github.com/voronianski/oceanic-next-color-scheme"; + license = lib.licenses.unlicense; + maintainers = [ lib.maintainers.themaxmur ]; + platforms = [ "x86_64-linux" "aarch64-darwin" ]; + }; + }; + njpwerner.autodocstring = buildVscodeMarketplaceExtension { mktplcRef = { name = "autodocstring"; From cb7d6b4b48b97f015bc5585d8eaeda3df59098d5 Mon Sep 17 00:00:00 2001 From: aleksana Date: Mon, 11 Mar 2024 08:05:55 +0800 Subject: [PATCH 135/230] varia: init at 2024.2.29-2 --- pkgs/by-name/va/varia/package.nix | 68 +++++++++++++++++++++++++++++++ 1 file changed, 68 insertions(+) create mode 100644 pkgs/by-name/va/varia/package.nix diff --git a/pkgs/by-name/va/varia/package.nix b/pkgs/by-name/va/varia/package.nix new file mode 100644 index 000000000000..d0ee4574b1e7 --- /dev/null +++ b/pkgs/by-name/va/varia/package.nix @@ -0,0 +1,68 @@ +{ lib +, python3Packages +, fetchFromGitHub +, aria2 +, meson +, ninja +, pkg-config +, gobject-introspection +, wrapGAppsHook4 +, desktop-file-utils +, libadwaita +}: + +python3Packages.buildPythonApplication rec { + pname = "varia"; + version = "2024.2.29-2"; + pyproject = false; + + src = fetchFromGitHub { + owner = "giantpinkrobots"; + repo = "varia"; + rev = "v${version}"; + hash = "sha256-PDI+URSop95e0bkSkE/9xV5Ezwj3vRmDA4Qyr1n8mCw="; + }; + + postPatch = '' + substituteInPlace src/varia-py.in \ + --replace-fail 'aria2cexec = sys.argv[1]' 'aria2cexec = "${lib.getExe aria2}"' + ''; + + nativeBuildInputs = [ + meson + ninja + pkg-config + gobject-introspection + wrapGAppsHook4 + desktop-file-utils + ]; + + buildInputs = [ + libadwaita + ]; + + propagatedBuildInputs = with python3Packages; [ + pygobject3 + aria2p + ]; + + postInstall = '' + rm $out/bin/varia + mv $out/bin/varia-py.py $out/bin/varia + ''; + + dontWrapGApps = true; + + preFixup = '' + makeWrapperArgs+=("''${gappsWrapperArgs[@]}") + ''; + + meta = with lib; { + description = "A simple download manager based on aria2 and libadwaita"; + homepage = "https://giantpinkrobots.github.io/varia"; + license = licenses.mpl20; + mainProgram = "varia"; + maintainers = with maintainers; [ aleksana ]; + platforms = platforms.linux; + }; +} From aa4dfd8b0e1a4f8b0c52b90a3ca0060d1ea998da Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 11 Mar 2024 02:39:04 +0000 Subject: [PATCH 136/230] vale: 3.2.2 -> 3.3.0 --- pkgs/tools/text/vale/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/text/vale/default.nix b/pkgs/tools/text/vale/default.nix index e3d2896078ca..f5e02eef3924 100644 --- a/pkgs/tools/text/vale/default.nix +++ b/pkgs/tools/text/vale/default.nix @@ -2,7 +2,7 @@ buildGoModule rec { pname = "vale"; - version = "3.2.2"; + version = "3.3.0"; subPackages = [ "cmd/vale" ]; outputs = [ "out" "data" ]; @@ -11,10 +11,10 @@ buildGoModule rec { owner = "errata-ai"; repo = "vale"; rev = "v${version}"; - hash = "sha256-CLbzrJJVgFxJKuTtXQKGZ6q228Sm7s+Is11TE8mAmD8="; + hash = "sha256-Mh0JKbQrsP45Bn9EdTJCuSPC13vCsnuOtoi68Z6fttc="; }; - vendorHash = "sha256-KxIQZViUYT4cgRlOuKBwen6pqQjGiAofkeBztmjnKdQ="; + vendorHash = "sha256-HMzFLSmO6sBDNU89UoIvHcPPd3ubpti2ii4sFMKUDmI="; postInstall = '' mkdir -p $data/share/vale From aae884c8a6531ba617ee06e1bdf325a9e8734c77 Mon Sep 17 00:00:00 2001 From: Vincent Laporte Date: Mon, 11 Mar 2024 04:29:23 +0100 Subject: [PATCH 137/230] =?UTF-8?q?liquidsoap:=202.2.3=20=E2=86=92=202.2.4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit ocamlPackages.cry: 1.0.1 → 1.0.2 Support for gstreamer in liquidsoap has been removed in nixpkgs as: - it does not build (see: liquidsoap PR 3769); - it is deprecated. --- pkgs/development/ocaml-modules/cry/default.nix | 6 +++--- pkgs/tools/audio/liquidsoap/full.nix | 7 +++---- 2 files changed, 6 insertions(+), 7 deletions(-) diff --git a/pkgs/development/ocaml-modules/cry/default.nix b/pkgs/development/ocaml-modules/cry/default.nix index 8e475a7987cc..e4339ef7563b 100644 --- a/pkgs/development/ocaml-modules/cry/default.nix +++ b/pkgs/development/ocaml-modules/cry/default.nix @@ -2,17 +2,17 @@ buildDunePackage rec { pname = "cry"; - version = "1.0.1"; + version = "1.0.2"; src = fetchFromGitHub { owner = "savonet"; repo = "ocaml-cry"; rev = "v${version}"; - sha256 = "sha256-wn9hLqbydzFTdYsJ1e76dmDLtwcZ7CGjbzFe5o9veYQ="; + hash = "sha256-wtilYOUOHElW8ZVxolMNomvT//ho2tACmoubEvU2bpQ="; }; postPatch = '' - substituteInPlace src/dune --replace bytes "" + substituteInPlace src/dune --replace-warn bytes "" ''; minimalOCamlVersion = "4.12"; diff --git a/pkgs/tools/audio/liquidsoap/full.nix b/pkgs/tools/audio/liquidsoap/full.nix index 87914436fd49..b4c4af7d457d 100644 --- a/pkgs/tools/audio/liquidsoap/full.nix +++ b/pkgs/tools/audio/liquidsoap/full.nix @@ -7,7 +7,7 @@ let pname = "liquidsoap"; - version = "2.2.3"; + version = "2.2.4"; in stdenv.mkDerivation { inherit pname version; @@ -16,7 +16,7 @@ stdenv.mkDerivation { owner = "savonet"; repo = "liquidsoap"; rev = "refs/tags/v${version}"; - hash = "sha256-oCMSdmdU3oHrq3QFEDQLdb3CLFYcWylxTqKWtGOoQW8="; + hash = "sha256-aAW3PeobTRVi5mV321MHZ6RymvOY4DbZITjwcMwGwFo="; }; postPatch = '' @@ -76,6 +76,7 @@ stdenv.mkDerivation { ocamlPackages.camomile ocamlPackages.uri ocamlPackages.fileutils + ocamlPackages.magic-mime ocamlPackages.menhir # liquidsoap-lang ocamlPackages.menhirLib ocamlPackages.metadata @@ -99,7 +100,6 @@ stdenv.mkDerivation { ocamlPackages.frei0r ocamlPackages.gd4o ocamlPackages.graphics - ocamlPackages.gstreamer ocamlPackages.imagelib ocamlPackages.inotify ocamlPackages.ladspa @@ -108,7 +108,6 @@ stdenv.mkDerivation { ocamlPackages.lilv ocamlPackages.lo ocamlPackages.mad - ocamlPackages.magic ocamlPackages.ogg ocamlPackages.opus ocamlPackages.portaudio From 5eb909c68ff2e54abf2a2bc1090bead3ae2bd797 Mon Sep 17 00:00:00 2001 From: Muhammad Falak R Wani Date: Mon, 11 Mar 2024 08:22:16 +0530 Subject: [PATCH 138/230] just: 1.25.1 -> 1.25.2 Diff: https://github.com/casey/just/compare/refs/tags/1.25.1...1.25.2 Changelog: https://github.com/casey/just/blob/1.25.2/CHANGELOG.md Signed-off-by: Muhammad Falak R Wani --- pkgs/by-name/ju/just/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/ju/just/package.nix b/pkgs/by-name/ju/just/package.nix index c3a8c11eb334..c613853ef3d9 100644 --- a/pkgs/by-name/ju/just/package.nix +++ b/pkgs/by-name/ju/just/package.nix @@ -11,17 +11,17 @@ rustPlatform.buildRustPackage rec { pname = "just"; - version = "1.25.1"; + version = "1.25.2"; outputs = [ "out" "man" "doc" ]; src = fetchFromGitHub { owner = "casey"; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-CvOnvUez2mfta9aXmdsLFxpVB/TGDw0y0ha3OyNJ2DE="; + hash = "sha256-w7tHLjIFnlvyuTw5yG6zxJtQ7oDNdKRXHIRKY638vTo="; }; - cargoHash = "sha256-b4hprcYOcY0z0UnUe3pGc87j+X3n52btYlaCemETLYg="; + cargoHash = "sha256-VL2uNbEtqOv3xmLukhdCmo3lrfx5yFwOAMGwgBlgAVw="; nativeBuildInputs = [ installShellFiles mdbook ]; buildInputs = lib.optionals stdenv.isDarwin [ libiconv ]; From b687a81b3fba9a031426cd8c9dbd637ead370194 Mon Sep 17 00:00:00 2001 From: pca006132 Date: Mon, 11 Mar 2024 13:17:35 +0800 Subject: [PATCH 139/230] openscad-unstable: 2024-02-18 -> 2024-03-10 --- pkgs/by-name/op/openscad-unstable/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/op/openscad-unstable/package.nix b/pkgs/by-name/op/openscad-unstable/package.nix index cd14fb525c36..5c97d5e37755 100644 --- a/pkgs/by-name/op/openscad-unstable/package.nix +++ b/pkgs/by-name/op/openscad-unstable/package.nix @@ -79,12 +79,12 @@ in # clang consume much less RAM than GCC clangStdenv.mkDerivation rec { pname = "openscad-unstable"; - version = "2024-02-18"; + version = "2024-03-10"; src = fetchFromGitHub { owner = "openscad"; repo = "openscad"; - rev = "f5688998760d6b85d7b280300388448c162edc42"; - hash = "sha256-rQnih7Am7NvlrTwIGAN4QbZCcziFm6YOOT27wmjcY8A="; + rev = "db167b1df31fbd8a2101cf3a13dac148b0c2165d"; + hash = "sha256-i2ZGYsNfMLDi3wRd/lohs9BuO2KuQ/7kJIXGtV65OQU="; fetchSubmodules = true; }; nativeBuildInputs = [ From 3ddb1c3c0905a5537f820bf6a79991d94eaa93cf Mon Sep 17 00:00:00 2001 From: pca006132 Date: Fri, 23 Feb 2024 14:15:16 +0800 Subject: [PATCH 140/230] openscad-unstable: run tests --- pkgs/by-name/op/openscad-unstable/package.nix | 33 +++++++++++---- pkgs/by-name/op/openscad-unstable/test.diff | 42 +++++++++++++++++++ 2 files changed, 68 insertions(+), 7 deletions(-) create mode 100644 pkgs/by-name/op/openscad-unstable/test.diff diff --git a/pkgs/by-name/op/openscad-unstable/package.nix b/pkgs/by-name/op/openscad-unstable/package.nix index 5c97d5e37755..05aaf2dee012 100644 --- a/pkgs/by-name/op/openscad-unstable/package.nix +++ b/pkgs/by-name/op/openscad-unstable/package.nix @@ -15,25 +15,27 @@ , flex , fontconfig , freetype +, ghostscript , glib , glm , gmp , harfbuzz , hidapi , lib3mf -, libGL , libGLU , libICE , libSM , libsForQt5 , libspnav , libzip +, mesa , mpfr , python3 , tbb_2021_8 , wayland , wayland-protocols , wrapGAppsHook +, xorg }: let # get cccl from source to avoid license issues @@ -87,16 +89,17 @@ clangStdenv.mkDerivation rec { hash = "sha256-i2ZGYsNfMLDi3wRd/lohs9BuO2KuQ/7kJIXGtV65OQU="; fetchSubmodules = true; }; + patches = [ ./test.diff ]; nativeBuildInputs = [ - pkg-config - cmake - ninja + (python3.withPackages (ps: with ps; [ numpy pillow ])) bison + cmake flex - python3 libsForQt5.qt5.wrapQtAppsHook llvmPackages.bintools wrapGAppsHook + ninja + pkg-config ]; buildInputs = with libsForQt5; with qt5; [ # manifold dependencies @@ -112,6 +115,7 @@ clangStdenv.mkDerivation rec { eigen fontconfig freetype + ghostscript glib gmp harfbuzz @@ -124,7 +128,15 @@ clangStdenv.mkDerivation rec { qtbase qtmultimedia ] - ++ lib.optionals clangStdenv.isLinux [ libICE libSM libGLU libGL wayland wayland-protocols qtwayland ] + ++ lib.optionals clangStdenv.isLinux [ + xorg.libXdmcp + libICE + libSM + wayland + wayland-protocols + qtwayland + libGLU + ] ++ lib.optional clangStdenv.isDarwin qtmacextras ; cmakeFlags = [ @@ -133,11 +145,18 @@ clangStdenv.mkDerivation rec { "-DUSE_BUILTIN_OPENCSG=ON" # bundled latest opencsg "-DOPENSCAD_VERSION=\"${builtins.replaceStrings ["-"] ["."] version}\"" "-DCMAKE_UNITY_BUILD=ON" # faster build - "-DENABLE_TESTS=OFF" # tests do not work for now # IPO "-DCMAKE_EXE_LINKER_FLAGS=-fuse-ld=lld" "-DCMAKE_INTERPROCEDURAL_OPTIMIZATION=ON" ]; + doCheck = true; + checkPhase = '' + # for running mesa llvmpipe + export __EGL_VENDOR_LIBRARY_FILENAMES=${mesa.drivers}/share/glvnd/egl_vendor.d/50_mesa.json + export LIBGL_DRIVERS_PATH=${mesa.drivers}/lib:${mesa.drivers}/lib/dri + # some fontconfig issues cause pdf output to have wrong font + ctest -j$NIX_BUILD_CORES -E pdfexporttest.\* + ''; meta = with lib; { description = "3D parametric model compiler (unstable)"; longDescription = '' diff --git a/pkgs/by-name/op/openscad-unstable/test.diff b/pkgs/by-name/op/openscad-unstable/test.diff new file mode 100644 index 000000000000..23b3983daddd --- /dev/null +++ b/pkgs/by-name/op/openscad-unstable/test.diff @@ -0,0 +1,42 @@ +diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt +index 5c1b40af4..917451dee 100644 +--- a/tests/CMakeLists.txt ++++ b/tests/CMakeLists.txt +@@ -59,13 +59,14 @@ if(USE_IMAGE_COMPARE_PY) + + # Since msys2 on Windows prefers bin/ over Scripts, we need to look for the actual folder to determine + # how to utilize the venv +- find_path(VENV_BIN_PATH activate PATHS "${VENV_DIR}/bin" "${VENV_DIR}/Scripts" NO_DEFAULT_PATH NO_CACHE) +- if(WIN32) +- set(IMAGE_COMPARE_EXE "${VENV_BIN_PATH}/python.exe") +- else() +- set(IMAGE_COMPARE_EXE "${VENV_BIN_PATH}/python") +- endif() +- if(EXISTS "${IMAGE_COMPARE_EXE}") ++ # find_path(VENV_BIN_PATH activate PATHS "${VENV_DIR}/bin" "${VENV_DIR}/Scripts" NO_DEFAULT_PATH NO_CACHE) ++ # if(WIN32) ++ # set(IMAGE_COMPARE_EXE "${VENV_BIN_PATH}/python.exe") ++ # else() ++ # set(IMAGE_COMPARE_EXE "${VENV_BIN_PATH}/python") ++ # endif() ++ set(IMAGE_COMPARE_EXE "python3") ++ # if(EXISTS "${IMAGE_COMPARE_EXE}") + message(STATUS "venv found, testing libraries") + execute_process( + COMMAND "${IMAGE_COMPARE_EXE}" "${CCSD}/image_compare.py" "--status" +@@ -77,10 +78,10 @@ if(USE_IMAGE_COMPARE_PY) + message(STATUS "venv libraries complete") + set(BUILD_VENV FALSE) + endif() +- else() +- message(STATUS "venv not found") +- set(BUILD_VENV TRUE) +- endif() ++ # else() ++ # message(STATUS "venv not found") ++ # set(BUILD_VENV TRUE) ++ # endif() + if(BUILD_VENV) + message(STATUS "Setting up testing venv for image comparison") + execute_process( + From dd01167b677deb245fcc4089d5b0e375bfb97dab Mon Sep 17 00:00:00 2001 From: K900 Date: Mon, 11 Mar 2024 08:30:15 +0300 Subject: [PATCH 141/230] linux_6_8: init at 6.8 --- pkgs/os-specific/linux/kernel/kernels-org.json | 4 ++++ pkgs/top-level/aliases.nix | 2 ++ pkgs/top-level/linux-kernels.nix | 13 ++++++++++++- 3 files changed, 18 insertions(+), 1 deletion(-) diff --git a/pkgs/os-specific/linux/kernel/kernels-org.json b/pkgs/os-specific/linux/kernel/kernels-org.json index e16804af99d3..c838d6371b6a 100644 --- a/pkgs/os-specific/linux/kernel/kernels-org.json +++ b/pkgs/os-specific/linux/kernel/kernels-org.json @@ -30,5 +30,9 @@ "6.7": { "version": "6.7.9", "hash": "sha256:0inkvyrvq60j9lxgivkivq3qh94lsfc1dpv6vwgxmy3q0zy37mqg" + }, + "6.8": { + "version": "6.8", + "hash": "sha256:1wv5x7qhcd05m8m0myyqm2il6mha1sx11h7ppf8yjsxvx2jdwsf9" } } diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index e9ac017bf1b5..4ac2114c2bec 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -607,6 +607,7 @@ mapAliases ({ linuxPackages_6_5 = linuxKernel.packages.linux_6_5; linuxPackages_6_6 = linuxKernel.packages.linux_6_6; linuxPackages_6_7 = linuxKernel.packages.linux_6_7; + linuxPackages_6_8 = linuxKernel.packages.linux_6_8; linuxPackages_rpi0 = linuxKernel.packages.linux_rpi1; linuxPackages_rpi02w = linuxKernel.packages.linux_rpi3; linuxPackages_rpi1 = linuxKernel.packages.linux_rpi1; @@ -633,6 +634,7 @@ mapAliases ({ linux_6_5 = linuxKernel.kernels.linux_6_5; linux_6_6 = linuxKernel.kernels.linux_6_6; linux_6_7 = linuxKernel.kernels.linux_6_7; + linux_6_8 = linuxKernel.kernels.linux_6_8; linux_rpi0 = linuxKernel.kernels.linux_rpi1; linux_rpi02w = linuxKernel.kernels.linux_rpi3; linux_rpi1 = linuxKernel.kernels.linux_rpi1; diff --git a/pkgs/top-level/linux-kernels.nix b/pkgs/top-level/linux-kernels.nix index 5f0fe736d38a..1a040f052c71 100644 --- a/pkgs/top-level/linux-kernels.nix +++ b/pkgs/top-level/linux-kernels.nix @@ -196,6 +196,16 @@ in { ]; }; + linux_6_8 = callPackage ../os-specific/linux/kernel/mainline.nix { + branch = "6.8"; + kernelPatches = [ + kernelPatches.bridge_stp_helper + kernelPatches.request_key_helper + kernelPatches.rust_1_75 + kernelPatches.rust_1_76 + ]; + }; + linux_testing = let testing = callPackage ../os-specific/linux/kernel/mainline.nix { # A special branch that tracks the kernel under the release process @@ -596,6 +606,7 @@ in { linux_6_1 = recurseIntoAttrs (packagesFor kernels.linux_6_1); linux_6_6 = recurseIntoAttrs (packagesFor kernels.linux_6_6); linux_6_7 = recurseIntoAttrs (packagesFor kernels.linux_6_7); + linux_6_8 = recurseIntoAttrs (packagesFor kernels.linux_6_8); __attrsFailEvaluation = true; } // lib.optionalAttrs config.allowAliases { linux_4_9 = throw "linux 4.9 was removed because it will reach its end of life within 22.11"; # Added 2022-11-08 @@ -662,7 +673,7 @@ in { packageAliases = { linux_default = packages.linux_6_6; # Update this when adding the newest kernel major version! - linux_latest = packages.linux_6_7; + linux_latest = packages.linux_6_8; linux_mptcp = throw "'linux_mptcp' has been moved to https://github.com/teto/mptcp-flake"; linux_rt_default = packages.linux_rt_5_4; linux_rt_latest = packages.linux_rt_6_6; From b2018ab6aa119731dcbc03e331cff9b9920a0c1b Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 11 Mar 2024 05:49:43 +0000 Subject: [PATCH 142/230] vscode-extensions.chenglou92.rescript-vscode: 1.42.0 -> 1.48.0 --- .../vscode/extensions/chenglou92.rescript-vscode/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/editors/vscode/extensions/chenglou92.rescript-vscode/default.nix b/pkgs/applications/editors/vscode/extensions/chenglou92.rescript-vscode/default.nix index 9c82b2ef60f8..530b28f30844 100644 --- a/pkgs/applications/editors/vscode/extensions/chenglou92.rescript-vscode/default.nix +++ b/pkgs/applications/editors/vscode/extensions/chenglou92.rescript-vscode/default.nix @@ -1,6 +1,6 @@ { lib, stdenv, vscode-utils, callPackage }: let - version = "1.42.0"; + version = "1.48.0"; rescript-editor-analysis = callPackage ./rescript-editor-analysis.nix { inherit version; }; arch = if stdenv.isLinux then "linux" @@ -13,7 +13,7 @@ vscode-utils.buildVscodeMarketplaceExtension rec { name = "rescript-vscode"; publisher = "chenglou92"; inherit version; - sha256 = "sha256-Po7zuppr8EHSfg2sDzkNn0KARncsiNVPoRsd25zc/xg="; + sha256 = "sha256-/1nDuj/kSdkV6PlbdlOLfUKQeuvyL2VhPjUAr9kq2NM="; }; postPatch = '' rm -r ${analysisDir} From 09df456c6dddda9bc1065c2e1e84915593732dfa Mon Sep 17 00:00:00 2001 From: Jerry Starke <42114389+JerrySM64@users.noreply.github.com> Date: Mon, 11 Mar 2024 06:49:45 +0100 Subject: [PATCH 143/230] linuxKernel.kernels.linux_zen: 6.7.9-zen1 -> 6.8-zen1 --- pkgs/os-specific/linux/kernel/zen-kernels.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/zen-kernels.nix b/pkgs/os-specific/linux/kernel/zen-kernels.nix index f7f513e21f60..d8261beb1764 100644 --- a/pkgs/os-specific/linux/kernel/zen-kernels.nix +++ b/pkgs/os-specific/linux/kernel/zen-kernels.nix @@ -4,9 +4,9 @@ let # comments with variant added for update script # ./update-zen.py zen zenVariant = { - version = "6.7.9"; #zen + version = "6.8"; #zen suffix = "zen1"; #zen - sha256 = "0g20hx5jhs99gm7bc3b99x6cg3hkx6r91dnxjzbplinzgh2kp0pz"; #zen + sha256 = "19rsi8747xw5lsq4pwizq2va6inmwrywgy8b5f2ppcd6ny0whn1i"; #zen isLqx = false; }; # ./update-zen.py lqx From a512cf4642b1ce97a7c19eb4d02339c1811caa94 Mon Sep 17 00:00:00 2001 From: K900 Date: Mon, 11 Mar 2024 08:57:19 +0300 Subject: [PATCH 144/230] kernel/common-config: enable NVK by default when available --- pkgs/os-specific/linux/kernel/common-config.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/os-specific/linux/kernel/common-config.nix b/pkgs/os-specific/linux/kernel/common-config.nix index fb59bfecaa01..cc9e7484c331 100644 --- a/pkgs/os-specific/linux/kernel/common-config.nix +++ b/pkgs/os-specific/linux/kernel/common-config.nix @@ -371,6 +371,8 @@ let DRM_AMD_DC_FP = whenAtLeast "6.4" yes; DRM_AMD_DC_HDCP = whenBetween "5.5" "6.4" yes; DRM_AMD_DC_SI = whenAtLeast "5.10" yes; + # Enable new firmware (and by extension NVK) for compatible hardware on Nouveau + DRM_NOUVEAU_GSP_DEFAULT = whenAtLeast "6.8" yes; } // optionalAttrs (stdenv.hostPlatform.system == "x86_64-linux") { # Intel GVT-g graphics virtualization supports 64-bit only DRM_I915_GVT = yes; From 998959464d6751ab6314ae16109505bf65bd9265 Mon Sep 17 00:00:00 2001 From: toastal Date: Mon, 11 Mar 2024 13:37:34 +0700 Subject: [PATCH 145/230] =?UTF-8?q?ocamlPackages.eio:=200.15=20=E2=86=92?= =?UTF-8?q?=201.0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pkgs/development/ocaml-modules/eio/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/ocaml-modules/eio/default.nix b/pkgs/development/ocaml-modules/eio/default.nix index dcffdd7dbe48..0eafead13cf1 100644 --- a/pkgs/development/ocaml-modules/eio/default.nix +++ b/pkgs/development/ocaml-modules/eio/default.nix @@ -1,6 +1,6 @@ { lib , ocaml -, version ? if lib.versionAtLeast ocaml.version "5.1" then "0.15" else "0.12" +, version ? if lib.versionAtLeast ocaml.version "5.1" then "1.0" else "0.12" , buildDunePackage , bigstringaf , cstruct @@ -24,9 +24,9 @@ let minimalOCamlVersion = "5.0"; hash = "sha256-2EhHzoX/t4ZBSWrSS+PGq1zCxohc7a1q4lfsrFnZJqA="; }; - "0.15" = { + "1.0" = { minimalOCamlVersion = "5.1"; - hash = "sha256-gH7O8zfdqEmwXT29F6ko5vXGNudusV4iE2Z8kRJ3GKc="; + hash = "sha256-2iYNnaOLPd6fMWZSogsTomHPkLhaJJisZpt9Vk5hlC0="; }; }."${version}"; in From 11a585d6acf0bc4f89f270556956defecd12a335 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 11 Mar 2024 06:48:05 +0000 Subject: [PATCH 146/230] free42: 3.1.4 -> 3.1.5 --- pkgs/by-name/fr/free42/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/fr/free42/package.nix b/pkgs/by-name/fr/free42/package.nix index a552921153d3..415f6f6f8b9d 100644 --- a/pkgs/by-name/fr/free42/package.nix +++ b/pkgs/by-name/fr/free42/package.nix @@ -10,13 +10,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "free42"; - version = "3.1.4"; + version = "3.1.5"; src = fetchFromGitHub { owner = "thomasokken"; repo = "free42"; rev = "v${finalAttrs.version}"; - hash = "sha256-XAYi4CBOx5KkqJyz6WkPlWC+bfbEReyaSv9SRCe6TDw="; + hash = "sha256-YFTmEyOd/r8Pbj+PzD+VYkkB0gqDJ4wteLBTdwa1qcE="; }; nativeBuildInputs = [ From 391634c3434fd98f708b78a9339efc6149366e86 Mon Sep 17 00:00:00 2001 From: Ivan Mincik Date: Mon, 11 Mar 2024 07:58:14 +0100 Subject: [PATCH 147/230] python3Packages.shapely: modernize build function configuration --- pkgs/development/python-modules/shapely/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/python-modules/shapely/default.nix b/pkgs/development/python-modules/shapely/default.nix index 785cacb320ae..3db9ce9e2af6 100644 --- a/pkgs/development/python-modules/shapely/default.nix +++ b/pkgs/development/python-modules/shapely/default.nix @@ -16,7 +16,7 @@ buildPythonPackage rec { pname = "shapely"; version = "2.0.3"; - format = "pyproject"; + pyproject = true; disabled = pythonOlder "3.7"; From c74b453de75a0a9252d5c9d477102deadaca9069 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 11 Mar 2024 07:14:28 +0000 Subject: [PATCH 148/230] python312Packages.ical: 7.0.0 -> 7.0.1 --- pkgs/development/python-modules/ical/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/ical/default.nix b/pkgs/development/python-modules/ical/default.nix index 01755d640c8c..43b810c1d552 100644 --- a/pkgs/development/python-modules/ical/default.nix +++ b/pkgs/development/python-modules/ical/default.nix @@ -16,7 +16,7 @@ buildPythonPackage rec { pname = "ical"; - version = "7.0.0"; + version = "7.0.1"; pyproject = true; disabled = pythonOlder "3.10"; @@ -25,7 +25,7 @@ buildPythonPackage rec { owner = "allenporter"; repo = "ical"; rev = "refs/tags/${version}"; - hash = "sha256-S/6zyUFXSWcnnLNSwz1smovSyodhKeRVbT9lj7+KLWo="; + hash = "sha256-kvZZfmrE42uoB9v0PuXopH3g9Cf0hwLkCvaNi6CGX8M="; }; nativeBuildInputs = [ From b72e0a55338c66529ad10257bd560f1c694509ea Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 11 Mar 2024 08:13:00 +0000 Subject: [PATCH 149/230] python312Packages.axis: 52 -> 53 --- pkgs/development/python-modules/axis/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/axis/default.nix b/pkgs/development/python-modules/axis/default.nix index 75c1d98b6f83..1d77c3409c94 100644 --- a/pkgs/development/python-modules/axis/default.nix +++ b/pkgs/development/python-modules/axis/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { pname = "axis"; - version = "52"; + version = "53"; pyproject = true; disabled = pythonOlder "3.11"; @@ -22,7 +22,7 @@ buildPythonPackage rec { owner = "Kane610"; repo = "axis"; rev = "refs/tags/v${version}"; - hash = "sha256-L94q3NxnkhYPIiz6p+o071QK2h4u9kSm+EUKdi93JzA="; + hash = "sha256-M5uaRiZP66RApSztvgzzpAUBKCcSCqC6fxzmB52mibY="; }; postPatch = '' From 5be63258eaea0840869baab3310a73a012cfaf2e Mon Sep 17 00:00:00 2001 From: Pol Dellaiera Date: Mon, 11 Mar 2024 09:44:17 +0100 Subject: [PATCH 150/230] jan: 0.4.7 -> 0.4.8 Changelog: https://github.com/janhq/jan/releases/tag/v0.4.8 Diff: https://github.com/janhq/jan/compare/v0.4.7..v0.4.8 --- pkgs/by-name/ja/jan/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/ja/jan/package.nix b/pkgs/by-name/ja/jan/package.nix index 44296231986f..181a7006c24c 100644 --- a/pkgs/by-name/ja/jan/package.nix +++ b/pkgs/by-name/ja/jan/package.nix @@ -5,10 +5,10 @@ let pname = "jan"; - version = "0.4.7"; + version = "0.4.8"; src = fetchurl { url = "https://github.com/janhq/jan/releases/download/v${version}/jan-linux-x86_64-${version}.AppImage"; - hash = "sha256-Mn7rIBEf46JbNof8h3z66TGdGKnb0FGMJc46JncA0KM="; + hash = "sha256-8Vi2KK+5Wk/K+RJZ0/cbRUb8L25WEiLdo5ay8+ichdw="; }; appimageContents = appimageTools.extractType2 { inherit pname version src; }; From cf936e0ce4e6cf65b6586ff4d772d2ee21b65cdd Mon Sep 17 00:00:00 2001 From: Sarah Brofeldt Date: Mon, 11 Mar 2024 09:55:42 +0100 Subject: [PATCH 151/230] squid: 6.7 -> 6.8 --- pkgs/servers/squid/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/squid/default.nix b/pkgs/servers/squid/default.nix index d564f77f7a7c..792c97ca6b5e 100644 --- a/pkgs/servers/squid/default.nix +++ b/pkgs/servers/squid/default.nix @@ -5,11 +5,11 @@ stdenv.mkDerivation (finalAttrs: { pname = "squid"; - version = "6.7"; + version = "6.8"; src = fetchurl { url = "http://www.squid-cache.org/Versions/v6/${finalAttrs.pname}-${finalAttrs.version}.tar.xz"; - hash = "sha256-4U2qTq5Bkl0a4/COZEOaaqowEb3O1oZii43ml9WrhCg="; + hash = "sha256-EcxWULUYCdmUg8z64kdEouUc0WGZ9f8MkX6E/OaVhw8="; }; nativeBuildInputs = [ pkg-config ]; From 27e93adb82c082bace4a5d5ae7f72bbff9e80258 Mon Sep 17 00:00:00 2001 From: TheMaxMur Date: Mon, 11 Mar 2024 12:09:56 +0300 Subject: [PATCH 152/230] vscode-extensions.vlanguage.vscode-vlang: init 0.1.14 --- .../editors/vscode/extensions/default.nix | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/pkgs/applications/editors/vscode/extensions/default.nix b/pkgs/applications/editors/vscode/extensions/default.nix index 7cee28c2a569..eb4fa169253e 100644 --- a/pkgs/applications/editors/vscode/extensions/default.nix +++ b/pkgs/applications/editors/vscode/extensions/default.nix @@ -4080,6 +4080,22 @@ let }; }; + vlanguage.vscode-vlang = buildVscodeMarketplaceExtension { + mktplcRef = { + name = "vscode-vlang"; + publisher = "vlanguage"; + version = "0.1.14"; + sha256 = "sha256-hlBALxBs5wZZFk4lgAkdkGs731Xuc2p0qxffOW6mMWQ="; + }; + meta = { + description = "V language support (syntax highlighting, formatter, snippets) for Visual Studio Code."; + downloadPage = "https://marketplace.visualstudio.com/items?itemName=vlanguage.vscode-vlang"; + homepage = "https://github.com/vlang/vscode-vlang"; + license = lib.licenses.mit; + maintainers = [ lib.maintainers.themaxmur ]; + }; + }; + vscjava.vscode-gradle = buildVscodeMarketplaceExtension rec { mktplcRef = { name = "vscode-gradle"; From 8f6198af4188ff91bac6e2827239a15677e5ade6 Mon Sep 17 00:00:00 2001 From: TheMaxMur Date: Mon, 11 Mar 2024 12:12:42 +0300 Subject: [PATCH 153/230] vscode-extensions.naumovs.theme-oceanicnext: remove platforms --- pkgs/applications/editors/vscode/extensions/default.nix | 1 - 1 file changed, 1 deletion(-) diff --git a/pkgs/applications/editors/vscode/extensions/default.nix b/pkgs/applications/editors/vscode/extensions/default.nix index 7cee28c2a569..4d6f408b7c9f 100644 --- a/pkgs/applications/editors/vscode/extensions/default.nix +++ b/pkgs/applications/editors/vscode/extensions/default.nix @@ -2984,7 +2984,6 @@ let homepage = "https://github.com/voronianski/oceanic-next-color-scheme"; license = lib.licenses.unlicense; maintainers = [ lib.maintainers.themaxmur ]; - platforms = [ "x86_64-linux" "aarch64-darwin" ]; }; }; From a907ea8faae92334d849f4793c2c6c4edaff9006 Mon Sep 17 00:00:00 2001 From: Doron Behar Date: Mon, 11 Mar 2024 11:50:25 +0200 Subject: [PATCH 154/230] syncthingtray: fix qt.qpa.plugin wayland issue --- pkgs/applications/misc/syncthingtray/default.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/applications/misc/syncthingtray/default.nix b/pkgs/applications/misc/syncthingtray/default.nix index 609bd81e40e4..2f54c8d09fe1 100644 --- a/pkgs/applications/misc/syncthingtray/default.nix +++ b/pkgs/applications/misc/syncthingtray/default.nix @@ -3,6 +3,7 @@ , fetchFromGitHub , qtbase , qtsvg +, qtwayland , qtwebengine , qtdeclarative , extra-cmake-modules @@ -46,6 +47,7 @@ stdenv.mkDerivation (finalAttrs: { buildInputs = [ qtbase qtsvg + qtwayland cpp-utilities qtutilities boost From 0a374afcfb25a0c57a1d852c704205046043cc20 Mon Sep 17 00:00:00 2001 From: TheMaxMur Date: Mon, 11 Mar 2024 13:06:18 +0300 Subject: [PATCH 155/230] vscode-extensions.tal7aouy.icons: init 3.8.0 --- .../editors/vscode/extensions/default.nix | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/pkgs/applications/editors/vscode/extensions/default.nix b/pkgs/applications/editors/vscode/extensions/default.nix index 85c17a2ea843..57861629673d 100644 --- a/pkgs/applications/editors/vscode/extensions/default.nix +++ b/pkgs/applications/editors/vscode/extensions/default.nix @@ -3746,6 +3746,22 @@ let }; }; + tal7aouy.icons = buildVscodeMarketplaceExtension { + mktplcRef = { + name = "icons"; + publisher = "tal7aouy"; + version = "3.8.0"; + sha256 = "sha256-PdhNFyVUWcOfli/ZlT+6TmtWrV31fBP1E1Vd4QWOY+A="; + }; + meta = { + description = "Icons for Visual Studio Code."; + downloadPage = "https://marketplace.visualstudio.com/items?itemName=tal7aouy.icons"; + homepage = "https://github.com/tal7aouy/vscode-icons"; + license = lib.licenses.mit; + maintainers = [ lib.maintainers.themaxmur ]; + }; + }; + tamasfe.even-better-toml = buildVscodeMarketplaceExtension { mktplcRef = { name = "even-better-toml"; From 81f1db85682f278c538d2ea2e219f9bedec9b9f1 Mon Sep 17 00:00:00 2001 From: Patka Date: Thu, 7 Mar 2024 20:10:35 +0100 Subject: [PATCH 156/230] phpPackages.phpstan: 1.10.59 -> 1.10.60 Release notes: https://github.com/phpstan/phpstan/releases/tag/1.10.60 --- pkgs/development/php-packages/phpstan/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/php-packages/phpstan/default.nix b/pkgs/development/php-packages/phpstan/default.nix index 63ced11f2351..8a094ce425cd 100644 --- a/pkgs/development/php-packages/phpstan/default.nix +++ b/pkgs/development/php-packages/phpstan/default.nix @@ -2,16 +2,16 @@ php.buildComposerProject (finalAttrs: { pname = "phpstan"; - version = "1.10.59"; + version = "1.10.60"; src = fetchFromGitHub { owner = "phpstan"; repo = "phpstan-src"; rev = finalAttrs.version; - hash = "sha256-2+CQtpmh2r2+87zLhx7UkYlZ7sDQdDh4S8v67PGNjLM="; + hash = "sha256-DKrlR3ujHWfbhPMzZhhkUCeTtKW6hpGUe4z7xgzJ4qs="; }; - vendorHash = "sha256-6Wea4iUSFq0xSWFq4er4lzFn2mgeoYBXG1zMGM3Y390="; + vendorHash = "sha256-8CEg1q3K1E9M6gaa5IlSYNPZb+evaY1oxbCnySXuFGE="; composerStrictValidation = false; meta = { From ec25a6c3ae35651c30d238cb16bf300c469f2eb7 Mon Sep 17 00:00:00 2001 From: Sandro Date: Mon, 11 Mar 2024 00:48:58 +0100 Subject: [PATCH 157/230] pangolin: remove potential bug hidding `? null` from inputs --- pkgs/development/libraries/pangolin/default.nix | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/pkgs/development/libraries/pangolin/default.nix b/pkgs/development/libraries/pangolin/default.nix index 4618a6d43187..5e8ec502a65f 100644 --- a/pkgs/development/libraries/pangolin/default.nix +++ b/pkgs/development/libraries/pangolin/default.nix @@ -1,11 +1,10 @@ { stdenv, lib, fetchFromGitHub, cmake, pkg-config, doxygen, libGL, glew , xorg, ffmpeg_4, libjpeg, libpng, libtiff, eigen -, Carbon ? null, Cocoa ? null +, Carbon, Cocoa }: stdenv.mkDerivation rec { pname = "pangolin"; - version = "0.9.1"; src = fetchFromGitHub { From a49c3d26899b46ed9b5cdd401dc202f7c9ba8f3b Mon Sep 17 00:00:00 2001 From: OPNA2608 Date: Mon, 11 Mar 2024 11:37:49 +0100 Subject: [PATCH 158/230] nixos/tests/miriway: Be more lenient when identifying the terminal prompts --- nixos/tests/miriway.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/nixos/tests/miriway.nix b/nixos/tests/miriway.nix index a0987d9fc41b..24e6ec6367cd 100644 --- a/nixos/tests/miriway.nix +++ b/nixos/tests/miriway.nix @@ -100,7 +100,7 @@ import ./make-test-python.nix ({ pkgs, lib, ... }: { # Test Wayland # We let Miriway start the first terminal, as we might get stuck if it's not ready to process the first keybind # machine.send_key("ctrl-alt-t") - machine.wait_for_text("alice@machine") + machine.wait_for_text(r"(alice|machine)") machine.send_chars("test-wayland\n") machine.wait_for_file("/tmp/test-wayland-exit-ok") machine.copy_from_vm("/tmp/test-wayland.out") @@ -112,7 +112,7 @@ import ./make-test-python.nix ({ pkgs, lib, ... }: { # Test XWayland machine.send_key("ctrl-alt-a") - machine.wait_for_text("alice@machine") + machine.wait_for_text(r"(alice|machine)") machine.send_chars("test-x11\n") machine.wait_for_file("/tmp/test-x11-exit-ok") machine.copy_from_vm("/tmp/test-x11.out") From 95369bd5ca8787d18a6b78939f5a9656b06b3661 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 11 Mar 2024 11:04:46 +0000 Subject: [PATCH 159/230] broot: 1.35.0 -> 1.36.0 --- pkgs/tools/misc/broot/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/misc/broot/default.nix b/pkgs/tools/misc/broot/default.nix index 751860860436..5e71e81d7d0f 100644 --- a/pkgs/tools/misc/broot/default.nix +++ b/pkgs/tools/misc/broot/default.nix @@ -18,16 +18,16 @@ rustPlatform.buildRustPackage rec { pname = "broot"; - version = "1.35.0"; + version = "1.36.0"; src = fetchFromGitHub { owner = "Canop"; repo = pname; rev = "v${version}"; - hash = "sha256-L9a1fQZkCHSHseZtQYwqIt1CokPGBqLcqY0jccHYqGw="; + hash = "sha256-nHEGvd9v0SuA3JsTOA2LTB+IDwbo5sBM1+j+K/ktDAc="; }; - cargoHash = "sha256-DRW1gv5lqdXWcRLD2yf7+u6J/xIUWmELmb/l729Sqo4="; + cargoHash = "sha256-LKBxN4SPkm2atOqQlZJfkt1ak4fMXQX1xR85q+8Ch8I="; nativeBuildInputs = [ installShellFiles From ac6c66df08078b26bf81ed6238af31192d3278bb Mon Sep 17 00:00:00 2001 From: TheMaxMur Date: Mon, 11 Mar 2024 14:07:08 +0300 Subject: [PATCH 160/230] vscode-extensions.hashicorp.hcl: init 0.3.2 --- .../editors/vscode/extensions/default.nix | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/pkgs/applications/editors/vscode/extensions/default.nix b/pkgs/applications/editors/vscode/extensions/default.nix index 57861629673d..126fb0cc65a4 100644 --- a/pkgs/applications/editors/vscode/extensions/default.nix +++ b/pkgs/applications/editors/vscode/extensions/default.nix @@ -1986,6 +1986,22 @@ let }; }; + hashicorp.hcl = buildVscodeMarketplaceExtension { + mktplcRef = { + name = "HCL"; + publisher = "HashiCorp"; + version = "0.3.2"; + sha256 = "sha256-cxF3knYY29PvT3rkRS8SGxMn9vzt56wwBXpk2PqO0mo="; + }; + meta = { + description = "HashiCorp HCL syntax"; + downloadPage = "https://marketplace.visualstudio.com/items?itemName=HashiCorp.HCL"; + homepage = "https://github.com/hashicorp/vscode-hcl"; + license = lib.licenses.mpl20; + maintainers = [ lib.maintainers.themaxmur ]; + }; + }; + hashicorp.terraform = callPackage ./hashicorp.terraform { }; haskell.haskell = buildVscodeMarketplaceExtension { From 1fb53efbbf842212a451b6f9f36fd32c81f76289 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 11 Mar 2024 11:39:15 +0000 Subject: [PATCH 161/230] build(deps): bump cachix/install-nix-action from 25 to 26 Bumps [cachix/install-nix-action](https://github.com/cachix/install-nix-action) from 25 to 26. - [Release notes](https://github.com/cachix/install-nix-action/releases) - [Commits](https://github.com/cachix/install-nix-action/compare/6004951b182f8860210c8d6f0d808ec5b1a33d28...8887e596b4ee1134dae06b98d573bd674693f47c) --- updated-dependencies: - dependency-name: cachix/install-nix-action dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] --- .github/workflows/basic-eval.yml | 2 +- .github/workflows/check-by-name.yml | 2 +- .github/workflows/check-maintainers-sorted.yaml | 2 +- .github/workflows/editorconfig.yml | 2 +- .github/workflows/manual-nixos.yml | 2 +- .github/workflows/manual-nixpkgs.yml | 2 +- .github/workflows/nix-parse.yml | 2 +- .github/workflows/update-terraform-providers.yml | 2 +- 8 files changed, 8 insertions(+), 8 deletions(-) diff --git a/.github/workflows/basic-eval.yml b/.github/workflows/basic-eval.yml index a0cd990ebc73..57dd0a90752f 100644 --- a/.github/workflows/basic-eval.yml +++ b/.github/workflows/basic-eval.yml @@ -19,7 +19,7 @@ jobs: # we don't limit this action to only NixOS repo since the checks are cheap and useful developer feedback steps: - uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1 - - uses: cachix/install-nix-action@6004951b182f8860210c8d6f0d808ec5b1a33d28 # v25 + - uses: cachix/install-nix-action@8887e596b4ee1134dae06b98d573bd674693f47c # v26 - uses: cachix/cachix-action@18cf96c7c98e048e10a83abd92116114cd8504be # v14 with: # This cache is for the nixpkgs repo checks and should not be trusted or used elsewhere. diff --git a/.github/workflows/check-by-name.yml b/.github/workflows/check-by-name.yml index 94875e67b649..00a8cb5e878f 100644 --- a/.github/workflows/check-by-name.yml +++ b/.github/workflows/check-by-name.yml @@ -98,7 +98,7 @@ jobs: base=$(mktemp -d) git worktree add "$base" "$(git rev-parse HEAD^1)" echo "base=$base" >> "$GITHUB_ENV" - - uses: cachix/install-nix-action@6004951b182f8860210c8d6f0d808ec5b1a33d28 # v25 + - uses: cachix/install-nix-action@8887e596b4ee1134dae06b98d573bd674693f47c # v26 - name: Fetching the pinned tool # Update the pinned version using pkgs/test/nixpkgs-check-by-name/scripts/update-pinned-tool.sh run: | diff --git a/.github/workflows/check-maintainers-sorted.yaml b/.github/workflows/check-maintainers-sorted.yaml index 074644153204..e42a7bfbfa4b 100644 --- a/.github/workflows/check-maintainers-sorted.yaml +++ b/.github/workflows/check-maintainers-sorted.yaml @@ -16,7 +16,7 @@ jobs: with: # pull_request_target checks out the base branch by default ref: refs/pull/${{ github.event.pull_request.number }}/merge - - uses: cachix/install-nix-action@6004951b182f8860210c8d6f0d808ec5b1a33d28 # v25 + - uses: cachix/install-nix-action@8887e596b4ee1134dae06b98d573bd674693f47c # v26 with: # explicitly enable sandbox extra_nix_config: sandbox = true diff --git a/.github/workflows/editorconfig.yml b/.github/workflows/editorconfig.yml index 6b151d45be2a..5c7f1ea52eae 100644 --- a/.github/workflows/editorconfig.yml +++ b/.github/workflows/editorconfig.yml @@ -28,7 +28,7 @@ jobs: with: # pull_request_target checks out the base branch by default ref: refs/pull/${{ github.event.pull_request.number }}/merge - - uses: cachix/install-nix-action@6004951b182f8860210c8d6f0d808ec5b1a33d28 # v25 + - uses: cachix/install-nix-action@8887e596b4ee1134dae06b98d573bd674693f47c # v26 with: # nixpkgs commit is pinned so that it doesn't break # editorconfig-checker 2.4.0 diff --git a/.github/workflows/manual-nixos.yml b/.github/workflows/manual-nixos.yml index c9c2451a9df2..d3079a03450a 100644 --- a/.github/workflows/manual-nixos.yml +++ b/.github/workflows/manual-nixos.yml @@ -18,7 +18,7 @@ jobs: with: # pull_request_target checks out the base branch by default ref: refs/pull/${{ github.event.pull_request.number }}/merge - - uses: cachix/install-nix-action@6004951b182f8860210c8d6f0d808ec5b1a33d28 # v25 + - uses: cachix/install-nix-action@8887e596b4ee1134dae06b98d573bd674693f47c # v26 with: # explicitly enable sandbox extra_nix_config: sandbox = true diff --git a/.github/workflows/manual-nixpkgs.yml b/.github/workflows/manual-nixpkgs.yml index d9a425a494ab..ac19743cdd60 100644 --- a/.github/workflows/manual-nixpkgs.yml +++ b/.github/workflows/manual-nixpkgs.yml @@ -19,7 +19,7 @@ jobs: with: # pull_request_target checks out the base branch by default ref: refs/pull/${{ github.event.pull_request.number }}/merge - - uses: cachix/install-nix-action@6004951b182f8860210c8d6f0d808ec5b1a33d28 # v25 + - uses: cachix/install-nix-action@8887e596b4ee1134dae06b98d573bd674693f47c # v26 with: # explicitly enable sandbox extra_nix_config: sandbox = true diff --git a/.github/workflows/nix-parse.yml b/.github/workflows/nix-parse.yml index e625cca93c5c..35363cd8cee3 100644 --- a/.github/workflows/nix-parse.yml +++ b/.github/workflows/nix-parse.yml @@ -29,7 +29,7 @@ jobs: # pull_request_target checks out the base branch by default ref: refs/pull/${{ github.event.pull_request.number }}/merge if: ${{ env.CHANGED_FILES && env.CHANGED_FILES != '' }} - - uses: cachix/install-nix-action@6004951b182f8860210c8d6f0d808ec5b1a33d28 # v25 + - uses: cachix/install-nix-action@8887e596b4ee1134dae06b98d573bd674693f47c # v26 with: nix_path: nixpkgs=channel:nixpkgs-unstable - name: Parse all changed or added nix files diff --git a/.github/workflows/update-terraform-providers.yml b/.github/workflows/update-terraform-providers.yml index 77486c722287..ffeb5cc87e5a 100644 --- a/.github/workflows/update-terraform-providers.yml +++ b/.github/workflows/update-terraform-providers.yml @@ -17,7 +17,7 @@ jobs: runs-on: ubuntu-latest steps: - uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1 - - uses: cachix/install-nix-action@6004951b182f8860210c8d6f0d808ec5b1a33d28 # v25 + - uses: cachix/install-nix-action@8887e596b4ee1134dae06b98d573bd674693f47c # v26 with: nix_path: nixpkgs=channel:nixpkgs-unstable - name: setup From 61cc9929fc83842b84d2933c6573f4bdee9cc575 Mon Sep 17 00:00:00 2001 From: TheMaxMur Date: Mon, 11 Mar 2024 14:49:55 +0300 Subject: [PATCH 162/230] vscode-extensions.redhat.ansible: init 2.12.143 --- .../editors/vscode/extensions/default.nix | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/pkgs/applications/editors/vscode/extensions/default.nix b/pkgs/applications/editors/vscode/extensions/default.nix index 126fb0cc65a4..89834eebaefe 100644 --- a/pkgs/applications/editors/vscode/extensions/default.nix +++ b/pkgs/applications/editors/vscode/extensions/default.nix @@ -3228,6 +3228,22 @@ let meta.license = lib.licenses.mit; }; + redhat.ansible = buildVscodeMarketplaceExtension { + mktplcRef = { + name = "ansible"; + publisher = "redhat"; + version = "2.12.143"; + sha256 = "sha256-NEV7sVYJJvapZjk5sylkzijH8qLZ7xzmBzHI7qcj2Ok="; + }; + meta = { + description = "Ansible language support"; + downloadPage = "https://marketplace.visualstudio.com/items?itemName=redhat.ansible"; + homepage = "https://github.com/ansible/vscode-ansible"; + license = lib.licenses.mit; + maintainers = [ lib.maintainers.themaxmur ]; + }; + }; + redhat.java = buildVscodeMarketplaceExtension { mktplcRef = { name = "java"; From cf625fe5f05b4a84e3fafc4ba8ba97913112dc31 Mon Sep 17 00:00:00 2001 From: Pierre Allix Date: Mon, 11 Mar 2024 12:55:27 +0100 Subject: [PATCH 163/230] nixos/networkmanager: add doc about nm profiles interaction with resolvconf --- nixos/modules/services/networking/networkmanager.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/nixos/modules/services/networking/networkmanager.nix b/nixos/modules/services/networking/networkmanager.nix index c96439cf2641..dcde505b7f2a 100644 --- a/nixos/modules/services/networking/networkmanager.nix +++ b/nixos/modules/services/networking/networkmanager.nix @@ -436,6 +436,7 @@ in And if you edit a declarative profile NetworkManager will move it to the persistent storage and treat it like a ad-hoc one, but there will be two profiles as soon as the systemd unit from this option runs again which can be confusing since NetworkManager tools will start displaying two profiles with the same name and probably a bit different settings depending on what you edited. A profile won't be deleted even if it's removed from the config until the system reboots because that's when NetworkManager clears it's temp directory. + If `networking.resolvconf.enable` is true, attributes affecting the name resolution (such as `ignore-auto-dns`) may not end up changing `/etc/resolv.conf` as expected when other name services (for example `networking.dhcpcd`) are enabled. Run `resolvconf -l` in the terminal to see what each service produces. ''; }; environmentFiles = mkOption { From e056b27725783af0c44262a3b4b0a27c31862598 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 11 Mar 2024 12:19:39 +0000 Subject: [PATCH 164/230] python312Packages.types-mock: 5.1.0.20240106 -> 5.1.0.20240311 --- pkgs/development/python-modules/types-mock/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/types-mock/default.nix b/pkgs/development/python-modules/types-mock/default.nix index b6a626536480..cde1a52b9319 100644 --- a/pkgs/development/python-modules/types-mock/default.nix +++ b/pkgs/development/python-modules/types-mock/default.nix @@ -6,12 +6,12 @@ buildPythonPackage rec { pname = "types-mock"; - version = "5.1.0.20240106"; + version = "5.1.0.20240311"; pyproject = true; src = fetchPypi { inherit pname version; - hash = "sha256-E8o3nVcQzLPxj2mt5bCIgYdMuDOD2PtJsdTaydXF0JA="; + hash = "sha256-dHJ5eYbYMBb5b95/c1d9EpsM2KjQt4NIenvjMNV7pDE="; }; nativeBuildInputs = [ From 6c08d7994acaa329e96af242e9c1a2b71fc658de Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 11 Mar 2024 12:27:56 +0000 Subject: [PATCH 165/230] calcmysky: 0.3.1 -> 0.3.2 --- pkgs/applications/science/astronomy/calcmysky/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/science/astronomy/calcmysky/default.nix b/pkgs/applications/science/astronomy/calcmysky/default.nix index cf762d36de74..9b7f50415ecd 100644 --- a/pkgs/applications/science/astronomy/calcmysky/default.nix +++ b/pkgs/applications/science/astronomy/calcmysky/default.nix @@ -11,13 +11,13 @@ stdenv.mkDerivation rec { pname = "calcmysky"; - version = "0.3.1"; + version = "0.3.2"; src = fetchFromGitHub { owner = "10110111"; repo = "CalcMySky"; rev = "refs/tags/v${version}"; - hash = "sha256-oqYOXoIPVqCD3HL7ShNoF89W725hFHX0Ei/yVJNTS5I="; + hash = "sha256-AP6YkORbvH8PzF869s2OWbTwTfwMC+RLJx3V3BqVy88="; }; nativeBuildInputs = [ cmake wrapQtAppsHook ]; From 43f8624fb1c0be60a40e233723f69005f5392e44 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 11 Mar 2024 12:35:56 +0000 Subject: [PATCH 166/230] python312Packages.types-markdown: 3.5.0.20240129 -> 3.5.0.20240311 --- pkgs/development/python-modules/types-markdown/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/types-markdown/default.nix b/pkgs/development/python-modules/types-markdown/default.nix index e0b1301062a6..edfa253da75f 100644 --- a/pkgs/development/python-modules/types-markdown/default.nix +++ b/pkgs/development/python-modules/types-markdown/default.nix @@ -6,13 +6,13 @@ buildPythonPackage rec { pname = "types-markdown"; - version = "3.5.0.20240129"; + version = "3.5.0.20240311"; pyproject = true; src = fetchPypi { pname = "types-Markdown"; inherit version; - hash = "sha256-ms02/vJk2e1aljRcRffYDw2WcFnpIhOZizBG+7ZPZ/w="; + hash = "sha256-TFjvM+4ngYPFQKWOWZy+lwkPZVMCtu9loQhMSzLXSKQ="; }; nativeBuildInputs = [ From 572d9fa982e2fee27ee352964917d426b79783dd Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 11 Mar 2024 12:38:08 +0000 Subject: [PATCH 167/230] python312Packages.types-pyopenssl: 24.0.0.20240228 -> 24.0.0.20240311 --- pkgs/development/python-modules/types-pyopenssl/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/types-pyopenssl/default.nix b/pkgs/development/python-modules/types-pyopenssl/default.nix index 32859f099955..d7cf53e4ff68 100644 --- a/pkgs/development/python-modules/types-pyopenssl/default.nix +++ b/pkgs/development/python-modules/types-pyopenssl/default.nix @@ -6,13 +6,13 @@ buildPythonPackage rec { pname = "types-pyopenssl"; - version = "24.0.0.20240228"; + version = "24.0.0.20240311"; format = "setuptools"; src = fetchPypi { pname = "types-pyOpenSSL"; inherit version; - hash = "sha256-zZkHF9iqN0PvDnPg9GLmS1TZDDBCSSMtSP7OTw98PGo="; + hash = "sha256-e8oAz8Tn75xdJmPGocBow1eY5ZZwWVQ59ilue6PVgIM="; }; propagatedBuildInputs = [ From 37747ff0637f160d7b03fba946f4bfdf7a6e655e Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 11 Mar 2024 12:48:05 +0000 Subject: [PATCH 168/230] sabnzbd: 4.2.2 -> 4.2.3 --- pkgs/servers/sabnzbd/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/sabnzbd/default.nix b/pkgs/servers/sabnzbd/default.nix index a7035426fdf9..4f2217be346f 100644 --- a/pkgs/servers/sabnzbd/default.nix +++ b/pkgs/servers/sabnzbd/default.nix @@ -47,14 +47,14 @@ let ]); path = lib.makeBinPath [ coreutils par2cmdline-turbo unrar unzip p7zip util-linux ]; in stdenv.mkDerivation rec { - version = "4.2.2"; + version = "4.2.3"; pname = "sabnzbd"; src = fetchFromGitHub { owner = pname; repo = pname; rev = version; - sha256 = "sha256-e5MjsBFUeQ1FMgMIuTDAmAUqf9BaM+ic2qpd1GVZEAw="; + sha256 = "sha256-DM+sgrb7Zvtvp0th8GlOloSBcD8mG1RYyM91+uvCOgU="; }; nativeBuildInputs = [ makeWrapper ]; From 921495ab81e57e5ee315c37abd0a4e9235236d12 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Manuel=20B=C3=A4renz?= Date: Mon, 11 Mar 2024 13:55:04 +0100 Subject: [PATCH 169/230] python3Packages.daff: init at 1.3.46 (#291597) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Co-authored-by: Manuel Bärenz Co-authored-by: Sandro --- .../python-modules/daff/default.nix | 28 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 ++ 2 files changed, 30 insertions(+) create mode 100644 pkgs/development/python-modules/daff/default.nix diff --git a/pkgs/development/python-modules/daff/default.nix b/pkgs/development/python-modules/daff/default.nix new file mode 100644 index 000000000000..59c2e1bfc38b --- /dev/null +++ b/pkgs/development/python-modules/daff/default.nix @@ -0,0 +1,28 @@ +{ lib +, buildPythonPackage +, fetchPypi +}: + +buildPythonPackage rec { + pname = "daff"; + version = "1.3.46"; + + src = fetchPypi { + inherit pname version; + sha256 = "sha256-ItDan9ajJ1tUySapyXsYD5JYqtZRE+oY8/7FLLrc2Bg="; + }; + + # there are no tests + doCheck = false; + + pythonImportsCheck = [ + "daff" + ]; + + meta = with lib; { + description = "Library for comparing tables, producing a summary of their differences, and using such a summary as a patch file"; + homepage = "https://github.com/paulfitz/daff"; + license = with licenses; [ mit ]; + maintainers = with maintainers; [ turion ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 097a37dbd234..947763ec3c39 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -2618,6 +2618,8 @@ self: super: with self; { daemonocle = callPackage ../development/python-modules/daemonocle { }; + daff = callPackage ../development/python-modules/daff { }; + daiquiri = callPackage ../development/python-modules/daiquiri { }; dalle-mini = callPackage ../development/python-modules/dalle-mini { }; From 10417a79f22249618b42bd1faad91d78b9951fb7 Mon Sep 17 00:00:00 2001 From: TheMaxMur Date: Mon, 11 Mar 2024 16:25:01 +0300 Subject: [PATCH 170/230] vscode-extensions.13xforever.language-x86-64-assembly: init 3.1.4 --- .../editors/vscode/extensions/default.nix | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/pkgs/applications/editors/vscode/extensions/default.nix b/pkgs/applications/editors/vscode/extensions/default.nix index 89834eebaefe..a85be79a58dd 100644 --- a/pkgs/applications/editors/vscode/extensions/default.nix +++ b/pkgs/applications/editors/vscode/extensions/default.nix @@ -40,6 +40,22 @@ let # baseExtensions = self: lib.mapAttrs (_n: lib.recurseIntoAttrs) { + "13xforever".language-x86-64-assembly = buildVscodeMarketplaceExtension { + mktplcRef = { + name = "language-x86-64-assembly"; + publisher = "13xforever"; + version = "3.1.4"; + sha256 = "sha256-FJRDm1H3GLBfSKBSFgVspCjByy9m+j9OStlU+/pMfs8="; + }; + meta = { + description = "Cutting edge x86 and x86_64 assembly syntax highlighting"; + downloadPage = "https://marketplace.visualstudio.com/items?itemName=13xforever.language-x86-64-assembly"; + homepage = "https://github.com/13xforever/x86_64-assembly-vscode"; + license = lib.licenses.mit; + maintainers = [ lib.maintainers.themaxmur ]; + }; + }; + "1Password".op-vscode = buildVscodeMarketplaceExtension { mktplcRef = { publisher = "1Password"; From 547c6af1d45c9c4cf37e17ef33607482360715ab Mon Sep 17 00:00:00 2001 From: TheMaxMur Date: Mon, 11 Mar 2024 16:25:55 +0300 Subject: [PATCH 171/230] vscode-extensions.cweijan.dbclient-jdbc: init 1.3.4 --- .../editors/vscode/extensions/default.nix | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/pkgs/applications/editors/vscode/extensions/default.nix b/pkgs/applications/editors/vscode/extensions/default.nix index a85be79a58dd..2db8ca0a5b5c 100644 --- a/pkgs/applications/editors/vscode/extensions/default.nix +++ b/pkgs/applications/editors/vscode/extensions/default.nix @@ -1032,6 +1032,22 @@ let }; }; + cweijan.dbclient-jdbc = buildVscodeMarketplaceExtension { + mktplcRef = { + name = "dbclient-jdbc"; + publisher = "cweijan"; + version = "1.3.4"; + sha256 = "sha256-qknooeedRhTvEWSuGXFoO/BczGanYCdMr7WWjthxG+k="; + }; + meta = { + description = "JDBC Adapter For Database Client"; + downloadPage = "https://marketplace.visualstudio.com/items?itemName=cweijan.dbclient-jdbc"; + homepage = "https://github.com/database-client/jdbc-adapter-server"; + license = lib.licenses.mit; + maintainers = [ lib.maintainers.themaxmur ]; + }; + }; + cweijan.vscode-database-client2 = buildVscodeMarketplaceExtension { mktplcRef = { name = "vscode-database-client2"; From a498f64c757cf96284c13c60c5687efdff9997a4 Mon Sep 17 00:00:00 2001 From: TheMaxMur Date: Mon, 11 Mar 2024 16:27:05 +0300 Subject: [PATCH 172/230] vscode-extensions.equinusocio.vsc-material-theme-icons: init 3.5.0 --- .../editors/vscode/extensions/default.nix | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/pkgs/applications/editors/vscode/extensions/default.nix b/pkgs/applications/editors/vscode/extensions/default.nix index 2db8ca0a5b5c..c7e16641eab2 100644 --- a/pkgs/applications/editors/vscode/extensions/default.nix +++ b/pkgs/applications/editors/vscode/extensions/default.nix @@ -1556,6 +1556,22 @@ let equinusocio.vsc-material-theme = callPackage ./equinusocio.vsc-material-theme { }; + equinusocio.vsc-material-theme-icons = buildVscodeMarketplaceExtension { + mktplcRef = { + name = "vsc-material-theme-icons"; + publisher = "Equinusocio"; + version = "3.5.0"; + sha256 = "sha256-XqtyZVlsPaPkKB9HdigKSXjCwqXe9wzJWeRcPpS6EVM="; + }; + meta = { + description = "Material Theme Icons, the most epic icons theme for Visual Studio Code and Material Theme."; + downloadPage = "https://marketplace.visualstudio.com/items?itemName=Equinusocio.vsc-material-theme-icons"; + homepage = "https://github.com/material-theme/vsc-material-theme-icons"; + license = lib.licenses.asl20; + maintainers = [ lib.maintainers.themaxmur ]; + }; + }; + esbenp.prettier-vscode = buildVscodeMarketplaceExtension { mktplcRef = { name = "prettier-vscode"; From 36f1c0c2b3ab4d6e12a8888950cc636d2197b587 Mon Sep 17 00:00:00 2001 From: Markus Theil Date: Tue, 28 Nov 2023 15:55:50 +0100 Subject: [PATCH 173/230] nixos/esdm: simplify module ESDM 1.0.1 fixed bugs related to Linux compatibility layer with CUSE. During these fixes, the compatibility layer was simplified behind a target in order to start the necessary services together or none of them (services.esdm.linuxCompatServices). Furthermore, a small helper was added to ESDM 1.0.1 in order to deal with resume/suspend/hibernate (FUSE needs to be unblocked). Removed options are marked. Signed-off-by: Markus Theil --- nixos/modules/services/security/esdm.nix | 101 ++++++----------------- 1 file changed, 26 insertions(+), 75 deletions(-) diff --git a/nixos/modules/services/security/esdm.nix b/nixos/modules/services/security/esdm.nix index 134b4be1a94c..c34fba1b3c75 100644 --- a/nixos/modules/services/security/esdm.nix +++ b/nixos/modules/services/security/esdm.nix @@ -4,49 +4,33 @@ let cfg = config.services.esdm; in { + imports = [ + # removed option 'services.esdm.cuseRandomEnable' + (lib.mkRemovedOptionModule [ "services" "esdm" "cuseRandomEnable" ] '' + Use services.esdm.enableLinuxCompatServices instead. + '') + # removed option 'services.esdm.cuseUrandomEnable' + (lib.mkRemovedOptionModule [ "services" "esdm" "cuseUrandomEnable" ] '' + Use services.esdm.enableLinuxCompatServices instead. + '') + # removed option 'services.esdm.procEnable' + (lib.mkRemovedOptionModule [ "services" "esdm" "procEnable" ] '' + Use services.esdm.enableLinuxCompatServices instead. + '') + # removed option 'services.esdm.verbose' + (lib.mkRemovedOptionModule [ "services" "esdm" "verbose" ] '' + There is no replacement. + '') + ]; + options.services.esdm = { enable = lib.mkEnableOption (lib.mdDoc "ESDM service configuration"); package = lib.mkPackageOption pkgs "esdm" { }; - serverEnable = lib.mkOption { + enableLinuxCompatServices = lib.mkOption { type = lib.types.bool; default = true; description = lib.mdDoc '' - Enable option for ESDM server service. If serverEnable == false, then the esdm-server - will not start. Also the subsequent services esdm-cuse-random, esdm-cuse-urandom - and esdm-proc will not start as these have the entry Want=esdm-server.service. - ''; - }; - cuseRandomEnable = lib.mkOption { - type = lib.types.bool; - default = true; - description = lib.mdDoc '' - Enable option for ESDM cuse-random service. Determines if the esdm-cuse-random.service - is started. - ''; - }; - cuseUrandomEnable = lib.mkOption { - type = lib.types.bool; - default = true; - description = lib.mdDoc '' - Enable option for ESDM cuse-urandom service. Determines if the esdm-cuse-urandom.service - is started. - ''; - }; - procEnable = lib.mkOption { - type = lib.types.bool; - default = true; - description = lib.mdDoc '' - Enable option for ESDM proc service. Determines if the esdm-proc.service - is started. - ''; - }; - verbose = lib.mkOption { - type = lib.types.bool; - default = false; - description = lib.mdDoc '' - Enable verbose ExecStart for ESDM. If verbose == true, then the corresponding "ExecStart" - values of the 4 aforementioned services are overwritten with the option - for the highest verbosity. + Enable /dev/random, /dev/urandom and /proc/sys/kernel/random/* userspace wrapper. ''; }; }; @@ -55,46 +39,13 @@ in lib.mkMerge [ ({ systemd.packages = [ cfg.package ]; + systemd.services."esdm-server".wantedBy = [ "basic.target" ]; }) # It is necessary to set those options for these services to be started by systemd in NixOS - (lib.mkIf cfg.serverEnable { - systemd.services."esdm-server".wantedBy = [ "basic.target" ]; - systemd.services."esdm-server".serviceConfig = lib.mkIf cfg.verbose { - ExecStart = [ - " " # unset previous value defined in 'esdm-server.service' - "${cfg.package}/bin/esdm-server -f -vvvvvv" - ]; - }; - }) - - (lib.mkIf cfg.cuseRandomEnable { - systemd.services."esdm-cuse-random".wantedBy = [ "basic.target" ]; - systemd.services."esdm-cuse-random".serviceConfig = lib.mkIf cfg.verbose { - ExecStart = [ - " " # unset previous value defined in 'esdm-cuse-random.service' - "${cfg.package}/bin/esdm-cuse-random -f -v 6" - ]; - }; - }) - - (lib.mkIf cfg.cuseUrandomEnable { - systemd.services."esdm-cuse-urandom".wantedBy = [ "basic.target" ]; - systemd.services."esdm-cuse-urandom".serviceConfig = lib.mkIf cfg.verbose { - ExecStart = [ - " " # unset previous value defined in 'esdm-cuse-urandom.service' - "${config.services.esdm.package}/bin/esdm-cuse-urandom -f -v 6" - ]; - }; - }) - - (lib.mkIf cfg.procEnable { - systemd.services."esdm-proc".wantedBy = [ "basic.target" ]; - systemd.services."esdm-proc".serviceConfig = lib.mkIf cfg.verbose { - ExecStart = [ - " " # unset previous value defined in 'esdm-proc.service' - "${cfg.package}/bin/esdm-proc --relabel -f -o allow_other /proc/sys/kernel/random -v 6" - ]; - }; + (lib.mkIf cfg.enableLinuxCompatServices { + systemd.targets."esdm-linux-compat".wantedBy = [ "basic.target" ]; + systemd.services."esdm-server-suspend".wantedBy = [ "sleep.target" "suspend.target" "hibernate.target" ]; + systemd.services."esdm-server-resume".wantedBy = [ "sleep.target" "suspend.target" "hibernate.target" ]; }) ]); From b9cdc735abdb9864f79a656b638589cc6133894d Mon Sep 17 00:00:00 2001 From: TheMaxMur Date: Mon, 11 Mar 2024 16:29:01 +0300 Subject: [PATCH 174/230] vscode-extensions.firsttris.vscode-jest-runner: init 0.4.72 --- .../editors/vscode/extensions/default.nix | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/pkgs/applications/editors/vscode/extensions/default.nix b/pkgs/applications/editors/vscode/extensions/default.nix index c7e16641eab2..0e9dcfdff954 100644 --- a/pkgs/applications/editors/vscode/extensions/default.nix +++ b/pkgs/applications/editors/vscode/extensions/default.nix @@ -1670,6 +1670,22 @@ let }; }; + firsttris.vscode-jest-runner = buildVscodeMarketplaceExtension { + mktplcRef = { + name = "vscode-jest-runner"; + publisher = "firsttris"; + version = "0.4.72"; + sha256 = "sha256-1nUpOXdteWsyFYJ2uATCcr1SUbeusmbpa09Bkw9/TZM="; + }; + meta = { + description = "Simple way to run or debug a single (or multiple) tests from context-menu"; + downloadPage = "https://marketplace.visualstudio.com/items?itemName=firsttris.vscode-jest-runner"; + homepage = "https://github.com/firsttris/vscode-jest-runner"; + license = lib.licenses.mit; + maintainers = [ lib.maintainers.themaxmur ]; + }; + }; + foam.foam-vscode = buildVscodeMarketplaceExtension { mktplcRef = { name = "foam-vscode"; From 30eaaf37f41e0ab624c369644513686021668d26 Mon Sep 17 00:00:00 2001 From: TheMaxMur Date: Mon, 11 Mar 2024 16:30:32 +0300 Subject: [PATCH 175/230] vscode-extensions.hars.cppsnippets: init 0.0.15 --- .../editors/vscode/extensions/default.nix | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/pkgs/applications/editors/vscode/extensions/default.nix b/pkgs/applications/editors/vscode/extensions/default.nix index 0e9dcfdff954..8516052c0505 100644 --- a/pkgs/applications/editors/vscode/extensions/default.nix +++ b/pkgs/applications/editors/vscode/extensions/default.nix @@ -2050,6 +2050,22 @@ let }; }; + hars.cppsnippets = buildVscodeMarketplaceExtension { + mktplcRef = { + name = "cppsnippets"; + publisher = "hars"; + version = "0.0.15"; + sha256 = "sha256-KXdEKcxPclbD22aKGAKSmdpVBZP2IpQRaKfc2LDsL0U="; + }; + meta = { + description = "Code snippets for C/C++"; + downloadPage = "https://marketplace.visualstudio.com/items?itemName=hars.CppSnippets"; + homepage = "https://github.com/one-harsh/vscode-cpp-snippets"; + license = lib.licenses.mit; + maintainers = [ lib.maintainers.themaxmur ]; + }; + }; + hashicorp.hcl = buildVscodeMarketplaceExtension { mktplcRef = { name = "HCL"; From 2645aea27a6306e15c6da69cdd46a4a8a8b21cdb Mon Sep 17 00:00:00 2001 From: Weijia Wang <9713184+wegank@users.noreply.github.com> Date: Mon, 11 Mar 2024 14:33:09 +0100 Subject: [PATCH 176/230] nomacs: move bundle to $out/Applications --- pkgs/by-name/no/nomacs/package.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/by-name/no/nomacs/package.nix b/pkgs/by-name/no/nomacs/package.nix index 5f4ee57ed94f..339397f9f82a 100644 --- a/pkgs/by-name/no/nomacs/package.nix +++ b/pkgs/by-name/no/nomacs/package.nix @@ -58,7 +58,8 @@ stdenv.mkDerivation (finalAttrs: { ]; postInstall = lib.optionalString stdenv.isDarwin '' - mkdir -p $out/lib + mkdir -p $out/{Applications,lib} + mv $out/nomacs.app $out/Applications/nomacs.app mv $out/libnomacsCore.dylib $out/lib/libnomacsCore.dylib ''; From 7d61abc95a920c7b4be905a17ef67b6c09c29d25 Mon Sep 17 00:00:00 2001 From: Weijia Wang <9713184+wegank@users.noreply.github.com> Date: Mon, 11 Mar 2024 14:33:25 +0100 Subject: [PATCH 177/230] nomacs: update comment on outputs --- pkgs/by-name/no/nomacs/package.nix | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/pkgs/by-name/no/nomacs/package.nix b/pkgs/by-name/no/nomacs/package.nix index 339397f9f82a..138e4ead7fcd 100644 --- a/pkgs/by-name/no/nomacs/package.nix +++ b/pkgs/by-name/no/nomacs/package.nix @@ -22,10 +22,9 @@ stdenv.mkDerivation (finalAttrs: { hash = "sha256-jHr7J0X1v2n/ZK0y3b/XPDISk7e08VWS6nicJU4fKKY="; }; - # Because some unknown reason split outputs is breaking on Darwin - outputs = if stdenv.isDarwin - then [ "out" ] - else [ "out" "man" ]; + outputs = [ "out" ] + # man pages are not installed on Darwin, see cmake/{Mac,Unix}BuildTarget.cmake + ++ lib.optionals (!stdenv.isDarwin) [ "man" ]; sourceRoot = "${finalAttrs.src.name}/ImageLounge"; From e23c73fb4030839ef0aedfc665a7fd38d792efa8 Mon Sep 17 00:00:00 2001 From: Austin Horstman Date: Mon, 11 Mar 2024 08:34:16 -0500 Subject: [PATCH 178/230] sketchybar-app-font: 2.0.5 -> 2.0.7 --- pkgs/data/fonts/sketchybar-app-font/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/data/fonts/sketchybar-app-font/default.nix b/pkgs/data/fonts/sketchybar-app-font/default.nix index a172f2da4b4b..e4b7f43a1a2f 100644 --- a/pkgs/data/fonts/sketchybar-app-font/default.nix +++ b/pkgs/data/fonts/sketchybar-app-font/default.nix @@ -5,11 +5,11 @@ stdenvNoCC.mkDerivation (finalAttrs: { pname = "sketchybar-app-font"; - version = "2.0.5"; + version = "2.0.7"; src = fetchurl { url = "https://github.com/kvndrsslr/sketchybar-app-font/releases/download/v${finalAttrs.version}/sketchybar-app-font.ttf"; - hash = "sha256-nfJVICpaw1Q1jChc3feY39vjtS/fLJ3FKVGqOKhyzwA="; + hash = "sha256-HP9fCP3CPsxc/l8nklV7bvEl4mDUYvQp+fT10AFX5LM="; }; dontUnpack = true; From 8ccd3255175015753c1efae4a1a3d99591c5f624 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 11 Mar 2024 13:34:22 +0000 Subject: [PATCH 179/230] python312Packages.types-redis: 4.6.0.20240218 -> 4.6.0.20240311 --- pkgs/development/python-modules/types-redis/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/types-redis/default.nix b/pkgs/development/python-modules/types-redis/default.nix index c5515cf1f70f..9a3685c1bb0d 100644 --- a/pkgs/development/python-modules/types-redis/default.nix +++ b/pkgs/development/python-modules/types-redis/default.nix @@ -7,12 +7,12 @@ buildPythonPackage rec { pname = "types-redis"; - version = "4.6.0.20240218"; + version = "4.6.0.20240311"; format = "setuptools"; src = fetchPypi { inherit pname version; - hash = "sha256-UQPX5pDlx0yXShYTF7LVmsIwPPi+8kF1sEwqTDSGyzk="; + hash = "sha256-4Em73/DgofjnAbZGNoESkdIb/3m/HnhQhQpEBVIkqF8="; }; propagatedBuildInputs = [ From 9031fb52454d883127cea0c6431534003e03499b Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 11 Mar 2024 13:34:28 +0000 Subject: [PATCH 180/230] reviewdog: 0.17.1 -> 0.17.2 --- pkgs/development/tools/misc/reviewdog/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/tools/misc/reviewdog/default.nix b/pkgs/development/tools/misc/reviewdog/default.nix index 2ed07f4579f1..b08fa9d5568d 100644 --- a/pkgs/development/tools/misc/reviewdog/default.nix +++ b/pkgs/development/tools/misc/reviewdog/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "reviewdog"; - version = "0.17.1"; + version = "0.17.2"; src = fetchFromGitHub { owner = pname; repo = pname; rev = "v${version}"; - hash = "sha256-l7jQaOFNhhWqkYaTd8BdH9au/wjlnWZnV5DAco93qlQ="; + hash = "sha256-NjVw+GU27ARqytpupJETAGGh0DfyuFsP637Mv+P4+zs="; }; - vendorHash = "sha256-p/WvGGadf/O2DFIUWjw7mpg8DhcaIYlgp1xgKV89+GM="; + vendorHash = "sha256-HZpRHFmEaE+MBvKJ8f5IEMmg2eIIrVGxM/jxhIgEqi0="; doCheck = false; From 4b0ec53c5b07bad947c28b38ac7b18aae686b25e Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 11 Mar 2024 13:34:29 +0000 Subject: [PATCH 181/230] pfetch-rs: 2.9.0 -> 2.9.1 --- pkgs/tools/misc/pfetch-rs/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/misc/pfetch-rs/default.nix b/pkgs/tools/misc/pfetch-rs/default.nix index 7f90a595f469..0f1d5b2f1d33 100644 --- a/pkgs/tools/misc/pfetch-rs/default.nix +++ b/pkgs/tools/misc/pfetch-rs/default.nix @@ -2,16 +2,16 @@ rustPlatform.buildRustPackage rec { pname = "pfetch-rs"; - version = "2.9.0"; + version = "2.9.1"; src = fetchFromGitHub { owner = "Gobidev"; repo = pname; rev = "v${version}"; - hash = "sha256-7Udop3542L2l9EYQZntk/qW0GUQeYfoDHQQJ8j39krQ="; + hash = "sha256-tpJk31Z7QzZNLmEv/L1008tf6hpJJI6b7E1o/kwbJe0="; }; - cargoHash = "sha256-gT5JjBsrGngfg77od566z+EOiH8KdARGYhTLOnOhWj4="; + cargoHash = "sha256-CQVPEUpblypDyr48MrLY3roGunOxem0eM1OtbcKlnsw="; buildInputs = lib.optionals stdenv.isDarwin [ darwin.apple_sdk.frameworks.AppKit From 8a1f68f99a14e8972a1567b9bef6dbd3a71858c9 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 11 Mar 2024 13:44:46 +0000 Subject: [PATCH 182/230] python312Packages.types-psycopg2: 2.9.21.20240218 -> 2.9.21.20240311 --- pkgs/development/python-modules/types-psycopg2/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/types-psycopg2/default.nix b/pkgs/development/python-modules/types-psycopg2/default.nix index b2fef1134aa1..4dce98b9c379 100644 --- a/pkgs/development/python-modules/types-psycopg2/default.nix +++ b/pkgs/development/python-modules/types-psycopg2/default.nix @@ -6,12 +6,12 @@ buildPythonPackage rec { pname = "types-psycopg2"; - version = "2.9.21.20240218"; + version = "2.9.21.20240311"; pyproject = true; src = fetchPypi { inherit pname version; - hash = "sha256-MITNgHA4piyA+1vni0HYVbSKBgMWEB6ln9hcMC77V9Q="; + hash = "sha256-cilF3/pqcpvrxmDxQTfzft/OrVosFesjQhKn0BfugHI="; }; nativeBuildInputs = [ From b625731bdddab8baf6c630bead29aab4647d233f Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 11 Mar 2024 13:44:51 +0000 Subject: [PATCH 183/230] ast-grep: 0.19.3 -> 0.19.4 --- pkgs/by-name/as/ast-grep/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/as/ast-grep/package.nix b/pkgs/by-name/as/ast-grep/package.nix index c0fa05e30c16..68fd5caf90d9 100644 --- a/pkgs/by-name/as/ast-grep/package.nix +++ b/pkgs/by-name/as/ast-grep/package.nix @@ -7,16 +7,16 @@ rustPlatform.buildRustPackage rec { pname = "ast-grep"; - version = "0.19.3"; + version = "0.19.4"; src = fetchFromGitHub { owner = "ast-grep"; repo = "ast-grep"; rev = version; - hash = "sha256-nqKDBRH2/YsSmirxJ84BgUTLfgPzZ/EQxqy6Fa7Mfxs="; + hash = "sha256-hKqj3LVu/3ndGoZQYyH1yCm5vF0/Ck5bkTKjLIkcUys="; }; - cargoHash = "sha256-48ZVbRJkpMO+kJE5Kz96McjXhMtu4TzzjfyYdggNWkQ="; + cargoHash = "sha256-Fli97ANWHZvvBC6hImymELkpBqqrAOm006LROj3R3sM="; # Work around https://github.com/NixOS/nixpkgs/issues/166205. env = lib.optionalAttrs stdenv.cc.isClang { From 13986eacc3a3a25207ce5e9ff890c74c82103447 Mon Sep 17 00:00:00 2001 From: Gaetan Lepage Date: Mon, 11 Mar 2024 14:46:04 +0100 Subject: [PATCH 184/230] rye: 0.28.0 -> 0.29.0 Diff: https://github.com/mitsuhiko/rye/compare/refs/tags/0.28.0...0.29.0 Changelog: https://github.com/mitsuhiko/rye/releases/tag/0.29.0 --- pkgs/development/tools/rye/Cargo.lock | 2 +- pkgs/development/tools/rye/default.nix | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/tools/rye/Cargo.lock b/pkgs/development/tools/rye/Cargo.lock index 0bec4dca2991..9aa4ff424bb5 100644 --- a/pkgs/development/tools/rye/Cargo.lock +++ b/pkgs/development/tools/rye/Cargo.lock @@ -1795,7 +1795,7 @@ dependencies = [ [[package]] name = "rye" -version = "0.28.0" +version = "0.29.0" dependencies = [ "age", "anyhow", diff --git a/pkgs/development/tools/rye/default.nix b/pkgs/development/tools/rye/default.nix index b6452b19afa8..b69888447c7b 100644 --- a/pkgs/development/tools/rye/default.nix +++ b/pkgs/development/tools/rye/default.nix @@ -12,13 +12,13 @@ rustPlatform.buildRustPackage rec { pname = "rye"; - version = "0.28.0"; + version = "0.29.0"; src = fetchFromGitHub { owner = "mitsuhiko"; repo = "rye"; rev = "refs/tags/${version}"; - hash = "sha256-i40VpPDK991mgBdGtufMFXuQuKuvqr0qIvl7q2KXQrg="; + hash = "sha256-rNXzhJazOi815dhqviqtfSTM60Y/5ncKBVn2YhqcKJM="; }; cargoLock = { From 0bfb4914830f03834532c1789ecfeb7514c9e25d Mon Sep 17 00:00:00 2001 From: Ilan Joselevich Date: Mon, 11 Mar 2024 16:19:25 +0200 Subject: [PATCH 185/230] rust-analyzer-unwrapped: 2024-02-26 -> 2024-03-11 Diff: https://github.com/rust-lang/rust-analyzer/compare/2024-02-26...2024-03-11 --- pkgs/development/tools/rust/rust-analyzer/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/tools/rust/rust-analyzer/default.nix b/pkgs/development/tools/rust/rust-analyzer/default.nix index e202baeb92f6..bfab5ca7eb52 100644 --- a/pkgs/development/tools/rust/rust-analyzer/default.nix +++ b/pkgs/development/tools/rust/rust-analyzer/default.nix @@ -13,14 +13,14 @@ rustPlatform.buildRustPackage rec { pname = "rust-analyzer-unwrapped"; - version = "2024-02-26"; - cargoSha256 = "sha256-qlLHynifRrMo1ZHFKDTXjsUnF6BFiiBH87ILBWCkDmE="; + version = "2024-03-11"; + cargoSha256 = "sha256-fhlz/Yo+UKeG/C5GENyDZYA8O15TF59HpKdUs04qMUE="; src = fetchFromGitHub { owner = "rust-lang"; repo = "rust-analyzer"; rev = version; - sha256 = "sha256-IBHMNEe3lspVdIzjpM2OVZiBFmFw1DKtdgVN5G41pRc="; + sha256 = "sha256-NfeDjQZUrVb9hzBPcqO19s0p/zSOatD5ZK+J7rZiE3c="; }; cargoBuildFlags = [ "--bin" "rust-analyzer" "--bin" "rust-analyzer-proc-macro-srv" ]; From b8c3fb7d6e66722d083363ccf18f2bdcdc076f03 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 11 Mar 2024 03:38:25 +0000 Subject: [PATCH 186/230] budgiePlugins.budgie-user-indicator-redux: 1.0.1 -> 1.0.2 --- .../budgie/plugins/budgie-user-indicator-redux/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/desktops/budgie/plugins/budgie-user-indicator-redux/default.nix b/pkgs/desktops/budgie/plugins/budgie-user-indicator-redux/default.nix index 0d031dbaeb5a..48d1cf96d73b 100644 --- a/pkgs/desktops/budgie/plugins/budgie-user-indicator-redux/default.nix +++ b/pkgs/desktops/budgie/plugins/budgie-user-indicator-redux/default.nix @@ -16,13 +16,13 @@ stdenv.mkDerivation rec { pname = "budgie-user-indicator-redux"; - version = "1.0.1"; + version = "1.0.2"; src = fetchFromGitHub { owner = "EbonJaeger"; repo = "budgie-user-indicator-redux"; rev = "v${version}"; - hash = "sha256-HGfcNlkIQD9nNzHm97LpNz3smYwDhxu4EArPo6msahI="; + hash = "sha256-X9b4H4PnrYGb/T7Sg9iXQeNDLoO1l0VCdbOCGUAgwC4="; }; nativeBuildInputs = [ From 3988ace9ba49c3ca572a2b0c2567e24a96b8b23b Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 11 Mar 2024 01:01:32 +0000 Subject: [PATCH 187/230] cargo-udeps: 0.1.45 -> 0.1.47 --- pkgs/development/tools/rust/cargo-udeps/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/tools/rust/cargo-udeps/default.nix b/pkgs/development/tools/rust/cargo-udeps/default.nix index e82d9b01ce1f..e54021554004 100644 --- a/pkgs/development/tools/rust/cargo-udeps/default.nix +++ b/pkgs/development/tools/rust/cargo-udeps/default.nix @@ -2,16 +2,16 @@ rustPlatform.buildRustPackage rec { pname = "cargo-udeps"; - version = "0.1.45"; + version = "0.1.47"; src = fetchFromGitHub { owner = "est31"; repo = pname; rev = "v${version}"; - sha256 = "sha256-pfEvztV/DAPPOxm8An/PsBdoF8S/AK+/S+vllezYCeo="; + sha256 = "sha256-1XnCGbOkAmQycwAAEbkoX9xHqBZWYM9v5fp8BdFv7RM="; }; - cargoHash = "sha256-SYlFENdnMeKxeDDHw73/edu1807rgrg8ncWTBsmgPtY="; + cargoHash = "sha256-awEqrvmu9Kgqlz43/yJFM45WfUXZPLix5LKLtwiXV7U="; nativeBuildInputs = [ pkg-config ]; From 7a220ac7b2543a26874737a0064faa7e42641b36 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 11 Mar 2024 14:30:45 +0000 Subject: [PATCH 188/230] python312Packages.adafruit-io: 2.7.1 -> 2.7.2 --- pkgs/development/python-modules/adafruit-io/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/adafruit-io/default.nix b/pkgs/development/python-modules/adafruit-io/default.nix index 3315df4212ce..8aaa8b61fda7 100644 --- a/pkgs/development/python-modules/adafruit-io/default.nix +++ b/pkgs/development/python-modules/adafruit-io/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { pname = "adafruit-io"; - version = "2.7.1"; + version = "2.7.2"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -19,7 +19,7 @@ buildPythonPackage rec { owner = "adafruit"; repo = "Adafruit_IO_Python"; rev = "refs/tags/${version}"; - hash = "sha256-vfjyU+czLtUA0WDEvc0iYmJ2Tn75o/OsX909clfDsUE="; + hash = "sha256-JBpF08WGe1pMK1y7HZLH/jSQkJtbWdiTGYHWRd39UIk="; }; nativeBuildInputs = [ From b4eaede38727a552372dd2fa658913ae6da9fc1a Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 11 Mar 2024 14:31:05 +0000 Subject: [PATCH 189/230] fastly: 10.8.4 -> 10.8.5 --- pkgs/misc/fastly/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/misc/fastly/default.nix b/pkgs/misc/fastly/default.nix index 7c6f44e09730..9376fc070162 100644 --- a/pkgs/misc/fastly/default.nix +++ b/pkgs/misc/fastly/default.nix @@ -10,13 +10,13 @@ buildGoModule rec { pname = "fastly"; - version = "10.8.4"; + version = "10.8.5"; src = fetchFromGitHub { owner = "fastly"; repo = "cli"; rev = "refs/tags/v${version}"; - hash = "sha256-l81DZUWP7/rCEkE/ZPuwcnVGOcbSFKe88lfduJdygu4="; + hash = "sha256-OzJWDdGPgJ4Af8Pe5YE7i7DQyvcw/YjjCrptjhH64cg="; # The git commit is part of the `fastly version` original output; # leave that output the same in nixpkgs. Use the `.git` directory # to retrieve the commit SHA, and remove the directory afterwards, @@ -33,7 +33,7 @@ buildGoModule rec { "cmd/fastly" ]; - vendorHash = "sha256-lTpj9fZ4SJzOdLwIVZxiZCUJxHC41BvwvDOctwckO5k="; + vendorHash = "sha256-raoWG+qFeDD5BKbbWq0NdBEL8ts6TsgBp/MnBzco27g="; nativeBuildInputs = [ installShellFiles From 18e2854db00c9cd7c6c9a3c98e77af556e1f7519 Mon Sep 17 00:00:00 2001 From: Bryan Lai Date: Mon, 11 Mar 2024 22:42:11 +0800 Subject: [PATCH 190/230] pulsar: 1.109.0 -> 1.114.0 Release notes: https://github.com/pulsar-edit/pulsar/releases/tag/v1.114.0 pulsar has been marked insecure so this change would not be verified by ofborg. Still, it is very actively developed and quite enjoyable to use. As an atom veteran, I would like to help keep it usable; thus adding myself to the maintainers. A patchelf fixup for `ctags-linux` is adjusted according to the new location of the binary. Co-authored-by: Peder Bergebakken Sundt --- pkgs/applications/editors/pulsar/default.nix | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/applications/editors/pulsar/default.nix b/pkgs/applications/editors/pulsar/default.nix index ef08ac9352dd..b1af335ec1d4 100644 --- a/pkgs/applications/editors/pulsar/default.nix +++ b/pkgs/applications/editors/pulsar/default.nix @@ -33,13 +33,13 @@ let pname = "pulsar"; - version = "1.109.0"; + version = "1.114.0"; sourcesPath = { x86_64-linux.tarname = "Linux.${pname}-${version}.tar.gz"; - x86_64-linux.hash = "sha256-pIm3mI1YdfapxXgIciSHtI4LeqMw5RdYTnH+eHUQ4Yo="; + x86_64-linux.hash = "sha256-O//dowoMgQfS3hq088IKr5aJd5St9zpT/ypfuswnyv0="; aarch64-linux.tarname = "ARM.Linux.${pname}-${version}-arm64.tar.gz"; - aarch64-linux.hash = "sha256-KIY/qzfl7CU0YwIgQlNHoAMhLfrTbQe7ZZvzdkUVw+M="; + aarch64-linux.hash = "sha256-EzCTB1Ib9cTbslEdXPsS5gehHr1qd5v4iZgOqpxhUmA="; }.${stdenv.hostPlatform.system} or (throw "Unsupported system: ${stdenv.hostPlatform.system}"); newLibpath = lib.makeLibraryPath [ @@ -137,7 +137,7 @@ stdenv.mkDerivation rec { --set-rpath "${newLibpath}" \ $opt/resources/app/ppm/bin/node patchelf --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \ - $opt/resources/app.asar.unpacked/node_modules/symbols-view/vendor/ctags-linux + $opt/resources/app.asar.unpacked/node_modules/symbol-provider-ctags/vendor/ctags-linux '' + lib.optionalString (stdenv.hostPlatform.system == "x86_64-linux") '' # Replace the bundled git with the one from nixpkgs @@ -208,7 +208,7 @@ stdenv.mkDerivation rec { sourceProvenance = with sourceTypes; [ binaryNativeCode ]; license = licenses.mit; platforms = platforms.linux; - maintainers = with maintainers; [ colamaroro ]; + maintainers = with maintainers; [ colamaroro bryango ]; knownVulnerabilities = [ "CVE-2023-5217" "CVE-2022-21718" From f972fa1a4971cea88b51125b3644ef4b302b0e74 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 11 Mar 2024 14:48:06 +0000 Subject: [PATCH 191/230] notmuch: 0.38.2 -> 0.38.3 --- pkgs/applications/networking/mailreaders/notmuch/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/mailreaders/notmuch/default.nix b/pkgs/applications/networking/mailreaders/notmuch/default.nix index b2970b02f7db..ba2f75669847 100644 --- a/pkgs/applications/networking/mailreaders/notmuch/default.nix +++ b/pkgs/applications/networking/mailreaders/notmuch/default.nix @@ -16,11 +16,11 @@ stdenv.mkDerivation rec { pname = "notmuch"; - version = "0.38.2"; + version = "0.38.3"; src = fetchurl { url = "https://notmuchmail.org/releases/notmuch-${version}.tar.xz"; - hash = "sha256-UoLr5HQrA+4A/Dq4NZaflNIpJ523IyESvcUAnYYelH4="; + hash = "sha256-mvRsyA2li0MByiuu/MJaQNES0DFVB+YywPPw8IMo0FQ="; }; nativeBuildInputs = [ From 47195dc3d9408e3c1a3c32c9e3fa87b165966d11 Mon Sep 17 00:00:00 2001 From: Pol Dellaiera Date: Mon, 11 Mar 2024 16:21:25 +0100 Subject: [PATCH 192/230] phpExtensions.dom: fix lowest extensions --- pkgs/top-level/php-packages.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/top-level/php-packages.nix b/pkgs/top-level/php-packages.nix index 25a1c821ac52..fe1c743d51c8 100644 --- a/pkgs/top-level/php-packages.nix +++ b/pkgs/top-level/php-packages.nix @@ -372,7 +372,7 @@ lib.makeScope pkgs.newScope (self: with self; { "--enable-dom" ]; # Add a PHP lower version bound constraint to avoid applying the patch on older PHP versions. - patches = lib.optionals (lib.versionOlder php.version "8.2.14" && lib.versionAtLeast php.version "8.1") [ + patches = lib.optionals (lib.versionOlder php.version "8.2.14" && lib.versionAtLeast php.version "8.1.27") [ # Fix tests with libxml 2.12 # Part of 8.3.1RC1+, 8.2.14RC1+ (fetchpatch { From dd46445adc028cd627dcf4686e74f464fb4b7c2e Mon Sep 17 00:00:00 2001 From: Philip Taron Date: Mon, 11 Mar 2024 08:37:31 -0700 Subject: [PATCH 193/230] Avoid top-level `with ...;` in lib/tests/modules/alias-with-priority-can-override.nix --- .../modules/alias-with-priority-can-override.nix | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) diff --git a/lib/tests/modules/alias-with-priority-can-override.nix b/lib/tests/modules/alias-with-priority-can-override.nix index 9a18c9d9f613..82a4c0df8cba 100644 --- a/lib/tests/modules/alias-with-priority-can-override.nix +++ b/lib/tests/modules/alias-with-priority-can-override.nix @@ -6,12 +6,19 @@ { config, lib, ... }: -with lib; +let + inherit (lib) + mkAliasOptionModule + mkForce + mkOption + types + ; +in { options = { # A simple boolean option that can be enabled or disabled. - enable = lib.mkOption { + enable = mkOption { type = types.nullOr types.bool; default = null; example = true; @@ -41,7 +48,7 @@ with lib; # should override the next import. ( { config, lib, ... }: { - enableAlias = lib.mkForce false; + enableAlias = mkForce false; } ) From 0426125c537b198e5d6db3f57e404e3f6954b85f Mon Sep 17 00:00:00 2001 From: Philip Taron Date: Mon, 11 Mar 2024 08:38:14 -0700 Subject: [PATCH 194/230] Avoid top-level `with ...;` in lib/tests/modules/alias-with-priority.nix --- lib/tests/modules/alias-with-priority.nix | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) diff --git a/lib/tests/modules/alias-with-priority.nix b/lib/tests/modules/alias-with-priority.nix index a35a06fc6974..c64a586ab2d1 100644 --- a/lib/tests/modules/alias-with-priority.nix +++ b/lib/tests/modules/alias-with-priority.nix @@ -6,12 +6,19 @@ { config, lib, ... }: -with lib; +let + inherit (lib) + mkAliasOptionModule + mkDefault + mkOption + types + ; +in { options = { # A simple boolean option that can be enabled or disabled. - enable = lib.mkOption { + enable = mkOption { type = types.nullOr types.bool; default = null; example = true; @@ -41,7 +48,7 @@ with lib; # should be able to be overridden by the next import. ( { config, lib, ... }: { - enableAlias = lib.mkDefault false; + enableAlias = mkDefault false; } ) From 20abffc0dd8ccc9896f787bb7b64edd2b1d05cd5 Mon Sep 17 00:00:00 2001 From: Philip Taron Date: Mon, 11 Mar 2024 08:38:37 -0700 Subject: [PATCH 195/230] Avoid top-level `with ...;` in lib/tests/modules/extendModules-168767-imports.nix --- lib/tests/modules/extendModules-168767-imports.nix | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/lib/tests/modules/extendModules-168767-imports.nix b/lib/tests/modules/extendModules-168767-imports.nix index 489e6b5a5d83..6b50b81236d1 100644 --- a/lib/tests/modules/extendModules-168767-imports.nix +++ b/lib/tests/modules/extendModules-168767-imports.nix @@ -2,7 +2,14 @@ , extendModules , ... }: -with lib; + +let + inherit (lib) + mkOption + mkOverride + types + ; +in { imports = [ From 06354636e7953db21d34c89703715916bbe04107 Mon Sep 17 00:00:00 2001 From: sinavir Date: Sun, 10 Mar 2024 00:00:16 +0100 Subject: [PATCH 196/230] python311Packages.aiohttp-client-cache: Use standard packaging --- .../aiohttp-client-cache/default.nix | 16 ++++++++++++---- 1 file changed, 12 insertions(+), 4 deletions(-) diff --git a/pkgs/development/python-modules/aiohttp-client-cache/default.nix b/pkgs/development/python-modules/aiohttp-client-cache/default.nix index 99f3488aa6f2..c8ff60e64f5a 100644 --- a/pkgs/development/python-modules/aiohttp-client-cache/default.nix +++ b/pkgs/development/python-modules/aiohttp-client-cache/default.nix @@ -1,6 +1,14 @@ -{ lib, fetchPypi, python3, ...}: +{ lib +, fetchPypi +, buildPythonPackage +, poetry-core +, aiohttp +, attrs +, itsdangerous +, url-normalize +}: -python3.pkgs.buildPythonPackage rec { +buildPythonPackage rec { pname = "aiohttp_client_cache"; version = "0.11.0"; pyproject = true; @@ -8,10 +16,10 @@ python3.pkgs.buildPythonPackage rec { inherit pname version; sha256 = "sha256-B2b/9O2gVJjHUlN0pYeBDcwsy3slaAnd5SroeQqEU+s="; }; - nativeBuildInputs = with python3.pkgs; [ + nativeBuildInputs = [ poetry-core ]; - propagatedBuildInputs = with python3.pkgs; [ + propagatedBuildInputs = [ aiohttp attrs itsdangerous From 00fd0f311b739a5dc7999b2fda97423fd94fc072 Mon Sep 17 00:00:00 2001 From: TheMaxMur Date: Mon, 11 Mar 2024 16:31:30 +0300 Subject: [PATCH 197/230] vscode-extensions.hediet.vscode-drawio: init 1.6.6 --- .../editors/vscode/extensions/default.nix | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/pkgs/applications/editors/vscode/extensions/default.nix b/pkgs/applications/editors/vscode/extensions/default.nix index 8516052c0505..087ccf7ae4c8 100644 --- a/pkgs/applications/editors/vscode/extensions/default.nix +++ b/pkgs/applications/editors/vscode/extensions/default.nix @@ -2096,6 +2096,22 @@ let }; }; + hediet.vscode-drawio = buildVscodeMarketplaceExtension { + mktplcRef = { + name = "vscode-drawio"; + publisher = "hediet"; + version = "1.6.6"; + sha256 = "sha256-SPcSnS7LnRL5gdiJIVsFaN7eccrUHSj9uQYIQZllm0M="; + }; + meta = { + description = "This unofficial extension integrates Draw.io into VS Code."; + downloadPage = "https://marketplace.visualstudio.com/items?itemName=hediet.vscode-drawio"; + homepage = "https://github.com/hediet/vscode-drawio"; + license = lib.licenses.gpl3Only; + maintainers = [ lib.maintainers.themaxmur ]; + }; + }; + hookyqr.beautify = buildVscodeMarketplaceExtension { mktplcRef = { name = "beautify"; From 0d5e9ddae9859f473ff4d5b1ed24188e67f4740c Mon Sep 17 00:00:00 2001 From: TheMaxMur Date: Mon, 11 Mar 2024 16:32:34 +0300 Subject: [PATCH 198/230] vscode-extensions.mathiasfrohlich.kotlin: init 1.7.1 --- .../editors/vscode/extensions/default.nix | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/pkgs/applications/editors/vscode/extensions/default.nix b/pkgs/applications/editors/vscode/extensions/default.nix index 087ccf7ae4c8..38d068383592 100644 --- a/pkgs/applications/editors/vscode/extensions/default.nix +++ b/pkgs/applications/editors/vscode/extensions/default.nix @@ -2601,6 +2601,22 @@ let meta.license = lib.licenses.mit; }; + mathiasfrohlich.kotlin = buildVscodeMarketplaceExtension { + mktplcRef = { + name = "Kotlin"; + publisher = "mathiasfrohlich"; + version = "1.7.1"; + sha256 = "sha256-MuAlX6cdYMLYRX2sLnaxWzdNPcZ4G0Fdf04fmnzQKH4="; + }; + meta = { + description = "Kotlin language support for VS Code"; + downloadPage = "https://marketplace.visualstudio.com/items?itemName=mathiasfrohlich.Kotlin"; + homepage = "https://github.com/mathiasfrohlich/vscode-kotlin"; + license = lib.licenses.asl20; + maintainers = [ lib.maintainers.themaxmur ]; + }; + }; + matthewpi.caddyfile-support = buildVscodeMarketplaceExtension { mktplcRef = { name = "caddyfile-support"; From ff8886fa0dfd0e223379a72866eb5a748529f180 Mon Sep 17 00:00:00 2001 From: TheMaxMur Date: Mon, 11 Mar 2024 16:33:30 +0300 Subject: [PATCH 199/230] vscode-extensions.reloadedextensions.reloaded-cpp: init 0.1.9 --- .../editors/vscode/extensions/default.nix | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/pkgs/applications/editors/vscode/extensions/default.nix b/pkgs/applications/editors/vscode/extensions/default.nix index 38d068383592..54fd18b3f9d8 100644 --- a/pkgs/applications/editors/vscode/extensions/default.nix +++ b/pkgs/applications/editors/vscode/extensions/default.nix @@ -3392,6 +3392,22 @@ let }; }; + reloadedextensions.reloaded-cpp = buildVscodeMarketplaceExtension { + mktplcRef = { + name = "reloaded-cpp"; + publisher = "reloadedextensions"; + version = "0.1.9"; + sha256 = "sha256-KQiSD18W9NnsqhRt+XM3ko70u4zX4enn3OpMt0ebViU="; + }; + meta = { + description = "C/C++ must-have highlighter that understands many coding styles and APIs. Use with 'Reloaded Themes' extension."; + downloadPage = "https://marketplace.visualstudio.com/items?itemName=reloadedextensions.reloaded-cpp"; + homepage = "https://github.com/kobalicek/reloaded-cpp"; + license = lib.licenses.mit; + maintainers = [ lib.maintainers.themaxmur ]; + }; + }; + richie5um2.snake-trail = buildVscodeMarketplaceExtension { mktplcRef = { name = "snake-trail"; From f9fc4dd23bea2b42f70f35e82fef8668530f1e75 Mon Sep 17 00:00:00 2001 From: TheMaxMur Date: Mon, 11 Mar 2024 16:36:17 +0300 Subject: [PATCH 200/230] vscode-extensions.stylelint.vscode-stylelint: init 1.3.0 --- .../editors/vscode/extensions/default.nix | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/pkgs/applications/editors/vscode/extensions/default.nix b/pkgs/applications/editors/vscode/extensions/default.nix index 54fd18b3f9d8..b870394aee0e 100644 --- a/pkgs/applications/editors/vscode/extensions/default.nix +++ b/pkgs/applications/editors/vscode/extensions/default.nix @@ -3829,6 +3829,22 @@ let }; }; + stylelint.vscode-stylelint = buildVscodeMarketplaceExtension { + mktplcRef = { + name = "vscode-stylelint"; + publisher = "stylelint"; + version = "1.3.0"; + sha256 = "sha256-JoCa2d0ayBEuCcQi3Z/90GJ4AIECVz8NCpd+i+9uMeA="; + }; + meta = { + description = "Official Stylelint extension for Visual Studio Code"; + downloadPage = "https://marketplace.visualstudio.com/items?itemName=stylelint.vscode-stylelint"; + homepage = "https://github.com/stylelint/vscode-stylelint"; + license = lib.licenses.mit; + maintainers = [ lib.maintainers.themaxmur ]; + }; + }; + sumneko.lua = callPackage ./sumneko.lua { }; svelte.svelte-vscode = buildVscodeMarketplaceExtension { From 71fce2227a77e22d27761c3636aa389daf27f7d1 Mon Sep 17 00:00:00 2001 From: TheMaxMur Date: Mon, 11 Mar 2024 16:37:46 +0300 Subject: [PATCH 201/230] vscode-extensions.ms-vscode.cpptools-extension-pack: init 1.3.0 --- .../editors/vscode/extensions/default.nix | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/pkgs/applications/editors/vscode/extensions/default.nix b/pkgs/applications/editors/vscode/extensions/default.nix index b870394aee0e..0f2d1d718683 100644 --- a/pkgs/applications/editors/vscode/extensions/default.nix +++ b/pkgs/applications/editors/vscode/extensions/default.nix @@ -2951,6 +2951,22 @@ let ms-vscode.cpptools = callPackage ./ms-vscode.cpptools { }; + ms-vscode.cpptools-extension-pack = buildVscodeMarketplaceExtension { + mktplcRef = { + name = "cpptools-extension-pack"; + publisher = "ms-vscode"; + version = "1.3.0"; + sha256 = "sha256-rHST7CYCVins3fqXC+FYiS5Xgcjmi7QW7M4yFrUR04U="; + }; + meta = { + description = "Popular extensions for C++ development in Visual Studio Code."; + downloadPage = "https://marketplace.visualstudio.com/items?itemName=ms-vscode.cpptools-extension-pack"; + homepage = "https://github.com/microsoft/vscode-cpptools"; + license = lib.licenses.mit; + maintainers = [ lib.maintainers.themaxmur ]; + }; + }; + ms-vscode.hexeditor = buildVscodeMarketplaceExtension { mktplcRef = { name = "hexeditor"; From d57dbbe36843f071bd54f0e57a29245ee00ca473 Mon Sep 17 00:00:00 2001 From: TheMaxMur Date: Mon, 11 Mar 2024 16:39:12 +0300 Subject: [PATCH 202/230] vscode-extensions.visualstudioexptteam.intellicode-api-usage-examples: init 0.2.8 --- .../editors/vscode/extensions/default.nix | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/pkgs/applications/editors/vscode/extensions/default.nix b/pkgs/applications/editors/vscode/extensions/default.nix index 0f2d1d718683..91ef18147c65 100644 --- a/pkgs/applications/editors/vscode/extensions/default.nix +++ b/pkgs/applications/editors/vscode/extensions/default.nix @@ -4287,6 +4287,22 @@ let }; }; + visualstudioexptteam.intellicode-api-usage-examples = buildVscodeMarketplaceExtension { + mktplcRef = { + name = "intellicode-api-usage-examples"; + publisher = "VisualStudioExptTeam"; + version = "0.2.8"; + sha256 = "sha256-aXAS3QX+mrX0kJqf1LUsvguqRxxC0o+jj1bKQteXPNA="; + }; + meta = { + description = "See relevant code examples from GitHub for over 100K different APIs right in your editor."; + downloadPage = "https://marketplace.visualstudio.com/items?itemName=VisualStudioExptTeam.intellicode-api-usage-examples"; + homepage = "https://github.com/MicrosoftDocs/intellicode"; + license = lib.licenses.cc-by-40; + maintainers = [ lib.maintainers.themaxmur ]; + }; + }; + vlanguage.vscode-vlang = buildVscodeMarketplaceExtension { mktplcRef = { name = "vscode-vlang"; From fe8fbcaf24546077a5616e53d5ecdef08ad44198 Mon Sep 17 00:00:00 2001 From: TheMaxMur Date: Mon, 11 Mar 2024 16:39:47 +0300 Subject: [PATCH 203/230] vscode-extensions.visualstudioexptteam.vscodeintellicode: init 1.2.30 --- .../editors/vscode/extensions/default.nix | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/pkgs/applications/editors/vscode/extensions/default.nix b/pkgs/applications/editors/vscode/extensions/default.nix index 91ef18147c65..4030cabf59cb 100644 --- a/pkgs/applications/editors/vscode/extensions/default.nix +++ b/pkgs/applications/editors/vscode/extensions/default.nix @@ -4303,6 +4303,22 @@ let }; }; + visualstudioexptteam.vscodeintellicode = buildVscodeMarketplaceExtension { + mktplcRef = { + name = "vscodeintellicode"; + publisher = "VisualStudioExptTeam"; + version = "1.2.30"; + sha256 = "sha256-f2Gn+W0QHN8jD5aCG+P93Y+JDr/vs2ldGL7uQwBK4lE="; + }; + meta = { + description = "AI-assisted development"; + downloadPage = "https://marketplace.visualstudio.com/items?itemName=VisualStudioExptTeam.vscodeintellicode"; + homepage = "https://github.com/MicrosoftDocs/intellicode"; + license = lib.licenses.cc-by-40; + maintainers = [ lib.maintainers.themaxmur ]; + }; + }; + vlanguage.vscode-vlang = buildVscodeMarketplaceExtension { mktplcRef = { name = "vscode-vlang"; From cc223b7de6a994d1eb17a3300803e4a93cb5265b Mon Sep 17 00:00:00 2001 From: TheMaxMur Date: Mon, 11 Mar 2024 16:40:49 +0300 Subject: [PATCH 204/230] vscode-extensions.vscjava.vscode-java-pack: init 0.25.2023121402 --- .../editors/vscode/extensions/default.nix | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/pkgs/applications/editors/vscode/extensions/default.nix b/pkgs/applications/editors/vscode/extensions/default.nix index 4030cabf59cb..ccf82dcba1b6 100644 --- a/pkgs/applications/editors/vscode/extensions/default.nix +++ b/pkgs/applications/editors/vscode/extensions/default.nix @@ -4389,6 +4389,22 @@ let }; }; + vscjava.vscode-java-pack = buildVscodeMarketplaceExtension { + mktplcRef = { + name = "vscode-java-pack"; + publisher = "vscjava"; + version = "0.25.2023121402"; + sha256 = "sha256-JhVJK2gZe3R6dpynon+9wauSAWPdW4LmG9oRWylCexM="; + }; + meta = { + description = "Popular extensions for Java development that provides Java IntelliSense, debugging, testing, Maven/Gradle support, project management and more"; + downloadPage = "https://marketplace.visualstudio.com/items?itemName=vscjava.vscode-java-pack"; + homepage = "https://github.com/Microsoft/vscode-java-pack"; + license = lib.licenses.mit; + maintainers = [ lib.maintainers.themaxmur ]; + }; + }; + vscjava.vscode-maven = buildVscodeMarketplaceExtension { mktplcRef = { name = "vscode-maven"; From 61a651e36286e1667afa73367465b09edcff6add Mon Sep 17 00:00:00 2001 From: emilylange Date: Sat, 9 Mar 2024 18:19:51 +0100 Subject: [PATCH 205/230] nixos/lldap: bootstrap `jwt_secret` if not provided If not provided, lldap defaults to `secretjwtsecret` as value which is hardcoded in the code base. See https://github.com/lldap/lldap/blob/v0.5.0/server/src/infra/configuration.rs#L76-L77 This is really bad, because it is trivially easy to generate an admin access token/cookie as attacker, if a `jwt_secret` is known. --- nixos/modules/services/databases/lldap.nix | 15 ++++++++++++++- 1 file changed, 14 insertions(+), 1 deletion(-) diff --git a/nixos/modules/services/databases/lldap.nix b/nixos/modules/services/databases/lldap.nix index e821da8e58aa..68374425449f 100644 --- a/nixos/modules/services/databases/lldap.nix +++ b/nixos/modules/services/databases/lldap.nix @@ -107,8 +107,21 @@ in wants = [ "network-online.target" ]; after = [ "network-online.target" ]; wantedBy = [ "multi-user.target" ]; + # lldap defaults to a hardcoded `jwt_secret` value if none is provided, which is bad, because + # an attacker could create a valid admin jwt access token fairly trivially. + # Because there are 3 different ways `jwt_secret` can be provided, we check if any one of them is present, + # and if not, bootstrap a secret in `/var/lib/lldap/jwt_secret_file` and give that to lldap. + script = lib.optionalString (!cfg.settings ? jwt_secret) '' + if [[ -z "$LLDAP_JWT_SECRET_FILE" ]] && [[ -z "$LLDAP_JWT_SECRET" ]]; then + if [[ ! -e "./jwt_secret_file" ]]; then + ${lib.getExe pkgs.openssl} rand -base64 -out ./jwt_secret_file 32 + fi + export LLDAP_JWT_SECRET_FILE="./jwt_secret_file" + fi + '' + '' + ${lib.getExe cfg.package} run --config-file ${format.generate "lldap_config.toml" cfg.settings} + ''; serviceConfig = { - ExecStart = "${lib.getExe cfg.package} run --config-file ${format.generate "lldap_config.toml" cfg.settings}"; StateDirectory = "lldap"; WorkingDirectory = "%S/lldap"; User = "lldap"; From 750188995011edd7798e09cb2969d357f7111579 Mon Sep 17 00:00:00 2001 From: emilylange Date: Sat, 9 Mar 2024 18:19:53 +0100 Subject: [PATCH 206/230] lldap: remove emilylange from maintainers I find lldap's defaults security-wise and its security-posture in a broader sense deeply unsettling for something as security-critical an authentication server. --- pkgs/servers/ldap/lldap/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/servers/ldap/lldap/default.nix b/pkgs/servers/ldap/lldap/default.nix index 892fa3a10c36..cf4cc82ed875 100644 --- a/pkgs/servers/ldap/lldap/default.nix +++ b/pkgs/servers/ldap/lldap/default.nix @@ -87,7 +87,7 @@ in rustPlatform.buildRustPackage (commonDerivationAttrs // { changelog = "https://github.com/lldap/lldap/blob/v${lldap.version}/CHANGELOG.md"; license = licenses.gpl3Only; platforms = platforms.linux; - maintainers = with maintainers; [ emilylange bendlas ]; + maintainers = with maintainers; [ bendlas ]; mainProgram = "lldap"; }; }) From 08c37ba89950cd10f4eaf6a10f7c8593bee6efb8 Mon Sep 17 00:00:00 2001 From: emilylange Date: Sun, 10 Mar 2024 18:39:43 +0100 Subject: [PATCH 207/230] nixos/lldap: set service `UMask=0027` and `StateDirectoryMode=0750` While `/var/lib/lldap` isn't technically accessible by unprivileged users thanks to `DynamicUser=true`, a user might prefer and change it to `DynamicUser=false`. There is currently also a PR open that intends to make `DynamicUser` configurable via module option. As such, `jwt_secret_file`, if bootstrapped by the service start procedure, might be rendered world-readable due to its permissions (`0644/-rw-r--r--`) defaulting to the service's umask (`022`) and `/var/lib/lldap` to `0755/drwxr-xr-x` due to `StateDirectoryMode=0755`. This would usually be fixed by using `(umask 027; openssl ...)` instead of just `openssl ...`. However, it was found that another file (`users.db`), this time bootstrapped by `lldap` itself, also had insufficient permissions (`0644/-rw-r--r--`) inherited by the global umask and would be left world-readable as well. Due to this, we instead change the service's to `027`. And to lower the impact for already bootstrapped files on existing instances like `users.db`, set `StateDirectoryMode=0750`. --- nixos/modules/services/databases/lldap.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/nixos/modules/services/databases/lldap.nix b/nixos/modules/services/databases/lldap.nix index 68374425449f..033de7af886f 100644 --- a/nixos/modules/services/databases/lldap.nix +++ b/nixos/modules/services/databases/lldap.nix @@ -123,7 +123,9 @@ in ''; serviceConfig = { StateDirectory = "lldap"; + StateDirectoryMode = "0750"; WorkingDirectory = "%S/lldap"; + UMask = "0027"; User = "lldap"; Group = "lldap"; DynamicUser = true; From cb4d58b28dd71a88992db94a9471ad5159fdbb4d Mon Sep 17 00:00:00 2001 From: Pol Dellaiera Date: Mon, 11 Mar 2024 17:49:29 +0100 Subject: [PATCH 208/230] phpExtensions.dom: update bounds for PHP82 and PHP81 --- pkgs/top-level/php-packages.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/top-level/php-packages.nix b/pkgs/top-level/php-packages.nix index fe1c743d51c8..e8144409ba12 100644 --- a/pkgs/top-level/php-packages.nix +++ b/pkgs/top-level/php-packages.nix @@ -372,7 +372,7 @@ lib.makeScope pkgs.newScope (self: with self; { "--enable-dom" ]; # Add a PHP lower version bound constraint to avoid applying the patch on older PHP versions. - patches = lib.optionals (lib.versionOlder php.version "8.2.14" && lib.versionAtLeast php.version "8.1.27") [ + patches = lib.optionals ((lib.versions.majorMinor php.version == "8.2" && lib.versionOlder php.version "8.2.14" && lib.versionAtLeast php.version "8.2.7") || (lib.versions.majorMinor php.version == "8.1" && lib.versionAtLeast php.version "8.1.27")) [ # Fix tests with libxml 2.12 # Part of 8.3.1RC1+, 8.2.14RC1+ (fetchpatch { From eb12b77ff061ac29279b940f829a7288441488fb Mon Sep 17 00:00:00 2001 From: Yaya Date: Wed, 10 Jan 2024 15:36:03 +0100 Subject: [PATCH 209/230] snipe-it: 6.2.2 -> 6.3.1 https://github.com/snipe/snipe-it/releases/tag/v6.3.0 https://github.com/snipe/snipe-it/releases/tag/v6.3.1 --- pkgs/servers/web-apps/snipe-it/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/servers/web-apps/snipe-it/default.nix b/pkgs/servers/web-apps/snipe-it/default.nix index 33fedd334a9e..5248df4ffad9 100644 --- a/pkgs/servers/web-apps/snipe-it/default.nix +++ b/pkgs/servers/web-apps/snipe-it/default.nix @@ -8,16 +8,16 @@ php.buildComposerProject (finalAttrs: { pname = "snipe-it"; - version = "6.2.2"; + version = "6.3.1"; src = fetchFromGitHub { owner = "snipe"; repo = "snipe-it"; rev = "v${finalAttrs.version}"; - hash = "sha256-EU+teGxo7YZkD7kNXk9jRyARpzWz5OMRmaWqQ6eMKYY="; + hash = "sha256-/IyQeSnD3lgNpxvPG11qgyL66UhvO7acZOLzk3BQI7U="; }; - vendorHash = "sha256-JcBcrETbjGJFlG1dH/XXqmb9MlKr0ICdnEx7/61Z5io="; + vendorHash = "sha256-V1jiJnSe7F/4bMj/gG4cfRerfIl+eAZBARm5FgErFoE="; postInstall = '' snipe_it_out="$out/share/php/snipe-it" From c1fd254bebdca04aa43577ac4ac5823cbe2d2cac Mon Sep 17 00:00:00 2001 From: Yaya Date: Tue, 5 Mar 2024 06:07:29 +0100 Subject: [PATCH 210/230] snipe-it: Move to pkgs/by-name/ --- .../snipe-it/default.nix => by-name/sn/snipe-it/package.nix} | 0 pkgs/top-level/all-packages.nix | 2 +- 2 files changed, 1 insertion(+), 1 deletion(-) rename pkgs/{servers/web-apps/snipe-it/default.nix => by-name/sn/snipe-it/package.nix} (100%) diff --git a/pkgs/servers/web-apps/snipe-it/default.nix b/pkgs/by-name/sn/snipe-it/package.nix similarity index 100% rename from pkgs/servers/web-apps/snipe-it/default.nix rename to pkgs/by-name/sn/snipe-it/package.nix diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 5e03fbae6b72..3a8b324d91da 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -27011,7 +27011,7 @@ with pkgs; smcroute = callPackage ../servers/smcroute { }; - snipe-it = callPackage ../servers/web-apps/snipe-it { + snipe-it = callPackage ../by-name/sn/snipe-it/package.nix { php = php81; }; From 57df47d9186ee07915cbfb7f6e33af6715740ace Mon Sep 17 00:00:00 2001 From: Yaya Date: Wed, 6 Mar 2024 13:49:28 +0100 Subject: [PATCH 211/230] snipe-it: 6.3.1 -> 6.3.3 https://github.com/snipe/snipe-it/releases/tag/v6.3.3 --- pkgs/by-name/sn/snipe-it/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/sn/snipe-it/package.nix b/pkgs/by-name/sn/snipe-it/package.nix index 5248df4ffad9..b8a9639b1a8d 100644 --- a/pkgs/by-name/sn/snipe-it/package.nix +++ b/pkgs/by-name/sn/snipe-it/package.nix @@ -8,16 +8,16 @@ php.buildComposerProject (finalAttrs: { pname = "snipe-it"; - version = "6.3.1"; + version = "6.3.3"; src = fetchFromGitHub { owner = "snipe"; repo = "snipe-it"; rev = "v${finalAttrs.version}"; - hash = "sha256-/IyQeSnD3lgNpxvPG11qgyL66UhvO7acZOLzk3BQI7U="; + hash = "sha256-ePE55mK8woopNuRXox51I0sJGBmjF6XDfjE+k+ncoJ0="; }; - vendorHash = "sha256-V1jiJnSe7F/4bMj/gG4cfRerfIl+eAZBARm5FgErFoE="; + vendorHash = "sha256-wO+hKttiI7T7C+4oSl8G0I4pQEfZpXjYspUhoaaLrAQ="; postInstall = '' snipe_it_out="$out/share/php/snipe-it" From 5813108ee2e7836fe421eecf0922c71571b9533c Mon Sep 17 00:00:00 2001 From: Jon Seager Date: Mon, 11 Mar 2024 17:31:34 +0000 Subject: [PATCH 212/230] lxd-ui: 0.6 -> 0.7 --- pkgs/tools/admin/lxd/ui.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/admin/lxd/ui.nix b/pkgs/tools/admin/lxd/ui.nix index afcb062630a5..138e99d26890 100644 --- a/pkgs/tools/admin/lxd/ui.nix +++ b/pkgs/tools/admin/lxd/ui.nix @@ -10,18 +10,18 @@ stdenv.mkDerivation rec { pname = "lxd-ui"; - version = "0.6"; + version = "0.7"; src = fetchFromGitHub { owner = "canonical"; repo = "lxd-ui"; rev = "refs/tags/${version}"; - hash = "sha256-3Ts6lKyzpMDVATCKD1fFIGTskWzWpQUT9S8cPFnlEOs="; + hash = "sha256-DJLkXZpParmEYHbTpl6KFC9l9y5DqzUTrC0pb2dJXI4="; }; offlineCache = fetchYarnDeps { yarnLock = "${src}/yarn.lock"; - hash = "sha256-0pyxwMGGqogEe1w3sail8NUDHtxLQZU9Wg8E6rQNy4o="; + hash = "sha256-ckTWE/czzvxbGOF8fsJ3W1sal7+NaHquoSjZSPjkGj4="; }; nativeBuildInputs = [ From 598f085755470251333117838d4bd73c5f90fa46 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 11 Mar 2024 17:32:12 +0000 Subject: [PATCH 213/230] disko: 1.4.0 -> 1.4.1 --- pkgs/by-name/di/disko/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/di/disko/package.nix b/pkgs/by-name/di/disko/package.nix index 8dd1b1313f9a..0d03005736a5 100644 --- a/pkgs/by-name/di/disko/package.nix +++ b/pkgs/by-name/di/disko/package.nix @@ -9,12 +9,12 @@ stdenvNoCC.mkDerivation (finalAttrs: { name = "disko"; - version = "1.4.0"; + version = "1.4.1"; src = fetchFromGitHub { owner = "nix-community"; repo = "disko"; rev = "v${finalAttrs.version}"; - hash = "sha256-71S/64RbyADT6FUVJq4WLiNbmcxFvgMsSihf/C2Hgno="; + hash = "sha256-HeWFrRuHpnAiPmIr26OKl2g142HuGerwoO/XtW53pcI="; }; nativeBuildInputs = [ makeWrapper ]; buildInputs = [ bash ]; From f35a9d27073ec2effc247a6aefb9a71f01961e4d Mon Sep 17 00:00:00 2001 From: Ivan Mincik Date: Mon, 11 Mar 2024 18:31:32 +0100 Subject: [PATCH 214/230] gdal: bump java source option Bump java source option to fix build with JDK 21. Closes #294940 --- pkgs/development/libraries/gdal/default.nix | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/pkgs/development/libraries/gdal/default.nix b/pkgs/development/libraries/gdal/default.nix index 5d0fc7a65706..38a4342dfa1d 100644 --- a/pkgs/development/libraries/gdal/default.nix +++ b/pkgs/development/libraries/gdal/default.nix @@ -2,6 +2,7 @@ , stdenv , callPackage , fetchFromGitHub +, fetchpatch , useMinimalFeatures ? false , useTiledb ? (!useMinimalFeatures) && !(stdenv.isDarwin && stdenv.isx86_64) @@ -88,6 +89,14 @@ stdenv.mkDerivation (finalAttrs: { hash = "sha256-R9VLof13OXPbWGHOG1Q4WZWSPoF739C6WuNWxoIwKTw="; }; + patches = [ + # bump java source option to fix build with JDK 21 + (fetchpatch { + url = "https://github.com/OSGeo/gdal/commit/ca2eb4130750b0e6365f738a5f8ff77081f5c5bb.patch"; + sha256 = "sha256-wShYm9yA7twJR72co+Tvf/IuYXqbI0OrjWl0uqC3bwo="; + }) + ]; + nativeBuildInputs = [ bison cmake From 3349c41fe4a7c37f7d2fc25f5add96c3fb3ff648 Mon Sep 17 00:00:00 2001 From: Hraban Date: Mon, 11 Mar 2024 18:51:40 +0000 Subject: [PATCH 215/230] sbcl: fix comment s/zlib/zstd Co-authored-by: 7c6f434c <7c6f434c@mail.ru> --- pkgs/development/compilers/sbcl/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/compilers/sbcl/default.nix b/pkgs/development/compilers/sbcl/default.nix index 0262584c3e37..78b3ed07602b 100644 --- a/pkgs/development/compilers/sbcl/default.nix +++ b/pkgs/development/compilers/sbcl/default.nix @@ -98,7 +98,7 @@ stdenv.mkDerivation (self: rec { # Declare at the point of actual use in case the caller wants to override # buildInputs to sidestep this. assert lib.assertMsg (!purgeNixReferences) '' - Cannot enable coreCompression when purging Nix references, because compression requires linking in zlib + Cannot enable coreCompression when purging Nix references, because compression requires linking in zstd ''; [ zstd ] ); From b7f315079317bafd646c5fa9a467e41bb1eb4585 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Maciej=20Kr=C3=BCger?= Date: Sun, 10 Mar 2024 20:48:23 +0100 Subject: [PATCH 216/230] incus.ui: upgrade zabbly patches, split from lxd --- pkgs/by-name/in/incus/ui.nix | 87 +++++++++++++++++++++++++++++------- 1 file changed, 71 insertions(+), 16 deletions(-) diff --git a/pkgs/by-name/in/incus/ui.nix b/pkgs/by-name/in/incus/ui.nix index ebf052ed8782..705d715f0cfd 100644 --- a/pkgs/by-name/in/incus/ui.nix +++ b/pkgs/by-name/in/incus/ui.nix @@ -1,32 +1,87 @@ -{ lxd +{ lib +, stdenv , fetchFromGitHub +, fetchYarnDeps +, nodejs +, prefetch-yarn-deps +, yarn +, nixosTests , git }: -lxd.ui.overrideAttrs(prev: rec { +stdenv.mkDerivation rec { pname = "incus-ui"; + version = "0.6"; + + src = fetchFromGitHub { + owner = "canonical"; + repo = "lxd-ui"; + rev = "refs/tags/${version}"; + hash = "sha256-3Ts6lKyzpMDVATCKD1fFIGTskWzWpQUT9S8cPFnlEOs="; + }; + + offlineCache = fetchYarnDeps { + yarnLock = "${src}/yarn.lock"; + hash = "sha256-0pyxwMGGqogEe1w3sail8NUDHtxLQZU9Wg8E6rQNy4o="; + }; zabbly = fetchFromGitHub { owner = "zabbly"; repo = "incus"; - rev = "8bbe23f42beedd845bd95069c06f4d0c85e450b6"; - hash = "sha256-X0I8vrhvg5mLGAY8oEU/nr2pvDJ8ZqLUSY9WBqwmolE="; + rev = "3eabc1960e99e7e515916e3ea7068a412a8c420b"; + hash = "sha256-Kw53Qjurc6WPswB38v6wuRhuuGE34uYxNoAKH4UmTBE="; }; - nativeBuildInputs = prev.nativeBuildInputs ++ [ - git - ]; - patchPhase = '' - for p in $zabbly/patches/ui-canonical*; do + for p in $zabbly/patches/ui-canonical*patch; do echo "applying patch $p" git apply -p1 "$p" done - sed -i "s/LXD/Incus/g" src/*/*.ts* src/*/*/*.ts* src/*/*/*/*.ts* - sed -i "s/devlxd/guestapi/g" src/*/*.ts* src/*/*/*.ts* src/*/*/*/*.ts* - sed -i "s/dev\/lxd/dev\/incus/g" src/*/*.ts* src/*/*/*.ts* src/*/*/*/*.ts* - sed -i "s/lxd_/incus_/g" src/*/*.ts* src/*/*/*.ts* src/*/*/*/*.ts* - sed -i "s/\"lxd\"/\"incus\"/g" src/*/*.ts* src/*/*/*.ts* src/*/*/*/*.ts* - + sed -i -f "$zabbly/patches/ui-canonical-renames.sed" src/*/*.ts* src/*/*/*.ts* src/*/*/*/*.ts* ''; -}) + + nativeBuildInputs = [ + nodejs + prefetch-yarn-deps + yarn + git + ]; + + configurePhase = '' + runHook preConfigure + + export HOME=$(mktemp -d) + yarn config --offline set yarn-offline-mirror "$offlineCache" + fixup-yarn-lock yarn.lock + yarn --offline --frozen-lockfile --ignore-platform --ignore-scripts --no-progress --non-interactive install + patchShebangs node_modules + + runHook postConfigure + ''; + + buildPhase = '' + runHook preBuild + + yarn --offline build + + runHook postBuild + ''; + + installPhase = '' + runHook preInstall + + cp -r build/ui/ $out + + runHook postInstall + ''; + + passthru.tests.default = nixosTests.incus.ui; + + meta = { + description = "Web user interface for Incus, based on LXD webui"; + homepage = "https://github.com/canonical/lxd-ui"; + license = lib.licenses.gpl3; + maintainers = lib.teams.lxc.members; + platforms = lib.platforms.linux; + }; +} From c58f136b53bddfaea84954828b9c213317915bb4 Mon Sep 17 00:00:00 2001 From: Jon Seager Date: Mon, 11 Mar 2024 08:28:07 +0000 Subject: [PATCH 217/230] homepage-dashboard: enable nix-update-script --- pkgs/servers/homepage-dashboard/default.nix | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/homepage-dashboard/default.nix b/pkgs/servers/homepage-dashboard/default.nix index 6f0a94500ef0..e2e5e16b0739 100644 --- a/pkgs/servers/homepage-dashboard/default.nix +++ b/pkgs/servers/homepage-dashboard/default.nix @@ -10,6 +10,7 @@ , makeBinaryWrapper , nixosTests , enableLocalIcons ? false +, nix-update-script }: let dashboardIcons = fetchFromGitHub { @@ -99,8 +100,11 @@ buildNpmPackage rec { doDist = false; - passthru.tests = { - inherit (nixosTests) homepage-dashboard; + passthru = { + tests = { + inherit (nixosTests) homepage-dashboard; + }; + updateScript = nix-update-script { }; }; meta = { From 62fddf40a9b648becb79173552f9080089d4928a Mon Sep 17 00:00:00 2001 From: Jon Seager Date: Mon, 11 Mar 2024 08:28:49 +0000 Subject: [PATCH 218/230] homepage-dashboard: 0.8.8 -> 0.8.9 https://github.com/gethomepage/homepage/releases/tag/v0.8.9 Remove patch which is now included upstream. --- pkgs/servers/homepage-dashboard/default.nix | 20 +++----------------- 1 file changed, 3 insertions(+), 17 deletions(-) diff --git a/pkgs/servers/homepage-dashboard/default.nix b/pkgs/servers/homepage-dashboard/default.nix index e2e5e16b0739..98166ea2d807 100644 --- a/pkgs/servers/homepage-dashboard/default.nix +++ b/pkgs/servers/homepage-dashboard/default.nix @@ -29,30 +29,16 @@ let in buildNpmPackage rec { pname = "homepage-dashboard"; - version = "0.8.8"; + version = "0.8.9"; src = fetchFromGitHub { owner = "gethomepage"; repo = "homepage"; rev = "v${version}"; - hash = "sha256-QPMjf+VpsjvIrjjhDuZqd8VLl2Uu5Wop286Yn8XeRWk="; + hash = "sha256-wG7+w6Hsqs1skxUyEMx2j3R8qh3dHXtBg2ADdWBPc/g="; }; - npmDepsHash = "sha256-u15lDdXnV3xlXAC9WQQKLIeV/AgtRM1sFNsacw3j6kU="; - - # This project is primarily designed to be consumed through Docker. - # By default it logs to stdout, and also to a directory. This makes - # little sense here where all the logs will be collated in the - # systemd journal anyway, so the patch removes the file logging. - # This patch has been suggested upstream, but the contribution won't - # be accepted until it gets at least 10 upvotes, per their policy: - # https://github.com/gethomepage/homepage/discussions/3067 - patches = [ - (fetchpatch { - url = "https://github.com/gethomepage/homepage/commit/3be28a2c8b68f2404e4083e7f32eebbccdc4d293.patch"; - hash = "sha256-5fUOXiHBZ4gdPeOHe1NIaBLaHJTDImsRjSwtueQOEXY="; - }) - ]; + npmDepsHash = "sha256-ZpH9rVe3bAhVbq7uTVDvaPpA6XRRKT/ySdytZMlemCE="; preBuild = '' mkdir -p config From bb27f930c866c0ef3ddc648a8cadb758759672dc Mon Sep 17 00:00:00 2001 From: Jon Seager Date: Mon, 11 Mar 2024 08:29:36 +0000 Subject: [PATCH 219/230] homepage-dashboard: add changelog to meta --- pkgs/servers/homepage-dashboard/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/servers/homepage-dashboard/default.nix b/pkgs/servers/homepage-dashboard/default.nix index 98166ea2d807..e5798f34308a 100644 --- a/pkgs/servers/homepage-dashboard/default.nix +++ b/pkgs/servers/homepage-dashboard/default.nix @@ -95,6 +95,7 @@ buildNpmPackage rec { meta = { description = "A highly customisable dashboard with Docker and service API integrations."; + changelog = "https://github.com/gethomepage/homepage/releases/tag/v${version}"; mainProgram = "homepage"; homepage = "https://gethomepage.dev"; license = lib.licenses.gpl3; From 8ab31764fc9f833e6b768ee67e7403ee94978763 Mon Sep 17 00:00:00 2001 From: Jon Seager Date: Mon, 11 Mar 2024 09:41:14 +0000 Subject: [PATCH 220/230] homepage-dashboard: remove trailing period from `meta.description` --- pkgs/servers/homepage-dashboard/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/servers/homepage-dashboard/default.nix b/pkgs/servers/homepage-dashboard/default.nix index e5798f34308a..85147507420d 100644 --- a/pkgs/servers/homepage-dashboard/default.nix +++ b/pkgs/servers/homepage-dashboard/default.nix @@ -94,7 +94,7 @@ buildNpmPackage rec { }; meta = { - description = "A highly customisable dashboard with Docker and service API integrations."; + description = "A highly customisable dashboard with Docker and service API integrations"; changelog = "https://github.com/gethomepage/homepage/releases/tag/v${version}"; mainProgram = "homepage"; homepage = "https://gethomepage.dev"; From c42d695778ab64f5ec798c37817b76c7436c79ab Mon Sep 17 00:00:00 2001 From: Josh Bainbridge Date: Mon, 11 Mar 2024 19:08:28 +0000 Subject: [PATCH 221/230] mods: 1.1.0 -> 1.2.2 Signed-off-by: Josh Bainbridge --- pkgs/tools/misc/mods/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/misc/mods/default.nix b/pkgs/tools/misc/mods/default.nix index fda8944c330f..33cc3dd3e133 100644 --- a/pkgs/tools/misc/mods/default.nix +++ b/pkgs/tools/misc/mods/default.nix @@ -8,16 +8,16 @@ buildGoModule rec { pname = "mods"; - version = "1.1.0"; + version = "1.2.2"; src = fetchFromGitHub { owner = "charmbracelet"; repo = "mods"; rev = "v${version}"; - hash = "sha256-ZWH3YuN1cmdw96/HVzsp1u70ziUfupUeBjJiNI5a538="; + hash = "sha256-ecmfWnrd9gwIEGAOIcOeUnfmkKmq9dLxpKqAHJemhvU="; }; - vendorHash = "sha256-PgaxqfgtwBYnzyL2F/OPJP1rdmLOtBCTKEPhMgvC6XA="; + vendorHash = "sha256-pJ31Lsa5VVix3BM4RrllQA3MJ/JeNIKfQ8RClyFfXCI="; ldflags = [ "-s" "-w" "-X=main.Version=${version}" ]; From ee0bc95d48f9671fad4b7a2f394b2b1f7cb3b348 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 11 Mar 2024 12:38:56 +0000 Subject: [PATCH 222/230] python312Packages.schema-salad: 8.5.20240102191336.dev7+g8e95468 -> 8.5.20240311110950 --- pkgs/development/python-modules/schema-salad/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/schema-salad/default.nix b/pkgs/development/python-modules/schema-salad/default.nix index 86a1ba65598d..7e20d1c39779 100644 --- a/pkgs/development/python-modules/schema-salad/default.nix +++ b/pkgs/development/python-modules/schema-salad/default.nix @@ -16,7 +16,7 @@ buildPythonPackage rec { pname = "schema-salad"; - version = "8.5.20240102191336.dev7+g8e95468"; + version = "8.5.20240311110950"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -24,8 +24,8 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "common-workflow-language"; repo = "schema_salad"; - rev = "8e954684b08d222d54b7eff680eaa4d4e65920a9"; - hash = "sha256-VoFFKe6XHDytj5UlmsN14RevKcgpl+DSDMGDVS2Ols4="; + rev = "refs/tags/${version}"; + hash = "sha256-bjeVgV9ovIVvGvSay24vKkzSXBbzgV05BkO5DojTX3o="; }; nativeBuildInputs = [ From 93c6b3e1296203879d7637fed35ba79fa7262b3e Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 11 Mar 2024 12:37:37 +0000 Subject: [PATCH 223/230] apk-tools: 2.14.0 -> 2.14.1 --- pkgs/tools/package-management/apk-tools/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/package-management/apk-tools/default.nix b/pkgs/tools/package-management/apk-tools/default.nix index 4a460adfd0ff..4800a6641bd0 100644 --- a/pkgs/tools/package-management/apk-tools/default.nix +++ b/pkgs/tools/package-management/apk-tools/default.nix @@ -4,14 +4,14 @@ stdenv.mkDerivation rec { pname = "apk-tools"; - version = "2.14.0"; + version = "2.14.1"; src = fetchFromGitLab { domain = "gitlab.alpinelinux.org"; owner = "alpine"; repo = "apk-tools"; rev = "v${version}"; - sha256 = "sha256-NbADp017wL6h+Owg/GISidoXEq0seWaa98/Hyyq6pYc="; + sha256 = "sha256-gO7Yf60eabvAdPDSzxvxeEMsvc6ixy1iQ6/o7WWlE2Q="; }; nativeBuildInputs = [ pkg-config scdoc ] From 0897539a66398a6b048371586c0e565348196743 Mon Sep 17 00:00:00 2001 From: Robert Sliwinski Date: Mon, 11 Mar 2024 20:41:12 +0100 Subject: [PATCH 224/230] paperless-ngx: 2.6.1 -> 2.6.2 https://github.com/paperless-ngx/paperless-ngx/releases/tag/v2.6.2 https://github.com/paperless-ngx/paperless-ngx/compare/v2.6.1...v2.6.2 --- pkgs/applications/office/paperless-ngx/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/office/paperless-ngx/default.nix b/pkgs/applications/office/paperless-ngx/default.nix index 0f77fd1cf358..367d4ebaf5b6 100644 --- a/pkgs/applications/office/paperless-ngx/default.nix +++ b/pkgs/applications/office/paperless-ngx/default.nix @@ -22,13 +22,13 @@ }: let - version = "2.6.1"; + version = "2.6.2"; src = fetchFromGitHub { owner = "paperless-ngx"; repo = "paperless-ngx"; rev = "refs/tags/v${version}"; - hash = "sha256-sBzy3C59630moKuv3cmE9YI/FQkoZbF0SoSFbpJdNd8="; + hash = "sha256-i7zQQbNF9uAmvC5qAlNKV8Ip9K6sM1xOeOV4wxe5hts="; }; python = python3; From ef12e2a9307b8af59c0e4f49845b95c3c9a8c028 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 11 Mar 2024 12:37:22 +0000 Subject: [PATCH 225/230] asciidoctorj: 2.5.11 -> 2.5.12 --- pkgs/tools/typesetting/asciidoctorj/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/typesetting/asciidoctorj/default.nix b/pkgs/tools/typesetting/asciidoctorj/default.nix index fd2bc2eabdb8..ac9abf1924c0 100644 --- a/pkgs/tools/typesetting/asciidoctorj/default.nix +++ b/pkgs/tools/typesetting/asciidoctorj/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "asciidoctorj"; - version = "2.5.11"; + version = "2.5.12"; src = fetchzip { url = "mirror://maven/org/asciidoctor/${pname}/${version}/${pname}-${version}-bin.zip"; - sha256 = "sha256-Eagq8a6xTMonaiyhuuHc47pD8gE6jqWx7cZ3xJykmeQ="; + sha256 = "sha256-cpFY9nEqy7yBevupHMpNybqnAfN2fT9RcSKWlRdWsag="; }; nativeBuildInputs = [ makeWrapper ]; From 12ee5fb27165a9862d9f2c63bd9427316a46e8b2 Mon Sep 17 00:00:00 2001 From: Vincenzo Mantova <1962985+xworld21@users.noreply.github.com> Date: Mon, 11 Mar 2024 20:12:51 +0000 Subject: [PATCH 226/230] texlive.bin.dvisvgm: 3.0.3 -> 3.1.2 (#294817) Build dvisvgm from upstream sources to align with binaries distributed by TeX Live. --- pkgs/tools/typesetting/tex/texlive/bin.nix | 41 ++++++---------------- 1 file changed, 11 insertions(+), 30 deletions(-) diff --git a/pkgs/tools/typesetting/tex/texlive/bin.nix b/pkgs/tools/typesetting/tex/texlive/bin.nix index 46ec52f75d84..7aa75106a611 100644 --- a/pkgs/tools/typesetting/tex/texlive/bin.nix +++ b/pkgs/tools/typesetting/tex/texlive/bin.nix @@ -322,44 +322,25 @@ context = stdenv.mkDerivation rec { }; }; -dvisvgm = stdenv.mkDerivation { +dvisvgm = stdenv.mkDerivation rec { pname = "dvisvgm"; - inherit (texlive.pkgs.dvisvgm) version; + version = "3.1.2"; - inherit (common) src; + src = assert lib.assertMsg (version == texlive.pkgs.dvisvgm.version) "dvisvgm: TeX Live version (${texlive.pkgs.dvisvgm.version}) different from source (${version}), please update dvisvgm"; fetchurl { + url = "https://github.com/mgieseki/dvisvgm/releases/download/${version}/dvisvgm-${version}.tar.gz"; + hash = "sha256-vqeDrf6TG3eUoMMNeQK4Kw1NmtaBbc2KCVqTHNM+rPY="; + }; - patches = [ - # do not use deprecated NEWPDF option with Ghostscript >= 10.02.0 - # https://github.com/mgieseki/dvisvgm/issues/245 - (fetchpatch { - name = "dont-use-NEWPDF-with-GS-10.02.0.patch"; - url = "https://github.com/mgieseki/dvisvgm/commit/f31cdf14d73f586e2b92b4b0891d097a90274a0b.patch"; - hash = "sha256-Yf/GhmJYM87M0ITZ/+7q2ZvSYnac4N2/NkTkFlJ2VII="; - stripLen = 1; - extraPrefix = "texk/dvisvgm/dvisvgm-src/"; - }) + configureFlags = [ + "--disable-manpage" # man pages are provided by the doc container ]; - # since we are running configure directly in texk/dvisvgm, - # the option --with-system-potrace is not picked up properly - # and dvisvgm tries to build a vendored copy of potrace + # PDF handling requires mutool (from mupdf) since Ghostscript 10.01 postPatch = '' - cat > texk/dvisvgm/dvisvgm-src/libs/potrace/Makefile < Date: Mon, 11 Mar 2024 22:03:01 +0100 Subject: [PATCH 227/230] osu-lazer{,-bin}: 2024.302.1 -> 2024.312.0 --- pkgs/games/osu-lazer/bin.nix | 8 +++---- pkgs/games/osu-lazer/default.nix | 4 ++-- pkgs/games/osu-lazer/deps.nix | 37 ++++++++++++++++++++------------ 3 files changed, 29 insertions(+), 20 deletions(-) diff --git a/pkgs/games/osu-lazer/bin.nix b/pkgs/games/osu-lazer/bin.nix index be46a964de88..dc599bf34f8b 100644 --- a/pkgs/games/osu-lazer/bin.nix +++ b/pkgs/games/osu-lazer/bin.nix @@ -7,22 +7,22 @@ let pname = "osu-lazer-bin"; - version = "2024.302.1"; + version = "2024.312.0"; src = { aarch64-darwin = fetchzip { url = "https://github.com/ppy/osu/releases/download/${version}/osu.app.Apple.Silicon.zip"; - hash = "sha256-fhjmYAgszAF0uNk94fDj1g4oi8PiHY5lgPc5SdF9L8I="; + hash = "sha256-RwOSB/WcAqR8j0xw1QUji1IEn7iHXcHj2xOcKjnpl00="; stripRoot = false; }; x86_64-darwin = fetchzip { url = "https://github.com/ppy/osu/releases/download/${version}/osu.app.Intel.zip"; - hash = "sha256-divrIWeBWjKvWxb+BANnsrUcSP2QlicFgPFpH+H2dpA="; + hash = "sha256-Wnr7CtQIfugKrGsl72NXdHJIsF7rRNhzjV1Q+gRHK10="; stripRoot = false; }; x86_64-linux = fetchurl { url = "https://github.com/ppy/osu/releases/download/${version}/osu.AppImage"; - hash = "sha256-vYG3viY9GBtgaY8ThCSWss+zzjAyVa4fmrWrQdYcUow="; + hash = "sha256-kWNobQXGGS2TWvPkhfheqnlbijfnxfcP36ANUeN6bW0="; }; }.${stdenv.system} or (throw "${pname}-${version}: ${stdenv.system} is unsupported."); diff --git a/pkgs/games/osu-lazer/default.nix b/pkgs/games/osu-lazer/default.nix index 60e372a768ec..e51b451847ae 100644 --- a/pkgs/games/osu-lazer/default.nix +++ b/pkgs/games/osu-lazer/default.nix @@ -17,13 +17,13 @@ buildDotnetModule rec { pname = "osu-lazer"; - version = "2024.302.1"; + version = "2024.312.0"; src = fetchFromGitHub { owner = "ppy"; repo = "osu"; rev = version; - hash = "sha256-4+ACEWYgXvr8eoRJZHmTq74Bh159V+p2K+Pn1IPi2l4="; + hash = "sha256-54georjON2Fu/kj4w4SeW0BR/aHomGrKeicJ9N4/Y9s="; }; projectFile = "osu.Desktop/osu.Desktop.csproj"; diff --git a/pkgs/games/osu-lazer/deps.nix b/pkgs/games/osu-lazer/deps.nix index 56cd9d37db82..8985785a4da9 100644 --- a/pkgs/games/osu-lazer/deps.nix +++ b/pkgs/games/osu-lazer/deps.nix @@ -5,12 +5,12 @@ (fetchNuGet { pname = "AutoMapper"; version = "12.0.1"; sha256 = "0s0wjl4ck3sal8a50x786wxs9mbca7bxaqk3558yx5wpld4h4z3b"; }) (fetchNuGet { pname = "Clowd.Squirrel"; version = "2.11.1"; sha256 = "0s8ar0cl1pz1cbh3xm79cyaqdnfdm89mxd18qkhbyavhn6kqgnm0"; }) (fetchNuGet { pname = "CodeFileSanity"; version = "0.0.37"; sha256 = "03ja3g66lb0smjmkr3yf28h7fy52wwbdnf6p268zfla3azh006pq"; }) - (fetchNuGet { pname = "DiffPlex"; version = "1.7.1"; sha256 = "1q78r70pirgb7j5wkh454ws237lihh0fig212cpbj02cz53c2h6j"; }) + (fetchNuGet { pname = "DiffPlex"; version = "1.7.2"; sha256 = "04db3fs6cl380309kdsabss61f6gqjb8fd0yj47z5640vgazrjan"; }) (fetchNuGet { pname = "DiscordRichPresence"; version = "1.2.1.24"; sha256 = "0maw0yd6xgwy0cgk593z3zva0r5j267zpdmmpq8avj3zbna6n4x1"; }) (fetchNuGet { pname = "FFmpeg.AutoGen"; version = "4.3.0.1"; sha256 = "0n6x57mnnvcjnrs8zyvy07h5zm4bcfy9gh4n4bvd9fx5ys4pxkvv"; }) (fetchNuGet { pname = "Fody"; version = "6.8.0"; sha256 = "1y159433n5wzlvc8hjjrhjarf7mjvngbmh34jkd452zlrjqrhmns"; }) (fetchNuGet { pname = "HidSharpCore"; version = "1.2.1.1"; sha256 = "1zkndglmz0s8rblfhnqcvv90rkq2i7lf4bc380g7z8h1avf2ikll"; }) - (fetchNuGet { pname = "HtmlAgilityPack"; version = "1.11.57"; sha256 = "0brswm659d2vb11021z7xylljlnaf344yf5q093bqxyhbxva8ijq"; }) + (fetchNuGet { pname = "HtmlAgilityPack"; version = "1.11.59"; sha256 = "0h4a2aq50x5hlgzp6qyqcly67j49rsrscrd83qmzqk6a7g1a50cz"; }) (fetchNuGet { pname = "Humanizer"; version = "2.14.1"; sha256 = "18cycx9gvbc3735chdi2r583x73m2fkz1ws03yi3g640j9zv00fp"; }) (fetchNuGet { pname = "Humanizer.Core"; version = "2.14.1"; sha256 = "1ai7hgr0qwd7xlqfd92immddyi41j3ag91h3594yzfsgsy6yhyqi"; }) (fetchNuGet { pname = "Humanizer.Core.af"; version = "2.14.1"; sha256 = "197lsky6chbmrixgsg6dvxbdbbpis0an8mn6vnwjcydhncis087h"; }) @@ -137,18 +137,18 @@ (fetchNuGet { pname = "ppy.ManagedBass.Fx"; version = "2022.1216.0"; sha256 = "1vw573mkligpx9qiqasw1683cqaa1kgnxhlnbdcj9c4320b1pwjm"; }) (fetchNuGet { pname = "ppy.ManagedBass.Mix"; version = "2022.1216.0"; sha256 = "185bpvgbnd8y20r7vxb1an4pd1aal9b7b5wvmv3knz0qg8j0chd9"; }) (fetchNuGet { pname = "ppy.ManagedBass.Wasapi"; version = "2022.1216.0"; sha256 = "0h2ncf59sza8whvrwwqi8b6fcrkqrnfgfhd0vnhyw0s98nj74f0z"; }) - (fetchNuGet { pname = "ppy.osu.Framework"; version = "2024.223.0"; sha256 = "0k97jd4kac3vzsyvgn7imx17lad8ibbrhfx1q8vglqy6w5mriqlw"; }) + (fetchNuGet { pname = "ppy.osu.Framework"; version = "2024.306.0"; sha256 = "0fvjr0955n8y5cysdmwzqq3anj59qk3dv2x23mrgdr3hdc75xb92"; }) (fetchNuGet { pname = "ppy.osu.Framework.NativeLibs"; version = "2023.1225.0-nativelibs"; sha256 = "008kj91i9486ff2q7fcgb8mmpinskvnmfsqza2m5vafh295y3h7m"; }) (fetchNuGet { pname = "ppy.osu.Framework.SourceGeneration"; version = "2023.720.0"; sha256 = "001vvxyv483ibid25fdknvij77x0y983mp4psx2lbg3x2al7yxax"; }) - (fetchNuGet { pname = "ppy.osu.Game.Resources"; version = "2024.207.0"; sha256 = "0960jg0a860f545phscimv5qw6bzijpc4pyplx126zcm1w1cpmfi"; }) + (fetchNuGet { pname = "ppy.osu.Game.Resources"; version = "2024.309.0"; sha256 = "1ckl3yzxijnsg73awwvbs1rfnla29r88f2qarq51l8fd1ngcig26"; }) (fetchNuGet { pname = "ppy.osuTK.NS20"; version = "1.0.211"; sha256 = "0j4a9n39pqm0cgdcps47p5n2mqph3h94r7hmf0bs59imif4jxvjy"; }) (fetchNuGet { pname = "ppy.SDL2-CS"; version = "1.0.693-alpha"; sha256 = "15fgd3j9cs3adldiscqm0ffixf68h06wqdz1xy1286z4gczhi954"; }) (fetchNuGet { pname = "ppy.Veldrid"; version = "4.9.5-gc8dfc5ca19"; sha256 = "0w0mimfwdgbywmvq2yv04p65wgi1plhlk1ya012yyxp13vvhfgi8"; }) (fetchNuGet { pname = "ppy.Veldrid.MetalBindings"; version = "4.9.5-gc8dfc5ca19"; sha256 = "0i6bb79kprrmsfphjq26rgxqfvvf12pxr7dfwcq448dw2xgq6rpy"; }) (fetchNuGet { pname = "ppy.Veldrid.OpenGLBindings"; version = "4.9.5-gc8dfc5ca19"; sha256 = "06a4kkfidr7yj60xl3k4yfawz4wzwkkjpaki8fmsanif1yhz69l8"; }) (fetchNuGet { pname = "ppy.Veldrid.SPIRV"; version = "1.0.15-gca6cec7843"; sha256 = "09pi4c91ljavilw9kx7kzhcax7ar4zk7zy1qwvqfrqsgxznvyxa1"; }) - (fetchNuGet { pname = "Realm"; version = "11.5.0"; sha256 = "0r7j5si3n4ncq8xnnjk1q5jjqbj0s1w3ps124y8pgqd14dzvch6a"; }) - (fetchNuGet { pname = "Realm.PlatformHelpers"; version = "11.5.0"; sha256 = "1ggbmlsf04pxnh1k86hs0wxnvcw0ja2xnn6358qmrp826km0w1g9"; }) + (fetchNuGet { pname = "Realm"; version = "11.7.0"; sha256 = "1vp8rparpcv7rbqx7m55xcji941a6qjamxhb943fgfkjf196z69w"; }) + (fetchNuGet { pname = "Realm.PlatformHelpers"; version = "11.7.0"; sha256 = "1a7kaap5ad3n7cgf07xa9yc4c1qi7cf2zj3f5hdv7fp84bdzmysg"; }) (fetchNuGet { pname = "Remotion.Linq"; version = "2.2.0"; sha256 = "1y46ni0xswmmiryp8sydjgryafwn458dr91f9xn653w73kdyk4xf"; }) (fetchNuGet { pname = "runtime.any.System.Collections"; version = "4.3.0"; sha256 = "0bv5qgm6vr47ynxqbnkc7i797fdi8gbjjxii173syrx14nmrkwg0"; }) (fetchNuGet { pname = "runtime.any.System.Diagnostics.Tools"; version = "4.3.0"; sha256 = "1wl76vk12zhdh66vmagni66h5xbhgqq7zkdpgw21jhxhvlbcl8pk"; }) @@ -168,8 +168,11 @@ (fetchNuGet { pname = "runtime.any.System.Threading.Tasks"; version = "4.3.0"; sha256 = "03mnvkhskbzxddz4hm113zsch1jyzh2cs450dk3rgfjp8crlw1va"; }) (fetchNuGet { pname = "runtime.any.System.Threading.Timer"; version = "4.3.0"; sha256 = "0aw4phrhwqz9m61r79vyfl5la64bjxj8l34qnrcwb28v49fg2086"; }) (fetchNuGet { pname = "runtime.debian.8-x64.runtime.native.System.Security.Cryptography.OpenSsl"; version = "4.3.0"; sha256 = "16rnxzpk5dpbbl1x354yrlsbvwylrq456xzpsha1n9y3glnhyx9d"; }) + (fetchNuGet { pname = "runtime.debian.8-x64.runtime.native.System.Security.Cryptography.OpenSsl"; version = "4.3.2"; sha256 = "0rwpqngkqiapqc5c2cpkj7idhngrgss5qpnqg0yh40mbyflcxf8i"; }) (fetchNuGet { pname = "runtime.fedora.23-x64.runtime.native.System.Security.Cryptography.OpenSsl"; version = "4.3.0"; sha256 = "0hkg03sgm2wyq8nqk6dbm9jh5vcq57ry42lkqdmfklrw89lsmr59"; }) + (fetchNuGet { pname = "runtime.fedora.23-x64.runtime.native.System.Security.Cryptography.OpenSsl"; version = "4.3.2"; sha256 = "1n06gxwlinhs0w7s8a94r1q3lwqzvynxwd3mp10ws9bg6gck8n4r"; }) (fetchNuGet { pname = "runtime.fedora.24-x64.runtime.native.System.Security.Cryptography.OpenSsl"; version = "4.3.0"; sha256 = "0c2p354hjx58xhhz7wv6div8xpi90sc6ibdm40qin21bvi7ymcaa"; }) + (fetchNuGet { pname = "runtime.fedora.24-x64.runtime.native.System.Security.Cryptography.OpenSsl"; version = "4.3.2"; sha256 = "0404wqrc7f2yc0wxv71y3nnybvqx8v4j9d47hlscxy759a525mc3"; }) (fetchNuGet { pname = "runtime.native.System"; version = "4.0.0"; sha256 = "1ppk69xk59ggacj9n7g6fyxvzmk1g5p4fkijm0d7xqfkig98qrkf"; }) (fetchNuGet { pname = "runtime.native.System"; version = "4.3.0"; sha256 = "15hgf6zaq9b8br2wi1i3x0zvmk410nlmsmva9p0bbg73v6hml5k4"; }) (fetchNuGet { pname = "runtime.native.System.IO.Compression"; version = "4.3.0"; sha256 = "1vvivbqsk6y4hzcid27pqpm5bsi6sc50hvqwbcx8aap5ifrxfs8d"; }) @@ -177,14 +180,22 @@ (fetchNuGet { pname = "runtime.native.System.Net.Security"; version = "4.3.0"; sha256 = "0dnqjhw445ay3chpia9p6vy4w2j6s9vy3hxszqvdanpvvyaxijr3"; }) (fetchNuGet { pname = "runtime.native.System.Security.Cryptography.Apple"; version = "4.3.0"; sha256 = "1b61p6gw1m02cc1ry996fl49liiwky6181dzr873g9ds92zl326q"; }) (fetchNuGet { pname = "runtime.native.System.Security.Cryptography.OpenSsl"; version = "4.3.0"; sha256 = "18pzfdlwsg2nb1jjjjzyb5qlgy6xjxzmhnfaijq5s2jw3cm3ab97"; }) + (fetchNuGet { pname = "runtime.native.System.Security.Cryptography.OpenSsl"; version = "4.3.2"; sha256 = "0zy5r25jppz48i2bkg8b9lfig24xixg6nm3xyr1379zdnqnpm8f6"; }) (fetchNuGet { pname = "runtime.opensuse.13.2-x64.runtime.native.System.Security.Cryptography.OpenSsl"; version = "4.3.0"; sha256 = "0qyynf9nz5i7pc26cwhgi8j62ps27sqmf78ijcfgzab50z9g8ay3"; }) + (fetchNuGet { pname = "runtime.opensuse.13.2-x64.runtime.native.System.Security.Cryptography.OpenSsl"; version = "4.3.2"; sha256 = "096ch4n4s8k82xga80lfmpimpzahd2ip1mgwdqgar0ywbbl6x438"; }) (fetchNuGet { pname = "runtime.opensuse.42.1-x64.runtime.native.System.Security.Cryptography.OpenSsl"; version = "4.3.0"; sha256 = "1klrs545awhayryma6l7g2pvnp9xy4z0r1i40r80zb45q3i9nbyf"; }) + (fetchNuGet { pname = "runtime.opensuse.42.1-x64.runtime.native.System.Security.Cryptography.OpenSsl"; version = "4.3.2"; sha256 = "1dm8fifl7rf1gy7lnwln78ch4rw54g0pl5g1c189vawavll7p6rj"; }) (fetchNuGet { pname = "runtime.osx.10.10-x64.runtime.native.System.Security.Cryptography.Apple"; version = "4.3.0"; sha256 = "10yc8jdrwgcl44b4g93f1ds76b176bajd3zqi2faf5rvh1vy9smi"; }) (fetchNuGet { pname = "runtime.osx.10.10-x64.runtime.native.System.Security.Cryptography.OpenSsl"; version = "4.3.0"; sha256 = "0zcxjv5pckplvkg0r6mw3asggm7aqzbdjimhvsasb0cgm59x09l3"; }) + (fetchNuGet { pname = "runtime.osx.10.10-x64.runtime.native.System.Security.Cryptography.OpenSsl"; version = "4.3.2"; sha256 = "1m9z1k9kzva9n9kwinqxl97x2vgl79qhqjlv17k9s2ymcyv2bwr6"; }) (fetchNuGet { pname = "runtime.rhel.7-x64.runtime.native.System.Security.Cryptography.OpenSsl"; version = "4.3.0"; sha256 = "0vhynn79ih7hw7cwjazn87rm9z9fj0rvxgzlab36jybgcpcgphsn"; }) + (fetchNuGet { pname = "runtime.rhel.7-x64.runtime.native.System.Security.Cryptography.OpenSsl"; version = "4.3.2"; sha256 = "1cpx56mcfxz7cpn57wvj18sjisvzq8b5vd9rw16ihd2i6mcp3wa1"; }) (fetchNuGet { pname = "runtime.ubuntu.14.04-x64.runtime.native.System.Security.Cryptography.OpenSsl"; version = "4.3.0"; sha256 = "160p68l2c7cqmyqjwxydcvgw7lvl1cr0znkw8fp24d1by9mqc8p3"; }) + (fetchNuGet { pname = "runtime.ubuntu.14.04-x64.runtime.native.System.Security.Cryptography.OpenSsl"; version = "4.3.2"; sha256 = "15gsm1a8jdmgmf8j5v1slfz8ks124nfdhk2vxs2rw3asrxalg8hi"; }) (fetchNuGet { pname = "runtime.ubuntu.16.04-x64.runtime.native.System.Security.Cryptography.OpenSsl"; version = "4.3.0"; sha256 = "15zrc8fgd8zx28hdghcj5f5i34wf3l6bq5177075m2bc2j34jrqy"; }) + (fetchNuGet { pname = "runtime.ubuntu.16.04-x64.runtime.native.System.Security.Cryptography.OpenSsl"; version = "4.3.2"; sha256 = "0q0n5q1r1wnqmr5i5idsrd9ywl33k0js4pngkwq9p368mbxp8x1w"; }) (fetchNuGet { pname = "runtime.ubuntu.16.10-x64.runtime.native.System.Security.Cryptography.OpenSsl"; version = "4.3.0"; sha256 = "1p4dgxax6p7rlgj4q73k73rslcnz4wdcv8q2flg1s8ygwcm58ld5"; }) + (fetchNuGet { pname = "runtime.ubuntu.16.10-x64.runtime.native.System.Security.Cryptography.OpenSsl"; version = "4.3.2"; sha256 = "1x0g58pbpjrmj2x2qw17rdwwnrcl0wvim2hdwz48lixvwvp22n9c"; }) (fetchNuGet { pname = "runtime.unix.Microsoft.Win32.Primitives"; version = "4.3.0"; sha256 = "0y61k9zbxhdi0glg154v30kkq7f8646nif8lnnxbvkjpakggd5id"; }) (fetchNuGet { pname = "runtime.unix.System.Console"; version = "4.3.0"; sha256 = "1pfpkvc6x2if8zbdzg9rnc5fx51yllprl8zkm5npni2k50lisy80"; }) (fetchNuGet { pname = "runtime.unix.System.Diagnostics.Debug"; version = "4.3.0"; sha256 = "1lps7fbnw34bnh3lm31gs5c0g0dh7548wfmb8zz62v0zqz71msj5"; }) @@ -198,12 +209,12 @@ (fetchNuGet { pname = "SharpFNT"; version = "2.0.0"; sha256 = "1bgacgh9hbck0qvji6frbb50sdiqfdng2fvvfgfw8b9qaql91mx0"; }) (fetchNuGet { pname = "SharpGen.Runtime"; version = "2.0.0-beta.13"; sha256 = "1250z6sa9ghf84czlkzvaysb29c0n229z1f0vh5qls89akrkl7h8"; }) (fetchNuGet { pname = "SharpGen.Runtime.COM"; version = "2.0.0-beta.13"; sha256 = "1lmv3jp2g7mgy9j23pd3j0wr3p89qiq8v6c6qxqf688izyni1166"; }) - (fetchNuGet { pname = "SixLabors.ImageSharp"; version = "2.1.0"; sha256 = "0lmj3qs39v5jcf2rjwav43nqnc7g6sd4l226l2jw85nidzmpvkwr"; }) - (fetchNuGet { pname = "SQLitePCLRaw.bundle_e_sqlite3"; version = "2.1.7"; sha256 = "1pi9mpzy7wi0rcqpny0gkn7pxykg01b0x2pkv8sxl0ddzl8ywg7s"; }) + (fetchNuGet { pname = "SixLabors.ImageSharp"; version = "3.1.3"; sha256 = "0f36my2lzkgc5fvk6s0lh4gn15vxhbl2zg71rdql7vrzh8b77c6q"; }) + (fetchNuGet { pname = "SQLitePCLRaw.bundle_e_sqlite3"; version = "2.1.8"; sha256 = "0m5jhil1h0z9x9j38x0k4053s065z28bsdgy3fxa85d4b5898shw"; }) (fetchNuGet { pname = "SQLitePCLRaw.core"; version = "2.1.4"; sha256 = "09akxz92qipr1cj8mk2hw99i0b81wwbwx26gpk21471zh543f8ld"; }) - (fetchNuGet { pname = "SQLitePCLRaw.core"; version = "2.1.7"; sha256 = "1y3jl4c76g2i13xss72nfvx5qr6mzsbjvjc5f9arybh53a0wavd6"; }) - (fetchNuGet { pname = "SQLitePCLRaw.lib.e_sqlite3"; version = "2.1.7"; sha256 = "1kbwf3fn8kcf1q3gm87m359yxmb6kcnclk2y469008yijvijwa26"; }) - (fetchNuGet { pname = "SQLitePCLRaw.provider.e_sqlite3"; version = "2.1.7"; sha256 = "0kcbn0s7n3ck1s1x30zf9y7x8n6c09qgj7n20h4zj2hyxcp3ag9b"; }) + (fetchNuGet { pname = "SQLitePCLRaw.core"; version = "2.1.8"; sha256 = "1j67fs6qznkcsfnf2z2571vks1c0bhg4nzcbh8i286rz77hk9gcg"; }) + (fetchNuGet { pname = "SQLitePCLRaw.lib.e_sqlite3"; version = "2.1.8"; sha256 = "1v193rgm734kymaia5ws4zkq2a9qri7sd2vhqxv0xlysbpsahs1s"; }) + (fetchNuGet { pname = "SQLitePCLRaw.provider.e_sqlite3"; version = "2.1.8"; sha256 = "12x7z1i13571fbiddvp8bzhyxvvvwwd2wwd7c8kd11hpkfza0kbq"; }) (fetchNuGet { pname = "StbiSharp"; version = "1.1.0"; sha256 = "0wbw20m7nyhxj32k153l668sxigamlwig0qpz8l8d0jqz35vizm0"; }) (fetchNuGet { pname = "System.AppContext"; version = "4.1.0"; sha256 = "0fv3cma1jp4vgj7a8hqc9n7hr1f1kjp541s6z0q1r6nazb4iz9mz"; }) (fetchNuGet { pname = "System.AppContext"; version = "4.3.0"; sha256 = "1649qvy3dar900z3g817h17nl8jp4ka5vcfmsr05kh0fshn7j3ya"; }) @@ -247,7 +258,7 @@ (fetchNuGet { pname = "System.Net.Http"; version = "4.3.0"; sha256 = "1i4gc757xqrzflbk7kc5ksn20kwwfjhw9w7pgdkn19y3cgnl302j"; }) (fetchNuGet { pname = "System.Net.NameResolution"; version = "4.3.0"; sha256 = "15r75pwc0rm3vvwsn8rvm2krf929mjfwliv0mpicjnii24470rkq"; }) (fetchNuGet { pname = "System.Net.Primitives"; version = "4.3.0"; sha256 = "0c87k50rmdgmxx7df2khd9qj7q35j9rzdmm2572cc55dygmdk3ii"; }) - (fetchNuGet { pname = "System.Net.Security"; version = "4.3.0"; sha256 = "1aa5igz31ivk6kpgsrwck3jccab7wd88wr52lddmgypmbh9mmf87"; }) + (fetchNuGet { pname = "System.Net.Security"; version = "4.3.2"; sha256 = "1aw1ca1vssqrillrh4qkarx0lxwc8wcaqdkfdima8376wb98j2q8"; }) (fetchNuGet { pname = "System.Net.Sockets"; version = "4.3.0"; sha256 = "1ssa65k6chcgi6mfmzrznvqaxk8jp0gvl77xhf1hbzakjnpxspla"; }) (fetchNuGet { pname = "System.Net.WebHeaderCollection"; version = "4.3.0"; sha256 = "0ms3ddjv1wn8sqa5qchm245f3vzzif6l6fx5k92klqpn7zf4z562"; }) (fetchNuGet { pname = "System.Net.WebSockets"; version = "4.3.0"; sha256 = "1gfj800078kggcgl0xyl00a6y5k4wwh2k2qm69rjy22wbmq7fy4p"; }) @@ -276,7 +287,6 @@ (fetchNuGet { pname = "System.Runtime"; version = "4.1.0"; sha256 = "02hdkgk13rvsd6r9yafbwzss8kr55wnj8d5c7xjnp8gqrwc8sn0m"; }) (fetchNuGet { pname = "System.Runtime"; version = "4.3.0"; sha256 = "066ixvgbf2c929kgknshcxqj6539ax7b9m570cp8n179cpfkapz7"; }) (fetchNuGet { pname = "System.Runtime.CompilerServices.Unsafe"; version = "4.7.1"; sha256 = "119br3pd85lq8zcgh4f60jzmv1g976q1kdgi3hvqdlhfbw6siz2j"; }) - (fetchNuGet { pname = "System.Runtime.CompilerServices.Unsafe"; version = "5.0.0"; sha256 = "02k25ivn50dmqx5jn8hawwmz24yf0454fjd823qk6lygj9513q4x"; }) (fetchNuGet { pname = "System.Runtime.CompilerServices.Unsafe"; version = "6.0.0"; sha256 = "0qm741kh4rh57wky16sq4m0v05fxmkjjr87krycf5vp9f0zbahbc"; }) (fetchNuGet { pname = "System.Runtime.CompilerServices.Unsafe"; version = "6.0.0-rc.1.21451.13"; sha256 = "0v5bc80p35jj5b5xdgsn5r1v4w68gqz0sahi214rprrrlr3sl206"; }) (fetchNuGet { pname = "System.Runtime.Extensions"; version = "4.1.0"; sha256 = "0rw4rm4vsm3h3szxp9iijc3ksyviwsv6f63dng3vhqyg4vjdkc2z"; }) @@ -305,7 +315,6 @@ (fetchNuGet { pname = "System.Security.Principal.Windows"; version = "5.0.0"; sha256 = "1mpk7xj76lxgz97a5yg93wi8lj0l8p157a5d50mmjy3gbz1904q8"; }) (fetchNuGet { pname = "System.Text.Encoding"; version = "4.0.11"; sha256 = "1dyqv0hijg265dwxg6l7aiv74102d6xjiwplh2ar1ly6xfaa4iiw"; }) (fetchNuGet { pname = "System.Text.Encoding"; version = "4.3.0"; sha256 = "1f04lkir4iladpp51sdgmis9dj4y8v08cka0mbmsy0frc9a4gjqr"; }) - (fetchNuGet { pname = "System.Text.Encoding.CodePages"; version = "5.0.0"; sha256 = "1bn2pzaaq4wx9ixirr8151vm5hynn3lmrljcgjx9yghmm4k677k0"; }) (fetchNuGet { pname = "System.Text.Encoding.Extensions"; version = "4.3.0"; sha256 = "11q1y8hh5hrp5a3kw25cb6l00v5l5dvirkz8jr3sq00h1xgcgrxy"; }) (fetchNuGet { pname = "System.Text.RegularExpressions"; version = "4.3.0"; sha256 = "1bgq51k7fwld0njylfn7qc5fmwrk2137gdq7djqdsw347paa9c2l"; }) (fetchNuGet { pname = "System.Threading"; version = "4.0.11"; sha256 = "19x946h926bzvbsgj28csn46gak2crv2skpwsx80hbgazmkgb1ls"; }) From d5cff868bd37bf549a8c94b1bc8089d609e635df Mon Sep 17 00:00:00 2001 From: VsQ90 Date: Mon, 11 Mar 2024 15:35:36 +0200 Subject: [PATCH 228/230] libreoffice: add finnish language --- pkgs/applications/office/libreoffice/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/applications/office/libreoffice/default.nix b/pkgs/applications/office/libreoffice/default.nix index e7fa0c53f730..46677de9bbc1 100644 --- a/pkgs/applications/office/libreoffice/default.nix +++ b/pkgs/applications/office/libreoffice/default.nix @@ -98,7 +98,7 @@ , gpgme , libwebp , abseil-cpp -, langs ? [ "ar" "ca" "cs" "da" "de" "en-GB" "en-US" "eo" "es" "fr" "hu" "it" "ja" "nl" "pl" "pt" "pt-BR" "ro" "ru" "sl" "tr" "uk" "zh-CN" ] +, langs ? [ "ar" "ca" "cs" "da" "de" "en-GB" "en-US" "eo" "es" "fi" "fr" "hu" "it" "ja" "nl" "pl" "pt" "pt-BR" "ro" "ru" "sl" "tr" "uk" "zh-CN" ] , withHelp ? true , kdeIntegration ? false , wrapQtAppsHook ? null From cadfa9d94165984900ce5682c3e365e5a9925bf7 Mon Sep 17 00:00:00 2001 From: Jonathan Davies Date: Mon, 11 Mar 2024 19:43:38 +0000 Subject: [PATCH 229/230] =?UTF-8?q?vector:=200.36.0=20=E2=86=92=200.36.1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pkgs/tools/misc/vector/Cargo.lock | 24 ++++++++++++++++-------- pkgs/tools/misc/vector/default.nix | 4 ++-- 2 files changed, 18 insertions(+), 10 deletions(-) diff --git a/pkgs/tools/misc/vector/Cargo.lock b/pkgs/tools/misc/vector/Cargo.lock index 41193aa9a014..6bc92235ea6c 100644 --- a/pkgs/tools/misc/vector/Cargo.lock +++ b/pkgs/tools/misc/vector/Cargo.lock @@ -4925,9 +4925,9 @@ dependencies = [ [[package]] name = "lockfree-object-pool" -version = "0.1.4" +version = "0.1.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ee33defb27b106378a6efcfcde4dda6226dfdac8ba7a2904f5bc93363cb88557" +checksum = "3a69c0481fc2424cb55795de7da41add33372ea75a94f9b6588ab6a2826dfebc" [[package]] name = "log" @@ -5234,9 +5234,9 @@ dependencies = [ [[package]] name = "mio" -version = "0.8.9" +version = "0.8.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3dce281c5e46beae905d4de1870d8b1509a9142b62eedf18b443b011ca8343d0" +checksum = "a4a650543ca06a924e8b371db273b2756685faae30f8487da1b56505a8f78b0c" dependencies = [ "libc", "log", @@ -9816,7 +9816,7 @@ checksum = "f1bddf1187be692e79c5ffeab891132dfb0f236ed36a43c7ed39f1165ee20191" [[package]] name = "vector" -version = "0.36.0" +version = "0.36.1" dependencies = [ "apache-avro", "approx", @@ -9839,6 +9839,7 @@ dependencies = [ "aws-sdk-s3", "aws-sdk-sns", "aws-sdk-sqs", + "aws-sdk-sts", "aws-sigv4", "aws-smithy-async", "aws-smithy-http", @@ -10538,6 +10539,12 @@ version = "0.11.0+wasi-snapshot-preview1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "9c8d87e72b64a3b4db28d11ce29237c246188f4f51057d65a7eab63b7987e423" +[[package]] +name = "wasite" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b8dad83b4f25e74f184f64c43b150b91efe7647395b42289f38e50566d82855b" + [[package]] name = "wasm-bindgen" version = "0.2.91" @@ -10677,11 +10684,12 @@ dependencies = [ [[package]] name = "whoami" -version = "1.4.1" +version = "1.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "22fc3756b8a9133049b26c7f61ab35416c130e8c09b660f5b3958b446f52cc50" +checksum = "0fec781d48b41f8163426ed18e8fc2864c12937df9ce54c88ede7bd47270893e" dependencies = [ - "wasm-bindgen", + "redox_syscall 0.4.1", + "wasite", "web-sys", ] diff --git a/pkgs/tools/misc/vector/default.nix b/pkgs/tools/misc/vector/default.nix index 0540bcac517b..2a0b8dbba75f 100644 --- a/pkgs/tools/misc/vector/default.nix +++ b/pkgs/tools/misc/vector/default.nix @@ -36,7 +36,7 @@ let pname = "vector"; - version = "0.36.0"; + version = "0.36.1"; in rustPlatform.buildRustPackage { inherit pname version; @@ -45,7 +45,7 @@ rustPlatform.buildRustPackage { owner = "vectordotdev"; repo = pname; rev = "v${version}"; - hash = "sha256-fbBKmhouY021osFVqNhEC+16cO7z3bS+DBhg1ByDeWw="; + hash = "sha256-iY0Bi1FG3kEiZtPTXonoVGYiquZkTPF51PWEZEoxQSw="; }; cargoLock = { From 9d59b64009aa1b5424deffe7079035eb84c6b17e Mon Sep 17 00:00:00 2001 From: Robert Scott Date: Sun, 10 Mar 2024 20:37:58 +0000 Subject: [PATCH 230/230] frr: add patch for CVE-2024-27913 --- pkgs/servers/frr/default.nix | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/pkgs/servers/frr/default.nix b/pkgs/servers/frr/default.nix index 0ca256f1cbdd..d588fee00483 100644 --- a/pkgs/servers/frr/default.nix +++ b/pkgs/servers/frr/default.nix @@ -1,6 +1,7 @@ { lib , stdenv , fetchFromGitHub +, fetchpatch # build time , autoreconfHook @@ -94,6 +95,15 @@ stdenv.mkDerivation rec { hash = "sha256-oDPr51vI+tlT1IiUPufmZh/UE0TNKWrn4RqpnGoGxNo="; }; + patches = [ + # fixes crash in OSPF TE parsing + (fetchpatch { + name = "CVE-2024-27913.patch"; + url = "https://github.com/FRRouting/frr/commit/541503eecd302d2cc8456167d130014cd2cf1134.patch"; + hash = "sha256-7NxPlQK/6lbLs/NqNi4OZ2uBWfXw99SiXDR6okNvJlg="; + }) + ]; + nativeBuildInputs = [ autoreconfHook bison