BoomMicrophone/nixpkgs-suyu
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge staging-next into staging

Browse source
This commit is contained in:
github-actions[bot] 2023-02-05 12:02:01 +00:00 committed by GitHub
commit dae72e8486
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
35 changed files with 460 additions and 277 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
nixos/tests/all-tests.nix
View file

@ -414,7 +414,9 @@ in {
mtp = handleTest ./mtp.nix {}; mtp = handleTest ./mtp.nix {};
multipass = handleTest ./multipass.nix {}; multipass = handleTest ./multipass.nix {};
mumble = handleTest ./mumble.nix {}; mumble = handleTest ./mumble.nix {};
musescore = handleTest ./musescore.nix {}; # Fails on aarch64-linux at the PDF creation step - need to debug this on an
# aarch64 machine..
musescore = handleTestOn ["x86_64-linux"] ./musescore.nix {};
munin = handleTest ./munin.nix {}; munin = handleTest ./munin.nix {};
mutableUsers = handleTest ./mutable-users.nix {}; mutableUsers = handleTest ./mutable-users.nix {};
mxisd = handleTest ./mxisd.nix {}; mxisd = handleTest ./mxisd.nix {};

80
nixos/tests/musescore.nix
View file

@ -2,13 +2,12 @@ import ./make-test-python.nix ({ pkgs, ...} :
let let
# Make sure we don't have to go through the startup tutorial # Make sure we don't have to go through the startup tutorial
customMuseScoreConfig = pkgs.writeText "MuseScore3.ini" '' customMuseScoreConfig = pkgs.writeText "MuseScore4.ini" ''
[application] [application]
startup\firstStart=false hasCompletedFirstLaunchSetup=true
[ui] [project]
application\startup\showTours=false preferredScoreCreationMode=1
application\startup\showStartCenter=false
''; '';
in in
{ {
@ -40,51 +39,68 @@ in
# Inject custom settings # Inject custom settings
machine.succeed("mkdir -p /root/.config/MuseScore/") machine.succeed("mkdir -p /root/.config/MuseScore/")
machine.succeed( machine.succeed(
"cp ${customMuseScoreConfig} /root/.config/MuseScore/MuseScore3.ini" "cp ${customMuseScoreConfig} /root/.config/MuseScore/MuseScore4.ini"
) )
# Start MuseScore window # Start MuseScore window
machine.execute("DISPLAY=:0.0 mscore >&2 &") machine.execute("DISPLAY=:0.0 mscore >&2 &")
# Wait until MuseScore has launched # Wait until MuseScore has launched
machine.wait_for_window("MuseScore") machine.wait_for_window("MuseScore 4")
# Wait until the window has completely initialised # Wait until the window has completely initialised
machine.wait_for_text("MuseScore") machine.wait_for_text("MuseScore 4")
# Start entering notes
machine.send_key("n")
# Type the beginning of https://de.wikipedia.org/wiki/Alle_meine_Entchen
machine.send_chars("cdef6gg5aaaa7g")
# Make sure the VM catches up with all the keys
machine.sleep(1)
machine.screenshot("MuseScore0") machine.screenshot("MuseScore0")
# Create a new score
machine.send_key("ctrl-n")
# Wait until the creation wizard appears
machine.wait_for_window("New score")
machine.screenshot("MuseScore1")
machine.send_key("tab")
machine.send_key("tab")
machine.send_key("tab")
machine.send_key("tab")
machine.send_key("right")
machine.send_key("right")
machine.send_key("ret")
machine.sleep(1)
# Type the beginning of https://de.wikipedia.org/wiki/Alle_meine_Entchen
machine.send_chars("cdef6gg5aaaa7g")
machine.sleep(1)
machine.screenshot("MuseScore2")
# Go to the export dialogue and create a PDF # Go to the export dialogue and create a PDF
machine.send_key("alt-f") machine.send_key("alt-f")
machine.sleep(1) machine.sleep(1)
machine.send_key("e") machine.send_key("e")
# Wait until the export dialogue appears. # Wait until the export dialogue appears.
machine.wait_for_window("Export") machine.wait_for_text("Export")
machine.screenshot("MuseScore1")
machine.send_key("shift-tab")
machine.sleep(1)
machine.send_key("shift-tab")
machine.sleep(1)
machine.send_key("ret")
machine.sleep(1)
machine.send_key("ret")
machine.screenshot("MuseScore2")
# Wait until PDF is exported
machine.wait_for_file("/root/Documents/MuseScore3/Scores/Untitled.pdf")
# Check that it contains the title of the score
machine.succeed("pdfgrep Title /root/Documents/MuseScore3/Scores/Untitled.pdf")
machine.screenshot("MuseScore3") machine.screenshot("MuseScore3")
machine.send_key("shift-tab")
machine.sleep(1)
machine.send_key("ret")
machine.sleep(1)
machine.send_key("ret")
machine.screenshot("MuseScore4")
# Wait until PDF is exported
machine.wait_for_file('"/root/Documents/MuseScore4/Scores/Untitled score.pdf"')
# Check that it contains the title of the score
machine.succeed('pdfgrep "Untitled score" "/root/Documents/MuseScore4/Scores/Untitled score.pdf"')
machine.screenshot("MuseScore5")
''; '';
}) })

4
pkgs/applications/audio/furnace/default.nix
View file

@ -63,8 +63,8 @@ stdenv.mkDerivation rec {
"-DWARNINGS_ARE_ERRORS=ON" "-DWARNINGS_ARE_ERRORS=ON"
]; ];
NIX_CFLAGS_COMPILE = [ NIX_CFLAGS_COMPILE = lib.optionals stdenv.cc.isGNU [
# Needed with GCC 12 # Needed with GCC 12 but breaks on darwin (with clang)
"-Wno-error=mismatched-new-delete" "-Wno-error=mismatched-new-delete"
"-Wno-error=use-after-free" "-Wno-error=use-after-free"
]; ];

7
pkgs/applications/audio/musescore/darwin.nix
View file

@ -1,8 +1,9 @@
{ stdenv, lib, fetchurl, undmg }: { stdenv, lib, fetchurl, undmg }:
let let
versionComponents = [ "3" "6" "2" "548020600" ]; versionComponents = [ "4" "0" "1" ];
appName = "MuseScore ${builtins.head versionComponents}"; appName = "MuseScore ${builtins.head versionComponents}";
ref = "230121751";
in in
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
@ -13,8 +14,8 @@ stdenv.mkDerivation rec {
sourceRoot = "${appName}.app"; sourceRoot = "${appName}.app";
src = fetchurl { src = fetchurl {
url = "https://github.com/musescore/MuseScore/releases/download/v${lib.concatStringsSep "." (lib.take 3 versionComponents)}/MuseScore-${version}.dmg"; url = "https://github.com/musescore/MuseScore/releases/download/v${version}/MuseScore-${version}.${ref}.dmg";
sha256 = "sha256-lHckfhTTrDzaGwlbnZ5w0O1gMPbRmrmgATIGMY517l0="; hash = "sha256-tkIEV+tCS0SYh2TlC70/zEBUEOSg//EaSKDGA7kH/vo=";
}; };
buildInputs = [ undmg ]; buildInputs = [ undmg ];

31
pkgs/applications/audio/musescore/default.nix
View file

@ -1,28 +1,35 @@
{ mkDerivation, lib, fetchFromGitHub, cmake, pkg-config { mkDerivation, lib, fetchFromGitHub, fetchpatch, cmake, pkg-config, ninja
, alsa-lib, freetype, libjack2, lame, libogg, libpulseaudio, libsndfile, libvorbis , alsa-lib, freetype, libjack2, lame, libogg, libpulseaudio, libsndfile, libvorbis
, portaudio, portmidi, qtbase, qtdeclarative, qtgraphicaleffects , portaudio, portmidi, qtbase, qtdeclarative, qtgraphicaleffects, flac
, qtquickcontrols2, qtscript, qtsvg, qttools , qtquickcontrols2, qtscript, qtsvg, qttools
, qtwebengine, qtxmlpatterns , qtwebengine, qtxmlpatterns, qtnetworkauth, qtx11extras
, nixosTests , nixosTests
}: }:
mkDerivation rec { mkDerivation rec {
pname = "musescore"; pname = "musescore";
version = "3.6.2"; version = "4.0.1";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "musescore"; owner = "musescore";
repo = "MuseScore"; repo = "MuseScore";
rev = "v${version}"; rev = "v${version}";
sha256 = "sha256-GBGAD/qdOhoNfDzI+O0EiKgeb86GFJxpci35T6tZ+2s="; sha256 = "sha256-Xhjjm/pYcjfZE632eP2jujqUAmzdYNa81EPrvS5UKnQ=";
}; };
patches = [ patches = [
./remove_qtwebengine_install_hack.patch # See https://github.com/musescore/MuseScore/issues/15571
(fetchpatch {
url = "https://github.com/musescore/MuseScore/commit/365be5dfb7296ebee4677cb74b67c1721bc2cf7b.patch";
hash = "sha256-tJ2M21i3geO9OsjUQKNatSXTkJ5U9qMT4RLNdJnyoKw=";
})
]; ];
cmakeFlags = [ cmakeFlags = [
"-DMUSESCORE_BUILD_CONFIG=release" "-DMUSESCORE_BUILD_CONFIG=release"
# Disable the _usage_ of the `/bin/crashpad_handler` utility. See:
# https://github.com/musescore/MuseScore/pull/15577
"-DBUILD_CRASHPAD_CLIENT=OFF"
# Use our freetype
"-DUSE_SYSTEM_FREETYPE=ON" "-DUSE_SYSTEM_FREETYPE=ON"
]; ];
@ -34,13 +41,13 @@ mkDerivation rec {
"--set-default QT_QPA_PLATFORM xcb" "--set-default QT_QPA_PLATFORM xcb"
]; ];
nativeBuildInputs = [ cmake pkg-config ]; nativeBuildInputs = [ cmake pkg-config ninja ];
buildInputs = [ buildInputs = [
alsa-lib libjack2 freetype lame libogg libpulseaudio libsndfile libvorbis alsa-lib libjack2 freetype lame libogg libpulseaudio libsndfile libvorbis
portaudio portmidi # tesseract portaudio portmidi flac # tesseract
qtbase qtdeclarative qtgraphicaleffects qtquickcontrols2 qtbase qtdeclarative qtgraphicaleffects qtquickcontrols2
qtscript qtsvg qttools qtwebengine qtxmlpatterns qtscript qtsvg qttools qtwebengine qtxmlpatterns qtnetworkauth qtx11extras
]; ];
passthru.tests = nixosTests.musescore; passthru.tests = nixosTests.musescore;
@ -48,8 +55,10 @@ mkDerivation rec {
meta = with lib; { meta = with lib; {
description = "Music notation and composition software"; description = "Music notation and composition software";
homepage = "https://musescore.org/"; homepage = "https://musescore.org/";
license = licenses.gpl2; license = licenses.gpl3Only;
maintainers = with maintainers; [ vandenoever turion doronbehar ]; maintainers = with maintainers; [ vandenoever turion doronbehar ];
# Darwin requires CoreMIDI from SDK 11.3, we use the upstream built .dmg
# file in ./darwin.nix in the meantime.
platforms = platforms.linux; platforms = platforms.linux;
}; };
} }

19
pkgs/applications/audio/musescore/remove_qtwebengine_install_hack.patch
View file

@ -1,19 +0,0 @@
--- a/main/CMakeLists.txt
+++ b/main/CMakeLists.txt
@@ -220,16 +219,0 @@ else (MINGW)
- ## install qwebengine core
- if (NOT APPLE AND USE_WEBENGINE)
- install(PROGRAMS
- ${QT_INSTALL_LIBEXECS}/QtWebEngineProcess
- DESTINATION bin
- )
- install(DIRECTORY
- ${QT_INSTALL_DATA}/resources
- DESTINATION lib/qt5
- )
- install(DIRECTORY
- ${QT_INSTALL_TRANSLATIONS}/qtwebengine_locales
- DESTINATION lib/qt5/translations
- )
- endif(NOT APPLE AND USE_WEBENGINE)
-

4
pkgs/applications/emulators/rpcs3/default.nix
View file

@ -1,4 +1,4 @@
{ gcc11Stdenv, lib, fetchFromGitHub, wrapQtAppsHook, cmake, pkg-config, git { gcc12Stdenv, lib, fetchFromGitHub, wrapQtAppsHook, cmake, pkg-config, git
, qtbase, qtquickcontrols, qtmultimedia, openal, glew, vulkan-headers, vulkan-loader, libpng , qtbase, qtquickcontrols, qtmultimedia, openal, glew, vulkan-headers, vulkan-loader, libpng
, ffmpeg, libevdev, libusb1, zlib, curl, wolfssl, python3, pugixml, faudio, flatbuffers , ffmpeg, libevdev, libusb1, zlib, curl, wolfssl, python3, pugixml, faudio, flatbuffers
, sdl2Support ? true, SDL2 , sdl2Support ? true, SDL2
@ -21,7 +21,7 @@ let
sha256 = "0c3g30rj1y8fbd2q4kwlpg1jdy02z4w5ryhj3yr9051pdnf4kndz"; sha256 = "0c3g30rj1y8fbd2q4kwlpg1jdy02z4w5ryhj3yr9051pdnf4kndz";
}; };
in in
gcc11Stdenv.mkDerivation { gcc12Stdenv.mkDerivation {
pname = "rpcs3"; pname = "rpcs3";
version = rpcs3Version; version = rpcs3Version;

2
pkgs/applications/misc/tvbrowser/default.nix
View file

@ -22,7 +22,7 @@ stdenv.mkDerivation rec {
version = "4.2.7"; version = "4.2.7";
src = fetchzip { src = fetchzip {
url = "mirror://sourceforge/${pname}/TV-Browser%20Releases%20%28Java%20${minimalJavaVersion}%20and%20higher%29/${version}/${pname}_${version}_src.tar.gz"; url = "mirror://sourceforge/${pname}/TV-Browser%20Releases%20%28Java%20${minimalJavaVersion}%20and%20higher%29/${version}/${pname}_${version}_src.zip";
hash = "sha256-dmNfI6T0MU7UtMH+C/2hiAeDwZlFCB4JofQViZezoqI="; hash = "sha256-dmNfI6T0MU7UtMH+C/2hiAeDwZlFCB4JofQViZezoqI=";
}; };

43
pkgs/applications/misc/xmrig/proxy.nix
View file

@ -1,27 +1,54 @@
{ stdenv, lib, fetchFromGitHub, cmake, libuv, libmicrohttpd, openssl { stdenv
, lib
, fetchFromGitHub
, cmake
, libuv
, libmicrohttpd
, openssl
, darwin
}: }:
let
inherit (darwin.apple_sdk_11_0.frameworks) CoreServices IOKit;
in
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "xmrig-proxy"; pname = "xmrig-proxy";
version = "6.18.0"; version = "6.19.0";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "xmrig"; owner = "xmrig";
repo = "xmrig-proxy"; repo = "xmrig-proxy";
rev = "v${version}"; rev = "v${version}";
sha256 = "sha256-3Tp0wTL3uHs0N4CdlNusvpuam653b6qUZu9/KBT4HOM="; hash = "sha256-0vmRwe7PQVifm6HxgpPno9mIFcBZFtxqNdDK4V637ds=";
}; };
nativeBuildInputs = [ cmake ];
buildInputs = [ libuv libmicrohttpd openssl ];
postPatch = '' postPatch = ''
# Link dynamically against libuuid instead of statically # Link dynamically against libraries instead of statically
substituteInPlace CMakeLists.txt --replace uuid.a uuid substituteInPlace CMakeLists.txt \
--replace uuid.a uuid
substituteInPlace cmake/OpenSSL.cmake \
--replace "set(OPENSSL_USE_STATIC_LIBS TRUE)" "set(OPENSSL_USE_STATIC_LIBS FALSE)"
''; '';
nativeBuildInputs = [
cmake
];
buildInputs = [
libuv
libmicrohttpd
openssl
] ++ lib.optionals stdenv.isDarwin [
CoreServices
IOKit
];
installPhase = '' installPhase = ''
runHook preInstall
install -vD xmrig-proxy $out/bin/xmrig-proxy install -vD xmrig-proxy $out/bin/xmrig-proxy
runHook postInstall
''; '';
meta = with lib; { meta = with lib; {

8
pkgs/applications/networking/instant-messengers/armcord/default.nix
View file

@ -33,6 +33,8 @@
, systemd , systemd
, xdg-utils , xdg-utils
, xorg , xorg
, wayland
, pipewire
}: }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
@ -97,6 +99,8 @@ stdenv.mkDerivation rec {
xorg.libXScrnSaver xorg.libXScrnSaver
xorg.libxshmfence xorg.libxshmfence
xorg.libXtst xorg.libXtst
wayland
pipewire
]; ];
sourceRoot = "."; sourceRoot = ".";
@ -114,9 +118,9 @@ stdenv.mkDerivation rec {
makeWrapper $out/opt/ArmCord/armcord $out/bin/armcord \ makeWrapper $out/opt/ArmCord/armcord $out/bin/armcord \
"''${gappsWrapperArgs[@]}" \ "''${gappsWrapperArgs[@]}" \
--prefix XDG_DATA_DIRS : "${gtk3}/share/gsettings-schemas/${gtk3.name}/" \ --prefix XDG_DATA_DIRS : "${gtk3}/share/gsettings-schemas/${gtk3.name}/" \
--add-flags "\''${NIXOS_OZONE_WL:+\''${WAYLAND_DISPLAY:+--ozone-platform=wayland --enable-features=UseOzonePlatform --enable-features=WebRTCPipeWireCapturer }}" \
--prefix LD_LIBRARY_PATH : "${lib.makeLibraryPath buildInputs}" \ --prefix LD_LIBRARY_PATH : "${lib.makeLibraryPath buildInputs}" \
--suffix PATH : ${lib.makeBinPath [ xdg-utils ]} \ --suffix PATH : ${lib.makeBinPath [ xdg-utils ]}
"''${gappsWrapperArgs[@]}"
# Fix desktop link # Fix desktop link
substituteInPlace $out/share/applications/armcord.desktop \ substituteInPlace $out/share/applications/armcord.desktop \

4
pkgs/applications/plasma-mobile/neochat.nix
View file

@ -1,4 +1,4 @@
{ gcc11Stdenv { gcc12Stdenv
, lib , lib
, srcs , srcs
@ -31,7 +31,7 @@
}: }:
# Workaround for AArch64 not using GCC11 yet. # Workaround for AArch64 not using GCC11 yet.
gcc11Stdenv.mkDerivation rec { gcc12Stdenv.mkDerivation rec {
pname = "neochat"; pname = "neochat";
inherit (srcs.neochat) version src; inherit (srcs.neochat) version src;

6
pkgs/applications/plasma-mobile/spacebar.nix
View file

@ -1,6 +1,6 @@
{ lib { lib
, mkDerivation , mkDerivation
, gcc11Stdenv , gcc12Stdenv
, srcs , srcs
, cmake , cmake
@ -23,8 +23,8 @@
, qtquickcontrols2 , qtquickcontrols2
}: }:
# Workaround for AArch64 not using GCC11 yet. # Workaround for AArch64 still using GCC9.
gcc11Stdenv.mkDerivation rec { gcc12Stdenv.mkDerivation rec {
pname = "spacebar"; pname = "spacebar";
inherit (srcs.spacebar) version src; inherit (srcs.spacebar) version src;

4
pkgs/applications/science/math/pari/default.nix
View file

@ -14,7 +14,7 @@ assert withThread -> libpthreadstubs != null;
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "pari"; pname = "pari";
version = "2.15.1"; version = "2.15.2";
src = fetchurl { src = fetchurl {
urls = [ urls = [
@ -22,7 +22,7 @@ stdenv.mkDerivation rec {
# old versions are at the url below # old versions are at the url below
"https://pari.math.u-bordeaux.fr/pub/pari/OLD/${lib.versions.majorMinor version}/${pname}-${version}.tar.gz" "https://pari.math.u-bordeaux.fr/pub/pari/OLD/${lib.versions.majorMinor version}/${pname}-${version}.tar.gz"
]; ];
hash = "sha256-RUGdt3xmhb7mfkLg7LeOGe9WK+eq/GN8ikGXDy6Qnj0="; hash = "sha256-sEYoER7iKHZRmksc2vsy/rqjTq+iT56B9Y+NBX++4N0=";
}; };
buildInputs = [ buildInputs = [

4
pkgs/development/libraries/boringssl/default.nix
View file

@ -30,8 +30,8 @@ buildGoModule {
export GOARCH=$(go env GOHOSTARCH) export GOARCH=$(go env GOHOSTARCH)
''; '';
NIX_CFLAGS_COMPILE = [ NIX_CFLAGS_COMPILE = lib.optionals stdenv.cc.isGNU [
# Needed with GCC 12 # Needed with GCC 12 but breaks on darwin (with clang)
"-Wno-error=stringop-overflow" "-Wno-error=stringop-overflow"
]; ];

7
pkgs/development/libraries/gloox/default.nix
View file

@ -14,6 +14,13 @@ stdenv.mkDerivation rec{
sha256 = "1jgrd07qr9jvbb5hcmhrqz4w4lvwc51m30jls1fgxf1f5az6455f"; sha256 = "1jgrd07qr9jvbb5hcmhrqz4w4lvwc51m30jls1fgxf1f5az6455f";
}; };
# needed since gcc12
postPatch = ''
sed '1i#include <ctime>' -i \
src/tests/{tag/tag_perf.cpp,zlib/zlib_perf.cpp} \
src/examples/*.cpp
'';
buildInputs = [ ] buildInputs = [ ]
++ lib.optional zlibSupport zlib ++ lib.optional zlibSupport zlib
++ lib.optional sslSupport openssl ++ lib.optional sslSupport openssl

2
pkgs/development/libraries/libcryptui/fix-latest-gnupg.patch
View file

@ -17,7 +17,7 @@ index 4486e7b2..be5b28b4 100644
if test "$DO_CHECK" = "yes"; then if test "$DO_CHECK" = "yes"; then
- accepted_versions="1.2 1.4 2.0" - accepted_versions="1.2 1.4 2.0"
+ accepted_versions="1.2 1.4 2.0 2.2 2.3" + accepted_versions="1.2 1.4 2.0 2.2 2.3 2.4"
AC_PATH_PROGS(GNUPG, [gpg gpg2], no) AC_PATH_PROGS(GNUPG, [gpg gpg2], no)
AC_DEFINE_UNQUOTED(GNUPG, "$GNUPG", [Path to gpg executable.]) AC_DEFINE_UNQUOTED(GNUPG, "$GNUPG", [Path to gpg executable.])
ok="no" ok="no"

4
pkgs/development/libraries/qcoro/default.nix
View file

@ -1,5 +1,5 @@
{ stdenv { stdenv
, gcc11Stdenv , gcc12Stdenv
, lib , lib
, fetchFromGitHub , fetchFromGitHub
, cmake , cmake
@ -9,7 +9,7 @@
, wrapQtAppsHook , wrapQtAppsHook
}: }:
gcc11Stdenv.mkDerivation rec { gcc12Stdenv.mkDerivation rec {
pname = "qcoro"; pname = "qcoro";
version = "0.7.0"; version = "0.7.0";

2
pkgs/development/libraries/science/astronomy/indilib/indi-3rdparty.nix
View file

@ -48,6 +48,8 @@ stdenv.mkDerivation rec {
--replace "/etc/udev/rules.d" "lib/udev/rules.d" \ --replace "/etc/udev/rules.d" "lib/udev/rules.d" \
--replace "/lib/firmware" "lib/firmware" --replace "/lib/firmware" "lib/firmware"
done done
sed '1i#include <ctime>' -i indi-duino/libfirmata/src/firmata.cpp # gcc12
''; '';
cmakeFlags = [ cmakeFlags = [

11
pkgs/development/python-modules/aiofile/default.nix
View file

@ -1,9 +1,9 @@
{ lib { lib
, aiomisc , aiomisc
, asynctest
, caio , caio
, buildPythonPackage , buildPythonPackage
, fetchFromGitHub , fetchFromGitHub
, fetchpatch
, pytestCheckHook , pytestCheckHook
, pythonOlder , pythonOlder
}: }:
@ -22,13 +22,20 @@ buildPythonPackage rec {
hash = "sha256-PIImQZ1ymazsOg8qmlO91tNYHwXqK/d8AuKPsWYvh0w="; hash = "sha256-PIImQZ1ymazsOg8qmlO91tNYHwXqK/d8AuKPsWYvh0w=";
}; };
patches = [
(fetchpatch {
name = "remove-asynctest.patch";
url = "https://github.com/mosquito/aiofile/commit/9253ca42022f17f630ccfb6811f67876910f8b13.patch";
hash = "sha256-yMRfqEbdxApFypEj27v1zTgF/4kuLf5aS/+clo3mfZo=";
})
];
propagatedBuildInputs = [ propagatedBuildInputs = [
caio caio
]; ];
nativeCheckInputs = [ nativeCheckInputs = [
aiomisc aiomisc
asynctest
pytestCheckHook pytestCheckHook
]; ];

5
pkgs/development/python-modules/elementpath/default.nix
View file

@ -6,7 +6,7 @@
buildPythonPackage rec { buildPythonPackage rec {
pname = "elementpath"; pname = "elementpath";
version = "4.0.1"; version = "3.0.2";
format = "setuptools"; format = "setuptools";
disabled = pythonOlder "3.7"; disabled = pythonOlder "3.7";
@ -15,7 +15,7 @@ buildPythonPackage rec {
owner = "sissaschool"; owner = "sissaschool";
repo = "elementpath"; repo = "elementpath";
rev = "refs/tags/v${version}"; rev = "refs/tags/v${version}";
hash = "sha256-BEnSPRuQUnKXtPAJfjxS+fwE0rpPj1U2yRK8eImKMYw="; hash = "sha256-b+Th28GI2UOmfO4jy4biohAJWPiYWkvFLqqs9lgR4Vc=";
}; };
# avoid circular dependency with xmlschema which directly depends on this # avoid circular dependency with xmlschema which directly depends on this
@ -28,7 +28,6 @@ buildPythonPackage rec {
meta = with lib; { meta = with lib; {
description = "XPath 1.0/2.0 parsers and selectors for ElementTree and lxml"; description = "XPath 1.0/2.0 parsers and selectors for ElementTree and lxml";
homepage = "https://github.com/sissaschool/elementpath"; homepage = "https://github.com/sissaschool/elementpath";
changelog = "https://github.com/sissaschool/elementpath/blob/${version}/CHANGELOG.rst";
license = licenses.mit; license = licenses.mit;
maintainers = with maintainers; [ jonringer ]; maintainers = with maintainers; [ jonringer ];
}; };

5
pkgs/development/python-modules/msal/default.nix
View file

@ -8,14 +8,14 @@
buildPythonPackage rec { buildPythonPackage rec {
pname = "msal"; pname = "msal";
version = "1.20.0"; version = "1.21.0";
format = "setuptools"; format = "setuptools";
disabled = pythonOlder "3.7"; disabled = pythonOlder "3.7";
src = fetchPypi { src = fetchPypi {
inherit pname version; inherit pname version;
hash = "sha256-eDRM1MkdYTSlk7Xj5FVB5mbje3R/+KYxbDZo3R5qtrI="; hash = "sha256-lrXIZ4MP0Rbl99DsjvGyOLTNpNGuqG2P7PUYJg4Tb78=";
}; };
propagatedBuildInputs = [ propagatedBuildInputs = [
@ -35,6 +35,7 @@ buildPythonPackage rec {
meta = with lib; { meta = with lib; {
description = "Library to access the Microsoft Cloud by supporting authentication of users with Microsoft Azure Active Directory accounts (AAD) and Microsoft Accounts (MSA) using industry standard OAuth2 and OpenID Connect"; description = "Library to access the Microsoft Cloud by supporting authentication of users with Microsoft Azure Active Directory accounts (AAD) and Microsoft Accounts (MSA) using industry standard OAuth2 and OpenID Connect";
homepage = "https://github.com/AzureAD/microsoft-authentication-library-for-python"; homepage = "https://github.com/AzureAD/microsoft-authentication-library-for-python";
changelog = "https://github.com/AzureAD/microsoft-authentication-library-for-python/releases/tag/${version}";
license = licenses.mit; license = licenses.mit;
maintainers = with maintainers; [ kamadorueda ]; maintainers = with maintainers; [ kamadorueda ];
}; };

14
pkgs/development/python-modules/onnx/default.nix
View file

@ -17,14 +17,14 @@
buildPythonPackage rec { buildPythonPackage rec {
pname = "onnx"; pname = "onnx";
version = "1.12.0"; version = "1.13.0";
format = "setuptools"; format = "setuptools";
disabled = isPy27; disabled = isPy27;
src = fetchPypi { src = fetchPypi {
inherit pname version; inherit pname version;
sha256 = "sha256-E7PnfSdSO52/TzDfyclZRVhZ1eNOkhxE9xLWm4Np7/k="; sha256 = "sha256-QQs5lQNnhX+XtlCTaB/iSVouI9Y3d6is6vlsVqFtFm4=";
}; };
nativeBuildInputs = [ nativeBuildInputs = [
@ -50,9 +50,13 @@ buildPythonPackage rec {
postPatch = '' postPatch = ''
chmod +x tools/protoc-gen-mypy.sh.in chmod +x tools/protoc-gen-mypy.sh.in
patchShebangs tools/protoc-gen-mypy.py patchShebangs tools/protoc-gen-mypy.sh.in
substituteInPlace tools/protoc-gen-mypy.sh.in \ '';
--replace "/bin/bash" "${bash}/bin/bash"
# Set CMAKE_INSTALL_LIBDIR to lib explicitly, because otherwise it gets set
# to lib64 and cmake incorrectly looks for the protobuf library in lib64
preConfigure = ''
export CMAKE_ARGS="-DCMAKE_INSTALL_LIBDIR=lib -DONNX_USE_PROTOBUF_SHARED_LIBS=ON"
''; '';
preBuild = '' preBuild = ''

24
pkgs/development/python-modules/python-box/default.nix
View file

@ -1,11 +1,14 @@
{ lib { lib
, buildPythonPackage , buildPythonPackage
, fetchFromGitHub , fetchFromGitHub
, fetchpatch
, msgpack , msgpack
, poetry-core
, pytestCheckHook , pytestCheckHook
, pythonOlder , pythonOlder
, pyyaml , pyyaml
, ruamel-yaml , ruamel-yaml
, setuptools
, toml , toml
, tomli , tomli
, tomli-w , tomli-w
@ -13,8 +16,8 @@
buildPythonPackage rec { buildPythonPackage rec {
pname = "python-box"; pname = "python-box";
version = "6.1.0"; version = "7.0.0";
format = "setuptools"; format = "pyproject";
disabled = pythonOlder "3.7"; disabled = pythonOlder "3.7";
@ -22,9 +25,23 @@ buildPythonPackage rec {
owner = "cdgriffith"; owner = "cdgriffith";
repo = "Box"; repo = "Box";
rev = "refs/tags/${version}"; rev = "refs/tags/${version}";
hash = "sha256-42VDZ4aASFFWhRY3ApBQ4dq76eD1flZtxUM9hpA9iiI="; hash = "sha256-CvcVN5DTaT8mSf2FtFrt7DHP+YLbVI15/5Vjfmgae34=";
}; };
patches = [
# Switch to poetry-core, https://github.com/cdgriffith/Box/pull/247
(fetchpatch {
name = "switch-to-poetry-core.patch";
url = "https://github.com/cdgriffith/Box/commit/a43b98c5f5ff1074568dcef27cf17e7065d1019c.patch";
hash = "sha256-ul/MVSzgjN3D+Vuzn7YPITaDrtS58vDmA23hy1EVF9U=";
})
];
nativeBuildInputs = [
poetry-core
setuptools
];
passthru.optional-dependencies = { passthru.optional-dependencies = {
all = [ all = [
msgpack msgpack
@ -64,6 +81,7 @@ buildPythonPackage rec {
meta = with lib; { meta = with lib; {
description = "Python dictionaries with advanced dot notation access"; description = "Python dictionaries with advanced dot notation access";
homepage = "https://github.com/cdgriffith/Box"; homepage = "https://github.com/cdgriffith/Box";
changelog = "https://github.com/cdgriffith/Box/blob/${version}/CHANGES.rst";
license = with licenses; [ mit ]; license = with licenses; [ mit ];
maintainers = with maintainers; [ fab ]; maintainers = with maintainers; [ fab ];
}; };

37
pkgs/development/python2-modules/wheel/0001-tests-Rename-a-a-o-_-.py-_-.py.patch Normal file
View file

@ -0,0 +1,37 @@
From 5879a4bbc34d1eb25e160b15b2f5a4f10eac6bd2 Mon Sep 17 00:00:00 2001
From: toonn <toonn@toonn.io>
Date: Mon, 13 Sep 2021 18:07:26 +0200
Subject: [PATCH] =?UTF-8?q?tests:=20Rename=20a=CC=8Aa=CC=88o=CC=88=5F?=
=?UTF-8?q?=E6=97=A5=E6=9C=AC=E8=AA=9E.py=20=3D>=20=C3=A6=C9=90=C3=B8=5F?=
=?UTF-8?q?=E6=97=A5=E6=9C=AC=E5=83=B9.py?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
`åäö_日本語.py` normalizes differently in NFC and NFD normal forms. This
means a hash generated for the source directory can differ depending on
whether or not the filesystem is normalizing and which normal form it
uses.
By renaming the file to `æɐø_日本價.py` we avoid this issue by using a
name that has the same encoding in each normal form.
---
tests/test_bdist_wheel.py | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/tests/test_bdist_wheel.py b/tests/test_bdist_wheel.py
index 651c034..9b94ac8 100644
--- a/tests/test_bdist_wheel.py
+++ b/tests/test_bdist_wheel.py
@@ -58,7 +58,7 @@ def test_unicode_record(wheel_paths):
with ZipFile(path) as zf:
record = zf.read('unicode.dist-0.1.dist-info/RECORD')
- assert u'åäö_日本語.py'.encode('utf-8') in record
+ assert u'æɐø_日本價.py'.encode('utf-8') in record
def test_licenses_default(dummy_dist, monkeypatch, tmpdir):
--
2.17.2 (Apple Git-113)

57
pkgs/development/python2-modules/wheel/default.nix Normal file
View file

@ -0,0 +1,57 @@
{ lib
, buildPythonPackage
, fetchFromGitHub
, bootstrapped-pip
, setuptools
}:
buildPythonPackage rec {
pname = "wheel";
version = "0.37.1";
format = "other";
src = fetchFromGitHub {
owner = "pypa";
repo = pname;
rev = version;
sha256 = "sha256-JlTmUPY3yo/uROyd3nW1dJa23zbLhgQTwcmqZkPOrHs=";
name = "${pname}-${version}-source";
postFetch = ''
cd $out
mv tests/testdata/unicode.dist/unicodedist/åäö_日本語.py \
tests/testdata/unicode.dist/unicodedist/æɐø_日本價.py
patch -p1 < ${./0001-tests-Rename-a-a-o-_-.py-_-.py.patch}
'';
};
nativeBuildInputs = [
bootstrapped-pip
setuptools
];
# No tests in archive
doCheck = false;
pythonImportsCheck = [ "wheel" ];
# We add this flag to ignore the copy installed by bootstrapped-pip
pipInstallFlags = [ "--ignore-installed" ];
meta = with lib; {
homepage = "https://github.com/pypa/wheel";
description = "A built-package format for Python";
longDescription = ''
This library is the reference implementation of the Python wheel packaging standard,
as defined in PEP 427.
It has two different roles:
- A setuptools extension for building wheels that provides the bdist_wheel setuptools command
- A command line tool for working with wheel files
It should be noted that wheel is not intended to be used as a library,
and as such there is no stable, public API.
'';
license = with licenses; [ mit ];
maintainers = with maintainers; [ siriobalmelli ];
};
}

22
pkgs/development/tools/language-servers/verible/default.nix
View file

@ -13,18 +13,21 @@ let
in in
buildBazelPackage rec { buildBazelPackage rec {
pname = "verible"; pname = "verible";
version = "0.0-2472-ga80124e1";
# These environment variables are read in bazel/build-version.py to create # These environment variables are read in bazel/build-version.py to create
# a build string. Otherwise it would attempt to extract it from .git/. # a build string shown in the tools --version output.
GIT_DATE = "2022-10-21"; # If env variables not set, it would attempt to extract it from .git/.
GIT_VERSION = version; GIT_DATE = "2023-02-02";
GIT_VERSION = "v0.0-2821-gb2180bfa";
# Derive nix package version from GIT_VERSION: "v1.2-345-abcde" -> "1.2.345"
version = builtins.concatStringsSep "." (lib.take 3 (lib.drop 1 (builtins.splitVersion GIT_VERSION)));
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "chipsalliance"; owner = "chipsalliance";
repo = "verible"; repo = "verible";
rev = "v${version}"; rev = "${GIT_VERSION}";
sha256 = "sha256:0jpdxqhnawrl80pbc8544pyggdp5s3cbc7byc423d5v0sri2f96v"; sha256 = "sha256-etcimvInhebH2zRPyZnWUq6m3VnCq44w32GJrIacULo=";
}; };
patches = [ patches = [
@ -46,8 +49,8 @@ buildBazelPackage rec {
# of the output derivation ? Is there a more robust way to do this ? # of the output derivation ? Is there a more robust way to do this ?
# (Hashes extracted from the ofborg build logs) # (Hashes extracted from the ofborg build logs)
sha256 = { sha256 = {
aarch64-linux = "sha256-6Udp7sZKGU8gcy6+5WPhkSWunf1sVkha8l5S1UQsC04="; aarch64-linux = "sha256-dYJoae3+u+gpULHS8nteFzzL974cVJ+cJzeG/Dz2HaQ=";
x86_64-linux = "sha256-WfhgbJFaM/ipdd1dRjPeVZ1mK2hotb0wLmKjO7e+BO4="; x86_64-linux = "sha256-Jd99+nhqgZ2Gwd78eyXfnSSfbl8C3hoWkiUnzJG1jqM=";
}.${system} or (throw "No hash for system: ${system}"); }.${system} or (throw "No hash for system: ${system}");
}; };
@ -62,12 +65,9 @@ buildBazelPackage rec {
bazel/build-version.py \ bazel/build-version.py \
bazel/sh_test_with_runfiles_lib.sh \ bazel/sh_test_with_runfiles_lib.sh \
common/lsp/dummy-ls_test.sh \ common/lsp/dummy-ls_test.sh \
common/parser/move_yacc_stack_symbols.sh \
common/parser/record_syntax_error.sh \
common/tools/patch_tool_test.sh \ common/tools/patch_tool_test.sh \
common/tools/verible-transform-interactive.sh \ common/tools/verible-transform-interactive.sh \
common/tools/verible-transform-interactive-test.sh \ common/tools/verible-transform-interactive-test.sh \
common/util/create_version_header.sh \
kythe-browse.sh \ kythe-browse.sh \
verilog/tools verilog/tools
''; '';

10
pkgs/development/tools/language-servers/verible/remove-unused-deps.patch
View file

@ -1,5 +1,5 @@
diff --git a/WORKSPACE b/WORKSPACE diff --git a/WORKSPACE b/WORKSPACE
index 696cc7ef..55a5bb8a 100644 index ad16b3a1..52b66703 100644
--- a/WORKSPACE --- a/WORKSPACE
+++ b/WORKSPACE +++ b/WORKSPACE
@@ -81,17 +81,6 @@ load("@com_github_google_rules_install//:setup.bzl", "install_rules_setup") @@ -81,17 +81,6 @@ load("@com_github_google_rules_install//:setup.bzl", "install_rules_setup")
@ -12,11 +12,11 @@ index 696cc7ef..55a5bb8a 100644
- -
-win_flex_configure( -win_flex_configure(
- name = "win_flex_bison", - name = "win_flex_bison",
- sha256 = "095cf65cb3f12ee5888022f93109acbe6264e5f18f6ffce0bda77feb31b65bd8", - sha256 = "8d324b62be33604b2c45ad1dd34ab93d722534448f55a16ca7292de32b6ac135",
- # bison 3.3.2, flex 2.6.4 - # bison 3.8.2, flex 2.6.4
- url = "https://github.com/lexxmark/winflexbison/releases/download/v2.5.18/win_flex_bison-2.5.18.zip", - url = "https://github.com/lexxmark/winflexbison/releases/download/v2.5.25/win_flex_bison-2.5.25.zip",
-) -)
- -
http_archive( http_archive(
name = "rules_m4", name = "rules_m4",
sha256 = "c67fa9891bb19e9e6c1050003ba648d35383b8cb3c9572f397ad24040fb7f0eb", sha256 = "b0309baacfd1b736ed82dc2bb27b0ec38455a31a3d5d20f8d05e831ebeef1a8e",

11
pkgs/servers/web-apps/outline/default.nix
View file

@ -9,13 +9,13 @@
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "outline"; pname = "outline";
version = "0.67.1"; version = "0.67.2";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "outline"; owner = "outline";
repo = "outline"; repo = "outline";
rev = "v${version}"; rev = "v${version}";
sha256 = "sha256-oc9rG1dHi5YEU8VdwldHDv1qporMk8K7wpXOrCgcc0w="; sha256 = "sha256-O5t//UwF+AVFxeBQHRIZM5RSf4+DgUE5LHWVRKxJLfc=";
}; };
nativeBuildInputs = [ makeWrapper yarn2nix-moretea.fixup_yarn_lock ]; nativeBuildInputs = [ makeWrapper yarn2nix-moretea.fixup_yarn_lock ];
@ -56,7 +56,12 @@ stdenv.mkDerivation rec {
runHook preInstall runHook preInstall
mkdir -p $out/bin $out/share/outline mkdir -p $out/bin $out/share/outline
mv public node_modules build $out/share/outline/ mv node_modules build $out/share/outline/
# On NixOS the WorkingDirectory is set to the build directory, as
# this contains files needed in the onboarding process. This folder
# must also contain the `public` folder for mail notifications to
# work, as it contains the mail templates.
mv public $out/share/outline/build
node_modules=$out/share/outline/node_modules node_modules=$out/share/outline/node_modules
build=$out/share/outline/build build=$out/share/outline/build

164
pkgs/servers/web-apps/outline/yarn.lock
View file

@ -76,12 +76,12 @@
json5 "^2.2.1" json5 "^2.2.1"
semver "^6.3.0" semver "^6.3.0"
"@babel/generator@^7.18.10", "@babel/generator@^7.7.2": "@babel/generator@^7.18.10", "@babel/generator@^7.20.7", "@babel/generator@^7.7.2":
version "7.18.12" version "7.20.7"
resolved "https://registry.yarnpkg.com/@babel/generator/-/generator-7.18.12.tgz#fa58daa303757bd6f5e4bbca91b342040463d9f4" resolved "https://registry.yarnpkg.com/@babel/generator/-/generator-7.20.7.tgz#f8ef57c8242665c5929fe2e8d82ba75460187b4a"
integrity sha512-dfQ8ebCN98SvyL7IxNMCUtZQSq5R7kxgN+r8qYTGDmmSion1hX2C0zq2yo1bsCDhXixokv1SAWTZUMYbO/V5zg== integrity sha512-7wqMOJq8doJMZmP4ApXTzLxSr7+oO2jroJURrVEp6XShrQUObV8Tq/D0NCcoYg2uHqUrjzO0zwBjoYzelxK+sw==
dependencies: dependencies:
"@babel/types" "^7.18.10" "@babel/types" "^7.20.7"
"@jridgewell/gen-mapping" "^0.3.2" "@jridgewell/gen-mapping" "^0.3.2"
jsesc "^2.5.1" jsesc "^2.5.1"
@ -110,17 +110,18 @@
browserslist "^4.20.2" browserslist "^4.20.2"
semver "^6.3.0" semver "^6.3.0"
"@babel/helper-create-class-features-plugin@^7.16.0", "@babel/helper-create-class-features-plugin@^7.16.7", "@babel/helper-create-class-features-plugin@^7.18.9": "@babel/helper-create-class-features-plugin@^7.16.0", "@babel/helper-create-class-features-plugin@^7.16.7", "@babel/helper-create-class-features-plugin@^7.18.9", "@babel/helper-create-class-features-plugin@^7.20.7":
version "7.18.9" version "7.20.12"
resolved "https://registry.yarnpkg.com/@babel/helper-create-class-features-plugin/-/helper-create-class-features-plugin-7.18.9.tgz#d802ee16a64a9e824fcbf0a2ffc92f19d58550ce" resolved "https://registry.yarnpkg.com/@babel/helper-create-class-features-plugin/-/helper-create-class-features-plugin-7.20.12.tgz#4349b928e79be05ed2d1643b20b99bb87c503819"
integrity sha512-WvypNAYaVh23QcjpMR24CwZY2Nz6hqdOcFdPbNpV56hL5H6KiFheO7Xm1aPdlLQ7d5emYZX7VZwPp9x3z+2opw== integrity sha512-9OunRkbT0JQcednL0UFvbfXpAsUXiGjUk0a7sN8fUXX7Mue79cUSMjHGDRRi/Vz9vYlpIhLV5fMD5dKoMhhsNQ==
dependencies: dependencies:
"@babel/helper-annotate-as-pure" "^7.18.6" "@babel/helper-annotate-as-pure" "^7.18.6"
"@babel/helper-environment-visitor" "^7.18.9" "@babel/helper-environment-visitor" "^7.18.9"
"@babel/helper-function-name" "^7.18.9" "@babel/helper-function-name" "^7.19.0"
"@babel/helper-member-expression-to-functions" "^7.18.9" "@babel/helper-member-expression-to-functions" "^7.20.7"
"@babel/helper-optimise-call-expression" "^7.18.6" "@babel/helper-optimise-call-expression" "^7.18.6"
"@babel/helper-replace-supers" "^7.18.9" "@babel/helper-replace-supers" "^7.20.7"
"@babel/helper-skip-transparent-expression-wrappers" "^7.20.0"
"@babel/helper-split-export-declaration" "^7.18.6" "@babel/helper-split-export-declaration" "^7.18.6"
"@babel/helper-create-regexp-features-plugin@^7.16.0": "@babel/helper-create-regexp-features-plugin@^7.16.0":
@ -157,13 +158,13 @@
dependencies: dependencies:
"@babel/types" "^7.16.0" "@babel/types" "^7.16.0"
"@babel/helper-function-name@^7.16.0", "@babel/helper-function-name@^7.18.9": "@babel/helper-function-name@^7.16.0", "@babel/helper-function-name@^7.18.9", "@babel/helper-function-name@^7.19.0":
version "7.18.9" version "7.19.0"
resolved "https://registry.yarnpkg.com/@babel/helper-function-name/-/helper-function-name-7.18.9.tgz#940e6084a55dee867d33b4e487da2676365e86b0" resolved "https://registry.yarnpkg.com/@babel/helper-function-name/-/helper-function-name-7.19.0.tgz#941574ed5390682e872e52d3f38ce9d1bef4648c"
integrity sha512-fJgWlZt7nxGksJS9a0XdSaI4XvpExnNIgRP+rVefWh5U7BL8pPuir6SJUmFKRfjWQ51OtWSzwOxhaH/EBWWc0A== integrity sha512-WAwHBINyrpqywkUH0nTnNgI5ina5TFn85HKS0pbPDfxFfhyR/aNQEn4hGi1P1JyT//I0t4OgXUlofzWILRvS5w==
dependencies: dependencies:
"@babel/template" "^7.18.6" "@babel/template" "^7.18.10"
"@babel/types" "^7.18.9" "@babel/types" "^7.19.0"
"@babel/helper-hoist-variables@^7.16.0", "@babel/helper-hoist-variables@^7.18.6": "@babel/helper-hoist-variables@^7.16.0", "@babel/helper-hoist-variables@^7.18.6":
version "7.18.6" version "7.18.6"
@ -172,12 +173,12 @@
dependencies: dependencies:
"@babel/types" "^7.18.6" "@babel/types" "^7.18.6"
"@babel/helper-member-expression-to-functions@^7.18.9": "@babel/helper-member-expression-to-functions@^7.18.9", "@babel/helper-member-expression-to-functions@^7.20.7":
version "7.18.9" version "7.20.7"
resolved "https://registry.yarnpkg.com/@babel/helper-member-expression-to-functions/-/helper-member-expression-to-functions-7.18.9.tgz#1531661e8375af843ad37ac692c132841e2fd815" resolved "https://registry.yarnpkg.com/@babel/helper-member-expression-to-functions/-/helper-member-expression-to-functions-7.20.7.tgz#a6f26e919582275a93c3aa6594756d71b0bb7f05"
integrity sha512-RxifAh2ZoVU67PyKIO4AMi1wTenGfMR/O/ae0CCRqwgBAt5v7xjdtRw7UoSbsreKrQn5t7r89eruK/9JjYHuDg== integrity sha512-9J0CxJLq315fEdi4s7xK5TQaNYjZw+nDVpVqr1axNGKzdrdwYBD5b4uKv3n75aABG0rCCTK8Im8Ww7eYfMrZgw==
dependencies: dependencies:
"@babel/types" "^7.18.9" "@babel/types" "^7.20.7"
"@babel/helper-module-imports@^7.0.0", "@babel/helper-module-imports@^7.0.0-beta.49", "@babel/helper-module-imports@^7.10.4", "@babel/helper-module-imports@^7.12.13", "@babel/helper-module-imports@^7.14.5", "@babel/helper-module-imports@^7.16.0", "@babel/helper-module-imports@^7.18.6": "@babel/helper-module-imports@^7.0.0", "@babel/helper-module-imports@^7.0.0-beta.49", "@babel/helper-module-imports@^7.10.4", "@babel/helper-module-imports@^7.12.13", "@babel/helper-module-imports@^7.14.5", "@babel/helper-module-imports@^7.16.0", "@babel/helper-module-imports@^7.18.6":
version "7.18.6" version "7.18.6"
@ -221,16 +222,17 @@
"@babel/helper-wrap-function" "^7.16.0" "@babel/helper-wrap-function" "^7.16.0"
"@babel/types" "^7.16.0" "@babel/types" "^7.16.0"
"@babel/helper-replace-supers@^7.16.0", "@babel/helper-replace-supers@^7.18.9": "@babel/helper-replace-supers@^7.16.0", "@babel/helper-replace-supers@^7.18.9", "@babel/helper-replace-supers@^7.20.7":
version "7.18.9" version "7.20.7"
resolved "https://registry.yarnpkg.com/@babel/helper-replace-supers/-/helper-replace-supers-7.18.9.tgz#1092e002feca980fbbb0bd4d51b74a65c6a500e6" resolved "https://registry.yarnpkg.com/@babel/helper-replace-supers/-/helper-replace-supers-7.20.7.tgz#243ecd2724d2071532b2c8ad2f0f9f083bcae331"
integrity sha512-dNsWibVI4lNT6HiuOIBr1oyxo40HvIVmbwPUm3XZ7wMh4k2WxrxTqZwSqw/eEmXDS9np0ey5M2bz9tBmO9c+YQ== integrity sha512-vujDMtB6LVfNW13jhlCrp48QNslK6JXi7lQG736HVbHz/mbf4Dc7tIRh1Xf5C0rF7BP8iiSxGMCmY6Ci1ven3A==
dependencies: dependencies:
"@babel/helper-environment-visitor" "^7.18.9" "@babel/helper-environment-visitor" "^7.18.9"
"@babel/helper-member-expression-to-functions" "^7.18.9" "@babel/helper-member-expression-to-functions" "^7.20.7"
"@babel/helper-optimise-call-expression" "^7.18.6" "@babel/helper-optimise-call-expression" "^7.18.6"
"@babel/traverse" "^7.18.9" "@babel/template" "^7.20.7"
"@babel/types" "^7.18.9" "@babel/traverse" "^7.20.7"
"@babel/types" "^7.20.7"
"@babel/helper-simple-access@^7.17.7", "@babel/helper-simple-access@^7.18.6": "@babel/helper-simple-access@^7.17.7", "@babel/helper-simple-access@^7.18.6":
version "7.18.6" version "7.18.6"
@ -239,12 +241,12 @@
dependencies: dependencies:
"@babel/types" "^7.18.6" "@babel/types" "^7.18.6"
"@babel/helper-skip-transparent-expression-wrappers@^7.16.0": "@babel/helper-skip-transparent-expression-wrappers@^7.16.0", "@babel/helper-skip-transparent-expression-wrappers@^7.20.0":
version "7.16.0" version "7.20.0"
resolved "https://registry.yarnpkg.com/@babel/helper-skip-transparent-expression-wrappers/-/helper-skip-transparent-expression-wrappers-7.16.0.tgz#0ee3388070147c3ae051e487eca3ebb0e2e8bb09" resolved "https://registry.yarnpkg.com/@babel/helper-skip-transparent-expression-wrappers/-/helper-skip-transparent-expression-wrappers-7.20.0.tgz#fbe4c52f60518cab8140d77101f0e63a8a230684"
integrity sha512-+il1gTy0oHwUsBQZyJvukbB4vPMdcYBrFHa0Uc4AizLxbq6BOYC51Rv4tWocX9BLBDLZ4kc6qUFpQ6HRgL+3zw== integrity sha512-5y1JYeNKfvnT8sZcK9DVRtpTbGiomYIHviSP3OQWmDPU3DeH4a1ZlT/N2lyQ5P8egjcRaT/Y9aNqUxK0WsnIIg==
dependencies: dependencies:
"@babel/types" "^7.16.0" "@babel/types" "^7.20.0"
"@babel/helper-split-export-declaration@^7.16.0", "@babel/helper-split-export-declaration@^7.18.6": "@babel/helper-split-export-declaration@^7.16.0", "@babel/helper-split-export-declaration@^7.18.6":
version "7.18.6" version "7.18.6"
@ -263,7 +265,7 @@
resolved "https://registry.yarnpkg.com/@babel/helper-validator-identifier/-/helper-validator-identifier-7.19.1.tgz#7eea834cf32901ffdc1a7ee555e2f9c27e249ca2" resolved "https://registry.yarnpkg.com/@babel/helper-validator-identifier/-/helper-validator-identifier-7.19.1.tgz#7eea834cf32901ffdc1a7ee555e2f9c27e249ca2"
integrity sha512-awrNfaMtnHUr653GgGEs++LlAvW6w+DcPrOliSMXWCKo597CwL5Acf/wWdNkf/tfEQE3mjkeD1YOVZOUV/od1w== integrity sha512-awrNfaMtnHUr653GgGEs++LlAvW6w+DcPrOliSMXWCKo597CwL5Acf/wWdNkf/tfEQE3mjkeD1YOVZOUV/od1w==
"@babel/helper-validator-option@^7.14.5", "@babel/helper-validator-option@^7.16.7", "@babel/helper-validator-option@^7.18.6": "@babel/helper-validator-option@^7.14.5", "@babel/helper-validator-option@^7.18.6":
version "7.18.6" version "7.18.6"
resolved "https://registry.yarnpkg.com/@babel/helper-validator-option/-/helper-validator-option-7.18.6.tgz#bf0d2b5a509b1f336099e4ff36e1a63aa5db4db8" resolved "https://registry.yarnpkg.com/@babel/helper-validator-option/-/helper-validator-option-7.18.6.tgz#bf0d2b5a509b1f336099e4ff36e1a63aa5db4db8"
integrity sha512-XO7gESt5ouv/LRJdrVjkShckw6STTaB7l9BrpBaAHDeF5YZT+01PCwmR0SJHnkW6i8OwW/EVWRShfi4j2x+KQw== integrity sha512-XO7gESt5ouv/LRJdrVjkShckw6STTaB7l9BrpBaAHDeF5YZT+01PCwmR0SJHnkW6i8OwW/EVWRShfi4j2x+KQw==
@ -296,10 +298,10 @@
chalk "^2.0.0" chalk "^2.0.0"
js-tokens "^4.0.0" js-tokens "^4.0.0"
"@babel/parser@^7.1.0", "@babel/parser@^7.14.7", "@babel/parser@^7.18.10", "@babel/parser@^7.18.11", "@babel/parser@^7.7.0": "@babel/parser@^7.1.0", "@babel/parser@^7.14.7", "@babel/parser@^7.18.10", "@babel/parser@^7.18.11", "@babel/parser@^7.20.7", "@babel/parser@^7.7.0":
version "7.18.11" version "7.20.7"
resolved "https://registry.yarnpkg.com/@babel/parser/-/parser-7.18.11.tgz#68bb07ab3d380affa9a3f96728df07969645d2d9" resolved "https://registry.yarnpkg.com/@babel/parser/-/parser-7.20.7.tgz#66fe23b3c8569220817d5feb8b9dcdc95bb4f71b"
integrity sha512-9JKn5vN+hDt0Hdqn1PiJ2guflwP+B6Ga8qbDuoF0PzzVhrzsKIJo8yGqVk6CmMHiMei9w1C1Bp9IMJSIK+HPIQ== integrity sha512-T3Z9oHybU+0vZlY9CiDSJQTD5ZapcW18ZctFMi0MOAl/4BjFF4ul7NVSARLdbGO5vDqy9eQiGTV0LtKfvCYvcg==
"@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression@^7.16.0": "@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression@^7.16.0":
version "7.16.2" version "7.16.2"
@ -582,12 +584,12 @@
dependencies: dependencies:
"@babel/helper-plugin-utils" "^7.14.5" "@babel/helper-plugin-utils" "^7.14.5"
"@babel/plugin-syntax-typescript@^7.16.7", "@babel/plugin-syntax-typescript@^7.7.2": "@babel/plugin-syntax-typescript@^7.20.0", "@babel/plugin-syntax-typescript@^7.7.2":
version "7.17.10" version "7.20.0"
resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-typescript/-/plugin-syntax-typescript-7.17.10.tgz#80031e6042cad6a95ed753f672ebd23c30933195" resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-typescript/-/plugin-syntax-typescript-7.20.0.tgz#4e9a0cfc769c85689b77a2e642d24e9f697fc8c7"
integrity sha512-xJefea1DWXW09pW4Tm9bjwVlPDyYA2it3fWlmEjpYz6alPvTUjL0EOzNzI/FEOyI3r4/J7uVH5UqKgl1TQ5hqQ== integrity sha512-rd9TkG+u1CExzS4SM1BlMEhMXwFLKVjOAFFCDx9PbX5ycJWDoWMcwdJH9RhkPu1dOgn5TrxLot/Gx6lWFuAUNQ==
dependencies: dependencies:
"@babel/helper-plugin-utils" "^7.16.7" "@babel/helper-plugin-utils" "^7.19.0"
"@babel/plugin-transform-arrow-functions@^7.16.0": "@babel/plugin-transform-arrow-functions@^7.16.0":
version "7.16.0" version "7.16.0"
@ -867,14 +869,14 @@
dependencies: dependencies:
"@babel/helper-plugin-utils" "^7.14.5" "@babel/helper-plugin-utils" "^7.14.5"
"@babel/plugin-transform-typescript@^7.16.7": "@babel/plugin-transform-typescript@^7.18.6":
version "7.16.8" version "7.20.7"
resolved "https://registry.yarnpkg.com/@babel/plugin-transform-typescript/-/plugin-transform-typescript-7.16.8.tgz#591ce9b6b83504903fa9dd3652c357c2ba7a1ee0" resolved "https://registry.yarnpkg.com/@babel/plugin-transform-typescript/-/plugin-transform-typescript-7.20.7.tgz#673f49499cd810ae32a1ea5f3f8fab370987e055"
integrity sha512-bHdQ9k7YpBDO2d0NVfkj51DpQcvwIzIusJ7mEUaMlbZq3Kt/U47j24inXZHQ5MDiYpCs+oZiwnXyKedE8+q7AQ== integrity sha512-m3wVKEvf6SoszD8pu4NZz3PvfKRCMgk6D6d0Qi9hNnlM5M6CFS92EgF4EiHVLKbU0r/r7ty1hg7NPZwE7WRbYw==
dependencies: dependencies:
"@babel/helper-create-class-features-plugin" "^7.16.7" "@babel/helper-create-class-features-plugin" "^7.20.7"
"@babel/helper-plugin-utils" "^7.16.7" "@babel/helper-plugin-utils" "^7.20.2"
"@babel/plugin-syntax-typescript" "^7.16.7" "@babel/plugin-syntax-typescript" "^7.20.0"
"@babel/plugin-transform-unicode-escapes@^7.16.0": "@babel/plugin-transform-unicode-escapes@^7.16.0":
version "7.16.0" version "7.16.0"
@ -994,14 +996,14 @@
"@babel/plugin-transform-react-jsx-development" "^7.18.6" "@babel/plugin-transform-react-jsx-development" "^7.18.6"
"@babel/plugin-transform-react-pure-annotations" "^7.18.6" "@babel/plugin-transform-react-pure-annotations" "^7.18.6"
"@babel/preset-typescript@^7.16.0": "@babel/preset-typescript@^7.18.6":
version "7.16.7" version "7.18.6"
resolved "https://registry.yarnpkg.com/@babel/preset-typescript/-/preset-typescript-7.16.7.tgz#ab114d68bb2020afc069cd51b37ff98a046a70b9" resolved "https://registry.yarnpkg.com/@babel/preset-typescript/-/preset-typescript-7.18.6.tgz#ce64be3e63eddc44240c6358daefac17b3186399"
integrity sha512-WbVEmgXdIyvzB77AQjGBEyYPZx+8tTsO50XtfozQrkW8QB2rLJpH2lgx0TRw5EJrBxOZQ+wCcyPVQvS8tjEHpQ== integrity sha512-s9ik86kXBAnD760aybBucdpnLsAt0jK1xqJn2juOn9lkOvSHV60os5hxoVJsPzMQxvnUJFAlkont2DvvaYEBtQ==
dependencies: dependencies:
"@babel/helper-plugin-utils" "^7.16.7" "@babel/helper-plugin-utils" "^7.18.6"
"@babel/helper-validator-option" "^7.16.7" "@babel/helper-validator-option" "^7.18.6"
"@babel/plugin-transform-typescript" "^7.16.7" "@babel/plugin-transform-typescript" "^7.18.6"
"@babel/runtime-corejs3@^7.10.2": "@babel/runtime-corejs3@^7.10.2":
version "7.12.5" version "7.12.5"
@ -1018,35 +1020,35 @@
dependencies: dependencies:
regenerator-runtime "^0.13.11" regenerator-runtime "^0.13.11"
"@babel/template@^7.16.0", "@babel/template@^7.18.10", "@babel/template@^7.18.6", "@babel/template@^7.3.3": "@babel/template@^7.16.0", "@babel/template@^7.18.10", "@babel/template@^7.18.6", "@babel/template@^7.20.7", "@babel/template@^7.3.3":
version "7.18.10" version "7.20.7"
resolved "https://registry.yarnpkg.com/@babel/template/-/template-7.18.10.tgz#6f9134835970d1dbf0835c0d100c9f38de0c5e71" resolved "https://registry.yarnpkg.com/@babel/template/-/template-7.20.7.tgz#a15090c2839a83b02aa996c0b4994005841fd5a8"
integrity sha512-TI+rCtooWHr3QJ27kJxfjutghu44DLnasDMwpDqCXVTal9RLp3RSYNh4NdBrRP2cQAoG9A8juOQl6P6oZG4JxA== integrity sha512-8SegXApWe6VoNw0r9JHpSteLKTpTiLZ4rMlGIm9JQ18KiCtyQiAMEazujAHrUS5flrcqYZa75ukev3P6QmUwUw==
dependencies: dependencies:
"@babel/code-frame" "^7.18.6" "@babel/code-frame" "^7.18.6"
"@babel/parser" "^7.18.10" "@babel/parser" "^7.20.7"
"@babel/types" "^7.18.10" "@babel/types" "^7.20.7"
"@babel/traverse@^7.13.0", "@babel/traverse@^7.16.0", "@babel/traverse@^7.18.10", "@babel/traverse@^7.18.9", "@babel/traverse@^7.4.5", "@babel/traverse@^7.7.0", "@babel/traverse@^7.7.2": "@babel/traverse@^7.13.0", "@babel/traverse@^7.16.0", "@babel/traverse@^7.18.10", "@babel/traverse@^7.18.9", "@babel/traverse@^7.20.7", "@babel/traverse@^7.4.5", "@babel/traverse@^7.7.0", "@babel/traverse@^7.7.2":
version "7.18.11" version "7.20.12"
resolved "https://registry.yarnpkg.com/@babel/traverse/-/traverse-7.18.11.tgz#3d51f2afbd83ecf9912bcbb5c4d94e3d2ddaa16f" resolved "https://registry.yarnpkg.com/@babel/traverse/-/traverse-7.20.12.tgz#7f0f787b3a67ca4475adef1f56cb94f6abd4a4b5"
integrity sha512-TG9PiM2R/cWCAy6BPJKeHzNbu4lPzOSZpeMfeNErskGpTJx6trEvFaVCbDvpcxwy49BKWmEPwiW8mrysNiDvIQ== integrity sha512-MsIbFN0u+raeja38qboyF8TIT7K0BFzz/Yd/77ta4MsUsmP2RAnidIlwq7d5HFQrH/OZJecGV6B71C4zAgpoSQ==
dependencies: dependencies:
"@babel/code-frame" "^7.18.6" "@babel/code-frame" "^7.18.6"
"@babel/generator" "^7.18.10" "@babel/generator" "^7.20.7"
"@babel/helper-environment-visitor" "^7.18.9" "@babel/helper-environment-visitor" "^7.18.9"
"@babel/helper-function-name" "^7.18.9" "@babel/helper-function-name" "^7.19.0"
"@babel/helper-hoist-variables" "^7.18.6" "@babel/helper-hoist-variables" "^7.18.6"
"@babel/helper-split-export-declaration" "^7.18.6" "@babel/helper-split-export-declaration" "^7.18.6"
"@babel/parser" "^7.18.11" "@babel/parser" "^7.20.7"
"@babel/types" "^7.18.10" "@babel/types" "^7.20.7"
debug "^4.1.0" debug "^4.1.0"
globals "^11.1.0" globals "^11.1.0"
"@babel/types@^7.0.0", "@babel/types@^7.0.0-beta.49", "@babel/types@^7.16.0", "@babel/types@^7.18.10", "@babel/types@^7.18.6", "@babel/types@^7.18.9", "@babel/types@^7.19.0", "@babel/types@^7.3.0", "@babel/types@^7.3.3", "@babel/types@^7.4.4", "@babel/types@^7.7.0": "@babel/types@^7.0.0", "@babel/types@^7.0.0-beta.49", "@babel/types@^7.16.0", "@babel/types@^7.18.10", "@babel/types@^7.18.6", "@babel/types@^7.18.9", "@babel/types@^7.19.0", "@babel/types@^7.20.0", "@babel/types@^7.20.7", "@babel/types@^7.3.0", "@babel/types@^7.3.3", "@babel/types@^7.4.4", "@babel/types@^7.7.0":
version "7.20.5" version "7.20.7"
resolved "https://registry.yarnpkg.com/@babel/types/-/types-7.20.5.tgz#e206ae370b5393d94dfd1d04cd687cace53efa84" resolved "https://registry.yarnpkg.com/@babel/types/-/types-7.20.7.tgz#54ec75e252318423fc07fb644dc6a58a64c09b7f"
integrity sha512-c9fst/h2/dcF7H+MJKZ2T0KjEQ8hY/BNnDk/H3XY8C4Aw/eWQXWn/lWntHF9ooUBnGmEvbfGrTgLWc+um0YDUg== integrity sha512-69OnhBxSSgK0OzTJai4kyPDiKTIe3j+ctaHdIGVbRahTLAT7L3R9oeXHC2aVSuGYt3cVnoAMDmOCgJ2yaiLMvg==
dependencies: dependencies:
"@babel/helper-string-parser" "^7.19.4" "@babel/helper-string-parser" "^7.19.4"
"@babel/helper-validator-identifier" "^7.19.1" "@babel/helper-validator-identifier" "^7.19.1"
@ -10062,10 +10064,10 @@ jsdom@^19.0.0:
ws "^8.2.3" ws "^8.2.3"
xml-name-validator "^4.0.0" xml-name-validator "^4.0.0"
jsdom@^20.0.3: jsdom@^21.0.0:
version "20.0.3" version "21.0.0"
resolved "https://registry.yarnpkg.com/jsdom/-/jsdom-20.0.3.tgz#886a41ba1d4726f67a8858028c99489fed6ad4db" resolved "https://registry.yarnpkg.com/jsdom/-/jsdom-21.0.0.tgz#33e22f2fc44286e50ac853c7b7656c8864a4ea45"
integrity sha512-SYhBvTh89tTfCD/CRdSOm13mOBa42iTaTyfyEWBdKcGdPxPtLFBXuHR8XHb33YNYaP+lLbmSvBTsnoesCNJEsQ== integrity sha512-AIw+3ZakSUtDYvhwPwWHiZsUi3zHugpMEKlNPaurviseYoBqo0zBd3zqoUi3LPCNtPFlEP8FiW9MqCZdjb2IYA==
dependencies: dependencies:
abab "^2.0.6" abab "^2.0.6"
acorn "^8.8.1" acorn "^8.8.1"

112
pkgs/servers/web-apps/outline/yarn.nix
View file

@ -58,11 +58,11 @@
}; };
} }
{ {
name = "_babel_generator___generator_7.18.12.tgz"; name = "_babel_generator___generator_7.20.7.tgz";
path = fetchurl { path = fetchurl {
name = "_babel_generator___generator_7.18.12.tgz"; name = "_babel_generator___generator_7.20.7.tgz";
url = "https://registry.yarnpkg.com/@babel/generator/-/generator-7.18.12.tgz"; url = "https://registry.yarnpkg.com/@babel/generator/-/generator-7.20.7.tgz";
sha512 = "dfQ8ebCN98SvyL7IxNMCUtZQSq5R7kxgN+r8qYTGDmmSion1hX2C0zq2yo1bsCDhXixokv1SAWTZUMYbO/V5zg=="; sha512 = "7wqMOJq8doJMZmP4ApXTzLxSr7+oO2jroJURrVEp6XShrQUObV8Tq/D0NCcoYg2uHqUrjzO0zwBjoYzelxK+sw==";
}; };
} }
{ {
@ -90,11 +90,11 @@
}; };
} }
{ {
name = "_babel_helper_create_class_features_plugin___helper_create_class_features_plugin_7.18.9.tgz"; name = "_babel_helper_create_class_features_plugin___helper_create_class_features_plugin_7.20.12.tgz";
path = fetchurl { path = fetchurl {
name = "_babel_helper_create_class_features_plugin___helper_create_class_features_plugin_7.18.9.tgz"; name = "_babel_helper_create_class_features_plugin___helper_create_class_features_plugin_7.20.12.tgz";
url = "https://registry.yarnpkg.com/@babel/helper-create-class-features-plugin/-/helper-create-class-features-plugin-7.18.9.tgz"; url = "https://registry.yarnpkg.com/@babel/helper-create-class-features-plugin/-/helper-create-class-features-plugin-7.20.12.tgz";
sha512 = "WvypNAYaVh23QcjpMR24CwZY2Nz6hqdOcFdPbNpV56hL5H6KiFheO7Xm1aPdlLQ7d5emYZX7VZwPp9x3z+2opw=="; sha512 = "9OunRkbT0JQcednL0UFvbfXpAsUXiGjUk0a7sN8fUXX7Mue79cUSMjHGDRRi/Vz9vYlpIhLV5fMD5dKoMhhsNQ==";
}; };
} }
{ {
@ -130,11 +130,11 @@
}; };
} }
{ {
name = "_babel_helper_function_name___helper_function_name_7.18.9.tgz"; name = "_babel_helper_function_name___helper_function_name_7.19.0.tgz";
path = fetchurl { path = fetchurl {
name = "_babel_helper_function_name___helper_function_name_7.18.9.tgz"; name = "_babel_helper_function_name___helper_function_name_7.19.0.tgz";
url = "https://registry.yarnpkg.com/@babel/helper-function-name/-/helper-function-name-7.18.9.tgz"; url = "https://registry.yarnpkg.com/@babel/helper-function-name/-/helper-function-name-7.19.0.tgz";
sha512 = "fJgWlZt7nxGksJS9a0XdSaI4XvpExnNIgRP+rVefWh5U7BL8pPuir6SJUmFKRfjWQ51OtWSzwOxhaH/EBWWc0A=="; sha512 = "WAwHBINyrpqywkUH0nTnNgI5ina5TFn85HKS0pbPDfxFfhyR/aNQEn4hGi1P1JyT//I0t4OgXUlofzWILRvS5w==";
}; };
} }
{ {
@ -146,11 +146,11 @@
}; };
} }
{ {
name = "_babel_helper_member_expression_to_functions___helper_member_expression_to_functions_7.18.9.tgz"; name = "_babel_helper_member_expression_to_functions___helper_member_expression_to_functions_7.20.7.tgz";
path = fetchurl { path = fetchurl {
name = "_babel_helper_member_expression_to_functions___helper_member_expression_to_functions_7.18.9.tgz"; name = "_babel_helper_member_expression_to_functions___helper_member_expression_to_functions_7.20.7.tgz";
url = "https://registry.yarnpkg.com/@babel/helper-member-expression-to-functions/-/helper-member-expression-to-functions-7.18.9.tgz"; url = "https://registry.yarnpkg.com/@babel/helper-member-expression-to-functions/-/helper-member-expression-to-functions-7.20.7.tgz";
sha512 = "RxifAh2ZoVU67PyKIO4AMi1wTenGfMR/O/ae0CCRqwgBAt5v7xjdtRw7UoSbsreKrQn5t7r89eruK/9JjYHuDg=="; sha512 = "9J0CxJLq315fEdi4s7xK5TQaNYjZw+nDVpVqr1axNGKzdrdwYBD5b4uKv3n75aABG0rCCTK8Im8Ww7eYfMrZgw==";
}; };
} }
{ {
@ -194,11 +194,11 @@
}; };
} }
{ {
name = "_babel_helper_replace_supers___helper_replace_supers_7.18.9.tgz"; name = "_babel_helper_replace_supers___helper_replace_supers_7.20.7.tgz";
path = fetchurl { path = fetchurl {
name = "_babel_helper_replace_supers___helper_replace_supers_7.18.9.tgz"; name = "_babel_helper_replace_supers___helper_replace_supers_7.20.7.tgz";
url = "https://registry.yarnpkg.com/@babel/helper-replace-supers/-/helper-replace-supers-7.18.9.tgz"; url = "https://registry.yarnpkg.com/@babel/helper-replace-supers/-/helper-replace-supers-7.20.7.tgz";
sha512 = "dNsWibVI4lNT6HiuOIBr1oyxo40HvIVmbwPUm3XZ7wMh4k2WxrxTqZwSqw/eEmXDS9np0ey5M2bz9tBmO9c+YQ=="; sha512 = "vujDMtB6LVfNW13jhlCrp48QNslK6JXi7lQG736HVbHz/mbf4Dc7tIRh1Xf5C0rF7BP8iiSxGMCmY6Ci1ven3A==";
}; };
} }
{ {
@ -210,11 +210,11 @@
}; };
} }
{ {
name = "_babel_helper_skip_transparent_expression_wrappers___helper_skip_transparent_expression_wrappers_7.16.0.tgz"; name = "_babel_helper_skip_transparent_expression_wrappers___helper_skip_transparent_expression_wrappers_7.20.0.tgz";
path = fetchurl { path = fetchurl {
name = "_babel_helper_skip_transparent_expression_wrappers___helper_skip_transparent_expression_wrappers_7.16.0.tgz"; name = "_babel_helper_skip_transparent_expression_wrappers___helper_skip_transparent_expression_wrappers_7.20.0.tgz";
url = "https://registry.yarnpkg.com/@babel/helper-skip-transparent-expression-wrappers/-/helper-skip-transparent-expression-wrappers-7.16.0.tgz"; url = "https://registry.yarnpkg.com/@babel/helper-skip-transparent-expression-wrappers/-/helper-skip-transparent-expression-wrappers-7.20.0.tgz";
sha512 = "+il1gTy0oHwUsBQZyJvukbB4vPMdcYBrFHa0Uc4AizLxbq6BOYC51Rv4tWocX9BLBDLZ4kc6qUFpQ6HRgL+3zw=="; sha512 = "5y1JYeNKfvnT8sZcK9DVRtpTbGiomYIHviSP3OQWmDPU3DeH4a1ZlT/N2lyQ5P8egjcRaT/Y9aNqUxK0WsnIIg==";
}; };
} }
{ {
@ -274,11 +274,11 @@
}; };
} }
{ {
name = "_babel_parser___parser_7.18.11.tgz"; name = "_babel_parser___parser_7.20.7.tgz";
path = fetchurl { path = fetchurl {
name = "_babel_parser___parser_7.18.11.tgz"; name = "_babel_parser___parser_7.20.7.tgz";
url = "https://registry.yarnpkg.com/@babel/parser/-/parser-7.18.11.tgz"; url = "https://registry.yarnpkg.com/@babel/parser/-/parser-7.20.7.tgz";
sha512 = "9JKn5vN+hDt0Hdqn1PiJ2guflwP+B6Ga8qbDuoF0PzzVhrzsKIJo8yGqVk6CmMHiMei9w1C1Bp9IMJSIK+HPIQ=="; sha512 = "T3Z9oHybU+0vZlY9CiDSJQTD5ZapcW18ZctFMi0MOAl/4BjFF4ul7NVSARLdbGO5vDqy9eQiGTV0LtKfvCYvcg==";
}; };
} }
{ {
@ -570,11 +570,11 @@
}; };
} }
{ {
name = "_babel_plugin_syntax_typescript___plugin_syntax_typescript_7.17.10.tgz"; name = "_babel_plugin_syntax_typescript___plugin_syntax_typescript_7.20.0.tgz";
path = fetchurl { path = fetchurl {
name = "_babel_plugin_syntax_typescript___plugin_syntax_typescript_7.17.10.tgz"; name = "_babel_plugin_syntax_typescript___plugin_syntax_typescript_7.20.0.tgz";
url = "https://registry.yarnpkg.com/@babel/plugin-syntax-typescript/-/plugin-syntax-typescript-7.17.10.tgz"; url = "https://registry.yarnpkg.com/@babel/plugin-syntax-typescript/-/plugin-syntax-typescript-7.20.0.tgz";
sha512 = "xJefea1DWXW09pW4Tm9bjwVlPDyYA2it3fWlmEjpYz6alPvTUjL0EOzNzI/FEOyI3r4/J7uVH5UqKgl1TQ5hqQ=="; sha512 = "rd9TkG+u1CExzS4SM1BlMEhMXwFLKVjOAFFCDx9PbX5ycJWDoWMcwdJH9RhkPu1dOgn5TrxLot/Gx6lWFuAUNQ==";
}; };
} }
{ {
@ -858,11 +858,11 @@
}; };
} }
{ {
name = "_babel_plugin_transform_typescript___plugin_transform_typescript_7.16.8.tgz"; name = "_babel_plugin_transform_typescript___plugin_transform_typescript_7.20.7.tgz";
path = fetchurl { path = fetchurl {
name = "_babel_plugin_transform_typescript___plugin_transform_typescript_7.16.8.tgz"; name = "_babel_plugin_transform_typescript___plugin_transform_typescript_7.20.7.tgz";
url = "https://registry.yarnpkg.com/@babel/plugin-transform-typescript/-/plugin-transform-typescript-7.16.8.tgz"; url = "https://registry.yarnpkg.com/@babel/plugin-transform-typescript/-/plugin-transform-typescript-7.20.7.tgz";
sha512 = "bHdQ9k7YpBDO2d0NVfkj51DpQcvwIzIusJ7mEUaMlbZq3Kt/U47j24inXZHQ5MDiYpCs+oZiwnXyKedE8+q7AQ=="; sha512 = "m3wVKEvf6SoszD8pu4NZz3PvfKRCMgk6D6d0Qi9hNnlM5M6CFS92EgF4EiHVLKbU0r/r7ty1hg7NPZwE7WRbYw==";
}; };
} }
{ {
@ -906,11 +906,11 @@
}; };
} }
{ {
name = "_babel_preset_typescript___preset_typescript_7.16.7.tgz"; name = "_babel_preset_typescript___preset_typescript_7.18.6.tgz";
path = fetchurl { path = fetchurl {
name = "_babel_preset_typescript___preset_typescript_7.16.7.tgz"; name = "_babel_preset_typescript___preset_typescript_7.18.6.tgz";
url = "https://registry.yarnpkg.com/@babel/preset-typescript/-/preset-typescript-7.16.7.tgz"; url = "https://registry.yarnpkg.com/@babel/preset-typescript/-/preset-typescript-7.18.6.tgz";
sha512 = "WbVEmgXdIyvzB77AQjGBEyYPZx+8tTsO50XtfozQrkW8QB2rLJpH2lgx0TRw5EJrBxOZQ+wCcyPVQvS8tjEHpQ=="; sha512 = "s9ik86kXBAnD760aybBucdpnLsAt0jK1xqJn2juOn9lkOvSHV60os5hxoVJsPzMQxvnUJFAlkont2DvvaYEBtQ==";
}; };
} }
{ {
@ -930,27 +930,27 @@
}; };
} }
{ {
name = "_babel_template___template_7.18.10.tgz"; name = "_babel_template___template_7.20.7.tgz";
path = fetchurl { path = fetchurl {
name = "_babel_template___template_7.18.10.tgz"; name = "_babel_template___template_7.20.7.tgz";
url = "https://registry.yarnpkg.com/@babel/template/-/template-7.18.10.tgz"; url = "https://registry.yarnpkg.com/@babel/template/-/template-7.20.7.tgz";
sha512 = "TI+rCtooWHr3QJ27kJxfjutghu44DLnasDMwpDqCXVTal9RLp3RSYNh4NdBrRP2cQAoG9A8juOQl6P6oZG4JxA=="; sha512 = "8SegXApWe6VoNw0r9JHpSteLKTpTiLZ4rMlGIm9JQ18KiCtyQiAMEazujAHrUS5flrcqYZa75ukev3P6QmUwUw==";
}; };
} }
{ {
name = "_babel_traverse___traverse_7.18.11.tgz"; name = "_babel_traverse___traverse_7.20.12.tgz";
path = fetchurl { path = fetchurl {
name = "_babel_traverse___traverse_7.18.11.tgz"; name = "_babel_traverse___traverse_7.20.12.tgz";
url = "https://registry.yarnpkg.com/@babel/traverse/-/traverse-7.18.11.tgz"; url = "https://registry.yarnpkg.com/@babel/traverse/-/traverse-7.20.12.tgz";
sha512 = "TG9PiM2R/cWCAy6BPJKeHzNbu4lPzOSZpeMfeNErskGpTJx6trEvFaVCbDvpcxwy49BKWmEPwiW8mrysNiDvIQ=="; sha512 = "MsIbFN0u+raeja38qboyF8TIT7K0BFzz/Yd/77ta4MsUsmP2RAnidIlwq7d5HFQrH/OZJecGV6B71C4zAgpoSQ==";
}; };
} }
{ {
name = "_babel_types___types_7.20.5.tgz"; name = "_babel_types___types_7.20.7.tgz";
path = fetchurl { path = fetchurl {
name = "_babel_types___types_7.20.5.tgz"; name = "_babel_types___types_7.20.7.tgz";
url = "https://registry.yarnpkg.com/@babel/types/-/types-7.20.5.tgz"; url = "https://registry.yarnpkg.com/@babel/types/-/types-7.20.7.tgz";
sha512 = "c9fst/h2/dcF7H+MJKZ2T0KjEQ8hY/BNnDk/H3XY8C4Aw/eWQXWn/lWntHF9ooUBnGmEvbfGrTgLWc+um0YDUg=="; sha512 = "69OnhBxSSgK0OzTJai4kyPDiKTIe3j+ctaHdIGVbRahTLAT7L3R9oeXHC2aVSuGYt3cVnoAMDmOCgJ2yaiLMvg==";
}; };
} }
{ {
@ -10482,11 +10482,11 @@
}; };
} }
{ {
name = "jsdom___jsdom_20.0.3.tgz"; name = "jsdom___jsdom_21.0.0.tgz";
path = fetchurl { path = fetchurl {
name = "jsdom___jsdom_20.0.3.tgz"; name = "jsdom___jsdom_21.0.0.tgz";
url = "https://registry.yarnpkg.com/jsdom/-/jsdom-20.0.3.tgz"; url = "https://registry.yarnpkg.com/jsdom/-/jsdom-21.0.0.tgz";
sha512 = "SYhBvTh89tTfCD/CRdSOm13mOBa42iTaTyfyEWBdKcGdPxPtLFBXuHR8XHb33YNYaP+lLbmSvBTsnoesCNJEsQ=="; sha512 = "AIw+3ZakSUtDYvhwPwWHiZsUi3zHugpMEKlNPaurviseYoBqo0zBd3zqoUi3LPCNtPFlEP8FiW9MqCZdjb2IYA==";
}; };
} }
{ {

1
pkgs/servers/x11/xorg/overrides.nix
View file

@ -592,6 +592,7 @@ self: super:
xf86videovmware = super.xf86videovmware.overrideAttrs (attrs: { xf86videovmware = super.xf86videovmware.overrideAttrs (attrs: {
buildInputs = attrs.buildInputs ++ [ mesa mesa.driversdev llvm ]; # for libxatracker buildInputs = attrs.buildInputs ++ [ mesa mesa.driversdev llvm ]; # for libxatracker
NIX_CFLAGS_COMPILE = [ "-Wno-error=address" ]; # gcc12
meta = attrs.meta // { meta = attrs.meta // {
platforms = ["i686-linux" "x86_64-linux"]; platforms = ["i686-linux" "x86_64-linux"];
}; };

4
pkgs/tools/filesystems/idsk/default.nix
View file

@ -14,8 +14,8 @@ stdenv.mkDerivation rec {
nativeBuildInputs = [ cmake ]; nativeBuildInputs = [ cmake ];
NIX_CFLAGS_COMPILE = [ NIX_CFLAGS_COMPILE = lib.optionals stdenv.cc.isGNU [
# Needed with GCC 12 # Needed with GCC 12 but breaks on darwin (with clang)
"-std=c++14" "-std=c++14"
]; ];

7
pkgs/tools/inputmethods/evdevremapkeys/default.nix
View file

@ -2,13 +2,13 @@
python3Packages.buildPythonPackage rec { python3Packages.buildPythonPackage rec {
pname = "evdevremapkeys"; pname = "evdevremapkeys";
version = "0.1.0"; version = "unstable-2021-05-04";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "philipl"; owner = "philipl";
repo = pname; repo = pname;
rev = "68fb618b8142e1b45d7a1e19ea9a5a9bbb206144"; rev = "9b6f372a9bdf8b27d39f7e655b74f6b9d1a8467f";
sha256 = "0c9slflakm5jqd8s1zpxm7gmrrk0335m040d7m70hnsak42jvs2f"; sha256 = "sha256-FwRbo0RTiiV2AB7z6XOalMnwMbj15jM4Dxs41TsIOQI=";
}; };
propagatedBuildInputs = with python3Packages; [ propagatedBuildInputs = with python3Packages; [
@ -16,6 +16,7 @@ python3Packages.buildPythonPackage rec {
pyxdg pyxdg
python-daemon python-daemon
evdev evdev
pyudev
]; ];
# hase no tests # hase no tests

16
pkgs/top-level/all-packages.nix
View file

@ -1244,7 +1244,6 @@ with pkgs;
arc_unpacker = callPackage ../tools/archivers/arc_unpacker { arc_unpacker = callPackage ../tools/archivers/arc_unpacker {
boost = boost16x; # checkPhase fails with Boost 1.77 boost = boost16x; # checkPhase fails with Boost 1.77
stdenv = gcc10StdenvCompat;
}; };
adminer = callPackage ../servers/adminer { }; adminer = callPackage ../servers/adminer { };
@ -4901,11 +4900,11 @@ with pkgs;
}; };
hyprland = callPackage ../applications/window-managers/hyprwm/hyprland { hyprland = callPackage ../applications/window-managers/hyprwm/hyprland {
stdenv = gcc11Stdenv; stdenv = gcc12Stdenv;
}; };
hyprpaper = callPackage ../applications/window-managers/hyprwm/hyprpaper { hyprpaper = callPackage ../applications/window-managers/hyprwm/hyprpaper {
stdenv = gcc11Stdenv; stdenv = gcc12Stdenv;
}; };
hysteria = callPackage ../tools/networking/hysteria { }; hysteria = callPackage ../tools/networking/hysteria { };
@ -14311,7 +14310,8 @@ with pkgs;
gcc11Stdenv = overrideCC gccStdenv buildPackages.gcc11; gcc11Stdenv = overrideCC gccStdenv buildPackages.gcc11;
gcc12Stdenv = overrideCC gccStdenv buildPackages.gcc12; gcc12Stdenv = overrideCC gccStdenv buildPackages.gcc12;
gcc10StdenvCompat = if stdenv.cc.isGNU && lib.versions.major stdenv.cc.version == "11" then gcc10Stdenv else stdenv; # Meant for packages that fail with newer than gcc10.
gcc10StdenvCompat = if stdenv.cc.isGNU && lib.versionAtLeast stdenv.cc.version "11" then gcc10Stdenv else stdenv;
# This is not intended for use in nixpkgs but for providing a faster-running # This is not intended for use in nixpkgs but for providing a faster-running
# compiler to nixpkgs users by building gcc with reproducibility-breaking # compiler to nixpkgs users by building gcc with reproducibility-breaking
@ -20544,7 +20544,7 @@ with pkgs;
lmdbxx = callPackage ../development/libraries/lmdbxx { }; lmdbxx = callPackage ../development/libraries/lmdbxx { };
lemon-graph = callPackage ../development/libraries/lemon-graph { lemon-graph = callPackage ../development/libraries/lemon-graph {
stdenv = if stdenv.isLinux then gcc11Stdenv else stdenv; stdenv = if stdenv.isLinux then gcc12Stdenv else stdenv;
}; };
levmar = callPackage ../development/libraries/levmar { }; levmar = callPackage ../development/libraries/levmar { };
@ -25758,7 +25758,7 @@ with pkgs;
}; };
btop = callPackage ../tools/system/btop { btop = callPackage ../tools/system/btop {
stdenv = gcc11Stdenv; stdenv = gcc12Stdenv;
}; };
nmon = callPackage ../os-specific/linux/nmon { }; nmon = callPackage ../os-specific/linux/nmon { };
@ -30780,7 +30780,7 @@ with pkgs;
ladybird = qt6Packages.callPackage ../applications/networking/browsers/ladybird { ladybird = qt6Packages.callPackage ../applications/networking/browsers/ladybird {
# https://github.com/NixOS/nixpkgs/issues/201254 # https://github.com/NixOS/nixpkgs/issues/201254
stdenv = if stdenv.isDarwin then llvmPackages_14.stdenv else gcc11Stdenv; stdenv = if stdenv.isDarwin then llvmPackages_14.stdenv else gcc12Stdenv;
}; };
lazpaint = callPackage ../applications/graphics/lazpaint { }; lazpaint = callPackage ../applications/graphics/lazpaint { };
@ -31223,7 +31223,7 @@ with pkgs;
xmrig-mo = callPackage ../applications/misc/xmrig/moneroocean.nix { }; xmrig-mo = callPackage ../applications/misc/xmrig/moneroocean.nix { };
xmrig-proxy = callPackage ../applications/misc/xmrig/proxy.nix { }; xmrig-proxy = darwin.apple_sdk_11_0.callPackage ../applications/misc/xmrig/proxy.nix { };
molot-lite = callPackage ../applications/audio/molot-lite { }; molot-lite = callPackage ../applications/audio/molot-lite { };

2
pkgs/top-level/python2-packages.nix
View file

@ -83,6 +83,8 @@ with self; with super; {
doCheck = false; # circular dependency with pytest doCheck = false; # circular dependency with pytest
}); });
wheel = callPackage ../development/python2-modules/wheel { };
zeek = disabled super.zeek; zeek = disabled super.zeek;
zipp = callPackage ../development/python2-modules/zipp { }; zipp = callPackage ../development/python2-modules/zipp { };