0
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2025-07-14 06:00:33 +03:00

Merge staging-next into staging

This commit is contained in:
github-actions[bot] 2022-07-19 18:02:05 +00:00 committed by GitHub
commit 49299f66ad
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
32 changed files with 488 additions and 413 deletions

View file

@ -15,7 +15,8 @@ import ./make-test-python.nix ({ pkgs, ... }: {
testScript = '' testScript = ''
def airsonic_is_up(_) -> bool: def airsonic_is_up(_) -> bool:
return machine.succeed("curl --fail http://localhost:4040/login") status, _ = machine.execute("curl --fail http://localhost:4040/login")
return status == 0
machine.start() machine.start()

View file

@ -35,6 +35,9 @@ stdenv.mkDerivation rec {
cp in-formant $out/bin cp in-formant $out/bin
''; '';
# RPATH of binary /nix/store/.../bin/... contains a forbidden reference to /build/
cmakeFlags = [ "-DCMAKE_SKIP_BUILD_RPATH=ON" ];
meta = with lib; { meta = with lib; {
description = "A real-time pitch and formant tracking software"; description = "A real-time pitch and formant tracking software";
homepage = "https://github.com/in-formant/in-formant"; homepage = "https://github.com/in-formant/in-formant";

View file

@ -24,11 +24,7 @@
, withDebug ? false , withDebug ? false
}: }:
let stdenv.mkDerivation rec {
opt = lib.optional;
mkFlag = c: f: if c then "--with-${f}" else "--without-${f}";
in stdenv.mkDerivation rec {
pname = "moc"; pname = "moc";
version = "2.5.2"; version = "2.5.2";
@ -39,56 +35,56 @@ in stdenv.mkDerivation rec {
}; };
patches = [] patches = []
++ opt ffmpegSupport ./moc-ffmpeg4.patch ++ lib.optional ffmpegSupport ./moc-ffmpeg4.patch
++ opt pulseSupport ./pulseaudio.patch; ++ lib.optional pulseSupport ./pulseaudio.patch;
nativeBuildInputs = [ pkg-config ] nativeBuildInputs = [ pkg-config ]
++ opt pulseSupport autoreconfHook; ++ lib.optional pulseSupport autoreconfHook;
buildInputs = [ ncurses db popt libtool ] buildInputs = [ ncurses db popt libtool ]
# Sound sub-systems # Sound sub-systems
++ opt alsaSupport alsa-lib ++ lib.optional alsaSupport alsa-lib
++ opt pulseSupport libpulseaudio ++ lib.optional pulseSupport libpulseaudio
++ opt jackSupport libjack2 ++ lib.optional jackSupport libjack2
# Audio formats # Audio formats
++ opt (aacSupport || mp3Support) libid3tag ++ lib.optional (aacSupport || mp3Support) libid3tag
++ opt aacSupport faad2 ++ lib.optional aacSupport faad2
++ opt flacSupport flac ++ lib.optional flacSupport flac
++ opt midiSupport timidity ++ lib.optional midiSupport timidity
++ opt modplugSupport libmodplug ++ lib.optional modplugSupport libmodplug
++ opt mp3Support libmad ++ lib.optional mp3Support libmad
++ lib.optionals musepackSupport [ libmpc libmpcdec taglib ] ++ lib.optionals musepackSupport [ libmpc libmpcdec taglib ]
++ opt vorbisSupport libvorbis ++ lib.optional vorbisSupport libvorbis
++ opt speexSupport speex ++ lib.optional speexSupport speex
++ opt ffmpegSupport ffmpeg ++ lib.optional ffmpegSupport ffmpeg
++ opt sndfileSupport libsndfile ++ lib.optional sndfileSupport libsndfile
++ opt wavpackSupport wavpack ++ lib.optional wavpackSupport wavpack
# Misc # Misc
++ opt curlSupport curl ++ lib.optional curlSupport curl
++ opt samplerateSupport libsamplerate ++ lib.optional samplerateSupport libsamplerate
++ lib.optionals stdenv.isDarwin [ libiconv CoreServices ]; ++ lib.optionals stdenv.isDarwin [ libiconv CoreServices ];
configureFlags = [ configureFlags = [
# Sound sub-systems # Sound sub-systems
(mkFlag alsaSupport "alsa") (lib.withFeature alsaSupport "alsa")
(mkFlag pulseSupport "pulse") (lib.withFeature pulseSupport "pulse")
(mkFlag jackSupport "jack") (lib.withFeature jackSupport "jack")
(mkFlag ossSupport "oss") (lib.withFeature ossSupport "oss")
# Audio formats # Audio formats
(mkFlag aacSupport "aac") (lib.withFeature aacSupport "aac")
(mkFlag flacSupport "flac") (lib.withFeature flacSupport "flac")
(mkFlag midiSupport "timidity") (lib.withFeature midiSupport "timidity")
(mkFlag modplugSupport "modplug") (lib.withFeature modplugSupport "modplug")
(mkFlag mp3Support "mp3") (lib.withFeature mp3Support "mp3")
(mkFlag musepackSupport "musepack") (lib.withFeature musepackSupport "musepack")
(mkFlag vorbisSupport "vorbis") (lib.withFeature vorbisSupport "vorbis")
(mkFlag speexSupport "speex") (lib.withFeature speexSupport "speex")
(mkFlag ffmpegSupport "ffmpeg") (lib.withFeature ffmpegSupport "ffmpeg")
(mkFlag sndfileSupport "sndfile") (lib.withFeature sndfileSupport "sndfile")
(mkFlag wavpackSupport "wavpack") (lib.withFeature wavpackSupport "wavpack")
# Misc # Misc
(mkFlag curlSupport "curl") (lib.withFeature curlSupport "curl")
(mkFlag samplerateSupport "samplerate") (lib.withFeature samplerateSupport "samplerate")
("--enable-debug=" + (if withDebug then "yes" else "no")) ("--enable-debug=" + (if withDebug then "yes" else "no"))
"--disable-cache" "--disable-cache"
"--without-rcc" "--without-rcc"

View file

@ -13,13 +13,13 @@
mkDerivation rec { mkDerivation rec {
pname = "ptcollab"; pname = "ptcollab";
version = "0.6.1.0"; version = "0.6.1.1";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "yuxshao"; owner = "yuxshao";
repo = "ptcollab"; repo = "ptcollab";
rev = "v${version}"; rev = "v${version}";
sha256 = "sha256-zkDMZT1kKCLqNvvxZFKVuXFqZptX/LG/R9kRUcNJphw="; sha256 = "sha256-ydn3qKOK0GwA/mBPbGwSIac09b9cz6YOFbuDFFV8jJs=";
}; };
nativeBuildInputs = [ qmake pkg-config ]; nativeBuildInputs = [ qmake pkg-config ];

View file

@ -38,13 +38,13 @@ let
in in
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "cudatext"; pname = "cudatext";
version = "1.166.5"; version = "1.167.0";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "Alexey-T"; owner = "Alexey-T";
repo = "CudaText"; repo = "CudaText";
rev = version; rev = version;
sha256 = "sha256-mFSVYC6a9iAiUcWZOlxuVxFwuwIgH8eQmh8YKaMw2Wg="; sha256 = "sha256-cK96lcncSojEcQrZIPiJ9j9F4cIcaXvWNI9wuR3tVBU=";
}; };
postPatch = '' postPatch = ''

View file

@ -11,13 +11,13 @@
}, },
"ATFlatControls": { "ATFlatControls": {
"owner": "Alexey-T", "owner": "Alexey-T",
"rev": "2022.06.19", "rev": "2022.07.17",
"sha256": "sha256-4pkwgg2U6NAGv+fVFKIli2Qe3fyDMiliFLJSgsh1hsQ=" "sha256": "sha256-KMGmimbtUQHa8i5wt4KLA/HotLbb/ISzdznmdqPXkNU="
}, },
"ATSynEdit": { "ATSynEdit": {
"owner": "Alexey-T", "owner": "Alexey-T",
"rev": "2022.07.01", "rev": "2022.07.18",
"sha256": "sha256-Il8NMBoShJtY5itDr9EBJ8NpfiPux/pNzs9LUc/nn30=" "sha256": "sha256-3ae1XAGu+4p+EVReH7VZZOTOwOu5juybPXjK7XN16CQ="
}, },
"ATSynEdit_Cmp": { "ATSynEdit_Cmp": {
"owner": "Alexey-T", "owner": "Alexey-T",

View file

@ -11,16 +11,16 @@
rustPlatform.buildRustPackage rec { rustPlatform.buildRustPackage rec {
pname = "break-time"; pname = "break-time";
version = "0.1.1"; version = "0.1.2";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "cdepillabout"; owner = "cdepillabout";
repo = "break-time"; repo = "break-time";
rev = "v${version}"; rev = "v${version}";
sha256 = "18p9gfp0inbnjsc7af38fghyklr7qnl2kkr25isfy9d5m8cpxqc6"; sha256 = "sha256-q79JXaBwd/oKtJPvK2+72pY2YvaR3of2CMC8cF6wwQ8=";
}; };
cargoSha256 = "01y1p40vz30h2jkh37zipqvmfybgpq6wdcdglkab85jivmd1lslx"; cargoSha256 = "sha256-DpX5tcIWt/pPGujufivmAGonVIiHERfa8Yb1JZpu3WA=";
nativeBuildInputs = [ nativeBuildInputs = [
pkg-config pkg-config

View file

@ -2,13 +2,13 @@
buildGoModule rec { buildGoModule rec {
pname = "k9s"; pname = "k9s";
version = "0.25.21"; version = "0.26.0";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "derailed"; owner = "derailed";
repo = "k9s"; repo = "k9s";
rev = "v${version}"; rev = "v${version}";
sha256 = "sha256-ziIMTMK6G8vXje6GWPvcIWmlubq75XVrJUzZlA+R0Rc="; sha256 = "sha256-6A6RxvobT0T/Pbd7Zcn8++I/7OVAhXSZI1NhYeDB3iY=";
}; };
ldflags = [ ldflags = [
@ -20,7 +20,7 @@ buildGoModule rec {
tags = [ "netgo" ]; tags = [ "netgo" ];
vendorSha256 = "sha256-wL8Unht/ZRAGDuC/U4SFV5PdExy78F4DMyM8+7CMtOY="; vendorSha256 = "sha256-1FmhoLfTQSygAScbvABHZJO3611T7cfuCboyu2ShbNo=";
# TODO investigate why some config tests are failing # TODO investigate why some config tests are failing
doCheck = !(stdenv.isDarwin && stdenv.isAarch64); doCheck = !(stdenv.isDarwin && stdenv.isAarch64);

View file

@ -10,16 +10,16 @@
buildGoModule rec { buildGoModule rec {
pname = "werf"; pname = "werf";
version = "1.2.124"; version = "1.2.128";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "werf"; owner = "werf";
repo = "werf"; repo = "werf";
rev = "v${version}"; rev = "v${version}";
sha256 = "sha256-fdCFdsRMdH9xu2YIYt6r7BxqbdzrzUxLxB1k4WEnGIo="; sha256 = "sha256-H1GzIxj6ZrlcNM4Y0oKYoVBsMFj4wYP9XYicAmIpaik=";
}; };
vendorSha256 = "sha256-AbTlchqVD3TySrcHcF3/QfMhbkNg4A4oef9Qkn2v6xY="; vendorSha256 = "sha256-78V+cw0A3Q3Gagl4KrserFXvV17MSqhpaFG38VKwhKg=";
proxyVendor = true; proxyVendor = true;

View file

@ -26,13 +26,12 @@
let let
pname = "pcloud"; pname = "pcloud";
version = "1.9.7"; version = "1.9.9";
code = "XZ0FAtXZNxFJbda6KhLejU9tKAg4N0TEqx3V"; code = "XZWTVkVZQM0GNXA4hrFGPkefzUUWVLKOpPIX";
# Archive link's codes: https://www.pcloud.com/release-notes/linux.html
# Archive link's code thanks to: https://aur.archlinux.org/cgit/aur.git/tree/PKGBUILD?h=pcloud-drive
src = fetchzip { src = fetchzip {
url = "https://api.pcloud.com/getpubzip?code=${code}&filename=${pname}-${version}.zip"; url = "https://api.pcloud.com/getpubzip?code=${code}&filename=${pname}-${version}.zip";
hash = "sha256-6eMRFuZOLcoZd2hGw7QV+kAmzE5lK8uK6ZpGs4n7/zw="; hash = "sha256-8566vKrE3/QCm4qW9KxEAO+r+YfMRYOhV2Da7qic48M=";
}; };
appimageContents = appimageTools.extractType2 { appimageContents = appimageTools.extractType2 {

View file

@ -76,6 +76,11 @@ stdenv.mkDerivation rec {
patchShebangs .. patchShebangs ..
''; '';
# needed by tests (so libsimgrid.so is found)
preConfigure = ''
export LD_LIBRARY_PATH="$PWD/build/lib"
'';
doCheck = true; doCheck = true;
preCheck = '' preCheck = ''
# prevent the execution of tests known to fail # prevent the execution of tests known to fail

View file

@ -36,7 +36,10 @@ stdenv.mkDerivation rec {
++ lib.optional (!stdenv.isLinux) libiconv ++ lib.optional (!stdenv.isLinux) libiconv
++ lib.optionals enableOcr [ leptonica tesseract4 ffmpeg ]; ++ lib.optionals enableOcr [ leptonica tesseract4 ffmpeg ];
cmakeFlags = lib.optionals enableOcr [ "-DWITH_OCR=on" "-DWITH_HARDSUBX=on" ]; cmakeFlags = [
# file RPATH_CHANGE could not write new RPATH:
"-DCMAKE_SKIP_BUILD_RPATH=ON"
] ++ lib.optionals enableOcr [ "-DWITH_OCR=on" "-DWITH_HARDSUBX=on" ];
postInstall = lib.optionalString enableOcr '' postInstall = lib.optionalString enableOcr ''
wrapProgram "$out/bin/ccextractor" \ wrapProgram "$out/bin/ccextractor" \

View file

@ -49,9 +49,15 @@ stdenv.mkDerivation rec {
''; '';
preCheck = '' preCheck = ''
${if stdenv.isDarwin then "export DYLD_LIBRARY_PATH=$(pwd)/src/" else "export LD_LIBRARY_PATH=$(pwd)/src/"}
${if enablePython then "sed -i -e 's|^#!.*|#!${stdenv.shell}|' python/py.test.sh" else ""} ${if enablePython then "sed -i -e 's|^#!.*|#!${stdenv.shell}|' python/py.test.sh" else ""}
''; '';
cmakeFlags = lib.optionals enablePython [
# RPATH of binary /nix/store/.../lib/python3.10/site-packages/galario/double/libcommon.so contains a forbidden reference to /build/
"-DCMAKE_SKIP_BUILD_RPATH=ON"
];
doCheck = true; doCheck = true;
postInstall = lib.optionalString (stdenv.isDarwin && enablePython) '' postInstall = lib.optionalString (stdenv.isDarwin && enablePython) ''

View file

@ -11,10 +11,6 @@
, debugSupport ? false # Debugging (disables optimizations) , debugSupport ? false # Debugging (disables optimizations)
}: }:
let
mkFlag = optSet: flag: if optSet then "--enable-${flag}" else "--disable-${flag}";
in
with lib; with lib;
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "lame"; pname = "lame";
@ -37,16 +33,16 @@ stdenv.mkDerivation rec {
++ optional sndfileFileIOSupport libsndfile; ++ optional sndfileFileIOSupport libsndfile;
configureFlags = [ configureFlags = [
(mkFlag nasmSupport "nasm") (enableFeature nasmSupport "nasm")
(mkFlag cpmlSupport "cpml") (enableFeature cpmlSupport "cpml")
#(mkFlag efenceSupport "efence") #(enableFeature efenceSupport "efence")
(if sndfileFileIOSupport then "--with-fileio=sndfile" else "--with-fileio=lame") (if sndfileFileIOSupport then "--with-fileio=sndfile" else "--with-fileio=lame")
(mkFlag analyzerHooksSupport "analyzer-hooks") (enableFeature analyzerHooksSupport "analyzer-hooks")
(mkFlag decoderSupport "decoder") (enableFeature decoderSupport "decoder")
(mkFlag frontendSupport "frontend") (enableFeature frontendSupport "frontend")
(mkFlag frontendSupport "dynamic-frontends") (enableFeature frontendSupport "dynamic-frontends")
#(mkFlag mp3xSupport "mp3x") #(enableFeature mp3xSupport "mp3x")
(mkFlag mp3rtpSupport "mp3rtp") (enableFeature mp3rtpSupport "mp3rtp")
(if debugSupport then "--enable-debug=alot" else "") (if debugSupport then "--enable-debug=alot" else "")
]; ];

View file

@ -8,10 +8,6 @@
assert fontconfigSupport -> fontconfig != null; assert fontconfigSupport -> fontconfig != null;
let
mkFlag = optSet: flag: if optSet then "--enable-${flag}" else "--disable-${flag}";
in
with lib; with lib;
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "libass"; pname = "libass";
@ -23,9 +19,9 @@ stdenv.mkDerivation rec {
}; };
configureFlags = [ configureFlags = [
(mkFlag fontconfigSupport "fontconfig") (enableFeature fontconfigSupport "fontconfig")
(mkFlag rasterizerSupport "rasterizer") (enableFeature rasterizerSupport "rasterizer")
(mkFlag largeTilesSupport "large-tiles") (enableFeature largeTilesSupport "large-tiles")
]; ];
nativeBuildInputs = [ pkg-config yasm ]; nativeBuildInputs = [ pkg-config yasm ];

View file

@ -9,8 +9,6 @@ assert avahiSupport -> avahi != null;
assert gtkWidgets -> gtk3 != null; assert gtkWidgets -> gtk3 != null;
let let
mkFlag = flag: feature: (if flag then "--with-" else "--without-") + feature;
self = stdenv.mkDerivation rec { self = stdenv.mkDerivation rec {
pname = "libinfinity"; pname = "libinfinity";
version = "0.7.2"; version = "0.7.2";
@ -29,13 +27,13 @@ let
propagatedBuildInputs = [ gnutls ]; propagatedBuildInputs = [ gnutls ];
configureFlags = [ configureFlags = [
"--enable-gtk-doc" (lib.enableFeature true "gtk-doc")
"--enable-introspection" (lib.enableFeature true "introspection")
(mkFlag gtkWidgets "inftextgtk") (lib.withFeature gtkWidgets "inftextgtk")
(mkFlag gtkWidgets "infgtk") (lib.withFeature gtkWidgets "infgtk")
"--with-infinoted" (lib.withFeature true "infinoted")
"--with-libdaemon" (lib.withFeature true "libdaemon")
(mkFlag avahiSupport "avahi") (lib.withFeature avahiSupport "avahi")
]; ];
passthru = { passthru = {

View file

@ -0,0 +1,36 @@
{ lib
, stdenv
, fetchurl
, cmake
}:
stdenv.mkDerivation rec {
pname = "clhep";
version = "2.4.5.3";
src = fetchurl {
url = "https://proj-clhep.web.cern.ch/proj-clhep/dist1/clhep-${version}.tgz";
hash = "sha256-RfY+6wl/Av5nuGp9rb8Q1Am0AcKKGj4XLbNiUsMJfBM=";
};
prePatch = ''
cd CLHEP
'';
postPatch = ''
substituteInPlace CMakeLists.txt \
--replace "clhep_ensure_out_of_source_build()" ""
'';
nativeBuildInputs = [
cmake
];
meta = with lib; {
description = "Set of HEP-specific foundation and utility classes such as random generators, physics vectors, geometry and linear algebra";
homepage = "https://cern.ch/clhep";
license = with licenses; [ gpl3Only lgpl3Only ];
maintainers = with maintainers; [ veprbl ];
platforms = platforms.unix;
};
}

View file

@ -10,7 +10,7 @@
# Standard build environment with cmake. # Standard build environment with cmake.
, lib, stdenv, fetchurl, fetchpatch, cmake , lib, stdenv, fetchurl, fetchpatch, cmake
, clhep ? null # not packaged currently , clhep
, expat , expat
, xercesc , xercesc
, zlib , zlib
@ -65,7 +65,7 @@ stdenv.mkDerivation rec {
"-DGEANT4_USE_INVENTOR=${if enableInventor then "ON" else "OFF"}" "-DGEANT4_USE_INVENTOR=${if enableInventor then "ON" else "OFF"}"
"-DGEANT4_USE_PYTHON=${if enablePython then "ON" else "OFF"}" "-DGEANT4_USE_PYTHON=${if enablePython then "ON" else "OFF"}"
"-DGEANT4_USE_RAYTRACER_X11=${if enableRaytracerX11 then "ON" else "OFF"}" "-DGEANT4_USE_RAYTRACER_X11=${if enableRaytracerX11 then "ON" else "OFF"}"
"-DGEANT4_USE_SYSTEM_CLHEP=${if clhep != null then "ON" else "OFF"}" "-DGEANT4_USE_SYSTEM_CLHEP=ON"
"-DGEANT4_USE_SYSTEM_EXPAT=ON" "-DGEANT4_USE_SYSTEM_EXPAT=ON"
"-DGEANT4_USE_SYSTEM_ZLIB=ON" "-DGEANT4_USE_SYSTEM_ZLIB=ON"
"-DGEANT4_BUILD_MULTITHREADED=${if enableMultiThreading then "ON" else "OFF"}" "-DGEANT4_BUILD_MULTITHREADED=${if enableMultiThreading then "ON" else "OFF"}"
@ -88,11 +88,11 @@ stdenv.mkDerivation rec {
]; ];
dontWrapQtApps = true; # no binaries dontWrapQtApps = true; # no binaries
buildInputs = [ libGLU xlibsWrapper libXmu ] buildInputs = [ clhep libGLU xlibsWrapper libXmu ]
++ lib.optionals enableInventor [ libXpm coin3d soxt motif ] ++ lib.optionals enableInventor [ libXpm coin3d soxt motif ]
++ lib.optionals enablePython [ boost_python python3 ]; ++ lib.optionals enablePython [ boost_python python3 ];
propagatedBuildInputs = [ clhep expat xercesc zlib libGL ] propagatedBuildInputs = [ expat xercesc zlib libGL ]
++ lib.optionals enableXM [ motif ] ++ lib.optionals enableXM [ motif ]
++ lib.optionals enableQt [ qtbase ]; ++ lib.optionals enableQt [ qtbase ];

View file

@ -7,13 +7,6 @@
with lib; with lib;
let let
mkFlag = trueStr: falseStr: cond: name: val: "--"
+ (if cond then trueStr else falseStr)
+ name
+ optionalString (val != null && cond != false) "=${val}";
mkEnable = mkFlag "enable-" "disable-";
mkWith = mkFlag "with-" "without-";
shouldUsePkg = pkg: if pkg != null && lib.meta.availableOn stdenv.hostPlatform pkg then pkg else null; shouldUsePkg = pkg: if pkg != null && lib.meta.availableOn stdenv.hostPlatform pkg then pkg else null;
optLz4 = shouldUsePkg lz4; optLz4 = shouldUsePkg lz4;
@ -39,19 +32,19 @@ stdenv.mkDerivation rec {
buildInputs = [ optLz4 optSnappy optZlib optBzip2 optDb optGperftools optLeveldb ]; buildInputs = [ optLz4 optSnappy optZlib optBzip2 optDb optGperftools optLeveldb ];
configureFlags = [ configureFlags = [
(mkWith false "attach" null) (withFeature false "attach")
(mkWith true "builtins" "") (withFeatureAs true "builtins" "")
(mkEnable (optBzip2 != null) "bzip2" null) (enableFeature (optBzip2 != null) "bzip2")
(mkEnable false "diagnostic" null) (enableFeature false "diagnostic")
(mkEnable false "java" null) (enableFeature false "java")
(mkEnable (optLeveldb != null) "leveldb" null) (enableFeature (optLeveldb != null) "leveldb")
(mkEnable false "python" null) (enableFeature false "python")
(mkEnable (optSnappy != null) "snappy" null) (enableFeature (optSnappy != null) "snappy")
(mkEnable (optLz4 != null) "lz4" null) (enableFeature (optLz4 != null) "lz4")
(mkEnable (optGperftools != null) "tcmalloc" null) (enableFeature (optGperftools != null) "tcmalloc")
(mkEnable (optZlib != null) "zlib" null) (enableFeature (optZlib != null) "zlib")
(mkWith (optDb != null) "berkeleydb" optDb) (withFeatureAs (optDb != null) "berkeleydb" optDb)
(mkWith false "helium" null) (withFeature false "helium")
]; ];
preConfigure = '' preConfigure = ''

View file

@ -1,6 +1,6 @@
{ lib { lib
, buildPythonPackage , buildPythonPackage
, python3 , python
, fetchFromGitHub , fetchFromGitHub
, mkdocs , mkdocs
, twine , twine
@ -53,7 +53,7 @@ let
postInstall = '' postInstall = ''
# FileNotFoundError: [Errno 2] No such file or directory: '$out/lib/python3.10/site-packages/textx/textx.tx # FileNotFoundError: [Errno 2] No such file or directory: '$out/lib/python3.10/site-packages/textx/textx.tx
cp "$src/textx/textx.tx" "$out/${python3.sitePackages}/${pname}/" cp "$src/textx/textx.tx" "$out/lib/${python.libPrefix}/site-packages/${pname}/"
# Install tests as the tests output. # Install tests as the tests output.
mkdir $testout mkdir $testout

View file

@ -34,7 +34,8 @@ buildPythonPackage rec {
postPatch = '' postPatch = ''
substituteInPlace pyproject.toml \ substituteInPlace pyproject.toml \
--replace 'rich = "^11.2.0"' 'rich = "*"' \ --replace 'rich = "^11.2.0"' 'rich = "*"' \
--replace 'treeo = "^0.0.10"' 'treeo = "*"' --replace 'treeo = "^0.0.10"' 'treeo = "*"' \
--replace 'certifi = "^2021.10.8"' 'certifi = "*"'
''; '';
nativeBuildInputs = [ nativeBuildInputs = [

View file

@ -9,6 +9,8 @@ let
# Fetch clang from qt vendor, this contains submodules like this: # Fetch clang from qt vendor, this contains submodules like this:
# clang<-clang-tools-extra<-clazy. # clang<-clang-tools-extra<-clazy.
clang_qt_vendor = llvmPackages_8.clang-unwrapped.overrideAttrs (oldAttrs: { clang_qt_vendor = llvmPackages_8.clang-unwrapped.overrideAttrs (oldAttrs: {
# file RPATH_CHANGE could not write new RPATH
cmakeFlags = [ "-DCMAKE_SKIP_BUILD_RPATH=ON" ];
src = fetchgit { src = fetchgit {
url = "https://code.qt.io/clang/clang.git"; url = "https://code.qt.io/clang/clang.git";
rev = "c12b012bb7465299490cf93c2ae90499a5c417d5"; rev = "c12b012bb7465299490cf93c2ae90499a5c417d5";

View file

@ -2,13 +2,13 @@
buildPythonPackage rec { buildPythonPackage rec {
pname = "matrix-synapse-mjolnir-antispam"; pname = "matrix-synapse-mjolnir-antispam";
version = "1.4.2"; version = "1.5.0";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "matrix-org"; owner = "matrix-org";
repo = "mjolnir"; repo = "mjolnir";
rev = "refs/tags/v${version}"; rev = "refs/tags/v${version}";
sha256 = "sha256-887azmXT5PGpcOqtWtKwdoyEtsXGm5DzpNRgEMlgSfM="; sha256 = "sha256-YmP+r9W5e63Aw66lSQeTTbYwSF/vjPyHkoehJxtcRNw=";
}; };
sourceRoot = "./source/synapse_antispam"; sourceRoot = "./source/synapse_antispam";

View file

@ -9,13 +9,13 @@
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "mjolnir"; pname = "mjolnir";
version = "1.4.2"; version = "1.5.0";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "matrix-org"; owner = "matrix-org";
repo = "mjolnir"; repo = "mjolnir";
rev = "v${version}"; rev = "v${version}";
sha256 = "887azmXT5PGpcOqtWtKwdoyEtsXGm5DzpNRgEMlgSfM="; sha256 = "YmP+r9W5e63Aw66lSQeTTbYwSF/vjPyHkoehJxtcRNw=";
}; };
nativeBuildInputs = [ nativeBuildInputs = [

View file

@ -13,31 +13,31 @@ let
sha512 = "Zt1yodBx1UcyiePMSkWnU4hPqhwq7hGi2nFL1LeA3EUl+q2LQx16MISgJ0+z7dnmgvP9QtIleuETGOiOH1RcIw=="; sha512 = "Zt1yodBx1UcyiePMSkWnU4hPqhwq7hGi2nFL1LeA3EUl+q2LQx16MISgJ0+z7dnmgvP9QtIleuETGOiOH1RcIw==";
}; };
}; };
"@babel/code-frame-7.16.7" = { "@babel/code-frame-7.18.6" = {
name = "_at_babel_slash_code-frame"; name = "_at_babel_slash_code-frame";
packageName = "@babel/code-frame"; packageName = "@babel/code-frame";
version = "7.16.7"; version = "7.18.6";
src = fetchurl { src = fetchurl {
url = "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.16.7.tgz"; url = "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.18.6.tgz";
sha512 = "iAXqUn8IIeBTNd72xsFlgaXHkMBMt6y4HJp1tIaK465CWLT/fG1aqB7ykr95gHHmlBdGbFeWWfyB4NJJ0nmeIg=="; sha512 = "TDCmlK5eOvH+eH7cdAFlNXeVJqWIQ7gW9tY1GJIpUtFb6CmjVyq2VM3u71bOyR8CRihcCgMUYoDNyLXao3+70Q==";
}; };
}; };
"@babel/helper-validator-identifier-7.16.7" = { "@babel/helper-validator-identifier-7.18.6" = {
name = "_at_babel_slash_helper-validator-identifier"; name = "_at_babel_slash_helper-validator-identifier";
packageName = "@babel/helper-validator-identifier"; packageName = "@babel/helper-validator-identifier";
version = "7.16.7"; version = "7.18.6";
src = fetchurl { src = fetchurl {
url = "https://registry.npmjs.org/@babel/helper-validator-identifier/-/helper-validator-identifier-7.16.7.tgz"; url = "https://registry.npmjs.org/@babel/helper-validator-identifier/-/helper-validator-identifier-7.18.6.tgz";
sha512 = "hsEnFemeiW4D08A5gUAZxLBTXpZ39P+a+DGDsHw1yxqyQ/jzFEnxf5uTEGp+3bzAbNOxU1paTgYS4ECU/IgfDw=="; sha512 = "MmetCkz9ej86nJQV+sFCxoGGrUbU3q02kgLciwkrt9QqEB7cP39oKEY0PakknEO0Gu20SskMRi+AYZ3b1TpN9g==";
}; };
}; };
"@babel/highlight-7.17.9" = { "@babel/highlight-7.18.6" = {
name = "_at_babel_slash_highlight"; name = "_at_babel_slash_highlight";
packageName = "@babel/highlight"; packageName = "@babel/highlight";
version = "7.17.9"; version = "7.18.6";
src = fetchurl { src = fetchurl {
url = "https://registry.npmjs.org/@babel/highlight/-/highlight-7.17.9.tgz"; url = "https://registry.npmjs.org/@babel/highlight/-/highlight-7.18.6.tgz";
sha512 = "J9PfEKCbFIv2X5bjTMiZu6Vf341N05QIY+d6FvVKynkG1S7G0j3I0QoRtWIrXhZ+/Nlb5Q0MzqL7TokEJ5BNHg=="; sha512 = "u7stbOuYjaPezCuLj29hNW1v64M2Md2qupEKP1fHc7WdOA3DgLh37suiSrZYY7haUB7iBeQZ9P1uiRF359do3g==";
}; };
}; };
"@eslint/eslintrc-0.4.3" = { "@eslint/eslintrc-0.4.3" = {
@ -139,13 +139,13 @@ let
sha512 = "6bSZTPaTIACxn48l50SR+axgrqm6qXFIxrdAKaG6PaJk3+zuUr35hBlgT7vOmJcum+OEaIBLtHV/qloEAFITeA=="; sha512 = "6bSZTPaTIACxn48l50SR+axgrqm6qXFIxrdAKaG6PaJk3+zuUr35hBlgT7vOmJcum+OEaIBLtHV/qloEAFITeA==";
}; };
}; };
"@types/express-serve-static-core-4.17.28" = { "@types/express-serve-static-core-4.17.29" = {
name = "_at_types_slash_express-serve-static-core"; name = "_at_types_slash_express-serve-static-core";
packageName = "@types/express-serve-static-core"; packageName = "@types/express-serve-static-core";
version = "4.17.28"; version = "4.17.29";
src = fetchurl { src = fetchurl {
url = "https://registry.npmjs.org/@types/express-serve-static-core/-/express-serve-static-core-4.17.28.tgz"; url = "https://registry.npmjs.org/@types/express-serve-static-core/-/express-serve-static-core-4.17.29.tgz";
sha512 = "P1BJAEAW3E2DJUlkgq4tOL3RyMunoWXqbSCygWo5ZIWTjUgN1YnaXWW4VWl/oc8vs/XoYibEGBKP0uZyF4AHig=="; sha512 = "uMd++6dMKS32EOuw1Uli3e3BPgdLIXmezcfHv7N4c1s3gkhikBplORPpMq3fuWkxncZN1reb16d5n8yhQ80x7Q==";
}; };
}; };
"@types/html-to-text-8.1.0" = { "@types/html-to-text-8.1.0" = {
@ -229,13 +229,13 @@ let
sha512 = "Z61JK7DKDtdKTWwLeElSEBcWGRLY8g95ic5FoQqI9CMx0ns/Ghep3B4DfcEimiKMvtamNVULVNKEsiwV3aQmXw=="; sha512 = "Z61JK7DKDtdKTWwLeElSEBcWGRLY8g95ic5FoQqI9CMx0ns/Ghep3B4DfcEimiKMvtamNVULVNKEsiwV3aQmXw==";
}; };
}; };
"@types/node-16.11.35" = { "@types/node-16.11.45" = {
name = "_at_types_slash_node"; name = "_at_types_slash_node";
packageName = "@types/node"; packageName = "@types/node";
version = "16.11.35"; version = "16.11.45";
src = fetchurl { src = fetchurl {
url = "https://registry.npmjs.org/@types/node/-/node-16.11.35.tgz"; url = "https://registry.npmjs.org/@types/node/-/node-16.11.45.tgz";
sha512 = "QXu45LyepgnhUfnIAj/FyT4uM87ug5KpIrgXfQtUPNAlx8w5hmd8z8emqCLNvG11QkpRSCG9Qg2buMxvqfjfsQ=="; sha512 = "3rKg/L5x0rofKuuUt5zlXzOnKyIHXmIu5R8A0TuNDMF2062/AOIDBciFIjToLEJ/9F9DzkHNot+BpNsMI1OLdQ==";
}; };
}; };
"@types/parse5-6.0.3" = { "@types/parse5-6.0.3" = {
@ -427,13 +427,13 @@ let
sha512 = "JoX0apGbHaUJBNl6yF+p6JAFYZ666/hhCGKN5t9QFjbJQKUU/g8MNbFDbvfrgKXvI1QpZplPOnwIo99lX/AAmA=="; sha512 = "JoX0apGbHaUJBNl6yF+p6JAFYZ666/hhCGKN5t9QFjbJQKUU/g8MNbFDbvfrgKXvI1QpZplPOnwIo99lX/AAmA==";
}; };
}; };
"ansi-colors-4.1.2" = { "ansi-colors-4.1.3" = {
name = "ansi-colors"; name = "ansi-colors";
packageName = "ansi-colors"; packageName = "ansi-colors";
version = "4.1.2"; version = "4.1.3";
src = fetchurl { src = fetchurl {
url = "https://registry.npmjs.org/ansi-colors/-/ansi-colors-4.1.2.tgz"; url = "https://registry.npmjs.org/ansi-colors/-/ansi-colors-4.1.3.tgz";
sha512 = "cEG18jjLG0O74o/33eEfnmtXYDEY196ZjL0eQEISULF+Imi7vr25l6ntGYmqS5lIrQIEeze+CqUtPVItywE7ZQ=="; sha512 = "/6w/C21Pm1A7aZitlI5Ni/2J6FFQN8i1Cvz3kHABAAbw93v/NlvKdVOqz7CCWz/3iv/JplRSEEZ83XION15ovw==";
}; };
}; };
"ansi-regex-5.0.1" = { "ansi-regex-5.0.1" = {
@ -784,7 +784,7 @@ let
version = "1.1.3"; version = "1.1.3";
src = fetchurl { src = fetchurl {
url = "https://registry.npmjs.org/color-name/-/color-name-1.1.3.tgz"; url = "https://registry.npmjs.org/color-name/-/color-name-1.1.3.tgz";
sha1 = "a7d0558bd89c42f795dd42328f740831ca53bc25"; sha512 = "72fSenhMw2HZMTVHeCA9KCmpEIbzWiQsjN+BHcBbS9vr1mtt+vJjPdksIBNUmKAW8TFUDPJK5SUU3QhE9NEXDw==";
}; };
}; };
"color-name-1.1.4" = { "color-name-1.1.4" = {
@ -829,7 +829,7 @@ let
version = "0.0.1"; version = "0.0.1";
src = fetchurl { src = fetchurl {
url = "https://registry.npmjs.org/concat-map/-/concat-map-0.0.1.tgz"; url = "https://registry.npmjs.org/concat-map/-/concat-map-0.0.1.tgz";
sha1 = "d8a96bd77fd68df7793a73036a3ba0d5405d477b"; sha512 = "/Srv4dswyQNBfohGpz9o6Yb3Gz3SrUDqBH5rTuhGR7ahtlbYKnVxw2bCFMRljaA7EXHaXZ8wsHdodFvbkhKmqg==";
}; };
}; };
"config-3.3.7" = { "config-3.3.7" = {
@ -874,7 +874,7 @@ let
version = "1.0.6"; version = "1.0.6";
src = fetchurl { src = fetchurl {
url = "https://registry.npmjs.org/cookie-signature/-/cookie-signature-1.0.6.tgz"; url = "https://registry.npmjs.org/cookie-signature/-/cookie-signature-1.0.6.tgz";
sha1 = "e303a882b342cc3ee8ca513a79999734dab3ae2c"; sha512 = "QADzlaHc8icV8I7vbaJXJwod9HWYp8uCqf1xa4OfNu1T7JVxQIrUgOWtHdNDtPiywmFbiS12VjotIXLrKM3orQ==";
}; };
}; };
"core-util-is-1.0.2" = { "core-util-is-1.0.2" = {
@ -883,7 +883,7 @@ let
version = "1.0.2"; version = "1.0.2";
src = fetchurl { src = fetchurl {
url = "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.2.tgz"; url = "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.2.tgz";
sha1 = "b5fd54220aa2bc5ab57aab7140c940754503c1a7"; sha512 = "3lqz5YjWTYnW6dlDa5TLaTCcShfar1e40rmcJVwCBJC6mWlFuj0eCHIElmG1g5kyuJ/GD+8Wn4FFCcz4gJPfaQ==";
}; };
}; };
"cross-spawn-7.0.3" = { "cross-spawn-7.0.3" = {
@ -937,7 +937,7 @@ let
version = "1.14.1"; version = "1.14.1";
src = fetchurl { src = fetchurl {
url = "https://registry.npmjs.org/dashdash/-/dashdash-1.14.1.tgz"; url = "https://registry.npmjs.org/dashdash/-/dashdash-1.14.1.tgz";
sha1 = "853cfa0f7cbe2fed5de20326b8dd581035f6e2f0"; sha512 = "jRFi8UDGo6j+odZiEpjazZaWqEal3w/basFjQHQEwVtZJGDpxbH1MeYluwCS8Xq5wmLJooDlMgvVarmWfGM44g==";
}; };
}; };
"data-urls-2.0.0" = { "data-urls-2.0.0" = {
@ -1018,7 +1018,7 @@ let
version = "1.0.0"; version = "1.0.0";
src = fetchurl { src = fetchurl {
url = "https://registry.npmjs.org/delayed-stream/-/delayed-stream-1.0.0.tgz"; url = "https://registry.npmjs.org/delayed-stream/-/delayed-stream-1.0.0.tgz";
sha1 = "df3ae199acadfb7d440aaae0b29e2272b24ec619"; sha512 = "ZySD7Nf91aLB0RxL4KGrKHBXl7Eds1DAmEdcoVawXnLD7SDhpNgtuII2aAkg7a7QS41jxPSZ17p4VdGnMHk3MQ==";
}; };
}; };
"depd-2.0.0" = { "depd-2.0.0" = {
@ -1081,7 +1081,7 @@ let
version = "1.0.0"; version = "1.0.0";
src = fetchurl { src = fetchurl {
url = "https://registry.npmjs.org/discontinuous-range/-/discontinuous-range-1.0.0.tgz"; url = "https://registry.npmjs.org/discontinuous-range/-/discontinuous-range-1.0.0.tgz";
sha1 = "e38331f0844bba49b9a9cb71c771585aab1bc65a"; sha512 = "c68LpLbO+7kP/b1Hr1qs8/BJ09F5khZGTxqxZuhzxpmwJKOgRFHJWIb9/KmqnqHhLdO55aOxFH/EGBvUQbL/RQ==";
}; };
}; };
"doctrine-3.0.0" = { "doctrine-3.0.0" = {
@ -1153,7 +1153,7 @@ let
version = "0.1.2"; version = "0.1.2";
src = fetchurl { src = fetchurl {
url = "https://registry.npmjs.org/ecc-jsbn/-/ecc-jsbn-0.1.2.tgz"; url = "https://registry.npmjs.org/ecc-jsbn/-/ecc-jsbn-0.1.2.tgz";
sha1 = "3a83a904e54353287874c564b7549386849a98c9"; sha512 = "eh9O+hwRHNbG4BLTjEl3nw044CkGm5X6LoaCf7LPp7UU8Qrt47JYNi6nPX8xjW97TKGKm1ouctg0QSpZe9qrnw==";
}; };
}; };
"editorconfig-0.15.3" = { "editorconfig-0.15.3" = {
@ -1171,7 +1171,7 @@ let
version = "1.1.1"; version = "1.1.1";
src = fetchurl { src = fetchurl {
url = "https://registry.npmjs.org/ee-first/-/ee-first-1.1.1.tgz"; url = "https://registry.npmjs.org/ee-first/-/ee-first-1.1.1.tgz";
sha1 = "590c61156b0ae2f4f0255732a158b266bc56b21d"; sha512 = "WMwm9LhRUo+WUaRN+vRuETqG89IgZphVSNkdFgeb6sS/E4OrDIN7t48CAewSHXc6C8lefD8KKfr5vY61brQlow==";
}; };
}; };
"emoji-regex-8.0.0" = { "emoji-regex-8.0.0" = {
@ -1189,7 +1189,7 @@ let
version = "1.0.2"; version = "1.0.2";
src = fetchurl { src = fetchurl {
url = "https://registry.npmjs.org/encodeurl/-/encodeurl-1.0.2.tgz"; url = "https://registry.npmjs.org/encodeurl/-/encodeurl-1.0.2.tgz";
sha1 = "ad3ff4c86ec2d029322f5a02c3a9a606c95b3f59"; sha512 = "TPJXq8JqFaVYm2CWmPvnP2Iyo4ZSM7/QKcSmuMLDObfpH5fi7RUGmd/rTDf+rut/saiDiQEeVTNgAmJEdAOx0w==";
}; };
}; };
"enquirer-2.3.6" = { "enquirer-2.3.6" = {
@ -1225,7 +1225,7 @@ let
version = "1.0.3"; version = "1.0.3";
src = fetchurl { src = fetchurl {
url = "https://registry.npmjs.org/escape-html/-/escape-html-1.0.3.tgz"; url = "https://registry.npmjs.org/escape-html/-/escape-html-1.0.3.tgz";
sha1 = "0258eae4d3d0c0974de1c169188ef0051d1d1988"; sha512 = "NiSupZ4OeuGwr68lGIeym/ksIZMJodUGOSCZ/FSnTxcrekbvqrgdUxlJOMpijaKZVjAJrWrGs/6Jy8OMuyj9ow==";
}; };
}; };
"escape-string-regexp-1.0.5" = { "escape-string-regexp-1.0.5" = {
@ -1234,7 +1234,7 @@ let
version = "1.0.5"; version = "1.0.5";
src = fetchurl { src = fetchurl {
url = "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz"; url = "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz";
sha1 = "1b61c0562190a8dff6ae3bb2cf0200ca130b86d4"; sha512 = "vbRorB5FUQWvla16U8R/qgaFIya2qGzwDrNmCZuYKrbdSUMG6I1ZCGQRefkRVhuOkIGVne7BQ35DSfo1qvJqFg==";
}; };
}; };
"escape-string-regexp-2.0.0" = { "escape-string-regexp-2.0.0" = {
@ -1378,7 +1378,7 @@ let
version = "1.8.1"; version = "1.8.1";
src = fetchurl { src = fetchurl {
url = "https://registry.npmjs.org/etag/-/etag-1.8.1.tgz"; url = "https://registry.npmjs.org/etag/-/etag-1.8.1.tgz";
sha1 = "41ae2eeb65efa62268aebfea83ac7d79299b0887"; sha512 = "aIL5Fx7mawVa300al2BnEE4iNvo1qETxLrPI/o05L7z6go7fCw1J6EQmbK4FmJ2AS7kgVF/KEZWufBfdClMcPg==";
}; };
}; };
"expect-27.5.1" = { "expect-27.5.1" = {
@ -1414,7 +1414,7 @@ let
version = "1.3.0"; version = "1.3.0";
src = fetchurl { src = fetchurl {
url = "https://registry.npmjs.org/extsprintf/-/extsprintf-1.3.0.tgz"; url = "https://registry.npmjs.org/extsprintf/-/extsprintf-1.3.0.tgz";
sha1 = "96918440e3041a7a414f8c52e3c574eb3c3e1e05"; sha512 = "11Ndz7Nv+mvAC1j0ktTa7fAb0vLyGGX+rMHNBYQviQDGU0Hw7lhctJANqbPhu9nV9/izT/IntTgZ7Im/9LJs9g==";
}; };
}; };
"fast-deep-equal-3.1.3" = { "fast-deep-equal-3.1.3" = {
@ -1441,7 +1441,7 @@ let
version = "2.0.6"; version = "2.0.6";
src = fetchurl { src = fetchurl {
url = "https://registry.npmjs.org/fast-levenshtein/-/fast-levenshtein-2.0.6.tgz"; url = "https://registry.npmjs.org/fast-levenshtein/-/fast-levenshtein-2.0.6.tgz";
sha1 = "3d8a5c66883a16a30ca8643e851f19baa7797917"; sha512 = "DCXu6Ifhqcks7TZKY3Hxp3y6qphY5SJZmrWMDrKcERSOXWQdMhU9Ig/PYrzyw/ul9jOIyh0N4M0tbC5hodg8dw==";
}; };
}; };
"file-entry-cache-6.0.1" = { "file-entry-cache-6.0.1" = {
@ -1498,13 +1498,13 @@ let
sha512 = "dm9s5Pw7Jc0GvMYbshN6zchCA9RgQlzzEZX3vylR9IqFfS8XciblUXOKfW6SiuJ0e13eDYZoZV5wdrev7P3Nwg=="; sha512 = "dm9s5Pw7Jc0GvMYbshN6zchCA9RgQlzzEZX3vylR9IqFfS8XciblUXOKfW6SiuJ0e13eDYZoZV5wdrev7P3Nwg==";
}; };
}; };
"flatted-3.2.5" = { "flatted-3.2.6" = {
name = "flatted"; name = "flatted";
packageName = "flatted"; packageName = "flatted";
version = "3.2.5"; version = "3.2.6";
src = fetchurl { src = fetchurl {
url = "https://registry.npmjs.org/flatted/-/flatted-3.2.5.tgz"; url = "https://registry.npmjs.org/flatted/-/flatted-3.2.6.tgz";
sha512 = "WIWGi2L3DyTUvUrwRKgGi9TwxQMUEqPOPQBVi71R96jZXJdFskXEmf54BoZaS1kknGODoIGASGEzBUYdyMCBJg=="; sha512 = "0sQoMh9s0BYsm+12Huy/rkKxVu4R1+r96YX5cG44rHV0pQ6iC3Q+mkoMFaGWObMFYQxCVT+ssG1ksneA2MI9KQ==";
}; };
}; };
"forever-agent-0.6.1" = { "forever-agent-0.6.1" = {
@ -1513,7 +1513,7 @@ let
version = "0.6.1"; version = "0.6.1";
src = fetchurl { src = fetchurl {
url = "https://registry.npmjs.org/forever-agent/-/forever-agent-0.6.1.tgz"; url = "https://registry.npmjs.org/forever-agent/-/forever-agent-0.6.1.tgz";
sha1 = "fbc71f0c41adeb37f96c577ad1ed42d8fdacca91"; sha512 = "j0KLYPhm6zeac4lz3oJ3o65qvgQCcPubiyotZrXqEaG4hNagNYO8qdlUrX5vwqv9ohqeT/Z3j6+yW067yWWdUw==";
}; };
}; };
"form-data-2.3.3" = { "form-data-2.3.3" = {
@ -1549,7 +1549,7 @@ let
version = "0.5.2"; version = "0.5.2";
src = fetchurl { src = fetchurl {
url = "https://registry.npmjs.org/fresh/-/fresh-0.5.2.tgz"; url = "https://registry.npmjs.org/fresh/-/fresh-0.5.2.tgz";
sha1 = "3d8cadd90d976569fa835ab1f8e4b23a105605a7"; sha512 = "zJ2mQYM18rEFOudeV4GShTGIQ7RbzA7ozbU9I/XBpm7kqgMywgmylMwXHxZJmkVoYkna9d2pVXVXPdYTP9ej8Q==";
}; };
}; };
"fs.realpath-1.0.0" = { "fs.realpath-1.0.0" = {
@ -1558,7 +1558,7 @@ let
version = "1.0.0"; version = "1.0.0";
src = fetchurl { src = fetchurl {
url = "https://registry.npmjs.org/fs.realpath/-/fs.realpath-1.0.0.tgz"; url = "https://registry.npmjs.org/fs.realpath/-/fs.realpath-1.0.0.tgz";
sha1 = "1504ad2523158caa40db4a2787cb01411994ea4f"; sha512 = "OO0pH2lK6a0hZnAdau5ItzHPI6pUlvI7jMVnxUQRtw4owF2wk8lOSabtGDCTP4Ggrg2MbGnWO9X8K1t4+fGMDw==";
}; };
}; };
"fsevents-2.3.2" = { "fsevents-2.3.2" = {
@ -1585,7 +1585,7 @@ let
version = "1.0.1"; version = "1.0.1";
src = fetchurl { src = fetchurl {
url = "https://registry.npmjs.org/functional-red-black-tree/-/functional-red-black-tree-1.0.1.tgz"; url = "https://registry.npmjs.org/functional-red-black-tree/-/functional-red-black-tree-1.0.1.tgz";
sha1 = "1b0ab3bd553b2a0d6399d29c0e3ea0b252078327"; sha512 = "dsKNQNdj6xA3T+QlADDA7mOSlX0qiMINjn0cgr+eGHGsbSHzTabcIogz2+p/iqP1Xs6EP/sS2SbqH+brGTbq0g==";
}; };
}; };
"get-caller-file-2.0.5" = { "get-caller-file-2.0.5" = {
@ -1597,13 +1597,13 @@ let
sha512 = "DyFP3BM/3YHTQOCUL/w0OZHR0lpKeGrxotcHWcqNEdnltqFwXVfhEBQ94eIo34AfQpo0rGki4cyIiftY06h2Fg=="; sha512 = "DyFP3BM/3YHTQOCUL/w0OZHR0lpKeGrxotcHWcqNEdnltqFwXVfhEBQ94eIo34AfQpo0rGki4cyIiftY06h2Fg==";
}; };
}; };
"get-intrinsic-1.1.1" = { "get-intrinsic-1.1.2" = {
name = "get-intrinsic"; name = "get-intrinsic";
packageName = "get-intrinsic"; packageName = "get-intrinsic";
version = "1.1.1"; version = "1.1.2";
src = fetchurl { src = fetchurl {
url = "https://registry.npmjs.org/get-intrinsic/-/get-intrinsic-1.1.1.tgz"; url = "https://registry.npmjs.org/get-intrinsic/-/get-intrinsic-1.1.2.tgz";
sha512 = "kWZrnVM42QCiEA2Ig1bG8zjoIMOgxWwYCEeNdwY6Tv/cOSeGpcoX4pXHfKUxNKVoArnrEr2e9srnAxxGIraS9Q=="; sha512 = "Jfm3OyCxHh9DJyc28qGk+JmfkpO41A4XkneDSujN9MDXrm4oDKdHvndhZ2dN94+ERNfkYJWDclW6k2L/ZGHjXA==";
}; };
}; };
"getpass-0.1.7" = { "getpass-0.1.7" = {
@ -1612,7 +1612,7 @@ let
version = "0.1.7"; version = "0.1.7";
src = fetchurl { src = fetchurl {
url = "https://registry.npmjs.org/getpass/-/getpass-0.1.7.tgz"; url = "https://registry.npmjs.org/getpass/-/getpass-0.1.7.tgz";
sha1 = "5eff8e3e684d569ae4cb2b1282604e8ba62149fa"; sha512 = "0fzj9JxOLfJ+XGLhR8ze3unN0KZCgZwiSSDz168VERjK8Wl8kVSdcu2kspd4s4wtAa1y/qrVRiAA0WclVsu0ng==";
}; };
}; };
"glob-7.2.0" = { "glob-7.2.0" = {
@ -1651,13 +1651,13 @@ let
sha512 = "lkX1HJXwyMcprw/5YUZc2s7DrpAiHB21/V+E1rHUrVNokkvB6bqMzT0VfV6/86ZNabt1k14YOIaT7nDvOX3Iiw=="; sha512 = "lkX1HJXwyMcprw/5YUZc2s7DrpAiHB21/V+E1rHUrVNokkvB6bqMzT0VfV6/86ZNabt1k14YOIaT7nDvOX3Iiw==";
}; };
}; };
"globals-13.15.0" = { "globals-13.16.0" = {
name = "globals"; name = "globals";
packageName = "globals"; packageName = "globals";
version = "13.15.0"; version = "13.16.0";
src = fetchurl { src = fetchurl {
url = "https://registry.npmjs.org/globals/-/globals-13.15.0.tgz"; url = "https://registry.npmjs.org/globals/-/globals-13.16.0.tgz";
sha512 = "bpzcOlgDhMG070Av0Vy5Owklpv1I6+j96GhUI7Rh7IzDCKLzboflLrrfqMu8NquDbiR4EOQk7XzJwqVJxicxog=="; sha512 = "A1lrQfpNF+McdPOnnFqY3kSN0AFTy485bTi1bkLk4mVPODIUEcSfhHgRqA+QdXPksrSTTztYXx37NFV+GpGk3Q==";
}; };
}; };
"graceful-fs-4.2.10" = { "graceful-fs-4.2.10" = {
@ -1684,7 +1684,7 @@ let
version = "2.0.0"; version = "2.0.0";
src = fetchurl { src = fetchurl {
url = "https://registry.npmjs.org/har-schema/-/har-schema-2.0.0.tgz"; url = "https://registry.npmjs.org/har-schema/-/har-schema-2.0.0.tgz";
sha1 = "a94c2224ebcac04782a0d9035521f24735b7ec92"; sha512 = "Oqluz6zhGX8cyRaTQlFMPw80bSJVG2x/cFb8ZPhUILGgHka9SsokCCOQgpveePerqidZOrT14ipqfJb7ILcW5Q==";
}; };
}; };
"har-validator-5.1.5" = { "har-validator-5.1.5" = {
@ -1711,7 +1711,7 @@ let
version = "3.0.0"; version = "3.0.0";
src = fetchurl { src = fetchurl {
url = "https://registry.npmjs.org/has-flag/-/has-flag-3.0.0.tgz"; url = "https://registry.npmjs.org/has-flag/-/has-flag-3.0.0.tgz";
sha1 = "b5d454dc2199ae225699f3467e5a07f3b955bafd"; sha512 = "sKJf1+ceQBr4SMkvQnBDNDtf4TXpVhVGateu0t918bl30FnbE2m4vNLX+VWe/dpjlb+HugGYzW7uQXH98HPEYw==";
}; };
}; };
"has-flag-4.0.0" = { "has-flag-4.0.0" = {
@ -1783,7 +1783,7 @@ let
version = "0.0.4"; version = "0.0.4";
src = fetchurl { src = fetchurl {
url = "https://registry.npmjs.org/htmlencode/-/htmlencode-0.0.4.tgz"; url = "https://registry.npmjs.org/htmlencode/-/htmlencode-0.0.4.tgz";
sha1 = "f7e2d6afbe18a87a78e63ba3308e753766740e3f"; sha512 = "0uDvNVpzj/E2TfvLLyyXhKBRvF1y84aZsyRxRXFsQobnHaL4pcaXk+Y9cnFlvnxrBLeXDNq/VJBD+ngdBgQG1w==";
}; };
}; };
"htmlparser2-4.1.0" = { "htmlparser2-4.1.0" = {
@ -1828,7 +1828,7 @@ let
version = "1.2.0"; version = "1.2.0";
src = fetchurl { src = fetchurl {
url = "https://registry.npmjs.org/http-signature/-/http-signature-1.2.0.tgz"; url = "https://registry.npmjs.org/http-signature/-/http-signature-1.2.0.tgz";
sha1 = "9aecd925114772f3d95b65a60abb8f7c18fbace1"; sha512 = "CAbnr6Rz4CYQkLYUtSNXxQPUH2gK8f3iWexVlsnMeD+GjlsQ0Xsy1cOX+mN3dtxYomRy21CiOzU8Uhw6OwncEQ==";
}; };
}; };
"https-proxy-agent-5.0.1" = { "https-proxy-agent-5.0.1" = {
@ -1840,13 +1840,13 @@ let
sha512 = "dFcAjpTQFgoLMzC2VwU+C/CbS7uRL0lWmxDITmqm7C+7F0Odmj6s9l6alZc6AELXhrnggM2CeWSXHGOdX2YtwA=="; sha512 = "dFcAjpTQFgoLMzC2VwU+C/CbS7uRL0lWmxDITmqm7C+7F0Odmj6s9l6alZc6AELXhrnggM2CeWSXHGOdX2YtwA==";
}; };
}; };
"humanize-duration-3.27.1" = { "humanize-duration-3.27.2" = {
name = "humanize-duration"; name = "humanize-duration";
packageName = "humanize-duration"; packageName = "humanize-duration";
version = "3.27.1"; version = "3.27.2";
src = fetchurl { src = fetchurl {
url = "https://registry.npmjs.org/humanize-duration/-/humanize-duration-3.27.1.tgz"; url = "https://registry.npmjs.org/humanize-duration/-/humanize-duration-3.27.2.tgz";
sha512 = "jCVkMl+EaM80rrMrAPl96SGG4NRac53UyI1o/yAzebDntEY6K6/Fj2HOjdPg8omTqIe5Y0wPBai2q5xXrIbarA=="; sha512 = "A15OmA3FLFRnehvF4ZMocsxTZYvHq4ze7L+AgR1DeHw0xC9vMd4euInY83uqGU9/XXKNnVIEeKc1R8G8nKqtzg==";
}; };
}; };
"humanize-duration-ts-2.1.1" = { "humanize-duration-ts-2.1.1" = {
@ -1891,7 +1891,7 @@ let
version = "0.1.4"; version = "0.1.4";
src = fetchurl { src = fetchurl {
url = "https://registry.npmjs.org/imurmurhash/-/imurmurhash-0.1.4.tgz"; url = "https://registry.npmjs.org/imurmurhash/-/imurmurhash-0.1.4.tgz";
sha1 = "9218b9b2b928a238b13dc4fb6b6d576f231453ea"; sha512 = "JmXMZ6wuvDmLiHEml9ykzqO6lwFbof0GG4IkcGaENdCRDDmMVnny7s5HsIgHCbaq0w2MyPhDqkhTUgS2LU2PHA==";
}; };
}; };
"inflight-1.0.6" = { "inflight-1.0.6" = {
@ -1900,7 +1900,7 @@ let
version = "1.0.6"; version = "1.0.6";
src = fetchurl { src = fetchurl {
url = "https://registry.npmjs.org/inflight/-/inflight-1.0.6.tgz"; url = "https://registry.npmjs.org/inflight/-/inflight-1.0.6.tgz";
sha1 = "49bd6331d7d02d0c09bc910a1075ba8165b56df9"; sha512 = "k92I/b08q4wvFscXCLvqfsHCrjrF7yiXsQuIVvVE7N82W3+aqpzuUdBbfhWcy/FZR3/4IgflMgKLOsvPDrGCJA==";
}; };
}; };
"inherits-2.0.4" = { "inherits-2.0.4" = {
@ -1945,7 +1945,7 @@ let
version = "2.1.1"; version = "2.1.1";
src = fetchurl { src = fetchurl {
url = "https://registry.npmjs.org/is-extglob/-/is-extglob-2.1.1.tgz"; url = "https://registry.npmjs.org/is-extglob/-/is-extglob-2.1.1.tgz";
sha1 = "a88c02535791f02ed37c76a1b9ea9773c833f8c2"; sha512 = "SbKbANkN603Vi4jEZv49LeVJMn4yGwsbzZworEoyEiutsN3nJYdbO36zfhGJ6QEDpOZIFkDtnq5JRxmvl3jsoQ==";
}; };
}; };
"is-fullwidth-code-point-3.0.0" = { "is-fullwidth-code-point-3.0.0" = {
@ -2017,7 +2017,7 @@ let
version = "1.0.0"; version = "1.0.0";
src = fetchurl { src = fetchurl {
url = "https://registry.npmjs.org/is-typedarray/-/is-typedarray-1.0.0.tgz"; url = "https://registry.npmjs.org/is-typedarray/-/is-typedarray-1.0.0.tgz";
sha1 = "e479c80858df0c1b11ddda6940f96011fcda4a9a"; sha512 = "cyA56iCMHAh5CdzjJIa4aohJyeO1YbwLi3Jc35MmRU6poroFjIGZzUzupGiRPOjgHg9TLu43xbpwXk523fMxKA==";
}; };
}; };
"is-unicode-supported-0.1.0" = { "is-unicode-supported-0.1.0" = {
@ -2035,7 +2035,7 @@ let
version = "2.0.0"; version = "2.0.0";
src = fetchurl { src = fetchurl {
url = "https://registry.npmjs.org/isexe/-/isexe-2.0.0.tgz"; url = "https://registry.npmjs.org/isexe/-/isexe-2.0.0.tgz";
sha1 = "e8fbf374dc556ff8947a10dcb0572d633f2cfa10"; sha512 = "RHxMLp9lnKHGHRng9QFhRCMbYAcVpn69smSGcq3f36xjgVVWThj4qqLbTLlq7Ssj8B+fIQ1EuCEGI2lKsyQeIw==";
}; };
}; };
"isstream-0.1.2" = { "isstream-0.1.2" = {
@ -2044,7 +2044,7 @@ let
version = "0.1.2"; version = "0.1.2";
src = fetchurl { src = fetchurl {
url = "https://registry.npmjs.org/isstream/-/isstream-0.1.2.tgz"; url = "https://registry.npmjs.org/isstream/-/isstream-0.1.2.tgz";
sha1 = "47e63f7af55afa6f92e1500e690eb8b8529c099a"; sha512 = "Yljz7ffyPbrLpLngrMtZ7NduUgVvi6wG9RJ9IUcyCd59YQ911PBJphODUcbOVbqYfxe1wuYf/LJ8PauMRwsM/g==";
}; };
}; };
"jest-diff-27.5.1" = { "jest-diff-27.5.1" = {
@ -2116,7 +2116,7 @@ let
version = "0.1.1"; version = "0.1.1";
src = fetchurl { src = fetchurl {
url = "https://registry.npmjs.org/jsbn/-/jsbn-0.1.1.tgz"; url = "https://registry.npmjs.org/jsbn/-/jsbn-0.1.1.tgz";
sha1 = "a5e654c2e5a2deb5f201d96cefbca80c0ef2f513"; sha512 = "UVU9dibq2JcFWxQPA6KCqj5O42VOmAY3zQUfEKxU0KpTGXwNoCjkX1e13eHNvw/xPynt6pU0rZ1htjWTNTSXsg==";
}; };
}; };
"jsdom-16.7.0" = { "jsdom-16.7.0" = {
@ -2161,7 +2161,7 @@ let
version = "1.0.1"; version = "1.0.1";
src = fetchurl { src = fetchurl {
url = "https://registry.npmjs.org/json-stable-stringify-without-jsonify/-/json-stable-stringify-without-jsonify-1.0.1.tgz"; url = "https://registry.npmjs.org/json-stable-stringify-without-jsonify/-/json-stable-stringify-without-jsonify-1.0.1.tgz";
sha1 = "9db7b59496ad3f3cfef30a75142d2d930ad72651"; sha512 = "Bdboy+l7tA3OGW6FjyFHWkP5LuByj1Tk33Ljyq0axyzdk9//JSi2u3fP1QSmd1KNwq6VOKYGlAu87CisVir6Pw==";
}; };
}; };
"json-stringify-safe-5.0.1" = { "json-stringify-safe-5.0.1" = {
@ -2170,7 +2170,7 @@ let
version = "5.0.1"; version = "5.0.1";
src = fetchurl { src = fetchurl {
url = "https://registry.npmjs.org/json-stringify-safe/-/json-stringify-safe-5.0.1.tgz"; url = "https://registry.npmjs.org/json-stringify-safe/-/json-stringify-safe-5.0.1.tgz";
sha1 = "1296a2d58fd45f19a0f6ce01d65701e2c735b6eb"; sha512 = "ZClg6AaYvamvYEE82d3Iyd3vSSIjQ+odgjaTzRuO3s7toCdFKczob2i0zCh7JE8kWn17yvAWhUVxvqGwUalsRA==";
}; };
}; };
"json5-1.0.1" = { "json5-1.0.1" = {
@ -2206,7 +2206,7 @@ let
version = "0.3.0"; version = "0.3.0";
src = fetchurl { src = fetchurl {
url = "https://registry.npmjs.org/levn/-/levn-0.3.0.tgz"; url = "https://registry.npmjs.org/levn/-/levn-0.3.0.tgz";
sha1 = "3b09924edf9f083c0490fdd4c0bc4421e04764ee"; sha512 = "0OO4y2iOHix2W6ujICbKIaEQXvFQHue65vUG3pb5EUomzPI90z9hsA1VsO/dbIIpC53J8gxM9Q4Oho0jrCM/yA==";
}; };
}; };
"levn-0.4.1" = { "levn-0.4.1" = {
@ -2251,7 +2251,7 @@ let
version = "4.4.2"; version = "4.4.2";
src = fetchurl { src = fetchurl {
url = "https://registry.npmjs.org/lodash.truncate/-/lodash.truncate-4.4.2.tgz"; url = "https://registry.npmjs.org/lodash.truncate/-/lodash.truncate-4.4.2.tgz";
sha1 = "5a350da0b1113b837ecfffd5812cbe58d6eae193"; sha512 = "jttmRe7bRse52OsWIMDLaXxWqRAmtIUccAQ3garviCqJjafXOfNMO0yMfNpdD6zbGaTU0P5Nz7e7gAT6cKmJRw==";
}; };
}; };
"log-symbols-4.1.0" = { "log-symbols-4.1.0" = {
@ -2314,7 +2314,7 @@ let
version = "0.3.0"; version = "0.3.0";
src = fetchurl { src = fetchurl {
url = "https://registry.npmjs.org/media-typer/-/media-typer-0.3.0.tgz"; url = "https://registry.npmjs.org/media-typer/-/media-typer-0.3.0.tgz";
sha1 = "8710d7af0aa626f8fffa1ce00168545263255748"; sha512 = "dq+qelQ9akHpcOl/gUVRTxVIOkAJ1wR3QAvb4RsVjS8oVoFjDGTc679wJYmUmknUF5HwMLOgb5O+a3KxfWapPQ==";
}; };
}; };
"merge-descriptors-1.0.1" = { "merge-descriptors-1.0.1" = {
@ -2323,7 +2323,7 @@ let
version = "1.0.1"; version = "1.0.1";
src = fetchurl { src = fetchurl {
url = "https://registry.npmjs.org/merge-descriptors/-/merge-descriptors-1.0.1.tgz"; url = "https://registry.npmjs.org/merge-descriptors/-/merge-descriptors-1.0.1.tgz";
sha1 = "b00aaa556dd8b44568150ec9d1b953f3f90cbb61"; sha512 = "cCi6g3/Zr1iqQi6ySbseM1Xvooa98N0w31jzUYrXPX2xqObmFGHJ0tQ5u74H3mVh7wLouTseZyYIq39g8cNp1w==";
}; };
}; };
"methods-1.1.2" = { "methods-1.1.2" = {
@ -2332,7 +2332,7 @@ let
version = "1.1.2"; version = "1.1.2";
src = fetchurl { src = fetchurl {
url = "https://registry.npmjs.org/methods/-/methods-1.1.2.tgz"; url = "https://registry.npmjs.org/methods/-/methods-1.1.2.tgz";
sha1 = "5529a4d67654134edcc5266656835b0f851afcee"; sha512 = "iclAHeNqNm68zFtnZ0e+1L2yUIdvzNoauKU4WBA3VvH/vPFieF7qfRlwUZU+DA9P9bPXIS90ulxoUoCH23sV2w==";
}; };
}; };
"micromatch-4.0.5" = { "micromatch-4.0.5" = {
@ -2458,7 +2458,7 @@ let
version = "2.0.0"; version = "2.0.0";
src = fetchurl { src = fetchurl {
url = "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz"; url = "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz";
sha1 = "5608aeadfc00be6c2901df5f9861788de0d597c8"; sha512 = "Tpp60P6IUJDTuOq/5Z8cdskzJujfwqfOTkrwIwj7IRISpnkJnT6SyJ4PCPnGMoFjC9ddhal5KVIYtAt97ix05A==";
}; };
}; };
"ms-2.1.2" = { "ms-2.1.2" = {
@ -2503,7 +2503,7 @@ let
version = "1.4.0"; version = "1.4.0";
src = fetchurl { src = fetchurl {
url = "https://registry.npmjs.org/natural-compare/-/natural-compare-1.4.0.tgz"; url = "https://registry.npmjs.org/natural-compare/-/natural-compare-1.4.0.tgz";
sha1 = "4abebfeed7541f2c27acfb29bdbbd15c8d5ba4f7"; sha512 = "OWND8ei3VtNC9h7V60qff3SVobHr996CTwgxubgyQYEpg290h9J0buyECNNJexkFm5sOajh5G116RYA1c8ZMSw==";
}; };
}; };
"nearley-2.20.1" = { "nearley-2.20.1" = {
@ -2533,13 +2533,13 @@ let
sha512 = "6eZs5Ls3WtCisHWp9S2GUy8dqkpGi4BVSz3GaqiE6ezub0512ESztXUwUB6C6IKbQkY2Pnb/mD4WYojCRwcwLA=="; sha512 = "6eZs5Ls3WtCisHWp9S2GUy8dqkpGi4BVSz3GaqiE6ezub0512ESztXUwUB6C6IKbQkY2Pnb/mD4WYojCRwcwLA==";
}; };
}; };
"nwsapi-2.2.0" = { "nwsapi-2.2.1" = {
name = "nwsapi"; name = "nwsapi";
packageName = "nwsapi"; packageName = "nwsapi";
version = "2.2.0"; version = "2.2.1";
src = fetchurl { src = fetchurl {
url = "https://registry.npmjs.org/nwsapi/-/nwsapi-2.2.0.tgz"; url = "https://registry.npmjs.org/nwsapi/-/nwsapi-2.2.1.tgz";
sha512 = "h2AatdwYH+JHiZpv7pt/gSX1XoRGb7L/qSIeuqA6GwYoF9w1vP1cw42TO0aI2pNyshRK5893hNSl+1//vHK7hQ=="; sha512 = "JYOWTeFoS0Z93587vRJgASD5Ut11fYl5NyihP3KrYBvMe1FRRs6RN7m20SA/16GM4P6hTnZjT+UmDOt38UeXNg==";
}; };
}; };
"oauth-sign-0.9.0" = { "oauth-sign-0.9.0" = {
@ -2551,13 +2551,13 @@ let
sha512 = "fexhUFFPTGV8ybAtSIGbV6gOkSv8UtRbDBnAyLQw4QPKkgNlsH2ByPGtMUqdWkos6YCRmAqViwgZrJc/mRDzZQ=="; sha512 = "fexhUFFPTGV8ybAtSIGbV6gOkSv8UtRbDBnAyLQw4QPKkgNlsH2ByPGtMUqdWkos6YCRmAqViwgZrJc/mRDzZQ==";
}; };
}; };
"object-inspect-1.12.0" = { "object-inspect-1.12.2" = {
name = "object-inspect"; name = "object-inspect";
packageName = "object-inspect"; packageName = "object-inspect";
version = "1.12.0"; version = "1.12.2";
src = fetchurl { src = fetchurl {
url = "https://registry.npmjs.org/object-inspect/-/object-inspect-1.12.0.tgz"; url = "https://registry.npmjs.org/object-inspect/-/object-inspect-1.12.2.tgz";
sha512 = "Ho2z80bVIvJloH+YzRmpZVQe87+qASmBUKZDWgx9cu+KDrX2ZDH/3tMy+gXbZETVGs2M8YdxObOh7XAtim9Y0g=="; sha512 = "z+cPxW0QGUp0mcqcsgQyLVRDoXFQbXOwBaqyF7VIgI4TWNQsDHrBpUQslRmIfAoYWdYzs6UlKJtB2XJpTaNSpQ==";
}; };
}; };
"on-finished-2.3.0" = { "on-finished-2.3.0" = {
@ -2566,7 +2566,7 @@ let
version = "2.3.0"; version = "2.3.0";
src = fetchurl { src = fetchurl {
url = "https://registry.npmjs.org/on-finished/-/on-finished-2.3.0.tgz"; url = "https://registry.npmjs.org/on-finished/-/on-finished-2.3.0.tgz";
sha1 = "20f1336481b083cd75337992a16971aa2d906947"; sha512 = "ikqdkGAAyf/X/gPhXGvfgAytDZtDbr+bkNUJ0N9h5MI/dmdgCs3l6hoHrcUv41sRKew3jIwrp4qQDXiK99Utww==";
}; };
}; };
"on-finished-2.4.1" = { "on-finished-2.4.1" = {
@ -2593,7 +2593,7 @@ let
version = "1.4.0"; version = "1.4.0";
src = fetchurl { src = fetchurl {
url = "https://registry.npmjs.org/once/-/once-1.4.0.tgz"; url = "https://registry.npmjs.org/once/-/once-1.4.0.tgz";
sha1 = "583b1aa775961d4b113ac17d9c50baef9dd76bd1"; sha512 = "lNaJgI+2Q5URQBkccEKHTQOPaXdUxnZZElQTZY0MFUAuaEqe1E+Nyvgdz/aIyNi6Z9MzO5dv1H8n58/GELp3+w==";
}; };
}; };
"optionator-0.8.3" = { "optionator-0.8.3" = {
@ -2656,7 +2656,7 @@ let
version = "1.0.2"; version = "1.0.2";
src = fetchurl { src = fetchurl {
url = "https://registry.npmjs.org/parse-srcset/-/parse-srcset-1.0.2.tgz"; url = "https://registry.npmjs.org/parse-srcset/-/parse-srcset-1.0.2.tgz";
sha1 = "f2bd221f6cc970a938d88556abc589caaaa2bde1"; sha512 = "/2qh0lav6CmI15FzA3i/2Bzk2zCgQhGMkvhOhKNcBVQ1ldgpbfiNTVslmooUmWJcADi1f1kIeynbDRVzNlfR6Q==";
}; };
}; };
"parse5-6.0.1" = { "parse5-6.0.1" = {
@ -2701,7 +2701,7 @@ let
version = "1.0.1"; version = "1.0.1";
src = fetchurl { src = fetchurl {
url = "https://registry.npmjs.org/path-is-absolute/-/path-is-absolute-1.0.1.tgz"; url = "https://registry.npmjs.org/path-is-absolute/-/path-is-absolute-1.0.1.tgz";
sha1 = "174b9268735534ffbc7ace6bf53a5a9e1b5c5f5f"; sha512 = "AVbw3UJ2e9bq64vSaS9Am0fje1Pa8pbGqTTsmXfaIiMpnr5DlDhfJOuLj9Sf95ZPVDAUerDfEk88MPmPe7UCQg==";
}; };
}; };
"path-key-3.1.1" = { "path-key-3.1.1" = {
@ -2728,7 +2728,7 @@ let
version = "0.1.7"; version = "0.1.7";
src = fetchurl { src = fetchurl {
url = "https://registry.npmjs.org/path-to-regexp/-/path-to-regexp-0.1.7.tgz"; url = "https://registry.npmjs.org/path-to-regexp/-/path-to-regexp-0.1.7.tgz";
sha1 = "df604178005f522f15eb4490e7247a1bfaa67f8c"; sha512 = "5DFkuoqlv1uYQKxy8omFBeJPQcdoE07Kv2sferDCrAq1ohOU+MSDswDIbnx3YAM60qIOnYa53wBhXW0EbMonrQ==";
}; };
}; };
"performance-now-2.1.0" = { "performance-now-2.1.0" = {
@ -2737,7 +2737,7 @@ let
version = "2.1.0"; version = "2.1.0";
src = fetchurl { src = fetchurl {
url = "https://registry.npmjs.org/performance-now/-/performance-now-2.1.0.tgz"; url = "https://registry.npmjs.org/performance-now/-/performance-now-2.1.0.tgz";
sha1 = "6309f4e0e5fa913ec1c69307ae364b4b377c9e7b"; sha512 = "7EAHlyLHI56VEIdK57uwHdHKIaAGbnXPiw0yWbarQZOKaKpvUIgW0jWRVLiatnM+XXlSwsanIBH/hzGMJulMow==";
}; };
}; };
"picocolors-1.0.0" = { "picocolors-1.0.0" = {
@ -2764,16 +2764,16 @@ let
version = "3.0.0"; version = "3.0.0";
src = fetchurl { src = fetchurl {
url = "https://registry.npmjs.org/pify/-/pify-3.0.0.tgz"; url = "https://registry.npmjs.org/pify/-/pify-3.0.0.tgz";
sha1 = "e5a4acd2c101fdf3d9a4d07f0dbc4db49dd28176"; sha512 = "C3FsVNH1udSEX48gGX1xfvwTWfsYWj5U+8/uK15BGzIGrKoUpghX8hWZwa/OFnakBiiVNmBvemTJR5mcy7iPcg==";
}; };
}; };
"postcss-8.4.13" = { "postcss-8.4.14" = {
name = "postcss"; name = "postcss";
packageName = "postcss"; packageName = "postcss";
version = "8.4.13"; version = "8.4.14";
src = fetchurl { src = fetchurl {
url = "https://registry.npmjs.org/postcss/-/postcss-8.4.13.tgz"; url = "https://registry.npmjs.org/postcss/-/postcss-8.4.14.tgz";
sha512 = "jtL6eTBrza5MPzy8oJLFuUscHDXTV5KcLlqAWHl5q5WYRfnNRGSmOZmOZ1T6Gy7A99mOZfqungmZMpMmCVJ8ZA=="; sha512 = "E398TUmfAYFPBSdzgeieK2Y1+1cpdxJx8yXbK/m57nRhKSmk1GB2tO4lbLBtlkfPQTDKfe4Xqv1ASWPpayPEig==";
}; };
}; };
"prelude-ls-1.1.2" = { "prelude-ls-1.1.2" = {
@ -2782,7 +2782,7 @@ let
version = "1.1.2"; version = "1.1.2";
src = fetchurl { src = fetchurl {
url = "https://registry.npmjs.org/prelude-ls/-/prelude-ls-1.1.2.tgz"; url = "https://registry.npmjs.org/prelude-ls/-/prelude-ls-1.1.2.tgz";
sha1 = "21932a549f5e52ffd9a827f570e04be62a97da54"; sha512 = "ESF23V4SKG6lVSGZgYNpbsiaAkdab6ZgOxe52p7+Kid3W3u3bxR4Vfd/o21dmN7jSt0IwgZ4v5MUd26FEtXE9w==";
}; };
}; };
"prelude-ls-1.2.1" = { "prelude-ls-1.2.1" = {
@ -2827,16 +2827,16 @@ let
version = "1.0.2"; version = "1.0.2";
src = fetchurl { src = fetchurl {
url = "https://registry.npmjs.org/pseudomap/-/pseudomap-1.0.2.tgz"; url = "https://registry.npmjs.org/pseudomap/-/pseudomap-1.0.2.tgz";
sha1 = "f052a28da70e618917ef0a8ac34c1ae5a68286b3"; sha512 = "b/YwNhb8lk1Zz2+bXXpS/LK9OisiZZ1SNsSLxN1x2OXVEhW2Ckr/7mWE5vrC1ZTiJlD9g19jWszTmJsB+oEpFQ==";
}; };
}; };
"psl-1.8.0" = { "psl-1.9.0" = {
name = "psl"; name = "psl";
packageName = "psl"; packageName = "psl";
version = "1.8.0"; version = "1.9.0";
src = fetchurl { src = fetchurl {
url = "https://registry.npmjs.org/psl/-/psl-1.8.0.tgz"; url = "https://registry.npmjs.org/psl/-/psl-1.9.0.tgz";
sha512 = "RIdOzyoavK+hA18OGGWDqUTsCLhtA7IcZ/6NCs4fFJaHBDab+pDDmDIByWFRQJq2Cd7r1OoQxBGKOaztq+hjIQ=="; sha512 = "E/ZsdU4HLs/68gYzgGTkMicWTLPdAftJLfJFlLUAAKZGkStNU72sZjT66SnMDVOfOWY/YAoiD7Jxa9iHvngcag==";
}; };
}; };
"punycode-2.1.1" = { "punycode-2.1.1" = {
@ -2872,7 +2872,7 @@ let
version = "1.0.0"; version = "1.0.0";
src = fetchurl { src = fetchurl {
url = "https://registry.npmjs.org/railroad-diagrams/-/railroad-diagrams-1.0.0.tgz"; url = "https://registry.npmjs.org/railroad-diagrams/-/railroad-diagrams-1.0.0.tgz";
sha1 = "eb7e6267548ddedfb899c1b90e57374559cddb7e"; sha512 = "cz93DjNeLY0idrCNOH6PviZGRN9GJhsdm9hpn1YCS879fj4W+x5IFJhhkRZcwVgMmFF7R82UA/7Oh+R8lLZg6A==";
}; };
}; };
"randexp-0.4.6" = { "randexp-0.4.6" = {
@ -2971,7 +2971,7 @@ let
version = "2.1.1"; version = "2.1.1";
src = fetchurl { src = fetchurl {
url = "https://registry.npmjs.org/require-directory/-/require-directory-2.1.1.tgz"; url = "https://registry.npmjs.org/require-directory/-/require-directory-2.1.1.tgz";
sha1 = "8c64ad5fd30dab1c976e2344ffe7f792a6a6df42"; sha512 = "fGxEI7+wsG9xrvdjsrlmL22OMTTiHRwAMroiEeMgq8gzoLC/PQr7RsRDSTLUg/bZAZtF+TVIkHc6/4RIKrui+Q==";
}; };
}; };
"require-from-string-2.0.2" = { "require-from-string-2.0.2" = {
@ -2983,13 +2983,13 @@ let
sha512 = "Xf0nWe6RseziFMu+Ap9biiUbmplq6S9/p+7w7YXP/JBHhrUDDUhwa+vANyubuqfZWTveU//DYVGsDG7RKL/vEw=="; sha512 = "Xf0nWe6RseziFMu+Ap9biiUbmplq6S9/p+7w7YXP/JBHhrUDDUhwa+vANyubuqfZWTveU//DYVGsDG7RKL/vEw==";
}; };
}; };
"resolve-1.22.0" = { "resolve-1.22.1" = {
name = "resolve"; name = "resolve";
packageName = "resolve"; packageName = "resolve";
version = "1.22.0"; version = "1.22.1";
src = fetchurl { src = fetchurl {
url = "https://registry.npmjs.org/resolve/-/resolve-1.22.0.tgz"; url = "https://registry.npmjs.org/resolve/-/resolve-1.22.1.tgz";
sha512 = "Hhtrw0nLeSrFQ7phPp4OOcVjLPIeMnRlr5mcnVuMe7M/7eBn98A3hmFRLoFo3DLZkivSYwhRUJTyPyWAk56WLw=="; sha512 = "nBpuuYuY5jFsli/JIs1oldw6fOQCBioohqWZg/2hiaOybXOft4lonv85uDOKXdf8rhyK159cxU5cDcK/NKk8zw==";
}; };
}; };
"resolve-from-4.0.0" = { "resolve-from-4.0.0" = {
@ -3169,7 +3169,7 @@ let
version = "1.0.1"; version = "1.0.1";
src = fetchurl { src = fetchurl {
url = "https://registry.npmjs.org/sigmund/-/sigmund-1.0.1.tgz"; url = "https://registry.npmjs.org/sigmund/-/sigmund-1.0.1.tgz";
sha1 = "3ff21f198cad2175f9f3b781853fd94d0d19b590"; sha512 = "fCvEXfh6NWpm+YSuY2bpXb/VIihqWA6hLsgboC+0nl71Q7N7o2eaCW8mJa/NLvQhs6jpd3VZV4UiUQlV6+lc8g==";
}; };
}; };
"slash-3.0.0" = { "slash-3.0.0" = {
@ -3223,7 +3223,7 @@ let
version = "1.0.3"; version = "1.0.3";
src = fetchurl { src = fetchurl {
url = "https://registry.npmjs.org/sprintf-js/-/sprintf-js-1.0.3.tgz"; url = "https://registry.npmjs.org/sprintf-js/-/sprintf-js-1.0.3.tgz";
sha1 = "04e6926f662895354f3dd015203633b857297e2c"; sha512 = "D9cPgkvLlV3t3IzL0D0YLvGA9Ahk4PcvVwUbN0dSGr1aP0Nrt4AEnTUbuGvquEC0mA64Gqt1fzirlRs5ibXx8g==";
}; };
}; };
"sshpk-1.17.0" = { "sshpk-1.17.0" = {
@ -3259,7 +3259,7 @@ let
version = "1.1.1"; version = "1.1.1";
src = fetchurl { src = fetchurl {
url = "https://registry.npmjs.org/stealthy-require/-/stealthy-require-1.1.1.tgz"; url = "https://registry.npmjs.org/stealthy-require/-/stealthy-require-1.1.1.tgz";
sha1 = "35b09875b4ff49f26a777e509b3090a3226bf24b"; sha512 = "ZnWpYnYugiOVEY5GkcuJK1io5V8QmNYChG62gSit9pQVGErXtrKuPC55ITaVSukmMta5qpMU7vqLt2Lnni4f/g==";
}; };
}; };
"steno-0.4.4" = { "steno-0.4.4" = {
@ -3268,7 +3268,7 @@ let
version = "0.4.4"; version = "0.4.4";
src = fetchurl { src = fetchurl {
url = "https://registry.npmjs.org/steno/-/steno-0.4.4.tgz"; url = "https://registry.npmjs.org/steno/-/steno-0.4.4.tgz";
sha1 = "071105bdfc286e6615c0403c27e9d7b5dcb855cb"; sha512 = "EEHMVYHNXFHfGtgjNITnka0aHhiAlo93F7z2/Pwd+g0teG9CnM3JIINM7hVVB5/rhw9voufD7Wukwgtw2uqh6w==";
}; };
}; };
"string-width-4.2.3" = { "string-width-4.2.3" = {
@ -3295,7 +3295,7 @@ let
version = "3.0.0"; version = "3.0.0";
src = fetchurl { src = fetchurl {
url = "https://registry.npmjs.org/strip-bom/-/strip-bom-3.0.0.tgz"; url = "https://registry.npmjs.org/strip-bom/-/strip-bom-3.0.0.tgz";
sha1 = "2334c18e9c759f7bdd56fdef7e9ae3d588e68ed3"; sha512 = "vavAMRXOgBVNF6nyEEmL3DBK19iRpDcoIwW+swQ+CbGiu7lju6t+JklA1MHweoWtadgt4ISVUsXLyDq34ddcwA==";
}; };
}; };
"strip-json-comments-3.1.1" = { "strip-json-comments-3.1.1" = {
@ -3367,7 +3367,7 @@ let
version = "0.2.0"; version = "0.2.0";
src = fetchurl { src = fetchurl {
url = "https://registry.npmjs.org/text-table/-/text-table-0.2.0.tgz"; url = "https://registry.npmjs.org/text-table/-/text-table-0.2.0.tgz";
sha1 = "7f5ee823ae805207c00af2df4a84ec3fcfa570b4"; sha512 = "N+8UisAXDGk8PFXP4HAzVR9nbfmVJ3zYLAWiTIoqC5v5isinhr+r5uaO8+7r3BMfuNIufIsA7RdpVgacC2cSpw==";
}; };
}; };
"to-regex-range-5.0.1" = { "to-regex-range-5.0.1" = {
@ -3475,7 +3475,7 @@ let
version = "0.6.0"; version = "0.6.0";
src = fetchurl { src = fetchurl {
url = "https://registry.npmjs.org/tunnel-agent/-/tunnel-agent-0.6.0.tgz"; url = "https://registry.npmjs.org/tunnel-agent/-/tunnel-agent-0.6.0.tgz";
sha1 = "27a5dea06b36b04a0a9966774b290868f0fc40fd"; sha512 = "McnNiV1l8RYeY8tBgEpuodCC1mLUdbSN+CYBL7kJsJNInOP8UjDDEwdk6Mw60vdLLrr5NHKZhMAOSrR2NZuQ+w==";
}; };
}; };
"tweetnacl-0.14.5" = { "tweetnacl-0.14.5" = {
@ -3484,7 +3484,7 @@ let
version = "0.14.5"; version = "0.14.5";
src = fetchurl { src = fetchurl {
url = "https://registry.npmjs.org/tweetnacl/-/tweetnacl-0.14.5.tgz"; url = "https://registry.npmjs.org/tweetnacl/-/tweetnacl-0.14.5.tgz";
sha1 = "5ae68177f192d4456269d108afa93ff8743f4f64"; sha512 = "KXXFFdAbFXY4geFIwoyNK+f5Z1b7swfXABfL7HXCmoIWMKU3dmS26672A4EeQtDzLKy7SXmfBu51JolvEKwtGA==";
}; };
}; };
"type-check-0.3.2" = { "type-check-0.3.2" = {
@ -3493,7 +3493,7 @@ let
version = "0.3.2"; version = "0.3.2";
src = fetchurl { src = fetchurl {
url = "https://registry.npmjs.org/type-check/-/type-check-0.3.2.tgz"; url = "https://registry.npmjs.org/type-check/-/type-check-0.3.2.tgz";
sha1 = "5884cab512cf1d355e3fb784f30804b2b520db72"; sha512 = "ZCmOJdvOWDBYJlzAoFkC+Q0+bUyEOS1ltgp1MGU03fqHG+dbi9tBFU2Rd9QKiDZFAYrhPh2JUf7rZRIuHRKtOg==";
}; };
}; };
"type-check-0.4.0" = { "type-check-0.4.0" = {
@ -3523,13 +3523,13 @@ let
sha512 = "TkRKr9sUTxEH8MdfuCSP7VizJyzRNMjj2J2do2Jr3Kym598JVdEksuzPQCnlFPW4ky9Q+iA+ma9BGm06XQBy8g=="; sha512 = "TkRKr9sUTxEH8MdfuCSP7VizJyzRNMjj2J2do2Jr3Kym598JVdEksuzPQCnlFPW4ky9Q+iA+ma9BGm06XQBy8g==";
}; };
}; };
"typescript-4.6.4" = { "typescript-4.7.4" = {
name = "typescript"; name = "typescript";
packageName = "typescript"; packageName = "typescript";
version = "4.6.4"; version = "4.7.4";
src = fetchurl { src = fetchurl {
url = "https://registry.npmjs.org/typescript/-/typescript-4.6.4.tgz"; url = "https://registry.npmjs.org/typescript/-/typescript-4.7.4.tgz";
sha512 = "9ia/jWHIEbo49HfjrLGfKbZSuWo9iTMwXO+Ca3pRsSpbsMbc7/IU8NKdCZVRRBafVPGnoJeFL76ZOAA84I9fEg=="; sha512 = "C0WQT0gezHuw6AdY1M2jxUO83Rjf0HP7Sk1DtXj6j1EwkQNZrHAg2XPWlq62oqEhYvONq5pkC2Y9oPljWToLmQ==";
}; };
}; };
"typescript-formatter-7.2.2" = { "typescript-formatter-7.2.2" = {
@ -3556,7 +3556,7 @@ let
version = "1.0.0"; version = "1.0.0";
src = fetchurl { src = fetchurl {
url = "https://registry.npmjs.org/unpipe/-/unpipe-1.0.0.tgz"; url = "https://registry.npmjs.org/unpipe/-/unpipe-1.0.0.tgz";
sha1 = "b2bf4ee8514aae6165b4817829d21b2ef49904ec"; sha512 = "pjy2bYhSsufwWlKwPc+l3cN7+wuJlK6uz0YdJEOlQDbl6jo/YlPi4mb8agUkVC8BF7V8NuzeyPNqRksA3hztKQ==";
}; };
}; };
"uri-js-4.4.1" = { "uri-js-4.4.1" = {
@ -3574,7 +3574,7 @@ let
version = "1.0.1"; version = "1.0.1";
src = fetchurl { src = fetchurl {
url = "https://registry.npmjs.org/utils-merge/-/utils-merge-1.0.1.tgz"; url = "https://registry.npmjs.org/utils-merge/-/utils-merge-1.0.1.tgz";
sha1 = "9f95710f50a267947b2ccc124741c1028427e713"; sha512 = "pMZTvIkT1d+TFGvDOqodOclx0QWkkgi6Tdoa8gC8ffGAAqz9pzPTZWAybbsHHoED/ztMtkv/VoYTYyShUn81hA==";
}; };
}; };
"uuid-3.4.0" = { "uuid-3.4.0" = {
@ -3601,7 +3601,7 @@ let
version = "1.1.2"; version = "1.1.2";
src = fetchurl { src = fetchurl {
url = "https://registry.npmjs.org/vary/-/vary-1.1.2.tgz"; url = "https://registry.npmjs.org/vary/-/vary-1.1.2.tgz";
sha1 = "2299f02c6ded30d4a5961b0b9f74524a18f634fc"; sha512 = "BNGbWLfd0eUPabhkXUVm0j8uuvREyTh5ovRa/dyow/BqAbZJyC+5fU+IzQOzmAKzYqYRAISoRhdQr3eIZ/PXqg==";
}; };
}; };
"verror-1.10.0" = { "verror-1.10.0" = {
@ -3610,7 +3610,7 @@ let
version = "1.10.0"; version = "1.10.0";
src = fetchurl { src = fetchurl {
url = "https://registry.npmjs.org/verror/-/verror-1.10.0.tgz"; url = "https://registry.npmjs.org/verror/-/verror-1.10.0.tgz";
sha1 = "3a105ca17053af55d6e270c1f8288682e18da400"; sha512 = "ZZKSmDAEFOijERBLkmYfJ+vmk3w+7hOLYDNkRCuRuMJGEmqYNCNLyBBFwWKVMhfwaEF3WOd0Zlw86U/WC/+nYw==";
}; };
}; };
"w3c-hr-time-1.0.2" = { "w3c-hr-time-1.0.2" = {
@ -3718,16 +3718,16 @@ let
version = "1.0.2"; version = "1.0.2";
src = fetchurl { src = fetchurl {
url = "https://registry.npmjs.org/wrappy/-/wrappy-1.0.2.tgz"; url = "https://registry.npmjs.org/wrappy/-/wrappy-1.0.2.tgz";
sha1 = "b5243d8f3ec1aa35f1364605bc0d1036e30ab69f"; sha512 = "l4Sp/DRseor9wL6EvV2+TuQn63dMkPjZ/sp9XkghTEbV9KlPS1xUsZ3u7/IQO4wxtcFB4bgpQPRcR3QCvezPcQ==";
}; };
}; };
"ws-7.5.7" = { "ws-7.5.9" = {
name = "ws"; name = "ws";
packageName = "ws"; packageName = "ws";
version = "7.5.7"; version = "7.5.9";
src = fetchurl { src = fetchurl {
url = "https://registry.npmjs.org/ws/-/ws-7.5.7.tgz"; url = "https://registry.npmjs.org/ws/-/ws-7.5.9.tgz";
sha512 = "KMvVuFzpKBuiIXW3E4u3mySRO2/mCHSyZDJQM5NQ9Q9KHWHWh0NHgfbRMLLrceUK5qAL4ytALJbpRMjixFZh8A=="; sha512 = "F+P9Jil7UiSKSkppIiD94dN07AwvFixvLIj1Og1Rl9GGMuNipJnV9JzjD6XuqmAeiswGvUmNLjr5cFuXwNS77Q==";
}; };
}; };
"xml-name-validator-3.0.0" = { "xml-name-validator-3.0.0" = {
@ -3763,7 +3763,7 @@ let
version = "2.1.2"; version = "2.1.2";
src = fetchurl { src = fetchurl {
url = "https://registry.npmjs.org/yallist/-/yallist-2.1.2.tgz"; url = "https://registry.npmjs.org/yallist/-/yallist-2.1.2.tgz";
sha1 = "1c11f9218f076089a47dd512f93c6699a6a81d52"; sha512 = "ncTzHV7NvsQZkYe1DW7cbDLm0YpzHmZF5r/iyP3ZnQtMiJ+pjzisCiMNI+Sj+xQF5pXhSHxSB3uDbsBTzY/c2A==";
}; };
}; };
"yallist-4.0.0" = { "yallist-4.0.0" = {
@ -3808,7 +3808,7 @@ let
version = "2.0.0"; version = "2.0.0";
src = fetchurl { src = fetchurl {
url = "https://registry.npmjs.org/yn/-/yn-2.0.0.tgz"; url = "https://registry.npmjs.org/yn/-/yn-2.0.0.tgz";
sha1 = "e5adabc8acf408f6385fc76495684c88e6af689a"; sha512 = "uTv8J/wiWTgUTg+9vLTi//leUl5vDQS6uii/emeTb2ssY7vl6QWf2fFbIIGjnhjvbdKlU0ed7QPgY1htTC86jQ==";
}; };
}; };
"yocto-queue-0.1.0" = { "yocto-queue-0.1.0" = {
@ -3824,12 +3824,12 @@ let
args = { args = {
name = "mjolnir"; name = "mjolnir";
packageName = "mjolnir"; packageName = "mjolnir";
version = "1.4.2"; version = "1.5.0";
src = ../../../../../../../nix/store/spvdzz0i3m55099ds9bjrd30c15cv8a6-source; src = ../../../../../../../nix/store/q7qh1pmk8jl32g0d9v89kp9nnlz68fil-source;
dependencies = [ dependencies = [
sources."@babel/code-frame-7.12.11" sources."@babel/code-frame-7.12.11"
sources."@babel/helper-validator-identifier-7.16.7" sources."@babel/helper-validator-identifier-7.18.6"
(sources."@babel/highlight-7.17.9" // { (sources."@babel/highlight-7.18.6" // {
dependencies = [ dependencies = [
sources."ansi-styles-3.2.1" sources."ansi-styles-3.2.1"
sources."chalk-2.4.2" sources."chalk-2.4.2"
@ -3863,7 +3863,7 @@ let
sources."@types/connect-3.4.35" sources."@types/connect-3.4.35"
sources."@types/crypto-js-4.1.1" sources."@types/crypto-js-4.1.1"
sources."@types/express-4.17.13" sources."@types/express-4.17.13"
sources."@types/express-serve-static-core-4.17.28" sources."@types/express-serve-static-core-4.17.29"
sources."@types/html-to-text-8.1.0" sources."@types/html-to-text-8.1.0"
sources."@types/humanize-duration-3.27.1" sources."@types/humanize-duration-3.27.1"
sources."@types/istanbul-lib-coverage-2.0.4" sources."@types/istanbul-lib-coverage-2.0.4"
@ -3873,7 +3873,7 @@ let
sources."@types/json5-0.0.29" sources."@types/json5-0.0.29"
sources."@types/mime-1.3.2" sources."@types/mime-1.3.2"
sources."@types/mocha-9.1.1" sources."@types/mocha-9.1.1"
sources."@types/node-16.11.35" sources."@types/node-16.11.45"
sources."@types/parse5-6.0.3" sources."@types/parse5-6.0.3"
sources."@types/qs-6.9.7" sources."@types/qs-6.9.7"
sources."@types/range-parser-1.2.4" sources."@types/range-parser-1.2.4"
@ -3901,7 +3901,7 @@ let
]; ];
}) })
sources."ajv-6.12.6" sources."ajv-6.12.6"
sources."ansi-colors-4.1.2" sources."ansi-colors-4.1.3"
sources."ansi-regex-5.0.1" sources."ansi-regex-5.0.1"
sources."ansi-styles-4.3.0" sources."ansi-styles-4.3.0"
sources."anymatch-3.1.2" sources."anymatch-3.1.2"
@ -4046,7 +4046,7 @@ let
sources."find-up-5.0.0" sources."find-up-5.0.0"
sources."flat-5.0.2" sources."flat-5.0.2"
sources."flat-cache-3.0.4" sources."flat-cache-3.0.4"
sources."flatted-3.2.5" sources."flatted-3.2.6"
sources."forever-agent-0.6.1" sources."forever-agent-0.6.1"
sources."form-data-3.0.1" sources."form-data-3.0.1"
sources."forwarded-0.2.0" sources."forwarded-0.2.0"
@ -4056,12 +4056,12 @@ let
sources."function-bind-1.1.1" sources."function-bind-1.1.1"
sources."functional-red-black-tree-1.0.1" sources."functional-red-black-tree-1.0.1"
sources."get-caller-file-2.0.5" sources."get-caller-file-2.0.5"
sources."get-intrinsic-1.1.1" sources."get-intrinsic-1.1.2"
sources."getpass-0.1.7" sources."getpass-0.1.7"
sources."glob-7.2.3" sources."glob-7.2.3"
sources."glob-parent-5.1.2" sources."glob-parent-5.1.2"
sources."glob-to-regexp-0.4.1" sources."glob-to-regexp-0.4.1"
sources."globals-13.15.0" sources."globals-13.16.0"
sources."graceful-fs-4.2.10" sources."graceful-fs-4.2.10"
sources."growl-1.10.5" sources."growl-1.10.5"
sources."har-schema-2.0.0" sources."har-schema-2.0.0"
@ -4089,7 +4089,7 @@ let
sources."ms-2.1.2" sources."ms-2.1.2"
]; ];
}) })
sources."humanize-duration-3.27.1" sources."humanize-duration-3.27.2"
sources."humanize-duration-ts-2.1.1" sources."humanize-duration-ts-2.1.1"
sources."iconv-lite-0.4.24" sources."iconv-lite-0.4.24"
sources."ignore-4.0.6" sources."ignore-4.0.6"
@ -4117,7 +4117,7 @@ let
sources."jest-matcher-utils-27.5.1" sources."jest-matcher-utils-27.5.1"
(sources."jest-message-util-27.5.1" // { (sources."jest-message-util-27.5.1" // {
dependencies = [ dependencies = [
sources."@babel/code-frame-7.16.7" sources."@babel/code-frame-7.18.6"
]; ];
}) })
sources."js-tokens-4.0.0" sources."js-tokens-4.0.0"
@ -4188,9 +4188,9 @@ let
sources."nearley-2.20.1" sources."nearley-2.20.1"
sources."negotiator-0.6.3" sources."negotiator-0.6.3"
sources."normalize-path-3.0.0" sources."normalize-path-3.0.0"
sources."nwsapi-2.2.0" sources."nwsapi-2.2.1"
sources."oauth-sign-0.9.0" sources."oauth-sign-0.9.0"
sources."object-inspect-1.12.0" sources."object-inspect-1.12.2"
sources."on-finished-2.4.1" sources."on-finished-2.4.1"
sources."on-headers-1.0.2" sources."on-headers-1.0.2"
sources."once-1.4.0" sources."once-1.4.0"
@ -4212,7 +4212,7 @@ let
sources."picocolors-1.0.0" sources."picocolors-1.0.0"
sources."picomatch-2.3.1" sources."picomatch-2.3.1"
sources."pify-3.0.0" sources."pify-3.0.0"
sources."postcss-8.4.13" sources."postcss-8.4.14"
sources."prelude-ls-1.1.2" sources."prelude-ls-1.1.2"
(sources."pretty-format-27.5.1" // { (sources."pretty-format-27.5.1" // {
dependencies = [ dependencies = [
@ -4222,7 +4222,7 @@ let
sources."progress-2.0.3" sources."progress-2.0.3"
sources."proxy-addr-2.0.7" sources."proxy-addr-2.0.7"
sources."pseudomap-1.0.2" sources."pseudomap-1.0.2"
sources."psl-1.8.0" sources."psl-1.9.0"
sources."punycode-2.1.1" sources."punycode-2.1.1"
sources."qs-6.10.3" sources."qs-6.10.3"
sources."railroad-diagrams-1.0.0" sources."railroad-diagrams-1.0.0"
@ -4248,7 +4248,7 @@ let
sources."request-promise-core-1.1.4" sources."request-promise-core-1.1.4"
sources."require-directory-2.1.1" sources."require-directory-2.1.1"
sources."require-from-string-2.0.2" sources."require-from-string-2.0.2"
sources."resolve-1.22.0" sources."resolve-1.22.1"
sources."resolve-from-4.0.0" sources."resolve-from-4.0.0"
sources."ret-0.1.15" sources."ret-0.1.15"
sources."rimraf-3.0.2" sources."rimraf-3.0.2"
@ -4339,7 +4339,7 @@ let
sources."type-check-0.3.2" sources."type-check-0.3.2"
sources."type-fest-0.20.2" sources."type-fest-0.20.2"
sources."type-is-1.6.18" sources."type-is-1.6.18"
sources."typescript-4.6.4" sources."typescript-4.7.4"
sources."typescript-formatter-7.2.2" sources."typescript-formatter-7.2.2"
sources."universalify-0.1.2" sources."universalify-0.1.2"
sources."unpipe-1.0.0" sources."unpipe-1.0.0"
@ -4360,7 +4360,7 @@ let
sources."workerpool-6.2.0" sources."workerpool-6.2.0"
sources."wrap-ansi-7.0.0" sources."wrap-ansi-7.0.0"
sources."wrappy-1.0.2" sources."wrappy-1.0.2"
sources."ws-7.5.7" sources."ws-7.5.9"
sources."xml-name-validator-3.0.0" sources."xml-name-validator-3.0.0"
sources."xmlchars-2.2.0" sources."xmlchars-2.2.0"
sources."y18n-5.0.8" sources."y18n-5.0.8"

View file

@ -6,14 +6,6 @@
}: }:
let let
mkFlag = trueStr: falseStr: cond: name: val: "--"
+ (if cond then trueStr else falseStr)
+ name
+ lib.optionalString (val != null && cond != false) "=${val}";
mkEnable = mkFlag "enable-" "disable-";
mkWith = mkFlag "with-" "without-";
mkOther = mkFlag "" "" true;
shouldUsePkg = pkg: if pkg != null && lib.meta.availableOn stdenv.hostPlatform pkg then pkg else null; shouldUsePkg = pkg: if pkg != null && lib.meta.availableOn stdenv.hostPlatform pkg then pkg else null;
optPam = shouldUsePkg pam; optPam = shouldUsePkg pam;
@ -37,19 +29,19 @@ stdenv.mkDerivation rec {
buildInputs = [ libgcrypt libgpg-error libtasn1 optPam optLibidn optGnutls ]; buildInputs = [ libgcrypt libgpg-error libtasn1 optPam optLibidn optGnutls ];
configureFlags = [ configureFlags = [
(mkOther "sysconfdir" "/etc") "--sysconfdir=/etc"
(mkOther "localstatedir" "/var") "--localstatedir=/var"
(mkEnable true "libgcrypt" null) (enableFeature true "libgcrypt")
(mkEnable (optPam != null) "pam" null) (enableFeature (optPam != null) "pam")
(mkEnable true "ipv6" null) (enableFeature true "ipv6")
(mkWith (optLibidn != null) "stringprep" null) (withFeature (optLibidn != null) "stringprep")
(mkEnable (optGnutls != null) "starttls" null) (enableFeature (optGnutls != null) "starttls")
(mkEnable true "des" null) (enableFeature true "des")
(mkEnable true "3des" null) (enableFeature true "3des")
(mkEnable true "aes" null) (enableFeature true "aes")
(mkEnable true "md" null) (enableFeature true "md")
(mkEnable false "null" null) (enableFeature false "null")
(mkEnable true "arcfour" null) (enableFeature true "arcfour")
]; ];
NIX_CFLAGS_COMPILE NIX_CFLAGS_COMPILE

View file

@ -1,28 +1,80 @@
{ stdenv, lib, fetchurl, wkhtmltopdf, xar, cpio }: { lib
, autoPatchelfHook
, cpio
, freetype
, zlib
, openssl
, dpkg
, fetchurl
, gcc-unwrapped
, libjpeg8
, libpng
, fontconfig
, stdenv
, wkhtmltopdf
, xar
, xorg
}:
stdenv.mkDerivation rec { let
darwinAttrs = rec {
version = "0.12.6-2";
src = fetchurl {
url = "https://github.com/wkhtmltopdf/packaging/releases/download/${version}/wkhtmltox-${version}.macos-cocoa.pkg";
sha256 = "sha256-gaZrd7UI/t6NvKpnEnIDdIN2Vos2c6F/ZhG21R6YlPg=";
};
pname = "wkhtmltopdf-bin"; nativeBuildInputs = [ xar cpio ];
version = "0.12.6-1";
sha256 = "1db59kdprzpmvdj1bg47lmfgi3zlvzvqif11sbym9hw61xy6gp3d"; unpackPhase = ''
src = fetchurl { xar -xf $src
url = zcat Payload | cpio -i
"https://github.com/wkhtmltopdf/packaging/releases/download/${version}/wkhtmltox-${version}.macos-cocoa.pkg"; tar -xf usr/local/share/wkhtmltox-installer/wkhtmltox.tar.gz
inherit sha256; '';
installPhase = ''
runHook preInstall
mkdir -p $out
cp -r bin include lib share $out/
runHook postInstall
'';
}; };
buildInputs = [ xar cpio ]; linuxAttrs = rec {
version = "0.12.6-3";
src = fetchurl {
url = "https://github.com/wkhtmltopdf/packaging/releases/download/${version}/wkhtmltox-${version}.archlinux-x86_64.pkg.tar.xz";
sha256 = "sha256-6Ewu8sPRbqvYWj27mBlQYpEN+mb+vKT46ljrdEUxckI=";
};
unpackPhase = '' nativeBuildInputs = [ autoPatchelfHook ];
xar -xf $src
zcat Payload | cpio -i
tar -xf usr/local/share/wkhtmltox-installer/wkhtmltox.tar.gz
'';
installPhase = '' buildInputs = [
mkdir -p $out xorg.libXext
cp -r bin include lib share $out/ xorg.libXrender
'';
freetype
openssl
zlib
(lib.getLib fontconfig)
(lib.getLib gcc-unwrapped)
(lib.getLib libjpeg8)
(lib.getLib libpng)
];
unpackPhase = "tar -xf $src";
installPhase = ''
runHook preInstall
mkdir -p $out
cp -r usr/bin usr/include usr/lib usr/share $out/
runHook postInstall
'';
};
in
stdenv.mkDerivation ({
pname = "wkhtmltopdf-bin";
dontStrip = true; dontStrip = true;
@ -45,7 +97,10 @@ stdenv.mkDerivation rec {
There is also a C library, if you're into that kind of thing. There is also a C library, if you're into that kind of thing.
''; '';
license = licenses.gpl3Plus; license = licenses.gpl3Plus;
maintainers = with maintainers; [ nbr ]; maintainers = with maintainers; [ nbr kalbasit ];
platforms = [ "x86_64-darwin" ]; platforms = [ "x86_64-darwin" "x86_64-linux" ];
}; };
} }
// lib.optionalAttrs (stdenv.hostPlatform.isDarwin) darwinAttrs
// lib.optionalAttrs (stdenv.hostPlatform.isLinux) linuxAttrs
)

View file

@ -1,23 +1,19 @@
{ lib, fetchFromGitHub, rustPlatform, gitUpdater, testers, fsrx }: { lib, fetchFromGitHub, rustPlatform, testers, fsrx }:
rustPlatform.buildRustPackage rec { rustPlatform.buildRustPackage rec {
pname = "fsrx"; pname = "fsrx";
version = "1.0.0"; version = "1.0.2";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "coloradocolby"; owner = "thatvegandev";
repo = pname; repo = pname;
rev = "v${version}"; rev = "v${version}";
sha256 = "sha256-pKdxYO8Rhck3UYxqiWHDlrlPS4cAPe5jLUu5Dajop/k="; sha256 = "sha256-hzfpjunP20WCt3erYu7AO7A3nz+UMKdFzWUA5jASbVA=";
}; };
cargoSha256 = "sha256-5h+ou9FLCG/WWMEQPsCTa1q+PovxUJs+6lzQ0L2bKIs="; cargoSha256 = "sha256-bRStmz2sJnhCKpvoQfc/ZP9B2ZdNHYNEHd+wZErdS1Y=";
passthru = { passthru = {
updateScript = gitUpdater {
inherit pname version;
rev-prefix = "v";
};
tests.version = testers.testVersion { tests.version = testers.testVersion {
package = fsrx; package = fsrx;
}; };
@ -25,7 +21,7 @@ rustPlatform.buildRustPackage rec {
meta = with lib; { meta = with lib; {
description = "A flow state reader in the terminal"; description = "A flow state reader in the terminal";
homepage = "https://github.com/coloradocolby/fsrx"; homepage = "https://github.com/thatvegandev/fsrx";
license = licenses.mit; license = licenses.mit;
maintainers = with maintainers; [ MoritzBoehme ]; maintainers = with maintainers; [ MoritzBoehme ];
}; };

View file

@ -7,7 +7,7 @@
python3.pkgs.buildPythonApplication rec { python3.pkgs.buildPythonApplication rec {
pname = "you-get"; pname = "you-get";
version = "0.4.1612"; version = "0.4.1620";
# Tests aren't packaged, but they all hit the real network so # Tests aren't packaged, but they all hit the real network so
# probably aren't suitable for a build environment anyway. # probably aren't suitable for a build environment anyway.
@ -15,7 +15,7 @@ python3.pkgs.buildPythonApplication rec {
src = python3.pkgs.fetchPypi { src = python3.pkgs.fetchPypi {
inherit pname version; inherit pname version;
sha256 = "sha256-lKEztwwn1pnALuwDiA1Ik9+XCVyO+UMobv+hXu0mn5w="; sha256 = "sha256-wCDaT9Nz1ZiSsqFwX1PXHq6QF6fjLRI9wwvvWxcmYOY=";
}; };
patches = [ patches = [
@ -39,6 +39,7 @@ python3.pkgs.buildPythonApplication rec {
meta = with lib; { meta = with lib; {
description = "A tiny command line utility to download media contents from the web"; description = "A tiny command line utility to download media contents from the web";
homepage = "https://you-get.org"; homepage = "https://you-get.org";
changelog = "https://github.com/soimort/you-get/raw/v${version}/CHANGELOG.rst";
license = licenses.mit; license = licenses.mit;
maintainers = with maintainers; [ ryneeverett ]; maintainers = with maintainers; [ ryneeverett ];
}; };

View file

@ -16,18 +16,13 @@ let
then mkDerivation then mkDerivation
else stdenv.mkDerivation; else stdenv.mkDerivation;
mkFlag = pfxTrue: pfxFalse: cond: name: enableFeaturePinentry = f:
"--${if cond then pfxTrue else pfxFalse}-${name}";
mkEnable = mkFlag "enable" "disable";
mkWith = mkFlag "with" "without";
mkEnablePinentry = f:
let let
info = flavorInfo.${f}; info = flavorInfo.${f};
flag = flavorInfo.${f}.flag or null; flag = flavorInfo.${f}.flag or null;
in in
optionalString (flag != null) optionalString (flag != null)
(mkEnable (elem f enabledFlavors) ("pinentry-" + flag)); (enableFeature (elem f enabledFlavors) ("pinentry-" + flag));
flavorInfo = { flavorInfo = {
curses = { bin = "curses"; flag = "curses"; buildInputs = [ ncurses ]; }; curses = { bin = "curses"; flag = "curses"; buildInputs = [ ncurses ]; };
@ -68,9 +63,9 @@ pinentryMkDerivation rec {
]; ];
configureFlags = [ configureFlags = [
(mkWith (libcap != null) "libcap") (withFeature (libcap != null) "libcap")
(mkEnable (libsecret != null) "libsecret") (enableFeature (libsecret != null) "libsecret")
] ++ (map mkEnablePinentry (attrNames flavorInfo)); ] ++ (map enableFeaturePinentry (attrNames flavorInfo));
postInstall = postInstall =
concatStrings (flip map enabledFlavors (f: concatStrings (flip map enabledFlavors (f:

View file

@ -9,9 +9,6 @@
}: }:
with lib; with lib;
let
mkFlag = cond: name: if cond then "--enable-${name}" else "--disable-${name}";
in
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "rsyslog"; pname = "rsyslog";
version = "8.2204.1"; version = "8.2204.1";
@ -36,72 +33,72 @@ stdenv.mkDerivation rec {
"--sysconfdir=/etc" "--sysconfdir=/etc"
"--localstatedir=/var" "--localstatedir=/var"
"--with-systemdsystemunitdir=\${out}/etc/systemd/system" "--with-systemdsystemunitdir=\${out}/etc/systemd/system"
(mkFlag true "largefile") (enableFeature true "largefile")
(mkFlag true "regexp") (enableFeature true "regexp")
(mkFlag (libkrb5 != null) "gssapi-krb5") (enableFeature (libkrb5 != null) "gssapi-krb5")
(mkFlag true "klog") (enableFeature true "klog")
(mkFlag true "kmsg") (enableFeature true "kmsg")
(mkFlag (systemd != null) "imjournal") (enableFeature (systemd != null) "imjournal")
(mkFlag true "inet") (enableFeature true "inet")
(mkFlag (jemalloc != null) "jemalloc") (enableFeature (jemalloc != null) "jemalloc")
(mkFlag true "unlimited-select") (enableFeature true "unlimited-select")
(mkFlag false "debug") (enableFeature false "debug")
(mkFlag false "debug-symbols") (enableFeature false "debug-symbols")
(mkFlag true "debugless") (enableFeature true "debugless")
(mkFlag false "valgrind") (enableFeature false "valgrind")
(mkFlag false "diagtools") (enableFeature false "diagtools")
(mkFlag true "usertools") (enableFeature true "usertools")
(mkFlag (libmysqlclient != null) "mysql") (enableFeature (libmysqlclient != null) "mysql")
(mkFlag (postgresql != null) "pgsql") (enableFeature (postgresql != null) "pgsql")
(mkFlag (libdbi != null) "libdbi") (enableFeature (libdbi != null) "libdbi")
(mkFlag (net-snmp != null) "snmp") (enableFeature (net-snmp != null) "snmp")
(mkFlag (libuuid != null) "uuid") (enableFeature (libuuid != null) "uuid")
(mkFlag (curl != null) "elasticsearch") (enableFeature (curl != null) "elasticsearch")
(mkFlag (gnutls != null) "gnutls") (enableFeature (gnutls != null) "gnutls")
(mkFlag (libgcrypt != null) "libgcrypt") (enableFeature (libgcrypt != null) "libgcrypt")
(mkFlag true "rsyslogrt") (enableFeature true "rsyslogrt")
(mkFlag true "rsyslogd") (enableFeature true "rsyslogd")
(mkFlag true "mail") (enableFeature true "mail")
(mkFlag (liblognorm != null) "mmnormalize") (enableFeature (liblognorm != null) "mmnormalize")
(mkFlag (libmaxminddb != null) "mmdblookup") (enableFeature (libmaxminddb != null) "mmdblookup")
(mkFlag true "mmjsonparse") (enableFeature true "mmjsonparse")
(mkFlag true "mmaudit") (enableFeature true "mmaudit")
(mkFlag true "mmanon") (enableFeature true "mmanon")
(mkFlag true "mmutf8fix") (enableFeature true "mmutf8fix")
(mkFlag true "mmcount") (enableFeature true "mmcount")
(mkFlag true "mmsequence") (enableFeature true "mmsequence")
(mkFlag true "mmfields") (enableFeature true "mmfields")
(mkFlag true "mmpstrucdata") (enableFeature true "mmpstrucdata")
(mkFlag (openssl != null) "mmrfc5424addhmac") (enableFeature (openssl != null) "mmrfc5424addhmac")
(mkFlag (librelp != null) "relp") (enableFeature (librelp != null) "relp")
(mkFlag (libksi != null) "ksi-ls12") (enableFeature (libksi != null) "ksi-ls12")
(mkFlag (liblogging != null) "liblogging-stdlog") (enableFeature (liblogging != null) "liblogging-stdlog")
(mkFlag (liblogging != null) "rfc3195") (enableFeature (liblogging != null) "rfc3195")
(mkFlag true "imfile") (enableFeature true "imfile")
(mkFlag false "imsolaris") (enableFeature false "imsolaris")
(mkFlag true "imptcp") (enableFeature true "imptcp")
(mkFlag true "impstats") (enableFeature true "impstats")
(mkFlag true "omprog") (enableFeature true "omprog")
(mkFlag (libnet != null) "omudpspoof") (enableFeature (libnet != null) "omudpspoof")
(mkFlag true "omstdout") (enableFeature true "omstdout")
(mkFlag (systemd != null) "omjournal") (enableFeature (systemd != null) "omjournal")
(mkFlag true "pmlastmsg") (enableFeature true "pmlastmsg")
(mkFlag true "pmcisconames") (enableFeature true "pmcisconames")
(mkFlag true "pmciscoios") (enableFeature true "pmciscoios")
(mkFlag true "pmaixforwardedfrom") (enableFeature true "pmaixforwardedfrom")
(mkFlag true "pmsnare") (enableFeature true "pmsnare")
(mkFlag true "omruleset") (enableFeature true "omruleset")
(mkFlag true "omuxsock") (enableFeature true "omuxsock")
(mkFlag true "mmsnmptrapd") (enableFeature true "mmsnmptrapd")
(mkFlag (hadoop != null) "omhdfs") (enableFeature (hadoop != null) "omhdfs")
(mkFlag (rdkafka != null) "omkafka") (enableFeature (rdkafka != null) "omkafka")
(mkFlag (libmongo-client != null) "ommongodb") (enableFeature (libmongo-client != null) "ommongodb")
(mkFlag (czmq != null) "imczmq") (enableFeature (czmq != null) "imczmq")
(mkFlag (czmq != null) "omczmq") (enableFeature (czmq != null) "omczmq")
(mkFlag (rabbitmq-c != null) "omrabbitmq") (enableFeature (rabbitmq-c != null) "omrabbitmq")
(mkFlag (hiredis != null) "omhiredis") (enableFeature (hiredis != null) "omhiredis")
(mkFlag (curl != null) "omhttpfs") (enableFeature (curl != null) "omhttpfs")
(mkFlag true "generate-man-pages") (enableFeature true "generate-man-pages")
]; ];
passthru.tests = { passthru.tests = {

View file

@ -12032,7 +12032,9 @@ with pkgs;
wkhtmltopdf = libsForQt514.callPackage ../tools/graphics/wkhtmltopdf { }; wkhtmltopdf = libsForQt514.callPackage ../tools/graphics/wkhtmltopdf { };
wkhtmltopdf-bin = callPackage ../tools/graphics/wkhtmltopdf-bin { }; wkhtmltopdf-bin = callPackage ../tools/graphics/wkhtmltopdf-bin {
libjpeg8 = libjpeg.override { enableJpeg8 = true; };
};
wml = callPackage ../development/web/wml { }; wml = callPackage ../development/web/wml { };
@ -34380,6 +34382,8 @@ with pkgs;
cernlib = callPackage ../development/libraries/physics/cernlib { }; cernlib = callPackage ../development/libraries/physics/cernlib { };
clhep = callPackage ../development/libraries/physics/clhep { };
hepmc2 = callPackage ../development/libraries/physics/hepmc2 { }; hepmc2 = callPackage ../development/libraries/physics/hepmc2 { };
hepmc3 = callPackage ../development/libraries/physics/hepmc3 { hepmc3 = callPackage ../development/libraries/physics/hepmc3 {