From 456de86f8f104a8af825888de54d9563c0d6ada1 Mon Sep 17 00:00:00 2001 From: mksafavi Date: Thu, 13 Jun 2024 15:08:51 +0330 Subject: [PATCH 01/31] livi: 0.1.0 -> 0.2.0 --- pkgs/by-name/li/livi/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/li/livi/package.nix b/pkgs/by-name/li/livi/package.nix index b36f08497a61..d4a440d42c1f 100644 --- a/pkgs/by-name/li/livi/package.nix +++ b/pkgs/by-name/li/livi/package.nix @@ -15,14 +15,14 @@ stdenv.mkDerivation rec { pname = "livi"; - version = "0.1.0"; + version = "0.2.0"; src = fetchFromGitLab { owner = "guidog"; repo = "livi"; domain = "gitlab.gnome.org"; rev = "v${version}"; - sha256 = "sha256-FJ43BDRsZUFuRrNFWuEJ/nSO+suWad2QvqhwzuXWBtY="; + hash = "sha256-4CWH8TWxuDGYlOilxyCa/HL/vtO6A9u/x39s1OLDODo"; }; nativeBuildInputs = [ meson From 2d91945388d57a9b61724a725b651764ed1fbfd5 Mon Sep 17 00:00:00 2001 From: aleksana Date: Tue, 18 Jun 2024 18:13:47 +0800 Subject: [PATCH 02/31] elastic: 0.1.4 -> 0.1.5 --- pkgs/applications/misc/elastic/default.nix | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/pkgs/applications/misc/elastic/default.nix b/pkgs/applications/misc/elastic/default.nix index ae614d35a4e0..d9d7681b36c8 100644 --- a/pkgs/applications/misc/elastic/default.nix +++ b/pkgs/applications/misc/elastic/default.nix @@ -11,21 +11,20 @@ , gtksourceview5 , blueprint-compiler , wrapGAppsHook4 -, appstream-glib , desktop-file-utils , template-glib }: stdenv.mkDerivation rec { pname = "elastic"; - version = "0.1.4"; + version = "0.1.5"; src = fetchFromGitLab { domain = "gitlab.gnome.org"; owner = "World"; repo = "elastic"; rev = version; - hash = "sha256-EExVhf71SEWVcAOAt+IuQH3umNOY4hzzkFVIqnESppo="; + hash = "sha256-y/XBXN5RIqnFmxnmkThBGW0B5owgy/1Q/6jmkBCi+rk="; }; nativeBuildInputs = [ @@ -34,7 +33,6 @@ stdenv.mkDerivation rec { vala pkg-config wrapGAppsHook4 - appstream-glib desktop-file-utils blueprint-compiler ]; From 70ff2154497cc235594f01d2531a3647311a6e43 Mon Sep 17 00:00:00 2001 From: Philip Taron Date: Tue, 18 Jun 2024 10:00:30 -0700 Subject: [PATCH 03/31] nixos/nvidia: move the TOPOLOGY_FILE_PATH and DATABASE_PATH keys from hardware.nvidia.datacenter.settings default into the service file --- nixos/modules/hardware/video/nvidia.nix | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/nixos/modules/hardware/video/nvidia.nix b/nixos/modules/hardware/video/nvidia.nix index ae5c2aa7a034..bb32f55313af 100644 --- a/nixos/modules/hardware/video/nvidia.nix +++ b/nixos/modules/hardware/video/nvidia.nix @@ -46,8 +46,6 @@ in TRUNK_LINK_FAILURE_MODE = 0; NVSWITCH_FAILURE_MODE = 0; ABORT_CUDA_JOBS_ON_FM_EXIT = 1; - TOPOLOGY_FILE_PATH = "${nvidia_x11.fabricmanager}/share/nvidia-fabricmanager/nvidia/nvswitch"; - DATABASE_PATH = "${nvidia_x11.fabricmanager}/share/nvidia-fabricmanager/nvidia/nvswitch"; }; defaultText = lib.literalExpression '' { @@ -69,8 +67,6 @@ in TRUNK_LINK_FAILURE_MODE=0; NVSWITCH_FAILURE_MODE=0; ABORT_CUDA_JOBS_ON_FM_EXIT=1; - TOPOLOGY_FILE_PATH="''${nvidia_x11.fabricmanager}/share/nvidia-fabricmanager/nvidia/nvswitch"; - DATABASE_PATH="''${nvidia_x11.fabricmanager}/share/nvidia-fabricmanager/nvidia/nvswitch"; } ''; description = '' @@ -628,7 +624,14 @@ in TimeoutStartSec = 240; ExecStart = let - nv-fab-conf = settingsFormat.generate "fabricmanager.conf" cfg.datacenter.settings; + # Since these rely on the `nvidia_x11.fabricmanager` derivation, they're + # unsuitable to be mentioned in the configuration defaults, but they _can_ + # be overridden in `cfg.datacenter.settings` if needed. + fabricManagerConfDefaults = { + TOPOLOGY_FILE_PATH = "${nvidia_x11.fabricmanager}/share/nvidia-fabricmanager/nvidia/nvswitch"; + DATABASE_PATH = "${nvidia_x11.fabricmanager}/share/nvidia-fabricmanager/nvidia/nvswitch"; + }; + nv-fab-conf = settingsFormat.generate "fabricmanager.conf" (fabricManagerConfDefaults // cfg.datacenter.settings); in "${lib.getExe nvidia_x11.fabricmanager} -c ${nv-fab-conf}"; LimitCORE = "infinity"; From 8696c6243a2274a67b8d9db8b7bcf134d035c523 Mon Sep 17 00:00:00 2001 From: Dee Anzorge Date: Thu, 20 Jun 2024 22:51:33 +0200 Subject: [PATCH 04/31] streamlink: 6.7.4 -> 6.8.1 changes: * https://github.com/streamlink/streamlink/releases/tag/6.8.0 * https://github.com/streamlink/streamlink/releases/tag/6.8.1 Also drop the exceptiongroup dependency, as it is not needed for Python>=3.11. --- pkgs/applications/video/streamlink/default.nix | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/video/streamlink/default.nix b/pkgs/applications/video/streamlink/default.nix index e5f0cac20b52..65b8406e8ee3 100644 --- a/pkgs/applications/video/streamlink/default.nix +++ b/pkgs/applications/video/streamlink/default.nix @@ -7,12 +7,12 @@ python3Packages.buildPythonApplication rec { pname = "streamlink"; - version = "6.7.4"; + version = "6.8.1"; pyproject = true; src = fetchPypi { inherit pname version; - hash = "sha256-kzdTerEZ/ndSSl1mWq7Ou/sG4suN8o0SYNkodkJXUc4="; + hash = "sha256-TEN++sKCtN8CZRnyBp4niRFlb+LPSNcyMCu9Rm+GOZ0="; }; patches = [ @@ -42,7 +42,6 @@ python3Packages.buildPythonApplication rec { propagatedBuildInputs = with python3Packages; [ certifi - exceptiongroup isodate lxml pycountry From 6592f3126d8f61d0ad2c5f45b7933a50605f8d22 Mon Sep 17 00:00:00 2001 From: "Ross A. Baker" Date: Sat, 22 Jun 2024 23:50:20 -0400 Subject: [PATCH 05/31] hyperlink: 0.1.31 -> 0.1.32 --- pkgs/by-name/hy/hyperlink/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/hy/hyperlink/package.nix b/pkgs/by-name/hy/hyperlink/package.nix index 2d2ac51f30fe..4bf253c030f7 100644 --- a/pkgs/by-name/hy/hyperlink/package.nix +++ b/pkgs/by-name/hy/hyperlink/package.nix @@ -5,16 +5,16 @@ rustPlatform.buildRustPackage rec { pname = "hyperlink"; - version = "0.1.31"; + version = "0.1.32"; src = fetchFromGitHub { owner = "untitaker"; repo = "hyperlink"; rev = version; - hash = "sha256-ZmNw4NmDD0VWwnmNjxsA4y5gzVbTzshZLRYzaNJ4iGw="; + hash = "sha256-QejpyleugPWvr4p8JOMieswVtfQMGxtH+fb46mRLlH4="; }; - cargoHash = "sha256-5j1Ziwk5uQNIKCRMZpJP4qR0tcyUUvT8i/KZbXq3WzI="; + cargoHash = "sha256-d0JwxxI6Quyan2lgymxGpROKR757LEOUIgJcs5c9Kmc="; meta = with lib; { description = "Very fast link checker for CI"; From 8c33dddc3f7ce64488411bf6ea390124abe3065a Mon Sep 17 00:00:00 2001 From: seth Date: Sat, 8 Jun 2024 16:54:32 -0400 Subject: [PATCH 06/31] cartridges: migrate to by-name --- .../default.nix => by-name/ca/cartridges/package.nix} | 0 pkgs/top-level/all-packages.nix | 2 -- 2 files changed, 2 deletions(-) rename pkgs/{applications/misc/cartridges/default.nix => by-name/ca/cartridges/package.nix} (100%) diff --git a/pkgs/applications/misc/cartridges/default.nix b/pkgs/by-name/ca/cartridges/package.nix similarity index 100% rename from pkgs/applications/misc/cartridges/default.nix rename to pkgs/by-name/ca/cartridges/package.nix diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 169d36662ccc..da6b04e5123c 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -411,8 +411,6 @@ with pkgs; caroline = callPackage ../development/libraries/caroline { }; - cartridges = callPackage ../applications/misc/cartridges { }; - castget = callPackage ../applications/networking/feedreaders/castget { }; catatonit = callPackage ../applications/virtualization/catatonit { }; From a57781b65a3ef9f82d512d82bc8605cebb7125d1 Mon Sep 17 00:00:00 2001 From: seth Date: Sat, 8 Jun 2024 16:55:11 -0400 Subject: [PATCH 07/31] cartridges: format with nixfmt --- pkgs/by-name/ca/cartridges/package.nix | 25 +++++++++++++------------ 1 file changed, 13 insertions(+), 12 deletions(-) diff --git a/pkgs/by-name/ca/cartridges/package.nix b/pkgs/by-name/ca/cartridges/package.nix index 3674d61fafca..e1ad5fc1de7a 100644 --- a/pkgs/by-name/ca/cartridges/package.nix +++ b/pkgs/by-name/ca/cartridges/package.nix @@ -1,15 +1,16 @@ -{ blueprint-compiler -, desktop-file-utils -, fetchFromGitHub -, gobject-introspection -, lib -, libadwaita -, meson -, ninja -, python3Packages -, stdenv -, wrapGAppsHook4 -, nix-update-script +{ + blueprint-compiler, + desktop-file-utils, + fetchFromGitHub, + gobject-introspection, + lib, + libadwaita, + meson, + ninja, + python3Packages, + stdenv, + wrapGAppsHook4, + nix-update-script, }: stdenv.mkDerivation (finalAttrs: { pname = "cartridges"; From 7401dfca27e7592c45bc449044324650d800e3a8 Mon Sep 17 00:00:00 2001 From: seth Date: Sat, 8 Jun 2024 17:07:45 -0400 Subject: [PATCH 08/31] cartridges: `mkDerivation` -> `buildPythonApplication` as we're already pulling in python's hooks, it makes sense to use the full builder as opposed to emulating its behavior --- pkgs/by-name/ca/cartridges/package.nix | 58 ++++++++++---------------- 1 file changed, 23 insertions(+), 35 deletions(-) diff --git a/pkgs/by-name/ca/cartridges/package.nix b/pkgs/by-name/ca/cartridges/package.nix index e1ad5fc1de7a..224e13a8744b 100644 --- a/pkgs/by-name/ca/cartridges/package.nix +++ b/pkgs/by-name/ca/cartridges/package.nix @@ -1,67 +1,53 @@ { + lib, + fetchFromGitHub, + python3Packages, blueprint-compiler, desktop-file-utils, - fetchFromGitHub, gobject-introspection, - lib, libadwaita, meson, ninja, - python3Packages, - stdenv, wrapGAppsHook4, - nix-update-script, }: -stdenv.mkDerivation (finalAttrs: { +python3Packages.buildPythonApplication rec { pname = "cartridges"; version = "2.8.5"; + pyproject = false; src = fetchFromGitHub { owner = "kra-mo"; repo = "cartridges"; - rev = "v${finalAttrs.version}"; + rev = "v${version}"; hash = "sha256-7T+q3T8z8SCpAn3ayodZeETOsTwL+hhVWzY2JyBEoi4="; }; - pythonPath = with python3Packages; [ - pillow - pygobject3 - pyyaml - requests - ]; - # TODO: remove this when #286814 hits master mesonFlags = [ "-Dtiff_compression=jpeg" ]; - buildInputs = [ - libadwaita - (python3Packages.python.withPackages (_: finalAttrs.pythonPath)) - ]; - nativeBuildInputs = [ blueprint-compiler desktop-file-utils gobject-introspection meson ninja - python3Packages.wrapPython wrapGAppsHook4 ]; + buildInputs = [ libadwaita ]; + + dependencies = with python3Packages; [ + pillow + pygobject3 + pyyaml + requests + ]; + dontWrapGApps = true; + makeWrapperArgs = [ ''''${gappsWrapperArgs[@]}'' ]; - postFixup = '' - makeWrapperArgs+=("''${gappsWrapperArgs[@]}") - wrapPythonPrograms "$out/bin" "$out" "$pythonPath" - ''; - - passthru = { - updateScript = nix-update-script { }; - }; - - meta = with lib; { + meta = { description = "GTK4 + Libadwaita game launcher"; - mainProgram = "cartridges"; longDescription = '' A simple game launcher for all of your games. It has support for importing games from Steam, Lutris, Heroic @@ -69,8 +55,10 @@ stdenv.mkDerivation (finalAttrs: { You can sort and hide games or download cover art from SteamGridDB. ''; homepage = "https://apps.gnome.org/Cartridges/"; - license = licenses.gpl3Plus; - maintainers = [ maintainers.getchoo ]; - platforms = platforms.linux; + changelog = "https://github.com/kra-mo/cartridges/releases/tag/${src.rev}"; + license = lib.licenses.gpl3Plus; + maintainers = with lib.maintainers; [ getchoo ]; + mainProgram = "cartridges"; + platforms = lib.platforms.linux; }; -}) +} From 2458b6ac7dca849199fe1c682486c352ff46462f Mon Sep 17 00:00:00 2001 From: seth Date: Sat, 8 Jun 2024 17:25:33 -0400 Subject: [PATCH 09/31] cartridges: add missing build deps --- pkgs/by-name/ca/cartridges/package.nix | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/pkgs/by-name/ca/cartridges/package.nix b/pkgs/by-name/ca/cartridges/package.nix index 224e13a8744b..31ddaf419bfc 100644 --- a/pkgs/by-name/ca/cartridges/package.nix +++ b/pkgs/by-name/ca/cartridges/package.nix @@ -2,12 +2,14 @@ lib, fetchFromGitHub, python3Packages, + appstream, blueprint-compiler, desktop-file-utils, gobject-introspection, libadwaita, meson, ninja, + pkg-config, wrapGAppsHook4, }: python3Packages.buildPythonApplication rec { @@ -26,11 +28,13 @@ python3Packages.buildPythonApplication rec { mesonFlags = [ "-Dtiff_compression=jpeg" ]; nativeBuildInputs = [ + appstream blueprint-compiler desktop-file-utils gobject-introspection meson ninja + pkg-config wrapGAppsHook4 ]; From 261bd913b0c8e0aa565323e1d47660149aee39f6 Mon Sep 17 00:00:00 2001 From: seth Date: Sat, 8 Jun 2024 17:26:46 -0400 Subject: [PATCH 10/31] cartridges: ensure tls support --- pkgs/by-name/ca/cartridges/package.nix | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/pkgs/by-name/ca/cartridges/package.nix b/pkgs/by-name/ca/cartridges/package.nix index 31ddaf419bfc..eeb20dbfda77 100644 --- a/pkgs/by-name/ca/cartridges/package.nix +++ b/pkgs/by-name/ca/cartridges/package.nix @@ -6,6 +6,7 @@ blueprint-compiler, desktop-file-utils, gobject-introspection, + glib-networking, libadwaita, meson, ninja, @@ -38,7 +39,10 @@ python3Packages.buildPythonApplication rec { wrapGAppsHook4 ]; - buildInputs = [ libadwaita ]; + buildInputs = [ + glib-networking + libadwaita + ]; dependencies = with python3Packages; [ pillow From bac1a063254c546c7f8d8efc18180d9a947a4212 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?W=C3=B6lfchen?= <115360611+W-lfchen@users.noreply.github.com> Date: Tue, 25 Jun 2024 20:31:25 +0200 Subject: [PATCH 11/31] obsidian: 1.6.3 -> 1.6.5 --- pkgs/applications/misc/obsidian/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/misc/obsidian/default.nix b/pkgs/applications/misc/obsidian/default.nix index 000d94bbeec3..9ca05a653a35 100644 --- a/pkgs/applications/misc/obsidian/default.nix +++ b/pkgs/applications/misc/obsidian/default.nix @@ -13,7 +13,7 @@ let inherit (stdenv.hostPlatform) system; pname = "obsidian"; - version = "1.6.3"; + version = "1.6.5"; appname = "Obsidian"; meta = with lib; { description = "Powerful knowledge base that works on top of a local folder of plain text Markdown files"; @@ -23,10 +23,10 @@ let maintainers = with maintainers; [ atila conradmearns zaninime qbit kashw2 w-lfchen ]; }; - filename = if stdenv.isDarwin then "Obsidian-${version}-universal.dmg" else "obsidian-${version}.tar.gz"; + filename = if stdenv.isDarwin then "Obsidian-${version}.dmg" else "obsidian-${version}.tar.gz"; src = fetchurl { url = "https://github.com/obsidianmd/obsidian-releases/releases/download/v${version}/${filename}"; - hash = if stdenv.isDarwin then "sha256-o5ELpG82mJgcd9Pil6A99BPK6Hoa0OKJJkYpyfGJR9I=" else "sha256-ho8E2Iq+s/w8NjmxzZo/y5aj3MNgbyvIGjk3nSKPLDw="; + hash = if stdenv.isDarwin then "sha256-gA6FkCalGw0pgnCbOJliItLzMGr+CG9r6mSMdvVUAoQ=" else "sha256-9goJnKOgJk5TrFUNz4vff8704cvHfqZpGL/iBkcU2GY="; }; icon = fetchurl { From 39fd56c3ce48083643b44cf489482242cdbc7dec Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 26 Jun 2024 09:47:57 +0000 Subject: [PATCH 12/31] limine: 7.7.2 -> 7.8.0 --- pkgs/by-name/li/limine/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/li/limine/package.nix b/pkgs/by-name/li/limine/package.nix index f313ab80863f..4402cad9816a 100644 --- a/pkgs/by-name/li/limine/package.nix +++ b/pkgs/by-name/li/limine/package.nix @@ -12,7 +12,7 @@ }: let - version = "7.7.2"; + version = "7.8.0"; in # The output of the derivation is a tool to create bootable images using Limine # as bootloader for various platforms and corresponding binary and helper files. @@ -24,7 +24,7 @@ stdenv.mkDerivation { # Packaging that in Nix is very cumbersome. src = fetchurl { url = "https://github.com/limine-bootloader/limine/releases/download/v${version}/limine-${version}.tar.gz"; - sha256 = "sha256-t3ymsKn+pFW2xOn+BKJriqx2cMbCjtnGGgvCF82/8TE="; + sha256 = "sha256-Fue2KPyJ76Q1f+chvhwmJlmQ4QwXksyCeztd2d2cTH0="; }; nativeBuildInputs = [ From ef3b725431fd14539f3095ceac7925b50dd150ef Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 27 Jun 2024 04:32:20 +0000 Subject: [PATCH 13/31] flyctl: 0.2.72 -> 0.2.75 --- pkgs/development/web/flyctl/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/web/flyctl/default.nix b/pkgs/development/web/flyctl/default.nix index e04421421180..47743d296e59 100644 --- a/pkgs/development/web/flyctl/default.nix +++ b/pkgs/development/web/flyctl/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "flyctl"; - version = "0.2.72"; + version = "0.2.75"; src = fetchFromGitHub { owner = "superfly"; repo = "flyctl"; rev = "v${version}"; - hash = "sha256-v2+xDeErVkgiGavPpBtKg7+BBhiKZdmbo2NIFL7iXvw="; + hash = "sha256-7qJDlMy2LmrUMxeacH6n/JP8Zg4ln12iC1BGysejMws="; }; - vendorHash = "sha256-iRZrjkWQxuUW/YM5TygFt+g8suM5iLGsWsCt4QQOX3M="; + vendorHash = "sha256-RSLwEOtZsYfTgBdkZIxccxehz8lbozWJV5UdKiMeoLU="; subPackages = [ "." ]; From 541a298cd8e50687b3e4a6e7698fbab413923f65 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Thu, 27 Jun 2024 02:13:55 -0700 Subject: [PATCH 14/31] sc-im: fix build on Darwin --- pkgs/applications/misc/sc-im/default.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/applications/misc/sc-im/default.nix b/pkgs/applications/misc/sc-im/default.nix index 2ec7f35a219b..d4509411dcfe 100644 --- a/pkgs/applications/misc/sc-im/default.nix +++ b/pkgs/applications/misc/sc-im/default.nix @@ -46,6 +46,8 @@ stdenv.mkDerivation rec { makeFlags = [ "prefix=${placeholder "out"}" ]; + env.NIX_CFLAGS_COMPILE = lib.optionalString stdenv.cc.isClang "-Wno-error=implicit-function-declaration"; + postInstall = '' wrapProgram "$out/bin/sc-im" --prefix PATH : "${lib.makeBinPath [ gnuplot ]}" ''; From bbdfbf0b86c41ab0935024dcbe737fb7e0f8f212 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 27 Jun 2024 11:22:57 +0000 Subject: [PATCH 15/31] trufflehog: 3.78.2 -> 3.79.0 --- pkgs/tools/security/trufflehog/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/security/trufflehog/default.nix b/pkgs/tools/security/trufflehog/default.nix index 4bbd65c09b65..6d012096b461 100644 --- a/pkgs/tools/security/trufflehog/default.nix +++ b/pkgs/tools/security/trufflehog/default.nix @@ -8,16 +8,16 @@ buildGoModule rec { pname = "trufflehog"; - version = "3.78.2"; + version = "3.79.0"; src = fetchFromGitHub { owner = "trufflesecurity"; repo = "trufflehog"; rev = "refs/tags/v${version}"; - hash = "sha256-s+8l203ntPsp54yZpEX2wz8Dt/p3rokfu6KI8LSwpko="; + hash = "sha256-YgalvCAhtL0y2bVqeI0w/n5eVMIW2QPPbm9zpBzzuAM="; }; - vendorHash = "sha256-0YNvqJlSF6TIGSbQrAu47G2oXPY9+2wiZbDP94oAaVA="; + vendorHash = "sha256-fBcBY6P2V2ZkBDqCLk5AMBtGF1vTZzZ8ohxc1BPTSVQ="; proxyVendor = true; From 68dd5e6f5ec826547dfe4c2e8e3266b76332891f Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 27 Jun 2024 11:53:02 +0000 Subject: [PATCH 16/31] stripe-cli: 1.19.5 -> 1.21.0 --- pkgs/tools/admin/stripe-cli/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/admin/stripe-cli/default.nix b/pkgs/tools/admin/stripe-cli/default.nix index e03024c4a574..acbc464663dd 100644 --- a/pkgs/tools/admin/stripe-cli/default.nix +++ b/pkgs/tools/admin/stripe-cli/default.nix @@ -2,15 +2,15 @@ buildGoModule rec { pname = "stripe-cli"; - version = "1.19.5"; + version = "1.21.0"; src = fetchFromGitHub { owner = "stripe"; repo = pname; rev = "v${version}"; - hash = "sha256-gunLbZOT0cnWGxc6714XcPdHJVK4LbDBwC2zt03WrUM="; + hash = "sha256-8r+Gu36zAmNTZb6xA5iS0+smkmJ7UrdGi9TaUXUr5aQ="; }; - vendorHash = "sha256-xFWU+OazwLTb5qdFeYth1MlPJ76nEK4qSCNGVhC/PxE="; + vendorHash = "sha256-TuxYJ3u4/5PJYRoRgom+M1au9XerZ+vj9X3jUWTPM58="; nativeBuildInputs = [ installShellFiles ]; From dfe067d1d81f60e3f602dd76710c1a70c41803e6 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 27 Jun 2024 12:19:06 +0000 Subject: [PATCH 17/31] asnmap: 1.1.0 -> 1.1.1 --- pkgs/tools/security/asnmap/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/security/asnmap/default.nix b/pkgs/tools/security/asnmap/default.nix index 1c2c52fd0098..84a0cf709b2a 100644 --- a/pkgs/tools/security/asnmap/default.nix +++ b/pkgs/tools/security/asnmap/default.nix @@ -5,16 +5,16 @@ buildGoModule rec { pname = "asnmap"; - version = "1.1.0"; + version = "1.1.1"; src = fetchFromGitHub { owner = "projectdiscovery"; repo = "asnmap"; rev = "refs/tags/v${version}"; - hash = "sha256-Of4IVra6kMHY9btWcF9grM/r3lTWFP/geeT309Seasw="; + hash = "sha256-dGSWUuM4Zcz9QYjYaHur3RYryxe1wJycx/wUL5yqCpM="; }; - vendorHash = "sha256-RDv8vkBI3miyeNAbhUsMpuZCYRUZ0ATfXYHxaTgTVfA="; + vendorHash = "sha256-bSpMYQvrlR9T06dYF8gaTZmMAp6Gnb2cfsYCUes7i2s="; ldflags = [ "-w" From 0215ebf7d92d7372a83bddd64c09e0b68248f7e7 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 27 Jun 2024 12:21:06 +0000 Subject: [PATCH 18/31] exploitdb: 2024-06-15 -> 2024-06-27 --- pkgs/tools/security/exploitdb/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/security/exploitdb/default.nix b/pkgs/tools/security/exploitdb/default.nix index 086927a43fce..c74c2aa6b05a 100644 --- a/pkgs/tools/security/exploitdb/default.nix +++ b/pkgs/tools/security/exploitdb/default.nix @@ -7,13 +7,13 @@ stdenv.mkDerivation rec { pname = "exploitdb"; - version = "2024-06-15"; + version = "2024-06-27"; src = fetchFromGitLab { owner = "exploit-database"; repo = "exploitdb"; rev = "refs/tags/${version}"; - hash = "sha256-bETNSUv36GobOke1bwE+uTSRqln3kANqfl8UIx7bdjM="; + hash = "sha256-8TYraSY6dA7Q9CE9sTjfteNzrVIc6CuMPD6umOmAoHk="; }; nativeBuildInputs = [ makeWrapper ]; From a9ee57f51280af9906a99d01f4901a6f652e4191 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Thu, 27 Jun 2024 14:25:54 +0200 Subject: [PATCH 19/31] python312Packages.google-cloud-pubsub: 2.21.4 -> 2.21.5 Changelog: https://github.com/googleapis/python-pubsub/blob/v2.21.5/CHANGELOG.md --- .../python-modules/google-cloud-pubsub/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/google-cloud-pubsub/default.nix b/pkgs/development/python-modules/google-cloud-pubsub/default.nix index 8ba2f84e072f..4f4877e3589a 100644 --- a/pkgs/development/python-modules/google-cloud-pubsub/default.nix +++ b/pkgs/development/python-modules/google-cloud-pubsub/default.nix @@ -18,14 +18,14 @@ buildPythonPackage rec { pname = "google-cloud-pubsub"; - version = "2.21.4"; + version = "2.21.5"; pyproject = true; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-LLjHaYrb/qBEjbbIm3iqchf84HweN7RtPlNfoWM/OuY="; + hash = "sha256-T6lufyADWczEnPZlfjGsNfXm5V0A+7PO36ZykDz3WyQ="; }; build-system = [ setuptools ]; From 3df418cedbb251c33b97304339397bd8d2761382 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Thu, 27 Jun 2024 14:26:50 +0200 Subject: [PATCH 20/31] python312Packages.google-cloud-bigquery: 3.24.0 -> 3.25.0 Changelog: https://github.com/googleapis/python-bigquery/blob/v3.25.0/CHANGELOG.md --- .../python-modules/google-cloud-bigquery/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/google-cloud-bigquery/default.nix b/pkgs/development/python-modules/google-cloud-bigquery/default.nix index 35de32bea6c5..7062b2b2e3d8 100644 --- a/pkgs/development/python-modules/google-cloud-bigquery/default.nix +++ b/pkgs/development/python-modules/google-cloud-bigquery/default.nix @@ -30,14 +30,14 @@ buildPythonPackage rec { pname = "google-cloud-bigquery"; - version = "3.24.0"; + version = "3.25.0"; pyproject = true; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-6V5vbgqjLmxFPUTisymJMf3XlHwwnqMpoxtv8fk54X4="; + hash = "sha256-Wyr/MgWoVEgRF0NoNq4UA/EfJZTmgQqYiGr9V+2ihQk="; }; build-system = [ setuptools ]; From d527d75f15a17a72d024a7077deb2c55ec86353d Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Thu, 27 Jun 2024 14:27:35 +0200 Subject: [PATCH 21/31] python312Packages.google-cloud-monitoring: 2.21.0 -> 2.22.0 Changelog: https://github.com/googleapis/google-cloud-python/tree/google-cloud-monitoring-v2.22.0/packages/google-cloud-monitoring --- .../python-modules/google-cloud-monitoring/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/google-cloud-monitoring/default.nix b/pkgs/development/python-modules/google-cloud-monitoring/default.nix index f3cafa489d6e..fb5e089228f7 100644 --- a/pkgs/development/python-modules/google-cloud-monitoring/default.nix +++ b/pkgs/development/python-modules/google-cloud-monitoring/default.nix @@ -16,14 +16,14 @@ buildPythonPackage rec { pname = "google-cloud-monitoring"; - version = "2.21.0"; + version = "2.22.0"; pyproject = true; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-57HIdY/DVj/7mjR7xRcuJ4L0TBIbyA/BUoPiic/2db8="; + hash = "sha256-SUaW4XiMVe9bL61GSBP92fWRF/wogZt9nSehhz17f60="; }; build-system = [ setuptools ]; From 418e9bdf39b9c245d05f425f5efc009abe5b6c54 Mon Sep 17 00:00:00 2001 From: Gaetan Lepage Date: Thu, 27 Jun 2024 14:19:00 +0200 Subject: [PATCH 22/31] rubyfmt: mark as broken on aarch64-darwin --- pkgs/development/tools/rubyfmt/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/development/tools/rubyfmt/default.nix b/pkgs/development/tools/rubyfmt/default.nix index a2bd6d453fcd..287959dbf0b5 100644 --- a/pkgs/development/tools/rubyfmt/default.nix +++ b/pkgs/development/tools/rubyfmt/default.nix @@ -73,12 +73,12 @@ rustPlatform.buildRustPackage rec { mv $out/bin/rubyfmt{-main,} ''; - meta = with lib; { + meta = { description = "Ruby autoformatter"; homepage = "https://github.com/fables-tales/rubyfmt"; - license = licenses.mit; - maintainers = with maintainers; [ bobvanderlinden ]; - broken = stdenv.isDarwin && stdenv.isx86_64; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ bobvanderlinden ]; + broken = stdenv.isDarwin; mainProgram = "rubyfmt"; }; } From 2c480654815767f988d4dd5706448447762c826a Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Thu, 27 Jun 2024 14:32:19 +0200 Subject: [PATCH 23/31] python312Packages.influxdb-client: 1.43.0 -> 1.44.0 Diff: https://github.com/influxdata/influxdb-client-python/compare/refs/tags/v1.43.0...v1.44.0 Changelog: https://github.com/influxdata/influxdb-client-python/blob/v1.44.0/CHANGELOG.md --- pkgs/development/python-modules/influxdb-client/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/influxdb-client/default.nix b/pkgs/development/python-modules/influxdb-client/default.nix index 0c959277f31e..7fe84b567d36 100644 --- a/pkgs/development/python-modules/influxdb-client/default.nix +++ b/pkgs/development/python-modules/influxdb-client/default.nix @@ -17,7 +17,7 @@ buildPythonPackage rec { pname = "influxdb-client"; - version = "1.43.0"; + version = "1.44.0"; pyproject = true; disabled = pythonOlder "3.7"; @@ -26,7 +26,7 @@ buildPythonPackage rec { owner = "influxdata"; repo = "influxdb-client-python"; rev = "refs/tags/v${version}"; - hash = "sha256-CwSqJj9MslcvTzYGaDRygskSxbSh80uCJQM2tNz743k="; + hash = "sha256-iG9edGHqhExUoL+1q8s5QvY/mrYOMosgtA2P1zwO3o8="; }; build-system = [ setuptools ]; From 7cd57254405fecbee03e4be3721c7ae05ae3c2e1 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Thu, 27 Jun 2024 14:34:50 +0200 Subject: [PATCH 24/31] python311Packages.llama-index-graph-stores-neo4j: 0.2.5 -> 0.2.6 --- .../python-modules/llama-index-graph-stores-neo4j/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/llama-index-graph-stores-neo4j/default.nix b/pkgs/development/python-modules/llama-index-graph-stores-neo4j/default.nix index 71b90f73f196..06d00b774787 100644 --- a/pkgs/development/python-modules/llama-index-graph-stores-neo4j/default.nix +++ b/pkgs/development/python-modules/llama-index-graph-stores-neo4j/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { pname = "llama-index-graph-stores-neo4j"; - version = "0.2.5"; + version = "0.2.6"; pyproject = true; disabled = pythonOlder "3.8"; @@ -18,7 +18,7 @@ buildPythonPackage rec { src = fetchPypi { pname = "llama_index_graph_stores_neo4j"; inherit version; - hash = "sha256-K+k3tsELhF6TXVK/voMRYpb0vVkGQpkzYnB9syCLmoY="; + hash = "sha256-xv/Z/HLFUEfLqjE4052bc8aBJq3bvreYD/XZw1vijQQ="; }; build-system = [ poetry-core ]; From 0c40909b96fe78422775c86fdf47dc5545a2e728 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Thu, 27 Jun 2024 14:37:50 +0200 Subject: [PATCH 25/31] python311Packages.neo4j: 5.21.0 -> 5.22.0 Diff: https://github.com/neo4j/neo4j-python-driver/compare/refs/tags/5.21.0...5.22.0 Changelog: https://github.com/neo4j/neo4j-python-driver/releases/tag/5.22.0 --- pkgs/development/python-modules/neo4j/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/neo4j/default.nix b/pkgs/development/python-modules/neo4j/default.nix index 1dc1de3daab1..d1a6903a666b 100644 --- a/pkgs/development/python-modules/neo4j/default.nix +++ b/pkgs/development/python-modules/neo4j/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { pname = "neo4j"; - version = "5.21.0"; + version = "5.22.0"; pyproject = true; disabled = pythonOlder "3.7"; @@ -22,7 +22,7 @@ buildPythonPackage rec { owner = "neo4j"; repo = "neo4j-python-driver"; rev = "refs/tags/${version}"; - hash = "sha256-SGRe5O+6HqLFu4VQc0QC+91KVjqKeqNt5hIBwophvP0="; + hash = "sha256-/yilbKui0D49zviNM9MI5ElGAYPB3MlbMgpDyI1kVX8="; }; postPatch = '' From 100ae3ed65dd88b37f23f549d2c6536d79347678 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Thu, 27 Jun 2024 14:43:04 +0200 Subject: [PATCH 26/31] python311Packages.pytelegrambotapi: 4.19.0 -> 4.20.0 Diff: https://github.com/eternnoir/pyTelegramBotAPI/compare/refs/tags/4.19.0...4.20.0 Changelog: https://github.com/eternnoir/pyTelegramBotAPI/releases/tag/4.20.0 --- pkgs/development/python-modules/pyTelegramBotAPI/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pyTelegramBotAPI/default.nix b/pkgs/development/python-modules/pyTelegramBotAPI/default.nix index e5f32b950756..e86332342bb9 100644 --- a/pkgs/development/python-modules/pyTelegramBotAPI/default.nix +++ b/pkgs/development/python-modules/pyTelegramBotAPI/default.nix @@ -20,7 +20,7 @@ buildPythonPackage rec { pname = "pytelegrambotapi"; - version = "4.19.0"; + version = "4.20.0"; pyproject = true; disabled = pythonOlder "3.7"; @@ -29,7 +29,7 @@ buildPythonPackage rec { owner = "eternnoir"; repo = "pyTelegramBotAPI"; rev = "refs/tags/${version}"; - hash = "sha256-vyhX6TG3B6f1u49ngzdaCOZwSnEUQ2XMiq80bqCSmxU="; + hash = "sha256-JKT3kllOV9VEwhUwv3geAP5ibJgaAApCahD1N4V5SE8="; }; build-system = [ hatchling ]; From 3d530bea8d981894aa996162efe7de9d75a32cc9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= Date: Thu, 27 Jun 2024 16:30:25 +0200 Subject: [PATCH 27/31] btrfs-progs: 6.9.1 -> 6.9.2 https://github.com/kdave/btrfs-progs/releases/tag/v6.9.2 In particular, channel is blocked because - subvol list: fix accidental trimming of subvolume name https://hydra.nixos.org/build/264495531#tabs-buildsteps --- pkgs/tools/filesystems/btrfs-progs/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/filesystems/btrfs-progs/default.nix b/pkgs/tools/filesystems/btrfs-progs/default.nix index e3fae05fe01e..955a2b97e745 100644 --- a/pkgs/tools/filesystems/btrfs-progs/default.nix +++ b/pkgs/tools/filesystems/btrfs-progs/default.nix @@ -10,11 +10,11 @@ stdenv.mkDerivation rec { pname = "btrfs-progs"; - version = "6.9.1"; + version = "6.9.2"; src = fetchurl { url = "mirror://kernel/linux/kernel/people/kdave/btrfs-progs/btrfs-progs-v${version}.tar.xz"; - hash = "sha256-7VSz1w0MfBHaBCipz6WoHLguYzFkx7pXz2cU+LaUGLo="; + hash = "sha256-Q4ZbsnLcCrJYXeNgVDTYG6IXV48Il79wDNNsFKxAZSo="; }; nativeBuildInputs = [ From aeea356ac61fe9ecd06db0085996e17a3924c3c6 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 27 Jun 2024 15:19:27 +0000 Subject: [PATCH 28/31] waylyrics: 0.3.12 -> 0.3.13 --- pkgs/applications/audio/waylyrics/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/audio/waylyrics/default.nix b/pkgs/applications/audio/waylyrics/default.nix index 69069f01243c..e3cf437258df 100644 --- a/pkgs/applications/audio/waylyrics/default.nix +++ b/pkgs/applications/audio/waylyrics/default.nix @@ -9,16 +9,16 @@ rustPlatform.buildRustPackage rec { pname = "waylyrics"; - version = "0.3.12"; + version = "0.3.13"; src = fetchFromGitHub { owner = "waylyrics"; repo = "waylyrics"; rev = "v${version}"; - hash = "sha256-FfrgeUDKiM9m0mvKlu02KEuvsq+3Gv3yPFW1DIQw05I="; + hash = "sha256-hx0g5JBf0v7B26GCcU5BkmxVvbHQNPSQ2d+ohDk3080="; }; - cargoHash = "sha256-xD46aKT18Kl+81Pfv+zleUUKhSV1Px7JFjhXw1/4cBA="; + cargoHash = "sha256-v1+1ivbJAZLqnnFaR6vmpcZ7vd5j3afZliggXaHiwWM="; nativeBuildInputs = [ pkg-config wrapGAppsHook4 ]; buildInputs = [ openssl dbus ]; From 8809946c78f30cfe602c7964156e5b463fe7f4ea Mon Sep 17 00:00:00 2001 From: Paul Meyer <49727155+katexochen@users.noreply.github.com> Date: Thu, 27 Jun 2024 15:56:32 +0200 Subject: [PATCH 29/31] envoy: 1.30.2 -> 1.30.3 Signed-off-by: Paul Meyer <49727155+katexochen@users.noreply.github.com> --- ...-nixpkgs-add-cstdint-in-dd-trace-cpp.patch | 29 ------------------- pkgs/servers/http/envoy/dd_trace_cpp.patch | 25 ---------------- pkgs/servers/http/envoy/default.nix | 17 ++++------- 3 files changed, 5 insertions(+), 66 deletions(-) delete mode 100644 pkgs/servers/http/envoy/0004-nixpkgs-add-cstdint-in-dd-trace-cpp.patch delete mode 100644 pkgs/servers/http/envoy/dd_trace_cpp.patch diff --git a/pkgs/servers/http/envoy/0004-nixpkgs-add-cstdint-in-dd-trace-cpp.patch b/pkgs/servers/http/envoy/0004-nixpkgs-add-cstdint-in-dd-trace-cpp.patch deleted file mode 100644 index 31dfe08f91b9..000000000000 --- a/pkgs/servers/http/envoy/0004-nixpkgs-add-cstdint-in-dd-trace-cpp.patch +++ /dev/null @@ -1,29 +0,0 @@ -From dd3509a7d646a970480f94a8e09f377e9783504d Mon Sep 17 00:00:00 2001 -From: Malte Poll <1780588+malt3@users.noreply.github.com> -Date: Mon, 22 Apr 2024 16:07:58 +0200 -Subject: [PATCH 4/4] nixpkgs: add cstdint in dd-trace-cpp - ---- - bazel/repositories.bzl | 6 +++++- - 1 file changed, 5 insertions(+), 1 deletion(-) - -diff --git a/bazel/repositories.bzl b/bazel/repositories.bzl -index d91aa712bd..467348e773 100644 ---- a/bazel/repositories.bzl -+++ b/bazel/repositories.bzl -@@ -772,7 +772,11 @@ def _io_opentelemetry_api_cpp(): - ) - - def _com_github_datadog_dd_trace_cpp(): -- external_http_archive("com_github_datadog_dd_trace_cpp") -+ external_http_archive( -+ name = "com_github_datadog_dd_trace_cpp", -+ patch_args = ["-p1"], -+ patches = ["@envoy//bazel:dd_trace_cpp.patch"], -+ ) - native.bind( - name = "dd_trace_cpp", - actual = "@com_github_datadog_dd_trace_cpp//:dd_trace_cpp", --- -2.42.0 - diff --git a/pkgs/servers/http/envoy/dd_trace_cpp.patch b/pkgs/servers/http/envoy/dd_trace_cpp.patch deleted file mode 100644 index d9873c8f1a8c..000000000000 --- a/pkgs/servers/http/envoy/dd_trace_cpp.patch +++ /dev/null @@ -1,25 +0,0 @@ -From 4851a6a722b228ecbfd9df255dab3d8f30bd84b9 Mon Sep 17 00:00:00 2001 -From: Malte Poll <1780588+malt3@users.noreply.github.com> -Date: Mon, 22 Apr 2024 15:36:33 +0200 -Subject: [PATCH] nixpkgs: add cstdint to fix compilation under GCC 13 - -https://gcc.gnu.org/gcc-13/porting_to.html#header-dep-changes ---- - src/datadog/parse_util.h | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/src/datadog/parse_util.h b/src/datadog/parse_util.h -index c603286..c8e4e83 100644 ---- a/src/datadog/parse_util.h -+++ b/src/datadog/parse_util.h -@@ -2,6 +2,7 @@ - - // This component provides parsing-related miscellanea. - -+#include - #include - #include - #include --- -2.42.0 - diff --git a/pkgs/servers/http/envoy/default.nix b/pkgs/servers/http/envoy/default.nix index f979cc92ba7e..2ea00c598e27 100644 --- a/pkgs/servers/http/envoy/default.nix +++ b/pkgs/servers/http/envoy/default.nix @@ -24,15 +24,15 @@ let # However, the version string is more useful for end-users. # These are contained in a attrset of their own to make it obvious that # people should update both. - version = "1.30.2"; - rev = "d79f6e8d453ee260e9094093b8dd31af0056e67b"; - hash = "sha256-qbe9M4dH7NFDY5UF17urJ6WvnZNhvdMU4HAg0BaL+KA="; + version = "1.30.3"; + rev = "12a6a79966203969a23aa2f0d705f39b679744c2"; + hash = "sha256-S18bnAVha4CnYKHTzytKY6PHWSbOzmObbyZEhzIHsf8="; }; # these need to be updated for any changes to fetchAttrs depsHash = { - x86_64-linux = "sha256-/IpTRFBkif1HSycPrWxphKTnhL6wHgPAweyxoXZ1oVg="; - aarch64-linux = "sha256-uA1CHKzdBht+WYxgwR2g5t7fRybhbo6Hgpzdr+H1vqY="; + x86_64-linux = "sha256-m7dMr/dCmjpKLPT+8FXBHGkTlNoN9x1oQ7D6uO0sHtQ="; + aarch64-linux = "sha256-9GqVpWkMHP9nb5EZHjGKixkWazi//oLlIUum45xTvoM="; }.${stdenv.system} or (throw "unsupported system ${stdenv.system}"); in buildBazelPackage { @@ -55,8 +55,6 @@ buildBazelPackage { sed -i 's,#!/usr/bin/env python3,#!${python3}/bin/python,' bazel/foreign_cc/luajit.patch sed -i '/javabase=/d' .bazelrc sed -i '/"-Werror"/d' bazel/envoy_internal.bzl - - cp ${./dd_trace_cpp.patch} bazel/dd_trace_cpp.patch ''; patches = [ @@ -68,11 +66,6 @@ buildBazelPackage { # use system C/C++ tools ./0003-nixpkgs-use-system-C-C-toolchains.patch - - # apply patch to dd-trace-cpp - # remove once a version of dd-trace-cpp is released and adopted by envoy - # that contains https://github.com/DataDog/dd-trace-cpp/commit/3a8e1e9a3cf4e87ef053e954a39dc7a967ac6965 - ./0004-nixpkgs-add-cstdint-in-dd-trace-cpp.patch ]; nativeBuildInputs = [ From 909955825b3a2d0ccf080b8030b9459f41e0fc29 Mon Sep 17 00:00:00 2001 From: klchen0112 <32459567+klchen0112@users.noreply.github.com> Date: Thu, 27 Jun 2024 23:39:33 +0800 Subject: [PATCH 30/31] emacsPackages.rime: fix build error in darwin (#322873) Co-authored-by: klchen0112 --- .../emacs/elisp-packages/melpa-packages.nix | 23 +++++++++++++++---- 1 file changed, 19 insertions(+), 4 deletions(-) diff --git a/pkgs/applications/editors/emacs/elisp-packages/melpa-packages.nix b/pkgs/applications/editors/emacs/elisp-packages/melpa-packages.nix index bb45c383487c..1e9a8191b3f1 100644 --- a/pkgs/applications/editors/emacs/elisp-packages/melpa-packages.nix +++ b/pkgs/applications/editors/emacs/elisp-packages/melpa-packages.nix @@ -508,14 +508,29 @@ let rime = super.rime.overrideAttrs (old: { buildInputs = (old.buildInputs or [ ]) ++ [ pkgs.librime ]; - preBuild = (old.preBuild or "") + '' + preBuild = (old.preBuild or "") + + (if pkgs.stdenv.isDarwin then + '' + export MODULE_FILE_SUFFIX=".dylib" + make lib + mkdir -p /tmp/build/rime-lib + cp *.dylib /tmp/build/rime-lib + '' + else + '' make lib mkdir -p /build/rime-lib cp *.so /build/rime-lib - ''; - postInstall = (old.postInstall or "") + '' + ''); + postInstall = (old.postInstall or "") + + (if pkgs.stdenv.isDarwin then + '' + install -m444 -t $out/share/emacs/site-lisp/elpa/rime-* /tmp/build/rime-lib/*.dylib + '' + else + '' install -m444 -t $out/share/emacs/site-lisp/elpa/rime-* /build/rime-lib/*.so - ''; + ''); }); shm = super.shm.overrideAttrs (attrs: { From 4b11f77acc4465cef7e3196ca3166819eae01a44 Mon Sep 17 00:00:00 2001 From: Yaya Date: Wed, 26 Jun 2024 16:04:31 +0200 Subject: [PATCH 31/31] gitlab: 16.11.4 -> 16.11.5 https://gitlab.com/gitlab-org/gitlab/-/blob/v16.11.5-ee/CHANGELOG.md Fixes CVE-2024-1493 Fixes CVE-2024-1816 Fixes CVE-2024-2177 Fixes CVE-2024-2191 Fixes CVE-2024-3115 Fixes CVE-2024-3959 Fixes CVE-2024-4011 Fixes CVE-2024-4025 Fixes CVE-2024-4557 Fixes CVE-2024-4901 Fixes CVE-2024-4994 Fixes CVE-2024-5430 Fixes CVE-2024-5655 Fixes CVE-2024-6323 --- .../applications/version-management/gitlab/data.json | 12 ++++++------ .../version-management/gitlab/gitaly/default.nix | 4 ++-- .../gitlab/gitlab-pages/default.nix | 4 ++-- .../gitlab/gitlab-workhorse/default.nix | 2 +- 4 files changed, 11 insertions(+), 11 deletions(-) diff --git a/pkgs/applications/version-management/gitlab/data.json b/pkgs/applications/version-management/gitlab/data.json index 382038ac99a5..41fe2756ff47 100644 --- a/pkgs/applications/version-management/gitlab/data.json +++ b/pkgs/applications/version-management/gitlab/data.json @@ -1,15 +1,15 @@ { - "version": "16.11.4", - "repo_hash": "sha256-VtjGV/0Xtmwqu/YZa6P6jUvlTYj9FNKALcJ3ZvMUJBw=", + "version": "16.11.5", + "repo_hash": "1bhg6glb644m55m50q2kp0azf3c4if11vymjn823rhs68jw3jqcp", "yarn_hash": "03q7h8dyssvsr91klr1jk65f5jz1ac71lx0114zq9c7awxrgp6kq", "owner": "gitlab-org", "repo": "gitlab", - "rev": "v16.11.4-ee", + "rev": "v16.11.5-ee", "passthru": { - "GITALY_SERVER_VERSION": "16.11.4", - "GITLAB_PAGES_VERSION": "16.11.4", + "GITALY_SERVER_VERSION": "16.11.5", + "GITLAB_PAGES_VERSION": "16.11.5", "GITLAB_SHELL_VERSION": "14.35.0", "GITLAB_ELASTICSEARCH_INDEXER_VERSION": "4.8.0", - "GITLAB_WORKHORSE_VERSION": "16.11.4" + "GITLAB_WORKHORSE_VERSION": "16.11.5" } } diff --git a/pkgs/applications/version-management/gitlab/gitaly/default.nix b/pkgs/applications/version-management/gitlab/gitaly/default.nix index fb175aad462a..c978c1884577 100644 --- a/pkgs/applications/version-management/gitlab/gitaly/default.nix +++ b/pkgs/applications/version-management/gitlab/gitaly/default.nix @@ -5,7 +5,7 @@ }: let - version = "16.11.4"; + version = "16.11.5"; package_version = "v${lib.versions.major version}"; gitaly_package = "gitlab.com/gitlab-org/gitaly/${package_version}"; @@ -17,7 +17,7 @@ let owner = "gitlab-org"; repo = "gitaly"; rev = "v${version}"; - hash = "sha256-sdRKKOWoX0yyqUGpu/mqDdTq2nLZ2Gr5GNV9x99rdeU="; + hash = "sha256-iBLRhkFPsopy6m3y+9Qc+v3FCbV5nOWMs+DMwW+JiSk="; }; vendorHash = "sha256-WCZF7XVW6J1zyPx8e/Mcn+HmHElAUGcEICxiF5HLzBg="; diff --git a/pkgs/applications/version-management/gitlab/gitlab-pages/default.nix b/pkgs/applications/version-management/gitlab/gitlab-pages/default.nix index 480d9921f9c7..3cb270e2cae0 100644 --- a/pkgs/applications/version-management/gitlab/gitlab-pages/default.nix +++ b/pkgs/applications/version-management/gitlab/gitlab-pages/default.nix @@ -2,14 +2,14 @@ buildGoModule rec { pname = "gitlab-pages"; - version = "16.11.4"; + version = "16.11.5"; # nixpkgs-update: no auto update src = fetchFromGitLab { owner = "gitlab-org"; repo = "gitlab-pages"; rev = "v${version}"; - hash = "sha256-6Fh1IKCs2Bg7Eg44kbCMM8YhLmwWvdZnXp39fphLzcE="; + hash = "sha256-mJKzaFICE7f4aIFGeV/4PbbQkaxwmRd9QO2pRXpM2ag="; }; vendorHash = "sha256-WrR4eZRAuYkhr7ZqP7OXqJ6uwvxzn+t+3OdBNcNaq0M="; diff --git a/pkgs/applications/version-management/gitlab/gitlab-workhorse/default.nix b/pkgs/applications/version-management/gitlab/gitlab-workhorse/default.nix index d01deb57b200..682376e40a11 100644 --- a/pkgs/applications/version-management/gitlab/gitlab-workhorse/default.nix +++ b/pkgs/applications/version-management/gitlab/gitlab-workhorse/default.nix @@ -5,7 +5,7 @@ in buildGoModule rec { pname = "gitlab-workhorse"; - version = "16.11.4"; + version = "16.11.5"; # nixpkgs-update: no auto update src = fetchFromGitLab {