Merge master into staging-next

This commit is contained in:
github-actions[bot] 2023-04-29 00:02:00 +00:00 committed by GitHub
commit 534c4a7623
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
66 changed files with 2126 additions and 1477 deletions

View File

@ -26,13 +26,9 @@ in
};
config = mkIf cfg.enable {
# for cli usage
environment.systemPackages = [ pkgs.vector ];
users.groups.vector = { };
users.users.vector = {
description = "Vector service user";
group = "vector";
isSystemUser = true;
};
systemd.services.vector = {
description = "Vector event and log aggregator";
wantedBy = [ "multi-user.target" ];
@ -52,8 +48,7 @@ in
in
{
ExecStart = "${pkgs.vector}/bin/vector --config ${validateConfig conf}";
User = "vector";
Group = "vector";
DynamicUser = true;
Restart = "no";
StateDirectory = "vector";
ExecReload = "${pkgs.coreutils}/bin/kill -HUP $MAINPID";

View File

@ -651,6 +651,9 @@ in
preload_link_header = false;
redirect_avatar_requests = false;
pg_force_readonly_mode = false;
dns_query_timeout_secs = null;
regex_timeout_seconds = 2;
allow_impersonation = true;
};
services.redis.servers.discourse =

View File

@ -61,6 +61,13 @@ in {
# https://www.home-assistant.io/integrations/frontend/
frontend = {};
# include some popular integrations, that absolutely shouldn't break
esphome = {};
knx = {};
matter = {};
shelly = {};
zha = {};
# set up a wake-on-lan switch to test capset capability required
# for the ping suid wrapper
# https://www.home-assistant.io/integrations/wake_on_lan/
@ -107,7 +114,7 @@ in {
# Cause a configuration change that requires a service restart as we added a new runtime dependency
specialisation.newFeature = {
inheritParentConfig = true;
configuration.services.home-assistant.config.esphome = {};
configuration.services.home-assistant.config.backup = {};
};
};

View File

@ -61,13 +61,13 @@
stdenv.mkDerivation rec {
pname = "audacity";
version = "3.3.0";
version = "3.3.1";
src = fetchFromGitHub {
owner = pname;
repo = pname;
rev = "Audacity-${version}";
hash = "sha256-OQX3YFUdK9TR7ZuN2dZc6ZAWaqfftk5VH0qoOwbTAuM=";
hash = "sha256-4L5ggu1izm9kichZBsJHAFq74q59xWGVYC11gy3K9go=";
};
postPatch = ''
@ -150,6 +150,7 @@ stdenv.mkDerivation rec {
"-Daudacity_conan_enabled=Off"
"-Daudacity_use_ffmpeg=loaded"
"-Daudacity_has_vst3=Off"
"-Daudacity_has_crashreports=Off"
# RPATH of binary /nix/store/.../bin/... contains a forbidden reference to /build/
"-DCMAKE_SKIP_BUILD_RPATH=ON"

View File

@ -0,0 +1,73 @@
{ lib
, fetchpatch
, python3
}:
python3.pkgs.buildPythonPackage rec {
pname = "ledfx";
version = "2.0.64";
format = "setuptools";
src = python3.pkgs.fetchPypi {
inherit pname version;
hash = "sha256-TKRa4PcMd0Jl94XD2WubOhmsxZaUplZeWKsuKz83Rl4=";
};
patches = [
# replace tcp-latency which is not packaged with icmplib
(fetchpatch {
url = "https://github.com/LedFx/LedFx/commit/98cd4256846ae3bdae7094eeacb3b02a4807dc6f.patch";
excludes = [
# only used in win.spec file which is windows specific
"hiddenimports.py"
];
hash = "sha256-p9fiLdjZI5fe5Qy2xbJIAtblp/7BwUxAvwjHQy5l9nQ=";
})
];
postPatch = ''
substituteInPlace setup.py \
--replace '"openrgb-python~=0.2.10",' "" \
--replace '"pyupdater>=3.1.0",' "" \
--replace "'rpi-ws281x>=4.3.0; platform_system == \"Linux\"'," "" \
--replace "~=" ">="
'';
propagatedBuildInputs = with python3.pkgs; [
aiohttp
aiohttp-cors
aubio
certifi
cython
flux-led
icmplib
multidict
numpy
# openrgb-python # not packaged
paho-mqtt
pillow
psutil
pyserial
pystray
# rpi-ws281x # not packaged
requests
sacn
samplerate
sentry-sdk
sounddevice
uvloop
voluptuous
zeroconf
];
# has no tests
doCheck = false;
meta = with lib; {
description = "LedFx is a network based LED effect controller with support for advanced real-time audio effects";
homepage = "https://github.com/LedFx/LedFx";
changelog = "https://github.com/LedFx/LedFx/blob/${version}/CHANGELOG.rst";
license = licenses.gpl3Only;
maintainers = teams.c3d2.members;
};
}

View File

@ -3,10 +3,10 @@
"clion": {
"update-channel": "CLion RELEASE",
"url-template": "https://download.jetbrains.com/cpp/CLion-{version}.tar.gz",
"version": "2023.1.1",
"sha256": "19f2f435ff21453f724e16b318a94d19c414fd5863aa08cc73e78c85a20d73c5",
"url": "https://download.jetbrains.com/cpp/CLion-2023.1.1.tar.gz",
"build_number": "231.8109.222"
"version": "2023.1.2",
"sha256": "e3efc51a4431dc67da6463a8a37aab8ad6a214a8338430ae61cd4add5e7e5b04",
"url": "https://download.jetbrains.com/cpp/CLion-2023.1.2.tar.gz",
"build_number": "231.8770.66"
},
"datagrip": {
"update-channel": "DataGrip RELEASE",
@ -35,18 +35,18 @@
"idea-community": {
"update-channel": "IntelliJ IDEA RELEASE",
"url-template": "https://download.jetbrains.com/idea/ideaIC-{version}.tar.gz",
"version": "2023.1",
"sha256": "e6fe45c9df8e763ee3278444b5fb1003910c436752e83221e0303a62c5e81eaa",
"url": "https://download.jetbrains.com/idea/ideaIC-2023.1.tar.gz",
"build_number": "231.8109.175"
"version": "2023.1.1",
"sha256": "0a9bc55c2eaecbe983cd1db9ab6a353e3b7c3747f6fc6dea95736df104a68239",
"url": "https://download.jetbrains.com/idea/ideaIC-2023.1.1.tar.gz",
"build_number": "231.8770.65"
},
"idea-ultimate": {
"update-channel": "IntelliJ IDEA RELEASE",
"url-template": "https://download.jetbrains.com/idea/ideaIU-{version}.tar.gz",
"version": "2023.1",
"sha256": "3029c751c36d86fef0021feceb8f3010d37aebd42aef6d6aed9e3b9207c2d2ac",
"url": "https://download.jetbrains.com/idea/ideaIU-2023.1.tar.gz",
"build_number": "231.8109.175"
"version": "2023.1.1",
"sha256": "62ac9a6a801e5e029c3ca5ea28ee5de2680e3d58ae233cf1cb3d3636c6b205ca",
"url": "https://download.jetbrains.com/idea/ideaIU-2023.1.1.tar.gz",
"build_number": "231.8770.65"
},
"mps": {
"update-channel": "MPS RELEASE",
@ -84,36 +84,36 @@
"rider": {
"update-channel": "Rider RELEASE",
"url-template": "https://download.jetbrains.com/rider/JetBrains.Rider-{version}.tar.gz",
"version": "2023.1",
"sha256": "494cd8bbb41023ae4a53487e9ac46aacc68f52ee3e14c8621f49e2675d56fa9c",
"url": "https://download.jetbrains.com/rider/JetBrains.Rider-2023.1.tar.gz",
"build_number": "231.8109.212"
"version": "2023.1.1",
"sha256": "d50a7ed977e04ae50d6a16422a0968896fc6d94b0ab84d044ad3503d904570e0",
"url": "https://download.jetbrains.com/rider/JetBrains.Rider-2023.1.1.tar.gz",
"build_number": "231.8770.54"
},
"ruby-mine": {
"update-channel": "RubyMine RELEASE",
"url-template": "https://download.jetbrains.com/ruby/RubyMine-{version}.tar.gz",
"version": "2023.1",
"sha256": "f9eabc980d82a9c9b27bc84daa7f1e786f41b17bbbfeca282985c6ed87e768ec",
"url": "https://download.jetbrains.com/ruby/RubyMine-2023.1.tar.gz",
"build_number": "231.8109.174"
"version": "2023.1.1",
"sha256": "44a852fa872751ba53b1a10eb5d136a407ae7db90e4e4f8c37ba282dcc9c1419",
"url": "https://download.jetbrains.com/ruby/RubyMine-2023.1.1.tar.gz",
"build_number": "231.8770.57"
},
"webstorm": {
"update-channel": "WebStorm RELEASE",
"url-template": "https://download.jetbrains.com/webstorm/WebStorm-{version}.tar.gz",
"version": "2023.1",
"sha256": "bd074c7bafdcfcce4db001a4356040d0badd7cd2f65418a35b4156b00a07e94b",
"url": "https://download.jetbrains.com/webstorm/WebStorm-2023.1.tar.gz",
"build_number": "231.8109.174"
"version": "2023.1.1",
"sha256": "93e11177010037a156939f2ded59ac5d8d0661e47a4471399665affe4a1eb7a9",
"url": "https://download.jetbrains.com/webstorm/WebStorm-2023.1.1.tar.gz",
"build_number": "231.8770.64"
}
},
"x86_64-darwin": {
"clion": {
"update-channel": "CLion RELEASE",
"url-template": "https://download.jetbrains.com/cpp/CLion-{version}.dmg",
"version": "2023.1.1",
"sha256": "98e1d907604dcde89b2a5df6a8331894eab03f1fb72e6acbde7da5c279f0043e",
"url": "https://download.jetbrains.com/cpp/CLion-2023.1.1.dmg",
"build_number": "231.8109.222"
"version": "2023.1.2",
"sha256": "a980ecceda348d5a9e4ee7aaec2baf6d985a66c714ee270d402d708838e40d26",
"url": "https://download.jetbrains.com/cpp/CLion-2023.1.2.dmg",
"build_number": "231.8770.66"
},
"datagrip": {
"update-channel": "DataGrip RELEASE",
@ -142,18 +142,18 @@
"idea-community": {
"update-channel": "IntelliJ IDEA RELEASE",
"url-template": "https://download.jetbrains.com/idea/ideaIC-{version}.dmg",
"version": "2023.1",
"sha256": "233cc0253921bb002bd20eff0e493864b5b7ad951cd806d29a702cf1a6934f0f",
"url": "https://download.jetbrains.com/idea/ideaIC-2023.1.dmg",
"build_number": "231.8109.175"
"version": "2023.1.1",
"sha256": "ee7769737cb0e22d4c88ea8808d0767b8d88667b6b732748d745a5eb48809c46",
"url": "https://download.jetbrains.com/idea/ideaIC-2023.1.1.dmg",
"build_number": "231.8770.65"
},
"idea-ultimate": {
"update-channel": "IntelliJ IDEA RELEASE",
"url-template": "https://download.jetbrains.com/idea/ideaIU-{version}.dmg",
"version": "2023.1",
"sha256": "1e8498336a5c4d90518f47d687a167adbe0e634d1f7d10530164c84542b91677",
"url": "https://download.jetbrains.com/idea/ideaIU-2023.1.dmg",
"build_number": "231.8109.175"
"version": "2023.1.1",
"sha256": "46fed7185c1cc901778593941db035d9806ebdad930eccbb4472668d440e60af",
"url": "https://download.jetbrains.com/idea/ideaIU-2023.1.1.dmg",
"build_number": "231.8770.65"
},
"mps": {
"update-channel": "MPS RELEASE",
@ -191,36 +191,36 @@
"rider": {
"update-channel": "Rider RELEASE",
"url-template": "https://download.jetbrains.com/rider/JetBrains.Rider-{version}.dmg",
"version": "2023.1",
"sha256": "fe6ee0086b3e59eecc7e2816e8f803a702a6b7ea382cb0a2168d08d19dd656d7",
"url": "https://download.jetbrains.com/rider/JetBrains.Rider-2023.1.dmg",
"build_number": "231.8109.212"
"version": "2023.1.1",
"sha256": "72131efb1d4606cefd9bfb11cc98443a13f5b9761ac007484564db2107e7f8e9",
"url": "https://download.jetbrains.com/rider/JetBrains.Rider-2023.1.1.dmg",
"build_number": "231.8770.54"
},
"ruby-mine": {
"update-channel": "RubyMine RELEASE",
"url-template": "https://download.jetbrains.com/ruby/RubyMine-{version}.dmg",
"version": "2023.1",
"sha256": "fba60e34520c807ba0a9124802e5782e2b4c8e63c27e07968b9cb642f0fc0a77",
"url": "https://download.jetbrains.com/ruby/RubyMine-2023.1.dmg",
"build_number": "231.8109.174"
"version": "2023.1.1",
"sha256": "2c37a3e8c8a9b800b9132f31d0cfdffbb3fd4ee83de13b3141187ec05a79e3e0",
"url": "https://download.jetbrains.com/ruby/RubyMine-2023.1.1.dmg",
"build_number": "231.8770.57"
},
"webstorm": {
"update-channel": "WebStorm RELEASE",
"url-template": "https://download.jetbrains.com/webstorm/WebStorm-{version}.dmg",
"version": "2023.1",
"sha256": "35f110baf5a37232175a367c524a4cb04216bc2c0b0767506449648df6a12032",
"url": "https://download.jetbrains.com/webstorm/WebStorm-2023.1.dmg",
"build_number": "231.8109.174"
"version": "2023.1.1",
"sha256": "e7b9b86501682a0cf5a1b2d22e65491a6923635043378707581357a10fc8dc2a",
"url": "https://download.jetbrains.com/webstorm/WebStorm-2023.1.1.dmg",
"build_number": "231.8770.64"
}
},
"aarch64-darwin": {
"clion": {
"update-channel": "CLion RELEASE",
"url-template": "https://download.jetbrains.com/cpp/CLion-{version}-aarch64.dmg",
"version": "2023.1.1",
"sha256": "f18183aa0efd776f2d641c72e61892e2d987f4b1f2a59786b2afb12604c43658",
"url": "https://download.jetbrains.com/cpp/CLion-2023.1.1-aarch64.dmg",
"build_number": "231.8109.222"
"version": "2023.1.2",
"sha256": "61c8c1e76fe25389557111534c3fdadb5ba69427384890bf25499d0b474c147d",
"url": "https://download.jetbrains.com/cpp/CLion-2023.1.2-aarch64.dmg",
"build_number": "231.8770.66"
},
"datagrip": {
"update-channel": "DataGrip RELEASE",
@ -249,18 +249,18 @@
"idea-community": {
"update-channel": "IntelliJ IDEA RELEASE",
"url-template": "https://download.jetbrains.com/idea/ideaIC-{version}-aarch64.dmg",
"version": "2023.1",
"sha256": "33964525cb28ac199e39e3c8eac4128874963f3292d5074257ae54fe1df9f986",
"url": "https://download.jetbrains.com/idea/ideaIC-2023.1-aarch64.dmg",
"build_number": "231.8109.175"
"version": "2023.1.1",
"sha256": "c9ab2053e1ad648466c547c378bd4e8753b4db8908de1caaeca91563ad80f6f9",
"url": "https://download.jetbrains.com/idea/ideaIC-2023.1.1-aarch64.dmg",
"build_number": "231.8770.65"
},
"idea-ultimate": {
"update-channel": "IntelliJ IDEA RELEASE",
"url-template": "https://download.jetbrains.com/idea/ideaIU-{version}-aarch64.dmg",
"version": "2023.1",
"sha256": "6e2ca530fe082f79724fb89849e06fa91b8c17089430f9633a7e9a813204151f",
"url": "https://download.jetbrains.com/idea/ideaIU-2023.1-aarch64.dmg",
"build_number": "231.8109.175"
"version": "2023.1.1",
"sha256": "ae631000e19b821194b38be7caaa1e13ad78b465e6eb00f44215bb1173038448",
"url": "https://download.jetbrains.com/idea/ideaIU-2023.1.1-aarch64.dmg",
"build_number": "231.8770.65"
},
"mps": {
"update-channel": "MPS RELEASE",
@ -298,26 +298,26 @@
"rider": {
"update-channel": "Rider RELEASE",
"url-template": "https://download.jetbrains.com/rider/JetBrains.Rider-{version}-aarch64.dmg",
"version": "2023.1",
"sha256": "dbd708379f2a489add7e87a321297841baf8bfcf83ce2f5549a1ff9f5037cf46",
"url": "https://download.jetbrains.com/rider/JetBrains.Rider-2023.1-aarch64.dmg",
"build_number": "231.8109.212"
"version": "2023.1.1",
"sha256": "b089e107bd81829fffe97509912c4467f8b4ea09fd5f38ebd8cc8c57e6adb947",
"url": "https://download.jetbrains.com/rider/JetBrains.Rider-2023.1.1-aarch64.dmg",
"build_number": "231.8770.54"
},
"ruby-mine": {
"update-channel": "RubyMine RELEASE",
"url-template": "https://download.jetbrains.com/ruby/RubyMine-{version}-aarch64.dmg",
"version": "2023.1",
"sha256": "56d0202ea1261eb8ac5bd24f1cb044282cda5bd6c8306d3ec606109a3fe28fba",
"url": "https://download.jetbrains.com/ruby/RubyMine-2023.1-aarch64.dmg",
"build_number": "231.8109.174"
"version": "2023.1.1",
"sha256": "17327de2d4edd3fbddb47c96d4db1bfba716786eb5b74b4a2e3ba6d0482610f9",
"url": "https://download.jetbrains.com/ruby/RubyMine-2023.1.1-aarch64.dmg",
"build_number": "231.8770.57"
},
"webstorm": {
"update-channel": "WebStorm RELEASE",
"url-template": "https://download.jetbrains.com/webstorm/WebStorm-{version}-aarch64.dmg",
"version": "2023.1",
"sha256": "91f4a8f63c36407e9431a97a1ecc33762f67afd488046796cf4cca3a6709518c",
"url": "https://download.jetbrains.com/webstorm/WebStorm-2023.1-aarch64.dmg",
"build_number": "231.8109.174"
"version": "2023.1.1",
"sha256": "3ccf935b898511106b25f3d30363767372f6a301311a5547f68210895b054cf1",
"url": "https://download.jetbrains.com/webstorm/WebStorm-2023.1.1-aarch64.dmg",
"build_number": "231.8770.64"
}
}
}

View File

@ -8,7 +8,6 @@ let
flask-api
flask-bootstrap
flask-paginate
flask-reverse-proxy-fix
flask-wtf
arrow
werkzeug
@ -18,20 +17,20 @@ let
];
in
with python3.pkgs; buildPythonApplication rec {
version = "4.7";
version = "4.8";
pname = "buku";
src = fetchFromGitHub {
owner = "jarun";
repo = "buku";
rev = "v${version}";
sha256 = "sha256-7piJK1hz9h6EWiU/q5MAS1PSvHFxnW7rZBKxq+wda1c=";
sha256 = "sha256-kPVlfTYUusf5CZnKB53WZcCHo3MEnA2bLUHTRPGPn+8=";
};
nativeCheckInputs = [
hypothesis
pytest
pytest-vcr
pytest-recording
pyyaml
mypy-extensions
click

View File

@ -71,16 +71,17 @@ mkDerivation rec {
unpackPhase = ''
# deb file contains a setuid binary, so 'dpkg -x' doesn't work here
dpkg --fsys-tarfile ${src} | tar --extract
mkdir deb
dpkg --fsys-tarfile ${src} | tar --extract -C deb
'';
installPhase =''
runHook preInstall
mkdir $out
mv usr/* $out/
rmdir usr
mv * $out/
mv deb/usr/* $out/
rmdir deb/usr
mv deb/* $out/
rm $out/bin/google-earth-pro $out/opt/google/earth/pro/googleearth
# patch and link googleearth binary

View File

@ -9,7 +9,7 @@
, gtkmm3
, pcre
, swig
, antlr4_9
, antlr4_12
, sudo
, mysql
, libxml2
@ -46,16 +46,14 @@ let
inherit (python3.pkgs) paramiko pycairo pyodbc;
in stdenv.mkDerivation rec {
pname = "mysql-workbench";
version = "8.0.32";
version = "8.0.33";
src = fetchurl {
url = "http://dev.mysql.com/get/Downloads/MySQLGUITools/mysql-workbench-community-${version}-src.tar.gz";
sha256 = "sha256-ruGdYTG0KPhRnUdlfaZjt1r/tAhA1XeAtjDgu/K9okI=";
url = "https://cdn.mysql.com//Downloads/MySQLGUITools/mysql-workbench-community-${version}-src.tar.gz";
sha256 = "a6c9b05ee6f8accd45203d8234a43415da65ddc8118d427dd1a2ef2a209261bc";
};
patches = [
./fix-gdal-includes.patch
(substituteAll {
src = ./hardcode-paths.patch;
catchsegv = "${glibc.bin}/bin/catchsegv";
@ -79,11 +77,11 @@ in stdenv.mkDerivation rec {
})
];
# 1. have it look for 4.9.3 instead of 4.9.1
# 1. have it look for 4.12.0 instead of 4.11.1
# 2. for some reason CMakeCache.txt is part of source code
preConfigure = ''
substituteInPlace CMakeLists.txt \
--replace "antlr-4.9.1-complete.jar" "antlr-4.9.3-complete.jar"
--replace "antlr-4.11.1-complete.jar" "antlr-4.12.0-complete.jar"
rm -f build/CMakeCache.txt
'';
@ -100,7 +98,7 @@ in stdenv.mkDerivation rec {
gtk3
gtkmm3
libX11
antlr4_9.runtime.cpp
antlr4_12.runtime.cpp
python3
mysql
libxml2
@ -157,7 +155,7 @@ in stdenv.mkDerivation rec {
# mysql-workbench 8.0.21 depends on libmysqlconnectorcpp 1.1.8.
# Newer versions of connector still provide the legacy library when enabled
# but the headers are in a different location.
"-DWITH_ANTLR_JAR=${antlr4_9.jarLocation}"
"-DWITH_ANTLR_JAR=${antlr4_12.jarLocation}"
"-DMySQLCppConn_INCLUDE_DIR=${libmysqlconnectorcpp}/include/jdbc"
];

View File

@ -1,47 +0,0 @@
--- a/backend/wbpublic/grt/spatial_handler.h
+++ b/backend/wbpublic/grt/spatial_handler.h
@@ -24,12 +24,12 @@
#ifndef SPATIAL_HANDLER_H_
#define SPATIAL_HANDLER_H_
-#include <gdal/ogrsf_frmts.h>
-#include <gdal/ogr_api.h>
-#include <gdal/gdal_pam.h>
-#include <gdal/memdataset.h>
-#include <gdal/gdal_alg.h>
-#include <gdal/gdal.h>
+#include <ogrsf_frmts.h>
+#include <ogr_api.h>
+#include <gdal_pam.h>
+#include <memdataset.h>
+#include <gdal_alg.h>
+#include <gdal.h>
#include <deque>
#include "base/geometry.h"
#include "wbpublic_public_interface.h"
--- a/backend/wbpublic/grtui/geom_draw_box.h
+++ b/backend/wbpublic/grtui/geom_draw_box.h
@@ -25,7 +25,7 @@
#define _GEOM_DRAW_BOX_H_
#include <mforms/drawbox.h>
-#include <gdal/ogr_geometry.h>
+#include <ogr_geometry.h>
#include "wbpublic_public_interface.h"
class WBPUBLICBACKEND_PUBLIC_FUNC GeomDrawBox : public mforms::DrawBox {
--- a/backend/wbpublic/objimpl/db.query/db_query_Resultset.cpp
+++ b/backend/wbpublic/objimpl/db.query/db_query_Resultset.cpp
@@ -21,9 +21,9 @@
* 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
*/
-#include <gdal/ogrsf_frmts.h>
-#include <gdal/ogr_api.h>
-#include <gdal/gdal.h>
+#include <ogrsf_frmts.h>
+#include <ogr_api.h>
+#include <gdal.h>
#include <grts/structs.db.query.h>
#include <grtpp_util.h>

View File

@ -1,15 +1,31 @@
GEM
remote: https://rubygems.org/
specs:
mail (2.7.1)
date (3.3.3)
mail (2.8.1)
mini_mime (>= 0.1.1)
mini_mime (1.0.1)
taskjuggler (3.6.0)
mail (>= 2.4.3)
term-ansicolor (>= 1.0.7)
net-imap
net-pop
net-smtp
mini_mime (1.1.2)
net-imap (0.3.4)
date
net-protocol
net-pop (0.1.2)
net-protocol
net-protocol (0.2.1)
timeout
net-smtp (0.3.3)
net-protocol
sync (0.5.0)
taskjuggler (3.7.2)
mail (~> 2.7, >= 2.7.1)
term-ansicolor (~> 1.7, >= 1.7.1)
term-ansicolor (1.7.1)
tins (~> 1.0)
tins (1.20.2)
timeout (0.3.2)
tins (1.32.1)
sync
PLATFORMS
ruby
@ -18,4 +34,4 @@ DEPENDENCIES
taskjuggler
BUNDLED WITH
2.1.4
2.4.12

View File

@ -1,24 +1,88 @@
{
mail = {
dependencies = ["mini_mime"];
date = {
groups = ["default"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "00wwz6ys0502dpk8xprwcqfwyf3hmnx6lgxaiq6vj43mkx43sapc";
sha256 = "03skfikihpx37rc27vr3hwrb057gxnmdzxhmzd4bf4jpkl0r55w1";
type = "gem";
};
version = "2.7.1";
version = "3.3.3";
};
mail = {
dependencies = ["mini_mime" "net-imap" "net-pop" "net-smtp"];
groups = ["default"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "1bf9pysw1jfgynv692hhaycfxa8ckay1gjw5hz3madrbrynryfzc";
type = "gem";
};
version = "2.8.1";
};
mini_mime = {
groups = ["default"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "1q4pshq387lzv9m39jv32vwb8wrq3wc4jwgl4jk209r4l33v09d3";
sha256 = "0lbim375gw2dk6383qirz13hgdmxlan0vc5da2l072j3qw6fqjm5";
type = "gem";
};
version = "1.0.1";
version = "1.1.2";
};
net-imap = {
dependencies = ["date" "net-protocol"];
groups = ["default"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "1d996zf3g8xz244791b0qsl9vr7zg4lqnnmf9k2kshr9lki5jam8";
type = "gem";
};
version = "0.3.4";
};
net-pop = {
dependencies = ["net-protocol"];
groups = ["default"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "1wyz41jd4zpjn0v1xsf9j778qx1vfrl24yc20cpmph8k42c4x2w4";
type = "gem";
};
version = "0.1.2";
};
net-protocol = {
dependencies = ["timeout"];
groups = ["default"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "0dxckrlw4q1lcn3qg4mimmjazmg9bma5gllv72f8js3p36fb3b91";
type = "gem";
};
version = "0.2.1";
};
net-smtp = {
dependencies = ["net-protocol"];
groups = ["default"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "1c6md06hm5bf6rv53sk54dl2vg038pg8kglwv3rayx0vk2mdql9x";
type = "gem";
};
version = "0.3.3";
};
sync = {
groups = ["default"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "1z9qlq4icyiv3hz1znvsq1wz2ccqjb1zwd6gkvnwg6n50z65d0v6";
type = "gem";
};
version = "0.5.0";
};
taskjuggler = {
dependencies = ["mail" "term-ansicolor"];
@ -26,10 +90,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "0ky3cydl3szhdyxsy4k6zxzjlbll7mlq025aj6xd5jmh49k3pfbp";
sha256 = "07fagka8nl29xwwzfhxx89gp34m5hih5vnq4sha1z814004md53j";
type = "gem";
};
version = "3.6.0";
version = "3.7.2";
};
term-ansicolor = {
dependencies = ["tins"];
@ -42,14 +106,25 @@
};
version = "1.7.1";
};
tins = {
timeout = {
groups = ["default"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "1pqj45n216zrz7yckdbdknlmhh187iqzx8fp76y2h0jrgqjfkxmj";
sha256 = "1pfddf51n5fnj4f9ggwj3wbf23ynj0nbxlxqpz12y1gvl9g7d6r6";
type = "gem";
};
version = "1.20.2";
version = "0.3.2";
};
tins = {
dependencies = ["sync"];
groups = ["default"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "0373zn7zkllcn2q4ylbjgjx9mvm8m73ll3jwjav48dx8myplsp5p";
type = "gem";
};
version = "1.32.1";
};
}

View File

@ -166,7 +166,7 @@ in stdenv.mkDerivation {
buildInputs = [
# needed for GSETTINGS_SCHEMAS_PATH
gsettings-desktop-schemas glib gtk3
gsettings-desktop-schemas glib gtk3 gtk4
# needed for XDG_ICON_DIRS
gnome.adwaita-icon-theme

View File

@ -230,8 +230,9 @@ buildStdenv.mkDerivation ({
url = "https://hg.mozilla.org/mozilla-central/raw-rev/1068e0955cfb";
hash = "sha256-iPqmofsmgvlFNm+mqVPbdgMKmP68ANuzYu+PzfCpoNA=";
})
] ++ [
] ++ lib.optionals (lib.versionOlder version "114.0") [
# https://bugzilla.mozilla.org/show_bug.cgi?id=1830040
# https://hg.mozilla.org/mozilla-central/rev/cddb250a28d8
(fetchpatch {
url = "https://git.alpinelinux.org/aports/plain/community/firefox/avoid-redefinition.patch?id=2f620d205ed0f9072bbd7714b5ec1b7bf6911c12";
hash = "sha256-fLUYaJwhrC/wF24HkuWn2PHqz7LlAaIZ1HYjRDB2w9A=";

View File

@ -291,7 +291,7 @@ stdenv.mkDerivation rec {
export LOCALE_ARCHIVE=${glibcLocales}/lib/locale/locale-archive
# Enter local state directory.
REAL_HOME=\$HOME
REAL_HOME=\''${HOME%/}
TBB_HOME=\''${TBB_HOME:-''${XDG_DATA_HOME:-\$REAL_HOME/.local/share}/tor-browser}
HOME=\$TBB_HOME

View File

@ -191,7 +191,7 @@ stdenv.mkDerivation rec {
"-Dpythia6=OFF"
"-Dpythia8=OFF"
"-Drfio=OFF"
"-Droot7=ON"
"-Droot7=OFF"
"-Dsqlite=OFF"
"-Dssl=ON"
"-Dtmva=ON"

View File

@ -19,12 +19,12 @@
buildGoModule rec {
pname = "gitea";
version = "1.19.1";
version = "1.19.2";
# not fetching directly from the git repo, because that lacks several vendor files for the web UI
src = fetchurl {
url = "https://dl.gitea.io/gitea/${version}/gitea-src-${version}.tar.gz";
hash = "sha256-i2exxgVsQhQtojJkyFJgBejCj6dSRo30ESEtN9n7Vfk=";
hash = "sha256-L0wedLLQ8NBiw7JQ5AiFa+kQb+Vg0jnBtSGtgIknIDg=";
};
vendorHash = null;

View File

@ -2,25 +2,30 @@
let
sets = [
# The compact, sans-serif set:
"comfy"
"comfy-fixed"
"comfy-duo"
# The compact, serif set:
"comfy-motion"
"comfy-motion-fixed"
"comfy-motion-duo"
# The wide, sans-serif set:
"comfy-wide"
"comfy-wide-fixed"
"comfy-wide-duo"
# Family | Shapes | Spacing | Style | Ligatures |
# ------------------------+--------+---------+------------+-----------|
"comfy" # Sans | Compact | Monospaced | Yes |
"comfy-fixed" # Sans | Compact | Monospaced | No |
"comfy-duo" # Sans | Compact | Duospaced | Yes |
# ------------------------+--------+---------+------------+-----------|
"comfy-motion" # Slab | Compact | Monospaced | Yes |
"comfy-motion-fixed" # Slab | Compact | Monospaced | No |
"comfy-motion-duo" # Slab | Compact | Duospaced | Yes |
# ------------------------+--------+---------+------------+-----------|
"comfy-wide" # Sans | Wide | Monospaced | Yes |
"comfy-wide-fixed" # Sans | Wide | Monospaced | No |
"comfy-wide-duo" # Sans | Wide | Duospaced | Yes |
# ------------------------+--------+---------+------------+-----------|
"comfy-wide-motion" # Slab | Wide | Monospaced | Yes |
"comfy-wide-motion-fixed" # Slab | Wide | Monospaced | No |
"comfy-wide-motion-duo" # Slab | Wide | Duospaced | Yes |
];
version = "1.1.0";
version = "1.2.0";
src = fetchFromSourcehut {
owner = "~protesilaos";
repo = "iosevka-comfy";
rev = version;
sha256 = "1h72my1s9pvxww6yijrvhy7hj9dspnshya60i60p1wlzr6d18v3p";
sha256 = "sha256-gHDERf3eDsb59wz+kGa2wLY7RDRWs2woi5P2rZDYjL0=";
};
privateBuildPlan = src.outPath + "/private-build-plans.toml";
makeIosevkaFont = set:
@ -34,11 +39,11 @@ let
src = fetchFromGitHub {
owner = "be5invis";
repo = "iosevka";
rev = "ad1e247a3fb8d2e2561122e8e57dcdc86a23df77";
hash = "sha256-sfItIMl9HOUykoZPsNKRGKwgkSWvNGUe3czHE8qFG5w=";
rev = "d3b461432137b36922e41322c2e45a2401e727a5";
hash = "sha256-Sm+eG6ovVLmvKvQFEZblQV3jCLQRrc9Gga3pukwteLE=";
};
npmDepsHash = "sha256-HaO2q1f+hX3LjccuVCQaqQZCdUH9r7+jiFOR+3m8Suw=";
npmDepsHash = "sha256-pikpi9eyo1a+AFLr7BMl1kegy3PgYFjzmE3QJqPXpNM=";
meta = with lib; {
inherit (src.meta) homepage;

View File

@ -1,7 +1,7 @@
{ lib, stdenv, buildPecl, php, valgrind, pcre2, fetchFromGitHub }:
let
version = "5.0.1";
version = "5.0.3";
in buildPecl {
inherit version;
pname = "swoole";
@ -10,7 +10,7 @@ in buildPecl {
owner = "swoole";
repo = "swoole-src";
rev = "v${version}";
sha256 = "sha256-d0xccbfOmebWR14oTUviWz/mB5IA7iXn0uUWxTQRd9w=";
sha256 = "sha256-xadseYMbA+llzTf9JFIitJK2iR0dN8vAjv3n9/e7FGs=";
};
buildInputs = [ pcre2 ] ++ lib.optionals (!stdenv.isDarwin) [ valgrind ];

View File

@ -28,7 +28,8 @@ buildPythonPackage rec {
propagatedBuildInputs = [
async-timeout
noiseprotocol
protobuf
protobuf.out
protobuf.dev
zeroconf
];

View File

@ -0,0 +1,45 @@
{ lib
, buildPythonPackage
, fetchPypi
, grpcio
, protobuf
, pythonOlder
, pythonRelaxDepsHook
}:
buildPythonPackage rec {
pname = "grpcio-testing";
version = "1.54.0";
format = "setuptools";
disabled = pythonOlder "3.7";
src = fetchPypi {
inherit pname version;
hash = "sha256-/0LlPGUVhV7lh4RDQH7wImxaynN2wDLoELxoUUG8bpM=";
};
postPatch = ''
substituteInPlace setup.py \
--replace "'grpcio>={version}'.format(version=grpc_version.VERSION)" "'grpcio'"
'';
propagatedBuildInputs = [
grpcio
protobuf
];
pythonImportsCheck = [
"grpc_testing"
];
# Module has no tests
doCheck = false;
meta = with lib; {
description = "Testing utilities for gRPC Python";
homepage = "https://grpc.io/";
license = with licenses; [ asl20 ];
maintainers = with maintainers; [ fab ];
};
}

View File

@ -8,13 +8,13 @@
buildPythonPackage rec {
pname = "prometheus-flask-exporter";
version = "0.20.3";
version = "0.22.4";
src = fetchFromGitHub {
owner = "rycus86";
repo = "prometheus_flask_exporter";
rev = version;
hash = "sha256-l9Iw9fvXQMXzq1y/4Dml8uLPJWyqX6SDIXptJVw3cVQ=";
hash = "sha256-GAQ80J7at8Apqu+DUMN3+rLi/lrNv5Y7w/DKpUN2iu8=";
};
propagatedBuildInputs = [ flask prometheus-client ];

View File

@ -1,39 +1,72 @@
{ lib
, stdenv
, buildPythonPackage
, fetchPypi
, grpcio-tools
, ujson
, environs
, fetchFromGitHub
, grpcio
, pandas
, grpcio-testing
, mmh3
, pandas
, pytestCheckHook
, python
, pythonOlder
, pythonRelaxDepsHook
, scikit-learn
, setuptools-scm
, ujson
}:
buildPythonPackage rec {
pname = "pymilvus";
version = "2.2.6";
version = "2.2.8";
format = "pyproject";
src = fetchPypi {
inherit pname version;
hash = "sha256-/i3WObwoY6Ffqw+Guij6+uGbKYKET2AJ+d708efmSx0=";
disabled = pythonOlder "3.7";
src = fetchFromGitHub {
owner = "milvus-io";
repo = pname;
rev = "refs/tags/v${version}";
hash = "sha256-Oqwa/2UT9jyGaEEzjr/phZZStLOZ6JRj+4ck0tmP0W0=";
};
SETUPTOOLS_SCM_PRETEND_VERSION = version;
propagatedBuildInputs = [
grpcio
grpcio-tools
ujson
pandas
mmh3
] ++ lib.optionals stdenv.isLinux [ setuptools-scm ];
pythonRelaxDeps = [
"grpcio"
];
doCheck = false;
nativeBuildInputs = [
pythonRelaxDepsHook
setuptools-scm
];
propagatedBuildInputs = [
environs
grpcio
mmh3
pandas
ujson
];
nativeCheckInputs = [
grpcio-testing
pytestCheckHook
scikit-learn
];
pythonImportsCheck = [
"pymilvus"
];
disabledTests = [
"test_get_commit"
];
meta = with lib; {
description = "Python SDK for Milvus";
homepage = "https://github.com/milvus-io/pymilvus";
description = "Python SDK for Milvus. ";
changelog = "https://github.com/milvus-io/pymilvus/releases/tag/v${version}";
license = licenses.mit;
maintainers = with maintainers; [happysalada];
maintainers = with maintainers; [ happysalada ];
};
}

View File

@ -1,29 +1,43 @@
{ lib
, buildPythonPackage
, fetchPypi
, hatchling
, click
, pythonOlder
}:
buildPythonPackage rec {
pname = "userpath";
version = "1.7.0";
version = "1.8.0";
format = "pyproject";
disabled = pythonOlder "3.7";
src = fetchPypi {
inherit pname version;
sha256="sha256-3NZsX6mxo8EjYvMJu7W8eZK6yK+G0XtOaxpLFmoRxD8=";
hash = "sha256-BCM9L8/lz/kRweT7cYl1VkDhUk/4ekuCq51rh1/uV4c=";
};
propagatedBuildInputs = [ click ];
nativeBuildInputs = [
hatchling
];
# test suite is difficult to emulate in sandbox due to shell manipulation
propagatedBuildInputs = [
click
];
# Test suite is difficult to emulate in sandbox due to shell manipulation
doCheck = false;
pythonImportsCheck = [ "click" "userpath" ];
pythonImportsCheck = [
"userpath"
];
meta = with lib; {
description = "Cross-platform tool for adding locations to the user PATH";
homepage = "https://github.com/ofek/userpath";
license = [ licenses.asl20 licenses.mit ];
changelog = "https://github.com/ofek/userpath/releases/tag/v${version}";
license = with licenses; [ asl20 mit ];
maintainers = with maintainers; [ yshym ];
};
}

View File

@ -4,7 +4,7 @@
, makeWrapper
, makeDesktopItem
, copyDesktopItems
, undmg
, _7zz
, jdk
}:
@ -12,9 +12,7 @@ let
inherit (stdenv.hostPlatform) system;
pname = "jprofiler";
# 11.1.4 is the last version which can be unpacked by undmg
# See: https://github.com/matthewbauer/undmg/issues/9
version = if stdenv.isLinux then "13.0.2" else "11.1.4";
version = "13.0.6";
nameApp = "JProfiler";
meta = with lib; {
@ -30,15 +28,15 @@ let
src = if stdenv.isLinux then fetchurl {
url = "https://download-gcdn.ej-technologies.com/jprofiler/jprofiler_linux_${lib.replaceStrings ["."] ["_"] version}.tar.gz";
sha256 = "sha256-x9I7l2ctquCqUymtlQpFXE6+u0Yg773qE6MvAxvCaEE=";
hash = "sha256-orjBSaC7NvKcak+RSEa9V05oL3EZIBnp7TyaX/8XFyg=";
} else fetchurl {
url = "https://download-gcdn.ej-technologies.com/jprofiler/jprofiler_macos_${lib.replaceStrings ["."] ["_"] version}.dmg";
sha256 = "sha256-WDMGrDsMdY1//WMHgr+/YKSxHWt6A1dD1Pd/MuDOaz8=";
hash = "sha256-OI6NSPqYws5Rv25U5jIPzkyJtB8LF04qHB3NPR9XBWg=";
};
srcIcon = fetchurl {
url = "https://www.ej-technologies.com/assets/content/header-product-jprofiler@2x-24bc4d84bd2a4eb641a5c8531758ff7c.png";
sha256 = "sha256-XUmuqhnNv7mZ3Gb4A0HLSlfiJd5xbCExVsw3hmXHeVE=";
hash = "sha256-XUmuqhnNv7mZ3Gb4A0HLSlfiJd5xbCExVsw3hmXHeVE=";
};
desktopItems = makeDesktopItem {
@ -80,15 +78,20 @@ let
darwin = stdenv.mkDerivation {
inherit pname version src;
# Archive extraction via undmg fails for this particular version.
nativeBuildInputs = [ makeWrapper undmg ];
nativeBuildInputs = [ makeWrapper _7zz ];
sourceRoot = "${nameApp}.app";
unpackPhase = ''
runHook preUnpack
7zz x $src -x!JProfiler/\[\]
runHook postUnpack
'';
sourceRoot = "${nameApp}";
installPhase = ''
runHook preInstall
mkdir -p $out/{Applications/${nameApp}.app,bin}
cp -R . $out/Applications/${nameApp}.app
mkdir -p $out/{Applications,bin}
cp -R ${nameApp}.app $out/Applications/
makeWrapper $out/Applications/${nameApp}.app/Contents/MacOS/JavaApplicationStub $out/bin/${pname}
runHook postInstall
'';

View File

@ -10,16 +10,16 @@
buildGoModule rec {
pname = "hound";
version = "0.6.0";
version = "0.7.0";
src = fetchFromGitHub {
owner = "hound-search";
repo = "hound";
rev = "v${version}";
sha256 = "sha256-M1c4lsD7DQo5+RCCDdyn9FeGuGngMsg1qSrxM2wCzpg=";
sha256 = "sha256-FqAPywVSkFsdgFpFe5m2+/Biwi11aYybKAhf6h2b//g=";
};
vendorSha256 = "sha256-ZgF/PB3VTPx367JUkhOkSEK1uvqENNG0xuNXvCGENnQ=";
vendorSha256 = "sha256-0psvz4bnhGuwwSAXvQp0ju0GebxoUyY2Rjp/D43KF78=";
nativeBuildInputs = [ makeWrapper ];
@ -33,8 +33,8 @@ buildGoModule rec {
passthru.tests = { inherit (nixosTests) hound; };
meta = with lib; {
inherit (src.meta) homepage;
description = "Lightning fast code searching made easy";
homepage = "https://github.com/hound-search/hound";
license = licenses.mit;
maintainers = with maintainers; [ grahamc SuperSandro2000 ];
platforms = platforms.unix;

View File

@ -0,0 +1,49 @@
{ lib
, stdenvNoCC
, fetchurl
, autoPatchelfHook
}:
stdenvNoCC.mkDerivation rec {
pname = "dart-sass-embedded";
version = "1.62.1";
dontConfigure = true;
dontBuild = true;
nativeBuildInputs = lib.optional stdenvNoCC.hostPlatform.isLinux autoPatchelfHook;
src = let base = "https://github.com/sass/dart-sass-embedded/releases/download/${version}/sass_embedded-${version}"; in
fetchurl {
"x86_64-linux" = {
url = "${base}-linux-x64.tar.gz";
hash = "sha256-NXTadacyKlOQNGSLj/hP8syhYuuSTXK2Y9cYzTk28HU=";
};
"aarch64-linux" = {
url = "${base}-linux-arm64.tar.gz";
hash = "sha256-DX29U1AjmqVhKFgzP+71vsdoMjQ13IS93PZ1JLOA7bA=";
};
"x86_64-darwin" = {
url = "${base}-macos-x64.tar.gz";
hash = "sha256-0oyb9YBKoPNaWFLbIUZOJc5yK11uDYyAKKW4urkmRJQ=";
};
"aarch64-darwin" = {
url = "${base}-macos-arm64.tar.gz";
hash = "sha256-dkBcdVbxolK8xXYaOHot0s9FxGmfhMNAEoZqo+2LRfk=";
};
}."${stdenvNoCC.hostPlatform.system}" or (throw "Unsupported system ${stdenvNoCC.hostPlatform.system}");
installPhase = ''
mkdir -p $out/bin
cp -r * $out
ln -s $out/dart-sass-embedded $out/bin/dart-sass-embedded
'';
meta = with lib; {
description = "A wrapper for Dart Sass that implements the compiler side of the Embedded Sass protocol";
homepage = "https://github.com/sass/dart-sass-embedded";
changelog = "https://github.com/sass/dart-sass-embedded/blob/${version}/CHANGELOG.md";
license = licenses.mit;
maintainers = with maintainers; [ shyim ];
};
}

View File

@ -6,7 +6,7 @@
stdenvNoCC.mkDerivation rec {
pname = "raycast";
version = "1.49.3";
version = "1.50.0";
src = fetchurl {
# https://github.com/NixOS/nixpkgs/pull/223495
@ -17,7 +17,7 @@ stdenvNoCC.mkDerivation rec {
# to host GitHub Actions to periodically check for updates
# and re-release the `.dmg` file to Internet Archive (https://archive.org/details/raycast)
url = "https://archive.org/download/raycast/raycast-${version}.dmg";
sha256 = "sha256-Irn99/49fRQg73cX8aKZ72D1o+mDPg44Q1pXAMdXrb0=";
sha256 = "sha256-+LvQDQZjbj/p8VT/af9XwKSKkKd65YzcwrKF9hoXCog=";
};
dontPatch = true;

View File

@ -16,8 +16,8 @@ buildGoModule rec {
ldflags = [ "-s" "-w" ];
meta = with lib; {
inherit (src.meta) homepage;
description = "Minimal IRC server bridge to Mattermost";
homepage = "https://github.com/42wim/matterircd";
license = licenses.mit;
maintainers = with maintainers; [ ];
platforms = platforms.unix;

View File

@ -26,7 +26,7 @@ buildGoModule rec {
meta = with lib; {
description = "Prometheus exporter for Redis metrics";
inherit (src.meta) homepage;
homepage = "https://github.com/oliver006/redis_exporter";
license = licenses.mit;
maintainers = with maintainers; [ eskytthe srhb ma27 ];
platforms = platforms.unix;

View File

@ -2,14 +2,14 @@
buildGoModule rec {
pname = "tempo";
version = "2.1.0";
version = "2.1.1";
src = fetchFromGitHub {
owner = "grafana";
repo = "tempo";
rev = "v${version}";
fetchSubmodules = true;
sha256 = "sha256-fhRIr9dFcfD3hFw6fnrV4yWEcz+CB5xph3KpxnKEWis=";
sha256 = "sha256-gnQAldqfxJk8kbXAyX1VQXddCnSBWnvc3wesYoYI7wI=";
};
vendorSha256 = null;

View File

@ -0,0 +1,13 @@
diff --git a/app/assets/javascripts/discourse/package.json b/app/assets/javascripts/discourse/package.json
index 9e4533d2..e57f8a5f 100644
--- a/app/assets/javascripts/discourse/package.json
+++ b/app/assets/javascripts/discourse/package.json
@@ -14,7 +14,7 @@
"build": "ember build",
"start": "ember serve",
"test": "ember test",
- "postinstall": "yarn --silent --cwd .. patch-package"
+ "postinstall": "patch-package"
},
"dependencies": {
"@babel/core": "^7.21.4",

View File

@ -8,7 +8,7 @@
, bundlerEnv
, callPackage
, ruby_3_1
, ruby_3_2
, replace
, gzip
, gnutar
@ -38,21 +38,22 @@
, fixup_yarn_lock
, nodePackages
, nodejs_16
, dart-sass-embedded
, plugins ? []
}@args:
let
version = "3.1.0.beta2";
version = "3.1.0.beta4";
src = fetchFromGitHub {
owner = "discourse";
repo = "discourse";
rev = "v${version}";
sha256 = "sha256-wkNTm5/QyujPcMUrnc6eWmjhrRQAthhmejmjpy6zmbE=";
sha256 = "sha256-22GXFYPjPYL20amR4xFB4L/dCp32H4Z3uf0GLGEghUE=";
};
ruby = ruby_3_1;
ruby = ruby_3_2;
runtimeDeps = [
# For backups, themes and assets
@ -186,6 +187,20 @@ let
cp $(readlink -f ${libpsl}/lib/libpsl.so) vendor/libpsl.x86_64.so
'';
};
sass-embedded = gems.sass-embedded // {
dontBuild = false;
# `sass-embedded` depends on `dart-sass-embedded` and tries to
# fetch that as `.tar.gz` from GitHub releases. That `.tar.gz`
# can also be specified via `SASS_EMBEDDED`. But instead of
# compressing our `dart-sass-embedded` just to decompress it
# again, we simply patch the Rakefile to symlink that path.
patches = [
./rubyEnv/sass-embedded-static.patch
];
postPatch = ''
export SASS_EMBEDDED=${dart-sass-embedded}
'';
};
};
groups = [
@ -199,7 +214,7 @@ let
yarnOfflineCache = fetchYarnDeps {
yarnLock = src + "/app/assets/javascripts/yarn.lock";
sha256 = "0ryc4p5s35mzg1p71z98x5fvr5fpldmgghdi1viha4ckbpv153lw";
sha256 = "0a20kns4irdpzzx2dvdjbi0m3s754gp737q08z5nlcnffxqvykrk";
};
nativeBuildInputs = runtimeDeps ++ [
@ -207,6 +222,7 @@ let
redis
nodePackages.uglify-js
nodePackages.terser
nodePackages.patch-package
yarn
nodejs_16
];
@ -226,6 +242,12 @@ let
# Fix the rake command used to recursively execute itself in the
# assets precompilation task.
./assets_rake_command.patch
# `app/assets/javascripts/discourse/package.json`'s postinstall
# hook tries to call `../node_modules/.bin/patch-package`, which
# hasn't been `patchShebangs`-ed yet. So instead we just use
# `patch-package` from `nativeBuildInputs`.
./asserts_patch-package_from_path.patch
];
# We have to set up an environment that is close enough to

View File

@ -5,8 +5,8 @@ mkDiscoursePlugin {
src = fetchFromGitHub {
owner = "discourse";
repo = "discourse-assign";
rev = "c6e6a883f66670e5cfc1eb973af8ac5b7c20f815";
sha256 = "sha256-OwNV+ZNogUgd6ZKdXwUqoMqcZKc4jbf276rHIYQzjYc=";
rev = "a655a009fade4671e4a2d38f0a0f7ce89d201d80";
sha256 = "sha256-HCwId3/7NRuToLFyJrOVaAiSxysB7XNZp9BUndSJzlY=";
};
meta = with lib; {
homepage = "https://github.com/discourse/discourse-docs";

View File

@ -1,15 +1,15 @@
GEM
remote: https://rubygems.org/
specs:
activesupport (7.0.4.2)
activesupport (7.0.4.3)
concurrent-ruby (~> 1.0, >= 1.0.2)
i18n (>= 1.6, < 2)
minitest (>= 5.1)
tzinfo (~> 2.0)
concurrent-ruby (1.2.0)
i18n (1.12.0)
concurrent-ruby (1.2.2)
i18n (1.13.0)
concurrent-ruby (~> 1.0)
minitest (5.17.0)
minitest (5.18.0)
rrule (0.4.4)
activesupport (>= 2.3)
tzinfo (2.0.6)
@ -22,4 +22,4 @@ DEPENDENCIES
rrule (= 0.4.4)
BUNDLED WITH
2.4.6
2.4.10

View File

@ -6,8 +6,8 @@ mkDiscoursePlugin {
src = fetchFromGitHub {
owner = "discourse";
repo = "discourse-calendar";
rev = "b71d4979370dcbd6f193b2ac5cfa0267f8a19fed";
sha256 = "sha256-XGybZqoM0nX8acLo3iwo+zD+zA4pz/ekLOnmDRNIVSo=";
rev = "d85e8e288d69788e0c3202bb3dab9c3450a98914";
sha256 = "sha256-mSn2gGidH4iSZ0fhf3UPh9pwMQurK0YGW2OAtdEWFBQ=";
};
meta = with lib; {
homepage = "https://github.com/discourse/discourse-calendar";

View File

@ -5,20 +5,20 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "0dmywys50074vj5rivpx188b00qimlc4jn84xzqlialrgp3ckq5f";
sha256 = "15m0b1im6i401ab51vzr7f8nk8kys1qa0snnl741y3sir3xd07jp";
type = "gem";
};
version = "7.0.4.2";
version = "7.0.4.3";
};
concurrent-ruby = {
groups = ["default"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "1qnsflsbjj38im8xq35g0vihlz96h09wjn2dad5g543l3vvrkrx5";
sha256 = "0krcwb6mn0iklajwngwsg850nk8k9b35dhmc2qkbdqvmifdi2y9q";
type = "gem";
};
version = "1.2.0";
version = "1.2.2";
};
i18n = {
dependencies = ["concurrent-ruby"];
@ -26,20 +26,20 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "1vdcchz7jli1p0gnc669a7bj3q1fv09y9ppf0y3k0vb1jwdwrqwi";
sha256 = "1yk33slipi3i1kydzrrchbi7cgisaxym6pgwlzx7ir8vjk6wl90x";
type = "gem";
};
version = "1.12.0";
version = "1.13.0";
};
minitest = {
groups = ["default"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "1kjy67qajw4rnkbjs5jyk7kc3lyhz5613fwj1i8f6ppdk4zampy0";
sha256 = "0ic7i5z88zcaqnpzprf7saimq2f6sad57g5mkkqsrqrcd6h3mx06";
type = "gem";
};
version = "5.17.0";
version = "5.18.0";
};
rrule = {
dependencies = ["activesupport"];

View File

@ -5,8 +5,8 @@ mkDiscoursePlugin {
src = fetchFromGitHub {
owner = "discourse";
repo = "discourse-canned-replies";
rev = "b30b20d43ba5cbbb1ff1476bb43e97d5b8a807e8";
sha256 = "sha256-XROYSqGy4Z39VAlMXCbx9d+kivpknN98Kn/HhoC4ndQ=";
rev = "5a2d9a11ef3f07fc781acd83770bafc14eca2c1b";
sha256 = "sha256-R6CmL1hqqybc/I3oAzr3xZ4WThPWQirMjlXkF82xmIk=";
};
meta = with lib; {
homepage = "https://github.com/discourse/discourse-canned-replies";

View File

@ -5,8 +5,8 @@ mkDiscoursePlugin {
src = fetchFromGitHub {
owner = "discourse";
repo = "discourse-chat-integration";
rev = "0522ad64143c9aedb27e00b642e82cad1273c83b";
sha256 = "sha256-GsoDVZkmKEX8+HwwQXptmmRuykTDqkbsL4WbFsL/PSo=";
rev = "9647c7afc0df42b8e2b5ae585afaf51f107fa195";
sha256 = "sha256-lP404OJvEEQVKIQTBMca7zb/YxQ6HXcPG1jMKpEB3iA=";
};
meta = with lib; {
homepage = "https://github.com/discourse/discourse-chat-integration";

View File

@ -5,8 +5,8 @@ mkDiscoursePlugin {
src = fetchFromGitHub {
owner = "discourse";
repo = "discourse-data-explorer";
rev = "556d12ac507b140d1ed9d307cad58fa8e1d8cfdd";
sha256 = "sha256-fcO/j506kIydnipx6VsuMkj4Wb2MmPCo3LSrj9Fnczc=";
rev = "f99b3af7ed4a21474f35223e83013ee3e8ad7002";
sha256 = "sha256-3bBKBSc/+yF9ogNj3J6HXM3ynoAoUZeHhZOOhTfbxDw=";
};
meta = with lib; {
homepage = "https://github.com/discourse/discourse-data-explorer";

View File

@ -5,8 +5,8 @@ mkDiscoursePlugin {
src = fetchFromGitHub {
owner = "discourse";
repo = "discourse-docs";
rev = "bf1c4574a61b053c136e2b181ba2fedb6c16f838";
sha256 = "sha256-voo3Q+e/Ud1Hg+SdHlvRsxoacFnPOQXwWu/g6n5cR3Y=";
rev = "0b4d2f3691048b6e0e257a1ac9ed01f66f662ba8";
sha256 = "sha256-HeIUCTbMNpuo6zeaDClsGrUOz4m0L+4UK7AwPsrKIHY=";
};
meta = with lib; {
homepage = "https://github.com/discourse/discourse-docs";

View File

@ -1,7 +1,7 @@
GEM
remote: https://rubygems.org/
specs:
addressable (2.8.1)
addressable (2.8.4)
public_suffix (>= 2.0.2, < 6.0)
faraday (2.7.4)
faraday-net_http (>= 2.0, < 3.1)
@ -24,4 +24,4 @@ DEPENDENCIES
sawyer (= 0.9.2)
BUNDLED WITH
2.4.6
2.4.10

View File

@ -6,8 +6,8 @@ mkDiscoursePlugin {
src = fetchFromGitHub {
owner = "discourse";
repo = "discourse-github";
rev = "148f28c1089288c9527fab1dcb88f13a5a5b0d10";
sha256 = "sha256-u91X+YFoKE0lP4RnNWX2XzNrJvlOQPbuZzFqBEVf84w=";
rev = "77e336a1b4ea08e2bb8a010d30146e4844afb3f3";
sha256 = "sha256-VHuf4ymT+W676RAuA3WPQl9QXLdQz4s8vP9EC8XAwW0=";
};
meta = with lib; {
homepage = "https://github.com/discourse/discourse-github";

View File

@ -5,10 +5,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "1ypdmpdn20hxp5vwxz3zc04r5xcwqc25qszdlg41h8ghdqbllwmw";
sha256 = "15s8van7r2ad3dq6i03l3z4hqnvxcq75a3h72kxvf9an53sqma20";
type = "gem";
};
version = "2.8.1";
version = "2.8.4";
};
faraday = {
dependencies = ["faraday-net_http" "ruby2_keywords"];

View File

@ -12,7 +12,7 @@ GEM
pyu-ruby-sasl (~> 0.0.3.2)
rubyntlm (~> 0.3.4)
pyu-ruby-sasl (0.0.3.3)
rack (2.2.6.2)
rack (2.2.7)
rubyntlm (0.3.4)
PLATFORMS
@ -25,4 +25,4 @@ DEPENDENCIES
rubyntlm (= 0.3.4)
BUNDLED WITH
2.4.6
2.4.10

View File

@ -6,8 +6,8 @@ mkDiscoursePlugin {
src = fetchFromGitHub {
owner = "jonmbake";
repo = "discourse-ldap-auth";
rev = "2f7a04b9fbeda0c8ab5c70e9012e4914ede9a707";
sha256 = "sha256-zBug9PHgvRsdQjvfWE5Bylm+0Ot+jBHFrbux7+Kn72c=";
rev = "edcf06957090e8d978a89fe7b07a6ba56fe35214";
sha256 = "sha256-VxBBip8QEXDQGDOsU5cXjUZe2HThJn20BPsNr33KhKI=";
};
meta = with lib; {
homepage = "https://github.com/jonmbake/discourse-ldap-auth";

View File

@ -56,10 +56,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "0qvp6h2abmlsl4sqjsvac03cr2mxq6143gbx4kq52rpazp021qsb";
sha256 = "16w217k9z02c4hqizym8dkj6bqmmzx4qdvqpnskgzf174a5pwdxk";
type = "gem";
};
version = "2.2.6.2";
version = "2.2.7";
};
rubyntlm = {
groups = ["default"];

View File

@ -6,8 +6,8 @@ mkDiscoursePlugin {
src = fetchFromGitHub {
owner = "discourse";
repo = "discourse-openid-connect";
rev = "fd552d5eee75ba5710ce92bcd2fa7457ec98bcab";
sha256 = "sha256-+58QfVvA6BqI/5AfdI4RiSSMzWHvAJMxPvDS2r5FieU=";
rev = "a16d5edd386f4099064753a4eed72ecb9c1bb1a8";
sha256 = "sha256-9Fuu/UFmU4Gpkm5cRKOgDK0bt7nD545X18wtue+IrN8=";
};
meta = with lib; {
homepage = "https://github.com/discourse/discourse-openid-connect";

View File

@ -13,4 +13,4 @@ DEPENDENCIES
webrick (= 1.7.0)
BUNDLED WITH
2.4.6
2.4.10

View File

@ -6,8 +6,8 @@
src = fetchFromGitHub {
owner = "discourse";
repo = "discourse-prometheus";
rev = "78324fbaa8cfa3040ee7e01ac793ad2515b6c004";
sha256 = "sha256-xzI6gzRztLuEzFHlMi3iXZP9bRRMsRHRQEBrwqyzpdk=";
rev = "802cb5aa89838ecb3078dbe21b70d87b1675d89e";
sha256 = "sha256-tgujK/k/7l/9dAFna5sfUpgP0PVfjk+aGRbqZ70lmRw=";
};
patches = [

View File

@ -5,8 +5,8 @@ mkDiscoursePlugin {
src = fetchFromGitHub {
owner = "discourse";
repo = "discourse-reactions";
rev = "aba16d53d15ceca9ae18595ae85defbd10fe0256";
sha256 = "sha256-mGyMQGNa5Q2hMQkdIsa1JArA6cqSK+FmGSDJFZxS/go=";
rev = "01aca15b2774c088f3673118e92e9469f37d2fb6";
sha256 = "sha256-txQ1G2pBcl4bMBwv3vTs9dwBGKp2uEBvK7BuqQ1O8xg=";
};
meta = with lib; {
homepage = "https://github.com/discourse/discourse-reactions";

View File

@ -5,8 +5,8 @@ mkDiscoursePlugin {
src = fetchFromGitHub {
owner = "discourse";
repo = "discourse-saved-searches";
rev = "d0b568efe6f829617a5bb85793f0ec1d697f2a96";
sha256 = "sha256-455ovBExE2+vuZOc0bESAbhtTOXqkMrQ//mVSIitLig=";
rev = "5c6d1b6c186c5c96bb92bd6de62d3bc2da6a5b68";
sha256 = "sha256-Z9wWwf9gH/Iainxx089J4eT7MpQeHpFXgTU40p/IcYY=";
};
meta = with lib; {
homepage = "https://github.com/discourse/discourse-saved-searches";

View File

@ -5,8 +5,8 @@ mkDiscoursePlugin {
src = fetchFromGitHub {
owner = "discourse";
repo = "discourse-solved";
rev = "8580f96fdf64abf8b22fa4b28d67a4cb0d72fc42";
sha256 = "sha256-YpUybEXQuPeDxxdX9dMNw4h6Mh/zNUaiR3bwzck5Urg=";
rev = "29a991e60f3ca3bb44d382d675e4458794a683f3";
sha256 = "sha256-6flXuGA7SdIlGLYzyY5AXzQF/cEs39XfeptoBia8SHw=";
};
meta = with lib; {
homepage = "https://github.com/discourse/discourse-solved";

View File

@ -5,8 +5,8 @@ mkDiscoursePlugin {
src = fetchFromGitHub {
owner = "discourse";
repo = "discourse-spoiler-alert";
rev = "a5fdb9096d638ac4a2a3f8ea6b02b6cb04c667d8";
sha256 = "sha256-S2Xtd/csB1YI85OA+2UO+OgF5u75Oi2YgIukQNOTQjk=";
rev = "0ee68da1fe1d029685a373df7fc874fcd2e50991";
sha256 = "sha256-z+0RL7HAJ92TyI1z2DBpirYN7IWzV7iGejs8Howo2+s=";
};
meta = with lib; {
homepage = "https://github.com/discourse/discourse-spoiler-alert";

View File

@ -5,8 +5,8 @@ mkDiscoursePlugin {
src = fetchFromGitHub {
owner = "discourse";
repo = "discourse-voting";
rev = "54e134c9b4dfeeb7585ff2c2a782990308733d8b";
sha256 = "sha256-0V+4G2XxUjL424DChFIFjCKm2zWaTAXOSiB9Ic8/lF0=";
rev = "d9cab9664263e75d46533fb83586ce88cb2b6cfe";
sha256 = "sha256-cKbsc2ZPXaU4CAzM+oqwbs93l3NMrOGw4IBZLVZIDyw=";
};
meta = with lib; {
homepage = "https://github.com/discourse/discourse-voting";

View File

@ -5,8 +5,8 @@ mkDiscoursePlugin {
src = fetchFromGitHub {
owner = "discourse";
repo = "discourse-yearly-review";
rev = "cb9a2df92788b0a285a595d4acf1749620f62974";
sha256 = "sha256-Hu61ULEXUxb/cjH7Z47hpBchyUTkz0QqunWoW8mSVQg=";
rev = "af7e294d04ca7b0c64dd604d19a553500accee51";
sha256 = "sha256-ioUJqLe/sUDKKa106hGY4OhwOgC+96YFQ4Lqr/CFF7Y=";
};
meta = with lib; {
homepage = "https://github.com/discourse/discourse-yearly-review";

View File

@ -18,7 +18,7 @@ else
# this allows us to include the bits of rails we use without pieces we do not.
#
# To issue a rails update bump the version number here
rails_version = "7.0.4.1"
rails_version = "7.0.4.3"
gem "actionmailer", rails_version
gem "actionpack", rails_version
gem "actionview", rails_version
@ -41,7 +41,7 @@ gem "actionview_precompiler", require: false
gem "discourse-seed-fu"
gem "mail", git: "https://github.com/discourse/mail.git"
gem "mail"
gem "mini_mime"
gem "mini_suffix"
@ -71,8 +71,6 @@ gem "rails_multisite"
gem "fast_xs", platform: :ruby
gem "xorcist"
gem "fastimage"
gem "aws-sdk-s3", require: false
@ -105,7 +103,7 @@ gem "pg"
gem "mini_sql"
gem "pry-rails", require: false
gem "pry-byebug", require: false
gem "r2", require: false
gem "rtlcss", require: false
gem "rake"
gem "thor", require: false
@ -180,6 +178,7 @@ group :development do
gem "better_errors", platform: :mri, require: !!ENV["BETTER_ERRORS"]
gem "binding_of_caller"
gem "yaml-lint"
gem "yard"
end
if ENV["ALLOW_DEV_POPULATE"] == "1"
@ -229,10 +228,9 @@ gem "logstash-event", require: false
gem "logstash-logger", require: false
gem "logster"
# NOTE: later versions of sassc are causing a segfault, possibly dependent on processer architecture
# and until resolved should be locked at 2.0.1
gem "sassc", "2.0.1", require: false
gem "sassc-rails"
# These are forks of sassc and sassc-rails with dart-sass support
gem "dartsass-ruby"
gem "dartsass-sprockets"
gem "rotp", require: false
@ -279,3 +277,5 @@ gem "webrick", require: false
# Workaround until Ruby ships with cgi version 0.3.6 or higher.
gem "cgi", ">= 0.3.6", require: false
gem "tzinfo-data"

View File

@ -1,10 +1,3 @@
GIT
remote: https://github.com/discourse/mail.git
revision: 5b700fc95ee66378e0cf2559abc73c8bc3062a4b
specs:
mail (2.8.0.edge)
mini_mime (>= 0.1.1)
GIT
remote: https://github.com/rails/sprockets
revision: f4d3dae71ef29c44b75a49cfbf8032cce07b423a
@ -17,25 +10,25 @@ GIT
GEM
remote: https://rubygems.org/
specs:
actionmailer (7.0.4.1)
actionpack (= 7.0.4.1)
actionview (= 7.0.4.1)
activejob (= 7.0.4.1)
activesupport (= 7.0.4.1)
actionmailer (7.0.4.3)
actionpack (= 7.0.4.3)
actionview (= 7.0.4.3)
activejob (= 7.0.4.3)
activesupport (= 7.0.4.3)
mail (~> 2.5, >= 2.5.4)
net-imap
net-pop
net-smtp
rails-dom-testing (~> 2.0)
actionpack (7.0.4.1)
actionview (= 7.0.4.1)
activesupport (= 7.0.4.1)
actionpack (7.0.4.3)
actionview (= 7.0.4.3)
activesupport (= 7.0.4.3)
rack (~> 2.0, >= 2.2.0)
rack-test (>= 0.6.3)
rails-dom-testing (~> 2.0)
rails-html-sanitizer (~> 1.0, >= 1.2.0)
actionview (7.0.4.1)
activesupport (= 7.0.4.1)
actionview (7.0.4.3)
activesupport (= 7.0.4.3)
builder (~> 3.1)
erubi (~> 1.4)
rails-dom-testing (~> 2.0)
@ -44,20 +37,20 @@ GEM
actionview (>= 6.0.a)
active_model_serializers (0.8.4)
activemodel (>= 3.0)
activejob (7.0.4.1)
activesupport (= 7.0.4.1)
activejob (7.0.4.3)
activesupport (= 7.0.4.3)
globalid (>= 0.3.6)
activemodel (7.0.4.1)
activesupport (= 7.0.4.1)
activerecord (7.0.4.1)
activemodel (= 7.0.4.1)
activesupport (= 7.0.4.1)
activesupport (7.0.4.1)
activemodel (7.0.4.3)
activesupport (= 7.0.4.3)
activerecord (7.0.4.3)
activemodel (= 7.0.4.3)
activesupport (= 7.0.4.3)
activesupport (7.0.4.3)
concurrent-ruby (~> 1.0, >= 1.0.2)
i18n (>= 1.6, < 2)
minitest (>= 5.1)
tzinfo (~> 2.0)
addressable (2.8.1)
addressable (2.8.4)
public_suffix (>= 2.0.2, < 6.0)
annotate (3.2.0)
activerecord (>= 3.2, < 8.0)
@ -88,14 +81,14 @@ GEM
rack (>= 0.9.0)
binding_of_caller (1.0.0)
debug_inspector (>= 0.0.1)
bootsnap (1.15.0)
bootsnap (1.16.0)
msgpack (~> 1.2)
builder (3.2.4)
bullet (7.0.7)
activesupport (>= 3.0.0)
uniform_notifier (~> 1.11)
byebug (11.1.3)
capybara (3.38.0)
capybara (3.39.0)
addressable
matrix
mini_mime (>= 0.1.3)
@ -110,8 +103,8 @@ GEM
chunky_png (1.4.0)
coderay (1.1.3)
colored2 (3.1.2)
concurrent-ruby (1.2.0)
connection_pool (2.3.0)
concurrent-ruby (1.2.2)
connection_pool (2.4.0)
cose (1.3.0)
cbor (~> 0.5.9)
openssl-signature_algorithm (~> 1.0)
@ -121,6 +114,14 @@ GEM
crass (1.0.6)
css_parser (1.14.0)
addressable
dartsass-ruby (3.0.1)
sass-embedded (~> 1.54)
dartsass-sprockets (3.0.0)
dartsass-ruby (~> 3.0)
railties (>= 4.0.0)
sprockets (> 3.0)
sprockets-rails
tilt
date (3.3.3)
debug_inspector (1.1.0)
diff-lcs (1.5.0)
@ -138,7 +139,7 @@ GEM
regexp_parser (~> 2.2)
email_reply_trimmer (0.1.13)
erubi (1.12.0)
excon (0.97.2)
excon (0.99.0)
execjs (2.8.1)
exifr (1.3.10)
fabrication (2.30.0)
@ -149,7 +150,7 @@ GEM
faraday-net_http (>= 2.0, < 3.1)
ruby2_keywords (>= 0.0.4)
faraday-net_http (3.0.2)
faraday-retry (2.0.0)
faraday-retry (2.1.0)
faraday (~> 2.0)
fast_blank (1.0.1)
fast_xs (0.8.0)
@ -157,8 +158,9 @@ GEM
ffi (1.15.5)
fspath (3.1.2)
gc_tracer (1.5.1)
globalid (1.0.1)
globalid (1.1.0)
activesupport (>= 5.0)
google-protobuf (3.22.3)
guess_html_encoding (0.0.11)
hana (1.3.7)
hashdiff (1.0.1)
@ -169,7 +171,7 @@ GEM
http_accept_language (2.1.1)
i18n (1.12.0)
concurrent-ruby (~> 1.0)
image_optim (0.31.2)
image_optim (0.31.3)
exifr (~> 1.2, >= 1.2.2)
fspath (~> 3.0)
image_size (>= 1.5, < 4)
@ -186,7 +188,7 @@ GEM
hana (~> 1.3)
regexp_parser (~> 2.0)
uri_template (~> 0.7)
jwt (2.6.0)
jwt (2.7.0)
kgio (2.11.4)
libv8-node (16.10.0.0)
listen (3.8.0)
@ -201,12 +203,17 @@ GEM
logstash-event (1.2.02)
logstash-logger (0.26.1)
logstash-event (~> 1.2)
logster (2.11.3)
loofah (2.19.1)
logster (2.12.2)
loofah (2.20.0)
crass (~> 1.0.2)
nokogiri (>= 1.5.9)
lru_redux (1.1.0)
lz4-ruby (0.3.3)
mail (2.8.1)
mini_mime (>= 0.1.1)
net-imap
net-pop
net-smtp
matrix (0.4.2)
maxminddb (0.1.22)
memory_profiler (1.0.1)
@ -222,10 +229,10 @@ GEM
mini_sql (1.4.0)
mini_suffix (0.3.3)
ffi (~> 1.9)
minitest (5.17.0)
minitest (5.18.0)
mocha (2.0.2)
ruby2_keywords (>= 0.0.5)
msgpack (1.6.0)
msgpack (1.7.0)
multi_json (1.15.0)
multi_xml (0.6.0)
mustache (1.1.1)
@ -240,8 +247,8 @@ GEM
timeout
net-smtp (0.3.3)
net-protocol
nio4r (2.5.8)
nokogiri (1.14.0)
nio4r (2.5.9)
nokogiri (1.14.3)
mini_portile2 (~> 2.8.0)
racc (~> 1.4)
oauth (1.1.0)
@ -279,17 +286,17 @@ GEM
omniauth-twitter (1.4.0)
omniauth-oauth (~> 1.1)
rack
openssl (3.0.2)
openssl-signature_algorithm (1.2.1)
openssl (> 2.0, < 3.1)
openssl (3.1.0)
openssl-signature_algorithm (1.3.0)
openssl (> 2.0)
optimist (3.0.1)
parallel (1.22.1)
parallel_tests (4.1.0)
parallel_tests (4.2.0)
parallel
parser (3.2.0.0)
parser (3.2.2.0)
ast (~> 2.4.1)
pg (1.4.5)
prettier_print (1.2.0)
pg (1.4.6)
prettier_print (1.2.1)
progress (3.6.0)
pry (0.14.2)
coderay (~> 1.1)
@ -300,38 +307,37 @@ GEM
pry-rails (0.3.9)
pry (>= 0.10.4)
public_suffix (5.0.1)
puma (6.0.2)
puma (6.2.1)
nio4r (~> 2.0)
r2 (0.2.7)
racc (1.6.2)
rack (2.2.6.2)
rack-mini-profiler (3.0.0)
rack (2.2.6.4)
rack-mini-profiler (3.1.0)
rack (>= 1.2.0)
rack-protection (3.0.5)
rack-protection (3.0.6)
rack
rack-test (2.0.2)
rack-test (2.1.0)
rack (>= 1.3)
rails-dom-testing (2.0.3)
activesupport (>= 4.2.0)
nokogiri (>= 1.6)
rails-html-sanitizer (1.5.0)
loofah (~> 2.19, >= 2.19.1)
rails_failover (0.8.1)
rails_failover (1.0.0)
activerecord (> 6.0, < 7.1)
concurrent-ruby
railties (> 6.0, < 7.1)
rails_multisite (4.0.1)
activerecord (> 5.0, < 7.1)
railties (> 5.0, < 7.1)
railties (7.0.4.1)
actionpack (= 7.0.4.1)
activesupport (= 7.0.4.1)
railties (7.0.4.3)
actionpack (= 7.0.4.3)
activesupport (= 7.0.4.3)
method_source
rake (>= 12.2)
thor (~> 1.0)
zeitwerk (~> 2.5)
rainbow (3.1.1)
raindrops (0.20.0)
raindrops (0.20.1)
rake (13.0.6)
rb-fsevent (0.11.2)
rb-inotify (0.10.1)
@ -341,10 +347,10 @@ GEM
msgpack (>= 0.4.3)
optimist (>= 3.0.0)
rchardet (1.8.0)
redis (4.8.0)
redis (4.8.1)
redis-namespace (1.10.0)
redis (>= 4)
regexp_parser (2.6.2)
regexp_parser (2.8.0)
request_store (1.5.1)
rack (>= 1.4)
rexml (3.2.5)
@ -358,7 +364,7 @@ GEM
rspec-core (~> 3.12.0)
rspec-expectations (~> 3.12.0)
rspec-mocks (~> 3.12.0)
rspec-core (3.12.0)
rspec-core (3.12.1)
rspec-support (~> 3.12.0)
rspec-expectations (3.12.2)
diff-lcs (>= 1.2.0, < 2.0)
@ -366,7 +372,7 @@ GEM
rspec-html-matchers (0.10.0)
nokogiri (~> 1)
rspec (>= 3.0.0.a)
rspec-mocks (3.12.3)
rspec-mocks (3.12.5)
diff-lcs (>= 1.2.0, < 2.0)
rspec-support (~> 3.12.0)
rspec-rails (6.0.1)
@ -385,46 +391,42 @@ GEM
json-schema (>= 2.2, < 4.0)
railties (>= 3.1, < 7.1)
rspec-core (>= 2.14)
rubocop (1.44.0)
rtlcss (0.2.0)
mini_racer (~> 0.6.3)
rubocop (1.50.2)
json (~> 2.3)
parallel (~> 1.10)
parser (>= 3.2.0.0)
rainbow (>= 2.2.2, < 4.0)
regexp_parser (>= 1.8, < 3.0)
rexml (>= 3.2.5, < 4.0)
rubocop-ast (>= 1.24.1, < 2.0)
rubocop-ast (>= 1.28.0, < 2.0)
ruby-progressbar (~> 1.7)
unicode-display_width (>= 2.4.0, < 3.0)
rubocop-ast (1.24.1)
parser (>= 3.1.1.0)
rubocop-capybara (2.17.0)
rubocop-ast (1.28.0)
parser (>= 3.2.1.0)
rubocop-capybara (2.17.1)
rubocop (~> 1.41)
rubocop-discourse (3.0.3)
rubocop-discourse (3.2.0)
rubocop (>= 1.1.0)
rubocop-rspec (>= 2.0.0)
rubocop-rspec (2.18.1)
rubocop-rspec (2.19.0)
rubocop (~> 1.33)
rubocop-capybara (~> 2.17)
ruby-prof (1.4.5)
ruby-progressbar (1.11.0)
ruby-prof (1.6.1)
ruby-progressbar (1.13.0)
ruby-readability (0.7.0)
guess_html_encoding (>= 0.0.4)
nokogiri (>= 1.6.0)
ruby2_keywords (0.0.5)
rubyzip (2.3.2)
sanitize (6.0.0)
sanitize (6.0.1)
crass (~> 1.0.2)
nokogiri (>= 1.12.0)
sassc (2.0.1)
ffi (~> 1.9)
rake
sassc-rails (2.1.2)
railties (>= 4.0.0)
sassc (>= 2.0)
sprockets (> 3.0)
sprockets-rails
tilt
selenium-webdriver (4.8.0)
sass-embedded (1.62.0)
google-protobuf (~> 3.21)
rake (>= 10.0.0)
selenium-webdriver (4.8.6)
rexml (~> 3.2, >= 3.2.5)
rubyzip (>= 1.2.2, < 3.0)
websocket (~> 1.0)
@ -448,16 +450,18 @@ GEM
activesupport (>= 5.2)
sprockets (>= 3.0.0)
sshkey (2.0.0)
stackprof (0.2.23)
syntax_tree (5.2.0)
stackprof (0.2.25)
syntax_tree (6.1.1)
prettier_print (>= 1.2.0)
syntax_tree-disable_ternary (1.0.0)
test-prof (1.1.0)
test-prof (1.2.1)
thor (1.2.1)
tilt (2.0.11)
timeout (0.3.1)
tzinfo (2.0.5)
tilt (2.1.0)
timeout (0.3.2)
tzinfo (2.0.6)
concurrent-ruby (~> 1.0)
tzinfo-data (1.2023.3)
tzinfo (>= 1.0.0)
uglifier (4.2.0)
execjs (>= 0.3.0, < 3)
unf (0.1.4)
@ -468,9 +472,9 @@ GEM
kgio (~> 2.6)
raindrops (~> 0.7)
uniform_notifier (1.16.0)
uri (0.12.0)
uri (0.12.1)
uri_template (0.7.0)
version_gem (1.1.1)
version_gem (1.1.2)
web-push (3.0.0)
hkdf (~> 1.0)
jwt (~> 2.0)
@ -485,24 +489,24 @@ GEM
hashdiff (>= 0.4.0, < 2.0.0)
webrick (1.7.0)
websocket (1.2.9)
xorcist (1.1.3)
xpath (3.2.0)
nokogiri (~> 1.8)
yaml-lint (0.1.2)
zeitwerk (2.6.6)
yard (0.9.34)
zeitwerk (2.6.7)
PLATFORMS
ruby
DEPENDENCIES
actionmailer (= 7.0.4.1)
actionpack (= 7.0.4.1)
actionview (= 7.0.4.1)
actionmailer (= 7.0.4.3)
actionpack (= 7.0.4.3)
actionview (= 7.0.4.3)
actionview_precompiler
active_model_serializers (~> 0.8.3)
activemodel (= 7.0.4.1)
activerecord (= 7.0.4.1)
activesupport (= 7.0.4.1)
activemodel (= 7.0.4.3)
activerecord (= 7.0.4.3)
activesupport (= 7.0.4.3)
addressable
annotate
aws-sdk-s3
@ -520,6 +524,8 @@ DEPENDENCIES
cose
cppjieba_rb
css_parser
dartsass-ruby
dartsass-sprockets
diffy
digest
discourse-fonts
@ -551,7 +557,7 @@ DEPENDENCIES
loofah
lru_redux
lz4-ruby
mail!
mail
maxminddb
memory_profiler
message_bus
@ -581,13 +587,12 @@ DEPENDENCIES
pry-byebug
pry-rails
puma
r2
rack
rack-mini-profiler
rack-protection
rails_failover
rails_multisite
railties (= 7.0.4.1)
railties (= 7.0.4.3)
rake
rb-fsevent
rbtrace
@ -602,13 +607,12 @@ DEPENDENCIES
rspec-rails
rss
rswag-specs
rtlcss
rubocop-discourse
ruby-prof
ruby-readability
rubyzip
sanitize
sassc (= 2.0.1)
sassc-rails
selenium-webdriver
shoulda-matchers
sidekiq
@ -621,6 +625,7 @@ DEPENDENCIES
syntax_tree-disable_ternary
test-prof
thor
tzinfo-data
uglifier
unf
unicorn
@ -628,8 +633,8 @@ DEPENDENCIES
webdrivers
webmock
webrick
xorcist
yaml-lint
yard
BUNDLED WITH
2.4.6
2.4.10

View File

@ -5,10 +5,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "1v4ra6jx4bynzj3im6fjbyyy1h6582qg72r6i42myls84z75qsxk";
sha256 = "112ga1x7y5l0fmammlwajzqxp0fbg1ciw7f6ad9a55wrb0n3hk3y";
type = "gem";
};
version = "7.0.4.1";
version = "7.0.4.3";
};
actionpack = {
dependencies = ["actionview" "activesupport" "rack" "rack-test" "rails-dom-testing" "rails-html-sanitizer"];
@ -16,10 +16,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "1g823r92w9c1si2mxd82mibdva1fyw0ccin0dc2bpbszk6zfyxrh";
sha256 = "1cb0hqkfkc0b9s7swvi4nf64c24i3ma1gv09anr8a81k56s0rwxd";
type = "gem";
};
version = "7.0.4.1";
version = "7.0.4.3";
};
actionview = {
dependencies = ["activesupport" "builder" "erubi" "rails-dom-testing" "rails-html-sanitizer"];
@ -27,10 +27,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "1pfnbkq1hzzxzrnc0m1dd0l2cad6x041dfv3ndrkk5llcjarphx2";
sha256 = "1h9027sqzfcbc84dnzw8nxjyg15zrk1y2fc0468wg1xi9nmyw96z";
type = "gem";
};
version = "7.0.4.1";
version = "7.0.4.3";
};
actionview_precompiler = {
dependencies = ["actionview"];
@ -60,10 +60,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "0yrjvd2w3l6fd5s984hn885dwcxj078ggfbbr1cpynjnqxrvvm6f";
sha256 = "08xawfj8lkxlfwnmx3f7324w126rli6mqdx9j6ybz2ks9vxz0x3w";
type = "gem";
};
version = "7.0.4.1";
version = "7.0.4.3";
};
activemodel = {
dependencies = ["activesupport"];
@ -71,10 +71,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "0y1v2jy4cwi6dkd9yr399kw53smaiyiqx7bsnljwmsz98g125sdw";
sha256 = "0ymhsxgdb68zgf4zp07g2bymmpgn0b9r38avn9pagz1p5zy1ql9v";
type = "gem";
};
version = "7.0.4.1";
version = "7.0.4.3";
};
activerecord = {
dependencies = ["activemodel" "activesupport"];
@ -82,10 +82,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "1c3wvrym6ib2a6ljc4n572gsrr46hazp7f0zijm8jdc8zp3yx5vi";
sha256 = "01wb98i2zsbb4jcb4i6z72vb05wiks4hv9chc66h1rsxrv0zi4dv";
type = "gem";
};
version = "7.0.4.1";
version = "7.0.4.3";
};
activesupport = {
dependencies = ["concurrent-ruby" "i18n" "minitest" "tzinfo"];
@ -93,10 +93,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "1j0ms94ng1hsxb37aar5j3n4mabjqvjkcl70adjrqib7grriyq7b";
sha256 = "15m0b1im6i401ab51vzr7f8nk8kys1qa0snnl741y3sir3xd07jp";
type = "gem";
};
version = "7.0.4.1";
version = "7.0.4.3";
};
addressable = {
dependencies = ["public_suffix"];
@ -104,10 +104,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "1ypdmpdn20hxp5vwxz3zc04r5xcwqc25qszdlg41h8ghdqbllwmw";
sha256 = "15s8van7r2ad3dq6i03l3z4hqnvxcq75a3h72kxvf9an53sqma20";
type = "gem";
};
version = "2.8.1";
version = "2.8.4";
};
annotate = {
dependencies = ["activerecord" "rake"];
@ -241,10 +241,10 @@
}];
source = {
remotes = ["https://rubygems.org"];
sha256 = "1ln89f9ypzincd5hqgmzd5vvfgf7fgir56v1spsri40ma88vnipj";
sha256 = "1vcg52gwl64xhhal6kwk1pc01y1klzdlnv1awyk89kb91z010x7q";
type = "gem";
};
version = "1.15.0";
version = "1.16.0";
};
builder = {
groups = ["default" "development" "test"];
@ -287,10 +287,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "123198zk2ak8mziwa5jc3ckgpmsg08zn064n3aywnqm9s1bwjv3v";
sha256 = "06b4nlhirsq8ny17s8zgz7qyvl9v41rixj1xkviiiwxlnjz982d3";
type = "gem";
};
version = "3.38.0";
version = "3.39.0";
};
cbor = {
groups = ["default"];
@ -361,20 +361,20 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "1qnsflsbjj38im8xq35g0vihlz96h09wjn2dad5g543l3vvrkrx5";
sha256 = "0krcwb6mn0iklajwngwsg850nk8k9b35dhmc2qkbdqvmifdi2y9q";
type = "gem";
};
version = "1.2.0";
version = "1.2.2";
};
connection_pool = {
groups = ["default"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "1nj4r58m5cpfdsijj6gjfs3yzcnxq2halagjk07wjcrgj6z8ayb7";
sha256 = "0dndngqvkm2ih3wqn5ilf9980c1cc57lqn5lywx3myalzpilq05z";
type = "gem";
};
version = "2.3.0";
version = "2.4.0";
};
cose = {
dependencies = ["cbor" "openssl-signature_algorithm"];
@ -429,6 +429,28 @@
};
version = "1.14.0";
};
dartsass-ruby = {
dependencies = ["sass-embedded"];
groups = ["default"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "0z3gdsnyvdjgn9gwia72irqgxq04i8hv9pv60yqkd4h5nk9rx4p6";
type = "gem";
};
version = "3.0.1";
};
dartsass-sprockets = {
dependencies = ["dartsass-ruby" "railties" "sprockets" "sprockets-rails" "tilt"];
groups = ["default"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "1842k5i96iiz264wzzqar2m3whs2caf0d8yhbsr6qdbi4j5pzmcx";
type = "gem";
};
version = "3.0.0";
};
date = {
groups = ["default"];
platforms = [];
@ -561,10 +583,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "17prxavwwskpv7dfl3npl0pgqiqg99rrmakqj1n4m5hl69jqz8y4";
sha256 = "0j826kfvzn7nc5pv950n270r0sx1702k988ad11cdlav3dcxxw09";
type = "gem";
};
version = "0.97.2";
version = "0.99.0";
};
execjs = {
groups = ["assets" "default"];
@ -644,10 +666,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "07bn75d784ndj9ljqk19ff6217hkqqmxjlnjx5b9v36k2nnj9kys";
sha256 = "1zz0w4jpfa6h1wlirfcs9hzvlpijnd1nnmjq94w5yv50585p279n";
type = "gem";
};
version = "2.0.0";
version = "2.1.0";
};
fast_blank = {
groups = ["default"];
@ -735,10 +757,20 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "040bxzfd7mz1p6z4bc9vk5yrf762hdllvf98hmk848fq28xc5dsk";
sha256 = "0kqm5ndzaybpnpxqiqkc41k4ksyxl41ln8qqr6kb130cdxsf2dxk";
type = "gem";
};
version = "1.0.1";
version = "1.1.0";
};
google-protobuf = {
groups = ["default"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "1xcg53yz44cqhcpb85w3ay80kvnniy0v441c9p08wb6zzia2mnq9";
type = "gem";
};
version = "3.22.3";
};
guess_html_encoding = {
groups = ["default"];
@ -837,10 +869,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "0acrqj9g8x39lz3z9li52wwc98d0csqarc7bv6jcfd0fp6h9zykb";
sha256 = "02iw1plldayr1l8bdw2gshq0h083h0fxwji1m1nfhzikz917c07p";
type = "gem";
};
version = "0.31.2";
version = "0.31.3";
};
image_size = {
groups = ["default"];
@ -909,10 +941,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "1x8zp1a2pnngxh7631s0kn0r665qkwzfp16kifmp93r4zj6ci8v8";
sha256 = "09yj3z5snhaawh2z1w45yyihzmh57m6m7dp8ra8gxavhj5kbiq5p";
type = "gem";
};
version = "2.6.0";
version = "2.7.0";
};
kgio = {
groups = ["default"];
@ -998,10 +1030,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "01n1ynk2xa94za8hhqy3xzfwhm24zhh3x5yllziyz3zjxxrj7fxc";
sha256 = "18yqcf756rzxdq5pw2qrximfryv15ib7rv2g622wjig7zhvk8wx4";
type = "gem";
};
version = "2.11.3";
version = "2.12.2";
};
loofah = {
dependencies = ["crass" "nokogiri"];
@ -1009,10 +1041,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "08qhzck271anrx9y6qa6mh8hwwdzsgwld8q0000rcd7yvvpnjr3c";
sha256 = "1mi4ia13fisc97fzd8xcd9wkjdki7zfbmdn1xkdzplicir68gyp8";
type = "gem";
};
version = "2.19.1";
version = "2.20.0";
};
lru_redux = {
groups = ["default"];
@ -1041,17 +1073,15 @@
version = "0.3.3";
};
mail = {
dependencies = ["mini_mime"];
dependencies = ["mini_mime" "net-imap" "net-pop" "net-smtp"];
groups = ["default"];
platforms = [];
source = {
fetchSubmodules = false;
rev = "5b700fc95ee66378e0cf2559abc73c8bc3062a4b";
sha256 = "0j084s1gsdwiqvm4jdayi0x4rsdrazqv8z8wkz28v7zmaymw18lz";
type = "git";
url = "https://github.com/discourse/mail.git";
remotes = ["https://rubygems.org"];
sha256 = "1bf9pysw1jfgynv692hhaycfxa8ckay1gjw5hz3madrbrynryfzc";
type = "gem";
};
version = "2.8.0.edge";
version = "2.8.1";
};
matrix = {
groups = ["default" "test"];
@ -1176,10 +1206,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "1kjy67qajw4rnkbjs5jyk7kc3lyhz5613fwj1i8f6ppdk4zampy0";
sha256 = "0ic7i5z88zcaqnpzprf7saimq2f6sad57g5mkkqsrqrcd6h3mx06";
type = "gem";
};
version = "5.17.0";
version = "5.18.0";
};
mocha = {
dependencies = ["ruby2_keywords"];
@ -1201,10 +1231,10 @@
}];
source = {
remotes = ["https://rubygems.org"];
sha256 = "1q03pb0vq8388s431nbxabsfxnch6p304c8vnjlk0zzpcv713yr3";
sha256 = "172ky0r1jfcm3xyg067pia7k1lhc15vw9svv93max120gcdbrvji";
type = "gem";
};
version = "1.6.0";
version = "1.7.0";
};
multi_json = {
groups = ["default"];
@ -1296,10 +1326,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "0xk64wghkscs6bv2n22853k2nh39d131c6rfpnlw12mbjnnv9v1v";
sha256 = "0w9978zwjf1qhy3amkivab0f9syz6a7k0xgydjidaf7xc831d78f";
type = "gem";
};
version = "2.5.8";
version = "2.5.9";
};
nokogiri = {
dependencies = ["mini_portile2" "racc"];
@ -1307,10 +1337,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "1fqld4wnamj7awdr1lwdifpylqdrrg5adm8xj2jl9sc5ms3nxjjm";
sha256 = "0fnw0z8zl8b5k35g9m5hhc1g4s6ajzjinhyxnqjrx7l7p07fw71v";
type = "gem";
};
version = "1.14.0";
version = "1.14.3";
};
oauth = {
dependencies = ["oauth-tty" "snaky_hash" "version_gem"];
@ -1437,10 +1467,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "0mcg47zz4w902cq6c8cdj62npawgwq68sfh7n7aqy7vm3pgvls9h";
sha256 = "0c649921vg2l939z5cc3jwd8p1v49099pdhxfk7sb9qqx5wi5873";
type = "gem";
};
version = "3.0.2";
version = "3.1.0";
};
openssl-signature_algorithm = {
dependencies = ["openssl"];
@ -1448,10 +1478,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "0rwjga70kbg0rmwgksb2if34ndh9cy0fgrimkx3hjz9c68ssvpxg";
sha256 = "103yjl68wqhl5kxaciir5jdnyi7iv9yckishdr52s5knh9g0pd53";
type = "gem";
};
version = "1.2.1";
version = "1.3.0";
};
optimist = {
groups = ["default"];
@ -1483,10 +1513,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "1p0y8cgdmfwyg7plwlsjf9afshm81wj9ah8nprmpfrv28adg3vn6";
sha256 = "11lf8vsh6kxzp7k3xzkxdmb31b01phaz5z8a7sjpq9hh6ab30k8l";
type = "gem";
};
version = "4.1.0";
version = "4.2.0";
};
parser = {
dependencies = ["ast"];
@ -1494,30 +1524,30 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "0zk8mdyr0322r11d63rcp5jhz4lakxilhvyvdv0ql5dw4lb83623";
sha256 = "0s5afi89p76k8vpwiqvh343pm5l23ijqlpszhz65afym3zpkxhzx";
type = "gem";
};
version = "3.2.0.0";
version = "3.2.2.0";
};
pg = {
groups = ["default"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "1wd6nl81nbdwck04hccsm7wf23ghpi8yddd9j4rbwyvyj0sbsff1";
sha256 = "07m6lxljabw9kyww5k5lgsxsznsm1v5l14r1la09gqka9b5kv3yr";
type = "gem";
};
version = "1.4.5";
version = "1.4.6";
};
prettier_print = {
groups = ["default" "development" "test"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "1bbw4czjr2ch6m57rgjib5a35hx3g18975vwzm2iwq13pvdj9hzk";
sha256 = "1ybgks9862zmlx71zd4j20ky86fsrp6j6m0az4hzzb1zyaskha57";
type = "gem";
};
version = "1.2.0";
version = "1.2.1";
};
progress = {
groups = ["default"];
@ -1578,20 +1608,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "15hj8r6wp23k187ajmp13kldk53ygm84q4caq7nlndrn8jlcsps0";
sha256 = "0qqd5lb3mamh53ssx0xavmspg4blhq6hd1kipksw20bq71xcklf5";
type = "gem";
};
version = "6.0.2";
};
r2 = {
groups = ["default"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "0wk0p55zp3l96xy5ps28b33dn5z0jwsjl74bwfdn6z81pzjs5sfk";
type = "gem";
};
version = "0.2.7";
version = "6.2.1";
};
racc = {
groups = ["default" "development" "test"];
@ -1612,10 +1632,10 @@
}];
source = {
remotes = ["https://rubygems.org"];
sha256 = "0qvp6h2abmlsl4sqjsvac03cr2mxq6143gbx4kq52rpazp021qsb";
sha256 = "1qgwkcb8kxns8d5187cxjaxf18b7dmg9gh6cr9c1125m0bj2pnfk";
type = "gem";
};
version = "2.2.6.2";
version = "2.2.6.4";
};
rack-mini-profiler = {
dependencies = ["rack"];
@ -1623,10 +1643,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "121fqk18x1bd52c2bkz8wkvv9nkgpqphj5aycnb7lkf67jkwic0h";
sha256 = "13dhpp1iljhqp9c8akmp6gjhx47qf83w12ns4bif26ldkignpam1";
type = "gem";
};
version = "3.0.0";
version = "3.1.0";
};
rack-protection = {
dependencies = ["rack"];
@ -1634,10 +1654,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "1a12m1mv8dc0g90fs1myvis8vsgr427k1arg1q4a9qlfw6fqyhis";
sha256 = "1kpm67az1wxlg76h620in2r7agfyhv177ps268j5ggsanzddzih8";
type = "gem";
};
version = "3.0.5";
version = "3.0.6";
};
rack-test = {
dependencies = ["rack"];
@ -1645,10 +1665,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "0rjl709krgf499dhjdapg580l2qaj9d91pwzk8ck8fpnazlx1bdd";
sha256 = "1ysx29gk9k14a14zsp5a8czys140wacvp91fja8xcja0j1hzqq8c";
type = "gem";
};
version = "2.0.2";
version = "2.1.0";
};
rails-dom-testing = {
dependencies = ["activesupport" "nokogiri"];
@ -1678,10 +1698,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "145m778yylgrjl2q7zfkq35l5sibyynlx6pyp176ifm146gbf9wf";
sha256 = "1j0zi64m9njfgk4xs4invqlimkgiy4fsivfmbpz33bg0w5yyzazi";
type = "gem";
};
version = "0.8.1";
version = "1.0.0";
};
rails_multisite = {
dependencies = ["activerecord" "railties"];
@ -1700,10 +1720,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "0q8as8yq6ni256fc6bmcqmdch1bksbhsg5lmaqmi4bpi33f06g01";
sha256 = "0w6pib1s0kmfnhjvxwh48flz7w4gy8y961n821w8by7d1g83vjwq";
type = "gem";
};
version = "7.0.4.1";
version = "7.0.4.3";
};
rainbow = {
groups = ["default" "development" "test"];
@ -1726,10 +1746,10 @@
}];
source = {
remotes = ["https://rubygems.org"];
sha256 = "0wb2x51parf6v78w0cic90m33bdc92y5h8rj4wqs75dhw1b69hc7";
sha256 = "0c27mcglrj928zkm4d2spj9yh2xkkka8ns5s6bidkwild3zvj3ma";
type = "gem";
};
version = "0.20.0";
version = "0.20.1";
};
rake = {
groups = ["default" "development" "test"];
@ -1792,10 +1812,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "0i4a8hxxcxci3n8hhlm9a8wa7a9m58r6sjvh4749v7362i8cy010";
sha256 = "0fikjg6j12ka6hh36dxzhfkpqqmilzjfzcdf59iwkzsgd63f0ziq";
type = "gem";
};
version = "4.8.0";
version = "4.8.1";
};
redis-namespace = {
dependencies = ["redis"];
@ -1813,10 +1833,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "0zjg29w5zvar7by1kqck3zilbdzm5iz3jp5d1zn3970krskfazh2";
sha256 = "17xizkw5ryw8hhq64iqxmzdrrdxpc5lhkqc1fgm1aj0zsk1r2950";
type = "gem";
};
version = "2.6.2";
version = "2.8.0";
};
request_store = {
dependencies = ["rack"];
@ -1897,10 +1917,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "1ibb81slc35q5yp276sixp3yrvj9q92wlmi1glbnwlk6g49z8rn4";
sha256 = "0da45cvllbv39sdbsl65vp5djb2xf5m10mxc9jm7rsqyyxjw4h1f";
type = "gem";
};
version = "3.12.0";
version = "3.12.1";
};
rspec-expectations = {
dependencies = ["diff-lcs" "rspec-support"];
@ -1930,10 +1950,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "0sq2cc9pm5gq411y7iwfvzbmgv3g91lyf7y7cqn1lr3yf1v122nc";
sha256 = "1hfm17xakfvwya236graj6c2arr4sb9zasp35q5fykhyz8mhs0w2";
type = "gem";
};
version = "3.12.3";
version = "3.12.5";
};
rspec-rails = {
dependencies = ["actionpack" "activesupport" "railties" "rspec-core" "rspec-expectations" "rspec-mocks" "rspec-support"];
@ -1978,16 +1998,27 @@
};
version = "2.8.0";
};
rtlcss = {
dependencies = ["mini_racer"];
groups = ["default"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "0nnc1qdr4vdr91406ga1nnw5xk27ii2yzk325ixrf2qca3zl213k";
type = "gem";
};
version = "0.2.0";
};
rubocop = {
dependencies = ["json" "parallel" "parser" "rainbow" "regexp_parser" "rexml" "rubocop-ast" "ruby-progressbar" "unicode-display_width"];
groups = ["default" "development" "test"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "0a2j57r6pvngqlzkmww031gs5isax3nsr9n7cbfpqnh34ljh2lk1";
sha256 = "0l46lw5gfj3mcm982wpmx7br4rs466gyislv0hfwcsk8dxhv1zkw";
type = "gem";
};
version = "1.44.0";
version = "1.50.2";
};
rubocop-ast = {
dependencies = ["parser"];
@ -1995,10 +2026,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "1pdzabz95hv3z5sfbkfqa8bdybsfl13gv7rjb32v3ss8klq99lbd";
sha256 = "0n2gsafg6p7nr1z8i1hkvp2qqkkbg842ba183dnl0h08xd9ms6q5";
type = "gem";
};
version = "1.24.1";
version = "1.28.0";
};
rubocop-capybara = {
dependencies = ["rubocop"];
@ -2006,10 +2037,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "1h4qcjkz0365qlhi7y1ni94qj14k397cad566zygm20p15ypbp5v";
sha256 = "1pz52ml0qbxgcjlmp8y0wsq8xy398n6ypkbrwfaa8zb0v7pscj6n";
type = "gem";
};
version = "2.17.0";
version = "2.17.1";
};
rubocop-discourse = {
dependencies = ["rubocop" "rubocop-rspec"];
@ -2017,10 +2048,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "0m6jqyh44vfibqcnxi0xz69xgrbf8vpps90h6al5qdbibm9dmajd";
sha256 = "1jfpi8wd6gxd626kp27n20ja1yj68478dqbc1fiyzj4mr8nw8nsl";
type = "gem";
};
version = "3.0.3";
version = "3.2.0";
};
rubocop-rspec = {
dependencies = ["rubocop" "rubocop-capybara"];
@ -2028,10 +2059,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "1vmmin3ymgq7bhv2hl4pd0zpwawy709p816axc4vi67w61b4bij1";
sha256 = "1k8yh0nzlz0g8igmj5smnxq71qmi2b005nkl25wkpjkwvzn2wfdx";
type = "gem";
};
version = "2.18.1";
version = "2.19.0";
};
ruby-prof = {
groups = ["development"];
@ -2042,20 +2073,20 @@
}];
source = {
remotes = ["https://rubygems.org"];
sha256 = "09n13bzm1p956z318xx1v7ikqdp2i971v7p3kwf3170axz368ccy";
sha256 = "106i9m62a20xaipp3vsq4rsnggddfgdvb8xqhvi264slvmac85zq";
type = "gem";
};
version = "1.4.5";
version = "1.6.1";
};
ruby-progressbar = {
groups = ["default" "development" "test"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "02nmaw7yx9kl7rbaan5pl8x5nn0y4j5954mzrkzi9i3dhsrps4nc";
sha256 = "0cwvyb7j47m7wihpfaq7rc47zwwx9k4v7iqd9s1xch5nm53rrz40";
type = "gem";
};
version = "1.11.0";
version = "1.13.0";
};
ruby-readability = {
dependencies = ["guess_html_encoding" "nokogiri"];
@ -2094,32 +2125,21 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "1zq8pxmsd1abw18zz6mazsm2jfpwmbgdxbpawb7bmwvkb2c5yyc1";
sha256 = "1ga8yzc9zj45m92ycwnzhzahkwvc3dp3lym5m3f3880hs4jhh7l3";
type = "gem";
};
version = "6.0.0";
version = "6.0.1";
};
sassc = {
dependencies = ["ffi" "rake"];
sass-embedded = {
dependencies = ["google-protobuf" "rake"];
groups = ["default"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "1sr4825rlwsrl7xrsm0sgalcpf5zgp4i56dbi3qxfa9lhs8r6zh4";
sha256 = "1fprlazlld0yr4g8aq9qh4lxjxpvzl2s3fp8f9ydwsrchzj95rbh";
type = "gem";
};
version = "2.0.1";
};
sassc-rails = {
dependencies = ["railties" "sassc" "sprockets" "sprockets-rails" "tilt"];
groups = ["default"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "1d9djmwn36a5m8a83bpycs48g8kh1n2xkyvghn7dr6zwh4wdyksz";
type = "gem";
};
version = "2.1.2";
version = "1.62.0";
};
selenium-webdriver = {
dependencies = ["rexml" "rubyzip" "websocket"];
@ -2127,10 +2147,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "1dkcyq2hfvf4wdj7q5cqqlka1dw6gz28dckxf4r17jmd53ymwg28";
sha256 = "1hfaz3srv9c420jkmhr19fmdisnjylwpwyjsr8fsw2ggw35ryhrz";
type = "gem";
};
version = "4.8.0";
version = "4.8.6";
};
shoulda-matchers = {
dependencies = ["activesupport"];
@ -2239,10 +2259,10 @@
}];
source = {
remotes = ["https://rubygems.org"];
sha256 = "02r3a3ny27ljj19bzmxscw2vlmk7sw1p4ppbl2i69g17khi0p4sw";
sha256 = "0bhdgfb0pmw9mav1kw9fn0ka012sa0i3h5ppvqssw5xq48nhxnr8";
type = "gem";
};
version = "0.2.23";
version = "0.2.25";
};
syntax_tree = {
dependencies = ["prettier_print"];
@ -2250,10 +2270,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "1sqjjz3ja2563p4dgw46wfx0knpcp176gfvx8gfmkv8h166qnkqg";
sha256 = "162m5xhbiq315bncp49ziddws537dv09pqsgrzsrmhhsymhgy0zb";
type = "gem";
};
version = "5.2.0";
version = "6.1.1";
};
syntax_tree-disable_ternary = {
groups = ["development" "test"];
@ -2270,10 +2290,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "15fcfjplc1zqahrha6rxgwnmjlyp41qkj4369fbxdfp0iaxb15pg";
sha256 = "09phq7jxfgamv03kjcgibw0f6w3g3mlb9yapji3bxh7cbjvwk2pa";
type = "gem";
};
version = "1.1.0";
version = "1.2.1";
};
thor = {
groups = ["default" "development" "test"];
@ -2290,20 +2310,20 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "186nfbcsk0l4l86gvng1fw6jq6p6s7rc0caxr23b3pnbfb20y63v";
sha256 = "1qmhi6d9przjzhsyk9g5pq2j75c656msh6xzprqd2mxgphf23jxs";
type = "gem";
};
version = "2.0.11";
version = "2.1.0";
};
timeout = {
groups = ["default"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "0lnh0kr7f43m1cjzc2jvggfsl1rzsaj2rd3pn6vp7mcqliymzaza";
sha256 = "1pfddf51n5fnj4f9ggwj3wbf23ynj0nbxlxqpz12y1gvl9g7d6r6";
type = "gem";
};
version = "0.3.1";
version = "0.3.2";
};
tzinfo = {
dependencies = ["concurrent-ruby"];
@ -2311,10 +2331,21 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "0rx114mpqnw2k4h98vc0rs0x0bmf0img84yh8mkkjkal07cjydf5";
sha256 = "16w2g84dzaf3z13gxyzlzbf748kylk5bdgg3n1ipvkvvqy685bwd";
type = "gem";
};
version = "2.0.5";
version = "2.0.6";
};
tzinfo-data = {
dependencies = ["tzinfo"];
groups = ["default"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "0m2d0gpsgqnv29j5h2d6g57g0rayvd460b8s2vjr8sn46bqf89m5";
type = "gem";
};
version = "1.2023.3";
};
uglifier = {
dependencies = ["execjs"];
@ -2390,10 +2421,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "11c4n5rri8d45c47krpg76n98mqh36l0kp2qrkb4dxnkp4flay6y";
sha256 = "1vigw7nfszfqgikr6n574k9bfh0rvs74z8xq46rz2zsm8249l8cc";
type = "gem";
};
version = "0.12.0";
version = "0.12.1";
};
uri_template = {
groups = ["default"];
@ -2410,10 +2441,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "0v2vj7q1rk3wd7hdqa3i1d4hq7sfcgf55qc70g6dsichsbgacb9w";
sha256 = "1dza601x34ln5yvmyaj42gnbij9pifx12frp5vak6n19q9j941r0";
type = "gem";
};
version = "1.1.1";
version = "1.1.2";
};
web-push = {
dependencies = ["hkdf" "jwt" "openssl"];
@ -2468,16 +2499,6 @@
};
version = "1.2.9";
};
xorcist = {
groups = ["default"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "1dbbiy8xlcfvn9ais37xfb5rci4liwakkmxzbkp72wmvlgcrf339";
type = "gem";
};
version = "1.1.3";
};
xpath = {
dependencies = ["nokogiri"];
groups = ["default" "test"];
@ -2499,14 +2520,24 @@
};
version = "0.1.2";
};
yard = {
groups = ["development"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "013yrnwx1zhzhn1fnc19zck22a1qgimsaglp2iwgf5bz9l8h93js";
type = "gem";
};
version = "0.9.34";
};
zeitwerk = {
groups = ["default" "development" "test"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "09pqhdi6q4sqv0p1gnjpbcy4az0yv8hrpykjngdgh9qiqd87nfdv";
sha256 = "028ld9qmgdllxrl7d0qkl65s58wb1n3gv8yjs28g43a8b1hplxk1";
type = "gem";
};
version = "2.6.6";
version = "2.6.7";
};
}

View File

@ -0,0 +1,21 @@
diff --git a/ext/sass/Rakefile b/ext/sass/Rakefile
index 77ced01..1e60ab0 100644
--- a/ext/sass/Rakefile
+++ b/ext/sass/Rakefile
@@ -18,15 +18,7 @@ file 'protoc.exe' do |t|
end
file 'sass_embedded' do |t|
- archive = fetch(ENV.fetch(t.name.upcase) { Configuration.default_sass_embedded })
- unarchive archive
- rm archive
-
- if ENV.key?('NIX_BINTOOLS')
- sh 'patchelf',
- '--set-interpreter', File.read("#{ENV.fetch('NIX_BINTOOLS')}/nix-support/dynamic-linker").chomp,
- (['sass_embedded/src/dart', 'sass_embedded/dart-sass-embedded'].find { |exe| File.exist?(exe) })
- end
+ symlink(ENV.fetch(t.name.upcase), 'sass_embedded')
end
file 'embedded.rb' => %w[sass_embedded] do |t|

View File

@ -23,8 +23,8 @@ buildGoModule rec {
];
meta = with lib; {
inherit (src.meta) homepage;
description = "A high performance HTTP server that implements restic's REST backend API";
homepage = "https://github.com/restic/rest-server";
platforms = platforms.unix;
license = licenses.bsd2;
maintainers = with maintainers; [ dotlambda ];

File diff suppressed because it is too large Load Diff

View File

@ -17,6 +17,7 @@
, tzdata
, cmake
, perl
, git
# nix has a problem with the `?` in the feature list
# enabling kafka will produce a vector with no features at all
, enableKafka ? false
@ -33,7 +34,7 @@
let
pname = "vector";
version = "0.28.1";
version = "0.29.1";
in
rustPlatform.buildRustPackage {
inherit pname version;
@ -42,20 +43,22 @@ rustPlatform.buildRustPackage {
owner = "vectordotdev";
repo = pname;
rev = "v${version}";
sha256 = "sha256-hBEw5sAxex4o/b1nr60dEwZs7nosXU7pUChT1VoI25k=";
sha256 = "sha256-4WqO7i1xthUU2bTzaS5poTh+wemjvqNAUFIDN73f7kw=";
};
cargoLock = {
lockFile = ./Cargo.lock;
outputHashes = {
"azure_core-0.5.0" = "sha256-fojO7dhntpymMjV58TtYb7N4UN6rOp30D54x09RDXfQ=";
"chrono-0.4.22" = "sha256-c5xHLte0+NpM+UUHEwxu2qdBFUBw62YN9vNkD12llwI=";
"chrono-0.4.24" = "sha256-SVPRfixSt0m14MmOcmBVseC/moj1DIA3B+m0pvT41K0=";
"datadog-filter-0.1.0" = "sha256-CNAIoDyJJo+D2Qzt6Fb2FwpQpzX02XurT8j1gHkz1bE=";
"heim-0.1.0-rc.1" = "sha256-ODKEQ1udt7FlxI5fvoFMG7C2zmM45eeEYDUEaLTsdYo=";
"nix-0.26.2" = "sha256-uquYvRT56lhupkrESpxwKEimRFhmYvri10n3dj0f2yg=";
"tokio-util-0.7.4" = "sha256-rAzj44O+GOZhG+o6FVN5qCcG/NWxW8fUpScm+xsRjIs=";
"tracing-0.2.0" = "sha256-YAxeEofFA43PX2hafh3RY+C81a2v6n1fGzYz2FycC3M=";
};
};
nativeBuildInputs = [ pkg-config cmake perl ];
nativeBuildInputs = [ pkg-config cmake perl git ];
buildInputs = [ oniguruma openssl protobuf rdkafka zstd ]
++ lib.optionals stdenv.isDarwin [ Security libiconv coreutils CoreServices ];
@ -106,10 +109,6 @@ rustPlatform.buildRustPackage {
postPatch = ''
substituteInPlace ./src/dns.rs \
--replace "#[tokio::test]" ""
${lib.optionalString (!builtins.elem "transforms-geoip" features) ''
substituteInPlace ./Cargo.toml --replace '"transforms-geoip",' ""
''}
'';
passthru = {

View File

@ -9,14 +9,14 @@
python3.pkgs.buildPythonApplication rec {
pname = "nix-update";
version = "0.17.1";
version = "0.17.2";
format = "setuptools";
src = fetchFromGitHub {
owner = "Mic92";
repo = pname;
rev = version;
hash = "sha256-nlA9WmwXkx/2IgRCcmoj/kpRNbNVTEl7uSkISXgo8wo=";
hash = "sha256-W2vBKgdPOLGdAIxbHD4Qi4ivAabFSuu7ikvu5kItwN8=";
};
makeWrapperArgs = [

View File

@ -1367,6 +1367,8 @@ with pkgs;
wine = null;
};
ledfx = callPackage ../applications/audio/ledfx { };
libdislocator = callPackage ../tools/security/afl/libdislocator.nix { };
afpfs-ng = callPackage ../tools/filesystems/afpfs-ng { };
@ -16638,6 +16640,8 @@ with pkgs;
inherit (darwin.apple_sdk.frameworks) Security;
};
dart-sass-embedded = callPackage ../misc/dart-sass-embedded { };
clojupyter = callPackage ../applications/editors/jupyter-kernels/clojupyter {
jre = jre8;
};
@ -39015,7 +39019,7 @@ with pkgs;
};
mysql = mysql;
pcre = pcre-cpp;
jre = jre8; # TODO: remove override https://github.com/NixOS/nixpkgs/pull/89731
jre = openjdk19; # TODO: remove override https://github.com/NixOS/nixpkgs/pull/89731
});
r128gain = callPackage ../applications/audio/r128gain { };

View File

@ -4268,6 +4268,8 @@ self: super: with self; {
grpcio-tools = callPackage ../development/python-modules/grpcio-tools { };
grpcio-testing = callPackage ../development/python-modules/grpcio-testing { };
grpclib = callPackage ../development/python-modules/grpclib { };
gruut = callPackage ../development/python-modules/gruut { };