diff options
Diffstat (limited to 'pkgs')
169 files changed, 2035 insertions, 1389 deletions
diff --git a/pkgs/applications/editors/emacs/elisp-packages/control-lock/default.nix b/pkgs/applications/editors/emacs/elisp-packages/control-lock/default.nix new file mode 100644 index 0000000000000..82ea42aa2b83e --- /dev/null +++ b/pkgs/applications/editors/emacs/elisp-packages/control-lock/default.nix @@ -0,0 +1,23 @@ +{ lib, stdenv, fetchurl }: + +stdenv.mkDerivation { + name = "control-lock"; + + src = fetchurl { + url = "https://github.com/emacsmirror/emacswiki.org/blob/185fdc34fb1e02b43759ad933d3ee5646b0e78f8/control-lock.el"; + sha256 = "1b5xcgq2r565pr1c14dwrmn1fl05p56infapa5pqvajv2kpfla7h"; + }; + + dontUnpack = true; + + installPhase = '' + install -d $out/share/emacs/site-lisp + install $src $out/share/emacs/site-lisp/control-lock.el + ''; + + meta = { + description = "Like caps-lock, but for your control key. Give your pinky a rest!"; + homepage = "https://www.emacswiki.org/emacs/control-lock.el"; + platforms = lib.platforms.all; + }; +} diff --git a/pkgs/applications/editors/emacs/elisp-packages/manual-packages.nix b/pkgs/applications/editors/emacs/elisp-packages/manual-packages.nix index 676b9bfca9a61..a27135032e184 100644 --- a/pkgs/applications/editors/emacs/elisp-packages/manual-packages.nix +++ b/pkgs/applications/editors/emacs/elisp-packages/manual-packages.nix @@ -190,6 +190,8 @@ perl-completion = callPackage ./perl-completion { }; + control-lock = callPackage ./control-lock { }; + plz = callPackage ./plz { }; pod-mode = callPackage ./pod-mode { }; diff --git a/pkgs/applications/emulators/ryujinx/default.nix b/pkgs/applications/emulators/ryujinx/default.nix index 7a4f4351dc943..1c731718887ac 100644 --- a/pkgs/applications/emulators/ryujinx/default.nix +++ b/pkgs/applications/emulators/ryujinx/default.nix @@ -17,13 +17,13 @@ buildDotnetModule rec { pname = "ryujinx"; - version = "1.1.77"; # Based off of the official github actions builds: https://github.com/Ryujinx/Ryujinx/actions/workflows/release.yml + version = "1.1.91"; # Based off of the official github actions builds: https://github.com/Ryujinx/Ryujinx/actions/workflows/release.yml src = fetchFromGitHub { owner = "Ryujinx"; repo = "Ryujinx"; - rev = "df70442c46e7ee133b1fb79dc23ddd134e618085"; - sha256 = "1m9msp7kxsj7251l2yjcfzrb4k1lisk9sip7acm22pxmi1a7gw73"; + rev = "3f4fb8f73a6635dbdca9dd11738c3a793f53ac65"; + sha256 = "1amky7a2rikl5sg8y0y6il0jjqwhjgxw0d2ivynfhmhz2v2ciwwi"; }; dotnet-sdk = dotnetCorePackages.sdk_6_0; @@ -63,6 +63,10 @@ buildDotnetModule rec { ]; preInstall = '' + # workaround for https://github.com/Ryujinx/Ryujinx/issues/2349 + mkdir -p $out/lib/sndio-6 + ln -s ${sndio}/lib/libsndio.so $out/lib/sndio-6/libsndio.so.6 + # Ryujinx tries to use ffmpeg from PATH makeWrapperArgs+=( --suffix PATH : ${lib.makeBinPath [ ffmpeg ]} diff --git a/pkgs/applications/emulators/ryujinx/deps.nix b/pkgs/applications/emulators/ryujinx/deps.nix index 33f55f8cb6e8c..f8cdee576e9ea 100644 --- a/pkgs/applications/emulators/ryujinx/deps.nix +++ b/pkgs/applications/emulators/ryujinx/deps.nix @@ -23,9 +23,8 @@ (fetchNuGet { pname = "Microsoft.IdentityModel.Logging"; version = "6.15.0"; sha256 = "0jn9a20a2zixnkm3bmpmvmiv7mk0hqdlnpi0qgjkg1nir87czm19"; }) (fetchNuGet { pname = "Microsoft.IdentityModel.Tokens"; version = "6.15.0"; sha256 = "1nbgydr45f7lp980xyrkzpyaw2mkkishjwp3slgxk7f0mz6q8i1v"; }) (fetchNuGet { pname = "Microsoft.NET.Test.Sdk"; version = "16.8.0"; sha256 = "1ln2mva7j2mpsj9rdhpk8vhm3pgd8wn563xqdcwd38avnhp74rm9"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Host.linux-x64"; version = "6.0.3"; sha256 = "1py3nrfvllqlnb9mhs0qwgy7c14n33b2hfb0qc49rx22sqv8ylbp"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Host.win-x64"; version = "6.0.3"; sha256 = "1y428glba68s76icjzfl1v3p61pcz7rd78wybhabs8zq8w9cp2pj"; }) (fetchNuGet { pname = "Microsoft.NETCore.App.Host.osx-x64"; version = "6.0.3"; sha256 = "0k9gc94cvn36p0v3pj296asg2sq9a8ah6lfw0xvvmd4hq2k72s79"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Host.win-x64"; version = "6.0.3"; sha256 = "1y428glba68s76icjzfl1v3p61pcz7rd78wybhabs8zq8w9cp2pj"; }) (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.linux-x64"; version = "6.0.3"; sha256 = "0f04srx6q0jk81a60n956hz32fdngzp0xmdb2x7gyl77gsq8yijj"; }) (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.osx-x64"; version = "6.0.3"; sha256 = "0180ipzzz9pc6f6l17rg5bxz1ghzbapmiqq66kdl33bmbny6vmm9"; }) (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.win-x64"; version = "6.0.3"; sha256 = "1rjkzs2013razi2xs943q62ys1jh8blhjcnj75qkvirf859d11qw"; }) diff --git a/pkgs/applications/emulators/ryujinx/updater.sh b/pkgs/applications/emulators/ryujinx/updater.sh index 9c2f69e606cac..3f6acf5e44d47 100755 --- a/pkgs/applications/emulators/ryujinx/updater.sh +++ b/pkgs/applications/emulators/ryujinx/updater.sh @@ -1,33 +1,60 @@ #! /usr/bin/env nix-shell -#! nix-shell -i bash -p coreutils gnused curl common-updater-scripts nuget-to-nix nix-prefetch-git jq dotnet-sdk_6 +#! nix-shell -I nixpkgs=./. -i bash -p coreutils gnused curl common-updater-scripts nuget-to-nix nix-prefetch-git jq dotnet-sdk_6 set -euo pipefail cd "$(dirname "${BASH_SOURCE[0]}")" DEPS_FILE="$(realpath "./deps.nix")" -RELEASE_JOB_DATA=$( - curl -s -H "Accept: application/vnd.github.v3+json" \ - https://api.github.com/repos/Ryujinx/Ryujinx/actions/workflows | - jq -r '.workflows[] | select(.name == "Release job") | { id, path }' -) -RELEASE_JOB_ID=$(echo "$RELEASE_JOB_DATA" | jq -r '.id') -RELEASE_JOB_FILE=$(echo "$RELEASE_JOB_DATA" | jq -r '.path') - -BASE_VERSION=$( - curl -s "https://raw.githubusercontent.com/Ryujinx/Ryujinx/master/${RELEASE_JOB_FILE}" | - grep -Po 'RYUJINX_BASE_VERSION:.*?".*"' | - sed 's/RYUJINX_BASE_VERSION: "\(.*\)"/\1/' -) - -LATEST_RELEASE_JOB_DATA=$( - curl -s -H "Accept: application/vnd.github.v3+json" \ - "https://api.github.com/repos/Ryujinx/Ryujinx/actions/workflows/${RELEASE_JOB_ID}/runs" | - jq -r '.workflow_runs[0] | { head_sha, run_number }' -) -COMMIT=$(echo "$LATEST_RELEASE_JOB_DATA" | jq -r '.head_sha') -PATCH_VERSION=$(echo "$LATEST_RELEASE_JOB_DATA" | jq -r '.run_number') - -NEW_VERSION="${BASE_VERSION}.${PATCH_VERSION}" +# provide a github token so you don't get rate limited +# if you use gh cli you can use: +# `export GITHUB_TOKEN="$(cat ~/.config/gh/config.yml | yq '.hosts."github.com".oauth_token' -r)"` +# or just set your token by hand: +# `read -s -p "Enter your token: " GITHUB_TOKEN; export GITHUB_TOKEN` +# (we use read so it doesn't show in our shell history and in secret mode so the token you paste isn't visible) +if [ -z "${GITHUB_TOKEN:-}" ]; then + echo "no GITHUB_TOKEN provided - you could meet API request limiting" >&2 +fi + +# or provide the new version manually +# manually modify and uncomment or export these env vars in your shell so they're accessable within the script +# make sure you don't commit your changes here +# +# NEW_VERSION="" +# COMMIT="" + +if [ -z ${NEW_VERSION+x} ] && [ -z ${COMMIT+x} ]; then + RELEASE_JOB_DATA=$( + curl -s -H "Accept: application/vnd.github.v3+json" \ + ${GITHUB_TOKEN:+ -H "Authorization: bearer $GITHUB_TOKEN"} \ + https://api.github.com/repos/Ryujinx/Ryujinx/actions/workflows + ) + if [ -z "$RELEASE_JOB_DATA" ] || [[ $RELEASE_JOB_DATA =~ "rate limit exceeded" ]]; then + echo "failed to get release job data" >&2 + exit 1 + fi + RELEASE_JOB_ID=$(echo "$RELEASE_JOB_DATA" | jq -r '.workflows[] | select(.name == "Release job") | .id') + RELEASE_JOB_FILE=$(echo "$RELEASE_JOB_DATA" | jq -r '.workflows[] | select(.name == "Release job") | .path') + + LATEST_RELEASE_JOB_DATA=$( + curl -s -H "Accept: application/vnd.github.v3+json" \ + ${GITHUB_TOKEN:+ -H "Authorization: bearer $GITHUB_TOKEN"} \ + "https://api.github.com/repos/Ryujinx/Ryujinx/actions/workflows/${RELEASE_JOB_ID}/runs" + ) + if [ -z "$LATEST_RELEASE_JOB_DATA" ] || [[ $LATEST_RELEASE_JOB_DATA =~ "rate limit exceeded" ]]; then + echo "failed to get latest release job data" >&2 + exit 1 + fi + COMMIT=$(echo "$LATEST_RELEASE_JOB_DATA" | jq -r '.workflow_runs[0] | .head_sha') + PATCH_VERSION=$(echo "$LATEST_RELEASE_JOB_DATA" | jq -r '.workflow_runs[0] | .run_number') + + BASE_VERSION=$( + curl -s "https://raw.githubusercontent.com/Ryujinx/Ryujinx/master/${RELEASE_JOB_FILE}" | + grep -Po 'RYUJINX_BASE_VERSION:.*?".*"' | + sed 's/RYUJINX_BASE_VERSION: "\(.*\)"/\1/' + ) + + NEW_VERSION="${BASE_VERSION}.${PATCH_VERSION}" +fi OLD_VERSION="$(sed -nE 's/\s*version = "(.*)".*/\1/p' ./default.nix)" diff --git a/pkgs/applications/graphics/hydrus/default.nix b/pkgs/applications/graphics/hydrus/default.nix index 1d0cf4bec7d08..63174ecba98d5 100644 --- a/pkgs/applications/graphics/hydrus/default.nix +++ b/pkgs/applications/graphics/hydrus/default.nix @@ -10,14 +10,14 @@ python3Packages.buildPythonPackage rec { pname = "hydrus"; - version = "478"; + version = "479"; format = "other"; src = fetchFromGitHub { owner = "hydrusnetwork"; repo = "hydrus"; rev = "v${version}"; - sha256 = "sha256-ZsQzKc2fOFTzI/kBS8ws2+XT9kRAn4L55n1EZgVy4Kk="; + sha256 = "sha256-hP+tOrtYfxAKmNCJSYWQzmd0hjxktNEjJqb42lPG9IM="; }; nativeBuildInputs = [ diff --git a/pkgs/applications/misc/gsctl/default.nix b/pkgs/applications/misc/gsctl/default.nix index 95a909c29a977..de6071ef06008 100644 --- a/pkgs/applications/misc/gsctl/default.nix +++ b/pkgs/applications/misc/gsctl/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "gsctl"; - version = "1.1.4"; + version = "1.1.5"; src = fetchFromGitHub { owner = "giantswarm"; repo = pname; rev = version; - sha256 = "sha256-uCNWgaLZMm1vPxFduj8mpjKYuYlp1ChF6bK+bmAWy50="; + sha256 = "sha256-P1hJoZ1YSZTCo5ha/Um/nYVVhbYC3dcrQGJYTSnqNu4="; }; - vendorSha256 = "sha256-lZgHrQYqoyoM1Iv6vCqTMcv62zSKyxaAsq56kUXHrIA="; + vendorSha256 = "sha256-NeRABlKUpD2ZHRid/vu34Dh9uHZ+7IXWFPX8jkexUog="; ldflags = [ "-s" "-w" "-X github.com/giantswarm/gsctl/buildinfo.Version=${version}" ]; diff --git a/pkgs/applications/misc/zathura/core/default.nix b/pkgs/applications/misc/zathura/core/default.nix index 000fc06bbf1bd..6398b88ffccd0 100644 --- a/pkgs/applications/misc/zathura/core/default.nix +++ b/pkgs/applications/misc/zathura/core/default.nix @@ -10,11 +10,11 @@ with lib; stdenv.mkDerivation rec { pname = "zathura"; - version = "0.4.8"; + version = "0.4.9"; src = fetchurl { url = "https://pwmt.org/projects/${pname}/download/${pname}-${version}.tar.xz"; - sha256 = "1nr0ym1mi2afk4ycdf1ppmkcv7i7hyzwn4p3r4m0j2qm3nvaiami"; + sha256 = "0msy7s57mlx0wya99qpia4fpcy40pbj253kmx2y97nb0sqnc8c7w"; }; outputs = [ "bin" "man" "dev" "out" ]; diff --git a/pkgs/applications/networking/cluster/istioctl/default.nix b/pkgs/applications/networking/cluster/istioctl/default.nix index 84ba5330da106..6c88926ca2429 100644 --- a/pkgs/applications/networking/cluster/istioctl/default.nix +++ b/pkgs/applications/networking/cluster/istioctl/default.nix @@ -37,7 +37,7 @@ buildGoModule rec { description = "Istio configuration command line utility for service operators to debug and diagnose their Istio mesh"; homepage = "https://istio.io/latest/docs/reference/commands/istioctl"; license = licenses.asl20; - maintainers = with maintainers; [ veehaitch ]; + maintainers = with maintainers; [ superherointj bryanasdev000 veehaitch ]; platforms = platforms.unix; }; } diff --git a/pkgs/applications/networking/cluster/sonobuoy/default.nix b/pkgs/applications/networking/cluster/sonobuoy/default.nix index f08f403de2824..4b935027d2e28 100644 --- a/pkgs/applications/networking/cluster/sonobuoy/default.nix +++ b/pkgs/applications/networking/cluster/sonobuoy/default.nix @@ -1,11 +1,11 @@ { lib, buildGoModule, fetchFromGitHub }: # SHA of ${version} for the tool's help output. Unfortunately this is needed in build flags. -let rev = "1005bee8fff1b8daa30ddbcca717d03384630a71"; +let rev = "51c79060fc1433233eb43842de564f0f2e47be86"; in buildGoModule rec { pname = "sonobuoy"; - version = "0.56.3"; # Do not forget to update `rev` above + version = "0.56.4"; # Do not forget to update `rev` above ldflags = let t = "github.com/vmware-tanzu/sonobuoy"; @@ -20,10 +20,10 @@ buildGoModule rec { owner = "vmware-tanzu"; repo = "sonobuoy"; rev = "v${version}"; - sha256 = "sha256-7yN3/bGjcntzMQRbB//fmqvD7me/xKLytfF+mQ1fcfc="; + sha256 = "sha256-6kHqfWDrZL3J5SrZ3JK50Z2Sw8mwM0zrfaKWo22g27A="; }; - vendorSha256 = "sha256-qKXm39CwrTcXENIMh2BBS3MUlhJvmTTA3UzZNpF0PCc="; + vendorSha256 = "sha256-8n4a1PLUYDU46lVegQoOCmmRSR1XfnjgEGZ+R5f36Ic="; subPackages = [ "." ]; diff --git a/pkgs/applications/networking/instant-messengers/skypeforlinux/default.nix b/pkgs/applications/networking/instant-messengers/skypeforlinux/default.nix index b23f4f107aed4..024ac9a143182 100644 --- a/pkgs/applications/networking/instant-messengers/skypeforlinux/default.nix +++ b/pkgs/applications/networking/instant-messengers/skypeforlinux/default.nix @@ -7,7 +7,7 @@ let # Please keep the version x.y.0.z and do not update to x.y.76.z because the # source of the latter disappears much faster. - version = "8.81.0.268"; + version = "8.82.0.403"; rpath = lib.makeLibraryPath [ alsa-lib @@ -68,7 +68,7 @@ let "https://mirror.cs.uchicago.edu/skype/pool/main/s/skypeforlinux/skypeforlinux_${version}_amd64.deb" "https://web.archive.org/web/https://repo.skype.com/deb/pool/main/s/skypeforlinux/skypeforlinux_${version}_amd64.deb" ]; - sha256 = "sha256-MqXLK+AdYkQVTeTjul9Dru78597FuThRUVq7/y9FYUU="; + sha256 = "sha256-45aHb6BI0kUnJOlRsglyGdZ6+8sLmHZK3FN8nYpuHXM="; } else throw "Skype for linux is not supported on ${stdenv.hostPlatform.system}"; diff --git a/pkgs/applications/networking/instant-messengers/slack/default.nix b/pkgs/applications/networking/instant-messengers/slack/default.nix index 5eb7518ea378c..5b542efff2309 100644 --- a/pkgs/applications/networking/instant-messengers/slack/default.nix +++ b/pkgs/applications/networking/instant-messengers/slack/default.nix @@ -44,14 +44,14 @@ let pname = "slack"; - x86_64-darwin-version = "4.23.0"; - x86_64-darwin-sha256 = "0l4zfyys0yf95dn0sldyjkhzp7bpn84z9q9li1lvv5jj55f0g9jd"; + x86_64-darwin-version = "4.25.0"; + x86_64-darwin-sha256 = "1ffg003ic0jhkis9ai2873axwzqj9yvjab8212zwhvr3a23zzr5c"; - x86_64-linux-version = "4.23.0"; - x86_64-linux-sha256 = "1wsrxacnj9f3cb6as7ncbdvi02jqcbyc7ijsavps5bls9phkp0is"; + x86_64-linux-version = "4.25.0"; + x86_64-linux-sha256 = "0b22hnf9bzdzffnxrsjqcimqhz5imshvp9gw9baz12d45jh610g8"; - aarch64-darwin-version = "4.23.0"; - aarch64-darwin-sha256 = "053psiqysyi7l8pviq0vwvk2azlxcpdrwfa0b99f1h6lbfcf48f3"; + aarch64-darwin-version = "4.25.0"; + aarch64-darwin-sha256 = "0s4c66bzi42y2r1c94r4ds5fyzzgvzkvrria0z45ysa47lnldp0f"; version = { x86_64-darwin = x86_64-darwin-version; diff --git a/pkgs/applications/networking/n8n/node-packages.nix b/pkgs/applications/networking/n8n/node-packages.nix index ab66b28fe17ac..1793956b1d3a6 100644 --- a/pkgs/applications/networking/n8n/node-packages.nix +++ b/pkgs/applications/networking/n8n/node-packages.nix @@ -445,13 +445,13 @@ let sha512 = "zm6xBQpFDIDM6o9r6HSgDeIcLy82TKWctCXEPbJJcXb5AKmi5BNNdLXneixK4lplX3PqIVcwLBCGE/kAGnlD4A=="; }; }; - "@types/lodash-4.14.180" = { + "@types/lodash-4.14.181" = { name = "_at_types_slash_lodash"; packageName = "@types/lodash"; - version = "4.14.180"; + version = "4.14.181"; src = fetchurl { - url = "https://registry.npmjs.org/@types/lodash/-/lodash-4.14.180.tgz"; - sha512 = "XOKXa1KIxtNXgASAnwj7cnttJxS4fksBRywK/9LzRV5YxrF80BXZIGeQSuoESQ/VkUj30Ae0+YcuHc15wJCB2g=="; + url = "https://registry.npmjs.org/@types/lodash/-/lodash-4.14.181.tgz"; + sha512 = "n3tyKthHJbkiWhDZs3DkhkCzt2MexYHXlX0td5iMplyfwketaOeKboEVBqzceH7juqvEg3q5oUoBFxSLu7zFag=="; }; }; "@types/lossless-json-1.0.1" = { @@ -661,13 +661,13 @@ let sha1 = "6a3e6bf0a63900ba15652808cb15c6813d1a5f25"; }; }; - "adler-32-1.3.0" = { + "adler-32-1.3.1" = { name = "adler-32"; packageName = "adler-32"; - version = "1.3.0"; + version = "1.3.1"; src = fetchurl { - url = "https://registry.npmjs.org/adler-32/-/adler-32-1.3.0.tgz"; - sha512 = "f5nltvjl+PRUh6YNfUstRaXwJxtfnKEWhAWWlmKvh+Y3J2+98a0KKVYDEhz6NdKGqswLhjNGznxfSsZGOvOd9g=="; + url = "https://registry.npmjs.org/adler-32/-/adler-32-1.3.1.tgz"; + sha512 = "ynZ4w/nUUv5rrsR8UUGoe1VC9hZj6V5hU9Qw1HlMDJGEJw5S7TfTErWTjMys6M7vr0YWcPqs3qAr4ss0nDfP+A=="; }; }; "agent-base-6.0.2" = { @@ -958,22 +958,22 @@ let sha512 = "h7diyELoq692AA4oqO50ULoYKIomUdzuQ+NW+eFPwIX0xzVbXEu9cIcgzZ3TYNVbpkGtcNKh51aRfAQNef7HVA=="; }; }; - "avsc-5.7.3" = { + "avsc-5.7.4" = { name = "avsc"; packageName = "avsc"; - version = "5.7.3"; + version = "5.7.4"; src = fetchurl { - url = "https://registry.npmjs.org/avsc/-/avsc-5.7.3.tgz"; - sha512 = "uUbetCWczQHbsKyX1C99XpQHBM8SWfovvaZhPIj23/1uV7SQf0WeRZbiLpw0JZm+LHTChfNgrLfDJOVoU2kU+A=="; + url = "https://registry.npmjs.org/avsc/-/avsc-5.7.4.tgz"; + sha512 = "z4oo33lmnvvNRqfUe3YjDGGpqu/L2+wXBIhMtwq6oqZ+exOUAkQYM6zd2VWKF7AIlajOF8ZZuPFfryTG9iLC/w=="; }; }; - "aws-sdk-2.1101.0" = { + "aws-sdk-2.1106.0" = { name = "aws-sdk"; packageName = "aws-sdk"; - version = "2.1101.0"; + version = "2.1106.0"; src = fetchurl { - url = "https://registry.npmjs.org/aws-sdk/-/aws-sdk-2.1101.0.tgz"; - sha512 = "7lyVb7GXGl8yyu954Qxf6vU6MrcgFlmKyTLBVXJyo3Phn1OB+qOExA55WtSC6gQiQ7e5TeWOn1RUHLg30ywTBA=="; + url = "https://registry.npmjs.org/aws-sdk/-/aws-sdk-2.1106.0.tgz"; + sha512 = "3dr0TTR2LI70ST8fa4IgXHpWdH4yv7FLnt9YEndwFQ8ar2EMCMpMU67wwCGBA72GUi0aOg4+lsLjGmCvIq3jug=="; }; }; "aws-sign2-0.7.0" = { @@ -1174,6 +1174,15 @@ let sha512 = "SAAwOxgoCKMGs9uUAUFHygfLAyaniaoun6I8mFY9pRAJL9+Kec34aU+oIjDhTycub1jozEfEwx1W1IuOYxVSFw=="; }; }; + "body-parser-1.20.0" = { + name = "body-parser"; + packageName = "body-parser"; + version = "1.20.0"; + src = fetchurl { + url = "https://registry.npmjs.org/body-parser/-/body-parser-1.20.0.tgz"; + sha512 = "DfJ+q6EPcGKZD1QWUjSpqp+Q7bDQTsQIF4zfUAtZ6qk+H/3/QRhg9CEp39ss+/T2vw0+HaidC0ecJj/DRLIaKg=="; + }; + }; "body-parser-xml-2.0.3" = { name = "body-parser-xml"; packageName = "body-parser-xml"; @@ -1435,13 +1444,13 @@ let sha512 = "hjx1XE1M/D5pAtMgvWwE21QClmAEeGHOIDfycgmndisdNgI6PE1cGRQkMGBcsbUbmEQyWu5PJLUcAOjtQS8DWw=="; }; }; - "cheerio-select-1.5.0" = { + "cheerio-select-1.6.0" = { name = "cheerio-select"; packageName = "cheerio-select"; - version = "1.5.0"; + version = "1.6.0"; src = fetchurl { - url = "https://registry.npmjs.org/cheerio-select/-/cheerio-select-1.5.0.tgz"; - sha512 = "qocaHPv5ypefh6YNxvnbABM07KMxExbtbfuJoIie3iZXX1ERwYmJcIiRrr9H05ucQP1k28dav8rpdDgjQd8drg=="; + url = "https://registry.npmjs.org/cheerio-select/-/cheerio-select-1.6.0.tgz"; + sha512 = "eq0GdBvxVFbqWgmCm7M3XGs1I8oLy/nExUnh6oLqmBditPO9AqQJrkslDpMun/hZ0yyTs8L0m85OHp4ho6Qm9g=="; }; }; "chokidar-3.5.2" = { @@ -1894,22 +1903,22 @@ let sha512 = "uTqEnCvWRk042asU6JtapDTcJeeailFy4ydOQS28bj1hcLnYRiqi8SsD2jS412AY1I/4qdOwWZun774iqywf9w=="; }; }; - "css-select-4.2.1" = { + "css-select-4.3.0" = { name = "css-select"; packageName = "css-select"; - version = "4.2.1"; + version = "4.3.0"; src = fetchurl { - url = "https://registry.npmjs.org/css-select/-/css-select-4.2.1.tgz"; - sha512 = "/aUslKhzkTNCQUB2qTX84lVmfia9NyjP3WpDGtj/WxhwBzWBYUV3DgUpurHTme8UTPcPlAD1DJ+b0nN/t50zDQ=="; + url = "https://registry.npmjs.org/css-select/-/css-select-4.3.0.tgz"; + sha512 = "wPpOYtnsVontu2mODhA19JrqWxNsfdatRKd64kmpRbQgh1KtItko5sTnEpPdpSaJszTOhEMlF/RPz28qj4HqhQ=="; }; }; - "css-what-5.1.0" = { + "css-what-6.1.0" = { name = "css-what"; packageName = "css-what"; - version = "5.1.0"; + version = "6.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/css-what/-/css-what-5.1.0.tgz"; - sha512 = "arSMRWIIFY0hV8pIxZMEfmMI47Wj3R/aWpZDDxWYCPEiOMv6tfOrnpDtgxBYPEQD4V0Y/958+1TdC3iWTFcUPw=="; + url = "https://registry.npmjs.org/css-what/-/css-what-6.1.0.tgz"; + sha512 = "HTUrgRJ7r4dsZKU6GjmpfRK1O76h97Z8MfS1G0FozR+oF2kG6Vfe8JE6zwrkbxigziPHinCJ+gCPjA9EaBDtRw=="; }; }; "cssfilter-0.0.10" = { @@ -2074,6 +2083,15 @@ let sha1 = "978857442c44749e4206613e37946205826abd80"; }; }; + "destroy-1.2.0" = { + name = "destroy"; + packageName = "destroy"; + version = "1.2.0"; + src = fetchurl { + url = "https://registry.npmjs.org/destroy/-/destroy-1.2.0.tgz"; + sha512 = "2sJGJTaXIIaR1w4iJSNoN0hnMY7Gpc/n8D4qSCJw8QqFWXf7cuAgnEHxBpweaVcPevC2l3KpjYCx3NypQQgaJg=="; + }; + }; "detect-libc-1.0.3" = { name = "detect-libc"; packageName = "detect-libc"; @@ -2299,13 +2317,13 @@ let sha512 = "2bmlRpNKBxT/CRmPOlyISQpNj+qSeYvcym/uT0Jx2bMOlKLtSy1ZmLuVxSEKKyor/N5yhvp/ZiG1oE3DEYMSFA=="; }; }; - "es-abstract-1.19.1" = { + "es-abstract-1.19.2" = { name = "es-abstract"; packageName = "es-abstract"; - version = "1.19.1"; + version = "1.19.2"; src = fetchurl { - url = "https://registry.npmjs.org/es-abstract/-/es-abstract-1.19.1.tgz"; - sha512 = "2vJ6tjA/UfqLm2MPs7jxVybLoB8i1t1Jd9R3kISld20sIxPcTbLuggQOUxeWeAvIUkduv/CfMjuh4WmiXr2v9w=="; + url = "https://registry.npmjs.org/es-abstract/-/es-abstract-1.19.2.tgz"; + sha512 = "gfSBJoZdlL2xRiOCy0g8gLMryhoe1TlimjzU99L/31Z8QEGIhVQI+EWwt5lT+AuU9SnorVupXFqqOGqGfsyO6w=="; }; }; "es-to-primitive-1.2.1" = { @@ -3064,6 +3082,15 @@ let sha512 = "Kpk9Sm7NmI+RHhnj6OIWDI1d6fIoFAtFt9RLaTMRlg/8w49juAStsrBgp0Dp4OdxdVbRIeKhtCUvoi/RuAhO4g=="; }; }; + "http-errors-2.0.0" = { + name = "http-errors"; + packageName = "http-errors"; + version = "2.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/http-errors/-/http-errors-2.0.0.tgz"; + sha512 = "FtwrG/euBzaEjYeRqOgly7G0qviiXoJWnvEH2Z1plBdXgbyjv34pHTSb9zoeHMyDy33+DWy5Wt9Wo+TURtOYSQ=="; + }; + }; "http-proxy-agent-4.0.1" = { name = "http-proxy-agent"; packageName = "http-proxy-agent"; @@ -3442,13 +3469,13 @@ let sha512 = "41Cifkg6e8TylSpdtTpeLVMqvSBEVzTttHvERD741+pnZ8ANv0004MRL43QKPDlK9cGvNp6NZWZUBlbGXYxxng=="; }; }; - "is-number-object-1.0.6" = { + "is-number-object-1.0.7" = { name = "is-number-object"; packageName = "is-number-object"; - version = "1.0.6"; + version = "1.0.7"; src = fetchurl { - url = "https://registry.npmjs.org/is-number-object/-/is-number-object-1.0.6.tgz"; - sha512 = "bEVOqiRcvo3zO1+G2lVMy+gkkEm9Yh7cDMRusKKu5ZJKPUYSJwICTKZrNKHA2EbSP0Tu0+6B/emsYNHZyn6K8g=="; + url = "https://registry.npmjs.org/is-number-object/-/is-number-object-1.0.7.tgz"; + sha512 = "k1U0IRzLMo7ZlYIfzRu23Oh6MiIFasgpb9X76eqfFZAqwH44UI4KTBvBYIZ1dSL9ZzChTB9ShHfLkR4pdW5krQ=="; }; }; "is-promise-1.0.1" = { @@ -3496,13 +3523,13 @@ let sha512 = "XVm7LOeLpTW4jV19QSH38vkswxoLud8sQ57YwJVTPWdiaI9I8keEhGFpBlslyVsgdQy4Opg8QOLb8YRgsyZiQg=="; }; }; - "is-shared-array-buffer-1.0.1" = { + "is-shared-array-buffer-1.0.2" = { name = "is-shared-array-buffer"; packageName = "is-shared-array-buffer"; - version = "1.0.1"; + version = "1.0.2"; src = fetchurl { - url = "https://registry.npmjs.org/is-shared-array-buffer/-/is-shared-array-buffer-1.0.1.tgz"; - sha512 = "IU0NmyknYZN0rChcKhRO1X8LYz5Isj/Fsqh8NJOSf+N/hCOTwy29F32Ik7a+QszE63IdvmwdTPDd6cZ5pg4cwA=="; + url = "https://registry.npmjs.org/is-shared-array-buffer/-/is-shared-array-buffer-1.0.2.tgz"; + sha512 = "sqN2UDu1/0y6uvXyStCOzyhAjCSlHceFoMKJW8W9EU9cvic/QdsZ0kEU93HEy3IUEFZIiH/3w+AH/UQbPHNdhA=="; }; }; "is-stream-2.0.1" = { @@ -4504,13 +4531,13 @@ let sha512 = "z81GNO7nnYMEhrGh9LeymoE4+Yr0Wn5McHIZMK5cfQCl+NDX08sCZgUc9/6MHni9IWuFLm1Z3HTCXu2z9fN62Q=="; }; }; - "n8n-core-0.111.0" = { + "n8n-core-0.112.0" = { name = "n8n-core"; packageName = "n8n-core"; - version = "0.111.0"; + version = "0.112.0"; src = fetchurl { - url = "https://registry.npmjs.org/n8n-core/-/n8n-core-0.111.0.tgz"; - sha512 = "fZLLJ60yIuuX+geKGQrO6jk+kxn1UaCJMoWEi2FVE+InTmi+/r51Bv6LGoapoW0Oz+Em+CDq0wE7Yzg3xNx7fw=="; + url = "https://registry.npmjs.org/n8n-core/-/n8n-core-0.112.0.tgz"; + sha512 = "1b/J9XWBrjqMCcDAM1vZlsEpeBXI7gZ9Jpxgpgu4eHh3l/BJfyeqq5KXgULfyDtolDn/bil0s7qXA2njmZLerw=="; }; }; "n8n-design-system-0.16.0" = { @@ -4522,31 +4549,31 @@ let sha512 = "X7Qa+DoXRyJL4gqh7x59udnPIBYAUgDvhchL33dpI/Rgq9gaFajT9eAuOFQnXKMUaL0FZ5hu3rRGcAmwwEA/bA=="; }; }; - "n8n-editor-ui-0.137.0" = { + "n8n-editor-ui-0.138.0" = { name = "n8n-editor-ui"; packageName = "n8n-editor-ui"; - version = "0.137.0"; + version = "0.138.0"; src = fetchurl { - url = "https://registry.npmjs.org/n8n-editor-ui/-/n8n-editor-ui-0.137.0.tgz"; - sha512 = "/wYAIh/3RtVaFxY+vtVEACfo6xsVOi3cEPWd+GSFCK/AMxXs517CNGbwNz54geqaGNUH+rhhUz87C0pG+TgiUg=="; + url = "https://registry.npmjs.org/n8n-editor-ui/-/n8n-editor-ui-0.138.0.tgz"; + sha512 = "1/mUJYSWG4vmUfMlT65lvtQzfDBMCHxhdIU3TUG2umvdIEsSHJM1gZwAPfoJZppoZ6DX/ApuxXY/67OXfgatQw=="; }; }; - "n8n-nodes-base-0.168.0" = { + "n8n-nodes-base-0.169.0" = { name = "n8n-nodes-base"; packageName = "n8n-nodes-base"; - version = "0.168.0"; + version = "0.169.0"; src = fetchurl { - url = "https://registry.npmjs.org/n8n-nodes-base/-/n8n-nodes-base-0.168.0.tgz"; - sha512 = "TyIL5Gwn+qvfi+1nNkQTPfrJYMqjx2P2OCiDWAMfzahauJyJpfJMYpIEKF3UxoKXCfWpBYPmHVoov6GadEOR1w=="; + url = "https://registry.npmjs.org/n8n-nodes-base/-/n8n-nodes-base-0.169.0.tgz"; + sha512 = "O8vwS7ROybSRLqXwG58xdLNrbA8hAvX4jSodXsztpGChbDWcrYJUXBewN9+Lfh1UAegz12G1devygc1W92qveQ=="; }; }; - "n8n-workflow-0.93.0" = { + "n8n-workflow-0.94.0" = { name = "n8n-workflow"; packageName = "n8n-workflow"; - version = "0.93.0"; + version = "0.94.0"; src = fetchurl { - url = "https://registry.npmjs.org/n8n-workflow/-/n8n-workflow-0.93.0.tgz"; - sha512 = "IqZrnTKdIZD7aeL9/FiwoI7w1WBgeBmqZVXRF+OGtIHooK/lDkHpy17hoXXqAyeATiVf2licgl8F/zMvSsnuJA=="; + url = "https://registry.npmjs.org/n8n-workflow/-/n8n-workflow-0.94.0.tgz"; + sha512 = "cVs5XPlbNDcCrGU5IoYzjO7IOsYNsNtEt5vVxkL9q5EgEmHhPYakValJN4GyLQ7Otdpsf47lJg/0EG3TvOssGQ=="; }; }; "named-placeholders-1.1.2" = { @@ -4567,13 +4594,13 @@ let sha512 = "wynEP02LmIbLpcYw8uBKpcfF6dmg2vcpKqxeH5UcoKEYdExslsdUA4ugFauuaeYdTB76ez6gJW8XAZ6CgkXYxA=="; }; }; - "nanoid-3.3.1" = { + "nanoid-3.3.2" = { name = "nanoid"; packageName = "nanoid"; - version = "3.3.1"; + version = "3.3.2"; src = fetchurl { - url = "https://registry.npmjs.org/nanoid/-/nanoid-3.3.1.tgz"; - sha512 = "n6Vs/3KGyxPQd6uO0eH4Bv0ojGSUvuLlIHtC3Y0kEO23YRge8H9x1GCzLn28YX0H66pMkxuaeESFq4tKISKwdw=="; + url = "https://registry.npmjs.org/nanoid/-/nanoid-3.3.2.tgz"; + sha512 = "CuHBogktKwpm5g2sRgv83jEy2ijFzBwMoYA60orPDR7ynsLijJDqgsi4RDGj3OJpy3Ieb+LYwiRmIOGyytgITA=="; }; }; "native-duplexpair-1.0.0" = { @@ -4864,6 +4891,15 @@ let sha1 = "20f1336481b083cd75337992a16971aa2d906947"; }; }; + "on-finished-2.4.1" = { + name = "on-finished"; + packageName = "on-finished"; + version = "2.4.1"; + src = fetchurl { + url = "https://registry.npmjs.org/on-finished/-/on-finished-2.4.1.tgz"; + sha512 = "oVlzkg3ENAhCk2zdv7IJwd/QUD4z2RxRwpkcGY8psCVcCYZNq4wYnVWALHM+brtuJjePWiYF/ClmuDr8Ch5+kg=="; + }; + }; "on-headers-1.0.2" = { name = "on-headers"; packageName = "on-headers"; @@ -5431,15 +5467,6 @@ let sha512 = "zA2SmoLaxZyArQTOPj5LXecR+RagfPSU5Kw1qP+jkWeNlrq+eJZyY2oS68SU1Z/7/myXM4lo9716laOFAVStCQ=="; }; }; - "printj-1.2.3" = { - name = "printj"; - packageName = "printj"; - version = "1.2.3"; - src = fetchurl { - url = "https://registry.npmjs.org/printj/-/printj-1.2.3.tgz"; - sha512 = "sanczS6xOJOg7IKDvi4sGOUOe7c1tsEzjwlLFH/zgwx/uyImVM9/rgBkc8AfiQa/Vg54nRd8mkm9yI7WV/O+WA=="; - }; - }; "printj-1.3.1" = { name = "printj"; packageName = "printj"; @@ -5737,6 +5764,15 @@ let sha512 = "UlTNLIcu0uzb4D2f4WltY6cVjLi+/jEN4lgEUj3E04tpMDpUlkBo/eSn6zou9hum2VMNpCCUone0O0WeJim07g=="; }; }; + "raw-body-2.5.1" = { + name = "raw-body"; + packageName = "raw-body"; + version = "2.5.1"; + src = fetchurl { + url = "https://registry.npmjs.org/raw-body/-/raw-body-2.5.1.tgz"; + sha512 = "qqJBtEyVgS0ZmPGdCFPWJ3FreoqvG4MVQln/kCgF7Olq95IbOp0/BWyMwbdtn4VTvkM8Y7khCQ2Xgk/tcrCXig=="; + }; + }; "rc-1.2.8" = { name = "rc"; packageName = "rc"; @@ -6286,13 +6322,13 @@ let sha512 = "wnD2ZE+l+SPC/uoS0vXeE9L1+0wuaMqKlfz9AMUo38JsyLSBWSFcHR1Rri62LZc12vLr1gb3jl7iwQhgwpAbGQ=="; }; }; - "simple-git-2.48.0" = { + "simple-git-3.5.0" = { name = "simple-git"; packageName = "simple-git"; - version = "2.48.0"; + version = "3.5.0"; src = fetchurl { - url = "https://registry.npmjs.org/simple-git/-/simple-git-2.48.0.tgz"; - sha512 = "z4qtrRuaAFJS4PUd0g+xy7aN4y+RvEt/QTJpR184lhJguBA1S/LsVlvE/CM95RsYMOFJG3NGGDjqFCzKU19S/A=="; + url = "https://registry.npmjs.org/simple-git/-/simple-git-3.5.0.tgz"; + sha512 = "fZsaq5nzdxQRhMNs6ESGLpMUHoL5GRP+boWPhq9pMYMKwOGZV2jHOxi8AbFFA2Y/6u4kR99HoULizSbpzaODkA=="; }; }; "simple-lru-cache-0.0.2" = { @@ -6430,13 +6466,13 @@ let sha512 = "+idbmIXoYET47hH+d7dfm2epdOMUDjqcB4648sTZ+t2JwoyBFL/insLfB/racrDmsKB3diwsDA696pZMieAC5g=="; }; }; - "ssh2-1.8.0" = { + "ssh2-1.9.0" = { name = "ssh2"; packageName = "ssh2"; - version = "1.8.0"; + version = "1.9.0"; src = fetchurl { - url = "https://registry.npmjs.org/ssh2/-/ssh2-1.8.0.tgz"; - sha512 = "NVIRkIwJvWl+mcRozp+EBzHMVCcbDKBea64ToPdZEk43yAVGwmfqYZRPFRnnvGjsKC34wYCmiupTcKgCVNVNNg=="; + url = "https://registry.npmjs.org/ssh2/-/ssh2-1.9.0.tgz"; + sha512 = "rhhIZT0eMPvCBSOG8CpqZZ7gre2vgXaIqmb3Jb83t88rjsxIsFzDanqBJM9Ns8BmP1835A5IbQ199io4EUZwOA=="; }; }; "ssh2-sftp-client-7.2.3" = { @@ -6484,6 +6520,15 @@ let sha1 = "161c7dac177659fd9811f43771fa99381478628c"; }; }; + "statuses-2.0.1" = { + name = "statuses"; + packageName = "statuses"; + version = "2.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/statuses/-/statuses-2.0.1.tgz"; + sha512 = "RwNA9Z/7PrK06rYLIzFMlaF+l73iwpzsqRIFgbMLbTcLD6cOao82TaWefPXQvB2fOC4AjuYSEndS7N/mTCbkdQ=="; + }; + }; "stealthy-require-1.1.1" = { name = "stealthy-require"; packageName = "stealthy-require"; @@ -7258,13 +7303,13 @@ let sha512 = "KEW0gkeNOLJjtXN4jqJhTazez5jtrwimHkE5Few/VxblH4F9EcvJiEsahrV5kg5uKd5U8du4ORKS6QjGE0piYA=="; }; }; - "vue-i18n-8.27.0" = { + "vue-i18n-8.27.1" = { name = "vue-i18n"; packageName = "vue-i18n"; - version = "8.27.0"; + version = "8.27.1"; src = fetchurl { - url = "https://registry.npmjs.org/vue-i18n/-/vue-i18n-8.27.0.tgz"; - sha512 = "SX35iJHL5PJ4Gfh0Mo/q0shyHiI2V6Zkh51c+k8E9O1RKv5BQyYrCxRzpvPrsIOJEnLaeiovet3dsUB0e/kDzw=="; + url = "https://registry.npmjs.org/vue-i18n/-/vue-i18n-8.27.1.tgz"; + sha512 = "lWrGm4F25qReJ7XxSnFVb2h3PfW54ldnM4C+YLBGGJ75+Myt/kj4hHSTKqsyDLamvNYpvINMicSOdW+7yuqgIQ=="; }; }; "vue2-boring-avatars-0.3.4" = { @@ -7579,10 +7624,10 @@ in n8n = nodeEnv.buildNodePackage { name = "n8n"; packageName = "n8n"; - version = "0.170.0"; + version = "0.171.0"; src = fetchurl { - url = "https://registry.npmjs.org/n8n/-/n8n-0.170.0.tgz"; - sha512 = "aY4A9+P7K6iinxFyDZl9Jdin283csAbiMStjfxLX5IfO75/aNbjXhSmpjclV9PCUuuTonvoMiVMTvpbCaeImqg=="; + url = "https://registry.npmjs.org/n8n/-/n8n-0.171.0.tgz"; + sha512 = "GenMxluqj0PfttyWndoMUsmyJ8r5pilWoY7xT+TVjCl5znhtIUT+3GTeDZ8K3vYqJILHXVxspyF5yLz2Ytnjow=="; }; dependencies = [ (sources."@azure/abort-controller-1.0.5" // { @@ -7691,7 +7736,7 @@ in sources."@types/ftp-0.3.33" sources."@types/json-diff-0.5.2" sources."@types/jsonwebtoken-8.5.8" - sources."@types/lodash-4.14.180" + sources."@types/lodash-4.14.181" sources."@types/lossless-json-1.0.1" sources."@types/mime-1.3.2" sources."@types/node-17.0.23" @@ -7762,8 +7807,8 @@ in sources."semver-6.3.0" ]; }) - sources."avsc-5.7.3" - (sources."aws-sdk-2.1101.0" // { + sources."avsc-5.7.4" + (sources."aws-sdk-2.1106.0" // { dependencies = [ sources."buffer-4.9.2" sources."events-1.1.1" @@ -7817,7 +7862,7 @@ in }) sources."bluebird-3.7.2" sources."bn.js-4.12.0" - (sources."body-parser-1.19.2" // { + (sources."body-parser-1.20.0" // { dependencies = [ sources."debug-2.6.9" sources."ms-2.0.0" @@ -7853,11 +7898,7 @@ in sources."caseless-0.12.0" (sources."cfb-1.2.1" // { dependencies = [ - (sources."adler-32-1.3.0" // { - dependencies = [ - sources."printj-1.2.3" - ]; - }) + sources."adler-32-1.3.1" sources."printj-1.3.1" ]; }) @@ -7870,7 +7911,7 @@ in sources."chardet-0.7.0" sources."charenc-0.0.2" sources."cheerio-1.0.0-rc.6" - sources."cheerio-select-1.5.0" + sources."cheerio-select-1.6.0" sources."chokidar-3.5.2" sources."chownr-1.1.4" sources."clamp-1.0.1" @@ -7956,8 +7997,8 @@ in sources."crypt-0.0.2" sources."crypto-js-4.1.1" sources."csrf-3.1.0" - sources."css-select-4.2.1" - sources."css-what-5.1.0" + sources."css-select-4.3.0" + sources."css-what-6.1.0" sources."cssfilter-0.0.10" sources."dashdash-1.14.1" sources."date-utils-1.2.21" @@ -7969,8 +8010,8 @@ in sources."delayed-stream-1.0.0" sources."delegates-1.0.0" sources."denque-1.5.1" - sources."depd-1.1.2" - sources."destroy-1.0.4" + sources."depd-2.0.0" + sources."destroy-1.2.0" sources."detect-libc-1.0.3" sources."diagnostics-1.1.1" sources."difflib-0.2.4" @@ -8006,7 +8047,7 @@ in sources."entities-2.2.0" sources."env-variable-0.0.6" sources."err-code-2.0.3" - sources."es-abstract-1.19.1" + sources."es-abstract-1.19.2" sources."es-to-primitive-1.2.1" sources."es5-ext-0.8.2" sources."escalade-3.1.1" @@ -8022,9 +8063,16 @@ in sources."expand-tilde-2.0.2" (sources."express-4.17.3" // { dependencies = [ + sources."body-parser-1.19.2" sources."cookie-0.4.2" sources."debug-2.6.9" + sources."depd-1.1.2" + sources."http-errors-1.8.1" sources."ms-2.0.0" + sources."on-finished-2.3.0" + sources."qs-6.9.7" + sources."raw-body-2.4.3" + sources."statuses-1.5.0" ]; }) sources."extend-3.0.2" @@ -8048,6 +8096,8 @@ in dependencies = [ sources."debug-2.6.9" sources."ms-2.0.0" + sources."on-finished-2.3.0" + sources."statuses-1.5.0" ]; }) sources."flatted-3.2.5" @@ -8126,7 +8176,7 @@ in sources."homedir-polyfill-1.0.3" sources."html-to-text-8.0.0" sources."htmlparser2-6.1.0" - sources."http-errors-1.8.1" + sources."http-errors-2.0.0" sources."http-proxy-agent-4.0.1" sources."http-signature-1.2.0" sources."https-proxy-agent-5.0.0" @@ -8162,13 +8212,13 @@ in sources."is-negated-glob-1.0.0" sources."is-negative-zero-2.0.2" sources."is-number-7.0.0" - sources."is-number-object-1.0.6" + sources."is-number-object-1.0.7" sources."is-promise-1.0.1" sources."is-property-1.0.2" sources."is-regex-1.1.4" sources."is-relative-1.0.0" sources."is-retry-allowed-2.2.0" - sources."is-shared-array-buffer-1.0.1" + sources."is-shared-array-buffer-1.0.2" sources."is-stream-2.0.1" sources."is-string-1.0.7" sources."is-symbol-1.0.4" @@ -8327,19 +8377,15 @@ in ]; }) sources."mz-2.7.0" - (sources."n8n-core-0.111.0" // { - dependencies = [ - sources."qs-6.10.3" - ]; - }) + sources."n8n-core-0.112.0" sources."n8n-design-system-0.16.0" - sources."n8n-editor-ui-0.137.0" - (sources."n8n-nodes-base-0.168.0" // { + sources."n8n-editor-ui-0.138.0" + (sources."n8n-nodes-base-0.169.0" // { dependencies = [ sources."iconv-lite-0.6.3" ]; }) - sources."n8n-workflow-0.93.0" + sources."n8n-workflow-0.94.0" (sources."named-placeholders-1.1.2" // { dependencies = [ sources."lru-cache-4.1.5" @@ -8347,7 +8393,7 @@ in ]; }) sources."nanoclone-0.2.1" - sources."nanoid-3.3.1" + sources."nanoid-3.3.2" sources."native-duplexpair-1.0.0" (sources."nearley-2.20.1" // { dependencies = [ @@ -8402,7 +8448,7 @@ in sources."async-1.5.2" ]; }) - sources."on-finished-2.3.0" + sources."on-finished-2.4.1" sources."on-headers-1.0.2" sources."once-1.4.0" sources."one-time-1.0.0" @@ -8520,7 +8566,7 @@ in }) sources."punycode-2.1.1" sources."python-struct-1.1.3" - sources."qs-6.9.7" + sources."qs-6.10.3" sources."querystring-0.2.0" sources."querystringify-2.2.0" sources."queue-microtask-1.2.3" @@ -8530,7 +8576,7 @@ in sources."random-bytes-1.0.0" sources."randombytes-2.1.0" sources."range-parser-1.2.1" - sources."raw-body-2.4.3" + sources."raw-body-2.5.1" sources."rc-1.2.8" sources."readable-stream-1.1.14" sources."readable-web-to-node-stream-2.0.0" @@ -8593,7 +8639,12 @@ in sources."ms-2.0.0" ]; }) + sources."depd-1.1.2" + sources."destroy-1.0.4" + sources."http-errors-1.8.1" sources."ms-2.1.3" + sources."on-finished-2.3.0" + sources."statuses-1.5.0" ]; }) (sources."sentence-case-3.0.4" // { @@ -8612,7 +8663,7 @@ in sources."shell-escape-0.2.0" sources."side-channel-1.0.4" sources."signal-exit-3.0.7" - sources."simple-git-2.48.0" + sources."simple-git-3.5.0" sources."simple-lru-cache-0.0.2" sources."simple-swizzle-0.2.2" sources."slash-3.0.0" @@ -8643,12 +8694,12 @@ in sources."sqlstring-2.3.3" sources."sse-channel-3.1.1" sources."ssf-0.11.2" - sources."ssh2-1.8.0" + sources."ssh2-1.9.0" sources."ssh2-sftp-client-7.2.3" sources."sshpk-1.17.0" sources."stack-trace-0.0.10" sources."standard-as-callback-2.1.0" - sources."statuses-1.5.0" + sources."statuses-2.0.1" sources."stealthy-require-1.1.1" sources."stream-shift-1.0.1" sources."string-similarity-4.0.4" @@ -8672,7 +8723,6 @@ in dependencies = [ sources."@types/node-12.20.47" sources."bl-3.0.1" - sources."depd-2.0.0" sources."iconv-lite-0.5.2" sources."readable-stream-3.6.0" sources."string_decoder-1.3.0" @@ -8773,7 +8823,7 @@ in sources."vue-2.6.14" sources."vue-color-2.8.1" sources."vue-fragment-1.5.2" - sources."vue-i18n-8.27.0" + sources."vue-i18n-8.27.1" sources."vue2-boring-avatars-0.3.4" sources."webidl-conversions-3.0.1" sources."whatwg-url-5.0.0" diff --git a/pkgs/applications/networking/sniffers/wireshark/default.nix b/pkgs/applications/networking/sniffers/wireshark/default.nix index 468a06af2091e..0947686144e54 100644 --- a/pkgs/applications/networking/sniffers/wireshark/default.nix +++ b/pkgs/applications/networking/sniffers/wireshark/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, pkg-config, pcre, perl, flex, bison, gettext, libpcap, libnl, c-ares +{ lib, stdenv, buildPackages, fetchurl, pkg-config, pcre, perl, flex, bison, gettext, libpcap, libnl, c-ares , gnutls, libgcrypt, libgpg-error, geoip, openssl, lua5, python3, libcap, glib , libssh, nghttp2, zlib, cmake, makeWrapper, wrapGAppsHook , withQt ? true, qt5 ? null @@ -29,22 +29,30 @@ in stdenv.mkDerivation { "-DENABLE_APPLICATION_BUNDLE=${if withQt && stdenv.isDarwin then "ON" else "OFF"}" # Fix `extcap` and `plugins` paths. See https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=16444 "-DCMAKE_INSTALL_LIBDIR=lib" + "-DLEMON_C_COMPILER=cc" + ] ++ lib.optionals (stdenv.buildPlatform != stdenv.hostPlatform) [ + "-DHAVE_C99_VSNPRINTF_EXITCODE=0" + "-DHAVE_C99_VSNPRINTF_EXITCODE__TRYRUN_OUTPUT=" ]; # Avoid referencing -dev paths because of debug assertions. NIX_CFLAGS_COMPILE = [ "-DQT_NO_DEBUG" ]; - nativeBuildInputs = [ asciidoctor bison cmake flex makeWrapper pkg-config ] + nativeBuildInputs = [ asciidoctor bison cmake flex makeWrapper pkg-config python3 perl ] ++ optionals withQt [ qt5.wrapQtAppsHook wrapGAppsHook ]; + depsBuildBuild = [ buildPackages.stdenv.cc ]; + buildInputs = [ - gettext pcre perl libpcap lua5 libssh nghttp2 openssl libgcrypt - libgpg-error gnutls geoip c-ares python3 glib zlib + gettext pcre libpcap lua5 libssh nghttp2 openssl libgcrypt + libgpg-error gnutls geoip c-ares glib zlib ] ++ optionals withQt (with qt5; [ qtbase qtmultimedia qtsvg qttools ]) ++ optionals stdenv.isLinux [ libcap libnl ] ++ optionals stdenv.isDarwin [ SystemConfiguration ApplicationServices gmp ] ++ optionals (withQt && stdenv.isDarwin) (with qt5; [ qtmacextras ]); + strictDeps = true; + patches = [ ./wireshark-lookup-dumpcap-in-path.patch ]; postPatch = '' diff --git a/pkgs/applications/office/vnote/default.nix b/pkgs/applications/office/vnote/default.nix index f548cf01fcd50..53fd1f07b6e65 100644 --- a/pkgs/applications/office/vnote/default.nix +++ b/pkgs/applications/office/vnote/default.nix @@ -8,14 +8,14 @@ mkDerivation rec { pname = "vnote"; - version = "3.12.888"; + version = "3.13.0"; src = fetchFromGitHub { owner = "vnotex"; repo = pname; fetchSubmodules = true; rev = "v${version}"; - sha256 = "sha256-l9oFixyEM0aAfvrC5rrQMzv7n8rUHECRzhuIQJ/szjc="; + sha256 = "sha256-osJvoi7oyZupJ/bnqpm0TdZ5cMYEeOw9DHOIAzONKLg="; }; nativeBuildInputs = [ diff --git a/pkgs/applications/science/math/caffe/default.nix b/pkgs/applications/science/math/caffe/default.nix index 74b89ed98c550..db2e74f245234 100644 --- a/pkgs/applications/science/math/caffe/default.nix +++ b/pkgs/applications/science/math/caffe/default.nix @@ -138,6 +138,7 @@ stdenv.mkDerivation rec { ''; homepage = "http://caffe.berkeleyvision.org/"; maintainers = with maintainers; [ ]; + broken = pythonSupport && (python.isPy310); license = licenses.bsd2; platforms = platforms.linux ++ platforms.darwin; }; diff --git a/pkgs/applications/science/math/mxnet/default.nix b/pkgs/applications/science/math/mxnet/default.nix index c9ffb8ed5cb3a..8e5e1ebd7e806 100644 --- a/pkgs/applications/science/math/mxnet/default.nix +++ b/pkgs/applications/science/math/mxnet/default.nix @@ -2,6 +2,7 @@ , opencv3, gtest, blas, gomp, llvmPackages, perl , cudaSupport ? config.cudaSupport or false, cudatoolkit, nvidia_x11 , cudnnSupport ? cudaSupport, cudnn +, cudaCapabilities ? [ "3.7" "5.0" "6.0" "7.0" "7.5" "8.0" "8.6" ] }: assert cudnnSupport -> cudaSupport; @@ -44,6 +45,7 @@ stdenv.mkDerivation rec { "-DUSE_OLDCMAKECUDA=ON" # see https://github.com/apache/incubator-mxnet/issues/10743 "-DCUDA_ARCH_NAME=All" "-DCUDA_HOST_COMPILER=${cudatoolkit.cc}/bin/cc" + "-DMXNET_CUDA_ARCH=${lib.concatStringsSep ";" cudaCapabilities}" ] else [ "-DUSE_CUDA=OFF" ]) ++ lib.optional (!cudnnSupport) "-DUSE_CUDNN=OFF"; @@ -60,6 +62,12 @@ stdenv.mkDerivation rec { rm "$out"/lib/*.a ''; + # used to mark cudaSupport in python310Packages.mxnet as broken; + # other attributes exposed for consistency + passthru = { + inherit cudaSupport cudnnSupport cudatoolkit cudnn; + }; + meta = with lib; { description = "Lightweight, Portable, Flexible Distributed/Mobile Deep Learning with Dynamic, Mutation-aware Dataflow Dep Scheduler"; homepage = "https://mxnet.incubator.apache.org/"; diff --git a/pkgs/applications/science/math/wxmaxima/default.nix b/pkgs/applications/science/math/wxmaxima/default.nix index 76d2c782b4d4a..f14fb489a9964 100644 --- a/pkgs/applications/science/math/wxmaxima/default.nix +++ b/pkgs/applications/science/math/wxmaxima/default.nix @@ -11,13 +11,13 @@ stdenv.mkDerivation rec { pname = "wxmaxima"; - version = "21.11.0"; + version = "22.03.0"; src = fetchFromGitHub { owner = "wxMaxima-developers"; repo = "wxmaxima"; rev = "Version-${version}"; - sha256 = "sha256-LwuqldMGsmFR8xrNg5vsrogmdi5ysqEQGWITM460IZk="; + sha256 = "sha256-ynLx1HPfDjLbyFziWFbjpCeUBaA3hAFRFm5/1GeFKRE="; }; buildInputs = [ diff --git a/pkgs/applications/version-management/git-and-tools/ghorg/default.nix b/pkgs/applications/version-management/git-and-tools/ghorg/default.nix index 543e3a7501a72..87d11dd9c1e98 100644 --- a/pkgs/applications/version-management/git-and-tools/ghorg/default.nix +++ b/pkgs/applications/version-management/git-and-tools/ghorg/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "ghorg"; - version = "1.7.11"; + version = "1.7.12"; src = fetchFromGitHub { owner = "gabrie30"; repo = "ghorg"; rev = "v${version}"; - sha256 = "sha256-/JecaTRmqTB1I0tqBRidlqWOvNE6U5zep5/lFi8VTCc="; + sha256 = "sha256-y5o4yY5M9eDKN9LtbrPR29EafN3X7J51ARCEpFtLxCo="; }; doCheck = false; diff --git a/pkgs/applications/version-management/subversion/default.nix b/pkgs/applications/version-management/subversion/default.nix index 4789d654ae681..0f88a18a47876 100644 --- a/pkgs/applications/version-management/subversion/default.nix +++ b/pkgs/applications/version-management/subversion/default.nix @@ -22,10 +22,10 @@ let common = { version, sha256, extraPatches ? [ ] }: stdenv.mkDerivation (rec { inherit version; - pname = "subversion"; + pname = "subversion${lib.optionalString (!bdbSupport && perlBindings && pythonBindings) "-client"}"; src = fetchurl { - url = "mirror://apache/subversion/${pname}-${version}.tar.bz2"; + url = "mirror://apache/subversion/subversion-${version}.tar.bz2"; inherit sha256; }; diff --git a/pkgs/applications/video/webtorrent_desktop/default.nix b/pkgs/applications/video/webtorrent_desktop/default.nix index b4f8af61fca5e..8f1353fa83e48 100644 --- a/pkgs/applications/video/webtorrent_desktop/default.nix +++ b/pkgs/applications/video/webtorrent_desktop/default.nix @@ -1,95 +1,76 @@ +## FIXME: see ../../../servers/code-server/ for a proper yarn packaging +## - export ELECTRON_SKIP_BINARY_DOWNLOAD=1 +## - jq "del(.scripts.preinstall)" node_modules/shellcheck/package.json | sponge node_modules/shellcheck/package.json { - alsa-lib, atk, cairo, cups, dbus, dpkg, expat, fetchurl, fetchzip, fontconfig, freetype, - gdk-pixbuf, glib, gtk3, libX11, libXScrnSaver, libXcomposite, libXcursor, - libXdamage, libXext, libXfixes, libXi, libXrandr, libXrender, libXtst, - libxcb, nspr, nss, lib, stdenv, udev, libuuid, pango, at-spi2-atk, at-spi2-core + lib, stdenv, buildFHSUserEnvBubblewrap, runCommand, writeScript, fetchurl, fetchzip }: +let + pname = "webtorrent-desktop"; + version = "0.21.0"; +in +runCommand "${pname}-${version}" rec { + inherit (stdenv) shell; + inherit pname version; + src = + if stdenv.hostPlatform.system == "x86_64-linux" then + fetchzip { + url = "https://github.com/webtorrent/webtorrent-desktop/releases/download/v${version}/WebTorrent-v${version}-linux.zip"; + sha256 = "13gd8isq2l10kibsc1bsc15dbgpnwa7nw4cwcamycgx6pfz9a852"; + } + else + throw "Webtorrent is not currently supported on ${stdenv.hostPlatform.system}"; - let - rpath = lib.makeLibraryPath ([ - alsa-lib - atk - at-spi2-core - at-spi2-atk - cairo - cups - dbus - expat - fontconfig - freetype - gdk-pixbuf - glib - gtk3 - pango - libuuid - libX11 - libXScrnSaver - libXcomposite - libXcursor - libXdamage - libXext - libXfixes - libXi - libXrandr - libXrender - libXtst - libxcb - nspr - nss - stdenv.cc.cc - udev - ]); - in stdenv.mkDerivation rec { - pname = "webtorrent-desktop"; - version = "0.21.0"; + fhs = buildFHSUserEnvBubblewrap rec { + name = "fhsEnterWebTorrent"; + runScript = "${src}/WebTorrent"; + ## use the trampoline, if you need to shell into the fhsenv + # runScript = writeScript "trampoline" '' + # #!/bin/sh + # exec "$@" + # ''; + targetPkgs = pkgs: with pkgs; with xorg; [ + alsa-lib atk at-spi2-core at-spi2-atk cairo cups dbus expat + fontconfig freetype gdk-pixbuf glib gtk3 pango libuuid libX11 + libXScrnSaver libXcomposite libXcursor libXdamage libXext + libXfixes libXi libXrandr libXrender libXtst libxcb nspr nss + stdenv.cc.cc udev + ]; + # extraBwrapArgs = [ + # "--ro-bind /run/user/$(id -u)/pulse /run/user/$(id -u)/pulse" + # ]; + }; - src = - if stdenv.hostPlatform.system == "x86_64-linux" then - fetchzip { - url = "https://github.com/webtorrent/webtorrent-desktop/releases/download/v${version}/WebTorrent-v${version}-linux.zip"; - sha256 = "13gd8isq2l10kibsc1bsc15dbgpnwa7nw4cwcamycgx6pfz9a852"; - } - else - throw "Webtorrent is not currently supported on ${stdenv.hostPlatform.system}"; - desktopFile = fetchurl { - url = "https://raw.githubusercontent.com/webtorrent/webtorrent-desktop/v${version}/static/linux/share/applications/webtorrent-desktop.desktop"; - sha256 = "1v16dqbxqds3cqg3xkzxsa5fyd8ssddvjhy9g3i3lz90n47916ca"; - }; - icon256File = fetchurl { - url = "https://raw.githubusercontent.com/webtorrent/webtorrent-desktop/v${version}/static/linux/share/icons/hicolor/256x256/apps/webtorrent-desktop.png"; - sha256 = "1dapxvvp7cx52zhyaby4bxm4rll9xc7x3wk8k0il4g3mc7zzn3yk"; - }; - icon48File = fetchurl { - url = "https://raw.githubusercontent.com/webtorrent/webtorrent-desktop/v${version}/static/linux/share/icons/hicolor/48x48/apps/webtorrent-desktop.png"; - sha256 = "00y96w9shbbrdbf6xcjlahqd08154kkrxmqraik7qshiwcqpw7p4"; - }; - nativeBuildInputs = [ dpkg ]; - installPhase = '' - mkdir -p $out/share/{applications,icons/hicolor/{48x48,256x256}/apps} - cp -R . $out/libexec + desktopFile = fetchurl { + url = "https://raw.githubusercontent.com/webtorrent/webtorrent-desktop/v${version}/static/linux/share/applications/webtorrent-desktop.desktop"; + sha256 = "1v16dqbxqds3cqg3xkzxsa5fyd8ssddvjhy9g3i3lz90n47916ca"; + }; + icon256File = fetchurl { + url = "https://raw.githubusercontent.com/webtorrent/webtorrent-desktop/v${version}/static/linux/share/icons/hicolor/256x256/apps/webtorrent-desktop.png"; + sha256 = "1dapxvvp7cx52zhyaby4bxm4rll9xc7x3wk8k0il4g3mc7zzn3yk"; + }; + icon48File = fetchurl { + url = "https://raw.githubusercontent.com/webtorrent/webtorrent-desktop/v${version}/static/linux/share/icons/hicolor/48x48/apps/webtorrent-desktop.png"; + sha256 = "00y96w9shbbrdbf6xcjlahqd08154kkrxmqraik7qshiwcqpw7p4"; + }; - # Patch WebTorrent - patchelf --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \ - --set-rpath ${rpath}:$out/libexec $out/libexec/WebTorrent + meta = with lib; { + description = "Streaming torrent app for Mac, Windows, and Linux"; + homepage = "https://webtorrent.io/desktop"; + license = licenses.mit; + maintainers = [ maintainers.flokli maintainers.bendlas ]; + platforms = [ + "x86_64-linux" + ]; + }; - # Symlink to bin - mkdir -p $out/bin - ln -s $out/libexec/WebTorrent $out/bin/WebTorrent +} '' + mkdir -p $out/{bin,share/{applications,icons/hicolor/{48x48,256x256}/apps}} - cp $icon48File $out/share/icons/hicolor/48x48/apps/webtorrent-desktop.png - cp $icon256File $out/share/icons/hicolor/256x256/apps/webtorrent-desktop.png - ## Fix the desktop link - substitute $desktopFile $out/share/applications/webtorrent-desktop.desktop \ - --replace /opt/webtorrent-desktop $out/libexec - ''; + cp $fhs/bin/fhsEnterWebTorrent $out/bin/WebTorrent - meta = with lib; { - description = "Streaming torrent app for Mac, Windows, and Linux"; - homepage = "https://webtorrent.io/desktop"; - license = licenses.mit; - maintainers = [ maintainers.flokli ]; - platforms = [ - "x86_64-linux" - ]; - }; - } + cp $icon48File $out/share/icons/hicolor/48x48/apps/webtorrent-desktop.png + cp $icon256File $out/share/icons/hicolor/256x256/apps/webtorrent-desktop.png + ## Fix the desktop link + substitute $desktopFile $out/share/applications/webtorrent-desktop.desktop \ + --replace /opt/webtorrent-desktop $out/libexec +'' diff --git a/pkgs/applications/virtualization/docker/compose.nix b/pkgs/applications/virtualization/docker/compose.nix index 16c25aea9ae48..fc264cdc59083 100644 --- a/pkgs/applications/virtualization/docker/compose.nix +++ b/pkgs/applications/virtualization/docker/compose.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "docker-compose"; - version = "2.4.0"; + version = "2.4.1"; src = fetchFromGitHub { owner = "docker"; repo = "compose"; rev = "v${version}"; - sha256 = "sha256-dHq1t1ebPSAS5H14Kd03xCiHV9UhAH0dIxikQK0rHQk="; + sha256 = "sha256-6yc+7Fc22b8xN8thRrxxpjdEz19aBYCWxgkh/nra784="; }; vendorSha256 = "sha256-N+paN3zEXzzUFb2JPVIDZYZ0h0iu7naiw4pSVnGsuKQ="; diff --git a/pkgs/applications/virtualization/x11docker/default.nix b/pkgs/applications/virtualization/x11docker/default.nix index bad1e98296c25..621514ad4c82f 100644 --- a/pkgs/applications/virtualization/x11docker/default.nix +++ b/pkgs/applications/virtualization/x11docker/default.nix @@ -1,12 +1,12 @@ { lib, stdenv, fetchFromGitHub, makeWrapper, nx-libs, xorg, getopt, gnugrep, gawk, ps, mount, iproute2 }: stdenv.mkDerivation rec { pname = "x11docker"; - version = "7.1.3"; + version = "7.1.4"; src = fetchFromGitHub { owner = "mviereck"; repo = "x11docker"; rev = "v${version}"; - sha256 = "sha256-eSarw5RG2ckup9pNlZtAyZAN8IPZy94RRfej9ppiLfo="; + sha256 = "sha256-geYn1ir8h1EAUpTWsTS7giQt5eQwIBFeemS+a940ORg="; }; nativeBuildInputs = [ makeWrapper ]; diff --git a/pkgs/applications/window-managers/sway/idle.nix b/pkgs/applications/window-managers/sway/idle.nix index 0928fbcfb4ef6..da23386d41ce8 100644 --- a/pkgs/applications/window-managers/sway/idle.nix +++ b/pkgs/applications/window-managers/sway/idle.nix @@ -21,6 +21,8 @@ stdenv.mkDerivation rec { mesonFlags = [ "-Dman-pages=enabled" "-Dlogind=${if systemdSupport then "enabled" else "disabled"}" ]; + postPatch = "substituteInPlace main.c --replace '%lu' '%zu'"; + meta = with lib; { description = "Idle management daemon for Wayland"; longDescription = '' diff --git a/pkgs/build-support/setup-hooks/copy-desktop-items.sh b/pkgs/build-support/setup-hooks/copy-desktop-items.sh index b5c5ed81eb970..313ebc9803445 100644 --- a/pkgs/build-support/setup-hooks/copy-desktop-items.sh +++ b/pkgs/build-support/setup-hooks/copy-desktop-items.sh @@ -28,14 +28,15 @@ copyDesktopItems() { return fi + applications="${!outputBin}/share/applications" for desktopItem in $desktopItems; do if [[ -f "$desktopItem" ]]; then - echo "Copying '$desktopItem' into '$out/share/applications'" - install -D -m 444 -t "$out"/share/applications "$desktopItem" + echo "Copying '$desktopItem' into '${applications}'" + install -D -m 444 -t "${applications}" "$desktopItem" else for f in "$desktopItem"/share/applications/*.desktop; do - echo "Copying '$f' into '$out/share/applications'" - install -D -m 444 -t "$out"/share/applications "$f" + echo "Copying '$f' into '${applications}'" + install -D -m 444 -t "${applications}" "$f" done fi done diff --git a/pkgs/data/misc/hackage/default.nix b/pkgs/data/misc/hackage/default.nix index e559281303d78..2e8c660d94727 100644 --- a/pkgs/data/misc/hackage/default.nix +++ b/pkgs/data/misc/hackage/default.nix @@ -1,10 +1,11 @@ # Hackage database snapshot, used by maintainers/scripts/regenerate-hackage-packages.sh # and callHackage -{ fetchurl }: +{ lib, fetchurl }: let pin = builtins.fromJSON (builtins.readFile ./pin.json); in fetchurl { inherit (pin) url sha256; + name = "all-cabal-hashes-${lib.substring 0 7 pin.commit}.tar.gz"; passthru.updateScript = ../../../../maintainers/scripts/haskell/update-hackage.sh; } diff --git a/pkgs/data/misc/hackage/pin.json b/pkgs/data/misc/hackage/pin.json index d6138cf231767..e729226b71cf5 100644 --- a/pkgs/data/misc/hackage/pin.json +++ b/pkgs/data/misc/hackage/pin.json @@ -1,6 +1,6 @@ { - "commit": "a02557e981025a281de13f66204c2cd2e788732f", - "url": "https://github.com/commercialhaskell/all-cabal-hashes/archive/a02557e981025a281de13f66204c2cd2e788732f.tar.gz", - "sha256": "0c6jg9s4p65ynkkk0z6p9q4whz5hs1vmbq8zsn7pavxkzwa8ych1", - "msg": "Update from Hackage at 2022-03-30T19:23:57Z" + "commit": "e4f120f36a6e55fc2fe15c5ed774773420d38108", + "url": "https://github.com/commercialhaskell/all-cabal-hashes/archive/e4f120f36a6e55fc2fe15c5ed774773420d38108.tar.gz", + "sha256": "16ljr256nrlmmsll2pbnf0xk07mqbcwa9n6d0mc2j44vyb478qwl", + "msg": "Update from Hackage at 2022-04-03T10:13:27Z" } diff --git a/pkgs/data/themes/flat-remix-gtk/default.nix b/pkgs/data/themes/flat-remix-gtk/default.nix index ec76d48457c56..177e606a0e6bd 100644 --- a/pkgs/data/themes/flat-remix-gtk/default.nix +++ b/pkgs/data/themes/flat-remix-gtk/default.nix @@ -6,13 +6,13 @@ stdenv.mkDerivation rec { pname = "flat-remix-gtk"; - version = "20220321"; + version = "20220330"; src = fetchFromGitHub { owner = "daniruiz"; repo = pname; rev = version; - sha256 = "sha256-QFG/jh3tPO0eflyDQaC1PJL/SavYD/W6rYp26Rxe/2E="; + sha256 = "sha256-TRBjttAYpx3M/Qza6N9dJy50vQtUOJGmdLNdobnAt2Y="; }; dontBuild = true; diff --git a/pkgs/desktops/gnome/apps/gedit/default.nix b/pkgs/desktops/gnome/apps/gedit/default.nix index b8783e4db4624..3269739df9af8 100644 --- a/pkgs/desktops/gnome/apps/gedit/default.nix +++ b/pkgs/desktops/gnome/apps/gedit/default.nix @@ -5,6 +5,7 @@ , python3 , pkg-config , gtk3 +, gtk-mac-integration , glib , adwaita-icon-theme , libpeas @@ -24,11 +25,11 @@ stdenv.mkDerivation rec { pname = "gedit"; - version = "41.0"; + version = "42.0"; src = fetchurl { url = "mirror://gnome/sources/gedit/${lib.versions.major version}/${pname}-${version}.tar.xz"; - sha256 = "epsYsViAjRiSmJFl83BsTxooKXkHmrdFinnTwkrU3rU="; + sha256 = "qHmR9Clh609qvNuqu3hHYMI66u765jY9PiGmHpxFhDc="; }; patches = [ @@ -59,6 +60,8 @@ stdenv.mkDerivation rec { gtksourceview4 libpeas libsoup + ] ++ lib.optionals stdenv.isDarwin [ + gtk-mac-integration ]; postPatch = '' diff --git a/pkgs/desktops/gnome/core/sushi/default.nix b/pkgs/desktops/gnome/core/sushi/default.nix index 4c6f960d8c845..af6a81b34787b 100644 --- a/pkgs/desktops/gnome/core/sushi/default.nix +++ b/pkgs/desktops/gnome/core/sushi/default.nix @@ -23,11 +23,11 @@ stdenv.mkDerivation rec { pname = "sushi"; - version = "41.1"; + version = "41.2"; src = fetchurl { url = "mirror://gnome/sources/sushi/${lib.versions.major version}/${pname}-${version}.tar.xz"; - sha256 = "JifbYWLnV3hZDAfhZbLzbqJNEjGlE7FkAj/G3fx1xKM="; + sha256 = "tZ+0LJllxzYfdilt0qNARatlUGXqQUPeWsiyygyq6l4="; }; nativeBuildInputs = [ diff --git a/pkgs/desktops/pantheon/apps/switchboard-plugs/about/default.nix b/pkgs/desktops/pantheon/apps/switchboard-plugs/about/default.nix index 82eece370dd8e..977d1a0b9fcc6 100644 --- a/pkgs/desktops/pantheon/apps/switchboard-plugs/about/default.nix +++ b/pkgs/desktops/pantheon/apps/switchboard-plugs/about/default.nix @@ -18,13 +18,13 @@ stdenv.mkDerivation rec { pname = "switchboard-plug-about"; - version = "6.0.1"; + version = "6.1.0"; src = fetchFromGitHub { owner = "elementary"; repo = pname; rev = version; - sha256 = "0c075ac7iqz4hqbp2ph0cwyhiq0jn6c1g1jjfhygjbssv3vvd268"; + sha256 = "sha256-/8K3xSbzlagOT0zHdXNwEERJP88C+H2I6qJHXwdlTS4="; }; patches = [ diff --git a/pkgs/desktops/pantheon/apps/switchboard-plugs/onlineaccounts/default.nix b/pkgs/desktops/pantheon/apps/switchboard-plugs/onlineaccounts/default.nix index 46703b349e674..70ab050c7ec17 100644 --- a/pkgs/desktops/pantheon/apps/switchboard-plugs/onlineaccounts/default.nix +++ b/pkgs/desktops/pantheon/apps/switchboard-plugs/onlineaccounts/default.nix @@ -18,13 +18,13 @@ stdenv.mkDerivation rec { pname = "switchboard-plug-onlineaccounts"; - version = "6.3.0"; + version = "6.4.0"; src = fetchFromGitHub { owner = "elementary"; repo = pname; rev = version; - sha256 = "sha256-aRh2zbKqcGOH4Qw5gdJw07hod8a/QGWUcJo/2R9erQs="; + sha256 = "sha256-Fppl/IvdlW8lZ6YKEHaHNticv3FFFKEKTPPVnz4u9b4="; }; nativeBuildInputs = [ diff --git a/pkgs/desktops/pantheon/apps/switchboard-plugs/sound/default.nix b/pkgs/desktops/pantheon/apps/switchboard-plugs/sound/default.nix index 8a23f09838eb6..ed258623ab241 100644 --- a/pkgs/desktops/pantheon/apps/switchboard-plugs/sound/default.nix +++ b/pkgs/desktops/pantheon/apps/switchboard-plugs/sound/default.nix @@ -16,13 +16,13 @@ stdenv.mkDerivation rec { pname = "switchboard-plug-sound"; - version = "2.3.0"; + version = "2.3.1"; src = fetchFromGitHub { owner = "elementary"; repo = pname; rev = version; - sha256 = "sha256-yHuboDpIcioZPNgpmnrM6J2eUCJpoNDdvgu27YuN65I="; + sha256 = "sha256-hyBmo9P68XSXRUuLw+baEAetba2QdqOwUti64geH6xc="; }; nativeBuildInputs = [ diff --git a/pkgs/desktops/xfce/applications/mousepad/default.nix b/pkgs/desktops/xfce/applications/mousepad/default.nix index 2b794aa4b8ab1..1da88a0104f82 100644 --- a/pkgs/desktops/xfce/applications/mousepad/default.nix +++ b/pkgs/desktops/xfce/applications/mousepad/default.nix @@ -3,10 +3,10 @@ mkXfceDerivation { category = "apps"; pname = "mousepad"; - version = "0.5.8"; + version = "0.5.9"; odd-unstable = false; - sha256 = "sha256-Q5coRO2Swo0LpB+pzi+fxrwNyhcDbQXLuQtepPlCyxY="; + sha256 = "sha256-xuSv2H1+/NNUAm+D8f+f5fPVR97iJ5vIDzPa3S0HLM0="; nativeBuildInputs = [ gobject-introspection ]; diff --git a/pkgs/development/compilers/cudatoolkit/default.nix b/pkgs/development/compilers/cudatoolkit/default.nix index 4fa99f80c8e36..d7fa6ee59f0a4 100644 --- a/pkgs/development/compilers/cudatoolkit/default.nix +++ b/pkgs/development/compilers/cudatoolkit/default.nix @@ -90,5 +90,5 @@ rec { # latest cudnn, nccl, cutensor, etc! It sometimes happens that CUDA versions # are released prior to compatibility with the rest of the ecosystem. And # don't forget to request a review from @NixOS/cuda-maintainers! - cudatoolkit_11 = cudatoolkit_11_5; + cudatoolkit_11 = cudatoolkit_11_5; # update me to 11_6 when cudnn>=8.3.3 } diff --git a/pkgs/development/compilers/ghc/9.0.2.nix b/pkgs/development/compilers/ghc/9.0.2.nix index 04e29ed668616..0968b85399224 100644 --- a/pkgs/development/compilers/ghc/9.0.2.nix +++ b/pkgs/development/compilers/ghc/9.0.2.nix @@ -5,6 +5,7 @@ , autoconf, automake, coreutils, fetchurl, perl, python3, m4, sphinx, xattr , autoSignDarwinBinariesHook , bash +, fetchpatch , libiconv ? null, ncurses , glibcLocales ? null @@ -182,6 +183,17 @@ stdenv.mkDerivation (rec { outputs = [ "out" "doc" ]; + patches = [ + # Add flag that fixes C++ exception handling; opt-in. Merged in 9.4 and 9.2.2. + # https://gitlab.haskell.org/ghc/ghc/-/merge_requests/7423 + (fetchpatch { + name = "ghc-9.0.2-fcompact-unwind.patch"; + # Note that the test suite is not packaged. + url = "https://gitlab.haskell.org/ghc/ghc/-/commit/c6132c782d974a7701e7f6447bdcd2bf6db4299a.patch?merge_request_iid=7423"; + sha256 = "sha256-b4feGZIaKDj/UKjWTNY6/jH4s2iate0wAgMxG3rAbZI="; + }) + ]; + postPatch = "patchShebangs ."; # GHC needs the locale configured during the Haddock phase. diff --git a/pkgs/development/compilers/go/2-dev.nix b/pkgs/development/compilers/go/2-dev.nix deleted file mode 100644 index c70133c98b351..0000000000000 --- a/pkgs/development/compilers/go/2-dev.nix +++ /dev/null @@ -1,276 +0,0 @@ -{ lib -, stdenv -, fetchgit -, tzdata -, iana-etc -, runCommand -, perl -, which -, pkg-config -, patch -, procps -, pcre -, cacert -, Security -, Foundation -, mailcap -, runtimeShell -, buildPackages -, pkgsBuildTarget -, callPackage -}: - -let - go_bootstrap = buildPackages.callPackage ./bootstrap.nix { }; - - goBootstrap = runCommand "go-bootstrap" { } '' - mkdir $out - cp -rf ${go_bootstrap}/* $out/ - chmod -R u+w $out - find $out -name "*.c" -delete - cp -rf $out/bin/* $out/share/go/bin/ - ''; - - goarch = platform: { - "i686" = "386"; - "x86_64" = "amd64"; - "aarch64" = "arm64"; - "arm" = "arm"; - "armv5tel" = "arm"; - "armv6l" = "arm"; - "armv7l" = "arm"; - "powerpc64le" = "ppc64le"; - }.${platform.parsed.cpu.name} or (throw "Unsupported system"); - - # We need a target compiler which is still runnable at build time, - # to handle the cross-building case where build != host == target - targetCC = pkgsBuildTarget.targetPackages.stdenv.cc; -in - -stdenv.mkDerivation rec { - pname = "go2-unstable"; - version = "2021-04-13"; - - src = fetchgit { - url = "https://go.googlesource.com/go"; - rev = "9cd52cf2a93a958e8e001aea36886e7846c91f2f"; - sha256 = "sha256:0hybm93y4i4j7bs86y7h73nc1wqnspkq75if7n1032zf9bs8sm96"; - }; - - # perl is used for testing go vet - nativeBuildInputs = [ perl which pkg-config patch procps ]; - buildInputs = [ cacert pcre ] - ++ lib.optionals stdenv.isLinux [ stdenv.cc.libc.out ] - ++ lib.optionals (stdenv.hostPlatform.libc == "glibc") [ stdenv.cc.libc.static ]; - - depsTargetTargetPropagated = lib.optionals stdenv.isDarwin [ Security Foundation ]; - - hardeningDisable = [ "all" ]; - - prePatch = '' - echo '${version}' > VERSION - patchShebangs ./ # replace /bin/bash - - # This source produces shell script at run time, - # and thus it is not corrected by patchShebangs. - substituteInPlace misc/cgo/testcarchive/carchive_test.go \ - --replace '#!/usr/bin/env bash' '#!${runtimeShell}' - - # Patch the mimetype database location which is missing on NixOS. - # but also allow static binaries built with NixOS to run outside nix - sed -i 's,\"/etc/mime.types,"${mailcap}/etc/mime.types\"\,\n\t&,' src/mime/type_unix.go - - # Disabling the 'os/http/net' tests (they want files not available in - # chroot builds) - rm src/net/{listen,parse}_test.go - rm src/syscall/exec_linux_test.go - - # !!! substituteInPlace does not seems to be effective. - # The os test wants to read files in an existing path. Just don't let it be /usr/bin. - sed -i 's,/usr/bin,'"`pwd`", src/os/os_test.go - sed -i 's,/bin/pwd,'"`type -P pwd`", src/os/os_test.go - # Fails on aarch64 - sed -i '/TestFallocate/aif true \{ return\; \}' src/cmd/link/internal/ld/fallocate_test.go - # Skip this test since ssl patches mess it up. - sed -i '/TestLoadSystemCertsLoadColonSeparatedDirs/aif true \{ return\; \}' src/crypto/x509/root_unix_test.go - # Disable another PIE test which breaks. - sed -i '/TestTrivialPIE/aif true \{ return\; \}' misc/cgo/testshared/shared_test.go - # Disable the BuildModePie test - sed -i '/TestBuildmodePIE/aif true \{ return\; \}' src/cmd/go/go_test.go - # Disable the unix socket test - sed -i '/TestShutdownUnix/aif true \{ return\; \}' src/net/net_test.go - # Disable the hostname test - sed -i '/TestHostname/aif true \{ return\; \}' src/os/os_test.go - # ParseInLocation fails the test - sed -i '/TestParseInSydney/aif true \{ return\; \}' src/time/format_test.go - # Remove the api check as it never worked - sed -i '/src\/cmd\/api\/run.go/ireturn nil' src/cmd/dist/test.go - # Remove the coverage test as we have removed this utility - sed -i '/TestCoverageWithCgo/aif true \{ return\; \}' src/cmd/go/go_test.go - # Remove the timezone naming test - sed -i '/TestLoadFixed/aif true \{ return\; \}' src/time/time_test.go - # Remove disable setgid test - sed -i '/TestRespectSetgidDir/aif true \{ return\; \}' src/cmd/go/internal/work/build_test.go - # Remove cert tests that conflict with NixOS's cert resolution - sed -i '/TestEnvVars/aif true \{ return\; \}' src/crypto/x509/root_unix_test.go - # TestWritevError hangs sometimes - sed -i '/TestWritevError/aif true \{ return\; \}' src/net/writev_test.go - # TestVariousDeadlines fails sometimes - sed -i '/TestVariousDeadlines/aif true \{ return\; \}' src/net/timeout_test.go - - sed -i 's,/etc/protocols,${iana-etc}/etc/protocols,' src/net/lookup_unix.go - sed -i 's,/etc/services,${iana-etc}/etc/services,' src/net/port_unix.go - - # Disable cgo lookup tests not works, they depend on resolver - rm src/net/cgo_unix_test.go - - '' + lib.optionalString stdenv.isLinux '' - # prepend the nix path to the zoneinfo files but also leave the original value for static binaries - # that run outside a nix server - sed -i 's,\"/usr/share/zoneinfo/,"${tzdata}/share/zoneinfo/\"\,\n\t&,' src/time/zoneinfo_unix.go - - '' + lib.optionalString stdenv.isAarch32 '' - echo '#!${runtimeShell}' > misc/cgo/testplugin/test.bash - '' + lib.optionalString stdenv.isDarwin '' - substituteInPlace src/race.bash --replace \ - "sysctl machdep.cpu.extfeatures | grep -qv EM64T" true - sed -i 's,strings.Contains(.*sysctl.*,true {,' src/cmd/dist/util.go - sed -i 's,"/etc","'"$TMPDIR"'",' src/os/os_test.go - sed -i 's,/_go_os_test,'"$TMPDIR"'/_go_os_test,' src/os/path_test.go - - sed -i '/TestChdirAndGetwd/aif true \{ return\; \}' src/os/os_test.go - sed -i '/TestCredentialNoSetGroups/aif true \{ return\; \}' src/os/exec/exec_posix_test.go - sed -i '/TestRead0/aif true \{ return\; \}' src/os/os_test.go - sed -i '/TestSystemRoots/aif true \{ return\; \}' src/crypto/x509/root_darwin_test.go - - sed -i '/TestGoInstallRebuildsStalePackagesInOtherGOPATH/aif true \{ return\; \}' src/cmd/go/go_test.go - sed -i '/TestBuildDashIInstallsDependencies/aif true \{ return\; \}' src/cmd/go/go_test.go - - sed -i '/TestDisasmExtld/aif true \{ return\; \}' src/cmd/objdump/objdump_test.go - - sed -i 's/unrecognized/unknown/' src/cmd/link/internal/ld/lib.go - - # TestCurrent fails because Current is not implemented on Darwin - sed -i 's/TestCurrent/testCurrent/g' src/os/user/user_test.go - sed -i 's/TestLookup/testLookup/g' src/os/user/user_test.go - - touch $TMPDIR/group $TMPDIR/hosts $TMPDIR/passwd - ''; - - patches = [ - ./remove-tools-1.11.patch - ./ssl-cert-file-2-dev.patch - ./remove-test-pie-1.15.patch - ./creds-test.patch - ./go-1.9-skip-flaky-19608.patch - ./go-1.9-skip-flaky-20072.patch - ./skip-external-network-tests-1.16.patch - ./skip-nohup-tests.patch - ./skip-cgo-tests-1.15.patch - ] ++ [ - # breaks under load: https://github.com/golang/go/issues/25628 - (if stdenv.isAarch32 - then ./skip-test-extra-files-on-aarch32-1.14.patch - else ./skip-test-extra-files-on-386-1.14.patch) - ]; - - postPatch = '' - find . -name '*.orig' -exec rm {} ';' - ''; - - GOOS = stdenv.targetPlatform.parsed.kernel.name; - GOARCH = goarch stdenv.targetPlatform; - # GOHOSTOS/GOHOSTARCH must match the building system, not the host system. - # Go will nevertheless build a for host system that we will copy over in - # the install phase. - GOHOSTOS = stdenv.buildPlatform.parsed.kernel.name; - GOHOSTARCH = goarch stdenv.buildPlatform; - - # {CC,CXX}_FOR_TARGET must be only set for cross compilation case as go expect those - # to be different from CC/CXX - CC_FOR_TARGET = - if (stdenv.buildPlatform != stdenv.targetPlatform) then - "${targetCC}/bin/${targetCC.targetPrefix}cc" - else - null; - CXX_FOR_TARGET = - if (stdenv.buildPlatform != stdenv.targetPlatform) then - "${targetCC}/bin/${targetCC.targetPrefix}c++" - else - null; - - GOARM = toString (lib.intersectLists [ (stdenv.hostPlatform.parsed.cpu.version or "") ] [ "5" "6" "7" ]); - GO386 = "softfloat"; # from Arch: don't assume sse2 on i686 - CGO_ENABLED = 1; - # Hopefully avoids test timeouts on Hydra - GO_TEST_TIMEOUT_SCALE = 3; - - # Indicate that we are running on build infrastructure - # Some tests assume things like home directories and users exists - GO_BUILDER_NAME = "nix"; - - GOROOT_BOOTSTRAP = "${goBootstrap}/share/go"; - - postConfigure = '' - export GOCACHE=$TMPDIR/go-cache - # this is compiled into the binary - export GOROOT_FINAL=$out/share/go - - export PATH=$(pwd)/bin:$PATH - - ${lib.optionalString (stdenv.buildPlatform != stdenv.targetPlatform) '' - # Independent from host/target, CC should produce code for the building system. - # We only set it when cross-compiling. - export CC=${buildPackages.stdenv.cc}/bin/cc - ''} - ulimit -a - ''; - - postBuild = '' - (cd src && ./make.bash) - ''; - - doCheck = stdenv.hostPlatform == stdenv.targetPlatform && !stdenv.isDarwin; - - checkPhase = '' - runHook preCheck - (cd src && HOME=$TMPDIR GOCACHE=$TMPDIR/go-cache ./run.bash --no-rebuild) - runHook postCheck - ''; - - preInstall = '' - rm -r pkg/obj - # Contains the wrong perl shebang when cross compiling, - # since it is not used for anything we can deleted as well. - rm src/regexp/syntax/make_perl_groups.pl - '' + (if (stdenv.buildPlatform != stdenv.hostPlatform) then '' - mv bin/*_*/* bin - rmdir bin/*_* - ${lib.optionalString (!(GOHOSTARCH == GOARCH && GOOS == GOHOSTOS)) '' - rm -rf pkg/${GOHOSTOS}_${GOHOSTARCH} pkg/tool/${GOHOSTOS}_${GOHOSTARCH} - ''} - '' else if (stdenv.hostPlatform != stdenv.targetPlatform) then '' - rm -rf bin/*_* - ${lib.optionalString (!(GOHOSTARCH == GOARCH && GOOS == GOHOSTOS)) '' - rm -rf pkg/${GOOS}_${GOARCH} pkg/tool/${GOOS}_${GOARCH} - ''} - '' else ""); - - installPhase = '' - runHook preInstall - mkdir -p $GOROOT_FINAL - cp -a bin pkg src lib misc api doc $GOROOT_FINAL - ln -s $GOROOT_FINAL/bin $out/bin - runHook postInstall - ''; - - disallowedReferences = [ goBootstrap ]; - - meta = with lib; { - homepage = "https://go.dev/"; - description = "The Go Programming language"; - license = licenses.bsd3; - maintainers = teams.golang.members ++ [ maintainers._3noch ]; - platforms = platforms.linux ++ platforms.darwin; - }; -} diff --git a/pkgs/development/compilers/go/ssl-cert-file-2-dev.patch b/pkgs/development/compilers/go/ssl-cert-file-2-dev.patch deleted file mode 100644 index a5be2685998e6..0000000000000 --- a/pkgs/development/compilers/go/ssl-cert-file-2-dev.patch +++ /dev/null @@ -1,54 +0,0 @@ -diff --git a/src/crypto/x509/root_darwin.go b/src/crypto/x509/root_darwin.go -index 05593bb105..a6a11eeec1 100644 ---- a/src/crypto/x509/root_darwin.go -+++ b/src/crypto/x509/root_darwin.go -@@ -11,6 +11,7 @@ import ( - "bytes" - macOS "crypto/x509/internal/macos" - "fmt" -+ "io/ioutil" - "os" - "strings" - ) -@@ -22,6 +23,14 @@ func (c *Certificate) systemVerify(opts *VerifyOptions) (chains [][]*Certificate - } - - func loadSystemRoots() (*CertPool, error) { -+ if file := os.Getenv("NIX_SSL_CERT_FILE"); file != "" { -+ data, err := ioutil.ReadFile(file) -+ if err == nil { -+ roots := NewCertPool() -+ roots.AppendCertsFromPEM(data) -+ return roots, nil -+ } -+ } - var trustedRoots []*Certificate - untrustedRoots := make(map[string]bool) - -diff --git a/src/crypto/x509/root_unix.go b/src/crypto/x509/root_unix.go -index dede825edd..ffb3caf4a4 100644 ---- a/src/crypto/x509/root_unix.go -+++ b/src/crypto/x509/root_unix.go -@@ -9,6 +9,7 @@ package x509 - - import ( - "io/fs" -+ "io/ioutil" - "os" - "path/filepath" - "strings" -@@ -32,6 +33,13 @@ func (c *Certificate) systemVerify(opts *VerifyOptions) (chains [][]*Certificate - - func loadSystemRoots() (*CertPool, error) { - roots := NewCertPool() -+ if file := os.Getenv("NIX_SSL_CERT_FILE"); file != "" { -+ data, err := ioutil.ReadFile(file) -+ if err == nil { -+ roots.AppendCertsFromPEM(data) -+ return roots, nil -+ } -+ } - - files := certFiles - if f := os.Getenv(certFileEnv); f != "" { - diff --git a/pkgs/development/compilers/kotlin/default.nix b/pkgs/development/compilers/kotlin/default.nix index 82d7fe3237b2a..fe0bd29a1b273 100644 --- a/pkgs/development/compilers/kotlin/default.nix +++ b/pkgs/development/compilers/kotlin/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "kotlin"; - version = "1.6.10"; + version = "1.6.20"; src = fetchurl { url = "https://github.com/JetBrains/kotlin/releases/download/v${version}/kotlin-compiler-${version}.zip"; - sha256 = "sha256-QyJnmW0Na0sXyo3g+HjkTUoJm36fFYepjtxNJ+dsIVo="; + hash = "sha256-2vF9scGU9CBfOvZxKTZ6abOI+BkXeWPcU6e0ssTYziI="; }; propagatedBuildInputs = [ jre ] ; diff --git a/pkgs/development/compilers/kotlin/native.nix b/pkgs/development/compilers/kotlin/native.nix index 514293e57459a..0c0315d876673 100644 --- a/pkgs/development/compilers/kotlin/native.nix +++ b/pkgs/development/compilers/kotlin/native.nix @@ -7,7 +7,7 @@ stdenv.mkDerivation rec { pname = "kotlin-native"; - version = "1.6.10"; + version = "1.6.20"; src = let getArch = { @@ -20,9 +20,9 @@ stdenv.mkDerivation rec { "https://github.com/JetBrains/kotlin/releases/download/v${version}/kotlin-native-${arch}-${version}.tar.gz"; getHash = arch: { - "macos-aarch64" = "sha256-W+9F1YZ5ATa6KaALYQEXW4xr4UxfquuC72xoB2987iM="; - "macos-x86_64" = "sha256-pceORt+YJZiP67nbnUB6ny1ic/r0aTrdA2hsQi5Otp8="; - "linux-x86_64" = "sha256-tcZffJPcR6PYJ22wIh5BHn/yjG3Jb+MG5COLbAQ2/Ww="; + "macos-aarch64" = "sha256-Nb/5UrNnIOJI+5PdXX4FfhUvCChrfUTkjaMS7nN/eGg="; + "macos-x86_64" = "sha256-cgET1zjk14/o3EH/1t7jfCfXHwcjfAANKG+yxpQccMc="; + "linux-x86_64" = "sha256-qbXyvCTGqRK0mCav6Ei128y1Ok1vfZ1o0haZ+MJjmBQ="; }.${arch}; in fetchurl { diff --git a/pkgs/development/compilers/ocaml/4.00.1.nix b/pkgs/development/compilers/ocaml/4.00.1.nix index 93e08740ddd82..abc5ff14bf298 100644 --- a/pkgs/development/compilers/ocaml/4.00.1.nix +++ b/pkgs/development/compilers/ocaml/4.00.1.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, ncurses, xlibsWrapper }: +{ lib, stdenv, fetchurl, fetchpatch, ncurses, xlibsWrapper }: let useX11 = !stdenv.isAarch32 && !stdenv.isMips; @@ -15,6 +15,12 @@ stdenv.mkDerivation rec { sha256 = "33c3f4acff51685f5bfd7c260f066645e767d4e865877bf1613c176a77799951"; }; + # Compatibility with Glibc 2.34 + patches = [ (fetchpatch { + url = "https://github.com/ocaml/ocaml/commit/60b0cdaf2519d881947af4175ac4c6ff68901be3.patch"; + sha256 = "sha256:07g9q9sjk4xsbqix7jxggfp36v15pmqw4bms80g5car0hfbszirn"; + })]; + prefixKey = "-prefix "; configureFlags = [ "-no-tk" ] ++ optionals useX11 [ "-x11lib" xlibsWrapper ]; buildFlags = [ "world" ] ++ optionals useNativeCompilers [ "bootstrap" "world.opt" ]; diff --git a/pkgs/development/compilers/ocaml/4.01.0.nix b/pkgs/development/compilers/ocaml/4.01.0.nix index 6362f360f7dab..c19f03c5d1645 100644 --- a/pkgs/development/compilers/ocaml/4.01.0.nix +++ b/pkgs/development/compilers/ocaml/4.01.0.nix @@ -2,6 +2,12 @@ import ./generic.nix { major_version = "4"; minor_version = "01"; patch_version = "0"; - patches = [ ./fix-clang-build-on-osx.diff ]; + patches = [ + ./fix-clang-build-on-osx.diff + + # Compatibility with Glibc 2.34 + { url = "https://github.com/ocaml/ocaml/commit/d111407bf4ff71171598d30825c8e59ed5f75fd6.patch"; + sha256 = "sha256:08mpy7lsiwv8m5qrqc4xzyiv2hri5713gz2qs1nfz02hz1bd79mc"; } + ]; sha256 = "03d7ida94s1gpr3gadf4jyhmh5rrszd5s4m4z59daaib25rvfyv7"; } diff --git a/pkgs/development/compilers/ocaml/4.02.nix b/pkgs/development/compilers/ocaml/4.02.nix index 4773f9f74a5a1..9610b78257602 100644 --- a/pkgs/development/compilers/ocaml/4.02.nix +++ b/pkgs/development/compilers/ocaml/4.02.nix @@ -2,6 +2,12 @@ import ./generic.nix { major_version = "4"; minor_version = "02"; patch_version = "3"; - patches = [ ./ocamlbuild.patch ]; + patches = [ + ./ocamlbuild.patch + + # Compatibility with Glibc 2.34 + { url = "https://github.com/ocaml/ocaml/commit/9de2b77472aee18a94b41cff70caee27fb901225.patch"; + sha256 = "sha256:12sw512kpwk0xf2g6j0h5vqgd8xcmgrvgyilx6fxbd6bnfv1yib9"; } + ]; sha256 = "1qwwvy8nzd87hk8rd9sm667nppakiapnx4ypdwcrlnav2dz6kil3"; } diff --git a/pkgs/development/compilers/ocaml/4.03.nix b/pkgs/development/compilers/ocaml/4.03.nix index 0bbe823304199..9f6c24014ea18 100644 --- a/pkgs/development/compilers/ocaml/4.03.nix +++ b/pkgs/development/compilers/ocaml/4.03.nix @@ -3,4 +3,10 @@ import ./generic.nix { minor_version = "03"; patch_version = "0"; sha256 = "09p3iwwi55r6rbrpyp8f0wmkb0ppcgw67yxw6yfky60524wayp39"; + + patches = [ + # Compatibility with Glibc 2.34 + { url = "https://github.com/ocaml/ocaml/commit/a8b2cc3b40f5269ce8525164ec2a63b35722b22b.patch"; + sha256 = "sha256:1rrknmrk86xrj2k3hznnjk1gwnliyqh125zabg1hvy6dlvml9b0x"; } + ]; } diff --git a/pkgs/development/compilers/ocaml/4.04.nix b/pkgs/development/compilers/ocaml/4.04.nix index 4f49bcf807285..7fa1367a51255 100644 --- a/pkgs/development/compilers/ocaml/4.04.nix +++ b/pkgs/development/compilers/ocaml/4.04.nix @@ -6,4 +6,10 @@ import ./generic.nix { # If the executable is stipped it does not work dontStrip = true; + + patches = [ + # Compatibility with Glibc 2.34 + { url = "https://github.com/ocaml/ocaml/commit/6bcff7e6ce1a43e088469278eb3a9341e6a2ca5b.patch"; + sha256 = "sha256:1hd45f7mwwrrym2y4dbcwklpv0g94avbz7qrn81l7w8mrrj3bngi"; } + ]; } diff --git a/pkgs/development/compilers/ocaml/4.05.nix b/pkgs/development/compilers/ocaml/4.05.nix index a63b06a9f6288..60cd6c359993c 100644 --- a/pkgs/development/compilers/ocaml/4.05.nix +++ b/pkgs/development/compilers/ocaml/4.05.nix @@ -6,4 +6,10 @@ import ./generic.nix { # If the executable is stipped it does not work dontStrip = true; + + patches = [ + # Compatibility with Glibc 2.34 + { url = "https://github.com/ocaml/ocaml/commit/50c2d1275e537906ea144bd557fde31e0bf16e5f.patch"; + sha256 = "sha256:0ck9b2dpgg5k2p9ndbgniql24h35pn1bbpxjvk69j715lswzy4mh"; } + ]; } diff --git a/pkgs/development/compilers/ocaml/4.06.nix b/pkgs/development/compilers/ocaml/4.06.nix index b54b8a6288fea..0f5e0a2d70be2 100644 --- a/pkgs/development/compilers/ocaml/4.06.nix +++ b/pkgs/development/compilers/ocaml/4.06.nix @@ -6,4 +6,10 @@ import ./generic.nix { # If the executable is stipped it does not work dontStrip = true; + + patches = [ + # Compatibility with Glibc 2.34 + { url = "https://github.com/ocaml/ocaml/commit/137a4ad167f25fe1bee792977ed89f30d19bcd74.patch"; + sha256 = "sha256:0izsf6rm3677vbbx0snkmn9pkfcsayrdwz3ipiml5wjiaysnchjz"; } + ]; } diff --git a/pkgs/development/compilers/ocaml/4.07.nix b/pkgs/development/compilers/ocaml/4.07.nix index c1952f30ba688..8292213bf46d6 100644 --- a/pkgs/development/compilers/ocaml/4.07.nix +++ b/pkgs/development/compilers/ocaml/4.07.nix @@ -6,4 +6,10 @@ import ./generic.nix { # If the executable is stripped it does not work dontStrip = true; + + patches = [ + # Compatibility with Glibc 2.34 + { url = "https://github.com/ocaml/ocaml/commit/00b8c4d503732343d5d01761ad09650fe50ff3a0.patch"; + sha256 = "sha256:02cfya5ff5szx0fsl5x8ax76jyrla9zmf3qxavf3adhwq5ssrfcv"; } + ]; } diff --git a/pkgs/development/compilers/ocaml/4.08.nix b/pkgs/development/compilers/ocaml/4.08.nix index 11c22e636ef10..3c4cf0a712553 100644 --- a/pkgs/development/compilers/ocaml/4.08.nix +++ b/pkgs/development/compilers/ocaml/4.08.nix @@ -9,4 +9,10 @@ import ./generic.nix { # Breaks build with Clang hardeningDisable = [ "strictoverflow" ]; + + patches = [ + # Compatibility with Glibc 2.34 + { url = "https://github.com/ocaml/ocaml/commit/17df117b4939486d3285031900587afce5262c8c.patch"; + sha256 = "sha256:1b3jc6sj2k23yvfwrv6nc1f4x2n2biqbhbbp74aqb6iyqyjsq35n"; } + ]; } diff --git a/pkgs/development/compilers/ocaml/4.09.nix b/pkgs/development/compilers/ocaml/4.09.nix index a093a24464195..c5f649c15d6bb 100644 --- a/pkgs/development/compilers/ocaml/4.09.nix +++ b/pkgs/development/compilers/ocaml/4.09.nix @@ -6,4 +6,10 @@ import ./generic.nix { # Breaks build with Clang hardeningDisable = [ "strictoverflow" ]; + + patches = [ + # Compatibility with Glibc 2.34 + { url = "https://github.com/ocaml/ocaml/commit/8eed2e441222588dc385a98ae8bd6f5820eb0223.patch"; + sha256 = "sha256:1b3jc6sj2k23yvfwrv6nc1f4x2n2biqbhbbp74aqb6iyqyjsq35n"; } + ]; } diff --git a/pkgs/development/haskell-modules/HACKING.md b/pkgs/development/haskell-modules/HACKING.md index 51b0abb155243..8dc5c434672df 100644 --- a/pkgs/development/haskell-modules/HACKING.md +++ b/pkgs/development/haskell-modules/HACKING.md @@ -345,7 +345,7 @@ Here are some additional tips that didn't fit in above. [release-haskell.nix](../../top-level/release-haskell.nix). 1. Update the - [Nextcloud Calendar](https://cloud.maralorn.de/apps/calendar/p/Mw5WLnzsP7fC4Zky) + [Nextcloud Calendar](https://cloud.maralorn.de/apps/calendar/p/H6migHmKX7xHoTFa) and work the new member into the `haskell-updates` rotation. 1. Optionally, have the new member add themselves to the Haskell diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix index 0302ca2e54cec..6c9f7499ce33a 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -619,7 +619,7 @@ self: super: { doCheck = false; # https://github.com/kazu-yamamoto/ghc-mod/issues/335 executableToolDepends = drv.executableToolDepends or [] ++ [pkgs.buildPackages.emacs]; postInstall = '' - local lispdir=( "$data/share/${self.ghc.name}/*/${drv.pname}-${drv.version}/elisp" ) + local lispdir=( "$data/share/${self.ghc.targetPrefix}${self.ghc.haskellCompilerName}/*/${drv.pname}-${drv.version}/elisp" ) make -C $lispdir mkdir -p $data/share/emacs/site-lisp ln -s "$lispdir/"*.el{,c} $data/share/emacs/site-lisp/ @@ -654,7 +654,7 @@ self: super: { # cannot easily byte-compile these files, unfortunately, because they # depend on a new version of haskell-mode that we don't have yet. postInstall = '' - local lispdir=( "$data/share/${self.ghc.name}/"*"/${drv.pname}-"*"/elisp" ) + local lispdir=( "$data/share/${self.ghc.targetPrefix}${self.ghc.haskellCompilerName}/"*"/${drv.pname}-"*"/elisp" ) mkdir -p $data/share/emacs ln -s $lispdir $data/share/emacs/site-lisp ''; @@ -665,7 +665,7 @@ self: super: { # We cannot easily byte-compile these files, unfortunately, because they # depend on a new version of haskell-mode that we don't have yet. postInstall = '' - local lispdir=( "$data/share/${self.ghc.name}/"*"/${drv.pname}-"*"/elisp" ) + local lispdir=( "$data/share/${self.ghc.targetPrefix}${self.ghc.haskellCompilerName}/"*"/${drv.pname}-"*"/elisp" ) mkdir -p $data/share/emacs ln -s $lispdir $data/share/emacs/site-lisp ''; @@ -1484,35 +1484,48 @@ self: super: { # hasura packages need some extra care graphql-engine = overrideCabal (drv: { - patches = [ ./patches/graphql-engine-mapkeys.patch ]; + patches = [ + # Compat with unordered-containers >= 0.2.15.0 + (fetchpatch { + name = "hasura-graphql-engine-updated-deps.patch"; + url = "https://github.com/hasura/graphql-engine/commit/d50aae87a58794bc1fc66c7a60acb0c34b5e70c7.patch"; + stripLen = 1; + excludes = [ "cabal.project.freeze" ]; + sha256 = "0lb5l9vfynr85i9xs53w4mpgczp04ncxz7846n3y91ri34fa87v3"; + }) + # Compat with hashable >= 1.3.4.0 + (fetchpatch { + name = "hasura-graphql-engine-hashable-1.3.4.0.patch"; + url = "https://github.com/hasura/graphql-engine/commit/e48b2287315fb09005ffd52c0a686dc321171ae2.patch"; + sha256 = "1jppnanmsyl8npyf59s0d8bgjy7bq50vkh5zx4888jy6jqh27jb6"; + stripLen = 1; + }) + # Compat with unordered-containers >= 0.2.17.0 + (fetchpatch { + name = "hasura-graphql-engine-unordered-containers-0.2.17.0.patch"; + url = "https://github.com/hasura/graphql-engine/commit/3a1eb3128a2ded2da7c5fef089738890828cce03.patch"; + sha256 = "0vz7s8m8mjvv728vm4q0dvvrirvydaw7xks30b5ddj9f6a72a2f1"; + stripLen = 1; + }) + ]; doHaddock = false; - version = "2.0.10"; - }) (super.graphql-engine.overrideScope (self: super: { + version = "2.3.1"; + }) (super.graphql-engine.override { immortal = self.immortal_0_2_2_1; resource-pool = self.hasura-resource-pool; ekg-core = self.hasura-ekg-core; ekg-json = self.hasura-ekg-json; - hspec = dontCheck self.hspec_2_9_4; - hspec-core = dontCheck self.hspec-core_2_9_4; - hspec-discover = dontCheck super.hspec-discover_2_9_4; - })); - hasura-ekg-core = doJailbreak (super.hasura-ekg-core.overrideScope (self: super: { - hspec = dontCheck self.hspec_2_9_4; - hspec-core = dontCheck self.hspec-core_2_9_4; - hspec-discover = dontCheck super.hspec-discover_2_9_4; - })); - hasura-ekg-json = super.hasura-ekg-json.overrideScope (self: super: { - ekg-core = self.hasura-ekg-core; - hspec = dontCheck self.hspec_2_9_4; - hspec-core = dontCheck self.hspec-core_2_9_4; - hspec-discover = dontCheck super.hspec-discover_2_9_4; }); + hasura-ekg-json = super.hasura-ekg-json.override { + ekg-core = self.hasura-ekg-core; + }; pg-client = overrideCabal (drv: { librarySystemDepends = with pkgs; [ postgresql krb5.dev openssl.dev ]; # wants a running DB to check against doCheck = false; }) (super.pg-client.override { resource-pool = self.hasura-resource-pool; + ekg-core = self.hasura-ekg-core; }); # https://github.com/bos/statistics/issues/170 @@ -2044,18 +2057,6 @@ self: super: { '' + (drv.postPatch or ""); }) (doJailbreak super.jsaddle); - # 2022-03-22: PR for haskell-gi-base compat https://github.com/ghcjs/jsaddle/pull/129 - jsaddle-webkit2gtk = - appendPatch ( - fetchpatch { - name = "haskell-gi-base-0.26-compat-patch"; - url = "https://github.com/ghcjs/jsaddle/commit/c9a9ad39addea469f7e3f5bc6b1c778fefaab5d8.patch"; - sha256 = "sha256-4njoOxtJH2jVqiPmW8f9hGUqpzI3yJ1XP4u85QgmvjU="; - relative = "jsaddle-webkit2gtk"; - } - ) - super.jsaddle-webkit2gtk; - # 2022-03-22: Jailbreak for base bound: https://github.com/reflex-frp/reflex-dom/pull/433 reflex-dom = assert super.reflex-dom.version == "0.6.1.1"; doJailbreak super.reflex-dom; diff --git a/pkgs/development/haskell-modules/configuration-darwin.nix b/pkgs/development/haskell-modules/configuration-darwin.nix index 84be174e97e8a..f8ae9807cd1d1 100644 --- a/pkgs/development/haskell-modules/configuration-darwin.nix +++ b/pkgs/development/haskell-modules/configuration-darwin.nix @@ -287,8 +287,6 @@ self: super: ({ # https://github.com/fpco/unliftio/issues/87 unliftio = dontCheck super.unliftio; - # https://github.com/fpco/inline-c/issues/127 - inline-c-cpp = dontCheck super.inline-c-cpp; # https://github.com/haskell-crypto/cryptonite/issues/360 cryptonite = appendPatch ./patches/cryptonite-remove-argon2.patch super.cryptonite; diff --git a/pkgs/development/haskell-modules/configuration-ghc-8.10.x.nix b/pkgs/development/haskell-modules/configuration-ghc-8.10.x.nix index 0979466904479..84d0a30858f33 100644 --- a/pkgs/development/haskell-modules/configuration-ghc-8.10.x.nix +++ b/pkgs/development/haskell-modules/configuration-ghc-8.10.x.nix @@ -2,6 +2,10 @@ with haskellLib; +let + inherit (pkgs.stdenv.hostPlatform) isDarwin; +in + self: super: { llvmPackages = pkgs.lib.dontRecurseIntoAttrs self.ghc.llvmPackages; @@ -121,4 +125,7 @@ self: super: { ] super.mysql-simple; taffybar = markUnbroken (doDistribute super.taffybar); + + # https://github.com/fpco/inline-c/issues/127 (recommend to upgrade to Nixpkgs GHC >=9.0) + inline-c-cpp = (if isDarwin then dontCheck else x: x) super.inline-c-cpp; } diff --git a/pkgs/development/haskell-modules/configuration-ghc-8.6.x.nix b/pkgs/development/haskell-modules/configuration-ghc-8.6.x.nix index d712ab9d1a2b1..5eaa1ae413d47 100644 --- a/pkgs/development/haskell-modules/configuration-ghc-8.6.x.nix +++ b/pkgs/development/haskell-modules/configuration-ghc-8.6.x.nix @@ -2,6 +2,10 @@ with haskellLib; +let + inherit (pkgs.stdenv.hostPlatform) isDarwin; +in + self: super: { llvmPackages = pkgs.lib.dontRecurseIntoAttrs self.ghc.llvmPackages; @@ -104,4 +108,6 @@ self: super: { mime-string = disableOptimization super.mime-string; + # https://github.com/fpco/inline-c/issues/127 (recommend to upgrade to Nixpkgs GHC >=9.0) + inline-c-cpp = (if isDarwin then dontCheck else x: x) super.inline-c-cpp; } diff --git a/pkgs/development/haskell-modules/configuration-ghc-8.8.x.nix b/pkgs/development/haskell-modules/configuration-ghc-8.8.x.nix index c0e9b7aab5ae3..6b56d9eb73543 100644 --- a/pkgs/development/haskell-modules/configuration-ghc-8.8.x.nix +++ b/pkgs/development/haskell-modules/configuration-ghc-8.8.x.nix @@ -2,6 +2,10 @@ with haskellLib; +let + inherit (pkgs.stdenv.hostPlatform) isDarwin; +in + self: super: { llvmPackages = pkgs.lib.dontRecurseIntoAttrs self.ghc.llvmPackages; @@ -150,4 +154,7 @@ self: super: { mysql-simple = addBuildDepends [ self.blaze-textual ] super.mysql-simple; + + # https://github.com/fpco/inline-c/issues/127 (recommend to upgrade to Nixpkgs GHC >=9.0) + inline-c-cpp = (if isDarwin then dontCheck else x: x) super.inline-c-cpp; } diff --git a/pkgs/development/haskell-modules/configuration-ghc-9.0.x.nix b/pkgs/development/haskell-modules/configuration-ghc-9.0.x.nix index f36c77d636a7b..855afa28101d5 100644 --- a/pkgs/development/haskell-modules/configuration-ghc-9.0.x.nix +++ b/pkgs/development/haskell-modules/configuration-ghc-9.0.x.nix @@ -2,6 +2,10 @@ with haskellLib; +let + inherit (pkgs.stdenv.hostPlatform) isDarwin; +in + self: super: { llvmPackages = pkgs.lib.dontRecurseIntoAttrs self.ghc.llvmPackages; @@ -118,4 +122,10 @@ self: super: { multistate = doJailbreak super.multistate; # https://github.com/lspitzner/butcher/issues/7 butcher = doJailbreak super.butcher; + + # We use a GHC patch to support the fix for https://github.com/fpco/inline-c/issues/127 + # which means that the upstream cabal file isn't allowed to add the flag. + inline-c-cpp = + (if isDarwin then appendConfigureFlags ["--ghc-option=-fcompact-unwind"] else x: x) + super.inline-c-cpp; } diff --git a/pkgs/development/haskell-modules/configuration-ghc-9.2.x.nix b/pkgs/development/haskell-modules/configuration-ghc-9.2.x.nix index eb1245191cb82..b55429da65b52 100644 --- a/pkgs/development/haskell-modules/configuration-ghc-9.2.x.nix +++ b/pkgs/development/haskell-modules/configuration-ghc-9.2.x.nix @@ -2,6 +2,10 @@ with haskellLib; +let + inherit (pkgs.stdenv.hostPlatform) isDarwin; +in + self: super: { llvmPackages = pkgs.lib.dontRecurseIntoAttrs self.ghc.llvmPackages; @@ -236,4 +240,9 @@ self: super: { hls-retrie-plugin = null; hls-splice-plugin = null; })); + + # https://github.com/fpco/inline-c/pull/131 + inline-c-cpp = + (if isDarwin then appendConfigureFlags ["--ghc-option=-fcompact-unwind"] else x: x) + super.inline-c-cpp; } diff --git a/pkgs/development/haskell-modules/configuration-ghc-head.nix b/pkgs/development/haskell-modules/configuration-ghc-head.nix index e1e3f2c99884e..9c7895d4fe6d2 100644 --- a/pkgs/development/haskell-modules/configuration-ghc-head.nix +++ b/pkgs/development/haskell-modules/configuration-ghc-head.nix @@ -9,6 +9,10 @@ with haskellLib; +let + inherit (pkgs.stdenv.hostPlatform) isDarwin; +in + self: super: { llvmPackages = pkgs.lib.dontRecurseIntoAttrs self.ghc.llvmPackages; @@ -74,4 +78,9 @@ self: super: { # Break out of "yaml >=0.10.4.0 && <0.11": https://github.com/commercialhaskell/stack/issues/4485 stack = doJailbreak super.stack; + # https://github.com/fpco/inline-c/pull/131 + # and/or https://gitlab.haskell.org/ghc/ghc/-/merge_requests/7739 + inline-c-cpp = + (if isDarwin then appendConfigureFlags ["--ghc-option=-fcompact-unwind"] else x: x) + super.inline-c-cpp; } diff --git a/pkgs/development/haskell-modules/configuration-ghcjs.nix b/pkgs/development/haskell-modules/configuration-ghcjs.nix index 2bdf5cfbe51ed..c6e0e6a2c053d 100644 --- a/pkgs/development/haskell-modules/configuration-ghcjs.nix +++ b/pkgs/development/haskell-modules/configuration-ghcjs.nix @@ -19,7 +19,7 @@ self: super: jailbreak-cabal alex happy gtk2hs-buildtools rehoo hoogle; ghcjs-base = dontCheck (self.callPackage ../compilers/ghcjs/ghcjs-base.nix { - fetchgit = pkgs.buildPackages.fetchgit; + fetchFromGitHub = pkgs.buildPackages.fetchFromGitHub; }); # GHCJS does not ship with the same core packages as GHC. diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix/broken.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix/broken.yaml index ba23a9a5b28ff..31a401ac8cc39 100644 --- a/pkgs/development/haskell-modules/configuration-hackage2nix/broken.yaml +++ b/pkgs/development/haskell-modules/configuration-hackage2nix/broken.yaml @@ -1392,6 +1392,7 @@ broken-packages: - fast-nats - fastpbkdf2 - FastPush + - fast-tags - FastxPipe - fathead-util - fb @@ -3959,6 +3960,7 @@ broken-packages: - powerdns - powermate - powerpc + - powerqueue-levelmem - pprecord - PPrinter - pqc @@ -4705,6 +4707,7 @@ broken-packages: - socketio - sockets-and-pipes - socket-sctp + - socketson - socket-unix - sodium - soegtk @@ -5205,6 +5208,7 @@ broken-packages: - trial-tomland - trigger - trim + - tripLL - trivia - tropical - true-name diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix/main.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix/main.yaml index dfa46c41b9354..a85df6b23c0f8 100644 --- a/pkgs/development/haskell-modules/configuration-hackage2nix/main.yaml +++ b/pkgs/development/haskell-modules/configuration-hackage2nix/main.yaml @@ -327,6 +327,8 @@ package-maintainers: - hercules-ci-cli - hercules-ci-cnix-expr - hercules-ci-cnix-store + - inline-c + - inline-c-cpp rvl: - taffybar - arbtt diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix/transitive-broken.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix/transitive-broken.yaml index 674735fd16e79..188e3069ede33 100644 --- a/pkgs/development/haskell-modules/configuration-hackage2nix/transitive-broken.yaml +++ b/pkgs/development/haskell-modules/configuration-hackage2nix/transitive-broken.yaml @@ -928,6 +928,7 @@ dont-distribute-packages: - cfopu - chainweb-mining-client - chalkboard-viewer + - chapelure - charade - chart-cli - chart-svg-various @@ -1354,7 +1355,6 @@ dont-distribute-packages: - errors-ext - ersatz-toysat - esotericbot - - espial - estimators - estreps - eternity @@ -1433,6 +1433,7 @@ dont-distribute-packages: - feed-translator - feed2lj - feed2twitter + - feedback - fei-base - fei-dataiter - fei-datasets diff --git a/pkgs/development/haskell-modules/generic-builder.nix b/pkgs/development/haskell-modules/generic-builder.nix index a9692b5a0f012..bc43c39676c81 100644 --- a/pkgs/development/haskell-modules/generic-builder.nix +++ b/pkgs/development/haskell-modules/generic-builder.nix @@ -196,13 +196,13 @@ let "--prefix=$out" "--libdir=\\$prefix/lib/\\$compiler" "--libsubdir=\\$abi/\\$libname" - (optionalString enableSeparateDataOutput "--datadir=$data/share/${ghc.name}") + (optionalString enableSeparateDataOutput "--datadir=$data/share/${ghcNameWithPrefix}") (optionalString enableSeparateDocOutput "--docdir=${docdir "$doc"}") ] ++ optionals stdenv.hasCC [ "--with-gcc=$CC" # Clang won't work without that extra information. ] ++ [ "--package-db=$packageConfDir" - (optionalString (enableSharedExecutables && stdenv.isLinux) "--ghc-option=-optl=-Wl,-rpath=$out/lib/${ghc.name}/${pname}-${version}") + (optionalString (enableSharedExecutables && stdenv.isLinux) "--ghc-option=-optl=-Wl,-rpath=$out/lib/${ghcNameWithPrefix}/${pname}-${version}") (optionalString (enableSharedExecutables && stdenv.isDarwin) "--ghc-option=-optl=-Wl,-headerpad_max_install_names") (optionalString enableParallelBuilding "--ghc-options=${parallelBuildingFlags}") (optionalString useCpphs "--with-cpphs=${cpphs}/bin/cpphs --ghc-options=-cpp --ghc-options=-pgmP${cpphs}/bin/cpphs --ghc-options=-optP--cpp") @@ -275,6 +275,8 @@ let ghcCommand' = if isGhcjs then "ghcjs" else "ghc"; ghcCommand = "${ghc.targetPrefix}${ghcCommand'}"; + ghcNameWithPrefix = "${ghc.targetPrefix}${ghc.haskellCompilerName}"; + nativeGhcCommand = "${nativeGhc.targetPrefix}ghc"; buildPkgDb = ghcName: packageConfDir: '' @@ -350,14 +352,14 @@ stdenv.mkDerivation ({ # pkgs* arrays defined in stdenv/setup.hs + '' for p in "''${pkgsBuildBuild[@]}" "''${pkgsBuildHost[@]}" "''${pkgsBuildTarget[@]}"; do - ${buildPkgDb nativeGhc.name "$setupPackageConfDir"} + ${buildPkgDb "${nativeGhcCommand}-${nativeGhc.version}" "$setupPackageConfDir"} done ${nativeGhcCommand}-pkg --${nativePackageDbFlag}="$setupPackageConfDir" recache '' # For normal components + '' for p in "''${pkgsHostHost[@]}" "''${pkgsHostTarget[@]}"; do - ${buildPkgDb ghc.name "$packageConfDir"} + ${buildPkgDb ghcNameWithPrefix "$packageConfDir"} if [ -d "$p/include" ]; then configureFlags+=" --extra-include-dirs=$p/include" fi @@ -494,7 +496,7 @@ stdenv.mkDerivation ({ # just the target specified; "install" will error here, since not all targets have been built. else '' ${setupCommand} copy ${buildTarget} - local packageConfDir="$out/lib/${ghc.name}/package.conf.d" + local packageConfDir="$out/lib/${ghcNameWithPrefix}/package.conf.d" local packageConfFile="$packageConfDir/${pname}-${version}.conf" mkdir -p "$packageConfDir" ${setupCommand} register --gen-pkg-config=$packageConfFile diff --git a/pkgs/development/haskell-modules/hackage-packages.nix b/pkgs/development/haskell-modules/hackage-packages.nix index abfa19d7ced66..b4ceaa6556a67 100644 --- a/pkgs/development/haskell-modules/hackage-packages.nix +++ b/pkgs/development/haskell-modules/hackage-packages.nix @@ -840,6 +840,42 @@ self: { maintainers = with lib.maintainers; [ abbradar turion ]; }) {inherit (pkgs) emacs;}; + "Agda_2_6_2_2" = callPackage + ({ mkDerivation, aeson, alex, array, async, base, binary + , blaze-html, boxes, bytestring, Cabal, case-insensitive + , containers, data-hash, deepseq, directory, edit-distance, emacs + , equivalence, exceptions, filepath, ghc-compact, gitrev, happy + , hashable, hashtables, haskeline, monad-control, mtl, murmur-hash + , parallel, pretty, process, regex-tdfa, split, stm, strict + , template-haskell, text, time, transformers, unordered-containers + , uri-encode, zlib + }: + mkDerivation { + pname = "Agda"; + version = "2.6.2.2"; + sha256 = "0yjjbhc593ylrm4mq4j01nkdvh7xqsg5in30wxj4y53vf5hkggp5"; + isLibrary = true; + isExecutable = true; + enableSeparateDataOutput = true; + setupHaskellDepends = [ base Cabal directory filepath process ]; + libraryHaskellDepends = [ + aeson array async base binary blaze-html boxes bytestring + case-insensitive containers data-hash deepseq directory + edit-distance equivalence exceptions filepath ghc-compact gitrev + hashable hashtables haskeline monad-control mtl murmur-hash + parallel pretty process regex-tdfa split stm strict + template-haskell text time transformers unordered-containers + uri-encode zlib + ]; + libraryToolDepends = [ alex happy ]; + executableHaskellDepends = [ base directory filepath process ]; + executableToolDepends = [ emacs ]; + description = "A dependently typed functional programming language and proof assistant"; + license = "unknown"; + hydraPlatforms = lib.platforms.none; + maintainers = with lib.maintainers; [ abbradar turion ]; + }) {inherit (pkgs) emacs;}; + "Agda-executable" = callPackage ({ mkDerivation, Agda, base }: mkDerivation { @@ -40127,8 +40163,8 @@ self: { }: mkDerivation { pname = "bcp47"; - version = "0.2.0.5"; - sha256 = "1drfv04v5137c726c9bpz8lh1c0blb4mfnca4dgzai91pjk026sd"; + version = "0.2.0.6"; + sha256 = "0k226jmpv6fnifbmbgdfvbj375an5g7bzzlcvfa1n5x65512ibp2"; libraryHaskellDepends = [ aeson base containers country generic-arbitrary iso639 megaparsec QuickCheck text @@ -40147,8 +40183,8 @@ self: { }: mkDerivation { pname = "bcp47-orphans"; - version = "0.1.0.4"; - sha256 = "08kx00dxmwj0vxazcd2s88q069swnzjfnj61kla5pczaz0aqh11w"; + version = "0.1.0.5"; + sha256 = "1h5pqcb1snmbbvcfpjcqrfbk9l8wry6i0mlz6vm347arhfwc62cd"; libraryHaskellDepends = [ base bcp47 cassava errors esqueleto hashable http-api-data path-pieces persistent text @@ -47076,6 +47112,33 @@ self: { license = lib.licenses.bsd3; }) {}; + "brick_0_68_1" = callPackage + ({ mkDerivation, base, bytestring, config-ini, containers + , contravariant, data-clist, deepseq, directory, dlist, exceptions + , filepath, microlens, microlens-mtl, microlens-th, QuickCheck, stm + , template-haskell, text, text-zipper, transformers, unix, vector + , vty, word-wrap + }: + mkDerivation { + pname = "brick"; + version = "0.68.1"; + sha256 = "17pzp9p4rmd82smxwz2kh1jjd5ssy5b86jnv7a4ac1g1zgnnki0r"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + base bytestring config-ini containers contravariant data-clist + deepseq directory dlist exceptions filepath microlens microlens-mtl + microlens-th stm template-haskell text text-zipper transformers + unix vector vty word-wrap + ]; + testHaskellDepends = [ + base containers microlens QuickCheck vector + ]; + description = "A declarative terminal user interface library"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + }) {}; + "brick-dropdownmenu" = callPackage ({ mkDerivation, base, brick, containers, microlens, microlens-ghc , microlens-th, pointedlist, vector, vty @@ -47977,8 +48040,8 @@ self: { }: mkDerivation { pname = "bugsnag"; - version = "1.0.0.0"; - sha256 = "0s0ppjhn1qylbcia2rpccq7xma26ch1qk9lq578df4i1djpl07zl"; + version = "1.0.0.1"; + sha256 = "1sbm85r2ia5k4rdbz8yqgd5x01b2l5kw0p4knj8mr8cr37fqzp8b"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -47986,7 +48049,7 @@ self: { http-client-tls parsec template-haskell text th-lift-instances ua-parser unordered-containers ]; - testHaskellDepends = [ base hspec text unliftio ]; + testHaskellDepends = [ base hspec unliftio ]; description = "Bugsnag error reporter for Haskell"; license = lib.licenses.mit; }) {}; @@ -48040,8 +48103,8 @@ self: { }: mkDerivation { pname = "bugsnag-wai"; - version = "1.0.0.0"; - sha256 = "0qarc8w1vprklccrr4i8z5x6m4qry2f09fi43ac7jnh1axywv93a"; + version = "1.0.0.1"; + sha256 = "0f3x4m9nl277rhg2pwrja9xh6fffrwl2dm1cf3jiyngkrbrfck0w"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -48059,8 +48122,8 @@ self: { }: mkDerivation { pname = "bugsnag-yesod"; - version = "1.0.0.0"; - sha256 = "181qdsq7dnzsna05g78r613mgfl3shxx6n0zllnzf4m3c05vq5j6"; + version = "1.0.0.1"; + sha256 = "06w2ndxk8czwdfwyy3ylkhzagbaxx6gkix8lwybks0vsxwjr6w83"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -54620,19 +54683,19 @@ self: { "cfn-flip" = callPackage ({ mkDerivation, aeson, base, bytestring, conduit, doctest - , filepath, Glob, hspec, libyaml, resourcet, text, unliftio - , unliftio-core, yaml + , filepath, Glob, hspec, libyaml, text, unliftio, unliftio-core + , yaml }: mkDerivation { pname = "cfn-flip"; - version = "0.1.0.1"; - sha256 = "0vykc7lwjarbf0zqkjfms5sv82vsd64q102qrmvl3qs8mil0vkv2"; + version = "0.1.0.2"; + sha256 = "16n45ik3g33fqfqry7l8pa0gcljymvw9wkg9n3qal8570q5k82ds"; libraryHaskellDepends = [ - aeson base bytestring conduit libyaml resourcet text unliftio - unliftio-core yaml + aeson base bytestring conduit libyaml text unliftio unliftio-core + yaml ]; testHaskellDepends = [ - aeson base conduit doctest filepath Glob hspec libyaml yaml + aeson base doctest filepath Glob hspec libyaml yaml ]; description = "Haskell implementation of aws/cfn-flip"; license = lib.licenses.mit; @@ -54990,6 +55053,27 @@ self: { license = lib.licenses.bsd3; }) {}; + "chapelure" = callPackage + ({ mkDerivation, ansi-terminal, base, colour, containers + , hsluv-haskell, hspec, nonempty-vector, optics-core, prettyprinter + , string-qq, text, text-display, vector + }: + mkDerivation { + pname = "chapelure"; + version = "0.0.1.0"; + sha256 = "0avlif17mx59vmla2gj649f73hglf38yhcwpblzly8yif2nnwj07"; + libraryHaskellDepends = [ + ansi-terminal base colour containers hsluv-haskell nonempty-vector + optics-core prettyprinter text text-display vector + ]; + testHaskellDepends = [ + base hspec nonempty-vector prettyprinter string-qq text vector + ]; + description = "A diagnostics library for Haskell"; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + }) {}; + "char-decode" = callPackage ({ mkDerivation, base, bytestring, QuickCheck, tasty , tasty-quickcheck, text @@ -56805,6 +56889,33 @@ self: { license = lib.licenses.bsd2; }) {}; + "citeproc_0_7" = callPackage + ({ mkDerivation, aeson, attoparsec, base, bytestring + , case-insensitive, containers, data-default, Diff, directory + , file-embed, filepath, mtl, pandoc-types, pretty, safe, scientific + , text, timeit, transformers, unicode-collation, uniplate, vector + , xml-conduit + }: + mkDerivation { + pname = "citeproc"; + version = "0.7"; + sha256 = "1xsfsz6hdp0ickps1qafkfn7pwjxc22a5ib3bl99jdjbx7fql6h9"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + aeson attoparsec base bytestring case-insensitive containers + data-default file-embed filepath pandoc-types safe scientific text + transformers unicode-collation uniplate vector xml-conduit + ]; + testHaskellDepends = [ + aeson base bytestring containers Diff directory filepath mtl pretty + text timeit transformers + ]; + description = "Generates citations and bibliography from CSL styles"; + license = lib.licenses.bsd2; + hydraPlatforms = lib.platforms.none; + }) {}; + "citeproc-hs" = callPackage ({ mkDerivation, base, bytestring, containers, directory, filepath , hexpat, hs-bibutils, HTTP, json, mtl, network, network-uri @@ -58619,6 +58730,26 @@ self: { license = lib.licenses.mit; }) {}; + "closed_0_2_0_2" = callPackage + ({ mkDerivation, aeson, base, cassava, deepseq, hashable, hspec + , markdown-unlit, persistent, QuickCheck, text, vector + }: + mkDerivation { + pname = "closed"; + version = "0.2.0.2"; + sha256 = "0dh73bayq78a0idbh2lprmb8hazj03g4ma5gcmad06bq01nl9yxh"; + libraryHaskellDepends = [ + aeson base cassava deepseq hashable persistent QuickCheck text + ]; + testHaskellDepends = [ + aeson base cassava hspec markdown-unlit persistent text vector + ]; + testToolDepends = [ markdown-unlit ]; + description = "Integers bounded by a closed interval"; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + }) {}; + "closed-classes" = callPackage ({ mkDerivation, base, template-haskell }: mkDerivation { @@ -61242,6 +61373,29 @@ self: { license = lib.licenses.bsd3; }) {}; + "commonmark_0_2_2" = callPackage + ({ mkDerivation, base, bytestring, containers, parsec, tasty + , tasty-bench, tasty-hunit, tasty-quickcheck, text, transformers + , unicode-data, unicode-transforms + }: + mkDerivation { + pname = "commonmark"; + version = "0.2.2"; + sha256 = "0kmjc9xgzy33kxz842mw5rdywip3lmk7v3ambrs87nakawgl42xp"; + libraryHaskellDepends = [ + base bytestring containers parsec text transformers unicode-data + unicode-transforms + ]; + testHaskellDepends = [ + base parsec tasty tasty-hunit tasty-quickcheck text + unicode-transforms + ]; + benchmarkHaskellDepends = [ base tasty-bench text ]; + description = "Pure Haskell commonmark parser"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + }) {}; + "commonmark-cli" = callPackage ({ mkDerivation, aeson, ansi-terminal, base, bytestring, commonmark , commonmark-extensions, commonmark-pandoc, containers, mtl @@ -61283,6 +61437,28 @@ self: { license = lib.licenses.bsd3; }) {}; + "commonmark-extensions_0_2_3_1" = callPackage + ({ mkDerivation, base, commonmark, containers, emojis, filepath + , network-uri, parsec, tasty, tasty-bench, tasty-hunit, text + , transformers + }: + mkDerivation { + pname = "commonmark-extensions"; + version = "0.2.3.1"; + sha256 = "1hnhaxw7mpsbcgqz1vlxy0xnnkgh590hi6gv1wk5fw1j12viqdzi"; + libraryHaskellDepends = [ + base commonmark containers emojis filepath network-uri parsec text + transformers + ]; + testHaskellDepends = [ + base commonmark parsec tasty tasty-hunit text + ]; + benchmarkHaskellDepends = [ base commonmark tasty-bench text ]; + description = "Pure Haskell commonmark parser"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + }) {}; + "commonmark-pandoc" = callPackage ({ mkDerivation, base, commonmark, commonmark-extensions , pandoc-types, text @@ -69819,13 +69995,13 @@ self: { }) {inherit (pkgs) curl;}; "curl-aeson" = callPackage - ({ mkDerivation, aeson, base, curl, text, utf8-string }: + ({ mkDerivation, aeson, base, bytestring, curl, text }: mkDerivation { pname = "curl-aeson"; - version = "0.0.4"; - sha256 = "1fpi448f6bgf3rbw3zxf7r9nwyhv9q67zan5sixnad1y7lqxivrx"; - libraryHaskellDepends = [ aeson base curl text utf8-string ]; - description = "Communicate with HTTP service using JSON"; + version = "0.1.0.1"; + sha256 = "1hiz2rwbycl2nx5k1157nnl661rk1gkj7m4vc4qac1saqvf9jxdz"; + libraryHaskellDepends = [ aeson base bytestring curl text ]; + description = "Communicate with web services using JSON"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; broken = true; @@ -74710,18 +74886,14 @@ self: { hydraPlatforms = lib.platforms.none; }) {}; - "deepseq_1_4_6_1" = callPackage - ({ mkDerivation, array, base, ghc-prim, HUnit, test-framework - , test-framework-hunit - }: + "deepseq_1_4_7_0" = callPackage + ({ mkDerivation, array, base, ghc-prim }: mkDerivation { pname = "deepseq"; - version = "1.4.6.1"; - sha256 = "178k97l6yh8bklnkzqsla4l2vms16ys126abs7d5i0fcnyj472fm"; - libraryHaskellDepends = [ array base ]; - testHaskellDepends = [ - array base ghc-prim HUnit test-framework test-framework-hunit - ]; + version = "1.4.7.0"; + sha256 = "0sm00rsw714y73qr5zihz5fhxw0hahs6ksmf8wa60m1qwb9jcy9v"; + libraryHaskellDepends = [ array base ghc-prim ]; + testHaskellDepends = [ array base ghc-prim ]; description = "Deep evaluation of data structures"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; @@ -75927,8 +76099,8 @@ self: { }: mkDerivation { pname = "deriving-trans"; - version = "0.3.1.0"; - sha256 = "0x7kk9b08f9fplkycw2202qil3rh5l2x7l7whjlv30b0v5k885xz"; + version = "0.3.2.0"; + sha256 = "0w13274j1qn6qdx9kmd01qbcwhnpvqn4rvrnpv60gwqfi4hwgcqs"; libraryHaskellDepends = [ base monad-control mtl transformers transformers-base ]; @@ -76566,6 +76738,8 @@ self: { pname = "dhall"; version = "1.41.1"; sha256 = "09flx2mfl8mzszn0hx80fai3ryiwgjkbxyklfkpmm5hw1smkdslv"; + revision = "1"; + editedCabalFile = "19lgfkyg1p9crrf3gi508zya477vma2ks7ib7hw0r84sl4jjiaji"; isLibrary = true; isExecutable = true; enableSeparateDataOutput = true; @@ -81276,6 +81450,28 @@ self: { license = lib.licenses.bsd3; }) {}; + "doclayout_0_4" = callPackage + ({ mkDerivation, base, containers, criterion, deepseq, emojis, mtl + , safe, tasty, tasty-golden, tasty-hunit, tasty-quickcheck, text + }: + mkDerivation { + pname = "doclayout"; + version = "0.4"; + sha256 = "18xkzywfw0hl3hgbq9z36hs040vb0iz9yygx33cybxfi4i0dwbkx"; + enableSeparateDataOutput = true; + libraryHaskellDepends = [ base containers emojis mtl safe text ]; + testHaskellDepends = [ + base emojis mtl tasty tasty-golden tasty-hunit tasty-quickcheck + text + ]; + benchmarkHaskellDepends = [ + base criterion deepseq emojis mtl text + ]; + description = "A prettyprinting library for laying out text documents"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + }) {}; + "docopt" = callPackage ({ mkDerivation, aeson, ansi-terminal, base, bytestring, containers , HUnit, parsec, split, template-haskell, text @@ -88652,68 +88848,66 @@ self: { }) {}; "espial" = callPackage - ({ mkDerivation, aeson, attoparsec, base, bcrypt, bytestring - , case-insensitive, classy-prelude, classy-prelude-conduit - , classy-prelude-yesod, conduit, containers, data-default - , directory, ekg, ekg-core, entropy, esqueleto, fast-logger - , file-embed, foreign-store, hjsmin, hscolour, hspec, http-api-data - , http-client, http-client-tls, http-conduit, http-types - , iso8601-time, microlens, monad-logger, monad-metrics, mtl - , optparse-generic, parser-combinators, persistent + ({ mkDerivation, aeson, attoparsec, base, bcrypt, blaze-html + , bytestring, case-insensitive, classy-prelude + , classy-prelude-conduit, classy-prelude-yesod, conduit, connection + , containers, data-default, directory, entropy, esqueleto + , fast-logger, file-embed, foreign-store, hjsmin, hscolour, hspec + , html-entities, http-api-data, http-client, http-client-tls + , http-conduit, http-types, iso8601-time, microlens, monad-logger + , mtl, optparse-generic, parser-combinators, persistent , persistent-sqlite, persistent-template, pretty-show, safe , shakespeare, template-haskell, text, time, transformers - , unordered-containers, vector, wai, wai-extra, wai-logger - , wai-middleware-metrics, warp, yaml, yesod, yesod-auth, yesod-core - , yesod-form, yesod-static, yesod-test + , unordered-containers, vector, wai, wai-extra, wai-logger, warp + , yaml, yesod, yesod-auth, yesod-core, yesod-form, yesod-newsfeed + , yesod-static, yesod-test }: mkDerivation { pname = "espial"; - version = "0.0.7"; - sha256 = "06nlmz8j6f64dgbd9y9b7i9fd1bv32yxijx764zlvy75i6vbips5"; + version = "0.0.9"; + sha256 = "128vwdmilvvxwaylslway3d6mx4ad9pcx5y2x74x38hi9mpmrylc"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ - aeson attoparsec base bcrypt bytestring case-insensitive + aeson attoparsec base bcrypt blaze-html bytestring case-insensitive classy-prelude classy-prelude-conduit classy-prelude-yesod conduit - containers data-default directory ekg ekg-core entropy esqueleto - fast-logger file-embed foreign-store hjsmin hscolour http-api-data - http-client http-client-tls http-conduit http-types iso8601-time - microlens monad-logger monad-metrics mtl parser-combinators + connection containers data-default directory entropy esqueleto + fast-logger file-embed foreign-store hjsmin hscolour html-entities + http-api-data http-client http-client-tls http-conduit http-types + iso8601-time microlens monad-logger mtl parser-combinators persistent persistent-sqlite persistent-template pretty-show safe shakespeare template-haskell text time transformers - unordered-containers vector wai wai-extra wai-logger - wai-middleware-metrics warp yaml yesod yesod-auth yesod-core - yesod-form yesod-static + unordered-containers vector wai wai-extra wai-logger warp yaml + yesod yesod-auth yesod-core yesod-form yesod-newsfeed yesod-static ]; executableHaskellDepends = [ - aeson attoparsec base bcrypt bytestring case-insensitive + aeson attoparsec base bcrypt blaze-html bytestring case-insensitive classy-prelude classy-prelude-conduit classy-prelude-yesod conduit - containers data-default directory ekg ekg-core entropy esqueleto - fast-logger file-embed foreign-store hjsmin hscolour http-api-data - http-client http-client-tls http-conduit http-types iso8601-time - microlens monad-logger monad-metrics mtl optparse-generic + connection containers data-default directory entropy esqueleto + fast-logger file-embed foreign-store hjsmin hscolour html-entities + http-api-data http-client http-client-tls http-conduit http-types + iso8601-time microlens monad-logger mtl optparse-generic parser-combinators persistent persistent-sqlite persistent-template pretty-show safe shakespeare template-haskell text time transformers unordered-containers vector wai wai-extra wai-logger - wai-middleware-metrics warp yaml yesod yesod-auth yesod-core - yesod-form yesod-static + warp yaml yesod yesod-auth yesod-core yesod-form yesod-newsfeed + yesod-static ]; testHaskellDepends = [ - aeson attoparsec base bcrypt bytestring case-insensitive + aeson attoparsec base bcrypt blaze-html bytestring case-insensitive classy-prelude classy-prelude-conduit classy-prelude-yesod conduit - containers data-default directory ekg ekg-core entropy esqueleto + connection containers data-default directory entropy esqueleto fast-logger file-embed foreign-store hjsmin hscolour hspec - http-api-data http-client http-client-tls http-conduit http-types - iso8601-time microlens monad-logger monad-metrics mtl + html-entities http-api-data http-client http-client-tls + http-conduit http-types iso8601-time microlens monad-logger mtl parser-combinators persistent persistent-sqlite persistent-template pretty-show safe shakespeare template-haskell text time transformers unordered-containers vector wai wai-extra wai-logger - wai-middleware-metrics warp yaml yesod yesod-auth yesod-core - yesod-form yesod-static yesod-test + warp yaml yesod yesod-auth yesod-core yesod-form yesod-newsfeed + yesod-static yesod-test ]; description = "Espial is an open-source, web-based bookmarking server"; license = lib.licenses.agpl3Only; - hydraPlatforms = lib.platforms.none; }) {}; "esqueleto" = callPackage @@ -88746,7 +88940,7 @@ self: { license = lib.licenses.bsd3; }) {}; - "esqueleto_3_5_3_2" = callPackage + "esqueleto_3_5_4_0" = callPackage ({ mkDerivation, aeson, attoparsec, base, blaze-html, bytestring , conduit, containers, exceptions, hspec, hspec-core, monad-logger , mtl, mysql, mysql-simple, persistent, persistent-mysql @@ -88756,8 +88950,8 @@ self: { }: mkDerivation { pname = "esqueleto"; - version = "3.5.3.2"; - sha256 = "0sdp8zxa8jqql1dmhm0wf20hj5yd3853ha7f8wg24dvbjff8z1yj"; + version = "3.5.4.0"; + sha256 = "1c38kx04nkk68bj76mkbjbmw9fhb3ljn3j8mwsls6q7m4z49m6yy"; libraryHaskellDepends = [ aeson attoparsec base blaze-html bytestring conduit containers monad-logger persistent resourcet tagged text time transformers @@ -92239,6 +92433,34 @@ self: { broken = true; }) {}; + "faktory_1_1_2_2" = callPackage + ({ mkDerivation, aeson, aeson-casing, aeson-qq, async, base + , bytestring, connection, cryptonite, errors, hspec, markdown-unlit + , megaparsec, memory, mtl, network, random, safe-exceptions + , scanner, semigroups, text, time, unix, unordered-containers + }: + mkDerivation { + pname = "faktory"; + version = "1.1.2.2"; + sha256 = "0vkjd20wpzb170lisk1sb4508h56mgjbk4f5qbi6k8vvbdipiaqy"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + aeson aeson-casing base bytestring connection cryptonite errors + megaparsec memory mtl network random safe-exceptions scanner + semigroups text time unix unordered-containers + ]; + executableHaskellDepends = [ aeson base safe-exceptions ]; + testHaskellDepends = [ + aeson aeson-qq async base hspec markdown-unlit mtl time + ]; + testToolDepends = [ markdown-unlit ]; + description = "Faktory Worker for Haskell"; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + broken = true; + }) {}; + "fallible" = callPackage ({ mkDerivation, base, transformers }: mkDerivation { @@ -92524,6 +92746,8 @@ self: { ]; description = "Fast incremental vi and emacs tags"; license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + broken = true; }) {}; "fast-tagsoup" = callPackage @@ -93640,6 +93864,31 @@ self: { hydraPlatforms = lib.platforms.none; }) {}; + "feedback" = callPackage + ({ mkDerivation, autodocodec, autodocodec-yaml, base, conduit + , containers, envparse, fsnotify, optparse-applicative, path + , path-io, pretty-show, safe-coloured-text + , safe-coloured-text-layout, safe-coloured-text-terminfo, text + , time, typed-process, unliftio, yaml + }: + mkDerivation { + pname = "feedback"; + version = "0.0.0.0"; + sha256 = "1y4p38cd0cqg4r43y2p0n2i99q83vnhm7gswx0j34p58isrbad4x"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + autodocodec autodocodec-yaml base conduit containers envparse + fsnotify optparse-applicative path path-io pretty-show + safe-coloured-text safe-coloured-text-layout + safe-coloured-text-terminfo text time typed-process unliftio yaml + ]; + executableHaskellDepends = [ base ]; + description = "Declarative feedback loop manager"; + license = lib.licenses.gpl3Only; + hydraPlatforms = lib.platforms.none; + }) {}; + "fei-base" = callPackage ({ mkDerivation, attoparsec, base, c2hs, constraints, deepseq , haskell-src-exts, hslogger, lens, mxnet, optparse-applicative @@ -98833,13 +99082,13 @@ self: { , persistent-postgresql, postgresql-simple, primitive, process , resource-pool, retry, rio, safe, semigroupoids, template-haskell , temporary, text, time, transformers, transformers-base, unliftio - , unliftio-core, unordered-containers, vector, wai, wai-extra, yaml - , yesod, yesod-core + , unordered-containers, vector, wai, wai-extra, yaml, yesod + , yesod-core }: mkDerivation { pname = "freckle-app"; - version = "1.0.2.9"; - sha256 = "000frzvydpmyn547za0zlf7w38avcgspvjpcakalsdv5vzj83kk5"; + version = "1.0.2.10"; + sha256 = "05y2b4lfc0wxygjrvjlw3nfl9s1x9km095k2vzj57mb58zkr3kyv"; libraryHaskellDepends = [ aeson ansi-terminal base bytestring case-insensitive conduit containers data-default datadog doctest ekg-core errors exceptions @@ -98850,8 +99099,7 @@ self: { network-uri persistent persistent-postgresql postgresql-simple primitive process resource-pool retry rio safe semigroupoids template-haskell text time transformers transformers-base unliftio - unliftio-core unordered-containers vector wai wai-extra yaml yesod - yesod-core + unordered-containers vector wai wai-extra yaml yesod yesod-core ]; testHaskellDepends = [ aeson base bytestring directory hspec http-types lens lens-aeson @@ -106535,12 +106783,12 @@ self: { license = lib.licenses.mit; }) {}; - "ghcjs-base_0_2_0_3" = callPackage + "ghcjs-base_0_2_1_0" = callPackage ({ mkDerivation }: mkDerivation { pname = "ghcjs-base"; - version = "0.2.0.3"; - sha256 = "09sv5p57l8jczbycasbb06h4qsifi5fagxwsr665yil1gickfxyg"; + version = "0.2.1.0"; + sha256 = "05dw3kvrwgipxjg1i3gfirqz260azcmgj1rwp7m37a94q4550bcq"; description = "base library for GHCJS"; license = lib.licenses.mit; hydraPlatforms = lib.platforms.none; @@ -115214,6 +115462,31 @@ self: { license = lib.licenses.mit; }) {}; + "graphula_2_0_1_1" = callPackage + ({ mkDerivation, base, containers, directory, generic-arbitrary + , generics-eot, hspec, HUnit, markdown-unlit, monad-logger, mtl + , persistent, persistent-sqlite, QuickCheck, random, resourcet + , semigroups, temporary, text, transformers, unliftio + , unliftio-core + }: + mkDerivation { + pname = "graphula"; + version = "2.0.1.1"; + sha256 = "0gn33jz9nb2pf1mkjzwnf04l0shnvj520qb0jmz6d87w79jiqdlj"; + libraryHaskellDepends = [ + base containers directory generics-eot HUnit mtl persistent + QuickCheck random semigroups temporary text unliftio unliftio-core + ]; + testHaskellDepends = [ + base generic-arbitrary hspec markdown-unlit monad-logger persistent + persistent-sqlite QuickCheck resourcet transformers unliftio-core + ]; + testToolDepends = [ markdown-unlit ]; + description = "A simple interface for generating persistent data and linking its dependencies"; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + }) {}; + "graphula-core" = callPackage ({ mkDerivation, aeson, base, bytestring, containers, directory , generics-eot, hspec, http-api-data, HUnit, markdown-unlit @@ -115332,6 +115605,23 @@ self: { license = lib.licenses.mit; }) {}; + "gravatar_0_8_1" = callPackage + ({ mkDerivation, base, bytestring, data-default, doctest, Glob + , hspec, HTTP, pureMD5, text + }: + mkDerivation { + pname = "gravatar"; + version = "0.8.1"; + sha256 = "0ijcv15kihy6125fm2kyxi997fxii3hvr62lx25nri5aa0qy6vkw"; + libraryHaskellDepends = [ + base bytestring data-default HTTP pureMD5 text + ]; + testHaskellDepends = [ base doctest Glob hspec ]; + description = "Generate Gravatar image URLs"; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + }) {}; + "gray-code" = callPackage ({ mkDerivation, base, QuickCheck }: mkDerivation { @@ -118872,8 +119162,8 @@ self: { }: mkDerivation { pname = "hadolint"; - version = "2.9.3"; - sha256 = "0kiy570s08qf9gqphbbv5kzhfkbc3m1jpzpszpb52rbmflmgwi7m"; + version = "2.10.0"; + sha256 = "19szxwz633n8zk0zm9hzw029npy9my84kdygxv9jbmy69ndyw9d6"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -138819,8 +139109,8 @@ self: { pname = "hpc-lcov"; version = "1.0.1"; sha256 = "01ws5y2vavgm7151dcabw3jwny1prrnzn5b04q76m5gc6a36wivl"; - revision = "2"; - editedCabalFile = "1sbd4wk977hh7jvy2ingmavkqx7fzicfa70figipa7lzdq3lg0ls"; + revision = "3"; + editedCabalFile = "1nq636asnibbx6mrx18kr02pcg3jr2m28z40vk9iydmz6lr5msni"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ base containers hpc ]; @@ -139370,8 +139660,8 @@ self: { }: mkDerivation { pname = "hquantlib"; - version = "0.0.5.0"; - sha256 = "1zi31y89kdbid3xjvpsd2iqwvn8a7d2i5518maigkmhp5v1lg0w6"; + version = "0.0.5.1"; + sha256 = "0fbmji48ry3adq9lfpxwfx2q064cbrav8wq2ykaqsszgq9yiysc8"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -139395,8 +139685,8 @@ self: { ({ mkDerivation, base, time }: mkDerivation { pname = "hquantlib-time"; - version = "0.0.4.1"; - sha256 = "0g2j7m14ic40lhcnbvfjya3qh7ngx658qlmrr0dzr5r1ywcyv75c"; + version = "0.0.5.1"; + sha256 = "1jvcpcnss3hgnjp6isbpbmjml068gasrlj376sbv7diynh8a4rlf"; libraryHaskellDepends = [ base time ]; description = "HQuantLib Time is a business calendar functions extracted from HQuantLib"; license = "LGPL"; @@ -143449,14 +143739,14 @@ self: { license = lib.licenses.mit; }) {}; - "hspec_2_9_4" = callPackage + "hspec_2_9_5" = callPackage ({ mkDerivation, base, hspec-core, hspec-discover , hspec-expectations, QuickCheck }: mkDerivation { pname = "hspec"; - version = "2.9.4"; - sha256 = "1s009dn0hkqfn5c0y0xfja18wps430f2dkga9mfrrndhvlvx8fm3"; + version = "2.9.5"; + sha256 = "170fsms5gmp3yxcw3if35mpv6sq9mi6k259szspbh3qdp3d1z6mc"; libraryHaskellDepends = [ base hspec-core hspec-discover hspec-expectations QuickCheck ]; @@ -143548,7 +143838,7 @@ self: { license = lib.licenses.mit; }) {}; - "hspec-core_2_9_4" = callPackage + "hspec-core_2_9_5" = callPackage ({ mkDerivation, ansi-terminal, array, base, base-orphans , call-stack, clock, deepseq, directory, filepath, ghc, ghc-boot-th , hspec-expectations, hspec-meta, HUnit, process, QuickCheck @@ -143557,8 +143847,8 @@ self: { }: mkDerivation { pname = "hspec-core"; - version = "2.9.4"; - sha256 = "0bkr2hywmlawyyrp27xgfd4a080bk1i5kj81hcxbg2w8y0i7r0w4"; + version = "2.9.5"; + sha256 = "0xyn90l7rar1av65bld7fs499mn1vpyga4vpz2ygi7lvc59lm0ay"; libraryHaskellDepends = [ ansi-terminal array base call-stack clock deepseq directory filepath ghc ghc-boot-th hspec-expectations HUnit QuickCheck @@ -143616,14 +143906,14 @@ self: { maintainers = with lib.maintainers; [ maralorn ]; }) {}; - "hspec-discover_2_9_4" = callPackage + "hspec-discover_2_9_5" = callPackage ({ mkDerivation, base, directory, filepath, hspec-meta, mockery , QuickCheck }: mkDerivation { pname = "hspec-discover"; - version = "2.9.4"; - sha256 = "16y3z6f32bbnkxw142y90hs0512rh2mp9904ffahmag9m95qfbnv"; + version = "2.9.5"; + sha256 = "0sd2bkwdgnzkb4gjaqk9q21s0qnp0q3n19yf4phb4qvl878rvnpk"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ base directory filepath ]; @@ -143666,6 +143956,24 @@ self: { license = lib.licenses.mit; }) {}; + "hspec-expectations-json_1_0_0_6" = callPackage + ({ mkDerivation, aeson, aeson-pretty, aeson-qq, base, Diff, hspec + , HUnit, scientific, text, unordered-containers, vector + }: + mkDerivation { + pname = "hspec-expectations-json"; + version = "1.0.0.6"; + sha256 = "1gb4i4vc6f59vp120asl6fr20n6d9xnibvnfxjd94knflidhq80n"; + libraryHaskellDepends = [ + aeson aeson-pretty base Diff HUnit scientific text + unordered-containers vector + ]; + testHaskellDepends = [ aeson-qq base hspec ]; + description = "Hspec expectations for JSON Values"; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + }) {}; + "hspec-expectations-lens" = callPackage ({ mkDerivation, base, hspec, hspec-expectations, HUnit, lens , silently @@ -143866,22 +144174,22 @@ self: { broken = true; }) {}; - "hspec-junit-formatter_1_1_0_1" = callPackage + "hspec-junit-formatter_1_1_0_2" = callPackage ({ mkDerivation, base, conduit, containers, directory, exceptions , filepath, hspec, hspec-core, iso8601-time, markdown-unlit , temporary, text, time, xml-conduit, xml-types }: mkDerivation { pname = "hspec-junit-formatter"; - version = "1.1.0.1"; - sha256 = "194r8bxfn525mn8vq4dcfkbsn668s11yz4mdqbfr5qy29i1bzm5p"; + version = "1.1.0.2"; + sha256 = "1gzgfisji7w4gsixlchlrg5ylkmdqq2mk5sc0jdwqxz865kjq01g"; libraryHaskellDepends = [ base conduit containers directory exceptions filepath hspec-core iso8601-time text time xml-conduit xml-types ]; testHaskellDepends = [ - base containers filepath hspec hspec-core markdown-unlit temporary - text xml-conduit + base containers filepath hspec markdown-unlit temporary text + xml-conduit ]; testToolDepends = [ markdown-unlit ]; description = "A JUnit XML runner/formatter for hspec"; @@ -148055,14 +148363,17 @@ self: { }) {}; "hw-aeson" = callPackage - ({ mkDerivation, aeson, base, doctest, doctest-discover, hedgehog - , hspec, hspec-discover, text + ({ mkDerivation, aeson, base, containers, doctest, doctest-discover + , hedgehog, hspec, hspec-discover, text, text-short + , unordered-containers }: mkDerivation { pname = "hw-aeson"; - version = "0.1.2.0"; - sha256 = "0a4x97laraxyyrpkklj4qxwgh7lmxxnzdg7y0ki9041ck8ymsmdr"; - libraryHaskellDepends = [ aeson base text ]; + version = "0.1.5.0"; + sha256 = "0dzwn1k467dij8ihqzxq6vhm5faqqjndvyw0ikwjhwh0lf1h38cz"; + libraryHaskellDepends = [ + aeson base containers text text-short unordered-containers + ]; testHaskellDepends = [ aeson base doctest doctest-discover hedgehog hspec ]; @@ -153701,6 +154012,7 @@ self: { ]; description = "Write Haskell source files including C code inline. No FFI required."; license = lib.licenses.mit; + maintainers = with lib.maintainers; [ roberth ]; }) {}; "inline-c-cpp" = callPackage @@ -153721,6 +154033,7 @@ self: { ]; description = "Lets you embed C++ code into Haskell"; license = lib.licenses.mit; + maintainers = with lib.maintainers; [ roberth ]; }) {}; "inline-c-win32" = callPackage @@ -157370,13 +157683,13 @@ self: { ({ mkDerivation, alex, array, base, bytestring, containers , criterion, deepseq, directory, filepath, happy, microlens , microlens-mtl, mtl, optparse-applicative, prettyprinter - , recursion, regex-rure, split, tasty, tasty-hunit, text + , recursion, regex-rure, silently, split, tasty, tasty-hunit, text , transformers, vector }: mkDerivation { pname = "jacinda"; - version = "0.3.1.0"; - sha256 = "1nn3c91fhq46ng2yh9425cpxlk5mksalx5wrv1d7z0xn5m1v1387"; + version = "1.0.0.0"; + sha256 = "1yskpr3mvfhzxcjf0f9sf3mhsg892vqkx5kd4vz4w6wk3vv1iz3i"; isLibrary = false; isExecutable = true; enableSeparateDataOutput = true; @@ -157390,7 +157703,9 @@ self: { base bytestring optparse-applicative ]; testHaskellDepends = [ base bytestring tasty tasty-hunit ]; - benchmarkHaskellDepends = [ base criterion deepseq ]; + benchmarkHaskellDepends = [ + base bytestring criterion deepseq silently + ]; doHaddock = false; description = "Functional, expression-oriented data processing language"; license = lib.licenses.agpl3Only; @@ -158642,8 +158957,8 @@ self: { }: mkDerivation { pname = "jsaddle"; - version = "0.9.8.1"; - sha256 = "19jszi6b2fhgz8cb0a4p6ixjg78c28cr78abwjcffbx173jp981h"; + version = "0.9.8.2"; + sha256 = "17xffxyl4h8fbb608gzhflli89qxhrzf38bp9l8n2w2bwix7w01i"; libraryHaskellDepends = [ aeson attoparsec base base-compat base64-bytestring bytestring containers deepseq exceptions filepath ghc-prim http-types lens @@ -158660,8 +158975,8 @@ self: { }: mkDerivation { pname = "jsaddle-clib"; - version = "0.9.8.0"; - sha256 = "0axgfkxgvm4awvklss2pqa8a4112m3q7k38h71anxs6i199lgkyq"; + version = "0.9.8.2"; + sha256 = "0nbsjmn52dr0rfslz6c7f16z7brc76ljq78bkkbq3aj8ljadh0p6"; libraryHaskellDepends = [ aeson base base-compat bytestring data-default jsaddle text ]; @@ -158716,8 +159031,8 @@ self: { }: mkDerivation { pname = "jsaddle-warp"; - version = "0.9.8.0"; - sha256 = "06bf071xnfx7mjzf7jdyjspjw28s2z3br5gmx9vcs7paji20c8np"; + version = "0.9.8.2"; + sha256 = "12914i4l7hkwvwvzf25vr7zywc6xp9cq0mfzr57kzw6ga1y3gvxb"; libraryHaskellDepends = [ aeson base bytestring containers foreign-store http-types jsaddle stm text time transformers wai wai-websockets warp websockets @@ -158743,8 +159058,8 @@ self: { }: mkDerivation { pname = "jsaddle-webkit2gtk"; - version = "0.9.8.1"; - sha256 = "1q4hyjlvw3m2139s1rp658hkqhnayk00nijdymjr8606d7cfyp7p"; + version = "0.9.8.2"; + sha256 = "0cqn013dzn5wwap74i5j9kd6maxsqxb84zys6p80kjl5vnk5pvxh"; libraryHaskellDepends = [ aeson base bytestring directory gi-gio gi-glib gi-gtk gi-javascriptcore gi-webkit2 haskell-gi-base haskell-gi-overloading @@ -158780,8 +159095,8 @@ self: { ({ mkDerivation }: mkDerivation { pname = "jsaddle-wkwebview"; - version = "0.9.8.0"; - sha256 = "1cjncl2jqnx4j83pmcnnvcc0rswhwwb5grwh636b11yyp4vv58dw"; + version = "0.9.8.2"; + sha256 = "07qba7bnygnsy3yg4mk8bn8wfzca43cd7mzzjp5b4yracchvljqj"; description = "Interface for JavaScript that works with GHCJS and GHC"; license = lib.licenses.mit; hydraPlatforms = lib.platforms.none; @@ -184127,15 +184442,15 @@ self: { }) {}; "monad-control-identity" = callPackage - ({ mkDerivation, base, monad-control, transformers + ({ mkDerivation, base, monad-control, stm, transformers , transformers-base }: mkDerivation { pname = "monad-control-identity"; - version = "0.1.0.3"; - sha256 = "0nxsyhyvp04xr7js2z8mvmh2w2b2fwv5zzkbgjagm6l51pqpam6q"; + version = "0.2.0.0"; + sha256 = "1b636vakpqprwfb0cb7fpcsff8adq4frj4g98vv1yaxzi56rjbb1"; libraryHaskellDepends = [ - base monad-control transformers transformers-base + base monad-control stm transformers transformers-base ]; description = "Stronger classes than monad-control"; license = lib.licenses.bsd3; @@ -186489,8 +186804,8 @@ self: { }: mkDerivation { pname = "morpheus-graphql"; - version = "0.19.0"; - sha256 = "0yfqbpis3385hqm3xlyx0ks2jnrwvkx898g2m2rb3qskaqblfcj9"; + version = "0.19.3"; + sha256 = "0vg48x6sb5rg7mzx905qjv026yq4b76kxfyfpakiw3xybqpcdw0w"; enableSeparateDataOutput = true; libraryHaskellDepends = [ aeson base bytestring containers morpheus-graphql-app @@ -186518,8 +186833,8 @@ self: { }: mkDerivation { pname = "morpheus-graphql-app"; - version = "0.19.0"; - sha256 = "0k7bl9gs8sdmfi5wdka5rjlp5vjn7py8n8a09rwws7kgqa3lvd0n"; + version = "0.19.3"; + sha256 = "0v00xp6hhaxbjp6kl124cj22p57hnqdkg8kksms9cp2h7f88vm3g"; enableSeparateDataOutput = true; libraryHaskellDepends = [ aeson base bytestring containers hashable megaparsec @@ -186566,8 +186881,8 @@ self: { }: mkDerivation { pname = "morpheus-graphql-client"; - version = "0.19.0"; - sha256 = "00hgxi8c7alfpvhxwcb7gcxki14vaasmg1qycfnyj7s2715w6i4c"; + version = "0.19.3"; + sha256 = "1vfk1rlm2lkra5xfp9zh3f4q70xhb42v4zyfy1xk6x9k2k919pmg"; enableSeparateDataOutput = true; libraryHaskellDepends = [ aeson base bytestring morpheus-graphql-code-gen @@ -186591,8 +186906,8 @@ self: { }: mkDerivation { pname = "morpheus-graphql-code-gen"; - version = "0.19.0"; - sha256 = "0avy4imllxlfyfw3fvwb0nzwd03pwdr0s67k3a2gymhqqz3zf37i"; + version = "0.19.3"; + sha256 = "0l9g0pnp3vvlpc5kdhgnvwqgid4d25wgr1mnlqc44s350si623qa"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -186617,8 +186932,8 @@ self: { }: mkDerivation { pname = "morpheus-graphql-core"; - version = "0.19.0"; - sha256 = "03sr4yy0n5wr53xk1x623d1zj03v6zpsv7csafp5m40kijx0bl2q"; + version = "0.19.3"; + sha256 = "0frd7hvy94q4iknih4ph11kgklk5a70yryhmbfhjipv5141ysrns"; enableSeparateDataOutput = true; libraryHaskellDepends = [ aeson base bytestring containers hashable megaparsec mtl relude @@ -186645,8 +186960,8 @@ self: { }: mkDerivation { pname = "morpheus-graphql-subscriptions"; - version = "0.19.0"; - sha256 = "179cwrmyj42hzd70qymrg7y5ll6ld5miadhlr0w0mqbfqnbj0lbv"; + version = "0.19.3"; + sha256 = "16flpss0b3qvdcwazsfisw8f0dw5z5p4rrxm7bpr2j54dlz98c7n"; libraryHaskellDepends = [ aeson base bytestring morpheus-graphql-app morpheus-graphql-core mtl relude text transformers unliftio-core unordered-containers @@ -186678,14 +186993,14 @@ self: { license = lib.licenses.mit; }) {}; - "morpheus-graphql-tests_0_19_0" = callPackage + "morpheus-graphql-tests_0_19_3" = callPackage ({ mkDerivation, aeson, base, bytestring, directory, relude, tasty , tasty-hunit, text, unordered-containers }: mkDerivation { pname = "morpheus-graphql-tests"; - version = "0.19.0"; - sha256 = "1ymwgsdj4gl88rarqjgb0bx05gdanqxwghz8ws2hh5cvn9m9g4sb"; + version = "0.19.3"; + sha256 = "1w10l9l0774hjhq8h0bxlqmksd8g350ccdv5ja86j89lb4glnxla"; libraryHaskellDepends = [ aeson base bytestring directory relude tasty tasty-hunit text unordered-containers @@ -190750,8 +191065,8 @@ self: { pname = "named"; version = "0.3.0.1"; sha256 = "0dnp4qbhn6ci2dlp230gpq8c5z26wb2liani1myc598g2b3c2qij"; - revision = "2"; - editedCabalFile = "03g6y6viakybmxpv9jnlbhq5yvchwdp2f1cvcdvlm10c5wkl71a1"; + revision = "3"; + editedCabalFile = "1rfli2b4asgasvgp7zjvydhxbyd0vx44vr7yck2760wz1crkzhhn"; libraryHaskellDepends = [ base ]; testHaskellDepends = [ base ]; description = "Named parameters (keyword arguments) for Haskell"; @@ -192045,8 +192360,8 @@ self: { }: mkDerivation { pname = "net-mqtt-rpc"; - version = "0.2.0.0"; - sha256 = "1ql1hjvx41gspjbpr4rldrcn0xj483g2cphvxbb51m4x6n690lkn"; + version = "0.2.0.1"; + sha256 = "079029bfzp9srgxz8655kkiwvccc0164hg4dpmg7f22qis0dd8vp"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -195660,6 +195975,19 @@ self: { license = lib.licenses.mit; }) {}; + "nonempty-zipper_1_0_0_4" = callPackage + ({ mkDerivation, base, comonad, deepseq, doctest, Glob, safe }: + mkDerivation { + pname = "nonempty-zipper"; + version = "1.0.0.4"; + sha256 = "19r7lxjwiscg5ml7l2bx6sizb2rlbxmv81shqwnf8yjbnmpibmkp"; + libraryHaskellDepends = [ base comonad deepseq safe ]; + testHaskellDepends = [ base comonad deepseq doctest Glob safe ]; + description = "A non-empty comonadic list zipper"; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + }) {}; + "nonemptymap" = callPackage ({ mkDerivation, base, containers, semigroupoids }: mkDerivation { @@ -202971,7 +203299,7 @@ self: { license = lib.licenses.gpl2Plus; }) {}; - "pandoc-plot_1_5_0" = callPackage + "pandoc-plot_1_5_1" = callPackage ({ mkDerivation, aeson, base, bytestring, containers, criterion , data-default, directory, filepath, gitrev, hashable, hspec , hspec-expectations, lifted-async, lifted-base, mtl @@ -202981,8 +203309,8 @@ self: { }: mkDerivation { pname = "pandoc-plot"; - version = "1.5.0"; - sha256 = "1naq6kfzxghxn6gzkp0697sdmfjdr2hk790d2rrwx72zv66g35vy"; + version = "1.5.1"; + sha256 = "0n0kazc43j4q39r9fp3400clbnpm0nsghv07pv16lwdjbl67sv91"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -203103,6 +203431,30 @@ self: { license = lib.licenses.bsd3; }) {}; + "pandoc-types_1_22_2" = callPackage + ({ mkDerivation, aeson, base, bytestring, containers, criterion + , deepseq, ghc-prim, HUnit, QuickCheck, string-qq, syb + , test-framework, test-framework-hunit, test-framework-quickcheck2 + , text, transformers + }: + mkDerivation { + pname = "pandoc-types"; + version = "1.22.2"; + sha256 = "1m5lln26ixzswx6pb1n7iv99w8i9gii6lhg07whg56jl2gvfghk0"; + libraryHaskellDepends = [ + aeson base bytestring containers deepseq ghc-prim QuickCheck syb + text transformers + ]; + testHaskellDepends = [ + aeson base bytestring containers HUnit QuickCheck string-qq syb + test-framework test-framework-hunit test-framework-quickcheck2 text + ]; + benchmarkHaskellDepends = [ base criterion text ]; + description = "Types for representing a structured document"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + }) {}; + "pandoc-unlit" = callPackage ({ mkDerivation, base, pandoc }: mkDerivation { @@ -216355,6 +216707,8 @@ self: { benchmarkSystemDepends = [ leveldb snappy ]; description = "A high performance in memory and LevelDB backend for powerqueue"; license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + broken = true; }) {inherit (pkgs) leveldb; inherit (pkgs) snappy;}; "powerqueue-sqs" = callPackage @@ -220070,20 +220424,18 @@ self: { ({ mkDerivation, aeson, aeson-pretty, attoparsec, base , base64-bytestring, binary, bytestring, cereal, containers , contravariant, deepseq, doctest, filepath, foldl - , generic-arbitrary, hashable, haskell-src + , generic-arbitrary, hashable, haskell-src, hedgehog , insert-ordered-containers, lens, mtl, neat-interpolation , optparse-applicative, optparse-generic, parsec, parsers, pretty , pretty-show, proto3-wire, QuickCheck, quickcheck-instances , range-set-list, safe, swagger2, system-filepath, tasty - , tasty-hunit, tasty-quickcheck, text, time, transformers, turtle - , vector + , tasty-hedgehog, tasty-hunit, tasty-quickcheck, text, time + , transformers, turtle, vector }: mkDerivation { pname = "proto3-suite"; - version = "0.4.2"; - sha256 = "015cg6brf6v0h2h2d36hqqr9i69vr30bhc35av55v0d65ya0sczz"; - revision = "1"; - editedCabalFile = "1s9mr6y31kbm0f316i7q0w4qgmi0mas23dhbam6i9pshfa0bav0x"; + version = "0.5.0"; + sha256 = "09y09y321jflxlrx13b9fm4v3f3k4j475wpp0bilmc4ygq9bxjcm"; isLibrary = true; isExecutable = true; enableSeparateDataOutput = true; @@ -220101,11 +220453,11 @@ self: { ]; testHaskellDepends = [ aeson attoparsec base base64-bytestring bytestring cereal - containers deepseq doctest generic-arbitrary mtl pretty-show - proto3-wire QuickCheck swagger2 tasty tasty-hunit tasty-quickcheck - text transformers turtle vector + containers deepseq doctest generic-arbitrary hedgehog mtl + pretty-show proto3-wire QuickCheck swagger2 tasty tasty-hedgehog + tasty-hunit tasty-quickcheck text transformers turtle vector ]; - description = "A low level library for writing out data in the Protocol Buffers wire format"; + description = "A higher-level API to the proto3-wire library"; license = lib.licenses.asl20; hydraPlatforms = lib.platforms.none; }) {}; @@ -220432,8 +220784,8 @@ self: { }: mkDerivation { pname = "provenience"; - version = "0.1.2.2"; - sha256 = "1glilqib6bs1kbb0yyrzqxbsijrcrdm9q3cgmymgacc7kllc616n"; + version = "0.1.2.3"; + sha256 = "1pv1xdzxsdgahv1i7nxdm0di7hs36zr57rpkny666myracdh1wvh"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -221443,8 +221795,8 @@ self: { }: mkDerivation { pname = "purescript"; - version = "0.14.7"; - sha256 = "0a8ia3qk6x6c42kkp00bdsnrpsrypy6i0bpavm844b0ny8dalqlr"; + version = "0.14.9"; + sha256 = "13canh915v668ii58y880b6zgzga3qmxxiblljs9qsdpwx1q7yzd"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -253170,6 +253522,8 @@ self: { ]; description = "A small websocket backend provider"; license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + broken = true; }) {}; "socks" = callPackage @@ -260426,8 +260780,8 @@ self: { pname = "string-interpolate"; version = "0.3.1.1"; sha256 = "0hhzvrs9msyqsxwsqqm55lyxf85vhg4vcsszl735zsbs7431av69"; - revision = "2"; - editedCabalFile = "1blxy1ld69i8bg2340j0dcrcbdrqqnx5q8v47jda6183jfzwrxr6"; + revision = "3"; + editedCabalFile = "0kpk5mwmi7qzvx0hkiq6pwfyid99ic95zmxc36xxfpw4qxfc7024"; libraryHaskellDepends = [ base bytestring haskell-src-exts haskell-src-meta split template-haskell text text-conversions utf8-string @@ -261325,8 +261679,8 @@ self: { }: mkDerivation { pname = "stylish-haskell"; - version = "0.14.0.1"; - sha256 = "109d7xf0k86c6hgdc0lgn9fvlqg4gag9nrj52z9ajw7s4qi3y3f1"; + version = "0.14.1.0"; + sha256 = "1chgkxqbnrgq7w9zzx118igp08h9vfgp150akazmgimy378cadlk"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -263329,14 +263683,14 @@ self: { }: mkDerivation { pname = "sydtest-servant"; - version = "0.2.0.0"; - sha256 = "063bjik3yx7wbawdw1x4yw8ba8k83bq2xysczkl3mxqhj4c0ngx9"; + version = "0.2.0.1"; + sha256 = "1yclwmcqp6wkcd980ha7a93dz99zc55mcw2z5fwhk3gfwdpdfyfj"; libraryHaskellDepends = [ base http-client servant servant-client servant-server sydtest sydtest-wai ]; testHaskellDepends = [ - base servant servant-client servant-server stm sydtest + base servant servant-client servant-server stm sydtest sydtest-wai ]; testToolDepends = [ sydtest-discover ]; description = "A servant companion library for sydtest"; @@ -267811,6 +268165,32 @@ self: { license = lib.licenses.bsd3; }) {}; + "telegram-bot-simple_0_4_5" = callPackage + ({ mkDerivation, aeson, aeson-pretty, base, bytestring, cron + , filepath, hashable, http-api-data, http-client, http-client-tls + , monad-control, mtl, pretty-show, profunctors, servant + , servant-client, servant-multipart-api, servant-multipart-client + , split, stm, template-haskell, text, time, transformers + , unordered-containers + }: + mkDerivation { + pname = "telegram-bot-simple"; + version = "0.4.5"; + sha256 = "0c2j0dmx6j15c8csmv64zc3m7qnbvnf5aqan7qjc8d5yfzbxr4nr"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + aeson aeson-pretty base bytestring cron filepath hashable + http-api-data http-client http-client-tls monad-control mtl + pretty-show profunctors servant servant-client + servant-multipart-api servant-multipart-client split stm + template-haskell text time transformers unordered-containers + ]; + description = "Easy to use library for building Telegram bots"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + }) {}; + "telegram-raw-api" = callPackage ({ mkDerivation, aeson, base, bytestring, deriving-aeson , generic-lens, hashable, http-client, http-client-tls, http-media @@ -268751,12 +269131,8 @@ self: { ({ mkDerivation, base, reactive-banana, termbox }: mkDerivation { pname = "termbox-banana"; - version = "0.3.0"; - sha256 = "07nn1jff33zb80vhzkw48fik5d5w7j7q982ihpsbb6gbqp5azx5s"; - revision = "1"; - editedCabalFile = "0k62lbwigk97shxlx5c34d2k81ndims9nc36rlcv34s0iig0lh7d"; - isLibrary = true; - isExecutable = true; + version = "0.3.1"; + sha256 = "0vni6wpdmqmbm7ypckr17qbjwilwilj3bibbmn6lv096n1wn751h"; libraryHaskellDepends = [ base reactive-banana termbox ]; description = "reactive-banana + termbox"; license = lib.licenses.bsd3; @@ -269834,6 +270210,29 @@ self: { license = lib.licenses.gpl2Only; }) {}; + "texmath_0_12_5" = callPackage + ({ mkDerivation, base, bytestring, containers, directory, filepath + , mtl, pandoc-types, parsec, pretty-show, split, syb, tagged, tasty + , tasty-golden, text, xml + }: + mkDerivation { + pname = "texmath"; + version = "0.12.5"; + sha256 = "16i40va03v04222wn92fz62jri3094mfim6kdqk29335gamn0yk9"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + base containers mtl pandoc-types parsec split syb text xml + ]; + testHaskellDepends = [ + base bytestring directory filepath pretty-show tagged tasty + tasty-golden text xml + ]; + description = "Conversion between math formats"; + license = lib.licenses.gpl2Only; + hydraPlatforms = lib.platforms.none; + }) {}; + "texrunner" = callPackage ({ mkDerivation, attoparsec, base, bytestring, directory, filepath , HUnit, io-streams, lens, mtl, process, semigroups, temporary @@ -271753,15 +272152,13 @@ self: { }) {}; "theatre" = callPackage - ({ mkDerivation, base, contravariant, semigroups, slave-thread - , unagi-chan - }: + ({ mkDerivation, base, contravariant, slave-thread, unagi-chan }: mkDerivation { pname = "theatre"; - version = "1.0.0.1"; - sha256 = "0vcli8i0vrxv8fzjdyp684fvp7640xmwc3yawz12mfvxcpgrs2xq"; + version = "1.0.0.2"; + sha256 = "1iwl4wswhav9d5vnfgwx9w9sms785jwxxc0vx7p5x2kb9hf3d8ac"; libraryHaskellDepends = [ - base contravariant semigroups slave-thread unagi-chan + base contravariant slave-thread unagi-chan ]; description = "Minimalistic actor library"; license = lib.licenses.mit; @@ -277583,6 +277980,8 @@ self: { ]; description = "A very simple triple store"; license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + broken = true; }) {}; "triplesec" = callPackage @@ -300938,6 +301337,30 @@ self: { license = lib.licenses.bsd3; }) {}; + "yesod-paginator_1_1_2_1" = callPackage + ({ mkDerivation, base, blaze-markup, doctest, hspec, path-pieces + , persistent, QuickCheck, quickcheck-classes, safe, text + , transformers, uri-encode, yesod-core, yesod-test + }: + mkDerivation { + pname = "yesod-paginator"; + version = "1.1.2.1"; + sha256 = "0d27jh5qizi9ppf7lvvpmmlih80hhgl5znjbknl12r95pkcjjy2r"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + base blaze-markup path-pieces persistent safe text transformers + uri-encode yesod-core + ]; + testHaskellDepends = [ + base doctest hspec QuickCheck quickcheck-classes yesod-core + yesod-test + ]; + description = "A pagination approach for yesod"; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + }) {}; + "yesod-paypal-rest" = callPackage ({ mkDerivation, base, paypal-rest-client, time, yesod-core }: mkDerivation { @@ -301267,6 +301690,29 @@ self: { license = lib.licenses.mit; }) {}; + "yesod-routes-flow_3_0_0_2" = callPackage + ({ mkDerivation, attoparsec, base, classy-prelude, containers + , hspec, hspec-expectations, semigroups, shakespeare, system-fileio + , system-filepath, text, yesod-core + }: + mkDerivation { + pname = "yesod-routes-flow"; + version = "3.0.0.2"; + sha256 = "1gw6a5089j0a1c0aivlznsqld1r8wc6babjcc7c7vzy7wpnc87c9"; + libraryHaskellDepends = [ + attoparsec base classy-prelude containers system-fileio + system-filepath text yesod-core + ]; + testHaskellDepends = [ + attoparsec base classy-prelude containers hspec hspec-expectations + semigroups shakespeare system-fileio system-filepath text + yesod-core + ]; + description = "Generate Flow routes for Yesod"; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + }) {}; + "yesod-routes-typescript" = callPackage ({ mkDerivation, attoparsec, base, classy-prelude, system-fileio , text, yesod-core, yesod-routes @@ -304166,12 +304612,12 @@ self: { }: mkDerivation { pname = "zuul"; - version = "0.1.0.0"; - sha256 = "1agacvixl6s3np8jizmy9vbpzhbb0am9hs8qlc5sqvbg98qr8x1v"; + version = "0.1.1.0"; + sha256 = "0pwiy690z32c9b5x2x1pmcczby7xwby6z8jsgl25zkrb07yagxz4"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ - aeson base http-client http-client-tls text + aeson base containers http-client http-client-tls text ]; executableHaskellDepends = [ aeson aeson-pretty base containers directory filepath diff --git a/pkgs/development/haskell-modules/non-hackage-packages.nix b/pkgs/development/haskell-modules/non-hackage-packages.nix index e06f9d30d2daa..beb81a58d8638 100644 --- a/pkgs/development/haskell-modules/non-hackage-packages.nix +++ b/pkgs/development/haskell-modules/non-hackage-packages.nix @@ -30,6 +30,7 @@ self: super: { pg-client = self.callPackage ../misc/haskell/hasura/pg-client.nix {}; graphql-parser = self.callPackage ../misc/haskell/hasura/graphql-parser.nix {}; graphql-engine = self.callPackage ../misc/haskell/hasura/graphql-engine.nix {}; + kriti-lang = self.callPackage ../misc/haskell/hasura/kriti-lang.nix {}; hasura-resource-pool = self.callPackage ../misc/haskell/hasura/pool.nix {}; hasura-ekg-core = self.callPackage ../misc/haskell/hasura/ekg-core.nix {}; hasura-ekg-json = self.callPackage ../misc/haskell/hasura/ekg-json.nix {}; diff --git a/pkgs/development/haskell-modules/patches/graphql-engine-mapkeys.patch b/pkgs/development/haskell-modules/patches/graphql-engine-mapkeys.patch deleted file mode 100644 index 9035185dc2d58..0000000000000 --- a/pkgs/development/haskell-modules/patches/graphql-engine-mapkeys.patch +++ /dev/null @@ -1,33 +0,0 @@ -diff --git a/server/src-lib/Data/HashMap/Strict/Extended.hs b/server/src-lib/Data/HashMap/Strict/Extended.hs -index eaff0dfba..9902cadd0 100644 ---- a/src-lib/Data/HashMap/Strict/Extended.hs -+++ b/src-lib/Data/HashMap/Strict/Extended.hs -@@ -7,7 +7,6 @@ module Data.HashMap.Strict.Extended - , groupOnNE - , differenceOn - , lpadZip -- , mapKeys - , unionsWith - ) where - -@@ -54,20 +53,6 @@ lpadZip left = catMaybes . flip A.alignWith left \case - That b -> Just (Nothing, b) - These a b -> Just (Just a, b) - ---- | @'mapKeys' f s@ is the map obtained by applying @f@ to each key of @s@. ---- ---- The size of the result may be smaller if @f@ maps two or more distinct ---- keys to the same new key. In this case the value at the greatest of the ---- original keys is retained. ---- ---- > mapKeys (+ 1) (fromList [(5,"a"), (3,"b")]) == fromList [(4, "b"), (6, "a")] ---- > mapKeys (\ _ -> 1) (fromList [(1,"b"), (2,"a"), (3,"d"), (4,"c")]) == singleton 1 "c" ---- > mapKeys (\ _ -> 3) (fromList [(1,"b"), (2,"a"), (3,"d"), (4,"c")]) == singleton 3 "c" ---- ---- copied from https://hackage.haskell.org/package/containers-0.6.4.1/docs/src/Data.Map.Internal.html#mapKeys --mapKeys :: (Ord k2, Hashable k2) => (k1 -> k2) -> HashMap k1 a -> HashMap k2 a --mapKeys f = fromList . foldrWithKey (\k x xs -> (f k, x) : xs) [] -- - -- | The union of a list of maps, with a combining operation: - -- (@'unionsWith' f == 'Prelude.foldl' ('unionWith' f) 'empty'@). - -- diff --git a/pkgs/development/haskell-modules/with-packages-wrapper.nix b/pkgs/development/haskell-modules/with-packages-wrapper.nix index 7c7add61679d3..c478c875540d1 100644 --- a/pkgs/development/haskell-modules/with-packages-wrapper.nix +++ b/pkgs/development/haskell-modules/with-packages-wrapper.nix @@ -51,7 +51,7 @@ let ghcCommand = "${ghc.targetPrefix}${ghcCommand'}"; ghcCommandCaps= lib.toUpper ghcCommand'; libDir = if isHaLVM then "$out/lib/HaLVM-${ghc.version}" - else "$out/lib/${ghcCommand}-${ghc.version}"; + else "$out/lib/${ghc.targetPrefix}${ghc.haskellCompilerName}"; docDir = "$out/share/doc/ghc/html"; packageCfgDir = "${libDir}/package.conf.d"; paths = lib.filter (x: x ? isHaskellLibrary) (lib.closePropagation packages); @@ -121,7 +121,7 @@ symlinkJoin { '' + (lib.optionalString (stdenv.targetPlatform.isDarwin && !isGhcjs && !stdenv.targetPlatform.isiOS) '' # Work around a linker limit in macOS Sierra (see generic-builder.nix): - local packageConfDir="$out/lib/${ghc.name}/package.conf.d"; + local packageConfDir="${packageCfgDir}"; local dynamicLinksDir="$out/lib/links" mkdir -p $dynamicLinksDir # Clean up the old links that may have been (transitively) included by @@ -148,8 +148,8 @@ symlinkJoin { # to another nix derivation, so they are not writable. Removing # them allow the correct behavior of ghc-pkg recache # See: https://github.com/NixOS/nixpkgs/issues/79441 - rm $out/lib/${ghc.name}/package.conf.d/package.cache.lock - rm $out/lib/${ghc.name}/package.conf.d/package.cache + rm ${packageCfgDir}/package.cache.lock + rm ${packageCfgDir}/package.cache $out/bin/${ghcCommand}-pkg recache ''} diff --git a/pkgs/development/interpreters/clojure/default.nix b/pkgs/development/interpreters/clojure/default.nix index cd63e506a55f4..50b2a49fdc6ed 100644 --- a/pkgs/development/interpreters/clojure/default.nix +++ b/pkgs/development/interpreters/clojure/default.nix @@ -2,12 +2,12 @@ stdenv.mkDerivation rec { pname = "clojure"; - version = "1.11.0.1100"; + version = "1.11.1.1107"; src = fetchurl { # https://clojure.org/releases/tools url = "https://download.clojure.org/install/clojure-tools-${version}.tar.gz"; - sha256 = "sha256-9KEsO32118fvKE1Gls+9nAeRdlhTKfmJylsiSYCoKKU="; + sha256 = "sha256-ItSKM546QW4DpnGotGzYs6917cbHYYkPvL9XezQBzOY="; }; nativeBuildInputs = [ diff --git a/pkgs/development/libraries/flint/default.nix b/pkgs/development/libraries/flint/default.nix index 6873508eb7dcd..0c2a07149d206 100644 --- a/pkgs/development/libraries/flint/default.nix +++ b/pkgs/development/libraries/flint/default.nix @@ -42,6 +42,8 @@ stdenv.mkDerivation rec { "--with-blas=${openblas}" ]; + enableParallelBuilding = true; + doCheck = true; meta = with lib; { diff --git a/pkgs/development/libraries/libjxl/default.nix b/pkgs/development/libraries/libjxl/default.nix index 081ddaf4988a5..049d79c7025eb 100644 --- a/pkgs/development/libraries/libjxl/default.nix +++ b/pkgs/development/libraries/libjxl/default.nix @@ -111,7 +111,7 @@ stdenv.mkDerivation rec { LDFLAGS = lib.optionalString stdenv.hostPlatform.isRiscV "-latomic"; - doCheck = true; + doCheck = !stdenv.hostPlatform.isi686; # The test driver runs a test `LibraryCLinkageTest` which without # LD_LIBRARY_PATH setting errors with: diff --git a/pkgs/development/libraries/libuldaq/default.nix b/pkgs/development/libraries/libuldaq/default.nix index 2f8f7fbb30ea0..fb234ef60d14c 100644 --- a/pkgs/development/libraries/libuldaq/default.nix +++ b/pkgs/development/libraries/libuldaq/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "libuldaq"; - version = "1.2.0"; + version = "1.2.1"; src = fetchFromGitHub { owner = "mccdaq"; repo = "uldaq"; rev = "v${version}"; - sha256 = "0l9ima8ac99yd9vvjvdrmacm95ghv687wiy39zxm00cmghcfv3vj"; + sha256 = "sha256-DA1mxu94z5xDpGK9OBwD02HXlOATv/slqZ4lz5GM7QM="; }; patches = [ diff --git a/pkgs/development/libraries/opensubdiv/default.nix b/pkgs/development/libraries/opensubdiv/default.nix index 83eb77b603c52..026465c97ae8d 100644 --- a/pkgs/development/libraries/opensubdiv/default.nix +++ b/pkgs/development/libraries/opensubdiv/default.nix @@ -1,6 +1,10 @@ { config, lib, stdenv, fetchFromGitHub, cmake, pkg-config, xorg, libGLU , libGL, glew, ocl-icd, python3 , cudaSupport ? config.cudaSupport or false, cudatoolkit + # For visibility mostly. The whole approach to cuda architectures and capabilities + # will be reworked soon. +, cudaArch ? "compute_37" +, openclSupport ? !cudaSupport , darwin }: @@ -24,7 +28,7 @@ stdenv.mkDerivation rec { glew xorg.libX11 xorg.libXrandr xorg.libXxf86vm xorg.libXcursor xorg.libXinerama xorg.libXi ] - ++ lib.optional (!stdenv.isDarwin) ocl-icd + ++ lib.optional (openclSupport && !stdenv.isDarwin) ocl-icd ++ lib.optionals stdenv.isDarwin (with darwin.apple_sdk.frameworks; [OpenCL Cocoa CoreVideo IOKit AppKit AGL ]) ++ lib.optional cudaSupport cudatoolkit; @@ -37,8 +41,10 @@ stdenv.mkDerivation rec { "-DGLEW_INCLUDE_DIR=${glew.dev}/include" "-DGLEW_LIBRARY=${glew.dev}/lib" ] ++ lib.optionals cudaSupport [ - "-DOSD_CUDA_NVCC_FLAGS=--gpu-architecture=compute_30" + "-DOSD_CUDA_NVCC_FLAGS=--gpu-architecture=${cudaArch}" "-DCUDA_HOST_COMPILER=${cudatoolkit.cc}/bin/cc" + ] ++ lib.optionals (!openclSupport) [ + "-DNO_OPENCL=1" ]; postInstall = "rm $out/lib/*.a"; @@ -46,6 +52,7 @@ stdenv.mkDerivation rec { meta = { description = "An Open-Source subdivision surface library"; homepage = "http://graphics.pixar.com/opensubdiv"; + broken = openclSupport && cudaSupport; platforms = lib.platforms.unix; maintainers = [ lib.maintainers.eelco ]; license = lib.licenses.asl20; diff --git a/pkgs/development/libraries/simgear/default.nix b/pkgs/development/libraries/simgear/default.nix index c24c336c72896..2d6f6ef8d2921 100644 --- a/pkgs/development/libraries/simgear/default.nix +++ b/pkgs/development/libraries/simgear/default.nix @@ -4,7 +4,7 @@ , curl }: let - version = "2020.3.12"; + version = "2020.3.13"; shortVersion = builtins.substring 0 6 version; in stdenv.mkDerivation rec { @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { src = fetchurl { url = "mirror://sourceforge/flightgear/release-${shortVersion}/${pname}-${version}.tar.bz2"; - sha256 = "sha256-W7KZzFU5qZE6tOv9YSzH3yoNi8YET2yzmThMcl23140="; + sha256 = "sha256-3AmQb9qLGBD+LLIrX1Fx0gi6kBxbnTkLrW0fP9ZsUeg="; }; nativeBuildInputs = [ cmake ]; diff --git a/pkgs/development/misc/haskell/hasura/ekg-core.nix b/pkgs/development/misc/haskell/hasura/ekg-core.nix index 6a9b1157021e2..2d1b62bc16c78 100644 --- a/pkgs/development/misc/haskell/hasura/ekg-core.nix +++ b/pkgs/development/misc/haskell/hasura/ekg-core.nix @@ -1,17 +1,17 @@ # This has been automatically generated by the script # ./update.sh. This should not be changed by hand. { mkDerivation, async, atomic-primops, base, containers, criterion -, fetchgit, generic-random, ghc-prim, hashable, hspec -, hspec-smallcheck, HUnit, inspection-testing, lib, markdown-unlit -, primitive, QuickCheck, smallcheck, text, unordered-containers +, fetchgit, ghc-prim, hashable, hspec, hspec-smallcheck, HUnit +, inspection-testing, lib, markdown-unlit, primitive, QuickCheck +, smallcheck, text, unordered-containers }: mkDerivation { pname = "ekg-core"; version = "0.1.1.7"; src = fetchgit { url = "https://github.com/hasura/ekg-core.git"; - sha256 = "1s58kjg1kbhsyfyj0zwhnnws9hg9zwj9jylpwicg54yi78w962ys"; - rev = "9fc8f94685c149a909b66bad4167455d8ae1002c"; + sha256 = "1syb87iav3fgj6vqjh1izdvw4g0l4mngcyhvcg2nazisw3l685z6"; + rev = "b0cdc337ca2a52e392d427916ba3e28246b396c0"; fetchSubmodules = true; }; libraryHaskellDepends = [ @@ -19,10 +19,9 @@ mkDerivation { primitive text unordered-containers ]; testHaskellDepends = [ - async atomic-primops base containers generic-random ghc-prim - hashable hspec hspec-smallcheck HUnit inspection-testing - markdown-unlit primitive QuickCheck smallcheck text - unordered-containers + async atomic-primops base containers ghc-prim hashable hspec + hspec-smallcheck HUnit inspection-testing markdown-unlit primitive + QuickCheck smallcheck text unordered-containers ]; testToolDepends = [ markdown-unlit ]; benchmarkHaskellDepends = [ base criterion ]; diff --git a/pkgs/development/misc/haskell/hasura/ekg-json.nix b/pkgs/development/misc/haskell/hasura/ekg-json.nix index e115e2c40b9d2..bb71aef27970d 100644 --- a/pkgs/development/misc/haskell/hasura/ekg-json.nix +++ b/pkgs/development/misc/haskell/hasura/ekg-json.nix @@ -1,6 +1,6 @@ # This has been automatically generated by the script # ./update.sh. This should not be changed by hand. -{ mkDerivation, aeson, base, ekg-core, fetchgit, lib, text +{ mkDerivation, aeson, base, ekg-core, fetchgit, hspec, lib, text , unordered-containers, vector }: mkDerivation { @@ -8,13 +8,16 @@ mkDerivation { version = "0.1.0.7"; src = fetchgit { url = "https://github.com/hasura/ekg-json.git"; - sha256 = "1yf9x7gh66q27c3wv5m00ijf2qpiwm53jjlhrj2yc1glv684wf4v"; - rev = "f25b9ddb7aae18059ef707a5ce30d6a54a63db13"; + sha256 = "17kd2f1695dmf5l95iz1w86hapc4f1gfrd0ld3ivffa2q5vxbi70"; + rev = "d1c5031b49a5559cf4b4f6beb0238b872890a48c"; fetchSubmodules = true; }; libraryHaskellDepends = [ aeson base ekg-core text unordered-containers vector ]; + testHaskellDepends = [ + aeson base ekg-core hspec text unordered-containers + ]; homepage = "https://github.com/tibbe/ekg-json"; description = "JSON encoding of ekg metrics"; license = lib.licenses.bsd3; diff --git a/pkgs/development/misc/haskell/hasura/graphql-engine.nix b/pkgs/development/misc/haskell/hasura/graphql-engine.nix index d5d8e693ab41a..646c576713625 100644 --- a/pkgs/development/misc/haskell/hasura/graphql-engine.nix +++ b/pkgs/development/misc/haskell/hasura/graphql-engine.nix @@ -1,39 +1,44 @@ # This has been automatically generated by the script # ./update.sh. This should not be changed by hand. -{ mkDerivation, aeson, aeson-casing, ansi-wl-pprint, asn1-encoding -, asn1-types, async, attoparsec, attoparsec-iso8601, auto-update -, base, base16-bytestring, base64-bytestring, binary, byteorder -, bytestring, case-insensitive, ci-info, connection, containers -, cron, cryptonite, data-default-class, data-has, deepseq -, dependent-map, dependent-sum, directory, ekg-core, ekg-json -, exceptions, fast-logger, fetchgit, file-embed, filepath -, ghc-heap-view, graphql-parser, hashable, hashable-time, hspec -, hspec-core, hspec-expectations, hspec-expectations-lifted -, http-api-data, http-client, http-client-tls, http-conduit +{ mkDerivation, aeson, aeson-casing, aeson-qq, ansi-wl-pprint +, asn1-encoding, asn1-types, async, attoparsec, attoparsec-iso8601 +, auto-update, base, base16-bytestring, base64-bytestring, binary +, byteorder, bytestring, case-insensitive, ci-info, conduit +, connection, containers, cron, cryptonite, data-default-class +, data-has, deepseq, dependent-map, dependent-sum, directory +, either, ekg-core, ekg-json, exceptions, fast-logger, fetchgit +, file-embed, filepath, ghc-heap-view, graphql-parser, hashable +, hashable-time, haskell-src-meta, hedgehog, hspec, hspec-core +, hspec-discover, hspec-expectations, hspec-expectations-lifted +, hspec-hedgehog, hspec-wai, hspec-wai-json, http-api-data +, http-client, http-client-tls, http-conduit, http-media , http-types, immortal, insert-ordered-containers, jose -, kan-extensions, lens, lens-aeson, lib, lifted-async, lifted-base -, list-t, memory, mime-types, mmorph, monad-control, monad-loops -, monad-validate, mtl, mustache, mysql, mysql-simple -, natural-transformation, network, network-uri, odbc -, optparse-applicative, pem, pg-client, postgresql-binary -, postgresql-libpq, pretty-simple, process, profunctors, psqueues -, QuickCheck, quickcheck-instances, random, regex-tdfa -, resource-pool, retry, safe, safe-exceptions, scientific -, semialign, semigroups, semver, shakespeare, some, split -, Spock-core, stm, stm-containers, tagged, template-haskell, text -, text-builder, text-conversions, these, time, tls, transformers -, transformers-base, unix, unordered-containers, uri-encode +, kan-extensions, kriti-lang, lens, lens-aeson, lib, libyaml +, lifted-async, lifted-base, list-t, memory, mime-types, mmorph +, monad-control, monad-logger, monad-loops, monad-validate, mtl +, mustache, mysql, mysql-simple, natural-transformation, network +, network-uri, odbc, openapi3, optparse-applicative +, optparse-generic, parsec, pem, pg-client, postgresql-binary +, postgresql-libpq, postgresql-simple, pretty-simple, process +, profunctors, psqueues, QuickCheck, quickcheck-instances, random +, regex-tdfa, resource-pool, resourcet, retry, safe +, safe-exceptions, scientific, semialign, semigroups, semver +, shakespeare, some, split, Spock-core, stm, stm-containers, tagged +, template-haskell, text, text-builder, text-conversions, th-lift +, th-lift-instances, these, time, tls, tmp-postgres, transformers +, transformers-base, typed-process, unix, unliftio-core +, unordered-containers, uri-bytestring, uri-encode, url , utf8-string, uuid, validation, vector, vector-instances, wai -, warp, websockets, wreq, x509, x509-store, x509-system -, x509-validation, yaml, zlib +, wai-extra, warp, websockets, witch, wreq, x509, x509-store +, x509-system, x509-validation, yaml, zlib }: mkDerivation { pname = "graphql-engine"; version = "1.0.0"; src = fetchgit { url = "https://github.com/hasura/graphql-engine.git"; - sha256 = "04ns40wk1760pxi18pyqzgrk8h28mw6402zkjc1g52ny6afchs05"; - rev = "8be851c2a1326b2caada13a3c43becd2e848db6c"; + sha256 = "1r19qw2wxzmngb6sjpin3dk6i5r491brcb0ir4g8kw9d0ic90hpy"; + rev = "1349e6cdcfdef4b06593b48fe8e2e51b9f9c94e9"; fetchSubmodules = true; }; postUnpack = "sourceRoot+=/server; echo source root reset to $sourceRoot"; @@ -44,22 +49,23 @@ mkDerivation { attoparsec attoparsec-iso8601 auto-update base base16-bytestring base64-bytestring binary byteorder bytestring case-insensitive ci-info connection containers cron cryptonite data-default-class - data-has deepseq dependent-map dependent-sum directory ekg-core - ekg-json exceptions fast-logger file-embed filepath ghc-heap-view - graphql-parser hashable hashable-time http-api-data http-client - http-client-tls http-conduit http-types immortal - insert-ordered-containers jose kan-extensions lens lens-aeson - lifted-async lifted-base list-t memory mime-types mmorph - monad-control monad-loops monad-validate mtl mustache mysql - mysql-simple network network-uri odbc optparse-applicative pem - pg-client postgresql-binary postgresql-libpq pretty-simple process - profunctors psqueues QuickCheck quickcheck-instances random - regex-tdfa resource-pool retry safe-exceptions scientific semialign - semigroups semver shakespeare some split Spock-core stm - stm-containers tagged template-haskell text text-builder - text-conversions these time tls transformers transformers-base unix - unordered-containers uri-encode utf8-string uuid validation vector - vector-instances wai warp websockets wreq x509 x509-store + data-has deepseq dependent-map dependent-sum directory either + ekg-core ekg-json exceptions fast-logger file-embed filepath + ghc-heap-view graphql-parser hashable hashable-time http-api-data + http-client http-client-tls http-conduit http-media http-types + immortal insert-ordered-containers jose kan-extensions kriti-lang + lens lens-aeson lifted-async lifted-base list-t memory mime-types + mmorph monad-control monad-loops monad-validate mtl mustache mysql + mysql-simple network network-uri odbc openapi3 optparse-applicative + optparse-generic parsec pem pg-client postgresql-binary + postgresql-libpq pretty-simple process profunctors psqueues + QuickCheck quickcheck-instances random regex-tdfa resource-pool + retry safe-exceptions scientific semialign semigroups semver + shakespeare some split Spock-core stm stm-containers tagged + template-haskell text text-builder text-conversions these time tls + transformers transformers-base unix unordered-containers + uri-bytestring uri-encode url utf8-string uuid validation vector + vector-instances wai warp websockets witch wreq x509 x509-store x509-system x509-validation yaml zlib ]; executableHaskellDepends = [ @@ -67,15 +73,24 @@ mkDerivation { text-conversions time unix ]; testHaskellDepends = [ - aeson base bytestring containers cron dependent-map dependent-sum - graphql-parser hspec hspec-core hspec-expectations - hspec-expectations-lifted http-client http-client-tls http-types - insert-ordered-containers jose kan-extensions lens lifted-base - mmorph monad-control mtl natural-transformation network-uri - optparse-applicative pg-client process QuickCheck safe scientific - split template-haskell text time transformers-base - unordered-containers vector + aeson aeson-casing aeson-qq async base bytestring case-insensitive + conduit containers cron dependent-map dependent-sum ekg-core + exceptions graphql-parser haskell-src-meta hedgehog hspec + hspec-core hspec-discover hspec-expectations + hspec-expectations-lifted hspec-hedgehog hspec-wai hspec-wai-json + http-client http-client-tls http-conduit http-types + insert-ordered-containers jose kan-extensions lens lens-aeson + libyaml lifted-base mmorph monad-control monad-logger mtl mysql + mysql-simple natural-transformation network network-uri odbc + optparse-applicative parsec pg-client postgresql-libpq + postgresql-simple process QuickCheck resource-pool resourcet safe + safe-exceptions scientific shakespeare split Spock-core stm + template-haskell text text-conversions th-lift th-lift-instances + time tmp-postgres transformers transformers-base typed-process unix + unliftio-core unordered-containers utf8-string vector wai wai-extra + warp websockets yaml ]; + testToolDepends = [ hspec-discover ]; doCheck = false; homepage = "https://www.hasura.io"; description = "GraphQL API over Postgres"; diff --git a/pkgs/development/misc/haskell/hasura/graphql-parser.nix b/pkgs/development/misc/haskell/hasura/graphql-parser.nix index a447ac0154015..70024ce732c44 100644 --- a/pkgs/development/misc/haskell/hasura/graphql-parser.nix +++ b/pkgs/development/misc/haskell/hasura/graphql-parser.nix @@ -1,30 +1,29 @@ # This has been automatically generated by the script # ./update.sh. This should not be changed by hand. -{ mkDerivation, aeson, attoparsec, base, bytestring, containers -, criterion, deepseq, fetchgit, filepath, hashable, hedgehog, lib -, prettyprinter, scientific, template-haskell, text, text-builder -, th-lift-instances, unordered-containers, vector +{ mkDerivation, aeson, attoparsec, base, bytestring, deepseq +, fetchgit, hashable, hedgehog, lib, prettyprinter, scientific +, tasty-bench, template-haskell, text, text-builder +, th-lift-instances, unordered-containers }: mkDerivation { pname = "graphql-parser"; version = "0.2.0.0"; src = fetchgit { url = "https://github.com/hasura/graphql-parser-hs.git"; - sha256 = "0zqrh7y0cjjrscsw2hmyhdcm4nzvb5pw394pcxk8q19xx13jp9xd"; - rev = "43562a5b7b41d380e3e31732b48637702e5aa97d"; + sha256 = "1xprr5wdhcfnbggkygz71v3za1mmkqv5mbm7h16kpsrhm1m9mpx8"; + rev = "c311bc15b8d8cef28a846d1d81b0bcc1d59bd956"; fetchSubmodules = true; }; libraryHaskellDepends = [ - aeson attoparsec base bytestring containers deepseq filepath - hashable hedgehog prettyprinter scientific template-haskell text - text-builder th-lift-instances unordered-containers vector + aeson attoparsec base bytestring deepseq hashable hedgehog + prettyprinter scientific template-haskell text text-builder + th-lift-instances unordered-containers ]; testHaskellDepends = [ - attoparsec base bytestring hedgehog prettyprinter scientific text - text-builder + attoparsec base bytestring hedgehog prettyprinter text text-builder ]; benchmarkHaskellDepends = [ - base bytestring criterion prettyprinter text text-builder + base bytestring prettyprinter tasty-bench text text-builder ]; homepage = "https://github.com/hasura/graphql-parser-hs"; description = "A native Haskell GraphQL parser"; diff --git a/pkgs/development/misc/haskell/hasura/kriti-lang.nix b/pkgs/development/misc/haskell/hasura/kriti-lang.nix new file mode 100644 index 0000000000000..7e22aff40d7b4 --- /dev/null +++ b/pkgs/development/misc/haskell/hasura/kriti-lang.nix @@ -0,0 +1,41 @@ +# This has been automatically generated by the script +# ./update.sh. This should not be changed by hand. +{ mkDerivation, aeson, aeson-pretty, alex, array, base, bytestring +, containers, directory, fetchgit, filepath, generic-arbitrary +, happy, hspec, hspec-core, hspec-golden, lens, lens-aeson, lib +, megaparsec, mtl, network-uri, optparse-applicative, parsec +, parser-combinators, pretty-simple, prettyprinter, QuickCheck +, raw-strings-qq, safe-exceptions, scientific, text +, unordered-containers, utf8-string, vector +}: +mkDerivation { + pname = "kriti-lang"; + version = "0.3.1"; + src = fetchgit { + url = "https://github.com/hasura/kriti-lang.git"; + sha256 = "09v31xp8gkc0p0gfysxyd8yb7lyb1vpgzq8550h3s3msjbapr7pj"; + rev = "0f0b153b93af5dc6c6e995c016ca4562e8438cec"; + fetchSubmodules = true; + }; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + aeson array base bytestring containers lens megaparsec mtl + network-uri optparse-applicative parser-combinators prettyprinter + scientific text unordered-containers utf8-string vector + ]; + libraryToolDepends = [ alex happy ]; + executableHaskellDepends = [ + aeson base bytestring containers mtl optparse-applicative + prettyprinter text utf8-string + ]; + testHaskellDepends = [ + aeson aeson-pretty base bytestring containers directory filepath + generic-arbitrary hspec hspec-core hspec-golden lens lens-aeson mtl + optparse-applicative parsec pretty-simple prettyprinter QuickCheck + raw-strings-qq safe-exceptions scientific text unordered-containers + utf8-string vector + ]; + license = lib.licenses.asl20; + maintainers = with lib.maintainers; [ lassulus ]; +} diff --git a/pkgs/development/misc/haskell/hasura/pg-client.nix b/pkgs/development/misc/haskell/hasura/pg-client.nix index 52f179f9923ce..92d556824dbd6 100644 --- a/pkgs/development/misc/haskell/hasura/pg-client.nix +++ b/pkgs/development/misc/haskell/hasura/pg-client.nix @@ -1,10 +1,10 @@ # This has been automatically generated by the script # ./update.sh. This should not be changed by hand. -{ mkDerivation, aeson, aeson-casing, attoparsec, base, bytestring -, Cabal, criterion, ekg-core, fetchgit, file-embed, hashable -, hashtables, hasql, hasql-pool, hasql-transaction, hspec, lib -, mmorph, monad-control, mtl, postgresql, postgresql-binary -, postgresql-libpq, resource-pool, retry, scientific +{ mkDerivation, aeson, aeson-casing, async, attoparsec, base +, bytestring, ekg-core, fetchgit, file-embed, hashable, hashtables +, hasql, hasql-pool, hasql-transaction, hspec, lib, mmorph +, monad-control, mtl, postgresql-binary, postgresql-libpq +, resource-pool, retry, safe-exceptions, scientific, tasty-bench , template-haskell, text, text-builder, time, transformers-base , uuid, vector }: @@ -13,24 +13,25 @@ mkDerivation { version = "0.1.0"; src = fetchgit { url = "https://github.com/hasura/pg-client-hs.git"; - sha256 = "00h9hskv3p4mg35php5wsr2d2rjahcv29rqidb2lxl11r05psr4m"; - rev = "5e8a2d7ebe8b96518e5a70f4d61be2550eaa4e70"; + sha256 = "0ga2bj0mfng25c8kxsvi8i13pnanbnhahxvbq8ijl0bysd41g7zi"; + rev = "09b40ad8e5d16a78f5d91fe2306676f52caadbc8"; fetchSubmodules = true; }; - setupHaskellDepends = [ base Cabal ]; libraryHaskellDepends = [ - aeson aeson-casing attoparsec base bytestring ekg-core hashable - hashtables mmorph monad-control mtl postgresql-binary - postgresql-libpq resource-pool retry scientific template-haskell - text text-builder time transformers-base uuid vector + aeson aeson-casing async attoparsec base bytestring ekg-core + hashable hashtables mmorph monad-control mtl postgresql-binary + postgresql-libpq resource-pool retry safe-exceptions scientific + template-haskell text text-builder time transformers-base uuid + vector + ]; + testHaskellDepends = [ + async base bytestring hspec mtl safe-exceptions time ]; - librarySystemDepends = [ postgresql ]; - testHaskellDepends = [ base bytestring hspec mtl ]; benchmarkHaskellDepends = [ - base bytestring criterion file-embed hashable hasql hasql-pool - hasql-transaction mtl postgresql-libpq text text-builder + base bytestring file-embed hasql hasql-pool hasql-transaction mtl + tasty-bench text ]; homepage = "https://github.com/hasura/platform"; - license = lib.licenses.bsd3; + license = lib.licenses.asl20; maintainers = with lib.maintainers; [ lassulus ]; } diff --git a/pkgs/development/misc/haskell/hasura/pool.nix b/pkgs/development/misc/haskell/hasura/pool.nix index c03b1fb88121d..48954114a4a17 100644 --- a/pkgs/development/misc/haskell/hasura/pool.nix +++ b/pkgs/development/misc/haskell/hasura/pool.nix @@ -17,7 +17,7 @@ mkDerivation { vector ]; testHaskellDepends = [ base hspec ]; - homepage = "https://github.com/bos/pool"; + homepage = "http://github.com/bos/pool"; description = "A high-performance striped resource pooling implementation"; license = lib.licenses.bsd3; maintainers = with lib.maintainers; [ lassulus ]; diff --git a/pkgs/development/misc/haskell/hasura/update.sh b/pkgs/development/misc/haskell/hasura/update.sh index 77a5d5fc6dead..f4286ea6b831e 100755 --- a/pkgs/development/misc/haskell/hasura/update.sh +++ b/pkgs/development/misc/haskell/hasura/update.sh @@ -21,12 +21,13 @@ pgclient_derivation_file="${script_dir}/pg-client.nix" pool_derivation_file="${script_dir}/pool.nix" ekgcore_derivation_file="${script_dir}/ekg-core.nix" ekgjson_derivation_file="${script_dir}/ekg-json.nix" +kritilang_derivation_file="${script_dir}/kriti-lang.nix" # TODO: get current revision of graphql-engine in Nixpkgs. # old_version="$(sed -En 's/.*\bversion = "(.*?)".*/\1/p' "$engine_derivation_file")" # This is the latest release version of graphql-engine on GitHub. -new_version=$(curl --silent "https://api.github.com/repos/hasura/graphql-engine/releases" | jq '.[0].tag_name' --raw-output) +new_version=$(curl --silent "https://api.github.com/repos/hasura/graphql-engine/releases" | jq 'map(select(.prerelease | not)) | .[0].tag_name' --raw-output) echo "Running cabal2nix and outputting to ${engine_derivation_file}..." @@ -77,6 +78,15 @@ echo "# ./update.sh. This should not be changed by hand." >> "$ekgjson_derivati cabal2nix --maintainer lassulus "https://github.com/hasura/ekg-json.git" >> "$ekgjson_derivation_file" +echo "Running cabal2nix and outputting to ${kritilang_derivation_file}..." + +echo "# This has been automatically generated by the script" > "$kritilang_derivation_file" +echo "# ./update.sh. This should not be changed by hand." >> "$kritilang_derivation_file" + +new_kritilang_version=$(curl --silent "https://api.github.com/repos/hasura/kriti-lang/tags" | jq '.[0].name' --raw-output) + +cabal2nix --revision "$new_kritilang_version" --maintainer lassulus "https://github.com/hasura/kriti-lang.git" >> "$kritilang_derivation_file" + echo "###################" echo "please update pkgs/servers/hasura/cli.nix vendorSha256" echo "please update pkgs/development/haskell-modules/configuration-common.nix graphql-engine version" diff --git a/pkgs/development/node-packages/default.nix b/pkgs/development/node-packages/default.nix index 9ecb7c5f3ef45..d31da0892e4df 100644 --- a/pkgs/development/node-packages/default.nix +++ b/pkgs/development/node-packages/default.nix @@ -343,13 +343,17 @@ let wrapProgram "$out/bin/postcss" \ --prefix NODE_PATH : ${self.postcss}/lib/node_modules \ --prefix NODE_PATH : ${self.autoprefixer}/lib/node_modules + ln -s '${self.postcss}/lib/node_modules/postcss' "$out/lib/node_modules/postcss" ''; passthru.tests = { simple-execution = pkgs.callPackage ./package-tests/postcss-cli.nix { inherit (self) postcss-cli; }; }; - meta.mainProgram = "postcss"; + meta = { + mainProgram = "postcss"; + maintainers = with lib.maintainers; [ Luflosi ]; + }; }; # To update prisma, please first update prisma-engines to the latest diff --git a/pkgs/development/python-modules/afdko/default.nix b/pkgs/development/python-modules/afdko/default.nix index 66f12ffd54b0b..3fc547ddf967a 100644 --- a/pkgs/development/python-modules/afdko/default.nix +++ b/pkgs/development/python-modules/afdko/default.nix @@ -91,6 +91,8 @@ buildPythonPackage rec { # aarch64-only (?) failure, unknown reason so far # https://github.com/adobe-type-tools/afdko/issues/1425 "test_spec" + ] ++ lib.optionals (stdenv.hostPlatform.isi686) [ + "test_type1mm_inputs" ]; passthru.tests = { diff --git a/pkgs/development/python-modules/aioswitcher/default.nix b/pkgs/development/python-modules/aioswitcher/default.nix index d42f242438b38..68cc3150d9f69 100644 --- a/pkgs/development/python-modules/aioswitcher/default.nix +++ b/pkgs/development/python-modules/aioswitcher/default.nix @@ -13,14 +13,14 @@ buildPythonPackage rec { pname = "aioswitcher"; - version = "2.0.8"; + version = "2.0.9"; format = "pyproject"; src = fetchFromGitHub { owner = "TomerFi"; repo = pname; - rev = version; - sha256 = "sha256-4+XGSaHZNYjId0bTOwCkYpb1K/pM8WtN5/NI+GVaI7M="; + rev = "refs/tags/${version}"; + sha256 = "sha256-vsMQG664ySMQfdl4tGJKMY0MZXVl39QaFxu7kMtZWCM="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/amberelectric/default.nix b/pkgs/development/python-modules/amberelectric/default.nix index cd49848614323..667e5fff5e19b 100644 --- a/pkgs/development/python-modules/amberelectric/default.nix +++ b/pkgs/development/python-modules/amberelectric/default.nix @@ -10,14 +10,14 @@ buildPythonPackage rec { pname = "amberelectric"; - version = "1.0.3"; + version = "1.0.4"; format = "setuptools"; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - sha256 = "1hsbk2v7j1nsa083j28jb7b3rv76flan0g9wav97qccp1gjds5b0"; + sha256 = "sha256-5SWJnTxRm6mzP0RxrgA+jnV+Gp23WjqQA57wbT2V9Dk="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/async-upnp-client/default.nix b/pkgs/development/python-modules/async-upnp-client/default.nix index 1c818d2724ea0..0f1a578c20d08 100644 --- a/pkgs/development/python-modules/async-upnp-client/default.nix +++ b/pkgs/development/python-modules/async-upnp-client/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { pname = "async-upnp-client"; - version = "0.23.5"; + version = "0.27.0"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -23,7 +23,7 @@ buildPythonPackage rec { owner = "StevenLooman"; repo = "async_upnp_client"; rev = version; - sha256 = "sha256-fMlP8LX+OFiw6o1rpz8J0sEsACk5x9dQko1oGEaZFuc="; + sha256 = "sha256-QElc4J2BxOFI+L9D/SVMiYeRVOmwrNTW65LgdBG0TbU="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/av/default.nix b/pkgs/development/python-modules/av/default.nix index c79dc8b3fcb14..3ebc44d1c4d63 100644 --- a/pkgs/development/python-modules/av/default.nix +++ b/pkgs/development/python-modules/av/default.nix @@ -1,33 +1,141 @@ { lib , buildPythonPackage -, fetchPypi -, isPy27 -, numpy -, ffmpeg +, fetchFromGitHub +, pythonOlder + +# build +, cython , pkg-config + +# runtime +, ffmpeg + +# tests +, numpy +, pillow +, pytestCheckHook }: buildPythonPackage rec { pname = "av"; - version = "8.1.0"; - disabled = isPy27; # setup.py no longer compatible + version = "9.1.1"; + format = "pyproject"; + disabled = pythonOlder "3.7"; - src = fetchPypi { - inherit pname version; - sha256 = "0402169bc27e38e0f44e0e0e1854cf488337e86206b6d25d6dae2bfd7a1a0230"; + src = fetchFromGitHub { + owner = "mikeboers"; + repo = "PyAV"; + rev = "v${version}"; + hash = "sha256-/6C5GE9zANPy0xaptu/+pIupOLDra/R7TJ41YLGszUs="; }; - checkInputs = [ numpy ]; + nativeBuildInputs = [ + cython + pkg-config + ]; + + buildInputs = [ + ffmpeg + ]; + + preCheck = '' + # ensure we import the built version + rm -r av + ''; + + checkInputs = [ + numpy + pillow + pytestCheckHook + ]; + + pytestFlagsArray = [ + # Tests that want to download FATE data + # https://github.com/PyAV-Org/PyAV/issues/955 + "--deselect=tests/test_audiofifo.py::TestAudioFifo::test_data" + "--deselect=tests/test_codec_context.py::TestCodecContext::test_codec_tag" + "--deselect=tests/test_codec_context.py::TestCodecContext::test_parse" + "--deselect=tests/test_codec_context.py::TestEncoding::test_encoding_aac" + "--deselect=tests/test_codec_context.py::TestEncoding::test_encoding_dnxhd" + "--deselect=tests/test_codec_context.py::TestEncoding::test_encoding_dvvideo" + "--deselect=tests/test_codec_context.py::TestEncoding::test_encoding_h264" + "--deselect=tests/test_codec_context.py::TestEncoding::test_encoding_mjpeg" + "--deselect=tests/test_codec_context.py::TestEncoding::test_encoding_mp2" + "--deselect=tests/test_codec_context.py::TestEncoding::test_encoding_mpeg1video" + "--deselect=tests/test_codec_context.py::TestEncoding::test_encoding_mpeg4" + "--deselect=tests/test_codec_context.py::TestEncoding::test_encoding_pcm_s24le" + "--deselect=tests/test_codec_context.py::TestEncoding::test_encoding_png" + "--deselect=tests/test_codec_context.py::TestEncoding::test_encoding_tiff" + "--deselect=tests/test_codec_context.py::TestEncoding::test_encoding_xvid" + "--deselect=tests/test_decode.py::TestDecode::test_decode_audio_sample_count" + "--deselect=tests/test_decode.py::TestDecode::test_decoded_motion_vectors" + "--deselect=tests/test_decode.py::TestDecode::test_decoded_motion_vectors_no_flag" + "--deselect=tests/test_decode.py::TestDecode::test_decoded_time_base" + "--deselect=tests/test_decode.py::TestDecode::test_decoded_video_frame_count" + "--deselect=tests/test_encode.py::TestBasicAudioEncoding::test_transcode" + "--deselect=tests/test_file_probing.py::TestAudioProbe::test_container_probing" + "--deselect=tests/test_file_probing.py::TestAudioProbe::test_stream_probing" + "--deselect=tests/test_file_probing.py::TestDataProbe::test_container_probing" + "--deselect=tests/test_file_probing.py::TestDataProbe::test_stream_probing" + "--deselect=tests/test_file_probing.py::TestSubtitleProbe::test_container_probing" + "--deselect=tests/test_file_probing.py::TestSubtitleProbe::test_stream_probing" + "--deselect=tests/test_file_probing.py::TestVideoProbe::test_container_probing" + "--deselect=tests/test_file_probing.py::TestVideoProbe::test_stream_probing" + "--deselect=tests/test_python_io.py::TestPythonIO::test_reading_from_buffer" + "--deselect=tests/test_python_io.py::TestPythonIO::test_reading_from_buffer_no_see" + "--deselect=tests/test_python_io.py::TestPythonIO::test_reading_from_file" + "--deselect=tests/test_python_io.py::TestPythonIO::test_reading_from_pipe_readonly" + "--deselect=tests/test_python_io.py::TestPythonIO::test_reading_from_write_readonl" + "--deselect=tests/test_seek.py::TestSeek::test_decode_half" + "--deselect=tests/test_seek.py::TestSeek::test_seek_end" + "--deselect=tests/test_seek.py::TestSeek::test_seek_float" + "--deselect=tests/test_seek.py::TestSeek::test_seek_int64" + "--deselect=tests/test_seek.py::TestSeek::test_seek_middle" + "--deselect=tests/test_seek.py::TestSeek::test_seek_start" + "--deselect=tests/test_seek.py::TestSeek::test_stream_seek" + "--deselect=tests/test_streams.py::TestStreams::test_selection" + "--deselect=tests/test_streams.py::TestStreams::test_stream_tuples" + "--deselect=tests/test_subtitles.py::TestSubtitle::test_movtext" + "--deselect=tests/test_subtitles.py::TestSubtitle::test_vobsub" + "--deselect=tests/test_videoframe.py::TestVideoFrameImage::test_roundtrip" + ]; - nativeBuildInputs = [ pkg-config ]; - buildInputs = [ ffmpeg ]; + disabledTestPaths = [ + # urlopen fails during DNS resolution + "tests/test_doctests.py" + "tests/test_timeout.py" + ]; - # Tests require downloading files from internet - doCheck = false; + pythonImportsCheck = [ + "av" + "av.audio" + "av.buffer" + "av.bytesource" + "av.codec" + "av.container" + "av._core" + "av.datasets" + "av.descriptor" + "av.dictionary" + "av.enum" + "av.error" + "av.filter" + "av.format" + "av.frame" + "av.logging" + "av.option" + "av.packet" + "av.plane" + "av.stream" + "av.subtitles" + "av.utils" + "av.video" + ]; - meta = { + meta = with lib; { description = "Pythonic bindings for FFmpeg/Libav"; homepage = "https://github.com/mikeboers/PyAV/"; - license = lib.licenses.bsd2; + license = licenses.bsd2; + maintainers = with maintainers; [ ]; }; } diff --git a/pkgs/development/python-modules/azure-eventgrid/default.nix b/pkgs/development/python-modules/azure-eventgrid/default.nix index a5e06a4f54f28..861f9ccd0f9b0 100644 --- a/pkgs/development/python-modules/azure-eventgrid/default.nix +++ b/pkgs/development/python-modules/azure-eventgrid/default.nix @@ -5,16 +5,20 @@ , azure-common , azure-core , msrestazure +, pythonOlder }: buildPythonPackage rec { pname = "azure-eventgrid"; - version = "4.7.1"; + version = "4.8.0"; + format = "setuptools"; + + disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; extension = "zip"; - sha256 = "b96afc0317c764c2c428512485305ec5748698081cb6bc70dcaa903b0ac04754"; + hash = "sha256-8jEtTQTUJLSa2iuA/Sgirgcm8kbwWOT11O1n46CLouw="; }; propagatedBuildInputs = [ @@ -26,7 +30,10 @@ buildPythonPackage rec { # has no tests doCheck = false; - pythonImportsCheck = [ "azure.eventgrid" ]; + + pythonImportsCheck = [ + "azure.eventgrid" + ]; meta = with lib; { description = "A fully-managed intelligent event routing service that allows for uniform event consumption using a publish-subscribe model"; diff --git a/pkgs/development/python-modules/azure-identity/default.nix b/pkgs/development/python-modules/azure-identity/default.nix index 44660e56f4268..c4897fb306f9b 100644 --- a/pkgs/development/python-modules/azure-identity/default.nix +++ b/pkgs/development/python-modules/azure-identity/default.nix @@ -16,12 +16,12 @@ buildPythonPackage rec { pname = "azure-identity"; - version = "1.8.0"; + version = "1.9.0"; src = fetchPypi { inherit pname version; extension = "zip"; - sha256 = "sha256-Ag/w5HFXhS5KrIo62waEGCcUfyepTL50qQRCXY5i2Tw="; + sha256 = "sha256-CFTRnaTFZEZBgU3E+VHELgFAC1eS8J37a/+nJti5Fg0="; }; postPatch = '' diff --git a/pkgs/development/python-modules/azure-mgmt-storage/default.nix b/pkgs/development/python-modules/azure-mgmt-storage/default.nix index cd7e96049d1fc..8bc69d0c9b72b 100644 --- a/pkgs/development/python-modules/azure-mgmt-storage/default.nix +++ b/pkgs/development/python-modules/azure-mgmt-storage/default.nix @@ -3,18 +3,20 @@ , fetchPypi , azure-mgmt-common , azure-mgmt-core -, isPy3k +, pythonOlder }: buildPythonPackage rec { - version = "19.1.0"; + version = "20.0.0"; pname = "azure-mgmt-storage"; - disabled = !isPy3k; + format = "setuptools"; + + disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; extension = "zip"; - sha256 = "sha256-Seoi8A4JZaNVCvNKQcGh06SBaQ9lAMeOhUCIAvVtdBY="; + hash = "sha256-buR2tWIv9vWVTt7m6w2N1CezIXAihVrfHshjPKBM3uI="; }; propagatedBuildInputs = [ @@ -22,9 +24,13 @@ buildPythonPackage rec { azure-mgmt-core ]; - pythonNamespaces = [ "azure.mgmt" ]; + pythonNamespaces = [ + "azure.mgmt" + ]; - pythonImportsCheck = [ "azure.mgmt.storage" ]; + pythonImportsCheck = [ + "azure.mgmt.storage" + ]; # has no tests doCheck = false; diff --git a/pkgs/development/python-modules/chainer/default.nix b/pkgs/development/python-modules/chainer/default.nix index b7dbfca70e8a8..1b40d506abc1d 100644 --- a/pkgs/development/python-modules/chainer/default.nix +++ b/pkgs/development/python-modules/chainer/default.nix @@ -1,6 +1,6 @@ -{ lib, buildPythonPackage, fetchFromGitHub, isPy3k +{ config, lib, buildPythonPackage, fetchFromGitHub, isPy3k , filelock, protobuf, numpy, pytestCheckHook, mock, typing-extensions -, cupy, cudaSupport ? false +, cupy, cudaSupport ? config.cudaSupport or false }: buildPythonPackage rec { @@ -39,6 +39,8 @@ buildPythonPackage rec { meta = with lib; { description = "A flexible framework of neural networks for deep learning"; homepage = "https://chainer.org/"; + # Un-break me when updating chainer next time! + broken = cudaSupport && (lib.versionAtLeast cupy.version "8.0.0"); license = licenses.mit; maintainers = with maintainers; [ hyphon81 ]; }; diff --git a/pkgs/development/python-modules/dotmap/default.nix b/pkgs/development/python-modules/dotmap/default.nix index b0627160e3ee7..5c4cfbf952406 100644 --- a/pkgs/development/python-modules/dotmap/default.nix +++ b/pkgs/development/python-modules/dotmap/default.nix @@ -7,14 +7,14 @@ buildPythonPackage rec { pname = "dotmap"; - version = "1.3.29"; + version = "1.3.30"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-5mhR+Ey8RrruucUIt5LxBNM6OBUWbLy5jNOWg6tzxRE="; + hash = "sha256-WCGnkz8HX7R1Y0F8DpLgt8AxFYtMmmp+VhY0ebZYs2g="; }; checkInputs = [ diff --git a/pkgs/development/python-modules/gattlib/default.nix b/pkgs/development/python-modules/gattlib/default.nix new file mode 100644 index 0000000000000..c7450d6b6b5b8 --- /dev/null +++ b/pkgs/development/python-modules/gattlib/default.nix @@ -0,0 +1,68 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, substituteAll + +# build +, pkg-config +, glibc +, python + +# runtime +, bluez +, boost +, glib + +}: + +let + pname = "gattlib"; + version = "unstable-2021-06-16"; +in +buildPythonPackage { + inherit pname version; + format = "setuptools"; + + + src = fetchFromGitHub { + owner = "oscaracena"; + repo = "pygattlib"; + rev = "7bdb229124fe7d9f4a2cc090277b0fdef82e2a56"; + hash = "sha256-PS5DIH1JuH2HweyebLLM+UNFGY/XsjKIrsD9x7g7yMI="; + }; + + patches = [ + (substituteAll { + src = ./setup.patch; + boost_version = let + pythonVersion = with lib.versions; "${major python.version}${minor python.version}"; + in + "boost_python${pythonVersion}"; + }) + ]; + + nativeBuildInputs = [ + pkg-config + glibc + ]; + + buildInputs = [ + bluez + boost + glib + ]; + + # has no tests + doCheck = false; + + pythonImportsCheck = [ + "gattlib" + ]; + + meta = with lib; { + description = "Python library to use the GATT Protocol for Bluetooth LE devices"; + homepage = "https://github.com/oscaracena/pygattlib"; + license = licenses.asl20; + maintainers = with maintainers; [ hexa ]; + }; +} diff --git a/pkgs/development/python-modules/gattlib/setup.patch b/pkgs/development/python-modules/gattlib/setup.patch new file mode 100644 index 0000000000000..32c3b1be496d1 --- /dev/null +++ b/pkgs/development/python-modules/gattlib/setup.patch @@ -0,0 +1,18 @@ +diff --git a/setup.py b/setup.py +index 0825241..389a59e 100755 +--- a/setup.py ++++ b/setup.py +@@ -11,12 +11,7 @@ extension_modules = [] + + + def get_boost_version(out=None): +- if out is None: +- out = subprocess.check_output( +- r"ldconfig -p | grep -E 'libboost_python.*\.so '", shell=True) +- +- ver = os.path.splitext(out.split()[0][3:])[0].decode() +- return ver ++ return "@boost_version@" + + def tests(): + # case: python3-py3x.so diff --git a/pkgs/development/python-modules/google-cloud-pubsub/default.nix b/pkgs/development/python-modules/google-cloud-pubsub/default.nix index 5f9fdb2833d20..9ba7f9145e30f 100644 --- a/pkgs/development/python-modules/google-cloud-pubsub/default.nix +++ b/pkgs/development/python-modules/google-cloud-pubsub/default.nix @@ -10,16 +10,19 @@ , mock , proto-plus , pytest-asyncio +, pythonOlder }: buildPythonPackage rec { pname = "google-cloud-pubsub"; - version = "2.11.0"; + version = "2.12.0"; format = "setuptools"; + disabled = pythonOlder "3.6"; + src = fetchPypi { inherit pname version; - sha256 = "sha256-btPJ2X+I0f8C3YDB9bZwPv7HWnqsq9koWsT+CyK1AgM="; + hash = "sha256-5RoIpyVm/y2+6pN4mJPWHbVUwxH6yWI/vIuCVNJU2aw="; }; propagatedBuildInputs = [ @@ -47,7 +50,9 @@ buildPythonPackage rec { "tests/unit/pubsub_v1" ]; - pythonImportsCheck = [ "google.cloud.pubsub" ]; + pythonImportsCheck = [ + "google.cloud.pubsub" + ]; meta = with lib; { description = "Google Cloud Pub/Sub API client library"; diff --git a/pkgs/development/python-modules/ha-av/default.nix b/pkgs/development/python-modules/ha-av/default.nix deleted file mode 100644 index 78735b67d44d9..0000000000000 --- a/pkgs/development/python-modules/ha-av/default.nix +++ /dev/null @@ -1,43 +0,0 @@ -{ lib -, buildPythonPackage -, pythonOlder -, fetchPypi -, pkg-config -, ffmpeg_4 -}: - -buildPythonPackage rec { - pname = "ha-av"; - version = "8.0.4rc1"; - format = "setuptools"; - - disabled = pythonOlder "3.5"; - - src = fetchPypi { - inherit pname version; - sha256 = "sha256-txdi2/X6upqrACeHhHpEh4tGqgPpW/dyWda8y++7c3M="; - }; - - nativeBuildInputs = [ - pkg-config - ]; - - buildInputs = [ - ffmpeg_4 - ]; - - pythonImportsCheck = [ - "av" - "av._core" - ]; - - # tests fail to import av._core - doCheck = false; - - meta = with lib; { - homepage = "https://pypi.org/project/ha-av/"; - description = "Pythonic bindings for FFmpeg's libraries"; - license = licenses.bsd3; - maintainers = with maintainers; [ hexa ]; - }; -} diff --git a/pkgs/development/python-modules/hangups/default.nix b/pkgs/development/python-modules/hangups/default.nix index 3b5e0a218b78a..18dd31f8af565 100644 --- a/pkgs/development/python-modules/hangups/default.nix +++ b/pkgs/development/python-modules/hangups/default.nix @@ -18,7 +18,7 @@ buildPythonPackage rec { pname = "hangups"; - version = "0.4.17"; + version = "0.4.18"; disabled = pythonOlder "3.6"; @@ -26,7 +26,7 @@ buildPythonPackage rec { owner = "tdryer"; repo = "hangups"; rev = "v${version}"; - hash = "sha256-8kNWcRAip9LkmazDUVeDjGWhy/TWzT01c959LA5hb1Q="; + hash = "sha256-vq1OrOUPMQtezBFlisP2f/bvvYprDjhOuwUcT8rmIvw="; }; postPatch = '' diff --git a/pkgs/development/python-modules/hatchling/default.nix b/pkgs/development/python-modules/hatchling/default.nix index 09cbdead671a3..045bbafd6360e 100644 --- a/pkgs/development/python-modules/hatchling/default.nix +++ b/pkgs/development/python-modules/hatchling/default.nix @@ -21,7 +21,7 @@ let pname = "hatchling"; - version = "0.20.1"; + version = "0.22.0"; in buildPythonPackage { inherit pname version; @@ -29,7 +29,7 @@ buildPythonPackage { src = fetchPypi { inherit pname version; - hash = "sha256-l1VRce5H3CSAwZBeuxRyy7bNpOM6zX5s2L1/DXPo/Bg="; + hash = "sha256-BUJ24F4oON/9dWpnnDNM5nIOuh3yuwlvDnLA9uQAIXo="; }; # listed in backend/src/hatchling/ouroboros.py diff --git a/pkgs/development/python-modules/hyperion-py/default.nix b/pkgs/development/python-modules/hyperion-py/default.nix index 719efb92d1da7..7837deea6dba5 100644 --- a/pkgs/development/python-modules/hyperion-py/default.nix +++ b/pkgs/development/python-modules/hyperion-py/default.nix @@ -4,6 +4,7 @@ , fetchFromGitHub , pytestCheckHook , pythonOlder +, pythonAtLeast , poetry-core , pytest-aiohttp , pytest-asyncio @@ -11,15 +12,15 @@ buildPythonPackage rec { pname = "hyperion-py"; - version = "0.7.4"; - disabled = pythonOlder "3.8"; + version = "0.7.5"; + disabled = pythonOlder "3.8" || pythonAtLeast "3.10"; format = "pyproject"; src = fetchFromGitHub { owner = "dermotduffy"; repo = pname; rev = "v${version}"; - sha256 = "00x12ppmvlxs3qbdxq06wnzakvwm2m39qhmpp27qfpl137b0qqyj"; + sha256 = "sha256-arcnpCQsRuiWCrAz/t4TCjTe8DRDtRuzYp8k7nnjGDk="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/lru-dict/default.nix b/pkgs/development/python-modules/lru-dict/default.nix new file mode 100644 index 0000000000000..b075ead342973 --- /dev/null +++ b/pkgs/development/python-modules/lru-dict/default.nix @@ -0,0 +1,34 @@ +{ lib +, buildPythonPackage +, fetchPypi +, pytestCheckHook +}: + +let + pname = "lru-dict"; + version = "1.1.7"; +in +buildPythonPackage { + inherit pname version; + format = "setuptools"; + + src = fetchPypi { + inherit pname version; + hash = "sha256-RbgfZ9dTQdRDOrreeZpH6cQqniKhGFMdy15UmGQDLXw="; + }; + + checkInputs = [ + pytestCheckHook + ]; + + pythonImportsCheck = [ + "lru" + ]; + + meta = with lib; { + description = "Fast and memory efficient LRU cache for Python"; + homepage = "https://github.com/amitdev/lru-dict"; + license = licenses.mit; + maintainers = with maintainers; [ hexa ]; + }; +} diff --git a/pkgs/development/python-modules/meshio/default.nix b/pkgs/development/python-modules/meshio/default.nix index 1471ea5b1e5dd..1df5a7f478074 100644 --- a/pkgs/development/python-modules/meshio/default.nix +++ b/pkgs/development/python-modules/meshio/default.nix @@ -11,12 +11,12 @@ buildPythonPackage rec { pname = "meshio"; - version = "5.3.2"; + version = "5.3.4"; format = "pyproject"; src = fetchPypi { inherit pname version; - sha256 = "sha256-L1YNRAgoHBvf8SsM++J+k1UNciIw91W1s6IA26I/bYw="; + sha256 = "sha256-4kBpLX/yecErE8bl17QDYpqGrStE6SMJWLPwDB7DafA="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/mxnet/default.nix b/pkgs/development/python-modules/mxnet/default.nix index 47f4d80ad9271..a9e778bdd8c6f 100644 --- a/pkgs/development/python-modules/mxnet/default.nix +++ b/pkgs/development/python-modules/mxnet/default.nix @@ -6,10 +6,11 @@ , graphviz , python , isPy3k +, isPy310 }: buildPythonPackage { - inherit (pkgs.mxnet) pname version src meta; + inherit (pkgs.mxnet) pname version src; buildInputs = [ pkgs.mxnet ]; propagatedBuildInputs = [ requests numpy graphviz ]; @@ -32,4 +33,7 @@ buildPythonPackage { ln -s ${pkgs.mxnet}/lib/libmxnet.so $out/${python.sitePackages}/mxnet ''; + meta = pkgs.mxnet.meta // { + broken = (pkgs.mxnet.broken or false) || (isPy310 && pkgs.mxnet.cudaSupport); + }; } diff --git a/pkgs/development/python-modules/ocrmypdf/default.nix b/pkgs/development/python-modules/ocrmypdf/default.nix index fe5211802807d..5d135a4731f0f 100644 --- a/pkgs/development/python-modules/ocrmypdf/default.nix +++ b/pkgs/development/python-modules/ocrmypdf/default.nix @@ -27,7 +27,7 @@ buildPythonPackage rec { pname = "ocrmypdf"; - version = "13.4.1"; + version = "13.4.2"; src = fetchFromGitHub { owner = "jbarlow83"; @@ -39,7 +39,7 @@ buildPythonPackage rec { extraPostFetch = '' rm "$out/.git_archival.txt" ''; - sha256 = "sha256-gxgeEwm3cYNllcmRTZhdyIWWGKXTewyVW314k732swE="; + sha256 = "sha256-P829Tv2848iMEFzweydGSkFEnkfX8Rvyqd6Yqu+2VXY="; }; SETUPTOOLS_SCM_PRETEND_VERSION = version; diff --git a/pkgs/development/python-modules/plugwise/default.nix b/pkgs/development/python-modules/plugwise/default.nix index cc2601e4a227b..d5e10f32a1928 100644 --- a/pkgs/development/python-modules/plugwise/default.nix +++ b/pkgs/development/python-modules/plugwise/default.nix @@ -19,14 +19,14 @@ buildPythonPackage rec { pname = "plugwise"; - version = "0.16.6"; + version = "0.17.3"; format = "setuptools"; src = fetchFromGitHub { owner = pname; repo = "python-plugwise"; rev = "v${version}"; - sha256 = "sha256-hAYbYsLpiiJYdg9Rx5BjqNA9JTtKGu3DE0SpwOxlTWw="; + sha256 = "sha256-1wSVmH7woTR2ebHS5FfWHLqwbY04rxtPx/0A/HY+N8s="; }; postPatch = '' diff --git a/pkgs/development/python-modules/pybluez/default.nix b/pkgs/development/python-modules/pybluez/default.nix index ae90c21bea9f9..55262a07a4cad 100644 --- a/pkgs/development/python-modules/pybluez/default.nix +++ b/pkgs/development/python-modules/pybluez/default.nix @@ -1,32 +1,45 @@ { lib +, stdenv , buildPythonPackage , fetchFromGitHub -, pkgs -, isPy3k +, bluez +, gattlib }: buildPythonPackage rec { - version = "unstable-20160819"; pname = "pybluez"; - # requires use2to3, which is no longer supported in setuptools>58 - disabled = isPy3k; - - propagatedBuildInputs = [ pkgs.bluez ]; + version = "unstable-2022-01-28"; + format = "setuptools"; src = fetchFromGitHub { - owner = "karulis"; + owner = pname; repo = pname; - rev = "a0b226a61b166e170d48539778525b31e47a4731"; - sha256 = "104dm5ngfhqisv1aszdlr3szcav2g3bhsgzmg4qfs09b3i5zj047"; + rev = "5096047f90a1f6a74ceb250aef6243e144170f92"; + hash = "sha256-GA58DfCFaVzZQA1HYpGQ68bznrt4SX1ojyOVn8hyCGo="; }; - # the tests do not pass + buildInputs = [ + bluez + ]; + + propagatedBuildInputs = [ + gattlib + ]; + + # there are no tests doCheck = false; + pythonImportsCheck = [ + "bluetooth" + "bluetooth.ble" + ]; + meta = with lib; { description = "Bluetooth Python extension module"; + homepage = "https://github.com/pybluez/pybluez"; license = licenses.gpl2; maintainers = with maintainers; [ leenaars ]; + broken = stdenv.isDarwin; # requires pyobjc-core, pyobjc-framework-Cocoa }; } diff --git a/pkgs/development/python-modules/pycfmodel/default.nix b/pkgs/development/python-modules/pycfmodel/default.nix index c47362e339e50..f7d45a31490b6 100644 --- a/pkgs/development/python-modules/pycfmodel/default.nix +++ b/pkgs/development/python-modules/pycfmodel/default.nix @@ -9,7 +9,7 @@ buildPythonPackage rec { pname = "pycfmodel"; - version = "0.18.0"; + version = "0.18.1"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -17,8 +17,8 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "Skyscanner"; repo = pname; - rev = version; - hash = "sha256-g249Nq4u4pPQLbW9Kw5vLwVKCaZoots5LD6yk1NPv6s="; + rev = "refs/tags/${version}"; + hash = "sha256-oP9u62PpnBCDAwE9LJHkm93f9eYyXbHai/gp62bL84M="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/pysma/default.nix b/pkgs/development/python-modules/pysma/default.nix index 81fc1d5709e9a..efad8aaca9483 100644 --- a/pkgs/development/python-modules/pysma/default.nix +++ b/pkgs/development/python-modules/pysma/default.nix @@ -9,14 +9,14 @@ buildPythonPackage rec { pname = "pysma"; - version = "0.6.10"; + version = "0.6.11"; format = "setuptools"; disabled = pythonOlder "3.8"; src = fetchPypi { inherit pname version; - sha256 = "990abf6dba3f52b98970fc95aaf484e521faa9ff28c9c19f5a6dca3fddf5840c"; + sha256 = "sha256-x0sFJAdueSny0XoaOYbYLN8ZRS5B/iEVT62mqd4Voe4="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/samsungtvws/default.nix b/pkgs/development/python-modules/samsungtvws/default.nix index cd137b1547ea3..05dc369476509 100644 --- a/pkgs/development/python-modules/samsungtvws/default.nix +++ b/pkgs/development/python-modules/samsungtvws/default.nix @@ -1,6 +1,8 @@ { lib, buildPythonPackage, fetchPypi, isPy27 +, aiohttp , requests , websocket-client +, websockets }: buildPythonPackage rec { @@ -14,8 +16,10 @@ buildPythonPackage rec { }; propagatedBuildInputs = [ - websocket-client + aiohttp requests + websocket-client + websockets ]; # no tests diff --git a/pkgs/development/python-modules/srp/default.nix b/pkgs/development/python-modules/srp/default.nix index 17a3ab51cc7a7..13820a2363469 100644 --- a/pkgs/development/python-modules/srp/default.nix +++ b/pkgs/development/python-modules/srp/default.nix @@ -1,20 +1,35 @@ -{ buildPythonPackage, fetchPypi, six, lib }: +{ lib +, buildPythonPackage +, fetchPypi +, six +, pythonOlder +}: buildPythonPackage rec { pname = "srp"; - version = "1.0.18"; + version = "1.0.19"; + format = "setuptools"; + + disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - sha256 = "1582317ccd383dc39d54f223424c588254d73d1cfb2c5c24d945e018ec9516bb"; + hash = "sha256-SOZT6MP1kJCbpAcwbrLoRgosfR+GxWvOWc9Cr1T/XSo="; }; - propagatedBuildInputs = [ six ]; + propagatedBuildInputs = [ + six + ]; # Tests ends up with libssl.so cannot load shared doCheck = false; + pythonImportsCheck = [ + "srp" + ]; + meta = with lib; { + description = "Implementation of the Secure Remote Password protocol (SRP)"; longDescription = '' This package provides an implementation of the Secure Remote Password protocol (SRP). SRP is a cryptographically strong authentication protocol for password-based, mutual authentication over an insecure network connection. diff --git a/pkgs/development/python-modules/toggl-cli/default.nix b/pkgs/development/python-modules/toggl-cli/default.nix index b1c0346b96489..af6132cd2771b 100644 --- a/pkgs/development/python-modules/toggl-cli/default.nix +++ b/pkgs/development/python-modules/toggl-cli/default.nix @@ -20,7 +20,7 @@ buildPythonPackage rec { pname = "toggl-cli"; - version = "3"; + version = "2.4.3"; format = "setuptools"; disabled = pythonOlder "3.6"; @@ -28,7 +28,7 @@ buildPythonPackage rec { src = fetchPypi { pname = "togglCli"; inherit version; - sha256 = "sha256-SkA/u1q//AyYn0v6uAXXsjANhFppxxjKhlhWhsK649w="; + sha256 = "sha256-ncMwiMwYivaFu5jrAsm1oCuXP/PZ2ALT+M+CmV6dtFo="; }; nativeBuildInputs = [ @@ -58,8 +58,9 @@ buildPythonPackage rec { postPatch = '' substituteInPlace requirements.txt \ --replace "notify-py==0.3.1" "notify-py>=0.3.1" \ - --replace "click==7.1.2" "click>=7.1.2" \ - --replace "pbr==5.5.1" "pbr>=5.5.1" + --replace "click==8.0.3" "click>=8.0.3" \ + --replace "pbr==5.8.0" "pbr>=5.8.0" \ + --replace "inquirer==2.9.1" "inquirer>=2.9.1" substituteInPlace pytest.ini \ --replace ' --cov toggl -m "not premium"' "" ''; diff --git a/pkgs/development/python-modules/tweepy/default.nix b/pkgs/development/python-modules/tweepy/default.nix index c97fd85a8be48..6b7dbee8fa5aa 100644 --- a/pkgs/development/python-modules/tweepy/default.nix +++ b/pkgs/development/python-modules/tweepy/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { pname = "tweepy"; - version = "4.6.0"; + version = "4.8.0"; format = "setuptools"; disabled = pythonOlder "3.6"; @@ -20,8 +20,8 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = pname; repo = pname; - rev = "v${version}"; - sha256 = "sha256-7ogsocRTMTO5yegyY7BADu9NrHK7zMMbihBu8oF4UlQ="; + rev = "refs/tags/v${version}"; + sha256 = "sha256-RaM2JN2WOHyZY+AxzgQLvhXg6UnevDbSFSR4jFLsYrc="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/types-cryptography/default.nix b/pkgs/development/python-modules/types-cryptography/default.nix index dd68bfddef7b5..5088247203661 100644 --- a/pkgs/development/python-modules/types-cryptography/default.nix +++ b/pkgs/development/python-modules/types-cryptography/default.nix @@ -7,11 +7,11 @@ buildPythonPackage rec { pname = "types-cryptography"; - version = "3.3.18"; + version = "3.3.19"; src = fetchPypi { inherit pname version; - sha256 = "sha256-RI/q+a4xImFJvGvOHPj/9U2mYe8Eg398DDFoKYhcNig="; + sha256 = "sha256-+VcTjwczMrnAfq2wgx76pXj9tgTlU6w41yxGeutLfCM="; }; pythonImportsCheck = [ diff --git a/pkgs/development/python-modules/vehicle/default.nix b/pkgs/development/python-modules/vehicle/default.nix index a56cc4ca8b43e..7328494a61ff1 100644 --- a/pkgs/development/python-modules/vehicle/default.nix +++ b/pkgs/development/python-modules/vehicle/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { pname = "vehicle"; - version = "0.3.1"; + version = "0.4.0"; format = "pyproject"; disabled = pythonOlder "3.8"; @@ -22,7 +22,7 @@ buildPythonPackage rec { owner = "frenck"; repo = "python-vehicle"; rev = "v${version}"; - sha256 = "04xcs5bfjd49j870gyyznc8hkaadsa9gm9pz0w9qvzlphnxvv5h4"; + sha256 = "sha256-dvSdYrONUEe+bdZ+9nALrOQ6gJwq9e1dLvuq08xP5tQ="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/west/default.nix b/pkgs/development/python-modules/west/default.nix index 1f9aad67f19db..df7d379292630 100644 --- a/pkgs/development/python-modules/west/default.nix +++ b/pkgs/development/python-modules/west/default.nix @@ -1,16 +1,24 @@ -{ lib, fetchPypi, buildPythonPackage, isPy3k -, colorama, configobj, packaging, pyyaml, pykwalify +{ lib +, buildPythonPackage +, colorama +, configobj +, fetchPypi +, packaging +, pykwalify +, pythonOlder +, pyyaml }: buildPythonPackage rec { - version = "0.12.0"; pname = "west"; + version = "0.13.0"; + format = "setuptools"; - disabled = !isPy3k; + disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - sha256 = "d7ce0d719fd218fee5983442fe93a33a21a6be6a736915a7ffbe75369714e9ce"; + hash = "sha256-jlOmeIM6NfgYykjhgs7KpnAXFMbT/lpbT/bBaJ2CGY4="; }; propagatedBuildInputs = [ @@ -24,12 +32,12 @@ buildPythonPackage rec { # pypi package does not include tests (and for good reason): # tests run under 'tox' and have west try to git clone repos (not sandboxable) doCheck = false; + pythonImportsCheck = [ "west" ]; meta = with lib; { - homepage = "https://github.com/zephyrproject-rtos/west"; description = "Zephyr RTOS meta tool"; longDescription = '' West lets you manage multiple Git repositories under a single directory using a single file, @@ -47,6 +55,7 @@ buildPythonPackage rec { For more details, see Multiple Repository Management in the west documentation (https://docs.zephyrproject.org/latest/guides/west/repo-tool.html). ''; + homepage = "https://github.com/zephyrproject-rtos/west"; license = licenses.asl20; maintainers = with maintainers; [ siriobalmelli ]; }; diff --git a/pkgs/development/python-modules/xknx/default.nix b/pkgs/development/python-modules/xknx/default.nix index b2bfeea8f7a93..6269c52c664bd 100644 --- a/pkgs/development/python-modules/xknx/default.nix +++ b/pkgs/development/python-modules/xknx/default.nix @@ -1,6 +1,7 @@ { lib , buildPythonPackage , fetchFromGitHub +, cryptography , netifaces , voluptuous , pyyaml @@ -11,7 +12,7 @@ buildPythonPackage rec { pname = "xknx"; - version = "0.19.2"; + version = "0.20.1"; format = "setuptools"; disabled = pythonOlder "3.8"; @@ -20,13 +21,12 @@ buildPythonPackage rec { owner = "XKNX"; repo = pname; rev = version; - sha256 = "sha256-LJ7MmKCWx+n7caud0pN4+7f9H4XzwuAAn9u86X/FACo="; + sha256 = "sha256-7g1uAkBGlNcmfjqGNH2MS+X26Pq1hTKQy9eLJVTqxhA="; }; propagatedBuildInputs = [ - voluptuous + cryptography netifaces - pyyaml ]; checkInputs = [ diff --git a/pkgs/development/python-modules/yeelight/default.nix b/pkgs/development/python-modules/yeelight/default.nix index b64bd929f13f4..b2c0198894835 100644 --- a/pkgs/development/python-modules/yeelight/default.nix +++ b/pkgs/development/python-modules/yeelight/default.nix @@ -9,7 +9,7 @@ buildPythonPackage rec { pname = "yeelight"; - version = "0.7.9"; + version = "0.7.10"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -18,7 +18,7 @@ buildPythonPackage rec { owner = "stavros"; repo = "python-yeelight"; rev = "v${version}"; - sha256 = "sha256-8N+HOhUX3BXecS/kaAfLoge+NYzKLKPyoTthu+useJA="; + sha256 = "sha256-vUsL1CvhYRtv75gkmiPe/UkAtBDZPy1iK2BPUupMXz8="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/youtube-search-python/default.nix b/pkgs/development/python-modules/youtube-search-python/default.nix index 6795ba5812731..361966ef458f1 100644 --- a/pkgs/development/python-modules/youtube-search-python/default.nix +++ b/pkgs/development/python-modules/youtube-search-python/default.nix @@ -7,14 +7,14 @@ buildPythonPackage rec { pname = "youtube-search-python"; - version = "1.6.3"; + version = "1.6.4"; format = "setuptools"; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - hash = "sha256-zAza1XMKLIMZFFS0v/4ATqh6j7aEB2Y+eliE/hNPORw="; + hash = "sha256-9ZAZaLkJb2mEg0rstBxOvs9/L4wtbLuCTdFDOuxMqN0="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/yq/default.nix b/pkgs/development/python-modules/yq/default.nix index 5bcbf24dc302e..4792f38d7ce17 100644 --- a/pkgs/development/python-modules/yq/default.nix +++ b/pkgs/development/python-modules/yq/default.nix @@ -4,8 +4,10 @@ , substituteAll , argcomplete , pyyaml +, toml , xmltodict , jq +, setuptools-scm , pytestCheckHook }: @@ -25,14 +27,14 @@ buildPythonPackage rec { }) ]; - postPatch = '' - substituteInPlace test/test.py \ - --replace "expect_exit_codes={0} if sys.stdin.isatty() else {2}" "expect_exit_codes={0}" - ''; + nativeBuildInputs = [ + setuptools-scm + ]; propagatedBuildInputs = [ pyyaml xmltodict + toml argcomplete ]; @@ -44,13 +46,8 @@ buildPythonPackage rec { pythonImportsCheck = [ "yq" ]; - doInstallCheck = true; - installCheckPhase = '' - echo '{"hello":{"foo":"bar"}}' | $out/bin/yq -y . | grep 'foo: bar' - ''; - meta = with lib; { - description = "Command-line YAML processor - jq wrapper for YAML documents"; + description = "Command-line YAML/XML/TOML processor - jq wrapper for YAML, XML, TOML documents"; homepage = "https://github.com/kislyuk/yq"; license = licenses.asl20; maintainers = with maintainers; [ womfoo SuperSandro2000 ]; diff --git a/pkgs/development/python-modules/zha-quirks/default.nix b/pkgs/development/python-modules/zha-quirks/default.nix index 56d2704fcc194..881523b14d256 100644 --- a/pkgs/development/python-modules/zha-quirks/default.nix +++ b/pkgs/development/python-modules/zha-quirks/default.nix @@ -9,13 +9,13 @@ buildPythonPackage rec { pname = "zha-quirks"; - version = "0.0.67"; + version = "0.0.69"; src = fetchFromGitHub { owner = "zigpy"; repo = "zha-device-handlers"; rev = version; - sha256 = "sha256-qkXXrwqMEtfafHsXtlyy6HFwuo/8sOZuQ9SvGRJkGtA="; + sha256 = "sha256-qPqgla+NFtZ85i+GB0lRRsoNImVghJsJfww7j8yQcFs="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/zigpy-cc/default.nix b/pkgs/development/python-modules/zigpy-cc/default.nix index 79b9d910053aa..376b74c266cb0 100644 --- a/pkgs/development/python-modules/zigpy-cc/default.nix +++ b/pkgs/development/python-modules/zigpy-cc/default.nix @@ -25,7 +25,6 @@ buildPythonPackage rec { }; propagatedBuildInputs = [ - pyserial pyserial-asyncio zigpy ]; @@ -36,6 +35,12 @@ buildPythonPackage rec { pytestCheckHook ]; + disabledTests = [ + "test_incoming_msg" + "test_incoming_msg2" + "test_deser" + ]; + meta = with lib; { description = "A library which communicates with Texas Instruments CC2531 radios for zigpy"; homepage = "https://github.com/zigpy/zigpy-cc"; diff --git a/pkgs/development/python-modules/zigpy/default.nix b/pkgs/development/python-modules/zigpy/default.nix index 20d5237f76e8b..0a152c3825a10 100644 --- a/pkgs/development/python-modules/zigpy/default.nix +++ b/pkgs/development/python-modules/zigpy/default.nix @@ -15,7 +15,7 @@ buildPythonPackage rec { pname = "zigpy"; - version = "0.43.0"; + version = "0.44.1"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -24,7 +24,7 @@ buildPythonPackage rec { owner = "zigpy"; repo = "zigpy"; rev = version; - sha256 = "1740cv99ny6xy7wfpz754h4wj2cm874b8vnddvff90ajk07qgdia"; + sha256 = "sha256-7X3uaxzvVMhSucCGA+rZsgt+fJSNjYQkJLpCGyHOIlc="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/tools/analysis/actionlint/default.nix b/pkgs/development/tools/analysis/actionlint/default.nix index 71a9a95d2fca8..6945ea8ca7086 100644 --- a/pkgs/development/tools/analysis/actionlint/default.nix +++ b/pkgs/development/tools/analysis/actionlint/default.nix @@ -10,7 +10,7 @@ buildGoModule rec { pname = "actionlint"; - version = "1.6.10"; + version = "1.6.11"; subPackages = [ "cmd/actionlint" ]; @@ -18,10 +18,10 @@ buildGoModule rec { owner = "rhysd"; repo = "actionlint"; rev = "v${version}"; - sha256 = "sha256-RFsNJiCeSAeEWOUnfBpeIZKoS2mlXazYMQd1M6yFLGU="; + sha256 = "sha256-BlJxgRDnAlfM/81qAEGEW09luScivYSDf5w2lR8hQUA="; }; - vendorSha256 = "sha256-CxNER8aQftMG14M+x6bPwcXgUZRkUDYZtFg1cPxxg+I="; + vendorSha256 = "sha256-nG0u5hZ/YRn+yUoEGTBo6ZdOp0e+sH6Jl9F+QhpfYAU="; nativeBuildInputs = [ makeWrapper ronn installShellFiles ]; diff --git a/pkgs/development/tools/analysis/flow/default.nix b/pkgs/development/tools/analysis/flow/default.nix index 2d97b64b11e80..d9d973d0ff50c 100644 --- a/pkgs/development/tools/analysis/flow/default.nix +++ b/pkgs/development/tools/analysis/flow/default.nix @@ -11,6 +11,8 @@ stdenv.mkDerivation rec { sha256 = "sha256-lfj6KyB9QYvUy4Ybo8f30omAg4K/jT5MEERJPm0aJ7U="; }; + makeFlags = [ "FLOW_RELEASE=1" ]; + installPhase = '' install -Dm755 bin/flow $out/bin/flow install -Dm644 resources/shell/bash-completion $out/share/bash-completion/completions/flow diff --git a/pkgs/development/tools/faas-cli/default.nix b/pkgs/development/tools/faas-cli/default.nix index 58e048b4f5fe3..8486014883649 100644 --- a/pkgs/development/tools/faas-cli/default.nix +++ b/pkgs/development/tools/faas-cli/default.nix @@ -9,13 +9,13 @@ let in buildGoModule rec { pname = "faas-cli"; - version = "0.14.3"; + version = "0.14.4"; src = fetchFromGitHub { owner = "openfaas"; repo = "faas-cli"; rev = version; - sha256 = "sha256-1aflQXfW/y31Dk0OZW77qNQKEwkhi6p8ZBfTUyRDbdo="; + sha256 = "sha256-hpQn1lEJP0FmU1jhmXDgV/11RbMdEqblLPIrTQLKLOc="; }; CGO_ENABLED = 0; @@ -35,6 +35,6 @@ buildGoModule rec { homepage = "https://github.com/openfaas/faas-cli"; description = "Official CLI for OpenFaaS "; license = licenses.mit; - maintainers = with maintainers; [ welteki ]; + maintainers = with maintainers; [ welteki techknowlogick ]; }; } diff --git a/pkgs/development/tools/go-task/default.nix b/pkgs/development/tools/go-task/default.nix index d6e5855d992c0..ff8a8174fd750 100644 --- a/pkgs/development/tools/go-task/default.nix +++ b/pkgs/development/tools/go-task/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "go-task"; - version = "3.11.0"; + version = "3.12.0"; src = fetchFromGitHub { owner = pname; repo = "task"; rev = "v${version}"; - sha256 = "sha256-KHeZ0UH7qa+fii+sT7q9ri3DpLOKqQZqCAKQYn4l5M8="; + sha256 = "sha256-FArt9w4nZJW/Kql3Y2rr/IVz+SnWCS2lzNMWF6TN0Bg="; }; - vendorSha256 = "sha256-u+LeH9GijquBeYlA3f2GcyoSP/S7BtBqb8C9OgEA9fY="; + vendorSha256 = "sha256-73DtLYyq3sltzv4VtZMlZaSbP9zA9RZw2wgXVkzwrso="; doCheck = false; diff --git a/pkgs/development/tools/kotlin-language-server/default.nix b/pkgs/development/tools/kotlin-language-server/default.nix index 144c159f36378..d48c5ace3e362 100644 --- a/pkgs/development/tools/kotlin-language-server/default.nix +++ b/pkgs/development/tools/kotlin-language-server/default.nix @@ -2,10 +2,10 @@ stdenv.mkDerivation rec { pname = "kotlin-language-server"; - version = "1.2.0"; + version = "1.3.0"; src = fetchurl { url = "https://github.com/fwcd/kotlin-language-server/releases/download/${version}/server.zip"; - sha256 = "sha256-GXr+sOGa09qeQrfaJYRPsoHULwfMst8tTr4y2cv752k="; + sha256 = "sha256-yyqI+87vtggSeAfb3OEftalknqbTDEQ5gTJwB/EMIlY="; }; dontBuild = true; diff --git a/pkgs/development/tools/kubectx/default.nix b/pkgs/development/tools/kubectx/default.nix index 8ddd7685dcfb9..1de22705ebdad 100644 --- a/pkgs/development/tools/kubectx/default.nix +++ b/pkgs/development/tools/kubectx/default.nix @@ -13,8 +13,6 @@ buildGoModule rec { vendorSha256 = "sha256-4sQaqC0BOsDfWH3cHy2EMQNMq6qiAcbV+RwxCdcSxsg="; - doCheck = false; - nativeBuildInputs = [ installShellFiles ]; postInstall = '' diff --git a/pkgs/development/tools/kustomize/default.nix b/pkgs/development/tools/kustomize/default.nix index 92cab080aa803..49bf3f35ad879 100644 --- a/pkgs/development/tools/kustomize/default.nix +++ b/pkgs/development/tools/kustomize/default.nix @@ -1,16 +1,14 @@ -{ lib, buildGoModule, fetchFromGitHub }: +{ lib, buildGoModule, fetchFromGitHub, installShellFiles }: buildGoModule rec { pname = "kustomize"; version = "4.5.4"; - # rev is the commit of the tag, mainly for kustomize version command output - rev = "cf3a452ddd6f83945d39d582243b8592ec627ae3"; ldflags = let t = "sigs.k8s.io/kustomize/api/provenance"; in [ "-s" "-X ${t}.version=${version}" - "-X ${t}.gitCommit=${rev}" + "-X ${t}.gitCommit=${src.rev}" ]; src = fetchFromGitHub { @@ -20,13 +18,20 @@ buildGoModule rec { sha256 = "sha256-7Ode+ONgWJRNSbIpvIjhuT+oVvZgJfByFqS/iSUhcXw="; }; - doCheck = true; - # avoid finding test and development commands - sourceRoot = "source/kustomize"; + modRoot = "kustomize"; vendorSha256 = "sha256-beIbeY/+k2NgotGw5zQFkYuqMKlwctoxuToZfiFlCm4="; + nativeBuildInputs = [ installShellFiles ]; + + postInstall = '' + installShellCompletion --cmd kustomize \ + --bash <($out/bin/kustomize completion bash) \ + --fish <($out/bin/kustomize completion fish) \ + --zsh <($out/bin/kustomize completion zsh) + ''; + meta = with lib; { description = "Customization of kubernetes YAML configurations"; longDescription = '' diff --git a/pkgs/development/tools/misc/saleae-logic-2/default.nix b/pkgs/development/tools/misc/saleae-logic-2/default.nix index 242d76174ce9d..3b9ae267d70a1 100644 --- a/pkgs/development/tools/misc/saleae-logic-2/default.nix +++ b/pkgs/development/tools/misc/saleae-logic-2/default.nix @@ -1,10 +1,10 @@ { lib, fetchurl, makeDesktopItem, appimageTools, gtk3 }: let name = "saleae-logic-2"; - version = "2.3.45"; + version = "2.3.47"; src = fetchurl { url = "https://downloads.saleae.com/logic2/Logic-${version}-master.AppImage"; - sha256 = "sha256-kX8jMCUkz7B0muxsEwEttEX+DA2P+6swdZJGHyo7ScA="; + sha256 = "sha256-6/FtdupveKnbAK6LizmJ6BokE0kXgUaMz0sOWi+Fq8k="; }; desktopItem = makeDesktopItem { inherit name; @@ -70,6 +70,6 @@ appimageTools.wrapType2 { description = "Software for Saleae logic analyzers"; license = licenses.unfree; platforms = [ "x86_64-linux" ]; - maintainers = [ maintainers.j-hui ]; + maintainers = with maintainers; [ j-hui newam ]; }; } diff --git a/pkgs/development/tools/ocaml/findlib/default.nix b/pkgs/development/tools/ocaml/findlib/default.nix index e7abf32eae5ff..44d9782f3ce51 100644 --- a/pkgs/development/tools/ocaml/findlib/default.nix +++ b/pkgs/development/tools/ocaml/findlib/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "ocaml-findlib"; - version = "1.9.1"; + version = "1.9.3"; src = fetchurl { url = "http://download.camlcity.org/download/findlib-${version}.tar.gz"; - sha256 = "sha256-K0K4vVRIjWTEvzy3BUtLN70wwdwSvUMeoeTXrYqYD+I="; + sha256 = "sha256:0hfcwamcvinmww59b5i4yxbf0kxyzkp5qv3d1c7ybn9q52vgq463"; }; nativeBuildInputs = [m4 ocaml]; diff --git a/pkgs/development/tools/ocaml/findlib/install_topfind.patch b/pkgs/development/tools/ocaml/findlib/install_topfind.patch index dbdb0edd6cb18..e961b3059065c 100644 --- a/pkgs/development/tools/ocaml/findlib/install_topfind.patch +++ b/pkgs/development/tools/ocaml/findlib/install_topfind.patch @@ -6,7 +6,7 @@ mkdir -p "$(prefix)$(OCAMLFIND_BIN)" - test $(INSTALL_TOPFIND) -eq 0 || cp topfind "$(prefix)$(OCAML_CORE_STDLIB)" + test $(INSTALL_TOPFIND) -eq 0 || cp topfind "$(prefix)$(OCAML_SITELIB)" - files=`$(SH) $(TOP)/tools/collect_files $(TOP)/Makefile.config findlib.cmi findlib.mli findlib.cma findlib.cmxa findlib$(LIB_SUFFIX) findlib.cmxs topfind.cmi topfind.mli fl_package_base.mli fl_package_base.cmi fl_metascanner.mli fl_metascanner.cmi fl_metatoken.cmi findlib_top.cma findlib_top.cmxa findlib_top$(LIB_SUFFIX) findlib_top.cmxs findlib_dynload.cma findlib_dynload.cmxa findlib_dynload$(LIB_SUFFIX) findlib_dynload.cmxs fl_dynload.mli fl_dynload.cmi META` && \ - cp $$files "$(prefix)$(OCAML_SITELIB)/$(NAME)" - f="ocamlfind$(EXEC_SUFFIX)"; { test -f ocamlfind_opt$(EXEC_SUFFIX) && f="ocamlfind_opt$(EXEC_SUFFIX)"; }; \ + files=`$(SH) $(TOP)/tools/collect_files $(TOP)/Makefile.config \ + findlib.cmi findlib.mli findlib.cma findlib.cmxa findlib$(LIB_SUFFIX) findlib.cmxs \ + findlib_config.cmi findlib_config.ml topfind.cmi topfind.mli \ diff --git a/pkgs/development/tools/rust/rust-analyzer/default.nix b/pkgs/development/tools/rust/rust-analyzer/default.nix index f155fdbaf7885..78ce0626ae5aa 100644 --- a/pkgs/development/tools/rust/rust-analyzer/default.nix +++ b/pkgs/development/tools/rust/rust-analyzer/default.nix @@ -11,14 +11,14 @@ rustPlatform.buildRustPackage rec { pname = "rust-analyzer-unwrapped"; - version = "2022-03-07"; - cargoSha256 = "sha256-geMzdo5frW5VkuTwBHKHXCTJZrHDUIRSTs2kkCfA5Vc="; + version = "2022-04-04"; + cargoSha256 = "sha256-5PA4EHCwuRO3uOK+Q+Lkp8Fs4MMlmOSOqdcEctkME4A="; src = fetchFromGitHub { owner = "rust-analyzer"; repo = "rust-analyzer"; rev = version; - sha256 = "sha256-/qKh4utesAjlyG8A3hEmSx+HBgh48Uje6ZRtUGz5f0g="; + sha256 = "sha256-ZzghqbLHMxAabG+RDu7Zniy8bJQMdtQVn3oLTnP3jLc="; }; patches = [ diff --git a/pkgs/development/tools/stagit/default.nix b/pkgs/development/tools/stagit/default.nix index 3b47823b9b439..7ac62a9e78526 100644 --- a/pkgs/development/tools/stagit/default.nix +++ b/pkgs/development/tools/stagit/default.nix @@ -2,12 +2,12 @@ stdenv.mkDerivation rec { pname = "stagit"; - version = "1.0"; + version = "1.1"; src = fetchgit { url = "git://git.codemadness.org/stagit"; rev = version; - sha256 = "sha256-4QSKW89RyK/PpGE+lOHFiMTI82pdspfObnzd0rcgQkg="; + sha256 = "sha256-wnXvK1OYd6FxJuZai5a0Mvz4gWpjlhLgGrcKlvn2lbs="; }; makeFlags = [ "PREFIX=$(out)" ]; diff --git a/pkgs/development/tools/vultr-cli/default.nix b/pkgs/development/tools/vultr-cli/default.nix index 6e839617034d3..6e80c62b78171 100644 --- a/pkgs/development/tools/vultr-cli/default.nix +++ b/pkgs/development/tools/vultr-cli/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "vultr-cli"; - version = "2.12.1"; + version = "2.12.2"; src = fetchFromGitHub { owner = "vultr"; repo = pname; rev = "v${version}"; - sha256 = "sha256-jcZiCZn6AbrjEhMkJQloLhZmfnxqlZxu5TXqH+dDN0s="; + sha256 = "sha256-ylSzPfBTIFZXLLxj/LHkzTNqpDZvT43UKIiG4y/aQJQ="; }; vendorSha256 = null; diff --git a/pkgs/os-specific/linux/wireguard/default.nix b/pkgs/os-specific/linux/wireguard/default.nix index 32389d27369c4..f10a447107277 100644 --- a/pkgs/os-specific/linux/wireguard/default.nix +++ b/pkgs/os-specific/linux/wireguard/default.nix @@ -7,11 +7,11 @@ assert lib.versionOlder kernel.version "5.6"; stdenv.mkDerivation rec { pname = "wireguard"; - version = "1.0.20210606"; + version = "1.0.20211208"; src = fetchzip { url = "https://git.zx2c4.com/wireguard-linux-compat/snapshot/wireguard-linux-compat-${version}.tar.xz"; - sha256 = "sha256-ha7x6+41oPRRhuRwEb1ojRWLF1dlEMoJtqXrzRKQ408="; + sha256 = "sha256-MHC4ojhRD8IGwTUE8oEew8IVof9hQCC7CPgVQIBfBRQ="; }; hardeningDisable = [ "pic" ]; diff --git a/pkgs/servers/hasura/cli.nix b/pkgs/servers/hasura/cli.nix index a19a2773ce96d..48bcfe39eabd0 100644 --- a/pkgs/servers/hasura/cli.nix +++ b/pkgs/servers/hasura/cli.nix @@ -9,7 +9,7 @@ buildGoModule rec { subPackages = [ "cmd/hasura" ]; - vendorSha256 = "0c0zn3a3bq3g13zj1b7hz1gfd9mcc5wlch80vjgp31vgm23vvd8d"; + vendorSha256 = "0rjh4rs92jj56il3hg8msjz0w0iv25lydnh9v1kxmvdzy1x75b2b"; doCheck = false; diff --git a/pkgs/servers/home-assistant/component-packages.nix b/pkgs/servers/home-assistant/component-packages.nix index 822bfcbe59367..d28507247eec5 100644 --- a/pkgs/servers/home-assistant/component-packages.nix +++ b/pkgs/servers/home-assistant/component-packages.nix @@ -2,7 +2,7 @@ # Do not edit! { - version = "2022.3.8"; + version = "2022.4.0"; components = { "abode" = ps: with ps; [ abodepy ]; "accuweather" = ps: with ps; [ accuweather ]; @@ -22,6 +22,7 @@ "airthings" = ps: with ps; [ airthings-cloud ]; "airtouch4" = ps: with ps; [ airtouch4pyapi ]; "airvisual" = ps: with ps; [ pyairvisual ]; + "airzone" = ps: with ps; [ aioairzone ]; "aladdin_connect" = ps: with ps; [ aladdin-connect ]; "alarm_control_panel" = ps: with ps; [ ]; "alarmdecoder" = ps: with ps; [ adext ]; @@ -36,7 +37,7 @@ "ambient_station" = ps: with ps; [ aioambient ]; "amcrest" = ps: with ps; [ amcrest ha-ffmpeg ]; "ampio" = ps: with ps; [ asmog ]; - "analytics" = ps: with ps; [ aiohttp-cors sqlalchemy ]; + "analytics" = ps: with ps; [ aiohttp-cors fnvhash lru-dict sqlalchemy ]; "android_ip_webcam" = ps: with ps; [ pydroid-ipcam ]; "androidtv" = ps: with ps; [ adb-shell androidtv pure-python-adb ]; "anel_pwrctrl" = ps: with ps; [ ]; # missing inputs: anel_pwrctrl-homeassistant @@ -76,13 +77,12 @@ "azure_devops" = ps: with ps; [ aioazuredevops ]; "azure_event_hub" = ps: with ps; [ azure-eventhub ]; "azure_service_bus" = ps: with ps; [ azure-servicebus ]; + "backup" = ps: with ps; [ aiohttp-cors ]; # missing inputs: securetar "baidu" = ps: with ps; [ ]; # missing inputs: baidu-aip "balboa" = ps: with ps; [ pybalboa ]; "bayesian" = ps: with ps; [ ]; - "bbb_gpio" = ps: with ps; [ ]; # missing inputs: Adafruit_BBIO "bbox" = ps: with ps; [ ]; # missing inputs: pybbox "beewi_smartclim" = ps: with ps; [ ]; # missing inputs: beewi_smartclim - "bh1750" = ps: with ps; [ i2csense smbus-cffi ]; "binary_sensor" = ps: with ps; [ ]; "bitcoin" = ps: with ps; [ blockchain ]; "bizkaibus" = ps: with ps; [ bizkaibus ]; @@ -90,16 +90,12 @@ "blebox" = ps: with ps; [ blebox-uniapi ]; "blink" = ps: with ps; [ blinkpy ]; "blinksticklight" = ps: with ps; [ BlinkStick ]; - "blinkt" = ps: with ps; [ ]; # missing inputs: blinkt "blockchain" = ps: with ps; [ ]; # missing inputs: python-blockchain-api "bloomsky" = ps: with ps; [ ]; "blueprint" = ps: with ps; [ ]; "bluesound" = ps: with ps; [ xmltodict ]; "bluetooth_le_tracker" = ps: with ps; [ pygatt ]; "bluetooth_tracker" = ps: with ps; [ bt-proximity pybluez ]; - "bme280" = ps: with ps; [ bme280spi i2csense smbus-cffi ]; - "bme680" = ps: with ps; [ bme680 smbus-cffi ]; - "bmp280" = ps: with ps; [ ]; # missing inputs: RPi.GPIO adafruit-circuitpython-bmp280 "bmw_connected_drive" = ps: with ps; [ bimmer-connected ]; "bond" = ps: with ps; [ bond-api ]; "bosch_shc" = ps: with ps; [ aiohttp-cors boschshcpy ifaddr zeroconf ]; @@ -130,7 +126,7 @@ "clickatell" = ps: with ps; [ ]; "clicksend" = ps: with ps; [ ]; "clicksend_tts" = ps: with ps; [ ]; - "climacell" = ps: with ps; [ pyclimacell ]; + "climacell" = ps: with ps; [ pyclimacell ]; # missing inputs: pytomorrowio "climate" = ps: with ps; [ ]; "cloud" = ps: with ps; [ pyturbojpeg aiohttp-cors hass-nabucasa ]; "cloudflare" = ps: with ps; [ pycfdns ]; @@ -165,10 +161,10 @@ "deconz" = ps: with ps; [ pydeconz ]; "decora" = ps: with ps; [ bluepy ]; # missing inputs: decora "decora_wifi" = ps: with ps; [ ]; # missing inputs: decora_wifi - "default_config" = ps: with ps; [ pynacl pyturbojpeg aiodiscover aiohttp-cors async-upnp-client hass-nabucasa home-assistant-frontend ifaddr pillow pyserial pyudev scapy sqlalchemy zeroconf ]; + "default_config" = ps: with ps; [ pynacl pyturbojpeg aiodiscover aiohttp-cors async-upnp-client fnvhash hass-nabucasa home-assistant-frontend ifaddr lru-dict pillow pyserial pyudev scapy sqlalchemy zeroconf ]; "delijn" = ps: with ps; [ pydelijn ]; "deluge" = ps: with ps; [ deluge-client ]; - "demo" = ps: with ps; [ aiohttp-cors sqlalchemy ]; + "demo" = ps: with ps; [ aiohttp-cors fnvhash lru-dict sqlalchemy ]; "denon" = ps: with ps; [ ]; "denonavr" = ps: with ps; [ denonavr ]; "derivative" = ps: with ps; [ ]; @@ -180,7 +176,6 @@ "devolo_home_network" = ps: with ps; [ devolo-plc-api ]; "dexcom" = ps: with ps; [ pydexcom ]; "dhcp" = ps: with ps; [ aiodiscover scapy ]; - "dht" = ps: with ps; [ ]; # missing inputs: RPi.GPIO adafruit-circuitpython-dht "diagnostics" = ps: with ps; [ aiohttp-cors ]; "dialogflow" = ps: with ps; [ aiohttp-cors ]; "digital_ocean" = ps: with ps; [ digital-ocean ]; @@ -234,13 +229,12 @@ "emulated_hue" = ps: with ps; [ aiohttp-cors ifaddr ]; "emulated_kasa" = ps: with ps; [ sense-energy ]; "emulated_roku" = ps: with ps; [ aiohttp-cors emulated-roku ifaddr ]; - "energy" = ps: with ps; [ aiohttp-cors sqlalchemy ]; + "energy" = ps: with ps; [ aiohttp-cors fnvhash lru-dict sqlalchemy ]; "enigma2" = ps: with ps; [ openwebifpy ]; "enocean" = ps: with ps; [ enocean ]; "enphase_envoy" = ps: with ps; [ envoy-reader ]; "entur_public_transport" = ps: with ps; [ enturclient ]; "environment_canada" = ps: with ps; [ env-canada ]; - "envirophat" = ps: with ps; [ smbus-cffi ]; # missing inputs: envirophat "envisalink" = ps: with ps; [ pyenvisalink ]; "ephember" = ps: with ps; [ pyephember ]; "epson" = ps: with ps; [ epson-projector ]; @@ -268,7 +262,7 @@ "fido" = ps: with ps; [ pyfido ]; "file" = ps: with ps; [ ]; "filesize" = ps: with ps; [ ]; - "filter" = ps: with ps; [ sqlalchemy ]; + "filter" = ps: with ps; [ fnvhash lru-dict sqlalchemy ]; "fints" = ps: with ps; [ fints ]; "fireservicerota" = ps: with ps; [ pyfireservicerota ]; "firmata" = ps: with ps; [ pymata-express ]; @@ -303,18 +297,18 @@ "fritzbox" = ps: with ps; [ pyfritzhome ]; "fritzbox_callmonitor" = ps: with ps; [ fritzconnection ]; "fronius" = ps: with ps; [ pyfronius ]; - "frontend" = ps: with ps; [ aiohttp-cors home-assistant-frontend pillow sqlalchemy ]; + "frontend" = ps: with ps; [ aiohttp-cors fnvhash home-assistant-frontend lru-dict pillow sqlalchemy ]; "frontier_silicon" = ps: with ps; [ afsapi ]; "futurenow" = ps: with ps; [ pyfnip ]; "garadget" = ps: with ps; [ ]; "garages_amsterdam" = ps: with ps; [ garages-amsterdam ]; "gc100" = ps: with ps; [ ]; # missing inputs: python-gc100 "gdacs" = ps: with ps; [ aio-georss-gdacs ]; - "generic" = ps: with ps; [ ]; + "generic" = ps: with ps; [ av pillow ]; "generic_hygrostat" = ps: with ps; [ ]; - "generic_thermostat" = ps: with ps; [ sqlalchemy ]; + "generic_thermostat" = ps: with ps; [ fnvhash lru-dict sqlalchemy ]; "geniushub" = ps: with ps; [ geniushub-client ]; - "geo_json_events" = ps: with ps; [ geojson-client ]; + "geo_json_events" = ps: with ps; [ ]; # missing inputs: aio_geojson_generic_client "geo_location" = ps: with ps; [ ]; "geo_rss_events" = ps: with ps; [ georss-generic-client ]; "geofency" = ps: with ps; [ aiohttp-cors ]; @@ -329,7 +323,7 @@ "goalzero" = ps: with ps; [ goalzero ]; "gogogate2" = ps: with ps; [ ismartgate ]; "goodwe" = ps: with ps; [ goodwe ]; - "google" = ps: with ps; [ google-api-python-client httplib2 oauth2client ]; + "google" = ps: with ps; [ aiohttp-cors google-api-python-client httplib2 oauth2client ]; "google_assistant" = ps: with ps; [ pyturbojpeg aiohttp-cors ]; "google_cloud" = ps: with ps; [ google-cloud-texttospeech ]; "google_domains" = ps: with ps; [ ]; @@ -353,7 +347,7 @@ "hangouts" = ps: with ps; [ hangups ]; "harman_kardon_avr" = ps: with ps; [ ]; # missing inputs: hkavr "harmony" = ps: with ps; [ aioharmony ]; - "hassio" = ps: with ps; [ aiohttp-cors home-assistant-frontend pillow sqlalchemy ]; + "hassio" = ps: with ps; [ aiohttp-cors fnvhash home-assistant-frontend lru-dict pillow sqlalchemy ]; "haveibeenpwned" = ps: with ps; [ ]; "hddtemp" = ps: with ps; [ ]; "hdmi_cec" = ps: with ps; [ pycec ]; @@ -363,8 +357,8 @@ "hikvision" = ps: with ps; [ ]; # missing inputs: pyhik "hikvisioncam" = ps: with ps; [ hikvision ]; "hisense_aehw4a1" = ps: with ps; [ pyaehw4a1 ]; - "history" = ps: with ps; [ aiohttp-cors sqlalchemy ]; - "history_stats" = ps: with ps; [ sqlalchemy ]; + "history" = ps: with ps; [ aiohttp-cors fnvhash lru-dict sqlalchemy ]; + "history_stats" = ps: with ps; [ fnvhash lru-dict sqlalchemy ]; "hitron_coda" = ps: with ps; [ ]; "hive" = ps: with ps; [ pyhiveapi ]; "hlk_sw16" = ps: with ps; [ hlk-sw16 ]; @@ -382,7 +376,6 @@ "hp_ilo" = ps: with ps; [ python-hpilo ]; "html5" = ps: with ps; [ aiohttp-cors pywebpush ]; "http" = ps: with ps; [ aiohttp-cors ]; - "htu21d" = ps: with ps; [ i2csense smbus-cffi ]; "huawei_lte" = ps: with ps; [ huawei-lte-api stringcase url-normalize ]; "hue" = ps: with ps; [ aiohue ]; "huisbaasje" = ps: with ps; [ huisbaasje-client ]; @@ -436,6 +429,7 @@ "joaoapps_join" = ps: with ps; [ ]; # missing inputs: python-join-api "juicenet" = ps: with ps; [ python-juicenet ]; "kaiterra" = ps: with ps; [ ]; # missing inputs: kaiterra-async-client + "kaleidescape" = ps: with ps; [ ]; # missing inputs: pykaleidescape "kankun" = ps: with ps; [ ]; "keba" = ps: with ps; [ ]; # missing inputs: keba-kecontact "keenetic_ndms2" = ps: with ps; [ ndms2-client ]; @@ -477,7 +471,7 @@ "local_ip" = ps: with ps; [ aiohttp-cors ifaddr ]; "locative" = ps: with ps; [ aiohttp-cors ]; "lock" = ps: with ps; [ ]; - "logbook" = ps: with ps; [ aiohttp-cors home-assistant-frontend pillow sqlalchemy ]; + "logbook" = ps: with ps; [ aiohttp-cors fnvhash home-assistant-frontend lru-dict pillow sqlalchemy ]; "logentries" = ps: with ps; [ ]; "logger" = ps: with ps; [ ]; "logi_circle" = ps: with ps; [ aiohttp-cors ha-ffmpeg ]; # missing inputs: logi_circle @@ -497,13 +491,12 @@ "mailgun" = ps: with ps; [ aiohttp-cors ]; # missing inputs: pymailgunner "manual" = ps: with ps; [ ]; "manual_mqtt" = ps: with ps; [ aiohttp-cors paho-mqtt ]; - "map" = ps: with ps; [ aiohttp-cors home-assistant-frontend pillow sqlalchemy ]; + "map" = ps: with ps; [ aiohttp-cors fnvhash home-assistant-frontend lru-dict pillow sqlalchemy ]; "marytts" = ps: with ps; [ ]; # missing inputs: speak2mary "mastodon" = ps: with ps; [ mastodon-py ]; "matrix" = ps: with ps; [ matrix-client ]; "maxcube" = ps: with ps; [ maxcube-api ]; "mazda" = ps: with ps; [ pymazda ]; - "mcp23017" = ps: with ps; [ ]; # missing inputs: RPi.GPIO adafruit-circuitpython-mcp230xx "media_extractor" = ps: with ps; [ aiohttp-cors youtube-dl-light ]; "media_player" = ps: with ps; [ aiohttp-cors ]; "media_source" = ps: with ps; [ aiohttp-cors ]; @@ -519,7 +512,6 @@ "meteoclimatic" = ps: with ps; [ pymeteoclimatic ]; "metoffice" = ps: with ps; [ ]; # missing inputs: datapoint "mfi" = ps: with ps; [ ]; # missing inputs: mficlient - "mhz19" = ps: with ps; [ pmsensor ]; "microsoft" = ps: with ps; [ ]; # missing inputs: pycsspeechtts "microsoft_face" = ps: with ps; [ pyturbojpeg aiohttp-cors ]; "microsoft_face_detect" = ps: with ps; [ pyturbojpeg aiohttp-cors ]; @@ -543,7 +535,6 @@ "moon" = ps: with ps; [ ]; "motion_blinds" = ps: with ps; [ aiohttp-cors ifaddr motionblinds ]; "motioneye" = ps: with ps; [ aiohttp-cors motioneye-client ]; - "mpchc" = ps: with ps; [ ]; "mpd" = ps: with ps; [ mpd2 ]; "mqtt" = ps: with ps; [ aiohttp-cors paho-mqtt ]; "mqtt_eventstream" = ps: with ps; [ aiohttp-cors paho-mqtt ]; @@ -554,7 +545,7 @@ "mullvad" = ps: with ps; [ mullvad-api ]; "mutesync" = ps: with ps; [ mutesync ]; "mvglive" = ps: with ps; [ PyMVGLive ]; - "my" = ps: with ps; [ aiohttp-cors home-assistant-frontend pillow sqlalchemy ]; + "my" = ps: with ps; [ aiohttp-cors fnvhash home-assistant-frontend lru-dict pillow sqlalchemy ]; "mycroft" = ps: with ps; [ ]; # missing inputs: mycroftapi "myq" = ps: with ps; [ pymyq ]; "mysensors" = ps: with ps; [ aiohttp-cors paho-mqtt pymysensors ]; @@ -609,7 +600,7 @@ "ohmconnect" = ps: with ps; [ defusedxml ]; "ombi" = ps: with ps; [ pyombi ]; "omnilogic" = ps: with ps; [ omnilogic ]; - "onboarding" = ps: with ps; [ aiohttp-cors home-assistant-frontend pillow sqlalchemy ]; + "onboarding" = ps: with ps; [ aiohttp-cors fnvhash home-assistant-frontend lru-dict pillow sqlalchemy ]; "oncue" = ps: with ps; [ aiooncue ]; "ondilo_ico" = ps: with ps; [ aiohttp-cors ondilo ]; "onewire" = ps: with ps; [ pi1wire pyownet ]; @@ -632,7 +623,6 @@ "openweathermap" = ps: with ps; [ pyowm ]; "opnsense" = ps: with ps; [ pyopnsense ]; "opple" = ps: with ps; [ ]; # missing inputs: pyoppleio - "orangepi_gpio" = ps: with ps; [ ]; # missing inputs: OPi.GPIO "oru" = ps: with ps; [ ]; # missing inputs: oru "orvibo" = ps: with ps; [ orvibo ]; "osramlightify" = ps: with ps; [ ]; # missing inputs: lightify @@ -640,29 +630,26 @@ "overkiz" = ps: with ps; [ pyoverkiz ]; "ovo_energy" = ps: with ps; [ ovoenergy ]; "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; [ 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 ]; - "panel_iframe" = ps: with ps; [ aiohttp-cors home-assistant-frontend pillow sqlalchemy ]; - "pcal9535a" = ps: with ps; [ ]; # missing inputs: pcal9535a + "panel_custom" = ps: with ps; [ aiohttp-cors fnvhash home-assistant-frontend lru-dict pillow sqlalchemy ]; + "panel_iframe" = ps: with ps; [ aiohttp-cors fnvhash home-assistant-frontend lru-dict pillow sqlalchemy ]; + "peco" = ps: with ps; [ ]; # missing inputs: peco "pencom" = ps: with ps; [ ]; # missing inputs: pencompy "persistent_notification" = ps: with ps; [ ]; "person" = ps: with ps; [ aiohttp-cors pillow ]; "philips_js" = ps: with ps; [ ha-philipsjs ]; - "pi4ioe5v9xxxx" = ps: with ps; [ ]; # missing inputs: pi4ioe5v9xxxx "pi_hole" = ps: with ps; [ hole ]; "picnic" = ps: with ps; [ python-picnic-api ]; "picotts" = ps: with ps; [ ]; - "piglow" = ps: with ps; [ ]; # missing inputs: piglow "pilight" = ps: with ps; [ ]; # missing inputs: pilight "ping" = ps: with ps; [ icmplib ]; "pioneer" = ps: with ps; [ ]; "pjlink" = ps: with ps; [ ]; # missing inputs: pypjlink2 "plaato" = ps: with ps; [ pyturbojpeg aiohttp-cors hass-nabucasa pyplaato ]; - "plant" = ps: with ps; [ sqlalchemy ]; + "plant" = ps: with ps; [ fnvhash lru-dict sqlalchemy ]; "plex" = ps: with ps; [ aiohttp-cors plexapi plexauth plexwebsocket ]; "plugwise" = ps: with ps; [ plugwise ]; "plum_lightpad" = ps: with ps; [ ]; # missing inputs: plumlightpad @@ -706,11 +693,10 @@ "rainforest_eagle" = ps: with ps; [ aioeagle ueagle ]; "rainmachine" = ps: with ps; [ regenmaschine ]; "random" = ps: with ps; [ ]; - "raspihats" = ps: with ps; [ smbus-cffi ]; # missing inputs: raspihats "raspyrfm" = ps: with ps; [ ]; # missing inputs: raspyrfm-client "rdw" = ps: with ps; [ vehicle ]; "recollect_waste" = ps: with ps; [ aiorecollect ]; - "recorder" = ps: with ps; [ sqlalchemy ]; + "recorder" = ps: with ps; [ fnvhash lru-dict sqlalchemy ]; "recswitch" = ps: with ps; [ ]; # missing inputs: pyrecswitch "reddit" = ps: with ps; [ praw ]; "rejseplanen" = ps: with ps; [ ]; # missing inputs: rjpl @@ -737,10 +723,7 @@ "rova" = ps: with ps; [ ]; # missing inputs: rova "rpi_camera" = ps: with ps; [ ]; "rpi_gpio" = ps: with ps; [ ]; # missing inputs: RPi.GPIO - "rpi_gpio_pwm" = ps: with ps; [ ]; # missing inputs: pwmled - "rpi_pfio" = ps: with ps; [ ]; # missing inputs: pifacecommon pifacedigitalio "rpi_power" = ps: with ps; [ rpi-bad-power ]; - "rpi_rf" = ps: with ps; [ ]; # missing inputs: RPi.GPIO rpi-rf "rss_feed_template" = ps: with ps; [ aiohttp-cors ]; "rtorrent" = ps: with ps; [ ]; "rtsp_to_webrtc" = ps: with ps; [ pyturbojpeg aiohttp-cors rtsp-to-webrtc ]; @@ -748,9 +731,9 @@ "russound_rio" = ps: with ps; [ ]; # missing inputs: russound_rio "russound_rnet" = ps: with ps; [ ]; # missing inputs: russound "sabnzbd" = ps: with ps; [ aiohttp-cors ifaddr netdisco zeroconf ]; # missing inputs: pysabnzbd - "safe_mode" = ps: with ps; [ pyturbojpeg aiohttp-cors hass-nabucasa home-assistant-frontend pillow sqlalchemy ]; + "safe_mode" = ps: with ps; [ pyturbojpeg aiohttp-cors fnvhash hass-nabucasa home-assistant-frontend lru-dict pillow sqlalchemy ]; "saj" = ps: with ps; [ ]; # missing inputs: pysaj - "samsungtv" = ps: with ps; [ getmac samsungctl samsungtvws wakeonlan ]; + "samsungtv" = ps: with ps; [ aiohttp-cors async-upnp-client getmac ifaddr samsungctl samsungtvws wakeonlan zeroconf ]; "satel_integra" = ps: with ps; [ ]; # missing inputs: satel_integra "scene" = ps: with ps; [ ]; "schluter" = ps: with ps; [ ]; # missing inputs: py-schluter @@ -763,23 +746,21 @@ "select" = ps: with ps; [ ]; "sendgrid" = ps: with ps; [ sendgrid ]; "sense" = ps: with ps; [ sense-energy ]; - "sensehat" = ps: with ps; [ ]; # missing inputs: sense-hat "senseme" = ps: with ps; [ aiosenseme ]; "sensibo" = ps: with ps; [ ]; # missing inputs: pysensibo - "sensor" = ps: with ps; [ sqlalchemy ]; + "sensor" = ps: with ps; [ fnvhash lru-dict sqlalchemy ]; "sentry" = ps: with ps; [ sentry-sdk ]; "serial" = ps: with ps; [ pyserial-asyncio ]; "serial_pm" = ps: with ps; [ pmsensor ]; "sesame" = ps: with ps; [ ]; # missing inputs: pysesame2 "seven_segments" = ps: with ps; [ pillow ]; "seventeentrack" = ps: with ps; [ py17track ]; - "sharkiq" = ps: with ps; [ sharkiqpy ]; + "sharkiq" = ps: with ps; [ ]; # missing inputs: sharkiq "shell_command" = ps: with ps; [ ]; "shelly" = ps: with ps; [ aioshelly ]; "shiftr" = ps: with ps; [ paho-mqtt ]; "shodan" = ps: with ps; [ shodan ]; "shopping_list" = ps: with ps; [ aiohttp-cors ]; - "sht31" = ps: with ps; [ ]; # missing inputs: Adafruit-GPIO Adafruit-SHT31 "sia" = ps: with ps; [ pysiaalarm ]; "sigfox" = ps: with ps; [ ]; "sighthound" = ps: with ps; [ pillow simplehound ]; @@ -799,7 +780,6 @@ "sma" = ps: with ps; [ pysma ]; "smappee" = ps: with ps; [ aiohttp-cors pysmappee ]; "smart_meter_texas" = ps: with ps; [ smart-meter-texas ]; - "smarthab" = ps: with ps; [ smarthab ]; "smartthings" = ps: with ps; [ pyturbojpeg aiohttp-cors hass-nabucasa pysmartapp pysmartthings ]; "smarttub" = ps: with ps; [ python-smarttub ]; "smarty" = ps: with ps; [ ]; # missing inputs: pysmarty @@ -809,7 +789,6 @@ "snapcast" = ps: with ps; [ snapcast ]; "snips" = ps: with ps; [ aiohttp-cors paho-mqtt ]; "snmp" = ps: with ps; [ pysnmp ]; - "sochain" = ps: with ps; [ ]; # missing inputs: python-sochain-api "solaredge" = ps: with ps; [ solaredge stringcase ]; "solaredge_local" = ps: with ps; [ ]; # missing inputs: solaredge-local "solarlog" = ps: with ps; [ sunwatcher ]; @@ -835,7 +814,7 @@ "starline" = ps: with ps; [ starline ]; "starlingbank" = ps: with ps; [ ]; # missing inputs: starlingbank "startca" = ps: with ps; [ xmltodict ]; - "statistics" = ps: with ps; [ sqlalchemy ]; + "statistics" = ps: with ps; [ fnvhash lru-dict sqlalchemy ]; "statsd" = ps: with ps; [ statsd ]; "steam_online" = ps: with ps; [ ]; # missing inputs: steamodd "steamist" = ps: with ps; [ aiohttp-cors aiosteamist discovery30303 ifaddr ]; @@ -854,6 +833,7 @@ "swiss_public_transport" = ps: with ps; [ python-opendata-transport ]; "swisscom" = ps: with ps; [ ]; "switch" = ps: with ps; [ ]; + "switch_as_x" = ps: with ps; [ ]; "switchbot" = ps: with ps; [ pyswitchbot ]; "switcher_kis" = ps: with ps; [ aioswitcher ]; "switchmate" = ps: with ps; [ ]; # missing inputs: pySwitchmate @@ -893,7 +873,7 @@ "thinkingcleaner" = ps: with ps; [ ]; # missing inputs: pythinkingcleaner "thomson" = ps: with ps; [ ]; "threshold" = ps: with ps; [ ]; - "tibber" = ps: with ps; [ pytibber sqlalchemy ]; + "tibber" = ps: with ps; [ fnvhash lru-dict pytibber sqlalchemy ]; "tikteck" = ps: with ps; [ ]; # missing inputs: tikteck "tile" = ps: with ps; [ pytile ]; "time_date" = ps: with ps; [ ]; @@ -901,9 +881,9 @@ "tmb" = ps: with ps; [ tmb ]; "tod" = ps: with ps; [ ]; "todoist" = ps: with ps; [ todoist ]; - "tof" = ps: with ps; [ ]; # missing inputs: RPi.GPIO VL53L1X2 "tolo" = ps: with ps; [ tololib ]; "tomato" = ps: with ps; [ ]; + "tomorrowio" = ps: with ps; [ ]; # missing inputs: pytomorrowio "toon" = ps: with ps; [ pyturbojpeg aiohttp-cors hass-nabucasa toonapi ]; "torque" = ps: with ps; [ aiohttp-cors ]; "totalconnect" = ps: with ps; [ total-connect-client ]; @@ -940,6 +920,7 @@ "upb" = ps: with ps; [ upb-lib ]; "upc_connect" = ps: with ps; [ connect-box ]; "upcloud" = ps: with ps; [ upcloud-api ]; + "update" = ps: with ps; [ ]; "updater" = ps: with ps; [ ]; "upnp" = ps: with ps; [ aiohttp-cors async-upnp-client ifaddr zeroconf ]; "uptime" = ps: with ps; [ ]; @@ -971,6 +952,7 @@ "volkszaehler" = ps: with ps; [ volkszaehler ]; "volumio" = ps: with ps; [ pyvolumio ]; "volvooncall" = ps: with ps; [ volvooncall ]; + "vulcan" = ps: with ps; [ vulcan-api ]; "vultr" = ps: with ps; [ vultr ]; "w800rf32" = ps: with ps; [ ]; # missing inputs: pyW800rf32 "wake_on_lan" = ps: with ps; [ wakeonlan ]; @@ -984,7 +966,7 @@ "waze_travel_time" = ps: with ps; [ wazeroutecalculator ]; "weather" = ps: with ps; [ ]; "webhook" = ps: with ps; [ aiohttp-cors ]; - "webostv" = ps: with ps; [ aiowebostv sqlalchemy ]; + "webostv" = ps: with ps; [ aiowebostv ]; "websocket_api" = ps: with ps; [ aiohttp-cors ]; "wemo" = ps: with ps; [ pywemo ]; "whirlpool" = ps: with ps; [ whirlpool-sixth-sense ]; @@ -1022,7 +1004,7 @@ "youless" = ps: with ps; [ youless-api ]; "zabbix" = ps: with ps; [ py-zabbix ]; "zamg" = ps: with ps; [ ]; - "zengge" = ps: with ps; [ ]; # missing inputs: zengge + "zengge" = ps: with ps; [ bluepy ]; # missing inputs: zengge "zeroconf" = ps: with ps; [ aiohttp-cors ifaddr zeroconf ]; "zerproc" = ps: with ps; [ pyzerproc ]; "zestimate" = ps: with ps; [ xmltodict ]; @@ -1032,7 +1014,6 @@ "zodiac" = ps: with ps; [ ]; "zone" = ps: with ps; [ ]; "zoneminder" = ps: with ps; [ zm-py ]; - "zwave" = ps: with ps; [ homeassistant-pyozw pydispatcher ]; "zwave_js" = ps: with ps; [ aiohttp-cors pyserial pyudev zwave-js-server-python ]; "zwave_me" = ps: with ps; [ aiohttp-cors ifaddr url-normalize zeroconf ]; # missing inputs: zwave_me_ws }; @@ -1052,6 +1033,7 @@ "airthings" "airtouch4" "airvisual" + "airzone" "alarm_control_panel" "alarmdecoder" "alert" @@ -1107,7 +1089,6 @@ "canary" "cast" "cert_expiry" - "climacell" "climate" "cloud" "cloudflare" @@ -1132,6 +1113,7 @@ "debugpy" "deconz" "default_config" + "deluge" "demo" "denonavr" "derivative" @@ -1145,6 +1127,7 @@ "diagnostics" "dialogflow" "directv" + "discord" "discovery" "dlna_dmr" "dlna_dms" @@ -1182,6 +1165,7 @@ "fan" "feedreader" "ffmpeg" + "fibaro" "fido" "file" "filesize" @@ -1215,7 +1199,6 @@ "generic" "generic_hygrostat" "generic_thermostat" - "geo_json_events" "geo_location" "geo_rss_events" "geofency" @@ -1339,7 +1322,6 @@ "met" "met_eireann" "meteoclimatic" - "mhz19" "microsoft_face" "microsoft_face_detect" "microsoft_face_identify" @@ -1409,7 +1391,6 @@ "overkiz" "ovo_energy" "owntracks" - "ozw" "p1_monitor" "panel_custom" "panel_iframe" @@ -1478,7 +1459,6 @@ "sensor" "sentry" "seventeentrack" - "sharkiq" "shell_command" "shelly" "shopping_list" @@ -1494,7 +1474,6 @@ "sma" "smappee" "smart_meter_texas" - "smarthab" "smartthings" "smarttub" "smhi" @@ -1530,6 +1509,7 @@ "sun" "surepetcare" "switch" + "switch_as_x" "switchbot" "switcher_kis" "syncthing" @@ -1541,9 +1521,11 @@ "tado" "tag" "tailscale" + "tankerkoenig" "tasmota" "tcp" "telegram" + "telegram_bot" "tellduslive" "template" "tesla_wall_connector" @@ -1553,6 +1535,7 @@ "time_date" "timer" "tod" + "todoist" "tolo" "tomato" "toon" @@ -1562,6 +1545,7 @@ "trace" "tractive" "tradfri" + "trafikverket_train" "trafikverket_weatherstation" "transmission" "transport_nsw" @@ -1578,6 +1562,7 @@ "universal" "upb" "upcloud" + "update" "updater" "upnp" "uptime" @@ -1599,6 +1584,7 @@ "vlc_telnet" "voicerss" "volumio" + "vulcan" "vultr" "wake_on_lan" "wallbox" @@ -1635,7 +1621,6 @@ "zha" "zodiac" "zone" - "zwave" "zwave_js" ]; } diff --git a/pkgs/servers/home-assistant/default.nix b/pkgs/servers/home-assistant/default.nix index 32273d35e7a76..ded617b35f6cf 100644 --- a/pkgs/servers/home-assistant/default.nix +++ b/pkgs/servers/home-assistant/default.nix @@ -59,17 +59,18 @@ let }) (self: super: { - hatasmota = super.hatasmota.overridePythonAttrs (oldAttrs: { - version = "0.3.1"; + aioairzone = super.aioairzone.overridePythonAttrs (oldAttrs: rec { + version = "0.2.3"; src = fetchFromGitHub { - owner = "emontnemery"; - repo = "hatasmota"; - rev = "0.3.1"; - sha256 = "sha256-/am6cRhAdiqMq0u7Ed4qhIA+Em2O0gIt7HfP19+2XHw="; + owner = "Noltari"; + repo = "aioairzone"; + rev = version; + hash = "sha256-vy6NqtlWv2El259rC+Nm0gs/rsY+s8xe7Z+wXvT1Ing="; }; }); }) + (self: super: { huawei-lte-api = super.huawei-lte-api.overridePythonAttrs (oldAttrs: rec { version = "1.4.18"; @@ -177,7 +178,7 @@ let extraPackagesFile = writeText "home-assistant-packages" (lib.concatMapStringsSep "\n" (pkg: pkg.pname) extraBuildInputs); # Don't forget to run parse-requirements.py after updating - hassVersion = "2022.3.8"; + hassVersion = "2022.4.0"; in python.pkgs.buildPythonApplication rec { pname = "homeassistant"; @@ -195,7 +196,7 @@ in python.pkgs.buildPythonApplication rec { owner = "home-assistant"; repo = "core"; rev = version; - hash = "sha256-FGsMFt/EEokaast81iiwKHqSsB1E4Si5ejTw+MV1MnQ="; + hash = "sha256-b/YwcbcQuRIue4fr4+yF2EEXLvmnI7e3xfyz52flwJw="; }; # leave this in, so users don't have to constantly update their downstream patch handling @@ -215,8 +216,8 @@ in python.pkgs.buildPythonApplication rec { "bcrypt" "cryptography" "httpx" + "jinja2" "pip" - "PyJWT" "requests" "yarl" ]; @@ -319,6 +320,8 @@ in python.pkgs.buildPythonApplication rec { "test_merge" # Tests are flaky "test_config_platform_valid" + # Test requires pylint>=2.13.0 + "test_invalid_discovery_info" ]; preCheck = '' diff --git a/pkgs/servers/home-assistant/frontend.nix b/pkgs/servers/home-assistant/frontend.nix index 9f13a6652d7de..fb708313072ce 100644 --- a/pkgs/servers/home-assistant/frontend.nix +++ b/pkgs/servers/home-assistant/frontend.nix @@ -4,7 +4,7 @@ buildPythonPackage rec { # the frontend version corresponding to a specific home-assistant version can be found here # https://github.com/home-assistant/home-assistant/blob/master/homeassistant/components/frontend/manifest.json pname = "home-assistant-frontend"; - version = "20220301.2"; + version = "20220405.0"; format = "wheel"; src = fetchPypi { @@ -12,7 +12,7 @@ buildPythonPackage rec { pname = "home_assistant_frontend"; dist = "py3"; python = "py3"; - sha256 = "sha256-iIywlG9ATLV/+bHtOQFx4mRwToelpPdE3DOKSp4yxN0="; + sha256 = "sha256-M024uJJVhVSoGhJTc7d8NKItw0sAOGFuCsZNUe//vBg="; }; # there is nothing to strip in this package diff --git a/pkgs/servers/home-assistant/tests.nix b/pkgs/servers/home-assistant/tests.nix index ae2d91b933f96..58bb1670e5a01 100644 --- a/pkgs/servers/home-assistant/tests.nix +++ b/pkgs/servers/home-assistant/tests.nix @@ -5,14 +5,14 @@ let # some components' tests have additional dependencies extraCheckInputs = with home-assistant.python.pkgs; { - alexa = [ ha-av ]; - camera = [ ha-av ]; + alexa = [ av ]; + camera = [ av ]; cloud = [ mutagen ]; config = [ pydispatcher ]; - generic = [ ha-av ]; + generic = [ av ]; google_translate = [ mutagen ]; lovelace = [ PyChromecast ]; - nest = [ ha-av ]; + nest = [ av ]; onboarding = [ pymetno radios rpi-bad-power ]; version = [ aioaseko ]; voicerss = [ mutagen ]; @@ -67,8 +67,11 @@ in lib.listToAttrs (map (component: lib.nameValuePair component ( meta = old.meta // { broken = lib.elem component [ "airtouch4" + "bsblan" "dnsip" - "zwave" + "efergy" + "ssdp" + "subaru" ]; # upstream only tests on Linux, so do we. platforms = lib.platforms.linux; diff --git a/pkgs/servers/mastodon/default.nix b/pkgs/servers/mastodon/default.nix index ef4c22b1c2c07..84010a0903688 100644 --- a/pkgs/servers/mastodon/default.nix +++ b/pkgs/servers/mastodon/default.nix @@ -1,6 +1,7 @@ { lib, stdenv, nodejs-slim, mkYarnPackage, fetchFromGitHub, bundlerEnv, nixosTests , yarn, callPackage, imagemagick, ffmpeg, file, ruby_3_0, writeShellScript , fetchYarnDeps, fixup_yarn_lock +, fetchpatch # Allow building a fork or custom version of Mastodon: , pname ? "mastodon" @@ -21,6 +22,14 @@ stdenv.mkDerivation rec { sha256 = "sha256-Ngfs15YKLfSBOKju3BzpZFnenB370jId2G1g9Qy1y5w="; }; + patches = [ + # Fix indexing statuses in ElasticSearch + (fetchpatch { + url = "https://github.com/mastodon/mastodon/commit/ef196c913c77338be5ebb1e02af2f6225f857080.patch"; + sha256 = "sha256-uw8m6j4BzMQtev0LNLeIHW0xOJEmj3JikT/6gVfmvzs="; + }) + ]; + mastodon-gems = bundlerEnv { name = "${pname}-gems-${version}"; inherit version; diff --git a/pkgs/shells/zsh/oh-my-zsh/default.nix b/pkgs/shells/zsh/oh-my-zsh/default.nix index 1b777d96696b2..05453444650e4 100644 --- a/pkgs/shells/zsh/oh-my-zsh/default.nix +++ b/pkgs/shells/zsh/oh-my-zsh/default.nix @@ -5,15 +5,15 @@ , git, nix, nixfmt, jq, coreutils, gnused, curl, cacert }: stdenv.mkDerivation rec { - version = "2022-04-04"; + version = "2022-04-06"; pname = "oh-my-zsh"; - rev = "4d9e5ce9a7d8db3c3aadcae81580a5c3ff5a0e8b"; + rev = "b3999a4b156185b617a5608317497399f88dc8fe"; src = fetchFromGitHub { inherit rev; owner = "ohmyzsh"; repo = "ohmyzsh"; - sha256 = "Plg7mr6ZOSzUpq5XMFkebVpCjdtwe237+4sVdtL+kLM="; + sha256 = "yXM+fLdNWOrUU03K7527NgtaAwSql5r0wPaWgUZqGhY="; }; installPhase = '' diff --git a/pkgs/tools/admin/certigo/default.nix b/pkgs/tools/admin/certigo/default.nix index f0840d1585352..d31cb6a0ef665 100644 --- a/pkgs/tools/admin/certigo/default.nix +++ b/pkgs/tools/admin/certigo/default.nix @@ -13,8 +13,6 @@ buildGoModule rec { vendorSha256 = "sha256-qS/tIi6umSuQcl43SI4LyL0k5eWfRWs7kVybRPGKcbs="; - doCheck = false; - meta = with lib; { description = "A utility to examine and validate certificates in a variety of formats"; homepage = "https://github.com/square/certigo"; diff --git a/pkgs/tools/admin/clair/default.nix b/pkgs/tools/admin/clair/default.nix index 484cbbb82cbda..20929f5d8d5fc 100644 --- a/pkgs/tools/admin/clair/default.nix +++ b/pkgs/tools/admin/clair/default.nix @@ -13,8 +13,6 @@ buildGoModule rec { vendorSha256 = "sha256-C3xnBANsymSgI7l446CjJzEMY1gURGTxDNBBjNjHmaE="; - doCheck = false; - nativeBuildInputs = [ makeWrapper ]; postInstall = '' diff --git a/pkgs/tools/admin/eksctl/default.nix b/pkgs/tools/admin/eksctl/default.nix index 3e0ab75681838..df96da11d1050 100644 --- a/pkgs/tools/admin/eksctl/default.nix +++ b/pkgs/tools/admin/eksctl/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "eksctl"; - version = "0.90.0"; + version = "0.91.0"; src = fetchFromGitHub { owner = "weaveworks"; repo = pname; rev = version; - sha256 = "sha256-XQZ32Gg/LZCDuSmtGvDEYCuzvq39zzq3yGGTYSKZyXI="; + sha256 = "sha256-Hz/joHOzy71ZtbpoTjomccSgc49VyWACTC9EwSiDpzc="; }; - vendorSha256 = "sha256-IYqeuyNPRQBMwuZMW4InKfHpOLhleM5Mz5Oauw4nK6M="; + vendorSha256 = "sha256-rkEVtIHXD5lXj8r89vhoWhJZF3unvwB43Zz3jBHRjYU="; doCheck = false; diff --git a/pkgs/tools/admin/iamy/default.nix b/pkgs/tools/admin/iamy/default.nix index 467f0ffbce0a4..caaa1cd488f1f 100644 --- a/pkgs/tools/admin/iamy/default.nix +++ b/pkgs/tools/admin/iamy/default.nix @@ -13,8 +13,6 @@ buildGoModule rec { vendorSha256 = "sha256-/IUYM3pTvcHXw8t5MW6JUEWdxegFuQC8zkiySp8VEgE="; - doCheck = false; - ldflags = [ "-X main.Version=v${version}" "-s" "-w" ]; diff --git a/pkgs/tools/filesystems/apfsprogs/default.nix b/pkgs/tools/filesystems/apfsprogs/default.nix index 2c2aa108077f0..a9f9a746d98b8 100644 --- a/pkgs/tools/filesystems/apfsprogs/default.nix +++ b/pkgs/tools/filesystems/apfsprogs/default.nix @@ -5,13 +5,13 @@ stdenv.mkDerivation { pname = "apfsprogs"; - version = "unstable-2021-10-26"; + version = "unstable-2022-02-23"; src = fetchFromGitHub { owner = "linux-apfs"; repo = "apfsprogs"; - rev = "05ecfa367a8142e289dc76333294271b5edfe395"; - sha256 = "sha256-McGQG8f12DTp/It8KjMHGyfE5tgmgLd7MZlZIn/xC+E="; + rev = "5bce5c7f42843dfbbed90767640e748062e23dd2"; + sha256 = "sha256-0N+aC5paP6ZoXUD7A9lLnF2onbOJU+dqZ8oKs+dCUcg="; }; buildPhase = '' diff --git a/pkgs/tools/misc/ethminer/default.nix b/pkgs/tools/misc/ethminer/default.nix index ce68e9f82098f..32d1c5500b806 100644 --- a/pkgs/tools/misc/ethminer/default.nix +++ b/pkgs/tools/misc/ethminer/default.nix @@ -1,6 +1,7 @@ { lib, stdenv, + fetchpatch, fetchFromGitHub, opencl-headers, cmake, @@ -31,6 +32,21 @@ stdenv.mkDerivation rec { fetchSubmodules = true; }; + patches = [ + # global context library is separated from libethash + ./add-global-context.patch + + # CUDA 11 no longer support SM30 + (fetchpatch { + url = "https://github.com/ethereum-mining/ethminer/commit/dae359dff28f376d4ce7ddfbd651dcd34d6dad8f.patch"; + hash = "sha256-CJGKc0rXOcKDX1u5VBzc8gyBi1Me9CNATfQzKViqtAA="; + }) + ]; + + postPatch = '' + sed -i 's/_lib_static//' libpoolprotocols/CMakeLists.txt + ''; + # NOTE: dbus is broken cmakeFlags = [ "-DHUNTER_ENABLED=OFF" @@ -64,15 +80,6 @@ stdenv.mkDerivation rec { cudatoolkit ]; - patches = [ - # global context library is separated from libethash - ./add-global-context.patch - ]; - - preConfigure = '' - sed -i 's/_lib_static//' libpoolprotocols/CMakeLists.txt - ''; - postInstall = '' wrapProgram $out/bin/ethminer --prefix LD_LIBRARY_PATH : /run/opengl-driver/lib ''; diff --git a/pkgs/tools/misc/interactsh/default.nix b/pkgs/tools/misc/interactsh/default.nix index 979569dc3329d..66bb319b5a5ae 100644 --- a/pkgs/tools/misc/interactsh/default.nix +++ b/pkgs/tools/misc/interactsh/default.nix @@ -5,16 +5,16 @@ buildGoModule rec { pname = "interactsh"; - version = "1.0.1"; + version = "1.0.2"; src = fetchFromGitHub { owner = "projectdiscovery"; repo = pname; rev = "v${version}"; - sha256 = "sha256-czXcncEm2Wm0ezGjNOpcCin5KOZKuimnnMPUWfGE0FY="; + sha256 = "sha256-AtWcVzY/1DnKRva/PGISTHmBsWpJ6nxJvlWR/B/fRcE="; }; - vendorSha256 = "sha256-YfHsl0AFNQNCg4HEP9FyrHUMMz0SFn5aDRrOruseE5k="; + vendorSha256 = "sha256-LV5K4fToE26i4Av/YcNPjIyYmf/kxmBMuiyXYYfL3Y4="; modRoot = "."; subPackages = [ diff --git a/pkgs/tools/misc/ntfy-sh/default.nix b/pkgs/tools/misc/ntfy-sh/default.nix index 6f5a0b0116336..c916f61f0d4c8 100644 --- a/pkgs/tools/misc/ntfy-sh/default.nix +++ b/pkgs/tools/misc/ntfy-sh/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "ntfy-sh"; - version = "1.18.1"; + version = "1.19.0"; src = fetchFromGitHub { owner = "binwiederhier"; repo = "ntfy"; rev = "v${version}"; - sha256 = "sha256-rXdkNJYpQ8s2BeFRR4fSIuCrdq60me4B3wee64ei8qM="; + sha256 = "sha256-su4Q41x0PrKHRg2R6jxo1KUmWaaLSrU9UZSDsonKNyA="; }; - vendorSha256 = "sha256-7b3cQczQLUZ//5ubKvq8s9U75qJpJaieLN+kzjXIyHg="; + vendorSha256 = "sha256-eZmvngNSYY5Z5Xd5tPXzxv9GkosUMueaBGjZ6L7o/yU="; doCheck = false; diff --git a/pkgs/tools/misc/steampipe/default.nix b/pkgs/tools/misc/steampipe/default.nix index ee97166deb117..664290dbc93a4 100644 --- a/pkgs/tools/misc/steampipe/default.nix +++ b/pkgs/tools/misc/steampipe/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "steampipe"; - version = "0.13.3"; + version = "0.13.4"; src = fetchFromGitHub { owner = "turbot"; repo = "steampipe"; rev = "v${version}"; - sha256 = "sha256-zU/FWrlE4TQhzRNOVED7hFub+lehPFD+fEJ3v0PFGdM="; + sha256 = "sha256-Qq8i/uU2TtrEpvTPFmnZdku2vNo5O240dAT2OQKel1U="; }; - vendorSha256 = "sha256-0jixQcgSXQJAd899EWOUKde5OXZcSZwQfH7LRdQlm7c="; + vendorSha256 = "sha256-pEQG9BHhsVDVSOoKJBocLXMLjmP72RM+GXz4nYD4D7s="; proxyVendor = true; # tests are failing for no obvious reasons diff --git a/pkgs/tools/networking/amass/default.nix b/pkgs/tools/networking/amass/default.nix index d440a55f334b7..2b0fdb190786b 100644 --- a/pkgs/tools/networking/amass/default.nix +++ b/pkgs/tools/networking/amass/default.nix @@ -5,16 +5,16 @@ buildGoModule rec { pname = "amass"; - version = "3.19.0"; + version = "3.19.1"; src = fetchFromGitHub { owner = "OWASP"; repo = "Amass"; rev = "v${version}"; - sha256 = "sha256-mhz+SjJwVsosbfJLnFUBt4y6W+afQFokciuBrFpfC48="; + sha256 = "sha256-URl0I2jtiw27IZSkxa0JR313+Et6OIZPB9SeRf2tqnk="; }; - vendorSha256 = "sha256-DGeMSyyucdU1FGRfil3I12UZ4DR1nQWD9oEDRhWQQzo="; + vendorSha256 = "sha256-emWAUxgM8HrDo5ThzqNlinUg6aEwh5TyOOTEQjM53wc="; outputs = [ "out" "wordlists" ]; diff --git a/pkgs/tools/networking/mosh/default.nix b/pkgs/tools/networking/mosh/default.nix index 8331e3686dc9f..121ba4395b519 100644 --- a/pkgs/tools/networking/mosh/default.nix +++ b/pkgs/tools/networking/mosh/default.nix @@ -1,5 +1,5 @@ { lib, stdenv, fetchurl, fetchpatch, zlib, protobuf, ncurses, pkg-config -, makeWrapper, perlPackages, openssl, autoreconfHook, openssh, bash-completion +, makeWrapper, perl, openssl, autoreconfHook, openssh, bash-completion , withUtempter ? stdenv.isLinux, libutempter }: stdenv.mkDerivation rec { @@ -11,8 +11,8 @@ stdenv.mkDerivation rec { sha256 = "05hjhlp6lk8yjcy59zywpf0r6s0h0b9zxq0lw66dh9x8vxrhaq6s"; }; - nativeBuildInputs = [ autoreconfHook pkg-config makeWrapper protobuf perlPackages.perl ]; - buildInputs = [ protobuf ncurses zlib openssl bash-completion ] + nativeBuildInputs = [ autoreconfHook pkg-config makeWrapper protobuf perl ]; + buildInputs = [ protobuf ncurses zlib openssl bash-completion perl ] ++ lib.optional withUtempter libutempter; strictDeps = true; diff --git a/pkgs/tools/networking/shadowsocks-rust/default.nix b/pkgs/tools/networking/shadowsocks-rust/default.nix index ed61740a6849f..50ac8c7a8afe6 100644 --- a/pkgs/tools/networking/shadowsocks-rust/default.nix +++ b/pkgs/tools/networking/shadowsocks-rust/default.nix @@ -2,16 +2,16 @@ rustPlatform.buildRustPackage rec { pname = "shadowsocks-rust"; - version = "1.13.5"; + version = "1.14.2"; src = fetchFromGitHub { rev = "v${version}"; owner = "shadowsocks"; repo = pname; - sha256 = "sha256-0TKAchPDjB7YKJO2JqBwJPZITWXDQbjPbRN8amilJ6E="; + sha256 = "sha256-zWiC1GhrI3gcXhr8JpAbFF6t7N6aBSho33FMu8bhF2o="; }; - cargoSha256 = "sha256-LBLUNBXsaGfviUUleoYIFf/vrbejKYwB9Lqetx3Agxc="; + cargoSha256 = "sha256-nSKeFLWTHhtmlvA9MV6NpupKJo3d1jKpTBI5H8cHJ9s="; RUSTC_BOOTSTRAP = 1; diff --git a/pkgs/tools/networking/termscp/default.nix b/pkgs/tools/networking/termscp/default.nix index 4883cc042cde7..5542adca77af9 100644 --- a/pkgs/tools/networking/termscp/default.nix +++ b/pkgs/tools/networking/termscp/default.nix @@ -12,16 +12,16 @@ rustPlatform.buildRustPackage rec { pname = "termscp"; - version = "0.8.0"; + version = "0.8.1"; src = fetchFromGitHub { owner = "veeso"; repo = pname; rev = "v${version}"; - sha256 = "sha256-fVZDpzgcpMWOoUtoq7go/NFWfoR1aONuRtTba0sqPZk="; + sha256 = "sha256-WqOkud8gOa81P6FT44y5RZX4CWjmou9HufZ3QPoYuAk="; }; - cargoSha256 = "sha256-iLm73dWF9z/obtAXe5dZlvJcxU6hB5N0vaSc/HLuTuQ="; + cargoSha256 = "sha256-jckJiFhiUvbn0fkgKzqDorWQvuLenx/S8+RyPoqaWUg="; nativeBuildInputs = [ pkg-config diff --git a/pkgs/tools/networking/xxh/default.nix b/pkgs/tools/networking/xxh/default.nix index 386b8cafbd12f..98632f5e2a0f7 100644 --- a/pkgs/tools/networking/xxh/default.nix +++ b/pkgs/tools/networking/xxh/default.nix @@ -10,7 +10,7 @@ buildPythonApplication rec{ pname = "xxh"; - version = "0.8.9"; + version = "0.8.10"; format = "setuptools"; disabled = pythonOlder "3.6"; @@ -19,7 +19,7 @@ buildPythonApplication rec{ owner = pname; repo = pname; rev = version; - hash = "sha256-Uo7xFwE9e5MFWDlNWq15kg+4xf/hF4WGUNTpTK+rgVg="; + hash = "sha256-2RMzgIAhM//XReCFBGlTlXn9j4WQiM/k2pLxP2iPUy8="; }; propagatedBuildInputs = [ diff --git a/pkgs/tools/package-management/nix-doc/default.nix b/pkgs/tools/package-management/nix-doc/default.nix index d3d45e6bbb725..882275eca44dc 100644 --- a/pkgs/tools/package-management/nix-doc/default.nix +++ b/pkgs/tools/package-management/nix-doc/default.nix @@ -2,13 +2,13 @@ rustPlatform.buildRustPackage rec { pname = "nix-doc"; - version = "0.5.2"; + version = "0.5.3"; src = fetchFromGitHub { rev = "v${version}"; owner = "lf-"; repo = "nix-doc"; - sha256 = "sha256-P4AX8ERsMHGkGowc05M7xE5HTFSmaJvD2z0Prz4emeQ="; + sha256 = "sha256-H8FNOOjHMUW2wIUfoDhS3eH2AgxxD0LAuX4J9SJyJhg="; }; doCheck = true; @@ -16,7 +16,7 @@ rustPlatform.buildRustPackage rec { nativeBuildInputs = [ pkg-config ]; - cargoSha256 = "sha256-RxsH4bSAzBslK8MVGmCJxduf6MYOtQEKxt9QjgUCg1o="; + cargoSha256 = "sha256-BTMFoZ8HqbgUXkVyydOkcQZ10TLE8KsGRdt+xhBKJVc="; meta = with lib; { description = "An interactive Nix documentation tool"; diff --git a/pkgs/tools/security/gitleaks/default.nix b/pkgs/tools/security/gitleaks/default.nix index bbeca94a993ec..1661d231a7cf1 100644 --- a/pkgs/tools/security/gitleaks/default.nix +++ b/pkgs/tools/security/gitleaks/default.nix @@ -5,13 +5,13 @@ buildGoModule rec { pname = "gitleaks"; - version = "8.5.1"; + version = "8.5.2"; src = fetchFromGitHub { owner = "zricethezav"; repo = pname; rev = "v${version}"; - sha256 = "sha256-lx7xjOajFyeetnGcJwX66pIcZw2A7+QGWb5crCoA83g="; + sha256 = "sha256-etrsdBTlTRN5X8KoJfAfppem9gCpf5MDIh7XYMtnRP0="; }; vendorSha256 = "sha256-gelUrZOYiThO0+COIv9cOgho/tjv7ZqSKOktWIbdADw="; diff --git a/pkgs/tools/security/saml2aws/default.nix b/pkgs/tools/security/saml2aws/default.nix index 2f1127fd68a28..296845c644d14 100644 --- a/pkgs/tools/security/saml2aws/default.nix +++ b/pkgs/tools/security/saml2aws/default.nix @@ -15,8 +15,6 @@ buildGoModule rec { buildInputs = lib.optionals stdenv.isDarwin [ AppKit ]; - doCheck = false; - subPackages = [ "." "cmd/saml2aws" ]; ldflags = [ diff --git a/pkgs/tools/security/truecrack/default.nix b/pkgs/tools/security/truecrack/default.nix index cf64b234c66f6..40d0ba213fb9a 100644 --- a/pkgs/tools/security/truecrack/default.nix +++ b/pkgs/tools/security/truecrack/default.nix @@ -33,6 +33,7 @@ gccStdenv.mkDerivation rec { meta = with lib; { description = "TrueCrack is a brute-force password cracker for TrueCrypt volumes. It works on Linux and it is optimized for Nvidia Cuda technology."; homepage = "https://gitlab.com/kalilinux/packages/truecrack"; + broken = cudaSupport; license = licenses.gpl3Plus; platforms = platforms.unix; maintainers = with maintainers; [ ethancedwards8 ]; diff --git a/pkgs/tools/system/ctop/default.nix b/pkgs/tools/system/ctop/default.nix index 6091eff255d8f..cd8c755e1afa1 100644 --- a/pkgs/tools/system/ctop/default.nix +++ b/pkgs/tools/system/ctop/default.nix @@ -13,8 +13,6 @@ buildGoModule rec { vendorSha256 = "sha256-UAja7XuoLqJFNcK1PgHGcuf/HbvSrWyRvW2D3T7Hg0g="; - doCheck = false; - ldflags = [ "-s" "-w" "-X main.version=${version}" "-X main.build=v${version}" ]; meta = with lib; { diff --git a/pkgs/tools/system/goreman/default.nix b/pkgs/tools/system/goreman/default.nix index 8257e930779d5..51d70fbc93335 100644 --- a/pkgs/tools/system/goreman/default.nix +++ b/pkgs/tools/system/goreman/default.nix @@ -20,8 +20,6 @@ buildGoModule rec { vendorSha256 = "sha256-87aHBRWm5Odv6LeshZty5N31sC+vdSwGlTYhk3BZkPo="; - doCheck = false; - meta = with lib; { description = "foreman clone written in go language"; homepage = "https://github.com/mattn/goreman"; diff --git a/pkgs/tools/text/asciigraph/default.nix b/pkgs/tools/text/asciigraph/default.nix index 5cfa00d5326f3..221f7c3d55281 100644 --- a/pkgs/tools/text/asciigraph/default.nix +++ b/pkgs/tools/text/asciigraph/default.nix @@ -1,11 +1,9 @@ -{ lib, buildGoPackage, fetchFromGitHub }: +{ lib, buildGoModule, fetchFromGitHub }: -buildGoPackage rec { +buildGoModule rec { pname = "asciigraph"; version = "0.5.3"; - goPackagePath = "github.com/guptarohit/asciigraph"; - src = fetchFromGitHub { owner = "guptarohit"; repo = pname; @@ -13,10 +11,14 @@ buildGoPackage rec { sha256 = "sha256-GzFJT4LI1QZzghs9g2A+pqkTg68XC+m9F14rYpMxEXM="; }; + vendorSha256 = "sha256-pQpattmS9VmO3ZIQUFn66az8GSmB4IvYhTTCFn6SUmo="; + + ldflags = [ "-s" "-w" ]; + meta = with lib; { homepage = "https://github.com/guptarohit/asciigraph"; description = "Lightweight ASCII line graph ╭┈╯ command line app"; license = licenses.bsd3; - maintainers = [ maintainers.mmahut ]; + maintainers = with maintainers; [ mmahut ]; }; } diff --git a/pkgs/tools/text/ugrep/default.nix b/pkgs/tools/text/ugrep/default.nix index 7a921bdd11f57..2511e0c88b215 100644 --- a/pkgs/tools/text/ugrep/default.nix +++ b/pkgs/tools/text/ugrep/default.nix @@ -11,13 +11,13 @@ stdenv.mkDerivation rec { pname = "ugrep"; - version = "3.7.6"; + version = "3.7.7"; src = fetchFromGitHub { owner = "Genivia"; repo = pname; rev = "v${version}"; - sha256 = "sha256-fOp+nf/xZKOw8CDI1RSl/DQH52ay/M/aeSMf6MdfKmQ="; + sha256 = "sha256-FucHivUd9WVQlTsBJbnSd2Q6WQpoFjm6dS0eb6z8SSs="; }; buildInputs = [ diff --git a/pkgs/tools/video/harvid/default.nix b/pkgs/tools/video/harvid/default.nix index 812457f35cbd2..729c26de57ea9 100644 --- a/pkgs/tools/video/harvid/default.nix +++ b/pkgs/tools/video/harvid/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "harvid"; - version = "0.8.3"; + version = "0.9.0"; src = fetchFromGitHub { owner = "x42"; repo = "harvid"; rev = "v${version}"; - sha256 = "0l1plfsfh2ixhlzg3hqqvjj42z7g422718a9kgbh7b4p882n71x7"; + sha256 = "sha256-qt6aep7iMF8/lnlT2wLqu6LkFDqzdfsGLZvrOlXttG8="; }; nativeBuildInputs = [ pkg-config ]; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index c73778efa654e..2d640c6b1ac20 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -4625,7 +4625,7 @@ with pkgs; cudatoolkit_11_5 cudatoolkit_11_6; - cudatoolkit = cudatoolkit_10; + cudatoolkit = cudatoolkit_11; cudnnPackages = callPackages ../development/libraries/science/math/cudnn { }; inherit (cudnnPackages) @@ -4648,7 +4648,7 @@ with pkgs; cudnn_8_3_cudatoolkit_11; # Make sure to keep this in sync with the `cudatoolkit` version! - cudnn = cudnn_8_3_cudatoolkit_10; + cudnn = cudnn_8_3_cudatoolkit_11; cutensorPackages = callPackages ../development/libraries/science/math/cutensor { }; inherit (cutensorPackages) @@ -4662,7 +4662,7 @@ with pkgs; cutensor_cudatoolkit_11_3 cutensor_cudatoolkit_11_4; - cutensor = cutensor_cudatoolkit_10; + cutensor = cutensor_cudatoolkit_11; curie = callPackage ../data/fonts/curie { }; @@ -12712,19 +12712,9 @@ with pkgs; buildPackages = buildPackages // { stdenv = buildPackages.gcc8Stdenv; }; }); - go_1_18 = callPackage ../development/compilers/go/1.18.nix ({ + go_1_18 = callPackage ../development/compilers/go/1.18.nix { inherit (darwin.apple_sdk.frameworks) Security Foundation; - } // lib.optionalAttrs (stdenv.cc.isGNU && stdenv.isAarch64) { - stdenv = gcc8Stdenv; - buildPackages = buildPackages // { stdenv = buildPackages.gcc8Stdenv; }; - }); - - go_2-dev = callPackage ../development/compilers/go/2-dev.nix ({ - inherit (darwin.apple_sdk.frameworks) Security Foundation; - } // lib.optionalAttrs (stdenv.cc.isGNU && stdenv.isAarch64) { - stdenv = gcc8Stdenv; - buildPackages = buildPackages // { stdenv = buildPackages.gcc8Stdenv; }; - }); + }; go = go_1_17; @@ -21396,7 +21386,7 @@ with pkgs; hashi-ui = callPackage ../servers/hashi-ui {}; - hasura-graphql-engine = haskell.lib.compose.justStaticExecutables haskellPackages.graphql-engine; + hasura-graphql-engine = haskell.lib.compose.justStaticExecutables haskell.packages.ghc8107.graphql-engine; hasura-cli = callPackage ../servers/hasura/cli.nix { }; @@ -23053,7 +23043,9 @@ with pkgs; golint = callPackage ../development/tools/golint { }; - golangci-lint = callPackage ../development/tools/golangci-lint { }; + golangci-lint = callPackage ../development/tools/golangci-lint { + buildGoModule = buildGo118Module; + }; gocyclo = callPackage ../development/tools/gocyclo { }; @@ -26408,7 +26400,10 @@ with pkgs; gpsprune = callPackage ../applications/misc/gpsprune { }; - gpu-screen-recorder = callPackage ../applications/video/gpu-screen-recorder { }; + gpu-screen-recorder = callPackage ../applications/video/gpu-screen-recorder { + # rm me as soon as this package gains the support for cuda 11 + cudatoolkit = cudatoolkit_10; + }; gpu-screen-recorder-gtk = callPackage ../applications/video/gpu-screen-recorder/gpu-screen-recorder-gtk.nix { }; @@ -29276,11 +29271,11 @@ with pkgs; inherit (callPackages ../applications/version-management/subversion { sasl = cyrus_sasl; }) subversion_1_10 subversion; - subversionClient = appendToName "client" (subversion.override { + subversionClient = subversion.override { bdbSupport = false; perlBindings = true; pythonBindings = true; - }); + }; sublime-music = callPackage ../applications/audio/sublime-music { }; @@ -33767,7 +33762,7 @@ with pkgs; nix-eval-jobs = callPackage ../tools/package-management/nix-eval-jobs { }; - nix-doc = callPackage ../tools/package-management/nix-doc { nix = nixVersions.nix_2_5; }; + nix-doc = callPackage ../tools/package-management/nix-doc { }; nix-bundle = callPackage ../tools/package-management/nix-bundle { }; diff --git a/pkgs/top-level/python-aliases.nix b/pkgs/top-level/python-aliases.nix index db0b456d905dd..f259b7cc7f687 100644 --- a/pkgs/top-level/python-aliases.nix +++ b/pkgs/top-level/python-aliases.nix @@ -66,6 +66,7 @@ mapAliases ({ google_api_python_client = google-api-python-client; # added 2021-03-19 googleapis_common_protos = googleapis-common-protos; # added 2021-03-19 grpc_google_iam_v1 = grpc-google-iam-v1; # added 2021-08-21 + ha-av = throw "ha-av was removed, because it is no longer maintained"; # added 2022-04-06 HAP-python = hap-python; # added 2021-06-01 hbmqtt = throw "hbmqtt was removed because it is no longer maintained"; # added 2021-11-07 hdlparse = throw "hdlparse has been removed, it was using setuptools 2to3 translation feature, which has been removed in setuptools 58"; # added 2022-01-18 diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index b908f68882906..9730bfe34544d 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -3205,6 +3205,10 @@ in { garages-amsterdam = callPackage ../development/python-modules/garages-amsterdam { }; + gattlib = callPackage ../development/python-modules/gattlib { + inherit (pkgs) bluez glib pkg-config; + }; + gbinder-python = callPackage ../development/python-modules/gbinder-python { }; gcovr = callPackage ../development/python-modules/gcovr { }; @@ -3701,8 +3705,6 @@ in { hdate = callPackage ../development/python-modules/hdate { }; - ha-av = callPackage ../development/python-modules/ha-av { }; - ha-ffmpeg = callPackage ../development/python-modules/ha-ffmpeg { }; ha-philipsjs = callPackage ../development/python-modules/ha-philipsjs{ }; @@ -4883,6 +4885,8 @@ in { losant-rest = callPackage ../development/python-modules/losant-rest { }; + lru-dict = callPackage ../development/python-modules/lru-dict { }; + lsassy = callPackage ../development/python-modules/lsassy { }; luddite = callPackage ../development/python-modules/luddite { }; @@ -6761,7 +6765,9 @@ in { pyblock = callPackage ../development/python-modules/pyblock { }; - pybluez = callPackage ../development/python-modules/pybluez { }; + pybluez = callPackage ../development/python-modules/pybluez { + inherit (pkgs) bluez; + }; pybotvac = callPackage ../development/python-modules/pybotvac { }; @@ -8377,24 +8383,6 @@ in { pytorch = callPackage ../development/python-modules/pytorch { cudaSupport = pkgs.config.cudaSupport or false; - - # TODO: next time pytorch is updated (to 1.11.0, currently in staging as of - # 2022-03-31), make the following changes: - - # -> cudatoolk_11 - cudatoolkit = pkgs.cudatoolkit_10; - - # -> cudnn_8_3_cudatoolkit_11 - cudnn = pkgs.cudnn_8_1_cudatoolkit_10; - - # -> cutensor_cudatoolkit_11 (cutensor is a new dependency in v1.11.0) - # cutensor = pkgs.cutensor_cudatoolkit_11; - - # -> setting a custom magma should be unnecessary with v1.11.0 - magma = pkgs.magma.override { cudatoolkit = pkgs.cudatoolkit_10; }; - - # -> nccl_cudatoolkit_11 - nccl = pkgs.nccl.override { cudatoolkit = pkgs.cudatoolkit_10; }; }; pytorch-bin = callPackage ../development/python-modules/pytorch/bin.nix { }; |