diff options
96 files changed, 1220 insertions, 446 deletions
diff --git a/nixos/doc/manual/from_md/release-notes/rl-2111.section.xml b/nixos/doc/manual/from_md/release-notes/rl-2111.section.xml index f740827d11f72..b9f0456a953a2 100644 --- a/nixos/doc/manual/from_md/release-notes/rl-2111.section.xml +++ b/nixos/doc/manual/from_md/release-notes/rl-2111.section.xml @@ -614,7 +614,7 @@ Superuser created successfully. <listitem> <para> The <literal>staticjinja</literal> package has been upgraded - from 1.0.4 to 4.1.0 + from 1.0.4 to 4.1.1 </para> </listitem> <listitem> diff --git a/nixos/doc/manual/release-notes/rl-2111.section.md b/nixos/doc/manual/release-notes/rl-2111.section.md index 9bb7108fc0536..860ce7cc342e9 100644 --- a/nixos/doc/manual/release-notes/rl-2111.section.md +++ b/nixos/doc/manual/release-notes/rl-2111.section.md @@ -202,7 +202,7 @@ In addition to numerous new and upgraded packages, this release has the followin Superuser created successfully. ``` -- The `staticjinja` package has been upgraded from 1.0.4 to 4.1.0 +- The `staticjinja` package has been upgraded from 1.0.4 to 4.1.1 - Firefox v91 does not support addons with invalid signature anymore. Firefox ESR needs to be used for nix addon support. diff --git a/nixos/maintainers/scripts/ec2/amazon-image.nix b/nixos/maintainers/scripts/ec2/amazon-image.nix index fcb369e87ff98..6358ec68f7cf6 100644 --- a/nixos/maintainers/scripts/ec2/amazon-image.nix +++ b/nixos/maintainers/scripts/ec2/amazon-image.nix @@ -4,6 +4,7 @@ with lib; let cfg = config.amazonImage; + amiBootMode = if config.ec2.efi then "uefi" else "legacy-bios"; in { @@ -106,10 +107,12 @@ in { --arg system ${lib.escapeShellArg pkgs.stdenv.hostPlatform.system} \ --arg root_logical_bytes "$(${pkgs.qemu}/bin/qemu-img info --output json "$rootDisk" | ${pkgs.jq}/bin/jq '."virtual-size"')" \ --arg boot_logical_bytes "$(${pkgs.qemu}/bin/qemu-img info --output json "$bootDisk" | ${pkgs.jq}/bin/jq '."virtual-size"')" \ + --arg boot_mode "${amiBootMode}" \ --arg root "$rootDisk" \ --arg boot "$bootDisk" \ '{} | .label = $system_label + | .boot_mode = $boot_mode | .system = $system | .disks.boot.logical_bytes = $boot_logical_bytes | .disks.boot.file = $boot @@ -145,9 +148,11 @@ in { --arg system_label ${lib.escapeShellArg config.system.nixos.label} \ --arg system ${lib.escapeShellArg pkgs.stdenv.hostPlatform.system} \ --arg logical_bytes "$(${pkgs.qemu}/bin/qemu-img info --output json "$diskImage" | ${pkgs.jq}/bin/jq '."virtual-size"')" \ + --arg boot_mode "${amiBootMode}" \ --arg file "$diskImage" \ '{} | .label = $system_label + | .boot_mode = $boot_mode | .system = $system | .logical_bytes = $logical_bytes | .file = $file diff --git a/nixos/maintainers/scripts/ec2/create-amis.sh b/nixos/maintainers/scripts/ec2/create-amis.sh index 3558945873913..797fe03e20952 100755 --- a/nixos/maintainers/scripts/ec2/create-amis.sh +++ b/nixos/maintainers/scripts/ec2/create-amis.sh @@ -1,6 +1,9 @@ #!/usr/bin/env nix-shell #!nix-shell -p awscli -p jq -p qemu -i bash # shellcheck shell=bash +# +# Future Deprecation? +# This entire thing should probably be replaced with a generic terraform config # Uploads and registers NixOS images built from the # <nixos/release.nix> amazonImage attribute. Images are uploaded and @@ -275,6 +278,7 @@ upload_image() { --region "$region" \ --architecture $amazon_arch \ --block-device-mappings "${block_device_mappings[@]}" \ + --boot-mode $(read_image_info .boot_mode) \ "${extra_flags[@]}" \ | jq -r '.ImageId' ) diff --git a/nixos/modules/services/web-apps/plausible.nix b/nixos/modules/services/web-apps/plausible.nix index 437c3f2df83bd..b6c48186a1d32 100644 --- a/nixos/modules/services/web-apps/plausible.nix +++ b/nixos/modules/services/web-apps/plausible.nix @@ -9,6 +9,14 @@ in { options.services.plausible = { enable = mkEnableOption "plausible"; + releaseCookiePath = mkOption { + default = null; + type = with types; nullOr (either str path); + description = '' + The path to the file with release cookie. (used for remote connection to the running node). + ''; + }; + adminUser = { name = mkOption { default = "admin"; @@ -173,6 +181,8 @@ in { services.epmd.enable = true; + environment.systemPackages = [ pkgs.plausible ]; + systemd.services = mkMerge [ { plausible = { @@ -197,6 +207,8 @@ in { DISABLE_REGISTRATION = boolToString cfg.server.disableRegistration; RELEASE_TMP = "/var/lib/plausible/tmp"; + # Home is needed to connect to the node with iex + HOME = "/var/lib/plausible"; ADMIN_USER_NAME = cfg.adminUser.name; ADMIN_USER_EMAIL = cfg.adminUser.email; @@ -231,6 +243,9 @@ in { psql -d plausible <<< "UPDATE users SET email_verified=true;" fi ''} + ${optionalString (cfg.releaseCookiePath != null) '' + export RELEASE_COOKIE="$(< $CREDENTIALS_DIRECTORY/RELEASE_COOKIE )" + ''} plausible start ''; @@ -242,7 +257,8 @@ in { LoadCredential = [ "ADMIN_USER_PWD:${cfg.adminUser.passwordFile}" "SECRET_KEY_BASE:${cfg.server.secretKeybaseFile}" - ] ++ lib.optionals (cfg.mail.smtp.passwordFile != null) [ "SMTP_USER_PWD:${cfg.mail.smtp.passwordFile}"]; + ] ++ lib.optionals (cfg.mail.smtp.passwordFile != null) [ "SMTP_USER_PWD:${cfg.mail.smtp.passwordFile}"] + ++ lib.optionals (cfg.releaseCookiePath != null) [ "RELEASE_COOKIE:${cfg.releaseCookiePath}"]; }; }; } diff --git a/nixos/modules/services/web-apps/zabbix.nix b/nixos/modules/services/web-apps/zabbix.nix index 21567896a89e7..ff50b95254f90 100644 --- a/nixos/modules/services/web-apps/zabbix.nix +++ b/nixos/modules/services/web-apps/zabbix.nix @@ -21,7 +21,8 @@ let $DB['PORT'] = '${toString cfg.database.port}'; $DB['DATABASE'] = '${cfg.database.name}'; $DB['USER'] = '${cfg.database.user}'; - $DB['PASSWORD'] = ${if cfg.database.passwordFile != null then "file_get_contents('${cfg.database.passwordFile}')" else "''"}; + # NOTE: file_get_contents adds newline at the end of returned string + $DB['PASSWORD'] = ${if cfg.database.passwordFile != null then "trim(file_get_contents('${cfg.database.passwordFile}'), \"\\r\\n\")" else "''"}; // Schema name. Used for IBM DB2 and PostgreSQL. $DB['SCHEMA'] = '''; $ZBX_SERVER = '${cfg.server.address}'; diff --git a/pkgs/applications/audio/aether-lv2/default.nix b/pkgs/applications/audio/aether-lv2/default.nix new file mode 100644 index 0000000000000..e912c7fa49a42 --- /dev/null +++ b/pkgs/applications/audio/aether-lv2/default.nix @@ -0,0 +1,33 @@ +{ lib, stdenv, fetchFromGitHub, lv2, libX11, libGL, libGLU, mesa, cmake }: + +stdenv.mkDerivation rec { + pname = "aether-lv2"; + version = "1.2.1"; + + src = fetchFromGitHub { + owner = "Dougal-s"; + repo = "aether"; + rev = "v${version}"; + sha256 = "0xhih4smjxn87s0f4gaab51d8594qlp0lyypzxl5lm37j1i9zigs"; + fetchSubmodules = true; + }; + + nativeBuildInputs = [ cmake ]; + + buildInputs = [ + lv2 libX11 libGL libGLU mesa + ]; + + installPhase = '' + mkdir -p $out/lib/lv2 + cp -r aether.lv2 $out/lib/lv2 + ''; + + meta = with lib; { + homepage = "https://dougal-s.github.io/Aether/"; + description = "An algorithmic reverb LV2 based on Cloudseed"; + maintainers = [ maintainers.magnetophon ]; + platforms = platforms.linux; + license = licenses.mit; + }; +} diff --git a/pkgs/applications/audio/faustPhysicalModeling/default.nix b/pkgs/applications/audio/faustPhysicalModeling/default.nix index 8dd43ead5914d..f9dbd3f80f0c4 100644 --- a/pkgs/applications/audio/faustPhysicalModeling/default.nix +++ b/pkgs/applications/audio/faustPhysicalModeling/default.nix @@ -1,13 +1,13 @@ { stdenv, lib, fetchFromGitHub, faust2jaqt, faust2lv2 }: stdenv.mkDerivation rec { pname = "faustPhysicalModeling"; - version = "2.33.1"; + version = "2.37.3"; src = fetchFromGitHub { owner = "grame-cncm"; repo = "faust"; rev = version; - sha256 = "sha256-gzkfLfNhJHg/jEhf/RQDhHnXxn3UI15eDZfutKt3yGk="; + sha256 = "sha256-h6L+qRkN2chnI4821WrjD3uRFw3J0sUYVLL8w57vR1U="; }; buildInputs = [ faust2jaqt faust2lv2 ]; diff --git a/pkgs/applications/audio/sublime-music/default.nix b/pkgs/applications/audio/sublime-music/default.nix index 655290020156d..3f7e1e038f8ee 100644 --- a/pkgs/applications/audio/sublime-music/default.nix +++ b/pkgs/applications/audio/sublime-music/default.nix @@ -15,14 +15,14 @@ python3Packages.buildPythonApplication rec { pname = "sublime-music"; - version = "0.11.14"; + version = "0.11.16"; format = "pyproject"; src = fetchFromGitLab { owner = "sublime-music"; repo = pname; rev = "v${version}"; - sha256 = "sha256-NzbQtRcsRVppyuG1UuS3IidSnniUOavf5YoAf/kcZqw="; + sha256 = "sha256-n77mTgElwwFaX3WQL8tZzbkPwnsyQ08OW9imSOjpBlg="; }; nativeBuildInputs = [ @@ -71,7 +71,7 @@ python3Packages.buildPythonApplication rec { ]; checkPhase = '' - ${xvfb-run}/bin/xvfb-run pytest -k "not test_json_load_unload" + ${xvfb-run}/bin/xvfb-run pytest ''; pythonImportsCheck = [ diff --git a/pkgs/applications/audio/surge-XT/default.nix b/pkgs/applications/audio/surge-XT/default.nix new file mode 100644 index 0000000000000..6445723d7781c --- /dev/null +++ b/pkgs/applications/audio/surge-XT/default.nix @@ -0,0 +1,33 @@ +{ stdenv, lib, fetchFromGitHub, cmake, pkg-config, cairo, libxkbcommon, xcbutilcursor, xcbutilkeysyms, xcbutil, libXrandr, libXinerama, libXcursor, alsa-lib, libjack2 +}: + +stdenv.mkDerivation rec { + pname = "surge-XT"; + version = "unstable-2021-11-07"; + + src = fetchFromGitHub { + owner = "surge-synthesizer"; + repo = "surge"; + rev = "ed93833eb44b177c977e3a7b878ffdd9bf9f24e5"; + sha256 = "0b164659ksl6h5nn7jja5zccx2mwzibqs6b7hg8l98gpcy9fi5r2"; + fetchSubmodules = true; + }; + + nativeBuildInputs = [ cmake pkg-config ]; + buildInputs = [ cairo libxkbcommon xcbutilcursor xcbutilkeysyms xcbutil libXrandr libXinerama libXcursor alsa-lib libjack2 ]; + + installPhase = '' + cd .. + cmake --build build --config Release --target install + ''; + + doInstallCheck = false; + + meta = with lib; { + description = "LV2 & VST3 synthesizer plug-in (previously released as Vember Audio Surge)"; + homepage = "https://surge-synthesizer.github.io"; + license = licenses.gpl3; + platforms = [ "x86_64-linux" ]; + maintainers = with maintainers; [ magnetophon orivej ]; + }; +} diff --git a/pkgs/applications/graphics/smartdeblur/default.nix b/pkgs/applications/graphics/smartdeblur/default.nix index ccde0c0d9ecb1..c82e22ae0ca83 100644 --- a/pkgs/applications/graphics/smartdeblur/default.nix +++ b/pkgs/applications/graphics/smartdeblur/default.nix @@ -1,13 +1,14 @@ -{ fetchurl, lib, stdenv, cmake, qt4, fftw }: +{ lib, stdenv, fetchFromGitHub, cmake, qt4, fftw }: stdenv.mkDerivation rec { pname = "smartdeblur"; version = "unstable-2013-01-09"; - src = fetchurl { - url = "https://github.com/Y-Vladimir/SmartDeblur/tarball/9895036d26"; - name = "smartdeblur-${version}.tar.gz"; - sha256 = "126x9x1zhqdarjz9in0p1qhmqg3jwz7frizadjvx723g2ppi33s4"; + src = fetchFromGitHub { + owner = "Y-Vladimir"; + repo = "SmartDeblur"; + rev = "9895036d26cbb823a9ade28cdcb26fd0ac37258e"; + sha256 = "sha256-+EbqEpOG1fj2OKmlz8NRF/CGfT2OYGwY5/lwJHCHaMw="; }; preConfigure = '' @@ -19,11 +20,11 @@ stdenv.mkDerivation rec { cmakeFlags = [ "-DUSE_SYSTEM_FFTW=ON" ]; - meta = { + meta = with lib; { homepage = "https://github.com/Y-Vladimir/SmartDeblur"; description = "Tool for restoring blurry and defocused images"; - license = lib.licenses.gpl3; - maintainers = with lib.maintainers; [ ]; - platforms = with lib.platforms; linux; + license = licenses.gpl3; + maintainers = with maintainers; [ ]; + platforms = platforms.linux; }; } diff --git a/pkgs/applications/misc/binance/default.nix b/pkgs/applications/misc/binance/default.nix index 1a14055ae09b0..c86342f6e7870 100644 --- a/pkgs/applications/misc/binance/default.nix +++ b/pkgs/applications/misc/binance/default.nix @@ -1,10 +1,7 @@ -{ lib, stdenv, fetchurl, dpkg, autoPatchelfHook, makeWrapper, electron_12, -alsa-lib, gtk3, libxshmfence, mesa, nss, popt }: +{ lib, stdenv, fetchurl, dpkg, autoPatchelfHook, makeWrapper, electron +, alsa-lib, gtk3, libxshmfence, mesa, nss, popt }: -let - electron = electron_12; - -in stdenv.mkDerivation rec { +stdenv.mkDerivation rec { pname = "binance"; version = "1.26.0"; diff --git a/pkgs/applications/networking/cluster/helm-docs/default.nix b/pkgs/applications/networking/cluster/helm-docs/default.nix index 346284d3eab08..7214530a046db 100644 --- a/pkgs/applications/networking/cluster/helm-docs/default.nix +++ b/pkgs/applications/networking/cluster/helm-docs/default.nix @@ -23,7 +23,6 @@ buildGoModule rec { meta = with lib; { homepage = "https://github.com/norwoodj/helm-docs"; description = "A tool for automatically generating markdown documentation for Helm charts"; - platforms = platforms.unix; license = licenses.gpl3Only; maintainers = with maintainers; [ sagikazarmark ]; }; diff --git a/pkgs/applications/networking/cluster/terraform/default.nix b/pkgs/applications/networking/cluster/terraform/default.nix index 8dfc8c701e3ab..036ee7d8243f0 100644 --- a/pkgs/applications/networking/cluster/terraform/default.nix +++ b/pkgs/applications/networking/cluster/terraform/default.nix @@ -195,9 +195,9 @@ rec { }; terraform_1_0 = mkTerraform { - version = "1.0.10"; - sha256 = "1jcgp9q99785m85754ipza7b3dd3g58adpnyh5w2imqj01cas6mb"; - vendorSha256 = "00cl42w1mzsi9qd09wydfvp5f2h7lxaay6s2dv0mf47k6h7prf42"; + version = "1.0.11"; + sha256 = "0k05s4zm16vksq21f1q00y2lzfgi5fhs1ygydm8jk0srs9x8ask7"; + vendorSha256 = "1brgghl7fb26va4adix443rl1dkjaqrr4jkknxjkcaps0knqp172"; patches = [ ./provider-path-0_15.patch ]; passthru = { inherit plugins; }; }; diff --git a/pkgs/applications/networking/flexget/default.nix b/pkgs/applications/networking/flexget/default.nix index 22fd08e3f4a87..c4f54a756b76e 100644 --- a/pkgs/applications/networking/flexget/default.nix +++ b/pkgs/applications/networking/flexget/default.nix @@ -2,14 +2,14 @@ python3Packages.buildPythonApplication rec { pname = "flexget"; - version = "3.1.149"; + version = "3.1.150"; # Fetch from GitHub in order to use `requirements.in` src = fetchFromGitHub { owner = "flexget"; repo = "flexget"; rev = "v${version}"; - sha256 = "1yrb8cfrc6y7gpfgzn0q6ldx9vk06qp229wjs4q8rccp72p6d6gg"; + sha256 = "sha256-tSA1pDGzIX2uIEWM0xV53jj1vBcJFMNCRakczs7Hue4="; }; postPatch = '' diff --git a/pkgs/applications/networking/instant-messengers/kdeltachat/default.nix b/pkgs/applications/networking/instant-messengers/kdeltachat/default.nix index a7cd9116195b9..c9cbdd3798641 100644 --- a/pkgs/applications/networking/instant-messengers/kdeltachat/default.nix +++ b/pkgs/applications/networking/instant-messengers/kdeltachat/default.nix @@ -14,13 +14,13 @@ mkDerivation rec { pname = "kdeltachat"; - version = "unstable-2021-09-10"; + version = "unstable-2021-10-27"; src = fetchFromSourcehut { owner = "~link2xt"; repo = "kdeltachat"; - rev = "40092aa096bac7e279eb5a4cc97758bac484236c"; - sha256 = "0vmsbxx4hxh35v1lbj82vq2w8z8inj83xpf24wzlbdr9inlbmym4"; + rev = "e1201cdcce4311061643d90cc0132745023a82d2"; + sha256 = "04xqvyj4rzgl9r7sfjjw1kc3vql30c80rwppff2zr5aijr15fgjj"; }; nativeBuildInputs = [ diff --git a/pkgs/applications/networking/instant-messengers/matrix-commander/default.nix b/pkgs/applications/networking/instant-messengers/matrix-commander/default.nix index 2ebf762c418b6..c4f268871e879 100644 --- a/pkgs/applications/networking/instant-messengers/matrix-commander/default.nix +++ b/pkgs/applications/networking/instant-messengers/matrix-commander/default.nix @@ -20,6 +20,7 @@ stdenv.mkDerivation { pillow urllib3 aiofiles + notify2 ]))]; installPhase = '' diff --git a/pkgs/applications/science/logic/logisim-evolution/default.nix b/pkgs/applications/science/logic/logisim-evolution/default.nix index 10266abffea11..cf7470b5475b0 100644 --- a/pkgs/applications/science/logic/logisim-evolution/default.nix +++ b/pkgs/applications/science/logic/logisim-evolution/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "logisim-evolution"; - version = "3.5.0"; + version = "3.7.1"; src = fetchurl { url = "https://github.com/logisim-evolution/logisim-evolution/releases/download/v${version}/logisim-evolution-${version}-all.jar"; - sha256 = "1r6im4gmjbnckx8jig6bxi5lxv06lwdnpxkyfalsfmw4nybd5arw"; + sha256 = "04q9bzhnzpi8cgv3ly4ii88qvmlw9n09c4p1qmg8dhxqkskdqj6h"; }; dontUnpack = true; @@ -30,8 +30,11 @@ stdenv.mkDerivation rec { mkdir -p $out/bin makeWrapper ${jre}/bin/java $out/bin/logisim-evolution --add-flags "-jar $src" - unzip $src resources/logisim/img/logisim-icon.svg - install -D resources/logisim/img/logisim-icon.svg $out/share/pixmaps/logisim-evolution.svg + # Create icons + unzip $src "resources/logisim/img/*" + for size in 16 32 48 128 256; do + install -D "./resources/logisim/img/logisim-icon-$size.png" "$out/share/icons/hicolor/''${size}x''${size}/apps/logisim-evolution.png" + done runHook postInstall ''; diff --git a/pkgs/applications/terminal-emulators/tilix/default.nix b/pkgs/applications/terminal-emulators/tilix/default.nix index a5c4b4574df38..c217ae7f991de 100644 --- a/pkgs/applications/terminal-emulators/tilix/default.nix +++ b/pkgs/applications/terminal-emulators/tilix/default.nix @@ -26,7 +26,7 @@ stdenv.mkDerivation rec { src = fetchFromGitHub { owner = "gnunn1"; repo = "tilix"; - rev = "${version}"; + rev = version; sha256 = "sha256:020gr4q7kmqq8vnsh8rw97gf1p2n1yq4d7ncyjjh9l13zkaxqqv9"; }; diff --git a/pkgs/applications/virtualization/qemu/default.nix b/pkgs/applications/virtualization/qemu/default.nix index fba8ecf9d9ad3..b95979fe88cd3 100644 --- a/pkgs/applications/virtualization/qemu/default.nix +++ b/pkgs/applications/virtualization/qemu/default.nix @@ -112,10 +112,6 @@ stdenv.mkDerivation rec { }) ] ++ lib.optional nixosTestRunner ./force-uid0-on-9p.patch ++ lib.optionals stdenv.hostPlatform.isMusl [ - (fetchpatch { - url = "https://raw.githubusercontent.com/alpinelinux/aports/2bb133986e8fa90e2e76d53369f03861a87a74ef/main/qemu/musl-F_SHLCK-and-F_EXLCK.patch"; - sha256 = "1gm67v41gw6apzgz7jr3zv9z80wvkv0jaxd2w4d16hmipa8bhs0k"; - }) ./sigrtminmax.patch (fetchpatch { url = "https://raw.githubusercontent.com/alpinelinux/aports/2bb133986e8fa90e2e76d53369f03861a87a74ef/main/qemu/fix-sigevent-and-sigval_t.patch"; diff --git a/pkgs/data/fonts/vista-fonts/default.nix b/pkgs/data/fonts/vista-fonts/default.nix index ca2ae302b3ee4..fa8308b8c9720 100644 --- a/pkgs/data/fonts/vista-fonts/default.nix +++ b/pkgs/data/fonts/vista-fonts/default.nix @@ -14,11 +14,12 @@ stdenvNoCC.mkDerivation { unpackPhase = '' cabextract --lowercase --filter ppviewer.cab $src cabextract --lowercase --filter '*.TTF' ppviewer.cab + cabextract --lowercase --filter '*.TTC' ppviewer.cab ''; installPhase = '' mkdir -p $out/share/fonts/truetype - cp *.ttf $out/share/fonts/truetype + cp *.ttf *.ttc $out/share/fonts/truetype # Set up no-op font configs to override any aliases set up by # other packages. diff --git a/pkgs/desktops/plasma-5/3rdparty/addons/bismuth/0001-Avoid-usage-of-npx.patch b/pkgs/desktops/plasma-5/3rdparty/addons/bismuth/0001-Avoid-usage-of-npx.patch new file mode 100644 index 0000000000000..34e06d77bd293 --- /dev/null +++ b/pkgs/desktops/plasma-5/3rdparty/addons/bismuth/0001-Avoid-usage-of-npx.patch @@ -0,0 +1,37 @@ +From c9aaff2461daba31a25ed20c0789ffd7c3561887 Mon Sep 17 00:00:00 2001 +From: Pasquale <p3dimaria@hotmail.it> +Date: Tue, 9 Nov 2021 23:12:50 +0100 +Subject: [PATCH] Avoid usage of npx + +tsc is only used for checking type annotation +that are stripped by esbuild + +--- + src/kwinscript/CMakeLists.txt | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/src/kwinscript/CMakeLists.txt b/src/kwinscript/CMakeLists.txt +index 6d85d5d..6f966a4 100644 +--- a/src/kwinscript/CMakeLists.txt ++++ b/src/kwinscript/CMakeLists.txt +@@ -29,7 +29,7 @@ add_custom_target( + + add_custom_command( + OUTPUT "bismuth/contents/code/index.mjs" +- COMMAND "npx" "esbuild" ++ COMMAND "esbuild" + "--bundle" "${CMAKE_CURRENT_SOURCE_DIR}/index.ts" + "--outfile=${CMAKE_CURRENT_BINARY_DIR}/bismuth/contents/code/index.mjs" + "--format=esm" +@@ -40,7 +40,7 @@ add_custom_command( + + add_custom_target( + LintViaTSC +- COMMAND "npx" "tsc" "--noEmit" "--incremental" ++ COMMAND "true" + COMMENT "👮 Checking sources using TS Compiler..." + ) + +-- +2.33.1 + diff --git a/pkgs/desktops/plasma-5/3rdparty/addons/bismuth/default.nix b/pkgs/desktops/plasma-5/3rdparty/addons/bismuth/default.nix new file mode 100644 index 0000000000000..114eb31e69ceb --- /dev/null +++ b/pkgs/desktops/plasma-5/3rdparty/addons/bismuth/default.nix @@ -0,0 +1,48 @@ +{ lib +, mkDerivation +, fetchFromGitHub +, kcoreaddons +, kwindowsystem +, plasma-framework +, systemsettings +, cmake +, extra-cmake-modules +, esbuild +}: + +mkDerivation rec { + pname = "bismuth"; + version = "2.1.0"; + + src = fetchFromGitHub { + owner = "Bismuth-Forge"; + repo = pname; + rev = "v${version}"; + sha256 = "sha256-ICpGgFvVi7tiYbMCo3JWQmbA36rdWF4NFYTWIejhxr4="; + }; + + patches = [ + ./0001-Avoid-usage-of-npx.patch + ]; + + nativeBuildInputs = [ + cmake + extra-cmake-modules + esbuild + ]; + + buildInputs = [ + kcoreaddons + kwindowsystem + plasma-framework + systemsettings + ]; + + meta = with lib; { + description = "A dynamic tiling extension for KWin"; + license = licenses.mit; + maintainers = with maintainers; [ pasqui23 ]; + homepage = "https://bismuth-forge.github.io/bismuth/"; + inherit (kwindowsystem.meta) platforms; + }; +} diff --git a/pkgs/desktops/plasma-5/default.nix b/pkgs/desktops/plasma-5/default.nix index e5a2393088865..8abf2b37dbeca 100644 --- a/pkgs/desktops/plasma-5/default.nix +++ b/pkgs/desktops/plasma-5/default.nix @@ -155,6 +155,7 @@ let thirdParty = let inherit (libsForQt5) callPackage; in { plasma-applet-caffeine-plus = callPackage ./3rdparty/addons/caffeine-plus.nix { }; plasma-applet-virtual-desktop-bar = callPackage ./3rdparty/addons/virtual-desktop-bar.nix { }; + bismuth = callPackage ./3rdparty/addons/bismuth { }; kwin-dynamic-workspaces = callPackage ./3rdparty/kwin/scripts/dynamic-workspaces.nix { }; kwin-tiling = callPackage ./3rdparty/kwin/scripts/tiling.nix { }; krohnkite = callPackage ./3rdparty/kwin/scripts/krohnkite.nix { }; diff --git a/pkgs/development/compilers/ldc/binary.nix b/pkgs/development/compilers/ldc/binary.nix index 7b43a2c2e8d87..05928d396c861 100644 --- a/pkgs/development/compilers/ldc/binary.nix +++ b/pkgs/development/compilers/ldc/binary.nix @@ -3,8 +3,8 @@ let inherit (stdenv) hostPlatform; - OS = if stdenv.hostPlatform.isDarwin then "osx" else hostPlatform.parsed.kernel.name; - ARCH = toString hostPlatform.parsed.cpu.name; + OS = if hostPlatform.isDarwin then "osx" else hostPlatform.parsed.kernel.name; + ARCH = if hostPlatform.isDarwin && hostPlatform.isAarch64 then "arm64" else hostPlatform.parsed.cpu.name; in stdenv.mkDerivation { pname = "ldc-bootstrap"; inherit version; @@ -37,6 +37,6 @@ in stdenv.mkDerivation { # from https://github.com/ldc-developers/ldc/blob/master/LICENSE license = with licenses; [ bsd3 boost mit ncsa gpl2Plus ]; maintainers = with maintainers; [ ThomasMader lionello ]; - platforms = [ "x86_64-linux" "x86_64-darwin" "aarch64-linux" ]; + platforms = [ "x86_64-linux" "x86_64-darwin" "aarch64-linux" "aarch64-darwin" ]; }; } diff --git a/pkgs/development/compilers/ldc/bootstrap.nix b/pkgs/development/compilers/ldc/bootstrap.nix index fde4c84268489..18c656b27f2f5 100644 --- a/pkgs/development/compilers/ldc/bootstrap.nix +++ b/pkgs/development/compilers/ldc/bootstrap.nix @@ -1,10 +1,11 @@ { callPackage }: callPackage ./binary.nix { - version = "1.19.0"; + version = "1.25.0"; hashes = { # Get these from `nix-prefetch-url https://github.com/ldc-developers/ldc/releases/download/v1.19.0/ldc2-1.19.0-osx-x86_64.tar.xz` etc.. - osx-x86_64 = "1bp3xkh9zp64dzq8isanib1gacb3nfbl70qv15qygwk1zan6zgy7"; - linux-x86_64 = "146grr2lwarfk13wgkpyb77xb6b3as1is2rf4s2hipqjmc8biy1h"; - linux-aarch64 = "1fv6jshfvi15m7masgxq1hgp216qjd5amizrqdf26vhrq3a08li3"; + osx-x86_64 = "1xaqxf1lz8kdb0n5iycfpxpvabf1zy0akg14kg554sm85xnsf8pa"; + linux-x86_64 = "1shzdq564jg3ga1hwrvpx30lpszc6pqndqndr5mqmc352znkiy5i"; + linux-aarch64 = "04i4xxwhq02d98r3qrrnv5dbd4xr4d7ph3zv94z2m58z3vgphdjh"; + osx-arm64 = "0b0cpgzn23clggx0cvdaja29q7w7ihkmjbnf1md03h9h5nzp9z1v"; }; } diff --git a/pkgs/development/compilers/ldc/generic.nix b/pkgs/development/compilers/ldc/generic.nix index f79fb24a56b4d..93ee83cb0abea 100644 --- a/pkgs/development/compilers/ldc/generic.nix +++ b/pkgs/development/compilers/ldc/generic.nix @@ -132,6 +132,6 @@ stdenv.mkDerivation rec { # from https://github.com/ldc-developers/ldc/blob/master/LICENSE license = with licenses; [ bsd3 boost mit ncsa gpl2Plus ]; maintainers = with maintainers; [ ThomasMader lionello ]; - platforms = [ "x86_64-linux" "i686-linux" "x86_64-darwin" ]; + platforms = [ "x86_64-linux" "i686-linux" "x86_64-darwin" "aarch64-darwin" ]; }; } diff --git a/pkgs/development/libraries/collada-dom/default.nix b/pkgs/development/libraries/collada-dom/default.nix new file mode 100644 index 0000000000000..1cb5c48539697 --- /dev/null +++ b/pkgs/development/libraries/collada-dom/default.nix @@ -0,0 +1,35 @@ +{ stdenv, lib, fetchFromGitHub, cmake, boost, libxml2, minizip, readline }: + +stdenv.mkDerivation { + pname = "collada-dom"; + version = "unstable-2020-01-03"; + + src = fetchFromGitHub { + owner = "rdiankov"; + repo = "collada-dom"; + rev = "c1e20b7d6ff806237030fe82f126cb86d661f063"; + sha256 = "sha256-A1ne/D6S0shwCzb9spd1MoSt/238HWA8dvgd+DC9cXc="; + }; + + postInstall = '' + chmod +w -R $out + ln -s $out/include/*/* $out/include + ''; + + nativeBuildInputs = [ cmake ]; + + buildInputs = [ + boost + libxml2 + minizip + readline + ]; + + meta = with lib; { + description = "Lightweight version of collada-dom, with only the parser."; + homepage = "https://github.com/rdiankov/collada-dom"; + license = licenses.mit; + maintainers = with maintainers; [ marius851000 ]; + platforms = platforms.all; + }; +} diff --git a/pkgs/development/libraries/giflib/default.nix b/pkgs/development/libraries/giflib/default.nix index 9eaf7b933d43e..c86b706e13c82 100644 --- a/pkgs/development/libraries/giflib/default.nix +++ b/pkgs/development/libraries/giflib/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, fetchpatch, xmlto, docbook_xml_dtd_412, docbook_xsl, libxml2, fixDarwinDylibNames }: +{ lib, stdenv, fetchurl, fetchpatch, xmlto, docbook_xml_dtd_412, docbook_xsl, libxml2, fixDarwinDylibNames, pkgsStatic }: stdenv.mkDerivation rec { name = "giflib-5.2.1"; @@ -19,12 +19,21 @@ stdenv.mkDerivation rec { postPatch = '' substituteInPlace Makefile \ --replace 'PREFIX = /usr/local' 'PREFIX = ${builtins.placeholder "out"}' + '' + # Upstream build system does not support NOT building shared libraries. + + lib.optionalString stdenv.hostPlatform.isStatic '' + sed -i '/all:/ s/libgif.so//' Makefile + sed -i '/all:/ s/libutil.so//' Makefile + sed -i '/-m 755 libgif.so/ d' Makefile + sed -i '/ln -sf libgif.so/ d' Makefile ''; nativeBuildInputs = lib.optionals stdenv.isDarwin [ fixDarwinDylibNames ]; buildInputs = [ xmlto docbook_xml_dtd_412 docbook_xsl libxml2 ]; + passthru.tests.static = pkgsStatic.giflib; + meta = { description = "A library for reading and writing gif images"; platforms = lib.platforms.unix; diff --git a/pkgs/development/libraries/glog/default.nix b/pkgs/development/libraries/glog/default.nix index 38cd40377a5c3..72758a1b3e774 100644 --- a/pkgs/development/libraries/glog/default.nix +++ b/pkgs/development/libraries/glog/default.nix @@ -42,6 +42,6 @@ stdenv.mkDerivation rec { license = licenses.bsd3; description = "Library for application-level logging"; platforms = platforms.unix; - maintainers = with lib.maintainers; [ nh2 r-burns ]; + maintainers = with maintainers; [ nh2 r-burns ]; }; } diff --git a/pkgs/development/libraries/libbsd/default.nix b/pkgs/development/libraries/libbsd/default.nix index ecea00086585a..745b34226e2dc 100644 --- a/pkgs/development/libraries/libbsd/default.nix +++ b/pkgs/development/libraries/libbsd/default.nix @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { # darwin changes configure.ac which means we need to regenerate # the configure scripts nativeBuildInputs = [ autoreconfHook ]; - buildInputs = [ libmd ]; + propagatedBuildInputs = [ libmd ]; patches = [ ./darwin.patch ]; diff --git a/pkgs/development/libraries/libdeltachat/darwin-dylib.patch b/pkgs/development/libraries/libdeltachat/darwin-dylib.patch new file mode 100644 index 0000000000000..caa44a62a062d --- /dev/null +++ b/pkgs/development/libraries/libdeltachat/darwin-dylib.patch @@ -0,0 +1,53 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 5ed8020c..44ca43e7 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -2,12 +2,20 @@ cmake_minimum_required(VERSION 3.16) + project(deltachat LANGUAGES C) + include(GNUInstallDirs) + ++if(APPLE) ++ set(DYNAMIC_EXT "dylib") ++elseif(UNIX) ++ set(DYNAMIC_EXT "so") ++else() ++ set(DYNAMIC_EXT "dll") ++endif() ++ + find_program(CARGO cargo) + + add_custom_command( + OUTPUT + "target/release/libdeltachat.a" +- "target/release/libdeltachat.so" ++ "target/release/libdeltachat.${DYNAMIC_EXT}" + "target/release/pkgconfig/deltachat.pc" + COMMAND + PREFIX=${CMAKE_INSTALL_PREFIX} +@@ -32,11 +40,11 @@ add_custom_target( + ALL + DEPENDS + "target/release/libdeltachat.a" +- "target/release/libdeltachat.so" ++ "target/release/libdeltachat.${DYNAMIC_EXT}" + "target/release/pkgconfig/deltachat.pc" + ) + + install(FILES "deltachat-ffi/deltachat.h" DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}) + install(FILES "target/release/libdeltachat.a" DESTINATION ${CMAKE_INSTALL_LIBDIR}) +-install(FILES "target/release/libdeltachat.so" DESTINATION ${CMAKE_INSTALL_LIBDIR}) ++install(FILES "target/release/libdeltachat.${DYNAMIC_EXT}" DESTINATION ${CMAKE_INSTALL_LIBDIR}) + install(FILES "target/release/pkgconfig/deltachat.pc" DESTINATION ${CMAKE_INSTALL_LIBDIR}/pkgconfig) +diff --git a/python/install_python_bindings.py b/python/install_python_bindings.py +index c8ed43e2..714c7e30 100755 +--- a/python/install_python_bindings.py ++++ b/python/install_python_bindings.py +@@ -24,7 +24,7 @@ + + print("running:", " ".join(cmd)) + subprocess.check_call(cmd) +- subprocess.check_call("rm -rf build/ src/deltachat/*.so" , shell=True) ++ subprocess.check_call("rm -rf build/ src/deltachat/*.so src/deltachat/*.dylib" , shell=True) + + if len(sys.argv) <= 1 or sys.argv[1] != "onlybuild": + subprocess.check_call([ diff --git a/pkgs/development/libraries/libdeltachat/default.nix b/pkgs/development/libraries/libdeltachat/default.nix index 9cc0ca65ae0bb..70b6cfe3d9c83 100644 --- a/pkgs/development/libraries/libdeltachat/default.nix +++ b/pkgs/development/libraries/libdeltachat/default.nix @@ -1,7 +1,6 @@ { lib , stdenv , fetchFromGitHub -, fetchpatch , cmake , openssl , perl @@ -16,33 +15,25 @@ stdenv.mkDerivation rec { pname = "libdeltachat"; - version = "1.60.0"; + version = "1.63.0"; src = fetchFromGitHub { owner = "deltachat"; repo = "deltachat-core-rust"; rev = version; - sha256 = "1agm5xyaib4ynmw4mhgmkhh4lnxs91wv0q9i1zfihv2vkckfm2s2"; + sha256 = "1511jh38h7nmn4dpyi1vfxvhybcacc6gavwfifxvb5npirphziga"; }; patches = [ # https://github.com/deltachat/deltachat-core-rust/pull/2589 - (fetchpatch { - url = "https://github.com/deltachat/deltachat-core-rust/commit/408467e85d04fbbfd6bed5908d84d9e995943487.patch"; - sha256 = "1j2ywaazglgl6370js34acrg0wrh0b7krqg05dfjf65n527lzn59"; - }) + ./darwin-dylib.patch ./no-static-lib.patch - # https://github.com/deltachat/deltachat-core-rust/pull/2660 - (fetchpatch { - url = "https://github.com/deltachat/deltachat-core-rust/commit/8fb5e038a97d8ae68564c885d61b93127a68366d.patch"; - sha256 = "088pzfrrkgfi4646dc72404s3kykcpni7hgkppalwlzg0p4is41x"; - }) ]; cargoDeps = rustPlatform.fetchCargoTarball { inherit src; name = "${pname}-${version}"; - sha256 = "09d3mw2hb1gmqg7smaqwnfm7izw40znl0h1dz7s2imms2cnkjws1"; + sha256 = "0hfp2k84mvq11h7q96hkcj3k6f3sxw8wx89acg4hy6lbh8xpy6ai"; }; nativeBuildInputs = [ diff --git a/pkgs/development/libraries/libdeltachat/no-static-lib.patch b/pkgs/development/libraries/libdeltachat/no-static-lib.patch index 95238cf885242..14ea1106138f9 100644 --- a/pkgs/development/libraries/libdeltachat/no-static-lib.patch +++ b/pkgs/development/libraries/libdeltachat/no-static-lib.patch @@ -1,8 +1,8 @@ diff --git a/CMakeLists.txt b/CMakeLists.txt -index fe7abe08..acdbe0d6 100644 +index 44ca43e7..8b6960dd 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt -@@ -13,7 +13,6 @@ find_program(CARGO cargo) +@@ -14,7 +14,6 @@ find_program(CARGO cargo) add_custom_command( OUTPUT @@ -10,7 +10,7 @@ index fe7abe08..acdbe0d6 100644 "target/release/libdeltachat.${DYNAMIC_EXT}" "target/release/pkgconfig/deltachat.pc" COMMAND -@@ -38,13 +37,11 @@ add_custom_target( +@@ -39,12 +38,10 @@ add_custom_target( lib_deltachat ALL DEPENDS @@ -19,13 +19,12 @@ index fe7abe08..acdbe0d6 100644 "target/release/pkgconfig/deltachat.pc" ) - include(GNUInstallDirs) install(FILES "deltachat-ffi/deltachat.h" DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}) -install(FILES "target/release/libdeltachat.a" DESTINATION ${CMAKE_INSTALL_LIBDIR}) install(FILES "target/release/libdeltachat.${DYNAMIC_EXT}" DESTINATION ${CMAKE_INSTALL_LIBDIR}) install(FILES "target/release/pkgconfig/deltachat.pc" DESTINATION ${CMAKE_INSTALL_LIBDIR}/pkgconfig) diff --git a/deltachat-ffi/Cargo.toml b/deltachat-ffi/Cargo.toml -index a34a27ba..cf354abb 100644 +index de0fbafe..120efec9 100644 --- a/deltachat-ffi/Cargo.toml +++ b/deltachat-ffi/Cargo.toml @@ -12,7 +12,7 @@ categories = ["cryptography", "std", "email"] diff --git a/pkgs/development/libraries/openscenegraph/default.nix b/pkgs/development/libraries/openscenegraph/default.nix index 6b446882ba137..6ed7d846de203 100644 --- a/pkgs/development/libraries/openscenegraph/default.nix +++ b/pkgs/development/libraries/openscenegraph/default.nix @@ -2,6 +2,7 @@ libX11, libXinerama, libXrandr, libGLU, libGL, glib, ilmbase, libxml2, pcre, zlib, AGL, Carbon, Cocoa, Foundation, + boost, jpegSupport ? true, libjpeg, exrSupport ? false, openexr, gifSupport ? true, giflib, @@ -9,7 +10,7 @@ tiffSupport ? true, libtiff, gdalSupport ? false, gdal, curlSupport ? true, curl, - colladaSupport ? false, opencollada, + colladaSupport ? false, collada-dom, opencascadeSupport ? false, opencascade, ffmpegSupport ? false, ffmpeg, nvttSupport ? false, nvidia-texture-tools, @@ -20,7 +21,7 @@ lasSupport ? false, libLAS, luaSupport ? false, lua, sdlSupport ? false, SDL2, - restSupport ? false, asio, boost, + restSupport ? false, asio, withApps ? false, withExamples ? false, fltk, wxGTK, }: @@ -48,7 +49,7 @@ stdenv.mkDerivation rec { ++ lib.optional tiffSupport libtiff ++ lib.optional gdalSupport gdal ++ lib.optional curlSupport curl - ++ lib.optional colladaSupport opencollada + ++ lib.optional colladaSupport collada-dom ++ lib.optional opencascadeSupport opencascade ++ lib.optional ffmpegSupport ffmpeg ++ lib.optional nvttSupport nvidia-texture-tools @@ -59,9 +60,10 @@ stdenv.mkDerivation rec { ++ lib.optional lasSupport libLAS ++ lib.optional luaSupport lua ++ lib.optional sdlSupport SDL2 - ++ lib.optionals restSupport [ asio boost ] + ++ lib.optional restSupport asio ++ lib.optionals withExamples [ fltk wxGTK ] ++ lib.optionals stdenv.isDarwin [ AGL Carbon Cocoa Foundation ] + ++ lib.optional (restSupport || colladaSupport) boost ; cmakeFlags = lib.optional (!withApps) "-DBUILD_OSG_APPLICATIONS=OFF" ++ lib.optional withExamples "-DBUILD_OSG_EXAMPLES=ON"; diff --git a/pkgs/development/libraries/recastnavigation/default.nix b/pkgs/development/libraries/recastnavigation/default.nix new file mode 100644 index 0000000000000..d39d1a7132191 --- /dev/null +++ b/pkgs/development/libraries/recastnavigation/default.nix @@ -0,0 +1,27 @@ +{ stdenv, lib, fetchFromGitHub, cmake, libGL, SDL2, libGLU }: + +stdenv.mkDerivation rec { + pname = "recastai"; + # use latest revision for the CMake build process and OpenMW + # OpenMW use e75adf86f91eb3082220085e42dda62679f9a3ea + version = "unstable-2021-03-05"; + + src = fetchFromGitHub { + owner = "recastnavigation"; + repo = "recastnavigation"; + rev = "c5cbd53024c8a9d8d097a4371215e3342d2fdc87"; + sha256 = "sha256-QP3lMMFR6fiKQTksAkRL6X9yaoVz2xt4QSIP9g6piww="; + }; + + nativeBuildInputs = [ cmake ]; + + buildInputs = [ libGL SDL2 libGLU ]; + + meta = with lib; { + homepage = "https://github.com/recastnavigation/recastnavigation"; + description = "Navigation-mesh Toolset for Games"; + license = licenses.zlib; + maintainers = with maintainers; [ marius851000 ]; + platforms = platforms.all; + }; +} diff --git a/pkgs/development/python-modules/authheaders/default.nix b/pkgs/development/python-modules/authheaders/default.nix index a1d049ebb1513..8593f7f4d742e 100644 --- a/pkgs/development/python-modules/authheaders/default.nix +++ b/pkgs/development/python-modules/authheaders/default.nix @@ -4,11 +4,11 @@ buildPythonPackage rec { pname = "authheaders"; - version = "0.13.0"; + version = "0.14.1"; src = fetchPypi { inherit pname version; - sha256 = "935726b784cc636cbcfed2c977f1a6887dc60056806da4eff60db932c5896692"; + sha256 = "4e601b5b54080019a2f548fadf80ddf9c5538615607c7fb602936404aafe67e2"; }; propagatedBuildInputs = [ authres dnspython dkimpy publicsuffix2 ] diff --git a/pkgs/development/python-modules/azure-mgmt-authorization/default.nix b/pkgs/development/python-modules/azure-mgmt-authorization/default.nix index a622c6a94c903..0489cb112b8ed 100644 --- a/pkgs/development/python-modules/azure-mgmt-authorization/default.nix +++ b/pkgs/development/python-modules/azure-mgmt-authorization/default.nix @@ -11,12 +11,12 @@ buildPythonPackage rec { pname = "azure-mgmt-authorization"; - version = "1.0.0"; + version = "2.0.0"; src = fetchPypi { inherit pname version; extension = "zip"; - sha256 = "9a9fc16866b46387853381ab4fa0f84c1765e0afea5b0124709ea9fae10ee752"; + sha256 = "0776edc4980be940a8602eefc0372b4d1a1fa26caa46e3c0234e0c7a0feda4ec"; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/azure-mgmt-containerinstance/default.nix b/pkgs/development/python-modules/azure-mgmt-containerinstance/default.nix index 45158b8015d57..ae6d9755171eb 100644 --- a/pkgs/development/python-modules/azure-mgmt-containerinstance/default.nix +++ b/pkgs/development/python-modules/azure-mgmt-containerinstance/default.nix @@ -11,12 +11,12 @@ buildPythonPackage rec { pname = "azure-mgmt-containerinstance"; - version = "9.0.0"; + version = "9.1.0"; src = fetchPypi { inherit pname version; extension = "zip"; - sha256 = "041431c5a768ac652aac318a17f2a53b90db968494c79abbafec441d0be387ff"; + sha256 = "22164b0c59138b37bc48ba6d476bf635152bc428dcb420b521a14b8c25c797ad"; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/azure-mgmt-network/default.nix b/pkgs/development/python-modules/azure-mgmt-network/default.nix index 20d3db5669a37..4d5426a4b1902 100644 --- a/pkgs/development/python-modules/azure-mgmt-network/default.nix +++ b/pkgs/development/python-modules/azure-mgmt-network/default.nix @@ -10,14 +10,14 @@ }: buildPythonPackage rec { - version = "19.1.0"; + version = "19.2.0"; pname = "azure-mgmt-network"; disabled = !isPy3k; src = fetchPypi { inherit pname version; extension = "zip"; - sha256 = "62ef7fe8ba98e56412b434c9c35dc755b3c5e469f2c01bbed2ce0d12973a044b"; + sha256 = "c8da1cf9523b89d4b268546ea087153372633962e31a4e6befae20d0ae308bac"; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/azure-mgmt-recoveryservicesbackup/default.nix b/pkgs/development/python-modules/azure-mgmt-recoveryservicesbackup/default.nix index 3ebc199599bd6..67343337868a9 100644 --- a/pkgs/development/python-modules/azure-mgmt-recoveryservicesbackup/default.nix +++ b/pkgs/development/python-modules/azure-mgmt-recoveryservicesbackup/default.nix @@ -10,12 +10,12 @@ buildPythonPackage rec { pname = "azure-mgmt-recoveryservicesbackup"; - version = "2.0.0"; + version = "3.0.0"; src = fetchPypi { inherit pname version; extension = "zip"; - sha256 = "d3e60daefbc20a7fa381c7ad1498f4bf4bb5a1414c1c64188cc9d5c98c4e12ac"; + sha256 = "1992486b28ddd6d4f597fd3004217cd2caf4f4dc8a0ce71226b5ae767ace3a18"; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/cirq-rigetti/default.nix b/pkgs/development/python-modules/cirq-rigetti/default.nix index 8717b09a49ce6..dbd93fdfa2fcd 100644 --- a/pkgs/development/python-modules/cirq-rigetti/default.nix +++ b/pkgs/development/python-modules/cirq-rigetti/default.nix @@ -34,6 +34,7 @@ buildPythonPackage rec { postPatch = '' substituteInPlace requirements.txt \ --replace "attrs~=20.3.0" "attrs" \ + --replace "certifi~=2021.5.30" "certifi" \ --replace "h11~=0.9.0" "h11" \ --replace "httpcore~=0.11.1" "httpcore" \ --replace "httpx~=0.15.5" "httpx" \ diff --git a/pkgs/development/python-modules/dask/default.nix b/pkgs/development/python-modules/dask/default.nix index 68e5304932df6..39d01559d460a 100644 --- a/pkgs/development/python-modules/dask/default.nix +++ b/pkgs/development/python-modules/dask/default.nix @@ -5,6 +5,7 @@ , cloudpickle , distributed , fetchFromGitHub +, fetchpatch , fsspec , jinja2 , numpy @@ -22,7 +23,7 @@ buildPythonPackage rec { pname = "dask"; - version = "2021.09.1"; + version = "2021.10.0"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -31,9 +32,19 @@ buildPythonPackage rec { owner = "dask"; repo = pname; rev = version; - sha256 = "sha256-+UkbXbWV5R/QtVb5rWm/5SA+IoWsIfBciL3vg138jkc="; + sha256 = "07ysrs46x5w8rc2df0j06rsw58ahcysd6lwjk5riqpjlpwdfmg7p"; }; + patches = [ + # remove with next bump + (fetchpatch { + name = "fix-tests-against-distributed-2021.10.0.patch"; + url = "https://github.com/dask/dask/commit/cd65507841448ad49001cf27564102e2fb964d0a.patch"; + includes = [ "dask/tests/test_distributed.py" ]; + sha256 = "1i4i4k1lzxcydq9l80jyifq21ny0j3i47rviq07ai488pvx1r2al"; + }) + ]; + propagatedBuildInputs = [ cloudpickle fsspec diff --git a/pkgs/development/python-modules/distributed/default.nix b/pkgs/development/python-modules/distributed/default.nix index 049290081d62a..b623fe302783e 100644 --- a/pkgs/development/python-modules/distributed/default.nix +++ b/pkgs/development/python-modules/distributed/default.nix @@ -19,13 +19,13 @@ buildPythonPackage rec { pname = "distributed"; - version = "2021.9.1"; + version = "2021.10.0"; disabled = pythonOlder "3.6"; # get full repository need conftest.py to run tests src = fetchPypi { inherit pname version; - sha256 = "sha256-9N65ap2+9bBK0DCrkF3+1xuJPXmjaL1Xh7ISaLTtX/g="; + sha256 = "0kfq7lwv2n2wiws4v2rj36wx56jvkp2fl6zxg04p2lc3vcgha9za"; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/django_environ/default.nix b/pkgs/development/python-modules/django_environ/default.nix index 7c36db1d1187f..633d3e7286eb0 100644 --- a/pkgs/development/python-modules/django_environ/default.nix +++ b/pkgs/development/python-modules/django_environ/default.nix @@ -7,11 +7,11 @@ buildPythonPackage rec { pname = "django-environ"; - version = "0.7.0"; + version = "0.8.1"; src = fetchPypi { inherit pname version; - sha256 = "b99bd3704221f8b717c8517d8146e53fdee509d9e99056be560060003b92213e"; + sha256 = "6f0bc902b43891656b20486938cba0861dc62892784a44919170719572a534cb"; }; # The testsuite fails to modify the base environment diff --git a/pkgs/development/python-modules/easy-thumbnails/default.nix b/pkgs/development/python-modules/easy-thumbnails/default.nix index f2be7b1903da3..53913f77d2b5d 100644 --- a/pkgs/development/python-modules/easy-thumbnails/default.nix +++ b/pkgs/development/python-modules/easy-thumbnails/default.nix @@ -4,7 +4,7 @@ buildPythonPackage rec { pname = "easy-thumbnails"; - version = "2.7.1"; + version = "2.7.2"; meta = { description = "Easy thumbnails for Django"; @@ -14,7 +14,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "f862949208d9066cd3d84ffcf9c2dbe9c7344ea6152b741e440f861eca46855c"; + sha256 = "a7dd9cf97efaf70ba5d76484a962f08ba65b31f1681bc417257743650e9e8a8a"; }; propagatedBuildInputs = [ django pillow ]; diff --git a/pkgs/development/python-modules/exchangelib/default.nix b/pkgs/development/python-modules/exchangelib/default.nix index 686a167d74bf4..dba1af3d0a4ff 100644 --- a/pkgs/development/python-modules/exchangelib/default.nix +++ b/pkgs/development/python-modules/exchangelib/default.nix @@ -27,14 +27,14 @@ buildPythonPackage rec { pname = "exchangelib"; - version = "4.5.2"; + version = "4.6.0"; disabled = pythonOlder "3.6"; src = fetchFromGitHub { owner = "ecederstrand"; repo = pname; rev = "v${version}"; - sha256 = "1zz4p13ww9y5x0ifvcj652hgfbjqbnmr3snwrs0p315sc3y47ggm"; + sha256 = "1lx5q3m3vhbx9xnm3v25xrrxvli1nh0lsza51ln4y3fk79ln91hv"; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/huawei-lte-api/default.nix b/pkgs/development/python-modules/huawei-lte-api/default.nix index 44cbfd4f0e0a6..2b0fb912387a6 100644 --- a/pkgs/development/python-modules/huawei-lte-api/default.nix +++ b/pkgs/development/python-modules/huawei-lte-api/default.nix @@ -2,15 +2,15 @@ , buildPythonPackage , pythonOlder , fetchFromGitHub -, dicttoxml +, pycryptodomex +, pytestCheckHook , requests , xmltodict -, pytestCheckHook }: buildPythonPackage rec { pname = "huawei-lte-api"; - version = "1.4.18"; + version = "1.5.2"; disabled = pythonOlder "3.4"; @@ -18,7 +18,7 @@ buildPythonPackage rec { owner = "Salamek"; repo = "huawei-lte-api"; rev = version; - sha256 = "1qaqxmh03j10wa9wqbwgc5r3ays8wfr7bldvsm45fycr3qfyn5fg"; + sha256 = "sha256-xG0QTvjYW0/C/7NNhl/d024TSAe0TzgMknOXvNxrPOY="; }; postPatch = '' @@ -27,7 +27,7 @@ buildPythonPackage rec { ''; propagatedBuildInputs = [ - dicttoxml + pycryptodomex requests xmltodict ]; diff --git a/pkgs/development/python-modules/icalendar/default.nix b/pkgs/development/python-modules/icalendar/default.nix index 289099dbb0e97..1e7200cffe46b 100644 --- a/pkgs/development/python-modules/icalendar/default.nix +++ b/pkgs/development/python-modules/icalendar/default.nix @@ -7,12 +7,12 @@ }: buildPythonPackage rec { - version = "4.0.8"; + version = "4.0.9"; pname = "icalendar"; src = fetchPypi { inherit pname version; - sha256 = "7508a92b4e36049777640b0ae393e7219a16488d852841a0e57b44fe51d9f848"; + sha256 = "cc73fa9c848744843046228cb66ea86cd8c18d73a51b140f7c003f760b84a997"; }; buildInputs = [ setuptools ]; diff --git a/pkgs/development/python-modules/jaeger-client/default.nix b/pkgs/development/python-modules/jaeger-client/default.nix index 4a7a49052ca16..a601fd9ce799e 100644 --- a/pkgs/development/python-modules/jaeger-client/default.nix +++ b/pkgs/development/python-modules/jaeger-client/default.nix @@ -9,11 +9,11 @@ buildPythonPackage rec { pname = "jaeger-client"; - version = "4.6.1"; + version = "4.8.0"; src = fetchPypi { inherit pname version; - sha256 = "3bc27ad77e035efd0899f377a15f180467fec44b2afbf5be0660cc888a2a4ac3"; + sha256 = "3157836edab8e2c209bd2d6ae61113db36f7ee399e66b1dcbb715d87ab49bfe0"; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/jellyfish/default.nix b/pkgs/development/python-modules/jellyfish/default.nix index 436aad07bf8c8..546e56f702f66 100644 --- a/pkgs/development/python-modules/jellyfish/default.nix +++ b/pkgs/development/python-modules/jellyfish/default.nix @@ -8,13 +8,13 @@ buildPythonPackage rec { pname = "jellyfish"; - version = "0.8.8"; + version = "0.8.9"; disabled = !isPy3k; src = fetchPypi { inherit pname version; - sha256 = "0506089cacf9b5897442134417b04b3c6610c19f280ae535eace390dc6325a5c"; + sha256 = "90d25e8f5971ebbcf56f216ff5bb65d6466572b78908c88c47ab588d4ea436c2"; }; checkInputs = [ pytest unicodecsv ]; diff --git a/pkgs/development/python-modules/manimpango/default.nix b/pkgs/development/python-modules/manimpango/default.nix new file mode 100644 index 0000000000000..95e0358647114 --- /dev/null +++ b/pkgs/development/python-modules/manimpango/default.nix @@ -0,0 +1,37 @@ +{ stdenv, lib, buildPythonPackage, fetchFromGitHub, python, pkg-config, pango, cython, AppKit, pytestCheckHook }: + +buildPythonPackage rec { + pname = "manimpango"; + version = "0.3.1"; + + src = fetchFromGitHub { + owner = "ManimCommunity"; + repo = pname; + rev = "v${version}"; + sha256 = "ldZfvv5kloQ0uj0agxOP8cRh+Ix8f9Z0PT+pnhWYjiQ="; + }; + + postPatch = '' + substituteInPlace setup.cfg --replace "--cov --no-cov-on-fail" "" + ''; + + nativeBuildInputs = [ pkg-config ]; + buildInputs = [ pango ] ++ lib.optionals stdenv.isDarwin [ AppKit ]; + propagatedBuildInputs = [ + cython + ]; + + preBuild = '' + ${python.interpreter} setup.py build_ext --inplace + ''; + + checkInputs = [ pytestCheckHook ]; + pythonImportsCheck = [ "manimpango" ]; + + meta = with lib; { + homepage = "https://github.com/ManimCommunity/ManimPango"; + license = licenses.gpl3Plus; + description = "Binding for Pango"; + maintainers = [ maintainers.angustrau ]; + }; +} diff --git a/pkgs/development/python-modules/mdp/default.nix b/pkgs/development/python-modules/mdp/default.nix index 55a440e680896..dc73daa449b91 100644 --- a/pkgs/development/python-modules/mdp/default.nix +++ b/pkgs/development/python-modules/mdp/default.nix @@ -1,4 +1,10 @@ -{ lib, buildPythonPackage, fetchPypi, pytest, future, numpy }: +{ lib +, buildPythonPackage +, fetchPypi +, future +, numpy +, pytest +}: buildPythonPackage rec { pname = "MDP"; @@ -9,11 +15,27 @@ buildPythonPackage rec { sha256 = "ac52a652ccbaed1857ff1209862f03bf9b06d093b12606fb410787da3aa65a0e"; }; - checkInputs = [ pytest ]; propagatedBuildInputs = [ future numpy ]; - # Tests disabled because of missing dependencies not in nix - doCheck = false; + checkInputs = [ pytest ]; + + doCheck = true; + + pythonImportsCheck = [ "mdp" "bimdp" ]; + + postPatch = '' + # https://github.com/mdp-toolkit/mdp-toolkit/issues/92 + substituteInPlace mdp/utils/routines.py --replace numx.typeDict numx.sctypeDict + ''; + + checkPhase = '' + runHook preCheck + + pytest --seed 7710873 mdp + pytest --seed 7710873 bimdp + + runHook postCheck + ''; meta = with lib; { description = "Library for building complex data processing software by combining widely used machine learning algorithms"; diff --git a/pkgs/development/python-modules/nbdime/default.nix b/pkgs/development/python-modules/nbdime/default.nix index 0d073027e5d5a..fa72ab748d750 100644 --- a/pkgs/development/python-modules/nbdime/default.nix +++ b/pkgs/development/python-modules/nbdime/default.nix @@ -25,12 +25,12 @@ buildPythonPackage rec { pname = "nbdime"; - version = "3.1.0"; + version = "3.1.1"; disabled = !isPy3k; src = fetchPypi { inherit pname version; - sha256 = "12dc4390b355b26d07ac8d11d50efbcb54bae0ad5842b817131babd2f4567963"; + sha256 = "67767320e971374f701a175aa59abd3a554723039d39fae908e72d16330d648b"; }; checkInputs = [ diff --git a/pkgs/development/python-modules/panacotta/default.nix b/pkgs/development/python-modules/panacotta/default.nix new file mode 100644 index 0000000000000..efaee8a421681 --- /dev/null +++ b/pkgs/development/python-modules/panacotta/default.nix @@ -0,0 +1,34 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, pythonOlder +}: + +buildPythonPackage rec { + pname = "panacotta"; + version = "0.1"; + format = "setuptools"; + + disabled = pythonOlder "3.8"; + + src = fetchFromGitHub { + owner = "u1f35c"; + repo = "python-panacotta"; + rev = "panacotta-${version}"; + sha256 = "0v2fa18n50iy18n22klkgjral728iplj6yk3b6hjkzas5dk9wd9c"; + }; + + # Project has no tests + doCheck = false; + + pythonImportsCheck = [ + "panacotta" + ]; + + meta = with lib; { + description = "Python API for controlling Panasonic Blu-Ray players"; + homepage = "https://github.com/u1f35c/python-panacotta"; + license = licenses.gpl3Plus; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/pkgs/development/python-modules/pyaftership/default.nix b/pkgs/development/python-modules/pyaftership/default.nix index 6253d95111835..c0b941e849d13 100644 --- a/pkgs/development/python-modules/pyaftership/default.nix +++ b/pkgs/development/python-modules/pyaftership/default.nix @@ -1,9 +1,8 @@ { lib , buildPythonPackage , fetchFromGitHub -, isPy3k +, pythonOlder , aiohttp -, async-timeout , aresponses , pytest-asyncio , pytestCheckHook @@ -11,21 +10,38 @@ buildPythonPackage rec { pname = "pyaftership"; - version = "21.1.0"; + version = "21.11.0"; + format = "setuptools"; - disabled = !isPy3k; + disabled = pythonOlder "3.7"; src = fetchFromGitHub { owner = "ludeeus"; repo = pname; rev = version; - sha256 = "0jyzgwaijkp80whi58a0hgjzmnlczmd9vwn11z2m0j01kbdwznn5"; + sha256 = "sha256-SN7fvI/+VHYn2eYQe5wp6lEZ73YeZbsiPjDiq/Ibk3Q="; }; - propagatedBuildInputs = [ aiohttp async-timeout ]; + propagatedBuildInputs = [ + aiohttp + ]; - checkInputs = [ pytestCheckHook aresponses pytest-asyncio ]; - pythonImportsCheck = [ "pyaftership" ]; + checkInputs = [ + aresponses + pytest-asyncio + pytestCheckHook + ]; + + postPatch = '' + # Upstream is releasing with the help of a CI to PyPI, GitHub releases + # are not in their focus + substituteInPlace setup.py \ + --replace 'version="main",' 'version="${version}",' + ''; + + pythonImportsCheck = [ + "pyaftership" + ]; meta = with lib; { description = "Python wrapper package for the AfterShip API"; diff --git a/pkgs/development/python-modules/pyopencl/default.nix b/pkgs/development/python-modules/pyopencl/default.nix index c19e571a9cc8e..c5c7c6b2fb746 100644 --- a/pkgs/development/python-modules/pyopencl/default.nix +++ b/pkgs/development/python-modules/pyopencl/default.nix @@ -21,7 +21,7 @@ let if stdenv.isDarwin then [ mesa_drivers.dev ] else [ ocl-icd ]; in buildPythonPackage rec { pname = "pyopencl"; - version = "2021.2.8"; + version = "2021.2.9"; checkInputs = [ pytest ]; buildInputs = [ opencl-headers pybind11 ] ++ os-specific-buildInputs; @@ -30,7 +30,7 @@ in buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "15809b5d2b9a86ad01e31d176c00415436805ac884c4d197d9263bfe98280d76"; + sha256 = "51425e65ec49c738eefe21b1eeb1f39245b01cc0ddfd495fbe1f8df33dbc6c9e"; }; # py.test is not needed during runtime, so remove it from `install_requires` diff --git a/pkgs/development/python-modules/pytest-flakes/default.nix b/pkgs/development/python-modules/pytest-flakes/default.nix index e016b68837dea..ef06ed1bf4f0e 100644 --- a/pkgs/development/python-modules/pytest-flakes/default.nix +++ b/pkgs/development/python-modules/pytest-flakes/default.nix @@ -7,12 +7,12 @@ buildPythonPackage rec { # upstream has abandoned project in favor of pytest-flake8 # retaining package to not break other packages pname = "pytest-flakes"; - version = "4.0.3"; + version = "4.0.4"; disabled = pythonOlder "3.5"; src = fetchPypi { inherit pname version; - sha256 = "bf070c5485dad82d5b5f5d0eb08d269737e378492d9a68f5223b0a90924c7754"; + sha256 = "551467a129331bed83596f3145d9eaf6541c26a03dc1b36419efef8ae231341b"; }; buildInputs = [ pytest ]; diff --git a/pkgs/development/python-modules/pytraccar/default.nix b/pkgs/development/python-modules/pytraccar/default.nix new file mode 100644 index 0000000000000..dd14bcfaadc0f --- /dev/null +++ b/pkgs/development/python-modules/pytraccar/default.nix @@ -0,0 +1,51 @@ +{ lib +, aiohttp +, aresponses +, buildPythonPackage +, fetchFromGitHub +, pytestCheckHook +, pytest-asyncio +, pythonOlder +}: + +buildPythonPackage rec { + pname = "pytraccar"; + version = "0.10.0"; + format = "setuptools"; + + disabled = pythonOlder "3.8"; + + src = fetchFromGitHub { + owner = "ludeeus"; + repo = pname; + rev = version; + sha256 = "08f7rwvbc1h17lvgv9823ssd3p0vw7yzsg40lbkacgqqiv1hxfzs"; + }; + + propagatedBuildInputs = [ + aiohttp + ]; + + checkInputs = [ + aresponses + pytestCheckHook + pytest-asyncio + ]; + + postPatch = '' + # Upstream doesn't set version in the repo + substituteInPlace setup.py \ + --replace 'version="master",' 'version="${version}",' + ''; + + pythonImportsCheck = [ + "pytraccar" + ]; + + meta = with lib; { + description = "Python library to handle device information from Traccar"; + homepage = "https://github.com/ludeeus/pytraccar"; + license = licenses.mit; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/pkgs/development/python-modules/pyuptimerobot/default.nix b/pkgs/development/python-modules/pyuptimerobot/default.nix new file mode 100644 index 0000000000000..6334c3f64c08f --- /dev/null +++ b/pkgs/development/python-modules/pyuptimerobot/default.nix @@ -0,0 +1,51 @@ +{ lib +, aiohttp +, aresponses +, buildPythonPackage +, fetchFromGitHub +, pytestCheckHook +, pytest-asyncio +, pythonOlder +}: + +buildPythonPackage rec { + pname = "pyuptimerobot"; + version = "21.11.0"; + format = "setuptools"; + + disabled = pythonOlder "3.8"; + + src = fetchFromGitHub { + owner = "ludeeus"; + repo = pname; + rev = version; + sha256 = "1nmmwp9m38b75lz51ypcj0qxnxm9wq4id5cggl0pn2rx6gwnbw9n"; + }; + + propagatedBuildInputs = [ + aiohttp + ]; + + checkInputs = [ + aresponses + pytestCheckHook + pytest-asyncio + ]; + + postPatch = '' + # Upstream doesn't set version in the repo + substituteInPlace setup.py \ + --replace 'version="main",' 'version="${version}",' + ''; + + pythonImportsCheck = [ + "pyuptimerobot" + ]; + + meta = with lib; { + description = "Python API wrapper for Uptime Robot"; + homepage = "https://github.com/ludeeus/pyuptimerobot"; + license = licenses.mit; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/pkgs/development/python-modules/sagemaker/default.nix b/pkgs/development/python-modules/sagemaker/default.nix index 015ba22781a82..ece8af476d876 100644 --- a/pkgs/development/python-modules/sagemaker/default.nix +++ b/pkgs/development/python-modules/sagemaker/default.nix @@ -16,11 +16,11 @@ buildPythonPackage rec { pname = "sagemaker"; - version = "2.63.0"; + version = "2.63.1"; src = fetchPypi { inherit pname version; - sha256 = "b4d793217181f4ff1d269aa22e44f82e21a060ec9723301e1ae5e7d9082c76c8"; + sha256 = "924847e9793b76d188049718aabbcad975296bb267812ad18e0279e7af0cb748"; }; pythonImportsCheck = [ diff --git a/pkgs/development/python-modules/simple_di/default.nix b/pkgs/development/python-modules/simple-di/default.nix index 4977c3a4bf146..4977c3a4bf146 100644 --- a/pkgs/development/python-modules/simple_di/default.nix +++ b/pkgs/development/python-modules/simple-di/default.nix diff --git a/pkgs/development/python-modules/staticjinja/default.nix b/pkgs/development/python-modules/staticjinja/default.nix index bce5316187e77..d0c4d39f11656 100644 --- a/pkgs/development/python-modules/staticjinja/default.nix +++ b/pkgs/development/python-modules/staticjinja/default.nix @@ -16,7 +16,7 @@ buildPythonPackage rec { pname = "staticjinja"; - version = "4.1.0"; + version = "4.1.1"; format = "pyproject"; disabled = pythonOlder "3.6"; @@ -26,7 +26,7 @@ buildPythonPackage rec { owner = "staticjinja"; repo = pname; rev = version; - sha256 = "sha256-4IL+7ncJPd1e7k5oFRjQ6yvDjozcBAAZPf88biNTiLU="; + sha256 = "sha256-Bpgff3VaTylnYpkWoaWEiRWu4sYSP6dLbHDOjAhj7BM="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/streamz/default.nix b/pkgs/development/python-modules/streamz/default.nix index ee96efe5e01f2..bb3e2b68cb144 100644 --- a/pkgs/development/python-modules/streamz/default.nix +++ b/pkgs/development/python-modules/streamz/default.nix @@ -14,6 +14,7 @@ , toolz , tornado , zict +, fetchpatch }: buildPythonPackage rec { @@ -28,6 +29,16 @@ buildPythonPackage rec { sha256 = "sha256-0wZ1ldLFRAIL9R+gLfwsFbL+gvdORAkYWNjnDmeafm8="; }; + patches = [ + # remove with next bump + (fetchpatch { + name = "fix-tests-against-distributed-2021.10.0.patch"; + url = "https://github.com/python-streamz/streamz/commit/5bd3bc4d305ff40c740bc2550c8491be9162778a.patch"; + sha256 = "1xzxcbf7yninkyizrwm3ahqk6ij2fmh0454iqjx2n7mmzx3sazx7"; + includes = ["streamz/tests/test_dask.py"]; + }) + ]; + propagatedBuildInputs = [ networkx six @@ -46,22 +57,23 @@ buildPythonPackage rec { requests ]; + pythonImportsCheck = [ + "streamz" + ]; + disabledTests = [ - # Disable test_tcp_async because fails on sandbox build - "test_partition_timeout" + # test_tcp_async fails on sandbox build "test_tcp_async" "test_tcp" + "test_partition_timeout" + # flaky + "test_from_iterable_backpressure" ]; - disabledTestPaths = [ - # Disable kafka tests + # disable kafka tests "streamz/tests/test_kafka.py" ]; - pythonImportsCheck = [ - "streamz" - ]; - meta = with lib; { description = "Pipelines to manage continuous streams of data"; homepage = "https://github.com/python-streamz/streamz"; diff --git a/pkgs/development/python-modules/swspotify/default.nix b/pkgs/development/python-modules/swspotify/default.nix index 7778c12255584..85cd2ed7c1681 100644 --- a/pkgs/development/python-modules/swspotify/default.nix +++ b/pkgs/development/python-modules/swspotify/default.nix @@ -17,7 +17,7 @@ buildPythonPackage rec { requests flask flask-cors dbus-python ]; - preConfigure = '' + postPatch = '' substituteInPlace setup.py \ --replace 'flask==2.0.1' 'flask' ''; diff --git a/pkgs/development/python-modules/tweepy/default.nix b/pkgs/development/python-modules/tweepy/default.nix index dd11e60aff6ce..ee5c8582948d3 100644 --- a/pkgs/development/python-modules/tweepy/default.nix +++ b/pkgs/development/python-modules/tweepy/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "tweepy"; - version = "3.10.0"; + version = "4.0.1"; src = fetchPypi { inherit pname version; - sha256 = "76e6954b806ca470dda877f57db8792fff06a0beba0ed43efc3805771e39f06a"; + sha256 = "3bbb14a0ddef1ca8c9e8686ab2f647163afa02a6bab83507335ce647e9653a90"; }; doCheck = false; diff --git a/pkgs/development/python-modules/vispy/default.nix b/pkgs/development/python-modules/vispy/default.nix index 666fcd8dbb8d4..c13f7b6d7d3a6 100644 --- a/pkgs/development/python-modules/vispy/default.nix +++ b/pkgs/development/python-modules/vispy/default.nix @@ -16,11 +16,11 @@ buildPythonPackage rec { pname = "vispy"; - version = "0.9.1"; + version = "0.9.3"; src = fetchPypi { inherit pname version; - sha256 = "75e2923792b937fbb0eb817716430613b6a2b37331cffb13bf623913a76b1da1"; + sha256 = "bc3aec042637947d4e999121bab224077a6f7ede4af745102f41737f7c81c05a"; }; patches = [ diff --git a/pkgs/development/python-modules/xarray/default.nix b/pkgs/development/python-modules/xarray/default.nix index ee07adeb9d5bb..602bbac89aec8 100644 --- a/pkgs/development/python-modules/xarray/default.nix +++ b/pkgs/development/python-modules/xarray/default.nix @@ -11,12 +11,12 @@ buildPythonPackage rec { pname = "xarray"; - version = "0.19.0"; + version = "0.20.1"; disabled = !isPy3k; src = fetchPypi { inherit pname version; - sha256 = "3a365ce09127fc841ba88baa63f37ca61376ffe389a6c5e66d52f2c88c23a62b"; + sha256 = "9c0bffd8b55fdef277f8f6c817153eb51fa4e58653a7ad92eaed9984164b7bdb"; }; nativeBuildInputs = [ setuptools-scm ]; diff --git a/pkgs/development/python-modules/zarr/default.nix b/pkgs/development/python-modules/zarr/default.nix index 0a8f13705eb5a..9e5b058212957 100644 --- a/pkgs/development/python-modules/zarr/default.nix +++ b/pkgs/development/python-modules/zarr/default.nix @@ -12,12 +12,12 @@ buildPythonPackage rec { pname = "zarr"; - version = "2.10.1"; + version = "2.10.2"; disabled = isPy27; src = fetchPypi { inherit pname version; - sha256 = "29e90114f037d433752b3cf951e4a3cb6c6f67b6501a273439b4be4a824e4caf"; + sha256 = "5c6ae914ab9215631bb95c09e76b9b9b4fffa70fec0c7bca26b68387d858ebe2"; }; nativeBuildInputs = [ diff --git a/pkgs/development/tools/fortran-language-server/default.nix b/pkgs/development/tools/fortran-language-server/default.nix new file mode 100644 index 0000000000000..2c606ab715b51 --- /dev/null +++ b/pkgs/development/tools/fortran-language-server/default.nix @@ -0,0 +1,21 @@ +{ lib, fetchPypi, buildPythonApplication }: + +buildPythonApplication rec { + pname = "fortran-language-server"; + version = "1.12.0"; + + src = fetchPypi { + inherit pname version; + sha256 = "7Dkh7yPX4rULkzfJFxg47YxrCaxuHk+k3TOINHS9T5A="; + }; + + checkPhase = "$out/bin/fortls --help 1>/dev/null"; + pythonImportsCheck = [ "fortls" ]; + + meta = with lib; { + description = "FORTRAN Language Server for the Language Server Protocol"; + homepage = "https://pypi.org/project/fortran-language-server/"; + license = [ licenses.mit ]; + maintainers = [ maintainers.sheepforce ]; + }; +} diff --git a/pkgs/games/openmw/default.nix b/pkgs/games/openmw/default.nix index cfde63ac72647..edc8147a2b77b 100644 --- a/pkgs/games/openmw/default.nix +++ b/pkgs/games/openmw/default.nix @@ -13,29 +13,46 @@ , unshield , openal , libXt +, lz4 +, recastnavigation }: let - openscenegraph_ = openscenegraph.overrideDerivation (self: { + openscenegraph_openmw = (openscenegraph.override { colladaSupport = true; }) + .overrideDerivation (self: { + src = fetchFromGitHub { + owner = "OpenMW"; + repo = "osg"; + rev = "bbe61c3bc510a4f5bb4aea21cce506519c2d24e6"; + sha256 = "sha256-t3smLqstp7wWfi9HXJoBCek+3acqt/ySBYF8RJOG6Mo="; + }; + }); + + bullet_openmw = bullet.overrideDerivation (old: rec { + version = "3.17"; src = fetchFromGitHub { - owner = "OpenMW"; - repo = "osg"; - # commit does not exist on any branch on the target repository - rev = "1556cd7966ebc1c80b6626988d2b25fb43a744cf"; - sha256 = "0d74hijzmj82nx3jkv5qmr3pkgvplra0b8fbjx1y3vmzxamb0axd"; + owner = "bulletphysics"; + repo = "bullet3"; + rev = version; + sha256 = "sha256-uQ4X8F8nmagbcFh0KexrmnhHIXFSB3A1CCnjPVeHL3Q="; }; + patches = []; + cmakeFlags = (old.cmakeFlags or []) ++ [ + "-DUSE_DOUBLE_PRECISION=ON" + "-DBULLET2_MULTITHREADING=ON" + ]; }); in mkDerivation rec { - version = "0.46.0"; pname = "openmw"; + version = "0.47.0"; src = fetchFromGitHub { owner = "OpenMW"; repo = "openmw"; rev = "${pname}-${version}"; - sha256 = "0rm32zsmxvr6b0jjihfj543skhicbw5kg6shjx312clhlm035w2x"; + sha256 = "sha256-Xq9hDUTCQr79Zzjk0CsiXclVTHK6nrSowukIQqVdrKY="; }; nativeBuildInputs = [ cmake pkg-config wrapQtAppsHook ]; @@ -43,26 +60,28 @@ mkDerivation rec { buildInputs = [ SDL2 boost - bullet + bullet_openmw ffmpeg libXt mygui openal - openscenegraph_ + openscenegraph_openmw unshield + lz4 + recastnavigation ]; cmakeFlags = [ - "-DDESIRED_QT_VERSION:INT=5" # as of 0.46, openmw is broken with GLVND "-DOpenGL_GL_PREFERENCE=LEGACY" + "-DOPENMW_USE_SYSTEM_RECASTNAVIGATION=1" ]; meta = with lib; { description = "An unofficial open source engine reimplementation of the game Morrowind"; - homepage = "http://openmw.org"; + homepage = "https://openmw.org"; license = licenses.gpl3Plus; - maintainers = with maintainers; [ abbradar ]; + maintainers = with maintainers; [ abbradar marius851000 ]; platforms = platforms.linux; }; } diff --git a/pkgs/games/openmw/tes3mp.nix b/pkgs/games/openmw/tes3mp.nix index 72b698ceb7301..37ad603d7cf53 100644 --- a/pkgs/games/openmw/tes3mp.nix +++ b/pkgs/games/openmw/tes3mp.nix @@ -9,6 +9,7 @@ , symlinkJoin , mygui , crudini +, bullet }: # revisions are taken from https://github.com/GrimKriegor/TES3MP-deploy @@ -70,7 +71,8 @@ let nativeBuildInputs = oldAttrs.nativeBuildInputs ++ [ makeWrapper ]; - buildInputs = oldAttrs.buildInputs ++ [ luajit ]; + buildInputs = (builtins.map (x: if x.pname or "" == "bullet" then bullet else x) oldAttrs.buildInputs) + ++ [ luajit ]; cmakeFlags = oldAttrs.cmakeFlags ++ [ "-DBUILD_OPENCS=OFF" @@ -79,6 +81,11 @@ let "-DRakNet_LIBRARY_DEBUG=${raknet}/lib/libRakNetLibStatic.a" ]; + prePatch = '' + substituteInPlace components/process/processinvoker.cpp \ + --replace "\"./\"" "\"$out/bin/\"" + ''; + # https://github.com/TES3MP/openmw-tes3mp/issues/552 patches = [ ./tes3mp.patch ]; diff --git a/pkgs/games/portmod/default.nix b/pkgs/games/portmod/default.nix index b677c63defeb5..27e00a746486c 100644 --- a/pkgs/games/portmod/default.nix +++ b/pkgs/games/portmod/default.nix @@ -1,22 +1,22 @@ -{ lib, callPackage, python3Packages, fetchFromGitLab, cacert, - rustPlatform, bubblewrap, git, perlPackages, imagemagick, fetchurl, fetchzip, - jre, makeWrapper, tr-patcher, tes3cmd, fetchpatch }: +{ lib, callPackage, python3Packages, fetchFromGitLab, cacert +, rustPlatform, bubblewrap, git, perlPackages, imagemagick, fetchurl, fetchzip +, jre, makeWrapper, tr-patcher, tes3cmd, openmw }: let - version = "2.0.3"; + version = "2.1.0"; src = fetchFromGitLab { owner = "portmod"; repo = "Portmod"; rev = "v${version}"; - sha256 = "sha256-vMdyaI1Ps7bFoRvwdVNVG9vPFEiGb7CPvKEWfxiM128="; + sha256 = "sha256-b/ENApFovMPNUMbJhwY+TZCnSzpr1e/IKJ/5XAGTQjE="; }; portmod-rust = rustPlatform.buildRustPackage rec { inherit src version; pname = "portmod-rust"; - cargoHash = "sha256-tAghZmlg34jHr8gtNgL3MQ8EI7K6/TfDcTbBjxdWLr0="; + cargoHash = "sha256-3EfMMpSWSYsB3nXaoGGDuKQ9duyCKzbrT6oeATnzqLE="; nativeBuildInputs = [ python3Packages.python ]; @@ -30,6 +30,7 @@ let tr-patcher tes3cmd imagemagick + openmw ]; in @@ -47,15 +48,6 @@ python3Packages.buildPythonApplication rec { --replace "RustExtension(\"portmodlib.portmod\", binding=Binding.PyO3, strip=True)" "" ''; - patches = [ - (fetchpatch { - # fix error when symlinks are present in the path (https://gitlab.com/portmod/portmod/-/merge_requests/393) - # happen with ~/.nix-profile - url = "https://gitlab.com/portmod/portmod/-/merge_requests/393.patch"; - sha256 = "sha256-XHifwD/Nh7UiMZdvSNudVF7qpBOpjGTKSr4VVdJqUdA="; - }) - ]; - propagatedBuildInputs = with python3Packages; [ setuptools-scm setuptools diff --git a/pkgs/games/quake2/yquake2/default.nix b/pkgs/games/quake2/yquake2/default.nix index 57405d9abd389..d251c48d38231 100644 --- a/pkgs/games/quake2/yquake2/default.nix +++ b/pkgs/games/quake2/yquake2/default.nix @@ -15,15 +15,20 @@ let yquake2 = stdenv.mkDerivation rec { pname = "yquake2"; - version = "7.43"; + version = "8.00"; src = fetchFromGitHub { owner = "yquake2"; repo = "yquake2"; rev = "QUAKE2_${builtins.replaceStrings ["."] ["_"] version}"; - sha256 = "1dszbvxlh1npq4nv9s4wv4lcyfgb01k92ncxrrczsxy1dddg86pp"; + sha256 = "0xnpmh0pl1095dykhc76rp242x587yh9zh6wayqzaam6cn3xlz3w"; }; + postPatch = '' + substituteInPlace src/common/filesystem.c \ + --replace /usr/share/games/quake2 $out/share/games/quake2 + ''; + nativeBuildInputs = [ cmake ]; buildInputs = [ SDL2 libGL curl ] diff --git a/pkgs/misc/vim-plugins/generated.nix b/pkgs/misc/vim-plugins/generated.nix index 6bb4eba7fb4f4..a2bbd5299c056 100644 --- a/pkgs/misc/vim-plugins/generated.nix +++ b/pkgs/misc/vim-plugins/generated.nix @@ -77,12 +77,12 @@ final: prev: ale = buildVimPluginFrom2Nix { pname = "ale"; - version = "2021-11-04"; + version = "2021-11-09"; src = fetchFromGitHub { owner = "dense-analysis"; repo = "ale"; - rev = "f37cd1fd4fc17173a98649d8a0b2f37ce7ba61cf"; - sha256 = "17p8bbqqsjw17b50p8pxrv30mf8n6495gwzvlfpj51yz2vvk66wv"; + rev = "8b3b16d71c4c683da6f3ca39662d207a3e894901"; + sha256 = "1mdxgiin61630fimxm2l0zcr30br4q2ipp84l3iqxjbs0fqg11s5"; }; meta.homepage = "https://github.com/dense-analysis/ale/"; }; @@ -113,12 +113,12 @@ final: prev: ansible-vim = buildVimPluginFrom2Nix { pname = "ansible-vim"; - version = "2021-10-07"; + version = "2021-11-08"; src = fetchFromGitHub { owner = "pearofducks"; repo = "ansible-vim"; - rev = "c84f8bb203c49d9da28e4ea7a32d951ccde1d40f"; - sha256 = "1ii58rvc8mvv33kbfnn7b66mpf08hn3vm2swjgaaw4dwvzffzi71"; + rev = "469e55b101d85ff82687d975349b356b362194a6"; + sha256 = "0z2iqb974drs0nc3cxk32z5xlbdl8bgbsc8564sz13ayqbdms4nk"; }; meta.homepage = "https://github.com/pearofducks/ansible-vim/"; }; @@ -461,12 +461,12 @@ final: prev: chadtree = buildVimPluginFrom2Nix { pname = "chadtree"; - version = "2021-11-07"; + version = "2021-11-11"; src = fetchFromGitHub { owner = "ms-jpq"; repo = "chadtree"; - rev = "4b8ec3650ae41bb70128baacd68684ad212520de"; - sha256 = "1cjw98nfzz8a9za7cs2jy3i164qaj2fyrsfpg28f7f1b087n24p3"; + rev = "8bf4553d1000b2c9189f1893ac5c737b61572791"; + sha256 = "1jk795a6r8yzbjbyx121qn65njs4j3l947x3n937kygqpb7paflm"; }; meta.homepage = "https://github.com/ms-jpq/chadtree/"; }; @@ -569,12 +569,12 @@ final: prev: cmp-buffer = buildVimPluginFrom2Nix { pname = "cmp-buffer"; - version = "2021-11-02"; + version = "2021-11-10"; src = fetchFromGitHub { owner = "hrsh7th"; repo = "cmp-buffer"; - rev = "d1ca295ce584ec80763a6dc043080874b57ccffc"; - sha256 = "1s8b4wc7as9v8iqk03aagjpxkkghn0wzf15nj4ljpi3k3w5hxiw0"; + rev = "2d85e76c725a389b72067f86fc3c65f3868b9a59"; + sha256 = "0lvx58nchrl08jjp2gvyfrxkqdqnyi97zj86nnx184vnx8a5qcqh"; }; meta.homepage = "https://github.com/hrsh7th/cmp-buffer/"; }; @@ -591,6 +591,18 @@ final: prev: meta.homepage = "https://github.com/hrsh7th/cmp-calc/"; }; + cmp-cmdline = buildVimPluginFrom2Nix { + pname = "cmp-cmdline"; + version = "2021-11-08"; + src = fetchFromGitHub { + owner = "hrsh7th"; + repo = "cmp-cmdline"; + rev = "0ca73c3a50b72c2ca168d8904b39aba34d0c4227"; + sha256 = "1777rv9mh3bar8lp5i4af7kip5j3s4ib8a83b67clga8pcdjla4d"; + }; + meta.homepage = "https://github.com/hrsh7th/cmp-cmdline/"; + }; + cmp-conjure = buildVimPluginFrom2Nix { pname = "cmp-conjure"; version = "2021-10-09"; @@ -629,16 +641,28 @@ final: prev: cmp-nvim-lsp = buildVimPluginFrom2Nix { pname = "cmp-nvim-lsp"; - version = "2021-10-17"; + version = "2021-11-10"; src = fetchFromGitHub { owner = "hrsh7th"; repo = "cmp-nvim-lsp"; - rev = "accbe6d97548d8d3471c04d512d36fa61d0e4be8"; - sha256 = "1dqx6yrd60x9ncjnpja87wv5zgnij7qmzbyh5xfyslk67c0i6mwm"; + rev = "134117299ff9e34adde30a735cd8ca9cf8f3db81"; + sha256 = "1jnspl08ilz9ggkdddk0saxp3wzf05lll5msdfb4770q3bixddwc"; }; meta.homepage = "https://github.com/hrsh7th/cmp-nvim-lsp/"; }; + cmp-nvim-lsp-document-symbol = buildVimPluginFrom2Nix { + pname = "cmp-nvim-lsp-document-symbol"; + version = "2021-10-28"; + src = fetchFromGitHub { + owner = "hrsh7th"; + repo = "cmp-nvim-lsp-document-symbol"; + rev = "29d12e55cf49ee07b829114ad39b161cad2544ab"; + sha256 = "0w4m34467j3cg4dj69r12115p5k1i2lbjzmwx5hmd5x6xzb5qycb"; + }; + meta.homepage = "https://github.com/hrsh7th/cmp-nvim-lsp-document-symbol/"; + }; + cmp-nvim-lua = buildVimPluginFrom2Nix { pname = "cmp-nvim-lua"; version = "2021-10-11"; @@ -677,12 +701,12 @@ final: prev: cmp-path = buildVimPluginFrom2Nix { pname = "cmp-path"; - version = "2021-10-27"; + version = "2021-11-10"; src = fetchFromGitHub { owner = "hrsh7th"; repo = "cmp-path"; - rev = "97661b00232a2fe145fe48e295875bc3299ed1f7"; - sha256 = "160jidd951qz1byjhbmd7ijp6hd37bdxbpg5wmzhprihwwpm628j"; + rev = "98ded32b9c4d95aa95af70b9979b767f39073f0e"; + sha256 = "1axx401sikh9ylji3d6cmgn4xsrzzfmlc1akfv1q709chv0a6r2h"; }; meta.homepage = "https://github.com/hrsh7th/cmp-path/"; }; @@ -725,24 +749,24 @@ final: prev: cmp-under-comparator = buildVimPluginFrom2Nix { pname = "cmp-under-comparator"; - version = "2021-10-22"; + version = "2021-11-11"; src = fetchFromGitHub { owner = "lukas-reineke"; repo = "cmp-under-comparator"; - rev = "69e88636a3f7a1630a6e1199b4039a5f110caf81"; - sha256 = "1af4l8vf66sz4vhyzlnkrg0hpwx2f7096g9rszralxq0nad1i12d"; + rev = "6857f10272c3cfe930cece2afa2406e1385bfef8"; + sha256 = "18kcxl9rg6qrg5wv6bb0hv0sjafspjhy57irf8gyaa66svwmgxmh"; }; meta.homepage = "https://github.com/lukas-reineke/cmp-under-comparator/"; }; cmp-vsnip = buildVimPluginFrom2Nix { pname = "cmp-vsnip"; - version = "2021-08-25"; + version = "2021-11-10"; src = fetchFromGitHub { owner = "hrsh7th"; repo = "cmp-vsnip"; - rev = "1588c35bf8f637e8f5287477f31895781858f970"; - sha256 = "0q3z0f7d53cbqidx8qd3z48b46a83l5ay54iw525w22j1kki3aaw"; + rev = "0abfa1860f5e095a07c477da940cfcb0d273b700"; + sha256 = "1vhw2qx8284bskivc2jyijl93g1b1z9hzzbq2l9b4aw6r23frbgc"; }; meta.homepage = "https://github.com/hrsh7th/cmp-vsnip/"; }; @@ -797,12 +821,12 @@ final: prev: coc-lua = buildVimPluginFrom2Nix { pname = "coc-lua"; - version = "2021-11-03"; + version = "2021-11-09"; src = fetchFromGitHub { owner = "josa42"; repo = "coc-lua"; - rev = "504f93819b47fd278e954608cace5c6530fdf397"; - sha256 = "1vfbciy34bvyfyl0vpyw7m2nj586cpvm2pin5c6iy5qmr92pgw60"; + rev = "9672c9cde3cce32720fafbdb65618d817b7022d8"; + sha256 = "1y35xqzd17c8cvlrqfa10lninql2xkkkgy40wl1bwfzl5awk9rm7"; }; meta.homepage = "https://github.com/josa42/coc-lua/"; }; @@ -1134,12 +1158,12 @@ final: prev: crates-nvim = buildVimPluginFrom2Nix { pname = "crates.nvim"; - version = "2021-11-02"; + version = "2021-11-10"; src = fetchFromGitHub { owner = "saecki"; repo = "crates.nvim"; - rev = "b3636f8199df988bedeb029f55a91cd17633523e"; - sha256 = "0jqbanfgh3l89i0frrnjyh47kyvhv3nfk3jgrswwzgn6b0w4cj6n"; + rev = "0b17e2bb069cb388ba22d156bbe1b3b3b3585312"; + sha256 = "1d7gssvw2sl1girj8svbdzlrhxsjgp9rkfkjrr2jd7p5ilhry27a"; }; meta.homepage = "https://github.com/saecki/crates.nvim/"; }; @@ -1676,12 +1700,12 @@ final: prev: edge = buildVimPluginFrom2Nix { pname = "edge"; - version = "2021-11-05"; + version = "2021-11-11"; src = fetchFromGitHub { owner = "sainnhe"; repo = "edge"; - rev = "dac55912be3642a954ef0891b63a3f4cb1db5ce4"; - sha256 = "1w7a72jfwqf81rkwsnq70ar0hsnjjlkyxqxb3vg9yfcd5fki4920"; + rev = "f2c8e3d2a72f3763e3ea9c620a118e73e2146fb1"; + sha256 = "08v10j0hirqcj2r2fcw8b04v8bpwj1kp887pq8vs5f57ncqzl8x7"; }; meta.homepage = "https://github.com/sainnhe/edge/"; }; @@ -1858,12 +1882,12 @@ final: prev: fern-vim = buildVimPluginFrom2Nix { pname = "fern.vim"; - version = "2021-10-24"; + version = "2021-11-11"; src = fetchFromGitHub { owner = "lambdalisue"; repo = "fern.vim"; - rev = "338c7190a535cc5cf82e9d7443964b2e4f8bf97f"; - sha256 = "1d74k0mgf8axsnksq5dh3zlangabwdx7vwfi05wx0q7vkxm545d4"; + rev = "dd365ec17e9ff1d87a5ce4ade8abf123ecfd007a"; + sha256 = "0s5gygvbz9ffnaxaikqj8mi16ip1gqxa19ijvjsjc8rv6jpkylsd"; }; meta.homepage = "https://github.com/lambdalisue/fern.vim/"; }; @@ -1979,12 +2003,12 @@ final: prev: friendly-snippets = buildVimPluginFrom2Nix { pname = "friendly-snippets"; - version = "2021-11-07"; + version = "2021-11-10"; src = fetchFromGitHub { owner = "rafamadriz"; repo = "friendly-snippets"; - rev = "242c4a021d5655a5e86508f1cb3c08977d0acbe4"; - sha256 = "1rlq22ypl44ajjb5597braks6hn6qmf6ss0kh5vrvv6p9p1fy1dy"; + rev = "7d4a4c4e57b7aabb9e7d1f591c29e6d5e7e382e4"; + sha256 = "19z6yjdd7q9hydzx3bw2w8c573y0xjn9s7n780w65n34iirjbh7i"; }; meta.homepage = "https://github.com/rafamadriz/friendly-snippets/"; }; @@ -2051,12 +2075,12 @@ final: prev: fzf-lsp-nvim = buildVimPluginFrom2Nix { pname = "fzf-lsp.nvim"; - version = "2021-10-21"; + version = "2021-11-07"; src = fetchFromGitHub { owner = "gfanto"; repo = "fzf-lsp.nvim"; - rev = "34bddd8a31441435f1d29eef0452576d12144da7"; - sha256 = "1ijqnqmdlm2f3jkjh68baif05lf27rww43vvndix2icypnd16vcp"; + rev = "19a6f405e4a6eb74788393390d945bd156d559b3"; + sha256 = "0nq9nfviyly136xhjzdvmhvj7flz44pl5as0npa4d13ng3gs451p"; }; meta.homepage = "https://github.com/gfanto/fzf-lsp.nvim/"; }; @@ -2171,12 +2195,12 @@ final: prev: git-worktree-nvim = buildVimPluginFrom2Nix { pname = "git-worktree.nvim"; - version = "2021-08-24"; + version = "2021-11-09"; src = fetchFromGitHub { owner = "ThePrimeagen"; repo = "git-worktree.nvim"; - rev = "e562d8a3baa6c96d148944592a2d7c88f48927f2"; - sha256 = "1c78pjycvnkq28ar7bp0xiadyd3jml596hsw0fsxvbdwba4a7ikk"; + rev = "14d4be5f9db5c5cce7b4c1ee10c70d663c367373"; + sha256 = "11gzz2dc75b0sqkkxsiw9yramfwhcrv4vq39mxlzmxxzbzk11dv2"; }; meta.homepage = "https://github.com/ThePrimeagen/git-worktree.nvim/"; }; @@ -2207,12 +2231,12 @@ final: prev: gitsigns-nvim = buildVimPluginFrom2Nix { pname = "gitsigns.nvim"; - version = "2021-11-04"; + version = "2021-11-11"; src = fetchFromGitHub { owner = "lewis6991"; repo = "gitsigns.nvim"; - rev = "61a81b0c003de3e12555a5626d66fb6a060d8aca"; - sha256 = "0ya0vgwlmy2mpkgqhz0lyxh19iwilm5vwvk4c9ygsxwq3561vfcw"; + rev = "e6775fa32e4904cc8bbd098ba9807db9606e816e"; + sha256 = "1w7vq9jbw3lhd8i9wbf71q344235iwcigff7jrrh3fbcq6kk7m12"; }; meta.homepage = "https://github.com/lewis6991/gitsigns.nvim/"; }; @@ -2279,12 +2303,12 @@ final: prev: goto-preview = buildVimPluginFrom2Nix { pname = "goto-preview"; - version = "2021-10-31"; + version = "2021-11-09"; src = fetchFromGitHub { owner = "rmagatti"; repo = "goto-preview"; - rev = "bde83cdac0c99a82c010c29f9e00ad488f9e035f"; - sha256 = "0vql6whiijfaglrkn0byrgkqm78rprhbbxajwh51iw80kqkm5ic0"; + rev = "b930629c018c6b30d42e8d271a32a37e0360c628"; + sha256 = "0mly30sqbs43xmkda04jzk4knxcv7f42sddm87ky6j8ii67147ys"; }; meta.homepage = "https://github.com/rmagatti/goto-preview/"; }; @@ -2339,12 +2363,12 @@ final: prev: gruvbox-material = buildVimPluginFrom2Nix { pname = "gruvbox-material"; - version = "2021-11-05"; + version = "2021-11-11"; src = fetchFromGitHub { owner = "sainnhe"; repo = "gruvbox-material"; - rev = "0eaf2c5f1e4c2e274b6983c5178d66522e312468"; - sha256 = "0yfal45w1lf02wpws8ha3rka7n9c694z7wjya9ilpnm6xg20d0y4"; + rev = "a25c5294013d58e4fde6b72d94a5f77e3330f0cc"; + sha256 = "0k4baphl8x6fy8hqidr7g8mw6w1cjhwsgjmsd9v72a9ikl4z22vq"; }; meta.homepage = "https://github.com/sainnhe/gruvbox-material/"; }; @@ -2579,12 +2603,12 @@ final: prev: indent-blankline-nvim = buildVimPluginFrom2Nix { pname = "indent-blankline.nvim"; - version = "2021-11-07"; + version = "2021-11-08"; src = fetchFromGitHub { owner = "lukas-reineke"; repo = "indent-blankline.nvim"; - rev = "9dab64554c6249eb31a0bf3e689e0d36d6998fb8"; - sha256 = "0jva20qh2mc9vd12wfbw3ngvx2745vvmn0qkz9lnrk2xkwy31dby"; + rev = "bc8372815506066f3ca7885baca717cb986957be"; + sha256 = "0svhinr5qmhcskvakl71yykzxhm6m0ydymx7dp5w0jwsdcv9nnrx"; }; meta.homepage = "https://github.com/lukas-reineke/indent-blankline.nvim/"; }; @@ -2784,12 +2808,12 @@ final: prev: kotlin-vim = buildVimPluginFrom2Nix { pname = "kotlin-vim"; - version = "2021-11-07"; + version = "2021-11-08"; src = fetchFromGitHub { owner = "udalov"; repo = "kotlin-vim"; - rev = "e2fd6fbe98a85be28e75fe9c7cc341cfbba3ac23"; - sha256 = "1iv45znmija86jly2hm08s5bsi53kphdziwgknsz5l2va93vx34z"; + rev = "6fec676fe552cb30165dc8977dab9353c4c3ab26"; + sha256 = "08sz0fmlk4bzzkg5j0zbjd1dki1ykigar4rzyc05xfynvkcxh4fg"; }; meta.homepage = "https://github.com/udalov/kotlin-vim/"; }; @@ -2880,12 +2904,12 @@ final: prev: lean-nvim = buildVimPluginFrom2Nix { pname = "lean.nvim"; - version = "2021-11-07"; + version = "2021-11-11"; src = fetchFromGitHub { owner = "Julian"; repo = "lean.nvim"; - rev = "f0fca2a67d06949ee7550d1525aca50107c6a3b7"; - sha256 = "0yw9k6mdbjhzgcdr9z2gyazcz200v8c66vfxmk9z0lhr7jrvby1a"; + rev = "27a9bba67bc9114ba9a6f48686ac983f301dd4be"; + sha256 = "1vcd1i2w9vnkmlhan62s0raa8gigxpdyyzqvn2qqv1rifxzigpfw"; }; meta.homepage = "https://github.com/Julian/lean.nvim/"; }; @@ -2928,28 +2952,16 @@ final: prev: lexima-vim = buildVimPluginFrom2Nix { pname = "lexima.vim"; - version = "2021-08-12"; + version = "2021-11-11"; src = fetchFromGitHub { owner = "cohama"; repo = "lexima.vim"; - rev = "6b716e2118d842a26620387f0845e57cfd69ffaf"; - sha256 = "1az40rjfyvwg9zkk822abrf0v0ccm29rp5290capirnfna5w71d6"; + rev = "99ece6758ec49b04de983873e4117a390121fbb8"; + sha256 = "00sjngkscry6ln9d94w9b2466d1y2prxivaxn8hqxpng1wyhhlay"; }; meta.homepage = "https://github.com/cohama/lexima.vim/"; }; - lingua-franca-vim = buildVimPluginFrom2Nix { - pname = "lingua-franca"; - version = "2021-9-5"; - src = fetchFromGitHub { - owner = "lf-lang"; - repo = "lingua-franca.vim"; - rev = "439b92a13744ee21cb3cd9c399e179efbcaa2967"; - sha256 = "sha256-Bf2MabUe3fy0meL6zIYgal/yFxtLKsg3b/BUI/AVlrM="; - }; - meta.homepage = "https://github.com/lf-lang/lingua-franca.vim"; - }; - lf-vim = buildVimPluginFrom2Nix { pname = "lf.vim"; version = "2021-02-18"; @@ -3036,12 +3048,12 @@ final: prev: lightspeed-nvim = buildVimPluginFrom2Nix { pname = "lightspeed.nvim"; - version = "2021-11-05"; + version = "2021-11-11"; src = fetchFromGitHub { owner = "ggandor"; repo = "lightspeed.nvim"; - rev = "3f833700b1d39c6cdfd32b9be27078e8bc37fc2f"; - sha256 = "0w1zb8pz3bgn19lfvz3ig35vmn5d4m65cmrhhgcnyjgi7z83p05f"; + rev = "6429028c58a2a64916cb9132743e5301af460c1c"; + sha256 = "0qhx7axm5vg1xh5j2mg0x3l7154f4n55k28pajrak4yw7ws82232"; }; meta.homepage = "https://github.com/ggandor/lightspeed.nvim/"; }; @@ -3058,6 +3070,18 @@ final: prev: meta.homepage = "https://github.com/junegunn/limelight.vim/"; }; + lingua-franca-vim = buildVimPluginFrom2Nix { + pname = "lingua-franca.vim"; + version = "2021-09-05"; + src = fetchFromGitHub { + owner = "lf-lang"; + repo = "lingua-franca.vim"; + rev = "439b92a13744ee21cb3cd9c399e179efbcaa2967"; + sha256 = "1cwn2pq26m7hdwvwhajb3cbz4pva423cryp2k6sgrp8ynmlqrz85"; + }; + meta.homepage = "https://github.com/lf-lang/lingua-franca.vim/"; + }; + lir-nvim = buildVimPluginFrom2Nix { pname = "lir.nvim"; version = "2021-11-03"; @@ -3180,24 +3204,24 @@ final: prev: lualine-nvim = buildVimPluginFrom2Nix { pname = "lualine.nvim"; - version = "2021-11-05"; + version = "2021-11-11"; src = fetchFromGitHub { owner = "nvim-lualine"; repo = "lualine.nvim"; - rev = "3f5cdc51a08c437c7705e283eebd4cf9fbb18f80"; - sha256 = "15vvz7a89lj101gcpykws45kgsai5dqbcqnkflvx87ivcxs0iz97"; + rev = "df46c1e70a0aeb234aa9d2048d14f626a1cca317"; + sha256 = "0khkkicwcnrwpd9scdsggia916ws6hvpyx0gnszg43zq74q5h27q"; }; meta.homepage = "https://github.com/nvim-lualine/lualine.nvim/"; }; luasnip = buildVimPluginFrom2Nix { pname = "luasnip"; - version = "2021-11-06"; + version = "2021-11-09"; src = fetchFromGitHub { owner = "l3mon4d3"; repo = "luasnip"; - rev = "bab7cc2c32fba00776d2f2fc4704bed4eee2d082"; - sha256 = "1z1a35rpil7f5yk0al7r7k1kxpvf4x9kzpsb4s0v0c6mh8zmc5aw"; + rev = "366fd76ea226bed11966cd8b1a229cba08fa4394"; + sha256 = "17jla5yvi0vzgi0himl8fyfmc8sl8xg1k5bzl58iq0d2ycmr08as"; }; meta.homepage = "https://github.com/l3mon4d3/luasnip/"; }; @@ -3240,12 +3264,12 @@ final: prev: marks-nvim = buildVimPluginFrom2Nix { pname = "marks.nvim"; - version = "2021-10-31"; + version = "2021-11-07"; src = fetchFromGitHub { owner = "chentau"; repo = "marks.nvim"; - rev = "17e7f468d7128c4c2f6ccf334d136be5f712464d"; - sha256 = "1a4jm8wm0lqx16ic991xzvwqyys9cspj15bqnphw05gc2w14qz02"; + rev = "f43e349601b439b4b07bec1d996cfd70d48d09fb"; + sha256 = "0xnrklam85yva82ncfbpymhs8wa0g9vcks4dzdpvnj8f21la1f3d"; }; meta.homepage = "https://github.com/chentau/marks.nvim/"; }; @@ -3624,24 +3648,24 @@ final: prev: neoformat = buildVimPluginFrom2Nix { pname = "neoformat"; - version = "2021-10-30"; + version = "2021-11-09"; src = fetchFromGitHub { owner = "sbdchd"; repo = "neoformat"; - rev = "6b28df63eed20a57af131ba320646395c77a676c"; - sha256 = "1bcnlw2za6ig6hj0zcqbas6pphs2i6zgqyvf2cakk37pjdxc2gv1"; + rev = "f1b6cd506b72be0a2aaf529105320ec929683920"; + sha256 = "0idj1l5962vfzqhksifxi4qa8d2w8mnhdqa2z5wwpphjiparfqrg"; }; meta.homepage = "https://github.com/sbdchd/neoformat/"; }; neogit = buildVimPluginFrom2Nix { pname = "neogit"; - version = "2021-11-02"; + version = "2021-11-09"; src = fetchFromGitHub { owner = "TimUntersberger"; repo = "neogit"; - rev = "85f2bdc31afb132c9603879bf3a7169a917eb949"; - sha256 = "1whcav7n49nrqvll1hdwr3bb25ls0ih7j49jwrjx1x4hpix2zrpl"; + rev = "807e4a795dc6c2383b281fc27bd1bc6c197d98cd"; + sha256 = "126kdn9dfvk0ggzh00439zwrq1jldnxvk0nsf7g371qkbbnc4qal"; }; meta.homepage = "https://github.com/TimUntersberger/neogit/"; }; @@ -3852,12 +3876,12 @@ final: prev: neuron-nvim = buildVimPluginFrom2Nix { pname = "neuron.nvim"; - version = "2021-10-18"; + version = "2021-11-08"; src = fetchFromGitHub { owner = "oberblastmeister"; repo = "neuron.nvim"; - rev = "10b189437c3e080502ca14ed0e7bc041274e0610"; - sha256 = "11p6n33c642z6q89j2a71czffp3d3mzhp9mdygw2gadar9g4fvl8"; + rev = "a7280d4923f51c8af8cecc53aa06ed49cbbd412d"; + sha256 = "0qanc7r9z5ry3xxbvpv9xbmxnx0f8yj10fi887yhrcms7kj73al9"; }; meta.homepage = "https://github.com/oberblastmeister/neuron.nvim/"; }; @@ -3900,12 +3924,12 @@ final: prev: nim-vim = buildVimPluginFrom2Nix { pname = "nim.vim"; - version = "2020-10-16"; + version = "2021-11-11"; src = fetchFromGitHub { owner = "zah"; repo = "nim.vim"; - rev = "7a8737a4532239c06116ebde0329d8156f3d3b55"; - sha256 = "05xhac416c8zsgqlchc80f7gbjxbyngi6cxziqagdhr6kccc73gi"; + rev = "a15714fea392b0f06ff2b282921a68c7033e39a2"; + sha256 = "1vf3af8b85rjsccvclkb6aw9zgkwfpxd43jgnkbx6wrsv9bfz034"; }; meta.homepage = "https://github.com/zah/nim.vim/"; }; @@ -3972,36 +3996,36 @@ final: prev: nterm-nvim = buildVimPluginFrom2Nix { pname = "nterm.nvim"; - version = "2021-11-05"; + version = "2021-11-10"; src = fetchFromGitHub { owner = "jlesquembre"; repo = "nterm.nvim"; - rev = "992cb567250cbf59d1465eb7371f9c6c75a13fb0"; - sha256 = "0d7fww3bv8fcl4wy29laa2drlhr6a7b29xlcfm5mxxdyyaxa1f3c"; + rev = "14d16c83aa1d165724f7780f470c4dcde5addcb6"; + sha256 = "0y883fpjfk7lki8nfscxhfw0wr7xm1d22zgf52zqmc9pjznjz9my"; }; meta.homepage = "https://github.com/jlesquembre/nterm.nvim/"; }; nui-nvim = buildVimPluginFrom2Nix { pname = "nui.nvim"; - version = "2021-10-30"; + version = "2021-11-11"; src = fetchFromGitHub { owner = "MunifTanjim"; repo = "nui.nvim"; - rev = "362585d6515805d4be4eb665cf8707759a92a254"; - sha256 = "0gzanzyn7fa0qmngrqzlflzzyjzqkn21nhwbgw48hd0x143p0fab"; + rev = "a07b754552008012f2d7d3602b7a233a29d92c66"; + sha256 = "19ffxpmq82f9qxbnb2lw2hvc9gqc1vfyvf553wpc439rpi98mxja"; }; meta.homepage = "https://github.com/MunifTanjim/nui.nvim/"; }; null-ls-nvim = buildVimPluginFrom2Nix { pname = "null-ls.nvim"; - version = "2021-11-04"; + version = "2021-11-11"; src = fetchFromGitHub { owner = "jose-elias-alvarez"; repo = "null-ls.nvim"; - rev = "64b269b51c7490660dcb2008f59ae260f2cdbbe4"; - sha256 = "1vp5y8cd3ljhshg2hrisbgxxb1zz5xqqxldngv3ll98pd98f9yjy"; + rev = "2bf885dda0ecb669ef66d1c757287c98f6c16500"; + sha256 = "1303gpdr5yzxznx0djn5q09p1vibh15d0nmj1j6n2zqbjdx6bhfw"; }; meta.homepage = "https://github.com/jose-elias-alvarez/null-ls.nvim/"; }; @@ -4044,12 +4068,12 @@ final: prev: nvim-autopairs = buildVimPluginFrom2Nix { pname = "nvim-autopairs"; - version = "2021-11-07"; + version = "2021-11-09"; src = fetchFromGitHub { owner = "windwp"; repo = "nvim-autopairs"; - rev = "01f3a9f72fe36d4ca036d0e9c5cd6c506f4394ce"; - sha256 = "092f6kj5b3jd4y65kmh3z4vq844mvv21msjgmlr453b5gqnkqdwr"; + rev = "f4f1c9f27d8514885cd851b3ae0a648e1eb15a17"; + sha256 = "0ipb2pvkc28zp5pdb5ih5rcnzj4wkwg5i59lb3ll4cv0yj398kr9"; }; meta.homepage = "https://github.com/windwp/nvim-autopairs/"; }; @@ -4104,12 +4128,12 @@ final: prev: nvim-cmp = buildVimPluginFrom2Nix { pname = "nvim-cmp"; - version = "2021-11-05"; + version = "2021-11-11"; src = fetchFromGitHub { owner = "hrsh7th"; repo = "nvim-cmp"; - rev = "1774ff0f842146521c63707245d3de5db2bb3732"; - sha256 = "1gj21q15s61l6afxrvh49cvm7wn4b7chhsrs4355j7ldmsr88dk7"; + rev = "af06bd4b440c4da6b363ec2c3feb49bc0cda5510"; + sha256 = "0ckvm3kggnfqv4ngaxpl4zikbs2pwbqgy5x9fqzrdj2vydfm85wp"; }; meta.homepage = "https://github.com/hrsh7th/nvim-cmp/"; }; @@ -4236,12 +4260,12 @@ final: prev: nvim-gps = buildVimPluginFrom2Nix { pname = "nvim-gps"; - version = "2021-11-05"; + version = "2021-11-10"; src = fetchFromGitHub { owner = "smiteshp"; repo = "nvim-gps"; - rev = "74648310ffe95eba2054ce7a312d77d0b0cc1a32"; - sha256 = "1qa3fn2ianq1fiq6jvlvbvija36qf4i48gccvafwc23ap4fgsg0g"; + rev = "14653c92c93b2e00a8cc742ee109f510350afc2a"; + sha256 = "13i1pyd5ibmczyw3r2wrhrislkych994487iv5202zv0jn6jaglm"; }; meta.homepage = "https://github.com/smiteshp/nvim-gps/"; }; @@ -4308,24 +4332,24 @@ final: prev: nvim-lsp-ts-utils = buildVimPluginFrom2Nix { pname = "nvim-lsp-ts-utils"; - version = "2021-11-06"; + version = "2021-11-11"; src = fetchFromGitHub { owner = "jose-elias-alvarez"; repo = "nvim-lsp-ts-utils"; - rev = "19d41dd70b3ee4e6fdd48c2a81c20a4b0c62a7b6"; - sha256 = "0ka575gcbgr78jgaa7zavfbm8jww1lpgypw8k7rjpzvbznnklxri"; + rev = "1af2922c3ab7f80654c09932c55bd5d70f13f1e3"; + sha256 = "1qcska723k2ajimmib7i57clhdbrbqlcp4b18capsrrnxsl92pq0"; }; meta.homepage = "https://github.com/jose-elias-alvarez/nvim-lsp-ts-utils/"; }; nvim-lspconfig = buildVimPluginFrom2Nix { pname = "nvim-lspconfig"; - version = "2021-11-06"; + version = "2021-11-11"; src = fetchFromGitHub { owner = "neovim"; repo = "nvim-lspconfig"; - rev = "3a5d94df2d61992496d1fc986d2433b944584a8d"; - sha256 = "17sx8yzlx2ciqhwdhwq28zjpmbzfdzm5rsyjr31q10gqlj6l9kq6"; + rev = "edca6c107027111ed02abe17a231d1cf0d353adf"; + sha256 = "13abx9r8p9admskallw3y1dqia288xm6l3l6idshih6wbmkx2jk2"; }; meta.homepage = "https://github.com/neovim/nvim-lspconfig/"; }; @@ -4392,24 +4416,24 @@ final: prev: nvim-solarized-lua = buildVimPluginFrom2Nix { pname = "nvim-solarized-lua"; - version = "2021-10-23"; + version = "2021-11-10"; src = fetchFromGitHub { owner = "ishan9299"; repo = "nvim-solarized-lua"; - rev = "39ed6d841a71de0fcc51d6665638e864e42116cb"; - sha256 = "11v8vxz3daj2sl13hgvd8cadh7h5kij5kg43km917an5k1cw293j"; + rev = "05433b58825e13465b82430f2cc7b0414df2ba6c"; + sha256 = "1w2n8zj17dj87xfbacz9kgkcws2cihnfa3640s6393gli20782kq"; }; meta.homepage = "https://github.com/ishan9299/nvim-solarized-lua/"; }; nvim-spectre = buildVimPluginFrom2Nix { pname = "nvim-spectre"; - version = "2021-11-01"; + version = "2021-11-10"; src = fetchFromGitHub { owner = "windwp"; repo = "nvim-spectre"; - rev = "8d5d29ac0d4ad1b21ed986cbbdb160193aba3d5f"; - sha256 = "0yiv3j153pg2x1cdwrl8fq2wbvapxbixxqz8z14x5bdy5rn7i4jf"; + rev = "9502f162a43d18d03f6d11e2152aee39b1ed5adb"; + sha256 = "1czj2jbls3ci35mbvvzb7x2zzh3aw2rz42bvfx45ibpw6iabdgky"; }; meta.homepage = "https://github.com/windwp/nvim-spectre/"; }; @@ -4500,24 +4524,24 @@ final: prev: nvim-ts-context-commentstring = buildVimPluginFrom2Nix { pname = "nvim-ts-context-commentstring"; - version = "2021-11-03"; + version = "2021-11-09"; src = fetchFromGitHub { owner = "joosepalviste"; repo = "nvim-ts-context-commentstring"; - rev = "159c5b9a2cdb8a8fe342078b7ac8139de76bad62"; - sha256 = "0h2dlln226jhvv8anybz4b70z698bfc0sdb5k2zhzya7k0lmlfcz"; + rev = "ce74852c36008b11dda451bfe6c2ed71c535152b"; + sha256 = "04hd5wg3f39sn4qc958fw9inmkaj18mkgvmwkxni4qnb2y8qs9pi"; }; meta.homepage = "https://github.com/joosepalviste/nvim-ts-context-commentstring/"; }; nvim-ts-rainbow = buildVimPluginFrom2Nix { pname = "nvim-ts-rainbow"; - version = "2021-10-26"; + version = "2021-11-10"; src = fetchFromGitHub { owner = "p00f"; repo = "nvim-ts-rainbow"; - rev = "2943a62d787e8b0ffa4dfc685036b262335889d3"; - sha256 = "113h15h0n454qfq0jlfpgp4f0msvsqmjc0mnsxw726yabd5qqjvg"; + rev = "5cef624eb407449a313b63cdda66720e9860821f"; + sha256 = "0r39ahrk54smb9ngb4s11kxjncrsarclrdjvaazdi82260saxgb9"; }; meta.homepage = "https://github.com/p00f/nvim-ts-rainbow/"; }; @@ -4560,12 +4584,12 @@ final: prev: nvim_context_vt = buildVimPluginFrom2Nix { pname = "nvim_context_vt"; - version = "2021-08-31"; + version = "2021-11-09"; src = fetchFromGitHub { owner = "haringsrob"; repo = "nvim_context_vt"; - rev = "df026a7186e33e20c4b8f98f8f94a5caecc345af"; - sha256 = "0lxkmld4rg3vzxbx23v3r3hxkgj572kngddvy4l83068gwmdr08m"; + rev = "8db258aeff84adee646afab970980c745286a1e6"; + sha256 = "0jbkms1alssp9399nhbzilqap0yji6sxpy207v3vmk1haf27cqz4"; }; meta.homepage = "https://github.com/haringsrob/nvim_context_vt/"; }; @@ -4632,12 +4656,12 @@ final: prev: onedarkpro-nvim = buildVimPluginFrom2Nix { pname = "onedarkpro.nvim"; - version = "2021-11-02"; + version = "2021-11-08"; src = fetchFromGitHub { owner = "olimorris"; repo = "onedarkpro.nvim"; - rev = "2789a1a025b3511224bb35bd3b0bb014a674166c"; - sha256 = "0wgdsh8rni68llif9f0i9ckl1n75ig0gb4lczg4gdk4g5qxi4rwj"; + rev = "9015d8a1313b16cf3792830eb8d77553765adb80"; + sha256 = "19mhfr8ih2hp9jadgphwq0g576qsbnggiknv6ipkl60d8jrhxflk"; }; meta.homepage = "https://github.com/olimorris/onedarkpro.nvim/"; }; @@ -4680,24 +4704,24 @@ final: prev: orgmode-nvim = buildVimPluginFrom2Nix { pname = "orgmode.nvim"; - version = "2021-10-29"; + version = "2021-11-10"; src = fetchFromGitHub { owner = "kristijanhusak"; repo = "orgmode.nvim"; - rev = "50d1a97b25d77f33d312b4775fbd68217d22c946"; - sha256 = "10rahp4yb6sjq8afrig0c0fi9fjvhcxqp3y9qclzz5bxp4skwv78"; + rev = "93779c1eed34da14ab8082933fb1e3d47869d07f"; + sha256 = "145460q9a9f4jp8l8pfqi5rf12vvz05g4jfd70h65i7i55l2v37j"; }; meta.homepage = "https://github.com/kristijanhusak/orgmode.nvim/"; }; package-info-nvim = buildVimPluginFrom2Nix { pname = "package-info.nvim"; - version = "2021-10-30"; + version = "2021-11-09"; src = fetchFromGitHub { owner = "vuki656"; repo = "package-info.nvim"; - rev = "0572250a6b69f01416399f2f581aa87c17e03810"; - sha256 = "0z26i2h42vjsc5fkikfi6w7d7fnf6m3j5m7a73hi9rdbw389b2ay"; + rev = "037bedfa881d60f0ece93c31f31d04cf3ca29a87"; + sha256 = "0gflgccj0ymgv89paq9dp54f56g0wwz7m56sdfdycjii491q5hm4"; }; meta.homepage = "https://github.com/vuki656/package-info.nvim/"; }; @@ -4812,12 +4836,12 @@ final: prev: plenary-nvim = buildVimPluginFrom2Nix { pname = "plenary.nvim"; - version = "2021-10-29"; + version = "2021-11-08"; src = fetchFromGitHub { owner = "nvim-lua"; repo = "plenary.nvim"; - rev = "96e821e8001c21bc904d3c15aa96a70c11462c5f"; - sha256 = "0y05pwc4kbjqgj1zjjhvmrll3d53wz55zgqavxd4bvj2gwhvnd2k"; + rev = "b42e0cfe22ad3a0cac35cf14315e9dc22cea2ec9"; + sha256 = "09is80vcmnp0w42nahsqwliiyiyv64s9x459rl2dk4mnr7hgi7fm"; }; meta.homepage = "https://github.com/nvim-lua/plenary.nvim/"; }; @@ -5005,12 +5029,12 @@ final: prev: rainbow = buildVimPluginFrom2Nix { pname = "rainbow"; - version = "2021-10-25"; + version = "2021-11-08"; src = fetchFromGitHub { owner = "luochen1990"; repo = "rainbow"; - rev = "54c79a24725af3a15d3aad20f70a56c7abbd46c3"; - sha256 = "1bd8nqlcyhxxf02p4a16gayqkdh1010b7mnlfvzy69iaf2xclyx5"; + rev = "f1cb0d3d4a4785428f7ccec9f0e69ad314d748d9"; + sha256 = "15227jrbhagbyvd56cq1byc32hwgbsh293r9fb96419pa3rm9j1l"; }; meta.homepage = "https://github.com/luochen1990/rainbow/"; }; @@ -5089,12 +5113,12 @@ final: prev: refactoring-nvim = buildVimPluginFrom2Nix { pname = "refactoring.nvim"; - version = "2021-11-01"; + version = "2021-11-11"; src = fetchFromGitHub { owner = "theprimeagen"; repo = "refactoring.nvim"; - rev = "0a6af73a7353233842d3c3004f66cb99eb7a45d0"; - sha256 = "0dm09183c68vsvpf3y3grfif7bqiba0jyprf3cgjypy1y8qzinvn"; + rev = "c3fea5e8b377b07cd744579f8ca65e3f805ddaad"; + sha256 = "0rbn1mnyn9dhxv48qngs71n8pw25fmyaaffqgrk3qxfc1rxihf4a"; }; meta.homepage = "https://github.com/theprimeagen/refactoring.nvim/"; }; @@ -5171,6 +5195,18 @@ final: prev: meta.homepage = "https://github.com/mfukar/robotframework-vim/"; }; + ron-vim = buildVimPluginFrom2Nix { + pname = "ron.vim"; + version = "2020-08-22"; + src = fetchFromGitHub { + owner = "ron-rs"; + repo = "ron.vim"; + rev = "04004b3395d219f95a533c4badd5ba831b7b7c07"; + sha256 = "1xlr8slwcr6b9p33awf8xzdp04myv6dcsxwi50val4vzvzcgyrcl"; + }; + meta.homepage = "https://github.com/ron-rs/ron.vim/"; + }; + rspec-vim = buildVimPluginFrom2Nix { pname = "rspec.vim"; version = "2020-08-20"; @@ -5245,12 +5281,12 @@ final: prev: SchemaStore-nvim = buildVimPluginFrom2Nix { pname = "SchemaStore.nvim"; - version = "2021-11-08"; + version = "2021-11-09"; src = fetchFromGitHub { owner = "b0o"; repo = "SchemaStore.nvim"; - rev = "29116d254c8fa4138cdbeac2beb9dedac6b52dcd"; - sha256 = "0jdzkbj6p8d84w6hfpwcdc0qzdrwzp7gqdqxgwl6nwkwm10ahwgm"; + rev = "6b3ec7db13a9935d5d948fb0985707181e07979d"; + sha256 = "18inch8c1n9b835igw8brvmxh4c8pl9cq8qiv3v64fry2pv59mqd"; }; meta.homepage = "https://github.com/b0o/SchemaStore.nvim/"; }; @@ -5317,12 +5353,12 @@ final: prev: seoul256-vim = buildVimPluginFrom2Nix { pname = "seoul256.vim"; - version = "2020-06-21"; + version = "2021-11-08"; src = fetchFromGitHub { owner = "junegunn"; repo = "seoul256.vim"; - rev = "24ed467ca6ef9ce7ede56c9ffb1c6b30cd0ee906"; - sha256 = "0ihs5nxdyx3jr1n96l2yx4b5gc48x7qbyxv6dc53ihw2vpn783fx"; + rev = "538742074ec5cac2e84c383f02b85b368d35df9c"; + sha256 = "0pcgx5ng3snfvcspfi62qbsg5pd10y79r3j21cn1g5rr5ck7zl7a"; }; meta.homepage = "https://github.com/junegunn/seoul256.vim/"; }; @@ -5462,12 +5498,12 @@ final: prev: sonokai = buildVimPluginFrom2Nix { pname = "sonokai"; - version = "2021-11-05"; + version = "2021-11-11"; src = fetchFromGitHub { owner = "sainnhe"; repo = "sonokai"; - rev = "c60000ce708e8cbcf833a4e82306169969174c7a"; - sha256 = "1iiamab2ym59l6mpm9v4jli9gdi9lmj73w5j7ag5f0n3bwdxpkyb"; + rev = "30dd4ae6f844ab0f53ba93eea61068f87886eb03"; + sha256 = "0hwcar6c6n3fvli9pmx1ycvk4128f47hl07c7y7hxzy2rks7s3j8"; }; meta.homepage = "https://github.com/sainnhe/sonokai/"; }; @@ -5619,12 +5655,12 @@ final: prev: stabilize-nvim = buildVimPluginFrom2Nix { pname = "stabilize.nvim"; - version = "2021-11-07"; + version = "2021-11-10"; src = fetchFromGitHub { owner = "luukvbaal"; repo = "stabilize.nvim"; - rev = "14c809b63c2a6fb87493dcab22ceba64ed5a1428"; - sha256 = "1xr2vy264fv0dk0rbs3q0cma4whrsdwxw8iqvfr2xa1mc1w5agpy"; + rev = "fd74d2a9d2a384a530eba3a9771a5396b4ddad26"; + sha256 = "190mf9w344db5civ122l7zdr63l811qcqf7shh89zx4qfrsllf43"; }; meta.homepage = "https://github.com/luukvbaal/stabilize.nvim/"; }; @@ -5727,12 +5763,12 @@ final: prev: syntastic = buildVimPluginFrom2Nix { pname = "syntastic"; - version = "2021-10-18"; + version = "2021-11-11"; src = fetchFromGitHub { owner = "vim-syntastic"; repo = "syntastic"; - rev = "d086f49d389e1c2d58211b1f92cf20c9f63dc325"; - sha256 = "0cnd2m1dnx69657dpckiiy1slx2fpnpggm3qs0nzm5rm3qpzx185"; + rev = "2c4b33f6e6679fb5f3824d9cd38d4813c71a19a3"; + sha256 = "18lb4rs9zrgn35b2x6b7pycd3h64virkadlidcy3xhzhsynlvwgr"; }; meta.homepage = "https://github.com/vim-syntastic/syntastic/"; }; @@ -5993,12 +6029,12 @@ final: prev: telescope-nvim = buildVimPluginFrom2Nix { pname = "telescope.nvim"; - version = "2021-11-07"; + version = "2021-11-10"; src = fetchFromGitHub { owner = "nvim-telescope"; repo = "telescope.nvim"; - rev = "458382836683140c1b4d8d74b80379fe4636bc40"; - sha256 = "0n9gpsd65fr0fn3cwfr73byjl3d0dr1yvwg0yhvh1iwhn6bg3nrv"; + rev = "f3ef5920725d719ed23195a457a86015826d3e1d"; + sha256 = "1dhczp84lhsz1ikqprg552wqi0hncigvhfb726iz01cr9y25b8mg"; }; meta.homepage = "https://github.com/nvim-telescope/telescope.nvim/"; }; @@ -6630,12 +6666,12 @@ final: prev: vim-airline = buildVimPluginFrom2Nix { pname = "vim-airline"; - version = "2021-11-03"; + version = "2021-11-11"; src = fetchFromGitHub { owner = "vim-airline"; repo = "vim-airline"; - rev = "17f7dff748c188eb511ff831c4ea1803418f2b42"; - sha256 = "1n2j81aw5iwv080apw8d463h4yqm0yhqsrhvizfb7zz8j30nbhq0"; + rev = "47bf6b1716d599fa19756ce094309a3d551fac73"; + sha256 = "1c2sqkyd0zha9pchh1lbyww7v281rr488ff5b1c2rkc6inya9lcd"; }; meta.homepage = "https://github.com/vim-airline/vim-airline/"; }; @@ -6762,12 +6798,12 @@ final: prev: vim-autoformat = buildVimPluginFrom2Nix { pname = "vim-autoformat"; - version = "2021-10-07"; + version = "2021-11-07"; src = fetchFromGitHub { owner = "vim-autoformat"; repo = "vim-autoformat"; - rev = "d8a6962524ed4afbf7c92e7678bacf91d66f097d"; - sha256 = "0sscvgj6fwa9yy2p999rr7chp1xgg8japzwpfwwnzw77x3ikv3cp"; + rev = "bb11f30377985e45e2eecef570856d42dbabb8b0"; + sha256 = "1lx5lrb0hjijvwngvgsgchww70c1bgqf5qxj8lhvk11dvxn3k087"; }; meta.homepage = "https://github.com/vim-autoformat/vim-autoformat/"; }; @@ -6954,12 +6990,12 @@ final: prev: vim-clang-format = buildVimPluginFrom2Nix { pname = "vim-clang-format"; - version = "2019-05-15"; + version = "2021-11-11"; src = fetchFromGitHub { owner = "rhysd"; repo = "vim-clang-format"; - rev = "95593b67723f23979cd7344ecfd049f2f917830f"; - sha256 = "0n0k13k63l8n0ixs4zrhlz923apvdp2mldadxqlhmvsvncmlqmpn"; + rev = "261d02c305f3ed361c39e3b9ca5d66b5b45df4c7"; + sha256 = "1lbfxb91s3951j3zhpmc7jj8xnsd2qcrd6d5xm35xarcsxwl5rvh"; }; meta.homepage = "https://github.com/rhysd/vim-clang-format/"; }; @@ -7770,16 +7806,28 @@ final: prev: vim-fugitive = buildVimPluginFrom2Nix { pname = "vim-fugitive"; - version = "2021-11-02"; + version = "2021-11-11"; src = fetchFromGitHub { owner = "tpope"; repo = "vim-fugitive"; - rev = "a6b823b8d0a8959e81876fd4857ba822495c028a"; - sha256 = "1aiz0lmjmjvcw67aanc06ba131fvszck0y7zg4kl625wlf6ahdkx"; + rev = "2e4ee0b5d6e61c6b3bc48e844343f89615dfc6e0"; + sha256 = "0ibks13hicpv5syk6lgrzjfbacwxfp02cmp23ry8wjm2dkzmv81s"; }; meta.homepage = "https://github.com/tpope/vim-fugitive/"; }; + vim-fzf-coauthorship = buildVimPluginFrom2Nix { + pname = "vim-fzf-coauthorship"; + version = "2021-07-14"; + src = fetchFromGitHub { + owner = "maxjacobson"; + repo = "vim-fzf-coauthorship"; + rev = "c5df55743a274a2c2d6370008f199176dabae0bd"; + sha256 = "0v52w9jiyg0q6fmsh0dq8gd6m48vhhj2fy95v7lvqyr7pnr1wqaa"; + }; + meta.homepage = "https://github.com/maxjacobson/vim-fzf-coauthorship/"; + }; + vim-gh-line = buildVimPluginFrom2Nix { pname = "vim-gh-line"; version = "2021-03-25"; @@ -7902,12 +7950,12 @@ final: prev: vim-go = buildVimPluginFrom2Nix { pname = "vim-go"; - version = "2021-11-07"; + version = "2021-11-08"; src = fetchFromGitHub { owner = "fatih"; repo = "vim-go"; - rev = "d2824f99487118912b3e6ad5baec09bae8d337e6"; - sha256 = "04kjl2x46ckazixwg43xf6n2m3f5rbgqbaskmwb5jsi6741vhkgi"; + rev = "96b74acc8747d667247fd8d30eb15f6b44778f6f"; + sha256 = "1cd5kzjsylg5if1fqs7ll5s47jmmbhpw3dxn1k7cyf9wkkmy0di8"; }; meta.homepage = "https://github.com/fatih/vim-go/"; }; @@ -8311,12 +8359,12 @@ final: prev: vim-javacomplete2 = buildVimPluginFrom2Nix { pname = "vim-javacomplete2"; - version = "2021-08-21"; + version = "2021-11-09"; src = fetchFromGitHub { owner = "artur-shaik"; repo = "vim-javacomplete2"; - rev = "54a4b02edef78509621d180794df0c6924e48b3b"; - sha256 = "08hi6r1cspkklir9qa6x4h4a3zs404hvcwsspylysv7asnv8jncf"; + rev = "19aec7d63eda429d056586d9bcc98f61f860c668"; + sha256 = "055f58342ai117gq0021zwhv8ck5sca8bxrqqixbv5cjywck0r17"; }; meta.homepage = "https://github.com/artur-shaik/vim-javacomplete2/"; }; @@ -8480,12 +8528,12 @@ final: prev: vim-lawrencium = buildVimPluginFrom2Nix { pname = "vim-lawrencium"; - version = "2020-10-10"; + version = "2021-11-08"; src = fetchFromGitHub { owner = "ludovicchabant"; repo = "vim-lawrencium"; - rev = "4592f24a50386e02870fa8d508cc7ba8454dc102"; - sha256 = "158hslq4chlqr9mhdpcrbxnygjk4j1pc2caqc3zrwqh9qdk8mvha"; + rev = "eee52c9da9a58c1f079adb4a3134a0620bc6e945"; + sha256 = "12431h344dhjswg0pm8nvfszy8hp8b61nm0r8gsry9a6w1j1a86b"; }; meta.homepage = "https://github.com/ludovicchabant/vim-lawrencium/"; }; @@ -8853,12 +8901,12 @@ final: prev: vim-mundo = buildVimPluginFrom2Nix { pname = "vim-mundo"; - version = "2021-07-13"; + version = "2021-11-09"; src = fetchFromGitHub { owner = "simnalamburt"; repo = "vim-mundo"; - rev = "8b4bccebf7a16938c77073983d643ba22aa04079"; - sha256 = "11livwi2pvnrxj7mildh46a6rli6hibpbffc9a5q6vxkvn9s6v29"; + rev = "e193f185bad3aa58446e771f8f2739abf11d3262"; + sha256 = "1q2j88rcg0slvm2bfdri4fy42h5a2md9bbqsspb3kzx5yrhgawhp"; }; meta.homepage = "https://github.com/simnalamburt/vim-mundo/"; }; @@ -10138,12 +10186,12 @@ final: prev: vim-test = buildVimPluginFrom2Nix { pname = "vim-test"; - version = "2021-10-17"; + version = "2021-11-10"; src = fetchFromGitHub { owner = "vim-test"; repo = "vim-test"; - rev = "2052bd926c37b5c828dd07c47ac676102ca34a0e"; - sha256 = "1lyx57jryxx5r9s60hg3v6y0kx5p2qc408nl8zhffqhzzmxvkgp9"; + rev = "8d942aa3b0eea1d53cccd1ee87a241b651f485ee"; + sha256 = "03s5m19j19xjnwnfknfff4nj3wpzb11fbkf95bif1rrms9v8kw2i"; }; meta.homepage = "https://github.com/vim-test/vim-test/"; }; @@ -10654,12 +10702,12 @@ final: prev: vim_current_word = buildVimPluginFrom2Nix { pname = "vim_current_word"; - version = "2021-09-26"; + version = "2021-11-09"; src = fetchFromGitHub { owner = "dominikduda"; repo = "vim_current_word"; - rev = "5cfee50ec35d011478c4ec9805a0e5d9a92f09ea"; - sha256 = "0l543hg5wyrbqykbm8vvhcb8wq9gwkc8y4nq9f7qy5a2qssvvd31"; + rev = "961d54dd53a1da7a9402dc92098a8a8c75d79ac6"; + sha256 = "1qa8pnr8fjxy0d3kf4vhjzwqlj1yszj2r21phmw4f3yl1hl72hc0"; }; meta.homepage = "https://github.com/dominikduda/vim_current_word/"; }; @@ -10678,12 +10726,12 @@ final: prev: vimade = buildVimPluginFrom2Nix { pname = "vimade"; - version = "2021-10-29"; + version = "2021-11-09"; src = fetchFromGitHub { owner = "TaDaa"; repo = "vimade"; - rev = "934d5c92e5b3439fb2eb2a8d8e6e50c4bf02d740"; - sha256 = "0pmmhap4npfg191dkzia1lajvp2l583bf2x2f2n33qlwbq2nh4nk"; + rev = "25ac9e6e3b8f127ab81dc996c69bb7a2c8f26329"; + sha256 = "1nkqmxvamziyavpfqlpn24wqzmrjwzb0s53avkw06h437mpzxzgy"; }; meta.homepage = "https://github.com/TaDaa/vimade/"; }; @@ -10811,12 +10859,12 @@ final: prev: vimtex = buildVimPluginFrom2Nix { pname = "vimtex"; - version = "2021-11-06"; + version = "2021-11-11"; src = fetchFromGitHub { owner = "lervag"; repo = "vimtex"; - rev = "8bfcb533b90447b8f70c4c0de712bd966059e416"; - sha256 = "1fls9g2bw5pr7y401c63ixi99d7cvm7nxawvpysayz36iyqajrwr"; + rev = "c63adb6958458b62a7b9c0e4156d11a5da5f1a9f"; + sha256 = "07q4wmckz2a1x2l11pa1m5dqbk8wz0slk28p7wcapwfn5lxf48jq"; }; meta.homepage = "https://github.com/lervag/vimtex/"; }; diff --git a/pkgs/misc/vim-plugins/overrides.nix b/pkgs/misc/vim-plugins/overrides.nix index af749a004f4c1..d9a0adcdbb180 100644 --- a/pkgs/misc/vim-plugins/overrides.nix +++ b/pkgs/misc/vim-plugins/overrides.nix @@ -776,6 +776,10 @@ self: super: { ]; }); + vim-fzf-coauthorship = super.vim-fzf-coauthorship.overrideAttrs (old: { + dependencies = with self; [ fzf-vim ]; + }); + # change the go_bin_path to point to a path in the nix store. See the code in # fatih/vim-go here # https://github.com/fatih/vim-go/blob/155836d47052ea9c9bac81ba3e937f6f22c8e384/autoload/go/path.vim#L154-L159 diff --git a/pkgs/misc/vim-plugins/update-shell.nix b/pkgs/misc/vim-plugins/update-shell.nix index b26620677039e..18b5b1a37c5fe 100644 --- a/pkgs/misc/vim-plugins/update-shell.nix +++ b/pkgs/misc/vim-plugins/update-shell.nix @@ -7,7 +7,7 @@ mkShell { packages = [ bash pyEnv - nix + nix_2_3 nix-prefetch-scripts ]; } diff --git a/pkgs/misc/vim-plugins/vim-plugin-names b/pkgs/misc/vim-plugins/vim-plugin-names index 0438506633f76..ba6b140f29afa 100644 --- a/pkgs/misc/vim-plugins/vim-plugin-names +++ b/pkgs/misc/vim-plugins/vim-plugin-names @@ -228,7 +228,9 @@ honza/vim-snippets hotwatermorning/auto-git-diff hrsh7th/cmp-buffer@main hrsh7th/cmp-calc@main +hrsh7th/cmp-cmdline@main hrsh7th/cmp-emoji@main +hrsh7th/cmp-nvim-lsp-document-symbol@main hrsh7th/cmp-nvim-lsp@main hrsh7th/cmp-nvim-lua@main hrsh7th/cmp-omni@main @@ -381,7 +383,7 @@ ledger/vim-ledger lepture/vim-jinja lervag/vimtex lewis6991/gitsigns.nvim@main -lf-lang/lingua-franca.vim +lf-lang/lingua-franca.vim@main lfe-support/vim-lfe lfilho/cosco.vim lifepillar/vim-gruvbox8 @@ -439,6 +441,7 @@ mattn/webapi-vim matze/vim-move max397574/better-escape.nvim maximbaz/lightline-ale +maxjacobson/vim-fzf-coauthorship MaxMEllon/vim-jsx-pretty mbbill/undotree mboughaba/i3config.vim @@ -648,6 +651,7 @@ romainl/vim-qlist roman/golden-ratio romgrk/barbar.nvim romgrk/nvim-treesitter-context +ron-rs/ron.vim ron89/thesaurus_query.vim roxma/nvim-cm-racer roxma/nvim-completion-manager @@ -884,8 +888,8 @@ vmchale/ats-vim vmchale/dhall-vim vn-ki/coc-clap voldikss/vim-floaterm -VundleVim/Vundle.vim vuki656/package-info.nvim +VundleVim/Vundle.vim w0ng/vim-hybrid wakatime/vim-wakatime wannesm/wmgraphviz.vim diff --git a/pkgs/os-specific/linux/kernel/linux-lqx.nix b/pkgs/os-specific/linux/kernel/linux-lqx.nix index 8c8b764a8812e..98a340cf94800 100644 --- a/pkgs/os-specific/linux/kernel/linux-lqx.nix +++ b/pkgs/os-specific/linux/kernel/linux-lqx.nix @@ -1,7 +1,7 @@ { lib, fetchFromGitHub, buildLinux, linux_zen, ... } @ args: let - version = "5.14.14"; + version = "5.14.16"; suffix = "lqx1"; in @@ -14,7 +14,7 @@ buildLinux (args // { owner = "zen-kernel"; repo = "zen-kernel"; rev = "v${version}-${suffix}"; - sha256 = "sha256-gwWZNGHmbKQajMP4mu3XT2Xf93MkcNpAXW8h94O4pNM="; + sha256 = "sha256-nWeHvKnVo/ln8sTLdFTK1pG09HMTdZ75a+3Ehxjd5pc="; }; extraMeta = { diff --git a/pkgs/servers/home-assistant/component-packages.nix b/pkgs/servers/home-assistant/component-packages.nix index 3fcf1a54a252e..c46248d93963b 100644 --- a/pkgs/servers/home-assistant/component-packages.nix +++ b/pkgs/servers/home-assistant/component-packages.nix @@ -631,7 +631,7 @@ "owntracks" = ps: with ps; [ pynacl pyturbojpeg aiohttp-cors hass-nabucasa paho-mqtt ]; "ozw" = ps: with ps; [ aiohttp-cors paho-mqtt python-openzwave-mqtt ]; "p1_monitor" = ps: with ps; [ p1monitor ]; - "panasonic_bluray" = ps: with ps; [ ]; # missing inputs: panacotta + "panasonic_bluray" = ps: with ps; [ panacotta ]; "panasonic_viera" = ps: with ps; [ ]; # missing inputs: panasonic_viera "pandora" = ps: with ps; [ pexpect ]; "panel_custom" = ps: with ps; [ aiohttp-cors home-assistant-frontend pillow sqlalchemy ]; @@ -890,7 +890,7 @@ "touchline" = ps: with ps; [ ]; # missing inputs: pytouchline "tplink" = ps: with ps; [ aiohttp-cors ifaddr python-kasa ]; "tplink_lte" = ps: with ps; [ ]; # missing inputs: tp-connected - "traccar" = ps: with ps; [ aiohttp-cors stringcase ]; # missing inputs: pytraccar + "traccar" = ps: with ps; [ aiohttp-cors pytraccar stringcase ]; "trace" = ps: with ps; [ ]; "tractive" = ps: with ps; [ aiotractive ]; "tradfri" = ps: with ps; [ pytradfri ]; @@ -922,7 +922,7 @@ "updater" = ps: with ps; [ ]; "upnp" = ps: with ps; [ aiohttp-cors async-upnp-client ifaddr zeroconf ]; "uptime" = ps: with ps; [ ]; - "uptimerobot" = ps: with ps; [ ]; # missing inputs: pyuptimerobot + "uptimerobot" = ps: with ps; [ pyuptimerobot ]; "usb" = ps: with ps; [ aiohttp-cors pyserial pyudev ]; "uscis" = ps: with ps; [ ]; # missing inputs: uscisstatus "usgs_earthquakes_feed" = ps: with ps; [ geojson-client ]; diff --git a/pkgs/servers/home-assistant/default.nix b/pkgs/servers/home-assistant/default.nix index b834f5ea07f6c..7da295cdc1d2d 100644 --- a/pkgs/servers/home-assistant/default.nix +++ b/pkgs/servers/home-assistant/default.nix @@ -662,6 +662,7 @@ in with py.pkgs; buildPythonApplication rec { "toon" "totalconnect" "tplink" + "traccar" "trace" "tradfri" "transmission" @@ -683,6 +684,7 @@ in with py.pkgs; buildPythonApplication rec { # disabled, because it tries to join a multicast group and fails to find a usable network interface # "upnp" "uptime" + "uptimerobot" "usgs_earthquakes_feed" "utility_meter" "uvc" diff --git a/pkgs/servers/openafs/1.8/module.nix b/pkgs/servers/openafs/1.8/module.nix index 9b113a4a0d1ea..2543aef376903 100644 --- a/pkgs/servers/openafs/1.8/module.nix +++ b/pkgs/servers/openafs/1.8/module.nix @@ -1,5 +1,5 @@ { lib, stdenv, fetchurl, which, autoconf, automake, flex, bison -, kernel, glibc, perl, libtool_2, libkrb5 }: +, kernel, glibc, perl, libtool_2, libkrb5, fetchpatch }: with (import ./srcs.nix { inherit fetchurl; @@ -18,6 +18,23 @@ in stdenv.mkDerivation { buildInputs = [ libkrb5 ]; + patches = [ + # LINUX 5.14: explicitly set set_page_dirty to default + ((fetchpatch { + url = "https://gerrit.openafs.org/changes/14830/revisions/20b8a37950b3718b85a4a3d21b23469a5176eb6a/patch"; + sha256 = "1mkfwq0pbwvfjspsy2lxhi0f09hljgc6xyn3y97sai0dyivn05jp"; + }).overrideAttrs (o: { + postFetch = "mv $out p; base64 -d p > $out; " + o.postFetch; + })) + # Linux 5.15: Convert osi_Msg macro to a function + ((fetchpatch { + url = "https://gerrit.openafs.org/changes/14831/revisions/6cfa9046229d90c0625687e3fddb7877f21fbcff/patch"; + sha256 = "18rip9a1krxf47fizf3f12ddq55apzb2w3wjj5qs7n3sh2nwks7g"; + }).overrideAttrs (o: { + postFetch = "mv $out p; base64 -d p > $out; " + o.postFetch; + })) + ]; + hardeningDisable = [ "pic" ]; configureFlags = [ @@ -56,6 +73,6 @@ in stdenv.mkDerivation { license = licenses.ipl10; platforms = platforms.linux; maintainers = with maintainers; [ maggesi spacefrogg ]; - broken = versionOlder kernel.version "3.18" || kernel.kernelAtLeast "5.15" || kernel.isHardened; + broken = versionOlder kernel.version "3.18" || kernel.isHardened; }; } diff --git a/pkgs/tools/admin/realvnc-vnc-viewer/default.nix b/pkgs/tools/admin/realvnc-vnc-viewer/default.nix index 690c215471cf1..2e8eabfc1a360 100644 --- a/pkgs/tools/admin/realvnc-vnc-viewer/default.nix +++ b/pkgs/tools/admin/realvnc-vnc-viewer/default.nix @@ -2,18 +2,18 @@ stdenv.mkDerivation rec { pname = "realvnc-vnc-viewer"; - version = "6.21.406"; + version = "6.21.920"; src = { "x86_64-linux" = fetchurl { url = "https://www.realvnc.com/download/file/viewer.files/VNC-Viewer-${version}-Linux-x64.rpm"; - sha256 = "0rnizzanaykqg1vfy56p8abc4fmgpbibj54j4c1v81zsj3kmahka"; + sha256 = "1qghc5380h4b2pczksmky3kcffz5wn9shw033w4f969wl96p31fz"; }; "i686-linux" = fetchurl { url = "https://www.realvnc.com/download/file/viewer.files/VNC-Viewer-${version}-Linux-x86.rpm"; - sha256 = "1rlxfiqymi1licn2spyiqa00kiwzhdr0pkh7vv3ai6gb9f6phk31"; + sha256 = "034iwqxpqhnm6i292fakva7vkwrrzamwcvbm7xyccpd54adj0grn"; }; - }.${stdenv.system}; + }.${stdenv.system} or (throw "Unsupported system: ${stdenv.hostPlatform.system}"); nativeBuildInputs = [ autoPatchelfHook rpmextract ]; buildInputs = [ libX11 libXext ]; diff --git a/pkgs/tools/compression/ouch/default.nix b/pkgs/tools/compression/ouch/default.nix index fc2e2642cf8d8..c9ffaef4b76c9 100644 --- a/pkgs/tools/compression/ouch/default.nix +++ b/pkgs/tools/compression/ouch/default.nix @@ -1,4 +1,14 @@ -{ lib, rustPlatform, fetchFromGitHub, help2man, installShellFiles }: +{ lib +, rustPlatform +, fetchFromGitHub +, help2man +, installShellFiles +, pkg-config +, bzip2 +, xz +, zlib +, zstd +}: rustPlatform.buildRustPackage rec { pname = "ouch"; @@ -13,7 +23,13 @@ rustPlatform.buildRustPackage rec { cargoSha256 = "sha256-jEprWtIl5LihD9fOMYHGGlk0+h4woUlwUWNfSkd2t10="; - nativeBuildInputs = [ help2man installShellFiles ]; + nativeBuildInputs = [ help2man installShellFiles pkg-config ]; + + buildInputs = [ bzip2 xz zlib zstd ]; + + cargoBuildFlags = [ "--features" "zstd/pkg-config" ]; + + cargoTestFlags = cargoBuildFlags; postInstall = '' help2man $out/bin/ouch > ouch.1 diff --git a/pkgs/tools/inputmethods/emote/default.nix b/pkgs/tools/inputmethods/emote/default.nix index d65831d5202e5..79831d7ef1ec7 100644 --- a/pkgs/tools/inputmethods/emote/default.nix +++ b/pkgs/tools/inputmethods/emote/default.nix @@ -2,18 +2,21 @@ python3Packages.buildPythonApplication rec { pname = "emote"; - version = "2.0.0"; + version = "3.0.3"; src = fetchFromGitHub { owner = "tom-james-watson"; repo = "Emote"; rev = "v${version}"; - sha256 = "kYXFD6VBnuEZ0ZMsF6ZmN4V0JN83puxRILpNlllVsKQ="; + sha256 = "mqCSl+EGbnL9AfzZT3aa/Y5Rsx433ZmI31BmK3wkaJk="; }; postPatch = '' - substituteInPlace setup.py --replace "pygobject==3.36.0" "pygobject" + substituteInPlace setup.py \ + --replace "pygobject==3.36.0" "pygobject" \ + --replace "manimpango==0.3.0" "manimpango" substituteInPlace emote/config.py --replace 'os.environ.get("SNAP")' "'$out/share/emote'" + substituteInPlace emote/picker.py --replace 'os.environ.get("SNAP_VERSION", "dev build")' "'$version'" substituteInPlace snap/gui/emote.desktop --replace "Icon=\''${SNAP}/usr/share/icons/emote.svg" "Icon=emote.svg" ''; @@ -27,6 +30,7 @@ python3Packages.buildPythonApplication rec { ]; propagatedBuildInputs = [ + python3Packages.manimpango python3Packages.pygobject3 gtk3 xdotool @@ -36,7 +40,7 @@ python3Packages.buildPythonApplication rec { postInstall = '' install -D snap/gui/emote.desktop $out/share/applications/emote.desktop install -D snap/gui/emote.svg $out/share/pixmaps/emote.svg - install -D -t $out/share/emote/static static/{emojis.json,logo.svg,style.css} + install -D -t $out/share/emote/static static/{NotoColorEmoji.ttf,emojis.csv,logo.svg,style.css} ''; dontWrapGApps = true; diff --git a/pkgs/tools/misc/most/default.nix b/pkgs/tools/misc/most/default.nix index de2118083d984..2073e066ae73e 100644 --- a/pkgs/tools/misc/most/default.nix +++ b/pkgs/tools/misc/most/default.nix @@ -9,6 +9,11 @@ stdenv.mkDerivation rec { sha256 = "008537ns659pw2aag15imwjrxj73j26aqq90h285is6kz8gmv06v"; }; + patches = [ + # Upstream patch to fix parallel build failure + ./parallel-make.patch + ]; + outputs = [ "out" "doc" ]; makeFlags = [ @@ -26,6 +31,8 @@ stdenv.mkDerivation rec { buildInputs = [ slang ncurses ]; + enableParallelBuilding = true; + meta = with lib; { description = "A terminal pager similar to 'more' and 'less'"; longDescription = '' diff --git a/pkgs/tools/misc/most/parallel-make.patch b/pkgs/tools/misc/most/parallel-make.patch new file mode 100644 index 0000000000000..07c2e47c673e3 --- /dev/null +++ b/pkgs/tools/misc/most/parallel-make.patch @@ -0,0 +1,18 @@ +Upstream commit c9cfad50a ("src/Makefile.in: Avoid a race condition +when performing a parallel build") + +--- a/src/Makefile.in ++++ b/src/Makefile.in +@@ -54,6 +54,12 @@ COMPILE_CMD = $(CC) -c $(ALL_CFLAGS) -DMOST_SYSTEM_INITFILE='"$(SYS_INITFILE)"' + all: $(EXEC) + $(EXEC): $(OBJDIR) $(CONFIG_H) slangversion $(OBJDIR)/$(EXEC) + @echo $(EXEC) created in $(OBJDIR) ++ ++# C source files include autogenrated "config.h". Make sure ++# it's available before the compilation. Pessimistically assume ++# any source file can depend on "config.h". ++$(OBJS) $(OBJDIR)/chkslang.o: $(CONFIG_H) ++ + $(OBJDIR)/$(EXEC): $(OBJS) + cd $(OBJDIR); $(CC) $(OFILES) -o $(EXEC) $(LDFLAGS) $(EXECLIBS) + # diff --git a/pkgs/tools/misc/youtube-dl/default.nix b/pkgs/tools/misc/youtube-dl/default.nix index 680000b337132..20869ac4d7928 100644 --- a/pkgs/tools/misc/youtube-dl/default.nix +++ b/pkgs/tools/misc/youtube-dl/default.nix @@ -1,4 +1,4 @@ -{ lib, fetchurl, buildPythonPackage +{ lib, fetchurl, fetchpatch, buildPythonPackage , zip, ffmpeg, rtmpdump, phantomjs2, atomicparsley, pycryptodome, pandoc # Pandoc is required to build the package's man page. Release tarballs contain a # formatted man page already, though, it will still be installed. We keep the @@ -25,6 +25,20 @@ buildPythonPackage rec { sha256 = "1hqan9h55x9gfdakw554vic68w9gpvhblchwxlw265zxp56hxjrw"; }; + patches = [ + # Fixes throttling on youtube.com. Without the patch downloads are capped at + # about 80KiB/s. See, e.g., + # + # https://github.com/ytdl-org/youtube-dl/issues/29326 + # + # The patch comes from PR https://github.com/ytdl-org/youtube-dl/pull/30188 + (fetchpatch { + name = "fix-youtube-dl-speed.patch"; + url = "https://github.com/ytdl-org/youtube-dl/pull/30188.patch"; + sha256 = "15liban37ina2y4bnykfdywdy4rbkfff2r6vd0kqn2k7rfkcczyz"; + }) + ]; + nativeBuildInputs = [ installShellFiles makeWrapper ]; buildInputs = [ zip ] ++ lib.optional generateManPage pandoc; propagatedBuildInputs = lib.optional hlsEncryptedSupport pycryptodome; diff --git a/pkgs/tools/networking/nss-mdns/default.nix b/pkgs/tools/networking/nss-mdns/default.nix index 6faf1f06dbb82..6ba996401a84c 100644 --- a/pkgs/tools/networking/nss-mdns/default.nix +++ b/pkgs/tools/networking/nss-mdns/default.nix @@ -21,14 +21,13 @@ stdenv.mkDerivation rec { "--localstatedir=/var" ]; - patches = lib.optional stdenv.hostPlatform.isMusl - ( - fetchpatch - { - url = "https://raw.githubusercontent.com/openembedded/openembedded-core/94f780e889f194b67a48587ac68b3200288bee10/meta/recipes-connectivity/libnss-mdns/libnss-mdns/0001-check-for-nss.h.patch"; - sha256 = "1l1kjbdw8z31br4vib3l5b85jy7kxin760a2f24lww8v6lqdpgds"; - } - ); + patches = [ + # Provide compat definition for libc lacking <nss.h> (e.g. musl) + (fetchpatch { + url = "https://raw.githubusercontent.com/openembedded/openembedded-core/94f780e889f194b67a48587ac68b3200288bee10/meta/recipes-connectivity/libnss-mdns/libnss-mdns/0001-check-for-nss.h.patch"; + sha256 = "1l1kjbdw8z31br4vib3l5b85jy7kxin760a2f24lww8v6lqdpgds"; + }) + ]; meta = { diff --git a/pkgs/tools/networking/tinyssh/default.nix b/pkgs/tools/networking/tinyssh/default.nix new file mode 100644 index 0000000000000..9bfa8aa3ab535 --- /dev/null +++ b/pkgs/tools/networking/tinyssh/default.nix @@ -0,0 +1,28 @@ +{ lib, stdenv, fetchFromGitHub }: + +stdenv.mkDerivation rec { + pname = "tinyssh"; + version = "20210601"; + + src = fetchFromGitHub { + owner = "janmojzis"; + repo = "tinyssh"; + rev = version; + sha256 = "sha256-+THoPiD6dW5ZuiQmmLckOJGyjhzdF3qF0DgC51zjGY8="; + }; + + preConfigure = '' + echo /bin > conf-bin + echo /share/man > conf-man + ''; + + DESTDIR = placeholder "out"; + + meta = with lib; { + description = "minimalistic SSH server"; + homepage = "https://tinyssh.org"; + license = licenses.publicDomain; + platforms = platforms.unix; + maintainers = [ maintainers.kaction ]; + }; +} diff --git a/pkgs/tools/security/hash-slinger/default.nix b/pkgs/tools/security/hash-slinger/default.nix index ee06c112481b7..e51d93e9d7fa0 100644 --- a/pkgs/tools/security/hash-slinger/default.nix +++ b/pkgs/tools/security/hash-slinger/default.nix @@ -1,45 +1,63 @@ -{ lib, stdenv, fetchFromGitHub, python2Packages, unbound, libreswan }: +{ lib +, stdenv +, fetchFromGitHub +, python3 +, unbound +, libreswan +}: -let - pythonPackages = python2Packages; -in stdenv.mkDerivation rec { - pname = "hash-slinger"; - version = "2.7"; +stdenv.mkDerivation rec { + pname = "hash-slinger"; + version = "3.1"; src = fetchFromGitHub { owner = "letoams"; repo = pname; rev = version; - sha256 = "05wn744ydclpnpyah6yfjqlfjlasrrhzj48lqmm5a91nyps5yqyn"; + sha256 = "sha256-mhMUdZt846QjwRIh2m/4EE+93fUcCKc2FFeoFpzKYvk="; }; - pythonPath = with pythonPackages; [ dnspython m2crypto ipaddr python-gnupg - pyunbound ]; + pythonPath = with python3.pkgs; [ + dnspython + m2crypto + python-gnupg + pyunbound + ]; - buildInputs = [ pythonPackages.wrapPython ]; - propagatedBuildInputs = [ unbound libreswan ] ++ pythonPath; - propagatedUserEnvPkgs = [ unbound libreswan ]; + buildInputs = [ + python3.pkgs.wrapPython + ]; - patchPhase = '' + propagatedBuildInputs = [ + unbound + libreswan + ] ++ pythonPath; + + propagatedUserEnvPkgs = [ + unbound + libreswan + ]; + + postPatch = '' substituteInPlace Makefile \ --replace "$(DESTDIR)/usr" "$out" substituteInPlace ipseckey \ --replace "/usr/sbin/ipsec" "${libreswan}/sbin/ipsec" substituteInPlace tlsa \ - --replace "/var/lib/unbound/root" "${pythonPackages.pyunbound}/etc/pyunbound/root" + --replace "/var/lib/unbound/root" "${python3.pkgs.pyunbound}/etc/pyunbound/root" patchShebangs * - ''; + ''; installPhase = '' - mkdir -p $out/bin $out/man $out/${pythonPackages.python.sitePackages}/ + mkdir -p $out/bin $out/man $out/lib/${python3.libPrefix}/site-packages make install wrapPythonPrograms - ''; + ''; - meta = { + meta = with lib; { description = "Various tools to generate special DNS records"; - homepage = "https://github.com/letoams/hash-slinger"; - license = lib.licenses.gpl2Plus; - maintainers = [ lib.maintainers.leenaars ]; + homepage = "https://github.com/letoams/hash-slinger"; + license = licenses.gpl2Plus; + maintainers = with maintainers; [ leenaars ]; }; } diff --git a/pkgs/tools/security/mkpasswd/default.nix b/pkgs/tools/security/mkpasswd/default.nix index 6064a80d6cd5d..7fea400f008c3 100644 --- a/pkgs/tools/security/mkpasswd/default.nix +++ b/pkgs/tools/security/mkpasswd/default.nix @@ -2,8 +2,7 @@ stdenv.mkDerivation { pname = "mkpasswd"; - inherit (whois) version; - inherit (whois) src; + inherit (whois) version src; nativeBuildInputs = [ perl pkg-config ]; buildInputs = [ libxcrypt ]; diff --git a/pkgs/tools/security/rbw/default.nix b/pkgs/tools/security/rbw/default.nix index 278e009039297..919fda9c67c5f 100644 --- a/pkgs/tools/security/rbw/default.nix +++ b/pkgs/tools/security/rbw/default.nix @@ -74,7 +74,6 @@ rustPlatform.buildRustPackage rec { $out/bin/rbw gen-completions $shell > rbw.$shell installShellCompletion rbw.$shell done - '' + '' cp bin/git-credential-rbw $out/bin '' + lib.optionalString withFzf '' cp bin/rbw-fzf $out/bin diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 4b62fb4e916ba..70a6d0a04e5e6 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -862,6 +862,8 @@ with pkgs; aescrypt = callPackage ../tools/misc/aescrypt { }; + aether-lv2 = callPackage ../applications/audio/aether-lv2 { }; + acme-client = callPackage ../tools/networking/acme-client { stdenv = gccStdenv; }; adriconf = callPackage ../tools/graphics/adriconf { }; @@ -1459,7 +1461,9 @@ with pkgs; bic = callPackage ../development/interpreters/bic { }; - binance = callPackage ../applications/misc/binance { }; + binance = callPackage ../applications/misc/binance { + electron = electron_12; + }; bit = callPackage ../applications/version-management/git-and-tools/bit { }; @@ -8177,6 +8181,8 @@ with pkgs; opensm = callPackage ../tools/networking/opensm { }; + tinyssh = callPackage ../tools/networking/tinyssh { }; + opensshPackages = dontRecurseIntoAttrs (callPackage ../tools/networking/openssh {}); openssh = opensshPackages.openssh.override { @@ -14448,6 +14454,8 @@ with pkgs; fprettify = callPackage ../development/tools/fprettify { }; + fortran-language-server = python3.pkgs.callPackage ../development/tools/fortran-language-server { }; + framac = callPackage ../development/tools/analysis/frama-c { }; frame = callPackage ../development/libraries/frame { }; @@ -15824,6 +15832,8 @@ with pkgs; cointop = callPackage ../applications/misc/cointop { }; + collada-dom = callPackage ../development/libraries/collada-dom { }; + cog = callPackage ../development/web/cog { }; cosmopolitan = callPackage ../development/libraries/cosmopolitan { }; @@ -19221,6 +19231,8 @@ with pkgs; readosm = callPackage ../development/libraries/readosm { }; + recastnavigation = callPackage ../development/libraries/recastnavigation { }; + rinutils = callPackage ../development/libraries/rinutils { }; kissfft = callPackage ../development/libraries/kissfft { }; @@ -28165,6 +28177,8 @@ with pkgs; git = gitMinimal; }; + surge-XT = callPackage ../applications/audio/surge-XT { }; + survex = callPackage ../applications/misc/survex { inherit (darwin.apple_sdk.frameworks) Carbon Cocoa; }; diff --git a/pkgs/top-level/metrics.nix b/pkgs/top-level/metrics.nix index c045439da1abe..1decb810f9738 100644 --- a/pkgs/top-level/metrics.nix +++ b/pkgs/top-level/metrics.nix @@ -8,7 +8,8 @@ runCommand "nixpkgs-metrics" #requiredSystemFeatures = [ "benchmark" ]; # dedicated machine, by @vcunat last time } '' - export NIX_STATE_DIR=$TMPDIR + export NIX_STORE_DIR=$TMPDIR/store + export NIX_STATE_DIR=$TMPDIR/state export NIX_PAGER= nix-store --init diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 75bb41c30af5f..1f7f0eba8f6d9 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -4581,6 +4581,10 @@ in { manhole = callPackage ../development/python-modules/manhole { }; + manimpango = callPackage ../development/python-modules/manimpango { + inherit (pkgs.darwin.apple_sdk.frameworks) AppKit; + }; + manifestparser = callPackage ../development/python-modules/marionette-harness/manifestparser.nix { }; manuel = callPackage ../development/python-modules/manuel { }; @@ -5422,6 +5426,8 @@ in { pamqp = callPackage ../development/python-modules/pamqp { }; + panacotta = callPackage ../development/python-modules/panacotta { }; + pandas = callPackage ../development/python-modules/pandas { }; pandas-datareader = callPackage ../development/python-modules/pandas-datareader { }; @@ -7720,6 +7726,8 @@ in { cudaSupport = false; }; + pytraccar = callPackage ../development/python-modules/pytraccar { }; + pytradfri = callPackage ../development/python-modules/pytradfri { }; pytrafikverket = callPackage ../development/python-modules/pytrafikverket { }; @@ -7769,6 +7777,8 @@ in { pyupgrade = callPackage ../development/python-modules/pyupgrade { }; + pyuptimerobot = callPackage ../development/python-modules/pyuptimerobot { }; + pyusb = callPackage ../development/python-modules/pyusb { inherit (pkgs) libusb1; }; @@ -8531,7 +8541,7 @@ in { simplekml = callPackage ../development/python-modules/simplekml { }; - simple-di = callPackage ../development/python-modules/simple_di { }; + simple-di = callPackage ../development/python-modules/simple-di { }; simple-rest-client = callPackage ../development/python-modules/simple-rest-client { }; |