From cb7760c205ee701eb8e8a0e5d6dcd01c9a50cea0 Mon Sep 17 00:00:00 2001 From: Anderson Torres Date: Mon, 13 May 2024 17:33:06 -0300 Subject: [PATCH 01/32] smplayer: migrate to by-name --- .../default.nix => by-name/sm/smplayer/package.nix} | 12 ++++++++---- pkgs/top-level/all-packages.nix | 2 -- 2 files changed, 8 insertions(+), 6 deletions(-) rename pkgs/{applications/video/smplayer/default.nix => by-name/sm/smplayer/package.nix} (94%) diff --git a/pkgs/applications/video/smplayer/default.nix b/pkgs/by-name/sm/smplayer/package.nix similarity index 94% rename from pkgs/applications/video/smplayer/default.nix rename to pkgs/by-name/sm/smplayer/package.nix index 513468cb16cf..67ec92ddaef5 100644 --- a/pkgs/applications/video/smplayer/default.nix +++ b/pkgs/by-name/sm/smplayer/package.nix @@ -1,11 +1,15 @@ { lib , stdenv , fetchFromGitHub -, qmake -, qtscript -, wrapQtAppsHook +, qt5 }: +let + inherit (qt5) + qmake + qtscript + wrapQtAppsHook; +in stdenv.mkDerivation (finalAttrs: { pname = "smplayer"; version = "23.12.0"; @@ -53,7 +57,7 @@ stdenv.mkDerivation (finalAttrs: { options of MPlayer, SMPlayer adds other interesting features like the possibility to play Youtube videos or download subtitles. ''; - changelog = "https://github.com/smplayer-dev/smplayer/releases/tag/v${finalAttrs.version}"; + changelog = "https://github.com/smplayer-dev/smplayer/releases/tag/${finalAttrs.src.rev}"; license = lib.licenses.gpl3Plus; maintainers = with lib.maintainers; [ AndersonTorres ]; platforms = lib.platforms.linux; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index ee2907d324cc..75d4e2a0e7d4 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -33280,8 +33280,6 @@ with pkgs; protobuf = protobuf_21; }; - smplayer = libsForQt5.callPackage ../applications/video/smplayer { }; - smtube = libsForQt5.callPackage ../applications/video/smtube { }; softmaker-office = callPackage ../applications/office/softmaker/softmaker_office.nix { }; From 16fc9a5a6532063a05ea13e8e687c8b5f21c7196 Mon Sep 17 00:00:00 2001 From: Anderson Torres Date: Mon, 13 May 2024 17:35:56 -0300 Subject: [PATCH 02/32] smplayer: nixfmt --- pkgs/by-name/sm/smplayer/package.nix | 22 ++++++++-------------- 1 file changed, 8 insertions(+), 14 deletions(-) diff --git a/pkgs/by-name/sm/smplayer/package.nix b/pkgs/by-name/sm/smplayer/package.nix index 67ec92ddaef5..83287e6b6e59 100644 --- a/pkgs/by-name/sm/smplayer/package.nix +++ b/pkgs/by-name/sm/smplayer/package.nix @@ -1,14 +1,12 @@ -{ lib -, stdenv -, fetchFromGitHub -, qt5 +{ + lib, + stdenv, + fetchFromGitHub, + qt5, }: let - inherit (qt5) - qmake - qtscript - wrapQtAppsHook; + inherit (qt5) qmake qtscript wrapQtAppsHook; in stdenv.mkDerivation (finalAttrs: { pname = "smplayer"; @@ -26,15 +24,11 @@ stdenv.mkDerivation (finalAttrs: { wrapQtAppsHook ]; - buildInputs = [ - qtscript - ]; + buildInputs = [ qtscript ]; dontUseQmakeConfigure = true; - makeFlags = [ - "PREFIX=${placeholder "out"}" - ]; + makeFlags = [ "PREFIX=${placeholder "out"}" ]; meta = { homepage = "https://www.smplayer.info"; From 93b021a440bd392660d990740ce91e157aee71ef Mon Sep 17 00:00:00 2001 From: Anderson Torres Date: Mon, 13 May 2024 17:51:25 -0300 Subject: [PATCH 03/32] smplayer: 23.12.0 -> 24.5.0 --- pkgs/by-name/sm/smplayer/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/sm/smplayer/package.nix b/pkgs/by-name/sm/smplayer/package.nix index 83287e6b6e59..f835c1808bc3 100644 --- a/pkgs/by-name/sm/smplayer/package.nix +++ b/pkgs/by-name/sm/smplayer/package.nix @@ -10,13 +10,13 @@ let in stdenv.mkDerivation (finalAttrs: { pname = "smplayer"; - version = "23.12.0"; + version = "24.5.0"; src = fetchFromGitHub { owner = "smplayer-dev"; repo = "smplayer"; rev = "v${finalAttrs.version}"; - hash = "sha256-ip4y9GF2u1yl1Ts8T9XcFg9wdXVTYXfDrrPuHLz6oSs="; + hash = "sha256-KblVDlE8EglMMAclGFZm81obipm6/JLUvsn5sLrpKqc="; }; nativeBuildInputs = [ From 78afb19682e601817c9157eaf6e071e971d4c549 Mon Sep 17 00:00:00 2001 From: Bintang Date: Fri, 24 May 2024 02:15:52 +0700 Subject: [PATCH 04/32] keymapper: 4.3.0 -> 4.3.1 Release note: https://github.com/houmain/keymapper/releases/tag/4.3.1 --- pkgs/tools/inputmethods/keymapper/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/tools/inputmethods/keymapper/default.nix b/pkgs/tools/inputmethods/keymapper/default.nix index 874a651b66a7..c751aa4d7445 100644 --- a/pkgs/tools/inputmethods/keymapper/default.nix +++ b/pkgs/tools/inputmethods/keymapper/default.nix @@ -10,18 +10,18 @@ , wayland , libxkbcommon , gtk3 -, libappindicator +, libayatana-appindicator }: stdenv.mkDerivation (finalAttrs: { pname = "keymapper"; - version = "4.3.0"; + version = "4.3.1"; src = fetchFromGitHub { owner = "houmain"; repo = "keymapper"; rev = finalAttrs.version; - hash = "sha256-QfISsRm0j/VoTmpDQes5XQooXHcmjqRD/WS/nvPDl00="; + hash = "sha256-SjYPkcXBEHjK7zgwL6U4ltjvhKuGMZWbp55LtndU400="; }; # all the following must be in nativeBuildInputs @@ -35,7 +35,7 @@ stdenv.mkDerivation (finalAttrs: { libusb1 libxkbcommon gtk3 - libappindicator + libayatana-appindicator ]; meta = { From 976504ea6b7ef512c174da9b46d7d4c4e40df4e2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Stephan=20He=C3=9Felmann?= Date: Thu, 23 May 2024 22:53:51 +0200 Subject: [PATCH 05/32] roxctl: 4.3.5 -> 4.4.2 --- pkgs/applications/networking/cluster/roxctl/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/networking/cluster/roxctl/default.nix b/pkgs/applications/networking/cluster/roxctl/default.nix index abcb6fd4299a..abc77155eb5c 100644 --- a/pkgs/applications/networking/cluster/roxctl/default.nix +++ b/pkgs/applications/networking/cluster/roxctl/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "roxctl"; - version = "4.3.5"; + version = "4.4.2"; src = fetchFromGitHub { owner = "stackrox"; repo = "stackrox"; rev = version; - sha256 = "sha256-zTZ03Qtb3ndBf1MunhYS8rzPReExzEPGxCh1JexkwuA="; + sha256 = "sha256-OHDQr83EQn0qjObuzldRAa9fDv1itqipkDRcKdt3kxg="; }; - vendorHash = "sha256-Sl5eIK8PWeGi2V7q/Qm5Gfjj1A9nQPtM0BGdO6inPxk="; + vendorHash = "sha256-SLr7h830lZpou2FyYqqUsYzRsh/QzMgkTArAJjHzCx0="; nativeBuildInputs = [ installShellFiles ]; From 34a197ee29db70b8e7febb3fce99e6c767ca38ae Mon Sep 17 00:00:00 2001 From: Sergei Zimmerman Date: Sat, 25 May 2024 17:28:23 +0300 Subject: [PATCH 06/32] ch341eeprom: 0-unstable-2021-01-05 -> 0-unstable-2024-05-06 Added passthru.updateScript. Reformatted with `nixfmt-rfc-style`. Removed `with lib;` usage. Sorted meta attributes lexicographically. --- pkgs/by-name/ch/ch341eeprom/package.nix | 34 ++++++++++++++----------- 1 file changed, 19 insertions(+), 15 deletions(-) diff --git a/pkgs/by-name/ch/ch341eeprom/package.nix b/pkgs/by-name/ch/ch341eeprom/package.nix index 1c4661398e54..b5e8c6f5e2ca 100644 --- a/pkgs/by-name/ch/ch341eeprom/package.nix +++ b/pkgs/by-name/ch/ch341eeprom/package.nix @@ -1,25 +1,25 @@ -{ lib -, stdenv -, fetchFromGitHub -, libusb1 -, +{ + lib, + stdenv, + fetchFromGitHub, + libusb1, + unstableGitUpdater, }: + stdenv.mkDerivation { pname = "ch341eeprom"; - version = "0-unstable-2021-01-05"; + version = "0-unstable-2024-05-06"; src = fetchFromGitHub { owner = "command-tab"; repo = "ch341eeprom"; - rev = "d5b2fba35a33a1cddd7a3e920e1df933f21ba9b0"; - hash = "sha256-QUl5ErOfEfDhk1fF+BNu6n0Bake3IagNfn4I43b6Uns="; + rev = "7cffbef7552d93162bd90cae836a45e94acb93fb"; + hash = "sha256-8pvQ2hBP3Rf8+MWsmMY53BghFiC5/b9k8vUjU2K6Ib4="; }; buildInputs = [ libusb1 ]; - makeFlags = [ - "CC=${stdenv.cc.targetPrefix}cc" - ]; + makeFlags = [ "CC=${stdenv.cc.targetPrefix}cc" ]; installPhase = '' runHook preInstall @@ -27,12 +27,16 @@ stdenv.mkDerivation { runHook postInstall ''; - meta = with lib; { + passthru = { + updateScript = unstableGitUpdater { hardcodeZeroVersion = true; }; + }; + + meta = { description = "A libusb based programming tool for 24Cxx serial EEPROMs using the WinChipHead CH341A IC"; homepage = "https://github.com/command-tab/ch341eeprom"; - license = licenses.gpl3Plus; - platforms = platforms.darwin ++ platforms.linux; + license = lib.licenses.gpl3Plus; mainProgram = "ch341eeprom"; - maintainers = with maintainers; [ xokdvium ]; + maintainers = with lib.maintainers; [ xokdvium ]; + platforms = with lib.platforms; darwin ++ linux; }; } From b8c7244baec13d29cb499beb0cfc29fe3eb98422 Mon Sep 17 00:00:00 2001 From: Connor Baker Date: Fri, 24 May 2024 20:50:15 +0000 Subject: [PATCH 07/32] opencv3: don't build with CUDA newer than 11 --- pkgs/development/libraries/opencv/3.x.nix | 4 +++- pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/pkgs/development/libraries/opencv/3.x.nix b/pkgs/development/libraries/opencv/3.x.nix index 140eee9c06e8..adb6532bd682 100644 --- a/pkgs/development/libraries/opencv/3.x.nix +++ b/pkgs/development/libraries/opencv/3.x.nix @@ -15,7 +15,7 @@ , enableContrib ? true , enableCuda ? config.cudaSupport -, cudaPackages ? { } +, cudaPackages , enableUnfree ? false , enableIpp ? false , enablePython ? false, pythonPackages ? null @@ -295,6 +295,8 @@ stdenv.mkDerivation { meta = with lib; { description = "Open Computer Vision Library with more than 500 algorithms"; homepage = "https://opencv.org/"; + # OpenCV 3 won't build with CUDA 12+ + broken = enableCuda && cudaPackages.cudaAtLeast "12"; license = with licenses; if enableUnfree then unfree else bsd3; maintainers = with maintainers; [mdaiter basvandijk]; platforms = with platforms; linux ++ darwin; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index acc4b8c93379..0862c0595889 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -23631,6 +23631,8 @@ with pkgs; inherit (darwin.apple_sdk.frameworks) AVFoundation Cocoa VideoDecodeAcceleration CoreMedia MediaToolbox Accelerate; ffmpeg = ffmpeg_4; + # OpenCV3 won't build with anything newer than CUDA 11 due to API changes. + cudaPackages = cudaPackages_11; }; opencv4 = callPackage ../development/libraries/opencv/4.x.nix { From da496b0c40526000e482d50a94e994a07a6fb5f6 Mon Sep 17 00:00:00 2001 From: Kai Norman Clasen Date: Sun, 26 May 2024 09:50:14 +0200 Subject: [PATCH 08/32] immich-go: 0.14.1 -> 0.15.0 Changelog: https://github.com/simulot/immich-go/releases/tag/0.15.0 --- pkgs/by-name/im/immich-go/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/im/immich-go/package.nix b/pkgs/by-name/im/immich-go/package.nix index 439c4768ea15..9d8cfda974e1 100644 --- a/pkgs/by-name/im/immich-go/package.nix +++ b/pkgs/by-name/im/immich-go/package.nix @@ -1,13 +1,13 @@ { lib, buildGoModule, fetchFromGitHub, nix-update-script, testers, immich-go }: buildGoModule rec { pname = "immich-go"; - version = "0.14.1"; + version = "0.15.0"; src = fetchFromGitHub { owner = "simulot"; repo = "immich-go"; rev = "${version}"; - hash = "sha256-5dgEyg55ffJLH8zxp6mFVsUqAzyPnY18XnX+jMethUc="; + hash = "sha256-gZVjs0aFwlx5joX7iqy7uDd23d/4LjP/t6u7z8X/P8o="; # Inspired by: https://github.com/NixOS/nixpkgs/blob/f2d7a289c5a5ece8521dd082b81ac7e4a57c2c5c/pkgs/applications/graphics/pdfcpu/default.nix#L20-L32 # The intention here is to write the information into files in the `src`'s From c0f55c7917d5def5a52d8a595ce745c50023814b Mon Sep 17 00:00:00 2001 From: Izorkin Date: Wed, 27 Mar 2024 20:08:59 +0300 Subject: [PATCH 09/32] angie: add withAcme option --- pkgs/servers/http/angie/default.nix | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/pkgs/servers/http/angie/default.nix b/pkgs/servers/http/angie/default.nix index 4c447f2b8c75..f57dc2e012bd 100644 --- a/pkgs/servers/http/angie/default.nix +++ b/pkgs/servers/http/angie/default.nix @@ -3,6 +3,7 @@ , lib , fetchurl , nixosTests +, withAcme ? false , withQuic ? false , fetchpatch , ... @@ -17,7 +18,10 @@ callPackage ../nginx/generic.nix args rec { hash = "sha256-pSBy+Gv3rSa0WqQOxLHM0V03/vLqvOYBGxrjY9qsBfQ="; }; - configureFlags = lib.optional withQuic [ + configureFlags = lib.optionals withAcme [ + "--with-http_acme_module" + "--http-acme-client-path=/var/lib/nginx/acme" + ] ++ lib.optionals withQuic [ "--with-http_v3_module" ]; From b4cc51513b2c80e8ea695e36d81666ab34543c8e Mon Sep 17 00:00:00 2001 From: Aaron Andersen Date: Sun, 26 May 2024 08:35:38 -0400 Subject: [PATCH 10/32] kodi.packages.controller-topology-project: unstable-2022-11-19 -> 1.0.0 --- .../kodi/addons/controller-topology-project/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/applications/video/kodi/addons/controller-topology-project/default.nix b/pkgs/applications/video/kodi/addons/controller-topology-project/default.nix index cfaef2bb7f98..5b55ab9d1282 100644 --- a/pkgs/applications/video/kodi/addons/controller-topology-project/default.nix +++ b/pkgs/applications/video/kodi/addons/controller-topology-project/default.nix @@ -1,14 +1,14 @@ { lib, stdenv, fetchFromGitHub, toKodiAddon, addonDir }: let - drv = stdenv.mkDerivation { + drv = stdenv.mkDerivation rec { pname = "controller-topology-project"; - version = "unstable-2022-11-19"; + version = "1.0.0"; src = fetchFromGitHub { owner = "kodi-game"; repo = "controller-topology-project"; - rev = "d96894ca68678000f26f56d14aa3ceea47b1a3a8"; - sha256 = "sha256-KfDr2bSJFey/aNO5WzoOQ8Mz0v4uitKkOesymIMZH1o="; + rev = "v${version}"; + sha256 = "sha256-6g4dyR34b0YgxlzRRS2C/gY3wjlO9MMYEB2fHLSCqC4="; }; postPatch = '' From 68c7c4140126c1cb4a39166f01976f52231a710d Mon Sep 17 00:00:00 2001 From: Nick Cao Date: Sun, 26 May 2024 11:18:22 -0400 Subject: [PATCH 11/32] icewm: fix cross compilation, set strictDeps --- pkgs/by-name/ic/icewm/package.nix | 3 +++ 1 file changed, 3 insertions(+) diff --git a/pkgs/by-name/ic/icewm/package.nix b/pkgs/by-name/ic/icewm/package.nix index c4f7e28c7df7..e19e9490a0ed 100644 --- a/pkgs/by-name/ic/icewm/package.nix +++ b/pkgs/by-name/ic/icewm/package.nix @@ -49,10 +49,13 @@ stdenv.mkDerivation (finalAttrs: { hash = "sha256-n0p8i6v6QreCFiChngHnx+5K4Djj34/+dmIA+bj/0cU="; }; + strictDeps = true; + nativeBuildInputs = [ cmake perl pkg-config + gettext # msgmerge ]; buildInputs = [ From 4911cf572e870d89c02483992a266203b576e670 Mon Sep 17 00:00:00 2001 From: Gliczy <129636582+Gliczy@users.noreply.github.com> Date: Sun, 26 May 2024 17:36:34 +0200 Subject: [PATCH 12/32] mangohud: 0.7.1 -> 0.7.2 --- pkgs/tools/graphics/mangohud/default.nix | 14 ++++---------- .../graphics/mangohud/hardcode-dependencies.patch | 7 ++++--- 2 files changed, 8 insertions(+), 13 deletions(-) diff --git a/pkgs/tools/graphics/mangohud/default.nix b/pkgs/tools/graphics/mangohud/default.nix index fc0fc9930d78..bb14ef0f3702 100644 --- a/pkgs/tools/graphics/mangohud/default.nix +++ b/pkgs/tools/graphics/mangohud/default.nix @@ -4,7 +4,6 @@ , fetchFromGitHub , fetchurl , substituteAll -, fetchpatch , coreutils , curl , glxinfo @@ -34,6 +33,7 @@ , gamescopeSupport ? true # build mangoapp and mangohudctl , lowerBitnessSupport ? stdenv.hostPlatform.isx86_64 # Support 32 bit on 64bit , nix-update-script +, libxkbcommon }: let @@ -94,14 +94,14 @@ let in stdenv.mkDerivation (finalAttrs: { pname = "mangohud"; - version = "0.7.1"; + version = "0.7.2"; src = fetchFromGitHub { owner = "flightlessmango"; repo = "MangoHud"; rev = "refs/tags/v${finalAttrs.version}"; fetchSubmodules = true; - hash = "sha256-Gnq+1j+PFbeipAfXGnTq7wZdVQeG9R9vLAKZnZj7Bvs="; + hash = "sha256-cj/F/DWUDm2AHTJvHgkKa+KdIrfxPWLzI570Dp4VFhs="; }; outputs = [ "out" "doc" "man" ]; @@ -140,13 +140,6 @@ stdenv.mkDerivation (finalAttrs: { libdbus = dbus.lib; inherit hwdata; }) - - # Add dep_vulkan to mangoapp and test_amdgpu to fix build failure - # TODO: Remove in next release - (fetchpatch { - url = "https://github.com/flightlessmango/MangoHud/commit/cba217ffaf93aea6acb4e59e3e46bf912f740ccf.patch"; - hash = "sha256-1My4/EuSMpe3AFhhFOJr8rz/wnywp+BW+F4dSgxToe0="; - }) ]; postPatch = '' @@ -202,6 +195,7 @@ stdenv.mkDerivation (finalAttrs: { glew glfw xorg.libXrandr + libxkbcommon ]; doCheck = true; diff --git a/pkgs/tools/graphics/mangohud/hardcode-dependencies.patch b/pkgs/tools/graphics/mangohud/hardcode-dependencies.patch index 1c0f3a497fe6..4b7954a3ee5e 100644 --- a/pkgs/tools/graphics/mangohud/hardcode-dependencies.patch +++ b/pkgs/tools/graphics/mangohud/hardcode-dependencies.patch @@ -12,17 +12,18 @@ index 7379af1..4eef3fe 100644 return false; } diff --git a/src/logging.cpp b/src/logging.cpp -index ca33ee3..90d3638 100644 +index 7d4cb98..256128c 100644 --- a/src/logging.cpp +++ b/src/logging.cpp -@@ -26,7 +26,11 @@ string exec(string command) { +@@ -27,8 +27,12 @@ string exec(string command) { #endif std::array buffer; std::string result; + + char* originalPath = getenv("PATH"); + setenv("PATH", "@path@", 1); - std::unique_ptr pipe(popen(command.c_str(), "r"), pclose); + auto deleter = [](FILE* ptr){ pclose(ptr); }; + std::unique_ptr pipe(popen(command.c_str(), "r"), deleter); + setenv("PATH", originalPath, 1); if (!pipe) { return "popen failed!"; From 9247f579f154b450eab7afa9a010c10f197d29ee Mon Sep 17 00:00:00 2001 From: rembo10 Date: Sun, 26 May 2024 21:35:54 +0530 Subject: [PATCH 13/32] headphones: 0.6.1 -> 0.6.3 --- pkgs/servers/headphones/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/headphones/default.nix b/pkgs/servers/headphones/default.nix index 704268c24257..fa33d16961fe 100644 --- a/pkgs/servers/headphones/default.nix +++ b/pkgs/servers/headphones/default.nix @@ -2,14 +2,14 @@ python3.pkgs.buildPythonApplication rec { pname = "headphones"; - version = "0.6.1"; + version = "0.6.3"; format = "other"; src = fetchFromGitHub { owner = "rembo10"; repo = "headphones"; rev = "v${version}"; - sha256 = "1pj6xrcc6g336lb2knlc9l3qxgj3jaaymnbd7bmfjahgq5cp4d4v"; + sha256 = "195v0ylhqd49bqq3dpig5nh0kivmwgmn0977fknix9j14jpvmd3b"; }; dontBuild = true; From 089b208a7bce383713d5cf15186cf01a9533aef5 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 26 May 2024 23:31:32 +0000 Subject: [PATCH 14/32] vitess: 19.0.3 -> 19.0.4 --- pkgs/development/tools/database/vitess/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/tools/database/vitess/default.nix b/pkgs/development/tools/database/vitess/default.nix index 2d107cc56246..d0e2e5d7a0df 100644 --- a/pkgs/development/tools/database/vitess/default.nix +++ b/pkgs/development/tools/database/vitess/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "vitess"; - version = "19.0.3"; + version = "19.0.4"; src = fetchFromGitHub { owner = "vitessio"; repo = pname; rev = "v${version}"; - hash = "sha256-Zy54nZCnwyZ1JNPvaKi0/bRt5g5ucPANwer/3pl4dGU="; + hash = "sha256-rP2a/t+5FhGIj9T6CQodMp9YXYf3fL5oBdFpAn7e7hw="; }; - vendorHash = "sha256-QUzBxYEvxVzv4c8tKiFb+4NLy8RsXh0QTn9twfstMtw="; + vendorHash = "sha256-BlHd5GQJwdntmvVti+Jvfw65LrYM+hjwdvQ0duKk5d8="; buildInputs = [ sqlite ]; From 3dfc7246ccda0290c905d1a9f9d98b1364791651 Mon Sep 17 00:00:00 2001 From: Pablo Ovelleiro Corral Date: Mon, 27 May 2024 08:41:30 +0200 Subject: [PATCH 15/32] zk: 0.14.0 -> 0.14.1 --- pkgs/applications/office/zk/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/applications/office/zk/default.nix b/pkgs/applications/office/zk/default.nix index 6cdbb0d63af2..96429770662a 100644 --- a/pkgs/applications/office/zk/default.nix +++ b/pkgs/applications/office/zk/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "zk"; - version = "0.14.0"; + version = "0.14.1"; src = fetchFromGitHub { - owner = "mickael-menu"; + owner = "zk-org"; repo = "zk"; rev = "v${version}"; - sha256 = "sha256-c0Grk5Bs9MOzuvWYbp+Y6cHouljUWoM3i7vFmQRFR18="; + sha256 = "sha256-PbF2k7b03Oo3fIWIN4BHUZJ625HUeX+htT9FTINowIs="; }; - vendorHash = "sha256-23m0fHYJl3X2uHCFnMYID9umTjZvGFoOKTtRrerlWKg="; + vendorHash = "sha256-UZsJa5hmMQwe9lhrp4ey8GGTkWUF8xJW+LPWMR0qfoo="; doCheck = false; From 072363fc3e404a3760f8a7e925b063a58f349046 Mon Sep 17 00:00:00 2001 From: isabel Date: Sat, 25 May 2024 09:18:45 +0100 Subject: [PATCH 16/32] gh-eco: added fetchpatch; modernize --- pkgs/by-name/gh/gh-eco/package.nix | 45 ++++++++++++++++++++++++++++++ pkgs/tools/misc/gh-eco/default.nix | 33 ---------------------- pkgs/top-level/all-packages.nix | 2 -- 3 files changed, 45 insertions(+), 35 deletions(-) create mode 100644 pkgs/by-name/gh/gh-eco/package.nix delete mode 100644 pkgs/tools/misc/gh-eco/default.nix diff --git a/pkgs/by-name/gh/gh-eco/package.nix b/pkgs/by-name/gh/gh-eco/package.nix new file mode 100644 index 000000000000..002362001848 --- /dev/null +++ b/pkgs/by-name/gh/gh-eco/package.nix @@ -0,0 +1,45 @@ +{ + lib, + fetchFromGitHub, + buildGoModule, + fetchpatch, +}: +let + version = "0.1.3"; +in +buildGoModule { + pname = "gh-eco"; + inherit version; + + src = fetchFromGitHub { + owner = "jrnxf"; + repo = "gh-eco"; + rev = "refs/tags/v${version}"; + hash = "sha256-TE1AymNlxjUtkBnBO/VBjYaqLuRyxL75s6sMidKUXTE="; + }; + + patches = [ + # Fix package breaking on runtime by updating deps + (fetchpatch { + name = "update-deps.patch"; + url = "https://github.com/jrnxf/gh-eco/commit/d45b1e7de8cbcb692def0e94111262cdeff2835d.patch"; + hash = "sha256-vW5YX6C552dVYjBkYVoDbzT2PP8CaZzxh5g1TKHjrbU="; + }) + ]; + + vendorHash = "sha256-O3FQ+Z3KVYgTafwVXUhrGRuOAWlWlOhtVegKVoZBnDE="; + + ldflags = [ + "-s" + "-w" + "-X main.Version=${version}" + ]; + + meta = { + homepage = "https://github.com/coloradocolby/gh-eco"; + description = "gh extension to explore the ecosystem"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ helium ]; + mainProgram = "gh-eco"; + }; +} diff --git a/pkgs/tools/misc/gh-eco/default.nix b/pkgs/tools/misc/gh-eco/default.nix deleted file mode 100644 index 329ef60c1b4e..000000000000 --- a/pkgs/tools/misc/gh-eco/default.nix +++ /dev/null @@ -1,33 +0,0 @@ -{ lib -, fetchFromGitHub -, buildGoModule -}: - -buildGoModule rec { - pname = "gh-eco"; - version = "0.1.3"; - - src = fetchFromGitHub { - owner = "coloradocolby"; - repo = "gh-eco"; - rev = "v${version}"; - sha256 = "sha256-TE1AymNlxjUtkBnBO/VBjYaqLuRyxL75s6sMidKUXTE="; - }; - - vendorHash = "sha256-K85fYV1uP/qSw8GPoG1u6UQo94vQOUo4cd9Ro+UApQ0="; - - ldflags = [ - "-s" - "-w" - "-X main.Version=${version}" - ]; - - meta = with lib; { - homepage = "https://github.com/coloradocolby/gh-eco"; - description = "gh extension to explore the ecosystem"; - license = licenses.mit; - maintainers = with maintainers; [ helium ]; - mainProgram = "gh-eco"; - }; -} - diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index e23cbe0da825..8121e17d6220 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -1821,8 +1821,6 @@ with pkgs; gh-dash = callPackage ../tools/misc/gh-dash { }; - gh-eco = callPackage ../tools/misc/gh-eco { }; - gh-markdown-preview = callPackage ../tools/misc/gh-markdown-preview { }; ghostie = callPackage ../tools/misc/ghostie { }; From 01dd67c4182046a5c2cef27decf3d976c0535cbe Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 27 May 2024 13:19:44 +0000 Subject: [PATCH 17/32] argo: 3.5.6 -> 3.5.7 --- pkgs/applications/networking/cluster/argo/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/networking/cluster/argo/default.nix b/pkgs/applications/networking/cluster/argo/default.nix index 52012a361709..e66bfb0a9a10 100644 --- a/pkgs/applications/networking/cluster/argo/default.nix +++ b/pkgs/applications/networking/cluster/argo/default.nix @@ -34,16 +34,16 @@ let in buildGoModule rec { pname = "argo"; - version = "3.5.6"; + version = "3.5.7"; src = fetchFromGitHub { owner = "argoproj"; repo = "argo"; rev = "refs/tags/v${version}"; - hash = "sha256-CcPY9eEpvDTIxilxHI+VBVVRxZy/82fi6uayBrGR/Dc="; + hash = "sha256-OJkC+uqOuXA6NBpVxmQAFs+N99d4Zonh9dcZnuB26Ts="; }; - vendorHash = "sha256-ttpDGeANQyrTfRyNGFkmJFpE+nnjz8PZN+0HScBJ1yg="; + vendorHash = "sha256-O7Lv5RLcqB4JbdXHKXFWkg/dvids8QH619urpeACuN8="; doCheck = false; From b162fe816786b2ba545515d6390091b6fbe0a8d2 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 27 May 2024 13:20:07 +0000 Subject: [PATCH 18/32] ast-grep: 0.22.3 -> 0.22.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 4e001f3445a6..b62c88d05a59 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.22.3"; + version = "0.22.4"; src = fetchFromGitHub { owner = "ast-grep"; repo = "ast-grep"; rev = version; - hash = "sha256-Q2xVB9GZBtXx67rKpeTpy1llXCBpgn9vdZmYkQVHtp8="; + hash = "sha256-AzwwOJ2SS+5wM/+357mXg+QMwXVPToKiTaFP+LZXP+U="; }; - cargoHash = "sha256-0N98WvNLlflNCu7I2nHDSgFHDmbMVqwu4YkqA9GNSwM="; + cargoHash = "sha256-fyEncz5eVe8OPNQO4TJQXBMfOcybesoBBNRv3T1EooU="; nativeBuildInputs = [ installShellFiles ]; From 1316128d5d26429ab0c75d429c72261c981de110 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 27 May 2024 14:34:07 +0000 Subject: [PATCH 19/32] jan: 0.4.13 -> 0.4.14 --- 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 af4fc834ea16..faa0c19d4ae5 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.13"; + version = "0.4.14"; src = fetchurl { url = "https://github.com/janhq/jan/releases/download/v${version}/jan-linux-x86_64-${version}.AppImage"; - hash = "sha256-6RjpkIMYScgJ2xTS7b2w90ixEm4ZHw8Izecjho93sRE="; + hash = "sha256-nqTvLZ0upNI82R4QaHTKaGQLVC3eHMVEHoOZ4JvXR1E="; }; appimageContents = appimageTools.extractType2 { inherit pname version src; }; From 834946b941694c2284704c95b6aa7bac5674453c Mon Sep 17 00:00:00 2001 From: Nick Cao Date: Mon, 27 May 2024 10:38:06 -0400 Subject: [PATCH 20/32] telegram-desktop: add missing glib-networking dependency --- .../instant-messengers/telegram/telegram-desktop/default.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/applications/networking/instant-messengers/telegram/telegram-desktop/default.nix b/pkgs/applications/networking/instant-messengers/telegram/telegram-desktop/default.nix index c478d24a6c8f..935e11103b82 100644 --- a/pkgs/applications/networking/instant-messengers/telegram/telegram-desktop/default.nix +++ b/pkgs/applications/networking/instant-messengers/telegram/telegram-desktop/default.nix @@ -15,6 +15,7 @@ , qtsvg , qtimageformats , gtk3 +, glib-networking , boost , fmt , libdbusmenu @@ -137,6 +138,7 @@ stdenv.mkDerivation rec { ] ++ lib.optionals stdenv.isLinux [ qtwayland gtk3 + glib-networking fmt libdbusmenu alsa-lib From b6085a260b1f25847529c3024e6feb889795e426 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 27 May 2024 15:50:37 +0000 Subject: [PATCH 21/32] shopware-cli: 0.4.43 -> 0.4.44 --- pkgs/by-name/sh/shopware-cli/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/sh/shopware-cli/package.nix b/pkgs/by-name/sh/shopware-cli/package.nix index 899b956b50a6..0362ee92ed06 100644 --- a/pkgs/by-name/sh/shopware-cli/package.nix +++ b/pkgs/by-name/sh/shopware-cli/package.nix @@ -9,18 +9,18 @@ buildGoModule rec { pname = "shopware-cli"; - version = "0.4.43"; + version = "0.4.44"; src = fetchFromGitHub { repo = "shopware-cli"; owner = "FriendsOfShopware"; rev = version; - hash = "sha256-c8CaPxV54bF4Unlz15SIh64jiGZMZywcKOzdZ74AtaM="; + hash = "sha256-i9FRt86kd2bUW5fyn/qRRSzXRSqUHTGlxOnzehEfnxU="; }; nativeBuildInputs = [ installShellFiles makeWrapper ]; nativeCheckInputs = [ git dart-sass ]; - vendorHash = "sha256-7K56fBX4y2UPofksAl6+u7jBg5tySvtrutUJXDJ/qz4="; + vendorHash = "sha256-j1zKugueG4QaCetwfZXnWqo5SciX2N/dr0VD4d0ITS4="; postInstall = '' export HOME="$(mktemp -d)" From ff577476778c27aa2a2ef19ee907e91426ca89ba Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 27 May 2024 15:59:43 +0000 Subject: [PATCH 22/32] uv: 0.2.3 -> 0.2.4 --- pkgs/by-name/uv/uv/Cargo.lock | 5 ++--- pkgs/by-name/uv/uv/package.nix | 4 ++-- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/pkgs/by-name/uv/uv/Cargo.lock b/pkgs/by-name/uv/uv/Cargo.lock index 14ac3d02a94d..a7b1c73e7ea4 100644 --- a/pkgs/by-name/uv/uv/Cargo.lock +++ b/pkgs/by-name/uv/uv/Cargo.lock @@ -4471,7 +4471,7 @@ checksum = "a183cf7feeba97b4dd1c0d46788634f6221d87fa961b305bed08c851829efcc0" [[package]] name = "uv" -version = "0.2.3" +version = "0.2.4" dependencies = [ "anstream", "anyhow", @@ -4496,7 +4496,6 @@ dependencies = [ "miette", "mimalloc", "owo-colors", - "pep440_rs", "pep508_rs", "platform-tags", "predicates", @@ -5057,7 +5056,7 @@ dependencies = [ [[package]] name = "uv-version" -version = "0.2.3" +version = "0.2.4" [[package]] name = "uv-virtualenv" diff --git a/pkgs/by-name/uv/uv/package.nix b/pkgs/by-name/uv/uv/package.nix index 1e1d4fc10065..0650e2c2551b 100644 --- a/pkgs/by-name/uv/uv/package.nix +++ b/pkgs/by-name/uv/uv/package.nix @@ -16,14 +16,14 @@ python3Packages.buildPythonApplication rec { pname = "uv"; - version = "0.2.3"; + version = "0.2.4"; pyproject = true; src = fetchFromGitHub { owner = "astral-sh"; repo = "uv"; rev = "refs/tags/${version}"; - hash = "sha256-NwIjuOsf6tv+kVEXA2GvQkVwDznZs5fnnkzcnVoOGpY="; + hash = "sha256-x0uFBHfH+RXMS67y7NdikqNzXrNVv40HGVV6TVqR5NY="; }; cargoDeps = rustPlatform.importCargoLock { From 8259c8bd4d201d82a86fd008e7a15eff2dd972e6 Mon Sep 17 00:00:00 2001 From: Ludovico Piero Date: Mon, 27 May 2024 11:36:29 +0900 Subject: [PATCH 23/32] samrewritten: change platforms to only x86_64-linux Signed-off-by: Ludovico Piero --- pkgs/by-name/sa/samrewritten/package.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/by-name/sa/samrewritten/package.nix b/pkgs/by-name/sa/samrewritten/package.nix index 1cbaf4b79db8..375e3be3385a 100644 --- a/pkgs/by-name/sa/samrewritten/package.nix +++ b/pkgs/by-name/sa/samrewritten/package.nix @@ -43,6 +43,6 @@ stdenv.mkDerivation (finalAttrs: { homepage = "https://github.com/PaulCombal/SamRewritten"; license = lib.licenses.gpl3Plus; maintainers = with lib.maintainers; [ ludovicopiero ]; - platforms = lib.platforms.linux; + platforms = [ "x86_64-linux" ]; }; }) From be54df3cf51be53332ed4421afaede155879d517 Mon Sep 17 00:00:00 2001 From: Ana Hobden Date: Mon, 27 May 2024 09:34:02 -0700 Subject: [PATCH 24/32] Remove Hoverbear from Determinate Systems team --- maintainers/team-list.nix | 1 - 1 file changed, 1 deletion(-) diff --git a/maintainers/team-list.nix b/maintainers/team-list.nix index b2539cf31c82..61c3d7873411 100644 --- a/maintainers/team-list.nix +++ b/maintainers/team-list.nix @@ -236,7 +236,6 @@ with lib.maintainers; { members = [ cole-h grahamc - hoverbear ]; scope = "Group registration for packages maintained by Determinate Systems."; shortName = "Determinate Systems employees"; From 471ad4440231f511e62dbd39eabdb68c5de8120b Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 27 May 2024 17:52:42 +0000 Subject: [PATCH 25/32] python311Packages.oslo-log: 5.5.1 -> 6.0.0 --- pkgs/development/python-modules/oslo-log/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/oslo-log/default.nix b/pkgs/development/python-modules/oslo-log/default.nix index 9f18906cb875..882131c7c60b 100644 --- a/pkgs/development/python-modules/oslo-log/default.nix +++ b/pkgs/development/python-modules/oslo-log/default.nix @@ -18,7 +18,7 @@ buildPythonPackage rec { pname = "oslo-log"; - version = "5.5.1"; + version = "6.0.0"; format = "setuptools"; disabled = pythonOlder "3.8"; @@ -26,7 +26,7 @@ buildPythonPackage rec { src = fetchPypi { pname = "oslo.log"; inherit version; - hash = "sha256-SEFIUSxdsqizXIPNmX6ZU3Vf2L+oqvbuDMjHrrdCkhA="; + hash = "sha256-ifDW+iy6goH4m1CKf+Sb+5far1XFJ4GH1FowaZceaH8="; }; propagatedBuildInputs = [ From e6aa3cace22a2ea064179f2af3975a0df84b52f7 Mon Sep 17 00:00:00 2001 From: Gaetan Lepage Date: Mon, 27 May 2024 20:25:45 +0200 Subject: [PATCH 26/32] typstyle: 0.11.23 -> 0.11.24 Diff: https://github.com/Enter-tainer/typstyle/compare/refs/tags/v0.11.23...v0.11.24 Changelog: https://github.com/Enter-tainer/typstyle/blob/refs/tags/v0.11.24/CHANGELOG.md --- pkgs/by-name/ty/typstyle/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/ty/typstyle/package.nix b/pkgs/by-name/ty/typstyle/package.nix index 0a92f4db41b4..f308dc0bff72 100644 --- a/pkgs/by-name/ty/typstyle/package.nix +++ b/pkgs/by-name/ty/typstyle/package.nix @@ -10,16 +10,16 @@ rustPlatform.buildRustPackage rec { pname = "typstyle"; - version = "0.11.23"; + version = "0.11.24"; src = fetchFromGitHub { owner = "Enter-tainer"; repo = "typstyle"; rev = "refs/tags/v${version}"; - hash = "sha256-42wpXEQdvVgN4aIXUp/t1jnPxqOW9ChxD0YB07PGE5o="; + hash = "sha256-FLvbY+0TozOWZ+JTX//psNjle5GxcyeZXzMOf4/s1v0="; }; - cargoHash = "sha256-Zp094Hs3850foQ1oGz56qEHY1dDIkXS+iDC7hJlOET0="; + cargoHash = "sha256-VA2WNheQltgCaWwtpbEAn2qtlA0fTeEbCjvgkjF+nvw="; nativeBuildInputs = [ pkg-config From 1d2d14cc1fdf36b7741b2c0ec6dbac36dd764041 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Mon, 27 May 2024 20:32:04 +0200 Subject: [PATCH 27/32] discourse: update plugins --- .../plugins/discourse-assign/default.nix | 4 +- .../discourse-bbcode-color/default.nix | 4 +- .../plugins/discourse-calendar/Gemfile.lock | 20 ++++-- .../plugins/discourse-calendar/default.nix | 4 +- .../plugins/discourse-calendar/gemset.nix | 68 ++++++++++++++++--- .../discourse-chat-integration/default.nix | 4 +- .../plugins/discourse-checklist/default.nix | 4 +- .../discourse-data-explorer/default.nix | 4 +- .../plugins/discourse-docs/default.nix | 4 +- .../plugins/discourse-github/Gemfile.lock | 18 ++--- .../plugins/discourse-github/default.nix | 4 +- .../plugins/discourse-github/gemset.nix | 50 ++++++++------ .../plugins/discourse-math/default.nix | 4 +- .../plugins/discourse-migratepassword/Gemfile | 2 +- .../discourse-migratepassword/Gemfile.lock | 8 +-- .../discourse-migratepassword/default.nix | 4 +- .../discourse-migratepassword/gemset.nix | 8 +-- .../discourse-openid-connect/default.nix | 4 +- .../plugins/discourse-prometheus/Gemfile.lock | 2 +- .../plugins/discourse-prometheus/default.nix | 4 +- .../plugins/discourse-reactions/default.nix | 4 +- .../discourse-saved-searches/default.nix | 4 +- .../plugins/discourse-solved/default.nix | 4 +- .../discourse-spoiler-alert/default.nix | 4 +- .../plugins/discourse-voting/default.nix | 4 +- .../discourse-yearly-review/default.nix | 4 +- 26 files changed, 161 insertions(+), 87 deletions(-) diff --git a/pkgs/servers/web-apps/discourse/plugins/discourse-assign/default.nix b/pkgs/servers/web-apps/discourse/plugins/discourse-assign/default.nix index 68cd69dcc3a6..ff7df0dfc70e 100644 --- a/pkgs/servers/web-apps/discourse/plugins/discourse-assign/default.nix +++ b/pkgs/servers/web-apps/discourse/plugins/discourse-assign/default.nix @@ -5,8 +5,8 @@ mkDiscoursePlugin { src = fetchFromGitHub { owner = "discourse"; repo = "discourse-assign"; - rev = "0cbf10b8055370445bd36536e51986bf48bdc57e"; - sha256 = "sha256-7rJ2zQo1nCHwtVuLJUmdj66Ky2bi4Cpo+22H3DbO1uo="; + rev = "b796ae3fcc89b48cf777de5ee3a4c21aada9271e"; + sha256 = "sha256-PnSD2ZuUVjH8TifHuzbkpmpfGSN/q4VWyJtkOPND44o="; }; meta = with lib; { homepage = "https://github.com/discourse/discourse-docs"; diff --git a/pkgs/servers/web-apps/discourse/plugins/discourse-bbcode-color/default.nix b/pkgs/servers/web-apps/discourse/plugins/discourse-bbcode-color/default.nix index 266c43e4f8e2..06bb5b659d7e 100644 --- a/pkgs/servers/web-apps/discourse/plugins/discourse-bbcode-color/default.nix +++ b/pkgs/servers/web-apps/discourse/plugins/discourse-bbcode-color/default.nix @@ -5,8 +5,8 @@ mkDiscoursePlugin { src = fetchFromGitHub { owner = "discourse"; repo = "discourse-bbcode-color"; - rev = "35aab2e9b92f8b01633d374ea999e7fd59d020d7"; - sha256 = "sha256-DHckx921EeQysm1UPloCrt43BJetTnZKnTbJGk15NMs="; + rev = "3336efe231e6c02e1dbe11ada71296af258cff58"; + sha256 = "sha256-C2PPF8kJm0agcYcRSUUBmmxZJliPatPM1vRtjufEd4M="; }; meta = with lib; { homepage = "https://github.com/discourse/discourse-bbcode-color"; diff --git a/pkgs/servers/web-apps/discourse/plugins/discourse-calendar/Gemfile.lock b/pkgs/servers/web-apps/discourse/plugins/discourse-calendar/Gemfile.lock index 183ead8d51d4..15aafaf94c9c 100644 --- a/pkgs/servers/web-apps/discourse/plugins/discourse-calendar/Gemfile.lock +++ b/pkgs/servers/web-apps/discourse/plugins/discourse-calendar/Gemfile.lock @@ -1,15 +1,25 @@ GEM remote: https://rubygems.org/ specs: - activesupport (7.0.8) + activesupport (7.1.3.3) + base64 + bigdecimal concurrent-ruby (~> 1.0, >= 1.0.2) + connection_pool (>= 2.2.5) + drb i18n (>= 1.6, < 2) minitest (>= 5.1) + mutex_m tzinfo (~> 2.0) - concurrent-ruby (1.2.2) - i18n (1.14.1) + base64 (0.2.0) + bigdecimal (3.1.8) + concurrent-ruby (1.2.3) + connection_pool (2.4.1) + drb (2.2.1) + i18n (1.14.5) concurrent-ruby (~> 1.0) - minitest (5.20.0) + minitest (5.23.1) + mutex_m (0.2.0) rrule (0.4.4) activesupport (>= 2.3) tzinfo (2.0.6) @@ -22,4 +32,4 @@ DEPENDENCIES rrule (= 0.4.4) BUNDLED WITH - 2.4.13 + 2.5.9 diff --git a/pkgs/servers/web-apps/discourse/plugins/discourse-calendar/default.nix b/pkgs/servers/web-apps/discourse/plugins/discourse-calendar/default.nix index 7a6bd7f69270..235f5f717755 100644 --- a/pkgs/servers/web-apps/discourse/plugins/discourse-calendar/default.nix +++ b/pkgs/servers/web-apps/discourse/plugins/discourse-calendar/default.nix @@ -6,8 +6,8 @@ mkDiscoursePlugin { src = fetchFromGitHub { owner = "discourse"; repo = "discourse-calendar"; - rev = "afc2ee684de41601d6cecc46713d139760f176a6"; - sha256 = "sha256-rTQWO+E/Jg4zjZDYDvBrDQsox5q4dHkdQjwnJxgv3dI="; + rev = "455eeed541a9b5cacf627349e543028427178a44"; + sha256 = "sha256-RXjMpeqCvAvwNsHpc3Fyms4pRXXqvarU8hWo3o1VgXY="; }; meta = with lib; { homepage = "https://github.com/discourse/discourse-calendar"; diff --git a/pkgs/servers/web-apps/discourse/plugins/discourse-calendar/gemset.nix b/pkgs/servers/web-apps/discourse/plugins/discourse-calendar/gemset.nix index 2e9b15ee5b9e..51922b163d4b 100644 --- a/pkgs/servers/web-apps/discourse/plugins/discourse-calendar/gemset.nix +++ b/pkgs/servers/web-apps/discourse/plugins/discourse-calendar/gemset.nix @@ -1,24 +1,64 @@ { activesupport = { - dependencies = ["concurrent-ruby" "i18n" "minitest" "tzinfo"]; + dependencies = ["base64" "bigdecimal" "concurrent-ruby" "connection_pool" "drb" "i18n" "minitest" "mutex_m" "tzinfo"]; groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "188kbwkn1lbhz40ala8ykp20jzqphgc68g3d8flin8cqa2xid0s5"; + sha256 = "0z8kygxmz99krz9pwp947znkzf0jr64sml28df0vf1gzxlg7y57i"; type = "gem"; }; - version = "7.0.8"; + version = "7.1.3.3"; + }; + base64 = { + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "01qml0yilb9basf7is2614skjp8384h2pycfx86cr8023arfj98g"; + type = "gem"; + }; + version = "0.2.0"; + }; + bigdecimal = { + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1gi7zqgmqwi5lizggs1jhc3zlwaqayy9rx2ah80sxy24bbnng558"; + type = "gem"; + }; + version = "3.1.8"; }; concurrent-ruby = { groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0krcwb6mn0iklajwngwsg850nk8k9b35dhmc2qkbdqvmifdi2y9q"; + sha256 = "1qh1b14jwbbj242klkyz5fc7npd4j0mvndz62gajhvl1l3wd7zc2"; type = "gem"; }; - version = "1.2.2"; + version = "1.2.3"; + }; + connection_pool = { + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1x32mcpm2cl5492kd6lbjbaf17qsssmpx9kdyr7z1wcif2cwyh0g"; + type = "gem"; + }; + version = "2.4.1"; + }; + drb = { + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0h5kbj9hvg5hb3c7l425zpds0vb42phvln2knab8nmazg2zp5m79"; + type = "gem"; + }; + version = "2.2.1"; }; i18n = { dependencies = ["concurrent-ruby"]; @@ -26,20 +66,30 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0qaamqsh5f3szhcakkak8ikxlzxqnv49n2p7504hcz2l0f4nj0wx"; + sha256 = "1ffix518y7976qih9k1lgnc17i3v6yrlh0a3mckpxdb4wc2vrp16"; type = "gem"; }; - version = "1.14.1"; + version = "1.14.5"; }; minitest = { groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0bkmfi9mb49m0fkdhl2g38i3xxa02d411gg0m8x0gvbwfmmg5ym3"; + sha256 = "1gkslxvkhh44s21rbjvka3zsvfxxrf5pcl6f75rv2vyrzzbgis7i"; type = "gem"; }; - version = "5.20.0"; + version = "5.23.1"; + }; + mutex_m = { + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1ma093ayps1m92q845hmpk0dmadicvifkbf05rpq9pifhin0rvxn"; + type = "gem"; + }; + version = "0.2.0"; }; rrule = { dependencies = ["activesupport"]; diff --git a/pkgs/servers/web-apps/discourse/plugins/discourse-chat-integration/default.nix b/pkgs/servers/web-apps/discourse/plugins/discourse-chat-integration/default.nix index 499d2e6447bd..701b5479ce1d 100644 --- a/pkgs/servers/web-apps/discourse/plugins/discourse-chat-integration/default.nix +++ b/pkgs/servers/web-apps/discourse/plugins/discourse-chat-integration/default.nix @@ -5,8 +5,8 @@ mkDiscoursePlugin { src = fetchFromGitHub { owner = "discourse"; repo = "discourse-chat-integration"; - rev = "70fea6b66b68868aa4c00b45a169436deaa142a8"; - sha256 = "sha256-K9MmP1F0B6Na2dTqgnsjMbTQFkF+nNKkI8aF3zPAodc="; + rev = "2e17b03e9a435de0079ae1c2eed1b48a11ad16a9"; + sha256 = "sha256-FOIQrpVFHak2PB8eNFv/oJwYiESJcHBqeC+MZMXnexo="; }; meta = with lib; { homepage = "https://github.com/discourse/discourse-chat-integration"; diff --git a/pkgs/servers/web-apps/discourse/plugins/discourse-checklist/default.nix b/pkgs/servers/web-apps/discourse/plugins/discourse-checklist/default.nix index f3fdd5459432..ab7ee28a7f64 100644 --- a/pkgs/servers/web-apps/discourse/plugins/discourse-checklist/default.nix +++ b/pkgs/servers/web-apps/discourse/plugins/discourse-checklist/default.nix @@ -5,8 +5,8 @@ mkDiscoursePlugin { src = fetchFromGitHub { owner = "discourse"; repo = "discourse-checklist"; - rev = "d94e58c3060ee7ca0fe76339215ed9456d5f4ea4"; - sha256 = "sha256-zTMkU8NRqxLQ3/ghYTmEhRqbCgdYsYaImHdGu7WwuFk="; + rev = "6fcf9fed5c3ae3baf9ddd1cca9cef4dc089996c1"; + sha256 = "sha256-RIuoqZo7dW1DXbfbWhyyhCOGe4R5sLerzFW2TT0zO6U="; }; meta = with lib; { homepage = "https://github.com/discourse/discourse-checklist"; diff --git a/pkgs/servers/web-apps/discourse/plugins/discourse-data-explorer/default.nix b/pkgs/servers/web-apps/discourse/plugins/discourse-data-explorer/default.nix index 39320637ddcd..bb21a6bdb4f6 100644 --- a/pkgs/servers/web-apps/discourse/plugins/discourse-data-explorer/default.nix +++ b/pkgs/servers/web-apps/discourse/plugins/discourse-data-explorer/default.nix @@ -5,8 +5,8 @@ mkDiscoursePlugin { src = fetchFromGitHub { owner = "discourse"; repo = "discourse-data-explorer"; - rev = "e4f8d3924a18b303c2bb7da9472cf0c060060e4e"; - sha256 = "sha256-K+GPszO3je6NmnhIRSqSEhylUK5oEByaS0bLfAGjvB4="; + rev = "ebe71a7a138c856d88737eb11b5096a42d4fbaf3"; + sha256 = "sha256-3CdA4liSrPhucOGevEbKuIYETlXpAn9qtsG0+Tr67EQ="; }; meta = with lib; { homepage = "https://github.com/discourse/discourse-data-explorer"; diff --git a/pkgs/servers/web-apps/discourse/plugins/discourse-docs/default.nix b/pkgs/servers/web-apps/discourse/plugins/discourse-docs/default.nix index 3dcd2b86a969..ee3910b8e0ab 100644 --- a/pkgs/servers/web-apps/discourse/plugins/discourse-docs/default.nix +++ b/pkgs/servers/web-apps/discourse/plugins/discourse-docs/default.nix @@ -5,8 +5,8 @@ mkDiscoursePlugin { src = fetchFromGitHub { owner = "discourse"; repo = "discourse-docs"; - rev = "a4b203274b88c5277d0b5b936de0bc0e0016726c"; - sha256 = "sha256-R+VP/gsb2Oa6lPVMhRoGZzOBx5C7kRSxqwYpWE10GHw="; + rev = "94c7b7da216c66d773f800a714493f087affaac9"; + sha256 = "sha256-4ZPv42fw5YdJ3+QUGOh5CJMWkXoUVs4bTVd9zuFekQM="; }; meta = with lib; { homepage = "https://github.com/discourse/discourse-docs"; diff --git a/pkgs/servers/web-apps/discourse/plugins/discourse-github/Gemfile.lock b/pkgs/servers/web-apps/discourse/plugins/discourse-github/Gemfile.lock index 3640cbc601da..87fbcc8f726b 100644 --- a/pkgs/servers/web-apps/discourse/plugins/discourse-github/Gemfile.lock +++ b/pkgs/servers/web-apps/discourse/plugins/discourse-github/Gemfile.lock @@ -1,20 +1,22 @@ GEM remote: https://rubygems.org/ specs: - addressable (2.8.5) + addressable (2.8.6) public_suffix (>= 2.0.2, < 6.0) - faraday (2.7.10) - faraday-net_http (>= 2.0, < 3.1) - ruby2_keywords (>= 0.0.4) - faraday-net_http (3.0.2) + faraday (2.9.0) + faraday-net_http (>= 2.0, < 3.2) + faraday-net_http (3.1.0) + net-http + net-http (0.4.1) + uri octokit (5.6.1) faraday (>= 1, < 3) sawyer (~> 0.9) - public_suffix (5.0.3) - ruby2_keywords (0.0.5) + public_suffix (5.0.5) sawyer (0.9.2) addressable (>= 2.3.5) faraday (>= 0.17.3, < 3) + uri (0.13.0) PLATFORMS ruby @@ -24,4 +26,4 @@ DEPENDENCIES sawyer (= 0.9.2) BUNDLED WITH - 2.4.13 + 2.5.9 diff --git a/pkgs/servers/web-apps/discourse/plugins/discourse-github/default.nix b/pkgs/servers/web-apps/discourse/plugins/discourse-github/default.nix index 50a59136ecf5..c47454aad43c 100644 --- a/pkgs/servers/web-apps/discourse/plugins/discourse-github/default.nix +++ b/pkgs/servers/web-apps/discourse/plugins/discourse-github/default.nix @@ -6,8 +6,8 @@ mkDiscoursePlugin { src = fetchFromGitHub { owner = "discourse"; repo = "discourse-github"; - rev = "8aa068d56ef010cecaabd50657e7753f4bbecc1f"; - sha256 = "sha256-WzljuGvv6pki3ROkvhXZWQaq5D9JkCbWjdlkdRI8lHE="; + rev = "53e22ccbd32dd868435f66efa2d48e0389673dea"; + sha256 = "sha256-QaKmnftCxkgGUP5U9wNYm483D+GdpcU8F96CLl8woo8="; }; meta = with lib; { homepage = "https://github.com/discourse/discourse-github"; diff --git a/pkgs/servers/web-apps/discourse/plugins/discourse-github/gemset.nix b/pkgs/servers/web-apps/discourse/plugins/discourse-github/gemset.nix index 87599999d894..73552eb610ee 100644 --- a/pkgs/servers/web-apps/discourse/plugins/discourse-github/gemset.nix +++ b/pkgs/servers/web-apps/discourse/plugins/discourse-github/gemset.nix @@ -5,31 +5,43 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "05r1fwy487klqkya7vzia8hnklcxy4vr92m9dmni3prfwk6zpw33"; + sha256 = "0irbdwkkjwzajq1ip6ba46q49sxnrl2cw7ddkdhsfhb6aprnm3vr"; type = "gem"; }; - version = "2.8.5"; + version = "2.8.6"; }; faraday = { - dependencies = ["faraday-net_http" "ruby2_keywords"]; + dependencies = ["faraday-net_http"]; groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "187clqhp9mv5mnqmjlfdp57svhsg1bggz84ak8v333j9skrnrgh9"; + sha256 = "1qqb1rmk0f9m82iijjlqadh5yby1bhnr6svjk9vxdvh6f181988s"; type = "gem"; }; - version = "2.7.10"; + version = "2.9.0"; }; faraday-net_http = { + dependencies = ["net-http"]; groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "13byv3mp1gsjyv8k0ih4612y6vw5kqva6i03wcg4w2fqpsd950k8"; + sha256 = "17w51yk4rrm9rpnbc3x509s619kba0jga3qrj4b17l30950vw9qn"; type = "gem"; }; - version = "3.0.2"; + version = "3.1.0"; + }; + net-http = { + dependencies = ["uri"]; + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "10n2n9aq00ih8v881af88l1zyrqgs5cl3njdw8argjwbl5ggqvm9"; + type = "gem"; + }; + version = "0.4.1"; }; octokit = { dependencies = ["faraday" "sawyer"]; @@ -47,20 +59,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0n9j7mczl15r3kwqrah09cxj8hxdfawiqxa60kga2bmxl9flfz9k"; + sha256 = "14y4vzjwf5gp0mqgs880kis0k7n2biq8i6ci6q2n315kichl1hvj"; type = "gem"; }; - version = "5.0.3"; - }; - ruby2_keywords = { - groups = ["default"]; - platforms = []; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "1vz322p8n39hz3b4a9gkmz9y7a5jaz41zrm2ywf31dvkqm03glgz"; - type = "gem"; - }; - version = "0.0.5"; + version = "5.0.5"; }; sawyer = { dependencies = ["addressable" "faraday"]; @@ -73,4 +75,14 @@ }; version = "0.9.2"; }; + uri = { + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "094gk72ckazf495qc76gk09b5i318d5l9m7bicg2wxlrjcm3qm96"; + type = "gem"; + }; + version = "0.13.0"; + }; } diff --git a/pkgs/servers/web-apps/discourse/plugins/discourse-math/default.nix b/pkgs/servers/web-apps/discourse/plugins/discourse-math/default.nix index 3a07b4bfd342..90fd6927ac94 100644 --- a/pkgs/servers/web-apps/discourse/plugins/discourse-math/default.nix +++ b/pkgs/servers/web-apps/discourse/plugins/discourse-math/default.nix @@ -5,8 +5,8 @@ mkDiscoursePlugin { src = fetchFromGitHub { owner = "discourse"; repo = "discourse-math"; - rev = "529ad1fe6da924da378a60bec48c35657bb01a68"; - sha256 = "sha256-zhtAy0tTVMzQfPilTwfyyzxgCJD4xazOITBuliFR5Gg="; + rev = "2984713f68044544129b3575b9e2f9be31105293"; + sha256 = "sha256-3jxSwjKGyKQy+ed6S2tQ27jseB9NygeiYvaldgV1XW4="; }; meta = with lib; { homepage = "https://github.com/discourse/discourse-math"; diff --git a/pkgs/servers/web-apps/discourse/plugins/discourse-migratepassword/Gemfile b/pkgs/servers/web-apps/discourse/plugins/discourse-migratepassword/Gemfile index 59c64586dc17..d2a2d943c408 100644 --- a/pkgs/servers/web-apps/discourse/plugins/discourse-migratepassword/Gemfile +++ b/pkgs/servers/web-apps/discourse/plugins/discourse-migratepassword/Gemfile @@ -5,6 +5,6 @@ source "https://rubygems.org" # gem "rails" gem 'bcrypt', '3.1.13' gem 'unix-crypt', '1.3.0' -gem 'ffi', '1.15.5', require: false +gem 'ffi', '1.16.3', require: false gem 'ffi-compiler', '1.0.1', require: false gem 'argon2', '2.2.0' diff --git a/pkgs/servers/web-apps/discourse/plugins/discourse-migratepassword/Gemfile.lock b/pkgs/servers/web-apps/discourse/plugins/discourse-migratepassword/Gemfile.lock index 75a9a363b6cc..a7bfa717ed9d 100644 --- a/pkgs/servers/web-apps/discourse/plugins/discourse-migratepassword/Gemfile.lock +++ b/pkgs/servers/web-apps/discourse/plugins/discourse-migratepassword/Gemfile.lock @@ -5,11 +5,11 @@ GEM ffi (~> 1.15) ffi-compiler (~> 1.0) bcrypt (3.1.13) - ffi (1.15.5) + ffi (1.16.3) ffi-compiler (1.0.1) ffi (>= 1.0.0) rake - rake (13.0.6) + rake (13.2.1) unix-crypt (1.3.0) PLATFORMS @@ -18,9 +18,9 @@ PLATFORMS DEPENDENCIES argon2 (= 2.2.0) bcrypt (= 3.1.13) - ffi (= 1.15.5) + ffi (= 1.16.3) ffi-compiler (= 1.0.1) unix-crypt (= 1.3.0) BUNDLED WITH - 2.4.13 + 2.5.9 diff --git a/pkgs/servers/web-apps/discourse/plugins/discourse-migratepassword/default.nix b/pkgs/servers/web-apps/discourse/plugins/discourse-migratepassword/default.nix index ee8d03e66ca8..2189ba854eb7 100644 --- a/pkgs/servers/web-apps/discourse/plugins/discourse-migratepassword/default.nix +++ b/pkgs/servers/web-apps/discourse/plugins/discourse-migratepassword/default.nix @@ -6,8 +6,8 @@ mkDiscoursePlugin { src = fetchFromGitHub { owner = "communiteq"; repo = "discourse-migratepassword"; - rev = "a95ae6bca4126172186fafcd2315f51a4504c23b"; - sha256 = "sha256-lr2xHz+8q4XnHc/7KLX0Z2m0KMffLgGYk36zxGG9X5o="; + rev = "32d5fca6de3e8daf3869696ce835fefca1f00bfa"; + sha256 = "sha256-kNYkA6zuiuUZlPgvIvaO49P8bD+nNysEsow33xG1PnI="; }; meta = with lib; { homepage = "https://github.com/communiteq/discourse-migratepassword"; diff --git a/pkgs/servers/web-apps/discourse/plugins/discourse-migratepassword/gemset.nix b/pkgs/servers/web-apps/discourse/plugins/discourse-migratepassword/gemset.nix index 97aa9bfc7048..49174f05d0e9 100644 --- a/pkgs/servers/web-apps/discourse/plugins/discourse-migratepassword/gemset.nix +++ b/pkgs/servers/web-apps/discourse/plugins/discourse-migratepassword/gemset.nix @@ -25,10 +25,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1862ydmclzy1a0cjbvm8dz7847d9rch495ib0zb64y84d3xd4bkg"; + sha256 = "1yvii03hcgqj30maavddqamqy50h7y6xcn2wcyq72wn823zl4ckd"; type = "gem"; }; - version = "1.15.5"; + version = "1.16.3"; }; ffi-compiler = { dependencies = ["ffi" "rake"]; @@ -46,10 +46,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "15whn7p9nrkxangbs9hh75q585yfn66lv0v2mhj6q6dl6x8bzr2w"; + sha256 = "17850wcwkgi30p7yqh60960ypn7yibacjjha0av78zaxwvd3ijs6"; type = "gem"; }; - version = "13.0.6"; + version = "13.2.1"; }; unix-crypt = { groups = ["default"]; diff --git a/pkgs/servers/web-apps/discourse/plugins/discourse-openid-connect/default.nix b/pkgs/servers/web-apps/discourse/plugins/discourse-openid-connect/default.nix index a467f4d17b39..aab60ca9bc9f 100644 --- a/pkgs/servers/web-apps/discourse/plugins/discourse-openid-connect/default.nix +++ b/pkgs/servers/web-apps/discourse/plugins/discourse-openid-connect/default.nix @@ -6,8 +6,8 @@ mkDiscoursePlugin { src = fetchFromGitHub { owner = "discourse"; repo = "discourse-openid-connect"; - rev = "b1df541ad29f6f6098a1008b83393b2d400986ed"; - sha256 = "sha256-afRd/9M0nQGkS14Q8BJhcJwMCkOku3Fr0uHxcRl44vQ="; + rev = "f31a869611a2fad8efadd9b2504440215169a391"; + sha256 = "sha256-cEgAjf7EPAVKsJOmm9lj9Jm0YNFjRswOJFFHU12Q5/Y="; }; meta = with lib; { homepage = "https://github.com/discourse/discourse-openid-connect"; diff --git a/pkgs/servers/web-apps/discourse/plugins/discourse-prometheus/Gemfile.lock b/pkgs/servers/web-apps/discourse/plugins/discourse-prometheus/Gemfile.lock index 88a3a3c8d654..e7939eadbb0e 100644 --- a/pkgs/servers/web-apps/discourse/plugins/discourse-prometheus/Gemfile.lock +++ b/pkgs/servers/web-apps/discourse/plugins/discourse-prometheus/Gemfile.lock @@ -13,4 +13,4 @@ DEPENDENCIES webrick (= 1.7.0) BUNDLED WITH - 2.4.13 + 2.5.9 diff --git a/pkgs/servers/web-apps/discourse/plugins/discourse-prometheus/default.nix b/pkgs/servers/web-apps/discourse/plugins/discourse-prometheus/default.nix index 95bf4c5a679a..d0fa5b690bb6 100644 --- a/pkgs/servers/web-apps/discourse/plugins/discourse-prometheus/default.nix +++ b/pkgs/servers/web-apps/discourse/plugins/discourse-prometheus/default.nix @@ -6,8 +6,8 @@ src = fetchFromGitHub { owner = "discourse"; repo = "discourse-prometheus"; - rev = "8a7a46a80cc65aa0839bc5e3c3b6f8ef6544089f"; - sha256 = "sha256-TL+pbP26LvRMKdy8CAuBEK+LZfAs8HfggMeUDaBu9hc="; + rev = "831dba15659055361966e0c42e6b517b3d7b133b"; + sha256 = "sha256-b7Du8rENY/gBbkqZSu6b9KHbvklYMkIRl8IGd1W4dHk="; }; patches = [ diff --git a/pkgs/servers/web-apps/discourse/plugins/discourse-reactions/default.nix b/pkgs/servers/web-apps/discourse/plugins/discourse-reactions/default.nix index 36e4ac19c4bd..656acb2a9b1e 100644 --- a/pkgs/servers/web-apps/discourse/plugins/discourse-reactions/default.nix +++ b/pkgs/servers/web-apps/discourse/plugins/discourse-reactions/default.nix @@ -5,8 +5,8 @@ mkDiscoursePlugin { src = fetchFromGitHub { owner = "discourse"; repo = "discourse-reactions"; - rev = "643f807a3a2195f08211064301f0350d9f51604f"; - sha256 = "sha256-4FdiYUNysSuOJ664G3YvlUHx/J7MLUS3kVBdXT47oEw="; + rev = "354695cf5fce2bf516c9be451fe4bb56e487b95a"; + sha256 = "sha256-pTK7gcDgWAlRPrUnJikMOEd0N/DBrHE0hOP23t//MiE="; }; meta = with lib; { homepage = "https://github.com/discourse/discourse-reactions"; diff --git a/pkgs/servers/web-apps/discourse/plugins/discourse-saved-searches/default.nix b/pkgs/servers/web-apps/discourse/plugins/discourse-saved-searches/default.nix index 32709666189e..150cf2216c20 100644 --- a/pkgs/servers/web-apps/discourse/plugins/discourse-saved-searches/default.nix +++ b/pkgs/servers/web-apps/discourse/plugins/discourse-saved-searches/default.nix @@ -5,8 +5,8 @@ mkDiscoursePlugin { src = fetchFromGitHub { owner = "discourse"; repo = "discourse-saved-searches"; - rev = "7c9bdcd68951e7cef16cafe3c4bfb583bb994d2a"; - sha256 = "sha256-6RIN12ACDCeRcxmsC3FgeIPdvovI4arn7w/Dqil1yCI="; + rev = "063e35ec5a905aac3332be6821b15eec6909f022"; + sha256 = "sha256-33aBhw00/tIF0Y0isYISctn3Bd+KntrRngj6sxW30EY="; }; meta = with lib; { homepage = "https://github.com/discourse/discourse-saved-searches"; diff --git a/pkgs/servers/web-apps/discourse/plugins/discourse-solved/default.nix b/pkgs/servers/web-apps/discourse/plugins/discourse-solved/default.nix index ed47f9e15e92..c44d5420941f 100644 --- a/pkgs/servers/web-apps/discourse/plugins/discourse-solved/default.nix +++ b/pkgs/servers/web-apps/discourse/plugins/discourse-solved/default.nix @@ -5,8 +5,8 @@ mkDiscoursePlugin { src = fetchFromGitHub { owner = "discourse"; repo = "discourse-solved"; - rev = "b5d487d6a5bfe2571d936eec5911d02a5f3fcc32"; - sha256 = "sha256-Tt7B9PcsV8E7B+m8GnJw+MBz9rGYtojKt6NjBFMQvOM="; + rev = "a18ce6d712fafed286bcc99543dd173110c6dfb8"; + sha256 = "sha256-MUkQ/6ChMGqSNFZO2t8amecrYZbK1OyVq5lhPeB99ow="; }; meta = with lib; { homepage = "https://github.com/discourse/discourse-solved"; diff --git a/pkgs/servers/web-apps/discourse/plugins/discourse-spoiler-alert/default.nix b/pkgs/servers/web-apps/discourse/plugins/discourse-spoiler-alert/default.nix index 23ce34dcd694..56240177a73e 100644 --- a/pkgs/servers/web-apps/discourse/plugins/discourse-spoiler-alert/default.nix +++ b/pkgs/servers/web-apps/discourse/plugins/discourse-spoiler-alert/default.nix @@ -5,8 +5,8 @@ mkDiscoursePlugin { src = fetchFromGitHub { owner = "discourse"; repo = "discourse-spoiler-alert"; - rev = "65989714af08eda44196cca3a0afe85c9e9443f9"; - sha256 = "sha256-R/vqNEDst50+Y7anckIvhy4viBOqBemIZMh4sPt7kRM="; + rev = "42b77ec048b9b386a8b25a22bfec6472817da465"; + sha256 = "sha256-BQeID+y9RvmcnuNsodOMXseVvre5QYxv+E/ul8bucUI="; }; meta = with lib; { homepage = "https://github.com/discourse/discourse-spoiler-alert"; diff --git a/pkgs/servers/web-apps/discourse/plugins/discourse-voting/default.nix b/pkgs/servers/web-apps/discourse/plugins/discourse-voting/default.nix index a311dbcfbfcf..3ddbc37cf7e9 100644 --- a/pkgs/servers/web-apps/discourse/plugins/discourse-voting/default.nix +++ b/pkgs/servers/web-apps/discourse/plugins/discourse-voting/default.nix @@ -5,8 +5,8 @@ mkDiscoursePlugin { src = fetchFromGitHub { owner = "discourse"; repo = "discourse-voting"; - rev = "6449fc15658d972e20086a3f1fae3dbac9cd9eeb"; - sha256 = "sha256-f04LpVeodCVEB/t5Ic2dketp542Nrc0rZWbQ6hrC22g="; + rev = "ba41633e0abe0535fd358a0809e0b4e0c79be128"; + sha256 = "sha256-Ni+g9mWftvYsknIoSFBRoq7IMIWPbj4mgGM+k8fjOuI="; }; meta = with lib; { homepage = "https://github.com/discourse/discourse-voting"; diff --git a/pkgs/servers/web-apps/discourse/plugins/discourse-yearly-review/default.nix b/pkgs/servers/web-apps/discourse/plugins/discourse-yearly-review/default.nix index 979398f7394b..2a5b3ff7f5ec 100644 --- a/pkgs/servers/web-apps/discourse/plugins/discourse-yearly-review/default.nix +++ b/pkgs/servers/web-apps/discourse/plugins/discourse-yearly-review/default.nix @@ -5,8 +5,8 @@ mkDiscoursePlugin { src = fetchFromGitHub { owner = "discourse"; repo = "discourse-yearly-review"; - rev = "3246c6b378f9e69e664c575efc63c2ad83bcac2f"; - sha256 = "sha256-usHHyfYP4YAQ94f7gvNSH7VBRRkdZMmsSi9QQM8tPfY="; + rev = "59b98bab5ee370da4774f60ea7b5122dddcbd83a"; + sha256 = "sha256-OIptI6T5n021AsWO/eYK3ntL0JJG7+f4OmZwdxGcfFg="; }; meta = with lib; { homepage = "https://github.com/discourse/discourse-yearly-review"; From 898d023384720831c0adff6de9b0a24c3660da16 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Mon, 27 May 2024 20:44:42 +0200 Subject: [PATCH 28/32] discourse: build discourseAllPlugins in passthru.tests. Useful to reveal failing plugin builds. --- pkgs/servers/web-apps/discourse/default.nix | 3 +++ 1 file changed, 3 insertions(+) diff --git a/pkgs/servers/web-apps/discourse/default.nix b/pkgs/servers/web-apps/discourse/default.nix index 55a25231d76b..79d7d096f668 100644 --- a/pkgs/servers/web-apps/discourse/default.nix +++ b/pkgs/servers/web-apps/discourse/default.nix @@ -409,6 +409,9 @@ let passthru = { inherit rubyEnv runtimeEnv runtimeDeps rake mkDiscoursePlugin assets; + inherit (pkgs) + discourseAllPlugins + ; enabledPlugins = plugins; plugins = callPackage ./plugins/all-plugins.nix { inherit mkDiscoursePlugin; }; ruby = rubyEnv.wrappedRuby; From 72f9049d6efcba4b47dcfa8dea2b042ec90dc949 Mon Sep 17 00:00:00 2001 From: winston Date: Sun, 26 May 2024 12:48:20 +0200 Subject: [PATCH 29/32] vimPlugins.nvim-spectre: fix `spectre_oxi` build on darwin the upstream Rust dependency has been fixed for macOS. --- pkgs/applications/editors/vim/plugins/generated.nix | 4 ++-- pkgs/applications/editors/vim/plugins/overrides.nix | 5 ++--- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/pkgs/applications/editors/vim/plugins/generated.nix b/pkgs/applications/editors/vim/plugins/generated.nix index b2f677726e30..71110db1f38e 100644 --- a/pkgs/applications/editors/vim/plugins/generated.nix +++ b/pkgs/applications/editors/vim/plugins/generated.nix @@ -8274,8 +8274,8 @@ final: prev: src = fetchFromGitHub { owner = "nvim-pack"; repo = "nvim-spectre"; - rev = "5690ea46baf08bbc1623980012e14b6239ce582e"; - sha256 = "14m9hp7rr7qldqsl40k1jiqyk44bndq4pfibb08xcqp8hqn8f3q1"; + rev = "366f46fdd4a1593cc237aea13d5ef113739a472c"; + sha256 = "sha256-JS0kfM+uxwC/z8bdkdkaC+MAJIyvlvXsi3BDJuBxADA="; }; meta.homepage = "https://github.com/nvim-pack/nvim-spectre/"; }; diff --git a/pkgs/applications/editors/vim/plugins/overrides.nix b/pkgs/applications/editors/vim/plugins/overrides.nix index 835ddde43d26..8f24b92251c9 100644 --- a/pkgs/applications/editors/vim/plugins/overrides.nix +++ b/pkgs/applications/editors/vim/plugins/overrides.nix @@ -1091,19 +1091,18 @@ cargoHash = "sha256-7V4RyWIo9gL3ir4Pay8CMIVn6cXjJi9sgKVOENG4muQ="; - preCheck = '' mkdir tests/tmp/ ''; }; in - (lib.optionalAttrs stdenv.isLinux { + { dependencies = with self; [ plenary-nvim ]; postInstall = '' ln -s ${spectre_oxi}/lib/libspectre_oxi.* $out/lua/spectre_oxi.so ''; - })); + }); nvim-teal-maker = super.nvim-teal-maker.overrideAttrs { postPatch = '' From a6134cb1744a95502037966c14c33e5e53b7e086 Mon Sep 17 00:00:00 2001 From: wucke13 Date: Mon, 27 May 2024 22:31:47 +0200 Subject: [PATCH 30/32] zerotierone: fix static compilation (#314824) * zerotierone: fix static compilation This fixes #314819. * Update pkgs/tools/networking/zerotierone/default.nix --------- Co-authored-by: Sandro --- pkgs/tools/networking/zerotierone/default.nix | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/pkgs/tools/networking/zerotierone/default.nix b/pkgs/tools/networking/zerotierone/default.nix index f9415055a537..fa2c86d6f83a 100644 --- a/pkgs/tools/networking/zerotierone/default.nix +++ b/pkgs/tools/networking/zerotierone/default.nix @@ -65,6 +65,19 @@ in stdenv.mkDerivation { enableParallelBuilding = true; + # Ensure Rust compiles for the right target + env.CARGO_BUILD_TARGET = stdenv.hostPlatform.rust.rustcTarget; + + # Cargo won't compile to target/release but to target//release when a target is + # explicitly defined. The build-system however expects target/release. Hence we just symlink from + # the latter to the former. + preBuild = '' + mkdir -p rustybits/target/release + ln -rs \ + ./rustybits/target/${stdenv.hostPlatform.rust.rustcTarget}/release/libzeroidc.a \ + ./rustybits/target/release/ + ''; + buildFlags = [ "all" "selftest" ]; doCheck = stdenv.hostPlatform == stdenv.buildPlatform; From 39cb4bd48b110b1b7545a1b2f34bab1d6e883bf9 Mon Sep 17 00:00:00 2001 From: Tom Fitzhenry Date: Wed, 15 May 2024 21:49:40 +1000 Subject: [PATCH 31/32] less: introduce withSecure flag `--with-secure` is a hardening compile flag to disable potentially dangerous commands within less(1). References: * https://man7.org/linux/man-pages/man1/less.1.html#SECURITY * https://seclists.org/fulldisclosure/2014/Nov/74 --- pkgs/by-name/le/less/package.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/by-name/le/less/package.nix b/pkgs/by-name/le/less/package.nix index f7791a2636eb..326e4e2df017 100644 --- a/pkgs/by-name/le/less/package.nix +++ b/pkgs/by-name/le/less/package.nix @@ -4,6 +4,7 @@ , fetchpatch , ncurses , pcre2 +, withSecure ? false }: stdenv.mkDerivation (finalAttrs: { @@ -37,7 +38,7 @@ stdenv.mkDerivation (finalAttrs: { # Look for 'sysless' in /etc. "--sysconfdir=/etc" "--with-regex=pcre2" - ]; + ] ++ lib.optional withSecure "--with-secure"; meta = { homepage = "https://www.greenwoodsoftware.com/less/"; From 25193bdc605a1da86b4e1885bf2e900ff364a1a4 Mon Sep 17 00:00:00 2001 From: Tom Fitzhenry Date: Thu, 16 May 2024 21:27:25 +1000 Subject: [PATCH 32/32] nixos/less: introduce programs.less.package Allow users to set the package, e.g. to override withSecure to true. --- nixos/modules/programs/less.nix | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/nixos/modules/programs/less.nix b/nixos/modules/programs/less.nix index c904fc2089aa..50ea1586f688 100644 --- a/nixos/modules/programs/less.nix +++ b/nixos/modules/programs/less.nix @@ -35,6 +35,8 @@ in # therefore also enables this module enable = lib.mkEnableOption "less, a file pager"; + package = lib.mkPackageOption pkgs "less" { }; + configFile = lib.mkOption { type = lib.types.nullOr lib.types.path; default = null; @@ -110,7 +112,7 @@ in config = lib.mkIf cfg.enable { - environment.systemPackages = [ pkgs.less ]; + environment.systemPackages = [ cfg.package ]; environment.variables = { LESSKEYIN_SYSTEM = builtins.toString lessKey;