nathan/nixpkgs
1
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2026-10-02 04:50:21 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge release-23.11 into staging-next-23.11

Browse Source
This commit is contained in:
github-actions[bot]
2024-04-13 00:11:56 +00:00
committed by GitHub
parent c430086edb ec877443d6
commit c8d580973a
18 changed files with 208 additions and 100 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
maintainers/maintainer-list.nix
View File

@@ -1640,6 +1640,16 @@
githubId = 11037075;
name = "Ashley Hooper";
};
ashuramaruzxc = {
email = "ashuramaru@tenjin-dk.com";
matrix = "@tenjin:mozilla.org";
github = "ashuramaruzxc";
githubId = 72100551;
name = "Mariia Holovata";
keys = [{
fingerprint = "409D 201E 9450 8732 A49E D0FC 6BDA F874 0068 08DF";
}];
};
ashvith-shetty = {
github = "Ashvith10";
githubId = 113123021;

2
nixos/modules/services/networking/searx.nix
View File

@@ -218,7 +218,7 @@ in
serviceConfig = {
User = "searx";
Group = "searx";
ExecStart = "${cfg.package}/bin/searx-run";
ExecStart = lib.getExe cfg.package;
} // optionalAttrs (cfg.environmentFile != null)
{ EnvironmentFile = builtins.toPath cfg.environmentFile; };
environment = {

6
nixos/tests/searx.nix
View File

@@ -36,7 +36,7 @@ import ./make-test-python.nix ({ pkgs, ...} :
};
# fancy setup: run in uWSGI and use nginx as proxy
nodes.fancy = { ... }: {
nodes.fancy = { config, ... }: {
imports = [ ../modules/profiles/minimal.nix ];
services.searx = {
@@ -65,7 +65,7 @@ import ./make-test-python.nix ({ pkgs, ...} :
include ${pkgs.nginx}/conf/uwsgi_params;
uwsgi_pass unix:/run/searx/uwsgi.sock;
'';
locations."/searx/static/".alias = "${pkgs.searx}/share/static/";
locations."/searx/static/".alias = "${config.services.searx.package}/share/static/";
};
# allow nginx access to the searx socket
@@ -108,7 +108,7 @@ import ./make-test-python.nix ({ pkgs, ...} :
"${pkgs.curl}/bin/curl --fail http://localhost/searx >&2"
)
fancy.succeed(
"${pkgs.curl}/bin/curl --fail http://localhost/searx/static/themes/oscar/js/bootstrap.min.js >&2"
"${pkgs.curl}/bin/curl --fail http://localhost/searx/static/themes/simple/js/leaflet.js >&2"
)
'';
})

4
pkgs/applications/editors/vscode/extensions/vscode-utils.nix
View File

@@ -32,6 +32,10 @@ let
inherit configurePhase buildPhase dontPatchELF dontStrip;
# Some .vsix files contain other directories (e.g., `package`) that we don't use.
# If other directories are present but `sourceRoot` is unset, the unpacker phase fails.
sourceRoot = "extension";
installPrefix = "share/vscode/extensions/${vscodeExtUniqueId}";
nativeBuildInputs = [ unzip ] ++ nativeBuildInputs;

24
pkgs/applications/networking/browsers/chromium/upstream-info.nix
View File

@@ -1,11 +1,11 @@
{
stable = {
chromedriver = {
hash_darwin = "sha256-sB6gH5k5zK1IIctBTXQpxlgmLEoIatcLDYO+WIFaYxA=";
hash_darwin = "sha256-PmLV++FK6aCvdhNNhb2ZAmRLumr+VRFvN+7IByieEZk=";
hash_darwin_aarch64 =
"sha256-sikyGQG0Y14eNjT3f/Z50cPmm38T58X7zQIGopXOHOs=";
hash_linux = "sha256-2WZmRXyvxN3hXeOoPQXL6lU6Xki9iUmTdETRxOkIYD0=";
version = "123.0.6312.86";
"sha256-6Ys1EMSLmJNNaWdPeQiCT+bC0H7ABInVNzwXorGavn4=";
hash_linux = "sha256-iimq37dcEcY2suW73a6lhgHuNaoqtzbAZCHkQP9ro/Y=";
version = "123.0.6312.122";
};
deps = {
gn = {
@@ -15,9 +15,9 @@
version = "2024-02-19";
};
};
hash = "sha256-C17TPDVFW3+cHO1tcEghjI6H59TVPm9hdCrF2s5NI68=";
hash_deb_amd64 = "sha256-zmnBi4UBx52fQKHHJuUaCMuDJl7ntQzhG6h/yH7YPNU=";
version = "123.0.6312.105";
hash = "sha256-7H7h621AHPyhFYbaVFO892TtS+SP3Qu7cYUVk3ICL14=";
hash_deb_amd64 = "sha256-tNkO1mPZg1xltBfoWeNhLekITtZV/WNgu//i2DJb17c=";
version = "123.0.6312.122";
};
ungoogled-chromium = {
deps = {
@@ -28,12 +28,12 @@
version = "2024-02-19";
};
ungoogled-patches = {
hash = "sha256-81SoZBOAAV0cAVzz3yOzBstRW3vWjmkFoFNjYdPnme4=";
rev = "123.0.6312.105-1";
hash = "sha256-ojKIAkJB/gfg6scCxUYNAGx4lsquAaCySBDcUCFLqSU=";
rev = "d5773b0fb696ef107cc6df6a94cbe732c9e905f9";
};
};
hash = "sha256-C17TPDVFW3+cHO1tcEghjI6H59TVPm9hdCrF2s5NI68=";
hash_deb_amd64 = "sha256-zmnBi4UBx52fQKHHJuUaCMuDJl7ntQzhG6h/yH7YPNU=";
version = "123.0.6312.105";
hash = "sha256-7H7h621AHPyhFYbaVFO892TtS+SP3Qu7cYUVk3ICL14=";
hash_deb_amd64 = "sha256-tNkO1mPZg1xltBfoWeNhLekITtZV/WNgu//i2DJb17c=";
version = "123.0.6312.122";
};
}

28
pkgs/applications/networking/instant-messengers/discord/default.nix
View File

@@ -2,14 +2,14 @@
let
versions =
if stdenv.isLinux then {
stable = "0.0.47";
ptb = "0.0.76";
canary = "0.0.326";
development = "0.0.16";
stable = "0.0.49";
ptb = "0.0.78";
canary = "0.0.346";
development = "0.0.17";
} else {
stable = "0.0.298";
ptb = "0.0.105";
canary = "0.0.451";
stable = "0.0.300";
ptb = "0.0.107";
canary = "0.0.468";
development = "0.0.39";
};
version = versions.${branch};
@@ -17,33 +17,33 @@ let
x86_64-linux = {
stable = fetchurl {
url = "https://dl.discordapp.net/apps/linux/${version}/discord-${version}.tar.gz";
hash = "sha256-4cELs7K7DAfzbA0/BwAkKraTD7z58jzOf1J3Our3CwM=";
hash = "sha256-rVSYAkTZTlurnbUeYJFCgsPcsCqjJ1bJneQQiyhmvwQ=";
};
ptb = fetchurl {
url = "https://dl-ptb.discordapp.net/apps/linux/${version}/discord-ptb-${version}.tar.gz";
hash = "sha256-Gj6OLzkHrEQ2CeEQpICaAh1m13DpM2cpNVsebBJ0MVc=";
hash = "sha256-Fp94BsR6Fzy4tV+c5ToP9GKg6GC/TryGvHWLupew4Z8=";
};
canary = fetchurl {
url = "https://dl-canary.discordapp.net/apps/linux/${version}/discord-canary-${version}.tar.gz";
hash = "sha256-MxiFhd7tLvL1tBRc451qjCFZlmGM8IolckExp0sR3y8=";
hash = "sha256-/FBVo3ptZk2YQPoq+VpyxMlSWYlVb8ChpKW5YH/BM7U=";
};
development = fetchurl {
url = "https://dl-development.discordapp.net/apps/linux/${version}/discord-development-${version}.tar.gz";
hash = "sha256-6QImWsNmL2JveB2QJ1MyBxkVEQfdPvKEdenRPjURptI=";
hash = "sha256-AmbaMVi/or+9QLuQO5u5btgKeKdrfo7bzZgGLILwgqo=";
};
};
x86_64-darwin = {
stable = fetchurl {
url = "https://dl.discordapp.net/apps/osx/${version}/Discord.dmg";
hash = "sha256-GlTebQ16sRgHdpB9+Jw7dn+KVZ6qIrAmWBSypTcoFmE=";
hash = "sha256-f9YIlzRESzzxtD9/us1DY5acu2HYo+UrwS7GWk9RwCk=";
};
ptb = fetchurl {
url = "https://dl-ptb.discordapp.net/apps/osx/${version}/DiscordPTB.dmg";
hash = "sha256-X5bYO1D5eWTYh22v4R274OhjTsVv70XCyrMqeRlt0Bo=";
hash = "sha256-etxXrO9Ksacbdes3DT1Tm4kKD/t40jGUeSAegdexRqc=";
};
canary = fetchurl {
url = "https://dl-canary.discordapp.net/apps/osx/${version}/DiscordCanary.dmg";
hash = "sha256-psVm0eXDHVBGNb/R0kHbvz/4ilyIg4xlOj/CwkwlvgM=";
hash = "sha256-UOoXDwAa5pFukqTCmUfM89QVK5jB13id8ek/gwWajMM=";
};
development = fetchurl {
url = "https://dl-development.discordapp.net/apps/osx/${version}/DiscordDevelopment.dmg";

10
pkgs/applications/networking/instant-messengers/mattermost-desktop/default.nix
View File

@@ -1,24 +1,24 @@
{ lib
, stdenv
, fetchurl
, electron_26
, electron_28
, makeWrapper
}:
let
pname = "mattermost-desktop";
version = "5.5.1";
version = "5.7.0";
srcs = {
"x86_64-linux" = {
url = "https://releases.mattermost.com/desktop/${version}/${pname}-${version}-linux-x64.tar.gz";
hash = "sha256-bRiO5gYM7nrnkbHBP3B9zAK2YV5POkc3stEsbZJ48VA=";
hash = "sha256-1xfU9+VzjhSVWsP1AYizphhQ2010GbQBgQ4dxvY3TBU=";
};
"aarch64-linux" = {
url = "https://releases.mattermost.com/desktop/${version}/${pname}-${version}-linux-arm64.tar.gz";
hash = "sha256-Z4U6Jbwasra69QPHJ9/7WwMSxh0O9r4QIe/xC3WRf4w=";
hash = "sha256-RrH+R9IuokKK+zfmCmOt38hD1HvWJbKqmxTFhQ3RcqQ=";
};
};
@@ -52,7 +52,7 @@ stdenv.mkDerivation {
substituteInPlace $out/share/applications/Mattermost.desktop \
--replace /share/mattermost-desktop/mattermost-desktop /bin/mattermost-desktop
makeWrapper ${electron_26}/bin/electron $out/bin/${pname} \
makeWrapper '${lib.getExe electron_28}' $out/bin/${pname} \
--add-flags $out/share/${pname}/app.asar
runHook postInstall

6
pkgs/by-name/mo/mountpoint-s3/package.nix
View File

@@ -8,17 +8,17 @@
rustPlatform.buildRustPackage rec {
pname = "mountpoint-s3";
version = "1.5.0";
version = "1.6.0";
src = fetchFromGitHub {
owner = "awslabs";
repo = "mountpoint-s3";
rev = "v${version}";
hash = "sha256-DsxcQ/FEVcrzPyv9LgssNut4XnbU3mPKbuBwQKLiRLA=";
hash = "sha256-1d2PPbTheUcHw2xS5LEcdchnfwu7szBApv+FnPaxt+I=";
fetchSubmodules = true;
};
cargoHash = "sha256-UOQRdSQ/whlOTZL2vaNiIcKB+Zgpk8tbinWBRWPyllc=";
cargoHash = "sha256-tBi41kdaa4mVHh0MkXJ8kaG1e3CQURIKVk9Lboy1N8Y=";
# thread 'main' panicked at cargo-auditable/src/collect_audit_data.rs:77:9:
# cargo metadata failure: error: none of the selected packages contains these features: libfuse3

15
pkgs/by-name/se/searxng/package.nix
View File

@@ -5,13 +5,13 @@
python3.pkgs.toPythonModule (python3.pkgs.buildPythonApplication rec {
pname = "searxng";
version = "unstable-2023-10-31";
version = "0-unstable-2024-03-08";
src = fetchFromGitHub {
owner = pname;
repo = pname;
rev = "b05a15540e1dc2dfb8e4e25aa537b2a68e713844";
hash = "sha256-x0PyS+A4KjbBnTpca17Wx3BQjtOHvVuWpusPPc1ULnU=";
owner = "searxng";
repo = "searxng";
rev = "9c08a0cdddae7ceafbe5e00ce94cf7f1d36c97e0";
hash = "sha256-0qlOpJqpOmseIeIafd0NLd2lF5whu18QxmwOua8dKzg=";
};
postPatch = ''
@@ -20,7 +20,7 @@ python3.pkgs.toPythonModule (python3.pkgs.buildPythonApplication rec {
preBuild =
let
versionString = lib.concatStringsSep "." (builtins.tail (lib.splitString "-" version));
versionString = lib.concatStringsSep "." (builtins.tail (lib.splitString "-" (lib.removePrefix "0-" version)));
commitAbbrev = builtins.substring 0 8 src.rev;
in
''
@@ -66,13 +66,14 @@ python3.pkgs.toPythonModule (python3.pkgs.buildPythonApplication rec {
ln -s ../${python3.sitePackages}/searx/static $out/share/
# copy config schema for the limiter
cp searx/botdetection/limiter.toml $out/${python3.sitePackages}/searx/botdetection/limiter.toml
cp searx/limiter.toml $out/${python3.sitePackages}/searx/limiter.toml
'';
meta = with lib; {
homepage = "https://github.com/searxng/searxng";
description = "A fork of Searx, a privacy-respecting, hackable metasearch engine";
license = licenses.agpl3Plus;
mainProgram = "searxng-run";
maintainers = with maintainers; [ SuperSandro2000 _999eagle ];
};
})

56
pkgs/by-name/th/thcrap-steam-proton-wrapper/package.nix Normal file
View File

@@ -0,0 +1,56 @@
{
lib
, stdenv
, fetchFromGitHub
, makeWrapper
, bash
, subversion
, gnome
}:
stdenv.mkDerivation {
pname = "thcrap-proton";
version = "0-unstable-2024-04-03";
src = fetchFromGitHub {
owner = "tactikauan";
repo = "thcrap-steam-proton-wrapper";
rev = "2b636c3f5f1ce1b9b41f731aa9397aa68d2ce66b";
sha256 = "sha256-J2O8F75NMdsxSaNVr8zLf+vLEJE6CHqWQIIscuuJZ3o=";
};
buildInputs = [ subversion ];
nativeBuildInputs = [ makeWrapper ];
installPhase = ''
runHook preInstall
mkdir -p $out/bin
cp thcrap_proton $out/bin/thcrap_proton
runHook postInstall
'';
postFixup = ''
wrapProgram $out/bin/thcrap_proton \
--prefix PATH : ${
lib.makeBinPath [
bash
subversion
gnome.zenity
]
}
'';
meta = {
description = "A wrapper script for launching the official Touhou games on Steam with patches through Proton on GNU/Linux";
homepage = "https://github.com/tactikauan/thcrap-steam-proton-wrapper";
license = lib.licenses.unlicense;
maintainers = with lib.maintainers; [ ashuramaruzxc ];
platforms = [
"x86_64-linux"
"aarch64-linux"
];
mainProgram = "thcrap_proton";
};
}

41
pkgs/development/tools/build-managers/bear/default.nix
View File

@@ -2,6 +2,7 @@
, fetchFromGitHub
, fetchpatch
, cmake
, ninja
, pkg-config
, grpc
, protobuf
@@ -13,6 +14,9 @@
, zlib
, sqlite
, re2
, lit
, python3
, coreutils
}:
stdenv.mkDerivation rec {
@@ -26,7 +30,15 @@ stdenv.mkDerivation rec {
hash = "sha256-1nZPzgLWcmaRkOUXdm16IW2Nw/p1w8GBGEfZX/v+En0=";
};
nativeBuildInputs = [ cmake pkg-config ];
nativeBuildInputs = [
cmake
ninja
pkg-config
# Used for functional tests, which run during buildPhase.
lit
python3
];
buildInputs = [
grpc
@@ -41,13 +53,32 @@ stdenv.mkDerivation rec {
re2
];
patches = [
# Default libexec would be set to /nix/store/*-bear//nix/store/*-bear/libexec/...
./no-double-relative.patch
cmakeFlags = [
# Build system and generated files concatenate install prefix and
# CMAKE_INSTALL_{BIN,LIB}DIR, which breaks if these are absolute paths.
"-DCMAKE_INSTALL_BINDIR=bin"
"-DCMAKE_INSTALL_LIBDIR=lib"
(lib.cmakeBool "ENABLE_UNIT_TESTS" false)
(lib.cmakeBool "ENABLE_FUNC_TESTS" false)
];
patches = [
# Fix toolchain environment variable handling and the Darwin SIP check.
./fix-functional-tests.patch
];
postPatch = ''
patchShebangs test/bin
# /usr/bin/env is used in test commands and embedded scripts.
find test -name '*.sh' \
-exec sed -ie 's|/usr/bin/env|${coreutils}/bin/env|g' {} +
'';
# Functional tests use loopback networking.
__darwinAllowLocalNetworking = true;
meta = with lib; {
broken = stdenv.isDarwin;
description = "Tool that generates a compilation database for clang tooling";
longDescription = ''
Note: the bear command is very useful to generate compilation commands

32
pkgs/development/tools/build-managers/bear/fix-functional-tests.patch Normal file
View File

@@ -0,0 +1,32 @@
diff --git a/test/lit.cfg b/test/lit.cfg
index 118c979..b69fecc 100644
--- a/test/lit.cfg
+++ b/test/lit.cfg
@@ -207,13 +207,8 @@ def is_preload_disabled():
if is_windows:
return True
elif sys.platform == 'darwin':
- command = ['csrutil', 'status']
- pattern = re.compile(r'System Integrity Protection status:\s+enabled')
- try:
- output = subprocess.check_output(command, stderr=subprocess.STDOUT)
- return any(pattern.match(line) for line in output.decode('utf-8').splitlines())
- except (OSError, subprocess.CalledProcessError):
- return False
+ # csrutil(8) isn't available in the Nix build sandbox.
+ return True
else:
return False
@@ -221,6 +216,11 @@ def is_preload_disabled():
if not is_preload_disabled():
config.available_features.add('preload')
+# Preserve the variables required for the Nix toolchain wrappers.
+for var, value in os.environ.items():
+ if var.startswith('NIX_'):
+ config.environment[var] = value
+
print(config.substitutions)
print(config.environment)
print(config.available_features)

27
pkgs/development/tools/build-managers/bear/no-double-relative.patch
View File

@@ -1,27 +0,0 @@
diff --git a/source/config.h.in b/source/config.h.in
index 6b659c2..f7bdf22 100644
--- a/source/config.h.in
+++ b/source/config.h.in
@@ -108,8 +108,8 @@ namespace cmd {
}
namespace wrapper {
- constexpr char DEFAULT_PATH[] = "@ROOT_INSTALL_PREFIX@/@CMAKE_INSTALL_LIBDIR@/bear/wrapper";
- constexpr char DEFAULT_DIR_PATH[] = "@ROOT_INSTALL_PREFIX@/@CMAKE_INSTALL_LIBDIR@/bear/wrapper.d";
+ constexpr char DEFAULT_PATH[] = "@CMAKE_INSTALL_LIBDIR@/bear/wrapper";
+ constexpr char DEFAULT_DIR_PATH[] = "@CMAKE_INSTALL_LIBDIR@/bear/wrapper.d";
constexpr char FLAG_VERBOSE[] = "--verbose";
constexpr char FLAG_DESTINATION[] = "--destination";
@@ -134,9 +134,9 @@ namespace cmd {
// And use the `libexec.so` path default value with a single path,
// that matches both. (The match can be achieved by the $LIB token
// expansion from the dynamic loader. See `man ld.so` for more.)
- constexpr char DEFAULT_PATH[] = "@ROOT_INSTALL_PREFIX@/$LIB/bear/@CMAKE_SHARED_LIBRARY_PREFIX@exec@CMAKE_SHARED_LIBRARY_SUFFIX@";
+ constexpr char DEFAULT_PATH[] = "$LIB/bear/@CMAKE_SHARED_LIBRARY_PREFIX@exec@CMAKE_SHARED_LIBRARY_SUFFIX@";
#else
- constexpr char DEFAULT_PATH[] = "@ROOT_INSTALL_PREFIX@/@CMAKE_INSTALL_LIBDIR@/bear/@CMAKE_SHARED_LIBRARY_PREFIX@exec@CMAKE_SHARED_LIBRARY_SUFFIX@";
+ constexpr char DEFAULT_PATH[] = "@CMAKE_INSTALL_LIBDIR@/bear/@CMAKE_SHARED_LIBRARY_PREFIX@exec@CMAKE_SHARED_LIBRARY_SUFFIX@";
#endif
constexpr char KEY_REPORTER[] = "INTERCEPT_REPORT_COMMAND";
constexpr char KEY_DESTINATION[] = "INTERCEPT_REPORT_DESTINATION";

14
pkgs/development/tools/electron/binary/default.nix
View File

@@ -158,13 +158,13 @@ rec {
headers = "0wcqz4vgkyz1zcd0ybx1ywzv9kz96hdxwk9an98v87nb1gfhk05c";
};
electron_26-bin = mkElectron "26.3.0" {
armv7l-linux = "c444d805381a8125eb16f24369bbc370751c1f6bfaa0d4613a7a94ad797f5059";
aarch64-linux = "740b779bf3a2032fedb6c1902e537f61e88c5e245a4e8815ec8cf471ff38aceb";
x86_64-linux = "38e2a68361566faa2e7f2a4639cfedee3a5889d5f64018b2ad055c8f40516312";
x86_64-darwin = "ea9434ad717f12771f8c508b664ed8d18179b397910ce81f4b6e21efce90b754";
aarch64-darwin = "97cb2d00d06f331b4c028fa96373abdd7b5a71c2aa31b56cdf67d391f889f384";
headers = "00r11n0i0j7brkjbb8b0b4df6kgkwdplic4l50y9l4a7sbg6i43m";
electron_26-bin = mkElectron "26.6.10" {
armv7l-linux = "f6fb96c37fa0b4061998441ebf3d8edee1076b6ef33d2f6fe16e07dcdb4c638a";
aarch64-linux = "1f235d36a9f3729b8e8da83b5819f42c7083aa7725bd4cf2cb9460e0b70c4f17";
x86_64-linux = "9a2ac0fcca0e0007859328b1df8e53f7ab1bc3d2946afee48c157a8a9ba36757";
x86_64-darwin = "faca327a094a9bce54184d4fe6b74b4580e53c8a1fafa94f9a8651f41be3aca7";
aarch64-darwin = "744eee95754579fae7b7f7dac181092d59f31de2516370fcd671ba8ec1d86af3";
headers = "0jg60lgcv2r10qa6hjayzh4qr2z2kcnbgnrlcmlp2dm94izz5nic";
};
electron_27-bin = mkElectron "27.3.9" {

1
pkgs/development/tools/electron/binary/generic.nix
View File

@@ -36,6 +36,7 @@ let
homepage = "https://github.com/electron/electron";
license = licenses.mit;
maintainers = with maintainers; [ travisbhartwell manveru prusnak ];
mainProgram = "electron";
platforms = [ "x86_64-darwin" "x86_64-linux" "armv7l-linux" "aarch64-linux" ]
++ optionals (versionAtLeast version "11.0.0") [ "aarch64-darwin" ]
++ optionals (versionOlder version "19.0.0") [ "i686-linux" ];

26
pkgs/development/tools/electron/info.json
View File

@@ -3,10 +3,10 @@
"deps": {
"src/electron": {
"fetcher": "fetchFromGitHub",
"hash": "sha256-fu2/PUgZZR8OWtD04X31RaLHkhF5QeHvtdg1UX3SoBw=",
"hash": "sha256-AHiOejVRSeJ14Xn+A6yjfICbERDPr/eCbBq+2qPjGDc=",
"owner": "electron",
"repo": "electron",
"rev": "v28.2.10"
"rev": "v28.3.0"
},
"src": {
"fetcher": "fetchFromGitiles",
@@ -873,7 +873,7 @@
"rev": "78d3966b3c331292ea29ec38661b25df0a245948"
}
},
"version": "28.2.10",
"version": "28.3.0",
"modules": "119",
"chrome": "120.0.6099.291",
"node": "18.18.2",
@@ -895,10 +895,10 @@
"deps": {
"src/electron": {
"fetcher": "fetchFromGitHub",
"hash": "sha256-/Bd91mSKGqsEThDZKnQCBSy/eWW+MnPDsPML2WafhtI=",
"hash": "sha256-vCM74wty0JN4PL9snwa4oFbNebA3cMZ8lorXz5DIVcE=",
"owner": "electron",
"repo": "electron",
"rev": "v27.3.9"
"rev": "v27.3.10"
},
"src": {
"fetcher": "fetchFromGitiles",
@@ -1765,7 +1765,7 @@
"rev": "78d3966b3c331292ea29ec38661b25df0a245948"
}
},
"version": "27.3.9",
"version": "27.3.10",
"modules": "118",
"chrome": "118.0.5993.159",
"node": "18.17.1",
@@ -1780,8 +1780,8 @@
}
}
},
"electron_yarn_hash": "1yq854829a4q0yqyjyn2lq4l3amsqdhfd7fjcnc3mz8l2ci3n964",
"chromium_npm_hash": "sha256-5cjqpYB45nw2gop54VP+tL7/0w63nQGfQ4x6a6KS7XQ="
"chromium_npm_hash": "sha256-5cjqpYB45nw2gop54VP+tL7/0w63nQGfQ4x6a6KS7XQ=",
"electron_yarn_hash": "1yq854829a4q0yqyjyn2lq4l3amsqdhfd7fjcnc3mz8l2ci3n964"
},
"26": {
"deps": {
@@ -2631,10 +2631,10 @@
"deps": {
"src/electron": {
"fetcher": "fetchFromGitHub",
"hash": "sha256-M/0dbmNELh9ZnH0FAtj0vItWhMwEd2vwrXx2JTqJGr0=",
"hash": "sha256-buW6hC7GIA59MTuyWg9/+EzQlFgJVN2IZrxlfisLemM=",
"owner": "electron",
"repo": "electron",
"rev": "v29.2.0"
"rev": "v29.3.0"
},
"src": {
"fetcher": "fetchFromGitiles",
@@ -3514,7 +3514,7 @@
"rev": "955335c30a752e9ef7bff375baab5e0819b6c00d"
}
},
"version": "29.2.0",
"version": "29.3.0",
"modules": "121",
"chrome": "122.0.6261.156",
"node": "20.9.0",
@@ -3529,7 +3529,7 @@
}
}
},
"chromium_npm_hash": "sha256-9eFsK673j3pTDOcsU35RN4hagFygA/v/ahCqVVEV0Rs=",
"electron_yarn_hash": "0spwnax6g3050z2bjylzs67l7m551is86nizzy4hp0306v57xdpz"
"electron_yarn_hash": "0f868gk3d2cablpczav8a4vhk4nfirph45yzjz18mgzgday7w8hf",
"chromium_npm_hash": "sha256-9eFsK673j3pTDOcsU35RN4hagFygA/v/ahCqVVEV0Rs="
}
}

4
pkgs/servers/uwsgi/default.nix
View File

@@ -71,13 +71,13 @@ in
stdenv.mkDerivation (finalAttrs: {
pname = "uwsgi";
version = "2.0.23";
version = "2.0.24";
src = fetchFromGitHub {
owner = "unbit";
repo = "uwsgi";
rev = finalAttrs.version;
hash = "sha256-gyYsgPF6eGa3D7bjmhhVER+uM0yPLfZiwSUzZ2mGcHg=";
hash = "sha256-KVzIp2rKCpF6aXhhu+6nw7q8Pnx/0+HD23mmYmVFPSA=";
};
patches = [

2
pkgs/top-level/all-packages.nix
View File

@@ -18523,7 +18523,7 @@ with pkgs;
electron_23 = electron_23-bin;
electron_24 = electron_24-bin;
electron_25 = electron_25-bin;
electron_26 = if lib.meta.availableOn stdenv.hostPlatform electron-source.electron_26 then electron-source.electron_26 else electron_26-bin;
electron_26 = electron_26-bin;
electron_27 = if lib.meta.availableOn stdenv.hostPlatform electron-source.electron_27 then electron-source.electron_27 else electron_27-bin;
electron_28 = if lib.meta.availableOn stdenv.hostPlatform electron-source.electron_28 then electron-source.electron_28 else electron_28-bin;
electron_29 = if lib.meta.availableOn stdenv.hostPlatform electron-source.electron_29 then electron-source.electron_29 else electron_29-bin;