diff options
author | github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> | 2022-11-30 06:01:30 +0000 |
---|---|---|
committer | GitHub <noreply@github.com> | 2022-11-30 06:01:30 +0000 |
commit | aff62e907a88d91fa18281374e4f3cae7c880b62 (patch) | |
tree | a88bc4fe48b80a5031bf6a70cd33a963c80ddfff | |
parent | 541466e966f73ece86047ee252ec443c1258062c (diff) | |
parent | b29e9c402578f5411253b6fb4d4cff316b51c09e (diff) |
Merge master into staging-next
84 files changed, 579 insertions, 1735 deletions
diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index 9ff147c7f8d4d..743c769b2b806 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -12735,6 +12735,13 @@ githubId = 4294323; name = "Langston Barrett"; }; + sielicki = { + name = "Nicholas Sielicki"; + email = "nix@opensource.nslick.com"; + github = "sielicki"; + githubId = 4522995; + matrix = "@sielicki:matrix.org"; + }; siers = { email = "veinbahs+nixpkgs@gmail.com"; github = "siers"; diff --git a/nixos/modules/services/networking/stubby.nix b/nixos/modules/services/networking/stubby.nix index 491371e468e5b..183002ff72b98 100644 --- a/nixos/modules/services/networking/stubby.nix +++ b/nixos/modules/services/networking/stubby.nix @@ -7,7 +7,9 @@ let settingsFormat = pkgs.formats.yaml { }; confFile = settingsFormat.generate "stubby.yml" cfg.settings; in { - imports = map (x: + imports = [ + (mkRemovedOptionModule [ "stubby" "debugLogging" ] "Use services.stubby.logLevel = \"debug\"; instead.") + ] ++ map (x: (mkRemovedOptionModule [ "services" "stubby" x ] "Stubby configuration moved to services.stubby.settings.")) [ "authenticationMode" @@ -49,10 +51,22 @@ in { ''; }; - debugLogging = mkOption { - default = false; - type = types.bool; - description = lib.mdDoc "Enable or disable debug level logging."; + logLevel = let + logLevels = { + emerg = 0; + alert = 1; + crit = 2; + error = 3; + warning = 4; + notice = 5; + info = 6; + debug = 7; + }; + in mkOption { + default = null; + type = types.nullOr (types.enum (attrNames logLevels ++ attrValues logLevels)); + apply = v: if isString v then logLevels.${v} else v; + description = lib.mdDoc "Log verbosity (syslog keyword or level)."; }; }; @@ -80,7 +94,7 @@ in { Type = "notify"; AmbientCapabilities = "CAP_NET_BIND_SERVICE"; CapabilityBoundingSet = "CAP_NET_BIND_SERVICE"; - ExecStart = "${pkgs.stubby}/bin/stubby -C ${confFile} ${optionalString cfg.debugLogging "-l"}"; + ExecStart = "${pkgs.stubby}/bin/stubby -C ${confFile} ${optionalString (cfg.logLevel != null) "-v ${toString cfg.logLevel}"}"; DynamicUser = true; CacheDirectory = "stubby"; }; diff --git a/pkgs/applications/audio/csound/default.nix b/pkgs/applications/audio/csound/default.nix index 4da3efbffe471..dc8ea92ae2421 100644 --- a/pkgs/applications/audio/csound/default.nix +++ b/pkgs/applications/audio/csound/default.nix @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { pname = "csound"; - version = "6.17.0"; + version = "6.18.1"; hardeningDisable = [ "format" ]; @@ -26,7 +26,7 @@ stdenv.mkDerivation rec { owner = "csound"; repo = "csound"; rev = version; - sha256 = "sha256-O19jm3JxHg4TcQzWQZu1uFjfYN2FR41fCRq5YGnTGD0="; + sha256 = "sha256-O7s92N54+zIl07eIdK/puoSve/qJ3O01fTh0TP+VdZA="; }; cmakeFlags = [ "-DBUILD_CSOUND_AC=0" ] # fails to find Score.hpp diff --git a/pkgs/applications/audio/mopidy/ytmusic.nix b/pkgs/applications/audio/mopidy/ytmusic.nix index a66620294dde3..70c7942f3d768 100644 --- a/pkgs/applications/audio/mopidy/ytmusic.nix +++ b/pkgs/applications/audio/mopidy/ytmusic.nix @@ -3,33 +3,20 @@ , mopidy }: -let - python = python3.override { - packageOverrides = self: super: { - ytmusicapi = super.ytmusicapi.overridePythonAttrs (old: rec { - version = "0.22.0"; - format = "setuptools"; - src = old.src.override { - inherit version; - hash = "sha256-CZ4uoW4UHn5C+MckQXysTdydaApn99b0UCnF5RPb7DI="; - }; - }); - }; - }; -in python.pkgs.buildPythonApplication rec { +python3.pkgs.buildPythonApplication rec { pname = "mopidy-ytmusic"; - version = "0.3.7"; + version = "0.3.8"; - src = python.pkgs.fetchPypi { + src = python3.pkgs.fetchPypi { inherit version; - pname = "Mopidy-YTMusic"; - sha256 = "0gqjvi3nfzkqvbdhihzai241p1h5p037bj2475cc93xwzyyqxcrq"; + pname = "mopidy_ytmusic"; + sha256 = "6b4d8ff9c477dbdd30d0259a009494ebe104cad3f8b37241ae503e5bce4ec2e8"; }; propagatedBuildInputs = [ - (mopidy.override { pythonPackages = python.pkgs; }) - python.pkgs.ytmusicapi - python.pkgs.pytube + (mopidy.override { pythonPackages = python3.pkgs; }) + python3.pkgs.ytmusicapi + python3.pkgs.pytube ]; pythonImportsCheck = [ "mopidy_ytmusic" ]; @@ -38,6 +25,7 @@ in python.pkgs.buildPythonApplication rec { doCheck = false; meta = with lib; { + changelog = "https://github.com/OzymandiasTheGreat/mopidy-ytmusic/blob/v${version}/CHANGELOG.rst"; description = "Mopidy extension for playing music from YouTube Music"; homepage = "https://github.com/OzymandiasTheGreat/mopidy-ytmusic"; license = licenses.asl20; diff --git a/pkgs/applications/audio/soundtracker/default.nix b/pkgs/applications/audio/soundtracker/default.nix index 251725ea6b29c..48acd55171792 100644 --- a/pkgs/applications/audio/soundtracker/default.nix +++ b/pkgs/applications/audio/soundtracker/default.nix @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { pname = "soundtracker"; - version = "1.0.2.1"; + version = "1.0.3"; src = fetchurl { # Past releases get moved to the "old releases" directory. @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { # Nonetheless, only the name of the file seems to affect which file is # downloaded, so this path should be fine both for old and current releases. url = "mirror://sourceforge/soundtracker/soundtracker-${version}.tar.xz"; - sha256 = "0nh0dwz8nldc040q6n06vlazhss8ms42r2dffhjcrqj3hbrvfx82"; + sha256 = "sha256-k+TB1DIauOIeQSCVV5uYu69wwRx7vCRAlSCTAtDguKo="; }; postPatch = lib.optionalString stdenv.hostPlatform.isDarwin '' diff --git a/pkgs/applications/audio/squeezelite/default.nix b/pkgs/applications/audio/squeezelite/default.nix index f5f1feacb00cc..dad4402e2d467 100644 --- a/pkgs/applications/audio/squeezelite/default.nix +++ b/pkgs/applications/audio/squeezelite/default.nix @@ -34,13 +34,13 @@ stdenv.mkDerivation { pname = binName; # versions are specified in `squeezelite.h` # see https://github.com/ralph-irving/squeezelite/issues/29 - version = "1.9.9.1411"; + version = "1.9.9.1414"; src = fetchFromGitHub { owner = "ralph-irving"; repo = "squeezelite"; - rev = "ca44fc6e258bb413d6281d927063b25940f42e5c"; - hash = "sha256-aZ+2nyy6tK3VwgTCWGoNaU4//kkHUzd6DZSfTEIgbvY="; + rev = "dbe69eb8aa88f644cfb46541d6cef72fa666570d"; + hash = "sha256-BN6eBHMMecucfHwzmho3xi1l2O3YnYcBUE321Rl6xrc="; }; buildInputs = [ flac libmad libvorbis mpg123 ] diff --git a/pkgs/applications/emulators/yuzu/default.nix b/pkgs/applications/emulators/yuzu/default.nix index 7650ebad343df..8dae647b89d6d 100644 --- a/pkgs/applications/emulators/yuzu/default.nix +++ b/pkgs/applications/emulators/yuzu/default.nix @@ -15,13 +15,13 @@ let in { mainline = libsForQt5.callPackage ./generic.nix rec { pname = "yuzu-mainline"; - version = "1162"; + version = "1245"; src = fetchFromGitHub { owner = "yuzu-emu"; repo = "yuzu-mainline"; rev = "mainline-0-${version}"; - sha256 = "sha256-1UNgB/3l6RN0OLRrmXqzwcEUgXlWGSE7PvHbZ8YSDro="; + sha256 = "sha256-lWXlY1KQC067MvCRUFhmr0c7KDrHDuwJOhIWMKw1f+A="; fetchSubmodules = true; }; diff --git a/pkgs/applications/graphics/gimp/default.nix b/pkgs/applications/graphics/gimp/default.nix index ee733a0b1b0c0..4423ca61ff177 100644 --- a/pkgs/applications/graphics/gimp/default.nix +++ b/pkgs/applications/graphics/gimp/default.nix @@ -30,7 +30,6 @@ , ghostscript , aalib , shared-mime-info -, python2 , libexif , gettext , makeWrapper @@ -48,6 +47,8 @@ , AppKit , Cocoa , gtk-mac-integration-gtk2 +, withPython ? false +, python2 ? null }: let @@ -116,9 +117,6 @@ in stdenv.mkDerivation rec { shared-mime-info libwebp libheif - python - # Duplicated here because python.withPackages does not expose the dev output with pkg-config files - python2.pkgs.pygtk libexif xorg.libXpm glib-networking @@ -130,6 +128,10 @@ in stdenv.mkDerivation rec { gtk-mac-integration-gtk2 ] ++ lib.optionals stdenv.isLinux [ libgudev + ] ++ lib.optionals withPython [ + python + # Duplicated here because python.withPackages does not expose the dev output with pkg-config files + python2.pkgs.pygtk ]; # needed by gimp-2.0.pc @@ -144,6 +146,8 @@ in stdenv.mkDerivation rec { "--with-icc-directory=/run/current-system/sw/share/color/icc" # fix libdir in pc files (${exec_prefix} needs to be passed verbatim) "--libdir=\${exec_prefix}/lib" + ] ++ lib.optionals (!withPython) [ + "--disable-python" # depends on Python2 which was EOLed on 2020-01-01 ]; enableParallelBuilding = true; diff --git a/pkgs/applications/misc/safeeyes/default.nix b/pkgs/applications/misc/safeeyes/default.nix index 51ae6888b2a96..e7a21fab1f412 100644 --- a/pkgs/applications/misc/safeeyes/default.nix +++ b/pkgs/applications/misc/safeeyes/default.nix @@ -15,11 +15,11 @@ with python3.pkgs; buildPythonApplication rec { pname = "safeeyes"; - version = "2.1.3"; + version = "2.1.4"; src = fetchPypi { inherit pname version; - sha256 = "1b5w887hivmdrkm1ydbar4nmnks6grpbbpvxgf9j9s46msj03c9x"; + sha256 = "sha256-SsZRyODeYRQk2pVspKzfJbSRX/zjD+M+aaK+YXPu6CE="; }; nativeBuildInputs = [ diff --git a/pkgs/applications/misc/streamdeck-ui/default.nix b/pkgs/applications/misc/streamdeck-ui/default.nix index be98b3713867a..a1179417719ba 100644 --- a/pkgs/applications/misc/streamdeck-ui/default.nix +++ b/pkgs/applications/misc/streamdeck-ui/default.nix @@ -1,7 +1,7 @@ { lib , python3Packages , fetchFromGitHub -, poetry +, fetchpatch , copyDesktopItems , wrapQtAppsHook , writeText @@ -20,6 +20,14 @@ python3Packages.buildPythonApplication rec { sha256 = "sha256-5dk+5oefg5R68kv038gsZ2p5ixmpj/vBLBp/V7Sdos8="; }; + patches = [ + (fetchpatch { + name = "use-poetry-core.patch"; + url = "https://github.com/timothycrosley/streamdeck-ui/commit/e271656c1f47b1619d1b942e2ebb01ab2d6a68a9.patch"; + hash = "sha256-wqYwX6eSqMnW6OG7wSprD62Dz818ayFduVrqW9E/ays="; + }) + ]; + desktopItems = [ (makeDesktopItem { name = "streamdeck-ui"; desktopName = "Stream Deck UI"; @@ -50,7 +58,7 @@ python3Packages.buildPythonApplication rec { format = "pyproject"; nativeBuildInputs = [ - poetry + python3Packages.poetry-core copyDesktopItems wrapQtAppsHook ]; diff --git a/pkgs/applications/misc/tut/default.nix b/pkgs/applications/misc/tut/default.nix index a47c509c4311a..1e7c61dca2bc8 100644 --- a/pkgs/applications/misc/tut/default.nix +++ b/pkgs/applications/misc/tut/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "tut"; - version = "1.0.22"; + version = "1.0.23"; src = fetchFromGitHub { owner = "RasmusLindroth"; repo = pname; rev = version; - sha256 = "sha256-wFK5dFGD25KtBn4gujgvDu8zZWQ8XH1peEbpLa+6n8A="; + sha256 = "sha256-nFN0F80QZh3SALtG3xe6mH0zbhcLSRtmcHosD6aPvrE="; }; - vendorSha256 = "sha256-HZrchLQ1861MYWDiiegXLNMDsDUzRNzLA7MoULBai+4="; + vendorSha256 = "sha256-Y5nHADLKCaqHIje7vMS3mAwiGx4tHixBzYZM+iHEZb8="; meta = with lib; { description = "A TUI for Mastodon with vim inspired keys"; diff --git a/pkgs/applications/networking/browsers/brave/default.nix b/pkgs/applications/networking/browsers/brave/default.nix index e9c5cf66d9de8..c446a607f3909 100644 --- a/pkgs/applications/networking/browsers/brave/default.nix +++ b/pkgs/applications/networking/browsers/brave/default.nix @@ -180,8 +180,8 @@ stdenv.mkDerivation rec { --add-flags "\''${NIXOS_OZONE_WL:+\''${WAYLAND_DISPLAY:+--ozone-platform-hint=auto --enable-features=WaylandWindowDecorations}}" ${optionalString vulkanSupport '' --prefix XDG_DATA_DIRS : "${addOpenGLRunpath.driverLink}/share" - --add-flags ${escapeShellArg commandLineArgs} ''} + --add-flags ${escapeShellArg commandLineArgs} ) ''; diff --git a/pkgs/applications/networking/freefilesync/default.nix b/pkgs/applications/networking/freefilesync/default.nix index f2d34b602ee3c..c0a69479d451b 100644 --- a/pkgs/applications/networking/freefilesync/default.nix +++ b/pkgs/applications/networking/freefilesync/default.nix @@ -13,13 +13,13 @@ gcc12Stdenv.mkDerivation rec { pname = "freefilesync"; - version = "11.27"; + version = "11.28"; src = fetchFromGitHub { owner = "hkneptune"; repo = "FreeFileSync"; rev = "v${version}"; - sha256 = "sha256-ZIWqCR5/8qaK9Qcb0Uzi/wu3Do8nZ5DGAw8sfwUhCZg="; + sha256 = "sha256-3eYvXClMdOCdl35S1d7nP2kiYZZOjyydi2gKY62K/qM="; }; # Patches from ROSA Linux diff --git a/pkgs/applications/networking/instant-messengers/telegram/tdesktop/default.nix b/pkgs/applications/networking/instant-messengers/telegram/tdesktop/default.nix index fe386cab5ac49..ca89b0d5fcf30 100644 --- a/pkgs/applications/networking/instant-messengers/telegram/tdesktop/default.nix +++ b/pkgs/applications/networking/instant-messengers/telegram/tdesktop/default.nix @@ -31,6 +31,7 @@ , webkitgtk_4_1 , jemalloc , rnnoise +, protobuf , abseil-cpp # Transitive dependencies: , util-linuxMinimal @@ -74,7 +75,7 @@ let in env.mkDerivation rec { pname = "telegram-desktop"; - version = "4.3.1"; + version = "4.3.4"; # Note: Update via pkgs/applications/networking/instant-messengers/telegram/tdesktop/update.py # Telegram-Desktop with submodules @@ -83,7 +84,7 @@ env.mkDerivation rec { repo = "tdesktop"; rev = "v${version}"; fetchSubmodules = true; - sha256 = "0j05hcl5nkvcl74jl8d0inkh6ha9xh299z87br1vr1mblflh087m"; + sha256 = "0x18m48k6abpbfgavjad5sg3mf3j0kfmyayyvkqxr31viw8kq6m5"; }; postPatch = '' @@ -135,6 +136,7 @@ env.mkDerivation rec { webkitgtk_4_1 jemalloc rnnoise + protobuf tg_owt # Transitive dependencies: util-linuxMinimal # Required for libmount thus not nativeBuildInputs. diff --git a/pkgs/applications/networking/mailreaders/electron-mail/default.nix b/pkgs/applications/networking/mailreaders/electron-mail/default.nix index f454a8b43daf4..3cce58258a8a5 100644 --- a/pkgs/applications/networking/mailreaders/electron-mail/default.nix +++ b/pkgs/applications/networking/mailreaders/electron-mail/default.nix @@ -2,12 +2,12 @@ let pname = "electron-mail"; - version = "5.0.1"; + version = "5.1.2"; name = "ElectronMail-${version}"; src = fetchurl { url = "https://github.com/vladimiry/ElectronMail/releases/download/v${version}/electron-mail-${version}-linux-x86_64.AppImage"; - sha256 = "sha256-w6ZZPIJnAlA8WhNHtM9gsjr7U6wMYT21fGFmkDDAVJU="; + sha256 = "sha256-PLDzAtH7T7QMrLavvcF3zOVTayCqEA1IghIUAAxkbEE="; }; appimageContents = appimageTools.extract { inherit name src; }; diff --git a/pkgs/applications/networking/mkchromecast/default.nix b/pkgs/applications/networking/mkchromecast/default.nix index ec2857753d7e3..b0ed32511910d 100644 --- a/pkgs/applications/networking/mkchromecast/default.nix +++ b/pkgs/applications/networking/mkchromecast/default.nix @@ -28,13 +28,13 @@ let packages = [ in python3Packages.buildPythonApplication rec { pname = "mkchromecast-unstable"; - version = "2020-10-17"; + version = "2022-10-31"; src = fetchFromGitHub rec { owner = "muammar"; repo = "mkchromecast"; - rev = "eb9da74d887acd70ed179e6e4c0cbed4ff83de04"; - sha256 = "1l565n3rmyghc4vzh80gazvdks1i97j1h94x33pkmxxlf9a9rncj"; + rev = "0de9fd78c4122dec4f184aeae2564790b45fe6dc"; + sha256 = "sha256-dxsIcBPrZaXlsfzOEXhYj2qoK5LRducJG2ggMrMMl9Y="; }; propagatedBuildInputs = with python3Packages; [ @@ -80,5 +80,6 @@ python3Packages.buildPythonApplication rec { description = "Cast macOS and Linux Audio/Video to your Google Cast and Sonos Devices"; license = licenses.mit; maintainers = with maintainers; [ shou ]; + mainProgram = "mkchromecast"; }; } diff --git a/pkgs/applications/version-management/commitizen/default.nix b/pkgs/applications/version-management/commitizen/default.nix index 274eb3a0070f6..3c0cf0ecec040 100644 --- a/pkgs/applications/version-management/commitizen/default.nix +++ b/pkgs/applications/version-management/commitizen/default.nix @@ -6,7 +6,7 @@ , jinja2 , lib , packaging -, poetry +, poetry-core , pytest-freezegun , pytest-mock , pytest-regressions @@ -34,7 +34,7 @@ buildPythonApplication rec { format = "pyproject"; - nativeBuildInputs = [ poetry ]; + nativeBuildInputs = [ poetry-core ]; propagatedBuildInputs = [ termcolor diff --git a/pkgs/applications/video/kodi/addons/certifi/default.nix b/pkgs/applications/video/kodi/addons/certifi/default.nix index 210429c777068..7becbd2252de0 100644 --- a/pkgs/applications/video/kodi/addons/certifi/default.nix +++ b/pkgs/applications/video/kodi/addons/certifi/default.nix @@ -2,11 +2,11 @@ buildKodiAddon rec { pname = "certifi"; namespace = "script.module.certifi"; - version = "2022.5.18+matrix.1"; + version = "2022.9.24"; src = fetchzip { url = "https://mirrors.kodi.tv/addons/matrix/${namespace}/${namespace}-${version}.zip"; - sha256 = "tk4Ven35sicLxrT7SO2yx5kQORjFP6niRuS9SMocJKY="; + sha256 = "kIPGEjmnHlgVb11W2RKBlrMy3/+kUOcQZiLCcnHCcno="; }; passthru = { diff --git a/pkgs/applications/video/kodi/addons/idna/default.nix b/pkgs/applications/video/kodi/addons/idna/default.nix index e21613dce615c..44bda1278bbd3 100644 --- a/pkgs/applications/video/kodi/addons/idna/default.nix +++ b/pkgs/applications/video/kodi/addons/idna/default.nix @@ -2,11 +2,11 @@ buildKodiAddon rec { pname = "idna"; namespace = "script.module.idna"; - version = "3.3.0+matrix.1"; + version = "3.4.0"; src = fetchzip { url = "https://mirrors.kodi.tv/addons/matrix/${namespace}/${namespace}-${version}.zip"; - sha256 = "gXW1BvM3CLKshVPaemjmzEoZekU0QjuxJY9zGbGwK18="; + sha256 = "wS1d1L18v4+RGwxDh7OpKRHB2A4qYwiq6b5mAz7l8Pk="; }; passthru = { diff --git a/pkgs/applications/video/kodi/addons/urllib3/default.nix b/pkgs/applications/video/kodi/addons/urllib3/default.nix index 1becee357bee8..90900f3060738 100644 --- a/pkgs/applications/video/kodi/addons/urllib3/default.nix +++ b/pkgs/applications/video/kodi/addons/urllib3/default.nix @@ -3,11 +3,11 @@ buildKodiAddon rec { pname = "urllib3"; namespace = "script.module.urllib3"; - version = "1.26.9+matrix.1"; + version = "1.26.13+matrix.1"; src = fetchzip { url = "https://mirrors.kodi.tv/addons/matrix/${namespace}/${namespace}-${version}.zip"; - sha256 = "w2HXepAHLE4NAWTXOQgY3ifr3mlI/QYF6KAKqpAmO/g="; + sha256 = "pymhHS1TqRv9o/3zBtmP8QSLMXSgFYno0VaR+YqhJqY="; }; passthru = { diff --git a/pkgs/applications/video/minitube/default.nix b/pkgs/applications/video/minitube/default.nix index eda58349bd861..06bed9211318f 100644 --- a/pkgs/applications/video/minitube/default.nix +++ b/pkgs/applications/video/minitube/default.nix @@ -1,4 +1,4 @@ -{ mkDerivation, lib, fetchFromGitHub, phonon, phonon-backend-vlc, qtbase, qmake +{ mkDerivation, lib, fetchFromGitHub, fetchpatch, phonon, phonon-backend-vlc, qtbase, qmake , qtdeclarative, qttools, qtx11extras, mpv # "Free" key generated by pasqui23 @@ -16,6 +16,12 @@ mkDerivation rec { fetchSubmodules = true; }; + patches = [ + # Taken from FreeBSD; already merged upstream in the media submodule + # (https://github.com/flaviotordini/media/commit/f6b7020f273e1fc06e6e204fab37a7c8edaa857a) + ./lib_media_src_mpv_mpvwidget.patch + ]; + nativeBuildInputs = [ qmake qttools ]; buildInputs = [ phonon phonon-backend-vlc qtbase qtdeclarative qtx11extras mpv ]; diff --git a/pkgs/applications/video/minitube/lib_media_src_mpv_mpvwidget.patch b/pkgs/applications/video/minitube/lib_media_src_mpv_mpvwidget.patch new file mode 100644 index 0000000000000..9beff68a0ec40 --- /dev/null +++ b/pkgs/applications/video/minitube/lib_media_src_mpv_mpvwidget.patch @@ -0,0 +1,16 @@ +diff -Nur a/lib/media/src/mpv/mpvwidget.cpp b/lib/media/src/mpv/mpvwidget.cpp +--- a/lib/media/src/mpv/mpvwidget.cpp ++++ b/lib/media/src/mpv/mpvwidget.cpp +@@ -30,7 +30,11 @@ + qDebug() << "initializeGL" << nativeParent; + if (nativeParent == nullptr) qFatal("No native parent"); + +- mpv_opengl_init_params gl_init_params{get_proc_address, this, nullptr}; ++ #if MPV_CLIENT_API_VERSION < MPV_MAKE_VERSION(2,0) ++ mpv_opengl_init_params gl_init_params{get_proc_address, this, nullptr}; ++ #else ++ mpv_opengl_init_params gl_init_params{get_proc_address, this}; ++ #endif + mpv_render_param params[]{{MPV_RENDER_PARAM_API_TYPE, (void *)MPV_RENDER_API_TYPE_OPENGL}, + {MPV_RENDER_PARAM_OPENGL_INIT_PARAMS, &gl_init_params}, + {MPV_RENDER_PARAM_INVALID, nullptr}, diff --git a/pkgs/applications/virtualization/crun/default.nix b/pkgs/applications/virtualization/crun/default.nix index 82d9b251292a2..60d05f6f23095 100644 --- a/pkgs/applications/virtualization/crun/default.nix +++ b/pkgs/applications/virtualization/crun/default.nix @@ -38,13 +38,13 @@ let in stdenv.mkDerivation rec { pname = "crun"; - version = "1.7.1"; + version = "1.7.2"; src = fetchFromGitHub { owner = "containers"; repo = pname; rev = version; - sha256 = "sha256-YCymMr2dxDACdBNylPXa0GKu+QRzKFi5QzlyacAyE5A="; + sha256 = "sha256-SNNy/oI3ZcMeRLEMS2nSCS/rRaen5WsDfhdlHQCdtP4="; fetchSubmodules = true; }; diff --git a/pkgs/build-support/docker/examples.nix b/pkgs/build-support/docker/examples.nix index 802b2f79f0fc5..71c3574963c88 100644 --- a/pkgs/build-support/docker/examples.nix +++ b/pkgs/build-support/docker/examples.nix @@ -92,10 +92,11 @@ rec { ]; extraCommands = '' + mkdir -p tmp + # nginx still tries to read this directory even if error_log # directive is specifying another file :/ mkdir -p var/log/nginx - mkdir -p var/cache/nginx ''; config = { diff --git a/pkgs/development/interpreters/nelua/default.nix b/pkgs/development/interpreters/nelua/default.nix new file mode 100644 index 0000000000000..6c0eb22225134 --- /dev/null +++ b/pkgs/development/interpreters/nelua/default.nix @@ -0,0 +1,27 @@ +{ lib, stdenv, fetchFromGitHub, luaPackages }: + +stdenv.mkDerivation { + pname = "nelua"; + version = "unstable-2022-11-20"; + + src = fetchFromGitHub { + owner = "edubart"; + repo = "nelua-lang"; + rev = "63909dc834708a5bd7c21d65a6633880f40295db"; + hash = "sha256-GeknXYsdRUzihzF3qHcCgbcB3w8geiWe5O1Az+4UqMs="; + }; + + makeFlags = [ "PREFIX=$(out)" ]; + + checkInputs = [ luaPackages.luacheck ]; + + doCheck = true; + + meta = with lib; { + description = "Minimal, efficient, statically-typed and meta-programmable systems programming language heavily inspired by Lua, which compiles to C and native code"; + homepage = "https://nelua.io/"; + license = licenses.mit; + platforms = platforms.all; + maintainers = [ maintainers.marsam ]; + }; +} diff --git a/pkgs/development/libraries/flatbuffers/default.nix b/pkgs/development/libraries/flatbuffers/default.nix index 88f7f6701b34f..ad883b12e4ebb 100644 --- a/pkgs/development/libraries/flatbuffers/default.nix +++ b/pkgs/development/libraries/flatbuffers/default.nix @@ -7,13 +7,13 @@ stdenv.mkDerivation rec { pname = "flatbuffers"; - version = "22.10.26"; + version = "22.11.23"; src = fetchFromGitHub { owner = "google"; repo = "flatbuffers"; rev = "v${version}"; - sha256 = "sha256-Kub076FkWwHNlphGtTx2c3Jojv8otKLo492uN6Oq1F0="; + sha256 = "sha256-I41bslYoSGPNm1+Xpf4kHFDnIqLN8vg5cEqbFIpDT5A="; }; nativeBuildInputs = [ cmake python3 ]; diff --git a/pkgs/development/libraries/highfive/default.nix b/pkgs/development/libraries/highfive/default.nix index 3ddba9e327db7..769da9546e492 100644 --- a/pkgs/development/libraries/highfive/default.nix +++ b/pkgs/development/libraries/highfive/default.nix @@ -12,13 +12,13 @@ assert mpiSupport -> mpi != null; stdenv.mkDerivation rec { pname = "highfive${lib.optionalString mpiSupport "-mpi"}"; - version = "2.6.1"; + version = "2.6.2"; src = fetchFromGitHub { owner = "BlueBrain"; repo = "HighFive"; rev = "v${version}"; - sha256 = "sha256-jo/yGcDnT/L/CMU3XpuhyzlBgvMxgNm9Y1qSVwZJihA="; + sha256 = "sha256-rUuhhoVH4Jdve7eY0M5THWtoHoIluiujfQwfTYULEiQ="; }; nativeBuildInputs = [ cmake ]; diff --git a/pkgs/development/libraries/imgui/default.nix b/pkgs/development/libraries/imgui/default.nix index 1cc0e3b3342f2..ab3a9faca00e9 100644 --- a/pkgs/development/libraries/imgui/default.nix +++ b/pkgs/development/libraries/imgui/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "imgui"; - version = "1.89"; + version = "1.89.1"; src = fetchFromGitHub { owner = "ocornut"; repo = "imgui"; rev = "v${version}"; - sha256 = "sha256-nD65+yI0IR5XwUalAKH8q8kLhZBal0sPkJ1Wyf4UGq0="; + sha256 = "sha256-wIkbluNGiK5HPmFaS5o2tZt/kPcqcXup+V2jnQQDSd0="; }; dontBuild = true; diff --git a/pkgs/development/libraries/libgbinder/default.nix b/pkgs/development/libraries/libgbinder/default.nix index 2cd6c55fdbdda..164c9f9e27dd5 100644 --- a/pkgs/development/libraries/libgbinder/default.nix +++ b/pkgs/development/libraries/libgbinder/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "libgbinder"; - version = "1.1.25"; + version = "1.1.26"; src = fetchFromGitHub { owner = "mer-hybris"; repo = pname; rev = version; - sha256 = "sha256-yr9FJd1+yJdP3vXHbuaaL5UmXGnKxR319LzXs76LBwk="; + sha256 = "sha256-bXptf1ALanzDyhajQtKMs/0M9TWlrjhWQdC1NZiUgd8="; }; outputs = [ "out" "dev" ]; diff --git a/pkgs/development/libraries/qcoro/default.nix b/pkgs/development/libraries/qcoro/default.nix index 7fcbd489b4c92..4a288702e2f29 100644 --- a/pkgs/development/libraries/qcoro/default.nix +++ b/pkgs/development/libraries/qcoro/default.nix @@ -11,13 +11,13 @@ gcc11Stdenv.mkDerivation rec { pname = "qcoro"; - version = "0.6.0"; + version = "0.7.0"; src = fetchFromGitHub { owner = "danvratil"; repo = "qcoro"; rev = "v${version}"; - sha256 = "sha256-6kRWBzspwsO0Q6/8gQUr69DJjmkPa3lWrKTmSgVn6V4="; + sha256 = "cHd2CwzP4oD/gy9qsDWIMgvlfBQq1p9C4G7JNAs4XW4="; }; outputs = [ "out" "dev" ]; diff --git a/pkgs/development/libraries/wxsqlite3/default.nix b/pkgs/development/libraries/wxsqlite3/default.nix index 3b1c9ff22e8f2..b610e903ba303 100644 --- a/pkgs/development/libraries/wxsqlite3/default.nix +++ b/pkgs/development/libraries/wxsqlite3/default.nix @@ -12,13 +12,13 @@ stdenv.mkDerivation rec { pname = "wxsqlite3"; - version = "4.9.0"; + version = "4.9.1"; src = fetchFromGitHub { owner = "utelle"; repo = "wxsqlite3"; rev = "v${version}"; - hash = "sha256-9WnXaMpKzqJhdfT7ScOhULbOwJsmuiS0IpYDArWq82s="; + hash = "sha256-n7m94QdQf0s5I9z8ScpCu+r2h7XOKO2F1OX44IjdBn4="; }; nativeBuildInputs = [ autoreconfHook ]; diff --git a/pkgs/development/python-modules/aioeafm/default.nix b/pkgs/development/python-modules/aioeafm/default.nix index d8b8c11cef99c..6200c60d46652 100644 --- a/pkgs/development/python-modules/aioeafm/default.nix +++ b/pkgs/development/python-modules/aioeafm/default.nix @@ -2,7 +2,8 @@ , aiohttp , buildPythonPackage , fetchFromGitHub -, poetry +, fetchpatch +, poetry-core , pytest-aiohttp , pytest-asyncio , pytest-cov @@ -21,7 +22,15 @@ buildPythonPackage rec { sha256 = "048cxn3fw2hynp27zlizq7k8ps67qq9sib1ddgirnxy5zc87vgkc"; }; - nativeBuildInputs = [ poetry ]; + patches = [ + (fetchpatch { + name = "use-poetry-core.patch"; + url = "https://github.com/Jc2k/aioeafm/commit/549590e2ed465be40e2406416d89b8a8cd8c6185.patch"; + hash = "sha256-cG/vQI1XQO8LVvWsHrAj8KlPGRulvO7Ny+k0CKUpPqQ="; + }) + ]; + + nativeBuildInputs = [ poetry-core ]; propagatedBuildInputs = [ aiohttp ]; diff --git a/pkgs/development/python-modules/aria2p/default.nix b/pkgs/development/python-modules/aria2p/default.nix index 2a7e6cb0df956..2663f0c9d54e3 100644 --- a/pkgs/development/python-modules/aria2p/default.nix +++ b/pkgs/development/python-modules/aria2p/default.nix @@ -1,41 +1,82 @@ -{ lib, buildPythonPackage, fetchFromGitHub, pythonOlder -, aria2, poetry, pytest, pytest-cov, pytest-xdist, responses -, asciimatics, loguru, requests, setuptools, websocket-client +{ lib +, buildPythonPackage +, fetchFromGitHub +, pythonOlder +, pdm-pep517 +, appdirs +, loguru +, requests +, setuptools +, toml +, websocket-client +, asciimatics +, pyperclip +, aria2 +, fastapi +, pytest-xdist +, pytestCheckHook +, responses +, uvicorn }: buildPythonPackage rec { pname = "aria2p"; - version = "0.9.1"; + version = "0.11.2"; format = "pyproject"; disabled = pythonOlder "3.6"; src = fetchFromGitHub { owner = "pawamoy"; repo = pname; - rev = "v${version}"; - sha256 = "1s4kad6jnfz9p64gkqclkfq2x2bn8dbc0hyr86d1545bgn7pz672"; + rev = version; + hash = "sha256-z74ej6J6Yh1aVsXR5fE+XhoCzCS+zfDxQL8gKFd7tBA="; }; - nativeBuildInputs = [ poetry ]; + nativeBuildInputs = [ + pdm-pep517 + ]; - preBuild = '' + propagatedBuildInputs = [ + appdirs + loguru + requests + setuptools # for pkg_resources + toml + websocket-client + ]; + + passthru.optional-dependencies = { + tui = [ asciimatics pyperclip ]; + }; + + preCheck = '' export HOME=$TMPDIR ''; - checkInputs = [ aria2 responses pytest pytest-cov pytest-xdist ]; + checkInputs = [ + aria2 + fastapi + pytest-xdist + pytestCheckHook + responses + uvicorn + ] ++ passthru.optional-dependencies.tui; - # Tests are not all stable/deterministic, - # they rely on actually running an aria2c daemon and communicating with it, - # race conditions and deadlocks were observed, - # thus the corresponding tests are disabled - checkPhase = '' - pytest -nauto -k "not test_api and not test_cli and not test_interface" - ''; + disabledTests = [ + # require a running display server + "test_add_downloads_torrents_and_metalinks" + "test_add_downloads_uris" + # require a running aria2 server + "test_get_files_method" + "test_pause_subcommand" + "test_resume_method" + ]; - propagatedBuildInputs = [ asciimatics loguru requests setuptools websocket-client ]; + pythonImportsCheck = [ "aria2p" ]; meta = with lib; { homepage = "https://github.com/pawamoy/aria2p"; + changelog = "https://github.com/pawamoy/aria2p/blob/${src.rev}/CHANGELOG.md"; description = "Command-line tool and library to interact with an aria2c daemon process with JSON-RPC"; license = licenses.isc; maintainers = with maintainers; [ koral ]; diff --git a/pkgs/development/python-modules/aws-lambda-builders/default.nix b/pkgs/development/python-modules/aws-lambda-builders/default.nix index b7c2cf8994d44..57aa49c23ce29 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.23.0"; + version = "1.23.1"; 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-3jzUowSeO6j7DzIlOkeU3KUFFIUi7cEyvjbIL8uRGcU="; + hash = "sha256-t/fdj0p3Z0J0C1v+TWx5jWNOjdAK2f0sPPkNM3SthXk="; }; propagatedBuildInputs = [ @@ -63,6 +63,7 @@ buildPythonPackage rec { broken = (stdenv.isLinux && stdenv.isAarch64); description = "Tool to compile, build and package AWS Lambda functions"; homepage = "https://github.com/awslabs/aws-lambda-builders"; + changelog = "https://github.com/aws/aws-lambda-builders/releases/tag/v${version}"; longDescription = '' Lambda Builders is a Python library to compile, build and package AWS Lambda functions for several runtimes & frameworks. diff --git a/pkgs/development/python-modules/cleo/default.nix b/pkgs/development/python-modules/cleo/default.nix index e81ff175d5336..f834ef198ca81 100644 --- a/pkgs/development/python-modules/cleo/default.nix +++ b/pkgs/development/python-modules/cleo/default.nix @@ -3,21 +3,21 @@ , fetchFromGitHub , crashtest , poetry-core -, pylev , pytest-mock , pytestCheckHook +, rapidfuzz }: buildPythonPackage rec { pname = "cleo"; - version = "1.0.0a5"; + version = "2.0.1"; format = "pyproject"; src = fetchFromGitHub { owner = "python-poetry"; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-FtGGIRF/tA2OWEjkCFwa1HHg6VY+5E5mAiJC/zjUC1g="; + hash = "sha256-y9PYlGSPLpZl9Ad2AFuDKIopH0LRETLp35aiZtLcXzM="; }; postPatch = '' @@ -31,7 +31,7 @@ buildPythonPackage rec { propagatedBuildInputs = [ crashtest - pylev + rapidfuzz ]; pythonImportsCheck = [ @@ -48,6 +48,7 @@ buildPythonPackage rec { meta = with lib; { homepage = "https://github.com/python-poetry/cleo"; + changelog = "https://github.com/python-poetry/cleo/blob/${src.rev}/CHANGELOG.md"; description = "Allows you to create beautiful and testable command-line interfaces"; license = licenses.mit; maintainers = with maintainers; [ jakewaksbaum ]; diff --git a/pkgs/development/python-modules/crashtest/default.nix b/pkgs/development/python-modules/crashtest/default.nix index da01d77cd0725..d8bd8c95b8d62 100644 --- a/pkgs/development/python-modules/crashtest/default.nix +++ b/pkgs/development/python-modules/crashtest/default.nix @@ -2,12 +2,12 @@ buildPythonPackage rec { pname = "crashtest"; - version = "0.4.0"; + version = "0.4.1"; disabled = !(pythonAtLeast "3.6"); src = fetchPypi { inherit pname version; - sha256 = "sha256-1imwDx1OecMWkJ9Ot2O7yym1ENZfveE2Whzrk6t/pMg="; + sha256 = "sha256-gNex8xbr+9Qp9kgHbWJ1yHe6MLpIl53kGRcUp1Jm8M4="; }; # has tests, but only on GitHub, however the pyproject build fails for me diff --git a/pkgs/development/python-modules/desktop-notifier/default.nix b/pkgs/development/python-modules/desktop-notifier/default.nix index 342b073872485..840fbda9231b4 100644 --- a/pkgs/development/python-modules/desktop-notifier/default.nix +++ b/pkgs/development/python-modules/desktop-notifier/default.nix @@ -11,15 +11,16 @@ buildPythonPackage rec { pname = "desktop-notifier"; - version = "3.4.1"; + version = "3.4.2"; format = "pyproject"; - disabled = pythonOlder "3.6"; + + disabled = pythonOlder "3.7"; src = fetchFromGitHub { owner = "SamSchott"; repo = pname; rev = "refs/tags/v${version}"; - sha256 = "sha256-cqPLnahs3fT6AfQQkS5azh4/cHzaexytg78RsJG5c6U="; + hash = "sha256-OujBpq3SBDKw9Jgb9MD200Rp0fD0OJRw90flxS22I2s="; }; nativeBuildInputs = [ @@ -36,11 +37,15 @@ buildPythonPackage rec { # no tests available, do the imports check instead doCheck = false; - pythonImportsCheck = [ "desktop_notifier" ]; + + pythonImportsCheck = [ + "desktop_notifier" + ]; meta = with lib; { + description = "Python library for cross-platform desktop notifications"; homepage = "https://github.com/samschott/desktop-notifier"; - description = "A Python library for cross-platform desktop notifications"; + changelog = "https://github.com/samschott/desktop-notifier/releases/tag/v${version}"; license = licenses.mit; maintainers = with maintainers; [ sfrijters ]; platforms = platforms.linux; diff --git a/pkgs/development/python-modules/duckdb-engine/default.nix b/pkgs/development/python-modules/duckdb-engine/default.nix index afe9b98d07450..db38ac4c29787 100644 --- a/pkgs/development/python-modules/duckdb-engine/default.nix +++ b/pkgs/development/python-modules/duckdb-engine/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { pname = "duckdb-engine"; - version = "0.6.4"; + version = "0.6.5"; format = "pyproject"; disabled = pythonOlder "3.7"; @@ -21,8 +21,8 @@ buildPythonPackage rec { src = fetchFromGitHub { repo = "duckdb_engine"; owner = "Mause"; - rev = "v${version}"; - hash = "sha256-7PfrI4bNz0XtBa/cb8T43j06BJ3B2S5zIyBZsEusyXc="; + rev = "refs/tags/v${version}"; + hash = "sha256-DLm/8bye8p2fhs36CW5PQAxm3uhJq1L+DT1Zn2uJhqE="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/expecttest/default.nix b/pkgs/development/python-modules/expecttest/default.nix index db64b386f2415..6892a7bcb63a6 100644 --- a/pkgs/development/python-modules/expecttest/default.nix +++ b/pkgs/development/python-modules/expecttest/default.nix @@ -2,7 +2,7 @@ , fetchFromGitHub , hypothesis , lib -, poetry +, poetry-core , pytestCheckHook }: @@ -18,7 +18,7 @@ buildPythonPackage rec { hash = "sha256-5CnpVFSbf3FcAa06Y7atG8sxu8uevpfrliB2HuVcrx0="; }; - buildInputs = [ poetry ]; + buildInputs = [ poetry-core ]; checkInputs = [ hypothesis pytestCheckHook ]; diff --git a/pkgs/development/python-modules/hypothesis-auto/default.nix b/pkgs/development/python-modules/hypothesis-auto/default.nix index 854f104be7581..49638e8258231 100644 --- a/pkgs/development/python-modules/hypothesis-auto/default.nix +++ b/pkgs/development/python-modules/hypothesis-auto/default.nix @@ -1,8 +1,9 @@ { lib , buildPythonPackage , fetchPypi +, fetchpatch , hypothesis -, poetry +, poetry-core , pydantic , pytest , pythonOlder @@ -20,6 +21,14 @@ buildPythonPackage rec { hash = "sha256-XiwvsJ3AmEJRLYBjC7eSNZodM9LARzrUfuI9oL6eMrE="; }; + patches = [ + (fetchpatch { + name = "switch-to-poetry-core.patch"; + url = "https://github.com/timothycrosley/hypothesis-auto/commit/8277b4232617c0433f80e9c2844452b9fae67a65.patch"; + hash = "sha256-/0z0nphtQnUBiLYhhzLZT59kQgktSugaBg+ePNxy0qI="; + }) + ]; + postPatch = '' # https://github.com/timothycrosley/hypothesis-auto/pull/20 substituteInPlace pyproject.toml \ @@ -28,7 +37,7 @@ buildPythonPackage rec { ''; nativeBuildInputs = [ - poetry + poetry-core ]; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/jedi-language-server/default.nix b/pkgs/development/python-modules/jedi-language-server/default.nix index af61a5d5f2367..b6d0019407ca5 100644 --- a/pkgs/development/python-modules/jedi-language-server/default.nix +++ b/pkgs/development/python-modules/jedi-language-server/default.nix @@ -2,7 +2,8 @@ , buildPythonPackage , fetchPypi , fetchFromGitHub -, poetry +, poetry-core +, pythonRelaxDepsHook , docstring-to-markdown , jedi , pygls @@ -13,18 +14,23 @@ buildPythonPackage rec { pname = "jedi-language-server"; - version = "0.37.0"; + version = "0.39.0"; format = "pyproject"; src = fetchFromGitHub { owner = "pappasam"; repo = pname; rev = "refs/tags/v${version}"; - sha256 = "sha256-5il12WDmUkdud9zTpzTaoSXEqOaK15Ut3/fUAX422fA="; + sha256 = "sha256-nra2Xvfo1cfMoZkY7sem7NIEDwDmODWbGVNCeefSuQY="; }; + pythonRelaxDeps = [ + "pygls" + ]; + nativeBuildInputs = [ - poetry + poetry-core + pythonRelaxDepsHook ]; propagatedBuildInputs = [ @@ -49,6 +55,7 @@ buildPythonPackage rec { meta = with lib; { homepage = "https://github.com/pappasam/jedi-language-server"; + changelog = "https://github.com/pappasam/jedi-language-server/blob/${src.rev}/CHANGELOG.md"; description = "A Language Server for the latest version(s) of Jedi"; license = licenses.mit; maintainers = with maintainers; [ doronbehar ]; diff --git a/pkgs/development/python-modules/pipenv-poetry-migrate/default.nix b/pkgs/development/python-modules/pipenv-poetry-migrate/default.nix index 7cbbb859e0ae9..0e5de80d8b15e 100644 --- a/pkgs/development/python-modules/pipenv-poetry-migrate/default.nix +++ b/pkgs/development/python-modules/pipenv-poetry-migrate/default.nix @@ -1,9 +1,11 @@ { lib , buildPythonPackage , fetchFromGitHub +, fetchpatch , pytestCheckHook , pythonOlder -, poetry +, poetry-core +, tomlkit , typer , setuptools }: @@ -21,17 +23,26 @@ buildPythonPackage rec { hash = "sha256-aP8bzWFUzAZrEsz8pYL2y5c7GaUjWG5GA+cc4/tGPZk="; }; - nativeBuildInputs = [ - setuptools + patches = [ + (fetchpatch { + name = "use-poetry-core.patch"; + url = "https://github.com/yhino/pipenv-poetry-migrate/commit/726ebd823bf6ef982992085bd04e41d178775b98.patch"; + hash = "sha256-TBVH1MZA0O1/2zLpVgNckLaP4JO3wIJJi0Nst726erk="; + }) + ]; + + nativeBuildInputs = [ + poetry-core ]; propagatedBuildInputs = [ - poetry + setuptools # for pkg_resources + tomlkit typer ]; postPatch = '' - substituteInPlace pyproject.toml --replace 'typer = "^0.4.0"' 'typer = ">=0.4"' + substituteInPlace pyproject.toml --replace 'typer = "^0.4.0"' 'typer = ">=0.4"' ''; checkInputs = [ diff --git a/pkgs/development/python-modules/pyairnow/default.nix b/pkgs/development/python-modules/pyairnow/default.nix index 51497e8875b77..da1b2223f2fcf 100644 --- a/pkgs/development/python-modules/pyairnow/default.nix +++ b/pkgs/development/python-modules/pyairnow/default.nix @@ -3,8 +3,9 @@ , aioresponses , buildPythonPackage , fetchFromGitHub +, fetchpatch , pytest-aiohttp -, poetry +, poetry-core , pytest-asyncio , pytest-cov , pytestCheckHook @@ -22,7 +23,15 @@ buildPythonPackage rec { sha256 = "1hkpfl8rdwyzqrr1drqlmcw3xpv3pi1jf19h1divspbzwarqxs1c"; }; - nativeBuildInputs = [ poetry ]; + patches = [ + (fetchpatch { + name = "switch-to-poetry-core.patch"; + url = "https://github.com/asymworks/pyairnow/commit/f7a01733a41c648563fc2fe4b559f61ef08b9153.patch"; + hash = "sha256-lcHnFP3bwkPTi9Zq1dZtShLKyXcxO0XoDF+PgjbWOqs="; + }) + ]; + + nativeBuildInputs = [ poetry-core ]; propagatedBuildInputs = [ aiohttp ]; diff --git a/pkgs/development/python-modules/pygls/default.nix b/pkgs/development/python-modules/pygls/default.nix index ce69c36d74619..5f837330754a9 100644 --- a/pkgs/development/python-modules/pygls/default.nix +++ b/pkgs/development/python-modules/pygls/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { pname = "pygls"; - version = "0.12.3"; + version = "0.13.0"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -21,16 +21,18 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "openlawlibrary"; repo = "pygls"; - rev = "refs/tags/v${version}"; - sha256 = "sha256-RtoRIfPIbERQFx0GzQqsxnKAMsIK5Zbf2sNtHhC2fmo="; + rev = "v${version}"; + hash = "sha256-guwOnB4EEUpucfprNLLr49Yn8EdOpRzzG+cT4NCn0rA="; }; SETUPTOOLS_SCM_PRETEND_VERSION = version; - nativeBuildInputs = [ setuptools-scm ]; + nativeBuildInputs = [ + setuptools-scm + toml + ]; propagatedBuildInputs = [ pydantic - toml typeguard ]; @@ -46,6 +48,7 @@ buildPythonPackage rec { pythonImportsCheck = [ "pygls" ]; meta = with lib; { + changelog = "https://github.com/openlawlibrary/pygls/blob/${src.rev}/CHANGELOG.md"; description = "Pythonic generic implementation of the Language Server Protocol"; homepage = "https://github.com/openlawlibrary/pygls"; license = licenses.asl20; diff --git a/pkgs/development/python-modules/pytest-golden/default.nix b/pkgs/development/python-modules/pytest-golden/default.nix index d6fd3fe5d2d01..9d1ba62df41d3 100644 --- a/pkgs/development/python-modules/pytest-golden/default.nix +++ b/pkgs/development/python-modules/pytest-golden/default.nix @@ -4,7 +4,7 @@ , fetchFromGitHub #, hatchling , ruamel-yaml -, poetry +, poetry-core , pytest , pytest-asyncio , pytestCheckHook @@ -27,13 +27,19 @@ buildPythonPackage rec { hash = "sha256-l5fXWDK6gWJc3dkYFTokI9tWvawMRnF0td/lSwqkYXE="; }; + postPatch = '' + substituteInPlace pyproject.toml \ + --replace "poetry>=0.12" poetry-core \ + --replace poetry.masonry.api poetry.core.masonry.api + ''; + pythonRelaxDeps = [ "testfixtures" ]; nativeBuildInputs = [ # hatchling used for > 0.2.2 - poetry + poetry-core pythonRelaxDepsHook ]; diff --git a/pkgs/development/python-modules/strawberry-graphql/default.nix b/pkgs/development/python-modules/strawberry-graphql/default.nix index 3c84d30ab371f..ca4b1b81725dc 100644 --- a/pkgs/development/python-modules/strawberry-graphql/default.nix +++ b/pkgs/development/python-modules/strawberry-graphql/default.nix @@ -1,4 +1,4 @@ -{ lib, buildPythonPackage, fetchFromGitHub, poetry, pythonOlder +{ lib, buildPythonPackage, fetchFromGitHub, fetchpatch, poetry-core, pythonOlder , click, backports-cached-property, graphql-core, pygments, python-dateutil, python-multipart, typing-extensions , aiohttp, asgiref, chalice, django, fastapi, flask, pydantic, sanic, starlette, uvicorn }: @@ -17,8 +17,16 @@ buildPythonPackage rec { sha256 = "sha256-8ERmG10qNiYg9Zr8oUZk/Uz68sCE+oWrqmJ5kUMqbRo="; }; + patches = [ + (fetchpatch { + name = "switch-to-poetry-core.patch"; + url = "https://github.com/strawberry-graphql/strawberry/commit/710bb96f47c244e78fc54c921802bcdb48f5f421.patch"; + hash = "sha256-ekUZ2hDPCqwXp9n0YjBikwSkhCmVKUzQk7LrPECcD7Y="; + }) + ]; + nativeBuildInputs = [ - poetry + poetry-core ]; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/webssh/default.nix b/pkgs/development/python-modules/webssh/default.nix index 47a25c25d1f46..e60fc87a1c50e 100644 --- a/pkgs/development/python-modules/webssh/default.nix +++ b/pkgs/development/python-modules/webssh/default.nix @@ -1,5 +1,5 @@ -{ stdenv -, lib +{ lib +, stdenv , buildPythonPackage , fetchPypi , paramiko @@ -9,12 +9,12 @@ buildPythonPackage rec { pname = "webssh"; - version = "1.6.0"; + version = "1.6.1"; format = "setuptools"; src = fetchPypi { inherit pname version; - hash = "sha256-yqjwahh2METXD83geTGt5sUL+vmxbrYxj4KtwTxbD94="; + hash = "sha256-g3RRQUWbjHRaZRVekmETcrHYeVIIpeteCCh7o28jBLY="; }; propagatedBuildInputs = [ @@ -36,10 +36,11 @@ buildPythonPackage rec { ]; meta = with lib; { - broken = stdenv.isDarwin; description = "Web based SSH client"; homepage = "https://github.com/huashengdun/webssh/"; + changelog = "https://github.com/huashengdun/webssh/releases/tag/v${version}"; license = licenses.mit; maintainers = with maintainers; [ davidtwco ]; + broken = stdenv.isDarwin; }; } diff --git a/pkgs/development/ruby-modules/bundler-update-script/default.nix b/pkgs/development/ruby-modules/bundler-update-script/default.nix index 50d0364aa0672..cf4942f6e58c4 100644 --- a/pkgs/development/ruby-modules/bundler-update-script/default.nix +++ b/pkgs/development/ruby-modules/bundler-update-script/default.nix @@ -1,11 +1,11 @@ -{ runtimeShell, lib, writeScript, bundix, bundler, bundler-audit, coreutils, git, nix }: +{ runtimeShell, lib, writeScript, bundix, bundler, bundler-audit, coreutils, git, nix_2_3 }: attrPath: let updateScript = writeScript "bundler-update-script" '' #!${runtimeShell} - PATH=${lib.makeBinPath [ bundler bundler-audit bundix coreutils git nix ]} + PATH=${lib.makeBinPath [ bundler bundler-audit bundix coreutils git nix_2_3 ]} set -o errexit set -o nounset set -o pipefail diff --git a/pkgs/development/tools/build-managers/scala-cli/default.nix b/pkgs/development/tools/build-managers/scala-cli/default.nix index 92ea26b833759..307efdd9458a6 100644 --- a/pkgs/development/tools/build-managers/scala-cli/default.nix +++ b/pkgs/development/tools/build-managers/scala-cli/default.nix @@ -41,7 +41,8 @@ stdenv.mkDerivation { runHook preInstall install -Dm755 scala-cli $out/bin/.scala-cli-wrapped makeWrapper $out/bin/.scala-cli-wrapped $out/bin/scala-cli \ - --set JAVA_HOME ${jre.home} + --set JAVA_HOME ${jre.home} \ + --argv0 "$out/bin/scala-cli" runHook postInstall ''; diff --git a/pkgs/development/tools/build-managers/scala-cli/sources.json b/pkgs/development/tools/build-managers/scala-cli/sources.json index e3df6799330da..6fb1463abcfee 100644 --- a/pkgs/development/tools/build-managers/scala-cli/sources.json +++ b/pkgs/development/tools/build-managers/scala-cli/sources.json @@ -1,17 +1,17 @@ { - "version": "0.1.16", + "version": "0.1.17", "assets": { "aarch64-darwin": { "asset": "scala-cli-aarch64-apple-darwin.gz", - "sha256": "1ryjsf126dsqkpnkc2dmr3p373sb518q2ply0y1ifrx3rhqj0viq" + "sha256": "0p3z4wvindcb9wahq2q8ca24zgl05qb3z2asmqi2z54pqfkc21d7" }, "x86_64-darwin": { "asset": "scala-cli-x86_64-apple-darwin.gz", - "sha256": "1vfx9ccl08mykr579nq9kwbv88d6gaq1vd9xscwyq5rps6lxrz92" + "sha256": "17zj3g62b27blbdfa3j4lzvs3v13jyy7428zxalkpdx8ixy0ghyy" }, "x86_64-linux": { "asset": "scala-cli-x86_64-pc-linux.gz", - "sha256": "1p2lk2hkj149r27p4kwxvwlvjvzv9l0zncqfs3wa972jyn4hhr9g" + "sha256": "0dm7jhsvrjb73wyvvds17r779gcm00yvsy31arc8552df5nkq4iz" } } } diff --git a/pkgs/development/tools/bunyan-rs/default.nix b/pkgs/development/tools/bunyan-rs/default.nix index 77191efbe4fa2..28f53a148e22d 100644 --- a/pkgs/development/tools/bunyan-rs/default.nix +++ b/pkgs/development/tools/bunyan-rs/default.nix @@ -5,16 +5,16 @@ rustPlatform.buildRustPackage rec { pname = "bunyan-rs"; - version = "0.1.7"; + version = "0.1.9"; src = fetchFromGitHub { owner = "LukeMathWalker"; repo = "bunyan"; rev = "v${version}"; - sha256 = "sha256-NGM8ryOy5bxF53Ak2/UDCf47MBlx/t6wcPlt+K8qvkg="; + sha256 = "sha256-dqhZIwxWBMXS2RgE8YynYrESVyAOIJ9ujAKcp2tDhvA="; }; - cargoSha256 = "sha256-kzzOEHil7mW+fsstgr4/N4i8c9rzx4TzqGfYDgkzjh0="; + cargoSha256 = "sha256-sQ6f8BHGsPFPchFDjNlZimnu9i99SGYf5bYfM1/2Gac="; meta = with lib; { description = "A CLI to pretty print logs in bunyan format (Rust port of the original JavaScript bunyan CLI)"; diff --git a/pkgs/development/tools/castxml/default.nix b/pkgs/development/tools/castxml/default.nix index f5f016f0d2de2..5e3801628e7ce 100644 --- a/pkgs/development/tools/castxml/default.nix +++ b/pkgs/development/tools/castxml/default.nix @@ -14,13 +14,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "castxml"; - version = "0.4.7"; + version = "0.4.8"; src = fetchFromGitHub { owner = "CastXML"; repo = "CastXML"; rev = "v${finalAttrs.version}"; - hash = "sha256-h2sLwhlz8AHyBK6Bbci17dvLkQ/9WEClz4lwM3GVVK8="; + hash = "sha256-9IdQWNbk28OdpxVU1t4d1sGvjc62GeWUueYGDKRfOy4="; }; nativeBuildInputs = [ diff --git a/pkgs/development/tools/go-swag/default.nix b/pkgs/development/tools/go-swag/default.nix index aed802868a418..49ffef19f779a 100644 --- a/pkgs/development/tools/go-swag/default.nix +++ b/pkgs/development/tools/go-swag/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "go-swag"; - version = "1.8.7"; + version = "1.8.8"; src = fetchFromGitHub { owner = "swaggo"; repo = "swag"; rev = "v${version}"; - sha256 = "sha256-HQ3VsYnPZGGZkeu8sc1sfKfRdOUWmdb98OQaIB62Yk4="; + sha256 = "sha256-xERuD15NEmBqosNAUmWEGqWVXc9jLA9HrbZrqmzhLFA="; }; vendorSha256 = "sha256-iu4rSgB7Gu5n1Sgu0jU9QwdwvuZ5rAqysvKuBnJd2jQ="; diff --git a/pkgs/development/tools/misc/blackfire/default.nix b/pkgs/development/tools/misc/blackfire/default.nix index bbf01b293c003..3dc581a06a360 100644 --- a/pkgs/development/tools/misc/blackfire/default.nix +++ b/pkgs/development/tools/misc/blackfire/default.nix @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { pname = "blackfire"; - version = "2.10.0"; + version = "2.13.1"; src = passthru.sources.${stdenv.hostPlatform.system} or (throw "Unsupported platform for blackfire: ${stdenv.hostPlatform.system}"); @@ -57,23 +57,23 @@ stdenv.mkDerivation rec { sources = { "x86_64-linux" = fetchurl { url = "https://packages.blackfire.io/debian/pool/any/main/b/blackfire/blackfire_${version}_amd64.deb"; - sha256 = "kyYmPU/y7pR2kx5ymDMuJvinTo5hpKs0Jy3LZPjDJyw="; + sha256 = "ErlIjReX6ui3rLeEpZ87HjagRp+RswpOcEk17FFd0Rk="; }; "i686-linux" = fetchurl { url = "https://packages.blackfire.io/debian/pool/any/main/b/blackfire/blackfire_${version}_i386.deb"; - sha256 = "swaZmlEoKSmH95pqAYW3ygOzQKkedWhc7FOMy3RnJFs="; + sha256 = "S/bV7AAsZhGrOZEeAY9E78nYcIykNMNzWobulUE06XE="; }; "aarch64-linux" = fetchurl { url = "https://packages.blackfire.io/debian/pool/any/main/b/blackfire/blackfire_${version}_arm64.deb"; - sha256 = "QjrLn+gxoJovMlLsIe24BNKVaFK3vgFk9BwRHSl/y3M="; + sha256 = "SDIaZ4k5y85cJKrQOEPehj/vhActl49UHNXSqpspaog="; }; "aarch64-darwin" = fetchurl { url = "https://packages.blackfire.io/blackfire/${version}/blackfire-darwin_arm64.pkg.tar.gz"; - sha256 = "pBzSswicNK8z/asmGhj+IhBSS0mPJSf91XBX75AGAtY="; + sha256 = "GAc3ikI8FVT9xFhrTWeX/pJVo147B0luPsS0QDYPv54="; }; "x86_64-darwin" = fetchurl { url = "https://packages.blackfire.io/blackfire/${version}/blackfire-darwin_amd64.pkg.tar.gz"; - sha256 = "ekeA/+N59mgDtkchEP1p4jz74goaPySmvZ6urCLcUNw="; + sha256 = "hy7u0lYI0qBdIDENFWea5aBeZWwwDITAl7WTlXjQuyM="; }; }; diff --git a/pkgs/development/tools/misc/cmake-language-server/default.nix b/pkgs/development/tools/misc/cmake-language-server/default.nix index 168c40911e685..892884e9339c8 100644 --- a/pkgs/development/tools/misc/cmake-language-server/default.nix +++ b/pkgs/development/tools/misc/cmake-language-server/default.nix @@ -1,7 +1,8 @@ { lib , buildPythonApplication , fetchFromGitHub -, poetry +, poetry-core +, pythonRelaxDepsHook , cmake-format , pygls , cmake @@ -26,8 +27,13 @@ buildPythonApplication rec { ./disable-test-timeouts.patch ]; + pythonRelaxDeps = [ + "pygls" + ]; + nativeBuildInputs = [ - poetry + poetry-core + pythonRelaxDepsHook ]; propagatedBuildInputs = [ diff --git a/pkgs/development/tools/pipenv/default.nix b/pkgs/development/tools/pipenv/default.nix index ae314347ff4fc..2d19f0fca3c37 100644 --- a/pkgs/development/tools/pipenv/default.nix +++ b/pkgs/development/tools/pipenv/default.nix @@ -23,11 +23,11 @@ let in buildPythonApplication rec { pname = "pipenv"; - version = "2022.11.11"; + version = "2022.11.25"; src = fetchPypi { inherit pname version; - sha256 = "sha256-5p9kR36DWV87iR4eWLGxNV1MWTQy5jsHjcG+m9k8UGY="; + sha256 = "sha256-ElnWxwU7EIbZqqvIGp/rc5vS0X6BuyAgSJoy7BQYYu4="; }; LC_ALL = "en_US.UTF-8"; diff --git a/pkgs/development/tools/rakkess/default.nix b/pkgs/development/tools/rakkess/default.nix index 1f85917bff5b6..a340a042cc2ba 100644 --- a/pkgs/development/tools/rakkess/default.nix +++ b/pkgs/development/tools/rakkess/default.nix @@ -2,15 +2,15 @@ buildGoModule rec { pname = "rakkess"; - version = "0.5.0"; + version = "0.5.1"; src = fetchFromGitHub { owner = "corneliusweig"; repo = pname; rev = "v${version}"; - sha256 = "sha256-qDcSIpIS09OU2tYoBGq7BCXFkf9QWj07RvNKMjghrFU="; + sha256 = "sha256-igovWWk8GfNmOS/NbZWfv9kox6QLNIbM09jdvA/lL3A="; }; - vendorSha256 = "sha256-1/8it/djhDjbWqe36VefnRu9XuwAa/qKpZT6d2LGpJ0="; + vendorSha256 = "sha256-lVxJ4wFBhHc8JVpkmqphLYPE9Z8Cr6o+aAHvC1naqyE="; ldflags = [ "-s" "-w" "-X github.com/corneliusweig/rakkess/internal/version.version=v${version}" ]; diff --git a/pkgs/development/tools/tabnine/sources.json b/pkgs/development/tools/tabnine/sources.json index e6587ea6bcb13..14ee825c72c07 100644 --- a/pkgs/development/tools/tabnine/sources.json +++ b/pkgs/development/tools/tabnine/sources.json @@ -1,17 +1,17 @@ { - "version": "4.4.169", + "version": "4.4.186", "platforms": { "x86_64-linux": { "name": "x86_64-unknown-linux-musl", - "hash": "sha256-gLhFSsOcMElm6a4oHM0yLL6ZGtSk+YvAsUTU/UgGwWg=" + "hash": "sha256-J/VzIxCxttKB4ggLLxyK596k0U1mh6jqaBrzTRxL32Q=" }, "aarch64-darwin": { "name": "aarch64-apple-darwin", - "hash": "sha256-nEUPSj1BFkZ1VyeA7X3Y0zt6eeD4AKAIcJ51QF24JVA=" + "hash": "sha256-quIINq0ocD5k/KyB/N3yBTqyW3GSljAuoaPp4JNYvMw=" }, "x86_64-darwin": { "name": "x86_64-apple-darwin", - "hash": "sha256-GePhGKPvvhYmOSN5NEaqcsFvyuSJi8eTfYTOtufmDiI=" + "hash": "sha256-lYmKgRi43MDyy7jZn8J/PFHgBE9UdjF1bqx2wrMJ4uU=" } } } diff --git a/pkgs/servers/http/gatling/default.nix b/pkgs/servers/http/gatling/default.nix index 00657757fce4d..1474232bd6243 100644 --- a/pkgs/servers/http/gatling/default.nix +++ b/pkgs/servers/http/gatling/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, libowfat, libcap, zlib, openssl }: +{ lib, stdenv, fetchurl, libowfat, libcap, zlib, openssl, libxcrypt }: let version = "0.16"; @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { sha256 = "0nrnws5qrl4frqcsfa9z973vv5mifgr9z170qbvg3mq1wa7475jz"; }; - buildInputs = [ libowfat libcap zlib openssl.dev ]; + buildInputs = [ libowfat libcap zlib openssl libxcrypt ]; configurePhase = '' substituteInPlace Makefile --replace "/usr/local" "$out" @@ -28,6 +28,5 @@ stdenv.mkDerivation rec { homepage = "http://www.fefe.de/gatling/"; license = lib.licenses.gpl2; platforms = platforms.linux; - broken = true; # 2022-11-16 }; } diff --git a/pkgs/servers/komga/default.nix b/pkgs/servers/komga/default.nix index 77ed5932180ed..4e2439a396df4 100644 --- a/pkgs/servers/komga/default.nix +++ b/pkgs/servers/komga/default.nix @@ -8,11 +8,11 @@ stdenvNoCC.mkDerivation rec { pname = "komga"; - version = "0.157.4"; + version = "0.157.5"; src = fetchurl { url = "https://github.com/gotson/${pname}/releases/download/v${version}/${pname}-${version}.jar"; - sha256 = "sha256-mszVdDnluR+na1DDEyNNqTyRS/8pUZ+et0M7KkXqNiE="; + sha256 = "sha256-cgS8QxxNdE7KMlgb4EJtqpsRUBUFCH+F7Wh0Dh4Gg5Q="; }; nativeBuildInputs = [ diff --git a/pkgs/servers/monitoring/prometheus/pushgateway.nix b/pkgs/servers/monitoring/prometheus/pushgateway.nix index 1bdd7854205a5..feda083c85de9 100644 --- a/pkgs/servers/monitoring/prometheus/pushgateway.nix +++ b/pkgs/servers/monitoring/prometheus/pushgateway.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "pushgateway"; - version = "1.4.3"; + version = "1.5.1"; src = fetchFromGitHub { owner = "prometheus"; repo = "pushgateway"; rev = "v${version}"; - sha256 = "sha256-fSp173/ubeXw44IHVnuyYAYnTCrHcsq7GRwPlH05kJY="; + sha256 = "sha256-UnkSv0ZGNFqEQX+QeCySN5XeGbM2hCJGgWxry5I+3tg="; }; - vendorSha256 = "sha256-abl2L8+QY2khLnsjXWWnzs9ewbFWctiJgHE29BRR2gU="; + vendorSha256 = "sha256-wEKk7Jrf14oJzP6MSRJidOUUgAbPFoBOmqPrXJg86FI="; ldflags = [ "-s" diff --git a/pkgs/servers/monitoring/prometheus/wireguard-exporter.nix b/pkgs/servers/monitoring/prometheus/wireguard-exporter.nix index cfa2d1d43a15f..14920ea035fff 100644 --- a/pkgs/servers/monitoring/prometheus/wireguard-exporter.nix +++ b/pkgs/servers/monitoring/prometheus/wireguard-exporter.nix @@ -2,16 +2,16 @@ rustPlatform.buildRustPackage rec { pname = "wireguard-exporter"; - version = "3.6.3"; + version = "3.6.6"; src = fetchFromGitHub { owner = "MindFlavor"; repo = "prometheus_wireguard_exporter"; rev = version; - sha256 = "sha256-m29/whlmhIkLin84NOWs2NVZcXNpVsyyHZ1CLp4FXd0="; + sha256 = "sha256-2e31ZuGJvpvu7L2Lb+n6bZWpC1JhETzEzSiNaxxsAtA="; }; - cargoSha256 = "sha256-XK4hjBIcOx6JMv61gOpIXaZy7Unw+Bk84TEb+8Fib6Q="; + cargoSha256 = "sha256-NsxGpjuZPpz4gCJRp5IOcfRFh8DTud47nV2bE0/kc2Q="; buildInputs = lib.optionals stdenv.isDarwin [ libiconv Security ]; diff --git a/pkgs/servers/samba/4.x.nix b/pkgs/servers/samba/4.x.nix index f5276e104faac..1c170e6f9cdf0 100644 --- a/pkgs/servers/samba/4.x.nix +++ b/pkgs/servers/samba/4.x.nix @@ -30,6 +30,7 @@ , bash , python3Packages , nixosTests +, libiconv , enableLDAP ? false, openldap , enablePrinting ? false, cups @@ -103,6 +104,7 @@ stdenv.mkDerivation rec { tdb libxcrypt ] ++ optionals stdenv.isLinux [ liburing systemd ] + ++ optionals stdenv.isDarwin [ libiconv ] ++ optionals enableLDAP [ openldap.dev python3Packages.markdown ] ++ optional (enablePrinting && stdenv.isLinux) cups ++ optional enableMDNS avahi @@ -208,6 +210,8 @@ stdenv.mkDerivation rec { license = licenses.gpl3; platforms = platforms.unix; # N.B. enableGlusterFS does not build + # TODO: darwin support needs newer SDK for "_futimens" and "_utimensat" + # see https://github.com/NixOS/nixpkgs/issues/101229 broken = stdenv.isDarwin || enableGlusterFS; maintainers = with maintainers; [ aneeshusa ]; }; diff --git a/pkgs/servers/soft-serve/default.nix b/pkgs/servers/soft-serve/default.nix index 9e0a9a96425eb..d29453556be25 100644 --- a/pkgs/servers/soft-serve/default.nix +++ b/pkgs/servers/soft-serve/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "soft-serve"; - version = "0.4.1"; + version = "0.4.4"; src = fetchFromGitHub { owner = "charmbracelet"; repo = "soft-serve"; rev = "v${version}"; - sha256 = "sha256-xlfAmAU9u4pI3q8EZm4c7BF/lPAHMjLYa/57VWq067M="; + sha256 = "sha256-MziobrOqEUsg/XhzLChNker3OU9YAH0LmQ+i+UYoPkE="; }; - vendorSha256 = "sha256-XSAMKR5WPG/6ix5T0e9jtHJXQ6HNkh7li+BDFyIhATQ="; + vendorSha256 = "sha256-YmAPZtGq2wWqrmTwFOPvSZ3pXa3hUFd+TQfU+Nzhlvs="; doCheck = false; diff --git a/pkgs/servers/ursadb/default.nix b/pkgs/servers/ursadb/default.nix index c9b39eccd8a81..ab5dfe5e99f66 100644 --- a/pkgs/servers/ursadb/default.nix +++ b/pkgs/servers/ursadb/default.nix @@ -1,40 +1,31 @@ -{ lib, stdenv, fetchFromGitHub, cmake, zeromq, cppzmq }: +{ lib, stdenv, fetchFromGitHub, cmake }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "ursadb"; - version = "1.2.0"; + version = "1.5.0"; src = fetchFromGitHub { owner = "CERT-Polska"; repo = "ursadb"; - rev = "v${version}"; - hash = "sha256-/EK1CKJ0IR7fkKSpQkONbWcz6uhUoAwK430ljNYsV5U="; + rev = "v${finalAttrs.version}"; + hash = "sha256-JssL1Yd+2CPy9fDPJnstiRucdy6TyUdb0Q6xa160CLM="; + fetchSubmodules = true; }; postPatch = '' substituteInPlace CMakeLists.txt \ - --replace \ - "add_executable(ursadb_test Tests.cpp)" "" \ - --replace \ - "target_link_libraries(ursadb_test ursa)" "" - ''; - - installPhase = '' - mkdir -p $out/bin - cp ursadb $out/bin/ - cp ursadb_new $out/bin/ - cp ursadb_trim $out/bin/ + --replace "add_executable(ursadb_test src/Tests.cpp)" "" \ + --replace "target_link_libraries(ursadb_test ursa)" "" \ + --replace "target_enable_ipo(ursadb_test)" "" \ + --replace "target_clangformat_setup(ursadb_test)" "" \ + --replace 'target_include_directories(ursadb_test PUBLIC ${"$"}{CMAKE_SOURCE_DIR})' "" \ + --replace "ursadb_test" "" ''; nativeBuildInputs = [ cmake ]; - buildInputs = [ - zeromq - cppzmq - ]; - meta = with lib; { homepage = "https://github.com/CERT-Polska/ursadb"; description = "Trigram database written in C++, suited for malware indexing"; @@ -43,4 +34,4 @@ stdenv.mkDerivation rec { platforms = platforms.unix; broken = stdenv.isDarwin; }; -} +}) diff --git a/pkgs/tools/admin/kics/default.nix b/pkgs/tools/admin/kics/default.nix index 6cd66011bb9e2..81cd4dc882838 100644 --- a/pkgs/tools/admin/kics/default.nix +++ b/pkgs/tools/admin/kics/default.nix @@ -8,16 +8,16 @@ buildGoModule rec { pname = "kics"; - version = "1.6.4"; + version = "1.6.5"; src = fetchFromGitHub { owner = "Checkmarx"; repo = "kics"; rev = "v${version}"; - sha256 = "sha256-QWu34BmmqqP4j3lU/25xnNdVRMKIPU4p6Ydh2jNiwEU="; + sha256 = "sha256-Y/fG10WKdSXNU9pLSItPKmTNfx8hL/YO8wtwTHob1QQ="; }; - vendorSha256 = "sha256-gOjlzo/28DC7dq/V88Sc5b88qX/WoBxyAS3P2n9jp6I="; + vendorSha256 = "sha256-sIIEWIVb1d4GDZVLfXz1myeQcxaG6aF8gYJn9+C8zQk="; subPackages = [ "cmd/console" ]; diff --git a/pkgs/tools/admin/lego/default.nix b/pkgs/tools/admin/lego/default.nix index 609c085edbd36..9d7c35a73bea8 100644 --- a/pkgs/tools/admin/lego/default.nix +++ b/pkgs/tools/admin/lego/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "lego"; - version = "4.9.0"; + version = "4.9.1"; src = fetchFromGitHub { owner = "go-acme"; repo = pname; rev = "v${version}"; - sha256 = "sha256-lMPyquQ+CeMe/V+hG4h61+GiuCXqjVAcTV9Fo3DNb6E="; + sha256 = "sha256-YaJT+gTnw9A2joL8D3P7fs/NTyHpH4gDhg6STv19SZU="; }; vendorSha256 = "sha256-gHwyXzmws99tPRJKR/boc0Hf+b5h9ZkzH2aiN8u6Z0I="; diff --git a/pkgs/tools/admin/syft/default.nix b/pkgs/tools/admin/syft/default.nix index 8e198d1eceff1..855061ef3e2d7 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.62.1"; + version = "0.62.2"; src = fetchFromGitHub { owner = "anchore"; repo = pname; rev = "v${version}"; - sha256 = "sha256-mzDowDWnIxQCbCxqPun6oCqMeke4KE+kaVDH/V5TFC4="; + sha256 = "sha256-n3ZkSsyaNreIohCrGYQUnRAnher1VqbV8vQKA20bnPs="; # 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; diff --git a/pkgs/tools/games/pokefinder/cstddef.patch b/pkgs/tools/games/pokefinder/cstddef.patch new file mode 100644 index 0000000000000..c74340b0d6dfa --- /dev/null +++ b/pkgs/tools/games/pokefinder/cstddef.patch @@ -0,0 +1,12 @@ +diff --git a/Source/Core/Util/EncounterSlot.cpp b/Source/Core/Util/EncounterSlot.cpp +index adddbdab..71c98e83 100644 +--- a/Source/Core/Util/EncounterSlot.cpp ++++ b/Source/Core/Util/EncounterSlot.cpp +@@ -20,6 +20,7 @@ + #include "EncounterSlot.hpp" + #include <Core/Enum/Encounter.hpp> + #include <array> ++#include <cstddef> + + namespace + { diff --git a/pkgs/tools/games/pokefinder/default.nix b/pkgs/tools/games/pokefinder/default.nix new file mode 100644 index 0000000000000..547b0c47bc26b --- /dev/null +++ b/pkgs/tools/games/pokefinder/default.nix @@ -0,0 +1,46 @@ +{ lib +, stdenv +, fetchFromGitHub +, cmake +, qtbase +, qttools +, wrapQtAppsHook +, gitUpdater +}: + +stdenv.mkDerivation rec { + pname = "pokefinder"; + version = "4.0.1"; + + src = fetchFromGitHub { + owner = "Admiral-Fish"; + repo = "PokeFinder"; + rev = "v${version}"; + sha256 = "j7xgjNF8NWLFVPNItWcFM5WL8yPxgHxVX00x7lt45WI="; + fetchSubmodules = true; + }; + + patches = [ ./cstddef.patch ]; + + postPatch = '' + patchShebangs Source/Core/Resources/ + ''; + + installPhase = '' + install -D Source/Forms/PokeFinder $out/bin/PokeFinder + ''; + + nativeBuildInputs = [ cmake wrapQtAppsHook ]; + + buildInputs = [ qtbase qttools ]; + + passthru.updateScript = gitUpdater { }; + + meta = with lib; { + homepage = "https://github.com/Admiral-Fish/PokeFinder"; + description = "Cross platform Pokémon RNG tool"; + license = licenses.gpl3Only; + platforms = platforms.all; + maintainers = with maintainers; [ leo60228 ]; + }; +} diff --git a/pkgs/tools/misc/opentelemetry-collector/default.nix b/pkgs/tools/misc/opentelemetry-collector/default.nix index 6db9e4c91e3f1..028ee081f4601 100644 --- a/pkgs/tools/misc/opentelemetry-collector/default.nix +++ b/pkgs/tools/misc/opentelemetry-collector/default.nix @@ -12,17 +12,17 @@ let in buildGoModule rec { pname = "opentelemetry-collector"; - version = "0.64.1"; + version = "0.66.0"; src = fetchFromGitHub { owner = "open-telemetry"; repo = "opentelemetry-collector"; rev = "v${version}"; - sha256 = "sha256-qYQWPhvWVNUqsQLTLUd4SOfW0YiXPyGBrtX8AY15FNg="; + sha256 = "sha256-EvDdZTMq2Z8nFlQCiIuF+9SSnj4Lfsa03a7luzc9ynU="; }; # there is a nested go.mod sourceRoot = "source/cmd/otelcorecol"; - vendorSha256 = "sha256-uq5o/wtmgGMthUqK86x+uKV7jFAd9koKucnBCKGUJMo="; + vendorSha256 = "sha256-D2/7Ubt1Zpb60CNRRQiMbxJXGF2CWmdeBc/XRxFzIjs="; preBuild = '' # set the build version, can't be done via ldflags diff --git a/pkgs/tools/misc/xstow/default.nix b/pkgs/tools/misc/xstow/default.nix index 079f4e67579d0..c46bef50caf25 100644 --- a/pkgs/tools/misc/xstow/default.nix +++ b/pkgs/tools/misc/xstow/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, fetchurl, ncurses }: +{ stdenv, lib, fetchurl, ncurses, autoreconfHook }: stdenv.mkDerivation rec { pname = "xstow"; version = "1.1.0"; @@ -8,6 +8,16 @@ stdenv.mkDerivation rec { sha256 = "sha256-wXQ5XSmogAt1torfarrqIU4nBYj69MGM/HBYqeIE+dw="; }; + nativeBuildInputs = [ autoreconfHook ]; + + # Upstream seems to try to support building both static and dynamic version + # of executable on dynamic systems, but fails with link error when attempting + # to cross-build "xstow-static" to the system where "xstow" proper is static. + postPatch = lib.optionalString stdenv.hostPlatform.isStatic '' + substituteInPlace src/Makefile.am --replace xstow-static "" + substituteInPlace src/Makefile.am --replace xstow-stow "" + ''; + buildInputs = [ ncurses ]; diff --git a/pkgs/tools/misc/zabbix-cli/default.nix b/pkgs/tools/misc/zabbix-cli/default.nix index d77be7326d0ba..aede201ee91a4 100644 --- a/pkgs/tools/misc/zabbix-cli/default.nix +++ b/pkgs/tools/misc/zabbix-cli/default.nix @@ -5,14 +5,14 @@ python3.pkgs.buildPythonApplication rec { pname = "zabbix-cli"; - version = "2.3.0"; + version = "2.3.1"; format = "setuptools"; src = fetchFromGitHub { owner = "usit-gd"; repo = "zabbix-cli"; - rev = version; - sha256 = "sha256-t8iVsdoJEHXtq9KK0WUGUX65zekKv8yzNoe8XgeeHd0="; + rev = "refs/tags/${version}"; + sha256 = "sha256-i4dviSdrHNAn4mSWMn5DOBg4j8BXCfwKVYsDaBd/g6o="; }; propagatedBuildInputs = with python3.pkgs; [ diff --git a/pkgs/tools/networking/hysteria/default.nix b/pkgs/tools/networking/hysteria/default.nix index 13792bc7ef71e..0b17203ad9769 100644 --- a/pkgs/tools/networking/hysteria/default.nix +++ b/pkgs/tools/networking/hysteria/default.nix @@ -4,16 +4,16 @@ }: buildGoModule rec { pname = "hysteria"; - version = "1.3.0"; + version = "1.3.1"; src = fetchFromGitHub { owner = "HyNetwork"; repo = pname; rev = "v${version}"; - sha256 = "sha256-WQpObXUZBVzRzFSiNNea0tRX0s0+a8qn4NacEaUBwaA="; + sha256 = "sha256-va/2eCi7wu8YMKf/I0ZiDFAY/shaHA/boF1PCYFolwM="; }; - vendorSha256 = "sha256-ww7JtTfyN0/ziQ2jLXRgMhnpx0vFozdSTKe7I129Hvg="; + vendorSha256 = "sha256-a24NyJDatyM+j29vyY5zbPRhRTOGfa2c1FkZdKpDvxk="; proxyVendor = true; ldflags = [ diff --git a/pkgs/tools/networking/oapi-codegen/default.nix b/pkgs/tools/networking/oapi-codegen/default.nix index 655edb99b5511..554ee52ed4cae 100644 --- a/pkgs/tools/networking/oapi-codegen/default.nix +++ b/pkgs/tools/networking/oapi-codegen/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "oapi-codegen"; - version = "1.12.2"; + version = "1.12.3"; src = fetchFromGitHub { owner = "deepmap"; repo = pname; rev = "v${version}"; - sha256 = "sha256-ZgYUCfqvKvXsgRziW0A7i4Cvntd4U2q9kKXHwBtAA9k="; + sha256 = "sha256-VjHZjClOiwz6XwbLJFSl6wEkhA5hOo3RNfNte37ZfBc="; }; vendorSha256 = "sha256-XFXe02WTtkzIzpcVN1Vwi+7rTKWlrMWCOV/rrDBRliY="; diff --git a/pkgs/tools/networking/ripe-atlas-tools/default.nix b/pkgs/tools/networking/ripe-atlas-tools/default.nix index 0c415c65b8ea3..05f3ef22bd8c1 100644 --- a/pkgs/tools/networking/ripe-atlas-tools/default.nix +++ b/pkgs/tools/networking/ripe-atlas-tools/default.nix @@ -6,13 +6,13 @@ python3.pkgs.buildPythonApplication rec { pname = "ripe-atlas-tools"; - version = "3.0.2"; + version = "3.0.3"; src = fetchFromGitHub { owner = "RIPE-NCC"; repo = "ripe-atlas-tools"; - rev = "v${version}"; - sha256 = "sha256-5AMqBXxJZOtI0/2NrEjrUfNXWKc7sn6kZX26766LBUM="; + rev = "refs/tags/v${version}"; + sha256 = "sha256-tNojduSNjJc8yOkDbuFLKoASqIV4P3mGuNbiIcf6Nac="; }; postPatch = '' diff --git a/pkgs/tools/package-management/licensee/Gemfile.lock b/pkgs/tools/package-management/licensee/Gemfile.lock index e631b63963c38..438ba3e8c6f3d 100644 --- a/pkgs/tools/package-management/licensee/Gemfile.lock +++ b/pkgs/tools/package-management/licensee/Gemfile.lock @@ -1,38 +1,36 @@ GEM remote: https://rubygems.org/ specs: - addressable (2.7.0) - public_suffix (>= 2.0.2, < 5.0) - dotenv (2.7.6) - faraday (1.3.0) - faraday-net_http (~> 1.0) - multipart-post (>= 1.2, < 3) - ruby2_keywords - faraday-net_http (1.0.1) - licensee (9.15.1) + addressable (2.8.1) + public_suffix (>= 2.0.2, < 6.0) + dotenv (2.8.1) + faraday (2.7.1) + faraday-net_http (>= 2.0, < 3.1) + ruby2_keywords (>= 0.0.4) + faraday-net_http (3.0.2) + licensee (9.15.3) dotenv (~> 2.0) - octokit (~> 4.20) - reverse_markdown (~> 1.0) + octokit (>= 4.20, < 7.0) + reverse_markdown (>= 1, < 3) rugged (>= 0.24, < 2.0) thor (>= 0.19, < 2.0) - mini_portile2 (2.5.0) - multipart-post (2.1.1) - nokogiri (1.11.1) - mini_portile2 (~> 2.5.0) + mini_portile2 (2.8.0) + nokogiri (1.13.9) + mini_portile2 (~> 2.8.0) racc (~> 1.4) - octokit (4.20.0) - faraday (>= 0.9) - sawyer (~> 0.8.0, >= 0.5.3) - public_suffix (4.0.6) - racc (1.5.2) - reverse_markdown (1.4.0) + octokit (6.0.1) + faraday (>= 1, < 3) + sawyer (~> 0.9) + public_suffix (5.0.0) + racc (1.6.0) + reverse_markdown (2.1.1) nokogiri - ruby2_keywords (0.0.4) - rugged (1.1.0) - sawyer (0.8.2) + ruby2_keywords (0.0.5) + rugged (1.5.0.1) + sawyer (0.9.2) addressable (>= 2.3.5) - faraday (> 0.8, < 2.0) - thor (1.1.0) + faraday (>= 0.17.3, < 3) + thor (1.2.1) PLATFORMS ruby @@ -41,4 +39,4 @@ DEPENDENCIES licensee BUNDLED WITH - 2.1.4 + 2.3.25 diff --git a/pkgs/tools/package-management/licensee/gemset.nix b/pkgs/tools/package-management/licensee/gemset.nix index b9b11b465f69c..656f67f3a270e 100644 --- a/pkgs/tools/package-management/licensee/gemset.nix +++ b/pkgs/tools/package-management/licensee/gemset.nix @@ -5,41 +5,41 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1fvchp2rhp2rmigx7qglf69xvjqvzq7x0g49naliw29r2bz656sy"; + sha256 = "1ypdmpdn20hxp5vwxz3zc04r5xcwqc25qszdlg41h8ghdqbllwmw"; type = "gem"; }; - version = "2.7.0"; + version = "2.8.1"; }; dotenv = { groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0iym172c5337sm1x2ykc2i3f961vj3wdclbyg1x6sxs3irgfsl94"; + sha256 = "1n0pi8x8ql5h1mijvm8lgn6bhq4xjb5a500p5r1krq4s6j9lg565"; type = "gem"; }; - version = "2.7.6"; + version = "2.8.1"; }; faraday = { - dependencies = ["faraday-net_http" "multipart-post" "ruby2_keywords"]; + dependencies = ["faraday-net_http" "ruby2_keywords"]; groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1hmssd8pj4n7yq4kz834ylkla8ryyvhaap6q9nzymp93m1xq21kz"; + sha256 = "1wyz9ab0mzi84gpf81fs19vrixglmmxi25k6n1mn9h141qmsp590"; type = "gem"; }; - version = "1.3.0"; + version = "2.7.1"; }; faraday-net_http = { groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1fi8sda5hc54v1w3mqfl5yz09nhx35kglyx72w7b8xxvdr0cwi9j"; + sha256 = "13byv3mp1gsjyv8k0ih4612y6vw5kqva6i03wcg4w2fqpsd950k8"; type = "gem"; }; - version = "1.0.1"; + version = "3.0.2"; }; licensee = { dependencies = ["dotenv" "octokit" "reverse_markdown" "rugged" "thor"]; @@ -47,30 +47,20 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1pvrz9fjvxzk3aq85zgh8dkw98kz54jmwi10k3shc8dqbrlvragy"; + sha256 = "0n0l1c8kxhpdg6pgv1wgwpdfc7gqkygpd8h41shwc95rapdha9gg"; type = "gem"; }; - version = "9.15.1"; + version = "9.15.3"; }; mini_portile2 = { groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1hdbpmamx8js53yk3h8cqy12kgv6ca06k0c9n3pxh6b6cjfs19x7"; + sha256 = "0rapl1sfmfi3bfr68da4ca16yhc0pp93vjwkj7y3rdqrzy3b41hy"; type = "gem"; }; - version = "2.5.0"; - }; - multipart-post = { - groups = ["default"]; - platforms = []; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "1zgw9zlwh2a6i1yvhhc4a84ry1hv824d6g2iw2chs3k5aylpmpfj"; - type = "gem"; - }; - version = "2.1.1"; + version = "2.8.0"; }; nokogiri = { dependencies = ["mini_portile2" "racc"]; @@ -78,10 +68,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1ajwkqr28hwqbyl1l3czx4a34c88acxywyqp8cjyy0zgsd6sbhj2"; + sha256 = "0cam1455nmi3fzzpa9ixn2hsim10fbprmj62ajpd6d02mwdprwwn"; type = "gem"; }; - version = "1.11.1"; + version = "1.13.9"; }; octokit = { dependencies = ["faraday" "sawyer"]; @@ -89,30 +79,30 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1fl517ld5vj0llyshp3f9kb7xyl9iqy28cbz3k999fkbwcxzhlyq"; + sha256 = "0a5iy1v1n8f5ggp6q601mn8dz1n08ffs4gv0zsh5ca68j8dfmpx5"; type = "gem"; }; - version = "4.20.0"; + version = "6.0.1"; }; public_suffix = { groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1xqcgkl7bwws1qrlnmxgh8g4g9m10vg60bhlw40fplninb3ng6d9"; + sha256 = "0sqw1zls6227bgq38sxb2hs8nkdz4hn1zivs27mjbniswfy4zvi6"; type = "gem"; }; - version = "4.0.6"; + version = "5.0.0"; }; racc = { groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "178k7r0xn689spviqzhvazzvxfq6fyjldxb3ywjbgipbfi4s8j1g"; + sha256 = "0la56m0z26j3mfn1a9lf2l03qx1xifanndf9p3vx1azf6sqy7v9d"; type = "gem"; }; - version = "1.5.2"; + version = "1.6.0"; }; reverse_markdown = { dependencies = ["nokogiri"]; @@ -120,30 +110,30 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0w786j869fjhjf72waj0hc9i4ghi45b78a2am27kij4sa2hmsc53"; + sha256 = "0087vhw5ik50lxvddicns01clkx800fk5v5qnrvi3b42nrk6885j"; type = "gem"; }; - version = "1.4.0"; + version = "2.1.1"; }; ruby2_keywords = { groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "15wfcqxyfgka05v2a7kpg64x57gl1y4xzvnc9lh60bqx5sf1iqrs"; + sha256 = "1vz322p8n39hz3b4a9gkmz9y7a5jaz41zrm2ywf31dvkqm03glgz"; type = "gem"; }; - version = "0.0.4"; + version = "0.0.5"; }; rugged = { groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "04aq913plcxjw71l5r62qgz3bx3466p0wvgyfqahg5n3nybmcwqy"; + sha256 = "02h1cv73znwfgy61mqmfylcfvwyyp3lddiz3njgivfx234mpz50x"; type = "gem"; }; - version = "1.1.0"; + version = "1.5.0.1"; }; sawyer = { dependencies = ["addressable" "faraday"]; @@ -151,19 +141,19 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0yrdchs3psh583rjapkv33mljdivggqn99wkydkjdckcjn43j3cz"; + sha256 = "1jks1qjbmqm8f9kvwa81vqj39avaj9wdnzc531xm29a55bb74fps"; type = "gem"; }; - version = "0.8.2"; + version = "0.9.2"; }; thor = { groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "18yhlvmfya23cs3pvhr1qy38y41b6mhr5q9vwv5lrgk16wmf3jna"; + sha256 = "0inl77jh4ia03jw3iqm5ipr76ghal3hyjrd6r8zqsswwvi9j2xdi"; type = "gem"; }; - version = "1.1.0"; + version = "1.2.1"; }; } diff --git a/pkgs/tools/package-management/poetry2conda/default.nix b/pkgs/tools/package-management/poetry2conda/default.nix index 1e570156f8c96..f69f28203196e 100644 --- a/pkgs/tools/package-management/poetry2conda/default.nix +++ b/pkgs/tools/package-management/poetry2conda/default.nix @@ -1,5 +1,6 @@ { lib , fetchFromGitHub +, fetchpatch , python3 }: @@ -16,7 +17,15 @@ with python3.pkgs; buildPythonApplication rec { sha256 = "sha256-UqNoEGgStvqtxhYwExk7wO4SvATaM2kGaFbB5ViJa7U="; }; - nativeBuildInputs = [ poetry ]; + patches = [ + (fetchpatch { + name = "use-poetry-core.patch"; + url = "https://github.com/dojeda/poetry2conda/commit/b127090498c89fbd8bbcbac45d03178a1e1c4219.patch"; + hash = "sha256-J26NhVPG1vD/QNXi5irtGW05CYsIYvZNQIi8YvHwCLc="; + }) + ]; + + nativeBuildInputs = [ poetry-core ]; propagatedBuildInputs = [ poetry-semver diff --git a/pkgs/tools/security/threatest/default.nix b/pkgs/tools/security/threatest/default.nix index 8af45fd580def..c11bf87357613 100644 --- a/pkgs/tools/security/threatest/default.nix +++ b/pkgs/tools/security/threatest/default.nix @@ -5,13 +5,13 @@ buildGoModule rec { pname = "threatest"; - version = "1.1.0"; + version = "1.1.1"; src = fetchFromGitHub { owner = "DataDog"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-ehyE19VGSLykJUOXoYMFr2Y82Bwpj2ZK5//VJybVAtk="; + hash = "sha256-9/TIiBp3w7NaECX929Tai5nqHKxb7YxYEr2hAl2ttsM="; }; vendorHash = "sha256-vTzgxByZ2BC7nuq/+LJV7LR0KsUxh1EbHFe81PwqCJc="; diff --git a/pkgs/tools/text/mdbook-katex/default.nix b/pkgs/tools/text/mdbook-katex/default.nix index 5291b9e9f821f..6d80babb2f956 100644 --- a/pkgs/tools/text/mdbook-katex/default.nix +++ b/pkgs/tools/text/mdbook-katex/default.nix @@ -1,22 +1,18 @@ -{ lib, stdenv, fetchFromGitHub, rustPlatform, CoreServices }: +{ lib, stdenv, fetchCrate, rustPlatform, openssl, CoreServices }: rustPlatform.buildRustPackage rec { pname = "mdbook-katex"; - version = "0.2.10"; + version = "0.2.17"; - src = fetchFromGitHub { - owner = "lzanini"; - repo = pname; - rev = "v${version}"; - hash = "sha256-5PzXX7icRxcHpzjp3x/9ssn2o0444uHrzBn1Ds1DEPM="; + src = fetchCrate { + inherit pname version; + sha256 = "sha256-rJzZVZn8CJOIcSVLCLv6tWox0MRdxNBMUKo1fij1ogc="; }; - cargoPatches = [ - # Remove when https://github.com/lzanini/mdbook-katex/pull/35 is in a new release. - ./update-mdbook-for-rust-1.64.patch - ]; + cargoHash = "sha256-aSFXTeP5wDshdrrJ+eJCTmLuTlxCuM+5irUr0iW4tAY="; - cargoHash = "sha256-lrEirKkGf9/8yLyLSON54UaeQ3Xtl7g7ezUc7e1KVHw="; + OPENSSL_DIR = "${lib.getDev openssl}"; + OPENSSL_LIB_DIR = "${lib.getLib openssl}/lib"; buildInputs = lib.optionals stdenv.isDarwin [ CoreServices ]; diff --git a/pkgs/tools/text/mdbook-katex/update-mdbook-for-rust-1.64.patch b/pkgs/tools/text/mdbook-katex/update-mdbook-for-rust-1.64.patch deleted file mode 100644 index ee90a3076702a..0000000000000 --- a/pkgs/tools/text/mdbook-katex/update-mdbook-for-rust-1.64.patch +++ /dev/null @@ -1,1417 +0,0 @@ -diff --git a/Cargo.lock b/Cargo.lock -index 3ff0894..ffef44f 100644 ---- a/Cargo.lock -+++ b/Cargo.lock -@@ -1,10 +1,12 @@ - # This file is automatically @generated by Cargo. - # It is not intended for manual editing. -+version = 3 -+ - [[package]] - name = "aho-corasick" --version = "0.7.15" -+version = "0.7.19" - source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "7404febffaa47dac81aa44dba71523c9d069b1bdc50a77db41195149e17f68e5" -+checksum = "b4f55bd91a0978cbfd91c457a164bab8b4001c833b7f323132c0a4e1922dd44e" - dependencies = [ - "memchr", - ] -@@ -52,9 +54,9 @@ dependencies = [ - - [[package]] - name = "autocfg" --version = "1.0.1" -+version = "1.1.0" - source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "cdb031dd78e28731d87d56cc8ffef4a8f36ca26c38fe2de700543e627f8a464a" -+checksum = "d468802bab17cbc0cc575e9b053f41e72aa36bfa6b7f55e3529ffa43161b97fa" - - [[package]] - name = "base64" -@@ -62,11 +64,17 @@ version = "0.12.3" - source = "registry+https://github.com/rust-lang/crates.io-index" - checksum = "3441f0f7b02788e948e47f457ca01f1d7e6d92c693bc132c22b087d3141c03ff" - -+[[package]] -+name = "base64" -+version = "0.13.0" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "904dfeac50f3cdaba28fc6f57fdcddb75f49ed61346676a78c4ffe55877802fd" -+ - [[package]] - name = "bitflags" --version = "1.2.1" -+version = "1.3.2" - source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "cf1de2fe8c75bc145a2f577add951f8134889b4795d47466a54a5c846d691693" -+checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a" - - [[package]] - name = "block-buffer" -@@ -82,9 +90,9 @@ dependencies = [ - - [[package]] - name = "block-buffer" --version = "0.9.0" -+version = "0.10.3" - source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "4152116fd6e9dadb291ae18fc1ec3575ed6d84c29642d97890f4b4a3417297e4" -+checksum = "69cce20737498f97b993470a6e536b8523f0af7892a4f928cceb1ac5e52ebe7e" - dependencies = [ - "generic-array 0.14.4", - ] -@@ -98,6 +106,17 @@ dependencies = [ - "byte-tools", - ] - -+[[package]] -+name = "bstr" -+version = "0.2.17" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "ba3569f383e8f1598449f1a423e72e99569137b47740b1da11ef19af3d5c3223" -+dependencies = [ -+ "lazy_static", -+ "memchr", -+ "regex-automata", -+] -+ - [[package]] - name = "byte-tools" - version = "0.3.1" -@@ -116,6 +135,12 @@ version = "0.5.6" - source = "registry+https://github.com/rust-lang/crates.io-index" - checksum = "0e4cec68f03f32e44924783795810fa50a7035d8c8ebe78580ad7e6c703fba38" - -+[[package]] -+name = "bytes" -+version = "1.2.1" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "ec8a7b6a70fde80372154c65702f00a0f56f3e1c36abbc6c440484be248856db" -+ - [[package]] - name = "cc" - version = "1.0.62" -@@ -157,11 +182,45 @@ dependencies = [ - "atty", - "bitflags", - "strsim 0.8.0", -- "textwrap", -+ "textwrap 0.11.0", - "unicode-width", - "vec_map", - ] - -+[[package]] -+name = "clap" -+version = "3.2.22" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "86447ad904c7fb335a790c9d7fe3d0d971dc523b8ccd1561a520de9a85302750" -+dependencies = [ -+ "atty", -+ "bitflags", -+ "clap_lex", -+ "indexmap", -+ "once_cell", -+ "strsim 0.10.0", -+ "termcolor", -+ "textwrap 0.15.1", -+] -+ -+[[package]] -+name = "clap_complete" -+version = "3.2.5" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "3f7a2e0a962c45ce25afce14220bc24f9dade0a1787f185cecf96bfba7847cd8" -+dependencies = [ -+ "clap 3.2.22", -+] -+ -+[[package]] -+name = "clap_lex" -+version = "0.2.4" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "2850f2f5a82cbf437dd5af4d49848fbdfc27c157c3d010345776f952765261c5" -+dependencies = [ -+ "os_str_bytes", -+] -+ - [[package]] - name = "copy_dir" - version = "0.1.2" -@@ -172,10 +231,23 @@ dependencies = [ - ] - - [[package]] --name = "cpuid-bool" --version = "0.1.2" -+name = "cpufeatures" -+version = "0.2.5" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "28d997bd5e24a5928dd43e46dc529867e207907fe0b239c3477d924f7f2ca320" -+dependencies = [ -+ "libc", -+] -+ -+[[package]] -+name = "crypto-common" -+version = "0.1.6" - source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "8aebca1129a03dc6dc2b127edd729435bbc4a37e1d5f4d7513165089ceb02634" -+checksum = "1bfb12502f3fc46cca1bb51ac28df9d618d813cdc3d2f25b9fe775a34af26bb3" -+dependencies = [ -+ "generic-array 0.14.4", -+ "typenum", -+] - - [[package]] - name = "darling" -@@ -248,39 +320,31 @@ dependencies = [ - - [[package]] - name = "digest" --version = "0.9.0" -+version = "0.10.5" - source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "d3dd60d1080a57a05ab032377049e0591415d2b31afd7028356dbf3cc6dcb066" -+checksum = "adfbc57365a37acbd2ebf2b64d7e69bb766e2fea813521ed536f5d0520dcf86c" - dependencies = [ -- "generic-array 0.14.4", -+ "block-buffer 0.10.3", -+ "crypto-common", - ] - --[[package]] --name = "dtoa" --version = "0.4.6" --source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "134951f4028bdadb9b84baf4232681efbf277da25144b9b0ad65df75946c422b" -- - [[package]] - name = "elasticlunr-rs" --version = "2.3.9" -+version = "3.0.1" - source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "35622eb004c8f0c5e7e2032815f3314a93df0db30a1ce5c94e62c1ecc81e22b9" -+checksum = "b94d9c8df0fe6879ca12e7633fdfe467c503722cc981fc463703472d2b876448" - dependencies = [ -- "lazy_static", - "regex", - "serde", - "serde_derive", - "serde_json", -- "strum", -- "strum_macros", - ] - - [[package]] - name = "env_logger" --version = "0.7.1" -+version = "0.9.1" - source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "44533bbbb3bb3c1fa17d9f2e4e38bbbaf8396ba82193c4cb1b6445d711445d36" -+checksum = "c90bf5f19754d10198ccb95b70664fc925bd1fc090a0fd9a6ebc54acc8cd6272" - dependencies = [ - "atty", - "humantime", -@@ -368,25 +432,11 @@ dependencies = [ - "new_debug_unreachable", - ] - --[[package]] --name = "futures" --version = "0.3.8" --source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "9b3b0c040a1fe6529d30b3c5944b280c7f0dcb2930d2c3062bca967b602583d0" --dependencies = [ -- "futures-channel", -- "futures-core", -- "futures-io", -- "futures-sink", -- "futures-task", -- "futures-util", --] -- - [[package]] - name = "futures-channel" --version = "0.3.8" -+version = "0.3.24" - source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "4b7109687aa4e177ef6fe84553af6280ef2778bdb7783ba44c9dc3399110fe64" -+checksum = "30bdd20c28fadd505d0fd6712cdfcb0d4b5648baf45faef7f852afb2399bb050" - dependencies = [ - "futures-core", - "futures-sink", -@@ -394,23 +444,16 @@ dependencies = [ - - [[package]] - name = "futures-core" --version = "0.3.8" -+version = "0.3.24" - source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "847ce131b72ffb13b6109a221da9ad97a64cbe48feb1028356b836b47b8f1748" -- --[[package]] --name = "futures-io" --version = "0.3.8" --source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "611834ce18aaa1bd13c4b374f5d653e1027cf99b6b502584ff8c9a64413b30bb" -+checksum = "4e5aa3de05362c3fb88de6531e6296e85cde7739cccad4b9dfeeb7f6ebce56bf" - - [[package]] - name = "futures-macro" --version = "0.3.8" -+version = "0.3.24" - source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "77408a692f1f97bcc61dc001d752e00643408fbc922e4d634c655df50d595556" -+checksum = "42cd15d1c7456c04dbdf7e88bcd69760d74f3a798d6444e16974b505b0e62f17" - dependencies = [ -- "proc-macro-hack", - "proc-macro2", - "quote", - "syn", -@@ -418,33 +461,28 @@ dependencies = [ - - [[package]] - name = "futures-sink" --version = "0.3.8" -+version = "0.3.24" - source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "f878195a49cee50e006b02b93cf7e0a95a38ac7b776b4c4d9cc1207cd20fcb3d" -+checksum = "21b20ba5a92e727ba30e72834706623d94ac93a725410b6a6b6fbc1b07f7ba56" - - [[package]] - name = "futures-task" --version = "0.3.8" -+version = "0.3.24" - source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "7c554eb5bf48b2426c4771ab68c6b14468b6e76cc90996f528c3338d761a4d0d" --dependencies = [ -- "once_cell", --] -+checksum = "a6508c467c73851293f390476d4491cf4d227dbabcd4170f3bb6044959b294f1" - - [[package]] - name = "futures-util" --version = "0.3.8" -+version = "0.3.24" - source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "d304cff4a7b99cfb7986f7d43fbe93d175e72e704a8860787cc95e9ffd85cbd2" -+checksum = "44fb6cb1be61cc1d2e43b262516aafcf63b241cffdb1d3fa115f91d9c7b09c90" - dependencies = [ - "futures-core", - "futures-macro", - "futures-sink", - "futures-task", -- "pin-project 1.0.1", -+ "pin-project-lite", - "pin-utils", -- "proc-macro-hack", -- "proc-macro-nested", - "slab", - ] - -@@ -468,23 +506,25 @@ dependencies = [ - ] - - [[package]] --name = "getopts" --version = "0.2.21" -+name = "getrandom" -+version = "0.1.15" - source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "14dbbfd5c71d70241ecf9e6f13737f7b5ce823821063188d7e46c41d371eebd5" -+checksum = "fc587bc0ec293155d5bfa6b9891ec18a1e330c234f896ea47fbada4cadbe47e6" - dependencies = [ -- "unicode-width", -+ "cfg-if 0.1.10", -+ "libc", -+ "wasi 0.9.0+wasi-snapshot-preview1", - ] - - [[package]] - name = "getrandom" --version = "0.1.15" -+version = "0.2.7" - source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "fc587bc0ec293155d5bfa6b9891ec18a1e330c234f896ea47fbada4cadbe47e6" -+checksum = "4eb1a864a501629691edf6c15a593b7a51eebaa1e8468e9ddc623de7c9b58ec6" - dependencies = [ -- "cfg-if 0.1.10", -+ "cfg-if 1.0.0", - "libc", -- "wasi 0.9.0+wasi-snapshot-preview1", -+ "wasi 0.11.0+wasi-snapshot-preview1", - ] - - [[package]] -@@ -504,11 +544,11 @@ checksum = "9b919933a397b79c37e33b77bb2aa3dc8eb6e165ad809e58ff75bc7db2e34574" - - [[package]] - name = "h2" --version = "0.2.7" -+version = "0.3.14" - source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "5e4728fd124914ad25e99e3d15a9361a879f6620f63cb56bbb08f95abb97a535" -+checksum = "5ca32592cf21ac7ccab1825cd87f6c9b3d9022c44d086172ed0966bec8af30be" - dependencies = [ -- "bytes", -+ "bytes 1.2.1", - "fnv", - "futures-core", - "futures-sink", -@@ -519,21 +559,20 @@ dependencies = [ - "tokio", - "tokio-util", - "tracing", -- "tracing-futures", - ] - - [[package]] - name = "handlebars" --version = "3.5.1" -+version = "4.3.5" - source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "2764f9796c0ddca4b82c07f25dd2cb3db30b9a8f47940e78e1c883d9e95c3db9" -+checksum = "433e4ab33f1213cdc25b5fa45c76881240cfe79284cf2b395e8b9e312a30a2fd" - dependencies = [ - "log", - "pest", - "pest_derive", -- "quick-error 2.0.0", - "serde", - "serde_json", -+ "thiserror", - ] - - [[package]] -@@ -548,9 +587,9 @@ version = "0.3.2" - source = "registry+https://github.com/rust-lang/crates.io-index" - checksum = "ed18eb2459bf1a09ad2d6b1547840c3e5e62882fa09b9a6a20b1de8e3228848f" - dependencies = [ -- "base64", -+ "base64 0.12.3", - "bitflags", -- "bytes", -+ "bytes 0.5.6", - "headers-core", - "http", - "mime", -@@ -567,15 +606,6 @@ dependencies = [ - "http", - ] - --[[package]] --name = "heck" --version = "0.3.1" --source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "20564e78d53d2bb135c343b3f47714a56af2061f1c928fdb541dc7b9fdd94205" --dependencies = [ -- "unicode-segmentation", --] -- - [[package]] - name = "hermit-abi" - version = "0.1.17" -@@ -605,19 +635,20 @@ version = "0.2.1" - source = "registry+https://github.com/rust-lang/crates.io-index" - checksum = "28d569972648b2c512421b5f2a405ad6ac9666547189d0c5477a3f200f3e02f9" - dependencies = [ -- "bytes", -+ "bytes 0.5.6", - "fnv", -- "itoa", -+ "itoa 0.4.6", - ] - - [[package]] - name = "http-body" --version = "0.3.1" -+version = "0.4.5" - source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "13d5ff830006f7646652e057693569bfe0d51760c0085a071769d142a205111b" -+checksum = "d5f38f16d184e36f2408a55281cd658ecbd3ca05cce6d6510a176eca393e26d1" - dependencies = [ -- "bytes", -+ "bytes 1.2.1", - "http", -+ "pin-project-lite", - ] - - [[package]] -@@ -634,20 +665,17 @@ checksum = "494b4d60369511e7dea41cf646832512a94e542f68bb9c49e54518e0f468eb47" - - [[package]] - name = "humantime" --version = "1.3.0" -+version = "2.1.0" - source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "df004cfca50ef23c36850aaaa59ad52cc70d0e90243c3c7737a4dd32dc7a3c4f" --dependencies = [ -- "quick-error 1.2.3", --] -+checksum = "9a3a5bfb195931eeb336b2a7b4d761daec841b97f947d34394601737a7bba5e4" - - [[package]] - name = "hyper" --version = "0.13.9" -+version = "0.14.5" - source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "f6ad767baac13b44d4529fcf58ba2cd0995e36e7b435bc5b039de6f47e880dbf" -+checksum = "8bf09f61b52cfcf4c00de50df88ae423d6c02354e385a86341133b5338630ad1" - dependencies = [ -- "bytes", -+ "bytes 1.2.1", - "futures-channel", - "futures-core", - "futures-util", -@@ -656,8 +684,8 @@ dependencies = [ - "http-body", - "httparse", - "httpdate", -- "itoa", -- "pin-project 1.0.1", -+ "itoa 0.4.6", -+ "pin-project", - "socket2", - "tokio", - "tower-service", -@@ -712,15 +740,6 @@ dependencies = [ - "libc", - ] - --[[package]] --name = "input_buffer" --version = "0.3.1" --source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "19a8a95243d5a0398cae618ec29477c6e3cb631152be5c19481f80bc71559754" --dependencies = [ -- "bytes", --] -- - [[package]] - name = "iovec" - version = "0.1.4" -@@ -736,6 +755,12 @@ version = "0.4.6" - source = "registry+https://github.com/rust-lang/crates.io-index" - checksum = "dc6f3ad7b9d11a0c00842ff8de1b60ee58661048eb8049ed33c73594f359d7e6" - -+[[package]] -+name = "itoa" -+version = "1.0.3" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "6c8af84674fe1f223a982c933a0ee1086ac4d4052aa0fb8060c12c6ad838e754" -+ - [[package]] - name = "katex" - version = "0.3.2" -@@ -771,9 +796,9 @@ checksum = "830d08ce1d1d941e6b30645f1a0eb5643013d835ce3779a5fc208261dbe10f55" - - [[package]] - name = "libc" --version = "0.2.80" -+version = "0.2.134" - source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "4d58d1b70b004888f764dfbf6a26a3b0342a1632d33968e4a179d8011c760614" -+checksum = "329c933548736bc49fd575ee68c89e8be4d260064184389a5b77517cddd99ffb" - - [[package]] - name = "libquickjs-sys" -@@ -843,14 +868,15 @@ checksum = "7ffc5c5338469d4d3ea17d269fa8ea3512ad247247c30bd2df69e68309ed0a08" - - [[package]] - name = "mdbook" --version = "0.4.4" -+version = "0.4.21" - source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "714a3ac362b9b32eef9468ecfe604cb8e2204d50793602e9d49fee44781230e7" -+checksum = "23f3e133c6d515528745ffd3b9f0c7d975ae039f0b6abb099f2168daa2afb4f9" - dependencies = [ - "ammonia", - "anyhow", - "chrono", -- "clap", -+ "clap 3.2.22", -+ "clap_complete", - "elasticlunr-rs", - "env_logger", - "futures-util", -@@ -860,16 +886,16 @@ dependencies = [ - "log", - "memchr", - "notify", -- "open", -+ "opener", - "pulldown-cmark", - "regex", - "serde", -- "serde_derive", - "serde_json", - "shlex", - "tempfile", - "tokio", - "toml", -+ "topological-sort", - "warp", - ] - -@@ -877,7 +903,7 @@ dependencies = [ - name = "mdbook-katex" - version = "0.2.10" - dependencies = [ -- "clap", -+ "clap 2.33.3", - "katex", - "mdbook", - "serde_json", -@@ -886,9 +912,9 @@ dependencies = [ - - [[package]] - name = "memchr" --version = "2.3.4" -+version = "2.5.0" - source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "0ee1c47aaa256ecabcaea351eae4a9b01ef39ed810004e298d2511ed284b1525" -+checksum = "2dffe52ecf27772e601905b7522cb4ef790d2cc203488bbd0e2fe85fcb74566d" - - [[package]] - name = "mime" -@@ -925,6 +951,18 @@ dependencies = [ - "winapi 0.2.8", - ] - -+[[package]] -+name = "mio" -+version = "0.8.4" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "57ee1c23c7c63b0c9250c339ffdc69255f110b298b901b9f6c82547b7b87caaf" -+dependencies = [ -+ "libc", -+ "log", -+ "wasi 0.11.0+wasi-snapshot-preview1", -+ "windows-sys", -+] -+ - [[package]] - name = "mio-extras" - version = "2.0.6" -@@ -933,7 +971,7 @@ checksum = "52403fe290012ce777c4626790c8951324a2b9e3316b3143779c72b029742f19" - dependencies = [ - "lazycell", - "log", -- "mio", -+ "mio 0.6.22", - "slab", - ] - -@@ -978,7 +1016,7 @@ dependencies = [ - "fsevent-sys", - "inotify", - "libc", -- "mio", -+ "mio 0.6.22", - "mio-extras", - "walkdir 2.3.1", - "winapi 0.3.9", -@@ -1004,32 +1042,43 @@ dependencies = [ - ] - - [[package]] --name = "once_cell" --version = "1.5.2" -+name = "num_cpus" -+version = "1.13.1" - source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "13bd41f508810a131401606d54ac32a467c97172d74ba7662562ebba5ad07fa0" -+checksum = "19e64526ebdee182341572e50e9ad03965aa510cd94427a4549448f285e957a1" -+dependencies = [ -+ "hermit-abi", -+ "libc", -+] - - [[package]] --name = "opaque-debug" --version = "0.2.3" -+name = "once_cell" -+version = "1.15.0" - source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "2839e79665f131bdb5782e51f2c6c9599c133c6098982a54c794358bf432529c" -+checksum = "e82dad04139b71a90c080c8463fe0dc7902db5192d939bd0950f074d014339e1" - - [[package]] - name = "opaque-debug" --version = "0.3.0" -+version = "0.2.3" - source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "624a8340c38c1b80fd549087862da4ba43e08858af025b236e509b6649fc13d5" -+checksum = "2839e79665f131bdb5782e51f2c6c9599c133c6098982a54c794358bf432529c" - - [[package]] --name = "open" --version = "1.4.0" -+name = "opener" -+version = "0.5.0" - source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "7c283bf0114efea9e42f1a60edea9859e8c47528eae09d01df4b29c1e489cc48" -+checksum = "4ea3ebcd72a54701f56345f16785a6d3ac2df7e986d273eb4395c0b01db17952" - dependencies = [ -+ "bstr", - "winapi 0.3.9", - ] - -+[[package]] -+name = "os_str_bytes" -+version = "6.3.0" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "9ff7415e9ae3fff1225851df9e0d9e4e5479f947619774677a63572e55e80eff" -+ - [[package]] - name = "percent-encoding" - version = "2.1.0" -@@ -1105,7 +1154,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" - checksum = "17367f0cc86f2d25802b2c26ee58a7b23faeccf78a396094c13dced0d0182526" - dependencies = [ - "phf_shared", -- "rand", -+ "rand 0.7.3", - ] - - [[package]] -@@ -1117,33 +1166,13 @@ dependencies = [ - "siphasher", - ] - --[[package]] --name = "pin-project" --version = "0.4.27" --source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "2ffbc8e94b38ea3d2d8ba92aea2983b503cd75d0888d75b86bb37970b5698e15" --dependencies = [ -- "pin-project-internal 0.4.27", --] -- - [[package]] - name = "pin-project" - version = "1.0.1" - source = "registry+https://github.com/rust-lang/crates.io-index" - checksum = "ee41d838744f60d959d7074e3afb6b35c7456d0f61cad38a24e35e6553f73841" - dependencies = [ -- "pin-project-internal 1.0.1", --] -- --[[package]] --name = "pin-project-internal" --version = "0.4.27" --source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "65ad2ae56b6abe3a1ee25f15ee605bacadb9a764edaba9c2bf4103800d4a1895" --dependencies = [ -- "proc-macro2", -- "quote", -- "syn", -+ "pin-project-internal", - ] - - [[package]] -@@ -1159,9 +1188,9 @@ dependencies = [ - - [[package]] - name = "pin-project-lite" --version = "0.1.11" -+version = "0.2.9" - source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "c917123afa01924fc84bb20c4c03f004d9c38e5127e3c039bbf7f4b9c76a2f6b" -+checksum = "e0a7ae3ac2f1173085d398531c705756c94a4c56843785df85a60c1a0afac116" - - [[package]] - name = "pin-utils" -@@ -1181,18 +1210,6 @@ version = "0.1.1" - source = "registry+https://github.com/rust-lang/crates.io-index" - checksum = "925383efa346730478fb4838dbe9137d2a47675ad789c546d150a6e1dd4ab31c" - --[[package]] --name = "proc-macro-hack" --version = "0.5.19" --source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "dbf0c48bc1d91375ae5c3cd81e3722dff1abcf81a30960240640d223f59fe0e5" -- --[[package]] --name = "proc-macro-nested" --version = "0.1.6" --source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "eba180dafb9038b050a4c280019bbedf9f2467b61e5d892dcad585bb57aadc5a" -- - [[package]] - name = "proc-macro2" - version = "1.0.24" -@@ -1204,28 +1221,15 @@ dependencies = [ - - [[package]] - name = "pulldown-cmark" --version = "0.7.2" -+version = "0.9.2" - source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "ca36dea94d187597e104a5c8e4b07576a8a45aa5db48a65e12940d3eb7461f55" -+checksum = "2d9cc634bc78768157b5cbfe988ffcd1dcba95cd2b2f03a88316c08c6d00ed63" - dependencies = [ - "bitflags", -- "getopts", - "memchr", - "unicase", - ] - --[[package]] --name = "quick-error" --version = "1.2.3" --source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "a1d01941d82fa2ab50be1e79e6714289dd7cde78eba4c074bc5a4374f650dfe0" -- --[[package]] --name = "quick-error" --version = "2.0.0" --source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "3ac73b1112776fc109b2e61909bc46c7e1bf0d7f690ffb1676553acce16d5cda" -- - [[package]] - name = "quick-js" - version = "0.4.0" -@@ -1251,14 +1255,25 @@ version = "0.7.3" - source = "registry+https://github.com/rust-lang/crates.io-index" - checksum = "6a6b1679d49b24bbfe0c803429aa1874472f50d9b363131f0e89fc356b544d03" - dependencies = [ -- "getrandom", -+ "getrandom 0.1.15", - "libc", -- "rand_chacha", -- "rand_core", -+ "rand_chacha 0.2.2", -+ "rand_core 0.5.1", - "rand_hc", - "rand_pcg", - ] - -+[[package]] -+name = "rand" -+version = "0.8.5" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "34af8d1a0e25924bc5b7c43c079c942339d8f0a8b57c39049bef581b46327404" -+dependencies = [ -+ "libc", -+ "rand_chacha 0.3.1", -+ "rand_core 0.6.4", -+] -+ - [[package]] - name = "rand_chacha" - version = "0.2.2" -@@ -1266,7 +1281,17 @@ source = "registry+https://github.com/rust-lang/crates.io-index" - checksum = "f4c8ed856279c9737206bf725bf36935d8666ead7aa69b52be55af369d193402" - dependencies = [ - "ppv-lite86", -- "rand_core", -+ "rand_core 0.5.1", -+] -+ -+[[package]] -+name = "rand_chacha" -+version = "0.3.1" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "e6c10a63a0fa32252be49d21e7709d4d4baf8d231c2dbce1eaa8141b9b127d88" -+dependencies = [ -+ "ppv-lite86", -+ "rand_core 0.6.4", - ] - - [[package]] -@@ -1275,7 +1300,16 @@ version = "0.5.1" - source = "registry+https://github.com/rust-lang/crates.io-index" - checksum = "90bde5296fc891b0cef12a6d03ddccc162ce7b2aff54160af9338f8d40df6d19" - dependencies = [ -- "getrandom", -+ "getrandom 0.1.15", -+] -+ -+[[package]] -+name = "rand_core" -+version = "0.6.4" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "ec0be4795e2f6a28069bec0b5ff3e2ac9bafc99e6a9a7dc3547996c5c816922c" -+dependencies = [ -+ "getrandom 0.2.7", - ] - - [[package]] -@@ -1284,7 +1318,7 @@ version = "0.2.0" - source = "registry+https://github.com/rust-lang/crates.io-index" - checksum = "ca3129af7b92a17112d59ad498c6f81eaf463253766b90396d39ea7a39d6613c" - dependencies = [ -- "rand_core", -+ "rand_core 0.5.1", - ] - - [[package]] -@@ -1293,7 +1327,7 @@ version = "0.2.1" - source = "registry+https://github.com/rust-lang/crates.io-index" - checksum = "16abd0c1b639e9eb4d7c50c0b8100b0d0f849be2349829c740fe8e6eb4816429" - dependencies = [ -- "rand_core", -+ "rand_core 0.5.1", - ] - - [[package]] -@@ -1304,21 +1338,26 @@ checksum = "41cc0f7e4d5d4544e8861606a285bb08d3e70712ccc7d2b84d7c0ccfaf4b05ce" - - [[package]] - name = "regex" --version = "1.4.2" -+version = "1.6.0" - source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "38cf2c13ed4745de91a5eb834e11c00bcc3709e773173b2ce4c56c9fbde04b9c" -+checksum = "4c4eb3267174b8c6c2f654116623910a0fef09c4753f8dd83db29c48a0df988b" - dependencies = [ - "aho-corasick", - "memchr", - "regex-syntax", -- "thread_local", - ] - -+[[package]] -+name = "regex-automata" -+version = "0.1.10" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "6c230d73fb8d8c1b9c0b3135c5142a8acee3a0558fb8db5cf1cb65f8d7862132" -+ - [[package]] - name = "regex-syntax" --version = "0.6.21" -+version = "0.6.27" - source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "3b181ba2dcf07aaccad5448e8ead58db5b742cf85dfe035e2227f137a539a189" -+checksum = "a3f87b73ce11b1619a3c6332f45341e0047173771e8b8b73f87bfeefb7b56244" - - [[package]] - name = "remove_dir_all" -@@ -1329,6 +1368,15 @@ dependencies = [ - "winapi 0.3.9", - ] - -+[[package]] -+name = "rustls-pemfile" -+version = "0.2.1" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "5eebeaeb360c87bfb72e84abdb3447159c0eaececf1bef2aecd65a8be949d1c9" -+dependencies = [ -+ "base64 0.13.0", -+] -+ - [[package]] - name = "ryu" - version = "1.0.5" -@@ -1355,6 +1403,9 @@ name = "serde" - version = "1.0.117" - source = "registry+https://github.com/rust-lang/crates.io-index" - checksum = "b88fa983de7720629c9387e9f517353ed404164b1e482c970a90c1a4aaf7dc1a" -+dependencies = [ -+ "serde_derive", -+] - - [[package]] - name = "serde_derive" -@@ -1373,21 +1424,21 @@ version = "1.0.59" - source = "registry+https://github.com/rust-lang/crates.io-index" - checksum = "dcac07dbffa1c65e7f816ab9eba78eb142c6d44410f4eeba1e26e4f5dfa56b95" - dependencies = [ -- "itoa", -+ "itoa 0.4.6", - "ryu", - "serde", - ] - - [[package]] - name = "serde_urlencoded" --version = "0.6.1" -+version = "0.7.1" - source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "9ec5d77e2d4c73717816afac02670d5c4f534ea95ed430442cad02e7a6e32c97" -+checksum = "d3491c14715ca2294c4d6a88f15e84739788c1d030eed8c110436aafdaa2f3fd" - dependencies = [ -- "dtoa", -- "itoa", -+ "form_urlencoded", -+ "itoa 1.0.3", -+ "ryu", - "serde", -- "url", - ] - - [[package]] -@@ -1399,27 +1450,25 @@ dependencies = [ - "block-buffer 0.7.3", - "digest 0.8.1", - "fake-simd", -- "opaque-debug 0.2.3", -+ "opaque-debug", - ] - - [[package]] - name = "sha-1" --version = "0.9.2" -+version = "0.10.0" - source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "ce3cdf1b5e620a498ee6f2a171885ac7e22f0e12089ec4b3d22b84921792507c" -+checksum = "028f48d513f9678cda28f6e4064755b3fbb2af6acd672f2c209b62323f7aea0f" - dependencies = [ -- "block-buffer 0.9.0", - "cfg-if 1.0.0", -- "cpuid-bool", -- "digest 0.9.0", -- "opaque-debug 0.3.0", -+ "cpufeatures", -+ "digest 0.10.5", - ] - - [[package]] - name = "shlex" --version = "0.1.1" -+version = "1.1.0" - source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "7fdf1b9db47230893d76faad238fd6097fd6d6a9245cd7a4d90dbd639536bbd2" -+checksum = "43b2853a4d09f215c24cc5489c992ce46052d359b5109343cbafbf26bc62f8a3" - - [[package]] - name = "siphasher" -@@ -1435,13 +1484,11 @@ checksum = "c111b5bd5695e56cffe5129854aa230b39c93a305372fdbb2668ca2394eea9f8" - - [[package]] - name = "socket2" --version = "0.3.16" -+version = "0.4.7" - source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "7fd8b795c389288baa5f355489c65e71fd48a02104600d15c4cfbc561e9e429d" -+checksum = "02e2d2db9033d13a1567121ddd7a095ee144db4e1ca1b1bda3419bc0da294ebd" - dependencies = [ -- "cfg-if 0.1.10", - "libc", -- "redox_syscall", - "winapi 0.3.9", - ] - -@@ -1483,28 +1530,16 @@ source = "registry+https://github.com/rust-lang/crates.io-index" - checksum = "6446ced80d6c486436db5c078dde11a9f73d42b57fb273121e160b84f63d894c" - - [[package]] --name = "strum" --version = "0.18.0" -+name = "strsim" -+version = "0.10.0" - source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "57bd81eb48f4c437cadc685403cad539345bf703d78e63707418431cecd4522b" -- --[[package]] --name = "strum_macros" --version = "0.18.0" --source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "87c85aa3f8ea653bfd3ddf25f7ee357ee4d204731f6aa9ad04002306f6e2774c" --dependencies = [ -- "heck", -- "proc-macro2", -- "quote", -- "syn", --] -+checksum = "73473c0e59e6d5812c5dfe2a064a6444949f089e20eec9a2e5506596494e4623" - - [[package]] - name = "syn" --version = "1.0.48" -+version = "1.0.67" - source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "cc371affeffc477f42a221a1e4297aedcea33d47d19b61455588bd9d8f6b19ac" -+checksum = "6498a9efc342871f91cc2d0d694c674368b4ceb40f62b65a7a08c3792935e702" - dependencies = [ - "proc-macro2", - "quote", -@@ -1519,7 +1554,7 @@ checksum = "7a6e24d9338a0a5be79593e2fa15a648add6138caa803e2d5bc782c371732ca9" - dependencies = [ - "cfg-if 0.1.10", - "libc", -- "rand", -+ "rand 0.7.3", - "redox_syscall", - "remove_dir_all", - "winapi 0.3.9", -@@ -1538,9 +1573,9 @@ dependencies = [ - - [[package]] - name = "termcolor" --version = "1.1.0" -+version = "1.1.3" - source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "bb6bfa289a4d7c5766392812c0a1f4c1ba45afa1ad47803c11e1f407d846d75f" -+checksum = "bab24d30b911b2376f3a13cc2cd443142f0c81dda04c118693e35b3835757755" - dependencies = [ - "winapi-util", - ] -@@ -1554,35 +1589,32 @@ dependencies = [ - "unicode-width", - ] - -+[[package]] -+name = "textwrap" -+version = "0.15.1" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "949517c0cf1bf4ee812e2e07e08ab448e3ae0d23472aee8a06c985f0c8815b16" -+ - [[package]] - name = "thiserror" --version = "1.0.22" -+version = "1.0.37" - source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "0e9ae34b84616eedaaf1e9dd6026dbe00dcafa92aa0c8077cb69df1fcfe5e53e" -+checksum = "10deb33631e3c9018b9baf9dcbbc4f737320d2b576bac10f6aefa048fa407e3e" - dependencies = [ - "thiserror-impl", - ] - - [[package]] - name = "thiserror-impl" --version = "1.0.22" -+version = "1.0.37" - source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "9ba20f23e85b10754cd195504aebf6a27e2e6cbe28c17778a0c930724628dd56" -+checksum = "982d17546b47146b28f7c22e3d08465f6b8903d0ea13c1660d9d84a6e7adcdbb" - dependencies = [ - "proc-macro2", - "quote", - "syn", - ] - --[[package]] --name = "thread_local" --version = "1.0.1" --source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "d40c6d1b69745a6ec6fb1ca717914848da4b44ae29d9b3080cbee91d72a69b14" --dependencies = [ -- "lazy_static", --] -- - [[package]] - name = "time" - version = "0.1.44" -@@ -1611,58 +1643,68 @@ checksum = "cda74da7e1a664f795bb1f8a87ec406fb89a02522cf6e50620d016add6dbbf5c" - - [[package]] - name = "tokio" --version = "0.2.23" -+version = "1.21.2" - source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "a6d7ad61edd59bfcc7e80dababf0f4aed2e6d5e0ba1659356ae889752dfc12ff" -+checksum = "a9e03c497dc955702ba729190dc4aac6f2a0ce97f913e5b1b5912fc5039d9099" - dependencies = [ -- "bytes", -- "fnv", -- "futures-core", -- "iovec", -- "lazy_static", -+ "autocfg", -+ "bytes 1.2.1", -+ "libc", - "memchr", -- "mio", -+ "mio 0.8.4", -+ "num_cpus", - "pin-project-lite", -- "slab", -+ "socket2", - "tokio-macros", -+ "winapi 0.3.9", - ] - - [[package]] - name = "tokio-macros" --version = "0.2.6" -+version = "1.8.0" - source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "e44da00bfc73a25f814cd8d7e57a68a5c31b74b3152a0a1d1f590c97ed06265a" -+checksum = "9724f9a975fb987ef7a3cd9be0350edcbe130698af5b8f7a631e23d42d052484" - dependencies = [ - "proc-macro2", - "quote", - "syn", - ] - -+[[package]] -+name = "tokio-stream" -+version = "0.1.10" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "f6edf2d6bc038a43d31353570e27270603f4648d18f5ed10c0e179abe43255af" -+dependencies = [ -+ "futures-core", -+ "pin-project-lite", -+ "tokio", -+] -+ - [[package]] - name = "tokio-tungstenite" --version = "0.11.0" -+version = "0.17.2" - source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "6d9e878ad426ca286e4dcae09cbd4e1973a7f8987d97570e2469703dd7f5720c" -+checksum = "f714dd15bead90401d77e04243611caec13726c2408afd5b31901dfcdcb3b181" - dependencies = [ - "futures-util", - "log", -- "pin-project 0.4.27", - "tokio", - "tungstenite", - ] - - [[package]] - name = "tokio-util" --version = "0.3.1" -+version = "0.7.4" - source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "be8242891f2b6cbef26a2d7e8605133c2c554cd35b3e4948ea892d6d68436499" -+checksum = "0bb2e075f03b3d66d8d8785356224ba688d2906a371015e225beeb65ca92c740" - dependencies = [ -- "bytes", -+ "bytes 1.2.1", - "futures-core", - "futures-sink", -- "log", - "pin-project-lite", - "tokio", -+ "tracing", - ] - - [[package]] -@@ -1674,6 +1716,12 @@ dependencies = [ - "serde", - ] - -+[[package]] -+name = "topological-sort" -+version = "0.1.0" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "aa7c7f42dea4b1b99439786f5633aeb9c14c1b53f75e282803c2ec2ad545873c" -+ - [[package]] - name = "tower-service" - version = "0.3.0" -@@ -1682,11 +1730,11 @@ checksum = "e987b6bf443f4b5b3b6f38704195592cca41c5bb7aedd3c3693c7081f8289860" - - [[package]] - name = "tracing" --version = "0.1.21" -+version = "0.1.35" - source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "b0987850db3733619253fe60e17cb59b82d37c7e6c0236bb81e4d6b87c879f27" -+checksum = "a400e31aa60b9d44a52a8ee0343b5b18566b03a8321e0d321f695cf56e940160" - dependencies = [ -- "cfg-if 0.1.10", -+ "cfg-if 1.0.0", - "log", - "pin-project-lite", - "tracing-core", -@@ -1694,21 +1742,11 @@ dependencies = [ - - [[package]] - name = "tracing-core" --version = "0.1.17" --source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "f50de3927f93d202783f4513cda820ab47ef17f624b03c096e86ef00c67e6b5f" --dependencies = [ -- "lazy_static", --] -- --[[package]] --name = "tracing-futures" --version = "0.2.4" -+version = "0.1.29" - source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "ab7bb6f14721aa00656086e9335d363c5c8747bae02ebe32ea2c7dece5689b4c" -+checksum = "5aeea4303076558a00714b823f9ad67d58a3bbda1df83d8827d21193156e22f7" - dependencies = [ -- "pin-project 0.4.27", -- "tracing", -+ "once_cell", - ] - - [[package]] -@@ -1719,28 +1757,28 @@ checksum = "59547bce71d9c38b83d9c0e92b6066c4253371f15005def0c30d9657f50c7642" - - [[package]] - name = "tungstenite" --version = "0.11.1" -+version = "0.17.3" - source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "f0308d80d86700c5878b9ef6321f020f29b1bb9d5ff3cab25e75e23f3a492a23" -+checksum = "e27992fd6a8c29ee7eef28fc78349aa244134e10ad447ce3b9f0ac0ed0fa4ce0" - dependencies = [ -- "base64", -+ "base64 0.13.0", - "byteorder", -- "bytes", -+ "bytes 1.2.1", - "http", - "httparse", -- "input_buffer", - "log", -- "rand", -- "sha-1 0.9.2", -+ "rand 0.8.5", -+ "sha-1 0.10.0", -+ "thiserror", - "url", - "utf-8", - ] - - [[package]] - name = "typenum" --version = "1.12.0" -+version = "1.15.0" - source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "373c8a200f9e67a0c95e62a4f52fbf80c23b4381c05a17845531982fa99e6b33" -+checksum = "dcf81ac59edc17cc8697ff311e8f5ef2d99fcbd9817b34cec66f90b6c3dfd987" - - [[package]] - name = "ucd-trie" -@@ -1775,12 +1813,6 @@ dependencies = [ - "tinyvec", - ] - --[[package]] --name = "unicode-segmentation" --version = "1.7.0" --source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "db8716a166f290ff49dabc18b44aa407cb7c6dbe1aa0971b44b8a24b0ca35aae" -- - [[package]] - name = "unicode-width" - version = "0.1.8" -@@ -1805,12 +1837,6 @@ dependencies = [ - "percent-encoding", - ] - --[[package]] --name = "urlencoding" --version = "1.1.1" --source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "c9232eb53352b4442e40d7900465dfc534e8cb2dc8f18656fcb2ac16112b5593" -- - [[package]] - name = "utf-8" - version = "0.7.5" -@@ -1862,29 +1888,32 @@ dependencies = [ - - [[package]] - name = "warp" --version = "0.2.5" -+version = "0.3.3" - source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "f41be6df54c97904af01aa23e613d4521eed7ab23537cede692d4058f6449407" -+checksum = "ed7b8be92646fc3d18b06147664ebc5f48d222686cb11a8755e561a735aacc6d" - dependencies = [ -- "bytes", -- "futures", -+ "bytes 1.2.1", -+ "futures-channel", -+ "futures-util", - "headers", - "http", - "hyper", - "log", - "mime", - "mime_guess", -- "pin-project 0.4.27", -+ "percent-encoding", -+ "pin-project", -+ "rustls-pemfile", - "scoped-tls", - "serde", - "serde_json", - "serde_urlencoded", - "tokio", -+ "tokio-stream", - "tokio-tungstenite", -+ "tokio-util", - "tower-service", - "tracing", -- "tracing-futures", -- "urlencoding", - ] - - [[package]] -@@ -1899,6 +1928,12 @@ version = "0.10.0+wasi-snapshot-preview1" - source = "registry+https://github.com/rust-lang/crates.io-index" - checksum = "1a143597ca7c7793eff794def352d41792a93c481eb1042423ff7ff72ba2c31f" - -+[[package]] -+name = "wasi" -+version = "0.11.0+wasi-snapshot-preview1" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "9c8d87e72b64a3b4db28d11ce29237c246188f4f51057d65a7eab63b7987e423" -+ - [[package]] - name = "winapi" - version = "0.2.8" -@@ -1942,6 +1977,49 @@ version = "0.4.0" - source = "registry+https://github.com/rust-lang/crates.io-index" - checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f" - -+[[package]] -+name = "windows-sys" -+version = "0.36.1" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "ea04155a16a59f9eab786fe12a4a450e75cdb175f9e0d80da1e17db09f55b8d2" -+dependencies = [ -+ "windows_aarch64_msvc", -+ "windows_i686_gnu", -+ "windows_i686_msvc", -+ "windows_x86_64_gnu", -+ "windows_x86_64_msvc", -+] -+ -+[[package]] -+name = "windows_aarch64_msvc" -+version = "0.36.1" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "9bb8c3fd39ade2d67e9874ac4f3db21f0d710bee00fe7cab16949ec184eeaa47" -+ -+[[package]] -+name = "windows_i686_gnu" -+version = "0.36.1" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "180e6ccf01daf4c426b846dfc66db1fc518f074baa793aa7d9b9aaeffad6a3b6" -+ -+[[package]] -+name = "windows_i686_msvc" -+version = "0.36.1" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "e2e7917148b2812d1eeafaeb22a97e4813dfa60a3f8f78ebe204bcc88f12f024" -+ -+[[package]] -+name = "windows_x86_64_gnu" -+version = "0.36.1" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "4dcd171b8776c41b97521e5da127a2d86ad280114807d0b2ab1e462bc764d9e1" -+ -+[[package]] -+name = "windows_x86_64_msvc" -+version = "0.36.1" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "c811ca4a8c853ef420abd8592ba53ddbbac90410fab6903b3e79972a631f7680" -+ - [[package]] - name = "ws2_32-sys" - version = "0.2.1" -diff --git a/Cargo.toml b/Cargo.toml -index 16efef1..e750ee2 100644 ---- a/Cargo.toml -+++ b/Cargo.toml -@@ -10,6 +10,6 @@ readme = "README.md" - [dependencies] - katex = "0.3.2" - clap = "2.33.3" --mdbook = "0.4.4" -+mdbook = "0.4.21" - serde_json = "1.0.59" - toml = "0.5.7" diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 56462296319e0..f275f8e293487 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -15797,6 +15797,8 @@ with pkgs; mujs = callPackage ../development/interpreters/mujs { }; + nelua = callPackage ../development/interpreters/nelua { }; + nextflow = callPackage ../development/interpreters/nextflow { }; ngn-k = callPackage ../development/interpreters/ngn-k { }; @@ -31424,6 +31426,8 @@ with pkgs; poke = callPackage ../applications/editors/poke { }; + pokefinder = qt6Packages.callPackage ../tools/games/pokefinder { }; + pokemonsay = callPackage ../tools/misc/pokemonsay { }; polar-bookshelf = callPackage ../applications/misc/polar-bookshelf { }; diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index c8a0271098a0c..642eb11d674c3 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -385,7 +385,11 @@ let url = "mirror://cpan/authors/id/M/MD/MDOOTSON/Alien-wxWidgets-0.69.tar.gz"; hash = "sha256-UyJOS7vv/0z3tj7ZpiljiTuf/Ull1w2WcQNI+Gdt4kk="; }; - propagatedBuildInputs = [ pkgs.pkg-config pkgs.gtk2 pkgs.wxGTK30 ModulePluggable ]; + postPatch = '' + substituteInPlace Build.PL \ + --replace "gtk+-2.0" "gtk+-3.0" + ''; + propagatedBuildInputs = [ pkgs.pkg-config pkgs.gtk3 pkgs.wxGTK30-gtk3 ModulePluggable ]; buildInputs = [ LWPProtocolHttps ]; meta = { description = "Building, finding and using wxWidgets binaries"; @@ -26946,6 +26950,12 @@ let url = "mirror://cpan/authors/id/M/MD/MDOOTSON/Wx-0.9932.tar.gz"; hash = "sha256-HP22U1oPRnbm8aqyydjhbVd74+s7fMBMgHTWheZlG3A="; }; + patches = [ + (fetchpatch { + url = "https://aur.archlinux.org/cgit/aur.git/plain/gtk3.patch?h=perl-wx&id=a3776d3747e3767d1e0f6d37bdaabf087f779fea"; + hash = "sha256-CokmRzDTFmEMN/jTKw9ECCPvi0mHt5+h8Ojg4Jgd7D4="; + }) + ]; propagatedBuildInputs = [ AlienWxWidgets ]; # Testing requires an X server: # Error: Unable to initialize GTK, is DISPLAY set properly?" |