diff options
Diffstat (limited to 'pkgs')
472 files changed, 7105 insertions, 4685 deletions
diff --git a/pkgs/applications/audio/easyeffects/default.nix b/pkgs/applications/audio/easyeffects/default.nix index ff7cce36712de..46b801bba331d 100644 --- a/pkgs/applications/audio/easyeffects/default.nix +++ b/pkgs/applications/audio/easyeffects/default.nix @@ -35,13 +35,13 @@ stdenv.mkDerivation rec { pname = "easyeffects"; - version = "6.2.5"; + version = "6.2.6"; src = fetchFromGitHub { owner = "wwmm"; repo = "easyeffects"; rev = "v${version}"; - sha256 = "sha256-LvTvNBo3aUGUD4vA04YtINFBjTplhmkxj3FlbTZDTA0="; + sha256 = "sha256-1kXYh2Qk0Wj0LgHTcRVAKro7LAPV/UM5i9VmHjmxTx0="; }; nativeBuildInputs = [ diff --git a/pkgs/applications/audio/geonkick/default.nix b/pkgs/applications/audio/geonkick/default.nix index 9739a88586ae0..0a99edd7b069c 100644 --- a/pkgs/applications/audio/geonkick/default.nix +++ b/pkgs/applications/audio/geonkick/default.nix @@ -3,13 +3,13 @@ stdenv.mkDerivation rec { pname = "geonkick"; - version = "2.9.0"; + version = "2.9.1"; src = fetchFromGitLab { owner = "iurie-sw"; repo = pname; rev = "v${version}"; - sha256 = "sha256-/BDK1PyRw4xOt+rzC9yX29aRQb1aDnDBIenSz+859OY="; + sha256 = "sha256-XSqcj8+X6QMBnIusPB9VNrgcbdiWhNMOYeFyKklGmO8="; }; nativeBuildInputs = [ cmake pkg-config ]; diff --git a/pkgs/applications/audio/ncpamixer/default.nix b/pkgs/applications/audio/ncpamixer/default.nix index aca96ef5da351..7663d1745d2fb 100644 --- a/pkgs/applications/audio/ncpamixer/default.nix +++ b/pkgs/applications/audio/ncpamixer/default.nix @@ -24,6 +24,6 @@ stdenv.mkDerivation rec { homepage = "https://github.com/fulhax/ncpamixer"; license = licenses.mit; platforms = platforms.linux; - maintainers = with maintainers; [ StijnDW SuperSandro2000 ]; + maintainers = with maintainers; [ StijnDW ] ++ teams.c3d2.members; }; } diff --git a/pkgs/applications/audio/tidal-hifi/default.nix b/pkgs/applications/audio/tidal-hifi/default.nix new file mode 100644 index 0000000000000..09b5c3f410c10 --- /dev/null +++ b/pkgs/applications/audio/tidal-hifi/default.nix @@ -0,0 +1,119 @@ +{ lib +, stdenv +, fetchurl +, autoPatchelfHook +, dpkg +, makeWrapper +, alsa-lib +, at-spi2-atk +, at-spi2-core +, atk +, cairo +, cups +, dbus +, expat +, ffmpeg +, fontconfig +, freetype +, gdk-pixbuf +, glib +, gtk3 +, libappindicator-gtk3 +, libdbusmenu +, libdrm +, libnotify +, libpulseaudio +, libsecret +, libuuid +, libxkbcommon +, mesa +, nss +, pango +, systemd +, xdg-utils +, xorg +}: + +stdenv.mkDerivation rec { + pname = "tidal-hifi"; + version = "4.0.1"; + + src = fetchurl { + url = "https://github.com/Mastermindzh/tidal-hifi/releases/download/${version}/tidal-hifi_${version}_amd64.deb"; + sha256 = "1azxdr2m84ci6ppzy0j17wmza7prlnw055fks6s4i77sjw45rhlq"; + }; + + nativeBuildInputs = [ autoPatchelfHook dpkg makeWrapper ]; + + buildInputs = [ + alsa-lib + at-spi2-atk + at-spi2-core + atk + cairo + cups + dbus + expat + ffmpeg + fontconfig + freetype + gdk-pixbuf + glib + gtk3 + pango + systemd + mesa # for libgbm + nss + libuuid + libdrm + libnotify + libsecret + libpulseaudio + libxkbcommon + libappindicator-gtk3 + xorg.libX11 + xorg.libxcb + xorg.libXcomposite + xorg.libXcursor + xorg.libXdamage + xorg.libXext + xorg.libXfixes + xorg.libXi + xorg.libXrandr + xorg.libXrender + xorg.libXScrnSaver + xorg.libxshmfence + xorg.libXtst + ]; + + runtimeDependencies = + [ (lib.getLib systemd) libnotify libdbusmenu xdg-utils ]; + + unpackPhase = "dpkg-deb -x $src ."; + + installPhase = '' + runHook preInstall + + mkdir -p "$out/bin" + cp -R "opt" "$out" + cp -R "usr/share" "$out/share" + chmod -R g-w "$out" + + runHook postInstall + ''; + + postFixup = '' + makeWrapper $out/opt/tidal-hifi/tidal-hifi $out/bin/tidal-hifi \ + --prefix LD_LIBRARY_PATH : "${lib.makeLibraryPath buildInputs}" \ + "''${gappsWrapperArgs[@]}" + ''; + + meta = with lib; { + description = "The web version of Tidal running in electron with hifi support thanks to widevine"; + homepage = "https://github.com/Mastermindzh/tidal-hifi"; + changelog = "https://github.com/Mastermindzh/tidal-hifi/releases/tag/${version}"; + license = licenses.mit; + maintainers = with maintainers; [ alternateved ]; + platforms = [ "x86_64-linux" ]; + }; +} diff --git a/pkgs/applications/blockchains/btcpayserver/default.nix b/pkgs/applications/blockchains/btcpayserver/default.nix index f93a8f329ef61..59879df61677c 100644 --- a/pkgs/applications/blockchains/btcpayserver/default.nix +++ b/pkgs/applications/blockchains/btcpayserver/default.nix @@ -26,7 +26,7 @@ buildDotnetModule rec { meta = with lib; { description = "Self-hosted, open-source cryptocurrency payment processor"; homepage = "https://btcpayserver.org"; - maintainers = with maintainers; [ kcalvinalvin earvstedt ]; + maintainers = with maintainers; [ kcalvinalvin erikarvstedt ]; license = licenses.mit; platforms = platforms.linux; }; diff --git a/pkgs/applications/blockchains/clightning/default.nix b/pkgs/applications/blockchains/clightning/default.nix index 2cf31ae3c95fb..27e2fea2845ec 100644 --- a/pkgs/applications/blockchains/clightning/default.nix +++ b/pkgs/applications/blockchains/clightning/default.nix @@ -21,11 +21,11 @@ let in stdenv.mkDerivation rec { pname = "clightning"; - version = "0.11.1"; + version = "0.11.2"; src = fetchurl { url = "https://github.com/ElementsProject/lightning/releases/download/v${version}/clightning-v${version}.zip"; - sha256 = "0vsh6gpv3458pfc5cggay9pw7bxjzyxpcniks9b2s3y1rxwk15xi"; + sha256 = "09qqfnj809dpwar9ijm3ic5cv4019hsnvh2h6sfpdqp1smf9igxs"; }; # when building on darwin we need dawin.cctools to provide the correct libtool diff --git a/pkgs/applications/blockchains/lndconnect/default.nix b/pkgs/applications/blockchains/lndconnect/default.nix index f1745655a56e3..9a3aa137453b4 100644 --- a/pkgs/applications/blockchains/lndconnect/default.nix +++ b/pkgs/applications/blockchains/lndconnect/default.nix @@ -1,4 +1,4 @@ -{ lib, buildGoModule, fetchFromGitHub, testVersion, lndconnect }: +{ lib, buildGoModule, fetchFromGitHub, lndconnect }: buildGoModule rec { pname = "lndconnect"; version = "0.2.1"; diff --git a/pkgs/applications/blockchains/nbxplorer/default.nix b/pkgs/applications/blockchains/nbxplorer/default.nix index 4d684f6a93505..3810d6f2251ce 100644 --- a/pkgs/applications/blockchains/nbxplorer/default.nix +++ b/pkgs/applications/blockchains/nbxplorer/default.nix @@ -22,7 +22,7 @@ buildDotnetModule rec { meta = with lib; { description = "Minimalist UTXO tracker for HD Cryptocurrency Wallets"; - maintainers = with maintainers; [ kcalvinalvin earvstedt ]; + maintainers = with maintainers; [ kcalvinalvin erikarvstedt ]; license = licenses.mit; platforms = platforms.linux; }; diff --git a/pkgs/applications/editors/ldtk/default.nix b/pkgs/applications/editors/ldtk/default.nix new file mode 100644 index 0000000000000..175026440daaa --- /dev/null +++ b/pkgs/applications/editors/ldtk/default.nix @@ -0,0 +1,58 @@ +{ lib, stdenv, fetchurl, makeWrapper, makeDesktopItem, copyDesktopItems, unzip +, appimage-run }: + +stdenv.mkDerivation rec { + pname = "ldtk"; + version = "1.1.3"; + + src = fetchurl { + url = "https://github.com/deepnight/ldtk/releases/download/v${version}/ubuntu-distribution.zip"; + sha256 = "sha256-qw7+4k4IH2+9DX4ny8EBbSlyXBrk/y91W04+zWPGupk="; + }; + + nativeBuildInputs = [ unzip makeWrapper copyDesktopItems appimage-run ]; + + buildInputs = [ appimage-run ]; + + unpackPhase = '' + runHook preUnpack + + unzip $src + appimage-run -x src 'LDtk ${version} installer.AppImage' + + runHook postUnpack + ''; + + installPhase = '' + runHook preInstall + + install -Dm644 'LDtk ${version} installer.AppImage' $out/share/ldtk.AppImage + makeWrapper ${appimage-run}/bin/appimage-run $out/bin/ldtk \ + --add-flags $out/share/ldtk.AppImage + install -Dm644 src/ldtk.png $out/share/icons/hicolor/1024x1024/apps/ldtk.png + + runHook postInstall + ''; + + desktopItems = [ + (makeDesktopItem { + name = "ldtk"; + exec = "ldtk"; + icon = "ldtk"; + terminal = false; + desktopName = "LDtk"; + comment = "2D level editor"; + categories = [ "Utility" ]; + mimeTypes = [ "application/json" ]; + }) + ]; + + meta = with lib; { + homepage = "https://ldtk.io/"; + description = "Modern, lightweight and efficient 2D level editor"; + license = licenses.mit; + platforms = [ "x86_64-linux" ]; + maintainers = with maintainers; [ felschr ]; + sourceProvenance = with sourceTypes; [ binaryBytecode ]; + }; +} diff --git a/pkgs/applications/editors/pixelorama/default.nix b/pkgs/applications/editors/pixelorama/default.nix new file mode 100644 index 0000000000000..9846d10491c1f --- /dev/null +++ b/pkgs/applications/editors/pixelorama/default.nix @@ -0,0 +1,57 @@ +{ lib, stdenv, fetchFromGitHub, godot-headless, godot-export-templates }: + +let + preset = + if stdenv.isLinux then + if stdenv.is64bit then "Linux/X11 64-bit" + else "Linux/X11 32-bit" + else if stdenv.isDarwin then "Mac OSX" + else throw "unsupported platform"; +in stdenv.mkDerivation rec { + pname = "pixelorama"; + version = "0.10.1"; + + src = fetchFromGitHub { + owner = "Orama-Interactive"; + repo = "Pixelorama"; + rev = "v${version}"; + sha256 = "sha256-+Sfhv66skHawe6jzfzQyFxejN5TvTdmWunzl0/7yy4M="; + }; + + nativeBuildInputs = [ + godot-headless + ]; + + buildPhase = '' + runHook preBuild + + export HOME=$(mktemp -d) + mkdir -p $HOME/.local/share/godot/ + ln -s "${godot-export-templates}/share/godot/templates" "$HOME/.local/share/godot/templates" + mkdir -p build + godot-headless -v --export "${preset}" ./build/pixelorama + godot-headless -v --export-pack "${preset}" ./build/pixelorama.pck + + runHook postBuild + ''; + + installPhase = '' + runHook preInstall + + install -D -m 755 -t $out/libexec ./build/pixelorama + install -D -m 644 -t $out/libexec ./build/pixelorama.pck + install -D -m 644 -t $out/share/applications ./Misc/Linux/com.orama_interactive.Pixelorama.desktop + install -d -m 755 $out/bin + ln -s $out/libexec/pixelorama $out/bin/pixelorama + + runHook postInstall + ''; + + meta = with lib; { + homepage = "https://orama-interactive.itch.io/pixelorama"; + description = "A free & open-source 2D sprite editor, made with the Godot Engine!"; + license = licenses.mit; + platforms = [ "i686-linux" "x86_64-linux" ]; + maintainers = with maintainers; [ felschr ]; + }; +} diff --git a/pkgs/applications/emulators/atari800/default.nix b/pkgs/applications/emulators/atari800/default.nix index 37e0d83f14060..c1f685827047a 100644 --- a/pkgs/applications/emulators/atari800/default.nix +++ b/pkgs/applications/emulators/atari800/default.nix @@ -4,13 +4,13 @@ with lib; stdenv.mkDerivation rec { pname = "atari800"; - version = "4.2.0"; + version = "5.0.0"; src = fetchFromGitHub { owner = "atari800"; repo = "atari800"; rev = "ATARI800_${replaceChars ["."] ["_"] version}"; - sha256 = "15l08clqqayi9izrgsz9achan6gl4x57wqsc8mad3yn0xayzz3qy"; + sha256 = "sha256-+eJXhqPyU0GhmzF7DbteTXzEnn5klCor9Io/UgXQfQg="; }; nativeBuildInputs = [ autoreconfHook ]; diff --git a/pkgs/applications/gis/gmt/default.nix b/pkgs/applications/gis/gmt/default.nix index 0420619e87790..c6e0846e54dc3 100644 --- a/pkgs/applications/gis/gmt/default.nix +++ b/pkgs/applications/gis/gmt/default.nix @@ -9,10 +9,10 @@ stdenv.mkDerivation rec { pname = "gmt"; - version = "6.3.0"; + version = "6.4.0"; src = fetchurl { url = "https://github.com/GenericMappingTools/gmt/releases/download/${version}/gmt-${version}-src.tar.gz"; - sha256 = "sha256-LNBz2LHxG4elmziqeq+OOceUDStVpGoyZ+I4AuyKCNE="; + sha256 = "sha256-0mfAx9b7MMnqfgKe8n2tsm/9e5LLS0cD+aO6Do85Ohs="; }; nativeBuildInputs = [ cmake ]; diff --git a/pkgs/applications/graphics/mcomix/default.nix b/pkgs/applications/graphics/mcomix/default.nix index 530ae0013b5a5..5c6e49ea9a64e 100644 --- a/pkgs/applications/graphics/mcomix/default.nix +++ b/pkgs/applications/graphics/mcomix/default.nix @@ -5,7 +5,7 @@ , gtk3 , mcomix , python3 -, testVersion +, testers , wrapGAppsHook # Recommended Dependencies: @@ -46,7 +46,7 @@ python3.pkgs.buildPythonApplication rec { ) ''; - passthru.tests.version = testVersion { + passthru.tests.version = testers.testVersion { package = mcomix; }; diff --git a/pkgs/applications/graphics/solvespace/default.nix b/pkgs/applications/graphics/solvespace/default.nix index 68744831538c4..e0605ad81e43f 100644 --- a/pkgs/applications/graphics/solvespace/default.nix +++ b/pkgs/applications/graphics/solvespace/default.nix @@ -7,6 +7,7 @@ , at-spi2-core , cairo , dbus +, eigen , freetype , fontconfig , glew @@ -18,6 +19,7 @@ , libpng , libselinux , libsepol +, libspnav , libthai , libxkbcommon , pangomm @@ -29,13 +31,13 @@ stdenv.mkDerivation rec { pname = "solvespace"; - version = "3.0"; + version = "3.1"; src = fetchFromGitHub { owner = pname; repo = pname; rev = "v${version}"; - hash = "sha256-aaYqUZ0c1lCL91fmxtKFAAE2uUWrjnDB3WdcqdutXhE="; + hash = "sha256-sSDht8pBrOG1YpsWfC/CLTTWh2cI5pn2PXGH900Z0yA="; fetchSubmodules = true; }; @@ -49,6 +51,7 @@ stdenv.mkDerivation rec { at-spi2-core cairo dbus + eigen freetype fontconfig glew @@ -60,6 +63,7 @@ stdenv.mkDerivation rec { libpng libselinux libsepol + libspnav libthai libxkbcommon pangomm diff --git a/pkgs/applications/graphics/synfigstudio/default.nix b/pkgs/applications/graphics/synfigstudio/default.nix index 57f3560233609..a77a0313223bf 100644 --- a/pkgs/applications/graphics/synfigstudio/default.nix +++ b/pkgs/applications/graphics/synfigstudio/default.nix @@ -1,122 +1,136 @@ -{ lib, stdenv, fetchFromGitHub, boost, cairo, gettext, glibmm, gtk3, gtkmm3 -, libjack2, libsigcxx, libxmlxx, makeWrapper, mlt-qt5, pango, pkg-config -, imagemagick, intltool, autoreconfHook, which, gnome +{ lib +, stdenv +, fetchFromGitHub +, pkg-config +, autoreconfHook +, wrapGAppsHook + +, boost +, cairo +, gettext +, glibmm +, gtk3 +, gtkmm3 +, libjack2 +, libsigcxx +, libxmlxx +, mlt +, pango +, imagemagick +, intltool +, gnome +, harfbuzz +, freetype +, fribidi +, openexr +, fftw }: let - version = "1.0.2"; + version = "1.5.1"; + src = fetchFromGitHub { + owner = "synfig"; + repo = "synfig"; + rev = "v${version}"; + hash = "sha256-9vBYESaSgW/1FWH2uFBvPiYvxLlX0LLNnd4S7ACJcwI="; + }; ETL = stdenv.mkDerivation { - name = "ETL-0.04.19"; - - src = fetchFromGitHub { - repo = "synfig"; - owner = "synfig"; - rev = version; - sha256 = "09ldkvzczqvb1yvlibd62y56dkyprxlr0w3rk38rcs7jnrhj2cqc"; - }; + pname = "ETL"; + inherit version src; - postUnpack = "sourceRoot=\${sourceRoot}/ETL/"; + sourceRoot = "source/ETL"; - nativeBuildInputs = [ autoreconfHook ]; + nativeBuildInputs = [ + pkg-config + autoreconfHook + ]; + buildInputs = [ + glibmm + ]; }; synfig = stdenv.mkDerivation { pname = "synfig"; - inherit version; - - src = fetchFromGitHub { - repo = "synfig"; - owner = "synfig"; - rev = version; - sha256 = "09ldkvzczqvb1yvlibd62y56dkyprxlr0w3rk38rcs7jnrhj2cqc"; - }; + inherit version src; - postUnpack = "sourceRoot=\${sourceRoot}/synfig-core/"; + sourceRoot = "source/synfig-core"; configureFlags = [ "--with-boost=${boost.dev}" "--with-boost-libdir=${boost.out}/lib" ]; - nativeBuildInputs = [ pkg-config autoreconfHook gettext ]; + nativeBuildInputs = [ + pkg-config + autoreconfHook + gettext + intltool + ]; buildInputs = [ - ETL boost cairo glibmm mlt-qt5 libsigcxx libxmlxx pango + ETL + boost + cairo + glibmm + mlt + libsigcxx + libxmlxx + pango + imagemagick + harfbuzz + freetype + fribidi + openexr + fftw ]; - - meta.broken = true; }; in stdenv.mkDerivation { pname = "synfigstudio"; - inherit version; + inherit version src; - src = fetchFromGitHub { - repo = "synfig"; - owner = "synfig"; - rev = version; - sha256 = "09ldkvzczqvb1yvlibd62y56dkyprxlr0w3rk38rcs7jnrhj2cqc"; - }; - - postUnpack = "sourceRoot=\${sourceRoot}/synfig-studio/"; + sourceRoot = "source/synfig-studio"; postPatch = '' - for i in \ - brushlib/brushlib.hpp \ - gui/canvasview.cpp \ - gui/compview.cpp \ - gui/docks/dock_canvasspecific.cpp \ - gui/docks/dock_children.cpp \ - gui/docks/dock_curves.cpp \ - gui/docks/dock_history.cpp \ - gui/docks/dock_keyframes.cpp \ - gui/docks/dock_layergroups.cpp \ - gui/docks/dock_layers.cpp \ - gui/docks/dock_metadata.cpp \ - gui/docks/dock_params.cpp \ - gui/docks/dock_timetrack.cpp \ - gui/docks/dock_toolbox.cpp \ - gui/docks/dockable.cpp \ - gui/docks/dockdialog.cpp \ - gui/docks/dockmanager.h \ - gui/duck.h \ - gui/duckmatic.cpp \ - gui/duckmatic.h \ - gui/instance.cpp \ - gui/instance.h \ - gui/states/state_stroke.h \ - gui/states/state_zoom.cpp \ - gui/widgets/widget_curves.cpp \ - gui/workarea.cpp \ - gui/workarearenderer/workarearenderer.h \ - synfigapp/action_system.h \ - synfigapp/canvasinterface.h \ - synfigapp/instance.h \ - synfigapp/main.h \ - synfigapp/uimanager.h - do - substituteInPlace src/"$i" --replace '#include <sigc++/object.h>' '#include <sigc++/sigc++.h>' - substituteInPlace src/"$i" --replace '#include <sigc++/hide.h>' '#include <sigc++/adaptors/hide.h>' - substituteInPlace src/"$i" --replace '#include <sigc++/retype.h>' '#include <sigc++/adaptors/retype.h>' - done + patchShebangs images/splash_screen_development.sh ''; - preConfigure = "./bootstrap.sh"; + preConfigure = '' + ./bootstrap.sh + ''; - nativeBuildInputs = [ pkg-config autoreconfHook gettext makeWrapper ]; + nativeBuildInputs = [ + pkg-config + autoreconfHook + gettext + wrapGAppsHook + ]; buildInputs = [ - ETL boost cairo glibmm gtk3 gtkmm3 imagemagick intltool - libjack2 libsigcxx libxmlxx mlt-qt5 - synfig which gnome.adwaita-icon-theme + ETL + synfig + boost + cairo + glibmm + gtk3 + gtkmm3 + imagemagick + intltool + libjack2 + libsigcxx + libxmlxx + mlt + gnome.adwaita-icon-theme + openexr + fftw ]; - postInstall = '' - wrapProgram "$out/bin/synfigstudio" \ - --prefix XDG_DATA_DIRS : "$XDG_ICON_DIRS:$GSETTINGS_SCHEMAS_PATH" - ''; - enableParallelBuilding = true; + passthru = { + # Expose libraries and cli tools + inherit ETL synfig; + }; + meta = with lib; { description = "A 2D animation program"; homepage = "http://www.synfig.org"; diff --git a/pkgs/applications/graphics/tesseract/tesseract3.nix b/pkgs/applications/graphics/tesseract/tesseract3.nix index 0e5f38ae7918b..16365674706ed 100644 --- a/pkgs/applications/graphics/tesseract/tesseract3.nix +++ b/pkgs/applications/graphics/tesseract/tesseract3.nix @@ -34,7 +34,7 @@ stdenv.mkDerivation rec { description = "OCR engine"; homepage = "https://github.com/tesseract-ocr/tesseract"; license = lib.licenses.asl20; - maintainers = with lib.maintainers; [ viric earvstedt ]; + maintainers = with lib.maintainers; [ viric erikarvstedt ]; platforms = with lib.platforms; linux ++ darwin; }; } diff --git a/pkgs/applications/graphics/tesseract/tesseract4.nix b/pkgs/applications/graphics/tesseract/tesseract4.nix index d1f936fab079f..36c4c694a16a8 100644 --- a/pkgs/applications/graphics/tesseract/tesseract4.nix +++ b/pkgs/applications/graphics/tesseract/tesseract4.nix @@ -45,7 +45,7 @@ stdenv.mkDerivation rec { description = "OCR engine"; homepage = "https://github.com/tesseract-ocr/tesseract"; license = lib.licenses.asl20; - maintainers = with lib.maintainers; [ viric earvstedt ]; + maintainers = with lib.maintainers; [ viric erikarvstedt ]; platforms = with lib.platforms; linux ++ darwin; }; } diff --git a/pkgs/applications/graphics/vengi-tools/default.nix b/pkgs/applications/graphics/vengi-tools/default.nix index eb5033a4a97c4..fb44d36f62a6d 100644 --- a/pkgs/applications/graphics/vengi-tools/default.nix +++ b/pkgs/applications/graphics/vengi-tools/default.nix @@ -29,13 +29,13 @@ stdenv.mkDerivation rec { pname = "vengi-tools"; - version = "0.0.18"; + version = "0.0.20"; src = fetchFromGitHub { owner = "mgerhardy"; repo = "vengi"; rev = "v${version}"; - sha256 = "sha256-Ur1X5FhOa87jbjWBXievBfCHW+qP/8bqLiyKAC8+KU4="; + sha256 = "sha256-WsG6mjO90QQNsAarxdupZvXubdy06JjQmVYUzygl8l4="; }; nativeBuildInputs = [ diff --git a/pkgs/applications/kde/default.nix b/pkgs/applications/kde/default.nix index c390e004c8cce..cb661d438cf64 100644 --- a/pkgs/applications/kde/default.nix +++ b/pkgs/applications/kde/default.nix @@ -122,6 +122,11 @@ let kdenlive = callPackage ./kdenlive {}; kdepim-runtime = callPackage ./kdepim-runtime {}; kdepim-addons = callPackage ./kdepim-addons.nix {}; + kdevelop-pg-qt = callPackage ./kdevelop/kdevelop-pg-qt.nix {}; + kdevelop-unwrapped = callPackage ./kdevelop/kdevelop.nix {}; + kdev-php = callPackage ./kdevelop/kdev-php.nix {}; + kdev-python = callPackage ./kdevelop/kdev-python.nix {}; + kdevelop = callPackage ./kdevelop/wrapper.nix {}; kdf = callPackage ./kdf.nix {}; kdialog = callPackage ./kdialog.nix {}; kdiamond = callPackage ./kdiamond.nix {}; diff --git a/pkgs/applications/editors/kdevelop5/kdev-php.nix b/pkgs/applications/kde/kdevelop/kdev-php.nix index 8308830efccc9..46c4af8c1c078 100644 --- a/pkgs/applications/editors/kdevelop5/kdev-php.nix +++ b/pkgs/applications/kde/kdevelop/kdev-php.nix @@ -1,13 +1,7 @@ -{ stdenv, lib, fetchurl, cmake, extra-cmake-modules, threadweaver, ktexteditor, kdevelop-unwrapped, kdevelop-pg-qt }: +{ mkDerivation, lib, cmake, extra-cmake-modules, threadweaver, ktexteditor, kdevelop-unwrapped, kdevelop-pg-qt }: -stdenv.mkDerivation rec { +mkDerivation rec { pname = "kdev-php"; - version = "5.6.2"; - - src = fetchurl { - url = "mirror://kde/stable/kdevelop/${version}/src/${pname}-${version}.tar.xz"; - hash = "sha256-8Qg9rsK4x1LeGgRB0Pn3InSx4tKccjAF7Xjc+Lpxfgw="; - }; nativeBuildInputs = [ cmake extra-cmake-modules ]; buildInputs = [ kdevelop-pg-qt threadweaver ktexteditor kdevelop-unwrapped ]; diff --git a/pkgs/applications/editors/kdevelop5/kdev-python.nix b/pkgs/applications/kde/kdevelop/kdev-python.nix index 374b4224ca6bd..66335429bdd13 100644 --- a/pkgs/applications/editors/kdevelop5/kdev-python.nix +++ b/pkgs/applications/kde/kdevelop/kdev-python.nix @@ -1,13 +1,13 @@ -{ stdenv, lib, fetchurl, cmake, extra-cmake-modules, threadweaver, ktexteditor, kdevelop-unwrapped, python }: - -stdenv.mkDerivation rec { +{ mkDerivation, lib, cmake, extra-cmake-modules +, threadweaver, ktexteditor, kdevelop-unwrapped, python39 +}: +let + # FIXME: stick with python 3.9 until MR supporting 3.10 is ready: + # https://invent.kde.org/kdevelop/kdev-python/-/merge_requests/16 + python = python39; +in +mkDerivation rec { pname = "kdev-python"; - version = "5.6.2"; - - src = fetchurl { - url = "mirror://kde/stable/kdevelop/${version}/src/${pname}-${version}.tar.xz"; - hash = "sha256-IPm3cblhJi3tmGpPMrjSWa2fe8SLsp6sCl1YU74dkX8="; - }; cmakeFlags = [ "-DPYTHON_EXECUTABLE=${python}/bin/python" diff --git a/pkgs/applications/editors/kdevelop5/kdevelop-pg-qt.nix b/pkgs/applications/kde/kdevelop/kdevelop-pg-qt.nix index e1478ef6a03c7..f96e8cf6b677e 100644 --- a/pkgs/applications/editors/kdevelop5/kdevelop-pg-qt.nix +++ b/pkgs/applications/kde/kdevelop/kdevelop-pg-qt.nix @@ -1,15 +1,11 @@ { lib, stdenv, fetchurl, cmake, pkg-config, extra-cmake-modules, qtbase }: -let +stdenv.mkDerivation rec { pname = "kdevelop-pg-qt"; version = "2.2.1"; -in -stdenv.mkDerivation rec { - name = "${pname}-${version}"; - src = fetchurl { - url = "mirror://kde/stable/${pname}/${version}/src/${name}.tar.xz"; + url = "mirror://kde/stable/${pname}/${version}/src/${pname}-${version}.tar.xz"; sha256 = "0ay6m6j6zgrbcm48f14bass83bk4w5qnx76xihc05p69i9w32ff1"; }; diff --git a/pkgs/applications/editors/kdevelop5/kdevelop.nix b/pkgs/applications/kde/kdevelop/kdevelop.nix index 37ede94fa193d..4e7f576398e5c 100644 --- a/pkgs/applications/editors/kdevelop5/kdevelop.nix +++ b/pkgs/applications/kde/kdevelop/kdevelop.nix @@ -1,21 +1,18 @@ - -{ mkDerivation, lib, fetchurl, cmake, gettext, pkg-config, extra-cmake-modules +{ mkDerivation, lib, cmake, gettext, pkg-config, extra-cmake-modules , qtquickcontrols, qtwebkit, qttools, kde-cli-tools, qtbase , kconfig, kdeclarative, kdoctools, kiconthemes, ki18n, kitemmodels, kitemviews , kjobwidgets, kcmutils, kio, knewstuff, knotifyconfig, kparts, ktexteditor , threadweaver, kxmlgui, kwindowsystem, grantlee, kcrash, karchive, kguiaddons , plasma-framework, krunner, kdevelop-pg-qt, shared-mime-info, libkomparediff2 -, libksysguard, konsole, llvmPackages, makeWrapper, kpurpose, boost +, libksysguard, konsole, llvmPackages_13, makeWrapper, kpurpose, boost +, qtwebengine, cppcheck }: +let + llvmPackages = llvmPackages_13; +in mkDerivation rec { pname = "kdevelop"; - version = "5.6.2"; - - src = fetchurl { - url = "mirror://kde/stable/${pname}/${version}/src/${pname}-${version}.tar.xz"; - sha256 = "sha256-D4a8P+U/dhwePj91RFd6DEFDO+i/8xDPLnKfdvQ2O/Y="; - }; nativeBuildInputs = [ cmake gettext pkg-config extra-cmake-modules makeWrapper @@ -32,6 +29,7 @@ mkDerivation rec { kjobwidgets kcmutils kio knewstuff knotifyconfig kparts ktexteditor threadweaver kxmlgui kwindowsystem grantlee plasma-framework krunner shared-mime-info libksysguard konsole kcrash karchive kguiaddons kpurpose + cppcheck qtwebengine ]; # https://cgit.kde.org/kdevelop.git/commit/?id=716372ae2e8dff9c51e94d33443536786e4bd85b diff --git a/pkgs/applications/editors/kdevelop5/wrapper.nix b/pkgs/applications/kde/kdevelop/wrapper.nix index 86d3de9eb39a9..86d3de9eb39a9 100644 --- a/pkgs/applications/editors/kdevelop5/wrapper.nix +++ b/pkgs/applications/kde/kdevelop/wrapper.nix diff --git a/pkgs/applications/kde/kio-extras.nix b/pkgs/applications/kde/kio-extras.nix index 29a3bdc97bb81..d9e8cf889491f 100644 --- a/pkgs/applications/kde/kio-extras.nix +++ b/pkgs/applications/kde/kio-extras.nix @@ -1,9 +1,9 @@ { mkDerivation, lib, extra-cmake-modules, kdoctools, shared-mime-info, - exiv2, kactivities, karchive, kbookmarks, kconfig, kconfigwidgets, + exiv2, kactivities, kactivities-stats, karchive, kbookmarks, kconfig, kconfigwidgets, kcoreaddons, kdbusaddons, kdsoap, kguiaddons, kdnssd, kiconthemes, ki18n, kio, - khtml, kpty, syntax-highlighting, libmtp, libssh, openexr, - ilmbase, openslp, phonon, qtsvg, samba, solid, gperf + khtml, kpty, syntax-highlighting, libmtp, libssh, openexr, libtirpc, + ilmbase, openslp, phonon, qtsvg, samba, solid, gperf, taglib }: mkDerivation { @@ -14,10 +14,10 @@ mkDerivation { }; nativeBuildInputs = [ extra-cmake-modules kdoctools shared-mime-info ]; buildInputs = [ - exiv2 kactivities karchive kbookmarks kconfig kconfigwidgets kcoreaddons + exiv2 kactivities kactivities-stats karchive kbookmarks kconfig kconfigwidgets kcoreaddons kdbusaddons kdsoap kguiaddons kdnssd kiconthemes ki18n kio khtml - kpty syntax-highlighting libmtp libssh openexr openslp - phonon qtsvg samba solid gperf + kpty syntax-highlighting libmtp libssh openexr libtirpc openslp + phonon qtsvg samba solid gperf taglib ]; # org.kde.kmtpd5 DBUS service launches kiod5 binary from kio derivation, not from kio-extras diff --git a/pkgs/applications/misc/1password/default.nix b/pkgs/applications/misc/1password/default.nix index afc8d114f005e..0d18b3dd37a3e 100644 --- a/pkgs/applications/misc/1password/default.nix +++ b/pkgs/applications/misc/1password/default.nix @@ -12,12 +12,12 @@ let if extension == "zip" then fetchzip args else fetchurl args; pname = "1password-cli"; - version = "2.4.1"; + version = "2.5.1"; sources = rec { - aarch64-linux = fetch "linux_arm64" "sha256-ANRYE1BoezrcDxZrQYp/OPdtn4J+FmC/PLSIP5Amm18=" "zip"; - i686-linux = fetch "linux_386" "sha256-w3anr76uj/Z+ilZ+LUGOB1CoKkvxcD+v8c8lVADPwRY=" "zip"; - x86_64-linux = fetch "linux_amd64" "sha256-axZ+XDIMJlAicnYTIXgcaoT+Zcg6xvHlchl/ng7V9GY=" "zip"; - aarch64-darwin = fetch "apple_universal" "sha256-/DnrQ4fwbc2ELtsEClvzA9kTrse3pMgGLbhiKZ3gphA=" "pkg"; + aarch64-linux = fetch "linux_arm64" "sha256-HZ6AVheJrw9ZR9HGWbB6/kCzbrfYcwApa2z18tDBo1k=" "zip"; + i686-linux = fetch "linux_386" "sha256-aG6oW0epF+P9pSWMlTStSbBynBDkGX1B+0NHUnwLRhs=" "zip"; + x86_64-linux = fetch "linux_amd64" "sha256-7GkBVcvXM/WZiXEiIbYh9lS0f4BS4Hc4RCVjr8FoW8A=" "zip"; + aarch64-darwin = fetch "apple_universal" "sha256-XebD33fX15RsFUdbV+DvMRIi1MSyMfIRC3JOwcmi8kk=" "pkg"; x86_64-darwin = aarch64-darwin; }; platforms = builtins.attrNames sources; @@ -48,6 +48,7 @@ stdenv.mkDerivation { ''; postInstall = '' + HOME=$TMPDIR installShellCompletion --cmd ${mainProgram} \ --bash <($out/bin/${mainProgram} completion bash) \ --fish <($out/bin/${mainProgram} completion fish) \ diff --git a/pkgs/applications/misc/ArchiSteamFarm/web-ui/default.nix b/pkgs/applications/misc/ArchiSteamFarm/web-ui/default.nix index bbe37b5ed743b..fdd2970fdac7b 100644 --- a/pkgs/applications/misc/ArchiSteamFarm/web-ui/default.nix +++ b/pkgs/applications/misc/ArchiSteamFarm/web-ui/default.nix @@ -27,7 +27,8 @@ in postInstall = '' patchShebangs node_modules/ npm run build - ln -s $out/lib/node_modules/asf-ui/dist $out/lib/dist + cp -r $out/lib/node_modules/asf-ui/dist $out/lib/dist + rm -rf $out/lib/node_modules/ ''; meta = with lib; { diff --git a/pkgs/applications/misc/anytype/default.nix b/pkgs/applications/misc/anytype/default.nix index 07cbee42694d9..6e28c58798e79 100644 --- a/pkgs/applications/misc/anytype/default.nix +++ b/pkgs/applications/misc/anytype/default.nix @@ -2,13 +2,13 @@ let pname = "anytype"; - version = "0.25.4"; + version = "0.26.1"; name = "Anytype-${version}"; nameExecutable = pname; src = fetchurl { url = "https://at9412003.fra1.digitaloceanspaces.com/Anytype-${version}.AppImage"; name = "Anytype-${version}.AppImage"; - sha256 = "sha256-v6Zecv/m1GvPJk/SmLlxHFyeYbNbIB+x17+AKCI45AM="; + sha256 = "sha256-lPzeYZzerFa0T77uaavvBQkMn4PUEfVj4SPlErqM9DI="; }; appimageContents = appimageTools.extractType2 { inherit name src; }; in diff --git a/pkgs/applications/misc/binance/default.nix b/pkgs/applications/misc/binance/default.nix index 9aa6e9bb9dd40..15e3c51e9ad4c 100644 --- a/pkgs/applications/misc/binance/default.nix +++ b/pkgs/applications/misc/binance/default.nix @@ -3,11 +3,11 @@ stdenv.mkDerivation rec { pname = "binance"; - version = "1.35.0"; + version = "1.36.0"; src = fetchurl { url = "https://github.com/binance/desktop/releases/download/v${version}/${pname}-${version}-amd64-linux.deb"; - sha256 = "sha256-6c7nrdViunnvPqqbt5/LQp2iS4EgZOCQ9PLcG+bY1YQ="; + sha256 = "sha256-Q1cvEQ/yxytzrPfiyeTZSCPecnmSdhy+ds/gtie4vwo="; }; nativeBuildInputs = [ diff --git a/pkgs/applications/misc/dbeaver/default.nix b/pkgs/applications/misc/dbeaver/default.nix index abde33b730c03..c36d98a1b6e52 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.1.0"; # When updating also update mvnSha256 + version = "22.1.1"; # When updating also update mvnSha256 src = fetchFromGitHub { owner = "dbeaver"; repo = "dbeaver"; rev = version; - sha256 = "sha256-gMs9q0+Yy/2l8TEG9vIuzv0qOh7QwawwlXKr3/Mz8wk="; + sha256 = "sha256-+MFULieuwfvuAP0HjJ+C0hb/uqhHtnP/nOoIfWwjtoI="; }; - mvnSha256 = "veclFlzLhTU+nT360qxRNut+yEi2dfTBxdQASyRMqhI="; + mvnSha256 = "pSZL+GDSXSm+sLymlSlq2ZIRdYJY1B3PCmCpjtosdGY="; mvnParameters = "-P desktop,all-platforms"; nativeBuildInputs = [ diff --git a/pkgs/applications/misc/debian-goodies/default.nix b/pkgs/applications/misc/debian-goodies/default.nix index 20d47e204f7cc..560afe32b8a19 100644 --- a/pkgs/applications/misc/debian-goodies/default.nix +++ b/pkgs/applications/misc/debian-goodies/default.nix @@ -10,14 +10,14 @@ stdenv.mkDerivation rec { pname = "debian-goodies"; - version = "0.87"; + version = "0.88"; src = fetchFromGitLab { domain = "salsa.debian.org"; owner = "debian"; repo = "debian-goodies"; rev = "debian/${version}"; - sha256 = "sha256-7O2AY7tWYiOIy4ImFBxWu6S+ljc3VmqS/j4KyEzVVIA="; + sha256 = "sha256-SDGWRGwRuryCJSWjuYB+Cg/Pl8q4VP4zcisUOn/GhJY="; }; postPatch = '' diff --git a/pkgs/applications/misc/diffuse/default.nix b/pkgs/applications/misc/diffuse/default.nix new file mode 100644 index 0000000000000..fb1646dbbcca5 --- /dev/null +++ b/pkgs/applications/misc/diffuse/default.nix @@ -0,0 +1,68 @@ +{ lib, gitUpdater +, fetchFromGitHub +, meson +, ninja +, gettext +, wrapGAppsHook +, gobject-introspection +, pango +, gdk-pixbuf +, python3 +, atk +}: + +python3.pkgs.buildPythonApplication rec { + pname = "diffuse"; + version = "0.7.5"; + + src = fetchFromGitHub { + owner = "MightyCreak"; + repo = "diffuse"; + rev = "v${version}"; + sha256 = "0nd1fyl40wyc98jclcxv8zlnm744lrr51fahh5h9v4ksk184h4z8"; + }; + + format = "other"; + + nativeBuildInputs = [ + wrapGAppsHook + meson + ninja + gettext + gobject-introspection + ]; + + buildInputs = [ + gobject-introspection + pango + gdk-pixbuf + atk + ]; + + propagatedBuildInputs = with python3.pkgs; [ + pycairo + pygobject3 + ]; + + mesonFlags = [ + "-Db_ndebug=true" + ]; + + # to avoid running gtk-update-icon-cache, update-desktop-database and glib-compile-schemas + DESTDIR = "/"; + + passthru = { + updateScript = gitUpdater { + inherit pname version; + rev-prefix = "v"; + }; + }; + + meta = with lib; { + homepage = "https://github.com/MightyCreak/diffuse"; + description = "Graphical tool for merging and comparing text files"; + license = licenses.gpl2; + maintainers = with maintainers; [ k3a ]; + platforms = platforms.linux; + }; +} diff --git a/pkgs/applications/misc/hollywood/default.nix b/pkgs/applications/misc/hollywood/default.nix new file mode 100644 index 0000000000000..f3b721bc49597 --- /dev/null +++ b/pkgs/applications/misc/hollywood/default.nix @@ -0,0 +1,94 @@ +{ stdenv +, fetchFromGitHub +, makeWrapper +, lib +, coreutils +, apg +, atop +, bmon +, cmatrix +, pygments +, moreutils +, util-linux +, jp2a +, man +, mplayer +, openssh +, tree +, mlocate +, findutils +, ccze +, ncurses +, python3 +, wget +, libcaca +, newsboat +, rsstail +, w3m +, ticker +, tmux +}: + +stdenv.mkDerivation { + pname = "hollywood"; + version = "1.22"; + + src = fetchFromGitHub { + owner = "dustinkirkland"; + repo = "hollywood"; + rev = "35275a68c37bbc39d8b2b0e4664a0c2f5451e5f6"; + sha256 = "sha256-faIm1uXERvIDZ6SK6uarVkWGNJskAroHgq5Cg7nUZc4="; + }; + + nativeBuildInputs = [ makeWrapper ]; + + patches = [ ./nixos-paths.patch ]; + postPatch = '' + rm lib/hollywood/speedometer + rm bin/wallstreet + rm -r lib/wallstreet + ''; + + dontBuild = true; + + installPhase = + let pathDeps = [ + tmux + coreutils + ncurses + jp2a + mlocate + apg + atop + bmon + cmatrix + pygments + moreutils + util-linux + jp2a + man + mplayer + openssh + tree + findutils + ccze + ]; + in '' + runHook preInstall + + mkdir -p $out + cp -r bin $out/bin + cp -r lib $out/lib + cp -r share $out/share + wrapProgram $out/bin/hollywood --prefix PATH : ${lib.makeBinPath pathDeps} + + runHook postInstall + ''; + + meta = { + description = "Fill your console with Hollywood melodrama technobabble"; + homepage = "https://a.hollywood.computer/"; + license = lib.licenses.asl20; + maintainers = [ lib.maintainers.anselmschueler ]; + }; +} diff --git a/pkgs/applications/misc/hollywood/nixos-paths.patch b/pkgs/applications/misc/hollywood/nixos-paths.patch new file mode 100644 index 0000000000000..d280a6b003c1e --- /dev/null +++ b/pkgs/applications/misc/hollywood/nixos-paths.patch @@ -0,0 +1,67 @@ +diff --git a/bin/hollywood b/bin/hollywood +index 6f1ee68..09bc4ea 100755 +--- a/bin/hollywood ++++ b/bin/hollywood +@@ -74,7 +74,7 @@ if [ -z "$TMUX" ]; then + else + tmux_launcher=tmux + fi +- $tmux_launcher new-session -d -s $PKG "/bin/bash" ++ $tmux_launcher new-session -d -s $PKG "/usr/bin/env bash" + $tmux_launcher send-keys -t $PKG "$0 $1" + $tmux_launcher send-keys -t $PKG Enter + exec $tmux_launcher attach-session -t $PKG +diff --git a/lib/hollywood/code b/lib/hollywood/code +index 532ce73..3448447 100755 +--- a/lib/hollywood/code ++++ b/lib/hollywood/code +@@ -19,7 +19,7 @@ command -v view >/dev/null 2>&1 || exit 1 + + trap "pkill -f -9 lib/hollywood/ >/dev/null 2>&1; exit" INT + while true; do +- FILES=$(locate -l 4096 "/usr/*.java" "/usr/*.c" "/usr/*.cpp" 2>/dev/null | sort -R) ++ FILES=$(locate -l 4096 "/usr/*.java" "/run/current-system/sw/*.java" "/usr/*.c" "/run/current-system/sw/*.c" "/usr/*.cpp" "/run/current-system/sw/*.cpp" 2>/dev/null | sort -R) + for f in $FILES; do + [ -r "$f" ] || continue + [ -s "$f" ] || continue +diff --git a/lib/hollywood/hexdump b/lib/hollywood/hexdump +index f2fb0bd..db059f5 100755 +--- a/lib/hollywood/hexdump ++++ b/lib/hollywood/hexdump +@@ -19,8 +19,8 @@ command -v ccze >/dev/null 2>&1 || exit 1 + + trap "pkill -f -9 lib/hollywood/ >/dev/null 2>&1; exit" INT + while true; do +- for f in $(ls /usr/bin/ | sort -R); do +- head -c 4096 "/usr/bin/$f" | hexdump -C | ccze -A -c default=green -c dir="bold green" ++ for f in $(find /usr/bin/ /run/current-system/sw/bin/ | sort -R); do ++ head -c 4096 "$f" | hexdump -C | ccze -A -c default=green -c dir="bold green" + sleep 0.7 + done + done +diff --git a/lib/hollywood/jp2a b/lib/hollywood/jp2a +index e87b950..6541f80 100755 +--- a/lib/hollywood/jp2a ++++ b/lib/hollywood/jp2a +@@ -19,7 +19,7 @@ command -v jp2a >/dev/null 2>&1 || exit 1 + + trap "pkill -f -9 lib/hollywood/ >/dev/null 2>&1; exit" INT + while true; do +- FILES=$(locate -l 4096 "/usr/*jpg" 2>/dev/null | sort -R) ++ FILES=$(locate -l 4096 "/usr/*jpg" "/run/current-system/sw/*jpg" 2>/dev/null | sort -R) + for f in $FILES; do + [ -r "$f" ] || continue + [ -s "$f" ] || continue +diff --git a/lib/hollywood/man b/lib/hollywood/man +index 2d42513..f4d8bbb 100755 +--- a/lib/hollywood/man ++++ b/lib/hollywood/man +@@ -19,7 +19,7 @@ command -v ccze >/dev/null 2>&1 || exit 1 + + trap "pkill -f -9 lib/hollywood/ >/dev/null 2>&1; exit" INT + while true; do +- FILES=$(ls /usr/share/man/man1/ | sort -R | sed "s/\.1\.gz.*$//" | head -n 4096) ++ FILES=$(ls /usr/share/man/man1/ /run/current-system/sw/share/man/man1/ | sort -R | sed "s/\.1\.gz.*$//" | head -n 4096) + for f in $FILES; do + man "$f" | ccze -A + sleep 0.2 diff --git a/pkgs/applications/misc/josm/default.nix b/pkgs/applications/misc/josm/default.nix index 67807887ec615..d35a526dfdb3b 100644 --- a/pkgs/applications/misc/josm/default.nix +++ b/pkgs/applications/misc/josm/default.nix @@ -3,15 +3,15 @@ }: let pname = "josm"; - version = "18427"; + version = "18463"; srcs = { jar = fetchurl { url = "https://josm.openstreetmap.de/download/josm-snapshot-${version}.jar"; - sha256 = "sha256-SsoeKfpWi41sd77LfaQW0OcHnyf8iLolKWF74dhalpY="; + sha256 = "sha256-++8XtzAykJ+85Kvzy3xgaZoKaVlJwz+Ct1xb/QkC1Gc="; }; macosx = fetchurl { url = "https://josm.openstreetmap.de/download/macosx/josm-macos-${version}-java17.zip"; - sha256 = "sha256-cz3OT03StvJy9XYBiPxx+nz36O0cg+XrL/uc52/G/1c="; + sha256 = "sha256-n7GlUWYOAXw4G59SBsO8HZ1OaiUWwzOsiURPFBYq31E="; }; pkg = fetchsvn { url = "https://josm.openstreetmap.de/svn/trunk/native/linux/tested"; diff --git a/pkgs/applications/misc/logseq/default.nix b/pkgs/applications/misc/logseq/default.nix index 70d21acc05b46..9c3313ba5f49a 100644 --- a/pkgs/applications/misc/logseq/default.nix +++ b/pkgs/applications/misc/logseq/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "logseq"; - version = "0.7.0"; + version = "0.7.5"; src = fetchurl { url = "https://github.com/logseq/logseq/releases/download/${version}/logseq-linux-x64-${version}.AppImage"; - sha256 = "sha256-oXNSd0ZU2ZsMK51tq8iq2sfuLg0ZHaiXhpJpWZkEmeY="; + sha256 = "sha256-uMlvpEEzanJ3zTEZKNE2zEfqvGC4IWL97b0AkTfwZeU="; name = "${pname}-${version}.AppImage"; }; diff --git a/pkgs/applications/misc/logseq/update.sh b/pkgs/applications/misc/logseq/update.sh index 9f83eefad1911..eb81dc68e4ebf 100755 --- a/pkgs/applications/misc/logseq/update.sh +++ b/pkgs/applications/misc/logseq/update.sh @@ -1,5 +1,5 @@ #!/usr/bin/env nix-shell #!nix-shell -i bash -p curl jq common-updater-scripts -version="$(curl -sL "https://api.github.com/repos/logseq/logseq/releases" | jq '.[0].tag_name' --raw-output)" +version="$(curl -sL "https://api.github.com/repos/logseq/logseq/releases" | jq 'map(select(.prerelease == false)) | .[0].tag_name' --raw-output)" update-source-version logseq "$version" diff --git a/pkgs/applications/misc/mapproxy/default.nix b/pkgs/applications/misc/mapproxy/default.nix index 08c2c7afc45f1..75e7f64227bba 100644 --- a/pkgs/applications/misc/mapproxy/default.nix +++ b/pkgs/applications/misc/mapproxy/default.nix @@ -6,10 +6,10 @@ with python3.pkgs; buildPythonApplication rec { pname = "MapProxy"; - version = "1.14.0"; + version = "1.15.1"; src = fetchPypi { inherit pname version; - sha256 = "dd36278d60cdcaaf31f7f9bbc50e90e770f3feb65cf4b3eff287215ee85f018d"; + sha256 = "sha256-SVKZDLH8IfdND0/BFj/lrqp7BNanpzkjuTxlSMGjuiY="; }; prePatch = '' substituteInPlace mapproxy/util/ext/serving.py --replace "args = [sys.executable] + sys.argv" "args = sys.argv" diff --git a/pkgs/applications/misc/megacmd/default.nix b/pkgs/applications/misc/megacmd/default.nix index afdfc6c905e04..2d5b6ee8f2ae6 100644 --- a/pkgs/applications/misc/megacmd/default.nix +++ b/pkgs/applications/misc/megacmd/default.nix @@ -23,13 +23,13 @@ stdenv.mkDerivation rec { pname = "megacmd"; - version = "1.5.0c"; + version = "1.5.1"; src = fetchFromGitHub { owner = "meganz"; repo = "MEGAcmd"; rev = "${version}_Linux"; - sha256 = "sha256-JHuGkf6TBOZMvoP7Izm5/T9AWxyjaqrxR99x4bm7tVE="; + sha256 = "sha256-qOXw/KGt3DyWQGBe/pbMujQITCMItHobxuK+1r00ZIs="; fetchSubmodules = true; }; diff --git a/pkgs/applications/misc/octoprint/plugins.nix b/pkgs/applications/misc/octoprint/plugins.nix index ae82d4023247d..822f2c13cbeae 100644 --- a/pkgs/applications/misc/octoprint/plugins.nix +++ b/pkgs/applications/misc/octoprint/plugins.nix @@ -311,8 +311,8 @@ in src = fetchFromGitHub { owner = "jneilliii"; repo = "OctoPrint-STLViewer"; - rev = version; - sha256 = "0mkvh44fn2ch4z2avsdjwi1rp353ylmk9j5fln4x7rx8ph8y7g2b"; + rev = "refs/tags/${version}"; + sha256 = "sha256-S7zjEbyo59OJpa7INCv1o4ybQ+Sy6a3EJ5AJ6wiBe1Y="; }; meta = with lib; { diff --git a/pkgs/applications/misc/organicmaps/default.nix b/pkgs/applications/misc/organicmaps/default.nix index 0930edbd4158b..c44fc41a5c650 100644 --- a/pkgs/applications/misc/organicmaps/default.nix +++ b/pkgs/applications/misc/organicmaps/default.nix @@ -8,7 +8,6 @@ , which , python3 , rsync -, makeWrapper , qtbase , qtsvg , libGLU @@ -20,13 +19,13 @@ mkDerivation rec { pname = "organicmaps"; - version = "2022.05.31-10"; + version = "2022.06.18-2"; src = fetchFromGitHub { owner = "organicmaps"; repo = "organicmaps"; rev = "${version}-android"; - sha256 = "sha256-2GeWa4CQoY7hi24q0/cZBbq1Ofl2Jane9BiZ0N+IsSc="; + sha256 = "sha256-FlytRGiqGr9L5ZwL1slbPjagJKsleOXM8+loPmtfccI="; fetchSubmodules = true; }; @@ -45,7 +44,6 @@ mkDerivation rec { which python3 rsync - makeWrapper ]; # Most dependencies are vendored @@ -64,16 +62,6 @@ mkDerivation rec { bash ./configure.sh ''; - # Tell the program that the read-only and the read-write data locations - # are different, and create the read-write one. - # https://github.com/organicmaps/organicmaps/issues/2387 - postInstall = '' - wrapProgram $out/bin/OMaps \ - --add-flags "-resources_path $out/share/organicmaps/data" \ - --add-flags '-data_path "''${XDG_DATA_HOME:-''${HOME}/.local/share}/OMaps"' \ - --run 'mkdir -p "''${XDG_DATA_HOME:-''${HOME}/.local/share}/OMaps"' - ''; - meta = with lib; { # darwin: "invalid application of 'sizeof' to a function type" broken = (stdenv.isLinux && stdenv.isAarch64) || stdenv.isDarwin; diff --git a/pkgs/applications/misc/skytemple/default.nix b/pkgs/applications/misc/skytemple/default.nix index 0f331ef6e2ce4..2ec034e882e18 100644 --- a/pkgs/applications/misc/skytemple/default.nix +++ b/pkgs/applications/misc/skytemple/default.nix @@ -1,4 +1,12 @@ -{ lib, fetchFromGitHub, gobject-introspection, gtk3, gtksourceview3, webkitgtk, wrapGAppsHook, python3Packages }: +{ lib +, fetchFromGitHub +, gobject-introspection +, gtk3 +, gtksourceview3 +, webkitgtk +, wrapGAppsHook +, python3Packages +}: python3Packages.buildPythonApplication rec { pname = "skytemple"; @@ -8,7 +16,7 @@ python3Packages.buildPythonApplication rec { owner = "SkyTemple"; repo = pname; rev = version; - sha256 = "sha256-CyYGTXdQsGpDR/gpqViEQO1xUPHaXTES592nRJixa1o="; + hash = "sha256-CyYGTXdQsGpDR/gpqViEQO1xUPHaXTES592nRJixa1o="; }; buildInputs = [ @@ -20,9 +28,16 @@ python3Packages.buildPythonApplication rec { # any Pokemon, and clicking Stats and Moves tab. webkitgtk ]; - nativeBuildInputs = [ gobject-introspection wrapGAppsHook ]; + + nativeBuildInputs = [ + gobject-introspection + wrapGAppsHook + ]; + propagatedBuildInputs = with python3Packages; [ + cairosvg natsort + ndspy packaging pycairo pygal @@ -36,6 +51,7 @@ python3Packages.buildPythonApplication rec { skytemple-files skytemple-icons skytemple-ssb-debugger + tilequant ]; doCheck = false; # there are no tests diff --git a/pkgs/applications/networking/blocky/default.nix b/pkgs/applications/networking/blocky/default.nix index 2f2a708455e17..0f25fd0a8ec98 100644 --- a/pkgs/applications/networking/blocky/default.nix +++ b/pkgs/applications/networking/blocky/default.nix @@ -6,20 +6,20 @@ buildGoModule rec { pname = "blocky"; - version = "0.18"; + version = "0.19"; src = fetchFromGitHub { owner = "0xERR0R"; repo = pname; rev = "v${version}"; - sha256 = "sha256-rFHDoNrEmMSNEc3RLdSeRk9mF05drUYfJFQKHAk5alE="; + sha256 = "sha256-jOOakRuiNbdCGmbaQFuHcLsHhV26jaQY+1GgDj9ocs0="; }; # needs network connection and fails at # https://github.com/0xERR0R/blocky/blob/development/resolver/upstream_resolver_test.go doCheck = false; - vendorSha256 = "sha256-rrqDjh5e3KX5+saYjnMPG0bhr5YEOPfz0QCRf6omNZI="; + vendorSha256 = "sha256-fsMBL9qyhIrV6eAsqpSaNniibMdYRVBnl2KCzStvMGQ="; meta = with lib; { description = "Fast and lightweight DNS proxy as ad-blocker for local network with many features."; diff --git a/pkgs/applications/networking/browsers/firefox/wrapper.nix b/pkgs/applications/networking/browsers/firefox/wrapper.nix index 153bd31a5e725..1b8e3c879676e 100644 --- a/pkgs/applications/networking/browsers/firefox/wrapper.nix +++ b/pkgs/applications/networking/browsers/firefox/wrapper.nix @@ -97,12 +97,15 @@ let nameArray = builtins.map(a: a.name) (if usesNixExtensions then nixExtensions else []); + requiresSigning = browser ? MOZ_REQUIRE_SIGNING + -> toString browser.MOZ_REQUIRE_SIGNING != ""; + # Check that every extension has a unqiue .name attribute # and an extid attribute extensions = if nameArray != (lib.unique nameArray) then throw "Firefox addon name needs to be unique" - else if ! (lib.hasSuffix "esr" browser.name) then - throw "Nix addons are only supported in Firefox ESR" + else if requiresSigning && !lib.hasSuffix "esr" browser.name then + throw "Nix addons are only supported without signature enforcement (eg. Firefox ESR)" else builtins.map (a: if ! (builtins.hasAttr "extid" a) then throw "nixExtensions has an invalid entry. Missing extid attribute. Please use fetchfirefoxaddon" diff --git a/pkgs/applications/networking/browsers/vivaldi/default.nix b/pkgs/applications/networking/browsers/vivaldi/default.nix index be134d465738e..35f0712d9abc8 100644 --- a/pkgs/applications/networking/browsers/vivaldi/default.nix +++ b/pkgs/applications/networking/browsers/vivaldi/default.nix @@ -20,11 +20,11 @@ let vivaldiName = if isSnapshot then "vivaldi-snapshot" else "vivaldi"; in stdenv.mkDerivation rec { pname = "vivaldi"; - version = "5.3.2679.58-1"; + version = "5.3.2679.61-1"; src = fetchurl { url = "https://downloads.vivaldi.com/${branch}/vivaldi-${branch}_${version}_amd64.deb"; - sha256 = "085r5mrj8kp65fv0fw3azcgl9a7wxw4vcmnma36ihml8r53f8iaw"; + sha256 = "0cxsdcksv29dxync8rxrn30kr68qzf615085nhkk0ava7jdlvz9g"; }; unpackPhase = '' diff --git a/pkgs/applications/networking/cluster/argo/default.nix b/pkgs/applications/networking/cluster/argo/default.nix index ffcfc8e9c177d..624814c1bb650 100644 --- a/pkgs/applications/networking/cluster/argo/default.nix +++ b/pkgs/applications/networking/cluster/argo/default.nix @@ -19,13 +19,13 @@ let in buildGoModule rec { pname = "argo"; - version = "3.3.5"; + version = "3.3.8"; src = fetchFromGitHub { owner = "argoproj"; repo = "argo"; rev = "v${version}"; - sha256 = "sha256-EeGpJliE38MroeScdmeMp36rEDld59zDEM5i4QqxYik="; + sha256 = "sha256-9RwUKLVf8ArDAE6ivbWqxDCCW4OjqQFEEoWHBIv/cww="; }; vendorSha256 = "sha256-cq452XEGMVbLvfJ/UiVyOvnUSJr196owB3SyBYnAmZ0="; diff --git a/pkgs/applications/networking/cluster/argocd/default.nix b/pkgs/applications/networking/cluster/argocd/default.nix index f0c81ab5ca5fb..212e024b98790 100644 --- a/pkgs/applications/networking/cluster/argocd/default.nix +++ b/pkgs/applications/networking/cluster/argocd/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "argocd"; - version = "2.4.0"; + version = "2.4.2"; src = fetchFromGitHub { owner = "argoproj"; repo = "argo-cd"; rev = "v${version}"; - sha256 = "sha256-U3i3shXsItQQlkFl/DrGdSHY2AAhaYV5WX3B+6TlOPw="; + sha256 = "sha256-zc99YKh5hNa4oRoKJcGWqNrDb3LqIwXWzYOsmGKVsL8="; }; vendorSha256 = "sha256-j/35tvfUCcuFN8NGIjWgna1W0Q4CyhMLcOlepTAUl0w="; diff --git a/pkgs/applications/networking/cluster/atlantis/default.nix b/pkgs/applications/networking/cluster/atlantis/default.nix index d039b7bc34604..d7f685ee14f2c 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.3"; + version = "0.19.4"; src = fetchFromGitHub { owner = "runatlantis"; repo = "atlantis"; rev = "v${version}"; - sha256 = "sha256-0/LrXdksljoTvhOWAyKzR/8fNqM6ZqCjfgTNUfZNdXw="; + sha256 = "sha256-OvUcSccSBLuWci0DZPd6+ztthnAf47CvuAxu2NnqRQ0="; }; - vendorSha256 = "sha256-HEMyJRNk7sii87cZBfuQy41n0sI+On4271bVVNVWXeg="; + vendorSha256 = "sha256-LActkTCZ7/KlvFmJ+58I8hTQWdxFxlRN09Jmj1vDa2U="; subPackages = [ "." ]; diff --git a/pkgs/applications/networking/cluster/cilium/default.nix b/pkgs/applications/networking/cluster/cilium/default.nix index 648b0048e3e29..74bba4b13c2fb 100644 --- a/pkgs/applications/networking/cluster/cilium/default.nix +++ b/pkgs/applications/networking/cluster/cilium/default.nix @@ -1,23 +1,47 @@ -{ lib, buildGoModule, fetchFromGitHub }: +{ lib, buildGoModule, fetchFromGitHub, installShellFiles }: buildGoModule rec { pname = "cilium-cli"; - version = "0.11.7"; + version = "0.11.10"; src = fetchFromGitHub { owner = "cilium"; repo = pname; rev = "v${version}"; - sha256 = "sha256-4+4E7v/b74DDekqymH8PR7/GfH3GGzSQFQk24VJisQ0="; + sha256 = "sha256-BkcnChxUceWGG5hBOHvzZokgcw8T/vvNwIEtHkLfUJA="; }; vendorSha256 = null; + subPackages = [ "cmd/cilium" ]; + + ldflags = [ + "-s" "-w" + "-X github.com/cilium/cilium-cli/internal/cli/cmd.Version=${version}" + ]; + + # Required to workaround install check error: + # 2022/06/25 10:36:22 Unable to start gops: mkdir /homeless-shelter: permission denied + HOME = "$TMPDIR"; + + doInstallCheck = true; + installCheckPhase = '' + $out/bin/cilium version | grep ${version} > /dev/null + ''; + + nativeBuildInputs = [ installShellFiles ]; + postInstall = '' + installShellCompletion --cmd cilium \ + --bash <($out/bin/cilium completion bash) \ + --fish <($out/bin/cilium completion fish) \ + --zsh <($out/bin/cilium completion zsh) + ''; + meta = with lib; { description = "CLI to install, manage & troubleshoot Kubernetes clusters running Cilium"; license = licenses.asl20; homepage = "https://www.cilium.io/"; - maintainers = with maintainers; [ humancalico ]; + maintainers = with maintainers; [ humancalico bryanasdev000 ]; mainProgram = "cilium"; }; } diff --git a/pkgs/applications/networking/cluster/cloudfoundry-cli/default.nix b/pkgs/applications/networking/cluster/cloudfoundry-cli/default.nix index ec9f45a83886e..b7992e2c723df 100644 --- a/pkgs/applications/networking/cluster/cloudfoundry-cli/default.nix +++ b/pkgs/applications/networking/cluster/cloudfoundry-cli/default.nix @@ -2,15 +2,15 @@ buildGoModule rec { pname = "cloudfoundry-cli"; - version = "8.3.0"; + version = "8.4.0"; src = fetchFromGitHub { owner = "cloudfoundry"; repo = "cli"; rev = "v${version}"; - sha256 = "sha256-tC9U0yvuMEwO4mzWyUC+v+/H0EzgwTu02waTQrx19Bs="; + sha256 = "sha256-+UP1abTDYLn+lhMvo9G57X0nlColai7isNswog+3Y40="; }; - vendorSha256 = "sha256-aXq92SI4cgJrmo67SEfg8YKPEpO2UW2fcYnKq9TmAQg="; + vendorSha256 = "sha256-opVnj6dTtHrPYM1v+EFw39XDMF/fampAn7n+JvlBcJk="; subPackages = [ "." ]; diff --git a/pkgs/applications/networking/cluster/cmctl/default.nix b/pkgs/applications/networking/cluster/cmctl/default.nix index 86c7eddd7ab02..8a839d065ea2c 100644 --- a/pkgs/applications/networking/cluster/cmctl/default.nix +++ b/pkgs/applications/networking/cluster/cmctl/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "cmctl"; - version = "1.8.0"; + version = "1.8.1"; src = fetchFromGitHub { owner = "cert-manager"; repo = "cert-manager"; rev = "v${version}"; - sha256 = "sha256-h7GyzjVrfyMHY7yuNmmsym6KGKCQr5R71gjPBTUeMCg="; + sha256 = "sha256-IR+z3+f9Pa7wQAP4EVya7fb7FnndaUY7F2ckTzpEuCA="; }; vendorSha256 = "sha256-UYw9WdQ6VwzuuiOsa1yovkLZG7NmLYSW51p8UhmQMeI="; diff --git a/pkgs/applications/networking/cluster/driftctl/default.nix b/pkgs/applications/networking/cluster/driftctl/default.nix index a488f1d2f52de..0cde6d0090e7b 100644 --- a/pkgs/applications/networking/cluster/driftctl/default.nix +++ b/pkgs/applications/networking/cluster/driftctl/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "driftctl"; - version = "0.31.0"; + version = "0.34.1"; src = fetchFromGitHub { owner = "snyk"; repo = "driftctl"; rev = "v${version}"; - sha256 = "sha256-2h7tasHxeEe65BpUXmHkMsNmjiG+QofyGVqXPuk4Ej8="; + sha256 = "sha256-/tdAmu/BurCFB82i9pT2+PNOsPtHdlL/brUt4B9Q/EA="; }; - vendorSha256 = "sha256-bsIPEjD/kCUvkRKP85CjW3JJf1Hyx9b2pMY9S4HlKrA="; + vendorSha256 = "sha256-KChEDFZj5zsZ/viOVWgC15WI8mp5cUC+SdNwkCjo6bI="; nativeBuildInputs = [ installShellFiles ]; diff --git a/pkgs/applications/networking/cluster/fluxcd/default.nix b/pkgs/applications/networking/cluster/fluxcd/default.nix index 358803a3cf379..1afb2b7a5e1f3 100644 --- a/pkgs/applications/networking/cluster/fluxcd/default.nix +++ b/pkgs/applications/networking/cluster/fluxcd/default.nix @@ -1,9 +1,9 @@ { lib, buildGoModule, fetchFromGitHub, fetchzip, installShellFiles }: let - version = "0.31.1"; - sha256 = "1dhs96r9yi37i5q9wqg7198f6kl59jlj3g1q76r0snqyl16g2jwf"; - manifestsSha256 = "0wwlwai1hhz69kgaccw3w8ad6bwdd46pm4ns8nqm04927b0b2dqb"; + version = "0.31.2"; + sha256 = "1w373gwxxvnqsfm5r63r1bcmlrii5wy6yhbs5li0bw2anhnb0iir"; + manifestsSha256 = "0lqfrry1kg52ikyhzgwg57zqzq24aspp2d7whyzir3dglvf999lb"; manifests = fetchzip { url = @@ -23,7 +23,7 @@ in buildGoModule rec { inherit sha256; }; - vendorSha256 = "sha256-sPyz6ISFLe+6CJoAcG17KSfo63vuTj30IWw+S2NCszY="; + vendorSha256 = "sha256-Z7O/ReEZwmK5KKAHzi4B3d31ynA51XzbTKsrzCXAFPo="; postUnpack = '' cp -r ${manifests} source/cmd/flux/manifests diff --git a/pkgs/applications/networking/cluster/fluxctl/default.nix b/pkgs/applications/networking/cluster/fluxctl/default.nix index d1f06ce333bc5..dd9875929258c 100644 --- a/pkgs/applications/networking/cluster/fluxctl/default.nix +++ b/pkgs/applications/networking/cluster/fluxctl/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "fluxctl"; - version = "1.25.1"; + version = "1.25.2"; src = fetchFromGitHub { owner = "weaveworks"; repo = "flux"; rev = version; - sha256 = "sha256-l/BPnqa0j0yAdrl9BxFUKt94JwiNyPq1gKYuhGj/c8w="; + sha256 = "sha256-OZLTT54InDPF+m5e4xtuAL311wCD16Ne/T0PbgiSaN4="; }; - vendorSha256 = "sha256-PZriaKbgRKm7ssHOBmbzbma5LrRt0TsQiphSrtcT83k="; + vendorSha256 = "sha256-Q9THG76/B/gdfhf5wLxVXoAAzXeOjaaAyYaGKy9LeF0="; nativeBuildInputs = [ installShellFiles ]; diff --git a/pkgs/applications/networking/cluster/fn-cli/default.nix b/pkgs/applications/networking/cluster/fn-cli/default.nix index 22e596dabf263..c9895fccc9b72 100644 --- a/pkgs/applications/networking/cluster/fn-cli/default.nix +++ b/pkgs/applications/networking/cluster/fn-cli/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "fn"; - version = "0.6.17"; + version = "0.6.20"; src = fetchFromGitHub { owner = "fnproject"; repo = "cli"; rev = version; - sha256 = "sha256-u/YISLlZFYlAUejSlaH7POA2WwKURPN8phFU86/caXU="; + sha256 = "sha256-HeyWMzxSga6T2/BRVwrmgb3utjnVTJk3zhhcVfq8/Cc="; }; vendorSha256 = null; diff --git a/pkgs/applications/networking/cluster/helm-docs/default.nix b/pkgs/applications/networking/cluster/helm-docs/default.nix index 1d3c9f43e906b..cdd6c68a76fba 100644 --- a/pkgs/applications/networking/cluster/helm-docs/default.nix +++ b/pkgs/applications/networking/cluster/helm-docs/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "helm-docs"; - version = "1.8.1"; + version = "1.10.0"; src = fetchFromGitHub { owner = "norwoodj"; repo = "helm-docs"; rev = "v${version}"; - sha256 = "sha256-OpS/CYBb2Ll6ktvEhqkw/bWMSrFa4duidK3Glu8EnPw="; + sha256 = "sha256-V7Qw20PPoAEXl/XAMj/WSM73fLdp/gH4G3ipx49p06o="; }; vendorSha256 = "sha256-FpmeOQ8nV+sEVu2+nY9o9aFbCpwSShQUFOmyzwEQ9Pw="; diff --git a/pkgs/applications/networking/cluster/helm/chart-testing/default.nix b/pkgs/applications/networking/cluster/helm/chart-testing/default.nix index 127ee9c6895a6..85971b8dfb10c 100644 --- a/pkgs/applications/networking/cluster/helm/chart-testing/default.nix +++ b/pkgs/applications/networking/cluster/helm/chart-testing/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "chart-testing"; - version = "3.5.1"; + version = "3.6.0"; src = fetchFromGitHub { owner = "helm"; repo = pname; rev = "v${version}"; - sha256 = "sha256-LNCzz5me60R/moFfdJhGMgUToFxADiPL02G4QCv0DLg="; + sha256 = "sha256-WGoLj6IuhxARSB3vAnprW1UO2g142uKZVHI3ubJepRs="; }; - vendorSha256 = "sha256-38ufXHzGlZgEh6swD/GhWbIYdY5uYznKCQ9OaoyOEiY="; + vendorSha256 = "sha256-gXW1NarCo42d/awg22wr6bIQQFRVTVnRUUAtQU8zY4M="; postPatch = '' substituteInPlace pkg/config/config.go \ diff --git a/pkgs/applications/networking/cluster/hubble/default.nix b/pkgs/applications/networking/cluster/hubble/default.nix index f55bb880480a4..e6e5e6c1ce6cb 100644 --- a/pkgs/applications/networking/cluster/hubble/default.nix +++ b/pkgs/applications/networking/cluster/hubble/default.nix @@ -1,8 +1,8 @@ -{ stdenv, lib, buildGoModule, fetchFromGitHub }: +{ stdenv, lib, buildGoModule, fetchFromGitHub, installShellFiles }: buildGoModule rec { pname = "hubble"; - version = "0.9.0"; + version = "0.10.0"; src = fetchFromGitHub { owner = "cilium"; @@ -13,11 +13,36 @@ buildGoModule rec { vendorSha256 = null; + ldflags = [ + "-s" "-w" + "-X github.com/cilium/hubble/pkg.GitBranch=none" + "-X github.com/cilium/hubble/pkg.GitHash=none" + "-X github.com/cilium/hubble/pkg.Version=${version}" + ]; + + # Test fails at Test_getFlowsRequestWithInvalidRawFilters in github.com/cilium/hubble/cmd/observe + # https://github.com/NixOS/nixpkgs/issues/178976 + # https://github.com/cilium/hubble/pull/656 + # https://github.com/cilium/hubble/pull/655 + doCheck = false; + doInstallCheck = true; + installCheckPhase = '' + $out/bin/hubble version | grep ${version} > /dev/null + ''; + + nativeBuildInputs = [ installShellFiles ]; + postInstall = '' + installShellCompletion --cmd hubble \ + --bash <($out/bin/hubble completion bash) \ + --fish <($out/bin/hubble completion fish) \ + --zsh <($out/bin/hubble completion zsh) + ''; + meta = with lib; { broken = (stdenv.isLinux && stdenv.isAarch64) || stdenv.isDarwin; description = "Network, Service & Security Observability for Kubernetes using eBPF"; license = licenses.asl20; homepage = "https://github.com/cilium/hubble/"; - maintainers = with maintainers; [ humancalico ]; + maintainers = with maintainers; [ humancalico bryanasdev000 ]; }; } diff --git a/pkgs/applications/networking/cluster/kubernetes/default.nix b/pkgs/applications/networking/cluster/kubernetes/default.nix index 8ed8cd5689136..5cbd307a3d73d 100644 --- a/pkgs/applications/networking/cluster/kubernetes/default.nix +++ b/pkgs/applications/networking/cluster/kubernetes/default.nix @@ -1,11 +1,11 @@ -{ stdenv -, lib +{ lib +, buildGoModule , fetchFromGitHub , which -, go , makeWrapper , rsync , installShellFiles +, runtimeShell , kubectl , nixosTests @@ -19,7 +19,7 @@ ] }: -stdenv.mkDerivation rec { +buildGoModule rec { pname = "kubernetes"; version = "1.23.8"; @@ -30,23 +30,27 @@ stdenv.mkDerivation rec { sha256 = "sha256-mu+jBSypoMNxOugLbS3foH4C4AqSZnlic4Bf1v9dYc8="; }; - nativeBuildInputs = [ makeWrapper which go rsync installShellFiles ]; + vendorSha256 = null; + + doCheck = false; + + nativeBuildInputs = [ makeWrapper which rsync installShellFiles ]; outputs = [ "out" "man" "pause" ]; patches = [ ./fixup-addonmanager-lib-path.patch ]; - postPatch = '' - substituteInPlace "hack/update-generated-docs.sh" --replace "make" "make SHELL=${stdenv.shell}" - patchShebangs ./hack - ''; - WHAT = lib.concatStringsSep " " ([ "cmd/kubeadm" ] ++ components); - postBuild = '' + buildPhase = '' + runHook preBuild + substituteInPlace "hack/update-generated-docs.sh" --replace "make" "make SHELL=${runtimeShell}" + patchShebangs ./hack ./cluster/addons/addon-manager + make "SHELL=${runtimeShell}" "WHAT=$WHAT" ./hack/update-generated-docs.sh + runHook postBuild ''; installPhase = '' @@ -69,7 +73,6 @@ stdenv.mkDerivation rec { --subst-var out chmod +x $out/bin/kube-addons - patchShebangs $out/bin/kube-addons wrapProgram $out/bin/kube-addons --set "KUBECTL_BIN" "$out/bin/kubectl" cp cluster/addons/addon-manager/kube-addons.sh $out/bin/kube-addons-lib.sh @@ -80,10 +83,6 @@ stdenv.mkDerivation rec { runHook postInstall ''; - disallowedReferences = [ go ]; - - GOFLAGS = [ "-trimpath" ]; - meta = with lib; { description = "Production-Grade Container Scheduling and Management"; license = licenses.asl20; diff --git a/pkgs/applications/networking/cluster/kubernetes/kubectl.nix b/pkgs/applications/networking/cluster/kubernetes/kubectl.nix index 6a6f9042124b8..754bca32511c1 100644 --- a/pkgs/applications/networking/cluster/kubernetes/kubectl.nix +++ b/pkgs/applications/networking/cluster/kubernetes/kubectl.nix @@ -1,15 +1,14 @@ -{ lib, stdenv, kubernetes }: +{ lib, buildGoModule, kubernetes }: -stdenv.mkDerivation rec { +buildGoModule rec { pname = "kubectl"; inherit (kubernetes) - disallowedReferences - GOFLAGS + buildPhase + doCheck nativeBuildInputs - postBuild - postPatch src + vendorSha256 version ; @@ -18,7 +17,7 @@ stdenv.mkDerivation rec { WHAT = lib.concatStringsSep " " [ "cmd/kubectl" "cmd/kubectl-convert" - ]; + ]; installPhase = '' runHook preInstall diff --git a/pkgs/applications/networking/cluster/roxctl/default.nix b/pkgs/applications/networking/cluster/roxctl/default.nix index bbd3d646fdfab..f022fc90b5408 100644 --- a/pkgs/applications/networking/cluster/roxctl/default.nix +++ b/pkgs/applications/networking/cluster/roxctl/default.nix @@ -1,4 +1,4 @@ -{ lib, buildGoModule, fetchFromGitHub, installShellFiles, testVersion, roxctl }: +{ lib, buildGoModule, fetchFromGitHub, installShellFiles, testers, roxctl }: buildGoModule rec { pname = "roxctl"; @@ -30,7 +30,7 @@ buildGoModule rec { --zsh <($out/bin/roxctl completion zsh) ''; - passthru.tests.version = testVersion { + passthru.tests.version = testers.testVersion { package = roxctl; command = "roxctl version"; }; diff --git a/pkgs/applications/networking/cluster/talosctl/default.nix b/pkgs/applications/networking/cluster/talosctl/default.nix index da240b337bfc2..42d451bd44db4 100644 --- a/pkgs/applications/networking/cluster/talosctl/default.nix +++ b/pkgs/applications/networking/cluster/talosctl/default.nix @@ -1,42 +1,21 @@ -{ lib, buildGoModule, fetchFromGitHub, installShellFiles }: -let - # look for GO_LDFLAGS getting set in the Makefile - version = "1.0.6"; - sha256 = "sha256-4cUaQWqVndp06eFgqInOMMGITbTdZO5BOqXW2XEpuWU="; - vendorSha256 = "sha256-7q35d+jbIDe7fAy6nL5FWdSovBb/f64HYLHGL+zE6bI="; - pkgsVersion = "v1.0.0-25-gcf9709e"; - extrasVersion = "v1.0.0-4-g05b0920"; -in +{ lib, stdenv, buildGoModule, fetchFromGitHub, installShellFiles }: + buildGoModule rec { pname = "talosctl"; - inherit version vendorSha256; - # nixpkgs-update: no auto update + version = "1.1.0"; src = fetchFromGitHub { owner = "siderolabs"; repo = "talos"; rev = "v${version}"; - inherit sha256; + sha256 = "sha256-52WzQ5LWgIX/XBJPNvWV0tAPnw1AiINDL/7D3UYvvn4="; }; - ldflags = - let - versionPkg = "github.com/talos-systems/talos/pkg/version"; # VERSION_PKG - imagesPkgs = "github.com/talos-systems/talos/pkg/images"; # IMAGES_PKGS - mgmtHelpersPkg = "github.com/talos-systems/talos/cmd/talosctl/pkg/mgmt/helpers"; #MGMT_HELPERS_PKG - in - [ - "-X ${versionPkg}.Name=Client" - "-X ${versionPkg}.SHA=${src.rev}" # should be the hash, but as we build from tags, this needs to do - "-X ${versionPkg}.Tag=${src.rev}" - "-X ${versionPkg}.PkgsVersion=${pkgsVersion}" # PKGS - "-X ${versionPkg}.ExtrasVersion=${extrasVersion}" # EXTRAS - "-X ${imagesPkgs}.Username=siderolabs" # USERNAME - "-X ${imagesPkgs}.Registry=ghcr.io" # REGISTRY - "-X ${mgmtHelpersPkg}.ArtifactsPath=_out" # ARTIFACTS - "-s" - "-w" - ]; + vendorSha256 = "sha256-iluI4UGw5cZ70wmC9jDiGttvxZ7xFyqcL9IZX4ubJqs="; + + ldflags = [ "-s" "-w" ]; + + GOWORK = "off"; subPackages = [ "cmd/talosctl" ]; @@ -56,5 +35,8 @@ buildGoModule rec { homepage = "https://www.talos.dev/"; license = licenses.mpl20; maintainers = with maintainers; [ flokli ]; + # requires >= 10.14 SDK https://github.com/NixOS/nixpkgs/issues/101229 + # Undefined symbols for architecture x86_64: "_SecTrustEvaluateWithError" + broken = stdenv.isDarwin && stdenv.isx86_64; }; } diff --git a/pkgs/applications/networking/cluster/temporal-cli/default.nix b/pkgs/applications/networking/cluster/temporal-cli/default.nix index 49d64283ca0f0..0d326d5ad458a 100644 --- a/pkgs/applications/networking/cluster/temporal-cli/default.nix +++ b/pkgs/applications/networking/cluster/temporal-cli/default.nix @@ -1,26 +1,17 @@ -{ lib, fetchFromGitHub, fetchpatch, buildGoModule, testers, temporal-cli }: +{ lib, fetchFromGitHub, buildGoModule, testers, temporal-cli }: buildGoModule rec { pname = "temporal-cli"; - version = "1.16.1"; + version = "1.16.2"; src = fetchFromGitHub { owner = "temporalio"; repo = "tctl"; rev = "v${version}"; - sha256 = "sha256-WNdu/62/VmxTmzAvzx3zIlcAAlEmpN0yKzQOSUtrL8s="; + sha256 = "sha256-KLcCFQJlFeioIhqrbkhgoNPcbAYvy1ESG8x9Y/I7+nw="; }; - patches = [ - # Fix tests - (fetchpatch { - name = "fix-tests.patch"; - url = "https://github.com/temporalio/tctl/pull/203/commits/2b113da137a3a925e8fbd7c18bdaaefc31397db4.patch"; - sha256 = "sha256-HFPwbmLZ2uPHzaHvYoB4MTZvMVyzvUKggA76/bh50DQ="; - }) - ]; - - vendorSha256 = "sha256-WF3T+HNisfR0JoKkHCC77kmHmsGZ9NfQ7UCwOmpCG/o="; + vendorSha256 = "sha256-kczmoP32/V0HHeC3Mr+giuMB+McVTNeC2F+t1ohY4/U="; ldflags = [ "-s" "-w" ]; diff --git a/pkgs/applications/networking/cluster/terraform-providers/default.nix b/pkgs/applications/networking/cluster/terraform-providers/default.nix index 9ed67b6969fce..3bcd6aeca63e5 100644 --- a/pkgs/applications/networking/cluster/terraform-providers/default.nix +++ b/pkgs/applications/networking/cluster/terraform-providers/default.nix @@ -1,4 +1,5 @@ { lib +, stdenv , buildGoModule , buildGo118Module , fetchFromGitHub @@ -59,6 +60,15 @@ let special-providers = { brightbox = automated-providers.brightbox.override { mkProviderGoModule = buildGo118Module; }; + # remove with >= 1.6.0 + # https://github.com/equinix/terraform-provider-equinix/commit/5b4d6415d23dc2ee56988c4b1458fbb51c8cc750 + equinix = automated-providers.equinix.overrideAttrs (a: { + src = a.src.overrideAttrs (a: { + postFetch = (a.postFetch or "") + lib.optionalString (!stdenv.isDarwin) '' + rm $out/cmd/migration-tool/README.md + ''; + }); + }); # mkisofs needed to create ISOs holding cloud-init data, # and wrapped to terraform via deecb4c1aab780047d79978c636eeb879dd68630 libvirt = automated-providers.libvirt.overrideAttrs (_: { propagatedBuildInputs = [ cdrtools ]; }); diff --git a/pkgs/applications/networking/cluster/terraform-providers/providers.json b/pkgs/applications/networking/cluster/terraform-providers/providers.json index b68c1eb041e77..6c8a328591e10 100644 --- a/pkgs/applications/networking/cluster/terraform-providers/providers.json +++ b/pkgs/applications/networking/cluster/terraform-providers/providers.json @@ -30,10 +30,10 @@ "owner": "aiven", "provider-source-address": "registry.terraform.io/aiven/aiven", "repo": "terraform-provider-aiven", - "rev": "v3.1.0", - "sha256": "sha256-or9zftygo0W0bcw2FZl9S8dp4K8enlC5MYrrqgB2IUs=", + "rev": "v3.2.0", + "sha256": "sha256-kKKln180j3b1AkuXdjSwboa3T5nLQeZtbOn6jB7i4nw=", "vendorSha256": "sha256-k6pKet1YdQYCyFICw67nKI3RGNZ4b+zA+T9jpa2ZLFM=", - "version": "3.1.0" + "version": "3.2.0" }, "akamai": { "owner": "akamai", @@ -49,10 +49,10 @@ "owner": "aliyun", "provider-source-address": "registry.terraform.io/aliyun/alicloud", "repo": "terraform-provider-alicloud", - "rev": "v1.172.0", - "sha256": "sha256-EtZXUJe3tl4ySOMXWZQPvBF2UrhlK2+RqWFhlUHBl+E=", - "vendorSha256": "sha256-xu1m/wE67gXYKc3sIkDpQGovs/LKfUVI+vl6V0Uc4FE=", - "version": "1.172.0" + "rev": "v1.173.0", + "sha256": "sha256-jLjliUWCpxoawwCl61qHXNzareuF7qCkjSdeQgj6IsE=", + "vendorSha256": "sha256-6FiVXy/q3WImYDbwvj9e3ns9gilaL6GBW5qCpaUNCW0=", + "version": "1.173.0" }, "ansible": { "owner": "nbering", @@ -76,10 +76,10 @@ "owner": "auth0", "provider-source-address": "registry.terraform.io/auth0/auth0", "repo": "terraform-provider-auth0", - "rev": "v0.30.3", - "sha256": "sha256-mtf5gsY7ZVkok6zUTRFgdlRRUnTSeej36aAABfo7NyA=", - "vendorSha256": "sha256-ZN7P9PD8MqThtc6x/Lm4Yeb7ciPVWpFP4zDo0gQHYTo=", - "version": "0.30.3" + "rev": "v0.31.0", + "sha256": "sha256-Huv+eL/5RiI2A1X8RLU9LbIWMjb5yuuslV4CaP/kFiQ=", + "vendorSha256": "sha256-kTR8kSirqhY1GdKLzeFIPt6QNJ4wq2ESUT5ShQUhvRI=", + "version": "0.31.0" }, "avi": { "owner": "vmware", @@ -103,28 +103,28 @@ "owner": "hashicorp", "provider-source-address": "registry.terraform.io/hashicorp/aws", "repo": "terraform-provider-aws", - "rev": "v4.19.0", - "sha256": "sha256-0pgCGv6a+/cBBInISM8Lmfapz+FIPwxAaqd+Rd6jax0=", - "vendorSha256": "sha256-n3iXCX87bu5rETz18GgUdIcy1NH+OTuA4ff56yE7kNg=", - "version": "4.19.0" + "rev": "v4.20.1", + "sha256": "sha256-k6JcwtTUfmZrfiFfacEPTXdtCbnjBrivNQp1dDzXFfM=", + "vendorSha256": "sha256-pKCIL1GD+oA+DVx24Xr07dFnhUcxT/TdASx0sCPWWIQ=", + "version": "4.20.1" }, "azuread": { "owner": "hashicorp", "provider-source-address": "registry.terraform.io/hashicorp/azuread", "repo": "terraform-provider-azuread", - "rev": "v2.24.0", - "sha256": "sha256-obaS2MzLTeIKskGRz8CanRgWzSKTaiK09xxc0kdMDeQ=", + "rev": "v2.25.0", + "sha256": "sha256-+9h9rdbnqIul+V/fhrsNEq/cX24i05i2LBqIk6g9mRE=", "vendorSha256": null, - "version": "2.24.0" + "version": "2.25.0" }, "azurerm": { "owner": "hashicorp", "provider-source-address": "registry.terraform.io/hashicorp/azurerm", "repo": "terraform-provider-azurerm", - "rev": "v3.10.0", - "sha256": "sha256-2xRSHKHC8ypleatXt6cYtZtDMxCSlcDh5lfNmyBb3/4=", + "rev": "v3.11.0", + "sha256": "sha256-81Z+z9h1X8OPkLSZlVwQqhy2gkdYc0DfXs5k8W7wO+k=", "vendorSha256": null, - "version": "3.10.0" + "version": "3.11.0" }, "azurestack": { "owner": "hashicorp", @@ -185,20 +185,20 @@ "owner": "checkly", "provider-source-address": "registry.terraform.io/checkly/checkly", "repo": "terraform-provider-checkly", - "rev": "v1.4.3", - "sha256": "sha256-5VF1cAFgdm2TR4wvuNlycpgQuVdHesFYnTv34MeauxY=", - "vendorSha256": "sha256-7X2cS5Erf373zu8xqe2KBSz52ZmZOnAlNC8lq2/LXV4=", - "version": "1.4.3" + "rev": "v1.6.0", + "sha256": "sha256-zmA6fVpXW4HOJaZzmv5K6cbmO2vM3yGWsa9TSYY4obY=", + "vendorSha256": "sha256-VnYRDBneQ+bUzISJM9DJdBEBmjA1WOXPo+kaYBW4w4U=", + "version": "1.6.0" }, "checkpoint": { "deleteVendor": true, "owner": "CheckPointSW", "provider-source-address": "registry.terraform.io/CheckPointSW/checkpoint", "repo": "terraform-provider-checkpoint", - "rev": "v1.9.1", - "sha256": "sha256-5fyOw4Pu5a+kju4/RXKYZY0TBJ+6PVDwi/VjBWYCPHs=", - "vendorSha256": "sha256-LCKISUjXguV+T/rxde+++JzJZnVQisgxoUMRkeAusyQ=", - "version": "1.9.1" + "rev": "v2.0.0", + "sha256": "sha256-z/mB20gQmglr0usVrzhqxR3v9vhoRHXNJ57j8fqNREM=", + "vendorSha256": "sha256-rb/X9C8eS9QH88FwuvfvDkGdrjZOTiI9nmcYqydOhdc=", + "version": "2.0.0" }, "ciscoasa": { "owner": "CiscoDevNet", @@ -340,19 +340,19 @@ "owner": "kreuzwerker", "provider-source-address": "registry.terraform.io/kreuzwerker/docker", "repo": "terraform-provider-docker", - "rev": "v2.16.0", - "sha256": "sha256-VXKIj7bvhnDMR+DE+5WmJ5SlMDiZIiB+++wbnag6Ai4=", - "vendorSha256": "sha256-9QKHd9rarChp3NN8dY37ldE95OO4pWh5F4Yx5/Ssbno=", - "version": "2.16.0" + "rev": "v2.17.0", + "sha256": "sha256-V+FuDhgih/hTpyuT13INY5vWIaNS/7Z8RlK15mR+CnE=", + "vendorSha256": "sha256-nTulwft8xfpE83ZLJvG7xllQJIqd2M0zzbqpfD3/Mno=", + "version": "2.17.0" }, "dome9": { "owner": "dome9", "provider-source-address": "registry.terraform.io/dome9/dome9", "repo": "terraform-provider-dome9", - "rev": "v1.26.0", - "sha256": "sha256-Edgtt+q1SPm/7wOIWUhe91lluXezNHfxUBu+h1NlEL4=", + "rev": "v1.27.1", + "sha256": "sha256-VmobLWMjHH+GzxUk0bnIr4dWkuH8D00U7VrN9eApF5c=", "vendorSha256": null, - "version": "1.26.0" + "version": "1.27.1" }, "elasticsearch": { "owner": "phillbaker", @@ -363,14 +363,23 @@ "vendorSha256": "sha256-oVTanZpCWs05HwyIKW2ajiBPz1HXOFzBAt5Us+EtTRw=", "version": "2.0.2" }, + "equinix": { + "owner": "equinix", + "provider-source-address": "registry.terraform.io/equinix/equinix", + "repo": "terraform-provider-equinix", + "rev": "v1.5.0", + "sha256": "sha256-+NrEP5x9/ymNb2qSdMyHNu7rjUtYxDT5Nv70vMxfTJw=", + "vendorSha256": "sha256-5MSZ4Mw6P5cI+COOq5SLTXqaVTr+zOix+w983rgcS+g=", + "version": "1.5.0" + }, "exoscale": { "owner": "exoscale", "provider-source-address": "registry.terraform.io/exoscale/exoscale", "repo": "terraform-provider-exoscale", - "rev": "v0.37.1", - "sha256": "sha256-PNm/As+N6+kB79J0lEaQM9LyybCwaRipG/eZCjTPMFY=", + "rev": "v0.38.0", + "sha256": "sha256-TVJlfce5bF5Z64FOPKqb0ac+NtjzeHsid+Q7vWIINuk=", "vendorSha256": null, - "version": "0.37.1" + "version": "0.38.0" }, "external": { "owner": "hashicorp", @@ -440,20 +449,20 @@ "provider-source-address": "registry.terraform.io/hashicorp/google", "proxyVendor": true, "repo": "terraform-provider-google", - "rev": "v4.25.0", - "sha256": "sha256-5tgQpiWjMC+Xh5SPGrTqZVW3GDrlRKTc7K5XMHT6uRA=", + "rev": "v4.26.0", + "sha256": "sha256-iCHhOuHEvynBUFKrKapzg7Jc673TiczG6zttgrABUEs=", "vendorSha256": "sha256-uwyl79TGrnFOxJLBTJ5LaAZLZdb/VbS7IW4jQ2A5xQM=", - "version": "4.25.0" + "version": "4.26.0" }, "google-beta": { "owner": "hashicorp", "provider-source-address": "registry.terraform.io/hashicorp/google-beta", "proxyVendor": true, "repo": "terraform-provider-google-beta", - "rev": "v4.25.0", - "sha256": "sha256-vIuZNjrgLGAF8szY0b9KeB1GoIDtlVLbnE5+IUXmccg=", + "rev": "v4.26.0", + "sha256": "sha256-udk+LtpMe4M4SoMpac06knOY6t5hFFa1yze9THTa5hQ=", "vendorSha256": "sha256-uwyl79TGrnFOxJLBTJ5LaAZLZdb/VbS7IW4jQ2A5xQM=", - "version": "4.25.0" + "version": "4.26.0" }, "googleworkspace": { "owner": "hashicorp", @@ -504,10 +513,10 @@ "owner": "heroku", "provider-source-address": "registry.terraform.io/heroku/heroku", "repo": "terraform-provider-heroku", - "rev": "v5.0.2", - "sha256": "sha256-HzbqqIr2RjarjuIw+9p8JqGRDbPRDfq2OLLztJLCLoM=", - "vendorSha256": "sha256-HrsjhaMlzs+uel5tBlxJD69Kkjl+4qVisWWREANBx40=", - "version": "5.0.2" + "rev": "v5.1.0", + "sha256": "sha256-MMX8zaM3J2GxMXUX0YNX03V8uQzb67cIUF432tjm3Mw=", + "vendorSha256": null, + "version": "5.1.0" }, "hetznerdns": { "owner": "timohirt", @@ -612,10 +621,10 @@ "owner": "mrparkers", "provider-source-address": "registry.terraform.io/mrparkers/keycloak", "repo": "terraform-provider-keycloak", - "rev": "v3.8.1", - "sha256": "sha256-++yoMIn6K4VwAGyRVe/MUjMU46gBeHjIRF2nrXktC7E=", + "rev": "v3.9.0", + "sha256": "sha256-MdsOZptj46RuvLK6wZJL3va8kMSzqxaS4wGEUpgky7Q=", "vendorSha256": "sha256-8x0MlwAzeA2O6wXXHSk++K0ePmzE9/2lfo2ID83LzRM=", - "version": "3.8.1" + "version": "3.9.0" }, "ksyun": { "owner": "kingsoftcloud", @@ -783,10 +792,10 @@ "owner": "newrelic", "provider-source-address": "registry.terraform.io/newrelic/newrelic", "repo": "terraform-provider-newrelic", - "rev": "v2.47.1", - "sha256": "sha256-iC4N8o+VJ5/TFGBO8O+SONMZVjHxZ+4+7ZuDDnAtZC4=", - "vendorSha256": "sha256-sMH/sdrMxIw/2jzUcYL9WwVNUsn12K+gPMR68zpXYIA=", - "version": "2.47.1" + "rev": "v2.48.0", + "sha256": "sha256-p1y09f/apsqCn9d5Hrh3L09zya8ebAsy+KCojfsW43w=", + "vendorSha256": "sha256-/BWmesMF5zzzMi+7IJviMbXOhAfpn9HDg9i+9tLs2ds=", + "version": "2.48.0" }, "nomad": { "owner": "hashicorp", @@ -810,10 +819,10 @@ "owner": "vmware", "provider-source-address": "registry.terraform.io/vmware/nsxt", "repo": "terraform-provider-nsxt", - "rev": "v3.2.7", - "sha256": "sha256-Og/U9bmaZIN7b/JcMnNkt6c3/H+toe4dFYNaQYfxLPM=", + "rev": "v3.2.8", + "sha256": "sha256-oXcT1VmwC9a+U0vM5O9y2As2PbzPr95LrUB6KlFKcMc=", "vendorSha256": null, - "version": "3.2.7" + "version": "3.2.8" }, "null": { "owner": "hashicorp", @@ -838,10 +847,10 @@ "owner": "oracle", "provider-source-address": "registry.terraform.io/oracle/oci", "repo": "terraform-provider-oci", - "rev": "v4.80.1", - "sha256": "sha256-suvtUABb+bLPAyMfS3btwVA4HVZofqKV1Lr/5RczBbw=", + "rev": "v4.81.0", + "sha256": "sha256-KuEF4VAMKd1IbtUbyDSIzKhk0qTSp/pJiGE5lBI/TFE=", "vendorSha256": null, - "version": "4.80.1" + "version": "4.81.0" }, "okta": { "owner": "okta", @@ -883,10 +892,10 @@ "owner": "opentelekomcloud", "provider-source-address": "registry.terraform.io/opentelekomcloud/opentelekomcloud", "repo": "terraform-provider-opentelekomcloud", - "rev": "v1.29.6", - "sha256": "sha256-zhYmwTJ80+w7H7DJxPjMMtLTsHCEhW9G9x5sMz5IRkM=", - "vendorSha256": "sha256-SE6ty/mLRo8nvxrPBW1cVhbxpiYDXr3cmjifF40RrmM=", - "version": "1.29.6" + "rev": "v1.29.7", + "sha256": "sha256-ZdxK143tjtE+pfuy0TxurdblZ2PO7jsYPyrQ1yJeClE=", + "vendorSha256": "sha256-1z5SaH6AoYkrMZVnNurZLmtvVRDNwTBwmQMX0KngKpA=", + "version": "1.29.7" }, "opsgenie": { "owner": "opsgenie", @@ -919,10 +928,10 @@ "owner": "PaloAltoNetworks", "provider-source-address": "registry.terraform.io/PaloAltoNetworks/panos", "repo": "terraform-provider-panos", - "rev": "v1.10.2", - "sha256": "sha256-da3ixmkg/xYr182cnAva6DqtCD5KTC3FkFHkvmMm9jA=", + "rev": "v1.10.3", + "sha256": "sha256-mscWNK113W7CVKI+qPGYX3irQI3YhkLdXox4pddOdF0=", "vendorSha256": null, - "version": "1.10.2" + "version": "1.10.3" }, "pass": { "owner": "camptocamp", @@ -973,10 +982,10 @@ "owner": "hashicorp", "provider-source-address": "registry.terraform.io/hashicorp/random", "repo": "terraform-provider-random", - "rev": "v3.3.1", - "sha256": "sha256-hsNGJmhYrzQhQ0acidx3/dkNFRIabMfgvJsM2Uz+7cE=", - "vendorSha256": "sha256-73/tsfe5YoPTpEGUBvBV6jYGFjSNG9h3AY680tAzM7M=", - "version": "3.3.1" + "rev": "v3.3.2", + "sha256": "sha256-izTx/uxe/SAsWSlN5husEWK64c9ugdg8BS7lScnWSX4=", + "vendorSha256": "sha256-ofU1zZb/C2LFaRCt0NULi+9dQY02lKBlz3jV1/ZhfWU=", + "version": "3.3.2" }, "remote": { "owner": "tenstad", @@ -1000,10 +1009,10 @@ "owner": "scaleway", "provider-source-address": "registry.terraform.io/scaleway/scaleway", "repo": "terraform-provider-scaleway", - "rev": "v2.2.1", - "sha256": "sha256-a3tSxGTRYQeGfaJOR8z1Qd0SeuoiLwrEbdlw3B9gc2A=", - "vendorSha256": "sha256-D/pE1uEpkWIuICNJsuWVHfRNGPf73YliFxqODkl+4QY=", - "version": "2.2.1" + "rev": "v2.2.2", + "sha256": "sha256-uSJga2M+9unC8eJkUjhuCQbTTGXEYGky4MJyVL0ZfiQ=", + "vendorSha256": "sha256-DOL38q5463aOMijP6AbBuE7jI7hvLYLm8yCBxrr6DoA=", + "version": "2.2.2" }, "secret": { "owner": "numtide", @@ -1027,10 +1036,10 @@ "owner": "jianyuan", "provider-source-address": "registry.terraform.io/jianyuan/sentry", "repo": "terraform-provider-sentry", - "rev": "v0.8.0", - "sha256": "sha256-3PTM3GOImwO/yqzR6tOuwU0f+74DfK4RQSBY0vmH3qs=", - "vendorSha256": "sha256-naMuvrVIJp82NIFoR1oEEN6cZFqG4craDh8YU3+NSf0=", - "version": "0.8.0" + "rev": "v0.9.0", + "sha256": "sha256-n+ca1+YKObcdq5h4Sn9tBLg1vpBooBB/pGJxaW4l3k0=", + "vendorSha256": "sha256-hYoLGMI8NGpHW3tsNt6EO1nJrmfeFLuDQ79bkXf7DmQ=", + "version": "0.9.0" }, "shell": { "owner": "scottwinkler", @@ -1081,10 +1090,10 @@ "owner": "spotinst", "provider-source-address": "registry.terraform.io/spotinst/spotinst", "repo": "terraform-provider-spotinst", - "rev": "v1.76.0", - "sha256": "sha256-+/OZw/wpeRHoK5XuwiI2qfbZSheoGd4PRy4TkdtV7yY=", + "rev": "v1.77.0", + "sha256": "sha256-qP6Hjo4ekEk105nQVwGLHR3LiQzUtEd68y45hppdoyY=", "vendorSha256": "sha256-JaWR7TiU5J7HGWExENqo5lHysCzg4Q6XvpCYfekuAg8=", - "version": "1.76.0" + "version": "1.77.0" }, "stackpath": { "owner": "stackpath", @@ -1117,19 +1126,19 @@ "owner": "tencentcloudstack", "provider-source-address": "registry.terraform.io/tencentcloudstack/tencentcloud", "repo": "terraform-provider-tencentcloud", - "rev": "v1.73.3", - "sha256": "sha256-wb1OCD0WupHUSgQJSX1don8GPmqgTqKKap/8DpDasNQ=", + "rev": "v1.74.3", + "sha256": "sha256-iZrM4TJYqJQddpOrqx836O9Y4yA+VsY4iAA7K29CNNU=", "vendorSha256": null, - "version": "1.73.3" + "version": "1.74.3" }, "tfe": { "owner": "hashicorp", "provider-source-address": "registry.terraform.io/hashicorp/tfe", "repo": "terraform-provider-tfe", - "rev": "v0.31.0", - "sha256": "sha256-BvA+1oCh8xB0XcXMGOmAEdi/lEwGdRed5vDEDVBUMhE=", - "vendorSha256": "sha256-7TFfIk+aPbl3CLuNdeJg1O2n3WlCuG5tsayCtbo77I0=", - "version": "0.31.0" + "rev": "v0.32.1", + "sha256": "sha256-7a2uc0f7+OFrbCvHJkKyeX7hXR63PpzpfNhUCWHqOxU=", + "vendorSha256": "sha256-V1nXhDwDMWJsbhPu9otXrOmtzVv0rjvL7CH/13AR5iw=", + "version": "0.32.1" }, "thunder": { "owner": "a10networks", diff --git a/pkgs/applications/networking/cluster/terraform/default.nix b/pkgs/applications/networking/cluster/terraform/default.nix index a281505e0ec62..9bc29755ddb91 100644 --- a/pkgs/applications/networking/cluster/terraform/default.nix +++ b/pkgs/applications/networking/cluster/terraform/default.nix @@ -168,29 +168,6 @@ rec { # Constructor for other terraform versions mkTerraform = attrs: pluggable (generic attrs); - terraform_0_13 = mkTerraform { - version = "0.13.7"; - sha256 = "1cahnmp66dk21g7ga6454yfhaqrxff7hpwpdgc87cswyq823fgjn"; - patches = [ ./provider-path.patch ]; - passthru = { inherit plugins; }; - }; - - terraform_0_14 = mkTerraform { - version = "0.14.11"; - sha256 = "1yi1jj3n61g1kn8klw6l78shd23q79llb7qqwigqrx3ki2mp279j"; - vendorSha256 = "sha256-tWrSr6JCS9s+I0T1o3jgZ395u8IBmh73XGrnJidWI7U="; - patches = [ ./provider-path.patch ]; - passthru = { inherit plugins; }; - }; - - terraform_0_15 = mkTerraform { - version = "0.15.5"; - sha256 = "18f4a6l24s3cym7gk40agxikd90i56q84wziskw1spy9rgv2yx6d"; - vendorSha256 = "sha256-oFvoEsDunJR4IULdGwS6nHBKWEgUehgT+nNM41W/GYo="; - patches = [ ./provider-path-0_15.patch ]; - passthru = { inherit plugins; }; - }; - terraform_1 = mkTerraform { version = "1.2.3"; sha256 = "sha256-hkPlufjlvmI5tKz1VTY5RztuDKEsgjrLR+f7HRrJmkA="; diff --git a/pkgs/applications/networking/cluster/terraform/provider-path.patch b/pkgs/applications/networking/cluster/terraform/provider-path.patch deleted file mode 100644 index 39a69e4a389fa..0000000000000 --- a/pkgs/applications/networking/cluster/terraform/provider-path.patch +++ /dev/null @@ -1,16 +0,0 @@ -diff --git a/command/init.go b/command/init.go -index 403ca245b..05d98329a 100644 ---- a/command/init.go -+++ b/command/init.go -@@ -64,6 +64,11 @@ func (c *InitCommand) Run(args []string) int { - return 1 - } - -+ val, ok := os.LookupEnv("NIX_TERRAFORM_PLUGIN_DIR") -+ if ok { -+ flagPluginPath = append(flagPluginPath, val) -+ } -+ - if len(flagPluginPath) > 0 { - c.pluginPath = flagPluginPath - c.getPlugins = false diff --git a/pkgs/applications/networking/cluster/velero/default.nix b/pkgs/applications/networking/cluster/velero/default.nix index 88c3a31fd2d77..5685b0b65072c 100644 --- a/pkgs/applications/networking/cluster/velero/default.nix +++ b/pkgs/applications/networking/cluster/velero/default.nix @@ -2,23 +2,25 @@ buildGoModule rec { pname = "velero"; - version = "1.8.1"; + version = "1.9.0"; src = fetchFromGitHub { owner = "vmware-tanzu"; repo = "velero"; rev = "v${version}"; - sha256 = "sha256-oiYr9JQlJVxjZxGhZyOIUy934KedBmDhzK+71qmaD58="; + sha256 = "sha256-zoHMyOhHEunJ8LirUxOT1qNY3jB28BEiQ+3GdqriTtQ="; }; ldflags = [ "-s" "-w" "-X github.com/vmware-tanzu/velero/pkg/buildinfo.Version=${version}" + "-X github.com/vmware-tanzu/velero/pkg/buildinfo.ImageRegistry=velero" "-X github.com/vmware-tanzu/velero/pkg/buildinfo.GitTreeState=clean" + "-X github.com/vmware-tanzu/velero/pkg/buildinfo.GitSHA=none" ]; - vendorSha256 = "sha256-DyQ+MHRNZFg80Yz/SCxhnF4NVbIsyhz4mApx0+kgHoA="; + vendorSha256 = "sha256-PDXufnddHEA0qCfzJ0O+h3u50gWNkQAnWMZjSVQ0oHc="; excludedPackages = [ "issue-template-gen" "release-tools" "v1" "velero-restic-restore-helper" ]; diff --git a/pkgs/applications/networking/flexget/default.nix b/pkgs/applications/networking/flexget/default.nix index 0a4cea6288152..071ac5b7aa273 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.17"; + version = "3.3.18"; # Fetch from GitHub in order to use `requirements.in` src = fetchFromGitHub { owner = "flexget"; repo = "flexget"; rev = "refs/tags/v${version}"; - hash = "sha256-xVHk6fQBY8EQsZJDZYoQ+WXDpLGJrRTVR6xhF1DWv0I="; + hash = "sha256-vZOeWxCcrTRT28Bn2r/I7/ojQ6uUV3xZlAZLbrAH5tc="; }; postPatch = '' diff --git a/pkgs/applications/networking/instant-messengers/chatty/default.nix b/pkgs/applications/networking/instant-messengers/chatty/default.nix index 35266eff90092..a6e31573ae816 100644 --- a/pkgs/applications/networking/instant-messengers/chatty/default.nix +++ b/pkgs/applications/networking/instant-messengers/chatty/default.nix @@ -29,7 +29,7 @@ stdenv.mkDerivation rec { pname = "chatty"; - version = "0.6.4"; + version = "0.6.6"; src = fetchFromGitLab { domain = "source.puri.sm"; @@ -37,7 +37,7 @@ stdenv.mkDerivation rec { repo = "chatty"; rev = "v${version}"; fetchSubmodules = true; - hash = "sha256-uDuSx+tWv6DV93/99QUcUKZaWA9kNW8phHZhetYlG/M="; + hash = "sha256-vwgXfoyZOCSMnRAB6bFSrtYlSrpMa9OOcmxYTqhU+lA="; }; postPatch = '' @@ -83,6 +83,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "XMPP and SMS messaging via libpurple and ModemManager"; homepage = "https://source.puri.sm/Librem5/chatty"; + changelog = "https://source.puri.sm/Librem5/chatty/-/blob/${src.rev}/NEWS"; license = licenses.gpl3Plus; maintainers = with maintainers; [ dotlambda tomfitzhenry ]; platforms = platforms.linux; diff --git a/pkgs/applications/networking/instant-messengers/discord/darwin.nix b/pkgs/applications/networking/instant-messengers/discord/darwin.nix index 4bc9ac98df1f6..494a7e6a44283 100644 --- a/pkgs/applications/networking/instant-messengers/discord/darwin.nix +++ b/pkgs/applications/networking/instant-messengers/discord/darwin.nix @@ -1,4 +1,4 @@ -{ pname, version, src, meta, stdenv, binaryName, desktopName, undmg }: +{ pname, version, src, openasar, meta, stdenv, binaryName, desktopName, lib, undmg }: stdenv.mkDerivation { inherit pname version src meta; @@ -8,7 +8,15 @@ stdenv.mkDerivation { sourceRoot = "."; installPhase = '' + runHook preInstall + mkdir -p $out/Applications cp -r "${desktopName}.app" $out/Applications + + runHook postInstall + ''; + + postInstall = lib.strings.optionalString (openasar != null) '' + cp -f ${openasar} $out/Applications/${desktopName}.app/Contents/Resources/app.asar ''; } diff --git a/pkgs/applications/networking/instant-messengers/discord/default.nix b/pkgs/applications/networking/instant-messengers/discord/default.nix index 326d02fd706a5..71606f2dcaddb 100644 --- a/pkgs/applications/networking/instant-messengers/discord/default.nix +++ b/pkgs/applications/networking/instant-messengers/discord/default.nix @@ -1,6 +1,5 @@ -{ branch ? "stable", pkgs, lib, stdenv }: +{ branch ? "stable", callPackage, fetchurl, lib, stdenv, withOpenASAR ? false }: let - inherit (pkgs) callPackage fetchurl; versions = if stdenv.isLinux then { stable = "0.0.18"; ptb = "0.0.29"; @@ -62,8 +61,11 @@ let ++ lib.optionals (branch == "ptb") [ "aarch64-darwin" ]; }; package = if stdenv.isLinux then ./linux.nix else ./darwin.nix; + + openasar = if withOpenASAR then callPackage ./openasar.nix { } else null; + packages = (builtins.mapAttrs - (_: value: callPackage package (value // { inherit src version; meta = meta // { mainProgram = value.binaryName; }; })) + (_: value: callPackage package (value // { inherit src version openasar; meta = meta // { mainProgram = value.binaryName; }; })) { stable = rec { pname = "discord"; diff --git a/pkgs/applications/networking/instant-messengers/discord/linux.nix b/pkgs/applications/networking/instant-messengers/discord/linux.nix index 74e424aaf1dfa..28c1d353ff610 100644 --- a/pkgs/applications/networking/instant-messengers/discord/linux.nix +++ b/pkgs/applications/networking/instant-messengers/discord/linux.nix @@ -1,4 +1,4 @@ -{ pname, version, src, meta, binaryName, desktopName, autoPatchelfHook +{ pname, version, src, openasar, meta, binaryName, desktopName, autoPatchelfHook , makeDesktopItem, lib, stdenv, wrapGAppsHook, makeShellWrapper, alsa-lib, at-spi2-atk , at-spi2-core, atk, cairo, cups, dbus, expat, fontconfig, freetype, gdk-pixbuf , glib, gtk3, libcxx, libdrm, libnotify, libpulseaudio, libuuid, libX11 @@ -72,6 +72,8 @@ stdenv.mkDerivation rec { ]; installPhase = '' + runHook preInstall + mkdir -p $out/{bin,opt/${binaryName},share/pixmaps,share/icons/hicolor/256x256/apps} mv * $out/opt/${binaryName} @@ -95,6 +97,12 @@ stdenv.mkDerivation rec { ln -s $out/opt/${binaryName}/discord.png $out/share/icons/hicolor/256x256/apps/${pname}.png ln -s "${desktopItem}/share/applications" $out/share/ + + runHook postInstall + ''; + + postInstall = lib.strings.optionalString (openasar != null) '' + cp -f ${openasar} $out/opt/${binaryName}/resources/app.asar ''; desktopItem = makeDesktopItem { diff --git a/pkgs/applications/networking/instant-messengers/discord/openasar.nix b/pkgs/applications/networking/instant-messengers/discord/openasar.nix new file mode 100644 index 0000000000000..e378f490c0f45 --- /dev/null +++ b/pkgs/applications/networking/instant-messengers/discord/openasar.nix @@ -0,0 +1,42 @@ +{ lib, stdenv, fetchFromGitHub, nodejs, bash, nodePackages }: + +stdenv.mkDerivation rec { + version = "unstable-2022-06-10"; + pname = "openasar"; + + src = fetchFromGitHub { + owner = "GooseMod"; + repo = "OpenAsar"; + rev = "c6f2f5eb7827fea14cb4c54345af8ff6858c633a"; + sha256 = "m6e/WKGgkR8vjKcHSNdWE25MmDQM1Z3kgB24OJgbw/w="; + }; + + buildPhase = '' + runHook preBuild + + bash scripts/injectPolyfills.sh + substituteInPlace src/index.js --replace 'nightly' '${version}' + ${nodejs}/bin/node scripts/strip.js + ${nodePackages.asar}/bin/asar pack src app.asar + + runHook postBuild + ''; + + installPhase = '' + runHook preInstall + + install app.asar $out + + runHook postInstall + ''; + + doCheck = false; + + meta = with lib; { + description = "Open-source alternative of Discord desktop's \"app.asar\"."; + homepage = "https://openasar.dev"; + license = licenses.mit; + maintainers = with maintainers; [ pedrohlc ]; + platforms = nodejs.meta.platforms; + }; +} diff --git a/pkgs/applications/networking/instant-messengers/signal-desktop/default.nix b/pkgs/applications/networking/instant-messengers/signal-desktop/default.nix index c8f57d20ec11a..7d18a8d29252f 100644 --- a/pkgs/applications/networking/instant-messengers/signal-desktop/default.nix +++ b/pkgs/applications/networking/instant-messengers/signal-desktop/default.nix @@ -24,7 +24,7 @@ let in stdenv.mkDerivation rec { pname = "signal-desktop"; - version = "5.46.0"; # Please backport all updates to the stable channel. + version = "5.47.0"; # Please backport all updates to the stable channel. # All releases have a limited lifetime and "expire" 90 days after the release. # When releases "expire" the application becomes unusable until an update is # applied. The expiration date for the current release can be extracted with: @@ -34,7 +34,7 @@ in stdenv.mkDerivation rec { src = fetchurl { url = "https://updates.signal.org/desktop/apt/pool/main/s/signal-desktop/signal-desktop_${version}_amd64.deb"; - sha256 = "sha256-zy9nETD82KguML0MXe8hlB4m+fBCMmJ1z/2Neq6QvEU="; + sha256 = "sha256-aQpylo4/pbHP2an1w6DEhRmU3uvntN/tnYhvaWtNGGg="; }; nativeBuildInputs = [ diff --git a/pkgs/applications/networking/instant-messengers/teamspeak/client.nix b/pkgs/applications/networking/instant-messengers/teamspeak/client.nix index e3273b8ddc59d..5a0a9006e0df5 100644 --- a/pkgs/applications/networking/instant-messengers/teamspeak/client.nix +++ b/pkgs/applications/networking/instant-messengers/teamspeak/client.nix @@ -93,6 +93,8 @@ stdenv.mkDerivation rec { wrapProgram $out/bin/ts3client \ --set LD_PRELOAD "${libredirect}/lib/libredirect.so" \ --set QT_PLUGIN_PATH "${qtbase}/${qtbase.qtPluginPrefix}" \ + '' /* wayland is currently broken, remove when TS3 fixes that */ + '' + --set QT_QPA_PLATFORM xcb \ --set NIX_REDIRECTS /usr/share/X11/xkb=${xkeyboard_config}/share/X11/xkb ''; diff --git a/pkgs/applications/networking/instant-messengers/telegram/tdesktop/default.nix b/pkgs/applications/networking/instant-messengers/telegram/tdesktop/default.nix index 0ee0bef5e233e..212092d8a1ff1 100644 --- a/pkgs/applications/networking/instant-messengers/telegram/tdesktop/default.nix +++ b/pkgs/applications/networking/instant-messengers/telegram/tdesktop/default.nix @@ -71,7 +71,7 @@ let in env.mkDerivation rec { pname = "telegram-desktop"; - version = "4.0.0"; + version = "4.0.2"; # Note: Update via pkgs/applications/networking/instant-messengers/telegram/tdesktop/update.py # Telegram-Desktop with submodules @@ -80,7 +80,7 @@ env.mkDerivation rec { repo = "tdesktop"; rev = "v${version}"; fetchSubmodules = true; - sha256 = "16j5rvlqr2bb1dkc7cc920ylhw3sp4qnqvm1aznnnjzcimqb8xf0"; + sha256 = "07fhm36394171w0rvay1x9x1br3z36z4dlpi57bkq23dvi331pxj"; }; postPatch = '' diff --git a/pkgs/applications/networking/instant-messengers/threema-desktop/default.nix b/pkgs/applications/networking/instant-messengers/threema-desktop/default.nix index 128107aa05521..852abe8e6dc45 100644 --- a/pkgs/applications/networking/instant-messengers/threema-desktop/default.nix +++ b/pkgs/applications/networking/instant-messengers/threema-desktop/default.nix @@ -3,13 +3,13 @@ stdenv.mkDerivation rec { pname = "threema-desktop"; - version = "1.2.0"; + version = "1.2.13"; src = fetchurl { # As Threema only offers a Latest Release url, the plan is to upload each # new release url to web.archive.org until their Github releases page gets populated. - url = "https://web.archive.org/web/20220408213031if_/https://releases.threema.ch/web-electron/v1/release/Threema-Latest.deb"; - sha256 = "7c8e1e76ad82a0cf776eb8b0a683a41a00dc8752bb79a24b0ae9d795fdedcde6"; + url = "https://web.archive.org/web/20220621152620id_/https://releases.threema.ch/web-electron/v1/release/Threema-Latest.deb"; + sha256 = "sha256-X16GMxUIKUloj0FxhzWQKUBf4zwfSBVg0cwLgGxHPHE="; }; nativeBuildInputs = [ diff --git a/pkgs/applications/networking/p2p/frostwire/frostwire-bin.nix b/pkgs/applications/networking/p2p/frostwire/frostwire-bin.nix index 50e18ac9dca31..fd5424cee3424 100644 --- a/pkgs/applications/networking/p2p/frostwire/frostwire-bin.nix +++ b/pkgs/applications/networking/p2p/frostwire/frostwire-bin.nix @@ -1,12 +1,12 @@ { lib, stdenv, fetchurl, jre, makeWrapper }: stdenv.mkDerivation rec { - version = "6.9.7"; + version = "6.9.8"; pname = "frostwire"; src = fetchurl { url = "https://dl.frostwire.com/frostwire/${version}/frostwire-${version}.amd64.tar.gz"; - sha256 = "sha256-LsmDfNAj10x+txJ4PugyF3Irj/N1reb3ChTvFFIucdc="; + sha256 = "sha256-gslNdvxA4rGKg0bjf2KWw7w9NMp3zqrii144AfKsV4s="; }; nativeBuildInputs = [ makeWrapper ]; diff --git a/pkgs/applications/networking/p2p/jesec-rtorrent/default.nix b/pkgs/applications/networking/p2p/jesec-rtorrent/default.nix index a760a0f96c35c..df314b6591c20 100644 --- a/pkgs/applications/networking/p2p/jesec-rtorrent/default.nix +++ b/pkgs/applications/networking/p2p/jesec-rtorrent/default.nix @@ -21,6 +21,10 @@ stdenv.mkDerivation rec { hash = "sha256-i7c1jSawHshj1kaXl8tdpelIKU24okeg9K5/+ht6t2k="; }; + passthru = { + inherit libtorrent; + }; + nativeBuildInputs = [ cmake ]; diff --git a/pkgs/applications/networking/p2p/rakshasa-rtorrent/default.nix b/pkgs/applications/networking/p2p/rakshasa-rtorrent/default.nix index f166f6d0e29f2..fa459137f1994 100644 --- a/pkgs/applications/networking/p2p/rakshasa-rtorrent/default.nix +++ b/pkgs/applications/networking/p2p/rakshasa-rtorrent/default.nix @@ -27,6 +27,10 @@ stdenv.mkDerivation rec { hash = "sha256-HTwAs8dfZVXfLRNiT6QpjKGnuahHfoMfYWqdKkedUL0="; }; + passthru = { + inherit libtorrent; + }; + nativeBuildInputs = [ autoconf-archive autoreconfHook diff --git a/pkgs/applications/networking/remote/anydesk/default.nix b/pkgs/applications/networking/remote/anydesk/default.nix index e13e2331323a0..69276c229b3c2 100644 --- a/pkgs/applications/networking/remote/anydesk/default.nix +++ b/pkgs/applications/networking/remote/anydesk/default.nix @@ -18,14 +18,14 @@ let in stdenv.mkDerivation rec { pname = "anydesk"; - version = "6.1.1"; + version = "6.2.0"; src = fetchurl { urls = [ "https://download.anydesk.com/linux/${pname}-${version}-amd64.tar.gz" "https://download.anydesk.com/linux/generic-linux/${pname}-${version}-amd64.tar.gz" ]; - sha256 = "1ai58fsivb8al1279bayl800qavy0kfj40rjhf87g902ap3p4bhh"; + sha256 = "k85nQH2FWyEXDgB+Pd4yStfNCjkiIGE2vA/YTXLaK4o="; }; passthru = { diff --git a/pkgs/applications/networking/sniffers/sngrep/default.nix b/pkgs/applications/networking/sniffers/sngrep/default.nix index 401d6dfa32cdb..558c7ef864611 100644 --- a/pkgs/applications/networking/sniffers/sngrep/default.nix +++ b/pkgs/applications/networking/sniffers/sngrep/default.nix @@ -11,13 +11,13 @@ stdenv.mkDerivation rec { pname = "sngrep"; - version = "1.4.10"; + version = "1.5.0"; src = fetchFromGitHub { owner = "irontec"; repo = pname; rev = "v${version}"; - sha256 = "sha256-P618QLk85W0oPisAGiRfpCgHCddKutUkGjwdfgsV4Es="; + sha256 = "sha256-GxC9+O72GHE8Tc6FReO7EdpZTSaqn9mBpZCYaKybJls="; }; nativeBuildInputs = [ diff --git a/pkgs/applications/networking/sync/onedrive/default.nix b/pkgs/applications/networking/sync/onedrive/default.nix index a76be3d318c3c..7b6316631e89c 100644 --- a/pkgs/applications/networking/sync/onedrive/default.nix +++ b/pkgs/applications/networking/sync/onedrive/default.nix @@ -14,13 +14,13 @@ stdenv.mkDerivation rec { pname = "onedrive"; - version = "2.4.17"; + version = "2.4.19"; src = fetchFromGitHub { owner = "abraunegg"; repo = pname; rev = "v${version}"; - hash = "sha256-+ADAPxAZNDqLKLz6rAProqSDINDiTZhc2trxJFFMQeA="; + hash = "sha256-7kX7gC/1jSZGgV3ZhfebMIn/Y5gXkz22GDP2zpiwUZ4="; }; nativeBuildInputs = [ autoreconfHook ldc installShellFiles pkg-config ]; diff --git a/pkgs/applications/networking/syncthing-gtk/paths.patch b/pkgs/applications/networking/syncthing-gtk/paths.patch deleted file mode 100644 index 0ba5a4f2db84e..0000000000000 --- a/pkgs/applications/networking/syncthing-gtk/paths.patch +++ /dev/null @@ -1,22 +0,0 @@ ---- a/syncthing_gtk/configuration.py -+++ b/syncthing_gtk/configuration.py -@@ -30,7 +30,7 @@ - "autokill_daemon" : (int, 2), # 0 - never kill, 1 - always kill, 2 - ask - "daemon_priority" : (int, 0), # uses nice values - "max_cpus" : (int, 0), # 0 for all cpus -- "syncthing_binary" : (str, "/usr/bin/syncthing"), -+ "syncthing_binary" : (str, "@syncthing@"), - "syncthing_arguments" : (str, ""), - "minimize_on_start" : (bool, False), - "folder_as_path" : (bool, True), ---- a/syncthing_gtk/tools.py -+++ b/syncthing_gtk/tools.py -@@ -303,7 +303,7 @@ - return False - # signal 0 doesn't kill anything, but killall exits with 1 if - # named process is not found -- p = Popen(["killall", "-u", os.environ["USER"], "-q", "-s", "0", "syncthing"]) -+ p = Popen(["@killall@", "-u", os.environ["USER"], "-q", "-s", "0", "syncthing"]) - p.communicate() - return p.returncode == 0 - else: diff --git a/pkgs/applications/office/paperless-ngx/default.nix b/pkgs/applications/office/paperless-ngx/default.nix index 18b22217004f1..75bc494d3a879 100644 --- a/pkgs/applications/office/paperless-ngx/default.nix +++ b/pkgs/applications/office/paperless-ngx/default.nix @@ -196,6 +196,6 @@ py.pkgs.pythonPackages.buildPythonApplication rec { description = "A supercharged version of paperless: scan, index, and archive all of your physical documents"; homepage = "https://paperless-ngx.readthedocs.io/en/latest/"; license = licenses.gpl3Only; - maintainers = with maintainers; [ lukegb gador earvstedt ]; + maintainers = with maintainers; [ lukegb gador erikarvstedt ]; }; } diff --git a/pkgs/applications/office/portfolio/default.nix b/pkgs/applications/office/portfolio/default.nix index fc38ac2e8c2ce..30da3b3520459 100644 --- a/pkgs/applications/office/portfolio/default.nix +++ b/pkgs/applications/office/portfolio/default.nix @@ -25,11 +25,11 @@ let in stdenv.mkDerivation rec { pname = "PortfolioPerformance"; - version = "0.58.4"; + version = "0.58.5"; src = fetchurl { url = "https://github.com/buchen/portfolio/releases/download/${version}/PortfolioPerformance-${version}-linux.gtk.x86_64.tar.gz"; - sha256 = "sha256-Png9OcO5dzoeKp826FwdM7zkovuOnSYMnGw5weT2eJU="; + sha256 = "sha256-7olUx0JmztNb6uFsxKwOkBqkbMEiy2vb+iHqBe5I1PM="; }; nativeBuildInputs = [ diff --git a/pkgs/applications/office/qownnotes/default.nix b/pkgs/applications/office/qownnotes/default.nix index 3fd9c3410693a..7df8a607f4dfa 100644 --- a/pkgs/applications/office/qownnotes/default.nix +++ b/pkgs/applications/office/qownnotes/default.nix @@ -5,13 +5,13 @@ mkDerivation rec { pname = "qownnotes"; - version = "22.5.0"; + version = "22.6.1"; src = fetchurl { url = "https://download.tuxfamily.org/${pname}/src/${pname}-${version}.tar.xz"; # Fetch the checksum of current version with curl: # curl https://download.tuxfamily.org/qownnotes/src/qownnotes-<version>.tar.xz.sha256 - sha256 = "52a81401a4a03c77e28f37f56c3ebdc6696ff43c75cc9330d10ba7e801f48ccd"; + sha256 = "c5b2075d42298d28f901ad2df8eb65f5a61aa59727fae9eeb1f92dac1b63d8ba"; }; nativeBuildInputs = [ qmake qttools ]; diff --git a/pkgs/applications/radio/gnuradio/3.9.nix b/pkgs/applications/radio/gnuradio/3.9.nix index 989722fdc3ecd..d607823bfeec4 100644 --- a/pkgs/applications/radio/gnuradio/3.9.nix +++ b/pkgs/applications/radio/gnuradio/3.9.nix @@ -46,13 +46,13 @@ , pname ? "gnuradio" , versionAttr ? { major = "3.9"; - minor = "6"; + minor = "7"; patch = "0"; } }: let - sourceSha256 = "sha256-0JODgv9MNOkHDQYTVCZMzjr/G542+NvGP9wlH9iwLeg="; + sourceSha256 = "sha256-6HEvQsV2JCkgNvBYsy1jfSTUIwEnrKJTzXNIVcPeWFQ="; featuresInfo = { # Needed always basic = { diff --git a/pkgs/applications/radio/gnuradio/default.nix b/pkgs/applications/radio/gnuradio/default.nix index 14a4763259fa9..8a9ca156ec1a8 100644 --- a/pkgs/applications/radio/gnuradio/default.nix +++ b/pkgs/applications/radio/gnuradio/default.nix @@ -48,13 +48,13 @@ , pname ? "gnuradio" , versionAttr ? { major = "3.10"; - minor = "2"; + minor = "3"; patch = "0"; } }: let - sourceSha256 = "sha256-WcfmW39wHhFdpbdBSjOfuDkxL8/fuMjjJoLUyCUud/o="; + sourceSha256 = "sha256-pH0nvZBUto9jXSN6fXD5vP1lIBwCMuFAvF2qT5dYsHU="; featuresInfo = { # Needed always basic = { diff --git a/pkgs/applications/radio/js8call/cmake.patch b/pkgs/applications/radio/js8call/cmake.patch new file mode 100644 index 0000000000000..04552eac40ecc --- /dev/null +++ b/pkgs/applications/radio/js8call/cmake.patch @@ -0,0 +1,69 @@ +diff --git a/CMake/Modules/Findhamlib.cmake b/CMake/Modules/Findhamlib.cmake +index 1590f05..e797851 100644 +--- a/CMake/Modules/Findhamlib.cmake ++++ b/CMake/Modules/Findhamlib.cmake +@@ -47,7 +47,7 @@ if (NOT PC_HAMLIB_FOUND) + + # libusb-1.0 has no pkg-config file on Windows so we have to find it + # ourselves +- find_library (LIBUSB NAMES usb-1.0 PATH_SUFFIXES MinGW32/dll) ++ find_library (LIBUSB NAMES libusb-1.0 usb-1.0 PATH_SUFFIXES MinGW32/dll) + if (LIBUSB) + set (hamlib_EXTRA_LIBRARIES ${LIBUSB} ${hamlib_EXTRA_LIBRARIES}) + get_filename_component (hamlib_libusb_path ${LIBUSB} PATH) +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 75b80b3..7c04265 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -558,7 +558,6 @@ find_package (FFTW3 COMPONENTS double single threads REQUIRED) + # + # libhamlib setup + # +-set (hamlib_STATIC 1) + find_package (hamlib 3 REQUIRED) + find_program (RIGCTL_EXE rigctl) + find_program (RIGCTLD_EXE rigctld) +@@ -576,6 +576,7 @@ message (STATUS "hamlib_LIBRARY_DIRS: ${hamlib_LIBRARY_DIRS}") + find_package (Qt5Widgets 5 REQUIRED) + find_package (Qt5Multimedia 5 REQUIRED) + find_package (Qt5PrintSupport 5 REQUIRED) ++find_package (Qt5SerialPort 5 REQUIRED) + + if (WIN32) + add_definitions (-DQT_NEEDS_QTMAIN) +@@ -849,7 +850,7 @@ target_link_libraries (qcp Qt5::Widgets Qt5::PrintSupport) + add_library (wsjt_qt STATIC ${wsjt_qt_CXXSRCS} ${wsjt_qt_GENUISRCS} ${GENAXSRCS}) + # set wsjtx_udp exports to static variants + target_compile_definitions (wsjt_qt PUBLIC UDP_STATIC_DEFINE) +-target_link_libraries (wsjt_qt qcp Qt5::Widgets Qt5::Network) ++target_link_libraries (wsjt_qt qcp Qt5::Widgets Qt5::Network Qt5::SerialPort) + target_include_directories (wsjt_qt BEFORE PRIVATE ${hamlib_INCLUDE_DIRS}) + if (WIN32) + target_link_libraries (wsjt_qt Qt5::AxContainer Qt5::AxBase) +@@ -959,7 +960,6 @@ else () + ) + endif () + endif () +-qt5_use_modules (js8call SerialPort) # not sure why the interface link library syntax above doesn't work + + # if (UNIX) + # if (NOT WSJT_SKIP_MANPAGES) +@@ -1292,3 +1292,5 @@ configure_file ("${PROJECT_SOURCE_DIR}/CMakeCPackOptions.cmake.in" + set (CPACK_PROJECT_CONFIG_FILE "${PROJECT_BINARY_DIR}/CMakeCPackOptions.cmake") + + include (CPack) ++ ++add_definitions (-DJS8_USE_HAMLIB_THREE) +diff --git a/Configuration.cpp b/Configuration.cpp +index 8258f97..63a29bb 100644 +--- a/Configuration.cpp ++++ b/Configuration.cpp +@@ -160,7 +160,7 @@ + #include <QFont> + #include <QFontDialog> + #include <QColorDialog> +-#include <QSerialPortInfo> ++#include <QtSerialPort/QSerialPortInfo> + #include <QScopedPointer> + #include <QDateTimeEdit> + #include <QProcess> diff --git a/pkgs/applications/radio/js8call/default.nix b/pkgs/applications/radio/js8call/default.nix new file mode 100644 index 0000000000000..e89d3445697f4 --- /dev/null +++ b/pkgs/applications/radio/js8call/default.nix @@ -0,0 +1,65 @@ +{ lib +, stdenv +, fetchFromBitbucket +, wrapQtAppsHook +, pkg-config +, hamlib +, libusb1 +, cmake +, gfortran +, fftw +, fftwFloat +, qtbase +, qtmultimedia +, qtserialport +}: + +stdenv.mkDerivation rec { + pname = "js8call"; + version = "2.2.0"; + + src = fetchFromBitbucket { + owner = "widefido"; + repo = pname; + rev = "v${version}-ga"; + sha256 = "sha256-mFPhiAAibCiAkLrysAmIQalVCGd9ips2lqbAsowYprY="; + }; + + nativeBuildInputs = [ + wrapQtAppsHook + gfortran + pkg-config + cmake + ]; + + buildInputs = [ + hamlib + libusb1 + fftw + fftwFloat + qtbase + qtmultimedia + qtserialport + ]; + + prePatch = '' + substituteInPlace CMakeLists.txt \ + --replace "/usr/share/applications" "$out/share/applications" \ + --replace "/usr/share/pixmaps" "$out/share/pixmaps" \ + --replace "/usr/bin/" "$out/bin" + ''; + + patches = [ ./cmake.patch ]; + + meta = with lib; { + description = "Weak-signal keyboard messaging for amateur radio"; + longDescription = '' + JS8Call is software using the JS8 Digital Mode providing weak signal + keyboard to keyboard messaging to Amateur Radio Operators. + ''; + homepage = "http://js8call.com/"; + license = licenses.gpl3Plus; + platforms = platforms.linux; + maintainers = with maintainers; [ melling ]; + }; +} diff --git a/pkgs/applications/science/logic/formula/default.nix b/pkgs/applications/science/logic/formula/default.nix index 09c29d720a704..f366003914a20 100644 --- a/pkgs/applications/science/logic/formula/default.nix +++ b/pkgs/applications/science/logic/formula/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, buildDotnetModule, dotnetCorePackages }: +{ lib, stdenv, fetchFromGitHub, buildDotnetModule, dotnetCorePackages, unstableGitUpdater }: buildDotnetModule rec { pname = "formula-dotnet"; @@ -7,8 +7,8 @@ buildDotnetModule rec { src = fetchFromGitHub { owner = "VUISIS"; repo = "formula-dotnet"; - rev = "e962438022350dca64335c0603c00d44cb10b528"; - sha256 = "sha256-hVtwV1MdsXaN6ZrGW4RG2HcNcv/hys/5VxGjH9vFdRE="; + rev = "8ee2e6abfd4ce038e1d9cb9c8602dec1ed6c0163"; + sha256 = "sha256-2ulv//YV3OqrfFltgUCeDe4rOPC0qqJ+80/D2lIoih8="; }; nugetDeps = ./nuget.nix; @@ -17,13 +17,15 @@ buildDotnetModule rec { postFixup = if stdenv.isLinux then '' mv $out/bin/CommandLine $out/bin/formula '' else lib.optionalString stdenv.isDarwin '' - makeWrapper ${dotnetCorePackages.runtime_5_0}/bin/dotnet $out/bin/formula \ + makeWrapper ${dotnetCorePackages.runtime_6_0}/bin/dotnet $out/bin/formula \ --add-flags "$out/lib/formula-dotnet/CommandLine.dll" \ --prefix DYLD_LIBRARY_PATH : $out/lib/formula-dotnet/runtimes/macos/native ''; + passthru.updateScript = unstableGitUpdater { url = meta.homepage; }; + meta = with lib; { - broken = (stdenv.isLinux && stdenv.isAarch64) || stdenv.isDarwin; + broken = stdenv.isLinux && stdenv.isAarch64; description = "Formal Specifications for Verification and Synthesis"; homepage = "https://github.com/VUISIS/formula-dotnet"; license = licenses.mspl; diff --git a/pkgs/applications/science/logic/formula/nuget.nix b/pkgs/applications/science/logic/formula/nuget.nix index 373df1a33bc83..40b9abe7fad92 100644 --- a/pkgs/applications/science/logic/formula/nuget.nix +++ b/pkgs/applications/science/logic/formula/nuget.nix @@ -1,13 +1,23 @@ { fetchNuGet }: [ (fetchNuGet { pname = "Antlr4.Runtime.Standard"; version = "4.7.2"; sha256 = "1pmrpsgqjfj0nzr1zqzk1m2fm0ynd4nklwq3dhvww08yjg5s0586"; }) - (fetchNuGet { pname = "Microsoft.AspNetCore.App.Ref"; version = "5.0.0"; sha256 = "0d7sjr89zwq0wxirf8la05hfalv9nhvlczg1c7a508k8aw79jvfg"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Host.linux-x64"; version = "5.0.17"; sha256 = "1lc2jhr4ikffi5ylyf8f6ya6k0hdj0wp1l0017grrwd4m5ajj4vv"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Ref"; version = "5.0.0"; sha256 = "1p62khf9zk23lh91lvz7plv3g1nzmm3b5szqrcm6mb8w3sjk03wi"; }) + (fetchNuGet { pname = "coverlet.collector"; version = "3.0.2"; sha256 = "1xf6z6izmsl4g8w3z1wbp4pa8f8qsf6sil4mf1c9fb22hq8c5hkg"; }) + (fetchNuGet { pname = "Microsoft.Build.Framework"; version = "16.3.0"; sha256 = "1fdgymp11qpv4h152km2wmbykq1rb4b05cyy6d06naw01l61gdz8"; }) + (fetchNuGet { pname = "Microsoft.Build.Utilities.Core"; version = "16.3.0"; sha256 = "17hqjzxqnx2hhp276kdlc6wnhd33dilk0bd41px37and2icl9shn"; }) + (fetchNuGet { pname = "Microsoft.CodeCoverage"; version = "16.9.4"; sha256 = "11wiyy3ykgk1sa9amy3lgcsg2v7d1sz59ggw647vx8ibpjxijjpp"; }) + (fetchNuGet { pname = "Microsoft.CSharp"; version = "4.0.1"; sha256 = "0zxc0apx1gcx361jlq8smc9pfdgmyjh6hpka8dypc9w23nlsh6yj"; }) + (fetchNuGet { pname = "Microsoft.NET.Test.Sdk"; version = "16.9.4"; sha256 = "1jdx05zmrqj1s7xfgn3wgy10qb5cl1n1jcj5kz43zvkw1amc7ra4"; }) + (fetchNuGet { pname = "Microsoft.NETCore.Platforms"; version = "1.0.1"; sha256 = "01al6cfxp68dscl15z7rxfw9zvhm64dncsw09a1vmdkacsa2v6lr"; }) (fetchNuGet { pname = "Microsoft.NETCore.Platforms"; version = "1.1.0"; sha256 = "08vh1r12g6ykjygq5d3vq09zylgb84l63k49jc4v8faw9g93iqqm"; }) + (fetchNuGet { pname = "Microsoft.NETCore.Targets"; version = "1.0.1"; sha256 = "0ppdkwy6s9p7x9jix3v4402wb171cdiibq7js7i13nxpdky7074p"; }) (fetchNuGet { pname = "Microsoft.NETCore.Targets"; version = "1.1.0"; sha256 = "193xwf33fbm0ni3idxzbr5fdq3i2dlfgihsac9jj7whj0gd902nh"; }) + (fetchNuGet { pname = "Microsoft.TestPlatform.ObjectModel"; version = "16.9.4"; sha256 = "1jizkbrnm4pv60zch29ki7gj8m7j5whk141x9cwx4kwsd6cfzwi6"; }) + (fetchNuGet { pname = "Microsoft.TestPlatform.TestHost"; version = "16.9.4"; sha256 = "14110qzmypr72ywvx3npq7mf4n0gvdr4536v91z1xbapms65am6x"; }) (fetchNuGet { pname = "Microsoft.Win32.Primitives"; version = "4.3.0"; sha256 = "0j0c1wj4ndj21zsgivsc24whiya605603kxrbiw6wkfdync464wq"; }) + (fetchNuGet { pname = "Microsoft.Win32.Registry"; version = "4.3.0"; sha256 = "1gxyzxam8163vk1kb6xzxjj4iwspjsz9zhgn1w9rjzciphaz0ig7"; }) (fetchNuGet { pname = "Microsoft.Z3.x64"; version = "4.8.7"; sha256 = "1wxlw29xm5x8vwji2s7gwk39wb88dkbpg76l9s9gq0hqpghwlmdz"; }) (fetchNuGet { pname = "NETStandard.Library"; version = "1.6.1"; sha256 = "1z70wvsx2d847a2cjfii7b83pjfs34q05gb037fdjikv5kbagml8"; }) + (fetchNuGet { pname = "Newtonsoft.Json"; version = "9.0.1"; sha256 = "0mcy0i7pnfpqm4pcaiyzzji4g0c8i3a5gjz28rrr28110np8304r"; }) + (fetchNuGet { pname = "NuGet.Frameworks"; version = "5.0.0"; sha256 = "18ijvmj13cwjdrrm52c8fpq021531zaz4mj4b4zapxaqzzxf2qjr"; }) (fetchNuGet { pname = "runtime.debian.8-x64.runtime.native.System.Security.Cryptography.OpenSsl"; version = "4.3.0"; sha256 = "16rnxzpk5dpbbl1x354yrlsbvwylrq456xzpsha1n9y3glnhyx9d"; }) (fetchNuGet { pname = "runtime.fedora.23-x64.runtime.native.System.Security.Cryptography.OpenSsl"; version = "4.3.0"; sha256 = "0hkg03sgm2wyq8nqk6dbm9jh5vcq57ry42lkqdmfklrw89lsmr59"; }) (fetchNuGet { pname = "runtime.fedora.24-x64.runtime.native.System.Security.Cryptography.OpenSsl"; version = "4.3.0"; sha256 = "0c2p354hjx58xhhz7wv6div8xpi90sc6ibdm40qin21bvi7ymcaa"; }) @@ -26,41 +36,67 @@ (fetchNuGet { pname = "runtime.ubuntu.16.10-x64.runtime.native.System.Security.Cryptography.OpenSsl"; version = "4.3.0"; sha256 = "1p4dgxax6p7rlgj4q73k73rslcnz4wdcv8q2flg1s8ygwcm58ld5"; }) (fetchNuGet { pname = "System.AppContext"; version = "4.3.0"; sha256 = "1649qvy3dar900z3g817h17nl8jp4ka5vcfmsr05kh0fshn7j3ya"; }) (fetchNuGet { pname = "System.Buffers"; version = "4.3.0"; sha256 = "0fgns20ispwrfqll4q1zc1waqcmylb3zc50ys9x8zlwxh9pmd9jy"; }) + (fetchNuGet { pname = "System.Collections"; version = "4.0.11"; sha256 = "1ga40f5lrwldiyw6vy67d0sg7jd7ww6kgwbksm19wrvq9hr0bsm6"; }) (fetchNuGet { pname = "System.Collections"; version = "4.3.0"; sha256 = "19r4y64dqyrq6k4706dnyhhw7fs24kpp3awak7whzss39dakpxk9"; }) (fetchNuGet { pname = "System.Collections.Concurrent"; version = "4.3.0"; sha256 = "0wi10md9aq33jrkh2c24wr2n9hrpyamsdhsxdcnf43b7y86kkii8"; }) + (fetchNuGet { pname = "System.Collections.Immutable"; version = "1.5.0"; sha256 = "1d5gjn5afnrf461jlxzawcvihz195gayqpcfbv6dd7pxa9ialn06"; }) (fetchNuGet { pname = "System.Console"; version = "4.3.0"; sha256 = "1flr7a9x920mr5cjsqmsy9wgnv3lvd0h1g521pdr1lkb2qycy7ay"; }) + (fetchNuGet { pname = "System.Diagnostics.Debug"; version = "4.0.11"; sha256 = "0gmjghrqmlgzxivd2xl50ncbglb7ljzb66rlx8ws6dv8jm0d5siz"; }) (fetchNuGet { pname = "System.Diagnostics.Debug"; version = "4.3.0"; sha256 = "00yjlf19wjydyr6cfviaph3vsjzg3d5nvnya26i2fvfg53sknh3y"; }) (fetchNuGet { pname = "System.Diagnostics.DiagnosticSource"; version = "4.3.0"; sha256 = "0z6m3pbiy0qw6rn3n209rrzf9x1k4002zh90vwcrsym09ipm2liq"; }) + (fetchNuGet { pname = "System.Diagnostics.Tools"; version = "4.0.1"; sha256 = "19cknvg07yhakcvpxg3cxa0bwadplin6kyxd8mpjjpwnp56nl85x"; }) (fetchNuGet { pname = "System.Diagnostics.Tools"; version = "4.3.0"; sha256 = "0in3pic3s2ddyibi8cvgl102zmvp9r9mchh82ns9f0ms4basylw1"; }) (fetchNuGet { pname = "System.Diagnostics.Tracing"; version = "4.3.0"; sha256 = "1m3bx6c2s958qligl67q7grkwfz3w53hpy7nc97mh6f7j5k168c4"; }) + (fetchNuGet { pname = "System.Dynamic.Runtime"; version = "4.0.11"; sha256 = "1pla2dx8gkidf7xkciig6nifdsb494axjvzvann8g2lp3dbqasm9"; }) + (fetchNuGet { pname = "System.Globalization"; version = "4.0.11"; sha256 = "070c5jbas2v7smm660zaf1gh0489xanjqymkvafcs4f8cdrs1d5d"; }) (fetchNuGet { pname = "System.Globalization"; version = "4.3.0"; sha256 = "1cp68vv683n6ic2zqh2s1fn4c2sd87g5hpp6l4d4nj4536jz98ki"; }) (fetchNuGet { pname = "System.Globalization.Calendars"; version = "4.3.0"; sha256 = "1xwl230bkakzzkrggy1l1lxmm3xlhk4bq2pkv790j5lm8g887lxq"; }) (fetchNuGet { pname = "System.Globalization.Extensions"; version = "4.3.0"; sha256 = "02a5zfxavhv3jd437bsncbhd2fp1zv4gxzakp1an9l6kdq1mcqls"; }) + (fetchNuGet { pname = "System.IO"; version = "4.1.0"; sha256 = "1g0yb8p11vfd0kbkyzlfsbsp5z44lwsvyc0h3dpw6vqnbi035ajp"; }) (fetchNuGet { pname = "System.IO"; version = "4.3.0"; sha256 = "05l9qdrzhm4s5dixmx68kxwif4l99ll5gqmh7rqgw554fx0agv5f"; }) (fetchNuGet { pname = "System.IO.Compression"; version = "4.3.0"; sha256 = "084zc82yi6yllgda0zkgl2ys48sypiswbiwrv7irb3r0ai1fp4vz"; }) (fetchNuGet { pname = "System.IO.Compression.ZipFile"; version = "4.3.0"; sha256 = "1yxy5pq4dnsm9hlkg9ysh5f6bf3fahqqb6p8668ndy5c0lk7w2ar"; }) + (fetchNuGet { pname = "System.IO.FileSystem"; version = "4.0.1"; sha256 = "0kgfpw6w4djqra3w5crrg8xivbanh1w9dh3qapb28q060wb9flp1"; }) (fetchNuGet { pname = "System.IO.FileSystem"; version = "4.3.0"; sha256 = "0z2dfrbra9i6y16mm9v1v6k47f0fm617vlb7s5iybjjsz6g1ilmw"; }) + (fetchNuGet { pname = "System.IO.FileSystem.Primitives"; version = "4.0.1"; sha256 = "1s0mniajj3lvbyf7vfb5shp4ink5yibsx945k6lvxa96r8la1612"; }) (fetchNuGet { pname = "System.IO.FileSystem.Primitives"; version = "4.3.0"; sha256 = "0j6ndgglcf4brg2lz4wzsh1av1gh8xrzdsn9f0yznskhqn1xzj9c"; }) + (fetchNuGet { pname = "System.Linq"; version = "4.1.0"; sha256 = "1ppg83svb39hj4hpp5k7kcryzrf3sfnm08vxd5sm2drrijsla2k5"; }) (fetchNuGet { pname = "System.Linq"; version = "4.3.0"; sha256 = "1w0gmba695rbr80l1k2h4mrwzbzsyfl2z4klmpbsvsg5pm4a56s7"; }) + (fetchNuGet { pname = "System.Linq.Expressions"; version = "4.1.0"; sha256 = "1gpdxl6ip06cnab7n3zlcg6mqp7kknf73s8wjinzi4p0apw82fpg"; }) (fetchNuGet { pname = "System.Linq.Expressions"; version = "4.3.0"; sha256 = "0ky2nrcvh70rqq88m9a5yqabsl4fyd17bpr63iy2mbivjs2nyypv"; }) (fetchNuGet { pname = "System.Net.Http"; version = "4.3.0"; sha256 = "1i4gc757xqrzflbk7kc5ksn20kwwfjhw9w7pgdkn19y3cgnl302j"; }) (fetchNuGet { pname = "System.Net.Primitives"; version = "4.3.0"; sha256 = "0c87k50rmdgmxx7df2khd9qj7q35j9rzdmm2572cc55dygmdk3ii"; }) (fetchNuGet { pname = "System.Net.Sockets"; version = "4.3.0"; sha256 = "1ssa65k6chcgi6mfmzrznvqaxk8jp0gvl77xhf1hbzakjnpxspla"; }) + (fetchNuGet { pname = "System.ObjectModel"; version = "4.0.12"; sha256 = "1sybkfi60a4588xn34nd9a58png36i0xr4y4v4kqpg8wlvy5krrj"; }) (fetchNuGet { pname = "System.ObjectModel"; version = "4.3.0"; sha256 = "191p63zy5rpqx7dnrb3h7prvgixmk168fhvvkkvhlazncf8r3nc2"; }) + (fetchNuGet { pname = "System.Reflection"; version = "4.1.0"; sha256 = "1js89429pfw79mxvbzp8p3q93il6rdff332hddhzi5wqglc4gml9"; }) (fetchNuGet { pname = "System.Reflection"; version = "4.3.0"; sha256 = "0xl55k0mw8cd8ra6dxzh974nxif58s3k1rjv1vbd7gjbjr39j11m"; }) + (fetchNuGet { pname = "System.Reflection.Emit"; version = "4.0.1"; sha256 = "0ydqcsvh6smi41gyaakglnv252625hf29f7kywy2c70nhii2ylqp"; }) (fetchNuGet { pname = "System.Reflection.Emit"; version = "4.3.0"; sha256 = "11f8y3qfysfcrscjpjym9msk7lsfxkk4fmz9qq95kn3jd0769f74"; }) + (fetchNuGet { pname = "System.Reflection.Emit.ILGeneration"; version = "4.0.1"; sha256 = "1pcd2ig6bg144y10w7yxgc9d22r7c7ww7qn1frdfwgxr24j9wvv0"; }) (fetchNuGet { pname = "System.Reflection.Emit.ILGeneration"; version = "4.3.0"; sha256 = "0w1n67glpv8241vnpz1kl14sy7zlnw414aqwj4hcx5nd86f6994q"; }) + (fetchNuGet { pname = "System.Reflection.Emit.Lightweight"; version = "4.0.1"; sha256 = "1s4b043zdbx9k39lfhvsk68msv1nxbidhkq6nbm27q7sf8xcsnxr"; }) (fetchNuGet { pname = "System.Reflection.Emit.Lightweight"; version = "4.3.0"; sha256 = "0ql7lcakycrvzgi9kxz1b3lljd990az1x6c4jsiwcacrvimpib5c"; }) + (fetchNuGet { pname = "System.Reflection.Extensions"; version = "4.0.1"; sha256 = "0m7wqwq0zqq9gbpiqvgk3sr92cbrw7cp3xn53xvw7zj6rz6fdirn"; }) (fetchNuGet { pname = "System.Reflection.Extensions"; version = "4.3.0"; sha256 = "02bly8bdc98gs22lqsfx9xicblszr2yan7v2mmw3g7hy6miq5hwq"; }) + (fetchNuGet { pname = "System.Reflection.Metadata"; version = "1.6.0"; sha256 = "1wdbavrrkajy7qbdblpbpbalbdl48q3h34cchz24gvdgyrlf15r4"; }) + (fetchNuGet { pname = "System.Reflection.Primitives"; version = "4.0.1"; sha256 = "1bangaabhsl4k9fg8khn83wm6yial8ik1sza7401621jc6jrym28"; }) (fetchNuGet { pname = "System.Reflection.Primitives"; version = "4.3.0"; sha256 = "04xqa33bld78yv5r93a8n76shvc8wwcdgr1qvvjh959g3rc31276"; }) + (fetchNuGet { pname = "System.Reflection.TypeExtensions"; version = "4.1.0"; sha256 = "1bjli8a7sc7jlxqgcagl9nh8axzfl11f4ld3rjqsyxc516iijij7"; }) (fetchNuGet { pname = "System.Reflection.TypeExtensions"; version = "4.3.0"; sha256 = "0y2ssg08d817p0vdag98vn238gyrrynjdj4181hdg780sif3ykp1"; }) + (fetchNuGet { pname = "System.Resources.ResourceManager"; version = "4.0.1"; sha256 = "0b4i7mncaf8cnai85jv3wnw6hps140cxz8vylv2bik6wyzgvz7bi"; }) (fetchNuGet { pname = "System.Resources.ResourceManager"; version = "4.3.0"; sha256 = "0sjqlzsryb0mg4y4xzf35xi523s4is4hz9q4qgdvlvgivl7qxn49"; }) + (fetchNuGet { pname = "System.Runtime"; version = "4.1.0"; sha256 = "02hdkgk13rvsd6r9yafbwzss8kr55wnj8d5c7xjnp8gqrwc8sn0m"; }) (fetchNuGet { pname = "System.Runtime"; version = "4.3.0"; sha256 = "066ixvgbf2c929kgknshcxqj6539ax7b9m570cp8n179cpfkapz7"; }) + (fetchNuGet { pname = "System.Runtime.Extensions"; version = "4.1.0"; sha256 = "0rw4rm4vsm3h3szxp9iijc3ksyviwsv6f63dng3vhqyg4vjdkc2z"; }) (fetchNuGet { pname = "System.Runtime.Extensions"; version = "4.3.0"; sha256 = "1ykp3dnhwvm48nap8q23893hagf665k0kn3cbgsqpwzbijdcgc60"; }) + (fetchNuGet { pname = "System.Runtime.Handles"; version = "4.0.1"; sha256 = "1g0zrdi5508v49pfm3iii2hn6nm00bgvfpjq1zxknfjrxxa20r4g"; }) (fetchNuGet { pname = "System.Runtime.Handles"; version = "4.3.0"; sha256 = "0sw2gfj2xr7sw9qjn0j3l9yw07x73lcs97p8xfc9w1x9h5g5m7i8"; }) + (fetchNuGet { pname = "System.Runtime.InteropServices"; version = "4.1.0"; sha256 = "01kxqppx3dr3b6b286xafqilv4s2n0gqvfgzfd4z943ga9i81is1"; }) (fetchNuGet { pname = "System.Runtime.InteropServices"; version = "4.3.0"; sha256 = "00hywrn4g7hva1b2qri2s6rabzwgxnbpw9zfxmz28z09cpwwgh7j"; }) (fetchNuGet { pname = "System.Runtime.InteropServices.RuntimeInformation"; version = "4.3.0"; sha256 = "0q18r1sh4vn7bvqgd6dmqlw5v28flbpj349mkdish2vjyvmnb2ii"; }) (fetchNuGet { pname = "System.Runtime.Numerics"; version = "4.3.0"; sha256 = "19rav39sr5dky7afygh309qamqqmi9kcwvz3i0c5700v0c5cg61z"; }) + (fetchNuGet { pname = "System.Runtime.Serialization.Primitives"; version = "4.1.1"; sha256 = "042rfjixknlr6r10vx2pgf56yming8lkjikamg3g4v29ikk78h7k"; }) (fetchNuGet { pname = "System.Security.Cryptography.Algorithms"; version = "4.3.0"; sha256 = "03sq183pfl5kp7gkvq77myv7kbpdnq3y0xj7vi4q1kaw54sny0ml"; }) (fetchNuGet { pname = "System.Security.Cryptography.Cng"; version = "4.3.0"; sha256 = "1k468aswafdgf56ab6yrn7649kfqx2wm9aslywjam1hdmk5yypmv"; }) (fetchNuGet { pname = "System.Security.Cryptography.Csp"; version = "4.3.0"; sha256 = "1x5wcrddf2s3hb8j78cry7yalca4lb5vfnkrysagbn6r9x6xvrx1"; }) @@ -68,13 +104,31 @@ (fetchNuGet { pname = "System.Security.Cryptography.OpenSsl"; version = "4.3.0"; sha256 = "0givpvvj8yc7gv4lhb6s1prq6p2c4147204a0wib89inqzd87gqc"; }) (fetchNuGet { pname = "System.Security.Cryptography.Primitives"; version = "4.3.0"; sha256 = "0pyzncsv48zwly3lw4f2dayqswcfvdwq2nz0dgwmi7fj3pn64wby"; }) (fetchNuGet { pname = "System.Security.Cryptography.X509Certificates"; version = "4.3.0"; sha256 = "0valjcz5wksbvijylxijjxb1mp38mdhv03r533vnx1q3ikzdav9h"; }) + (fetchNuGet { pname = "System.Text.Encoding"; version = "4.0.11"; sha256 = "1dyqv0hijg265dwxg6l7aiv74102d6xjiwplh2ar1ly6xfaa4iiw"; }) (fetchNuGet { pname = "System.Text.Encoding"; version = "4.3.0"; sha256 = "1f04lkir4iladpp51sdgmis9dj4y8v08cka0mbmsy0frc9a4gjqr"; }) + (fetchNuGet { pname = "System.Text.Encoding.CodePages"; version = "4.0.1"; sha256 = "00wpm3b9y0k996rm9whxprngm8l500ajmzgy2ip9pgwk0icp06y3"; }) + (fetchNuGet { pname = "System.Text.Encoding.Extensions"; version = "4.0.11"; sha256 = "08nsfrpiwsg9x5ml4xyl3zyvjfdi4mvbqf93kjdh11j4fwkznizs"; }) (fetchNuGet { pname = "System.Text.Encoding.Extensions"; version = "4.3.0"; sha256 = "11q1y8hh5hrp5a3kw25cb6l00v5l5dvirkz8jr3sq00h1xgcgrxy"; }) + (fetchNuGet { pname = "System.Text.RegularExpressions"; version = "4.1.0"; sha256 = "1mw7vfkkyd04yn2fbhm38msk7dz2xwvib14ygjsb8dq2lcvr18y7"; }) (fetchNuGet { pname = "System.Text.RegularExpressions"; version = "4.3.0"; sha256 = "1bgq51k7fwld0njylfn7qc5fmwrk2137gdq7djqdsw347paa9c2l"; }) + (fetchNuGet { pname = "System.Threading"; version = "4.0.11"; sha256 = "19x946h926bzvbsgj28csn46gak2crv2skpwsx80hbgazmkgb1ls"; }) (fetchNuGet { pname = "System.Threading"; version = "4.3.0"; sha256 = "0rw9wfamvhayp5zh3j7p1yfmx9b5khbf4q50d8k5rk993rskfd34"; }) + (fetchNuGet { pname = "System.Threading.Tasks"; version = "4.0.11"; sha256 = "0nr1r41rak82qfa5m0lhk9mp0k93bvfd7bbd9sdzwx9mb36g28p5"; }) (fetchNuGet { pname = "System.Threading.Tasks"; version = "4.3.0"; sha256 = "134z3v9abw3a6jsw17xl3f6hqjpak5l682k2vz39spj4kmydg6k7"; }) + (fetchNuGet { pname = "System.Threading.Tasks.Extensions"; version = "4.0.0"; sha256 = "1cb51z062mvc2i8blpzmpn9d9mm4y307xrwi65di8ri18cz5r1zr"; }) (fetchNuGet { pname = "System.Threading.Tasks.Extensions"; version = "4.3.0"; sha256 = "1xxcx2xh8jin360yjwm4x4cf5y3a2bwpn2ygkfkwkicz7zk50s2z"; }) + (fetchNuGet { pname = "System.Threading.Thread"; version = "4.0.0"; sha256 = "1gxxm5fl36pjjpnx1k688dcw8m9l7nmf802nxis6swdaw8k54jzc"; }) (fetchNuGet { pname = "System.Threading.Timer"; version = "4.3.0"; sha256 = "1nx773nsx6z5whv8kaa1wjh037id2f1cxhb69pvgv12hd2b6qs56"; }) + (fetchNuGet { pname = "System.Xml.ReaderWriter"; version = "4.0.11"; sha256 = "0c6ky1jk5ada9m94wcadih98l6k1fvf6vi7vhn1msjixaha419l5"; }) (fetchNuGet { pname = "System.Xml.ReaderWriter"; version = "4.3.0"; sha256 = "0c47yllxifzmh8gq6rq6l36zzvw4kjvlszkqa9wq3fr59n0hl3s1"; }) + (fetchNuGet { pname = "System.Xml.XDocument"; version = "4.0.11"; sha256 = "0n4lvpqzy9kc7qy1a4acwwd7b7pnvygv895az5640idl2y9zbz18"; }) (fetchNuGet { pname = "System.Xml.XDocument"; version = "4.3.0"; sha256 = "08h8fm4l77n0nd4i4fk2386y809bfbwqb7ih9d7564ifcxr5ssxd"; }) + (fetchNuGet { pname = "xunit"; version = "2.4.1"; sha256 = "0xf3kaywpg15flqaqfgywqyychzk15kz0kz34j21rcv78q9ywq20"; }) + (fetchNuGet { pname = "xunit.abstractions"; version = "2.0.3"; sha256 = "00wl8qksgkxld76fgir3ycc5rjqv1sqds6x8yx40927q5py74gfh"; }) + (fetchNuGet { pname = "xunit.analyzers"; version = "0.10.0"; sha256 = "15n02q3akyqbvkp8nq75a8rd66d4ax0rx8fhdcn8j78pi235jm7j"; }) + (fetchNuGet { pname = "xunit.assert"; version = "2.4.1"; sha256 = "1imynzh80wxq2rp9sc4gxs4x1nriil88f72ilhj5q0m44qqmqpc6"; }) + (fetchNuGet { pname = "xunit.core"; version = "2.4.1"; sha256 = "1nnb3j4kzmycaw1g76ii4rfqkvg6l8gqh18falwp8g28h802019a"; }) + (fetchNuGet { pname = "xunit.extensibility.core"; version = "2.4.1"; sha256 = "103qsijmnip2pnbhciqyk2jyhdm6snindg5z2s57kqf5pcx9a050"; }) + (fetchNuGet { pname = "xunit.extensibility.execution"; version = "2.4.1"; sha256 = "1pbilxh1gp2ywm5idfl0klhl4gb16j86ib4x83p8raql1dv88qia"; }) + (fetchNuGet { pname = "xunit.runner.visualstudio"; version = "2.4.3"; sha256 = "0j1d0rbcm7pp6dypi61sjxp8l22sv261252z55b243l39jgv2rp3"; }) ] diff --git a/pkgs/applications/science/math/ginac/default.nix b/pkgs/applications/science/math/ginac/default.nix index 0ceefe9b5dd8a..a723fc720f10d 100644 --- a/pkgs/applications/science/math/ginac/default.nix +++ b/pkgs/applications/science/math/ginac/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "ginac"; - version = "1.8.2"; + version = "1.8.3"; src = fetchurl { url = "https://www.ginac.de/ginac-${version}.tar.bz2"; - sha256 = "sha256-v811Gryviv3bg5WMKtInY6deokAyVT5QPumzjj6jtsM="; + sha256 = "sha256-d8caWGrfb8C12rVzQ08wz/FXkVPNd8broCKS4Xj3pJA="; }; propagatedBuildInputs = [ cln ]; diff --git a/pkgs/applications/science/math/gmsh/default.nix b/pkgs/applications/science/math/gmsh/default.nix index 8ef8fcc2295a2..7e7b7a4752fd9 100644 --- a/pkgs/applications/science/math/gmsh/default.nix +++ b/pkgs/applications/science/math/gmsh/default.nix @@ -5,11 +5,11 @@ assert (!blas.isILP64) && (!lapack.isILP64); stdenv.mkDerivation rec { pname = "gmsh"; - version = "4.10.2"; + version = "4.10.4"; src = fetchurl { url = "https://gmsh.info/src/gmsh-${version}-source.tgz"; - sha256 = "sha256-2SEQnmxBn2jVUH2WEu6BXUC1I5pdsXXygoXgzQ2/JRc="; + sha256 = "sha256-9H6SfyTzVPONROJsIaJJXEzb3D1eubiD1afjoic/vRM="; }; buildInputs = [ diff --git a/pkgs/applications/science/math/mathematica/generic.nix b/pkgs/applications/science/math/mathematica/generic.nix index 0f4819172cea9..b081640c97d5b 100644 --- a/pkgs/applications/science/math/mathematica/generic.nix +++ b/pkgs/applications/science/math/mathematica/generic.nix @@ -121,6 +121,8 @@ in stdenv.mkDerivation { "--set USE_WOLFRAM_LD_LIBRARY_PATH 1" # Fix xkeyboard config path for Qt "--set QT_XKB_CONFIG_ROOT ${xkeyboard_config}/share/X11/xkb" + # wayland isn't supported + "--set QT_QPA_PLATFORM xcb" ] ++ lib.optionals cudaSupport [ "--set CUDA_PATH ${cudaEnv}" "--set NVIDIA_DRIVER_LIBRARY_PATH ${addOpenGLRunpath.driverLink}/lib/libnvidia-tls.so" diff --git a/pkgs/applications/science/robotics/betaflight-configurator/default.nix b/pkgs/applications/science/robotics/betaflight-configurator/default.nix index 9417be6e1df88..271274126b754 100644 --- a/pkgs/applications/science/robotics/betaflight-configurator/default.nix +++ b/pkgs/applications/science/robotics/betaflight-configurator/default.nix @@ -13,10 +13,10 @@ let in stdenv.mkDerivation rec { inherit pname; - version = "10.7.2"; + version = "10.8.0"; src = fetchurl { - url = "https://github.com/betaflight/${pname}/releases/download/${version}/${pname}_${version}_linux64.zip"; - sha256 = "sha256-FDmtFRUupPKiHeF3Xvh/VagqMo+FJi8I7mhTz0VDs3o="; + url = "https://github.com/betaflight/${pname}/releases/download/${version}/${pname}_${version}_linux64-portable.zip"; + sha256 = "sha256-Xn0ga2Z1UKd++TriL47ulV6idVTNBR8uiSW7FnL7r1g="; }; nativeBuildInputs = [ wrapGAppsHook unzip ]; diff --git a/pkgs/tools/misc/dterm/default.nix b/pkgs/applications/terminal-emulators/dterm/default.nix index 48665751aeb3f..69b1f67d629a9 100644 --- a/pkgs/tools/misc/dterm/default.nix +++ b/pkgs/applications/terminal-emulators/dterm/default.nix @@ -1,4 +1,8 @@ -{ lib, stdenv, fetchurl, readline }: +{ lib +, stdenv +, fetchurl +, readline +}: stdenv.mkDerivation rec { pname = "dterm"; @@ -6,20 +10,31 @@ stdenv.mkDerivation rec { src = fetchurl { url = "http://www.knossos.net.nz/downloads/dterm-${version}.tgz"; - sha256 = "94533be79f1eec965e59886d5f00a35cb675c5db1d89419f253bb72f140abddb"; + hash = "sha256-lFM7558e7JZeWYhtXwCjXLZ1xdsdiUGfJTu3LxQKvds="; }; buildInputs = [ readline ]; + postPatch = '' substituteInPlace Makefile \ --replace 'gcc' '${stdenv.cc.targetPrefix}cc' ''; + preInstall = "mkdir -p $out/bin"; + installFlags = [ "BIN=$(out)/bin/" ]; meta = with lib; { homepage = "http://www.knossos.net.nz/resources/free-software/dterm/"; description = "A simple terminal program"; + longDescription = '' + dterm is a simple terminal emulator, which doesn’t actually emulate any + particular terminal. Mainly, it is designed for use with xterm and + friends, which already do a perfectly good emulation, and therefore don’t + need any special help; dterm simply provides a means by which keystrokes + are forwarded to the serial line, and data forwarded from the serial line + appears on the terminal. + ''; license = licenses.gpl2Only; maintainers = with maintainers; [ auchter ]; platforms = platforms.unix; diff --git a/pkgs/applications/terminal-emulators/wezterm/default.nix b/pkgs/applications/terminal-emulators/wezterm/default.nix index 8f15a38111c8f..4fed03db0dd08 100644 --- a/pkgs/applications/terminal-emulators/wezterm/default.nix +++ b/pkgs/applications/terminal-emulators/wezterm/default.nix @@ -28,14 +28,14 @@ rustPlatform.buildRustPackage rec { pname = "wezterm"; - version = "20220408-101518-b908e2dd"; + version = "20220624-141144-bd1b7c5d"; src = fetchFromGitHub { owner = "wez"; repo = pname; rev = version; fetchSubmodules = true; - sha256 = "sha256-kuuoD+hqgj7QXFRIxa112oc4idtcK0ptFACDpI0bzGY="; + sha256 = "sha256-7VuNOJ4xqTxumLft7wRj4zdN8Y2ZSYtXr/KuqaLNOgw="; }; postPatch = '' @@ -45,7 +45,7 @@ rustPlatform.buildRustPackage rec { rm -r wezterm-ssh/tests ''; - cargoSha256 = "sha256-iIb2zLUZpn23ooEiOP+yQMYUUmvef/KqvjzgLOFmjs0="; + cargoSha256 = "sha256-YvQ0APyPiYwISE/pDD2s+UgYFj4CKPdolb14FrNpocU="; nativeBuildInputs = [ pkg-config diff --git a/pkgs/applications/version-management/git-and-tools/gfold/default.nix b/pkgs/applications/version-management/git-and-tools/gfold/default.nix index d3b960208fc92..c50fbc7950189 100644 --- a/pkgs/applications/version-management/git-and-tools/gfold/default.nix +++ b/pkgs/applications/version-management/git-and-tools/gfold/default.nix @@ -7,7 +7,7 @@ , rustPlatform , Security , stdenv -, testVersion +, testers }: let @@ -28,7 +28,7 @@ rustPlatform.buildRustPackage { buildInputs = lib.optionals stdenv.isDarwin [ libiconv Security ]; - passthru.tests.version = testVersion { + passthru.tests.version = testers.testVersion { package = gfold; command = "gfold --version"; inherit version; 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 f991bccf0e288..2b2fde8ea27d0 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.7.13"; + version = "1.7.16"; src = fetchFromGitHub { owner = "gabrie30"; repo = "ghorg"; rev = "v${version}"; - sha256 = "sha256-EQCu+2qMKu+e6G5iXAQn5cz0MZqHrF2wnKNO8Fkpp/Y="; + sha256 = "sha256-dQJ21QT3mDGS4nPB9o6033/Sn0+XV0P8Wjqvfcc5Loo="; }; doCheck = false; diff --git a/pkgs/applications/version-management/git-and-tools/git-quickfix/default.nix b/pkgs/applications/version-management/git-and-tools/git-quickfix/default.nix index b8743b7ea9022..4b4319f8cd7cc 100644 --- a/pkgs/applications/version-management/git-and-tools/git-quickfix/default.nix +++ b/pkgs/applications/version-management/git-and-tools/git-quickfix/default.nix @@ -10,15 +10,17 @@ rustPlatform.buildRustPackage rec { pname = "git-quickfix"; - version = "0.0.5"; + version = "0.1.0"; src = fetchFromGitHub { owner = "siedentop"; repo = pname; rev = "v${version}"; - sha256 = "sha256-LDA94pH5Oodf80mEENoURh+MJSg122SVWFVo9i1TEQg="; + sha256 = "sha256-IAjet/bDG/Hf/whS+yrEQSquj8s5DEmFis+5ysLLuxs="; }; + doCheck = false; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ openssl ] ++ lib.optionals stdenv.isDarwin [ Security @@ -26,7 +28,7 @@ rustPlatform.buildRustPackage rec { libiconv ]; - cargoSha256 = "sha256-QTPy0w45AawEU4fHf2FMGpL3YM+iTNnyiI4+mDJzWaE="; + cargoSha256 = "sha256-eTAEf2nRrJ7i2Dw5BBZlLLu8mK2G/wUk40ivtfxk1pI="; meta = with lib; { description = "Quickfix allows you to commit changes in your git repository to a new branch without leaving the current branch"; diff --git a/pkgs/applications/version-management/git-and-tools/git-secret/default.nix b/pkgs/applications/version-management/git-and-tools/git-secret/default.nix index 4c50836cfdb27..6293af4642a34 100644 --- a/pkgs/applications/version-management/git-and-tools/git-secret/default.nix +++ b/pkgs/applications/version-management/git-and-tools/git-secret/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "git-secret"; - version = "0.4.0"; + version = "0.5.0"; src = fetchFromGitHub { repo = "git-secret"; owner = "sobolevn"; rev = "v${version}"; - sha256 = "sha256-Mtuj+e/yCDr4XkmYkWUFJB3cqOT5yOMOq9P/QJV1S80="; + sha256 = "sha256-Vdlv3H99BZcT1O66ZCpq5olENOaUSubx58B1PQ/OlMU="; }; nativeBuildInputs = [ makeWrapper ]; diff --git a/pkgs/applications/version-management/gitlab/Remove-geo-from-database.yml.patch b/pkgs/applications/version-management/gitlab/Remove-geo-from-database.yml.patch new file mode 100644 index 0000000000000..968e618f3121f --- /dev/null +++ b/pkgs/applications/version-management/gitlab/Remove-geo-from-database.yml.patch @@ -0,0 +1,69 @@ +From 7d833508e3bc4c737834e9edf1c429d36f67a38c Mon Sep 17 00:00:00 2001 +From: "M. A" <mak@nyantec.com> +Date: Sat, 25 Jun 2022 13:34:42 +0000 +Subject: [PATCH] Remove geo from database.yml + +--- + config/database.yml.postgresql | 28 ---------------------------- + 1 file changed, 28 deletions(-) + +diff --git a/config/database.yml.postgresql b/config/database.yml.postgresql +index 5329a8e9fd7..a4daab1fd0c 100644 +--- a/config/database.yml.postgresql ++++ b/config/database.yml.postgresql +@@ -18,13 +18,6 @@ production: + # port: 8600 + # record: secondary.postgresql.service.consul + # interval: 300 +- geo: +- adapter: postgresql +- encoding: unicode +- database: gitlabhq_geo_production +- username: git +- password: "secure password" +- host: localhost + + # + # Development specific +@@ -39,13 +32,6 @@ development: + host: localhost + variables: + statement_timeout: 15s +- geo: +- adapter: postgresql +- encoding: unicode +- database: gitlabhq_geo_development +- username: postgres +- password: "secure password" +- host: localhost + + # + # Staging specific +@@ -58,13 +44,6 @@ staging: + username: git + password: "secure password" + host: localhost +- geo: +- adapter: postgresql +- encoding: unicode +- database: gitlabhq_geo_staging +- username: git +- password: "secure password" +- host: localhost + + # Warning: The database defined as "test" will be erased and + # re-generated from your development database when you run "rake". +@@ -80,10 +59,3 @@ test: &test + prepared_statements: false + variables: + statement_timeout: 15s +- geo: +- adapter: postgresql +- encoding: unicode +- database: gitlabhq_geo_test +- username: postgres +- password: +- host: localhost +-- +2.36.0 + diff --git a/pkgs/applications/version-management/gitlab/data.json b/pkgs/applications/version-management/gitlab/data.json index c2f3092a7fabc..3cfdc2a11c771 100644 --- a/pkgs/applications/version-management/gitlab/data.json +++ b/pkgs/applications/version-management/gitlab/data.json @@ -1,14 +1,14 @@ { - "version": "15.0.2", - "repo_hash": "sha256-B5zD8yBY6d+jkIghuxShsR73+2X7Jd9mai1ouraEM44=", - "yarn_hash": "1a8k3x3b9sirzicqkwmr10m27n593iljfh8awdc9700akbj155lr", + "version": "15.1.0", + "repo_hash": "sha256-vOPI9kxdJlQNmI/DZueFcbvZPy2/0d+2CYM/RBAkIcU=", + "yarn_hash": "19df16gk0vpvdi1idqaakaglf11cic93i5njw0x4m2cnsznhpvz4", "owner": "gitlab-org", "repo": "gitlab", - "rev": "v15.0.2-ee", + "rev": "v15.1.0-ee", "passthru": { - "GITALY_SERVER_VERSION": "15.0.2", - "GITLAB_PAGES_VERSION": "1.58.0", - "GITLAB_SHELL_VERSION": "14.3.0", - "GITLAB_WORKHORSE_VERSION": "15.0.2" + "GITALY_SERVER_VERSION": "15.1.0", + "GITLAB_PAGES_VERSION": "1.59.0", + "GITLAB_SHELL_VERSION": "14.7.4", + "GITLAB_WORKHORSE_VERSION": "15.1.0" } } diff --git a/pkgs/applications/version-management/gitlab/default.nix b/pkgs/applications/version-management/gitlab/default.nix index e5765bb78423c..73a02673471f4 100644 --- a/pkgs/applications/version-management/gitlab/default.nix +++ b/pkgs/applications/version-management/gitlab/default.nix @@ -59,9 +59,17 @@ let nativeBuildInputs = [ rubyEnv.wrappedRuby rubyEnv.bundler nodejs yarn git cacert ]; - # Since version 12.6.0, the rake tasks need the location of git, - # so we have to apply the location patches here too. - patches = [ ./remove-hardcoded-locations.patch ]; + patches = [ + # Since version 12.6.0, the rake tasks need the location of git, + # so we have to apply the location patches here too. + ./remove-hardcoded-locations.patch + + # Gitlab edited the default database config since [1] and the + # installer complains about valid keywords only being "main" and "ci". + # + # [1]: https://gitlab.com/gitlab-org/gitlab/-/commit/99c0fac52b10cd9df62bbe785db799352a2d9028 + ./Remove-geo-from-database.yml.patch + ]; # One of the patches uses this variable - if it's unset, execution # of rake tasks fails. GITLAB_LOG_PATH = "log"; diff --git a/pkgs/applications/version-management/gitlab/gitaly/Gemfile.lock b/pkgs/applications/version-management/gitlab/gitaly/Gemfile.lock index cc5344f8e87af..3616864ad7e6d 100644 --- a/pkgs/applications/version-management/gitlab/gitaly/Gemfile.lock +++ b/pkgs/applications/version-management/gitlab/gitaly/Gemfile.lock @@ -115,7 +115,7 @@ GEM minitest (5.15.0) msgpack (1.3.3) multipart-post (2.1.1) - nokogiri (1.13.3) + nokogiri (1.13.6) mini_portile2 (~> 2.8.0) racc (~> 1.4) octokit (4.20.0) @@ -249,4 +249,4 @@ DEPENDENCIES timecop BUNDLED WITH - 2.1.4 + 2.3.15 diff --git a/pkgs/applications/version-management/gitlab/gitaly/default.nix b/pkgs/applications/version-management/gitlab/gitaly/default.nix index e38a24213b0ef..b8c1ecf6704e6 100644 --- a/pkgs/applications/version-management/gitlab/gitaly/default.nix +++ b/pkgs/applications/version-management/gitlab/gitaly/default.nix @@ -11,8 +11,8 @@ let gemdir = ./.; }; - version = "15.0.2"; - package_version = "v14"; + version = "15.1.0"; + package_version = "v${lib.versions.major version}"; gitaly_package = "gitlab.com/gitlab-org/gitaly/${package_version}"; in @@ -24,10 +24,10 @@ buildGoModule { owner = "gitlab-org"; repo = "gitaly"; rev = "v${version}"; - sha256 = "sha256-jwPXar16FOq0xCg3xUXH72YPmoVa91ae3bgz95ZmYo4="; + sha256 = "sha256-rhMQRskum4c5bQL1sE7O4gMxIGX7q3bntuV1HkttA8M="; }; - vendorSha256 = "sha256-/tHKWo09ZV31TSIqlOk36V3y7gNikziUJHf+nS1gHEw="; + vendorSha256 = "sha256-0JWJ2mpf79gJdnNRdlQLi0oDvnj6VmibkW2XcPnaCww="; passthru = { inherit rubyEnv; diff --git a/pkgs/applications/version-management/gitlab/gitaly/gemset.nix b/pkgs/applications/version-management/gitlab/gitaly/gemset.nix index ccf444330af36..1697a9f90200c 100644 --- a/pkgs/applications/version-management/gitlab/gitaly/gemset.nix +++ b/pkgs/applications/version-management/gitlab/gitaly/gemset.nix @@ -493,10 +493,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1p6b3q411h2mw4dsvhjrp1hh66hha5cm69fqg85vn2lizz71n6xz"; + sha256 = "11w59ga9324yx6339dgsflz3dsqq2mky1qqdwcg6wi5s1bf2yldi"; type = "gem"; }; - version = "1.13.3"; + version = "1.13.6"; }; octokit = { dependencies = ["faraday" "sawyer"]; diff --git a/pkgs/applications/version-management/gitlab/gitlab-shell/default.nix b/pkgs/applications/version-management/gitlab/gitlab-shell/default.nix index 3888b0ba1104b..37d66c3a7f656 100644 --- a/pkgs/applications/version-management/gitlab/gitlab-shell/default.nix +++ b/pkgs/applications/version-management/gitlab/gitlab-shell/default.nix @@ -2,19 +2,19 @@ buildGoModule rec { pname = "gitlab-shell"; - version = "14.3.0"; + version = "14.7.4"; src = fetchFromGitLab { owner = "gitlab-org"; repo = "gitlab-shell"; rev = "v${version}"; - sha256 = "sha256-SFoNtWcY0iJREsA+vZRsVJHmNb2vNvOiBJnochxA/Us="; + sha256 = "sha256-kLIjlMwoK1AlhvP38OspXnIWbdOcaLl4r05PiUmqnWw="; }; buildInputs = [ ruby ]; patches = [ ./remove-hardcoded-locations.patch ]; - vendorSha256 = "sha256-eSzJon8o7ktV3rFuTE1A4tzdkBzWBZf1JxnrcMj5s00="; + vendorSha256 = "sha256-f2IkdkTZhve/cYKSH+N2Y5bXFSHuQ8t4hjfReyKTPUU="; postInstall = '' cp -r "$NIX_BUILD_TOP/source"/bin/* $out/bin diff --git a/pkgs/applications/version-management/gitlab/gitlab-workhorse/default.nix b/pkgs/applications/version-management/gitlab/gitlab-workhorse/default.nix index 89d82cc8dd569..b59909dd041a1 100644 --- a/pkgs/applications/version-management/gitlab/gitlab-workhorse/default.nix +++ b/pkgs/applications/version-management/gitlab/gitlab-workhorse/default.nix @@ -5,7 +5,7 @@ in buildGoModule rec { pname = "gitlab-workhorse"; - version = "15.0.2"; + version = "15.1.0"; src = fetchFromGitLab { owner = data.owner; @@ -16,7 +16,7 @@ buildGoModule rec { sourceRoot = "source/workhorse"; - vendorSha256 = "sha256-7hNwBCDMdiiOliZa/lkYLo8gyAksAU0HanCSyaAMYLs="; + vendorSha256 = "sha256-cF2wVii/uBqlUQvrbDyPlv4tnfKA45deb/sE0c9U7Tk="; buildInputs = [ git ]; ldflags = [ "-X main.Version=${version}" ]; doCheck = false; diff --git a/pkgs/applications/version-management/gitlab/rubyEnv/Gemfile b/pkgs/applications/version-management/gitlab/rubyEnv/Gemfile index cbb4d6f90c0fb..9f5c0e4cbfd8d 100644 --- a/pkgs/applications/version-management/gitlab/rubyEnv/Gemfile +++ b/pkgs/applications/version-management/gitlab/rubyEnv/Gemfile @@ -4,7 +4,7 @@ source 'https://rubygems.org' gem 'rails', '~> 6.1.4.7' -gem 'bootsnap', '~> 1.9.4', require: false +gem 'bootsnap', '~> 1.12.0', require: false # Responders respond_to and respond_with gem 'responders', '~> 3.0' @@ -17,7 +17,7 @@ gem 'view_component', '~> 2.50.0' gem 'default_value_for', '~> 3.4.0' # Supported DBs -gem 'pg', '~> 1.1' +gem 'pg', '~> 1.3.0' gem 'rugged', '~> 1.2' gem 'grape-path-helpers', '~> 1.7.0' @@ -55,7 +55,7 @@ gem 'omniauth-authentiq', '~> 0.3.3' gem 'gitlab-omniauth-openid-connect', '~> 0.9.0', require: 'omniauth_openid_connect' gem 'omniauth-salesforce', '~> 1.0.5' gem 'omniauth-atlassian-oauth2', '~> 0.2.0' -gem 'rack-oauth2', '~> 1.16.0' +gem 'rack-oauth2', '~> 1.19.0' gem 'jwt', '~> 2.1.0' # Kerberos authentication. EE-only @@ -97,10 +97,10 @@ gem 'net-ldap', '~> 0.16.3' # API gem 'grape', '~> 1.5.2' gem 'grape-entity', '~> 0.10.0' -gem 'rack-cors', '~> 1.0.6', require: 'rack/cors' +gem 'rack-cors', '~> 1.1.0', require: 'rack/cors' # GraphQL API -gem 'graphql', '~> 1.11.10' +gem 'graphql', '~> 1.13.12' gem 'graphiql-rails', '~> 1.8' gem 'apollo_upload_server', '~> 2.1.0' gem 'graphql-docs', '~> 1.6.0', group: [:development, :test] @@ -121,7 +121,7 @@ gem 'carrierwave', '~> 1.3' gem 'mini_magick', '~> 4.10.1' # for backups -gem 'fog-aws', '~> 3.12' +gem 'fog-aws', '~> 3.14' # Locked until fog-google resolves https://github.com/fog/fog-google/issues/421. # Also see config/initializers/fog_core_patch.rb. gem 'fog-core', '= 2.1.0' @@ -130,7 +130,7 @@ gem 'fog-local', '~> 0.6' gem 'fog-openstack', '~> 1.0' gem 'fog-rackspace', '~> 0.1.1' gem 'fog-aliyun', '~> 0.3' -gem 'gitlab-fog-azure-rm', '~> 1.2.0', require: 'fog/azurerm' +gem 'gitlab-fog-azure-rm', '~> 1.3.0', require: 'fog/azurerm' # for Google storage gem 'google-api-client', '~> 0.33' @@ -167,10 +167,10 @@ gem 'asciidoctor', '~> 2.0.10' gem 'asciidoctor-include-ext', '~> 0.4.0', require: false gem 'asciidoctor-plantuml', '~> 0.0.12' gem 'asciidoctor-kroki', '~> 0.5.0', require: false -gem 'rouge', '~> 3.27.0' +gem 'rouge', '~> 3.29.0' gem 'truncato', '~> 0.7.11' gem 'bootstrap_form', '~> 4.2.0' -gem 'nokogiri', '~> 1.12' +gem 'nokogiri', '~> 1.13.6' gem 'escape_utils', '~> 1.1' # Calendar rendering @@ -181,9 +181,9 @@ gem 'diffy', '~> 3.3' gem 'diff_match_patch', '~> 0.1.0' # Application server -gem 'rack', '~> 2.2.3' -# https://github.com/sharpstone/rack-timeout/blob/master/README.md#rails-apps-manually -gem 'rack-timeout', '~> 0.5.1', require: 'rack/timeout/base' +gem 'rack', '~> 2.2.3.0' +# https://github.com/zombocom/rack-timeout/blob/master/README.md#rails-apps-manually +gem 'rack-timeout', '~> 0.6.0', require: 'rack/timeout/base' group :puma do gem 'puma', '~> 5.6.2', require: false @@ -219,7 +219,7 @@ gem 'ruby-progressbar', '~> 1.10' gem 'settingslogic', '~> 2.0.9' # Linear-time regex library for untrusted regular expressions -gem 're2', '~> 1.2.0' +gem 're2', '~> 1.4.0' # Misc @@ -301,7 +301,7 @@ gem 'base32', '~> 0.3.0' gem 'gitlab-license', '~> 2.1.0' # Protect against bruteforcing -gem 'rack-attack', '~> 6.3.0' +gem 'rack-attack', '~> 6.6.0' # Sentry integration gem 'sentry-raven', '~> 3.1' @@ -311,12 +311,12 @@ gem 'sentry-sidekiq', '~> 5.1.1' # PostgreSQL query parsing # -gem 'pg_query', '~> 2.1' +gem 'pg_query', '~> 2.1.0' gem 'premailer-rails', '~> 1.10.3' # LabKit: Tracing and Correlation -gem 'gitlab-labkit', '~> 0.22.0' +gem 'gitlab-labkit', '~> 0.23.0' # Thrift is a dependency of gitlab-labkit, we want a version higher than 0.14.0 # because of https://gitlab.com/gitlab-org/gitlab/-/issues/321900 gem 'thrift', '>= 0.14.0' @@ -344,7 +344,7 @@ gem 'prometheus-client-mmap', '~> 0.15.0', require: 'prometheus/client' gem 'warning', '~> 1.2.0' group :development do - gem 'lefthook', '~> 0.7.0', require: false + gem 'lefthook', '~> 0.8.0', require: false gem 'rubocop' gem 'solargraph', '~> 0.44.3', require: false @@ -381,7 +381,7 @@ group :development, :test do gem 'spring', '~> 2.1.0' gem 'spring-commands-rspec', '~> 1.0.4' - gem 'gitlab-styles', '~> 7.0.0', require: false + gem 'gitlab-styles', '~> 7.1.0', require: false gem 'haml_lint', '~> 0.36.0', require: false gem 'bundler-audit', '~> 0.7.0.1', require: false @@ -402,10 +402,12 @@ group :development, :test do gem 'test_file_finder', '~> 0.1.3' gem 'sigdump', '~> 0.2.4', require: 'sigdump/setup' + + gem 'pact', '~> 1.12' end group :development, :test, :danger do - gem 'gitlab-dangerfiles', '~> 3.0', require: false + gem 'gitlab-dangerfiles', '~> 3.4.0', require: false end group :development, :test, :coverage do @@ -477,13 +479,13 @@ gem 'sys-filesystem', '~> 1.4.3' gem 'net-ntp' # SSH keys support -gem 'ssh_data', '~> 1.2' +gem 'ssh_data', '~> 1.3' # Spamcheck GRPC protocol definitions gem 'spamcheck', '~> 0.1.0' # Gitaly GRPC protocol definitions -gem 'gitaly', '~> 14.10.0-rc1' +gem 'gitaly', '~> 15.1.0-rc1' # KAS GRPC protocol definitions gem 'kas-grpc', '~> 0.0.2' @@ -503,7 +505,7 @@ gem 'gitlab-experiment', '~> 0.7.1' # Structured logging gem 'lograge', '~> 0.5' -gem 'grape_logging', '~> 1.7' +gem 'grape_logging', '~> 1.8' # DNS Lookup gem 'gitlab-net-dns', '~> 0.9.1' @@ -545,3 +547,5 @@ gem 'ipaddress', '~> 0.8.3' gem 'parslet', '~> 1.8' gem 'ipynbdiff', '0.4.7' + +gem 'ed25519', '~> 1.3.0' diff --git a/pkgs/applications/version-management/gitlab/rubyEnv/Gemfile.lock b/pkgs/applications/version-management/gitlab/rubyEnv/Gemfile.lock index 4f5d0e36ab33e..535e470372c6d 100644 --- a/pkgs/applications/version-management/gitlab/rubyEnv/Gemfile.lock +++ b/pkgs/applications/version-management/gitlab/rubyEnv/Gemfile.lock @@ -143,8 +143,8 @@ GEM rack (>= 0.9.0) bindata (2.4.10) binding_ninja (0.2.3) - bootsnap (1.9.4) - msgpack (~> 1.0) + bootsnap (1.12.0) + msgpack (~> 1.2) bootstrap_form (4.2.0) actionpack (>= 5.0) activemodel (>= 5.0) @@ -214,10 +214,10 @@ GEM creole (0.5.0) crystalball (0.7.0) git - css_parser (1.7.0) + css_parser (1.11.0) addressable daemons (1.3.1) - danger (8.5.0) + danger (8.6.1) claide (~> 1.0) claide-plugins (>= 0.9.2) colored2 (~> 3.1) @@ -306,6 +306,7 @@ GEM e2mmap (0.1.0) ecma-re-validator (0.3.0) regexp_parser (~> 2.0) + ed25519 (1.3.0) elasticsearch (7.13.3) elasticsearch-api (= 7.13.3) elasticsearch-transport (= 7.13.3) @@ -360,7 +361,7 @@ GEM faraday-em_http (1.0.0) faraday-em_synchrony (1.0.0) faraday-excon (1.1.0) - faraday-http-cache (2.2.0) + faraday-http-cache (2.4.0) faraday (>= 0.8) faraday-httpclient (1.0.1) faraday-multipart (1.0.3) @@ -387,6 +388,8 @@ GEM rake ffi-yajl (2.3.4) libyajl2 (~> 1.2) + filelock (1.1.1) + find_a_port (1.0.1) flipper (0.21.0) flipper-active_record (0.21.0) activerecord (>= 5.0, < 7) @@ -402,11 +405,10 @@ GEM fog-json ipaddress (~> 0.8) xml-simple (~> 1.1) - fog-aws (3.12.0) + fog-aws (3.14.0) fog-core (~> 2.1) fog-json (~> 1.1) fog-xml (~> 0.1) - ipaddress (~> 0.8) fog-core (2.1.0) builder excon (~> 0.58) @@ -458,7 +460,7 @@ GEM rails (>= 3.2.0) git (1.7.0) rchardet (~> 1.8) - gitaly (14.10.0.pre.rc1) + gitaly (15.1.0.pre.rc1) grpc (~> 1.0) github-markup (1.7.0) gitlab (4.16.1) @@ -466,21 +468,21 @@ GEM terminal-table (~> 1.5, >= 1.5.1) gitlab-chronic (0.10.5) numerizer (~> 0.2) - gitlab-dangerfiles (3.0.0) + gitlab-dangerfiles (3.4.0) danger (>= 8.4.5) danger-gitlab (>= 8.0.0) rake gitlab-experiment (0.7.1) activesupport (>= 3.0) request_store (>= 1.0) - gitlab-fog-azure-rm (1.2.0) + gitlab-fog-azure-rm (1.3.0) azure-storage-blob (~> 2.0) azure-storage-common (~> 2.0) fog-core (= 2.1.0) fog-json (~> 1.2.0) mime-types ms_rest_azure (~> 0.12.0) - gitlab-labkit (0.22.0) + gitlab-labkit (0.23.0) actionpack (>= 5.0.0, < 7.0.0) activesupport (>= 5.0.0, < 7.0.0) grpc (>= 1.37) @@ -505,7 +507,7 @@ GEM openid_connect (~> 1.2) gitlab-sidekiq-fetcher (0.8.0) sidekiq (~> 6.1) - gitlab-styles (7.0.0) + gitlab-styles (7.1.0) rubocop (~> 0.91, >= 0.91.1) rubocop-gitlab-security (~> 0.1.1) rubocop-graphql (~> 0.10) @@ -564,7 +566,7 @@ GEM grape (~> 1.3) rake (> 12) ruby2_keywords (~> 0.0.2) - grape_logging (1.8.3) + grape_logging (1.8.4) grape rack graphiql-rails (1.8.0) @@ -574,7 +576,7 @@ GEM faraday (>= 1.0) faraday_middleware graphql-client - graphql (1.11.10) + graphql (1.13.12) graphql-client (0.17.0) activesupport (>= 3.0) graphql (~> 1.10) @@ -715,7 +717,7 @@ GEM rest-client (~> 2.0) launchy (2.5.0) addressable (~> 2.7) - lefthook (0.7.5) + lefthook (0.8.0) letter_opener (1.7.0) launchy (~> 2.2) letter_opener_web (2.0.0) @@ -777,7 +779,7 @@ GEM faraday (>= 0.9, < 2.0.0) faraday-cookie_jar (~> 0.0.6) ms_rest (~> 0.7.6) - msgpack (1.5.1) + msgpack (1.5.2) multi_json (1.14.1) multi_xml (0.6.0) multipart-post (2.1.1) @@ -798,7 +800,7 @@ GEM netrc (0.11.0) nio4r (2.5.8) no_proxy_fix (0.1.2) - nokogiri (1.13.3) + nokogiri (1.13.6) mini_portile2 (~> 2.8.0) racc (~> 1.4) notiffany (0.1.3) @@ -852,8 +854,8 @@ GEM addressable (~> 2.3) nokogiri (~> 1.7, >= 1.7.1) omniauth (~> 1.2) - omniauth-dingtalk-oauth2 (1.0.0) - omniauth-oauth2 (~> 1.7.1) + omniauth-dingtalk-oauth2 (1.0.1) + omniauth-oauth2 (~> 1.7) omniauth-facebook (4.0.0) omniauth-oauth2 (~> 1.2) omniauth-github (1.4.0) @@ -908,22 +910,45 @@ GEM rubypants (~> 0.2) orm_adapter (0.5.0) os (1.1.1) - parallel (1.20.1) - parser (3.0.3.2) + pact (1.59.0) + pact-mock_service (~> 3.0, >= 3.3.1) + pact-support (~> 1.15) + rack-test (>= 0.6.3, < 2.0.0) + rspec (~> 3.0) + term-ansicolor (~> 1.0) + thor (>= 0.20, < 2.0) + webrick (~> 1.3) + pact-mock_service (3.6.2) + filelock (~> 1.1) + find_a_port (~> 1.0.1) + json + pact-support (~> 1.12, >= 1.12.0) + rack (~> 2.0) + rspec (>= 2.14) + term-ansicolor (~> 1.0) + thor (>= 0.19, < 2.0) + webrick (~> 1.3) + pact-support (1.15.1) + awesome_print (~> 1.1) + randexp (~> 0.1.7) + rspec (>= 2.14) + term-ansicolor (~> 1.0) + parallel (1.22.1) + parser (3.1.2.0) ast (~> 2.4.1) parslet (1.8.2) pastel (0.8.0) tty-color (~> 0.5) peek (1.1.0) railties (>= 4.0.0) - pg (1.2.3) - pg_query (2.1.1) - google-protobuf (>= 3.17.1) + pg (1.3.5) + pg_query (2.1.3) + google-protobuf (>= 3.19.2) plist (3.6.0) png_quantizator (0.2.1) po_to_json (1.0.1) json (>= 1.6.0) - premailer (1.11.1) + premailer (1.16.0) addressable css_parser (>= 1.6.0) htmlentities (>= 4.0.0) @@ -947,7 +972,7 @@ GEM pry (~> 0.13.0) tty-markdown tty-prompt - public_suffix (4.0.6) + public_suffix (4.0.7) puma (5.6.2) nio4r (~> 2.0) puma_worker_killer (0.3.1) @@ -956,14 +981,14 @@ GEM pyu-ruby-sasl (0.0.3.3) raabro (1.1.6) racc (1.6.0) - rack (2.2.3) + rack (2.2.3.1) rack-accept (0.4.5) rack (>= 0.4) - rack-attack (6.3.0) + rack-attack (6.6.1) rack (>= 1.0, < 3) - rack-cors (1.0.6) - rack (>= 1.6.0) - rack-oauth2 (1.16.0) + rack-cors (1.1.1) + rack (>= 2.0.0) + rack-oauth2 (1.19.0) activesupport attr_required httpclient @@ -973,7 +998,7 @@ GEM rack rack-test (1.1.0) rack (>= 1.0, < 3) - rack-timeout (0.5.2) + rack-timeout (0.6.0) rails (6.1.4.7) actioncable (= 6.1.4.7) actionmailbox (= 6.1.4.7) @@ -1007,8 +1032,9 @@ GEM method_source rake (>= 0.13) thor (~> 1.0) - rainbow (3.0.0) + rainbow (3.1.1) rake (13.0.6) + randexp (0.1.7) rb-fsevent (0.10.4) rb-inotify (0.10.1) ffi (~> 1.0) @@ -1019,7 +1045,7 @@ GEM rbtree (0.4.4) rchardet (1.8.0) rdoc (6.3.2) - re2 (1.2.0) + re2 (1.4.0) recaptcha (4.13.1) json recursive-open-struct (1.1.3) @@ -1035,7 +1061,7 @@ GEM redis-store (>= 1.2, < 2) redis-store (1.9.0) redis (>= 4, < 5) - regexp_parser (2.2.1) + regexp_parser (2.5.0) regexp_property_values (1.0.0) representable (3.0.4) declarative (< 0.1.0) @@ -1057,7 +1083,7 @@ GEM rexml (3.2.5) rinku (2.0.0) rotp (6.2.0) - rouge (3.27.0) + rouge (3.29.0) rqrcode (0.7.0) chunky_png rqrcode-rails3 (0.1.7) @@ -1112,11 +1138,11 @@ GEM rubocop-ast (>= 0.6.0) ruby-progressbar (~> 1.7) unicode-display_width (>= 1.4.0, < 2.0) - rubocop-ast (1.4.1) - parser (>= 2.7.1.5) + rubocop-ast (1.18.0) + parser (>= 3.1.1.0) rubocop-gitlab-security (0.1.1) rubocop (>= 0.51) - rubocop-graphql (0.13.0) + rubocop-graphql (0.14.3) rubocop (>= 0.87, < 2) rubocop-performance (1.9.2) rubocop (>= 0.90.0, < 2.0) @@ -1253,7 +1279,7 @@ GEM activesupport (>= 5.2) sprockets (>= 3.0.0) sqlite3 (1.4.2) - ssh_data (1.2.0) + ssh_data (1.3.0) ssrf_filter (1.0.7) stackprof (0.2.15) state_machines (0.5.0) @@ -1272,11 +1298,14 @@ GEM activesupport (>= 3) attr_required (>= 0.0.5) httpclient (>= 2.4) + sync (0.5.0) sys-filesystem (1.4.3) ffi (~> 1.1) sysexits (1.2.0) tanuki_emoji (0.6.0) temple (0.8.2) + term-ansicolor (1.7.1) + tins (~> 1.0) terminal-table (1.8.0) unicode-display_width (~> 1.1, >= 1.1.1) terser (1.0.2) @@ -1295,6 +1324,8 @@ GEM timecop (0.9.1) timeliness (0.3.10) timfel-krb5-auth (0.8.3) + tins (1.31.0) + sync toml-rb (2.0.1) citrus (~> 3.0, > 3.0) tomlrb (1.3.0) @@ -1341,7 +1372,7 @@ GEM unf (0.1.4) unf_ext unf_ext (0.0.8) - unicode-display_width (1.7.0) + unicode-display_width (1.8.0) unicode_utils (1.4.0) uniform_notifier (1.13.0) unleash (3.2.2) @@ -1403,7 +1434,7 @@ GEM nokogiri (~> 1.8) yajl-ruby (1.4.1) yard (0.9.26) - zeitwerk (2.5.4) + zeitwerk (2.6.0) PLATFORMS ruby @@ -1435,7 +1466,7 @@ DEPENDENCIES benchmark-ips (~> 2.3.0) benchmark-memory (~> 0.1) better_errors (~> 2.9.0) - bootsnap (~> 1.9.4) + bootsnap (~> 1.12.0) bootstrap_form (~> 4.2.0) browser (~> 4.2) bullet (~> 6.1.3) @@ -1464,6 +1495,7 @@ DEPENDENCIES discordrb-webhooks (~> 3.4) doorkeeper (~> 5.5.0.rc2) doorkeeper-openid_connect (~> 1.7.5) + ed25519 (~> 1.3.0) elasticsearch-api (= 7.13.3) elasticsearch-model (~> 7.2) elasticsearch-rails (~> 7.2) @@ -1481,7 +1513,7 @@ DEPENDENCIES flipper-active_support_cache_store (~> 0.21.0) flowdock (~> 0.7) fog-aliyun (~> 0.3) - fog-aws (~> 3.12) + fog-aws (~> 3.14) fog-core (= 2.1.0) fog-google (~> 1.15) fog-local (~> 0.6) @@ -1492,13 +1524,13 @@ DEPENDENCIES gettext (~> 3.3) gettext_i18n_rails (~> 1.8.0) gettext_i18n_rails_js (~> 1.3) - gitaly (~> 14.10.0.pre.rc1) + gitaly (~> 15.1.0.pre.rc1) github-markup (~> 1.7.0) gitlab-chronic (~> 0.10.5) - gitlab-dangerfiles (~> 3.0) + gitlab-dangerfiles (~> 3.4.0) gitlab-experiment (~> 0.7.1) - gitlab-fog-azure-rm (~> 1.2.0) - gitlab-labkit (~> 0.22.0) + gitlab-fog-azure-rm (~> 1.3.0) + gitlab-labkit (~> 0.23.0) gitlab-license (~> 2.1.0) gitlab-license_finder (~> 6.0) gitlab-mail_room (~> 0.0.9) @@ -1506,7 +1538,7 @@ DEPENDENCIES gitlab-net-dns (~> 0.9.1) gitlab-omniauth-openid-connect (~> 0.9.0) gitlab-sidekiq-fetcher (= 0.8.0) - gitlab-styles (~> 7.0.0) + gitlab-styles (~> 7.1.0) gitlab_chronic_duration (~> 0.10.6.2) gitlab_omniauth-ldap (~> 2.1.1) gon (~> 6.4.0) @@ -1516,10 +1548,10 @@ DEPENDENCIES grape (~> 1.5.2) grape-entity (~> 0.10.0) grape-path-helpers (~> 1.7.0) - grape_logging (~> 1.7) + grape_logging (~> 1.8) graphiql-rails (~> 1.8) graphlient (~> 0.5.0) - graphql (~> 1.11.10) + graphql (~> 1.13.12) graphql-docs (~> 1.6.0) grpc (~> 1.42.0) gssapi @@ -1547,7 +1579,7 @@ DEPENDENCIES knapsack (~> 1.21.1) kramdown (~> 2.3.1) kubeclient (~> 4.9.2) - lefthook (~> 0.7.0) + lefthook (~> 0.8.0) letter_opener_web (~> 2.0.0) licensee (~> 9.14.1) lockbox (~> 0.6.2) @@ -1563,7 +1595,7 @@ DEPENDENCIES multi_json (~> 1.14.1) net-ldap (~> 0.16.3) net-ntp - nokogiri (~> 1.12) + nokogiri (~> 1.13.6) oauth2 (~> 1.4) octokit (~> 4.15) ohai (~> 16.10) @@ -1588,11 +1620,12 @@ DEPENDENCIES omniauth-twitter (~> 1.4) omniauth_crowd (~> 2.4.0) org-ruby (~> 0.9.12) + pact (~> 1.12) parallel (~> 1.19) parslet (~> 1.8) peek (~> 1.1) - pg (~> 1.1) - pg_query (~> 2.1) + pg (~> 1.3.0) + pg_query (~> 2.1.0) png_quantizator (~> 0.2.1) premailer-rails (~> 1.10.3) prometheus-client-mmap (~> 0.15.0) @@ -1601,19 +1634,19 @@ DEPENDENCIES pry-shell (~> 0.5.0) puma (~> 5.6.2) puma_worker_killer (~> 0.3.1) - rack (~> 2.2.3) - rack-attack (~> 6.3.0) - rack-cors (~> 1.0.6) - rack-oauth2 (~> 1.16.0) + rack (~> 2.2.3.0) + rack-attack (~> 6.6.0) + rack-cors (~> 1.1.0) + rack-oauth2 (~> 1.19.0) rack-proxy (~> 0.7.2) - rack-timeout (~> 0.5.1) + rack-timeout (~> 0.6.0) rails (~> 6.1.4.7) rails-controller-testing rails-i18n (~> 6.0) rainbow (~> 3.0) rbtrace (~> 0.4) rdoc (~> 6.3.2) - re2 (~> 1.2.0) + re2 (~> 1.4.0) recaptcha (~> 4.11) redis (~> 4.4.0) redis-actionpack (~> 5.2.0) @@ -1622,7 +1655,7 @@ DEPENDENCIES responders (~> 3.0) retriable (~> 3.1.2) rexml (~> 3.2.5) - rouge (~> 3.27.0) + rouge (~> 3.29.0) rqrcode-rails3 (~> 0.1.7) rspec-benchmark (~> 0.6.0) rspec-parameterized @@ -1665,7 +1698,7 @@ DEPENDENCIES spring-commands-rspec (~> 1.0.4) sprite-factory (~> 1.7) sprockets (~> 3.7.0) - ssh_data (~> 1.2) + ssh_data (~> 1.3) stackprof (~> 0.2.15) state_machines-activerecord (~> 0.8.0) sys-filesystem (~> 1.4.3) diff --git a/pkgs/applications/version-management/gitlab/rubyEnv/gemset.nix b/pkgs/applications/version-management/gitlab/rubyEnv/gemset.nix index 87791ff567532..5f11d60987854 100644 --- a/pkgs/applications/version-management/gitlab/rubyEnv/gemset.nix +++ b/pkgs/applications/version-management/gitlab/rubyEnv/gemset.nix @@ -577,10 +577,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "19i4x2nascd74ahcvmrsnf03cygh1y4c9yf8rcv91fv0mcxpvb9n"; + sha256 = "0yza43f42v0ys81y6jzbqfkdykf40h6l3yyvadwq32fswrbpwvbc"; type = "gem"; }; - version = "1.9.4"; + version = "1.12.0"; }; bootstrap_form = { dependencies = ["actionpack" "activemodel"]; @@ -930,10 +930,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1y4vc018b5mzp7winw4pbb22jk0dpxp22pzzxq7w0rgvfxzi89pd"; + sha256 = "1qbdgp36dhcyljhmfxrvbgp1ha9yqxhxgyg3sdm48y9m371jd2an"; type = "gem"; }; - version = "1.7.0"; + version = "1.11.0"; }; daemons = { groups = ["default" "development"]; @@ -951,10 +951,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0xmckbl41v27x9ri6snrl01alsbwxcqsfc4a1nfhgx0py6y0dmjg"; + sha256 = "1n6zbkkinlv2hp4ig5c170d1ckbbdf8rgxmykfm3m3gn865vapnr"; type = "gem"; }; - version = "8.5.0"; + version = "8.6.1"; }; danger-gitlab = { dependencies = ["danger" "gitlab"]; @@ -1283,6 +1283,16 @@ }; version = "0.3.0"; }; + ed25519 = { + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0zb2dr2ihb1qiknn5iaj1ha1w9p7lj9yq5waasndlfadz225ajji"; + type = "gem"; + }; + version = "1.3.0"; + }; elasticsearch = { dependencies = ["elasticsearch-api" "elasticsearch-transport"]; groups = ["default"]; @@ -1537,14 +1547,14 @@ }; faraday-http-cache = { dependencies = ["faraday"]; - groups = ["default" "development"]; + groups = ["danger" "default" "development" "test"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0lhfwlk4mhmw9pdlgdsl2bq4x45w7s51jkxjryf18wym8iiw36g7"; + sha256 = "143cpzdrnyqyfv1jasr0qjqgm57dhv46nsf5f2s06ndxccfr13rq"; type = "gem"; }; - version = "2.2.0"; + version = "2.4.0"; }; faraday-httpclient = { groups = ["danger" "default" "development" "test"]; @@ -1712,6 +1722,26 @@ }; version = "2.3.4"; }; + filelock = { + groups = ["default" "development" "test"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "085vrb6wf243iqqnrrccwhjd4chphfdsybkvjbapa2ipfj1ja1sj"; + type = "gem"; + }; + version = "1.1.1"; + }; + find_a_port = { + groups = ["default" "development" "test"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1sswgpvn38yav4i21adrr7yy8c8299d7rj065gd3iwg6nn26lpb0"; + type = "gem"; + }; + version = "1.0.1"; + }; flipper = { groups = ["default"]; platforms = []; @@ -1767,15 +1797,15 @@ version = "0.3.3"; }; fog-aws = { - dependencies = ["fog-core" "fog-json" "fog-xml" "ipaddress"]; + dependencies = ["fog-core" "fog-json" "fog-xml"]; groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0cl9b93mwhzm9fp0lmac1vzz359g3sq52k06kn0a0vnvxrxnhzjm"; + sha256 = "1gsb26a1jp0k7hclry0dai2a9m77a9h6ybc17x0i98z2ivzjsi07"; type = "gem"; }; - version = "3.12.0"; + version = "3.14.0"; }; fog-core = { dependencies = ["builder" "excon" "formatador" "mime-types"]; @@ -1967,10 +1997,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0ls4x3h1c3axx9kqmvs1mpcmjqchl297sh1bzzl5zjgdz25w24di"; + sha256 = "0ygf5di1sl8b3gs7ascn3r9carf6v8d9c3damc10sh81sm7bwc0z"; type = "gem"; }; - version = "14.10.0.pre.rc1"; + version = "15.1.0.pre.rc1"; }; github-markup = { groups = ["default"]; @@ -2010,10 +2040,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1kyp5kxp0jsk224y2nq4yg37wnn824ialdjvsf8fv3a20q9w4k7i"; + sha256 = "13c7k36xq042fbf7d9jwgfc30zq9dfziwvqfi88h2199v9dkylix"; type = "gem"; }; - version = "3.0.0"; + version = "3.4.0"; }; gitlab-experiment = { dependencies = ["activesupport" "request_store"]; @@ -2032,10 +2062,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1hi9v0zy863gnk17w0fp1ks2kr1s2z6q0bkx5wdbq6yawycjs94h"; + sha256 = "1d8plrl69q5mcsgz8ywhw7k9q0g31y3gm6h90gw9apsisqbm7vrg"; type = "gem"; }; - version = "1.2.0"; + version = "1.3.0"; }; gitlab-labkit = { dependencies = ["actionpack" "activesupport" "grpc" "jaeger-client" "opentracing" "pg_query" "redis"]; @@ -2043,10 +2073,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1vs5q1lfk5i953gv2xvz6h5x6ycllr8hdzg81zsrz7hy3aygxknj"; + sha256 = "0kiz2m3dw6ld2z6dsl8jh2ycw061wv8wiy34flymb5zqjiyyzw8l"; type = "gem"; }; - version = "0.22.0"; + version = "0.23.0"; }; gitlab-license = { groups = ["default"]; @@ -2127,10 +2157,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "10fmvx2vx2v0mbwv5d4wcpc2iyp5y8lwxn9hjpzkk5bvxkk4c493"; + sha256 = "0xp2f1bbx8i7a89xjwy6b5rhxr9g1vnms68chcnxdd95csxhxpzp"; type = "gem"; }; - version = "7.0.0"; + version = "7.1.0"; }; gitlab_chronic_duration = { dependencies = ["numerizer"]; @@ -2280,10 +2310,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0x6cmmj0wi1m689r8d4yhyhpl8dwj5skn8b29igm4xvw3swkg94x"; + sha256 = "1lcjqwal3wc2r41wsi01d09cyhxhglxp6y7hd0564pdx5lr3xk7g"; type = "gem"; }; - version = "1.8.3"; + version = "1.8.4"; }; graphiql-rails = { dependencies = ["railties" "sprockets-rails"]; @@ -2312,10 +2342,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0qb6bk8gflwid4qrk2i9ndzs5fxycdjvxmhy9w547lglzb5jx19b"; + sha256 = "1hvsv6ig6d8syr4vasa8vcc090kbawwflk5m1j6kl681y9n6d0hx"; type = "gem"; }; - version = "1.11.10"; + version = "1.13.12"; }; graphql-client = { dependencies = ["activesupport" "graphql"]; @@ -2899,10 +2929,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "07r76qlzxcz9y4dmkqf8k4khkfq7s2v22dcq6b0w0v4cfiwqva3h"; + sha256 = "05ykgpj6cka9vprvrk37ixyhj2pdw7a9m6bq645yai6ihghahlf0"; type = "gem"; }; - version = "0.7.5"; + version = "0.8.0"; }; letter_opener = { dependencies = ["launchy"]; @@ -3226,10 +3256,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1i0gbypr1yxwfkaxzrk0i1wz4n6v3mw7z24k65jy3q1h5lda5xbw"; + sha256 = "1hpj9mm31a5aw5qys2kglfl8jv74bkwkc5pfrpp3als89hgkznqy"; type = "gem"; }; - version = "1.5.1"; + version = "1.5.2"; }; multi_json = { groups = ["default"]; @@ -3401,10 +3431,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1p6b3q411h2mw4dsvhjrp1hh66hha5cm69fqg85vn2lizz71n6xz"; + sha256 = "11w59ga9324yx6339dgsflz3dsqq2mky1qqdwcg6wi5s1bf2yldi"; type = "gem"; }; - version = "1.13.3"; + version = "1.13.6"; }; notiffany = { dependencies = ["nenv" "shellany"]; @@ -3574,10 +3604,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1sflfy1jvn9wqpral7gcfmbys7msvykp6rlnl33r8qgnbksn54y8"; + sha256 = "16qkd51f1ab1hw4az27qj3vk958aal67by8djsplwd1q3h7nfib5"; type = "gem"; }; - version = "1.0.0"; + version = "1.0.1"; }; omniauth-facebook = { dependencies = ["omniauth-oauth2"]; @@ -3803,15 +3833,48 @@ }; version = "1.1.1"; }; + pact = { + dependencies = ["pact-mock_service" "pact-support" "rack-test" "rspec" "term-ansicolor" "thor" "webrick"]; + groups = ["development" "test"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0ngwc4zrp6jxpb8s0y07xxic492a1n0akjxd7x4hks2fbsiwwwk2"; + type = "gem"; + }; + version = "1.59.0"; + }; + pact-mock_service = { + dependencies = ["filelock" "find_a_port" "json" "pact-support" "rack" "rspec" "term-ansicolor" "thor" "webrick"]; + groups = ["default" "development" "test"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0izmf5h0n1mcrfk6qlz61rhzdjs6h0bkqrx6ndp8nhmfhja254fc"; + type = "gem"; + }; + version = "3.6.2"; + }; + pact-support = { + dependencies = ["awesome_print" "randexp" "rspec" "term-ansicolor"]; + groups = ["default" "development" "test"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "07qxvxy48im9vlswqspsh2k6fy6rsmi3409863ww8y7yx5pmjr63"; + type = "gem"; + }; + version = "1.15.1"; + }; parallel = { groups = ["development" "test"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0055br0mibnqz0j8wvy20zry548dhkakws681bhj3ycb972awkzd"; + sha256 = "07vnk6bb54k4yc06xnwck7php50l09vvlw1ga8wdz0pia461zpzb"; type = "gem"; }; - version = "1.20.1"; + version = "1.22.1"; }; parser = { dependencies = ["ast"]; @@ -3819,10 +3882,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0sszdl9mpzqzn9kxrp28sqmg47mjxcwypr4d60vbajqba4v885di"; + sha256 = "0xhfghgidj8cbdnqp01f7kvnrv1f60izpkd9dhxsvpdzkfsdg97d"; type = "gem"; }; - version = "3.0.3.2"; + version = "3.1.2.0"; }; parslet = { groups = ["default" "development" "test"]; @@ -3861,10 +3924,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "13mfrysrdrh8cka1d96zm0lnfs59i5x2g6ps49r2kz5p3q81xrzj"; + sha256 = "10ryzmc3r5ja6g90a9ycsxcxsy5872xa1vf01jam0bm74zq3zmi6"; type = "gem"; }; - version = "1.2.3"; + version = "1.3.5"; }; pg_query = { dependencies = ["google-protobuf"]; @@ -3872,10 +3935,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0cf1b97nznl6adkx25j2x96sq8xx2b4fpic230fx65k3vqqn8a4r"; + sha256 = "00bhwkhjy6bkp04313m5il7vd165i3fz0x4jissflf66i164ppgk"; type = "gem"; }; - version = "2.1.1"; + version = "2.1.3"; }; plist = { groups = ["default"]; @@ -3914,10 +3977,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1xrhmialxn5vlp1nmf40a4db9gji4h2wbzd7f43sz64z8lvrjj6h"; + sha256 = "11j7d6abxivj15yax47z3f751wz4pnl02qszzc9swswf8hn41r03"; type = "gem"; }; - version = "1.11.1"; + version = "1.16.0"; }; premailer-rails = { dependencies = ["actionmailer" "premailer"]; @@ -4000,14 +4063,14 @@ version = "0.5.0"; }; public_suffix = { - groups = ["default" "development" "test"]; + groups = ["danger" "default" "development" "test"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1xqcgkl7bwws1qrlnmxgh8g4g9m10vg60bhlw40fplninb3ng6d9"; + sha256 = "1f3knlwfwm05sfbaihrxm4g772b79032q14c16q4b38z8bi63qcb"; type = "gem"; }; - version = "4.0.6"; + version = "4.0.7"; }; puma = { dependencies = ["nio4r"]; @@ -4062,14 +4125,14 @@ version = "1.6.0"; }; rack = { - groups = ["default" "development" "kerberos" "test"]; + groups = ["default" "development" "test"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0i5vs0dph9i5jn8dfc6aqd6njcafmb20rwqngrf759c9cvmyff16"; + sha256 = "1b1qsg0yfargdhmpapp2d3mlxj82wyygs9nj74w0r03diyi8swlc"; type = "gem"; }; - version = "2.2.3"; + version = "2.2.3.1"; }; rack-accept = { dependencies = ["rack"]; @@ -4088,10 +4151,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "15b8lk54j2abqhpn588b1wvbzwmxwa7iql6241kxpjc0gyb51p0z"; + sha256 = "049s3y3dpl6dn478g912y6f9nzclnnkl30psrbc2w5kaihj5szhq"; type = "gem"; }; - version = "6.3.0"; + version = "6.6.1"; }; rack-cors = { dependencies = ["rack"]; @@ -4099,10 +4162,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "07dppmm1ah1gs31sb5byrkkady9vqzwjmpd92c8425nc6yzwknik"; + sha256 = "0jvs0mq8jrsz86jva91mgql16daprpa3qaipzzfvngnnqr5680j7"; type = "gem"; }; - version = "1.0.6"; + version = "1.1.1"; }; rack-oauth2 = { dependencies = ["activesupport" "attr_required" "httpclient" "json-jwt" "rack"]; @@ -4110,10 +4173,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1b0h0rlfl0p0drymwfc71g87fp66ck3205pl32z89xsgh0lzw25k"; + sha256 = "0gxxr209r8h3nxhc9h731khv6yswiv9hc6q2pg672v530xmknznw"; type = "gem"; }; - version = "1.16.0"; + version = "1.19.0"; }; rack-proxy = { dependencies = ["rack"]; @@ -4142,10 +4205,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0d4dgbf8rgqx03lwsm8j6i20lzawk1bsvzfj5bhzrsycfyfk25aj"; + sha256 = "16ahj3qz3xhfrwvqb4nf6cfzvliigg0idfsp5jyr8qwk676d2f30"; type = "gem"; }; - version = "0.5.2"; + version = "0.6.0"; }; rails = { dependencies = ["actioncable" "actionmailbox" "actionmailer" "actionpack" "actiontext" "actionview" "activejob" "activemodel" "activerecord" "activestorage" "activesupport" "railties" "sprockets-rails"]; @@ -4214,14 +4277,14 @@ version = "6.1.4.7"; }; rainbow = { - groups = ["default" "development" "test"]; + groups = ["coverage" "default" "development" "test"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0bb2fpjspydr6x0s8pn1pqkzmxszvkfapv0p4627mywl7ky4zkhk"; + sha256 = "0smwg4mii0fm38pyb5fddbmrdpifwv22zv3d3px2xx497am93503"; type = "gem"; }; - version = "3.0.0"; + version = "3.1.1"; }; rake = { groups = ["default" "development" "test"]; @@ -4233,6 +4296,16 @@ }; version = "13.0.6"; }; + randexp = { + groups = ["default" "development" "test"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1j742j7g107jgkvpsfq2b10d5xhsni5s8vxrp518d3karw7529ih"; + type = "gem"; + }; + version = "0.1.7"; + }; rb-fsevent = { groups = ["default" "development" "test"]; platforms = []; @@ -4300,10 +4373,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "16q71cc9wx342c697q18pkz19ym4ncjd97hcw4v6f1mgflkdv400"; + sha256 = "13za43xb5xfg1xb1vwlvwx14jlmnk7jal5dqw8q9a5g13csx41sw"; type = "gem"; }; - version = "1.2.0"; + version = "1.4.0"; }; recaptcha = { dependencies = ["json"]; @@ -4395,10 +4468,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "155f6cr4rrfw5bs5xd3m5kfw32qhc5fsi4nk82rhif56rc6cs0wm"; + sha256 = "1rfd3q17p7q7pa67844q8b16ipy6ksh8mkzynpm1zldqbb9x4xm0"; type = "gem"; }; - version = "2.2.1"; + version = "2.5.0"; }; regexp_property_values = { groups = ["default"]; @@ -4510,10 +4583,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0530ri0p60km0bg0ib6swkhfnas427cva7vcdmnwl8df52a10y1k"; + sha256 = "17dhzc9hfzd8x18hfsvn9rsp4jg18wdfsdy3a5p99y5dhfh1321r"; type = "gem"; }; - version = "3.27.0"; + version = "3.29.0"; }; rqrcode = { dependencies = ["chunky_png"]; @@ -4674,10 +4747,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0gkf1p8yal38nlvdb39qaiy0gr85fxfr09j5dxh8qvrgpncpnk78"; + sha256 = "1b3p4wy68jkyq8vhm5y568wlhsihy3ilnp2c6ig18xcw1slnkypl"; type = "gem"; }; - version = "1.4.1"; + version = "1.18.0"; }; rubocop-gitlab-security = { dependencies = ["rubocop"]; @@ -4696,10 +4769,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "18md69dkz0s5xm93c4psmvy4c0nx3a7yi61vfjn46cw6yk54fm7b"; + sha256 = "1yam7fdm77y0x6b6i7v14iiji9020mvdd9h1ainvv88zbv8yd4wq"; type = "gem"; }; - version = "0.13.0"; + version = "0.14.3"; }; rubocop-performance = { dependencies = ["rubocop" "rubocop-ast"]; @@ -5330,10 +5403,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0p3vaq2fbmlphphqr0yjc5cyzzxjizq4zbxbbw3j2vpgdcmpi6bs"; + sha256 = "1h5aiqqlk51z12kgvanhdvd0ajvv2i68z6a7450yxgmflfaiwz7c"; type = "gem"; }; - version = "1.2.0"; + version = "1.3.0"; }; ssrf_filter = { groups = ["default"]; @@ -5419,6 +5492,16 @@ }; version = "1.3.0"; }; + sync = { + groups = ["default" "development" "test"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1z9qlq4icyiv3hz1znvsq1wz2ccqjb1zwd6gkvnwg6n50z65d0v6"; + type = "gem"; + }; + version = "0.5.0"; + }; sys-filesystem = { dependencies = ["ffi"]; groups = ["default"]; @@ -5460,6 +5543,17 @@ }; version = "0.8.2"; }; + term-ansicolor = { + dependencies = ["tins"]; + groups = ["default" "development" "test"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1xq5kci9215skdh27npyd3y55p812v4qb4x2hv3xsjvwqzz9ycwj"; + type = "gem"; + }; + version = "1.7.1"; + }; terminal-table = { dependencies = ["unicode-display_width"]; groups = ["default" "development"]; @@ -5584,6 +5678,17 @@ }; version = "0.8.3"; }; + tins = { + dependencies = ["sync"]; + groups = ["default" "development" "test"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "153q7j2nj7y43iscbfcihmwlcydx6sbd65azs27kain0gncymd90"; + type = "gem"; + }; + version = "1.31.0"; + }; toml-rb = { dependencies = ["citrus"]; groups = ["default"]; @@ -5776,14 +5881,14 @@ version = "0.0.8"; }; unicode-display_width = { - groups = ["default" "development" "test"]; + groups = ["danger" "default" "development" "test"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "06i3id27s60141x6fdnjn5rar1cywdwy64ilc59cz937303q3mna"; + sha256 = "1204c1jx2g89pc25qk5150mk7j5k90692i7ihgfzqnad6qni74h2"; type = "gem"; }; - version = "1.7.0"; + version = "1.8.0"; }; unicode_utils = { groups = ["default"]; @@ -6084,9 +6189,9 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "09bq7j2p6mkbxnsg71s253dm2463kg51xc7bmjcxgyblqbh4ln7m"; + sha256 = "0xjdr2szxvn3zb1sb5l8nfd6k9jr3b4qqbbg1mj9grf68m3fxckc"; type = "gem"; }; - version = "2.5.4"; + version = "2.6.0"; }; } diff --git a/pkgs/applications/video/clapper/default.nix b/pkgs/applications/video/clapper/default.nix index 0e97eab1773e7..1600b1b4d8bba 100644 --- a/pkgs/applications/video/clapper/default.nix +++ b/pkgs/applications/video/clapper/default.nix @@ -24,13 +24,13 @@ stdenv.mkDerivation rec { pname = "clapper"; - version = "0.4.1"; + version = "0.5.1"; src = fetchFromGitHub { owner = "Rafostar"; repo = pname; rev = version; - sha256 = "sha256-ccvg8yxPCN7OYmJvq0SPY6iyiuFuWJyiu+mRoykEzqI="; + sha256 = "sha256-o68IdI20gSwWCPI0g/BhUGF5ro6srXMy0JD1EgmY5ck="; }; nativeBuildInputs = [ @@ -65,11 +65,6 @@ stdenv.mkDerivation rec { patchShebangs build-aux/meson/postinstall.py ''; - mesonFlags = [ - # TODO: https://github.com/NixOS/nixpkgs/issues/36468 - "-Dc_args=-I${glib.dev}/include/gio-unix-2.0" - ]; - postInstall = '' cp ${src}/data/icons/*.svg $out/share/icons/hicolor/scalable/apps/ cp ${src}/data/icons/*.svg $out/share/icons/hicolor/symbolic/apps/ diff --git a/pkgs/applications/video/vlc/default.nix b/pkgs/applications/video/vlc/default.nix index 700730a57fc97..770fe2cea3ee2 100644 --- a/pkgs/applications/video/vlc/default.nix +++ b/pkgs/applications/video/vlc/default.nix @@ -34,6 +34,7 @@ , libmtp , liboggz , libopus +, libplacebo , libpulseaudio , libraw1394 , librsvg @@ -123,6 +124,7 @@ stdenv.mkDerivation rec { libmtp liboggz libopus + libplacebo libpulseaudio libraw1394 librsvg diff --git a/pkgs/applications/virtualization/docker/compose.nix b/pkgs/applications/virtualization/docker/compose.nix index 98af8ebf7fb53..583a3e50a1f59 100644 --- a/pkgs/applications/virtualization/docker/compose.nix +++ b/pkgs/applications/virtualization/docker/compose.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "docker-compose"; - version = "2.6.0"; + version = "2.6.1"; src = fetchFromGitHub { owner = "docker"; repo = "compose"; rev = "v${version}"; - sha256 = "sha256-Fg99ugaqH/jL3KUZ5Vh/SJnqzEyOaR/KuPFwt2oqXxM="; + sha256 = "sha256-D3+qDWxg3e5/3UIMz8FZDuxmQHmTv0NJVT/otGYedtw="; }; - vendorSha256 = "sha256-7uNQNO+EI90J2Btz2tnumKqd+AtVWON+Csh6tkTNKNA="; + vendorSha256 = "sha256-WxLQfu65Gr+ao/pM8B2uiS88sNT72Klhz7ZIrEadW5g="; ldflags = [ "-X github.com/docker/compose/v2/internal.Version=${version}" "-s" "-w" ]; diff --git a/pkgs/applications/virtualization/docker/distribution.nix b/pkgs/applications/virtualization/docker/distribution.nix index 96722fe393f60..8253a2304da9b 100644 --- a/pkgs/applications/virtualization/docker/distribution.nix +++ b/pkgs/applications/virtualization/docker/distribution.nix @@ -2,7 +2,7 @@ buildGoPackage rec { pname = "distribution"; - version = "2.7.1"; + version = "2.8.1"; rev = "v${version}"; goPackagePath = "github.com/docker/distribution"; @@ -11,7 +11,7 @@ buildGoPackage rec { owner = "docker"; repo = "distribution"; inherit rev; - sha256 = "1nx8b5a68rn81alp8wkkw6qd5v32mgf0fk23mxm60zdf63qk1nzw"; + sha256 = "sha256-M8XVeIvD7LtWa9l+6ovwWu5IwFGYt0xDfcIwcU/KH/E="; }; meta = with lib; { diff --git a/pkgs/applications/virtualization/virtualbox/guest-additions/default.nix b/pkgs/applications/virtualization/virtualbox/guest-additions/default.nix index da9f32b9c6856..538ebfa78cf8e 100644 --- a/pkgs/applications/virtualization/virtualbox/guest-additions/default.nix +++ b/pkgs/applications/virtualization/virtualbox/guest-additions/default.nix @@ -45,26 +45,15 @@ in stdenv.mkDerivation rec { patchFlags = [ "-p1" "-d" "src/vboxguest-${version}" ]; unpackPhase = '' - ${if stdenv.hostPlatform.system == "i686-linux" || stdenv.hostPlatform.system == "x86_64-linux" then '' - isoinfo -J -i $src -x /VBoxLinuxAdditions.run > ./VBoxLinuxAdditions.run - chmod 755 ./VBoxLinuxAdditions.run - # An overflow leads the is-there-enough-space check to fail when there's too much space available, so fake how much space there is - sed -i 's/\$leftspace/16383/' VBoxLinuxAdditions.run - ./VBoxLinuxAdditions.run --noexec --keep - '' - else throw ("Architecture: "+stdenv.hostPlatform.system+" not supported for VirtualBox guest additions") - } + isoinfo -J -i $src -x /VBoxLinuxAdditions.run > ./VBoxLinuxAdditions.run + chmod 755 ./VBoxLinuxAdditions.run + # An overflow leads the is-there-enough-space check to fail when there's too much space available, so fake how much space there is + sed -i 's/\$leftspace/16383/' VBoxLinuxAdditions.run + ./VBoxLinuxAdditions.run --noexec --keep # Unpack files cd install - ${if stdenv.hostPlatform.system == "i686-linux" then '' - tar xfvj VBoxGuestAdditions-x86.tar.bz2 - '' - else if stdenv.hostPlatform.system == "x86_64-linux" then '' - tar xfvj VBoxGuestAdditions-amd64.tar.bz2 - '' - else throw ("Architecture: "+stdenv.hostPlatform.system+" not supported for VirtualBox guest additions") - } + tar xfvj VBoxGuestAdditions-${if stdenv.hostPlatform.is32bit then "x86" else "amd64"}.tar.bz2 ''; buildPhase = '' @@ -158,7 +147,7 @@ in stdenv.mkDerivation rec { sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ]; license = "GPL"; maintainers = [ lib.maintainers.sander ]; - platforms = lib.platforms.linux; - broken = kernel.kernelAtLeast "5.17"; + platforms = [ "i686-linux" "x86_64-linux" ]; + broken = kernel.kernelAtLeast (if stdenv.hostPlatform.is32bit then "5.10" else "5.17"); }; } diff --git a/pkgs/applications/window-managers/i3/status-rust.nix b/pkgs/applications/window-managers/i3/status-rust.nix index c3d8d96bba4e1..ddc4383fbd73c 100644 --- a/pkgs/applications/window-managers/i3/status-rust.nix +++ b/pkgs/applications/window-managers/i3/status-rust.nix @@ -15,16 +15,16 @@ rustPlatform.buildRustPackage rec { pname = "i3status-rust"; - version = "0.21.10"; + version = "0.22.0"; src = fetchFromGitHub { owner = "greshake"; repo = pname; - rev = "v${version}"; - sha256 = "sha256-HtPgl52ysE/CVX706YeKBFc6CgGpHzvHwZoS+DzHADY="; + rev = "refs/tags/v${version}"; + sha256 = "sha256-9Fp5k14QkV1CwLSL1nUUu6NYIpjfvI9vNJRYNqvyr3M="; }; - cargoSha256 = "sha256-ini0AIYwvTskNFMSC+Gy23ohL75PTET95e1mjpjCsWE="; + cargoSha256 = "sha256-MzosatZ4yPHAdANqOBPVW2wpjnojLo9B9N9o4DtU0Iw="; nativeBuildInputs = [ pkg-config makeWrapper ]; diff --git a/pkgs/applications/window-managers/shod/default.nix b/pkgs/applications/window-managers/shod/default.nix new file mode 100644 index 0000000000000..f9e6216a86ab1 --- /dev/null +++ b/pkgs/applications/window-managers/shod/default.nix @@ -0,0 +1,58 @@ +{ lib +, stdenv +, fetchFromGitHub +, writeText +, fontconfig +, libX11 +, libXft +, libXinerama +, libXpm +, libXrender +, conf ? null +}: + +stdenv.mkDerivation rec { + pname = "shod"; + version = "2.4.0"; + + src = fetchFromGitHub { + owner = "phillbush"; + repo = "shod"; + rev = "v${version}"; + sha256 = "sha256-jrPuI3ADppqaJ2y9GksiJZZd4LtN1P5yjWwlf9VuYDc="; + }; + + buildInputs = [ + fontconfig + libX11 + libXft + libXinerama + libXpm + libXrender + ]; + + postPatch = + let + configFile = + if lib.isDerivation conf || builtins.isPath conf + then conf else writeText "config.h" conf; + in + lib.optionalString (conf != null) "cp ${configFile} config.h"; + + makeFlags = [ "PREFIX=$(out)" ]; + + meta = with lib; { + description = "A mouse-based window manager that can tile windows inside floating containers"; + longDescription = '' + shod is a multi-monitor floating reparenting X11 window manager that + supports tiled and tabbed containers. shod sets no keybindings, reads no + configuration, and works only via mouse with a given key modifier (Alt by + default) and by responding to client messages sent by the shodc utility + (shod's remote controller). + ''; + homepage = "https://github.com/phillbush/shod"; + license = licenses.mit; + maintainers = with maintainers; [ azahi ]; + platforms = platforms.unix; + }; +} diff --git a/pkgs/data/documentation/scheme-manpages/default.nix b/pkgs/data/documentation/scheme-manpages/default.nix index aaa7007d02624..cfc16e932c78f 100644 --- a/pkgs/data/documentation/scheme-manpages/default.nix +++ b/pkgs/data/documentation/scheme-manpages/default.nix @@ -1,14 +1,14 @@ { lib, stdenv, fetchFromGitHub }: stdenv.mkDerivation rec { - pname = "scheme-manpages-unstable"; - version = "2022-04-21"; + pname = "scheme-manpages"; + version = "unstable-2022-05-14"; src = fetchFromGitHub { owner = "schemedoc"; repo = "manpages"; - rev = "e3faaa1b80b3493ee644958a105f84f2995a0436"; - sha256 = "sha256-28e6tFRTqX/PWMhdoUZ4nQU1e/JL2uR+NjVXGBwogMM="; + rev = "e4d8e389312a865e350ef88f3e9d69be290705c7"; + sha256 = "sha256-bYg8XSycbQIaZDsE0G5Xy0bd2JNWHwYEnyL6ThN7XS4="; }; dontBuild = true; diff --git a/pkgs/data/fonts/victor-mono/default.nix b/pkgs/data/fonts/victor-mono/default.nix index 45873e1b7f96c..11d3f1d25baef 100644 --- a/pkgs/data/fonts/victor-mono/default.nix +++ b/pkgs/data/fonts/victor-mono/default.nix @@ -1,10 +1,11 @@ { lib, fetchzip }: let - version = "1.5.2"; + version = "1.5.3"; in fetchzip { name = "victor-mono-${version}"; + stripRoot = false; # Upstream prefers we download from the website, # but we really insist on a more versioned resource. @@ -16,12 +17,15 @@ fetchzip { url = "https://github.com/rubjo/victor-mono/raw/v${version}/public/VictorMonoAll.zip"; postFetch = '' - mkdir -p $out/share/fonts/ - unzip -j $downloadedFile \*.otf -d $out/share/fonts/opentype - unzip -j $downloadedFile \*.ttf -d $out/share/fonts/truetype + mkdir -p "$out/share/fonts/" + + mv $out/OTF $out/share/fonts/opentype + mv $out/TTF $out/share/fonts/truetype + + rm -r $out/{EOT,WOFF,WOFF2} ''; - sha256 = "sha256-cNDZh0P/enmoKL/6eHzkgl5ghtai2K9cTgWMVmm8GIA="; + sha256 = "sha256-3TGpUDBJ24NEJb00oaJAHEbjC58bSthohzqM1klVDGA="; meta = with lib; { description = "Free programming font with cursive italics and ligatures"; diff --git a/pkgs/data/misc/hackage/pin.json b/pkgs/data/misc/hackage/pin.json index 3828c6d45e73d..d3d11e13385ba 100644 --- a/pkgs/data/misc/hackage/pin.json +++ b/pkgs/data/misc/hackage/pin.json @@ -1,6 +1,6 @@ { - "commit": "3871a68d11673db568acc232f35f8ffd28b63832", - "url": "https://github.com/commercialhaskell/all-cabal-hashes/archive/3871a68d11673db568acc232f35f8ffd28b63832.tar.gz", - "sha256": "0fbj5353ni22b7vbfn5b9k5lq78i3aanx2njj6kac7qyiazrdck2", - "msg": "Update from Hackage at 2022-06-17T13:13:15Z" + "commit": "c87d8bf669c0f5da46e44dece7a851e2f9d8c3e9", + "url": "https://github.com/commercialhaskell/all-cabal-hashes/archive/c87d8bf669c0f5da46e44dece7a851e2f9d8c3e9.tar.gz", + "sha256": "0m1ahg2knm136g2gr66asicsqcy9n80lmszs70nkz550ll51vq8v", + "msg": "Update from Hackage at 2022-06-23T03:01:47Z" } diff --git a/pkgs/data/misc/v2ray-domain-list-community/default.nix b/pkgs/data/misc/v2ray-domain-list-community/default.nix index 5e84f479d21bf..a5bbb2b5c013b 100644 --- a/pkgs/data/misc/v2ray-domain-list-community/default.nix +++ b/pkgs/data/misc/v2ray-domain-list-community/default.nix @@ -3,12 +3,12 @@ let generator = pkgsBuildBuild.buildGoModule rec { pname = "v2ray-domain-list-community"; - version = "20220528180904"; + version = "20220624025859"; src = fetchFromGitHub { owner = "v2fly"; repo = "domain-list-community"; rev = version; - sha256 = "sha256-j1Q7B/U0OADOcgJRJ269Jx9Z5dmmT4T2eaOHeGmUjmc="; + sha256 = "sha256-/4wfTtRsBzOCbx3I3H28tB935xDZPPwHOFFmjiV7kEI="; }; vendorSha256 = "sha256-Igx8yGWWVmVEogvbrosaK13LVs+ZZuYLBNji7iSfzdo="; meta = with lib; { diff --git a/pkgs/data/misc/v2ray-geoip/default.nix b/pkgs/data/misc/v2ray-geoip/default.nix index a6954100d547d..e4ab5df758421 100644 --- a/pkgs/data/misc/v2ray-geoip/default.nix +++ b/pkgs/data/misc/v2ray-geoip/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "v2ray-geoip"; - version = "202205260055"; + version = "202206230045"; src = fetchFromGitHub { owner = "v2fly"; repo = "geoip"; - rev = "96f4639373709f7560ccaf374d1ff008781aa324"; - sha256 = "sha256-aFTLeYr+JishhJ2AhGMrD02fKxci2rREkh8HN9HtXLs="; + rev = "2e2aba7f3dfb4139e8a882f85350045f2ef522d1"; + sha256 = "sha256-WFvS51RmkAWivYj0HFAT6S3euJk+GSYLDTN3cmkcCNs="; }; installPhase = '' diff --git a/pkgs/data/themes/kwin-decorations/kde-rounded-corners/default.nix b/pkgs/data/themes/kwin-decorations/kde-rounded-corners/default.nix index b77c136e4067f..3d0c298cadae7 100644 --- a/pkgs/data/themes/kwin-decorations/kde-rounded-corners/default.nix +++ b/pkgs/data/themes/kwin-decorations/kde-rounded-corners/default.nix @@ -12,13 +12,13 @@ stdenv.mkDerivation rec { pname = "kde-rounded-corners"; - version = "0.1.1"; + version = "unstable-2022-06-17"; src = fetchFromGitHub { owner = "matinlotfali"; repo = "KDE-Rounded-Corners"; - rev = "v${version}"; - hash = "sha256-cXpJabeOHnat7OljtRzduUdOaA6Z3z6vV3aBKwiIrR0="; + rev = "015ef5cd65e9ec89e4a1ae057f2251eda03715e2"; + hash = "sha256-NJ7icavofSUPPww1Ro7p0yY2EQ78S4KVCuj9yPuYwd8="; }; postConfigure = '' diff --git a/pkgs/desktops/plasma-5/fetch.sh b/pkgs/desktops/plasma-5/fetch.sh index 57d42b3016e8e..f58b02da6fb9f 100644 --- a/pkgs/desktops/plasma-5/fetch.sh +++ b/pkgs/desktops/plasma-5/fetch.sh @@ -1 +1 @@ -WGET_ARGS=( https://download.kde.org/stable/plasma/5.25.0/ -A '*.tar.xz' ) +WGET_ARGS=( https://download.kde.org/stable/plasma/5.25.1/ -A '*.tar.xz' ) diff --git a/pkgs/desktops/plasma-5/plasma-mobile/default.nix b/pkgs/desktops/plasma-5/plasma-mobile/default.nix index be628de65408b..7ce5f827589a9 100644 --- a/pkgs/desktops/plasma-5/plasma-mobile/default.nix +++ b/pkgs/desktops/plasma-5/plasma-mobile/default.nix @@ -23,7 +23,7 @@ mkDerivation { appstream libdbusmenu pam wayland kdeclarative kdelibs4support kpeople kconfig krunner kinit kwayland kwin plasma-framework telepathy libphonenumber protobuf libqofono modemmanager-qt - networkmanager-qt maliit-framework maliit-keyboard + networkmanager-qt maliit-framework maliit-keyboard plasma-workspace ]; postPatch = '' diff --git a/pkgs/desktops/plasma-5/powerdevil.nix b/pkgs/desktops/plasma-5/powerdevil.nix index df575fcb987a9..bb511c21ba67f 100644 --- a/pkgs/desktops/plasma-5/powerdevil.nix +++ b/pkgs/desktops/plasma-5/powerdevil.nix @@ -1,5 +1,5 @@ { - mkDerivation, fetchpatch, + mkDerivation, extra-cmake-modules, kdoctools, bluez-qt, kactivities, kauth, kconfig, kdbusaddons, kglobalaccel, ki18n, kidletime, kio, knotifyconfig, kwayland, libkscreen, @@ -9,15 +9,6 @@ mkDerivation { pname = "powerdevil"; nativeBuildInputs = [ extra-cmake-modules kdoctools ]; - patches = [ - # Backported fix for https://bugs.kde.org/show_bug.cgi?id=454161 - # FIXME: remove for next release - (fetchpatch { - name = "brightness-overflow-fix"; - url = "https://invent.kde.org/plasma/powerdevil/-/commit/2ebe655d220c9167b66893a823b2fff2e2b8a531.patch"; - sha256 = "sha256-Sf2q0CImLYjy1fTp9AWbCeRG05liUkemhfEXL/0MIQI="; - }) - ]; buildInputs = [ kconfig kdbusaddons knotifyconfig solid udev bluez-qt kactivities kauth kglobalaccel ki18n kio kidletime kwayland libkscreen diff --git a/pkgs/desktops/plasma-5/srcs.nix b/pkgs/desktops/plasma-5/srcs.nix index 0b570c9dda81c..73298c78399e9 100644 --- a/pkgs/desktops/plasma-5/srcs.nix +++ b/pkgs/desktops/plasma-5/srcs.nix @@ -4,427 +4,427 @@ { bluedevil = { - version = "5.25.0"; + version = "5.25.1"; src = fetchurl { - url = "${mirror}/stable/plasma/5.25.0/bluedevil-5.25.0.tar.xz"; - sha256 = "18iaxyfjgs7zk972aajxww372sj6azqx5flnxbs7m9zmrg687d2v"; - name = "bluedevil-5.25.0.tar.xz"; + url = "${mirror}/stable/plasma/5.25.1/bluedevil-5.25.1.tar.xz"; + sha256 = "1fdbxz2lk43svp6f0srjhpfhipfimf0nqjnvv62bqzpasv74p13g"; + name = "bluedevil-5.25.1.tar.xz"; }; }; breeze = { - version = "5.25.0"; + version = "5.25.1"; src = fetchurl { - url = "${mirror}/stable/plasma/5.25.0/breeze-5.25.0.tar.xz"; - sha256 = "0kph45sasp0zvccp4sblglg9b851a8jxi8zsjbj2vpfrwrmyyv4l"; - name = "breeze-5.25.0.tar.xz"; + url = "${mirror}/stable/plasma/5.25.1/breeze-5.25.1.tar.xz"; + sha256 = "13qwxvbdmf3qx7nfarr33q22rn43xsby7l8bjjfn6862l7pqhash"; + name = "breeze-5.25.1.tar.xz"; }; }; breeze-grub = { - version = "5.25.0"; + version = "5.25.1"; src = fetchurl { - url = "${mirror}/stable/plasma/5.25.0/breeze-grub-5.25.0.tar.xz"; - sha256 = "1i5a32spn0kdrdnbd3za3fjchk006l46ybn41h2fbrzq908yh44w"; - name = "breeze-grub-5.25.0.tar.xz"; + url = "${mirror}/stable/plasma/5.25.1/breeze-grub-5.25.1.tar.xz"; + sha256 = "11ic3cjfvgs2jkwbkzr2xd568ym7x2l99w488qhdhw9fzkk56rrh"; + name = "breeze-grub-5.25.1.tar.xz"; }; }; breeze-gtk = { - version = "5.25.0"; + version = "5.25.1"; src = fetchurl { - url = "${mirror}/stable/plasma/5.25.0/breeze-gtk-5.25.0.tar.xz"; - sha256 = "0hnyslgngqsywaqbfx845wfdpdvqymizvjyryi10sbki80fmdbmc"; - name = "breeze-gtk-5.25.0.tar.xz"; + url = "${mirror}/stable/plasma/5.25.1/breeze-gtk-5.25.1.tar.xz"; + sha256 = "0lzh7lrqiw537phfkz6bvqfbyqc4h4rb5bkxcb4s1ryynamy36yh"; + name = "breeze-gtk-5.25.1.tar.xz"; }; }; breeze-plymouth = { - version = "5.25.0"; + version = "5.25.1"; src = fetchurl { - url = "${mirror}/stable/plasma/5.25.0/breeze-plymouth-5.25.0.tar.xz"; - sha256 = "1b3qlw99d2rqpay47188bc0yqzp95s8g6skx7znxq8cxgg7ck24j"; - name = "breeze-plymouth-5.25.0.tar.xz"; + url = "${mirror}/stable/plasma/5.25.1/breeze-plymouth-5.25.1.tar.xz"; + sha256 = "0xprjl0bszs2dmn27pvklwxx5qbcsdmrr256jlvljvq5hs5vd9ly"; + name = "breeze-plymouth-5.25.1.tar.xz"; }; }; discover = { - version = "5.25.0"; + version = "5.25.1"; src = fetchurl { - url = "${mirror}/stable/plasma/5.25.0/discover-5.25.0.tar.xz"; - sha256 = "0ws0hvxnbf3mwy5lsyv56b73vjdswhy8lh01sx33xmgpbnyykqni"; - name = "discover-5.25.0.tar.xz"; + url = "${mirror}/stable/plasma/5.25.1/discover-5.25.1.tar.xz"; + sha256 = "1cpmi4qfxlprvj5qamjkxj4lq8038fv1fyldsfhnyi9s4zw6ww9s"; + name = "discover-5.25.1.tar.xz"; }; }; drkonqi = { - version = "5.25.0"; + version = "5.25.1"; src = fetchurl { - url = "${mirror}/stable/plasma/5.25.0/drkonqi-5.25.0.tar.xz"; - sha256 = "123snx7hfk9m7ds1vk047g3q5lkfmn00w5668xvpqr7yqw9w78fh"; - name = "drkonqi-5.25.0.tar.xz"; + url = "${mirror}/stable/plasma/5.25.1/drkonqi-5.25.1.tar.xz"; + sha256 = "147azxas0idb0ymcwg15davb5p84czysmsfxmcbrcqlxjkby3dy0"; + name = "drkonqi-5.25.1.tar.xz"; }; }; kactivitymanagerd = { - version = "5.25.0"; + version = "5.25.1"; src = fetchurl { - url = "${mirror}/stable/plasma/5.25.0/kactivitymanagerd-5.25.0.tar.xz"; - sha256 = "1iwrjf090s47mwl6rlk3fjk96bkrz56mvbk6d474b1f2n2ymqibm"; - name = "kactivitymanagerd-5.25.0.tar.xz"; + url = "${mirror}/stable/plasma/5.25.1/kactivitymanagerd-5.25.1.tar.xz"; + sha256 = "1jjby09p8hak52syjzaf4wz9hyjz8rylz4jzranrkk3n85znqwk0"; + name = "kactivitymanagerd-5.25.1.tar.xz"; }; }; kde-cli-tools = { - version = "5.25.0"; + version = "5.25.1"; src = fetchurl { - url = "${mirror}/stable/plasma/5.25.0/kde-cli-tools-5.25.0.tar.xz"; - sha256 = "0j3cib7yzmixsq2v2kymdz9sip8qxgq1x3ns86xlcwcl4fh77mqy"; - name = "kde-cli-tools-5.25.0.tar.xz"; + url = "${mirror}/stable/plasma/5.25.1/kde-cli-tools-5.25.1.tar.xz"; + sha256 = "03v7ws48ywjkaqj87zcw7d0dfi36abpz9bnv9s9qp2y4mnk9x198"; + name = "kde-cli-tools-5.25.1.tar.xz"; }; }; - kdecoration = { - version = "5.25.0"; + kde-gtk-config = { + version = "5.25.1"; src = fetchurl { - url = "${mirror}/stable/plasma/5.25.0/kdecoration-5.25.0.tar.xz"; - sha256 = "1g7l8vbcbrh20nq4s4ac1a0bmf0kb4r0b4mzqcndn6yjwab4z7c8"; - name = "kdecoration-5.25.0.tar.xz"; + url = "${mirror}/stable/plasma/5.25.1/kde-gtk-config-5.25.1.tar.xz"; + sha256 = "17sqznjz5sn3xih6l83sx62p0s2sk3p1svqg297x3jq67a9299yj"; + name = "kde-gtk-config-5.25.1.tar.xz"; }; }; - kde-gtk-config = { - version = "5.25.0"; + kdecoration = { + version = "5.25.1"; src = fetchurl { - url = "${mirror}/stable/plasma/5.25.0/kde-gtk-config-5.25.0.tar.xz"; - sha256 = "1dg45brjwh7v83d9pm21vhn27mx0lsnbp7ry9f1mkzy509v461fb"; - name = "kde-gtk-config-5.25.0.tar.xz"; + url = "${mirror}/stable/plasma/5.25.1/kdecoration-5.25.1.tar.xz"; + sha256 = "15gik2c0370f2rmd7jv3pbxbsjng25g6cwzamq3xaa3gqh6l2b33"; + name = "kdecoration-5.25.1.tar.xz"; }; }; kdeplasma-addons = { - version = "5.25.0"; + version = "5.25.1"; src = fetchurl { - url = "${mirror}/stable/plasma/5.25.0/kdeplasma-addons-5.25.0.tar.xz"; - sha256 = "0i5pxg95v7dr3in7mswnx53zkg5c05q3ijb1yqdlj4a3k6ln26nr"; - name = "kdeplasma-addons-5.25.0.tar.xz"; + url = "${mirror}/stable/plasma/5.25.1/kdeplasma-addons-5.25.1.tar.xz"; + sha256 = "14p69kpyaszir8y4zxnyhxmall291rwcy770w4d0mlc04difki8d"; + name = "kdeplasma-addons-5.25.1.tar.xz"; }; }; kgamma5 = { - version = "5.25.0"; + version = "5.25.1"; src = fetchurl { - url = "${mirror}/stable/plasma/5.25.0/kgamma5-5.25.0.tar.xz"; - sha256 = "0rzlf8dr6zj7bcbgdga0d6h9k7aw7d2ra7awzvyq7w2rx8i40ra0"; - name = "kgamma5-5.25.0.tar.xz"; + url = "${mirror}/stable/plasma/5.25.1/kgamma5-5.25.1.tar.xz"; + sha256 = "1pc8abx3j91iqb93rsc13bq8sr610zxa91dhy8hr301fmvv9dbg2"; + name = "kgamma5-5.25.1.tar.xz"; }; }; khotkeys = { - version = "5.25.0"; + version = "5.25.1"; src = fetchurl { - url = "${mirror}/stable/plasma/5.25.0/khotkeys-5.25.0.tar.xz"; - sha256 = "0m2fr3mfqqaprcqd0b31ilz4r0d2mlvc4jwn6ax1fww4inzfa261"; - name = "khotkeys-5.25.0.tar.xz"; + url = "${mirror}/stable/plasma/5.25.1/khotkeys-5.25.1.tar.xz"; + sha256 = "14i9bdqjf5myacybsplsais70x3rnjnfj9807xxgwnqy5dqbz8hg"; + name = "khotkeys-5.25.1.tar.xz"; }; }; kinfocenter = { - version = "5.25.0"; + version = "5.25.1"; src = fetchurl { - url = "${mirror}/stable/plasma/5.25.0/kinfocenter-5.25.0.tar.xz"; - sha256 = "1wzl0qbpj4zkhv56l86fqf7agp29jf7ljxn0na6x1sd7wqqj2hp6"; - name = "kinfocenter-5.25.0.tar.xz"; + url = "${mirror}/stable/plasma/5.25.1/kinfocenter-5.25.1.tar.xz"; + sha256 = "0pyirq0zz8y1pvznw5idjsxwslp0bchfjp72l855z5bwfwh7dmfq"; + name = "kinfocenter-5.25.1.tar.xz"; }; }; kmenuedit = { - version = "5.25.0"; + version = "5.25.1"; src = fetchurl { - url = "${mirror}/stable/plasma/5.25.0/kmenuedit-5.25.0.tar.xz"; - sha256 = "080mffhym2yxpk2jdaynz7gzhr0s2ca0qhg8xhilzvf4r3qlmv1j"; - name = "kmenuedit-5.25.0.tar.xz"; + url = "${mirror}/stable/plasma/5.25.1/kmenuedit-5.25.1.tar.xz"; + sha256 = "0v7k9dcawylgdbjklmjn4mv10z6cm6hhp3za9ni88wlgb2vh9mmk"; + name = "kmenuedit-5.25.1.tar.xz"; }; }; kscreen = { - version = "5.25.0"; + version = "5.25.1"; src = fetchurl { - url = "${mirror}/stable/plasma/5.25.0/kscreen-5.25.0.tar.xz"; - sha256 = "0cna20n9yizkm60wrr03bd048gd7q0wznn1h5sz5y3m4svvxm2qb"; - name = "kscreen-5.25.0.tar.xz"; + url = "${mirror}/stable/plasma/5.25.1/kscreen-5.25.1.tar.xz"; + sha256 = "1dflaaba001wk5r9n523b1mxib7pd0x5b6dnhis62zn9v5apqhaa"; + name = "kscreen-5.25.1.tar.xz"; }; }; kscreenlocker = { - version = "5.25.0"; + version = "5.25.1"; src = fetchurl { - url = "${mirror}/stable/plasma/5.25.0/kscreenlocker-5.25.0.tar.xz"; - sha256 = "0hi077325694dqxikvsf3vrhabk6bja02n3fy9jxv5znaaf6a0hf"; - name = "kscreenlocker-5.25.0.tar.xz"; + url = "${mirror}/stable/plasma/5.25.1/kscreenlocker-5.25.1.tar.xz"; + sha256 = "1bhl8a1jhzr2iycq6fzkj1sb4bybyqlnxs8rnfw0s4mmcs17lmm7"; + name = "kscreenlocker-5.25.1.tar.xz"; }; }; ksshaskpass = { - version = "5.25.0"; + version = "5.25.1"; src = fetchurl { - url = "${mirror}/stable/plasma/5.25.0/ksshaskpass-5.25.0.tar.xz"; - sha256 = "0bkngywr50sd0vzw73zzbwlnzv2fwpni7w7c8m6xfl64vb8629bh"; - name = "ksshaskpass-5.25.0.tar.xz"; + url = "${mirror}/stable/plasma/5.25.1/ksshaskpass-5.25.1.tar.xz"; + sha256 = "1mxmjiprcckqn4sgqyj9nk32prvgymscmpv0kfkcsg60phqyz91m"; + name = "ksshaskpass-5.25.1.tar.xz"; }; }; ksystemstats = { - version = "5.25.0"; + version = "5.25.1"; src = fetchurl { - url = "${mirror}/stable/plasma/5.25.0/ksystemstats-5.25.0.tar.xz"; - sha256 = "0dcx198iamdh6llqk9z5mzc76cgra93m4w669jwrzgwnib8is8ji"; - name = "ksystemstats-5.25.0.tar.xz"; + url = "${mirror}/stable/plasma/5.25.1/ksystemstats-5.25.1.tar.xz"; + sha256 = "0cp6hsy24g2yhijiyavx5av5djdrypvwrcpzswp8mr86p6b1ii8n"; + name = "ksystemstats-5.25.1.tar.xz"; }; }; kwallet-pam = { - version = "5.25.0"; + version = "5.25.1"; src = fetchurl { - url = "${mirror}/stable/plasma/5.25.0/kwallet-pam-5.25.0.tar.xz"; - sha256 = "19lxih5ywrvk76wir4xa4zp0adp7am412g02wya8zw21pabni2zi"; - name = "kwallet-pam-5.25.0.tar.xz"; + url = "${mirror}/stable/plasma/5.25.1/kwallet-pam-5.25.1.tar.xz"; + sha256 = "1n9bnlsm4l051hp73hsp9wa14q77pplr855w3j620qz0az2zxwwx"; + name = "kwallet-pam-5.25.1.tar.xz"; }; }; kwayland-integration = { - version = "5.25.0"; + version = "5.25.1"; src = fetchurl { - url = "${mirror}/stable/plasma/5.25.0/kwayland-integration-5.25.0.tar.xz"; - sha256 = "0lgnlfm48jm5rbmdwipkmagy0r1x9v1y10vidpcd26ldaql2lixk"; - name = "kwayland-integration-5.25.0.tar.xz"; + url = "${mirror}/stable/plasma/5.25.1/kwayland-integration-5.25.1.tar.xz"; + sha256 = "1r80rj7f8xskiwp7lfzxp92q39gm2y6xy3ip4hv0sgjr2014fb21"; + name = "kwayland-integration-5.25.1.tar.xz"; }; }; kwin = { - version = "5.25.0"; + version = "5.25.1"; src = fetchurl { - url = "${mirror}/stable/plasma/5.25.0/kwin-5.25.0.tar.xz"; - sha256 = "03r8zmwjc74hc506kzasx9a3cbygnacdw1mjmkk39wl4599w4xai"; - name = "kwin-5.25.0.tar.xz"; + url = "${mirror}/stable/plasma/5.25.1/kwin-5.25.1.tar.xz"; + sha256 = "1srwdx1pw8kjcdmj531f43789fqsa0wj1kkhp0g42wbwj0y9af8x"; + name = "kwin-5.25.1.tar.xz"; }; }; kwrited = { - version = "5.25.0"; + version = "5.25.1"; src = fetchurl { - url = "${mirror}/stable/plasma/5.25.0/kwrited-5.25.0.tar.xz"; - sha256 = "1cxfgf26kdbp84wk190s6j4hi62gp928nvyiclgxja1ha4f3yzsb"; - name = "kwrited-5.25.0.tar.xz"; + url = "${mirror}/stable/plasma/5.25.1/kwrited-5.25.1.tar.xz"; + sha256 = "0gpql9kzwvv0n2ccq6jwwf9agd1abxc8q45plj48sv09b31bxvhz"; + name = "kwrited-5.25.1.tar.xz"; }; }; layer-shell-qt = { - version = "5.25.0"; + version = "5.25.1"; src = fetchurl { - url = "${mirror}/stable/plasma/5.25.0/layer-shell-qt-5.25.0.tar.xz"; - sha256 = "1wyijkk45mzrd2glsilv0748vi5vcdyhkbfm367v9rbyszwhsv9j"; - name = "layer-shell-qt-5.25.0.tar.xz"; + url = "${mirror}/stable/plasma/5.25.1/layer-shell-qt-5.25.1.tar.xz"; + sha256 = "0lh1dy1z08k6c40xdxcbmpdzzm18dq98gb14q6b6snh1jcrvg95c"; + name = "layer-shell-qt-5.25.1.tar.xz"; }; }; libkscreen = { - version = "5.25.0"; + version = "5.25.1"; src = fetchurl { - url = "${mirror}/stable/plasma/5.25.0/libkscreen-5.25.0.tar.xz"; - sha256 = "0b6qsni1nls29apdkhavxy980mxk46wrp9fizarsvvsgkahl5m8v"; - name = "libkscreen-5.25.0.tar.xz"; + url = "${mirror}/stable/plasma/5.25.1/libkscreen-5.25.1.tar.xz"; + sha256 = "1zbdbacmbnczskk8cpr99ph9cn28izvr25x5v5l455dk077qf25g"; + name = "libkscreen-5.25.1.tar.xz"; }; }; libksysguard = { - version = "5.25.0"; + version = "5.25.1"; src = fetchurl { - url = "${mirror}/stable/plasma/5.25.0/libksysguard-5.25.0.tar.xz"; - sha256 = "1z210jv0354midbqbcipdirilrhpcmhy5s5cy7jvgmmivarr0mrl"; - name = "libksysguard-5.25.0.tar.xz"; + url = "${mirror}/stable/plasma/5.25.1/libksysguard-5.25.1.tar.xz"; + sha256 = "1xn454ch9ggx67c69hjvhhykprrdys38ych1ap8l3b1j2731vyn6"; + name = "libksysguard-5.25.1.tar.xz"; }; }; milou = { - version = "5.25.0"; + version = "5.25.1"; src = fetchurl { - url = "${mirror}/stable/plasma/5.25.0/milou-5.25.0.tar.xz"; - sha256 = "166m0w8yn6dz00g6h40zyjklr6zf0yrskg6q48593l8f35kmqzdl"; - name = "milou-5.25.0.tar.xz"; + url = "${mirror}/stable/plasma/5.25.1/milou-5.25.1.tar.xz"; + sha256 = "0al6d26b96j3kx37p34gmqamc1pz7l3shyqf7dxf7j71hh0mrk09"; + name = "milou-5.25.1.tar.xz"; }; }; oxygen = { - version = "5.25.0"; + version = "5.25.1"; src = fetchurl { - url = "${mirror}/stable/plasma/5.25.0/oxygen-5.25.0.tar.xz"; - sha256 = "0kq8h3zi07h0j0y6n0q6nkbf3sa2pxvyvy7hyxbbvl4b8s4h3asf"; - name = "oxygen-5.25.0.tar.xz"; + url = "${mirror}/stable/plasma/5.25.1/oxygen-5.25.1.tar.xz"; + sha256 = "1ax0vw7mzlln09aajis5vc78snbi3508lg6qbx6vw9m59lpq140v"; + name = "oxygen-5.25.1.tar.xz"; }; }; oxygen-sounds = { - version = "5.25.0"; + version = "5.25.1"; src = fetchurl { - url = "${mirror}/stable/plasma/5.25.0/oxygen-sounds-5.25.0.tar.xz"; - sha256 = "1qk4ff5knjpznj5zbpvzd3wjbpbzmijaxrwqsr7q663i0rjx82b4"; - name = "oxygen-sounds-5.25.0.tar.xz"; + url = "${mirror}/stable/plasma/5.25.1/oxygen-sounds-5.25.1.tar.xz"; + sha256 = "14z23yzqcvwjyy0qbm20xgijrndiw8pk1xf4wdbslny454k0l1q7"; + name = "oxygen-sounds-5.25.1.tar.xz"; }; }; plasma-browser-integration = { - version = "5.25.0"; + version = "5.25.1"; src = fetchurl { - url = "${mirror}/stable/plasma/5.25.0/plasma-browser-integration-5.25.0.tar.xz"; - sha256 = "1qcaxchwlqsjs9fwksc185n3pr7c8wp74m0abbbv1g0qkwwkfww5"; - name = "plasma-browser-integration-5.25.0.tar.xz"; + url = "${mirror}/stable/plasma/5.25.1/plasma-browser-integration-5.25.1.tar.xz"; + sha256 = "140j74dbsx0jicz1407h4n1hqsnnvh3mk07w4y7slvf3392fqp6i"; + name = "plasma-browser-integration-5.25.1.tar.xz"; }; }; plasma-desktop = { - version = "5.25.0"; + version = "5.25.1"; src = fetchurl { - url = "${mirror}/stable/plasma/5.25.0/plasma-desktop-5.25.0.tar.xz"; - sha256 = "1ib8j6pv720ky3v7pcyjzdn4cyi0201kcrpxj4adv2hsj3qc3lv3"; - name = "plasma-desktop-5.25.0.tar.xz"; + url = "${mirror}/stable/plasma/5.25.1/plasma-desktop-5.25.1.tar.xz"; + sha256 = "1j1d0j4sdnyfcpv9z4ch6z5z0d7ylkbqcwkhwx0qqs7if8p6f355"; + name = "plasma-desktop-5.25.1.tar.xz"; }; }; plasma-disks = { - version = "5.25.0"; + version = "5.25.1"; src = fetchurl { - url = "${mirror}/stable/plasma/5.25.0/plasma-disks-5.25.0.tar.xz"; - sha256 = "10fz7biz0p7ipdxjllwjcja8d3mf7wf4af0gi0yh0pwr5yj8yn68"; - name = "plasma-disks-5.25.0.tar.xz"; + url = "${mirror}/stable/plasma/5.25.1/plasma-disks-5.25.1.tar.xz"; + sha256 = "1ji4gkm36zk4ybdnqzynni0q66nniryfa4p60wqmqr7x97h4376s"; + name = "plasma-disks-5.25.1.tar.xz"; }; }; plasma-firewall = { - version = "5.25.0"; + version = "5.25.1"; src = fetchurl { - url = "${mirror}/stable/plasma/5.25.0/plasma-firewall-5.25.0.tar.xz"; - sha256 = "0m8lh6lfr7a9w33wcj4li01b82vfw7smv5l1sigri5zx0ahpkqdc"; - name = "plasma-firewall-5.25.0.tar.xz"; + url = "${mirror}/stable/plasma/5.25.1/plasma-firewall-5.25.1.tar.xz"; + sha256 = "0vip17v0860grmqh9sv7vjisnxgpxqs5hw8yw0fdign0dp3yjn33"; + name = "plasma-firewall-5.25.1.tar.xz"; }; }; plasma-integration = { - version = "5.25.0"; + version = "5.25.1"; src = fetchurl { - url = "${mirror}/stable/plasma/5.25.0/plasma-integration-5.25.0.tar.xz"; - sha256 = "1a069wcjfxw1rvb285lln19yg18f1k0003snmrmfbisbv5f7475q"; - name = "plasma-integration-5.25.0.tar.xz"; + url = "${mirror}/stable/plasma/5.25.1/plasma-integration-5.25.1.tar.xz"; + sha256 = "09xpbjp5k28bjvs8nszkzk9mw72zv0v171y495ffn8af6yq35cgj"; + name = "plasma-integration-5.25.1.tar.xz"; }; }; plasma-mobile = { - version = "5.25.0"; + version = "5.25.1"; src = fetchurl { - url = "${mirror}/stable/plasma/5.25.0/plasma-mobile-5.25.0.tar.xz"; - sha256 = "00d63zb8n3iza8q2a1pgk0v63bzzq3yky71ij3bmm08a405w2ad8"; - name = "plasma-mobile-5.25.0.tar.xz"; + url = "${mirror}/stable/plasma/5.25.1/plasma-mobile-5.25.1.tar.xz"; + sha256 = "04dg6xyzj9zg9g80f6l1chg8f9pj0wz4c8szj3mx1cs98lp3bvcy"; + name = "plasma-mobile-5.25.1.tar.xz"; }; }; plasma-nano = { - version = "5.25.0"; + version = "5.25.1"; src = fetchurl { - url = "${mirror}/stable/plasma/5.25.0/plasma-nano-5.25.0.tar.xz"; - sha256 = "0hcki7qz1xldnm70x5qwrp7knqzyq3kzwjasiqpbz9vc5l4rxxyz"; - name = "plasma-nano-5.25.0.tar.xz"; + url = "${mirror}/stable/plasma/5.25.1/plasma-nano-5.25.1.tar.xz"; + sha256 = "0acdz8qqkk4rwsfglk06am8s89zyz0jafhqq574bw83znq13xhfy"; + name = "plasma-nano-5.25.1.tar.xz"; }; }; plasma-nm = { - version = "5.25.0"; + version = "5.25.1"; src = fetchurl { - url = "${mirror}/stable/plasma/5.25.0/plasma-nm-5.25.0.tar.xz"; - sha256 = "10350qnsap1m1jcmga331pis8076lpk9kkg9141xrlsy8kbf36ad"; - name = "plasma-nm-5.25.0.tar.xz"; + url = "${mirror}/stable/plasma/5.25.1/plasma-nm-5.25.1.tar.xz"; + sha256 = "011i4d612ljvy2b9vv4lqr2ad5yq0qv18nqqjdy3wmj7w1nm4ww9"; + name = "plasma-nm-5.25.1.tar.xz"; }; }; plasma-pa = { - version = "5.25.0"; + version = "5.25.1"; src = fetchurl { - url = "${mirror}/stable/plasma/5.25.0/plasma-pa-5.25.0.tar.xz"; - sha256 = "0shp4y08ry8ql02akdmwzzn7yaiddbhsp3h2jqmh401q14n374m8"; - name = "plasma-pa-5.25.0.tar.xz"; + url = "${mirror}/stable/plasma/5.25.1/plasma-pa-5.25.1.tar.xz"; + sha256 = "1nrsw3f2dj1sd3ibyym7142shwxnsi72j4nkhx02206fcjm5p9d1"; + name = "plasma-pa-5.25.1.tar.xz"; }; }; plasma-sdk = { - version = "5.25.0"; + version = "5.25.1"; src = fetchurl { - url = "${mirror}/stable/plasma/5.25.0/plasma-sdk-5.25.0.tar.xz"; - sha256 = "0z72gyxp5ddcn9ilyflp781a60vgpck3l91prxaphhgn3js0al9r"; - name = "plasma-sdk-5.25.0.tar.xz"; + url = "${mirror}/stable/plasma/5.25.1/plasma-sdk-5.25.1.tar.xz"; + sha256 = "1cy9c4h6yxqjnylnpy2ai7vsx3c1b9p6ga3771jdb1zgqw55lgg7"; + name = "plasma-sdk-5.25.1.tar.xz"; }; }; plasma-systemmonitor = { - version = "5.25.0"; + version = "5.25.1"; src = fetchurl { - url = "${mirror}/stable/plasma/5.25.0/plasma-systemmonitor-5.25.0.tar.xz"; - sha256 = "131hzqhhc4a0531p2xjabcbjp9cgkzir2sxvx8mb7xa5i213qjfr"; - name = "plasma-systemmonitor-5.25.0.tar.xz"; + url = "${mirror}/stable/plasma/5.25.1/plasma-systemmonitor-5.25.1.tar.xz"; + sha256 = "1l6m5jnqk56r20mv24s567qj4fbv6ixnzsw75pssngn5zmccm6xy"; + name = "plasma-systemmonitor-5.25.1.tar.xz"; }; }; plasma-tests = { - version = "5.25.0"; + version = "5.25.1"; src = fetchurl { - url = "${mirror}/stable/plasma/5.25.0/plasma-tests-5.25.0.tar.xz"; - sha256 = "1cgkfg1psnl74h2v5napv4fzxa7d997d8zzkkpy5sg89isxidcjq"; - name = "plasma-tests-5.25.0.tar.xz"; + url = "${mirror}/stable/plasma/5.25.1/plasma-tests-5.25.1.tar.xz"; + sha256 = "1vdvyirk53xv77mdj9kd3n8sk9rfgrz7c31h93bs1hybpbkqbc4g"; + name = "plasma-tests-5.25.1.tar.xz"; }; }; plasma-thunderbolt = { - version = "5.25.0"; + version = "5.25.1"; src = fetchurl { - url = "${mirror}/stable/plasma/5.25.0/plasma-thunderbolt-5.25.0.tar.xz"; - sha256 = "04h1rmc4ha62sgljs1gy4kafip611rd54sx6siagz5wicjq0fahi"; - name = "plasma-thunderbolt-5.25.0.tar.xz"; + url = "${mirror}/stable/plasma/5.25.1/plasma-thunderbolt-5.25.1.tar.xz"; + sha256 = "19wjs5sapq4v4wwmhd4fk1pdc4zkn0p0w91vc29mzw7vy51id5w0"; + name = "plasma-thunderbolt-5.25.1.tar.xz"; }; }; plasma-vault = { - version = "5.25.0"; + version = "5.25.1"; src = fetchurl { - url = "${mirror}/stable/plasma/5.25.0/plasma-vault-5.25.0.tar.xz"; - sha256 = "1afqvnfbznazbyik8m1sj04a2qfihvhjn7pv1kbpzj83yca00zvq"; - name = "plasma-vault-5.25.0.tar.xz"; + url = "${mirror}/stable/plasma/5.25.1/plasma-vault-5.25.1.tar.xz"; + sha256 = "15pad4p9lf6z4nkm0zk82k1zn0x724l68hajvwrhw4qjrr8p2p68"; + name = "plasma-vault-5.25.1.tar.xz"; }; }; plasma-workspace = { - version = "5.25.0"; + version = "5.25.1"; src = fetchurl { - url = "${mirror}/stable/plasma/5.25.0/plasma-workspace-5.25.0.tar.xz"; - sha256 = "1hbv0w6vkqdrr3dr3cndg8c049x9fpxg9siw2ggbxz30kvc64m2n"; - name = "plasma-workspace-5.25.0.tar.xz"; + url = "${mirror}/stable/plasma/5.25.1/plasma-workspace-5.25.1.tar.xz"; + sha256 = "1pin9x3sz0x39af0cvfna518sx383sr2564f85c7znvyw4qdys0k"; + name = "plasma-workspace-5.25.1.tar.xz"; }; }; plasma-workspace-wallpapers = { - version = "5.25.0"; + version = "5.25.1"; src = fetchurl { - url = "${mirror}/stable/plasma/5.25.0/plasma-workspace-wallpapers-5.25.0.tar.xz"; - sha256 = "0lvqf53a4cy3vzm2kmxwnjlrvhfdb7s9vqq1x3cmagaq9d6zkb70"; - name = "plasma-workspace-wallpapers-5.25.0.tar.xz"; + url = "${mirror}/stable/plasma/5.25.1/plasma-workspace-wallpapers-5.25.1.tar.xz"; + sha256 = "0cpqgp45rbsaynasf1k974fvwwrfv93r68hn6bvka99nh6j4vpki"; + name = "plasma-workspace-wallpapers-5.25.1.tar.xz"; }; }; plymouth-kcm = { - version = "5.25.0"; + version = "5.25.1"; src = fetchurl { - url = "${mirror}/stable/plasma/5.25.0/plymouth-kcm-5.25.0.tar.xz"; - sha256 = "0h6qrqz2mvb0b1x5z74a8knh7dr8g5lwz8dzwypbsa7ahfj877x5"; - name = "plymouth-kcm-5.25.0.tar.xz"; + url = "${mirror}/stable/plasma/5.25.1/plymouth-kcm-5.25.1.tar.xz"; + sha256 = "08sf692fsdffaj91kgw3mg4bgxyy080kx992zb6drnkjmxq6pi93"; + name = "plymouth-kcm-5.25.1.tar.xz"; }; }; polkit-kde-agent = { - version = "1-5.25.0"; + version = "1-5.25.1"; src = fetchurl { - url = "${mirror}/stable/plasma/5.25.0/polkit-kde-agent-1-5.25.0.tar.xz"; - sha256 = "0ph3i46xn2273anhbszxjn51rkngsmy588ayhjqx0a19wmfw7qk9"; - name = "polkit-kde-agent-1-5.25.0.tar.xz"; + url = "${mirror}/stable/plasma/5.25.1/polkit-kde-agent-1-5.25.1.tar.xz"; + sha256 = "0aawaq09l1ifn7wd9ggj50vv19vj30w8bmfdzwjhj9zgym2s8dc4"; + name = "polkit-kde-agent-1-5.25.1.tar.xz"; }; }; powerdevil = { - version = "5.25.0"; + version = "5.25.1"; src = fetchurl { - url = "${mirror}/stable/plasma/5.25.0/powerdevil-5.25.0.tar.xz"; - sha256 = "1fqgnc5l2vxf310i41l4ggcjwjq1jp8c4wngfb8jl3nn6lqkmdki"; - name = "powerdevil-5.25.0.tar.xz"; + url = "${mirror}/stable/plasma/5.25.1/powerdevil-5.25.1.tar.xz"; + sha256 = "0m57mp577liv3cmd4afm834mif688akdir9i89xjmvwdg8cws7n4"; + name = "powerdevil-5.25.1.tar.xz"; }; }; qqc2-breeze-style = { - version = "5.25.0"; + version = "5.25.1"; src = fetchurl { - url = "${mirror}/stable/plasma/5.25.0/qqc2-breeze-style-5.25.0.tar.xz"; - sha256 = "0jw2zk9rrfdb3g983c85c4q539277p0cl2y165zb63p2hrcy44cz"; - name = "qqc2-breeze-style-5.25.0.tar.xz"; + url = "${mirror}/stable/plasma/5.25.1/qqc2-breeze-style-5.25.1.tar.xz"; + sha256 = "00ij7ci9xh125g9n8f1qmlpjjy93hydqi3gf29bfz4vh2lnvfd4l"; + name = "qqc2-breeze-style-5.25.1.tar.xz"; }; }; sddm-kcm = { - version = "5.25.0"; + version = "5.25.1"; src = fetchurl { - url = "${mirror}/stable/plasma/5.25.0/sddm-kcm-5.25.0.tar.xz"; - sha256 = "0mj101qsmp3405ir6qnkfc8gm6f3vzy0gdg6zv465mh8fs8yvcf4"; - name = "sddm-kcm-5.25.0.tar.xz"; + url = "${mirror}/stable/plasma/5.25.1/sddm-kcm-5.25.1.tar.xz"; + sha256 = "1m371dqj72f3lxyn8bjz0bgxycrz5ik1byzqqhrjkfy3an68vs36"; + name = "sddm-kcm-5.25.1.tar.xz"; }; }; systemsettings = { - version = "5.25.0"; + version = "5.25.1"; src = fetchurl { - url = "${mirror}/stable/plasma/5.25.0/systemsettings-5.25.0.tar.xz"; - sha256 = "1a3x0gig7ixk52hqa7jr85l7xypj8rjaashk8xnq9zmvxlk6idng"; - name = "systemsettings-5.25.0.tar.xz"; + url = "${mirror}/stable/plasma/5.25.1/systemsettings-5.25.1.tar.xz"; + sha256 = "1kichbhmsnr3kmlzic4dp3ajbkwrn8q9idjwwffnr48rz1pnb3j3"; + name = "systemsettings-5.25.1.tar.xz"; }; }; xdg-desktop-portal-kde = { - version = "5.25.0"; + version = "5.25.1"; src = fetchurl { - url = "${mirror}/stable/plasma/5.25.0/xdg-desktop-portal-kde-5.25.0.tar.xz"; - sha256 = "1632pglnz8yv86sgrmmr8zv3h38mw8bk21cshw63bbcfvxmvl88m"; - name = "xdg-desktop-portal-kde-5.25.0.tar.xz"; + url = "${mirror}/stable/plasma/5.25.1/xdg-desktop-portal-kde-5.25.1.tar.xz"; + sha256 = "15b9wradlqlcipn9q09czc698xsb4q7j6pwgnv8fbaq5na6xgh0s"; + name = "xdg-desktop-portal-kde-5.25.1.tar.xz"; }; }; } diff --git a/pkgs/development/compilers/binaryen/default.nix b/pkgs/development/compilers/binaryen/default.nix index 0df831831ba9e..6aeaeac8a1ead 100644 --- a/pkgs/development/compilers/binaryen/default.nix +++ b/pkgs/development/compilers/binaryen/default.nix @@ -1,18 +1,52 @@ -{ lib, stdenv, cmake, python3, fetchFromGitHub, emscripten }: +{ lib, stdenv, cmake, python3, fetchFromGitHub, emscripten, + gtest, lit, nodejs, filecheck, fetchpatch +}: stdenv.mkDerivation rec { pname = "binaryen"; - version = "105"; + version = "109"; src = fetchFromGitHub { owner = "WebAssembly"; repo = "binaryen"; rev = "version_${version}"; - sha256 = "0yg9rarjv1gfbq225cj9hnbgx99n5az2m19qwfp8z41dwhh71igm"; + sha256 = "sha256-HMPoiuTvYhTDaBUfSOfh/Dt4FdO9jGqUaFpi92pnscI="; }; + patches = [ + # https://github.com/WebAssembly/binaryen/pull/4321 + (fetchpatch { + url = "https://github.com/WebAssembly/binaryen/commit/93b8849d9f98ef7ed812938ff0b3219819c2be77.patch"; + sha256 = "sha256-Duan/B9A+occ5Lj2SbRX793xIfhzHbdYPI5PyTNCZoU="; + }) + ]; + nativeBuildInputs = [ cmake python3 ]; + preConfigure = '' + if [ $doCheck -eq 1 ]; then + sed -i '/googletest/d' third_party/CMakeLists.txt + else + cmakeFlagsArray=($cmakeFlagsArray -DBUILD_TESTS=0) + fi + ''; + + checkInputs = [ gtest lit nodejs filecheck ]; + checkPhase = '' + LD_LIBRARY_PATH=$LD_LIBRARY_PATH:$PWD/lib python3 ../check.py $tests + ''; + + tests = [ + "version" "wasm-opt" "wasm-dis" + "crash" "dylink" "ctor-eval" + "wasm-metadce" "wasm-reduce" "spec" + "lld" "wasm2js" "validator" + "example" "unit" + # "binaryenjs" "binaryenjs_wasm" # not building this + "lit" "gtest" + ]; + doCheck = stdenv.isLinux; + meta = with lib; { homepage = "https://github.com/WebAssembly/binaryen"; description = "Compiler infrastructure and toolchain library for WebAssembly, in C++"; diff --git a/pkgs/development/compilers/bs-platform/ocaml.nix b/pkgs/development/compilers/bs-platform/ocaml.nix index 05fb8b6b17eac..3fe0e0b2eede5 100644 --- a/pkgs/development/compilers/bs-platform/ocaml.nix +++ b/pkgs/development/compilers/bs-platform/ocaml.nix @@ -5,6 +5,13 @@ stdenv.mkDerivation rec { configurePhase = '' ./configure -prefix $out ''; + + # Workaround ocaml-4.06 limitation of duplicate definitions. + # ld: libcamlrun.a(minor_gc.o):/build/ocaml/byterun/caml/major_gc.h:67: multiple definition of + # `caml_major_ring'; libcamlrun.a(stacks.o):/build/ocaml/byterun/caml/major_gc.h:67: first defined here + # Match -fcommon workaround in ocaml-4.06 itself. + NIX_CFLAGS_COMPILE = "-fcommon"; + buildPhase = '' make -j9 world.opt ''; diff --git a/pkgs/development/compilers/emscripten/default.nix b/pkgs/development/compilers/emscripten/default.nix index 47464e52ddbd9..0a99fa170b779 100644 --- a/pkgs/development/compilers/emscripten/default.nix +++ b/pkgs/development/compilers/emscripten/default.nix @@ -3,12 +3,11 @@ , llvmPackages , symlinkJoin, makeWrapper, substituteAll , mkYarnModules -, fetchpatch }: stdenv.mkDerivation rec { pname = "emscripten"; - version = "3.1.10"; + version = "3.1.14"; llvmEnv = symlinkJoin { name = "emscripten-llvm-${version}"; @@ -27,7 +26,7 @@ stdenv.mkDerivation rec { src = fetchFromGitHub { owner = "emscripten-core"; repo = "emscripten"; - sha256 = "03k0pd5hna7khrnn3k3ln38h9w0vyaicfzvfqlqbxi4zz8jikrdb"; + sha256 = "sha256-CVFC278ibwUMib2F64Uc7FP+D1JPUJ/9/3w0wz1PWqg="; rev = version; }; @@ -39,11 +38,6 @@ stdenv.mkDerivation rec { src = ./0001-emulate-clang-sysroot-include-logic.patch; resourceDir = "${llvmEnv}/lib/clang/${llvmPackages.release_version}/"; }) - (fetchpatch { - # https://github.com/emscripten-core/emscripten/pull/16986 - url = "https://github.com/emscripten-core/emscripten/commit/d5ef6937fe395488e23a82c1e582a7ea5c2dab83.patch"; - sha256 = "sha256-YX5DG8i5x6S7XnU58etEapDd+o5SuzbFIGv8v/9+T3E="; - }) ]; buildPhase = '' @@ -98,7 +92,7 @@ stdenv.mkDerivation rec { # precompile libc (etc.) in all variants: pushd $TMPDIR - echo 'int main() { return 42; }' >test.c + echo 'int __main_argc_argv() { return 42; }' >test.c for LTO in -flto ""; do # wasm2c doesn't work with PIC $out/bin/emcc -s WASM2C -s STANDALONE_WASM $LTO test.c diff --git a/pkgs/development/compilers/emscripten/package.json b/pkgs/development/compilers/emscripten/package.json index 485fc87b9e342..dfd416c3b5a68 100644 --- a/pkgs/development/compilers/emscripten/package.json +++ b/pkgs/development/compilers/emscripten/package.json @@ -1,17 +1,17 @@ { "name": "emscripten", - "version": "3.1.10", + "version": "3.1.14", "private": true, "devDependencies": { - "es-check": "^6.1.1", - "eslint": "^8.6.0", + "es-check": "^6.2.1", + "eslint": "^8.16.0", "eslint-config-google": "^0.14.0", "source-map": "0.7.3", - "ws": "^8.5.0" + "ws": "^8.6.0" }, "dependencies": { - "acorn": "^8.7.0", - "google-closure-compiler": "20220104.0.0", + "acorn": "^8.7.1", + "google-closure-compiler": "20220502.0.0", "html-minifier-terser": "6.1.0", "wasm2c": "1.0.0" }, diff --git a/pkgs/development/compilers/emscripten/yarn.lock b/pkgs/development/compilers/emscripten/yarn.lock index 5a28df7f8dcd3..6b4e1011f947f 100644 --- a/pkgs/development/compilers/emscripten/yarn.lock +++ b/pkgs/development/compilers/emscripten/yarn.lock @@ -26,15 +26,15 @@ resolved "https://registry.yarnpkg.com/@colors/colors/-/colors-1.5.0.tgz#bb504579c1cae923e6576a4f5da43d25f97bdbd9" integrity sha512-ooWCrlZP11i8GImSjTHYHLkvFDP48nS4+204nGb1RiX/WXYHmJA2III9/e2DWVabCESdW7hBAEzHRqUn9OUVvQ== -"@eslint/eslintrc@^1.2.3": - version "1.2.3" - resolved "https://registry.yarnpkg.com/@eslint/eslintrc/-/eslintrc-1.2.3.tgz#fcaa2bcef39e13d6e9e7f6271f4cc7cae1174886" - integrity sha512-uGo44hIwoLGNyduRpjdEpovcbMdd+Nv7amtmJxnKmI8xj6yd5LncmSwDa5NgX/41lIFJtkjD6YdVfgEzPfJ5UA== +"@eslint/eslintrc@^1.3.0": + version "1.3.0" + resolved "https://registry.yarnpkg.com/@eslint/eslintrc/-/eslintrc-1.3.0.tgz#29f92c30bb3e771e4a2048c95fa6855392dfac4f" + integrity sha512-UWW0TMTmk2d7hLcWD1/e2g5HDM/HQ3csaLSqXCfqwh4uNDuNqlaKWXmEsL4Cs41Z0KnILNvwbHAah3C2yt06kw== dependencies: ajv "^6.12.4" debug "^4.3.2" espree "^9.3.2" - globals "^13.9.0" + globals "^13.15.0" ignore "^5.2.0" import-fresh "^3.2.1" js-yaml "^4.1.0" @@ -55,6 +55,46 @@ resolved "https://registry.yarnpkg.com/@humanwhocodes/object-schema/-/object-schema-1.2.1.tgz#b520529ec21d8e5945a1851dfd1c32e94e39ff45" integrity sha512-ZnQMnLV4e7hDlUvw8H+U8ASL02SS2Gn6+9Ac3wGGLIe7+je2AeAOxPY+izIPJDfFDb7eDjev0Us8MO1iFRN8hA== +"@jridgewell/gen-mapping@^0.3.0": + version "0.3.1" + resolved "https://registry.yarnpkg.com/@jridgewell/gen-mapping/-/gen-mapping-0.3.1.tgz#cf92a983c83466b8c0ce9124fadeaf09f7c66ea9" + integrity sha512-GcHwniMlA2z+WFPWuY8lp3fsza0I8xPFMWL5+n8LYyP6PSvPrXf4+n8stDHZY2DM0zy9sVkRDy1jDI4XGzYVqg== + dependencies: + "@jridgewell/set-array" "^1.0.0" + "@jridgewell/sourcemap-codec" "^1.4.10" + "@jridgewell/trace-mapping" "^0.3.9" + +"@jridgewell/resolve-uri@^3.0.3": + version "3.0.7" + resolved "https://registry.yarnpkg.com/@jridgewell/resolve-uri/-/resolve-uri-3.0.7.tgz#30cd49820a962aff48c8fffc5cd760151fca61fe" + integrity sha512-8cXDaBBHOr2pQ7j77Y6Vp5VDT2sIqWyWQ56TjEq4ih/a4iST3dItRe8Q9fp0rrIl9DoKhWQtUQz/YpOxLkXbNA== + +"@jridgewell/set-array@^1.0.0": + version "1.1.1" + resolved "https://registry.yarnpkg.com/@jridgewell/set-array/-/set-array-1.1.1.tgz#36a6acc93987adcf0ba50c66908bd0b70de8afea" + integrity sha512-Ct5MqZkLGEXTVmQYbGtx9SVqD2fqwvdubdps5D3djjAkgkKwT918VNOz65pEHFaYTeWcukmJmH5SwsA9Tn2ObQ== + +"@jridgewell/source-map@^0.3.2": + version "0.3.2" + resolved "https://registry.yarnpkg.com/@jridgewell/source-map/-/source-map-0.3.2.tgz#f45351aaed4527a298512ec72f81040c998580fb" + integrity sha512-m7O9o2uR8k2ObDysZYzdfhb08VuEml5oWGiosa1VdaPZ/A6QyPkAJuwN0Q1lhULOf6B7MtQmHENS743hWtCrgw== + dependencies: + "@jridgewell/gen-mapping" "^0.3.0" + "@jridgewell/trace-mapping" "^0.3.9" + +"@jridgewell/sourcemap-codec@^1.4.10": + version "1.4.13" + resolved "https://registry.yarnpkg.com/@jridgewell/sourcemap-codec/-/sourcemap-codec-1.4.13.tgz#b6461fb0c2964356c469e115f504c95ad97ab88c" + integrity sha512-GryiOJmNcWbovBxTfZSF71V/mXbgcV3MewDe3kIMCLyIh5e7SKAeUZs+rMnJ8jkMolZ/4/VsdBmMrw3l+VdZ3w== + +"@jridgewell/trace-mapping@^0.3.9": + version "0.3.13" + resolved "https://registry.yarnpkg.com/@jridgewell/trace-mapping/-/trace-mapping-0.3.13.tgz#dcfe3e95f224c8fe97a87a5235defec999aa92ea" + integrity sha512-o1xbKhp9qnIAoHJSWd6KlCZfqslL4valSF81H8ImioOAxluWYWOpWkpyktY2vnt4tbrX9XYaxovq6cgowaJp2w== + dependencies: + "@jridgewell/resolve-uri" "^3.0.3" + "@jridgewell/sourcemap-codec" "^1.4.10" + "@nodelib/fs.scandir@2.1.5": version "2.1.5" resolved "https://registry.yarnpkg.com/@nodelib/fs.scandir/-/fs.scandir-2.1.5.tgz#7619c2eb21b25483f6d167548b4cfd5a7488c3d5" @@ -95,9 +135,9 @@ integrity sha512-Klz949h02Gz2uZCMGwDUSDS1YBlTdDDgbWHi+81l29tQALUtvz4rAYi5uoVhE5Lagoq6DeqAUlbrHvW/mXDgdQ== "@types/node@*": - version "17.0.32" - resolved "https://registry.yarnpkg.com/@types/node/-/node-17.0.32.tgz#51d59d7a90ef2d0ae961791e0900cad2393a0149" - integrity sha512-eAIcfAvhf/BkHcf4pkLJ7ECpBAhh9kcxRBpip9cTiO+hf+aJrsxYxBeS6OXvOd9WqNAJmavXVpZvY1rBjNsXmw== + version "18.0.0" + resolved "https://registry.yarnpkg.com/@types/node/-/node-18.0.0.tgz#67c7b724e1bcdd7a8821ce0d5ee184d3b4dd525a" + integrity sha512-cHlGmko4gWLVI27cGJntjs/Sj8th9aYwplmZFwmmgYQQvL5NUsgVJG7OddLvNfLqYS31KFN0s3qlaD9qCaxACA== "@types/node@13.9.3": version "13.9.3" @@ -147,20 +187,15 @@ ansi-escapes@^3.2.0: integrity sha512-cBhpre4ma+U0T1oM5fXg7Dy1Jw7zzwv7lt/GoCpr+hDQJoYnKVPLL4dCvSEFMmQurOQvSrwT7SL/DAlhBI97RQ== ansi-regex@^3.0.0: - version "3.0.0" - resolved "https://registry.yarnpkg.com/ansi-regex/-/ansi-regex-3.0.0.tgz#ed0317c322064f79466c02966bddb605ab37d998" - integrity sha1-7QMXwyIGT3lGbAKWa922Bas32Zg= + version "3.0.1" + resolved "https://registry.yarnpkg.com/ansi-regex/-/ansi-regex-3.0.1.tgz#123d6479e92ad45ad897d4054e3c7ca7db4944e1" + integrity sha512-+O9Jct8wf++lXxxFc4hc8LsjaSq0HFzzL7cVsw8pRDIPdjKD2mT4ytDZlLuSBZ4cLKZFXIrMGO7DbQCtMJJMKw== ansi-regex@^4.1.0: version "4.1.1" resolved "https://registry.yarnpkg.com/ansi-regex/-/ansi-regex-4.1.1.tgz#164daac87ab2d6f6db3a29875e2d1766582dabed" integrity sha512-ILlv4k/3f6vfQ4OoP2AGvirOktlQ98ZEL1k9FaQjxa3L1abBgbuTDAdPOpvbGncC0BTVQrl+OM8xZGK6tWXt7g== -ansi-regex@^5.0.0: - version "5.0.0" - resolved "https://registry.yarnpkg.com/ansi-regex/-/ansi-regex-5.0.0.tgz#388539f55179bf39339c81af30a654d69f87cb75" - integrity sha512-bY6fj56OUQ0hU1KjFNDQuJFezqKdrAyFdIevADiqrWHwSlbmBNMHp5ak2f40Pm8JTFyM2mqxkG6ngkHO11f/lg== - ansi-regex@^5.0.1: version "5.0.1" resolved "https://registry.yarnpkg.com/ansi-regex/-/ansi-regex-5.0.1.tgz#082cb2c89c9fe8659a311a53bd6a4dc5301db304" @@ -218,9 +253,9 @@ braces@^3.0.2: fill-range "^7.0.1" buffer-from@^1.0.0: - version "1.1.1" - resolved "https://registry.yarnpkg.com/buffer-from/-/buffer-from-1.1.1.tgz#32713bc028f75c02fdb710d7c7bcec1f2c6070ef" - integrity sha512-MQcXEUbCKtEo7bhqEs6560Hyd4XaovZlO/k9V3hjVUF/zwW7KBVdSK4gIt/bzwS9MbR5qob+F5jusZsb0YQK2A== + version "1.1.2" + resolved "https://registry.yarnpkg.com/buffer-from/-/buffer-from-1.1.2.tgz#2b146a6fd72e80b4f55d255f35ed59a3a9a41bd5" + integrity sha512-E+XQCRwSbaaiChtv6k6Dwgc+bx+Bs6vuKJHHl5kox/BaKbhiXzqQOwK4cO22yElGp2OCmjwVhT3HmxgyPGnJfQ== callsites@^3.0.0: version "3.1.0" @@ -253,9 +288,9 @@ chalk@3.0.0: supports-color "^7.1.0" chalk@^4.0.0: - version "4.1.1" - resolved "https://registry.yarnpkg.com/chalk/-/chalk-4.1.1.tgz#c80b3fab28bf6371e6863325eee67e618b77e6ad" - integrity sha512-diHzdDKxcU+bAsUboHLPEDQiw0qEe0qd7SYUn3HgcFlWgbDcfLGswOHYeGrHKzG9z6UYf01d9VFMfZxPM1xZSg== + version "4.1.2" + resolved "https://registry.yarnpkg.com/chalk/-/chalk-4.1.2.tgz#aac4e2b7734a740867aeb16bf02aad556a1e7a01" + integrity sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA== dependencies: ansi-styles "^4.1.0" supports-color "^7.1.0" @@ -275,7 +310,7 @@ clean-css@^5.2.2: cli-cursor@^2.1.0: version "2.1.0" resolved "https://registry.yarnpkg.com/cli-cursor/-/cli-cursor-2.1.0.tgz#b35dac376479facc3e94747d41d0d0f5238ffcb5" - integrity sha1-s12sN2R5+sw+lHR9QdDQ9SOP/LU= + integrity sha512-8lgKz8LmCRYZZQDpRyT2m5rKJ08TnU4tR9FFFW2rxpxR1FzWi4PQ/NfyODchAatHaUgnSPVcx/R5w6NuTBzFiw== dependencies: restore-cursor "^2.0.0" @@ -287,17 +322,17 @@ cli-width@^2.0.0: clone-buffer@^1.0.0: version "1.0.0" resolved "https://registry.yarnpkg.com/clone-buffer/-/clone-buffer-1.0.0.tgz#e3e25b207ac4e701af721e2cb5a16792cac3dc58" - integrity sha1-4+JbIHrE5wGvch4staFnksrD3Fg= + integrity sha512-KLLTJWrvwIP+OPfMn0x2PheDEP20RPUcGXj/ERegTgdmPEZylALQldygiqrPPu8P45uNuPs7ckmReLY6v/iA5g== clone-stats@^1.0.0: version "1.0.0" resolved "https://registry.yarnpkg.com/clone-stats/-/clone-stats-1.0.0.tgz#b3782dff8bb5474e18b9b6bf0fdfe782f8777680" - integrity sha1-s3gt/4u1R04Yuba/D9/ngvh3doA= + integrity sha512-au6ydSpg6nsrigcZ4m8Bc9hxjeW+GJ8xh5G3BJCMt4WXe1H10UNaVOamqQTmrx1kjVuxAHIQSNU6hY4Nsn9/ag== clone@^2.1.1: version "2.1.2" resolved "https://registry.yarnpkg.com/clone/-/clone-2.1.2.tgz#1b7f4b9f591f1e8f83670401600345a02887435f" - integrity sha1-G39Ln1kfHo+DZwQBYANFoCiHQ18= + integrity sha512-3Pe/CF1Nn94hyhIYpjtiLhdCoEoz0DqQ+988E9gmeEdQZlojxnOb74wctFyuwWQHzqyf9X7C7MG8juUpqBJT8w== cloneable-readable@^1.0.0: version "1.1.3" @@ -325,7 +360,7 @@ color-convert@^2.0.1: color-name@1.1.3: version "1.1.3" resolved "https://registry.yarnpkg.com/color-name/-/color-name-1.1.3.tgz#a7d0558bd89c42f795dd42328f740831ca53bc25" - integrity sha1-p9BVi9icQveV3UIyj3QIMcpTvCU= + integrity sha512-72fSenhMw2HZMTVHeCA9KCmpEIbzWiQsjN+BHcBbS9vr1mtt+vJjPdksIBNUmKAW8TFUDPJK5SUU3QhE9NEXDw== color-name@^1.0.0, color-name@~1.1.4: version "1.1.4" @@ -351,7 +386,7 @@ color@^3.1.3: colornames@^1.1.1: version "1.1.1" resolved "https://registry.yarnpkg.com/colornames/-/colornames-1.1.1.tgz#f8889030685c7c4ff9e2a559f5077eb76a816f96" - integrity sha1-+IiQMGhcfE/54qVZ9Qd+t2qBb5Y= + integrity sha512-/pyV40IrsdulWv+wFPmERh9k/mjsPZ64yUMDmWrtj/k1nmgrzzIENWKdaVKyBbvFdQWqkcaRxr+polCo3VMe7A== colorspace@1.1.x: version "1.1.4" @@ -374,12 +409,12 @@ commander@^8.3.0: concat-map@0.0.1: version "0.0.1" resolved "https://registry.yarnpkg.com/concat-map/-/concat-map-0.0.1.tgz#d8a96bd77fd68df7793a73036a3ba0d5405d477b" - integrity sha1-2Klr13/Wjfd5OnMDajug1UBdR3s= + integrity sha512-/Srv4dswyQNBfohGpz9o6Yb3Gz3SrUDqBH5rTuhGR7ahtlbYKnVxw2bCFMRljaA7EXHaXZ8wsHdodFvbkhKmqg== core-util-is@~1.0.0: - version "1.0.2" - resolved "https://registry.yarnpkg.com/core-util-is/-/core-util-is-1.0.2.tgz#b5fd54220aa2bc5ab57aab7140c940754503c1a7" - integrity sha1-tf1UIgqivFq1eqtxQMlAdUUDwac= + version "1.0.3" + resolved "https://registry.yarnpkg.com/core-util-is/-/core-util-is-1.0.3.tgz#a6042d3634c2b27e9328f837b965fac83808db85" + integrity sha512-ZQBvi1DcpJ4GDqanjucZ2Hj3wEO5pZDS89BWbkcrvdxksJorwUDDZamX9ldFkp9aw2lmBDLgkObEA4DWNJ9FYQ== cross-spawn@^7.0.2: version "7.0.3" @@ -390,14 +425,7 @@ cross-spawn@^7.0.2: shebang-command "^2.0.0" which "^2.0.1" -debug@^4.0.1, debug@^4.1.1: - version "4.3.1" - resolved "https://registry.yarnpkg.com/debug/-/debug-4.3.1.tgz#f0d229c505e0c6d8c49ac553d1b13dc183f6b2ee" - integrity sha512-doEwdvm4PCeK4K3RQN2ZC2BYUBaxwLARCqZmMjtF8a51J2Rb0xpVloFRnCODwqjpwnAoao4pelN8l3RJdv3gRQ== - dependencies: - ms "2.1.2" - -debug@^4.3.2: +debug@^4.0.1, debug@^4.1.1, debug@^4.3.2: version "4.3.4" resolved "https://registry.yarnpkg.com/debug/-/debug-4.3.4.tgz#1319f6579357f2338d3337d2cdd4914bb5dcc865" integrity sha512-PRWFHuSU3eDtQJPvnNY7Jcket1j0t5OuOsFzPPzsekD52Zl8qUfFIPEiswXqIvHWGVHOgX+7G/vCNNhehwxfkQ== @@ -405,9 +433,9 @@ debug@^4.3.2: ms "2.1.2" deep-is@^0.1.3: - version "0.1.3" - resolved "https://registry.yarnpkg.com/deep-is/-/deep-is-0.1.3.tgz#b369d6fb5dbc13eecf524f91b070feedc357cf34" - integrity sha1-s2nW+128E+7PUk+RsHD+7cNXzzQ= + version "0.1.4" + resolved "https://registry.yarnpkg.com/deep-is/-/deep-is-0.1.4.tgz#a6f2dce612fadd2ef1f519b73551f17e85199831" + integrity sha512-oIPzksmTg4/MriiaYGO+okXDT7ztn/w3Eptv/+gSIdMdKsJo0u4CfYNFJPy+4SKMuCqGw2wxnA+URMg3t8a/bQ== diagnostics@^1.1.1: version "1.1.1" @@ -446,7 +474,7 @@ emoji-regex@^8.0.0: enabled@1.0.x: version "1.0.2" resolved "https://registry.yarnpkg.com/enabled/-/enabled-1.0.2.tgz#965f6513d2c2d1c5f4652b64a2e3396467fc2f93" - integrity sha1-ll9lE9LC0cX0ZStkouM5ZGf8L5M= + integrity sha512-nnzgVSpB35qKrUN8358SjO1bYAmxoThECTWw9s3J0x5G8A9hokKHVDFzBjVpCoSryo6MhN8woVyascN5jheaNA== dependencies: env-variable "0.0.x" @@ -455,7 +483,7 @@ env-variable@0.0.x: resolved "https://registry.yarnpkg.com/env-variable/-/env-variable-0.0.6.tgz#74ab20b3786c545b62b4a4813ab8cf22726c9808" integrity sha512-bHz59NlBbtS0NhftmR8+ExBEekE7br0e01jw+kk0NDro7TtZzBYZ5ScGPs3OmwnpyfHTHOtr1Y6uedCdrIldtg== -es-check@^6.1.1: +es-check@^6.2.1: version "6.2.1" resolved "https://registry.yarnpkg.com/es-check/-/es-check-6.2.1.tgz#08d6f5de2045da5d8f1535c66eac39bb611b2b65" integrity sha512-IPiRXUlwSTd2yMklIf9yEGe6GK5wCS8Sz1aTNHm1QSiYzI4aiq19giYbLi95tb+e0JJVKmcU0iQXQWW60a8V9A== @@ -472,7 +500,7 @@ es6-promisify@^6.0.0: escape-string-regexp@^1.0.5: version "1.0.5" resolved "https://registry.yarnpkg.com/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz#1b61c0562190a8dff6ae3bb2cf0200ca130b86d4" - integrity sha1-G2HAViGQqN/2rjuyzwIAyhMLhtQ= + integrity sha512-vbRorB5FUQWvla16U8R/qgaFIya2qGzwDrNmCZuYKrbdSUMG6I1ZCGQRefkRVhuOkIGVne7BQ35DSfo1qvJqFg== escape-string-regexp@^4.0.0: version "4.0.0" @@ -509,12 +537,12 @@ eslint-visitor-keys@^3.3.0: resolved "https://registry.yarnpkg.com/eslint-visitor-keys/-/eslint-visitor-keys-3.3.0.tgz#f6480fa6b1f30efe2d1968aa8ac745b862469826" integrity sha512-mQ+suqKJVyeuwGYHAdjMFqjCyfl8+Ldnxuyp3ldiMBFKkvytrXUZWaiPCEav8qDHKty44bD+qV1IP4T+w+xXRA== -eslint@^8.6.0: - version "8.15.0" - resolved "https://registry.yarnpkg.com/eslint/-/eslint-8.15.0.tgz#fea1d55a7062da48d82600d2e0974c55612a11e9" - integrity sha512-GG5USZ1jhCu8HJkzGgeK8/+RGnHaNYZGrGDzUtigK3BsGESW/rs2az23XqE0WVwDxy1VRvvjSSGu5nB0Bu+6SA== +eslint@^8.16.0: + version "8.18.0" + resolved "https://registry.yarnpkg.com/eslint/-/eslint-8.18.0.tgz#78d565d16c993d0b73968c523c0446b13da784fd" + integrity sha512-As1EfFMVk7Xc6/CvhssHUjsAQSkpfXvUGMFC3ce8JDe6WvqCgRrLOBQbVpsBFr1X1V+RACOadnzVvcUS5ni2bA== dependencies: - "@eslint/eslintrc" "^1.2.3" + "@eslint/eslintrc" "^1.3.0" "@humanwhocodes/config-array" "^0.9.2" ajv "^6.10.0" chalk "^4.0.0" @@ -532,7 +560,7 @@ eslint@^8.6.0: file-entry-cache "^6.0.1" functional-red-black-tree "^1.0.1" glob-parent "^6.0.1" - globals "^13.6.0" + globals "^13.15.0" ignore "^5.2.0" import-fresh "^3.0.0" imurmurhash "^0.1.4" @@ -574,9 +602,9 @@ esrecurse@^4.3.0: estraverse "^5.2.0" estraverse@^5.1.0, estraverse@^5.2.0: - version "5.2.0" - resolved "https://registry.yarnpkg.com/estraverse/-/estraverse-5.2.0.tgz#307df42547e6cc7324d3cf03c155d5cdb8c53880" - integrity sha512-BxbNGGNm0RyRYvUdHpIwv9IWzeM9XClbOxwoATuFdOE7ZE6wHL+HQ5T8hoPM+zHvmKzzsEqhgy0GrQ5X13afiQ== + version "5.3.0" + resolved "https://registry.yarnpkg.com/estraverse/-/estraverse-5.3.0.tgz#2eea5290702f26ab8fe5370370ff86c965d21123" + integrity sha512-MMdARuVEQziNTeJD8DgMqmhwR11BRQ/cBP+pLtYdSTnf3MIO8fFeiINEbX36ZdNlfU/7A9f3gUw49B3oQsvwBA== esutils@^2.0.2: version "2.0.3" @@ -616,7 +644,7 @@ fast-json-stable-stringify@^2.0.0: fast-levenshtein@^2.0.6: version "2.0.6" resolved "https://registry.yarnpkg.com/fast-levenshtein/-/fast-levenshtein-2.0.6.tgz#3d8a5c66883a16a30ca8643e851f19baa7797917" - integrity sha1-PYpcZog6FqMMqGQ+hR8Zuqd5eRc= + integrity sha512-DCXu6Ifhqcks7TZKY3Hxp3y6qphY5SJZmrWMDrKcERSOXWQdMhU9Ig/PYrzyw/ul9jOIyh0N4M0tbC5hodg8dw== fastq@^1.6.0: version "1.13.0" @@ -633,7 +661,7 @@ fecha@^4.2.0: figures@^2.0.0: version "2.0.0" resolved "https://registry.yarnpkg.com/figures/-/figures-2.0.0.tgz#3ab1a2d2a62c8bfb431a0c94cb797a2fce27c962" - integrity sha1-OrGi0qYsi/tDGgyUy3l6L84nyWI= + integrity sha512-Oa2M9atig69ZkfwiApY8F2Yy+tzMbazyvqv21R0NsSC8floSOC09BbT1ITWAdoMGQvJ/aZnR1KMwdx9tvHnTNA== dependencies: escape-string-regexp "^1.0.5" @@ -660,19 +688,19 @@ flat-cache@^3.0.4: rimraf "^3.0.2" flatted@^3.1.0: - version "3.1.1" - resolved "https://registry.yarnpkg.com/flatted/-/flatted-3.1.1.tgz#c4b489e80096d9df1dfc97c79871aea7c617c469" - integrity sha512-zAoAQiudy+r5SvnSw3KJy5os/oRJYHzrzja/tBDqrZtNhUw8bt6y8OBzMWcjWr+8liV8Eb6yOhw8WZ7VFZ5ZzA== + version "3.2.5" + resolved "https://registry.yarnpkg.com/flatted/-/flatted-3.2.5.tgz#76c8584f4fc843db64702a6bd04ab7a8bd666da3" + integrity sha512-WIWGi2L3DyTUvUrwRKgGi9TwxQMUEqPOPQBVi71R96jZXJdFskXEmf54BoZaS1kknGODoIGASGEzBUYdyMCBJg== fs.realpath@^1.0.0: version "1.0.0" resolved "https://registry.yarnpkg.com/fs.realpath/-/fs.realpath-1.0.0.tgz#1504ad2523158caa40db4a2787cb01411994ea4f" - integrity sha1-FQStJSMVjKpA20onh8sBQRmU6k8= + integrity sha512-OO0pH2lK6a0hZnAdau5ItzHPI6pUlvI7jMVnxUQRtw4owF2wk8lOSabtGDCTP4Ggrg2MbGnWO9X8K1t4+fGMDw== functional-red-black-tree@^1.0.1: version "1.0.1" resolved "https://registry.yarnpkg.com/functional-red-black-tree/-/functional-red-black-tree-1.0.1.tgz#1b0ab3bd553b2a0d6399d29c0e3ea0b252078327" - integrity sha1-GwqzvVU7Kg1jmdKcDj6gslIHgyc= + integrity sha512-dsKNQNdj6xA3T+QlADDA7mOSlX0qiMINjn0cgr+eGHGsbSHzTabcIogz2+p/iqP1Xs6EP/sS2SbqH+brGTbq0g== glob-parent@^5.1.2: version "5.1.2" @@ -688,76 +716,64 @@ glob-parent@^6.0.1: dependencies: is-glob "^4.0.3" -glob@^7.1.3: - version "7.1.7" - resolved "https://registry.yarnpkg.com/glob/-/glob-7.1.7.tgz#3b193e9233f01d42d0b3f78294bbeeb418f94a90" - integrity sha512-OvD9ENzPLbegENnYP5UUfJIirTg4+XwMWGaQfQTY0JenxNvvIKP3U3/tAQSPIu/lHxXYSZmpXlUHeqAIdKzBLQ== +glob@^7.1.3, glob@^7.1.6: + version "7.2.3" + resolved "https://registry.yarnpkg.com/glob/-/glob-7.2.3.tgz#b8df0fb802bbfa8e89bd1d938b4e16578ed44f2b" + integrity sha512-nFR0zLpU2YCaRxwoCJvL6UvCH2JFyFVIvwTLsIf21AuHlMskA1hhTdk+LlYJtOlYt9v6dvszD2BGRqBL+iQK9Q== dependencies: fs.realpath "^1.0.0" inflight "^1.0.4" inherits "2" - minimatch "^3.0.4" + minimatch "^3.1.1" once "^1.3.0" path-is-absolute "^1.0.0" -glob@^7.1.6: - version "7.2.0" - resolved "https://registry.yarnpkg.com/glob/-/glob-7.2.0.tgz#d15535af7732e02e948f4c41628bd910293f6023" - integrity sha512-lmLf6gtyrPq8tTjSmrO94wBeQbFR3HbLHbuyD69wuyQkImp2hWqMGB47OX65FBkPffO641IP9jWa1z4ivqG26Q== - dependencies: - fs.realpath "^1.0.0" - inflight "^1.0.4" - inherits "2" - minimatch "^3.0.4" - once "^1.3.0" - path-is-absolute "^1.0.0" - -globals@^13.6.0, globals@^13.9.0: - version "13.9.0" - resolved "https://registry.yarnpkg.com/globals/-/globals-13.9.0.tgz#4bf2bf635b334a173fb1daf7c5e6b218ecdc06cb" - integrity sha512-74/FduwI/JaIrr1H8e71UbDE+5x7pIPs1C2rrwC52SszOo043CsWOZEMW7o2Y58xwm9b+0RBKDxY5n2sUpEFxA== +globals@^13.15.0: + version "13.15.0" + resolved "https://registry.yarnpkg.com/globals/-/globals-13.15.0.tgz#38113218c907d2f7e98658af246cef8b77e90bac" + integrity sha512-bpzcOlgDhMG070Av0Vy5Owklpv1I6+j96GhUI7Rh7IzDCKLzboflLrrfqMu8NquDbiR4EOQk7XzJwqVJxicxog== dependencies: type-fest "^0.20.2" -google-closure-compiler-java@^20220104.0.0: - version "20220104.0.0" - resolved "https://registry.yarnpkg.com/google-closure-compiler-java/-/google-closure-compiler-java-20220104.0.0.tgz#de2784e2a7b58f091b861711218e41a5f04dbb05" - integrity sha512-cnxEfms548+whhdtIT5MLNVfHcXasYmsUGpyrdLDX+0xR4t+oJBT7RI/O7qOusoqXdW6lwAIT2jbFI8Irk6eVQ== +google-closure-compiler-java@^20220502.0.0: + version "20220502.0.0" + resolved "https://registry.yarnpkg.com/google-closure-compiler-java/-/google-closure-compiler-java-20220502.0.0.tgz#a92696bfc05489738dc06f797041985bbfb334be" + integrity sha512-XDXw1v+1zcNHuEUXQg24eD9MUF2XTHnEDKCwF0P0zQe+8TWQajKvjsekdJnO6JH/Lqcu8XKc7dxO5+SMijr0sw== -google-closure-compiler-linux@^20220104.0.0: - version "20220104.0.0" - resolved "https://registry.yarnpkg.com/google-closure-compiler-linux/-/google-closure-compiler-linux-20220104.0.0.tgz#fe503010827dceecaa4a842579645efcd156e443" - integrity sha512-3la7sjrcKHlQc8piP+nzsZmFQFYV/4DtxFcpjq+Re81+vYmE9NWUZ21xgp6OZ7ygZhVLEWQqGlZqJls45HS0rA== +google-closure-compiler-linux@^20220502.0.0: + version "20220502.0.0" + resolved "https://registry.yarnpkg.com/google-closure-compiler-linux/-/google-closure-compiler-linux-20220502.0.0.tgz#64a3c1723f102e047433d85ec1dfd1d101a84b4f" + integrity sha512-T+2p/Qj02yGZHxymhj1oZsiHudNvI9sQKfCLoIH0wi0ikDiVIOh/dsH+57lsaGDJ+XTP/ur5Ozl8GIOjv1Efrw== -google-closure-compiler-osx@^20220104.0.0: - version "20220104.0.0" - resolved "https://registry.yarnpkg.com/google-closure-compiler-osx/-/google-closure-compiler-osx-20220104.0.0.tgz#ff3b1c5c1e27ddcf821b8c7086e9581a61a39788" - integrity sha512-D6WPBKS6H416kY4OH9WBhviY7e+b1+RXT8jWhBGXMHoSlUiIUALOi67RvBuibiX39ljG0D1JSZbfYXNCDYLMmw== +google-closure-compiler-osx@^20220502.0.0: + version "20220502.0.0" + resolved "https://registry.yarnpkg.com/google-closure-compiler-osx/-/google-closure-compiler-osx-20220502.0.0.tgz#b5e40b2adf737622d435d9bfc99d0912a75f967e" + integrity sha512-VwEncD4I1gfkF3zyHlRcUsx2o/poC0qzHjBv+g3Z09wHy9tuqjQ4EP8LmN/GMuV2Hai6gQvkKC0XjYnZTFx2mQ== -google-closure-compiler-windows@^20220104.0.0: - version "20220104.0.0" - resolved "https://registry.yarnpkg.com/google-closure-compiler-windows/-/google-closure-compiler-windows-20220104.0.0.tgz#853a4c357bd23faf0687175a7a2671d6607b7716" - integrity sha512-VNBUBSBLn2ZeK4EKsoY/rl6qjXYoph+DWmiicNeFrEvqyUB9Vh9MhhP4F+PPOg1iYdPw4XtNsmfSnIV96kQHyA== +google-closure-compiler-windows@^20220502.0.0: + version "20220502.0.0" + resolved "https://registry.yarnpkg.com/google-closure-compiler-windows/-/google-closure-compiler-windows-20220502.0.0.tgz#6c07ebeddd70e138135ae9382b0ced50aea5add6" + integrity sha512-ssdAUS2VZxJAyciVrbhpnYymvm//V4CHyg8aLvMisUfWRDeUSsOCC5mNXy6D8f9i9bYHs3cFV3itIRUfnYCEWg== -google-closure-compiler@20220104.0.0: - version "20220104.0.0" - resolved "https://registry.yarnpkg.com/google-closure-compiler/-/google-closure-compiler-20220104.0.0.tgz#cf2ddee10abdf129cea82481e7d92f8c5ff30ce2" - integrity sha512-8JQs1cWpJYjvqnAskMis1sQ/nm2wHYIt/Rd3HYyMOgfEzjNdqLkIiuzCXbz2flktHXS63mvdxU4+ZlJR72Kz8g== +google-closure-compiler@20220502.0.0: + version "20220502.0.0" + resolved "https://registry.yarnpkg.com/google-closure-compiler/-/google-closure-compiler-20220502.0.0.tgz#94d793f60be006236b174f8e1bc3c1a493ed86f1" + integrity sha512-i9Qdve2v3jlerkHzlm00bpYds+kfAlIdeaOQ+acK/pHPHeLjhiXS+EyIpegVnH8+TY3I1QAMZFuVEXkMVJqpBQ== dependencies: chalk "2.x" - google-closure-compiler-java "^20220104.0.0" + google-closure-compiler-java "^20220502.0.0" minimist "1.x" vinyl "2.x" vinyl-sourcemaps-apply "^0.2.0" optionalDependencies: - google-closure-compiler-linux "^20220104.0.0" - google-closure-compiler-osx "^20220104.0.0" - google-closure-compiler-windows "^20220104.0.0" + google-closure-compiler-linux "^20220502.0.0" + google-closure-compiler-osx "^20220502.0.0" + google-closure-compiler-windows "^20220502.0.0" has-flag@^3.0.0: version "3.0.0" resolved "https://registry.yarnpkg.com/has-flag/-/has-flag-3.0.0.tgz#b5d454dc2199ae225699f3467e5a07f3b955bafd" - integrity sha1-tdRU3CGZriJWmfNGfloH87lVuv0= + integrity sha512-sKJf1+ceQBr4SMkvQnBDNDtf4TXpVhVGateu0t918bl30FnbE2m4vNLX+VWe/dpjlb+HugGYzW7uQXH98HPEYw== has-flag@^4.0.0: version "4.0.0" @@ -805,12 +821,12 @@ import-fresh@^3.0.0, import-fresh@^3.2.1: imurmurhash@^0.1.4: version "0.1.4" resolved "https://registry.yarnpkg.com/imurmurhash/-/imurmurhash-0.1.4.tgz#9218b9b2b928a238b13dc4fb6b6d576f231453ea" - integrity sha1-khi5srkoojixPcT7a21XbyMUU+o= + integrity sha512-JmXMZ6wuvDmLiHEml9ykzqO6lwFbof0GG4IkcGaENdCRDDmMVnny7s5HsIgHCbaq0w2MyPhDqkhTUgS2LU2PHA== inflight@^1.0.4: version "1.0.6" resolved "https://registry.yarnpkg.com/inflight/-/inflight-1.0.6.tgz#49bd6331d7d02d0c09bc910a1075ba8165b56df9" - integrity sha1-Sb1jMdfQLQwJvJEKEHW6gWW1bfk= + integrity sha512-k92I/b08q4wvFscXCLvqfsHCrjrF7yiXsQuIVvVE7N82W3+aqpzuUdBbfhWcy/FZR3/4IgflMgKLOsvPDrGCJA== dependencies: once "^1.3.0" wrappy "1" @@ -847,26 +863,19 @@ is-arrayish@^0.3.1: is-extglob@^2.1.1: version "2.1.1" resolved "https://registry.yarnpkg.com/is-extglob/-/is-extglob-2.1.1.tgz#a88c02535791f02ed37c76a1b9ea9773c833f8c2" - integrity sha1-qIwCU1eR8C7TfHahueqXc8gz+MI= + integrity sha512-SbKbANkN603Vi4jEZv49LeVJMn4yGwsbzZworEoyEiutsN3nJYdbO36zfhGJ6QEDpOZIFkDtnq5JRxmvl3jsoQ== is-fullwidth-code-point@^2.0.0: version "2.0.0" resolved "https://registry.yarnpkg.com/is-fullwidth-code-point/-/is-fullwidth-code-point-2.0.0.tgz#a3b30a5c4f199183167aaab93beefae3ddfb654f" - integrity sha1-o7MKXE8ZkYMWeqq5O+764937ZU8= + integrity sha512-VHskAKYM8RfSFXwee5t5cbN5PZeq1Wrh6qd5bkyiXIf6UQcN6w/A0eXM9r6t8d+GYOh+o6ZhiEnb88LN/Y8m2w== is-fullwidth-code-point@^3.0.0: version "3.0.0" resolved "https://registry.yarnpkg.com/is-fullwidth-code-point/-/is-fullwidth-code-point-3.0.0.tgz#f116f8064fe90b3f7844a38997c0b75051269f1d" integrity sha512-zymm5+u+sCsSWyD9qNaejV3DFvhCKclKdizYaJUuHA83RLjb7nSuGnddCHGv0hk+KY7BMAlsWeK4Ueg6EV6XQg== -is-glob@^4.0.0, is-glob@^4.0.1: - version "4.0.1" - resolved "https://registry.yarnpkg.com/is-glob/-/is-glob-4.0.1.tgz#7567dbe9f2f5e2467bc77ab83c4a29482407a5dc" - integrity sha512-5G0tKtBTFImOqDnLB2hG6Bp2qcKEFduo4tZu9MT/H6NQv/ghhy30o55ufafxJ/LdH79LLs2Kfrn85TLKyA7BUg== - dependencies: - is-extglob "^2.1.1" - -is-glob@^4.0.3: +is-glob@^4.0.0, is-glob@^4.0.1, is-glob@^4.0.3: version "4.0.3" resolved "https://registry.yarnpkg.com/is-glob/-/is-glob-4.0.3.tgz#64f61e42cbbb2eec2071a9dac0b28ba1e65d5084" integrity sha512-xelSayHH36ZgE7ZWhli7pW34hNbNl8Ojv5KVmkJD4hBdD3th8Tfk9vYasLM+mXWOZhFkgZfxhLSnrwRr4elSSg== @@ -881,17 +890,17 @@ is-number@^7.0.0: is-stream@^1.1.0: version "1.1.0" resolved "https://registry.yarnpkg.com/is-stream/-/is-stream-1.1.0.tgz#12d4a3dd4e68e0b79ceb8dbc84173ae80d91ca44" - integrity sha1-EtSj3U5o4Lec6428hBc66A2RykQ= + integrity sha512-uQPm8kcs47jx38atAcWTVxyltQYoPT68y9aWYdV6yWXSyW8mzSat0TL6CiWdZeCdF3KrAvpVtnHbTv4RN+rqdQ== isarray@~1.0.0: version "1.0.0" resolved "https://registry.yarnpkg.com/isarray/-/isarray-1.0.0.tgz#bb935d48582cba168c06834957a54a3e07124f11" - integrity sha1-u5NdSFgsuhaMBoNJV6VKPgcSTxE= + integrity sha512-VLghIWNM6ELQzo7zwmcg0NmTVyWKYjvIeM83yjp0wRDTmUnrM678fQbcKBo6n2CJEF0szoG//ytg+TKla89ALQ== isexe@^2.0.0: version "2.0.0" resolved "https://registry.yarnpkg.com/isexe/-/isexe-2.0.0.tgz#e8fbf374dc556ff8947a10dcb0572d633f2cfa10" - integrity sha1-6PvzdNxVb/iUehDcsFctYz8s+hA= + integrity sha512-RHxMLp9lnKHGHRng9QFhRCMbYAcVpn69smSGcq3f36xjgVVWThj4qqLbTLlq7Ssj8B+fIQ1EuCEGI2lKsyQeIw== js-yaml@^4.1.0: version "4.1.0" @@ -908,7 +917,7 @@ json-schema-traverse@^0.4.1: json-stable-stringify-without-jsonify@^1.0.1: version "1.0.1" resolved "https://registry.yarnpkg.com/json-stable-stringify-without-jsonify/-/json-stable-stringify-without-jsonify-1.0.1.tgz#9db7b59496ad3f3cfef30a75142d2d930ad72651" - integrity sha1-nbe1lJatPzz+8wp1FC0tkwrXJlE= + integrity sha512-Bdboy+l7tA3OGW6FjyFHWkP5LuByj1Tk33Ljyq0axyzdk9//JSi2u3fP1QSmd1KNwq6VOKYGlAu87CisVir6Pw== kuler@1.0.x: version "1.0.1" @@ -930,11 +939,6 @@ lodash.merge@^4.6.2: resolved "https://registry.yarnpkg.com/lodash.merge/-/lodash.merge-4.6.2.tgz#558aa53b43b661e1925a0afdfa36a9a1085fe57a" integrity sha512-0KpjqXRVvrYyCsX1swR/XTK0va6VQkQM6MNo7PqW77ByjAhoARA8EfrP1N4+KlKj8YS0ZUCtRT/YUuhyYDujIQ== -lodash.sortby@^4.7.0: - version "4.7.0" - resolved "https://registry.yarnpkg.com/lodash.sortby/-/lodash.sortby-4.7.0.tgz#edd14c824e2cc9c1e0b0a1b42bb5210516a42438" - integrity sha1-7dFMgk4sycHgsKG0K7UhBRakJDg= - lodash@4.17.15: version "4.17.15" resolved "https://registry.yarnpkg.com/lodash/-/lodash-4.17.15.tgz#b447f6670a0455bbfeedd11392eff330ea097548" @@ -946,9 +950,9 @@ lodash@^4.17.12, lodash@^4.17.14: integrity sha512-v2kDEe57lecTulaDIuNTPy3Ry4gLGJ6Z1O3vE1krgXZNrsQ+LFTGHVxVjcXPs17LhbZVGedAJv8XZ1tvj5FvSg== logform@^2.1.1, logform@^2.3.2: - version "2.4.0" - resolved "https://registry.yarnpkg.com/logform/-/logform-2.4.0.tgz#131651715a17d50f09c2a2c1a524ff1a4164bcfe" - integrity sha512-CPSJw4ftjf517EhXZGGvTHHkYobo7ZCc0kvwUoOYcjfR2UVrI66RHj8MCrfAdEitdmFqbu2BYdYs8FHHZSb6iw== + version "2.4.1" + resolved "https://registry.yarnpkg.com/logform/-/logform-2.4.1.tgz#512c9eaef738044d1c619790ba0f806c80d9d3a9" + integrity sha512-7XB/tqc3VRbri9pRjU6E97mQ8vC27ivJ3lct4jhyT+n0JNDd4YKldFl0D75NqDp46hk8RC7Ma1Vjv/UPf67S+A== dependencies: "@colors/colors" "1.5.0" fecha "^4.2.0" @@ -981,31 +985,24 @@ mimic-fn@^1.0.0: resolved "https://registry.yarnpkg.com/mimic-fn/-/mimic-fn-1.2.0.tgz#820c86a39334640e99516928bd03fca88057d022" integrity sha512-jf84uxzwiuiIVKiOLpfYk7N46TSy8ubTonmneY9vrpHNAnp0QBt2BxWV9dO3/j+BoVAb+a5G6YDPW3M5HOdMWQ== -minimatch@^3.0.4: - version "3.0.4" - resolved "https://registry.yarnpkg.com/minimatch/-/minimatch-3.0.4.tgz#5166e286457f03306064be5497e8dbb0c3d32083" - integrity sha512-yJHVQEhyqPLUTgt9B83PXu6W3rx4MvvHvSUvToogpwoGDOUQ+yDrR0HRot+yOCdCO7u4hX3pWft6kWBBcqh0UA== - dependencies: - brace-expansion "^1.1.7" - -minimatch@^3.1.2: +minimatch@^3.0.4, minimatch@^3.1.1, minimatch@^3.1.2: version "3.1.2" resolved "https://registry.yarnpkg.com/minimatch/-/minimatch-3.1.2.tgz#19cd194bfd3e428f049a70817c038d89ab4be35b" integrity sha512-J7p63hRiAjw1NDEww1W7i37+ByIrOWO5XQQAzZ3VOcL0PNybwpfmV/N05zFAzwQ9USyEcX6t3UO+K5aqBQOIHw== dependencies: brace-expansion "^1.1.7" -minimist@1.x, minimist@^1.2.0, minimist@^1.2.5: - version "1.2.5" - resolved "https://registry.yarnpkg.com/minimist/-/minimist-1.2.5.tgz#67d66014b66a6a8aaa0c083c5fd58df4e4e97602" - integrity sha512-FM9nNUYrRBAELZQT3xeZQ7fmMOBg6nWNmJKTcgsJeaLstP/UODVpGsr5OhXhhXg6f+qtJ8uiZ+PUxkDWcgIXLw== +minimist@1.x, minimist@^1.2.0, minimist@^1.2.6: + version "1.2.6" + resolved "https://registry.yarnpkg.com/minimist/-/minimist-1.2.6.tgz#8637a5b759ea0d6e98702cfb3a9283323c93af44" + integrity sha512-Jsjnk4bw3YJqYzbdyBiNsPWHPfO++UGG749Cxs6peCu5Xg4nrena6OVxOYxrQTqww0Jmwt+Ref8rggumkTLz9Q== mkdirp@^0.5.1: - version "0.5.5" - resolved "https://registry.yarnpkg.com/mkdirp/-/mkdirp-0.5.5.tgz#d91cefd62d1436ca0f41620e251288d420099def" - integrity sha512-NKmAlESf6jMGym1++R0Ra7wvhV+wFW63FaSOFPwRahvea0gMUcGUhVeAg/0BC0wiv9ih5NYPB1Wn1UEI1/L+xQ== + version "0.5.6" + resolved "https://registry.yarnpkg.com/mkdirp/-/mkdirp-0.5.6.tgz#7def03d2432dcae4ba1d611445c48396062255f6" + integrity sha512-FP+p8RB8OWpF3YZBCrP5gtADmtXApB5AMLn+vdyA+PyxCjrCs00mjyUozssO33cwDeT3wNGdLxJ5M//YqtHAJw== dependencies: - minimist "^1.2.5" + minimist "^1.2.6" ms@2.1.2: version "2.1.2" @@ -1020,12 +1017,12 @@ ms@^2.1.1: mute-stream@0.0.7: version "0.0.7" resolved "https://registry.yarnpkg.com/mute-stream/-/mute-stream-0.0.7.tgz#3075ce93bc21b8fab43e1bc4da7e8115ed1e7bab" - integrity sha1-MHXOk7whuPq0PhvE2n6BFe0ee6s= + integrity sha512-r65nCZhrbXXb6dXOACihYApHw2Q6pV0M3V0PSxd74N0+D8nzAdEAITq2oAjA1jVnKI+tGvEBUpqiMh0+rW6zDQ== natural-compare@^1.4.0: version "1.4.0" resolved "https://registry.yarnpkg.com/natural-compare/-/natural-compare-1.4.0.tgz#4abebfeed7541f2c27acfb29bdbbd15c8d5ba4f7" - integrity sha1-Sr6/7tdUHywnrPspvbvRXI1bpPc= + integrity sha512-OWND8ei3VtNC9h7V60qff3SVobHr996CTwgxubgyQYEpg290h9J0buyECNNJexkFm5sOajh5G116RYA1c8ZMSw== no-case@^3.0.4: version "3.0.4" @@ -1038,19 +1035,19 @@ no-case@^3.0.4: once@^1.3.0: version "1.4.0" resolved "https://registry.yarnpkg.com/once/-/once-1.4.0.tgz#583b1aa775961d4b113ac17d9c50baef9dd76bd1" - integrity sha1-WDsap3WWHUsROsF9nFC6753Xa9E= + integrity sha512-lNaJgI+2Q5URQBkccEKHTQOPaXdUxnZZElQTZY0MFUAuaEqe1E+Nyvgdz/aIyNi6Z9MzO5dv1H8n58/GELp3+w== dependencies: wrappy "1" one-time@0.0.4: version "0.0.4" resolved "https://registry.yarnpkg.com/one-time/-/one-time-0.0.4.tgz#f8cdf77884826fe4dff93e3a9cc37b1e4480742e" - integrity sha1-+M33eISCb+Tf+T46nMN7HkSAdC4= + integrity sha512-qAMrwuk2xLEutlASoiPiAMW3EN3K96Ka/ilSXYr6qR1zSVXw2j7+yDSqGTC4T9apfLYxM3tLLjKvgPdAUK7kYQ== onetime@^2.0.0: version "2.0.1" resolved "https://registry.yarnpkg.com/onetime/-/onetime-2.0.1.tgz#067428230fd67443b2794b22bba528b6867962d4" - integrity sha1-BnQoIw/WdEOyeUsiu6UotoZ5YtQ= + integrity sha512-oyyPpiMaKARvvcgip+JV+7zci5L8D1W9RZIz2l1o08AM3pfspitVWnPt3mzHcBPp12oYMTy0pqrFs/C+m3EwsQ== dependencies: mimic-fn "^1.0.0" @@ -1069,7 +1066,7 @@ optionator@^0.9.1: os-tmpdir@~1.0.2: version "1.0.2" resolved "https://registry.yarnpkg.com/os-tmpdir/-/os-tmpdir-1.0.2.tgz#bbe67406c79aa85c5cfec766fe5734555dfa1274" - integrity sha1-u+Z0BseaqFxc/sdm/lc0VV36EnQ= + integrity sha512-D2FR03Vir7FIu45XBY20mTb+/ZSWB00sjU9jdQXt83gDrI4Ztz5Fs7/yy74g2N5SVQY4xY1qDr4rNddwYRVX0g== param-case@^3.0.4: version "3.0.4" @@ -1097,7 +1094,7 @@ pascal-case@^3.1.2: path-is-absolute@^1.0.0: version "1.0.1" resolved "https://registry.yarnpkg.com/path-is-absolute/-/path-is-absolute-1.0.1.tgz#174b9268735534ffbc7ace6bf53a5a9e1b5c5f5f" - integrity sha1-F0uSaHNVNP+8es5r9TpanhtcX18= + integrity sha512-AVbw3UJ2e9bq64vSaS9Am0fje1Pa8pbGqTTsmXfaIiMpnr5DlDhfJOuLj9Sf95ZPVDAUerDfEk88MPmPe7UCQg== path-key@^3.1.0: version "3.1.1" @@ -1159,12 +1156,12 @@ regexpp@^3.2.0: relateurl@^0.2.7: version "0.2.7" resolved "https://registry.yarnpkg.com/relateurl/-/relateurl-0.2.7.tgz#54dbf377e51440aca90a4cd274600d3ff2d888a9" - integrity sha1-VNvzd+UUQKypCkzSdGANP/LYiKk= + integrity sha512-G08Dxvm4iDN3MLM0EsP62EDV9IuhXPR6blNz6Utcp7zyV3tr4HVNINt6MpaRWbxoOHT3Q7YN2P+jaHX8vUbgog== remove-trailing-separator@^1.0.1: version "1.1.0" resolved "https://registry.yarnpkg.com/remove-trailing-separator/-/remove-trailing-separator-1.1.0.tgz#c24bce2a283adad5bc3f58e0d48249b92379d8ef" - integrity sha1-wkvOKig62tW8P1jg1IJJuSN52O8= + integrity sha512-/hS+Y0u3aOfIETiaiirUFwDBDzmXPvO+jAfKTitUngIPzdKc6Z0LoFjM/CK5PL4C+eKwHohlHAb6H0VFfmmUsw== replace-ext@^1.0.0: version "1.0.1" @@ -1179,7 +1176,7 @@ resolve-from@^4.0.0: restore-cursor@^2.0.0: version "2.0.0" resolved "https://registry.yarnpkg.com/restore-cursor/-/restore-cursor-2.0.0.tgz#9f7ee287f82fd326d4fd162923d62129eee0dfaf" - integrity sha1-n37ih/gv0ybU/RYpI9YhKe7g368= + integrity sha512-6IzJLuGi4+R14vwagDHX+JrXmPVtPpn4mffDJ1UdR7/Edm87fl6yi8mMBIVvFtJaNTUvjughmW4hwLhRG7gC1Q== dependencies: onetime "^2.0.0" signal-exit "^3.0.2" @@ -1255,7 +1252,7 @@ signal-exit@^3.0.2: simple-swizzle@^0.2.2: version "0.2.2" resolved "https://registry.yarnpkg.com/simple-swizzle/-/simple-swizzle-0.2.2.tgz#a4da6b635ffcccca33f70d17cb92592de95e557a" - integrity sha1-pNprY1/8zMoz9w0Xy5JZLeleVXo= + integrity sha512-JA//kQgZtbuY83m+xT+tXJkmJncGMTFT+C+g2h2R9uxkYIrE2yy9sgmcLhCnw57/WSD+Eh3J97FPEDFnbXnDUg== dependencies: is-arrayish "^0.3.1" @@ -1284,24 +1281,17 @@ source-map@0.7.3: source-map@^0.5.1: version "0.5.7" resolved "https://registry.yarnpkg.com/source-map/-/source-map-0.5.7.tgz#8a039d2d1021d22d1ea14c80d8ea468ba2ef3fcc" - integrity sha1-igOdLRAh0i0eoUyA2OpGi6LvP8w= + integrity sha512-LbrmJOMUSdEVxIKvdcJzQC+nQhe8FUZQTXQy6+I75skNgn3OoQ0DZA8YnFa7gp8tqtL3KPf1kmo0R5DoApeSGQ== source-map@^0.6.0, source-map@~0.6.0: version "0.6.1" resolved "https://registry.yarnpkg.com/source-map/-/source-map-0.6.1.tgz#74722af32e9614e9c287a8d0bbde48b5e2f1a263" integrity sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g== -source-map@~0.8.0-beta.0: - version "0.8.0-beta.0" - resolved "https://registry.yarnpkg.com/source-map/-/source-map-0.8.0-beta.0.tgz#d4c1bb42c3f7ee925f005927ba10709e0d1d1f11" - integrity sha512-2ymg6oRBpebeZi9UUNsgQ89bhx01TcTkmNTGnNO88imTmbSgy4nfujrgVEFKWpMTEGA11EDkTt7mqObTPdigIA== - dependencies: - whatwg-url "^7.0.0" - stack-trace@0.0.x: version "0.0.10" resolved "https://registry.yarnpkg.com/stack-trace/-/stack-trace-0.0.10.tgz#547c70b347e8d32b4e108ea1a2a159e5fdde19c0" - integrity sha1-VHxws0fo0ytOEI6hoqFZ5f3eGcA= + integrity sha512-KGzahc7puUKkzyMt+IqAep+TVNbKP+k2Lmwhub39m1AsTSkaDutx56aDCo+HLDzf/D26BIHTJWNiTG1KAJiQCg== string-width@^2.1.0: version "2.1.1" @@ -1346,7 +1336,7 @@ string_decoder@~1.1.1: strip-ansi@^4.0.0: version "4.0.0" resolved "https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-4.0.0.tgz#a8479022eb1ac368a871389b635262c505ee368f" - integrity sha1-qEeQIusaw2iocTibY1JixQXuNo8= + integrity sha512-4XaJ2zQdCzROZDivEVIDPkcQn8LMFSa8kj8Gxb/Lnwzv9A8VctNZ+lfivC/sV3ivW8ElJTERXZoPBRrZKkNKow== dependencies: ansi-regex "^3.0.0" @@ -1357,14 +1347,7 @@ strip-ansi@^5.1.0: dependencies: ansi-regex "^4.1.0" -strip-ansi@^6.0.0: - version "6.0.0" - resolved "https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-6.0.0.tgz#0b1571dd7669ccd4f3e06e14ef1eed26225ae532" - integrity sha512-AuvKTrTfQNYNIctbR1K/YGTR1756GycPsg7b9bdV9Duqur4gv6aKqHXah67Z8ImS7WEz5QVcOtlfW2rZEugt6w== - dependencies: - ansi-regex "^5.0.0" - -strip-ansi@^6.0.1: +strip-ansi@^6.0.0, strip-ansi@^6.0.1: version "6.0.1" resolved "https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-6.0.1.tgz#9e26c63d30f53443e9489495b2105d37b67a85d9" integrity sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A== @@ -1413,13 +1396,13 @@ tabtab@^3.0.2: untildify "^3.0.3" terser@^5.10.0: - version "5.13.1" - resolved "https://registry.yarnpkg.com/terser/-/terser-5.13.1.tgz#66332cdc5a01b04a224c9fad449fc1a18eaa1799" - integrity sha512-hn4WKOfwnwbYfe48NgrQjqNOH9jzLqRcIfbYytOXCOv46LBfWr9bDS17MQqOi+BWGD0sJK3Sj5NC/gJjiojaoA== + version "5.14.1" + resolved "https://registry.yarnpkg.com/terser/-/terser-5.14.1.tgz#7c95eec36436cb11cf1902cc79ac564741d19eca" + integrity sha512-+ahUAE+iheqBTDxXhTisdA8hgvbEG1hHOQ9xmNjeUJSoi6DU/gMrKNcfZjHkyY6Alnuyc+ikYJaxxfHkT3+WuQ== dependencies: + "@jridgewell/source-map" "^0.3.2" acorn "^8.5.0" commander "^2.20.0" - source-map "~0.8.0-beta.0" source-map-support "~0.5.20" text-hex@1.0.x: @@ -1430,12 +1413,12 @@ text-hex@1.0.x: text-table@^0.2.0: version "0.2.0" resolved "https://registry.yarnpkg.com/text-table/-/text-table-0.2.0.tgz#7f5ee823ae805207c00af2df4a84ec3fcfa570b4" - integrity sha1-f17oI66AUgfACvLfSoTsP8+lcLQ= + integrity sha512-N+8UisAXDGk8PFXP4HAzVR9nbfmVJ3zYLAWiTIoqC5v5isinhr+r5uaO8+7r3BMfuNIufIsA7RdpVgacC2cSpw== through@^2.3.6: version "2.3.8" resolved "https://registry.yarnpkg.com/through/-/through-2.3.8.tgz#0dd4c9ffaabc357960b1b724115d7e0e86a2e1f5" - integrity sha1-DdTJ/6q8NXlgsbckEV1+Doai4fU= + integrity sha512-w89qg7PI8wAdvX60bMDP+bFoD5Dvhm9oLheFp5O4a2QF0cSBGsBX4qZmadPMvVqlLJBBci+WqGGOAPvcDeNSVg== tmp@^0.0.33: version "0.0.33" @@ -1451,13 +1434,6 @@ to-regex-range@^5.0.1: dependencies: is-number "^7.0.0" -tr46@^1.0.1: - version "1.0.1" - resolved "https://registry.yarnpkg.com/tr46/-/tr46-1.0.1.tgz#a8b13fd6bfd2489519674ccde55ba3693b706d09" - integrity sha1-qLE/1r/SSJUZZ0zN5VujaTtwbQk= - dependencies: - punycode "^2.1.0" - triple-beam@^1.3.0: version "1.3.0" resolved "https://registry.yarnpkg.com/triple-beam/-/triple-beam-1.3.0.tgz#a595214c7298db8339eeeee083e4d10bd8cb8dd9" @@ -1469,9 +1445,9 @@ tslib@^1.9.0: integrity sha512-Xni35NKzjgMrwevysHTCArtLDpPvye8zV/0E4EyYn43P7/7qvQwPh9BGkHewbMulVntbigmcT7rdX3BNo9wRJg== tslib@^2.0.3: - version "2.3.0" - resolved "https://registry.yarnpkg.com/tslib/-/tslib-2.3.0.tgz#803b8cdab3e12ba581a4ca41c8839bbb0dacb09e" - integrity sha512-N82ooyxVNm6h1riLCoyS9e3fuJ3AMG2zIZs2Gd1ATcSFjSA23Q0fzjjZeh0jbJvWVDZ0cJT8yaNNaaXHzueNjg== + version "2.4.0" + resolved "https://registry.yarnpkg.com/tslib/-/tslib-2.4.0.tgz#7cecaa7f073ce680a05847aa77be941098f36dc3" + integrity sha512-d6xOpEDfsi2CZVlPQzGeux8XMwLT9hssAsaPYExaQMuYskwb+x1x7J371tWlbBdWHroy99KnVB6qIkUbs5X3UQ== type-check@^0.4.0, type-check@~0.4.0: version "0.4.0" @@ -1500,7 +1476,7 @@ uri-js@^4.2.2: util-deprecate@^1.0.1, util-deprecate@~1.0.1: version "1.0.2" resolved "https://registry.yarnpkg.com/util-deprecate/-/util-deprecate-1.0.2.tgz#450d4dc9fa70de732762fbd2d4a28981419a0ccf" - integrity sha1-RQ1Nyfpw3nMnYvvS1KKJgUGaDM8= + integrity sha512-EPD5q1uXyFxJpCrLnCc1nHnq3gOa6DZBocAIiI2TaSCA7VCJ1UJDMagCzIkXNsUYfD1daK//LTEQ8xiIbrHtcw== v8-compile-cache@^2.0.3: version "2.3.0" @@ -1510,7 +1486,7 @@ v8-compile-cache@^2.0.3: vinyl-sourcemaps-apply@^0.2.0: version "0.2.1" resolved "https://registry.yarnpkg.com/vinyl-sourcemaps-apply/-/vinyl-sourcemaps-apply-0.2.1.tgz#ab6549d61d172c2b1b87be5c508d239c8ef87705" - integrity sha1-q2VJ1h0XLCsbh75cUI0jnI74dwU= + integrity sha512-+oDh3KYZBoZC8hfocrbrxbLUeaYtQK7J5WU5Br9VqWqmCll3tFJqKp97GC9GmMsVIL0qnx2DgEDVxdo5EZ5sSw== dependencies: source-map "^0.5.1" @@ -1531,20 +1507,6 @@ wasm2c@1.0.0: resolved "https://registry.yarnpkg.com/wasm2c/-/wasm2c-1.0.0.tgz#761671e141c46b8a7c6c54429db1e6bfa3cd0ec0" integrity sha512-4SIESF2JNxrry6XFa/UQcsQibn+bxPkQ/oqixiXz2o8fsMl8J4vtvhH/evgbi8vZajAlaukuihEcQTWb9tVLUA== -webidl-conversions@^4.0.2: - version "4.0.2" - resolved "https://registry.yarnpkg.com/webidl-conversions/-/webidl-conversions-4.0.2.tgz#a855980b1f0b6b359ba1d5d9fb39ae941faa63ad" - integrity sha512-YQ+BmxuTgd6UXZW3+ICGfyqRyHXVlD5GtQr5+qjiNW7bF0cqrzX500HVXPBOvgXb5YnzDd+h0zqyv61KUD7+Sg== - -whatwg-url@^7.0.0: - version "7.1.0" - resolved "https://registry.yarnpkg.com/whatwg-url/-/whatwg-url-7.1.0.tgz#c2c492f1eca612988efd3d2266be1b9fc6170d06" - integrity sha512-WUu7Rg1DroM7oQvGWfOiAK21n74Gg+T4elXEQYkOhtyLeWiJFoOGLXPKI/9gzIie9CtwVLm8wtw6YJdKyxSjeg== - dependencies: - lodash.sortby "^4.7.0" - tr46 "^1.0.1" - webidl-conversions "^4.0.2" - which@^2.0.1: version "2.0.2" resolved "https://registry.yarnpkg.com/which/-/which-2.0.2.tgz#7c6a8dd0a636a0327e10b59c9286eee93f3f51b1" @@ -1593,9 +1555,9 @@ wrap-ansi@^6.2.0: wrappy@1: version "1.0.2" resolved "https://registry.yarnpkg.com/wrappy/-/wrappy-1.0.2.tgz#b5243d8f3ec1aa35f1364605bc0d1036e30ab69f" - integrity sha1-tSQ9jz7BqjXxNkYFvA0QNuMKtp8= + integrity sha512-l4Sp/DRseor9wL6EvV2+TuQn63dMkPjZ/sp9XkghTEbV9KlPS1xUsZ3u7/IQO4wxtcFB4bgpQPRcR3QCvezPcQ== -ws@^8.5.0: - version "8.6.0" - resolved "https://registry.yarnpkg.com/ws/-/ws-8.6.0.tgz#e5e9f1d9e7ff88083d0c0dd8281ea662a42c9c23" - integrity sha512-AzmM3aH3gk0aX7/rZLYvjdvZooofDu3fFOzGqcSnQ1tOcTWwhM/o+q++E8mAyVVIyUdajrkzWUGftaVSDLn1bw== +ws@^8.6.0: + version "8.8.0" + resolved "https://registry.yarnpkg.com/ws/-/ws-8.8.0.tgz#8e71c75e2f6348dbf8d78005107297056cb77769" + integrity sha512-JDAgSYQ1ksuwqfChJusw1LSJ8BizJ2e/vVu5Lxjq3YvNJNlROv1ui4i+c/kUUrPheBvQl4c5UbERhTwKa6QBJQ== diff --git a/pkgs/development/compilers/emscripten/yarn.nix b/pkgs/development/compilers/emscripten/yarn.nix index 96229c5f689fd..d22d1c7d615b5 100644 --- a/pkgs/development/compilers/emscripten/yarn.nix +++ b/pkgs/development/compilers/emscripten/yarn.nix @@ -18,11 +18,11 @@ }; } { - name = "_eslint_eslintrc___eslintrc_1.2.3.tgz"; + name = "_eslint_eslintrc___eslintrc_1.3.0.tgz"; path = fetchurl { - name = "_eslint_eslintrc___eslintrc_1.2.3.tgz"; - url = "https://registry.yarnpkg.com/@eslint/eslintrc/-/eslintrc-1.2.3.tgz"; - sha512 = "uGo44hIwoLGNyduRpjdEpovcbMdd+Nv7amtmJxnKmI8xj6yd5LncmSwDa5NgX/41lIFJtkjD6YdVfgEzPfJ5UA=="; + name = "_eslint_eslintrc___eslintrc_1.3.0.tgz"; + url = "https://registry.yarnpkg.com/@eslint/eslintrc/-/eslintrc-1.3.0.tgz"; + sha512 = "UWW0TMTmk2d7hLcWD1/e2g5HDM/HQ3csaLSqXCfqwh4uNDuNqlaKWXmEsL4Cs41Z0KnILNvwbHAah3C2yt06kw=="; }; } { @@ -42,6 +42,54 @@ }; } { + name = "_jridgewell_gen_mapping___gen_mapping_0.3.1.tgz"; + path = fetchurl { + name = "_jridgewell_gen_mapping___gen_mapping_0.3.1.tgz"; + url = "https://registry.yarnpkg.com/@jridgewell/gen-mapping/-/gen-mapping-0.3.1.tgz"; + sha512 = "GcHwniMlA2z+WFPWuY8lp3fsza0I8xPFMWL5+n8LYyP6PSvPrXf4+n8stDHZY2DM0zy9sVkRDy1jDI4XGzYVqg=="; + }; + } + { + name = "_jridgewell_resolve_uri___resolve_uri_3.0.7.tgz"; + path = fetchurl { + name = "_jridgewell_resolve_uri___resolve_uri_3.0.7.tgz"; + url = "https://registry.yarnpkg.com/@jridgewell/resolve-uri/-/resolve-uri-3.0.7.tgz"; + sha512 = "8cXDaBBHOr2pQ7j77Y6Vp5VDT2sIqWyWQ56TjEq4ih/a4iST3dItRe8Q9fp0rrIl9DoKhWQtUQz/YpOxLkXbNA=="; + }; + } + { + name = "_jridgewell_set_array___set_array_1.1.1.tgz"; + path = fetchurl { + name = "_jridgewell_set_array___set_array_1.1.1.tgz"; + url = "https://registry.yarnpkg.com/@jridgewell/set-array/-/set-array-1.1.1.tgz"; + sha512 = "Ct5MqZkLGEXTVmQYbGtx9SVqD2fqwvdubdps5D3djjAkgkKwT918VNOz65pEHFaYTeWcukmJmH5SwsA9Tn2ObQ=="; + }; + } + { + name = "_jridgewell_source_map___source_map_0.3.2.tgz"; + path = fetchurl { + name = "_jridgewell_source_map___source_map_0.3.2.tgz"; + url = "https://registry.yarnpkg.com/@jridgewell/source-map/-/source-map-0.3.2.tgz"; + sha512 = "m7O9o2uR8k2ObDysZYzdfhb08VuEml5oWGiosa1VdaPZ/A6QyPkAJuwN0Q1lhULOf6B7MtQmHENS743hWtCrgw=="; + }; + } + { + name = "_jridgewell_sourcemap_codec___sourcemap_codec_1.4.13.tgz"; + path = fetchurl { + name = "_jridgewell_sourcemap_codec___sourcemap_codec_1.4.13.tgz"; + url = "https://registry.yarnpkg.com/@jridgewell/sourcemap-codec/-/sourcemap-codec-1.4.13.tgz"; + sha512 = "GryiOJmNcWbovBxTfZSF71V/mXbgcV3MewDe3kIMCLyIh5e7SKAeUZs+rMnJ8jkMolZ/4/VsdBmMrw3l+VdZ3w=="; + }; + } + { + name = "_jridgewell_trace_mapping___trace_mapping_0.3.13.tgz"; + path = fetchurl { + name = "_jridgewell_trace_mapping___trace_mapping_0.3.13.tgz"; + url = "https://registry.yarnpkg.com/@jridgewell/trace-mapping/-/trace-mapping-0.3.13.tgz"; + sha512 = "o1xbKhp9qnIAoHJSWd6KlCZfqslL4valSF81H8ImioOAxluWYWOpWkpyktY2vnt4tbrX9XYaxovq6cgowaJp2w=="; + }; + } + { name = "_nodelib_fs.scandir___fs.scandir_2.1.5.tgz"; path = fetchurl { name = "_nodelib_fs.scandir___fs.scandir_2.1.5.tgz"; @@ -90,11 +138,11 @@ }; } { - name = "_types_node___node_17.0.32.tgz"; + name = "_types_node___node_18.0.0.tgz"; path = fetchurl { - name = "_types_node___node_17.0.32.tgz"; - url = "https://registry.yarnpkg.com/@types/node/-/node-17.0.32.tgz"; - sha512 = "eAIcfAvhf/BkHcf4pkLJ7ECpBAhh9kcxRBpip9cTiO+hf+aJrsxYxBeS6OXvOd9WqNAJmavXVpZvY1rBjNsXmw=="; + name = "_types_node___node_18.0.0.tgz"; + url = "https://registry.yarnpkg.com/@types/node/-/node-18.0.0.tgz"; + sha512 = "cHlGmko4gWLVI27cGJntjs/Sj8th9aYwplmZFwmmgYQQvL5NUsgVJG7OddLvNfLqYS31KFN0s3qlaD9qCaxACA=="; }; } { @@ -162,11 +210,11 @@ }; } { - name = "ansi_regex___ansi_regex_3.0.0.tgz"; + name = "ansi_regex___ansi_regex_3.0.1.tgz"; path = fetchurl { - name = "ansi_regex___ansi_regex_3.0.0.tgz"; - url = "https://registry.yarnpkg.com/ansi-regex/-/ansi-regex-3.0.0.tgz"; - sha1 = "7QMXwyIGT3lGbAKWa922Bas32Zg="; + name = "ansi_regex___ansi_regex_3.0.1.tgz"; + url = "https://registry.yarnpkg.com/ansi-regex/-/ansi-regex-3.0.1.tgz"; + sha512 = "+O9Jct8wf++lXxxFc4hc8LsjaSq0HFzzL7cVsw8pRDIPdjKD2mT4ytDZlLuSBZ4cLKZFXIrMGO7DbQCtMJJMKw=="; }; } { @@ -178,14 +226,6 @@ }; } { - name = "ansi_regex___ansi_regex_5.0.0.tgz"; - path = fetchurl { - name = "ansi_regex___ansi_regex_5.0.0.tgz"; - url = "https://registry.yarnpkg.com/ansi-regex/-/ansi-regex-5.0.0.tgz"; - sha512 = "bY6fj56OUQ0hU1KjFNDQuJFezqKdrAyFdIevADiqrWHwSlbmBNMHp5ak2f40Pm8JTFyM2mqxkG6ngkHO11f/lg=="; - }; - } - { name = "ansi_regex___ansi_regex_5.0.1.tgz"; path = fetchurl { name = "ansi_regex___ansi_regex_5.0.1.tgz"; @@ -258,11 +298,11 @@ }; } { - name = "buffer_from___buffer_from_1.1.1.tgz"; + name = "buffer_from___buffer_from_1.1.2.tgz"; path = fetchurl { - name = "buffer_from___buffer_from_1.1.1.tgz"; - url = "https://registry.yarnpkg.com/buffer-from/-/buffer-from-1.1.1.tgz"; - sha512 = "MQcXEUbCKtEo7bhqEs6560Hyd4XaovZlO/k9V3hjVUF/zwW7KBVdSK4gIt/bzwS9MbR5qob+F5jusZsb0YQK2A=="; + name = "buffer_from___buffer_from_1.1.2.tgz"; + url = "https://registry.yarnpkg.com/buffer-from/-/buffer-from-1.1.2.tgz"; + sha512 = "E+XQCRwSbaaiChtv6k6Dwgc+bx+Bs6vuKJHHl5kox/BaKbhiXzqQOwK4cO22yElGp2OCmjwVhT3HmxgyPGnJfQ=="; }; } { @@ -298,11 +338,11 @@ }; } { - name = "chalk___chalk_4.1.1.tgz"; + name = "chalk___chalk_4.1.2.tgz"; path = fetchurl { - name = "chalk___chalk_4.1.1.tgz"; - url = "https://registry.yarnpkg.com/chalk/-/chalk-4.1.1.tgz"; - sha512 = "diHzdDKxcU+bAsUboHLPEDQiw0qEe0qd7SYUn3HgcFlWgbDcfLGswOHYeGrHKzG9z6UYf01d9VFMfZxPM1xZSg=="; + name = "chalk___chalk_4.1.2.tgz"; + url = "https://registry.yarnpkg.com/chalk/-/chalk-4.1.2.tgz"; + sha512 = "oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA=="; }; } { @@ -326,7 +366,7 @@ path = fetchurl { name = "cli_cursor___cli_cursor_2.1.0.tgz"; url = "https://registry.yarnpkg.com/cli-cursor/-/cli-cursor-2.1.0.tgz"; - sha1 = "s12sN2R5+sw+lHR9QdDQ9SOP/LU="; + sha512 = "8lgKz8LmCRYZZQDpRyT2m5rKJ08TnU4tR9FFFW2rxpxR1FzWi4PQ/NfyODchAatHaUgnSPVcx/R5w6NuTBzFiw=="; }; } { @@ -342,7 +382,7 @@ path = fetchurl { name = "clone_buffer___clone_buffer_1.0.0.tgz"; url = "https://registry.yarnpkg.com/clone-buffer/-/clone-buffer-1.0.0.tgz"; - sha1 = "4+JbIHrE5wGvch4staFnksrD3Fg="; + sha512 = "KLLTJWrvwIP+OPfMn0x2PheDEP20RPUcGXj/ERegTgdmPEZylALQldygiqrPPu8P45uNuPs7ckmReLY6v/iA5g=="; }; } { @@ -350,7 +390,7 @@ path = fetchurl { name = "clone_stats___clone_stats_1.0.0.tgz"; url = "https://registry.yarnpkg.com/clone-stats/-/clone-stats-1.0.0.tgz"; - sha1 = "s3gt/4u1R04Yuba/D9/ngvh3doA="; + sha512 = "au6ydSpg6nsrigcZ4m8Bc9hxjeW+GJ8xh5G3BJCMt4WXe1H10UNaVOamqQTmrx1kjVuxAHIQSNU6hY4Nsn9/ag=="; }; } { @@ -358,7 +398,7 @@ path = fetchurl { name = "clone___clone_2.1.2.tgz"; url = "https://registry.yarnpkg.com/clone/-/clone-2.1.2.tgz"; - sha1 = "G39Ln1kfHo+DZwQBYANFoCiHQ18="; + sha512 = "3Pe/CF1Nn94hyhIYpjtiLhdCoEoz0DqQ+988E9gmeEdQZlojxnOb74wctFyuwWQHzqyf9X7C7MG8juUpqBJT8w=="; }; } { @@ -390,7 +430,7 @@ path = fetchurl { name = "color_name___color_name_1.1.3.tgz"; url = "https://registry.yarnpkg.com/color-name/-/color-name-1.1.3.tgz"; - sha1 = "p9BVi9icQveV3UIyj3QIMcpTvCU="; + sha512 = "72fSenhMw2HZMTVHeCA9KCmpEIbzWiQsjN+BHcBbS9vr1mtt+vJjPdksIBNUmKAW8TFUDPJK5SUU3QhE9NEXDw=="; }; } { @@ -422,7 +462,7 @@ path = fetchurl { name = "colornames___colornames_1.1.1.tgz"; url = "https://registry.yarnpkg.com/colornames/-/colornames-1.1.1.tgz"; - sha1 = "+IiQMGhcfE/54qVZ9Qd+t2qBb5Y="; + sha512 = "/pyV40IrsdulWv+wFPmERh9k/mjsPZ64yUMDmWrtj/k1nmgrzzIENWKdaVKyBbvFdQWqkcaRxr+polCo3VMe7A=="; }; } { @@ -454,15 +494,15 @@ path = fetchurl { name = "concat_map___concat_map_0.0.1.tgz"; url = "https://registry.yarnpkg.com/concat-map/-/concat-map-0.0.1.tgz"; - sha1 = "2Klr13/Wjfd5OnMDajug1UBdR3s="; + sha512 = "/Srv4dswyQNBfohGpz9o6Yb3Gz3SrUDqBH5rTuhGR7ahtlbYKnVxw2bCFMRljaA7EXHaXZ8wsHdodFvbkhKmqg=="; }; } { - name = "core_util_is___core_util_is_1.0.2.tgz"; + name = "core_util_is___core_util_is_1.0.3.tgz"; path = fetchurl { - name = "core_util_is___core_util_is_1.0.2.tgz"; - url = "https://registry.yarnpkg.com/core-util-is/-/core-util-is-1.0.2.tgz"; - sha1 = "tf1UIgqivFq1eqtxQMlAdUUDwac="; + name = "core_util_is___core_util_is_1.0.3.tgz"; + url = "https://registry.yarnpkg.com/core-util-is/-/core-util-is-1.0.3.tgz"; + sha512 = "ZQBvi1DcpJ4GDqanjucZ2Hj3wEO5pZDS89BWbkcrvdxksJorwUDDZamX9ldFkp9aw2lmBDLgkObEA4DWNJ9FYQ=="; }; } { @@ -474,14 +514,6 @@ }; } { - name = "debug___debug_4.3.1.tgz"; - path = fetchurl { - name = "debug___debug_4.3.1.tgz"; - url = "https://registry.yarnpkg.com/debug/-/debug-4.3.1.tgz"; - sha512 = "doEwdvm4PCeK4K3RQN2ZC2BYUBaxwLARCqZmMjtF8a51J2Rb0xpVloFRnCODwqjpwnAoao4pelN8l3RJdv3gRQ=="; - }; - } - { name = "debug___debug_4.3.4.tgz"; path = fetchurl { name = "debug___debug_4.3.4.tgz"; @@ -490,11 +522,11 @@ }; } { - name = "deep_is___deep_is_0.1.3.tgz"; + name = "deep_is___deep_is_0.1.4.tgz"; path = fetchurl { - name = "deep_is___deep_is_0.1.3.tgz"; - url = "https://registry.yarnpkg.com/deep-is/-/deep-is-0.1.3.tgz"; - sha1 = "s2nW+128E+7PUk+RsHD+7cNXzzQ="; + name = "deep_is___deep_is_0.1.4.tgz"; + url = "https://registry.yarnpkg.com/deep-is/-/deep-is-0.1.4.tgz"; + sha512 = "oIPzksmTg4/MriiaYGO+okXDT7ztn/w3Eptv/+gSIdMdKsJo0u4CfYNFJPy+4SKMuCqGw2wxnA+URMg3t8a/bQ=="; }; } { @@ -542,7 +574,7 @@ path = fetchurl { name = "enabled___enabled_1.0.2.tgz"; url = "https://registry.yarnpkg.com/enabled/-/enabled-1.0.2.tgz"; - sha1 = "ll9lE9LC0cX0ZStkouM5ZGf8L5M="; + sha512 = "nnzgVSpB35qKrUN8358SjO1bYAmxoThECTWw9s3J0x5G8A9hokKHVDFzBjVpCoSryo6MhN8woVyascN5jheaNA=="; }; } { @@ -574,7 +606,7 @@ path = fetchurl { name = "escape_string_regexp___escape_string_regexp_1.0.5.tgz"; url = "https://registry.yarnpkg.com/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz"; - sha1 = "G2HAViGQqN/2rjuyzwIAyhMLhtQ="; + sha512 = "vbRorB5FUQWvla16U8R/qgaFIya2qGzwDrNmCZuYKrbdSUMG6I1ZCGQRefkRVhuOkIGVne7BQ35DSfo1qvJqFg=="; }; } { @@ -626,11 +658,11 @@ }; } { - name = "eslint___eslint_8.15.0.tgz"; + name = "eslint___eslint_8.18.0.tgz"; path = fetchurl { - name = "eslint___eslint_8.15.0.tgz"; - url = "https://registry.yarnpkg.com/eslint/-/eslint-8.15.0.tgz"; - sha512 = "GG5USZ1jhCu8HJkzGgeK8/+RGnHaNYZGrGDzUtigK3BsGESW/rs2az23XqE0WVwDxy1VRvvjSSGu5nB0Bu+6SA=="; + name = "eslint___eslint_8.18.0.tgz"; + url = "https://registry.yarnpkg.com/eslint/-/eslint-8.18.0.tgz"; + sha512 = "As1EfFMVk7Xc6/CvhssHUjsAQSkpfXvUGMFC3ce8JDe6WvqCgRrLOBQbVpsBFr1X1V+RACOadnzVvcUS5ni2bA=="; }; } { @@ -658,11 +690,11 @@ }; } { - name = "estraverse___estraverse_5.2.0.tgz"; + name = "estraverse___estraverse_5.3.0.tgz"; path = fetchurl { - name = "estraverse___estraverse_5.2.0.tgz"; - url = "https://registry.yarnpkg.com/estraverse/-/estraverse-5.2.0.tgz"; - sha512 = "BxbNGGNm0RyRYvUdHpIwv9IWzeM9XClbOxwoATuFdOE7ZE6wHL+HQ5T8hoPM+zHvmKzzsEqhgy0GrQ5X13afiQ=="; + name = "estraverse___estraverse_5.3.0.tgz"; + url = "https://registry.yarnpkg.com/estraverse/-/estraverse-5.3.0.tgz"; + sha512 = "MMdARuVEQziNTeJD8DgMqmhwR11BRQ/cBP+pLtYdSTnf3MIO8fFeiINEbX36ZdNlfU/7A9f3gUw49B3oQsvwBA=="; }; } { @@ -710,7 +742,7 @@ path = fetchurl { name = "fast_levenshtein___fast_levenshtein_2.0.6.tgz"; url = "https://registry.yarnpkg.com/fast-levenshtein/-/fast-levenshtein-2.0.6.tgz"; - sha1 = "PYpcZog6FqMMqGQ+hR8Zuqd5eRc="; + sha512 = "DCXu6Ifhqcks7TZKY3Hxp3y6qphY5SJZmrWMDrKcERSOXWQdMhU9Ig/PYrzyw/ul9jOIyh0N4M0tbC5hodg8dw=="; }; } { @@ -734,7 +766,7 @@ path = fetchurl { name = "figures___figures_2.0.0.tgz"; url = "https://registry.yarnpkg.com/figures/-/figures-2.0.0.tgz"; - sha1 = "OrGi0qYsi/tDGgyUy3l6L84nyWI="; + sha512 = "Oa2M9atig69ZkfwiApY8F2Yy+tzMbazyvqv21R0NsSC8floSOC09BbT1ITWAdoMGQvJ/aZnR1KMwdx9tvHnTNA=="; }; } { @@ -762,11 +794,11 @@ }; } { - name = "flatted___flatted_3.1.1.tgz"; + name = "flatted___flatted_3.2.5.tgz"; path = fetchurl { - name = "flatted___flatted_3.1.1.tgz"; - url = "https://registry.yarnpkg.com/flatted/-/flatted-3.1.1.tgz"; - sha512 = "zAoAQiudy+r5SvnSw3KJy5os/oRJYHzrzja/tBDqrZtNhUw8bt6y8OBzMWcjWr+8liV8Eb6yOhw8WZ7VFZ5ZzA=="; + name = "flatted___flatted_3.2.5.tgz"; + url = "https://registry.yarnpkg.com/flatted/-/flatted-3.2.5.tgz"; + sha512 = "WIWGi2L3DyTUvUrwRKgGi9TwxQMUEqPOPQBVi71R96jZXJdFskXEmf54BoZaS1kknGODoIGASGEzBUYdyMCBJg=="; }; } { @@ -774,7 +806,7 @@ path = fetchurl { name = "fs.realpath___fs.realpath_1.0.0.tgz"; url = "https://registry.yarnpkg.com/fs.realpath/-/fs.realpath-1.0.0.tgz"; - sha1 = "FQStJSMVjKpA20onh8sBQRmU6k8="; + sha512 = "OO0pH2lK6a0hZnAdau5ItzHPI6pUlvI7jMVnxUQRtw4owF2wk8lOSabtGDCTP4Ggrg2MbGnWO9X8K1t4+fGMDw=="; }; } { @@ -782,7 +814,7 @@ path = fetchurl { name = "functional_red_black_tree___functional_red_black_tree_1.0.1.tgz"; url = "https://registry.yarnpkg.com/functional-red-black-tree/-/functional-red-black-tree-1.0.1.tgz"; - sha1 = "GwqzvVU7Kg1jmdKcDj6gslIHgyc="; + sha512 = "dsKNQNdj6xA3T+QlADDA7mOSlX0qiMINjn0cgr+eGHGsbSHzTabcIogz2+p/iqP1Xs6EP/sS2SbqH+brGTbq0g=="; }; } { @@ -802,67 +834,59 @@ }; } { - name = "glob___glob_7.1.7.tgz"; - path = fetchurl { - name = "glob___glob_7.1.7.tgz"; - url = "https://registry.yarnpkg.com/glob/-/glob-7.1.7.tgz"; - sha512 = "OvD9ENzPLbegENnYP5UUfJIirTg4+XwMWGaQfQTY0JenxNvvIKP3U3/tAQSPIu/lHxXYSZmpXlUHeqAIdKzBLQ=="; - }; - } - { - name = "glob___glob_7.2.0.tgz"; + name = "glob___glob_7.2.3.tgz"; path = fetchurl { - name = "glob___glob_7.2.0.tgz"; - url = "https://registry.yarnpkg.com/glob/-/glob-7.2.0.tgz"; - sha512 = "lmLf6gtyrPq8tTjSmrO94wBeQbFR3HbLHbuyD69wuyQkImp2hWqMGB47OX65FBkPffO641IP9jWa1z4ivqG26Q=="; + name = "glob___glob_7.2.3.tgz"; + url = "https://registry.yarnpkg.com/glob/-/glob-7.2.3.tgz"; + sha512 = "nFR0zLpU2YCaRxwoCJvL6UvCH2JFyFVIvwTLsIf21AuHlMskA1hhTdk+LlYJtOlYt9v6dvszD2BGRqBL+iQK9Q=="; }; } { - name = "globals___globals_13.9.0.tgz"; + name = "globals___globals_13.15.0.tgz"; path = fetchurl { - name = "globals___globals_13.9.0.tgz"; - url = "https://registry.yarnpkg.com/globals/-/globals-13.9.0.tgz"; - sha512 = "74/FduwI/JaIrr1H8e71UbDE+5x7pIPs1C2rrwC52SszOo043CsWOZEMW7o2Y58xwm9b+0RBKDxY5n2sUpEFxA=="; + name = "globals___globals_13.15.0.tgz"; + url = "https://registry.yarnpkg.com/globals/-/globals-13.15.0.tgz"; + sha512 = "bpzcOlgDhMG070Av0Vy5Owklpv1I6+j96GhUI7Rh7IzDCKLzboflLrrfqMu8NquDbiR4EOQk7XzJwqVJxicxog=="; }; } { - name = "google_closure_compiler_java___google_closure_compiler_java_20220104.0.0.tgz"; + name = "google_closure_compiler_java___google_closure_compiler_java_20220502.0.0.tgz"; path = fetchurl { - name = "google_closure_compiler_java___google_closure_compiler_java_20220104.0.0.tgz"; - url = "https://registry.yarnpkg.com/google-closure-compiler-java/-/google-closure-compiler-java-20220104.0.0.tgz"; - sha512 = "cnxEfms548+whhdtIT5MLNVfHcXasYmsUGpyrdLDX+0xR4t+oJBT7RI/O7qOusoqXdW6lwAIT2jbFI8Irk6eVQ=="; + name = "google_closure_compiler_java___google_closure_compiler_java_20220502.0.0.tgz"; + url = "https://registry.yarnpkg.com/google-closure-compiler-java/-/google-closure-compiler-java-20220502.0.0.tgz"; + sha512 = "XDXw1v+1zcNHuEUXQg24eD9MUF2XTHnEDKCwF0P0zQe+8TWQajKvjsekdJnO6JH/Lqcu8XKc7dxO5+SMijr0sw=="; }; } { - name = "google_closure_compiler_linux___google_closure_compiler_linux_20220104.0.0.tgz"; + name = "google_closure_compiler_linux___google_closure_compiler_linux_20220502.0.0.tgz"; path = fetchurl { - name = "google_closure_compiler_linux___google_closure_compiler_linux_20220104.0.0.tgz"; - url = "https://registry.yarnpkg.com/google-closure-compiler-linux/-/google-closure-compiler-linux-20220104.0.0.tgz"; - sha512 = "3la7sjrcKHlQc8piP+nzsZmFQFYV/4DtxFcpjq+Re81+vYmE9NWUZ21xgp6OZ7ygZhVLEWQqGlZqJls45HS0rA=="; + name = "google_closure_compiler_linux___google_closure_compiler_linux_20220502.0.0.tgz"; + url = "https://registry.yarnpkg.com/google-closure-compiler-linux/-/google-closure-compiler-linux-20220502.0.0.tgz"; + sha512 = "T+2p/Qj02yGZHxymhj1oZsiHudNvI9sQKfCLoIH0wi0ikDiVIOh/dsH+57lsaGDJ+XTP/ur5Ozl8GIOjv1Efrw=="; }; } { - name = "google_closure_compiler_osx___google_closure_compiler_osx_20220104.0.0.tgz"; + name = "google_closure_compiler_osx___google_closure_compiler_osx_20220502.0.0.tgz"; path = fetchurl { - name = "google_closure_compiler_osx___google_closure_compiler_osx_20220104.0.0.tgz"; - url = "https://registry.yarnpkg.com/google-closure-compiler-osx/-/google-closure-compiler-osx-20220104.0.0.tgz"; - sha512 = "D6WPBKS6H416kY4OH9WBhviY7e+b1+RXT8jWhBGXMHoSlUiIUALOi67RvBuibiX39ljG0D1JSZbfYXNCDYLMmw=="; + name = "google_closure_compiler_osx___google_closure_compiler_osx_20220502.0.0.tgz"; + url = "https://registry.yarnpkg.com/google-closure-compiler-osx/-/google-closure-compiler-osx-20220502.0.0.tgz"; + sha512 = "VwEncD4I1gfkF3zyHlRcUsx2o/poC0qzHjBv+g3Z09wHy9tuqjQ4EP8LmN/GMuV2Hai6gQvkKC0XjYnZTFx2mQ=="; }; } { - name = "google_closure_compiler_windows___google_closure_compiler_windows_20220104.0.0.tgz"; + name = "google_closure_compiler_windows___google_closure_compiler_windows_20220502.0.0.tgz"; path = fetchurl { - name = "google_closure_compiler_windows___google_closure_compiler_windows_20220104.0.0.tgz"; - url = "https://registry.yarnpkg.com/google-closure-compiler-windows/-/google-closure-compiler-windows-20220104.0.0.tgz"; - sha512 = "VNBUBSBLn2ZeK4EKsoY/rl6qjXYoph+DWmiicNeFrEvqyUB9Vh9MhhP4F+PPOg1iYdPw4XtNsmfSnIV96kQHyA=="; + name = "google_closure_compiler_windows___google_closure_compiler_windows_20220502.0.0.tgz"; + url = "https://registry.yarnpkg.com/google-closure-compiler-windows/-/google-closure-compiler-windows-20220502.0.0.tgz"; + sha512 = "ssdAUS2VZxJAyciVrbhpnYymvm//V4CHyg8aLvMisUfWRDeUSsOCC5mNXy6D8f9i9bYHs3cFV3itIRUfnYCEWg=="; }; } { - name = "google_closure_compiler___google_closure_compiler_20220104.0.0.tgz"; + name = "google_closure_compiler___google_closure_compiler_20220502.0.0.tgz"; path = fetchurl { - name = "google_closure_compiler___google_closure_compiler_20220104.0.0.tgz"; - url = "https://registry.yarnpkg.com/google-closure-compiler/-/google-closure-compiler-20220104.0.0.tgz"; - sha512 = "8JQs1cWpJYjvqnAskMis1sQ/nm2wHYIt/Rd3HYyMOgfEzjNdqLkIiuzCXbz2flktHXS63mvdxU4+ZlJR72Kz8g=="; + name = "google_closure_compiler___google_closure_compiler_20220502.0.0.tgz"; + url = "https://registry.yarnpkg.com/google-closure-compiler/-/google-closure-compiler-20220502.0.0.tgz"; + sha512 = "i9Qdve2v3jlerkHzlm00bpYds+kfAlIdeaOQ+acK/pHPHeLjhiXS+EyIpegVnH8+TY3I1QAMZFuVEXkMVJqpBQ=="; }; } { @@ -870,7 +894,7 @@ path = fetchurl { name = "has_flag___has_flag_3.0.0.tgz"; url = "https://registry.yarnpkg.com/has-flag/-/has-flag-3.0.0.tgz"; - sha1 = "tdRU3CGZriJWmfNGfloH87lVuv0="; + sha512 = "sKJf1+ceQBr4SMkvQnBDNDtf4TXpVhVGateu0t918bl30FnbE2m4vNLX+VWe/dpjlb+HugGYzW7uQXH98HPEYw=="; }; } { @@ -926,7 +950,7 @@ path = fetchurl { name = "imurmurhash___imurmurhash_0.1.4.tgz"; url = "https://registry.yarnpkg.com/imurmurhash/-/imurmurhash-0.1.4.tgz"; - sha1 = "khi5srkoojixPcT7a21XbyMUU+o="; + sha512 = "JmXMZ6wuvDmLiHEml9ykzqO6lwFbof0GG4IkcGaENdCRDDmMVnny7s5HsIgHCbaq0w2MyPhDqkhTUgS2LU2PHA=="; }; } { @@ -934,7 +958,7 @@ path = fetchurl { name = "inflight___inflight_1.0.6.tgz"; url = "https://registry.yarnpkg.com/inflight/-/inflight-1.0.6.tgz"; - sha1 = "Sb1jMdfQLQwJvJEKEHW6gWW1bfk="; + sha512 = "k92I/b08q4wvFscXCLvqfsHCrjrF7yiXsQuIVvVE7N82W3+aqpzuUdBbfhWcy/FZR3/4IgflMgKLOsvPDrGCJA=="; }; } { @@ -966,7 +990,7 @@ path = fetchurl { name = "is_extglob___is_extglob_2.1.1.tgz"; url = "https://registry.yarnpkg.com/is-extglob/-/is-extglob-2.1.1.tgz"; - sha1 = "qIwCU1eR8C7TfHahueqXc8gz+MI="; + sha512 = "SbKbANkN603Vi4jEZv49LeVJMn4yGwsbzZworEoyEiutsN3nJYdbO36zfhGJ6QEDpOZIFkDtnq5JRxmvl3jsoQ=="; }; } { @@ -974,7 +998,7 @@ path = fetchurl { name = "is_fullwidth_code_point___is_fullwidth_code_point_2.0.0.tgz"; url = "https://registry.yarnpkg.com/is-fullwidth-code-point/-/is-fullwidth-code-point-2.0.0.tgz"; - sha1 = "o7MKXE8ZkYMWeqq5O+764937ZU8="; + sha512 = "VHskAKYM8RfSFXwee5t5cbN5PZeq1Wrh6qd5bkyiXIf6UQcN6w/A0eXM9r6t8d+GYOh+o6ZhiEnb88LN/Y8m2w=="; }; } { @@ -986,14 +1010,6 @@ }; } { - name = "is_glob___is_glob_4.0.1.tgz"; - path = fetchurl { - name = "is_glob___is_glob_4.0.1.tgz"; - url = "https://registry.yarnpkg.com/is-glob/-/is-glob-4.0.1.tgz"; - sha512 = "5G0tKtBTFImOqDnLB2hG6Bp2qcKEFduo4tZu9MT/H6NQv/ghhy30o55ufafxJ/LdH79LLs2Kfrn85TLKyA7BUg=="; - }; - } - { name = "is_glob___is_glob_4.0.3.tgz"; path = fetchurl { name = "is_glob___is_glob_4.0.3.tgz"; @@ -1014,7 +1030,7 @@ path = fetchurl { name = "is_stream___is_stream_1.1.0.tgz"; url = "https://registry.yarnpkg.com/is-stream/-/is-stream-1.1.0.tgz"; - sha1 = "EtSj3U5o4Lec6428hBc66A2RykQ="; + sha512 = "uQPm8kcs47jx38atAcWTVxyltQYoPT68y9aWYdV6yWXSyW8mzSat0TL6CiWdZeCdF3KrAvpVtnHbTv4RN+rqdQ=="; }; } { @@ -1022,7 +1038,7 @@ path = fetchurl { name = "isarray___isarray_1.0.0.tgz"; url = "https://registry.yarnpkg.com/isarray/-/isarray-1.0.0.tgz"; - sha1 = "u5NdSFgsuhaMBoNJV6VKPgcSTxE="; + sha512 = "VLghIWNM6ELQzo7zwmcg0NmTVyWKYjvIeM83yjp0wRDTmUnrM678fQbcKBo6n2CJEF0szoG//ytg+TKla89ALQ=="; }; } { @@ -1030,7 +1046,7 @@ path = fetchurl { name = "isexe___isexe_2.0.0.tgz"; url = "https://registry.yarnpkg.com/isexe/-/isexe-2.0.0.tgz"; - sha1 = "6PvzdNxVb/iUehDcsFctYz8s+hA="; + sha512 = "RHxMLp9lnKHGHRng9QFhRCMbYAcVpn69smSGcq3f36xjgVVWThj4qqLbTLlq7Ssj8B+fIQ1EuCEGI2lKsyQeIw=="; }; } { @@ -1054,7 +1070,7 @@ path = fetchurl { name = "json_stable_stringify_without_jsonify___json_stable_stringify_without_jsonify_1.0.1.tgz"; url = "https://registry.yarnpkg.com/json-stable-stringify-without-jsonify/-/json-stable-stringify-without-jsonify-1.0.1.tgz"; - sha1 = "nbe1lJatPzz+8wp1FC0tkwrXJlE="; + sha512 = "Bdboy+l7tA3OGW6FjyFHWkP5LuByj1Tk33Ljyq0axyzdk9//JSi2u3fP1QSmd1KNwq6VOKYGlAu87CisVir6Pw=="; }; } { @@ -1082,14 +1098,6 @@ }; } { - name = "lodash.sortby___lodash.sortby_4.7.0.tgz"; - path = fetchurl { - name = "lodash.sortby___lodash.sortby_4.7.0.tgz"; - url = "https://registry.yarnpkg.com/lodash.sortby/-/lodash.sortby-4.7.0.tgz"; - sha1 = "7dFMgk4sycHgsKG0K7UhBRakJDg="; - }; - } - { name = "lodash___lodash_4.17.15.tgz"; path = fetchurl { name = "lodash___lodash_4.17.15.tgz"; @@ -1106,11 +1114,11 @@ }; } { - name = "logform___logform_2.4.0.tgz"; + name = "logform___logform_2.4.1.tgz"; path = fetchurl { - name = "logform___logform_2.4.0.tgz"; - url = "https://registry.yarnpkg.com/logform/-/logform-2.4.0.tgz"; - sha512 = "CPSJw4ftjf517EhXZGGvTHHkYobo7ZCc0kvwUoOYcjfR2UVrI66RHj8MCrfAdEitdmFqbu2BYdYs8FHHZSb6iw=="; + name = "logform___logform_2.4.1.tgz"; + url = "https://registry.yarnpkg.com/logform/-/logform-2.4.1.tgz"; + sha512 = "7XB/tqc3VRbri9pRjU6E97mQ8vC27ivJ3lct4jhyT+n0JNDd4YKldFl0D75NqDp46hk8RC7Ma1Vjv/UPf67S+A=="; }; } { @@ -1146,14 +1154,6 @@ }; } { - name = "minimatch___minimatch_3.0.4.tgz"; - path = fetchurl { - name = "minimatch___minimatch_3.0.4.tgz"; - url = "https://registry.yarnpkg.com/minimatch/-/minimatch-3.0.4.tgz"; - sha512 = "yJHVQEhyqPLUTgt9B83PXu6W3rx4MvvHvSUvToogpwoGDOUQ+yDrR0HRot+yOCdCO7u4hX3pWft6kWBBcqh0UA=="; - }; - } - { name = "minimatch___minimatch_3.1.2.tgz"; path = fetchurl { name = "minimatch___minimatch_3.1.2.tgz"; @@ -1162,19 +1162,19 @@ }; } { - name = "minimist___minimist_1.2.5.tgz"; + name = "minimist___minimist_1.2.6.tgz"; path = fetchurl { - name = "minimist___minimist_1.2.5.tgz"; - url = "https://registry.yarnpkg.com/minimist/-/minimist-1.2.5.tgz"; - sha512 = "FM9nNUYrRBAELZQT3xeZQ7fmMOBg6nWNmJKTcgsJeaLstP/UODVpGsr5OhXhhXg6f+qtJ8uiZ+PUxkDWcgIXLw=="; + name = "minimist___minimist_1.2.6.tgz"; + url = "https://registry.yarnpkg.com/minimist/-/minimist-1.2.6.tgz"; + sha512 = "Jsjnk4bw3YJqYzbdyBiNsPWHPfO++UGG749Cxs6peCu5Xg4nrena6OVxOYxrQTqww0Jmwt+Ref8rggumkTLz9Q=="; }; } { - name = "mkdirp___mkdirp_0.5.5.tgz"; + name = "mkdirp___mkdirp_0.5.6.tgz"; path = fetchurl { - name = "mkdirp___mkdirp_0.5.5.tgz"; - url = "https://registry.yarnpkg.com/mkdirp/-/mkdirp-0.5.5.tgz"; - sha512 = "NKmAlESf6jMGym1++R0Ra7wvhV+wFW63FaSOFPwRahvea0gMUcGUhVeAg/0BC0wiv9ih5NYPB1Wn1UEI1/L+xQ=="; + name = "mkdirp___mkdirp_0.5.6.tgz"; + url = "https://registry.yarnpkg.com/mkdirp/-/mkdirp-0.5.6.tgz"; + sha512 = "FP+p8RB8OWpF3YZBCrP5gtADmtXApB5AMLn+vdyA+PyxCjrCs00mjyUozssO33cwDeT3wNGdLxJ5M//YqtHAJw=="; }; } { @@ -1198,7 +1198,7 @@ path = fetchurl { name = "mute_stream___mute_stream_0.0.7.tgz"; url = "https://registry.yarnpkg.com/mute-stream/-/mute-stream-0.0.7.tgz"; - sha1 = "MHXOk7whuPq0PhvE2n6BFe0ee6s="; + sha512 = "r65nCZhrbXXb6dXOACihYApHw2Q6pV0M3V0PSxd74N0+D8nzAdEAITq2oAjA1jVnKI+tGvEBUpqiMh0+rW6zDQ=="; }; } { @@ -1206,7 +1206,7 @@ path = fetchurl { name = "natural_compare___natural_compare_1.4.0.tgz"; url = "https://registry.yarnpkg.com/natural-compare/-/natural-compare-1.4.0.tgz"; - sha1 = "Sr6/7tdUHywnrPspvbvRXI1bpPc="; + sha512 = "OWND8ei3VtNC9h7V60qff3SVobHr996CTwgxubgyQYEpg290h9J0buyECNNJexkFm5sOajh5G116RYA1c8ZMSw=="; }; } { @@ -1222,7 +1222,7 @@ path = fetchurl { name = "once___once_1.4.0.tgz"; url = "https://registry.yarnpkg.com/once/-/once-1.4.0.tgz"; - sha1 = "WDsap3WWHUsROsF9nFC6753Xa9E="; + sha512 = "lNaJgI+2Q5URQBkccEKHTQOPaXdUxnZZElQTZY0MFUAuaEqe1E+Nyvgdz/aIyNi6Z9MzO5dv1H8n58/GELp3+w=="; }; } { @@ -1230,7 +1230,7 @@ path = fetchurl { name = "one_time___one_time_0.0.4.tgz"; url = "https://registry.yarnpkg.com/one-time/-/one-time-0.0.4.tgz"; - sha1 = "+M33eISCb+Tf+T46nMN7HkSAdC4="; + sha512 = "qAMrwuk2xLEutlASoiPiAMW3EN3K96Ka/ilSXYr6qR1zSVXw2j7+yDSqGTC4T9apfLYxM3tLLjKvgPdAUK7kYQ=="; }; } { @@ -1238,7 +1238,7 @@ path = fetchurl { name = "onetime___onetime_2.0.1.tgz"; url = "https://registry.yarnpkg.com/onetime/-/onetime-2.0.1.tgz"; - sha1 = "BnQoIw/WdEOyeUsiu6UotoZ5YtQ="; + sha512 = "oyyPpiMaKARvvcgip+JV+7zci5L8D1W9RZIz2l1o08AM3pfspitVWnPt3mzHcBPp12oYMTy0pqrFs/C+m3EwsQ=="; }; } { @@ -1254,7 +1254,7 @@ path = fetchurl { name = "os_tmpdir___os_tmpdir_1.0.2.tgz"; url = "https://registry.yarnpkg.com/os-tmpdir/-/os-tmpdir-1.0.2.tgz"; - sha1 = "u+Z0BseaqFxc/sdm/lc0VV36EnQ="; + sha512 = "D2FR03Vir7FIu45XBY20mTb+/ZSWB00sjU9jdQXt83gDrI4Ztz5Fs7/yy74g2N5SVQY4xY1qDr4rNddwYRVX0g=="; }; } { @@ -1286,7 +1286,7 @@ path = fetchurl { name = "path_is_absolute___path_is_absolute_1.0.1.tgz"; url = "https://registry.yarnpkg.com/path-is-absolute/-/path-is-absolute-1.0.1.tgz"; - sha1 = "F0uSaHNVNP+8es5r9TpanhtcX18="; + sha512 = "AVbw3UJ2e9bq64vSaS9Am0fje1Pa8pbGqTTsmXfaIiMpnr5DlDhfJOuLj9Sf95ZPVDAUerDfEk88MPmPe7UCQg=="; }; } { @@ -1366,7 +1366,7 @@ path = fetchurl { name = "relateurl___relateurl_0.2.7.tgz"; url = "https://registry.yarnpkg.com/relateurl/-/relateurl-0.2.7.tgz"; - sha1 = "VNvzd+UUQKypCkzSdGANP/LYiKk="; + sha512 = "G08Dxvm4iDN3MLM0EsP62EDV9IuhXPR6blNz6Utcp7zyV3tr4HVNINt6MpaRWbxoOHT3Q7YN2P+jaHX8vUbgog=="; }; } { @@ -1374,7 +1374,7 @@ path = fetchurl { name = "remove_trailing_separator___remove_trailing_separator_1.1.0.tgz"; url = "https://registry.yarnpkg.com/remove-trailing-separator/-/remove-trailing-separator-1.1.0.tgz"; - sha1 = "wkvOKig62tW8P1jg1IJJuSN52O8="; + sha512 = "/hS+Y0u3aOfIETiaiirUFwDBDzmXPvO+jAfKTitUngIPzdKc6Z0LoFjM/CK5PL4C+eKwHohlHAb6H0VFfmmUsw=="; }; } { @@ -1398,7 +1398,7 @@ path = fetchurl { name = "restore_cursor___restore_cursor_2.0.0.tgz"; url = "https://registry.yarnpkg.com/restore-cursor/-/restore-cursor-2.0.0.tgz"; - sha1 = "n37ih/gv0ybU/RYpI9YhKe7g368="; + sha512 = "6IzJLuGi4+R14vwagDHX+JrXmPVtPpn4mffDJ1UdR7/Edm87fl6yi8mMBIVvFtJaNTUvjughmW4hwLhRG7gC1Q=="; }; } { @@ -1502,7 +1502,7 @@ path = fetchurl { name = "simple_swizzle___simple_swizzle_0.2.2.tgz"; url = "https://registry.yarnpkg.com/simple-swizzle/-/simple-swizzle-0.2.2.tgz"; - sha1 = "pNprY1/8zMoz9w0Xy5JZLeleVXo="; + sha512 = "JA//kQgZtbuY83m+xT+tXJkmJncGMTFT+C+g2h2R9uxkYIrE2yy9sgmcLhCnw57/WSD+Eh3J97FPEDFnbXnDUg=="; }; } { @@ -1534,7 +1534,7 @@ path = fetchurl { name = "source_map___source_map_0.5.7.tgz"; url = "https://registry.yarnpkg.com/source-map/-/source-map-0.5.7.tgz"; - sha1 = "igOdLRAh0i0eoUyA2OpGi6LvP8w="; + sha512 = "LbrmJOMUSdEVxIKvdcJzQC+nQhe8FUZQTXQy6+I75skNgn3OoQ0DZA8YnFa7gp8tqtL3KPf1kmo0R5DoApeSGQ=="; }; } { @@ -1546,19 +1546,11 @@ }; } { - name = "source_map___source_map_0.8.0_beta.0.tgz"; - path = fetchurl { - name = "source_map___source_map_0.8.0_beta.0.tgz"; - url = "https://registry.yarnpkg.com/source-map/-/source-map-0.8.0-beta.0.tgz"; - sha512 = "2ymg6oRBpebeZi9UUNsgQ89bhx01TcTkmNTGnNO88imTmbSgy4nfujrgVEFKWpMTEGA11EDkTt7mqObTPdigIA=="; - }; - } - { name = "stack_trace___stack_trace_0.0.10.tgz"; path = fetchurl { name = "stack_trace___stack_trace_0.0.10.tgz"; url = "https://registry.yarnpkg.com/stack-trace/-/stack-trace-0.0.10.tgz"; - sha1 = "VHxws0fo0ytOEI6hoqFZ5f3eGcA="; + sha512 = "KGzahc7puUKkzyMt+IqAep+TVNbKP+k2Lmwhub39m1AsTSkaDutx56aDCo+HLDzf/D26BIHTJWNiTG1KAJiQCg=="; }; } { @@ -1606,7 +1598,7 @@ path = fetchurl { name = "strip_ansi___strip_ansi_4.0.0.tgz"; url = "https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-4.0.0.tgz"; - sha1 = "qEeQIusaw2iocTibY1JixQXuNo8="; + sha512 = "4XaJ2zQdCzROZDivEVIDPkcQn8LMFSa8kj8Gxb/Lnwzv9A8VctNZ+lfivC/sV3ivW8ElJTERXZoPBRrZKkNKow=="; }; } { @@ -1618,14 +1610,6 @@ }; } { - name = "strip_ansi___strip_ansi_6.0.0.tgz"; - path = fetchurl { - name = "strip_ansi___strip_ansi_6.0.0.tgz"; - url = "https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-6.0.0.tgz"; - sha512 = "AuvKTrTfQNYNIctbR1K/YGTR1756GycPsg7b9bdV9Duqur4gv6aKqHXah67Z8ImS7WEz5QVcOtlfW2rZEugt6w=="; - }; - } - { name = "strip_ansi___strip_ansi_6.0.1.tgz"; path = fetchurl { name = "strip_ansi___strip_ansi_6.0.1.tgz"; @@ -1674,11 +1658,11 @@ }; } { - name = "terser___terser_5.13.1.tgz"; + name = "terser___terser_5.14.1.tgz"; path = fetchurl { - name = "terser___terser_5.13.1.tgz"; - url = "https://registry.yarnpkg.com/terser/-/terser-5.13.1.tgz"; - sha512 = "hn4WKOfwnwbYfe48NgrQjqNOH9jzLqRcIfbYytOXCOv46LBfWr9bDS17MQqOi+BWGD0sJK3Sj5NC/gJjiojaoA=="; + name = "terser___terser_5.14.1.tgz"; + url = "https://registry.yarnpkg.com/terser/-/terser-5.14.1.tgz"; + sha512 = "+ahUAE+iheqBTDxXhTisdA8hgvbEG1hHOQ9xmNjeUJSoi6DU/gMrKNcfZjHkyY6Alnuyc+ikYJaxxfHkT3+WuQ=="; }; } { @@ -1694,7 +1678,7 @@ path = fetchurl { name = "text_table___text_table_0.2.0.tgz"; url = "https://registry.yarnpkg.com/text-table/-/text-table-0.2.0.tgz"; - sha1 = "f17oI66AUgfACvLfSoTsP8+lcLQ="; + sha512 = "N+8UisAXDGk8PFXP4HAzVR9nbfmVJ3zYLAWiTIoqC5v5isinhr+r5uaO8+7r3BMfuNIufIsA7RdpVgacC2cSpw=="; }; } { @@ -1702,7 +1686,7 @@ path = fetchurl { name = "through___through_2.3.8.tgz"; url = "https://registry.yarnpkg.com/through/-/through-2.3.8.tgz"; - sha1 = "DdTJ/6q8NXlgsbckEV1+Doai4fU="; + sha512 = "w89qg7PI8wAdvX60bMDP+bFoD5Dvhm9oLheFp5O4a2QF0cSBGsBX4qZmadPMvVqlLJBBci+WqGGOAPvcDeNSVg=="; }; } { @@ -1722,14 +1706,6 @@ }; } { - name = "tr46___tr46_1.0.1.tgz"; - path = fetchurl { - name = "tr46___tr46_1.0.1.tgz"; - url = "https://registry.yarnpkg.com/tr46/-/tr46-1.0.1.tgz"; - sha1 = "qLE/1r/SSJUZZ0zN5VujaTtwbQk="; - }; - } - { name = "triple_beam___triple_beam_1.3.0.tgz"; path = fetchurl { name = "triple_beam___triple_beam_1.3.0.tgz"; @@ -1746,11 +1722,11 @@ }; } { - name = "tslib___tslib_2.3.0.tgz"; + name = "tslib___tslib_2.4.0.tgz"; path = fetchurl { - name = "tslib___tslib_2.3.0.tgz"; - url = "https://registry.yarnpkg.com/tslib/-/tslib-2.3.0.tgz"; - sha512 = "N82ooyxVNm6h1riLCoyS9e3fuJ3AMG2zIZs2Gd1ATcSFjSA23Q0fzjjZeh0jbJvWVDZ0cJT8yaNNaaXHzueNjg=="; + name = "tslib___tslib_2.4.0.tgz"; + url = "https://registry.yarnpkg.com/tslib/-/tslib-2.4.0.tgz"; + sha512 = "d6xOpEDfsi2CZVlPQzGeux8XMwLT9hssAsaPYExaQMuYskwb+x1x7J371tWlbBdWHroy99KnVB6qIkUbs5X3UQ=="; }; } { @@ -1790,7 +1766,7 @@ path = fetchurl { name = "util_deprecate___util_deprecate_1.0.2.tgz"; url = "https://registry.yarnpkg.com/util-deprecate/-/util-deprecate-1.0.2.tgz"; - sha1 = "RQ1Nyfpw3nMnYvvS1KKJgUGaDM8="; + sha512 = "EPD5q1uXyFxJpCrLnCc1nHnq3gOa6DZBocAIiI2TaSCA7VCJ1UJDMagCzIkXNsUYfD1daK//LTEQ8xiIbrHtcw=="; }; } { @@ -1806,7 +1782,7 @@ path = fetchurl { name = "vinyl_sourcemaps_apply___vinyl_sourcemaps_apply_0.2.1.tgz"; url = "https://registry.yarnpkg.com/vinyl-sourcemaps-apply/-/vinyl-sourcemaps-apply-0.2.1.tgz"; - sha1 = "q2VJ1h0XLCsbh75cUI0jnI74dwU="; + sha512 = "+oDh3KYZBoZC8hfocrbrxbLUeaYtQK7J5WU5Br9VqWqmCll3tFJqKp97GC9GmMsVIL0qnx2DgEDVxdo5EZ5sSw=="; }; } { @@ -1826,22 +1802,6 @@ }; } { - name = "webidl_conversions___webidl_conversions_4.0.2.tgz"; - path = fetchurl { - name = "webidl_conversions___webidl_conversions_4.0.2.tgz"; - url = "https://registry.yarnpkg.com/webidl-conversions/-/webidl-conversions-4.0.2.tgz"; - sha512 = "YQ+BmxuTgd6UXZW3+ICGfyqRyHXVlD5GtQr5+qjiNW7bF0cqrzX500HVXPBOvgXb5YnzDd+h0zqyv61KUD7+Sg=="; - }; - } - { - name = "whatwg_url___whatwg_url_7.1.0.tgz"; - path = fetchurl { - name = "whatwg_url___whatwg_url_7.1.0.tgz"; - url = "https://registry.yarnpkg.com/whatwg-url/-/whatwg-url-7.1.0.tgz"; - sha512 = "WUu7Rg1DroM7oQvGWfOiAK21n74Gg+T4elXEQYkOhtyLeWiJFoOGLXPKI/9gzIie9CtwVLm8wtw6YJdKyxSjeg=="; - }; - } - { name = "which___which_2.0.2.tgz"; path = fetchurl { name = "which___which_2.0.2.tgz"; @@ -1886,15 +1846,15 @@ path = fetchurl { name = "wrappy___wrappy_1.0.2.tgz"; url = "https://registry.yarnpkg.com/wrappy/-/wrappy-1.0.2.tgz"; - sha1 = "tSQ9jz7BqjXxNkYFvA0QNuMKtp8="; + sha512 = "l4Sp/DRseor9wL6EvV2+TuQn63dMkPjZ/sp9XkghTEbV9KlPS1xUsZ3u7/IQO4wxtcFB4bgpQPRcR3QCvezPcQ=="; }; } { - name = "ws___ws_8.6.0.tgz"; + name = "ws___ws_8.8.0.tgz"; path = fetchurl { - name = "ws___ws_8.6.0.tgz"; - url = "https://registry.yarnpkg.com/ws/-/ws-8.6.0.tgz"; - sha512 = "AzmM3aH3gk0aX7/rZLYvjdvZooofDu3fFOzGqcSnQ1tOcTWwhM/o+q++E8mAyVVIyUdajrkzWUGftaVSDLn1bw=="; + name = "ws___ws_8.8.0.tgz"; + url = "https://registry.yarnpkg.com/ws/-/ws-8.8.0.tgz"; + sha512 = "JDAgSYQ1ksuwqfChJusw1LSJ8BizJ2e/vVu5Lxjq3YvNJNlROv1ui4i+c/kUUrPheBvQl4c5UbERhTwKa6QBJQ=="; }; } ]; diff --git a/pkgs/development/compilers/ghc/9.2.2-binary.nix b/pkgs/development/compilers/ghc/9.2.2-binary.nix new file mode 100644 index 0000000000000..53b56b0447963 --- /dev/null +++ b/pkgs/development/compilers/ghc/9.2.2-binary.nix @@ -0,0 +1,448 @@ +{ lib, stdenv +, fetchurl, perl, gcc +, ncurses5 +, ncurses6, gmp, libiconv, numactl, libffi +, llvmPackages +, coreutils +, targetPackages + + # minimal = true; will remove files that aren't strictly necessary for + # regular builds and GHC bootstrapping. + # This is "useful" for staying within hydra's output limits for at least the + # aarch64-linux architecture. +, minimal ? false +}: + +# Prebuilt only does native +assert stdenv.targetPlatform == stdenv.hostPlatform; + +let + downloadsUrl = "https://downloads.haskell.org/ghc"; + + # Copy sha256 from https://downloads.haskell.org/~ghc/9.2.2/SHA256SUMS + version = "9.2.2"; + + # Information about available bindists that we use in the build. + # + # # Bindist library checking + # + # The field `archSpecificLibraries` also provides a way for us get notified + # early when the upstream bindist changes its dependencies (e.g. because a + # newer Debian version is used that uses a new `ncurses` version). + # + # Usage: + # + # * You can find the `fileToCheckFor` of libraries by running `readelf -d` + # on the compiler binary (`exePathForLibraryCheck`). + # * To skip library checking for an architecture, + # set `exePathForLibraryCheck = null`. + # * To skip file checking for a specific arch specfic library, + # set `fileToCheckFor = null`. + ghcBinDists = { + # Binary distributions for the default libc (e.g. glibc, or libSystem on Darwin) + # nixpkgs uses for the respective system. + defaultLibc = { + i686-linux = { + variantSuffix = ""; + src = { + url = "${downloadsUrl}/${version}/ghc-${version}-i386-deb9-linux.tar.xz"; + sha256 = "24234486ed4508161c6f88f4750a36d38b135b0c6e5fe78efe2d85c612ecaf9e"; + }; + exePathForLibraryCheck = "ghc/stage2/build/tmp/ghc-stage2"; + archSpecificLibraries = [ + { nixPackage = gmp; fileToCheckFor = null; } + # The i686-linux bindist provided by GHC HQ is currently built on Debian 9, + # which link it against `libtinfo.so.5` (ncurses 5). + # Other bindists are linked `libtinfo.so.6` (ncurses 6). + { nixPackage = ncurses5; fileToCheckFor = "libtinfo.so.5"; } + ]; + }; + x86_64-linux = { + variantSuffix = ""; + src = { + url = "${downloadsUrl}/${version}/ghc-${version}-x86_64-deb10-linux.tar.xz"; + sha256 = "fb61dea556a2023dc2d50ee61a22144bb23e4229a378e533065124c218f40cfc"; + }; + exePathForLibraryCheck = "ghc/stage2/build/tmp/ghc-stage2"; + archSpecificLibraries = [ + { nixPackage = gmp; fileToCheckFor = null; } + { nixPackage = ncurses6; fileToCheckFor = "libtinfo.so.6"; } + ]; + }; + armv7l-linux = { + variantSuffix = ""; + src = { + url = "${downloadsUrl}/${version}/ghc-${version}-armv7-deb10-linux.tar.xz"; + sha256 = "ce5a7c3beb19d8c13a9e60bd39d3ba8ef0060b954ea42eb23f1ef8d077fa9e8b"; + }; + exePathForLibraryCheck = "ghc/stage2/build/tmp/ghc-stage2"; + archSpecificLibraries = [ + { nixPackage = gmp; fileToCheckFor = null; } + { nixPackage = ncurses6; fileToCheckFor = "libtinfo.so.6"; } + ]; + }; + aarch64-linux = { + variantSuffix = ""; + src = { + url = "${downloadsUrl}/${version}/ghc-${version}-aarch64-deb10-linux.tar.xz"; + sha256 = "f3621ccba7ae48fcd67a9505f61bb5ccfb05c4cbfecd5a6ea65fe3f150af0e98"; + }; + exePathForLibraryCheck = "ghc/stage2/build/tmp/ghc-stage2"; + archSpecificLibraries = [ + { nixPackage = gmp; fileToCheckFor = null; } + { nixPackage = ncurses6; fileToCheckFor = "libtinfo.so.6"; } + { nixPackage = numactl; fileToCheckFor = null; } + ]; + }; + x86_64-darwin = { + variantSuffix = ""; + src = { + url = "${downloadsUrl}/${version}/ghc-${version}-x86_64-apple-darwin.tar.xz"; + sha256 = "934abbd6083d3aeb5ff081955682d7711d9e79db57b1613eb229c325dd06f83f"; + }; + exePathForLibraryCheck = null; # we don't have a library check for darwin yet + archSpecificLibraries = [ + { nixPackage = gmp; fileToCheckFor = null; } + { nixPackage = ncurses6; fileToCheckFor = null; } + { nixPackage = libiconv; fileToCheckFor = null; } + ]; + }; + aarch64-darwin = { + variantSuffix = ""; + src = { + url = "${downloadsUrl}/${version}/ghc-${version}-aarch64-apple-darwin.tar.xz"; + sha256 = "d1f04f7cc062ed134f863305c67dfe2c42df46ed658dd34f9dd552186f194e5c"; + }; + exePathForLibraryCheck = null; # we don't have a library check for darwin yet + archSpecificLibraries = [ + { nixPackage = gmp; fileToCheckFor = null; } + { nixPackage = ncurses6; fileToCheckFor = null; } + { nixPackage = libiconv; fileToCheckFor = null; } + ]; + }; + }; + # Binary distributions for the musl libc for the respective system. + musl = { + x86_64-linux = { + variantSuffix = "-musl"; + src = { + url = "${downloadsUrl}/${version}/ghc-${version}-x86_64-alpine3.12-linux-gmp.tar.xz"; + sha256 = "624523826e24eae33c03490267cddecc1d80c047f2a3f4b03580f1040112d5c0"; + }; + isStatic = true; + # We can't check the RPATH for statically linked executable + exePathForLibraryCheck = null; + archSpecificLibraries = [ + { nixPackage = gmp.override { withStatic = true; }; fileToCheckFor = null; } + ]; + }; + }; + }; + + distSetName = if stdenv.hostPlatform.isMusl then "musl" else "defaultLibc"; + + binDistUsed = ghcBinDists.${distSetName}.${stdenv.hostPlatform.system} + or (throw "cannot bootstrap GHC on this platform ('${stdenv.hostPlatform.system}' with libc '${distSetName}')"); + + gmpUsed = (builtins.head ( + builtins.filter ( + drv: lib.hasPrefix "gmp" (drv.nixPackage.name or "") + ) binDistUsed.archSpecificLibraries + )).nixPackage; + + # GHC has other native backends (like PowerPC), but here only the ones + # we ship bindists for matter. + useLLVM = !(stdenv.targetPlatform.isx86 + || (stdenv.targetPlatform.isAarch64 && stdenv.targetPlatform.isDarwin)); + + libPath = + lib.makeLibraryPath ( + # Add arch-specific libraries. + map ({ nixPackage, ... }: nixPackage) binDistUsed.archSpecificLibraries + ); + + libEnvVar = lib.optionalString stdenv.hostPlatform.isDarwin "DY" + + "LD_LIBRARY_PATH"; + + runtimeDeps = [ + targetPackages.stdenv.cc + targetPackages.stdenv.cc.bintools + coreutils # for cat + ] + ++ lib.optionals useLLVM [ + (lib.getBin llvmPackages.llvm) + ] + # On darwin, we need unwrapped bintools as well (for otool) + ++ lib.optionals (stdenv.targetPlatform.linker == "cctools") [ + targetPackages.stdenv.cc.bintools.bintools + ]; + +in + +stdenv.mkDerivation rec { + inherit version; + pname = "ghc-binary${binDistUsed.variantSuffix}"; + + src = fetchurl binDistUsed.src; + + nativeBuildInputs = [ perl ]; + + # Set LD_LIBRARY_PATH or equivalent so that the programs running as part + # of the bindist installer can find the libraries they expect. + # Cannot patchelf beforehand due to relative RPATHs that anticipate + # the final install location. + ${libEnvVar} = libPath; + + postUnpack = + # Verify our assumptions of which `libtinfo.so` (ncurses) version is used, + # so that we know when ghc bindists upgrade that and we need to update the + # version used in `libPath`. + lib.optionalString + (binDistUsed.exePathForLibraryCheck != null) + # Note the `*` glob because some GHCs have a suffix when unpacked, e.g. + # the musl bindist has dir `ghc-VERSION-x86_64-unknown-linux/`. + # As a result, don't shell-quote this glob when splicing the string. + (let buildExeGlob = ''ghc-${version}*/"${binDistUsed.exePathForLibraryCheck}"''; in + lib.concatStringsSep "\n" [ + ('' + echo "Checking that ghc binary exists in bindist at ${buildExeGlob}" + if ! test -e ${buildExeGlob}; then + echo >&2 "GHC binary ${binDistUsed.exePathForLibraryCheck} could not be found in the bindist build directory (at ${buildExeGlob}) for arch ${stdenv.hostPlatform.system}, please check that ghcBinDists correctly reflect the bindist dependencies!"; exit 1; + fi + '') + (lib.concatMapStringsSep + "\n" + ({ fileToCheckFor, nixPackage }: + lib.optionalString (fileToCheckFor != null) '' + echo "Checking bindist for ${fileToCheckFor} to ensure that is still used" + if ! readelf -d ${buildExeGlob} | grep "${fileToCheckFor}"; then + echo >&2 "File ${fileToCheckFor} could not be found in ${binDistUsed.exePathForLibraryCheck} for arch ${stdenv.hostPlatform.system}, please check that ghcBinDists correctly reflect the bindist dependencies!"; exit 1; + fi + + echo "Checking that the nix package ${nixPackage} contains ${fileToCheckFor}" + if ! test -e "${lib.getLib nixPackage}/lib/${fileToCheckFor}"; then + echo >&2 "Nix package ${nixPackage} did not contain ${fileToCheckFor} for arch ${stdenv.hostPlatform.system}, please check that ghcBinDists correctly reflect the bindist dependencies!"; exit 1; + fi + '' + ) + binDistUsed.archSpecificLibraries + ) + ]) + # GHC has dtrace probes, which causes ld to try to open /usr/lib/libdtrace.dylib + # during linking + + lib.optionalString stdenv.isDarwin '' + export NIX_LDFLAGS+=" -no_dtrace_dof" + # not enough room in the object files for the full path to libiconv :( + for exe in $(find . -type f -executable); do + isScript $exe && continue + ln -fs ${libiconv}/lib/libiconv.dylib $(dirname $exe)/libiconv.dylib + install_name_tool -change /usr/lib/libiconv.2.dylib @executable_path/libiconv.dylib -change /usr/local/lib/gcc/6/libgcc_s.1.dylib ${gcc.cc.lib}/lib/libgcc_s.1.dylib $exe + done + '' + + + # Some scripts used during the build need to have their shebangs patched + '' + patchShebangs ghc-${version}/utils/ + patchShebangs ghc-${version}/configure + '' + + # We have to patch the GMP paths for the integer-gmp package. + '' + find . -name ghc-bignum.buildinfo \ + -exec sed -i "s@extra-lib-dirs: @extra-lib-dirs: ${lib.getLib gmpUsed}/lib@" {} \; + + # we need to modify the package db directly for hadrian bindists + find . -name 'ghc-bignum*.conf' \ + -exec sed -e '/^[a-z-]*library-dirs/a \ ${lib.getLib gmpUsed}/lib' -i {} \; + '' + lib.optionalString stdenv.isDarwin '' + # we need to modify the package db directly for hadrian bindists + # (all darwin bindists are hadrian-based for 9.2.2) + find . -name 'base*.conf' \ + -exec sed -e '/^[a-z-]*library-dirs/a \ ${lib.getLib libiconv}/lib' -i {} \; + + # To link RTS in the end we also need libffi now + find . -name 'rts*.conf' \ + -exec sed -e '/^[a-z-]*library-dirs/a \ ${lib.getLib libffi}/lib' \ + -e 's@/Library/Developer/.*/usr/include/ffi@${lib.getDev libffi}/include@' \ + -i {} \; + '' + + # aarch64 does HAVE_NUMA so -lnuma requires it in library-dirs in rts/package.conf.in + # FFI_LIB_DIR is a good indication of places it must be needed. + lib.optionalString (stdenv.hostPlatform.isLinux && stdenv.hostPlatform.isAarch64) '' + find . -name package.conf.in \ + -exec sed -i "s@FFI_LIB_DIR@FFI_LIB_DIR ${numactl.out}/lib@g" {} \; + '' + + # Rename needed libraries and binaries, fix interpreter + lib.optionalString stdenv.isLinux '' + find . -type f -executable -exec patchelf \ + --interpreter ${stdenv.cc.bintools.dynamicLinker} {} \; + '' + + # The hadrian install Makefile uses 'xxx' as a temporary placeholder in path + # substitution. Which can break the build if the store path / prefix happens + # to contain this string. This will be fixed with 9.2.3 bindists. + # https://gitlab.haskell.org/ghc/ghc/-/issues/21402 + '' + # Detect hadrian Makefile by checking for the target that has the problem + if grep '^update_package_db' ghc-${version}*/Makefile > /dev/null; then + echo Hadrian bindist, applying workaround for xxx path substitution. + # based on https://gitlab.haskell.org/ghc/ghc/-/commit/dd5fecb0e2990b192d92f4dfd7519ecb33164fad.patch + substituteInPlace ghc-${version}*/Makefile --replace 'xxx' '\0xxx\0' + else + echo Not a hadrian bindist, not applying xxx path workaround. + fi + ''; + + # fix for `configure: error: Your linker is affected by binutils #16177` + preConfigure = lib.optionalString + stdenv.targetPlatform.isAarch32 + "LD=ld.gold"; + + configurePlatforms = [ ]; + configureFlags = [ + "--with-gmp-includes=${lib.getDev gmpUsed}/include" + # Note `--with-gmp-libraries` does nothing for GHC bindists: + # https://gitlab.haskell.org/ghc/ghc/-/merge_requests/6124 + ] ++ lib.optional stdenv.isDarwin "--with-gcc=${./gcc-clang-wrapper.sh}" + # From: https://github.com/NixOS/nixpkgs/pull/43369/commits + ++ lib.optional stdenv.hostPlatform.isMusl "--disable-ld-override"; + + # No building is necessary, but calling make without flags ironically + # calls install-strip ... + dontBuild = true; + + # Patch scripts to include runtime dependencies in $PATH. + postInstall = '' + for i in "$out/bin/"*; do + test ! -h "$i" || continue + isScript "$i" || continue + sed -i -e '2i export PATH="${lib.makeBinPath runtimeDeps}:$PATH"' "$i" + done + ''; + + # Apparently necessary for the ghc Alpine (musl) bindist: + # When we strip, and then run the + # patchelf --set-rpath "${libPath}:$(patchelf --print-rpath $p)" $p + # below, running ghc (e.g. during `installCheckPhase)` gives some apparently + # corrupted rpath or whatever makes the loader work on nonsensical strings: + # running install tests + # Error relocating /nix/store/...-ghc-8.10.2-binary/lib/ghc-8.10.5/bin/ghc: : symbol not found + # Error relocating /nix/store/...-ghc-8.10.2-binary/lib/ghc-8.10.5/bin/ghc: ir6zf6c9f86pfx8sr30n2vjy-ghc-8.10.2-binary/lib/ghc-8.10.5/bin/../lib/x86_64-linux-ghc-8.10.5/libHSexceptions-0.10.4-ghc8.10.5.so: symbol not found + # Error relocating /nix/store/...-ghc-8.10.2-binary/lib/ghc-8.10.5/bin/ghc: y/lib/ghc-8.10.5/bin/../lib/x86_64-linux-ghc-8.10.5/libHStemplate-haskell-2.16.0.0-ghc8.10.5.so: symbol not found + # Error relocating /nix/store/...-ghc-8.10.2-binary/lib/ghc-8.10.5/bin/ghc: 8.10.5/libHStemplate-haskell-2.16.0.0-ghc8.10.5.so: symbol not found + # Error relocating /nix/store/...-ghc-8.10.2-binary/lib/ghc-8.10.5/bin/ghc: �: symbol not found + # Error relocating /nix/store/...-ghc-8.10.2-binary/lib/ghc-8.10.5/bin/ghc: �?: symbol not found + # Error relocating /nix/store/...-ghc-8.10.2-binary/lib/ghc-8.10.5/bin/ghc: 64-linux-ghc-8.10.5/libHSexceptions-0.10.4-ghc8.10.5.so: symbol not found + # This is extremely bogus and should be investigated. + dontStrip = if stdenv.hostPlatform.isMusl then true else false; # `if` for explicitness + + # On Linux, use patchelf to modify the executables so that they can + # find editline/gmp. + postFixup = lib.optionalString (stdenv.isLinux && !(binDistUsed.isStatic or false)) + (if stdenv.hostPlatform.isAarch64 then + # Keep rpath as small as possible on aarch64 for patchelf#244. All Elfs + # are 2 directories deep from $out/lib, so pooling symlinks there makes + # a short rpath. + '' + (cd $out/lib; ln -s ${ncurses6.out}/lib/libtinfo.so.6) + (cd $out/lib; ln -s ${lib.getLib gmpUsed}/lib/libgmp.so.10) + (cd $out/lib; ln -s ${numactl.out}/lib/libnuma.so.1) + for p in $(find "$out/lib" -type f -name "*\.so*"); do + (cd $out/lib; ln -s $p) + done + + for p in $(find "$out/lib" -type f -executable); do + if isELF "$p"; then + echo "Patchelfing $p" + patchelf --set-rpath "\$ORIGIN:\$ORIGIN/../.." $p + fi + done + '' + else + '' + for p in $(find "$out" -type f -executable); do + if isELF "$p"; then + echo "Patchelfing $p" + patchelf --set-rpath "${libPath}:$(patchelf --print-rpath $p)" $p + fi + done + '') + lib.optionalString stdenv.isDarwin '' + # not enough room in the object files for the full path to libiconv :( + for exe in $(find "$out" -type f -executable); do + isScript $exe && continue + ln -fs ${libiconv}/lib/libiconv.dylib $(dirname $exe)/libiconv.dylib + install_name_tool -change /usr/lib/libiconv.2.dylib @executable_path/libiconv.dylib -change /usr/local/lib/gcc/6/libgcc_s.1.dylib ${gcc.cc.lib}/lib/libgcc_s.1.dylib $exe + done + + for file in $(find "$out" -name setup-config); do + substituteInPlace $file --replace /usr/bin/ranlib "$(type -P ranlib)" + done + '' + + lib.optionalString minimal '' + # Remove profiling files + find $out -type f -name '*.p_o' -delete + find $out -type f -name '*.p_hi' -delete + find $out -type f -name '*_p.a' -delete + # `-f` because e.g. musl bindist does not have this file. + rm -f $out/lib/ghc-*/bin/ghc-iserv-prof + # Hydra will redistribute this derivation, so we have to keep the docs for + # legal reasons (retaining the legal notices etc) + # As a last resort we could unpack the docs separately and symlink them in. + # They're in $out/share/{doc,man}. + '' + # Recache package db which needs to happen for Hadrian bindists + # where we modify the package db before installing + + '' + "$out/bin/ghc-pkg" --package-db="$out/lib/"ghc-*/package.conf.d recache + ''; + + # In nixpkgs, musl based builds currently enable `pie` hardening by default + # (see `defaultHardeningFlags` in `make-derivation.nix`). + # But GHC cannot currently produce outputs that are ready for `-pie` linking. + # Thus, disable `pie` hardening, otherwise `recompile with -fPIE` errors appear. + # See: + # * https://github.com/NixOS/nixpkgs/issues/129247 + # * https://gitlab.haskell.org/ghc/ghc/-/issues/19580 + hardeningDisable = lib.optional stdenv.targetPlatform.isMusl "pie"; + + doInstallCheck = true; + installCheckPhase = '' + # Sanity check, can ghc create executables? + cd $TMP + mkdir test-ghc; cd test-ghc + cat > main.hs << EOF + {-# LANGUAGE TemplateHaskell #-} + module Main where + main = putStrLn \$([|"yes"|]) + EOF + env -i $out/bin/ghc --make main.hs || exit 1 + echo compilation ok + [ $(./main) == "yes" ] + ''; + + passthru = { + targetPrefix = ""; + enableShared = true; + + inherit llvmPackages; + + # Our Cabal compiler name + haskellCompilerName = "ghc-${version}"; + }; + + meta = rec { + homepage = "http://haskell.org/ghc"; + description = "The Glasgow Haskell Compiler"; + license = lib.licenses.bsd3; + # HACK: since we can't encode the libc / abi in platforms, we need + # to make the platform list dependent on the evaluation platform + # in order to avoid eval errors with musl which supports less + # platforms than the default libcs (i. e. glibc / libSystem). + # This is done for the benefit of Hydra, so `packagePlatforms` + # won't return any platforms that would cause an evaluation + # failure for `pkgsMusl.haskell.compiler.ghc922Binary`, as + # long as the evaluator runs on a platform that supports + # `pkgsMusl`. + platforms = builtins.attrNames ghcBinDists.${distSetName}; + hydraPlatforms = builtins.filter (p: minimal || p != "aarch64-linux") platforms; + maintainers = lib.teams.haskell.members; + }; +} diff --git a/pkgs/development/compilers/hare/disable-failing-test-cases.patch b/pkgs/development/compilers/hare/disable-failing-test-cases.patch new file mode 100644 index 0000000000000..4f8ba6056046d --- /dev/null +++ b/pkgs/development/compilers/hare/disable-failing-test-cases.patch @@ -0,0 +1,37 @@ +diff --git a/math/complex/+test.ha b/math/complex/+test.ha +index a1cc0916..705a0a41 100644 +--- a/math/complex/+test.ha ++++ b/math/complex/+test.ha +@@ -567,8 +567,8 @@ const TEST_COSSC: [](c128, c128) = [ + (math::INF, math::NAN)), // real sign unspecified + ((math::INF, math::NAN), + (math::NAN, math::NAN)), +- ((math::NAN, 0f64), +- (math::NAN, -0f64)), // imaginary sign unspecified ++// ((math::NAN, 0f64), ++// (math::NAN, -0f64)), // imaginary sign unspecified + ((math::NAN, 1f64), + (math::NAN, math::NAN)), + ((math::NAN, math::INF), +@@ -583,8 +583,8 @@ const TEST_COSHSC: [](c128, c128) = [ + (1f64, 0f64)), + ((0f64, math::INF), + (math::NAN, 0f64)), // imaginary sign unspecified +- ((0f64, math::NAN), +- (math::NAN, 0f64)), // imaginary sign unspecified ++// ((0f64, math::NAN), ++// (math::NAN, 0f64)), // imaginary sign unspecified + ((1f64, math::INF), + (math::NAN, math::NAN)), + ((1f64, math::NAN), +@@ -627,8 +627,8 @@ const TEST_EXPSC: [](c128, c128) = [ + (0f64, 0f64)), // real and imaginary sign unspecified + ((math::INF, math::INF), + (math::INF, math::NAN)), // real sign unspecified +- ((-math::INF, math::NAN), +- (0f64, 0f64)), // real and imaginary sign unspecified ++// ((-math::INF, math::NAN), ++// (0f64, 0f64)), // real and imaginary sign unspecified + ((math::INF, math::NAN), + (math::INF, math::NAN)), // real sign unspecified + ((math::NAN, 0f64), diff --git a/pkgs/development/compilers/hare/hare.nix b/pkgs/development/compilers/hare/hare.nix index f5c0cd8e405f5..e24fc68ab4228 100644 --- a/pkgs/development/compilers/hare/hare.nix +++ b/pkgs/development/compilers/hare/hare.nix @@ -11,16 +11,18 @@ stdenv.mkDerivation rec { pname = "hare"; - version = "0.pre+date=2022-04-27"; + version = "unstable-2022-06-18"; src = fetchFromSourcehut { name = pname + "-src"; owner = "~sircmpwn"; repo = pname; - rev = "1bfb2e6dee850c675a8831b41420800d3c62c2a0"; - hash = "sha256-1b7U5u3PM3jmnH/OnY9O++GTPyVOdFkJ0fwJBoDZgSU="; + rev = "ac9b2c35c09d555e09dbd81c5ed95bdfa14313ba"; + hash = "sha256-eeS14LGkbi9IamvKzK+HF0Rvk9NFp4QVYcrHwNSNBx4="; }; + patches = [ ./disable-failing-test-cases.patch ]; + nativeBuildInputs = [ binutils-unwrapped harec @@ -35,6 +37,7 @@ stdenv.mkDerivation rec { qbe ]; + setupHook = ./setup-hook.sh; strictDeps = true; configurePhase = @@ -59,6 +62,7 @@ stdenv.mkDerivation rec { runHook preConfigure export HARECACHE="$NIX_BUILD_TOP/.harecache" + export BINOUT="$NIX_BUILD_TOP/.bin" cat ${config-file} > config.mk runHook postConfigure diff --git a/pkgs/development/compilers/hare/harec.nix b/pkgs/development/compilers/hare/harec.nix index a3ad53350b094..4c77a77bd0d1a 100644 --- a/pkgs/development/compilers/hare/harec.nix +++ b/pkgs/development/compilers/hare/harec.nix @@ -6,14 +6,14 @@ stdenv.mkDerivation rec { pname = "harec"; - version = "0.pre+date=2022-04-26"; + version = "unstable-2022-06-20"; src = fetchFromSourcehut { name = pname + "-src"; owner = "~sircmpwn"; repo = pname; - rev = "e5fb5176ba629e98ace5fcb3aa427b2c25d8fdf0"; - hash = "sha256-sqt3q6sarzrpyJ/1QYM1WTukrZpflAmAYq6pQwAwe18="; + rev = "2eccbc4b959a590dda91143c8487edda841106d9"; + hash = "sha256-pwy7cNxAqIbhx9kpcjfgk7sCEns9oA6zhKSQJdHLZCM="; }; nativeBuildInputs = [ diff --git a/pkgs/development/compilers/hare/setup-hook.sh b/pkgs/development/compilers/hare/setup-hook.sh new file mode 100644 index 0000000000000..999b91df122fa --- /dev/null +++ b/pkgs/development/compilers/hare/setup-hook.sh @@ -0,0 +1,11 @@ +export HARECACHE="$NIX_BUILD_TOP/.harecache" + +addHarepath () { + for haredir in third-party stdlib; do + if [[ -d "$1/src/hare/$haredir" ]]; then + addToSearchPath HAREPATH "$1/src/hare/$haredir" + fi + done +} + +addEnvHooks "$hostOffset" addHarepath diff --git a/pkgs/development/em-modules/generic/default.nix b/pkgs/development/em-modules/generic/default.nix index a859720294160..2f8d7d878a8e0 100644 --- a/pkgs/development/em-modules/generic/default.nix +++ b/pkgs/development/em-modules/generic/default.nix @@ -18,6 +18,9 @@ pkgs.stdenv.mkDerivation ( # fake conftest results with emscripten's python magic EMCONFIGURE_JS=2; + # removes archive indices + dontStrip = args.dontStrip or true; + configurePhase = args.configurePhase or '' # FIXME: Some tests require writing at $HOME HOME=$TMPDIR diff --git a/pkgs/development/haskell-modules/configuration-arm.nix b/pkgs/development/haskell-modules/configuration-arm.nix index 38a176c3db32f..c7bbe3c6137d8 100644 --- a/pkgs/development/haskell-modules/configuration-arm.nix +++ b/pkgs/development/haskell-modules/configuration-arm.nix @@ -112,6 +112,7 @@ self: super: { hls-haddock-comments-plugin = dontCheck super.hls-haddock-comments-plugin; hls-rename-plugin = dontCheck super.hls-rename-plugin; hls-fourmolu-plugin = dontCheck super.hls-fourmolu-plugin; + hls-floskell-plugin = dontCheck super.hls-floskell-plugin; } // lib.optionalAttrs pkgs.stdenv.hostPlatform.isAarch32 { # AARCH32-SPECIFIC OVERRIDES diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix index c162e3feec355..f3396bd24a19c 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -1662,11 +1662,7 @@ self: super: { # waiting for aeson bump servant-swagger-ui-core = doJailbreak super.servant-swagger-ui-core; - hercules-ci-agent = - assert super.hercules-ci-agent.version == "0.9.5"; # >0.9.5: remove source override as sdist will be fixed - overrideSrc - { src = pkgs.fetchFromGitHub { owner = "hercules-ci"; repo = "hercules-ci-agent"; rev = "hercules-ci-agent-0.9.5"; sha256 = "sha256-7d8lf4g8CWHTzIOmma8UKvFIi1Og6RqPH9Lt+6iA4pw="; } + "/hercules-ci-agent"; } - (generateOptparseApplicativeCompletion "hercules-ci-agent" super.hercules-ci-agent); + hercules-ci-agent = generateOptparseApplicativeCompletion "hercules-ci-agent" super.hercules-ci-agent; # Test suite doesn't compile with aeson 2.0 # https://github.com/hercules-ci/hercules-ci-agent/pull/387 diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix/broken.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix/broken.yaml index aa4a3fc2790c3..6c882587c5791 100644 --- a/pkgs/development/haskell-modules/configuration-hackage2nix/broken.yaml +++ b/pkgs/development/haskell-modules/configuration-hackage2nix/broken.yaml @@ -358,6 +358,7 @@ broken-packages: - binary-derive - binary-ext - binary-indexed-tree + - binary-io - binary-protocol - binary-tree - binary-typed @@ -366,6 +367,7 @@ broken-packages: - bindings-apr - bindings-bfd - bindings-cctools + - bindings-common - bindings-dc1394 - bindings-eskit - bindings-EsounD @@ -1777,6 +1779,7 @@ broken-packages: - goatee - gochan - godot-haskell + - godot-megaparsec - gofer-prelude - gogol-core - gooey @@ -2332,6 +2335,7 @@ broken-packages: - houseman - hp2any-core - hpack-convert + - hpapi - hpasteit - HPath - hpc-coveralls @@ -2705,6 +2709,7 @@ broken-packages: - IsNull - iso8601-duration - isobmff + - isomorphism-class - isotope - itcli - itemfield @@ -2868,6 +2873,7 @@ broken-packages: - lambdabot-utils - lambdabot-xmpp - lambda-bridge + - lambda-calculator - lambda-canvas - lambdacms-core - lambda-cube @@ -4155,6 +4161,7 @@ broken-packages: - quenya-verb - querystring-pickle - questioner + - quibble-core - QuickAnnotate - quickcheck-arbitrary-template - quickcheck-property-comb @@ -5831,7 +5838,9 @@ broken-packages: - zendesk-api - zeno - zeolite-lang + - zeromq4-clone-pattern - zeromq4-conduit + - zeromq4-patterns - zeromq-haskell - zettelkast - ZFS diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix/stackage.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix/stackage.yaml index 8c460af7e375f..a7f461652b7ed 100644 --- a/pkgs/development/haskell-modules/configuration-hackage2nix/stackage.yaml +++ b/pkgs/development/haskell-modules/configuration-hackage2nix/stackage.yaml @@ -1,4 +1,4 @@ -# Stackage LTS 19.11 +# Stackage LTS 19.12 # This file is auto-generated by # maintainers/scripts/haskell/update-stackage.sh default-package-overrides: @@ -11,7 +11,7 @@ default-package-overrides: - acid-state ==0.16.1.1 - action-permutations ==0.0.0.1 - active ==0.2.0.15 - - ad ==4.5.1 + - ad ==4.5.2 - ad-delcont ==0.3.0.0 - adjunctions ==4.4.1 - adler32 ==0.1.2.0 @@ -25,7 +25,7 @@ default-package-overrides: - aeson-commit ==1.4 - aeson-compat ==0.3.10 - aeson-diff ==1.1.0.13 - - aeson-extra ==0.5.1 + - aeson-extra ==0.5.1.1 - aeson-generic-compat ==0.0.1.3 - aeson-optics ==1.1.1 - aeson-pretty ==0.8.9 @@ -42,7 +42,7 @@ default-package-overrides: - alex ==3.2.7.1 - alex-meta ==0.3.0.13 - algebra ==4.3.1 - - algebraic-graphs ==0.6 + - algebraic-graphs ==0.6.1 - align-audio ==0.0 - Allure ==0.11.0.0 - almost-fix ==0.0.2 @@ -239,7 +239,7 @@ default-package-overrides: - buffer-builder ==0.2.4.8 - buffer-pipe ==0.0 - bugsnag-haskell ==0.0.4.4 - - bugsnag-hs ==0.2.0.8 + - bugsnag-hs ==0.2.0.9 - bugzilla-redhat ==1.0.0 - burrito ==2.0.1.1 - butcher ==1.3.3.2 @@ -256,7 +256,7 @@ default-package-overrides: - bytestring-conversion ==0.3.2 - bytestring-lexing ==0.5.0.8 - bytestring-mmap ==0.2.2 - - bytestring-strict-builder ==0.4.5.5 + - bytestring-strict-builder ==0.4.5.6 - bytestring-to-vector ==0.3.0.1 - bytestring-tree-builder ==0.2.7.9 - bytestring-trie ==0.2.7 @@ -813,7 +813,7 @@ default-package-overrides: - function-builder ==0.3.0.1 - functor-classes-compat ==2.0.0.2 - functor-combinators ==0.4.1.0 - - fused-effects ==1.1.1.2 + - fused-effects ==1.1.1.3 - fusion-plugin ==0.2.4 - fusion-plugin-types ==0.1.0 - fuzzcheck ==0.1.1 @@ -825,7 +825,7 @@ default-package-overrides: - gd ==3000.7.3 - gdp ==0.0.3.0 - general-games ==1.1.1 - - generic-aeson ==0.2.0.13 + - generic-aeson ==0.2.0.14 - generic-arbitrary ==0.2.2 - generic-constraints ==1.1.1.1 - generic-data ==0.9.2.1 @@ -915,7 +915,7 @@ default-package-overrides: - gi-pango ==1.0.25 - githash ==0.1.6.2 - github ==0.27 - - github-release ==2.0.0.0 + - github-release ==2.0.0.1 - github-rest ==1.1.2 - github-types ==0.2.1 - github-webhooks ==0.15.0 @@ -1182,7 +1182,7 @@ default-package-overrides: - http-common ==0.8.3.4 - http-conduit ==2.3.8 - http-date ==0.0.11 - - http-directory ==0.1.9 + - http-directory ==0.1.10 - http-download ==0.2.0.0 - httpd-shed ==0.4.1.1 - http-io-streams ==0.1.6.1 @@ -1197,7 +1197,7 @@ default-package-overrides: - HUnit-approx ==1.1.1.1 - hunit-dejafu ==2.0.0.5 - hvect ==0.4.0.1 - - hvega ==0.12.0.2 + - hvega ==0.12.0.3 - hw-balancedparens ==0.4.1.2 - hw-bits ==0.7.2.2 - hw-conduit ==0.2.1.1 @@ -1248,7 +1248,7 @@ default-package-overrides: - if ==0.1.0.0 - iff ==0.0.6 - ihaskell ==0.10.2.2 - - ihaskell-hvega ==0.5.0.2 + - ihaskell-hvega ==0.5.0.3 - ihs ==0.1.0.3 - ilist ==0.4.0.1 - imagesize-conduit ==1.1 @@ -1301,7 +1301,7 @@ default-package-overrides: - io-streams ==1.5.2.1 - ip6addr ==1.0.3 - iproute ==1.7.12 - - IPv6Addr ==2.0.4 + - IPv6Addr ==2.0.5 - ipynb ==0.2 - ipython-kernel ==0.10.2.2 - irc ==0.6.1.0 @@ -1326,7 +1326,7 @@ default-package-overrides: - js-flot ==0.8.3 - js-jquery ==3.3.1 - json ==0.10 - - json-feed ==2.0.0.2 + - json-feed ==2.0.0.3 - jsonifier ==0.2.1.1 - jsonpath ==0.2.1.0 - json-stream ==0.4.4.1 @@ -1343,7 +1343,7 @@ default-package-overrides: - katip-logstash ==0.1.0.2 - katip-wai ==0.1.2.0 - kazura-queue ==0.1.0.4 - - keep-alive ==0.2.0.0 + - keep-alive ==0.2.1.0 - keycode ==0.2.2 - keys ==3.12.3 - ki ==0.2.0.1 @@ -1621,7 +1621,7 @@ default-package-overrides: - named ==0.3.0.1 - names-th ==0.3.0.1 - nano-erl ==0.1.0.1 - - NanoID ==3.2.0 + - NanoID ==3.2.1 - nanospec ==0.2.2 - nanovg ==0.8.0.0 - nats ==1.1.2 @@ -1799,7 +1799,7 @@ default-package-overrides: - peano ==0.1.0.1 - pem ==0.2.4 - percent-format ==0.0.2 - - peregrin ==0.3.2 + - peregrin ==0.3.3 - perf ==0.9.0 - perfect-hash-generator ==0.2.0.6 - persist ==0.1.1.5 @@ -1951,7 +1951,7 @@ default-package-overrides: - pulse-simple ==0.1.14 - pureMD5 ==2.1.4 - purescript-bridge ==0.14.0.0 - - pusher-http-haskell ==2.1.0.9 + - pusher-http-haskell ==2.1.0.10 - pvar ==1.0.0.0 - PyF ==0.10.2.0 - qchas ==1.1.0.1 @@ -1998,7 +1998,7 @@ default-package-overrides: - rank2classes ==1.4.4 - Rasterific ==0.7.5.4 - rasterific-svg ==0.3.3.2 - - ratel ==2.0.0.2 + - ratel ==2.0.0.3 - rate-limit ==1.4.2 - ratel-wai ==2.0.0.0 - rattle ==0.2 @@ -2091,7 +2091,7 @@ default-package-overrides: - rope-utf16-splay ==0.3.2.0 - rosezipper ==0.2 - rot13 ==0.2.0.1 - - rpmbuild-order ==0.4.7 + - rpmbuild-order ==0.4.8 - rpm-nvr ==0.1.2 - rp-tree ==0.7.1 - RSA ==2.4.1 @@ -2216,7 +2216,7 @@ default-package-overrides: - ShellCheck ==0.8.0 - shell-conduit ==5.0.0 - shell-escape ==0.2.0 - - shellmet ==0.0.4.0 + - shellmet ==0.0.4.1 - shelltestrunner ==1.9 - shell-utility ==0.1 - shelly ==1.10.0 @@ -2247,7 +2247,7 @@ default-package-overrides: - siphash ==1.0.3 - Sit ==0.2022.3.18 - sitemap-gen ==0.1.0.0 - - sized ==1.0.0.0 + - sized ==1.0.0.1 - skein ==1.0.9.4 - skews ==0.1.0.3 - skip-var ==0.1.1.0 @@ -2370,7 +2370,7 @@ default-package-overrides: - stripe-scotty ==1.1.0.2 - stripe-signature ==1.0.0.14 - stripe-wreq ==1.0.1.14 - - strive ==6.0.0.2 + - strive ==6.0.0.3 - strong-path ==1.1.4.0 - structs ==0.1.6 - structured ==0.1.1 @@ -2382,7 +2382,7 @@ default-package-overrides: - svg-builder ==0.1.1 - SVGFonts ==1.8.0.1 - svg-tree ==0.6.2.4 - - swagger2 ==2.8.2 + - swagger2 ==2.8.4 - swish ==0.10.2.0 - syb ==0.7.2.1 - sydtest-discover ==0.0.0.1 @@ -2587,7 +2587,7 @@ default-package-overrides: - type-level-integers ==0.0.1 - type-level-kv-list ==1.1.0 - type-level-natural-number ==2.0 - - type-level-numbers ==0.1.1.1 + - type-level-numbers ==0.1.1.2 - typelits-witnesses ==0.4.0.0 - type-map ==0.1.7.0 - type-natural ==1.1.0.1 @@ -2641,7 +2641,7 @@ default-package-overrides: - unliftio ==0.2.22.0 - unliftio-core ==0.2.0.1 - unliftio-path ==0.0.2.0 - - unliftio-pool ==0.2.1.1 + - unliftio-pool ==0.2.2.0 - unliftio-streams ==0.1.1.1 - unlit ==0.4.0.0 - unordered-containers ==0.2.17.0 @@ -2718,7 +2718,7 @@ default-package-overrides: - wai-enforce-https ==1.0.0.0 - wai-eventsource ==3.0.0 - wai-extra ==3.1.12.1 - - wai-feature-flags ==0.1.0.3 + - wai-feature-flags ==0.1.0.4 - wai-handler-launch ==3.0.3.1 - wai-logger ==2.4.0 - wai-middleware-caching ==0.1.0.2 @@ -2745,9 +2745,9 @@ default-package-overrides: - wcwidth ==0.0.2 - webex-teams-api ==0.2.0.1 - webex-teams-conduit ==0.2.0.1 - - webgear-core ==1.0.1 - - webgear-openapi ==1.0.1 - - webgear-server ==1.0.1 + - webgear-core ==1.0.2 + - webgear-openapi ==1.0.2 + - webgear-server ==1.0.2 - webpage ==0.0.5.1 - web-plugins ==0.4.1 - web-routes ==0.27.14.4 @@ -2851,7 +2851,7 @@ with-compiler: ghc-9.0.2 - yesod-markdown ==0.12.6.13 - yesod-newsfeed ==1.7.0.0 - yesod-page-cursor ==2.0.1.0 - - yesod-paginator ==1.1.2.1 + - yesod-paginator ==1.1.2.2 - yesod-persistent ==1.6.0.8 - yesod-recaptcha2 ==1.0.2 - yesod-routes-flow ==3.0.0.2 diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix/transitive-broken.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix/transitive-broken.yaml index bfbf505795508..fe20afdc4e712 100644 --- a/pkgs/development/haskell-modules/configuration-hackage2nix/transitive-broken.yaml +++ b/pkgs/development/haskell-modules/configuration-hackage2nix/transitive-broken.yaml @@ -3810,6 +3810,7 @@ dont-distribute-packages: - test-simple - testbench - text-all + - text-builder-dev_0_3_3 - text-generic-pretty - text-json-qq - text-locale-encoding diff --git a/pkgs/development/haskell-modules/hackage-packages.nix b/pkgs/development/haskell-modules/hackage-packages.nix index 914a9c6337e92..706c6a36ee211 100644 --- a/pkgs/development/haskell-modules/hackage-packages.nix +++ b/pkgs/development/haskell-modules/hackage-packages.nix @@ -5721,6 +5721,8 @@ self: { pname = "Euterpea"; version = "2.0.7"; sha256 = "0kxdilxzg0dgz1684csbyfv4cifh9d92ac6pwp6dnrcwwpwskiw8"; + revision = "1"; + editedCabalFile = "1fdkjivbrp9q5vwiprjhpnpl9bir1qdiybc2hm52i016x3rx51d8"; libraryHaskellDepends = [ array arrows base bytestring containers deepseq ghc-prim HCodecs heap PortMidi random stm @@ -11220,8 +11222,8 @@ self: { pname = "HsYAML-aeson"; version = "0.2.0.1"; sha256 = "139hqd07hkr8ykvrgmcshh9f3vp9dnrj6ks5nl8hgrpi990jsy5r"; - revision = "3"; - editedCabalFile = "0gs1gw5wmp7hqh2d0rwkhwzm71gjnivfqd3nd5gzc4yvqqzxplwg"; + revision = "4"; + editedCabalFile = "0njrmdrjnw0i3km50wprfsqmimvqsi90p8kc47d3imgkp6fvcnik"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -11470,8 +11472,8 @@ self: { }: mkDerivation { pname = "IPv6Addr"; - version = "2.0.4"; - sha256 = "1d20cfnxvahcnr8iq71ymyykfl6cgxzl5i6vmdl7ill2bj07xy08"; + version = "2.0.5"; + sha256 = "14zd98kbs3z6gmw9x897x1vslv5qphfhillhwxvnpkz87wsgzsc1"; libraryHaskellDepends = [ aeson attoparsec base iproute network network-info random text ]; @@ -13072,6 +13074,8 @@ self: { pname = "ListLike"; version = "4.7.7"; sha256 = "0h4yfzrf3ljvzf3x75nx791bpxlmdi7f42ff0xyfk8d498iws08a"; + revision = "1"; + editedCabalFile = "155y1r051ar9k8vhb54q5ga7a5rzlm4jx1c42pbw7cfy3c8af6hc"; libraryHaskellDepends = [ array base bytestring containers deepseq dlist fmlist text utf8-string vector @@ -14661,8 +14665,8 @@ self: { }: mkDerivation { pname = "NanoID"; - version = "3.2.0"; - sha256 = "16h4mhr16b2fkf37vpsalnzjmg06sghb86gh1n1w3z64dvad0849"; + version = "3.2.1"; + sha256 = "13917k5s17aq7h4hab3i2b6y3z3c0wq6p9x7hlindks28390i93f"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -21787,12 +21791,12 @@ self: { platforms = lib.platforms.windows; }) {}; - "Win32_2_13_2_0" = callPackage + "Win32_2_13_2_1" = callPackage ({ mkDerivation }: mkDerivation { pname = "Win32"; - version = "2.13.2.0"; - sha256 = "1gmhqb0v3ds7csrmzw211jqjjp955akgp7ykngwnpqb6kpbvpcf4"; + version = "2.13.2.1"; + sha256 = "1fn4z7spq0w2bajg6q8qw6mn3kpz07356zc0shpks8cf6gkmyb8h"; description = "A binding to Windows Win32 API"; license = lib.licenses.bsd3; platforms = lib.platforms.windows; @@ -24619,16 +24623,17 @@ self: { "ad" = callPackage ({ mkDerivation, adjunctions, array, base, comonad, containers , criterion, data-reify, erf, free, nats, reflection, semigroups - , transformers + , tasty, tasty-hunit, transformers }: mkDerivation { pname = "ad"; - version = "4.5.1"; - sha256 = "08hx8ww93x2hg6qxfypd9hyqqcp7c70w17i6hs03qmk4i433h2b9"; + version = "4.5.2"; + sha256 = "08vcp760j6ay8k9zs4qzhvirf775vhni56923jbjzdxrs9mm5167"; libraryHaskellDepends = [ adjunctions array base comonad containers data-reify erf free nats reflection semigroups transformers ]; + testHaskellDepends = [ base tasty tasty-hunit ]; benchmarkHaskellDepends = [ base criterion erf ]; description = "Automatic Differentiation"; license = lib.licenses.bsd3; @@ -25059,6 +25064,8 @@ self: { pname = "aeson"; version = "2.0.3.0"; sha256 = "09dk0j33n262dm75vff3y3i9fm6lh06dyqswwv7a6kvnhhmhlxhr"; + revision = "1"; + editedCabalFile = "1zrgn63jzrpk3n3vd44zkzgw7kb5qxlvhx4nk6g3sswwrsz5j32i"; libraryHaskellDepends = [ attoparsec base base-compat-batteries bytestring containers data-fix deepseq dlist ghc-prim hashable indexed-traversable @@ -25094,6 +25101,8 @@ self: { pname = "aeson"; version = "2.1.0.0"; sha256 = "151wyyw0ip0f2w4mfxcs58c26rsvhaac7s0yba76gnhnzbskwxha"; + revision = "1"; + editedCabalFile = "1zq5rnapvvrhfi4yy1xzi322h5zvmx0c3klpbrb08k92ykvfb98q"; libraryHaskellDepends = [ attoparsec base base-compat-batteries bytestring containers data-fix deepseq dlist generically ghc-prim hashable @@ -25384,35 +25393,6 @@ self: { }) {}; "aeson-extra" = callPackage - ({ mkDerivation, aeson, attoparsec, attoparsec-iso8601, base - , base-compat-batteries, bytestring, containers, deepseq - , exceptions, hashable, parsec, quickcheck-instances - , recursion-schemes, scientific, semialign, tasty, tasty-hunit - , tasty-quickcheck, template-haskell, text, these, time-parsers - , unordered-containers, vector - }: - mkDerivation { - pname = "aeson-extra"; - version = "0.5.1"; - sha256 = "13d01hppx71cm7f901n1bd0hxj69ikbp57i6ckfygc6da0mg49jc"; - revision = "1"; - editedCabalFile = "0minlchivdbpwlfqv7n7ss9cvd7fbpflnmbvs0bcmw1fi83k3b32"; - libraryHaskellDepends = [ - aeson attoparsec attoparsec-iso8601 base base-compat-batteries - bytestring containers deepseq exceptions hashable parsec - recursion-schemes scientific semialign template-haskell text these - unordered-containers vector - ]; - testHaskellDepends = [ - aeson base base-compat-batteries containers quickcheck-instances - tasty tasty-hunit tasty-quickcheck time-parsers - unordered-containers vector - ]; - description = "Extra goodies for aeson"; - license = lib.licenses.bsd3; - }) {}; - - "aeson-extra_0_5_1_1" = callPackage ({ mkDerivation, aeson, attoparsec, base, base-compat-batteries , bytestring, containers, deepseq, quickcheck-instances , recursion-schemes, scientific, semialign, tasty, tasty-hunit @@ -25435,7 +25415,6 @@ self: { ]; description = "Extra goodies for aeson"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; }) {}; "aeson-filthy" = callPackage @@ -25802,8 +25781,8 @@ self: { pname = "aeson-pretty"; version = "0.8.9"; sha256 = "021az9az6xik9c9s3rnar5fr1lgy2h3igibf5ixnc7ps3m2lzg2x"; - revision = "1"; - editedCabalFile = "0x01ryaadmic21dy8ix73k4nkh1hkvwn5vp04vf95a6d30zcmnjf"; + revision = "2"; + editedCabalFile = "1895w56jl4c06wfhv5zf8ayqpzkxgva2rz5xxz8fvfdiza781cgp"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -27261,33 +27240,31 @@ self: { "algebraic-graphs" = callPackage ({ mkDerivation, array, base, containers, deepseq, extra - , inspection-testing, mtl, QuickCheck, transformers + , inspection-testing, QuickCheck, transformers }: mkDerivation { pname = "algebraic-graphs"; - version = "0.6"; - sha256 = "1d3gwyimrzcc7i2qj3iimab3wz6vicgwybhq7ac3da86b8pjlgim"; - revision = "1"; - editedCabalFile = "0f7ih4d0jls7399slxc3zkg38z32jm80jv74iyy42l8s6m5ya1cv"; + version = "0.6.1"; + sha256 = "168aqkm7mfd4is95qwpyf9k0k95qf5rfnkhq5ydbr74jj4jrhr1d"; libraryHaskellDepends = [ - array base containers deepseq mtl transformers + array base containers deepseq transformers ]; testHaskellDepends = [ - array base containers deepseq extra inspection-testing mtl - QuickCheck transformers + array base containers deepseq extra inspection-testing QuickCheck + transformers ]; description = "A library for algebraic graph construction and transformation"; license = lib.licenses.mit; }) {}; - "algebraic-graphs_0_6_1" = callPackage + "algebraic-graphs_0_7" = callPackage ({ mkDerivation, array, base, containers, deepseq, extra , inspection-testing, QuickCheck, transformers }: mkDerivation { pname = "algebraic-graphs"; - version = "0.6.1"; - sha256 = "168aqkm7mfd4is95qwpyf9k0k95qf5rfnkhq5ydbr74jj4jrhr1d"; + version = "0.7"; + sha256 = "0s75h92qb9jdfdyzh0fraxpzj0jl4xvcbqq9cwgba2k9306rl5ai"; libraryHaskellDepends = [ array base containers deepseq transformers ]; @@ -32953,15 +32930,16 @@ self: { }) {}; "appendful" = callPackage - ({ mkDerivation, aeson, base, containers, deepseq, mtl, validity - , validity-containers + ({ mkDerivation, aeson, autodocodec, base, containers, deepseq, mtl + , validity, validity-containers }: mkDerivation { pname = "appendful"; - version = "0.0.0.0"; - sha256 = "1wb2abnr2k7d7bgvh3zjyg55s1236cgnz1idldpxcrib30nr01l8"; + version = "0.1.0.0"; + sha256 = "07bs55kwj0r5q8z9mvihc890yfan9whis8q1n5k27sbqpfbwaqws"; libraryHaskellDepends = [ - aeson base containers deepseq mtl validity validity-containers + aeson autodocodec base containers deepseq mtl validity + validity-containers ]; license = lib.licenses.mit; }) {}; @@ -33306,6 +33284,8 @@ self: { pname = "approximate"; version = "0.3.5"; sha256 = "1f168ac9xryrv50k7gvh89xv0mj6c42cxw7pj01pqcbppbs0rm3g"; + revision = "1"; + editedCabalFile = "1dv6jk6hin5bvzdvdz10nlk4xfhn03mdd90f8g94ah4gyqsx6sfk"; libraryHaskellDepends = [ base binary bytes cereal comonad deepseq ghc-prim hashable lens log-domain pointed safecopy semigroupoids semigroups vector @@ -37034,6 +37014,8 @@ self: { pname = "aur"; version = "7.0.7"; sha256 = "0k8b3rc89ibln7idb1a1f6g3p04f1n7mnk8q8nqiggygf8r6sdnh"; + revision = "1"; + editedCabalFile = "0lxhkpxxg7gvwa47bdk2hi0f9ww1kvrmkwy41ar64lp124frcvsf"; libraryHaskellDepends = [ aeson base bytestring hashable http-client http-types text ]; @@ -37076,6 +37058,8 @@ self: { pname = "aura"; version = "3.2.9"; sha256 = "0hw96090gb4rf6n6mf9mn2y50sjgcvny2ipdd9720an33nhpsd3m"; + revision = "3"; + editedCabalFile = "0ah0hdb3inqbmvriwx67hd7rbj5qkh3q103bvbdd0zj7zaqlz30k"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -37268,8 +37252,8 @@ self: { }: mkDerivation { pname = "autodocodec-openapi3"; - version = "0.2.0.0"; - sha256 = "1r9csd9v01pwiz1vhydpn3jnp5jk45shkfmizgpnn8p1mfkms55j"; + version = "0.2.1.0"; + sha256 = "1nd1r7r258dxhrdjwc7m8byrv99b1zqapvj8021yq8j1nad8mjvg"; libraryHaskellDepends = [ aeson autodocodec base insert-ordered-containers lens mtl openapi3 scientific text unordered-containers @@ -37995,6 +37979,8 @@ self: { pname = "aws-cloudfront-signed-cookies"; version = "0.2.0.11"; sha256 = "018a3q443h19pbcc178ns7zdmsdd3pz8ww3yfixrhr4jfghws3r9"; + revision = "2"; + editedCabalFile = "1i8zyr3kz1cm8ygzpkvxyfqzlnykkwsfa41yrb5k89729fw51dnm"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -40342,6 +40328,17 @@ self: { mainProgram = "base91"; }) {}; + "based" = callPackage + ({ mkDerivation, base }: + mkDerivation { + pname = "based"; + version = "0.1"; + sha256 = "1s4nacp3ripdn895c863hmnpaqmbkiisjp3y45v1q28qdjy052qv"; + libraryHaskellDepends = [ base ]; + description = "alternative prelude"; + license = lib.licenses.mit; + }) {}; + "basement" = callPackage ({ mkDerivation, base, ghc-prim }: mkDerivation { @@ -41324,8 +41321,8 @@ self: { }: mkDerivation { pname = "bearriver"; - version = "0.13.4"; - sha256 = "1c2w0ll84mrzkwg3314pnmasgaql0yjhrb5wy7zlm18s3bgpcysb"; + version = "0.13.5"; + sha256 = "08r6i7xs7n9054m80svqbyjgy6c5diypxswwjkc3gxrcn1s0fqkv"; libraryHaskellDepends = [ base dunai MonadRandom mtl simple-affine-space transformers ]; @@ -42608,6 +42605,8 @@ self: { ]; description = "Read and write values of types that implement Binary"; license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + broken = true; }) {}; "binary-list" = callPackage @@ -43184,6 +43183,8 @@ self: { libraryHaskellDepends = [ base ]; description = "This package is obsolete. Look for bindings-DSL instead."; license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + broken = true; }) {}; "bindings-dc1394" = callPackage @@ -45159,6 +45160,8 @@ self: { pname = "bitvec"; version = "1.1.2.0"; sha256 = "0h7c5kpx43bm6qqnkpbzma9n201987cnq1231zg33p3xp7qc1hm2"; + revision = "1"; + editedCabalFile = "0kf70z3adgdhmwc91ymr2y3jlg9irnz4hzck3l9im1d3zxs1lyvs"; libraryHaskellDepends = [ base bytestring deepseq ghc-bignum primitive vector ]; @@ -45173,6 +45176,30 @@ self: { license = lib.licenses.bsd3; }) {}; + "bitvec_1_1_3_0" = callPackage + ({ mkDerivation, base, bytestring, containers, deepseq, ghc-bignum + , primitive, quickcheck-classes, quickcheck-classes-base, random + , tasty, tasty-bench, tasty-quickcheck, vector + }: + mkDerivation { + pname = "bitvec"; + version = "1.1.3.0"; + sha256 = "0l85lshzh5c0s59pbbh76vg65bzz7x4y1a9gdvj4dkqz1bsklk0w"; + libraryHaskellDepends = [ + base bytestring deepseq ghc-bignum primitive vector + ]; + testHaskellDepends = [ + base ghc-bignum primitive quickcheck-classes + quickcheck-classes-base tasty tasty-quickcheck vector + ]; + benchmarkHaskellDepends = [ + base containers ghc-bignum random tasty-bench vector + ]; + description = "Space-efficient bit vectors"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + }) {}; + "bitwise" = callPackage ({ mkDerivation, array, base, bytestring, criterion, QuickCheck }: mkDerivation { @@ -45197,8 +45224,8 @@ self: { pname = "bitwise-enum"; version = "1.0.1.0"; sha256 = "0vmdr8csmxwab7s4nmqdfpqdssivh90fddk94i8wkwj1la867y1z"; - revision = "1"; - editedCabalFile = "0g4w46bv0pj52v3kfcc41g9m750il67fg78n54s91p6jam6l0r6h"; + revision = "3"; + editedCabalFile = "1f94gscpmffhx1m88nq6h6y46b1xpzp1kwfxb362zq6k1rq7dbk9"; libraryHaskellDepends = [ aeson array base deepseq mono-traversable vector ]; @@ -45472,8 +45499,8 @@ self: { pname = "blank-canvas"; version = "0.7.3"; sha256 = "1g10959ly5nv2xfhax4pamzxnxkqbniahplc5za8k5r4nq1vjrm2"; - revision = "8"; - editedCabalFile = "1l5aj1p7db93qq1jxndv77csizwr6pbfm0g98d1mv7zgqanks3dd"; + revision = "9"; + editedCabalFile = "1qzwy8kd25crnnm1m4sks6daqsm01i7pi8z96wnv1aa056vwiqx2"; enableSeparateDataOutput = true; libraryHaskellDepends = [ aeson base base-compat-batteries base64-bytestring bytestring @@ -47962,7 +47989,7 @@ self: { license = lib.licenses.bsd3; }) {}; - "brick_0_69" = callPackage + "brick_0_70_1" = callPackage ({ mkDerivation, base, bytestring, config-ini, containers , contravariant, data-clist, deepseq, directory, dlist, exceptions , filepath, microlens, microlens-mtl, microlens-th, QuickCheck, stm @@ -47971,8 +47998,8 @@ self: { }: mkDerivation { pname = "brick"; - version = "0.69"; - sha256 = "1q963gpcjcrnsyrypkb238ay8lbkq8745pxkanmhy4m40gvk5j94"; + version = "0.70.1"; + sha256 = "18i1i06ll6pklzaazcl2bzbi3w5zdn43l9wvkclhfcmddjy19lp4"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -48935,23 +48962,6 @@ self: { }: mkDerivation { pname = "bugsnag-hs"; - version = "0.2.0.8"; - sha256 = "1qnbkp2c5fhv6b9mq3xr849if418qihy6xczzlsf7q4y0vx36kg9"; - enableSeparateDataOutput = true; - libraryHaskellDepends = [ - aeson base bytestring http-client text time unordered-containers - ]; - testHaskellDepends = [ aeson base bytestring hedgehog ]; - description = "A Bugsnag client for Haskell"; - license = lib.licenses.bsd3; - }) {}; - - "bugsnag-hs_0_2_0_9" = callPackage - ({ mkDerivation, aeson, base, bytestring, hedgehog, http-client - , text, time, unordered-containers - }: - mkDerivation { - pname = "bugsnag-hs"; version = "0.2.0.9"; sha256 = "0af7xgjcgv5wly2hq0n82paa4qi35xv726y3f44zcvipjh8c4zvq"; enableSeparateDataOutput = true; @@ -48961,7 +48971,6 @@ self: { testHaskellDepends = [ aeson base bytestring hedgehog ]; description = "A Bugsnag client for Haskell"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; }) {}; "bugsnag-wai" = callPackage @@ -50291,25 +50300,6 @@ self: { }: mkDerivation { pname = "bytestring-strict-builder"; - version = "0.4.5.5"; - sha256 = "1knin3mfj2qfh7xhvbrpakd037y7qqic24f1w93v8p6y5g7bc3zp"; - libraryHaskellDepends = [ base bytestring ]; - testHaskellDepends = [ - QuickCheck quickcheck-instances rerebase tasty tasty-hunit - tasty-quickcheck - ]; - benchmarkHaskellDepends = [ criterion rerebase ]; - description = "An efficient strict bytestring builder"; - license = lib.licenses.mit; - }) {}; - - "bytestring-strict-builder_0_4_5_6" = callPackage - ({ mkDerivation, base, bytestring, criterion, QuickCheck - , quickcheck-instances, rerebase, tasty, tasty-hunit - , tasty-quickcheck - }: - mkDerivation { - pname = "bytestring-strict-builder"; version = "0.4.5.6"; sha256 = "0zqi65jpf6f3gyhcg11hfn7b457c3zsmgsyqx8gi9sqh5pzn34kw"; libraryHaskellDepends = [ base bytestring ]; @@ -50320,7 +50310,6 @@ self: { benchmarkHaskellDepends = [ criterion rerebase ]; description = "An efficient strict bytestring builder"; license = lib.licenses.mit; - hydraPlatforms = lib.platforms.none; }) {}; "bytestring-substring" = callPackage @@ -54529,8 +54518,8 @@ self: { pname = "cassava"; version = "0.5.2.0"; sha256 = "01h1zrdqb313cjd4rqm1107azzx4czqi018c2djf66a5i7ajl3dk"; - revision = "7"; - editedCabalFile = "1zb16h20w4p3qqvrg4m9rhnyrbpx1ga4r6azrzy1h8vsw09vcbsz"; + revision = "8"; + editedCabalFile = "17vm6016k4phznax0v4jbg14wckwwxlx9q0kkrvz1m2zcbjk8r9h"; configureFlags = [ "-f-bytestring--lt-0_10_4" ]; libraryHaskellDepends = [ array attoparsec base bytestring containers deepseq hashable Only @@ -55052,15 +55041,15 @@ self: { broken = true; }) {}; - "cayley-client_0_4_18" = callPackage + "cayley-client_0_4_19" = callPackage ({ mkDerivation, aeson, attoparsec, base, binary, bytestring , exceptions, hspec, http-client, http-conduit, lens, lens-aeson , mtl, text, transformers, unordered-containers, vector }: mkDerivation { pname = "cayley-client"; - version = "0.4.18"; - sha256 = "0zdv66p9klc6px8ch6239k2p4pi3px28k50918kq80wl94msigns"; + version = "0.4.19"; + sha256 = "0qfi56wkf9ycd7dhah01pc1vlaims4p8mscdcq7xc3pc3m4vvjs2"; libraryHaskellDepends = [ aeson attoparsec base binary bytestring exceptions http-client http-conduit lens lens-aeson mtl text transformers @@ -58026,7 +58015,7 @@ self: { license = lib.licenses.bsd2; }) {}; - "citeproc_0_7" = callPackage + "citeproc_0_8" = callPackage ({ mkDerivation, aeson, attoparsec, base, bytestring , case-insensitive, containers, data-default, Diff, directory , file-embed, filepath, mtl, pandoc-types, pretty, safe, scientific @@ -58035,8 +58024,8 @@ self: { }: mkDerivation { pname = "citeproc"; - version = "0.7"; - sha256 = "1xsfsz6hdp0ickps1qafkfn7pwjxc22a5ib3bl99jdjbx7fql6h9"; + version = "0.8"; + sha256 = "13f89nnx1g91cpnw1cp28nv33lrvp8swdkxlcbgvsfm38gs684qc"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -63194,8 +63183,8 @@ self: { pname = "compensated"; version = "0.8.3"; sha256 = "0xigi4pcw581d8kjbhdjkksyz9bgcgvq0j17br9z1x6a3hw1m39a"; - revision = "1"; - editedCabalFile = "0c1yzvchjbrv5q6b24y74026082f408d2kqv1789a27z78awfhwm"; + revision = "2"; + editedCabalFile = "0nr81fm5b8pavgyf0n34199jvr2zp18y0cdlzas240xwpgxn6k1p"; libraryHaskellDepends = [ base bifunctors binary bytes cereal comonad deepseq distributive hashable lens log-domain safecopy semigroupoids semigroups vector @@ -65164,8 +65153,8 @@ self: { pname = "conferer"; version = "1.1.0.0"; sha256 = "1hkdrqxrac1mbzvd29f6ds4cbihdv0j0daai7yc282myv0varh09"; - revision = "1"; - editedCabalFile = "0xr6910zn9j07gwc9f9dmlgxiagirmpzjzb9vlaqc0qvpawgq201"; + revision = "2"; + editedCabalFile = "0j7q975kg4dchl7pn8cl26sf8945bmhw5mvy73s18ylxqx4qqkwb"; libraryHaskellDepends = [ base bytestring containers directory filepath text ]; @@ -65185,6 +65174,8 @@ self: { pname = "conferer-aeson"; version = "1.1.0.2"; sha256 = "07rdal3smq1s14zmsn7g26vc6sqj21rsa2a1vcbrwrfgh9x36jkn"; + revision = "1"; + editedCabalFile = "19v6xla4vvhmhqh3z82inp1b6jzvprbvcmd9nbg1l65nsvqgq25a"; libraryHaskellDepends = [ aeson base bytestring conferer directory text unordered-containers vector @@ -67703,6 +67694,26 @@ self: { license = lib.licenses.mit; }) {}; + "core-data_0_3_4_0" = callPackage + ({ mkDerivation, aeson, base, bytestring, containers, core-text + , hashable, hourglass, prettyprinter, scientific, text, time + , unordered-containers, uuid, vector + }: + mkDerivation { + pname = "core-data"; + version = "0.3.4.0"; + sha256 = "07f90lhjv9vpnymidq6kyrnz6s2w3slvy2nwzjxvbia2p22nqmak"; + revision = "1"; + editedCabalFile = "1zc0y1f2mzycdnyd5f8dmkhnwc15bczhf2i82y45bjy4pg3890vg"; + libraryHaskellDepends = [ + aeson base bytestring containers core-text hashable hourglass + prettyprinter scientific text time unordered-containers uuid vector + ]; + description = "Convenience wrappers around common data structures and encodings"; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + }) {}; + "core-haskell" = callPackage ({ mkDerivation, base, haskeline, haskell-src-exts, hint }: mkDerivation { @@ -67742,7 +67753,7 @@ self: { license = lib.licenses.mit; }) {}; - "core-program_0_5_0_4" = callPackage + "core-program_0_5_1_0" = callPackage ({ mkDerivation, async, base, bytestring, core-data, core-text , directory, exceptions, filepath, fsnotify, hashable, hourglass , mtl, prettyprinter, safe-exceptions, stm, template-haskell @@ -67751,8 +67762,10 @@ self: { }: mkDerivation { pname = "core-program"; - version = "0.5.0.4"; - sha256 = "1s3b80hx4fzpibh79l42hhpw8lf01s85s5l3xa8jgnv32lisllby"; + version = "0.5.1.0"; + sha256 = "0h9iw9kdj947zlzjd9gi4xlnldrqpgw80vla31c0zhl4dmib6a22"; + revision = "1"; + editedCabalFile = "1920jl5yxwgj64wacgx929b054icq7bz73p06rqfm38wkj87bqa3"; libraryHaskellDepends = [ async base bytestring core-data core-text directory exceptions filepath fsnotify hashable hourglass mtl prettyprinter @@ -67802,6 +67815,24 @@ self: { license = lib.licenses.mit; }) {}; + "core-text_0_3_8_0" = callPackage + ({ mkDerivation, ansi-terminal, base, bytestring, colour, deepseq + , fingertree, hashable, prettyprinter, template-haskell, text + , text-short + }: + mkDerivation { + pname = "core-text"; + version = "0.3.8.0"; + sha256 = "1vl463wdgnfb795nbir355w1cgy5ndqnwgfiiyr1j73xmngmvw04"; + libraryHaskellDepends = [ + ansi-terminal base bytestring colour deepseq fingertree hashable + prettyprinter template-haskell text text-short + ]; + description = "A rope type based on a finger tree over UTF-8 fragments"; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + }) {}; + "core-warn" = callPackage ({ mkDerivation, base, containers, containers-good-graph, ghc, syb }: @@ -70756,16 +70787,16 @@ self: { }) {}; "css-easings" = callPackage - ({ mkDerivation, aeson, base, blaze-markup, data-default, deepseq - , QuickCheck, scientific, shakespeare, text + ({ mkDerivation, aeson, base, blaze-markup, data-default-class + , deepseq, QuickCheck, scientific, shakespeare, text }: mkDerivation { pname = "css-easings"; - version = "0.2.2.0"; - sha256 = "0ks42vnvj5qffs5zwnplsrqjd9c90xxlcfgcqdhl0iw5fxxnfipj"; + version = "0.2.3.0"; + sha256 = "1mammajx15ingmzk974b35lflq9bi2ri2rgpwd76zhzlzy91vca6"; libraryHaskellDepends = [ - aeson base blaze-markup data-default deepseq QuickCheck scientific - shakespeare text + aeson base blaze-markup data-default-class deepseq QuickCheck + scientific shakespeare text ]; description = "Defining and manipulating css easing strings"; license = lib.licenses.bsd3; @@ -76392,6 +76423,29 @@ self: { license = lib.licenses.mit; }) {}; + "deferred-folds_0_9_18_2" = callPackage + ({ mkDerivation, base, bytestring, containers, foldl, hashable + , primitive, QuickCheck, quickcheck-instances, rerebase, tasty + , tasty-hunit, tasty-quickcheck, text, transformers + , unordered-containers, vector + }: + mkDerivation { + pname = "deferred-folds"; + version = "0.9.18.2"; + sha256 = "0amlxdgz1yfql1r7w6z9gy6gncihp5nm1fl2bxrk7027hc0wdp96"; + libraryHaskellDepends = [ + base bytestring containers foldl hashable primitive text + transformers unordered-containers vector + ]; + testHaskellDepends = [ + QuickCheck quickcheck-instances rerebase tasty tasty-hunit + tasty-quickcheck + ]; + description = "Abstractions over deferred folds"; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + }) {}; + "definitive-base" = callPackage ({ mkDerivation, array, base, bytestring, containers, deepseq , ghc-prim, GLURaw, OpenGL, OpenGLRaw, primitive, vector @@ -78159,8 +78213,8 @@ self: { pname = "dhall"; version = "1.41.1"; sha256 = "09flx2mfl8mzszn0hx80fai3ryiwgjkbxyklfkpmm5hw1smkdslv"; - revision = "1"; - editedCabalFile = "19lgfkyg1p9crrf3gi508zya477vma2ks7ib7hw0r84sl4jjiaji"; + revision = "3"; + editedCabalFile = "0x4dkfg3257c4vq05ca7jcyk7p446djzzwwc5j509wj23mrqf30h"; isLibrary = true; isExecutable = true; enableSeparateDataOutput = true; @@ -78302,6 +78356,8 @@ self: { pname = "dhall-csv"; version = "1.0.2"; sha256 = "08m9gjjldbzbgqr7vb33xjnzn7vmhf8gp9zh73vvzbchflwgh48p"; + revision = "1"; + editedCabalFile = "08zavv7bpb4033imzqmbxpxh51a3srcy58h85k4nmii73xv1iwzg"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -78433,6 +78489,8 @@ self: { pname = "dhall-json"; version = "1.7.10"; sha256 = "11gpsgd3aafqh9v10gib7yivy3dp7dhd1a3dslf2ivc7na3d8p71"; + revision = "1"; + editedCabalFile = "1dhs90y4jn2ipc1x0srd3a5qrgh0pj0laqd7mmqgwr3l9f0p19g6"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -78484,8 +78542,8 @@ self: { pname = "dhall-lsp-server"; version = "1.1.1"; sha256 = "0z4gc27fpz1pcjbajwpxgn0zhxlp9xp47lyg55p03ghfpqa2mcl6"; - revision = "2"; - editedCabalFile = "1618pkfdv887sj9i572db8sgz0jl7lpkmil4fkdc8irh2y45wl6r"; + revision = "3"; + editedCabalFile = "0lb51q09fdsnwlfsgna8ssv3434w550kla193kslbrmx5vsi04kp"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -78564,6 +78622,8 @@ self: { pname = "dhall-nixpkgs"; version = "1.0.8"; sha256 = "1jr9njnly63d5bzd9np7hijmczkwamb4j2k14h647h6i3hhkxh8n"; + revision = "1"; + editedCabalFile = "0navmlh0yh3abk114x7grv7rcbxxvk1yvh3lvnwc23qq6gm34r79"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -78587,6 +78647,8 @@ self: { pname = "dhall-openapi"; version = "1.0.4"; sha256 = "1hvjilm1hjq4963l7xnr1r35x023pgddv0l3bvfgryd58zv728ah"; + revision = "2"; + editedCabalFile = "1vb7hka8iwprl555zl20z6wgl1zkah6bj02b9r0x6b99mds463x0"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -78730,6 +78792,8 @@ self: { pname = "dhall-yaml"; version = "1.2.10"; sha256 = "1a3g84799lbq7v9bzdq9bcwzyzci07rd1x42325ck4x51hrqs8nn"; + revision = "1"; + editedCabalFile = "1jfzpwbcg17mqk9c2f1lhqjwadxm1k04rd91j4h4gd5wnsvb85i4"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -80308,6 +80372,28 @@ self: { license = lib.licenses.bsd3; }) {}; + "dimensional_1_5" = callPackage + ({ mkDerivation, base, criterion, deepseq, doctest, exact-pi, Glob + , hspec, hspec-discover, ieee754, numtype-dk, QuickCheck + , template-haskell, vector + }: + mkDerivation { + pname = "dimensional"; + version = "1.5"; + sha256 = "16d50vlln11hq894y8qxrg4cricz1459dg14z0wc1fzfiydxb6ns"; + libraryHaskellDepends = [ + base deepseq exact-pi ieee754 numtype-dk vector + ]; + testHaskellDepends = [ + base doctest Glob hspec QuickCheck template-haskell + ]; + testToolDepends = [ hspec-discover ]; + benchmarkHaskellDepends = [ base criterion deepseq ]; + description = "Statically checked physical dimensions"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + }) {}; + "dimensional-codata" = callPackage ({ mkDerivation, base, dimensional, numtype-dk }: mkDerivation { @@ -82468,6 +82554,25 @@ self: { mainProgram = "dmenu-search"; }) {}; + "dnf-repo" = callPackage + ({ mkDerivation, base, directory, extra, filepath, simple-cmd + , simple-cmd-args + }: + mkDerivation { + pname = "dnf-repo"; + version = "0.1"; + sha256 = "1xsicihfdvygqpnham4y0cixd07iyh4mxcjrmbivrc3mglb3qgf2"; + isLibrary = false; + isExecutable = true; + enableSeparateDataOutput = true; + executableHaskellDepends = [ + base directory extra filepath simple-cmd simple-cmd-args + ]; + description = "DNF wrapper tool to control repos"; + license = lib.licenses.bsd3; + mainProgram = "dnf-repo"; + }) {}; + "dns" = callPackage ({ mkDerivation, array, async, attoparsec, auto-update, base , base16-bytestring, base64-bytestring, bytestring, containers @@ -82876,8 +82981,8 @@ self: { }: mkDerivation { pname = "docker"; - version = "0.7.0.0"; - sha256 = "1w228qhnl54v3d69ln4y5s64ywvcsd202m1m3ry8j6lsgfj1hawm"; + version = "0.7.0.1"; + sha256 = "18qbwfr930hnz0wrcvq6xzma64lmvh1f69b5nick540wsfbwcqg3"; libraryHaskellDepends = [ aeson base blaze-builder bytestring conduit conduit-combinators conduit-extra containers data-default-class directory exceptions @@ -83763,8 +83868,8 @@ self: { }: mkDerivation { pname = "dormouse-client"; - version = "0.2.0.0"; - sha256 = "1l5vhlvl5kl4m5shl2rysj16r7wqkqwy1i1yb3r96zx8rbwhi2j8"; + version = "0.2.1.0"; + sha256 = "09qkmlgfq0p2d7amil9af6zbd3p2ayhziv8sr152zim4g0v2nmmk"; libraryHaskellDepends = [ aeson attoparsec base bytestring case-insensitive containers dormouse-uri http-api-data http-client http-client-tls http-types @@ -85305,6 +85410,24 @@ self: { maintainers = [ lib.maintainers.turion ]; }) {}; + "dunai_0_8_3" = callPackage + ({ mkDerivation, base, MonadRandom, simple-affine-space, tasty + , tasty-hunit, transformers, transformers-base + }: + mkDerivation { + pname = "dunai"; + version = "0.8.3"; + sha256 = "1xkc7a337g6xg2wgj1sphpmvj22y2fkifs36s7iws7cr7fqx1a1p"; + libraryHaskellDepends = [ + base MonadRandom simple-affine-space transformers transformers-base + ]; + testHaskellDepends = [ base tasty tasty-hunit transformers ]; + description = "Generalised reactive framework supporting classic, arrowized and monadic FRP"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + maintainers = [ lib.maintainers.turion ]; + }) {}; + "dunai-core" = callPackage ({ mkDerivation, base, MonadRandom, transformers, transformers-base }: @@ -85325,8 +85448,8 @@ self: { ({ mkDerivation, base, dunai, normaldistribution, QuickCheck }: mkDerivation { pname = "dunai-test"; - version = "0.8.2"; - sha256 = "0cicvzp604945mmlnrxwkkcyl01id933jrnnrv3y0c5xqlly2y9r"; + version = "0.8.3"; + sha256 = "07kirfcyzanscp0kdhgsg0pf809nwf6im0m104xrsrxkak1iqkh4"; libraryHaskellDepends = [ base dunai normaldistribution QuickCheck ]; @@ -86484,8 +86607,8 @@ self: { }: mkDerivation { pname = "eccrypto"; - version = "0.2.2"; - sha256 = "1avzxzzlhldpjp6k14jirx3ws5818bpsip9p0wj6kl1g3ii7ydjz"; + version = "0.2.3"; + sha256 = "16jysii88v1wkm3g7vjx9vdhzcjqq1dlfrjkf2hccrcxz8wqv4d1"; enableSeparateDataOutput = true; libraryHaskellDepends = [ base bytestring cryptohash-sha512 integer-gmp @@ -99645,6 +99768,8 @@ self: { pname = "folds"; version = "0.7.8"; sha256 = "11278546mq05rhyjfmhg0iasqjsn898l44dhp5qgaw1zwzywir2i"; + revision = "1"; + editedCabalFile = "1gxb8469w12afd1adf5cn32wxvnvndavxwr65dyc6icqvalbkirn"; configureFlags = [ "-f-test-hlint" ]; libraryHaskellDepends = [ adjunctions base bifunctors comonad constraints contravariant @@ -103147,8 +103272,8 @@ self: { }: mkDerivation { pname = "fused-effects"; - version = "1.1.1.2"; - sha256 = "1icm2mk4xbijahn7srv5dhnrlgx7fx5m0si75ixj1g1s16s2v8sf"; + version = "1.1.1.3"; + sha256 = "046d6r1sbcqvinla14hhfb6f2ynryz5ixqzf4q2fjd3g0c4pfm88"; libraryHaskellDepends = [ base transformers ]; testHaskellDepends = [ base containers hedgehog hedgehog-fn inspection-testing @@ -105018,24 +105143,6 @@ self: { }: mkDerivation { pname = "generic-aeson"; - version = "0.2.0.13"; - sha256 = "0w5xp1rfg3r90ja1f0s48i4x7yyynfv52p6b9ncsdqyrq3y9qvl0"; - revision = "1"; - editedCabalFile = "07kg0bc2jvfww9a9n5rzffsi23k2i3py7h7dq7qcj7817kkh0ig0"; - libraryHaskellDepends = [ - aeson attoparsec base generic-deriving mtl tagged text - unordered-containers vector - ]; - description = "Derivation of Aeson instances using GHC generics"; - license = lib.licenses.bsd3; - }) {}; - - "generic-aeson_0_2_0_14" = callPackage - ({ mkDerivation, aeson, attoparsec, base, generic-deriving, mtl - , tagged, text, unordered-containers, vector - }: - mkDerivation { - pname = "generic-aeson"; version = "0.2.0.14"; sha256 = "0ssras2db9fqgyfhhw2pk827xf4dd4g9s9vwj8g85vaqxyvzyd8x"; libraryHaskellDepends = [ @@ -105044,7 +105151,6 @@ self: { ]; description = "Derivation of Aeson instances using GHC generics"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; }) {}; "generic-arbitrary" = callPackage @@ -111566,8 +111672,8 @@ self: { }: mkDerivation { pname = "github-release"; - version = "2.0.0.0"; - sha256 = "03bvbqpaa3xp9rnmg8a95qs9j7chng1xsk53f30520m1cfyyikgq"; + version = "2.0.0.1"; + sha256 = "1ic4qg7gbmf28hhzzcg8907grwdai9vxj41gz7f3wzjyph8q574g"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -113558,22 +113664,24 @@ self: { }) {}; "godot-megaparsec" = callPackage - ({ mkDerivation, base, criterion, lens, megaparsec, text - , unordered-containers + ({ mkDerivation, base, criterion, generic-lens, lens, megaparsec + , mtl, text, unordered-containers }: mkDerivation { pname = "godot-megaparsec"; - version = "0.2.2.0"; - sha256 = "0rlbvvanf8y9drnr8f5fszylkchl70ddhlfcib9d03albvw1xllb"; + version = "0.2.5.1"; + sha256 = "1k5bil98zc6pw363mb2hmmlsq27zjf7j7xfwa61vg41bxyz88nqz"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ - base lens megaparsec text unordered-containers + base generic-lens lens megaparsec mtl text unordered-containers ]; executableHaskellDepends = [ base criterion megaparsec text ]; - description = "Megaparsec parser for Godot `tscn` and `gdns` files"; + description = "Megaparsec parser for Godot `tscn` and `gdextension` files"; license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; mainProgram = "bench"; + broken = true; }) {}; "gofer-prelude" = callPackage @@ -116706,8 +116814,8 @@ self: { ({ mkDerivation, base, criterion, hedgehog }: mkDerivation { pname = "grab"; - version = "0.0.0.7"; - sha256 = "14r5asraz28apc7fhyf36ai1i6ndgf29c32ln5nk88s6z1fnlhvk"; + version = "0.0.0.8"; + sha256 = "0g3b79q985r6r6dfd97x1fhdj8fh35qnz9b34b78982qg60pl6y6"; libraryHaskellDepends = [ base ]; testHaskellDepends = [ base hedgehog ]; benchmarkHaskellDepends = [ base criterion ]; @@ -116719,8 +116827,8 @@ self: { ({ mkDerivation, base, containers, grab, hedgehog, text }: mkDerivation { pname = "grab-form"; - version = "0.0.0.7"; - sha256 = "0hqj0b6lv3qs5cs4rhsmk3prd25x8v6m04ilab8jck3c01lfksfm"; + version = "0.0.0.8"; + sha256 = "0q1lx6lybariwhnlbg49m683jppn6da5q8h3xmg795m420x1dk5a"; libraryHaskellDepends = [ base containers grab text ]; testHaskellDepends = [ base containers grab hedgehog text ]; description = "Applicative parsers for form parameter lists"; @@ -129382,8 +129490,8 @@ self: { }: mkDerivation { pname = "haspara"; - version = "0.0.0.3"; - sha256 = "1gfrqabmnv4fqfq9w03s6aj1rg5ba54nfrjcmbg9msy7sclsrx5i"; + version = "0.0.0.4"; + sha256 = "0jl6ncf16lc4h9w6w8n59b3z58h5g4ddcmjm5ml2pd1qgp5ncilh"; libraryHaskellDepends = [ aeson base containers exceptions hashable megaparsec mtl refined safe-decimal scientific template-haskell text time @@ -129448,6 +129556,33 @@ self: { license = lib.licenses.mit; }) {}; + "hasql_1_5_0_4" = callPackage + ({ mkDerivation, attoparsec, base, bytestring + , bytestring-strict-builder, contravariant, contravariant-extras + , dlist, gauge, hashable, hashtables, mtl, postgresql-binary + , postgresql-libpq, profunctors, QuickCheck, quickcheck-instances + , rerebase, tasty, tasty-hunit, tasty-quickcheck, text + , text-builder, transformers, vector + }: + mkDerivation { + pname = "hasql"; + version = "1.5.0.4"; + sha256 = "01jfjx9l10f28w395r1990r6l5i15bw1333d968m2qgnx5l04vw3"; + libraryHaskellDepends = [ + attoparsec base bytestring bytestring-strict-builder contravariant + dlist hashable hashtables mtl postgresql-binary postgresql-libpq + profunctors text text-builder transformers vector + ]; + testHaskellDepends = [ + contravariant-extras QuickCheck quickcheck-instances rerebase tasty + tasty-hunit tasty-quickcheck + ]; + benchmarkHaskellDepends = [ gauge rerebase ]; + description = "An efficient PostgreSQL driver with a flexible mapping API"; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + }) {}; + "hasql-backend" = callPackage ({ mkDerivation, base, base-prelude, bytestring, either, free , list-t, text, transformers, vector @@ -129597,8 +129732,8 @@ self: { }: mkDerivation { pname = "hasql-implicits"; - version = "0.1.0.3"; - sha256 = "0xw7yy146adc805cr95ijm06ynmzinidngy16vgcfaqph0zx1ks2"; + version = "0.1.0.4"; + sha256 = "1ls8ximzpgr3p4301xgxjfl17dff4ljpxwps205nblh1d7bkda6a"; libraryHaskellDepends = [ aeson base bytestring containers hasql network-ip scientific text time uuid vector @@ -129985,6 +130120,25 @@ self: { license = lib.licenses.mit; }) {}; + "hasql-th_0_4_0_15" = callPackage + ({ mkDerivation, base, bytestring, containers, contravariant, foldl + , hasql, postgresql-syntax, template-haskell + , template-haskell-compat-v0208, text, uuid, vector + }: + mkDerivation { + pname = "hasql-th"; + version = "0.4.0.15"; + sha256 = "0h8cg8w16hn315hwdgamik9vwqslpgrbrhsd109w0lrv5l27xywz"; + libraryHaskellDepends = [ + base bytestring containers contravariant foldl hasql + postgresql-syntax template-haskell template-haskell-compat-v0208 + text uuid vector + ]; + description = "Template Haskell utilities for Hasql"; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + }) {}; + "hasql-transaction" = callPackage ({ mkDerivation, async, base, bytestring, bytestring-tree-builder , contravariant, contravariant-extras, hasql, mtl, rerebase @@ -132480,13 +132634,13 @@ self: { }: mkDerivation { pname = "hedgehog-golden"; - version = "1.0.0"; - sha256 = "17ja3ch042kvk0fpd1gd9nnj9x5jbl37vxn579hr9rimwgf99az7"; + version = "1.0.1"; + sha256 = "1pjzpsn0dq07dnvf6nixz0jghskwkngjhki2hqc4bnw2ha5h3fdl"; libraryHaskellDepends = [ aeson aeson-pretty base bytestring containers Diff directory extra hedgehog text ]; - testHaskellDepends = [ base hedgehog ]; + testHaskellDepends = [ aeson base hedgehog ]; description = "Golden testing capabilities for hedgehog using Aeson"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; @@ -133405,8 +133559,8 @@ self: { }: mkDerivation { pname = "hercules-ci-agent"; - version = "0.9.5"; - sha256 = "121s8x61ya4p921zs38r4grqvpi4jkhinlys394hajlqniz7mh6h"; + version = "0.9.6"; + sha256 = "1viy6h0jslhr5ln06g1yqmgqjr36yl6014v8m2fzlnszga761v6y"; isLibrary = true; isExecutable = true; enableSeparateDataOutput = true; @@ -133550,8 +133704,8 @@ self: { }: mkDerivation { pname = "hercules-ci-cli"; - version = "0.3.1"; - sha256 = "1653riw0r3l2lyx69346h19cbrxqw12bmzbpnjmmdkcr9h3g36k6"; + version = "0.3.2"; + sha256 = "1lr7ai19zq55y1ib7133llajpx4n041xv6gv797d1ibk03qj69gc"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -133590,8 +133744,8 @@ self: { }: mkDerivation { pname = "hercules-ci-cnix-expr"; - version = "0.3.2.0"; - sha256 = "03zqj51ch9n49p13554mischjv3vz02dlbnswz714bz78rxw7lbv"; + version = "0.3.3.0"; + sha256 = "03c579y14cnynnrgfj2p41q65aplhr5ayc8i38yzvm96i5d6w6yq"; enableSeparateDataOutput = true; setupHaskellDepends = [ base Cabal cabal-pkg-config-version-hook ]; libraryHaskellDepends = [ @@ -133620,8 +133774,8 @@ self: { }: mkDerivation { pname = "hercules-ci-cnix-store"; - version = "0.3.2.0"; - sha256 = "1s4vwjsk7sj7627yaq9i1c3ghxk83gdhhvf50p6fl93mji5513k3"; + version = "0.3.3.0"; + sha256 = "0h4igygjmi8z9dyfidizs04f9yhnibdba523h8996lf7s2dxb6g9"; setupHaskellDepends = [ base Cabal cabal-pkg-config-version-hook ]; libraryHaskellDepends = [ base bytestring conduit containers inline-c inline-c-cpp protolude @@ -135604,8 +135758,8 @@ self: { pname = "hiedb"; version = "0.4.1.0"; sha256 = "1389qmlga5rq8has02rn35pzag5wnfpx3w77r60mzl3b4pkpzi7i"; - revision = "1"; - editedCabalFile = "1ayy7xjbwfbdln1bqk9lpv2afc8kbzxyz9858gfafdd08kx0xmw1"; + revision = "2"; + editedCabalFile = "1mlsjdd41a89znafqssafwghlvk6bkijk5qkbgrm61h1h7flir2j"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -141994,6 +142148,8 @@ self: { description = "Binding for the PAPI library"; license = lib.licenses.bsd3; platforms = lib.platforms.linux; + hydraPlatforms = lib.platforms.none; + broken = true; }) {inherit (pkgs) papi;}; "hpaste" = callPackage @@ -146121,7 +146277,7 @@ self: { license = lib.licenses.mit; }) {}; - "hslua_2_2_0" = callPackage + "hslua_2_2_1" = callPackage ({ mkDerivation, base, bytestring, containers, exceptions , hslua-aeson, hslua-classes, hslua-core, hslua-marshalling , hslua-objectorientation, hslua-packaging, lua, lua-arbitrary, mtl @@ -146130,10 +146286,8 @@ self: { }: mkDerivation { pname = "hslua"; - version = "2.2.0"; - sha256 = "1krx9ay31q2rvnjncyirw77h7ljg20qqcix2zin81ws6wy4lwirq"; - revision = "1"; - editedCabalFile = "08zpky44l0hnk8l4xbasv47mn3043i7bn510jnrcldgj99zsaii1"; + version = "2.2.1"; + sha256 = "1q587cjwb29jsf71hhmra6djr2sycbx2hr0rhwlgvb8ax699vkv3"; libraryHaskellDepends = [ base bytestring containers exceptions hslua-aeson hslua-classes hslua-core hslua-marshalling hslua-objectorientation @@ -146264,15 +146418,15 @@ self: { license = lib.licenses.mit; }) {}; - "hslua-core_2_2_0" = callPackage + "hslua-core_2_2_1" = callPackage ({ mkDerivation, base, bytestring, exceptions, lua, lua-arbitrary , mtl, QuickCheck, quickcheck-instances, tasty, tasty-hunit , tasty-quickcheck, text }: mkDerivation { pname = "hslua-core"; - version = "2.2.0"; - sha256 = "1nwh0alhnwgg4rzl113nlh8bkkq89dk9d9vl0iihipj9s2mk84bh"; + version = "2.2.1"; + sha256 = "0hy3a7rn940bcj0shxyk75dndwl23wwmmvbnwnay36py60hy3rbq"; libraryHaskellDepends = [ base bytestring exceptions lua mtl text ]; @@ -146323,17 +146477,15 @@ self: { license = lib.licenses.mit; }) {}; - "hslua-marshalling_2_2_0" = callPackage + "hslua-marshalling_2_2_1" = callPackage ({ mkDerivation, base, bytestring, containers, hslua-core , lua-arbitrary, mtl, QuickCheck, quickcheck-instances, tasty , tasty-hslua, tasty-hunit, tasty-quickcheck, text }: mkDerivation { pname = "hslua-marshalling"; - version = "2.2.0"; - sha256 = "0mwj7zqzgzijlx40amwzs4jbldd0vbjqv3x791kdxip3yyvnlyqi"; - revision = "1"; - editedCabalFile = "1k9f13rjivvg18a6l5pcmd844s0yxgg1cl6g4hk05g4bngibnhkh"; + version = "2.2.1"; + sha256 = "1xmix1frfcyv4p51rnshrg02gba7di7nrrc6chsq71d3mbwhyask"; libraryHaskellDepends = [ base bytestring containers hslua-core mtl text ]; @@ -146462,7 +146614,7 @@ self: { license = lib.licenses.mit; }) {}; - "hslua-objectorientation_2_2_0_1" = callPackage + "hslua-objectorientation_2_2_1" = callPackage ({ mkDerivation, base, bytestring, containers, exceptions , hslua-core, hslua-marshalling, lua-arbitrary, mtl, QuickCheck , quickcheck-instances, tasty, tasty-hslua, tasty-hunit @@ -146470,8 +146622,8 @@ self: { }: mkDerivation { pname = "hslua-objectorientation"; - version = "2.2.0.1"; - sha256 = "04fm0d3rvb06k7b7jka2prlhnh7dl2j2410jdl5pbbnfkwbaw1q7"; + version = "2.2.1"; + sha256 = "13011yzz6lrgl2gasn9w5ggdqgrdz49hhqk1h259qd9gq29jnq3y"; libraryHaskellDepends = [ base bytestring containers exceptions hslua-core hslua-marshalling mtl text @@ -146507,15 +146659,15 @@ self: { license = lib.licenses.mit; }) {}; - "hslua-packaging_2_2_0_1" = callPackage + "hslua-packaging_2_2_1" = callPackage ({ mkDerivation, base, bytestring, containers, hslua-core , hslua-marshalling, hslua-objectorientation, mtl, tasty , tasty-hslua, tasty-hunit, text }: mkDerivation { pname = "hslua-packaging"; - version = "2.2.0.1"; - sha256 = "0kyc50xrfnxnhhx2xic1ajd0p0dkhlv0w88yykl4fncpb0i2wc25"; + version = "2.2.1"; + sha256 = "1yxfrsxmmsb96lyfihlk9ks53l2z2aln3whfqaha7grs3gx1yaib"; libraryHaskellDepends = [ base containers hslua-core hslua-marshalling hslua-objectorientation mtl text @@ -149716,6 +149868,17 @@ self: { hydraPlatforms = lib.platforms.none; }) {}; + "http-client-brread-timeout" = callPackage + ({ mkDerivation, base, bytestring, http-client }: + mkDerivation { + pname = "http-client-brread-timeout"; + version = "0.1.0.1"; + sha256 = "04p98qkii1g6mk3cjra6ij73ks6qv0r2p7naq9j1rwvr9m7n1d4p"; + libraryHaskellDepends = [ base bytestring http-client ]; + description = "Http client with time-limited brRead"; + license = lib.licenses.mit; + }) {}; + "http-client-conduit" = callPackage ({ mkDerivation, base, http-client }: mkDerivation { @@ -150065,26 +150228,6 @@ self: { }: mkDerivation { pname = "http-directory"; - version = "0.1.9"; - sha256 = "0hvrajwap7ilqi6ika0vd3hf83k1p3wr3ck6bvz8kayim8ih7apz"; - libraryHaskellDepends = [ - base bytestring html-conduit http-client http-client-tls - http-conduit http-date http-types network-uri text time xml-conduit - ]; - testHaskellDepends = [ base hspec text ]; - description = "http directory listing library"; - license = lib.licenses.mit; - hydraPlatforms = lib.platforms.none; - broken = true; - }) {}; - - "http-directory_0_1_10" = callPackage - ({ mkDerivation, base, bytestring, hspec, html-conduit, http-client - , http-client-tls, http-conduit, http-date, http-types, network-uri - , text, time, xml-conduit - }: - mkDerivation { - pname = "http-directory"; version = "0.1.10"; sha256 = "1dgmd24n0r6r0yjndk62rxvs8nrbzqgdszjg5ad2wm26abynzdgy"; libraryHaskellDepends = [ @@ -151718,25 +151861,6 @@ self: { }: mkDerivation { pname = "hvega"; - version = "0.12.0.2"; - sha256 = "0m78j7w7sf09yvvs995pvk66ifli7q1bl7r739mgm9dgxaw7wqhm"; - isLibrary = true; - isExecutable = true; - libraryHaskellDepends = [ aeson base text unordered-containers ]; - testHaskellDepends = [ - aeson aeson-pretty base bytestring containers filepath tasty - tasty-golden text unordered-containers - ]; - description = "Create Vega-Lite visualizations (version 4) in Haskell"; - license = lib.licenses.bsd3; - }) {}; - - "hvega_0_12_0_3" = callPackage - ({ mkDerivation, aeson, aeson-pretty, base, bytestring, containers - , filepath, tasty, tasty-golden, text, unordered-containers - }: - mkDerivation { - pname = "hvega"; version = "0.12.0.3"; sha256 = "1dmc8va82qzr9c7kn8w3nm70f3nb59gz3f6178j6iaph0acplyfh"; isLibrary = true; @@ -151748,7 +151872,6 @@ self: { ]; description = "Create Vega-Lite visualizations (version 4) in Haskell"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; }) {}; "hvega-theme" = callPackage @@ -153632,6 +153755,20 @@ self: { license = lib.licenses.bsd3; }) {}; + "hybrid-vectors_0_2_3" = callPackage + ({ mkDerivation, base, deepseq, primitive, semigroups, vector }: + mkDerivation { + pname = "hybrid-vectors"; + version = "0.2.3"; + sha256 = "0g3z482sd0j930ja3g9cyc4xnjby03d4cq8x56crsl61arr81r1c"; + libraryHaskellDepends = [ + base deepseq primitive semigroups vector + ]; + description = "Hybrid vectors e.g. Mixed Boxed/Unboxed vectors"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + }) {}; + "hydra-hs" = callPackage ({ mkDerivation, base, hmatrix, sixense_x64 }: mkDerivation { @@ -154087,6 +154224,8 @@ self: { pname = "hyperloglog"; version = "0.4.6"; sha256 = "0zwg4dhgasa9sx7pbjjjb9kz2bnhb3r2daij2b572cszv65l91nv"; + revision = "1"; + editedCabalFile = "1vpzs2sj0p4y0dy88fvb0imfks84655ilw1n56dpkfz3kn4dqaq8"; libraryHaskellDepends = [ approximate base binary bits bytes bytestring cereal cereal-vector comonad cpu deepseq distributive hashable lens reflection @@ -155487,23 +155626,11 @@ self: { ({ mkDerivation, aeson, base, hvega, ihaskell, text }: mkDerivation { pname = "ihaskell-hvega"; - version = "0.5.0.2"; - sha256 = "0r0q4hfjcm2p229k2xwyh9xrxbm6i3vpy13rjpsv4x5n30rsv56s"; - libraryHaskellDepends = [ aeson base hvega ihaskell text ]; - description = "IHaskell display instance for hvega types"; - license = lib.licenses.bsd3; - }) {}; - - "ihaskell-hvega_0_5_0_3" = callPackage - ({ mkDerivation, aeson, base, hvega, ihaskell, text }: - mkDerivation { - pname = "ihaskell-hvega"; version = "0.5.0.3"; sha256 = "12bznrjb3qgy9di9p3faymaba8wsbx7v9gp5zxifnad6aqwlblf8"; libraryHaskellDepends = [ aeson base hvega ihaskell text ]; description = "IHaskell display instance for hvega types"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; }) {}; "ihaskell-inline-r" = callPackage @@ -156995,6 +157122,8 @@ self: { pname = "indexed-traversable-instances"; version = "0.1.1"; sha256 = "0i4s8fbqbgvkd2na48zwhlrcjpwxkx5rdh6f9fq2h4sl7c1d23hh"; + revision = "1"; + editedCabalFile = "1655cf712kkjrpf0axwgdf7y6yjqnf2njyijlfr3mdzzy6dkagwb"; libraryHaskellDepends = [ base indexed-traversable OneTuple tagged unordered-containers vector @@ -159003,6 +159132,8 @@ self: { pname = "invert"; version = "1.0.0.2"; sha256 = "13zl9i6g7ygkm3pgm7b72815cfp66mykxzp5vwy5kqakr8c3w1fp"; + revision = "1"; + editedCabalFile = "01qaybywd30b5s3clvw4bblq9pviwckgc2claf7lvl4fq6hjqszs"; libraryHaskellDepends = [ base containers generic-deriving hashable unordered-containers vector @@ -160429,6 +160560,30 @@ self: { hydraPlatforms = lib.platforms.none; }) {}; + "isomorphism-class" = callPackage + ({ mkDerivation, base, bytestring, containers, hashable, primitive + , QuickCheck, quickcheck-instances, rebase, tasty, tasty-hunit + , tasty-quickcheck, text, unordered-containers, vector + }: + mkDerivation { + pname = "isomorphism-class"; + version = "0.1.0.1"; + sha256 = "1iynpy0mz1y569p8im3x9a48z73r7mz191dy0cm9x878r79hbplz"; + libraryHaskellDepends = [ + base bytestring containers hashable primitive text + unordered-containers vector + ]; + testHaskellDepends = [ + base bytestring containers hashable primitive QuickCheck + quickcheck-instances rebase tasty tasty-hunit tasty-quickcheck text + unordered-containers vector + ]; + description = "Isomorphism typeclass solving the conversion problem"; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + broken = true; + }) {}; + "isotope" = callPackage ({ mkDerivation, base, containers, hspec, megaparsec, QuickCheck , template-haskell, th-lift @@ -163060,10 +163215,8 @@ self: { }: mkDerivation { pname = "json-directory"; - version = "0.1.0.1"; - sha256 = "145z46hh3ba3g7niwv9kf5djfv3xa1q5fmwadi629h7grfij0rr3"; - revision = "2"; - editedCabalFile = "0rid8i7chq7ca81m6kyhd0dl3ig8k24fk7mq5ydnhgdfnd25v78g"; + version = "0.1.0.2"; + sha256 = "12fwzazj88hd6a6fgr2rf1m276j2zsxs5fwczkyhak892c2w3hx6"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -163140,8 +163293,8 @@ self: { }: mkDerivation { pname = "json-feed"; - version = "2.0.0.2"; - sha256 = "075385gvk01r6iw5v7d019y9fa9xng4nx574qjxrxp3nci9gv4rq"; + version = "2.0.0.3"; + sha256 = "0hil16m7higmcvjgdjmrq9r1cdwq13jyp9fz7hm83j1hra2z4i5j"; libraryHaskellDepends = [ aeson base bytestring mime-types network-uri tagsoup text time ]; @@ -165582,18 +165735,6 @@ self: { }) {}; "keep-alive" = callPackage - ({ mkDerivation, base }: - mkDerivation { - pname = "keep-alive"; - version = "0.2.0.0"; - sha256 = "1hkmm1933y6dlzr88p75kkl6qiw5jnb1f4klfbwbl2d3jx8fg92k"; - libraryHaskellDepends = [ base ]; - testHaskellDepends = [ base ]; - description = "TCP keep alive implementation"; - license = lib.licenses.bsd3; - }) {}; - - "keep-alive_0_2_1_0" = callPackage ({ mkDerivation, base, network }: mkDerivation { pname = "keep-alive"; @@ -165603,7 +165744,6 @@ self: { testHaskellDepends = [ base network ]; description = "TCP keep alive implementation"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; }) {}; "keera-callbacks" = callPackage @@ -167857,7 +167997,9 @@ self: { ]; description = "A lambda calculus interpreter"; license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; mainProgram = "lambda-calculator"; + broken = true; }) {}; "lambda-calculus-interpreter" = callPackage @@ -171208,8 +171350,8 @@ self: { }: mkDerivation { pname = "ldap-scim-bridge"; - version = "0.7"; - sha256 = "1vy8ccdjp4s8pbv1jckd53c07gzykzjacdk104bcvfj8pv09k7cq"; + version = "0.8"; + sha256 = "04klp9n61q63bvpcn7i12q35dfm6r3mivjpw8708pxqq1mkd2qf2"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -171854,6 +171996,8 @@ self: { pname = "lens"; version = "5.1.1"; sha256 = "08mkm2mjvhmwg9hc4kd4cd6dgmcszs1p2mzp1nmri7lqbpy9jknc"; + revision = "1"; + editedCabalFile = "19z3k7ikpfa96b86yabxghfqpnq9d0ayy4gdlvci3ycvws0s8cy6"; libraryHaskellDepends = [ array assoc base base-orphans bifunctors bytestring call-stack comonad containers contravariant distributive exceptions filepath @@ -171933,8 +172077,8 @@ self: { pname = "lens-aeson"; version = "1.2.1"; sha256 = "08x0vbkay8d6s24fzy2iria0hl9pmq891cnzm6zl0j9j53z9jw9l"; - revision = "2"; - editedCabalFile = "0pbnfpr8l1nbskh7sn40jazrfmbzsnw8xgw2iyk7dnqwfl6vzirs"; + revision = "3"; + editedCabalFile = "0lqpl5fhl94fm3xcwf8ssz7yg9nyfxp9bw2z959x7hg6bcqmv9p1"; libraryHaskellDepends = [ aeson attoparsec base bytestring lens scientific text text-short unordered-containers vector @@ -172544,18 +172688,19 @@ self: { }) {inherit (pkgs) leveldb;}; "levenshtein" = callPackage - ({ mkDerivation, base, binary, data-default, deepseq, hashable - , hspec, hspec-discover, QuickCheck + ({ mkDerivation, base, binary, criterion, data-default-class + , deepseq, hashable, hspec, hspec-discover, QuickCheck }: mkDerivation { pname = "levenshtein"; - version = "0.1.3.0"; - sha256 = "1h9xygy65npn2a5pgngqzm39k9ms3krzn1in9h0adln6aq2kcgdx"; + version = "0.2.0.0"; + sha256 = "0q0q19xjp37gl3xadfm1i70q5dwyh1b3699rf0b3rb6zb13py839"; libraryHaskellDepends = [ - base binary data-default deepseq hashable QuickCheck + base binary data-default-class deepseq hashable QuickCheck ]; - testHaskellDepends = [ base hspec QuickCheck ]; + testHaskellDepends = [ base data-default-class hspec QuickCheck ]; testToolDepends = [ hspec-discover ]; + benchmarkHaskellDepends = [ base criterion deepseq ]; description = "Calculate the edit distance between two foldables"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; @@ -174611,6 +174756,34 @@ self: { license = lib.licenses.bsd3; }) {}; + "linear_1_21_10" = callPackage + ({ mkDerivation, adjunctions, base, base-orphans, binary, bytes + , bytestring, cereal, containers, deepseq, distributive, ghc-prim + , hashable, HUnit, indexed-traversable, lens, random, reflection + , semigroupoids, semigroups, simple-reflect, tagged + , template-haskell, test-framework, test-framework-hunit + , transformers, transformers-compat, unordered-containers, vector + , void + }: + mkDerivation { + pname = "linear"; + version = "1.21.10"; + sha256 = "1d3s1p4imkifn7dccqci2qiwcg99x22kf250hzh4fh4xghi361xr"; + libraryHaskellDepends = [ + adjunctions base base-orphans binary bytes cereal containers + deepseq distributive ghc-prim hashable indexed-traversable lens + random reflection semigroupoids semigroups tagged template-haskell + transformers transformers-compat unordered-containers vector void + ]; + testHaskellDepends = [ + base binary bytestring deepseq HUnit reflection simple-reflect + test-framework test-framework-hunit vector + ]; + description = "Linear Algebra"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + }) {}; + "linear-accelerate" = callPackage ({ mkDerivation, accelerate, base, Cabal, cabal-doctest , distributive, doctest, lens, linear @@ -177579,6 +177752,8 @@ self: { pname = "log-domain"; version = "0.13.2"; sha256 = "0i4fx9k8cwjvmj0pgfnbici1b68zmif1jmmqxplpjqy32ksnyifa"; + revision = "1"; + editedCabalFile = "0nbfbp7a6x3vppavra7pf28l2wwlci3qgps60igqgjkbdcvq7w8c"; libraryHaskellDepends = [ base binary bytes cereal comonad deepseq distributive hashable semigroupoids semigroups vector @@ -179046,6 +179221,38 @@ self: { license = lib.licenses.mit; }) {}; + "lsp_1_5_0_0" = callPackage + ({ mkDerivation, aeson, async, attoparsec, base, bytestring + , co-log-core, containers, data-default, directory, exceptions + , filepath, hashable, hspec, hspec-discover, lens, lsp-types, mtl + , network-uri, prettyprinter, QuickCheck, quickcheck-instances + , random, scientific, sorted-list, stm, temporary, text, text-rope + , time, transformers, unliftio-core, unordered-containers, uuid + }: + mkDerivation { + pname = "lsp"; + version = "1.5.0.0"; + sha256 = "0cqrdsq4w4nwhzpxadxa5mvh3cn1zy9wjsq7ib38r6b09zxzi3i7"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + aeson async attoparsec base bytestring co-log-core containers + data-default directory exceptions filepath hashable lens lsp-types + mtl network-uri prettyprinter random scientific sorted-list stm + temporary text text-rope time transformers unliftio-core + unordered-containers uuid + ]; + testHaskellDepends = [ + aeson base containers filepath hspec lens network-uri QuickCheck + quickcheck-instances sorted-list text text-rope + unordered-containers + ]; + testToolDepends = [ hspec-discover ]; + description = "Haskell library for the Microsoft Language Server Protocol"; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + }) {}; + "lsp-test" = callPackage ({ mkDerivation, aeson, aeson-pretty, ansi-terminal, async, base , bytestring, conduit, conduit-parse, containers, data-default @@ -179075,6 +179282,35 @@ self: { license = lib.licenses.bsd3; }) {}; + "lsp-test_0_14_0_3" = callPackage + ({ mkDerivation, aeson, aeson-pretty, ansi-terminal, async, base + , bytestring, co-log-core, conduit, conduit-parse, containers + , data-default, Diff, directory, extra, filepath, Glob, hspec, lens + , lsp, lsp-types, mtl, parser-combinators, process, some, text + , time, transformers, unix, unliftio, unordered-containers + }: + mkDerivation { + pname = "lsp-test"; + version = "0.14.0.3"; + sha256 = "110hkf91033m1vg90mj7ifq5214r4a2qwswkgb0ahj4sd8c0hsa7"; + libraryHaskellDepends = [ + aeson aeson-pretty ansi-terminal async base bytestring co-log-core + conduit conduit-parse containers data-default Diff directory + filepath Glob lens lsp lsp-types mtl parser-combinators process + some text time transformers unix unordered-containers + ]; + testHaskellDepends = [ + aeson base co-log-core data-default directory filepath hspec lens + lsp mtl parser-combinators process text unliftio + unordered-containers + ]; + testToolDepends = [ lsp ]; + benchmarkHaskellDepends = [ base extra lsp process ]; + description = "Functional test framework for LSP servers"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + }) {}; + "lsp-types" = callPackage ({ mkDerivation, aeson, base, binary, bytestring, containers , data-default, deepseq, Diff, directory, dlist, filepath, hashable @@ -179096,6 +179332,26 @@ self: { license = lib.licenses.mit; }) {}; + "lsp-types_1_5_0_0" = callPackage + ({ mkDerivation, aeson, base, binary, containers, data-default + , deepseq, Diff, dlist, filepath, hashable, lens, mod, mtl + , network-uri, scientific, some, template-haskell, text + , unordered-containers + }: + mkDerivation { + pname = "lsp-types"; + version = "1.5.0.0"; + sha256 = "18hbhwd0cl32dbw88wskpxkqvnkym0rvjm46mcpnz3nxa1rdbn0m"; + libraryHaskellDepends = [ + aeson base binary containers data-default deepseq Diff dlist + filepath hashable lens mod mtl network-uri scientific some + template-haskell text unordered-containers + ]; + description = "Haskell library for the Microsoft Language Server Protocol, data types"; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + }) {}; + "lss" = callPackage ({ mkDerivation, attoparsec, base, containers, directory, filepath , hspec2, language-css, language-css-attoparsec, text, xmlhtml @@ -179257,12 +179513,12 @@ self: { license = lib.licenses.mit; }) {inherit (pkgs) lua5_3;}; - "lua_2_2_0" = callPackage + "lua_2_2_1" = callPackage ({ mkDerivation, base, lua5_4, tasty, tasty-hunit }: mkDerivation { pname = "lua"; - version = "2.2.0"; - sha256 = "1258i5a3b16lbkgfdzgibqx3q4csd5wvk2gzqp96kkjcndfva92d"; + version = "2.2.1"; + sha256 = "07wni3ji46ndqabwffgwzij2jk34dq2d66z15hcd6jg33sqnym45"; configureFlags = [ "-fsystem-lua" "-f-use-pkgconfig" ]; libraryHaskellDepends = [ base ]; librarySystemDepends = [ lua5_4 ]; @@ -184236,19 +184492,19 @@ self: { "melf" = callPackage ({ mkDerivation, base, binary, bytestring, containers, directory , exceptions, filepath, mtl, optparse-applicative, prettyprinter - , singletons, tasty, tasty-golden, tasty-hunit, template-haskell - , unix + , singletons, singletons-base, singletons-th, tasty, tasty-golden + , tasty-hunit, template-haskell, unix }: mkDerivation { pname = "melf"; - version = "1.0.2"; - sha256 = "065nsazfsh8f6j2g80c2wppq5zm502ngwbn3lyzg2y42im4cdycx"; + version = "1.1.0"; + sha256 = "0d8rc67yirdj03i1gdcyip51q3qbzfghfblwqzdm85hlhp7vidic"; isLibrary = true; isExecutable = true; enableSeparateDataOutput = true; libraryHaskellDepends = [ base binary bytestring exceptions mtl prettyprinter singletons - template-haskell + singletons-base singletons-th template-haskell ]; executableHaskellDepends = [ base binary bytestring exceptions optparse-applicative @@ -184256,7 +184512,8 @@ self: { ]; testHaskellDepends = [ base binary bytestring containers directory exceptions filepath mtl - prettyprinter singletons tasty tasty-golden tasty-hunit unix + prettyprinter singletons singletons-th tasty tasty-golden + tasty-hunit unix ]; description = "An Elf parser"; license = lib.licenses.bsd3; @@ -184875,15 +185132,15 @@ self: { }) {}; "mergeful" = callPackage - ({ mkDerivation, aeson, base, containers, deepseq, mtl, text, time - , validity, validity-containers, validity-time + ({ mkDerivation, aeson, autodocodec, base, containers, deepseq, mtl + , text, time, validity, validity-containers, validity-time }: mkDerivation { pname = "mergeful"; - version = "0.2.0.0"; - sha256 = "0cvx0qs4j7jbamz5dz23dii7car8dq5wz0qvkbckb3ymbrf16ywa"; + version = "0.3.0.0"; + sha256 = "1w7ccngqcgvwysw1zbdm0qr6hscqc3dnza9n1cp6xfdb80qjqynn"; libraryHaskellDepends = [ - aeson base containers deepseq mtl text time validity + aeson autodocodec base containers deepseq mtl text time validity validity-containers validity-time ]; license = lib.licenses.mit; @@ -184930,6 +185187,22 @@ self: { license = lib.licenses.mit; }) {}; + "mergeless_0_4_0_0" = callPackage + ({ mkDerivation, aeson, autodocodec, base, containers, deepseq, mtl + , text, validity, validity-containers + }: + mkDerivation { + pname = "mergeless"; + version = "0.4.0.0"; + sha256 = "0iy4l51kqldgm9wv60g524q67rag9rswapxrymrfy89cshyc5hib"; + libraryHaskellDepends = [ + aeson autodocodec base containers deepseq mtl text validity + validity-containers + ]; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + }) {}; + "mergeless-persistent" = callPackage ({ mkDerivation, base, containers, genvalidity, genvalidity-hspec , genvalidity-mergeless, genvalidity-persistent, hspec, mergeless @@ -185976,8 +186249,8 @@ self: { pname = "microstache"; version = "1.0.2.1"; sha256 = "12i2sx2rv2ai77m95gvfm93jcjk6q5i4cgfyxjrhyx3ll94z775v"; - revision = "1"; - editedCabalFile = "1qxhznrd20d9c2ji4vvddkpc9zbxamlabf3p4yyzm75ivh374lmf"; + revision = "2"; + editedCabalFile = "0vjqffb0960kc4k32lgbsjl1mwah129m3ci6lyqyw7slqripw5fp"; libraryHaskellDepends = [ aeson base containers deepseq directory filepath parsec text transformers unordered-containers vector @@ -189113,8 +189386,8 @@ self: { }: mkDerivation { pname = "monad-logger-aeson"; - version = "0.2.0.2"; - sha256 = "1kk8wfcj0jrjb563n59x9naz4h6f75j1gax4zki7vm8xs5289ry0"; + version = "0.3.0.1"; + sha256 = "1bfz5z836m9fn7sd6r5mlgsnavb8ih0d3x9nm0m3zlx654llvpmq"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -199496,8 +199769,8 @@ self: { }: mkDerivation { pname = "nix-deploy"; - version = "1.0.5"; - sha256 = "0jsrmslai8xn1nkijg1196gkn10dagqgm8p39r7jsfaa4jvwm040"; + version = "1.0.6"; + sha256 = "119zfpcn0iil56z3bv2hwiy6pn6546pq3nvaa9cbhxvld0ax76wc"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -203654,6 +203927,8 @@ self: { pname = "opaleye"; version = "0.9.2.0"; sha256 = "0zvms42pmsg6ish76mvk0ksz4apxvs4iyjfvgkm7zwadq3i9v8l3"; + revision = "1"; + editedCabalFile = "006pp9l4j2vc2h6597vml424834xv1j4krfb3xjyaxhnq32hzcjr"; libraryHaskellDepends = [ aeson base base16-bytestring bytestring case-insensitive contravariant postgresql-simple pretty product-profunctors @@ -206071,19 +206346,19 @@ self: { }) {}; "ordinal" = callPackage - ({ mkDerivation, base, containers, data-default, hspec - , hspec-discover, QuickCheck, regex, template-haskell, text, time - , vector + ({ mkDerivation, base, containers, data-default-class, deepseq + , hspec, hspec-discover, QuickCheck, regex, template-haskell, text + , time, vector }: mkDerivation { pname = "ordinal"; - version = "0.4.0.6"; - sha256 = "0zpqhyn8f2iphgz2746fxsjk817ly8q6s4dz6129jrrd25v3kdc7"; + version = "0.5.0.0"; + sha256 = "016ydmanbxpj8jngqv19wf2v8c12s51lf3x3ddyb1706fh7nqcrw"; libraryHaskellDepends = [ - base containers data-default QuickCheck regex template-haskell text - time vector + base containers data-default-class deepseq QuickCheck regex + template-haskell text time vector ]; - testHaskellDepends = [ base hspec QuickCheck text ]; + testHaskellDepends = [ base hspec QuickCheck text time ]; testToolDepends = [ hspec-discover ]; description = "Convert numbers to words in different languages"; license = lib.licenses.bsd3; @@ -206468,8 +206743,8 @@ self: { }: mkDerivation { pname = "ory-hydra-client"; - version = "1.10"; - sha256 = "0ciyyd1925z2wnd6w57f993dva519cm1wgcs39kiw20n2bpb2myi"; + version = "1.10.1"; + sha256 = "1hs0r7f9b5kzcxs7m83ynnd36fk12j0jlhr0zngz8hlbcgkzwv9v"; libraryHaskellDepends = [ aeson base base64-bytestring bytestring case-insensitive containers deepseq exceptions http-api-data http-client http-client-tls @@ -206481,7 +206756,7 @@ self: { aeson base bytestring containers hspec iso8601-time mtl QuickCheck semigroups text time transformers unordered-containers vector ]; - description = "Auto-generated ory-hydra-client API Client"; + description = "Auto-generated ory-hydra API Client"; license = lib.licenses.mit; hydraPlatforms = lib.platforms.none; broken = true; @@ -212340,25 +212615,6 @@ self: { }: mkDerivation { pname = "peregrin"; - version = "0.3.2"; - sha256 = "12p17fznvrn9hhcwr7hpsii4syq5vhyww8lp7nrsyn966q8dd8xa"; - libraryHaskellDepends = [ base bytestring postgresql-simple text ]; - testHaskellDepends = [ - base hspec pg-harness-client postgresql-simple resource-pool text - transformers - ]; - description = "Database migration support for use in other libraries"; - license = lib.licenses.mit; - hydraPlatforms = lib.platforms.none; - broken = true; - }) {}; - - "peregrin_0_3_3" = callPackage - ({ mkDerivation, base, bytestring, hspec, pg-harness-client - , postgresql-simple, resource-pool, text, transformers - }: - mkDerivation { - pname = "peregrin"; version = "0.3.3"; sha256 = "1m7s8ws47g9icf9rfi8sk51bjwpbz5av17lbsnfg2cz3gji0977w"; libraryHaskellDepends = [ base bytestring postgresql-simple text ]; @@ -220794,6 +221050,34 @@ self: { license = lib.licenses.mit; }) {}; + "postgresql-binary_0_12_4_4" = callPackage + ({ mkDerivation, aeson, base, binary-parser, bytestring + , bytestring-strict-builder, containers, conversion + , conversion-bytestring, conversion-text, criterion, json-ast + , network-ip, postgresql-libpq, QuickCheck, quickcheck-instances + , rerebase, scientific, tasty, tasty-hunit, tasty-quickcheck, text + , time, transformers, unordered-containers, uuid, vector + }: + mkDerivation { + pname = "postgresql-binary"; + version = "0.12.4.4"; + sha256 = "03lh7ply77849xwpxh6k2hz20xl9cmvyx8yq03wqywvh7snd1ss3"; + libraryHaskellDepends = [ + aeson base binary-parser bytestring bytestring-strict-builder + containers network-ip scientific text time transformers + unordered-containers uuid vector + ]; + testHaskellDepends = [ + aeson conversion conversion-bytestring conversion-text json-ast + network-ip postgresql-libpq QuickCheck quickcheck-instances + rerebase tasty tasty-hunit tasty-quickcheck + ]; + benchmarkHaskellDepends = [ criterion rerebase ]; + description = "Encoders and decoders for the PostgreSQL's binary format"; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + }) {}; + "postgresql-common" = callPackage ({ mkDerivation, attoparsec, base, bytestring, postgresql-simple }: mkDerivation { @@ -221182,8 +221466,8 @@ self: { pname = "postgresql-simple"; version = "0.6.4"; sha256 = "0rz2bklxp4pvbxb2w49h5p6pbwabn6d5d4j4mrya4fpa0d13k43d"; - revision = "7"; - editedCabalFile = "056q0jpnb4fz5djzngjy2xbbqijrhjg90mr7mphjxb8clzc2xl1w"; + revision = "8"; + editedCabalFile = "1qavb3qs1g307pc19k9y3yvqp0c1srwsplijvayn9ldp0bxdy6q8"; libraryHaskellDepends = [ aeson attoparsec base bytestring bytestring-builder case-insensitive containers hashable Only postgresql-libpq @@ -222088,6 +222372,22 @@ self: { license = lib.licenses.bsd3; }) {}; + "pqueue_1_4_2_0" = callPackage + ({ mkDerivation, base, deepseq, random, tasty, tasty-bench + , tasty-quickcheck + }: + mkDerivation { + pname = "pqueue"; + version = "1.4.2.0"; + sha256 = "1b7a0gf00aaw02vz21s7g7mni3dlx34cvl88dgm96a9jrm1djqrw"; + libraryHaskellDepends = [ base deepseq ]; + testHaskellDepends = [ base deepseq tasty tasty-quickcheck ]; + benchmarkHaskellDepends = [ base deepseq random tasty-bench ]; + description = "Reliable, persistent, fast priority queues"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + }) {}; + "pqueue-mtl" = callPackage ({ mkDerivation, base, containers, ghc-prim, MaybeT, mtl , stateful-mtl, uvector @@ -223659,6 +223959,29 @@ self: { license = lib.licenses.mit; }) {}; + "primitive-extras_0_10_1_5" = callPackage + ({ mkDerivation, base, bytestring, cereal, deferred-folds, focus + , foldl, list-t, primitive, primitive-unlifted, profunctors + , QuickCheck, quickcheck-instances, rerebase, tasty, tasty-hunit + , tasty-quickcheck, vector + }: + mkDerivation { + pname = "primitive-extras"; + version = "0.10.1.5"; + sha256 = "0xmigva8lss9h18q0a63mc9sridny40nyzkizr2vmgm5d9qniqjs"; + libraryHaskellDepends = [ + base bytestring cereal deferred-folds focus foldl list-t primitive + primitive-unlifted profunctors vector + ]; + testHaskellDepends = [ + cereal deferred-folds focus primitive QuickCheck + quickcheck-instances rerebase tasty tasty-hunit tasty-quickcheck + ]; + description = "Extras for the \"primitive\" library"; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + }) {}; + "primitive-foreign" = callPackage ({ mkDerivation, base, primitive, QuickCheck }: mkDerivation { @@ -225822,6 +226145,8 @@ self: { pname = "proto3-suite"; version = "0.5.0"; sha256 = "09y09y321jflxlrx13b9fm4v3f3k4j475wpp0bilmc4ygq9bxjcm"; + revision = "2"; + editedCabalFile = "0wd212sjjdvggav7a719pxh3q232bnyp6jlgdavhay4b5n4adzx8"; isLibrary = true; isExecutable = true; enableSeparateDataOutput = true; @@ -227586,27 +227911,6 @@ self: { }: mkDerivation { pname = "pusher-http-haskell"; - version = "2.1.0.9"; - sha256 = "1ipx9xy5wf79pgkmy1669qh8v73ad6ncx7fhqqacmlmhvvphv9vs"; - libraryHaskellDepends = [ - aeson base base16-bytestring bytestring cryptonite hashable - http-client http-client-tls http-types memory text time - unordered-containers - ]; - testHaskellDepends = [ - aeson base bytestring hspec QuickCheck text unordered-containers - ]; - description = "Haskell client library for the Pusher Channels HTTP API"; - license = lib.licenses.mit; - }) {}; - - "pusher-http-haskell_2_1_0_10" = callPackage - ({ mkDerivation, aeson, base, base16-bytestring, bytestring - , cryptonite, hashable, hspec, http-client, http-client-tls - , http-types, memory, QuickCheck, text, time, unordered-containers - }: - mkDerivation { - pname = "pusher-http-haskell"; version = "2.1.0.10"; sha256 = "1xmqs11v8bj099izdqfq6mza4rqm1njznrdcfq4zvwg9381n86hz"; libraryHaskellDepends = [ @@ -227619,7 +227923,6 @@ self: { ]; description = "Haskell client library for the Pusher Channels HTTP API"; license = lib.licenses.mit; - hydraPlatforms = lib.platforms.none; }) {}; "pusher-ws" = callPackage @@ -228824,6 +229127,28 @@ self: { hydraPlatforms = lib.platforms.none; }) {}; + "quibble-core" = callPackage + ({ mkDerivation, base, bytestring, containers, hedgehog + , mono-traversable, optics-core, tasty, tasty-hedgehog, tasty-hunit + , text, text-conversions, time, uuid + }: + mkDerivation { + pname = "quibble-core"; + version = "0.0.0.1"; + sha256 = "1dzgha5c827x0gb9fhqa13rz0wkdn0wpxfw3sxnxq8g9rr8myb0g"; + libraryHaskellDepends = [ + base bytestring containers mono-traversable optics-core text + text-conversions time uuid + ]; + testHaskellDepends = [ + base hedgehog tasty tasty-hedgehog tasty-hunit + ]; + description = "Convenient SQL query language for Haskell (but only for single tables)"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + broken = true; + }) {}; + "quic" = callPackage ({ mkDerivation, array, async, base, base16-bytestring, bytestring , containers, crypto-token, cryptonite, data-default-class, doctest @@ -229053,8 +229378,8 @@ self: { pname = "quickcheck-instances"; version = "0.3.27"; sha256 = "10vb3rl1ma9x4qdych9vn8gj9kngkqs2b97f4s6s1a908ddxv4m5"; - revision = "1"; - editedCabalFile = "1b17ghhhrw9h625q08145pdpw72xmava73d3xb933slza5jms6nz"; + revision = "2"; + editedCabalFile = "13g7mf6brxxwp99n5a0pazjq4r3i5ckzq6kflcfaknzl1gxvmnhp"; libraryHaskellDepends = [ array base bytestring case-insensitive containers data-fix hashable integer-logarithms old-time OneTuple QuickCheck scientific splitmix @@ -231509,8 +231834,8 @@ self: { }: mkDerivation { pname = "ratel"; - version = "2.0.0.2"; - sha256 = "1z5wla26c11dvx0rymp1r5v62vwf8w71jymjlbvmiqh0dxlp4pf3"; + version = "2.0.0.3"; + sha256 = "1bgag2z55pmxnyng5nzplqcyd6zkqswhkaj4qmd7mnbsk5jqhf01"; libraryHaskellDepends = [ aeson base bytestring case-insensitive containers http-client http-client-tls http-types uuid @@ -231683,14 +232008,14 @@ self: { broken = true; }) {}; - "rattletrap_11_2_10" = callPackage + "rattletrap_11_2_11" = callPackage ({ mkDerivation, aeson, aeson-pretty, array, base, bytestring , containers, filepath, http-client, http-client-tls, text }: mkDerivation { pname = "rattletrap"; - version = "11.2.10"; - sha256 = "1iy0nkqpnwhscs98b277q6ykk7mph5a5ah8gqf4dxz58q7lwk47z"; + version = "11.2.11"; + sha256 = "004lhyi5v34124990j1m8mhcb1inn6313lp4db9yd3p82c7k928n"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -232951,6 +233276,30 @@ self: { license = lib.licenses.mit; }) {}; + "rebase_1_16" = callPackage + ({ mkDerivation, base, bifunctors, bytestring, comonad, containers + , contravariant, deepseq, dlist, either, groups, hashable + , invariant, mtl, profunctors, scientific, selective, semigroupoids + , stm, text, time, time-compat, transformers, unordered-containers + , uuid-types, vector, vector-instances, void + }: + mkDerivation { + pname = "rebase"; + version = "1.16"; + sha256 = "0r5dmkw1bb3fkc40gjdcswf7388c8w7lzvzh7wvf7vk4lhxjaxhd"; + revision = "1"; + editedCabalFile = "048h2ir37j09s0z7fb364p7smyhzq6h4705qklhvylak9242gz2n"; + libraryHaskellDepends = [ + base bifunctors bytestring comonad containers contravariant deepseq + dlist either groups hashable invariant mtl profunctors scientific + selective semigroupoids stm text time time-compat transformers + unordered-containers uuid-types vector vector-instances void + ]; + description = "A more progressive alternative to the \"base\" package"; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + }) {}; + "rebindable" = callPackage ({ mkDerivation, base, data-default-class, indexed }: mkDerivation { @@ -235042,6 +235391,26 @@ self: { license = lib.licenses.bsd3; }) {}; + "regex_1_1_0_2" = callPackage + ({ mkDerivation, array, base, base-compat, bytestring, containers + , hashable, regex-base, regex-pcre-builtin, regex-tdfa + , template-haskell, text, time, time-locale-compat, transformers + , unordered-containers, utf8-string + }: + mkDerivation { + pname = "regex"; + version = "1.1.0.2"; + sha256 = "1nzyfkqmclmawmphvksvm9l64awqgnypic4xplc2s9sjcj4h814a"; + libraryHaskellDepends = [ + array base base-compat bytestring containers hashable regex-base + regex-pcre-builtin regex-tdfa template-haskell text time + time-locale-compat transformers unordered-containers utf8-string + ]; + description = "Toolkit for regex-base"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + }) {}; + "regex-applicative" = callPackage ({ mkDerivation, attoparsec, base, bytestring, containers , criterion, deepseq, filtrable, megaparsec, parsec, parsers @@ -235194,8 +235563,8 @@ self: { }: mkDerivation { pname = "regex-examples"; - version = "1.1.0.1"; - sha256 = "1x8611bnvzj8pcc2g934gif4m6sssi08rxyqamn1b2i28ixzfh0c"; + version = "1.1.0.2"; + sha256 = "1m0z6xjm26fh0zhbkv2ajy5vjb86hawbdn8q6qwd0sydrjy1879b"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -235579,6 +235948,25 @@ self: { license = lib.licenses.bsd3; }) {}; + "regex-with-pcre_1_1_0_2" = callPackage + ({ mkDerivation, base, base-compat, bytestring, containers, regex + , regex-base, regex-pcre-builtin, regex-tdfa, template-haskell + , text, transformers, unordered-containers + }: + mkDerivation { + pname = "regex-with-pcre"; + version = "1.1.0.2"; + sha256 = "00x90kj8xc9pnnzryx45rnvfh0psya6kc174y7zx43jgvbz29icy"; + libraryHaskellDepends = [ + base base-compat bytestring containers regex regex-base + regex-pcre-builtin regex-tdfa template-haskell text transformers + unordered-containers + ]; + description = "Toolkit for regex-base"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + }) {}; + "regex-wrapper" = callPackage ({ mkDerivation, aeson, base, bytestring, containers, hashable , regex-tdfa, string-conv, text @@ -235807,8 +236195,8 @@ self: { }: mkDerivation { pname = "registry"; - version = "0.3.0.7"; - sha256 = "10fa8aw966py3hr6cnisiisf9578kp46kglrpa2q34hzz0q7sr7g"; + version = "0.3.0.8"; + sha256 = "1mz8ahbivaj8a9hsi5m8shwmdz5hqq2fw1m0z7m2kpinnj1p3pbf"; libraryHaskellDepends = [ base containers exceptions hashable mmorph mtl protolude resourcet semigroupoids semigroups template-haskell text transformers-base @@ -237435,6 +237823,8 @@ self: { pname = "req"; version = "3.12.0"; sha256 = "1gwdqmqmj3acim5r8c4sjzcvr3hvlbcjwkrpcsvq95ckr1wmzpqp"; + revision = "1"; + editedCabalFile = "0f3d1y1ymgrdbf84p4pgpbsn5772vc5lrjmj7wgf7baqw03kq8wy"; enableSeparateDataOutput = true; libraryHaskellDepends = [ aeson authenticate-oauth base blaze-builder bytestring @@ -241341,32 +241731,6 @@ self: { }: mkDerivation { pname = "rpmbuild-order"; - version = "0.4.7"; - sha256 = "10qwndr8hxvgy386jy4zxkjsw4cj79fr9rh6qivivx6y0q2d2jnr"; - isLibrary = true; - isExecutable = true; - libraryHaskellDepends = [ - base case-insensitive directory extra fgl filepath graphviz - simple-cmd - ]; - executableHaskellDepends = [ - base directory extra fgl optparse-applicative simple-cmd-args - ]; - testHaskellDepends = [ base extra hspec simple-cmd unix ]; - description = "Sort RPM packages in dependency order"; - license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; - mainProgram = "rpmbuild-order"; - broken = true; - }) {}; - - "rpmbuild-order_0_4_8" = callPackage - ({ mkDerivation, base, case-insensitive, directory, extra, fgl - , filepath, graphviz, hspec, optparse-applicative, simple-cmd - , simple-cmd-args, unix - }: - mkDerivation { - pname = "rpmbuild-order"; version = "0.4.8"; sha256 = "16mzvgx4az9wjy4va85hprj2mqiw1mmc6pw8xjdfv8vxsw17kb16"; isLibrary = true; @@ -245736,16 +246100,14 @@ self: { license = lib.licenses.bsd3; }) {inherit (pkgs) SDL2;}; - "sdl2_2_5_3_2" = callPackage + "sdl2_2_5_3_3" = callPackage ({ mkDerivation, base, bytestring, deepseq, exceptions, linear , SDL2, StateVar, text, transformers, vector, weigh }: mkDerivation { pname = "sdl2"; - version = "2.5.3.2"; - sha256 = "06v3zdfashd8f2jhrl2gfgkp7ykjsc06yvw2l4n3sy1p9xxk9q2y"; - revision = "1"; - editedCabalFile = "1v0y88c86d0f9p0ymi9hcq5hlzdyglrvhj4sxv0bkpjkpqavn5l9"; + version = "2.5.3.3"; + sha256 = "1a0vdw7nhwhq9zz1wq1w8j9za02js55h92n2rj8zrbqxcr2091ma"; isLibrary = true; isExecutable = true; enableSeparateDataOutput = true; @@ -246863,8 +247225,8 @@ self: { pname = "semialign"; version = "1.2.0.1"; sha256 = "0ci1jpp37p1lzyjxc1bljd6zgg407qmkl9s36b50qjxf85q6j06r"; - revision = "1"; - editedCabalFile = "00cmkdmgqlk8v2jg084nddlj2qkwj68nqk9p3l07kzwf796rn5qf"; + revision = "2"; + editedCabalFile = "0dm51m0qa1mbwk66wzidws1vvv6xy54swjg58nkjhw76yys2mcia"; libraryHaskellDepends = [ base containers hashable indexed-traversable indexed-traversable-instances semigroupoids tagged these @@ -252818,24 +253180,6 @@ self: { }: mkDerivation { pname = "shellmet"; - version = "0.0.4.0"; - sha256 = "1nrva50knx3ca0m6f84f1yim4apj949fqqmmrxqmxhlixjzafl8v"; - isLibrary = true; - isExecutable = true; - libraryHaskellDepends = [ base process text ]; - executableHaskellDepends = [ base text ]; - executableToolDepends = [ markdown-unlit ]; - testHaskellDepends = [ base doctest Glob ]; - description = "Out of the shell solution for scripting in Haskell"; - license = lib.licenses.mpl20; - mainProgram = "readme"; - }) {}; - - "shellmet_0_0_4_1" = callPackage - ({ mkDerivation, base, doctest, Glob, markdown-unlit, process, text - }: - mkDerivation { - pname = "shellmet"; version = "0.0.4.1"; sha256 = "0jd05bazny7y25jnminal5wv30kxg6pzchswxpw5yac027qjagd0"; isLibrary = true; @@ -252846,7 +253190,6 @@ self: { testHaskellDepends = [ base doctest Glob ]; description = "Out of the shell solution for scripting in Haskell"; license = lib.licenses.mpl20; - hydraPlatforms = lib.platforms.none; mainProgram = "readme"; }) {}; @@ -254103,6 +254446,23 @@ self: { license = lib.licenses.bsd3; }) {}; + "simple-cmd_0_2_7" = callPackage + ({ mkDerivation, base, directory, extra, filepath, hspec, process + , time, unix + }: + mkDerivation { + pname = "simple-cmd"; + version = "0.2.7"; + sha256 = "1pjkcww6s45s6w757cyxniis2w4ndg7vgz6gj3c1iwfh10ajk0q4"; + libraryHaskellDepends = [ + base directory extra filepath process time unix + ]; + testHaskellDepends = [ base hspec ]; + description = "Simple String-based process commands"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + }) {}; + "simple-cmd-args" = callPackage ({ mkDerivation, base, optparse-applicative }: mkDerivation { @@ -255723,24 +256083,24 @@ self: { "sized" = callPackage ({ mkDerivation, base, constraints, containers, deepseq , equational-reasoning, ghc-typelits-knownnat - , ghc-typelits-presburger, hashable, hspec, inspection-testing - , lens, mono-traversable, subcategories, template-haskell, th-lift - , these, type-natural, vector + , ghc-typelits-presburger, hashable, inspection-testing, lens + , mono-traversable, subcategories, tasty, tasty-expected-failure + , tasty-inspection-testing, template-haskell, th-lift, these + , type-natural, vector }: mkDerivation { pname = "sized"; - version = "1.0.0.0"; - sha256 = "0f6ql0yk0qi2wkzifhhhfn5z3wzh10d57ak9wrb4dv8s6mx34yk7"; - revision = "3"; - editedCabalFile = "13v3dkfdnzg2y7pfkn2dnvczd9y40izlm30vcssn2a5b1v7vy3bz"; + version = "1.0.0.1"; + sha256 = "1ayj3fzr4l4l5wmkqnv4h4fxgivmjgamq3wdlpixlwy43wbmf3fy"; libraryHaskellDepends = [ base constraints containers deepseq equational-reasoning ghc-typelits-knownnat ghc-typelits-presburger hashable lens mono-traversable subcategories these type-natural vector ]; testHaskellDepends = [ - base containers hspec inspection-testing mono-traversable - subcategories template-haskell th-lift type-natural vector + base containers inspection-testing mono-traversable subcategories + tasty tasty-expected-failure tasty-inspection-testing + template-haskell th-lift type-natural vector ]; description = "Sized sequence data-types"; license = lib.licenses.bsd3; @@ -261277,6 +261637,18 @@ self: { license = lib.licenses.isc; }) {}; + "splint_1_0_2_0" = callPackage + ({ mkDerivation, base, containers, ghc, hlint, stm }: + mkDerivation { + pname = "splint"; + version = "1.0.2.0"; + sha256 = "18n97b6437yql0sk55kns9mz2x2rgdfjw9ajpmm4adh5n5kc5cf6"; + libraryHaskellDepends = [ base containers ghc hlint stm ]; + description = "HLint as a GHC source plugin"; + license = lib.licenses.isc; + hydraPlatforms = lib.platforms.none; + }) {}; + "split" = callPackage ({ mkDerivation, base, QuickCheck }: mkDerivation { @@ -267373,6 +267745,8 @@ self: { pname = "stripe-scotty"; version = "1.1.0.2"; sha256 = "123l1khqd0ilcihrij1givz4lg2jns2r2iyf90yjh7zdva1xf507"; + revision = "1"; + editedCabalFile = "0rr2vyw1vpa4psxqq2x9lsp67lgm0pylmnsnixm681qa6pykjnhr"; libraryHaskellDepends = [ aeson base bytestring http-types scotty stripe-concepts stripe-signature text @@ -267444,6 +267818,8 @@ self: { pname = "stripe-wreq"; version = "1.0.1.14"; sha256 = "01z0hqqnnc2g8q0bzj4brjmd9wmpjda4rlk770brvk9ip9mjdlys"; + revision = "1"; + editedCabalFile = "1knsmrj0m1xjf8z8hsjcci3h7bg5afzbnx5v6znffc5vzgnphc64"; libraryHaskellDepends = [ aeson base bytestring lens stripe-concepts text wreq ]; @@ -267491,8 +267867,8 @@ self: { }: mkDerivation { pname = "strive"; - version = "6.0.0.2"; - sha256 = "02bw8qsfixjdlyzp1gpgrrj0qacw40rsw75858l0894lyq7x35hk"; + version = "6.0.0.3"; + sha256 = "1sj2s6cqcmyczbf09d2bzygd0gfgx0p16wgwcrmr9f9h84dk4bps"; libraryHaskellDepends = [ aeson base bytestring data-default gpolyline http-client http-client-tls http-types template-haskell text time transformers @@ -269372,8 +269748,8 @@ self: { }: mkDerivation { pname = "swagger2"; - version = "2.8.2"; - sha256 = "0vxqmc3wx01fx04cqq9l0gvcas7njsj6q2r960rb1gbmggydpysc"; + version = "2.8.4"; + sha256 = "11gpnh7dg6bqbvgwfw9xri3l08kvxply698arpz62ix38qyf14iv"; setupHaskellDepends = [ base Cabal cabal-doctest ]; libraryHaskellDepends = [ aeson aeson-pretty base base-compat-batteries bytestring containers @@ -272496,6 +272872,28 @@ self: { broken = true; }) {}; + "takedouble" = callPackage + ({ mkDerivation, base, bytestring, directory, extra, filepath + , hedgehog, temporary, unix + }: + mkDerivation { + pname = "takedouble"; + version = "0.0.1.1"; + sha256 = "0b0m96grcjjk1hw9i13d9nfs8k7i68zl4jv5raqw8lxqvav5yd3j"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + base bytestring directory extra filepath unix + ]; + executableHaskellDepends = [ base ]; + testHaskellDepends = [ + base directory extra filepath hedgehog temporary unix + ]; + description = "duplicate file finder"; + license = lib.licenses.bsd3; + mainProgram = "takedouble"; + }) {}; + "takusen-oracle" = callPackage ({ mkDerivation, base, clntsh, mtl, old-time, time }: mkDerivation { @@ -276817,17 +277215,18 @@ self: { license = lib.licenses.mit; }) {}; - "text-builder-dev_0_3_2" = callPackage + "text-builder-dev_0_3_3" = callPackage ({ mkDerivation, base, bytestring, criterion, deferred-folds - , QuickCheck, quickcheck-instances, rerebase, split, tasty - , tasty-hunit, tasty-quickcheck, text, transformers + , isomorphism-class, QuickCheck, quickcheck-instances, rerebase + , split, tasty, tasty-hunit, tasty-quickcheck, text, transformers }: mkDerivation { pname = "text-builder-dev"; - version = "0.3.2"; - sha256 = "0x77y8vrsxdrmx2d6y8wxw7qmdnxdjh4rzbs3lwmharxvrqdwnxs"; + version = "0.3.3"; + sha256 = "0h88yxj0w7ycpmzxyxnxkrz05dmi902dv9v8mxlx7nrr8idxss74"; libraryHaskellDepends = [ - base bytestring deferred-folds split text transformers + base bytestring deferred-folds isomorphism-class split text + transformers ]; testHaskellDepends = [ QuickCheck quickcheck-instances rerebase tasty tasty-hunit @@ -277567,6 +277966,8 @@ self: { pname = "text-show-instances"; version = "3.9"; sha256 = "1bfangk4ys6pvhrv3j7i2c29xnhgin5lma2ndw051hnmmc7v2j7l"; + revision = "1"; + editedCabalFile = "1radrshv4flxlqsv36bz06pvw1l7nanqimfrx9rzspxcnldzv5q7"; libraryHaskellDepends = [ base base-compat-batteries bifunctors binary containers directory ghc-boot-th haskeline hpc old-locale old-time pretty random @@ -278065,8 +278466,8 @@ self: { ({ mkDerivation, base, template-haskell }: mkDerivation { pname = "th-data-compat"; - version = "0.1.0.0"; - sha256 = "03d5ddbxzfn60ysxxn17q7gzdlls8hvlsvhzai4mn0qfjpwi6ljx"; + version = "0.1.1.0"; + sha256 = "0579yxlcl3cfirjim31capk7q2raf9bmmfnvcxxnicjmvx22790q"; libraryHaskellDepends = [ base template-haskell ]; description = "Compatibility for data definition template of TH"; license = lib.licenses.bsd3; @@ -282169,8 +282570,8 @@ self: { }: mkDerivation { pname = "tonatona-google-server-api"; - version = "0.2.0.0"; - sha256 = "01ilskcr8k219vijd3zkzy6lpzavqv36j3vxbx1hrms0hylnydah"; + version = "0.3.0.0"; + sha256 = "04bw1z2is1mr5mqllxrp1inagvnan95f4gckzyj3a87sv1x2qm8m"; libraryHaskellDepends = [ base google-server-api monad-logger persistent persistent-sqlite resource-pool servant-client tonalude tonaparser tonatona @@ -282449,8 +282850,8 @@ self: { pname = "topograph"; version = "1.0.0.1"; sha256 = "1sd2gyirkdgwcll76zxw954wdsyxzajn59xa9zk55fbrsm6w24cv"; - revision = "3"; - editedCabalFile = "144pbbmir77ql5qzf031mh2qs946c05h22iz3fm8xkzg1cgils0z"; + revision = "4"; + editedCabalFile = "05pkc4byw9xqz4048sdlk24h311kw41nr18f3vs1p1vssyy10g36"; libraryHaskellDepends = [ base base-compat base-orphans containers vector ]; @@ -283943,8 +284344,8 @@ self: { pname = "tree-diff"; version = "0.2.1.1"; sha256 = "0p1pvbqgrwkxmv4b8xmw9mx6a1xpyl6j8ivg1qs65q5nd7xaxqvp"; - revision = "1"; - editedCabalFile = "0avc30hkfhh6sr2ch5d6xrndskj06az8h0b0zkrrnl89jgiw7c3x"; + revision = "2"; + editedCabalFile = "12smpqjg5ah2sr593d4glx8ib5yjj3wh1mhy6v4xy82xj27mhh11"; libraryHaskellDepends = [ aeson ansi-terminal ansi-wl-pprint base base-compat bytestring bytestring-builder containers deepseq hashable parsec parsers @@ -285564,7 +285965,7 @@ self: { maintainers = [ lib.maintainers.Gabriel439 ]; }) {}; - "turtle_1_6_0" = callPackage + "turtle_1_6_1" = callPackage ({ mkDerivation, ansi-wl-pprint, async, base, bytestring, clock , containers, directory, doctest, exceptions, filepath, foldl , hostname, managed, optional-args, optparse-applicative, process @@ -285573,8 +285974,8 @@ self: { }: mkDerivation { pname = "turtle"; - version = "1.6.0"; - sha256 = "1g35l9c3zsimirlhknjma6pziiaxam51i6r0a4xfbr7cc8psflc5"; + version = "1.6.1"; + sha256 = "171viripwn8hg3afkkswr243bv7q0r0bz3mn0bflddm4jdf49597"; libraryHaskellDepends = [ ansi-wl-pprint async base bytestring clock containers directory exceptions filepath foldl hostname managed optional-args @@ -286757,27 +287158,12 @@ self: { ({ mkDerivation, base, template-haskell }: mkDerivation { pname = "type-level-numbers"; - version = "0.1.1.1"; - sha256 = "12iiyaqi60fpds7fv1qvphy84rwyj71maq54mfwpcr0bdrgyymjv"; - revision = "1"; - editedCabalFile = "0nzam0mkawxaq793l5isrfnc3vg8s73lca5nig0y50kfmyk30sbc"; - libraryHaskellDepends = [ base template-haskell ]; - testHaskellDepends = [ base template-haskell ]; - description = "Type level numbers implemented using type families"; - license = lib.licenses.bsd3; - }) {}; - - "type-level-numbers_0_1_1_2" = callPackage - ({ mkDerivation, base, template-haskell }: - mkDerivation { - pname = "type-level-numbers"; version = "0.1.1.2"; sha256 = "0bw2b0hw8svgsy3whqxj66qqffdrl7643ar8187n9a0drs81353i"; libraryHaskellDepends = [ base template-haskell ]; testHaskellDepends = [ base template-haskell ]; description = "Type level numbers implemented using type families"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; }) {}; "type-level-sets" = callPackage @@ -290485,21 +290871,6 @@ self: { }: mkDerivation { pname = "unliftio-pool"; - version = "0.2.1.1"; - sha256 = "0hxxngldp4zr55qv67gf62a87yxr1f0xfyh4gfzr45q62mscs8xv"; - libraryHaskellDepends = [ - base resource-pool time transformers unliftio-core - ]; - description = "Data.Pool generalized to MonadUnliftIO."; - license = lib.licenses.bsd3; - }) {}; - - "unliftio-pool_0_2_2_0" = callPackage - ({ mkDerivation, base, resource-pool, time, transformers - , unliftio-core - }: - mkDerivation { - pname = "unliftio-pool"; version = "0.2.2.0"; sha256 = "08246kbmgxv5afm6kngag2mh8mswifsh6017z8rirca37cwp01vr"; libraryHaskellDepends = [ @@ -290507,7 +290878,6 @@ self: { ]; description = "Data.Pool generalized to MonadUnliftIO."; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; }) {}; "unliftio-streams" = callPackage @@ -293774,6 +294144,28 @@ self: { license = lib.licenses.bsd3; }) {}; + "vector_0_13_0_0" = callPackage + ({ mkDerivation, base, base-orphans, deepseq, HUnit, primitive + , QuickCheck, random, tasty, tasty-bench, tasty-hunit + , tasty-inspection-testing, tasty-quickcheck, template-haskell + , transformers, vector-stream + }: + mkDerivation { + pname = "vector"; + version = "0.13.0.0"; + sha256 = "0ksvs6ldb8bzbjy4gk39wds2lrwill2g7pbr13h54bz12myidly5"; + libraryHaskellDepends = [ base deepseq primitive vector-stream ]; + testHaskellDepends = [ + base base-orphans HUnit primitive QuickCheck random tasty + tasty-hunit tasty-inspection-testing tasty-quickcheck + template-haskell transformers + ]; + benchmarkHaskellDepends = [ base random tasty tasty-bench ]; + description = "Efficient Arrays"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + }) {}; + "vector-algorithms" = callPackage ({ mkDerivation, base, bytestring, containers, mwc-random , primitive, QuickCheck, vector @@ -293782,8 +294174,8 @@ self: { pname = "vector-algorithms"; version = "0.8.0.4"; sha256 = "0fxg6w0vh5g2vzw4alajj9ywdijfn9nyx28hbckhmwwbfxb6l5vn"; - revision = "1"; - editedCabalFile = "10zjr2cdsaxb71z9svl7h2bxrxbhr19ckqy9p2mhkvhg7ar60ixz"; + revision = "2"; + editedCabalFile = "0i55aqh2kfswmzvkyls1vlzlg3gvh1ydhksx9w7circ8ffj6lrg0"; libraryHaskellDepends = [ base bytestring primitive vector ]; testHaskellDepends = [ base bytestring containers QuickCheck vector @@ -293853,6 +294245,24 @@ self: { license = lib.licenses.mit; }) {}; + "vector-builder_0_3_8_4" = callPackage + ({ mkDerivation, attoparsec, base, QuickCheck, quickcheck-instances + , rerebase, tasty, tasty-hunit, tasty-quickcheck, vector + }: + mkDerivation { + pname = "vector-builder"; + version = "0.3.8.4"; + sha256 = "0gc2n5j1ca07hd50shy7l5xybs1y720zrarzs5dj74dsdcpvmjxw"; + libraryHaskellDepends = [ base vector ]; + testHaskellDepends = [ + attoparsec QuickCheck quickcheck-instances rerebase tasty + tasty-hunit tasty-quickcheck + ]; + description = "Vector builder"; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + }) {}; + "vector-bytes-instances" = callPackage ({ mkDerivation, base, bytes, tasty, tasty-quickcheck, vector }: mkDerivation { @@ -293979,8 +294389,8 @@ self: { }: mkDerivation { pname = "vector-extras"; - version = "0.2.7"; - sha256 = "0ygxryrm2sylv2is1nxw9j8qb8hrald7j0smcbx079g8byvf5nj7"; + version = "0.2.7.1"; + sha256 = "1a8aak9v68qmrx719w782ww7accn7bk11gnca3d2lvbzw793dl4q"; libraryHaskellDepends = [ base containers deferred-folds foldl hashable unordered-containers vector @@ -294081,6 +294491,8 @@ self: { pname = "vector-instances"; version = "3.4"; sha256 = "10akvpa5w9bp0d8hflab63r9laa9gy2hv167smhjsdzq1kplc0hv"; + revision = "1"; + editedCabalFile = "177jllmcv0517vppc4lx0l0kvicgaf1h060lkcnv7fl0hnp16zf5"; libraryHaskellDepends = [ base comonad hashable keys pointed semigroupoids semigroups vector ]; @@ -294284,6 +294696,17 @@ self: { license = lib.licenses.bsd3; }) {}; + "vector-stream" = callPackage + ({ mkDerivation, base, ghc-prim }: + mkDerivation { + pname = "vector-stream"; + version = "0.1.0.0"; + sha256 = "0v40vdpp35lhnnnx7q17fah0c14jrkjlnwsk0q4mbwb7ch7j3258"; + libraryHaskellDepends = [ base ghc-prim ]; + description = "Efficient Streams"; + license = lib.licenses.bsd3; + }) {}; + "vector-text" = callPackage ({ mkDerivation, base, binary, prologue, text, vector , vector-binary-instances @@ -296353,26 +296776,6 @@ self: { }: mkDerivation { pname = "wai-feature-flags"; - version = "0.1.0.3"; - sha256 = "1w1n24w7wf3jxnlid437d4rva86vbhyvlrz8nq7z6bc3xi8bdlkz"; - isLibrary = true; - isExecutable = true; - enableSeparateDataOutput = true; - libraryHaskellDepends = [ - aeson base bytestring splitmix text unordered-containers wai - ]; - executableHaskellDepends = [ base wai warp ]; - description = "Feature flag support for WAI applications"; - license = lib.licenses.bsd3; - mainProgram = "example-app"; - }) {}; - - "wai-feature-flags_0_1_0_4" = callPackage - ({ mkDerivation, aeson, base, bytestring, splitmix, text - , unordered-containers, wai, warp - }: - mkDerivation { - pname = "wai-feature-flags"; version = "0.1.0.4"; sha256 = "02fwha57wwjbjapkp519da2jml3921rdlna1zr7vdmrqdz6j327j"; isLibrary = true; @@ -296384,7 +296787,6 @@ self: { executableHaskellDepends = [ base wai warp ]; description = "Feature flag support for WAI applications"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; mainProgram = "example-app"; }) {}; @@ -296488,6 +296890,8 @@ self: { pname = "wai-handler-hal"; version = "0.1.2.0"; sha256 = "05q0aig70yfrhq73q8i79y4kvjkb2hlrbgza5m9sz5g3i0w21l3y"; + revision = "1"; + editedCabalFile = "1gkj8yhwqv6rf5b38xjiniwwyfnz5krbx4nx5r98danipjpr1fan"; libraryHaskellDepends = [ base base64-bytestring bytestring case-insensitive hal http-types network text unordered-containers vault wai @@ -299595,25 +299999,6 @@ self: { }: mkDerivation { pname = "webgear-core"; - version = "1.0.1"; - sha256 = "06yg14x40j7jg5gy875f2g4fplnh08678qy3naqapd8ysvw52rmb"; - libraryHaskellDepends = [ - arrows base bytestring case-insensitive filepath http-api-data - http-media http-types jose mime-types network safe-exceptions - tagged template-haskell text unordered-containers wai - ]; - description = "Composable, type-safe library to build HTTP APIs"; - license = lib.licenses.mpl20; - }) {}; - - "webgear-core_1_0_2" = callPackage - ({ mkDerivation, arrows, base, bytestring, case-insensitive - , filepath, http-api-data, http-media, http-types, jose, mime-types - , network, safe-exceptions, tagged, template-haskell, text - , unordered-containers, wai - }: - mkDerivation { - pname = "webgear-core"; version = "1.0.2"; sha256 = "18zzi1gs0sxa8x061lqavipjn82zzvpnlff02cz7k8lvyyivyn60"; libraryHaskellDepends = [ @@ -299623,7 +300008,6 @@ self: { ]; description = "Composable, type-safe library to build HTTP APIs"; license = lib.licenses.mpl20; - hydraPlatforms = lib.platforms.none; }) {}; "webgear-openapi" = callPackage @@ -299632,22 +300016,6 @@ self: { }: mkDerivation { pname = "webgear-openapi"; - version = "1.0.1"; - sha256 = "0fxj5bhsqxkjizyl0wcwbs5ai05lksf3cwzz2535lb4rh90ndx3b"; - libraryHaskellDepends = [ - arrows base http-media http-types insert-ordered-containers lens - openapi3 text webgear-core - ]; - description = "Composable, type-safe library to build HTTP API servers"; - license = lib.licenses.mpl20; - }) {}; - - "webgear-openapi_1_0_2" = callPackage - ({ mkDerivation, arrows, base, http-media, http-types - , insert-ordered-containers, lens, openapi3, text, webgear-core - }: - mkDerivation { - pname = "webgear-openapi"; version = "1.0.2"; sha256 = "0k3smna51wm9rc00nzv8cf7pd16l4ddldr27niw11gy27viyzpj2"; libraryHaskellDepends = [ @@ -299656,7 +300024,6 @@ self: { ]; description = "Composable, type-safe library to build HTTP API servers"; license = lib.licenses.mpl20; - hydraPlatforms = lib.platforms.none; }) {}; "webgear-server" = callPackage @@ -299668,31 +300035,6 @@ self: { }: mkDerivation { pname = "webgear-server"; - version = "1.0.1"; - sha256 = "0v27iq4jqbxyn66pzi7sz0qapd4a0k1iifvj2ng488jl2j852xa2"; - libraryHaskellDepends = [ - aeson arrows base base64-bytestring bytestring - bytestring-conversion http-api-data http-media http-types jose - monad-time mtl text unordered-containers wai webgear-core - ]; - testHaskellDepends = [ - base base64-bytestring bytestring http-types QuickCheck - quickcheck-instances tasty tasty-hunit tasty-quickcheck text wai - webgear-core - ]; - description = "Composable, type-safe library to build HTTP API servers"; - license = lib.licenses.mpl20; - }) {}; - - "webgear-server_1_0_2" = callPackage - ({ mkDerivation, aeson, arrows, base, base64-bytestring, bytestring - , bytestring-conversion, http-api-data, http-media, http-types - , jose, monad-time, mtl, QuickCheck, quickcheck-instances, tasty - , tasty-hunit, tasty-quickcheck, text, unordered-containers, wai - , webgear-core - }: - mkDerivation { - pname = "webgear-server"; version = "1.0.2"; sha256 = "0zy0sxm3jcq8889494v7y1ydka739yw2gh38w60h2fw7awqlbj5w"; libraryHaskellDepends = [ @@ -299707,7 +300049,6 @@ self: { ]; description = "Composable, type-safe library to build HTTP API servers"; license = lib.licenses.mpl20; - hydraPlatforms = lib.platforms.none; }) {}; "webidl" = callPackage @@ -301150,8 +301491,8 @@ self: { pname = "witherable"; version = "0.4.2"; sha256 = "0121ic4xkv3k568j23zp22a5lrv0k11h94fq7cbijd18fjr2n3br"; - revision = "2"; - editedCabalFile = "1ljnv5xf6w7x58akj0a0yw16j63jkka0dvfvmjqwbn76aqg3pzc1"; + revision = "3"; + editedCabalFile = "1f2bvl41by904lnr0dk6qgasqwadq2w48l7fj51bp2h8bqbkdjyc"; libraryHaskellDepends = [ base base-orphans containers hashable indexed-traversable indexed-traversable-instances transformers unordered-containers @@ -306252,8 +306593,8 @@ self: { }: mkDerivation { pname = "yaml-unscrambler"; - version = "0.1.0.10"; - sha256 = "07pwdd6w6gh0x05925hfk5mhzmig6rh9yb87rkyx15197r9hj7xw"; + version = "0.1.0.11"; + sha256 = "1znca5my1z2pjgnw4x37lmh0lqipbg4xkw7lsijjn4ddhazwpd7x"; libraryHaskellDepends = [ acc attoparsec attoparsec-data attoparsec-time base base64-bytestring bytestring conduit containers foldl hashable @@ -310594,7 +310935,9 @@ self: { ]; description = "Haskell implementation of the ZeroMQ clone pattern"; license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; mainProgram = "zeromq4-clone-pattern-exe"; + broken = true; }) {}; "zeromq4-conduit" = callPackage @@ -310659,7 +311002,9 @@ self: { ]; description = "Haskell implementation of several ZeroMQ patterns"; license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; mainProgram = "zeromq4-patterns-exe"; + broken = true; }) {}; "zeromq4-simple" = callPackage diff --git a/pkgs/development/libraries/allegro/5.nix b/pkgs/development/libraries/allegro/5.nix index 859d46459cb8a..6bb1a70b86506 100644 --- a/pkgs/development/libraries/allegro/5.nix +++ b/pkgs/development/libraries/allegro/5.nix @@ -9,13 +9,13 @@ stdenv.mkDerivation rec { pname = "allegro"; - version = "5.2.7.0"; + version = "5.2.8.0"; src = fetchFromGitHub { owner = "liballeg"; repo = "allegro5"; rev = version; - sha256 = "sha256-JdnzEW+qAhAljR+WfmgE3P9xeR2HvjS64tFgCC0tNA0="; + sha256 = "sha256-uNcaeTelFNfg+YjPYc7nK4TrFDxJsEuPhsF8x1cvIYQ="; }; nativeBuildInputs = [ cmake ]; diff --git a/pkgs/development/libraries/audio/libopenmpt-modplug/default.nix b/pkgs/development/libraries/audio/libopenmpt-modplug/default.nix new file mode 100644 index 0000000000000..8d5ef86a89671 --- /dev/null +++ b/pkgs/development/libraries/audio/libopenmpt-modplug/default.nix @@ -0,0 +1,42 @@ +{ stdenv +, lib +, fetchurl +, autoreconfHook +, pkg-config +, libopenmpt +}: + +stdenv.mkDerivation rec { + pname = "libopenmpt-modplug"; + version = "0.8.9.0-openmpt1"; + + outputs = [ "out" "dev" ]; + + src = fetchurl { + url = "https://lib.openmpt.org/files/libopenmpt-modplug/libopenmpt-modplug-${version}.tar.gz"; + sha256 = "sha256-7M4aDuz9sLWCTKuJwnDc5ZWWKVosF8KwQyFez018T/c="; + }; + + enableParallelBuilding = true; + + nativeBuildInputs = [ + autoreconfHook + pkg-config + ]; + + buildInputs = [ + libopenmpt + ]; + + configureFlags = [ + "--enable-libmodplug" + ]; + + meta = with lib; { + description = "A libmodplug emulation layer based on libopenmpt"; + homepage = "https://lib.openmpt.org/libopenmpt/"; + license = licenses.bsd3; + maintainers = with maintainers; [ OPNA2608 ]; + platforms = platforms.unix; + }; +} diff --git a/pkgs/development/libraries/capnproto/default.nix b/pkgs/development/libraries/capnproto/default.nix index aeb9728af8269..3f1d121989946 100644 --- a/pkgs/development/libraries/capnproto/default.nix +++ b/pkgs/development/libraries/capnproto/default.nix @@ -6,14 +6,14 @@ stdenv.mkDerivation rec { pname = "capnproto"; - version = "0.9.1"; + version = "0.10.1"; # release tarballs are missing some ekam rules src = fetchFromGitHub { owner = "capnproto"; repo = "capnproto"; rev = "v${version}"; - sha256 = "0cbiwkmd29abih8rjjm35dfkrkr8c6axbzq3fkryay6jyvpi42c5"; + sha256 = "sha256-VdeoTU802kAqTdu8CJTIhy3xHM3ZCPqb5YNUS2k1x7E="; }; nativeBuildInputs = [ cmake ] @@ -21,9 +21,6 @@ stdenv.mkDerivation rec { cmakeFlags = lib.optional (!(stdenv.buildPlatform.canExecute stdenv.hostPlatform)) "-DEXTERNAL_CAPNP"; - # Upstream 77ac9154440bcc216fda1092fd5bb51da62ae09c, modified to apply to v0.9.1. Drop on update. - patches = lib.optional stdenv.hostPlatform.isMusl ./musl-no-fibers.patch; - meta = with lib; { homepage = "https://capnproto.org/"; description = "Cap'n Proto cerealization protocol"; diff --git a/pkgs/development/libraries/capnproto/musl-no-fibers.patch b/pkgs/development/libraries/capnproto/musl-no-fibers.patch deleted file mode 100644 index bb7804fb0abb4..0000000000000 --- a/pkgs/development/libraries/capnproto/musl-no-fibers.patch +++ /dev/null @@ -1,244 +0,0 @@ -From 3d983eff304c28574c330a52d70a60145c9e157e Mon Sep 17 00:00:00 2001 -From: Jonas Vautherin <jonas.vautherin@gmail.com> -Date: Fri, 14 Jan 2022 00:14:26 +0100 -Subject: [PATCH] Add support for musl - ---- -Based on upstream 77ac9154440bcc216fda1092fd5bb51da62ae09c, -modified slightly by dtzWill to apply to v0.9.1. - -(drop whitespace change to a cmake "if (WITH_OPENSSL)", -leave the other instance of that change since it applies) ---- - -Co-authored-by: Guillaume Papin <guillaume.papin@epitech.eu> -(cherry picked from commit 77ac9154440bcc216fda1092fd5bb51da62ae09c) ---- - .github/workflows/quick-test.yml | 9 ++++++ - c++/CMakeLists.txt | 46 ++++++++++++++++++++++++++++- - c++/cmake/CapnProtoConfig.cmake.in | 32 ++++++++++++++++++++ - c++/configure.ac | 47 ++++++++++++++++++++++++++++-- - c++/src/kj/CMakeLists.txt | 11 ++++++- - 5 files changed, 141 insertions(+), 4 deletions(-) - -diff --git a/.github/workflows/quick-test.yml b/.github/workflows/quick-test.yml -index c18ef6a6..773ff043 100644 ---- a/.github/workflows/quick-test.yml -+++ b/.github/workflows/quick-test.yml -@@ -10,6 +10,15 @@ on: - - 'release-*' - - jobs: -+ Linux-musl: -+ runs-on: ubuntu-latest -+ container: alpine:latest -+ steps: -+ - uses: actions/checkout@v2 -+ - name: install dependencies -+ run: apk add autoconf automake build-base cmake libtool libucontext-dev linux-headers openssl-dev -+ - name: super-test -+ run: ./super-test.sh quick - Linux: - runs-on: ubuntu-latest - strategy: -diff --git a/c++/CMakeLists.txt b/c++/CMakeLists.txt -index 548dfd1f..5de7ab26 100644 ---- a/c++/CMakeLists.txt -+++ b/c++/CMakeLists.txt -@@ -1,4 +1,4 @@ --cmake_minimum_required(VERSION 3.4) -+cmake_minimum_required(VERSION 3.6) - project("Cap'n Proto" CXX) - set(VERSION 0.9.1) - -@@ -64,6 +64,50 @@ elseif (WITH_OPENSSL) - find_package(OpenSSL REQUIRED COMPONENTS Crypto SSL) - endif() - -+set(WITH_FIBERS "AUTO" CACHE STRING -+ "Whether or not to build libkj-async with fibers") -+# define list of values GUI will offer for the variable -+set_property(CACHE WITH_FIBERS PROPERTY STRINGS AUTO ON OFF) -+ -+# CapnProtoConfig.cmake.in needs this variable. -+set(_WITH_LIBUCONTEXT OFF) -+ -+if (WITH_FIBERS OR WITH_FIBERS STREQUAL "AUTO") -+ set(_capnp_fibers_found OFF) -+ if (WIN32 OR CYGWIN) -+ set(_capnp_fibers_found ON) -+ else() -+ # Fibers need makecontext, setcontext, getcontext, swapcontext that may be in libc, -+ # or in libucontext (e.g. for musl). -+ # We assume that makecontext implies that the others are present. -+ include(CheckLibraryExists) -+ check_library_exists(c makecontext "" HAVE_UCONTEXT_LIBC) -+ if (HAVE_UCONTEXT_LIBC) -+ set(_capnp_fibers_found ON) -+ else() -+ # Try with libucontext -+ find_package(PkgConfig) -+ if (PKG_CONFIG_FOUND) -+ pkg_check_modules(libucontext IMPORTED_TARGET libucontext) -+ if (libucontext_FOUND) -+ set(_WITH_LIBUCONTEXT ON) -+ set(_capnp_fibers_found ON) -+ endif() -+ else() -+ set(_capnp_fibers_found OFF) -+ endif() -+ endif() -+ endif() -+ -+ if (_capnp_fibers_found) -+ set(WITH_FIBERS ON) -+ elseif(WITH_FIBERS STREQUAL "AUTO") -+ set(WITH_FIBERS OFF) -+ else() -+ message(FATAL_ERROR "Missing 'makecontext', 'getcontext', 'setcontext' or 'swapcontext' symbol in libc and no libucontext found: KJ won't be able to build with fibers. Disable fibers (-DWITH_FIBERS=OFF).") -+ endif() -+endif() -+ - if(MSVC) - # TODO(cleanup): Enable higher warning level in MSVC, but make sure to test - # build with that warning level and clean out false positives. -diff --git a/c++/cmake/CapnProtoConfig.cmake.in b/c++/cmake/CapnProtoConfig.cmake.in -index 667f502f..0580b11a 100644 ---- a/c++/cmake/CapnProtoConfig.cmake.in -+++ b/c++/cmake/CapnProtoConfig.cmake.in -@@ -62,6 +62,38 @@ if (@WITH_OPENSSL@) # WITH_OPENSSL - endif() - endif() - -+if (@_WITH_LIBUCONTEXT@) # _WITH_LIBUCONTEXT -+ set(forwarded_config_flags) -+ if(CapnProto_FIND_QUIETLY) -+ list(APPEND forwarded_config_flags QUIET) -+ endif() -+ if(CapnProto_FIND_REQUIRED) -+ list(APPEND forwarded_config_flags REQUIRED) -+ endif() -+ # If the consuming project called find_package(CapnProto) with the QUIET or REQUIRED flags, forward -+ # them to calls to find_package(PkgConfig) and pkg_check_modules(). Note that find_dependency() -+ # would do this for us in the former case, but there is no such forwarding wrapper for -+ # pkg_check_modules(). -+ -+ find_package(PkgConfig ${forwarded_config_flags}) -+ if(NOT ${PkgConfig_FOUND}) -+ # If we're here, the REQUIRED flag must not have been passed, else we would have had a fatal -+ # error. Nevertheless, a diagnostic for this case is probably nice. -+ if(NOT CapnProto_FIND_QUIETLY) -+ message(WARNING "pkg-config cannot be found") -+ endif() -+ set(CapnProto_FOUND OFF) -+ return() -+ endif() -+ -+ if (CMAKE_VERSION VERSION_LESS 3.6) -+ # CMake >= 3.6 required due to the use of IMPORTED_TARGET -+ message(SEND_ERROR "libucontext support requires CMake >= 3.6.") -+ endif() -+ -+ pkg_check_modules(libucontext IMPORTED_TARGET ${forwarded_config_flags} libucontext) -+endif() -+ - include("${CMAKE_CURRENT_LIST_DIR}/CapnProtoTargets.cmake") - include("${CMAKE_CURRENT_LIST_DIR}/CapnProtoMacros.cmake") - -diff --git a/c++/configure.ac b/c++/configure.ac -index 72fe8456..b627bec8 100644 ---- a/c++/configure.ac -+++ b/c++/configure.ac -@@ -32,6 +32,11 @@ AC_ARG_WITH([openssl], - [build libkj-tls by linking against openssl @<:@default=check@:>@])], - [],[with_openssl=check]) - -+AC_ARG_WITH([fibers], -+ [AS_HELP_STRING([--with-fibers], -+ [build libkj-async with fibers @<:@default=check@:>@])], -+ [],[with_fibers=check]) -+ - AC_ARG_ENABLE([reflection], [ - AS_HELP_STRING([--disable-reflection], [ - compile Cap'n Proto in "lite mode", in which all reflection APIs (schema.h, dynamic.h, etc.) -@@ -195,8 +200,46 @@ AS_IF([test "$with_openssl" != no], [ - ]) - AM_CONDITIONAL([BUILD_KJ_TLS], [test "$with_openssl" != no]) - --# CapnProtoConfig.cmake.in needs this variable. --AC_SUBST(WITH_OPENSSL, $with_openssl) -+# Fibers need the symbols getcontext, setcontext, swapcontext and makecontext. -+# We assume that makecontext implies the rest. -+AS_IF([test "$with_fibers" != no], [ -+ libc_supports_fibers=yes -+ AC_SEARCH_LIBS([makecontext], [], [], [ -+ libc_supports_fibers=no -+ ]) -+ -+ AS_IF([test "$libc_supports_fibers" = yes], [ -+ with_fibers=yes -+ ], [ -+ # If getcontext does not exist in libc, try with libucontext -+ ucontext_supports_fibers=yes -+ AC_CHECK_LIB(ucontext, [makecontext], [], [ -+ ucontext_supports_fibers=no -+ ]) -+ AS_IF([test "$ucontext_supports_fibers" = yes], [ -+ ASYNC_LIBS="$ASYNC_LIBS -lucontext" -+ with_fibers=yes -+ ], [ -+ AS_IF([test "$with_fibers" = yes], [ -+ AC_MSG_ERROR([Missing symbols required for fibers (makecontext, setcontext, ...). Disable fibers (--without-fibers) or install libucontext]) -+ ], [ -+ AC_MSG_WARN([could not find required symbols (makecontext, setcontext, ...) -- won't build with fibers]) -+ with_fibers=no -+ ]) -+ ]) -+ ]) -+]) -+AS_IF([test "$with_fibers" = yes], [ -+ CXXFLAGS="$CXXFLAGS -DKJ_USE_FIBERS" -+], [ -+ CXXFLAGS="$CXXFLAGS -DKJ_USE_FIBERS=0" -+]) -+ -+# CapnProtoConfig.cmake.in needs these variables, -+# we force them to NO because we don't need the CMake dependency for them, -+# the dependencies are provided by the .pc files. -+AC_SUBST(WITH_OPENSSL, NO) -+AC_SUBST(_WITH_LIBUCONTEXT, NO) - - AM_CONDITIONAL([HAS_FUZZING_ENGINE], [test "x$LIB_FUZZING_ENGINE" != "x"]) - -diff --git a/c++/src/kj/CMakeLists.txt b/c++/src/kj/CMakeLists.txt -index 813fac4d..f7b4dddf 100644 ---- a/c++/src/kj/CMakeLists.txt -+++ b/c++/src/kj/CMakeLists.txt -@@ -136,6 +136,15 @@ if(NOT CAPNP_LITE) - add_library(kj-async ${kj-async_sources}) - add_library(CapnProto::kj-async ALIAS kj-async) - target_link_libraries(kj-async PUBLIC kj) -+ if(WITH_FIBERS) -+ target_compile_definitions(kj-async PUBLIC KJ_USE_FIBERS) -+ if(_WITH_LIBUCONTEXT) -+ target_link_libraries(kj-async PUBLIC PkgConfig::libucontext) -+ endif() -+ else() -+ target_compile_definitions(kj-async PUBLIC KJ_USE_FIBERS=0) -+ endif() -+ - if(UNIX) - # external clients of this library need to link to pthreads - target_compile_options(kj-async INTERFACE "-pthread") -@@ -181,7 +190,7 @@ if(NOT CAPNP_LITE) - add_library(kj-tls ${kj-tls_sources}) - add_library(CapnProto::kj-tls ALIAS kj-tls) - target_link_libraries(kj-tls PUBLIC kj-async) -- if (WITH_OPENSSL) -+ if(WITH_OPENSSL) - target_compile_definitions(kj-tls PRIVATE KJ_HAS_OPENSSL) - target_link_libraries(kj-tls PRIVATE OpenSSL::SSL OpenSSL::Crypto) - endif() --- -2.35.1 - diff --git a/pkgs/development/libraries/cpp-utilities/default.nix b/pkgs/development/libraries/cpp-utilities/default.nix index f2f331eec6878..7064964adc580 100644 --- a/pkgs/development/libraries/cpp-utilities/default.nix +++ b/pkgs/development/libraries/cpp-utilities/default.nix @@ -7,13 +7,13 @@ stdenv.mkDerivation rec { pname = "cpp-utilities"; - version = "5.15.0"; + version = "5.16.0"; src = fetchFromGitHub { owner = "Martchus"; repo = pname; rev = "v${version}"; - sha256 = "sha256-3D/5Bl5vANZrHtJGehoHwQ0mDrL8TJ7iK2GoViiuj6E="; + sha256 = "sha256-B/pWdfK3KddAIppJXQRohiIK8mouAQjXRHic75IzY/Q="; }; nativeBuildInputs = [ cmake ]; diff --git a/pkgs/development/libraries/doctest/default.nix b/pkgs/development/libraries/doctest/default.nix index 360c643f52336..6c9281bda9918 100644 --- a/pkgs/development/libraries/doctest/default.nix +++ b/pkgs/development/libraries/doctest/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "doctest"; - version = "2.4.8"; + version = "2.4.9"; src = fetchFromGitHub { owner = "doctest"; repo = "doctest"; rev = "v${version}"; - sha256 = "sha256-/4lyCQZHsa32ozes5MJ0JZpQ99MECRlgFeSzN/Zs/BQ="; + sha256 = "sha256-ugmkeX2PN4xzxAZpWgswl4zd2u125Q/ADSKzqTfnd94="; }; nativeBuildInputs = [ cmake ]; diff --git a/pkgs/development/libraries/egl-wayland/default.nix b/pkgs/development/libraries/egl-wayland/default.nix index 3881f8f7ee38b..83cde54f348e7 100644 --- a/pkgs/development/libraries/egl-wayland/default.nix +++ b/pkgs/development/libraries/egl-wayland/default.nix @@ -42,7 +42,7 @@ let in stdenv.mkDerivation rec { pname = "egl-wayland"; - version = "1.1.9"; + version = "1.1.10"; outputs = [ "out" "dev" ]; @@ -50,7 +50,7 @@ in stdenv.mkDerivation rec { owner = "Nvidia"; repo = pname; rev = version; - sha256 = "sha256-rcmGVEcOtKTR8sVkHV7Xb+8NuKWUapYn+/Fswi4z6Mc="; + sha256 = "sha256-dbcEMtPnzF2t7O8YtKVUGSvJqb5WPMmmW+SyqOFnDY4="; }; depsBuildBuild = [ diff --git a/pkgs/development/libraries/flint/default.nix b/pkgs/development/libraries/flint/default.nix index 79b0e4caa1f05..eeb2cf1127e43 100644 --- a/pkgs/development/libraries/flint/default.nix +++ b/pkgs/development/libraries/flint/default.nix @@ -13,11 +13,11 @@ assert withBlas -> openblas != null && blas.implementation == "openblas" && lapa stdenv.mkDerivation rec { pname = "flint"; - version = "2.8.5"; + version = "2.9.0"; src = fetchurl { url = "https://www.flintlib.org/flint-${version}.tar.gz"; - sha256 = "sha256-WRH+3/kREA8VeB8146T6k0/mDkrqAqjBDMiRgQHB7tg="; + sha256 = "sha256-L8CQ1RAzyTII5sENQGOXpTyYOuU0O5WOsl9ypXpM52o="; }; buildInputs = [ diff --git a/pkgs/development/libraries/folly/default.nix b/pkgs/development/libraries/folly/default.nix index a3626feca9de8..fdda2b3a62051 100644 --- a/pkgs/development/libraries/folly/default.nix +++ b/pkgs/development/libraries/folly/default.nix @@ -21,13 +21,13 @@ stdenv.mkDerivation rec { pname = "folly"; - version = "2022.05.23.00"; + version = "2022.06.13.00"; src = fetchFromGitHub { owner = "facebook"; repo = "folly"; rev = "v${version}"; - sha256 = "sha256-ti/aqVg6b3ZPEI72AZNo/4NrtlI/mKQb39tlTw+3VG4="; + sha256 = "sha256-30Fzk97wVK0JR/6YllyBjW9KlYrFj+GJpuV+V2bKXL8="; }; nativeBuildInputs = [ diff --git a/pkgs/development/libraries/geos/default.nix b/pkgs/development/libraries/geos/default.nix index c067a705d0bfe..32b3155b8c564 100644 --- a/pkgs/development/libraries/geos/default.nix +++ b/pkgs/development/libraries/geos/default.nix @@ -1,6 +1,7 @@ { lib , stdenv , fetchurl +, fetchpatch , cmake }: stdenv.mkDerivation rec { @@ -12,13 +13,15 @@ stdenv.mkDerivation rec { sha256 = "sha256-ULvFmaw4a0wrOWLcxBHwBAph8gSq7066ciXs3Qz0VxU="; }; - nativeBuildInputs = [ cmake ]; + patches = [ + # Fix paths with absolute CMAKE_INSTALL_*DIR + (fetchpatch { + url = "https://github.com/libgeos/geos/commit/11faa4db672ed61d64fd8a6f1a59114f5b5f2406.patch"; + hash = "sha256-oAArwGq91Z93C6hBPQD0AlY8Q4Nnn6tA40HUPoZ5ftc="; + }) + ]; - postPatch = '' - substituteInPlace tools/geos-config.in \ - --replace "@libdir@" "@prefix@/lib" \ - --replace "@includedir@" "@prefix@/include" - ''; + nativeBuildInputs = [ cmake ]; meta = with lib; { description = "C++ port of the Java Topology Suite (JTS)"; diff --git a/pkgs/development/libraries/hunspell/dictionaries.nix b/pkgs/development/libraries/hunspell/dictionaries.nix index 4f520772b7502..b6c4c4e6570cf 100644 --- a/pkgs/development/libraries/hunspell/dictionaries.nix +++ b/pkgs/development/libraries/hunspell/dictionaries.nix @@ -845,4 +845,15 @@ rec { platforms = platforms.all; }; }; + + /* CROATIAN */ + + hr_HR = hr-hr; + hr-hr = mkDictFromLibreOffice { + shortName = "hr-hr"; + dictFileName = "hr_HR"; + shortDescription = "Croatian (Croatia)"; + readmeFile = "README_hr_HR.txt"; + license = with lib.licenses; [ gpl2Only lgpl21Only mpl11 ]; + }; } diff --git a/pkgs/development/libraries/jansson/default.nix b/pkgs/development/libraries/jansson/default.nix index aafbe839bd4cf..fbc9a676a85cd 100644 --- a/pkgs/development/libraries/jansson/default.nix +++ b/pkgs/development/libraries/jansson/default.nix @@ -13,9 +13,11 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake ]; - # networkmanager relies on libjansson.so: - # https://github.com/NixOS/nixpkgs/pull/176302#issuecomment-1150239453 - cmakeFlags = [ "-DJANSSON_BUILD_SHARED_LIBS=ON" ]; + cmakeFlags = [ + # networkmanager relies on libjansson.so: + # https://github.com/NixOS/nixpkgs/pull/176302#issuecomment-1150239453 + "-DJANSSON_BUILD_SHARED_LIBS=${if stdenv.hostPlatform.isStatic then "OFF" else "ON"}" + ]; meta = with lib; { homepage = "https://github.com/akheron/jansson"; diff --git a/pkgs/development/libraries/jarowinkler-cpp/default.nix b/pkgs/development/libraries/jarowinkler-cpp/default.nix index 6ddb86299365f..0cbfdcea64475 100644 --- a/pkgs/development/libraries/jarowinkler-cpp/default.nix +++ b/pkgs/development/libraries/jarowinkler-cpp/default.nix @@ -7,13 +7,13 @@ stdenv.mkDerivation rec { pname = "jarowinkler-cpp"; - version = "1.0.1"; + version = "1.0.2"; src = fetchFromGitHub { owner = "maxbachmann"; repo = "jarowinkler-cpp"; rev = "v${version}"; - hash = "sha256-3/x0fyaDJTouBKbif0ALgMzht6HMEGHNw8g8zQlUcNk="; + hash = "sha256-GuwDSCYTfSwqTnzZSft3ufVSKL7255lVvbJhBxKxjJw="; }; nativeBuildInputs = [ @@ -33,6 +33,7 @@ stdenv.mkDerivation rec { meta = { description = "Fast Jaro and Jaro-Winkler distance"; homepage = "https://github.com/maxbachmann/jarowinkler-cpp"; + changelog = "https://github.com/maxbachmann/jarowinkler-cpp/blob/${src.rev}/CHANGELOG.md"; license = lib.licenses.mit; maintainers = with lib.maintainers; [ dotlambda ]; platforms = lib.platforms.unix; diff --git a/pkgs/development/libraries/java/commons/daemon/default.nix b/pkgs/development/libraries/java/commons/daemon/default.nix index 7b5be45e200cf..e41c475c829d3 100644 --- a/pkgs/development/libraries/java/commons/daemon/default.nix +++ b/pkgs/development/libraries/java/commons/daemon/default.nix @@ -1,12 +1,12 @@ { lib, stdenv, fetchurl }: stdenv.mkDerivation rec { - version = "1.3.0"; + version = "1.3.1"; pname = "commons-daemon"; src = fetchurl { url = "mirror://apache/commons/daemon/binaries/commons-daemon-${version}-bin.tar.gz"; - sha256 = "sha256-Fihsar8HR2adN2f9deo7bk8tRgeiD6BljVZ/mfkLUUA="; + sha256 = "sha256-EaQ4wy32GX1MGByCqo811WblqZgsNSw3psr94lrxEqw="; }; installPhase = '' diff --git a/pkgs/development/libraries/kde-frameworks/plasma-framework.nix b/pkgs/development/libraries/kde-frameworks/plasma-framework.nix index cf118beaabce7..83a7cc2546d35 100644 --- a/pkgs/development/libraries/kde-frameworks/plasma-framework.nix +++ b/pkgs/development/libraries/kde-frameworks/plasma-framework.nix @@ -1,5 +1,5 @@ { - mkDerivation, + mkDerivation, fetchpatch, extra-cmake-modules, kdoctools, kactivities, karchive, kconfig, kconfigwidgets, kcoreaddons, kdbusaddons, kdeclarative, kglobalaccel, kguiaddons, ki18n, kiconthemes, kio, @@ -9,6 +9,14 @@ mkDerivation { pname = "plasma-framework"; + patches = [ + # FIXME: remove on kf5.96 + (fetchpatch { + name = "fix-thumbnails-task-manager.patch"; + url = "https://invent.kde.org/frameworks/plasma-framework/-/commit/dff1b034c1162062aa2292099d3d01fc53dafdf6.patch"; + sha256 = "sha256-0162bi3J5bl5BmmUSrhxxy8MpLtSXkdHGK8wMcS5BB8="; + }) + ]; nativeBuildInputs = [ extra-cmake-modules kdoctools ]; buildInputs = [ kactivities karchive kconfig kconfigwidgets kcoreaddons kdbusaddons diff --git a/pkgs/development/libraries/libkqueue/default.nix b/pkgs/development/libraries/libkqueue/default.nix index 8a4bfdedd1e33..5f96353d9d69f 100644 --- a/pkgs/development/libraries/libkqueue/default.nix +++ b/pkgs/development/libraries/libkqueue/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "libkqueue"; - version = "2.6.1"; + version = "2.6.2"; src = fetchFromGitHub { owner = "mheily"; repo = "libkqueue"; rev = "v${version}"; - sha256 = "sha256-YKKBHOxjUS7+/ib4gcR7EYjjVOwhHVksYasLhErdV8s="; + sha256 = "sha256-5Zds9sqHkFldJf3ThTPOiaGKohmFcIzY0ARDA0iswVk="; }; nativeBuildInputs = [ cmake ]; @@ -16,6 +16,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "kqueue(2) compatibility library"; homepage = "https://github.com/mheily/libkqueue"; + changelog = "https://github.com/mheily/libkqueue/raw/v${version}/ChangeLog"; license = licenses.bsd2; maintainers = [ maintainers.marsam ]; platforms = platforms.linux; diff --git a/pkgs/development/libraries/malcontent/default.nix b/pkgs/development/libraries/malcontent/default.nix index 791fae96f0fcf..4154f0315cd24 100644 --- a/pkgs/development/libraries/malcontent/default.nix +++ b/pkgs/development/libraries/malcontent/default.nix @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { pname = "malcontent"; - version = "0.10.4"; + version = "0.10.5"; outputs = [ "bin" "out" "lib" "pam" "dev" "man" "installedTests" ]; @@ -28,7 +28,7 @@ stdenv.mkDerivation rec { owner = "pwithnall"; repo = pname; rev = version; - sha256 = "sha256-s2wQLb3tCfO3p8yYG8Nc6pu+y2TLfrmo7Ug1LgDLEdw="; + sha256 = "sha256-UPKAStB6wTd3qbbISHMgNw1bJjIRgn89tHnsw4ZptvQ="; }; patches = [ diff --git a/pkgs/development/libraries/ncurses/default.nix b/pkgs/development/libraries/ncurses/default.nix index 72d64854238f3..2cfe41956a4b1 100644 --- a/pkgs/development/libraries/ncurses/default.nix +++ b/pkgs/development/libraries/ncurses/default.nix @@ -41,7 +41,17 @@ stdenv.mkDerivation rec { ++ lib.optionals stdenv.hostPlatform.isWindows [ "--enable-sp-funcs" "--enable-term-driver" - ]; + ] ++ lib.optionals (stdenv.hostPlatform.isUnix && stdenv.hostPlatform.isStatic) [ + # For static binaries, the point is to have a standalone binary with + # minimum dependencies. So here we make sure that binaries using this + # package won't depend on a terminfo database located in the Nix store. + "--with-terminfo-dirs=${lib.concatStringsSep ":" [ + "/etc/terminfo" # Debian, Fedora, Gentoo + "/lib/terminfo" # Debian + "/usr/share/terminfo" # upstream default, probably all FHS-based distros + "/run/current-system/sw/share/terminfo" # NixOS + ]}" + ]; # Only the C compiler, and explicitly not C++ compiler needs this flag on solaris: CFLAGS = lib.optionalString stdenv.isSunOS "-D_XOPEN_SOURCE_EXTENDED"; diff --git a/pkgs/development/libraries/nghttp3/default.nix b/pkgs/development/libraries/nghttp3/default.nix index 32e3917e72c11..e0392901eccfa 100644 --- a/pkgs/development/libraries/nghttp3/default.nix +++ b/pkgs/development/libraries/nghttp3/default.nix @@ -5,13 +5,13 @@ stdenv.mkDerivation rec { pname = "nghttp3"; - version = "0.4.1"; + version = "0.5.0"; src = fetchFromGitHub { owner = "ngtcp2"; repo = pname; rev = "v${version}"; - sha256 = "sha256-1+0ln0J8dqHqmE+fsawhbfbbMNlCkDpJx4xomUuoHdE="; + sha256 = "sha256-EEwo4KIBNVb/O1htUN8GkuiU/P3r/DyEn6L9l1r1I6E="; }; outputs = [ "out" "dev" "doc" ]; diff --git a/pkgs/development/libraries/ngtcp2/default.nix b/pkgs/development/libraries/ngtcp2/default.nix index 68dabef6d9fbc..02812e004322a 100644 --- a/pkgs/development/libraries/ngtcp2/default.nix +++ b/pkgs/development/libraries/ngtcp2/default.nix @@ -7,13 +7,13 @@ stdenv.mkDerivation rec { pname = "ngtcp2"; - version = "0.5.0"; + version = "0.6.0"; src = fetchFromGitHub { owner = "ngtcp2"; repo = pname; rev = "v${version}"; - sha256 = "sha256-hpIGsQBJCOyaEqopdES/hRXc2makIERonUju9D/HvgE="; + sha256 = "sha256-1cbbH411kn2OnxLWXQvmae0JW4HzXnEHYnucQEVAslk="; }; outputs = [ "out" "dev" "doc" ]; diff --git a/pkgs/development/libraries/olm/default.nix b/pkgs/development/libraries/olm/default.nix index 21f5a83073fe6..47a2656871222 100644 --- a/pkgs/development/libraries/olm/default.nix +++ b/pkgs/development/libraries/olm/default.nix @@ -2,14 +2,14 @@ stdenv.mkDerivation rec { pname = "olm"; - version = "3.2.11"; + version = "3.2.12"; src = fetchFromGitLab { domain = "gitlab.matrix.org"; owner = "matrix-org"; repo = pname; rev = version; - sha256 = "sha256-/ozMvcHDhYruhzp8xfskKOYCbe/vS4pEOPn1+1Pb+Q0="; + sha256 = "sha256-EvqQvg7khsJ2OrcoHBImd9fTgjA65pVRqbJuMV5MG80="; }; nativeBuildInputs = [ cmake ]; diff --git a/pkgs/development/libraries/rapidfuzz-cpp/default.nix b/pkgs/development/libraries/rapidfuzz-cpp/default.nix index 99c3059c7a51f..0831539dd570b 100644 --- a/pkgs/development/libraries/rapidfuzz-cpp/default.nix +++ b/pkgs/development/libraries/rapidfuzz-cpp/default.nix @@ -7,24 +7,19 @@ stdenv.mkDerivation rec { pname = "rapidfuzz-cpp"; - version = "1.0.2"; + version = "1.0.3"; src = fetchFromGitHub { owner = "maxbachmann"; repo = "rapidfuzz-cpp"; rev = "v${version}"; - hash = "sha256-Tf7nEMXiem21cvQHPnYnCvOOLg0KBBnNQDaYIcHcm2g="; + hash = "sha256-8SJU+ERFRGkbGBmGJa5Ypetc3LPeytg5pR4S29RkvR8="; }; - patches = lib.optionals doCheck [ + patches = [ ./dont-fetch-project-options.patch ]; - postPatch = '' - substituteInPlace test/CMakeLists.txt \ - --replace WARNINGS_AS_ERRORS "" - ''; - nativeBuildInputs = [ cmake ]; @@ -42,6 +37,7 @@ stdenv.mkDerivation rec { meta = { description = "Rapid fuzzy string matching in C++ using the Levenshtein Distance"; homepage = "https://github.com/maxbachmann/rapidfuzz-cpp"; + changelog = "https://github.com/maxbachmann/rapidfuzz-cpp/blob/${src.rev}/CHANGELOG.md"; license = lib.licenses.mit; maintainers = with lib.maintainers; [ dotlambda ]; platforms = lib.platforms.unix; diff --git a/pkgs/development/libraries/science/math/m4rie/default.nix b/pkgs/development/libraries/science/math/m4rie/default.nix index 38a633e58c712..2a46e22b60d26 100644 --- a/pkgs/development/libraries/science/math/m4rie/default.nix +++ b/pkgs/development/libraries/science/math/m4rie/default.nix @@ -5,14 +5,14 @@ }: stdenv.mkDerivation rec { - version = "20200115"; + version = "20200125"; pname = "m4rie"; src = fetchFromBitbucket { owner = "malb"; repo = "m4rie"; rev = "release-${version}"; - sha256 = "0s8if80x5d6mikbcfsbbxg347136spahp9f3x8i1hflbwl8xj9k8"; + sha256 = "sha256-bjAcxfXsC6+jPYC472CN78jm4UljJQlkWyvsqckCDh0="; }; doCheck = true; diff --git a/pkgs/development/libraries/taskflow/default.nix b/pkgs/development/libraries/taskflow/default.nix index 29760cdb94bd2..dd2f8fb391448 100644 --- a/pkgs/development/libraries/taskflow/default.nix +++ b/pkgs/development/libraries/taskflow/default.nix @@ -8,13 +8,13 @@ stdenv.mkDerivation rec { pname = "taskflow"; - version = "3.3.0"; + version = "3.4.0"; src = fetchFromGitHub { owner = "taskflow"; repo = "taskflow"; rev = "v${version}"; - hash = "sha256-UfXGupxgtowIt3BnIVWwim3rTE57TT1C9TCx9LVyN34="; + hash = "sha256-5bTTV/WAxslHQ+hvATtUUA1h3MuNzwVTlYMbD/sINRM="; }; patches = [ diff --git a/pkgs/development/libraries/v8/8_x.nix b/pkgs/development/libraries/v8/8_x.nix index 9e2469eed38e6..b5184bafcbff9 100644 --- a/pkgs/development/libraries/v8/8_x.nix +++ b/pkgs/development/libraries/v8/8_x.nix @@ -148,6 +148,7 @@ stdenv.mkDerivation rec { install -D d8 $out/bin/d8 install -D -m644 obj/libv8_monolith.a $out/lib/libv8.a install -D -m644 icudtl.dat $out/share/v8/icudtl.dat + ln -s libv8.a $out/lib/libv8_monolith.a cp -r ../../include $out mkdir -p $out/lib/pkgconfig diff --git a/pkgs/development/libraries/v8/default.nix b/pkgs/development/libraries/v8/default.nix index 2b56d2e5dcf8e..cf9d597edc21c 100644 --- a/pkgs/development/libraries/v8/default.nix +++ b/pkgs/development/libraries/v8/default.nix @@ -148,6 +148,7 @@ stdenv.mkDerivation rec { install -D d8 $out/bin/d8 install -D -m644 obj/libv8_monolith.a $out/lib/libv8.a install -D -m644 icudtl.dat $out/share/v8/icudtl.dat + ln -s libv8.a $out/lib/libv8_monolith.a cp -r ../../include $out mkdir -p $out/lib/pkgconfig diff --git a/pkgs/development/node-packages/main-programs.nix b/pkgs/development/node-packages/main-programs.nix index b5c710bd8c848..8004f2025a91b 100644 --- a/pkgs/development/node-packages/main-programs.nix +++ b/pkgs/development/node-packages/main-programs.nix @@ -32,6 +32,7 @@ "@webassemblyjs/wasm-strip" = "wasm-strip"; "@webassemblyjs/wasm-text-gen" = "wasmgen"; "@webassemblyjs/wast-refmt" = "wast-refmt"; + aws-cdk = "cdk"; balanceofsatoshis = "bos"; carbon-now-cli = "carbon-now"; cdk8s-cli = "cdk8s"; diff --git a/pkgs/development/ocaml-modules/ffmpeg/base.nix b/pkgs/development/ocaml-modules/ffmpeg/base.nix index 5dc5f612fd325..212ad686e356a 100644 --- a/pkgs/development/ocaml-modules/ffmpeg/base.nix +++ b/pkgs/development/ocaml-modules/ffmpeg/base.nix @@ -1,7 +1,7 @@ { lib, fetchFromGitHub }: rec { - version = "1.1.3"; + version = "1.1.4"; useDune2 = true; @@ -9,7 +9,7 @@ rec { owner = "savonet"; repo = "ocaml-ffmpeg"; rev = "v${version}"; - sha256 = "1l40dfc0v3wn2drfq0mclrc1lrlpycdjrkrw4knkwpsg0za68v4c"; + sha256 = "sha256-IM7bzOZAZQjLz4YjRTMU5fZgrA2QTZcSDMgclDo4sn0="; }; meta = with lib; { diff --git a/pkgs/development/ocaml-modules/mldoc/default.nix b/pkgs/development/ocaml-modules/mldoc/default.nix new file mode 100644 index 0000000000000..2d184e68a0e7a --- /dev/null +++ b/pkgs/development/ocaml-modules/mldoc/default.nix @@ -0,0 +1,65 @@ +{ lib +, buildDunePackage +, fetchFromGitHub +, fetchpatch +, angstrom +, cmdliner +, core +, core_bench +, js_of_ocaml +, js_of_ocaml-ppx +, ppx_deriving_yojson +, uri +, yojson +, lwt +, xmlm +}: +let + angstrom' = angstrom.overrideAttrs (attrs: { + patches = attrs.patches or [ ] ++ [ + # mldoc requires Angstrom to expose `unsafe_lookahead` + (fetchpatch { + url = "https://github.com/logseq/angstrom/commit/bbe36c99c13678937d4c983a427e02a733d6cc24.patch"; + sha256 = "sha256-RapY1QJ8U0HOqJ9TFDnCYB4tFLFuThESzdBZqjYuDUA="; + }) + ]; + }); + uri' = uri.override { angstrom = angstrom'; }; +in +buildDunePackage rec { + pname = "mldoc"; + version = "1.3.9"; + + minimalOCamlVersion = "4.10"; + + src = fetchFromGitHub { + owner = "logseq"; + repo = "mldoc"; + rev = "v${version}"; + sha256 = "sha256-C5SeG10EoZixCWeBxw7U+isAR8UWd1jzHLdmbp//gAs="; + }; + + buildInputs = [ + cmdliner + core + core_bench + js_of_ocaml + js_of_ocaml-ppx + lwt + ]; + + propagatedBuildInputs = [ + angstrom' + uri' + yojson + ppx_deriving_yojson + xmlm + ]; + + meta = with lib; { + homepage = "https://github.com/logseq/mldoc"; + description = "Another Emacs Org-mode and Markdown parser"; + license = licenses.agpl3Only; + maintainers = with maintainers; [ marsam ]; + }; +} diff --git a/pkgs/development/ocaml-modules/pbkdf/default.nix b/pkgs/development/ocaml-modules/pbkdf/default.nix index 1ecf213f6d369..d82869c4392d4 100644 --- a/pkgs/development/ocaml-modules/pbkdf/default.nix +++ b/pkgs/development/ocaml-modules/pbkdf/default.nix @@ -1,22 +1,23 @@ { lib , buildDunePackage -, fetchurl +, fetchFromGitHub +, cstruct , mirage-crypto , alcotest }: buildDunePackage rec { pname = "pbkdf"; - version = "1.1.0"; + version = "1.2.0"; - useDune2 = true; - - src = fetchurl { - url = "https://github.com/abeaumont/ocaml-pbkdf/releases/download/${version}/pbkdf-${version}.tbz"; - sha256 = "e53ed1bd9abf490c858a341c10fb548bc9ad50d4479acdf95a9358a73d042264"; + src = fetchFromGitHub { + owner = "abeaumont"; + repo = "ocaml-pbkdf"; + rev = version; + sha256 = "sha256-dGi4Vw+7VBpK/NpJ6zdpogm+E6G/oJovXCksJBSmqjI="; }; - propagatedBuildInputs = [ mirage-crypto ]; + propagatedBuildInputs = [ cstruct mirage-crypto ]; checkInputs = [ alcotest ]; doCheck = true; diff --git a/pkgs/development/python-modules/Pmw/default.nix b/pkgs/development/python-modules/Pmw/default.nix index 9dfb8de3b2c67..27c62ea663265 100644 --- a/pkgs/development/python-modules/Pmw/default.nix +++ b/pkgs/development/python-modules/Pmw/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "Pmw"; - version = "2.0.1"; + version = "2.1.1"; src = fetchPypi { inherit pname version; - sha256 = "080iml3868nxniyn56kcwnbghm10j7fw74a5nj0s19sm4zsji78b"; + sha256 = "sha256-lIQSRXz8zwx3XdCOCRP7APkIlqM8eXN9VxxzEq6vVcY="; }; propagatedBuildInputs = [ tkinter ]; diff --git a/pkgs/development/python-modules/aiosteamist/default.nix b/pkgs/development/python-modules/aiosteamist/default.nix index 785d0f610361e..535594e3d28dd 100644 --- a/pkgs/development/python-modules/aiosteamist/default.nix +++ b/pkgs/development/python-modules/aiosteamist/default.nix @@ -9,7 +9,7 @@ buildPythonPackage rec { pname = "aiosteamist"; - version = "0.3.1"; + version = "0.3.2"; format = "pyproject"; disabled = pythonOlder "3.7"; @@ -18,7 +18,7 @@ buildPythonPackage rec { owner = "bdraco"; repo = pname; rev = version; - hash = "sha256-VoIJh3EDBPKmvEmM3gP2pyt/0oz4i6Y0zIkkprTcFLg="; + hash = "sha256-IKrAJ4QDcYJRO4hcomL9FRs8hJ3k7SgRgK4H1b8SxIM="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/aioswitcher/default.nix b/pkgs/development/python-modules/aioswitcher/default.nix index 68cc3150d9f69..d03cc22ab1eb1 100644 --- a/pkgs/development/python-modules/aioswitcher/default.nix +++ b/pkgs/development/python-modules/aioswitcher/default.nix @@ -47,6 +47,7 @@ buildPythonPackage rec { "test_schedule_parser_with_a_daily_recurring_enabled_schedule_data" "test_schedule_parser_with_a_partial_daily_recurring_enabled_schedule_data" "test_schedule_parser_with_a_non_recurring_enabled_schedule_data" + "test_hexadecimale_timestamp_to_localtime_with_the_current_timestamp_should_return_a_time_string" ]; pythonImportsCheck = [ "aioswitcher" ]; diff --git a/pkgs/development/python-modules/aiounifi/default.nix b/pkgs/development/python-modules/aiounifi/default.nix index 10f07f343043f..0596e654eb7e7 100644 --- a/pkgs/development/python-modules/aiounifi/default.nix +++ b/pkgs/development/python-modules/aiounifi/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { pname = "aiounifi"; - version = "32"; + version = "33"; disabled = pythonOlder "3.9"; @@ -19,7 +19,7 @@ buildPythonPackage rec { owner = "Kane610"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-YKkZMOlV4DPScNohU+M2J71CrIT3cHCHrzp4PIOAc5E="; + hash = "sha256-MXzUQOC5Y33RgRKf5BPbA9VfQKKdRjawF9kW4QmSHkU="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/aioymaps/default.nix b/pkgs/development/python-modules/aioymaps/default.nix index c23451b9db92a..e1da7baaa6b50 100644 --- a/pkgs/development/python-modules/aioymaps/default.nix +++ b/pkgs/development/python-modules/aioymaps/default.nix @@ -7,13 +7,13 @@ buildPythonPackage rec { pname = "aioymaps"; - version = "1.2.2"; + version = "1.2.3"; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - sha256 = "sha256-ZWolVsh6MSEA3h62ERaCLSVAr+vl53yysPjulMtW4QI="; + sha256 = "sha256-pW8FoMdA8XdQZmLRwk5SBBgFhYhgEMJPA9+b+8aicuE="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/ansible/default.nix b/pkgs/development/python-modules/ansible/default.nix index 802e7ee72c7b8..69d80afb872f5 100644 --- a/pkgs/development/python-modules/ansible/default.nix +++ b/pkgs/development/python-modules/ansible/default.nix @@ -20,7 +20,7 @@ let pname = "ansible"; - version = "5.8.0"; + version = "6.0.0"; in buildPythonPackage { inherit pname version; @@ -30,7 +30,7 @@ buildPythonPackage { src = fetchPypi { inherit pname version; - sha256 = "sha256-+gVkdiAfQGJfs22VxQQe9GOIC+GL5cc7mYtXtAGWeGM="; + sha256 = "sha256-ZBosJ7xXaPmorRSIDx9uVxwfKvHUXnbycdduP3R1TFM="; }; postPatch = '' diff --git a/pkgs/development/python-modules/audible/default.nix b/pkgs/development/python-modules/audible/default.nix index 2d4f3ac4df037..8769cdedeac31 100644 --- a/pkgs/development/python-modules/audible/default.nix +++ b/pkgs/development/python-modules/audible/default.nix @@ -2,13 +2,13 @@ buildPythonPackage rec { pname = "audible"; - version = "0.8.1"; + version = "0.8.2"; src = fetchFromGitHub { owner = "mkb79"; repo = "Audible"; - rev = "v${version}"; - sha256 = "0fsb5av4s7fvpn0iryl8jj3lwffwlxgbwj46l3fidy0l58nq3b1d"; + rev = "refs/tags/v${version}"; + sha256 = "sha256-SIEDBuMCC/Hap2mGVbKEFic96ClN369SEsV06Sg+poY="; }; propagatedBuildInputs = [ beautifulsoup4 httpx pbkdf2 pillow pyaes rsa ]; diff --git a/pkgs/development/python-modules/authcaptureproxy/default.nix b/pkgs/development/python-modules/authcaptureproxy/default.nix index 11e1f444cb0bb..d4a71d639c73b 100644 --- a/pkgs/development/python-modules/authcaptureproxy/default.nix +++ b/pkgs/development/python-modules/authcaptureproxy/default.nix @@ -15,14 +15,14 @@ buildPythonPackage rec { pname = "authcaptureproxy"; - version = "1.1.3"; + version = "1.1.4"; format = "pyproject"; src = fetchFromGitHub { owner = "alandtse"; repo = "auth_capture_proxy"; - rev = "v${version}"; - sha256 = "sha256-RD/8v3IQb50iGkU6zj5QfHXakjHdcCBWWAkXhCIF6qo="; + rev = "refs/tags/v${version}"; + sha256 = "sha256-4IPBulzRoAAplyM/1MPE40IW4IXBIGYLydzpY64Gl0c="; }; postPatch = '' diff --git a/pkgs/development/python-modules/awesomeversion/default.nix b/pkgs/development/python-modules/awesomeversion/default.nix index 2e5501afb2ddc..f55f91d5a1921 100644 --- a/pkgs/development/python-modules/awesomeversion/default.nix +++ b/pkgs/development/python-modules/awesomeversion/default.nix @@ -8,7 +8,7 @@ buildPythonPackage rec { pname = "awesomeversion"; - version = "22.5.2"; + version = "22.6.0"; format = "pyproject"; disabled = pythonOlder "3.8"; @@ -17,7 +17,7 @@ buildPythonPackage rec { owner = "ludeeus"; repo = pname; rev = version; - sha256 = "sha256-/La54qrejUhyoA1fRPEIItlKojTP5n5YmH+ovL6ASGk="; + sha256 = "sha256-osAJzJr9PtGH8wcHam1BolIBTD8QDBWg3mI/z4JW0JE="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/aws-lambda-builders/default.nix b/pkgs/development/python-modules/aws-lambda-builders/default.nix index 1c750267695fc..f2dd2c4205271 100644 --- a/pkgs/development/python-modules/aws-lambda-builders/default.nix +++ b/pkgs/development/python-modules/aws-lambda-builders/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { pname = "aws-lambda-builders"; - version = "1.17.0"; + version = "1.18.0"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -21,7 +21,7 @@ buildPythonPackage rec { owner = "awslabs"; repo = "aws-lambda-builders"; rev = "refs/tags/v${version}"; - hash = "sha256-EkAtRqUHwmH0LG/bkXBbZ3TMgXDtcqLfUBySPbrgWmc="; + hash = "sha256-yAqGVZnnragi3+jaAGnkYNH/XtpH3bojXHmPCrANgJU="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/bimmer-connected/default.nix b/pkgs/development/python-modules/bimmer-connected/default.nix index 63071d4946248..5f494308ecf9f 100644 --- a/pkgs/development/python-modules/bimmer-connected/default.nix +++ b/pkgs/development/python-modules/bimmer-connected/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { pname = "bimmer-connected"; - version = "0.9.4"; + version = "0.10.0"; format = "setuptools"; disabled = pythonOlder "3.6"; @@ -22,7 +22,7 @@ buildPythonPackage rec { owner = "bimmerconnected"; repo = "bimmer_connected"; rev = "refs/tags/${version}"; - hash = "sha256-+K+RffQzbJiKld0AM41OlK0ma0aopJRaTz+ZcCcYzJk="; + hash = "sha256-R7QmxSUbVsvb+MRTYlihxuM05WLYASRSfUs09fl7l1k="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/blinkpy/default.nix b/pkgs/development/python-modules/blinkpy/default.nix index ae509418b7b1a..c56c377b299be 100644 --- a/pkgs/development/python-modules/blinkpy/default.nix +++ b/pkgs/development/python-modules/blinkpy/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { pname = "blinkpy"; - version = "0.19.0"; + version = "0.19.1"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -19,8 +19,8 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "fronzbot"; repo = "blinkpy"; - rev = "v${version}"; - hash = "sha256-niUGfktP1zVdrRCDy81ou4yAoscnYveHje9423IKcso="; + rev = "refs/tags/v${version}"; + hash = "sha256-29wfdRbJ4U3ou/4jkpWBE2FrUuo09k4hTYLnIP1S3uU="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/casbin/default.nix b/pkgs/development/python-modules/casbin/default.nix index 6350fda9650e0..cc84063060755 100644 --- a/pkgs/development/python-modules/casbin/default.nix +++ b/pkgs/development/python-modules/casbin/default.nix @@ -9,7 +9,7 @@ buildPythonPackage rec { pname = "casbin"; - version = "1.16.6"; + version = "1.16.8"; format = "setuptools"; disabled = pythonOlder "3.6"; @@ -18,7 +18,7 @@ buildPythonPackage rec { owner = pname; repo = "pycasbin"; rev = "refs/tags/v${version}"; - sha256 = "sha256-i7XwB1qV2WQD1dWxi4ncXsAwGUR5tWQhp+Z/jVvv1oo="; + sha256 = "sha256-l98QfrRg7ghZ+jT9J2BNILUcinOKwhpnIMS+W8NQFr4="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/censys/default.nix b/pkgs/development/python-modules/censys/default.nix index 754d7ca0f2aa9..272be648d2cf6 100644 --- a/pkgs/development/python-modules/censys/default.nix +++ b/pkgs/development/python-modules/censys/default.nix @@ -5,8 +5,10 @@ , importlib-metadata , parameterized , poetry-core +, pytest-mock , pytestCheckHook , pythonOlder +, pythonRelaxDepsHook , requests , requests-mock , responses @@ -15,20 +17,21 @@ buildPythonPackage rec { pname = "censys"; - version = "2.1.3"; + version = "2.1.6"; format = "pyproject"; - disabled = pythonOlder "3.6"; + disabled = pythonOlder "3.7"; src = fetchFromGitHub { owner = "censys"; repo = "censys-python"; rev = "v${version}"; - sha256 = "sha256-Zv3ViOrdQby+7UQrHy6174W2qh1vx21R0yOA7ecr0lU="; + hash = "sha256-jCQWjGx35erhkj1gjBjdGytvKNarrTODH6fJpFMQqLE="; }; nativeBuildInputs = [ poetry-core + pythonRelaxDepsHook ]; propagatedBuildInputs = [ @@ -40,16 +43,19 @@ buildPythonPackage rec { checkInputs = [ parameterized + pytest-mock pytestCheckHook requests-mock responses ]; + pythonRelaxDeps = [ + "backoff" + "requests" + "rich" + ]; + postPatch = '' - substituteInPlace pyproject.toml \ - --replace 'backoff = "^1.11.1"' 'backoff = "*"' \ - --replace 'requests = ">=2.26.0"' 'requests = "*"' \ - --replace 'rich = "^10.16.2"' 'rich = "*"' substituteInPlace pytest.ini \ --replace "--cov" "" ''; @@ -60,7 +66,9 @@ buildPythonPackage rec { mkdir -p $HOME ''; - pythonImportsCheck = [ "censys" ]; + pythonImportsCheck = [ + "censys" + ]; meta = with lib; { description = "Python API wrapper for the Censys Search Engine (censys.io)"; diff --git a/pkgs/development/python-modules/channels/default.nix b/pkgs/development/python-modules/channels/default.nix index e50dc051361a9..d027c194675b6 100644 --- a/pkgs/development/python-modules/channels/default.nix +++ b/pkgs/development/python-modules/channels/default.nix @@ -11,13 +11,13 @@ buildPythonPackage rec { pname = "channels"; - version = "3.0.4"; + version = "3.0.5"; src = fetchFromGitHub { owner = "django"; repo = pname; rev = version; - sha256 = "0jdylcb77n04rqyzg9v6qfzaxp1dnvdvnxddwh3x1qazw3csi5y2"; + sha256 = "sha256-bKrPLbD9zG7DwIYBst1cb+zkDsM8B02wh3D80iortpw="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/clickgen/default.nix b/pkgs/development/python-modules/clickgen/default.nix index b74827d1971dd..d0f81a20c6d34 100644 --- a/pkgs/development/python-modules/clickgen/default.nix +++ b/pkgs/development/python-modules/clickgen/default.nix @@ -2,7 +2,6 @@ , stdenv , buildPythonPackage , pythonOlder -, pythonAtLeast , fetchFromGitHub , pillow , libX11 @@ -17,7 +16,7 @@ buildPythonPackage rec { version = "1.2.0"; format = "setuptools"; - disabled = pythonOlder "3.8" || pythonAtLeast "3.10"; + disabled = pythonOlder "3.8"; src = fetchFromGitHub { owner = "ful1e5"; diff --git a/pkgs/development/python-modules/cocotb/0001-Patch-LDCXXSHARED-for-macOS-along-with-LDSHARED.patch b/pkgs/development/python-modules/cocotb/0001-Patch-LDCXXSHARED-for-macOS-along-with-LDSHARED.patch new file mode 100644 index 0000000000000..38ca864add3b3 --- /dev/null +++ b/pkgs/development/python-modules/cocotb/0001-Patch-LDCXXSHARED-for-macOS-along-with-LDSHARED.patch @@ -0,0 +1,26 @@ +From 94c4768cd69b026e498d92133dd6c7d8589cf911 Mon Sep 17 00:00:00 2001 +From: Jiajie Chen <c@jia.je> +Date: Sat, 25 Jun 2022 10:19:44 +0800 +Subject: [PATCH] Patch LDCXXSHARED for macOS along with LDSHARED + +In Nixpkgs, we patched distutils to respect LDCXXSHARED environment, so +the replacement should be taken on LDCXXSHARED as well. +--- + cocotb_build_libs.py | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/cocotb_build_libs.py b/cocotb_build_libs.py +index 66097ec2..d5555b36 100755 +--- a/cocotb_build_libs.py ++++ b/cocotb_build_libs.py +@@ -583,6 +583,7 @@ def get_ext(): + + if sys.platform == "darwin": + cfg_vars["LDSHARED"] = cfg_vars["LDSHARED"].replace("-bundle", "-dynamiclib") ++ cfg_vars["LDCXXSHARED"] = cfg_vars["LDCXXSHARED"].replace("-bundle", "-dynamiclib") + + share_lib_dir = os.path.relpath(os.path.join(cocotb_share_dir, "lib")) + include_dir = os.path.relpath(os.path.join(cocotb_share_dir, "include")) +-- +2.36.1 + diff --git a/pkgs/development/python-modules/cocotb/default.nix b/pkgs/development/python-modules/cocotb/default.nix index d24d3bc798227..83ed76ac86691 100644 --- a/pkgs/development/python-modules/cocotb/default.nix +++ b/pkgs/development/python-modules/cocotb/default.nix @@ -40,8 +40,17 @@ buildPythonPackage rec { # remove circular dependency cocotb-bus from setup.py substituteInPlace setup.py --replace "'cocotb-bus<1.0'" "" + '' + lib.optionalString stdenv.isDarwin '' + # disable lto on darwin + # https://github.com/NixOS/nixpkgs/issues/19098 + substituteInPlace cocotb_build_libs.py --replace "-flto" "" ''; + patches = [ + # Fix "can't link with bundle (MH_BUNDLE) only dylibs (MH_DYLIB) file" error + ./0001-Patch-LDCXXSHARED-for-macOS-along-with-LDSHARED.patch + ]; + checkInputs = [ cocotb-bus pytestCheckHook swig verilog ]; checkPhase = '' @@ -53,6 +62,5 @@ buildPythonPackage rec { homepage = "https://github.com/cocotb/cocotb"; license = licenses.bsd3; maintainers = with maintainers; [ matthuszagh ]; - broken = stdenv.isDarwin; }; } diff --git a/pkgs/development/python-modules/django-debug-toolbar/default.nix b/pkgs/development/python-modules/django-debug-toolbar/default.nix index 871b8bb852e64..b4409dc04d4cb 100644 --- a/pkgs/development/python-modules/django-debug-toolbar/default.nix +++ b/pkgs/development/python-modules/django-debug-toolbar/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { pname = "django-debug-toolbar"; - version = "3.4"; + version = "3.5"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -20,7 +20,7 @@ buildPythonPackage rec { owner = "jazzband"; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-tXQZcQvdGEtcIAtER1s2HSVkGHW0sdrnC+i01+RuSXg="; + hash = "sha256-OZWO3tXZ+p+zKtQHCkj0kGSXpDFHFV+HqSgiJvLmMTg="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/django-oauth-toolkit/default.nix b/pkgs/development/python-modules/django-oauth-toolkit/default.nix index eca67211671c4..65bf5045a0351 100644 --- a/pkgs/development/python-modules/django-oauth-toolkit/default.nix +++ b/pkgs/development/python-modules/django-oauth-toolkit/default.nix @@ -18,14 +18,14 @@ buildPythonPackage rec { pname = "django-oauth-toolkit"; - version = "1.7.0"; + version = "2.1.0"; format = "setuptools"; src = fetchFromGitHub { owner = "jazzband"; repo = pname; - rev = version; - sha256 = "0rp7pjif54yvdxfxn0pnf8ha3fjxspnx1ijyr1f8npwk2x5vnvhb"; + rev = "refs/tags/${version}"; + sha256 = "sha256-c78QYlU/gB4Lt04TlQFjtsS6pyjDm/fURBMa9hXLpLI="; }; postPatch = '' diff --git a/pkgs/development/python-modules/django-prometheus/default.nix b/pkgs/development/python-modules/django-prometheus/default.nix index 733a177d6a5ef..209395ef6430a 100644 --- a/pkgs/development/python-modules/django-prometheus/default.nix +++ b/pkgs/development/python-modules/django-prometheus/default.nix @@ -16,8 +16,8 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "korfuri"; repo = pname; - rev = version; - sha256 = "1y1cmycc545xrys41jk8kia36hwnkwhkw26mlpfdjgb63vq30x1d"; + rev = "v${version}"; + hash = "sha256-NE0zHnGGSrtkBLrSyBcQuyGrSfSQbdpevokg3YZhwDw="; }; patches = [ diff --git a/pkgs/development/python-modules/django-prometheus/drop-untestable-database-backends.patch b/pkgs/development/python-modules/django-prometheus/drop-untestable-database-backends.patch index 1e9e650608498..41f1229c5e59e 100644 --- a/pkgs/development/python-modules/django-prometheus/drop-untestable-database-backends.patch +++ b/pkgs/development/python-modules/django-prometheus/drop-untestable-database-backends.patch @@ -1,5 +1,5 @@ diff --git a/django_prometheus/tests/end2end/testapp/settings.py b/django_prometheus/tests/end2end/testapp/settings.py -index 0630721..bd2190a 100644 +index cdd167f..5c6073b 100644 --- a/django_prometheus/tests/end2end/testapp/settings.py +++ b/django_prometheus/tests/end2end/testapp/settings.py @@ -53,33 +53,6 @@ DATABASES = { @@ -28,9 +28,9 @@ index 0630721..bd2190a 100644 - "mysql": { - "ENGINE": "django_prometheus.db.backends.mysql", - "NAME": "django_prometheus_1", -- "USER": "travis", +- "USER": "root", - "PASSWORD": "", -- "HOST": "localhost", +- "HOST": "127.0.0.1", - "PORT": "3306", - }, # The following databases are used by test_db.py only diff --git a/pkgs/development/python-modules/django-webpack-loader/default.nix b/pkgs/development/python-modules/django-webpack-loader/default.nix index 2656dd593c1c2..ee51b0e7c8ecb 100644 --- a/pkgs/development/python-modules/django-webpack-loader/default.nix +++ b/pkgs/development/python-modules/django-webpack-loader/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "django-webpack-loader"; - version = "1.4.1"; + version = "1.6.0"; src = fetchPypi { inherit pname version; - sha256 = "7e34085b7fc4d352e482ff9cf7d09ae4524e730675e25432ab1d25a2dd94e583"; + sha256 = "sha256-opQY/0FpADW+ENLJSgZV2rCZAJxouJiDmBPWoQmxTXE="; }; # django.core.exceptions.ImproperlyConfigured (path issue with DJANGO_SETTINGS_MODULE?) diff --git a/pkgs/development/python-modules/djangoql/default.nix b/pkgs/development/python-modules/djangoql/default.nix index f0550a296aa9f..0e38c82cab7ef 100644 --- a/pkgs/development/python-modules/djangoql/default.nix +++ b/pkgs/development/python-modules/djangoql/default.nix @@ -23,6 +23,6 @@ buildPythonPackage rec { description = "Advanced search language for Django"; homepage = "https://github.com/ivelum/djangoql"; license = licenses.mit; - maintainers = with maintainers; [ earvstedt ]; + maintainers = with maintainers; [ erikarvstedt ]; }; } diff --git a/pkgs/development/python-modules/dremel3dpy/default.nix b/pkgs/development/python-modules/dremel3dpy/default.nix index 52f0721580281..8d28ac60dccb8 100644 --- a/pkgs/development/python-modules/dremel3dpy/default.nix +++ b/pkgs/development/python-modules/dremel3dpy/default.nix @@ -14,14 +14,14 @@ buildPythonPackage rec { pname = "dremel3dpy"; - version = "1.0.1"; + version = "1.1.1"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-wqfCzS9dhRN/zerrC6g/O8tn0k1IC0wBdZMfWumtBds="; + hash = "sha256-mf0YjK0nnuNnWgP20yqSgwc0SJfbqnvZqW0MKEXFTg8="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/email-validator/default.nix b/pkgs/development/python-modules/email-validator/default.nix index b6112bb87dccd..bdd830810fb38 100644 --- a/pkgs/development/python-modules/email-validator/default.nix +++ b/pkgs/development/python-modules/email-validator/default.nix @@ -44,10 +44,9 @@ buildPythonPackage rec { ]; meta = with lib; { - description = "A robust email syntax and deliverability validation library for Python 2.x/3.x."; + description = "A robust email syntax and deliverability validation library"; homepage = "https://github.com/JoshData/python-email-validator"; license = licenses.cc0; maintainers = with maintainers; [ siddharthist ]; - platforms = platforms.unix; }; } diff --git a/pkgs/development/python-modules/fastapi-mail/default.nix b/pkgs/development/python-modules/fastapi-mail/default.nix index 8b3c6d0ed0566..973c810b63476 100644 --- a/pkgs/development/python-modules/fastapi-mail/default.nix +++ b/pkgs/development/python-modules/fastapi-mail/default.nix @@ -3,7 +3,7 @@ , aiosmtplib , blinker , buildPythonPackage -, email_validator +, email-validator , fakeredis , fastapi , fetchFromGitHub @@ -45,7 +45,7 @@ buildPythonPackage rec { aioredis aiosmtplib blinker - email_validator + email-validator fakeredis fastapi httpx diff --git a/pkgs/development/python-modules/filecheck/default.nix b/pkgs/development/python-modules/filecheck/default.nix new file mode 100644 index 0000000000000..2480c196881af --- /dev/null +++ b/pkgs/development/python-modules/filecheck/default.nix @@ -0,0 +1,29 @@ +{ lib +, buildPythonApplication +, fetchFromGitHub +, poetry +}: + +buildPythonApplication rec { + pname = "filecheck"; + version = "0.0.22"; + format = "pyproject"; + + src = fetchFromGitHub { + owner = "mull-project"; + repo = "FileCheck.py"; + rev = "v${version}"; + sha256 = "sha256-I2SypKkgcVuLyLiwNw5oWDb9qT56TbC6vbui8PEcziI="; + }; + + nativeBuildInputs = [ poetry ]; + + pythonImportsCheck = [ "filecheck" ]; + + meta = with lib; { + homepage = "https://github.com/mull-project/FileCheck.py"; + license = licenses.asl20; + description = "Python port of LLVM's FileCheck, flexible pattern matching file verifier"; + maintainers = with maintainers; [ yorickvp ]; + }; +} diff --git a/pkgs/development/python-modules/filemagic/default.nix b/pkgs/development/python-modules/filemagic/default.nix index ef8f6933e8fed..96ee0a95b283e 100644 --- a/pkgs/development/python-modules/filemagic/default.nix +++ b/pkgs/development/python-modules/filemagic/default.nix @@ -25,6 +25,6 @@ buildPythonPackage { description = "File type identification using libmagic"; homepage = "https://github.com/aliles/filemagic"; license = licenses.asl20; - maintainers = with maintainers; [ earvstedt ]; + maintainers = with maintainers; [ erikarvstedt ]; }; } diff --git a/pkgs/development/python-modules/flask-admin/default.nix b/pkgs/development/python-modules/flask-admin/default.nix index 6a1ea3991cfa3..75573c7a69d64 100644 --- a/pkgs/development/python-modules/flask-admin/default.nix +++ b/pkgs/development/python-modules/flask-admin/default.nix @@ -2,7 +2,7 @@ , arrow , buildPythonPackage , colour -, email_validator +, email-validator , enum34 , fetchPypi , flask @@ -45,7 +45,7 @@ buildPythonPackage rec { checkInputs = [ arrow colour - email_validator + email-validator flask_sqlalchemy flask-babelex flask-mongoengine diff --git a/pkgs/development/python-modules/flask-appbuilder/default.nix b/pkgs/development/python-modules/flask-appbuilder/default.nix index 5276fceb3f51a..9b0e993b1eb34 100644 --- a/pkgs/development/python-modules/flask-appbuilder/default.nix +++ b/pkgs/development/python-modules/flask-appbuilder/default.nix @@ -5,7 +5,7 @@ , apispec , colorama , click -, email_validator +, email-validator , flask , flask-babel , flask_login @@ -56,7 +56,7 @@ buildPythonPackage rec { apispec colorama click - email_validator + email-validator flask flask-babel flask_login diff --git a/pkgs/development/python-modules/flask-mongoengine/default.nix b/pkgs/development/python-modules/flask-mongoengine/default.nix index ee05ff420333b..e411d1f55a78b 100644 --- a/pkgs/development/python-modules/flask-mongoengine/default.nix +++ b/pkgs/development/python-modules/flask-mongoengine/default.nix @@ -8,7 +8,7 @@ , nose , rednose , coverage -, email_validator +, email-validator }: buildPythonPackage rec { @@ -23,7 +23,7 @@ buildPythonPackage rec { }; propagatedBuildInputs = [ - email_validator + email-validator flask flask-wtf mongoengine diff --git a/pkgs/development/python-modules/flask-security-too/default.nix b/pkgs/development/python-modules/flask-security-too/default.nix index ec088d5332c18..e1a598d3a0ba4 100644 --- a/pkgs/development/python-modules/flask-security-too/default.nix +++ b/pkgs/development/python-modules/flask-security-too/default.nix @@ -23,7 +23,7 @@ # propagates , blinker -, email_validator +, email-validator , flask , flask_login , flask_principal @@ -54,7 +54,7 @@ buildPythonPackage rec { propagatedBuildInputs = [ blinker - email_validator + email-validator flask flask_login flask_principal diff --git a/pkgs/development/python-modules/flask-wtf/default.nix b/pkgs/development/python-modules/flask-wtf/default.nix index fcfa4835be7c2..014f250128c32 100644 --- a/pkgs/development/python-modules/flask-wtf/default.nix +++ b/pkgs/development/python-modules/flask-wtf/default.nix @@ -4,7 +4,7 @@ , flask , itsdangerous , wtforms -, email_validator +, email-validator , pytestCheckHook }: @@ -25,7 +25,7 @@ buildPythonPackage rec { ]; passthru.optional-dependencies = { - email = [ email_validator ]; + email = [ email-validator ]; }; checkInputs = [ diff --git a/pkgs/development/python-modules/fuzzywuzzy/default.nix b/pkgs/development/python-modules/fuzzywuzzy/default.nix index 0bcf8efc359e9..9059ba977b7b9 100644 --- a/pkgs/development/python-modules/fuzzywuzzy/default.nix +++ b/pkgs/development/python-modules/fuzzywuzzy/default.nix @@ -16,6 +16,6 @@ buildPythonPackage rec { description = "Fuzzy string matching for Python"; homepage = "https://github.com/seatgeek/fuzzywuzzy"; license = licenses.gpl2; - maintainers = with maintainers; [ earvstedt ]; + maintainers = with maintainers; [ erikarvstedt ]; }; } diff --git a/pkgs/development/python-modules/gdown/default.nix b/pkgs/development/python-modules/gdown/default.nix index 7399d141a5649..3368706c8c12f 100644 --- a/pkgs/development/python-modules/gdown/default.nix +++ b/pkgs/development/python-modules/gdown/default.nix @@ -11,12 +11,12 @@ buildPythonApplication rec { pname = "gdown"; - version = "4.4.0"; + version = "4.5.1"; format = "setuptools"; src = fetchPypi { inherit pname version; - sha256 = "sha256-GPw6TaSiJz3reqKcdIa+TfORnZBBWK1qaj4lyBFUcNc="; + sha256 = "sha256-ghcGEGPYr8qtnY4tVBD7wJicKz8JRqa9m/65RhYWzGo="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/ihatemoney/default.nix b/pkgs/development/python-modules/ihatemoney/default.nix index dafea4e2cb20e..bacaea2f2cb19 100644 --- a/pkgs/development/python-modules/ihatemoney/default.nix +++ b/pkgs/development/python-modules/ihatemoney/default.nix @@ -10,7 +10,7 @@ , cachetools , click , dnspython -, email_validator +, email-validator , flask , flask-babel , flask-cors @@ -60,7 +60,7 @@ buildPythonPackage rec { click debts dnspython - email_validator + email-validator flask flask_mail flask_migrate diff --git a/pkgs/development/python-modules/imap-tools/default.nix b/pkgs/development/python-modules/imap-tools/default.nix index 404731e22a9a5..95f988a34951a 100644 --- a/pkgs/development/python-modules/imap-tools/default.nix +++ b/pkgs/development/python-modules/imap-tools/default.nix @@ -7,7 +7,7 @@ buildPythonPackage rec { pname = "imap-tools"; - version = "0.55.0"; + version = "0.56.0"; disabled = isPy27; @@ -16,8 +16,8 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "ikvk"; repo = "imap_tools"; - rev = "v${version}"; - hash = "sha256-Jtuw0pYkgR1wrqPlEBOpia1rFU/+MLadOFEm2xLIFMw="; + rev = "refs/tags/v${version}"; + hash = "sha256-g1m44hUtD/x7zEe/ELY6zj2hJikSmZB6S8ZHEHPrvz0="; }; checkInputs = [ diff --git a/pkgs/development/python-modules/inotify-simple/default.nix b/pkgs/development/python-modules/inotify-simple/default.nix index fe5f8ae9f11b8..8fdc7c4926c97 100644 --- a/pkgs/development/python-modules/inotify-simple/default.nix +++ b/pkgs/development/python-modules/inotify-simple/default.nix @@ -19,6 +19,6 @@ buildPythonPackage rec { description = "A simple Python wrapper around inotify"; homepage = "https://github.com/chrisjbillington/inotify_simple"; license = licenses.bsd2; - maintainers = with maintainers; [ earvstedt ]; + maintainers = with maintainers; [ erikarvstedt ]; }; } diff --git a/pkgs/development/python-modules/jarowinkler/default.nix b/pkgs/development/python-modules/jarowinkler/default.nix index 3985a22d5bcb6..de20ac26550ef 100644 --- a/pkgs/development/python-modules/jarowinkler/default.nix +++ b/pkgs/development/python-modules/jarowinkler/default.nix @@ -3,32 +3,42 @@ , pythonOlder , fetchFromGitHub , cmake +, ninja , cython , rapidfuzz-capi , scikit-build +, setuptools +, jarowinkler-cpp , hypothesis , pytestCheckHook }: buildPythonPackage rec { pname = "jarowinkler"; - version = "1.0.2"; + version = "1.0.4"; disabled = pythonOlder "3.6"; + format = "pyproject"; + src = fetchFromGitHub { owner = "maxbachmann"; repo = "JaroWinkler"; rev = "v${version}"; - fetchSubmodules = true; - hash = "sha256-zVAcV6xxqyfXRUcyWo9PcOdagcexJc/D5k4g5ag3hbY="; + hash = "sha256-2bhKl7l3ByfrtkXnXifQd/AhWVFGSMzULkzJftd1mVE="; }; nativeBuildInputs = [ cmake cython + ninja rapidfuzz-capi scikit-build + setuptools + ]; + + buildInputs = [ + jarowinkler-cpp ]; dontUseCmakeConfigure = true; @@ -48,6 +58,7 @@ buildPythonPackage rec { meta = with lib; { description = "Library for fast approximate string matching using Jaro and Jaro-Winkler similarity"; homepage = "https://github.com/maxbachmann/JaroWinkler"; + changelog = "https://github.com/maxbachmann/JaroWinkler/blob/${src.rev}/CHANGELOG.md"; license = licenses.mit; maintainers = with maintainers; [ dotlambda ]; }; diff --git a/pkgs/development/python-modules/junos-eznc/default.nix b/pkgs/development/python-modules/junos-eznc/default.nix index d693c73130be8..9830d29789b51 100644 --- a/pkgs/development/python-modules/junos-eznc/default.nix +++ b/pkgs/development/python-modules/junos-eznc/default.nix @@ -77,7 +77,7 @@ buildPythonPackage rec { pythonImportsCheck = [ "jnpr.junos" ]; meta = with lib; { - homepage = "http://www.github.com/Juniper/py-junos-eznc"; + homepage = "https://github.com/Juniper/py-junos-eznc"; description = "Junos 'EZ' automation for non-programmers"; license = licenses.asl20; maintainers = with maintainers; [ xnaveira ]; diff --git a/pkgs/development/python-modules/langdetect/default.nix b/pkgs/development/python-modules/langdetect/default.nix index 2b9f87fdd81a4..4eab3bd06e580 100644 --- a/pkgs/development/python-modules/langdetect/default.nix +++ b/pkgs/development/python-modules/langdetect/default.nix @@ -28,6 +28,6 @@ buildPythonPackage rec { description = "Python port of Google's language-detection library"; homepage = "https://github.com/Mimino666/langdetect"; license = licenses.asl20; - maintainers = with maintainers; [ earvstedt ]; + maintainers = with maintainers; [ erikarvstedt ]; }; } diff --git a/pkgs/development/python-modules/manuel/default.nix b/pkgs/development/python-modules/manuel/default.nix index 27ec85a1f4d12..7bf02f03895b2 100644 --- a/pkgs/development/python-modules/manuel/default.nix +++ b/pkgs/development/python-modules/manuel/default.nix @@ -8,12 +8,12 @@ buildPythonPackage rec { pname = "manuel"; - version = "1.11.2"; + version = "1.12.4"; disabled = isPy27; src = fetchPypi { inherit pname version; - sha256 = "sha256-nJt3WMQ66oa3VlW5InJCzOea96Wf7WwxSbBp9WIfzqc="; + sha256 = "sha256-A5Wq32mR+SSseVz61Z2l3AYYcyqMxYrQ9HSWWrco9/Q="; }; propagatedBuildInputs = [ six ]; diff --git a/pkgs/development/python-modules/miniaudio/default.nix b/pkgs/development/python-modules/miniaudio/default.nix index d40c1df47cd90..328dcd93ad48d 100644 --- a/pkgs/development/python-modules/miniaudio/default.nix +++ b/pkgs/development/python-modules/miniaudio/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { pname = "miniaudio"; - version = "1.50"; + version = "1.51"; disabled = pythonOlder "3.6"; @@ -19,7 +19,7 @@ buildPythonPackage rec { owner = "irmen"; repo = "pyminiaudio"; rev = "refs/tags/v${version}"; - sha256 = "sha256-GqpOuL+q5v9sKCpbNpPH4uC7k2HBs0RkTWaIC5A2eHI="; + sha256 = "sha256-nWx/1+b28/pvyTe8jSAOmw+vfzjuD7FFmVVUzH8DAyw="; }; buildInputs = lib.optionals stdenv.isDarwin [ diff --git a/pkgs/development/python-modules/mitogen/default.nix b/pkgs/development/python-modules/mitogen/default.nix index d99bdec4b0da0..6b6f29e1d5f4d 100644 --- a/pkgs/development/python-modules/mitogen/default.nix +++ b/pkgs/development/python-modules/mitogen/default.nix @@ -6,7 +6,7 @@ buildPythonPackage rec { pname = "mitogen"; - version = "0.3.2"; + version = "0.3.3"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -15,7 +15,7 @@ buildPythonPackage rec { owner = "mitogen-hq"; repo = pname; rev = "v${version}"; - sha256 = "sha256-ACd1z9h9RLu6Kho59L2YkXkLtBEywYbO+drUvoZaVlg="; + sha256 = "sha256-cx0q2Y9A6UzpdD1kuGBtXIs9oBGFpkIyvPfN2hj+A1g="; }; # Tests require network access and Docker support diff --git a/pkgs/development/python-modules/mockito/default.nix b/pkgs/development/python-modules/mockito/default.nix index 1d2509c4a75e5..e9af134ba111e 100644 --- a/pkgs/development/python-modules/mockito/default.nix +++ b/pkgs/development/python-modules/mockito/default.nix @@ -1,12 +1,12 @@ { lib, buildPythonPackage, fetchPypi, isPy3k, funcsigs, pytest, numpy }: buildPythonPackage rec { - version = "1.3.1"; + version = "1.3.3"; pname = "mockito"; src = fetchPypi { inherit pname version; - sha256 = "sha256-o8Hg3UnxWbJITBu/IjsbWRHDiJ5smffKUNHAqG21170="; + sha256 = "sha256-mCRTdihXcyMHNPJkmGWLHcBFrTvhNCH1CMcaXHaVe8E="; }; propagatedBuildInputs = lib.optionals (!isPy3k) [ funcsigs ]; diff --git a/pkgs/development/python-modules/mysqlclient/default.nix b/pkgs/development/python-modules/mysqlclient/default.nix index ad1e321e9f845..c12b16611e924 100644 --- a/pkgs/development/python-modules/mysqlclient/default.nix +++ b/pkgs/development/python-modules/mysqlclient/default.nix @@ -2,7 +2,7 @@ buildPythonPackage rec { pname = "mysqlclient"; - version = "2.1.0"; + version = "2.1.1"; nativeBuildInputs = [ libmysqlclient @@ -17,7 +17,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "973235686f1b720536d417bf0a0d39b4ab3d5086b2b6ad5e6752393428c02b12"; + sha256 = "sha256-godX5Bn7Ed1sXtJXbsksPvqpOg98OeJjWG0e53nD14I="; }; meta = with lib; { diff --git a/pkgs/development/python-modules/napalm/default.nix b/pkgs/development/python-modules/napalm/default.nix index 09d38875db8e8..9625c8b55649f 100644 --- a/pkgs/development/python-modules/napalm/default.nix +++ b/pkgs/development/python-modules/napalm/default.nix @@ -1,7 +1,7 @@ { lib, buildPythonPackage, fetchFromGitHub, fetchpatch, setuptools, cffi , paramiko, requests, future, textfsm, jinja2, netaddr, pyyaml, pyeapi, netmiko , junos-eznc, ciscoconfparse, scp, lxml, ncclient, pytestCheckHook, ddt, mock -, pythonOlder }: +, pythonOlder, invoke }: buildPythonPackage rec { pname = "napalm"; @@ -35,14 +35,13 @@ buildPythonPackage rec { --replace "netmiko>=3.3.0,<4.0.0" "netmiko" ''; - buildInputs = [ setuptools ]; - propagatedBuildInputs = [ cffi paramiko requests future textfsm + invoke jinja2 netaddr pyyaml @@ -51,6 +50,7 @@ buildPythonPackage rec { junos-eznc ciscoconfparse scp + setuptools lxml ncclient ]; @@ -62,6 +62,6 @@ buildPythonPackage rec { "Network Automation and Programmability Abstraction Layer with Multivendor support"; homepage = "https://github.com/napalm-automation/napalm"; license = licenses.asl20; - maintainers = [ maintainers.astro ]; + maintainers = with maintainers; [ ] ++ teams.c3d2.members; }; } diff --git a/pkgs/development/python-modules/nibabel/default.nix b/pkgs/development/python-modules/nibabel/default.nix index dc0a6d12f0c1b..af75649216957 100644 --- a/pkgs/development/python-modules/nibabel/default.nix +++ b/pkgs/development/python-modules/nibabel/default.nix @@ -13,12 +13,12 @@ buildPythonPackage rec { pname = "nibabel"; - version = "3.2.2"; + version = "4.0.1"; disabled = isPy27; src = fetchPypi { inherit pname version; - sha256 = "sha256-sNzBdLMEBc6ej+weqzy7sg9cXkkgl2wIsi4FC3wST5Q="; + sha256 = "sha256-Ih83OjgAWpEcViOWBw1ngu3zTuNsVguWrj/m3Q7VxGI="; }; propagatedBuildInputs = [ numpy scipy h5py packaging pydicom ]; diff --git a/pkgs/development/python-modules/numexpr/default.nix b/pkgs/development/python-modules/numexpr/default.nix index ffc422e9b421d..6c76a8fc88eee 100644 --- a/pkgs/development/python-modules/numexpr/default.nix +++ b/pkgs/development/python-modules/numexpr/default.nix @@ -9,14 +9,14 @@ buildPythonPackage rec { pname = "numexpr"; - version = "2.8.1"; + version = "2.8.3"; format = "setuptools"; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - hash = "sha256-zXeapE3ZhsTvEBY1GSOWArAnvgalJ5RmViB6zx9YETs="; + hash = "sha256-y2R8nZx4Xa4HWb9sh1zeK+xHK1w/emAVc0sWGudm0UE="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/oscpy/default.nix b/pkgs/development/python-modules/oscpy/default.nix new file mode 100644 index 0000000000000..07991a0fac7e9 --- /dev/null +++ b/pkgs/development/python-modules/oscpy/default.nix @@ -0,0 +1,24 @@ +{ lib, buildPythonPackage, fetchFromGitHub, pytestCheckHook }: + +buildPythonPackage rec { + pname = "oscpy"; + version = "0.6.0"; + + src = fetchFromGitHub { + owner = "kivy"; + repo = "oscpy"; + rev = "v${version}"; + hash = "sha256-Luj36JLgU9xbBMydeobyf98U5zs5VwWQOPGV7TPXQwA="; + }; + + checkInputs = [ pytestCheckHook ]; + + pythonImportsCheck = [ "oscpy" ]; + + meta = with lib; { + description = "A modern implementation of OSC for python2/3"; + license = licenses.mit; + homepage = "https://github.com/kivy/oscpy"; + maintainers = [ maintainers.yurkobb ]; + }; +} diff --git a/pkgs/development/python-modules/param/default.nix b/pkgs/development/python-modules/param/default.nix index 701c9db7962a2..dc1e8c9ae5174 100644 --- a/pkgs/development/python-modules/param/default.nix +++ b/pkgs/development/python-modules/param/default.nix @@ -6,13 +6,13 @@ buildPythonPackage rec { pname = "param"; - version = "1.12.1"; + version = "1.12.2"; src = fetchFromGitHub { owner = "holoviz"; repo = pname; - rev = "v${version}"; - sha256 = "sha256-MehTz0qCpWe/11PZ5jmFxHE54TA+QX2KfqvKB8L79V4="; + rev = "refs/tags/v${version}"; + sha256 = "sha256-NrMsIDcpZc/R2j8VuXitbnIlhP3NtLxU/OkygXqYok8="; }; checkInputs = [ diff --git a/pkgs/development/python-modules/pdftotext/default.nix b/pkgs/development/python-modules/pdftotext/default.nix index 4e1ea3622e8ca..efb26fa4955dc 100644 --- a/pkgs/development/python-modules/pdftotext/default.nix +++ b/pkgs/development/python-modules/pdftotext/default.nix @@ -15,6 +15,6 @@ buildPythonPackage rec { description = "Simple PDF text extraction"; homepage = "https://github.com/jalan/pdftotext"; license = licenses.mit; - maintainers = with maintainers; [ earvstedt ]; + maintainers = with maintainers; [ erikarvstedt ]; }; } diff --git a/pkgs/development/python-modules/proto-plus/default.nix b/pkgs/development/python-modules/proto-plus/default.nix index ace9537c1d043..3db023447f610 100644 --- a/pkgs/development/python-modules/proto-plus/default.nix +++ b/pkgs/development/python-modules/proto-plus/default.nix @@ -10,12 +10,12 @@ buildPythonPackage rec { pname = "proto-plus"; - version = "1.20.5"; + version = "1.20.6"; disabled = !isPy3k; src = fetchPypi { inherit pname version; - sha256 = "sha256-gXlOsb4zPGeYYzOUjfcOu4zfU44Dn4z6kv0qnXF21AU="; + sha256 = "sha256-RJtFN+g/R3a9aQUcTXdtuP/j+dBkHx6HsGwRbrlMkOk="; }; propagatedBuildInputs = [ protobuf ]; diff --git a/pkgs/development/python-modules/pubnub/default.nix b/pkgs/development/python-modules/pubnub/default.nix index 0f4cb78e8fefb..88fb56750aaea 100644 --- a/pkgs/development/python-modules/pubnub/default.nix +++ b/pkgs/development/python-modules/pubnub/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { pname = "pubnub"; - version = "6.3.2"; + version = "6.3.3"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -22,7 +22,7 @@ buildPythonPackage rec { owner = pname; repo = "python"; rev = "refs/tags/v${version}"; - hash = "sha256-xSPsBcbttADgaetkTIFSYSoEl3lWfdhechpkzQEmcag="; + hash = "sha256-OVciXd1u112h9tPNW5XpT7aDknpMGEYroe4m7HxBqaw="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/pyTelegramBotAPI/default.nix b/pkgs/development/python-modules/pyTelegramBotAPI/default.nix index 13678edc8656a..0474ed4e67cf0 100644 --- a/pkgs/development/python-modules/pyTelegramBotAPI/default.nix +++ b/pkgs/development/python-modules/pyTelegramBotAPI/default.nix @@ -8,14 +8,14 @@ buildPythonPackage rec { pname = "pyTelegramBotAPI"; - version = "4.5.1"; + version = "4.6.0"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-ClzdkvH1uz1qh/q3prfn8n0eosY3y3mUscbb4EKbmJQ="; + hash = "sha256-sa6kw8hnWGt++qgNVNs7cQ9LJK64CVv871aP8n08pRA="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/pydantic/default.nix b/pkgs/development/python-modules/pydantic/default.nix index a886b5ba78cee..25a5d54d529e0 100644 --- a/pkgs/development/python-modules/pydantic/default.nix +++ b/pkgs/development/python-modules/pydantic/default.nix @@ -2,7 +2,7 @@ , buildPythonPackage , cython , devtools -, email_validator +, email-validator , fetchFromGitHub , pytest-mock , pytestCheckHook @@ -57,7 +57,7 @@ buildPythonPackage rec { propagatedBuildInputs = [ devtools - email_validator + email-validator python-dotenv typing-extensions ]; diff --git a/pkgs/development/python-modules/pygmt/default.nix b/pkgs/development/python-modules/pygmt/default.nix index f7728cfa28db0..127150a1a626d 100644 --- a/pkgs/development/python-modules/pygmt/default.nix +++ b/pkgs/development/python-modules/pygmt/default.nix @@ -17,15 +17,15 @@ buildPythonPackage rec { pname = "pygmt"; - version = "0.6.0"; + version = "0.6.1"; disabled = pythonOlder "3.6"; src = fetchFromGitHub { owner = "GenericMappingTools"; repo = "pygmt"; - rev = "v${version}"; - sha256 = "sha256-QzqQKnANReSHIsDbiKSZ1ZgMgbj3NAfq4bmRQktnRjQ="; + rev = "refs/tags/v${version}"; + sha256 = "sha256-/hZUDvMhF/ojTXBcap5lL6X2bYu+opf+TwYNjANgtiw="; }; postPatch = '' diff --git a/pkgs/development/python-modules/pyrogram/default.nix b/pkgs/development/python-modules/pyrogram/default.nix index 055efe2975569..f17e42b5d46f7 100644 --- a/pkgs/development/python-modules/pyrogram/default.nix +++ b/pkgs/development/python-modules/pyrogram/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { pname = "pyrogram"; - version = "2.0.27"; + version = "2.0.30"; disabled = pythonOlder "3.7"; @@ -20,7 +20,7 @@ buildPythonPackage rec { owner = "pyrogram"; repo = "pyrogram"; rev = "v${version}"; - hash = "sha256-QYNE6VfbhlZpxc3CGitOs0zMwYI6RKQG/GhyWSNoaDI="; + hash = "sha256-EG9LafZHqCC4klYm5gAlShnznGoaDOGsak4cEOh2OA4="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/pyroute2-core/default.nix b/pkgs/development/python-modules/pyroute2-core/default.nix index 085e0059a9d55..76fb240445563 100644 --- a/pkgs/development/python-modules/pyroute2-core/default.nix +++ b/pkgs/development/python-modules/pyroute2-core/default.nix @@ -7,7 +7,7 @@ buildPythonPackage rec { pname = "pyroute2-core"; - version = "0.6.12"; + version = "0.6.13"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -15,7 +15,7 @@ buildPythonPackage rec { src = fetchPypi { pname = "pyroute2.core"; inherit version; - hash = "sha256-uzb8nlAOHNtNq205/sJPoJtvMoo7uCFfrRQas/rv8p8="; + hash = "sha256-In39nxmIjd0TQZZoIv/ViA2548iTdQlkGMZg/00aEdA="; }; # pyroute2 sub-modules have no tests diff --git a/pkgs/development/python-modules/pyroute2-ethtool/default.nix b/pkgs/development/python-modules/pyroute2-ethtool/default.nix index 93699e161b819..f163336028d16 100644 --- a/pkgs/development/python-modules/pyroute2-ethtool/default.nix +++ b/pkgs/development/python-modules/pyroute2-ethtool/default.nix @@ -7,7 +7,7 @@ buildPythonPackage rec { pname = "pyroute2-ethtool"; - version = "0.6.12"; + version = "0.6.13"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -15,7 +15,7 @@ buildPythonPackage rec { src = fetchPypi { pname = "pyroute2.ethtool"; inherit version; - hash = "sha256-MwIRm/DezL7yCN682Yckxd23+iri2V6HCokF4G36apU="; + hash = "sha256-Cmh/6g/Nd9kHTHwYujXZufcOQhfr5opofiAECEc6O9Q="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/pyroute2-ipdb/default.nix b/pkgs/development/python-modules/pyroute2-ipdb/default.nix index 0c11d6f85cedd..a991645d4ce2c 100644 --- a/pkgs/development/python-modules/pyroute2-ipdb/default.nix +++ b/pkgs/development/python-modules/pyroute2-ipdb/default.nix @@ -7,7 +7,7 @@ buildPythonPackage rec { pname = "pyroute2-ipdb"; - version = "0.6.12"; + version = "0.6.13"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -15,7 +15,7 @@ buildPythonPackage rec { src = fetchPypi { pname = "pyroute2.ipdb"; inherit version; - hash = "sha256-hKh5SFFMdhECeMyA3Quzqp7h+iQMMmCYBJEuLEq5dVs="; + hash = "sha256-u7u3XRO+luRUnPcOuU/XCy4XNuowGsa2g/VqoazYTVo="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/pyroute2-ipset/default.nix b/pkgs/development/python-modules/pyroute2-ipset/default.nix index 6b21283aa9078..28c806143808f 100644 --- a/pkgs/development/python-modules/pyroute2-ipset/default.nix +++ b/pkgs/development/python-modules/pyroute2-ipset/default.nix @@ -7,7 +7,7 @@ buildPythonPackage rec { pname = "pyroute2-ipset"; - version = "0.6.12"; + version = "0.6.13"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -15,7 +15,7 @@ buildPythonPackage rec { src = fetchPypi { pname = "pyroute2.ipset"; inherit version; - hash = "sha256-nvj7b6HF/XhzqmFg6aOQKMFDEFwAcyOnoJXi/coNvG4="; + hash = "sha256-KKJU9iKhiXbQaDYD1a79pat8hSj6nja+uFvOUgJveGY="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/pyroute2-ndb/default.nix b/pkgs/development/python-modules/pyroute2-ndb/default.nix index 6965dfaf8a5a4..c43adc07647f0 100644 --- a/pkgs/development/python-modules/pyroute2-ndb/default.nix +++ b/pkgs/development/python-modules/pyroute2-ndb/default.nix @@ -7,7 +7,7 @@ buildPythonPackage rec { pname = "pyroute2-ndb"; - version = "0.6.12"; + version = "0.6.13"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -15,7 +15,7 @@ buildPythonPackage rec { src = fetchPypi { pname = "pyroute2.ndb"; inherit version; - hash = "sha256-Oc+uaqftRH6Dw3Sa2G1rZ3Mx2u81ErKIyz8xhnA1QgI="; + hash = "sha256-CbH1XyYEPOZMkz6CJP0IREpJjzgeXcSDvJ9CjLrwkBo="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/pyroute2-nftables/default.nix b/pkgs/development/python-modules/pyroute2-nftables/default.nix index 19850bb9f2fb2..f6ac1b1f22478 100644 --- a/pkgs/development/python-modules/pyroute2-nftables/default.nix +++ b/pkgs/development/python-modules/pyroute2-nftables/default.nix @@ -6,12 +6,12 @@ buildPythonPackage rec { pname = "pyroute2-nftables"; - version = "0.6.12"; + version = "0.6.13"; src = fetchPypi { pname = "pyroute2.nftables"; inherit version; - sha256 = "sha256-jy04M73r49LxfbHAuDgSaoFWmkc0O/jPJwdDlW8YCSc="; + sha256 = "sha256-yUvXQNULA6Go2WVPdp53r8d6deBfxYh90FUeOXD4ZZI="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/pyroute2-nslink/default.nix b/pkgs/development/python-modules/pyroute2-nslink/default.nix index 7213556ea950d..59eba1b76a1ec 100644 --- a/pkgs/development/python-modules/pyroute2-nslink/default.nix +++ b/pkgs/development/python-modules/pyroute2-nslink/default.nix @@ -7,7 +7,7 @@ buildPythonPackage rec { pname = "pyroute2-nslink"; - version = "0.6.12"; + version = "0.6.13"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -15,7 +15,7 @@ buildPythonPackage rec { src = fetchPypi { pname = "pyroute2.nslink"; inherit version; - hash = "sha256-c66rD7CyHdyYACIiq1Nfu6rmUsIL9YmFp4Z1gxOFik4="; + hash = "sha256-hu1QbK3MsVTNJ667Pb9z67cjw5EQTn8PO8LEo5xiNmw="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/pyroute2-protocols/default.nix b/pkgs/development/python-modules/pyroute2-protocols/default.nix index 700abb2266daa..24758a91ca24c 100644 --- a/pkgs/development/python-modules/pyroute2-protocols/default.nix +++ b/pkgs/development/python-modules/pyroute2-protocols/default.nix @@ -7,7 +7,7 @@ buildPythonPackage rec { pname = "pyroute2-protocols"; - version = "0.6.12"; + version = "0.6.13"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -15,7 +15,7 @@ buildPythonPackage rec { src = fetchPypi { pname = "pyroute2.protocols"; inherit version; - hash = "sha256-j83UNlQVjxIyKhOqDsx6yhvMZEfAh54gRjniacCpSxY="; + hash = "sha256-bb7y0D7If2MAHabua9EzgEL2Ic+9BHVfYaMoxDCwAtY="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/pyroute2/default.nix b/pkgs/development/python-modules/pyroute2/default.nix index 96835a1be1f84..632fadd3c2667 100644 --- a/pkgs/development/python-modules/pyroute2/default.nix +++ b/pkgs/development/python-modules/pyroute2/default.nix @@ -15,14 +15,14 @@ buildPythonPackage rec { pname = "pyroute2"; - version = "0.6.12"; + version = "0.6.13"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-cnUvmx9R+4oUGgf6LpbMlAadVh/EYcNX1ep88gtPTn4="; + hash = "sha256-sD1JpYGUX+wrHsfR1RJcb0C6BO0Rr/yQxMrdwBniV5I="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/pyserial/default.nix b/pkgs/development/python-modules/pyserial/default.nix index 92ef636932fd8..e6b8edb784aae 100644 --- a/pkgs/development/python-modules/pyserial/default.nix +++ b/pkgs/development/python-modules/pyserial/default.nix @@ -4,6 +4,7 @@ , fetchPypi , python , pythonOlder +, isPy3k }: buildPythonPackage rec { @@ -11,7 +12,8 @@ buildPythonPackage rec { version = "3.5"; format = "setuptools"; - disabled = pythonOlder "3.7"; + # Supports Python 2.7 and 3.4+ + disabled = isPy3k && pythonOlder "3.4"; src = fetchPypi { inherit pname version; diff --git a/pkgs/development/python-modules/pysigma-backend-splunk/default.nix b/pkgs/development/python-modules/pysigma-backend-splunk/default.nix index b270fa79c88d2..aa316a2617531 100644 --- a/pkgs/development/python-modules/pysigma-backend-splunk/default.nix +++ b/pkgs/development/python-modules/pysigma-backend-splunk/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { pname = "pysigma-backend-splunk"; - version = "0.3.3"; + version = "0.3.4"; format = "pyproject"; disabled = pythonOlder "3.8"; @@ -19,7 +19,7 @@ buildPythonPackage rec { owner = "SigmaHQ"; repo = "pySigma-backend-splunk"; rev = "v${version}"; - hash = "sha256-VRHrlcty3EpGnQkVJvsNWOJSW6rNE97Lqt36HmMR53A="; + hash = "sha256-zsX2lycqJKRASXio8s3Cvkt1yfnBm5cwQOFAFA891GI="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/pytest-env/default.nix b/pkgs/development/python-modules/pytest-env/default.nix index 3e2fb0a05dc7f..72df18c884750 100644 --- a/pkgs/development/python-modules/pytest-env/default.nix +++ b/pkgs/development/python-modules/pytest-env/default.nix @@ -15,6 +15,6 @@ buildPythonPackage rec { description = "Pytest plugin used to set environment variables"; homepage = "https://github.com/MobileDynasty/pytest-env"; license = licenses.mit; - maintainers = with maintainers; [ earvstedt ]; + maintainers = with maintainers; [ erikarvstedt ]; }; } diff --git a/pkgs/development/python-modules/python-dotenv/default.nix b/pkgs/development/python-modules/python-dotenv/default.nix index d1b5d632b302c..a805c3e6c6236 100644 --- a/pkgs/development/python-modules/python-dotenv/default.nix +++ b/pkgs/development/python-modules/python-dotenv/default.nix @@ -38,6 +38,6 @@ buildPythonPackage rec { description = "Add .env support to your django/flask apps in development and deployments"; homepage = "https://github.com/theskumar/python-dotenv"; license = licenses.bsdOriginal; - maintainers = with maintainers; [ earvstedt ]; + maintainers = with maintainers; [ erikarvstedt ]; }; } diff --git a/pkgs/development/python-modules/python-olm/default.nix b/pkgs/development/python-modules/python-olm/default.nix index d38c33df8c81f..f430517be7590 100644 --- a/pkgs/development/python-modules/python-olm/default.nix +++ b/pkgs/development/python-modules/python-olm/default.nix @@ -5,6 +5,8 @@ buildPythonPackage { pname = "python-olm"; inherit (olm) src version; + disabled = !isPy3k; + sourceRoot = "source/python"; buildInputs = [ olm ]; @@ -15,7 +17,8 @@ buildPythonPackage { propagatedBuildInputs = [ cffi future - ] ++ lib.optionals (!isPy3k) [ typing ]; + typing + ]; propagatedNativeBuildInputs = [ cffi diff --git a/pkgs/development/python-modules/pytibber/default.nix b/pkgs/development/python-modules/pytibber/default.nix index 3b2d924695ace..b00cc63da1fab 100644 --- a/pkgs/development/python-modules/pytibber/default.nix +++ b/pkgs/development/python-modules/pytibber/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { pname = "pytibber"; - version = "0.22.3"; + version = "0.23.0"; format = "setuptools"; disabled = pythonOlder "3.9"; @@ -22,7 +22,7 @@ buildPythonPackage rec { owner = "Danielhiversen"; repo = "pyTibber"; rev = version; - hash = "sha256-tM8Uu/TpP5a7y+ePFko0bMoZJWG2efYA861Ez8dPeFY="; + hash = "sha256-DMYSv66PVBuOHuIio06OLrtGP0q7PeuDGKK+OznaLec="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/railroad-diagrams/default.nix b/pkgs/development/python-modules/railroad-diagrams/default.nix index 57c07e0dc48b1..55b964fb6ad27 100644 --- a/pkgs/development/python-modules/railroad-diagrams/default.nix +++ b/pkgs/development/python-modules/railroad-diagrams/default.nix @@ -1,24 +1,30 @@ { lib , buildPythonPackage , fetchPypi +, pythonOlder }: buildPythonPackage rec { pname = "railroad-diagrams"; - version = "1.1.1"; + version = "2.0.4"; + format = "setuptools"; + + disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - sha256 = "8a1ec227666be2000e76794aa740f77987f1586077aae4d090d2633b3064c976"; + hash = "sha256-dBP/oZRYO9UQ78PkZo9h1aOL7soYa7fDbuptDW8D+0U="; }; - # this is a dependency of pyparsing, which is a dependency of pytest + # This is a dependency of pyparsing, which is a dependency of pytest doCheck = false; - pythonImportsCheck = [ "railroad" ]; + pythonImportsCheck = [ + "railroad" + ]; meta = with lib; { - description = "Generate SVG railroad syntax diagrams, like on JSON.org"; + description = "Module to generate SVG railroad syntax diagrams"; homepage = "https://github.com/tabatkins/railroad-diagrams"; license = licenses.cc0; maintainers = with maintainers; [ jonringer ]; diff --git a/pkgs/development/python-modules/rapidfuzz/default.nix b/pkgs/development/python-modules/rapidfuzz/default.nix index 9012473f06459..f3c4b77a70956 100644 --- a/pkgs/development/python-modules/rapidfuzz/default.nix +++ b/pkgs/development/python-modules/rapidfuzz/default.nix @@ -7,6 +7,7 @@ , ninja , rapidfuzz-capi , scikit-build +, setuptools , jarowinkler , numpy , hypothesis @@ -19,15 +20,17 @@ buildPythonPackage rec { pname = "rapidfuzz"; - version = "2.0.11"; + version = "2.0.15"; disabled = pythonOlder "3.6"; + format = "pyproject"; + src = fetchFromGitHub { owner = "maxbachmann"; repo = "RapidFuzz"; rev = "v${version}"; - hash = "sha256-npmdnUMrmbHgUgqMxKBytgtL1weWw6BjVNmBkYSKNMw="; + hash = "sha256-wn77gA6UCgsdDf3FZgjrA5gSWpWJg3YoUhx88X7aVcM="; }; nativeBuildInputs = [ @@ -36,6 +39,7 @@ buildPythonPackage rec { ninja rapidfuzz-capi scikit-build + setuptools ]; dontUseCmakeConfigure = true; @@ -72,6 +76,7 @@ buildPythonPackage rec { meta = with lib; { description = "Rapid fuzzy string matching"; homepage = "https://github.com/maxbachmann/RapidFuzz"; + changelog = "https://github.com/maxbachmann/RapidFuzz/blob/${src.rev}/CHANGELOG.md"; license = licenses.mit; maintainers = with maintainers; [ dotlambda ]; }; diff --git a/pkgs/development/python-modules/ropgadget/default.nix b/pkgs/development/python-modules/ropgadget/default.nix index 4d0a4aa94f11e..65a80e399d1e3 100644 --- a/pkgs/development/python-modules/ropgadget/default.nix +++ b/pkgs/development/python-modules/ropgadget/default.nix @@ -7,7 +7,7 @@ buildPythonPackage rec { pname = "ropgadget"; - version = "6.7"; + version = "6.8"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -15,8 +15,8 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "JonathanSalwan"; repo = "ROPgadget"; - rev = "v${version}"; - hash = "sha256-zOTbncsOvmLQMZGpcRLviSZP/d1cQTQHXCLUKyEgVBk="; + rev = "refs/tags/v${version}"; + hash = "sha256-hnqjyZC3RJNQf8JdtaQ5L3PU+96p4cxdd+P4YlW9jjI="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/sentry-sdk/default.nix b/pkgs/development/python-modules/sentry-sdk/default.nix index 542178a3cae30..e434310f56f04 100644 --- a/pkgs/development/python-modules/sentry-sdk/default.nix +++ b/pkgs/development/python-modules/sentry-sdk/default.nix @@ -46,7 +46,7 @@ buildPythonPackage rec { pname = "sentry-sdk"; - version = "1.5.12"; + version = "1.6.0"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -55,7 +55,7 @@ buildPythonPackage rec { owner = "getsentry"; repo = "sentry-python"; rev = version; - hash = "sha256-8M0FWfvaGp74Fb+qJlhyiJPUVHN2ZdEleZf27d+bftE="; + hash = "sha256-X831uMlxvcgxQz8xWQZkJOp/fTmF62J95esJY23DZQw="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/snowflake-connector-python/default.nix b/pkgs/development/python-modules/snowflake-connector-python/default.nix index 06474e645e474..304a1c36894f2 100644 --- a/pkgs/development/python-modules/snowflake-connector-python/default.nix +++ b/pkgs/development/python-modules/snowflake-connector-python/default.nix @@ -18,14 +18,14 @@ buildPythonPackage rec { pname = "snowflake-connector-python"; - version = "2.7.8"; + version = "2.7.9"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-nPsHsEi8sf5kbQP3SAzLaod+nEUGcwLpC8/3/XL2vC8="; + hash = "sha256-HQ/d7luqdG1BriuP8QXzZk5JZwwLJH1JQIN3BtEDpM4="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/sunpy/default.nix b/pkgs/development/python-modules/sunpy/default.nix index b9fc0a652439e..beb7c5b73ada2 100644 --- a/pkgs/development/python-modules/sunpy/default.nix +++ b/pkgs/development/python-modules/sunpy/default.nix @@ -31,14 +31,14 @@ buildPythonPackage rec { pname = "sunpy"; - version = "4.0.1"; + version = "4.0.2"; format = "setuptools"; disabled = pythonOlder "3.8"; src = fetchPypi { inherit pname version; - hash = "sha256-TKOJcEg5A3zjuJbH/tugoX7A7vxSwcE20jJ5QuvWTu8="; + hash = "sha256-ZswUFdMRqEiMpTXAuVtEnsHJ4dgwcx2f4k1DwLl8pz8="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/systemd/default.nix b/pkgs/development/python-modules/systemd/default.nix index 86c330bd1d880..b27af96edbd75 100644 --- a/pkgs/development/python-modules/systemd/default.nix +++ b/pkgs/development/python-modules/systemd/default.nix @@ -1,4 +1,10 @@ -{ lib, buildPythonPackage, fetchFromGitHub, systemd, pkg-config }: +{ lib +, buildPythonPackage +, fetchpatch +, fetchFromGitHub +, systemd +, pkg-config +}: buildPythonPackage rec { pname = "systemd"; @@ -11,14 +17,36 @@ buildPythonPackage rec { sha256 = "1fakw7qln44mfd6pj4kqsgyrhkc6cyr653id34kv0rdnb1bvysrz"; }; - buildInputs = [ systemd ]; - nativeBuildInputs = [ pkg-config ]; + patches = [ + # Fix runtime issues on Python 3.10 + # https://github.com/systemd/python-systemd/issues/107 + (fetchpatch { + url = "https://github.com/systemd/python-systemd/commit/c71bbac357f0ac722e1bcb2edfa925b68cca23c9.patch"; + sha256 = "22s72Wa/BCwNNvwbxEUh58jhHlbA00SNwNVchVDovcc="; + }) + ]; + nativeBuildInputs = [ + pkg-config + ]; + + buildInputs = [ + systemd + ]; + + # No module named 'systemd._journal doCheck = false; + pythonImportsCheck = [ + "systemd.journal" + "systemd.id128" + "systemd.daemon" + "systemd.login" + ]; + meta = with lib; { description = "Python module for native access to the systemd facilities"; homepage = "http://www.freedesktop.org/software/systemd/python-systemd/"; - license = licenses.lgpl21; + license = licenses.lgpl21Plus; }; } diff --git a/pkgs/development/python-modules/time-machine/default.nix b/pkgs/development/python-modules/time-machine/default.nix index f840512c7d519..1b680dd6c1b14 100644 --- a/pkgs/development/python-modules/time-machine/default.nix +++ b/pkgs/development/python-modules/time-machine/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { pname = "time-machine"; - version = "2.7.0"; + version = "2.7.1"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -19,7 +19,7 @@ buildPythonPackage rec { owner = "adamchainz"; repo = pname; rev = version; - sha256 = "sha256-d/jUyzqC4weWdY2x6lf85noE/6gNBFhhDfAaYcwB9XQ="; + sha256 = "sha256-bRqljS09IBp/uqbx9hrr1iEwqvAyOWyl4qjKhJqqGzc="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/timetagger/default.nix b/pkgs/development/python-modules/timetagger/default.nix index 6b99e9882c37f..4ef4369669885 100644 --- a/pkgs/development/python-modules/timetagger/default.nix +++ b/pkgs/development/python-modules/timetagger/default.nix @@ -15,13 +15,13 @@ buildPythonPackage rec { pname = "timetagger"; - version = "22.6.2"; + version = "22.6.4"; src = fetchFromGitHub { owner = "almarklein"; repo = pname; rev = "refs/tags/v${version}"; - sha256 = "sha256-8Rl7g0OwjabBI9ekh3+vb+20KsqttvwwzZU0U1ee8dQ="; + sha256 = "sha256-wLbC7NlDNgAyCnGjawfrnRPN/4DOcHVd93pIWrILs68="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/types-requests/default.nix b/pkgs/development/python-modules/types-requests/default.nix index b5b52a730fcdb..b6b6f99f4d80d 100644 --- a/pkgs/development/python-modules/types-requests/default.nix +++ b/pkgs/development/python-modules/types-requests/default.nix @@ -6,12 +6,12 @@ buildPythonPackage rec { pname = "types-requests"; - version = "2.27.31"; + version = "2.28.0"; format = "setuptools"; src = fetchPypi { inherit pname version; - sha256 = "sha256-b6uXuZ/qUrnHtGak3ZPga7MlvH50IEdeh4MQJqjdNcw="; + sha256 = "sha256-mGPRbfuz+lXc2mT6O5ieduiFkDOybB4WI+MEZc/ilNM="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/types-setuptools/default.nix b/pkgs/development/python-modules/types-setuptools/default.nix index 1114b06157a65..28c29d0c5de8a 100644 --- a/pkgs/development/python-modules/types-setuptools/default.nix +++ b/pkgs/development/python-modules/types-setuptools/default.nix @@ -5,12 +5,12 @@ buildPythonPackage rec { pname = "types-setuptools"; - version = "57.4.17"; + version = "57.4.18"; format = "setuptools"; src = fetchPypi { inherit pname version; - sha256 = "sha256-nVVvyvaAihzq1KqkHlwHph8BUqh1gR4SOXOOuk4LexY="; + sha256 = "sha256-juA9gj/n/aC9Nfrq4z01y1wltJcmPmpYs0xM/QX0C88="; }; # Module doesn't have tests diff --git a/pkgs/development/python-modules/types-tabulate/default.nix b/pkgs/development/python-modules/types-tabulate/default.nix index 13f7453a8fcd3..dd3a6b461c780 100644 --- a/pkgs/development/python-modules/types-tabulate/default.nix +++ b/pkgs/development/python-modules/types-tabulate/default.nix @@ -5,11 +5,11 @@ buildPythonPackage rec { pname = "types-tabulate"; - version = "0.8.10"; + version = "0.8.11"; src = fetchPypi { inherit pname version; - hash = "sha256-BmdTn8ZjMKJdqmtOUtSUt4Niip/tVKP/MVB23NFaHs0="; + hash = "sha256-F6X6O1ykU4FXePyYZejs0BGLB7K5+v8+Kwb+RIF03V4="; }; # Module doesn't have tests diff --git a/pkgs/development/python-modules/ultraheat-api/default.nix b/pkgs/development/python-modules/ultraheat-api/default.nix index 1d359d748b34f..9eee34d154313 100644 --- a/pkgs/development/python-modules/ultraheat-api/default.nix +++ b/pkgs/development/python-modules/ultraheat-api/default.nix @@ -7,7 +7,7 @@ buildPythonPackage rec { pname = "ultraheat-api"; - version = "0.4.0"; + version = "0.4.1"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -15,7 +15,7 @@ buildPythonPackage rec { src = fetchPypi { pname = "ultraheat_api"; inherit version; - hash = "sha256-J0mQolWdXatIG/ORTBNyo6HrAfydvYqXK7LxInQWcX0="; + hash = "sha256-6idbapqxPgA6st2ayuEiHc6WDDmsb3AJU1FnJjOukaM="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/vaa/default.nix b/pkgs/development/python-modules/vaa/default.nix index 783cc7bd68117..d43f007c35cda 100644 --- a/pkgs/development/python-modules/vaa/default.nix +++ b/pkgs/development/python-modules/vaa/default.nix @@ -9,7 +9,7 @@ , marshmallow , pyschemes , wtforms -, email_validator +, email-validator }: buildPythonPackage rec { @@ -42,7 +42,7 @@ buildPythonPackage rec { marshmallow pyschemes wtforms - email_validator + email-validator ]; pythonImportsCheck = [ "vaa" ]; diff --git a/pkgs/development/python-modules/vapoursynth/default.nix b/pkgs/development/python-modules/vapoursynth/default.nix new file mode 100644 index 0000000000000..bfd5e1ca8b2bc --- /dev/null +++ b/pkgs/development/python-modules/vapoursynth/default.nix @@ -0,0 +1,22 @@ +{ vapoursynth, cython, buildPythonPackage, python }: + +buildPythonPackage { + pname = "vapoursynth"; + + inherit (vapoursynth) version src; + + nativeBuildInputs = [ + cython + ]; + + buildInputs = [ + vapoursynth + ]; + + checkPhase = '' + ${python.interpreter} -m unittest discover -s $src/test -p "*test.py" + ''; + + inherit (vapoursynth) meta; +} + diff --git a/pkgs/development/python-modules/wtforms/default.nix b/pkgs/development/python-modules/wtforms/default.nix index c6a3ecf2088ad..ef2e06cc3e71f 100644 --- a/pkgs/development/python-modules/wtforms/default.nix +++ b/pkgs/development/python-modules/wtforms/default.nix @@ -4,7 +4,7 @@ , markupsafe , babel , pytestCheckHook -, email_validator +, email-validator }: buildPythonPackage rec { @@ -22,7 +22,7 @@ buildPythonPackage rec { checkInputs = [ pytestCheckHook - email_validator + email-validator ]; pythonImportsCheck = [ "wtforms" ]; diff --git a/pkgs/development/python-modules/xmlschema/default.nix b/pkgs/development/python-modules/xmlschema/default.nix index 07001eb49f8b3..3dcfe8d7d0269 100644 --- a/pkgs/development/python-modules/xmlschema/default.nix +++ b/pkgs/development/python-modules/xmlschema/default.nix @@ -9,7 +9,7 @@ buildPythonPackage rec { pname = "xmlschema"; - version = "1.11.2"; + version = "1.11.3"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -18,7 +18,7 @@ buildPythonPackage rec { owner = "sissaschool"; repo = "xmlschema"; rev = "refs/tags/v${version}"; - hash = "sha256-coQbO5XrFjU9rAN5Vw/BlMHpkQzQy6t0dNfFsMeO2+o="; + hash = "sha256-z6VgLRDp5PHaYstdV30gt6xGVd4uifz4LkYQ2z3ayk4="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/youtube-search-python/default.nix b/pkgs/development/python-modules/youtube-search-python/default.nix index 9383d4cb05988..11da850c992d3 100644 --- a/pkgs/development/python-modules/youtube-search-python/default.nix +++ b/pkgs/development/python-modules/youtube-search-python/default.nix @@ -7,14 +7,14 @@ buildPythonPackage rec { pname = "youtube-search-python"; - version = "1.6.5"; + version = "1.6.6"; format = "setuptools"; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - hash = "sha256-1B7rppa+s/oE8w91Ca7ogjkNHu5pFSnNmDyUopCWEY8="; + hash = "sha256-RWjR12ns1+tLuDZfBO7G42TF9w7sezdl9UPa67E1/PU="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/ruby-modules/bundled-common/gen-bin-stubs.rb b/pkgs/development/ruby-modules/bundled-common/gen-bin-stubs.rb index 3106e9c24ca76..822996b7cbf68 100644 --- a/pkgs/development/ruby-modules/bundled-common/gen-bin-stubs.rb +++ b/pkgs/development/ruby-modules/bundled-common/gen-bin-stubs.rb @@ -41,6 +41,20 @@ Gem.paths = { 'GEM_HOME' => #{bundle_path.dump} } $LOAD_PATH.unshift #{File.join(bundler_path, "/lib").dump} require 'bundler' +# Monkey-patch out the check that Bundler performs to determine +# whether the bundler env is writable. It's not writable, even for +# root! And for this use of Bundler, it shouldn't be necessary since +# we're not trying to perform any package management operations, only +# produce a Gem path. Thus, we replace it with a method that will +# always return false, to squelch a warning from Bundler saying that +# sudo may be required. +module Bundler + class <<self + def requires_sudo? + return false + end + end +end Bundler.setup(#{groups.map(&:dump).join(', ')}) load Gem.bin_path(#{name.dump}, #{exe.dump}) diff --git a/pkgs/development/tools/analysis/actionlint/default.nix b/pkgs/development/tools/analysis/actionlint/default.nix index 9e94fe79d358c..b4d9dd9698df9 100644 --- a/pkgs/development/tools/analysis/actionlint/default.nix +++ b/pkgs/development/tools/analysis/actionlint/default.nix @@ -10,7 +10,7 @@ buildGoModule rec { pname = "actionlint"; - version = "1.6.13"; + version = "1.6.14"; subPackages = [ "cmd/actionlint" ]; @@ -18,10 +18,10 @@ buildGoModule rec { owner = "rhysd"; repo = "actionlint"; rev = "v${version}"; - sha256 = "sha256-EZqWamNfv4+f1Ajm6StEdDLOwwWdJr1mrzd3+ba3YHI="; + sha256 = "sha256-eBIAm+mgjOLePxJ6b9d3cr3k0vqaDqLzorZg/ZplpcM="; }; - vendorSha256 = "sha256-fADaYrGtg4B7XqD2MUMw30xfGT70Hx+iue79AIDsSRc="; + vendorSha256 = "sha256-wKK597mk51jT6s1eKA4AjiCvI4IkZ9WjMXxaY8AWwkU="; nativeBuildInputs = [ makeWrapper ronn installShellFiles ]; diff --git a/pkgs/development/tools/analysis/checkov/default.nix b/pkgs/development/tools/analysis/checkov/default.nix index 06ba4fe762ef4..6cb98bf10d4dc 100644 --- a/pkgs/development/tools/analysis/checkov/default.nix +++ b/pkgs/development/tools/analysis/checkov/default.nix @@ -32,14 +32,14 @@ with py.pkgs; buildPythonApplication rec { pname = "checkov"; - version = "2.1.4"; + version = "2.1.5"; format = "setuptools"; src = fetchFromGitHub { owner = "bridgecrewio"; repo = pname; rev = version; - hash = "sha256-J8CpNeON2qOaU/U7LbIOaQ/DJ/7Q+kLzzw+jD1QLkik="; + hash = "sha256-bH7W+GZ4O32ty5YD4hfKz2R10v7zEJLU1kLzKvdx3E4="; }; nativeBuildInputs = with py.pkgs; [ diff --git a/pkgs/development/tools/analysis/checkstyle/default.nix b/pkgs/development/tools/analysis/checkstyle/default.nix index 31f022263b22f..1f07c8ff030f0 100644 --- a/pkgs/development/tools/analysis/checkstyle/default.nix +++ b/pkgs/development/tools/analysis/checkstyle/default.nix @@ -1,12 +1,12 @@ { lib, stdenv, fetchurl, makeWrapper, jre }: stdenv.mkDerivation rec { - version = "10.2"; + version = "10.3"; pname = "checkstyle"; src = fetchurl { url = "https://github.com/checkstyle/checkstyle/releases/download/checkstyle-${version}/checkstyle-${version}-all.jar"; - sha256 = "sha256-jcu7KMeYbHZW4zswaV/cLkY4CLX9vJIcElXJq06EfRY="; + sha256 = "sha256-3n5gXGHznrLGL9hudk1nZs1GJ5V2qzqVPCtn1fqujB0="; }; nativeBuildInputs = [ makeWrapper ]; diff --git a/pkgs/development/tools/analysis/cvehound/default.nix b/pkgs/development/tools/analysis/cvehound/default.nix index 3fe3c043c238b..12d36dc6089ef 100644 --- a/pkgs/development/tools/analysis/cvehound/default.nix +++ b/pkgs/development/tools/analysis/cvehound/default.nix @@ -7,13 +7,13 @@ python3.pkgs.buildPythonApplication rec { pname = "cvehound"; - version = "1.0.9"; + version = "1.1.0"; src = fetchFromGitHub { owner = "evdenis"; repo = "cvehound"; - rev = version; - hash = "sha256-qwQfpelY1Air3wVQ3RziM/+MNOR3jiKmLpO2w6kXZwM="; + rev = "refs/tags/${version}"; + hash = "sha256-4+0Virpsq4mwOIpostS87VYTX8hsumXEL1w8FiOrNtA="; }; makeWrapperArgs = [ diff --git a/pkgs/development/tools/analysis/tflint/default.nix b/pkgs/development/tools/analysis/tflint/default.nix index 2ed23f43a4710..d37b514138034 100644 --- a/pkgs/development/tools/analysis/tflint/default.nix +++ b/pkgs/development/tools/analysis/tflint/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "tflint"; - version = "0.37.0"; + version = "0.38.1"; src = fetchFromGitHub { owner = "terraform-linters"; repo = pname; rev = "v${version}"; - sha256 = "sha256-2fcrKwbYuCOZE++Sin0zNuGaBQQd0dNs1MRL/doOLOw="; + sha256 = "sha256-sBvfcAOkfZ5V7SrLBWrSQr5zXwqbwOBmYehujk0y6eg="; }; vendorSha256 = "sha256-2v070TwDWkN4HZ/EOu85lotA9qIKLgpwD9TrfH7pGY4="; diff --git a/pkgs/development/tools/apko/default.nix b/pkgs/development/tools/apko/default.nix index 05342e7714e97..ee2d7f24a6b61 100644 --- a/pkgs/development/tools/apko/default.nix +++ b/pkgs/development/tools/apko/default.nix @@ -6,13 +6,13 @@ buildGoModule rec { pname = "apko"; - version = "0.3.3"; + version = "0.4.0"; src = fetchFromGitHub { owner = "chainguard-dev"; repo = pname; rev = "v${version}"; - sha256 = "sha256-j/tfa9O10HSEwzuXE2mjV2TVYuwk9lpA0PgsKDm70uI="; + sha256 = "sha256-gmBcN1lxzkkRpiUUWv87ji/G4Uy3DA8a6+6Qs+p/2mg="; # populate values that require us to use git. By doing this in postFetch we # can delete .git afterwards and maintain better reproducibility of the src. leaveDotGit = true; @@ -24,7 +24,7 @@ buildGoModule rec { find "$out" -name .git -print0 | xargs -0 rm -rf ''; }; - vendorSha256 = "sha256-jsNSYlTXUAUPG7vccjmonZUN1HAmULprCmJ1TYLYP00="; + vendorSha256 = "sha256-3gRECgKvGqkgBzB3SSxm6/LxZG8RxhjoC6Q7DZj/Has="; nativeBuildInputs = [ installShellFiles ]; diff --git a/pkgs/development/tools/bazelisk/default.nix b/pkgs/development/tools/bazelisk/default.nix index 2ba077fa9439c..6eace485507a3 100644 --- a/pkgs/development/tools/bazelisk/default.nix +++ b/pkgs/development/tools/bazelisk/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "bazelisk"; - version = "1.11.0"; + version = "1.12.0"; src = fetchFromGitHub { owner = "bazelbuild"; repo = pname; rev = "v${version}"; - sha256 = "sha256-9J49+1fI3wmHQqYgdoGgaAuVMA9eG7wrFe7dQEectvI="; + sha256 = "sha256-RWVD6tngFE3i8JDB9b0JZz8Bd+u97b4ilmEF0N8Pm4Y="; }; - vendorSha256 = "sha256-+zJEB9FyVvxHdwR/dAn56jrMbgVBhlbziVFe2WCQFfE="; + vendorSha256 = "sha256-6rJa/c5uCnBQh0VVlzefXXPuJNFi+R8X2r+o7GBLIiE="; doCheck = false; diff --git a/pkgs/development/tools/beancount-language-server/default.nix b/pkgs/development/tools/beancount-language-server/default.nix index 1766f22ee1809..b415906eead76 100644 --- a/pkgs/development/tools/beancount-language-server/default.nix +++ b/pkgs/development/tools/beancount-language-server/default.nix @@ -5,16 +5,16 @@ rustPlatform.buildRustPackage rec { pname = "beancount-language-server"; - version = "1.1.1"; + version = "1.2.5"; src = fetchFromGitHub { owner = "polarmutex"; repo = "beancount-language-server"; rev = "v${version}"; - sha256 = "sha256-CkwNxamkErRo3svJNth2F8NSqlJNX+1S/srKu6Z+mX4="; + sha256 = "sha256-AbljduMz4mz5InsHKCq0K6i9F/lBgvdy0+W8aclr0R0="; }; - cargoSha256 = "sha256-NTUs9ADTn+KoE08FikRHrdptZkrUqnjVIlcr8RtDvic="; + cargoSha256 = "sha256-jrxVMGJk4o9aROtFZBc8G/HP5xm9MjVyewww1DzrRdM="; doInstallCheck = true; postInstallCheck = '' diff --git a/pkgs/development/tools/buf/default.nix b/pkgs/development/tools/buf/default.nix index 8fcc8bad2269e..c853e361bae97 100644 --- a/pkgs/development/tools/buf/default.nix +++ b/pkgs/development/tools/buf/default.nix @@ -10,16 +10,16 @@ buildGoModule rec { pname = "buf"; - version = "1.5.0"; + version = "1.6.0"; src = fetchFromGitHub { owner = "bufbuild"; repo = pname; rev = "v${version}"; - sha256 = "sha256-Jcj1tpcG64mSVn444isGsK9AcITh171ibECukv3bXDI="; + sha256 = "sha256-sqByTrhtaytBMD8ULOP+xoacxMD6sw3n2XYVZ1hWIJ4="; }; - vendorSha256 = "sha256-aHGV8UfPn7xsySPXRSzsEpcaz1Ll49Mj1S9izvaIRWY="; + vendorSha256 = "sha256-H000xhqjSFXGW3Saa/ryYdVcDl2ieeSW3dq3DPVX+c0="; patches = [ # Skip a test that requires networking to be available to work. diff --git a/pkgs/development/tools/build-managers/bazel/bazel_4/default.nix b/pkgs/development/tools/build-managers/bazel/bazel_4/default.nix index 56a4d5b3b5a0c..aa9794b5869c0 100644 --- a/pkgs/development/tools/build-managers/bazel/bazel_4/default.nix +++ b/pkgs/development/tools/build-managers/bazel/bazel_4/default.nix @@ -257,7 +257,7 @@ stdenv.mkDerivation rec { runLocal = name: attrs: script: let attrs' = removeAttrs attrs [ "buildInputs" ]; - buildInputs = [ python3 which ] ++ (attrs.buildInputs or []); + buildInputs = attrs.buildInputs or []; in runCommandCC name ({ inherit buildInputs; @@ -323,13 +323,13 @@ stdenv.mkDerivation rec { in (if !stdenv.hostPlatform.isDarwin then { # `extracted` doesn’t work on darwin - shebang = callPackage ../shebang-test.nix { inherit runLocal extracted bazelTest distDir; }; + shebang = callPackage ../shebang-test.nix { inherit runLocal extracted bazelTest distDir; bazel = bazel_self; }; } else {}) // { - bashTools = callPackage ../bash-tools-test.nix { inherit runLocal bazelTest distDir; }; - cpp = callPackage ../cpp-test.nix { inherit runLocal bazelTest bazel-examples distDir; }; - java = callPackage ../java-test.nix { inherit runLocal bazelTest bazel-examples distDir; }; - protobuf = callPackage ../protobuf-test.nix { inherit runLocal bazelTest distDir; }; - pythonBinPath = callPackage ../python-bin-path-test.nix { inherit runLocal bazelTest distDir; }; + bashTools = callPackage ../bash-tools-test.nix { inherit runLocal bazelTest distDir; bazel = bazel_self; }; + cpp = callPackage ../cpp-test.nix { inherit runLocal bazelTest bazel-examples distDir; bazel = bazel_self; }; + java = callPackage ../java-test.nix { inherit runLocal bazelTest bazel-examples distDir; bazel = bazel_self; }; + protobuf = callPackage ../protobuf-test.nix { inherit runLocal bazelTest distDir; bazel = bazel_self; }; + pythonBinPath = callPackage ../python-bin-path-test.nix { inherit runLocal bazelTest distDir; bazel = bazel_self; }; bashToolsWithNixHacks = callPackage ../bash-tools-test.nix { inherit runLocal bazelTest distDir; bazel = bazelWithNixHacks; }; @@ -591,6 +591,7 @@ stdenv.mkDerivation rec { # The binary _must_ exist with this naming if your project contains a .bazelversion # file. cp ./bazel_src/scripts/packages/bazel.sh $out/bin/bazel + wrapProgram $out/bin/bazel $wrapperfile --suffix PATH : ${defaultShellPath} mv ./bazel_src/output/bazel $out/bin/bazel-${version}-${system}-${arch} mkdir $out/share diff --git a/pkgs/development/tools/build-managers/bazel/bazel_5/default.nix b/pkgs/development/tools/build-managers/bazel/bazel_5/default.nix index d0b71f3760c89..c9c435a0b34d7 100644 --- a/pkgs/development/tools/build-managers/bazel/bazel_5/default.nix +++ b/pkgs/development/tools/build-managers/bazel/bazel_5/default.nix @@ -219,7 +219,7 @@ stdenv.mkDerivation rec { runLocal = name: attrs: script: let attrs' = removeAttrs attrs [ "buildInputs" ]; - buildInputs = [ python3 which ] ++ (attrs.buildInputs or []); + buildInputs = attrs.buildInputs or []; in runCommandCC name ({ inherit buildInputs; @@ -285,13 +285,13 @@ stdenv.mkDerivation rec { in (if !stdenv.hostPlatform.isDarwin then { # `extracted` doesn’t work on darwin - shebang = callPackage ../shebang-test.nix { inherit runLocal extracted bazelTest distDir; }; + shebang = callPackage ../shebang-test.nix { inherit runLocal extracted bazelTest distDir; bazel = bazel_self;}; } else {}) // { - bashTools = callPackage ../bash-tools-test.nix { inherit runLocal bazelTest distDir; }; - cpp = callPackage ../cpp-test.nix { inherit runLocal bazelTest bazel-examples distDir; }; - java = callPackage ../java-test.nix { inherit runLocal bazelTest bazel-examples distDir; }; - protobuf = callPackage ../protobuf-test.nix { inherit runLocal bazelTest distDir; }; - pythonBinPath = callPackage ../python-bin-path-test.nix { inherit runLocal bazelTest distDir; }; + bashTools = callPackage ../bash-tools-test.nix { inherit runLocal bazelTest distDir; bazel = bazel_self;}; + cpp = callPackage ../cpp-test.nix { inherit runLocal bazelTest bazel-examples distDir; bazel = bazel_self;}; + java = callPackage ../java-test.nix { inherit runLocal bazelTest bazel-examples distDir; bazel = bazel_self;}; + protobuf = callPackage ../protobuf-test.nix { inherit runLocal bazelTest distDir; bazel = bazel_self; }; + pythonBinPath = callPackage ../python-bin-path-test.nix { inherit runLocal bazelTest distDir; bazel = bazel_self;}; bashToolsWithNixHacks = callPackage ../bash-tools-test.nix { inherit runLocal bazelTest distDir; bazel = bazelWithNixHacks; }; @@ -586,6 +586,7 @@ stdenv.mkDerivation rec { # The binary _must_ exist with this naming if your project contains a .bazelversion # file. cp ./bazel_src/scripts/packages/bazel.sh $out/bin/bazel + wrapProgram $out/bin/bazel $wrapperfile --suffix PATH : ${defaultShellPath} mv ./bazel_src/output/bazel $out/bin/bazel-${version}-${system}-${arch} mkdir $out/share @@ -662,4 +663,3 @@ stdenv.mkDerivation rec { dontStrip = true; dontPatchELF = true; } - diff --git a/pkgs/development/tools/build-managers/scala-cli/sources.json b/pkgs/development/tools/build-managers/scala-cli/sources.json index 5bf6e5f3e2fd5..bd3a4efc57bfd 100644 --- a/pkgs/development/tools/build-managers/scala-cli/sources.json +++ b/pkgs/development/tools/build-managers/scala-cli/sources.json @@ -1,6 +1,10 @@ { "version": "0.1.8", "assets": { + "aarch64-darwin": { + "asset": "scala-cli-x86_64-apple-darwin.gz", + "sha256": "1dxhwhdk7kflzn4ckqxfxkz4v26l39ki6ykpml6k6kvy3nn0wwz3" + }, "x86_64-darwin": { "asset": "scala-cli-x86_64-apple-darwin.gz", "sha256": "1dxhwhdk7kflzn4ckqxfxkz4v26l39ki6ykpml6k6kvy3nn0wwz3" diff --git a/pkgs/development/tools/clj-kondo/default.nix b/pkgs/development/tools/clj-kondo/default.nix index 5ef65dde14d63..3fe90a3004c08 100644 --- a/pkgs/development/tools/clj-kondo/default.nix +++ b/pkgs/development/tools/clj-kondo/default.nix @@ -2,11 +2,11 @@ buildGraalvmNativeImage rec { pname = "clj-kondo"; - version = "2022.04.25"; + version = "2022.06.22"; src = fetchurl { url = "https://github.com/clj-kondo/${pname}/releases/download/v${version}/${pname}-${version}-standalone.jar"; - sha256 = "sha256-BqqeJQ7mBMofX6efJCSUr6qMZXubO9CuDiCNNNKT3DA="; + sha256 = "sha256-g+0BYwk9bws+c7CfLGf88r2nfcDBCdDKyqRS285oIQM="; }; extraNativeImageBuildArgs = [ diff --git a/pkgs/development/tools/cloud-nuke/default.nix b/pkgs/development/tools/cloud-nuke/default.nix index 7f98d9ee3767e..3354b6f693711 100644 --- a/pkgs/development/tools/cloud-nuke/default.nix +++ b/pkgs/development/tools/cloud-nuke/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "cloud-nuke"; - version = "0.11.6"; + version = "0.11.8"; src = fetchFromGitHub { owner = "gruntwork-io"; repo = pname; rev = "v${version}"; - sha256 = "sha256-wsCe32Ui+czM0+qpMxgTahJ7FlcnFMkueEkrcwm1sdE="; + sha256 = "sha256-0GP7T/OspaJVATd0dYNVniDh0XAiL09dopNnOQrLpCs="; }; - vendorSha256 = "sha256-McCbogZvgm9pnVjay9O2CxAh+653JnDMcU4CHD0PTPI="; + vendorSha256 = "sha256-4BUKUDr0bcd4AcMGIDC7HIhDI7pdTu2efkLqRD7Piw0="; ldflags = [ "-s" "-w" "-X main.VERSION=${version}" ]; diff --git a/pkgs/development/tools/continuous-integration/drone/default.nix b/pkgs/development/tools/continuous-integration/drone/default.nix index d043f25f4550c..313099d45e072 100644 --- a/pkgs/development/tools/continuous-integration/drone/default.nix +++ b/pkgs/development/tools/continuous-integration/drone/default.nix @@ -3,9 +3,9 @@ buildGoModule rec { pname = "drone.io${lib.optionalString (!enableUnfree) "-oss"}"; - version = "2.12.0"; + version = "2.12.1"; - vendorSha256 = "sha256-y9knuU/+hkXBLgMmJ5Trp0A3lEiLC1I2Dh85/CFBXow="; + vendorSha256 = "sha256-hKJFYjIJVuGBiSIeTitI7kZdGjSRUTCPMhH72O0wm3I="; doCheck = false; @@ -13,7 +13,7 @@ buildGoModule rec { owner = "harness"; repo = "drone"; rev = "v${version}"; - sha256 = "sha256-Bpv08iD0wRiscwNE8TIBgZMlChQFQEegbjkzDv4mIYU="; + sha256 = "sha256-ZngZzpFjQLkiBDNrmgPXPCfDoeZbX/ynBXkuNrrGz3E="; }; tags = lib.optionals (!enableUnfree) [ "oss" "nolimit" ]; diff --git a/pkgs/development/tools/continuous-integration/jenkins/default.nix b/pkgs/development/tools/continuous-integration/jenkins/default.nix index abf7f840a4541..00395854cfd8d 100644 --- a/pkgs/development/tools/continuous-integration/jenkins/default.nix +++ b/pkgs/development/tools/continuous-integration/jenkins/default.nix @@ -4,11 +4,11 @@ stdenv.mkDerivation rec { pname = "jenkins"; - version = "2.332.3"; + version = "2.346.1"; src = fetchurl { url = "https://get.jenkins.io/war-stable/${version}/jenkins.war"; - sha256 = "sha256-0ZPxearfOnzrYa3rw6tRIYrEp4UriJMv8ztE/XvmAQ8="; + sha256 = "09rvwpywf8wc3605kc0x171kmxfigqg4dq7gkd1hng1xqbjjqvhp"; }; nativeBuildInputs = [ makeWrapper ]; diff --git a/pkgs/development/tools/continuous-integration/woodpecker/agent.nix b/pkgs/development/tools/continuous-integration/woodpecker/agent.nix new file mode 100644 index 0000000000000..2865711d507c3 --- /dev/null +++ b/pkgs/development/tools/continuous-integration/woodpecker/agent.nix @@ -0,0 +1,17 @@ +{ lib, buildGoModule, callPackage, fetchFromGitHub }: +let + common = callPackage ./common.nix { }; +in +buildGoModule { + pname = "woodpecker-agent"; + inherit (common) version src ldflags postBuild; + vendorSha256 = null; + + subPackages = "cmd/agent"; + + CGO_ENABLED = 0; + + meta = common.meta // { + description = "Woodpecker Continuous Integration agent"; + }; +} diff --git a/pkgs/development/tools/continuous-integration/woodpecker/cli.nix b/pkgs/development/tools/continuous-integration/woodpecker/cli.nix new file mode 100644 index 0000000000000..b5eda9efb9173 --- /dev/null +++ b/pkgs/development/tools/continuous-integration/woodpecker/cli.nix @@ -0,0 +1,17 @@ +{ lib, buildGoModule, callPackage, fetchFromGitHub }: +let + common = callPackage ./common.nix { }; +in +buildGoModule { + pname = "woodpecker-cli"; + inherit (common) version src ldflags postBuild; + vendorSha256 = null; + + subPackages = "cmd/cli"; + + CGO_ENABLED = 0; + + meta = common.meta // { + description = "Command line client for the Woodpecker Continuous Integration server"; + }; +} diff --git a/pkgs/development/tools/continuous-integration/woodpecker/common.nix b/pkgs/development/tools/continuous-integration/woodpecker/common.nix new file mode 100644 index 0000000000000..932fa934b1bc7 --- /dev/null +++ b/pkgs/development/tools/continuous-integration/woodpecker/common.nix @@ -0,0 +1,36 @@ +{ lib, fetchFromGitHub }: +let + version = "0.15.3"; + srcSha256 = "sha256-HOOH3H2SXLcT2oW/xL80TO+ZSI+Haulnznpb4hlCQow="; + yarnSha256 = "sha256-x9g0vSoexfknqLejgcNIigmkFnqYsmhcQNTOStcj68o="; +in +{ + inherit version yarnSha256; + + src = fetchFromGitHub { + owner = "woodpecker-ci"; + repo = "woodpecker"; + rev = "v${version}"; + sha256 = srcSha256; + }; + + postBuild = '' + cd $GOPATH/bin + for f in *; do + mv -- "$f" "woodpecker-$f" + done + cd - + ''; + + ldflags = [ + "-s" + "-w" + "-X github.com/woodpecker-ci/woodpecker/version.Version=${version}" + ]; + + meta = with lib; { + homepage = "https://woodpecker-ci.org/"; + license = licenses.asl20; + maintainers = with maintainers; [ ambroisie ]; + }; +} diff --git a/pkgs/development/tools/continuous-integration/woodpecker/frontend.nix b/pkgs/development/tools/continuous-integration/woodpecker/frontend.nix new file mode 100644 index 0000000000000..267fdc13985a9 --- /dev/null +++ b/pkgs/development/tools/continuous-integration/woodpecker/frontend.nix @@ -0,0 +1,40 @@ +{ lib, callPackage, fetchFromGitHub, fetchYarnDeps, mkYarnPackage }: +let + common = callPackage ./common.nix { }; +in +mkYarnPackage { + pname = "woodpecker-frontend"; + inherit (common) version; + + src = "${common.src}/web"; + + packageJSON = ./woodpecker-package.json; + offlineCache = fetchYarnDeps { + yarnLock = "${common.src}/web/yarn.lock"; + sha256 = common.yarnSha256; + }; + + buildPhase = '' + runHook preBuild + + yarn build + + runHook postBuild + ''; + + installPhase = '' + runHook preInstall + + cp -R deps/woodpecker-ci/dist $out + echo "${common.version}" > "$out/version" + + runHook postInstall + ''; + + # Do not attempt generating a tarball for woodpecker-frontend again. + doDist = false; + + meta = common.meta // { + description = "Woodpecker Continuous Integration server frontend"; + }; +} diff --git a/pkgs/development/tools/continuous-integration/woodpecker/server.nix b/pkgs/development/tools/continuous-integration/woodpecker/server.nix new file mode 100644 index 0000000000000..d97412649b5db --- /dev/null +++ b/pkgs/development/tools/continuous-integration/woodpecker/server.nix @@ -0,0 +1,27 @@ +{ lib, buildGoModule, callPackage, fetchFromGitHub, woodpecker-frontend }: +let + common = callPackage ./common.nix { }; +in +buildGoModule { + pname = "woodpecker-server"; + inherit (common) version src ldflags postBuild; + vendorSha256 = null; + + postPatch = '' + cp -r ${woodpecker-frontend} web/dist + ''; + + subPackages = "cmd/server"; + + CGO_ENABLED = 1; + + passthru = { + inherit woodpecker-frontend; + + updateScript = ./update.sh; + }; + + meta = common.meta // { + description = "Woodpecker Continuous Integration server"; + }; +} diff --git a/pkgs/development/tools/continuous-integration/woodpecker/update.sh b/pkgs/development/tools/continuous-integration/woodpecker/update.sh new file mode 100755 index 0000000000000..3530ea6c46c6c --- /dev/null +++ b/pkgs/development/tools/continuous-integration/woodpecker/update.sh @@ -0,0 +1,50 @@ +#!/usr/bin/env nix-shell +#!nix-shell -i bash -p nix wget prefetch-yarn-deps nix-prefetch-github jq + +# shellcheck shell=bash + +if [ -n "$GITHUB_TOKEN" ]; then + TOKEN_ARGS=(--header "Authorization: token $GITHUB_TOKEN") +fi + +if [[ $# -gt 1 || $1 == -* ]]; then + echo "Regenerates packaging data for the woodpecker packages." + echo "Usage: $0 [git release tag]" + exit 1 +fi + +set -x + +cd "$(dirname "$0")" +version="$1" + +set -euo pipefail + +if [ -z "$version" ]; then + version="$(wget -O- "${TOKEN_ARGS[@]}" "https://api.github.com/repos/woodpecker-ci/woodpecker/releases?per_page=1" | jq -r '.[0].tag_name')" +fi + +# strip leading "v" +version="${version#v}" + +# Woodpecker repository +src_hash=$(nix-prefetch-github woodpecker-ci woodpecker --rev "v${version}" | jq -r .sha256) + +# Front-end dependencies +woodpecker_src="https://raw.githubusercontent.com/woodpecker-ci/woodpecker/v$version" +wget "${TOKEN_ARGS[@]}" "$woodpecker_src/web/package.json" -O woodpecker-package.json + +web_tmpdir=$(mktemp -d) +trap 'rm -rf "$web_tmpdir"' EXIT +pushd "$web_tmpdir" +wget "${TOKEN_ARGS[@]}" "$woodpecker_src/web/yarn.lock" +yarn_hash=$(prefetch-yarn-deps yarn.lock) +popd + +# Use friendlier hashes +src_hash=$(nix hash to-sri --type sha256 "$src_hash") +yarn_hash=$(nix hash to-sri --type sha256 "$yarn_hash") + +sed -i -E -e "s#version = \".*\"#version = \"$version\"#" common.nix +sed -i -E -e "s#srcSha256 = \".*\"#srcSha256 = \"$src_hash\"#" common.nix +sed -i -E -e "s#yarnSha256 = \".*\"#yarnSha256 = \"$yarn_hash\"#" common.nix diff --git a/pkgs/development/tools/continuous-integration/woodpecker/woodpecker-package.json b/pkgs/development/tools/continuous-integration/woodpecker/woodpecker-package.json new file mode 100644 index 0000000000000..eb29431a0566c --- /dev/null +++ b/pkgs/development/tools/continuous-integration/woodpecker/woodpecker-package.json @@ -0,0 +1,63 @@ +{ + "name": "woodpecker-ci", + "author": "Woodpecker CI", + "version": "0.0.0", + "license": "Apache-2.0", + "engines": { + "node": ">=14" + }, + "scripts": { + "start": "vite", + "build": "vite build", + "serve": "vite preview", + "lint": "eslint --max-warnings 0 --ext .js,.ts,.vue,.json .", + "formatcheck": "prettier -c .", + "format:fix": "prettier --write .", + "typecheck": "vue-tsc --noEmit", + "test": "echo 'No tests configured' && exit 0" + }, + "dependencies": { + "@kyvg/vue3-notification": "2.3.4", + "@meforma/vue-toaster": "1.2.2", + "ansi-to-html": "0.7.2", + "dayjs": "1.10.7", + "floating-vue": "2.0.0-beta.5", + "fuse.js": "6.4.6", + "humanize-duration": "3.27.0", + "javascript-time-ago": "2.3.10", + "node-emoji": "1.11.0", + "pinia": "2.0.0", + "vue": "v3.2.20", + "vue-router": "4.0.10" + }, + "devDependencies": { + "@iconify/json": "1.1.421", + "@types/humanize-duration": "3.27.0", + "@types/javascript-time-ago": "2.0.3", + "@types/node": "16.11.6", + "@types/node-emoji": "1.8.1", + "@typescript-eslint/eslint-plugin": "5.6.0", + "@typescript-eslint/parser": "5.6.0", + "@vitejs/plugin-vue": "1.9.4", + "@vue/compiler-sfc": "3.2.20", + "eslint": "7.32.0", + "eslint-config-airbnb-base": "15.0.0", + "eslint-config-airbnb-typescript": "16.1.0", + "eslint-config-prettier": "8.3.0", + "eslint-plugin-import": "2.25.3", + "eslint-plugin-prettier": "4.0.0", + "eslint-plugin-promise": "5.1.1", + "eslint-plugin-simple-import-sort": "7.0.0", + "eslint-plugin-vue": "7.18.0", + "eslint-plugin-vue-scoped-css": "1.3.0", + "prettier": "2.4.1", + "typescript": "4.4.4", + "unplugin-icons": "0.12.17", + "unplugin-vue-components": "0.17.0", + "vite": "2.6.13", + "vite-plugin-windicss": "1.4.12", + "vite-svg-loader": "3.0.0", + "vue-tsc": "0.28.10", + "windicss": "3.2.0" + } +} diff --git a/pkgs/development/tools/doctl/default.nix b/pkgs/development/tools/doctl/default.nix index fb602240bb328..926b1c75ee36b 100644 --- a/pkgs/development/tools/doctl/default.nix +++ b/pkgs/development/tools/doctl/default.nix @@ -2,7 +2,7 @@ buildGoModule rec { pname = "doctl"; - version = "1.76.0"; + version = "1.77.0"; vendorSha256 = null; @@ -31,7 +31,7 @@ buildGoModule rec { owner = "digitalocean"; repo = "doctl"; rev = "v${version}"; - sha256 = "sha256-rascG0WXDsmParwzR8QZEayiQEARu8YXfU0JT2yhQrc="; + sha256 = "sha256-i+Z5xFO3e04c/CfOyPAjD1nwPvm5vmYLsvj6OblJuqg="; }; meta = with lib; { diff --git a/pkgs/development/tools/dyff/default.nix b/pkgs/development/tools/dyff/default.nix index 33590f4a4e10f..c2801422c0e0a 100644 --- a/pkgs/development/tools/dyff/default.nix +++ b/pkgs/development/tools/dyff/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "dyff"; - version = "1.5.3"; + version = "1.5.4"; src = fetchFromGitHub { owner = "homeport"; repo = "dyff"; rev = "v${version}"; - sha256 = "sha256-On3n4qJUcGhJfh0B1ESE5zl1fb/RW12eFPxx5sTqfpw="; + sha256 = "sha256-6r7e35hJrrkBaDHMUJGVOP7b0OwekJzedTs/P5E8Ykc="; }; - vendorSha256 = "sha256-eI3E83bYSMfi7fInBsPflE3zUGHF6diSkXDy04+CeqQ="; + vendorSha256 = "sha256-nam/so7ylbGVhEjGKZzeYZyHz90rq5XEZelHkjcIeh8="; subPackages = [ "cmd/dyff" diff --git a/pkgs/development/tools/earthly/default.nix b/pkgs/development/tools/earthly/default.nix index 5838f5e94b433..cca4b15899766 100644 --- a/pkgs/development/tools/earthly/default.nix +++ b/pkgs/development/tools/earthly/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "earthly"; - version = "0.6.14"; + version = "0.6.16"; src = fetchFromGitHub { owner = "earthly"; repo = "earthly"; rev = "v${version}"; - sha256 = "sha256-1zJPtx+W+UuH+upun1o9f3ofieahTsb4bSuznPhIYnw="; + sha256 = "sha256-PKvF5dO7aFF3WOAWOxFTy1PpCr6o9s4QjQkgI7EO6Ss="; }; - vendorSha256 = "sha256-2bOaJdK12qGjjVtoBp3LeSyIiFwm4ZvxNI5yR0HriXI="; + vendorSha256 = "sha256-ESPi6ZjN2GkvzVidmBmuglL4Oh0EjyhGBdvjjiXB38s="; ldflags = [ "-s" "-w" diff --git a/pkgs/development/tools/esbuild/default.nix b/pkgs/development/tools/esbuild/default.nix index ce8ade8d6b3b4..a1989084ad525 100644 --- a/pkgs/development/tools/esbuild/default.nix +++ b/pkgs/development/tools/esbuild/default.nix @@ -2,21 +2,23 @@ buildGoModule rec { pname = "esbuild"; - version = "0.14.39"; + version = "0.14.47"; src = fetchFromGitHub { owner = "evanw"; repo = "esbuild"; rev = "v${version}"; - sha256 = "sha256-li8uVs7SZ3KX0AbzyTDUesiqm8dQecrzyLjYKnQncj8="; + sha256 = "sha256-4T+kH8aDIN18lGkduHUTg+kXjU3JZRvmzXsT2gVNar4="; }; vendorSha256 = "sha256-QPkBR+FscUc3jOvH7olcGUhM6OW4vxawmNJuRQxPuGs="; + ldflags = [ "-s" "-w" ]; + meta = with lib; { description = "An extremely fast JavaScript bundler"; homepage = "https://esbuild.github.io"; license = licenses.mit; - maintainers = with maintainers; [ lucus16 ]; + maintainers = with maintainers; [ lucus16 marsam ]; }; } diff --git a/pkgs/development/tools/flyway/default.nix b/pkgs/development/tools/flyway/default.nix index 02c6c6ae9437f..4cf9efb964abe 100644 --- a/pkgs/development/tools/flyway/default.nix +++ b/pkgs/development/tools/flyway/default.nix @@ -1,10 +1,10 @@ { lib, stdenv, fetchurl, jre_headless, makeWrapper }: stdenv.mkDerivation rec{ pname = "flyway"; - version = "8.5.11"; + version = "8.5.13"; src = fetchurl { url = "mirror://maven/org/flywaydb/flyway-commandline/${version}/flyway-commandline-${version}.tar.gz"; - sha256 = "sha256-qmDvubyWWBRTbspVDSACiklC6a8l5n4y88vz3VZFnV0="; + sha256 = "sha256-9MEsZ5lc9cF7MKD+dYdZGR9cnMHFxELACp4gsC0gzRc="; }; nativeBuildInputs = [ makeWrapper ]; dontBuild = true; diff --git a/pkgs/development/tools/jira-cli-go/default.nix b/pkgs/development/tools/jira-cli-go/default.nix index 75640ddf33f82..641b16ac2e9ff 100644 --- a/pkgs/development/tools/jira-cli-go/default.nix +++ b/pkgs/development/tools/jira-cli-go/default.nix @@ -1,4 +1,4 @@ -{ lib, buildGoModule, fetchFromGitHub, less, more, installShellFiles, testVersion, jira-cli-go }: +{ lib, buildGoModule, fetchFromGitHub, less, more, installShellFiles, testers, jira-cli-go }: buildGoModule rec { pname = "jira-cli-go"; @@ -22,7 +22,7 @@ buildGoModule rec { checkInputs = [ less more ]; # Tests expect a pager in $PATH - passthru.tests.version = testVersion { + passthru.tests.version = testers.testVersion { package = jira-cli-go; command = "jira version"; inherit version; diff --git a/pkgs/development/tools/jless/default.nix b/pkgs/development/tools/jless/default.nix index 558c9e019e192..306a271936bfd 100644 --- a/pkgs/development/tools/jless/default.nix +++ b/pkgs/development/tools/jless/default.nix @@ -23,6 +23,6 @@ rustPlatform.buildRustPackage rec { description = "A command-line pager for JSON data"; homepage = "https://jless.io"; license = licenses.mit; - maintainers = with maintainers; [ jfchevrette zowoq ]; + maintainers = with maintainers; [ jfchevrette ]; }; } diff --git a/pkgs/development/tools/lc3tools/0004-configure-use-cc.patch b/pkgs/development/tools/lc3tools/0004-configure-use-cc.patch new file mode 100644 index 0000000000000..caaec22000083 --- /dev/null +++ b/pkgs/development/tools/lc3tools/0004-configure-use-cc.patch @@ -0,0 +1,22 @@ +diff --git a/configure b/configure +index dfc1b3e..55577af 100755 +--- a/configure ++++ b/configure +@@ -18,7 +18,7 @@ esac + # Some binaries that we'll need, and the places that we might find them. + + IFS=: +-binlist="uname:flex:gcc:wish:rm:cp:mkdir:chmod:sed" ++binlist="uname:flex:cc:wish:rm:cp:mkdir:chmod:sed" + pathlist=$PATH + libpathlist=$LIBS + incpathlist=$INCLUDES +@@ -109,7 +109,7 @@ fi + # Splice it all in to Makefile.def to create the Makefile. + + rm -f Makefile +-sed -e "s __GCC__ $gcc g" -e "s __FLEX__ $flex g" -e "s __EXE__ $EXE g" \ ++sed -e "s __GCC__ $cc g" -e "s __FLEX__ $flex g" -e "s __EXE__ $EXE g" \ + -e "s*__OS_SIM_LIBS__*$OS_SIM_LIBS*g" -e "s __RM__ $rm g" \ + -e "s __CP__ $cp g" -e "s __MKDIR__ $mkdir g" -e "s __CHMOD__ $chmod g" \ + -e "s __USE_READLINE__ $USE_READLINE g" -e "s*__RLLPATH__*$RLLPATH*g" \ diff --git a/pkgs/development/tools/lc3tools/default.nix b/pkgs/development/tools/lc3tools/default.nix index 3e7f81bb4e7bc..c6120a227a993 100644 --- a/pkgs/development/tools/lc3tools/default.nix +++ b/pkgs/development/tools/lc3tools/default.nix @@ -19,6 +19,9 @@ stdenv.mkDerivation { # lc3sim-tk looks for lc3sim in $out/bin instead of $out ./0003-lc3sim-tk-path.patch + + # use `cc` instead of `gcc`; on macOS the latter is not present + ./0004-configure-use-cc.patch ]; nativeBuildInputs = [ unzip ]; @@ -40,8 +43,15 @@ stdenv.mkDerivation { ''; meta = with lib; { + longDescription = '' + The LC-3 tools package contains the lc3as assembler, the lc3sim simulator, + and lc3sim-tk, a Tcl/Tk-based GUI frontend to the simulator. + ''; description = "Toolchain and emulator for the LC-3 architecture"; + homepage = "https://highered.mheducation.com/sites/0072467509/student_view0/lc-3_simulator.html"; license = licenses.gpl2; maintainers = with maintainers; [ anna328p ]; + mainProgram = "lc3sim-tk"; + platforms = with lib.platforms; unix ++ windows; }; } diff --git a/pkgs/development/tools/metal-cli/default.nix b/pkgs/development/tools/metal-cli/default.nix index f2194ecc428d2..a01dc7d9d28e2 100644 --- a/pkgs/development/tools/metal-cli/default.nix +++ b/pkgs/development/tools/metal-cli/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "metal-cli"; - version = "0.7.4"; + version = "0.9.0"; src = fetchFromGitHub { owner = "equinix"; repo = pname; rev = "v${version}"; - sha256 = "sha256-muhHBUb5Ttj4n6fJzIJMqics5rKupeSBZAd4JxZUe64="; + sha256 = "sha256-ivO4YFFDTza20WgTGEaSGUcIEvXVtwKKVGyKWe8d9bA="; }; - vendorSha256 = "sha256-F8d5i9jvjY11Pv6w0ZXI3jr0Wix++B/w9oRTuJGpQfE="; + vendorSha256 = "sha256-rf0EWMVvuoPUMTQKi/FnUbE2ZAs0C7XosHAzCgwB5wg="; ldflags = [ "-s" "-w" diff --git a/pkgs/development/tools/millet/default.nix b/pkgs/development/tools/millet/default.nix new file mode 100644 index 0000000000000..bc5f184ad94b2 --- /dev/null +++ b/pkgs/development/tools/millet/default.nix @@ -0,0 +1,29 @@ +{ lib, rustPlatform, fetchFromGitHub, rustfmt }: + +rustPlatform.buildRustPackage rec { + pname = "millet"; + version = "0.1.12"; + + src = fetchFromGitHub { + owner = "azdavis"; + repo = pname; + rev = "v${version}"; + sha256 = "sha256-dYX7G/oDSjQwW28njat6pdNobnFp5yE7rgUCPqbWLi0="; + }; + + cargoSha256 = "sha256-ve7V2G4rVQJshngxEFZWX8PtRxvZgeHP7XCgW4x1yyo="; + + nativeBuildInputs = [ + # Required for `syntax-gen` crate https://github.com/azdavis/language-util/blob/8ec2dc509c88951102ad3e751820443059a363af/crates/syntax-gen/src/util.rs#L37 + rustfmt + ]; + + cargoBuildFlags = [ "--package" "lang-srv" ]; + + meta = with lib; { + description = "A language server for Standard ML"; + homepage = "https://github.com/azdavis/millet"; + license = licenses.mit; + maintainers = with maintainers; [ marsam ]; + }; +} diff --git a/pkgs/development/tools/misc/checkbashisms/default.nix b/pkgs/development/tools/misc/checkbashisms/default.nix index 6222bb312bb08..b648a082fa3f6 100644 --- a/pkgs/development/tools/misc/checkbashisms/default.nix +++ b/pkgs/development/tools/misc/checkbashisms/default.nix @@ -1,11 +1,11 @@ { lib, stdenv, fetchurl, perl, installShellFiles }: stdenv.mkDerivation rec { - version = "2.21.1"; + version = "2.22.1"; pname = "checkbashisms"; src = fetchurl { url = "mirror://debian/pool/main/d/devscripts/devscripts_${version}.tar.xz"; - hash = "sha256-1ZbIiUrFd38uMVLy7YayLLm5RrmcovsA++JTb8PbTFI="; + hash = "sha256-Nd1eYCnSe+NblujG44uKpvunkaITcdrC3g+M3uX+M9U="; }; nativeBuildInputs = [ installShellFiles ]; diff --git a/pkgs/development/tools/misc/cli11/default.nix b/pkgs/development/tools/misc/cli11/default.nix index dbab7c880efbd..67cdfb2c68ef9 100644 --- a/pkgs/development/tools/misc/cli11/default.nix +++ b/pkgs/development/tools/misc/cli11/default.nix @@ -1,35 +1,30 @@ -{ - lib, stdenv, - fetchFromGitHub, - cmake, - gtest, - python3, - boost +{ lib +, stdenv +, fetchFromGitHub +, boost +, catch2 +, cmake +, gtest +, python3 }: stdenv.mkDerivation rec { pname = "cli11"; - version = "1.9.1"; + version = "2.2.0"; src = fetchFromGitHub { owner = "CLIUtils"; repo = "CLI11"; rev = "v${version}"; - sha256 = "0hbch0vk8irgmiaxnfqlqys65v1770rxxdfn3d23m2vqyjh0j9l6"; + sha256 = "sha256-emTIaoUyTINbAAn9tw1r3zLTQt58N8A1zoP+0y41yKo="; }; nativeBuildInputs = [ cmake ]; - checkInputs = [ boost python3 ]; + checkInputs = [ boost python3 catch2 ]; doCheck = true; - preConfigure = '' - rm -rfv extern/googletest - ln -sfv ${gtest.src} extern/googletest - sed -i '/TrueFalseTest/d' tests/CMakeLists.txt - ''; - meta = with lib; { description = "Command line parser for C++11"; homepage = "https://github.com/CLIUtils/CLI11"; diff --git a/pkgs/development/tools/misc/fswatch/default.nix b/pkgs/development/tools/misc/fswatch/default.nix index 5eb252a9c0e41..bf1784e08a02a 100644 --- a/pkgs/development/tools/misc/fswatch/default.nix +++ b/pkgs/development/tools/misc/fswatch/default.nix @@ -11,13 +11,13 @@ stdenv.mkDerivation rec { pname = "fswatch"; - version = "1.16.0"; + version = "1.17.0"; src = fetchFromGitHub { owner = "emcrisostomo"; repo = "fswatch"; rev = version; - sha256 = "sha256-EKbo5gkrWuijLJgYsNBDtxy0ioXu/yHxnPPeOpk620g="; + sha256 = "sha256-9xCp/SaqdUsVhOYr/QfAN/7RcRxsybCmfiO91vf3j40="; }; nativeBuildInputs = [ autoreconfHook makeWrapper ] ++ lib.optionals stdenv.isDarwin [ CoreServices ]; diff --git a/pkgs/development/tools/misc/grpc-client-cli/default.nix b/pkgs/development/tools/misc/grpc-client-cli/default.nix new file mode 100644 index 0000000000000..59beb7acd8bb4 --- /dev/null +++ b/pkgs/development/tools/misc/grpc-client-cli/default.nix @@ -0,0 +1,22 @@ +{ lib, buildGoModule, fetchFromGitHub }: + +buildGoModule rec { + pname = "grpc-client-cli"; + version = "1.12.0"; + + src = fetchFromGitHub { + owner = "vadimi"; + repo = "grpc-client-cli"; + rev = "v${version}"; + sha256 = "sha256-hsx+nmkYLkSsrUEDAf5556qNLeZ3w5txFBUpDv+b3a4="; + }; + + vendorSha256 = "sha256-1WcnEl3odjxyXfSNyzPU3fa5yrF4MaEgfCAsbr3xedA="; + + meta = with lib; { + description = "generic gRPC command line client"; + maintainers = with maintainers; [ Philipp-M ]; + homepage = "https://github.com/vadimi/grpc-client-cli"; + license = licenses.mit; + }; +} diff --git a/pkgs/development/tools/misc/hound/default.nix b/pkgs/development/tools/misc/hound/default.nix index 4a2b4ac603603..7e46fadf362e0 100644 --- a/pkgs/development/tools/misc/hound/default.nix +++ b/pkgs/development/tools/misc/hound/default.nix @@ -8,13 +8,13 @@ buildGoModule rec { pname = "hound"; - version = "0.5.0"; + version = "0.5.1"; src = fetchFromGitHub { owner = "hound-search"; repo = "hound"; rev = "v${version}"; - sha256 = "sha256-FNK6SgISGqx+O7Vgp+KOqQyPhqzERDjeo6mQIX1SXnA="; + sha256 = "sha256-1URhb+ZrtP5eGS2o7lBxvAxQJR/J6oE+pCbJ7sQb0X4="; }; vendorSha256 = "sha256-ZgF/PB3VTPx367JUkhOkSEK1uvqENNG0xuNXvCGENnQ="; diff --git a/pkgs/development/tools/misc/terraform-ls/default.nix b/pkgs/development/tools/misc/terraform-ls/default.nix index e85e014368afd..3e218523ed34b 100644 --- a/pkgs/development/tools/misc/terraform-ls/default.nix +++ b/pkgs/development/tools/misc/terraform-ls/default.nix @@ -2,15 +2,15 @@ buildGoModule rec { pname = "terraform-ls"; - version = "0.26.0"; + version = "0.28.1"; src = fetchFromGitHub { owner = "hashicorp"; repo = pname; rev = "v${version}"; - sha256 = "sha256-Xq9HojFjUrdThXvQ4M8o4LLmxopVErnN3WGUgI79BCw="; + sha256 = "sha256-6K4aOp5mjX+qhG/OS/Gs1kAOpDGUPdgRNx4zp3i/c2A="; }; - vendorSha256 = "sha256-iSgK+FOD9olVN4bR2jmtWndaRHrh9pfo/42COTiIh9c="; + vendorSha256 = "sha256-YouAdTo7huco35er84MRfI1gmq11VbFwRGSovs1XDYo="; ldflags = [ "-s" "-w" "-X main.version=v${version}" "-X main.prerelease=" ]; diff --git a/pkgs/development/tools/okteto/default.nix b/pkgs/development/tools/okteto/default.nix index 435ccd5a79fd3..ec4974876cb59 100644 --- a/pkgs/development/tools/okteto/default.nix +++ b/pkgs/development/tools/okteto/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "okteto"; - version = "2.3.3"; + version = "2.4.0"; src = fetchFromGitHub { owner = "okteto"; repo = "okteto"; rev = version; - sha256 = "sha256-rKhXzmBV59bj/Dj2ORU1ggOohAs56iB15es924pHXp4="; + sha256 = "sha256-+shhY7/chtq4xPwYSlcVgL/RGMNA0ahTCqT9pVQqpG4="; }; - vendorSha256 = "sha256-XT/ZLydN1oeuRupD3gjvY6+hOB/Lq5CQwhfr9/iT7JI="; + vendorSha256 = "sha256-W1/QBMnMdZWokWSFmHhPqmOu827bpGXS8+GFp5Iu9Ig="; postPatch = '' # Disable some tests that need file system & network access. diff --git a/pkgs/development/tools/pip-audit/default.nix b/pkgs/development/tools/pip-audit/default.nix index 3f3d47cb75d38..09c954b199b64 100644 --- a/pkgs/development/tools/pip-audit/default.nix +++ b/pkgs/development/tools/pip-audit/default.nix @@ -25,14 +25,14 @@ with py.pkgs; buildPythonApplication rec { pname = "pip-audit"; - version = "2.3.3"; + version = "2.3.4"; format = "pyproject"; src = fetchFromGitHub { owner = "trailofbits"; repo = pname; rev = "v${version}"; - hash = "sha256-pzcphJWRM1OTbytZ4jJyPSQ+961gmBTrfYuLrMGkBQk="; + hash = "sha256-11lcF+ITvZmB5UKgGWJdXJE45Kh5rD98UOg9a648dKc="; }; nativeBuildInputs = [ diff --git a/pkgs/development/tools/rust/cargo-bloat/default.nix b/pkgs/development/tools/rust/cargo-bloat/default.nix index 44e06696ae84c..0742b6b904fbc 100644 --- a/pkgs/development/tools/rust/cargo-bloat/default.nix +++ b/pkgs/development/tools/rust/cargo-bloat/default.nix @@ -2,16 +2,16 @@ rustPlatform.buildRustPackage rec { pname = "cargo-bloat"; - version = "0.11.0"; + version = "0.11.1"; src = fetchFromGitHub { owner = "RazrFalcon"; repo = pname; rev = "v${version}"; - sha256 = "sha256-UzMo+IqoP3GpGu7tWlrkEU1YpVLgEL7UwIU1hPmoJNg="; + sha256 = "sha256-lCA7C1G2xu65jn3/wzj6prWSrjQz3EqqJyMlPR/HRFs="; }; - cargoSha256 = "sha256-w3+ypGuVRGwC94zj/OaDUUoUbBnepGHvqulY4IVIsfo="; + cargoSha256 = "sha256-fOenXn5gagFss9DRDXXsGxQlDqVXZ5LZcdM4WsXAyUU="; meta = with lib; { description = "A tool and Cargo subcommand that helps you find out what takes most of the space in your executable"; diff --git a/pkgs/development/tools/rust/cargo-crev/default.nix b/pkgs/development/tools/rust/cargo-crev/default.nix index 90ea165827137..0caa77e2bfd8b 100644 --- a/pkgs/development/tools/rust/cargo-crev/default.nix +++ b/pkgs/development/tools/rust/cargo-crev/default.nix @@ -13,16 +13,16 @@ rustPlatform.buildRustPackage rec { pname = "cargo-crev"; - version = "0.23.1"; + version = "0.23.2"; src = fetchFromGitHub { owner = "crev-dev"; repo = "cargo-crev"; rev = "v${version}"; - sha256 = "sha256-XzjZEVyPVn+7VrjG4QsqVBFmuGC1TWTWLEoqFcwQhaI="; + sha256 = "sha256-q/GbEsGQip7+wXxbVFfm9l3tdCT2o4yhWVTY1qmnEic="; }; - cargoSha256 = "sha256-p87ZnOxaF9ytSUxp0P3QE3K1/jo7hz/N7BH1f2Lc0I0="; + cargoSha256 = "sha256-pqOVKLh+ovUy+rJIz0tjp56qhilZTno4t4dZyCY1r7c="; preCheck = '' export HOME=$(mktemp -d) diff --git a/pkgs/development/tools/rust/cargo-depgraph/default.nix b/pkgs/development/tools/rust/cargo-depgraph/default.nix index 3ec0c110a69d8..5d2d1206007e1 100644 --- a/pkgs/development/tools/rust/cargo-depgraph/default.nix +++ b/pkgs/development/tools/rust/cargo-depgraph/default.nix @@ -2,16 +2,16 @@ rustPlatform.buildRustPackage rec { pname = "cargo-depgraph"; - version = "1.2.4"; + version = "1.2.5"; src = fetchFromSourcehut { owner = "~jplatte"; repo = pname; rev = "v${version}"; - sha256 = "sha256-EbAV2VM73K0KiEKcy9kkK1TQHFQ1jRmKG3Tn9GAsWIk="; + sha256 = "sha256-ewlrxxHnsXBWSMPAlxTfrHj23jMiThkDSJhEsChO/sM="; }; - cargoSha256 = "sha256-AAZlAYhl62c8nFvFtwwGniGbQqXu2vHTO4++O1VJ4LM="; + cargoSha256 = "sha256-Ce13vJ5zE63hHVkg/WFdz3LrASj7Xw6nqOO64uALOeQ="; meta = with lib; { description = "Create dependency graphs for cargo projects using `cargo metadata` and graphviz"; diff --git a/pkgs/development/tools/rust/cargo-expand/default.nix b/pkgs/development/tools/rust/cargo-expand/default.nix index d448b9a88f863..ebca19b3cbb34 100644 --- a/pkgs/development/tools/rust/cargo-expand/default.nix +++ b/pkgs/development/tools/rust/cargo-expand/default.nix @@ -7,16 +7,16 @@ rustPlatform.buildRustPackage rec { pname = "cargo-expand"; - version = "1.0.21"; + version = "1.0.27"; src = fetchFromGitHub { owner = "dtolnay"; repo = pname; rev = version; - sha256 = "sha256-hxG7e5JBDv79eA7IQEdU8kpvE0B69Gqc+aPdCoc6Uf4="; + sha256 = "sha256-lj6B+9AdKhHc71cyzp7TcHmHv3K2ZoXEzMn/d3H0bB4="; }; - cargoSha256 = "sha256-7CMNJb/HGHPP4CIBEYK+2HC/JAce25qGI86NkSvyxos="; + cargoSha256 = "sha256-j14l3E+vyeyEMYN+TEsuxlEdWa2Em0B6Y2LoTot2Np8="; buildInputs = lib.optional stdenv.isDarwin libiconv; diff --git a/pkgs/development/tools/rust/cargo-insta/default.nix b/pkgs/development/tools/rust/cargo-insta/default.nix index aa70a576d37c2..99a19d12405fe 100644 --- a/pkgs/development/tools/rust/cargo-insta/default.nix +++ b/pkgs/development/tools/rust/cargo-insta/default.nix @@ -2,17 +2,17 @@ rustPlatform.buildRustPackage rec { pname = "cargo-insta"; - version = "1.14.0"; + version = "1.15.0"; src = fetchFromGitHub { owner = "mitsuhiko"; repo = "insta"; rev = version; - sha256 = "sha256-kTICdLL3paJIj779w4i7QUzhdynzyjo+YjtBorJsms4="; + sha256 = "sha256-IwtAd8qhG7FgnC7esipwAbSssVKIirB6GCedgNRPabo="; }; sourceRoot = "source/cargo-insta"; - cargoSha256 = "sha256-Hfjz3arOvRbMIvV3o60zjRB2p4JbBUFPj66OpHZdIJg="; + cargoSha256 = "sha256-asWf+wIOpbZx9YOw5c4prg2D6FSRCTcc5FgWY93MNII="; buildInputs = lib.optionals stdenv.isDarwin [ libiconv ]; meta = with lib; { diff --git a/pkgs/development/tools/rust/cargo-llvm-lines/default.nix b/pkgs/development/tools/rust/cargo-llvm-lines/default.nix index e523fb44bb99a..417cdd6761838 100644 --- a/pkgs/development/tools/rust/cargo-llvm-lines/default.nix +++ b/pkgs/development/tools/rust/cargo-llvm-lines/default.nix @@ -2,16 +2,16 @@ rustPlatform.buildRustPackage rec { pname = "cargo-llvm-lines"; - version = "0.4.15"; + version = "0.4.16"; src = fetchFromGitHub { owner = "dtolnay"; repo = pname; rev = version; - sha256 = "sha256-pP1kMwxIrL2ADvj4AkbhqKH5vzGyQnfL7hjg3/QYIY8="; + sha256 = "sha256-MDRVNCfyObEaN0eNnaDBQCYQV2Y1Ck5/8zdpG4eZbaE="; }; - cargoSha256 = "sha256-V9mD9NAG7bB8uB/pjl0XGXmJqOUm4ZrFJV7nv569XOM="; + cargoSha256 = "sha256-oOUidCM3Xex8bqBVJmrigHZHMdjXBNDdKaPiA/+MR7s="; meta = with lib; { description = "Count the number of lines of LLVM IR across all instantiations of a generic function"; diff --git a/pkgs/development/tools/rust/cargo-make/default.nix b/pkgs/development/tools/rust/cargo-make/default.nix index d099bf5f8765b..59ea51406ce0b 100644 --- a/pkgs/development/tools/rust/cargo-make/default.nix +++ b/pkgs/development/tools/rust/cargo-make/default.nix @@ -13,11 +13,11 @@ rustPlatform.buildRustPackage rec { pname = "cargo-make"; - version = "0.35.12"; + version = "0.35.13"; src = fetchCrate { inherit pname version; - sha256 = "sha256-BBSZTbzT+8obY677Yfmf1VTwg0GtvMNY/FTlS6isJTE="; + sha256 = "sha256-rkE/GLFZP1C5C4s6ghbfsJY92Wu3ku27VRorU/ZGelA="; }; nativeBuildInputs = [ pkg-config ]; @@ -25,7 +25,7 @@ rustPlatform.buildRustPackage rec { buildInputs = [ openssl ] ++ lib.optionals stdenv.isDarwin [ Security SystemConfiguration libiconv ]; - cargoSha256 = "sha256-Nsm6KnL72HjqGevXwg2qYagzMG5nEFuH9DblbcUv6Qg="; + cargoSha256 = "sha256-GSHbs8GUHqFrBN1Op6Uh4fPzXEjSkX+a6beBQxS19K8="; # Some tests fail because they need network access. # However, Travis ensures a proper build. diff --git a/pkgs/development/tools/rust/cargo-nextest/default.nix b/pkgs/development/tools/rust/cargo-nextest/default.nix index 25c809079c11b..8220b8a726667 100644 --- a/pkgs/development/tools/rust/cargo-nextest/default.nix +++ b/pkgs/development/tools/rust/cargo-nextest/default.nix @@ -1,17 +1,19 @@ -{ lib, fetchFromGitHub, rustPlatform, stdenv, libiconv }: +{ lib, fetchFromGitHub, rustPlatform, stdenv, Security }: rustPlatform.buildRustPackage rec { pname = "cargo-nextest"; - version = "0.9.20"; + version = "0.9.22"; src = fetchFromGitHub { owner = "nextest-rs"; repo = "nextest"; rev = "cargo-nextest-${version}"; - sha256 = "sha256-dsXjoXoFliaALA/tz8/QqC5FpapE/E9nNMJYgvkI+nw="; + sha256 = "sha256-so9h6bpQzGMVwXI4qGHOJGbX7hnd9tllPGJcRvtIiIU="; }; - cargoSha256 = "sha256-3aooeKfQtElWuGtdh0gYvdm62Cm7IhebsintQgOi1Mo="; + cargoSha256 = "sha256-rbrJPEMOFq37U+0uL5NIqithQAdjO8J6TDwr5vdfT50="; + + buildInputs = lib.optionals stdenv.isDarwin [ Security ]; cargoTestFlags = [ # TODO: investigate some more why these tests fail in nix "--" diff --git a/pkgs/development/tools/yq-go/default.nix b/pkgs/development/tools/yq-go/default.nix index bd0abce2282ff..7725c7d6e8099 100644 --- a/pkgs/development/tools/yq-go/default.nix +++ b/pkgs/development/tools/yq-go/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "yq-go"; - version = "4.25.2"; + version = "4.25.3"; src = fetchFromGitHub { owner = "mikefarah"; repo = "yq"; rev = "v${version}"; - sha256 = "sha256-yvFh1wPOsmQLGTLrMG7dwcEukFpelP183Xa2n2XiHlQ="; + sha256 = "sha256-136qmLHPBWPGiyIckSO9y3zpDxikGVy6w/f4UxWpvrw="; }; - vendorSha256 = "sha256-oUpHK6YKjKWTGL2yC1q2hK/K/gK8I+FwTVshTxHBOKI="; + vendorSha256 = "sha256-pPZ5pR4RHzrb7k8akrBarUv7CHMCw+T4hfFJNGTrn8Y="; nativeBuildInputs = [ installShellFiles ]; diff --git a/pkgs/development/web/deno/default.nix b/pkgs/development/web/deno/default.nix index 3a62b1802b74b..c433e2dfa671a 100644 --- a/pkgs/development/web/deno/default.nix +++ b/pkgs/development/web/deno/default.nix @@ -16,15 +16,15 @@ rustPlatform.buildRustPackage rec { pname = "deno"; - version = "1.23.0"; + version = "1.23.1"; src = fetchFromGitHub { owner = "denoland"; repo = pname; rev = "v${version}"; - sha256 = "sha256-nPVghkLtXhd2/TeBeNDtA1ucgiqzZWmtxXf9bCrFh44="; + sha256 = "sha256-Z9dZrhH+zlYNuhFs+aicuepnUTSOfIHdLaz9sJp0LCA="; }; - cargoSha256 = "sha256-bCk6zgsfyI5Nk0AHPyr29KzgltobxfD6b72N0ZaQyOU="; + cargoSha256 = "sha256-VIpy5vRZinFvFhyyKQwi5ThrBNwqGy1TVg5tAoxxJyQ="; postPatch = '' # upstream uses lld on aarch64-darwin for faster builds diff --git a/pkgs/development/web/deno/librusty_v8.nix b/pkgs/development/web/deno/librusty_v8.nix index 581c2e88d9ca1..793bc9cb19493 100644 --- a/pkgs/development/web/deno/librusty_v8.nix +++ b/pkgs/development/web/deno/librusty_v8.nix @@ -11,11 +11,11 @@ let }; in fetch_librusty_v8 { - version = "0.44.1"; + version = "0.44.2"; shas = { - x86_64-linux = "sha256-8aBjN9ukbH+lr3YPdngXxSjPjutBgWv4hEdhYmcvtO4="; - aarch64-linux = "sha256-h0mxzeA/wB+/zNz0ZKjSBH7lpYrCLRdTgeDGwZypuXE="; - x86_64-darwin = "sha256-4YXYHhYwCBnb1clxW1ziccHMWsUcGz8Rr8/anCvI1lY="; - aarch64-darwin = "sha256-3sBeL+YJB1HaEhM76GfABvN/6iWeST7Z6lVu3X8sRjk="; + x86_64-linux = "sha256-I1ad9a9FtJGGGW7Odc8HfysQyCEAb8xoEYmYti0pEkE="; + aarch64-linux = "sha256-KHjVMI9qiJ6q3D6t6iUKxbp1qthHSSl+2AfvL3Hvk6I="; + x86_64-darwin = "sha256-UO1NRpbCA5MtqeRLTGM3FIWdX/ECDW/JG52U756FIv8="; + aarch64-darwin = "sha256-FqakcG050m52/F6nWlS7VeW0r+77CCIzG1qvBP3Naik="; }; } diff --git a/pkgs/development/web/flyctl/default.nix b/pkgs/development/web/flyctl/default.nix index 4a2ed0a33f4e4..c9d36dd679ade 100644 --- a/pkgs/development/web/flyctl/default.nix +++ b/pkgs/development/web/flyctl/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "flyctl"; - version = "0.0.330"; + version = "0.0.335"; src = fetchFromGitHub { owner = "superfly"; repo = "flyctl"; rev = "v${version}"; - sha256 = "sha256-lgyr2NgurOZPqJv8ZUD8ut7ELxMZqLZ+rXYTjZauv8Y="; + sha256 = "sha256-da7fKtByg3zwtRmsObs5SV6E9bVBe9KyVzn1eE3PcV8="; }; - vendorSha256 = "sha256-T1E2VJiaGKhk/rDVKYEju3AyDPEUMGFNvj/KrMjLKEc="; + vendorSha256 = "sha256-Hn4uB9HYHVS3p9zBpOzOiyTHMmjN8YmVxHZAj1V7y2I="; subPackages = [ "." ]; diff --git a/pkgs/games/ferium/default.nix b/pkgs/games/ferium/default.nix new file mode 100644 index 0000000000000..b542ae3451e74 --- /dev/null +++ b/pkgs/games/ferium/default.nix @@ -0,0 +1,28 @@ +{ lib, stdenv, fetchFromGitHub, rustPlatform, Security }: + +rustPlatform.buildRustPackage rec { + pname = "ferium"; + version = "4.1.1"; + + src = fetchFromGitHub { + owner = "gorilla-devs"; + repo = pname; + rev = "v${version}"; + sha256 = "5DYdeK6JdA7oLBkjP3WkwLwlBitdf4Yt2dNP7P0INN0="; + }; + + buildInputs = lib.optionals stdenv.isDarwin [ Security ]; + + cargoSha256 = "7rpxHfe+pWarPJ72WSXjgr63YctZ5+RrsEgmw7o66VI="; + + buildNoDefaultFeatures = true; # by default pulls in GTK 3 just for its directory picker + + doCheck = false; # requires internet + + meta = with lib; { + description = "A CLI Minecraft mod manager for mods from Modrinth, CurseForge, and Github Releases"; + homepage = "https://github.com/theRookieCoder/ferium"; + license = licenses.mpl20; + maintainers = [ maintainers.leo60228 ]; + }; +} diff --git a/pkgs/games/freeciv/default.nix b/pkgs/games/freeciv/default.nix index b1d215912a0a8..e3057d59cd43a 100644 --- a/pkgs/games/freeciv/default.nix +++ b/pkgs/games/freeciv/default.nix @@ -10,13 +10,13 @@ stdenv.mkDerivation rec { pname = "freeciv"; - version = "3.0.1"; + version = "3.0.2"; src = fetchFromGitHub { owner = "freeciv"; repo = "freeciv"; rev = "R${lib.replaceStrings [ "." ] [ "_" ] version}"; - sha256 = "sha256-Nzc6Tirj6TKLgTYN5XjZZut9HVYLKGOp1GZeaoqEtW8="; + sha256 = "sha256-1QGARXIfb97aLxQ5TZ6Fjznlniznnyuc2ugiW/Drf9g="; }; postPatch = '' diff --git a/pkgs/games/gnonograms/default.nix b/pkgs/games/gnonograms/default.nix index 21f522d3418f9..2446384ff719a 100644 --- a/pkgs/games/gnonograms/default.nix +++ b/pkgs/games/gnonograms/default.nix @@ -1,7 +1,6 @@ { lib , stdenv , fetchFromGitHub -, fetchpatch , vala , meson , ninja @@ -19,24 +18,15 @@ stdenv.mkDerivation rec { pname = "gnonograms"; - version = "2.0.0"; + version = "2.1.2"; src = fetchFromGitHub { owner = "jeremypw"; repo = "gnonograms"; rev = "v${version}"; - sha256 = "sha256-2uXaybpCAm9cr0o7bqfhgD7mMNPwtv1X/PgnFnSDOl0="; + sha256 = "sha256-TkEVjrwlr4Q5FsfcdY+9fxwaMq+DFs0RwGI2E+GT5Mk="; }; - patches = [ - # Fix build with meson 0.61, can be removed on next release - # https://github.com/jeremypw/gnonograms/pull/45 - (fetchpatch { - url = "https://github.com/jeremypw/gnonograms/commit/0e90d8ff42d64a94002ec8500889bc4d7e06c1b6.patch"; - sha256 = "sha256-G/yqsZFmOA69A3E2CROMYAS5vmok/K5l1S/M2m8DMh4="; - }) - ]; - postPatch = '' patchShebangs meson/post_install.py ''; diff --git a/pkgs/games/graphwar/default.nix b/pkgs/games/graphwar/default.nix new file mode 100644 index 0000000000000..3586979292e6c --- /dev/null +++ b/pkgs/games/graphwar/default.nix @@ -0,0 +1,66 @@ +{ lib +, stdenv +, fetchFromGitHub +, copyDesktopItems +, jdk +, makeDesktopItem +, makeWrapper +}: + +stdenv.mkDerivation rec { + pname = "graphwar"; + version = "1.0.0"; + + src = fetchFromGitHub { + owner = "catabriga"; + repo = "graphwar"; + rev = version; + sha256 = "sha256-t3Y576dXWp2Mj6OSQN5cm9FuNBWNqKq6xxkVRbjIBgE="; + }; + + nativeBuildInputs = [ copyDesktopItems makeWrapper ]; + buildInputs = [ jdk ]; + + buildPhase = '' + runHook preBuild + + mkdir -p out/ + javac -d out/ -sourcepath src/ -classpath out/ -encoding utf8 src/**/*.java + + runHook postBuild + ''; + + installPhase = '' + runHook preInstall + + mkdir -p $out/lib/ + mv out $out/lib/graphwar + cp -r rsc $out/lib/graphwar/rsc + + makeWrapper ${jdk}/bin/java $out/bin/graphwar \ + --add-flags "-classpath $out/lib/graphwar Graphwar.Graphwar" + makeWrapper ${jdk}/bin/java $out/bin/graphwar-roomserver \ + --add-flags "-classpath $out/lib/graphwar RoomServer.RoomServer" + makeWrapper ${jdk}/bin/java $out/bin/graphwar-globalserver \ + --add-flags "-classpath $out/lib/graphwar GlobalServer.GlobalServer" + + runHook postInstall + ''; + + desktopItems = [ + (makeDesktopItem { + name = "graphwar"; + exec = "graphwar"; + desktopName = "Graphwar"; + categories = [ "Game" ]; + }) + ]; + + meta = with lib; { + homepage = "http://www.graphwar.com/"; + description = "An artillery game in which you must hit your enemies using mathematical functions"; + license = licenses.gpl3Plus; + platforms = jdk.meta.platforms; + maintainers = with maintainers; [ yrd ]; + }; +} diff --git a/pkgs/games/infra-arcana/default.nix b/pkgs/games/infra-arcana/default.nix new file mode 100644 index 0000000000000..e48c69a2cf333 --- /dev/null +++ b/pkgs/games/infra-arcana/default.nix @@ -0,0 +1,60 @@ +{ lib +, stdenv +, fetchFromGitLab +, cmake +, makeWrapper +, SDL2 +, SDL2_image +, SDL2_mixer +}: + +stdenv.mkDerivation rec { + pname = "infra-arcana"; + version = "21.0.1"; + + src = fetchFromGitLab { + owner = "martin-tornqvist"; + repo = "ia"; + rev = "v${version}"; + sha256 = "sha256-E2ssxdYa27qRk5cCmM7A5VqXGExwXHblR34y+rOUBRI="; + }; + + nativeBuildInputs = [ cmake makeWrapper ]; + buildInputs = [ SDL2 SDL2_image SDL2_mixer ]; + + # Some parts of the game don't compile with glibc 2.34. As soon as + # this is fixed upstream we can switch to the default build flags. + buildFlags = [ "ia" ]; + + installPhase = '' + runHook preInstall + + mkdir -p $out/{opt/ia,bin} + + # Remove build artifacts + rm -rf CMake* cmake* compile_commands.json CTest* Makefile + cp -ra * $out/opt/ia + + # Uses relative paths when looking for assets + wrapProgram $out/opt/ia/ia --run "cd $out/opt/ia" + ln -s $out/opt/ia/ia $out/bin/infra-arcana + + runHook postInstall + ''; + + meta = with lib; { + homepage = "https://sites.google.com/site/infraarcana"; + description = "A Lovecraftian single-player roguelike game"; + longDescription = '' + Infra Arcana is a Roguelike set in the early 20th century. The goal is to + explore the lair of a dreaded cult called The Church of Starry Wisdom. + + Buried deep beneath their hallowed grounds lies an artifact called The + Shining Trapezohedron - a window to all secrets of the universe. Your + ultimate goal is to unearth this artifact. + ''; + platforms = platforms.linux; + maintainers = [ maintainers.kenran ]; + license = licenses.agpl3Plus; + }; +} diff --git a/pkgs/games/itch-setup/default.nix b/pkgs/games/itch-setup/default.nix deleted file mode 100644 index 55d488bcaac06..0000000000000 --- a/pkgs/games/itch-setup/default.nix +++ /dev/null @@ -1,24 +0,0 @@ -{ lib, writeShellScriptBin, steam-run, fetchurl }: -let - - pname = "itch-setup"; - version = "1.26.0"; - - src = fetchurl { - url = "https://broth.itch.ovh/itch-setup/linux-amd64/${version}/unpacked/default"; - hash = "sha256-bcJKqhgZK42Irx12BIvbTDMb/DHEOEXljetlDokF7x8="; - executable = true; - }; - -in -(writeShellScriptBin pname ''exec ${steam-run}/bin/steam-run ${src} "$@"'') // { - - passthru = { inherit pname version src; }; - meta = with lib; { - description = "An installer for the itch.io desktop app"; - homepage = "https://github.com/itchio/itch-setup"; - license = licenses.mit; - platforms = platforms.linux; - maintainers = with maintainers; [ pasqui23 ]; - }; -} diff --git a/pkgs/games/itch/butler.nix b/pkgs/games/itch/butler.nix new file mode 100644 index 0000000000000..68f1bac49e903 --- /dev/null +++ b/pkgs/games/itch/butler.nix @@ -0,0 +1,29 @@ +{ lib +, buildGoModule +, fetchFromGitHub +}: + +buildGoModule rec { + pname = "butler"; + version = "15.21.0"; + + src = fetchFromGitHub { + owner = "itchio"; + repo = pname; + rev = "v${version}"; + sha256 = "sha256-vciSmXR3wI3KcnC+Uz36AgI/WUfztA05MJv1InuOjJM="; + }; + + proxyVendor = true; + + vendorSha256 = "sha256-EIl0ZFDKbZopUR22hp5a2vRUu0O1h1O953NrtoNa2x8="; + + doCheck = false; + + meta = with lib; { + description = "Command-line itch.io helper"; + homepage = "https://github.com/itchio/butler"; + license = licenses.mit; + maintainers = with maintainers; [ martfont ]; + }; +} diff --git a/pkgs/games/itch/default.nix b/pkgs/games/itch/default.nix index 34a2775c3c80c..991623b6c9f7e 100644 --- a/pkgs/games/itch/default.nix +++ b/pkgs/games/itch/default.nix @@ -1,30 +1,56 @@ { lib , stdenvNoCC -, fetchurl -, libnotify -, nss -, gtk3 +, fetchpatch +, fetchzip , fetchFromGitHub +, butler +, electron_11 +, steam-run +, makeWrapper +, copyDesktopItems , makeDesktopItem -, itch-setup -, runtimeShell }: -stdenvNoCC.mkDerivation rec{ +stdenvNoCC.mkDerivation rec { pname = "itch"; version = "25.5.1"; - src = fetchFromGitHub { - owner = "itchio"; - repo = pname; - rev = "v${version}"; - hash = "sha256-Pi3l3uK4kr+N3p7fGQuqckYIzycRqJHDVX00reoSbp4="; + src = fetchzip { + url = "https://broth.itch.ovh/${pname}/linux-amd64/${version}/itch.zip"; + stripRoot = false; + sha256 = "sha256-ejfS+sqhacW2h8u96W4fout3V8xrBs0SrW5w/7X83m4="; }; + patches = [ + # Fixes crash while browsing the store. + (fetchpatch { + name = "itch.patch"; + url = "https://aur.archlinux.org/cgit/aur.git/plain/itch.patch?h=itch-bin&id=0b181454567029141749f870880b10093216e133"; + sha256 = "sha256-gmLL/BMondSflERm0z+DuGDP56JhDXiyxEwLUavTD8Q="; + }) + ]; + + itch-setup = fetchzip { + url = "https://broth.itch.ovh/itch-setup/linux-amd64/1.26.0/itch-setup.zip"; + stripRoot = false; + sha256 = "sha256-5MP6X33Jfu97o5R1n6Og64Bv4ZMxVM0A8lXeQug+bNA="; + }; + + icons = let sparseCheckout = "/release/images/itch-icons"; in + fetchFromGitHub { + owner = "itchio"; + repo = pname; + rev = "v${version}"; + hash = "sha256-1L6STTBHA9xL9IaERaH2OTvurTSng1D+P3KoW0ucEJc="; + inherit sparseCheckout; + } + sparseCheckout; + + nativeBuildInputs = [ copyDesktopItems makeWrapper ]; + desktopItems = [ (makeDesktopItem { name = pname; - exec = pname; - tryExec = "itch %U"; + exec = "itch %U"; + tryExec = pname; icon = pname; desktopName = pname; mimeTypes = [ "x-scheme-handler/itchio" "x-scheme-handler/itch" ]; @@ -33,23 +59,33 @@ stdenvNoCC.mkDerivation rec{ }) ]; - itchBin = '' - #!${runtimeShell} - exec ${itch-setup}/bin/itch-setup --prefer-launch -- "$@" - ''; + # As taken from https://aur.archlinux.org/cgit/aur.git/tree/PKGBUILD?h=itch-bin + installPhase = '' + runHook preInstall - passAsFile = [ "itchBin" ]; + mkdir -p $out/bin $out/share/${pname}/resources/app + cp -r resources/app "$out/share/${pname}/resources/" - # as taken from https://aur.archlinux.org/cgit/aur.git/tree/PKGBUILD?h=itch - installPhase = '' - install -Dm0777 $itchBinPath $out/bin/itch - for icon in release/images/itch-icons/icon*.png + install -Dm644 LICENSE -t "$out/share/licenses/$pkgname/" + install -Dm644 LICENSES.chromium.html -t "$out/share/licenses/$pkgname/" + + for icon in $icons/icon*.png do - iconsize="''${icon#release/images/itch-icons/icon}" + iconsize="''${icon#$icons/icon}" iconsize="''${iconsize%.png}" icondir="$out/share/icons/hicolor/''${iconsize}x''${iconsize}/apps/" install -Dm644 "$icon" "$icondir/itch.png" done + + runHook postInstall + ''; + + postFixup = '' + makeWrapper ${steam-run}/bin/steam-run $out/bin/${pname} \ + --add-flags ${electron_11}/bin/electron \ + --add-flags $out/share/${pname}/resources/app \ + --set BROTH_USE_LOCAL butler,itch-setup \ + --prefix PATH : ${butler}/bin/:${itch-setup} ''; meta = with lib; { @@ -57,6 +93,7 @@ stdenvNoCC.mkDerivation rec{ homepage = "https://github.com/itchio/itch"; license = licenses.mit; platforms = platforms.linux; + sourceProvenance = lib.sourceTypes.binaryBytecode; maintainers = with maintainers; [ pasqui23 ]; }; } diff --git a/pkgs/games/legendary-gl/default.nix b/pkgs/games/legendary-gl/default.nix index 7025a9cb66eb3..6b81593c8af14 100644 --- a/pkgs/games/legendary-gl/default.nix +++ b/pkgs/games/legendary-gl/default.nix @@ -7,13 +7,13 @@ buildPythonApplication rec { pname = "legendary-gl"; # Name in pypi - version = "0.20.26"; + version = "0.20.27"; src = fetchFromGitHub { owner = "derrod"; repo = "legendary"; rev = "refs/tags/${version}"; - sha256 = "sha256-NqAdS5PN7Qj/HdZ2quemb0xJQsD3Ox1a/TVXj3QMq9c="; + sha256 = "sha256-h9WmeVONX19/pUBfE1T/OSMI/HkTKJiTfyyEJV/noB8="; }; propagatedBuildInputs = [ requests ]; diff --git a/pkgs/games/sil-q/default.nix b/pkgs/games/sil-q/default.nix index 1676f8da55a90..e4299bd8aca73 100644 --- a/pkgs/games/sil-q/default.nix +++ b/pkgs/games/sil-q/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, writeScript, makeWrapper, ncurses, libX11 }: +{ pkgs, lib, stdenv, fetchFromGitHub, writeScript, makeWrapper, ncurses, libX11 }: let setup = writeScript "setup" '' @@ -47,6 +47,13 @@ in stdenv.mkDerivation rec { runHook postInstall ''; + passthru.tests = { + saveDirCreation = pkgs.runCommand "save-dir-creation" {} '' + HOME=$(pwd) ${lib.getExe pkgs.sil-q} --help + test -d .sil && touch $out + ''; + }; + meta = { description = "A roguelike game set in the First Age of Middle-earth"; longDescription = '' diff --git a/pkgs/games/sil/default.nix b/pkgs/games/sil/default.nix index 2e6c50daa8236..7d446a684aae0 100644 --- a/pkgs/games/sil/default.nix +++ b/pkgs/games/sil/default.nix @@ -1,4 +1,6 @@ -{ lib, stdenv, fetchzip, ncurses, libX11, libXaw, libXt, libXext, libXmu, makeWrapper, writeScript, ... }: +{ pkgs, lib, stdenv, fetchzip, ncurses, libX11, libXaw, libXt, libXext, libXmu +, makeWrapper, writeScript }: + let setup = writeScript "setup" '' mkdir -p "$ANGBAND_PATH" @@ -15,7 +17,7 @@ stdenv.mkDerivation rec { src = fetchzip { url = "http://www.amirrorclear.net/flowers/game/sil/Sil-130-src.zip"; sha256 = "1amp2mr3fxascra0k76sdsvikjh8g76nqh46kka9379zd35lfq8w"; - stripRoot=false; + stripRoot = false; }; nativeBuildInputs = [ makeWrapper ]; @@ -25,7 +27,7 @@ stdenv.mkDerivation rec { makefile = "Makefile.std"; - prePatch = '' + postPatch = '' # Allow usage of ANGBAND_PATH substituteInPlace config.h --replace "#define FIXED_PATHS" "" ''; @@ -41,30 +43,42 @@ stdenv.mkDerivation rec { NIX_CFLAGS_COMPILE = "-fcommon"; installPhase = '' - # the makefile doesn't have a sensible install target, so we hav to do it ourselves + runHook preInstall + + # the makefile doesn't have a sensible install target, so we have to do it ourselves mkdir -p $out/bin cp sil $out/bin/sil - # Wrap the program to set a user-local ANGBAND_PATH, and run the setup script to copy files into place + + # Wrap the program to set a user-local ANGBAND_PATH, and run the setup script to copy files into place. # We could just use the options for a user-local save and scores dir, but it tried to write to the # lib directory anyway, so we might as well give everyone a copy wrapProgram $out/bin/sil \ - --run "set -u" \ --run "export ANGBAND_PATH=\$HOME/.sil" \ --run "${setup} ${src}/Sil/lib" + + runHook postInstall ''; + passthru.tests = { + saveDirCreation = pkgs.runCommand "save-dir-creation" {} '' + HOME=$(pwd) ${lib.getExe pkgs.sil} --help + test -d .sil && touch $out + ''; + }; + meta = { - description = "A rouge-like game set in the first age of Middle-earth"; + description = "A rogue-like game set in the First Age of Middle-earth"; longDescription = '' - A game of adventure set in the first age of Middle-earth, when the world still - rang with elven song and gleamed with dwarven mail. + A game of adventure set in the First Age of Middle-earth, when the world still + rang with Elven song and gleamed with Dwarven mail. Walk the dark halls of Angband. Slay creatures black and fell. Wrest a shining Silmaril from Morgoth’s iron crown. ''; homepage = "http://www.amirrorclear.net/flowers/game/sil/index.html"; license = lib.licenses.gpl2; - maintainers = [ lib.maintainers.michaelpj ]; + maintainers = with lib.maintainers; [ michaelpj kenran ]; platforms = lib.platforms.linux; + mainProgram = "sil"; }; } diff --git a/pkgs/games/umoria/default.nix b/pkgs/games/umoria/default.nix index 1114d47b7be56..13ec037afba78 100644 --- a/pkgs/games/umoria/default.nix +++ b/pkgs/games/umoria/default.nix @@ -8,7 +8,7 @@ }: let - savesDir = "~/.umoria/"; + savesDir = "~/.umoria"; in gcc9Stdenv.mkDerivation rec { pname = "umoria"; @@ -38,24 +38,22 @@ gcc9Stdenv.mkDerivation rec { RUNDIR=\$(mktemp -d) - cleanup() { - rm -rf \$RUNDIR - } - - trap cleanup EXIT + # Print the directory, so users have access to dumps, and let the system + # take care of cleaning up temp files. + echo "Running umoria in \$RUNDIR" cd \$RUNDIR - mkdir data - - for i in $out/data/*; do - ln -s \$i "data/\$(basename \$i)" - done + ln -sn $out/data \$RUNDIR/data mkdir -p ${savesDir} [[ ! -f ${savesDir}/scores.dat ]] && touch ${savesDir}/scores.dat ln -s ${savesDir}/scores.dat scores.dat - $out/.umoria-unwrapped + if [ \$# -eq 0 ]; then + $out/.umoria-unwrapped ${savesDir}/game.sav + else + $out/.umoria-unwrapped "\$@" + fi EOF chmod +x $out/bin/umoria @@ -74,7 +72,7 @@ gcc9Stdenv.mkDerivation rec { ''; platforms = platforms.unix; badPlatforms = [ "aarch64-darwin" ]; - maintainers = [ maintainers.aciceri ]; + maintainers = with maintainers; [ aciceri kenran ]; license = licenses.gpl3Plus; }; } diff --git a/pkgs/misc/drivers/steamcontroller/default.nix b/pkgs/misc/drivers/steamcontroller/default.nix index db5c8e5d903b5..50d1133c38201 100644 --- a/pkgs/misc/drivers/steamcontroller/default.nix +++ b/pkgs/misc/drivers/steamcontroller/default.nix @@ -1,5 +1,4 @@ { lib, fetchFromGitHub, python3Packages, libusb1, linuxHeaders -, GyroplotSupport ? false }: with python3Packages; @@ -21,9 +20,7 @@ buildPythonApplication { ''; buildInputs = [ libusb1 ]; - propagatedBuildInputs = [ psutil python3Packages.libusb1 ] - ++ lib.optionals GyroplotSupport [ pyqtgraph pyside ]; - + propagatedBuildInputs = [ psutil python3Packages.libusb1 ]; doCheck = false; pythonImportsCheck = [ "steamcontroller" ]; diff --git a/pkgs/misc/opensbi/default.nix b/pkgs/misc/opensbi/default.nix index 3a3e9edf93a22..558f5c487ae1b 100644 --- a/pkgs/misc/opensbi/default.nix +++ b/pkgs/misc/opensbi/default.nix @@ -6,15 +6,19 @@ stdenv.mkDerivation rec { pname = "opensbi"; - version = "1.0"; + version = "1.1"; src = fetchFromGitHub { owner = "riscv-software-src"; repo = "opensbi"; rev = "v${version}"; - sha256 = "sha256-OgzcH+RLU680qF3+lUiWFFbif6YtjIknJriGlRqcOGs="; + sha256 = "sha256-k6f4/lWY/f7qqk0AFY4tdEi4cDilSv/jngaJYhKFlnY="; }; + postPatch = '' + patchShebangs ./scripts + ''; + installFlags = [ "I=$(out)" ]; diff --git a/pkgs/os-specific/darwin/iproute2mac/default.nix b/pkgs/os-specific/darwin/iproute2mac/default.nix index 915ef7c915889..f542f2c5221be 100644 --- a/pkgs/os-specific/darwin/iproute2mac/default.nix +++ b/pkgs/os-specific/darwin/iproute2mac/default.nix @@ -1,21 +1,20 @@ -{ lib, stdenv, fetchFromGitHub, darwin, python2 }: +{ lib, stdenv, fetchFromGitHub, darwin, python3 }: stdenv.mkDerivation rec { - version = "1.2.1"; + version = "1.4.0"; pname = "iproute2mac"; src = fetchFromGitHub { owner = "brona"; repo = "iproute2mac"; rev = "v${version}"; - sha256 = "1n6la7blbxza2m79cpnywsavhzsdv4gzdxrkly4dppyidjg6jy1h"; + sha256 = "sha256-xakCNjmZpdVY7MMxk38EZatrakgkEeDhvljhl+aMmGg="; }; - buildInputs = [ python2 ]; + buildInputs = [ python3 ]; postPatch = '' substituteInPlace src/ip.py \ - --replace /usr/bin/python ${python2}/bin/python \ --replace /sbin/ifconfig ${darwin.network_cmds}/bin/ifconfig \ --replace /sbin/route ${darwin.network_cmds}/bin/route \ --replace /usr/sbin/netstat ${darwin.network_cmds}/bin/netstat \ @@ -32,7 +31,7 @@ stdenv.mkDerivation rec { homepage = "https://github.com/brona/iproute2mac"; description = "CLI wrapper for basic network utilites on Mac OS X inspired with iproute2 on Linux systems - ip command."; license = licenses.mit; - maintainers = with maintainers; [ flokli ]; + maintainers = with maintainers; [ jiegec ]; platforms = platforms.darwin; }; } diff --git a/pkgs/os-specific/linux/alsa-project/alsa-utils/default.nix b/pkgs/os-specific/linux/alsa-project/alsa-utils/default.nix index e614be978c067..e8c6a2ae566fb 100644 --- a/pkgs/os-specific/linux/alsa-project/alsa-utils/default.nix +++ b/pkgs/os-specific/linux/alsa-project/alsa-utils/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "alsa-utils"; - version = "1.2.6"; + version = "1.2.7"; src = fetchurl { url = "mirror://alsa/utils/${pname}-${version}.tar.bz2"; - sha256 = "sha256-ah79ih8dnTjkiWM+rsH/+lwxVmOzFsq4BL5IaIfmFF0="; + sha256 = "sha256-6Qa/JAT/BMRI6qPSJtKDpiuaKD8S5P2EV/skusJ05ng="; }; nativeBuildInputs = [ gettext makeWrapper ]; diff --git a/pkgs/os-specific/linux/busybox/default.nix b/pkgs/os-specific/linux/busybox/default.nix index 636a07edddfd8..3feb590eb5d64 100644 --- a/pkgs/os-specific/linux/busybox/default.nix +++ b/pkgs/os-specific/linux/busybox/default.nix @@ -75,6 +75,11 @@ stdenv.mkDerivation rec { url = "https://git.alpinelinux.org/aports/plain/main/busybox/0002-nslookup-sanitize-all-printed-strings-with-printable.patch?id=ed92963eb55bbc8d938097b9ccb3e221a94653f4"; sha256 = "sha256-vl1wPbsHtXY9naajjnTicQ7Uj3N+EQ8pRNnrdsiow+w="; }) + (fetchurl { + name = "CVE-2022-30065.patch"; + url = "https://git.alpinelinux.org/aports/plain/main/busybox/CVE-2022-30065.patch?id=4ffd996b3f8298c7dd424b912c245864c816e354"; + sha256 = "sha256-+WSYxI6eF8S0tya/S62f9Nc6jVMnHO0q1OyM69GlNTY="; + }) ] ++ lib.optional (stdenv.hostPlatform != stdenv.buildPlatform) ./clang-cross.patch; separateDebugInfo = true; diff --git a/pkgs/os-specific/linux/zfs/default.nix b/pkgs/os-specific/linux/zfs/default.nix index 96c6f57b019ab..eec2d1ad04abc 100644 --- a/pkgs/os-specific/linux/zfs/default.nix +++ b/pkgs/os-specific/linux/zfs/default.nix @@ -16,7 +16,7 @@ , enablePython ? true # for determining the latest compatible linuxPackages -, linuxPackages_5_15 ? pkgs.linuxKernel.packages.linux_5_15 +, linuxPackages_5_18 ? pkgs.linuxKernel.packages.linux_5_18 }: let @@ -216,28 +216,28 @@ in { # to be adapted zfsStable = common { # check the release notes for compatible kernels - kernelCompatible = kernel.kernelOlder "5.18"; - latestCompatibleLinuxPackages = linuxPackages_5_15; + kernelCompatible = kernel.kernelOlder "5.19"; + latestCompatibleLinuxPackages = linuxPackages_5_18; # this package should point to the latest release. - version = "2.1.4"; + version = "2.1.5"; - sha256 = "sha256-pHz1N2j+d9p1xleEBwwrmK9mN5gEyM69Suy0dsrkZT4="; + sha256 = "sha256-a9rmuPO8R8UfxdHvwjfFuYRGn97a1MPmLZRvr3l0swE="; }; zfsUnstable = common { # check the release notes for compatible kernels - kernelCompatible = kernel.kernelOlder "5.18"; - latestCompatibleLinuxPackages = linuxPackages_5_15; + kernelCompatible = kernel.kernelOlder "5.19"; + latestCompatibleLinuxPackages = linuxPackages_5_18; # this package should point to a version / git revision compatible with the latest kernel release # IMPORTANT: Always use a tagged release candidate or commits from the # zfs-<version>-staging branch, because this is tested by the OpenZFS # maintainers. - version = "2.1.4"; + version = "2.1.5"; # rev = "0000000000000000000000000000000000000000"; - sha256 = "sha256-pHz1N2j+d9p1xleEBwwrmK9mN5gEyM69Suy0dsrkZT4="; + sha256 = "sha256-a9rmuPO8R8UfxdHvwjfFuYRGn97a1MPmLZRvr3l0swE="; isUnstable = true; }; diff --git a/pkgs/servers/bird/default.nix b/pkgs/servers/bird/default.nix index 5c5fec3d892a4..4ea9d6a030564 100644 --- a/pkgs/servers/bird/default.nix +++ b/pkgs/servers/bird/default.nix @@ -1,11 +1,11 @@ -{ lib, stdenv, fetchurl, fetchpatch, flex, bison, readline, libssh, nixosTests }: +{ lib, stdenv, fetchurl, flex, bison, readline, libssh, nixosTests }: stdenv.mkDerivation rec { pname = "bird"; - version = "2.0.9"; + version = "2.0.10"; src = fetchurl { - sha256 = "sha256-dnhrvN7TBh4bsiGwEfLMACIewGPenNoASn2bBhoJbV4="; + sha256 = "sha256-ftNB3djch/qXNlhrNRVEeoQ2/sRC1l9AIhVaud4f/Vo="; url = "ftp://bird.network.cz/pub/bird/${pname}-${version}.tar.gz"; }; @@ -14,10 +14,6 @@ stdenv.mkDerivation rec { patches = [ ./dont-create-sysconfdir-2.patch - (fetchurl { - url = "https://gitlab.nic.cz/labs/bird/-/commit/fcb4dd0c831339c4374ace17d8f2ae6ebfeed279.patch"; - sha256 = "sha256-PEgpRnOGLa1orHJDEHlblnVhBVv7XOKPR70M1wUMxMQ="; - }) ]; CPP="${stdenv.cc.targetPrefix}cpp -E"; diff --git a/pkgs/servers/confluencepot/default.nix b/pkgs/servers/confluencepot/default.nix new file mode 100644 index 0000000000000..242e2b93d7ad9 --- /dev/null +++ b/pkgs/servers/confluencepot/default.nix @@ -0,0 +1,44 @@ +{ lib +, stdenv +, buildGoModule +, fetchFromGitHub +}: + +buildGoModule rec { + pname = "confluencepot"; + version = "1.0.0"; + + src = fetchFromGitHub { + owner = "SIFalcon"; + repo = "confluencePot"; + rev = "v${version}"; + hash = "sha256-jIbL6prOUII8o9FghIYa80BytJ9SSuyj/TZmAxwAbJk="; + }; + + vendorSha256 = "sha256-nzPHx+c369T4h9KETqMurxZK3LsJAhwBaunkcWIW3Ps="; + + postPatch = '' + substituteInPlace confluencePot.go \ + --replace "confluence.html" "$out/share/confluence.html" + ''; + + postInstall = lib.optionalString (!stdenv.isDarwin) '' + mv $out/bin/confluencePot $out/bin/${pname} + ''; + + preFixup = '' + # Install HTML file + install -vD confluence.html -t $out/share + ''; + + meta = with lib; { + description = "Honeypot for the Atlassian Confluence OGNL injection vulnerability"; + homepage = "https://github.com/SIFalcon/confluencePot"; + longDescription = '' + ConfluencePot is a simple honeypot for the Atlassian Confluence unauthenticated + and remote OGNL injection vulnerability (CVE-2022-26134). + ''; + license = with licenses; [ agpl3Plus ]; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/pkgs/servers/dns/bind/default.nix b/pkgs/servers/dns/bind/default.nix index 7b56061a4aa81..d2923ee23345d 100644 --- a/pkgs/servers/dns/bind/default.nix +++ b/pkgs/servers/dns/bind/default.nix @@ -9,11 +9,11 @@ stdenv.mkDerivation rec { pname = "bind"; - version = "9.18.3"; + version = "9.18.4"; src = fetchurl { url = "https://downloads.isc.org/isc/bind9/${version}/${pname}-${version}.tar.xz"; - sha256 = "sha256-CtjadzvZPLoO9mzIGZlpjr35w+UfrtXlyMHrdcrSrm8="; + sha256 = "sha256-8neuUBWaAMMA65JqnF1RlTA4qTa9gkLWkT37bqxCdh0="; }; outputs = [ "out" "lib" "dev" "man" "dnsutils" "host" ]; diff --git a/pkgs/servers/dns/coredns/default.nix b/pkgs/servers/dns/coredns/default.nix index c93d1235ea821..54965fd998aa6 100644 --- a/pkgs/servers/dns/coredns/default.nix +++ b/pkgs/servers/dns/coredns/default.nix @@ -6,16 +6,16 @@ buildGoModule rec { pname = "coredns"; - version = "1.9.2"; + version = "1.9.3"; src = fetchFromGitHub { owner = "coredns"; repo = "coredns"; rev = "v${version}"; - sha256 = "sha256-6ABcXRuPEkzhjVZcltPoWGAc+fs6FwmgQCMRuLmhXxo="; + sha256 = "sha256-9lRZjY85SD1HXAWVCp8fpzV0d1Y+LbodT3Sp21CNp+k="; }; - vendorSha256 = "sha256-0S77748voNlIuY6yUAa669pB09h35THojCyQKUm5VFc="; + vendorSha256 = "sha256-gNa+dm7n71IiSCztTO5VZ5FnGTGYfNXo/HMichNzek0="; postPatch = '' substituteInPlace test/file_cname_proxy_test.go \ diff --git a/pkgs/servers/etebase/default.nix b/pkgs/servers/etebase/default.nix index 9ed14ac5503c4..8a69645c51ed6 100644 --- a/pkgs/servers/etebase/default.nix +++ b/pkgs/servers/etebase/default.nix @@ -1,16 +1,17 @@ { lib, fetchFromGitHub, buildPythonPackage, aioredis, aiofiles, django_3 -, fastapi, msgpack, pynacl, typing-extensions }: +, fastapi, msgpack, pynacl, typing-extensions +, withLdap ? true, ldap }: buildPythonPackage rec { pname = "etebase-server"; - version = "0.8.3"; + version = "0.9.1"; format = "other"; src = fetchFromGitHub { owner = "etesync"; repo = "server"; rev = "v${version}"; - sha256 = "sha256-rPs34uzb5veiOw74SACLrDm4Io0CYH9EL9IuV38CkPY="; + sha256 = "sha256-mYXy0N7ohNk3K2XNB6JvULF6lhL5dV8yBvooR6RuV1E="; }; patches = [ ./secret.patch ]; @@ -23,7 +24,7 @@ buildPythonPackage rec { msgpack pynacl typing-extensions - ]; + ] ++ lib.optional withLdap ldap; installPhase = '' mkdir -p $out/bin $out/lib diff --git a/pkgs/servers/geospatial/geoserver/default.nix b/pkgs/servers/geospatial/geoserver/default.nix new file mode 100644 index 0000000000000..0fc184e063e54 --- /dev/null +++ b/pkgs/servers/geospatial/geoserver/default.nix @@ -0,0 +1,38 @@ +{ lib, stdenv, fetchurl, unzip, jre, makeWrapper }: + +stdenv.mkDerivation rec { + pname = "geoserver"; + version = "2.21.0"; + + src = fetchurl { + url = "mirror://sourceforge/geoserver/GeoServer/${version}/geoserver-${version}-bin.zip"; + sha256 = "sha256-UCr22Ffhnux6eA0w5qoaf5Hvuypsl/FGpK+emi8G0Mc="; + }; + + sourceRoot = "."; + nativeBuildInputs = [ unzip makeWrapper ]; + + installPhase = '' + runHook preInstall + mkdir -p $out/share/geoserver + cp -r . $out/share/geoserver + rm -fr $out/share/geoserver/bin/*.bat + + makeWrapper $out/share/geoserver/bin/startup.sh $out/bin/geoserver-startup \ + --set JAVA_HOME "${jre}" \ + --set GEOSERVER_HOME "$out/share/geoserver" + makeWrapper $out/share/geoserver/bin/shutdown.sh $out/bin/geoserver-shutdown \ + --set JAVA_HOME "${jre}" \ + --set GEOSERVER_HOME "$out/share/geoserver" + runHook postInstall + ''; + + meta = with lib; { + description = "Open source server for sharing geospatial data"; + homepage = "https://geoserver.org/"; + sourceProvenance = with sourceTypes; [ binaryBytecode ]; + license = licenses.gpl2Plus; + maintainers = with maintainers; [ sikmir ]; + platforms = platforms.all; + }; +} diff --git a/pkgs/servers/heisenbridge/default.nix b/pkgs/servers/heisenbridge/default.nix index 3d4ef94dda490..82599cdcbaa58 100644 --- a/pkgs/servers/heisenbridge/default.nix +++ b/pkgs/servers/heisenbridge/default.nix @@ -1,13 +1,13 @@ { lib, fetchFromGitHub, fetchpatch, python3 }: python3.pkgs.buildPythonApplication rec { pname = "heisenbridge"; - version = "1.13.0"; + version = "1.13.1"; src = fetchFromGitHub { owner = "hifi"; repo = pname; rev = "refs/tags/v${version}"; - sha256 = "sha256-3YCYLhJqZAWIwpwOd8J1+uYsxw0q6jQy35Vp+ttVKhI="; + sha256 = "sha256-sgZql9373xKT7Hi8M5TIZTOkS2AOFoKA1DXYa2f2IkA="; }; postPatch = '' diff --git a/pkgs/servers/http/apache-modules/mod_cspnonce/default.nix b/pkgs/servers/http/apache-modules/mod_cspnonce/default.nix index 5fb922c2df08a..f6de7f0175375 100644 --- a/pkgs/servers/http/apache-modules/mod_cspnonce/default.nix +++ b/pkgs/servers/http/apache-modules/mod_cspnonce/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "mod_cspnonce"; - version = "1.3"; + version = "1.4"; src = fetchFromGitHub { owner = "wyattoday"; repo = "mod_cspnonce"; rev = version; - sha256 = "0kqvxf1dn8r0ywrfiwsxryjrxii2sq11wisbjnm7770sjwckwqh5"; + hash = "sha256-uUWRKUjS2LvHgT5xrK+LZLQRHc6wMaxGca2OsVxVlRs="; }; buildInputs = [ apacheHttpd ]; diff --git a/pkgs/servers/monitoring/cadvisor/default.nix b/pkgs/servers/monitoring/cadvisor/default.nix index 760bed7b9371b..73fe3ed1192d3 100644 --- a/pkgs/servers/monitoring/cadvisor/default.nix +++ b/pkgs/servers/monitoring/cadvisor/default.nix @@ -2,18 +2,18 @@ buildGoModule rec { pname = "cadvisor"; - version = "0.40.0"; + version = "0.44.1"; src = fetchFromGitHub { owner = "google"; repo = "cadvisor"; rev = "v${version}"; - sha256 = "sha256-8HOaKjdATVZpyx4yLf7xefz+jiOEqmkWiZnA3DOyT50="; + sha256 = "sha256-OVUKQGP9zzlzoC/25BHNbJuP6ELstBMaRFAzUnDSR0U="; }; modRoot = "./cmd"; - vendorSha256 = "sha256-+nrXD0hQ3zBwTTq9xoBqO3ho4s4tf8uZQz2wL1nYi/k="; + vendorSha256 = "sha256-LGMouB76GT/ZvG3kLoo/jmnHT0CEeND9pObTOKaS9T0="; ldflags = [ "-s" "-w" "-X github.com/google/cadvisor/version.Version=${version}" ]; diff --git a/pkgs/servers/monitoring/grafana/default.nix b/pkgs/servers/monitoring/grafana/default.nix index 46c80120daa95..87430bda86d78 100644 --- a/pkgs/servers/monitoring/grafana/default.nix +++ b/pkgs/servers/monitoring/grafana/default.nix @@ -2,7 +2,7 @@ buildGoModule rec { pname = "grafana"; - version = "9.0.0"; + version = "9.0.1"; excludedPackages = [ "alert_webhook_listener" "clean-swagger" "release_publisher" "slow_proxy" "slow_proxy_mac" "macaron" "devenv" ]; @@ -10,15 +10,15 @@ buildGoModule rec { rev = "v${version}"; owner = "grafana"; repo = "grafana"; - sha256 = "sha256-vPPaOepx4uwOWOjeE+dWULxmJPk5To9UY3rnoEqeAJA="; + sha256 = "sha256-+03bfSpUT5sb0oFf9BomglcVb5bRqAwZ1MKCPmRtAss="; }; srcStatic = fetchurl { url = "https://dl.grafana.com/oss/release/grafana-${version}.linux-amd64.tar.gz"; - sha256 = "0xl5z31mkgbwkwcpvr0v0hmc0ynvxjn39w4sb1vc572kjbwqpvkr"; + sha256 = "1kw9l3gip4lqfrc0asgsd1lf5sxa7zj67isyvhb14qdsf9rs3b2d"; }; - vendorSha256 = "sha256-E3uSwdgoPgQPQ/uCIuTxcYeNRYbQR7q7SrUrh/ypENk="; + vendorSha256 = "sha256-eB0SswtqAb0xoLcq021KaH4CdgLbWmhODyifQDVl5XI="; nativeBuildInputs = [ wire ]; diff --git a/pkgs/servers/nosql/mongodb/patches/mongodb-4.0-glibc-2.34.patch b/pkgs/servers/nosql/mongodb/patches/mongodb-4.0-glibc-2.34.patch new file mode 100644 index 0000000000000..f5c4a5c354085 --- /dev/null +++ b/pkgs/servers/nosql/mongodb/patches/mongodb-4.0-glibc-2.34.patch @@ -0,0 +1,14 @@ +--- a/src/mongo/stdx/thread.h ++++ b/src/mongo/stdx/thread.h +@@ -103,10 +103,7 @@ private: + // . N Y : 4,344 | 13,048 | 7,352 + // . Y Y : 4,424 | 13,672 | 8,392 + // ( https://jira.mongodb.org/secure/attachment/233569/233569_stacktrace-writeup.txt ) +- static constexpr std::size_t kMongoMinSignalStackSize = std::size_t{64} << 10; +- +- static constexpr std::size_t kStackSize = +- std::max(kMongoMinSignalStackSize, std::size_t{MINSIGSTKSZ}); ++ static constexpr std::size_t kStackSize = std::size_t{64} << 10; + std::unique_ptr<char[]> _stackStorage = std::make_unique<char[]>(kStackSize); + + #else // !MONGO_HAS_SIGALTSTACK \ No newline at end of file diff --git a/pkgs/servers/nosql/mongodb/v4_0.nix b/pkgs/servers/nosql/mongodb/v4_0.nix index 24349686fbec8..9d28a9185ba13 100644 --- a/pkgs/servers/nosql/mongodb/v4_0.nix +++ b/pkgs/servers/nosql/mongodb/v4_0.nix @@ -1,4 +1,4 @@ -{ stdenv, callPackage, lib, sasl, boost, Security, CoreFoundation, cctools }: +{ stdenv, callPackage, fetchpatch, lib, sasl, boost, Security, CoreFoundation, cctools }: let buildMongoDB = callPackage ./mongodb.nix { @@ -11,7 +11,15 @@ let in buildMongoDB { version = "4.0.27"; sha256 = "sha256-ct33mnK4pszhYM4Is7j0GZQRyi8i8Qmy0wcklyq5LjM="; - patches = - [ ./forget-build-dependencies.patch ./mozjs-45_fix-3-byte-opcode.patch ] + patches = [ + ./forget-build-dependencies.patch + ./mozjs-45_fix-3-byte-opcode.patch + ./patches/mongodb-4.0-glibc-2.34.patch # https://github.com/NixOS/nixpkgs/issues/171928 + (fetchpatch { + name = "mongodb-4.4.1-gcc11.patch"; + url = "https://raw.githubusercontent.com/gentoo/gentoo/7168257cad6ea7c4856b01c5703d0ed5b764367c/dev-db/mongodb/files/mongodb-4.4.1-gcc11.patch"; + sha256 = "sha256-RvfCP462RG+ZVjcb23DgCuxCdfPl2/UgH8N7FgCghGI="; + }) + ] ++ lib.optionals stdenv.isDarwin [ ./asio-no-experimental-string-view.patch ]; } diff --git a/pkgs/servers/nosql/mongodb/v4_2.nix b/pkgs/servers/nosql/mongodb/v4_2.nix index 3759cc1e6d585..53b73b510e3ad 100644 --- a/pkgs/servers/nosql/mongodb/v4_2.nix +++ b/pkgs/servers/nosql/mongodb/v4_2.nix @@ -1,4 +1,4 @@ -{ stdenv, callPackage, lib, sasl, boost, Security, CoreFoundation, cctools }: +{ stdenv, callPackage, fetchpatch, lib, sasl, boost, Security, CoreFoundation, cctools }: let buildMongoDB = callPackage ./mongodb.nix { @@ -11,7 +11,12 @@ let in buildMongoDB { version = "4.2.19"; sha256 = "sha256-fngTHd+fSdHqiqQYOYS7o6P5eHybeZy3iNKkGzFmjTw="; - patches = - [ ./forget-build-dependencies-4-2.patch ] - ++ lib.optionals stdenv.isDarwin [ ./asio-no-experimental-string-view-4-2.patch ]; + patches = [ + ./forget-build-dependencies-4-2.patch + (fetchpatch { + name = "mongodb-4.4.1-gcc11.patch"; + url = "https://raw.githubusercontent.com/gentoo/gentoo/7168257cad6ea7c4856b01c5703d0ed5b764367c/dev-db/mongodb/files/mongodb-4.4.1-gcc11.patch"; + sha256 = "sha256-RvfCP462RG+ZVjcb23DgCuxCdfPl2/UgH8N7FgCghGI="; + }) + ] ++ lib.optionals stdenv.isDarwin [ ./asio-no-experimental-string-view-4-2.patch ]; } diff --git a/pkgs/servers/nosql/riak/2.2.0.nix b/pkgs/servers/nosql/riak/2.2.0.nix deleted file mode 100644 index 102d69f82b40d..0000000000000 --- a/pkgs/servers/nosql/riak/2.2.0.nix +++ /dev/null @@ -1,106 +0,0 @@ -{ stdenv, lib, fetchurl, unzip, erlang, which, pam, nixosTests }: - -let - solrName = "solr-4.10.4-yz-2.tgz"; - yokozunaJarName = "yokozuna-3.jar"; - yzMonitorJarName = "yz_monitor-1.jar"; - - srcs = { - riak = fetchurl { - url = "https://s3.amazonaws.com/downloads.basho.com/riak/2.2/2.2.0/riak-2.2.0.tar.gz"; - sha256 = "0kl28bpyzajcllybili46jfr1schl45w5ysii187jr0ssgls2c9p"; - }; - solr = fetchurl { - url = "http://s3.amazonaws.com/files.basho.com/solr/${solrName}"; - sha256 = "0fy5slnldn628gmr2kilyx606ph0iykf7pz6j0xjcc3wqvrixa2a"; - }; - yokozunaJar = fetchurl { - url = "http://s3.amazonaws.com/files.basho.com/yokozuna/${yokozunaJarName}"; - sha256 = "17n6m100fz8affdcxsn4niw2lrpnswgfnd6aszgzipffwbg7v8v5"; - }; - yzMonitorJar = fetchurl { - url = "http://s3.amazonaws.com/files.basho.com/yokozuna/${yzMonitorJarName}"; - sha256 = "0kb97d1a43vw759j1h5qwbhx455pidn2pi7sfxijqic37h81ri1m"; - }; - }; -in - -stdenv.mkDerivation { - pname = "riak"; - version = "2.2.0"; - - nativeBuildInputs = [ unzip ]; - buildInputs = [ - which erlang pam - ]; - - src = srcs.riak; - - hardeningDisable = [ "format" ]; - - postPatch = '' - sed -i deps/node_package/priv/base/env.sh \ - -e 's@{{platform_data_dir}}@''${RIAK_DATA_DIR:-/var/db/riak}@' \ - -e 's@^RUNNER_SCRIPT_DIR=.*@RUNNER_SCRIPT_DIR='$out'/bin@' \ - -e 's@^RUNNER_BASE_DIR=.*@RUNNER_BASE_DIR='$out'@' \ - -e 's@^RUNNER_ETC_DIR=.*@RUNNER_ETC_DIR=''${RIAK_ETC_DIR:-/etc/riak}@' \ - -e 's@^RUNNER_LOG_DIR=.*@RUNNER_LOG_DIR=''${RIAK_LOG_DIR:-/var/log}@' - ''; - - preBuild = '' - mkdir solr-pkg - cp ${srcs.solr} solr-pkg/${solrName} - export SOLR_PKG_DIR=$(readlink -f solr-pkg) - - mkdir -p deps/yokozuna/priv/java_lib - cp ${srcs.yokozunaJar} deps/yokozuna/priv/java_lib/${yokozunaJarName} - - mkdir -p deps/yokozuna/priv/solr/lib/ext - cp ${srcs.yzMonitorJar} deps/yokozuna/priv/solr/lib/ext/${yzMonitorJarName} - - patchShebangs . - ''; - - buildPhase = '' - runHook preBuild - - make locked-deps - make rel - - runHook postBuild - ''; - - doCheck = false; - - installPhase = '' - runHook preInstall - - mkdir $out - mv rel/riak/etc rel/riak/riak-etc - mkdir -p rel/riak/etc - mv rel/riak/riak-etc rel/riak/etc/riak - mv rel/riak/* $out - - for prog in $out/bin/*; do - substituteInPlace $prog \ - --replace '. "`cd \`dirname $0\` && /bin/pwd`/../lib/env.sh"' \ - ". $out/lib/env.sh" - done - - runHook postInstall - ''; - - passthru.tests = { inherit (nixosTests) riak; }; - - meta = with lib; { - maintainers = with maintainers; [ cstrahan mdaiter ]; - description = "Dynamo inspired NoSQL DB by Basho"; - platforms = [ "x86_64-linux" ]; - sourceProvenance = with sourceTypes; [ - fromSource - binaryBytecode # dependencies - ]; - license = licenses.asl20; - knownVulnerabilities = [ "CVE-2017-3163 - see https://github.com/NixOS/nixpkgs/issues/33876" ]; - }; -} diff --git a/pkgs/servers/peertube/default.nix b/pkgs/servers/peertube/default.nix index 1a8253d51d4ab..f4a80cbe26f68 100644 --- a/pkgs/servers/peertube/default.nix +++ b/pkgs/servers/peertube/default.nix @@ -6,13 +6,13 @@ let if stdenv.hostPlatform.system == "x86_64-linux" then "linux-x64" else throw "Unsupported architecture: ${stdenv.hostPlatform.system}"; - version = "4.2.0"; + version = "4.2.1"; source = fetchFromGitHub { owner = "Chocobozzz"; repo = "PeerTube"; rev = "v${version}"; - sha256 = "sha256-U/QJqYw1fFmUvtPDZ1VcYe1+clLj/I0Lkhhu8+FuK2U="; + sha256 = "sha256-bb22/GidSPaRtvbht6FzVqTGzzNDYgBdHqHGnzA1Iy0="; }; yarnOfflineCacheServer = fetchYarnDeps { diff --git a/pkgs/servers/plex/raw.nix b/pkgs/servers/plex/raw.nix index fd6adfe65a981..87e36134acbba 100644 --- a/pkgs/servers/plex/raw.nix +++ b/pkgs/servers/plex/raw.nix @@ -12,16 +12,16 @@ # server, and the FHS userenv and corresponding NixOS module should # automatically pick up the changes. stdenv.mkDerivation rec { - version = "1.27.0.5897-3940636f2"; + version = "1.27.1.5916-6b0e31a64"; pname = "plexmediaserver"; # Fetch the source src = if stdenv.hostPlatform.system == "aarch64-linux" then fetchurl { url = "https://downloads.plex.tv/plex-media-server-new/${version}/debian/plexmediaserver_${version}_arm64.deb"; - sha256 = "1ibahbz276diji66m5w059a1h9crva92r83w6av1dfq44v298s77"; + sha256 = "0cyx83a64vdq68qknsscdnawx9lcyr5siiwys2gc9gnxm6sv8x82"; } else fetchurl { url = "https://downloads.plex.tv/plex-media-server-new/${version}/debian/plexmediaserver_${version}_amd64.deb"; - sha256 = "119nmmjpca05d6vzhy3xipgca9k51ps8252vcgdsp080dh7nk2kp"; + sha256 = "0v5gkk0izqkma9m4gvqyx94mij4jvv8vdv6897r7v8xqg9wji24l"; }; outputs = [ "out" "basedb" ]; diff --git a/pkgs/servers/search/lnx/default.nix b/pkgs/servers/search/lnx/default.nix new file mode 100644 index 0000000000000..cda779ee26322 --- /dev/null +++ b/pkgs/servers/search/lnx/default.nix @@ -0,0 +1,31 @@ +{ stdenv +, lib +, rustPlatform +, fetchFromGitHub +, DiskArbitration +, Foundation +}: + +# unstable was chosen because of an added Cargo.lock +# revert to stable for the version after 0.9.0 +let version = "unstable-2022-06-25"; +in +rustPlatform.buildRustPackage { + pname = "lnx"; + inherit version; + src = fetchFromGitHub { + owner = "lnx-search"; + repo = "lnx"; + rev = "2cb80f344c558bfe37f21ccfb83265bf351419d9"; + sha256 = "sha256-iwoZ6xRzEDArmhWYxIrbIXRTQjOizyTsXCvMdnUrs2g="; + }; + cargoSha256 = "sha256-JpsZ37u3+4+X8knTxoGmJisopTsPR221rv3Bu4DMZZI="; + buildInputs = lib.optionals stdenv.isDarwin [ DiskArbitration Foundation ]; + meta = with lib; { + description = "Insanely fast, Feature-rich searching. lnx is the adaptable, typo tollerant deployment of the tantivy search engine. Standing on the shoulders of giants. "; + homepage = "https://lnx.rs/"; + license = licenses.mit; + maintainers = with maintainers; [ happysalada ]; + platforms = platforms.unix; + }; +} diff --git a/pkgs/servers/shairport-sync/default.nix b/pkgs/servers/shairport-sync/default.nix index ed3c0dcc7f9de..dbe478568ac64 100644 --- a/pkgs/servers/shairport-sync/default.nix +++ b/pkgs/servers/shairport-sync/default.nix @@ -1,6 +1,12 @@ -{ lib, stdenv, fetchFromGitHub, autoreconfHook, openssl, avahi, alsa-lib -, libdaemon, popt, pkg-config, libconfig, libpulseaudio, soxr }: +{ lib, stdenv, fetchFromGitHub +, autoreconfHook, pkg-config +, openssl, avahi, alsa-lib, glib, libdaemon, popt, libconfig, libpulseaudio, soxr +, enableDbus ? stdenv.isLinux +, enableMetadata ? false +, enableMpris ? stdenv.isLinux +}: +with lib; stdenv.mkDerivation rec { version = "3.3.9"; pname = "shairport-sync"; @@ -23,7 +29,12 @@ stdenv.mkDerivation rec { libconfig libpulseaudio soxr - ]; + ] ++ optional stdenv.isLinux glib; + + prePatch = '' + sed -i -e 's/G_BUS_TYPE_SYSTEM/G_BUS_TYPE_SESSION/g' dbus-service.c + sed -i -e 's/G_BUS_TYPE_SYSTEM/G_BUS_TYPE_SESSION/g' mpris-service.c + ''; enableParallelBuilding = true; @@ -32,7 +43,10 @@ stdenv.mkDerivation rec { "--with-avahi" "--with-ssl=openssl" "--with-soxr" "--without-configfiles" "--sysconfdir=/etc" - ]; + ] + ++ optional enableDbus "--with-dbus-interface" + ++ optional enableMetadata "--with-metadata" + ++ optional enableMpris "--with-mpris-interface"; meta = with lib; { inherit (src.meta) homepage; diff --git a/pkgs/servers/sql/mariadb/galera/default.nix b/pkgs/servers/sql/mariadb/galera/default.nix index d124664dd7b52..0c6c085866e33 100644 --- a/pkgs/servers/sql/mariadb/galera/default.nix +++ b/pkgs/servers/sql/mariadb/galera/default.nix @@ -4,13 +4,13 @@ stdenv.mkDerivation rec { pname = "mariadb-galera"; - version = "26.4.11"; + version = "26.4.12"; src = fetchFromGitHub { owner = "codership"; repo = "galera"; rev = "release_${version}"; - sha256 = "sha256-zAS/YCUNSgkjehUXJpa+FyPC6zHnx3Nmlx0m7hbuZo0="; + sha256 = "sha256-1Jw99Eo8xhCNLd2XHm9M6DatzBl0w5VvgUahvKs4glg="; fetchSubmodules = true; }; diff --git a/pkgs/servers/traefik/default.nix b/pkgs/servers/traefik/default.nix index 622662645c7ef..d6a0f497da14f 100644 --- a/pkgs/servers/traefik/default.nix +++ b/pkgs/servers/traefik/default.nix @@ -1,33 +1,34 @@ -{ lib, fetchzip, buildGoModule, go-bindata, nixosTests }: +{ lib, fetchFromGitHub, buildGoModule, nixosTests }: buildGoModule rec { pname = "traefik"; - version = "2.6.3"; + version = "2.7.1"; - src = fetchzip { - url = "https://github.com/traefik/traefik/releases/download/v${version}/traefik-v${version}.src.tar.gz"; - sha256 = "sha256-OaKgX3qwiJM/EPprV1r3CbUnxOaWl7BTMcS5v+tmHoo="; - stripRoot = false; + src = fetchFromGitHub { + owner = "traefik"; + repo = "traefik"; + rev = "v${version}"; + sha256 = "sha256-uTE0Z7lgxKNq1wQSMUSp9dMfxV+aIm7cwYSkZBUdnug="; }; - vendorSha256 = "sha256-tqrfCpZ/fRYZBZ/SBAvvJebLBeD2M/AVJEPiseehJHY="; + vendorSha256 = "sha256-WlLntYrXs1kOu26yNeZI1xpb6FsHPiA/bNzaxCZTG4Y="; subPackages = [ "cmd/traefik" ]; - nativeBuildInputs = [ go-bindata ]; - - passthru.tests = { inherit (nixosTests) traefik; }; - preBuild = '' go generate CODENAME=$(awk -F "=" '/CODENAME=/ { print $2}' script/binary) - buildFlagsArray+=("-ldflags=\ - -X github.com/traefik/traefik/v2/pkg/version.Version=${version} \ - -X github.com/traefik/traefik/v2/pkg/version.Codename=$CODENAME") + buildFlagsArray+=("-ldflags= -s -w \ + -X github.com/traefik/traefik/v${lib.versions.major version}/pkg/version.Version=${version} \ + -X github.com/traefik/traefik/v${lib.versions.major version}/pkg/version.Codename=$CODENAME") ''; + doCheck = false; + + passthru.tests = { inherit (nixosTests) traefik; }; + meta = with lib; { homepage = "https://traefik.io"; description = "A modern reverse proxy"; diff --git a/pkgs/servers/web-apps/lemmy/package.json b/pkgs/servers/web-apps/lemmy/package.json index bb7dc863d5bbf..934cccd205f7d 100644 --- a/pkgs/servers/web-apps/lemmy/package.json +++ b/pkgs/servers/web-apps/lemmy/package.json @@ -1,7 +1,7 @@ { "name": "lemmy-ui", "description": "An isomorphic UI for lemmy", - "version": "0.15.1", + "version": "0.16.4", "author": "Dessalines <tyhou13@gmx.com>", "license": "AGPL-3.0", "scripts": { @@ -17,14 +17,14 @@ }, "repository": "https://github.com/LemmyNet/lemmy-ui", "dependencies": { - "@typescript-eslint/parser": "^5.6.0", + "@typescript-eslint/parser": "^5.21.0", "autosize": "^5.0.1", - "check-password-strength": "^2.0.3", - "choices.js": "^10.0.0", + "check-password-strength": "^2.0.5", + "choices.js": "^10.1.0", "classnames": "^2.3.1", - "emoji-short-name": "^1.0.0", - "express": "~4.17.1", - "i18next": "^21.5.4", + "emoji-short-name": "^2.0.0", + "express": "~4.18.0", + "i18next": "^21.6.16", "inferno": "^7.4.11", "inferno-create-element": "^7.4.11", "inferno-helmet": "^5.2.1", @@ -34,15 +34,16 @@ "inferno-server": "^7.4.11", "isomorphic-cookie": "^1.2.4", "jwt-decode": "^3.1.2", - "markdown-it": "^12.1.0", + "markdown-it": "^13.0.0", "markdown-it-container": "^3.0.0", + "markdown-it-footnote": "^3.0.3", "markdown-it-html5-embed": "^1.0.0", "markdown-it-sub": "^1.0.0", "markdown-it-sup": "^1.0.0", - "moment": "^2.29.1", + "moment": "^2.29.3", "register-service-worker": "^1.7.2", - "rxjs": "^7.4.0", - "sass": "^1.47.0", + "rxjs": "^7.5.5", + "sass": "^1.51.0", "serialize-javascript": "^6.0.0", "tippy.js": "^6.3.7", "toastify-js": "^1.11.2", @@ -50,48 +51,47 @@ "websocket-ts": "^1.1.1" }, "devDependencies": { - "@babel/core": "^7.16.0", - "@babel/plugin-transform-runtime": "^7.16.4", + "@babel/core": "^7.17.9", + "@babel/plugin-transform-runtime": "^7.17.0", "@babel/plugin-transform-typescript": "^7.16.1", - "@babel/preset-env": "7.16.8", + "@babel/preset-env": "7.16.11", "@babel/preset-typescript": "^7.16.0", - "@babel/runtime": "^7.16.3", + "@babel/runtime": "^7.17.9", "@types/autosize": "^4.0.0", "@types/express": "^4.17.13", - "@types/node": "^17.0.8", - "@types/node-fetch": "^2.5.11", + "@types/node": "^17.0.29", + "@types/node-fetch": "^2.6.1", "@types/serialize-javascript": "^5.0.1", - "@typescript-eslint/eslint-plugin": "^5.6.0", - "babel-loader": "^8.2.3", - "babel-plugin-inferno": "^6.3.0", + "@typescript-eslint/eslint-plugin": "^5.21.0", + "babel-loader": "^8.2.5", + "babel-plugin-inferno": "^6.4.0", "bootstrap": "^5.1.3", "bootswatch": "^5.1.3", "clean-webpack-plugin": "^4.0.0", - "copy-webpack-plugin": "^10.0.0", - "css-loader": "^6.5.1", - "eslint": "^8.4.0", + "copy-webpack-plugin": "^10.2.4", + "css-loader": "^6.7.1", + "eslint": "^8.14.0", "eslint-plugin-prettier": "^4.0.0", "husky": "^7.0.4", "import-sort-style-module": "^6.0.0", - "iso-639-1": "^2.1.10", - "lemmy-js-client": "0.15.0", - "lint-staged": "^12.1.2", - "mini-css-extract-plugin": "^2.4.5", + "lemmy-js-client": "0.16.4", + "lint-staged": "^12.4.1", + "mini-css-extract-plugin": "^2.6.0", "node-fetch": "^2.6.1", - "prettier": "^2.5.1", + "prettier": "^2.6.2", "prettier-plugin-import-sort": "^0.0.7", "prettier-plugin-organize-imports": "^2.3.4", - "prettier-plugin-packagejson": "^2.2.15", + "prettier-plugin-packagejson": "^2.2.17", "rimraf": "^3.0.2", "run-node-webpack-plugin": "^1.3.0", - "sass-loader": "^12.3.0", + "sass-loader": "^12.6.0", "sortpack": "^2.2.0", "style-loader": "^3.3.1", - "terser": "^5.10.0", - "typescript": "^4.5.2", - "webpack": "5.66.0", - "webpack-cli": "^4.9.1", - "webpack-dev-server": "4.7.3", + "terser": "^5.13.0", + "typescript": "^4.6.3", + "webpack": "5.72.0", + "webpack-cli": "^4.9.2", + "webpack-dev-server": "4.8.1", "webpack-node-externals": "^3.0.0" }, "engines": { diff --git a/pkgs/servers/web-apps/lemmy/pin.json b/pkgs/servers/web-apps/lemmy/pin.json index 9a588b54da99f..c22c821f5db3f 100644 --- a/pkgs/servers/web-apps/lemmy/pin.json +++ b/pkgs/servers/web-apps/lemmy/pin.json @@ -1,7 +1,7 @@ { - "version": "0.15.1", - "serverSha256": "sha256-HHr9mG0AuI/86+EjODE/GT9lhl5DeNkzQ4k077b7ICU=", - "serverCargoSha256": "sha256-ErMNsyHfBiYZA4gjaxPHO+fQseUVIKy/928oGqw+Adg=", - "uiSha256": "sha256-Al6Q1xXkjqIb2v2S4JbmlQAAFCKwzkAW924uolC0tu8=", - "uiYarnDepsSha256": "sha256-Zadp74ZHmbxCHxpDAYOa6Ot2kWujIj8ZzrSaIEsYgMY=" + "version": "0.16.4", + "serverSha256": "sha256-xbxavlmRm7QTbrAjw6IMgQq8rEgyEHdcj11EhsOY+j0=", + "serverCargoSha256": "sha256-vDIaLpw0C6fnv0quH20qRN0I38Br338+MS9YzVfNizU=", + "uiSha256": "sha256-GZH/fSYLbxwigrr5LwAzxH4ElDVjTs8Tqqq+xYDFNCU", + "uiYarnDepsSha256": "sha256-BQs9UXUT/CcxJ7CdLksYGvGPGAaW7FLUAShLsbPC0jw=" } diff --git a/pkgs/servers/web-apps/lemmy/server.nix b/pkgs/servers/web-apps/lemmy/server.nix index 5526d8fe31f3e..52dddc8183c0d 100644 --- a/pkgs/servers/web-apps/lemmy/server.nix +++ b/pkgs/servers/web-apps/lemmy/server.nix @@ -7,6 +7,7 @@ , libiconv , Security , protobuf +, rustfmt }: let pinData = lib.importJSON ./pin.json; @@ -21,6 +22,7 @@ rustPlatform.buildRustPackage rec { repo = "lemmy"; rev = version; sha256 = pinData.serverSha256; + fetchSubmodules = true; }; cargoSha256 = pinData.serverCargoSha256; @@ -37,7 +39,7 @@ rustPlatform.buildRustPackage rec { PROTOC = "${protobuf}/bin/protoc"; PROTOC_INCLUDE = "${protobuf}/include"; - nativeBuildInputs = [ protobuf ]; + nativeBuildInputs = [ protobuf rustfmt ]; passthru.updateScript = ./update.sh; diff --git a/pkgs/servers/web-apps/snipe-it/default.nix b/pkgs/servers/web-apps/snipe-it/default.nix index 3e3ac6fde11b7..02a1ff30d8f9a 100644 --- a/pkgs/servers/web-apps/snipe-it/default.nix +++ b/pkgs/servers/web-apps/snipe-it/default.nix @@ -18,13 +18,13 @@ let in package.override rec { pname = "snipe-it"; - version = "6.0.4"; + version = "6.0.5"; src = fetchFromGitHub { owner = "snipe"; repo = pname; rev = "v${version}"; - sha256 = "06h8rnk8q85f0z0a1q0j010kzs4z2k5sxvi06avk7ndpkrisv4wz"; + sha256 = "15dp8y0kdjg9x4iwa5ha5w4qbwwsdg5z8337rmkkla2yjmf4lrxb"; }; meta = with lib; { diff --git a/pkgs/shells/fish/plugins/fzf-fish.nix b/pkgs/shells/fish/plugins/fzf-fish.nix index 374e4db4bb223..a4a4e319c6bbe 100644 --- a/pkgs/shells/fish/plugins/fzf-fish.nix +++ b/pkgs/shells/fish/plugins/fzf-fish.nix @@ -2,13 +2,13 @@ buildFishPlugin rec { pname = "fzf.fish"; - version = "8.3"; + version = "9.0"; src = fetchFromGitHub { owner = "PatrickF1"; repo = "fzf.fish"; rev = "v${version}"; - sha256 = "sha256-eSNUqvKXTxcuvICxo8BmVWL1ESXQuU7VhOl7aONrhwM="; + sha256 = "sha256-0rnd8oJzLw8x/U7OLqoOMQpK81gRc7DTxZRSHxN9YlM="; }; checkInputs = [ fzf fd util-linux ]; diff --git a/pkgs/shells/oh/default.nix b/pkgs/shells/oh/default.nix index 68f34fe8eb170..e9a09c8c28880 100644 --- a/pkgs/shells/oh/default.nix +++ b/pkgs/shells/oh/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "oh"; - version = "0.8.0"; + version = "0.8.1"; src = fetchFromGitHub { owner = "michaelmacinnis"; repo = pname; rev = "v${version}"; - sha256 = "0sdpk77i5mfamkdqldybl9znzz92hqgi4xvby5j28m0a5gw46kj0"; + sha256 = "sha256-DMxC5fv5ZLDv7gMajC/eyJd2YpO+OXFdvwAPYotnczw="; }; - vendorSha256 = "12vlvh37hvi8c1i9arppm5wj4v9c98s7myxra10q6qpdqssgc8a0"; + vendorSha256 = "sha256-f4rqXOu6yXUzNsseSaV9pb8c2KXItYOalB5pfH3Acnc="; meta = with lib; { homepage = "https://github.com/michaelmacinnis/oh"; diff --git a/pkgs/tools/X11/focus/default.nix b/pkgs/tools/X11/focus/default.nix new file mode 100644 index 0000000000000..20c7e2e25d90a --- /dev/null +++ b/pkgs/tools/X11/focus/default.nix @@ -0,0 +1,34 @@ +{ lib +, stdenv +, fetchFromGitHub +, libX11 +, libXinerama +}: + +stdenv.mkDerivation rec { + pname = "focus"; + version = "unstable-2021-02-23"; + + src = fetchFromGitHub { + owner = "phillbush"; + repo = "focus"; + rev = "fed2fdbd3f73b192882d97aeb5b1cea681bb7d85"; + sha256 = "sha256-IDiUXindzv5Ng5oCTyUlj2il/2kLvXG4YhgiYp7ZebQ="; + }; + + buildInputs = [ libX11 libXinerama ]; + + makeFlags = [ "PREFIX=\${out}" ]; + + meta = with lib; { + description = "Focus window, workspace or monitor by direction or cycle through them"; + longDescription = '' + A collection of utilities that change the focus of windows, workspaces or + monitors. + ''; + homepage = "https://github.com/phillbush/focus"; + license = licenses.publicDomain; + maintainers = with maintainers; [ azahi ]; + platforms = platforms.unix; + }; +} diff --git a/pkgs/tools/X11/pmenu/default.nix b/pkgs/tools/X11/pmenu/default.nix new file mode 100644 index 0000000000000..7de509a299c58 --- /dev/null +++ b/pkgs/tools/X11/pmenu/default.nix @@ -0,0 +1,60 @@ +{ lib +, stdenv +, fetchFromGitHub +, writeText +, fontconfig +, imlib2 +, libX11 +, libXext +, libXft +, libXinerama +, libXrender +, conf ? null +}: + +stdenv.mkDerivation rec { + pname = "pmenu"; + version = "3.0.1"; + + src = fetchFromGitHub { + owner = "phillbush"; + repo = "pmenu"; + rev = "v${version}"; + sha256 = "sha256-xeOiJEOPz5QEMlWP6bWhTjmj4tfNqh3rsEVmnKvrKuM="; + }; + + buildInputs = [ + fontconfig + imlib2 + libX11 + libXext + libXft + libXinerama + libXrender + ]; + + postPatch = let + configFile = + if lib.isDerivation conf || builtins.isPath conf + then conf else writeText "config.h" conf; + in + lib.optionalString (conf != null) "mv ${configFile} config.h"; + + makeFlags = [ + "INSTALL=install" + "PREFIX=\${out}" + ]; + + meta = with lib; { + description = "A pie-menu tool"; + longDescription = '' + πmenu is a pie menu utility for X. πmenu receives a menu specification in + stdin, shows a menu for the user to select one of the options, and outputs + the option selected to stdout. + ''; + homepage = "https://github.com/phillbush/pmenu"; + license = licenses.mit; + maintainers = with maintainers; [ azahi ]; + platforms = platforms.unix; + }; +} diff --git a/pkgs/tools/X11/xmcp/default.nix b/pkgs/tools/X11/xmcp/default.nix new file mode 100644 index 0000000000000..178861d637246 --- /dev/null +++ b/pkgs/tools/X11/xmcp/default.nix @@ -0,0 +1,33 @@ +{ lib +, stdenv +, fetchFromGitHub +, libX11 +}: + +stdenv.mkDerivation rec { + pname = "xmcp"; + version = "unstable-2020-10-10"; + + src = fetchFromGitHub { + owner = "blblapco"; + repo = "xmcp"; + rev = "ee56225f1665f9edc04fe5c165809f2fe160a420"; + sha256 = "sha256-B3YkYrVEg6UJ2ApaVook4N2XvrCboxDMUG5CN9I79Sg="; + }; + + buildInputs = [ libX11 ]; + + installPhase = '' + runHook preInstall + install -Dm0755 xmcp $out/bin/xmcp + runHook postInstall + ''; + + meta = with lib; { + description = "Tiny color picker for X11"; + homepage = "https://github.com/blblapco/xmcp"; + license = licenses.gpl3Plus; + maintainers = with maintainers; [ azahi ]; + platforms = platforms.linux; + }; +} diff --git a/pkgs/tools/admin/aliyun-cli/default.nix b/pkgs/tools/admin/aliyun-cli/default.nix index e2359bd5e117a..b18b8a82088ee 100644 --- a/pkgs/tools/admin/aliyun-cli/default.nix +++ b/pkgs/tools/admin/aliyun-cli/default.nix @@ -2,17 +2,17 @@ buildGoModule rec { pname = "aliyun-cli"; - version = "3.0.121"; + version = "3.0.123"; src = fetchFromGitHub { rev = "v${version}"; owner = "aliyun"; repo = pname; fetchSubmodules = true; - sha256 = "sha256-1D1JZZ/KMC4oZRaYvWpUazTk7llvX5WHPBxWEGCiKrI="; + sha256 = "sha256-68u31s7SsRRT9OQpTqlhAs5Dx+ggbTTSeKYBByiqn6g="; }; - vendorSha256 = "sha256-f3GXkAvTe8rPFWCR5TM4mDK/VOQWt2lrZrfJ/Wvw8Uc="; + vendorSha256 = "sha256-X5r89aI7UdVlzEJi8zaOzwTETwb+XH8dKO6rVe//FNs="; subPackages = [ "main" ]; diff --git a/pkgs/tools/admin/awsrm/default.nix b/pkgs/tools/admin/awsrm/default.nix new file mode 100644 index 0000000000000..e01f16267a2e7 --- /dev/null +++ b/pkgs/tools/admin/awsrm/default.nix @@ -0,0 +1,28 @@ +{ lib, buildGoModule, fetchFromGitHub }: + +buildGoModule rec { + pname = "awsrm"; + version = "0.4.0"; + + src = fetchFromGitHub { + owner = "jckuester"; + repo = pname; + rev = "v${version}"; + sha256 = "sha256-KAujqYDtZbCBRO5WK9b9mxqe84ZllbBoO2tLnDH/bdo="; + }; + + vendorSha256 = "sha256-CldEAeiFH7gdFNLbIe/oTzs8Pdnde7EqLr7vP7SMDGU="; + + ldflags = + let t = "github.com/jckuester/awsrm/internal"; + in [ "-s" "-w" "-X ${t}.version=${version}" "-X ${t}.commit=${src.rev}" "-X ${t}.date=unknown" ]; + + doCheck = false; + + meta = with lib; { + description = "A remove command for AWS resources"; + homepage = "https://github.com/jckuester/awsrm"; + license = licenses.mit; + maintainers = [ maintainers.markus1189 ]; + }; +} diff --git a/pkgs/tools/admin/boulder/default.nix b/pkgs/tools/admin/boulder/default.nix index 6de6ae6c02022..e953248b26fa5 100644 --- a/pkgs/tools/admin/boulder/default.nix +++ b/pkgs/tools/admin/boulder/default.nix @@ -1,18 +1,19 @@ -{ lib +{ stdenv +, lib , buildGoModule , fetchFromGitHub }: buildGoModule rec { pname = "boulder"; - version = "release-2022-05-31"; - rev = "99dcb9a5b31be576a55e33184581c942421bc172"; + version = "2022-06-21"; + rev = "09f87bb31a57f9a04932b7175fab1e3cabffd86f"; src = fetchFromGitHub { owner = "letsencrypt"; repo = "boulder"; - rev = version; - sha256 = "sha256-x1Vf8agwVTgSkDVEdAnG3div+MzRsMi96jKJRc2s8Ks="; + rev = "release-${version}"; + sha256 = "sha256-Q5fMM3UXMFqmpJks1xnINeKBA7dDam4bfczO3D43Yoo="; }; vendorSha256 = null; @@ -47,5 +48,6 @@ buildGoModule rec { ''; license = licenses.mpl20; maintainers = with maintainers; [ azahi ]; + broken = stdenv.isDarwin; }; } diff --git a/pkgs/tools/admin/chamber/default.nix b/pkgs/tools/admin/chamber/default.nix index 25b3048199518..fff2343cf21de 100644 --- a/pkgs/tools/admin/chamber/default.nix +++ b/pkgs/tools/admin/chamber/default.nix @@ -2,18 +2,18 @@ buildGoModule rec { pname = "chamber"; - version = "2.10.10"; + version = "2.10.12"; src = fetchFromGitHub { owner = "segmentio"; repo = pname; rev = "v${version}"; - sha256 = "sha256-W/yuCQ1kE300//if/H73ZEJh/r2vttJ0GotZkBZNM+4="; + sha256 = "sha256-KbKOaUwJEy/mT59yW0VhZ3MIWkXarCRY8cyNlaI51mQ="; }; CGO_ENABLED = 0; - vendorSha256 = "sha256-XpLLolxWu9aMp1cyG4dUQk4YtknbIRMmBUdSeyY4PNk="; + vendorSha256 = "sha256-ENsKm3D3URCrRUiqqebkgFS//2h9SlLbAQHdjisdGlE="; ldflags = [ "-s" "-w" "-X main.Version=v${version}" ]; diff --git a/pkgs/tools/admin/chkservice/default.nix b/pkgs/tools/admin/chkservice/default.nix new file mode 100644 index 0000000000000..949a65290d226 --- /dev/null +++ b/pkgs/tools/admin/chkservice/default.nix @@ -0,0 +1,37 @@ +{ stdenv, fetchFromGitHub, cmake, ninja, pkg-config, systemd, ncurses, lib }: + +stdenv.mkDerivation rec { + pname = "chkservice"; + version = "0.3"; + + src = fetchFromGitHub { + owner = "linuxenko"; + repo = "chkservice"; + rev = version; + hash = "sha256:0dfvm62h6dwg18f17fn58nr09mfh6kylm8wy88j00fiy13l4wnb6"; + }; + + # Tools needed during build time + nativeBuildInputs = [ + cmake + # Makes the build faster, adds less than half a megabyte to the build + # dependencies + ninja + pkg-config + ]; + + buildInputs = [ + systemd + ncurses + ]; + + hardeningDisable = [ "format" ]; + + meta = { + description = "chkservice is a tool for managing systemd units in terminal."; + platforms = lib.platforms.all; + maintainers = with lib.maintainers; [ infinisil ]; + license = lib.licenses.gpl3Plus; + homepage = "https://github.com/linuxenko/chkservice"; + }; +} diff --git a/pkgs/tools/admin/docker-credential-gcr/default.nix b/pkgs/tools/admin/docker-credential-gcr/default.nix index a3cd4b9b5149c..02d75ac629c87 100644 --- a/pkgs/tools/admin/docker-credential-gcr/default.nix +++ b/pkgs/tools/admin/docker-credential-gcr/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "docker-credential-gcr"; - version = "2.1.4"; + version = "2.1.5"; src = fetchFromGitHub { owner = "GoogleCloudPlatform"; repo = "docker-credential-gcr"; rev = "v${version}"; - sha256 = "sha256-1AUs8Gt2Qw8BJk2zwRcazVl+POkPSy9e1jW9Mk/0rx8="; + sha256 = "sha256-NUFSnegLVGNUc6f/WSyIk1U6UQorxRykqojhgE/maw8="; }; patches = [ diff --git a/pkgs/tools/admin/eksctl/default.nix b/pkgs/tools/admin/eksctl/default.nix index cc2cffa82b2a1..8448b24e59913 100644 --- a/pkgs/tools/admin/eksctl/default.nix +++ b/pkgs/tools/admin/eksctl/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "eksctl"; - version = "0.99.0"; + version = "0.104.0"; src = fetchFromGitHub { owner = "weaveworks"; repo = pname; rev = version; - sha256 = "sha256-J2d3Uyc/gYciQaZJnOw0piO90ixtqgdnC0gprIoWmvs="; + sha256 = "sha256-s/7RoFVf7mejPsMz6lMBHDGG8+N1KBMzUesXu9MPrzo="; }; - vendorSha256 = "sha256-sRtFfJ7umVK8ruCpZ7TcTVcY9gr3Fldcf3KEdmbgkX4="; + vendorSha256 = "sha256-mwQahKRHR9cy2Yb4IGCIRtA0j38QJoPKNtpS/T4ndC4="; doCheck = false; diff --git a/pkgs/tools/admin/lxd/default.nix b/pkgs/tools/admin/lxd/default.nix index 5198f79a7f188..d664cdd50860d 100644 --- a/pkgs/tools/admin/lxd/default.nix +++ b/pkgs/tools/admin/lxd/default.nix @@ -1,4 +1,4 @@ -{ lib, hwdata, pkg-config, lxc, buildGo118Package, fetchurl, fetchpatch +{ lib, hwdata, pkg-config, lxc, buildGo118Package, fetchurl , makeWrapper, acl, rsync, gnutar, xz, btrfs-progs, gzip, dnsmasq, attr , squashfsTools, iproute2, iptables, libcap , dqlite, raft-canonical, sqlite-replication, udev @@ -11,7 +11,7 @@ buildGo118Package rec { pname = "lxd"; - version = "5.2"; + version = "5.3"; goPackagePath = "github.com/lxc/lxd"; @@ -20,7 +20,7 @@ buildGo118Package rec { "https://linuxcontainers.org/downloads/lxd/lxd-${version}.tar.gz" "https://github.com/lxc/lxd/releases/download/lxd-${version}/lxd-${version}.tar.gz" ]; - sha256 = "sha256-4i0rNKGEjTOyCAsrHII1WvttNv3+SeZ/RLN0ntvALkw="; + sha256 = "sha256-DRdKCfp0nL3lg5O/Wm7vX2grO/DBuyhHRi85XI5laZU="; }; postPatch = '' @@ -60,6 +60,7 @@ buildGo118Package rec { meta = with lib; { description = "Daemon based on liblxc offering a REST API to manage containers"; homepage = "https://linuxcontainers.org/lxd/"; + changelog = "https://github.com/lxc/lxd/releases/tag/lxd-${version}"; license = licenses.asl20; maintainers = with maintainers; [ fpletz marsam ]; platforms = platforms.linux; diff --git a/pkgs/tools/admin/nomachine-client/default.nix b/pkgs/tools/admin/nomachine-client/default.nix index 7e8ff1d087575..d0ed40c7d059d 100644 --- a/pkgs/tools/admin/nomachine-client/default.nix +++ b/pkgs/tools/admin/nomachine-client/default.nix @@ -1,8 +1,8 @@ { lib, stdenv, file, fetchurl, makeWrapper, autoPatchelfHook, jsoncpp, libpulseaudio }: let - versionMajor = "7.9"; - versionMinor = "2"; + versionMajor = "7.10"; + versionMinor = "1"; versionBuild_x86_64 = "1"; versionBuild_i686 = "1"; in @@ -14,12 +14,12 @@ in if stdenv.hostPlatform.system == "x86_64-linux" then fetchurl { url = "https://download.nomachine.com/download/${versionMajor}/Linux/nomachine_${version}_${versionBuild_x86_64}_x86_64.tar.gz"; - sha256 = "sha256-Gsi0Hj6cfpxzr0zbWfsq0ZJvCPATQn9YvHbx0Cziia4="; + sha256 = "sha256-alClFaNbQ76r8LukbygesWWXA5rx6VEzxK+bY5tOfO0="; } else if stdenv.hostPlatform.system == "i686-linux" then fetchurl { url = "https://download.nomachine.com/download/${versionMajor}/Linux/nomachine_${version}_${versionBuild_i686}_i686.tar.gz"; - sha256 = "sha256-zmXOLzFePAD+oH00bAkNsEFviQwkjjqC/gAv87E1qX4="; + sha256 = "sha256-UDvrjb/2rXvSvpiA+UwiVi4YyXhFLNiEtrszqjAPGXc="; } else throw "NoMachine client is not supported on ${stdenv.hostPlatform.system}"; diff --git a/pkgs/tools/admin/syft/default.nix b/pkgs/tools/admin/syft/default.nix index 73c2553ba71b6..6895129363952 100644 --- a/pkgs/tools/admin/syft/default.nix +++ b/pkgs/tools/admin/syft/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "syft"; - version = "0.46.3"; + version = "0.49.0"; src = fetchFromGitHub { owner = "anchore"; repo = pname; rev = "v${version}"; - sha256 = "sha256-4Yo9CIAVEOtAvsvGzSXerTwCbvylo7MjwJwWU6uJAX8="; + sha256 = "sha256-VsiQa3W/5eG5/U4sGRvYPa0MDYrayXIJtbutPnH/vUI="; # populate values that require us to use git. By doing this in postFetch we # can delete .git afterwards and maintain better reproducibility of the src. leaveDotGit = true; @@ -20,7 +20,7 @@ buildGoModule rec { find "$out" -name .git -print0 | xargs -0 rm -rf ''; }; - vendorSha256 = "sha256-K4bPldGOQVkmAavEbVxMjOhiHgfSrNpQ2ljFLqyceCw="; + vendorSha256 = "sha256-NENKogPlp6upMkRULnkkqMep9U7cI+CR+6TDF38T2vk="; nativeBuildInputs = [ installShellFiles ]; diff --git a/pkgs/tools/admin/trinsic-cli/default.nix b/pkgs/tools/admin/trinsic-cli/default.nix index d6e6d6f100c56..907516ce3655b 100644 --- a/pkgs/tools/admin/trinsic-cli/default.nix +++ b/pkgs/tools/admin/trinsic-cli/default.nix @@ -2,11 +2,11 @@ rustPlatform.buildRustPackage rec { pname = "trinsic-cli"; - version = "1.4.0"; + version = "1.5.0"; src = fetchurl { url = "https://github.com/trinsic-id/sdk/releases/download/v${version}/trinsic-cli-vendor-${version}.tar.gz"; - sha256 = "sha256-Dxmjbd1Q2JNeET22Fte7bygd+oH3ZfovRTJh5xforuw="; + sha256 = "sha256-Z9orGhxbu/ehyaYhY35lYWcZQWNVk+zLSoqwAZwnpLY="; }; cargoVendorDir = "vendor"; diff --git a/pkgs/tools/archivers/7zz/default.nix b/pkgs/tools/archivers/7zz/default.nix index b734232ca053f..4f41a09304fb8 100644 --- a/pkgs/tools/archivers/7zz/default.nix +++ b/pkgs/tools/archivers/7zz/default.nix @@ -26,13 +26,13 @@ let in stdenv.mkDerivation rec { pname = "7zz"; - version = "21.07"; + version = "22.00"; src = fetchurl { url = "https://7-zip.org/a/7z${lib.replaceStrings [ "." ] [ "" ] version}-src.tar.xz"; - sha256 = { - free = "sha256-SMM6kQ6AZ05s4miJjMoE4NnsXQ0tlkdWx0q2HKjhaM8="; - unfree = "sha256-IT1ZRAfLjvy6NmELFSykkh7aFBYzELQ5A9E+aDE+Hjk="; + hash = { + free = "sha256-QzGZgPxHobGwstFfVRtb4V+hqMM7dMIy2/EZcJ2aZe8="; + unfree = "sha256-QJafYB6Gr/Saqgug31zm/Tl89+JoOoS1kbAIHkYe9nU="; }.${if enableUnfree then "unfree" else "free"}; downloadToTemp = (!enableUnfree); # remove the unRAR related code from the src drv diff --git a/pkgs/tools/archivers/unrar/default.nix b/pkgs/tools/archivers/unrar/default.nix index b988a135e4548..16756bf91fbe1 100644 --- a/pkgs/tools/archivers/unrar/default.nix +++ b/pkgs/tools/archivers/unrar/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "unrar"; - version = "6.1.6"; + version = "6.1.7"; src = fetchurl { url = "https://www.rarlab.com/rar/unrarsrc-${version}.tar.gz"; - sha256 = "sha256-Z/SriRwGIhjCut+qycjKtci/1eltq/ylbI+qPSCagB0="; + hash = "sha256-3nW2E2lYFz/fxTDTigFFtyNCzw04Qr97sSDTNmAtiO0="; }; postPatch = '' diff --git a/pkgs/tools/backup/borgmatic/default.nix b/pkgs/tools/backup/borgmatic/default.nix index 904e64704c90a..a63cdcda7cb8a 100644 --- a/pkgs/tools/backup/borgmatic/default.nix +++ b/pkgs/tools/backup/borgmatic/default.nix @@ -2,11 +2,11 @@ python3Packages.buildPythonApplication rec { pname = "borgmatic"; - version = "1.5.18"; + version = "1.6.4"; src = python3Packages.fetchPypi { inherit pname version; - sha256 = "sha256-dX1U1zza8zMhDiTLE+DgtN6RLRciLks4NDOukpKH/po="; + sha256 = "sha256-2kQ+KO69RxpIQkrkD6n7l9ti9ITwdpHYK7LuXYUo3ck="; }; checkInputs = with python3Packages; [ flexmock pytestCheckHook pytest-cov ]; diff --git a/pkgs/tools/backup/dar/default.nix b/pkgs/tools/backup/dar/default.nix index 92642973d45b3..f4f2a2630098e 100644 --- a/pkgs/tools/backup/dar/default.nix +++ b/pkgs/tools/backup/dar/default.nix @@ -9,12 +9,12 @@ with lib; stdenv.mkDerivation rec { - version = "2.7.5"; + version = "2.7.6"; pname = "dar"; src = fetchurl { url = "mirror://sourceforge/dar/${pname}-${version}.tar.gz"; - sha256 = "sha256-lfpJOomadV/oTJsOloH1rYF5Wy3kVr+EBUvqZ+xaCWY="; + sha256 = "sha256-PV5ESJE1B2gQnX6QUeJgOb3rkG3jApTn4NcRBbh9bao="; }; outputs = [ "out" "dev" ]; diff --git a/pkgs/tools/backup/duplicity/default.nix b/pkgs/tools/backup/duplicity/default.nix index 95e29686f24e6..46f841c8f5b3b 100644 --- a/pkgs/tools/backup/duplicity/default.nix +++ b/pkgs/tools/backup/duplicity/default.nix @@ -70,7 +70,6 @@ pythonPackages.buildPythonApplication rec { pythonPath = with pythonPackages; [ b2sdk - boto boto3 cffi cryptography diff --git a/pkgs/tools/backup/rsbep/default.nix b/pkgs/tools/backup/rsbep/default.nix index 7f59b0af94448..b30ddddb2b07f 100644 --- a/pkgs/tools/backup/rsbep/default.nix +++ b/pkgs/tools/backup/rsbep/default.nix @@ -41,6 +41,6 @@ stdenv.mkDerivation rec { description = "Create resilient backups with Reed-Solomon error correction and byte-spreading"; homepage = "https://www.thanassis.space/rsbep.html"; license = licenses.gpl3Plus; - maintainers = [ maintainers.earvstedt ]; + maintainers = [ maintainers.erikarvstedt ]; }; } diff --git a/pkgs/tools/backup/zfsbackup/default.nix b/pkgs/tools/backup/zfsbackup/default.nix index ff47ce47edef1..332ad619a431d 100644 --- a/pkgs/tools/backup/zfsbackup/default.nix +++ b/pkgs/tools/backup/zfsbackup/default.nix @@ -1,26 +1,34 @@ -{ lib, buildGoPackage, fetchFromGitHub }: +{ lib +, buildGoModule +, fetchFromGitHub +, zfs +}: -buildGoPackage rec { +buildGoModule rec { pname = "zfsbackup"; - version = "unstable-2020-09-30"; - rev = "092f80846b23e02f99d2aa72d9d889eabfdcb053"; - - goPackagePath = "github.com/someone1/zfsbackup-go"; + version = "unstable-2021-05-26"; + rev = "2d4534b920d3c57552667e1c6da9978b3a9278f0"; src = fetchFromGitHub { owner = "someone1"; repo = "zfsbackup-go"; inherit rev; - sha256 = "1xiacaf4r9jkx0m8wjfis14cq622yhljldwkflh9ni3khax7dlgi"; + sha256 = "sha256-slVwXXGLvq+eAlqzD8p1fnc17CGUBY0Z68SURBBuf2k="; }; - goDeps = ./deps.nix; + vendorSha256 = "sha256-jpxp8RKDBrkBBaY89QnKYGWFI/DUURUVX8cPJ/qoLrg="; + + ldflags = [ "-w" "-s" ]; + + # Tests require loading the zfs kernel module. + doCheck = false; meta = with lib; { description = "Backup ZFS snapshots to cloud storage such as Google, Amazon, Azure, etc"; homepage = "https://github.com/someone1/zfsbackup-go"; license = licenses.mit; - maintainers = [ maintainers.xfix ]; + maintainers = with maintainers; [ xfix ]; + platforms = platforms.linux; mainProgram = "zfsbackup-go"; }; } diff --git a/pkgs/tools/backup/zfsbackup/deps.nix b/pkgs/tools/backup/zfsbackup/deps.nix deleted file mode 100644 index 28be9fa141cf9..0000000000000 --- a/pkgs/tools/backup/zfsbackup/deps.nix +++ /dev/null @@ -1,1326 +0,0 @@ -# file generated from go.mod using vgo2nix (https://github.com/adisbladis/vgo2nix) -[ - { - goPackagePath = "cloud.google.com/go"; - fetch = { - type = "git"; - url = "https://github.com/googleapis/google-cloud-go"; - rev = "v0.57.0"; - sha256 = "0lcq68h0x56qb14yx2df584ad0g9s1s19py813dy9nzqp0bmjig8"; - }; - } - { - goPackagePath = "dmitri.shuralyov.com/gpu/mtl"; - fetch = { - type = "git"; - url = "https://dmitri.shuralyov.com/gpu/mtl"; - rev = "666a987793e9"; - sha256 = "1isd03hgiwcf2ld1rlp0plrnfz7r4i7c5q4kb6hkcd22axnmrv0z"; - }; - } - { - goPackagePath = "github.com/Azure/azure-pipeline-go"; - fetch = { - type = "git"; - url = "https://github.com/Azure/azure-pipeline-go"; - rev = "v0.2.2"; - sha256 = "1agn2nzmm1dkwggm4w7h4bnrav4n5jrl0vqbqy2s49vqlr8zirn6"; - }; - } - { - goPackagePath = "github.com/Azure/azure-sdk-for-go"; - fetch = { - type = "git"; - url = "https://github.com/Azure/azure-sdk-for-go"; - rev = "v42.3.0"; - sha256 = "1nqxpifrr8n17irkfzhx253b17cwd15x4vfqxx80l5y7dn0jqavq"; - }; - } - { - goPackagePath = "github.com/Azure/azure-storage-blob-go"; - fetch = { - type = "git"; - url = "https://github.com/Azure/azure-storage-blob-go"; - rev = "v0.8.0"; - sha256 = "00gsnk9s1rlrakqvcm917hn4r47jannxwp7rkhrb71pamzm46752"; - }; - } - { - goPackagePath = "github.com/BurntSushi/toml"; - fetch = { - type = "git"; - url = "https://github.com/BurntSushi/toml"; - rev = "v0.3.1"; - sha256 = "1fjdwwfzyzllgiwydknf1pwjvy49qxfsczqx5gz3y0izs7as99j6"; - }; - } - { - goPackagePath = "github.com/BurntSushi/xgb"; - fetch = { - type = "git"; - url = "https://github.com/BurntSushi/xgb"; - rev = "27f122750802"; - sha256 = "18lp2x8f5bljvlz0r7xn744f0c9rywjsb9ifiszqqdcpwhsa0kvj"; - }; - } - { - goPackagePath = "github.com/OneOfOne/xxhash"; - fetch = { - type = "git"; - url = "https://github.com/OneOfOne/xxhash"; - rev = "v1.2.2"; - sha256 = "1mjfhrwhvxa48rycjnqpqzm521i38h1hdyz6pdwmhd7xb8j6gwi6"; - }; - } - { - goPackagePath = "github.com/alecthomas/template"; - fetch = { - type = "git"; - url = "https://github.com/alecthomas/template"; - rev = "a0175ee3bccc"; - sha256 = "0qjgvvh26vk1cyfq9fadyhfgdj36f1iapbmr5xp6zqipldz8ffxj"; - }; - } - { - goPackagePath = "github.com/alecthomas/units"; - fetch = { - type = "git"; - url = "https://github.com/alecthomas/units"; - rev = "2efee857e7cf"; - sha256 = "1j65b91qb9sbrml9cpabfrcf07wmgzzghrl7809hjjhrmbzri5bl"; - }; - } - { - goPackagePath = "github.com/armon/consul-api"; - fetch = { - type = "git"; - url = "https://github.com/armon/consul-api"; - rev = "eb2c6b5be1b6"; - sha256 = "1j6fdr1sg36qy4n4xjl7brq739fpm5npq98cmvklzjc9qrx98nk9"; - }; - } - { - goPackagePath = "github.com/aws/aws-sdk-go"; - fetch = { - type = "git"; - url = "https://github.com/aws/aws-sdk-go"; - rev = "v1.31.4"; - sha256 = "07ia78j6j2y139iq9x5gin0fwc77wv8x0zhg47kibykxn4iyx85y"; - }; - } - { - goPackagePath = "github.com/beorn7/perks"; - fetch = { - type = "git"; - url = "https://github.com/beorn7/perks"; - rev = "v1.0.0"; - sha256 = "1i1nz1f6g55xi2y3aiaz5kqfgvknarbfl4f0sx4nyyb4s7xb1z9x"; - }; - } - { - goPackagePath = "github.com/cenkalti/backoff"; - fetch = { - type = "git"; - url = "https://github.com/cenkalti/backoff"; - rev = "v2.2.1"; - sha256 = "1mf4lsl3rbb8kk42x0mrhzzy4ikqy0jf6nxpzhkr02rdgwh6rjk8"; - }; - } - { - goPackagePath = "github.com/census-instrumentation/opencensus-proto"; - fetch = { - type = "git"; - url = "https://github.com/census-instrumentation/opencensus-proto"; - rev = "v0.2.1"; - sha256 = "19fcx3sc99i5dsklny6r073z5j20vlwn2xqm6di1q3b1xwchzqfj"; - }; - } - { - goPackagePath = "github.com/cespare/xxhash"; - fetch = { - type = "git"; - url = "https://github.com/cespare/xxhash"; - rev = "v1.1.0"; - sha256 = "1qyzlcdcayavfazvi03izx83fvip8h36kis44zr2sg7xf6sx6l4x"; - }; - } - { - goPackagePath = "github.com/chzyer/logex"; - fetch = { - type = "git"; - url = "https://github.com/chzyer/logex"; - rev = "v1.1.10"; - sha256 = "08pbjj3wx9acavlwyr055isa8a5hnmllgdv5k6ra60l5y1brmlq4"; - }; - } - { - goPackagePath = "github.com/chzyer/readline"; - fetch = { - type = "git"; - url = "https://github.com/chzyer/readline"; - rev = "2972be24d48e"; - sha256 = "104q8dazj8yf6b089jjr82fy9h1g80zyyzvp3g8b44a7d8ngjj6r"; - }; - } - { - goPackagePath = "github.com/chzyer/test"; - fetch = { - type = "git"; - url = "https://github.com/chzyer/test"; - rev = "a1ea475d72b1"; - sha256 = "0rns2aqk22i9xsgyap0pq8wi4cfaxsri4d9q6xxhhyma8jjsnj2k"; - }; - } - { - goPackagePath = "github.com/client9/misspell"; - fetch = { - type = "git"; - url = "https://github.com/client9/misspell"; - rev = "v0.3.4"; - sha256 = "1vwf33wsc4la25zk9nylpbp9px3svlmldkm0bha4hp56jws4q9cs"; - }; - } - { - goPackagePath = "github.com/cncf/udpa"; - fetch = { - type = "git"; - url = "https://github.com/cncf/udpa"; - rev = "269d4d468f6f"; - sha256 = "0i1jiaw2k3hlwwmg4hap81vb4s1p25xp9kdfww37v0fbgjariccs"; - }; - } - { - goPackagePath = "github.com/coreos/bbolt"; - fetch = { - type = "git"; - url = "https://github.com/coreos/bbolt"; - rev = "v1.3.2"; - sha256 = "13d5l6p6c5wvkr6vn9hkhz9c593qifn7fgx0hg4d6jcvg1y0bnm2"; - }; - } - { - goPackagePath = "github.com/coreos/etcd"; - fetch = { - type = "git"; - url = "https://github.com/coreos/etcd"; - rev = "v3.3.10"; - sha256 = "1x2ii1hj8jraba8rbxz6dmc03y3sjxdnzipdvg6fywnlq1f3l3wl"; - }; - } - { - goPackagePath = "github.com/coreos/go-semver"; - fetch = { - type = "git"; - url = "https://github.com/coreos/go-semver"; - rev = "v0.2.0"; - sha256 = "1gghi5bnqj50hfxhqc1cxmynqmh2yk9ii7ab9gsm75y5cp94ymk0"; - }; - } - { - goPackagePath = "github.com/coreos/go-systemd"; - fetch = { - type = "git"; - url = "https://github.com/coreos/go-systemd"; - rev = "95778dfbb74e"; - sha256 = "1s3bg9p78wkixn2bqb2p23wbsqfg949ml6crw2b498s71mwh8rcf"; - }; - } - { - goPackagePath = "github.com/coreos/pkg"; - fetch = { - type = "git"; - url = "https://github.com/coreos/pkg"; - rev = "399ea9e2e55f"; - sha256 = "0nxbn0m7lr4dg0yrwnvlkfiyg3ndv8vdpssjx7b714nivpc6ar0y"; - }; - } - { - goPackagePath = "github.com/cpuguy83/go-md2man"; - fetch = { - type = "git"; - url = "https://github.com/cpuguy83/go-md2man"; - rev = "v2.0.0"; - sha256 = "0r1f7v475dxxgzqci1mxfliwadcrk86ippflx9n411325l4g3ghv"; - }; - } - { - goPackagePath = "github.com/davecgh/go-spew"; - fetch = { - type = "git"; - url = "https://github.com/davecgh/go-spew"; - rev = "v1.1.1"; - sha256 = "0hka6hmyvp701adzag2g26cxdj47g21x6jz4sc6jjz1mn59d474y"; - }; - } - { - goPackagePath = "github.com/dgrijalva/jwt-go"; - fetch = { - type = "git"; - url = "https://github.com/dgrijalva/jwt-go"; - rev = "v3.2.0"; - sha256 = "08m27vlms74pfy5z79w67f9lk9zkx6a9jd68k3c4msxy75ry36mp"; - }; - } - { - goPackagePath = "github.com/dgryski/go-sip13"; - fetch = { - type = "git"; - url = "https://github.com/dgryski/go-sip13"; - rev = "e10d5fee7954"; - sha256 = "15fyibfas209ljz3f7g07kdmfbl3hhyd9n5n7aq5n5p9m5mn41d6"; - }; - } - { - goPackagePath = "github.com/dnaeon/go-vcr"; - fetch = { - type = "git"; - url = "https://github.com/dnaeon/go-vcr"; - rev = "v1.0.1"; - sha256 = "1d0kpqr12qrqlamz5a47bp05mx49za2v6l1k7c6z71xahfmb7v2d"; - }; - } - { - goPackagePath = "github.com/dustin/go-humanize"; - fetch = { - type = "git"; - url = "https://github.com/dustin/go-humanize"; - rev = "v1.0.0"; - sha256 = "1kqf1kavdyvjk7f8kx62pnm7fbypn9z1vbf8v2qdh3y7z7a0cbl3"; - }; - } - { - goPackagePath = "github.com/envoyproxy/go-control-plane"; - fetch = { - type = "git"; - url = "https://github.com/envoyproxy/go-control-plane"; - rev = "v0.9.4"; - sha256 = "0m0crzx70lp7vz13v20wxb1fcfdnzp7h3mkh3bn6a8mbfz6w5asj"; - }; - } - { - goPackagePath = "github.com/envoyproxy/protoc-gen-validate"; - fetch = { - type = "git"; - url = "https://github.com/envoyproxy/protoc-gen-validate"; - rev = "v0.1.0"; - sha256 = "0kxd3wwh3xwqk0r684hsy281xq4y71cd11d4q2hspcjbnlbwh7cy"; - }; - } - { - goPackagePath = "github.com/fsnotify/fsnotify"; - fetch = { - type = "git"; - url = "https://github.com/fsnotify/fsnotify"; - rev = "v1.4.7"; - sha256 = "07va9crci0ijlivbb7q57d2rz9h27zgn2fsm60spjsqpdbvyrx4g"; - }; - } - { - goPackagePath = "github.com/ghodss/yaml"; - fetch = { - type = "git"; - url = "https://github.com/ghodss/yaml"; - rev = "v1.0.0"; - sha256 = "0skwmimpy7hlh7pva2slpcplnm912rp3igs98xnqmn859kwa5v8g"; - }; - } - { - goPackagePath = "github.com/go-gl/glfw"; - fetch = { - type = "git"; - url = "https://github.com/go-gl/glfw"; - rev = "6f7a984d4dc4"; - sha256 = "1nyv7h08qf4dp8w9pmcnrc6vv9bkwj8fil6pz0mkbss5hf4i8xcq"; - }; - } - { - goPackagePath = "github.com/go-kit/kit"; - fetch = { - type = "git"; - url = "https://github.com/go-kit/kit"; - rev = "v0.8.0"; - sha256 = "1rcywbc2pvab06qyf8pc2rdfjv7r6kxdv2v4wnpqnjhz225wqvc0"; - }; - } - { - goPackagePath = "github.com/go-logfmt/logfmt"; - fetch = { - type = "git"; - url = "https://github.com/go-logfmt/logfmt"; - rev = "v0.4.0"; - sha256 = "06smxc112xmixz78nyvk3b2hmc7wasf2sl5vxj1xz62kqcq9lzm9"; - }; - } - { - goPackagePath = "github.com/go-sql-driver/mysql"; - fetch = { - type = "git"; - url = "https://github.com/go-sql-driver/mysql"; - rev = "v1.5.0"; - sha256 = "11x0m9yf3kdnf6981182r824psgxwfaqhn3x3in4yiidp0w0hk3v"; - }; - } - { - goPackagePath = "github.com/go-stack/stack"; - fetch = { - type = "git"; - url = "https://github.com/go-stack/stack"; - rev = "v1.8.0"; - sha256 = "0wk25751ryyvxclyp8jdk5c3ar0cmfr8lrjb66qbg4808x66b96v"; - }; - } - { - goPackagePath = "github.com/gogo/protobuf"; - fetch = { - type = "git"; - url = "https://github.com/gogo/protobuf"; - rev = "v1.2.1"; - sha256 = "06yqa6h0kw3gr5pc3qmas7f7435a96zf7iw7p0l00r2hqf6fqq6m"; - }; - } - { - goPackagePath = "github.com/golang/glog"; - fetch = { - type = "git"; - url = "https://github.com/golang/glog"; - rev = "23def4e6c14b"; - sha256 = "0jb2834rw5sykfr937fxi8hxi2zy80sj2bdn9b3jb4b26ksqng30"; - }; - } - { - goPackagePath = "github.com/golang/groupcache"; - fetch = { - type = "git"; - url = "https://github.com/golang/groupcache"; - rev = "8c9f03a8e57e"; - sha256 = "0vjjr79r32icjzlb05wn02k59av7jx0rn1jijml8r4whlg7dnkfh"; - }; - } - { - goPackagePath = "github.com/golang/mock"; - fetch = { - type = "git"; - url = "https://github.com/golang/mock"; - rev = "v1.4.3"; - sha256 = "1p37xnja1dgq5ykx24n7wincwz2gahjh71b95p8vpw7ss2g8j8wx"; - }; - } - { - goPackagePath = "github.com/golang/protobuf"; - fetch = { - type = "git"; - url = "https://github.com/golang/protobuf"; - rev = "v1.4.1"; - sha256 = "0w7ks4vffnnkp0miwgc3chrsnmya45lzvpahb2wmw0jwhdp5kdx7"; - }; - } - { - goPackagePath = "github.com/google/btree"; - fetch = { - type = "git"; - url = "https://github.com/google/btree"; - rev = "v1.0.0"; - sha256 = "0ba430m9fbnagacp57krgidsyrgp3ycw5r7dj71brgp5r52g82p6"; - }; - } - { - goPackagePath = "github.com/google/go-cmp"; - fetch = { - type = "git"; - url = "https://github.com/google/go-cmp"; - rev = "v0.4.0"; - sha256 = "1x5pvl3fb5sbyng7i34431xycnhmx8xx94gq2n19g6p0vz68z2v2"; - }; - } - { - goPackagePath = "github.com/google/martian"; - fetch = { - type = "git"; - url = "https://github.com/google/martian"; - rev = "v2.1.0"; - sha256 = "197hil6vrjk50b9wvwyzf61csid83whsjj6ik8mc9r2lryxlyyrp"; - }; - } - { - goPackagePath = "github.com/google/pprof"; - fetch = { - type = "git"; - url = "https://github.com/google/pprof"; - rev = "fc25d7d30c6d"; - sha256 = "0ba28qx2i1bi6n6x5g670v8hmqavwj8lwl8psnc6vzagmdhjw0vg"; - }; - } - { - goPackagePath = "github.com/google/renameio"; - fetch = { - type = "git"; - url = "https://github.com/google/renameio"; - rev = "v0.1.0"; - sha256 = "1ki2x5a9nrj17sn092d6n4zr29lfg5ydv4xz5cp58z6cw8ip43jx"; - }; - } - { - goPackagePath = "github.com/googleapis/gax-go"; - fetch = { - type = "git"; - url = "https://github.com/googleapis/gax-go"; - rev = "v2.0.5"; - sha256 = "1lxawwngv6miaqd25s3ba0didfzylbwisd2nz7r4gmbmin6jsjrx"; - }; - } - { - goPackagePath = "github.com/gorilla/websocket"; - fetch = { - type = "git"; - url = "https://github.com/gorilla/websocket"; - rev = "v1.4.0"; - sha256 = "00i4vb31nsfkzzk7swvx3i75r2d960js3dri1875vypk3v2s0pzk"; - }; - } - { - goPackagePath = "github.com/grpc-ecosystem/go-grpc-middleware"; - fetch = { - type = "git"; - url = "https://github.com/grpc-ecosystem/go-grpc-middleware"; - rev = "v1.0.0"; - sha256 = "0lwgxih021xfhfb1xb9la5f98bpgpaiz63sbllx77qwwl2rmhrsp"; - }; - } - { - goPackagePath = "github.com/grpc-ecosystem/go-grpc-prometheus"; - fetch = { - type = "git"; - url = "https://github.com/grpc-ecosystem/go-grpc-prometheus"; - rev = "v1.2.0"; - sha256 = "1lzk54h7np32b3acidg1ggbn8ppbnns0m71gcg9d1qkkdh8zrijl"; - }; - } - { - goPackagePath = "github.com/grpc-ecosystem/grpc-gateway"; - fetch = { - type = "git"; - url = "https://github.com/grpc-ecosystem/grpc-gateway"; - rev = "v1.9.0"; - sha256 = "1r4y48c76yxc2hpqszfjirvh7zxjb6z72qmk95li12ar79dhv3dy"; - }; - } - { - goPackagePath = "github.com/hashicorp/golang-lru"; - fetch = { - type = "git"; - url = "https://github.com/hashicorp/golang-lru"; - rev = "v0.5.1"; - sha256 = "13f870cvk161bzjj6x41l45r5x9i1z9r2ymwmvm7768kg08zznpy"; - }; - } - { - goPackagePath = "github.com/hashicorp/hcl"; - fetch = { - type = "git"; - url = "https://github.com/hashicorp/hcl"; - rev = "v1.0.0"; - sha256 = "0q6ml0qqs0yil76mpn4mdx4lp94id8vbv575qm60jzl1ijcl5i66"; - }; - } - { - goPackagePath = "github.com/ianlancetaylor/demangle"; - fetch = { - type = "git"; - url = "https://github.com/ianlancetaylor/demangle"; - rev = "5e5cf60278f6"; - sha256 = "1fhjk11cip9c3jyj1byz9z77n6n2rlxmyz0xjx1zpn1da3cvri75"; - }; - } - { - goPackagePath = "github.com/inconshreveable/mousetrap"; - fetch = { - type = "git"; - url = "https://github.com/inconshreveable/mousetrap"; - rev = "v1.0.0"; - sha256 = "1mn0kg48xkd74brf48qf5hzp0bc6g8cf5a77w895rl3qnlpfw152"; - }; - } - { - goPackagePath = "github.com/jmespath/go-jmespath"; - fetch = { - type = "git"; - url = "https://github.com/jmespath/go-jmespath"; - rev = "v0.3.0"; - sha256 = "12qgp7yb7yfjxhd311kb820fcjmg7gd4hp2fc4v6x8s7121pwnjp"; - }; - } - { - goPackagePath = "github.com/jonboulle/clockwork"; - fetch = { - type = "git"; - url = "https://github.com/jonboulle/clockwork"; - rev = "v0.1.0"; - sha256 = "1pqxhsdavbp1n5grgyx2j6ylvql2fzn2cvpsgkc8li69dil7sibl"; - }; - } - { - goPackagePath = "github.com/jstemmer/go-junit-report"; - fetch = { - type = "git"; - url = "https://github.com/jstemmer/go-junit-report"; - rev = "v0.9.1"; - sha256 = "1knip80yir1cdsjlb3rzy0a4w3kl4ljpiciaz6hjzwqlfhnv7bkw"; - }; - } - { - goPackagePath = "github.com/juju/ratelimit"; - fetch = { - type = "git"; - url = "https://github.com/juju/ratelimit"; - rev = "v1.0.1"; - sha256 = "0ppwvwbh9jdpdk4f9924vw373cpfz5g5ad10c707p22a984vanrz"; - }; - } - { - goPackagePath = "github.com/julienschmidt/httprouter"; - fetch = { - type = "git"; - url = "https://github.com/julienschmidt/httprouter"; - rev = "v1.2.0"; - sha256 = "1k8bylc9s4vpvf5xhqh9h246dl1snxrzzz0614zz88cdh8yzs666"; - }; - } - { - goPackagePath = "github.com/kisielk/errcheck"; - fetch = { - type = "git"; - url = "https://github.com/kisielk/errcheck"; - rev = "v1.1.0"; - sha256 = "19vd4rxmqbk5lpiav3pf7df3yjlz0l0dwx9mn0gjq5f998iyhy6y"; - }; - } - { - goPackagePath = "github.com/kisielk/gotool"; - fetch = { - type = "git"; - url = "https://github.com/kisielk/gotool"; - rev = "v1.0.0"; - sha256 = "14af2pa0ssyp8bp2mvdw184s5wcysk6akil3wzxmr05wwy951iwn"; - }; - } - { - goPackagePath = "github.com/klauspost/compress"; - fetch = { - type = "git"; - url = "https://github.com/klauspost/compress"; - rev = "v1.10.6"; - sha256 = "0jnm5mjazxkjwzb7z6sjlqm2l68z4h4xjhir2lgfkf04rj4l290s"; - }; - } - { - goPackagePath = "github.com/klauspost/pgzip"; - fetch = { - type = "git"; - url = "https://github.com/klauspost/pgzip"; - rev = "v1.2.4"; - sha256 = "0mnhfdn0isbkra455jynqjbmrwymx09shlbzbyvgfycih3nbrif0"; - }; - } - { - goPackagePath = "github.com/konsorten/go-windows-terminal-sequences"; - fetch = { - type = "git"; - url = "https://github.com/konsorten/go-windows-terminal-sequences"; - rev = "v1.0.1"; - sha256 = "1lchgf27n276vma6iyxa0v1xds68n2g8lih5lavqnx5x6q5pw2ip"; - }; - } - { - goPackagePath = "github.com/kr/logfmt"; - fetch = { - type = "git"; - url = "https://github.com/kr/logfmt"; - rev = "b84e30acd515"; - sha256 = "02ldzxgznrfdzvghfraslhgp19la1fczcbzh7wm2zdc6lmpd1qq9"; - }; - } - { - goPackagePath = "github.com/kr/pretty"; - fetch = { - type = "git"; - url = "https://github.com/kr/pretty"; - rev = "v0.1.0"; - sha256 = "18m4pwg2abd0j9cn5v3k2ksk9ig4vlwxmlw9rrglanziv9l967qp"; - }; - } - { - goPackagePath = "github.com/kr/pty"; - fetch = { - type = "git"; - url = "https://github.com/kr/pty"; - rev = "v1.1.1"; - sha256 = "0383f0mb9kqjvncqrfpidsf8y6ns5zlrc91c6a74xpyxjwvzl2y6"; - }; - } - { - goPackagePath = "github.com/kr/text"; - fetch = { - type = "git"; - url = "https://github.com/kr/text"; - rev = "v0.1.0"; - sha256 = "1gm5bsl01apvc84bw06hasawyqm4q84vx1pm32wr9jnd7a8vjgj1"; - }; - } - { - goPackagePath = "github.com/kurin/blazer"; - fetch = { - type = "git"; - url = "https://github.com/kurin/blazer"; - rev = "v0.5.3"; - sha256 = "18jsq7n31ycvaivpvyksbddj82spw4g29w6dx92x2wab2hzbc7ik"; - }; - } - { - goPackagePath = "github.com/magiconair/properties"; - fetch = { - type = "git"; - url = "https://github.com/magiconair/properties"; - rev = "v1.8.0"; - sha256 = "1a10362wv8a8qwb818wygn2z48lgzch940hvpv81hv8gc747ajxn"; - }; - } - { - goPackagePath = "github.com/mattn/go-ieproxy"; - fetch = { - type = "git"; - url = "https://github.com/mattn/go-ieproxy"; - rev = "v0.0.1"; - sha256 = "0x1ijwwp22s20vjbca5ac7y7bx2jp6jizzqa38ks4943q7vi4w09"; - }; - } - { - goPackagePath = "github.com/matttproud/golang_protobuf_extensions"; - fetch = { - type = "git"; - url = "https://github.com/matttproud/golang_protobuf_extensions"; - rev = "v1.0.1"; - sha256 = "1d0c1isd2lk9pnfq2nk0aih356j30k3h1gi2w0ixsivi5csl7jya"; - }; - } - { - goPackagePath = "github.com/miolini/datacounter"; - fetch = { - type = "git"; - url = "https://github.com/miolini/datacounter"; - rev = "v1.0.2"; - sha256 = "0lqhdb9glx65ycjjrqqqpd28zi95qnr2sdz93y6fma0khss46c5f"; - }; - } - { - goPackagePath = "github.com/mitchellh/go-homedir"; - fetch = { - type = "git"; - url = "https://github.com/mitchellh/go-homedir"; - rev = "v1.1.0"; - sha256 = "0ydzkipf28hwj2bfxqmwlww47khyk6d152xax4bnyh60f4lq3nx1"; - }; - } - { - goPackagePath = "github.com/mitchellh/mapstructure"; - fetch = { - type = "git"; - url = "https://github.com/mitchellh/mapstructure"; - rev = "v1.1.2"; - sha256 = "03bpv28jz9zhn4947saqwi328ydj7f6g6pf1m2d4m5zdh5jlfkrr"; - }; - } - { - goPackagePath = "github.com/mwitkow/go-conntrack"; - fetch = { - type = "git"; - url = "https://github.com/mwitkow/go-conntrack"; - rev = "cc309e4a2223"; - sha256 = "0nbrnpk7bkmqg9mzwsxlm0y8m7s9qd9phr1q30qlx2qmdmz7c1mf"; - }; - } - { - goPackagePath = "github.com/nightlyone/lockfile"; - fetch = { - type = "git"; - url = "https://github.com/nightlyone/lockfile"; - rev = "v1.0.0"; - sha256 = "0jzlngank7yaq5pl5mipsfglmalv9x2b9yhqr78w5dmx4hikh7kr"; - }; - } - { - goPackagePath = "github.com/oklog/ulid"; - fetch = { - type = "git"; - url = "https://github.com/oklog/ulid"; - rev = "v1.3.1"; - sha256 = "0hybwyid820n80axrk863k2py93hbqlq6hxhf84ppmz0qd0ys0gq"; - }; - } - { - goPackagePath = "github.com/op/go-logging"; - fetch = { - type = "git"; - url = "https://github.com/op/go-logging"; - rev = "970db520ece7"; - sha256 = "1cpna2x5l071z1vrnk7zipdkka8dzwsjyx7m79xk0lr08rip0kcj"; - }; - } - { - goPackagePath = "github.com/pelletier/go-toml"; - fetch = { - type = "git"; - url = "https://github.com/pelletier/go-toml"; - rev = "v1.2.0"; - sha256 = "1fjzpcjng60mc3a4b2ql5a00d5gah84wj740dabv9kq67mpg8fxy"; - }; - } - { - goPackagePath = "github.com/pkg/errors"; - fetch = { - type = "git"; - url = "https://github.com/pkg/errors"; - rev = "v0.9.1"; - sha256 = "1761pybhc2kqr6v5fm8faj08x9bql8427yqg6vnfv6nhrasx1mwq"; - }; - } - { - goPackagePath = "github.com/pmezard/go-difflib"; - fetch = { - type = "git"; - url = "https://github.com/pmezard/go-difflib"; - rev = "v1.0.0"; - sha256 = "0c1cn55m4rypmscgf0rrb88pn58j3ysvc2d0432dp3c6fqg6cnzw"; - }; - } - { - goPackagePath = "github.com/prometheus/client_golang"; - fetch = { - type = "git"; - url = "https://github.com/prometheus/client_golang"; - rev = "v0.9.3"; - sha256 = "1608rm1y2p3iv8k2x7wyc6hshvpbfkv2k77hy0x870syms1g3g1p"; - }; - } - { - goPackagePath = "github.com/prometheus/client_model"; - fetch = { - type = "git"; - url = "https://github.com/prometheus/client_model"; - rev = "14fe0d1b01d4"; - sha256 = "0zdmk6rbbx39cvfz0r59v2jg5sg9yd02b4pds5n5llgvivi99550"; - }; - } - { - goPackagePath = "github.com/prometheus/common"; - fetch = { - type = "git"; - url = "https://github.com/prometheus/common"; - rev = "v0.4.0"; - sha256 = "00008pczafy982m59n1j31pnp41f4grbc2c40jccp52xg3m5klmr"; - }; - } - { - goPackagePath = "github.com/prometheus/procfs"; - fetch = { - type = "git"; - url = "https://github.com/prometheus/procfs"; - rev = "5867b95ac084"; - sha256 = "1rahdk62ajj4zpfb3mgzjqip773la9fb0m87m7s9a0b39l3fmzvr"; - }; - } - { - goPackagePath = "github.com/prometheus/tsdb"; - fetch = { - type = "git"; - url = "https://github.com/prometheus/tsdb"; - rev = "v0.7.1"; - sha256 = "1c1da8i5byvhh4fp3vqjfb65aaksjskn3ggb8wg9hcfzjrhgpz04"; - }; - } - { - goPackagePath = "github.com/rogpeppe/fastuuid"; - fetch = { - type = "git"; - url = "https://github.com/rogpeppe/fastuuid"; - rev = "6724a57986af"; - sha256 = "12s65phfx6hxj4v0b5kj8akgrbf5mxpa101fyzw03h6hld1f70cz"; - }; - } - { - goPackagePath = "github.com/rogpeppe/go-internal"; - fetch = { - type = "git"; - url = "https://github.com/rogpeppe/go-internal"; - rev = "v1.3.0"; - sha256 = "0mcdh1licgnnahwml9y2iq6xy5x9xmjw5frcnds2s3wpjyqrl216"; - }; - } - { - goPackagePath = "github.com/russross/blackfriday"; - fetch = { - type = "git"; - url = "https://github.com/russross/blackfriday"; - rev = "v2.0.1"; - sha256 = "0nlz7isdd4rgnwzs68499hlwicxz34j2k2a0b8jy0y7ycd2bcr5j"; - }; - } - { - goPackagePath = "github.com/satori/go.uuid"; - fetch = { - type = "git"; - url = "https://github.com/satori/go.uuid"; - rev = "v1.2.0"; - sha256 = "1j4s5pfg2ldm35y8ls8jah4dya2grfnx2drb4jcbjsyrp4cm5yfb"; - }; - } - { - goPackagePath = "github.com/shurcooL/sanitized_anchor_name"; - fetch = { - type = "git"; - url = "https://github.com/shurcooL/sanitized_anchor_name"; - rev = "v1.0.0"; - sha256 = "1gv9p2nr46z80dnfjsklc6zxbgk96349sdsxjz05f3z6wb6m5l8f"; - }; - } - { - goPackagePath = "github.com/sirupsen/logrus"; - fetch = { - type = "git"; - url = "https://github.com/sirupsen/logrus"; - rev = "v1.2.0"; - sha256 = "0r6334x2bls8ddznvzaldx4g88msjjns4mlks95rqrrg7h0ijigg"; - }; - } - { - goPackagePath = "github.com/soheilhy/cmux"; - fetch = { - type = "git"; - url = "https://github.com/soheilhy/cmux"; - rev = "v0.1.4"; - sha256 = "1f736g68d9vwlyfb6g0fxkr0r875369xafk30cz8kaq5niaqwv0h"; - }; - } - { - goPackagePath = "github.com/spaolacci/murmur3"; - fetch = { - type = "git"; - url = "https://github.com/spaolacci/murmur3"; - rev = "f09979ecbc72"; - sha256 = "1lv3zyz3jy2d76bhvvs8svygx66606iygdvwy5cwc0p5z8yghq25"; - }; - } - { - goPackagePath = "github.com/spf13/afero"; - fetch = { - type = "git"; - url = "https://github.com/spf13/afero"; - rev = "v1.1.2"; - sha256 = "0miv4faf5ihjfifb1zv6aia6f6ik7h1s4954kcb8n6ixzhx9ck6k"; - }; - } - { - goPackagePath = "github.com/spf13/cast"; - fetch = { - type = "git"; - url = "https://github.com/spf13/cast"; - rev = "v1.3.0"; - sha256 = "0xq1ffqj8y8h7dcnm0m9lfrh0ga7pssnn2c1dnr09chqbpn4bdc5"; - }; - } - { - goPackagePath = "github.com/spf13/cobra"; - fetch = { - type = "git"; - url = "https://github.com/spf13/cobra"; - rev = "v1.0.0"; - sha256 = "0vbppqqhby302a5ayn0296jqr71qkcd4c9am7wzsk6z71fwdsa7h"; - }; - } - { - goPackagePath = "github.com/spf13/jwalterweatherman"; - fetch = { - type = "git"; - url = "https://github.com/spf13/jwalterweatherman"; - rev = "v1.0.0"; - sha256 = "093fmmvavv84pv4q84hav7ph3fmrq87bvspjj899q0qsx37yvdr8"; - }; - } - { - goPackagePath = "github.com/spf13/pflag"; - fetch = { - type = "git"; - url = "https://github.com/spf13/pflag"; - rev = "v1.0.5"; - sha256 = "0gpmacngd0gpslnbkzi263f5ishigzgh6pbdv9hp092rnjl4nd31"; - }; - } - { - goPackagePath = "github.com/spf13/viper"; - fetch = { - type = "git"; - url = "https://github.com/spf13/viper"; - rev = "v1.4.0"; - sha256 = "1zpzxvn13wpvbblbbn73svaq39zgxfjqhci9d68g3qf309pcfy19"; - }; - } - { - goPackagePath = "github.com/stretchr/objx"; - fetch = { - type = "git"; - url = "https://github.com/stretchr/objx"; - rev = "v0.1.1"; - sha256 = "0iph0qmpyqg4kwv8jsx6a56a7hhqq8swrazv40ycxk9rzr0s8yls"; - }; - } - { - goPackagePath = "github.com/stretchr/testify"; - fetch = { - type = "git"; - url = "https://github.com/stretchr/testify"; - rev = "v1.5.1"; - sha256 = "09r89m1wy4cjv2nps1ykp00qjpi0531r07q3s34hr7m6njk4srkl"; - }; - } - { - goPackagePath = "github.com/tmc/grpc-websocket-proxy"; - fetch = { - type = "git"; - url = "https://github.com/tmc/grpc-websocket-proxy"; - rev = "0ad062ec5ee5"; - sha256 = "1anw4v9wspnw9xf2z5r9w0sszwjklyanl0l85wgg6nxak9gnrqp4"; - }; - } - { - goPackagePath = "github.com/ugorji/go"; - fetch = { - type = "git"; - url = "https://github.com/ugorji/go"; - rev = "v1.1.4"; - sha256 = "0ma2qvn5wqvjidpdz74x832a813qnr1cxbx6n6n125ak9b3wbn5w"; - }; - } - { - goPackagePath = "github.com/xiang90/probing"; - fetch = { - type = "git"; - url = "https://github.com/xiang90/probing"; - rev = "43a291ad63a2"; - sha256 = "1z22ms16j5j42775mf31isanwx2pwr1d8wqw8006dczjv36qnz5i"; - }; - } - { - goPackagePath = "github.com/xordataexchange/crypt"; - fetch = { - type = "git"; - url = "https://github.com/xordataexchange/crypt"; - rev = "b2862e3d0a77"; - sha256 = "04q3856anpzl4gdfgmg7pbp9cx231nkz3ymq2xp27rnmmwhfxr8y"; - }; - } - { - goPackagePath = "github.com/yuin/goldmark"; - fetch = { - type = "git"; - url = "https://github.com/yuin/goldmark"; - rev = "v1.1.27"; - sha256 = "1872cqnii0kwiqcy81yin0idvjy5mdy4zlzz0csb319lcjs3b923"; - }; - } - { - goPackagePath = "go.etcd.io/bbolt"; - fetch = { - type = "git"; - url = "https://github.com/etcd-io/bbolt"; - rev = "v1.3.2"; - sha256 = "13d5l6p6c5wvkr6vn9hkhz9c593qifn7fgx0hg4d6jcvg1y0bnm2"; - }; - } - { - goPackagePath = "go.opencensus.io"; - fetch = { - type = "git"; - url = "https://github.com/census-instrumentation/opencensus-go"; - rev = "v0.22.3"; - sha256 = "0xj16iq5jp26hi2py7lsd8cvqh651fgn39y05gzvjdi88d9xd3nw"; - }; - } - { - goPackagePath = "go.uber.org/atomic"; - fetch = { - type = "git"; - url = "https://github.com/uber-go/atomic"; - rev = "v1.4.0"; - sha256 = "0c6yzx15c20719xii3dm0vyjd8i9jx45m0wh5yp1zf29b0gbljcy"; - }; - } - { - goPackagePath = "go.uber.org/multierr"; - fetch = { - type = "git"; - url = "https://github.com/uber-go/multierr"; - rev = "v1.1.0"; - sha256 = "1slfc6syvw8cvr6rbrjsy6ja5w8gsx0f8aq8qm16rp2x5c2pj07w"; - }; - } - { - goPackagePath = "go.uber.org/zap"; - fetch = { - type = "git"; - url = "https://github.com/uber-go/zap"; - rev = "v1.10.0"; - sha256 = "10hdzr1rghwbsl6bbd30779dx44fh9mg9pq8d2cgqlknqxxpvpvr"; - }; - } - { - goPackagePath = "golang.org/x/crypto"; - fetch = { - type = "git"; - url = "https://go.googlesource.com/crypto"; - rev = "06a226fb4e37"; - sha256 = "0fdig6jx81g7a44dnxggibl909wchsj4nakmmhhz7db36sl0d7m5"; - }; - } - { - goPackagePath = "golang.org/x/exp"; - fetch = { - type = "git"; - url = "https://go.googlesource.com/exp"; - rev = "6cc2880d07d6"; - sha256 = "1iia6hiif6hcp0cg1i6nq63qg0pmvm2kq24pf2r2il3597rfmlgy"; - }; - } - { - goPackagePath = "golang.org/x/image"; - fetch = { - type = "git"; - url = "https://go.googlesource.com/image"; - rev = "cff245a6509b"; - sha256 = "0hiznlkiaay30acwvvyq8g6bm32r7bc6gv47pygrcxqpapasbz84"; - }; - } - { - goPackagePath = "golang.org/x/lint"; - fetch = { - type = "git"; - url = "https://go.googlesource.com/lint"; - rev = "738671d3881b"; - sha256 = "0jkiz4py59jjnkyxbxifpf7bsar11lbgmj5jiq2kic5k03shkn9c"; - }; - } - { - goPackagePath = "golang.org/x/mobile"; - fetch = { - type = "git"; - url = "https://go.googlesource.com/mobile"; - rev = "d2bd2a29d028"; - sha256 = "1nv6vvhnjr01nx9y06q46ww87dppdwpbqrlsfg1xf2587wxl8xiv"; - }; - } - { - goPackagePath = "golang.org/x/mod"; - fetch = { - type = "git"; - url = "https://go.googlesource.com/mod"; - rev = "v0.2.0"; - sha256 = "1fp6885dclq77mh73v7i54v2b9llpv4di193zc8vmsbbkkc483cl"; - }; - } - { - goPackagePath = "golang.org/x/net"; - fetch = { - type = "git"; - url = "https://go.googlesource.com/net"; - rev = "7e3656a0809f"; - sha256 = "1rmj59bd0hvf8cbp42c0y8y38prs5ill1zszhqp9i8m86cvkfqk9"; - }; - } - { - goPackagePath = "golang.org/x/oauth2"; - fetch = { - type = "git"; - url = "https://go.googlesource.com/oauth2"; - rev = "bf48bf16ab8d"; - sha256 = "1sirdib60zwmh93kf9qrx51r8544k1p9rs5mk0797wibz3m4mrdg"; - }; - } - { - goPackagePath = "golang.org/x/sync"; - fetch = { - type = "git"; - url = "https://go.googlesource.com/sync"; - rev = "43a5402ce75a"; - sha256 = "0j6zrrb81qjr1926kkwmn0di9a0jn8qyjd9dw614rfkihxgq1vsm"; - }; - } - { - goPackagePath = "golang.org/x/sys"; - fetch = { - type = "git"; - url = "https://go.googlesource.com/sys"; - rev = "7e40ca221e25"; - sha256 = "1fkhs1sn6prfsqaj70kya2gn1sqqa85lmgff6j6s7027zc1yjvqa"; - }; - } - { - goPackagePath = "golang.org/x/text"; - fetch = { - type = "git"; - url = "https://go.googlesource.com/text"; - rev = "v0.3.2"; - sha256 = "0flv9idw0jm5nm8lx25xqanbkqgfiym6619w575p7nrdh0riqwqh"; - }; - } - { - goPackagePath = "golang.org/x/time"; - fetch = { - type = "git"; - url = "https://go.googlesource.com/time"; - rev = "555d28b269f0"; - sha256 = "1rhl4lyz030kwfsg63yk83yd3ivryv1afmzdz9sxbhcj84ym6h4r"; - }; - } - { - goPackagePath = "golang.org/x/tools"; - fetch = { - type = "git"; - url = "https://go.googlesource.com/tools"; - rev = "2bc93b1c0c88"; - sha256 = "10sg7nvw40f2d6hxmsy4nvhmawbidk022v3arbh8acsjxglw84zs"; - }; - } - { - goPackagePath = "golang.org/x/xerrors"; - fetch = { - type = "git"; - url = "https://go.googlesource.com/xerrors"; - rev = "9bdfabe68543"; - sha256 = "1yjfi1bk9xb81lqn85nnm13zz725wazvrx3b50hx19qmwg7a4b0c"; - }; - } - { - goPackagePath = "google.golang.org/api"; - fetch = { - type = "git"; - url = "https://github.com/googleapis/google-api-go-client"; - rev = "v0.25.0"; - sha256 = "0bfpii160ns1pl3iqc38h5db258mv58igf2ifglds3dajgsj2qrr"; - }; - } - { - goPackagePath = "google.golang.org/appengine"; - fetch = { - type = "git"; - url = "https://github.com/golang/appengine"; - rev = "v1.6.6"; - sha256 = "15c38h6fbv06cnkr6yknygfrpibyms2mya4w0l29kaxf42jn1qi5"; - }; - } - { - goPackagePath = "google.golang.org/genproto"; - fetch = { - type = "git"; - url = "https://github.com/googleapis/go-genproto"; - rev = "f5ebc3bea380"; - sha256 = "1v5dyp6g35rwjwx1ixjy7yh1hay4n7ya5aq5h4ckvd9h0j7rw5sz"; - }; - } - { - goPackagePath = "google.golang.org/grpc"; - fetch = { - type = "git"; - url = "https://github.com/grpc/grpc-go"; - rev = "v1.29.1"; - sha256 = "1465947r6536si36cl2ppx7929la9zba1y6xfczfyp4kgf8988hf"; - }; - } - { - goPackagePath = "google.golang.org/protobuf"; - fetch = { - type = "git"; - url = "https://go.googlesource.com/protobuf"; - rev = "v1.22.0"; - sha256 = "0n7lc4m7kfvj01glc0gnjy0zsnsic7cxnbvlajy0h14cxbab87pj"; - }; - } - { - goPackagePath = "gopkg.in/alecthomas/kingpin.v2"; - fetch = { - type = "git"; - url = "https://gopkg.in/alecthomas/kingpin.v2"; - rev = "v2.2.6"; - sha256 = "0mndnv3hdngr3bxp7yxfd47cas4prv98sqw534mx7vp38gd88n5r"; - }; - } - { - goPackagePath = "gopkg.in/check.v1"; - fetch = { - type = "git"; - url = "https://gopkg.in/check.v1"; - rev = "788fd7840127"; - sha256 = "0v3bim0j375z81zrpr5qv42knqs0y2qv2vkjiqi5axvb78slki1a"; - }; - } - { - goPackagePath = "gopkg.in/errgo.v2"; - fetch = { - type = "git"; - url = "https://gopkg.in/errgo.v2"; - rev = "v2.1.0"; - sha256 = "065mbihiy7q67wnql0bzl9y1kkvck5ivra68254zbih52jxwrgr2"; - }; - } - { - goPackagePath = "gopkg.in/resty.v1"; - fetch = { - type = "git"; - url = "https://gopkg.in/resty.v1"; - rev = "v1.12.0"; - sha256 = "062mn735rqzhha5ag07z4gz08hxzrfm2yx067jfmaaxmb6797lmp"; - }; - } - { - goPackagePath = "gopkg.in/yaml.v2"; - fetch = { - type = "git"; - url = "https://gopkg.in/yaml.v2"; - rev = "v2.2.2"; - sha256 = "01wj12jzsdqlnidpyjssmj0r4yavlqy7dwrg7adqd8dicjc4ncsa"; - }; - } - { - goPackagePath = "honnef.co/go/tools"; - fetch = { - type = "git"; - url = "https://github.com/dominikh/go-tools"; - rev = "v0.0.1-2020.1.3"; - sha256 = "0pvi1mzhy6zgx4zfgdypbl4zhvgg11hl5qv7blf2qs0a96j2djhf"; - }; - } - { - goPackagePath = "rsc.io/binaryregexp"; - fetch = { - type = "git"; - url = "https://github.com/rsc/binaryregexp"; - rev = "v0.2.0"; - sha256 = "1kar0myy85waw418zslviwx8846zj0m9cmqkxjx0fvgjdi70nc4b"; - }; - } - { - goPackagePath = "rsc.io/quote"; - fetch = { - type = "git"; - url = "https://github.com/rsc/quote"; - rev = "v3.1.0"; - sha256 = "0nvv97hwwrl1mx5gzsbdm1ndnwpg3m7i2jb10ig9wily7zmvki0i"; - }; - } - { - goPackagePath = "rsc.io/sampler"; - fetch = { - type = "git"; - url = "https://github.com/rsc/sampler"; - rev = "v1.3.0"; - sha256 = "0byxk2ynba50py805kcvbvjzh59l1r308i1xgyzpw6lff4xx9xjh"; - }; - } -] diff --git a/pkgs/tools/backup/zrepl/default.nix b/pkgs/tools/backup/zrepl/default.nix index 0bbc7267af80f..74d74b7947606 100644 --- a/pkgs/tools/backup/zrepl/default.nix +++ b/pkgs/tools/backup/zrepl/default.nix @@ -24,6 +24,8 @@ buildGoModule rec { makeWrapper ]; + ldflags = [ "-s" "-w" "-X github.com/zrepl/zrepl/version.zreplVersion=${version}" ]; + postInstall = '' mkdir -p $out/lib/systemd/system substitute dist/systemd/zrepl.service $out/lib/systemd/system/zrepl.service \ diff --git a/pkgs/tools/bluetooth/blueman/default.nix b/pkgs/tools/bluetooth/blueman/default.nix index 74ebb04f74744..2f59d14902bb2 100644 --- a/pkgs/tools/bluetooth/blueman/default.nix +++ b/pkgs/tools/bluetooth/blueman/default.nix @@ -9,11 +9,11 @@ let in stdenv.mkDerivation rec { pname = "blueman"; - version = "2.2.4"; + version = "2.2.5"; src = fetchurl { url = "https://github.com/blueman-project/blueman/releases/download/${version}/${pname}-${version}.tar.xz"; - sha256 = "sha256-VdY5/u2gtDsYplnmWYUhOlS0fcsTSPO07/tSONskJgI="; + sha256 = "sha256-yfPAqU3HyAvTIwS7Jf3tIU/jC3AY6e9Gsvy9HYA8fHw="; }; nativeBuildInputs = [ diff --git a/pkgs/tools/compression/bzip3/default.nix b/pkgs/tools/compression/bzip3/default.nix index fa9b5d0845df7..c265a54a9813b 100644 --- a/pkgs/tools/compression/bzip3/default.nix +++ b/pkgs/tools/compression/bzip3/default.nix @@ -2,11 +2,12 @@ , stdenv , fetchFromGitHub , autoreconfHook +, pkg-config }: stdenv.mkDerivation rec { pname = "bzip3"; - version = "1.1.3"; + version = "1.1.4"; outputs = [ "bin" "dev" "out" ]; @@ -14,7 +15,7 @@ stdenv.mkDerivation rec { owner = "kspalaiologos"; repo = "bzip3"; rev = version; - hash = "sha256-puGtaL76p4BzSiTPf3qFgXN4pz90CDU9dziGIszk3to="; + hash = "sha256-rbJUvFm8WYgQLNpbX6kcXb5qAGAJfylTo4HgOvZVCu8="; }; postPatch = '' @@ -24,6 +25,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ autoreconfHook + pkg-config ]; configureFlags = [ diff --git a/pkgs/tools/filesystems/bindfs/default.nix b/pkgs/tools/filesystems/bindfs/default.nix index 12052100db32a..333157d829fb8 100644 --- a/pkgs/tools/filesystems/bindfs/default.nix +++ b/pkgs/tools/filesystems/bindfs/default.nix @@ -1,12 +1,12 @@ { lib, stdenv, fetchurl, fuse, pkg-config }: stdenv.mkDerivation rec { - version = "1.15.1"; + version = "1.16.0"; pname = "bindfs"; src = fetchurl { url = "https://bindfs.org/downloads/${pname}-${version}.tar.gz"; - sha256 = "sha256-BN01hKbN+a9DRNQDxiGFyp+rMc465aJdAQG8EJNsaKs="; + sha256 = "sha256-AuvvqqZOGwRPxcdDxYKarSHtb3FF9NsHI7zEXwhXgfY="; }; nativeBuildInputs = [ pkg-config ]; diff --git a/pkgs/tools/filesystems/gcsfuse/default.nix b/pkgs/tools/filesystems/gcsfuse/default.nix index 0a621c5e034df..12447377ae933 100644 --- a/pkgs/tools/filesystems/gcsfuse/default.nix +++ b/pkgs/tools/filesystems/gcsfuse/default.nix @@ -1,32 +1,32 @@ -{ lib, buildGoPackage, fetchFromGitHub }: +{ lib, buildGoModule, fetchFromGitHub }: -buildGoPackage rec { +buildGoModule rec { pname = "gcsfuse"; - version = "0.41.1"; + version = "0.41.4"; src = fetchFromGitHub { owner = "googlecloudplatform"; repo = "gcsfuse"; rev = "v${version}"; - sha256 = "sha256-5Kfd033SG1ldF+2QCZ01aa7ts0mA8uPXiLmqZIr94YQ="; + sha256 = "sha256-8QzSvR/uelp9iBLK+DsUXsH6fBOIoeXePeN7Spht6SE="; }; - goPackagePath = "github.com/googlecloudplatform/gcsfuse"; + vendorSha256 = null; subPackages = [ "." "tools/mount_gcsfuse" ]; + ldflags = [ "-s" "-w" "-X main.gcsfuseVersion=${version}" ]; + postInstall = '' ln -s $out/bin/mount_gcsfuse $out/bin/mount.gcsfuse ln -s $out/bin/mount_gcsfuse $out/bin/mount.fuse.gcsfuse ''; - ldflags = [ "-s" "-w" "-X main.gcsfuseVersion=${version}" ]; - meta = with lib;{ description = "A user-space file system for interacting with Google Cloud Storage"; homepage = "https://cloud.google.com/storage/docs/gcs-fuse"; license = licenses.asl20; platforms = platforms.unix; - maintainers = []; + maintainers = with maintainers; [ aaronjheng ]; }; } diff --git a/pkgs/tools/filesystems/httm/default.nix b/pkgs/tools/filesystems/httm/default.nix index f4cfdc46e9b43..51f0e039df798 100644 --- a/pkgs/tools/filesystems/httm/default.nix +++ b/pkgs/tools/filesystems/httm/default.nix @@ -6,16 +6,16 @@ rustPlatform.buildRustPackage rec { pname = "httm"; - version = "0.11.6"; + version = "0.12.2"; src = fetchFromGitHub { owner = "kimono-koans"; repo = pname; rev = version; - sha256 = "5jeCENAas7i/eBySSBjwmdc3MEHVhWWH7/RZGS8g1Y4="; + sha256 = "gly3P4b6MlhJA/Qre6S0iFGBaY0Hi/u4hzlirdTdZoc="; }; - cargoSha256 = "x4qfi3Wm5r0HNqDgmJBXNvS1xQDU7MQ/H2+zNpHon+s="; + cargoSha256 = "fq4RVJT6u2ST4Nu9zAnfcXZQqWe8gdC4cFwrJzFums4="; nativeBuildInputs = [ installShellFiles ]; diff --git a/pkgs/tools/games/minecraft/fabric-installer/default.nix b/pkgs/tools/games/minecraft/fabric-installer/default.nix index 4ba2dc542aaff..f0068f5c829d7 100644 --- a/pkgs/tools/games/minecraft/fabric-installer/default.nix +++ b/pkgs/tools/games/minecraft/fabric-installer/default.nix @@ -6,11 +6,11 @@ stdenv.mkDerivation rec { pname = "fabric-installer"; - version = "0.10.2"; + version = "0.11.0"; src = fetchurl { url = "https://maven.fabricmc.net/net/fabricmc/fabric-installer/${version}/fabric-installer-${version}.jar"; - sha256 = "sha256-xjnL1nURAr4z2OZKEqiC/E6+rSvDpxrfGwm/5Bvxxno="; + sha256 = "sha256-aLpC6k+Cum0QfdIa1sUXS4BBKFTudJGbcjS1LSFP0Qo="; }; dontUnpack = true; diff --git a/pkgs/tools/games/minecraft/packwiz/default.nix b/pkgs/tools/games/minecraft/packwiz/default.nix index 3be2798312e77..80feced2b7013 100644 --- a/pkgs/tools/games/minecraft/packwiz/default.nix +++ b/pkgs/tools/games/minecraft/packwiz/default.nix @@ -6,13 +6,13 @@ buildGoModule rec { pname = "packwiz"; - version = "unstable-2022-5-25"; + version = "unstable-2022-06-08"; src = fetchFromGitHub { owner = "packwiz"; repo = "packwiz"; - rev = "e71b63ea98283c8c1f0e03ee51ae40f452f22a61"; - sha256 = "sha256-XwGacEVfQAduDCSMQFRw7Xnx4bND2zaV7l27B+2u5xg="; + rev = "d051932bbbeb7b16cd21a1897019428e71f63bfd"; + sha256 = "sha256-H1v5pY9hJYGP0ZiE/GrsATf1ljw69085t6PQhPOfYCs="; }; vendorSha256 = "sha256-M9u7N4IrL0B4pPRQwQG5TlMaGT++w3ZKHZ0RdxEHPKk="; diff --git a/pkgs/tools/inputmethods/uim/default.nix b/pkgs/tools/inputmethods/uim/default.nix index 9336d5429c128..e1daecbd10ff7 100644 --- a/pkgs/tools/inputmethods/uim/default.nix +++ b/pkgs/tools/inputmethods/uim/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, shared-mime-info +{ lib, stdenv, fetchFromGitHub, fetchpatch, shared-mime-info , autoconf, automake, intltool, libtool, pkg-config, cmake , ruby, librsvg , ncurses, m17n_lib, m17n_db, expat @@ -86,7 +86,21 @@ stdenv.mkDerivation rec { ./autogen.sh ''; - patches = [ ./data-hook.patch ]; + patches = [ + ./data-hook.patch + + # Pull upstream fix for -fno-common toolchains + # https://github.com/uim/libgcroots/pull/4 + (fetchpatch { + name = "libgcroots-fno-common.patch"; + url = "https://github.com/uim/libgcroots/commit/7e39241344ad0663409e836560ae6b5eb231e1fc.patch"; + sha256 = "0iifcl5lk8bvl0cflm47gkymg88aiwzj0gxh2aj3mqlyhvyx78nz"; + # Patch comes from git submodule. Relocate as: + # a/include/private/gc_priv.h -> a/sigscheme/libgcroots/include/private/gc_priv.h + stripLen = 1; + extraPrefix = "sigscheme/libgcroots/"; + }) + ]; configureFlags = [ # configure in maintainer mode or else some pixmaps won't get autogenerated diff --git a/pkgs/tools/misc/antimicrox/default.nix b/pkgs/tools/misc/antimicrox/default.nix index b39d9b17002fe..73e430e54e340 100644 --- a/pkgs/tools/misc/antimicrox/default.nix +++ b/pkgs/tools/misc/antimicrox/default.nix @@ -12,13 +12,13 @@ mkDerivation rec { pname = "antimicrox"; - version = "3.2.3"; + version = "3.2.4"; src = fetchFromGitHub { owner = "AntiMicroX"; repo = pname; rev = version; - sha256 = "sha256-Qn2XT/l3zx0u3twKsQr1cHbaRiLTglQf0WNx8tqtKro="; + sha256 = "sha256-catgal3bpWJUcTo0x0V0X3VV87AHO2Dp58IpQ/ILsZ8="; }; nativeBuildInputs = [ cmake extra-cmake-modules pkg-config itstool ]; diff --git a/pkgs/tools/misc/bsp-layout/default.nix b/pkgs/tools/misc/bsp-layout/default.nix index bad5b4d9a89fe..48f68bebe6c5a 100644 --- a/pkgs/tools/misc/bsp-layout/default.nix +++ b/pkgs/tools/misc/bsp-layout/default.nix @@ -9,13 +9,13 @@ stdenv.mkDerivation rec { pname = "bsp-layout"; - version = "unstable-2021-05-10"; + version = "unstable-2022-06-19"; src = fetchFromGitHub { owner = "phenax"; repo = pname; - rev = "726b850b79eabdc6f4d236cff52e434848cb55e3"; - sha256 = "1wqlzbz7l9vz37gin2zckrnxkkabnd7x5mi9pb0x96w4yhld5mx6"; + rev = "181d38443778e81df2d4bc3639063c3ae608f9c7"; + sha256 = "sha256-4NKI+OnOTYGaJnaPvSoXGJdSSzMo9AjYRLOomp9onoo="; }; nativeBuildInputs = [ makeWrapper git bc ]; @@ -39,7 +39,7 @@ stdenv.mkDerivation rec { ''; homepage = "https://github.com/phenax/bsp-layout"; license = licenses.mit; - maintainers = with maintainers; [ devins2518 totoroot ]; + maintainers = with maintainers; [ totoroot ]; platforms = platforms.linux; }; } diff --git a/pkgs/tools/misc/chafa/default.nix b/pkgs/tools/misc/chafa/default.nix index 7a0178eea735f..85b52dd398c25 100644 --- a/pkgs/tools/misc/chafa/default.nix +++ b/pkgs/tools/misc/chafa/default.nix @@ -4,14 +4,14 @@ }: stdenv.mkDerivation rec { - version = "1.8.0"; + version = "1.10.3"; pname = "chafa"; src = fetchFromGitHub { owner = "hpjansson"; repo = "chafa"; rev = version; - sha256 = "sha256-8ENPmcl0KVxoBu8FGOGk+y8XsONWW0YW32MHAKBUiPE="; + sha256 = "sha256-GRPn0xPWtCayOdmA6M+KQrObAHtZIJLEydXaKhhO5IU="; }; nativeBuildInputs = [ autoconf diff --git a/pkgs/tools/misc/chezmoi/default.nix b/pkgs/tools/misc/chezmoi/default.nix index 782efb24f48d3..7fc8f0ad1458a 100644 --- a/pkgs/tools/misc/chezmoi/default.nix +++ b/pkgs/tools/misc/chezmoi/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "chezmoi"; - version = "2.16.0"; + version = "2.18.1"; src = fetchFromGitHub { owner = "twpayne"; repo = "chezmoi"; rev = "v${version}"; - sha256 = "sha256-J5L4xFdRV8eOJgILQqK0DhvP5/AXAmr7spzokhd4kcg="; + sha256 = "sha256-eRlEhtpUBZBS3fNrkkXPiktPyGQ2K8MFwsDVo3DUb+o="; }; - vendorSha256 = "sha256-y+xPuW8l3XvpnlqdlNIWdweNXMsAOrwbXHq2cJQRcOY="; + vendorSha256 = "sha256-u+iFnBzlaa+7heQEI18WWD45TSxEpIY73ZrxjLx84Ic="; doCheck = false; diff --git a/pkgs/tools/misc/dateutils/default.nix b/pkgs/tools/misc/dateutils/default.nix index 20837d5ee3ec7..ec8f9ca83d93e 100644 --- a/pkgs/tools/misc/dateutils/default.nix +++ b/pkgs/tools/misc/dateutils/default.nix @@ -1,12 +1,12 @@ { lib, stdenv, fetchurl, autoreconfHook, tzdata, fetchpatch }: stdenv.mkDerivation rec { - version = "0.4.9"; + version = "0.4.10"; pname = "dateutils"; src = fetchurl { url = "https://bitbucket.org/hroptatyr/dateutils/downloads/${pname}-${version}.tar.xz"; - sha256 = "1hy96h9imxdbg9y7305mgv4grr6x4qic9xy3vhgh15lvjkcmc0kr"; + sha256 = "sha256-PFCOKIm51a7Kt9WdcyWnAIlZMRGhIwpJbasPWtZ3zew="; }; nativeBuildInputs = [ autoreconfHook ]; diff --git a/pkgs/tools/misc/diffoscope/default.nix b/pkgs/tools/misc/diffoscope/default.nix index ae0a38b6d3166..2307dddf6cacc 100644 --- a/pkgs/tools/misc/diffoscope/default.nix +++ b/pkgs/tools/misc/diffoscope/default.nix @@ -11,11 +11,11 @@ # Note: when upgrading this package, please run the list-missing-tools.sh script as described below! python3Packages.buildPythonApplication rec { pname = "diffoscope"; - version = "216"; + version = "217"; src = fetchurl { url = "https://diffoscope.org/archive/diffoscope-${version}.tar.bz2"; - sha256 = "sha256-KSmC2mNNzsC2H5xOOQ/3gODsSvFQD95XGtrzbDud0W0="; + sha256 = "sha256-JS6lzxOsE3K4gH3VHsRY5Iucq5PBH3jFD5lSmNZWEG4="; }; outputs = [ "out" "man" ]; diff --git a/pkgs/tools/misc/dsq/default.nix b/pkgs/tools/misc/dsq/default.nix index 1d6dde3c3cffa..62a17142bde6b 100644 --- a/pkgs/tools/misc/dsq/default.nix +++ b/pkgs/tools/misc/dsq/default.nix @@ -15,13 +15,13 @@ buildGoModule rec { pname = "dsq"; - version = "0.20.1"; + version = "0.20.2"; src = fetchFromGitHub { owner = "multiprocessio"; repo = "dsq"; rev = version; - hash = "sha256-zTrIs6Q/+PW6CKCx1L8VaXhc1ZAqbb+Od+LJNjPCOTs="; + hash = "sha256-dgx1rFdhEtvyH/N3AtQE89ASBoE3CLl+ZFWwWWYe0II="; }; vendorSha256 = "sha256-bLaBBWChK2RKXd/rX9m9UfHu8zt0j8TOm5S2M02U91A="; diff --git a/pkgs/tools/misc/dua/default.nix b/pkgs/tools/misc/dua/default.nix index 4a83d8147acb3..526eb705e4cc8 100644 --- a/pkgs/tools/misc/dua/default.nix +++ b/pkgs/tools/misc/dua/default.nix @@ -2,7 +2,7 @@ rustPlatform.buildRustPackage rec { pname = "dua"; - version = "2.17.5"; + version = "2.17.7"; buildInputs = lib.optionals stdenv.isDarwin [ libiconv Foundation ]; @@ -10,7 +10,7 @@ rustPlatform.buildRustPackage rec { owner = "Byron"; repo = "dua-cli"; rev = "v${version}"; - sha256 = "sha256-dpkUbZz/bIiTMhZalXHGct77qMzYB6LATs7MPVyW1GY="; + sha256 = "sha256-FiTjN4coOJZ3Uu9LfaJxcpvVKS+5MVYWQPmwllBh1Jg="; # Remove unicode file names which leads to different checksums on HFS+ # vs. other filesystems because of unicode normalisation. postFetch = '' @@ -18,7 +18,7 @@ rustPlatform.buildRustPackage rec { ''; }; - cargoSha256 = "sha256-xBiabY0aGPxrAHypuSg3AF/EcChDgtIK9cJDCeTNkm0="; + cargoSha256 = "sha256-xCHbS+D7ss85hklv9xftJTsctvQlAjkKtuJbTt5R8nM="; doCheck = false; diff --git a/pkgs/tools/misc/fend/default.nix b/pkgs/tools/misc/fend/default.nix index 07880c4fbdc54..afdc719a5e448 100644 --- a/pkgs/tools/misc/fend/default.nix +++ b/pkgs/tools/misc/fend/default.nix @@ -7,16 +7,16 @@ rustPlatform.buildRustPackage rec { pname = "fend"; - version = "1.0.1"; + version = "1.0.3"; src = fetchFromGitHub { owner = "printfn"; repo = pname; rev = "v${version}"; - sha256 = "sha256-EV3uxoN6RuQ7grXLcFev1ZCfjVnVIDumQmHdpUm1Jbc="; + sha256 = "sha256-eYCFX3JVsTnmVzHQd9JU6BT80kS0LTjVwVcfNJink1M="; }; - cargoSha256 = "sha256-lNpFdrriAglLaiWjxVP4JoiBuU+zdLlerAIApIvHHZw="; + cargoSha256 = "sha256-+N8/ZKj1Ht2lkTYSEm/lrLtopBQqc82gIFiLzJ6NogU="; buildInputs = lib.optionals stdenv.isDarwin [ darwin.apple_sdk.frameworks.Security ]; diff --git a/pkgs/tools/misc/ffsend/default.nix b/pkgs/tools/misc/ffsend/default.nix index b6c7cefbccb24..1aedac7ca16f5 100644 --- a/pkgs/tools/misc/ffsend/default.nix +++ b/pkgs/tools/misc/ffsend/default.nix @@ -1,6 +1,6 @@ -{ lib, stdenv, fetchFromGitLab, rustPlatform, cmake, pkg-config, openssl +{ lib, stdenv, fetchFromGitLab, rustPlatform, pkg-config, openssl , installShellFiles -, CoreFoundation, CoreServices, Security, AppKit, libiconv +, Security, AppKit , x11Support ? stdenv.isLinux || stdenv.hostPlatform.isBSD , xclip ? null, xsel ? null @@ -17,20 +17,21 @@ with rustPlatform; buildRustPackage rec { pname = "ffsend"; - version = "0.2.74"; + version = "0.2.76"; src = fetchFromGitLab { owner = "timvisee"; repo = "ffsend"; rev = "v${version}"; - sha256 = "0ia9agh0h9hp06ijmlgnw63n3xz2jajjw1maz27sawqp342x9vn5"; + sha256 = "sha256-L1j1lXPxy9nWMeED9uzQHV5y7XTE6+DB57rDnXa4kMo="; }; - cargoSha256 = "0dl671sw3amny52a81bx7imh94dvi91dprwhcm1b0g40mjic45pw"; + cargoSha256 = "sha256-zNLU9QnBGna5qb+iu2imOUvCIw3ZWRFsQlpFo5ECtKo="; - nativeBuildInputs = [ cmake pkg-config installShellFiles ]; + nativeBuildInputs = [ installShellFiles ] + ++ lib.optionals stdenv.isLinux [ pkg-config ]; buildInputs = - if stdenv.isDarwin then [ libiconv CoreFoundation CoreServices Security AppKit ] + if stdenv.isDarwin then [ Security AppKit ] else [ openssl ]; preBuild = lib.optionalString (x11Support && usesX11) ( @@ -56,7 +57,7 @@ buildRustPackage rec { ''; homepage = "https://gitlab.com/timvisee/ffsend"; license = licenses.gpl3Only; - maintainers = with maintainers; [ lilyball equirosa ]; + maintainers = with maintainers; [ lilyball equirosa marsam ]; platforms = platforms.unix; }; } diff --git a/pkgs/tools/misc/flameshot/default.nix b/pkgs/tools/misc/flameshot/default.nix index 82cf7a3b78fd9..4bbe0508c12c5 100644 --- a/pkgs/tools/misc/flameshot/default.nix +++ b/pkgs/tools/misc/flameshot/default.nix @@ -10,13 +10,13 @@ mkDerivation rec { pname = "flameshot"; - version = "11.0.0"; + version = "12.0.0"; src = fetchFromGitHub { owner = "flameshot-org"; repo = "flameshot"; rev = "v${version}"; - sha256 = "sha256-SlnEXW3Uhdgl0icwYyYsKQOcYkAtHpAvL6LMXBF2gWM="; + sha256 = "sha256-ByW+XYTaeBTTbOaxNeF367nqgnBM+EC8jm+PmwHcVGQ="; }; passthru = { diff --git a/pkgs/tools/misc/mandown/default.nix b/pkgs/tools/misc/mandown/default.nix index 08755ede14db5..4851c764d0eb0 100644 --- a/pkgs/tools/misc/mandown/default.nix +++ b/pkgs/tools/misc/mandown/default.nix @@ -15,6 +15,6 @@ rustPlatform.buildRustPackage rec { description = "Markdown to groff (man page) converter"; homepage = "https://gitlab.com/kornelski/mandown"; license = with licenses; [ asl20 /* or */ mit ]; - maintainers = with maintainers; [ zowoq ]; + maintainers = with maintainers; [ ]; }; } diff --git a/pkgs/tools/misc/sheldon/default.nix b/pkgs/tools/misc/sheldon/default.nix new file mode 100644 index 0000000000000..db6aa9d8f1708 --- /dev/null +++ b/pkgs/tools/misc/sheldon/default.nix @@ -0,0 +1,60 @@ +{ lib +, stdenv +, fetchCrate +, rustPlatform +, pkg-config +, openssl +, installShellFiles +, Security +, curl +}: + +rustPlatform.buildRustPackage rec { + pname = "sheldon"; + version = "0.6.6"; + + src = fetchCrate { + inherit pname version; + sha256 = "sha256-NjNBTjSaFoh+DAJfcM4G3+Meih1czLxs/RMmMwrXqD4="; + }; + + cargoSha256 = "sha256-uRcaHuDLQm6OYqt01kLbW/mfZnL4HaDabaweaw1EOfs="; + + buildInputs = [ openssl ] ++ lib.optional stdenv.isDarwin [ Security curl ]; + nativeBuildInputs = [ installShellFiles pkg-config ]; + + # Needs network connection + checkFlags = [ + "--skip cli::tests::raw_opt_help" + "--skip lock::tests::external_plugin_lock_git_with_matches" + "--skip lock::tests::external_plugin_lock_git_with_matches_error" + "--skip lock::tests::external_plugin_lock_git_with_matches_not_each" + "--skip lock::tests::external_plugin_lock_git_with_uses" + "--skip lock::tests::external_plugin_lock_remote" + "--skip lock::tests::git_checkout_resolve_branch" + "--skip lock::tests::git_checkout_resolve_rev" + "--skip lock::tests::git_checkout_resolve_tag" + "--skip lock::tests::locked_config_clean" + "--skip lock::tests::source_lock_git_and_reinstall" + "--skip lock::tests::source_lock_git_git_with_checkout" + "--skip lock::tests::source_lock_git_https_with_checkout" + "--skip lock::tests::source_lock_local" + "--skip lock::tests::source_lock_remote_and_reinstall" + "--skip lock::tests::source_lock_with_git" + "--skip lock::tests::source_lock_with_remote" + ]; + + postInstall = '' + installShellCompletion --cmd sheldon \ + --bash <($out/bin/sheldon completions --shell bash) \ + --zsh <($out/bin/sheldon completions --shell zsh) + ''; + + meta = with lib; { + description = "A fast and configurable shell plugin manager"; + homepage = "https://github.com/rossmacarthur/sheldon"; + license = with licenses; [ mit ]; + maintainers = with maintainers; [ seqizz ]; + platforms = platforms.linux; + }; +} diff --git a/pkgs/tools/misc/starfetch/default.nix b/pkgs/tools/misc/starfetch/default.nix new file mode 100755 index 0000000000000..3dfff1400e9e5 --- /dev/null +++ b/pkgs/tools/misc/starfetch/default.nix @@ -0,0 +1,36 @@ +{ stdenv, lib, fetchFromGitHub }: + +stdenv.mkDerivation rec { + pname = "starfetch"; + version = "0.0.2"; + + src = fetchFromGitHub { + owner = "Haruno19"; + repo = "starfetch"; + rev = version; + sha256 = "sha256-waJ1DbOqhZ3hHtqcODSXBC+O46S8RSxuBuoEqs8OfgI="; + }; + + postPatch = '' + substituteInPlace src/starfetch.cpp --replace /usr/local/ $out/ + ''; + + installPhase = '' + runHook preInstall + + mkdir -p $out/bin + mkdir -p $out/share/starfetch + cp starfetch $out/bin/ + cp -r res/* $out/share/starfetch/ + + runHook postInstall + ''; + + meta = with lib; { + description = "CLI star constellations displayer"; + homepage = "https://github.com/Haruno19/starfetch"; + license = licenses.gpl3Plus; + platforms = platforms.all; + maintainers = with maintainers; [ papojari ]; + }; +} diff --git a/pkgs/tools/misc/tmux/default.nix b/pkgs/tools/misc/tmux/default.nix index fd4361d27678a..44cbe713f096e 100644 --- a/pkgs/tools/misc/tmux/default.nix +++ b/pkgs/tools/misc/tmux/default.nix @@ -6,7 +6,7 @@ , libevent , ncurses , pkg-config -, systemd +, withSystemd ? stdenv.isLinux && !stdenv.hostPlatform.isStatic, systemd , utf8proc }: @@ -43,13 +43,13 @@ stdenv.mkDerivation rec { buildInputs = [ ncurses libevent - ] ++ lib.optionals stdenv.isLinux [ systemd ] + ] ++ lib.optionals withSystemd [ systemd ] ++ lib.optionals stdenv.isDarwin [ utf8proc ]; configureFlags = [ "--sysconfdir=/etc" "--localstatedir=/var" - ] ++ lib.optionals stdenv.isLinux [ "--enable-systemd" ] + ] ++ lib.optionals withSystemd [ "--enable-systemd" ] ++ lib.optionals stdenv.isDarwin [ "--enable-utf8proc" ]; enableParallelBuilding = true; diff --git a/pkgs/tools/misc/viddy/default.nix b/pkgs/tools/misc/viddy/default.nix index f882ce4b5be3d..dafb91b09f0db 100644 --- a/pkgs/tools/misc/viddy/default.nix +++ b/pkgs/tools/misc/viddy/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "viddy"; - version = "0.3.4"; + version = "0.3.5"; src = fetchFromGitHub { owner = "sachaos"; repo = pname; rev = "v${version}"; - sha256 = "sha256-V/x969wi5u5ND9QgJfc4vtI2t1G1ETlATzeqnpHMncc="; + sha256 = "sha256-+0Twa9OYIuyt1+F/sLkQSOj0u04r7y/DqYd11buquow="; }; vendorSha256 = "sha256-LtRHnZF0ynnIp77K9anljqq42BumXohDMwlU7hzSxZk="; diff --git a/pkgs/tools/misc/wayback-machine-archiver/default.nix b/pkgs/tools/misc/wayback-machine-archiver/default.nix new file mode 100644 index 0000000000000..986ca165ed246 --- /dev/null +++ b/pkgs/tools/misc/wayback-machine-archiver/default.nix @@ -0,0 +1,31 @@ +{ lib, python3, fetchFromGitHub }: + +python3.pkgs.buildPythonApplication rec { + pname = "wayback-machine-archiver"; + version = "1.9.1"; + + src = fetchFromGitHub { + owner = "agude"; + repo = "wayback-machine-archiver"; + rev = "v${version}"; + sha256 = "0dnnqx507gpj8wsx6f2ivfmha969ydayiqsvxh23p9qcixw9257x"; + }; + + nativeBuildInputs = with python3.pkgs; [ pypandoc ]; + propagatedBuildInputs = with python3.pkgs; [ requests ]; + checkInputs = with python3.pkgs; [ pytestCheckHook requests-mock ]; + + postPatch = '' + substituteInPlace setup.py \ + --replace \"pytest-runner\", "" + ''; + + pythonImportsCheck = [ "wayback_machine_archiver" ]; + + meta = with lib; { + description = "A Python script to submit web pages to the Wayback Machine for archiving"; + homepage = "https://github.com/agude/wayback-machine-archiver"; + license = licenses.mit; + maintainers = with maintainers; [ dandellion ]; + }; +} diff --git a/pkgs/tools/misc/youtube-dl/default.nix b/pkgs/tools/misc/youtube-dl/default.nix index fd038d7acb128..4aee6bdeb5f51 100644 --- a/pkgs/tools/misc/youtube-dl/default.nix +++ b/pkgs/tools/misc/youtube-dl/default.nix @@ -25,8 +25,8 @@ buildPythonPackage rec { }; patches = [ - # Fixes throttling on youtube.com. Without the patch downloads are capped at - # about 80KiB/s. See, e.g., + # Fixes throttling on youtube.com by decoding a "n-parameter". Without the patch + # downloads are capped at about 80KiB/s. See, e.g., # # https://github.com/ytdl-org/youtube-dl/issues/29326 # @@ -37,6 +37,20 @@ buildPythonPackage rec { url = "https://github.com/ytdl-org/youtube-dl/compare/57044eacebc6f2f3cd83c345e1b6e659a22e4773...1e677567cd083d43f55daef0cc74e5fa24575ae3.diff"; sha256 = "11s0j3w60r75xx20p0x2j3yc4d3yvz99r0572si8b5qd93lqs4pr"; }) + # The above patch may fail to decode the n-parameter (if, say, YouTube is updated). Failure to decode + # it blocks the download instead of falling back to the throttled version. The patch below implements + # better fallback behaviour. + (fetchpatch { + name = "avoid-crashing-if-nsig-decode-fails.patch"; + url = "https://github.com/ytdl-org/youtube-dl/commit/41f0043983c831b7c0c3614340d2f66ec153087b.diff"; + sha256 = "sha256-a72gWhBXCLjuBBD36PpZ5F/AHBdiBv4W8Wf9g4P/aBY="; + }) + # YouTube changed the n-parameter format in April 2022, so decoder updates are required. + (fetchpatch { + name = "fix-n-descrambling.patch"; + url = "https://github.com/ytdl-org/youtube-dl/commit/a0068bd6bec16008bda7a39caecccbf84881c603.diff"; + sha256 = "sha256-tSuEns4jputa2nOOo6JsFXpK3hvJ/+z1/ymcLsd3A6w="; + }) ]; nativeBuildInputs = [ installShellFiles makeWrapper ]; diff --git a/pkgs/tools/misc/zoxide/default.nix b/pkgs/tools/misc/zoxide/default.nix index 96c7c29a2d90b..c83a3e9a80684 100644 --- a/pkgs/tools/misc/zoxide/default.nix +++ b/pkgs/tools/misc/zoxide/default.nix @@ -10,13 +10,13 @@ rustPlatform.buildRustPackage rec { pname = "zoxide"; - version = "0.8.1"; + version = "0.8.2"; src = fetchFromGitHub { owner = "ajeetdsouza"; repo = "zoxide"; rev = "v${version}"; - sha256 = "sha256-f6HzSnrOaAOnA9k6e3CnXioxCTOM0VSpTOpxnmz+Tyk="; + sha256 = "sha256-yueUpOU28IzQA/SI8YB9Lo3J4fiKDXze0MGDCUv0+jI="; }; nativeBuildInputs = [ installShellFiles ]; @@ -28,7 +28,7 @@ rustPlatform.buildRustPackage rec { --replace '"fzf"' '"${fzf}/bin/fzf"' ''; - cargoSha256 = "sha256-OAvE/KFoS4+18J+kOZTYa9zgnkWh/0bgy9iglGyZ8PQ="; + cargoSha256 = "sha256-toFfxDQcN6nSzSrvlW7aychikc6GeZ8eHjvH9e6dtHQ="; postInstall = '' installManPage man/man*/* diff --git a/pkgs/tools/networking/brook/default.nix b/pkgs/tools/networking/brook/default.nix index e0e37e99ac743..b4a5a30beeb35 100644 --- a/pkgs/tools/networking/brook/default.nix +++ b/pkgs/tools/networking/brook/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "brook"; - version = "20220515"; + version = "20220707"; src = fetchFromGitHub { owner = "txthinking"; repo = pname; rev = "v${version}"; - sha256 = "sha256-olYlAuIcK34nNXbfiPT4+u0L3xcxBMMty72FjSeuNqg="; + sha256 = "sha256-TlbVXfNUvCHHX0BReSVE6GNfmS+p6lWSdO0OtOC+I2U="; }; - vendorSha256 = "sha256-ic5QYRVElEuH4D29PXgTzMHU0KjrxDqcdfg7Kd37/YU="; + vendorSha256 = "sha256-MPLM1lBM1K55q6nsfmOekdFlSDmPsLLDv09mD1XqLNo="; meta = with lib; { homepage = "https://github.com/txthinking/brook"; diff --git a/pkgs/tools/networking/clash/default.nix b/pkgs/tools/networking/clash/default.nix index d3125d13adabd..0341e7e7f3d32 100644 --- a/pkgs/tools/networking/clash/default.nix +++ b/pkgs/tools/networking/clash/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "clash"; - version = "1.10.6"; + version = "1.11.0"; src = fetchFromGitHub { owner = "Dreamacro"; repo = pname; rev = "v${version}"; - sha256 = "sha256-v9MUMgHIpHDUEmB5vXOIOkSriX+PCPtiiHHB4H5FeMw="; + sha256 = "sha256-8g5rrkRA31wHvwY3JDFIU+slU0cLHFpADyd897hVyw0="; }; - vendorSha256 = "sha256-egbXCRmC862tctapMUWTcNej1g6a9wCt2JIC9DSEP6k="; + vendorSha256 = "sha256-iW14KxtUY2nhpShcdrHLiCRZxsoXyLSPt01dB0Ds28Y="; # Do not build testing suit excludedPackages = [ "./test" ]; diff --git a/pkgs/tools/networking/fdm/default.nix b/pkgs/tools/networking/fdm/default.nix index 608b669535d46..7e66fde030342 100644 --- a/pkgs/tools/networking/fdm/default.nix +++ b/pkgs/tools/networking/fdm/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "fdm"; - version = "2.0"; + version = "2.1"; src = fetchFromGitHub { owner = "nicm"; repo = pname; rev = version; - sha256 = "0j2n271ni5wslgjq1f4zgz1nsvqjf895dxy3ij5c904bbp8ckcwq"; + sha256 = "sha256-w7jgFq/uWGTF8+CsQCwXKu3eJ7Yjp1WWY4DGQhpBFmQ="; }; nativeBuildInputs = [ autoreconfHook ]; diff --git a/pkgs/tools/networking/frp/default.nix b/pkgs/tools/networking/frp/default.nix index 5e39491096f27..864893b1467af 100644 --- a/pkgs/tools/networking/frp/default.nix +++ b/pkgs/tools/networking/frp/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "frp"; - version = "0.42.0"; + version = "0.43.0"; src = fetchFromGitHub { owner = "fatedier"; repo = pname; rev = "v${version}"; - sha256 = "sha256-Ubc9jRZ+rkJ5TelizP6z9Hef6TkypfGMhZN+H4Awdqc="; + sha256 = "sha256-ked1emPx9pOz54s4ViutY41s7sQG+IjX/eZJkX15IGo="; }; vendorSha256 = "sha256-5ljUbEvynNo1AxGpJq9B0bTFgzVfgVZbsqXcPBERLMI="; diff --git a/pkgs/tools/networking/ghostunnel/default.nix b/pkgs/tools/networking/ghostunnel/default.nix index f6986a1516b37..16350850163e3 100644 --- a/pkgs/tools/networking/ghostunnel/default.nix +++ b/pkgs/tools/networking/ghostunnel/default.nix @@ -7,16 +7,16 @@ buildGoModule rec { pname = "ghostunnel"; - version = "1.6.0"; + version = "1.6.1"; src = fetchFromGitHub { owner = "ghostunnel"; repo = "ghostunnel"; rev = "v${version}"; - sha256 = "sha256-EE8gCm/gOp3lmCx1q4PahulipLoBZnEatNAVUXzHIVw="; + sha256 = "sha256-VameENcHZ6AttV0D8ekPGGFoMHTiTXAY2FxK/Nxwjmk="; }; - vendorSha256 = "sha256-XgmvqB1PCfL2gSDqwqauSixk8vlINHRmX6U0h9EXXdU="; + vendorSha256 = null; deleteVendor = true; diff --git a/pkgs/tools/networking/godns/default.nix b/pkgs/tools/networking/godns/default.nix index 3cede3a9a3305..063a8c34cffe4 100644 --- a/pkgs/tools/networking/godns/default.nix +++ b/pkgs/tools/networking/godns/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "godns"; - version = "2.7.8"; + version = "2.7.9"; src = fetchFromGitHub { owner = "TimothyYe"; repo = "godns"; rev = "v${version}"; - sha256 = "sha256-8uGw8F4HcpSsZF8X4cYz9ETsLLBH/NbOk2QzbAXFVFo="; + sha256 = "sha256-gFleIRXYfO/gocyVyVzp3ZnJ6gUVmR7IAc0Z985YnVI="; }; vendorSha256 = "sha256-tXH62HyA/pJxt69GWkVrJ4VrA16KfpEtpK/YKiUkvtU="; diff --git a/pkgs/tools/networking/mu/default.nix b/pkgs/tools/networking/mu/default.nix index fd140bfe55edc..ec5b13b34f26e 100644 --- a/pkgs/tools/networking/mu/default.nix +++ b/pkgs/tools/networking/mu/default.nix @@ -1,53 +1,46 @@ -{ lib, stdenv, fetchFromGitHub, sqlite, pkg-config, autoreconfHook, pmccabe -, xapian, glib, gmime3, texinfo, emacs, guile -, gtk3, webkitgtk, libsoup, icu -, makeWrapper -, withMug ? false -, batchSize ? null }: +{ lib +, stdenv +, fetchFromGitHub +, meson +, ninja +, pkg-config +, coreutils +, emacs +, glib +, gmime3 +, texinfo +, xapian +}: stdenv.mkDerivation rec { pname = "mu"; - version = "1.6.11"; + version = "1.8.1"; src = fetchFromGitHub { owner = "djcb"; repo = "mu"; - rev = version; - sha256 = "E/6+vEwYXk65/ZoAtUeTjvg56g6gz+Qtcaz0qwEru6c="; + rev = "v${version}"; + sha256 = "dFYITyO9znocf9fv3eh2h83NM3RDYcpDV/uxOISChZo="; }; - postPatch = lib.optionalString (batchSize != null) '' - sed -i lib/mu-store.cc --regexp-extended \ - -e 's@(constexpr auto BatchSize).*@\1 = ${toString batchSize};@' - ''; + postPatch = '' + # Fix mu4e-builddir (set it to $out) + substituteInPlace mu4e/mu4e-config.el.in \ + --replace "@abs_top_builddir@" "$out" + substituteInPlace lib/utils/mu-utils.cc \ + --replace "/bin/rm" "${coreutils}/bin/rm" + ''; - buildInputs = [ - sqlite xapian glib gmime3 texinfo emacs libsoup icu - ] - # Workaround for https://github.com/djcb/mu/issues/1641 - ++ lib.optional (!stdenv.isDarwin) guile - ++ lib.optionals withMug [ gtk3 webkitgtk ]; + buildInputs = [ emacs glib gmime3 texinfo xapian ]; - nativeBuildInputs = [ pkg-config autoreconfHook pmccabe makeWrapper ]; + mesonFlags = [ + "-Dguile=disabled" + "-Dreadline=disabled" + ]; - enableParallelBuilding = true; + nativeBuildInputs = [ pkg-config meson ninja ]; - preBuild = '' - # Fix mu4e-builddir (set it to $out) - substituteInPlace mu4e/mu4e-meta.el.in \ - --replace "@abs_top_builddir@" "$out" - ''; - - # Make sure included scripts can find their dependencies & optionally install mug - postInstall = '' - wrapProgram "$out/bin/mu" \ - --prefix LD_LIBRARY_PATH : "$out/lib" \ - --prefix GUILE_LOAD_PATH : "$out/share/guile/site/2.2" - '' + lib.optionalString withMug '' - for f in mug ; do - install -m755 toys/$f/$f $out/bin/$f - done - ''; + enableParallelBuilding = true; doCheck = true; @@ -55,7 +48,7 @@ stdenv.mkDerivation rec { description = "A collection of utilties for indexing and searching Maildirs"; license = licenses.gpl3Plus; homepage = "https://www.djcbsoftware.nl/code/mu/"; - changelog = "https://github.com/djcb/mu/releases/tag/${version}"; + changelog = "https://github.com/djcb/mu/releases/tag/v${version}"; maintainers = with maintainers; [ antono chvp peterhoeg ]; platforms = platforms.mesaPlatforms; }; diff --git a/pkgs/tools/networking/pykms/default.nix b/pkgs/tools/networking/pykms/default.nix index d648ff3ec1ed1..fac532110d2f2 100644 --- a/pkgs/tools/networking/pykms/default.nix +++ b/pkgs/tools/networking/pykms/default.nix @@ -37,15 +37,15 @@ pypkgs.buildPythonApplication rec { version = "unstable-2021-01-25"; src = fetchFromGitHub { - owner = "SystemRage"; + owner = "Py-KMS-Organization"; repo = "py-kms"; - rev = "a3b0c85b5b90f63b33dfa5ae6085fcd52c6da2ff"; - sha256 = "sha256-u0R0uJMQxHnJUDenxglhQkZza3/1DcyXCILcZVceygA="; + rev = "1435c86fe4f11aa7fd42d77fa61715ca3015eeab"; + hash = "sha256-9KiMbS0uKTbWSZVIv5ziIeR9c8+EKfKd20yPmjCX7GQ="; }; sourceRoot = "source/py-kms"; - propagatedBuildInputs = with pypkgs; [ systemd pytz tzlocal ]; + propagatedBuildInputs = with pypkgs; [ systemd pytz tzlocal dnspython ]; postPatch = '' siteDir=$out/${python3.sitePackages} @@ -64,11 +64,14 @@ pypkgs.buildPythonApplication rec { mkdir -p $siteDir + PYTHONPATH="$PYTHONPATH:$siteDir" + mv * $siteDir for b in Client Server ; do makeWrapper ${python3.interpreter} $out/bin/''${b,,} \ --argv0 pykms-''${b,,} \ - --add-flags $siteDir/pykms_$b.py + --add-flags $siteDir/pykms_$b.py \ + --set PYTHONPATH $PYTHONPATH done install -Dm755 ${dbScript} $out/libexec/create_pykms_db.sh @@ -82,8 +85,8 @@ pypkgs.buildPythonApplication rec { meta = with lib; { description = "Windows KMS (Key Management Service) server written in Python"; - homepage = "https://github.com/SystemRage/py-kms"; + homepage = "https://github.com/Py-KMS-Organization/py-kms"; license = licenses.unlicense; - maintainers = with maintainers; [ peterhoeg ]; + maintainers = with maintainers; [ peterhoeg zopieux ]; }; } diff --git a/pkgs/tools/networking/routedns/default.nix b/pkgs/tools/networking/routedns/default.nix new file mode 100644 index 0000000000000..4cf2c9eeeed8b --- /dev/null +++ b/pkgs/tools/networking/routedns/default.nix @@ -0,0 +1,29 @@ +{ lib +, buildGoModule +, fetchFromGitHub +}: + +buildGoModule rec { + pname = "routedns"; + version = "0.1.5"; + + src = fetchFromGitHub { + owner = "folbricht"; + repo = "routedns"; + # https://github.com/folbricht/routedns/issues/237 + rev = "02f14a567fee2a289810979446f5260b8a31bf73"; + sha256 = "sha256-oImimNBz1qizUPD6qHi73fGKNCu5cii99GIUo21e+bs="; + }; + + vendorSha256 = "sha256-T6adpxJgOPGy+UOOlGAAf1gjk1wJxwOc9enfv9X3LBE="; + + subPackages = [ "./cmd/routedns" ]; + + meta = with lib; { + homepage = "https://github.com/folbricht/routedns"; + description = "DNS stub resolver, proxy and router"; + license = licenses.bsd3; + maintainers = with maintainers; [ jsimonetti ]; + platforms = platforms.linux; + }; +} diff --git a/pkgs/tools/nix/alejandra/default.nix b/pkgs/tools/nix/alejandra/default.nix index 0e7f5e133eaad..5cfacdb50bc04 100644 --- a/pkgs/tools/nix/alejandra/default.nix +++ b/pkgs/tools/nix/alejandra/default.nix @@ -7,16 +7,16 @@ rustPlatform.buildRustPackage rec { pname = "alejandra"; - version = "1.4.0"; + version = "1.5.0"; src = fetchFromGitHub { owner = "kamadorueda"; repo = "alejandra"; rev = version; - sha256 = "sha256-0AolxQtKj3Oek0WSbODDpPVO5Ih8PXHOA3qXEKPB4dQ="; + sha256 = "sha256-A0ruEdPeKIzGYxyXNACnzaKtQUVc30s2ExTUzdFTcWM="; }; - cargoSha256 = "sha256-USI98hozlTaTj07tMbCQEWDgRkHsd4PFW1HUpKsNZJA="; + cargoSha256 = "sha256-BmpFyVF2fxV3rExI7rpOQlVwHEJNlof44dnUshaO/no="; passthru.tests = { version = testers.testVersion { package = alejandra; }; diff --git a/pkgs/tools/nix/nar-serve/default.nix b/pkgs/tools/nix/nar-serve/default.nix index 1d7fd6beb4a7d..10ac797578f98 100644 --- a/pkgs/tools/nix/nar-serve/default.nix +++ b/pkgs/tools/nix/nar-serve/default.nix @@ -4,16 +4,16 @@ }: buildGoModule rec { pname = "nar-serve"; - version = "0.4.0"; + version = "0.6.1"; src = fetchFromGitHub { owner = "numtide"; repo = "nar-serve"; rev = "v${version}"; - hash = "sha256-h/pzKRXgcGTpr1YUKppDa+iTLKak/PGhbYa8ZczWj1U="; + hash = "sha256-cSOYHYJJEGzFtkD4mjTmYBiM9CaWKt64xgV/JeNHpfM="; }; - vendorSha256 = "sha256-eW+cul/5qJocpKV/6azxj7HTmkezDw6dNubPtAOP5HU="; + vendorSha256 = "sha256-RpjLs4+9abbbysYAlPDUXBLe1cz4Lp+QmR1yv+LpYwQ="; doCheck = false; diff --git a/pkgs/tools/nix/nixel/default.nix b/pkgs/tools/nix/nixel/default.nix new file mode 100644 index 0000000000000..5ce14a8d312fe --- /dev/null +++ b/pkgs/tools/nix/nixel/default.nix @@ -0,0 +1,36 @@ +{ lib +, rustPlatform +, fetchFromGitHub +, testers +, nixel +}: + +rustPlatform.buildRustPackage rec { + pname = "nixel"; + version = "4.1.0"; + + src = fetchFromGitHub { + owner = "kamadorueda"; + repo = pname; + rev = version; + sha256 = "sha256-dQ3wzBTjteqk9rju+FMAO+ydimnGu24Y2DEDLX/P+1A="; + }; + + cargoSha256 = "sha256-1OsHs0W3ji9Kgpv7nGY9XyGxJ4c0faN2VuFLsdwkgKY="; + + # Package requires a non reproducible submodule + # https://github.com/kamadorueda/nixel/blob/2873bd84bf4fc540d0ae8af062e109cc9ad40454/.gitmodules#L7 + doCheck = false; + # + # Let's test it runs + passthru.tests = { + version = testers.testVersion { package = nixel; }; + }; + + meta = with lib; { + description = "Lexer, Parser, Abstract Syntax Tree and Concrete Syntax Tree for the Nix Expressions Language"; + homepage = "https://github.com/kamadorueda/nixel"; + license = licenses.agpl3Only; + maintainers = with maintainers; [ kamadorueda ]; + }; +} diff --git a/pkgs/tools/package-management/appimagekit/default.nix b/pkgs/tools/package-management/appimagekit/default.nix index 3118b784334b0..151566ba8e8e2 100644 --- a/pkgs/tools/package-management/appimagekit/default.nix +++ b/pkgs/tools/package-management/appimagekit/default.nix @@ -96,6 +96,7 @@ in stdenv.mkDerivation rec { "-DUSE_SYSTEM_LIBARCHIVE=ON" "-DUSE_SYSTEM_GTEST=ON" "-DUSE_SYSTEM_MKSQUASHFS=ON" + "-DTOOLS_PREFIX=${stdenv.cc.targetPrefix}" ]; postInstall = '' diff --git a/pkgs/tools/package-management/micromamba/default.nix b/pkgs/tools/package-management/micromamba/default.nix index c1f8fc9c990bd..70443695e0ff1 100644 --- a/pkgs/tools/package-management/micromamba/default.nix +++ b/pkgs/tools/package-management/micromamba/default.nix @@ -1,5 +1,20 @@ -{ lib, stdenv, fetchFromGitHub, fetchpatch, cmake -, cli11, nlohmann_json, curl, libarchive, libyamlcpp, libsolv, reproc, spdlog, termcolor, ghc_filesystem +{ lib +, stdenv +, fetchFromGitHub +, fetchpatch +, cli11 +, cmake +, curl +, ghc_filesystem +, libarchive +, libsolv +, libyamlcpp +, nlohmann_json +, python3 +, reproc +, spdlog +, termcolor +, tl-expected }: let @@ -9,7 +24,8 @@ let ]; patches = [ - # Patch added by the mamba team + # Apply the same patch as in the "official" boa-forge build: + # https://github.com/mamba-org/boa-forge/tree/master/libsolv (fetchpatch { url = "https://raw.githubusercontent.com/mamba-org/boa-forge/20530f80e2e15012078d058803b6e2c75ed54224/libsolv/conda_variant_priorization.patch"; sha256 = "1iic0yx7h8s662hi2jqx68w5kpyrab4fr017vxd4wyxb6wyk35dd"; @@ -28,13 +44,13 @@ let in stdenv.mkDerivation rec { pname = "micromamba"; - version = "0.22.0"; + version = "0.24.0"; src = fetchFromGitHub { owner = "mamba-org"; repo = "mamba"; rev = "micromamba-" + version; - sha256 = "sha256-9/vkn8wks2nyzIn5hnK+zvX18Du2B8YZ3/ugrmEGVH8="; + sha256 = "sha256-CszDmt3SElHo1D2sNy2tPhZ43YD3pDjT8+fp2PVk+7Y="; }; nativeBuildInputs = [ cmake ]; @@ -50,6 +66,8 @@ stdenv.mkDerivation rec { spdlog' termcolor ghc_filesystem + python3 + tl-expected ]; cmakeFlags = [ @@ -63,7 +81,7 @@ stdenv.mkDerivation rec { description = "Reimplementation of the conda package manager"; homepage = "https://github.com/mamba-org/mamba"; license = licenses.bsd3; - platforms = platforms.linux; + platforms = platforms.all; maintainers = with maintainers; [ mausch ]; }; } diff --git a/pkgs/tools/security/gopass/git-credential.nix b/pkgs/tools/security/gopass/git-credential.nix index 0b15e9b023537..9877131d0a345 100644 --- a/pkgs/tools/security/gopass/git-credential.nix +++ b/pkgs/tools/security/gopass/git-credential.nix @@ -7,16 +7,16 @@ buildGoModule rec { pname = "git-credential-gopass"; - version = "1.12.0"; + version = "1.14.3"; src = fetchFromGitHub { owner = "gopasspw"; repo = pname; rev = "v${version}"; - sha256 = "sha256-IvYxpUMclDAKJ/EkRbNrX8eIFyhtY9Q0B0RipweieZA="; + sha256 = "sha256-ggdQL8BU56zE5figmbfHKlZ7WGZ7z5nKunXTy3kn170="; }; - vendorSha256 = "sha256-N6eU6KsnUrYBK90ydwUH8LNkR9KRjgc4ciGOGvy7pw8="; + vendorSha256 = "sha256-fwqkiPzrfo83NweuGONRx8+MOE4wQxg2Xk4/1kZwnCM="; subPackages = [ "." ]; diff --git a/pkgs/tools/security/gopass/hibp.nix b/pkgs/tools/security/gopass/hibp.nix new file mode 100644 index 0000000000000..49618c53aead2 --- /dev/null +++ b/pkgs/tools/security/gopass/hibp.nix @@ -0,0 +1,39 @@ +{ lib +, makeWrapper +, buildGoModule +, fetchFromGitHub +, gopass +}: + +buildGoModule rec { + pname = "gopass-hibp"; + version = "1.14.3"; + + src = fetchFromGitHub { + owner = "gopasspw"; + repo = pname; + rev = "v${version}"; + sha256 = "sha256-JwZZ2VaSD9xkLny5sFeku5rN4FitI1dyW56JSWPMagM="; + }; + + vendorSha256 = "sha256-YySkVWdfGIT5qz0jTGlLEHoO0vGY0iNZ/oG9IZCjwRE="; + + subPackages = [ "." ]; + + nativeBuildInputs = [ makeWrapper ]; + + ldflags = [ + "-s" "-w" "-X main.version=${version}" "-X main.commit=${src.rev}" + ]; + + postFixup = '' + wrapProgram $out/bin/gopass-hibp --prefix PATH : "${lib.makeBinPath [ gopass ]}" + ''; + + meta = with lib; { + description = "Gopass haveibeenpwnd.com integration"; + homepage = "https://www.gopass.pw/"; + license = licenses.mit; + maintainers = with maintainers; [ sikmir ]; + }; +} diff --git a/pkgs/tools/security/gopass/jsonapi.nix b/pkgs/tools/security/gopass/jsonapi.nix index c138bde2cc3c6..5f6dab2e9069a 100644 --- a/pkgs/tools/security/gopass/jsonapi.nix +++ b/pkgs/tools/security/gopass/jsonapi.nix @@ -8,16 +8,16 @@ buildGoModule rec { pname = "gopass-jsonapi"; - version = "1.11.1"; + version = "1.14.3"; src = fetchFromGitHub { owner = "gopasspw"; repo = pname; rev = "v${version}"; - sha256 = "03xhza7n92xg12z83as9qdvvc0yx1qy6q0c7i4njvng594f9a8x2"; + sha256 = "sha256-uLsKxx2Yr0g3vf2AQqRqRzNsBX2D4+6wwxM+czthL+I="; }; - vendorSha256 = "0d4fyppsdfzvmjb0qvpnfnw0vl6z256bly7hfb0whk6rldks60wr"; + vendorSha256 = "sha256-QEqtyHb+/tpbbHLCSBw7uafAtKzKkmxoFGqFVHSR03I="; subPackages = [ "." ]; diff --git a/pkgs/tools/security/gopass/summon.nix b/pkgs/tools/security/gopass/summon.nix index c1be7c9eb0811..f3968bb3ce2a1 100644 --- a/pkgs/tools/security/gopass/summon.nix +++ b/pkgs/tools/security/gopass/summon.nix @@ -7,16 +7,16 @@ buildGoModule rec { pname = "gopass-summon-provider"; - version = "1.12.0"; + version = "1.14.3"; src = fetchFromGitHub { owner = "gopasspw"; repo = pname; rev = "v${version}"; - sha256 = "sha256-mRZXczIlW1s0VGZJ+KQue4Dz6XCXGfl56+g6iRv2lZg="; + sha256 = "sha256-Pbe5LMQioHDBHeEoT2brtsEBKq4oNROIlLccIjppRVo="; }; - vendorSha256 = "sha256-fiV4rtel2jOw6y/ukOZHeFuNVqxHS3rnYhXJ6JZ+a/8="; + vendorSha256 = "sha256-U0qniRHl4YgSy1GpsaYknMQpjpM8uKNtyLm6YblSd4U="; subPackages = [ "." ]; diff --git a/pkgs/tools/security/grype/default.nix b/pkgs/tools/security/grype/default.nix index e57ae69b1872d..47aa65264ff4d 100644 --- a/pkgs/tools/security/grype/default.nix +++ b/pkgs/tools/security/grype/default.nix @@ -7,13 +7,13 @@ buildGoModule rec { pname = "grype"; - version = "0.40.0"; + version = "0.40.1"; src = fetchFromGitHub { owner = "anchore"; repo = pname; rev = "v${version}"; - hash = "sha256-Lpv4A8g/yfurma5NKQFWPy5vfuOyp/dSLf4pQCFOKLY="; + hash = "sha256-op0oNtHljAjEmWCjvWHk/jGf8De6IdX7Y0dfPl7dkN0="; # populate values that require us to use git. By doing this in postFetch we # can delete .git afterwards and maintain better reproducibility of the src. leaveDotGit = true; @@ -26,7 +26,7 @@ buildGoModule rec { ''; }; - vendorSha256 = "sha256-4dw7OPrBwpMTHY6MpAJ1p9sEauBw+k3aYmoa0ezn9Rw="; + vendorSha256 = "sha256-5huViLIs6SZoO0cAIf2sI20qlQUsFi+Rv68PvfbVgBw="; nativeBuildInputs = [ installShellFiles diff --git a/pkgs/tools/security/himitsu-firefox/default.nix b/pkgs/tools/security/himitsu-firefox/default.nix new file mode 100644 index 0000000000000..b462863011871 --- /dev/null +++ b/pkgs/tools/security/himitsu-firefox/default.nix @@ -0,0 +1,46 @@ +{ lib +, stdenv +, fetchFromSourcehut +, hare +, himitsu +, zip +}: + +stdenv.mkDerivation rec { + pname = "himitsu-firefox"; + version = "0.3"; + + src = fetchFromSourcehut { + name = pname + "-src"; + owner = "~sircmpwn"; + repo = pname; + rev = "d6d0fdb30aefc93f6ff7d48e5737557051f1ffea"; + hash = "sha256-5RbNdEGPnfDt1KDeU2LnuRsqqqMRyV/Dh2cgEWkz4vQ="; + }; + + nativeBuildInputs = [ + hare + zip + ]; + + buildInputs = [ + himitsu + ]; + + buildFlags = [ "LIBEXECDIR=$(out)/libexec" ]; + + # Only install the native component; per the docs: + # > To install the add-on for Firefox ESR, run make install-xpi. Be advised + # > that this will probably not work. The recommended installation procedure + # > for the native extension is to install it from addons.mozilla.org instead. + installTargets = [ "install-native" ]; + installFlags = [ "PREFIX=" "DESTDIR=$(out)" ]; + + meta = with lib; { + homepage = "https://git.sr.ht/~sircmpwn/himitsu-firefox"; + description = "Himitsu integration for Firefox"; + license = licenses.gpl3Only; + maintainers = with maintainers; [ auchter ]; + inherit (hare.meta) platforms badPlatforms; + }; +} diff --git a/pkgs/tools/security/himitsu/default.nix b/pkgs/tools/security/himitsu/default.nix new file mode 100644 index 0000000000000..e48de780d72dd --- /dev/null +++ b/pkgs/tools/security/himitsu/default.nix @@ -0,0 +1,34 @@ +{ lib +, stdenv +, fetchFromSourcehut +, hare +, scdoc +}: + +stdenv.mkDerivation rec { + pname = "himitsu"; + version = "0.1"; + + src = fetchFromSourcehut { + name = pname + "-src"; + owner = "~sircmpwn"; + repo = pname; + rev = "003c14747fcddceb5359c9503f20c44b15fea5fa"; + hash = "sha256-tzBTDJKMuFh9anURy1aKQTmt77tI7wZDZQiOUowuomk="; + }; + + nativeBuildInputs = [ + hare + scdoc + ]; + + installFlags = [ "PREFIX=" "DESTDIR=$(out)" ]; + + meta = with lib; { + homepage = "https://himitsustore.org/"; + description = "A secret storage manager"; + license = licenses.gpl3Only; + maintainers = with maintainers; [ auchter ]; + inherit (hare.meta) platforms badPlatforms; + }; +} diff --git a/pkgs/tools/security/metasploit/Gemfile b/pkgs/tools/security/metasploit/Gemfile index d2ae05738047e..8350e202156e4 100644 --- a/pkgs/tools/security/metasploit/Gemfile +++ b/pkgs/tools/security/metasploit/Gemfile @@ -1,4 +1,4 @@ # frozen_string_literal: true source "https://rubygems.org" -gem "metasploit-framework", git: "https://github.com/rapid7/metasploit-framework", ref: "refs/tags/6.2.3" +gem "metasploit-framework", git: "https://github.com/rapid7/metasploit-framework", ref: "refs/tags/6.2.4" diff --git a/pkgs/tools/security/metasploit/Gemfile.lock b/pkgs/tools/security/metasploit/Gemfile.lock index 5fa3d58634395..6dd9a21eaa9da 100644 --- a/pkgs/tools/security/metasploit/Gemfile.lock +++ b/pkgs/tools/security/metasploit/Gemfile.lock @@ -1,9 +1,9 @@ GIT remote: https://github.com/rapid7/metasploit-framework - revision: ef3f1dfb9c196e19174e59f5d75707fffb847073 - ref: refs/tags/6.2.3 + revision: ed772a23efa7e2a7d7ae6417939e900c66950fd9 + ref: refs/tags/6.2.4 specs: - metasploit-framework (6.2.3) + metasploit-framework (6.2.4) actionpack (~> 6.0) activerecord (~> 6.0) activesupport (~> 6.0) @@ -32,7 +32,7 @@ GIT metasploit-concern metasploit-credential metasploit-model - metasploit-payloads (= 2.0.93) + metasploit-payloads (= 2.0.94) metasploit_data_models metasploit_payloads-mettle (= 1.0.18) mqtt @@ -130,13 +130,13 @@ GEM arel-helpers (2.14.0) activerecord (>= 3.1.0, < 8) aws-eventstream (1.2.0) - aws-partitions (1.600.0) - aws-sdk-core (3.131.1) + aws-partitions (1.601.0) + aws-sdk-core (3.131.2) aws-eventstream (~> 1, >= 1.0.2) aws-partitions (~> 1, >= 1.525.0) aws-sigv4 (~> 1.1) jmespath (~> 1, >= 1.6.1) - aws-sdk-ec2 (1.318.0) + aws-sdk-ec2 (1.319.0) aws-sdk-core (~> 3, >= 3.127.0) aws-sigv4 (~> 1.1) aws-sdk-iam (1.69.0) @@ -238,7 +238,7 @@ GEM activemodel (~> 6.0) activesupport (~> 6.0) railties (~> 6.0) - metasploit-payloads (2.0.93) + metasploit-payloads (2.0.94) metasploit_data_models (5.0.5) activerecord (~> 6.0) activesupport (~> 6.0) @@ -252,7 +252,7 @@ GEM metasploit_payloads-mettle (1.0.18) method_source (1.0.0) mini_portile2 (2.8.0) - minitest (5.16.0) + minitest (5.16.1) mqtt (0.5.0) msgpack (1.5.2) multi_json (1.15.0) @@ -290,7 +290,7 @@ GEM hashery (~> 2.0) ruby-rc4 ttfunk - pg (1.3.5) + pg (1.4.1) public_suffix (4.0.7) puma (5.6.4) nio4r (~> 2.0) @@ -298,8 +298,8 @@ GEM rack (2.2.3.1) rack-protection (2.2.0) rack - rack-test (1.1.0) - rack (>= 1.0, < 3) + rack-test (2.0.0) + rack (>= 1.3) rails-dom-testing (2.0.3) activesupport (>= 4.2.0) nokogiri (>= 1.6) @@ -371,7 +371,7 @@ GEM ruby-macho (3.0.0) ruby-rc4 (0.1.5) ruby2_keywords (0.0.5) - ruby_smb (3.1.3) + ruby_smb (3.1.4) bindata openssl-ccm openssl-cmac diff --git a/pkgs/tools/security/metasploit/default.nix b/pkgs/tools/security/metasploit/default.nix index 126d21bc7d0b5..ae3c75c630fe8 100644 --- a/pkgs/tools/security/metasploit/default.nix +++ b/pkgs/tools/security/metasploit/default.nix @@ -15,13 +15,13 @@ let }; in stdenv.mkDerivation rec { pname = "metasploit-framework"; - version = "6.2.3"; + version = "6.2.4"; src = fetchFromGitHub { owner = "rapid7"; repo = "metasploit-framework"; rev = version; - sha256 = "sha256-5G2xjzdZro01Es3oqnUFO9TrvBCku5QE7DjPgU0xlc8="; + sha256 = "sha256-9JzavB6VMEM7UFa30WlHdZ/hajOly+JX75I+3DECOqM="; }; nativeBuildInputs = [ makeWrapper ]; diff --git a/pkgs/tools/security/metasploit/gemset.nix b/pkgs/tools/security/metasploit/gemset.nix index baa4aea667211..98a026aaa9f20 100644 --- a/pkgs/tools/security/metasploit/gemset.nix +++ b/pkgs/tools/security/metasploit/gemset.nix @@ -104,30 +104,30 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0cx73zazv4jsh51b08jgf7pzn62wmfqlwwg2z8w4rcqbvn326n93"; + sha256 = "0ydlikjhhsiqk7v8k7q1f036fd7yrmimasw40rnwcj3f1747lygd"; type = "gem"; }; - version = "1.600.0"; + version = "1.601.0"; }; aws-sdk-core = { groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0yiz3aaik62rxhxipwznb2bv8ywha13vdxg9nk6anq9bd0nn0728"; + sha256 = "164abp3cvmvfa2qsgzbxvkafbhwbgn3qwknp0amwmxw5nwvz8p3s"; type = "gem"; }; - version = "3.131.1"; + version = "3.131.2"; }; aws-sdk-ec2 = { groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0airi3qgnjdxl3n459nxq6bjwq0i3jyvwa0pv8nivw6lnskl1jps"; + sha256 = "0b42j6hdw62qz02j1llqp4c4y0dx39x3wfk1nprxwl27sdvy1mgk"; type = "gem"; }; - version = "1.318.0"; + version = "1.319.0"; }; aws-sdk-iam = { groups = ["default"]; @@ -614,12 +614,12 @@ platforms = []; source = { fetchSubmodules = false; - rev = "ef3f1dfb9c196e19174e59f5d75707fffb847073"; - sha256 = "1kwm656q3krqxh299fx422yfpm1v0mssms6d28sqvbjr6y7v2vg4"; + rev = "ed772a23efa7e2a7d7ae6417939e900c66950fd9"; + sha256 = "18rs08qxqgljxxby5jx56dmf37vm8xlx3dsna0xl6c4m3sydm77l"; type = "git"; url = "https://github.com/rapid7/metasploit-framework"; }; - version = "6.2.3"; + version = "6.2.4"; }; metasploit-model = { groups = ["default"]; @@ -636,10 +636,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0y06rkm2zh13qz1b40srx7dd1f5yl669k01ji4ha41pqn7wcv32v"; + sha256 = "1azr70qfq14wpki61hnljqnxnxlx9ifa4p92wh29cnak8v697v69"; type = "gem"; }; - version = "2.0.93"; + version = "2.0.94"; }; metasploit_data_models = { groups = ["default"]; @@ -686,10 +686,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "05ik7y422ylnv391w7lh812w43p1dirlvkzyq09v27ag683fvsbh"; + sha256 = "08z6rgs1jgbc032843mwg3fayvzn4hihz8bl2gp87pf7z02kw5f3"; type = "gem"; }; - version = "5.16.0"; + version = "5.16.1"; }; mqtt = { groups = ["default"]; @@ -917,10 +917,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "10ryzmc3r5ja6g90a9ycsxcxsy5872xa1vf01jam0bm74zq3zmi6"; + sha256 = "11q4zw8n0lmff5k514ip30yizr38jb2x5nh3m7fy3k13sbxbysrq"; type = "gem"; }; - version = "1.3.5"; + version = "1.4.1"; }; public_suffix = { groups = ["default"]; @@ -977,10 +977,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0rh8h376mx71ci5yklnpqqn118z3bl67nnv5k801qaqn1zs62h8m"; + sha256 = "01igqmm7xqw6vg6x28phivl044n2crq0bcfjrxr4979kzxydgh8h"; type = "gem"; }; - version = "1.1.0"; + version = "2.0.0"; }; rails-dom-testing = { groups = ["default"]; @@ -1297,10 +1297,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0vqj4lb41vkpv0dl65caw7w9h804vzbdw5q6wvkzqv1q0k8nbqbd"; + sha256 = "0cvavqvgwq2gcrg0gh8fdzyn9zzpkyh9g07jz6cn7zzxzgwxfn9v"; type = "gem"; }; - version = "3.1.3"; + version = "3.1.4"; }; rubyntlm = { groups = ["default"]; diff --git a/pkgs/tools/security/regpg/default.nix b/pkgs/tools/security/regpg/default.nix new file mode 100644 index 0000000000000..aaefbef227b88 --- /dev/null +++ b/pkgs/tools/security/regpg/default.nix @@ -0,0 +1,52 @@ +{ lib +, stdenv +, fetchFromGitHub +, makeWrapper +, gnupg +, perl +}: + +let + perlEnv = perl.withPackages (p: with p; [ TextMarkdown ]); +in +stdenv.mkDerivation rec { + pname = "regpg"; + version = "1.11"; + + src = fetchFromGitHub { + owner = "fanf2"; + repo = "regpg"; + rev = "regpg-${version}"; + sha256 = "2ea99950804078190e1cc2a76d4740e3fdd5395a9043db3f3fe86bf2477d3a7d"; + }; + + nativeBuildInputs = [ makeWrapper perlEnv ]; + + postPatch = '' + patchShebangs ./util/insert-here.pl ./util/markdown.pl + substituteInPlace ./Makefile \ + --replace 'util/insert-here.pl' 'perl util/insert-here.pl' + substituteInPlace ./Makefile \ + --replace 'util/markdown.pl' 'perl util/markdown.pl' + substituteInPlace util/insert-here.pl \ + --replace 'qx(git describe)' '"regpg-${version}"' + ''; + + dontConfigure = true; + + makeFlags = [ "prefix=$(out)" ]; + + postFixup = '' + patchShebangs $out/bin/regpg + wrapProgram $out/bin/regpg --prefix PATH ":" \ + "${lib.makeBinPath [ gnupg ]}" + ''; + + meta = with lib; { + description = "GPG wrapper utility for storing secrets in VCS"; + homepage = "https://dotat.at/prog/regpg"; + license = licenses.gpl3; + platforms = platforms.all; + maintainers = with maintainers; [ _0xC45 ]; + }; +} diff --git a/pkgs/tools/security/rekor/default.nix b/pkgs/tools/security/rekor/default.nix index 2ecff27825a3a..99928b96caa49 100644 --- a/pkgs/tools/security/rekor/default.nix +++ b/pkgs/tools/security/rekor/default.nix @@ -4,13 +4,13 @@ let generic = { pname, packageToBuild, description }: buildGoModule rec { inherit pname; - version = "0.8.1"; + version = "0.8.2"; src = fetchFromGitHub { owner = "sigstore"; repo = "rekor"; rev = "v${version}"; - sha256 = "sha256-QBS9vGKYe7aox0RhgiJ3wp7UmnxAmtox45xKOC0vhj0="; + sha256 = "sha256-EaOLqStoZJMTSS6g56UhFQRhuwYBjh/XLRX6JjD17+g="; # populate values that require us to use git. By doing this in postFetch we # can delete .git afterwards and maintain better reproducibility of the src. leaveDotGit = true; @@ -23,7 +23,7 @@ let ''; }; - vendorSha256 = "sha256-OZyRIi6y47c9eS8GLClgV4JGbSsvjd6KvED3N8LIe6I="; + vendorSha256 = "sha256-bvn5TKfTcB/0p47r5kW1P4OlnbWYQpESo9t8IC9f+fM="; nativeBuildInputs = [ installShellFiles ]; diff --git a/pkgs/tools/security/schleuder/Gemfile b/pkgs/tools/security/schleuder/Gemfile new file mode 100644 index 0000000000000..687c293bac913 --- /dev/null +++ b/pkgs/tools/security/schleuder/Gemfile @@ -0,0 +1,3 @@ +source 'https://rubygems.org' do + gem 'schleuder' +end diff --git a/pkgs/tools/security/schleuder/Gemfile.lock b/pkgs/tools/security/schleuder/Gemfile.lock new file mode 100644 index 0000000000000..a5b7312901c27 --- /dev/null +++ b/pkgs/tools/security/schleuder/Gemfile.lock @@ -0,0 +1,85 @@ +GEM + specs: + +GEM + remote: https://rubygems.org/ + specs: + activemodel (6.1.4.4) + activesupport (= 6.1.4.4) + activerecord (6.1.4.4) + activemodel (= 6.1.4.4) + activesupport (= 6.1.4.4) + activesupport (6.1.4.4) + concurrent-ruby (~> 1.0, >= 1.0.2) + i18n (>= 1.6, < 2) + minitest (>= 5.1) + tzinfo (~> 2.0) + zeitwerk (~> 2.3) + bcrypt (3.1.16) + charlock_holmes (0.7.7) + concurrent-ruby (1.1.9) + daemons (1.4.1) + eventmachine (1.2.7) + gpgme (2.0.20) + mini_portile2 (~> 2.3) + i18n (1.8.11) + concurrent-ruby (~> 1.0) + mail (2.7.1) + mini_mime (>= 0.1.1) + mail-gpg (0.4.4) + gpgme (~> 2.0, >= 2.0.2) + mail (~> 2.5, >= 2.5.3) + mini_mime (1.1.2) + mini_portile2 (2.7.1) + minitest (5.15.0) + multi_json (1.15.0) + mustermann (1.1.1) + ruby2_keywords (~> 0.0.1) + rack (2.2.3) + rack-protection (2.1.0) + rack + rake (13.0.6) + ruby2_keywords (0.0.5) + schleuder (4.0.2) + activerecord (~> 6.1.3) + bcrypt (~> 3.1.2) + charlock_holmes (~> 0.7.6) + gpgme (~> 2.0, >= 2.0.19) + mail (~> 2.7.1) + mail-gpg (~> 0.3) + rake (>= 10.5.0) + sinatra (~> 2) + sinatra-contrib (~> 2) + sqlite3 (~> 1.4.2) + thin (~> 1) + thor (~> 0) + sinatra (2.1.0) + mustermann (~> 1.0) + rack (~> 2.2) + rack-protection (= 2.1.0) + tilt (~> 2.0) + sinatra-contrib (2.1.0) + multi_json + mustermann (~> 1.0) + rack-protection (= 2.1.0) + sinatra (= 2.1.0) + tilt (~> 2.0) + sqlite3 (1.4.2) + thin (1.8.1) + daemons (~> 1.0, >= 1.0.9) + eventmachine (~> 1.0, >= 1.0.4) + rack (>= 1, < 3) + thor (0.20.3) + tilt (2.0.10) + tzinfo (2.0.4) + concurrent-ruby (~> 1.0) + zeitwerk (2.5.3) + +PLATFORMS + x86_64-linux + +DEPENDENCIES + schleuder! + +BUNDLED WITH + 2.2.24 diff --git a/pkgs/tools/security/schleuder/cli/Gemfile b/pkgs/tools/security/schleuder/cli/Gemfile new file mode 100644 index 0000000000000..428e856aecc65 --- /dev/null +++ b/pkgs/tools/security/schleuder/cli/Gemfile @@ -0,0 +1,4 @@ +source "https://rubygems.org" + +gem "schleuder-cli", git: "https://0xacab.org/schleuder/schleuder-cli", tag: "schleuder-cli-0.1.0" + diff --git a/pkgs/tools/security/schleuder/cli/Gemfile.lock b/pkgs/tools/security/schleuder/cli/Gemfile.lock new file mode 100644 index 0000000000000..bd47b9df7f9a0 --- /dev/null +++ b/pkgs/tools/security/schleuder/cli/Gemfile.lock @@ -0,0 +1,21 @@ +GIT + remote: https://0xacab.org/schleuder/schleuder-cli + revision: 1de2548695d9a74f47b7868954561b48cbc966f9 + tag: schleuder-cli-0.1.0 + specs: + schleuder-cli (0.1.0) + thor (~> 0) + +GEM + remote: https://rubygems.org/ + specs: + thor (0.20.3) + +PLATFORMS + x86_64-linux + +DEPENDENCIES + schleuder-cli! + +BUNDLED WITH + 2.3.6 diff --git a/pkgs/tools/security/schleuder/cli/default.nix b/pkgs/tools/security/schleuder/cli/default.nix new file mode 100644 index 0000000000000..e34afa699f042 --- /dev/null +++ b/pkgs/tools/security/schleuder/cli/default.nix @@ -0,0 +1,34 @@ +{ lib +, bundlerApp +, ruby +, bundlerUpdateScript +}: + +bundlerApp { + inherit ruby; + + pname = "schleuder-cli"; + + gemdir = ./.; + + installManpages = false; + + exes = [ + "schleuder-cli" + ]; + + passthru.updateScript = bundlerUpdateScript "schleuder-cli"; + + meta = with lib; { + description = "A command line tool to create and manage schleuder-lists"; + longDescription = '' + Schleuder-cli enables creating, configuring, and deleting lists, + subscriptions, keys, etc. It uses the Schleuder API, provided by + schleuder-api-daemon (part of Schleuder). + ''; + homepage = "https://schleuder.org"; + changelog = "https://0xacab.org/schleuder/schleuder-cli/-/blob/main/CHANGELOG.md"; + license = licenses.gpl3Plus; + maintainers = with maintainers; [ hexa ]; + }; +} diff --git a/pkgs/tools/security/schleuder/cli/gemset.nix b/pkgs/tools/security/schleuder/cli/gemset.nix new file mode 100644 index 0000000000000..45ff62f891370 --- /dev/null +++ b/pkgs/tools/security/schleuder/cli/gemset.nix @@ -0,0 +1,25 @@ +{ + schleuder-cli = { + dependencies = ["thor"]; + groups = ["default"]; + platforms = []; + source = { + fetchSubmodules = false; + rev = "1de2548695d9a74f47b7868954561b48cbc966f9"; + sha256 = "0k4i33w9a0bscw4wbs301vxca367g7pa89y6cr24i0014pbmhs9z"; + type = "git"; + url = "https://0xacab.org/schleuder/schleuder-cli"; + }; + version = "0.1.0"; + }; + thor = { + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1yhrnp9x8qcy5vc7g438amd5j9sw83ih7c30dr6g6slgw9zj3g29"; + type = "gem"; + }; + version = "0.20.3"; + }; +} diff --git a/pkgs/tools/security/schleuder/default.nix b/pkgs/tools/security/schleuder/default.nix new file mode 100644 index 0000000000000..84597f6f51bf7 --- /dev/null +++ b/pkgs/tools/security/schleuder/default.nix @@ -0,0 +1,38 @@ +{ lib +, bundlerApp +, ruby +, bundlerUpdateScript +, defaultGemConfig +, nixosTests +}: + +bundlerApp { + inherit ruby; + + pname = "schleuder"; + + gemdir = ./.; + + exes = [ + "schleuder" + "schleuder-api-daemon" + ]; + + passthru.updateScript = bundlerUpdateScript "schleuder"; + passthru.tests = { + inherit (nixosTests) schleuder; + }; + + meta = with lib; { + description = "Schleuder is an encrypting mailing list manager with remailing-capabilities"; + longDescription = '' + Schleuder is a group's email-gateway: subscribers can exchange + encrypted emails among themselves, receive emails from + non-subscribers and send emails to non-subscribers via the list. + ''; + homepage = "https://schleuder.org"; + changelog = "https://0xacab.org/schleuder/schleuder/blob/main/CHANGELOG.md"; + license = licenses.gpl3Plus; + maintainers = with maintainers; [ hexa lheckemann ]; + }; +} diff --git a/pkgs/tools/security/schleuder/gemset.nix b/pkgs/tools/security/schleuder/gemset.nix new file mode 100644 index 0000000000000..9bd9cadbb883b --- /dev/null +++ b/pkgs/tools/security/schleuder/gemset.nix @@ -0,0 +1,316 @@ +{ + activemodel = { + dependencies = ["activesupport"]; + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0g3qdz8dw6zkgz45jd13lwfdnm7rhgczv1pssw63g9k6qj3bkxjm"; + type = "gem"; + }; + version = "6.1.4.4"; + }; + activerecord = { + dependencies = ["activemodel" "activesupport"]; + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "090d4wl1pq06m9mibpck0m5nm8h45fwhs3fjx27297kjmnv4gzik"; + type = "gem"; + }; + version = "6.1.4.4"; + }; + activesupport = { + dependencies = ["concurrent-ruby" "i18n" "minitest" "tzinfo" "zeitwerk"]; + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0rvnz9lsf9mrkpji748sf51f54m027snkw6rm8flyvf7fq18rm98"; + type = "gem"; + }; + version = "6.1.4.4"; + }; + bcrypt = { + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "02r1c3isfchs5fxivbq99gc3aq4vfyn8snhcy707dal1p8qz12qb"; + type = "gem"; + }; + version = "3.1.16"; + }; + charlock_holmes = { + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0hybw8jw9ryvz5zrki3gc9r88jqy373m6v46ynxsdzv1ysiyr40p"; + type = "gem"; + }; + version = "0.7.7"; + }; + concurrent-ruby = { + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0nwad3211p7yv9sda31jmbyw6sdafzmdi2i2niaz6f0wk5nq9h0f"; + type = "gem"; + }; + version = "1.1.9"; + }; + daemons = { + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "07cszb0zl8mqmwhc8a2yfg36vi6lbgrp4pa5bvmryrpcz9v6viwg"; + type = "gem"; + }; + version = "1.4.1"; + }; + eventmachine = { + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0wh9aqb0skz80fhfn66lbpr4f86ya2z5rx6gm5xlfhd05bj1ch4r"; + type = "gem"; + }; + version = "1.2.7"; + }; + gpgme = { + dependencies = ["mini_portile2"]; + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0xbgh9d8nbvsvyzqnd0mzhz0nr9hx4qn025kmz6d837lry4lc6gw"; + type = "gem"; + }; + version = "2.0.20"; + }; + i18n = { + dependencies = ["concurrent-ruby"]; + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0vdd1kii40qhbr9n8qx71k2gskq6rkl8ygy8hw5hfj8bb5a364xf"; + type = "gem"; + }; + version = "1.8.11"; + }; + mail = { + dependencies = ["mini_mime"]; + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "00wwz6ys0502dpk8xprwcqfwyf3hmnx6lgxaiq6vj43mkx43sapc"; + type = "gem"; + }; + version = "2.7.1"; + }; + mail-gpg = { + dependencies = ["gpgme" "mail"]; + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1rz936m8nacy7agksvpvkf6b37d1h5qvh5xkrjqvv5wbdqs3cyfj"; + type = "gem"; + }; + version = "0.4.4"; + }; + mini_mime = { + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0lbim375gw2dk6383qirz13hgdmxlan0vc5da2l072j3qw6fqjm5"; + type = "gem"; + }; + version = "1.1.2"; + }; + mini_portile2 = { + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0d3ga166pahsxavzwj19yjj4lr13rw1vsb36s2qs8blcxigrdp6z"; + type = "gem"; + }; + version = "2.7.1"; + }; + minitest = { + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "06xf558gid4w8lwx13jwfdafsch9maz8m0g85wnfymqj63x5nbbd"; + type = "gem"; + }; + version = "5.15.0"; + }; + multi_json = { + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0pb1g1y3dsiahavspyzkdy39j4q377009f6ix0bh1ag4nqw43l0z"; + type = "gem"; + }; + version = "1.15.0"; + }; + mustermann = { + dependencies = ["ruby2_keywords"]; + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0ccm54qgshr1lq3pr1dfh7gphkilc19dp63rw6fcx7460pjwy88a"; + type = "gem"; + }; + version = "1.1.1"; + }; + rack = { + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0i5vs0dph9i5jn8dfc6aqd6njcafmb20rwqngrf759c9cvmyff16"; + type = "gem"; + }; + version = "2.2.3"; + }; + rack-protection = { + dependencies = ["rack"]; + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "159a4j4kragqh0z0z8vrpilpmaisnlz3n7kgiyf16bxkwlb3qlhz"; + type = "gem"; + }; + version = "2.1.0"; + }; + rake = { + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "15whn7p9nrkxangbs9hh75q585yfn66lv0v2mhj6q6dl6x8bzr2w"; + type = "gem"; + }; + version = "13.0.6"; + }; + ruby2_keywords = { + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1vz322p8n39hz3b4a9gkmz9y7a5jaz41zrm2ywf31dvkqm03glgz"; + type = "gem"; + }; + version = "0.0.5"; + }; + schleuder = { + dependencies = ["activerecord" "bcrypt" "charlock_holmes" "gpgme" "mail" "mail-gpg" "rake" "sinatra" "sinatra-contrib" "sqlite3" "thin" "thor"]; + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "15j1rfkfvni82msamikynsg48s50hbsx1pxm3y967caq9s80ll6c"; + type = "gem"; + }; + version = "4.0.2"; + }; + sinatra = { + dependencies = ["mustermann" "rack" "rack-protection" "tilt"]; + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0dd53rzpkxgs697pycbhhgc9vcnxra4ly4xar8ni6aiydx2f88zk"; + type = "gem"; + }; + version = "2.1.0"; + }; + sinatra-contrib = { + dependencies = ["multi_json" "mustermann" "rack-protection" "sinatra" "tilt"]; + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1rl1iiafz51yzjd0vchl2lni7lmwppjql6cn1fnfxbma707qlcja"; + type = "gem"; + }; + version = "2.1.0"; + }; + sqlite3 = { + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0lja01cp9xd5m6vmx99zwn4r7s97r1w5cb76gqd8xhbm1wxyzf78"; + type = "gem"; + }; + version = "1.4.2"; + }; + thin = { + dependencies = ["daemons" "eventmachine" "rack"]; + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "123bh7qlv6shk8bg8cjc84ix8bhlfcilwnn3iy6zq3l57yaplm9l"; + type = "gem"; + }; + version = "1.8.1"; + }; + thor = { + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1yhrnp9x8qcy5vc7g438amd5j9sw83ih7c30dr6g6slgw9zj3g29"; + type = "gem"; + }; + version = "0.20.3"; + }; + tilt = { + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0rn8z8hda4h41a64l0zhkiwz2vxw9b1nb70gl37h1dg2k874yrlv"; + type = "gem"; + }; + version = "2.0.10"; + }; + tzinfo = { + dependencies = ["concurrent-ruby"]; + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "10qp5x7f9hvlc0psv9gsfbxg4a7s0485wsbq1kljkxq94in91l4z"; + type = "gem"; + }; + version = "2.0.4"; + }; + zeitwerk = { + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0lmg9x683gr9mkrbq9df2m0zb0650mdfxqna0bs10js44inv7znx"; + type = "gem"; + }; + version = "2.5.3"; + }; +} diff --git a/pkgs/tools/security/sslscan/default.nix b/pkgs/tools/security/sslscan/default.nix index ae94b6e254702..6c112d6488daa 100644 --- a/pkgs/tools/security/sslscan/default.nix +++ b/pkgs/tools/security/sslscan/default.nix @@ -6,13 +6,13 @@ stdenv.mkDerivation rec { pname = "sslscan"; - version = "2.0.13"; + version = "2.0.14"; src = fetchFromGitHub { owner = "rbsec"; repo = "sslscan"; rev = version; - sha256 = "sha256-boXp26f8jiw73lMLwUMuAuDBRIw8JzokYadbKx/VeSg="; + sha256 = "sha256-CqfxiTRIgrr4J6qThDFqohkxJj5Byf0vQzG+voAEzag="; }; buildInputs = [ openssl ]; diff --git a/pkgs/tools/security/witness/default.nix b/pkgs/tools/security/witness/default.nix index f443d765b571e..c3334875d2f05 100644 --- a/pkgs/tools/security/witness/default.nix +++ b/pkgs/tools/security/witness/default.nix @@ -2,25 +2,25 @@ buildGoModule rec { pname = "witness"; - version = "0.1.8"; + version = "0.1.10"; src = fetchFromGitHub { owner = "testifysec"; repo = pname; rev = "v${version}"; - sha256 = "sha256-i76sw5ysWDZwuNt7CYtpVy9mEV643i4YaMxksglyPWw="; + sha256 = "sha256-BRYp8gp3TNZrl6fRNHOIgdhCVCN+N2lReFk+0FxCUxY="; }; - vendorSha256 = "sha256-A3fnAWEJ7SeUnDfIIOkbHIhUBRB8INcqMleOLL3LHF0="; + vendorSha256 = "sha256-/NniYty50dO44VUTfVq9b8dbT3le4uZ2ZoDN4IjLBto="; nativeBuildInputs = [ installShellFiles ]; # We only want the witness binary, not the helper utilities for generating docs. - subPackages = [ "cmd/witness" ]; + subPackages = [ "." ]; ldflags = [ "-s" "-w" - "-X github.com/testifysec/witness/cmd/witness/cmd.Version=v${version}" + "-X github.com/testifysec/witness/cmd.Version=v${version}" ]; # Feed in all tests for testing diff --git a/pkgs/tools/system/btop/default.nix b/pkgs/tools/system/btop/default.nix index 86547d04e467d..7b18f0ec604fe 100644 --- a/pkgs/tools/system/btop/default.nix +++ b/pkgs/tools/system/btop/default.nix @@ -8,8 +8,8 @@ stdenv.mkDerivation rec { pname = "btop"; - version = "1.2.6"; - hash = "sha256-q1Dpdw7bVSG10xtoUpelRgMrWe71vCWajjsAHjAZzQ4="; + version = "1.2.7"; + hash = "sha256-zQpt/CEWW3oPqPo6SPuawyfLa50y6M4hL07uRO7YjLo="; src = fetchFromGitHub { owner = "aristocratos"; diff --git a/pkgs/tools/system/openipmi/default.nix b/pkgs/tools/system/openipmi/default.nix index 8a8ac04f3accc..228c305de0c6f 100644 --- a/pkgs/tools/system/openipmi/default.nix +++ b/pkgs/tools/system/openipmi/default.nix @@ -18,6 +18,6 @@ stdenv.mkDerivation rec { description = "A user-level library that provides a higher-level abstraction of IPMI and generic services"; license = with licenses; [ gpl2Only lgpl2Only ]; platforms = platforms.linux; - maintainers = with maintainers; [ arezvov SuperSandro2000 ]; + maintainers = with maintainers; [ arezvov ] ++ teams.c3d2.members; }; } diff --git a/pkgs/tools/text/dos2unix/default.nix b/pkgs/tools/text/dos2unix/default.nix index f694b91762c55..6a0c5fc57ee93 100644 --- a/pkgs/tools/text/dos2unix/default.nix +++ b/pkgs/tools/text/dos2unix/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "dos2unix"; - version = "7.4.2"; + version = "7.4.3"; src = fetchurl { url = "https://waterlan.home.xs4all.nl/dos2unix/${pname}-${version}.tar.gz"; - sha256 = "00dfsf4rfyjb5j12gan8xjiirm0asshdz6dmd3l34a7ays6wadb0"; + sha256 = "sha256-to20GVba+TOChCOqMFEOAMEtKe9ZFucV6NTmlP5mynI="; }; nativeBuildInputs = [ perl gettext ]; diff --git a/pkgs/tools/text/nkf/default.nix b/pkgs/tools/text/nkf/default.nix index a2b5f66a6e915..9a70ea9461af5 100644 --- a/pkgs/tools/text/nkf/default.nix +++ b/pkgs/tools/text/nkf/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl }: +{ lib, stdenv, fetchurl, fetchpatch }: stdenv.mkDerivation rec { pname = "nkf"; @@ -9,6 +9,15 @@ stdenv.mkDerivation rec { sha256 = "0i5dbcb9aipwr8ym4mhvgf1in3frl6y8h8x96cprz9s7b11xz9yi"; }; + patches = [ + # Pull upstream fix for parllel build failures + (fetchpatch { + name = "parallel-install.patch"; + url = "http://git.osdn.net/view?p=nkf/nkf.git;a=patch;h=9ccff5975bec7963e591e042e1ab1139252a4dc9"; + sha256 = "00f0x414gfch650b20w0yj5x2bd67hchmadl7v54lk3vdgkc6jwj"; + }) + ]; + makeFlags = [ "prefix=$(out)" ]; meta = { diff --git a/pkgs/tools/text/poedit/default.nix b/pkgs/tools/text/poedit/default.nix index fcb2a7019acad..c64828579c948 100644 --- a/pkgs/tools/text/poedit/default.nix +++ b/pkgs/tools/text/poedit/default.nix @@ -1,22 +1,22 @@ -{ lib, stdenv, fetchFromGitHub, autoconf, automake, libtool, gettext, pkg-config, wxGTK31-gtk3, +{ lib, stdenv, fetchFromGitHub, autoconf, automake, libtool, gettext, pkg-config, wxGTK30-gtk3, boost, icu, lucenepp, asciidoc, libxslt, xmlto, gtk3, gtkspell3, pugixml, nlohmann_json, hicolor-icon-theme, wrapGAppsHook }: stdenv.mkDerivation rec { pname = "poedit"; - version = "3.0.1"; + version = "3.1"; src = fetchFromGitHub { owner = "vslavik"; repo = "poedit"; rev = "v${version}-oss"; - sha256 = "sha256-PBAOCAO3OrBE7lOho7nJNEpqwds7XiblN/f+GonrXHA="; + sha256 = "sha256-Wxj1xPbtupEnzuvf7JdUgdTxX2oAZDEYk6W4CjrmRRE="; }; nativeBuildInputs = [ autoconf automake asciidoc wrapGAppsHook libxslt xmlto boost libtool pkg-config ]; - buildInputs = [ lucenepp nlohmann_json wxGTK31-gtk3 icu pugixml gtk3 gtkspell3 hicolor-icon-theme ]; + buildInputs = [ lucenepp nlohmann_json wxGTK30-gtk3 icu pugixml gtk3 gtkspell3 hicolor-icon-theme ]; propagatedBuildInputs = [ gettext ]; diff --git a/pkgs/tools/video/rtmpdump/default.nix b/pkgs/tools/video/rtmpdump/default.nix index 5f301ae88915a..6e05f81fcd8ce 100644 --- a/pkgs/tools/video/rtmpdump/default.nix +++ b/pkgs/tools/video/rtmpdump/default.nix @@ -15,13 +15,13 @@ assert (gnutlsSupport || opensslSupport); with lib; stdenv.mkDerivation { pname = "rtmpdump"; - version = "unstable-2019-03-30"; + version = "unstable-2021-02-19"; src = fetchgit { url = "git://git.ffmpeg.org/rtmpdump"; # Currently the latest commit is used (a release has not been made since 2011, i.e. '2.4') - rev = "c5f04a58fc2aeea6296ca7c44ee4734c18401aa3"; - sha256 = "07ias612jgmxpam9h418kvlag32da914jsnjsfyafklpnh8gdzjb"; + rev = "f1b83c10d8beb43fcc70a6e88cf4325499f25857"; + sha256 = "0vchr0f0d5fi0zaa16jywva5db3x9dyws7clqaq32gwh5drbkvs0"; }; patches = [ diff --git a/pkgs/tools/virtualization/extra-container/default.nix b/pkgs/tools/virtualization/extra-container/default.nix index dad7a3d1be72d..eee1baca28ae0 100644 --- a/pkgs/tools/virtualization/extra-container/default.nix +++ b/pkgs/tools/virtualization/extra-container/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "extra-container"; - version = "0.8"; + version = "0.10"; src = fetchFromGitHub { owner = "erikarvstedt"; repo = pname; rev = version; - hash = "sha256-/AetqDPkz32JMdjbSdzZCBVmGbvzjeAb8Wv82iTgHFE="; + hash = "sha256-vtCZ0w1Kaiw9bIrzwEb4Jnv7QoQLp8JDjaGmAP91hpE="; }; buildCommand = '' @@ -18,13 +18,14 @@ stdenv.mkDerivation rec { install $src/eval-config.nix -Dt $share # Use existing PATH for systemctl and machinectl - scriptPath="export PATH=${lib.makeBinPath [ nixos-container openssh ]}:\$PATH" + scriptPath="export PATH=${lib.makeBinPath [ openssh ]}:\$PATH" - sed -i \ - -e "s|evalConfig=.*|evalConfig=$share/eval-config.nix|" \ - -e "s|LOCALE_ARCHIVE=.*|LOCALE_ARCHIVE=${glibcLocales}/lib/locale/locale-archive|" \ - -e "2i$scriptPath" \ - $out/bin/extra-container + sed -i " + s|evalConfig=.*|evalConfig=$share/eval-config.nix| + s|LOCALE_ARCHIVE=.*|LOCALE_ARCHIVE=${glibcLocales}/lib/locale/locale-archive| + 2i$scriptPath + 2inixosContainer=${nixos-container}/bin + " $out/bin/extra-container ''; meta = with lib; { @@ -32,6 +33,6 @@ stdenv.mkDerivation rec { homepage = "https://github.com/erikarvstedt/extra-container"; license = licenses.mit; platforms = platforms.linux; - maintainers = [ maintainers.earvstedt ]; + maintainers = [ maintainers.erikarvstedt ]; }; } diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index 3b2a08673c7fa..6b17ea7fcfa20 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -619,6 +619,7 @@ mapAliases ({ iops = throw "iops was removed: upstream is gone"; # Added 2022-02-06 iproute = iproute2; # moved from top-level 2021-03-14 ipsecTools = throw "ipsecTools has benn removed, because it was no longer maintained upstream"; # Added 2021-12-15 + itch-setup = throw "itch-setup has benn removed, use itch instead"; # Added 2022-06-02 ### J ### @@ -1217,6 +1218,7 @@ mapAliases ({ retroArchCores = throw "retroArchCores has been removed. Please use overrides instead, e.g.: `retroarch.override { cores = with libretro; [ ... ]; }`"; # Added 2021-11-19 retroshare06 = retroshare; rfkill = throw "rfkill has been removed, as it's included in util-linux"; # Added 2020-08-23 + riak = throw "riak has been removed due to lack of maintainer to update the package"; # Added 2022-06-22 riak-cs = throw "riak-cs is not maintained anymore"; # Added 2020-10-14 rimshot = throw "rimshot has been removed, because it is broken and no longer maintained upstream"; # Added 2022-01-15 ring-daemon = jami-daemon; # Added 2021-10-26 @@ -1368,12 +1370,9 @@ mapAliases ({ telepathy_qt5 = throw "'telepathy_qt5' has been renamed to/replaced by 'libsForQt5.telepathy'"; # Converted to throw 2022-02-22 telnet = throw "'telnet' has been renamed to/replaced by 'inetutils'"; # Converted to throw 2022-02-22 terminus = throw "terminus has been removed, it was unmaintained in nixpkgs"; # Added 2021-08-21 - terraform-provider-ibm = throw "'terraform-provider-ibm' has been renamed to/replaced by 'terraform-providers.ibm'"; # Converted to throw 2022-02-22 - terraform-provider-libvirt = throw "'terraform-provider-libvirt' has been renamed to/replaced by 'terraform-providers.libvirt'"; # Converted to throw 2022-02-22 - terraform-provider-lxd = terraform-providers.lxd; # Added 2020-03-16 - terraform_0_12 = throw "terraform_0_12 has been removed from nixpkgs on 2021/01"; - terraform_1_0 = throw "terraform_1_0 has been renamed to terraform_1"; # Added 2021-12-08 - terraform_1_0_0 = throw "terraform_1_0_0 has been renamed to terraform_1"; # Added 2021-06-15 + terraform_0_13 = throw "terraform_0_13 has been removed from nixpkgs"; # Added 2022-06-26 + terraform_0_14 = throw "terraform_0_14 has been removed from nixpkgs"; # Added 2022-06-26 + terraform_0_15 = throw "terraform_0_15 has been removed from nixpkgs"; # Added 2022-06-26 tesseract_4 = throw "'tesseract_4' has been renamed to/replaced by 'tesseract4'"; # Converted to throw 2022-02-22 testVersion = testers.testVersion; # Added 2022-04-20 invalidateFetcherByDrvHash = testers.invalidateFetcherByDrvHash; # Added 2022-05-05 @@ -1644,7 +1643,8 @@ mapAliases ({ ffmpegthumbs filelight granatier gwenview k3b kactivitymanagerd kaddressbook kalendar kalzium kapman kapptemplate kate katomic kblackbox kblocks kbounce kcachegrind kcalc kcharselect kcolorchooser kde-cli-tools kde-gtk-config - kdenlive kdeplasma-addons kdf kdialog kdiamond keditbookmarks kfind kfloppy + kdenlive kdeplasma-addons kdevelop-pg-qt kdevelop-unwrapped kdev-php + kdev-python kdevelop kdf kdialog kdiamond keditbookmarks kfind kfloppy kgamma5 kget kgpg khelpcenter kig kigo killbots kinfocenter kitinerary kleopatra klettres klines kmag kmail kmenuedit kmines kmix kmplot knavalbattle knetwalk knights kollision kolourpaint kompare konsole kontact diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 229a23d2349bd..c31c566a76b37 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -207,6 +207,10 @@ with pkgs; } ''); + chkservice = callPackage ../tools/admin/chkservice { + stdenv = gcc10StdenvCompat; + }; + addOpenGLRunpath = callPackage ../build-support/add-opengl-runpath { }; quickemu = callPackage ../development/quickemu { }; @@ -1139,6 +1143,8 @@ with pkgs; asleap = callPackage ../tools/networking/asleap { }; + butler = callPackage ../games/itch/butler.nix { }; + cf-vault = callPackage ../tools/admin/cf-vault { }; bikeshed = python3Packages.callPackage ../applications/misc/bikeshed { }; @@ -1147,8 +1153,6 @@ with pkgs; cope = callPackage ../tools/misc/cope { }; - dterm = callPackage ../tools/misc/dterm { }; - ejson2env = callPackage ../tools/admin/ejson2env { }; davinci-resolve = callPackage ../applications/video/davinci-resolve { }; @@ -1583,6 +1587,8 @@ with pkgs; darktile = callPackage ../applications/terminal-emulators/darktile { }; + dterm = callPackage ../applications/terminal-emulators/dterm { }; + eterm = callPackage ../applications/terminal-emulators/eterm { }; foot = callPackage ../applications/terminal-emulators/foot { }; @@ -2403,6 +2409,10 @@ with pkgs; hime = callPackage ../tools/inputmethods/hime {}; + himitsu = callPackage ../tools/security/himitsu { }; + + himitsu-firefox = callPackage ../tools/security/himitsu-firefox { }; + hinit = haskell.lib.compose.justStaticExecutables haskellPackages.hinit; hostctl = callPackage ../tools/system/hostctl { }; @@ -2431,8 +2441,6 @@ with pkgs; itch = callPackage ../games/itch {}; - itch-setup = callPackage ../games/itch-setup {}; - lastpass-cli = callPackage ../tools/security/lastpass-cli { }; leetcode-cli = callPackage ../applications/misc/leetcode-cli { }; @@ -2491,11 +2499,21 @@ with pkgs; buildGoModule = buildGo118Module; }; - gopass-jsonapi = callPackage ../tools/security/gopass/jsonapi.nix { }; + gopass-hibp = callPackage ../tools/security/gopass/hibp.nix { + buildGoModule = buildGo118Module; + }; - git-credential-gopass = callPackage ../tools/security/gopass/git-credential.nix { }; + gopass-jsonapi = callPackage ../tools/security/gopass/jsonapi.nix { + buildGoModule = buildGo118Module; + }; + + git-credential-gopass = callPackage ../tools/security/gopass/git-credential.nix { + buildGoModule = buildGo118Module; + }; - gopass-summon-provider = callPackage ../tools/security/gopass/summon.nix { }; + gopass-summon-provider = callPackage ../tools/security/gopass/summon.nix { + buildGoModule = buildGo118Module; + }; gosca = callPackage ../development/tools/gosca { }; @@ -2645,6 +2663,8 @@ with pkgs; awsls = callPackage ../tools/admin/awsls { }; + awsrm = callPackage ../tools/admin/awsrm { }; + awstats = callPackage ../tools/system/awstats { }; awsweeper = callPackage ../tools/admin/awsweeper { }; @@ -3919,6 +3939,8 @@ with pkgs; languagetool = callPackage ../tools/text/languagetool { }; + ldtk = callPackage ../applications/editors/ldtk { }; + lepton = callPackage ../tools/graphics/lepton { }; lepton-eda = callPackage ../applications/science/electronics/lepton-eda { }; @@ -4095,6 +4117,8 @@ with pkgs; nix-direnv = callPackage ../tools/misc/nix-direnv { }; + nixel = callPackage ../tools/nix/nixel { }; + nix-output-monitor = callPackage ../tools/nix/nix-output-monitor { }; nix-template = callPackage ../tools/package-management/nix-template { @@ -4268,6 +4292,8 @@ with pkgs; shab = callPackage ../tools/text/shab { }; + sheldon = callPackage ../tools/misc/sheldon { }; + shell-hist = callPackage ../tools/misc/shell-hist { }; shellhub-agent = callPackage ../applications/networking/shellhub-agent { }; @@ -5551,6 +5577,10 @@ with pkgs; conf = config.schildichat-web.conf or {}; }; + schleuder = callPackage ../tools/security/schleuder { }; + + schleuder-cli = callPackage ../tools/security/schleuder/cli { }; + tealdeer = callPackage ../tools/misc/tealdeer { inherit (darwin.apple_sdk.frameworks) Security; }; @@ -5650,7 +5680,7 @@ with pkgs; conform = callPackage ../applications/version-management/git-and-tools/conform { }; emscripten = callPackage ../development/compilers/emscripten { - llvmPackages = llvmPackages_13; + llvmPackages = llvmPackages_14; }; emscriptenPackages = recurseIntoAttrs (callPackage ./emscripten-packages.nix { }); @@ -5914,7 +5944,7 @@ with pkgs; }; ffsend = callPackage ../tools/misc/ffsend { - inherit (darwin.apple_sdk.frameworks) CoreFoundation CoreServices Security AppKit; + inherit (darwin.apple_sdk.frameworks) Security AppKit; }; fgallery = callPackage ../tools/graphics/fgallery { }; @@ -6781,6 +6811,8 @@ with pkgs; grpc-tools = callPackage ../development/tools/misc/grpc-tools { }; + grpc-client-cli = callPackage ../development/tools/misc/grpc-client-cli { }; + grub = pkgsi686Linux.callPackage ../tools/misc/grub ({ stdenv = overrideCC stdenv buildPackages.pkgsi686Linux.gcc6; } // (config.grub or {})); @@ -7697,6 +7729,10 @@ with pkgs; lnch = callPackage ../tools/misc/lnch { }; + lnx = callPackage ../servers/search/lnx { + inherit (darwin.apple_sdk.frameworks) DiskArbitration Foundation; + }; + loadlibrary = callPackage ../tools/misc/loadlibrary { }; loc = callPackage ../development/misc/loc { }; @@ -7764,14 +7800,6 @@ with pkgs; mani = callPackage ../development/tools/mani { }; - mapcache = callPackage ../servers/geospatial/mapcache { }; - - mapserver = callPackage ../servers/geospatial/mapserver { }; - - martin = callPackage ../servers/geospatial/martin { - inherit (darwin.apple_sdk.frameworks) Security; - }; - mask = callPackage ../development/tools/mask { }; mathpix-snipping-tool = callPackage ../tools/misc/mathpix-snipping-tool { }; @@ -9540,6 +9568,8 @@ with pkgs; pm2 = nodePackages.pm2; + pmenu = callPackage ../tools/X11/pmenu { }; + pngcheck = callPackage ../tools/graphics/pngcheck { }; pngcrush = callPackage ../tools/graphics/pngcrush { }; @@ -9570,7 +9600,7 @@ with pkgs; pod2mdoc = callPackage ../tools/misc/pod2mdoc { }; poedit = callPackage ../tools/text/poedit { - wxGTK31-gtk3 = wxGTK31-gtk3.override { withWebKit = true; }; + wxGTK30-gtk3 = wxGTK30-gtk3.override { withWebKit = true; }; }; polipo = callPackage ../servers/polipo { }; @@ -9985,6 +10015,8 @@ with pkgs; reftools = callPackage ../development/tools/reftools { }; + regpg = callPackage ../tools/security/regpg { }; + remote-touchpad = callPackage ../tools/inputmethods/remote-touchpad { }; reposurgeon = callPackage ../applications/version-management/reposurgeon { }; @@ -10982,8 +11014,6 @@ with pkgs; tidy-viewer = callPackage ../tools/text/tidy-viewer { }; - tile38 = callPackage ../servers/geospatial/tile38 { }; - tiled = libsForQt5.callPackage ../applications/editors/tiled { }; tiledb = callPackage ../development/libraries/tiledb { }; @@ -11550,6 +11580,14 @@ with pkgs; woff2 = callPackage ../development/web/woff2 { }; + woodpecker-agent = callPackage ../development/tools/continuous-integration/woodpecker/agent.nix { }; + + woodpecker-cli = callPackage ../development/tools/continuous-integration/woodpecker/cli.nix { }; + + woodpecker-server = callPackage ../development/tools/continuous-integration/woodpecker/server.nix { + woodpecker-frontend = callPackage ../development/tools/continuous-integration/woodpecker/frontend.nix { }; + }; + woof = callPackage ../tools/misc/woof { }; wootility = callPackage ../tools/misc/wootility { @@ -11598,8 +11636,6 @@ with pkgs; td = callPackage ../tools/misc/td { }; - tegola = callPackage ../servers/geospatial/tegola {}; - tftp-hpa = callPackage ../tools/networking/tftp-hpa {}; tigervnc = callPackage ../tools/admin/tigervnc {}; @@ -12421,7 +12457,10 @@ with pkgs; bigloo = callPackage ../development/compilers/bigloo { }; - binaryen = callPackage ../development/compilers/binaryen { }; + binaryen = callPackage ../development/compilers/binaryen { + nodejs = nodejs-slim; + inherit (python3Packages) filecheck; + }; blueprint-compiler = callPackage ../development/compilers/blueprint { }; @@ -13220,10 +13259,6 @@ with pkgs; remarkable2-toolchain = callPackage ../development/tools/misc/remarkable/remarkable2-toolchain { }; - t-rex = callPackage ../servers/geospatial/t-rex { - inherit (darwin.apple_sdk.frameworks) Security; - }; - tacacsplus = callPackage ../servers/tacacsplus { }; tamarin-prover = @@ -13642,6 +13677,8 @@ with pkgs; microscheme = callPackage ../development/compilers/microscheme { }; + millet = callPackage ../development/tools/millet {}; + mint = callPackage ../development/compilers/mint { }; mitscheme = callPackage ../development/compilers/mit-scheme @@ -13953,7 +13990,9 @@ with pkgs; cargo-msrv = callPackage ../development/tools/rust/cargo-msrv { inherit (darwin.apple_sdk.frameworks) Security; }; - cargo-nextest = callPackage ../development/tools/rust/cargo-nextest { }; + cargo-nextest = callPackage ../development/tools/rust/cargo-nextest { + inherit (darwin.apple_sdk.frameworks) Security; + }; cargo-play = callPackage ../development/tools/rust/cargo-play { }; cargo-raze = callPackage ../development/tools/rust/cargo-raze { inherit (darwin.apple_sdk.frameworks) Security; @@ -15358,6 +15397,8 @@ with pkgs; corundum = callPackage ../development/tools/corundum { }; + confluencepot = callPackage ../servers/confluencepot {}; + confluent-platform = callPackage ../servers/confluent-platform {}; ctags = callPackage ../development/tools/misc/ctags { }; @@ -21032,6 +21073,8 @@ with pkgs; tidyp = callPackage ../development/libraries/tidyp { }; + tidal-hifi = callPackage ../applications/audio/tidal-hifi { }; + tinycdb = callPackage ../development/libraries/tinycdb { }; tinyxml = tinyxml2; @@ -22113,8 +22156,6 @@ with pkgs; mattermost-desktop = callPackage ../applications/networking/instant-messengers/mattermost-desktop { }; - mbtileserver = callPackage ../servers/geospatial/mbtileserver { }; - memcached = callPackage ../servers/memcached {}; meteor = callPackage ../servers/meteor { }; @@ -22357,10 +22398,6 @@ with pkgs; tomcat-native = callPackage ../servers/http/tomcat/tomcat-native.nix { }; - pg_featureserv = callPackage ../servers/geospatial/pg_featureserv { }; - - pg_tileserv = callPackage ../servers/geospatial/pg_tileserv { }; - pies = callPackage ../servers/pies { }; rpcbind = callPackage ../servers/rpcbind { }; @@ -22439,10 +22476,6 @@ with pkgs; percona-server56 = callPackage ../servers/sql/percona/5.6.x.nix { stdenv = gcc10StdenvCompat; }; percona-server = percona-server56; - riak = callPackage ../servers/nosql/riak/2.2.0.nix { - erlang = erlang_basho_R16B02; - }; - influxdb = callPackage ../servers/nosql/influxdb { }; influxdb2-server = callPackage ../servers/nosql/influxdb2 { }; influxdb2-cli = callPackage ../servers/nosql/influxdb2/cli.nix { }; @@ -22953,6 +22986,32 @@ with pkgs; zipkin = callPackage ../servers/monitoring/zipkin { }; + ### SERVERS / GEOSPATIAL + + geoserver = callPackage ../servers/geospatial/geoserver { }; + + mapcache = callPackage ../servers/geospatial/mapcache { }; + + mapserver = callPackage ../servers/geospatial/mapserver { }; + + martin = callPackage ../servers/geospatial/martin { + inherit (darwin.apple_sdk.frameworks) Security; + }; + + mbtileserver = callPackage ../servers/geospatial/mbtileserver { }; + + pg_featureserv = callPackage ../servers/geospatial/pg_featureserv { }; + + pg_tileserv = callPackage ../servers/geospatial/pg_tileserv { }; + + t-rex = callPackage ../servers/geospatial/t-rex { + inherit (darwin.apple_sdk.frameworks) Security; + }; + + tegola = callPackage ../servers/geospatial/tegola { }; + + tile38 = callPackage ../servers/geospatial/tile38 { }; + ### OS-SPECIFIC afuse = callPackage ../os-specific/linux/afuse { }; @@ -25008,6 +25067,8 @@ with pkgs; stdmanpages = callPackage ../data/documentation/std-man-pages { }; + starfetch = callPackage ../tools/misc/starfetch { }; + starship = callPackage ../tools/misc/starship { inherit (darwin.apple_sdk.frameworks) Security Foundation Cocoa; }; @@ -26403,6 +26464,8 @@ with pkgs; fnc = callPackage ../applications/version-management/fnc { }; + focus = callPackage ../tools/X11/focus { }; + focuswriter = libsForQt5.callPackage ../applications/editors/focuswriter { }; foliate = callPackage ../applications/office/foliate { }; @@ -27188,6 +27251,10 @@ with pkgs; gtk = gtk3; }; + hollywood = callPackage ../applications/misc/hollywood { + inherit (python3Packages) pygments; + }; + hors = callPackage ../development/tools/hors { inherit (darwin.apple_sdk.frameworks) Security; }; @@ -27297,6 +27364,8 @@ with pkgs; pixelnuke = callPackage ../applications/graphics/pixelnuke { }; + pixelorama = callPackage ../applications/editors/pixelorama { }; + pixeluvo = callPackage ../applications/graphics/pixeluvo { }; pixinsight = libsForQt5.callPackage ../applications/graphics/pixinsight { }; @@ -27668,6 +27737,8 @@ with pkgs; josm = callPackage ../applications/misc/josm { }; + js8call = qt5.callPackage ../applications/radio/js8call { }; + jwm = callPackage ../applications/window-managers/jwm { }; jwm-settings-manager = callPackage ../applications/window-managers/jwm/jwm-settings-manager.nix { }; @@ -27704,19 +27775,6 @@ with pkgs; kdeltachat = libsForQt5.callPackage ../applications/networking/instant-messengers/kdeltachat { }; - kdevelop-pg-qt = libsForQt5.callPackage ../applications/editors/kdevelop5/kdevelop-pg-qt.nix { }; - - kdevelop-unwrapped = libsForQt5.callPackage ../applications/editors/kdevelop5/kdevelop.nix { - llvmPackages = llvmPackages_10; - }; - - kdev-php = libsForQt5.callPackage ../applications/editors/kdevelop5/kdev-php.nix { }; - kdev-python = libsForQt5.callPackage ../applications/editors/kdevelop5/kdev-python.nix { - python = python3; - }; - - kdevelop = libsForQt5.callPackage ../applications/editors/kdevelop5/wrapper.nix { }; - kepubify = callPackage ../tools/misc/kepubify { }; kermit = callPackage ../tools/misc/kermit { }; @@ -28728,6 +28786,8 @@ with pkgs; scudcloud = callPackage ../applications/networking/instant-messengers/scudcloud { }; + shod = callPackage ../applications/window-managers/shod { }; + shotcut = libsForQt5.callPackage ../applications/video/shotcut { }; shogun = callPackage ../applications/science/machine-learning/shogun { @@ -28758,9 +28818,7 @@ with pkgs; inherit (darwin.apple_sdk.frameworks) CoreServices Security; }; - synfigstudio = callPackage ../applications/graphics/synfigstudio { - mlt-qt5 = libsForQt514.mlt; - }; + synfigstudio = callPackage ../applications/graphics/synfigstudio { }; taxi = callPackage ../applications/networking/ftp/taxi { }; @@ -28812,6 +28870,8 @@ with pkgs; diff-pdf = callPackage ../applications/misc/diff-pdf { wxGTK = wxGTK31; }; + diffuse = callPackage ../applications/misc/diffuse { }; + mlocate = callPackage ../tools/misc/mlocate { }; plocate = callPackage ../tools/misc/plocate { }; @@ -29012,6 +29072,8 @@ with pkgs; libopenmpt = callPackage ../development/libraries/audio/libopenmpt { }; + libopenmpt-modplug = callPackage ../development/libraries/audio/libopenmpt-modplug { }; + openrazer-daemon = with python3Packages; toPythonApplication openrazer-daemon; opusfile = callPackage ../applications/audio/opusfile { }; @@ -29858,6 +29920,10 @@ with pkgs; robustirc-bridge = callPackage ../servers/irc/robustirc-bridge { }; + routedns = callPackage ../tools/networking/routedns { + buildGoModule = buildGo118Module; + }; + skrooge = libsForQt5.callPackage ../applications/office/skrooge {}; smartgithg = callPackage ../applications/version-management/smartgithg { @@ -30057,7 +30123,9 @@ with pkgs; inherit (darwin.apple_sdk.frameworks) Security; }; - talosctl = callPackage ../applications/networking/cluster/talosctl { }; + talosctl = callPackage ../applications/networking/cluster/talosctl { + buildGoModule = buildGo118Module; + }; talentedhack = callPackage ../applications/audio/talentedhack { }; @@ -30194,7 +30262,9 @@ with pkgs; inherit (darwin.apple_sdk.frameworks) Security; }; - tig = callPackage ../applications/version-management/git-and-tools/tig { }; + tig = callPackage ../applications/version-management/git-and-tools/tig { + readline = readline81; + }; tilemaker = callPackage ../applications/misc/tilemaker { }; @@ -31900,6 +31970,10 @@ with pkgs; fairymax = callPackage ../games/fairymax { }; + ferium = callPackage ../games/ferium { + inherit (darwin.apple_sdk.frameworks) Security; + }; + fheroes2 = callPackage ../games/fheroes2 { }; fish-fillets-ng = callPackage ../games/fish-fillets-ng { }; @@ -32011,6 +32085,8 @@ with pkgs; wine = wineWowPackages.unstable; }; + graphwar = callPackage ../games/graphwar { }; + gtetrinet = callPackage ../games/gtetrinet { inherit (gnome2) GConf libgnome libgnomeui; }; @@ -32031,6 +32107,8 @@ with pkgs; icbm3d = callPackage ../games/icbm3d { }; + infra-arcana = callPackage ../games/infra-arcana { }; + ingen = callPackage ../applications/audio/ingen { }; ideogram = callPackage ../applications/graphics/ideogram { }; @@ -33624,6 +33702,8 @@ with pkgs; why3 = callPackage ../applications/science/logic/why3 { }; + wayback-machine-archiver = callPackage ../tools/misc/wayback-machine-archiver { }; + workcraft = callPackage ../applications/science/logic/workcraft {}; yices = callPackage ../applications/science/logic/yices { @@ -34904,9 +34984,6 @@ with pkgs; inherit (callPackage ../applications/networking/cluster/terraform { }) mkTerraform - terraform_0_13 - terraform_0_14 - terraform_0_15 terraform_1 terraform_plugins_test ; @@ -35286,19 +35363,16 @@ with pkgs; mpvc = callPackage ../applications/misc/mpvc { }; - discord = import ../applications/networking/instant-messengers/discord { + discord = callPackage ../applications/networking/instant-messengers/discord { branch = "stable"; - inherit pkgs lib stdenv; }; - discord-ptb = import ../applications/networking/instant-messengers/discord { + discord-ptb = callPackage ../applications/networking/instant-messengers/discord { branch = "ptb"; - inherit pkgs lib stdenv; }; - discord-canary = import ../applications/networking/instant-messengers/discord { + discord-canary = callPackage ../applications/networking/instant-messengers/discord { branch = "canary"; - inherit pkgs lib stdenv; }; golden-cheetah = libsForQt5.callPackage ../applications/misc/golden-cheetah {}; @@ -35621,6 +35695,7 @@ with pkgs; xsos = callPackage ../os-specific/linux/xsos { }; + xmcp = callPackage ../tools/X11/xmcp { }; zk = callPackage ../applications/office/zk {}; diff --git a/pkgs/top-level/dotnet-packages.nix b/pkgs/top-level/dotnet-packages.nix index 10188cee9148b..732fb66731efe 100644 --- a/pkgs/top-level/dotnet-packages.nix +++ b/pkgs/top-level/dotnet-packages.nix @@ -53,8 +53,8 @@ let self = dotnetPackages // overrides; dotnetPackages = with self; { SharpZipLib = fetchNuGet { pname = "SharpZipLib"; - version = "0.86.0"; - sha256 = "01w2038gckfnq31pncrlgm7d0c939pwr1x4jj5450vcqpd4c41jr"; + version = "1.3.3"; + sha256 = "sha256-HWEQTKh9Ktwg/zIl079dAiH+ob2ShWFAqLgG6XgIMr4="; outputFiles = [ "lib/*" ]; }; diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix index 79815b65f605c..68a3230995694 100644 --- a/pkgs/top-level/haskell-packages.nix +++ b/pkgs/top-level/haskell-packages.nix @@ -8,6 +8,8 @@ let "ghc8102BinaryMinimal" "ghc8107Binary" "ghc8107BinaryMinimal" + "ghc922Binary" + "ghc922BinaryMinimal" "ghcjs" "ghcjs810" "integer-simple" @@ -76,6 +78,14 @@ in { minimal = true; }; + ghc922Binary = callPackage ../development/compilers/ghc/9.2.2-binary.nix { + llvmPackages = pkgs.llvmPackages_12; + }; + ghc922BinaryMinimal = callPackage ../development/compilers/ghc/9.2.2-binary.nix { + llvmPackages = pkgs.llvmPackages_12; + minimal = true; + }; + ghc884 = callPackage ../development/compilers/ghc/8.8.4.nix { bootPkgs = # aarch64 ghc865Binary gets SEGVs due to haskell#15449 or similar @@ -212,6 +222,18 @@ in { compilerConfig = callPackage ../development/haskell-modules/configuration-ghc-8.10.x.nix { }; packageSetConfig = bootstrapPackageSet; }; + ghc922Binary = callPackage ../development/haskell-modules { + buildHaskellPackages = bh.packages.ghc922Binary; + ghc = bh.compiler.ghc922Binary; + compilerConfig = callPackage ../development/haskell-modules/configuration-ghc-9.2.x.nix { }; + packageSetConfig = bootstrapPackageSet; + }; + ghc922BinaryMinimal = callPackage ../development/haskell-modules { + buildHaskellPackages = bh.packages.ghc922BinaryMinimal; + ghc = bh.compiler.ghc922BinaryMinimal; + compilerConfig = callPackage ../development/haskell-modules/configuration-ghc-9.2.x.nix { }; + packageSetConfig = bootstrapPackageSet; + }; ghc884 = callPackage ../development/haskell-modules { buildHaskellPackages = bh.packages.ghc884; ghc = bh.compiler.ghc884; diff --git a/pkgs/top-level/ocaml-packages.nix b/pkgs/top-level/ocaml-packages.nix index 5083f1733cd09..efebf7e385332 100644 --- a/pkgs/top-level/ocaml-packages.nix +++ b/pkgs/top-level/ocaml-packages.nix @@ -899,6 +899,8 @@ let mirage-vnetif = callPackage ../development/ocaml-modules/mirage-vnetif { }; + mldoc = callPackage ../development/ocaml-modules/mldoc { }; + mlgmp = callPackage ../development/ocaml-modules/mlgmp { }; mlgmpidl = callPackage ../development/ocaml-modules/mlgmpidl { }; diff --git a/pkgs/top-level/python-aliases.nix b/pkgs/top-level/python-aliases.nix index 8fd557ce60a63..a6c676ea60156 100644 --- a/pkgs/top-level/python-aliases.nix +++ b/pkgs/top-level/python-aliases.nix @@ -69,6 +69,7 @@ mapAliases ({ dogpile_cache = dogpile-cache; # added 2021-10-28 dogpile-core = throw "dogpile-core is no longer maintained, use dogpile-cache instead"; # added 2021-11-20 eebrightbox = throw "eebrightbox is unmaintained upstream and has therefore been removed"; # added 2022-02-03 + email_validator = email-validator; # added 2022-06-22 fake_factory = throw "fake_factory has been removed because it is unused and deprecated by upstream since 2016."; # added 2022-05-30 faulthandler = throw "faulthandler is built into ${python.executable}"; # added 2021-07-12 flask_testing = flask-testing; # added 2022-04-25 diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 88f9286b1e41b..59cdb70f68dde 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -2734,7 +2734,7 @@ in { emailthreads = callPackage ../development/python-modules/emailthreads { }; - email_validator = callPackage ../development/python-modules/email-validator { }; + email-validator = callPackage ../development/python-modules/email-validator { }; embrace = callPackage ../development/python-modules/embrace { }; @@ -3033,6 +3033,8 @@ in { filebytes = callPackage ../development/python-modules/filebytes { }; + filecheck = callPackage ../development/python-modules/filecheck { }; + filelock = callPackage ../development/python-modules/filelock { }; filemagic = callPackage ../development/python-modules/filemagic { }; @@ -6163,6 +6165,8 @@ in { oscrypto = callPackage ../development/python-modules/oscrypto { }; + oscpy = callPackage ../development/python-modules/oscpy { }; + oset = callPackage ../development/python-modules/oset { }; osmnx = callPackage ../development/python-modules/osmnx { }; @@ -11000,6 +11004,10 @@ in { vallox-websocket-api = callPackage ../development/python-modules/vallox-websocket-api { }; + vapoursynth = callPackage ../development/python-modules/vapoursynth { + inherit (pkgs) vapoursynth; + }; + variants = callPackage ../development/python-modules/variants { }; varint = callPackage ../development/python-modules/varint { }; |