diff options
Diffstat (limited to 'pkgs/applications')
216 files changed, 5134 insertions, 1274 deletions
diff --git a/pkgs/applications/audio/aumix/default.nix b/pkgs/applications/audio/aumix/default.nix index 2603e88fcbd..6127cb7e692 100644 --- a/pkgs/applications/audio/aumix/default.nix +++ b/pkgs/applications/audio/aumix/default.nix @@ -28,8 +28,12 @@ stdenv.mkDerivation rec { }) ]; + nativeBuildInputs = lib.optionals gtkGUI [ pkg-config ]; + buildInputs = [ gettext ncurses ] - ++ lib.optionals gtkGUI [ pkg-config gtk2 ]; + ++ lib.optionals gtkGUI [ gtk2 ]; + + configureFlags = lib.optionals (!gtkGUI) ["--without-gtk"]; meta = with lib; { description = "Audio mixer for X and the console"; diff --git a/pkgs/applications/audio/blanket/default.nix b/pkgs/applications/audio/blanket/default.nix index 6c648ed7115..3b12aeb8868 100644 --- a/pkgs/applications/audio/blanket/default.nix +++ b/pkgs/applications/audio/blanket/default.nix @@ -4,7 +4,7 @@ , meson , ninja , pkg-config -, wrapGAppsHook +, wrapGAppsHook4 , desktop-file-utils , appstream-glib , python3Packages @@ -30,9 +30,8 @@ python3Packages.buildPythonApplication rec { meson ninja pkg-config - wrapGAppsHook + wrapGAppsHook4 desktop-file-utils - appstream-glib ]; buildInputs = [ @@ -57,6 +56,8 @@ python3Packages.buildPythonApplication rec { postPatch = '' patchShebangs build-aux/meson/postinstall.py + substituteInPlace build-aux/meson/postinstall.py \ + --replace gtk-update-icon-cache gtk4-update-icon-cache ''; meta = with lib; { diff --git a/pkgs/applications/audio/calf/default.nix b/pkgs/applications/audio/calf/default.nix index bdcbf024e60..4ab651e3fb8 100644 --- a/pkgs/applications/audio/calf/default.nix +++ b/pkgs/applications/audio/calf/default.nix @@ -12,9 +12,10 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ cairo expat fftwSinglePrec fluidsynth glib gtk2 libjack2 ladspaH - libglade lv2 pkg-config + libglade lv2 ]; meta = with lib; { diff --git a/pkgs/applications/audio/crip/default.nix b/pkgs/applications/audio/crip/default.nix index d635dce83f4..d41ebed0960 100644 --- a/pkgs/applications/audio/crip/default.nix +++ b/pkgs/applications/audio/crip/default.nix @@ -61,7 +61,7 @@ stdenv.mkDerivation rec { meta = { homepage = "http://bach.dynet.com/crip/"; description = "Terminal-based ripper/encoder/tagger tool for creating Ogg Vorbis/FLAC files"; - license = lib.licenses.gpl1; + license = lib.licenses.gpl1Only; platforms = lib.platforms.linux; maintainers = [ maintainers.endgame ]; }; diff --git a/pkgs/applications/audio/faust/faustlive.nix b/pkgs/applications/audio/faust/faustlive.nix index 4ee5ab82e6e..87f2920c200 100644 --- a/pkgs/applications/audio/faust/faustlive.nix +++ b/pkgs/applications/audio/faust/faustlive.nix @@ -5,12 +5,12 @@ stdenv.mkDerivation rec { pname = "faustlive"; - version = "2.5.11"; + version = "2.5.12"; src = fetchFromGitHub { owner = "grame-cncm"; repo = "faustlive"; rev = version; - sha256 = "sha256-ldn6st3/iIABjEfAwodOnPrI97DygWbnYmvMktlOgrk="; + sha256 = "sha256-pq9zO4opCh9GEEtuQjrxKdNvOasDlcGGUsQD4je7Wyw="; fetchSubmodules = true; }; diff --git a/pkgs/applications/audio/flac/default.nix b/pkgs/applications/audio/flac/default.nix index 621804840bf..c9e3b946dd1 100644 --- a/pkgs/applications/audio/flac/default.nix +++ b/pkgs/applications/audio/flac/default.nix @@ -2,11 +2,12 @@ stdenv.mkDerivation rec { pname = "flac"; - version = "1.3.4"; + version = "1.4.1"; src = fetchurl { url = "http://downloads.xiph.org/releases/flac/${pname}-${version}.tar.xz"; - sha256 = "0dz7am8kbc97a6afml1h4yp085274prg8j7csryds8m3fmz61w4g"; + # Official checksum is published at https://github.com/xiph/flac/releases/tag/${version} + sha256 = "91303c3e5dfde52c3e94e75976c0ab3ee14ced278ab8f60033a3a12db9209ae6"; }; buildInputs = [ libogg ]; @@ -20,5 +21,6 @@ stdenv.mkDerivation rec { description = "Library and tools for encoding and decoding the FLAC lossless audio file format"; platforms = platforms.all; license = licenses.bsd3; + maintainers = with maintainers; [ ruuda ]; }; } diff --git a/pkgs/applications/audio/ft2-clone/default.nix b/pkgs/applications/audio/ft2-clone/default.nix index d26d92e00db..cfa831ab525 100644 --- a/pkgs/applications/audio/ft2-clone/default.nix +++ b/pkgs/applications/audio/ft2-clone/default.nix @@ -13,13 +13,13 @@ stdenv.mkDerivation rec { pname = "ft2-clone"; - version = "1.59"; + version = "1.60"; src = fetchFromGitHub { owner = "8bitbubsy"; repo = "ft2-clone"; rev = "v${version}"; - sha256 = "sha256-TQJCkvPV6vbhURLcuH41i8obHnfHkrCTJG0+IuSVDos="; + sha256 = "sha256-6/9NaQSRNGnuIivIeWi/dOBSOzxhZYghy7zvdB5i500="; }; # Adapt the linux-only CMakeLists to darwin (more reliable than make-macos.sh) diff --git a/pkgs/applications/audio/gbsplay/default.nix b/pkgs/applications/audio/gbsplay/default.nix index 59253af2ad6..1e6bbdb4dd7 100644 --- a/pkgs/applications/audio/gbsplay/default.nix +++ b/pkgs/applications/audio/gbsplay/default.nix @@ -25,7 +25,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "Gameboy sound player"; - license = licenses.gpl1; + license = licenses.gpl1Plus; platforms = [ "i686-linux" "x86_64-linux" ]; maintainers = with maintainers; [ ]; }; diff --git a/pkgs/applications/audio/grandorgue/default.nix b/pkgs/applications/audio/grandorgue/default.nix index 30c6e57188a..954a2265312 100644 --- a/pkgs/applications/audio/grandorgue/default.nix +++ b/pkgs/applications/audio/grandorgue/default.nix @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake pkg-config ]; - buildInputs = [ pkg-config fftwFloat alsa-lib zlib wavpack wxGTK31 udev ] + buildInputs = [ fftwFloat alsa-lib zlib wavpack wxGTK31 udev ] ++ lib.optional jackaudioSupport libjack2; cmakeFlags = lib.optional (!jackaudioSupport) [ diff --git a/pkgs/applications/audio/ltc-tools/default.nix b/pkgs/applications/audio/ltc-tools/default.nix index c8c87959727..93558105074 100644 --- a/pkgs/applications/audio/ltc-tools/default.nix +++ b/pkgs/applications/audio/ltc-tools/default.nix @@ -11,7 +11,8 @@ stdenv.mkDerivation rec { sha256 = "0vp25b970r1hv5ndzs4di63rgwnl31jfaj3jz5dka276kx34q4al"; }; - buildInputs = [ pkg-config libltc libsndfile jack2 ]; + nativeBuildInputs = [ pkg-config ]; + buildInputs = [ libltc libsndfile jack2 ]; makeFlags = [ "PREFIX=$(out)" ]; diff --git a/pkgs/applications/audio/meterbridge/default.nix b/pkgs/applications/audio/meterbridge/default.nix index a825eaa4e38..675189f6d13 100644 --- a/pkgs/applications/audio/meterbridge/default.nix +++ b/pkgs/applications/audio/meterbridge/default.nix @@ -12,8 +12,9 @@ stdenv.mkDerivation rec { patches = [ ./buf_rect.patch ./fix_build_with_gcc-5.patch]; + nativeBuildInputs = [ pkg-config ]; buildInputs = - [ pkg-config SDL SDL_image libjack2 + [ SDL SDL_image libjack2 ]; meta = with lib; { diff --git a/pkgs/applications/audio/mod-arpeggiator-lv2/default.nix b/pkgs/applications/audio/mod-arpeggiator-lv2/default.nix index 3896545dc41..a628e38469f 100644 --- a/pkgs/applications/audio/mod-arpeggiator-lv2/default.nix +++ b/pkgs/applications/audio/mod-arpeggiator-lv2/default.nix @@ -12,7 +12,8 @@ stdenv.mkDerivation rec { sha256 = "sha256-1KiWMTVTTf1/iR4AzJ1Oe0mOrWN5edsZN0tQMidgnRA="; }; - buildInputs = [ lv2 pkg-config ]; + nativeBuildInputs = [ pkg-config ]; + buildInputs = [ lv2 ]; makeFlags = [ "PREFIX=$(out)" ]; diff --git a/pkgs/applications/audio/mopidy/mpd.nix b/pkgs/applications/audio/mopidy/mpd.nix index ab7e33ea3e3..2c4f8eaa5a9 100644 --- a/pkgs/applications/audio/mopidy/mpd.nix +++ b/pkgs/applications/audio/mopidy/mpd.nix @@ -2,14 +2,14 @@ python3Packages.buildPythonApplication rec { pname = "Mopidy-MPD"; - version = "3.2.0"; + version = "3.3.0"; src = python3Packages.fetchPypi { inherit pname version; - sha256 = "sha256-oZvKr61lyu7CmXP2A/xtYng1FIUPyveVJMqUuv6UnaM="; + sha256 = "sha256-CeLMRqj9cwBvQrOx7XHVV8MjDjwOosONVlsN2o+vTVM="; }; - propagatedBuildInputs = [mopidy]; + propagatedBuildInputs = [ mopidy ]; # no tests implemented doCheck = false; diff --git a/pkgs/applications/audio/new-session-manager/default.nix b/pkgs/applications/audio/new-session-manager/default.nix index 287b593d3eb..5f23b9be651 100644 --- a/pkgs/applications/audio/new-session-manager/default.nix +++ b/pkgs/applications/audio/new-session-manager/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "new-session-manager"; - version = "1.6.0"; + version = "1.6.1"; src = fetchFromGitHub { owner = "linuxaudio"; repo = "new-session-manager"; rev = "v${version}"; - sha256 = "sha256-QVykRYXToeVXr7pYQy2afgEAlXrQnm68+xEUZhd+FkY="; + sha256 = "sha256-5G2GlBuKjC/r1SMm78JKia7bMA97YcvUR5l6zBucemw="; }; nativeBuildInputs = [ meson pkg-config ninja ]; diff --git a/pkgs/applications/audio/opusfile/default.nix b/pkgs/applications/audio/opusfile/default.nix index a6683904cb1..f86595361b6 100644 --- a/pkgs/applications/audio/opusfile/default.nix +++ b/pkgs/applications/audio/opusfile/default.nix @@ -11,6 +11,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkg-config ]; buildInputs = [ openssl libogg ]; propagatedBuildInputs = [ libopus ]; + outputs = [ "out" "dev" ]; patches = [ ./include-multistream.patch ] # fixes problem with openssl 1.1 dependency # see https://github.com/xiph/opusfile/issues/13 diff --git a/pkgs/applications/audio/parlatype/default.nix b/pkgs/applications/audio/parlatype/default.nix new file mode 100644 index 00000000000..6aa92a3a99f --- /dev/null +++ b/pkgs/applications/audio/parlatype/default.nix @@ -0,0 +1,85 @@ +{ lib +, stdenv +, fetchFromGitHub +, appstream-glib +, dbus +, desktop-file-utils +, gettext +, glib +, gobject-introspection +, gsettings-desktop-schemas +, gst_all_1 +, gtk3 +, hicolor-icon-theme +, isocodes +, itstool +, libxml2 +, meson +, ninja +, pkg-config +, python3 +, wrapGAppsHook +}: + +stdenv.mkDerivation rec { + pname = "parlatype"; + version = "3.1"; + + src = fetchFromGitHub { + owner = "gkarsay"; + repo = pname; + rev = "v${version}"; + sha256 = "1a4xlsbszb50vnz1g7kf7hl7aywp7s7xaravkcx13csn0a7l3x45"; + }; + + nativeBuildInputs = [ + appstream-glib + desktop-file-utils + gettext + gobject-introspection + itstool + libxml2 + meson + ninja + pkg-config + python3 + wrapGAppsHook + ]; + + buildInputs = [ + dbus + glib + gsettings-desktop-schemas + gst_all_1.gst-libav + gst_all_1.gst-plugins-bad + gst_all_1.gst-plugins-base + gst_all_1.gst-plugins-good + gst_all_1.gst-plugins-ugly + gst_all_1.gstreamer + gtk3 + hicolor-icon-theme + isocodes + ]; + + postPatch = '' + patchShebangs data/meson_post_install.py + patchShebangs libparlatype/tests/data/generate_config_data + ''; + + doCheck = false; + + meta = with lib; { + description = "GNOME audio player for transcription"; + longDescription = '' + Parlatype is a minimal audio player for manual speech transcription, + written for the GNOME desktop environment. It plays audio sources to + transcribe them in your favourite text application. It’s intended to be + useful for journalists, students, scientists and whoever needs to + transcribe audio files. + ''; + homepage = "https://www.parlatype.org/"; + license = licenses.gpl3Plus; + maintainers = with maintainers; [ alexshpilkin melchips ]; + platforms = platforms.linux; + }; +} diff --git a/pkgs/applications/audio/patchage/default.nix b/pkgs/applications/audio/patchage/default.nix index a8a5bed0e07..99bbdf693a9 100644 --- a/pkgs/applications/audio/patchage/default.nix +++ b/pkgs/applications/audio/patchage/default.nix @@ -25,6 +25,7 @@ stdenv.mkDerivation rec { fetchSubmodules = true; }; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ alsa-lib boost @@ -33,7 +34,6 @@ stdenv.mkDerivation rec { glibmm gtkmm2 libjack2 - pkg-config python3 wafHook ]; diff --git a/pkgs/applications/audio/pd-plugins/puremapping/default.nix b/pkgs/applications/audio/pd-plugins/puremapping/default.nix index 811b8c2ee9a..5aef92ab61f 100644 --- a/pkgs/applications/audio/pd-plugins/puremapping/default.nix +++ b/pkgs/applications/audio/pd-plugins/puremapping/default.nix @@ -25,7 +25,7 @@ stdenv.mkDerivation rec { meta = { description = "Set of externals to facilitate the use of sensors within Pure Data and to create complex relations between input and output of a dynamic system"; homepage = "http://www.chnry.net/ch/?090-Pure-Mapping&lang=en"; - license = lib.licenses.gpl1; + license = lib.licenses.gpl1Only; maintainers = [ lib.maintainers.magnetophon ]; platforms = lib.platforms.linux; }; diff --git a/pkgs/applications/audio/spot/default.nix b/pkgs/applications/audio/spot/default.nix index e995f8cfa1b..af1dfb01e9a 100644 --- a/pkgs/applications/audio/spot/default.nix +++ b/pkgs/applications/audio/spot/default.nix @@ -16,7 +16,7 @@ , openssl , alsa-lib , libpulseaudio -, wrapGAppsHook +, wrapGAppsHook4 }: stdenv.mkDerivation rec { @@ -48,7 +48,7 @@ stdenv.mkDerivation rec { rustPlatform.rust.cargo rustPlatform.cargoSetupHook rustPlatform.rust.rustc - wrapGAppsHook + wrapGAppsHook4 ]; buildInputs = [ @@ -67,6 +67,8 @@ stdenv.mkDerivation rec { postPatch = '' chmod +x build-aux/cargo.sh patchShebangs build-aux/cargo.sh build-aux/meson/postinstall.py + substituteInPlace build-aux/meson/postinstall.py \ + --replace gtk-update-icon-cache gtk4-update-icon-cache ''; passthru = { diff --git a/pkgs/applications/audio/spotify-tui/default.nix b/pkgs/applications/audio/spotify-tui/default.nix index 2b1d114964b..3011b712fe2 100644 --- a/pkgs/applications/audio/spotify-tui/default.nix +++ b/pkgs/applications/audio/spotify-tui/default.nix @@ -1,4 +1,17 @@ -{ lib, stdenv, fetchFromGitHub, fetchCrate, rustPlatform, installShellFiles, pkg-config, openssl, python3, libxcb, AppKit, Security }: +{ lib +, stdenv +, fetchFromGitHub +, fetchCrate +, fetchpatch +, rustPlatform +, installShellFiles +, pkg-config +, openssl +, python3 +, libxcb +, AppKit +, Security +}: rustPlatform.buildRustPackage rec { pname = "spotify-tui"; @@ -8,14 +21,30 @@ rustPlatform.buildRustPackage rec { owner = "Rigellute"; repo = "spotify-tui"; rev = "v${version}"; - sha256 = "sha256-L5gg6tjQuYoAC89XfKE38KCFONwSAwfNoFEUPH4jNAI="; + hash = "sha256-L5gg6tjQuYoAC89XfKE38KCFONwSAwfNoFEUPH4jNAI="; }; - # Use patched rspotify cargoPatches = [ + # Use patched rspotify ./Cargo.lock.patch + + # Needed so that the patch below it applies. + (fetchpatch { + name = "update-dirs.patch"; + url = "https://github.com/Rigellute/spotify-tui/commit/3881defc1ed0bcf79df1aef4836b857f64be657c.patch"; + hash = "sha256-OGqiYLFojMwR3RgKbddXxPDiAdzPySnscVVsVmTT7t4="; + }) + + # https://github.com/Rigellute/spotify-tui/pull/990 + (fetchpatch { + name = "update-socket2-for-rust-1.64.patch"; + url = "https://github.com/Rigellute/spotify-tui/commit/14df9419cf72da13f3b55654686a95647ea9dfea.patch"; + hash = "sha256-craY6UwmHDdxih3nZBdPkNJtQ6wvVgf09Ovqdxi0JZo="; + }) ]; + patches = [ + # Use patched rspotify ./Cargo.toml.patch ]; @@ -44,7 +73,7 @@ rustPlatform.buildRustPackage rec { ln -s ${rspotify} ./rspotify-${rspotify.version} ''; - cargoSha256 = "sha256-S8zuVYcyYvrwggIvlpxNydhoN9kx6xLBwYJSHcbEK40="; + cargoHash = "sha256-aZJ6Q/rvqrv+wvQw2eKFPnSROhI5vXPvr5pu1hwtZKA="; nativeBuildInputs = [ installShellFiles ] ++ lib.optionals stdenv.isLinux [ pkg-config python3 ]; buildInputs = [ ] diff --git a/pkgs/applications/audio/transcode/default.nix b/pkgs/applications/audio/transcode/default.nix index 112d84a08b1..da149db0753 100644 --- a/pkgs/applications/audio/transcode/default.nix +++ b/pkgs/applications/audio/transcode/default.nix @@ -9,8 +9,9 @@ stdenv.mkDerivation rec { sha256 = "1e4e72d8e0dd62a80b8dd90699f5ca64c9b0cb37a5c9325c184166a9654f0a92"; }; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ flac lame zlib libjpeg libvorbis libtheora libxml2 lzo - libdvdread pkg-config x264 libmpeg2 xvidcore ]; + libdvdread x264 libmpeg2 xvidcore ]; configureFlags = [ "--disable-ffmpeg" "--disable-libavcodec" "--disable-libavformat" "--enable-lzo" "--enable-ogg" "--enable-vorbis" "--enable-theora" "--enable-libxml2" diff --git a/pkgs/applications/audio/xsynth-dssi/default.nix b/pkgs/applications/audio/xsynth-dssi/default.nix index 61d49d110a9..87305027e4c 100644 --- a/pkgs/applications/audio/xsynth-dssi/default.nix +++ b/pkgs/applications/audio/xsynth-dssi/default.nix @@ -10,9 +10,9 @@ stdenv.mkDerivation rec { sha256 = "00nwv2pqjbmxqdc6xdm0cljq6z05lv4y6bibmhz1kih9lm0lklnk"; }; - nativeBuildInputs = [ autoconf automake ]; + nativeBuildInputs = [ autoconf automake pkg-config ]; buildInputs = [ alsa-lib dssi gtk2 libjack2 ladspaH - ladspaPlugins liblo pkg-config ]; + ladspaPlugins liblo ]; installPhase = '' mkdir -p $out/bin diff --git a/pkgs/applications/blockchains/clightning/default.nix b/pkgs/applications/blockchains/clightning/default.nix index 8e87610e03f..4dfeebfe096 100644 --- a/pkgs/applications/blockchains/clightning/default.nix +++ b/pkgs/applications/blockchains/clightning/default.nix @@ -7,6 +7,7 @@ , automake , gettext , libtool +, lowdown , protobuf , unzip , which @@ -21,30 +22,21 @@ let in stdenv.mkDerivation rec { pname = "clightning"; - version = "0.12.0"; + version = "0.12.1"; src = fetchurl { url = "https://github.com/ElementsProject/lightning/releases/download/v${version}/clightning-v${version}.zip"; - sha256 = "1ff400339db3d314b459e1a3e973f1213783e814faa21f2e1b18917693cabfd9"; - }; - - manpages = fetchurl { - url = "https://github.com/ElementsProject/lightning/releases/download/v${version}/clightning-v${version}-manpages.tar.xz"; - sha256 = "sha256-7EohXp0/gIJwlMsTHwlcLNBzZb8LwF9n0eXkQhOnY7g="; + sha256 = "sha256-SlDDOJ6H2UVT/dof23CYSzCliAc+5CAYQc87AzOtYjg="; }; # when building on darwin we need dawin.cctools to provide the correct libtool # as libwally-core detects the host as darwin and tries to add the -static # option to libtool, also we have to add the modified gsed package. - nativeBuildInputs = [ autoconf autogen automake gettext libtool protobuf py3 unzip which ] + nativeBuildInputs = [ autoconf autogen automake gettext libtool lowdown protobuf py3 unzip which ] ++ lib.optionals stdenv.isDarwin [ darwin.cctools darwin.autoSignDarwinBinariesHook ]; buildInputs = [ gmp libsodium sqlite zlib ]; - postUnpack = '' - tar -xf $manpages -C $sourceRoot - ''; - # this causes some python trouble on a darwin host so we skip this step. # also we have to tell libwally-core to use sed instead of gsed. postPatch = if !stdenv.isDarwin then '' diff --git a/pkgs/applications/blockchains/zcash/default.nix b/pkgs/applications/blockchains/zcash/default.nix index 20520037a60..c4d007f2907 100644 --- a/pkgs/applications/blockchains/zcash/default.nix +++ b/pkgs/applications/blockchains/zcash/default.nix @@ -40,7 +40,7 @@ rustPlatform.buildRustPackage.override { inherit stdenv; } rec { postPatch = '' # Have to do this here instead of in preConfigure because # cargoDepsCopy gets unset after postPatch. - configureFlagsArray+=("RUST_VENDORED_SOURCES=$NIX_BUILD_TOP/$cargoDepsCopy") + configureFlagsArray+=("RUST_VENDORED_SOURCES=$cargoDepsCopy") ''; CXXFLAGS = [ diff --git a/pkgs/applications/editors/eclipse/default.nix b/pkgs/applications/editors/eclipse/default.nix index f5657b0a4d7..64204deaa4a 100644 --- a/pkgs/applications/editors/eclipse/default.nix +++ b/pkgs/applications/editors/eclipse/default.nix @@ -14,11 +14,11 @@ let platform_major = "4"; - platform_minor = "24"; + platform_minor = "25"; year = "2022"; - month = "06"; #release month - buildmonth = "06"; #sometimes differs from release month - timestamp = "${year}${buildmonth}070700"; + month = "09"; #release month + buildmonth = "08"; #sometimes differs from release month + timestamp = "${year}${buildmonth}311800"; gtk = gtk3; in rec { @@ -38,7 +38,7 @@ in rec { src = fetchurl { url = "https://www.eclipse.org/downloads/download.php?r=1&nf=1&file=/technology/epp/downloads/release/${year}-${month}/R/eclipse-cpp-${year}-${month}-R-linux-gtk-x86_64.tar.gz"; - hash = "sha512-mqoeP6BwmTWGy6qp/+BSfjTaMfAEKtlyqHwn1GrihRCXQyDNeVWRkBNa7JTCUs+yve2rokgisZNVSwpgAqqHYQ=="; + hash = "sha512-1sUQ/jDOQMqnKLKY6oh28STvS5pbH89+2zs+H77euiJOsBgB+yEkEntnhI39O67qmOK/EkQ3y3NkQcumbax56A=="; }; }; @@ -50,7 +50,7 @@ in rec { src = fetchurl { url = "https://www.eclipse.org/downloads/download.php?r=1&nf=1&file=/technology/epp/downloads/release/${year}-${month}/R/eclipse-modeling-${year}-${month}-R-linux-gtk-x86_64.tar.gz"; - hash = "sha512-RbvqIUnJ00/qvqsw1s5mcZ2SQhhT2y+S9J9xOB+t8bK+1SOhUOFvU/HcDAmHBl88L1qBCF0ckAKd7jETYPeXnw=="; + hash = "sha512-Qb2BmfXtmVeTLIZZav91hayPkwSGYMAG3fod3BmyJdo1DPas6VC+MzBwklAjpC1wqLTzKCAKzVZtdtPYC9QCqw=="; }; }; @@ -62,7 +62,7 @@ in rec { src = fetchurl { url = "https://www.eclipse.org/downloads/download.php?r=1&nf=1&file=/eclipse/downloads/drops${platform_major}/R-${platform_major}.${platform_minor}-${timestamp}/eclipse-platform-${platform_major}.${platform_minor}-linux-gtk-x86_64.tar.gz"; - hash = "sha512-PPgFti6UUSkIDEUBGY4tDVfnaFXxTUIRIvfMOVXVxIr+ciGK2dOHpQ7K9hcYnWqoIulxa/fV+TXQI3hzcIRVAA=="; + hash = "sha512-RW+5H82AcH/U9XUzIlUCU5heN9qQAlMl3rmxsKnTYxVWdIjSN461Nf71F6jPhL/Q+VCAMesguOEF0AqyhnH0nw=="; }; }; @@ -88,7 +88,7 @@ in rec { src = fetchurl { url = "https://www.eclipse.org/downloads/download.php?r=1&nf=1&file=/eclipse/downloads/drops${platform_major}/R-${platform_major}.${platform_minor}-${timestamp}/eclipse-SDK-${platform_major}.${platform_minor}-linux-gtk-x86_64.tar.gz"; - hash = "sha512-IVSdZI4QnMtj7HdWAXATeJSQt950qNkiSL7n/+f9bPioCA2NtNbDUlBBxnownMKnr+C+iJH2phzPabT9Ar6plA=="; + hash = "sha512-1wjKNBl6A2XENRVZNtDelPSMAYtc4wRXdQ4CJX/1YcFUPEzbPsX7plO2uJXmDpZcjw3wkQNxqy4bmZF6YnXy/Q=="; }; }; @@ -100,7 +100,7 @@ in rec { src = fetchurl { url = "https://www.eclipse.org/downloads/download.php?r=1&nf=1&file=/technology/epp/downloads/release/${year}-${month}/R/eclipse-java-${year}-${month}-R-linux-gtk-x86_64.tar.gz"; - hash = "sha512-ace+zpz5tjLA89gHLyBrjldKU7+kb85uJX4y4IQdVkrskrA+uCv0z9lzB/qbgrH51ZFN2xz04z1nFLJd09WacA=="; + hash = "sha512-UejE0pzgwBYpmNbdGEegMM5iEOMYP+VvebU17YQeJUzh/qYr0B6sfXwJ+cdTCavKCNGLMMDenJMYk9V/6DSZHw=="; }; }; @@ -112,7 +112,7 @@ in rec { src = fetchurl { url = "https://www.eclipse.org/downloads/download.php?r=1&nf=1&file=/technology/epp/downloads/release/${year}-${month}/R/eclipse-jee-${year}-${month}-R-linux-gtk-x86_64.tar.gz"; - hash = "sha512-Xo1dk8+BLUoUVrnMm9XC+IBzoS9bKde2waRaYxjCRBOykUiZ4npGgquh3bEbsk1GZ3cKlwuxLxr9Y9+RGw3UTA=="; + hash = "sha512-9E0Zwv64qRwVdPouhmIYT6SkbTkd3zLnfkHduHy2VXvmqW7xaOfmplvxpr+V1RDpnfDfw4RouU+WQdhFqBqcWg=="; }; }; @@ -124,7 +124,7 @@ in rec { src = fetchurl { url = "https://www.eclipse.org/downloads/download.php?r=1&nf=1&file=/technology/epp/downloads/release/${year}-${month}/R/eclipse-committers-${year}-${month}-R-linux-gtk-x86_64.tar.gz"; - hash = "sha512-rkjLwexI352G8CYkaF/1dl26wF58IuPMan76gR/3Fx/CMywtv25Tueu8NWZGkHd6Zwdpv/h25D8fu9tbM2NExg=="; + hash = "sha512-V7GmvqQVZnTkkhKmuGyMiZlFlRpFbXM7r6w9yS0FxBOHNHIzkX4pJ6sgn+ww1lvwsdPqBFYtbWUiuKo73eTKzg=="; }; }; @@ -136,7 +136,7 @@ in rec { src = fetchurl { url = "https://www.eclipse.org/downloads/download.php?r=1&nf=1&file=/technology/epp/downloads/release/${year}-${month}/R/eclipse-rcp-${year}-${month}-R-linux-gtk-x86_64.tar.gz"; - hash = "sha256-8FaVTzjvtT17pYUYfKJgVd55nd2ngrsLY+7AJnXu/BI="; + hash = "sha256-8qQWwUiNemJLTAncZwO14fBfr7kTmmXPSeqBLfV8wTw="; }; }; diff --git a/pkgs/applications/editors/gnome-builder/default.nix b/pkgs/applications/editors/gnome-builder/default.nix index 7cfde3a91f3..54625d75e5c 100644 --- a/pkgs/applications/editors/gnome-builder/default.nix +++ b/pkgs/applications/editors/gnome-builder/default.nix @@ -2,92 +2,113 @@ , lib , ctags , cmark -, appstream-glib , desktop-file-utils +, editorconfig-core-c , fetchurl +, fetchpatch , flatpak , gnome , libgit2-glib , gi-docgen , gobject-introspection -, glade -, gspell -, gtk3 -, gtksourceview4 +, enchant +, icu +, gtk4 +, gtksourceview5 , json-glib , jsonrpc-glib -, libdazzle -, libhandy +, libadwaita +, libpanel , libpeas -, libportal-gtk3 +, libportal-gtk4 , libxml2 , meson , ninja , ostree -, pcre +, d-spy , pcre2 , pkg-config , python3 , sysprof , template-glib , vala -, vte -, webkitgtk -, wrapGAppsHook +, vte-gtk4 +, webkitgtk_5_0 +, wrapGAppsHook4 , dbus , xvfb-run }: stdenv.mkDerivation rec { pname = "gnome-builder"; - version = "42.1"; + version = "43.2"; outputs = [ "out" "devdoc" ]; src = fetchurl { url = "mirror://gnome/sources/${pname}/${lib.versions.major version}/${pname}-${version}.tar.xz"; - sha256 = "XU1RtwKGW0gBcgHwxgfiSifXIDGo9ciNT86HW1VFZwo="; + sha256 = "dzIhF6ERsnR7zOitYFeKZ5wgIeSGkRz29OY0FjKKuzM="; }; + patches = [ + # The test environment hardcodes `GI_TYPELIB_PATH` environment variable to direct dependencies of libide & co. + # https://gitlab.gnome.org/GNOME/gnome-builder/-/commit/2ce510b0ec0518c29427a29b386bb2ac1a121edf + # https://gitlab.gnome.org/GNOME/gnome-builder/-/commit/2964f7c2a0729f2f456cdca29a0f5b7525baf7c1 + # + # But Nix does not have a fallback path for typelibs like /usr/lib on FHS distros and relies solely + # on `GI_TYPELIB_PATH` environment variable. So, when Ide started to depend on Vte, which + # depends on Pango, among others, GIrepository was unable to find these indirect dependencies + # and crashed with: + # + # Typelib file for namespace 'Pango', version '1.0' not found (g-irepository-error-quark, 0) + ./fix-finding-test-typelibs.patch + ]; + nativeBuildInputs = [ - appstream-glib desktop-file-utils - gi-docgen + (gi-docgen.overrideAttrs (attrs: { + patches = attrs.patches ++ [ + (fetchpatch { + url = "https://gitlab.gnome.org/GNOME/gi-docgen/-/commit/f4ff4787cce962b705fb2588b31f2988c5063c13.patch"; + sha256 = "11VGFFb2PLVxnX/qUQdLPLfhGQWx4sf4apBP7R2JWjA="; + }) + ]; + })) gobject-introspection meson ninja pkg-config python3 python3.pkgs.wrapPython - wrapGAppsHook + wrapGAppsHook4 ]; buildInputs = [ ctags cmark + editorconfig-core-c flatpak - gnome.devhelp - glade libgit2-glib libpeas - libportal-gtk3 - vte - gspell - gtk3 - gtksourceview4 + libportal-gtk4 + vte-gtk4 + enchant + icu + gtk4 + gtksourceview5 json-glib jsonrpc-glib - libdazzle - libhandy + libadwaita + libpanel libxml2 ostree - pcre + d-spy pcre2 python3 sysprof template-glib vala - webkitgtk + webkitgtk_5_0 ]; checkInputs = [ @@ -110,6 +131,8 @@ stdenv.mkDerivation rec { postPatch = '' patchShebangs build-aux/meson/post_install.py + substituteInPlace build-aux/meson/post_install.py \ + --replace "gtk-update-icon-cache" "gtk4-update-icon-cache" ''; checkPhase = '' diff --git a/pkgs/applications/editors/gnome-builder/fix-finding-test-typelibs.patch b/pkgs/applications/editors/gnome-builder/fix-finding-test-typelibs.patch new file mode 100644 index 00000000000..1c6c663c69a --- /dev/null +++ b/pkgs/applications/editors/gnome-builder/fix-finding-test-typelibs.patch @@ -0,0 +1,13 @@ +diff --git a/src/meson.build b/src/meson.build +index c9a44e418..cd9e466d6 100644 +--- a/src/meson.build ++++ b/src/meson.build +@@ -35,7 +35,7 @@ foreach test_typelib_dep: test_typelib_deps + test_gi_typelib_path += [join_paths(test_typelib_dep.get_variable('libdir'), 'girepository-1.0')] + endforeach + test_env = [ +- 'GI_TYPELIB_PATH=@0@'.format(':'.join(test_gi_typelib_path)), ++ 'GI_TYPELIB_PATH=@0@:@1@'.format(':'.join(test_gi_typelib_path), run_command('sh', ['-c', 'echo "$GI_TYPELIB_PATH"']).stdout().strip()), + 'G_TEST_SRCDIR=@0@/tests'.format(meson.current_source_dir()), + 'G_TEST_BUILDDIR=@0@/tests'.format(meson.current_build_dir()), + 'G_DEBUG=gc-friendly', diff --git a/pkgs/applications/editors/gnome-latex/default.nix b/pkgs/applications/editors/gnome-latex/default.nix index fe8666fd741..3a4760265d1 100644 --- a/pkgs/applications/editors/gnome-latex/default.nix +++ b/pkgs/applications/editors/gnome-latex/default.nix @@ -15,18 +15,18 @@ , gnome , glib , pkg-config -, intltool +, gettext , itstool , libxml2 }: stdenv.mkDerivation rec { - version = "3.40.0"; + version = "3.41.2"; pname = "gnome-latex"; src = fetchurl { url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "xad/55vUDjeOooyPRaZjJ/vIzFw7W48PCcAhfufMCpA="; + sha256 = "8xDwoUUEmfDP92y5+cXWaZGpUGH6s9bmcMSlZHOF1jM="; }; nativeBuildInputs = [ @@ -37,7 +37,7 @@ stdenv.mkDerivation rec { gobject-introspection wrapGAppsHook itstool - intltool + gettext ]; buildInputs = [ diff --git a/pkgs/applications/editors/jetbrains/default.nix b/pkgs/applications/editors/jetbrains/default.nix index 47dabbf0cbb..b2713def5bb 100644 --- a/pkgs/applications/editors/jetbrains/default.nix +++ b/pkgs/applications/editors/jetbrains/default.nix @@ -86,6 +86,22 @@ let }; }); + buildGateway = { pname, version, src, license, description, wmClass, ... }: + (mkJetBrainsProduct { + inherit pname version src wmClass jdk; + product = "Gateway"; + meta = with lib; { + homepage = "https://www.jetbrains.com/remote-development/gateway/"; + inherit description license platforms; + longDescription = '' + JetBrains Gateway is a lightweight launcher that connects a remote + server with your local machine, downloads necessary components on the + backend, and opens your project in JetBrains Client. + ''; + maintainers = with maintainers; [ kouyk ]; + }; + }); + buildGoland = { pname, version, src, license, description, wmClass, ... }: (mkJetBrainsProduct { inherit pname version src wmClass jdk; @@ -301,6 +317,19 @@ in update-channel = products.datagrip.update-channel; }; + gateway = buildGateway rec { + pname = "gateway"; + version = products.gateway.version; + description = "Your single entry point to all remote development environments"; + license = lib.licenses.unfree; + src = fetchurl { + url = products.gateway.url; + sha256 = products.gateway.sha256; + }; + wmClass = "jetbrains-gateway"; + update-channel = products.gateway.update-channel; + }; + goland = buildGoland rec { pname = "goland"; version = products.goland.version; diff --git a/pkgs/applications/editors/jetbrains/linux.nix b/pkgs/applications/editors/jetbrains/linux.nix index 3f77f3fae5b..fde3e52632e 100644 --- a/pkgs/applications/editors/jetbrains/linux.nix +++ b/pkgs/applications/editors/jetbrains/linux.nix @@ -80,6 +80,7 @@ with stdenv; lib.makeOverridable mkDerivation (rec { --set-default JDK_HOME "$jdk" \ --set-default ANDROID_JAVA_HOME "$jdk" \ --set-default JAVA_HOME "$jdk" \ + --set-default JETBRAINSCLIENT_JDK "$jdk" \ --set ${hiName}_JDK "$jdk" \ --set ${hiName}_VM_OPTIONS ${vmoptsFile} diff --git a/pkgs/applications/editors/jetbrains/versions.json b/pkgs/applications/editors/jetbrains/versions.json index 19fefe9ad6a..5505c0c61c8 100644 --- a/pkgs/applications/editors/jetbrains/versions.json +++ b/pkgs/applications/editors/jetbrains/versions.json @@ -3,47 +3,56 @@ "clion": { "update-channel": "CLion RELEASE", "url-template": "https://download.jetbrains.com/cpp/CLion-{version}.tar.gz", - "version": "2022.2.1", - "sha256": "a0d9e77ad4afbb5f7d69e23cf84ccf132eed6ead6c3a7cd442b33924e6931656", - "url": "https://download.jetbrains.com/cpp/CLion-2022.2.1.tar.gz", + "version": "2022.2.3", + "sha256": "e0338107115231c4b354870dfcf537ba6ad1741a0d310e4e50c48dfc24ff9cce", + "url": "https://download.jetbrains.com/cpp/CLion-2022.2.3.tar.gz", "version-major-minor": "2022.1", - "build_number": "222.3739.54" + "build_number": "222.4167.35" }, "datagrip": { "update-channel": "DataGrip RELEASE", "url-template": "https://download.jetbrains.com/datagrip/datagrip-{version}.tar.gz", - "version": "2022.2.1", - "sha256": "4015bfa478f7ee33914975b530f13930bc32eff86223e9256f2610497f95825f", - "url": "https://download.jetbrains.com/datagrip/datagrip-2022.2.1.tar.gz", + "version": "2022.2.5", + "sha256": "55b28f3b79eda126fe778e2945804d50b1145503737f1b5e25ab6ae2d2a0e3ae", + "url": "https://download.jetbrains.com/datagrip/datagrip-2022.2.5.tar.gz", "version-major-minor": "2022.1.1", - "build_number": "222.3345.126" + "build_number": "222.4345.5" + }, + "gateway": { + "update-channel": "Gateway EAP", + "url-template": "https://download.jetbrains.com/idea/gateway/JetBrainsGateway-{version}.tar.gz", + "version": "2022.3 EAP", + "sha256": "4868baed9350065c1db760f07a09badd1473132af640cc19330e20c8a0940d7d", + "url": "https://download.jetbrains.com/idea/gateway/JetBrainsGateway-223.6646.21.tar.gz", + "version-major-minor": "2022.3", + "build_number": "223.6646.21" }, "goland": { "update-channel": "GoLand RELEASE", "url-template": "https://download.jetbrains.com/go/goland-{version}.tar.gz", - "version": "2022.2.2", - "sha256": "c3cfc300f55adc3a52528d13a1133bffd2aa7c2d20ea301cd20e3aff52d87609", - "url": "https://download.jetbrains.com/go/goland-2022.2.2.tar.gz", + "version": "2022.2.3", + "sha256": "fda47d9939b95d8995d1a375443025599cd74b1b5a2966273477ecfafa9ce4f1", + "url": "https://download.jetbrains.com/go/goland-2022.2.3.tar.gz", "version-major-minor": "2022.1", - "build_number": "222.3739.57" + "build_number": "222.4167.25" }, "idea-community": { "update-channel": "IntelliJ IDEA RELEASE", "url-template": "https://download.jetbrains.com/idea/ideaIC-{version}.tar.gz", - "version": "2022.2.1", - "sha256": "93eb9391a898aad164ca47965e0445cbf0f04d7062b6875c4e4a3136799ee6cf", - "url": "https://download.jetbrains.com/idea/ideaIC-2022.2.1.tar.gz", + "version": "2022.2.3", + "sha256": "4ba5faafad48d58db5099fae080ae2238086d3d9803080082de8efe35d8bf4ed", + "url": "https://download.jetbrains.com/idea/ideaIC-2022.2.3.tar.gz", "version-major-minor": "2022.1", - "build_number": "222.3739.54" + "build_number": "222.4345.14" }, "idea-ultimate": { "update-channel": "IntelliJ IDEA RELEASE", "url-template": "https://download.jetbrains.com/idea/ideaIU-{version}-no-jbr.tar.gz", - "version": "2022.2.1", - "sha256": "43eee4b9ea9aed7601252823689e7232b39829784a9bab5e8b5462f55eecc83a", - "url": "https://download.jetbrains.com/idea/ideaIU-2022.2.1-no-jbr.tar.gz", + "version": "2022.2.3", + "sha256": "7454d7e0b8f4e3d8d805dde645d28b842101bd77aea8b29125880c592e6b8c85", + "url": "https://download.jetbrains.com/idea/ideaIU-2022.2.3-no-jbr.tar.gz", "version-major-minor": "2022.1", - "build_number": "222.3739.54" + "build_number": "222.4345.14" }, "mps": { "update-channel": "MPS RELEASE", @@ -57,103 +66,112 @@ "phpstorm": { "update-channel": "PhpStorm RELEASE", "url-template": "https://download.jetbrains.com/webide/PhpStorm-{version}.tar.gz", - "version": "2022.2.1", - "sha256": "dc463578e879f958cae3c5fc775170dd0a6a89347c02aa087126f03cc7a63f79", - "url": "https://download.jetbrains.com/webide/PhpStorm-2022.2.1.tar.gz", + "version": "2022.2.3", + "sha256": "2376cd043bb941524df62db40f9125b1c693be11df80a41fd5b3dd9dcd3446e9", + "url": "https://download.jetbrains.com/webide/PhpStorm-2022.2.3.tar.gz", "version-major-minor": "2022.1", - "build_number": "222.3739.61" + "build_number": "222.4345.15" }, "pycharm-community": { "update-channel": "PyCharm RELEASE", "url-template": "https://download.jetbrains.com/python/pycharm-community-{version}.tar.gz", - "version": "2022.2.1", - "sha256": "fc91b134b6899a09ce8cbdc1ebdbdcfe1c1ffb6dbe756b30b24d7ad131bf27c8", - "url": "https://download.jetbrains.com/python/pycharm-community-2022.2.1.tar.gz", + "version": "2022.2.2", + "sha256": "2f361c5f59c685c9f8d1385029ed753eabe5b688a82acef6e83a50f0d2b9d7a8", + "url": "https://download.jetbrains.com/python/pycharm-community-2022.2.2.tar.gz", "version-major-minor": "2022.1", - "build_number": "222.3739.56" + "build_number": "222.4167.33" }, "pycharm-professional": { "update-channel": "PyCharm RELEASE", "url-template": "https://download.jetbrains.com/python/pycharm-professional-{version}.tar.gz", - "version": "2022.2.1", - "sha256": "a23ffa7b617ab27d3c8abb0689b4d03b5370534193152cd4cfe4196c7d150751", - "url": "https://download.jetbrains.com/python/pycharm-professional-2022.2.1.tar.gz", + "version": "2022.2.2", + "sha256": "b7bfb86026fba669bb22429ab0840afba5047680202762070cfbb1f181d53d0e", + "url": "https://download.jetbrains.com/python/pycharm-professional-2022.2.2.tar.gz", "version-major-minor": "2022.1", - "build_number": "222.3739.56" + "build_number": "222.4167.33" }, "rider": { "update-channel": "Rider RELEASE", "url-template": "https://download.jetbrains.com/rider/JetBrains.Rider-{version}.tar.gz", - "version": "2022.2.1", - "sha256": "3f61c5fbdf46b94a5cb772ad51dda5a9cad8a9c7ad78dbcacf01daa2226a5633", - "url": "https://download.jetbrains.com/rider/JetBrains.Rider-2022.2.1.tar.gz", + "version": "2022.2.3", + "sha256": "2fdff8616fd1574a0ef7baaed855aa39a1254ea164b74d1b4dda11241e58ab2d", + "url": "https://download.jetbrains.com/rider/JetBrains.Rider-2022.2.3.tar.gz", "version-major-minor": "2022.1", - "build_number": "222.3739.37" + "build_number": "222.4167.23" }, "ruby-mine": { "update-channel": "RubyMine RELEASE", "url-template": "https://download.jetbrains.com/ruby/RubyMine-{version}.tar.gz", - "version": "2022.2", - "sha256": "4300570552fb94932fe4311b6f8c7a071296e0c0c84246039f26f1b37dda9f0a", - "url": "https://download.jetbrains.com/ruby/RubyMine-2022.2.tar.gz", + "version": "2022.2.3", + "sha256": "a8c3412db30ab7bd8b8601b0a50c95dc48a412391f1c33df27c47cf5d2204257", + "url": "https://download.jetbrains.com/ruby/RubyMine-2022.2.3.tar.gz", "version-major-minor": "2022.1", - "build_number": "222.3345.111" + "build_number": "222.4345.14" }, "webstorm": { "update-channel": "WebStorm RELEASE", "url-template": "https://download.jetbrains.com/webstorm/WebStorm-{version}.tar.gz", - "version": "2022.2.1", - "sha256": "508fe7272dd049875d848b52a2908e4d228ce576d4dde5f56f51a8c346b12a2c", - "url": "https://download.jetbrains.com/webstorm/WebStorm-2022.2.1.tar.gz", + "version": "2022.2.3", + "sha256": "1d7d464bbcb83d5af48359aeda6aa7d165038bfaa1f26fef1019761eb278fa22", + "url": "https://download.jetbrains.com/webstorm/WebStorm-2022.2.3.tar.gz", "version-major-minor": "2022.1", - "build_number": "222.3739.57" + "build_number": "222.4345.14" } }, "x86_64-darwin": { "clion": { "update-channel": "CLion RELEASE", "url-template": "https://download.jetbrains.com/cpp/CLion-{version}.dmg", - "version": "2022.2.1", - "sha256": "ba2a8fcf9a1f080ca6b2ef832b13104c440077b9e6a2bb6e26bc97bdea373208", - "url": "https://download.jetbrains.com/cpp/CLion-2022.2.1.dmg", + "version": "2022.2.3", + "sha256": "d7e0dcbb3c28f383d1365f5cb6d2b55afbb8c638fd9f100b8040f72b394a1aed", + "url": "https://download.jetbrains.com/cpp/CLion-2022.2.3.dmg", "version-major-minor": "2022.1", - "build_number": "222.3739.54" + "build_number": "222.4167.35" }, "datagrip": { "update-channel": "DataGrip RELEASE", "url-template": "https://download.jetbrains.com/datagrip/datagrip-{version}.dmg", - "version": "2022.2.1", - "sha256": "7cd7bcdc7588a88459dcda5bab0e7c97751b8d7a87a37c5af8e08072fc9beb03", - "url": "https://download.jetbrains.com/datagrip/datagrip-2022.2.1.dmg", + "version": "2022.2.5", + "sha256": "cdf0302b0ab65d3dfce4e48004ef45873c9912c844d2e3c82bfe19de2b11cfda", + "url": "https://download.jetbrains.com/datagrip/datagrip-2022.2.5.dmg", "version-major-minor": "2022.1.1", - "build_number": "222.3345.126" + "build_number": "222.4345.5" + }, + "gateway": { + "update-channel": "Gateway EAP", + "url-template": "https://download.jetbrains.com/idea/gateway/JetBrainsGateway-{version}.dmg", + "version": "2022.3 EAP", + "sha256": "2db71a052501db41d5cfe142f1a6e3178fe02830f0da127d00fbf93a4629c61b", + "url": "https://download.jetbrains.com/idea/gateway/JetBrainsGateway-223.6646.21.dmg", + "version-major-minor": "2022.3", + "build_number": "223.6646.21" }, "goland": { "update-channel": "GoLand RELEASE", "url-template": "https://download.jetbrains.com/go/goland-{version}.dmg", - "version": "2022.2.2", - "sha256": "e11f07aebf849ed942c4b8658c11c70ce81b4138186a0301c0ec7cd236f1ff51", - "url": "https://download.jetbrains.com/go/goland-2022.2.2.dmg", + "version": "2022.2.3", + "sha256": "f2e9f2455cf2e13f3b7ed28c18507aa758742c533cb1c07a1ebe62172a939b47", + "url": "https://download.jetbrains.com/go/goland-2022.2.3.dmg", "version-major-minor": "2022.1", - "build_number": "222.3739.57" + "build_number": "222.4167.25" }, "idea-community": { "update-channel": "IntelliJ IDEA RELEASE", "url-template": "https://download.jetbrains.com/idea/ideaIC-{version}.dmg", - "version": "2022.2.1", - "sha256": "9c1402f8682ecefe84ae9494c65b80da1b763664624a7f6b0104b044b4cb687a", - "url": "https://download.jetbrains.com/idea/ideaIC-2022.2.1.dmg", + "version": "2022.2.3", + "sha256": "6ec3721d9961918a14630eaf068765eeba97e71baecd95ec67510dc25c8bd1b1", + "url": "https://download.jetbrains.com/idea/ideaIC-2022.2.3.dmg", "version-major-minor": "2022.1", - "build_number": "222.3739.54" + "build_number": "222.4345.14" }, "idea-ultimate": { "update-channel": "IntelliJ IDEA RELEASE", "url-template": "https://download.jetbrains.com/idea/ideaIU-{version}.dmg", - "version": "2022.2.1", - "sha256": "e54a026da11d05d9bb0172f4ef936ba2366f985b5424e7eecf9e9341804d65bf", - "url": "https://download.jetbrains.com/idea/ideaIU-2022.2.1.dmg", + "version": "2022.2.3", + "sha256": "df780c841398532e090adc2c6af35a7fbcdd29fddb37e5a68f33d61a9032d5a3", + "url": "https://download.jetbrains.com/idea/ideaIU-2022.2.3.dmg", "version-major-minor": "2022.1", - "build_number": "222.3739.54" + "build_number": "222.4345.14" }, "mps": { "update-channel": "MPS RELEASE", @@ -167,103 +185,112 @@ "phpstorm": { "update-channel": "PhpStorm RELEASE", "url-template": "https://download.jetbrains.com/webide/PhpStorm-{version}.dmg", - "version": "2022.2.1", - "sha256": "ba9cc863c2247e6404b015fac085e8b3427b29aba3d7cb07940840f7c5e3b647", - "url": "https://download.jetbrains.com/webide/PhpStorm-2022.2.1.dmg", + "version": "2022.2.3", + "sha256": "8dbe5cd8e31c7f6bc6795db6946e2430c82f0aa2c13e7805c40733428b02241d", + "url": "https://download.jetbrains.com/webide/PhpStorm-2022.2.3.dmg", "version-major-minor": "2022.1", - "build_number": "222.3739.61" + "build_number": "222.4345.15" }, "pycharm-community": { "update-channel": "PyCharm RELEASE", "url-template": "https://download.jetbrains.com/python/pycharm-community-{version}.dmg", - "version": "2022.2.1", - "sha256": "8c2b322cab74cbf52dbe33e0fd9be63fe320d1ade2446790c4eec7309b590eea", - "url": "https://download.jetbrains.com/python/pycharm-community-2022.2.1.dmg", + "version": "2022.2.2", + "sha256": "a7fbc83ea01e96c79a75fd061669fa0156b770e92c1153a03681fb67ee4a59ea", + "url": "https://download.jetbrains.com/python/pycharm-community-2022.2.2.dmg", "version-major-minor": "2022.1", - "build_number": "222.3739.56" + "build_number": "222.4167.33" }, "pycharm-professional": { "update-channel": "PyCharm RELEASE", "url-template": "https://download.jetbrains.com/python/pycharm-professional-{version}.dmg", - "version": "2022.2.1", - "sha256": "6636139dc9c0e28b90517e91d1c1924e218b5d33d9418cca888b05c11fbf54d9", - "url": "https://download.jetbrains.com/python/pycharm-professional-2022.2.1.dmg", + "version": "2022.2.2", + "sha256": "9b2f5841fa5741881600fbf3b0d5686f2593a6771bb70454d4cb0cc3acd1e43a", + "url": "https://download.jetbrains.com/python/pycharm-professional-2022.2.2.dmg", "version-major-minor": "2022.1", - "build_number": "222.3739.56" + "build_number": "222.4167.33" }, "rider": { "update-channel": "Rider RELEASE", "url-template": "https://download.jetbrains.com/rider/JetBrains.Rider-{version}.dmg", - "version": "2022.2.1", - "sha256": "13cdaa0f83e645a0a08bc3dd05522441e591b247af853b22c8ca5bbce047a125", - "url": "https://download.jetbrains.com/rider/JetBrains.Rider-2022.2.1.dmg", + "version": "2022.2.3", + "sha256": "aa02c2c621d356486a0b698a45d773f5830ff4ef431940059f82e8d3c17a2335", + "url": "https://download.jetbrains.com/rider/JetBrains.Rider-2022.2.3.dmg", "version-major-minor": "2022.1", - "build_number": "222.3739.37" + "build_number": "222.4167.23" }, "ruby-mine": { "update-channel": "RubyMine RELEASE", "url-template": "https://download.jetbrains.com/ruby/RubyMine-{version}.dmg", - "version": "2022.2", - "sha256": "d806254af68425089d40a7a302ce10c87283a25399e7b667e8d261b3958f4fbb", - "url": "https://download.jetbrains.com/ruby/RubyMine-2022.2.dmg", + "version": "2022.2.3", + "sha256": "a04700159fcf3bfed74d196edc4c1150e5906dc4730d06ffd017b6bbb9bc853b", + "url": "https://download.jetbrains.com/ruby/RubyMine-2022.2.3.dmg", "version-major-minor": "2022.1", - "build_number": "222.3345.111" + "build_number": "222.4345.14" }, "webstorm": { "update-channel": "WebStorm RELEASE", "url-template": "https://download.jetbrains.com/webstorm/WebStorm-{version}.dmg", - "version": "2022.2.1", - "sha256": "7d57692ce83dd6c853c80c457bdb8239dd833cf5535c600154a7ebc0be18a05d", - "url": "https://download.jetbrains.com/webstorm/WebStorm-2022.2.1.dmg", + "version": "2022.2.3", + "sha256": "e6532a9a840c3508cdf26511200fbba34ec9a275154d717538019f72ebc5fc51", + "url": "https://download.jetbrains.com/webstorm/WebStorm-2022.2.3.dmg", "version-major-minor": "2022.1", - "build_number": "222.3739.57" + "build_number": "222.4345.14" } }, "aarch64-darwin": { "clion": { "update-channel": "CLion RELEASE", "url-template": "https://download.jetbrains.com/cpp/CLion-{version}-aarch64.dmg", - "version": "2022.2.1", - "sha256": "af36f7f9a98881d37d89757083875494c472e60d14bd70fe0d08533d284dd4e1", - "url": "https://download.jetbrains.com/cpp/CLion-2022.2.1-aarch64.dmg", + "version": "2022.2.3", + "sha256": "d921c83ee6b444520e7fdb9fdae4ec0e67cea6dfcaa720e6b36d85c17a4df39c", + "url": "https://download.jetbrains.com/cpp/CLion-2022.2.3-aarch64.dmg", "version-major-minor": "2022.1", - "build_number": "222.3739.54" + "build_number": "222.4167.35" }, "datagrip": { "update-channel": "DataGrip RELEASE", "url-template": "https://download.jetbrains.com/datagrip/datagrip-{version}-aarch64.dmg", - "version": "2022.2.1", - "sha256": "01d8de1225fb4a74f22752edf74038405f02d27565f01816d8e751d7989a75bb", - "url": "https://download.jetbrains.com/datagrip/datagrip-2022.2.1-aarch64.dmg", + "version": "2022.2.5", + "sha256": "8ff78e440e4753adc8dbd4ee408fde114f7d9c65ee780f012b917498b63993ee", + "url": "https://download.jetbrains.com/datagrip/datagrip-2022.2.5-aarch64.dmg", "version-major-minor": "2022.1.1", - "build_number": "222.3345.126" + "build_number": "222.4345.5" + }, + "gateway": { + "update-channel": "Gateway EAP", + "url-template": "https://download.jetbrains.com/idea/gateway/JetBrainsGateway-{version}-aarch64.dmg", + "version": "2022.3 EAP", + "sha256": "513d3a271c5ff20fdc5c22f6e28eb21cfbb283d01ade2d11f33bb7eb79317410", + "url": "https://download.jetbrains.com/idea/gateway/JetBrainsGateway-223.6646.21-aarch64.dmg", + "version-major-minor": "2022.3", + "build_number": "223.6646.21" }, "goland": { "update-channel": "GoLand RELEASE", "url-template": "https://download.jetbrains.com/go/goland-{version}-aarch64.dmg", - "version": "2022.2.2", - "sha256": "7098f05847c0524bc90b00766c71c2f1cc1442983da956c79ee1445b48da73fd", - "url": "https://download.jetbrains.com/go/goland-2022.2.2-aarch64.dmg", + "version": "2022.2.3", + "sha256": "c3c790a45b36af006f743a70fb114782a9c4a2076d025de65894d0f39b0f48a5", + "url": "https://download.jetbrains.com/go/goland-2022.2.3-aarch64.dmg", "version-major-minor": "2022.1", - "build_number": "222.3739.57" + "build_number": "222.4167.25" }, "idea-community": { "update-channel": "IntelliJ IDEA RELEASE", "url-template": "https://download.jetbrains.com/idea/ideaIC-{version}-aarch64.dmg", - "version": "2022.2.1", - "sha256": "4bf843152fe009838dbb5e5a1d8e39ebf98df5f6771254cf1f26ff0b299798fd", - "url": "https://download.jetbrains.com/idea/ideaIC-2022.2.1-aarch64.dmg", + "version": "2022.2.3", + "sha256": "333c70caf452034ae332cdded4d24a71592049b4045725eb57826a0b997d1c7a", + "url": "https://download.jetbrains.com/idea/ideaIC-2022.2.3-aarch64.dmg", "version-major-minor": "2022.1", - "build_number": "222.3739.54" + "build_number": "222.4345.14" }, "idea-ultimate": { "update-channel": "IntelliJ IDEA RELEASE", "url-template": "https://download.jetbrains.com/idea/ideaIU-{version}-aarch64.dmg", - "version": "2022.2.1", - "sha256": "f7b56525adf96d0ac290eebebd08a53b962a799db65942e07cd437aef655fa0e", - "url": "https://download.jetbrains.com/idea/ideaIU-2022.2.1-aarch64.dmg", + "version": "2022.2.3", + "sha256": "9e5c32fffd17d651d8d875c2588a067902a9ebb9bf815d06aabfd75b9f4ee3cd", + "url": "https://download.jetbrains.com/idea/ideaIU-2022.2.3-aarch64.dmg", "version-major-minor": "2022.1", - "build_number": "222.3739.54" + "build_number": "222.4345.14" }, "mps": { "update-channel": "MPS RELEASE", @@ -277,56 +304,56 @@ "phpstorm": { "update-channel": "PhpStorm RELEASE", "url-template": "https://download.jetbrains.com/webide/PhpStorm-{version}-aarch64.dmg", - "version": "2022.2.1", - "sha256": "b553e1f0249b4d7f89cacdac7bada758895cd35aec8ddac5f81017f61ddc44fb", - "url": "https://download.jetbrains.com/webide/PhpStorm-2022.2.1-aarch64.dmg", + "version": "2022.2.3", + "sha256": "0dee8fe654cccdafa73b65da1a2ef844401a9438ecee726fe6f6af1f09d07c38", + "url": "https://download.jetbrains.com/webide/PhpStorm-2022.2.3-aarch64.dmg", "version-major-minor": "2022.1", - "build_number": "222.3739.61" + "build_number": "222.4345.15" }, "pycharm-community": { "update-channel": "PyCharm RELEASE", "url-template": "https://download.jetbrains.com/python/pycharm-community-{version}-aarch64.dmg", - "version": "2022.2.1", - "sha256": "c3abc618614be830dbf41479b74ae489aa44290d9bbb11e3c4d2cdffb4d569b6", - "url": "https://download.jetbrains.com/python/pycharm-community-2022.2.1-aarch64.dmg", + "version": "2022.2.2", + "sha256": "8a6f1440cfc9aa47a89a8dda7d19bf50c9790fc12153f97d11e975327703d6e0", + "url": "https://download.jetbrains.com/python/pycharm-community-2022.2.2-aarch64.dmg", "version-major-minor": "2022.1", - "build_number": "222.3739.56" + "build_number": "222.4167.33" }, "pycharm-professional": { "update-channel": "PyCharm RELEASE", "url-template": "https://download.jetbrains.com/python/pycharm-professional-{version}-aarch64.dmg", - "version": "2022.2.1", - "sha256": "416ca961042b9c3ae8b23039cc3b84b64e941c1d82478bca3e327089efa4f4d2", - "url": "https://download.jetbrains.com/python/pycharm-professional-2022.2.1-aarch64.dmg", + "version": "2022.2.2", + "sha256": "30915c13c4ba2907f083dfa092bc3734e98a4ab83e2180221e52b9b04a93a1e2", + "url": "https://download.jetbrains.com/python/pycharm-professional-2022.2.2-aarch64.dmg", "version-major-minor": "2022.1", - "build_number": "222.3739.56" + "build_number": "222.4167.33" }, "rider": { "update-channel": "Rider RELEASE", "url-template": "https://download.jetbrains.com/rider/JetBrains.Rider-{version}-aarch64.dmg", - "version": "2022.2.1", - "sha256": "96e539ba43d7dcecb9e709c1b1483b4c832fbff4b9fd77f6e91b266a91125a55", - "url": "https://download.jetbrains.com/rider/JetBrains.Rider-2022.2.1-aarch64.dmg", + "version": "2022.2.3", + "sha256": "5dd892ed16dd1bc819a97ffb62cdfbb3b60c6019581ba18358afc5c0a39585f5", + "url": "https://download.jetbrains.com/rider/JetBrains.Rider-2022.2.3-aarch64.dmg", "version-major-minor": "2022.1", - "build_number": "222.3739.37" + "build_number": "222.4167.23" }, "ruby-mine": { "update-channel": "RubyMine RELEASE", "url-template": "https://download.jetbrains.com/ruby/RubyMine-{version}-aarch64.dmg", - "version": "2022.2", - "sha256": "c7650443f16ab9cc0b3f6fc701164633bab079f11eeb7aa93b78f2ddc73640a0", - "url": "https://download.jetbrains.com/ruby/RubyMine-2022.2-aarch64.dmg", + "version": "2022.2.3", + "sha256": "cd7a967c2745aca566569a320eb276773638d05fcd25839db18a098803d2c5f4", + "url": "https://download.jetbrains.com/ruby/RubyMine-2022.2.3-aarch64.dmg", "version-major-minor": "2022.1", - "build_number": "222.3345.111" + "build_number": "222.4345.14" }, "webstorm": { "update-channel": "WebStorm RELEASE", "url-template": "https://download.jetbrains.com/webstorm/WebStorm-{version}-aarch64.dmg", - "version": "2022.2.1", - "sha256": "fa790240b0d00cb134bf0e87c6a85d5a749b73b3f577a9564a890e5819926e53", - "url": "https://download.jetbrains.com/webstorm/WebStorm-2022.2.1-aarch64.dmg", + "version": "2022.2.3", + "sha256": "7ffd746e5e33f2d69f7b8c39920f67de149f183a0d372d20f3f6bc4febf2e355", + "url": "https://download.jetbrains.com/webstorm/WebStorm-2022.2.3-aarch64.dmg", "version-major-minor": "2022.1", - "build_number": "222.3739.57" + "build_number": "222.4345.14" } } } diff --git a/pkgs/applications/editors/leafpad/default.nix b/pkgs/applications/editors/leafpad/default.nix index 2f53df97d32..0376e3af6bf 100644 --- a/pkgs/applications/editors/leafpad/default.nix +++ b/pkgs/applications/editors/leafpad/default.nix @@ -8,8 +8,8 @@ stdenv.mkDerivation rec { sha256 = "0b0az2wvqgvam7w0ns1j8xp2llslm1rx6h7zcsy06a7j0yp257cm"; }; - nativeBuildInputs = [ pkg-config ]; - buildInputs = [ intltool gtk2 ]; + nativeBuildInputs = [ pkg-config intltool ]; + buildInputs = [ gtk2 ]; hardeningDisable = [ "format" ]; diff --git a/pkgs/applications/editors/neovim/neovide/default.nix b/pkgs/applications/editors/neovim/neovide/default.nix index 77f0735ec98..3d1aa9cdc57 100644 --- a/pkgs/applications/editors/neovim/neovide/default.nix +++ b/pkgs/applications/editors/neovim/neovide/default.nix @@ -27,6 +27,7 @@ , ApplicationServices , AppKit , Carbon +, removeReferencesTo }: rustPlatform.buildRustPackage rec { pname = "neovide"; @@ -80,6 +81,7 @@ rustPlatform.buildRustPackage rec { python2 # skia-bindings python3 # rust-xcb llvmPackages.clang # skia + removeReferencesTo ] ++ lib.optionals stdenv.isDarwin [ xcbuild ]; # All tests passes but at the end cargo prints for unknown reason: @@ -115,6 +117,10 @@ rustPlatform.buildRustPackage rec { xorg.libXi ] ++ lib.optionals enableWayland [ wayland ]); in '' + # library skia embeds the path to its sources + remove-references-to -t "$SKIA_SOURCE_DIR" \ + $out/bin/neovide + wrapProgram $out/bin/neovide \ --prefix LD_LIBRARY_PATH : ${libPath} ''; @@ -128,6 +134,8 @@ rustPlatform.buildRustPackage rec { install -m444 -Dt $out/share/applications assets/neovide.desktop ''; + disallowedReferences = [ SKIA_SOURCE_DIR ]; + meta = with lib; { description = "This is a simple graphical user interface for Neovim."; homepage = "https://github.com/Kethku/neovide"; diff --git a/pkgs/applications/editors/rehex/default.nix b/pkgs/applications/editors/rehex/default.nix index 52134d15da8..6a67d6df743 100644 --- a/pkgs/applications/editors/rehex/default.nix +++ b/pkgs/applications/editors/rehex/default.nix @@ -3,41 +3,37 @@ , fetchFromGitHub , pkg-config , which +, zip +, libicns , capstone , jansson , libunistring -, lua5_3 , wxGTK31 +, lua53Packages +, perlPackages , Carbon , Cocoa , IOKit -, libicns -, wxmac }: stdenv.mkDerivation rec { pname = "rehex"; - version = "0.4.1"; + version = "0.5.3"; src = fetchFromGitHub { owner = "solemnwarning"; repo = pname; rev = version; - hash = "sha256-NuWWaYABQDaS9wkwmXkBJWHzLFJbUUCiePNQNo4yZrk="; + hash = "sha256-VBHNrOVIz7UM9tY1V7Ykwt4Cv0fY++8gXc2og4sLDk8="; }; - postPatch = '' - # See https://github.com/solemnwarning/rehex/pull/148 - substituteInPlace Makefile.osx \ - --replace '$(filter-out %@2x.png,$(wildcard $(ICONSET)/*.png))' 'res/icon{16,32,128,256,512}.png' - ''; - - nativeBuildInputs = [ pkg-config which ] + nativeBuildInputs = [ pkg-config which zip ] ++ lib.optionals stdenv.isDarwin [ libicns ]; - buildInputs = [ capstone jansson libunistring lua5_3 ] - ++ lib.optionals (!stdenv.isDarwin) [ wxGTK31 ] - ++ lib.optionals stdenv.isDarwin [ Carbon Cocoa IOKit wxmac ]; + buildInputs = [ capstone jansson libunistring wxGTK31 ] + ++ (with lua53Packages; [ lua busted ]) + ++ (with perlPackages; [ perl TemplateToolkit ]) + ++ lib.optionals stdenv.isDarwin [ Carbon Cocoa IOKit ]; makeFlags = [ "prefix=${placeholder "out"}" ] ++ lib.optionals stdenv.isDarwin [ "-f Makefile.osx" ]; @@ -53,7 +49,7 @@ stdenv.mkDerivation rec { homepage = "https://github.com/solemnwarning/rehex"; changelog = "https://github.com/solemnwarning/rehex/raw/${version}/CHANGES.txt"; license = licenses.gpl2Only; - maintainers = with maintainers; [ markus1189 ]; + maintainers = with maintainers; [ markus1189 wegank ]; platforms = platforms.all; }; } diff --git a/pkgs/applications/editors/vim/plugins/generated.nix b/pkgs/applications/editors/vim/plugins/generated.nix index 3ed8976b060..57ea7b9e5fd 100644 --- a/pkgs/applications/editors/vim/plugins/generated.nix +++ b/pkgs/applications/editors/vim/plugins/generated.nix @@ -161,12 +161,12 @@ final: prev: LeaderF = buildVimPluginFrom2Nix { pname = "LeaderF"; - version = "2022-09-15"; + version = "2022-10-10"; src = fetchFromGitHub { owner = "Yggdroot"; repo = "LeaderF"; - rev = "f090cb40eacdce71c406e466d02e3b41c03312c8"; - sha256 = "0ma65874dffpj7sc3skczlxf7gmq1v2lqi5qwqv0hgx6idqdkf1c"; + rev = "b7bf04eaeae846168efd86ef0136394a2d128b72"; + sha256 = "00krndb2crrcvcp8vb60wqz75pjj3121335mykaqhhq0jhc67xw2"; }; meta.homepage = "https://github.com/Yggdroot/LeaderF/"; }; @@ -341,12 +341,12 @@ final: prev: SpaceVim = buildVimPluginFrom2Nix { pname = "SpaceVim"; - version = "2022-10-08"; + version = "2022-10-11"; src = fetchFromGitHub { owner = "SpaceVim"; repo = "SpaceVim"; - rev = "cd193b852d51dc70200fbf8f7d92f174735ee657"; - sha256 = "0syimr7v6a87fq9zvxkh8xc38102y04jm8z0g53inayamp64vz2p"; + rev = "1ed769feb2a13061be69563cc42d686ac44fc441"; + sha256 = "0naxqvxm8dwi7hbphbl04kaphhxpq1x2f3n9whdhj7rbnq7m6r9h"; }; meta.homepage = "https://github.com/SpaceVim/SpaceVim/"; }; @@ -942,12 +942,12 @@ final: prev: bullets-vim = buildVimPluginFrom2Nix { pname = "bullets.vim"; - version = "2022-10-08"; + version = "2022-10-10"; src = fetchFromGitHub { owner = "dkarter"; repo = "bullets.vim"; - rev = "bb2b9f3cae530fcc9e70055243cbbdda4daa497e"; - sha256 = "1k9ynbkiag6b42zaqk7vyq2l376g5p7j8hn5xmjnmxzra1s68yx4"; + rev = "746f92ae05cdcc988857d8e76418326f07af9494"; + sha256 = "0zdfri31h1iv3jjw2yqkqqfd07cdk7ymyrl5n03khwh192dawd5r"; }; meta.homepage = "https://github.com/dkarter/bullets.vim/"; }; @@ -990,12 +990,12 @@ final: prev: ccc-nvim = buildVimPluginFrom2Nix { pname = "ccc.nvim"; - version = "2022-10-07"; + version = "2022-10-10"; src = fetchFromGitHub { owner = "uga-rosa"; repo = "ccc.nvim"; - rev = "666a406659fadd22a9c2b0fb1fed432f4529e7f1"; - sha256 = "1cdkws7k3b55ahbhfhnqv4f47jm20n6cfgrr5yrfmplqvl2az70h"; + rev = "e74e0ebf3fac929c81fb9d918228ef03afc8d470"; + sha256 = "1abpkiry3ffmwj51yldiaw3ix1scr6jjx714am1d4wz7kbl4228g"; }; meta.homepage = "https://github.com/uga-rosa/ccc.nvim/"; }; @@ -1506,12 +1506,12 @@ final: prev: cmp-spell = buildVimPluginFrom2Nix { pname = "cmp-spell"; - version = "2022-10-03"; + version = "2022-10-10"; src = fetchFromGitHub { owner = "f3fora"; repo = "cmp-spell"; - rev = "5c32dd5c23ec31e88ed28c74231eec0c55dc8307"; - sha256 = "1w0658jgn5v1018by1912dpnxa6y25pv929awaimgzd3wlsfm89p"; + rev = "60584cb75e5e8bba5a0c9e4c3ab0791e0698bffa"; + sha256 = "1lzv8wbq1w45pbig7lcgyj46nmz4gkag7b37j72p04bixr7wgabv"; }; meta.homepage = "https://github.com/f3fora/cmp-spell/"; }; @@ -1806,12 +1806,12 @@ final: prev: comment-nvim = buildVimPluginFrom2Nix { pname = "comment.nvim"; - version = "2022-10-08"; + version = "2022-10-10"; src = fetchFromGitHub { owner = "numtostr"; repo = "comment.nvim"; - rev = "d30f2b059c0c03fcfab3842684212bac525a3d0b"; - sha256 = "0n0ybjzwfdh7dk8wk3mf77hf0v7zxakv26a9z608srdia2xa3ndr"; + rev = "250bbc5a04b6e80ff1c212e89a80e976cda9e433"; + sha256 = "18x9a1fmial78f28mkaqsajzazjj9zd4yq44fghw1ynaa36gjmwh"; }; meta.homepage = "https://github.com/numtostr/comment.nvim/"; }; @@ -1878,12 +1878,12 @@ final: prev: compiler-explorer-nvim = buildVimPluginFrom2Nix { pname = "compiler-explorer.nvim"; - version = "2022-10-07"; + version = "2022-10-10"; src = fetchFromGitHub { owner = "krady21"; repo = "compiler-explorer.nvim"; - rev = "b611606f62b4ae0de10cc9a5565ce32f629a868a"; - sha256 = "102ic12byilviz65nnk3crwnrfsw1dqwvvfhj6gfix7ybg76vkx6"; + rev = "b565df009e92aad6ca8b338562b2f375fb1fea96"; + sha256 = "0855y7vhhfzv3ppmg5834k593jg4b2qlkpg45fsf4xkks3g2s168"; }; meta.homepage = "https://github.com/krady21/compiler-explorer.nvim/"; }; @@ -2010,24 +2010,24 @@ final: prev: coq-artifacts = buildVimPluginFrom2Nix { pname = "coq.artifacts"; - version = "2022-10-09"; + version = "2022-10-11"; src = fetchFromGitHub { owner = "ms-jpq"; repo = "coq.artifacts"; - rev = "39a174683e28b7b96a4b6521d1d3d2ef3a571ce2"; - sha256 = "0wk5jgsn0k2zp4kg6rj4pagnnbmq4rbk566d01svfw6vphv4d9fc"; + rev = "80ec4396170f63041d8d7e8d2df3c54eb45300f7"; + sha256 = "13h2nib9amjjsx35gsxfcvyx674m04wrsp4fia06ksa40h8hadkm"; }; meta.homepage = "https://github.com/ms-jpq/coq.artifacts/"; }; coq-thirdparty = buildVimPluginFrom2Nix { pname = "coq.thirdparty"; - version = "2022-10-09"; + version = "2022-10-11"; src = fetchFromGitHub { owner = "ms-jpq"; repo = "coq.thirdparty"; - rev = "46dc68b8193873ce44f2f572f1f2ecb3f5cdb9a9"; - sha256 = "14z16aw60ns90yf8g5z8rcb757byrvq1c8yaw0qb6bcvvgzgpwbm"; + rev = "adfb5c498f9d6d7f3b74baaae228ab6dcf923ecb"; + sha256 = "19l9g3j0pn3l4rndx38fpi82ypgbm0087gwyczj6dbvszld3ln78"; }; meta.homepage = "https://github.com/ms-jpq/coq.thirdparty/"; }; @@ -2046,12 +2046,12 @@ final: prev: coq_nvim = buildVimPluginFrom2Nix { pname = "coq_nvim"; - version = "2022-10-09"; + version = "2022-10-11"; src = fetchFromGitHub { owner = "ms-jpq"; repo = "coq_nvim"; - rev = "27fb487f108d8159793f0eeb6aa1e5ee0d4da9aa"; - sha256 = "1wzwgi6czri6cnq7qws5pw97k2c81q72masn7cd7lv7dva6bzz3p"; + rev = "550149d751f8d62ad646d38ef57b87f4d960bceb"; + sha256 = "1y5achbd4vkq0fhsh9hvgnb4qh42k3mskii7x6vrnr3vr3gvy0ff"; }; meta.homepage = "https://github.com/ms-jpq/coq_nvim/"; }; @@ -3215,12 +3215,12 @@ final: prev: gitsigns-nvim = buildNeovimPluginFrom2Nix { pname = "gitsigns.nvim"; - version = "2022-10-07"; + version = "2022-10-10"; src = fetchFromGitHub { owner = "lewis6991"; repo = "gitsigns.nvim"; - rev = "9787c94178b4062f30d2f06b6d52984217196647"; - sha256 = "1w96nqwmc9y3k6wyrnbr8br1h6lwxcvyykv22320lbxipl6i8rhw"; + rev = "9d18976c10413e52d76d41a771f042704786ce2e"; + sha256 = "1fzmg74i9q6xal0k1s1ikgbc37s0q1z79af5vhlfll5f2c5dkpsk"; }; meta.homepage = "https://github.com/lewis6991/gitsigns.nvim/"; }; @@ -3381,6 +3381,18 @@ final: prev: meta.homepage = "https://github.com/ellisonleao/gruvbox.nvim/"; }; + guess-indent-nvim = buildVimPluginFrom2Nix { + pname = "guess-indent.nvim"; + version = "2022-07-17"; + src = fetchFromGitHub { + owner = "nmac427"; + repo = "guess-indent.nvim"; + rev = "c37467baa1a51b74ed767cbe0540fce44e03d828"; + sha256 = "11fb9xsaq9ygl7sd7k1xg4ccbynmjdvnrbs44snp4q48fidn1vrb"; + }; + meta.homepage = "https://github.com/nmac427/guess-indent.nvim/"; + }; + gundo-vim = buildVimPluginFrom2Nix { pname = "gundo.vim"; version = "2021-02-21"; @@ -3407,11 +3419,11 @@ final: prev: hare-vim = buildVimPluginFrom2Nix { pname = "hare.vim"; - version = "2022-08-27"; + version = "2022-10-10"; src = fetchgit { url = "https://git.sr.ht/~sircmpwn/hare.vim"; - rev = "0bdef854f8531747438f7764cf7553ba16e56fb8"; - sha256 = "15ajgvhwl63h5268kp56m741bglaq3zgcf0bv61sasrh4v97xmgz"; + rev = "267fb4dac4e8cd4df1d9b57fa587ce718f5fc256"; + sha256 = "1spl17vd8w5k5xgqvmr80fi5samzhxfcqnkmzpqjk2sf5z88k80k"; }; meta.homepage = "https://git.sr.ht/~sircmpwn/hare.vim"; }; @@ -3490,12 +3502,12 @@ final: prev: hologram-nvim = buildVimPluginFrom2Nix { pname = "hologram.nvim"; - version = "2022-09-03"; + version = "2022-10-09"; src = fetchFromGitHub { owner = "edluffy"; repo = "hologram.nvim"; - rev = "338969044a5d6f9f56f728c8efeeced7408d580a"; - sha256 = "0q493i7fsws9q2wrmddbvxwr968qkkz8nlgm0nynb13m5qxpdzvh"; + rev = "f5194f71ec1578d91b2e3119ff08e574e2eab542"; + sha256 = "0khmi21mvmif7qd8cak9x1z4h68d34rwhfvcvnqxxh0mjzvskppv"; }; meta.homepage = "https://github.com/edluffy/hologram.nvim/"; }; @@ -3514,12 +3526,12 @@ final: prev: hop-nvim = buildVimPluginFrom2Nix { pname = "hop.nvim"; - version = "2022-07-31"; + version = "2022-10-09"; src = fetchFromGitHub { owner = "phaazon"; repo = "hop.nvim"; - rev = "2a1b686aad85a3c241f8cd8fd42eb09c7de5ed79"; - sha256 = "1f8p8cxi74kgqs20knx7yq1bd7m30va1dqpsy5dqdzsazr50fymc"; + rev = "6591b3656b75ff313cc38dc662a7ee8f75f1c165"; + sha256 = "1y6jvl8q8j46zy1c18xi0hfdbma2cq7g3k0ymw05qghvvjyv65bq"; }; meta.homepage = "https://github.com/phaazon/hop.nvim/"; }; @@ -3536,6 +3548,18 @@ final: prev: meta.homepage = "https://github.com/rktjmp/hotpot.nvim/"; }; + hydra-nvim = buildVimPluginFrom2Nix { + pname = "hydra.nvim"; + version = "2022-10-02"; + src = fetchFromGitHub { + owner = "anuvyklack"; + repo = "hydra.nvim"; + rev = "fa41a971765d4cce9c39185289f5a10894f66dbd"; + sha256 = "198bkw3y3253wjamvxxkdjr54nv1bkin148v554b47yv5w156zz1"; + }; + meta.homepage = "https://github.com/anuvyklack/hydra.nvim/"; + }; + i3config-vim = buildVimPluginFrom2Nix { pname = "i3config.vim"; version = "2021-06-23"; @@ -3935,36 +3959,36 @@ final: prev: leap-ast-nvim = buildVimPluginFrom2Nix { pname = "leap-ast.nvim"; - version = "2022-08-02"; + version = "2022-10-10"; src = fetchFromGitHub { owner = "ggandor"; repo = "leap-ast.nvim"; - rev = "38d05c808fc8cecb4c380912649d87c7abfa9e95"; - sha256 = "0d52ndk9r8g6mp09rjryz9hp7mdyfqqcjf94j0f83qdkdmv3i9gp"; + rev = "1a21b70505ebb868a1e196c0d63797e1426b53a5"; + sha256 = "1jb8rydp4h3b71vfn9hq4ni1fs6ds0kk92vlal4jl9gzs38cx5p9"; }; meta.homepage = "https://github.com/ggandor/leap-ast.nvim/"; }; leap-nvim = buildVimPluginFrom2Nix { pname = "leap.nvim"; - version = "2022-10-01"; + version = "2022-10-10"; src = fetchFromGitHub { owner = "ggandor"; repo = "leap.nvim"; - rev = "5a09c30bf676d1392ff00eb9a41e0a1fc9b60a1b"; - sha256 = "078q9dr4a2j6c6v7l4n1ly2j94d3q4fbinpmi4qma9zmrpg9nsn6"; + rev = "517f142dea3d62c956fd00ab78385b83b14932a9"; + sha256 = "09j9frsxqxbzvk2fpyfz1ian9q5gzm1zj13kq64fwldzxamjsjji"; }; meta.homepage = "https://github.com/ggandor/leap.nvim/"; }; legendary-nvim = buildVimPluginFrom2Nix { pname = "legendary.nvim"; - version = "2022-10-07"; + version = "2022-10-10"; src = fetchFromGitHub { owner = "mrjones2014"; repo = "legendary.nvim"; - rev = "4ecafc2993b31e74bb8cecb93a90f2414f008be2"; - sha256 = "0d0qg2hs83jf26hjca7bwjxgv59zrnw4w8gm54p0fr8gaqcvr514"; + rev = "9d8e43e25174033a1066f12b7d656d93c7527db7"; + sha256 = "17drk65qrxnmnywg8p3251581hfy01drzj669v92brn1varp1a6d"; }; meta.homepage = "https://github.com/mrjones2014/legendary.nvim/"; }; @@ -4211,12 +4235,12 @@ final: prev: live-command-nvim = buildVimPluginFrom2Nix { pname = "live-command.nvim"; - version = "2022-10-06"; + version = "2022-10-10"; src = fetchFromGitHub { owner = "smjonas"; repo = "live-command.nvim"; - rev = "76abef7bcf40afd8db381c8d95a0f3143aa28e68"; - sha256 = "0swz1pvzl5fr57y7vzxzb9gqfmw5d3zh0751hgj7jqdy4hn00a6z"; + rev = "b3639c1bc78dbd396b47ef1dcf624dabc01238be"; + sha256 = "0bkffrsha1mhsnd0w45js5d0kx097k21lyg7bwj4a40icgkgyfpk"; }; meta.homepage = "https://github.com/smjonas/live-command.nvim/"; }; @@ -4366,12 +4390,12 @@ final: prev: lua-dev-nvim = buildVimPluginFrom2Nix { pname = "lua-dev.nvim"; - version = "2022-10-09"; + version = "2022-10-11"; src = fetchFromGitHub { owner = "folke"; repo = "lua-dev.nvim"; - rev = "a37b9ba11a4d1ed97284b416526e6251d23d58e1"; - sha256 = "1ida1a97ddz5ps4yhxpvm9in20q8jy345a0b8kc7h4h3v0pqmdkd"; + rev = "34858064f55295557a377b88aebccc9965869cf8"; + sha256 = "1dvwzsa3002yaff0rcjkfzgzv3r96192kh0b9skg53z44nyvawcw"; }; meta.homepage = "https://github.com/folke/lua-dev.nvim/"; }; @@ -4402,12 +4426,12 @@ final: prev: luasnip = buildVimPluginFrom2Nix { pname = "luasnip"; - version = "2022-10-08"; + version = "2022-10-10"; src = fetchFromGitHub { owner = "l3mon4d3"; repo = "luasnip"; - rev = "aa7acef98392f35288590f2fcf984b19e0d5bc29"; - sha256 = "1xs5h97q3fg4avsab9csf8nwmxadc9pvhv31khq86637kximgzz1"; + rev = "08511f9a8dc3ef01c31a245429bfaef993e2f1f6"; + sha256 = "04100gf6rgl3d7vxsxvf0xgn0y2ypyjh22qznx18hm0c7mdsl1qz"; fetchSubmodules = true; }; meta.homepage = "https://github.com/l3mon4d3/luasnip/"; @@ -4511,12 +4535,12 @@ final: prev: mini-nvim = buildVimPluginFrom2Nix { pname = "mini.nvim"; - version = "2022-10-02"; + version = "2022-10-10"; src = fetchFromGitHub { owner = "echasnovski"; repo = "mini.nvim"; - rev = "3f2c7a2aee528309fb42091b723285fb7630a0c2"; - sha256 = "18049zbm2gxm6gjif6radwy09x84ix1y30657q294n7scsh25mg5"; + rev = "9f7bdfd90d5bdb466fd297f691db6c58316c3bb7"; + sha256 = "11yn7jwy8vy6rzmavh420x3dn7y9lzb0dn5nkrky2rr38s6wyd5h"; }; meta.homepage = "https://github.com/echasnovski/mini.nvim/"; }; @@ -4943,12 +4967,12 @@ final: prev: neorg = buildVimPluginFrom2Nix { pname = "neorg"; - version = "2022-10-08"; + version = "2022-10-09"; src = fetchFromGitHub { owner = "nvim-neorg"; repo = "neorg"; - rev = "7e56721877cb8219a6b982710d98eb675738f499"; - sha256 = "1n875jcbrqvc3gyswld3np9r7axns7v0pmd4cf0lcx64pkb3wrn2"; + rev = "9a9891a3247b2c15b752efca749f1175b9013235"; + sha256 = "01iibvgf5lf23zivd94dfcjiz2b0rmqcz7yddfqf8drq1pi3bxjw"; }; meta.homepage = "https://github.com/nvim-neorg/neorg/"; }; @@ -5171,12 +5195,12 @@ final: prev: noice-nvim = buildVimPluginFrom2Nix { pname = "noice.nvim"; - version = "2022-10-08"; + version = "2022-10-09"; src = fetchFromGitHub { owner = "folke"; repo = "noice.nvim"; - rev = "b479e237c3af7b72e26e032f790a73a9aae91897"; - sha256 = "1hv0gqs088ga60clp4dszjqsf67g6ppggmwi9h4pkyr9yni6himh"; + rev = "87f908da660c321439a0dd98a8e51cd85227f57b"; + sha256 = "0byzbwhclppby3ryqis29d6wpdgshk7qi9sp1pp8kkfjv2fg3xb3"; }; meta.homepage = "https://github.com/folke/noice.nvim/"; }; @@ -5243,12 +5267,12 @@ final: prev: null-ls-nvim = buildVimPluginFrom2Nix { pname = "null-ls.nvim"; - version = "2022-10-08"; + version = "2022-10-10"; src = fetchFromGitHub { owner = "jose-elias-alvarez"; repo = "null-ls.nvim"; - rev = "3d76bb2968310f7e18a20711ac89c5e7b07e8c93"; - sha256 = "145dqk8423b8wnkzrv7ajvymxpsvpr2bj3malywmlyb6zkzkc8q4"; + rev = "17e81c1c1f21f8f6d11a4141a490a0b37974a52b"; + sha256 = "0l8lkrcbyvlkjv18fvi6jk13s9dj5in8h9f0izx1xpk6cdarx7cb"; }; meta.homepage = "https://github.com/jose-elias-alvarez/null-ls.nvim/"; }; @@ -5363,12 +5387,12 @@ final: prev: nvim-cmp = buildNeovimPluginFrom2Nix { pname = "nvim-cmp"; - version = "2022-10-07"; + version = "2022-10-11"; src = fetchFromGitHub { owner = "hrsh7th"; repo = "nvim-cmp"; - rev = "0e436ee23abc6c3fe5f3600145d2a413703e7272"; - sha256 = "02w95zqbl3nx0vnl2fhlhlkil3jzy6yi2731xmy01qjl54vgqgdj"; + rev = "53bd5749011c0830d54d9b22a37259651d5916df"; + sha256 = "1fbhbb0aakjs7zwdllzpcydz41nanxyw271ix18h9j47a4x12lq6"; }; meta.homepage = "https://github.com/hrsh7th/nvim-cmp/"; }; @@ -5459,16 +5483,28 @@ final: prev: nvim-dap = buildVimPluginFrom2Nix { pname = "nvim-dap"; - version = "2022-10-08"; + version = "2022-10-09"; src = fetchFromGitHub { owner = "mfussenegger"; repo = "nvim-dap"; - rev = "684f57f9d6aed53dfa349986a1038b10b759e18b"; - sha256 = "1w1ka48zhv0qgx6s03q5c9clm3y7x572q0k6qvgqlj22fcqcqph1"; + rev = "6b12294a57001d994022df8acbe2ef7327d30587"; + sha256 = "16v6cy2za9v48jrm4mipfnxv5ry0h60k85342xrzxwanhnkagi5v"; }; meta.homepage = "https://github.com/mfussenegger/nvim-dap/"; }; + nvim-dap-python = buildVimPluginFrom2Nix { + pname = "nvim-dap-python"; + version = "2022-10-09"; + src = fetchFromGitHub { + owner = "mfussenegger"; + repo = "nvim-dap-python"; + rev = "408186a9d1e03e078e3603af912f9e264ceb2742"; + sha256 = "131a8m5ngxlpbx2b9syksmcci7fff03naw56z7djkvs1w6zh4ln4"; + }; + meta.homepage = "https://github.com/mfussenegger/nvim-dap-python/"; + }; + nvim-dap-ui = buildVimPluginFrom2Nix { pname = "nvim-dap-ui"; version = "2022-10-06"; @@ -5579,12 +5615,12 @@ final: prev: nvim-hlslens = buildVimPluginFrom2Nix { pname = "nvim-hlslens"; - version = "2022-09-30"; + version = "2022-10-09"; src = fetchFromGitHub { owner = "kevinhwang91"; repo = "nvim-hlslens"; - rev = "5e6ea33cfdf8be57bb33146f1927b7723d3ddff6"; - sha256 = "0zhjsg627avq3755a9q28hy8g6iahrn17cwavx47q69j3hp0cl7q"; + rev = "8b67dd488cc4633dc3580b44bf0b30d002a2ba29"; + sha256 = "1wwk0sxd3j4fpndill5hbdq1rwmjfv8x8hmajvsxdnpc8skvyzxa"; }; meta.homepage = "https://github.com/kevinhwang91/nvim-hlslens/"; }; @@ -5687,12 +5723,12 @@ final: prev: nvim-lspconfig = buildVimPluginFrom2Nix { pname = "nvim-lspconfig"; - version = "2022-10-07"; + version = "2022-10-09"; src = fetchFromGitHub { owner = "neovim"; repo = "nvim-lspconfig"; - rev = "9d4b8d393aad0e6e9227e2d67629aa99e56b994a"; - sha256 = "0yajlbas8ghm75d2qsngl6c72w1kk05rhpzfmsrp3yzm57jpx73v"; + rev = "0a8064eda0c7a4475c4a8ceb39199e975308797b"; + sha256 = "163ppl8fdybx2bkaimbxxidn6vgqgz6dz6qs45ng9f9ys1wxg5nr"; }; meta.homepage = "https://github.com/neovim/nvim-lspconfig/"; }; @@ -5771,12 +5807,12 @@ final: prev: nvim-notify = buildVimPluginFrom2Nix { pname = "nvim-notify"; - version = "2022-10-08"; + version = "2022-10-10"; src = fetchFromGitHub { owner = "rcarriga"; repo = "nvim-notify"; - rev = "74eb04da1945cb4411bb7b1a4373d61b4f4c135b"; - sha256 = "05rszmk0x5xbhlprfky2kn3dm2gvbiphqcb7yj65sng4423z4g40"; + rev = "56f65a9474e9ce294a89eb325fccf4391646bfd4"; + sha256 = "1dr3yv8b3zv50yls8xwf6k75xk7l8y78cbbs7zvjmwri31sw5w4f"; }; meta.homepage = "https://github.com/rcarriga/nvim-notify/"; }; @@ -5879,24 +5915,24 @@ final: prev: nvim-tree-lua = buildVimPluginFrom2Nix { pname = "nvim-tree.lua"; - version = "2022-10-09"; + version = "2022-10-10"; src = fetchFromGitHub { owner = "nvim-tree"; repo = "nvim-tree.lua"; - rev = "0db49773037a399996db81bb2ba0ac5301d8bf1d"; - sha256 = "1d19hb819zxbl1vzn3d50gyhp97z818hh5q9fdgav33kkkhycc4f"; + rev = "b01e7beaa6f0dbbf5df775cf4ecc829a23f0be54"; + sha256 = "0bmzwgycrp6wcn8kd2h1kwl0ysazmzd36fvi12x2c99yxnassxvi"; }; meta.homepage = "https://github.com/nvim-tree/nvim-tree.lua/"; }; nvim-treesitter = buildVimPluginFrom2Nix { pname = "nvim-treesitter"; - version = "2022-10-08"; + version = "2022-10-10"; src = fetchFromGitHub { owner = "nvim-treesitter"; repo = "nvim-treesitter"; - rev = "b273a06728305c1e7bd0179977ca48049aeff5e6"; - sha256 = "107yb35kq5c8fg2h9mr0v1wjskym9ai1wmfdr5j72gcv0zc174xj"; + rev = "6840b3740da5497730136c875e8f89cad314657b"; + sha256 = "1yl9gjdv059xjnzfcqd1mh4icdxr6dyay694gi3g9jbg3pi3djg8"; }; meta.homepage = "https://github.com/nvim-treesitter/nvim-treesitter/"; }; @@ -6071,12 +6107,12 @@ final: prev: octo-nvim = buildVimPluginFrom2Nix { pname = "octo.nvim"; - version = "2022-09-14"; + version = "2022-10-09"; src = fetchFromGitHub { owner = "pwntester"; repo = "octo.nvim"; - rev = "e634cd1b120af1d7f642081185782a24b49dc11f"; - sha256 = "1zlqyhxr8ibgahz3s3gwbw0ybkczgd96a18d5lfcg5i9axi6iaqp"; + rev = "d91f88be51fa7cde8b5d6f529c057338aad18383"; + sha256 = "0d4340gjbsvbdvymw0a7kpqwvzrn946nnsaav9i0z6rallrk583n"; }; meta.homepage = "https://github.com/pwntester/octo.nvim/"; }; @@ -6119,24 +6155,24 @@ final: prev: onedark-vim = buildVimPluginFrom2Nix { pname = "onedark.vim"; - version = "2022-10-03"; + version = "2022-10-10"; src = fetchFromGitHub { owner = "joshdick"; repo = "onedark.vim"; - rev = "0c23bb090f14580c924323ef1d3ccb1f9d2fa001"; - sha256 = "1fylkscj2iz4p89807xzzaj21lqi6621afsa8p3pms5vcn0hi8jm"; + rev = "b6b5ffe31a195a3077338d7a506b905e4a51590f"; + sha256 = "0mw0z6z33xrxs5yp5d2jm8wvrlicj084gmw858sbx9d9ph4sdyj3"; }; meta.homepage = "https://github.com/joshdick/onedark.vim/"; }; onedarkpro-nvim = buildVimPluginFrom2Nix { pname = "onedarkpro.nvim"; - version = "2022-10-08"; + version = "2022-10-10"; src = fetchFromGitHub { owner = "olimorris"; repo = "onedarkpro.nvim"; - rev = "18d2362f28ba577824e68e0a12d2338f67da0e06"; - sha256 = "1qan2g1a0kmbbzwd4hs9msv5bx47m0pa02jhl7ha03g0j2qbxbcx"; + rev = "81f50f9ab0f4b556b4bd10c8c8cdf8a76ab01213"; + sha256 = "179nq72hlcb4g5dgm8psl3il075km80ijz5kz5yzb43kllkaadls"; }; meta.homepage = "https://github.com/olimorris/onedarkpro.nvim/"; }; @@ -7227,12 +7263,12 @@ final: prev: surround-nvim = buildVimPluginFrom2Nix { pname = "surround.nvim"; - version = "2022-02-22"; + version = "2022-10-10"; src = fetchFromGitHub { owner = "ur4ltz"; repo = "surround.nvim"; - rev = "633068182cf894480341b992445f0f0d2883721d"; - sha256 = "0mqg4vki23rs0rj6zyfkd1ki9wndjifp0lmnnw99x3i1qc0ba47i"; + rev = "36c253d6470910692491b13382f54c9bab2811e1"; + sha256 = "0bjv399gw0gkpfqclmv65viwi34il5zn5kx9zplnkq5r0734l3nw"; }; meta.homepage = "https://github.com/ur4ltz/surround.nvim/"; }; @@ -7481,12 +7517,12 @@ final: prev: telescope-coc-nvim = buildVimPluginFrom2Nix { pname = "telescope-coc.nvim"; - version = "2022-10-06"; + version = "2022-10-10"; src = fetchFromGitHub { owner = "fannheyward"; repo = "telescope-coc.nvim"; - rev = "ecf56935b05c7da4150e6d046f07b920628aab53"; - sha256 = "16jl04zbsmhry1ybpcl9czs2lzlni6dzpaf163y9ff080cs5f3si"; + rev = "da487dfd41266a0b5507a310da684ef3a3bfdb68"; + sha256 = "1lnang3qn861z0p657aa8r7w6d1v6qn86gdwg7di11dgc5vljfh4"; }; meta.homepage = "https://github.com/fannheyward/telescope-coc.nvim/"; }; @@ -7602,12 +7638,12 @@ final: prev: telescope-project-nvim = buildVimPluginFrom2Nix { pname = "telescope-project.nvim"; - version = "2022-10-02"; + version = "2022-10-10"; src = fetchFromGitHub { owner = "nvim-telescope"; repo = "telescope-project.nvim"; - rev = "a0dec67decbc85cf1af2002807c8a963f72c1d13"; - sha256 = "0gz7rxzn7phq45ss1bhb5g35z1kq97r7yapvrnb1yi0259jwbxsa"; + rev = "ff4d3cea905383a67d1a47b9dd210c4907d858c2"; + sha256 = "16byj7gcyxpn837x096a074vpj67drbd5ndcfpkvp1xyam9604b4"; }; meta.homepage = "https://github.com/nvim-telescope/telescope-project.nvim/"; }; @@ -7686,12 +7722,12 @@ final: prev: telescope-nvim = buildVimPluginFrom2Nix { pname = "telescope.nvim"; - version = "2022-10-08"; + version = "2022-10-09"; src = fetchFromGitHub { owner = "nvim-telescope"; repo = "telescope.nvim"; - rev = "5fadc247c56e739d9c5c30a484fd291bb87bd378"; - sha256 = "1bdzdsxx9l0aq2hk81diawpa56m7yh33wvb6kb0s4c7i2c6kbi3m"; + rev = "f174a0367b4fc7cb17710d867e25ea792311c418"; + sha256 = "1hra6vrr25xan0xwjc76m14ml6hwrm7nx2wapl44zx3m29hwfasx"; }; meta.homepage = "https://github.com/nvim-telescope/telescope.nvim/"; }; @@ -7891,12 +7927,12 @@ final: prev: tokyonight-nvim = buildVimPluginFrom2Nix { pname = "tokyonight.nvim"; - version = "2022-10-05"; + version = "2022-10-10"; src = fetchFromGitHub { owner = "folke"; repo = "tokyonight.nvim"; - rev = "fd9105c9487996aa2269992b72a6fea7504688e4"; - sha256 = "1aawphnlac7aaizn4im4v7lx87gnp1avishghvk3fglfsm95r3fz"; + rev = "23c0038166800d373f3ec41e56768212aa3aaa2f"; + sha256 = "1zz54cq4ls4kb74pjxpy1afzckw5m3q92r1gr83l36i7yn5w0h61"; }; meta.homepage = "https://github.com/folke/tokyonight.nvim/"; }; @@ -9691,12 +9727,12 @@ final: prev: vim-gist = buildVimPluginFrom2Nix { pname = "vim-gist"; - version = "2021-11-04"; + version = "2022-10-09"; src = fetchFromGitHub { owner = "mattn"; repo = "vim-gist"; - rev = "34e0f0aad5cc21cb3087a5d92ae1aa108019ecda"; - sha256 = "1dlsml47nh2mdllahh2nicnpqxk271p62cp3xsjd4dbbr0lallds"; + rev = "5bfbb5450d9eff248f6c074de0b7800392439304"; + sha256 = "00yvl59jbblkif4967kdg6b0mr0hd7rnr5mkxnb4n74akj9pwcf0"; }; meta.homepage = "https://github.com/mattn/vim-gist/"; }; @@ -10521,12 +10557,12 @@ final: prev: vim-lsp = buildVimPluginFrom2Nix { pname = "vim-lsp"; - version = "2022-09-27"; + version = "2022-10-09"; src = fetchFromGitHub { owner = "prabirshrestha"; repo = "vim-lsp"; - rev = "8fdaf4f78c94c6abba06a907520a5de157c5803b"; - sha256 = "0cm3vf84hvvi13v4239j3m24p6dzclv7y4061wyh6sdf7cdx6dqq"; + rev = "23728ad8c5becd2641ac7fb7e995b36295d2544e"; + sha256 = "026blks2bljynrw1xg8wmxz1ikr0f819ih0635bxwp8ah9dkfqzc"; }; meta.homepage = "https://github.com/prabirshrestha/vim-lsp/"; }; @@ -11410,12 +11446,12 @@ final: prev: vim-qml = buildVimPluginFrom2Nix { pname = "vim-qml"; - version = "2020-11-03"; + version = "2022-10-10"; src = fetchFromGitHub { owner = "peterhoeg"; repo = "vim-qml"; - rev = "50d2e737094c146195171b7d52e522384f15afe8"; - sha256 = "1iz2l51c15ijkpzyk5qwmd8y0yy2z8f1jwxcwk16h63g4nmfm1zr"; + rev = "92cd291bc3d59126ef771dfaad5f2506636104c7"; + sha256 = "1pabhpsikss4cr439yikwl7lnq5bahzs22xmv9icp3fz921c67bh"; }; meta.homepage = "https://github.com/peterhoeg/vim-qml/"; }; @@ -11830,12 +11866,12 @@ final: prev: vim-snippets = buildVimPluginFrom2Nix { pname = "vim-snippets"; - version = "2022-10-07"; + version = "2022-10-10"; src = fetchFromGitHub { owner = "honza"; repo = "vim-snippets"; - rev = "250fd916757a545e7dfa29a62afa1e7ea16e2460"; - sha256 = "1iimz25g4vyg9fnjsrbc1b6rkga99y9b3wn0qnyf9d1hms643k3a"; + rev = "9a7f3968c92c6589d3a12aa5448e8374c8d68a42"; + sha256 = "15bqw0l78s8v2l44j4h64lvs7456h5l0dy46kxas095jrjg9aqnw"; }; meta.homepage = "https://github.com/honza/vim-snippets/"; }; @@ -11866,12 +11902,12 @@ final: prev: vim-speeddating = buildVimPluginFrom2Nix { pname = "vim-speeddating"; - version = "2021-04-29"; + version = "2022-10-10"; src = fetchFromGitHub { owner = "tpope"; repo = "vim-speeddating"; - rev = "95da3d72efc91a5131acf388eafa4b1ad6512a9b"; - sha256 = "1al53c1x2bnnf0nnn7319jxq7bphaxdcnb5i7qa86m337jb2wqrp"; + rev = "5a36fd29df63ea3f65562bd2bb837be48a5ec90b"; + sha256 = "0zwhynknkcf9zpsl7ddsrihh351fy9k75ylfrzzl222i88g17d14"; }; meta.homepage = "https://github.com/tpope/vim-speeddating/"; }; @@ -12251,12 +12287,12 @@ final: prev: vim-tpipeline = buildVimPluginFrom2Nix { pname = "vim-tpipeline"; - version = "2022-10-06"; + version = "2022-10-10"; src = fetchFromGitHub { owner = "vimpostor"; repo = "vim-tpipeline"; - rev = "c345f17e8ff7c3158a60d7a4285fc29972fa0c80"; - sha256 = "1mi6x2k1dpyrw9fsrbq48rfyj4bsgcazy8jw7nnkhicmhp73mzqs"; + rev = "58daf4b1927c4c4fa5377f7527a2d13d06a044f7"; + sha256 = "1k91q2i7pv1yx1mdcwhagwvpi294zbwngvd63xv1wfkwkyi32jcj"; }; meta.homepage = "https://github.com/vimpostor/vim-tpipeline/"; }; @@ -12743,12 +12779,12 @@ final: prev: vimspector = buildVimPluginFrom2Nix { pname = "vimspector"; - version = "2022-09-27"; + version = "2022-10-09"; src = fetchFromGitHub { owner = "puremourning"; repo = "vimspector"; - rev = "c95ad4c8fb54adb75ceb0397ef6ace1c4eec3790"; - sha256 = "1mxgw6zx529lmi98z4072zc0ri9idf2ysaxmfby3wycl2z73b7k8"; + rev = "90c8b7de334ee778c99eaafee41105808e363f81"; + sha256 = "0hgasj2sr5kh4c70rwgzn2cfpw8vc61m82jjhis15a6bdl2jqw4a"; fetchSubmodules = true; }; meta.homepage = "https://github.com/puremourning/vimspector/"; @@ -12790,6 +12826,18 @@ final: prev: meta.homepage = "https://github.com/vimwiki/vimwiki/"; }; + virtual-types-nvim = buildVimPluginFrom2Nix { + pname = "virtual-types.nvim"; + version = "2022-03-17"; + src = fetchFromGitHub { + owner = "jubnzv"; + repo = "virtual-types.nvim"; + rev = "31da847fa54b801f309a08123935626adda4aaad"; + sha256 = "0kqg29xld064fz1xly1kc7wcyck62q5hjkb5fc5vrj0zdnrdzz22"; + }; + meta.homepage = "https://github.com/jubnzv/virtual-types.nvim/"; + }; + vis = buildVimPluginFrom2Nix { pname = "vis"; version = "2013-04-26"; @@ -13093,12 +13141,12 @@ final: prev: catppuccin-nvim = buildVimPluginFrom2Nix { pname = "catppuccin-nvim"; - version = "2022-10-08"; + version = "2022-10-11"; src = fetchFromGitHub { owner = "catppuccin"; repo = "nvim"; - rev = "e9b313b4dcaa35a8092c91fbff5984df39406173"; - sha256 = "08g2qlqjrg0svj53h91ay95fraa15v8myvx3yjvggi1f6y4vgwcf"; + rev = "e4ff2a69844f02ef3ee88ca5c5766eb4c7cf0c0c"; + sha256 = "1xb161q8zmb52x1y8v6fvc5snlf47jxwnyams46xq2q2k8x4sjl6"; }; meta.homepage = "https://github.com/catppuccin/nvim/"; }; @@ -13117,12 +13165,12 @@ final: prev: chad = buildVimPluginFrom2Nix { pname = "chad"; - version = "2022-10-09"; + version = "2022-10-11"; src = fetchFromGitHub { owner = "ms-jpq"; repo = "chadtree"; - rev = "06d13155ac420b410b2b48e36d62069035c00323"; - sha256 = "0mn54z0w6sjxh3fb0igkmcbms102mi52js3fj3kjx5b56iy1k87r"; + rev = "5375b996a54214d43065017ea06092929d670e9b"; + sha256 = "0dcqxaz2fa2dp1bpq6schdzr4mhm3nckcmaaa9bn213xxa9dv1in"; }; meta.homepage = "https://github.com/ms-jpq/chadtree/"; }; diff --git a/pkgs/applications/editors/vim/plugins/overrides.nix b/pkgs/applications/editors/vim/plugins/overrides.nix index 850f82f7018..f04511f9a21 100644 --- a/pkgs/applications/editors/vim/plugins/overrides.nix +++ b/pkgs/applications/editors/vim/plugins/overrides.nix @@ -628,6 +628,10 @@ self: super: { dependencies = with self; [ plenary-nvim ]; }); + nvim-dap-python = super.nvim-dap-python.overrideAttrs (old: { + dependencies = with self; [ nvim-dap ]; + }); + nvim-lsputils = super.nvim-lsputils.overrideAttrs (old: { dependencies = with self; [ popfix ]; }); diff --git a/pkgs/applications/editors/vim/plugins/vim-plugin-names b/pkgs/applications/editors/vim/plugins/vim-plugin-names index 33223084447..8c90a7ed19b 100644 --- a/pkgs/applications/editors/vim/plugins/vim-plugin-names +++ b/pkgs/applications/editors/vim/plugins/vim-plugin-names @@ -283,6 +283,7 @@ https://github.com/morhetz/gruvbox/,, https://github.com/eddyekofo94/gruvbox-flat.nvim/,, https://github.com/sainnhe/gruvbox-material/,, https://github.com/ellisonleao/gruvbox.nvim/,, +https://github.com/nmac427/guess-indent.nvim/,HEAD, https://github.com/sjl/gundo.vim/,, https://github.com/junegunn/gv.vim/,, https://git.sr.ht/~sircmpwn/hare.vim,HEAD, @@ -296,6 +297,7 @@ https://github.com/edluffy/hologram.nvim/,, https://github.com/urbit/hoon.vim/,, https://github.com/phaazon/hop.nvim/,, https://github.com/rktjmp/hotpot.nvim/,, +https://github.com/anuvyklack/hydra.nvim/,HEAD, https://github.com/mboughaba/i3config.vim/,, https://github.com/cocopon/iceberg.vim/,, https://github.com/idris-hackers/idris-vim/,, @@ -460,6 +462,7 @@ https://github.com/roxma/nvim-completion-manager/,, https://github.com/klen/nvim-config-local/,, https://github.com/yamatsum/nvim-cursorline/,, https://github.com/mfussenegger/nvim-dap/,, +https://github.com/mfussenegger/nvim-dap-python/,HEAD, https://github.com/rcarriga/nvim-dap-ui/,, https://github.com/theHamsta/nvim-dap-virtual-text/,, https://github.com/allendang/nvim-expand-expr/,, @@ -1073,6 +1076,7 @@ https://github.com/puremourning/vimspector/,, https://github.com/lervag/vimtex/,, https://github.com/preservim/vimux/,, https://github.com/vimwiki/vimwiki/,, +https://github.com/jubnzv/virtual-types.nvim/,HEAD, https://github.com/vim-scripts/vis/,, https://github.com/navicore/vissort.vim/,, https://github.com/liuchengxu/vista.vim/,, diff --git a/pkgs/applications/editors/vscode/extensions/default.nix b/pkgs/applications/editors/vscode/extensions/default.nix index 082504d41a7..e866c25e29d 100644 --- a/pkgs/applications/editors/vscode/extensions/default.nix +++ b/pkgs/applications/editors/vscode/extensions/default.nix @@ -225,8 +225,8 @@ let mktplcRef = { name = "vscode-apollo"; publisher = "apollographql"; - version = "1.19.9"; - sha256 = "sha256-iJpzNKcuQrfq4Z0LXuadt6OKXelBbDQg/vuc7NJ2I5o="; + version = "1.19.11"; + sha256 = "sha256-EixefDuJiw/p5yAR/UQLK1a1RXJLXlTmOlD34qpAN+U="; }; meta = with lib; { changelog = "https://marketplace.visualstudio.com/items/apollographql.vscode-apollo/changelog"; @@ -673,8 +673,8 @@ let mktplcRef = { name = "vscode-eslint"; publisher = "dbaeumer"; - version = "2.2.2"; - sha256 = "sha256-llalyQXl+k/ugZq+Ti9mApHRqAGu6QyoMP51GtZnRJ4="; + version = "2.2.6"; + sha256 = "sha256-1yZeyLrXuubhKzobWcd00F/CdU824uJDTkB6qlHkJlQ="; }; meta = { license = lib.licenses.mit; @@ -698,8 +698,8 @@ let mktplcRef = { name = "vscode-markdownlint"; publisher = "DavidAnson"; - version = "0.47.0"; - sha256 = "sha256-KtDJo8rhQXkZtJz93E+J7eNiAIcLk4e5qKDLoR3DoGw="; + version = "0.48.1"; + sha256 = "sha256-3TpZGvas+pfabHayaA6Yd9nOO2MbfXbCvCiTcbja9Vo="; }; meta = with lib; { changelog = "https://marketplace.visualstudio.com/items/DavidAnson.vscode-markdownlint/changelog"; @@ -934,8 +934,8 @@ let mktplcRef = { name = "prettier-vscode"; publisher = "esbenp"; - version = "9.8.0"; - sha256 = "sha256-+8lEuQD73w+urAv2Tw0b+q6oQ66+gLgMPe3Luln9cuY="; + version = "9.9.0"; + sha256 = "sha256-Yr7M4HyRNcsBf8YglQLvyZjblMhtkpMP+f9SH8oUav0="; }; meta = with lib; { changelog = "https://marketplace.visualstudio.com/items/esbenp.prettier-vscode/changelog"; @@ -1881,8 +1881,8 @@ let mktplcRef = { name = "color-highlight"; publisher = "naumovs"; - version = "2.5.0"; - sha256 = "sha256-dYMDV84LEGXUjt/fbsSy3BVM5SsBHcPaDDll8KjPIWY="; + version = "2.6.0"; + sha256 = "sha256-TcPQOAHCYeFHPdR85GIXsy3fx70p8cLdO2UNO0krUOs="; }; meta = with lib; { changelog = "https://marketplace.visualstudio.com/items/naumovs.color-highlight/changelog"; @@ -2345,8 +2345,8 @@ let mktplcRef = { publisher = "stkb"; name = "rewrap"; - version = "1.16.1"; - sha256 = "sha256-OTPNbwoQmKd73g8IwLKMIbe6c7E2jKNkzwuBU/f8dmY="; + version = "1.16.3"; + sha256 = "sha256-WHeLTN992ltEZw2W7B3sJrHfAFsOGMq3llV4C0hXLNA="; }; meta = with lib; { changelog = "https://github.com/stkb/Rewrap/blob/master/CHANGELOG.md"; diff --git a/pkgs/applications/editors/vscode/extensions/rescript/default.nix b/pkgs/applications/editors/vscode/extensions/rescript/default.nix index 902bc58f1d1..1f92e600f40 100644 --- a/pkgs/applications/editors/vscode/extensions/rescript/default.nix +++ b/pkgs/applications/editors/vscode/extensions/rescript/default.nix @@ -1,6 +1,6 @@ { lib, stdenv, vscode-utils, callPackage }: let - version = "1.6.0"; + version = "1.8.1"; rescript-editor-analysis = callPackage ./rescript-editor-analysis.nix { inherit version; }; arch = if stdenv.isLinux then "linux" @@ -13,7 +13,7 @@ vscode-utils.buildVscodeMarketplaceExtension rec { name = "rescript-vscode"; publisher = "chenglou92"; inherit version; - sha256 = "sha256-/Nv+uyTkJQVaPKIDRr1P/Z5vsituXpP48/sDn3FUEeA="; + sha256 = "sha256-XZG0PRzc3wyAVq9tQeGDlaUZg5YAgkPxJ3NsrdUHoOk="; }; postPatch = '' rm -r ${analysisDir} diff --git a/pkgs/applications/editors/vscode/extensions/rescript/rescript-editor-analysis.nix b/pkgs/applications/editors/vscode/extensions/rescript/rescript-editor-analysis.nix index a0b49f9c44b..a87cd094342 100644 --- a/pkgs/applications/editors/vscode/extensions/rescript/rescript-editor-analysis.nix +++ b/pkgs/applications/editors/vscode/extensions/rescript/rescript-editor-analysis.nix @@ -8,7 +8,7 @@ stdenv.mkDerivation { owner = "rescript-lang"; repo = "rescript-vscode"; rev = version; - sha256 = "sha256-O5kZCnhtMcevPTs5UxhIXx124WQf1VvF2WMVHjMEQZc="; + sha256 = "sha256-a8otK0BxZbl0nOp4QWQRkjb5fM85JA4nVkLuKAz71xU="; }; nativeBuildInputs = [ ocaml dune_3 ]; diff --git a/pkgs/applications/editors/vscode/extensions/vscode-lldb/default.nix b/pkgs/applications/editors/vscode/extensions/vscode-lldb/default.nix index d5961f0c9eb..9eba40330b9 100644 --- a/pkgs/applications/editors/vscode/extensions/vscode-lldb/default.nix +++ b/pkgs/applications/editors/vscode/extensions/vscode-lldb/default.nix @@ -45,7 +45,8 @@ let inherit (stdenv.hostPlatform) system; }).nodeDependencies.override (old: { inherit src version; - buildInputs = [pkg-config libsecret]; + nativeBuildInputs = [ pkg-config ]; + buildInputs = [libsecret]; dontNpmInstall = true; })); diff --git a/pkgs/applications/editors/vscode/vscode.nix b/pkgs/applications/editors/vscode/vscode.nix index 1ae65c1cbf4..4c154ebf9cb 100644 --- a/pkgs/applications/editors/vscode/vscode.nix +++ b/pkgs/applications/editors/vscode/vscode.nix @@ -18,17 +18,17 @@ let archive_fmt = if stdenv.isDarwin then "zip" else "tar.gz"; sha256 = { - x86_64-linux = "0ar8gpklaa0aa3k1934jyg2vh65hzncx0awl1f0wz8n4fjasfrpc"; - x86_64-darwin = "0jkpzyg2pk2d88w2ffrp2lr0qadss7ccycx4vpmjmw62d3sap8n1"; - aarch64-linux = "1g7lzqghagz63pljg4wy34z706j70vjmk49cl8v27jbnsgnva56a"; - aarch64-darwin = "132ml95xlyv5c343bfv0gpgr8rmk85xspsy9baninlmhnmy7mivv"; - armv7l-linux = "04anb6r7hkk3y3vahx32nxj5dz2i66rrnl0561xkcjr4cqvxykiw"; + x86_64-linux = "0hj6rpg65ivnnvzfjm16vjpjzzqbabpw5ldrr78x7ddrr06h02z6"; + x86_64-darwin = "01gskihfp5s0j4dw8nxmfsp0sav1zqlmylmvwhi1y2qqq4y9c3w9"; + aarch64-linux = "07n1svlkd2ji4b6yvhci6qvx429xipp8y418cqq3173gw8v59lws"; + aarch64-darwin = "0gr94l7lk54fhhhqbiv23hd7d25xilqlwla2dbs5c171nj9pz325"; + armv7l-linux = "0nxnjrzwfvma9zl4x11r45qwqq8mk91cxg47mg33qgr22lvbgz63"; }.${system} or throwSystem; in callPackage ./generic.nix rec { # Please backport all compatible updates to the stable release. # This is important for the extension ecosystem. - version = "1.71.2"; + version = "1.72.1"; pname = "vscode"; executableName = "code" + lib.optionalString isInsiders "-insiders"; diff --git a/pkgs/applications/editors/vscode/vscodium.nix b/pkgs/applications/editors/vscode/vscodium.nix index 49c5cf00044..ea081382b51 100644 --- a/pkgs/applications/editors/vscode/vscodium.nix +++ b/pkgs/applications/editors/vscode/vscodium.nix @@ -15,11 +15,11 @@ let archive_fmt = if stdenv.isDarwin then "zip" else "tar.gz"; sha256 = { - x86_64-linux = "1ajls31iqvrcnydwdn2fhajz76j60vsqhn343237jgwfbvaklvav"; - x86_64-darwin = "100p494k1gfzhd86nj9hvh0w73i4wjn2vy6jdpb66rrmswy2hr40"; - aarch64-linux = "066g825s79hmwl5yl7yl0yf6vzr3nagb44bcqw1zp1iqv54f40c6"; - aarch64-darwin = "02aln53zcjp689ivq3ypid2gk9pwbqs24n1ay0hibvrpkx3v4y8k"; - armv7l-linux = "1qvz1233k31baw09p45x67cfadsgm1jnnfc4r8yvrh75iplcspgl"; + x86_64-linux = "01b6w97miai191b2d1lr7cwv36vjvwv1hjggr0g9gfr5j99yzdw3"; + x86_64-darwin = "1vf6sdm19r1d6a6ljz3jlvqddgyrdqcxpha4x80ar3kwddy254kb"; + aarch64-linux = "1i48lck395i6lzcxwzfhijs5d141wnxbxg5rzgprm2hgkqx836nr"; + aarch64-darwin = "02xvb41i8ri8l9w8cxxviz63mkskkmxn6rwprpbglpbpxncsxgbn"; + armv7l-linux = "0s0zlql652fwfz94bqmnrl77agd8gf6i5w1y09jpvcc33wv0zlgw"; }.${system} or throwSystem; sourceRoot = if stdenv.isDarwin then "" else "."; @@ -29,7 +29,7 @@ in # Please backport all compatible updates to the stable release. # This is important for the extension ecosystem. - version = "1.71.2.22258"; + version = "1.72.1.22284"; pname = "vscodium"; executableName = "codium"; diff --git a/pkgs/applications/emulators/mgba/default.nix b/pkgs/applications/emulators/mgba/default.nix index 4424bedc6f2..ce0ea6d6de8 100644 --- a/pkgs/applications/emulators/mgba/default.nix +++ b/pkgs/applications/emulators/mgba/default.nix @@ -3,12 +3,14 @@ , fetchFromGitHub , SDL2 , cmake -, libepoxy -, ffmpeg_4 +, copyDesktopItems +, ffmpeg , imagemagick , libedit , libelf +, libepoxy , libzip +, lua , makeDesktopItem , minizip , pkg-config @@ -18,31 +20,33 @@ , wrapQtAppsHook }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "mgba"; - version = "0.9.3"; + version = "0.10.0"; src = fetchFromGitHub { owner = "mgba-emu"; repo = "mgba"; - rev = version; - hash = "sha256-0ZtoyyoD+YjplJlPFpZgIg5119j/6X8ZaSZP+UpX5K0="; + rev = finalAttrs.version; + hash = "sha256-2thc2v3aD8t1PrREZIjzRuYfP7b3BA7uFb6R95zxsZI="; }; nativeBuildInputs = [ cmake + copyDesktopItems pkg-config wrapQtAppsHook ]; buildInputs = [ SDL2 - libepoxy - ffmpeg_4 + ffmpeg imagemagick libedit libelf + libepoxy libzip + lua minizip qtbase qtmultimedia @@ -79,9 +83,9 @@ stdenv.mkDerivation rec { runners, and a modern feature set for emulators that older emulators may not support. ''; + changelog = "https://github.com/mgba-emu/mgba/blob/${finalAttrs.version}/CHANGES"; license = licenses.mpl20; maintainers = with maintainers; [ MP2E AndersonTorres ]; platforms = platforms.linux; }; -} -# TODO: use desktopItem functions +}) diff --git a/pkgs/applications/emulators/np2kai/default.nix b/pkgs/applications/emulators/np2kai/default.nix index dd5e53967c0..cf55085b78a 100644 --- a/pkgs/applications/emulators/np2kai/default.nix +++ b/pkgs/applications/emulators/np2kai/default.nix @@ -124,7 +124,7 @@ stdenv.mkDerivation rec { configurePhase = '' export GIT_VERSION=${builtins.substring 0 7 src.rev} - buildFlags="$buildFlags ''${enableParallelBuilding:+-j$NIX_BUILD_CORES -l$NIX_BUILD_CORES}" + buildFlags="$buildFlags ''${enableParallelBuilding:+-j$NIX_BUILD_CORES" '' + optionalString enableX11 '' cd x11 substituteInPlace Makefile.am \ diff --git a/pkgs/applications/emulators/rpcs3/default.nix b/pkgs/applications/emulators/rpcs3/default.nix index 3f8c2fc97b0..c53276659e0 100644 --- a/pkgs/applications/emulators/rpcs3/default.nix +++ b/pkgs/applications/emulators/rpcs3/default.nix @@ -9,10 +9,10 @@ let # Keep these separate so the update script can regex them - rpcs3GitVersion = "14141-d686b48f6"; - rpcs3Version = "0.0.24-14141-d686b48f6"; - rpcs3Revision = "d686b48f6549c736661e14d1e0990b043c32e3c2"; - rpcs3Sha256 = "1jzpb189isy9kc6l5cy1nfx0wq5cri753sh32b1xq259lkqihdp5"; + rpcs3GitVersion = "14241-92b08a4fa"; + rpcs3Version = "0.0.24-14241-92b08a4fa"; + rpcs3Revision = "92b08a4fafb1e36ccc23ac7e2a9b10e91a9b6df7"; + rpcs3Sha256 = "01h9m4cdywdfhiv5kjd7cv53spv3g2ixk3dvji14vi28zac8jcxb"; ittapi = fetchFromGitHub { owner = "intel"; diff --git a/pkgs/applications/file-managers/spacefm/default.nix b/pkgs/applications/file-managers/spacefm/default.nix index 433109cd86a..334228f98ea 100644 --- a/pkgs/applications/file-managers/spacefm/default.nix +++ b/pkgs/applications/file-managers/spacefm/default.nix @@ -45,9 +45,9 @@ stdenv.mkDerivation rec { gappsWrapperArgs+=(--prefix XDG_DATA_DIRS : "${shared-mime-info}/share") ''; - nativeBuildInputs = [ pkg-config ]; + nativeBuildInputs = [ pkg-config intltool ]; buildInputs = [ - gtk3 udev desktop-file-utils shared-mime-info intltool + gtk3 udev desktop-file-utils shared-mime-info wrapGAppsHook ffmpegthumbnailer jmtpfs lsof udisks2 ] ++ (if ifuseSupport then [ ifuse ] else []); # Introduced because ifuse doesn't build due to CVEs in libplist diff --git a/pkgs/applications/file-managers/xfe/default.nix b/pkgs/applications/file-managers/xfe/default.nix index d59b936608c..c861c695598 100644 --- a/pkgs/applications/file-managers/xfe/default.nix +++ b/pkgs/applications/file-managers/xfe/default.nix @@ -9,8 +9,8 @@ stdenv.mkDerivation rec { sha256 = "1v1v0vcbnm30kpyd3rj8f56yh7lfnwy7nbs9785wi229b29fiqx1"; }; - nativeBuildInputs = [ pkg-config ]; - buildInputs = [ fox gettext xlibsWrapper gcc intltool file libpng ]; + nativeBuildInputs = [ pkg-config intltool ]; + buildInputs = [ fox gettext xlibsWrapper gcc file libpng ]; preConfigure = '' sed -i s,/usr/share/xfe,$out/share/xfe, src/xfedefs.h diff --git a/pkgs/applications/gis/spatialite-gui/default.nix b/pkgs/applications/gis/spatialite-gui/default.nix index 541d0da8d73..76014887d2b 100644 --- a/pkgs/applications/gis/spatialite-gui/default.nix +++ b/pkgs/applications/gis/spatialite-gui/default.nix @@ -20,7 +20,7 @@ , sqlite , virtualpg , wxGTK -, wxmac +, xz , zstd , Carbon , Cocoa @@ -56,9 +56,10 @@ stdenv.mkDerivation rec { proj sqlite virtualpg + wxGTK + xz zstd - ] ++ lib.optional stdenv.isLinux wxGTK - ++ lib.optionals stdenv.isDarwin [ Carbon Cocoa IOKit wxmac ]; + ] ++ lib.optionals stdenv.isDarwin [ Carbon Cocoa IOKit ]; enableParallelBuilding = true; diff --git a/pkgs/applications/graphics/cyan/default.nix b/pkgs/applications/graphics/cyan/default.nix new file mode 100644 index 00000000000..2e59c6716b7 --- /dev/null +++ b/pkgs/applications/graphics/cyan/default.nix @@ -0,0 +1,42 @@ +{ lib +, stdenv +, fetchFromGitHub +, qt5 +, cmake +, pkg-config +, imagemagick +, nix-update-script +}: + +stdenv.mkDerivation rec { + pname = "cyan"; + version = "1.2.4"; + + src = fetchFromGitHub { + owner = "rodlie"; + repo = pname; + rev = version; + hash = "sha256-R5sj8AN7UT9OIeUPNrdTIUQvtEitXp1A32l/Z2qRS94="; + }; + + nativeBuildInputs = [ + cmake + pkg-config + qt5.wrapQtAppsHook + ]; + + buildInputs = [ imagemagick ]; + + passthru.updateScript = nix-update-script { + attrPath = pname; + }; + + meta = with lib; { + description = "Image viewer and converter, designed for prepress (print) work"; + homepage = "https://github.com/rodlie/cyan"; + mainProgram = "Cyan"; + license = licenses.cecill21; + platforms = platforms.linux; + maintainers = with maintainers; [ zendo ]; + }; +} diff --git a/pkgs/applications/graphics/gnome-photos/default.nix b/pkgs/applications/graphics/gnome-photos/default.nix index 774e377ca03..ef731caf1a2 100644 --- a/pkgs/applications/graphics/gnome-photos/default.nix +++ b/pkgs/applications/graphics/gnome-photos/default.nix @@ -1,4 +1,5 @@ -{ lib, stdenv +{ stdenv +, lib , fetchurl , at-spi2-core , babl @@ -7,22 +8,19 @@ , dleyna-renderer , gdk-pixbuf , gegl -, geocode-glib +, geocode-glib_2 , gettext , gexiv2 -, gfbgraph , glib , gnome-online-accounts , gnome , gobject-introspection -, grilo -, grilo-plugins , gsettings-desktop-schemas , gtk3 , itstool , libdazzle +, libportal-gtk3 , libhandy -, libgdata , libxml2 , meson , ninja @@ -36,13 +34,13 @@ stdenv.mkDerivation rec { pname = "gnome-photos"; - version = "42.0"; + version = "43.0"; outputs = [ "out" "installedTests" ]; src = fetchurl { url = "mirror://gnome/sources/${pname}/${lib.versions.major version}/${pname}-${version}.tar.xz"; - sha256 = "JcsoFCUZnex7BF8T8y+PlgNMsMuLlNlvnf+vT1vmhVE="; + sha256 = "x6x0WNUz8p2VUBHHS3YiTXnqMbzBLp1tDOe2w3BNCOE="; }; patches = [ @@ -73,18 +71,15 @@ stdenv.mkDerivation rec { dleyna-renderer gdk-pixbuf gegl - geocode-glib + geocode-glib_2 gexiv2 - gfbgraph glib gnome-online-accounts - grilo - grilo-plugins gsettings-desktop-schemas gtk3 libdazzle + libportal-gtk3 libhandy - libgdata tracker tracker-miners # For 'org.freedesktop.Tracker.Miner.Files' GSettings schema diff --git a/pkgs/applications/graphics/gpicview/default.nix b/pkgs/applications/graphics/gpicview/default.nix index ae1e64297bd..06c3b03ae53 100644 --- a/pkgs/applications/graphics/gpicview/default.nix +++ b/pkgs/applications/graphics/gpicview/default.nix @@ -16,9 +16,9 @@ stdenv.mkDerivation rec { }) ]; - nativeBuildInputs = [ pkg-config ]; + nativeBuildInputs = [ pkg-config intltool ]; - buildInputs = [ intltool gtk2 ]; + buildInputs = [ gtk2 ]; meta = with lib; { description = "A simple and fast image viewer for X"; diff --git a/pkgs/applications/graphics/image-roll/default.nix b/pkgs/applications/graphics/image-roll/default.nix index 49cf0ff1b60..461a07837d8 100644 --- a/pkgs/applications/graphics/image-roll/default.nix +++ b/pkgs/applications/graphics/image-roll/default.nix @@ -3,7 +3,7 @@ , fetchFromGitHub , glib , pkg-config -, wrapGAppsHook +, wrapGAppsHook4 , gtk4 }: @@ -20,7 +20,7 @@ rustPlatform.buildRustPackage rec { cargoSha256 = "sha256-cUE2IZOunR/NIo/qytORRfNqCsf87LfpKA8o/v4Nkhk="; - nativeBuildInputs = [ glib pkg-config wrapGAppsHook ]; + nativeBuildInputs = [ glib pkg-config wrapGAppsHook4 ]; buildInputs = [ gtk4 ]; @@ -29,7 +29,7 @@ rustPlatform.buildRustPackage rec { "--skip=file_list::tests" # sometimes fails on darwin - "image_list::tests::save_current_image_overwrites_image_at_current_image_path_when_filename_is_set_to_none" + "--skip=image_list::tests::save_current_image_overwrites_image_at_current_image_path_when_filename_is_set_to_none" ]; postInstall = '' diff --git a/pkgs/applications/graphics/shotwell/default.nix b/pkgs/applications/graphics/shotwell/default.nix index a4eb3068239..251dfdef32f 100644 --- a/pkgs/applications/graphics/shotwell/default.nix +++ b/pkgs/applications/graphics/shotwell/default.nix @@ -6,11 +6,11 @@ , libexif , libgphoto2 , libwebp -, libsoup +, libsoup_3 , libxml2 , vala , sqlite -, webkitgtk +, webkitgtk_4_1 , pkg-config , gnome , gst_all_1 @@ -30,7 +30,6 @@ , wrapGAppsHook , gobject-introspection , itstool -, libgdata , libchamplain , libsecret , gsettings-desktop-schemas @@ -41,11 +40,11 @@ stdenv.mkDerivation rec { pname = "shotwell"; - version = "0.30.16"; + version = "0.31.5"; src = fetchurl { url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "sha256-yYgs+9rTA8uBYbFJrLtMYX++fKn2q24i0XTiRH51GPo="; + sha256 = "sha256-OwSPxs6ZsjLR4OqbjbB0CDyGyI07bWMTaiz4IXqkXBk="; }; nativeBuildInputs = [ @@ -66,10 +65,10 @@ stdenv.mkDerivation rec { libexif libgphoto2 libwebp - libsoup + libsoup_3 libxml2 sqlite - webkitgtk + webkitgtk_4_1 gst_all_1.gstreamer gst_all_1.gst-libav gst_all_1.gst-plugins-base @@ -87,7 +86,6 @@ stdenv.mkDerivation rec { librest gcr gnome.adwaita-icon-theme - libgdata libchamplain libsecret ]; diff --git a/pkgs/applications/graphics/synfigstudio/default.nix b/pkgs/applications/graphics/synfigstudio/default.nix index a77a0313223..c87a71fdf6c 100644 --- a/pkgs/applications/graphics/synfigstudio/default.nix +++ b/pkgs/applications/graphics/synfigstudio/default.nix @@ -114,7 +114,6 @@ stdenv.mkDerivation { gtk3 gtkmm3 imagemagick - intltool libjack2 libsigcxx libxmlxx diff --git a/pkgs/applications/graphics/xaos/default.nix b/pkgs/applications/graphics/xaos/default.nix index 15c2d468fb4..2ba96fda3f0 100644 --- a/pkgs/applications/graphics/xaos/default.nix +++ b/pkgs/applications/graphics/xaos/default.nix @@ -12,9 +12,10 @@ stdenv.mkDerivation rec { hardeningDisable = [ "format" ]; + nativeBuildInputs = [ intltool ]; buildInputs = [ aalib gsl libpng libX11 xorgproto libXext - libXt zlib gettext intltool perl + libXt zlib gettext perl ]; preConfigure = '' diff --git a/pkgs/applications/logging/humioctl/default.nix b/pkgs/applications/logging/humioctl/default.nix index 2003eb5264e..a1959b473dd 100644 --- a/pkgs/applications/logging/humioctl/default.nix +++ b/pkgs/applications/logging/humioctl/default.nix @@ -1,8 +1,8 @@ { buildGoModule, fetchFromGitHub, installShellFiles, lib }: let - humioCtlVersion = "0.30.1"; - sha256 = "sha256-w+mZi3KdBnBRII/Mi+1SN/u4dhz2vfqn3nzU6AKk4yM="; + humioCtlVersion = "0.30.2"; + sha256 = "sha256-FqBS6PoEKMqK590f58re4ycYmrJScyij74Ngj+PLzLs="; vendorSha256 = "sha256-70QxW2nn6PS6HZWllmQ8O39fbUcbe4c/nKAygLnD4n0="; in buildGoModule { name = "humioctl-${humioCtlVersion}"; diff --git a/pkgs/applications/misc/almanah/default.nix b/pkgs/applications/misc/almanah/default.nix index 5e4f4482354..3b27f5b96e3 100644 --- a/pkgs/applications/misc/almanah/default.nix +++ b/pkgs/applications/misc/almanah/default.nix @@ -5,15 +5,15 @@ , atk , cairo , desktop-file-utils -, evolution-data-server +, evolution-data-server-gtk4 , evolution -, gcr +, gcr_4 , gettext , glib , gnome , gpgme , gtk3 -, gtksourceview3 +, gtksourceview4 , gtkspell3 , libcryptui , libxml2 @@ -42,6 +42,20 @@ stdenv.mkDerivation rec { url = "https://gitlab.gnome.org/GNOME/almanah/-/commit/8c42a67695621d1e30cec933a04e633e6030bbaf.patch"; sha256 = "qyqFgYSu4emFDG/Mjwz1bZb3v3/4gwQSKmGCoPPNYCQ="; }) + + # Port to Gcr 4 + # https://gitlab.gnome.org/GNOME/almanah/-/merge_requests/14 + (fetchpatch { + url = "https://gitlab.gnome.org/GNOME/almanah/-/commit/cd44b476f4ffbf37c5d5f5b996ecd711db925576.patch"; + sha256 = "wJ1035NxgeTwUa0LoNcB6TSLxffoXBR3WbGAGkfggYY="; + }) + + # Port to GtkSourceView 4 + # https://gitlab.gnome.org/GNOME/almanah/-/merge_requests/15 + (fetchpatch { + url = "https://gitlab.gnome.org/GNOME/almanah/-/commit/0ba7f05cba7feaf2ae2c220596aead5dfc676675.patch"; + sha256 = "5uvHTPzQloEq8SVt3EnZ+8mziBdXsDmu/e92/RtyFzE="; + }) ]; nativeBuildInputs = [ @@ -58,13 +72,13 @@ stdenv.mkDerivation rec { buildInputs = [ atk cairo - evolution-data-server - gcr + evolution-data-server-gtk4 + gcr_4 glib evolution gpgme gtk3 - gtksourceview3 + gtksourceview4 gtkspell3 libcryptui sqlite diff --git a/pkgs/applications/misc/bemenu/default.nix b/pkgs/applications/misc/bemenu/default.nix index 9f69cdc5d2d..5b78e999320 100644 --- a/pkgs/applications/misc/bemenu/default.nix +++ b/pkgs/applications/misc/bemenu/default.nix @@ -11,13 +11,13 @@ assert x11Support -> xorg != null; stdenv.mkDerivation rec { pname = "bemenu"; - version = "0.6.12"; + version = "0.6.13"; src = fetchFromGitHub { owner = "Cloudef"; repo = pname; rev = version; - sha256 = "sha256-u8DQn1WIQjt1Be3WMAUNr/4qQm4vLGaj5RY49sQVpFI="; + sha256 = "sha256-YGaAJOyVZBHEWQuZVfPIIbtuntv1klQk9GcWRN+oVF4="; }; nativeBuildInputs = [ pkg-config pcre ]; diff --git a/pkgs/applications/misc/bfcal/default.nix b/pkgs/applications/misc/bfcal/default.nix new file mode 100644 index 00000000000..9b77d1ebe3c --- /dev/null +++ b/pkgs/applications/misc/bfcal/default.nix @@ -0,0 +1,41 @@ +{ stdenv +, lib +, fetchFromSourcehut +, meson +, ninja +, pkg-config +, wrapQtAppsHook +, qtbase +}: + +stdenv.mkDerivation rec { + pname = "bfcal"; + version = "1.0"; + + src = fetchFromSourcehut { + owner = "~bitfehler"; + repo = "bfcal"; + rev = "v${version}"; + sha256 = "sha256-2z5ICVEZ55omwcoVWpac/HPwyKF9jDCYO78S9p21VMU="; + }; + + nativeBuildInputs = [ + meson ninja pkg-config wrapQtAppsHook + ]; + + buildInputs = [ + qtbase + ]; + + postInstall = '' + mkdir -p $out/bin + install bfcal $out/bin + ''; + + meta = with lib; { + description = "Quickly display a calendar"; + homepage = "https://git.sr.ht/~bitfehler/bfcal"; + license = licenses.gpl3Plus; + maintainers = with maintainers; [ laalsaas ]; + }; +} diff --git a/pkgs/applications/misc/calibre/default.nix b/pkgs/applications/misc/calibre/default.nix index e573ee93d21..da230acbbe6 100644 --- a/pkgs/applications/misc/calibre/default.nix +++ b/pkgs/applications/misc/calibre/default.nix @@ -124,11 +124,11 @@ stdenv.mkDerivation rec { pycryptodome # the following are distributed with calibre, but we use upstream instead odfpy - ] ++ lib.optionals (lib.lists.any (p: p == stdenv.hostPlatform.system) pyqtwebengine.meta.platforms) [ + ] ++ lib.optionals (lib.lists.any (p: p == stdenv.hostPlatform.system) pyqt6-webengine.meta.platforms) [ # much of calibre's functionality is usable without a web # browser, so we enable building on platforms which qtwebengine # does not support by simply omitting qtwebengine. - pyqtwebengine + pyqt6-webengine ] ++ lib.optional (unrarSupport) unrardll ); diff --git a/pkgs/applications/misc/chrysalis/default.nix b/pkgs/applications/misc/chrysalis/default.nix index 749dc4b8e86..8206698ce2e 100644 --- a/pkgs/applications/misc/chrysalis/default.nix +++ b/pkgs/applications/misc/chrysalis/default.nix @@ -2,7 +2,7 @@ let pname = "chrysalis"; - version = "0.11.5"; + version = "0.11.8"; in appimageTools.wrapAppImage rec { name = "${pname}-${version}-binary"; @@ -10,7 +10,7 @@ in appimageTools.wrapAppImage rec { inherit name; src = fetchurl { url = "https://github.com/keyboardio/${pname}/releases/download/v${version}/${pname}-${version}.AppImage"; - sha256 = "sha256-3GdObGW91nDqOAlHcaI/4wnbl2EG2RGGzpwY+XYQ0u4="; + sha256 = "sha256-yyb6sRCPjHCK0tkuHTffw2NkZHcqw9tIdHbbBiKLGu8="; }; }; diff --git a/pkgs/applications/misc/dbeaver/default.nix b/pkgs/applications/misc/dbeaver/default.nix index 32440ad7df1..ceb1b9833c9 100644 --- a/pkgs/applications/misc/dbeaver/default.nix +++ b/pkgs/applications/misc/dbeaver/default.nix @@ -23,16 +23,16 @@ inherit maven; # use overridden maven version (see dbeaver's entry in all-packages.nix) }) rec { pname = "dbeaver"; - version = "22.2.0"; # When updating also update mvnSha256 + version = "22.2.2"; # When updating also update mvnSha256 src = fetchFromGitHub { owner = "dbeaver"; repo = "dbeaver"; rev = version; - sha256 = "sha256-T2S5qoOqjqJGf7M4h+IFO+bBER3aNcbxC7CY1fJFqpg="; + sha256 = "sha256-TUdtrhQ1JzqZx+QNauNA1P/+WDSSeOGIgGX3SdS0JTI="; }; - mvnSha256 = "HdIhENml6W4U+gM7ODxXinbex5o1X4YhWGTct5rpL5c="; + mvnSha256 = "uu7UNRIuAx2GOh4+YxxoGRcV5QO8C72q32e0ynJdgFo="; mvnParameters = "-P desktop,all-platforms"; nativeBuildInputs = [ diff --git a/pkgs/applications/misc/devilspie2/default.nix b/pkgs/applications/misc/devilspie2/default.nix index b9d8b0f9797..581a8126cad 100644 --- a/pkgs/applications/misc/devilspie2/default.nix +++ b/pkgs/applications/misc/devilspie2/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "devilspie2"; - version = "0.43"; + version = "0.44"; src = fetchurl { - url = "https://download.savannah.gnu.org/releases/devilspie2/devilspie2_${version}-src.tar.gz"; - sha256 = "0a7qjl2qd4099kkkbwa1y2fk48s21jlr409lf9mij7mlc9yc3zzc"; + url = "https://download.savannah.gnu.org/releases/devilspie2/devilspie2-${version}.tar.xz"; + sha256 = "Cp8erdKyKjGBY+QYAGXUlSIboaQ60gIepoZs0RgEJkA="; }; nativeBuildInputs = [ intltool pkg-config ]; @@ -27,7 +27,7 @@ stdenv.mkDerivation rec { positioned at a specific screen position, or position a window on a specific workspace. ''; - homepage = "https://www.gusnan.se/devilspie2/"; + homepage = "https://www.nongnu.org/devilspie2/"; license = licenses.gpl3; maintainers = [ maintainers.ebzzry ]; platforms = platforms.linux; diff --git a/pkgs/applications/misc/diff-pdf/default.nix b/pkgs/applications/misc/diff-pdf/default.nix index 186826e6f7d..918605366fe 100644 --- a/pkgs/applications/misc/diff-pdf/default.nix +++ b/pkgs/applications/misc/diff-pdf/default.nix @@ -1,12 +1,5 @@ -{ lib, stdenv, fetchFromGitHub, autoconf, automake, pkg-config, cairo, poppler, wxGTK ? null, wxmac ? null, darwin ? null }: +{ lib, stdenv, fetchFromGitHub, autoconf, automake, pkg-config, cairo, poppler, wxGTK, Cocoa }: -let - wxInputs = - if stdenv.isDarwin then - [ wxmac darwin.apple_sdk.frameworks.Cocoa ] - else - [ wxGTK ]; -in stdenv.mkDerivation rec { pname = "diff-pdf"; version = "0.5"; @@ -19,7 +12,8 @@ stdenv.mkDerivation rec { }; nativeBuildInputs = [ autoconf automake pkg-config ]; - buildInputs = [ cairo poppler ] ++ wxInputs; + buildInputs = [ cairo poppler wxGTK ] + ++ lib.optionals stdenv.isDarwin [ Cocoa ]; preConfigure = "./bootstrap"; diff --git a/pkgs/applications/misc/endeavour/default.nix b/pkgs/applications/misc/endeavour/default.nix new file mode 100644 index 00000000000..3c48efe66c4 --- /dev/null +++ b/pkgs/applications/misc/endeavour/default.nix @@ -0,0 +1,104 @@ +{ lib +, stdenv +, fetchFromGitLab +, fetchpatch +, meson +, ninja +, pkg-config +, wrapGAppsHook4 +, gettext +, gnome +, glib +, gtk4 +, wayland +, libadwaita +, libpeas +, gnome-online-accounts +, gsettings-desktop-schemas +, libportal-gtk4 +, evolution-data-server-gtk4 +, libical +, librest +, json-glib +, itstool +, gitUpdater +}: + +stdenv.mkDerivation rec { + pname = "endeavour"; + version = "42.0"; + + src = fetchFromGitLab { + domain = "gitlab.gnome.org"; + owner = "World"; + repo = "Endeavour"; + rev = "v${version}"; + sha256 = "U91WAoyIeQ0WbFbOCrbFJjbWe2eT7b/VL2M1hNXxyzQ="; + }; + + patches = [ + # fix build race bug https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=257667 + (fetchpatch { + url = "https://cgit.freebsd.org/ports/plain/deskutils/gnome-todo/files/patch-src_meson.build?id=a4faaf6cf7835014b5f69a337b544ea4ee7f9655"; + sha256 = "sha256-dio4Mg+5OGrnjtRAf4LwowO0sG50HRmlNR16cbDvEUY="; + extraPrefix = ""; + name = "gnome-todo_meson-build.patch"; + }) + + # build: Fix building with -Werror=format-security + # https://gitlab.gnome.org/World/Endeavour/-/merge_requests/132 + (fetchpatch { + url = "https://gitlab.gnome.org/World/Endeavour/-/commit/3bad03e90fcc28f6e3f87f2c90df5984dbeb0791.patch"; + sha256 = "sha256-HRkNfhn+EH0Fc+KBDdX1Q+T9QWSctTOn1cvecP2N0zo="; + }) + + # build: Use GNOME module post_install() + # https://gitlab.gnome.org/World/Endeavour/-/merge_requests/135 + (fetchpatch { + url = "https://gitlab.gnome.org/World/Endeavour/-/commit/a8daa1d8acd0a5da7aef54d6e16d8a585c71e555.patch"; + sha256 = "sha256-zUTQ36eUMOY9ODAgwSKUhSlB9Cj0Yu/60KjFFW5fx2I="; + }) + ]; + + nativeBuildInputs = [ + meson + ninja + pkg-config + gettext + wrapGAppsHook4 + itstool + ]; + + buildInputs = [ + glib + gtk4 + wayland # required by gtk header + libadwaita + libpeas + gnome-online-accounts + gsettings-desktop-schemas + gnome.adwaita-icon-theme + + # Plug-ins + libportal-gtk4 # background + evolution-data-server-gtk4 # eds + libical + librest # todoist + json-glib # todoist + ]; + + passthru = { + updateScript = gitUpdater { + inherit pname version; + rev-prefix = "v"; + }; + }; + + meta = with lib; { + description = "Personal task manager for GNOME"; + homepage = "https://gitlab.gnome.org/World/Endeavour"; + license = licenses.gpl3Plus; + maintainers = teams.gnome.members; + platforms = platforms.linux; + }; +} diff --git a/pkgs/applications/misc/far2l/default.nix b/pkgs/applications/misc/far2l/default.nix index aafc332f6b9..2a23aac79f8 100644 --- a/pkgs/applications/misc/far2l/default.nix +++ b/pkgs/applications/misc/far2l/default.nix @@ -2,7 +2,7 @@ , xdg-utils, zip, unzip, gzip, bzip2, gnutar, p7zip, xz , IOKit, Carbon, Cocoa, AudioToolbox, OpenGL , withTTYX ? true, libX11 -, withGUI ? true, wxGTK30, wxmac +, withGUI ? true, wxGTK32 , withUCD ? true, libuchardet # Plugins @@ -12,18 +12,15 @@ , withPython ? false, python3Packages }: -let - wxWidgets = (if stdenv.isDarwin then wxmac else wxGTK30); -in stdenv.mkDerivation rec { pname = "far2l"; - version = "2.4.0"; + version = "2.4.1"; src = fetchFromGitHub { owner = "elfmz"; repo = "far2l"; rev = "v_${version}"; - sha256 = "sha256-nfoAElPLQ97lj65MBX4JMEdgTFbkdEbR1BazYZgV/lg="; + sha256 = "sha256-0t1ND6LmDcivfrZ8RaEr1vjeS5JtaeWkoHkl2e7Xr5s="; }; patches = [ ./python_prebuild.patch ]; @@ -31,7 +28,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake ninja pkg-config m4 makeWrapper ]; buildInputs = lib.optional withTTYX libX11 - ++ lib.optional withGUI wxWidgets + ++ lib.optional withGUI wxGTK32 ++ lib.optional withUCD libuchardet ++ lib.optionals withColorer [ spdlog xercesc ] ++ lib.optionals withMultiArc [ libarchive pcre ] @@ -73,7 +70,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "Linux port of FAR Manager v2, a program for managing files and archives in Windows operating systems"; homepage = "https://github.com/elfmz/far2l"; - license = licenses.gpl2Plus; # NOTE: might change in far2l repo soon, check next time + license = licenses.gpl2Only; maintainers = with maintainers; [ hypersw ]; platforms = platforms.unix; }; diff --git a/pkgs/applications/misc/free42/default.nix b/pkgs/applications/misc/free42/default.nix index 9f1b6f73a1a..0d01122e6a5 100644 --- a/pkgs/applications/misc/free42/default.nix +++ b/pkgs/applications/misc/free42/default.nix @@ -10,13 +10,13 @@ stdenv.mkDerivation rec { pname = "free42"; - version = "3.0.14"; + version = "3.0.15"; src = fetchFromGitHub { owner = "thomasokken"; repo = pname; rev = "v${version}"; - hash = "sha256-Jx+MLItr+rIGfzJdQku1pRXaIldfrpG3vfOhjebSIZA="; + hash = "sha256-QeUopHBW3KZGkYklOJIjlNCQG+aab2vwbIsVBfQ07R4="; }; nativeBuildInputs = [ diff --git a/pkgs/applications/misc/genact/default.nix b/pkgs/applications/misc/genact/default.nix index cb08cfb334a..061fce57263 100644 --- a/pkgs/applications/misc/genact/default.nix +++ b/pkgs/applications/misc/genact/default.nix @@ -1,17 +1,29 @@ -{ lib, rustPlatform, fetchFromGitHub }: +{ lib, rustPlatform, fetchFromGitHub, installShellFiles }: rustPlatform.buildRustPackage rec { pname = "genact"; - version = "1.2.0"; + version = "1.2.2"; src = fetchFromGitHub { owner = "svenstaro"; repo = pname; rev = "v${version}"; - sha256 = "sha256-POOXawhxrPT2UgbSZE3r0br7cqJ0ao7MpycrPYa/oCc="; + sha256 = "sha256-MB/i1jCxoGE8cPF+NE8aS7kF7ZsGb4+OyLcPcGp1hwI="; }; - cargoSha256 = "sha256-2c34YarMFw2CK+7zn41GL5tXfXfnw3NvGtgSlPH5d64="; + cargoSha256 = "sha256-OBGJIR3REeMxHQu3ovEKSZZ8QNlhl/5jvWbR5OdsRTQ="; + + nativeBuildInputs = [ installShellFiles ]; + + postInstall = '' + $out/bin/genact --print-manpage > genact.1 + installManPage genact.1 + + installShellCompletion --cmd genact \ + --bash <($out/bin/genact --print-completions bash) \ + --fish <($out/bin/genact --print-completions fish) \ + --zsh <($out/bin/genact --print-completions zsh) + ''; meta = with lib; { description = "A nonsense activity generator"; diff --git a/pkgs/applications/misc/gpxsee/default.nix b/pkgs/applications/misc/gpxsee/default.nix index 2973ac81539..d7177906287 100644 --- a/pkgs/applications/misc/gpxsee/default.nix +++ b/pkgs/applications/misc/gpxsee/default.nix @@ -4,13 +4,13 @@ stdenv.mkDerivation rec { pname = "gpxsee"; - version = "11.5"; + version = "11.6"; src = fetchFromGitHub { owner = "tumic0"; repo = "GPXSee"; rev = version; - hash = "sha256-bA5C+BFqeOS0oFgz/qlYOFMsuh3L/U6QJbzOcRQkNhY="; + hash = "sha256-kwEltkLcMCZlUJyE+nyy70WboVO1FgMw0cH1hxLVtKQ="; }; patches = (substituteAll { diff --git a/pkgs/applications/misc/grsync/default.nix b/pkgs/applications/misc/grsync/default.nix index c8068d68223..3a6a717b6e1 100644 --- a/pkgs/applications/misc/grsync/default.nix +++ b/pkgs/applications/misc/grsync/default.nix @@ -25,7 +25,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "Synchronize folders, files and make backups"; homepage = "http://www.opbyte.it/grsync/"; - license = licenses.gpl1; + license = licenses.gpl2Only; platforms = platforms.linux; maintainers = [ maintainers.kuznero ]; }; diff --git a/pkgs/applications/misc/gum/default.nix b/pkgs/applications/misc/gum/default.nix index 416de12bcb1..d4bd7c63a72 100644 --- a/pkgs/applications/misc/gum/default.nix +++ b/pkgs/applications/misc/gum/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "gum"; - version = "0.7.0"; + version = "0.8.0"; src = fetchFromGitHub { owner = "charmbracelet"; repo = pname; rev = "v${version}"; - sha256 = "sha256-T8dIk99qUMyeZvfM+rLA13HAmITQ8SMsQ9uIXtMM+MM="; + sha256 = "sha256-6x1t/PLs1dqlY5XQ1F0PDqZ/TofZ0h1hTc0C1sjn3fA="; }; - vendorSha256 = "sha256-sht9e4pam4aJCylUZPeVGwk9TYttumJSniNVxI0LfNM="; + vendorSha256 = "sha256-rOBwhPXo4sTSI3j3rn3c5qWGnGFgkpeFUKgtzKBltbg="; nativeBuildInputs = [ installShellFiles diff --git a/pkgs/applications/misc/gv/default.nix b/pkgs/applications/misc/gv/default.nix index 851f2d80c97..d5aa1ac8817 100644 --- a/pkgs/applications/misc/gv/default.nix +++ b/pkgs/applications/misc/gv/default.nix @@ -13,11 +13,11 @@ stdenv.mkDerivation rec { "--enable-SIGCHLD-fallback" ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ Xaw3d ghostscriptX perl - pkg-config ] ++ lib.optionals stdenv.isDarwin [ libiconv ]; diff --git a/pkgs/applications/misc/gxmessage/default.nix b/pkgs/applications/misc/gxmessage/default.nix index f7c5714f126..fb172eb22b0 100644 --- a/pkgs/applications/misc/gxmessage/default.nix +++ b/pkgs/applications/misc/gxmessage/default.nix @@ -9,8 +9,8 @@ stdenv.mkDerivation rec { sha256 = "db4e1655fc58f31e5770a17dfca4e6c89028ad8b2c8e043febc87a0beedeef05"; }; - nativeBuildInputs = [ pkg-config ]; - buildInputs = [ intltool gtk3 texinfo ]; + nativeBuildInputs = [ pkg-config intltool ]; + buildInputs = [ gtk3 texinfo ]; meta = { description = "A GTK enabled dropin replacement for xmessage"; diff --git a/pkgs/applications/misc/mangal/default.nix b/pkgs/applications/misc/mangal/default.nix index bd27a60e744..f14084a865e 100644 --- a/pkgs/applications/misc/mangal/default.nix +++ b/pkgs/applications/misc/mangal/default.nix @@ -2,17 +2,17 @@ buildGoModule rec { pname = "mangal"; - version = "3.11.0"; + version = "3.12.0"; src = fetchFromGitHub { owner = "metafates"; repo = pname; rev = "v${version}"; - hash = "sha256-gBHNB3s7RHHxlxgeUFmxOdYvPaI78AzL4vRaCmXKgus="; + hash = "sha256-1fWy7riInrbReQ0sQ1TF8GhqWQG0KXk1JzhmxlSuvmk="; }; proxyVendor = true; - vendorSha256 = "sha256-dHwookjeF8U/2i0Totho0HY7FdOr/jABmqlQelthc6E="; + vendorSha256 = "sha256-+HDuGSZinotUtCqffrmFkjHegxdArSJMWwnUG/tnLRc="; ldflags = [ "-s" "-w" ]; diff --git a/pkgs/applications/misc/mdzk/default.nix b/pkgs/applications/misc/mdzk/default.nix index 3144f59476b..98bcda9943f 100644 --- a/pkgs/applications/misc/mdzk/default.nix +++ b/pkgs/applications/misc/mdzk/default.nix @@ -8,10 +8,15 @@ rustPlatform.buildRustPackage rec { owner = "mdzk-rs"; repo = "mdzk"; rev = version; - sha256 = "sha256-V//tVcIzhCh03VjwMC+R2ynaOFm+dp6qxa0oqBfvGUs="; + hash = "sha256-V//tVcIzhCh03VjwMC+R2ynaOFm+dp6qxa0oqBfvGUs="; }; - cargoSha256 = "sha256-2lPckUhnyfHaVWXzZXKliolDZiPtNl9UBZIKs6tUaNQ="; + cargoPatches = [ + # Remove when new version of mdzk is released. + ./update-mdbook-for-rust-1.64.patch + ]; + + cargoHash = "sha256-5zGUBvmf68tCk5jGrNn+ukgYbiKzrlmZvWrYgoJf2zk="; buildInputs = lib.optionals stdenv.isDarwin [ CoreServices ]; diff --git a/pkgs/applications/misc/mdzk/update-mdbook-for-rust-1.64.patch b/pkgs/applications/misc/mdzk/update-mdbook-for-rust-1.64.patch new file mode 100644 index 00000000000..79b7240b96f --- /dev/null +++ b/pkgs/applications/misc/mdzk/update-mdbook-for-rust-1.64.patch @@ -0,0 +1,246 @@ +diff --git a/Cargo.lock b/Cargo.lock +index ae63793..4068e02 100644 +--- a/Cargo.lock ++++ b/Cargo.lock +@@ -162,12 +162,46 @@ dependencies = [ + "ansi_term", + "atty", + "bitflags", +- "strsim", +- "textwrap", ++ "strsim 0.8.0", ++ "textwrap 0.11.0", + "unicode-width", + "vec_map", + ] + ++[[package]] ++name = "clap" ++version = "3.2.2" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "8e538f9ee5aa3b3963f09a997035f883677966ed50fce0292611927ce6f6d8c6" ++dependencies = [ ++ "atty", ++ "bitflags", ++ "clap_lex", ++ "indexmap", ++ "lazy_static", ++ "strsim 0.10.0", ++ "termcolor", ++ "textwrap 0.15.1", ++] ++ ++[[package]] ++name = "clap_complete" ++version = "3.2.5" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "3f7a2e0a962c45ce25afce14220bc24f9dade0a1787f185cecf96bfba7847cd8" ++dependencies = [ ++ "clap 3.2.2", ++] ++ ++[[package]] ++name = "clap_lex" ++version = "0.2.4" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "2850f2f5a82cbf437dd5af4d49848fbdfc27c157c3d010345776f952765261c5" ++dependencies = [ ++ "os_str_bytes", ++] ++ + [[package]] + name = "cpufeatures" + version = "0.2.1" +@@ -222,9 +256,9 @@ dependencies = [ + + [[package]] + name = "env_logger" +-version = "0.7.1" ++version = "0.9.1" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "44533bbbb3bb3c1fa17d9f2e4e38bbbaf8396ba82193c4cb1b6445d711445d36" ++checksum = "c90bf5f19754d10198ccb95b70664fc925bd1fc090a0fd9a6ebc54acc8cd6272" + dependencies = [ + "atty", + "humantime", +@@ -385,15 +419,6 @@ dependencies = [ + "version_check", + ] + +-[[package]] +-name = "getopts" +-version = "0.2.21" +-source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "14dbbfd5c71d70241ecf9e6f13737f7b5ce823821063188d7e46c41d371eebd5" +-dependencies = [ +- "unicode-width", +-] +- + [[package]] + name = "getrandom" + version = "0.1.16" +@@ -471,7 +496,7 @@ dependencies = [ + "log", + "pest", + "pest_derive", +- "quick-error 2.0.1", ++ "quick-error", + "serde", + "serde_json", + ] +@@ -575,12 +600,9 @@ checksum = "6456b8a6c8f33fee7d958fcd1b60d55b11940a79e63ae87013e6d22e26034440" + + [[package]] + name = "humantime" +-version = "1.3.0" ++version = "2.1.0" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "df004cfca50ef23c36850aaaa59ad52cc70d0e90243c3c7737a4dd32dc7a3c4f" +-dependencies = [ +- "quick-error 1.2.3", +-] ++checksum = "9a3a5bfb195931eeb336b2a7b4d761daec841b97f947d34394601737a7bba5e4" + + [[package]] + name = "hyper" +@@ -822,13 +844,14 @@ checksum = "a3e378b66a060d48947b590737b30a1be76706c8dd7b8ba0f2fe3989c68a853f" + + [[package]] + name = "mdbook" +-version = "0.4.15" ++version = "0.4.21" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "241f10687eb3b4e0634b3b4e423f97c5f1efbd69dc9522e24a8b94583eeec3c6" ++checksum = "23f3e133c6d515528745ffd3b9f0c7d975ae039f0b6abb099f2168daa2afb4f9" + dependencies = [ + "anyhow", + "chrono", +- "clap", ++ "clap 3.2.2", ++ "clap_complete", + "env_logger", + "handlebars", + "lazy_static", +@@ -838,7 +861,6 @@ dependencies = [ + "pulldown-cmark", + "regex", + "serde", +- "serde_derive", + "serde_json", + "shlex", + "tempfile", +@@ -1062,6 +1084,12 @@ dependencies = [ + "winapi 0.3.9", + ] + ++[[package]] ++name = "os_str_bytes" ++version = "6.3.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "9ff7415e9ae3fff1225851df9e0d9e4e5479f947619774677a63572e55e80eff" ++ + [[package]] + name = "parking_lot" + version = "0.11.2" +@@ -1258,17 +1286,10 @@ source = "registry+https://github.com/rust-lang/crates.io-index" + checksum = "34f197a544b0c9ab3ae46c359a7ec9cbbb5c7bf97054266fecb7ead794a181d6" + dependencies = [ + "bitflags", +- "getopts", + "memchr", + "unicase", + ] + +-[[package]] +-name = "quick-error" +-version = "1.2.3" +-source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "a1d01941d82fa2ab50be1e79e6714289dd7cde78eba4c074bc5a4374f650dfe0" +- + [[package]] + name = "quick-error" + version = "2.0.1" +@@ -1386,9 +1407,9 @@ dependencies = [ + + [[package]] + name = "regex" +-version = "1.5.4" ++version = "1.6.0" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "d07a8629359eb56f1e2fb1652bb04212c072a87ba68546a04065d525673ac461" ++checksum = "4c4eb3267174b8c6c2f654116623910a0fef09c4753f8dd83db29c48a0df988b" + dependencies = [ + "aho-corasick", + "memchr", +@@ -1403,9 +1424,9 @@ checksum = "6c230d73fb8d8c1b9c0b3135c5142a8acee3a0558fb8db5cf1cb65f8d7862132" + + [[package]] + name = "regex-syntax" +-version = "0.6.25" ++version = "0.6.27" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "f497285884f3fcff424ffc933e56d7cbca511def0c9831a7f9b5f6153e3cc89b" ++checksum = "a3f87b73ce11b1619a3c6332f45341e0047173771e8b8b73f87bfeefb7b56244" + + [[package]] + name = "remove_dir_all" +@@ -1577,13 +1598,19 @@ version = "0.8.0" + source = "registry+https://github.com/rust-lang/crates.io-index" + checksum = "8ea5119cdb4c55b55d432abb513a0429384878c15dde60cc77b1c99de1a95a6a" + ++[[package]] ++name = "strsim" ++version = "0.10.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "73473c0e59e6d5812c5dfe2a064a6444949f089e20eec9a2e5506596494e4623" ++ + [[package]] + name = "structopt" + version = "0.3.26" + source = "registry+https://github.com/rust-lang/crates.io-index" + checksum = "0c6b5c64445ba8094a6ab0c3cd2ad323e07171012d9c98b0b15651daf1787a10" + dependencies = [ +- "clap", ++ "clap 2.33.3", + "lazy_static", + "structopt-derive", + ] +@@ -1673,6 +1700,12 @@ dependencies = [ + "unicode-width", + ] + ++[[package]] ++name = "textwrap" ++version = "0.15.1" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "949517c0cf1bf4ee812e2e07e08ab448e3ae0d23472aee8a06c985f0c8815b16" ++ + [[package]] + name = "thiserror" + version = "1.0.30" +diff --git a/Cargo.toml b/Cargo.toml +index dfeeb45..8b1e4e5 100644 +--- a/Cargo.toml ++++ b/Cargo.toml +@@ -38,7 +38,7 @@ handlebars = "4.2.1" + ignore = "0.4.18" + lazy_static = "1.4.0" + lazy-regex = "2.2.2" +-mdbook = { version = "0.4.15", default-features = false } ++mdbook = { version = "0.4.21", default-features = false } + notify = "4.0.17" + pest = "2.1.3" + pest_derive = "2.1.0" +diff --git a/src/renderer/mdzk_renderer.rs b/src/renderer/mdzk_renderer.rs +index 55b2423..f8480ca 100644 +--- a/src/renderer/mdzk_renderer.rs ++++ b/src/renderer/mdzk_renderer.rs +@@ -92,7 +92,7 @@ impl Renderer for HtmlMdzk { + "description", + json!(ctx.config.book.description.clone().unwrap_or_default()), + ); +- if let Some(ref livereload) = html_config.livereload_url { ++ if let Some(ref livereload) = html_config.live_reload_endpoint { + data.insert("livereload", json!(livereload)); + } + data.insert("fold_enable", json!(html_config.fold.enable)); diff --git a/pkgs/applications/misc/obsidian/default.nix b/pkgs/applications/misc/obsidian/default.nix index c38ee194b4e..2ef17f9c1cd 100644 --- a/pkgs/applications/misc/obsidian/default.nix +++ b/pkgs/applications/misc/obsidian/default.nix @@ -12,7 +12,7 @@ let inherit (stdenv.hostPlatform) system; pname = "obsidian"; - version = "0.15.9"; + version = "1.0.0"; appname = "Obsidian"; meta = with lib; { description = "A powerful knowledge base that works on top of a local folder of plain text Markdown files"; @@ -25,7 +25,7 @@ let filename = if stdenv.isDarwin then "Obsidian-${version}-universal.dmg" else "obsidian-${version}.tar.gz"; src = fetchurl { url = "https://github.com/obsidianmd/obsidian-releases/releases/download/v${version}/${filename}"; - sha256 = if stdenv.isDarwin then "1q9almr8k1i2wzksd09libgnvypj5k9j15y6cxg4rgnw32fa152n" else "sha256-Qz1Ic5FtxXIk8J/2spNZaqpPIgx3yNyXiAQllbVrGjw="; + sha256 = if stdenv.isDarwin then "sha256-KVWqdXzbQT93Dj4yesdnfFwAdYin1vfpPsj/ur1AGA0=" else "sha256-H1Cl9SBz/mwN8gezFkcV4KxI7+xVjQV2AtyLKyjVpI8="; }; icon = fetchurl { diff --git a/pkgs/applications/misc/orca/default.nix b/pkgs/applications/misc/orca/default.nix index 639ad2175b4..29cdac6b8d1 100644 --- a/pkgs/applications/misc/orca/default.nix +++ b/pkgs/applications/misc/orca/default.nix @@ -34,13 +34,13 @@ buildPythonApplication rec { pname = "orca"; - version = "42.3"; + version = "43.0"; format = "other"; src = fetchurl { url = "mirror://gnome/sources/${pname}/${lib.versions.major version}/${pname}-${version}.tar.xz"; - sha256 = "+ty6C/6uHmZyJmJk529j/lq/jw77NL4Ri1qXP7by9yQ="; + sha256 = "HKdaAMSoUSoJ5KJuszn615RNHtQayjL3D2lickQhglA="; }; patches = [ diff --git a/pkgs/applications/misc/osmscout-server/default.nix b/pkgs/applications/misc/osmscout-server/default.nix index cefce001eba..c463ade3986 100644 --- a/pkgs/applications/misc/osmscout-server/default.nix +++ b/pkgs/applications/misc/osmscout-server/default.nix @@ -1,7 +1,7 @@ { lib, mkDerivation, fetchFromGitHub, pkg-config , qmake, qttools, kirigami2, qtquickcontrols2, qtlocation , libosmscout, valhalla, libpostal, osrm-backend, protobuf -, libmicrohttpd_0_9_70, sqlite, marisa, kyotocabinet, boost +, libmicrohttpd, sqlite, marisa, kyotocabinet, boost }: let @@ -14,20 +14,20 @@ let in mkDerivation rec { pname = "osmscout-server"; - version = "2.1.2"; + version = "2.2.2"; src = fetchFromGitHub { owner = "rinigus"; repo = "osmscout-server"; rev = version; - sha256 = "sha256-I14nQL0H2rMga+RDdAjykqmf7QIZveA6oGWu5PfZ89s="; + sha256 = "sha256-ngB3c6rUQ/+AeaJHKAFRl9lCkUobLWSnsn030brB+Bw="; fetchSubmodules = true; }; nativeBuildInputs = [ qmake pkg-config qttools ]; buildInputs = [ kirigami2 qtquickcontrols2 qtlocation - valhalla libosmscout osrm-backend libmicrohttpd_0_9_70 + valhalla libosmscout osrm-backend libmicrohttpd libpostal sqlite marisa kyotocabinet boost protobuf date ]; diff --git a/pkgs/applications/misc/parsec/bin.nix b/pkgs/applications/misc/parsec/bin.nix new file mode 100644 index 00000000000..502ee9f7f01 --- /dev/null +++ b/pkgs/applications/misc/parsec/bin.nix @@ -0,0 +1,81 @@ +{ stdenvNoCC, stdenv +, lib +, dpkg, autoPatchelfHook, makeWrapper +, fetchurl +, alsa-lib, openssl, udev +, libglvnd +, libX11, libXcursor, libXi, libXrandr +, libpulseaudio +, libva +, ffmpeg +}: + +stdenvNoCC.mkDerivation { + pname = "parsec-bin"; + version = "150_28"; + + src = fetchurl { + url = "https://web.archive.org/web/20220622215230id_/https://builds.parsecgaming.com/package/parsec-linux.deb"; + sha256 = "1hfdzjd8qiksv336m4s4ban004vhv00cv2j461gc6zrp37s0fwhc"; + }; + + unpackPhase = '' + runHook preUnpack + + dpkg-deb -x $src . + + runHook postUnpack + ''; + + nativeBuildInputs = [ dpkg autoPatchelfHook makeWrapper ]; + + buildInputs = [ + stdenv.cc.cc # libstdc++ + libglvnd + libX11 + ]; + + runtimeDependenciesPath = lib.makeLibraryPath [ + stdenv.cc.cc + libglvnd + openssl + udev + alsa-lib + libpulseaudio + libva + ffmpeg + libX11 + libXcursor + libXi + libXrandr + ]; + + prepareParsec = '' + if [[ ! -e "$HOME/.parsec/appdata.json" ]]; then + mkdir -p "$HOME/.parsec" + cp --no-preserve=mode,ownership,timestamps ${placeholder "out"}/share/parsec/skel/* "$HOME/.parsec/" + fi + ''; + + installPhase = '' + runHook preInstall + + mkdir $out + mv usr/* $out + + wrapProgram $out/bin/parsecd \ + --prefix LD_LIBRARY_PATH : "$runtimeDependenciesPath" \ + --run "$prepareParsec" + + runHook postInstall + ''; + + meta = with lib; { + homepage = "https://parsecgaming.com/"; + description = "Remote streaming service client"; + license = licenses.unfree; + maintainers = with maintainers; [ arcnmx ]; + platforms = platforms.linux; + mainProgram = "parsecd"; + }; +} diff --git a/pkgs/applications/misc/pattypan/default.nix b/pkgs/applications/misc/pattypan/default.nix new file mode 100644 index 00000000000..19a9b18ce19 --- /dev/null +++ b/pkgs/applications/misc/pattypan/default.nix @@ -0,0 +1,62 @@ +{ lib +, stdenv +, fetchFromGitHub +, unzip +, jre +, jdk +, ant +, makeWrapper +, makeDesktopItem +, copyDesktopItems +, glib +, wrapGAppsHook +}: + +stdenv.mkDerivation rec { + pname = "pattypan"; + version = "22.03"; + + src = fetchFromGitHub { + owner = "yarl"; + repo = "pattypan"; + rev = "v${version}"; + sha256 = "0qmvlcqhqw5k500v2xdakk340ymgv5amhbfqxib5s4db1w32pi60"; + }; + + nativeBuildInputs = [ copyDesktopItems jdk ant makeWrapper wrapGAppsHook ]; + buildInputs = [ glib jre ]; + + buildPhase = '' + runHook preBuild + export JAVA_TOOL_OPTIONS="-Dfile.encoding=UTF8" + ant + runHook postBuild + ''; + + installPhase = '' + runHook preInstall + mkdir -p $out/bin $out/share/java + cp pattypan.jar $out/share/java/pattypan.jar + makeWrapper ${jre}/bin/java $out/bin/pattypan \ + --add-flags "-cp $out/share/java/pattypan.jar pattypan.Launcher" + runHook postInstall + ''; + + desktopItems = [ + (makeDesktopItem { + desktopName = "Pattypan"; + genericName = "An uploader for Wikimedia Commons"; + categories = [ "Utility" ]; + exec = "pattypan"; + name = "pattypan"; + }) + ]; + + meta = with lib; { + homepage = "https://commons.wikimedia.org/wiki/Commons:Pattypan"; + description = "An uploader for Wikimedia Commons"; + license = licenses.mit; + platforms = [ "x86_64-linux" ]; + maintainers = with maintainers; [ fee1-dead ]; + }; +} diff --git a/pkgs/applications/misc/pcmanx-gtk2/default.nix b/pkgs/applications/misc/pcmanx-gtk2/default.nix index dffbd2079ae..2e75791e308 100644 --- a/pkgs/applications/misc/pcmanx-gtk2/default.nix +++ b/pkgs/applications/misc/pcmanx-gtk2/default.nix @@ -11,8 +11,8 @@ stdenv.mkDerivation rec { sha256 = "0fbwd149wny67rfhczz4cbh713a1qnswjiz7b6c2bxfcwh51f9rc"; }; - nativeBuildInputs = [ pkg-config automake autoconf ]; - buildInputs = [ gtk2 libXft intltool libtool ]; + nativeBuildInputs = [ pkg-config automake autoconf intltool ]; + buildInputs = [ gtk2 libXft libtool ]; preConfigure = '' ./autogen.sh diff --git a/pkgs/applications/misc/survex/default.nix b/pkgs/applications/misc/survex/default.nix index 17888cc8041..0dd5afd3edb 100644 --- a/pkgs/applications/misc/survex/default.nix +++ b/pkgs/applications/misc/survex/default.nix @@ -1,6 +1,7 @@ { lib , stdenv , fetchurl +, fetchpatch , Carbon , Cocoa , ffmpeg @@ -12,14 +13,26 @@ , proj , python3 , wrapGAppsHook -, wxGTK30-gtk3 -, wxmac +, wxGTK32 , xlibsWrapper }: stdenv.mkDerivation rec { pname = "survex"; - version = "1.4.1"; + version = "1.4.3"; + + src = fetchurl { + url = "https://survex.com/software/${version}/${pname}-${version}.tar.gz"; + hash = "sha256-7NtGTe9xNRPEvG9fQ2fC6htQLEMHfqGmBM2ezhi6oNM="; + }; + + patches = [ + # Fix cavern.tst to work with SOURCE_DATE_EPOCH set + (fetchpatch { + url = "https://github.com/ojwb/survex/commit/b1200a60be7bdea20ffebbd8bb15386041727fa6.patch"; + hash = "sha256-OtFjqpU+u8XGy+PAHg2iea++b681p/Kl8YslisBs4sA="; + }) + ]; nativeBuildInputs = [ perl @@ -34,20 +47,14 @@ stdenv.mkDerivation rec { libGLU mesa proj + wxGTK32 ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ Carbon Cocoa - wxmac ] ++ lib.optionals stdenv.hostPlatform.isLinux [ - wxGTK30-gtk3 xlibsWrapper ]; - src = fetchurl { - url = "https://survex.com/software/${version}/${pname}-${version}.tar.gz"; - hash = "sha256-69X1jGjBTQIQzkD1mTZTzE8L/GXnnf5SI52l7eIiLz4="; - }; - postPatch = '' patchShebangs . ''; diff --git a/pkgs/applications/misc/tandoor-recipes/common.nix b/pkgs/applications/misc/tandoor-recipes/common.nix index 77f1c3f9aef..49b38bec655 100644 --- a/pkgs/applications/misc/tandoor-recipes/common.nix +++ b/pkgs/applications/misc/tandoor-recipes/common.nix @@ -1,12 +1,12 @@ { lib, fetchFromGitHub }: rec { - version = "1.4.1"; + version = "1.4.4"; src = fetchFromGitHub { owner = "TandoorRecipes"; repo = "recipes"; rev = version; - sha256 = "sha256-Q/IwjSByCUXVYxhk3U7oWvlMxrJxyajhpsRyq67PVHY="; + sha256 = "sha256-1wqZoOT2Aafbs2P0mL33jw5HkrLIitUcRt6bQQcHx40="; }; yarnSha256 = "sha256-gH0q3pJ2BC5pAU9KSo3C9DDRUnpypoyLOEqKSrkxYrk="; diff --git a/pkgs/applications/misc/tandoor-recipes/default.nix b/pkgs/applications/misc/tandoor-recipes/default.nix index 008468f1b5e..767d0c768de 100644 --- a/pkgs/applications/misc/tandoor-recipes/default.nix +++ b/pkgs/applications/misc/tandoor-recipes/default.nix @@ -112,6 +112,9 @@ python.pkgs.pythonPackages.buildPythonPackage rec { makeWrapper $out/lib/tandoor-recipes/manage.py $out/bin/tandoor-recipes \ --prefix PYTHONPATH : "$PYTHONPATH" + # usually copied during frontend build (see vue.config.js) + cp vue/src/sw.js $out/lib/tandoor-recipes/cookbook/templates/ + runHook postInstall ''; diff --git a/pkgs/applications/misc/thedesk/default.nix b/pkgs/applications/misc/thedesk/default.nix index c9d845574ff..132b205f85c 100644 --- a/pkgs/applications/misc/thedesk/default.nix +++ b/pkgs/applications/misc/thedesk/default.nix @@ -3,11 +3,11 @@ stdenv.mkDerivation rec { pname = "thedesk"; - version = "22.3.1"; + version = "23.0.1"; src = fetchurl { url = "https://github.com/cutls/TheDesk/releases/download/v${version}/${pname}_${version}_amd64.deb"; - sha256 = "sha256-5KB88zMgwfObgmcMTe6R+oG48qLHrMht6vM1EvI+QFY="; + sha256 = "sha256-DyaJggucFOxkrpaJSmg5fTrK8O3HA0Byd5pHwcgPSIM="; }; nativeBuildInputs = [ diff --git a/pkgs/applications/misc/tootle/default.nix b/pkgs/applications/misc/tootle/default.nix index 48b1b2d57e0..422cf8ea762 100644 --- a/pkgs/applications/misc/tootle/default.nix +++ b/pkgs/applications/misc/tootle/default.nix @@ -93,5 +93,6 @@ stdenv.mkDerivation rec { homepage = "https://github.com/bleakgrey/tootle"; license = licenses.gpl3; maintainers = with maintainers; [ dtzWill ]; + broken = true; }; } diff --git a/pkgs/applications/misc/udevil/default.nix b/pkgs/applications/misc/udevil/default.nix index 536d800001b..9c50b189cc1 100644 --- a/pkgs/applications/misc/udevil/default.nix +++ b/pkgs/applications/misc/udevil/default.nix @@ -20,11 +20,10 @@ stdenv.mkDerivation rec { sha256 = "0nd44r8rbxifx4x4m24z5aji1c6k1fhw8cmf5s43wd5qys0bcdad"; }; - nativeBuildInputs = [ pkg-config ]; + nativeBuildInputs = [ pkg-config intltool ]; buildInputs = [ glib - intltool udev ]; diff --git a/pkgs/applications/misc/ulauncher/default.nix b/pkgs/applications/misc/ulauncher/default.nix index 63a8b485df5..491dd28435a 100644 --- a/pkgs/applications/misc/ulauncher/default.nix +++ b/pkgs/applications/misc/ulauncher/default.nix @@ -31,6 +31,7 @@ python3Packages.buildPythonApplication rec { nativeBuildInputs = with python3Packages; [ distutils_extra + gobject-introspection intltool wrapGAppsHook gdk-pixbuf @@ -40,7 +41,6 @@ python3Packages.buildPythonApplication rec { gdk-pixbuf glib gnome.adwaita-icon-theme - gobject-introspection gtk3 keybinder3 libappindicator diff --git a/pkgs/applications/misc/wofi/default.nix b/pkgs/applications/misc/wofi/default.nix index 25cbac7d229..0020594bb8c 100644 --- a/pkgs/applications/misc/wofi/default.nix +++ b/pkgs/applications/misc/wofi/default.nix @@ -2,12 +2,12 @@ stdenv.mkDerivation rec { pname = "wofi"; - version = "1.2.4"; + version = "1.3"; src = fetchhg { url = "https://hg.sr.ht/~scoopta/wofi"; rev = "v${version}"; - sha256 = "1bnf078fg1kwslzwm1mjxwcqqq3bhk1dzymwfw9gk3brqbxrl75c"; + sha256 = "sha256-GxMjEXBPQniD+Yc9QZjd8TH4ILJAX5dNzrjxDawhy8w="; }; nativeBuildInputs = [ pkg-config meson ninja wrapGAppsHook installShellFiles ]; diff --git a/pkgs/applications/misc/xmr-stak/default.nix b/pkgs/applications/misc/xmr-stak/default.nix index 73d111979f3..5fffac0c777 100644 --- a/pkgs/applications/misc/xmr-stak/default.nix +++ b/pkgs/applications/misc/xmr-stak/default.nix @@ -1,5 +1,5 @@ -{ stdenv, stdenvGcc6, lib -, fetchFromGitHub, cmake, libmicrohttpd_0_9_70, openssl +{ stdenv, lib, fetchpatch +, fetchFromGitHub, cmake, libmicrohttpd, openssl , opencl-headers, ocl-icd, hwloc , devDonationLevel ? "0.0" , openclSupport ? true @@ -18,11 +18,18 @@ stdenv.mkDerivation rec { NIX_CFLAGS_COMPILE = "-O3"; + patches = [ (fetchpatch { + name = "fix-libmicrohttpd-0-9-71.patch"; + url = "https://github.com/fireice-uk/xmr-stak/compare/06e08780eab54dbc025ce3f38c948e4eef2726a0...8adb208987f5881946992ab9cd9a45e4e2a4b870.patch"; + excludes = [ "CMakeLists.txt.user" ]; + hash = "sha256-Yv0U5EO1P5eikn1fKvUXEwemoUIjjeTjpP9p5J8pbC0="; + }) ]; + cmakeFlags = [ "-DCUDA_ENABLE=OFF" ] ++ lib.optional (!openclSupport) "-DOpenCL_ENABLE=OFF"; nativeBuildInputs = [ cmake ]; - buildInputs = [ libmicrohttpd_0_9_70 openssl hwloc ] + buildInputs = [ libmicrohttpd openssl hwloc ] ++ lib.optionals openclSupport [ opencl-headers ocl-icd ]; postPatch = '' diff --git a/pkgs/applications/misc/xpad/default.nix b/pkgs/applications/misc/xpad/default.nix index dbb5eb42e1d..2a14cbe24fb 100644 --- a/pkgs/applications/misc/xpad/default.nix +++ b/pkgs/applications/misc/xpad/default.nix @@ -11,9 +11,9 @@ stdenv.mkDerivation rec { sha256 = "1qpmlwn0bcw1q73ag0l0fdnlzmwawfvsy4g9y5b0vyrc58lcp5d3"; }; - nativeBuildInputs = [ autoreconfHook pkg-config wrapGAppsHook ]; + nativeBuildInputs = [ autoreconfHook pkg-config wrapGAppsHook intltool ]; - buildInputs = [ glib intltool gtk3 gtksourceview ]; + buildInputs = [ glib gtk3 gtksourceview ]; meta = with lib; { description = "A sticky note application for jotting down things to remember"; diff --git a/pkgs/applications/misc/xxkb/default.nix b/pkgs/applications/misc/xxkb/default.nix index d6514e58517..5e76e3a14d5 100644 --- a/pkgs/applications/misc/xxkb/default.nix +++ b/pkgs/applications/misc/xxkb/default.nix @@ -23,14 +23,14 @@ stdenv.mkDerivation rec { sha256 = "0hl1i38z9xnbgfjkaz04vv1n8xbgfg88g5z8fyzyb2hxv2z37anf"; }; - nativeBuildInputs = [ imake gccmakedep ]; + nativeBuildInputs = [ imake gccmakedep pkg-config ]; buildInputs = [ libX11 libXt libXext libXpm - ] ++ lib.optionals svgSupport [ librsvg glib gdk-pixbuf pkg-config ]; + ] ++ lib.optionals svgSupport [ librsvg glib gdk-pixbuf ]; outputs = [ "out" "man" ]; diff --git a/pkgs/applications/networking/browsers/chromium/common.nix b/pkgs/applications/networking/browsers/chromium/common.nix index b22a334b64f..afee9cf4f61 100644 --- a/pkgs/applications/networking/browsers/chromium/common.nix +++ b/pkgs/applications/networking/browsers/chromium/common.nix @@ -325,7 +325,7 @@ let buildPhase = let buildCommand = target: '' - ninja -C "${buildPath}" -j$NIX_BUILD_CORES -l$NIX_BUILD_CORES "${target}" + ninja -C "${buildPath}" -j$NIX_BUILD_CORES "${target}" ( source chrome/installer/linux/common/installer.include PACKAGE=$packageName diff --git a/pkgs/applications/networking/browsers/chromium/upstream-info.json b/pkgs/applications/networking/browsers/chromium/upstream-info.json index f63db845d58..2571e3eefd3 100644 --- a/pkgs/applications/networking/browsers/chromium/upstream-info.json +++ b/pkgs/applications/networking/browsers/chromium/upstream-info.json @@ -1,8 +1,8 @@ { "stable": { - "version": "106.0.5249.91", - "sha256": "16jlwzlfqdhhyajsxxrdfcqmh76ds8g1w4xd5mz3bdbd81mljh2p", - "sha256bin64": "1cfhsar79f319417cx4blcg5hk7b7ix45r7vhrbbwla18p0jij5y", + "version": "106.0.5249.119", + "sha256": "14niglj8q6mfkmgbbjhaipmyhv6vryx93crswb1xa871a14in28g", + "sha256bin64": "1kcf8l6ivqzx6qaiy7vx2l6mhfqn4lq93dkgcx1bdadikwcpq0dd", "deps": { "gn": { "version": "2022-08-11", @@ -19,9 +19,9 @@ } }, "beta": { - "version": "107.0.5304.18", - "sha256": "0d3px8300zvimrp3k9vqaw1ivcizmlxs635gyb8sfrc4gvng29wm", - "sha256bin64": "1p06mmv7azivx8zhh4sgffblq9j3rgjvpjfsz5b6li9mlwqg72rq", + "version": "107.0.5304.29", + "sha256": "1gid36r4hdl3wg2dbdvp847vnzggd2jga4i3pl5mdnvd3f1z0jpd", + "sha256bin64": "039b1yc5x5xgfj8sbc843lpizgmrkppcnmdzqq36zgihhj4mqkrg", "deps": { "gn": { "version": "2022-09-14", @@ -32,22 +32,22 @@ } }, "dev": { - "version": "108.0.5327.0", - "sha256": "14g164khca0k5q0b5hgy790s5krfs5xxm08gqvs3jg5dn8w4pzvd", - "sha256bin64": "08nmikr06qlmfr0jx4jclid1wlb0iqy467c5jn67z033ym7ff1dy", + "version": "108.0.5343.2", + "sha256": "1xg982z01zrv2lfr5qygn4391906m1z3ksi7k1l0i86g777f0ahg", + "sha256bin64": "0pgk3hsw1dxd6z63gpgx5ivjq49lyk608rkidp8i0acmwrvf0fqm", "deps": { "gn": { - "version": "2022-09-16", + "version": "2022-10-05", "url": "https://gn.googlesource.com/gn", - "rev": "cc28efe62ef0c2fb32455f414a29c4a55bb7fbc4", - "sha256": "0vibz1v6p88mr7is2nz6ir9x3zlx4vphciwv2awjrb5nhwabz9dg" + "rev": "b9c6c19be95a3863e02f00f1fe403b2502e345b6", + "sha256": "1rhadb6qk867jafr85x2m3asis3jv7x06blhmad2d296p26d5w6x" } } }, "ungoogled-chromium": { - "version": "106.0.5249.91", - "sha256": "16jlwzlfqdhhyajsxxrdfcqmh76ds8g1w4xd5mz3bdbd81mljh2p", - "sha256bin64": "1cfhsar79f319417cx4blcg5hk7b7ix45r7vhrbbwla18p0jij5y", + "version": "106.0.5249.119", + "sha256": "14niglj8q6mfkmgbbjhaipmyhv6vryx93crswb1xa871a14in28g", + "sha256bin64": "1kcf8l6ivqzx6qaiy7vx2l6mhfqn4lq93dkgcx1bdadikwcpq0dd", "deps": { "gn": { "version": "2022-08-11", @@ -56,8 +56,8 @@ "sha256": "13zks2z65kg7fzzsysq4mswd4bhhy3h7ycdrpxfilcvixx2n2gac" }, "ungoogled-patches": { - "rev": "106.0.5249.91-1", - "sha256": "1cih72ay2gr9xjwwa8iw0wmpmfs4xm4200c4z04v7vi9sxadxnrd" + "rev": "106.0.5249.119-1", + "sha256": "0mgyakq0g3v24b1qn76zblhjf9zzbiv1fq95w7w42nv3fvxfrxr2" } } } diff --git a/pkgs/applications/networking/browsers/firefox/wrapper.nix b/pkgs/applications/networking/browsers/firefox/wrapper.nix index e09bbef871b..eeb72590df2 100644 --- a/pkgs/applications/networking/browsers/firefox/wrapper.nix +++ b/pkgs/applications/networking/browsers/firefox/wrapper.nix @@ -4,7 +4,7 @@ ## various stuff that can be plugged in , ffmpeg_5, xorg, alsa-lib, libpulseaudio, libcanberra-gtk3, libglvnd, libnotify, opensc , gnome/*.gnome-shell*/ -, browserpass, chrome-gnome-shell, uget-integrator, plasma5Packages, bukubrow, pipewire +, browserpass, gnome-browser-connector, uget-integrator, plasma5Packages, bukubrow, pipewire , tridactyl-native , fx_cast_bridge , udev @@ -65,7 +65,7 @@ let ++ lib.optional (cfg.enableBrowserpass or false) (lib.getBin browserpass) ++ lib.optional (cfg.enableBukubrow or false) bukubrow ++ lib.optional (cfg.enableTridactylNative or false) tridactyl-native - ++ lib.optional (cfg.enableGnomeExtensions or false) chrome-gnome-shell + ++ lib.optional (cfg.enableGnomeExtensions or false) gnome-browser-connector ++ lib.optional (cfg.enableUgetIntegrator or false) uget-integrator ++ lib.optional (cfg.enablePlasmaBrowserIntegration or false) plasma5Packages.plasma-browser-integration ++ lib.optional (cfg.enableFXCastBridge or false) fx_cast_bridge diff --git a/pkgs/applications/networking/browsers/misc/widevine-cdm.nix b/pkgs/applications/networking/browsers/misc/widevine-cdm.nix new file mode 100644 index 00000000000..41021cfdaa7 --- /dev/null +++ b/pkgs/applications/networking/browsers/misc/widevine-cdm.nix @@ -0,0 +1,26 @@ +{ lib, stdenv, fetchzip +}: + +stdenv.mkDerivation rec { + pname = "widevine-cdm"; + version = "4.10.2449.0"; + + src = fetchzip { + url = "https://dl.google.com/widevine-cdm/${version}-linux-x64.zip"; + sha256 = "sha256-f2kAkP+s3fB+krEZsiujEoI4oznkzSyaIB/CRJZWlXE="; + stripRoot = false; + }; + + installPhase = '' + install -vD libwidevinecdm.so $out/libwidevinecdm.so + ''; + + meta = with lib; { + description = "Widevine CDM"; + homepage = "https://www.widevine.com"; + sourceProvenance = with sourceTypes; [ binaryNativeCode ]; + license = licenses.unfree; + maintainers = with maintainers; [ jlamur ]; + platforms = [ "x86_64-linux" ]; + }; +} diff --git a/pkgs/applications/networking/browsers/offpunk/default.nix b/pkgs/applications/networking/browsers/offpunk/default.nix index cb11708fbee..98a5b1cf50f 100644 --- a/pkgs/applications/networking/browsers/offpunk/default.nix +++ b/pkgs/applications/networking/browsers/offpunk/default.nix @@ -31,14 +31,14 @@ let in stdenv.mkDerivation (finalAttrs: { pname = "offpunk"; - version = "1.5"; + version = "1.6"; src = fetchFromGitea { domain = "notabug.org"; owner = "ploum"; repo = "offpunk"; rev = "v${finalAttrs.version}"; - sha256 = "1zg13wajsfrl3hli6sihn47db08w037jjq9vgr6m5sjh8r1jb9iy"; + sha256 = "1pfafb96xk7vis26zhfq254waz1ic9p0zdkxwpqs84p3vsmny775"; }; nativeBuildInputs = [ makeWrapper ]; diff --git a/pkgs/applications/networking/browsers/qutebrowser/default.nix b/pkgs/applications/networking/browsers/qutebrowser/default.nix index a3f5b323697..4f10e76d0e4 100644 --- a/pkgs/applications/networking/browsers/qutebrowser/default.nix +++ b/pkgs/applications/networking/browsers/qutebrowser/default.nix @@ -12,6 +12,8 @@ , qtbase ? null , qtwebengine ? null , wrapGAppsHook ? null +, enableWideVine ? false +, widevine-cdm }: let isQt6 = mkDerivationWith == null; @@ -75,7 +77,8 @@ buildPythonApplication { nativeBuildInputs = [ wrapQtAppsHook wrapGAppsHook asciidoc docbook_xml_dtd_45 docbook_xsl libxml2 libxslt - ]; + ] + ++ lib.optional isQt6 python3Packages.pygments; propagatedBuildInputs = with python3Packages; ([ pyyaml backendPackage jinja2 pygments @@ -97,6 +100,12 @@ buildPythonApplication { dontWrapGApps = true; dontWrapQtApps = true; + preConfigure = '' + a2x -f manpage doc/qutebrowser.1.asciidoc + '' + lib.optionalString isQt6 '' + python scripts/asciidoc2html.py + ''; + postPatch = '' substituteInPlace qutebrowser/misc/quitter.py --subst-var-by qutebrowser "$out/bin/qutebrowser" @@ -105,10 +114,6 @@ buildPythonApplication { sed -i "s,/usr/share/pdf.js,${pdfjs},g" qutebrowser/browser/pdfjs.py ''; - postBuild = '' - a2x -f manpage doc/qutebrowser.1.asciidoc - ''; - postInstall = '' install -Dm644 doc/qutebrowser.1 "$out/share/man/man1/qutebrowser.1" install -Dm644 misc/org.qutebrowser.qutebrowser.desktop \ @@ -116,15 +121,15 @@ buildPythonApplication { # Install icons for i in 16 24 32 48 64 128 256 512; do - install -Dm644 "qutebrowser/icons/qutebrowser-''${i}x''${i}.png" \ + install -Dm644 "${lib.optionalString isQt6 "qutebrowser/"}icons/qutebrowser-''${i}x''${i}.png" \ "$out/share/icons/hicolor/''${i}x''${i}/apps/qutebrowser.png" done - install -Dm644 ${if isQt6 then "qutebrowser/" else ""}icons/qutebrowser.svg \ + install -Dm644 ${lib.optionalString isQt6 "qutebrowser/"}icons/qutebrowser.svg \ "$out/share/icons/hicolor/scalable/apps/qutebrowser.svg" # Install scripts sed -i "s,/usr/bin/,$out/bin/,g" scripts/open_url_in_instance.sh - ${if isQt6 then "rm -rf scripts/{testbrowser,dev}" else ""} + ${lib.optionalString isQt6 "rm -rf scripts/{testbrowser,dev}"} install -Dm755 -t "$out/share/qutebrowser/scripts/" $(find scripts -type f) install -Dm755 -t "$out/share/qutebrowser/userscripts/" misc/userscripts/* @@ -146,6 +151,7 @@ buildPythonApplication { --add-flags '--backend ${backend}' --set QUTE_QTWEBENGINE_VERSION_OVERRIDE "${lib.getVersion qtwebengine}" ${lib.optionalString (pipewireSupport && backend == "webengine") ''--prefix LD_LIBRARY_PATH : ${libPath}''} + ${lib.optionalString enableWideVine ''--add-flags "--qt-flag widevine-path=${widevine-cdm}/libwidevinecdm.so"''} ) ''; @@ -154,6 +160,6 @@ buildPythonApplication { description = "Keyboard-focused browser with a minimal GUI"; license = licenses.gpl3Plus; maintainers = with maintainers; [ jagajaga rnhmjoj ebzzry dotlambda ]; - inherit (backendPackage.meta) platforms; + platforms = if enableWideVine then [ "x86_64-linux" ] else backendPackage.meta.platforms; }; } diff --git a/pkgs/applications/networking/calls/default.nix b/pkgs/applications/networking/calls/default.nix index b5961c4adbc..a0a9b10f068 100644 --- a/pkgs/applications/networking/calls/default.nix +++ b/pkgs/applications/networking/calls/default.nix @@ -25,6 +25,7 @@ , gtk-doc , docbook-xsl-nons , docbook_xml_dtd_43 +, docutils , gobject-introspection , gst_all_1 , sofia_sip @@ -32,15 +33,15 @@ stdenv.mkDerivation rec { pname = "calls"; - version = "42.0"; + version = "43.0"; src = fetchFromGitLab { domain = "gitlab.gnome.org"; owner = "GNOME"; repo = pname; - rev = version; + rev = "v${version}"; fetchSubmodules = true; - hash = "sha256-ASKK9PB5FAD10CR5O+L2WgMjCzmIalithHL8jV0USiM="; + hash = "sha256-fvG9N6HuuO8BMH8MJRquMSe1oEPNmX/pzsJX5yzs1CY="; }; outputs = [ "out" "devdoc" ]; @@ -56,6 +57,7 @@ stdenv.mkDerivation rec { gtk-doc docbook-xsl-nons docbook_xml_dtd_43 + docutils ]; buildInputs = [ @@ -104,7 +106,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "A phone dialer and call handler"; longDescription = "GNOME Calls is a phone dialer and call handler. Setting NixOS option `programs.calls.enable = true` is recommended."; - homepage = "https://source.puri.sm/Librem5/calls"; + homepage = "https://gitlab.gnome.org/GNOME/calls"; license = licenses.gpl3Plus; maintainers = with maintainers; [ craigem lheckemann tomfitzhenry ]; platforms = platforms.linux; diff --git a/pkgs/applications/networking/cluster/atlantis/default.nix b/pkgs/applications/networking/cluster/atlantis/default.nix index 38408ed32ea..8ce7b0dcae0 100644 --- a/pkgs/applications/networking/cluster/atlantis/default.nix +++ b/pkgs/applications/networking/cluster/atlantis/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "atlantis"; - version = "0.19.8"; + version = "0.20.1"; src = fetchFromGitHub { owner = "runatlantis"; repo = "atlantis"; rev = "v${version}"; - sha256 = "sha256-o8lBpiR8gIo1kyOTkPOIuMnJbJsi619Zl0bAAFGYM4E="; + sha256 = "sha256-5zchElzEjrIgODRUvQTQwlBz5371iJU5VOpz12Xtbcg="; }; - vendorSha256 = "sha256-aEMRCvZBaY1uwZqKtMmZ4aiPdNmtANcnuE7eykBiTQg="; + vendorSha256 = "sha256-n2yzqNjmPDP+8/ipiuUt6BqFYF0Oh0Y0TCdKsqCcrIQ="; subPackages = [ "." ]; diff --git a/pkgs/applications/networking/cluster/atmos/default.nix b/pkgs/applications/networking/cluster/atmos/default.nix index ef7c3787bdc..e255611a1b3 100644 --- a/pkgs/applications/networking/cluster/atmos/default.nix +++ b/pkgs/applications/networking/cluster/atmos/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "atmos"; - version = "1.8.2"; + version = "1.10.2"; src = fetchFromGitHub { owner = "cloudposse"; repo = pname; rev = "v${version}"; - sha256 = "sha256-rDbnny/qRU31ciAXKLGLXS3FhgOpxmkLT4oatYCbt9g="; + sha256 = "sha256-/rxGAfYjV5VzYs9h8eCpz5jhmW7jPdk1XB3bXHH+oQw="; }; - vendorSha256 = "sha256-Kfv3RlH80E/9yf/rvnY5vljaRr4cH5AhgXQn54x72Ds="; + vendorSha256 = "sha256-/b764auKkZF0oMqNlXmsW9aB5gcq4WFQRFjsVhNDiB4="; ldflags = [ "-s" "-w" "-X github.com/cloudposse/atmos/cmd.Version=v${version}" ]; diff --git a/pkgs/applications/networking/cluster/clusterctl/default.nix b/pkgs/applications/networking/cluster/clusterctl/default.nix index f6e5aa4952f..3892266c7f9 100644 --- a/pkgs/applications/networking/cluster/clusterctl/default.nix +++ b/pkgs/applications/networking/cluster/clusterctl/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "clusterctl"; - version = "1.2.2"; + version = "1.2.3"; src = fetchFromGitHub { owner = "kubernetes-sigs"; repo = "cluster-api"; rev = "v${version}"; - sha256 = "sha256-U9U1r74E4ryc8zUb1EogfBT57kfsd89i7DWO05tnQw4="; + sha256 = "sha256-QVzhRaNLFhH+5x+/X/Nc3bW/09txurhVd0yDU9LYhAo="; }; - vendorSha256 = "sha256-jM5qU/KaBf+CzKKOuVXjawn/QqwrCjXKaQFFomEPndg="; + vendorSha256 = "sha256-jPIrUW4el8sAO+4j20qMYVXqvov6Ac0cENd7gOrYj+U="; subPackages = [ "cmd/clusterctl" ]; diff --git a/pkgs/applications/networking/cluster/helm/default.nix b/pkgs/applications/networking/cluster/helm/default.nix index 55e5c77c733..5ec74e95e05 100644 --- a/pkgs/applications/networking/cluster/helm/default.nix +++ b/pkgs/applications/networking/cluster/helm/default.nix @@ -2,15 +2,15 @@ buildGoModule rec { pname = "kubernetes-helm"; - version = "3.10.0"; + version = "3.10.1"; src = fetchFromGitHub { owner = "helm"; repo = "helm"; rev = "v${version}"; - sha256 = "sha256-oYM7T0t/U7Y/O4u3t9eDjfoxjVeNFBPJdlPs+p9PXOM="; + sha256 = "sha256-OyU97zyN7fZMZAD2BEp8TW2z2E9Rl/yeiVkQaJ1GWZk="; }; - vendorSha256 = "sha256-cyqTed3IZ5JFHYTphrOzSmcAc9xyre2LuMC3p0rfh/Y="; + vendorSha256 = "sha256-vyHT/N5lat/vqM2jK4Q+jJOtZpS52YCYGcJqfa5e0KM="; subPackages = [ "cmd/helm" ]; ldflags = [ diff --git a/pkgs/applications/networking/cluster/kops/default.nix b/pkgs/applications/networking/cluster/kops/default.nix index a18e60f051b..cf571139871 100644 --- a/pkgs/applications/networking/cluster/kops/default.nix +++ b/pkgs/applications/networking/cluster/kops/default.nix @@ -49,15 +49,9 @@ in rec { mkKops = generic; - kops_1_22 = mkKops rec { - version = "1.22.4"; - sha256 = "sha256-osU7yI77ZALGrAGuP8qAgv+ogDRn+BSVmcjPbi/WEKE="; - rev = "v${version}"; - }; - kops_1_23 = mkKops rec { - version = "1.23.2"; - sha256 = "sha256-9GANjGRS9QaJw+CEeMv/f+rEu37QV2YxMvSRSH6+3PM="; + version = "1.23.4"; + sha256 = "sha256-hUj/kUyaqo8q3SJTkd5+9Ld8kfE8wCYNJ2qIATjXqhU="; rev = "v${version}"; }; @@ -67,4 +61,9 @@ rec { rev = "v${version}"; }; + kops_1_25 = mkKops rec { + version = "1.25.1"; + sha256 = "sha256-wKmEdcORXBKQ1AjYr0tNimxs//tSNPO3VQpEPC2mieA="; + rev = "v${version}"; + }; } diff --git a/pkgs/applications/networking/cluster/kubedog/default.nix b/pkgs/applications/networking/cluster/kubedog/default.nix new file mode 100644 index 00000000000..9c1b14e6dd2 --- /dev/null +++ b/pkgs/applications/networking/cluster/kubedog/default.nix @@ -0,0 +1,49 @@ +{ lib +, stdenv +, buildGoModule +, fetchFromGitHub +, testers +, kubedog +}: + +buildGoModule rec { + pname = "kubedog"; + version = "0.9.6"; + + src = fetchFromGitHub { + owner = "werf"; + repo = "kubedog"; + rev = "v${version}"; + hash = "sha256-mwITvv2MuqzH1aB4iTVaFfZljyqOAu7vl4cORHT/OXQ="; + }; + + vendorHash = "sha256-HBo26cPiWJPDpsjPYUEBraHB2SZsUttrlBKpB9/SS6o="; + + subPackages = [ "cmd/kubedog" ]; + + ldflags = [ + "-s" + "-w" + "-X github.com/werf/kubedog.Version=${src.rev}" + ]; + + # There are no tests. + doCheck = false; + + passthru.tests.version = testers.testVersion { + package = kubedog; + command = "kubedog version"; + version = src.rev; + }; + + meta = with lib; { + description = '' + A tool to watch and follow Kubernetes resources in CI/CD deployment + pipelines + ''; + homepage = "https://github.com/werf/kubedog"; + changelog = "https://github.com/werf/kubedog/releases/tag/${src.rev}"; + license = licenses.asl20; + maintainers = with maintainers; [ azahi ]; + }; +} diff --git a/pkgs/applications/networking/cluster/kyverno/default.nix b/pkgs/applications/networking/cluster/kyverno/default.nix index d00b1b38b2e..da602ac6864 100644 --- a/pkgs/applications/networking/cluster/kyverno/default.nix +++ b/pkgs/applications/networking/cluster/kyverno/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "kyverno"; - version = "1.7.4"; + version = "1.8.0"; src = fetchFromGitHub { owner = "kyverno"; repo = "kyverno"; rev = "v${version}"; - sha256 = "sha256-EzPd4D+pK9mFSoJx9gEWEw9izXum2NgACiBuQ6uTYGo="; + sha256 = "sha256-VJhn3z/utbcZdJjmVzsjyqPfpKMmDXSKUcoALSmawqs="; }; ldflags = [ @@ -18,7 +18,7 @@ buildGoModule rec { "-X github.com/kyverno/kyverno/pkg/version.BuildTime=1970-01-01_00:00:00" ]; - vendorSha256 = "sha256-bpuEEoWobFPVsNZKKuOKTQGvV+/NAgaM4M63bv5y0Rk="; + vendorSha256 = "sha256-8Sk36IFk3tL/wqDnKJw/K1MtKBZuVRRFkyMl4b/XwDI="; subPackages = [ "cmd/cli/kubectl-kyverno" ]; diff --git a/pkgs/applications/networking/cluster/multus-cni/default.nix b/pkgs/applications/networking/cluster/multus-cni/default.nix index 2cfbcaa6bd1..2d01d470c87 100644 --- a/pkgs/applications/networking/cluster/multus-cni/default.nix +++ b/pkgs/applications/networking/cluster/multus-cni/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "multus-cni"; - version = "3.9.1"; + version = "3.9.2"; src = fetchFromGitHub { owner = "k8snetworkplumbingwg"; repo = pname; rev = "v${version}"; - sha256 = "sha256-U5Ji+f7ckynBVMb4xsmoRZzYJx8obMO+bO9TU6GqcW0="; + sha256 = "sha256-AYSUJEoNYt4DYNcPynRBal5c5QAzRVltkjwoEM66VcY="; }; ldflags = [ diff --git a/pkgs/applications/networking/cluster/talosctl/default.nix b/pkgs/applications/networking/cluster/talosctl/default.nix index 4ddde426e38..c19383c2b79 100644 --- a/pkgs/applications/networking/cluster/talosctl/default.nix +++ b/pkgs/applications/networking/cluster/talosctl/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "talosctl"; - version = "1.2.3"; + version = "1.2.5"; src = fetchFromGitHub { owner = "siderolabs"; repo = "talos"; rev = "v${version}"; - sha256 = "sha256-BCbbQQUk3iJJQhjkwlSAVz/SbVPvZGhGHwXSPgCPBHg="; + sha256 = "sha256-XCfT2uSYFszxxj9JS9A+nnFX6gz3gY03xokjoH3/kVA="; }; - vendorSha256 = "sha256-jUVPJ1mq9pMJGwS/0nBv9hsXotiqUksbKChjegF7KRk="; + vendorSha256 = "sha256-DVrGpWtHiWWDx4fCpA7fBGr8r+OUzworpwHcK0jj3AY="; ldflags = [ "-s" "-w" ]; diff --git a/pkgs/applications/networking/cluster/tanka/default.nix b/pkgs/applications/networking/cluster/tanka/default.nix index c9a5d7c60ce..010527121e5 100644 --- a/pkgs/applications/networking/cluster/tanka/default.nix +++ b/pkgs/applications/networking/cluster/tanka/default.nix @@ -2,22 +2,22 @@ buildGoModule rec { pname = "tanka"; - version = "0.22.1"; + version = "0.23.1"; src = fetchFromGitHub { owner = "grafana"; repo = pname; rev = "v${version}"; - sha256 = "sha256-MMQv3/Ft6/FUueGEXGqYWAYy4zc2R6LASbh2x7eJNdQ="; + sha256 = "sha256-exPFlcbku51Bs/YISRyjl8iwLYRVS9ltRQPpd/QpnWk="; }; - vendorSha256 = "sha256-QwtcWzJbusa8BxtG5xmGUgqG0qCMSpkzbmes/x3lnWc="; + vendorSha256 = "sha256-eo4B2p5Yo1r5jro49mSetp9AFYhcTXbyy7wGuaFwbb0="; doCheck = false; subPackages = [ "cmd/tk" ]; - ldflags = [ "-s" "-w" "-extldflags '-static'" "-X github.com/grafana/tanka/pkg/tanka.CURRENT_VERSION=v${version}" ]; + ldflags = [ "-s" "-w" "-extldflags '-static'" "-X github.com/grafana/tanka/pkg/tanka.CurrentVersion=v${version}" ]; nativeBuildInputs = [ installShellFiles ]; diff --git a/pkgs/applications/networking/cluster/terraform-providers/providers.json b/pkgs/applications/networking/cluster/terraform-providers/providers.json index 76815b45dba..feba95f58db 100644 --- a/pkgs/applications/networking/cluster/terraform-providers/providers.json +++ b/pkgs/applications/networking/cluster/terraform-providers/providers.json @@ -75,13 +75,13 @@ "version": "2.2.0" }, "auth0": { - "hash": "sha256-0y7sS03/cvO49jo4IY+xyh3dYZYcHOTlbCV1JBiYZQ4=", + "hash": "sha256-xe9BWrkuQqmwjUy3ys7M3IWJjqZiWkox9NYmsH3VHJ8=", "owner": "auth0", "provider-source-address": "registry.terraform.io/auth0/auth0", "repo": "terraform-provider-auth0", - "rev": "v0.37.1", - "vendorHash": "sha256-8mGbTkAf42YQ5kKQmC0qSS8lj6Bd/KzpyX3MtS9r6Fk=", - "version": "0.37.1" + "rev": "v0.38.0", + "vendorHash": "sha256-e5mQ3NrWdFeyIjh38YbTd9fRVuxJB6FPmw7xNlEHzGY=", + "version": "0.38.0" }, "avi": { "hash": "sha256-BQ4M1e7wWDCq2HEJIoAAqSUmq9hV66auvH47p3j2M8I=", @@ -120,13 +120,13 @@ "version": "2.29.0" }, "azurerm": { - "hash": "sha256-3dJ/nXpMYEK7sB6VAnkbUfQRoCsiqXhBkU6gCYBpmHY=", + "hash": "sha256-MWbw0E5TtqHaoU9nxeMVrUCPlRE73KYxvC6A6tMrjC0=", "owner": "hashicorp", "provider-source-address": "registry.terraform.io/hashicorp/azurerm", "repo": "terraform-provider-azurerm", - "rev": "v3.26.0", + "rev": "v3.27.0", "vendorHash": null, - "version": "3.26.0" + "version": "3.27.0" }, "azurestack": { "hash": "sha256-aSwVa7y1AJ6sExx+bO/93oLBNgSBDJjuPYPY8i3C9T0=", @@ -304,13 +304,13 @@ "version": "0.0.3" }, "digitalocean": { - "hash": "sha256-FnVmkHNMuWF01eSOCMyPQescyao/cyUjXwimwYU5gqY=", + "hash": "sha256-iLwAkmzKRY8NfUHVGcstIHlSnZY+oi7fhCNP2kCzIxM=", "owner": "digitalocean", "provider-source-address": "registry.terraform.io/digitalocean/digitalocean", "repo": "terraform-provider-digitalocean", - "rev": "v2.22.3", + "rev": "v2.23.0", "vendorHash": null, - "version": "2.22.3" + "version": "2.23.0" }, "dme": { "hash": "sha256-QNkr+6lKlKY+os0Pf6dqlmIn9u2LtMOo6ONahDeA9mE=", @@ -385,13 +385,13 @@ "version": "2.2.2" }, "fastly": { - "hash": "sha256-CafrOJiDkIrRph8X+EvvBkI1T7j0qUlOnyhrylToJ7s=", + "hash": "sha256-WxFkJBi87IvO4a/8bmftMKCc/JcfoQILCtklvr9bcuc=", "owner": "fastly", "provider-source-address": "registry.terraform.io/fastly/fastly", "repo": "terraform-provider-fastly", - "rev": "v2.3.3", + "rev": "v2.4.0", "vendorHash": null, - "version": "2.3.3" + "version": "2.4.0" }, "flexibleengine": { "hash": "sha256-2eXNumT1Hkc33bW635qYr5jxlByX+yZ8zSKRpgKWQJo=", @@ -423,13 +423,13 @@ "version": "2.2.0" }, "github": { - "hash": "sha256-NJ5HvW3LOvshzea7t0/sAsp3SqiXErXd32Ej0Qp4zsk=", + "hash": "sha256-dUL01cuP5fQdPPm6+R1XDQNups5BJC2oq8LSjJ1+tB0=", "owner": "integrations", "provider-source-address": "registry.terraform.io/integrations/github", "repo": "terraform-provider-github", - "rev": "v5.3.0", + "rev": "v5.5.0", "vendorHash": null, - "version": "5.3.0" + "version": "5.5.0" }, "gitlab": { "hash": "sha256-eNd1o0UjG6A9OTRmcJfcPLLtWIJmdZ+viDnSZhyHpgY=", @@ -441,24 +441,24 @@ "version": "3.18.0" }, "google": { - "hash": "sha256-b2U4bViukaGXcbkhSpE57dH0w45jUL5TSF2/pdmqqQY=", + "hash": "sha256-tjcG23chJwuaf/SRD6Kqz49fdWFKMaVygg/FGydaSR8=", "owner": "hashicorp", "provider-source-address": "registry.terraform.io/hashicorp/google", "proxyVendor": true, "repo": "terraform-provider-google", - "rev": "v4.39.0", + "rev": "v4.40.0", "vendorHash": "sha256-PWSok1sTU/57Xeri4Un5B9Fbwg8gBP6Quy5oIZrjxUI=", - "version": "4.39.0" + "version": "4.40.0" }, "google-beta": { - "hash": "sha256-iYNolS1tvlsa0C/UX4xbtOVhGz8wkpit8z2sPSk22a0=", + "hash": "sha256-U27ZzjNMFP/TCpXrU0QQ0uYB0sgeWVmRrQFIzq7FAhs=", "owner": "hashicorp", "provider-source-address": "registry.terraform.io/hashicorp/google-beta", "proxyVendor": true, "repo": "terraform-provider-google-beta", - "rev": "v4.39.0", + "rev": "v4.40.0", "vendorHash": "sha256-PWSok1sTU/57Xeri4Un5B9Fbwg8gBP6Quy5oIZrjxUI=", - "version": "4.39.0" + "version": "4.40.0" }, "googleworkspace": { "hash": "sha256-dedYnsKHizxJZibuvJOMbJoux0W6zgKaK5fxIofKqCY=", @@ -497,22 +497,22 @@ "version": "1.35.2" }, "helm": { - "hash": "sha256-oX6pchJcgv9w5xLGe09GBzngz9+a/OZn6FTBWURgiLk=", + "hash": "sha256-s8ZOzTG3qux+4Yh1wj3ArjB1uJ32bdGhxY9iSL5LOK8=", "owner": "hashicorp", "provider-source-address": "registry.terraform.io/hashicorp/helm", "repo": "terraform-provider-helm", - "rev": "v2.7.0", + "rev": "v2.7.1", "vendorHash": null, - "version": "2.7.0" + "version": "2.7.1" }, "heroku": { - "hash": "sha256-n6M7i7zompAGRoP9WxrcWdBHsK2RssfTgCKsvAE5XZM=", + "hash": "sha256-V6jShbhVwsUTxj2tp2msIseZnckHgB7bBswqIRlrwjQ=", "owner": "heroku", "provider-source-address": "registry.terraform.io/heroku/heroku", "repo": "terraform-provider-heroku", - "rev": "v5.1.4", + "rev": "v5.1.5", "vendorHash": null, - "version": "5.1.4" + "version": "5.1.5" }, "hetznerdns": { "hash": "sha256-QmD9UlQpyvEz4in1I960J0eC6xNtgk5z8tZUxaApOwE=", @@ -615,13 +615,13 @@ "version": "0.3.0" }, "keycloak": { - "hash": "sha256-JDMPr2uFi+9CcHdyigmP1DM3uRx2+eFnzSaHp+es2Tg=", + "hash": "sha256-1yV3w3hhZf113XMxvpRvr3ADaRcuCl7BCIa5SIZPcCs=", "owner": "mrparkers", "provider-source-address": "registry.terraform.io/mrparkers/keycloak", "repo": "terraform-provider-keycloak", - "rev": "v3.10.0", - "vendorHash": "sha256-8x0MlwAzeA2O6wXXHSk++K0ePmzE9/2lfo2ID83LzRM=", - "version": "3.10.0" + "rev": "v4.0.1", + "vendorHash": "sha256-nDvnLEOtXkUJFY22pKogOzkWrj4qjyQbdlJ5pa/xnK8=", + "version": "4.0.1" }, "ksyun": { "hash": "sha256-sfvmDByxAQbbdPHb9l5tIT5dyu8eA3r63i5FZJYEYTI=", @@ -669,13 +669,13 @@ "version": "0.7.0" }, "linode": { - "hash": "sha256-gysdJOGUmhwFoRpR0Yp2p/Vjb69k+fDzcWatOgA+/AQ=", + "hash": "sha256-FtJYpHmXkXBIcxlrUN9hOid3x4wMSk5NI2CFzmwniu4=", "owner": "linode", "provider-source-address": "registry.terraform.io/linode/linode", "repo": "terraform-provider-linode", - "rev": "v1.29.2", - "vendorHash": "sha256-Sp/e3QVdUeQGflDGYLSMPGqxcMWoIY8Q9nZUteFIryo=", - "version": "1.29.2" + "rev": "v1.29.3", + "vendorHash": "sha256-D7WZ2Ep/W8aCCFOVgsveJKAIg/j5l9fEnnXLMobICnc=", + "version": "1.29.3" }, "linuxbox": { "hash": "sha256-MzasMVtXO7ZeZ+qEx2Z+7881fOIA0SFzSvXVHeEROtg=", @@ -904,13 +904,13 @@ "version": "0.22.0" }, "pagerduty": { - "hash": "sha256-Kdm6WizssVdMwsTUyV4wUAW6QelUxDE9GZDGvnehFCw=", + "hash": "sha256-S55TSm3aFe9ACo+ysNRnyQ/U55C2KoZroQEHVBXsSPI=", "owner": "PagerDuty", "provider-source-address": "registry.terraform.io/PagerDuty/pagerduty", "repo": "terraform-provider-pagerduty", - "rev": "v2.6.2", + "rev": "v2.6.3", "vendorHash": null, - "version": "2.6.2" + "version": "2.6.3" }, "panos": { "hash": "sha256-mscWNK113W7CVKI+qPGYX3irQI3YhkLdXox4pddOdF0=", @@ -1075,13 +1075,13 @@ "version": "0.7.1" }, "spotinst": { - "hash": "sha256-D/HFeozi5IRj7G+pRzY/V98+oejfmQlW4y6ddob7OBI=", + "hash": "sha256-hlTeN8dQWHU4yHDUqCeBbfapDI1lbxj05FlUN+vUOuM=", "owner": "spotinst", "provider-source-address": "registry.terraform.io/spotinst/spotinst", "repo": "terraform-provider-spotinst", - "rev": "v1.84.0", + "rev": "v1.85.0", "vendorHash": "sha256-BDYX/4D3R2A1w3k14mON/2KZUg2kPbwePXQQpVanqdU=", - "version": "1.84.0" + "version": "1.85.0" }, "stackpath": { "hash": "sha256-nTR9HgSmuNCt7wxE4qqIH2+HA2igzqVx0lLRx6FoKrE=", @@ -1111,13 +1111,13 @@ "version": "2.19.1" }, "tencentcloud": { - "hash": "sha256-SoCXh0pRqEkto2K+ZfN7ncVGDVC32zDElS+rBdOfa0g=", + "hash": "sha256-kAbLfuENWHxu51Eu+7X1X4HiWkD8KAL4awZpGRg0BaU=", "owner": "tencentcloudstack", "provider-source-address": "registry.terraform.io/tencentcloudstack/tencentcloud", "repo": "terraform-provider-tencentcloud", - "rev": "v1.78.3", + "rev": "v1.78.4", "vendorHash": null, - "version": "1.78.3" + "version": "1.78.4" }, "tfe": { "hash": "sha256-jh5bRe/3OsdgvSpraYEc1NgvBmYb1tFuVSPQ2ZAesSY=", @@ -1138,13 +1138,13 @@ "version": "1.0.0" }, "time": { - "hash": "sha256-r1AzzO1fxmDZkxWKg+LUiYU19oAg8TthIJA7c0tktZE=", + "hash": "sha256-tDYrKU/kggrv/p8QZ0LbHjQSOaNrQ0qy9ekY7DAXqEA=", "owner": "hashicorp", "provider-source-address": "registry.terraform.io/hashicorp/time", "repo": "terraform-provider-time", - "rev": "v0.8.0", - "vendorHash": "sha256-67V+lG6mkLuzoJnd8OoH73/XBnkgqDmv6aqpSSsHSqg=", - "version": "0.8.0" + "rev": "v0.9.0", + "vendorHash": "sha256-I4CnaSyn32S7FM56dYWZhzGUKByP2DXD0t/eBOL2ALs=", + "version": "0.9.0" }, "tls": { "hash": "sha256-q3zt+5zd/bJ42sWbFwuE+rDyHHcZoVBZF4c61aJJkMs=", @@ -1175,22 +1175,22 @@ "version": "1.9.1" }, "ucloud": { - "hash": "sha256-lx3LLBmqUjRc+Jn+SbLk6DChJJ2jbuh720wnO05qot0=", + "hash": "sha256-O/M864JY7nW+PZ53z26QvOAar5DeqBGk+dfzarfUy+g=", "owner": "ucloud", "provider-source-address": "registry.terraform.io/ucloud/ucloud", "repo": "terraform-provider-ucloud", - "rev": "v1.32.2", + "rev": "v1.32.4", "vendorHash": null, - "version": "1.32.2" + "version": "1.32.4" }, "utils": { - "hash": "sha256-Mh1yj1VZ620xSs1a5j86K4uCUyjzdeCphKLANQvgTNA=", + "hash": "sha256-6o55uGTaqf3rbqoIGiYi5F4zOkK7D0YP+LdaMmBtw24=", "owner": "cloudposse", "provider-source-address": "registry.terraform.io/cloudposse/utils", "repo": "terraform-provider-utils", - "rev": "1.3.0", - "vendorHash": "sha256-00kcosPSk/Ll7UQhnrEGRo0USvFM2V5MLKnndfhQEQA=", - "version": "1.3.0" + "rev": "1.5.0", + "vendorHash": "sha256-D1QpZTh/4BgAbsoo4RRpJoIFwkHYBkN5JWfCOe5N/A0=", + "version": "1.5.0" }, "vault": { "hash": "sha256-v+WhEJ9HsTdOqSVpbV/qVCEICsgY3nEqcIutYHi3aQ8=", diff --git a/pkgs/applications/networking/cluster/tilt/default.nix b/pkgs/applications/networking/cluster/tilt/default.nix index 9245a543914..339564f52a0 100644 --- a/pkgs/applications/networking/cluster/tilt/default.nix +++ b/pkgs/applications/networking/cluster/tilt/default.nix @@ -5,13 +5,13 @@ buildGoModule rec { /* Do not use "dev" as a version. If you do, Tilt will consider itself running in development environment and try to serve assets from the source tree, which is not there once build completes. */ - version = "0.30.8"; + version = "0.30.9"; src = fetchFromGitHub { owner = "tilt-dev"; repo = pname; rev = "v${version}"; - sha256 = "sha256-dVaLeooTEiKYWp9CmEcSFOunLyJecB8jR9LIKRO8b9g="; + sha256 = "sha256-vZthFaIsgpZ2aap9kRSH//AHHnOpekPIkwpz9Tt0lI4="; }; vendorSha256 = null; diff --git a/pkgs/applications/networking/cluster/werf/default.nix b/pkgs/applications/networking/cluster/werf/default.nix index 22c0178cd8f..325fb030972 100644 --- a/pkgs/applications/networking/cluster/werf/default.nix +++ b/pkgs/applications/networking/cluster/werf/default.nix @@ -10,13 +10,13 @@ buildGoModule rec { pname = "werf"; - version = "1.2.177"; + version = "1.2.178"; src = fetchFromGitHub { owner = "werf"; repo = "werf"; rev = "v${version}"; - hash = "sha256-hvMDQlWlAy7gRiSJMt2qAtBpYEbfhGS/DZeQK5ueHYA="; + hash = "sha256-gmUamDV7gH30grFkG6rqDEf73wxe+FqhPi1GkNOeKuk="; }; vendorHash = "sha256-4QVLxvprm27Bv/ZFgxTtqZcSAWak1e+G8s+heW1JZnA="; diff --git a/pkgs/applications/networking/dropbox/cli.nix b/pkgs/applications/networking/dropbox/cli.nix index ffbf42715f5..c6b0baa9d3f 100644 --- a/pkgs/applications/networking/dropbox/cli.nix +++ b/pkgs/applications/networking/dropbox/cli.nix @@ -1,5 +1,6 @@ { lib, stdenv , substituteAll +, autoreconfHook , pkg-config , fetchurl , python3 @@ -28,6 +29,10 @@ stdenv.mkDerivation { strictDeps = true; patches = [ + # Fix extension for Nautilus 43 + # https://github.com/dropbox/nautilus-dropbox/pull/105 + ./nautilus-43.patch + (substituteAll { src = ./fix-cli-paths.patch; inherit dropboxd; @@ -35,6 +40,7 @@ stdenv.mkDerivation { ]; nativeBuildInputs = [ + autoreconfHook pkg-config gobject-introspection gdk-pixbuf diff --git a/pkgs/applications/networking/dropbox/nautilus-43.patch b/pkgs/applications/networking/dropbox/nautilus-43.patch new file mode 100644 index 00000000000..b4b55784319 --- /dev/null +++ b/pkgs/applications/networking/dropbox/nautilus-43.patch @@ -0,0 +1,195 @@ +diff --git a/configure.ac b/configure.ac +index 025289c..42b49fa 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -12,7 +12,7 @@ AM_CONFIG_HEADER(config.h) + #AC_PROG_INTLTOOL([0.29]) + + # Dependency checks +-NAUTILUS_REQUIRED=2.16.0 ++NAUTILUS_REQUIRED=43.rc + GLIB_REQUIRED=2.14.0 + + # Used programs +@@ -26,8 +26,11 @@ if test "x$HAVE_PKGCONFIG" = "xno"; then + AC_MSG_ERROR(you need to have pkgconfig installed !) + fi + +-PKG_CHECK_MODULES(NAUTILUS, libnautilus-extension >= $NAUTILUS_REQUIRED) ++PKG_CHECK_MODULES(NAUTILUS, libnautilus-extension-4 >= $NAUTILUS_REQUIRED) + PKG_CHECK_MODULES(GLIB, glib-2.0 >= $GLIB_REQUIRED) ++PKG_CHECK_MODULES(GTK, gtk4 >= 4.6.0) ++ ++AC_SUBST(GTK_CFLAGS) + + AC_PATH_PROG([PYTHON3], [python3]) + +@@ -84,10 +87,10 @@ AC_MSG_CHECKING([for nautilus extension directory]) + if test -n "$with_nautilus_extension_dir"; then + NAUTILUS_EXTENSION_DIR=$with_nautilus_extension_dir + else +- NAUTILUS_EXTENSION_DIR=`$PKG_CONFIG --variable=extensiondir libnautilus-extension` ++ NAUTILUS_EXTENSION_DIR=`$PKG_CONFIG --variable=extensiondir libnautilus-extension-4` + fi + if test -z "$NAUTILUS_EXTENSION_DIR"; then +- NAUTILUS_EXTENSION_DIR='${exec_prefix}/lib/nautilus/extension-1.0' ++ NAUTILUS_EXTENSION_DIR='${exec_prefix}/lib/nautilus/extension-4' + fi + + AC_MSG_RESULT([${NAUTILUS_EXTENSION_DIR}]) +diff --git a/src/Makefile.am b/src/Makefile.am +index 15d6687..c521ec5 100644 +--- a/src/Makefile.am ++++ b/src/Makefile.am +@@ -13,6 +13,7 @@ libnautilus_dropbox_la_CFLAGS = \ + $(WARN_CFLAGS) \ + $(DISABLE_DEPRECATED_CFLAGS) \ + $(NAUTILUS_CFLAGS) \ ++ $(GTK_CFLAGS) \ + $(GLIB_CFLAGS) + + if DEBUG +diff --git a/src/dropbox.c b/src/dropbox.c +index 0d59559..8162aa9 100644 +--- a/src/dropbox.c ++++ b/src/dropbox.c +@@ -27,9 +27,6 @@ + + #include <glib-object.h> + +-#include <gdk/gdk.h> +-#include <gtk/gtk.h> +- + #include "nautilus-dropbox.h" + + static GType type_list[1]; +@@ -41,9 +38,6 @@ nautilus_module_initialize (GTypeModule *module) { + nautilus_dropbox_register_type (module); + type_list[0] = NAUTILUS_TYPE_DROPBOX; + +- dropbox_use_nautilus_submenu_workaround +- = (NAUTILUS_VERSION_MAJOR < 2 || +- (NAUTILUS_VERSION_MAJOR == 2 && NAUTILUS_VERSION_MINOR <= 22)); + dropbox_use_operation_in_progress_workaround = TRUE; + } + +diff --git a/src/nautilus-dropbox.c b/src/nautilus-dropbox.c +index c75ccbf..b9c10b4 100644 +--- a/src/nautilus-dropbox.c ++++ b/src/nautilus-dropbox.c +@@ -37,9 +37,7 @@ + #include <glib-object.h> + #include <gtk/gtk.h> + +-#include <libnautilus-extension/nautilus-extension-types.h> +-#include <libnautilus-extension/nautilus-menu-provider.h> +-#include <libnautilus-extension/nautilus-info-provider.h> ++#include <nautilus-extension.h> + + #include "g-util.h" + #include "dropbox-command-client.h" +@@ -49,7 +47,7 @@ + static char *emblems[] = {"dropbox-uptodate", "dropbox-syncing", "dropbox-unsyncable"}; + gchar *DEFAULT_EMBLEM_PATHS[2] = { EMBLEMDIR , NULL }; + +-gboolean dropbox_use_nautilus_submenu_workaround; ++ + gboolean dropbox_use_operation_in_progress_workaround; + + static GType dropbox_type = 0; +@@ -630,13 +628,6 @@ nautilus_dropbox_parse_menu(gchar **options, + g_object_set_property (G_OBJECT(item), "sensitive", &sensitive); + } + +- /* taken from nautilus-file-repairer (http://repairer.kldp.net/): +- * this code is a workaround for a bug of nautilus +- * See: http://bugzilla.gnome.org/show_bug.cgi?id=508878 */ +- if (dropbox_use_nautilus_submenu_workaround) { +- toret = g_list_append(toret, item); +- } +- + g_object_unref(item); + g_string_free(new_action_string, TRUE); + ret++; +@@ -661,7 +652,6 @@ get_file_items_callback(GHashTable *response, gpointer ud) + + static GList * + nautilus_dropbox_get_file_items(NautilusMenuProvider *provider, +- GtkWidget *window, + GList *files) + { + /* +@@ -778,14 +768,13 @@ add_emblem_paths(GHashTable* emblem_paths_response) + + gchar **emblem_paths_list; + int i; +- +- GtkIconTheme *theme = gtk_icon_theme_get_default(); ++ GtkIconTheme *theme = gtk_icon_theme_get_for_display (gdk_display_get_default ()); + + if (emblem_paths_response && + (emblem_paths_list = g_hash_table_lookup(emblem_paths_response, "path"))) { + for (i = 0; emblem_paths_list[i] != NULL; i++) { + if (emblem_paths_list[i][0]) +- gtk_icon_theme_append_search_path(theme, emblem_paths_list[i]); ++ gtk_icon_theme_add_search_path(theme, emblem_paths_list[i]); + } + } + g_hash_table_unref(emblem_paths_response); +@@ -804,15 +793,14 @@ remove_emblem_paths(GHashTable* emblem_paths_response) + goto exit; + + // We need to remove the old paths. +- GtkIconTheme * icon_theme = gtk_icon_theme_get_default(); + gchar ** paths; +- gint path_count; ++ GtkIconTheme *theme = gtk_icon_theme_get_for_display (gdk_display_get_default ()); + +- gtk_icon_theme_get_search_path(icon_theme, &paths, &path_count); ++ paths = gtk_icon_theme_get_search_path(theme); + + gint i, j, out = 0; + gboolean found = FALSE; +- for (i = 0; i < path_count; i++) { ++ for (i = 0; paths[i] != NULL; i++) { + gboolean keep = TRUE; + for (j = 0; emblem_paths_list[j] != NULL; j++) { + if (emblem_paths_list[j][0]) { +@@ -834,7 +822,7 @@ remove_emblem_paths(GHashTable* emblem_paths_response) + accomodate the changes */ + if (found) { + paths[out] = NULL; /* Clear the last one */ +- gtk_icon_theme_set_search_path(icon_theme, (const gchar **)paths, out); ++ gtk_icon_theme_set_search_path(theme, (const gchar **)paths); + } + + g_strfreev(paths); +@@ -888,13 +876,13 @@ on_disconnect(NautilusDropbox *cvs) { + + + static void +-nautilus_dropbox_menu_provider_iface_init (NautilusMenuProviderIface *iface) { ++nautilus_dropbox_menu_provider_iface_init (NautilusMenuProviderInterface *iface) { + iface->get_file_items = nautilus_dropbox_get_file_items; + return; + } + + static void +-nautilus_dropbox_info_provider_iface_init (NautilusInfoProviderIface *iface) { ++nautilus_dropbox_info_provider_iface_init (NautilusInfoProviderInterface *iface) { + iface->update_file_info = nautilus_dropbox_update_file_info; + iface->cancel_update = nautilus_dropbox_cancel_update; + return; +diff --git a/src/nautilus-dropbox.h b/src/nautilus-dropbox.h +index 65734be..44faa27 100644 +--- a/src/nautilus-dropbox.h ++++ b/src/nautilus-dropbox.h +@@ -27,7 +27,7 @@ + #include <glib.h> + #include <glib-object.h> + +-#include <libnautilus-extension/nautilus-info-provider.h> ++#include <nautilus-extension.h> + + #include "dropbox-command-client.h" + #include "nautilus-dropbox-hooks.h" diff --git a/pkgs/applications/networking/flexget/default.nix b/pkgs/applications/networking/flexget/default.nix index 110bcaa081a..e28e999522c 100644 --- a/pkgs/applications/networking/flexget/default.nix +++ b/pkgs/applications/networking/flexget/default.nix @@ -5,14 +5,14 @@ python3Packages.buildPythonApplication rec { pname = "flexget"; - version = "3.3.33"; + version = "3.3.34"; # Fetch from GitHub in order to use `requirements.in` src = fetchFromGitHub { owner = "flexget"; repo = "flexget"; rev = "refs/tags/v${version}"; - hash = "sha256-dJdRGqHBPbdGrxqhOmQJSZmR+YacQCDKgu03WtrGqVA="; + hash = "sha256-eDSfKkVR06rqSQkVWTEL/v5XLXWHagV0h8ClWNFaYak="; }; postPatch = '' diff --git a/pkgs/applications/networking/freefilesync/default.nix b/pkgs/applications/networking/freefilesync/default.nix index 48f2f2e1fe0..94c049d52cb 100644 --- a/pkgs/applications/networking/freefilesync/default.nix +++ b/pkgs/applications/networking/freefilesync/default.nix @@ -13,13 +13,13 @@ gcc12Stdenv.mkDerivation rec { pname = "freefilesync"; - version = "11.25"; + version = "11.26"; src = fetchFromGitHub { owner = "hkneptune"; repo = "FreeFileSync"; rev = "v${version}"; - sha256 = "sha256-JV9qwBiF9kl+wc9+7lUufQVu6uiMQ6vojntxduNJ8MI="; + sha256 = "sha256-MKs9PfxKVxfDYYB8Dqop9dUd757ajjgvIdMtKJX5dNw="; }; # Patches from ROSA Linux @@ -43,11 +43,6 @@ gcc12Stdenv.mkDerivation rec { }) ]; - postPatch = '' - substituteInPlace FreeFileSync/Source/ui/version_check.cpp \ - --replace "openBrowserForDownload();" "openBrowserForDownload(parent);" - ''; - nativeBuildInputs = [ pkg-config ]; diff --git a/pkgs/applications/networking/ids/snort/default.nix b/pkgs/applications/networking/ids/snort/default.nix index 938626806ca..46394c107de 100644 --- a/pkgs/applications/networking/ids/snort/default.nix +++ b/pkgs/applications/networking/ids/snort/default.nix @@ -12,8 +12,8 @@ stdenv.mkDerivation rec { sha256 = "0xrc7crchflfrk4x5dq5zx22zkmgcrbkww5r1pvkc3cyyr18cc6h"; }; - nativeBuildInputs = [ makeWrapper ]; - buildInputs = [ pkg-config luajit openssl libpcap pcre libdnet daq zlib flex bison libtirpc ]; + nativeBuildInputs = [ makeWrapper pkg-config ]; + buildInputs = [ luajit openssl libpcap pcre libdnet daq zlib flex bison libtirpc ]; NIX_CFLAGS_COMPILE = [ "-I${libtirpc.dev}/include/tirpc" ]; diff --git a/pkgs/applications/networking/instant-messengers/baresip/default.nix b/pkgs/applications/networking/instant-messengers/baresip/default.nix index b032cc2faa8..fd4e214cb03 100644 --- a/pkgs/applications/networking/instant-messengers/baresip/default.nix +++ b/pkgs/applications/networking/instant-messengers/baresip/default.nix @@ -25,13 +25,13 @@ , libvpx }: stdenv.mkDerivation rec { - version = "2.8.1"; + version = "2.8.2"; pname = "baresip"; src = fetchFromGitHub { owner = "baresip"; repo = "baresip"; rev = "v${version}"; - sha256 = "sha256-qtdwFAJLsHqhYVmD1YRUw0NMqX+Vq5BHR5mMvZISnuY="; + sha256 = "sha256-+hkV9s4ORm4Kqu9zBmxtFZJFG3gh70OOxpjix052bM0="; }; nativeBuildInputs = [ pkg-config ]; buildInputs = [ diff --git a/pkgs/applications/networking/instant-messengers/chatty/default.nix b/pkgs/applications/networking/instant-messengers/chatty/default.nix index fc9c4c10b21..9728ea65c36 100644 --- a/pkgs/applications/networking/instant-messengers/chatty/default.nix +++ b/pkgs/applications/networking/instant-messengers/chatty/default.nix @@ -87,5 +87,7 @@ stdenv.mkDerivation rec { license = licenses.gpl3Plus; maintainers = with maintainers; [ dotlambda tomfitzhenry ]; platforms = platforms.linux; + # Requires upgrade to libsoup3 + broken = true; }; } diff --git a/pkgs/applications/networking/instant-messengers/element/pin.json b/pkgs/applications/networking/instant-messengers/element/pin.json index ce17529cd39..f5f38124ceb 100644 --- a/pkgs/applications/networking/instant-messengers/element/pin.json +++ b/pkgs/applications/networking/instant-messengers/element/pin.json @@ -1,7 +1,7 @@ { - "version": "1.11.8", - "desktopSrcHash": "l6IwztPEPSo3WgdUBPO4ZNgfoLts8NaqvoHekAhfVGg=", - "desktopYarnHash": "105xj2xwc9g8cfiby0x93gy8w8w5c76mzzxck5mgvawcc6qpvmrc", - "webSrcHash": "Etxlq2TEaZM9Qz4ig5H00DsshJoFH6+wtt+RL1dR2n4=", - "webYarnHash": "1q05r2shv1c3kghwksjzrh9rl25ins6r2y46ng7smdml4f9vdcc0" + "version": "1.11.10", + "desktopSrcHash": "cywTZ5OgKaFkHh3i3KLfb8HH8ZlIAOY3Xn2WHyY0fNM=", + "desktopYarnHash": "1xwnw9hbbrr72xs2d43qwhbmhfk3w4z80cipyrmdj5y248y8sz84", + "webSrcHash": "r7WZUWgPDEBS9xpc1YmmPVGch7B2ouJOFAoKdcC/55Q=", + "webYarnHash": "0s8wxf13jc9x4zykhm4abgq3a38mjya7z43kjsags1fxhilf09bc" } diff --git a/pkgs/applications/networking/instant-messengers/fractal/default.nix b/pkgs/applications/networking/instant-messengers/fractal/default.nix index 3b5349d65ff..bfc322fea6c 100644 --- a/pkgs/applications/networking/instant-messengers/fractal/default.nix +++ b/pkgs/applications/networking/instant-messengers/fractal/default.nix @@ -32,7 +32,7 @@ stdenv.mkDerivation rec { owner = "GNOME"; repo = "fractal"; rev = version; - sha256 = "DSNVd9YvI7Dd3s3+M0+wE594tmL1yPNMnD1W9wLhSuw="; + hash = "sha256-To6lr2I+JVrxvuK++2gLWntFGnEBm+B6KTRuOvjASek="; }; patches = [ @@ -40,14 +40,17 @@ stdenv.mkDerivation rec { # fractal-gtk/res/meson.build:5:0: ERROR: Function does not take positional arguments. (fetchpatch { url = "https://gitlab.gnome.org/GNOME/fractal/-/commit/6fa1a23596d65d94aa889efe725174e6cd2903f0.patch"; - sha256 = "3OzU9XL2V1VNOkvL1j677K3HNoBqPMQudQDmiDxYfAc="; + hash = "sha256-3OzU9XL2V1VNOkvL1j677K3HNoBqPMQudQDmiDxYfAc="; }) + + # This is in fractal v4.4.1b1+ so can be removed when fractal is updated. + ./update-socket2-for-rust-1.64.diff ]; cargoDeps = rustPlatform.fetchCargoTarball { - inherit src; + inherit src patches; name = "${pname}-${version}"; - hash = "sha256-xim5sOzeXJjRXbTOg2Gk/LHU0LioiyMK5nSr1LwMPjc="; + hash = "sha256-d99zSaxp22YyLP3Wckgcm7wlz7nFrLJDHq2xPJmZFf0="; }; nativeBuildInputs = [ diff --git a/pkgs/applications/networking/instant-messengers/fractal/update-socket2-for-rust-1.64.diff b/pkgs/applications/networking/instant-messengers/fractal/update-socket2-for-rust-1.64.diff new file mode 100644 index 00000000000..04e6f2cc1cb --- /dev/null +++ b/pkgs/applications/networking/instant-messengers/fractal/update-socket2-for-rust-1.64.diff @@ -0,0 +1,195 @@ +diff --git a/Cargo.lock b/Cargo.lock +index c0b5e5e2..3009f183 100644 +--- a/Cargo.lock ++++ b/Cargo.lock +@@ -1,5 +1,7 @@ + # This file is automatically @generated by Cargo. + # It is not intended for manual editing. ++version = 3 ++ + [[package]] + name = "addr2line" + version = "0.13.0" +@@ -169,7 +171,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" + checksum = "46254cf2fdcdf1badb5934448c1bcbe046a56537b3987d96c51a7afc5d03f293" + dependencies = [ + "addr2line", +- "cfg-if", ++ "cfg-if 0.1.10", + "libc", + "miniz_oxide", + "object", +@@ -326,6 +328,12 @@ version = "0.1.10" + source = "registry+https://github.com/rust-lang/crates.io-index" + checksum = "4785bdd1c96b2a846b2bd7cc02e86b6b3dbf14e7e53446c4f54c92a361040822" + ++[[package]] ++name = "cfg-if" ++version = "1.0.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd" ++ + [[package]] + name = "chrono" + version = "0.4.13" +@@ -407,7 +415,7 @@ version = "1.2.0" + source = "registry+https://github.com/rust-lang/crates.io-index" + checksum = "ba125de2af0df55319f41944744ad91c71113bf74a4646efff39afe1f6842db1" + dependencies = [ +- "cfg-if", ++ "cfg-if 0.1.10", + ] + + [[package]] +@@ -417,7 +425,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" + checksum = "c3c7c73a2d1e9fc0886a08b93e98eb643461230d5f1925e4036204d5f2e261a8" + dependencies = [ + "autocfg 1.0.0", +- "cfg-if", ++ "cfg-if 0.1.10", + "lazy_static", + ] + +@@ -455,7 +463,7 @@ version = "2.0.2" + source = "registry+https://github.com/rust-lang/crates.io-index" + checksum = "551a778172a450d7fc12e629ca3b0428d00f6afa9a43da1b630d54604e97371c" + dependencies = [ +- "cfg-if", ++ "cfg-if 0.1.10", + "dirs-sys", + ] + +@@ -465,7 +473,7 @@ version = "2.0.2" + source = "registry+https://github.com/rust-lang/crates.io-index" + checksum = "13aea89a5c93364a98e9b37b2fa237effbb694d5cfe01c5b70941f7eb087d5e3" + dependencies = [ +- "cfg-if", ++ "cfg-if 0.1.10", + "dirs-sys", + ] + +@@ -506,7 +514,7 @@ version = "0.8.23" + source = "registry+https://github.com/rust-lang/crates.io-index" + checksum = "e8ac63f94732332f44fe654443c46f6375d1939684c17b0afb6cb56b0456e171" + dependencies = [ +- "cfg-if", ++ "cfg-if 0.1.10", + ] + + [[package]] +@@ -549,7 +557,7 @@ version = "1.0.16" + source = "registry+https://github.com/rust-lang/crates.io-index" + checksum = "68c90b0fc46cf89d227cc78b40e494ff81287a92dd07631e5af0d06fe3cf885e" + dependencies = [ +- "cfg-if", ++ "cfg-if 0.1.10", + "crc32fast", + "libc", + "miniz_oxide", +@@ -842,7 +850,7 @@ version = "0.1.14" + source = "registry+https://github.com/rust-lang/crates.io-index" + checksum = "7abc8dd8451921606d809ba32e95b6111925cd2906060d2dcc29c070220503eb" + dependencies = [ +- "cfg-if", ++ "cfg-if 0.1.10", + "libc", + "wasi", + ] +@@ -979,7 +987,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" + checksum = "ce8664a114cd6ec16bece783d5eee59496919915b1f6884400ba4a953274a163" + dependencies = [ + "bitflags", +- "cfg-if", ++ "cfg-if 0.1.10", + "futures-channel", + "futures-core", + "futures-util", +@@ -1543,7 +1551,7 @@ version = "0.4.11" + source = "registry+https://github.com/rust-lang/crates.io-index" + checksum = "4fabed175da42fed1fa0746b0ea71f412aa9d35e76e95e59b192c64b9dc2bf8b" + dependencies = [ +- "cfg-if", ++ "cfg-if 0.1.10", + ] + + [[package]] +@@ -1648,7 +1656,7 @@ version = "0.6.22" + source = "registry+https://github.com/rust-lang/crates.io-index" + checksum = "fce347092656428bc8eaf6201042cb551b8d67855af7374542a92a0fbfcac430" + dependencies = [ +- "cfg-if", ++ "cfg-if 0.1.10", + "fuchsia-zircon", + "fuchsia-zircon-sys", + "iovec", +@@ -1703,7 +1711,7 @@ version = "0.2.34" + source = "registry+https://github.com/rust-lang/crates.io-index" + checksum = "2ba7c918ac76704fb42afcbbb43891e72731f3dcca3bef2a19786297baf14af7" + dependencies = [ +- "cfg-if", ++ "cfg-if 0.1.10", + "libc", + "winapi 0.3.9", + ] +@@ -1826,7 +1834,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" + checksum = "8d575eff3665419f9b83678ff2815858ad9d11567e082f5ac1814baba4e2bcb4" + dependencies = [ + "bitflags", +- "cfg-if", ++ "cfg-if 0.1.10", + "foreign-types", + "lazy_static", + "libc", +@@ -2523,13 +2531,12 @@ checksum = "c111b5bd5695e56cffe5129854aa230b39c93a305372fdbb2668ca2394eea9f8" + + [[package]] + name = "socket2" +-version = "0.3.12" ++version = "0.3.19" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "03088793f677dce356f3ccc2edb1b314ad191ab702a5de3faf49304f7e104918" ++checksum = "122e570113d28d773067fab24266b66753f6ea915758651696b6e35e49f88d6e" + dependencies = [ +- "cfg-if", ++ "cfg-if 1.0.0", + "libc", +- "redox_syscall", + "winapi 0.3.9", + ] + +@@ -2678,7 +2685,7 @@ version = "3.1.0" + source = "registry+https://github.com/rust-lang/crates.io-index" + checksum = "7a6e24d9338a0a5be79593e2fa15a648add6138caa803e2d5bc782c371732ca9" + dependencies = [ +- "cfg-if", ++ "cfg-if 0.1.10", + "libc", + "rand 0.7.3", + "redox_syscall", +@@ -2818,7 +2825,7 @@ version = "0.1.18" + source = "registry+https://github.com/rust-lang/crates.io-index" + checksum = "f0aae59226cf195d8e74d4b34beae1859257efb4e5fed3f147d2dc2c7d372178" + dependencies = [ +- "cfg-if", ++ "cfg-if 0.1.10", + "log", + "tracing-core", + ] +@@ -2998,7 +3005,7 @@ version = "0.2.67" + source = "registry+https://github.com/rust-lang/crates.io-index" + checksum = "f0563a9a4b071746dd5aedbc3a28c6fe9be4586fb3fbadb67c400d4f53c6b16c" + dependencies = [ +- "cfg-if", ++ "cfg-if 0.1.10", + "serde", + "serde_json", + "wasm-bindgen-macro", +@@ -3025,7 +3032,7 @@ version = "0.4.17" + source = "registry+https://github.com/rust-lang/crates.io-index" + checksum = "95f8d235a77f880bcef268d379810ea6c0af2eacfa90b1ad5af731776e0c4699" + dependencies = [ +- "cfg-if", ++ "cfg-if 0.1.10", + "js-sys", + "wasm-bindgen", + "web-sys", diff --git a/pkgs/applications/networking/instant-messengers/linphone/default.nix b/pkgs/applications/networking/instant-messengers/linphone/default.nix index dc94b077952..3132faeb630 100644 --- a/pkgs/applications/networking/instant-messengers/linphone/default.nix +++ b/pkgs/applications/networking/instant-messengers/linphone/default.nix @@ -33,7 +33,7 @@ mkDerivation rec { pname = "linphone-desktop"; - version = "4.4.9"; + version = "4.4.10"; src = fetchFromGitLab { domain = "gitlab.linphone.org"; @@ -41,7 +41,7 @@ mkDerivation rec { group = "BC"; repo = pname; rev = version; - sha256 = "sha256-xvKkFMZ7rUyEjnQK7rBkrzO8fhfHjpQ1DHQBUlizZ+o="; + sha256 = "sha256-V3vycO0kV6RTFZWi6uiCFSNfLq/09dBfyLk/5zw3kRA="; }; patches = [ diff --git a/pkgs/applications/networking/instant-messengers/pidgin-plugins/otr/default.nix b/pkgs/applications/networking/instant-messengers/pidgin-plugins/otr/default.nix index 52204d5c79c..aa871df5e8a 100644 --- a/pkgs/applications/networking/instant-messengers/pidgin-plugins/otr/default.nix +++ b/pkgs/applications/networking/instant-messengers/pidgin-plugins/otr/default.nix @@ -10,7 +10,8 @@ stdenv.mkDerivation rec { postInstall = "ln -s \$out/lib/pidgin \$out/share/pidgin-otr"; - buildInputs = [ libotr pidgin intltool ]; + nativeBuildInputs = [ intltool ]; + buildInputs = [ libotr pidgin ]; meta = with lib; { homepage = "https://otr.cypherpunks.ca/"; diff --git a/pkgs/applications/networking/instant-messengers/pidgin-plugins/pidgin-indicator/default.nix b/pkgs/applications/networking/instant-messengers/pidgin-plugins/pidgin-indicator/default.nix index 9afdee8cda1..70cb3a9028d 100644 --- a/pkgs/applications/networking/instant-messengers/pidgin-plugins/pidgin-indicator/default.nix +++ b/pkgs/applications/networking/instant-messengers/pidgin-plugins/pidgin-indicator/default.nix @@ -20,8 +20,8 @@ stdenv.mkDerivation rec { sha256 = "sha256-CdA/aUu+CmCRbVBKpJGydicqFQa/rEsLWS3MBKlH2/M="; }; - nativeBuildInputs = [ autoreconfHook ]; - buildInputs = [ glib intltool libappindicator-gtk2 libtool pidgin ]; + nativeBuildInputs = [ autoreconfHook intltool ]; + buildInputs = [ glib libappindicator-gtk2 libtool pidgin ]; meta = with lib; { description = "An AppIndicator and KStatusNotifierItem Plugin for Pidgin"; diff --git a/pkgs/applications/networking/instant-messengers/pidgin-plugins/purple-plugin-pack/default.nix b/pkgs/applications/networking/instant-messengers/pidgin-plugins/purple-plugin-pack/default.nix index f393a17c1bc..7c076cb3724 100644 --- a/pkgs/applications/networking/instant-messengers/pidgin-plugins/purple-plugin-pack/default.nix +++ b/pkgs/applications/networking/instant-messengers/pidgin-plugins/purple-plugin-pack/default.nix @@ -8,7 +8,8 @@ stdenv.mkDerivation rec { sha256 = "0g5hmy7fwgjq59j52h9yps28jsjjrfkd4r18gyx6hfd3g3kzbg1b"; }; - buildInputs = [ pidgin intltool python2 ]; + nativeBuildInputs = [ intltool ]; + buildInputs = [ pidgin python2 ]; meta = with lib; { homepage = "https://bitbucket.org/rekkanoryo/purple-plugin-pack"; diff --git a/pkgs/applications/networking/instant-messengers/pidgin-plugins/tox-prpl/default.nix b/pkgs/applications/networking/instant-messengers/pidgin-plugins/tox-prpl/default.nix index 41c6a75310a..eb606f796cf 100644 --- a/pkgs/applications/networking/instant-messengers/pidgin-plugins/tox-prpl/default.nix +++ b/pkgs/applications/networking/instant-messengers/pidgin-plugins/tox-prpl/default.nix @@ -19,6 +19,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ autoreconfHook ]; meta = with lib; { + broken = true; # unmaintained and not compatible with current Tox API. homepage = "https://github.com/jin-eld/tox-prpl"; description = "Tox plugin for Pidgin / libpurple"; license = licenses.gpl3; diff --git a/pkgs/applications/networking/instant-messengers/pidgin/default.nix b/pkgs/applications/networking/instant-messengers/pidgin/default.nix index 84f8f327cad..15e830b7687 100644 --- a/pkgs/applications/networking/instant-messengers/pidgin/default.nix +++ b/pkgs/applications/networking/instant-messengers/pidgin/default.nix @@ -16,7 +16,7 @@ let unwrapped = stdenv.mkDerivation rec { sha256 = "sha256-RUsbkovGvLsYM1OvMPv95VlfIkWjQjoaRubJei3yKBA="; }; - nativeBuildInputs = [ makeWrapper ]; + nativeBuildInputs = [ makeWrapper intltool ]; NIX_CFLAGS_COMPILE = "-I${gst_all_1.gst-plugins-base.dev}/include/gstreamer-1.0"; @@ -27,7 +27,7 @@ let unwrapped = stdenv.mkDerivation rec { gst_all_1.gstreamer gst_all_1.gst-plugins-base gst_all_1.gst-plugins-good libxml2 nss nspr libXScrnSaver python-with-dbus - avahi dbus dbus-glib intltool libidn + avahi dbus dbus-glib libidn libICE libXext libSM cyrus_sasl libgnt ncurses # optional: build finch - the console UI ] diff --git a/pkgs/applications/networking/instant-messengers/slack/default.nix b/pkgs/applications/networking/instant-messengers/slack/default.nix index 8c6572224c3..325d5330d62 100644 --- a/pkgs/applications/networking/instant-messengers/slack/default.nix +++ b/pkgs/applications/networking/instant-messengers/slack/default.nix @@ -47,8 +47,8 @@ let x86_64-darwin-version = "4.28.182"; x86_64-darwin-sha256 = "0x0zc45k0jh0hivgjymcxnnwc2lwyfq68rw39lbxp4i1ir2sbnxg"; - x86_64-linux-version = "4.28.171"; - x86_64-linux-sha256 = "sha256-rsHX/NLLGR0XZsg3Cc6GjNK6rSc9UmM2XkfjqwsJZV4="; + x86_64-linux-version = "4.28.184"; + x86_64-linux-sha256 = "sha256-qAc9rHJbM7lmqNxOcOSnqnuib5zJ0Ry3hAGri8DKIlo="; aarch64-darwin-version = "4.28.182"; aarch64-darwin-sha256 = "0bc8lhmpm0310gh1w9xkb8i1cpldchm4b4mzsr9h0mhvljxmvlyf"; diff --git a/pkgs/applications/networking/instant-messengers/telegram/tdesktop/default.nix b/pkgs/applications/networking/instant-messengers/telegram/tdesktop/default.nix index 530e9377828..a820e4e0150 100644 --- a/pkgs/applications/networking/instant-messengers/telegram/tdesktop/default.nix +++ b/pkgs/applications/networking/instant-messengers/telegram/tdesktop/default.nix @@ -28,7 +28,7 @@ , tl-expected , hunspell , glibmm -, webkitgtk +, webkitgtk_4_1 , jemalloc , rnnoise , abseil-cpp @@ -93,7 +93,7 @@ env.mkDerivation rec { substituteInPlace Telegram/ThirdParty/libtgvoip/os/linux/AudioPulse.cpp \ --replace '"libpulse.so.0"' '"${libpulseaudio}/lib/libpulse.so.0"' substituteInPlace Telegram/lib_webview/webview/platform/linux/webview_linux_webkit_gtk.cpp \ - --replace '"libwebkit2gtk-4.0.so.37"' '"${webkitgtk}/lib/libwebkit2gtk-4.0.so.37"' + --replace '"libwebkit2gtk-4.1.so.0"' '"${webkitgtk_4_1}/lib/libwebkit2gtk-4.1.so.0"' ''; # We want to run wrapProgram manually (with additional parameters) @@ -131,7 +131,7 @@ env.mkDerivation rec { tl-expected hunspell glibmm - webkitgtk + webkitgtk_4_1 jemalloc rnnoise tg_owt diff --git a/pkgs/applications/networking/instant-messengers/toxic/default.nix b/pkgs/applications/networking/instant-messengers/toxic/default.nix index a6d6cac4ac7..2f16cb78454 100644 --- a/pkgs/applications/networking/instant-messengers/toxic/default.nix +++ b/pkgs/applications/networking/instant-messengers/toxic/default.nix @@ -1,27 +1,18 @@ -{ lib, stdenv, fetchFromGitHub, fetchpatch, libsodium, ncurses, curl +{ lib, stdenv, fetchFromGitHub, libsodium, ncurses, curl , libtoxcore, openal, libvpx, freealut, libconfig, pkg-config, libopus , qrencode, gdk-pixbuf, libnotify }: stdenv.mkDerivation rec { pname = "toxic"; - version = "0.11.1"; + version = "0.11.3"; src = fetchFromGitHub { owner = "Tox"; repo = "toxic"; rev = "v${version}"; - sha256 = "sha256-5jLXXI+IMrYa7ZtdMjJrah1zB5TJ3GdHfvcMd1TYE4E="; + sha256 = "sha256-BabRY9iu5ccEXo5POrWkWaIWAeQU4MVlMK8I+Iju6aQ="; }; - patches = [ - # Pending for upstream inclusion fix for ncurses-6.3 compatibility. - (fetchpatch { - name = "ncurses-6.3.patch"; - url = "https://github.com/JFreegman/toxic/commit/41e93adbdbd56db065166af5a6676a7996e9e451.patch"; - sha256 = "sha256-LYEseB5FmXFNifa1RZUxhkXeWlkEEMm3ASD55IoUPa0="; - }) - ]; - makeFlags = [ "PREFIX=$(out)"]; installFlags = [ "PREFIX=$(out)"]; @@ -32,10 +23,10 @@ stdenv.mkDerivation rec { ]; nativeBuildInputs = [ pkg-config libconfig ]; - meta = with lib; { + meta = with lib; src.meta // { description = "Reference CLI for Tox"; license = licenses.gpl3Plus; - maintainers = with maintainers; [ ]; + maintainers = with maintainers; [ ehmry ]; platforms = platforms.linux; }; } diff --git a/pkgs/applications/networking/irc/weechat/default.nix b/pkgs/applications/networking/irc/weechat/default.nix index 4631cef04fa..132504a20e1 100644 --- a/pkgs/applications/networking/irc/weechat/default.nix +++ b/pkgs/applications/networking/irc/weechat/default.nix @@ -1,20 +1,25 @@ { stdenv, fetchurl, lib , ncurses, openssl, aspell, gnutls, gettext , zlib, curl, pkg-config, libgcrypt -, cmake, makeWrapper, libobjc, libresolv, libiconv +, cmake, libobjc, libresolv, libiconv , asciidoctor # manpages +, enableTests ? !stdenv.isDarwin, cpputest , guileSupport ? true, guile , luaSupport ? true, lua5 , perlSupport ? true, perl , pythonSupport ? true, python3Packages , rubySupport ? true, ruby , tclSupport ? true, tcl +, phpSupport ? !stdenv.isDarwin, php, systemd, libxml2, pcre2, libargon2 , extraBuildInputs ? [] -, fetchpatch }: let inherit (python3Packages) python; + php-embed = php.override { + embedSupport = true; + apxs2Support = false; + }; plugins = [ { name = "perl"; enabled = perlSupport; cmakeFlag = "ENABLE_PERL"; buildInputs = [ perl ]; } { name = "tcl"; enabled = tclSupport; cmakeFlag = "ENABLE_TCL"; buildInputs = [ tcl ]; } @@ -22,35 +27,37 @@ let { name = "guile"; enabled = guileSupport; cmakeFlag = "ENABLE_GUILE"; buildInputs = [ guile ]; } { name = "lua"; enabled = luaSupport; cmakeFlag = "ENABLE_LUA"; buildInputs = [ lua5 ]; } { name = "python"; enabled = pythonSupport; cmakeFlag = "ENABLE_PYTHON3"; buildInputs = [ python ]; } + { name = "php"; enabled = phpSupport; cmakeFlag = "ENABLE_PHP"; buildInputs = [ + php-embed.unwrapped.dev libxml2 pcre2 libargon2 + ] ++ lib.optional stdenv.isLinux systemd; } ]; enabledPlugins = builtins.filter (p: p.enabled) plugins; in assert lib.all (p: p.enabled -> ! (builtins.elem null p.buildInputs)) plugins; stdenv.mkDerivation rec { - version = "3.6"; + version = "3.7"; pname = "weechat"; hardeningEnable = [ "pie" ]; src = fetchurl { url = "https://weechat.org/files/src/weechat-${version}.tar.bz2"; - sha256 = "sha256-GkYN/Y4LQQr7GdSDu0ucXXM9wWPAqKD1txJXkOhJMDc="; + hash = "sha256-n5kvC//h85c4IvkrCVTz+F0DcCC5rdRkvj8W3fUPXI8="; }; outputs = [ "out" "man" ] ++ map (p: p.name) enabledPlugins; cmakeFlags = with lib; [ "-DENABLE_MAN=ON" - "-DENABLE_DOC=OFF" # TODO: Documentation fails to build, was deactivated to push through security update - "-DENABLE_JAVASCRIPT=OFF" # Requires v8 <= 3.24.3, https://github.com/weechat/weechat/issues/360 - "-DENABLE_PHP=OFF" + "-DENABLE_DOC=OFF" # TODO(@ncfavier): Documentation fails to build, was deactivated to push through security update + "-DENABLE_TESTS=${if enableTests then "ON" else "OFF"}" ] ++ optionals stdenv.isDarwin ["-DICONV_LIBRARY=${libiconv}/lib/libiconv.dylib"] ++ map (p: "-D${p.cmakeFlag}=" + (if p.enabled then "ON" else "OFF")) plugins ; - nativeBuildInputs = [ cmake pkg-config makeWrapper asciidoctor ]; + nativeBuildInputs = [ cmake pkg-config asciidoctor ] ++ lib.optional enableTests cpputest; buildInputs = with lib; [ ncurses openssl aspell gnutls gettext zlib curl libgcrypt ] @@ -85,7 +92,7 @@ let on https://nixos.org/nixpkgs/manual/#sec-weechat . ''; license = lib.licenses.gpl3; - maintainers = with lib.maintainers; [ lovek323 ]; + maintainers = with lib.maintainers; [ ncfavier ]; platforms = lib.platforms.unix; }; } diff --git a/pkgs/applications/networking/irc/weechat/wrapper.nix b/pkgs/applications/networking/irc/weechat/wrapper.nix index 5c06bb8517a..353b7ffd6fd 100644 --- a/pkgs/applications/networking/irc/weechat/wrapper.nix +++ b/pkgs/applications/networking/irc/weechat/wrapper.nix @@ -7,7 +7,11 @@ weechat: let wrapper = { installManPages ? true - , configure ? { availablePlugins, ... }: { plugins = builtins.attrValues availablePlugins; } + , configure ? { availablePlugins, ... }: { + # Do not include PHP by default, because it bloats the closure, doesn't + # build on Darwin, and there are no official PHP scripts. + plugins = builtins.attrValues (builtins.removeAttrs availablePlugins [ "php" ]); + } }: let @@ -21,6 +25,7 @@ let ''; withPackages = pkgsFun: (python // { extraEnv = '' + ${python.extraEnv} export PYTHONHOME="${python3Packages.python.withPackages pkgsFun}" ''; }); @@ -40,6 +45,7 @@ let ruby = simplePlugin "ruby"; guile = simplePlugin "guile"; lua = simplePlugin "lua"; + php = simplePlugin "php"; }; config = configure { inherit availablePlugins; }; diff --git a/pkgs/applications/networking/mailreaders/evolution/evolution-ews/default.nix b/pkgs/applications/networking/mailreaders/evolution/evolution-ews/default.nix index 337aeaba1a2..f97bbea0023 100644 --- a/pkgs/applications/networking/mailreaders/evolution/evolution-ews/default.nix +++ b/pkgs/applications/networking/mailreaders/evolution/evolution-ews/default.nix @@ -1,32 +1,55 @@ -{ lib, stdenv, fetchurl, gnome, cmake, gettext, intltool, pkg-config, evolution-data-server, evolution -, sqlite, gtk3, webkitgtk, libgdata, libmspack }: +{ stdenv +, lib +, fetchurl +, gnome +, cmake +, gettext +, intltool +, pkg-config +, evolution-data-server +, evolution +, gtk3 +, libsoup_3 +, libical +, json-glib +, libmspack +, webkitgtk_4_1 +}: stdenv.mkDerivation rec { pname = "evolution-ews"; - version = "3.44.4"; + version = "3.46.0"; src = fetchurl { url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "TxgrBaE6wbezOwj7Bm6DlcqpW6fagIiGqpGxQp1tfbM="; + sha256 = "vZe6IFzEW60SmXvuE0ii+R2LAtcUWD159PrheU2sG4A="; }; - nativeBuildInputs = [ cmake gettext intltool pkg-config ]; + nativeBuildInputs = [ + cmake + gettext + intltool + pkg-config + ]; buildInputs = [ - evolution-data-server evolution - sqlite libgdata - gtk3 webkitgtk + evolution-data-server + evolution + gtk3 + libsoup_3 + libical + json-glib libmspack + # For evolution-shell-3.0 + webkitgtk_4_1 ]; cmakeFlags = [ - # Building with libmspack as recommended: https://wiki.gnome.org/Apps/Evolution/Building#Build_evolution-ews - "-DWITH_MSPACK=ON" # don't try to install into ${evolution} "-DFORCE_INSTALL_PREFIX=ON" ]; - passthru = { + passthru = { updateScript = gnome.updateScript { packageName = "evolution-ews"; versionPolicy = "odd-unstable"; diff --git a/pkgs/applications/networking/mailreaders/evolution/evolution/default.nix b/pkgs/applications/networking/mailreaders/evolution/evolution/default.nix index 19d6469e96a..6cac048cfd2 100644 --- a/pkgs/applications/networking/mailreaders/evolution/evolution/default.nix +++ b/pkgs/applications/networking/mailreaders/evolution/evolution/default.nix @@ -5,7 +5,7 @@ , intltool , fetchurl , libxml2 -, webkitgtk +, webkitgtk_4_1 , highlight , pkg-config , gtk3 @@ -14,7 +14,6 @@ , libpst , gspell , evolution-data-server -, libgdata , libgweather , glib-networking , gsettings-desktop-schemas @@ -23,7 +22,6 @@ , shared-mime-info , libical , db -, gcr , sqlite , gnome , gnome-desktop @@ -34,7 +32,7 @@ , nspr , icu , libcanberra-gtk3 -, geocode-glib +, geocode-glib_2 , cmark , bogofilter , gst_all_1 @@ -46,11 +44,11 @@ stdenv.mkDerivation rec { pname = "evolution"; - version = "3.44.4"; + version = "3.46.0"; src = fetchurl { url = "mirror://gnome/sources/evolution/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "8LFuerrTx5RaKcMi8X2rSgjWHpm9fMkbjfNQU8XBLow="; + sha256 = "4J6Sdrxrmr8NrTpOgT7qHQJfT2qvH6w7ew+IiVdCkT8="; }; nativeBuildInputs = [ @@ -68,7 +66,6 @@ stdenv.mkDerivation rec { bogofilter db evolution-data-server - gcr gdk-pixbuf glib glib-networking @@ -81,9 +78,8 @@ stdenv.mkDerivation rec { highlight icu libcanberra-gtk3 - geocode-glib + geocode-glib_2 cmark - libgdata libgweather libical libnotify @@ -97,7 +93,7 @@ stdenv.mkDerivation rec { procps shared-mime-info sqlite - webkitgtk + webkitgtk_4_1 ]; propagatedUserEnvPkgs = [ @@ -106,13 +102,11 @@ stdenv.mkDerivation rec { cmakeFlags = [ "-DENABLE_AUTOAR=OFF" - "-DENABLE_LIBCRYPTUI=OFF" "-DENABLE_YTNEF=OFF" "-DWITH_SPAMASSASSIN=${spamassassin}/bin/spamassassin" "-DWITH_SA_LEARN=${spamassassin}/bin/sa-learn" "-DWITH_BOGOFILTER=${bogofilter}/bin/bogofilter" "-DWITH_OPENLDAP=${openldap}" - "-DWITH_GWEATHER4=ON" ]; requiredSystemFeatures = [ @@ -128,6 +122,7 @@ stdenv.mkDerivation rec { }; }; + PKG_CONFIG_CAMEL_1_2_CAMEL_PROVIDERDIR = "${placeholder "out"}/lib/evolution-data-server/camel-providers"; PKG_CONFIG_LIBEDATASERVERUI_1_2_UIMODULEDIR = "${placeholder "out"}/lib/evolution-data-server/ui-modules"; meta = with lib; { diff --git a/pkgs/applications/networking/mailreaders/himalaya/default.nix b/pkgs/applications/networking/mailreaders/himalaya/default.nix index 91161e5ab14..52aac148df3 100644 --- a/pkgs/applications/networking/mailreaders/himalaya/default.nix +++ b/pkgs/applications/networking/mailreaders/himalaya/default.nix @@ -12,16 +12,16 @@ rustPlatform.buildRustPackage rec { pname = "himalaya"; - version = "0.5.10"; + version = "0.6.0"; src = fetchFromGitHub { owner = "soywod"; repo = pname; rev = "v${version}"; - sha256 = "sha256-CXchZbXX7NH2ZXeAoPph3qxxdcAdDVZLBmOMwxFu+Yo="; + sha256 = "sha256-d+ERCUPUHx41HfBtjb6BjhGKzkUTGIb01BRWvAnLYwk="; }; - cargoSha256 = "sha256-sSQX7DHDgh1eO1Dwn1f0m51Bl2ZG1daRtrnYvsvPOkg="; + cargoSha256 = "sha256-ICaahkIP1uSm4iXvSPMo8uVTtSa1nCyJdDihGdVEQvg="; nativeBuildInputs = lib.optionals enableCompletions [ installShellFiles ] ++ lib.optionals (!stdenv.hostPlatform.isDarwin) [ pkg-config ]; diff --git a/pkgs/applications/networking/n8n/default.nix b/pkgs/applications/networking/n8n/default.nix index 84ac952846f..cdaf4286f93 100644 --- a/pkgs/applications/networking/n8n/default.nix +++ b/pkgs/applications/networking/n8n/default.nix @@ -7,17 +7,25 @@ let }; in nodePackages.n8n.override { - nativeBuildInputs = with pkgs.nodePackages; [ - node-pre-gyp + nativeBuildInputs = [ + pkgs.nodePackages.node-pre-gyp ]; - dontNpmInstall = true; + buildInputs = [ + pkgs.postgresql + ]; - postInstall = '' - mkdir -p $out/bin - ln -s $out/lib/node_modules/n8n/bin/n8n $out/bin/n8n + # Oracle's official package on npm is binary only (WHY?!) and doesn't provide binaries for aarch64. + # This can supposedly be fixed by building a custom copy of the module from source, but that's way + # too much complexity for a setup no one would ever actually run. + # + # NB: If you _are_ actually running n8n on Oracle on aarch64, feel free to submit a patch. + preRebuild = lib.optionalString stdenv.isAarch64 '' + rm -rf node_modules/oracledb ''; + dontNpmInstall = true; + passthru = { updateScript = ./generate-dependencies.sh; tests = nixosTests.n8n; diff --git a/pkgs/applications/networking/n8n/node-env.nix b/pkgs/applications/networking/n8n/node-env.nix index 2590dd267a4..5dad9ec63d4 100644 --- a/pkgs/applications/networking/n8n/node-env.nix +++ b/pkgs/applications/networking/n8n/node-env.nix @@ -165,7 +165,11 @@ let if(process.argv[2] == "development") { replaceDependencies(packageObj.devDependencies); } + else { + packageObj.devDependencies = {}; + } replaceDependencies(packageObj.optionalDependencies); + replaceDependencies(packageObj.peerDependencies); /* Write the fixed package.json file */ fs.writeFileSync("package.json", JSON.stringify(packageObj, null, 2)); @@ -270,7 +274,7 @@ let # Reconstructs a package-lock file from the node_modules/ folder structure and package.json files with dummy sha1 hashes reconstructPackageLock = writeTextFile { - name = "addintegrityfields.js"; + name = "reconstructpackagelock.js"; text = '' var fs = require('fs'); var path = require('path'); @@ -280,25 +284,43 @@ let var lockObj = { name: packageObj.name, version: packageObj.version, - lockfileVersion: 1, + lockfileVersion: 2, requires: true, + packages: { + "": { + name: packageObj.name, + version: packageObj.version, + license: packageObj.license, + bin: packageObj.bin, + dependencies: packageObj.dependencies, + engines: packageObj.engines, + optionalDependencies: packageObj.optionalDependencies + } + }, dependencies: {} }; - function augmentPackageJSON(filePath, dependencies) { + function augmentPackageJSON(filePath, packages, dependencies) { var packageJSON = path.join(filePath, "package.json"); if(fs.existsSync(packageJSON)) { var packageObj = JSON.parse(fs.readFileSync(packageJSON)); + packages[filePath] = { + version: packageObj.version, + integrity: "sha1-000000000000000000000000000=", + dependencies: packageObj.dependencies, + engines: packageObj.engines, + optionalDependencies: packageObj.optionalDependencies + }; dependencies[packageObj.name] = { version: packageObj.version, integrity: "sha1-000000000000000000000000000=", dependencies: {} }; - processDependencies(path.join(filePath, "node_modules"), dependencies[packageObj.name].dependencies); + processDependencies(path.join(filePath, "node_modules"), packages, dependencies[packageObj.name].dependencies); } } - function processDependencies(dir, dependencies) { + function processDependencies(dir, packages, dependencies) { if(fs.existsSync(dir)) { var files = fs.readdirSync(dir); @@ -314,23 +336,84 @@ let pkgFiles.forEach(function(entry) { if(stats.isDirectory()) { var pkgFilePath = path.join(filePath, entry); - augmentPackageJSON(pkgFilePath, dependencies); + augmentPackageJSON(pkgFilePath, packages, dependencies); } }); } else { - augmentPackageJSON(filePath, dependencies); + augmentPackageJSON(filePath, packages, dependencies); } } }); } } - processDependencies("node_modules", lockObj.dependencies); + processDependencies("node_modules", lockObj.packages, lockObj.dependencies); fs.writeFileSync("package-lock.json", JSON.stringify(lockObj, null, 2)); ''; }; + # Script that links bins defined in package.json to the node_modules bin directory + # NPM does not do this for top-level packages itself anymore as of v7 + linkBinsScript = writeTextFile { + name = "linkbins.js"; + text = '' + var fs = require('fs'); + var path = require('path'); + + var packageObj = JSON.parse(fs.readFileSync("package.json")); + + var nodeModules = Array(packageObj.name.split("/").length).fill("..").join(path.sep); + + if(packageObj.bin !== undefined) { + fs.mkdirSync(path.join(nodeModules, ".bin")) + + if(typeof packageObj.bin == "object") { + Object.keys(packageObj.bin).forEach(function(exe) { + if(fs.existsSync(packageObj.bin[exe])) { + console.log("linking bin '" + exe + "'"); + fs.symlinkSync( + path.join("..", packageObj.name, packageObj.bin[exe]), + path.join(nodeModules, ".bin", exe) + ); + } + else { + console.log("skipping non-existent bin '" + exe + "'"); + } + }) + } + else { + if(fs.existsSync(packageObj.bin)) { + console.log("linking bin '" + packageObj.bin + "'"); + fs.symlinkSync( + path.join("..", packageObj.name, packageObj.bin), + path.join(nodeModules, ".bin", packageObj.name.split("/").pop()) + ); + } + else { + console.log("skipping non-existent bin '" + packageObj.bin + "'"); + } + } + } + else if(packageObj.directories !== undefined && packageObj.directories.bin !== undefined) { + fs.mkdirSync(path.join(nodeModules, ".bin")) + + fs.readdirSync(packageObj.directories.bin).forEach(function(exe) { + if(fs.existsSync(path.join(packageObj.directories.bin, exe))) { + console.log("linking bin '" + exe + "'"); + fs.symlinkSync( + path.join("..", packageObj.name, packageObj.directories.bin, exe), + path.join(nodeModules, ".bin", exe) + ); + } + else { + console.log("skipping non-existent bin '" + exe + "'"); + } + }) + } + ''; + }; + prepareAndInvokeNPM = {packageName, bypassCache, reconstructLock, npmFlags, production}: let forceOfflineFlag = if bypassCache then "--offline" else "--registry http://www.example.com"; @@ -377,13 +460,18 @@ let npm ${forceOfflineFlag} --nodedir=${nodeSources} ${npmFlags} ${lib.optionalString production "--production"} rebuild + runHook postRebuild + if [ "''${dontNpmInstall-}" != "1" ] then # NPM tries to download packages even when they already exist if npm-shrinkwrap is used. rm -f npm-shrinkwrap.json - npm ${forceOfflineFlag} --nodedir=${nodeSources} ${npmFlags} ${lib.optionalString production "--production"} install + npm ${forceOfflineFlag} --nodedir=${nodeSources} --no-bin-links --ignore-scripts ${npmFlags} ${lib.optionalString production "--production"} install fi + + # Link executables defined in package.json + node ${linkBinsScript} ''; # Builds and composes an NPM package including all its dependencies diff --git a/pkgs/applications/networking/n8n/node-packages.nix b/pkgs/applications/networking/n8n/node-packages.nix index 7feebd16a8a..fb578d0d05e 100644 --- a/pkgs/applications/networking/n8n/node-packages.nix +++ b/pkgs/applications/networking/n8n/node-packages.nix @@ -58,13 +58,13 @@ let sha512 = "ZN9avruqbQ5TxopzG3ih3KRy52n8OAbitX3fnZT5go4hzu0J+KVPSzkL+Wt3hpJpdG8WIfg1sBD1tWkgUdEpBA=="; }; }; - "@azure/core-lro-2.3.1" = { + "@azure/core-lro-2.4.0" = { name = "_at_azure_slash_core-lro"; packageName = "@azure/core-lro"; - version = "2.3.1"; + version = "2.4.0"; src = fetchurl { - url = "https://registry.npmjs.org/@azure/core-lro/-/core-lro-2.3.1.tgz"; - sha512 = "nQ+Xnm9g1EWcmbqgxJGmkNHfOHRUmrbYIlRT4KjluzhHQooaGO55m/h6wCX0ho3Jte2ZNBzZPJRmi6yBWeb3yA=="; + url = "https://registry.npmjs.org/@azure/core-lro/-/core-lro-2.4.0.tgz"; + sha512 = "F65+rYkll1dpw3RGm8/SSiSj+/QkMeYDanzS/QKlM1dmuneVyXbO46C88V1MRHluLGdMP6qfD3vDRYALn0z0tQ=="; }; }; "@azure/core-paging-1.3.0" = { @@ -103,13 +103,13 @@ let sha512 = "I5CGMoLtX+pI17ZdiFJZgxMJApsK6jjfm85hpgp3oazCdq5Wxgh4wMr7ge/TTWW1B5WBuvIOI1fMU/FrOAMKrw=="; }; }; - "@azure/core-util-1.1.0" = { + "@azure/core-util-1.1.1" = { name = "_at_azure_slash_core-util"; packageName = "@azure/core-util"; - version = "1.1.0"; + version = "1.1.1"; src = fetchurl { - url = "https://registry.npmjs.org/@azure/core-util/-/core-util-1.1.0.tgz"; - sha512 = "+i93lNJNA3Pl3KSuC6xKP2jTL4YFeDfO6VNOaYdk0cppZcLCxt811gS878VsqsCisaltdhl9lhMzK5kbxCiF4w=="; + url = "https://registry.npmjs.org/@azure/core-util/-/core-util-1.1.1.tgz"; + sha512 = "A4TBYVQCtHOigFb2ETiiKFDocBoI1Zk2Ui1KpI42aJSIDexF7DHQFpnjonltXAIU/ceH+1fsZAWWgvX6/AKzog=="; }; }; "@azure/identity-2.1.0" = { @@ -121,13 +121,13 @@ let sha512 = "BPDz1sK7Ul9t0l9YKLEa8PHqWU4iCfhGJ+ELJl6c8CP3TpJt2urNCbm0ZHsthmxRsYoMPbz2Dvzj30zXZVmAFw=="; }; }; - "@azure/keyvault-keys-4.5.0" = { + "@azure/keyvault-keys-4.6.0" = { name = "_at_azure_slash_keyvault-keys"; packageName = "@azure/keyvault-keys"; - version = "4.5.0"; + version = "4.6.0"; src = fetchurl { - url = "https://registry.npmjs.org/@azure/keyvault-keys/-/keyvault-keys-4.5.0.tgz"; - sha512 = "F+0qpUrIxp1/uuQ3sFsAf4rTXErFwmuVLoXlD2e3ebrONrmYjqszwmlN4tBqAag1W9wGuZTL0jE8X8b+LB83ow=="; + url = "https://registry.npmjs.org/@azure/keyvault-keys/-/keyvault-keys-4.6.0.tgz"; + sha512 = "0112LegxeR03L8J4k+q6HwBVvrpd9y+oInG0FG3NaHXN7YUubVBon/eb5jFI6edGrvNigpxSR0XIsprFXdkzCQ=="; }; }; "@azure/logger-1.0.3" = { @@ -139,31 +139,58 @@ let sha512 = "aK4s3Xxjrx3daZr3VylxejK3vG5ExXck5WOHDJ8in/k9AqlfIyFMMT1uG7u8mNjX+QRILTIn0/Xgschfh/dQ9g=="; }; }; - "@azure/msal-browser-2.28.3" = { + "@azure/ms-rest-azure-env-2.0.0" = { + name = "_at_azure_slash_ms-rest-azure-env"; + packageName = "@azure/ms-rest-azure-env"; + version = "2.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/@azure/ms-rest-azure-env/-/ms-rest-azure-env-2.0.0.tgz"; + sha512 = "dG76W7ElfLi+fbTjnZVGj+M9e0BIEJmRxU6fHaUQ12bZBe8EJKYb2GV50YWNaP2uJiVQ5+7nXEVj1VN1UQtaEw=="; + }; + }; + "@azure/ms-rest-js-2.6.2" = { + name = "_at_azure_slash_ms-rest-js"; + packageName = "@azure/ms-rest-js"; + version = "2.6.2"; + src = fetchurl { + url = "https://registry.npmjs.org/@azure/ms-rest-js/-/ms-rest-js-2.6.2.tgz"; + sha512 = "0/8rOxAoR9M3qKUdbGOIYtHtQkm4m5jdoDNdxTU0DkOr84KwyAdJuW/RfjJinGyig4h73DNF0rdCl6XowgCYcg=="; + }; + }; + "@azure/ms-rest-nodeauth-3.1.1" = { + name = "_at_azure_slash_ms-rest-nodeauth"; + packageName = "@azure/ms-rest-nodeauth"; + version = "3.1.1"; + src = fetchurl { + url = "https://registry.npmjs.org/@azure/ms-rest-nodeauth/-/ms-rest-nodeauth-3.1.1.tgz"; + sha512 = "UA/8dgLy3+ZiwJjAZHxL4MUB14fFQPkaAOZ94jsTW/Z6WmoOeny2+cLk0+dyIX/iH6qSrEWKwbStEeB970B9pA=="; + }; + }; + "@azure/msal-browser-2.29.0" = { name = "_at_azure_slash_msal-browser"; packageName = "@azure/msal-browser"; - version = "2.28.3"; + version = "2.29.0"; src = fetchurl { - url = "https://registry.npmjs.org/@azure/msal-browser/-/msal-browser-2.28.3.tgz"; - sha512 = "2SdyH2el3s8BzPURf9RK17BvvXvaMEGpLc3D9WilZcmjJqP4nStVH7Ogwr/SNTuGV48FUhqEkP0RxDvzuFJSIw=="; + url = "https://registry.npmjs.org/@azure/msal-browser/-/msal-browser-2.29.0.tgz"; + sha512 = "ezrB0qL1WsJSNgvLmAN5vKr/4pH28UYLe8JUZeHzB6Z408JU8qYXXGnHAhDPzpDg0g91eG05IdIVrLwxk/i15g=="; }; }; - "@azure/msal-common-7.4.1" = { + "@azure/msal-common-7.5.0" = { name = "_at_azure_slash_msal-common"; packageName = "@azure/msal-common"; - version = "7.4.1"; + version = "7.5.0"; src = fetchurl { - url = "https://registry.npmjs.org/@azure/msal-common/-/msal-common-7.4.1.tgz"; - sha512 = "zxcxg9pRdgGTS5mrRJeQvwA8aIjD8qSGzaAiz5SeTVkyhtjB0AeFnAcvBOKHv/TkswWNfYKpERxsXOAKXkXk0w=="; + url = "https://registry.npmjs.org/@azure/msal-common/-/msal-common-7.5.0.tgz"; + sha512 = "W+SIsGSjkUAyDggA/6QVMKErttQ/8Bq9l/7ADr7GJwt9JFsc+XNBdQDsOsUvZ7YCVkZcSgzJw2MZJLIBqfQtQA=="; }; }; - "@azure/msal-node-1.14.0" = { + "@azure/msal-node-1.14.1" = { name = "_at_azure_slash_msal-node"; packageName = "@azure/msal-node"; - version = "1.14.0"; + version = "1.14.1"; src = fetchurl { - url = "https://registry.npmjs.org/@azure/msal-node/-/msal-node-1.14.0.tgz"; - sha512 = "3XB7FuHLhmGBjw7bxuz1LCHOXQgmNIO3J56tlbOjuJcyJtd4aBCgnYIXNKLed3uRcQNHEO0mlg24I4iGxAV/UA=="; + url = "https://registry.npmjs.org/@azure/msal-node/-/msal-node-1.14.1.tgz"; + sha512 = "RftjLd35xlafh5cPT17zrzpYdcsbHKJal7R/FTbThpbetSk8y8vQHUzNwWNhBM6GFFiyMS4IQ+zs+z8bgJ4sKQ=="; }; }; "@azure/storage-blob-12.11.0" = { @@ -175,22 +202,13 @@ let sha512 = "na+FisoARuaOWaHWpmdtk3FeuTWf2VWamdJ9/TJJzj5ZdXPLC3juoDgFs6XVuJIoK30yuBpyFBEDXVRK4pB7Tg=="; }; }; - "@babel/parser-7.19.1" = { - name = "_at_babel_slash_parser"; - packageName = "@babel/parser"; - version = "7.19.1"; - src = fetchurl { - url = "https://registry.npmjs.org/@babel/parser/-/parser-7.19.1.tgz"; - sha512 = "h7RCSorm1DdTVGJf3P2Mhj3kdnkmF/EiysUkzS2TdgAYqyjFdMQJbVuXOBej2SBJaXan/lIVtT6KkGbyyq753A=="; - }; - }; - "@babel/runtime-7.19.0" = { + "@babel/runtime-7.19.4" = { name = "_at_babel_slash_runtime"; packageName = "@babel/runtime"; - version = "7.19.0"; + version = "7.19.4"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/runtime/-/runtime-7.19.0.tgz"; - sha512 = "eR8Lo9hnDS7tqkO7NsV+mKvCmv5boaXFSZ70DnfhcgiEne8hv9oCEd36Klw74EtizEqLsy4YnW8UWwpBVolHZA=="; + url = "https://registry.npmjs.org/@babel/runtime/-/runtime-7.19.4.tgz"; + sha512 = "EXpLCrk55f+cYqmHsSR+yD/0gAIMxxA9QK9lnQWzhMCvt+YmoBN7Zx94s++Kv0+unHk39vxNO8t+CMA2WSS3wA=="; }; }; "@colors/colors-1.5.0" = { @@ -202,6 +220,24 @@ let sha512 = "ooWCrlZP11i8GImSjTHYHLkvFDP48nS4+204nGb1RiX/WXYHmJA2III9/e2DWVabCESdW7hBAEzHRqUn9OUVvQ=="; }; }; + "@curlconverter/yargs-0.0.2" = { + name = "_at_curlconverter_slash_yargs"; + packageName = "@curlconverter/yargs"; + version = "0.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/@curlconverter/yargs/-/yargs-0.0.2.tgz"; + sha512 = "Q1YEebpCY61kxme4wvU0/IN/uMBfG5pZOKCo9FU+w20ElPvN+eH2qEVbK1C12t3Tee3qeYLLEU6HkiUeO1gc4A=="; + }; + }; + "@curlconverter/yargs-parser-0.0.1" = { + name = "_at_curlconverter_slash_yargs-parser"; + packageName = "@curlconverter/yargs-parser"; + version = "0.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/@curlconverter/yargs-parser/-/yargs-parser-0.0.1.tgz"; + sha512 = "DbEVRYqrorzwqc63MQ3RODflut1tNla8ZCKo1h83lF7+fbntgubZsDfRDBv5Lxj3vkKuvAolysNM2ekwJev8wA=="; + }; + }; "@dabh/diagnostics-2.0.3" = { name = "_at_dabh_slash_diagnostics"; packageName = "@dabh/diagnostics"; @@ -211,13 +247,31 @@ let sha512 = "hrlQOIi7hAfzsMqlGSFyVucrx38O+j6wiGOf//H2ecvIEqYN4ADBSS2iLMh5UFyDunCNniUIPk/q3riFv45xRA=="; }; }; - "@fontsource/open-sans-4.5.11" = { + "@fontsource/open-sans-4.5.12" = { name = "_at_fontsource_slash_open-sans"; packageName = "@fontsource/open-sans"; - version = "4.5.11"; + version = "4.5.12"; + src = fetchurl { + url = "https://registry.npmjs.org/@fontsource/open-sans/-/open-sans-4.5.12.tgz"; + sha512 = "WKCexsVbOECJUSOgG7GnrUxe+3ds4Sa1yhsTjSnszI+0TaJvMZnDnn5YDKwA/KwLbkZqCaV3nvMTH97jJuxWNA=="; + }; + }; + "@fortawesome/fontawesome-common-types-0.2.36" = { + name = "_at_fortawesome_slash_fontawesome-common-types"; + packageName = "@fortawesome/fontawesome-common-types"; + version = "0.2.36"; + src = fetchurl { + url = "https://registry.npmjs.org/@fortawesome/fontawesome-common-types/-/fontawesome-common-types-0.2.36.tgz"; + sha512 = "a/7BiSgobHAgBWeN7N0w+lAhInrGxksn13uK7231n2m8EDPE3BMCl9NZLTGrj9ZXfCmC6LM0QLqXidIizVQ6yg=="; + }; + }; + "@fortawesome/fontawesome-common-types-0.3.0" = { + name = "_at_fortawesome_slash_fontawesome-common-types"; + packageName = "@fortawesome/fontawesome-common-types"; + version = "0.3.0"; src = fetchurl { - url = "https://registry.npmjs.org/@fontsource/open-sans/-/open-sans-4.5.11.tgz"; - sha512 = "nG0gmbx4pSr8wltdG/ZdlS6OrsMK40Wt6iyuLTKHEf0TQfzKRMlWaskZHdeuWCwS6WUgqHKMf9KSwGdxPfapOg=="; + url = "https://registry.npmjs.org/@fortawesome/fontawesome-common-types/-/fontawesome-common-types-0.3.0.tgz"; + sha512 = "CA3MAZBTxVsF6SkfkHXDerkhcQs0QPofy43eFdbWJJkZiq3SfiaH1msOkac59rQaqto5EqWnASboY1dBuKen5w=="; }; }; "@fortawesome/fontawesome-common-types-6.2.0" = { @@ -229,6 +283,15 @@ let sha512 = "rBevIsj2nclStJ7AxTdfsa3ovHb1H+qApwrxcTVo+NNdeJiB9V75hsKfrkG5AwNcRUNxrPPiScGYCNmLMoh8pg=="; }; }; + "@fortawesome/fontawesome-svg-core-1.3.0" = { + name = "_at_fortawesome_slash_fontawesome-svg-core"; + packageName = "@fortawesome/fontawesome-svg-core"; + version = "1.3.0"; + src = fetchurl { + url = "https://registry.npmjs.org/@fortawesome/fontawesome-svg-core/-/fontawesome-svg-core-1.3.0.tgz"; + sha512 = "UIL6crBWhjTNQcONt96ExjUnKt1D68foe3xjEensLDclqQ6YagwCRYVQdrp/hW0ALRp/5Fv/VKw+MqTUWYYvPg=="; + }; + }; "@fortawesome/free-regular-svg-icons-6.2.0" = { name = "_at_fortawesome_slash_free-regular-svg-icons"; packageName = "@fortawesome/free-regular-svg-icons"; @@ -238,6 +301,33 @@ let sha512 = "M1dG+PAmkYMTL9BSUHFXY5oaHwBYfHCPhbJ8qj8JELsc9XCrUJ6eEHWip4q0tE+h9C0DVyFkwIM9t7QYyCpprQ=="; }; }; + "@fortawesome/free-solid-svg-icons-5.15.4" = { + name = "_at_fortawesome_slash_free-solid-svg-icons"; + packageName = "@fortawesome/free-solid-svg-icons"; + version = "5.15.4"; + src = fetchurl { + url = "https://registry.npmjs.org/@fortawesome/free-solid-svg-icons/-/free-solid-svg-icons-5.15.4.tgz"; + sha512 = "JLmQfz6tdtwxoihXLg6lT78BorrFyCf59SAwBM6qV/0zXyVeDygJVb3fk+j5Qat+Yvcxp1buLTY5iDh1ZSAQ8w=="; + }; + }; + "@fortawesome/vue-fontawesome-2.0.8" = { + name = "_at_fortawesome_slash_vue-fontawesome"; + packageName = "@fortawesome/vue-fontawesome"; + version = "2.0.8"; + src = fetchurl { + url = "https://registry.npmjs.org/@fortawesome/vue-fontawesome/-/vue-fontawesome-2.0.8.tgz"; + sha512 = "SRmP0q9Ox4zq8ydDR/hrH+23TVU1bdwYVnugLVaAIwklOHbf56gx6JUGlwES7zjuNYqzKgl8e39iYf6ph8qSQw=="; + }; + }; + "@gar/promisify-1.1.3" = { + name = "_at_gar_slash_promisify"; + packageName = "@gar/promisify"; + version = "1.1.3"; + src = fetchurl { + url = "https://registry.npmjs.org/@gar/promisify/-/promisify-1.1.3.tgz"; + sha512 = "k2Ty1JcVojjJFwrg/ThKi2ujJ7XNLYaFGNB/bWT9wGR+oSMJHMa5w+CUq6p/pVrKeNNgA7pCqEcjSnHVoqJQFw=="; + }; + }; "@icetee/ftp-0.3.15" = { name = "_at_icetee_slash_ftp"; packageName = "@icetee/ftp"; @@ -247,13 +337,13 @@ let sha512 = "RxSa9VjcDWgWCYsaLdZItdCnJj7p4LxggaEk+Y3MP0dHKoxez8ioG07DVekVbZZqccsrL+oPB/N9AzVPxj4blg=="; }; }; - "@js-joda/core-5.3.1" = { + "@js-joda/core-5.4.1" = { name = "_at_js-joda_slash_core"; packageName = "@js-joda/core"; - version = "5.3.1"; + version = "5.4.1"; src = fetchurl { - url = "https://registry.npmjs.org/@js-joda/core/-/core-5.3.1.tgz"; - sha512 = "iHHyIRLEfXLqBN+BkyH8u8imMYr4ihRbFDEk8toqTwUECETVQFCTh2U59Sw2oMoRVaS3XRIb7pyCulltq2jFVA=="; + url = "https://registry.npmjs.org/@js-joda/core/-/core-5.4.1.tgz"; + sha512 = "+uMco2Xm9VYJ81XYWwrvgsM9xEvqs9JvLNrN4/fOg7YJKk4yeqAg+O/cpoFPTGxvfL2Zy0mUcnKlIz9UV0Cadw=="; }; }; "@jsdevtools/ono-7.1.3" = { @@ -337,58 +427,67 @@ let sha512 = "oGB+UxlgWcgQkgwo8GcEGwemoTFt3FIO9ababBmaGwXIoBKZ+GTy0pP185beGg7Llih/NSHSV2XAs1lnznocSg=="; }; }; - "@oclif/command-1.8.16" = { - name = "_at_oclif_slash_command"; - packageName = "@oclif/command"; - version = "1.8.16"; + "@npmcli/fs-1.1.1" = { + name = "_at_npmcli_slash_fs"; + packageName = "@npmcli/fs"; + version = "1.1.1"; src = fetchurl { - url = "https://registry.npmjs.org/@oclif/command/-/command-1.8.16.tgz"; - sha512 = "rmVKYEsKzurfRU0xJz+iHelbi1LGlihIWZ7Qvmb/CBz1EkhL7nOkW4SVXmG2dA5Ce0si2gr88i6q4eBOMRNJ1w=="; + url = "https://registry.npmjs.org/@npmcli/fs/-/fs-1.1.1.tgz"; + sha512 = "8KG5RD0GVP4ydEzRn/I4BNDuxDtqVbOdm8675T49OIG/NGhaK0pjPX7ZcDlvKYbA+ulvVK3ztfcF4uBdOxuJbQ=="; }; }; - "@oclif/config-1.18.2" = { - name = "_at_oclif_slash_config"; - packageName = "@oclif/config"; - version = "1.18.2"; + "@npmcli/move-file-1.1.2" = { + name = "_at_npmcli_slash_move-file"; + packageName = "@npmcli/move-file"; + version = "1.1.2"; + src = fetchurl { + url = "https://registry.npmjs.org/@npmcli/move-file/-/move-file-1.1.2.tgz"; + sha512 = "1SUf/Cg2GzGDyaf15aR9St9TWlb+XvbZXWpDx8YKs7MLzMH/BCeopv+y9vzrzgkfykCGuWOlSu3mZhj2+FQcrg=="; + }; + }; + "@oclif/command-1.8.18" = { + name = "_at_oclif_slash_command"; + packageName = "@oclif/command"; + version = "1.8.18"; src = fetchurl { - url = "https://registry.npmjs.org/@oclif/config/-/config-1.18.2.tgz"; - sha512 = "cE3qfHWv8hGRCP31j7fIS7BfCflm/BNZ2HNqHexH+fDrdF2f1D5S8VmXWLC77ffv3oDvWyvE9AZeR0RfmHCCaA=="; + url = "https://registry.npmjs.org/@oclif/command/-/command-1.8.18.tgz"; + sha512 = "qTad+jtiriMMbkw6ArtcUY89cwLwmwDnD4KSGT+OQiZKYtegp3NUCM9JN8lfj/aKC+0kvSitJM4ULzbgiVTKQQ=="; }; }; - "@oclif/config-1.18.3" = { + "@oclif/config-1.18.5" = { name = "_at_oclif_slash_config"; packageName = "@oclif/config"; - version = "1.18.3"; + version = "1.18.5"; src = fetchurl { - url = "https://registry.npmjs.org/@oclif/config/-/config-1.18.3.tgz"; - sha512 = "sBpko86IrTscc39EvHUhL+c++81BVTsIZ3ETu/vG+cCdi0N6vb2DoahR67A9FI2CGnxRRHjnTfa3m6LulwNATA=="; + url = "https://registry.npmjs.org/@oclif/config/-/config-1.18.5.tgz"; + sha512 = "R6dBedaUVn5jtAh79aaRm7jezx4l3V7Im9NORlLmudz5BL1foMeuXEvnqm+bMiejyexVA+oi9mto6YKZPzo/5Q=="; }; }; - "@oclif/core-1.16.3" = { + "@oclif/core-1.16.5" = { name = "_at_oclif_slash_core"; packageName = "@oclif/core"; - version = "1.16.3"; + version = "1.16.5"; src = fetchurl { - url = "https://registry.npmjs.org/@oclif/core/-/core-1.16.3.tgz"; - sha512 = "SWrU/eGgN5kLyuZ+TqtKz2z2HTSrgaNEwkawNj4B31VXDrPv7aULS3ntVCboAKRldX/6J+Af+70BV07Rr5c5oA=="; + url = "https://registry.npmjs.org/@oclif/core/-/core-1.16.5.tgz"; + sha512 = "Jb58K79AALkLmY0PNU1Jx4Z+/JIWtpgtRbei92PIIBx+TaAmYgVySNI1beInZFNOpGo2fhxVBp+yr3DZ38z3kQ=="; }; }; - "@oclif/errors-1.3.5" = { + "@oclif/errors-1.3.6" = { name = "_at_oclif_slash_errors"; packageName = "@oclif/errors"; - version = "1.3.5"; + version = "1.3.6"; src = fetchurl { - url = "https://registry.npmjs.org/@oclif/errors/-/errors-1.3.5.tgz"; - sha512 = "OivucXPH/eLLlOT7FkCMoZXiaVYf8I/w1eTAM1+gKzfhALwWTusxEx7wBmW0uzvkSg/9ovWLycPaBgJbM3LOCQ=="; + url = "https://registry.npmjs.org/@oclif/errors/-/errors-1.3.6.tgz"; + sha512 = "fYaU4aDceETd89KXP+3cLyg9EHZsLD3RxF2IU9yxahhBpspWjkWi3Dy3bTgcwZ3V47BgxQaGapzJWDM33XIVDQ=="; }; }; - "@oclif/help-1.0.1" = { + "@oclif/help-1.0.3" = { name = "_at_oclif_slash_help"; packageName = "@oclif/help"; - version = "1.0.1"; + version = "1.0.3"; src = fetchurl { - url = "https://registry.npmjs.org/@oclif/help/-/help-1.0.1.tgz"; - sha512 = "8rsl4RHL5+vBUAKBL6PFI3mj58hjPCp2VYyXD4TAa7IMStikFfOH2gtWmqLzIlxAED2EpD0dfYwo9JJxYsH7Aw=="; + url = "https://registry.npmjs.org/@oclif/help/-/help-1.0.3.tgz"; + sha512 = "AjjhSWFQkRb9rChEH+IRUmp0CxEacYpUbh+kQqtdCR9CDSsj2a3ibWjtMtJb4lFGAle6kVKfaal/juYe+6P5TQ=="; }; }; "@oclif/linewrap-1.0.0" = { @@ -400,13 +499,13 @@ let sha512 = "Ups2dShK52xXa8w6iBWLgcjPJWjais6KPJQq3gQ/88AY6BXoTX+MIGFPrWQO1KLMiQfoTpcLnUwloN4brrVUHw=="; }; }; - "@oclif/parser-3.8.7" = { + "@oclif/parser-3.8.8" = { name = "_at_oclif_slash_parser"; packageName = "@oclif/parser"; - version = "3.8.7"; + version = "3.8.8"; src = fetchurl { - url = "https://registry.npmjs.org/@oclif/parser/-/parser-3.8.7.tgz"; - sha512 = "b11xBmIUK+LuuwVGJpFs4LwQN2xj2cBWj2c4z1FtiXGrJ85h9xV6q+k136Hw0tGg1jQoRXuvuBnqQ7es7vO9/Q=="; + url = "https://registry.npmjs.org/@oclif/parser/-/parser-3.8.8.tgz"; + sha512 = "OgqQAtpyq1XFJG3dvLl9aqiO+F5pubkzt7AivUDkNoa6/hNgVZ79vvTO8sqo5XAAhOm/fcTSerZ35OTnTJb1ng=="; }; }; "@oclif/screen-3.0.2" = { @@ -436,6 +535,15 @@ let sha512 = "kJYCXv6fRFbQrAp3hMsgRCnAa7RUBdbiGLBT9PcpQURi0VwHmD7mk3Ja7U4HDnL0EHXYJpPyx3oSonkklmPJ9Q=="; }; }; + "@sap/hana-client-2.14.18" = { + name = "_at_sap_slash_hana-client"; + packageName = "@sap/hana-client"; + version = "2.14.18"; + src = fetchurl { + url = "https://registry.npmjs.org/@sap/hana-client/-/hana-client-2.14.18.tgz"; + sha512 = "9TfoDuxWZyUYIwISVVMPguX9iirZrD0cI6rI0xXg6URRaqk71GZ5U0ueomeZapSY1nni2Yf+th1ZjU+jSUw/9g=="; + }; + }; "@segment/loosely-validate-event-2.0.0" = { name = "_at_segment_slash_loosely-validate-event"; packageName = "@segment/loosely-validate-event"; @@ -580,6 +688,15 @@ let sha512 = "TyPLQaF6w8UlWdv4gj8i46B+INBVzURBNRahCozCSXfsK2VTlL1wNyTlMKw817VHygBtlcl5jfnPadlydr06Yw=="; }; }; + "@types/js-nacl-1.3.0" = { + name = "_at_types_slash_js-nacl"; + packageName = "@types/js-nacl"; + version = "1.3.0"; + src = fetchurl { + url = "https://registry.npmjs.org/@types/js-nacl/-/js-nacl-1.3.0.tgz"; + sha512 = "juUvxo444ZfwDSwWyhssMxSN+snqTdiUoOVXZF+/ffVrGHq3rAf1fmczWn3z9TCEAuRbaTmgAcYlZ9MutyyOkQ=="; + }; + }; "@types/json-schema-7.0.11" = { name = "_at_types_slash_json-schema"; packageName = "@types/json-schema"; @@ -589,13 +706,13 @@ let sha512 = "wOuvG1SN4Us4rez+tylwwwCV1psiNVOkJeM3AUWUNWg/jDQY2+HE/444y5gc+jBmRqASOm2Oeh5c1axHobwRKQ=="; }; }; - "@types/lodash-4.14.185" = { + "@types/lodash-4.14.186" = { name = "_at_types_slash_lodash"; packageName = "@types/lodash"; - version = "4.14.185"; + version = "4.14.186"; src = fetchurl { - url = "https://registry.npmjs.org/@types/lodash/-/lodash-4.14.185.tgz"; - sha512 = "evMDG1bC4rgQg4ku9tKpuMh5iBNEwNa3tf9zRHdP1qlv+1WUg44xat4IxCE14gIpZRGUUWAx2VhItCZc25NfMA=="; + url = "https://registry.npmjs.org/@types/lodash/-/lodash-4.14.186.tgz"; + sha512 = "eHcVlLXP0c2FlMPm56ITode2AgLMSa6aJ05JTTbYbI+7EMkCEE5qk2E41d5g2lCVTqRe0GnnRFurmlCsDODrPw=="; }; }; "@types/mime-3.0.1" = { @@ -616,13 +733,22 @@ let sha512 = "/SNsDidUFCvqqcWDwxv2feww/yqhNeTRL5CVoL3jU4Goc4kKEL10T7Eye65ZqPNi4HRx8sAEX59pV1aEH7drNA=="; }; }; - "@types/node-18.7.18" = { + "@types/node-12.20.55" = { + name = "_at_types_slash_node"; + packageName = "@types/node"; + version = "12.20.55"; + src = fetchurl { + url = "https://registry.npmjs.org/@types/node/-/node-12.20.55.tgz"; + sha512 = "J8xLz7q2OFulZ2cyGTLE1TbbZcjpno7FaN6zdJNrgAdrJ+DZzh/uFR6YrTb4C+nXakvud8Q4+rbhoIWlYQbUFQ=="; + }; + }; + "@types/node-18.8.3" = { name = "_at_types_slash_node"; packageName = "@types/node"; - version = "18.7.18"; + version = "18.8.3"; src = fetchurl { - url = "https://registry.npmjs.org/@types/node/-/node-18.7.18.tgz"; - sha512 = "m+6nTEOadJZuTPkKR/SYK3A2d7FZrgElol9UP1Kae90VVU4a6mxnPuLiIW1m4Cq4gZ/nWb9GrdVXJCoCazDAbg=="; + url = "https://registry.npmjs.org/@types/node/-/node-18.8.3.tgz"; + sha512 = "0os9vz6BpGwxGe9LOhgP/ncvYN5Tx1fNcd2TM3rD/aCGBkysb+ZWpXEocG24h6ZzOi13+VB8HndAQFezsSOw1w=="; }; }; "@types/node-fetch-2.6.2" = { @@ -652,6 +778,15 @@ let sha512 = "EEhsLsD6UsDM1yFhAvy0Cjr6VwmpMWqFBCb9w07wVugF7w9nfajxLuVmngTIpgS6svCnm6Vaw+MZhoDCKnOfsw=="; }; }; + "@types/readable-stream-2.3.14" = { + name = "_at_types_slash_readable-stream"; + packageName = "@types/readable-stream"; + version = "2.3.14"; + src = fetchurl { + url = "https://registry.npmjs.org/@types/readable-stream/-/readable-stream-2.3.14.tgz"; + sha512 = "8jQ5Mp7bsDJEnW/69i6nAaQMoLwAVJVc7ZRAVTrdh/o6XueQsX38TEvKuYyoQj76/mg7WdlRfMrtl9pDLCJWsg=="; + }; + }; "@types/serve-static-1.15.0" = { name = "_at_types_slash_serve-static"; packageName = "@types/serve-static"; @@ -697,13 +832,22 @@ let sha512 = "FtQu10RWgn3D9U4aazdwIE2yzphmTJREDqNdODHrbrZmmMqI0vMheC/6NE/J1Yveaj8H+ela+YwWTjq5PGmuhA=="; }; }; - "@vue/compiler-sfc-2.7.10" = { - name = "_at_vue_slash_compiler-sfc"; - packageName = "@vue/compiler-sfc"; - version = "2.7.10"; + "@xmldom/xmldom-0.7.5" = { + name = "_at_xmldom_slash_xmldom"; + packageName = "@xmldom/xmldom"; + version = "0.7.5"; + src = fetchurl { + url = "https://registry.npmjs.org/@xmldom/xmldom/-/xmldom-0.7.5.tgz"; + sha512 = "V3BIhmY36fXZ1OtVcI9W+FxQqxVLsPKcNjWigIaa81dLC9IolJl5Mt4Cvhmr0flUnjSpTdrbMTSbXqYqV5dT6A=="; + }; + }; + "a-sync-waterfall-1.0.1" = { + name = "a-sync-waterfall"; + packageName = "a-sync-waterfall"; + version = "1.0.1"; src = fetchurl { - url = "https://registry.npmjs.org/@vue/compiler-sfc/-/compiler-sfc-2.7.10.tgz"; - sha512 = "55Shns6WPxlYsz4WX7q9ZJBL77sKE1ZAYNYStLs6GbhIOMrNtjMvzcob6gu3cGlfpCR4bT7NXgyJ3tly2+Hx8Q=="; + url = "https://registry.npmjs.org/a-sync-waterfall/-/a-sync-waterfall-1.0.1.tgz"; + sha512 = "RYTOHHdWipFUliRFMCS4X2Yn2X8M87V/OpSqWzKKOGhzqyUxzyVmhHDH9sAvG+ZuQf/TAOFsLCpMw09I1ufUnA=="; }; }; "abbrev-1.1.1" = { @@ -715,6 +859,15 @@ let sha512 = "nne9/IiQ/hzIhY6pdDnbBtz7DjPTKrY00P/zvPSm5pOFkl6xuGrGnXn/VtTNNfNtAfZ9/1RtehkszU9qcTii0Q=="; }; }; + "abort-controller-3.0.0" = { + name = "abort-controller"; + packageName = "abort-controller"; + version = "3.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/abort-controller/-/abort-controller-3.0.0.tgz"; + sha512 = "h8lQ8tacZYnR3vNQTgibj+tODHI5/+l06Au2Pcriv/Gmet0eaj4TwWH41sO9wnHDiQsEj19q0drzdWdeAHtweg=="; + }; + }; "accepts-1.3.8" = { name = "accepts"; packageName = "accepts"; @@ -751,6 +904,15 @@ let sha512 = "k+iyHEuPgSw6SbuDpGQM+06HQUa04DZ3o+F6CSzXMvvI5KMvnaEqXe+YVe555R9nn6GPt404fos4wcgpw12SDA=="; }; }; + "adal-node-0.2.3" = { + name = "adal-node"; + packageName = "adal-node"; + version = "0.2.3"; + src = fetchurl { + url = "https://registry.npmjs.org/adal-node/-/adal-node-0.2.3.tgz"; + sha512 = "gMKr8RuYEYvsj7jyfCv/4BfKToQThz20SP71N3AtFn3ia3yAR8Qt2T3aVQhuJzunWs2b38ZsQV0qsZPdwZr7VQ=="; + }; + }; "address-1.2.1" = { name = "address"; packageName = "address"; @@ -787,6 +949,24 @@ let sha512 = "RZNwNclF7+MS/8bDg70amg32dyeZGZxiDuQmZxKLAlQjr3jGyLx+4Kkk58UO7D2QdgFIQCovuSuZESne6RG6XQ=="; }; }; + "agentkeepalive-4.2.1" = { + name = "agentkeepalive"; + packageName = "agentkeepalive"; + version = "4.2.1"; + src = fetchurl { + url = "https://registry.npmjs.org/agentkeepalive/-/agentkeepalive-4.2.1.tgz"; + sha512 = "Zn4cw2NEqd+9fiSVWMscnjyQ1a8Yfoc5oBajLeo5w+YBHgDUcEBY2hS4YpTz6iN5f/2zQiktcuM6tS8x1p9dpA=="; + }; + }; + "aggregate-error-3.1.0" = { + name = "aggregate-error"; + packageName = "aggregate-error"; + version = "3.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/aggregate-error/-/aggregate-error-3.1.0.tgz"; + sha512 = "4I7Td01quW/RpocfNayFdFVk1qSuoh0E7JrbRJ16nH01HhKFQ88INq9Sd+nd72zqRySlr9BmDA8xlEJ6vJMrYA=="; + }; + }; "ajv-6.12.6" = { name = "ajv"; packageName = "ajv"; @@ -904,6 +1084,15 @@ let sha512 = "Ci/qENmwHnsYo9xKIcUJN5LeDKdJ6R1Z1j9V/J5wyq8nh/mYPEpIKJbBZXtZjG04HiK7zV/p6Vs9952MrMeUIw=="; }; }; + "are-we-there-yet-3.0.1" = { + name = "are-we-there-yet"; + packageName = "are-we-there-yet"; + version = "3.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/are-we-there-yet/-/are-we-there-yet-3.0.1.tgz"; + sha512 = "QZW4EDmGwlYur0Yyf/b2uGucHQMa8aFUP7eu9ddR73vvhFyt4V0Vl3QHPcTNJ8l6qYOBdxgXdnBXQrHilfRQBg=="; + }; + }; "argparse-1.0.10" = { name = "argparse"; packageName = "argparse"; @@ -967,6 +1156,15 @@ let sha512 = "WnM+AjG/DvLRLo4DDl+r+SvCzYtD2Jd9oeBYMcEaI7t3fFrHY9M53/wdLcTvmZNQ70IU6Htj0emFkZ5TS+lrdw=="; }; }; + "asap-2.0.6" = { + name = "asap"; + packageName = "asap"; + version = "2.0.6"; + src = fetchurl { + url = "https://registry.npmjs.org/asap/-/asap-2.0.6.tgz"; + sha512 = "BSHWgDSAiKs50o2Re8ppvp3seVHXSRM44cdSsT9FfNEUUZLOGWVCsiWaRPWM1Znn+mqZ1OfVZ3z3DWEzSp7hRA=="; + }; + }; "asn1-0.2.6" = { name = "asn1"; packageName = "asn1"; @@ -1030,6 +1228,15 @@ let sha512 = "x1FCFnFifvYDDzTaLII71vG5uvDwgtmDTEVWAxrgeiR8VjMONcCXJx7E+USjDtHlwFmt9MysbqgF9b9Vjr6w+w=="; }; }; + "async-2.6.4" = { + name = "async"; + packageName = "async"; + version = "2.6.4"; + src = fetchurl { + url = "https://registry.npmjs.org/async/-/async-2.6.4.tgz"; + sha512 = "mzo5dfJYwAn29PeiJ0zvwTo04zj8HDJj0Mn8TD7sno7q12prdbnasKJHhkm2c1LgrhlJ0teaea8860oxi51mGA=="; + }; + }; "async-3.2.4" = { name = "async"; packageName = "async"; @@ -1084,22 +1291,22 @@ let sha512 = "DMD0KiN46eipeziST1LPP/STfDU0sufISXmjSgvVsoU2tqxctQeASejWcfNtxYKqETM1UxQ8sp2OrSBWpHY6sw=="; }; }; - "avsc-5.7.5" = { + "avsc-5.7.6" = { name = "avsc"; packageName = "avsc"; - version = "5.7.5"; + version = "5.7.6"; src = fetchurl { - url = "https://registry.npmjs.org/avsc/-/avsc-5.7.5.tgz"; - sha512 = "vkyt1+sj6qaD9oMtqqLE2pZ2IcHI66kFx8lpnVuXp55SnNPjKghfOhVfZpaDwDPpY0oVWP3Qu1uHZWxF3E856A=="; + url = "https://registry.npmjs.org/avsc/-/avsc-5.7.6.tgz"; + sha512 = "jyn9tfd9J3h7pgJSk4qQ/1c1Tk5qiXrvmdCDON2UjcFplqRu/KpmKmpi+Ess8ZKmmqK12U4Y3VHrfwQs1xSMZA=="; }; }; - "aws-sdk-2.1218.0" = { + "aws-sdk-2.1231.0" = { name = "aws-sdk"; packageName = "aws-sdk"; - version = "2.1218.0"; + version = "2.1231.0"; src = fetchurl { - url = "https://registry.npmjs.org/aws-sdk/-/aws-sdk-2.1218.0.tgz"; - sha512 = "oreF2jKfUZ8VKnIKh8TrOOOsdSfv87jHGtWQNAHdvfeyrYK5FrnvGkHUZ3bu6g6u1gHwu5FhTPiRMbgS8Re+NA=="; + url = "https://registry.npmjs.org/aws-sdk/-/aws-sdk-2.1231.0.tgz"; + sha512 = "ONBuRsOxsu0zL8u/Vmz49tPWi9D4ls2pjb6szdfSx9VQef7bOnWe9gJpWoA94OTzcjOWsvjsG7UgjvQJkIuPBg=="; }; }; "aws-sign2-0.7.0" = { @@ -1219,6 +1426,15 @@ let sha512 = "V/Hy/X9Vt7f3BbPJEi8BdVFMByHi+jNXrYkW3huaybV/kQ0KJg0Y6PkEMbn+zeT+i+SiKZ/HMqJGIIt4LZDqNQ=="; }; }; + "better-sqlite3-7.6.2" = { + name = "better-sqlite3"; + packageName = "better-sqlite3"; + version = "7.6.2"; + src = fetchurl { + url = "https://registry.npmjs.org/better-sqlite3/-/better-sqlite3-7.6.2.tgz"; + sha512 = "S5zIU1Hink2AH4xPsN0W43T1/AJ5jrPh7Oy07ocuW/AKYYY02GWzz9NH0nbSMn/gw6fDZ5jZ1QsHt1BXAwJ6Lg=="; + }; + }; "big-integer-1.6.51" = { name = "big-integer"; packageName = "big-integer"; @@ -1255,6 +1471,15 @@ let sha512 = "rA2CrUl1+6yKrn+XgLs8Hdy18OER1UW146nM+ixzhQXDY+Bd3ySkyIJGwF2a4I45JwbvF1mDL/nWkqBwpOcdBA=="; }; }; + "bindings-1.5.0" = { + name = "bindings"; + packageName = "bindings"; + version = "1.5.0"; + src = fetchurl { + url = "https://registry.npmjs.org/bindings/-/bindings-1.5.0.tgz"; + sha512 = "p2q/t/mhvuOj/UeLlV6566GD/guowlr0hHxClI0W9m7MWYkL1F0hLo+0Aexs9HSPCtR1SXQ0TD3MMKrXZajbiQ=="; + }; + }; "bintrees-1.0.2" = { name = "bintrees"; packageName = "bintrees"; @@ -1273,6 +1498,24 @@ let sha512 = "ikAdCnrloKmFOugAfxWws89/fPc+nw0OOG1IzIE72uSOg/A3cYptKCjSUhDTuj7fhsJtzkzlv7l3b8PzRHLN0Q=="; }; }; + "bl-2.2.1" = { + name = "bl"; + packageName = "bl"; + version = "2.2.1"; + src = fetchurl { + url = "https://registry.npmjs.org/bl/-/bl-2.2.1.tgz"; + sha512 = "6Pesp1w0DEX1N550i/uGV/TqucVL4AM/pgThFSN/Qq9si1/DF9aIHs1BxD8V/QU0HoeHO6cQRTAuYnLPKq1e4g=="; + }; + }; + "bl-3.0.1" = { + name = "bl"; + packageName = "bl"; + version = "3.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/bl/-/bl-3.0.1.tgz"; + sha512 = "jrCW5ZhfQ/Vt07WX1Ngs+yn9BDqPL/gw28S7s9H6QK/gupnizNzJAss5akW20ISgOrbLTlXOOCTJeNUQqruAWQ=="; + }; + }; "bl-4.1.0" = { name = "bl"; packageName = "bl"; @@ -1318,13 +1561,13 @@ let sha512 = "c98Bf3tPniI+scsdk237ku1Dc3ujXQTSgyiPUDEOe7tRkhrqridvh8klBv0HCEso1OLOYcHuCv/cS6DNxKH+ZA=="; }; }; - "body-parser-1.20.0" = { + "body-parser-1.20.1" = { name = "body-parser"; packageName = "body-parser"; - version = "1.20.0"; + version = "1.20.1"; src = fetchurl { - url = "https://registry.npmjs.org/body-parser/-/body-parser-1.20.0.tgz"; - sha512 = "DfJ+q6EPcGKZD1QWUjSpqp+Q7bDQTsQIF4zfUAtZ6qk+H/3/QRhg9CEp39ss+/T2vw0+HaidC0ecJj/DRLIaKg=="; + url = "https://registry.npmjs.org/body-parser/-/body-parser-1.20.1.tgz"; + sha512 = "jWi7abTbYwajOytWCQc37VulmWiRae5RyTpaCyDcS5/lMdtwSz5lOpDE67srw/HYe35f1z3fDQw+3txg7gNtWw=="; }; }; "body-parser-xml-2.0.3" = { @@ -1381,6 +1624,15 @@ let sha512 = "YyNI4qJJ+piQG6MMEuo7J3Bzaqssufx04zpEKYfSrl/1Op59HWali9zMtBpXnkmqMcOuWJPZvudrm9wISmnCbg=="; }; }; + "bson-1.1.6" = { + name = "bson"; + packageName = "bson"; + version = "1.1.6"; + src = fetchurl { + url = "https://registry.npmjs.org/bson/-/bson-1.1.6.tgz"; + sha512 = "EvVNVeGo4tHxwi8L6bPj3y3itEvStdwvvlojVxxbyYfoaxJ6keLgrTuKdyfEAszFK+H3olzBuafE0yoh0D1gdg=="; + }; + }; "bson-4.7.0" = { name = "bson"; packageName = "bson"; @@ -1453,6 +1705,15 @@ let sha512 = "a7ZpuTZU1TRtnwyCNW3I5dc0wWNC3VR9S++Ewyk2HHZdrO3CQJqSpd+95Us590V6AL7JqUAH2IwZ/398PmNFgw=="; }; }; + "bufferutil-4.0.6" = { + name = "bufferutil"; + packageName = "bufferutil"; + version = "4.0.6"; + src = fetchurl { + url = "https://registry.npmjs.org/bufferutil/-/bufferutil-4.0.6.tgz"; + sha512 = "jduaYOYtnio4aIAyc6UbvPCVcgq7nYpVnucyxr6eCYg/Woad9Hf/oxxBRDnGGjPfjUm6j5O/uBWhIu4iLebFaw=="; + }; + }; "bull-3.29.3" = { name = "bull"; packageName = "bull"; @@ -1498,6 +1759,15 @@ let sha512 = "/Nf7TyzTx6S3yRJObOAV7956r8cr2+Oj8AC5dt8wSP3BQAoeX58NoHyCU8P8zGkNXStjTSi6fzO6F0pBdcYbEg=="; }; }; + "cacache-15.3.0" = { + name = "cacache"; + packageName = "cacache"; + version = "15.3.0"; + src = fetchurl { + url = "https://registry.npmjs.org/cacache/-/cacache-15.3.0.tgz"; + sha512 = "VVdYzXEn+cnbXpFgWs5hTT7OScegHVmLhJIR8Ufqk3iFD6A6j5iSX1KuBTfNEv4tdJWE2PzA6IVFtcLC7fN9wQ=="; + }; + }; "call-bind-1.0.2" = { name = "call-bind"; packageName = "call-bind"; @@ -1642,6 +1912,24 @@ let sha512 = "ekGhOnNVPgT77r4K/U3GDhu+FQ2S8TnK/s2KbIGXi0SZWuwkZ2QNyfWdZW+TVfn84DpEP7rLeCt2UI6bJ8GwbQ=="; }; }; + "chokidar-3.5.3" = { + name = "chokidar"; + packageName = "chokidar"; + version = "3.5.3"; + src = fetchurl { + url = "https://registry.npmjs.org/chokidar/-/chokidar-3.5.3.tgz"; + sha512 = "Dr3sfKRP6oTcjf2JmUmFJfeVMvXBdegxB0iVQ5eb2V10uFJUCAS8OByZdVAyVb8xXNz3GjjTgj9kLWsZTqE6kw=="; + }; + }; + "chownr-1.1.4" = { + name = "chownr"; + packageName = "chownr"; + version = "1.1.4"; + src = fetchurl { + url = "https://registry.npmjs.org/chownr/-/chownr-1.1.4.tgz"; + sha512 = "jJ0bqzaylmJtVnNgzTeSOs8DPavpbYgEr/b0YL8/2GO3xJEhInFmhKMUnEJQjZumK7KXGFhUy89PrsJWlakBVg=="; + }; + }; "chownr-2.0.0" = { name = "chownr"; packageName = "chownr"; @@ -1669,6 +1957,15 @@ let sha512 = "yBUcQy07FPlGzUjoLuUfIOXzgynnQPPruyK1Ge2B74k9ROwnle1E+NxLWnUv5OLU8hA/qL5leAE9XnXq3byaBw=="; }; }; + "clean-stack-2.2.0" = { + name = "clean-stack"; + packageName = "clean-stack"; + version = "2.2.0"; + src = fetchurl { + url = "https://registry.npmjs.org/clean-stack/-/clean-stack-2.2.0.tgz"; + sha512 = "4diC9HaTE+KRAMWhDhrGOECgWZxoevMc5TlkObMqNSsVU62PYzXZ/SMTjzyGAFF1YusgxGcSWTEXBhp0CPwQ1A=="; + }; + }; "clean-stack-3.0.1" = { name = "clean-stack"; packageName = "clean-stack"; @@ -1741,13 +2038,22 @@ let sha512 = "OcRE68cOsVMXp1Yvonl/fzkQOyjLSu/8bhPDfQt0e0/Eb283TKP20Fs2MqoPsr9SwA595rRCA+QMzYc9nBP+JQ=="; }; }; - "cluster-key-slot-1.1.0" = { + "clone-2.1.2" = { + name = "clone"; + packageName = "clone"; + version = "2.1.2"; + src = fetchurl { + url = "https://registry.npmjs.org/clone/-/clone-2.1.2.tgz"; + sha512 = "3Pe/CF1Nn94hyhIYpjtiLhdCoEoz0DqQ+988E9gmeEdQZlojxnOb74wctFyuwWQHzqyf9X7C7MG8juUpqBJT8w=="; + }; + }; + "cluster-key-slot-1.1.1" = { name = "cluster-key-slot"; packageName = "cluster-key-slot"; - version = "1.1.0"; + version = "1.1.1"; src = fetchurl { - url = "https://registry.npmjs.org/cluster-key-slot/-/cluster-key-slot-1.1.0.tgz"; - sha512 = "2Nii8p3RwAPiFwsnZvukotvow2rIHM+yQ6ZcBXGHdniadkYGZYiGmkHJIbZPIV9nfv7m/U1IPMVVcAhoWFeklw=="; + url = "https://registry.npmjs.org/cluster-key-slot/-/cluster-key-slot-1.1.1.tgz"; + sha512 = "rwHwUfXL40Chm1r08yrhU3qpUvdVlgkKNeyeGPOxnW8/SyVDvgRaed/Uz54AqWNaTCAThlj6QAs3TZcKI0xDEw=="; }; }; "codepage-1.15.0" = { @@ -1867,13 +2173,13 @@ let sha512 = "P0CysNDQ7rtVw4QIQtm+MRxV66vKFSvlsQvGYXZWR3qFU0jlMKHZZZgw8e+8DSah4UDKMqnknRDQz+xuQXQ/Zg=="; }; }; - "commander-9.4.0" = { + "commander-9.4.1" = { name = "commander"; packageName = "commander"; - version = "9.4.0"; + version = "9.4.1"; src = fetchurl { - url = "https://registry.npmjs.org/commander/-/commander-9.4.0.tgz"; - sha512 = "sRPT+umqkz90UA8M1yqYfnHlZA7fF6nSphDtxeywPZ49ysjxDQybzk13CL+mXekDRG92skbcqCLVovuCusNmFw=="; + url = "https://registry.npmjs.org/commander/-/commander-9.4.1.tgz"; + sha512 = "5EEkTNyHNGFPD2H+c/dXXfQZYa/scCKasxWcXJaWnNJ99pnQN9Vnmqow+p+PlFPE63Q6mThaZws1T+HxfpgtPw=="; }; }; "commist-1.1.0" = { @@ -1885,6 +2191,15 @@ let sha512 = "rraC8NXWOEjhADbZe9QBNzLAN5Q3fsTPQtBV+fEVj6xKIgDgNiEVE6ZNfHpZOqfQ21YUzfVNUXLOEZquYvQPPg=="; }; }; + "component-props-1.1.1" = { + name = "component-props"; + packageName = "component-props"; + version = "1.1.1"; + src = fetchurl { + url = "https://registry.npmjs.org/component-props/-/component-props-1.1.1.tgz"; + sha512 = "69pIRJs9fCCHRqCz3390YF2LV1Lu6iEMZ5zuVqqUn+G20V9BNXlMs0cWawWeW9g4Ynmg29JmkG6R7/lUJoGd1Q=="; + }; + }; "component-type-1.2.1" = { name = "component-type"; packageName = "component-type"; @@ -1894,6 +2209,15 @@ let sha512 = "Kgy+2+Uwr75vAi6ChWXgHuLvd+QLD7ssgpaRq2zCvt80ptvAfMc/hijcJxXkBa2wMlEZcJvC2H8Ubo+A9ATHIg=="; }; }; + "component-xor-0.0.4" = { + name = "component-xor"; + packageName = "component-xor"; + version = "0.0.4"; + src = fetchurl { + url = "https://registry.npmjs.org/component-xor/-/component-xor-0.0.4.tgz"; + sha512 = "ZIt6sla8gfo+AFVRZoZOertcnD5LJaY2T9CKE2j13NJxQt/mUafD69Bl7/Y4AnpI2LGjiXH7cOfJDx/n2G9edA=="; + }; + }; "compressible-2.0.18" = { name = "compressible"; packageName = "compressible"; @@ -2047,13 +2371,13 @@ let sha512 = "Kb2wC0fvsWfQrgk8HU5lW6U/Lcs8+9aaYcy4ZFc6DDlo4nZ7n70dEgE5rtR0oG6ufKDUnrwfWL1mXR5ljDatrQ=="; }; }; - "core-js-3.25.2" = { + "core-js-3.25.5" = { name = "core-js"; packageName = "core-js"; - version = "3.25.2"; + version = "3.25.5"; src = fetchurl { - url = "https://registry.npmjs.org/core-js/-/core-js-3.25.2.tgz"; - sha512 = "YB4IAT1bjEfxTJ1XYy11hJAKskO+qmhuDBM8/guIfMz4JvdsAQAqvyb97zXX7JgSrfPLG5mRGFWJwJD39ruq2A=="; + url = "https://registry.npmjs.org/core-js/-/core-js-3.25.5.tgz"; + sha512 = "nbm6eZSjm+ZuBQxCUPQKQCoUEfFOXjUZ8dTTyikyKaWrTYmAVbykQfwsKE5dBK88u3QCkCrzsx/PPlKfhsvgpw=="; }; }; "core-util-is-1.0.2" = { @@ -2173,13 +2497,22 @@ let sha512 = "FAaLDaplstoRsDR8XGYH51znUN0UY7nMc6Z9/fvE8EXGwvJE9hu7W2vHwx1+bd6gCYnln9nLbzxFTrcO9YQDZw=="; }; }; - "csstype-3.1.1" = { - name = "csstype"; - packageName = "csstype"; - version = "3.1.1"; + "curlconverter-3.21.0" = { + name = "curlconverter"; + packageName = "curlconverter"; + version = "3.21.0"; + src = fetchurl { + url = "https://registry.npmjs.org/curlconverter/-/curlconverter-3.21.0.tgz"; + sha512 = "DXCnp1A/Xa69FujksUfdvWQFAnIn/C+4Wuv8t+UVdZkF/lY5bzj98GGKOGme7V/ckSHDLxE29Xp76sJ5Cpsp5A=="; + }; + }; + "currency-codes-2.1.0" = { + name = "currency-codes"; + packageName = "currency-codes"; + version = "2.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/csstype/-/csstype-3.1.1.tgz"; - sha512 = "DJR/VvkAvSZW9bTouZue2sSxDwdTN92uHjqeKVm+0dAqdfNykRzQ95tay8aXMBAAPpUiq4Qcug2L7neoRh2Egw=="; + url = "https://registry.npmjs.org/currency-codes/-/currency-codes-2.1.0.tgz"; + sha512 = "aASwFNP8VjZ0y0PWlSW7c9N/isYTLxK6OCbm7aVuQMk7dWO2zgup9KGiFQgeL9OGL5P/ulvCHcjQizmuEeZXtw=="; }; }; "dashdash-1.14.1" = { @@ -2191,6 +2524,15 @@ let sha512 = "jRFi8UDGo6j+odZiEpjazZaWqEal3w/basFjQHQEwVtZJGDpxbH1MeYluwCS8Xq5wmLJooDlMgvVarmWfGM44g=="; }; }; + "data-api-client-1.3.0" = { + name = "data-api-client"; + packageName = "data-api-client"; + version = "1.3.0"; + src = fetchurl { + url = "https://registry.npmjs.org/data-api-client/-/data-api-client-1.3.0.tgz"; + sha512 = "+Q+lChhl5PBogsB7nO/VZFF3X0WJe8y93dyft50HIg2Bg+c765wM/sXkfBz5pjmGoRESkB/GLesQJLTMBbK4dQ=="; + }; + }; "data-uri-to-buffer-3.0.1" = { name = "data-uri-to-buffer"; packageName = "data-uri-to-buffer"; @@ -2200,6 +2542,33 @@ let sha512 = "WboRycPNsVw3B3TL559F7kuBUM4d8CgMEvk6xEJlOp7OBPjt6G7z8WMWlD2rOFZLk6OYfFIUGsCOWzcQH9K2og=="; }; }; + "date-utils-1.2.21" = { + name = "date-utils"; + packageName = "date-utils"; + version = "1.2.21"; + src = fetchurl { + url = "https://registry.npmjs.org/date-utils/-/date-utils-1.2.21.tgz"; + sha512 = "wJMBjqlwXR0Iv0wUo/lFbhSQ7MmG1hl36iuxuE91kW+5b5sWbase73manEqNH9sOLFAMG83B4ffNKq9/Iq0FVA=="; + }; + }; + "dateformat-3.0.3" = { + name = "dateformat"; + packageName = "dateformat"; + version = "3.0.3"; + src = fetchurl { + url = "https://registry.npmjs.org/dateformat/-/dateformat-3.0.3.tgz"; + sha512 = "jyCETtSl3VMZMWeRo7iY1FL19ges1t55hMo5yaam4Jrsm5EPL89UQkoQRyiI+Yf4k8r2ZpdngkV8hr1lIdjb3Q=="; + }; + }; + "de-indent-1.0.2" = { + name = "de-indent"; + packageName = "de-indent"; + version = "1.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/de-indent/-/de-indent-1.0.2.tgz"; + sha512 = "e/1zu3xH5MQryN2zdVaF0OrdNLUbvWxzMbi+iNA6Bky7l1RoP8a2fIbRocyHclXt/arDrrR6lL3TqFD9pMQTsg=="; + }; + }; "debug-2.6.9" = { name = "debug"; packageName = "debug"; @@ -2209,6 +2578,15 @@ let sha512 = "bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA=="; }; }; + "debug-3.1.0" = { + name = "debug"; + packageName = "debug"; + version = "3.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/debug/-/debug-3.1.0.tgz"; + sha512 = "OX8XqP7/1a9cqkxYw2yXss15f26NKWBpDXQd0/uK/KPqdQhxbPa994hnzjcE2VqQpDslf55723cKPUOGSmMY3g=="; + }; + }; "debug-3.2.7" = { name = "debug"; packageName = "debug"; @@ -2245,6 +2623,51 @@ let sha512 = "syBZ+rnAK3EgMsH2aYEOLUW7mZSY9Gb+0wUMCFsZvcmiz+HigA0LOcq/HoQqVuGG+EKykunc7QG2bzrponfaSw=="; }; }; + "decode-uri-component-0.2.0" = { + name = "decode-uri-component"; + packageName = "decode-uri-component"; + version = "0.2.0"; + src = fetchurl { + url = "https://registry.npmjs.org/decode-uri-component/-/decode-uri-component-0.2.0.tgz"; + sha512 = "hjf+xovcEn31w/EUYdTXQh/8smFL/dzYjohQGEIgjyNavaJfBY2p5F527Bo1VPATxv0VYTUC2bOcXvqFwk78Og=="; + }; + }; + "decompress-response-6.0.0" = { + name = "decompress-response"; + packageName = "decompress-response"; + version = "6.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/decompress-response/-/decompress-response-6.0.0.tgz"; + sha512 = "aW35yZM6Bb/4oJlZncMH2LCoZtJXTRxES17vE3hoRiowU2kWHaJKFkSBDnDR+cm9J+9QhXmREyIfv0pji9ejCQ=="; + }; + }; + "deep-equal-1.1.1" = { + name = "deep-equal"; + packageName = "deep-equal"; + version = "1.1.1"; + src = fetchurl { + url = "https://registry.npmjs.org/deep-equal/-/deep-equal-1.1.1.tgz"; + sha512 = "yd9c5AdiqVcR+JjcwUQb9DkhJc8ngNr0MahEBGvDiJw8puWab2yZlh+nkasOnZP+EGTAP6rRp2JzJhJZzvNF8g=="; + }; + }; + "deep-equal-2.0.5" = { + name = "deep-equal"; + packageName = "deep-equal"; + version = "2.0.5"; + src = fetchurl { + url = "https://registry.npmjs.org/deep-equal/-/deep-equal-2.0.5.tgz"; + sha512 = "nPiRgmbAtm1a3JsnLCf6/SLfXcjyN5v8L1TXzdCmHrXJ4hx+gW/w1YCcn7z8gJtSiDArZCgYtbao3QqLm/N1Sw=="; + }; + }; + "deep-extend-0.6.0" = { + name = "deep-extend"; + packageName = "deep-extend"; + version = "0.6.0"; + src = fetchurl { + url = "https://registry.npmjs.org/deep-extend/-/deep-extend-0.6.0.tgz"; + sha512 = "LOHxIOaPYdHlJRtCQfDIVZtfw/ufM8+rVj649RIHzcm/vGwQRXFt6OPqIFWsm2XEMrNIEtWR64sY1LEKD2vAOA=="; + }; + }; "deep-is-0.1.4" = { name = "deep-is"; packageName = "deep-is"; @@ -2344,6 +2767,15 @@ let sha512 = "HVQE3AAb/pxF8fQAoiqpvg9i3evqug3hoiwakOyZAwJm+6vZehbkYXZ0l4JxS+I3QxM97v5aaRNhj8v5oBhekw=="; }; }; + "depd-1.1.2" = { + name = "depd"; + packageName = "depd"; + version = "1.1.2"; + src = fetchurl { + url = "https://registry.npmjs.org/depd/-/depd-1.1.2.tgz"; + sha512 = "7emPTl6Dpo6JRXOXjLRxck+FlLRX5847cLKEn00PLAgc3g2hTZZgr+e4c2v6QpSmLeFP3n5yUo7ft6avBK/5jQ=="; + }; + }; "depd-2.0.0" = { name = "depd"; packageName = "depd"; @@ -2416,6 +2848,15 @@ let sha512 = "c68LpLbO+7kP/b1Hr1qs8/BJ09F5khZGTxqxZuhzxpmwJKOgRFHJWIb9/KmqnqHhLdO55aOxFH/EGBvUQbL/RQ=="; }; }; + "dom-iterator-1.0.0" = { + name = "dom-iterator"; + packageName = "dom-iterator"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/dom-iterator/-/dom-iterator-1.0.0.tgz"; + sha512 = "7dsMOQI07EMU98gQM8NSB3GsAiIeBYIPKpnxR3c9xOvdvBjChAcOM0iJ222I3p5xyiZO9e5oggkNaCusuTdYig=="; + }; + }; "dom-serializer-1.4.1" = { name = "dom-serializer"; packageName = "dom-serializer"; @@ -2569,6 +3010,15 @@ let sha512 = "TPJXq8JqFaVYm2CWmPvnP2Iyo4ZSM7/QKcSmuMLDObfpH5fi7RUGmd/rTDf+rut/saiDiQEeVTNgAmJEdAOx0w=="; }; }; + "encoding-0.1.13" = { + name = "encoding"; + packageName = "encoding"; + version = "0.1.13"; + src = fetchurl { + url = "https://registry.npmjs.org/encoding/-/encoding-0.1.13.tgz"; + sha512 = "ETBauow1T35Y/WZMkio9jiM0Z5xjHHmJ4XmjZOq1l/dXz3lr2sRn87nJy20RupqSh1F2m3HHPSp8ShIPQJrJ3A=="; + }; + }; "encoding-japanese-2.0.0" = { name = "encoding-japanese"; packageName = "encoding-japanese"; @@ -2596,6 +3046,15 @@ let sha512 = "p92if5Nz619I0w+akJrLZH0MX0Pb5DX39XOwQTtXSdQQOaYH03S1uIQp4mhOZtAXrxq4ViO67YTiLBo2638o9A=="; }; }; + "env-paths-2.2.1" = { + name = "env-paths"; + packageName = "env-paths"; + version = "2.2.1"; + src = fetchurl { + url = "https://registry.npmjs.org/env-paths/-/env-paths-2.2.1.tgz"; + sha512 = "+h1lkLKhZMTYjog1VEpJNG7NZJWcuc2DDk/qsqSTRRCOXiLjeQ1d1/udrUGhqMxUgAlwKNZ0cf2uqan5GLuS2A=="; + }; + }; "env-variable-0.0.6" = { name = "env-variable"; packageName = "env-variable"; @@ -2614,13 +3073,13 @@ let sha512 = "2bmlRpNKBxT/CRmPOlyISQpNj+qSeYvcym/uT0Jx2bMOlKLtSy1ZmLuVxSEKKyor/N5yhvp/ZiG1oE3DEYMSFA=="; }; }; - "es-abstract-1.20.2" = { + "es-abstract-1.20.4" = { name = "es-abstract"; packageName = "es-abstract"; - version = "1.20.2"; + version = "1.20.4"; src = fetchurl { - url = "https://registry.npmjs.org/es-abstract/-/es-abstract-1.20.2.tgz"; - sha512 = "XxXQuVNrySBNlEkTYJoDNFe5+s2yIOpzq80sUHEdPdQr0S5nTLz4ZPPPswNIpKseDDUS5yghX1gfLIHQZ1iNuQ=="; + url = "https://registry.npmjs.org/es-abstract/-/es-abstract-1.20.4.tgz"; + sha512 = "0UtvRN79eMe2L+UNEF1BwRe364sj/DXhQ/k5FmivgoSdpM90b8Jc0mDzKMGo7QS0BVbOP/bTwBKNnDc9rNzaPA=="; }; }; "es-aggregate-error-1.0.8" = { @@ -2641,6 +3100,15 @@ let sha512 = "wd6JXUmyHmt8T5a2xreUwKcGPq6f1f+WwIJkijUqiGcJz1qqnZgP6XIK+QyIWU5lT7imeNxUll48bziG+TSYcA=="; }; }; + "es-get-iterator-1.1.2" = { + name = "es-get-iterator"; + packageName = "es-get-iterator"; + version = "1.1.2"; + src = fetchurl { + url = "https://registry.npmjs.org/es-get-iterator/-/es-get-iterator-1.1.2.tgz"; + sha512 = "+DTO8GYwbMCwbywjimwZMHp8AuYXOS2JZFWoi2AlPOS3ebnII9w/NLpNZtA7A0YLaVDw+O7KFCeoIV7OPvM7hQ=="; + }; + }; "es-to-primitive-1.2.1" = { name = "es-to-primitive"; packageName = "es-to-primitive"; @@ -2713,6 +3181,15 @@ let sha512 = "NB/L/1Y30qyJcG5xZxCJKW/+bqyj+llbcCwo9DEz8bESIP0SLTOQ8T1DWCCFc+wJ61AMEstj4511PSScqMMfCw=="; }; }; + "esprima-1.2.2" = { + name = "esprima"; + packageName = "esprima"; + version = "1.2.2"; + src = fetchurl { + url = "https://registry.npmjs.org/esprima/-/esprima-1.2.2.tgz"; + sha512 = "+JpPZam9w5DuJ3Q67SqsMGtiHKENSMRVoxvArfJZK01/BfLEObtZ6orJa/MtoGNR/rfMgp5837T41PAmTwAv/A=="; + }; + }; "esprima-4.0.1" = { name = "esprima"; packageName = "esprima"; @@ -2749,6 +3226,24 @@ let sha512 = "aIL5Fx7mawVa300al2BnEE4iNvo1qETxLrPI/o05L7z6go7fCw1J6EQmbK4FmJ2AS7kgVF/KEZWufBfdClMcPg=="; }; }; + "event-target-shim-5.0.1" = { + name = "event-target-shim"; + packageName = "event-target-shim"; + version = "5.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/event-target-shim/-/event-target-shim-5.0.1.tgz"; + sha512 = "i/2XbnSz/uxRCU6+NdVJgKWDTM427+MqYbkQzD321DuCQJUqOuJKIA0IM2+W2xtYHdKOmZ4dR6fExsd4SXL+WQ=="; + }; + }; + "eventemitter3-4.0.7" = { + name = "eventemitter3"; + packageName = "eventemitter3"; + version = "4.0.7"; + src = fetchurl { + url = "https://registry.npmjs.org/eventemitter3/-/eventemitter3-4.0.7.tgz"; + sha512 = "8guHBZCwKnFhYdHr2ysuRWErTwhoN2X8XELRlrRwpmfeY2jjuUN4taQMsULKUVo1K4DvZl+0pgfyoysHxvmvEw=="; + }; + }; "events-1.1.1" = { name = "events"; packageName = "events"; @@ -2785,6 +3280,15 @@ let sha512 = "h2z5mrROTxce56S+pnvAV890uu7ls7f1kEvVGJbw1OlFH3/mlJ5bkXu0KRyW94v37zzHPiUd55iLn3DA7TjWpw=="; }; }; + "expand-template-2.0.3" = { + name = "expand-template"; + packageName = "expand-template"; + version = "2.0.3"; + src = fetchurl { + url = "https://registry.npmjs.org/expand-template/-/expand-template-2.0.3.tgz"; + sha512 = "XYfuKMvj4O35f/pOXLObndIRvyQ+/+6AhODh+OKWj9S9498pHHn/IMszH+gt0fBCRWMNfk1ZSp5x3AifmnI2vg=="; + }; + }; "expand-tilde-2.0.2" = { name = "expand-tilde"; packageName = "expand-tilde"; @@ -2794,13 +3298,13 @@ let sha512 = "A5EmesHW6rfnZ9ysHQjPdJRni0SRar0tjtG5MNtm9n5TUvsYU8oozprtRD4AqHxcZWWlVuAmQo2nWKfN9oyjTw=="; }; }; - "express-4.18.1" = { + "express-4.18.2" = { name = "express"; packageName = "express"; - version = "4.18.1"; + version = "4.18.2"; src = fetchurl { - url = "https://registry.npmjs.org/express/-/express-4.18.1.tgz"; - sha512 = "zZBcOX9TfehHQhtupq57OF8lFZ3UZi08Y97dwFCkD8p9d/d2Y3M+ykKcwaMDEL+4qyUolgBDX6AblpR3fL212Q=="; + url = "https://registry.npmjs.org/express/-/express-4.18.2.tgz"; + sha512 = "5/PsL6iGPdfQ/lKM1UuielYgv3BUoJfz1aUwU9vHZ+J7gyvwdQXFEBIEIaxeGf0GIcreATNyBExtalisDbuMqQ=="; }; }; "express-openapi-validator-4.13.8" = { @@ -2857,6 +3361,15 @@ let sha512 = "f3qQ9oQy9j2AhBe/H9VC91wLmKBCCU/gDOnKNAYG5hswO7BLKj09Hc5HYNz9cGI++xlpDCIgDaitVs03ATR84Q=="; }; }; + "fast-diff-1.2.0" = { + name = "fast-diff"; + packageName = "fast-diff"; + version = "1.2.0"; + src = fetchurl { + url = "https://registry.npmjs.org/fast-diff/-/fast-diff-1.2.0.tgz"; + sha512 = "xJuoT5+L99XlZ8twedaRf6Ax2TgQVxvgZOYoPKqZufmJib0tL2tegPBOZb1pVNgIhlqDlA0eO0c3wBvQcmzx4w=="; + }; + }; "fast-glob-3.2.12" = { name = "fast-glob"; packageName = "fast-glob"; @@ -2902,13 +3415,13 @@ let sha512 = "OP2IUU6HeYKJi3i0z4A19kHMQoLVs4Hc+DPqqxI2h/DPZHTm/vjsfC6P0b4jCMy14XizLBqvndQ+UilD7707Jw=="; }; }; - "fflate-0.7.3" = { + "fflate-0.7.4" = { name = "fflate"; packageName = "fflate"; - version = "0.7.3"; + version = "0.7.4"; src = fetchurl { - url = "https://registry.npmjs.org/fflate/-/fflate-0.7.3.tgz"; - sha512 = "0Zz1jOzJWERhyhsimS54VTqOteCNwRtIlh8isdL0AXLo0g7xNTfTL7oWrkmCnPhZGocKIkWHBistBrrpoNH3aw=="; + url = "https://registry.npmjs.org/fflate/-/fflate-0.7.4.tgz"; + sha512 = "5u2V/CDW15QM1XbbgS+0DfPxVB+jUKhWEKuuFuHncbk3tEEqzmoXL+2KyOFuKGqOnmdIy0/davWF1CkuwtibCw=="; }; }; "figures-3.2.0" = { @@ -2920,6 +3433,15 @@ let sha512 = "yaduQFRKLXYOGgEn6AZau90j3ggSOyiqXU0F9JZfeXYhNa+Jk4X+s45A2zg5jns87GAFa34BBm2kXw4XpNcbdg=="; }; }; + "file-saver-2.0.5" = { + name = "file-saver"; + packageName = "file-saver"; + version = "2.0.5"; + src = fetchurl { + url = "https://registry.npmjs.org/file-saver/-/file-saver-2.0.5.tgz"; + sha512 = "P9bmyZ3h/PRG+Nzga+rbdI4OEpNDzAVyy74uVO9ATgzLK6VtAsYybF/+TOCvrc0MO793d6+42lLyZTw7/ArVzA=="; + }; + }; "file-type-16.5.4" = { name = "file-type"; packageName = "file-type"; @@ -2929,6 +3451,15 @@ let sha512 = "/yFHK0aGjFEgDJjEKP0pWCplsPFPhwyfwevf/pVxiN0tmE4L9LmwWxWukdJSHdoCli4VgQLehjJtwQBnqmsKcw=="; }; }; + "file-uri-to-path-1.0.0" = { + name = "file-uri-to-path"; + packageName = "file-uri-to-path"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/file-uri-to-path/-/file-uri-to-path-1.0.0.tgz"; + sha512 = "0Zt+s3L7Vf1biwWZ29aARiVYLx7iMGnEUl9x33fbB/j3jR81u/O2LbqK+Bm1CDSNDKVtJ/YjwY7TUd5SkeLQLw=="; + }; + }; "file-uri-to-path-2.0.0" = { name = "file-uri-to-path"; packageName = "file-uri-to-path"; @@ -2956,6 +3487,15 @@ let sha512 = "qOo9F+dMUmC2Lcb4BbVvnKJxTPjCm+RRpe4gDuGrzkL7mEVl/djYSu2OdQ2Pa302N4oqkSg9ir6jaLWJ2USVpQ=="; }; }; + "filter-obj-1.1.0" = { + name = "filter-obj"; + packageName = "filter-obj"; + version = "1.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/filter-obj/-/filter-obj-1.1.0.tgz"; + sha512 = "8rXg1ZnX7xzy2NGDVkBVaAy+lSlPNwad13BtgSlLuxfIslyt5Vg64U7tFcCt4WS1R0hvtnQybT/IyCkGZ3DpXQ=="; + }; + }; "finalhandler-1.2.0" = { name = "finalhandler"; packageName = "finalhandler"; @@ -2965,6 +3505,15 @@ let sha512 = "5uXcUVftlQMFnWC9qu/svkWv3GTd2PfUhK/3PLkYNAe7FbqJMt3515HaxE6eRL74GdsriiwujiawdaB1BpEISg=="; }; }; + "first-match-0.0.1" = { + name = "first-match"; + packageName = "first-match"; + version = "0.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/first-match/-/first-match-0.0.1.tgz"; + sha512 = "VvKbnaxrC0polTFDC+teKPTdl2mn6B/KUW+WB3C9RzKDeNwbzfLdnUz3FxC+tnjvus6bI0jWrWicQyVIPdS37A=="; + }; + }; "flatted-3.2.7" = { name = "flatted"; packageName = "flatted"; @@ -3019,6 +3568,15 @@ let sha512 = "1lLKB2Mu3aGP1Q/2eCOx0fNbRMe7XdwktwOruhfqqd0rIJWwN4Dh+E3hrPSlDCXnSR7UtZ1N38rVXm+6+MEhJQ=="; }; }; + "form-data-2.5.1" = { + name = "form-data"; + packageName = "form-data"; + version = "2.5.1"; + src = fetchurl { + url = "https://registry.npmjs.org/form-data/-/form-data-2.5.1.tgz"; + sha512 = "m21N3WOmEEURgk6B9GLOE4RuWOFf28Lhh9qGYeNlGq4VDXUlJy2th2slBNU8Gp8EzloYZOibZJ7t5ecIrFSjVA=="; + }; + }; "form-data-3.0.1" = { name = "form-data"; packageName = "form-data"; @@ -3082,6 +3640,15 @@ let sha512 = "zJ2mQYM18rEFOudeV4GShTGIQ7RbzA7ozbU9I/XBpm7kqgMywgmylMwXHxZJmkVoYkna9d2pVXVXPdYTP9ej8Q=="; }; }; + "fs-constants-1.0.0" = { + name = "fs-constants"; + packageName = "fs-constants"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/fs-constants/-/fs-constants-1.0.0.tgz"; + sha512 = "y6OAwoSIf7FyjMIv94u+b5rdheZEjzR63GTyZJm5qh4Bi+2YgwLCcI/fPFZkL5PSixOt6ZNKm+w+Hfp/Bciwow=="; + }; + }; "fs-extra-8.1.0" = { name = "fs-extra"; packageName = "fs-extra"; @@ -3163,6 +3730,15 @@ let sha512 = "+5J6MS/5XksCuXq++uFRsnUd7Ovu1XenbeuIuNRJxYWjgQbPuFhT14lAvsWfqfAmnwluf1OwMjz39HjfLPci0Q=="; }; }; + "gauge-4.0.4" = { + name = "gauge"; + packageName = "gauge"; + version = "4.0.4"; + src = fetchurl { + url = "https://registry.npmjs.org/gauge/-/gauge-4.0.4.tgz"; + sha512 = "f9m+BEN5jkg6a0fZjleidjN51VE1X+mPFQ2DJ0uv1V39oCLCbsGe6yjbBnp7eK7z/+GAon99a3nHuqbuuthyPg=="; + }; + }; "generate-function-2.3.1" = { name = "generate-function"; packageName = "generate-function"; @@ -3262,6 +3838,15 @@ let sha512 = "0fzj9JxOLfJ+XGLhR8ze3unN0KZCgZwiSSDz168VERjK8Wl8kVSdcu2kspd4s4wtAa1y/qrVRiAA0WclVsu0ng=="; }; }; + "github-from-package-0.0.0" = { + name = "github-from-package"; + packageName = "github-from-package"; + version = "0.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/github-from-package/-/github-from-package-0.0.0.tgz"; + sha512 = "SyHy3T1v2NUXn29OsWdxmK6RwHD+vkj3v8en8AOBZ1wBQ/hCAQ5bAQTD02kW4W9tUp/3Qh6J8r9EvntiyCmOOw=="; + }; + }; "glob-7.2.3" = { name = "glob"; packageName = "glob"; @@ -3316,13 +3901,13 @@ let sha512 = "jhIXaOzy1sb8IyocaruWSn1TjmnBVs8Ayhcy83rmxNJ8q2uWKCAj3CnJY+KpGSXCueAPc0i05kVvVKtP1t9S3g=="; }; }; - "gm-1.24.0" = { + "gm-1.25.0" = { name = "gm"; packageName = "gm"; - version = "1.24.0"; + version = "1.25.0"; src = fetchurl { - url = "https://registry.npmjs.org/gm/-/gm-1.24.0.tgz"; - sha512 = "HsB94GIi6D4KklPrcRtq85CUuQhgi292N7vOx00pBH95sKuuy9LfenL9UtqXV4XFU8AmP5EaIhYcCxYp9zjiGQ=="; + url = "https://registry.npmjs.org/gm/-/gm-1.25.0.tgz"; + sha512 = "4kKdWXTtgQ4biIo7hZA396HT062nDVVHPjQcurNZ3o/voYN+o5FUC5kOwuORbpExp3XbTJ3SU7iRipiIhQtovw=="; }; }; "google-timezones-json-1.0.2" = { @@ -3433,6 +4018,15 @@ let sha512 = "8Rf9Y83NBReMnx0gFzA8JImQACstCYWUplepDa9xprwwtmgEZUF0h/i5xSA625zB/I37EtrswSST6OXxwaaIJQ=="; }; }; + "hdb-pool-0.1.6" = { + name = "hdb-pool"; + packageName = "hdb-pool"; + version = "0.1.6"; + src = fetchurl { + url = "https://registry.npmjs.org/hdb-pool/-/hdb-pool-0.1.6.tgz"; + sha512 = "8VZOLn1EHamm1NmTFQj2iqjVcfonYIsD7F5DU2bz2N+gF+knp6/MbAVeRXkJtya717IBkPeA5iv0/1iPuYo4ZA=="; + }; + }; "he-1.2.0" = { name = "he"; packageName = "he"; @@ -3505,6 +4099,15 @@ let sha512 = "gyyPk6rgonLFEDGoeRgQNaEUvdJ4ktTmmUh/h2t7s+M8oPpIPxgNACWa+6ESR57kXstwqPiCut0V8NRpcwgU7A=="; }; }; + "http-cache-semantics-4.1.0" = { + name = "http-cache-semantics"; + packageName = "http-cache-semantics"; + version = "4.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/http-cache-semantics/-/http-cache-semantics-4.1.0.tgz"; + sha512 = "carPklcUh7ROWRK7Cv27RPtdhYhUsela/ue5/jKzjegVvXDqM2ILE9Q2BGn9JZJh1g87cp56su/FgQSzcWS8cQ=="; + }; + }; "http-errors-2.0.0" = { name = "http-errors"; packageName = "http-errors"; @@ -3577,6 +4180,15 @@ let sha512 = "v3MXnZAcvnywkTUEZomIActle7RXXeedOR31wwl7VlyoXO4Qi9arvSenNQWne1TcRwhCL1HwLI21bEqdpj8/rA=="; }; }; + "iconv-lite-0.5.2" = { + name = "iconv-lite"; + packageName = "iconv-lite"; + version = "0.5.2"; + src = fetchurl { + url = "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.5.2.tgz"; + sha512 = "kERHXvpSaB4aU3eANwidg79K8FlrN77m8G9V+0vOR3HYaRifrlwMEpT7ZBJqLSEIHnEgJTHcWK82wwLwwKwtag=="; + }; + }; "iconv-lite-0.6.3" = { name = "iconv-lite"; packageName = "iconv-lite"; @@ -3640,6 +4252,15 @@ let sha512 = "SW3LtfEJFjlJKS/h2CmpX2IKpya2RXobR3ENJJW4iMQ3QYPxWxf5oeaz1K3P4eGUwfGEndkqt7uVDKnEyG9zeQ=="; }; }; + "imurmurhash-0.1.4" = { + name = "imurmurhash"; + packageName = "imurmurhash"; + version = "0.1.4"; + src = fetchurl { + url = "https://registry.npmjs.org/imurmurhash/-/imurmurhash-0.1.4.tgz"; + sha512 = "JmXMZ6wuvDmLiHEml9ykzqO6lwFbof0GG4IkcGaENdCRDDmMVnny7s5HsIgHCbaq0w2MyPhDqkhTUgS2LU2PHA=="; + }; + }; "indent-string-4.0.0" = { name = "indent-string"; packageName = "indent-string"; @@ -3649,6 +4270,15 @@ let sha512 = "EdDDZu4A2OyIK7Lr/2zG+w5jmbuk1DVBnEwREQvBzspBJkCEbRa8GxU1lghYcaGJCnRWibjDXlq779X1/y5xwg=="; }; }; + "infer-owner-1.0.4" = { + name = "infer-owner"; + packageName = "infer-owner"; + version = "1.0.4"; + src = fetchurl { + url = "https://registry.npmjs.org/infer-owner/-/infer-owner-1.0.4.tgz"; + sha512 = "IClj+Xz94+d7irH5qRyfJonOdfTzuDaifE6ZPWfx0N0+/ATZCbuTPq2prFl526urkQd90WyUKIh1DfBQ2hMz9A=="; + }; + }; "inflight-1.0.6" = { name = "inflight"; packageName = "inflight"; @@ -3667,6 +4297,15 @@ let sha512 = "k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ=="; }; }; + "ini-1.3.8" = { + name = "ini"; + packageName = "ini"; + version = "1.3.8"; + src = fetchurl { + url = "https://registry.npmjs.org/ini/-/ini-1.3.8.tgz"; + sha512 = "JV/yugV2uzW5iMRSiZAyDtQd+nxtUnjeLt0acNdw98kKLrvuRVyB80tsREOE7yvGVgalhZ6RNXCmEHkUKBKxew=="; + }; + }; "inquirer-7.3.3" = { name = "inquirer"; packageName = "inquirer"; @@ -3802,13 +4441,13 @@ let sha512 = "NcdALwpXkTm5Zvvbk7owOUSvVvBKDgKP5/ewfXEznmQFfs4ZRmanOeKBTjRVjka3QFoN6XJ+9F3USqfHqTaU5w=="; }; }; - "is-callable-1.2.6" = { + "is-callable-1.2.7" = { name = "is-callable"; packageName = "is-callable"; - version = "1.2.6"; + version = "1.2.7"; src = fetchurl { - url = "https://registry.npmjs.org/is-callable/-/is-callable-1.2.6.tgz"; - sha512 = "krO72EO2NptOGAX2KYyqbP9vYMlNAXdB53rq6f8LXY6RY7JdSR/3BD6wLUlPHSAesmY9vstNrjvqGaCiRK/91Q=="; + url = "https://registry.npmjs.org/is-callable/-/is-callable-1.2.7.tgz"; + sha512 = "1BC0BVFhS/p0qtw6enp8e+8OD0UrK0oFLztSjNzhcKA3WDuJxxAPXzPuPtKkjEY9UUoEWlX/8fgKeu2S8i9JTA=="; }; }; "is-core-module-2.10.0" = { @@ -3892,6 +4531,24 @@ let sha512 = "xelSayHH36ZgE7ZWhli7pW34hNbNl8Ojv5KVmkJD4hBdD3th8Tfk9vYasLM+mXWOZhFkgZfxhLSnrwRr4elSSg=="; }; }; + "is-lambda-1.0.1" = { + name = "is-lambda"; + packageName = "is-lambda"; + version = "1.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/is-lambda/-/is-lambda-1.0.1.tgz"; + sha512 = "z7CMFGNrENq5iFB9Bqo64Xk6Y9sg+epq1myIcdHaGnbMTYOxvzsEtdYqQUylB7LxfkvgrrjP32T6Ywciio9UIQ=="; + }; + }; + "is-map-2.0.2" = { + name = "is-map"; + packageName = "is-map"; + version = "2.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/is-map/-/is-map-2.0.2.tgz"; + sha512 = "cOZFQQozTha1f4MxLFzlgKYPTyj26picdZTx82hbc/Xf4K/tZOOXSCkMvU4pKioRXGDLJRn0GM7Upe7kR721yg=="; + }; + }; "is-nan-1.3.2" = { name = "is-nan"; packageName = "is-nan"; @@ -3991,6 +4648,15 @@ let sha512 = "XVm7LOeLpTW4jV19QSH38vkswxoLud8sQ57YwJVTPWdiaI9I8keEhGFpBlslyVsgdQy4Opg8QOLb8YRgsyZiQg=="; }; }; + "is-set-2.0.2" = { + name = "is-set"; + packageName = "is-set"; + version = "2.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/is-set/-/is-set-2.0.2.tgz"; + sha512 = "+2cnTEZeY5z/iXGbLhPrOAaK/Mau5k5eXq9j14CpRTftq0pAJu2MwVRSZhyZWBzx3o6X795Lz6Bpb6R0GKf37g=="; + }; + }; "is-shared-array-buffer-1.0.2" = { name = "is-shared-array-buffer"; packageName = "is-shared-array-buffer"; @@ -4054,6 +4720,15 @@ let sha512 = "mrGpVd0fs7WWLfVsStvgF6iEJnbjDFZh9/emhRDcGWTduTfNHd9CHeUwH3gYIjdbwo4On6hunkztwOaAw0yllQ=="; }; }; + "is-weakmap-2.0.1" = { + name = "is-weakmap"; + packageName = "is-weakmap"; + version = "2.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/is-weakmap/-/is-weakmap-2.0.1.tgz"; + sha512 = "NSBR4kH5oVj1Uwvv970ruUkCV7O1mzgVFO4/rev2cLRda9Tm9HrL70ZPut4rOHgY0FNrUu9BCbXA2sdQ+x0chA=="; + }; + }; "is-weakref-1.0.2" = { name = "is-weakref"; packageName = "is-weakref"; @@ -4063,6 +4738,15 @@ let sha512 = "qctsuLZmIQ0+vSSMfoVvyFe2+GSEvnmZ2ezTup1SBse9+twCCeial6EEi3Nc2KFcf6+qz2FBPnjXsk8xhKSaPQ=="; }; }; + "is-weakset-2.0.2" = { + name = "is-weakset"; + packageName = "is-weakset"; + version = "2.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/is-weakset/-/is-weakset-2.0.2.tgz"; + sha512 = "t2yVvttHkQktwnNNmBQ98AhENLdPUTDTE21uPqAQ0ARwQfGeQKRVS0NNurH7bTf7RrvcVn1OOge45CnBeHCSmg=="; + }; + }; "is-windows-1.0.2" = { name = "is-windows"; packageName = "is-windows"; @@ -4099,13 +4783,22 @@ let sha512 = "VLghIWNM6ELQzo7zwmcg0NmTVyWKYjvIeM83yjp0wRDTmUnrM678fQbcKBo6n2CJEF0szoG//ytg+TKla89ALQ=="; }; }; - "isbot-3.5.3" = { + "isarray-2.0.5" = { + name = "isarray"; + packageName = "isarray"; + version = "2.0.5"; + src = fetchurl { + url = "https://registry.npmjs.org/isarray/-/isarray-2.0.5.tgz"; + sha512 = "xHjhDr3cNBK0BzdUJSPXZntQUx/mwMS5Rw4A7lPJ90XGAO6ISP/ePDNuo0vhqOZU+UD5JoodwCAAoZQd3FeAKw=="; + }; + }; + "isbot-3.6.1" = { name = "isbot"; packageName = "isbot"; - version = "3.5.3"; + version = "3.6.1"; src = fetchurl { - url = "https://registry.npmjs.org/isbot/-/isbot-3.5.3.tgz"; - sha512 = "mMLxdBl0hB6UEDibl/nXPSmF+kjX9cOKEJw1YeiKBGr6AdZq/LQUsk7UlDfr/D3gU+PdR6hf8o72BLOxzgw6EA=="; + url = "https://registry.npmjs.org/isbot/-/isbot-3.6.1.tgz"; + sha512 = "e1RmjWns87x60QyiHberWWMJGutL3+Ad0nZ8cz735iDEDDS6ApPfKSFo4EMj0PmMZ0m0ntpWIM0ADdqDFvUJPQ=="; }; }; "isexe-2.0.0" = { @@ -4162,6 +4855,15 @@ let sha512 = "bF7vcQxbODoGK1imE2P9GS9aw4zD0Sd+Hni68IMZLj7zRnquH7dXUmMw9hDI5S/Jzt7q+IyTXN0rSg2GI0IKhQ=="; }; }; + "jquery-3.6.1" = { + name = "jquery"; + packageName = "jquery"; + version = "3.6.1"; + src = fetchurl { + url = "https://registry.npmjs.org/jquery/-/jquery-3.6.1.tgz"; + sha512 = "opJeO4nCucVnsjiXOE+/PcCgYw9Gwpvs/a6B1LL/lQhwWwpbVEVYDZ1FokFr8PRc7ghYlrFPuyHuiiDNTQxmcw=="; + }; + }; "js-md4-0.3.2" = { name = "js-md4"; packageName = "js-md4"; @@ -4171,6 +4873,15 @@ let sha512 = "/GDnfQYsltsjRswQhN9fhv3EMw2sCpUdrdxyWDOUK7eyD++r3gRhzgiQgc/x4MAv2i1iuQ4lxO5mvqM3vj4bwA=="; }; }; + "js-nacl-1.4.0" = { + name = "js-nacl"; + packageName = "js-nacl"; + version = "1.4.0"; + src = fetchurl { + url = "https://registry.npmjs.org/js-nacl/-/js-nacl-1.4.0.tgz"; + sha512 = "HgYLcutGbMYBJrwgVICiHliuw1OJLy2U3tIuK6a1rZ06KC84TPl81WG1hcBRrBCiIIuBe3PSo9G4IZOMGdSg3Q=="; + }; + }; "js-yaml-3.14.1" = { name = "js-yaml"; packageName = "js-yaml"; @@ -4189,6 +4900,15 @@ let sha512 = "wpxZs9NoxZaJESJGIZTyDEaYpl0FKSA+FB9aJiyemKhMwkxQg63h4T1KJgUGHpTqPDNRcmmYLugrRjJlBtWvRA=="; }; }; + "jsbi-3.2.5" = { + name = "jsbi"; + packageName = "jsbi"; + version = "3.2.5"; + src = fetchurl { + url = "https://registry.npmjs.org/jsbi/-/jsbi-3.2.5.tgz"; + sha512 = "aBE4n43IPvjaddScbvWRA2YlTzKEynHzu7MqOyTipdHucf/VxS63ViCjxYRg86M8Rxwbt/GfzHl1kKERkt45fQ=="; + }; + }; "jsbi-4.3.0" = { name = "jsbi"; packageName = "jsbi"; @@ -4207,6 +4927,15 @@ let sha512 = "UVU9dibq2JcFWxQPA6KCqj5O42VOmAY3zQUfEKxU0KpTGXwNoCjkX1e13eHNvw/xPynt6pU0rZ1htjWTNTSXsg=="; }; }; + "jsesc-3.0.2" = { + name = "jsesc"; + packageName = "jsesc"; + version = "3.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/jsesc/-/jsesc-3.0.2.tgz"; + sha512 = "xKqzzWXDttJuOcawBt4KnKHHIf5oQ/Cxax+0PWFG+DFDgHNAdi+TXECADI+RYiFUMmx8792xsMbbgXj4CwnP4g=="; + }; + }; "json-diff-0.5.5" = { name = "json-diff"; packageName = "json-diff"; @@ -4279,6 +5008,15 @@ let sha512 = "5dgndWOriYSm5cnYaJNhalLNDKOqFwyDB/rr1E9ZsGciGvKPs8R2xYGCacuf3z6K1YKDz182fd+fY3cn3pMqXQ=="; }; }; + "jsonpath-1.1.1" = { + name = "jsonpath"; + packageName = "jsonpath"; + version = "1.1.1"; + src = fetchurl { + url = "https://registry.npmjs.org/jsonpath/-/jsonpath-1.1.1.tgz"; + sha512 = "l6Cg7jRpixfbgoWgkrl77dgEj8RPvND0wMH6TwQmi9Qs4TFfS9u5cUFnbeKTwj5ga5Y3BTGGNI28k117LJ009w=="; + }; + }; "jsonschema-1.4.1" = { name = "jsonschema"; packageName = "jsonschema"; @@ -4297,6 +5035,15 @@ let sha512 = "XjwVfRS6jTMsqYs0EsuJ4LGxXV14zQybNd4L2r0UvbVnSF9Af8x7p5MzbJ90Ioz/9TI41/hTCvznF/loiSzn8w=="; }; }; + "jsplumb-2.15.4" = { + name = "jsplumb"; + packageName = "jsplumb"; + version = "2.15.4"; + src = fetchurl { + url = "https://registry.npmjs.org/jsplumb/-/jsplumb-2.15.4.tgz"; + sha512 = "QssfhXe0YRxY4V2WHPmKwsE3bPHNj4Vts9oinys66ci+4m9lJvFDcEMDygqueiSFL8Jb8CnFyQC9fvL+YHJS7g=="; + }; + }; "jsprim-1.4.2" = { name = "jsprim"; packageName = "jsprim"; @@ -4423,6 +5170,15 @@ let sha512 = "b74iyWmwb4GprAUPjPkJ11GTC7KX4Pd3onpJfKxYyY8y9Rbb4ERY47LvCMEDM09WD3thiLDMXtkfDK/AX+zT7Q=="; }; }; + "libpq-1.8.12" = { + name = "libpq"; + packageName = "libpq"; + version = "1.8.12"; + src = fetchurl { + url = "https://registry.npmjs.org/libpq/-/libpq-1.8.12.tgz"; + sha512 = "4lUY9BD9suz76mVS0kH4rRgRy620g/c9YZH5GYC3smfIpjtj6KiPuQ4IwQSHSZMMMhMM3tBFrYUrw8mHOOZVeg=="; + }; + }; "libqp-1.1.0" = { name = "libqp"; packageName = "libqp"; @@ -4477,6 +5233,15 @@ let sha512 = "mKnC+QJ9pWVzv+C4/U3rRsHapFfHvQFoFB92e52xeyGMcX6/OlIl78je1u8vePzYZSkkogMPJ2yjxxsb89cxyw=="; }; }; + "lodash.camelcase-4.3.0" = { + name = "lodash.camelcase"; + packageName = "lodash.camelcase"; + version = "4.3.0"; + src = fetchurl { + url = "https://registry.npmjs.org/lodash.camelcase/-/lodash.camelcase-4.3.0.tgz"; + sha512 = "TwuEnCnxbc3rAvhf/LbG7tJUDzhqXyFnv3dtzLOPgCG/hODL7WFnsbwktkD7yUV0RrreP/l1PALq/YSg6VvjlA=="; + }; + }; "lodash.clonedeep-4.5.0" = { name = "lodash.clonedeep"; packageName = "lodash.clonedeep"; @@ -4486,6 +5251,15 @@ let sha512 = "H5ZhCF25riFd9uB5UCkVKo61m3S/xZk1x4wA6yp/L3RFP6Z/eHH1ymQcGLo7J3GMPfm0V/7m1tryHuGVxpqEBQ=="; }; }; + "lodash.debounce-4.0.8" = { + name = "lodash.debounce"; + packageName = "lodash.debounce"; + version = "4.0.8"; + src = fetchurl { + url = "https://registry.npmjs.org/lodash.debounce/-/lodash.debounce-4.0.8.tgz"; + sha512 = "FT1yDzDYEoYWhnSGnpE/4Kj1fLZkDFyqRb7fNt6FdYOSxlUWAtp42Eh6Wb0rGIv/m9Bgo7x4GhQbm5Ys4SG5ow=="; + }; + }; "lodash.defaults-4.2.0" = { name = "lodash.defaults"; packageName = "lodash.defaults"; @@ -4621,6 +5395,24 @@ let sha512 = "Sb487aTOCr9drQVL8pIxOzVhafOjZN9UU54hiN8PU3uAiSV7lx1yYNpbNmex2PK6dSJoNTSJUUswT651yww3Mg=="; }; }; + "lodash.orderby-4.6.0" = { + name = "lodash.orderby"; + packageName = "lodash.orderby"; + version = "4.6.0"; + src = fetchurl { + url = "https://registry.npmjs.org/lodash.orderby/-/lodash.orderby-4.6.0.tgz"; + sha512 = "T0rZxKmghOOf5YPnn8EY5iLYeWCpZq8G41FfqoVHH5QDTAFaghJRmAdLiadEDq+ztgM2q5PjA+Z1fOwGrLgmtg=="; + }; + }; + "lodash.pick-4.4.0" = { + name = "lodash.pick"; + packageName = "lodash.pick"; + version = "4.4.0"; + src = fetchurl { + url = "https://registry.npmjs.org/lodash.pick/-/lodash.pick-4.4.0.tgz"; + sha512 = "hXt6Ul/5yWjfklSGvLQl8vM//l3FtyHZeuelpzK6mm99pNvN9yTDruNZPEJZD1oWrqo+izBmB7oUfWgcCX7s4Q=="; + }; + }; "lodash.set-4.3.2" = { name = "lodash.set"; packageName = "lodash.set"; @@ -4819,6 +5611,15 @@ let sha512 = "etgt+n4LlOkGSJbBTV9VROHA5R7ekIPS4vfh+bCAoJgRrJWdqJCBbpS3osRJ/HrT7R68MzMiY3L3sDJ/Fd8aBg=="; }; }; + "make-fetch-happen-9.1.0" = { + name = "make-fetch-happen"; + packageName = "make-fetch-happen"; + version = "9.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/make-fetch-happen/-/make-fetch-happen-9.1.0.tgz"; + sha512 = "+zopwDy7DNknmwPQplem5lAZX/eCOzSvSNNcSKm5eVwTkOBzoktEfXsa9L23J/GIRhxRsaxzkPEhrJEpE2F4Gg=="; + }; + }; "mappersmith-2.40.0" = { name = "mappersmith"; packageName = "mappersmith"; @@ -4954,6 +5755,15 @@ let sha512 = "OqbOk5oEQeAZ8WXWydlu9HJjz9WVdEIvamMCcXmuqUYjTknH/sqsWvhQ3vgwKFRR1HpjvNBKQ37nbJgYzGqGcg=="; }; }; + "mimic-response-3.1.0" = { + name = "mimic-response"; + packageName = "mimic-response"; + version = "3.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/mimic-response/-/mimic-response-3.1.0.tgz"; + sha512 = "z0yWI+4FDrrweS8Zmt4Ej5HdJmky15+L2e6Wgn3+iK5fWzb6T3fhNFq2+MeTRb064c6Wr4N/wv0DzQTjNzHNGQ=="; + }; + }; "minimalistic-assert-1.0.1" = { name = "minimalistic-assert"; packageName = "minimalistic-assert"; @@ -4999,6 +5809,51 @@ let sha512 = "rQ/p+KfKBkeNwo04U15i+hOwoVBVmekmm/HcfTkTN2t9pbQKCMm4eN5gFeqgrrSp/kH/7BYYhTIHOxGqzbBPaA=="; }; }; + "minipass-collect-1.0.2" = { + name = "minipass-collect"; + packageName = "minipass-collect"; + version = "1.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/minipass-collect/-/minipass-collect-1.0.2.tgz"; + sha512 = "6T6lH0H8OG9kITm/Jm6tdooIbogG9e0tLgpY6mphXSm/A9u8Nq1ryBG+Qspiub9LjWlBPsPS3tWQ/Botq4FdxA=="; + }; + }; + "minipass-fetch-1.4.1" = { + name = "minipass-fetch"; + packageName = "minipass-fetch"; + version = "1.4.1"; + src = fetchurl { + url = "https://registry.npmjs.org/minipass-fetch/-/minipass-fetch-1.4.1.tgz"; + sha512 = "CGH1eblLq26Y15+Azk7ey4xh0J/XfJfrCox5LDJiKqI2Q2iwOLOKrlmIaODiSQS8d18jalF6y2K2ePUm0CmShw=="; + }; + }; + "minipass-flush-1.0.5" = { + name = "minipass-flush"; + packageName = "minipass-flush"; + version = "1.0.5"; + src = fetchurl { + url = "https://registry.npmjs.org/minipass-flush/-/minipass-flush-1.0.5.tgz"; + sha512 = "JmQSYYpPUqX5Jyn1mXaRwOda1uQ8HP5KAT/oDSLCzt1BYRhQU0/hDtsB1ufZfEEzMZ9aAVmsBw8+FWsIXlClWw=="; + }; + }; + "minipass-pipeline-1.2.4" = { + name = "minipass-pipeline"; + packageName = "minipass-pipeline"; + version = "1.2.4"; + src = fetchurl { + url = "https://registry.npmjs.org/minipass-pipeline/-/minipass-pipeline-1.2.4.tgz"; + sha512 = "xuIq7cIOt09RPRJ19gdi4b+RiNvDFYe5JH+ggNvBqGqpQXcru3PcRmOZuHBKWK1Txf9+cQ+HMVN4d6z46LZP7A=="; + }; + }; + "minipass-sized-1.0.3" = { + name = "minipass-sized"; + packageName = "minipass-sized"; + version = "1.0.3"; + src = fetchurl { + url = "https://registry.npmjs.org/minipass-sized/-/minipass-sized-1.0.3.tgz"; + sha512 = "MbkQQ2CTiBMlA2Dm/5cY+9SWFEN8pzzOXi6rlM5Xxq0Yqbda5ZQy9sU75a673FE9ZK0Zsbr6Y5iP6u9nktfg2g=="; + }; + }; "minizlib-2.1.2" = { name = "minizlib"; packageName = "minizlib"; @@ -5026,6 +5881,15 @@ let sha512 = "vVqVZQyf3WLx2Shd0qJ9xuvqgAyKPLAiqITEtqW0oIUjzo3PePDd6fW9iFz30ef7Ysp/oiWqbhszeGWW2T6Gzw=="; }; }; + "mkdirp-classic-0.5.3" = { + name = "mkdirp-classic"; + packageName = "mkdirp-classic"; + version = "0.5.3"; + src = fetchurl { + url = "https://registry.npmjs.org/mkdirp-classic/-/mkdirp-classic-0.5.3.tgz"; + sha512 = "gKLcREMhtuZRwRAfqP3RFW+TK4JqApVBtOIftVgjuABpAtpxhPGaDcfvbhNvD0B8iD1oUr/txX35NjcaY6Ns/A=="; + }; + }; "mock-require-3.0.3" = { name = "mock-require"; packageName = "mock-require"; @@ -5062,31 +5926,40 @@ let sha512 = "B/y4+b2O5G2gjuxIFtCE2EkM17R2NM7/3F8x0qcPsqy4V83bitJTIO4TIeZpYlzu/xy6INiY/+84BEm6+7Cmzg=="; }; }; - "mongodb-4.9.1" = { + "mongodb-3.7.3" = { + name = "mongodb"; + packageName = "mongodb"; + version = "3.7.3"; + src = fetchurl { + url = "https://registry.npmjs.org/mongodb/-/mongodb-3.7.3.tgz"; + sha512 = "Psm+g3/wHXhjBEktkxXsFMZvd3nemI0r3IPsE0bU+4//PnvNWKkzhZcEsbPcYiWqe8XqXJJEg4Tgtr7Raw67Yw=="; + }; + }; + "mongodb-4.10.0" = { name = "mongodb"; packageName = "mongodb"; - version = "4.9.1"; + version = "4.10.0"; src = fetchurl { - url = "https://registry.npmjs.org/mongodb/-/mongodb-4.9.1.tgz"; - sha512 = "ZhgI/qBf84fD7sI4waZBoLBNJYPQN5IOC++SBCiPiyhzpNKOxN/fi0tBHvH2dEC42HXtNEbFB0zmNz4+oVtorQ=="; + url = "https://registry.npmjs.org/mongodb/-/mongodb-4.10.0.tgz"; + sha512 = "My2QxLTw0Cc1O9gih0mz4mqo145Jq4rLAQx0Glk/Ha9iYBzYpt4I2QFNRIh35uNFNfe8KFQcdwY1/HKxXBkinw=="; }; }; - "mongodb-connection-string-url-2.5.3" = { + "mongodb-connection-string-url-2.5.4" = { name = "mongodb-connection-string-url"; packageName = "mongodb-connection-string-url"; - version = "2.5.3"; + version = "2.5.4"; src = fetchurl { - url = "https://registry.npmjs.org/mongodb-connection-string-url/-/mongodb-connection-string-url-2.5.3.tgz"; - sha512 = "f+/WsED+xF4B74l3k9V/XkTVj5/fxFH2o5ToKXd8Iyi5UhM+sO9u0Ape17Mvl/GkZaFtM0HQnzAG5OTmhKw+tQ=="; + url = "https://registry.npmjs.org/mongodb-connection-string-url/-/mongodb-connection-string-url-2.5.4.tgz"; + sha512 = "SeAxuWs0ez3iI3vvmLk/j2y+zHwigTDKQhtdxTgt5ZCOQQS5+HW4g45/Xw5vzzbn7oQXCNQ24Z40AkJsizEy7w=="; }; }; - "moo-0.5.1" = { + "moo-0.5.2" = { name = "moo"; packageName = "moo"; - version = "0.5.1"; + version = "0.5.2"; src = fetchurl { - url = "https://registry.npmjs.org/moo/-/moo-0.5.1.tgz"; - sha512 = "I1mnb5xn4fO80BH9BLcF0yLypy2UKl+Cb01Fu0hJRkJjlCRtxZMWkTdAtDd5ZqCOxtCkhmRwyI57vWT+1iZ67w=="; + url = "https://registry.npmjs.org/moo/-/moo-0.5.2.tgz"; + sha512 = "iSAJLHYKnX41mKcJKjqvnAN9sf0LMDTXDEvFv+ffuRR9a1MIuXLjMNL6EsnDHSkKLTWNqQQ5uo61P4EbU4NU+Q=="; }; }; "mqtt-4.2.6" = { @@ -5134,6 +6007,15 @@ let sha512 = "6FlzubTLZG3J2a/NVCAleEhjzq5oxgHyaCU9yYXvcLsvoVaHJq/s5xXI6/XXP6tz7R9xAOtHnSO/tXtF3WRTlA=="; }; }; + "mssql-6.4.1" = { + name = "mssql"; + packageName = "mssql"; + version = "6.4.1"; + src = fetchurl { + url = "https://registry.npmjs.org/mssql/-/mssql-6.4.1.tgz"; + sha512 = "G1I7mM0gfxcH5TGSNoVmxq13Mve5YnQgRAlonqaMlHEjHjMn1g04bsrIQbVHFRdI6++dw/FGWlh8GoItJMoUDw=="; + }; + }; "mssql-8.1.4" = { name = "mssql"; packageName = "mssql"; @@ -5179,49 +6061,49 @@ let sha512 = "z81GNO7nnYMEhrGh9LeymoE4+Yr0Wn5McHIZMK5cfQCl+NDX08sCZgUc9/6MHni9IWuFLm1Z3HTCXu2z9fN62Q=="; }; }; - "n8n-core-0.134.0" = { + "n8n-core-0.137.0" = { name = "n8n-core"; packageName = "n8n-core"; - version = "0.134.0"; + version = "0.137.0"; src = fetchurl { - url = "https://registry.npmjs.org/n8n-core/-/n8n-core-0.134.0.tgz"; - sha512 = "9NejfRS1FvD7vHn7Oz1465mBNZNAmZ01epxF1NFTjvqx4kNWEYWmKssYE30RINegFAt6He+KJCGzj0AMdtm2iw=="; + url = "https://registry.npmjs.org/n8n-core/-/n8n-core-0.137.0.tgz"; + sha512 = "qNFzL20TDG7kdtW7rt46DEf6eAWi9MrYmCjmrliJqDOGp2CHtpwlQM8dsIDXuzHoLRX4vuYXDA4kEKA/8kPvlw=="; }; }; - "n8n-design-system-0.34.0" = { + "n8n-design-system-0.37.0" = { name = "n8n-design-system"; packageName = "n8n-design-system"; - version = "0.34.0"; + version = "0.37.0"; src = fetchurl { - url = "https://registry.npmjs.org/n8n-design-system/-/n8n-design-system-0.34.0.tgz"; - sha512 = "4baEVsmgp+9bvwK0oecuzzq9d99ymfFD7rhL4wWlSyF1sC/4Ug7BJ1aoxS3LMOAwZxAZu3eeumXArHLYT7temw=="; + url = "https://registry.npmjs.org/n8n-design-system/-/n8n-design-system-0.37.0.tgz"; + sha512 = "P17+YgT5NjjuaBfqLD+CyTEaLM89q3UyuSDJgmyQdTmsg0tKwaWmVXL455a6L6syLILjwMDg77lTFKKMedBhtg=="; }; }; - "n8n-editor-ui-0.160.0" = { + "n8n-editor-ui-0.163.1" = { name = "n8n-editor-ui"; packageName = "n8n-editor-ui"; - version = "0.160.0"; + version = "0.163.1"; src = fetchurl { - url = "https://registry.npmjs.org/n8n-editor-ui/-/n8n-editor-ui-0.160.0.tgz"; - sha512 = "ys0InljStAlGA9AHH/RutOvkmkDgnC4onkRlSDFZTy9YCSNr5k0sCmhjfQiPe+zrnJUH200kQupcsZQN06AiQA=="; + url = "https://registry.npmjs.org/n8n-editor-ui/-/n8n-editor-ui-0.163.1.tgz"; + sha512 = "bKn6DkK4GuFdjW9rcaBewYZE2wF5g5zfb5zamp+I4TlJXMAsR1bSHpiq8Z8BRyGg0bR76Ny35MQvmXCbvKTejQ=="; }; }; - "n8n-nodes-base-0.192.0" = { + "n8n-nodes-base-0.195.1" = { name = "n8n-nodes-base"; packageName = "n8n-nodes-base"; - version = "0.192.0"; + version = "0.195.1"; src = fetchurl { - url = "https://registry.npmjs.org/n8n-nodes-base/-/n8n-nodes-base-0.192.0.tgz"; - sha512 = "k+xYWdjyM1wCXYfE8ak3lHbqiJrn4NPI2XiEM9oTdYIB9qDItlOSLLnGOVsypksJ71FJfSQVxkZfwpxVzTGbyg=="; + url = "https://registry.npmjs.org/n8n-nodes-base/-/n8n-nodes-base-0.195.1.tgz"; + sha512 = "EfTySsb3sc1RzGe8Da/FClXVkCwUIErDfOjl6me8ikRGntjf7Sco6FXS6Ib0iLi6XGbXbyKlJ1c9+Phe9A1I4g=="; }; }; - "n8n-workflow-0.116.0" = { + "n8n-workflow-0.119.0" = { name = "n8n-workflow"; packageName = "n8n-workflow"; - version = "0.116.0"; + version = "0.119.0"; src = fetchurl { - url = "https://registry.npmjs.org/n8n-workflow/-/n8n-workflow-0.116.0.tgz"; - sha512 = "i+5fcN6a4m4sn9awGuKHDrsAXLNyFNrgSPffxcP4Vj5R9nRg9zjocWNse05WzcRgzBCvujCOZo7O1ispX0MLCg=="; + url = "https://registry.npmjs.org/n8n-workflow/-/n8n-workflow-0.119.0.tgz"; + sha512 = "BcSIBSbX1NZ9i8eFFk4Wp0k7esmzH6m8j0RDZK5KwhD4hla4mpx6z6i7kKmAOCuLWjKuY0OMQPEYFWrDEjt0fA=="; }; }; "named-placeholders-1.1.2" = { @@ -5233,6 +6115,15 @@ let sha512 = "wiFWqxoLL3PGVReSZpjLVxyJ1bRqe+KKJVbr4hGs1KWfTZTQyezHFBbuKj9hsizHyGV2ne7EMjHdxEGAybD5SA=="; }; }; + "nan-2.16.0" = { + name = "nan"; + packageName = "nan"; + version = "2.16.0"; + src = fetchurl { + url = "https://registry.npmjs.org/nan/-/nan-2.16.0.tgz"; + sha512 = "UdAqHyFngu7TfQKsCBgAA6pWDkT8MAO7d0jyOecVhN5354xbLqdn8mV9Tat9gepAupm0bt2DbeaSC8vS52MuFA=="; + }; + }; "nanoclone-0.2.1" = { name = "nanoclone"; packageName = "nanoclone"; @@ -5251,6 +6142,15 @@ let sha512 = "MqBkQh/OHTS2egovRtLk45wEyNXwF+cokD+1YPf9u5VfJiRdAiRwB2froX5Co9Rh20xs4siNPm8naNotSD6RBw=="; }; }; + "napi-build-utils-1.0.2" = { + name = "napi-build-utils"; + packageName = "napi-build-utils"; + version = "1.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/napi-build-utils/-/napi-build-utils-1.0.2.tgz"; + sha512 = "ONmRUqK7zj7DWX0D9ADe03wbwOBZxNAfF20PlGfCWQcD3+/MakShIHrMqx9YwPTfxDdF1zLeL+RGZiR9kGMLdg=="; + }; + }; "native-duplexpair-1.0.0" = { name = "native-duplexpair"; packageName = "native-duplexpair"; @@ -5323,6 +6223,15 @@ let sha512 = "fgAN3jGAh+RoxUGZHTSOLJIqUc2wmoBwGR4tbpNAKmmovFoWq0OdRkb0VkldReO2a2iBT/OEulG9XSUc10r3zg=="; }; }; + "node-abi-3.26.0" = { + name = "node-abi"; + packageName = "node-abi"; + version = "3.26.0"; + src = fetchurl { + url = "https://registry.npmjs.org/node-abi/-/node-abi-3.26.0.tgz"; + sha512 = "jRVtMFTChbi2i/jqo/i2iP9634KMe+7K1v35mIdj3Mn59i5q27ZYhn+sW6npISM/PQg7HrP2kwtRBMmh5Uvzdg=="; + }; + }; "node-abort-controller-3.0.1" = { name = "node-abort-controller"; packageName = "node-abort-controller"; @@ -5359,6 +6268,24 @@ let sha512 = "ZjMPFEfVx5j+y2yF35Kzx5sF7kDzxuDj6ziH4FFbOp87zKDZNx8yExJIb05OGF4Nlt9IHFIMBkRl41VdvcNdbQ=="; }; }; + "node-gyp-8.4.1" = { + name = "node-gyp"; + packageName = "node-gyp"; + version = "8.4.1"; + src = fetchurl { + url = "https://registry.npmjs.org/node-gyp/-/node-gyp-8.4.1.tgz"; + sha512 = "olTJRgUtAb/hOXG0E93wZDs5YiJlgbXxTwQAFHyNlRsXQnYzUaF2aGgujZbw+hR8aF4ZG/rST57bWMWD16jr9w=="; + }; + }; + "node-gyp-build-4.5.0" = { + name = "node-gyp-build"; + packageName = "node-gyp-build"; + version = "4.5.0"; + src = fetchurl { + url = "https://registry.npmjs.org/node-gyp-build/-/node-gyp-build-4.5.0.tgz"; + sha512 = "2iGbaQBV+ITgCz76ZEjmhUKAKVf7xfY1sRl4UiKQspfZMH2h06SyhNsnSVy50cwkFQDGLyif6m/6uFXHkOZ6rg=="; + }; + }; "node-html-markdown-1.2.0" = { name = "node-html-markdown"; packageName = "node-html-markdown"; @@ -5404,13 +6331,13 @@ let sha512 = "KUdDsspqx89sD4UUyUKzdlUOper3hRkDVkrKh/89G+d9WKsU5ox51NWS4tB1XR5dPUdR4SP0E3molyEfOvSa3g=="; }; }; - "nodemailer-6.7.8" = { + "nodemailer-6.8.0" = { name = "nodemailer"; packageName = "nodemailer"; - version = "6.7.8"; + version = "6.8.0"; src = fetchurl { - url = "https://registry.npmjs.org/nodemailer/-/nodemailer-6.7.8.tgz"; - sha512 = "2zaTFGqZixVmTxpJRCFC+Vk5eGRd/fYtvIR+dl5u9QXLTQWGIf48x/JXvo58g9sa0bU6To04XUv554Paykum3g=="; + url = "https://registry.npmjs.org/nodemailer/-/nodemailer-6.8.0.tgz"; + sha512 = "EjYvSmHzekz6VNkNd12aUqAco+bOkRe3Of5jVhltqKhEsjw/y0PYPJfp83+s9Wzh1dspYAkUW/YNQ350NATbSQ=="; }; }; "nopt-5.0.0" = { @@ -5458,6 +6385,15 @@ let sha512 = "AqZtDUWOMKs1G/8lwylVjrdYgqA4d9nu8hc+0gzRxlDb1I10+FHBGMXs6aiQHFdCUUlqH99MUMuLfzWDNDtfxw=="; }; }; + "npmlog-6.0.2" = { + name = "npmlog"; + packageName = "npmlog"; + version = "6.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/npmlog/-/npmlog-6.0.2.tgz"; + sha512 = "/vBvz5Jfr9dT/aFWd0FIRf+T/Q2WBsLENygUaFUqstqsycmZAP/t5BvFJTK0viFmSUxiUKTUplWy5vt+rvKIxg=="; + }; + }; "nth-check-2.1.1" = { name = "nth-check"; packageName = "nth-check"; @@ -5467,6 +6403,24 @@ let sha512 = "lqjrjmaOoAnWfMmBPL+XNnynZh2+swxiX3WUE0s4yEHI6m+AwrK2UZOimIRl3X/4QctVqS8AiZjFqyOGrMXb/w=="; }; }; + "nub-0.0.0" = { + name = "nub"; + packageName = "nub"; + version = "0.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/nub/-/nub-0.0.0.tgz"; + sha512 = "dK0Ss9C34R/vV0FfYJXuqDAqHlaW9fvWVufq9MmGF2umCuDbd5GRfRD9fpi/LiM0l4ZXf8IBB+RYmZExqCrf0w=="; + }; + }; + "nunjucks-3.2.3" = { + name = "nunjucks"; + packageName = "nunjucks"; + version = "3.2.3"; + src = fetchurl { + url = "https://registry.npmjs.org/nunjucks/-/nunjucks-3.2.3.tgz"; + sha512 = "psb6xjLj47+fE76JdZwskvwG4MYsQKXUtMsPh6U0YMvmyjRtKRFcxnlXGWglNybtNTNVmGdp94K62/+NjF5FDQ=="; + }; + }; "oauth-1.0a-2.2.6" = { name = "oauth-1.0a"; packageName = "oauth-1.0a"; @@ -5503,6 +6457,15 @@ let sha512 = "z+cPxW0QGUp0mcqcsgQyLVRDoXFQbXOwBaqyF7VIgI4TWNQsDHrBpUQslRmIfAoYWdYzs6UlKJtB2XJpTaNSpQ=="; }; }; + "object-is-1.1.5" = { + name = "object-is"; + packageName = "object-is"; + version = "1.1.5"; + src = fetchurl { + url = "https://registry.npmjs.org/object-is/-/object-is-1.1.5.tgz"; + sha512 = "3cyDsyHgtmi7I7DfSSI2LDp6SK2lwvtbg0p0R1e0RvTqF5ceGx+K2dfSjm1bKDMVCFEDAQvy+o8c6a7VujOddw=="; + }; + }; "object-keys-1.1.1" = { name = "object-keys"; packageName = "object-keys"; @@ -5629,6 +6592,15 @@ let sha512 = "d/gTkTb1i1GKz5k3XE3XFV/PxQ1k45zDqGP2OA7YhgsaLoqm6qRvARAZOFer1fcXritWlGBRCu/UgeS4HAnXAA=="; }; }; + "optional-require-1.1.8" = { + name = "optional-require"; + packageName = "optional-require"; + version = "1.1.8"; + src = fetchurl { + url = "https://registry.npmjs.org/optional-require/-/optional-require-1.1.8.tgz"; + sha512 = "jq83qaUb0wNg9Krv1c5OQ+58EK+vHde6aBPzLvPPqJm89UQWsvSuFy9X/OSNJnFeSOKo7btE0n8Nl2+nE+z5nA=="; + }; + }; "optionator-0.8.3" = { name = "optionator"; packageName = "optionator"; @@ -5638,6 +6610,15 @@ let sha512 = "+IW9pACdk3XWmmTXG8m3upGUJst5XRGzxMRjXzAuJ1XnIFNvfhjjIuYkDvysnPQ7qzqVzLt78BCruntqRhWQbA=="; }; }; + "oracledb-5.5.0" = { + name = "oracledb"; + packageName = "oracledb"; + version = "5.5.0"; + src = fetchurl { + url = "https://registry.npmjs.org/oracledb/-/oracledb-5.5.0.tgz"; + sha512 = "i5cPvMENpZP8nnqptB6l0pjiOyySj1IISkbM4Hr3yZEDdANo2eezarwZb9NQ8fTh5pRjmgpZdSyIbnn9N3AENw=="; + }; + }; "ordered-read-streams-1.0.1" = { name = "ordered-read-streams"; packageName = "ordered-read-streams"; @@ -5701,6 +6682,15 @@ let sha512 = "y3b8Kpd8OAN444hxfBbFfj1FY/RjtTd8tzYwhUqNYXx0fXx2iX4maP4Qr6qhIKbQXI02wTLAda4fYUbDagTUFw=="; }; }; + "p-map-4.0.0" = { + name = "p-map"; + packageName = "p-map"; + version = "4.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/p-map/-/p-map-4.0.0.tgz"; + sha512 = "/bjOqmgETBYB5BoEeGVea8dmvHb2m9GLy1E9W43yeyfP6QQCZGFNa+XRceJEuDB6zqr+gKpIAmlLebMpykw/MQ=="; + }; + }; "p-timeout-3.2.0" = { name = "p-timeout"; packageName = "p-timeout"; @@ -5746,6 +6736,15 @@ let sha512 = "RXlj7zCYokReqWpOPH9oYivUzLYZ5vAPIfEmCTNViosC78F8F0H9y7T7gG2M39ymgutxF5gcFEsyZQSph9Bp3A=="; }; }; + "parchment-2.0.0-dev.2" = { + name = "parchment"; + packageName = "parchment"; + version = "2.0.0-dev.2"; + src = fetchurl { + url = "https://registry.npmjs.org/parchment/-/parchment-2.0.0-dev.2.tgz"; + sha512 = "4fgRny4pPISoML08Zp7poi52Dff3E2G1ORTi2D/acJ/RiROdDAMDB6VcQNfBcmehrX5Wixp6dxh6JjLyE5yUNQ=="; + }; + }; "parse-github-url-1.0.2" = { name = "parse-github-url"; packageName = "parse-github-url"; @@ -6007,6 +7006,15 @@ let sha512 = "r5o/V/ORTA6TmUnyWZR9nCj1klXCO2CEKNRlVuJptZe85QuhFayC7WeMic7ndayT5IRIR0S0xFxFi2ousartlQ=="; }; }; + "pg-cursor-2.7.4" = { + name = "pg-cursor"; + packageName = "pg-cursor"; + version = "2.7.4"; + src = fetchurl { + url = "https://registry.npmjs.org/pg-cursor/-/pg-cursor-2.7.4.tgz"; + sha512 = "CNWwOzTTZ9QvphoOL+Wg/7pmVr9GnAWBjPbuK2FRclrB4A/WRO/ssCJ9BlkzIGmmofK2M/LyokNHgsLSn+fMHA=="; + }; + }; "pg-int8-1.0.1" = { name = "pg-int8"; packageName = "pg-int8"; @@ -6025,6 +7033,15 @@ let sha512 = "1KdmFGGTP6jplJoI8MfvRlfvMiyBivMRP7/ffh4a11RUFJ7kC2J0ZHlipoKiH/1hz+DVgceon9U2qbaHpPeyPg=="; }; }; + "pg-native-3.0.1" = { + name = "pg-native"; + packageName = "pg-native"; + version = "3.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/pg-native/-/pg-native-3.0.1.tgz"; + sha512 = "LBVNWkNh0fVx/cienARRP2y22J5OpUsKBe0TpxzAx3arEUUdIs77aLSAHS3scS7SMaqc+OkG40CEu5fN0/cjIw=="; + }; + }; "pg-pool-3.5.2" = { name = "pg-pool"; packageName = "pg-pool"; @@ -6052,6 +7069,24 @@ let sha512 = "muRttij7H8TqRNu/DxrAJQITO4Ac7RmX3Klyr/9mJEOBeIpgnF8f9jAfRz5d3XwQZl5qBjF9gLsUtMPJE0vezQ=="; }; }; + "pg-query-stream-4.2.4" = { + name = "pg-query-stream"; + packageName = "pg-query-stream"; + version = "4.2.4"; + src = fetchurl { + url = "https://registry.npmjs.org/pg-query-stream/-/pg-query-stream-4.2.4.tgz"; + sha512 = "Et3gTrWn4C2rj4LVioNq1QDd7aH/3mSJcBm79jZALv3wopvx9bWENtbOYZbHQ6KM+IkfFxs0JF1ZLjMDJ9/N6Q=="; + }; + }; + "pg-types-1.13.0" = { + name = "pg-types"; + packageName = "pg-types"; + version = "1.13.0"; + src = fetchurl { + url = "https://registry.npmjs.org/pg-types/-/pg-types-1.13.0.tgz"; + sha512 = "lfKli0Gkl/+za/+b6lzENajczwZHc7D5kiUCZfgm914jipD2kIOIvEkAhZ8GrW3/TUoP9w8FHjwpPObBye5KQQ=="; + }; + }; "pg-types-2.2.0" = { name = "pg-types"; packageName = "pg-types"; @@ -6151,13 +7186,22 @@ let sha512 = "epKaq3TTfTzXcxBxjpoKYMcTTcAX8Rykus6QZu77XNhJuRHSRxMd+JJrbX/3PFI0opFGSN0BabbAYCbGxbu0mA=="; }; }; - "postcss-8.4.16" = { + "postcss-8.4.17" = { name = "postcss"; packageName = "postcss"; - version = "8.4.16"; + version = "8.4.17"; + src = fetchurl { + url = "https://registry.npmjs.org/postcss/-/postcss-8.4.17.tgz"; + sha512 = "UNxNOLQydcOFi41yHNMcKRZ39NeXlr8AxGuZJsdub8vIb12fHzcq37DTU/QtbI6WLxNg2gF9Z+8qtRwTj1UI1Q=="; + }; + }; + "postgres-array-1.0.3" = { + name = "postgres-array"; + packageName = "postgres-array"; + version = "1.0.3"; src = fetchurl { - url = "https://registry.npmjs.org/postcss/-/postcss-8.4.16.tgz"; - sha512 = "ipHE1XBvKzm5xI7hiHCZJCSugxvsdq2mPnsq5+UF+VHCjiBvtDrlxJfMBToWaP9D5XlgNmcFGqoHmUn0EYEaRQ=="; + url = "https://registry.npmjs.org/postgres-array/-/postgres-array-1.0.3.tgz"; + sha512 = "5wClXrAP0+78mcsNX3/ithQ5exKvCyK5lr5NEEEeGwwM6NJdQgzIJBVxLvRW+huFpX92F2QnZ5CcokH0VhK2qQ=="; }; }; "postgres-array-2.0.0" = { @@ -6205,6 +7249,15 @@ let sha512 = "2+VhqiY/rKIqKIXyvemBFHbeijHE25sP7eKltnqcFqAssUE6+sX6vusN9A4luzToOqHQkUZexiCKxvuGagh7JA=="; }; }; + "prebuild-install-7.1.1" = { + name = "prebuild-install"; + packageName = "prebuild-install"; + version = "7.1.1"; + src = fetchurl { + url = "https://registry.npmjs.org/prebuild-install/-/prebuild-install-7.1.1.tgz"; + sha512 = "jAXscXWMcCK8GgCoHOfIr0ODh5ai8mj63L2nWrjuAgXE6tDyYGnx4/8o/rCgU+B4JSyZBKbeZqzhtwtC3ovxjw=="; + }; + }; "prelude-ls-1.1.2" = { name = "prelude-ls"; packageName = "prelude-ls"; @@ -6223,6 +7276,15 @@ let sha512 = "zA2SmoLaxZyArQTOPj5LXecR+RagfPSU5Kw1qP+jkWeNlrq+eJZyY2oS68SU1Z/7/myXM4lo9716laOFAVStCQ=="; }; }; + "prismjs-1.29.0" = { + name = "prismjs"; + packageName = "prismjs"; + version = "1.29.0"; + src = fetchurl { + url = "https://registry.npmjs.org/prismjs/-/prismjs-1.29.0.tgz"; + sha512 = "Kx/1w86q/epKcmte75LNrEoT+lX8pBpavuAbvJWRXar7Hz8jrtF+e3vY751p0R8H9HdArwaCTNDDzHg/ScJK1Q=="; + }; + }; "process-0.11.10" = { name = "process"; packageName = "process"; @@ -6277,6 +7339,15 @@ let sha512 = "a84F/zM2Z0Ry/ht3nXfV6Ze7BISOQlWrct/YObrluJn8qy2LVeeQ+IJ7jD4bkmM0N2xfXYy5nurz4L1KEj+rJg=="; }; }; + "promise-inflight-1.0.1" = { + name = "promise-inflight"; + packageName = "promise-inflight"; + version = "1.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/promise-inflight/-/promise-inflight-1.0.1.tgz"; + sha512 = "6zWPyEOFaQBJYcGMHBKTKJ3u6TBsnMFOIZSa6ce1e/ZrrsOlnHRHbabMjLiBYKp+n44X9eUI6VUPaukCXHuG4g=="; + }; + }; "promise-retry-2.0.1" = { name = "promise-retry"; packageName = "promise-retry"; @@ -6403,13 +7474,13 @@ let sha512 = "UsI/mNvk25jRpGKYI38Nfbv84z48oiIWwG67DLVvjRhy8B/0aIK+5Ju5WOHgw/o9rnEmbAS00v4rgKFQeC332Q=="; }; }; - "qs-6.10.3" = { + "qs-6.11.0" = { name = "qs"; packageName = "qs"; - version = "6.10.3"; + version = "6.11.0"; src = fetchurl { - url = "https://registry.npmjs.org/qs/-/qs-6.10.3.tgz"; - sha512 = "wr7M2E0OFRfIfJZjKGieI8lBKb7fRCH4Fv5KNPEs7gJ8jadvotdsS08PzOKR7opXhZ/Xkjtt3WF9g38drmyRqQ=="; + url = "https://registry.npmjs.org/qs/-/qs-6.11.0.tgz"; + sha512 = "MvjoMCJwEarSbUYk5O+nmoSzSutSsTwF85zcHPQ9OrlFoZOYIjaqBAJIqIXjptyD5vThxGq52Xu/MaJzRkIk4Q=="; }; }; "qs-6.5.3" = { @@ -6421,6 +7492,15 @@ let sha512 = "qxXIEh4pCGfHICj1mAJQ2/2XVZkjCDTcEgfoSQxc/fYivUZxTkk7L3bDBJSoNrEzXI17oUO5Dp07ktqE5KzczA=="; }; }; + "query-string-7.1.1" = { + name = "query-string"; + packageName = "query-string"; + version = "7.1.1"; + src = fetchurl { + url = "https://registry.npmjs.org/query-string/-/query-string-7.1.1.tgz"; + sha512 = "MplouLRDHBZSG9z7fpuAAcI7aAYjDLhtsiVZsevsfaHWDS2IDdORKbSd1kWUA+V4zyva/HZoSfpwnYMMQDhb0w=="; + }; + }; "querystring-0.2.0" = { name = "querystring"; packageName = "querystring"; @@ -6448,6 +7528,33 @@ let sha512 = "NuaNSa6flKT5JaSYQzJok04JzTL1CA6aGhv5rfLW3PgqA+M2ChpZQnAC8h8i4ZFkBS8X5RqkDBHA7r4hej3K9A=="; }; }; + "quill-2.0.0-dev.4" = { + name = "quill"; + packageName = "quill"; + version = "2.0.0-dev.4"; + src = fetchurl { + url = "https://registry.npmjs.org/quill/-/quill-2.0.0-dev.4.tgz"; + sha512 = "9WmMVCEIhf3lDdhzl+i+GBDeDl0BFi65waC4Im8Y4HudEJ9kEEb1lciAz9A8pcDmLMjiMbvz84lNt/U5OBS8Vg=="; + }; + }; + "quill-autoformat-0.1.2" = { + name = "quill-autoformat"; + packageName = "quill-autoformat"; + version = "0.1.2"; + src = fetchurl { + url = "https://registry.npmjs.org/quill-autoformat/-/quill-autoformat-0.1.2.tgz"; + sha512 = "kRe2rTSmcBDg/oCxhzbjmXXOpQUl0Gak6ZCQshxek/RLvdR8o715qC0WcBRUozqaYbR6PJ+0Z/piINqlYStxWw=="; + }; + }; + "quill-delta-4.2.1" = { + name = "quill-delta"; + packageName = "quill-delta"; + version = "4.2.1"; + src = fetchurl { + url = "https://registry.npmjs.org/quill-delta/-/quill-delta-4.2.1.tgz"; + sha512 = "Y2nksOj6Q+4hizre8n0dml76vLNGK4/y86EoI1d7rv6EL1bx7DPDYRmqQMPu1UqFQO/uQuVHQ3fOmm4ZSzWrfA=="; + }; + }; "quoted-printable-1.0.1" = { name = "quoted-printable"; packageName = "quoted-printable"; @@ -6511,6 +7618,24 @@ let sha512 = "qqJBtEyVgS0ZmPGdCFPWJ3FreoqvG4MVQln/kCgF7Olq95IbOp0/BWyMwbdtn4VTvkM8Y7khCQ2Xgk/tcrCXig=="; }; }; + "rc-1.2.8" = { + name = "rc"; + packageName = "rc"; + version = "1.2.8"; + src = fetchurl { + url = "https://registry.npmjs.org/rc/-/rc-1.2.8.tgz"; + sha512 = "y3bGgqKj3QBdxLbLkomlohkvsA8gdAiUQlSBJnBhfn+BPxg4bc62d8TcBW15wavDfgexCgccckhcZvywyQYPOw=="; + }; + }; + "readable-stream-1.0.31" = { + name = "readable-stream"; + packageName = "readable-stream"; + version = "1.0.31"; + src = fetchurl { + url = "https://registry.npmjs.org/readable-stream/-/readable-stream-1.0.31.tgz"; + sha512 = "tco/Dwv1f/sgIgN6CWdj/restacPKNskK6yps1981ivH2ZmLYcs5o5rVzL3qaO/cSkhN8hYOMWs7+glzOLSgRg=="; + }; + }; "readable-stream-1.1.14" = { name = "readable-stream"; packageName = "readable-stream"; @@ -6700,6 +7825,15 @@ let sha512 = "wcW+sIUiWnKgNY0dqCpOZkUbF/I+YPi+f09JZIDa39Ec+q82CpSYniDp+ISgTTbKmnpJWASeJBPZmoxH84wt3g=="; }; }; + "require-at-1.0.6" = { + name = "require-at"; + packageName = "require-at"; + version = "1.0.6"; + src = fetchurl { + url = "https://registry.npmjs.org/require-at/-/require-at-1.0.6.tgz"; + sha512 = "7i1auJbMUrXEAZCOQ0VNJgmcT2VOKPRl2YGJwgpHpC9CE91Mv4/4UYIUm4chGJaI381ZDq1JUicFii64Hapd8g=="; + }; + }; "require-directory-2.1.1" = { name = "require-directory"; packageName = "require-directory"; @@ -6862,6 +7996,15 @@ let sha512 = "rp3So07KcdmmKbGvgaNxQSJr7bGVSVk5S9Eq1F+ppbRo70+YeaDxkw5Dd8NPN+GD6bjnYm2VuPuCXmpuYvmCXQ=="; }; }; + "safe-regex-test-1.0.0" = { + name = "safe-regex-test"; + packageName = "safe-regex-test"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/safe-regex-test/-/safe-regex-test-1.0.0.tgz"; + sha512 = "JBUUzyOgEwXQY1NuPtvcj/qcBDbDmEvWufhlnXZIm75DEHp+afM1r1ujJpJsV/gSM4t59tpDyPi1sd6ZaPFfsA=="; + }; + }; "safe-stable-stringify-2.4.0" = { name = "safe-stable-stringify"; packageName = "safe-stable-stringify"; @@ -6961,13 +8104,13 @@ let sha512 = "b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw=="; }; }; - "semver-7.3.7" = { + "semver-7.3.8" = { name = "semver"; packageName = "semver"; - version = "7.3.7"; + version = "7.3.8"; src = fetchurl { - url = "https://registry.npmjs.org/semver/-/semver-7.3.7.tgz"; - sha512 = "QlYTucUYOews+WeEujDoEGziz4K6c47V/Bd+LjSSYcA94p+DmINdf7ncaUinThfvZyu13lN9OY1XDxt8C0Tw0g=="; + url = "https://registry.npmjs.org/semver/-/semver-7.3.8.tgz"; + sha512 = "NB1ctGL5rlHrPJtFDVIVzTyQylMLu9N9VICA6HSFJo8MCGVTMW6gfpicwKmmK/dAjTOrqu5l63JJOpDSrAis3A=="; }; }; "send-0.18.0" = { @@ -7123,6 +8266,24 @@ let sha512 = "wnD2ZE+l+SPC/uoS0vXeE9L1+0wuaMqKlfz9AMUo38JsyLSBWSFcHR1Rri62LZc12vLr1gb3jl7iwQhgwpAbGQ=="; }; }; + "simple-concat-1.0.1" = { + name = "simple-concat"; + packageName = "simple-concat"; + version = "1.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/simple-concat/-/simple-concat-1.0.1.tgz"; + sha512 = "cSFtAPtRhljv69IK0hTVZQ+OfE9nePi/rtJmw5UjHeVyVroEqJXP1sFztKUy1qU+xvz3u/sfYJLa947b7nAN2Q=="; + }; + }; + "simple-get-4.0.1" = { + name = "simple-get"; + packageName = "simple-get"; + version = "4.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/simple-get/-/simple-get-4.0.1.tgz"; + sha512 = "brv7p5WgH0jmQJr1ZDDfKDOSeWWg+OVypG99A/5vYGPqJ6pxiaHLy8nxtFjBA7oMa01ebA9gfh1uMCFqOuXxvA=="; + }; + }; "simple-git-3.14.1" = { name = "simple-git"; packageName = "simple-git"; @@ -7177,22 +8338,22 @@ let sha512 = "LAOh4z89bGQvl9pFfNF8V146i7o7/CqFPbqzYgP+yYzDIDeS9HaNFtXABamRW+AQzEVODcvE79ljJ+8a9YSdMg=="; }; }; - "snowflake-sdk-1.6.13" = { + "snowflake-sdk-1.6.14" = { name = "snowflake-sdk"; packageName = "snowflake-sdk"; - version = "1.6.13"; + version = "1.6.14"; src = fetchurl { - url = "https://registry.npmjs.org/snowflake-sdk/-/snowflake-sdk-1.6.13.tgz"; - sha512 = "X/eiT4v/yw6+aLdEJK85te4lvkB45lkTzad2CtJdofzxWqtfi1CB2hafTJTfXoDKKJTxLTyYVo+zIYhvhcEarA=="; + url = "https://registry.npmjs.org/snowflake-sdk/-/snowflake-sdk-1.6.14.tgz"; + sha512 = "sKg17Yz1/aydKxlA4unlprH+uw9ZsvRezdUmamLjNlvsXQsw+pok4PoMeCKtWs2OSVFnX0VO3eSacCPglQrAQA=="; }; }; - "socks-2.7.0" = { + "socks-2.7.1" = { name = "socks"; packageName = "socks"; - version = "2.7.0"; + version = "2.7.1"; src = fetchurl { - url = "https://registry.npmjs.org/socks/-/socks-2.7.0.tgz"; - sha512 = "scnOe9y4VuiNUULJN72GrM26BNOjVsfPXI+j+98PkyEfsIXroa5ofyjT+FzGvn/xHs73U2JtoBYAVx9Hl4quSA=="; + url = "https://registry.npmjs.org/socks/-/socks-2.7.1.tgz"; + sha512 = "7maUZy1N7uo6+WVEX6psASxtNlKaNVMlGQKkG/63nEDdLOWNbiUMoLK7X4uYoLhQstau72mLgfEWcXcwsaHbYQ=="; }; }; "socks-proxy-agent-5.0.1" = { @@ -7204,6 +8365,15 @@ let sha512 = "vZdmnjb9a2Tz6WEQVIurybSwElwPxMZaIc7PzqbJTrezcKNznv6giT7J7tZDZ1BojVaa1jvO/UiUdhDVB0ACoQ=="; }; }; + "socks-proxy-agent-6.2.1" = { + name = "socks-proxy-agent"; + packageName = "socks-proxy-agent"; + version = "6.2.1"; + src = fetchurl { + url = "https://registry.npmjs.org/socks-proxy-agent/-/socks-proxy-agent-6.2.1.tgz"; + sha512 = "a6KW9G+6B3nWZ1yB8G7pJwL3ggLy1uTzKAgCb7ttblwqdz9fMGJUuTy3uFzEP48FAs9FLILlmzDlE2JJhVQaXQ=="; + }; + }; "source-map-0.6.1" = { name = "source-map"; packageName = "source-map"; @@ -7231,6 +8401,15 @@ let sha512 = "9srjJM7NaymrpwMHvSmpDeIK5GoRMX/Tq0E8aOlDPS54dDnDUIp30DrP9SphMPEETDLzEM9+4qo+KipmbtPecg=="; }; }; + "split-on-first-1.1.0" = { + name = "split-on-first"; + packageName = "split-on-first"; + version = "1.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/split-on-first/-/split-on-first-1.1.0.tgz"; + sha512 = "43ZssAJaMusuKWL8sKUBQXHWOpq8d6CfN/u1p4gUzfJkM05C8rxTmYrkIPTXapZpORA6LkkzcUulJ8FqA7Uudw=="; + }; + }; "split2-3.2.2" = { name = "split2"; packageName = "split2"; @@ -7267,13 +8446,22 @@ let sha512 = "VE0SOVEHCk7Qc8ulkWw3ntAzXuqf7S2lvwQaDLRnUeIEaKNQJzV6BwmLKhOqT61aGhfUMrXeaBk+oDGCzvhcug=="; }; }; - "sqlite3-5.1.1" = { + "sql.js-1.8.0" = { + name = "sql.js"; + packageName = "sql.js"; + version = "1.8.0"; + src = fetchurl { + url = "https://registry.npmjs.org/sql.js/-/sql.js-1.8.0.tgz"; + sha512 = "3HD8pSkZL+5YvYUI8nlvNILs61ALqq34xgmF+BHpqxe68yZIJ1H+sIVIODvni25+CcxHUxDyrTJUL0lE/m7afw=="; + }; + }; + "sqlite3-5.1.2" = { name = "sqlite3"; packageName = "sqlite3"; - version = "5.1.1"; + version = "5.1.2"; src = fetchurl { - url = "https://registry.npmjs.org/sqlite3/-/sqlite3-5.1.1.tgz"; - sha512 = "mMinkrQr/LKJqFiFF+AF7imPSzRCCpTCreusZO3D/ssJHVjZOrbu2Caz+zPH5KTmGGXBxXMGSRDssL+44CLxvg=="; + url = "https://registry.npmjs.org/sqlite3/-/sqlite3-5.1.2.tgz"; + sha512 = "D0Reg6pRWAFXFUnZKsszCI67tthFD8fGPewRddDCX6w4cYwz3MbvuwRICbL+YQjBAh9zbw+lJ/V9oC8nG5j6eg=="; }; }; "sqlstring-2.3.3" = { @@ -7330,6 +8518,15 @@ let sha512 = "/9HIEs1ZXGhSPE8X6Ccm7Nam1z8KcoCqPdI7ecm1N33EzAetWahvQWVqLZtaZQ+IDKX4IyA2o0gBzqIMkAagHQ=="; }; }; + "ssri-8.0.1" = { + name = "ssri"; + packageName = "ssri"; + version = "8.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/ssri/-/ssri-8.0.1.tgz"; + sha512 = "97qShzy1AiyxvPNIkLWoGua7xoQzzPjQ0HAH4B0rWKo7SZ6USuPcrUiAFrws0UH8RrbWmgq3LMTObhPIHbbBeQ=="; + }; + }; "stack-trace-0.0.10" = { name = "stack-trace"; packageName = "stack-trace"; @@ -7348,6 +8545,15 @@ let sha512 = "qoRRSyROncaz1z0mvYqIE4lCd9p2R90i6GxW3uZv5ucSu8tU7B5HXUP1gG8pVZsYNVaXjk8ClXHPttLyxAL48A=="; }; }; + "static-eval-2.0.2" = { + name = "static-eval"; + packageName = "static-eval"; + version = "2.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/static-eval/-/static-eval-2.0.2.tgz"; + sha512 = "N/D219Hcr2bPjLxPiV+TQE++Tsmrady7TqAJugLy7Xk1EumfDWS/f5dtBbkRCGE7wKKXuYockQoj8Rm2/pVKyg=="; + }; + }; "statuses-1.5.0" = { name = "statuses"; packageName = "statuses"; @@ -7402,6 +8608,15 @@ let sha512 = "Mcc5wHehp9aXz1ax6bZUyY5afg9u2rv5cqQI3mRrYkGC8rW2hM02jWuwjtL++LS5qinSyhj2QfLyNsuc+VsExg=="; }; }; + "strict-uri-encode-2.0.0" = { + name = "strict-uri-encode"; + packageName = "strict-uri-encode"; + version = "2.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/strict-uri-encode/-/strict-uri-encode-2.0.0.tgz"; + sha512 = "QwiXZgpRcKkhTj2Scnn++4PKtWsH0kpzZ62L2R6c/LUVYv7hVnZqcg2+sMuT6R7Jusu1vviK/MFsu6kNJfWlEQ=="; + }; + }; "string-similarity-4.0.4" = { name = "string-similarity"; packageName = "string-similarity"; @@ -7420,6 +8635,15 @@ let sha512 = "wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g=="; }; }; + "string.prototype.startswith-1.0.0" = { + name = "string.prototype.startswith"; + packageName = "string.prototype.startswith"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/string.prototype.startswith/-/string.prototype.startswith-1.0.0.tgz"; + sha512 = "VHhsDkuf8gsw4JNRK9cIZjYe6r7PsVUutVohaBhqYAoPaRADoQH+mMgUg7Cs/TgQeDGEvI+PzPEMOdvdsCMvpg=="; + }; + }; "string.prototype.trimend-1.0.5" = { name = "string.prototype.trimend"; packageName = "string.prototype.trimend"; @@ -7465,6 +8689,15 @@ let sha512 = "Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A=="; }; }; + "strip-json-comments-2.0.1" = { + name = "strip-json-comments"; + packageName = "strip-json-comments"; + version = "2.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/strip-json-comments/-/strip-json-comments-2.0.1.tgz"; + sha512 = "4gB8na07fecVVkOI6Rs4e7T6NOTki5EmL7TUduTs6bu3EdnSycntVJ4re8kgZA+wx9IueI2Y11bfbgwtzuE0KQ=="; + }; + }; "strtok3-6.3.0" = { name = "strtok3"; packageName = "strtok3"; @@ -7510,13 +8743,13 @@ let sha512 = "ot0WnXS9fgdkgIcePe6RHNk1WA8+muPa6cSjeR3V8K27q9BB1rTE3R1p7Hv0z1ZyAc8s6Vvv8DIyWf681MAt0w=="; }; }; - "swagger-ui-dist-4.14.0" = { + "swagger-ui-dist-4.14.2" = { name = "swagger-ui-dist"; packageName = "swagger-ui-dist"; - version = "4.14.0"; + version = "4.14.2"; src = fetchurl { - url = "https://registry.npmjs.org/swagger-ui-dist/-/swagger-ui-dist-4.14.0.tgz"; - sha512 = "TBzhheU15s+o54Cgk9qxuYcZMiqSm/SkvKnapoGHOF66kz0Y5aGjpzj5BT/vpBbn6rTPJ9tUYXQxuDWfsjiGMw=="; + url = "https://registry.npmjs.org/swagger-ui-dist/-/swagger-ui-dist-4.14.2.tgz"; + sha512 = "kOIU7Ts3TrXDLb3/c9jRe4qGp8O3bRT19FFJA8wJfrRFkcK/4atPn3krhtBVJ57ZkNNofworXHxuYwmaisXBdg=="; }; }; "swagger-ui-express-4.5.0" = { @@ -7537,6 +8770,33 @@ let sha512 = "an/KZQzQUkZCkuoAA64hM92X0Urb6VpRhAFllDzz44U2mcD5scmT3zBc4VgVpkugF580+DQn8eAFSyoQt0tznA=="; }; }; + "tar-fs-2.1.1" = { + name = "tar-fs"; + packageName = "tar-fs"; + version = "2.1.1"; + src = fetchurl { + url = "https://registry.npmjs.org/tar-fs/-/tar-fs-2.1.1.tgz"; + sha512 = "V0r2Y9scmbDRLCNex/+hYzvp/zyYjvFbHPNgVTKfQvVrb6guiE/fxP+XblDNR011utopbkex2nM4dHNV6GDsng=="; + }; + }; + "tar-stream-2.2.0" = { + name = "tar-stream"; + packageName = "tar-stream"; + version = "2.2.0"; + src = fetchurl { + url = "https://registry.npmjs.org/tar-stream/-/tar-stream-2.2.0.tgz"; + sha512 = "ujeqbceABgwMZxEJnk2HDY2DlnUZ+9oEcb1KzTVfYHio0UE6dG71n60d8D2I4qNvleWrrXpmjpt7vZeF1LnMZQ=="; + }; + }; + "tarn-1.1.5" = { + name = "tarn"; + packageName = "tarn"; + version = "1.1.5"; + src = fetchurl { + url = "https://registry.npmjs.org/tarn/-/tarn-1.1.5.tgz"; + sha512 = "PMtJ3HCLAZeedWjJPgGnCvcphbCOMbtZpjKgLq3qM5Qq9aQud+XHrL0WlrlgnTyS8U+jrjGbEXprFcQrxPy52g=="; + }; + }; "tarn-3.0.2" = { name = "tarn"; packageName = "tarn"; @@ -7564,6 +8824,15 @@ let sha512 = "d3qlmZcvZyt7akyPHiOdR+knfzObWZH3mW+gouQTSb7YTSwtpHuYHcvsQabfbY7oOvgbs51xRb7CwOahWK/t9w=="; }; }; + "tedious-6.7.1" = { + name = "tedious"; + packageName = "tedious"; + version = "6.7.1"; + src = fetchurl { + url = "https://registry.npmjs.org/tedious/-/tedious-6.7.1.tgz"; + sha512 = "61eg/mvUa5vIqZcRizcqw/82dY65kR2uTll1TaUFh0aJ45XOrgbc8axiVR48dva8BahIAlJByaHNfAJ/KmPV0g=="; + }; + }; "test-console-2.0.0" = { name = "test-console"; packageName = "test-console"; @@ -7906,6 +9175,15 @@ let sha512 = "c0rCO8VMJ3ER7JQ73xfk0zDnVv0WDjpsP6Q1m6CVKul7DB9iVdWLRjPzc8v2eaeBuomsbZ2+gTaYr8k1gm3bYA=="; }; }; + "typeorm-aurora-data-api-driver-2.4.4" = { + name = "typeorm-aurora-data-api-driver"; + packageName = "typeorm-aurora-data-api-driver"; + version = "2.4.4"; + src = fetchurl { + url = "https://registry.npmjs.org/typeorm-aurora-data-api-driver/-/typeorm-aurora-data-api-driver-2.4.4.tgz"; + sha512 = "EqrdoXr0FbUrAMmkNQQuPwlhUGM7SJnpwUlWTWNlK2mOhOUyM+33fhm1f1hz3nnJJV8fTxzS3kTDq6pkVASLAw=="; + }; + }; "uc.micro-1.0.6" = { name = "uc.micro"; packageName = "uc.micro"; @@ -7942,6 +9220,15 @@ let sha512 = "eXL4nmJT7oCpkZsHZUOJo8hcX3GbsiDOa0Qu9F646fi8dT3XuSVopVqAcEiVzSKKH7UoDti23wNX3qGFxcW5Qg=="; }; }; + "underscore-1.12.1" = { + name = "underscore"; + packageName = "underscore"; + version = "1.12.1"; + src = fetchurl { + url = "https://registry.npmjs.org/underscore/-/underscore-1.12.1.tgz"; + sha512 = "hEQt0+ZLDVUMhebKxL4x1BTtDY7bavVofhZ9KZ4aI26X9SRaE+Y3m83XUL1UP2jn8ynjndwCCpEHdUG+9pP1Tw=="; + }; + }; "unescape-1.0.1" = { name = "unescape"; packageName = "unescape"; @@ -7951,6 +9238,24 @@ let sha512 = "O0+af1Gs50lyH1nUu3ZyYS1cRh01Q/kUKatTOkSs7jukXE6/NebucDVxyiDsA9AQ4JC1V1jUH9EO8JX2nMDgGQ=="; }; }; + "unique-filename-1.1.1" = { + name = "unique-filename"; + packageName = "unique-filename"; + version = "1.1.1"; + src = fetchurl { + url = "https://registry.npmjs.org/unique-filename/-/unique-filename-1.1.1.tgz"; + sha512 = "Vmp0jIp2ln35UTXuryvjzkjGdRyf9b2lTXuSYUiPmzRcl3FDtYqAwOnTJkAngD9SWhnoJzDbTKwaOrZ+STtxNQ=="; + }; + }; + "unique-slug-2.0.2" = { + name = "unique-slug"; + packageName = "unique-slug"; + version = "2.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/unique-slug/-/unique-slug-2.0.2.tgz"; + sha512 = "zoWr9ObaxALD3DOPfjPSqxt4fnZiWblxHIgeWqW8x7UqDzEtHEQLzji2cuJYQFCU6KmoJikOYAZlrTHHebjx2w=="; + }; + }; "unique-stream-2.3.1" = { name = "unique-stream"; packageName = "unique-stream"; @@ -8041,13 +9346,22 @@ let sha512 = "WypcfiRhfeUP9vvF0j6rw0J3hrWrw6iZv3+22h6iRMJ/8z1Tj6XfLP4DsUix5MhMPnXpiHDoKyoZ/bdCkwBCiQ=="; }; }; - "urllib-2.38.1" = { + "urllib-2.39.1" = { name = "urllib"; packageName = "urllib"; - version = "2.38.1"; + version = "2.39.1"; + src = fetchurl { + url = "https://registry.npmjs.org/urllib/-/urllib-2.39.1.tgz"; + sha512 = "c3sLtY8uhc/WoyJt/nNcEwO4fFC9sFYMQmU5NKoUz9OqUYrPSbYFPflocZCA5oCTavky9weK+YA2EHjsva9AwQ=="; + }; + }; + "utf-8-validate-5.0.9" = { + name = "utf-8-validate"; + packageName = "utf-8-validate"; + version = "5.0.9"; src = fetchurl { - url = "https://registry.npmjs.org/urllib/-/urllib-2.38.1.tgz"; - sha512 = "1tvjdL74oT9aV4X+SIjE1BXyes5PbfhHKhK4IlhoKhKqk4nD5/lXE90v10WZ02kELWIPI4w7ADneEQ4i7dPjiQ=="; + url = "https://registry.npmjs.org/utf-8-validate/-/utf-8-validate-5.0.9.tgz"; + sha512 = "Yek7dAy0v3Kl0orwMlvi7TPtiCNrdfHNd7Gcc/pLq4BLXqfAmd0J7OWMizUQnTTJsyjKn02mU7anqwfmUP4J8Q=="; }; }; "utf7-1.0.2" = { @@ -8203,13 +9517,22 @@ let sha512 = "PFG8iJRSjvvBdisowQ7iVF580DXb1uCIiGaXgm7tynMR1uTBlv7UJlB1zdv5KJ+Tmq1f0Upnj3fayoEOPpCBKg=="; }; }; - "vue-2.7.10" = { + "vue-2.6.14" = { name = "vue"; packageName = "vue"; - version = "2.7.10"; + version = "2.6.14"; + src = fetchurl { + url = "https://registry.npmjs.org/vue/-/vue-2.6.14.tgz"; + sha512 = "x2284lgYvjOMj3Za7kqzRcUSxBboHqtgRE2zlos1qWaOye5yUmHn42LB1250NJBLRwEcdrB0JRwyPTEPhfQjiQ=="; + }; + }; + "vue-agile-2.0.0" = { + name = "vue-agile"; + packageName = "vue-agile"; + version = "2.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/vue/-/vue-2.7.10.tgz"; - sha512 = "HmFC70qarSHPXcKtW8U8fgIkF6JGvjEmDiVInTkKZP0gIlEPhlVlcJJLkdGIDiNkIeA2zJPQTWJUI4iWe+AVfg=="; + url = "https://registry.npmjs.org/vue-agile/-/vue-agile-2.0.0.tgz"; + sha512 = "5xkSLJQNRdQ7qpEnXj5FgLg33XKRHaTZKGP5qkvteOc/uGJX89MYCjPSgdNqJ1GYFGfdGAp0jvhihW8OMuXS3g=="; }; }; "vue-color-2.8.1" = { @@ -8239,6 +9562,51 @@ let sha512 = "QVzn7u2WVH8F7eSKIM00lujC7x1mnuGPaTnDTmB01Hd709jDtB9kYtBqM+MWmp5AJRx3gnqAdZbee9MelqwFBg=="; }; }; + "vue-json-pretty-1.9.2" = { + name = "vue-json-pretty"; + packageName = "vue-json-pretty"; + version = "1.9.2"; + src = fetchurl { + url = "https://registry.npmjs.org/vue-json-pretty/-/vue-json-pretty-1.9.2.tgz"; + sha512 = "FHAYmZAazhVC6Wi+Zi9DVYha+oZb9uylJPGkl/yTYLxlqLMxmnaVC2R8ZwaYzt6TBGvkLe3Y2D2vgyJCDBJy1w=="; + }; + }; + "vue-prism-editor-0.3.0" = { + name = "vue-prism-editor"; + packageName = "vue-prism-editor"; + version = "0.3.0"; + src = fetchurl { + url = "https://registry.npmjs.org/vue-prism-editor/-/vue-prism-editor-0.3.0.tgz"; + sha512 = "yNSuwql/xHMJrWghn/OhZ5WPBKdhx7FkvFjgq2uDm99jHSJhuGwhcgPyuoGzpm6w8DRDzi85lgerKCu8DTDWWg=="; + }; + }; + "vue-router-3.6.5" = { + name = "vue-router"; + packageName = "vue-router"; + version = "3.6.5"; + src = fetchurl { + url = "https://registry.npmjs.org/vue-router/-/vue-router-3.6.5.tgz"; + sha512 = "VYXZQLtjuvKxxcshuRAwjHnciqZVoXAjTjcqBTz4rKc8qih9g9pI3hbDjmqXaHdgL3v8pV6P8Z335XvHzESxLQ=="; + }; + }; + "vue-template-compiler-2.6.14" = { + name = "vue-template-compiler"; + packageName = "vue-template-compiler"; + version = "2.6.14"; + src = fetchurl { + url = "https://registry.npmjs.org/vue-template-compiler/-/vue-template-compiler-2.6.14.tgz"; + sha512 = "ODQS1SyMbjKoO1JBJZojSw6FE4qnh9rIpUZn2EUT86FKizx9uH5z6uXiIrm4/Nb/gwxTi/o17ZDEGWAXHvtC7g=="; + }; + }; + "vue-typed-mixins-0.2.0" = { + name = "vue-typed-mixins"; + packageName = "vue-typed-mixins"; + version = "0.2.0"; + src = fetchurl { + url = "https://registry.npmjs.org/vue-typed-mixins/-/vue-typed-mixins-0.2.0.tgz"; + sha512 = "0OxuinandPWv3nm5k/reYkuKtX3jjPZ40Sy9roJz0ih8PUzmI7zSRiXFEJ62LsyRegw9Tqy+qMkajk7ipKP8Vg=="; + }; + }; "vue2-boring-avatars-0.3.4" = { name = "vue2-boring-avatars"; packageName = "vue2-boring-avatars"; @@ -8257,6 +9625,24 @@ let sha512 = "hbY/Q0x8qXGFxo6h4KU4YYesUcN+uUjliqqC0PoNSgpcbS2QRb3qXi+7XMTgLYs0a8i7o1H6Mu43UV4Vbgkhgw=="; }; }; + "vue2-touch-events-3.2.2" = { + name = "vue2-touch-events"; + packageName = "vue2-touch-events"; + version = "3.2.2"; + src = fetchurl { + url = "https://registry.npmjs.org/vue2-touch-events/-/vue2-touch-events-3.2.2.tgz"; + sha512 = "rGV8jxgOQEJYkJCp7uOBe3hjvmG1arThrq1wGtJHwJTgi65+P2a+0l4CYcQO/U1ZFqTq2/TT2+oTE6H7Y+6Eog=="; + }; + }; + "vuex-3.6.2" = { + name = "vuex"; + packageName = "vuex"; + version = "3.6.2"; + src = fetchurl { + url = "https://registry.npmjs.org/vuex/-/vuex-3.6.2.tgz"; + sha512 = "ETW44IqCgBpVomy520DT5jf8n0zoCac+sxWnn+hMe/CzaSejb/eVw2YToiXYX+Ex/AuHHia28vWTq4goAexFbw=="; + }; + }; "webidl-conversions-3.0.1" = { name = "webidl-conversions"; packageName = "webidl-conversions"; @@ -8302,6 +9688,15 @@ let sha512 = "HxJdYWq1MTIQbJ3nw0cqssHoTNU267KlrDuGZ1WYlxDStUtKUhOaJmh112/TZmHxxUfuJqPXSOm7tDyas0OSIQ=="; }; }; + "which-2.0.2" = { + name = "which"; + packageName = "which"; + version = "2.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/which/-/which-2.0.2.tgz"; + sha512 = "BLI3Tl1TW3Pvl70l3yq3Y64i+awpwXqsGBYWkkqMtnbXgrMD+yj7rhW0kuEDxzJaYXGjEW5ogapKNMEKNMjibA=="; + }; + }; "which-boxed-primitive-1.0.2" = { name = "which-boxed-primitive"; packageName = "which-boxed-primitive"; @@ -8311,6 +9706,15 @@ let sha512 = "bwZdv0AKLpplFY2KZRX6TvyuN7ojjr7lwkg6ml0roIy9YeuSr7JS372qlNW18UQYzgYK9ziGcerWqZOmEn9VNg=="; }; }; + "which-collection-1.0.1" = { + name = "which-collection"; + packageName = "which-collection"; + version = "1.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/which-collection/-/which-collection-1.0.1.tgz"; + sha512 = "W8xeTUwaln8i3K/cY1nGXzdnVZlidBcagyNFtBdD5kxnb4TvGKR7FfSIS3mYpwWS1QUCutfKz8IY8RjftB0+1A=="; + }; + }; "which-typed-array-1.1.8" = { name = "which-typed-array"; packageName = "which-typed-array"; @@ -8482,6 +9886,15 @@ let sha512 = "7YXTQc3P2l9+0rjaUbLwMKRhtmwg1M1eDf6nag7urC7pIPYLD9W/jmzQ4ptRSUbodw5S0jfoGTflLemQibSpeQ=="; }; }; + "xpath.js-1.1.0" = { + name = "xpath.js"; + packageName = "xpath.js"; + version = "1.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/xpath.js/-/xpath.js-1.1.0.tgz"; + sha512 = "jg+qkfS4K8E7965sqaUl8mRngXiKb3WZGfONgE18pr03FUQiuSV6G+Ej4tS55B+rIQSFEIw3phdVAQ4pPqNWfQ=="; + }; + }; "xregexp-2.0.0" = { name = "xregexp"; packageName = "xregexp"; @@ -8614,10 +10027,10 @@ in n8n = nodeEnv.buildNodePackage { name = "n8n"; packageName = "n8n"; - version = "0.194.0"; + version = "0.197.1"; src = fetchurl { - url = "https://registry.npmjs.org/n8n/-/n8n-0.194.0.tgz"; - sha512 = "xbOMzq5AuP7EbvFJQ8VNE3mQYySH1yRS/Eb2ZyBe4ae33FQyZokLEwxGXFLzV2Caf+lX7xv/7d+6cU/m1jliSQ=="; + url = "https://registry.npmjs.org/n8n/-/n8n-0.197.1.tgz"; + sha512 = "uswTJAfyDqMSBT0HZrNFFVKQ/s/FiaQl97+Pdl/MdrC74scPNSTBUrS/L2X08LR0UADO6ByPpB7uOrj+w29pdg=="; }; dependencies = [ (sources."@apidevtools/json-schema-ref-parser-9.0.9" // { @@ -8650,7 +10063,7 @@ in ]; }) sources."@azure/core-http-compat-1.3.0" - (sources."@azure/core-lro-2.3.1" // { + (sources."@azure/core-lro-2.4.0" // { dependencies = [ sources."tslib-2.4.0" ]; @@ -8672,7 +10085,7 @@ in sources."tslib-2.4.0" ]; }) - (sources."@azure/core-util-1.1.0" // { + (sources."@azure/core-util-1.1.1" // { dependencies = [ sources."tslib-2.4.0" ]; @@ -8685,7 +10098,7 @@ in sources."tslib-2.4.0" ]; }) - (sources."@azure/keyvault-keys-4.5.0" // { + (sources."@azure/keyvault-keys-4.6.0" // { dependencies = [ sources."tslib-2.4.0" ]; @@ -8695,27 +10108,47 @@ in sources."tslib-2.4.0" ]; }) - sources."@azure/msal-browser-2.28.3" - sources."@azure/msal-common-7.4.1" - sources."@azure/msal-node-1.14.0" + sources."@azure/ms-rest-azure-env-2.0.0" + (sources."@azure/ms-rest-js-2.6.2" // { + dependencies = [ + sources."form-data-2.5.1" + ]; + }) + sources."@azure/ms-rest-nodeauth-3.1.1" + sources."@azure/msal-browser-2.29.0" + sources."@azure/msal-common-7.5.0" + sources."@azure/msal-node-1.14.1" (sources."@azure/storage-blob-12.11.0" // { dependencies = [ sources."@azure/core-tracing-1.0.0-preview.13" sources."tslib-2.4.0" ]; }) - sources."@babel/parser-7.19.1" - sources."@babel/runtime-7.19.0" + sources."@babel/runtime-7.19.4" sources."@colors/colors-1.5.0" + sources."@curlconverter/yargs-0.0.2" + sources."@curlconverter/yargs-parser-0.0.1" (sources."@dabh/diagnostics-2.0.3" // { dependencies = [ sources."enabled-2.0.0" sources."kuler-2.0.0" ]; }) - sources."@fontsource/open-sans-4.5.11" - sources."@fortawesome/fontawesome-common-types-6.2.0" - sources."@fortawesome/free-regular-svg-icons-6.2.0" + sources."@fontsource/open-sans-4.5.12" + sources."@fortawesome/fontawesome-common-types-0.3.0" + sources."@fortawesome/fontawesome-svg-core-1.3.0" + (sources."@fortawesome/free-regular-svg-icons-6.2.0" // { + dependencies = [ + sources."@fortawesome/fontawesome-common-types-6.2.0" + ]; + }) + (sources."@fortawesome/free-solid-svg-icons-5.15.4" // { + dependencies = [ + sources."@fortawesome/fontawesome-common-types-0.2.36" + ]; + }) + sources."@fortawesome/vue-fontawesome-2.0.8" + sources."@gar/promisify-1.1.3" (sources."@icetee/ftp-0.3.15" // { dependencies = [ sources."isarray-0.0.1" @@ -8723,7 +10156,7 @@ in sources."string_decoder-0.10.31" ]; }) - sources."@js-joda/core-5.3.1" + sources."@js-joda/core-5.4.1" sources."@jsdevtools/ono-7.1.3" sources."@kafkajs/confluent-schema-registry-1.0.6" sources."@kwsites/file-exists-1.1.1" @@ -8733,20 +10166,26 @@ in sources."@nodelib/fs.scandir-2.1.5" sources."@nodelib/fs.stat-2.0.5" sources."@nodelib/fs.walk-1.2.8" - sources."@oclif/command-1.8.16" - (sources."@oclif/config-1.18.3" // { + sources."@npmcli/fs-1.1.1" + (sources."@npmcli/move-file-1.1.2" // { + dependencies = [ + sources."mkdirp-1.0.4" + ]; + }) + sources."@oclif/command-1.8.18" + (sources."@oclif/config-1.18.5" // { dependencies = [ sources."tslib-2.4.0" ]; }) - (sources."@oclif/core-1.16.3" // { + (sources."@oclif/core-1.16.5" // { dependencies = [ sources."supports-color-8.1.1" sources."tslib-2.4.0" sources."wrap-ansi-7.0.0" ]; }) - (sources."@oclif/errors-1.3.5" // { + (sources."@oclif/errors-1.3.6" // { dependencies = [ sources."fs-extra-8.1.0" sources."jsonfile-4.0.0" @@ -8754,14 +10193,9 @@ in sources."wrap-ansi-7.0.0" ]; }) - (sources."@oclif/help-1.0.1" // { - dependencies = [ - sources."@oclif/config-1.18.2" - sources."tslib-2.4.0" - ]; - }) + sources."@oclif/help-1.0.3" sources."@oclif/linewrap-1.0.0" - (sources."@oclif/parser-3.8.7" // { + (sources."@oclif/parser-3.8.8" // { dependencies = [ sources."tslib-2.4.0" ]; @@ -8769,6 +10203,12 @@ in sources."@oclif/screen-3.0.2" sources."@opentelemetry/api-1.2.0" sources."@rudderstack/rudder-sdk-node-1.0.6" + (sources."@sap/hana-client-2.14.18" // { + dependencies = [ + sources."debug-3.1.0" + sources."ms-2.0.0" + ]; + }) sources."@segment/loosely-validate-event-2.0.0" sources."@selderee/plugin-htmlparser2-0.6.0" sources."@servie/events-1.0.0" @@ -8784,11 +10224,12 @@ in sources."@types/express-jwt-0.0.42" sources."@types/express-serve-static-core-4.17.31" sources."@types/express-unless-0.5.3" + sources."@types/js-nacl-1.3.0" sources."@types/json-schema-7.0.11" - sources."@types/lodash-4.14.185" + sources."@types/lodash-4.14.186" sources."@types/mime-3.0.1" sources."@types/multer-1.4.7" - sources."@types/node-18.7.18" + sources."@types/node-18.8.3" (sources."@types/node-fetch-2.6.2" // { dependencies = [ sources."form-data-3.0.1" @@ -8796,20 +10237,39 @@ in }) sources."@types/qs-6.9.7" sources."@types/range-parser-1.2.4" + sources."@types/readable-stream-2.3.14" sources."@types/serve-static-1.15.0" sources."@types/tough-cookie-2.3.8" sources."@types/tunnel-0.0.3" sources."@types/webidl-conversions-7.0.0" sources."@types/whatwg-url-8.2.2" - sources."@vue/compiler-sfc-2.7.10" + sources."@xmldom/xmldom-0.7.5" + sources."a-sync-waterfall-1.0.1" sources."abbrev-1.1.1" + sources."abort-controller-3.0.0" sources."accepts-1.3.8" sources."access-control-1.0.1" sources."acorn-8.8.0" sources."acorn-walk-8.2.0" + (sources."adal-node-0.2.3" // { + dependencies = [ + sources."async-2.6.4" + sources."uuid-3.4.0" + ]; + }) sources."address-1.2.1" sources."adler-32-1.2.0" sources."agent-base-6.0.2" + (sources."agentkeepalive-4.2.1" // { + dependencies = [ + sources."depd-1.1.2" + ]; + }) + (sources."aggregate-error-3.1.0" // { + dependencies = [ + sources."clean-stack-2.2.0" + ]; + }) sources."ajv-6.12.6" (sources."amqplib-0.8.0" // { dependencies = [ @@ -8838,6 +10298,7 @@ in sources."array-series-0.1.5" sources."array-union-2.1.0" sources."array.prototype.reduce-1.0.4" + sources."asap-2.0.6" sources."asn1-0.2.6" sources."asn1.js-5.4.1" sources."asn1.js-rfc2560-5.0.1" @@ -8859,8 +10320,8 @@ in ]; }) sources."available-typed-arrays-1.0.5" - sources."avsc-5.7.5" - (sources."aws-sdk-2.1218.0" // { + sources."avsc-5.7.6" + (sources."aws-sdk-2.1231.0" // { dependencies = [ sources."buffer-4.9.2" sources."events-1.1.1" @@ -8891,10 +10352,16 @@ in }) sources."bcrypt-pbkdf-1.0.2" sources."bcryptjs-2.4.3" + sources."better-sqlite3-7.6.2" sources."big-integer-1.6.51" sources."bignumber.js-2.4.0" sources."binary-extensions-2.2.0" sources."binascii-0.0.2" + (sources."bindings-1.5.0" // { + dependencies = [ + sources."file-uri-to-path-1.0.0" + ]; + }) sources."bintrees-1.0.2" (sources."bitsyntax-0.1.0" // { dependencies = [ @@ -8910,9 +10377,10 @@ in }) sources."bluebird-3.7.2" sources."bn.js-4.12.0" - (sources."body-parser-1.20.0" // { + (sources."body-parser-1.20.1" // { dependencies = [ sources."debug-2.6.9" + sources."iconv-lite-0.4.24" sources."ms-2.0.0" ]; }) @@ -8927,10 +10395,17 @@ in sources."buffer-from-1.1.2" sources."buffer-more-ints-1.0.0" sources."buffer-writer-2.0.0" + sources."bufferutil-4.0.6" sources."bull-3.29.3" sources."busboy-1.6.0" sources."byte-length-1.0.2" sources."bytes-3.1.2" + (sources."cacache-15.3.0" // { + dependencies = [ + sources."mkdirp-1.0.4" + sources."p-map-4.0.0" + ]; + }) sources."call-bind-1.0.2" sources."call-me-maybe-1.0.1" sources."callback-stream-1.1.0" @@ -8962,7 +10437,7 @@ in sources."charenc-0.0.2" sources."cheerio-1.0.0-rc.6" sources."cheerio-select-1.6.0" - sources."chokidar-3.5.2" + sources."chokidar-3.5.3" sources."chownr-2.0.0" sources."clamp-1.0.1" sources."class-validator-0.13.2" @@ -8983,7 +10458,8 @@ in sources."wrap-ansi-7.0.0" ]; }) - sources."cluster-key-slot-1.1.0" + sources."clone-2.1.2" + sources."cluster-key-slot-1.1.1" sources."codepage-1.15.0" (sources."color-3.2.1" // { dependencies = [ @@ -9000,7 +10476,9 @@ in sources."combined-stream-1.0.8" sources."commander-5.1.0" sources."commist-1.1.0" + sources."component-props-1.1.1" sources."component-type-1.2.1" + sources."component-xor-0.0.4" sources."compressible-2.0.18" (sources."compression-1.7.4" // { dependencies = [ @@ -9026,7 +10504,7 @@ in sources."cookie-parser-1.4.6" sources."cookie-signature-1.0.6" sources."copy-to-2.0.1" - sources."core-js-3.25.2" + sources."core-js-3.25.5" sources."core-util-is-1.0.3" sources."crc-32-1.2.2" sources."cron-1.7.2" @@ -9042,11 +10520,24 @@ in sources."css-select-4.3.0" sources."css-what-6.1.0" sources."cssfilter-0.0.10" - sources."csstype-3.1.1" + sources."curlconverter-3.21.0" + sources."currency-codes-2.1.0" sources."dashdash-1.14.1" + sources."data-api-client-1.3.0" sources."data-uri-to-buffer-3.0.1" + sources."date-utils-1.2.21" + sources."dateformat-3.0.3" + sources."de-indent-1.0.2" sources."debug-4.3.4" sources."debuglog-1.0.1" + sources."decode-uri-component-0.2.0" + sources."decompress-response-6.0.0" + (sources."deep-equal-2.0.5" // { + dependencies = [ + sources."isarray-2.0.5" + ]; + }) + sources."deep-extend-0.6.0" sources."deep-is-0.1.4" sources."deepmerge-1.5.2" sources."default-user-agent-1.0.0" @@ -9068,6 +10559,7 @@ in }) sources."dir-glob-3.0.1" sources."discontinuous-range-1.0.0" + sources."dom-iterator-1.0.0" sources."dom-serializer-1.4.1" sources."domelementtype-2.3.0" sources."domhandler-4.3.1" @@ -9088,14 +10580,21 @@ in sources."emoji-regex-8.0.0" sources."enabled-1.0.2" sources."encodeurl-1.0.2" + sources."encoding-0.1.13" sources."encoding-japanese-2.0.0" sources."end-of-stream-1.4.4" sources."entities-2.2.0" + sources."env-paths-2.2.1" sources."env-variable-0.0.6" sources."err-code-2.0.3" - sources."es-abstract-1.20.2" + sources."es-abstract-1.20.4" sources."es-aggregate-error-1.0.8" sources."es-array-method-boxes-properly-1.0.0" + (sources."es-get-iterator-1.1.2" // { + dependencies = [ + sources."isarray-2.0.5" + ]; + }) sources."es-to-primitive-1.2.1" sources."es5-ext-0.8.2" sources."escalade-3.1.1" @@ -9107,11 +10606,14 @@ in sources."estraverse-4.3.0" sources."esutils-2.0.3" sources."etag-1.8.1" + sources."event-target-shim-5.0.1" + sources."eventemitter3-4.0.7" sources."events-3.3.0" sources."eventsource-2.0.2" sources."exit-on-epipe-1.0.1" + sources."expand-template-2.0.3" sources."expand-tilde-2.0.2" - (sources."express-4.18.1" // { + (sources."express-4.18.2" // { dependencies = [ sources."cookie-0.5.0" sources."debug-2.6.9" @@ -9126,20 +10628,26 @@ in }) sources."extend-3.0.2" sources."extend-shallow-2.0.1" - sources."external-editor-3.1.0" + (sources."external-editor-3.1.0" // { + dependencies = [ + sources."iconv-lite-0.4.24" + ]; + }) sources."extsprintf-1.3.0" sources."fast-deep-equal-3.1.3" + sources."fast-diff-1.2.0" sources."fast-glob-3.2.12" sources."fast-json-stable-stringify-2.1.0" sources."fast-levenshtein-2.0.6" sources."fastq-1.13.0" sources."fecha-4.2.3" - sources."fflate-0.7.3" + sources."fflate-0.7.4" (sources."figures-3.2.0" // { dependencies = [ sources."escape-string-regexp-1.0.5" ]; }) + sources."file-saver-2.0.5" sources."file-type-16.5.4" sources."file-uri-to-path-2.0.0" (sources."filelist-1.0.4" // { @@ -9148,12 +10656,14 @@ in ]; }) sources."fill-range-7.0.1" + sources."filter-obj-1.1.0" (sources."finalhandler-1.2.0" // { dependencies = [ sources."debug-2.6.9" sources."ms-2.0.0" ]; }) + sources."first-match-0.0.1" sources."flatted-3.2.7" sources."fn.name-1.1.0" sources."follow-redirects-1.15.2" @@ -9169,6 +10679,7 @@ in sources."forwarded-0.2.0" sources."frac-1.1.2" sources."fresh-0.5.2" + sources."fs-constants-1.0.0" sources."fs-extra-9.1.0" sources."fs-minipass-2.1.0" sources."fs.realpath-1.0.0" @@ -9199,6 +10710,7 @@ in ]; }) sources."getpass-0.1.7" + sources."github-from-package-0.0.0" sources."glob-7.2.3" sources."glob-parent-5.1.2" (sources."glob-stream-6.1.0" // { @@ -9209,7 +10721,7 @@ in }) sources."globalthis-1.0.3" sources."globby-11.1.0" - (sources."gm-1.24.0" // { + (sources."gm-1.25.0" // { dependencies = [ sources."cross-spawn-4.0.2" sources."debug-3.2.7" @@ -9229,6 +10741,7 @@ in sources."has-symbols-1.0.3" sources."has-tostringtag-1.0.0" sources."has-unicode-2.0.1" + sources."hdb-pool-0.1.6" sources."he-1.2.0" (sources."header-case-2.0.4" // { dependencies = [ @@ -9245,13 +10758,14 @@ in ]; }) sources."htmlparser2-6.1.0" + sources."http-cache-semantics-4.1.0" sources."http-errors-2.0.0" sources."http-proxy-agent-4.0.1" sources."http-signature-1.2.0" sources."https-proxy-agent-5.0.1" sources."humanize-ms-1.2.1" sources."hyperlinker-1.0.0" - sources."iconv-lite-0.4.24" + sources."iconv-lite-0.6.3" sources."ics-2.40.0" sources."ieee754-1.2.1" sources."ignore-5.2.0" @@ -9262,10 +10776,17 @@ in sources."string_decoder-0.10.31" ]; }) - sources."imap-simple-4.3.0" + (sources."imap-simple-4.3.0" // { + dependencies = [ + sources."iconv-lite-0.4.24" + ]; + }) + sources."imurmurhash-0.1.4" sources."indent-string-4.0.0" + sources."infer-owner-1.0.4" sources."inflight-1.0.6" sources."inherits-2.0.4" + sources."ini-1.3.8" sources."inquirer-7.3.3" sources."internal-slot-1.0.3" sources."interpret-1.4.0" @@ -9280,7 +10801,7 @@ in sources."is-binary-path-2.1.0" sources."is-boolean-object-1.1.2" sources."is-buffer-1.1.6" - sources."is-callable-1.2.6" + sources."is-callable-1.2.7" sources."is-core-module-2.10.0" sources."is-date-object-1.0.5" sources."is-docker-2.2.1" @@ -9289,6 +10810,8 @@ in sources."is-fullwidth-code-point-3.0.0" sources."is-generator-function-1.0.10" sources."is-glob-4.0.3" + sources."is-lambda-1.0.1" + sources."is-map-2.0.2" sources."is-nan-1.3.2" sources."is-negated-glob-1.0.0" sources."is-negative-zero-2.0.2" @@ -9300,6 +10823,7 @@ in sources."is-regex-1.1.4" sources."is-relative-1.0.0" sources."is-retry-allowed-2.2.0" + sources."is-set-2.0.2" sources."is-shared-array-buffer-1.0.2" sources."is-stream-2.0.1" sources."is-string-1.0.7" @@ -9307,21 +10831,26 @@ in sources."is-typed-array-1.1.9" sources."is-typedarray-1.0.0" sources."is-unc-path-1.0.0" + sources."is-weakmap-2.0.1" sources."is-weakref-1.0.2" + sources."is-weakset-2.0.2" sources."is-windows-1.0.2" sources."is-wsl-2.2.0" sources."isarray-1.0.0" - sources."isbot-3.5.3" + sources."isbot-3.6.1" sources."isexe-2.0.0" sources."iso-639-1-2.1.15" sources."isstream-0.1.2" sources."jake-10.8.5" sources."jmespath-0.16.0" sources."join-component-1.1.0" + sources."jquery-3.6.1" sources."js-md4-0.3.2" + sources."js-nacl-1.4.0" sources."js-yaml-3.14.1" sources."jsbi-4.3.0" sources."jsbn-0.1.1" + sources."jsesc-3.0.2" sources."json-diff-0.5.5" sources."json-schema-0.4.0" sources."json-schema-ref-parser-9.0.9" @@ -9329,12 +10858,18 @@ in sources."json-stable-stringify-without-jsonify-1.0.1" sources."json-stringify-safe-5.0.1" sources."jsonfile-6.1.0" + (sources."jsonpath-1.1.1" // { + dependencies = [ + sources."esprima-1.2.2" + ]; + }) sources."jsonschema-1.4.1" (sources."jsonwebtoken-8.5.1" // { dependencies = [ sources."semver-5.7.1" ]; }) + sources."jsplumb-2.15.4" sources."jsprim-1.4.2" sources."jwa-1.4.1" sources."jwks-rsa-1.12.3" @@ -9344,12 +10879,9 @@ in sources."leven-2.1.0" sources."levn-0.3.0" sources."libbase64-1.2.1" - (sources."libmime-5.1.0" // { - dependencies = [ - sources."iconv-lite-0.6.3" - ]; - }) + sources."libmime-5.1.0" sources."libphonenumber-js-1.10.13" + sources."libpq-1.8.12" sources."libqp-1.1.0" sources."limiter-1.1.5" sources."linkify-it-4.0.0" @@ -9360,7 +10892,9 @@ in }) sources."lodash-4.17.21" sources."lodash-es-4.17.21" + sources."lodash.camelcase-4.3.0" sources."lodash.clonedeep-4.5.0" + sources."lodash.debounce-4.0.8" sources."lodash.defaults-4.2.0" sources."lodash.flatten-4.4.0" sources."lodash.get-4.4.2" @@ -9376,6 +10910,8 @@ in sources."lodash.merge-4.6.2" sources."lodash.omit-4.5.0" sources."lodash.once-4.1.1" + sources."lodash.orderby-4.6.0" + sources."lodash.pick-4.4.0" sources."lodash.set-4.3.2" sources."lodash.split-4.4.2" sources."lodash.throttle-4.1.1" @@ -9401,7 +10937,6 @@ in sources."luxon-2.5.0" (sources."mailparser-3.5.0" // { dependencies = [ - sources."iconv-lite-0.6.3" sources."nodemailer-6.7.3" ]; }) @@ -9413,6 +10948,11 @@ in }) sources."make-error-1.3.6" sources."make-error-cause-2.3.0" + (sources."make-fetch-happen-9.1.0" // { + dependencies = [ + sources."socks-proxy-agent-6.2.1" + ]; + }) sources."mappersmith-2.40.0" sources."material-colors-1.2.6" sources."md5-2.3.0" @@ -9426,6 +10966,7 @@ in sources."mime-db-1.52.0" sources."mime-types-2.1.35" sources."mimic-fn-2.1.0" + sources."mimic-response-3.1.0" sources."minimalistic-assert-1.0.1" (sources."minimatch-3.1.2" // { dependencies = [ @@ -9434,8 +10975,14 @@ in }) sources."minimist-1.2.6" sources."minipass-3.3.5" + sources."minipass-collect-1.0.2" + sources."minipass-fetch-1.4.1" + sources."minipass-flush-1.0.5" + sources."minipass-pipeline-1.2.4" + sources."minipass-sized-1.0.3" sources."minizlib-2.1.2" sources."mkdirp-0.5.6" + sources."mkdirp-classic-0.5.3" (sources."mock-require-3.0.3" // { dependencies = [ sources."get-caller-file-1.0.3" @@ -9445,19 +10992,19 @@ in sources."moment-2.29.4" sources."moment-timezone-0.5.37" sources."monaco-editor-0.30.1" - (sources."mongodb-4.9.1" // { + (sources."mongodb-4.10.0" // { dependencies = [ sources."denque-2.1.0" ]; }) - (sources."mongodb-connection-string-url-2.5.3" // { + (sources."mongodb-connection-string-url-2.5.4" // { dependencies = [ sources."tr46-3.0.0" sources."webidl-conversions-7.0.0" sources."whatwg-url-11.0.0" ]; }) - sources."moo-0.5.1" + sources."moo-0.5.2" (sources."mqtt-4.2.6" // { dependencies = [ sources."concat-stream-2.0.0" @@ -9468,7 +11015,7 @@ in sources."ms-2.1.2" (sources."mssql-8.1.4" // { dependencies = [ - sources."commander-9.4.0" + sources."commander-9.4.1" ]; }) sources."multer-1.4.5-lts.1" @@ -9476,27 +11023,28 @@ in (sources."mysql2-2.3.3" // { dependencies = [ sources."denque-2.1.0" - sources."iconv-lite-0.6.3" ]; }) sources."mz-2.7.0" - sources."n8n-core-0.134.0" - sources."n8n-design-system-0.34.0" - sources."n8n-editor-ui-0.160.0" - (sources."n8n-nodes-base-0.192.0" // { + sources."n8n-core-0.137.0" + sources."n8n-design-system-0.37.0" + sources."n8n-editor-ui-0.163.1" + (sources."n8n-nodes-base-0.195.1" // { dependencies = [ - sources."iconv-lite-0.6.3" + sources."chokidar-3.5.2" ]; }) - sources."n8n-workflow-0.116.0" + sources."n8n-workflow-0.119.0" (sources."named-placeholders-1.1.2" // { dependencies = [ sources."lru-cache-4.1.5" sources."yallist-2.1.2" ]; }) + sources."nan-2.16.0" sources."nanoclone-0.2.1" sources."nanoid-3.3.4" + sources."napi-build-utils-1.0.2" sources."native-duplexpair-1.0.0" sources."natural-orderby-2.0.3" (sources."nearley-2.20.1" // { @@ -9513,24 +11061,38 @@ in sources."tslib-2.4.0" ]; }) + sources."node-abi-3.26.0" sources."node-abort-controller-3.0.1" sources."node-addon-api-4.3.0" sources."node-ensure-0.0.0" sources."node-fetch-2.6.7" + (sources."node-gyp-8.4.1" // { + dependencies = [ + sources."are-we-there-yet-3.0.1" + sources."gauge-4.0.4" + sources."npmlog-6.0.2" + sources."readable-stream-3.6.0" + sources."which-2.0.2" + ]; + }) + sources."node-gyp-build-4.5.0" sources."node-html-markdown-1.2.0" sources."node-html-parser-5.4.2" sources."node-ssh-12.0.5" sources."nodeify-1.0.1" - sources."nodemailer-6.7.8" + sources."nodemailer-6.8.0" sources."nopt-5.0.0" sources."normalize-path-3.0.0" sources."normalize-wheel-1.0.1" sources."npmlog-5.0.1" sources."nth-check-2.1.1" + sources."nub-0.0.0" + sources."nunjucks-3.2.3" sources."oauth-1.0a-2.2.6" sources."oauth-sign-0.9.0" sources."object-assign-4.1.1" sources."object-inspect-1.12.2" + sources."object-is-1.1.5" sources."object-keys-1.1.1" sources."object-treeify-1.1.33" sources."object.assign-4.1.4" @@ -9544,7 +11106,9 @@ in sources."open-7.4.2" sources."openapi-types-10.0.0" sources."openurl-1.1.1" + sources."optional-require-1.1.8" sources."optionator-0.8.3" + sources."oracledb-5.5.0" sources."ordered-read-streams-1.0.1" sources."os-name-1.0.3" sources."os-tmpdir-1.0.2" @@ -9565,6 +11129,7 @@ in sources."tslib-2.4.0" ]; }) + sources."parchment-2.0.0-dev.2" sources."parse-github-url-1.0.2" sources."parse-passwd-1.0.0" sources."parse-srcset-1.0.2" @@ -9608,11 +11173,22 @@ in sources."performance-now-2.1.0" sources."pg-8.8.0" sources."pg-connection-string-2.5.0" + sources."pg-cursor-2.7.4" sources."pg-int8-1.0.1" sources."pg-minify-1.6.2" + (sources."pg-native-3.0.1" // { + dependencies = [ + sources."isarray-0.0.1" + sources."pg-types-1.13.0" + sources."postgres-array-1.0.3" + sources."readable-stream-1.0.31" + sources."string_decoder-0.10.31" + ]; + }) sources."pg-pool-3.5.2" sources."pg-promise-10.12.0" sources."pg-protocol-1.5.0" + sources."pg-query-stream-4.2.4" sources."pg-types-2.2.0" (sources."pgpass-1.0.5" // { dependencies = [ @@ -9628,7 +11204,7 @@ in sources."popsicle-transport-http-1.2.1" sources."popsicle-transport-xhr-2.0.0" sources."popsicle-user-agent-1.0.0" - sources."postcss-8.4.16" + sources."postcss-8.4.17" sources."postgres-array-2.0.0" sources."postgres-bytea-1.0.0" sources."postgres-date-1.0.7" @@ -9639,8 +11215,10 @@ in sources."ms-2.1.3" ]; }) + sources."prebuild-install-7.1.1" sources."prelude-ls-1.1.2" sources."printj-1.1.2" + sources."prismjs-1.29.0" sources."process-0.11.10" sources."process-nextick-args-2.0.1" sources."prom-client-13.2.0" @@ -9651,6 +11229,7 @@ in ]; }) sources."promise-ftp-common-1.1.5" + sources."promise-inflight-1.0.1" sources."promise-retry-2.0.1" sources."promise.prototype.finally-3.1.3" sources."property-expr-2.0.5" @@ -9672,17 +11251,30 @@ in }) sources."punycode-2.1.1" sources."python-struct-1.1.3" - sources."qs-6.10.3" + sources."qs-6.11.0" + sources."query-string-7.1.1" sources."querystring-0.2.0" sources."querystringify-2.2.0" sources."queue-microtask-1.2.3" + sources."quill-2.0.0-dev.4" + sources."quill-autoformat-0.1.2" + (sources."quill-delta-4.2.1" // { + dependencies = [ + sources."deep-equal-1.1.1" + ]; + }) sources."quoted-printable-1.0.1" sources."railroad-diagrams-1.0.0" sources."randexp-0.4.6" sources."random-bytes-1.0.0" sources."randombytes-2.1.0" sources."range-parser-1.2.1" - sources."raw-body-2.5.1" + (sources."raw-body-2.5.1" // { + dependencies = [ + sources."iconv-lite-0.4.24" + ]; + }) + sources."rc-1.2.8" (sources."readable-stream-2.3.7" // { dependencies = [ sources."safe-buffer-5.1.2" @@ -9720,6 +11312,7 @@ in sources."tough-cookie-2.5.0" ]; }) + sources."require-at-1.0.6" sources."require-directory-2.1.1" sources."requires-port-1.0.0" sources."resize-observer-polyfill-1.5.1" @@ -9741,6 +11334,7 @@ in sources."run-parallel-1.2.0" sources."rxjs-6.6.7" sources."safe-buffer-5.2.1" + sources."safe-regex-test-1.0.0" sources."safe-stable-stringify-2.4.0" sources."safer-buffer-2.1.2" (sources."sanitize-html-2.7.0" // { @@ -9752,7 +11346,7 @@ in sources."sb-promise-queue-2.1.0" sources."sb-scandir-3.1.0" sources."selderee-0.6.0" - sources."semver-7.3.7" + sources."semver-7.3.8" (sources."send-0.18.0" // { dependencies = [ (sources."debug-2.6.9" // { @@ -9782,11 +11376,13 @@ in sources."shelljs-0.8.5" (sources."showdown-2.1.0" // { dependencies = [ - sources."commander-9.4.0" + sources."commander-9.4.1" ]; }) sources."side-channel-1.0.4" sources."signal-exit-3.0.7" + sources."simple-concat-1.0.1" + sources."simple-get-4.0.1" sources."simple-git-3.14.1" sources."simple-lru-cache-0.0.2" sources."simple-swizzle-0.2.2" @@ -9797,7 +11393,7 @@ in sources."tslib-2.4.0" ]; }) - (sources."snowflake-sdk-1.6.13" // { + (sources."snowflake-sdk-1.6.14" // { dependencies = [ sources."axios-0.27.2" sources."debug-3.2.7" @@ -9806,18 +11402,20 @@ in sources."uuid-3.4.0" ]; }) - sources."socks-2.7.0" + sources."socks-2.7.1" sources."socks-proxy-agent-5.0.1" sources."source-map-0.6.1" sources."source-map-js-1.0.2" sources."spex-3.2.0" + sources."split-on-first-1.1.0" (sources."split2-3.2.2" // { dependencies = [ sources."readable-stream-3.6.0" ]; }) sources."sprintf-js-1.0.3" - sources."sqlite3-5.1.1" + sources."sql.js-1.8.0" + sources."sqlite3-5.1.2" sources."sqlstring-2.3.3" sources."sse-channel-3.1.1" sources."ssf-0.11.2" @@ -9829,15 +11427,19 @@ in ]; }) sources."sshpk-1.17.0" + sources."ssri-8.0.1" sources."stack-trace-0.0.10" sources."standard-as-callback-2.1.0" + sources."static-eval-2.0.2" sources."statuses-2.0.1" sources."stealthy-require-1.1.1" sources."stoppable-1.1.0" sources."stream-shift-1.0.1" sources."streamsearch-1.1.0" + sources."strict-uri-encode-2.0.0" sources."string-similarity-4.0.4" sources."string-width-4.2.3" + sources."string.prototype.startswith-1.0.0" sources."string.prototype.trimend-1.0.5" sources."string.prototype.trimstart-1.0.5" (sources."string_decoder-1.1.1" // { @@ -9846,24 +11448,34 @@ in ]; }) sources."strip-ansi-6.0.1" + sources."strip-json-comments-2.0.1" sources."strtok3-6.3.0" sources."supports-color-7.2.0" sources."supports-hyperlinks-2.3.0" sources."supports-preserve-symlinks-flag-1.0.0" - sources."swagger-ui-dist-4.14.0" + sources."swagger-ui-dist-4.14.2" sources."swagger-ui-express-4.5.0" (sources."tar-6.1.11" // { dependencies = [ sources."mkdirp-1.0.4" ]; }) + (sources."tar-fs-2.1.1" // { + dependencies = [ + sources."chownr-1.1.4" + ]; + }) + (sources."tar-stream-2.2.0" // { + dependencies = [ + sources."readable-stream-3.6.0" + ]; + }) sources."tarn-3.0.2" sources."tdigest-0.1.2" (sources."tedious-14.7.0" // { dependencies = [ sources."bl-5.0.0" sources."buffer-6.0.3" - sources."iconv-lite-0.6.3" sources."readable-stream-3.6.0" sources."sprintf-js-1.1.2" ]; @@ -9906,18 +11518,37 @@ in sources."typedarray-0.0.6" (sources."typeorm-0.2.45" // { dependencies = [ + sources."@types/node-12.20.55" sources."argparse-2.0.1" + sources."bl-2.2.1" + sources."bson-1.1.6" sources."buffer-6.0.3" + sources."iconv-lite-0.5.2" sources."js-yaml-4.1.0" + sources."jsbi-3.2.5" sources."mkdirp-1.0.4" + sources."mongodb-3.7.3" + sources."mssql-6.4.1" + sources."readable-stream-3.6.0" + sources."sprintf-js-1.1.2" + sources."tarn-1.1.5" + (sources."tedious-6.7.1" // { + dependencies = [ + sources."bl-3.0.1" + ]; + }) sources."tslib-2.4.0" ]; }) + sources."typeorm-aurora-data-api-driver-2.4.4" sources."uc.micro-1.0.6" sources."uid-safe-2.1.5" sources."unbox-primitive-1.0.2" sources."unc-path-regex-0.1.2" + sources."underscore-1.12.1" sources."unescape-1.0.1" + sources."unique-filename-1.1.1" + sources."unique-slug-2.0.2" sources."unique-stream-2.3.1" sources."universalify-2.0.0" sources."unpipe-1.0.0" @@ -9938,14 +11569,16 @@ in ]; }) sources."url-parse-1.5.10" - (sources."urllib-2.38.1" // { + (sources."urllib-2.39.1" // { dependencies = [ sources."debug-2.6.9" + sources."iconv-lite-0.4.24" sources."ip-1.1.8" sources."ms-2.0.0" sources."statuses-1.5.0" ]; }) + sources."utf-8-validate-5.0.9" (sources."utf7-1.0.2" // { dependencies = [ sources."semver-5.3.0" @@ -9968,16 +11601,25 @@ in ]; }) sources."vm2-3.9.11" - sources."vue-2.7.10" + sources."vue-2.6.14" + sources."vue-agile-2.0.0" sources."vue-color-2.8.1" sources."vue-fragment-1.5.1" sources."vue-i18n-8.27.2" + sources."vue-json-pretty-1.9.2" + sources."vue-prism-editor-0.3.0" + sources."vue-router-3.6.5" + sources."vue-template-compiler-2.6.14" + sources."vue-typed-mixins-0.2.0" sources."vue2-boring-avatars-0.3.4" sources."vue2-teleport-1.0.1" + sources."vue2-touch-events-3.2.2" + sources."vuex-3.6.2" sources."webidl-conversions-3.0.1" sources."whatwg-url-5.0.0" sources."which-1.3.1" sources."which-boxed-primitive-1.0.2" + sources."which-collection-1.0.1" sources."which-typed-array-1.1.8" sources."wide-align-1.1.5" sources."widest-line-3.1.0" @@ -10006,6 +11648,7 @@ in sources."xlsx-0.17.5" sources."xml2js-0.4.23" sources."xmlbuilder-11.0.1" + sources."xpath.js-1.1.0" sources."xregexp-2.0.0" (sources."xss-1.0.14" // { dependencies = [ diff --git a/pkgs/applications/networking/newsreaders/liferea/default.nix b/pkgs/applications/networking/newsreaders/liferea/default.nix index ae8aa4656c0..15b3c8a976a 100644 --- a/pkgs/applications/networking/newsreaders/liferea/default.nix +++ b/pkgs/applications/networking/newsreaders/liferea/default.nix @@ -24,11 +24,11 @@ stdenv.mkDerivation rec { pname = "liferea"; - version = "1.13.9"; + version = "1.14-RC1"; src = fetchurl { url = "https://github.com/lwindolf/${pname}/releases/download/v${version}/${pname}-${version}.tar.bz2"; - sha256 = "IP3TSmnRekFebxeBh5JRegeSedx+y24e4X9muMAyhFk="; + sha256 = "cBtS+Km2d1n5Yl0wrQkN3Pg6OxSzhG7oVu7ZJ5RQuRQ="; }; nativeBuildInputs = [ diff --git a/pkgs/applications/networking/onionshare/default.nix b/pkgs/applications/networking/onionshare/default.nix index 8452d3c26f6..2d23ece5e45 100644 --- a/pkgs/applications/networking/onionshare/default.nix +++ b/pkgs/applications/networking/onionshare/default.nix @@ -26,12 +26,12 @@ }: let - version = "2.5"; + version = "2.6"; src = fetchFromGitHub { owner = "onionshare"; repo = "onionshare"; rev = "v${version}"; - sha256 = "xCAM+tjjyDg/gqAXr4YNPhM8R3n9r895jktisAGlpZo="; + sha256 = "sha256-LA7XlzoCXUiG/9subTddAd22336wO9sOHCIBlQK4Ga4="; }; meta = with lib; { description = "Securely and anonymously send and receive files"; diff --git a/pkgs/applications/networking/onionshare/fix-paths-gui.patch b/pkgs/applications/networking/onionshare/fix-paths-gui.patch index 4eb611c860d..63bc3f68d3b 100644 --- a/pkgs/applications/networking/onionshare/fix-paths-gui.patch +++ b/pkgs/applications/networking/onionshare/fix-paths-gui.patch @@ -1,6 +1,6 @@ --- a/onionshare/gui_common.py +++ b/onionshare/gui_common.py -@@ -410,52 +410,12 @@ class GuiCommon: +@@ -482,52 +482,12 @@ class GuiCommon: } def get_tor_paths(self): @@ -29,12 +29,12 @@ - - if self.common.platform == "Windows": - base_path = self.get_resource_path("tor") -- tor_path = os.path.join(base_path, "Tor", "tor.exe") -- obfs4proxy_file_path = os.path.join(base_path, "Tor", "obfs4proxy.exe") -- snowflake_file_path = os.path.join(base_path, "Tor", "snowflake-client.exe") -- meek_client_file_path = os.path.join(base_path, "Tor", "meek-client.exe") -- tor_geo_ip_file_path = os.path.join(base_path, "Data", "Tor", "geoip") -- tor_geo_ipv6_file_path = os.path.join(base_path, "Data", "Tor", "geoip6") +- tor_path = os.path.join(base_path, "tor.exe") +- obfs4proxy_file_path = os.path.join(base_path, "obfs4proxy.exe") +- snowflake_file_path = os.path.join(base_path, "snowflake-client.exe") +- meek_client_file_path = os.path.join(base_path, "meek-client.exe") +- tor_geo_ip_file_path = os.path.join(base_path, "geoip") +- tor_geo_ipv6_file_path = os.path.join(base_path, "geoip6") - elif self.common.platform == "Darwin": - base_path = self.get_resource_path("tor") - tor_path = os.path.join(base_path, "tor") diff --git a/pkgs/applications/networking/onionshare/fix-paths.patch b/pkgs/applications/networking/onionshare/fix-paths.patch index fec4b4e0395..62e69f927b5 100644 --- a/pkgs/applications/networking/onionshare/fix-paths.patch +++ b/pkgs/applications/networking/onionshare/fix-paths.patch @@ -1,6 +1,6 @@ --- a/onionshare_cli/common.py +++ b/onionshare_cli/common.py -@@ -318,67 +318,12 @@ class Common: +@@ -318,73 +318,12 @@ class Common: return path def get_tor_paths(self): @@ -18,21 +18,27 @@ - # In Windows, the Tor binaries are in the onionshare package, not the onionshare_cli package - base_path = self.get_resource_path("tor") - base_path = base_path.replace("onionshare_cli", "onionshare") -- tor_path = os.path.join(base_path, "Tor", "tor.exe") +- tor_path = os.path.join(base_path, "tor.exe") - - # If tor.exe isn't there, mayber we're running from the source tree - if not os.path.exists(tor_path): +- self.log( +- "Common", "get_tor_paths", f"Cannot find tor.exe at {tor_path}" +- ) - base_path = os.path.join(os.getcwd(), "onionshare", "resources", "tor") - -- tor_path = os.path.join(base_path, "Tor", "tor.exe") +- tor_path = os.path.join(base_path, "tor.exe") - if not os.path.exists(tor_path): +- self.log( +- "Common", "get_tor_paths", f"Cannot find tor.exe at {tor_path}" +- ) - raise CannotFindTor() - -- obfs4proxy_file_path = os.path.join(base_path, "Tor", "obfs4proxy.exe") -- snowflake_file_path = os.path.join(base_path, "Tor", "snowflake-client.exe") -- meek_client_file_path = os.path.join(base_path, "Tor", "meek-client.exe") -- tor_geo_ip_file_path = os.path.join(base_path, "Data", "Tor", "geoip") -- tor_geo_ipv6_file_path = os.path.join(base_path, "Data", "Tor", "geoip6") +- obfs4proxy_file_path = os.path.join(base_path, "obfs4proxy.exe") +- snowflake_file_path = os.path.join(base_path, "snowflake-client.exe") +- meek_client_file_path = os.path.join(base_path, "meek-client.exe") +- tor_geo_ip_file_path = os.path.join(base_path, "geoip") +- tor_geo_ipv6_file_path = os.path.join(base_path, "geoip6") - - elif self.platform == "Darwin": - # Let's see if we have tor binaries in the onionshare GUI package diff --git a/pkgs/applications/networking/p2p/qbittorrent/default.nix b/pkgs/applications/networking/p2p/qbittorrent/default.nix index 47fe3e97c1d..1b4f12874db 100644 --- a/pkgs/applications/networking/p2p/qbittorrent/default.nix +++ b/pkgs/applications/networking/p2p/qbittorrent/default.nix @@ -12,13 +12,13 @@ assert trackerSearch -> (python3 != null); with lib; mkDerivation rec { pname = "qbittorrent"; - version = "4.4.3.1"; + version = "4.4.5"; src = fetchFromGitHub { owner = "qbittorrent"; repo = "qBittorrent"; rev = "release-${version}"; - sha256 = "sha256-byA6bzGdigmVptUFdgBjyg6Oimn5L6l1DDOuuBjwO0s="; + sha256 = "sha256-EgRDNOJ4szdZA5ipOuGy2R0oVdjWcuqPU3ecU3ZNK3g="; }; enableParallelBuilding = true; diff --git a/pkgs/applications/networking/protonvpn-cli/default.nix b/pkgs/applications/networking/protonvpn-cli/default.nix index f247b5d1482..e480ab5f67b 100644 --- a/pkgs/applications/networking/protonvpn-cli/default.nix +++ b/pkgs/applications/networking/protonvpn-cli/default.nix @@ -9,7 +9,7 @@ buildPythonApplication rec { pname = "protonvpn-cli"; - version = "3.12.0"; + version = "3.13.0"; format = "setuptools"; disabled = pythonOlder "3.5"; @@ -17,8 +17,8 @@ buildPythonApplication rec { src = fetchFromGitHub { owner = "protonvpn"; repo = "linux-cli"; - rev = version; - sha256 = "sha256-z0ewAqf8hjyExqBN8KBsDwJ+SA/pIBYZhKtXF9M65HE="; + rev = "refs/tags/${version}"; + sha256 = "sha256-KhfogC23i7THe6YZJ6Sy1+q83vZupHsS69NurHCeo8I="; }; propagatedBuildInputs = [ diff --git a/pkgs/applications/networking/protonvpn-gui/default.nix b/pkgs/applications/networking/protonvpn-gui/default.nix index ef128932f7c..13f6e0186f6 100644 --- a/pkgs/applications/networking/protonvpn-gui/default.nix +++ b/pkgs/applications/networking/protonvpn-gui/default.nix @@ -18,13 +18,13 @@ buildPythonApplication rec { pname = "protonvpn-gui"; - version = "1.10.0"; + version = "1.11.0"; src = fetchFromGitHub { owner = "ProtonVPN"; repo = "linux-app"; rev = "refs/tags/${version}"; - sha256 = "sha256-6IRkJKtdQQ9Yixb9CkT3tGNY0MYFZyvz1/6buZo5eYU="; + sha256 = "sha256-aov7Mkb3bGlS3q9zIWkeuWbrvfP1Gm2DhaeTprQNbeI="; }; nativeBuildInputs = [ diff --git a/pkgs/applications/networking/remote/freerdp/default.nix b/pkgs/applications/networking/remote/freerdp/default.nix index c769b7de6c8..89e952945c8 100644 --- a/pkgs/applications/networking/remote/freerdp/default.nix +++ b/pkgs/applications/networking/remote/freerdp/default.nix @@ -52,13 +52,13 @@ let in stdenv.mkDerivation rec { pname = "freerdp"; - version = "2.8.0"; + version = "2.8.1"; src = fetchFromGitHub { owner = "FreeRDP"; repo = "FreeRDP"; rev = version; - sha256 = "sha256-bVq/99jMkxTjckMjWoK4pBa0jD/AYezgKUPJziNSqI0="; + sha256 = "sha256-0heCwXFms6Ni/F1TaS5QEK+ePlR9DXUrzVj3vA5DvCk="; }; postPatch = '' diff --git a/pkgs/applications/networking/remote/remmina/default.nix b/pkgs/applications/networking/remote/remmina/default.nix index 20496f38e86..8a39e31aa9c 100644 --- a/pkgs/applications/networking/remote/remmina/default.nix +++ b/pkgs/applications/networking/remote/remmina/default.nix @@ -3,7 +3,7 @@ , freerdp, libssh, libgcrypt, gnutls, vte , pcre2, libdbusmenu-gtk3, libappindicator-gtk3 , libvncserver, libpthreadstubs, libXdmcp, libxkbcommon -, libsecret, libsoup, spice-protocol, spice-gtk, libepoxy, at-spi2-core +, libsecret, libsoup, spice-protocol, spice-gtk_libsoup2, libepoxy, at-spi2-core , openssl, gsettings-desktop-schemas, json-glib, libsodium, webkitgtk, harfbuzz # The themes here are soft dependencies; only icons are missing without them. , gnome @@ -31,7 +31,10 @@ stdenv.mkDerivation rec { freerdp libssh libgcrypt gnutls pcre2 libdbusmenu-gtk3 libappindicator-gtk3 libvncserver libpthreadstubs libXdmcp libxkbcommon - libsoup spice-protocol spice-gtk libepoxy at-spi2-core + libsoup spice-protocol + # https://gitlab.com/Remmina/Remmina/-/issues/2754 + spice-gtk_libsoup2 + libepoxy at-spi2-core openssl gnome.adwaita-icon-theme json-glib libsodium webkitgtk harfbuzz python3 ] ++ optionals withLibsecret [ libsecret ] diff --git a/pkgs/applications/networking/seahub/default.nix b/pkgs/applications/networking/seahub/default.nix index 98d873097a5..70cb96ed136 100644 --- a/pkgs/applications/networking/seahub/default.nix +++ b/pkgs/applications/networking/seahub/default.nix @@ -21,6 +21,7 @@ in python.pkgs.buildPythonApplication rec { pname = "seahub"; version = "9.0.6"; + format = "other"; src = fetchFromGitHub { owner = "haiwen"; @@ -29,8 +30,6 @@ python.pkgs.buildPythonApplication rec { sha256 = "sha256-GHvJlm5DVt3IVJnqJu8YobNNqbjdPd08s4DCdQQRQds="; }; - format = "other"; - dontBuild = true; doCheck = false; # disabled because it requires a ccnet environment diff --git a/pkgs/applications/networking/sync/lsyncd/default.nix b/pkgs/applications/networking/sync/lsyncd/default.nix index 7690bf6ee54..3e52d664d52 100644 --- a/pkgs/applications/networking/sync/lsyncd/default.nix +++ b/pkgs/applications/networking/sync/lsyncd/default.nix @@ -31,10 +31,10 @@ stdenv.mkDerivation rec { dontUseCmakeBuildDir = true; - nativeBuildInputs = [ cmake ]; + nativeBuildInputs = [ cmake pkg-config ]; buildInputs = [ rsync - lua pkg-config + lua asciidoc libxml2 docbook_xml_dtd_45 docbook_xsl libxslt ]; diff --git a/pkgs/applications/networking/sync/onedrive/default.nix b/pkgs/applications/networking/sync/onedrive/default.nix index 9fa34e785b0..0945de2011b 100644 --- a/pkgs/applications/networking/sync/onedrive/default.nix +++ b/pkgs/applications/networking/sync/onedrive/default.nix @@ -43,13 +43,14 @@ stdenv.mkDerivation rec { postInstall = '' installShellCompletion --bash --name ${pname} contrib/completions/complete.bash installShellCompletion --zsh --name _${pname} contrib/completions/complete.zsh + installShellCompletion --fish --name ${pname} contrib/completions/complete.fish ''; meta = with lib; { description = "A complete tool to interact with OneDrive on Linux"; homepage = "https://github.com/abraunegg/onedrive"; license = licenses.gpl3Only; - maintainers = with maintainers; [ srgom peterhoeg ]; + maintainers = with maintainers; [ srgom peterhoeg bertof ]; platforms = platforms.linux; }; } diff --git a/pkgs/applications/office/elementary-planner/default.nix b/pkgs/applications/office/elementary-planner/default.nix index 54ad0753c72..1d0b06db248 100644 --- a/pkgs/applications/office/elementary-planner/default.nix +++ b/pkgs/applications/office/elementary-planner/default.nix @@ -99,6 +99,7 @@ stdenv.mkDerivation rec { maintainers = with maintainers; [ dtzWill ] ++ teams.pantheon.members; platforms = platforms.linux; mainProgram = "com.github.alainm23.planner"; + broken = true; # https://github.com/alainm23/planner/issues/928 }; } diff --git a/pkgs/applications/office/gnucash/default.nix b/pkgs/applications/office/gnucash/default.nix index 251c7795132..9e5294c4b00 100644 --- a/pkgs/applications/office/gnucash/default.nix +++ b/pkgs/applications/office/gnucash/default.nix @@ -39,6 +39,7 @@ stdenv.mkDerivation rec { gettext makeWrapper wrapGAppsHook + pkg-config ]; buildInputs = [ @@ -55,7 +56,6 @@ stdenv.mkDerivation rec { libofx libxml2 libxslt - pkg-config swig webkitgtk ] diff --git a/pkgs/applications/office/gnumeric/default.nix b/pkgs/applications/office/gnumeric/default.nix index c9b4ef13912..e93be60741b 100644 --- a/pkgs/applications/office/gnumeric/default.nix +++ b/pkgs/applications/office/gnumeric/default.nix @@ -7,11 +7,11 @@ let inherit (python3Packages) python pygobject3; in stdenv.mkDerivation rec { pname = "gnumeric"; - version = "1.12.52"; + version = "1.12.53"; src = fetchurl { url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "c89zBJoiodgoUGJ1ssk3jsN8X/N7aLsfL0lPDWQAgjs="; + sha256 = "VWjkyNzqu5Ao8TYdEEVSL5Xwpx2qWelzy90tObrdTwI="; }; configureFlags = [ "--disable-component" ]; diff --git a/pkgs/applications/office/grisbi/default.nix b/pkgs/applications/office/grisbi/default.nix index ff0d75711cf..81f97b116b0 100644 --- a/pkgs/applications/office/grisbi/default.nix +++ b/pkgs/applications/office/grisbi/default.nix @@ -19,12 +19,11 @@ stdenv.mkDerivation rec { sha256 = "sha256-vTrbq/xLTfwF7/YtKzZFiiSw8A0HzzWin2ry8gPHej8="; }; - nativeBuildInputs = [ pkg-config wrapGAppsHook ]; + nativeBuildInputs = [ pkg-config wrapGAppsHook intltool ]; buildInputs = [ gtk libgsf libofx - intltool libsoup gnome.adwaita-icon-theme ]; diff --git a/pkgs/applications/office/homebank/default.nix b/pkgs/applications/office/homebank/default.nix index 2a00811a449..17a9cbb5924 100644 --- a/pkgs/applications/office/homebank/default.nix +++ b/pkgs/applications/office/homebank/default.nix @@ -9,8 +9,8 @@ stdenv.mkDerivation rec { sha256 = "sha256-Rg6OjHLkwVIDnXqzqPXA8DxqSdrh2T6V/gLBND8vx9o="; }; - nativeBuildInputs = [ pkg-config wrapGAppsHook ]; - buildInputs = [ gtk libofx intltool libsoup gnome.adwaita-icon-theme ]; + nativeBuildInputs = [ pkg-config wrapGAppsHook intltool ]; + buildInputs = [ gtk libofx libsoup gnome.adwaita-icon-theme ]; meta = with lib; { description = "Free, easy, personal accounting for everyone"; diff --git a/pkgs/applications/office/karlender/default.nix b/pkgs/applications/office/karlender/default.nix new file mode 100644 index 00000000000..44cd2ed0051 --- /dev/null +++ b/pkgs/applications/office/karlender/default.nix @@ -0,0 +1,60 @@ +{ lib +, rustPlatform +, fetchFromGitLab +, pkg-config +, gtk4 +, libadwaita +, wrapGAppsHook4 +, glib +, tzdata +}: + +rustPlatform.buildRustPackage rec { + pname = "karlender"; + version = "0.6.2"; + + src = fetchFromGitLab { + owner = "loers"; + repo = "karlender"; + rev = "v${version}"; + sha256 = "sha256-YF46C+Vz7eGl4lqOQXqiQqaa6ieo1p8l6QCh4oNSJEg="; + }; + + cargoSha256 = "sha256-Kx5K2tp5PAQWac8LVrmOsk8Qf9m34SJ1vyfv7Ef2Wr0="; + + nativeBuildInputs = [ + pkg-config + wrapGAppsHook4 + glib + ]; + buildInputs = [ + gtk4 + libadwaita + ]; + + postPatch = '' + substituteInPlace src/domain/time.rs --replace "/usr/share/zoneinfo" "${tzdata}/share/zoneinfo" + ''; + + postInstall = '' + substituteInPlace target/gra-gen/data/codes.loers.Karlender.desktop \ + --replace "Exec=codes.loers.Karlender" "Exec=karlender" + substituteInPlace target/gra-gen/data/codes.loers.Karlender.appdata.xml \ + --replace "<binary>codes.loers.Karlender</binary>" "<binary>karlender</binary>" + install -Dm444 target/gra-gen/codes.loers.Karlender.gschema.xml -t $out/share/gsettings-schemas/$name/glib-2.0/schemas/ + glib-compile-schemas $out/share/gsettings-schemas/$name/glib-2.0/schemas/ + install -Dm444 target/gra-gen/data/codes.loers.Karlender.svg -t $out/share/icons/hicolor/scalable/apps/ + install -Dm444 target/gra-gen/data/codes.loers.Karlender.64.png -T $out/share/icons/hicolor/64x64/apps/codes.loers.Karlender.png + install -Dm444 target/gra-gen/data/codes.loers.Karlender.128.png -T $out/share/icons/hicolor/128x128/apps/codes.loers.Karlender.png + install -Dm444 target/gra-gen/data/codes.loers.Karlender.desktop -t $out/share/applications/ + install -Dm444 target/gra-gen/data/codes.loers.Karlender.appdata.xml -t $out/share/metainfo/ + ''; + + meta = with lib; { + description = "Mobile-friendly GTK calendar application"; + homepage = "https://gitlab.com/loers/karlender"; + license = licenses.gpl3Plus; + maintainers = with maintainers; [ chuangzhu ]; + platforms = platforms.linux; + }; +} diff --git a/pkgs/applications/office/libreoffice/default.nix b/pkgs/applications/office/libreoffice/default.nix index c4435ca6269..43a1571b46e 100644 --- a/pkgs/applications/office/libreoffice/default.nix +++ b/pkgs/applications/office/libreoffice/default.nix @@ -555,7 +555,6 @@ in openssl pam perl - pkg-config poppler python3 sane-backends diff --git a/pkgs/applications/office/treesheets/default.nix b/pkgs/applications/office/treesheets/default.nix index 7b1fd1ae73a..6a0bb48c7de 100644 --- a/pkgs/applications/office/treesheets/default.nix +++ b/pkgs/applications/office/treesheets/default.nix @@ -12,13 +12,13 @@ stdenv.mkDerivation rec { pname = "treesheets"; - version = "unstable-2022-09-26"; + version = "unstable-2022-10-11"; src = fetchFromGitHub { owner = "aardappel"; repo = "treesheets"; - rev = "4778c343ac78a3b3ccdaf079187b53d8cd64e235"; - sha256 = "UyltzT9B+7/hME7famQa/XgrDPaNw3apwchKgxwscOo="; + rev = "be79e537c148d961d40137a7f83d7bdcc4119dd6"; + sha256 = "GKRxb6W9PDY7nzgPTPRPmA9GBvD4zLaZwnalZan3+m0="; }; nativeBuildInputs = [ diff --git a/pkgs/applications/radio/rtl-ais/default.nix b/pkgs/applications/radio/rtl-ais/default.nix index c244868f65d..407c18c1a0a 100644 --- a/pkgs/applications/radio/rtl-ais/default.nix +++ b/pkgs/applications/radio/rtl-ais/default.nix @@ -3,7 +3,8 @@ stdenv.mkDerivation { pname = "rtl-ais"; version = "0.8.1"; - buildInputs = [ pkg-config rtl-sdr libusb1 ]; + nativeBuildInputs = [ pkg-config ]; + buildInputs = [ rtl-sdr libusb1 ]; src = fetchFromGitHub { owner = "dgiardini"; diff --git a/pkgs/applications/radio/unixcw/default.nix b/pkgs/applications/radio/unixcw/default.nix index 0d352609cf0..3fd066ec7b7 100644 --- a/pkgs/applications/radio/unixcw/default.nix +++ b/pkgs/applications/radio/unixcw/default.nix @@ -10,7 +10,8 @@ mkDerivation rec { patches = [ ./remove-use-of-dlopen.patch ]; - buildInputs = [ libpulseaudio alsa-lib pkg-config qtbase ]; + nativeBuildInputs = [ pkg-config ]; + buildInputs = [ libpulseaudio alsa-lib qtbase ]; CFLAGS ="-lasound -lpulse-simple"; meta = with lib; { diff --git a/pkgs/applications/radio/xlog/default.nix b/pkgs/applications/radio/xlog/default.nix index 59af9a94d96..d47bd418f51 100644 --- a/pkgs/applications/radio/xlog/default.nix +++ b/pkgs/applications/radio/xlog/default.nix @@ -11,7 +11,8 @@ stdenv.mkDerivation rec { # glib-2.62 deprecations NIX_CFLAGS_COMPILE = "-DGLIB_DISABLE_DEPRECATION_WARNINGS"; - buildInputs = [ glib pkg-config gtk2 hamlib ]; + nativeBuildInputs = [ pkg-config ]; + buildInputs = [ glib gtk2 hamlib ]; meta = with lib; { description = "An amateur radio logging program"; diff --git a/pkgs/applications/science/biology/gatk/default.nix b/pkgs/applications/science/biology/gatk/default.nix index c0818b8336d..9853b0322c0 100644 --- a/pkgs/applications/science/biology/gatk/default.nix +++ b/pkgs/applications/science/biology/gatk/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchzip }: +{ lib, stdenv, fetchzip, jre, makeWrapper, python3 }: stdenv.mkDerivation rec { pname = "gatk"; @@ -8,10 +8,19 @@ stdenv.mkDerivation rec { sha256 = "0hjlsl7fxf3ankyjidqhwxc70gjh6z4lnjzw6b5fldzb0qvgfvy8"; }; + nativeBuildInputs = [ makeWrapper ]; + buildInputs = [ python3 ]; + + dontUnpack = true; + installPhase = '' mkdir -p $out/bin - install -m755 -D $src/gatk $out/bin/ install -m755 -D $src/gatk-package-${version}-local.jar $out/bin/ + install -m755 -D $src/gatk-package-${version}-spark.jar $out/bin/ + install -m755 -D $src/gatk $out/bin/ + ''; + postFixup = '' + wrapProgram $out/bin/gatk --prefix PATH : ${lib.makeBinPath [ jre ]} ''; meta = with lib; { diff --git a/pkgs/applications/science/biology/vcftools/default.nix b/pkgs/applications/science/biology/vcftools/default.nix index 9f88079627e..a4ec84d4d50 100755 --- a/pkgs/applications/science/biology/vcftools/default.nix +++ b/pkgs/applications/science/biology/vcftools/default.nix @@ -11,7 +11,8 @@ stdenv.mkDerivation rec { sha256 = "0msb09d2cnm8rlpg8bsc1lhjddvp3kf3i9dsj1qs4qgsdlzhxkyx"; }; - buildInputs = [ autoreconfHook pkg-config zlib perl ]; + nativeBuildInputs = [ pkg-config autoreconfHook ]; + buildInputs = [ zlib perl ]; meta = with lib; { description = "A set of tools written in Perl and C++ for working with VCF files, such as those generated by the 1000 Genomes Project"; diff --git a/pkgs/applications/science/electronics/gtkwave/default.nix b/pkgs/applications/science/electronics/gtkwave/default.nix index 10dcb2327c0..57104cb045e 100644 --- a/pkgs/applications/science/electronics/gtkwave/default.nix +++ b/pkgs/applications/science/electronics/gtkwave/default.nix @@ -16,11 +16,11 @@ stdenv.mkDerivation rec { pname = "gtkwave"; - version = "3.3.111"; + version = "3.3.113"; src = fetchurl { url = "mirror://sourceforge/gtkwave/${pname}-gtk3-${version}.tar.gz"; - sha256 = "0cv222qhgldfniz6zys52zhrynfsp5v0h8ia857lng7v33vw5qdl"; + sha256 = "sha256-bv81puBSiFVkO2hNk63rMchbTSN3KtSnyHnL0/apQe0="; }; nativeBuildInputs = [ pkg-config wrapGAppsHook ]; diff --git a/pkgs/applications/science/electronics/kicad/base.nix b/pkgs/applications/science/electronics/kicad/base.nix index cce72245bb3..1503230b3af 100644 --- a/pkgs/applications/science/electronics/kicad/base.nix +++ b/pkgs/applications/science/electronics/kicad/base.nix @@ -168,8 +168,7 @@ stdenv.mkDerivation rec { preInstallCheck = optionals (withNgspice) [ "export LD_LIBRARY_PATH=${libngspice}/lib" ]; # debug builds fail all but the python test - # stable release doesn't have the fix for upstream issue 9888 yet - doInstallCheck = !debug && !stable; + doInstallCheck = !debug; installCheckTarget = "test"; dontStrip = debug; diff --git a/pkgs/applications/science/electronics/kicad/versions.nix b/pkgs/applications/science/electronics/kicad/versions.nix index b6d6def4fca..d46c941b8f0 100644 --- a/pkgs/applications/science/electronics/kicad/versions.nix +++ b/pkgs/applications/science/electronics/kicad/versions.nix @@ -3,23 +3,23 @@ { "kicad" = { kicadVersion = { - version = "6.0.7"; + version = "6.0.8"; src = { - rev = "77480857076960b2e8a70e01aee0b843db37f5f7"; - sha256 = "10bqn99nif9zyi5v0lkic3na2vac5lgacw01ayil359vaw7d0pzy"; + rev = "f2edbf62ab6eb123d605d06cffedadc424fed55b"; + sha256 = "0f5iriahskzflgfzahbjihiff7m7nbdmp3ip8dx69xa28b9012w9"; }; }; libVersion = { - version = "6.0.7"; + version = "6.0.8"; libSources = { - symbols.rev = "059abdef06a0b7b44994ae9948a4f98f7224cb1f"; - symbols.sha256 = "006ksx8r6cm6q7v701nalggivp21cmysj8p9zc18y3sch8n1mj4g"; - templates.rev = "16d1898d52f1277ce9bd75640a32f7d2c6d122bf"; + symbols.rev = "64a2f338f3f994975edfd33bc04f92fd6b9ed1c3"; + symbols.sha256 = "1nxz8r3h3j62fs3s77lj27333fsj5c4i01n05lv0gqx36h28hqxk"; + templates.rev = "549275966dd4f01ce656cec2b46599d1b7a3ca62"; templates.sha256 = "08zxh83fbygh1x2jhca8nrp3f9kihf7kmg65qmyp95wvps4p5h8v"; - footprints.rev = "26e8be9805444cc25d03d2263277aa06620f5374"; - footprints.sha256 = "0c5fm4hlkka0ms43j02kbv7s9yrlkffn0jz6649ac3gpx6pk8lbf"; - packages3d.rev = "cd9551dfb37ab0c086cac63564e54a7bc7b611d8"; - packages3d.sha256 = "0rdhwyhknrc63sc5ykmq097rzrl36zibnkls7q5hf54lrhn0n3k4"; + footprints.rev = "8eedad538f5b8234d3889ad08a3f272832b724b1"; + footprints.sha256 = "19di37hi80rzlwd468w3b6bq5kzxbslp3daskv8xb4y4f7pk3n00"; + packages3d.rev = "471e36d23c2d4f9971a591e2ab6ce717709438f9"; + packages3d.sha256 = "0cnrg7mr3khpglviid1adk2ihs1qwj0r7l32z2vqsl8aidzbg9kr"; }; }; }; diff --git a/pkgs/applications/science/geometry/drgeo/default.nix b/pkgs/applications/science/geometry/drgeo/default.nix index 59d7315ef41..0cc8bcb0fb3 100644 --- a/pkgs/applications/science/geometry/drgeo/default.nix +++ b/pkgs/applications/science/geometry/drgeo/default.nix @@ -13,8 +13,9 @@ stdenv.mkDerivation rec { }; patches = [ ./struct.patch ]; + nativeBuildInputs = [ pkg-config intltool ]; buildInputs = [libglade gtk2 guile libxml2 - perl intltool libtool pkg-config]; + perl libtool ]; prebuild = '' cp drgeo.desktop.in drgeo.desktop diff --git a/pkgs/applications/science/logic/bitwuzla/default.nix b/pkgs/applications/science/logic/bitwuzla/default.nix index 82bfbd6dc3f..cc8651f69cf 100644 --- a/pkgs/applications/science/logic/bitwuzla/default.nix +++ b/pkgs/applications/science/logic/bitwuzla/default.nix @@ -5,6 +5,7 @@ , cmake , lingeling , btor2tools +, symfpu , gtest , gmp , cadical @@ -19,13 +20,13 @@ stdenv.mkDerivation rec { pname = "bitwuzla"; - version = "unstable-2022-08-07"; + version = "unstable-2022-10-03"; src = fetchFromGitHub { owner = "bitwuzla"; repo = "bitwuzla"; - rev = "b6fb61736a5cf70cd0b35ec4aeeadf23971610ce"; - hash = "sha256-T5VnnWrcZ8K1NjFf5eeg0TRpXBLRCxC67v8zWPwYF/Y="; + rev = "3bc0f9f1aca04afabe1aff53dd0937924618b2ad"; + hash = "sha256-UXZERl7Nedwex/oUrcf6/GkDSgOQ537WDYm117RfvWo="; }; nativeBuildInputs = [ cmake pkg-config ]; @@ -35,6 +36,7 @@ stdenv.mkDerivation rec { picosat minisat btor2tools + symfpu gmp zlib ] ++ lib.optional withLingeling lingeling; diff --git a/pkgs/applications/science/logic/cbmc/default.nix b/pkgs/applications/science/logic/cbmc/default.nix index 07c3b62d37d..4750dd08c0a 100644 --- a/pkgs/applications/science/logic/cbmc/default.nix +++ b/pkgs/applications/science/logic/cbmc/default.nix @@ -13,13 +13,13 @@ stdenv.mkDerivation rec { pname = "cbmc"; - version = "5.67.0"; + version = "5.68.0"; src = fetchFromGitHub { owner = "diffblue"; repo = pname; rev = "${pname}-${version}"; - sha256 = "sha256-9w6GGi/yW7IYv3NoflpzO/UH712+LWp6f10+ak2hLIA="; + sha256 = "sha256-Hup/E426sPAj8/vpgBz8j6C65fG6U59oq78mqmGkDD8="; }; nativeBuildInputs = [ diff --git a/pkgs/applications/science/logic/coq/default.nix b/pkgs/applications/science/logic/coq/default.nix index f1ec27642fe..a258c4f5cea 100644 --- a/pkgs/applications/science/logic/coq/default.nix +++ b/pkgs/applications/science/logic/coq/default.nix @@ -7,7 +7,9 @@ { lib, stdenv, fetchzip, writeText, pkg-config, gnumake42 , customOCamlPackages ? null -, ocamlPackages_4_05, ocamlPackages_4_09, ocamlPackages_4_10, ocamlPackages_4_12, ncurses +, ocamlPackages_4_05, ocamlPackages_4_09, ocamlPackages_4_10, ocamlPackages_4_12 +, ocamlPackages_4_14 +, ncurses , buildIde ? null # default is true for Coq < 8.14 and false for Coq >= 8.14 , glib, gnome, wrapGAppsHook, makeDesktopItem, copyDesktopItems , csdp ? null @@ -68,11 +70,12 @@ let '' else ""; ocamlPackages = if !isNull customOCamlPackages then customOCamlPackages else with versions; switch coq-version [ - { case = range "8.14" "8.14"; out = ocamlPackages_4_12; } + { case = range "8.16" "8.17"; out = ocamlPackages_4_14; } + { case = range "8.14" "8.15"; out = ocamlPackages_4_12; } { case = range "8.11" "8.13"; out = ocamlPackages_4_10; } { case = range "8.7" "8.10"; out = ocamlPackages_4_09; } { case = range "8.5" "8.6"; out = ocamlPackages_4_05; } - ] ocamlPackages_4_12; + ] ocamlPackages_4_14; ocamlNativeBuildInputs = with ocamlPackages; [ ocaml findlib ] ++ optional (coqAtLeast "8.14") dune_2; ocamlPropagatedBuildInputs = [ ] diff --git a/pkgs/applications/science/logic/prover9/default.nix b/pkgs/applications/science/logic/prover9/default.nix index aa01469bfbb..5c476be06e4 100644 --- a/pkgs/applications/science/logic/prover9/default.nix +++ b/pkgs/applications/science/logic/prover9/default.nix @@ -33,7 +33,7 @@ stdenv.mkDerivation { meta = with lib; { homepage = "https://www.cs.unm.edu/~mccune/mace4/"; - license = licenses.gpl1; + license = licenses.gpl2Only; description = "Automated theorem prover for first-order and equational logic"; longDescription = '' Prover9 is a resolution/paramodulation automated theorem prover diff --git a/pkgs/applications/science/math/R/default.nix b/pkgs/applications/science/math/R/default.nix index 74f27fa534e..1c8c565528e 100644 --- a/pkgs/applications/science/math/R/default.nix +++ b/pkgs/applications/science/math/R/default.nix @@ -23,10 +23,11 @@ stdenv.mkDerivation rec { dontUseImakeConfigure = true; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ bzip2 gfortran libX11 libXmu libXt libXt libjpeg libpng libtiff ncurses pango pcre2 perl readline texLive xz zlib less texinfo graphviz icu - pkg-config bison imake which blas lapack curl tcl tk jdk + bison imake which blas lapack curl tcl tk jdk ] ++ lib.optionals stdenv.isDarwin [ Cocoa Foundation libobjc libcxx ]; patches = [ diff --git a/pkgs/applications/science/math/sage/sage-with-env.nix b/pkgs/applications/science/math/sage/sage-with-env.nix index 23069f335b8..7632b851773 100644 --- a/pkgs/applications/science/math/sage/sage-with-env.nix +++ b/pkgs/applications/science/math/sage/sage-with-env.nix @@ -28,9 +28,9 @@ assert (!blas.isILP64) && (!lapack.isILP64); # executable sage. No tests are run yet and no documentation is built. let + nativeBuildInputs = [ pkg-config ]; buildInputs = [ pythonEnv # for patchShebangs - pkg-config blas lapack singular three @@ -72,7 +72,7 @@ let [] ); - allInputs = lib.remove null (buildInputs ++ pythonEnv.extraLibs ++ [ makeWrapper ]); + allInputs = lib.remove null (nativeBuildInputs ++ buildInputs ++ pythonEnv.extraLibs ++ [ makeWrapper ]); transitiveDeps = lib.unique (builtins.concatLists (map transitiveClosure allInputs )); # fix differences between spkg and sage names # (could patch sage instead, but this is more lightweight and also works for packages depending on sage) @@ -91,7 +91,7 @@ stdenv.mkDerivation rec { pname = "sage-with-env"; src = sage-env.lib.src; - inherit buildInputs; + inherit nativeBuildInputs buildInputs; configurePhase = "#do nothing"; diff --git a/pkgs/applications/science/robotics/mavproxy/default.nix b/pkgs/applications/science/robotics/mavproxy/default.nix index 4aee366e987..712374ef752 100644 --- a/pkgs/applications/science/robotics/mavproxy/default.nix +++ b/pkgs/applications/science/robotics/mavproxy/default.nix @@ -4,11 +4,11 @@ buildPythonApplication rec { pname = "MAVProxy"; - version = "1.8.56"; + version = "1.8.57"; src = fetchPypi { inherit pname version; - sha256 = "sha256-wyY9oYWABkXNhlZW4RFuyZy/HEnv7cGFVbXVoEnIF1Q="; + sha256 = "sha256-tsx3oVXPIa3OtbLWj3QWrW9leL9/jsdbbLG+Wd3nxn4="; }; postPatch = '' diff --git a/pkgs/applications/terminal-emulators/alacritty/default.nix b/pkgs/applications/terminal-emulators/alacritty/default.nix index 2b145717fb3..9eff1604563 100644 --- a/pkgs/applications/terminal-emulators/alacritty/default.nix +++ b/pkgs/applications/terminal-emulators/alacritty/default.nix @@ -54,16 +54,16 @@ let in rustPlatform.buildRustPackage rec { pname = "alacritty"; - version = "0.11.0-rc2"; + version = "0.11.0"; src = fetchFromGitHub { owner = "alacritty"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-svo7DIPgNQy+MkIrRtRQjKQ2ND0CRfofSCiXJqoWby0="; + hash = "sha256-2jNE0UdPXfOyAfPPVKhdBpuVVw4IpwWQ+RLQlJNnK0Y="; }; - cargoSha256 = "sha256-ClAW7WjnDs4Peu+UqcOwtuDDkWYWACMQU5p39CiIFm0="; + cargoSha256 = "sha256-t6ckX0PYI8UHfXhGRpcX8ly3DzE9A6i9P6f3Ny3DBzw="; nativeBuildInputs = [ cmake diff --git a/pkgs/applications/terminal-emulators/blackbox-terminal/default.nix b/pkgs/applications/terminal-emulators/blackbox-terminal/default.nix new file mode 100644 index 00000000000..67a719d0117 --- /dev/null +++ b/pkgs/applications/terminal-emulators/blackbox-terminal/default.nix @@ -0,0 +1,72 @@ +{ lib +, stdenv +, fetchFromGitLab +, fetchurl +, meson +, ninja +, pkg-config +, vala +, gtk4 +, vte-gtk4 +, json-glib +, sassc +, libadwaita +, pcre2 +, libxml2 +, librsvg +, callPackage +, python3 +, gtk3 +, desktop-file-utils +, wrapGAppsHook +}: + +let + marble = callPackage ./marble.nix { }; +in +stdenv.mkDerivation rec { + pname = "blackbox"; + version = "0.12.0"; + + src = fetchFromGitLab { + domain = "gitlab.gnome.org"; + owner = "raggesilver"; + repo = "blackbox"; + rev = "v${version}"; + sha256 = "sha256-8u4qHC8+3rKDFNdg5kI48dBgAm3d6ESXN5H9aT/nIBY="; + }; + + postPatch = '' + patchShebangs build-aux/meson/postinstall.py + ''; + + nativeBuildInputs = [ + meson + ninja + pkg-config + vala + sassc + wrapGAppsHook + python3 + gtk3 # For gtk-update-icon-cache + desktop-file-utils # For update-desktop-database + ]; + buildInputs = [ + gtk4 + vte-gtk4 + json-glib + marble + libadwaita + pcre2 + libxml2 + librsvg + ]; + + meta = with lib; { + description = "Beautiful GTK 4 terminal"; + homepage = "https://gitlab.gnome.org/raggesilver/blackbox"; + license = licenses.gpl3Plus; + maintainers = with maintainers; [ chuangzhu ]; + platforms = platforms.linux; + }; +} diff --git a/pkgs/applications/terminal-emulators/blackbox-terminal/marble.nix b/pkgs/applications/terminal-emulators/blackbox-terminal/marble.nix new file mode 100644 index 00000000000..6d100c0894e --- /dev/null +++ b/pkgs/applications/terminal-emulators/blackbox-terminal/marble.nix @@ -0,0 +1,45 @@ +{ lib +, stdenv +, fetchFromGitLab +, meson +, ninja +, pkg-config +, vala +, gobject-introspection +, gtk4 +, gtk3 +, desktop-file-utils +}: + +stdenv.mkDerivation { + pname = "marble"; + version = "unstable-2022-04-20"; + + src = fetchFromGitLab { + domain = "gitlab.gnome.org"; + owner = "raggesilver"; + repo = "marble"; + # Latest commit from the 'wip/gtk4' branch + rev = "6dcc6fefa35f0151b0549c01bd774750fe6bdef8"; + sha256 = "sha256-0VJ9nyjWOOdLBm3ufleS/xcAS5YsSedJ2NtBjyM3uaY="; + }; + + nativeBuildInputs = [ + meson + ninja + pkg-config + vala + gtk3 # For gtk-update-icon-cache + desktop-file-utils # For update-desktop-database + gobject-introspection # For g-ir-compiler + ]; + buildInputs = [ gtk4 ]; + + meta = with lib; { + description = "Raggesilver's GTK library"; + homepage = "https://gitlab.gnome.org/raggesilver/marble"; + license = licenses.gpl3Plus; + maintainers = with maintainers; [ chuangzhu ]; + platforms = platforms.linux; + }; +} diff --git a/pkgs/applications/terminal-emulators/gnome-console/default.nix b/pkgs/applications/terminal-emulators/gnome-console/default.nix index 790aa172592..85ee654a989 100644 --- a/pkgs/applications/terminal-emulators/gnome-console/default.nix +++ b/pkgs/applications/terminal-emulators/gnome-console/default.nix @@ -23,6 +23,7 @@ stdenv.mkDerivation rec { pname = "gnome-console"; + # Do not upgrade until https://gitlab.gnome.org/GNOME/vte/-/issues/2584 is resolved! version = "42.2"; src = fetchurl { @@ -45,8 +46,6 @@ stdenv.mkDerivation rec { libhandy pcre2 vte - ] ++ lib.optionals stdenv.isLinux [ - gnome.nautilus ]; nativeBuildInputs = [ @@ -61,7 +60,7 @@ stdenv.mkDerivation rec { wrapGAppsHook ]; - mesonFlags = lib.optionals (!stdenv.isLinux) [ + mesonFlags = [ "-Dnautilus=disabled" ]; diff --git a/pkgs/applications/terminal-emulators/guake/default.nix b/pkgs/applications/terminal-emulators/guake/default.nix index cc2dc5c55d6..ee28a250478 100644 --- a/pkgs/applications/terminal-emulators/guake/default.nix +++ b/pkgs/applications/terminal-emulators/guake/default.nix @@ -15,15 +15,15 @@ python3.pkgs.buildPythonApplication rec { pname = "guake"; - version = "3.6.3"; + version = "3.9.0"; format = "other"; src = fetchFromGitHub { owner = "Guake"; repo = "guake"; - rev = version; - sha256 = "13ipnmqcyixpa6qv83m0f91za4kar14s5jpib68b32z65x1h0j3b"; + rev = "refs/tags/${version}"; + sha256 = "sha256-BW13fBH26UqMPMjV8JC4QkpgzyoPfCpAfSkJD68uOZU="; }; # Strict deps breaks guake @@ -51,16 +51,16 @@ python3.pkgs.buildPythonApplication rec { propagatedBuildInputs = with python3.pkgs; [ dbus-python - pbr pycairo pygobject3 - setuptools + setuptools-scm + pyyaml ]; - PBR_VERSION = version; # pbr needs either .git directory, sdist, or env var + SETUPTOOLS_SCM_PRETEND_VERSION = version; makeFlags = [ - "prefix=${placeholder "out"}" + "PREFIX=${placeholder "out"}" ]; preFixup = '' diff --git a/pkgs/applications/terminal-emulators/mrxvt/default.nix b/pkgs/applications/terminal-emulators/mrxvt/default.nix index 006616bd944..b05872b11e4 100644 --- a/pkgs/applications/terminal-emulators/mrxvt/default.nix +++ b/pkgs/applications/terminal-emulators/mrxvt/default.nix @@ -22,7 +22,8 @@ stdenv.mkDerivation rec { sha256 = "1mqhmnlz32lvld9rc6c1hyz7gjw4anwf39yhbsjkikcgj1das0zl"; }; - buildInputs = [ libX11 libXft libXi xorgproto libSM libICE freetype pkg-config which ]; + nativeBuildInputs = [ pkg-config ]; + buildInputs = [ libX11 libXft libXi xorgproto libSM libICE freetype which ]; configureFlags = [ "--with-x" diff --git a/pkgs/applications/terminal-emulators/rxvt-unicode/default.nix b/pkgs/applications/terminal-emulators/rxvt-unicode/default.nix index 0eccceb5a4f..ede0638e7a0 100644 --- a/pkgs/applications/terminal-emulators/rxvt-unicode/default.nix +++ b/pkgs/applications/terminal-emulators/rxvt-unicode/default.nix @@ -44,9 +44,10 @@ stdenv.mkDerivation { sha256 = "0badnkjsn3zps24r5iggj8k5v4f00npc77wqg92pcn1q5z8r677y"; }; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ libX11 libXt libXft ncurses # required to build the terminfo file - fontconfig freetype pkg-config libXrender + fontconfig freetype libXrender libptytty ] ++ optional perlSupport perl ++ optional gdkPixbufSupport gdk-pixbuf; diff --git a/pkgs/applications/version-management/gerrit/default.nix b/pkgs/applications/version-management/gerrit/default.nix index e1e1fe17547..335a899b4da 100644 --- a/pkgs/applications/version-management/gerrit/default.nix +++ b/pkgs/applications/version-management/gerrit/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "gerrit"; - version = "3.5.1"; + version = "3.6.2"; src = fetchurl { url = "https://gerrit-releases.storage.googleapis.com/gerrit-${version}.war"; - sha256 = "3fb5de878b6470dc8ef65ce22f2709cb8baecb5f16d89497dfaa33a0f33f7920"; + sha256 = "sha256-/OckQD6r9WSMx9Vt44eFpzsacH6VMa6NJX6sj2HBQSs="; }; buildCommand = '' diff --git a/pkgs/applications/version-management/git-and-tools/ghorg/default.nix b/pkgs/applications/version-management/git-and-tools/ghorg/default.nix index af2bff40357..a9bf9229e02 100644 --- a/pkgs/applications/version-management/git-and-tools/ghorg/default.nix +++ b/pkgs/applications/version-management/git-and-tools/ghorg/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "ghorg"; - version = "1.8.7"; + version = "1.8.8"; src = fetchFromGitHub { owner = "gabrie30"; repo = "ghorg"; rev = "v${version}"; - sha256 = "sha256-3NlGS6DTTE0FCsvNPBNaxxbYcKKwE3gd1jsfdxlTl38="; + sha256 = "sha256-xB/TdeXC0V8dZs6N6Uq1+gzG84j9uhSrwkSbIMwUWSk="; }; doCheck = false; diff --git a/pkgs/applications/version-management/git-and-tools/git-extras/default.nix b/pkgs/applications/version-management/git-and-tools/git-extras/default.nix index 6e2377bbec4..937a771b1e4 100644 --- a/pkgs/applications/version-management/git-and-tools/git-extras/default.nix +++ b/pkgs/applications/version-management/git-and-tools/git-extras/default.nix @@ -1,29 +1,21 @@ { lib , stdenv , fetchFromGitHub -, fetchpatch , unixtools , which }: stdenv.mkDerivation rec { pname = "git-extras"; - version = "6.4.0"; + version = "6.5.0"; src = fetchFromGitHub { owner = "tj"; repo = "git-extras"; rev = version; - sha256 = "sha256-Cn7IXMzgg0QIsNIHz+X14Gkmop0UbsSBlGlGkmg71ek="; + sha256 = "sha256-7VNkIFjz4stRT48a9uXks84W7/tP3p7esMJKnIe1O+8="; }; - patches = [ - (fetchpatch { - url = "https://github.com/tj/git-extras/commit/66961ad4911cd0f1a908530f2b725bacc7d198e1.patch"; - sha256 = "sha256-iC1lUf/NmuAPADxDWZ2JScHIMgYjIaR0edlGpq0qCOc="; - }) - ]; - postPatch = '' patchShebangs check_dependencies.sh ''; diff --git a/pkgs/applications/version-management/git-and-tools/git-gone/default.nix b/pkgs/applications/version-management/git-and-tools/git-gone/default.nix index 7a26b38b6b2..5bdab4b081e 100644 --- a/pkgs/applications/version-management/git-and-tools/git-gone/default.nix +++ b/pkgs/applications/version-management/git-and-tools/git-gone/default.nix @@ -1,29 +1,27 @@ { lib , stdenv -, fetchFromGitea +, fetchFromGitHub , rustPlatform -, libiconv , Security , installShellFiles }: rustPlatform.buildRustPackage rec { pname = "git-gone"; - version = "0.4.1"; + version = "0.4.2"; - src = fetchFromGitea { - domain = "codeberg.org"; - owner = "flausch"; - repo = pname; + src = fetchFromGitHub { + owner = "lunaryorn"; + repo = "git-gone"; rev = "v${version}"; - sha256 = "sha256-kqKFs3xvTVHnsLpLC9gjj1dcPChhegmupNrbWy+7C6o="; + sha256 = "sha256-aKBNi797aMPawxD+BLpk0sazXz2g0XTzmDpR/mk07no="; }; - cargoSha256 = "sha256-8R13eHS69fQ3r3LYlnB3nPTPX7VesUPlAUCmQEpUUdw="; + cargoSha256 = "sha256-vO1ePqDIy5HEBauO3OkMCovrgtIVB9biJExw/q89ivE="; nativeBuildInputs = [ installShellFiles ]; - buildInputs = lib.optionals stdenv.isDarwin [ libiconv Security ]; + buildInputs = lib.optionals stdenv.isDarwin [ Security ]; postInstall = '' installManPage git-gone.1 @@ -31,8 +29,8 @@ rustPlatform.buildRustPackage rec { meta = with lib; { description = "Cleanup stale Git branches of merge requests"; - homepage = "https://codeberg.org/flausch/git-gone"; - changelog = "https://codeberg.org/flausch/git-gone/raw/tag/v${version}/CHANGELOG.md"; + homepage = "https://github.com/lunaryorn/git-gone"; + changelog = "https://github.com/lunaryorn/git-gone/raw/v${version}/CHANGELOG.md"; license = licenses.asl20; maintainers = [ maintainers.marsam ]; }; diff --git a/pkgs/applications/version-management/git-and-tools/git-interactive-rebase-tool/default.nix b/pkgs/applications/version-management/git-and-tools/git-interactive-rebase-tool/default.nix index b85f6d973cf..97e2cf0537a 100644 --- a/pkgs/applications/version-management/git-and-tools/git-interactive-rebase-tool/default.nix +++ b/pkgs/applications/version-management/git-and-tools/git-interactive-rebase-tool/default.nix @@ -2,16 +2,16 @@ rustPlatform.buildRustPackage rec { pname = "git-interactive-rebase-tool"; - version = "2.2.0"; + version = "2.2.1"; src = fetchFromGitHub { owner = "MitMaro"; repo = pname; rev = version; - sha256 = "sha256-++KTMzTt84dowoZP+Bc9E/jUS21YN5ybKrlpQUKCir0="; + sha256 = "sha256-KqItunxh24jAkvsAMnByS+dhm+wyUqmdF96qEDs/5mI="; }; - cargoSha256 = "sha256-OUaP/nDs589FYaGYcleRMTQNu3/q/2wBjHSv2q8OyjA="; + cargoSha256 = "sha256-510kNtcSsuXADMmSqu2t0HsnPUS/Jedsfvjnh2k+vDs="; buildInputs = lib.optionals stdenv.isDarwin [ libiconv Security ]; diff --git a/pkgs/applications/version-management/git-and-tools/git-nomad/default.nix b/pkgs/applications/version-management/git-and-tools/git-nomad/default.nix new file mode 100644 index 00000000000..f11e978ceaf --- /dev/null +++ b/pkgs/applications/version-management/git-and-tools/git-nomad/default.nix @@ -0,0 +1,22 @@ +{ lib, rustPlatform, fetchFromGitHub }: + +rustPlatform.buildRustPackage rec { + pname = "git-nomad"; + version = "0.6.0"; + + src = fetchFromGitHub { + owner = "rraval"; + repo = pname; + rev = "v${version}"; + sha256 = "sha256-1PXAdXafkPOIVzaWjW/RlWHwYhMqPoj0Hj5JmOMUj8A="; + }; + + cargoHash = "sha256-ULcdJRla1JwI0y6ngW9xQXjNw2wO48HuAczsNIsJJK0="; + + meta = with lib; { + description = "Synchronize work-in-progress git branches in a light weight fashion"; + homepage = "https://github.com/rraval/git-nomad"; + license = licenses.mit; + maintainers = with maintainers; [ rraval ]; + }; +} diff --git a/pkgs/applications/version-management/git-and-tools/git-publish/default.nix b/pkgs/applications/version-management/git-and-tools/git-publish/default.nix new file mode 100644 index 00000000000..0f0eeff156b --- /dev/null +++ b/pkgs/applications/version-management/git-and-tools/git-publish/default.nix @@ -0,0 +1,32 @@ +{ lib, stdenv, python, perl, fetchFromGitHub, installShellFiles }: +stdenv.mkDerivation rec { + pname = "git-publish"; + version = "1.8.1"; + + src = fetchFromGitHub { + owner = "stefanha"; + repo = "git-publish"; + rev = "v${version}"; + sha256 = "14rz5kli6sz171cvdc46z3z0nnpd57rliwr6nn6vjjc49yyfwgl4"; + }; + + nativeBuildInputs = [ perl installShellFiles ]; + buildInputs = [ python ]; + + installPhase = '' + runHook preInstall + + install -Dm0755 git-publish $out/bin/git-publish + pod2man git-publish.pod > git-publish.1 + installManPage git-publish.1 + + runHook postInstall + ''; + + meta = { + description = "Prepare and store patch revisions as git tags"; + license = lib.licenses.mit; + maintainers = [ lib.maintainers.lheckemann ]; + homepage = "https://github.com/stefanha/git-publish"; + }; +} diff --git a/pkgs/applications/version-management/git-and-tools/git/default.nix b/pkgs/applications/version-management/git-and-tools/git/default.nix index 95327f31ddc..9b2c755b109 100644 --- a/pkgs/applications/version-management/git-and-tools/git/default.nix +++ b/pkgs/applications/version-management/git-and-tools/git/default.nix @@ -74,7 +74,7 @@ stdenv.mkDerivation (finalAttrs: { done ''; - nativeBuildInputs = [ gettext perlPackages.perl makeWrapper ] + nativeBuildInputs = [ gettext perlPackages.perl makeWrapper pkg-config ] ++ lib.optionals withManual [ asciidoc texinfo xmlto docbook2x docbook_xsl docbook_xml_dtd_45 libxslt ]; buildInputs = [ curl openssl zlib expat cpio libiconv bash ] @@ -82,7 +82,7 @@ stdenv.mkDerivation (finalAttrs: { ++ lib.optionals guiSupport [tcl tk] ++ lib.optionals withpcre2 [ pcre2 ] ++ lib.optionals stdenv.isDarwin [ Security CoreServices ] - ++ lib.optionals withLibsecret [ pkg-config glib libsecret ]; + ++ lib.optionals withLibsecret [ glib libsecret ]; # required to support pthread_cancel() NIX_LDFLAGS = lib.optionalString (stdenv.cc.isGNU && stdenv.hostPlatform.libc == "glibc") "-lgcc_s" @@ -252,7 +252,7 @@ stdenv.mkDerivation (finalAttrs: { '') + lib.optionalString withManual ''# Install man pages - make -j $NIX_BUILD_CORES -l $NIX_BUILD_CORES PERL_PATH="${buildPackages.perl}/bin/perl" cmd-list.made install install-html \ + make -j $NIX_BUILD_CORES PERL_PATH="${buildPackages.perl}/bin/perl" cmd-list.made install install-html \ -C Documentation '' + (if guiSupport then '' diff --git a/pkgs/applications/version-management/git-and-tools/thicket/default.nix b/pkgs/applications/version-management/git-and-tools/thicket/default.nix index 6aa639be86c..1f331ffd496 100644 --- a/pkgs/applications/version-management/git-and-tools/thicket/default.nix +++ b/pkgs/applications/version-management/git-and-tools/thicket/default.nix @@ -1,22 +1,21 @@ { lib -, fetchFromGitHub , crystal +, fetchFromGitHub }: crystal.buildCrystalPackage rec { pname = "thicket"; - version = "0.1.5"; + version = "0.1.6"; src = fetchFromGitHub { owner = "taylorthurlow"; repo = pname; rev = "v${version}"; - sha256 = "sha256-7X1RKj/FWgJdgA7P746hU0ndUM49fH79ZNRSkvNZYFg="; + sha256 = "sha256-sF+fNKEZEfjpW3buh6kFUpL1P0yO9g4SrTb0rhx1uNc="; }; format = "shards"; - shardsFile = ./shards.nix; crystalBinaries.thicket.src = "src/thicket.cr"; # there is one test that tries to clone a repo diff --git a/pkgs/applications/version-management/git-and-tools/thicket/shards.nix b/pkgs/applications/version-management/git-and-tools/thicket/shards.nix deleted file mode 100644 index 1c035d332e5..00000000000 --- a/pkgs/applications/version-management/git-and-tools/thicket/shards.nix +++ /dev/null @@ -1,8 +0,0 @@ -{ - ameba = { - owner = "veelenga"; - repo = "ameba"; - rev = "v0.14.3"; - sha256 = "1cfr95xi6hsyxw1wlrh571hc775xhwmssk3k14i8b7dgbwfmm5x1"; - }; -} diff --git a/pkgs/applications/version-management/p4/default.nix b/pkgs/applications/version-management/p4/default.nix index 4f61be6669a..8a54d4eb77b 100644 --- a/pkgs/applications/version-management/p4/default.nix +++ b/pkgs/applications/version-management/p4/default.nix @@ -1,31 +1,115 @@ -{ stdenv, fetchurl, lib, autoPatchelfHook }: +{ stdenv +, fetchurl +, fetchzip +, lib +, emptyDirectory +, linkFarm +, symlinkJoin +, jam +, libcxx +, libcxxabi +, openssl +, xcbuild +, CoreServices +, Foundation +, Security +}: +let + opensslStatic = openssl.override { + static = true; + }; + androidZlibContrib = + let + src = fetchzip { + url = "https://android.googlesource.com/platform/external/zlib/+archive/61174f4fd262c6075f88768465f308aae95a2f04.tar.gz"; + sha256 = "sha256-EMzKAHcEWOUugcHKH2Fj3ZaIHC9UlgO4ULKe3RvgxvI="; + stripRoot = false; + }; + in + linkFarm "android-zlib-contrib" [ + # We only want to keep the contrib directory as the other files conflict + # with p4's own zlib files. (For the same reason, we can't use the + # cone-based Git sparse checkout, either.) + { name = "contrib"; path = "${src}/contrib"; } + ]; + libcxxUnified = symlinkJoin { + inherit (libcxx) name; + paths = [ libcxx libcxxabi ]; + }; +in stdenv.mkDerivation rec { pname = "p4"; - version = "2021.2.2201121"; + version = "2022.1.2305383"; src = fetchurl { - # actually https://cdist2.perforce.com/perforce/r21.2/bin.linux26x86_64/helix-core-server.tgz but upstream deletes releases - url = "https://web.archive.org/web/20211118024943/https://cdist2.perforce.com/perforce/r21.2/bin.linux26x86_64/helix-core-server.tgz"; - sha256 = "sha256-SrfI2ZD7KDyttCd8+fo8g4UZKljYYO/SbzqrS9tAcC8="; + # Upstream replaces minor versions, so use archived URL. + url = "https://web.archive.org/web/20220901184735id_/https://ftp.perforce.com/perforce/r22.1/bin.tools/p4source.tgz"; + sha256 = "27ab3ddd7b178b05cf0b710e941650dac0688d294110ebafda9027732c0944c6"; }; - sourceRoot = "."; + nativeBuildInputs = [ jam ]; + + buildInputs = lib.optionals stdenv.isDarwin [ CoreServices Foundation Security ]; + + outputs = [ "out" "bin" "dev" ]; - dontBuild = true; + hardeningDisable = lib.optionals stdenv.isDarwin [ "strictoverflow" ]; - nativeBuildInputs = [ autoPatchelfHook ]; + jamFlags = + [ + "-sEXEC=bin.unix" + "-sCROSS_COMPILE=${stdenv.cc.targetPrefix}" + "-sMALLOC_OVERRIDE=no" + "-sSSLINCDIR=${lib.getDev opensslStatic}/include" + "-sSSLLIBDIR=${lib.getLib opensslStatic}/lib" + ] + ++ lib.optionals stdenv.cc.isClang [ "-sOSCOMP=clang" "-sCLANGVER=${stdenv.cc.cc.version}" ] + ++ lib.optionals stdenv.cc.isGNU [ "-sOSCOMP=gcc" "-sGCCVER=${stdenv.cc.cc.version}" ] + ++ lib.optionals stdenv.isLinux [ "-sOSVER=26" ] + ++ lib.optionals stdenv.isDarwin [ + "-sOSVER=1013" + "-sMACOSX_SDK=${emptyDirectory}" + "-sLIBC++DIR=${libcxxUnified}/lib" + ]; + + CCFLAGS = + # The file contrib/optimizations/slide_hash_neon.h is missing from the + # upstream distribution. It comes from the Android/Chromium sources. + lib.optionals stdenv.isAarch64 [ "-I${androidZlibContrib}" ]; + + "C++FLAGS" = + # Avoid a compilation error that only occurs for 4-byte longs. + lib.optionals stdenv.isi686 [ "-Wno-narrowing" ] + # See the "Header dependency changes" section of + # https://www.gnu.org/software/gcc/gcc-11/porting_to.html for more + # information on why we need to include these. + ++ lib.optionals + (stdenv.cc.isClang || (stdenv.cc.isGNU && lib.versionAtLeast stdenv.cc.cc.version "11.0.0")) + [ "-include" "limits" "-include" "thread" ]; + + buildPhase = '' + runHook preBuild + jam $jamFlags -j$NIX_BUILD_CORES p4 + jam $jamFlags -j$NIX_BUILD_CORES -sPRODUCTION=yes p4api.tar + runHook postBuild + ''; installPhase = '' - install -D --target $out/bin p4 p4broker p4d p4p + runHook preInstall + mkdir -p $bin/bin $dev $out + cp bin.unix/p4 $bin/bin + cp -r bin.unix/p4api-${version}/include $dev + cp -r bin.unix/p4api-${version}/lib $out + runHook postInstall ''; - meta = { - description = "Perforce Command-Line Client"; + meta = with lib; { + description = "Perforce Helix Core command-line client and APIs"; homepage = "https://www.perforce.com"; - sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ]; - license = lib.licenses.unfree; - platforms = [ "x86_64-linux" ]; - maintainers = with lib.maintainers; [ corngood ]; + license = licenses.bsd2; + mainProgram = "p4"; + platforms = platforms.unix; + maintainers = with maintainers; [ corngood impl ]; }; } diff --git a/pkgs/applications/version-management/p4d/default.nix b/pkgs/applications/version-management/p4d/default.nix index 5b98131303d..e2cf8e1013c 100644 --- a/pkgs/applications/version-management/p4d/default.nix +++ b/pkgs/applications/version-management/p4d/default.nix @@ -47,6 +47,6 @@ stdenv.mkDerivation { license = licenses.unfree; mainProgram = "p4d"; platforms = builtins.attrNames srcs; - maintainers = with maintainers; [ impl ]; + maintainers = with maintainers; [ corngood impl ]; }; } diff --git a/pkgs/applications/version-management/srvc/default.nix b/pkgs/applications/version-management/srvc/default.nix new file mode 100644 index 00000000000..8e32b42912c --- /dev/null +++ b/pkgs/applications/version-management/srvc/default.nix @@ -0,0 +1,22 @@ +{ lib, fetchFromGitHub, rustPlatform }: + +rustPlatform.buildRustPackage rec { + pname = "srvc"; + version = "0.6.0"; + + src = fetchFromGitHub { + owner = "insilica"; + repo = "rs-srvc"; + rev = "v${version}"; + sha256 = "sha256-PBs86cvEacvCt/2JnURL4qKvXGXRZHWaGYrPUSsnt0I="; + }; + + cargoSha256 = "sha256-5CUbfI67gsINdHcxN8KbIN10Mu90rAU53DbmQ5QotWg="; + + meta = with lib; { + description = "Sysrev version control"; + homepage = "https://github.com/insilica/rs-srvc"; + license = licenses.asl20; + maintainers = with maintainers; [ john-shaffer ]; + }; +} diff --git a/pkgs/applications/video/byzanz/default.nix b/pkgs/applications/video/byzanz/default.nix index 5e60bb7fd90..d7ad9846306 100644 --- a/pkgs/applications/video/byzanz/default.nix +++ b/pkgs/applications/video/byzanz/default.nix @@ -34,12 +34,11 @@ stdenv.mkDerivation { "-Wno-error=incompatible-pointer-types" ]; - nativeBuildInputs = [ pkg-config ]; + nativeBuildInputs = [ pkg-config intltool ]; buildInputs = [ which gnome.gnome-common glib - intltool libtool cairo gtk3 diff --git a/pkgs/applications/video/entangle/default.nix b/pkgs/applications/video/entangle/default.nix index 761a3849c31..b163fc2aa60 100644 --- a/pkgs/applications/video/entangle/default.nix +++ b/pkgs/applications/video/entangle/default.nix @@ -33,6 +33,7 @@ , libxkbcommon , orc , pcre +, pcre2 , udev , util-linux , xorg @@ -94,7 +95,8 @@ stdenv.mkDerivation rec { libunwind libxkbcommon orc - pcre + pcre # required by libselinux before we USE_PCRE2 + pcre2 # required by glib-2.0 udev util-linux zstd diff --git a/pkgs/applications/video/haruna/default.nix b/pkgs/applications/video/haruna/default.nix index e873ac4a3bc..0d063e70718 100644 --- a/pkgs/applications/video/haruna/default.nix +++ b/pkgs/applications/video/haruna/default.nix @@ -26,13 +26,13 @@ mkDerivation rec { pname = "haruna"; - version = "0.9.1"; + version = "0.9.3"; src = fetchFromGitLab { owner = "multimedia"; repo = "haruna"; rev = "v${version}"; - hash = "sha256-pkskrzpKDsMg7DOC335zXknEIKh9Ku2NgyeinawQtiY="; + hash = "sha256-JINvLmiS6EnkAmxbqPJI+J9Wk4+ZXwZZm1x5Ew7FCBg="; domain = "invent.kde.org"; }; diff --git a/pkgs/applications/video/losslesscut-bin/appimage.nix b/pkgs/applications/video/losslesscut-bin/appimage.nix index 87518479db4..8e84406c60e 100644 --- a/pkgs/applications/video/losslesscut-bin/appimage.nix +++ b/pkgs/applications/video/losslesscut-bin/appimage.nix @@ -5,7 +5,7 @@ let nameRepo = "lossless-cut"; nameCamel = "LosslessCut"; name = "${pname}-${version}"; - nameSource = "${nameCamel}-linux.AppImage"; + nameSource = "${nameCamel}-linux-x86_64.AppImage"; nameExecutable = "losslesscut"; owner = "mifi"; src = fetchurl { diff --git a/pkgs/applications/video/losslesscut-bin/default.nix b/pkgs/applications/video/losslesscut-bin/default.nix index be7786f9102..77dd6e0c35f 100644 --- a/pkgs/applications/video/losslesscut-bin/default.nix +++ b/pkgs/applications/video/losslesscut-bin/default.nix @@ -1,9 +1,9 @@ { callPackage, stdenvNoCC, lib }: let - version = "3.43.0"; - appimage = callPackage ./appimage.nix { inherit version; sha256 = "1xfr3i4gsi13wj374yr5idhgs0q71s4h33yxdr7b7xjdg2gb8lp1"; }; - dmg = callPackage ./dmg.nix { inherit version; sha256 = "1axki47hrxx5m0hrmjpxcya091lahqfnh2pd3zhn5dd496slq8an"; }; - windows = callPackage ./windows.nix { inherit version; sha256 = "1v00gym18hjxxm42dfqmw7vhwh8lgjz2jgv6fmg234npr3d43py5"; }; + version = "3.46.2"; + appimage = callPackage ./appimage.nix { inherit version; sha256 = "sha256-p+HscYsChR90JHdYjurY4OOHgveGXbJomz1klBCsF2Q="; }; + dmg = callPackage ./dmg.nix { inherit version; sha256 = "sha256-350MHWwyjCdvIv6W6lX6Hr6PLDiAwO/e+KW0yKi/Yoc="; }; + windows = callPackage ./windows.nix { inherit version; sha256 = "sha256-48ifhvIWSPmmnBnW8tP7NeWPIWJYWNqGP925O50CAwQ="; }; in ( if stdenvNoCC.isDarwin then dmg else if stdenvNoCC.isCygwin then windows diff --git a/pkgs/applications/video/losslesscut-bin/dmg.nix b/pkgs/applications/video/losslesscut-bin/dmg.nix index 3cbd77198b9..e334c0a58b9 100644 --- a/pkgs/applications/video/losslesscut-bin/dmg.nix +++ b/pkgs/applications/video/losslesscut-bin/dmg.nix @@ -4,7 +4,7 @@ let pname = "losslesscut"; nameRepo = "lossless-cut"; nameCamel = "LosslessCut"; - nameSource = "${nameCamel}-mac.dmg"; + nameSource = "${nameCamel}-mac-x64.dmg"; nameApp = nameCamel + ".app"; owner = "mifi"; src = fetchurl { diff --git a/pkgs/applications/video/losslesscut-bin/windows.nix b/pkgs/applications/video/losslesscut-bin/windows.nix index 0e6ed9b0412..89ccbca4832 100644 --- a/pkgs/applications/video/losslesscut-bin/windows.nix +++ b/pkgs/applications/video/losslesscut-bin/windows.nix @@ -1,7 +1,7 @@ { stdenvNoCC , lib , fetchurl -, unzip +, p7zip , version , sha256 , useMklink ? false @@ -11,8 +11,8 @@ let pname = "losslesscut"; nameRepo = "lossless-cut"; nameCamel = "LosslessCut"; - nameSourceBase = "${nameCamel}-win"; - nameSource = "${nameSourceBase}.zip"; + nameSourceBase = "${nameCamel}-win-x64"; + nameSource = "${nameSourceBase}.7z"; nameExecutable = "${nameCamel}.exe"; owner = "mifi"; getSymlinkCommand = if (customSymlinkCommand != null) then customSymlinkCommand @@ -27,10 +27,10 @@ in stdenvNoCC.mkDerivation { inherit sha256; }; - nativeBuildInputs = [ unzip ]; + nativeBuildInputs = [ p7zip ]; unpackPhase = '' - unzip $src -d ${nameSourceBase} + 7z x $src -o${nameSourceBase} ''; sourceRoot = nameSourceBase; diff --git a/pkgs/applications/video/showmethekey/default.nix b/pkgs/applications/video/showmethekey/default.nix index 219010eeb39..d50b7ababfa 100644 --- a/pkgs/applications/video/showmethekey/default.nix +++ b/pkgs/applications/video/showmethekey/default.nix @@ -1,6 +1,7 @@ { lib , stdenv , fetchFromGitHub +, fetchpatch , glib , meson , ninja @@ -10,10 +11,11 @@ , pango , libinput , gtk4 -, wrapGAppsHook +, wrapGAppsHook4 , libxkbcommon , pkg-config }: + stdenv.mkDerivation rec { pname = "showmethekey"; version = "1.7.3"; @@ -25,6 +27,14 @@ stdenv.mkDerivation rec { sha256 = "sha256-hq4X4dG25YauMjsNXC6Flco9pEpVj3EM2JiFWbRrPaA="; }; + patches = [ + (fetchpatch { + name = "use-gtk4-update-icon-cache.patch"; + url = "https://github.com/alynxzhou/showmethekey/commit/c73102dc2825d00cbaf323fcfc96736381dc67ae.patch"; + sha256 = "sha256-6QDY5eQ9A8q3LZeD7v6WI/4vYXc/XXVY/WENA1nvIKo="; + }) + ]; + nativeBuildInputs = [ glib meson @@ -36,7 +46,7 @@ stdenv.mkDerivation rec { libevdev libinput libxkbcommon - wrapGAppsHook + wrapGAppsHook4 ]; buildInputs = [ diff --git a/pkgs/applications/video/video-trimmer/default.nix b/pkgs/applications/video/video-trimmer/default.nix index dbeb85821de..230654d9957 100644 --- a/pkgs/applications/video/video-trimmer/default.nix +++ b/pkgs/applications/video/video-trimmer/default.nix @@ -3,7 +3,6 @@ , fetchFromGitLab , fetchpatch , rustPlatform -, gnome , pkg-config , meson , wrapGAppsHook4 diff --git a/pkgs/applications/virtualization/buildkit-nix/default.nix b/pkgs/applications/virtualization/buildkit-nix/default.nix index 940a1d7bb7f..5e0ddf6a040 100644 --- a/pkgs/applications/virtualization/buildkit-nix/default.nix +++ b/pkgs/applications/virtualization/buildkit-nix/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "buildkit-nix"; - version = "0.0.3"; + version = "0.1.0"; src = fetchFromGitHub { - owner = "AkihiroSuda"; + owner = "reproducible-containers"; repo = pname; rev = "v${version}"; - sha256 = "sha256-hrrvDby+UDwY0wvq/HIP9lYVEa/flr/1gtGXHMN8Mug="; + sha256 = "sha256-gKTCBz7om1M7UBzyMJDetNGcKLkQKMyuzwrHBbuuifM="; }; vendorSha256 = "sha256-1H5oWgcaamf+hocABWWnzJUjWiqwk1ZZtbBjF6EKzzU="; @@ -19,7 +19,7 @@ buildGoModule rec { meta = with lib; { description = "Nix frontend for BuildKit"; - homepage = "https://github.com/AkihiroSuda/buildkit-nix/"; + homepage = "https://github.com/reproducible-containers/buildkit-nix/"; license = licenses.asl20; platforms = platforms.linux; maintainers = with maintainers; [ lesuisse ]; diff --git a/pkgs/applications/virtualization/pods/default.nix b/pkgs/applications/virtualization/pods/default.nix index 10af8fe502c..cb4cea09ec2 100644 --- a/pkgs/applications/virtualization/pods/default.nix +++ b/pkgs/applications/virtualization/pods/default.nix @@ -8,7 +8,7 @@ , ninja , pkg-config , rustPlatform -, wrapGAppsHook +, wrapGAppsHook4 , gtksourceview5 , libadwaita }: @@ -40,7 +40,7 @@ stdenv.mkDerivation rec { rustPlatform.cargoSetupHook rustPlatform.rust.cargo rustPlatform.rust.rustc - wrapGAppsHook + wrapGAppsHook4 ]; buildInputs = [ diff --git a/pkgs/applications/virtualization/qemu/9pfs-use-GHashTable-for-fid-table.patch b/pkgs/applications/virtualization/qemu/9pfs-use-GHashTable-for-fid-table.patch new file mode 100644 index 00000000000..2e6f1699637 --- /dev/null +++ b/pkgs/applications/virtualization/qemu/9pfs-use-GHashTable-for-fid-table.patch @@ -0,0 +1,371 @@ +From 8ab70b8958a8f9cb9bd316eecd3ccbcf05c06614 Mon Sep 17 00:00:00 2001 +From: Linus Heckemann <git@sphalerite.org> +Date: Tue, 4 Oct 2022 12:41:21 +0200 +Subject: [PATCH] 9pfs: use GHashTable for fid table +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +The previous implementation would iterate over the fid table for +lookup operations, resulting in an operation with O(n) complexity on +the number of open files and poor cache locality -- for every open, +stat, read, write, etc operation. + +This change uses a hashtable for this instead, significantly improving +the performance of the 9p filesystem. The runtime of NixOS's simple +installer test, which copies ~122k files totalling ~1.8GiB from 9p, +decreased by a factor of about 10. + +Signed-off-by: Linus Heckemann <git@sphalerite.org> +Reviewed-by: Philippe Mathieu-Daudé <f4bug@amsat.org> +Reviewed-by: Greg Kurz <groug@kaod.org> +[CS: - Retain BUG_ON(f->clunked) in get_fid(). + - Add TODO comment in clunk_fid(). ] +Message-Id: <20221004104121.713689-1-git@sphalerite.org> +[CS: - Drop unnecessary goto and out: label. ] +Signed-off-by: Christian Schoenebeck <qemu_oss@crudebyte.com> +--- + hw/9pfs/9p.c | 194 +++++++++++++++++++++++++++++---------------------- + hw/9pfs/9p.h | 2 +- + 2 files changed, 112 insertions(+), 84 deletions(-) + +diff --git a/hw/9pfs/9p.c b/hw/9pfs/9p.c +index aebadeaa03..9bf13133e5 100644 +--- a/hw/9pfs/9p.c ++++ b/hw/9pfs/9p.c +@@ -256,7 +256,8 @@ static size_t v9fs_string_size(V9fsString *str) + } + + /* +- * returns 0 if fid got re-opened, 1 if not, < 0 on error */ ++ * returns 0 if fid got re-opened, 1 if not, < 0 on error ++ */ + static int coroutine_fn v9fs_reopen_fid(V9fsPDU *pdu, V9fsFidState *f) + { + int err = 1; +@@ -282,33 +283,32 @@ static V9fsFidState *coroutine_fn get_fid(V9fsPDU *pdu, int32_t fid) + V9fsFidState *f; + V9fsState *s = pdu->s; + +- QSIMPLEQ_FOREACH(f, &s->fid_list, next) { ++ f = g_hash_table_lookup(s->fids, GINT_TO_POINTER(fid)); ++ if (f) { + BUG_ON(f->clunked); +- if (f->fid == fid) { +- /* +- * Update the fid ref upfront so that +- * we don't get reclaimed when we yield +- * in open later. +- */ +- f->ref++; +- /* +- * check whether we need to reopen the +- * file. We might have closed the fd +- * while trying to free up some file +- * descriptors. +- */ +- err = v9fs_reopen_fid(pdu, f); +- if (err < 0) { +- f->ref--; +- return NULL; +- } +- /* +- * Mark the fid as referenced so that the LRU +- * reclaim won't close the file descriptor +- */ +- f->flags |= FID_REFERENCED; +- return f; ++ /* ++ * Update the fid ref upfront so that ++ * we don't get reclaimed when we yield ++ * in open later. ++ */ ++ f->ref++; ++ /* ++ * check whether we need to reopen the ++ * file. We might have closed the fd ++ * while trying to free up some file ++ * descriptors. ++ */ ++ err = v9fs_reopen_fid(pdu, f); ++ if (err < 0) { ++ f->ref--; ++ return NULL; + } ++ /* ++ * Mark the fid as referenced so that the LRU ++ * reclaim won't close the file descriptor ++ */ ++ f->flags |= FID_REFERENCED; ++ return f; + } + return NULL; + } +@@ -317,12 +317,11 @@ static V9fsFidState *alloc_fid(V9fsState *s, int32_t fid) + { + V9fsFidState *f; + +- QSIMPLEQ_FOREACH(f, &s->fid_list, next) { ++ f = g_hash_table_lookup(s->fids, GINT_TO_POINTER(fid)); ++ if (f) { + /* If fid is already there return NULL */ + BUG_ON(f->clunked); +- if (f->fid == fid) { +- return NULL; +- } ++ return NULL; + } + f = g_new0(V9fsFidState, 1); + f->fid = fid; +@@ -333,7 +332,7 @@ static V9fsFidState *alloc_fid(V9fsState *s, int32_t fid) + * reclaim won't close the file descriptor + */ + f->flags |= FID_REFERENCED; +- QSIMPLEQ_INSERT_TAIL(&s->fid_list, f, next); ++ g_hash_table_insert(s->fids, GINT_TO_POINTER(fid), f); + + v9fs_readdir_init(s->proto_version, &f->fs.dir); + v9fs_readdir_init(s->proto_version, &f->fs_reclaim.dir); +@@ -424,12 +423,12 @@ static V9fsFidState *clunk_fid(V9fsState *s, int32_t fid) + { + V9fsFidState *fidp; + +- QSIMPLEQ_FOREACH(fidp, &s->fid_list, next) { +- if (fidp->fid == fid) { +- QSIMPLEQ_REMOVE(&s->fid_list, fidp, V9fsFidState, next); +- fidp->clunked = true; +- return fidp; +- } ++ /* TODO: Use g_hash_table_steal_extended() instead? */ ++ fidp = g_hash_table_lookup(s->fids, GINT_TO_POINTER(fid)); ++ if (fidp) { ++ g_hash_table_remove(s->fids, GINT_TO_POINTER(fid)); ++ fidp->clunked = true; ++ return fidp; + } + return NULL; + } +@@ -439,10 +438,15 @@ void coroutine_fn v9fs_reclaim_fd(V9fsPDU *pdu) + int reclaim_count = 0; + V9fsState *s = pdu->s; + V9fsFidState *f; ++ GHashTableIter iter; ++ gpointer fid; ++ ++ g_hash_table_iter_init(&iter, s->fids); ++ + QSLIST_HEAD(, V9fsFidState) reclaim_list = + QSLIST_HEAD_INITIALIZER(reclaim_list); + +- QSIMPLEQ_FOREACH(f, &s->fid_list, next) { ++ while (g_hash_table_iter_next(&iter, &fid, (gpointer *) &f)) { + /* + * Unlink fids cannot be reclaimed. Check + * for them and skip them. Also skip fids +@@ -514,72 +518,85 @@ void coroutine_fn v9fs_reclaim_fd(V9fsPDU *pdu) + } + } + ++/* ++ * This is used when a path is removed from the directory tree. Any ++ * fids that still reference it must not be closed from then on, since ++ * they cannot be reopened. ++ */ + static int coroutine_fn v9fs_mark_fids_unreclaim(V9fsPDU *pdu, V9fsPath *path) + { +- int err; ++ int err = 0; + V9fsState *s = pdu->s; +- V9fsFidState *fidp, *fidp_next; ++ V9fsFidState *fidp; ++ gpointer fid; ++ GHashTableIter iter; ++ /* ++ * The most common case is probably that we have exactly one ++ * fid for the given path, so preallocate exactly one. ++ */ ++ g_autoptr(GArray) to_reopen = g_array_sized_new(FALSE, FALSE, ++ sizeof(V9fsFidState *), 1); ++ gint i; + +- fidp = QSIMPLEQ_FIRST(&s->fid_list); +- if (!fidp) { +- return 0; +- } ++ g_hash_table_iter_init(&iter, s->fids); + + /* +- * v9fs_reopen_fid() can yield : a reference on the fid must be held +- * to ensure its pointer remains valid and we can safely pass it to +- * QSIMPLEQ_NEXT(). The corresponding put_fid() can also yield so +- * we must keep a reference on the next fid as well. So the logic here +- * is to get a reference on a fid and only put it back during the next +- * iteration after we could get a reference on the next fid. Start with +- * the first one. ++ * We iterate over the fid table looking for the entries we need ++ * to reopen, and store them in to_reopen. This is because ++ * v9fs_reopen_fid() and put_fid() yield. This allows the fid table ++ * to be modified in the meantime, invalidating our iterator. + */ +- for (fidp->ref++; fidp; fidp = fidp_next) { ++ while (g_hash_table_iter_next(&iter, &fid, (gpointer *) &fidp)) { + if (fidp->path.size == path->size && + !memcmp(fidp->path.data, path->data, path->size)) { +- /* Mark the fid non reclaimable. */ +- fidp->flags |= FID_NON_RECLAIMABLE; +- +- /* reopen the file/dir if already closed */ +- err = v9fs_reopen_fid(pdu, fidp); +- if (err < 0) { +- put_fid(pdu, fidp); +- return err; +- } +- } +- +- fidp_next = QSIMPLEQ_NEXT(fidp, next); +- +- if (fidp_next) { + /* +- * Ensure the next fid survives a potential clunk request during +- * put_fid() below and v9fs_reopen_fid() in the next iteration. ++ * Ensure the fid survives a potential clunk request during ++ * v9fs_reopen_fid or put_fid. + */ +- fidp_next->ref++; ++ fidp->ref++; ++ fidp->flags |= FID_NON_RECLAIMABLE; ++ g_array_append_val(to_reopen, fidp); + } ++ } + +- /* We're done with this fid */ +- put_fid(pdu, fidp); ++ for (i = 0; i < to_reopen->len; i++) { ++ fidp = g_array_index(to_reopen, V9fsFidState*, i); ++ /* reopen the file/dir if already closed */ ++ err = v9fs_reopen_fid(pdu, fidp); ++ if (err < 0) { ++ break; ++ } + } + +- return 0; ++ for (i = 0; i < to_reopen->len; i++) { ++ put_fid(pdu, g_array_index(to_reopen, V9fsFidState*, i)); ++ } ++ return err; + } + + static void coroutine_fn virtfs_reset(V9fsPDU *pdu) + { + V9fsState *s = pdu->s; + V9fsFidState *fidp; ++ GList *freeing; ++ /* ++ * Get a list of all the values (fid states) in the table, which ++ * we then... ++ */ ++ g_autoptr(GList) fids = g_hash_table_get_values(s->fids); + +- /* Free all fids */ +- while (!QSIMPLEQ_EMPTY(&s->fid_list)) { +- /* Get fid */ +- fidp = QSIMPLEQ_FIRST(&s->fid_list); +- fidp->ref++; ++ /* ... remove from the table, taking over ownership. */ ++ g_hash_table_steal_all(s->fids); + +- /* Clunk fid */ +- QSIMPLEQ_REMOVE(&s->fid_list, fidp, V9fsFidState, next); ++ /* ++ * This allows us to release our references to them asynchronously without ++ * iterating over the hash table and risking iterator invalidation ++ * through concurrent modifications. ++ */ ++ for (freeing = fids; freeing; freeing = freeing->next) { ++ fidp = freeing->data; ++ fidp->ref++; + fidp->clunked = true; +- + put_fid(pdu, fidp); + } + } +@@ -3205,6 +3222,8 @@ static int coroutine_fn v9fs_complete_rename(V9fsPDU *pdu, V9fsFidState *fidp, + V9fsFidState *tfidp; + V9fsState *s = pdu->s; + V9fsFidState *dirfidp = NULL; ++ GHashTableIter iter; ++ gpointer fid; + + v9fs_path_init(&new_path); + if (newdirfid != -1) { +@@ -3238,11 +3257,13 @@ static int coroutine_fn v9fs_complete_rename(V9fsPDU *pdu, V9fsFidState *fidp, + if (err < 0) { + goto out; + } ++ + /* + * Fixup fid's pointing to the old name to + * start pointing to the new name + */ +- QSIMPLEQ_FOREACH(tfidp, &s->fid_list, next) { ++ g_hash_table_iter_init(&iter, s->fids); ++ while (g_hash_table_iter_next(&iter, &fid, (gpointer *) &tfidp)) { + if (v9fs_path_is_ancestor(&fidp->path, &tfidp->path)) { + /* replace the name */ + v9fs_fix_path(&tfidp->path, &new_path, strlen(fidp->path.data)); +@@ -3320,6 +3341,8 @@ static int coroutine_fn v9fs_fix_fid_paths(V9fsPDU *pdu, V9fsPath *olddir, + V9fsPath oldpath, newpath; + V9fsState *s = pdu->s; + int err; ++ GHashTableIter iter; ++ gpointer fid; + + v9fs_path_init(&oldpath); + v9fs_path_init(&newpath); +@@ -3336,7 +3359,8 @@ static int coroutine_fn v9fs_fix_fid_paths(V9fsPDU *pdu, V9fsPath *olddir, + * Fixup fid's pointing to the old name to + * start pointing to the new name + */ +- QSIMPLEQ_FOREACH(tfidp, &s->fid_list, next) { ++ g_hash_table_iter_init(&iter, s->fids); ++ while (g_hash_table_iter_next(&iter, &fid, (gpointer *) &tfidp)) { + if (v9fs_path_is_ancestor(&oldpath, &tfidp->path)) { + /* replace the name */ + v9fs_fix_path(&tfidp->path, &newpath, strlen(oldpath.data)); +@@ -4226,7 +4250,7 @@ int v9fs_device_realize_common(V9fsState *s, const V9fsTransport *t, + s->ctx.fmode = fse->fmode; + s->ctx.dmode = fse->dmode; + +- QSIMPLEQ_INIT(&s->fid_list); ++ s->fids = g_hash_table_new(NULL, NULL); + qemu_co_rwlock_init(&s->rename_lock); + + if (s->ops->init(&s->ctx, errp) < 0) { +@@ -4286,6 +4310,10 @@ void v9fs_device_unrealize_common(V9fsState *s) + if (s->ctx.fst) { + fsdev_throttle_cleanup(s->ctx.fst); + } ++ if (s->fids) { ++ g_hash_table_destroy(s->fids); ++ s->fids = NULL; ++ } + g_free(s->tag); + qp_table_destroy(&s->qpd_table); + qp_table_destroy(&s->qpp_table); +diff --git a/hw/9pfs/9p.h b/hw/9pfs/9p.h +index 994f952600..10fd2076c2 100644 +--- a/hw/9pfs/9p.h ++++ b/hw/9pfs/9p.h +@@ -339,7 +339,7 @@ typedef struct { + struct V9fsState { + QLIST_HEAD(, V9fsPDU) free_list; + QLIST_HEAD(, V9fsPDU) active_list; +- QSIMPLEQ_HEAD(, V9fsFidState) fid_list; ++ GHashTable *fids; + FileOperations *ops; + FsContext ctx; + char *tag; +-- +2.36.2 + diff --git a/pkgs/applications/virtualization/qemu/default.nix b/pkgs/applications/virtualization/qemu/default.nix index 4f55b48bc54..410c3bf2d9e 100644 --- a/pkgs/applications/virtualization/qemu/default.nix +++ b/pkgs/applications/virtualization/qemu/default.nix @@ -3,7 +3,7 @@ , bison, lzo, snappy, libaio, libtasn1, gnutls, nettle, curl, ninja, meson, sigtool , makeWrapper, runtimeShell, removeReferencesTo , attr, libcap, libcap_ng, socat -, CoreServices, Cocoa, Hypervisor, rez, setfile +, CoreServices, Cocoa, Hypervisor, rez, setfile, vmnet , guestAgentSupport ? with stdenv.hostPlatform; isLinux || isSunOS || isWindows , numaSupport ? stdenv.isLinux && !stdenv.isAarch32, numactl , seccompSupport ? stdenv.isLinux, libseccomp @@ -60,7 +60,7 @@ stdenv.mkDerivation rec { gnutls nettle curl ] ++ lib.optionals ncursesSupport [ ncurses ] - ++ lib.optionals stdenv.isDarwin [ CoreServices Cocoa Hypervisor rez setfile ] + ++ lib.optionals stdenv.isDarwin [ CoreServices Cocoa Hypervisor rez setfile vmnet ] ++ lib.optionals seccompSupport [ libseccomp ] ++ lib.optionals numaSupport [ numactl ] ++ lib.optionals alsaSupport [ alsa-lib ] @@ -111,6 +111,7 @@ stdenv.mkDerivation rec { sha256 = "sha256-oC+bRjEHixv1QEFO9XAm4HHOwoiT+NkhknKGPydnZ5E="; revert = true; }) + ./9pfs-use-GHashTable-for-fid-table.patch ] ++ lib.optional nixosTestRunner ./force-uid0-on-9p.patch; diff --git a/pkgs/applications/virtualization/virt-viewer/default.nix b/pkgs/applications/virtualization/virt-viewer/default.nix index 95909e36d0c..ed882709aa1 100644 --- a/pkgs/applications/virtualization/virt-viewer/default.nix +++ b/pkgs/applications/virtualization/virt-viewer/default.nix @@ -19,7 +19,8 @@ , pkg-config , python3 , shared-mime-info -, spice-gtk ? null +# https://gitlab.com/virt-viewer/virt-viewer/-/issues/88 +, spice-gtk_libsoup2 ? null , spice-protocol ? null , spiceSupport ? true , vte @@ -29,7 +30,7 @@ assert spiceSupport -> ( gdbm != null && libcap != null - && spice-gtk != null + && spice-gtk_libsoup2 != null && spice-protocol != null ); @@ -78,12 +79,12 @@ stdenv.mkDerivation rec { ] ++ optionals spiceSupport [ gdbm libcap - spice-gtk + spice-gtk_libsoup2 spice-protocol ]; # Required for USB redirection PolicyKit rules file - propagatedUserEnvPkgs = optional spiceSupport spice-gtk; + propagatedUserEnvPkgs = optional spiceSupport spice-gtk_libsoup2; strictDeps = true; diff --git a/pkgs/applications/virtualization/xen/generic.nix b/pkgs/applications/virtualization/xen/generic.nix index cde71d2b87f..234d72e4682 100644 --- a/pkgs/applications/virtualization/xen/generic.nix +++ b/pkgs/applications/virtualization/xen/generic.nix @@ -66,9 +66,9 @@ stdenv.mkDerivation (rec { hardeningDisable = [ "stackprotector" "fortify" "pic" ]; - nativeBuildInputs = [ pkg-config ]; + nativeBuildInputs = [ pkg-config cmake ]; buildInputs = [ - cmake which + which # Xen bison bzip2 checkpolicy dev86 figlet flex gettext glib acpica-tools libaio diff --git a/pkgs/applications/window-managers/dwm/default.nix b/pkgs/applications/window-managers/dwm/default.nix index 68e1467c5a8..a0979007077 100644 --- a/pkgs/applications/window-managers/dwm/default.nix +++ b/pkgs/applications/window-managers/dwm/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "dwm"; - version = "6.3"; + version = "6.4"; src = fetchurl { url = "https://dl.suckless.org/dwm/${pname}-${version}.tar.gz"; - sha256 = "utqgKFKbH7of1/moTztk8xGQRmyFgBG1Pi97cMajB40="; + sha256 = "sha256-+pwNaaWESFB2z8GICf1wXlwggNr7E9XnKaNkbKdwOm4="; }; buildInputs = [ libX11 libXinerama libXft ]; diff --git a/pkgs/applications/window-managers/fbpanel/default.nix b/pkgs/applications/window-managers/fbpanel/default.nix index 33a313eb8ee..6dc22a664d3 100644 --- a/pkgs/applications/window-managers/fbpanel/default.nix +++ b/pkgs/applications/window-managers/fbpanel/default.nix @@ -9,8 +9,9 @@ stdenv.mkDerivation rec { url = "mirror://sourceforge/fbpanel/${pname}-${version}.tbz2"; sha256 = "e14542cc81ea06e64dd4708546f5fd3f5e01884c3e4617885c7ef22af8cf3965"; }; + nativeBuildInputs = [ pkg-config ]; buildInputs = - [ pkg-config libX11 libXmu libXpm gtk2 libpng libjpeg libtiff librsvg gdk-pixbuf gdk-pixbuf-xlib.dev ]; + [ libX11 libXmu libXpm gtk2 libpng libjpeg libtiff librsvg gdk-pixbuf gdk-pixbuf-xlib.dev ]; preConfigure = "patchShebangs ."; diff --git a/pkgs/applications/window-managers/sway/wsr.nix b/pkgs/applications/window-managers/sway/wsr.nix index 64d9fd7d7db..23a82bd2df0 100644 --- a/pkgs/applications/window-managers/sway/wsr.nix +++ b/pkgs/applications/window-managers/sway/wsr.nix @@ -2,16 +2,16 @@ rustPlatform.buildRustPackage rec { pname = "swaywsr"; - version = "1.1.0"; + version = "1.1.1"; src = fetchFromGitHub { owner = "pedroscaff"; repo = pname; - rev = "6c4671c702f647395d983aaf607286db1c692db6"; - sha256 = "0bmpbhyvgnbi5baj6v0wdxpdh9cnlzvcc44vh3vihmzsp6i5q05a"; + rev = "0276b43824af5c40085248c1275feaa372c412a5"; + sha256 = "sha256-KCMsn9uevmmjHkP4zwfaWSUI10JgT3M91iqmXI9Cv2Y="; }; - cargoSha256 = "1pmkyw60ggn5filb47nyf97g1arrw7nfa4yjndnx35zw12mkj61d"; + cargoSha256 = "sha256-j/9p28ezy8m5NXReOmG1oryWd+GcY/fNW6i7OrEvjSc="; nativeBuildInputs = [ python3 ]; buildInputs = [ libxcb ]; diff --git a/pkgs/applications/window-managers/tinywm/default.nix b/pkgs/applications/window-managers/tinywm/default.nix index 8fa6a84b721..50fbae605da 100644 --- a/pkgs/applications/window-managers/tinywm/default.nix +++ b/pkgs/applications/window-managers/tinywm/default.nix @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { dontConfigure = true; buildPhase = '' - ${stdenv.cc}/bin/cc -Wall -pedantic -I${libX11}/include tinywm.c -L${libX11}/lib -lX11 -o tinywm + $CC -Wall -pedantic -I${libX11}/include tinywm.c -L${libX11}/lib -lX11 -o tinywm ''; installPhase = '' |