diff options
124 files changed, 2174 insertions, 1433 deletions
diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index 18de6217e348c..babc392648cf6 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -6329,6 +6329,12 @@ github = "jsimonetti"; githubId = 5478838; }; + jsoo1 = { + email = "jsoo1@asu.edu"; + github = "jsoo1"; + name = "John Soo"; + githubId = 10039785; + }; jtcoolen = { email = "jtcoolen@pm.me"; name = "Julien Coolen"; @@ -7200,10 +7206,14 @@ name = "Daniel Kuehn"; }; leo60228 = { - email = "iakornfeld@gmail.com"; + email = "leo@60228.dev"; + matrix = "@leo60228:matrix.org"; github = "leo60228"; githubId = 8355305; name = "leo60228"; + keys = [{ + fingerprint = "5BE4 98D5 1C24 2CCD C21A 4604 AC6F 4BA0 78E6 7833"; + }]; }; leona = { email = "nix@leona.is"; diff --git a/nixos/modules/services/web-apps/openwebrx.nix b/nixos/modules/services/web-apps/openwebrx.nix index c530a07610f9b..8a7972a3fc6ec 100644 --- a/nixos/modules/services/web-apps/openwebrx.nix +++ b/nixos/modules/services/web-apps/openwebrx.nix @@ -20,6 +20,9 @@ in path = with pkgs; [ csdr digiham + codec2 + js8call + m17-cxx-demod alsaUtils netcat ]; diff --git a/pkgs/applications/editors/vscode/extensions/cpptools/default.nix b/pkgs/applications/editors/vscode/extensions/cpptools/default.nix index cc935876ded35..65f833a3fb74b 100644 --- a/pkgs/applications/editors/vscode/extensions/cpptools/default.nix +++ b/pkgs/applications/editors/vscode/extensions/cpptools/default.nix @@ -1,7 +1,8 @@ { lib, vscode-utils -, fetchurl, mono, writeScript, runtimeShell +, fetchurl, writeScript, runtimeShell , jq, clang-tools , gdbUseFixed ? true, gdb # The gdb default setting will be fixed to specified. Use version from `PATH` otherwise. +, autoPatchelfHook, makeWrapper, stdenv, lttng-ust, libkrb5, zlib }: /* @@ -29,47 +30,27 @@ let gdbDefaultsTo = if gdbUseFixed then "${gdb}/bin/gdb" else "gdb"; - - - openDebugAD7Script = writeScript "OpenDebugAD7" '' - #!${runtimeShell} - BIN_DIR="$(cd "$(dirname "$0")" && pwd -P)" - ${if gdbUseFixed - then '' - export PATH=''${PATH}''${PATH:+:}${gdb}/bin - '' - else ""} - ${mono}/bin/mono $BIN_DIR/bin/OpenDebugAD7.exe $* - ''; in - vscode-utils.buildVscodeMarketplaceExtension rec { mktplcRef = { name = "cpptools"; publisher = "ms-vscode"; - version = "1.9.1"; + version = "1.11.0"; + sha256 = "c0725d3914aeb2515627691727455cc27e7a75031fa02ca957be02cc210bd64d"; + arch = "linux-x64"; }; - vsix = fetchurl { - name = "${mktplcRef.publisher}-${mktplcRef.name}.gz"; - url = "https://marketplace.visualstudio.com/_apis/public/gallery/publishers/${mktplcRef.publisher}/vsextensions/${mktplcRef.name}/${mktplcRef.version}/vspackage?targetPlatform=linux-x64"; - sha256 = "sha256-BtTl9DR8hnwNpO5k99M4dtqcTQ2hTzVbjR8VZh+tdDI="; - }; - - unpackPhase = '' - runHook preUnpack - - gzip -d $src --stdout &> temporary.zip - unzip temporary.zip - rm temporary.zip - - cd extension/ - - runHook postUnpack - ''; + nativeBuildInputs = [ + autoPatchelfHook + makeWrapper + ]; buildInputs = [ jq + lttng-ust + libkrb5 + zlib + stdenv.cc.cc.lib ]; postPatch = '' @@ -85,27 +66,25 @@ vscode-utils.buildVscodeMarketplaceExtension rec { # Prevent download/install of extensions touch "./install.lock" - # Mono runtimes from nix package (used by generated `OpenDebugAD7`). - mv ./debugAdapters/bin/OpenDebugAD7 ./debugAdapters/bin/OpenDebugAD7_orig - cp -p "${openDebugAD7Script}" "./debugAdapters/bin/OpenDebugAD7" - # Clang-format from nix package. - mv ./LLVM/ ./LLVM_orig + mv ./LLVM/ ./LLVM_orig mkdir "./LLVM/" find "${clang-tools}" -mindepth 1 -maxdepth 1 | xargs ln -s -t "./LLVM" - # Patching cpptools and cpptools-srv - elfInterpreter="$(cat $NIX_CC/nix-support/dynamic-linker)" - patchelf --set-interpreter "$elfInterpreter" ./bin/cpptools - patchelf --set-interpreter "$elfInterpreter" ./bin/cpptools-srv - chmod a+x ./bin/cpptools{-srv,} + # Patching binaries + chmod +x bin/cpptools bin/cpptools-srv bin/cpptools-wordexp debugAdapters/bin/OpenDebugAD7 + patchelf --replace-needed liblttng-ust.so.0 liblttng-ust.so.1 ./debugAdapters/bin/libcoreclrtraceptprovider.so ''; - meta = with lib; { - license = licenses.unfree; - maintainers = [ maintainers.jraygauthier ]; - # A 32 bit linux would also be possible with some effort (specific download of binaries + - # patching of the elf files with 32 bit interpreter). - platforms = [ "x86_64-linux" ]; - }; + postFixup = lib.optionalString gdbUseFixed '' + wrapProgram $out/share/vscode/extensions/ms-vscode.cpptools/debugAdapters/bin/OpenDebugAD7 --prefix PATH : ${lib.makeBinPath [ gdb ]} + ''; + + meta = with lib; { + description = "The C/C++ extension adds language support for C/C++ to Visual Studio Code, including features such as IntelliSense and debugging."; + homepage = "https://marketplace.visualstudio.com/items?itemName=ms-vscode.cpptools"; + license = licenses.unfree; + maintainers = with maintainers; [ jraygauthier stargate01 ]; + platforms = [ "x86_64-linux" ]; + }; } diff --git a/pkgs/applications/editors/vscode/extensions/mktplcExtRefToFetchArgs.nix b/pkgs/applications/editors/vscode/extensions/mktplcExtRefToFetchArgs.nix index a781250fc18b2..e871baa608efa 100644 --- a/pkgs/applications/editors/vscode/extensions/mktplcExtRefToFetchArgs.nix +++ b/pkgs/applications/editors/vscode/extensions/mktplcExtRefToFetchArgs.nix @@ -1,6 +1,9 @@ -{ publisher, name, version, sha256 ? "" }: +{ publisher, name, version, arch ? "", sha256 ? "" }: +let + archurl = (if arch == "" then "" else "?targetPlatform=${arch}"); +in { - url = "https://${publisher}.gallery.vsassets.io/_apis/public/gallery/publisher/${publisher}/extension/${name}/${version}/assetbyname/Microsoft.VisualStudio.Services.VSIXPackage"; + url = "https://${publisher}.gallery.vsassets.io/_apis/public/gallery/publisher/${publisher}/extension/${name}/${version}/assetbyname/Microsoft.VisualStudio.Services.VSIXPackage${archurl}"; sha256 = sha256; # The `*.vsix` file is in the end a simple zip file. Change the extension # so that existing `unzip` hooks takes care of the unpacking. diff --git a/pkgs/applications/misc/ArchiSteamFarm/default.nix b/pkgs/applications/misc/ArchiSteamFarm/default.nix index d9da9e34b7370..e54f6c8cbc127 100644 --- a/pkgs/applications/misc/ArchiSteamFarm/default.nix +++ b/pkgs/applications/misc/ArchiSteamFarm/default.nix @@ -12,13 +12,13 @@ buildDotnetModule rec { pname = "archisteamfarm"; # nixpkgs-update: no auto update - version = "5.2.6.3"; + version = "5.2.7.7"; src = fetchFromGitHub { owner = "justarchinet"; repo = pname; rev = version; - sha256 = "sha256-ZsBOF3ZFZ0aicaAJ5j+6DQPwDyloxSafae8FTKSdwAI="; + sha256 = "sha256-2yx6YjMsJixtaiWse65p5VeZoiSumdIjaPIlfq9Mdmw="; }; dotnet-runtime = dotnetCorePackages.aspnetcore_6_0; diff --git a/pkgs/applications/misc/ArchiSteamFarm/web-ui/default.nix b/pkgs/applications/misc/ArchiSteamFarm/web-ui/default.nix index fdd2970fdac7b..260035bf11e81 100644 --- a/pkgs/applications/misc/ArchiSteamFarm/web-ui/default.nix +++ b/pkgs/applications/misc/ArchiSteamFarm/web-ui/default.nix @@ -11,31 +11,30 @@ let repo = "ASF-ui"; # updated by the update script # this is always the commit that should be used with asf-ui from the latest asf version - rev = "5c7d99928e2d390bc1cd5fa74b2f422aa760d78e"; - sha256 = "04wcmqav2q7dchvjyy0k6g8cv5ff1sw2a238sz38670cnwx569r2"; + rev = "99278781c3716064dc25e3608a344900ebb05165"; + sha256 = "0nly16g39cv4lhnm40w5ci6bdwypk0gp8n70l914907hy0nvz4vg"; }; in - nodePackages.package.override { - inherit src; +nodePackages.package.override { + inherit src; - # upstream isn't tagged, but we are using the latest official commit for that specific asf version (assuming both get updated at the same time) - version = ArchiSteamFarm.version; + # upstream isn't tagged, but we are using the latest official commit for that specific asf version (assuming both get updated at the same time) + version = ArchiSteamFarm.version; - nativeBuildInputs = [ pkgs.nodePackages.node-gyp-build ]; + nativeBuildInputs = [ pkgs.nodePackages.node-gyp-build ]; - postInstall = '' - patchShebangs node_modules/ - npm run build - cp -r $out/lib/node_modules/asf-ui/dist $out/lib/dist - rm -rf $out/lib/node_modules/ - ''; + postInstall = '' + patchShebangs node_modules/ + npm run build + cp -r $out/lib/node_modules/asf-ui/dist $out/lib/dist + rm -rf $out/lib/node_modules/ + ''; - meta = with lib; { - description = "The official web interface for ASF"; - license = licenses.apsl20; - homepage = "https://github.com/JustArchiNET/ASF-ui"; - platforms = ArchiSteamFarm.meta.platforms; - maintainers = with maintainers; [ lom ]; - }; - } + meta = with lib; { + description = "The official web interface for ASF"; + license = licenses.apsl20; + homepage = "https://github.com/JustArchiNET/ASF-ui"; + inherit (ArchiSteamFarm.meta) maintainers platforms; + }; +} diff --git a/pkgs/applications/misc/ArchiSteamFarm/web-ui/node-packages.nix b/pkgs/applications/misc/ArchiSteamFarm/web-ui/node-packages.nix index 38f965ffa8b3f..5de9d220ab743 100644 --- a/pkgs/applications/misc/ArchiSteamFarm/web-ui/node-packages.nix +++ b/pkgs/applications/misc/ArchiSteamFarm/web-ui/node-packages.nix @@ -31,13 +31,13 @@ let sha512 = "GZt/TCsG70Ms19gfZO1tM4CVnXsPgEPBCpJu+Qz3L0LUDsY5nZqFZglIoPC1kIYOtNBZlrnFT+klg12vFGZXrw=="; }; }; - "@babel/core-7.18.2" = { + "@babel/core-7.18.5" = { name = "_at_babel_slash_core"; packageName = "@babel/core"; - version = "7.18.2"; + version = "7.18.5"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/core/-/core-7.18.2.tgz"; - sha512 = "A8pri1YJiC5UnkdrWcmfZTJTV85b4UXTAfImGmCfYmax4TR9Cw8sDS0MOk++Gp2mE/BefVJ5nwy5yzqNJbP/DQ=="; + url = "https://registry.npmjs.org/@babel/core/-/core-7.18.5.tgz"; + sha512 = "MGY8vg3DxMnctw0LdvSEojOsumc70g0t18gNyUdAZqB1Rpd1Bqo/svHGvt+UJ6JcGX+DIekGFDxxIWofBxLCnQ=="; }; }; "@babel/eslint-parser-7.18.2" = { @@ -283,13 +283,13 @@ let sha512 = "aKpPMfLvGO3Q97V0qhw/V2SWNWlwfJknuwAunU7wZLSfrM4xTBvg7E5opUVi1kJTBKihE38CPg4nBiqX83PWYw=="; }; }; - "@babel/parser-7.18.0" = { + "@babel/parser-7.18.5" = { name = "_at_babel_slash_parser"; packageName = "@babel/parser"; - version = "7.18.0"; + version = "7.18.5"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/parser/-/parser-7.18.0.tgz"; - sha512 = "AqDccGC+m5O/iUStSJy3DGRIUFu7WbY/CppZYwrEUB4N0tZlnI8CSTsgL7v5fHVFmUbRv2sd+yy27o8Ydt4MGg=="; + url = "https://registry.npmjs.org/@babel/parser/-/parser-7.18.5.tgz"; + sha512 = "YZWVaglMiplo7v8f1oMQ5ZPQr0vn7HPeZXxXWsxXJRjGVrzUFn9OxFQl1sb5wzfootjA/yChhW84BV+383FSOw=="; }; }; "@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression-7.17.12" = { @@ -904,22 +904,22 @@ let sha512 = "I8j/x8kHUrbYRTUxXrrMbfCa7jxkE7tZre39x3kjr9hvI82cK1FfqLygotcWN5kdPGWcLdWMHpSBavse5tWw3w=="; }; }; - "@babel/traverse-7.18.2" = { + "@babel/traverse-7.18.5" = { name = "_at_babel_slash_traverse"; packageName = "@babel/traverse"; - version = "7.18.2"; + version = "7.18.5"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/traverse/-/traverse-7.18.2.tgz"; - sha512 = "9eNwoeovJ6KH9zcCNnENY7DMFwTU9JdGCFtqNLfUAqtUHRCOsTOqWoffosP8vKmNYeSBUv3yVJXjfd8ucwOjUA=="; + url = "https://registry.npmjs.org/@babel/traverse/-/traverse-7.18.5.tgz"; + sha512 = "aKXj1KT66sBj0vVzk6rEeAO6Z9aiiQ68wfDgge3nHhA/my6xMM/7HGQUNumKZaoa2qUPQ5whJG9aAifsxUKfLA=="; }; }; - "@babel/types-7.18.2" = { + "@babel/types-7.18.4" = { name = "_at_babel_slash_types"; packageName = "@babel/types"; - version = "7.18.2"; + version = "7.18.4"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/types/-/types-7.18.2.tgz"; - sha512 = "0On6B8A4/+mFUto5WERt3EEuG1NznDirvwca1O8UwXQHVY8g3R7OzYgxXdOfMwLO08UrpUD/2+3Bclyq+/C94Q=="; + url = "https://registry.npmjs.org/@babel/types/-/types-7.18.4.tgz"; + sha512 = "ThN1mBcMq5pG/Vm2IcBmPPfyPXbd8S02rS+OBIDENdufvqC7Z/jHPCv9IcP01277aKtDI8g/2XysBN4hA8niiw=="; }; }; "@discoveryjs/json-ext-0.5.5" = { @@ -985,13 +985,13 @@ let sha512 = "0/5exxavOhI/D4Ovm2r3vxNojGZioPwmFrKg0ZUH69Q68uFhFPs6+dhAToh6VEQBntxPRYPuT5Cg1tpNa9JUPg=="; }; }; - "@fortawesome/vue-fontawesome-2.0.6" = { + "@fortawesome/vue-fontawesome-2.0.7" = { name = "_at_fortawesome_slash_vue-fontawesome"; packageName = "@fortawesome/vue-fontawesome"; - version = "2.0.6"; + version = "2.0.7"; src = fetchurl { - url = "https://registry.npmjs.org/@fortawesome/vue-fontawesome/-/vue-fontawesome-2.0.6.tgz"; - sha512 = "V3vT3flY15AKbUS31aZOP12awQI3aAzkr2B1KnqcHLmwrmy51DW3pwyBczKdypV8QxBZ8U68Hl2XxK2nudTxpg=="; + url = "https://registry.npmjs.org/@fortawesome/vue-fontawesome/-/vue-fontawesome-2.0.7.tgz"; + sha512 = "D1a5FJQeiCFG5a29Re5uNAUAI8SdkCPZlvf0EyfEy9XBVB7tEsL/tfXO6ToXoEOE8CAzJCwuM/PXSCHusXT5/Q=="; }; }; "@humanwhocodes/config-array-0.9.2" = { @@ -1462,31 +1462,31 @@ let sha512 = "IQboUWM4eKzWW+N/jij2sRatKMh99QEelo3Eb2q0qXkvPRISAj8Qxtmw5itwqK+TTkBuUIE45AxYPToqPtL5gg=="; }; }; - "@webpack-cli/configtest-1.1.1" = { + "@webpack-cli/configtest-1.2.0" = { name = "_at_webpack-cli_slash_configtest"; packageName = "@webpack-cli/configtest"; - version = "1.1.1"; + version = "1.2.0"; src = fetchurl { - url = "https://registry.npmjs.org/@webpack-cli/configtest/-/configtest-1.1.1.tgz"; - sha512 = "1FBc1f9G4P/AxMqIgfZgeOTuRnwZMten8E7zap5zgpPInnCrP8D4Q81+4CWIch8i/Nf7nXjP0v6CjjbHOrXhKg=="; + url = "https://registry.npmjs.org/@webpack-cli/configtest/-/configtest-1.2.0.tgz"; + sha512 = "4FB8Tj6xyVkyqjj1OaTqCjXYULB9FMkqQ8yGrZjRDrYh0nOE+7Lhs45WioWQQMV+ceFlE368Ukhe6xdvJM9Egg=="; }; }; - "@webpack-cli/info-1.4.1" = { + "@webpack-cli/info-1.5.0" = { name = "_at_webpack-cli_slash_info"; packageName = "@webpack-cli/info"; - version = "1.4.1"; + version = "1.5.0"; src = fetchurl { - url = "https://registry.npmjs.org/@webpack-cli/info/-/info-1.4.1.tgz"; - sha512 = "PKVGmazEq3oAo46Q63tpMr4HipI3OPfP7LiNOEJg963RMgT0rqheag28NCML0o3GIzA3DmxP1ZIAv9oTX1CUIA=="; + url = "https://registry.npmjs.org/@webpack-cli/info/-/info-1.5.0.tgz"; + sha512 = "e8tSXZpw2hPl2uMJY6fsMswaok5FdlGNRTktvFk2sD8RjH0hE2+XistawJx1vmKteh4NmGmNUrp+Tb2w+udPcQ=="; }; }; - "@webpack-cli/serve-1.6.1" = { + "@webpack-cli/serve-1.7.0" = { name = "_at_webpack-cli_slash_serve"; packageName = "@webpack-cli/serve"; - version = "1.6.1"; + version = "1.7.0"; src = fetchurl { - url = "https://registry.npmjs.org/@webpack-cli/serve/-/serve-1.6.1.tgz"; - sha512 = "gNGTiTrjEVQ0OcVnzsRSqTxaBSr+dmTfm+qJsCDluky8uhdLWep7Gcr62QsAKHTMxjCS/8nEITsmFAhfIx+QSw=="; + url = "https://registry.npmjs.org/@webpack-cli/serve/-/serve-1.7.0.tgz"; + sha512 = "oxnCNGj88fL+xzV+dacXs44HcDwf1ovs3AuEzvP7mqXw7fQntqIhQ1BRmynh4qEKQSSSRSWVyXRjmTbZIX9V2Q=="; }; }; "@xtuc/ieee754-1.2.0" = { @@ -1516,15 +1516,6 @@ let sha512 = "PYAthTa2m2VKxuvSD3DPC/Gy+U+sOA1LAuT8mkmRuvw+NACSaeXEQ+NHcVF7rONl6qcaxV3Uuemwawk+7+SJLw=="; }; }; - "acorn-7.4.1" = { - name = "acorn"; - packageName = "acorn"; - version = "7.4.1"; - src = fetchurl { - url = "https://registry.npmjs.org/acorn/-/acorn-7.4.1.tgz"; - sha512 = "nQyp0o1/mNdbTO1PO6kHkwSrmgZ0MT/jCCpNiwbUjGoRN4dlBhqJtoQuCnEOKzgTVwg0ZWiCoQy6SxMebQVh8A=="; - }; - }; "acorn-8.7.1" = { name = "acorn"; packageName = "acorn"; @@ -1606,15 +1597,6 @@ let sha512 = "x9VuX+R/jcFj1DHo/fCp99esgGDWiHENrKxaCENuCxpoMCmAt/COCGVDwA7kleEpEzJjDnvh3yGoOuLu0Dtllw=="; }; }; - "ajv-8.9.0" = { - name = "ajv"; - packageName = "ajv"; - version = "8.9.0"; - src = fetchurl { - url = "https://registry.npmjs.org/ajv/-/ajv-8.9.0.tgz"; - sha512 = "qOKJyNj/h+OWx7s5DePL6Zu1KeM9jPZhwBqs+7DzP6bGOvqzVCSf0xueYmVuaC/oQ/VtS2zLMLHdQFbkka+XDQ=="; - }; - }; "ajv-formats-2.1.1" = { name = "ajv-formats"; packageName = "ajv-formats"; @@ -1732,15 +1714,6 @@ let sha1 = "9a34410e4f4e3da23dea375be5be70f24778ec39"; }; }; - "array-union-3.0.1" = { - name = "array-union"; - packageName = "array-union"; - version = "3.0.1"; - src = fetchurl { - url = "https://registry.npmjs.org/array-union/-/array-union-3.0.1.tgz"; - sha512 = "1OvF9IbWwaeiM9VhzYXVQacMibxpXOMYVNIvMtKRyX9SImBXpKcFr8XvFDeEslCyuH/t6KRt7HEO94AlP8Iatw=="; - }; - }; "array-uniq-1.0.3" = { name = "array-uniq"; packageName = "array-uniq"; @@ -2263,13 +2236,13 @@ let sha512 = "i13qo6kIHTTpCm8/Wup+0b1mVWETvu2kIMzKoK8FpkLkFxlt0znUAHcMzox+T8sPlqtZXq3CulEjQHsYiGFJUw=="; }; }; - "copy-webpack-plugin-10.2.4" = { + "copy-webpack-plugin-11.0.0" = { name = "copy-webpack-plugin"; packageName = "copy-webpack-plugin"; - version = "10.2.4"; + version = "11.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/copy-webpack-plugin/-/copy-webpack-plugin-10.2.4.tgz"; - sha512 = "xFVltahqlsRcyyJqQbDY6EYTtyQZF9rf+JPjwHObLdPFMEISqkFkr7mFoVOC6BfYS/dNThyoQKvziugm+OnwBg=="; + url = "https://registry.npmjs.org/copy-webpack-plugin/-/copy-webpack-plugin-11.0.0.tgz"; + sha512 = "fX2MWpamkW0hZxMEg0+mYnA40LTosOSa5TqZ9GYIBzyJa9C3QUaMPSE2xAi/buNr8u89SfD9wHSQVBzrRa/SOQ=="; }; }; "core-js-compat-3.22.3" = { @@ -2362,15 +2335,6 @@ let sha512 = "CFjzYYAi4ThfiQvizrFQevTTXHtnCqWfe7x1AhgEscTz6ZbLbfoLRLPugTQyBth6f8ZERVUSyWHFD/7Wu4t1XQ=="; }; }; - "debug-4.3.2" = { - name = "debug"; - packageName = "debug"; - version = "4.3.2"; - src = fetchurl { - url = "https://registry.npmjs.org/debug/-/debug-4.3.2.tgz"; - sha512 = "mOp8wKcvj7XxC78zLgw/ZA+6TSgkoE2C/ienthhRD298T7UNwAg9diBpLRxC0mOezLl4B0xV7M0cCO6P/O0Xhw=="; - }; - }; "debug-4.3.3" = { name = "debug"; packageName = "debug"; @@ -2713,13 +2677,13 @@ let sha512 = "TtpcNJ3XAzx3Gq8sWRzJaVajRs0uVxA2YAkdb1jm2YkPz4G6egUFAyA3n5vtEIZefPk5Wa4UXbKuS5fKkJWdgA=="; }; }; - "eslint-8.16.0" = { + "eslint-8.17.0" = { name = "eslint"; packageName = "eslint"; - version = "8.16.0"; + version = "8.17.0"; src = fetchurl { - url = "https://registry.npmjs.org/eslint/-/eslint-8.16.0.tgz"; - sha512 = "MBndsoXY/PeVTDJeWsYj7kLZ5hQpJOfMYLsF6LicLHQWbRDG19lK5jOix4DPl8yY4SUFcE3txy86OzFLWT+yoA=="; + url = "https://registry.npmjs.org/eslint/-/eslint-8.17.0.tgz"; + sha512 = "gq0m0BTJfci60Fz4nczYxNAlED+sMcihltndR8t9t1evnU/azx53x3t2UHXC/uRjcbvRw/XctpaNygSTcQD+Iw=="; }; }; "eslint-config-airbnb-base-15.0.0" = { @@ -2758,13 +2722,13 @@ let sha512 = "hYfi3FXaM8WPLf4S1cikh/r4IxnO6zrhZbEGz2b660EJRbuxgpDS5gkCuYgGWg2xxh2rBuIr4Pvhve/7c31koA=="; }; }; - "eslint-plugin-vue-7.20.0" = { + "eslint-plugin-vue-9.1.1" = { name = "eslint-plugin-vue"; packageName = "eslint-plugin-vue"; - version = "7.20.0"; + version = "9.1.1"; src = fetchurl { - url = "https://registry.npmjs.org/eslint-plugin-vue/-/eslint-plugin-vue-7.20.0.tgz"; - sha512 = "oVNDqzBC9h3GO+NTgWeLMhhGigy6/bQaQbHS+0z7C4YEu/qK/yxHvca/2PTZtGNPsCrHwOTgKMrwu02A9iPBmw=="; + url = "https://registry.npmjs.org/eslint-plugin-vue/-/eslint-plugin-vue-9.1.1.tgz"; + sha512 = "W9n5PB1X2jzC7CK6riG0oAcxjmKrjTF6+keL1rni8n57DZeilx/Fulz+IRJK3lYseLNAygN0I62L7DvioW40Tw=="; }; }; "eslint-scope-5.1.1" = { @@ -2785,15 +2749,6 @@ let sha512 = "QKQM/UXpIiHcLqJ5AOyIW7XZmzjkzQXYE54n1++wb0u9V/abW3l9uQnxX8Z5Xd18xyKIMTUAyQ0k1e8pz6LUrw=="; }; }; - "eslint-utils-2.1.0" = { - name = "eslint-utils"; - packageName = "eslint-utils"; - version = "2.1.0"; - src = fetchurl { - url = "https://registry.npmjs.org/eslint-utils/-/eslint-utils-2.1.0.tgz"; - sha512 = "w94dQYoauyvlDc43XnGB8lU3Zt713vNChgt4EWwhXAP2XkBvndfxF0AgIqKOOasjPIPzj9JqgwkwbCYD0/V3Zg=="; - }; - }; "eslint-utils-3.0.0" = { name = "eslint-utils"; packageName = "eslint-utils"; @@ -2803,15 +2758,6 @@ let sha512 = "uuQC43IGctw68pJA1RgbQS8/NP7rch6Cwd4j3ZBtgo4/8Flj4eGE7ZYSZRN3iq5pVUv6GPdW5Z1RFleo84uLDA=="; }; }; - "eslint-visitor-keys-1.3.0" = { - name = "eslint-visitor-keys"; - packageName = "eslint-visitor-keys"; - version = "1.3.0"; - src = fetchurl { - url = "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-1.3.0.tgz"; - sha512 = "6J72N8UNa462wa/KFODt/PJ3IU60SDpC3QXC1Hjc1BXXpfL2C9R5+AU7jhe0F6GREqVMh4Juu+NY7xn+6dipUQ=="; - }; - }; "eslint-visitor-keys-2.1.0" = { name = "eslint-visitor-keys"; packageName = "eslint-visitor-keys"; @@ -2830,24 +2776,6 @@ let sha512 = "mQ+suqKJVyeuwGYHAdjMFqjCyfl8+Ldnxuyp3ldiMBFKkvytrXUZWaiPCEav8qDHKty44bD+qV1IP4T+w+xXRA=="; }; }; - "espree-6.2.1" = { - name = "espree"; - packageName = "espree"; - version = "6.2.1"; - src = fetchurl { - url = "https://registry.npmjs.org/espree/-/espree-6.2.1.tgz"; - sha512 = "ysCxRQY3WaXJz9tdbWOwuWr5Y/XrPTGX9Kiz3yoUXwW0VZ4w30HTkQLaGx/+ttFjF8i+ACbArnB4ce68a9m5hw=="; - }; - }; - "espree-9.3.1" = { - name = "espree"; - packageName = "espree"; - version = "9.3.1"; - src = fetchurl { - url = "https://registry.npmjs.org/espree/-/espree-9.3.1.tgz"; - sha512 = "bvdyLmJMfwkV3NCRl5ZhJf22zBFo1y8bYh3VYb+bfzqNB4Je68P2sSuXyuFquzWLebHpNd2/d5uv7yoP9ISnGQ=="; - }; - }; "espree-9.3.2" = { name = "espree"; packageName = "espree"; @@ -3289,13 +3217,13 @@ let sha512 = "bpzcOlgDhMG070Av0Vy5Owklpv1I6+j96GhUI7Rh7IzDCKLzboflLrrfqMu8NquDbiR4EOQk7XzJwqVJxicxog=="; }; }; - "globby-12.2.0" = { + "globby-13.1.1" = { name = "globby"; packageName = "globby"; - version = "12.2.0"; + version = "13.1.1"; src = fetchurl { - url = "https://registry.npmjs.org/globby/-/globby-12.2.0.tgz"; - sha512 = "wiSuFQLZ+urS9x2gGPl1H5drc5twabmm4m2gTR27XDFyjUHJUNsS8o/2aKyIF6IoBaR630atdher0XJ5g6OMmA=="; + url = "https://registry.npmjs.org/globby/-/globby-13.1.1.tgz"; + sha512 = "XMzoDZbGZ37tufiv7g0N4F/zp3zkwdFtVbV3EHsVl1KQr4RPLfNoT068/97RPshz2J5xYNEjLKKBKaGHifBd3Q=="; }; }; "globby-6.1.0" = { @@ -3604,15 +3532,6 @@ let sha1 = "9218b9b2b928a238b13dc4fb6b6d576f231453ea"; }; }; - "indexes-of-1.0.1" = { - name = "indexes-of"; - packageName = "indexes-of"; - version = "1.0.1"; - src = fetchurl { - url = "https://registry.npmjs.org/indexes-of/-/indexes-of-1.0.1.tgz"; - sha1 = "f30f716c8e2bd346c7b67d3df3915566a7c05607"; - }; - }; "inflight-1.0.6" = { name = "inflight"; packageName = "inflight"; @@ -4954,22 +4873,13 @@ let sha512 = "RDxHkAiEGI78gS2ofyvCsu7iycRv7oqw5xMWn9iMoR0N/7mf9D50ecQqUo5BZ9Zh2vH4bCUR/ktCqbB9m8vJjQ=="; }; }; - "postcss-selector-parser-6.0.2" = { + "postcss-selector-parser-6.0.10" = { name = "postcss-selector-parser"; packageName = "postcss-selector-parser"; - version = "6.0.2"; + version = "6.0.10"; src = fetchurl { - url = "https://registry.npmjs.org/postcss-selector-parser/-/postcss-selector-parser-6.0.2.tgz"; - sha512 = "36P2QR59jDTOAiIkqEprfJDsoNrvwFei3eCqKd1Y0tUsBimsq39BLp7RD+JWny3WgB1zGhJX8XVePwm9k4wdBg=="; - }; - }; - "postcss-selector-parser-6.0.6" = { - name = "postcss-selector-parser"; - packageName = "postcss-selector-parser"; - version = "6.0.6"; - src = fetchurl { - url = "https://registry.npmjs.org/postcss-selector-parser/-/postcss-selector-parser-6.0.6.tgz"; - sha512 = "9LXrvaaX3+mcv5xkg5kFwqSzSH1JIObIx51PrndZwlmznwXRfxMddDvo9gve3gVR8ZTKgoFDdWkbRFmEhT4PMg=="; + url = "https://registry.npmjs.org/postcss-selector-parser/-/postcss-selector-parser-6.0.10.tgz"; + sha512 = "IQ7TZdoaqbT+LCpShg46jnZVlhWD2w6iQYAcYXfHARZ7X1t/UGhhceQDs5X0cGqKvYlHNOuv7Oa1xmb0oQuA3w=="; }; }; "postcss-value-parser-4.2.0" = { @@ -5341,22 +5251,22 @@ let sha512 = "YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg=="; }; }; - "sass-1.52.1" = { + "sass-1.52.3" = { name = "sass"; packageName = "sass"; - version = "1.52.1"; + version = "1.52.3"; src = fetchurl { - url = "https://registry.npmjs.org/sass/-/sass-1.52.1.tgz"; - sha512 = "fSzYTbr7z8oQnVJ3Acp9hV80dM1fkMN7mSD/25mpcct9F7FPBMOI8krEYALgU1aZoqGhQNhTPsuSmxjnIvAm4Q=="; + url = "https://registry.npmjs.org/sass/-/sass-1.52.3.tgz"; + sha512 = "LNNPJ9lafx+j1ArtA7GyEJm9eawXN8KlA1+5dF6IZyoONg1Tyo/g+muOsENWJH/2Q1FHbbV4UwliU0cXMa/VIA=="; }; }; - "sass-loader-12.6.0" = { + "sass-loader-13.0.0" = { name = "sass-loader"; packageName = "sass-loader"; - version = "12.6.0"; + version = "13.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/sass-loader/-/sass-loader-12.6.0.tgz"; - sha512 = "oLTaH0YCtX4cfnJZxKSLAyglED0naiYfNG1iXfU5w1LNZ+ukoA5DtyDIN5zmKVZwYNJP4KRc5Y3hkWga+7tYfA=="; + url = "https://registry.npmjs.org/sass-loader/-/sass-loader-13.0.0.tgz"; + sha512 = "IHCFecI+rbPvXE2zO/mqdVFe8MU7ElGrwga9hh2H65Ru4iaBJAMRteum1c4Gsxi9Cq1FOtTEDd6+/AEYuQDM4Q=="; }; }; "schema-utils-2.7.1" = { @@ -5431,13 +5341,13 @@ let sha512 = "+GB6zVA9LWh6zovYQLALHwv5rb2PHGlJi3lfiqIHxR0uuwCgefcOJc59v9fv1w8GbStwxuuqqAjI9NMAOOgq1A=="; }; }; - "semver-7.3.5" = { + "semver-7.3.7" = { name = "semver"; packageName = "semver"; - version = "7.3.5"; + version = "7.3.7"; src = fetchurl { - url = "https://registry.npmjs.org/semver/-/semver-7.3.5.tgz"; - sha512 = "PoeGJYh8HK4BTO/a9Tf6ZG3veo/A7ZVsYrSA6J8ny9nb3B1VrpkuN+z9OE5wfE5p6H4LchYZsegiQgbJD94ZFQ=="; + url = "https://registry.npmjs.org/semver/-/semver-7.3.7.tgz"; + sha512 = "QlYTucUYOews+WeEujDoEGziz4K6c47V/Bd+LjSSYcA94p+DmINdf7ncaUinThfvZyu13lN9OY1XDxt8C0Tw0g=="; }; }; "send-0.17.2" = { @@ -5926,15 +5836,6 @@ let sha512 = "5Zfuy9q/DFr4tfO7ZPeVXb1aPoeQSdeFMLpYuFebehDAhbuevLs5yxSZmIFN1tP5F9Wl4IpJrYojg85/zgyZHQ=="; }; }; - "uniq-1.0.1" = { - name = "uniq"; - packageName = "uniq"; - version = "1.0.1"; - src = fetchurl { - url = "https://registry.npmjs.org/uniq/-/uniq-1.0.1.tgz"; - sha1 = "b31c5ae8254844a3a8281541ce2b04b865a734ff"; - }; - }; "unpipe-1.0.0" = { name = "unpipe"; packageName = "unpipe"; @@ -6034,22 +5935,22 @@ let sha512 = "x2284lgYvjOMj3Za7kqzRcUSxBboHqtgRE2zlos1qWaOye5yUmHn42LB1250NJBLRwEcdrB0JRwyPTEPhfQjiQ=="; }; }; - "vue-eslint-parser-7.11.0" = { + "vue-eslint-parser-8.3.0" = { name = "vue-eslint-parser"; packageName = "vue-eslint-parser"; - version = "7.11.0"; + version = "8.3.0"; src = fetchurl { - url = "https://registry.npmjs.org/vue-eslint-parser/-/vue-eslint-parser-7.11.0.tgz"; - sha512 = "qh3VhDLeh773wjgNTl7ss0VejY9bMMa0GoDG2fQVyDzRFdiU3L7fw74tWZDHNQXdZqxO3EveQroa9ct39D2nqg=="; + url = "https://registry.npmjs.org/vue-eslint-parser/-/vue-eslint-parser-8.3.0.tgz"; + sha512 = "dzHGG3+sYwSf6zFBa0Gi9ZDshD7+ad14DGOdTLjruRVgZXe2J+DcZ9iUhyR48z5g1PqRa20yt3Njna/veLJL/g=="; }; }; - "vue-eslint-parser-8.3.0" = { + "vue-eslint-parser-9.0.2" = { name = "vue-eslint-parser"; packageName = "vue-eslint-parser"; - version = "8.3.0"; + version = "9.0.2"; src = fetchurl { - url = "https://registry.npmjs.org/vue-eslint-parser/-/vue-eslint-parser-8.3.0.tgz"; - sha512 = "dzHGG3+sYwSf6zFBa0Gi9ZDshD7+ad14DGOdTLjruRVgZXe2J+DcZ9iUhyR48z5g1PqRa20yt3Njna/veLJL/g=="; + url = "https://registry.npmjs.org/vue-eslint-parser/-/vue-eslint-parser-9.0.2.tgz"; + sha512 = "uCPQwTGjOtAYrwnU+76pYxalhjsh7iFBsHwBqDHiOPTxtICDaraO4Szw54WFTNZTAEsgHHzqFOu1mmnBOBRzDA=="; }; }; "vue-hot-reload-api-2.3.4" = { @@ -6169,13 +6070,13 @@ let sha512 = "O84QOnr0icsbFGLS0O3bI5FswxzRr8/gHwWkDlQFskhSPryQXvrTMxjxGP4+iWYoauLoBvfDpkrOauZ+0iZpDA=="; }; }; - "webpack-5.72.1" = { + "webpack-5.73.0" = { name = "webpack"; packageName = "webpack"; - version = "5.72.1"; + version = "5.73.0"; src = fetchurl { - url = "https://registry.npmjs.org/webpack/-/webpack-5.72.1.tgz"; - sha512 = "dXG5zXCLspQR4krZVR6QgajnZOjW2K/djHvdcRaDQvsjV9z9vaW6+ja5dZOYbqBBjF6kGXka/2ZyxNdc+8Jung=="; + url = "https://registry.npmjs.org/webpack/-/webpack-5.73.0.tgz"; + sha512 = "svjudQRPPa0YiOYa2lM/Gacw0r6PvxptHj4FuEKQ2kX05ZLkjbVc5MnPs6its5j7IZljnIqSVo/OsY2X0IpHGA=="; }; }; "webpack-bundle-analyzer-4.5.0" = { @@ -6187,13 +6088,13 @@ let sha512 = "GUMZlM3SKwS8Z+CKeIFx7CVoHn3dXFcUAjT/dcZQQmfSZGvitPfMob2ipjai7ovFFqPvTqkEZ/leL4O0YOdAYQ=="; }; }; - "webpack-cli-4.9.2" = { + "webpack-cli-4.10.0" = { name = "webpack-cli"; packageName = "webpack-cli"; - version = "4.9.2"; + version = "4.10.0"; src = fetchurl { - url = "https://registry.npmjs.org/webpack-cli/-/webpack-cli-4.9.2.tgz"; - sha512 = "m3/AACnBBzK/kMTcxWHcZFPrw/eQuY4Df1TxvIWfWM2x7mRqBQCqKEd96oCUa9jkapLBaFfRce33eGDb4Pr7YQ=="; + url = "https://registry.npmjs.org/webpack-cli/-/webpack-cli-4.10.0.tgz"; + sha512 = "NLhDfH/h4O6UOy+0LSso42xvYypClINuMNBVVzX4vX98TmTaTUxwRbXdhucbFMd2qLaCTcLq/PdYrvi8onw90w=="; }; }; "webpack-dev-middleware-5.3.1" = { @@ -6205,13 +6106,13 @@ let sha512 = "81EujCKkyles2wphtdrnPg/QqegC/AtqNH//mQkBYSMqwFVCQrxM6ktB2O/SPlZy7LqeEfTbV3cZARGQz6umhg=="; }; }; - "webpack-dev-server-4.9.1" = { + "webpack-dev-server-4.9.2" = { name = "webpack-dev-server"; packageName = "webpack-dev-server"; - version = "4.9.1"; + version = "4.9.2"; src = fetchurl { - url = "https://registry.npmjs.org/webpack-dev-server/-/webpack-dev-server-4.9.1.tgz"; - sha512 = "CTMfu2UMdR/4OOZVHRpdy84pNopOuigVIsRbGX3LVDMWNP8EUgC5mUBMErbwBlHTEX99ejZJpVqrir6EXAEajA=="; + url = "https://registry.npmjs.org/webpack-dev-server/-/webpack-dev-server-4.9.2.tgz"; + sha512 = "H95Ns95dP24ZsEzO6G9iT+PNw4Q7ltll1GfJHV4fKphuHWgKFzGHWi4alTlTnpk1SPPk41X+l2RB7rLfIhnB9Q=="; }; }; "webpack-merge-5.8.0" = { @@ -6322,6 +6223,15 @@ let sha512 = "Kbk4Nxyq7/ZWqr/tarI9yIt/+iNNFOjBXEWgTb4ydaNHBNGgvf2QHbS9fdfsndfjFlFwEd4Al+mw83YkaD10ZA=="; }; }; + "xml-name-validator-4.0.0" = { + name = "xml-name-validator"; + packageName = "xml-name-validator"; + version = "4.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/xml-name-validator/-/xml-name-validator-4.0.0.tgz"; + sha512 = "ICP2e+jsHvAj2E2lIHxa5tjXRlKDJo4IdvPvCXbXQGdzSfmSpNVyIKMvoZHjDY9DP0zV17iI85o90vRFXNccRw=="; + }; + }; "yallist-2.1.2" = { name = "yallist"; packageName = "yallist"; @@ -6350,7 +6260,7 @@ let sources."@ampproject/remapping-2.1.1" sources."@babel/code-frame-7.16.7" sources."@babel/compat-data-7.17.10" - (sources."@babel/core-7.18.2" // { + (sources."@babel/core-7.18.5" // { dependencies = [ sources."debug-4.3.4" sources."json5-2.2.1" @@ -6400,7 +6310,7 @@ let sources."@babel/helper-wrap-function-7.16.8" sources."@babel/helpers-7.18.2" sources."@babel/highlight-7.16.7" - sources."@babel/parser-7.18.0" + sources."@babel/parser-7.18.5" sources."@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression-7.17.12" sources."@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining-7.17.12" sources."@babel/plugin-proposal-async-generator-functions-7.17.12" @@ -6473,19 +6383,17 @@ let sources."@babel/preset-modules-0.1.5" sources."@babel/runtime-7.14.6" sources."@babel/template-7.16.7" - (sources."@babel/traverse-7.18.2" // { + (sources."@babel/traverse-7.18.5" // { dependencies = [ sources."debug-4.3.3" sources."ms-2.1.2" ]; }) - sources."@babel/types-7.18.2" + sources."@babel/types-7.18.4" sources."@discoveryjs/json-ext-0.5.5" (sources."@eslint/eslintrc-1.3.0" // { dependencies = [ sources."debug-4.3.3" - sources."eslint-visitor-keys-3.3.0" - sources."espree-9.3.2" sources."globals-13.15.0" sources."ms-2.1.2" ]; @@ -6502,7 +6410,7 @@ let sources."@fortawesome/fontawesome-common-types-6.1.1" ]; }) - sources."@fortawesome/vue-fontawesome-2.0.6" + sources."@fortawesome/vue-fontawesome-2.0.7" (sources."@humanwhocodes/config-array-0.9.2" // { dependencies = [ sources."debug-4.3.3" @@ -6566,9 +6474,9 @@ let sources."@webassemblyjs/wasm-opt-1.11.1" sources."@webassemblyjs/wasm-parser-1.11.1" sources."@webassemblyjs/wast-printer-1.11.1" - sources."@webpack-cli/configtest-1.1.1" - sources."@webpack-cli/info-1.4.1" - sources."@webpack-cli/serve-1.6.1" + sources."@webpack-cli/configtest-1.2.0" + sources."@webpack-cli/info-1.5.0" + sources."@webpack-cli/serve-1.7.0" sources."@xtuc/ieee754-1.2.0" sources."@xtuc/long-4.2.2" sources."accepts-1.3.8" @@ -6682,16 +6590,14 @@ let sources."cookie-0.4.2" sources."cookie-signature-1.0.6" sources."copy-to-clipboard-3.3.1" - (sources."copy-webpack-plugin-10.2.4" // { + (sources."copy-webpack-plugin-11.0.0" // { dependencies = [ - sources."ajv-8.9.0" + sources."ajv-8.11.0" sources."ajv-keywords-5.1.0" - sources."array-union-3.0.1" sources."glob-parent-6.0.2" - sources."globby-12.2.0" + sources."globby-13.1.1" sources."json-schema-traverse-1.0.0" sources."schema-utils-4.0.0" - sources."slash-4.0.0" ]; }) (sources."core-js-compat-3.22.3" // { @@ -6760,7 +6666,7 @@ let sources."escalade-3.1.1" sources."escape-html-1.0.3" sources."escape-string-regexp-1.0.5" - (sources."eslint-8.16.0" // { + (sources."eslint-8.17.0" // { dependencies = [ sources."ansi-styles-4.3.0" sources."chalk-4.1.2" @@ -6769,13 +6675,6 @@ let sources."debug-4.3.4" sources."escape-string-regexp-4.0.0" sources."eslint-scope-7.1.1" - (sources."eslint-utils-3.0.0" // { - dependencies = [ - sources."eslint-visitor-keys-2.1.0" - ]; - }) - sources."eslint-visitor-keys-3.3.0" - sources."espree-9.3.2" sources."estraverse-5.3.0" sources."glob-parent-6.0.2" sources."globals-13.15.0" @@ -6806,22 +6705,23 @@ let sources."doctrine-2.1.0" ]; }) - (sources."eslint-plugin-vue-7.20.0" // { + (sources."eslint-plugin-vue-9.1.1" // { dependencies = [ - sources."debug-4.3.2" + sources."debug-4.3.4" + sources."eslint-scope-7.1.1" + sources."estraverse-5.3.0" sources."ms-2.1.2" - sources."semver-6.3.0" - sources."vue-eslint-parser-7.11.0" + sources."vue-eslint-parser-9.0.2" ]; }) sources."eslint-scope-5.1.1" - sources."eslint-utils-2.1.0" - sources."eslint-visitor-keys-1.3.0" - (sources."espree-6.2.1" // { + (sources."eslint-utils-3.0.0" // { dependencies = [ - sources."acorn-7.4.1" + sources."eslint-visitor-keys-2.1.0" ]; }) + sources."eslint-visitor-keys-3.3.0" + sources."espree-9.3.2" (sources."esquery-1.4.0" // { dependencies = [ sources."estraverse-5.2.0" @@ -6974,7 +6874,6 @@ let ]; }) sources."imurmurhash-0.1.4" - sources."indexes-of-1.0.1" sources."inflight-1.0.6" sources."inherits-2.0.3" (sources."internal-slot-1.0.3" // { @@ -7147,13 +7046,9 @@ let sources."postcss-8.4.12" sources."postcss-modules-extract-imports-3.0.0" sources."postcss-modules-local-by-default-4.0.0" - (sources."postcss-modules-scope-3.0.0" // { - dependencies = [ - sources."postcss-selector-parser-6.0.6" - ]; - }) + sources."postcss-modules-scope-3.0.0" sources."postcss-modules-values-4.0.0" - sources."postcss-selector-parser-6.0.2" + sources."postcss-selector-parser-6.0.10" sources."postcss-value-parser-4.2.0" sources."prelude-ls-1.2.1" sources."prettier-1.19.1" @@ -7203,12 +7098,12 @@ let sources."run-parallel-1.2.0" sources."safe-buffer-5.1.2" sources."safer-buffer-2.1.2" - sources."sass-1.52.1" - sources."sass-loader-12.6.0" + sources."sass-1.52.3" + sources."sass-loader-13.0.0" sources."schema-utils-3.1.1" sources."select-hose-2.0.0" sources."selfsigned-2.0.1" - (sources."semver-7.3.5" // { + (sources."semver-7.3.7" // { dependencies = [ sources."lru-cache-6.0.0" sources."yallist-4.0.0" @@ -7240,6 +7135,7 @@ let }) sources."signal-exit-3.0.3" sources."sirv-1.0.17" + sources."slash-4.0.0" sources."sockjs-0.3.24" sources."source-map-js-1.0.2" (sources."spdy-4.0.2" // { @@ -7301,7 +7197,6 @@ let sources."unicode-match-property-ecmascript-2.0.0" sources."unicode-match-property-value-ecmascript-2.0.0" sources."unicode-property-aliases-ecmascript-2.0.0" - sources."uniq-1.0.1" sources."unpipe-1.0.0" sources."uri-js-4.2.2" (sources."url-loader-4.1.1" // { @@ -7326,8 +7221,6 @@ let dependencies = [ sources."debug-4.3.3" sources."eslint-scope-7.1.1" - sources."eslint-visitor-keys-3.3.0" - sources."espree-9.3.1" sources."estraverse-5.3.0" sources."ms-2.1.2" ]; @@ -7345,7 +7238,7 @@ let sources."vuex-3.6.2" sources."watchpack-2.3.1" sources."wbuf-1.7.3" - sources."webpack-5.72.1" + sources."webpack-5.73.0" (sources."webpack-bundle-analyzer-4.5.0" // { dependencies = [ sources."ansi-styles-4.3.0" @@ -7358,7 +7251,7 @@ let sources."ws-7.5.5" ]; }) - (sources."webpack-cli-4.9.2" // { + (sources."webpack-cli-4.10.0" // { dependencies = [ sources."commander-7.2.0" ]; @@ -7371,7 +7264,7 @@ let sources."schema-utils-4.0.0" ]; }) - (sources."webpack-dev-server-4.9.1" // { + (sources."webpack-dev-server-4.9.2" // { dependencies = [ sources."ajv-8.11.0" sources."ajv-keywords-5.1.0" @@ -7395,6 +7288,7 @@ let sources."word-wrap-1.2.3" sources."wrappy-1.0.2" sources."ws-8.4.2" + sources."xml-name-validator-4.0.0" sources."yallist-2.1.2" ]; buildInputs = globalBuildInputs; diff --git a/pkgs/applications/misc/dunst/default.nix b/pkgs/applications/misc/dunst/default.nix index 6afd9ee624208..24bfaf785e1f8 100644 --- a/pkgs/applications/misc/dunst/default.nix +++ b/pkgs/applications/misc/dunst/default.nix @@ -8,13 +8,13 @@ stdenv.mkDerivation rec { pname = "dunst"; - version = "1.8.1"; + version = "1.9.0"; src = fetchFromGitHub { owner = "dunst-project"; repo = "dunst"; rev = "v${version}"; - sha256 = "sha256-aMla5mzQpN9CNDc4QSxjcKR+Ufej+8WLBYxCntApcKU="; + sha256 = "sha256-fRPhu+kpwLPvdzIpXSjXFzQTfv4xewOMv/1ZqLJw3dk="; }; nativeBuildInputs = [ perl pkg-config which systemd makeWrapper ]; diff --git a/pkgs/applications/networking/browsers/chromium/upstream-info.json b/pkgs/applications/networking/browsers/chromium/upstream-info.json index db8c24ec58504..548910540fa5a 100644 --- a/pkgs/applications/networking/browsers/chromium/upstream-info.json +++ b/pkgs/applications/networking/browsers/chromium/upstream-info.json @@ -19,9 +19,9 @@ } }, "beta": { - "version": "104.0.5112.20", - "sha256": "0adzdk3m2l4pjlk82sqavwgxf6a5darbiwchmlrsxc58p9xxag4s", - "sha256bin64": "1cm5k4gpxc0dn0vdqf3qwwf36pc77va9pnci84zcpaxx0jih7l9b", + "version": "104.0.5112.29", + "sha256": "1cjqr1d2cgiwq7vlb26ilyw2r79wgyd7dkxaipmjiqyyrl4bfm6y", + "sha256bin64": "1vbhm3pm1jgifmg6dc4aqi7xf12dx37spifjs3flq4v2lixg5r6f", "deps": { "gn": { "version": "2022-06-08", diff --git a/pkgs/applications/networking/browsers/surf/default.nix b/pkgs/applications/networking/browsers/surf/default.nix index c79aa1d6f1d69..6573821d05984 100644 --- a/pkgs/applications/networking/browsers/surf/default.nix +++ b/pkgs/applications/networking/browsers/surf/default.nix @@ -1,7 +1,7 @@ { lib, stdenv, fetchgit , pkg-config, wrapGAppsHook , glib, gcr, glib-networking, gsettings-desktop-schemas, gtk, libsoup, webkitgtk -, xorg, dmenu, findutils, gnused, coreutils +, xorg, dmenu, findutils, gnused, coreutils, gst_all_1 , patches ? null }: @@ -17,7 +17,21 @@ stdenv.mkDerivation rec { }; nativeBuildInputs = [ pkg-config wrapGAppsHook ]; - buildInputs = [ glib gcr glib-networking gsettings-desktop-schemas gtk libsoup webkitgtk ]; + buildInputs = [ + glib + gcr + glib-networking + gsettings-desktop-schemas + gtk + libsoup + webkitgtk + ] ++ (with gst_all_1; [ + # Audio & video support for webkitgtk WebView + gstreamer + gst-plugins-base + gst-plugins-good + gst-plugins-bad + ]); inherit patches; diff --git a/pkgs/applications/networking/cluster/cilium/default.nix b/pkgs/applications/networking/cluster/cilium/default.nix index 74bba4b13c2fb..f9b66041d40f9 100644 --- a/pkgs/applications/networking/cluster/cilium/default.nix +++ b/pkgs/applications/networking/cluster/cilium/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "cilium-cli"; - version = "0.11.10"; + version = "0.11.11"; src = fetchFromGitHub { owner = "cilium"; repo = pname; rev = "v${version}"; - sha256 = "sha256-BkcnChxUceWGG5hBOHvzZokgcw8T/vvNwIEtHkLfUJA="; + sha256 = "sha256-IZMtkTKslFvbk/qwfZpFZAV6VUj66JKGFewXH1Ujxbw="; }; vendorSha256 = null; diff --git a/pkgs/applications/networking/cluster/tgswitch/default.nix b/pkgs/applications/networking/cluster/tgswitch/default.nix index 44c16bd4668df..31df14cebeda7 100644 --- a/pkgs/applications/networking/cluster/tgswitch/default.nix +++ b/pkgs/applications/networking/cluster/tgswitch/default.nix @@ -1,26 +1,26 @@ { buildGoModule, lib, fetchFromGitHub }: buildGoModule rec { pname = "tgswitch"; - version = "0.5.389"; + version = "0.6.0"; src = fetchFromGitHub { owner = "warrensbox"; repo = "tgswitch"; rev = version; - sha256 = "sha256-6hErfI7LEJFgOoJR8IF9jTSBwqbQYeGiwdeJShqxVQ0="; + sha256 = "sha256-Q3Cef3B7hfVHLvW8Rx6IdH9g/3luDhpUMZ8TXVpb8gQ="; }; - vendorSha256 = null; + vendorSha256 = "sha256-PlTdbA8Z2I2SWoG7oYG87VQfczx9zP1SCJx70UWOEog="; ldflags = [ "-s" "-w" ]; # There are many modifications need to be done to make tests run. For example: # 1. Network access # 2. Operation on `/var/empty` not permitted on macOS - doCheck= false; + doCheck = false; meta = with lib; { - description = "A command line tool to switch between different versions of terragrunt"; + description = "Command line tool to switch between different versions of terragrunt"; homepage = "https://github.com/warrensbox/tgswitch"; license = licenses.mit; maintainers = with maintainers; [ psibi ]; diff --git a/pkgs/applications/networking/firewalld/default.nix b/pkgs/applications/networking/firewalld/default.nix index b937c35a3f969..5ec7bf0447367 100644 --- a/pkgs/applications/networking/firewalld/default.nix +++ b/pkgs/applications/networking/firewalld/default.nix @@ -31,13 +31,13 @@ let in stdenv.mkDerivation rec { pname = "firewalld"; - version = "1.1.1"; + version = "1.2.0"; src = fetchFromGitHub { owner = "firewalld"; repo = "firewalld"; rev = "v${version}"; - sha256 = "sha256-w8TbovIhOhJAUZWbKdBd/+db8Hro/ttlxWZDcrCXX4Q="; + sha256 = "sha256-lLS4ISmx+BgAExiqNpYcSIFpSenRs4Kh25WyvTxPqPg="; }; patches = [ diff --git a/pkgs/applications/radio/m17-cxx-demod/default.nix b/pkgs/applications/radio/m17-cxx-demod/default.nix new file mode 100644 index 0000000000000..86c30686c706d --- /dev/null +++ b/pkgs/applications/radio/m17-cxx-demod/default.nix @@ -0,0 +1,24 @@ +{ lib, stdenv, fetchFromGitHub, cmake, pkg-config, boost, codec2 }: + +stdenv.mkDerivation rec { + pname = "m17-cxx-demod"; + version = "2.3"; + + src = fetchFromGitHub { + owner = "mobilinkd"; + repo = pname; + rev = "v${version}"; + hash = "sha256-mvppkFBmmPVqvlqIqrbwGrOBih5zS5sZrV/usEhHiws="; + }; + + nativeBuildInputs = [ cmake pkg-config ]; + buildInputs = [ codec2 boost ]; + + meta = with lib; { + description = "M17 Demodulator in C++"; + homepage = "https://github.com/mobilinkd/m17-cxx-demod"; + license = licenses.gpl3Only; + platforms = platforms.unix; + maintainers = teams.c3d2.members; + }; +} diff --git a/pkgs/applications/science/logic/klee/default.nix b/pkgs/applications/science/logic/klee/default.nix index 612d9fd57c7cc..ae4b7ee36636f 100644 --- a/pkgs/applications/science/logic/klee/default.nix +++ b/pkgs/applications/science/logic/klee/default.nix @@ -1,10 +1,9 @@ { lib , callPackage , fetchFromGitHub -, fetchpatch , cmake -, llvmPackages_9 -, clang_9 +, llvmPackages_11 +, clang , python3 , zlib , z3 @@ -36,31 +35,43 @@ }: let + # Python used for KLEE tests. kleePython = python3.withPackages (ps: with ps; [ tabulate ]); # The klee-uclibc derivation. kleeuClibc = callPackage ./klee-uclibc.nix { - inherit clang_9 llvmPackages_9 extraKleeuClibcConfig debugRuntime runtimeAsserts; + inherit clang llvmPackages_11 extraKleeuClibcConfig debugRuntime runtimeAsserts; }; + in -clang_9.stdenv.mkDerivation rec { +clang.stdenv.mkDerivation rec { + pname = "klee"; - version = "2.2"; + version = "2.3"; + src = fetchFromGitHub { owner = "klee"; repo = "klee"; rev = "v${version}"; - sha256 = "Ar3BKfADjJvvP0dI9+x/l3RDs8ncx4jmO7ol4MgOr4M="; + sha256 = "sha256-E1c6K6Q+LAWm342W8I00JI6+LMvqmULHZLkv9Kj5RmY="; }; + buildInputs = [ - llvmPackages_9.llvm - z3 stp cryptominisat - gperftools sqlite + cryptominisat + gperftools + lit # Configure phase checking for lit + llvmPackages_11.llvm + sqlite + stp + z3 ]; + nativeBuildInputs = [ - cmake clang_9 + clang + cmake ]; + checkInputs = [ gtest @@ -94,34 +105,7 @@ clang_9.stdenv.mkDerivation rec { patchShebangs . ''; - patches = map fetchpatch [ - /* This patch is currently necessary for the unit test suite to run correctly. - * See https://www.mail-archive.com/klee-dev@imperial.ac.uk/msg03136.html - * and https://github.com/klee/klee/pull/1458 for more information. - */ - { - name = "fix-gtest"; - sha256 = "F+/6videwJZz4sDF9lnV4B8lMx6W11KFJ0Q8t1qUDf4="; - url = "https://github.com/klee/klee/pull/1458.patch"; - } - - # This patch fixes test compile issues with glibc 2.33+. - { - name = "fix-glibc-2.33"; - sha256 = "PzxqtFyLy9KF1eA9AAKg1tu+ggRdvu7leuvXifayIcc="; - url = "https://github.com/klee/klee/pull/1385.patch"; - } - - # /etc/mtab doesn't exist in the Nix build sandbox. - { - name = "fix-etc-mtab-in-tests"; - sha256 = "2Yb/rJA791esNNqq8uAXV+MML4YXIjPKkHBOufvyRoQ="; - url = "https://github.com/klee/klee/pull/1471.patch"; - } - ]; - doCheck = true; - checkTarget = "check"; passthru = { # Let the user depend on `klee.uclibc` for klee-uclibc diff --git a/pkgs/applications/science/logic/klee/klee-uclibc.nix b/pkgs/applications/science/logic/klee/klee-uclibc.nix index 2e3826c50c424..a794fe2eee8aa 100644 --- a/pkgs/applications/science/logic/klee/klee-uclibc.nix +++ b/pkgs/applications/science/logic/klee/klee-uclibc.nix @@ -3,9 +3,10 @@ , fetchFromGitHub , which , linuxHeaders -, clang_9 -, llvmPackages_9 +, clang +, llvmPackages_11 , python3 +, curl , debugRuntime ? true , runtimeAsserts ? false , extraKleeuClibcConfig ? {} @@ -23,18 +24,20 @@ let "DEVEL_PREFIX" = "/"; }); in -clang_9.stdenv.mkDerivation rec { +clang.stdenv.mkDerivation rec { pname = "klee-uclibc"; - version = "1.2"; + version = "1.3"; src = fetchFromGitHub { owner = "klee"; repo = "klee-uclibc"; rev = "klee_uclibc_v${version}"; - sha256 = "qdrGMw+2XwpDsfxdv6swnoaoACcF5a/RWgUxUYbtPrI="; + sha256 = "sha256-xQ8GWa0Gmd3lbwKodJhrsZeuR4j7NT4zIUh+kNhVY/w="; }; + nativeBuildInputs = [ - clang_9 - llvmPackages_9.llvm + clang + curl + llvmPackages_11.llvm python3 which ]; @@ -44,7 +47,7 @@ clang_9.stdenv.mkDerivation rec { # HACK: needed for cross-compile. # See https://www.mail-archive.com/klee-dev@imperial.ac.uk/msg03141.html - KLEE_CFLAGS = "-idirafter ${clang_9}/resource-root/include"; + KLEE_CFLAGS = "-idirafter ${clang}/resource-root/include"; prePatch = '' patchShebangs ./configure diff --git a/pkgs/data/misc/hackage/pin.json b/pkgs/data/misc/hackage/pin.json index d3d11e13385ba..d78722b89491e 100644 --- a/pkgs/data/misc/hackage/pin.json +++ b/pkgs/data/misc/hackage/pin.json @@ -1,6 +1,6 @@ { - "commit": "c87d8bf669c0f5da46e44dece7a851e2f9d8c3e9", - "url": "https://github.com/commercialhaskell/all-cabal-hashes/archive/c87d8bf669c0f5da46e44dece7a851e2f9d8c3e9.tar.gz", - "sha256": "0m1ahg2knm136g2gr66asicsqcy9n80lmszs70nkz550ll51vq8v", - "msg": "Update from Hackage at 2022-06-23T03:01:47Z" + "commit": "e304e8df4de976f80d5d58e47cf560be91055799", + "url": "https://github.com/commercialhaskell/all-cabal-hashes/archive/e304e8df4de976f80d5d58e47cf560be91055799.tar.gz", + "sha256": "10xws4lazlx8bx26xc8h6c7ab7gkzc01an7nwip3bghc1h92zr4m", + "msg": "Update from Hackage at 2022-07-02T15:59:48Z" } diff --git a/pkgs/development/compilers/ghc/8.10.7.nix b/pkgs/development/compilers/ghc/8.10.7.nix index e2cd496640f1a..b7f027440de1d 100644 --- a/pkgs/development/compilers/ghc/8.10.7.nix +++ b/pkgs/development/compilers/ghc/8.10.7.nix @@ -194,6 +194,14 @@ stdenv.mkDerivation (rec { # when adding new GHC releases in nixpkgs. ./respect-ar-path.patch + # fix hyperlinked haddock sources: https://github.com/haskell/haddock/pull/1482 + (fetchpatch { + url = "https://patch-diff.githubusercontent.com/raw/haskell/haddock/pull/1482.patch"; + sha256 = "sha256-8w8QUCsODaTvknCDGgTfFNZa8ZmvIKaKS+2ZJZ9foYk="; + extraPrefix = "utils/haddock/"; + stripLen = 1; + }) + # cabal passes incorrect --host= when cross-compiling # https://github.com/haskell/cabal/issues/5887 (fetchpatch { diff --git a/pkgs/development/compilers/ghc/9.0.2.nix b/pkgs/development/compilers/ghc/9.0.2.nix index b998176af9749..0881b58ff7172 100644 --- a/pkgs/development/compilers/ghc/9.0.2.nix +++ b/pkgs/development/compilers/ghc/9.0.2.nix @@ -187,6 +187,14 @@ stdenv.mkDerivation (rec { outputs = [ "out" "doc" ]; patches = [ + # fix hyperlinked haddock sources: https://github.com/haskell/haddock/pull/1482 + (fetchpatch { + url = "https://patch-diff.githubusercontent.com/raw/haskell/haddock/pull/1482.patch"; + sha256 = "sha256-8w8QUCsODaTvknCDGgTfFNZa8ZmvIKaKS+2ZJZ9foYk="; + extraPrefix = "utils/haddock/"; + stripLen = 1; + }) + # 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 { diff --git a/pkgs/development/compilers/ghc/9.2.3.nix b/pkgs/development/compilers/ghc/9.2.3.nix index 7803a50525590..a7a80f4b9f145 100644 --- a/pkgs/development/compilers/ghc/9.2.3.nix +++ b/pkgs/development/compilers/ghc/9.2.3.nix @@ -188,6 +188,16 @@ stdenv.mkDerivation (rec { outputs = [ "out" "doc" ]; + patches = [ + # fix hyperlinked haddock sources: https://github.com/haskell/haddock/pull/1482 + (fetchpatch { + url = "https://patch-diff.githubusercontent.com/raw/haskell/haddock/pull/1482.patch"; + sha256 = "sha256-8w8QUCsODaTvknCDGgTfFNZa8ZmvIKaKS+2ZJZ9foYk="; + extraPrefix = "utils/haddock/"; + stripLen = 1; + }) + ]; + postPatch = "patchShebangs ."; # GHC needs the locale configured during the Haddock phase. diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix index f3396bd24a19c..40b7efc96bd0b 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -99,7 +99,7 @@ self: super: { name = "git-annex-${super.git-annex.version}-src"; url = "git://git-annex.branchable.com/"; rev = "refs/tags/" + super.git-annex.version; - sha256 = "0a0jnahljd46vzjgcwlzjhrrjgn40s0zfjklh63aa9w9x0zkvbin"; + sha256 = "0pr2fnaq3fa6lcly39xssl89v65h0wa26ikv5g30fm8y6z5rkqqd"; # delete android and Android directories which cause issues on # darwin (case insensitive directory). Since we don't need them # during the build process, we can delete it to prevent a hash @@ -353,7 +353,10 @@ self: super: { matplotlib = dontCheck super.matplotlib; # https://github.com/matterhorn-chat/matterhorn/issues/679 they do not want to be on stackage - matterhorn = doJailbreak super.matterhorn; + # Needs brick ^>= 0.70 + matterhorn = doJailbreak (super.matterhorn.overrideScope (self: super: { + brick = self.brick_0_70_1; + })); memcache = dontCheck super.memcache; metrics = dontCheck super.metrics; @@ -379,6 +382,7 @@ self: super: { posix-pty = dontCheck super.posix-pty; # https://github.com/merijn/posix-pty/issues/12 postgresql-binary = dontCheck super.postgresql-binary; # needs a running postgresql server postgresql-simple-migration = dontCheck super.postgresql-simple-migration; + powerdns = dontCheck super.powerdns; # Tests require networking and external services process-streaming = dontCheck super.process-streaming; punycode = dontCheck super.punycode; pwstore-cli = dontCheck super.pwstore-cli; @@ -2348,12 +2352,6 @@ self: super: { # https://github.com/kuribas/mfsolve/issues/8 mfsolve = dontCheck super.mfsolve; - # compatibility with random-fu 0.3 https://github.com/mokus0/misfortune/pull/5 - misfortune = appendPatch ./patches/misfortune-ghc9.patch (overrideCabal (drv: { - revision = null; - editedCabalFile = null; - }) super.misfortune); - # GHC 9 support https://github.com/lambdabot/dice/pull/2 dice = appendPatch (fetchpatch { name = "dice-ghc9.patch"; @@ -2556,14 +2554,31 @@ self: super: { # has been resolved. lucid-htmx = doJailbreak super.lucid-htmx; + lsp_1_5_0_0 = doDistribute (super.lsp_1_5_0_0.override { + lsp-types = self.lsp-types_1_5_0_0; + }); + + # A delay between futhark package uploads caused us to end up with conflicting + # versions of futhark and futhark-manifest + futhark = assert super.futhark.version == "0.21.12"; overrideCabal (drv: { + editedCabalFile = null; + revision = null; + version = "0.21.13"; + sha256 = "0bzqlsaaqbbi47zvmvv7hd6hcz54hzw676rh9nxcjxgff3hzqb08"; + libraryHaskellDepends = drv.libraryHaskellDepends or [] ++ [ + self.fgl + self.fgl-visualize + self.co-log-core + ]; + }) (super.futhark.override { + lsp = self.lsp_1_5_0_0; + }); + } // import ./configuration-tensorflow.nix {inherit pkgs haskellLib;} self super // (let # We need to build purescript with these dependencies and thus also its reverse # dependencies to avoid version mismatches in their dependency closure. # TODO(@cdepillabout): maybe unify with the spago overlay in configuration-nix.nix? purescriptOverlay = self: super: { - # Purescript targets Stackage LTS 18, so we need to downgrade a few things - aeson = self.aeson_1_5_6_0; - bower-json = self.bower-json_1_0_0_1; # As of 2021-11-08, the latest release of `language-javascript` is 0.7.1.0, # but it has a problem with parsing the `async` keyword. It doesn't allow # `async` to be used as an object key: @@ -2571,11 +2586,20 @@ self: super: { language-javascript = self.language-javascript_0_7_0_0; }; - # Doesn't support GHC >= 9.0 (something related to instance resolution and TH) - purescriptBrokenFlag = drv: + # Don't support GHC >= 9.0 yet and need aeson 1.5.* + purescriptStOverride = drv: + let + overlayed = drv.overrideScope ( + lib.composeExtensions + purescriptOverlay + (self: super: { + aeson = self.aeson_1_5_6_0; + }) + ); + in if lib.versionAtLeast self.ghc.version "9.0" - then dontDistribute (markBroken drv) - else drv; + then dontDistribute (markBroken overlayed) + else overlayed; in { purescript = lib.pipe @@ -2591,13 +2615,11 @@ in { doJailbreak # Generate shell completions (generateOptparseApplicativeCompletion "purs") - - purescriptBrokenFlag ]; - purescript-cst = purescriptBrokenFlag (super.purescript-cst.overrideScope purescriptOverlay); + purescript-cst = purescriptStOverride super.purescript-cst; - purescript-ast = purescriptBrokenFlag (super.purescript-ast.overrideScope purescriptOverlay); + purescript-ast = purescriptStOverride super.purescript-ast; - purenix = super.purenix.overrideScope purescriptOverlay; + purenix = purescriptStOverride super.purenix; }) diff --git a/pkgs/development/haskell-modules/configuration-darwin.nix b/pkgs/development/haskell-modules/configuration-darwin.nix index d40643114e478..fd632ee81f829 100644 --- a/pkgs/development/haskell-modules/configuration-darwin.nix +++ b/pkgs/development/haskell-modules/configuration-darwin.nix @@ -281,7 +281,16 @@ self: super: ({ # https://github.com/fpco/unliftio/issues/87 unliftio = dontCheck super.unliftio; - + # This is the same issue as above; the rio tests call functions in unliftio + # that have issues as tracked in the GitHub issue above. Once the unliftio + # tests are fixed, we can remove this as well. + # + # We skip just the problematic tests by replacing 'it' with 'xit'. + rio = overrideCabal (drv: { + preConfigure = '' + sed -i 's/\bit /xit /g' test/RIO/FileSpec.hs + ''; + }) super.rio; # 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-hackage2nix/broken.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix/broken.yaml index 6c882587c5791..67c5b5255fa85 100644 --- a/pkgs/development/haskell-modules/configuration-hackage2nix/broken.yaml +++ b/pkgs/development/haskell-modules/configuration-hackage2nix/broken.yaml @@ -262,6 +262,7 @@ broken-packages: - authenticate-ldap - authinfo-hs - auto + - autodocodec-yaml - autom - autonix-deps - autopack @@ -1134,6 +1135,7 @@ broken-packages: - direct-plugins - direm - dirtree + - discord-haskell - discordian-calendar - discord-types - discrete @@ -1314,6 +1316,7 @@ broken-packages: - enum-text - enum-utf8 - envelope + - env-extra - env-parser - envstatus - epanet-haskell @@ -1417,6 +1420,7 @@ broken-packages: - fast-nats - fastpbkdf2 - FastPush + - fast-tags - FastxPipe - fathead-util - fb @@ -1659,6 +1663,7 @@ broken-packages: - gentlemark - geocode-google - GeocoderOpenCage + - geodetics - geodetic-types - GeoIp - geojson-types @@ -2843,6 +2848,7 @@ broken-packages: - khph - kickass-torrents-dump-parser - kickchan + - ki-unlifted - kleene-list - kmonad - kmp-dfa @@ -4014,7 +4020,6 @@ broken-packages: - postmaster - potato-tool - potoki-core - - powerdns - powermate - powerpc - powerqueue-levelmem @@ -4110,6 +4115,7 @@ broken-packages: - provenience - proxy-kindness - proxy-mapping + - psc-ide - pseudo-trie - PSQueue - PTQ @@ -4127,6 +4133,7 @@ broken-packages: - pure-io - purenix - pure-priority-queue + - purescript-tsd-gen - pure-zlib - pushbullet - pushbullet-types @@ -4418,6 +4425,7 @@ broken-packages: - ruin - runhs - runmany + - rustls - rws - RxHaskell - rz-pipe @@ -5838,6 +5846,7 @@ broken-packages: - zendesk-api - zeno - zeolite-lang + - zephyr - zeromq4-clone-pattern - zeromq4-conduit - zeromq4-patterns diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix/main.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix/main.yaml index d61854cf5bcc1..8d07653534210 100644 --- a/pkgs/development/haskell-modules/configuration-hackage2nix/main.yaml +++ b/pkgs/development/haskell-modules/configuration-hackage2nix/main.yaml @@ -87,6 +87,10 @@ default-package-overrides: - dhall-nix < 1.1.24 # Temporarily forbid distribution-nixpkgs updates until cabal2nix supports the new version - distribution-nixpkgs < 1.7.0 + # patch is primarily used by reflex packages not all of which are patch 0.0.7 compatible yet + - patch < 0.0.7 + - reflex < 0.8.2.1 + - reflex-dom-core < 0.7.0.2 extra-packages: - aeson < 2 # required by pantry-0.5.2 diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix/stackage.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix/stackage.yaml index a7f461652b7ed..f9c9d161a6924 100644 --- a/pkgs/development/haskell-modules/configuration-hackage2nix/stackage.yaml +++ b/pkgs/development/haskell-modules/configuration-hackage2nix/stackage.yaml @@ -1,4 +1,4 @@ -# Stackage LTS 19.12 +# Stackage LTS 19.13 # This file is auto-generated by # maintainers/scripts/haskell/update-stackage.sh default-package-overrides: @@ -192,7 +192,7 @@ default-package-overrides: - bits ==0.6 - bitset-word8 ==0.1.1.2 - bits-extra ==0.0.2.3 - - bitvec ==1.1.2.0 + - bitvec ==1.1.3.0 - bitwise-enum ==1.0.1.0 - blake2 ==0.3.0 - blanks ==0.5.0 @@ -429,9 +429,9 @@ default-package-overrides: - convertible ==1.1.1.1 - cookie ==0.4.5 - copr-api ==0.1.0 - - core-data ==0.3.3.1 + - core-data ==0.3.4.0 - core-program ==0.4.6.4 - - core-text ==0.3.7.2 + - core-text ==0.3.8.0 - countable ==1.0 - covariance ==0.1.0.6 - cpphs ==1.20.9.1 @@ -543,7 +543,7 @@ default-package-overrides: - Decimal ==0.5.2 - declarative ==0.5.4 - deepseq-generics ==0.2.0.0 - - deferred-folds ==0.9.18.1 + - deferred-folds ==0.9.18.2 - dejafu ==2.4.0.3 - dense-linear-algebra ==0.1.0.0 - dependent-map ==0.4.0.0 @@ -626,7 +626,7 @@ default-package-overrides: - dual ==0.1.1.1 - dual-tree ==0.2.3.0 - dublincore-xml-conduit ==0.1.0.2 - - dunai ==0.8.2 + - dunai ==0.8.3 - duration ==0.2.0.0 - dvorak ==0.1.0.0 - dynamic-state ==0.3.1 @@ -1004,13 +1004,13 @@ default-package-overrides: - haskintex ==0.8.0.0 - haskoin-core ==0.21.2 - hasktags ==0.72.0 - - hasql ==1.5.0.3 + - hasql ==1.5.0.4 - hasql-migration ==0.3.0 - hasql-notifications ==0.2.0.1 - hasql-optparse-applicative ==0.3.0.9 - hasql-pool ==0.5.2.2 - hasql-queue ==1.2.0.2 - - hasql-th ==0.4.0.14 + - hasql-th ==0.4.0.15 - hasql-transaction ==1.0.1.1 - has-transformers ==0.1.0.4 - hasty-hamiltonian ==1.3.4 @@ -1238,7 +1238,7 @@ default-package-overrides: - hxt-regex-xmlschema ==9.2.0.7 - hxt-tagsoup ==9.1.4 - hxt-unicode ==9.0.2.4 - - hybrid-vectors ==0.2.2 + - hybrid-vectors ==0.2.3 - hyper ==0.2.1.1 - hyperloglog ==0.4.6 - hyphenation ==0.8.2 @@ -1417,7 +1417,7 @@ default-package-overrides: - lift-generics ==0.2.1 - lift-type ==0.1.0.1 - line ==4.0.1 - - linear ==1.21.9 + - linear ==1.21.10 - linear-base ==0.1.0 - linear-circuit ==0.1.0.4 - linebreak ==1.1.0.1 @@ -1873,7 +1873,7 @@ default-package-overrides: - posix-paths ==0.3.0.0 - possibly ==1.0.0.0 - postgres-options ==0.2.0.0 - - postgresql-binary ==0.12.4.3 + - postgresql-binary ==0.12.4.4 - postgresql-libpq ==0.9.4.3 - postgresql-libpq-notify ==0.2.0.0 - postgresql-migration ==0.2.1.3 @@ -1886,7 +1886,7 @@ default-package-overrides: - postgresql-typed ==0.6.2.1 - post-mess-age ==0.2.1.0 - pptable ==0.3.0.0 - - pqueue ==1.4.1.4 + - pqueue ==1.4.2.0 - prefix-units ==0.2.0 - prelude-compat ==0.0.0.2 - prelude-safeenum ==0.1.1.3 @@ -1910,7 +1910,7 @@ default-package-overrides: - primitive ==0.7.3.0 - primitive-addr ==0.1.0.2 - PrimitiveArray ==0.10.1.1 - - primitive-extras ==0.10.1.4 + - primitive-extras ==0.10.1.5 - primitive-offset ==0.2.0.0 - primitive-unaligned ==0.1.1.1 - primitive-unlifted ==0.1.3.1 @@ -2036,7 +2036,7 @@ default-package-overrides: - reform-happstack ==0.2.5.5 - RefSerialize ==0.4.0 - ref-tf ==0.5.0.1 - - regex ==1.1.0.1 + - regex ==1.1.0.2 - regex-applicative ==0.3.4 - regex-applicative-text ==0.1.0.1 - regex-base ==0.94.0.2 @@ -2046,7 +2046,7 @@ default-package-overrides: - regex-posix ==0.96.0.1 - regex-posix-clib ==2.7 - regex-tdfa ==1.3.1.2 - - regex-with-pcre ==1.1.0.1 + - regex-with-pcre ==1.1.0.2 - reinterpret-cast ==0.1.0 - rel8 ==1.3.1.0 - reliable-io ==0.0.2 @@ -2075,8 +2075,6 @@ default-package-overrides: - rfc5051 ==0.2 - rg ==1.4.0.0 - rhbzquery ==0.4.4 - - rhine ==0.7.1 - - rhine-gloss ==0.7.1 - riak-protobuf ==0.25.0.0 - rio ==0.1.22.0 - rio-orphans ==0.1.2.0 @@ -2228,7 +2226,7 @@ default-package-overrides: - silently ==1.2.5.2 - simple-affine-space ==0.1.1 - simple-cabal ==0.1.3 - - simple-cmd ==0.2.6 + - simple-cmd ==0.2.7 - simple-cmd-args ==0.1.7 - simple-log ==0.9.12 - simple-media-timestamp ==0.2.0.0 @@ -2288,7 +2286,7 @@ default-package-overrides: - speedy-slice ==0.3.2 - Spintax ==0.3.6 - splice ==0.6.1.1 - - splint ==1.0.1.5 + - splint ==1.0.2.0 - split ==0.2.3.4 - splitmix ==0.1.0.4 - splitmix-distributions ==0.9.0.0 @@ -2687,7 +2685,7 @@ default-package-overrides: - vector-algorithms ==0.8.0.4 - vector-binary-instances ==0.2.5.2 - vector-buffer ==0.4.1 - - vector-builder ==0.3.8.3 + - vector-builder ==0.3.8.4 - vector-bytes-instances ==0.1.1 - vector-circular ==0.1.4 - vector-instances ==3.4 diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix/transitive-broken.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix/transitive-broken.yaml index fe20afdc4e712..a68cf2b513a33 100644 --- a/pkgs/development/haskell-modules/configuration-hackage2nix/transitive-broken.yaml +++ b/pkgs/development/haskell-modules/configuration-hackage2nix/transitive-broken.yaml @@ -1026,6 +1026,7 @@ dont-distribute-packages: - commsec-keyexchange - comonad-random - compact-mutable + - compactable - compdata-automata - compdata-dags - compdata-param @@ -1431,6 +1432,7 @@ dont-distribute-packages: - feed-translator - feed2lj - feed2twitter + - feedback - fei-base - fei-dataiter - fei-datasets @@ -1558,6 +1560,11 @@ dont-distribute-packages: - geniconvert - geniserver - genvalidity-mergeful + - genvalidity-sydtest + - genvalidity-sydtest-aeson + - genvalidity-sydtest-hashable + - genvalidity-sydtest-lens + - genvalidity-sydtest-persistent - geodetic - geolite-csv - getemx @@ -1937,6 +1944,7 @@ dont-distribute-packages: - hascat-setup - hascat-system - hashable-accelerate + - hashes - hashflare - hask-home - haskades @@ -2248,6 +2256,7 @@ dont-distribute-packages: - hts - htsn-import - http-client-auth + - http-client-rustls - http-enumerator - http-pony - http2-client-exe @@ -3174,7 +3183,6 @@ dont-distribute-packages: - proto3-wire - protobuf-native - protocol-buffers-descriptor-fork - - psc-ide - psql - ptera - ptera-core @@ -3187,7 +3195,6 @@ dont-distribute-packages: - pure-cdb - pure-priority-queue-tests - purescript-iso - - purescript-tsd-gen - pursuit-client - push-notify - push-notify-apn @@ -3426,6 +3433,9 @@ dont-distribute-packages: - runtime-arbitrary - rv - s-expression + - safe-coloured-text-gen + - safe-coloured-text-layout + - safe-coloured-text-layout-gen - safe-coupling - safe-plugins - safer-file-handles @@ -3549,6 +3559,7 @@ dont-distribute-packages: - shady-graphics - shake-ats - shake-bindist + - shake-futhark - shake-minify-css - shake-plus-extended - shakebook @@ -3745,7 +3756,17 @@ dont-distribute-packages: - sweet-egison - switch - syb-with-class-instances-text + - sydtest + - sydtest-aeson - sydtest-amqp + - sydtest-hedgehog + - sydtest-hspec + - sydtest-persistent + - sydtest-persistent-sqlite + - sydtest-process + - sydtest-servant + - sydtest-typed-process + - sydtest-wai - sydtest-webdriver - sydtest-webdriver-screenshot - sydtest-webdriver-yesod @@ -3851,6 +3872,7 @@ dont-distribute-packages: - to-string-instances - toboggan - todos + - token-limiter-concurrent - toktok - tomlcheck - tonatona @@ -4202,7 +4224,6 @@ dont-distribute-packages: - yuuko - z85 - zasni-gerna - - zephyr - zephyr-copilot - zeromq3-conduit - zeromq3-haskell diff --git a/pkgs/development/haskell-modules/configuration-nix.nix b/pkgs/development/haskell-modules/configuration-nix.nix index ba5d70682a8c3..14c6dd6667194 100644 --- a/pkgs/development/haskell-modules/configuration-nix.nix +++ b/pkgs/development/haskell-modules/configuration-nix.nix @@ -845,14 +845,14 @@ self: super: builtins.intersectAttrs super { rel8 = addTestToolDepend pkgs.postgresql super.rel8; - cachix = generateOptparseApplicativeCompletion "cachix" (super.cachix.override { nix = pkgs.nixVersions.nix_2_7; }); + cachix = generateOptparseApplicativeCompletion "cachix" (super.cachix.override { nix = pkgs.nixVersions.nix_2_9; }); - hercules-ci-agent = super.hercules-ci-agent.override { nix = pkgs.nixVersions.nix_2_7; }; + hercules-ci-agent = super.hercules-ci-agent.override { nix = pkgs.nixVersions.nix_2_9; }; hercules-ci-cnix-expr = addTestToolDepend pkgs.git ( - super.hercules-ci-cnix-expr.override { nix = pkgs.nixVersions.nix_2_7; } + super.hercules-ci-cnix-expr.override { nix = pkgs.nixVersions.nix_2_9; } ); - hercules-ci-cnix-store = super.hercules-ci-cnix-store.override { nix = pkgs.nixVersions.nix_2_7; }; + hercules-ci-cnix-store = super.hercules-ci-cnix-store.override { nix = pkgs.nixVersions.nix_2_9; }; # Enable extra optimisations which increase build time, but also # later compiler performance, so we should do this for user's benefit. diff --git a/pkgs/development/haskell-modules/hackage-packages.nix b/pkgs/development/haskell-modules/hackage-packages.nix index 706c6a36ee211..2e945a16b4595 100644 --- a/pkgs/development/haskell-modules/hackage-packages.nix +++ b/pkgs/development/haskell-modules/hackage-packages.nix @@ -24480,6 +24480,8 @@ self: { pname = "acquire"; version = "0.3.1"; sha256 = "1spw70dw8x6d9dy5wg47fim4kpsvzgr25nmwpv8c4wd8g3gmnqmw"; + revision = "1"; + editedCabalFile = "0p78cr2qg5ciy0d98mf98ay0cbkl072j79is73j7vcmq1mwcli3c"; libraryHaskellDepends = [ base transformers ]; description = "Abstraction over management of resources"; license = lib.licenses.mit; @@ -31318,6 +31320,17 @@ self: { broken = true; }) {}; + "ann" = callPackage + ({ mkDerivation, base }: + mkDerivation { + pname = "ann"; + version = "1.0.0"; + sha256 = "11313ml12h7k4l71bpv170ryjy5g6bwrpmpw7b2yf1j5lkwjwrxf"; + libraryHaskellDepends = [ base ]; + description = "Informative annotations which don't change equality"; + license = lib.licenses.bsd3; + }) {}; + "annah" = callPackage ({ mkDerivation, alex, array, base, Earley, lens-family-core, morte , optparse-applicative, pipes, system-fileio, system-filepath, text @@ -32979,6 +32992,17 @@ self: { license = lib.licenses.bsd3; }) {}; + "applicable" = callPackage + ({ mkDerivation, base }: + mkDerivation { + pname = "applicable"; + version = "0.4.0.0"; + sha256 = "0gyj204svcscigrar6n349hr76gna5x8zbh6f0f6n2la4q8r88ak"; + libraryHaskellDepends = [ base ]; + description = "A class for things that can be applied"; + license = lib.licenses.mit; + }) {}; + "applicative-extras" = callPackage ({ mkDerivation, base }: mkDerivation { @@ -37228,19 +37252,18 @@ self: { }) {}; "autodocodec" = callPackage - ({ mkDerivation, aeson, base, bytestring, containers, doctest - , hashable, mtl, scientific, text, time, unordered-containers - , validity, validity-scientific, vector + ({ mkDerivation, aeson, base, bytestring, containers, hashable, mtl + , scientific, text, time, unordered-containers, validity + , validity-scientific, vector }: mkDerivation { pname = "autodocodec"; - version = "0.1.0.1"; - sha256 = "1m1zcscbx5553kh4hi12awqqqddxw4sr5vsg3lwcskl9qjzi1crx"; + version = "0.1.0.2"; + sha256 = "05sx66bdk6l2p26cvh24ynak4gp2dr8xdiw78jxbvgknsvrjkgf6"; libraryHaskellDepends = [ aeson base bytestring containers hashable mtl scientific text time unordered-containers validity validity-scientific vector ]; - testHaskellDepends = [ base doctest ]; description = "Self-documenting encoder and decoder"; license = lib.licenses.mit; }) {}; @@ -37302,8 +37325,8 @@ self: { }: mkDerivation { pname = "autodocodec-yaml"; - version = "0.1.0.1"; - sha256 = "1js3w0r7nrvl70vkkwblx8zqax22idblpdzs1ljr4x0jiwwji8bs"; + version = "0.2.0.0"; + sha256 = "0wqc0gxyakz5vqa99kj684mnxfdgr3qz2prwabynr1lqs08krw1i"; libraryHaskellDepends = [ autodocodec autodocodec-schema base bytestring containers path path-io safe-coloured-text scientific text unordered-containers @@ -37311,6 +37334,8 @@ self: { ]; description = "Autodocodec interpreters for yaml"; license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + broken = true; }) {}; "autoexporter" = callPackage @@ -45154,31 +45179,6 @@ self: { "bitvec" = callPackage ({ mkDerivation, base, bytestring, containers, deepseq, ghc-bignum , primitive, quickcheck-classes, quickcheck-classes-base, random - , tasty, tasty-bench, tasty-hunit, tasty-quickcheck, vector - }: - mkDerivation { - pname = "bitvec"; - version = "1.1.2.0"; - sha256 = "0h7c5kpx43bm6qqnkpbzma9n201987cnq1231zg33p3xp7qc1hm2"; - revision = "1"; - editedCabalFile = "0kf70z3adgdhmwc91ymr2y3jlg9irnz4hzck3l9im1d3zxs1lyvs"; - libraryHaskellDepends = [ - base bytestring deepseq ghc-bignum primitive vector - ]; - testHaskellDepends = [ - base ghc-bignum primitive quickcheck-classes - quickcheck-classes-base tasty tasty-hunit tasty-quickcheck vector - ]; - benchmarkHaskellDepends = [ - base containers ghc-bignum random tasty-bench vector - ]; - description = "Space-efficient bit vectors"; - license = lib.licenses.bsd3; - }) {}; - - "bitvec_1_1_3_0" = callPackage - ({ mkDerivation, base, bytestring, containers, deepseq, ghc-bignum - , primitive, quickcheck-classes, quickcheck-classes-base, random , tasty, tasty-bench, tasty-quickcheck, vector }: mkDerivation { @@ -45197,7 +45197,6 @@ self: { ]; description = "Space-efficient bit vectors"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; }) {}; "bitwise" = callPackage @@ -52498,8 +52497,8 @@ self: { }: mkDerivation { pname = "cachix"; - version = "0.7.0"; - sha256 = "10yyzk26hmx4xqv4zc83a5m69bj88fd6v2fs76nfbqc2kcpiis6k"; + version = "0.7.1"; + sha256 = "1n3gb40bj426fzdcqx7yypbss17z3snrz75d1aff60az4942n3jd"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -53057,6 +53056,29 @@ self: { broken = true; }) {}; + "call-alloy_0_3_0_2" = callPackage + ({ mkDerivation, base, bytestring, containers, directory, extra + , file-embed, filepath, hashable, hspec, mtl, process, split + , trifecta, unix + }: + mkDerivation { + pname = "call-alloy"; + version = "0.3.0.2"; + sha256 = "1bigpy4338zkvcxccnri3xfav7wdz3zblkzzwm0nrnyz7an4mgy6"; + libraryHaskellDepends = [ + base bytestring containers directory extra file-embed filepath + hashable mtl process split trifecta unix + ]; + testHaskellDepends = [ + base bytestring containers directory extra file-embed filepath + hashable hspec mtl process split trifecta unix + ]; + description = "A simple library to call Alloy given a specification"; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + broken = true; + }) {}; + "call-haskell-from-anything" = callPackage ({ mkDerivation, base, bytestring, data-msgpack, mtl , storable-endian, template-haskell @@ -59047,8 +59069,8 @@ self: { }: mkDerivation { pname = "clckwrks-plugin-media"; - version = "0.6.17"; - sha256 = "1yaga5g4r9rngc4f8hz4mndrjd6xnksw2vs916ccx2b5dn6i871c"; + version = "0.6.17.2"; + sha256 = "1kcm89mx6is7lvikipa1is9g9l8nivlcncw475zh2lylhv774qgd"; enableSeparateDataOutput = true; libraryHaskellDepends = [ acid-state attoparsec base blaze-html cereal clckwrks containers @@ -62970,6 +62992,7 @@ self: { ]; description = "A typeclass for structures which can be catMaybed, filtered, and partitioned"; license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; }) {}; "compactmap" = callPackage @@ -67680,23 +67703,6 @@ self: { "core-data" = callPackage ({ mkDerivation, aeson, base, bytestring, containers, core-text , hashable, hourglass, prettyprinter, scientific, text, time - , unordered-containers, vector - }: - mkDerivation { - pname = "core-data"; - version = "0.3.3.1"; - sha256 = "149hf4mi6rklzcnqai44hkilp8kwis5irkn25bxjpkrwyl41m25q"; - libraryHaskellDepends = [ - aeson base bytestring containers core-text hashable hourglass - prettyprinter scientific text time unordered-containers vector - ]; - description = "Convenience wrappers around common data structures and encodings"; - license = lib.licenses.mit; - }) {}; - - "core-data_0_3_4_0" = callPackage - ({ mkDerivation, aeson, base, bytestring, containers, core-text - , hashable, hourglass, prettyprinter, scientific, text, time , unordered-containers, uuid, vector }: mkDerivation { @@ -67711,7 +67717,6 @@ self: { ]; description = "Convenience wrappers around common data structures and encodings"; license = lib.licenses.mit; - hydraPlatforms = lib.platforms.none; }) {}; "core-haskell" = callPackage @@ -67805,23 +67810,6 @@ self: { }: mkDerivation { pname = "core-text"; - version = "0.3.7.2"; - sha256 = "0ybac107psr558fqyfmc1x8ssfd8mk1cf3v220svi6k6i8qaxi7x"; - libraryHaskellDepends = [ - ansi-terminal base bytestring colour deepseq fingertree hashable - prettyprinter template-haskell text text-short - ]; - description = "A rope type based on a finger tree over UTF-8 fragments"; - license = lib.licenses.mit; - }) {}; - - "core-text_0_3_8_0" = callPackage - ({ mkDerivation, ansi-terminal, base, bytestring, colour, deepseq - , fingertree, hashable, prettyprinter, template-haskell, text - , text-short - }: - mkDerivation { - pname = "core-text"; version = "0.3.8.0"; sha256 = "1vl463wdgnfb795nbir355w1cgy5ndqnwgfiiyr1j73xmngmvw04"; libraryHaskellDepends = [ @@ -67830,7 +67818,6 @@ self: { ]; description = "A rope type based on a finger tree over UTF-8 fragments"; license = lib.licenses.mit; - hydraPlatforms = lib.platforms.none; }) {}; "core-warn" = callPackage @@ -76401,29 +76388,18 @@ self: { hydraPlatforms = lib.platforms.none; }) {}; - "deferred-folds" = callPackage - ({ mkDerivation, base, bytestring, containers, foldl, hashable - , primitive, QuickCheck, quickcheck-instances, rerebase, tasty - , tasty-hunit, tasty-quickcheck, text, transformers - , unordered-containers, vector - }: + "defaultable-map" = callPackage + ({ mkDerivation, base, containers, deepseq, semigroupoids }: mkDerivation { - pname = "deferred-folds"; - version = "0.9.18.1"; - sha256 = "1hf14xa9fdfyk9ijxnll402x96m59giqrpj9s5rjqkd5pyi1yj6w"; - libraryHaskellDepends = [ - base bytestring containers foldl hashable primitive text - transformers unordered-containers vector - ]; - testHaskellDepends = [ - QuickCheck quickcheck-instances rerebase tasty tasty-hunit - tasty-quickcheck - ]; - description = "Abstractions over deferred folds"; - license = lib.licenses.mit; + pname = "defaultable-map"; + version = "1.0.2"; + sha256 = "0s70fwnh6r41hlr7hzv5rwiw8m0rrlj8v1bar09fq3gzqmhrpbqw"; + libraryHaskellDepends = [ base containers deepseq semigroupoids ]; + description = "Applicative maps"; + license = lib.licenses.bsd3; }) {}; - "deferred-folds_0_9_18_2" = callPackage + "deferred-folds" = callPackage ({ mkDerivation, base, bytestring, containers, foldl, hashable , primitive, QuickCheck, quickcheck-instances, rerebase, tasty , tasty-hunit, tasty-quickcheck, text, transformers @@ -76443,7 +76419,6 @@ self: { ]; description = "Abstractions over deferred folds"; license = lib.licenses.mit; - hydraPlatforms = lib.platforms.none; }) {}; "definitive-base" = callPackage @@ -78997,19 +78972,19 @@ self: { "diagnose" = callPackage ({ mkDerivation, base, data-default, hashable, prettyprinter - , prettyprinter-ansi-terminal, unordered-containers, wcwidth + , prettyprinter-ansi-terminal, text, unordered-containers, wcwidth }: mkDerivation { pname = "diagnose"; - version = "2.0.0"; - sha256 = "1rb2fm0bx1rmb63xc56v19adi9f0iy72j0h8rvrvw0lvcwp398xk"; + version = "2.1.1"; + sha256 = "1ydga65py1bbxhgm76mmzsy3khklb4ay72nn8idc6bp1z1qdk0pa"; libraryHaskellDepends = [ base data-default hashable prettyprinter - prettyprinter-ansi-terminal unordered-containers wcwidth + prettyprinter-ansi-terminal text unordered-containers wcwidth ]; testHaskellDepends = [ base data-default hashable prettyprinter - prettyprinter-ansi-terminal unordered-containers wcwidth + prettyprinter-ansi-terminal text unordered-containers wcwidth ]; description = "Beautiful error reporting done easily"; license = lib.licenses.bsd3; @@ -81038,26 +81013,28 @@ self: { "discord-haskell" = callPackage ({ mkDerivation, aeson, async, base, base64-bytestring, bytestring - , containers, data-default, emoji, http-client, iso8601-time - , JuicyPixels, MonadRandom, mtl, req, safe-exceptions, scientific + , containers, data-default, emoji, http-api-data, http-client + , iso8601-time, MonadRandom, mtl, req, safe-exceptions, scientific , text, time, unliftio, websockets, wuss }: mkDerivation { pname = "discord-haskell"; - version = "1.13.0"; - sha256 = "1bj75kj9pzm0f6dyh8g60s9nvkbsfc80sqrsd7q6czwhi765nqy0"; + version = "1.14.0"; + sha256 = "0dxzv2kl4njnq5m48d017ph1r8fir418ndzjahcing3b2hp2g1lp"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ aeson async base base64-bytestring bytestring containers - data-default emoji http-client iso8601-time JuicyPixels MonadRandom - mtl req safe-exceptions scientific text time unliftio websockets - wuss + data-default emoji http-api-data http-client iso8601-time + MonadRandom mtl req safe-exceptions scientific text time unliftio + websockets wuss ]; executableHaskellDepends = [ base text unliftio ]; description = "Write bots for Discord in Haskell"; license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; mainProgram = "ping-pong"; + broken = true; }) {}; "discord-haskell-voice" = callPackage @@ -85399,23 +85376,6 @@ self: { }: mkDerivation { pname = "dunai"; - version = "0.8.2"; - sha256 = "1hcjzd6zki10lkh6f11naxqrnkdmiqm4hwyj5acj4naqkakc6mmp"; - libraryHaskellDepends = [ - base MonadRandom simple-affine-space transformers transformers-base - ]; - testHaskellDepends = [ base tasty tasty-hunit transformers ]; - description = "Generalised reactive framework supporting classic, arrowized and monadic FRP"; - license = lib.licenses.bsd3; - maintainers = [ lib.maintainers.turion ]; - }) {}; - - "dunai_0_8_3" = callPackage - ({ mkDerivation, base, MonadRandom, simple-affine-space, tasty - , tasty-hunit, transformers, transformers-base - }: - mkDerivation { - pname = "dunai"; version = "0.8.3"; sha256 = "1xkc7a337g6xg2wgj1sphpmvj22y2fkifs36s7iws7cr7fqx1a1p"; libraryHaskellDepends = [ @@ -85424,7 +85384,6 @@ self: { testHaskellDepends = [ base tasty tasty-hunit transformers ]; description = "Generalised reactive framework supporting classic, arrowized and monadic FRP"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; maintainers = [ lib.maintainers.turion ]; }) {}; @@ -85691,8 +85650,8 @@ self: { ({ mkDerivation, base }: mkDerivation { pname = "dwergaz"; - version = "0.2.0.4"; - sha256 = "01gdh96p5nwca9g5sa0nrv65vaial3jqprngk67n9wxbj74pwr8f"; + version = "0.2.0.5"; + sha256 = "0g88xm00j0b5k20rw7fdzmswn1migqs6sw3sm0yy9na4b5l1mf4p"; libraryHaskellDepends = [ base ]; testHaskellDepends = [ base ]; description = "A minimal testing library"; @@ -89740,6 +89699,20 @@ self: { ]; description = "Safe helpers for accessing and modifying environment variables"; license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + broken = true; + }) {}; + + "env-guard" = callPackage + ({ mkDerivation, base, doctest }: + mkDerivation { + pname = "env-guard"; + version = "0.2"; + sha256 = "0chgskm1893i17b7r704wh44b7wh0ig2jz7y43vznhnmchrc80al"; + libraryHaskellDepends = [ base ]; + testHaskellDepends = [ base doctest ]; + description = "Conditionally running IO actions based on environment variables"; + license = lib.licenses.mit; }) {}; "env-locale" = callPackage @@ -94288,6 +94261,42 @@ self: { license = lib.licenses.bsd3; }) {}; + "fakedata_1_0_3" = callPackage + ({ mkDerivation, aeson, attoparsec, base, bytestring, containers + , deepseq, directory, exceptions, fakedata-parser, filepath, gauge + , hashable, hspec, hspec-discover, QuickCheck, random, regex-tdfa + , string-random, template-haskell, text, time, transformers + , unordered-containers, vector, yaml + }: + mkDerivation { + pname = "fakedata"; + version = "1.0.3"; + sha256 = "12sldxpn14zx5zwblw28k593rdqz50d246rz8j3zj41ljmnbwj4i"; + enableSeparateDataOutput = true; + libraryHaskellDepends = [ + aeson attoparsec base bytestring containers directory exceptions + fakedata-parser filepath hashable random string-random + template-haskell text time transformers unordered-containers vector + yaml + ]; + testHaskellDepends = [ + aeson attoparsec base bytestring containers directory exceptions + fakedata-parser filepath hashable hspec QuickCheck random + regex-tdfa string-random template-haskell text time transformers + unordered-containers vector yaml + ]; + testToolDepends = [ hspec-discover ]; + benchmarkHaskellDepends = [ + aeson attoparsec base bytestring containers deepseq directory + exceptions fakedata-parser filepath gauge hashable random + string-random template-haskell text time transformers + unordered-containers vector yaml + ]; + description = "Library for producing fake data"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + }) {}; + "fakedata-parser" = callPackage ({ mkDerivation, attoparsec, base, hspec, text }: mkDerivation { @@ -94653,10 +94662,8 @@ self: { }: mkDerivation { pname = "fast-tags"; - version = "2.0.1"; - sha256 = "1v60jrcpbd86np5265grd61x6rla1fy85jphcnknffy4zf0sswrf"; - revision = "1"; - editedCabalFile = "120prvsdwkil1wq5y72ym4h5gzafdpm3cy4kchgfjcdlyf8jf619"; + version = "2.0.2"; + sha256 = "06sw868inr6sngyxcfvzbldlzllqhk9sfsb8193x9jbxvxbrlfws"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -94672,7 +94679,9 @@ self: { ]; description = "Fast incremental vi and emacs tags"; license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; mainProgram = "fast-tags"; + broken = true; }) {}; "fast-tagsoup" = callPackage @@ -95840,6 +95849,7 @@ self: { executableHaskellDepends = [ base ]; description = "Declarative feedback loop manager"; license = lib.licenses.gpl3Only; + hydraPlatforms = lib.platforms.none; }) {}; "fei-base" = callPackage @@ -101219,6 +101229,25 @@ self: { license = lib.licenses.bsd3; }) {}; + "free_5_1_9" = callPackage + ({ mkDerivation, base, comonad, containers, distributive + , exceptions, indexed-traversable, mtl, profunctors, semigroupoids + , template-haskell, th-abstraction, transformers, transformers-base + }: + mkDerivation { + pname = "free"; + version = "5.1.9"; + sha256 = "1vlzis9sqxh7xrmh3habbgiw3skkhkn710bhqb6fnl45804i6x9f"; + libraryHaskellDepends = [ + base comonad containers distributive exceptions indexed-traversable + mtl profunctors semigroupoids template-haskell th-abstraction + transformers transformers-base + ]; + description = "Monads for free"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + }) {}; + "free-algebras" = callPackage ({ mkDerivation, base, containers, data-fix, dlist, free, groups , hedgehog, kan-extensions, mtl, transformers @@ -103488,6 +103517,8 @@ self: { pname = "futhark"; version = "0.21.12"; sha256 = "1pjrq70x4qxgjjx5yy8zk9v6k3d01kk42bq5jrrb5f27id4dyn6v"; + revision = "2"; + editedCabalFile = "1m6rn5amxikflgli0izq9lsdc2s4qcwmmhiila54mnk1c6l2q7zv"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -103540,8 +103571,8 @@ self: { }: mkDerivation { pname = "futhark-manifest"; - version = "1.0.0.1"; - sha256 = "0zm6c907a9ywl9isslmqrl7k42076azzrrx16z0dj8w1pns69nw5"; + version = "1.1.0.0"; + sha256 = "1y1f3b6rz6m778izvi6n7ylinr6m41fy19h4by0bb6hdmcazaxpn"; libraryHaskellDepends = [ aeson base bytestring containers text ]; testHaskellDepends = [ base QuickCheck quickcheck-instances tasty tasty-hunit @@ -103557,8 +103588,8 @@ self: { }: mkDerivation { pname = "futhark-server"; - version = "1.2.0.0"; - sha256 = "0ahpn2f35jmm4n1dqw58ca4v9ny4hs1fhxih9fdmp5cya9fli0nf"; + version = "1.2.1.0"; + sha256 = "0i5jc7lddc8s938qh4jq61i33l13yfknppxi6q9n7yqig0rl3lbv"; libraryHaskellDepends = [ base binary bytestring directory futhark-data mtl process temporary text @@ -103710,6 +103741,21 @@ self: { license = lib.licenses.mit; }) {}; + "fuzzy-time_0_2_0_1" = callPackage + ({ mkDerivation, base, containers, deepseq, megaparsec, text, time + , validity, validity-time + }: + mkDerivation { + pname = "fuzzy-time"; + version = "0.2.0.1"; + sha256 = "1wlcq37q71q3565dc73jcr42p970lml0gmpjqwn3k5xf8d63ridj"; + libraryHaskellDepends = [ + base containers deepseq megaparsec text time validity validity-time + ]; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + }) {}; + "fuzzy-time-gen" = callPackage ({ mkDerivation, base, containers, criterion, fuzzy-time , genvalidity, genvalidity-criterion, genvalidity-hspec @@ -104224,8 +104270,8 @@ self: { }: mkDerivation { pname = "gargoyle"; - version = "0.1.1.0"; - sha256 = "1rjkz0v8jmzxxh41fs777fyhdp7lizwngg33886awmg08hdk24rq"; + version = "0.1.1.1"; + sha256 = "1c1pcv7vs7h9v7v1drjxilz7dw3b0fzpg9yl72h5ahjdfdc6xcqp"; libraryHaskellDepends = [ base directory filelock filepath network process unix ]; @@ -104241,8 +104287,8 @@ self: { }: mkDerivation { pname = "gargoyle-postgresql"; - version = "0.2.0.1"; - sha256 = "1k12cfrz58hmdrjnrxyb3dixj8yfz41xpq0dqgvxzwlrd3d4nb9g"; + version = "0.2.0.2"; + sha256 = "1l1p51wp8s52bpy6ac1zw1d1x0sk97bi9g77p43610386cq3dlpl"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -104264,10 +104310,8 @@ self: { }: mkDerivation { pname = "gargoyle-postgresql-connect"; - version = "0.1.0.0"; - sha256 = "00gfs33hcmjla7h32hiazjpsdcszvig7fajhsx48yr8jq9srkm3d"; - revision = "2"; - editedCabalFile = "052glxfxsd9wvdyqxdj49vp1b1vvqr77zrdv85r3iqm7mvf16gmk"; + version = "0.1.0.1"; + sha256 = "0ipx0zh8j1k6w71h6zkhdf1xkjhid90q4yiy5mwypyywwwwbwjdv"; libraryHaskellDepends = [ base bytestring directory gargoyle gargoyle-postgresql gargoyle-postgresql-nix postgresql-simple resource-pool @@ -104283,8 +104327,8 @@ self: { }: mkDerivation { pname = "gargoyle-postgresql-nix"; - version = "0.3.0.0"; - sha256 = "1cjh9hqk4ba1bz29b4vj0h249vpfpdgn8zsznqcr7b58czd8cf4y"; + version = "0.3.0.1"; + sha256 = "0fspvwgvs2mcg7hlivmjsw92phmxpjzjls23psvnl600nk7pnij8"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -106425,6 +106469,7 @@ self: { testToolDepends = [ sydtest-discover ]; description = "Standard properties for functions on `Validity` types for the sydtest framework"; license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; }) {}; "genvalidity-sydtest-aeson" = callPackage @@ -106447,6 +106492,7 @@ self: { testToolDepends = [ sydtest-discover ]; description = "Standard spec's for aeson-related instances in sydtest"; license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; }) {}; "genvalidity-sydtest-hashable" = callPackage @@ -106468,6 +106514,7 @@ self: { testToolDepends = [ sydtest-discover ]; description = "Standard spec's for Hashable instances for sydtest"; license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; }) {}; "genvalidity-sydtest-lens" = callPackage @@ -106487,6 +106534,7 @@ self: { testToolDepends = [ sydtest-discover ]; description = "Standard spec's for lens for sydtest"; license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; }) {}; "genvalidity-sydtest-persistent" = callPackage @@ -106509,6 +106557,7 @@ self: { testToolDepends = [ sydtest-discover ]; description = "Standard spec's for persistent-related instances for sydtest"; license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; }) {}; "genvalidity-text" = callPackage @@ -106754,6 +106803,8 @@ self: { ]; description = "Terrestrial coordinate systems and geodetic calculations"; license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + broken = true; }) {}; "geohash" = callPackage @@ -110993,8 +111044,8 @@ self: { }: mkDerivation { pname = "git-annex"; - version = "10.20220525"; - sha256 = "1nrwa4qm3xkr11x0b0c1mx052zhd7lz9w97xf0ycdkhsyc6vbiy6"; + version = "10.20220624"; + sha256 = "0a17ph8w620fmbwhm4yhdz2pwp0z8g5d4qsw2bg8k1par2n8rnmz"; configureFlags = [ "-fassistant" "-f-benchmark" "-fdbus" "-f-debuglocks" "-fmagicmime" "-fnetworkbsd" "-fpairing" "-fproduction" "-fs3" "-ftorrentparser" @@ -124675,8 +124726,8 @@ self: { }: mkDerivation { pname = "hascard"; - version = "0.5.0.3"; - sha256 = "0ca6vpin2vavff94lw8an5sisni5ncz9cvidy48dvw5y5hlj2yv8"; + version = "0.5.0.3.1"; + sha256 = "0d3zx4lbbc49lzc5pyrrh18c6ca9wnfsrxdakfpvqx8y4r1nlrdp"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -125040,6 +125091,7 @@ self: { benchmarkSystemDepends = [ openssl ]; description = "Hash functions"; license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; }) {inherit (pkgs) openssl;}; "hashflare" = callPackage @@ -129490,8 +129542,8 @@ self: { }: mkDerivation { pname = "haspara"; - version = "0.0.0.4"; - sha256 = "0jl6ncf16lc4h9w6w8n59b3z58h5g4ddcmjm5ml2pd1qgp5ncilh"; + version = "0.0.0.5"; + sha256 = "1y1zgsr2ba8m8rjwias1xqx61p1g081pxxwaas14blq5ijcp9ivz"; libraryHaskellDepends = [ aeson base containers exceptions hashable megaparsec mtl refined safe-decimal scientific template-haskell text time @@ -129540,8 +129592,8 @@ self: { }: mkDerivation { pname = "hasql"; - version = "1.5.0.3"; - sha256 = "1ai1vq1l58r4k6ri78gl0zlbc4sgkp3mcyi2dsm37f7ah9r38hsz"; + version = "1.5.0.4"; + sha256 = "01jfjx9l10f28w395r1990r6l5i15bw1333d968m2qgnx5l04vw3"; libraryHaskellDepends = [ attoparsec base bytestring bytestring-strict-builder contravariant dlist hashable hashtables mtl postgresql-binary postgresql-libpq @@ -129556,7 +129608,7 @@ self: { license = lib.licenses.mit; }) {}; - "hasql_1_5_0_4" = callPackage + "hasql_1_5_0_5" = callPackage ({ mkDerivation, attoparsec, base, bytestring , bytestring-strict-builder, contravariant, contravariant-extras , dlist, gauge, hashable, hashtables, mtl, postgresql-binary @@ -129566,8 +129618,8 @@ self: { }: mkDerivation { pname = "hasql"; - version = "1.5.0.4"; - sha256 = "01jfjx9l10f28w395r1990r6l5i15bw1333d968m2qgnx5l04vw3"; + version = "1.5.0.5"; + sha256 = "029bsr8966q6r1ig7x2ykj5jmrg64990c00zqpjq48acc39ap0qw"; libraryHaskellDepends = [ attoparsec base bytestring bytestring-strict-builder contravariant dlist hashable hashtables mtl postgresql-binary postgresql-libpq @@ -130109,8 +130161,8 @@ self: { }: mkDerivation { pname = "hasql-th"; - version = "0.4.0.14"; - sha256 = "0zskfsvxzilz6j3cd09hl6ixn3j9daksqjcb73pfm1f9hhrasa2a"; + version = "0.4.0.15"; + sha256 = "0h8cg8w16hn315hwdgamik9vwqslpgrbrhsd109w0lrv5l27xywz"; libraryHaskellDepends = [ base bytestring containers contravariant foldl hasql postgresql-syntax template-haskell template-haskell-compat-v0208 @@ -130120,15 +130172,15 @@ self: { license = lib.licenses.mit; }) {}; - "hasql-th_0_4_0_15" = callPackage + "hasql-th_0_4_0_16" = callPackage ({ mkDerivation, base, bytestring, containers, contravariant, foldl , hasql, postgresql-syntax, template-haskell , template-haskell-compat-v0208, text, uuid, vector }: mkDerivation { pname = "hasql-th"; - version = "0.4.0.15"; - sha256 = "0h8cg8w16hn315hwdgamik9vwqslpgrbrhsd109w0lrv5l27xywz"; + version = "0.4.0.16"; + sha256 = "029zmhwmr8wp432hf33ffvns5nkfqzk1cnh663cln5f2ryllxxx3"; libraryHaskellDepends = [ base bytestring containers contravariant foldl hasql postgresql-syntax template-haskell template-haskell-compat-v0208 @@ -137497,14 +137549,14 @@ self: { mainProgram = "hkgr"; }) {}; - "hkgr_0_4" = callPackage + "hkgr_0_4_2" = callPackage ({ mkDerivation, base, bytestring, directory, extra, filepath , simple-cabal, simple-cmd-args, typed-process, xdg-basedir }: mkDerivation { pname = "hkgr"; - version = "0.4"; - sha256 = "1h4dxnsj729cy8x687f77y0p8gh7sz9z7dl8vgqwmcd4p65vjwlk"; + version = "0.4.2"; + sha256 = "0ssh8wylalmgicpcixilvx3p46jf8miqx2q0gz9yjhxa54c721ab"; isLibrary = false; isExecutable = true; enableSeparateDataOutput = true; @@ -138028,6 +138080,8 @@ self: { pname = "hledger-stockquotes"; version = "0.1.2.1"; sha256 = "09h021dcpya8492kgyqkd2irxa10kwc9dgzk5xn7r121hl55jp50"; + revision = "1"; + editedCabalFile = "1b10qfxps3iz69l05gagshphifhxw5nvsx79yfyc4iq1rb8hnxc7"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -140141,15 +140195,15 @@ self: { license = lib.licenses.bsd3; }) {}; - "hoauth2_2_4_0" = callPackage + "hoauth2_2_5_0" = callPackage ({ mkDerivation, aeson, base, binary, bytestring, containers , data-default, exceptions, http-conduit, http-types, microlens , text, transformers, uri-bytestring, uri-bytestring-aeson }: mkDerivation { pname = "hoauth2"; - version = "2.4.0"; - sha256 = "0lz4ah5dxzzbkw01sarx5dg15vr2d7bms7nksbl66kblpdwyskbx"; + version = "2.5.0"; + sha256 = "0pi9g8rn9cs3hf2api1im9bvm9hk811wbkx8ncaakrkvjyx53gf4"; libraryHaskellDepends = [ aeson base binary bytestring containers data-default exceptions http-conduit http-types microlens text transformers uri-bytestring @@ -146327,7 +146381,7 @@ self: { license = lib.licenses.mit; }) {}; - "hslua-aeson_2_2_0_1" = callPackage + "hslua-aeson_2_2_1" = callPackage ({ mkDerivation, aeson, base, bytestring, containers, hashable , hslua-core, hslua-marshalling, mtl, QuickCheck , quickcheck-instances, scientific, tasty, tasty-quickcheck, text @@ -146335,8 +146389,8 @@ self: { }: mkDerivation { pname = "hslua-aeson"; - version = "2.2.0.1"; - sha256 = "0s6viv1gvwvla8i64ifqwmpcfpjcskpg1q6p11bszdakz1d9ay5f"; + version = "2.2.1"; + sha256 = "0igmkay5bf3wg1n6rqm20kjv1xq36x552lgdvr1vlpwikgsiq8mb"; libraryHaskellDepends = [ aeson base bytestring containers hashable hslua-core hslua-marshalling mtl scientific text unordered-containers vector @@ -149872,8 +149926,8 @@ self: { ({ mkDerivation, base, bytestring, http-client }: mkDerivation { pname = "http-client-brread-timeout"; - version = "0.1.0.1"; - sha256 = "04p98qkii1g6mk3cjra6ij73ks6qv0r2p7naq9j1rwvr9m7n1d4p"; + version = "0.1.1.0"; + sha256 = "0prghn5hif47r9viy9g7slpw03zs91z9k9z135ar5b6xa5xdz058"; libraryHaskellDepends = [ base bytestring http-client ]; description = "Http client with time-limited brRead"; license = lib.licenses.mit; @@ -150034,6 +150088,27 @@ self: { hydraPlatforms = lib.platforms.none; }) {}; + "http-client-rustls" = callPackage + ({ mkDerivation, base, bytestring, directory, filepath, http-client + , http-types, network, port-utils, process, resourcet, rustls + , tasty, tasty-hunit, temporary, text + }: + mkDerivation { + pname = "http-client-rustls"; + version = "0.0.0.0"; + sha256 = "1rwiclqc1hpxgaqz6y8pxl96g68bg8d8m1clapg60fgmyj0zjnha"; + libraryHaskellDepends = [ + base bytestring http-client network resourcet rustls text + ]; + testHaskellDepends = [ + base bytestring directory filepath http-client http-types network + port-utils process rustls tasty tasty-hunit temporary + ]; + description = "http-client TLS backend using Rustls"; + license = lib.licenses.cc0; + hydraPlatforms = lib.platforms.none; + }) {}; + "http-client-session" = callPackage ({ mkDerivation, base-prelude, bytestring, either, http-client , mtl-prelude @@ -153744,21 +153819,6 @@ self: { ({ mkDerivation, base, deepseq, primitive, semigroups, vector }: mkDerivation { pname = "hybrid-vectors"; - version = "0.2.2"; - sha256 = "1mw69xjdncj6kqa2mvag8xc79y4jijnh2qg6ahrhifb4vxqw7ij1"; - revision = "1"; - editedCabalFile = "16wpgh7cxgmap5acyccbff02b2jvhqiad5m3fknribpbahvmkk88"; - libraryHaskellDepends = [ - base deepseq primitive semigroups vector - ]; - description = "Hybrid vectors e.g. Mixed Boxed/Unboxed vectors"; - license = lib.licenses.bsd3; - }) {}; - - "hybrid-vectors_0_2_3" = callPackage - ({ mkDerivation, base, deepseq, primitive, semigroups, vector }: - mkDerivation { - pname = "hybrid-vectors"; version = "0.2.3"; sha256 = "0g3z482sd0j930ja3g9cyc4xnjby03d4cq8x56crsl61arr81r1c"; libraryHaskellDepends = [ @@ -153766,7 +153826,6 @@ self: { ]; description = "Hybrid vectors e.g. Mixed Boxed/Unboxed vectors"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; }) {}; "hydra-hs" = callPackage @@ -158782,15 +158841,19 @@ self: { }) {}; "interprocess" = callPackage - ({ mkDerivation, base, typed-process }: + ({ mkDerivation, async, base, bytestring, containers, stm + , temporary, typed-process + }: mkDerivation { pname = "interprocess"; - version = "0.2.0.1"; - sha256 = "1s8q8nvd7x55vzvgbj0clfcjl1wh5xy04hxrqj1qz6gg0irm2iq8"; + version = "0.2.1.0"; + sha256 = "1g57ing0kkwqlq06dw0y6fmdwfx7922q27nb32fgrd92cc1b46bx"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ base ]; - testHaskellDepends = [ base typed-process ]; + testHaskellDepends = [ + async base bytestring containers stm temporary typed-process + ]; description = "Shared memory and control structures for IPC"; license = lib.licenses.bsd3; }) {}; @@ -160567,8 +160630,8 @@ self: { }: mkDerivation { pname = "isomorphism-class"; - version = "0.1.0.1"; - sha256 = "1iynpy0mz1y569p8im3x9a48z73r7mz191dy0cm9x878r79hbplz"; + version = "0.1.0.5"; + sha256 = "03sarmva392szf5c04nqq795jsbkbklad409y8ym49kvb28mh1sg"; libraryHaskellDepends = [ base bytestring containers hashable primitive text unordered-containers vector @@ -162668,8 +162731,8 @@ self: { }: mkDerivation { pname = "joy-rewrite"; - version = "0.1.0.0"; - sha256 = "1bfzi4axs0bz0c0aqshixmy73s1whr28iql7i955crm2blwf3zjq"; + version = "0.2.0"; + sha256 = "00p1gnkydlcfkbcbv2dycpafni2v2dg5xp87yvcf304jiyw4xh4r"; libraryHaskellDepends = [ base containers hspec monad-loops parsec text ]; @@ -164953,6 +165016,25 @@ self: { license = lib.licenses.bsd3; }) {}; + "kan-extensions_5_2_5" = callPackage + ({ mkDerivation, adjunctions, array, base, comonad, containers + , contravariant, distributive, free, invariant, mtl, profunctors + , semigroupoids, tagged, transformers, transformers-compat + }: + mkDerivation { + pname = "kan-extensions"; + version = "5.2.5"; + sha256 = "08mddsk9v75mahp1jqn28vglygmdil1g37drcj3ivbqc0k6dq55r"; + libraryHaskellDepends = [ + adjunctions array base comonad containers contravariant + distributive free invariant mtl profunctors semigroupoids tagged + transformers transformers-compat + ]; + description = "Kan extensions, Kan lifts, the Yoneda lemma, and (co)density (co)monads"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + }) {}; + "kangaroo" = callPackage ({ mkDerivation, array, base }: mkDerivation { @@ -166702,6 +166784,32 @@ self: { license = lib.licenses.bsd3; }) {}; + "ki_1_0_0" = callPackage + ({ mkDerivation, base, containers, stm, tasty, tasty-hunit }: + mkDerivation { + pname = "ki"; + version = "1.0.0"; + sha256 = "1nag3rc3yiwc3x9q0mn70vrb6vjh7f2vxawaxq296za2q6n1gylh"; + libraryHaskellDepends = [ base containers ]; + testHaskellDepends = [ base stm tasty tasty-hunit ]; + description = "A lightweight structured concurrency library"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + }) {}; + + "ki-unlifted" = callPackage + ({ mkDerivation, base, ki, unliftio-core }: + mkDerivation { + pname = "ki-unlifted"; + version = "1.0.0"; + sha256 = "0751sy948gng9a0bqp127xsdgl4gf5acnj6vrvsmr7lw9x67ap04"; + libraryHaskellDepends = [ base ki unliftio-core ]; + description = "A lightweight structured-concurrency library"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + broken = true; + }) {}; + "kibro" = callPackage ({ mkDerivation }: mkDerivation { @@ -167606,6 +167714,22 @@ self: { broken = true; }) {}; + "kudzu" = callPackage + ({ mkDerivation, base, hedgehog, hpc, leancheck, QuickCheck }: + mkDerivation { + pname = "kudzu"; + version = "0.1.0.0"; + sha256 = "19324i7scjpi5xq8978hn18n2vyyiczqzv5109yn2wisprnklv8f"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ base hedgehog hpc leancheck QuickCheck ]; + executableHaskellDepends = [ base ]; + testHaskellDepends = [ base ]; + description = "coverage driven random testing framework"; + license = lib.licenses.bsd3; + mainProgram = "kudzu"; + }) {}; + "kuifje" = callPackage ({ mkDerivation, base, boxes, containers, lens }: mkDerivation { @@ -170776,31 +170900,29 @@ self: { "launchdarkly-server-sdk" = callPackage ({ mkDerivation, aeson, attoparsec, base, base16-bytestring - , bytestring, bytestring-conversion, clock, containers, cryptohash - , exceptions, extra, generic-lens, hashtables, hedis, http-client - , http-client-tls, http-types, HUnit, iso8601-time, lens, lrucache - , monad-logger, mtl, pcre-light, random, retry, scientific, semver - , text, time, unordered-containers, uuid, vector + , bytestring, clock, containers, cryptohash, exceptions, extra + , generic-lens, hashtables, hedis, http-client, http-client-tls + , http-types, HUnit, iso8601-time, lens, lrucache, monad-logger + , mtl, pcre-light, random, retry, scientific, semver, text, time + , unordered-containers, uuid, vector, yaml }: mkDerivation { pname = "launchdarkly-server-sdk"; - version = "2.2.0"; - sha256 = "0hi6w7rb1qf3dzla5cjmhz25a4ynkc29mpnixgdx5i8p771zyg3z"; + version = "3.0.1"; + sha256 = "08smhjp2vjnjz2dvgpswgsrv7vjwrawgm3vbylgysc816w56bxg7"; libraryHaskellDepends = [ - aeson attoparsec base base16-bytestring bytestring - bytestring-conversion clock containers cryptohash exceptions extra - generic-lens hashtables hedis http-client http-client-tls - http-types iso8601-time lens lrucache monad-logger mtl pcre-light - random retry scientific semver text time unordered-containers uuid - vector + aeson attoparsec base base16-bytestring bytestring clock containers + cryptohash exceptions extra generic-lens hashtables hedis + http-client http-client-tls http-types iso8601-time lens lrucache + monad-logger mtl pcre-light random retry scientific semver text + time unordered-containers uuid vector yaml ]; testHaskellDepends = [ - aeson attoparsec base base16-bytestring bytestring - bytestring-conversion clock containers cryptohash exceptions extra - generic-lens hashtables hedis http-client http-client-tls - http-types HUnit iso8601-time lens lrucache monad-logger mtl - pcre-light random retry scientific semver text time - unordered-containers uuid vector + aeson attoparsec base base16-bytestring bytestring clock containers + cryptohash exceptions extra generic-lens hashtables hedis + http-client http-client-tls http-types HUnit iso8601-time lens + lrucache monad-logger mtl pcre-light random retry scientific semver + text time unordered-containers uuid vector yaml ]; description = "Server-side SDK for integrating with LaunchDarkly"; license = lib.licenses.asl20; @@ -173744,6 +173866,31 @@ self: { license = lib.licenses.bsd3; }) {}; + "libsecp256k1" = callPackage + ({ mkDerivation, base, base16, bytestring, cereal, deepseq, entropy + , hashable, hspec, hspec-discover, HUnit, monad-par, mtl + , QuickCheck, secp256k1, secp256k1-haskell, string-conversions + , unliftio-core + }: + mkDerivation { + pname = "libsecp256k1"; + version = "0.0.1"; + sha256 = "1bjrnh3y37iij5y8g3fpl0nl2102n1h6q09xsgkdrxgcbsdbkl0j"; + libraryHaskellDepends = [ + base base16 bytestring cereal deepseq entropy hashable QuickCheck + string-conversions unliftio-core + ]; + libraryPkgconfigDepends = [ secp256k1 ]; + testHaskellDepends = [ + base base16 bytestring cereal deepseq entropy hashable hspec HUnit + monad-par mtl QuickCheck secp256k1-haskell string-conversions + unliftio-core + ]; + testToolDepends = [ hspec-discover ]; + description = "Bindings for secp256k1"; + license = lib.licenses.mit; + }) {inherit (pkgs) secp256k1;}; + "libsodium" = callPackage ({ mkDerivation, base, c2hs, hedgehog, libsodium, tasty , tasty-hedgehog, tasty-hunit @@ -174740,33 +174887,6 @@ self: { }: mkDerivation { pname = "linear"; - version = "1.21.9"; - sha256 = "1lc2kgszbqgxxypprk68x305cqpr7y88if955mqd7c07vx7ci9ba"; - libraryHaskellDepends = [ - adjunctions base base-orphans binary bytes cereal containers - deepseq distributive ghc-prim hashable indexed-traversable lens - random reflection semigroupoids semigroups tagged template-haskell - transformers transformers-compat unordered-containers vector void - ]; - testHaskellDepends = [ - base binary bytestring deepseq HUnit reflection simple-reflect - test-framework test-framework-hunit vector - ]; - description = "Linear Algebra"; - license = lib.licenses.bsd3; - }) {}; - - "linear_1_21_10" = callPackage - ({ mkDerivation, adjunctions, base, base-orphans, binary, bytes - , bytestring, cereal, containers, deepseq, distributive, ghc-prim - , hashable, HUnit, indexed-traversable, lens, random, reflection - , semigroupoids, semigroups, simple-reflect, tagged - , template-haskell, test-framework, test-framework-hunit - , transformers, transformers-compat, unordered-containers, vector - , void - }: - mkDerivation { - pname = "linear"; version = "1.21.10"; sha256 = "1d3s1p4imkifn7dccqci2qiwcg99x22kf250hzh4fh4xghi361xr"; libraryHaskellDepends = [ @@ -174781,7 +174901,6 @@ self: { ]; description = "Linear Algebra"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; }) {}; "linear-accelerate" = callPackage @@ -175088,6 +175207,8 @@ self: { pname = "linearscan"; version = "1.0.0"; sha256 = "12p1li2g69jf9rhr7xx4phrhsmw5nzn7q82n8n19bzidxflkdabm"; + revision = "1"; + editedCabalFile = "1n65l60wjwmdlcw7jbfmr0mknb8c812ibqnnlaayy3z1wnzpb4g3"; libraryHaskellDepends = [ base containers ghc-prim mtl transformers ]; @@ -177465,6 +177586,22 @@ self: { license = lib.licenses.asl20; }) {}; + "loc_0_1_4_0" = callPackage + ({ mkDerivation, base, containers, hedgehog, hspec, hspec-hedgehog + }: + mkDerivation { + pname = "loc"; + version = "0.1.4.0"; + sha256 = "1sv3nka1dxvxrvcl9jz8qa06194wvk2vcs894rzb4g052ikxgmnb"; + libraryHaskellDepends = [ base containers ]; + testHaskellDepends = [ + base containers hedgehog hspec hspec-hedgehog + ]; + description = "Types representing line and column positions and ranges in text files"; + license = lib.licenses.asl20; + hydraPlatforms = lib.platforms.none; + }) {}; + "loc-test" = callPackage ({ mkDerivation, base, containers, hedgehog, loc }: mkDerivation { @@ -179322,6 +179459,8 @@ self: { pname = "lsp-types"; version = "1.4.0.1"; sha256 = "0dxf5nnaxs2564hgjldkclhm5gvszjxxvz6gk00jmx0gf8k6dm8z"; + revision = "1"; + editedCabalFile = "0p5yywd6lam533arwfw9b4xvmibg9glmfd69j0h5268l62fqdh10"; libraryHaskellDepends = [ aeson base binary bytestring containers data-default deepseq Diff directory dlist filepath hashable hslogger lens mod mtl network-uri @@ -183458,8 +183597,8 @@ self: { }: mkDerivation { pname = "matterhorn"; - version = "50200.16.0"; - sha256 = "1hjb408dznls8r6k89jv0zvliv259xj2gzl03f4ypwacihmr3qiw"; + version = "50200.17.0"; + sha256 = "10n0vgphdkbdhyadiwn2a35zdazmxz2k0ibq7f1v9iyr8ylshz46"; isLibrary = true; isExecutable = true; enableSeparateDataOutput = true; @@ -183495,8 +183634,8 @@ self: { }: mkDerivation { pname = "mattermost-api"; - version = "50200.12.0"; - sha256 = "12mmpyw1lcmyxh73rgzckww7dd6lxc6m81h2xa9rpd8mxwx0n17n"; + version = "50200.13.0"; + sha256 = "128x1ygfb8g8ig4wy3cgmjh3ijkrg7vg27ylxvb1rnn4hc4lfn7i"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -183520,8 +183659,8 @@ self: { }: mkDerivation { pname = "mattermost-api-qc"; - version = "50200.12.0"; - sha256 = "00fgr80xanrni835n7wgazq6900f040cwnhbsz99936azx125nx4"; + version = "50200.13.0"; + sha256 = "0qy0jzv808hry99clfkc61sfmid8qwv3qcf2gsmana30bdxy8v57"; libraryHaskellDepends = [ base containers mattermost-api QuickCheck text time ]; @@ -187317,6 +187456,18 @@ self: { license = lib.licenses.bsd3; }) {}; + "mintty_0_1_4" = callPackage + ({ mkDerivation, base }: + mkDerivation { + pname = "mintty"; + version = "0.1.4"; + sha256 = "0zla9cg6fcjgpjjsgq7mi0xl753j5zmvhy5kwsagb5pp2gc48l3b"; + libraryHaskellDepends = [ base ]; + description = "A reliable way to detect the presence of a MinTTY console on Windows"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + }) {}; + "mios" = callPackage ({ mkDerivation, base, bytestring, ghc-prim, gitrev, hspec , primitive, vector @@ -187365,25 +187516,27 @@ self: { "misfortune" = callPackage ({ mkDerivation, base, bytestring, cereal, directory, filepath - , knob, monad-loops, random-fu, regex-base, regex-pcre, semigroups + , knob, monad-loops, random, random-fu, regex-base, regex-pcre , text, utf8-string, vector }: mkDerivation { pname = "misfortune"; - version = "0.1.1.2"; - sha256 = "0j93zqgqskrj2zc0vwsmwldidr6nkcxq2v3mmzv7l7l1bwhl8jxf"; - revision = "1"; - editedCabalFile = "1i3ivm06g690ksxnkmkg56rxzns7acwilnl6iy610n9b1k7plnqc"; + version = "0.1.2"; + sha256 = "0jnws1sc5dxbg03iy2l3glimm3qk2z0pcvyk4518y7a4n0wnxf89"; isLibrary = true; isExecutable = true; enableSeparateDataOutput = true; libraryHaskellDepends = [ - base bytestring cereal directory filepath knob random-fu semigroups + base bytestring cereal directory filepath knob random random-fu text utf8-string vector ]; - executableHaskellDepends = [ monad-loops regex-base regex-pcre ]; + executableHaskellDepends = [ + base bytestring cereal directory filepath knob monad-loops random + random-fu regex-base regex-pcre text utf8-string vector + ]; description = "fortune-mod clone"; - license = lib.licenses.publicDomain; + license = lib.licenses.mit; + mainProgram = "misfortune"; }) {}; "mismi-core" = callPackage @@ -187636,29 +187789,20 @@ self: { }) {}; "mit-3qvpPyAi6mH" = callPackage - ({ mkDerivation, base, base64, clock, containers, directory, free - , ki, process, record-dot-preprocessor, record-hasfield, temporary - , text, text-ansi, unix + ({ mkDerivation, base, base64, containers, directory, ki + , optparse-applicative, parsec, process, text, text-ansi, unix }: mkDerivation { pname = "mit-3qvpPyAi6mH"; - version = "7"; - sha256 = "1asr82fnqpb936kfj8fnilas76l5r5ndylvzf1van2z57sxjx9ba"; + version = "8"; + sha256 = "0rknwwfysmic2x8apwah99d0lmjlgyn6wnxrvviv22903bnjlcn9"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ - base base64 clock containers directory ki process - record-dot-preprocessor record-hasfield text text-ansi unix - ]; - executableHaskellDepends = [ - base base64 clock containers directory ki process - record-dot-preprocessor record-hasfield text text-ansi unix - ]; - testHaskellDepends = [ - base base64 clock containers directory free ki process - record-dot-preprocessor record-hasfield temporary text text-ansi - unix + base base64 containers directory ki optparse-applicative parsec + process text text-ansi unix ]; + executableHaskellDepends = [ base ]; description = "A git wrapper with a streamlined UX"; license = lib.licenses.mit; hydraPlatforms = lib.platforms.none; @@ -189876,12 +190020,19 @@ self: { }) {}; "monad-schedule" = callPackage - ({ mkDerivation, base, free, stm, time-domain, transformers }: + ({ mkDerivation, base, free, HUnit, QuickCheck, stm, test-framework + , test-framework-hunit, test-framework-quickcheck2, time-domain + , transformers + }: mkDerivation { pname = "monad-schedule"; - version = "0.1.0.0"; - sha256 = "1jc70f71yr886wd150vg97kvbyp489nma0c98xa6drhw720rbwwz"; + version = "0.1.2.0"; + sha256 = "1crzah9arrr0c3zmld66r20w3jvd5gcblq9d3my784z9sh8cqwz3"; libraryHaskellDepends = [ base free stm time-domain transformers ]; + testHaskellDepends = [ + base free HUnit QuickCheck test-framework test-framework-hunit + test-framework-quickcheck2 transformers + ]; description = "A new, simple, composable concurrency abstraction"; license = lib.licenses.mit; }) {}; @@ -190830,8 +190981,8 @@ self: { }: mkDerivation { pname = "monoid-statistics"; - version = "1.1.1"; - sha256 = "13vncdylaazcyfsdylxxnfkywyzw7ydmacisjhx6qhq12c87375q"; + version = "1.1.2"; + sha256 = "1ac59pk7yv0g55c7yxykmsy06d4dlxnas5739041ydc5f9vdd1wz"; libraryHaskellDepends = [ base exceptions math-functions vector vector-th-unbox ]; @@ -199470,20 +199621,21 @@ self: { "ngx-export-tools-extra" = callPackage ({ mkDerivation, aeson, array, base, base64, binary, bytestring , case-insensitive, containers, ede, enclosed-exceptions - , http-client, http-types, network, ngx-export, ngx-export-tools - , pcre-heavy, pcre-light, prettyprinter, safe, snap-core - , snap-server, template-haskell, text, time, trifecta - , unordered-containers + , http-client, http-client-brread-timeout, http-types, network + , ngx-export, ngx-export-tools, pcre-heavy, pcre-light + , prettyprinter, safe, snap-core, snap-server, template-haskell + , text, time, trifecta, unordered-containers }: mkDerivation { pname = "ngx-export-tools-extra"; - version = "1.0"; - sha256 = "1p77wanci0bs5bvhxd8fjfqpm5aasvwxgxhpazkcvhb0s8lr67am"; + version = "1.1.0"; + sha256 = "191v30zxqwpyb546sbgbn7nwbxmv7l476msavgrqnahphcgg5zqy"; libraryHaskellDepends = [ aeson array base base64 binary bytestring case-insensitive - containers ede enclosed-exceptions http-client http-types network - ngx-export ngx-export-tools pcre-heavy pcre-light prettyprinter - safe snap-core snap-server template-haskell text time trifecta + containers ede enclosed-exceptions http-client + http-client-brread-timeout http-types network ngx-export + ngx-export-tools pcre-heavy pcre-light prettyprinter safe snap-core + snap-server template-haskell text time trifecta unordered-containers ]; description = "More extra tools for Nginx haskell module"; @@ -200813,6 +200965,59 @@ self: { license = lib.licenses.bsd3; }) {}; + "nonempty-wrapper" = callPackage + ({ mkDerivation, base, hspec, hspec-core, hspec-discover }: + mkDerivation { + pname = "nonempty-wrapper"; + version = "0.1.0.0"; + sha256 = "057c0ry3p4z1x2br6v5gm4c044i0z868kk5jihyf8s0r821zfzxj"; + libraryHaskellDepends = [ base ]; + testHaskellDepends = [ base hspec hspec-core hspec-discover ]; + testToolDepends = [ hspec-discover ]; + description = "Create NonEmpty version of any container"; + license = lib.licenses.isc; + }) {}; + + "nonempty-wrapper-aeson" = callPackage + ({ mkDerivation, aeson, base, containers, hspec, hspec-core + , hspec-discover, nonempty-wrapper + }: + mkDerivation { + pname = "nonempty-wrapper-aeson"; + version = "0.1.0.0"; + sha256 = "0qg0xl93vl4nkm2aqsfqnwgk7vsaxvbib302n4ap6m5vks84b8fg"; + libraryHaskellDepends = [ aeson base nonempty-wrapper ]; + testHaskellDepends = [ + aeson base containers hspec hspec-core hspec-discover + nonempty-wrapper + ]; + testToolDepends = [ hspec-discover ]; + description = "aeson instances for 'NonEmpty'"; + license = lib.licenses.isc; + }) {}; + + "nonempty-wrapper-quickcheck" = callPackage + ({ mkDerivation, base, nonempty-wrapper, QuickCheck }: + mkDerivation { + pname = "nonempty-wrapper-quickcheck"; + version = "0.1.0.0"; + sha256 = "1k0bb0ir5k9cmgv261s1l86yd0sfrl0m9h0dfc2qhq9qzz9k2lvz"; + libraryHaskellDepends = [ base nonempty-wrapper QuickCheck ]; + description = "QuickCheck instance for 'NonEmpty'"; + license = lib.licenses.isc; + }) {}; + + "nonempty-wrapper-text" = callPackage + ({ mkDerivation, base, bytestring, nonempty-wrapper, text }: + mkDerivation { + pname = "nonempty-wrapper-text"; + version = "0.1.0.0"; + sha256 = "1v2my0dcy7frmnnhf46rqsiqi5mfsk7d1fi28agcg9qva73qiw4q"; + libraryHaskellDepends = [ base bytestring nonempty-wrapper text ]; + description = "'NonEmpty' wrappers for text"; + license = lib.licenses.isc; + }) {}; + "nonempty-zipper" = callPackage ({ mkDerivation, base, comonad, deepseq, doctest, Glob, safe }: mkDerivation { @@ -200847,6 +201052,18 @@ self: { license = lib.licenses.mit; }) {}; + "nonlinear" = callPackage + ({ mkDerivation, base, hspec, HUnit, QuickCheck }: + mkDerivation { + pname = "nonlinear"; + version = "0.1.0"; + sha256 = "1qka0yrsi64z7brppsnp387xbsax0nqahgs6190kiwk63fp0p12n"; + libraryHaskellDepends = [ base ]; + testHaskellDepends = [ base hspec HUnit QuickCheck ]; + description = "Low-dimensional vectors"; + license = lib.licenses.bsd3; + }) {}; + "nonlinear-optimization" = callPackage ({ mkDerivation, base, primitive, vector }: mkDerivation { @@ -210367,6 +210584,8 @@ self: { pname = "parsley"; version = "2.0.0.0"; sha256 = "0h6msk2a11bq4bzl5gs3aq0sqd1z13smp2n8bxsr49vm51hmd1qh"; + revision = "1"; + editedCabalFile = "112643pvn60a0146d6804pafv5n1na2fn6awdivpdkxxngvy7xji"; libraryHaskellDepends = [ base parsley-core template-haskell text ]; @@ -210393,8 +210612,8 @@ self: { }: mkDerivation { pname = "parsley-core"; - version = "2.1.0.0"; - sha256 = "0vr4qlgkwsh92a8fv4fj48l9625xd80mkkmihwf20zln6svcsbfs"; + version = "2.1.0.1"; + sha256 = "0nagpms1d8cxng4pswrcncn8dacyhc91v3gbg93xn9mw2h2gapfx"; libraryHaskellDepends = [ array base bytestring containers dependent-map dependent-sum ghc-prim hashable mtl pretty-terminal template-haskell text @@ -210921,6 +211140,31 @@ self: { license = lib.licenses.bsd3; }) {}; + "patch_0_0_7_0" = callPackage + ({ mkDerivation, base, commutative-semigroups, constraints-extras + , containers, dependent-map, dependent-sum, directory, filemanip + , filepath, hedgehog, hlint, HUnit, indexed-traversable, lens + , monoidal-containers, semialign, semigroupoids, these + , transformers, witherable + }: + mkDerivation { + pname = "patch"; + version = "0.0.7.0"; + sha256 = "0hpx1sh90rhvvd9j8nmpibdhj9jd4mmwbsr1c220ywaz7g6f3bxv"; + libraryHaskellDepends = [ + base commutative-semigroups constraints-extras containers + dependent-map dependent-sum indexed-traversable lens + monoidal-containers semialign semigroupoids these transformers + witherable + ]; + testHaskellDepends = [ + base containers directory filemanip filepath hedgehog hlint HUnit + ]; + description = "Data structures for describing changes to other data structures"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + }) {}; + "patch-combinators" = callPackage ({ mkDerivation, base }: mkDerivation { @@ -212722,6 +212966,37 @@ self: { license = lib.licenses.asl20; }) {}; + "perfect-hash-generator_1_0_0" = callPackage + ({ mkDerivation, base, binary, bytestring, containers, data-default + , data-ordlist, directory, filepath, hashable, HUnit + , optparse-applicative, random, sorted-list, test-framework + , test-framework-hunit, text, unordered-containers, vector + }: + mkDerivation { + pname = "perfect-hash-generator"; + version = "1.0.0"; + sha256 = "1gxrba5lpwzifjg5glld6nj54xhvajm4b6cg88cs64iqnwhh2chi"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + base binary bytestring containers data-default data-ordlist + directory filepath hashable sorted-list text unordered-containers + vector + ]; + executableHaskellDepends = [ + base binary bytestring containers hashable optparse-applicative + random text unordered-containers vector + ]; + testHaskellDepends = [ + base binary bytestring containers data-default hashable HUnit + optparse-applicative random test-framework test-framework-hunit + text unordered-containers vector + ]; + description = "Perfect minimal hashing implementation in native Haskell"; + license = lib.licenses.asl20; + hydraPlatforms = lib.platforms.none; + }) {}; + "perfect-vector-shuffle" = callPackage ({ mkDerivation, base, MonadRandom, primitive, QuickCheck , quickcheck-instances, random, tasty, tasty-quickcheck, vector @@ -218902,10 +219177,8 @@ self: { ({ mkDerivation, base, requirements }: mkDerivation { pname = "poly-rec"; - version = "0.7.0.0"; - sha256 = "0ayaz87l2rgpm4ddc7bidss042xhfcwa3sk7685ypssqvp02k5r0"; - revision = "2"; - editedCabalFile = "12cgm587k27mmjkix58qs4ihdcx1axlkp17bq7f3fhw80j64imk7"; + version = "0.7.0.2"; + sha256 = "1kysfam03sbwx9kqbnnncrp0sp764zj57sfj6raar8im9wpwpyh9"; libraryHaskellDepends = [ base requirements ]; description = "Polykinded extensible records"; license = lib.licenses.gpl3Only; @@ -221033,33 +221306,6 @@ self: { }: mkDerivation { pname = "postgresql-binary"; - version = "0.12.4.3"; - sha256 = "0g3qj41gdiphngil9rz4wi9sg78m13q9mvh6369i46612w0jc9dv"; - libraryHaskellDepends = [ - aeson base binary-parser bytestring bytestring-strict-builder - containers network-ip scientific text time transformers - unordered-containers uuid vector - ]; - testHaskellDepends = [ - aeson conversion conversion-bytestring conversion-text json-ast - network-ip postgresql-libpq QuickCheck quickcheck-instances - rerebase tasty tasty-hunit tasty-quickcheck - ]; - benchmarkHaskellDepends = [ criterion rerebase ]; - description = "Encoders and decoders for the PostgreSQL's binary format"; - license = lib.licenses.mit; - }) {}; - - "postgresql-binary_0_12_4_4" = callPackage - ({ mkDerivation, aeson, base, binary-parser, bytestring - , bytestring-strict-builder, containers, conversion - , conversion-bytestring, conversion-text, criterion, json-ast - , network-ip, postgresql-libpq, QuickCheck, quickcheck-instances - , rerebase, scientific, tasty, tasty-hunit, tasty-quickcheck, text - , time, transformers, unordered-containers, uuid, vector - }: - mkDerivation { - pname = "postgresql-binary"; version = "0.12.4.4"; sha256 = "03lh7ply77849xwpxh6k2hz20xl9cmvyx8yq03wqywvh7snd1ss3"; libraryHaskellDepends = [ @@ -221075,7 +221321,6 @@ self: { benchmarkHaskellDepends = [ criterion rerebase ]; description = "Encoders and decoders for the PostgreSQL's binary format"; license = lib.licenses.mit; - hydraPlatforms = lib.platforms.none; }) {}; "postgresql-common" = callPackage @@ -222194,8 +222439,6 @@ self: { ]; description = "PowerDNS API bindings for api/v1"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "powermate" = callPackage @@ -222361,18 +222604,6 @@ self: { }) {}; "pqueue" = callPackage - ({ mkDerivation, base, deepseq, QuickCheck }: - mkDerivation { - pname = "pqueue"; - version = "1.4.1.4"; - sha256 = "06hjgy7q6dmz6g0m2w466cn5yfdhsv4qqyhmd4wwggvpcn89yr5d"; - libraryHaskellDepends = [ base deepseq ]; - testHaskellDepends = [ base deepseq QuickCheck ]; - description = "Reliable, persistent, fast priority queues"; - license = lib.licenses.bsd3; - }) {}; - - "pqueue_1_4_2_0" = callPackage ({ mkDerivation, base, deepseq, random, tasty, tasty-bench , tasty-quickcheck }: @@ -222385,7 +222616,6 @@ self: { benchmarkHaskellDepends = [ base deepseq random tasty-bench ]; description = "Reliable, persistent, fast priority queues"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; }) {}; "pqueue-mtl" = callPackage @@ -222602,8 +222832,8 @@ self: { ({ mkDerivation, adjunctions, base, deepseq, lens, mtl }: mkDerivation { pname = "predicate-transformers"; - version = "0.7.0.3"; - sha256 = "0ipbl4wq95z61h7jd0x5jv5m01vw69v6qqif4nwx9wp7mjfdp7z0"; + version = "0.8.0.0"; + sha256 = "1fjh0zi3fwy1xkxrr4ang4fa6g0ckdd6sjz11ix0ih6ymsdai39f"; libraryHaskellDepends = [ adjunctions base deepseq lens mtl ]; description = "A library for writing predicates and transformations over predicates in Haskell"; license = lib.licenses.bsd3; @@ -223945,28 +224175,6 @@ self: { }: mkDerivation { pname = "primitive-extras"; - version = "0.10.1.4"; - sha256 = "00x8jwmkijc110idviz6i4q25dfxnjv4gcdkhsyrldrg8g1bn90f"; - libraryHaskellDepends = [ - base bytestring cereal deferred-folds focus foldl list-t primitive - primitive-unlifted profunctors vector - ]; - testHaskellDepends = [ - cereal deferred-folds focus primitive QuickCheck - quickcheck-instances rerebase tasty tasty-hunit tasty-quickcheck - ]; - description = "Extras for the \"primitive\" library"; - license = lib.licenses.mit; - }) {}; - - "primitive-extras_0_10_1_5" = callPackage - ({ mkDerivation, base, bytestring, cereal, deferred-folds, focus - , foldl, list-t, primitive, primitive-unlifted, profunctors - , QuickCheck, quickcheck-instances, rerebase, tasty, tasty-hunit - , tasty-quickcheck, vector - }: - mkDerivation { - pname = "primitive-extras"; version = "0.10.1.5"; sha256 = "0xmigva8lss9h18q0a63mc9sridny40nyzkizr2vmgm5d9qniqjs"; libraryHaskellDepends = [ @@ -223979,7 +224187,6 @@ self: { ]; description = "Extras for the \"primitive\" library"; license = lib.licenses.mit; - hydraPlatforms = lib.platforms.none; }) {}; "primitive-foreign" = callPackage @@ -224989,8 +225196,8 @@ self: { }: mkDerivation { pname = "profiteur"; - version = "0.4.6.0"; - sha256 = "0jkrx34hymx70aqxjcnw2a7pdiw1hy4nc6m2larjrgxjczshpfqx"; + version = "0.4.6.1"; + sha256 = "1a8li2wkr2af1d5ddpprxzjs7m2j7ii30k7j93a22isfqmywhhbb"; isLibrary = false; isExecutable = true; enableSeparateDataOutput = true; @@ -226174,15 +226381,15 @@ self: { }) {}; "proto3-wire" = callPackage - ({ mkDerivation, base, bytestring, cereal, containers, deepseq - , doctest, ghc-prim, hashable, parameterized, primitive, QuickCheck - , safe, tasty, tasty-hunit, tasty-quickcheck, text, transformers - , unordered-containers, vector, word-compat + ({ mkDerivation, base, bytestring, cereal, containers, criterion + , deepseq, doctest, ghc-prim, hashable, parameterized, primitive + , QuickCheck, random, safe, tasty, tasty-hunit, tasty-quickcheck + , text, transformers, unordered-containers, vector, word-compat }: mkDerivation { pname = "proto3-wire"; - version = "1.3.0"; - sha256 = "1m9yv7cvswkzz32cxm57ay68gh4rdklcz15m3v8rzywp5fqsly26"; + version = "1.4.0"; + sha256 = "1byjv249w3vm1298dqqjpmrwpzcdmz8dh7bykn981zxyn9qhf55y"; libraryHaskellDepends = [ base bytestring cereal containers deepseq ghc-prim hashable parameterized primitive QuickCheck safe text transformers @@ -226192,6 +226399,7 @@ self: { base bytestring cereal doctest QuickCheck tasty tasty-hunit tasty-quickcheck text transformers vector ]; + benchmarkHaskellDepends = [ base bytestring criterion random ]; description = "A low-level implementation of the Protocol Buffers (version 3) wire format"; license = lib.licenses.asl20; hydraPlatforms = lib.platforms.none; @@ -226620,6 +226828,7 @@ self: { description = "Language support for the PureScript programming language"; license = lib.licenses.mit; hydraPlatforms = lib.platforms.none; + broken = true; }) {}; "pseudo-boolean" = callPackage @@ -227516,12 +227725,12 @@ self: { , regex-base, regex-tdfa, safe, scientific, semialign, semigroups , serialise, sourcemap, split, stm, stringsearch, syb, text, these , time, transformers, transformers-base, transformers-compat - , unordered-containers, utf8-string, vector + , typed-process, unordered-containers, utf8-string, vector }: mkDerivation { pname = "purescript"; - version = "0.15.2"; - sha256 = "11ym7ix8nwx96mxq53kgfwqr2cwx5b537di14zr2bk4dp5kr7nd4"; + version = "0.15.4"; + sha256 = "13w604knmazp8bhbdcb7smfpyy4nwsbng10km0gmp367lxwr09yz"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -227534,7 +227743,7 @@ self: { pattern-arrows process protolude regex-tdfa safe scientific semialign semigroups serialise sourcemap split stm stringsearch syb text these time transformers transformers-base transformers-compat - unordered-containers utf8-string vector + typed-process unordered-containers utf8-string vector ]; libraryToolDepends = [ happy ]; executableHaskellDepends = [ @@ -227548,7 +227757,7 @@ self: { parsec pattern-arrows process protolude regex-tdfa safe scientific semialign semigroups serialise sourcemap split stm stringsearch syb text these time transformers transformers-base transformers-compat - unordered-containers utf8-string vector + typed-process unordered-containers utf8-string vector ]; executableToolDepends = [ happy ]; testHaskellDepends = [ @@ -227562,7 +227771,7 @@ self: { process protolude QuickCheck regex-base regex-tdfa safe scientific semialign semigroups serialise sourcemap split stm stringsearch syb text these time transformers transformers-base transformers-compat - unordered-containers utf8-string vector + typed-process unordered-containers utf8-string vector ]; testToolDepends = [ happy hspec-discover ]; doCheck = false; @@ -227697,6 +227906,7 @@ self: { license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; mainProgram = "purs-tsd-gen"; + broken = true; }) {}; "pursuit-client" = callPackage @@ -232032,21 +232242,18 @@ self: { }) {}; "raven-haskell" = callPackage - ({ mkDerivation, aeson, base, bytestring, hspec, http-conduit, mtl + ({ mkDerivation, aeson, base, bytestring, http-conduit, mtl , network, random, resourcet, text, time, unordered-containers , uuid-types }: mkDerivation { pname = "raven-haskell"; - version = "0.1.4.0"; - sha256 = "136vszzvfmhpxzavl7smnbyn45w026j005cdknapxhb6v495b7qz"; + version = "0.1.4.1"; + sha256 = "0977rwafdwljz3444asvjsikpwc89diahmmzl9f5xc8dzfqcnzay"; libraryHaskellDepends = [ aeson base bytestring http-conduit mtl network random resourcet text time unordered-containers uuid-types ]; - testHaskellDepends = [ - aeson base bytestring hspec time unordered-containers - ]; description = "Haskell client for Sentry logging service"; license = lib.licenses.mit; hydraPlatforms = lib.platforms.none; @@ -234265,6 +234472,24 @@ self: { license = lib.licenses.mit; }) {}; + "refined_0_7" = callPackage + ({ mkDerivation, aeson, base, bytestring, deepseq, exceptions + , hashable, mtl, QuickCheck, template-haskell, text, these-skinny + }: + mkDerivation { + pname = "refined"; + version = "0.7"; + sha256 = "0l0hn905vjymabp9m3mvs9lg73kwp7c7133zkbyc911mb9h0lq54"; + libraryHaskellDepends = [ + aeson base bytestring deepseq exceptions hashable mtl QuickCheck + template-haskell text these-skinny + ]; + testHaskellDepends = [ base QuickCheck ]; + description = "Refinement types with static and runtime checking"; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + }) {}; + "refined-http-api-data" = callPackage ({ mkDerivation, base, http-api-data, refined, text }: mkDerivation { @@ -234392,6 +234617,48 @@ self: { license = lib.licenses.bsd3; }) {}; + "reflex_0_8_2_1" = callPackage + ({ mkDerivation, base, bifunctors, commutative-semigroups, comonad + , constraints, constraints-extras, containers, criterion + , data-default, deepseq, dependent-map, dependent-sum, directory + , exception-transformers, filemanip, filepath, haskell-src-exts + , haskell-src-meta, hlint, hspec, lens, loch-th, MemoTrie, mmorph + , monad-control, monoidal-containers, mtl, patch, prim-uniq + , primitive, process, proctest, profunctors, random, ref-tf + , reflection, semialign, semigroupoids, split, stm, syb + , template-haskell, text, these, these-lens, time, transformers + , unbounded-delays, witherable + }: + mkDerivation { + pname = "reflex"; + version = "0.8.2.1"; + sha256 = "1w8smiwn86cxb3fsfgyzxpk11hryhxi6g94m52grmnx6vhc7sm6v"; + libraryHaskellDepends = [ + base bifunctors commutative-semigroups comonad constraints + constraints-extras containers data-default dependent-map + dependent-sum exception-transformers haskell-src-exts + haskell-src-meta lens MemoTrie mmorph monad-control + monoidal-containers mtl patch prim-uniq primitive profunctors + random ref-tf reflection semialign semigroupoids stm syb + template-haskell these time transformers unbounded-delays + witherable + ]; + testHaskellDepends = [ + base bifunctors commutative-semigroups constraints + constraints-extras containers deepseq dependent-map dependent-sum + directory filemanip filepath hlint hspec lens monoidal-containers + mtl patch proctest ref-tf semialign split text these these-lens + transformers witherable + ]; + benchmarkHaskellDepends = [ + base containers criterion deepseq dependent-map dependent-sum + loch-th mtl primitive process ref-tf split stm time transformers + ]; + description = "Higher-order Functional Reactive Programming"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + }) {}; + "reflex-animation" = callPackage ({ mkDerivation, base, bifunctors, containers, profunctors, reflex , reflex-transformers, semigroups, vector-space @@ -235380,25 +235647,6 @@ self: { }: mkDerivation { pname = "regex"; - version = "1.1.0.1"; - sha256 = "0gjascxc2x4mxq570wv1q5fn6qfkk9lc4x0xdkhqrd84aw4pc3qm"; - libraryHaskellDepends = [ - array base base-compat bytestring containers hashable regex-base - regex-pcre-builtin regex-tdfa template-haskell text time - time-locale-compat transformers unordered-containers utf8-string - ]; - description = "Toolkit for regex-base"; - license = lib.licenses.bsd3; - }) {}; - - "regex_1_1_0_2" = callPackage - ({ mkDerivation, array, base, base-compat, bytestring, containers - , hashable, regex-base, regex-pcre-builtin, regex-tdfa - , template-haskell, text, time, time-locale-compat, transformers - , unordered-containers, utf8-string - }: - mkDerivation { - pname = "regex"; version = "1.1.0.2"; sha256 = "1nzyfkqmclmawmphvksvm9l64awqgnypic4xplc2s9sjcj4h814a"; libraryHaskellDepends = [ @@ -235408,7 +235656,6 @@ self: { ]; description = "Toolkit for regex-base"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; }) {}; "regex-applicative" = callPackage @@ -235937,24 +236184,6 @@ self: { }: mkDerivation { pname = "regex-with-pcre"; - version = "1.1.0.1"; - sha256 = "1dypklwhjcsq1y7nfpn6z6gj9c4j1wg3x55yvfczlnk97jl6dk1m"; - libraryHaskellDepends = [ - base base-compat bytestring containers regex regex-base - regex-pcre-builtin regex-tdfa template-haskell text transformers - unordered-containers - ]; - description = "Toolkit for regex-base"; - license = lib.licenses.bsd3; - }) {}; - - "regex-with-pcre_1_1_0_2" = callPackage - ({ mkDerivation, base, base-compat, bytestring, containers, regex - , regex-base, regex-pcre-builtin, regex-tdfa, template-haskell - , text, transformers, unordered-containers - }: - mkDerivation { - pname = "regex-with-pcre"; version = "1.1.0.2"; sha256 = "00x90kj8xc9pnnzryx45rnvfh0psya6kc174y7zx43jgvbz29icy"; libraryHaskellDepends = [ @@ -235964,7 +236193,6 @@ self: { ]; description = "Toolkit for regex-base"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; }) {}; "regex-wrapper" = callPackage @@ -236195,8 +236423,8 @@ self: { }: mkDerivation { pname = "registry"; - version = "0.3.0.8"; - sha256 = "1mz8ahbivaj8a9hsi5m8shwmdz5hqq2fw1m0z7m2kpinnj1p3pbf"; + version = "0.3.0.9"; + sha256 = "1w4qs28q5gb5v896hb7rpkbjix7jwgni5ky0wddas04l7ap3an0d"; libraryHaskellDepends = [ base containers exceptions hashable mmorph mtl protolude resourcet semigroupoids semigroups template-haskell text transformers-base @@ -236246,8 +236474,8 @@ self: { }: mkDerivation { pname = "registry-hedgehog"; - version = "0.7.0.2"; - sha256 = "1vjvpszac038lyjix9mbfixfid224incb3y97s2dhqjirb8dzzbf"; + version = "0.7.0.3"; + sha256 = "1scas90v8qsikacahk6z5xkg4k6vy0fq4kpgdzgmzibfgjb5d4an"; libraryHaskellDepends = [ base containers hedgehog mmorph multimap protolude registry tasty tasty-discover tasty-hedgehog tasty-th template-haskell text @@ -237993,8 +238221,8 @@ self: { ({ mkDerivation, base }: mkDerivation { pname = "requirements"; - version = "0.7.0.1"; - sha256 = "0nikl4ga2jap95yf29z87wnazfhz7k272phjwajn1yk22shv308z"; + version = "0.7.0.2"; + sha256 = "0291av4vixsns5w55yff4vjd8mr2wr8fpm26ckx903sll0y982ix"; libraryHaskellDepends = [ base ]; description = "Abstraction to manage user defined Type Errors"; license = lib.licenses.gpl3Only; @@ -238382,6 +238610,23 @@ self: { license = lib.licenses.bsd3; }) {}; + "resourcet_1_2_6" = callPackage + ({ mkDerivation, base, containers, exceptions, hspec, mtl + , primitive, transformers, unliftio-core + }: + mkDerivation { + pname = "resourcet"; + version = "1.2.6"; + sha256 = "0d7xnpysrick56gxzkkj0mpblywbxaaldhziyl77am3822r3afzq"; + libraryHaskellDepends = [ + base containers exceptions mtl primitive transformers unliftio-core + ]; + testHaskellDepends = [ base exceptions hspec transformers ]; + description = "Deterministic allocation and freeing of scarce resources"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + }) {}; + "resourcet-pool" = callPackage ({ mkDerivation, base, resource-pool, resourcet }: mkDerivation { @@ -238754,6 +238999,24 @@ self: { broken = true; }) {}; + "ret" = callPackage + ({ mkDerivation, base, case-insensitive, containers, directory + , filepath, unix + }: + mkDerivation { + pname = "ret"; + version = "0.1.4.2"; + sha256 = "1p0d854hw5qs94fiqsbgbs4picyjj2g51x0j4nasw4acbfwhmzgz"; + isLibrary = false; + isExecutable = true; + executableHaskellDepends = [ + base case-insensitive containers directory filepath unix + ]; + description = "A tool that returns to a landmark parent directory"; + license = lib.licenses.mit; + mainProgram = "ret"; + }) {}; + "rethinkdb" = callPackage ({ mkDerivation, aeson, async, base, base64-bytestring, binary , bytestring, containers, criterion, data-default, doctest, mtl @@ -239427,16 +239690,16 @@ self: { "rhine" = callPackage ({ mkDerivation, base, containers, deepseq, dunai, free - , MonadRandom, random, simple-affine-space, time, transformers - , vector-sized + , MonadRandom, random, simple-affine-space, time, time-domain + , transformers, vector-sized }: mkDerivation { pname = "rhine"; - version = "0.7.1"; - sha256 = "1pgmbb1l3qf4gm7hb5vic5r85qrq2spzb0r1jniw12sq0jb113dp"; + version = "0.8.0.0"; + sha256 = "0axhfv3vwd12k5c21fd34hw4dvn0bydyzr50b62z8wl0009vq01x"; libraryHaskellDepends = [ base containers deepseq dunai free MonadRandom random - simple-affine-space time transformers vector-sized + simple-affine-space time time-domain transformers vector-sized ]; description = "Functional Reactive Programming with type-level clocks"; license = lib.licenses.bsd3; @@ -239447,8 +239710,8 @@ self: { ({ mkDerivation, base, dunai, gloss, rhine, transformers }: mkDerivation { pname = "rhine-gloss"; - version = "0.7.1"; - sha256 = "0xy135nqjrzqxyvcma7mqp05plfw8xhl9qn827wswrqy8wcg85pm"; + version = "0.8.0.0"; + sha256 = "00mc1kbxvh4ilxkgpmxzfac50hziq6x6j7f1h7rfdlxhjhfyzh6y"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ base dunai gloss rhine transformers ]; @@ -242346,6 +242609,32 @@ self: { hydraPlatforms = lib.platforms.none; }) {}; + "rustls" = callPackage + ({ mkDerivation, async, base, bytestring, containers + , derive-storable, derive-storable-plugin, directory, filepath + , hedgehog, network, process, resourcet, rustls, stm, tasty + , tasty-hedgehog, tasty-hunit, temporary, text, transformers + }: + mkDerivation { + pname = "rustls"; + version = "0.0.0.0"; + sha256 = "1j7qxmapz9znmbd02359qxbsh1pkprzcg2jjpsz80kfyb6bjj766"; + libraryHaskellDepends = [ + base bytestring derive-storable derive-storable-plugin network + resourcet text transformers + ]; + librarySystemDepends = [ rustls ]; + testHaskellDepends = [ + async base bytestring containers directory filepath hedgehog + process resourcet stm tasty tasty-hedgehog tasty-hunit temporary + text transformers + ]; + description = "TLS bindings for Rustls"; + license = lib.licenses.cc0; + hydraPlatforms = lib.platforms.none; + broken = true; + }) {rustls = null;}; + "rv" = callPackage ({ mkDerivation, base, base-unicode-symbols, criterion, Fin, peano , smallcheck, tasty, tasty-smallcheck, util, word @@ -242566,6 +242855,22 @@ self: { license = lib.licenses.mit; }) {}; + "safe-coloured-text_0_2_0_1" = callPackage + ({ mkDerivation, base, bytestring, text, validity + , validity-bytestring, validity-text + }: + mkDerivation { + pname = "safe-coloured-text"; + version = "0.2.0.1"; + sha256 = "0n8pkdy7v1c3c14fpbwkrib5vmmviqv9ysl7bcm6g3p23qi4lq5i"; + libraryHaskellDepends = [ + base bytestring text validity validity-bytestring validity-text + ]; + description = "Safely output coloured text"; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + }) {}; + "safe-coloured-text-gen" = callPackage ({ mkDerivation, base, genvalidity, genvalidity-bytestring , genvalidity-sydtest, genvalidity-text, safe-coloured-text @@ -242573,8 +242878,8 @@ self: { }: mkDerivation { pname = "safe-coloured-text-gen"; - version = "0.0.0.0"; - sha256 = "1z5livjv0n1i05i3fi58hi7vqwvycapnr5rp1m8rpgj8lhsbi9qx"; + version = "0.0.0.1"; + sha256 = "1h2n6qvggrzrqfbi9633kjzmlpgqf4anbqzip6l3ygj5p1lk69zb"; libraryHaskellDepends = [ base genvalidity genvalidity-bytestring genvalidity-text safe-coloured-text @@ -242584,6 +242889,7 @@ self: { ]; testToolDepends = [ sydtest-discover ]; license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; }) {}; "safe-coloured-text-layout" = callPackage @@ -242601,6 +242907,7 @@ self: { testToolDepends = [ sydtest-discover ]; description = "Safely layout output coloured text"; license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; }) {}; "safe-coloured-text-layout-gen" = callPackage @@ -242621,6 +242928,7 @@ self: { ]; testToolDepends = [ sydtest-discover ]; license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; }) {}; "safe-coloured-text-terminfo" = callPackage @@ -242634,6 +242942,18 @@ self: { license = lib.licenses.mit; }) {}; + "safe-coloured-text-terminfo_0_1_0_0" = callPackage + ({ mkDerivation, base, safe-coloured-text, terminfo }: + mkDerivation { + pname = "safe-coloured-text-terminfo"; + version = "0.1.0.0"; + sha256 = "1qfs1y35sxabnlihfzbs5nhmhz5xb7fwiib4j2nhwwq70glyldcn"; + libraryHaskellDepends = [ base safe-coloured-text terminfo ]; + description = "Safely output coloured text"; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + }) {}; + "safe-coupling" = callPackage ({ mkDerivation, HUnit, liquid-base, liquid-containers , liquid-prelude, liquidhaskell, probability, rest-rewrite, sort @@ -244163,7 +244483,7 @@ self: { license = lib.licenses.mit; }) {}; - "sbp_4_4_0" = callPackage + "sbp_4_5_0" = callPackage ({ mkDerivation, aeson, aeson-pretty, array, base , base64-bytestring, basic-prelude, binary, binary-conduit , bytestring, cmdargs, conduit, conduit-extra, data-binary-ieee754 @@ -244172,8 +244492,8 @@ self: { }: mkDerivation { pname = "sbp"; - version = "4.4.0"; - sha256 = "1alwz2ch0yb5x2djk2pfba1iiywgkq7qzsk31l4mc8ixy4bcx6sf"; + version = "4.5.0"; + sha256 = "1yw6ak55j5zwc7wa3fspwdcmgxn6hy0lha42r6slr82gam9pcih3"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -245842,8 +246162,8 @@ self: { }: mkDerivation { pname = "script-monad"; - version = "0.0.3"; - sha256 = "18gwf2d8hzpgmkyjzr7p6f33qjcgr9lbj267s4bjf8476kk40ifg"; + version = "0.0.4"; + sha256 = "1wyw3kqr0fnps8nj59wc1g5jj72fx7zjfvizka61smxlfqvvil87"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -245853,8 +246173,8 @@ self: { ]; executableHaskellDepends = [ base ]; testHaskellDepends = [ - base bytestring tasty tasty-hunit tasty-quickcheck - tasty-quickcheck-laws transformers + base bytestring http-client http-types QuickCheck tasty tasty-hunit + tasty-quickcheck tasty-quickcheck-laws text transformers ]; description = "Stack of error, reader, writer, state, and prompt monad transformers"; license = lib.licenses.bsd3; @@ -247549,15 +247869,16 @@ self: { }) {}; "sendgrid-v3" = callPackage - ({ mkDerivation, aeson, base, bytestring, http-client, lens - , semigroups, tasty, tasty-hunit, text, wreq + ({ mkDerivation, aeson, base, bytestring, containers, http-client + , lens, semigroups, tasty, tasty-hunit, text, wreq }: mkDerivation { pname = "sendgrid-v3"; - version = "0.3.0.0"; - sha256 = "0b1m2r0zq3f3ggy9nds42rf0w25p08mkcs9crvckmvqjhmwik1cm"; + version = "1.0.0.0"; + sha256 = "0rl1zz01ca61bmm795b769k7h399s0yhkivp2br85flhrqw3asmm"; libraryHaskellDepends = [ - aeson base bytestring http-client lens semigroups text wreq + aeson base bytestring containers http-client lens semigroups text + wreq ]; testHaskellDepends = [ base lens semigroups tasty tasty-hunit text wreq @@ -252422,6 +252743,7 @@ self: { ]; description = "Dependency tracking for Futhark"; license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; }) {}; "shake-google-closure-compiler" = callPackage @@ -253233,10 +253555,10 @@ self: { ({ mkDerivation, base, hspec, megaparsec, text }: mkDerivation { pname = "shellwords"; - version = "0.1.2.2"; - sha256 = "0d99ix0gffch5vnbnkd48zlah6lgbn4pj1z58k07g90rickrv4sl"; + version = "0.1.3.0"; + sha256 = "0n5miyicjirpkh5p9vgcxb75jh4n6g8lxhrzxpm8fggmv8z0gm1s"; libraryHaskellDepends = [ base megaparsec text ]; - testHaskellDepends = [ base hspec ]; + testHaskellDepends = [ base hspec megaparsec ]; description = "Parse strings into words, like a shell would"; license = lib.licenses.mit; }) {}; @@ -254436,22 +254758,6 @@ self: { }: mkDerivation { pname = "simple-cmd"; - version = "0.2.6"; - sha256 = "0x5r4i1ckswrs0060blr6zx1n8zbdqc977nq9n5gmwcfznsrhc67"; - libraryHaskellDepends = [ - base directory extra filepath process time unix - ]; - testHaskellDepends = [ base hspec ]; - description = "Simple String-based process commands"; - license = lib.licenses.bsd3; - }) {}; - - "simple-cmd_0_2_7" = callPackage - ({ mkDerivation, base, directory, extra, filepath, hspec, process - , time, unix - }: - mkDerivation { - pname = "simple-cmd"; version = "0.2.7"; sha256 = "1pjkcww6s45s6w757cyxniis2w4ndg7vgz6gj3c1iwfh10ajk0q4"; libraryHaskellDepends = [ @@ -254460,7 +254766,6 @@ self: { testHaskellDepends = [ base hspec ]; description = "Simple String-based process commands"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; }) {}; "simple-cmd-args" = callPackage @@ -261630,23 +261935,11 @@ self: { ({ mkDerivation, base, containers, ghc, hlint, stm }: mkDerivation { pname = "splint"; - version = "1.0.1.5"; - sha256 = "1mvkd5jcrivc57g6dw6iwss6682q7wyi6zb2k3nd3vywm1a0c8ql"; - libraryHaskellDepends = [ base containers ghc hlint stm ]; - description = "HLint as a GHC source plugin"; - license = lib.licenses.isc; - }) {}; - - "splint_1_0_2_0" = callPackage - ({ mkDerivation, base, containers, ghc, hlint, stm }: - mkDerivation { - pname = "splint"; version = "1.0.2.0"; sha256 = "18n97b6437yql0sk55kns9mz2x2rgdfjw9ajpmm4adh5n5kc5cf6"; libraryHaskellDepends = [ base containers ghc hlint stm ]; description = "HLint as a GHC source plugin"; license = lib.licenses.isc; - hydraPlatforms = lib.platforms.none; }) {}; "split" = callPackage @@ -262958,6 +263251,8 @@ self: { pname = "stache"; version = "2.3.2"; sha256 = "1ya9hnxvwqh1qhlci7aqpbj9abmsi2n13251b8nffmpvlpls6lk8"; + revision = "1"; + editedCabalFile = "1dirydqnbnvyasdpsncf1c9vlcfb9h8c8ff3fancsbrdwfbdjlbj"; isLibrary = true; isExecutable = true; enableSeparateDataOutput = true; @@ -262981,6 +263276,40 @@ self: { mainProgram = "stache"; }) {}; + "stache_2_3_3" = callPackage + ({ mkDerivation, aeson, base, bytestring, containers, criterion + , deepseq, directory, file-embed, filepath, gitrev, hspec + , hspec-discover, hspec-megaparsec, megaparsec, mtl + , optparse-applicative, template-haskell, text, vector, yaml + }: + mkDerivation { + pname = "stache"; + version = "2.3.3"; + sha256 = "1naqj54qm59f04x310lvj4fsrp3xar1v643i79gp7h48kyn1c2vy"; + isLibrary = true; + isExecutable = true; + enableSeparateDataOutput = true; + libraryHaskellDepends = [ + aeson base bytestring containers deepseq directory filepath + megaparsec mtl template-haskell text vector + ]; + executableHaskellDepends = [ + aeson base filepath gitrev optparse-applicative text yaml + ]; + testHaskellDepends = [ + aeson base bytestring containers file-embed hspec hspec-megaparsec + megaparsec template-haskell text yaml + ]; + testToolDepends = [ hspec-discover ]; + benchmarkHaskellDepends = [ + aeson base criterion deepseq megaparsec text + ]; + description = "Mustache templates for Haskell"; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + mainProgram = "stache"; + }) {}; + "stack" = callPackage ({ mkDerivation, aeson, annotated-wl-pprint, ansi-terminal, array , async, attoparsec, base, base64-bytestring, bytestring, Cabal @@ -267834,8 +268163,8 @@ self: { }: mkDerivation { pname = "stripeapi"; - version = "2.0.1.0"; - sha256 = "16jiqhkl6ww1rk0n3bp26p30x536akyaaww75bwz0rwzxkr8rjsh"; + version = "3.0.0.0"; + sha256 = "0nv2xypch45lm8v6lx4g9isgdxxpj60s9a5ki8iwnc333vy62q1v"; libraryHaskellDepends = [ aeson base bytestring ghc-prim http-client http-conduit http-types mtl scientific text time transformers unordered-containers vector @@ -269038,6 +269367,24 @@ self: { license = lib.licenses.bsd3; }) {}; + "superbuffer_0_3_1_2" = callPackage + ({ mkDerivation, async, base, buffer-builder, bytestring, criterion + , HTF, QuickCheck + }: + mkDerivation { + pname = "superbuffer"; + version = "0.3.1.2"; + sha256 = "024mcjmayirwxqqyr9w1zfsxihi680clzngkpmgccv10phb8qpsp"; + libraryHaskellDepends = [ base bytestring ]; + testHaskellDepends = [ async base bytestring HTF QuickCheck ]; + benchmarkHaskellDepends = [ + async base buffer-builder bytestring criterion + ]; + description = "Efficiently build a bytestring from smaller chunks"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + }) {}; + "supercollider-ht" = callPackage ({ mkDerivation, base, hosc, hsc3, opensoundcontrol-ht, process , random, transformers @@ -270053,8 +270400,8 @@ self: { }: mkDerivation { pname = "sydtest"; - version = "0.10.1.0"; - sha256 = "149nn1shdwixg3is7fgjav0ff4vaqkm39ha0gswds7z57pr18qhm"; + version = "0.11.0.0"; + sha256 = "0alrpz8py6afanr1g1in9yd9jvjps9iww9gjb6kg0mdvnrwimj7b"; libraryHaskellDepends = [ async autodocodec autodocodec-yaml base bytestring containers Diff dlist envparse filepath MonadRandom mtl optparse-applicative path @@ -270068,6 +270415,7 @@ self: { testToolDepends = [ sydtest-discover ]; description = "A modern testing framework for Haskell with good defaults and advanced testing features"; license = "unknown"; + hydraPlatforms = lib.platforms.none; }) {}; "sydtest-aeson" = callPackage @@ -270086,6 +270434,7 @@ self: { testToolDepends = [ sydtest-discover ]; description = "An aeson companion library for sydtest"; license = "unknown"; + hydraPlatforms = lib.platforms.none; }) {}; "sydtest-amqp" = callPackage @@ -270142,6 +270491,7 @@ self: { testToolDepends = [ sydtest-discover ]; description = "A Hedgehog companion library for sydtest"; license = "unknown"; + hydraPlatforms = lib.platforms.none; }) {}; "sydtest-hedis" = callPackage @@ -270180,6 +270530,7 @@ self: { testToolDepends = [ sydtest-discover ]; description = "An Hspec companion library for sydtest"; license = "unknown"; + hydraPlatforms = lib.platforms.none; }) {}; "sydtest-mongo" = callPackage @@ -270216,6 +270567,7 @@ self: { ]; description = "A persistent companion library for sydtest"; license = "unknown"; + hydraPlatforms = lib.platforms.none; }) {}; "sydtest-persistent-postgresql" = callPackage @@ -270257,6 +270609,7 @@ self: { testToolDepends = [ sydtest-discover ]; description = "A persistent-sqlite companion library for sydtest"; license = "unknown"; + hydraPlatforms = lib.platforms.none; }) {}; "sydtest-process" = callPackage @@ -270272,6 +270625,7 @@ self: { testToolDepends = [ sydtest-discover ]; description = "A typed-process companion library for sydtest"; license = "unknown"; + hydraPlatforms = lib.platforms.none; }) {}; "sydtest-rabbitmq" = callPackage @@ -270312,6 +270666,7 @@ self: { testToolDepends = [ sydtest-discover ]; description = "A servant companion library for sydtest"; license = "unknown"; + hydraPlatforms = lib.platforms.none; }) {}; "sydtest-typed-process" = callPackage @@ -270327,6 +270682,7 @@ self: { testToolDepends = [ sydtest-discover ]; description = "A typed-process companion library for sydtest"; license = "unknown"; + hydraPlatforms = lib.platforms.none; }) {}; "sydtest-wai" = callPackage @@ -270348,6 +270704,7 @@ self: { testToolDepends = [ sydtest-discover ]; description = "A wai companion library for sydtest"; license = "unknown"; + hydraPlatforms = lib.platforms.none; }) {}; "sydtest-webdriver" = callPackage @@ -272874,16 +273231,16 @@ self: { "takedouble" = callPackage ({ mkDerivation, base, bytestring, directory, extra, filepath - , hedgehog, temporary, unix + , filepattern, hedgehog, temporary, unix }: mkDerivation { pname = "takedouble"; - version = "0.0.1.1"; - sha256 = "0b0m96grcjjk1hw9i13d9nfs8k7i68zl4jv5raqw8lxqvav5yd3j"; + version = "0.0.2.0"; + sha256 = "09n187ng4gk0ck40jx8xzpbyw6dj800qc479hzib9bq248pbw4lg"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ - base bytestring directory extra filepath unix + base bytestring directory extra filepath filepattern unix ]; executableHaskellDepends = [ base ]; testHaskellDepends = [ @@ -274175,8 +274532,8 @@ self: { }: mkDerivation { pname = "tasty-sugar"; - version = "1.2.0.0"; - sha256 = "0hw0aanmhxq59r577d1ypd10m08kprhqpdb5w6x4na9pll5sc0gb"; + version = "1.3.0.1"; + sha256 = "065m1x9zjyfjw167crr67ja0hsqpckl0zai6dbpr93jnvifg17ar"; libraryHaskellDepends = [ base directory filemanip filepath kvitable logict microlens mtl optparse-applicative prettyprinter tasty text @@ -282241,6 +282598,7 @@ self: { testToolDepends = [ sydtest-discover ]; description = "A thread-safe concurrent token-bucket rate limiter that guarantees fairness"; license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; }) {}; "token-search" = callPackage @@ -283748,14 +284106,12 @@ self: { license = lib.licenses.bsd3; }) {}; - "transformers-compat_0_7_1" = callPackage + "transformers-compat_0_7_2" = callPackage ({ mkDerivation, base, ghc-prim, transformers }: mkDerivation { pname = "transformers-compat"; - version = "0.7.1"; - sha256 = "102hydcqn7yjskzp586fvsw39dp3fi34fkskc7ykqkf16haqc2xc"; - revision = "1"; - editedCabalFile = "03xi4gxwvim33xkv289g6wz9dpz43zd91s5j2ini7bhcg40gagl7"; + version = "0.7.2"; + sha256 = "0slxrkxi8xa1bmi9saq9x8bz52clrf2slf877m3ckjzkr4276b5n"; libraryHaskellDepends = [ base ghc-prim transformers ]; description = "A small compatibility shim for the transformers library"; license = lib.licenses.bsd3; @@ -285701,6 +286057,18 @@ self: { license = lib.licenses.bsd3; }) {}; + "tuple-append" = callPackage + ({ mkDerivation, base, ghc-prim, hspec, template-haskell }: + mkDerivation { + pname = "tuple-append"; + version = "0.1.0.0"; + sha256 = "1lmpwf5fdgs6xzfbgp5mr9090m7323gmrn8fbclmr1kr2xfribnw"; + libraryHaskellDepends = [ base ghc-prim template-haskell ]; + testHaskellDepends = [ base ghc-prim hspec ]; + description = "A package to append items and tuples into new tuples"; + license = lib.licenses.bsd3; + }) {}; + "tuple-gen" = callPackage ({ mkDerivation, base, combinat }: mkDerivation { @@ -289275,10 +289643,10 @@ self: { ({ mkDerivation, base, containers, uni-util }: mkDerivation { pname = "uni-events"; - version = "2.2.2.0"; - sha256 = "1damlhi56xfp4xvdk2ijxjx7vxywhhbi4hiprdx09b5ipblrfpqz"; + version = "2.2.2.1"; + sha256 = "0l6m6gzpk8v4f5lhmxf8irpfncjfj017s564mbvgc8dn6zc0301r"; libraryHaskellDepends = [ base containers uni-util ]; - description = "Event handling for the uniform workbench"; + description = "uni events"; license = "LGPL"; hydraPlatforms = lib.platforms.none; }) {}; @@ -289289,8 +289657,8 @@ self: { }: mkDerivation { pname = "uni-graphs"; - version = "2.2.1.1"; - sha256 = "1l9spz147nppdzannk98x9zb7r2pdxz31xs7vqzj1g5alndn2ffy"; + version = "2.2.1.2"; + sha256 = "0l05mcn0swciq6sb9xsym0qksazyrlzlcp3k7ngpva0h092g7gfm"; libraryHaskellDepends = [ base containers mtl uni-events uni-htk uni-reactor uni-util ]; @@ -289366,15 +289734,15 @@ self: { "uni-util" = callPackage ({ mkDerivation, array, base, bytestring, containers, directory - , ghc-prim, mtl, network, old-time, parsec + , ghc-prim, mtl, network, network-bsd, old-time, parsec }: mkDerivation { pname = "uni-util"; - version = "2.3.0.2"; - sha256 = "0qxpfaxsmkhvqbpwymlz20hx63z9bkxra2pynr0imxchaxahxws6"; + version = "2.3.0.3"; + sha256 = "0y0xivvy9wgd0q0npahii5jmq0z2913pmbf8smn6w0xpxi1a7482"; libraryHaskellDepends = [ array base bytestring containers directory ghc-prim mtl network - old-time parsec + network-bsd old-time parsec ]; description = "Utilities for the uniform workbench"; license = "LGPL"; @@ -289443,6 +289811,24 @@ self: { license = lib.licenses.asl20; }) {}; + "unicode-data-names" = callPackage + ({ mkDerivation, base, deepseq, hspec, hspec-discover, tasty + , tasty-bench, unicode-data + }: + mkDerivation { + pname = "unicode-data-names"; + version = "0.1.0"; + sha256 = "08f071i6p13q6n9aqlibdn0zsl4b6079lml341bfydd5qj9kjmgv"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ base ]; + testHaskellDepends = [ base hspec unicode-data ]; + testToolDepends = [ hspec-discover ]; + benchmarkHaskellDepends = [ base deepseq tasty tasty-bench ]; + description = "Unicode characters names and aliases"; + license = lib.licenses.asl20; + }) {}; + "unicode-general-category" = callPackage ({ mkDerivation, array, base, binary, bytestring, containers , file-embed, hspec, QuickCheck, text @@ -294232,25 +294618,6 @@ self: { }: mkDerivation { pname = "vector-builder"; - version = "0.3.8.3"; - sha256 = "0rajpk54n9anlqixxr2qn7qximhhy7qa4gg4czwmj5zl5ysj2br4"; - revision = "1"; - editedCabalFile = "026yz76lqi7pllcnix8jwsqa7dp775nd0ssf6pkjbqnmlgf5iblf"; - libraryHaskellDepends = [ base vector ]; - testHaskellDepends = [ - attoparsec QuickCheck quickcheck-instances rerebase tasty - tasty-hunit tasty-quickcheck - ]; - description = "Vector builder"; - license = lib.licenses.mit; - }) {}; - - "vector-builder_0_3_8_4" = callPackage - ({ mkDerivation, attoparsec, base, QuickCheck, quickcheck-instances - , rerebase, tasty, tasty-hunit, tasty-quickcheck, vector - }: - mkDerivation { - pname = "vector-builder"; version = "0.3.8.4"; sha256 = "0gc2n5j1ca07hd50shy7l5xybs1y720zrarzs5dj74dsdcpvmjxw"; libraryHaskellDepends = [ base vector ]; @@ -294260,7 +294627,6 @@ self: { ]; description = "Vector builder"; license = lib.licenses.mit; - hydraPlatforms = lib.platforms.none; }) {}; "vector-bytes-instances" = callPackage @@ -297945,20 +298311,21 @@ self: { }) {}; "wai-rate-limit-postgres" = callPackage - ({ mkDerivation, base, http-client, http-types, postgresql-simple - , postgresql-simple-url, relude, resource-pool, tasty, tasty-hunit - , text, wai, wai-rate-limit, warp + ({ mkDerivation, base, bytestring, http-client, http-types + , postgresql-simple, postgresql-simple-url, resource-pool, tasty + , tasty-hunit, text, time-units, wai, wai-rate-limit, warp }: mkDerivation { pname = "wai-rate-limit-postgres"; - version = "0.5.0.0"; - sha256 = "1qf6s5qx16vjhcxyl24xdh3q10f1rg0aq7hnwm4zmy9b2jfsj77n"; + version = "0.6.0.0"; + sha256 = "1pfdy2gsk5kbxlkjy9f31y45s6jd06ji8mr5qhqh6sxf4gynkmn7"; libraryHaskellDepends = [ - base postgresql-simple relude resource-pool text wai-rate-limit + base bytestring postgresql-simple resource-pool text wai-rate-limit ]; testHaskellDepends = [ - base http-client http-types postgresql-simple postgresql-simple-url - relude resource-pool tasty tasty-hunit text wai wai-rate-limit warp + base bytestring http-client http-types postgresql-simple + postgresql-simple-url resource-pool tasty tasty-hunit text + time-units wai wai-rate-limit warp ]; description = "See README for more info"; license = lib.licenses.asl20; @@ -299671,8 +300038,10 @@ self: { }: mkDerivation { pname = "webby"; - version = "1.0.1"; - sha256 = "00sdw1ly5848f4yq64j4an8w1c83gwry6n8bp7z7csh1y0lz4mm3"; + version = "1.0.2"; + sha256 = "17mx6xwrb49rqx55ccg1wx3ysjpfbvii8kwrmd4nd9wisslldiv6"; + isLibrary = true; + isExecutable = true; libraryHaskellDepends = [ aeson base binary bytestring formatting http-api-data http-types relude resourcet text unliftio unliftio-core unordered-containers @@ -299859,8 +300228,8 @@ self: { }: mkDerivation { pname = "webdriver-w3c"; - version = "0.0.2"; - sha256 = "04ca4j880dpivlascckp386r0jj8cwsw9mfq4jala0b59pkz8z6y"; + version = "0.0.3"; + sha256 = "0q653ais8ayvpgmh7hg25wjlq0h7023khv6xqwz7fb7pp3vadg0x"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -299871,7 +300240,7 @@ self: { unordered-containers uri-encode vector wreq ]; executableHaskellDepends = [ - base tasty tasty-expected-failure transformers + base tasty tasty-expected-failure text transformers ]; testHaskellDepends = [ aeson base base64-bytestring bytestring containers directory @@ -300010,6 +300379,26 @@ self: { license = lib.licenses.mpl20; }) {}; + "webgear-core_1_0_3" = callPackage + ({ mkDerivation, arrows, base, bytestring, case-insensitive + , filepath, http-api-data, http-media, http-types, jose, mime-types + , network, safe-exceptions, tagged, template-haskell, text + , unordered-containers, wai + }: + mkDerivation { + pname = "webgear-core"; + version = "1.0.3"; + sha256 = "1617gc4hlhgx5xyd5b5l1syhpqdq801ifpdgsbrk3z3madhn8vag"; + libraryHaskellDepends = [ + arrows base bytestring case-insensitive filepath http-api-data + http-media http-types jose mime-types network safe-exceptions + tagged template-haskell text unordered-containers wai + ]; + description = "Composable, type-safe library to build HTTP APIs"; + license = lib.licenses.mpl20; + hydraPlatforms = lib.platforms.none; + }) {}; + "webgear-openapi" = callPackage ({ mkDerivation, arrows, base, http-media, http-types , insert-ordered-containers, lens, openapi3, text, webgear-core @@ -300026,6 +300415,23 @@ self: { license = lib.licenses.mpl20; }) {}; + "webgear-openapi_1_0_3" = callPackage + ({ mkDerivation, arrows, base, http-media, http-types + , insert-ordered-containers, lens, openapi3, text, webgear-core + }: + mkDerivation { + pname = "webgear-openapi"; + version = "1.0.3"; + sha256 = "0j0xdqg43qsphsnk0lhy5di3hk77a0n5bbw0qp8n371lk90464hd"; + libraryHaskellDepends = [ + arrows base http-media http-types insert-ordered-containers lens + openapi3 text webgear-core + ]; + description = "Composable, type-safe library to build HTTP API servers"; + license = lib.licenses.mpl20; + hydraPlatforms = lib.platforms.none; + }) {}; + "webgear-server" = callPackage ({ mkDerivation, aeson, arrows, base, base64-bytestring, bytestring , bytestring-conversion, http-api-data, http-media, http-types @@ -300051,6 +300457,32 @@ self: { license = lib.licenses.mpl20; }) {}; + "webgear-server_1_0_3" = callPackage + ({ mkDerivation, aeson, arrows, base, base64-bytestring, bytestring + , bytestring-conversion, http-api-data, http-media, http-types + , jose, monad-time, mtl, QuickCheck, quickcheck-instances, tasty + , tasty-hunit, tasty-quickcheck, text, unordered-containers, wai + , webgear-core + }: + mkDerivation { + pname = "webgear-server"; + version = "1.0.3"; + sha256 = "1qj297wgrhzkg7sb9lrmp5jfi77k09fnfmz4mn74vbwwpr90ahaw"; + libraryHaskellDepends = [ + aeson arrows base base64-bytestring bytestring + bytestring-conversion http-api-data http-media http-types jose + monad-time mtl text unordered-containers wai webgear-core + ]; + testHaskellDepends = [ + base base64-bytestring bytestring http-types QuickCheck + quickcheck-instances tasty tasty-hunit tasty-quickcheck text wai + webgear-core + ]; + description = "Composable, type-safe library to build HTTP API servers"; + license = lib.licenses.mpl20; + hydraPlatforms = lib.platforms.none; + }) {}; + "webidl" = callPackage ({ mkDerivation, base, bytestring, HSFFIG, LEXER, parsec, pretty , utf8-env, utf8-string @@ -300851,8 +301283,8 @@ self: { ({ mkDerivation, base, shelly, template-haskell, text }: mkDerivation { pname = "which"; - version = "0.2"; - sha256 = "1c1l79bdpqfg4n3p5gkc3x362m9k11hmyydr2y3j0xs4hhm3d5aa"; + version = "0.2.0.1"; + sha256 = "0wa11a7x003fx3fx0l7bn8f339pbz9fhv1dnr6jv7xx2066mdnya"; libraryHaskellDepends = [ base shelly template-haskell text ]; description = "Determine the full path to an executable"; license = lib.licenses.bsd3; @@ -301907,9 +302339,10 @@ self: { ({ mkDerivation, base, ghc-prim }: mkDerivation { pname = "word-compat"; - version = "0.0.2"; - sha256 = "164zpk3cqw9i9mblz0cdshgk1382pcnbakr7pxamz4r0gyhs3r9n"; + version = "0.0.3"; + sha256 = "1zr5jcvnhmr7g74ysyd5n8ykakl0n0shpfh7li42a9j7q5bq6ryb"; libraryHaskellDepends = [ base ghc-prim ]; + testHaskellDepends = [ base ]; description = "Compatibility shim for the Int/Word internal change in GHC 9.2"; license = lib.licenses.bsd3; }) {}; @@ -310797,6 +311230,7 @@ self: { license = lib.licenses.mpl20; hydraPlatforms = lib.platforms.none; mainProgram = "zephyr"; + broken = true; }) {}; "zephyr-copilot" = callPackage diff --git a/pkgs/development/haskell-modules/patches/misfortune-ghc9.patch b/pkgs/development/haskell-modules/patches/misfortune-ghc9.patch deleted file mode 100644 index 39f983b15d78e..0000000000000 --- a/pkgs/development/haskell-modules/patches/misfortune-ghc9.patch +++ /dev/null @@ -1,70 +0,0 @@ -diff --git a/misfortune.cabal b/misfortune.cabal -index f5d0dd3..faa5794 100644 ---- a/misfortune.cabal -+++ b/misfortune.cabal -@@ -113,7 +113,8 @@ Library - directory, - filepath, - knob, -- random-fu >= 0.2.2, -+ random, -+ random-fu >= 0.3, - semigroups, - text, - utf8-string, -diff --git a/src/Data/Fortune.hs b/src/Data/Fortune.hs -index 16d221e..ffbc970 100644 ---- a/src/Data/Fortune.hs -+++ b/src/Data/Fortune.hs -@@ -64,6 +64,7 @@ import Paths_misfortune - import System.Directory - import System.Environment - import System.FilePath -+import System.Random.Stateful (newIOGenM, newStdGen) - - -- |The number of fortune strings in the index - numFortunes :: S.FortuneStats -> Int -@@ -233,9 +234,10 @@ randomFortune paths = withFortuneFiles '%' False paths $ \fs -> do - -- random fortune from that file (unformly). - randomFortuneFromRandomFile :: RVar FortuneFile -> IO String - randomFortuneFromRandomFile file = do -- f <- sample file -+ gen <- newStdGen >>= newIOGenM -+ f <- sampleFrom gen file - n <- getNumFortunes f -- i <- sample (uniform 0 (n-1)) -+ i <- sampleFrom gen (uniform 0 (n-1)) - T.unpack <$> getFortune f i - - -- |Given a list of 'FortuneFile's, compute a distrubution over them weighted by the number -diff --git a/src/Fortune.hs b/src/Fortune.hs -index 5a27578..d6ffb74 100644 ---- a/src/Fortune.hs -+++ b/src/Fortune.hs -@@ -21,6 +21,7 @@ import System.Environment - import System.Exit - import System.FilePath - import System.IO -+import System.Random.Stateful (newIOGenM, newStdGen) - import Text.Printf - import Text.Regex.Base - import Text.Regex.PCRE -@@ -200,6 +201,7 @@ main = do - fortunes <- filterM (filterFile args) (fortuneFiles args) - - dist <- getDist args fortunes -+ gen <- newStdGen >>= newIOGenM - - when (numEvents dist == 0) $ do - hPutStrLn stderr "No fortunes matched the filter criteria" -@@ -225,8 +227,8 @@ main = do - , let pctStr = printf "(%.2f%%)" (100 * weight / totalWeight dist) :: String - ] - else do -- (file, fortuneDist) <- sample dist -- fortune <- sample fortuneDist -+ (file, fortuneDist) <- sampleFrom gen dist -+ fortune <- sampleFrom gen fortuneDist - putStrLn . T.unpack =<< getFortune file fortune - - getDist :: Args -> [FortuneFile] -> IO (Categorical Float (FortuneFile, Categorical Float Int)) diff --git a/pkgs/development/libraries/codec2/default.nix b/pkgs/development/libraries/codec2/default.nix index 7d271e16f2408..e360279c6a441 100644 --- a/pkgs/development/libraries/codec2/default.nix +++ b/pkgs/development/libraries/codec2/default.nix @@ -13,6 +13,11 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake ]; + # Install a binary that is used by openwebrx + postInstall = '' + install -Dm0755 src/freedv_rx -t $out/bin/ + ''; + # Swap keyword order to satisfy SWIG parser postFixup = '' sed -r -i 's/(\<_Complex)(\s+)(float|double)/\3\2\1/' $out/include/$pname/freedv_api.h diff --git a/pkgs/development/libraries/gamenetworkingsockets/default.nix b/pkgs/development/libraries/gamenetworkingsockets/default.nix index 8fcb5b2230e06..3927e6e428a80 100644 --- a/pkgs/development/libraries/gamenetworkingsockets/default.nix +++ b/pkgs/development/libraries/gamenetworkingsockets/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "GameNetworkingSockets"; - version = "1.3.0"; + version = "1.4.1"; src = fetchFromGitHub { owner = "ValveSoftware"; repo = pname; rev = "v${version}"; - sha256 = "1d3k1ciw8c8rznxsr4bfmw0f0srblpflv8xqavhcxx2zwvaya78c"; + sha256 = "12741wmpvy7mcvqqmjg4a7ph75rwliwgclhk4imjijqf2qkvsphd"; }; nativeBuildInputs = [ cmake ninja go ]; diff --git a/pkgs/development/libraries/openvdb/default.nix b/pkgs/development/libraries/openvdb/default.nix index 655d664d8fa63..f2b95bd07e3c9 100644 --- a/pkgs/development/libraries/openvdb/default.nix +++ b/pkgs/development/libraries/openvdb/default.nix @@ -1,50 +1,26 @@ -{ lib, stdenv, fetchFromGitHub, openexr, boost, jemalloc, c-blosc, ilmbase, tbb }: +{ lib, stdenv, fetchFromGitHub, cmake, openexr, boost, jemalloc, c-blosc, ilmbase, tbb }: stdenv.mkDerivation rec { pname = "openvdb"; - version = "7.0.0"; + version = "9.1.0"; src = fetchFromGitHub { owner = "dreamworksanimation"; repo = "openvdb"; rev = "v${version}"; - sha256 = "0hhs50f05hkgj1wni53cwbsx2bhn1aam6z65j133356gbid2carl"; + sha256 = "sha256-OP1xCR1YW60125mhhrW5+8/4uk+EBGIeoWGEU9OiIGY="; }; - outputs = [ "out" ]; + nativeBuildInputs = [ cmake ]; buildInputs = [ openexr boost tbb jemalloc c-blosc ilmbase ]; - setSourceRoot = '' - sourceRoot=$(echo */openvdb) - ''; - - installTargets = [ "install_lib" ]; - - enableParallelBuilding = true; - - buildFlags = [ - "lib" - "DESTDIR=$(out)" - "HALF_LIB=-lHalf" - "TBB_LIB=-ltbb" - "BLOSC_LIB=-lblosc" - "LOG4CPLUS_LIB=" - "BLOSC_INCLUDE_DIR=${c-blosc}/include/" - "BLOSC_LIB_DIR=${c-blosc}/lib/" - ]; - - installFlags = [ "DESTDIR=$(out)" ]; - - NIX_CFLAGS_COMPILE="-I${openexr.dev}/include/OpenEXR -I${ilmbase.dev}/include/OpenEXR/"; - NIX_LDFLAGS="-lboost_iostreams"; - meta = with lib; { description = "An open framework for voxel"; homepage = "https://www.openvdb.org"; maintainers = [ maintainers.guibou ]; - platforms = platforms.linux; + platforms = platforms.unix; license = licenses.mpl20; }; } diff --git a/pkgs/development/python-modules/aiohomekit/default.nix b/pkgs/development/python-modules/aiohomekit/default.nix index 66f028cf1df7e..aa312fb7d0bf3 100644 --- a/pkgs/development/python-modules/aiohomekit/default.nix +++ b/pkgs/development/python-modules/aiohomekit/default.nix @@ -1,5 +1,6 @@ { lib , buildPythonPackage +, chacha20poly1305-reuseable , commentjson , cryptography , fetchFromGitHub @@ -12,7 +13,7 @@ buildPythonPackage rec { pname = "aiohomekit"; - version = "0.7.17"; + version = "0.7.20"; format = "pyproject"; disabled = pythonOlder "3.7"; @@ -21,7 +22,7 @@ buildPythonPackage rec { owner = "Jc2k"; repo = pname; rev = "refs/tags/${version}"; - sha256 = "sha256-vgRiqA3xNvuw3nIzl45RXdmcbDW6OTxvReSH5SVcNEs="; + sha256 = "sha256-g7N+CIBJCMnW4FjN502SahhSpPS1p7AXZvduteHu+Z4="; }; nativeBuildInputs = [ @@ -29,6 +30,7 @@ buildPythonPackage rec { ]; propagatedBuildInputs = [ + chacha20poly1305-reuseable commentjson cryptography zeroconf diff --git a/pkgs/development/python-modules/aioimaplib/default.nix b/pkgs/development/python-modules/aioimaplib/default.nix index 61bf1567b71b3..97e21dc615223 100644 --- a/pkgs/development/python-modules/aioimaplib/default.nix +++ b/pkgs/development/python-modules/aioimaplib/default.nix @@ -5,7 +5,6 @@ , buildPythonPackage , docutils , fetchFromGitHub -, fetchpatch , imaplib2 , mock , nose @@ -17,7 +16,7 @@ buildPythonPackage rec { pname = "aioimaplib"; - version = "0.9.0"; + version = "1.0.0"; format = "setuptools"; disabled = pythonOlder "3.5"; @@ -26,17 +25,9 @@ buildPythonPackage rec { owner = "bamthomas"; repo = pname; rev = version; - sha256 = "sha256-xxZAeJDuqrPv4kGgDr0ypFuZJk1zcs/bmgeEzI0jpqY="; + hash = "sha256-7Ta0BhtQSm228vvUa5z+pzM3UC7+BskgBNjxsbEb9P0="; }; - patches = [ - # https://github.com/bamthomas/aioimaplib/pull/76 - (fetchpatch { - url = "https://github.com/bamthomas/aioimaplib/commit/03f796f45b60a163ad0f3d52166d58f280de7065.patch"; - hash = "sha256-9staxkw/EfGoBz/uyrNKBvQ0KfN+za4rTGRyqrAJSd8="; - }) - ]; - checkInputs = [ asynctest docutils @@ -49,6 +40,11 @@ buildPythonPackage rec { tzlocal ]; + disabledTests = [ + # https://github.com/bamthomas/aioimaplib/issues/77 + "test_get_quotaroot" + ]; + pythonImportsCheck = [ "aioimaplib" ]; meta = with lib; { diff --git a/pkgs/development/python-modules/aiounifi/default.nix b/pkgs/development/python-modules/aiounifi/default.nix index 0596e654eb7e7..b25fa9839b3c0 100644 --- a/pkgs/development/python-modules/aiounifi/default.nix +++ b/pkgs/development/python-modules/aiounifi/default.nix @@ -3,6 +3,7 @@ , aioresponses , buildPythonPackage , fetchFromGitHub +, orjson , pytest-aiohttp , pytest-asyncio , pytestCheckHook @@ -11,7 +12,7 @@ buildPythonPackage rec { pname = "aiounifi"; - version = "33"; + version = "34"; disabled = pythonOlder "3.9"; @@ -19,11 +20,12 @@ buildPythonPackage rec { owner = "Kane610"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-MXzUQOC5Y33RgRKf5BPbA9VfQKKdRjawF9kW4QmSHkU="; + hash = "sha256-NxxM1rU781QTfNWfE6maNovPZNDwU54ST1lxhTKmmBA="; }; propagatedBuildInputs = [ aiohttp + orjson ]; checkInputs = [ diff --git a/pkgs/development/python-modules/async-upnp-client/default.nix b/pkgs/development/python-modules/async-upnp-client/default.nix index 4fc5854f63dc3..7e6d0bc3fb754 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.31.1"; + version = "0.31.2"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -23,7 +23,7 @@ buildPythonPackage rec { owner = "StevenLooman"; repo = "async_upnp_client"; rev = version; - sha256 = "sha256-edoP4YvMp9ImfeS9bUwNBdx6eAUj5/J1tLymkOc6jwQ="; + sha256 = "sha256-/8gSx1oe2ljBGIPddzBLXuH3LiuHpUXi4/vO7stm5FY="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/bellows/default.nix b/pkgs/development/python-modules/bellows/default.nix index 531f05844f54d..d2ba3e77ee622 100644 --- a/pkgs/development/python-modules/bellows/default.nix +++ b/pkgs/development/python-modules/bellows/default.nix @@ -17,14 +17,14 @@ buildPythonPackage rec { pname = "bellows"; - version = "0.30.0"; + version = "0.31.0"; format = "setuptools"; src = fetchFromGitHub { owner = "zigpy"; repo = "bellows"; rev = "refs/tags/${version}"; - sha256 = "sha256-epsE/VKK6LwMVbkx5PWgAxZ62PO4udCFr3jYi0MrUpI="; + sha256 = "sha256-8pw139TNY7LE7x13JfgxcUVWFIXVj4FiEvqdUh+xcl8="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/chacha20poly1305-reuseable/default.nix b/pkgs/development/python-modules/chacha20poly1305-reuseable/default.nix new file mode 100644 index 0000000000000..8f9408ec2fa2e --- /dev/null +++ b/pkgs/development/python-modules/chacha20poly1305-reuseable/default.nix @@ -0,0 +1,62 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, pythonOlder + +# build +, poetry-core + +# propagates +, cryptography + +# tests +, pytestCheckHook +}: + +let + pname = "chacha20poly1305-reuseable"; + version = "0.0.4"; +in + +buildPythonPackage { + inherit pname version; + format = "pyproject"; + + disabled = pythonOlder "3.7"; + + src = fetchFromGitHub { + owner = "bdraco"; + repo = pname; + rev = "v${version}"; + hash = "sha256-iOGDTQyiznjYblT/NfHxewIwEZsPnp7bdNVD1p9/H1M="; + }; + + nativeBuildInputs = [ + poetry-core + ]; + + propagatedBuildInputs = [ + cryptography + ]; + + pythonImportsCheck = [ + "chacha20poly1305_reuseable" + ]; + + preCheck = '' + substituteInPlace pyproject.toml \ + --replace "--cov=chacha20poly1305_reuseable --cov-report=term-missing:skip-covered" "" + ''; + + checkInputs = [ + pytestCheckHook + ]; + + meta = with lib; { + description = "ChaCha20Poly1305 that is reuseable for asyncio"; + homepage = "https://github.com/bdraco/chacha20poly1305-reuseable"; + changelog = "https://github.com/bdraco/chacha20poly1305-reuseable/blob/main/CHANGELOG.md"; + license = licenses.asl20; + maintainers = with maintainers; [ hexa ]; + }; +} diff --git a/pkgs/development/python-modules/gphoto2/default.nix b/pkgs/development/python-modules/gphoto2/default.nix index 6b9125db64e6e..fa161a4b5025f 100644 --- a/pkgs/development/python-modules/gphoto2/default.nix +++ b/pkgs/development/python-modules/gphoto2/default.nix @@ -4,11 +4,11 @@ buildPythonPackage rec { pname = "gphoto2"; - version = "2.3.3"; + version = "2.3.4"; src = fetchPypi { inherit pname version; - sha256 = "sha256-bhHGvUGzXrk7snMzv+R0fd/gnZTFJ3xfse5i2Krpl3I="; + sha256 = "sha256-mEbF/fOtw0cU/bx7DgQcmmJ/yqal8Hs/1KaLGC3e4/c="; }; nativeBuildInputs = [ pkg-config ]; diff --git a/pkgs/development/python-modules/homematicip/default.nix b/pkgs/development/python-modules/homematicip/default.nix index 71752fede5399..2f201c986b12b 100644 --- a/pkgs/development/python-modules/homematicip/default.nix +++ b/pkgs/development/python-modules/homematicip/default.nix @@ -17,7 +17,7 @@ buildPythonPackage rec { pname = "homematicip"; - version = "1.0.2"; + version = "1.0.3"; format = "setuptools"; disabled = pythonOlder "3.6"; @@ -26,7 +26,7 @@ buildPythonPackage rec { owner = "coreGreenberet"; repo = "homematicip-rest-api"; rev = version; - sha256 = "sha256-j2ansly05auevlcDY5TFz6PZR/pNIGIbtkJuU8L5b0o="; + sha256 = "sha256-rTTYJ/2R+/FLuL3rTWT7ieixN+Gv9GhwkUaKPfLqUGc="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/intellifire4py/default.nix b/pkgs/development/python-modules/intellifire4py/default.nix index f8cbd93bb35be..0ef45a56a6dee 100644 --- a/pkgs/development/python-modules/intellifire4py/default.nix +++ b/pkgs/development/python-modules/intellifire4py/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { pname = "intellifire4py"; - version = "1.0.5"; + version = "2.0.1"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -20,7 +20,7 @@ buildPythonPackage rec { owner = "jeeftor"; repo = pname; rev = version; - hash = "sha256-wBk9tCVXDxHBnhofFQfMbsrYF4UYRZ2oXEBCldvJTnM="; + hash = "sha256-CO6ImL2e6B2yvHAQs3Cc7oaOllB5V9sap4bQS/XRnWI="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/nexia/default.nix b/pkgs/development/python-modules/nexia/default.nix index 184271a5fe67e..8e07c37fadb38 100644 --- a/pkgs/development/python-modules/nexia/default.nix +++ b/pkgs/development/python-modules/nexia/default.nix @@ -1,6 +1,7 @@ { lib , aioresponses , buildPythonPackage +, orjson , fetchFromGitHub , pytestCheckHook , pythonOlder @@ -10,7 +11,7 @@ buildPythonPackage rec { pname = "nexia"; - version = "1.0.2"; + version = "2.0.1"; format = "setuptools"; disabled = pythonOlder "3.5"; @@ -19,10 +20,11 @@ buildPythonPackage rec { owner = "bdraco"; repo = pname; rev = version; - sha256 = "sha256-+3nWf9GjX7ovnumwSq3l1dcHrgWIPPzKsPmI8/tT7Lo="; + sha256 = "sha256-Wb9qxJBbmac1B3wYJxFCdXiQ3LqIl3CHIZnNvZ5Jr5k="; }; propagatedBuildInputs = [ + orjson requests ]; diff --git a/pkgs/development/python-modules/ocrmypdf/default.nix b/pkgs/development/python-modules/ocrmypdf/default.nix index 97b0bfd4cbcac..340907e0ed8fd 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.5.0"; + version = "13.6.0"; src = fetchFromGitHub { owner = "ocrmypdf"; @@ -39,7 +39,7 @@ buildPythonPackage rec { postFetch = '' rm "$out/.git_archival.txt" ''; - hash = "sha256-jGVqH2z8NRnQcm4hv4OufCm26o6Qr8/mBRIScvcUpkE="; + hash = "sha256-EY0dXma6tyXLT8XogS5iFdVgJPrtwB9YVrplhDT4gWw="; }; SETUPTOOLS_SCM_PRETEND_VERSION = version; diff --git a/pkgs/development/python-modules/omnilogic/default.nix b/pkgs/development/python-modules/omnilogic/default.nix index daa95fa964508..4f01571881906 100644 --- a/pkgs/development/python-modules/omnilogic/default.nix +++ b/pkgs/development/python-modules/omnilogic/default.nix @@ -8,7 +8,7 @@ buildPythonPackage rec { pname = "omnilogic"; - version = "0.4.6"; + version = "0.4.9"; disabled = pythonOlder "3.4"; @@ -17,8 +17,8 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "djtimca"; repo = "omnilogic-api"; - rev = version; - hash = "sha256-XyAniuUr/Kt8VfBtovD4kKLG+ehOqE26egEG7j8q9LY="; + rev = "refs/tags/${version}"; + hash = "sha256-U+3FI/2qLuPayURP8V+SGuIQK14FWGOgJtpJnmsmulA="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/pikepdf/default.nix b/pkgs/development/python-modules/pikepdf/default.nix index ec95bd24fc887..07b2389039b6f 100644 --- a/pkgs/development/python-modules/pikepdf/default.nix +++ b/pkgs/development/python-modules/pikepdf/default.nix @@ -24,7 +24,7 @@ buildPythonPackage rec { pname = "pikepdf"; - version = "5.2.0"; + version = "5.3.1"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -39,7 +39,7 @@ buildPythonPackage rec { postFetch = '' rm "$out/.git_archival.txt" ''; - hash = "sha256-el7gnqnk8Mp5rpn8Q3WKOTAuB11j4ByCq2Gf60LBBEI="; + hash = "sha256-QYSI0oWuDw19EF8pwh3t1+VOY3Xe/AZxL1uARufg/nE="; }; patches = [ diff --git a/pkgs/development/python-modules/pikepdf/paths.patch b/pkgs/development/python-modules/pikepdf/paths.patch index 7db73bb1a6dd2..5f21da38fae37 100644 --- a/pkgs/development/python-modules/pikepdf/paths.patch +++ b/pkgs/development/python-modules/pikepdf/paths.patch @@ -1,8 +1,8 @@ diff --git a/src/pikepdf/_methods.py b/src/pikepdf/_methods.py -index 87e99fe..253a701 100644 +index 2a170c6..5ee3ba1 100644 --- a/src/pikepdf/_methods.py +++ b/src/pikepdf/_methods.py -@@ -204,7 +204,7 @@ def _mudraw(buffer, fmt) -> bytes: +@@ -80,7 +80,7 @@ def _mudraw(buffer, fmt) -> bytes: tmp_in.flush() proc = run( @@ -12,10 +12,10 @@ index 87e99fe..253a701 100644 check=True, ) diff --git a/src/pikepdf/jbig2.py b/src/pikepdf/jbig2.py -index 04c762d..924727c 100644 +index be390a1..3818ec3 100644 --- a/src/pikepdf/jbig2.py +++ b/src/pikepdf/jbig2.py -@@ -26,7 +26,7 @@ def extract_jbig2( +@@ -31,7 +31,7 @@ def extract_jbig2( output_path = Path(tmpdir) / "outfile" args = [ @@ -24,7 +24,7 @@ index 04c762d..924727c 100644 "--embedded", "--format", "png", -@@ -59,7 +59,7 @@ def extract_jbig2_bytes(jbig2: bytes, jbig2_globals: bytes) -> bytes: +@@ -64,7 +64,7 @@ def _extract_jbig2_bytes(jbig2: bytes, jbig2_globals: bytes) -> bytes: output_path = Path(tmpdir) / "outfile" args = [ @@ -33,12 +33,12 @@ index 04c762d..924727c 100644 "--embedded", "--format", "png", -@@ -84,7 +84,7 @@ def extract_jbig2_bytes(jbig2: bytes, jbig2_globals: bytes) -> bytes: +@@ -100,7 +100,7 @@ def extract_jbig2_bytes( - def jbig2dec_available() -> bool: + def _check_jbig2dec_available() -> None: # pragma: no cover try: - proc = run(['jbig2dec', '--version'], stdout=PIPE, check=True, encoding='ascii') + proc = run(['@jbig2dec@', '--version'], stdout=PIPE, check=True, encoding='ascii') - except (CalledProcessError, FileNotFoundError): - return False + except (CalledProcessError, FileNotFoundError) as e: + raise DependencyError("jbig2dec - not installed or not found") from e else: diff --git a/pkgs/development/python-modules/py-canary/default.nix b/pkgs/development/python-modules/py-canary/default.nix index 6685d245833f3..68a33ae111737 100644 --- a/pkgs/development/python-modules/py-canary/default.nix +++ b/pkgs/development/python-modules/py-canary/default.nix @@ -10,8 +10,8 @@ buildPythonPackage rec { pname = "py-canary"; - version = "0.5.2"; - format = "setuptools"; + version = "0.5.3"; + format = "pyproject"; disabled = pythonOlder "3.6"; @@ -19,7 +19,7 @@ buildPythonPackage rec { owner = "snjoetw"; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-PE31J82Uc6mErnh7nQ1pkIjnMbuCnlYEX2R0azknMHQ="; + hash = "sha256-873XAf0jOX5pjrNRELEcTWCauk80FUYxTu7G7jc3MHE="; }; propagatedBuildInputs = [ @@ -36,6 +36,11 @@ buildPythonPackage rec { "canary" ]; + disabledTests = [ + # Test requires network access + "test_location_with_motion_entry" + ]; + meta = with lib; { description = "Python package for Canary Security Camera"; homepage = "https://github.com/snjoetw/py-canary"; diff --git a/pkgs/development/python-modules/pyatv/default.nix b/pkgs/development/python-modules/pyatv/default.nix index 3fbc68dac58ee..9454755f5cf1d 100644 --- a/pkgs/development/python-modules/pyatv/default.nix +++ b/pkgs/development/python-modules/pyatv/default.nix @@ -2,6 +2,7 @@ , buildPythonPackage , aiohttp , bitarray +, chacha20poly1305-reuseable , cryptography , deepdiff , fetchFromGitHub @@ -21,7 +22,7 @@ buildPythonPackage rec { pname = "pyatv"; - version = "0.10.0"; + version = "0.10.2"; format = "setuptools"; disabled = pythonOlder "3.6"; @@ -30,7 +31,7 @@ buildPythonPackage rec { owner = "postlund"; repo = pname; rev = "v${version}"; - sha256 = "sha256-aYNBFtsnSg3PORq72U0PXPFCTVj2+8D2TS3nMau55t4="; + sha256 = "sha256-70bimFWsby2x8wBRH5CZgg9Xjw8n+xfhW07rOG9Pk0s="; }; postPatch = '' @@ -45,6 +46,7 @@ buildPythonPackage rec { propagatedBuildInputs = [ aiohttp bitarray + chacha20poly1305-reuseable cryptography mediafile miniaudio diff --git a/pkgs/development/python-modules/pydeconz/default.nix b/pkgs/development/python-modules/pydeconz/default.nix index 965b4ecf62026..a8e661e58d72c 100644 --- a/pkgs/development/python-modules/pydeconz/default.nix +++ b/pkgs/development/python-modules/pydeconz/default.nix @@ -4,6 +4,7 @@ , async-timeout , buildPythonPackage , fetchFromGitHub +, orjson , pytest-aiohttp , pytestCheckHook , pythonOlder @@ -11,7 +12,7 @@ buildPythonPackage rec { pname = "pydeconz"; - version = "92"; + version = "96"; format = "setuptools"; disabled = pythonOlder "3.9"; @@ -20,12 +21,13 @@ buildPythonPackage rec { owner = "Kane610"; repo = "deconz"; rev = "refs/tags/v${version}"; - hash = "sha256-qA7AgiiRBq1ekBcQDC8LlLnZLthA0QFZpxNUZdrMMIA="; + hash = "sha256-6W8GPsIvFlbgXkkN5tJEXyGKsjLfdJzgP8VS07lYZn4="; }; propagatedBuildInputs = [ aiohttp async-timeout + orjson ]; checkInputs = [ diff --git a/pkgs/development/python-modules/pyhiveapi/default.nix b/pkgs/development/python-modules/pyhiveapi/default.nix index 56e8e4d620bfa..bd85e0dfa73c8 100644 --- a/pkgs/development/python-modules/pyhiveapi/default.nix +++ b/pkgs/development/python-modules/pyhiveapi/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { pname = "pyhiveapi"; - version = "0.5.11"; + version = "0.5.13"; format = "pyproject"; @@ -24,7 +24,7 @@ buildPythonPackage rec { owner = "Pyhass"; repo = "Pyhiveapi"; rev = "refs/tags/v${version}"; - hash = "sha256-7Zval0LPuL3QUgDwpG91ybbL7gSWm4DxxZ/yXzkBES8="; + hash = "sha256-VuWP+yypQznirNcjvqbI3x+bWRiVIfO1NxG76Mdc37g="; }; postPatch = '' diff --git a/pkgs/development/python-modules/pyialarmxr-homeassistant/default.nix b/pkgs/development/python-modules/pyialarmxr-homeassistant/default.nix deleted file mode 100644 index fea638f7a5f82..0000000000000 --- a/pkgs/development/python-modules/pyialarmxr-homeassistant/default.nix +++ /dev/null @@ -1,39 +0,0 @@ -{ lib -, buildPythonPackage -, fetchPypi -, lxml -, pythonOlder -, xmltodict -}: - -buildPythonPackage rec { - pname = "pyialarmxr-homeassistant"; - version = "1.0.18"; - format = "setuptools"; - - disabled = pythonOlder "3.7"; - - src = fetchPypi { - inherit pname version; - hash = "sha256-aQHJiSmaGyABHP17oFH+6JQ9zNJ6pj2+PcE+gsRuhaQ="; - }; - - propagatedBuildInputs = [ - lxml - xmltodict - ]; - - # Module has no test - doCheck = false; - - pythonImportsCheck = [ - "pyialarmxr" - ]; - - meta = with lib; { - description = "Library to interface with Antifurto365 iAlarmXR systems"; - homepage = "https://pypi.org/project/pyialarmxr-homeassistant/"; - license = licenses.mit; - maintainers = with maintainers; [ fab ]; - }; -} diff --git a/pkgs/development/python-modules/pysensibo/default.nix b/pkgs/development/python-modules/pysensibo/default.nix index 8093bfac263a4..f5817917c9ab7 100644 --- a/pkgs/development/python-modules/pysensibo/default.nix +++ b/pkgs/development/python-modules/pysensibo/default.nix @@ -7,7 +7,7 @@ buildPythonPackage rec { pname = "pysensibo"; - version = "1.0.17"; + version = "1.0.18"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -15,8 +15,8 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "andrey-git"; repo = pname; - rev = version; - hash = "sha256-ZOJIsl6Ic4wSTpoylXGwQphPDV1yPw0mXbyiVKiDcVk="; + rev = "refs/tags/${version}"; + hash = "sha256-sFEeN72+h6yFQFluhOQfxoVJPB5lCpFnlJfLnRxVjFg="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/pyunifiprotect/default.nix b/pkgs/development/python-modules/pyunifiprotect/default.nix index 8b7a481716a63..f105cca7987cb 100644 --- a/pkgs/development/python-modules/pyunifiprotect/default.nix +++ b/pkgs/development/python-modules/pyunifiprotect/default.nix @@ -5,6 +5,7 @@ , buildPythonPackage , fetchFromGitHub , ipython +, orjson , packaging , pillow , poetry-core @@ -25,7 +26,7 @@ buildPythonPackage rec { pname = "pyunifiprotect"; - version = "3.9.2"; + version = "4.0.9"; format = "pyproject"; disabled = pythonOlder "3.9"; @@ -34,13 +35,14 @@ buildPythonPackage rec { owner = "briis"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-IQ+mjiNxfxG0Zq543Rn5rK/BNPzLGVX9jVTtyW7W9cs="; + hash = "sha256-1jKZWF+xNQVNzgOTNwEG/rloPXZYYwoVMYmQ+jep1/0="; }; propagatedBuildInputs = [ aiofiles aiohttp aioshutil + orjson packaging pillow pydantic diff --git a/pkgs/development/python-modules/spacy/models.json b/pkgs/development/python-modules/spacy/models.json index 7c2212359b8ae..d29b7ac7fa87a 100644 --- a/pkgs/development/python-modules/spacy/models.json +++ b/pkgs/development/python-modules/spacy/models.json @@ -1,332 +1,374 @@ [ { + "pname": "ca_core_news_lg", + "version": "3.3.0", + "sha256": "06dyd5h3c1q7vndg8j0vja24y49lvdqkb6cy6i25ldz306b6aa0l", + "license": "gpl3" + }, + { + "pname": "ca_core_news_md", + "version": "3.3.0", + "sha256": "0ac8n8lg4x5mknplsfbzhsl1qxhkbi5plx4xd252zmr0kilxkykn", + "license": "gpl3" + }, + { + "pname": "ca_core_news_sm", + "version": "3.3.0", + "sha256": "1gj4ni9mwksrwqxjipvn13lhbfk7wqh8k7hh9gfpsm2saa951yf6", + "license": "gpl3" + }, + { + "pname": "ca_core_news_trf", + "version": "3.3.0", + "sha256": "0fhf71rj568akcwxvzjr2j5x5f5qz7g7i49bz5m9lbqs01bj0rjw", + "license": "gpl3" + }, + { "pname": "da_core_news_lg", - "version": "3.1.0", - "sha256": "0mchfkj0l1fx1l3bvilwyj7y3frg8hpxyga87vcpf7rzm1iynz1z", + "version": "3.3.0", + "sha256": "0wyw9lyxbs0jgy8qgxhpqpfhm8y4a9hanar0ggrvhsaxcfjs6qhr", "license": "cc-by-sa-40" }, { "pname": "da_core_news_md", - "version": "3.1.0", - "sha256": "0vbg353cfjlid8k3nk8zzzxsrsvl2qmjhdg5qfr3f91klzy385cg", + "version": "3.3.0", + "sha256": "0rj8l0v6m1ia5r4j0180gl0kh2srfw90bkvq21wr1gq142536f2d", "license": "cc-by-sa-40" }, { "pname": "da_core_news_sm", - "version": "3.1.0", - "sha256": "0c0nv42737jbyhvfvz1aqqn97fpd6jrh4bxmkzyjx0svyc1n3bxz", + "version": "3.3.0", + "sha256": "0a8786jqlpjrvg27h9nww0v4p3p9f0rr7kilbpmb7w9466hjbkjy", "license": "cc-by-sa-40" }, { "pname": "de_core_news_lg", - "version": "3.1.0", - "sha256": "03hyx9d0050y8hr1mjadbqrxvw7g8xv3zd1vgw4yq68ran6ggjbl", + "version": "3.3.0", + "sha256": "1k80mq5gfiw7m7z60by1qis2zhszwb9z9hg55r0qam71pnbsqb0f", "license": "mit" }, { "pname": "de_core_news_md", - "version": "3.1.0", - "sha256": "1n2j4bjlc4vhrr5i6f2vrn4pwwrd0jjc3wc2g8c4dr9jgdcwnl0n", + "version": "3.3.0", + "sha256": "0y13qwkfh7nzp2m8w3qna0qj3gaxrpsncmc1ramnn515565j62in", "license": "mit" }, { "pname": "de_core_news_sm", - "version": "3.1.0", - "sha256": "0s82qhyv5x1wzvwy69jwh1sddw53q741ci5d10128mkmjyapdhzv", + "version": "3.3.0", + "sha256": "0ln5p4dg5y4hzpx1738qlh6591j2ydrf8gyvhfvx5dr1pkwps83d", "license": "mit" }, { "pname": "de_dep_news_trf", - "version": "3.1.0", - "sha256": "0ws9xvzz6aimpn4cgi2rdi06acqrisf9c4v31yn1ljrrkwv9clwk", + "version": "3.3.0", + "sha256": "18clx5dck1wmk39miqlsqgwvzhhqd7xh8vmi6ilpjnwgx48yfjh7", "license": "mit" }, { "pname": "el_core_news_lg", - "version": "3.1.0", - "sha256": "1gf85gr5dyd3hk38zzp9aax1adhq1f5hhvl6s8sxh4myakpvmikw", + "version": "3.3.0", + "sha256": "165vji0d4imylpgpywnmdjvylsi2l8kz8fpxbhwjdx5cv40ywcda", "license": "cc-by-nc-sa-30" }, { "pname": "el_core_news_md", - "version": "3.1.0", - "sha256": "05k3fp1afhd89v5m46jngvzncf08546r0ic1micc70mzrxifs3jl", + "version": "3.3.0", + "sha256": "0jz32glmwj1a662ciz1ay6g2shil0ia8smmbj42ghnjl4dlf2n3b", "license": "cc-by-nc-sa-30" }, { "pname": "el_core_news_sm", - "version": "3.1.0", - "sha256": "0g7riydqghnri95wbxdbfchgrm88jg7qhv3hfhb4f9zp7viy2fx9", + "version": "3.3.0", + "sha256": "179fqj781wfrh9nkizv7s5ia8abb73sgnnl3yim35nbkpwnps47v", "license": "cc-by-nc-sa-30" }, { "pname": "en_core_web_lg", - "version": "3.1.0", - "sha256": "106mi060r9q06b90cx2hhsr39bajj70gkliwxfbg9mps69ci8xdy", + "version": "3.3.0", + "sha256": "0j1d9i2xqqbaiyzr1aghzm42nfjlxx3qv2mlfhav3yi69hmy8aj3", "license": "mit" }, { "pname": "en_core_web_md", - "version": "3.1.0", - "sha256": "1565swsn628515gfw47h5pf868kw4bnag22iwxyf3mmnlyif63bz", + "version": "3.3.0", + "sha256": "1anq8vlk3rwf7by1j7b9gvc5pjdvc9cz4mazqvrs4448xs3r0ndl", "license": "mit" }, { "pname": "en_core_web_sm", - "version": "3.1.0", - "sha256": "0q3nz1q4nmj58s5f5h4n43w4pcfai8n51vgr9w7ckrhiappcn97n", + "version": "3.3.0", + "sha256": "1bknji6j21pm9y0v48zhc0r4di5wm4lxxab35wmzakn0myhag2il", "license": "mit" }, { "pname": "en_core_web_trf", - "version": "3.1.0", - "sha256": "087dzqazrpl2bc2bys8rdqb8s08il8lc3zjk9scalggkgyqn6h20", + "version": "3.3.0", + "sha256": "1qfkif2dzs9gvkydca2mq1w9xb818zmz14rwramxpvq17bfraqdw", "license": "mit" }, { "pname": "es_core_news_lg", - "version": "3.1.0", - "sha256": "1jrkx80n4wkvwvw6lmqd9kxdxag7qr2vfhi0msc43li11bb01dxi", + "version": "3.3.0", + "sha256": "0jd9wq7nxw4iywr9v2m19kf84hhgnh1sy9j2zrz6w5vv16363cr9", "license": "gpl3" }, { "pname": "es_core_news_md", - "version": "3.1.0", - "sha256": "0x4l9d3ky15rsf9h0zx0k9z5g0alwly0lch6dzn5b3ngphz01d43", + "version": "3.3.0", + "sha256": "0gk2rca1qmgy5bnv4r8h9kxpix19h3dgbgjwky60fagnbvch5pzc", "license": "gpl3" }, { "pname": "es_core_news_sm", - "version": "3.1.0", - "sha256": "1y3ibgc1q1ck6qrkbwvsv401vcyy9cnpxkzj5lvdhz7xwm8agqw6", + "version": "3.3.0", + "sha256": "0r3hvx5za3iydqfqz65p586c8g86b7pw8mjnipj43y0qnz2d0x14", "license": "gpl3" }, { "pname": "es_dep_news_trf", - "version": "3.1.0", - "sha256": "1p47ng7837iixfcfir5rrsbix9633hbi8hvg46zyw9waygyp57l3", + "version": "3.3.0", + "sha256": "1rmccrgddgbfagj2vasfr6bqc5kpziy4gln5bcmnxwhh6mh66rwd", "license": "gpl3" }, { "pname": "fr_core_news_lg", - "version": "3.1.0", - "sha256": "1vpzhny33i2x9pnh9d9wajj3m5bpxk1bc21r434ir0x81zl61nm8", + "version": "3.3.0", + "sha256": "15vxksw3g7g721cwrp9436w5wx43gicq6i2v6v1h63qifxjhkp3j", "license": "lgpllr" }, { "pname": "fr_core_news_md", - "version": "3.1.0", - "sha256": "1bqn779zbv8izisk028d8xgga38f4snys3w8kfb05bgmgv9c4qwb", + "version": "3.3.0", + "sha256": "1x3d6nlfmclq961b292aqvgz8ldijpsi330vja75ncrbyz9wygav", "license": "lgpllr" }, { "pname": "fr_core_news_sm", - "version": "3.1.0", - "sha256": "0958mpfdmq73gasbqzyg8gjsih0c6bc9b3iyr0llmsibq0lfhglx", + "version": "3.3.0", + "sha256": "1gqzspi8y8b54ja7ikhlr5ip137kgv7x4flavgj456sdhfzkaqkz", "license": "lgpllr" }, { "pname": "fr_dep_news_trf", - "version": "3.1.0", - "sha256": "0afn0a665sqbf28lh4lxz9w2w5982m52kfqzysh5a9r6j734dxqv", + "version": "3.3.0", + "sha256": "09n067v07233gr8sw6yma1s2bi2m6wf8ripn74npjjs28akmr5p3", "license": "lgpllr" }, { "pname": "it_core_news_lg", - "version": "3.1.0", - "sha256": "08l84f9vgi6y1ahkac9pq5i95ninlzcw276vpx4h53zijhk6hvkv", + "version": "3.3.0", + "sha256": "1c5zqfpkmjwr21nmcnky6sgf7fr4lpiaai9hz2z14yrnnvby80y1", "license": "cc-by-nc-sa-30" }, { "pname": "it_core_news_md", - "version": "3.1.0", - "sha256": "1zkw3h626rm2x5pv06yzgbj0hwjlbyn00vg8hjk8k0f5hwad5sf3", + "version": "3.3.0", + "sha256": "1jpcivp0djfm975czn41k23y7ly6b54myrlj5fyjql1scwf0xzh1", "license": "cc-by-nc-sa-30" }, { "pname": "it_core_news_sm", - "version": "3.1.0", - "sha256": "0dn593h105ggzjql8rc0rfn4i78a1l90v7fbycqb427q88fbzkk9", + "version": "3.3.0", + "sha256": "0lkgs8sw02p7l5mrbrwkaiqs524hd9bkhfiiz7wzcc0p0zn4hn8h", "license": "cc-by-nc-sa-30" }, { "pname": "lt_core_news_lg", - "version": "3.1.0", - "sha256": "1qqds0hxn0lcl51934mgl0c22m7a3vy13rnswb46i5x9lj89d50c", + "version": "3.3.0", + "sha256": "08azxjqpsa66b5vm7gwllbjli36wv1n11m07andlkg3p2nmn6m85", "license": "cc-by-sa-40" }, { "pname": "lt_core_news_md", - "version": "3.1.0", - "sha256": "0xd8wa1cmywndgd1byiny9rv3008iawxb89pnyradglcbklmffd4", + "version": "3.3.0", + "sha256": "05qj4bhjq4v31r05rza7kc52kmp954f4h4zs344pdddzdzzc8h4q", "license": "cc-by-sa-40" }, { "pname": "lt_core_news_sm", - "version": "3.1.0", - "sha256": "0bpf5k09xqdx64rfkpc7949s46b5xm893wx6jwwn2mx4ay6x23s5", + "version": "3.3.0", + "sha256": "0wmaxixrm08ikicgnbz5zw3iimmm9dl7j7yy78bqixzym0iv2hxy", "license": "cc-by-sa-40" }, { "pname": "mk_core_news_lg", - "version": "3.1.0", - "sha256": "08i96r0980dgkz2ygj76d0v0lgx0lpb5bxmhxdhv7mhzqs38v436", + "version": "3.3.0", + "sha256": "17q62v8nvyz73d5jsbd5nw1mzxkj1cn7g6f0cl0lrl6pqn2b2rgl", "license": "cc-by-sa-40" }, { "pname": "mk_core_news_md", - "version": "3.1.0", - "sha256": "1dnah0ycgzy5wp6anpbiclyn0fs6jf7s43sr87rcpfcaflnp1qcs", + "version": "3.3.0", + "sha256": "103z7hkr5jbk6zmqihzsm9jlmr4mg32r6ph90j6xx71jdmnjz4ky", "license": "cc-by-sa-40" }, { "pname": "mk_core_news_sm", - "version": "3.1.0", - "sha256": "1q1v3i1rpq70nznwhqji2wpjkrxma4v50nsvack1pmqnh9zkcn17", + "version": "3.3.0", + "sha256": "09k56dds3mjc2qxa6mbcha1i2h4hqjvbavkhnijmdfhsk6azk3v5", "license": "cc-by-sa-40" }, { "pname": "nb_core_news_lg", - "version": "3.1.0", - "sha256": "0cjd6cl4iaa4c6j7h3gh9iwpnaazhn3w0fmwyp33827y0r1bxanx", + "version": "3.3.0", + "sha256": "11iq62w96zc5z51i9kkxp5bqbfmhzm3jpivrs8arw9fs7xrscjn0", "license": "mit" }, { "pname": "nb_core_news_md", - "version": "3.1.0", - "sha256": "17c6khcmpxq7gkdb1hglz3z9jpwdxghfidl4p3cdrphvyxsx8wni", + "version": "3.3.0", + "sha256": "0891z1c867jyhg9jr0ais2vv6h3v5b98sc7c8hxy4apf7nwnkjss", "license": "mit" }, { "pname": "nb_core_news_sm", - "version": "3.1.0", - "sha256": "0rbq5f5p24yb9j8i4h1z7xrg2knixzdnz9pnpah4klqql9n0w5aw", + "version": "3.3.0", + "sha256": "1v19jvzvhix6rfac4szggdcqi3qkljwqmrynl75qz28piff0sln5", "license": "mit" }, { "pname": "nl_core_news_lg", - "version": "3.1.0", - "sha256": "1bg74ig9vcl94sd68m6c2z0vviw41x1mqz3829gzk349qb78h55l", + "version": "3.3.0", + "sha256": "0ai6pydmd2rabpl8fy98ild7n2wwk2z11qha20x4gn33d8k60ih0", "license": "cc-by-sa-40" }, { "pname": "nl_core_news_md", - "version": "3.1.0", - "sha256": "1jw2is3n8dg3bkxjq3ziix2xgx3f29s4i7ipibk5w8f0k6d8gyyh", + "version": "3.3.0", + "sha256": "1c95xcivn09dmfgrq21hh9i82v6wbnk0cwglcdgnx9kfidzgpgjc", "license": "cc-by-sa-40" }, { "pname": "nl_core_news_sm", - "version": "3.1.0", - "sha256": "14q8sdl79l5fb32vfk13z69kb3mjb35s6ksbhv0bp7yaav35s8gv", + "version": "3.3.0", + "sha256": "1jp978ish3hvn48i1dard82czzx3vvh4lnlhhb50j0kk4b7xv5z1", "license": "cc-by-sa-40" }, { "pname": "pl_core_news_lg", - "version": "3.1.0", - "sha256": "1rmb63dvi8fgmnb6q04li1xghb0grlgnbsv6maybnnzmi9471kly", + "version": "3.3.0", + "sha256": "0w5rpz43ix16sq8h6h5g3h1a64ww8r5z4fydz2vr7bphajkwrhlq", "license": "gpl3" }, { "pname": "pl_core_news_md", - "version": "3.1.0", - "sha256": "11hl9nz1xfb5bz93z3cpzbq58fs4yb4s0184bnsh8bnmqqqkqxmx", + "version": "3.3.0", + "sha256": "1sllknhw689nbf9rmnc5604r0vig1yzkpg3s6yvgjyli7m04k6d1", "license": "gpl3" }, { "pname": "pl_core_news_sm", - "version": "3.1.0", - "sha256": "05kgv093bq833qczsvksd695494kb7i3gmxcq874z2gg8bhjb70b", + "version": "3.3.0", + "sha256": "0gpa140y04kazr8imifgdjsdzj7m10s15vy8q0vbi8chc8m14i1s", "license": "gpl3" }, { "pname": "pt_core_news_lg", - "version": "3.1.0", - "sha256": "1lbzv8789vkcm1jw50g9ny85k3pf245rz9rgr1c7j91d3gzlqkg8", + "version": "3.3.0", + "sha256": "1pk0m03hyck3g6riq1x5n5k0jp70z2fqaw6pl7zrm0rcf2165rh0", "license": "cc-by-sa-40" }, { "pname": "pt_core_news_md", - "version": "3.1.0", - "sha256": "0a6bs6lpw3n90jzkblkp831xffbglwv33ss16kh2mcvsx41apdhp", + "version": "3.3.0", + "sha256": "190d74ihga38kp68r8xs9rxnavxdzw2j917f7b75wmr04brbf824", "license": "cc-by-sa-40" }, { "pname": "pt_core_news_sm", - "version": "3.1.0", - "sha256": "0b65ji3sfnx6qhr66m2jm206zgf1vkx8jmp3qxsz8prarsj6az0n", + "version": "3.3.0", + "sha256": "1477yddal5cjn7a6adw1bvmal4pc4p8bcc4x7q016a22fgk9lcpl", "license": "cc-by-sa-40" }, { "pname": "ro_core_news_lg", - "version": "3.1.0", - "sha256": "055yxc0n3c9k28wi4bzq4pvwihj7lq84z7s374cpz8kmykddxjvz", + "version": "3.3.0", + "sha256": "1w8cwll2dp9a1k40b5njbypdrxwf7vacf9sdwc18kkiadkrihy4g", "license": "cc-by-sa-40" }, { "pname": "ro_core_news_md", - "version": "3.1.0", - "sha256": "1l1i6jm29qij27laghzgb3ba4a3vk0l5hl09qhrwmrqccycx546r", + "version": "3.3.0", + "sha256": "1mr3s0fm571idbgi0g3qg4x7hyy1kw9br98vn8g21f8h05qmlc72", "license": "cc-by-sa-40" }, { "pname": "ro_core_news_sm", - "version": "3.1.0", - "sha256": "17dvqn2dip34n3hckdsizjm0mikfqpy5f9f1mz0r9pf2c9fjk1gr", + "version": "3.3.0", + "sha256": "1n6dwfx2l0wzb02r14z47r19v5dy7ld35s11w1kq40k5bbkbakhm", "license": "cc-by-sa-40" }, { "pname": "ru_core_news_lg", - "version": "3.1.0", - "sha256": "1748i34rb4cqsjslippay592769gmdzsvly95pfl6nh67vmyd9my", + "version": "3.3.0", + "sha256": "1yv2r6b6n9ccvizi23q2xdrzbws1asa5mbiw4771irrmqzan9wiq", "license": "mit" }, { "pname": "ru_core_news_md", - "version": "3.1.0", - "sha256": "0zg3ar1fbrlh2gm30xfc0zz7br4dzzr3bixjvkp5q4k9d2dxmzxh", + "version": "3.3.0", + "sha256": "0s2yjlibg2r2pdf8cfn36nx6rp9ppk8jjjph91az0sp5lj0c38pp", "license": "mit" }, { "pname": "ru_core_news_sm", - "version": "3.1.0", - "sha256": "1a507iwgq2940g9gj5a6g25l4l21md0yihivk6fch1k0mjkjrgd0", + "version": "3.3.0", + "sha256": "0cnn8daf90hnl5mmgk3y6fc0f6x62j7rm9gkq16zbb0qmayb7ri0", "license": "mit" }, { + "pname": "sv_core_news_lg", + "version": "3.3.0", + "sha256": "0503xnr8cdzb2ckj12b51hkayv2gzf2c2rv746w4y50pjk4cmfsx", + "license": "cc-by-sa-40" + }, + { + "pname": "sv_core_news_md", + "version": "3.3.0", + "sha256": "1hzfl92j13hxf8im4b4mjbgxawp8xqpi3ych6bi2x5pr7qjx6gab", + "license": "cc-by-sa-40" + }, + { + "pname": "sv_core_news_sm", + "version": "3.3.0", + "sha256": "0sjg1ab8r7m1g735amgakslchn1jba0ygyri59h6qsp8cmhvajw7", + "license": "cc-by-sa-40" + }, + { "pname": "xx_ent_wiki_sm", - "version": "3.1.0", - "sha256": "03kal7nv42yiv8bn9kdi7ngrylzgilk4gqj26jd9q1fszlr018gj", + "version": "3.3.0", + "sha256": "1925y6n90qwy703v410si8sq7vzvlwi6zaj9n19ggysr78kyrsqz", "license": "mit" }, { "pname": "xx_sent_ud_sm", - "version": "3.1.0", - "sha256": "0wvfxg2jid3lmxqc9nhizpkqy7206m2axllqbcjgi7pgq56gy7nw", + "version": "3.3.0", + "sha256": "0dgd2lwh269f8m7qsv8x3743b3mc5r2lw6kcvdh1cs8qk8hxlfnx", "license": "cc-by-sa-30" }, { "pname": "zh_core_web_lg", - "version": "3.1.0", - "sha256": "19g557a6n9mwljkbcf3j2ibnizryvnqkl0l5viz8mg8bw39bay2g", + "version": "3.3.0", + "sha256": "15yps28i86shnf313xbsmv1sgnr71aymxnx5s155hbn2fk8pdzwc", "license": "mit" }, { "pname": "zh_core_web_md", - "version": "3.1.0", - "sha256": "1ja4swiy1bx113hpjjx56nixj1xgvw4wlarbxma4xw91g7mmbikg", + "version": "3.3.0", + "sha256": "0mvqgmm4y1ng6asxb2ic215ikk8lx0dm7c5cfwhx02vamllxv20q", "license": "mit" }, { "pname": "zh_core_web_sm", - "version": "3.1.0", - "sha256": "1z97l381ccf1g16834myss4ccyb7x4pbbf6m5skb7300s7csdi1g", + "version": "3.3.0", + "sha256": "05qc50wxddfacf6x7i8q0r9dnrr6gsfnaldzmavry96nfngmqp6v", "license": "mit" }, { "pname": "zh_core_web_trf", - "version": "3.1.0", - "sha256": "11ra9jf10piv79hdyvgg10bwrgcxbb8ml611d3069jjab6vaa8xn", + "version": "3.3.0", + "sha256": "0pmb456q8b02qw5zmw735w9yv3clfaqcqm91ng8lphxbcxqkp9jc", "license": "mit" } ] diff --git a/pkgs/development/python-modules/sphinx-jinja/default.nix b/pkgs/development/python-modules/sphinx-jinja/default.nix index 28d575752551e..76823af5424f0 100644 --- a/pkgs/development/python-modules/sphinx-jinja/default.nix +++ b/pkgs/development/python-modules/sphinx-jinja/default.nix @@ -2,13 +2,13 @@ buildPythonPackage rec { pname = "sphinx-jinja"; - version = "2.0.1"; + version = "2.0.2"; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - sha256 = "sha256-3lMY1InG1PaAqhIrp5kovE6t+kTTpTKS3ir+WI/+RAY="; + sha256 = "sha256-xiMrWaiUE5dwvh3G0LAKN55CiM54FXkE4fhHPeo+Bxg="; }; propagatedBuildInputs = [ sphinx ]; diff --git a/pkgs/development/python-modules/spotipy/default.nix b/pkgs/development/python-modules/spotipy/default.nix index c6a488e4a2857..8f0b0c13ba8f9 100644 --- a/pkgs/development/python-modules/spotipy/default.nix +++ b/pkgs/development/python-modules/spotipy/default.nix @@ -1,19 +1,25 @@ { lib , buildPythonPackage , fetchPypi +, redis , requests -, six }: +, six +}: buildPythonPackage rec { pname = "spotipy"; - version = "2.19.0"; + version = "2.20.0"; src = fetchPypi { inherit pname version; - sha256 = "sha256-kE9ugT26g3dY6VEMG+5R18ohfxaSRmJaE+aTcz3DNUM="; + sha256 = "sha256-4mqZt1vi/EI3WytLNV3ET6Hlnvx3OvoXt4ThpMCoGMk="; }; - propagatedBuildInputs = [ requests six ]; + propagatedBuildInputs = [ + redis + requests + six + ]; # tests want to access the spotify API doCheck = false; diff --git a/pkgs/development/python-modules/zigpy-cc/default.nix b/pkgs/development/python-modules/zigpy-cc/default.nix index 376b74c266cb0..a89ad26ae78f6 100644 --- a/pkgs/development/python-modules/zigpy-cc/default.nix +++ b/pkgs/development/python-modules/zigpy-cc/default.nix @@ -7,11 +7,14 @@ , pytest-asyncio , pytestCheckHook , pythonOlder -, zigpy }: +, zigpy +}: buildPythonPackage rec { pname = "zigpy-cc"; version = "0.5.2"; + format = "setuptools"; + # https://github.com/Martiusweb/asynctest/issues/152 # broken by upstream python bug with asynctest and # is used exclusively by home-assistant with python 3.8 @@ -39,10 +42,16 @@ buildPythonPackage rec { "test_incoming_msg" "test_incoming_msg2" "test_deser" + # Fails in sandbox + "tests/test_application.py " + ]; + + pythonImportsCheck = [ + "zigpy_cc" ]; meta = with lib; { - description = "A library which communicates with Texas Instruments CC2531 radios for zigpy"; + description = "Library which communicates with Texas Instruments CC2531 radios for zigpy"; homepage = "https://github.com/zigpy/zigpy-cc"; license = licenses.gpl3Plus; maintainers = with maintainers; [ etu mvnetbiz ]; diff --git a/pkgs/development/python-modules/zigpy-deconz/default.nix b/pkgs/development/python-modules/zigpy-deconz/default.nix index 54a2a7aae5fe9..fbe0e6b6ac244 100644 --- a/pkgs/development/python-modules/zigpy-deconz/default.nix +++ b/pkgs/development/python-modules/zigpy-deconz/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { pname = "zigpy-deconz"; - version = "0.16.0"; + version = "0.18.0"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -21,7 +21,7 @@ buildPythonPackage rec { owner = "zigpy"; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-MEYe8DGx338ze1t36Fh0Zl8GgBpk2Wmx0EKnewjnTws="; + hash = "sha256-2M25g3iJWW6kT17P9PVAPD09E5QXuOJN75yjWsLY/cI="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/zigpy-xbee/default.nix b/pkgs/development/python-modules/zigpy-xbee/default.nix index be522214164ba..0a1b62ef1888c 100644 --- a/pkgs/development/python-modules/zigpy-xbee/default.nix +++ b/pkgs/development/python-modules/zigpy-xbee/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { pname = "zigpy-xbee"; - version = "0.14.0"; + version = "0.15.0"; # https://github.com/Martiusweb/asynctest/issues/152 # broken by upstream python bug with asynctest and # is used exclusively by home-assistant with python 3.8 @@ -22,7 +22,7 @@ buildPythonPackage rec { owner = "zigpy"; repo = "zigpy-xbee"; rev = version; - sha256 = "sha256-veAkaBHPYgVd3iwvnH/A2upYX4T/qXXNRcaysbRQvNI="; + sha256 = "sha256-NT7d5JWaVZOrk32uYh0z0sI9RA4eJYYIa2D/Ei81KjY="; }; buildInputs = [ diff --git a/pkgs/development/python-modules/zigpy-zigate/default.nix b/pkgs/development/python-modules/zigpy-zigate/default.nix index b44a385fd933e..80d5d6e993ab8 100644 --- a/pkgs/development/python-modules/zigpy-zigate/default.nix +++ b/pkgs/development/python-modules/zigpy-zigate/default.nix @@ -1,28 +1,28 @@ { lib -, asynctest , buildPythonPackage , fetchFromGitHub +, mock , pyserial , pyserial-asyncio , pyusb , pytest-asyncio , pytestCheckHook , pythonOlder -, zigpy }: +, zigpy +}: buildPythonPackage rec { pname = "zigpy-zigate"; - version = "0.8.0"; - # https://github.com/Martiusweb/asynctest/issues/152 - # broken by upstream python bug with asynctest and - # is used exclusively by home-assistant with python 3.8 + version = "0.9.0"; + format = "setuptools"; + disabled = pythonOlder "3.8"; src = fetchFromGitHub { owner = "zigpy"; repo = "zigpy-zigate"; - rev = version; - sha256 = "sha256-rFmcgfn87XS1fvbSdJG6pItXRMkeogp4faKMe7pCxkM="; + rev = "v${version}"; + hash = "sha256-rFmcgfn87XS1fvbSdJG6pItXRMkeogp4faKMe7pCxkM="; }; propagatedBuildInputs = [ @@ -33,13 +33,22 @@ buildPythonPackage rec { ]; checkInputs = [ - asynctest + mock pytest-asyncio pytestCheckHook ]; + pythonImportsCheck = [ + "zigpy_zigate" + ]; + + disabledTestPaths = [ + # Fails in sandbox + "tests/test_application.py " + ]; + meta = with lib; { - description = "A library which communicates with ZiGate radios for zigpy"; + description = "Library which communicates with ZiGate radios for zigpy"; homepage = "https://github.com/zigpy/zigpy-zigate"; license = licenses.gpl3Plus; maintainers = with maintainers; [ etu mvnetbiz ]; diff --git a/pkgs/development/python-modules/zigpy-znp/default.nix b/pkgs/development/python-modules/zigpy-znp/default.nix index 31a45ab644774..a37f22a386a3f 100644 --- a/pkgs/development/python-modules/zigpy-znp/default.nix +++ b/pkgs/development/python-modules/zigpy-znp/default.nix @@ -18,7 +18,7 @@ buildPythonPackage rec { pname = "zigpy-znp"; - version = "0.7.0"; + version = "0.8.0"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -27,7 +27,7 @@ buildPythonPackage rec { owner = "zigpy"; repo = pname; rev = "v${version}"; - sha256 = "0h6dclz4q4lvmapzpslh8kb0aihdjddbkxc4zc981glbip89li5w"; + sha256 = "sha256-sGwZL2AOCEWO9xl3HPHBGEFQ5NVk6CeuX9lt8ez8MFE="; }; propagatedBuildInputs = [ @@ -45,7 +45,7 @@ buildPythonPackage rec { pytest-mock pytest-timeout pytestCheckHook - ] ++ lib.optionals (pythonOlder "3.8") [ + ] ++ lib.optionals (pythonOlder "3.8") [ asynctest ]; @@ -54,7 +54,7 @@ buildPythonPackage rec { ]; meta = with lib; { - description = "Python library for zigpy which communicates with TI ZNP radios"; + description = "Library for zigpy which communicates with TI ZNP radios"; homepage = "https://github.com/zigpy/zigpy-znp"; license = licenses.gpl3Plus; maintainers = with maintainers; [ mvnetbiz ]; diff --git a/pkgs/development/python-modules/zigpy/default.nix b/pkgs/development/python-modules/zigpy/default.nix index 6f37c11fc67c8..fcea3b96cfac9 100644 --- a/pkgs/development/python-modules/zigpy/default.nix +++ b/pkgs/development/python-modules/zigpy/default.nix @@ -16,7 +16,7 @@ buildPythonPackage rec { pname = "zigpy"; - version = "0.46.0"; + version = "0.47.2"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -25,7 +25,7 @@ buildPythonPackage rec { owner = "zigpy"; repo = "zigpy"; rev = "refs/tags/${version}"; - sha256 = "sha256-YCkNjygNSvGNuhP7N1apCWYevl18GASgUFSSTLHj2YU="; + sha256 = "sha256-Jx7KnukwWaSi16Buh+Dt7RiCFEbQXXypnKYbYoMQyDY="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/zwave-js-server-python/default.nix b/pkgs/development/python-modules/zwave-js-server-python/default.nix index 1e54bf97ace13..204ac1cfa189b 100644 --- a/pkgs/development/python-modules/zwave-js-server-python/default.nix +++ b/pkgs/development/python-modules/zwave-js-server-python/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { pname = "zwave-js-server-python"; - version = "0.37.2"; + version = "0.39.0"; format = "setuptools"; disabled = pythonOlder "3.8"; @@ -19,7 +19,7 @@ buildPythonPackage rec { owner = "home-assistant-libs"; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-3Cn/8BbxcOFv8zDdRC91/8EWH6hTuXhtu5Yk8EOhGH4="; + hash = "sha256-qKIlknxzZSHCl5KF8SRVHLB7eFc7ZEzAdzi+tlfcoPg="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/tools/delve/default.nix b/pkgs/development/tools/delve/default.nix index 27100fe15cc0f..238bc728b047f 100644 --- a/pkgs/development/tools/delve/default.nix +++ b/pkgs/development/tools/delve/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "delve"; - version = "1.8.3"; + version = "1.9.0"; src = fetchFromGitHub { owner = "go-delve"; repo = "delve"; rev = "v${version}"; - sha256 = "sha256-6hiUQNUXpLgvYl/MH+AopIzwqvX+vtvp9GDEDmwlqek="; + sha256 = "sha256-paNr9aiRG6NP6DIGUojl7VPPPMTeJRpDW8ThDNOQhWM="; }; vendorSha256 = null; diff --git a/pkgs/development/tools/doctl/default.nix b/pkgs/development/tools/doctl/default.nix index 926b1c75ee36b..9d66b6359652f 100644 --- a/pkgs/development/tools/doctl/default.nix +++ b/pkgs/development/tools/doctl/default.nix @@ -2,7 +2,7 @@ buildGoModule rec { pname = "doctl"; - version = "1.77.0"; + version = "1.78.0"; vendorSha256 = null; @@ -31,7 +31,7 @@ buildGoModule rec { owner = "digitalocean"; repo = "doctl"; rev = "v${version}"; - sha256 = "sha256-i+Z5xFO3e04c/CfOyPAjD1nwPvm5vmYLsvj6OblJuqg="; + sha256 = "sha256-mbUGfAqKC8g2K9pPNnXrpa7DmJUeGXs0KFaavDRMXdc="; }; meta = with lib; { diff --git a/pkgs/development/tools/earthly/default.nix b/pkgs/development/tools/earthly/default.nix index cca4b15899766..43b7b19c6ee50 100644 --- a/pkgs/development/tools/earthly/default.nix +++ b/pkgs/development/tools/earthly/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "earthly"; - version = "0.6.16"; + version = "0.6.19"; src = fetchFromGitHub { owner = "earthly"; repo = "earthly"; rev = "v${version}"; - sha256 = "sha256-PKvF5dO7aFF3WOAWOxFTy1PpCr6o9s4QjQkgI7EO6Ss="; + sha256 = "sha256-TjAooHRkmC9bmgfRSLQByXyyKHVgXqj4X5xbCqAEYpM="; }; - vendorSha256 = "sha256-ESPi6ZjN2GkvzVidmBmuglL4Oh0EjyhGBdvjjiXB38s="; + vendorSha256 = "sha256-bXu1W0FpEPLBBw4D1B95Q3Uh2Ro2BYvjaPkROJpFlK4="; ldflags = [ "-s" "-w" diff --git a/pkgs/development/tools/electron/default.nix b/pkgs/development/tools/electron/default.nix index 1eb6144b4c3be..a1a593f522b55 100644 --- a/pkgs/development/tools/electron/default.nix +++ b/pkgs/development/tools/electron/default.nix @@ -23,7 +23,7 @@ let in rec { - electron = electron_18; + electron = electron_19; electron_9 = mkElectron "9.4.4" { x86_64-linux = "781d6ca834d415c71078e1c2c198faba926d6fce19e31448bbf4450869135450"; @@ -122,4 +122,13 @@ rec { aarch64-darwin = "97adf13306c9b3b304d3e9ddf68f5f7fb9b79c9a1342114e3671182f3cc9e808"; headers = "0gl30q2igr9c8sjlhyj5w57dm5navpkas5hnz9yl7sasbx66v10v"; }; + + electron_19 = mkElectron "19.0.7" { + armv7l-linux = "d6a6d2d7c0d658695783137d032a50f20843cdfe6582ef985451d741eef4dd32"; + aarch64-linux = "58685d21bb92c2667d20063ab12aabc2e5c2518f3eda84e98a0fa2306456ce57"; + x86_64-linux = "a4c20a068c54c238ae8c440ab8f46d39eda4168d6aa8cffcaae406800b539983"; + x86_64-darwin = "2709dd94e22ecfc8e7de0c7a7009160ed79e95ba91618c7307e24c26a33e978b"; + aarch64-darwin = "f9042bce83fe8446e22f6885285dd5fc2dca048d0b89cbf7f326a46102ffc440"; + headers = "09dbx4qh0rgp5mdm6srz6fgx12zq6b9jqq1k6l3gzyvwigi3wny1"; + }; } diff --git a/pkgs/development/tools/electron/generic.nix b/pkgs/development/tools/electron/generic.nix index 0016e82c47cd0..6091fa902c776 100644 --- a/pkgs/development/tools/electron/generic.nix +++ b/pkgs/development/tools/electron/generic.nix @@ -27,8 +27,9 @@ let homepage = "https://github.com/electron/electron"; license = licenses.mit; maintainers = with maintainers; [ travisbhartwell manveru prusnak ]; - platforms = [ "x86_64-darwin" "x86_64-linux" "i686-linux" "armv7l-linux" "aarch64-linux" ] - ++ optionals (versionAtLeast version "11.0.0") [ "aarch64-darwin" ]; + platforms = [ "x86_64-darwin" "x86_64-linux" "armv7l-linux" "aarch64-linux" ] + ++ optionals (versionAtLeast version "11.0.0") [ "aarch64-darwin" ] + ++ optionals (versionOlder version "19.0.0") [ "i686-linux" ]; sourceProvenance = with sourceTypes; [ binaryNativeCode ]; knownVulnerabilities = optional (versionOlder version "15.0.0") "Electron version ${version} is EOL"; }; @@ -39,21 +40,22 @@ let }; headersFetcher = vers: hash: fetchurl { - url = "https://atom.io/download/electron/v${vers}/node-v${vers}-headers.tar.gz"; + url = "https://artifacts.electronjs.org/headers/dist/v${vers}/node-v${vers}-headers.tar.gz"; sha256 = hash; }; tags = { - i686-linux = "linux-ia32"; x86_64-linux = "linux-x64"; armv7l-linux = "linux-armv7l"; aarch64-linux = "linux-arm64"; x86_64-darwin = "darwin-x64"; - aarch64-darwin = "darwin-arm64"; + } // lib.optionalAttrs (lib.versionAtLeast version "11.0.0") { + aarch64-darwin = "darwin-arm64"; + } // lib.optionalAttrs (lib.versionOlder version "19.0.0") { + i686-linux = "linux-ia32"; }; - get = as: platform: as.${platform.system} or - "Unsupported system: ${platform.system}"; + get = as: platform: as.${platform.system} or (throw "Unsupported system: ${platform.system}"); common = platform: { inherit pname version meta; diff --git a/pkgs/development/tools/electron/print-hashes.sh b/pkgs/development/tools/electron/print-hashes.sh index 48c8f0412e100..e43f1f922a948 100755 --- a/pkgs/development/tools/electron/print-hashes.sh +++ b/pkgs/development/tools/electron/print-hashes.sh @@ -7,8 +7,7 @@ if [[ $# -lt 1 ]]; then exit 1 fi - -VERSION=$1 +VERSION="$1" declare -A SYSTEMS HASHES SYSTEMS=( @@ -20,8 +19,8 @@ SYSTEMS=( [aarch64-darwin]=darwin-arm64 ) -hashfile="$(nix-prefetch-url --print-path "https://github.com/electron/electron/releases/download/v${VERSION}/SHASUMS256.txt" 2>/dev/null | tail -n1)" -headers="$(nix-prefetch-url "https://atom.io/download/electron/v${VERSION}/node-v${VERSION}-headers.tar.gz")" +hashfile="$(nix-prefetch-url --print-path "https://github.com/electron/electron/releases/download/v${VERSION}/SHASUMS256.txt" | tail -n1)" +headers="$(nix-prefetch-url "https://artifacts.electronjs.org/headers/dist/v${VERSION}/node-v${VERSION}-headers.tar.gz")" # Entry similar to the following goes in default.nix: diff --git a/pkgs/development/tools/fnlfmt/default.nix b/pkgs/development/tools/fnlfmt/default.nix index 86ca6b843d24e..aa34d0236524f 100644 --- a/pkgs/development/tools/fnlfmt/default.nix +++ b/pkgs/development/tools/fnlfmt/default.nix @@ -36,6 +36,6 @@ stdenv.mkDerivation rec { homepage = "https://git.sr.ht/~technomancy/fnlfmt"; license = licenses.lgpl3Plus; platforms = lua.meta.platforms; - maintainers = with maintainers; [ gpanders chiroptical ]; + maintainers = with maintainers; [ chiroptical ]; }; } diff --git a/pkgs/development/tools/gopls/default.nix b/pkgs/development/tools/gopls/default.nix index 26cf11299eb5b..a809894887636 100644 --- a/pkgs/development/tools/gopls/default.nix +++ b/pkgs/development/tools/gopls/default.nix @@ -2,17 +2,17 @@ buildGoModule rec { pname = "gopls"; - version = "0.8.4"; + version = "0.9.0"; src = fetchFromGitHub { owner = "golang"; repo = "tools"; rev = "gopls/v${version}"; - sha256 = "sha256-3JI6jrWCOgfFefivSDWz3yets4CXnDsvE/iYYms+piU="; + sha256 = "sha256-pEEqzaV3B/eDSiqJa5AZydlmYrvpD9CDryy2rHf4N5Y="; }; modRoot = "gopls"; - vendorSha256 = "sha256-7SkCRu4CGvb0TaL9BR2eeNjGNwViFh6TgtUUxiRjDxA="; + vendorSha256 = "sha256-ZdFYAQxStbY6KPyRAHvnwPeKLrOLVrr59MMyjknyK5Y="; doCheck = false; diff --git a/pkgs/development/tools/rust/cargo-whatfeatures/default.nix b/pkgs/development/tools/rust/cargo-whatfeatures/default.nix index 7041f0ebd6cdf..5a22307ecc346 100644 --- a/pkgs/development/tools/rust/cargo-whatfeatures/default.nix +++ b/pkgs/development/tools/rust/cargo-whatfeatures/default.nix @@ -2,16 +2,16 @@ rustPlatform.buildRustPackage rec { pname = "cargo-whatfeatures"; - version = "0.9.6"; + version = "0.9.7"; src = fetchFromGitHub { owner = "museun"; repo = pname; rev = "v${version}"; - sha256 = "0vki37pxngg15za9c1z61dc6sqk0j59s0qhcf9hplnym4ib5kqx1"; + sha256 = "sha256-tfaaYYdCe9PthVOtoRbinxItxg9zK18sm0wk5tpdsJU="; }; - cargoSha256 = "sha256-ZEkSj/JzXXTHjaxBVS5RDk/ECvOPPjzH4eS3CmlQA9I="; + cargoSha256 = "sha256-x5BStIb+0CYJZjO6xDmCVHjSuR2vilH4YLYuOYoB/JY="; nativeBuildInputs = [ pkg-config ]; diff --git a/pkgs/development/web/flyctl/default.nix b/pkgs/development/web/flyctl/default.nix index a2ee52bdfa068..a1f346e8418bb 100644 --- a/pkgs/development/web/flyctl/default.nix +++ b/pkgs/development/web/flyctl/default.nix @@ -1,17 +1,17 @@ -{ lib, buildGoModule, fetchFromGitHub, testers, flyctl }: +{ lib, buildGoModule, fetchFromGitHub, testers, flyctl, installShellFiles }: buildGoModule rec { pname = "flyctl"; - version = "0.0.346"; + version = "0.0.348"; src = fetchFromGitHub { owner = "superfly"; repo = "flyctl"; rev = "v${version}"; - sha256 = "sha256-CUv/zF323tplvyAfpTWGALFV3RKpkMmxiXx3gX8ZO3A="; + sha256 = "sha256-Z5WHmwz1ds5xQkc7QrGsUjZu0ug66XNV7KFbzhaP32I="; }; - vendorSha256 = "sha256-x2mJ1FO/a4eMHpEPLGdatUoY+Bt0RGElENJYUEsqcMU="; + vendorSha256 = "sha256-U5f2S5MoCk8PjkVYKlmVQvWb8/Q8n0J9julFz52bOec="; subPackages = [ "." ]; @@ -23,6 +23,8 @@ buildGoModule rec { "-X github.com/superfly/flyctl/internal/buildinfo.version=${version}" ]; + nativeBuildInputs = [ installShellFiles ]; + preBuild = '' go generate ./... ''; @@ -35,6 +37,13 @@ buildGoModule rec { go test ./... -ldflags="-X 'github.com/superfly/flyctl/internal/buildinfo.buildDate=1970-01-01T00:00:00Z'" ''; + postInstall = '' + installShellCompletion --cmd flyctl \ + --bash <($out/bin/flyctl completion bash) \ + --fish <($out/bin/flyctl completion fish) \ + --zsh <($out/bin/flyctl completion zsh) + ''; + passthru.tests.version = testers.testVersion { package = flyctl; command = "HOME=$(mktemp -d) flyctl version"; diff --git a/pkgs/games/ferium/default.nix b/pkgs/games/ferium/default.nix index b542ae3451e74..11ba016adb347 100644 --- a/pkgs/games/ferium/default.nix +++ b/pkgs/games/ferium/default.nix @@ -2,18 +2,18 @@ rustPlatform.buildRustPackage rec { pname = "ferium"; - version = "4.1.1"; + version = "4.1.5"; src = fetchFromGitHub { owner = "gorilla-devs"; repo = pname; rev = "v${version}"; - sha256 = "5DYdeK6JdA7oLBkjP3WkwLwlBitdf4Yt2dNP7P0INN0="; + sha256 = "sha256-NxrV8mi7xsr+x9oOp78DkHoPls0JLm5eol/8q9NwuTs="; }; buildInputs = lib.optionals stdenv.isDarwin [ Security ]; - cargoSha256 = "7rpxHfe+pWarPJ72WSXjgr63YctZ5+RrsEgmw7o66VI="; + cargoSha256 = "sha256-hR2PKQqSvtSBOOhZKW2IsGGjuU4jCdLMeruAHxErQtU="; buildNoDefaultFeatures = true; # by default pulls in GTK 3 just for its directory picker diff --git a/pkgs/games/soldat-unstable/default.nix b/pkgs/games/opensoldat/default.nix index b3ae3b58cfe76..625fc0dce5ae4 100644 --- a/pkgs/games/soldat-unstable/default.nix +++ b/pkgs/games/opensoldat/default.nix @@ -5,12 +5,12 @@ let base = stdenv.mkDerivation rec { - pname = "soldat-base"; + pname = "opensoldat-base"; version = "unstable-2021-09-05"; src = fetchFromGitHub { name = "base"; - owner = "Soldat"; + owner = "opensoldat"; repo = "base"; rev = "6c74d768d511663e026e015dde788006c74406b5"; sha256 = "175gmkdccy8rnkd95h2zqldqfydyji1hfby8b1qbnl8wz4dh08mz"; @@ -28,7 +28,7 @@ let ''; meta = with lib; { - description = "Soldat's base game content"; + description = "Opensoldat's base game content"; license = licenses.cc-by-40; platforms = platforms.all; inherit (src.meta) homepage; @@ -38,27 +38,22 @@ let in stdenv.mkDerivation rec { - pname = "soldat"; - version = "unstable-2021-11-01"; + pname = "opensoldat"; + version = "unstable-2022-07-02"; src = fetchFromGitHub { - name = "soldat"; - owner = "Soldat"; - repo = "soldat"; - rev = "7780d2948b724970af9f2aaf4fb4e4350d5438d9"; - sha256 = "0r39d1394q7kabsgq6vpdlzwsajxafsg23i0r273nggfvs3m805z"; + name = "opensoldat"; + owner = "opensoldat"; + repo = "opensoldat"; + rev = "9574f5791b7993067f03d2df03d625908bc3762f"; + sha256 = "0kyxzikd4ngx3nshjw0411x61zqq1b7l01lxw41rlcy4nad3r0vi"; }; - patches = [ - # Don't build GameNetworkingSockets as an ExternalProject, - # see https://github.com/Soldat/soldat/issues/73 - ./gamenetworkingsockets-no-external.patch - ]; - nativeBuildInputs = [ fpc makeWrapper autoPatchelfHook cmake ]; cmakeFlags = [ "-DADD_ASSETS=OFF" # We provide base's smods via nix + "-DBUILD_GNS=OFF" # Don't build GameNetworkingSockets as an ExternalProject ]; buildInputs = [ SDL2 freetype physfs openal gamenetworkingsockets ]; @@ -69,6 +64,7 @@ stdenv.mkDerivation rec { # let them write their state and configuration files # to $XDG_CONFIG_HOME/soldat/soldat{,server} unless # the user specifies otherwise. + # TODO(@sternenseemann): rename config dir to opensoldat postInstall = '' for p in $out/bin/soldatserver $out/bin/soldat; do configDir="\''${XDG_CONFIG_HOME:-\$HOME/.config}/soldat/$(basename "$p")" @@ -82,7 +78,7 @@ stdenv.mkDerivation rec { ''; meta = with lib; { - description = "Soldat is a unique 2D (side-view) multiplayer action game"; + description = "Opensoldat is a unique 2D (side-view) multiplayer action game"; license = [ licenses.mit base.meta.license ]; inherit (src.meta) homepage; maintainers = [ maintainers.sternenseemann ]; @@ -90,6 +86,6 @@ stdenv.mkDerivation rec { # portability currently mainly limited by fpc # in nixpkgs which doesn't work on darwin, # aarch64 and arm support should be possible: - # https://github.com/Soldat/soldat/issues/45 + # https://github.com/opensoldat/opensoldat/issues/45 }; } diff --git a/pkgs/games/soldat-unstable/gamenetworkingsockets-no-external.patch b/pkgs/games/soldat-unstable/gamenetworkingsockets-no-external.patch deleted file mode 100644 index 629ca6c67518a..0000000000000 --- a/pkgs/games/soldat-unstable/gamenetworkingsockets-no-external.patch +++ /dev/null @@ -1,14 +0,0 @@ -diff --git a/CMakeLists.txt b/CMakeLists.txt -index 1084048..1ea4c84 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -143,7 +143,8 @@ if(BUILD_CLIENT OR BUILD_SERVER) - file(WRITE ${PROJECT_BINARY_DIR}/bin/steam_appid.txt "638490") - else() - # GameNetworkingSockets -- add_subdirectory(shared/libs/GameNetworkingSockets) -+ # add_subdirectory(shared/libs/GameNetworkingSockets) -+ find_package(GameNetworkingSockets REQUIRED) - endif() - endif() - diff --git a/pkgs/os-specific/linux/fsverity-utils/default.nix b/pkgs/os-specific/linux/fsverity-utils/default.nix new file mode 100644 index 0000000000000..c5bed075338f7 --- /dev/null +++ b/pkgs/os-specific/linux/fsverity-utils/default.nix @@ -0,0 +1,51 @@ +{ stdenv +, lib +, fetchgit +, openssl +, enableShared ? !stdenv.hostPlatform.isStatic +, enableManpages ? false +, pandoc +}: + +stdenv.mkDerivation rec { + pname = "fsverity-utils"; + version = "1.5"; + + outputs = [ "out" "lib" "dev" ] ++ lib.optional enableManpages "man"; + + src = fetchgit { + url = "https://git.kernel.org/pub/scm/linux/kernel/git/ebiggers/fsverity-utils.git"; + rev = "v${version}"; + sha256 = "sha256-ygBOkp2PBe8Z2ak6SXEJ6HHuT4NRKmIsbJDHcY+h8PQ="; + }; + + patches = lib.optionals (!enableShared) [ + ./remove-dynamic-libs.patch + ]; + + enableParallelBuilding = true; + strictDeps = true; + + nativeBuildInputs = lib.optional enableManpages pandoc; + buildInputs = [ openssl ]; + + makeFlags = [ "DESTDIR=$(out)" "PREFIX=" ] ++ lib.optional enableShared "USE_SHARED_LIB=1"; + + doCheck = true; + + installTargets = [ "install" ] ++ lib.optional enableManpages "install-man"; + + postInstall = '' + mkdir -p $lib + mv $out/lib $lib/lib + ''; + + meta = with lib; { + homepage = "https://www.kernel.org/doc/html/latest/filesystems/fsverity.html#userspace-utility"; + changelog = "https://git.kernel.org/pub/scm/linux/kernel/git/ebiggers/fsverity-utils.git/tree/NEWS.md"; + description = "A set of userspace utilities for fs-verity"; + license = licenses.mit; + maintainers = with maintainers; [ jk ]; + platforms = platforms.linux; + }; +} diff --git a/pkgs/os-specific/linux/fsverity-utils/remove-dynamic-libs.patch b/pkgs/os-specific/linux/fsverity-utils/remove-dynamic-libs.patch new file mode 100644 index 0000000000000..95635cbccdb87 --- /dev/null +++ b/pkgs/os-specific/linux/fsverity-utils/remove-dynamic-libs.patch @@ -0,0 +1,27 @@ +diff --git a/Makefile b/Makefile +index 2304a21..697ccd4 100644 +--- a/Makefile ++++ b/Makefile +@@ -149,13 +149,11 @@ libfsverity.so.$(SOVERSION):$(SHARED_LIB_OBJ) + $(QUIET_CCLD) $(CC) -o $@ -Wl,-soname=$@ -shared $+ \ + $(CFLAGS) $(LDFLAGS) $(LDLIBS) + +-DEFAULT_TARGETS += libfsverity.so.$(SOVERSION) + + # Create the symlink libfsverity.so => libfsverity.so.$(SOVERSION) + libfsverity.so:libfsverity.so.$(SOVERSION) + $(QUIET_LN) ln -sf $+ $@ + +-DEFAULT_TARGETS += libfsverity.so + + ############################################################################## + +@@ -263,8 +261,6 @@ install:all + install -d $(DESTDIR)$(LIBDIR)/pkgconfig $(DESTDIR)$(INCDIR) $(DESTDIR)$(BINDIR) + install -m755 $(FSVERITY) $(DESTDIR)$(BINDIR) + install -m644 libfsverity.a $(DESTDIR)$(LIBDIR) +- install -m755 libfsverity.so.$(SOVERSION) $(DESTDIR)$(LIBDIR) +- ln -sf libfsverity.so.$(SOVERSION) $(DESTDIR)$(LIBDIR)/libfsverity.so + install -m644 include/libfsverity.h $(DESTDIR)$(INCDIR) + sed -e "s|@PREFIX@|$(PREFIX)|" \ + -e "s|@LIBDIR@|$(LIBDIR)|" \ diff --git a/pkgs/os-specific/linux/gt/default.nix b/pkgs/os-specific/linux/gt/default.nix index a7e4c0750463f..e227b6b6bc917 100644 --- a/pkgs/os-specific/linux/gt/default.nix +++ b/pkgs/os-specific/linux/gt/default.nix @@ -4,20 +4,23 @@ }: stdenv.mkDerivation { pname = "gt"; - version = "unstable-2021-09-30"; + version = "unstable-2022-05-08"; src = fetchFromGitHub { owner = "linux-usb-gadgets"; repo = "gt"; - rev = "7247547a14b2d092dc03fd83218ae65c2f7ff7d6"; - sha256 = "1has9q2sghd5vyi25l3h2hd4d315vvpld076iwwsg01fx4d9vjmg"; + rev = "7f9c45d98425a27444e49606ce3cf375e6164e8e"; + sha256 = "sha256-km4U+t4Id2AZx6GpH24p2WNmvV5RVjJ14sy8tWLCQsk="; }; - sourceRoot = "source"; + + sourceRoot = "source/source"; preConfigure = '' cmakeFlagsArray+=("-DBASH_COMPLETION_COMPLETIONSDIR=$out/share/bash-completions/completions") ''; + nativeBuildInputs = [ cmake pkg-config asciidoc ]; + buildInputs = [ bash-completion libconfig libusbgx]; meta = { diff --git a/pkgs/servers/computing/slurm/default.nix b/pkgs/servers/computing/slurm/default.nix index 341c89c4a0c3b..b64d8b1e442a2 100644 --- a/pkgs/servers/computing/slurm/default.nix +++ b/pkgs/servers/computing/slurm/default.nix @@ -48,13 +48,13 @@ stdenv.mkDerivation rec { # this doesn't fix tests completely at least makes slurmd to launch hardeningDisable = [ "bindnow" ]; - nativeBuildInputs = [ pkg-config libtool python3 ]; + nativeBuildInputs = [ pkg-config libtool python3 perl ]; buildInputs = [ - curl python3 munge perl pam - libmysqlclient ncurses gtk2 lz4 rdma-core - lua hwloc numactl readline freeipmi shadow.su - pmix json_c libjwt libyaml dbus libbpf - http-parser + curl python3 munge pam + libmysqlclient ncurses gtk2 lz4 rdma-core + lua hwloc numactl readline freeipmi shadow.su + pmix json_c libjwt libyaml dbus libbpf + http-parser ] ++ lib.optionals enableX11 [ xorg.xauth ]; configureFlags = with lib; diff --git a/pkgs/servers/home-assistant/component-packages.nix b/pkgs/servers/home-assistant/component-packages.nix index 467c628c5666c..1c65fce6e7fe5 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.6.7"; + version = "2022.7.0"; components = { "abode" = ps: with ps; [ abodepy @@ -61,8 +61,7 @@ aioairzone ]; "aladdin_connect" = ps: with ps; [ - aladdin-connect - ]; + ]; # missing inputs: AIOAladdinConnect "alarm_control_panel" = ps: with ps; [ ]; "alarmdecoder" = ps: with ps; [ @@ -801,6 +800,7 @@ pyfido ]; "file" = ps: with ps; [ + file-read-backwards ]; "filesize" = ps: with ps; [ ]; @@ -1134,6 +1134,14 @@ ]; "homeassistant" = ps: with ps; [ ]; + "homeassistant_yellow" = ps: with ps; [ + aiohttp-cors + fnvhash + home-assistant-frontend + lru-dict + pillow + sqlalchemy + ]; "homekit" = ps: with ps; [ hap-python pyqrcode @@ -1206,9 +1214,6 @@ "ialarm" = ps: with ps; [ pyialarm ]; - "ialarm_xr" = ps: with ps; [ - pyialarmxr-homeassistant - ]; "iammeter" = ps: with ps; [ ]; # missing inputs: iammeter "iaqualink" = ps: with ps; [ @@ -2427,7 +2432,8 @@ ] ++ pygatt.optional-dependencies.GATTTOOL; "skybell" = ps: with ps; [ - skybellpy + aioskybell + ha-ffmpeg ]; "slack" = ps: with ps; [ slackclient @@ -2479,7 +2485,7 @@ paho-mqtt ]; "snmp" = ps: with ps; [ - pysnmp + pysnmplib ]; "solaredge" = ps: with ps; [ solaredge @@ -2496,10 +2502,6 @@ "soma" = ps: with ps; [ pysoma ]; - "somfy" = ps: with ps; [ - aiohttp-cors - pymfy - ]; "somfy_mylink" = ps: with ps; [ somfy-mylink-synergy ]; @@ -2657,9 +2659,8 @@ "system_bridge" = ps: with ps; [ aiohttp-cors ifaddr - systembridge zeroconf - ]; + ]; # missing inputs: systembridgeconnector "system_health" = ps: with ps; [ aiohttp-cors ]; @@ -2916,8 +2917,7 @@ "uscis" = ps: with ps; [ ]; # missing inputs: uscisstatus "usgs_earthquakes_feed" = ps: with ps; [ - geojson-client - ]; + ]; # missing inputs: aio_geojson_usgs_earthquakes "utility_meter" = ps: with ps; [ croniter ]; @@ -3172,10 +3172,15 @@ "zha" = ps: with ps; [ aiohttp-cors bellows + fnvhash + home-assistant-frontend ifaddr + lru-dict + pillow pyserial-asyncio pyserial pyudev + sqlalchemy zeroconf zha-quirks zigpy-deconz @@ -3226,7 +3231,6 @@ "airtouch4" "airvisual" "airzone" - "aladdin_connect" "alarm_control_panel" "alarmdecoder" "alert" @@ -3338,6 +3342,7 @@ "ecobee" "econet" "efergy" + "eight_sleep" "elgato" "elkm1" "elmax" @@ -3440,6 +3445,7 @@ "home_connect" "home_plus_control" "homeassistant" + "homeassistant_yellow" "homekit" "homekit_controller" "homematic" @@ -3456,7 +3462,6 @@ "hvv_departures" "hyperion" "ialarm" - "ialarm_xr" "iaqualink" "icloud" "ifttt" @@ -3499,6 +3504,8 @@ "launch_library" "laundrify" "lcn" + "lg_soundbar" + "life360" "light" "litterrobot" "local_file" @@ -3635,6 +3642,7 @@ "rachio" "radarr" "radio_browser" + "radiotherm" "rainforest_eagle" "rainmachine" "random" @@ -3689,6 +3697,7 @@ "simplisafe" "simulated" "siren" + "skybell" "slack" "sleepiq" "slimproto" @@ -3700,11 +3709,11 @@ "smhi" "smtp" "snips" + "snmp" "solaredge" "solarlog" "solax" "soma" - "somfy" "somfy_mylink" "sonarr" "songpal" @@ -3738,7 +3747,6 @@ "syncthing" "syncthru" "synology_dsm" - "system_bridge" "system_health" "system_log" "tado" @@ -3795,7 +3803,6 @@ "uptime" "uptimerobot" "usb" - "usgs_earthquakes_feed" "utility_meter" "uvc" "vacuum" diff --git a/pkgs/servers/home-assistant/default.nix b/pkgs/servers/home-assistant/default.nix index ee069f19b0546..b343971f0442c 100644 --- a/pkgs/servers/home-assistant/default.nix +++ b/pkgs/servers/home-assistant/default.nix @@ -30,6 +30,20 @@ let defaultOverrides = [ # Override the version of some packages pinned in Home Assistant's setup.py and requirements_all.txt + (self: super: { + bsblan = super.bsblan.overridePythonAttrs (oldAttrs: rec { + version = "0.5.0"; + postPatch = null; + propagatedBuildInputs = oldAttrs.propagatedBuildInputs ++ [ super.cattrs ]; + src = fetchFromGitHub { + owner = "liudger"; + repo = "python-bsblan"; + rev = "v.${version}"; + hash = "sha256-yzlHcIb5QlG+jAgEtKlAcY7rESiUY7nD1YwqK63wgcg="; + }; + }); + }) + # pytest-aiohttp>0.3.0 breaks home-assistant tests (self: super: { pytest-aiohttp = super.pytest-aiohttp.overridePythonAttrs (oldAttrs: rec { @@ -176,7 +190,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.6.7"; + hassVersion = "2022.7.0"; in python.pkgs.buildPythonApplication rec { pname = "homeassistant"; @@ -194,7 +208,7 @@ in python.pkgs.buildPythonApplication rec { owner = "home-assistant"; repo = "core"; rev = version; - hash = "sha256-RR0CsPOzOdWRPSgmKGl3egrPXS1CDI+ODWZeLkVCSGQ="; + hash = "sha256-DDRut+3wJutXcQVOf2KU+XuHs5XuKkd5R7dQIXwOIrU="; }; # leave this in, so users don't have to constantly update their downstream patch handling @@ -203,6 +217,7 @@ in python.pkgs.buildPythonApplication rec { src = ./patches/ffmpeg-path.patch; ffmpeg = "${lib.getBin ffmpeg}/bin/ffmpeg"; }) + ./patches/wilight-import.patch ]; postPatch = let @@ -212,15 +227,16 @@ in python.pkgs.buildPythonApplication rec { "bcrypt" "cryptography" "httpx" + "orjson" "PyJWT" "requests" ]; in '' sed -r -i \ ${lib.concatStringsSep "\n" (map (package: - ''-e 's@${package}[<>=]+.*@${package}@g' \'' + ''-e 's/${package}[<>=]+.*/${package}",/g' \'' ) relaxedConstraints)} - setup.cfg + pyproject.toml substituteInPlace tests/test_config.py --replace '"/usr"' '"/build/media"' ''; @@ -239,13 +255,13 @@ in python.pkgs.buildPythonApplication rec { httpx ifaddr jinja2 + lru-dict + orjson pip pyjwt python-slugify - pytz pyyaml requests - ruamel-yaml voluptuous voluptuous-serialize yarl diff --git a/pkgs/servers/home-assistant/frontend.nix b/pkgs/servers/home-assistant/frontend.nix index 7180b284e2ceb..f92314f83df05 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 = "20220601.0"; + version = "20220706.0"; format = "wheel"; src = fetchPypi { @@ -12,7 +12,7 @@ buildPythonPackage rec { pname = "home_assistant_frontend"; dist = "py3"; python = "py3"; - sha256 = "sha256-WGRKJq429fIxZQJzVK2xFqXUNrIYbCjr2zTSzpBlakI="; + sha256 = "sha256-hTdfe+S9D6Grtku5AkRJpCNBvYv2JspSPmXRHHfEPrA="; }; # there is nothing to strip in this package diff --git a/pkgs/servers/home-assistant/patches/wilight-import.patch b/pkgs/servers/home-assistant/patches/wilight-import.patch new file mode 100644 index 0000000000000..2d6626b974381 --- /dev/null +++ b/pkgs/servers/home-assistant/patches/wilight-import.patch @@ -0,0 +1,52 @@ +diff --git a/homeassistant/components/wilight/__init__.py b/homeassistant/components/wilight/__init__.py +index 2cdcf20c1e..37b034c9ae 100644 +--- a/homeassistant/components/wilight/__init__.py ++++ b/homeassistant/components/wilight/__init__.py +@@ -2,7 +2,7 @@ + + from typing import Any + +-from pywilight.wilight_device import Device as PyWiLightDevice ++from pywilight.wilight_device import PyWiLightDevice + + from homeassistant.config_entries import ConfigEntry + from homeassistant.const import Platform +diff --git a/homeassistant/components/wilight/fan.py b/homeassistant/components/wilight/fan.py +index c598e6db39..3d0c6d0ff3 100644 +--- a/homeassistant/components/wilight/fan.py ++++ b/homeassistant/components/wilight/fan.py +@@ -13,7 +13,7 @@ from pywilight.const import ( + WL_SPEED_LOW, + WL_SPEED_MEDIUM, + ) +-from pywilight.wilight_device import Device as PyWiLightDevice ++from pywilight.wilight_device import PyWiLightDevice + + from homeassistant.components.fan import DIRECTION_FORWARD, FanEntity, FanEntityFeature + from homeassistant.config_entries import ConfigEntry +diff --git a/homeassistant/components/wilight/light.py b/homeassistant/components/wilight/light.py +index ea9e19dcb3..2509dc5073 100644 +--- a/homeassistant/components/wilight/light.py ++++ b/homeassistant/components/wilight/light.py +@@ -4,7 +4,7 @@ from __future__ import annotations + from typing import Any + + from pywilight.const import ITEM_LIGHT, LIGHT_COLOR, LIGHT_DIMMER, LIGHT_ON_OFF +-from pywilight.wilight_device import Device as PyWiLightDevice ++from pywilight.wilight_device import PyWiLightDevice + + from homeassistant.components.light import ( + ATTR_BRIGHTNESS, +diff --git a/homeassistant/components/wilight/parent_device.py b/homeassistant/components/wilight/parent_device.py +index 17a33fef63..8091e78cc7 100644 +--- a/homeassistant/components/wilight/parent_device.py ++++ b/homeassistant/components/wilight/parent_device.py +@@ -5,7 +5,7 @@ import asyncio + import logging + + import pywilight +-from pywilight.wilight_device import Device as PyWiLightDevice ++from pywilight.wilight_device import PyWiLightDevice + import requests + + from homeassistant.config_entries import ConfigEntry diff --git a/pkgs/servers/home-assistant/tests.nix b/pkgs/servers/home-assistant/tests.nix index 488ce35a16450..6d21e6a6eed24 100644 --- a/pkgs/servers/home-assistant/tests.nix +++ b/pkgs/servers/home-assistant/tests.nix @@ -11,6 +11,7 @@ let config = [ pydispatcher ]; generic = [ av ]; google_translate = [ mutagen ]; + homeassistant_yellow = [ bellows zha-quirks zigpy-deconz zigpy-xbee zigpy-zigate zigpy-znp ]; lovelace = [ PyChromecast ]; nest = [ av ]; onboarding = [ pymetno radios rpi-bad-power ]; @@ -36,13 +37,31 @@ let # homeassistant.components.roku.media_player:media_player.py:428 Media type music is not supported with format None (mime: audio/x-matroska) "test_services_play_media_audio" ]; + rfxtrx = [ + # bytearrray mismatch + "test_rfy_cover" + ]; }; extraPytestFlagsArray = { asuswrt = [ - # asuswrt/test_config_flow.py: Sandbox network limitations, fails with unexpected error + # Sandbox network limitations, fails with unexpected error "--deselect tests/components/asuswrt/test_config_flow.py::test_on_connect_failed" ]; + history_stats = [ + # Flaky: AssertionError: assert '0.0' == '12.0' + "--deselect tests/components/history_stats/test_sensor.py::test_end_time_with_microseconds_zeroed" + ]; + skybell = [ + # Sandbox network limitations: Cannot connect to host cloud.myskybell.com:443 + "--deselect tests/components/skybell/test_config_flow.py::test_flow_user_unknown_error" + ]; + stream = [ + # Tries to write to /example and gets "Permission denied" + "--deselect tests/components/stream/test_recorder.py::test_record_lookback" + "--deselect tests/components/stream/test_recorder.py::test_recorder_log" + "--deselect tests/components/stream/test_worker.py::test_get_image" + ]; }; in lib.listToAttrs (map (component: lib.nameValuePair component ( home-assistant.overridePythonAttrs (old: { @@ -72,9 +91,8 @@ in lib.listToAttrs (map (component: lib.nameValuePair component ( meta = old.meta // { broken = lib.elem component [ - "bsblan" + "blebox" # all tests fail with: AttributeError: Mock object has no attribute 'async_from_host' "dnsip" - "efergy" "ssdp" "subaru" ]; diff --git a/pkgs/servers/monitoring/newrelic-sysmond/default.nix b/pkgs/servers/monitoring/newrelic-sysmond/default.nix index 3cdcbde161b7c..35a6a5e828e5c 100644 --- a/pkgs/servers/monitoring/newrelic-sysmond/default.nix +++ b/pkgs/servers/monitoring/newrelic-sysmond/default.nix @@ -19,6 +19,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "System-wide monitoring for newrelic"; homepage = "https://newrelic.com/"; + sourceProvenance = with sourceTypes; [ binaryNativeCode ]; license = licenses.unfree; platforms = platforms.linux; maintainers = with maintainers; [ lnl7 ]; diff --git a/pkgs/servers/monitoring/plugins/wmic-bin.nix b/pkgs/servers/monitoring/plugins/wmic-bin.nix index e091727e48e29..00e76624d102b 100644 --- a/pkgs/servers/monitoring/plugins/wmic-bin.nix +++ b/pkgs/servers/monitoring/plugins/wmic-bin.nix @@ -39,6 +39,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "WMI client for Linux (binary)"; homepage = "https://www.openvas.org"; + sourceProvenance = with sourceTypes; [ binaryNativeCode ]; license = licenses.mit; maintainers = with maintainers; [ peterhoeg ]; platforms = [ "x86_64-linux" ]; diff --git a/pkgs/servers/ombi/default.nix b/pkgs/servers/ombi/default.nix index 7215571b3aec6..a8251b1c42e12 100644 --- a/pkgs/servers/ombi/default.nix +++ b/pkgs/servers/ombi/default.nix @@ -49,6 +49,7 @@ in stdenv.mkDerivation rec { meta = with lib; { description = "Self-hosted web application that automatically gives your shared Plex or Emby users the ability to request content by themselves"; homepage = "https://ombi.io/"; + sourceProvenance = with sourceTypes; [ binaryNativeCode ]; license = licenses.gpl2Only; maintainers = with maintainers; [ woky ]; platforms = [ "x86_64-linux" "aarch64-linux" "x86_64-darwin" ]; diff --git a/pkgs/servers/redpanda/default.nix b/pkgs/servers/redpanda/default.nix index f7c11fe39f636..80d5e8743f772 100644 --- a/pkgs/servers/redpanda/default.nix +++ b/pkgs/servers/redpanda/default.nix @@ -39,6 +39,7 @@ in stdenv.mkDerivation rec { meta = with lib; { description = "Redpanda is a streaming data platform for developers. Kafka API compatible. 10x faster. No ZooKeeper. No JVM! "; + sourceProvenance = with sourceTypes; [ binaryNativeCode ]; license = licenses.bsl11; homepage = "https://redpanda.com/"; maintainers = with maintainers; [ happysalada ]; diff --git a/pkgs/servers/search/elasticsearch/6.x.nix b/pkgs/servers/search/elasticsearch/6.x.nix index 798fa83e6d588..32f6d67925c55 100644 --- a/pkgs/servers/search/elasticsearch/6.x.nix +++ b/pkgs/servers/search/elasticsearch/6.x.nix @@ -56,6 +56,7 @@ stdenv.mkDerivation (rec { meta = { description = "Open Source, Distributed, RESTful Search Engine"; + sourceProvenance = with lib.sourceTypes; [ binaryBytecode ]; license = if enableUnfree then licenses.elastic else licenses.asl20; platforms = platforms.unix; maintainers = with maintainers; [ apeschar basvandijk ]; diff --git a/pkgs/servers/search/elasticsearch/7.x.nix b/pkgs/servers/search/elasticsearch/7.x.nix index 9ef1c3cc63493..aad6403cf6abc 100644 --- a/pkgs/servers/search/elasticsearch/7.x.nix +++ b/pkgs/servers/search/elasticsearch/7.x.nix @@ -72,6 +72,10 @@ stdenv.mkDerivation rec { meta = { description = "Open Source, Distributed, RESTful Search Engine"; + sourceProvenance = with lib.sourceTypes; [ + binaryBytecode + binaryNativeCode + ]; license = licenses.elastic; platforms = platforms.unix; maintainers = with maintainers; [ apeschar basvandijk ]; diff --git a/pkgs/shells/powershell/default.nix b/pkgs/shells/powershell/default.nix index e03a2e24e7e49..435f54cdf4af0 100644 --- a/pkgs/shells/powershell/default.nix +++ b/pkgs/shells/powershell/default.nix @@ -74,6 +74,10 @@ stdenv.mkDerivation rec { meta = with lib; { description = "Powerful cross-platform (Windows, Linux, and macOS) shell and scripting language based on .NET"; homepage = "https://github.com/PowerShell/PowerShell"; + sourceProvenance = with sourceTypes; [ + binaryBytecode + binaryNativeCode + ]; maintainers = with maintainers; [ yrashk srgom p3psi ]; mainProgram = "pwsh"; platforms = [ "x86_64-darwin" "x86_64-linux" "aarch64-linux" "aarch64-darwin" ]; diff --git a/pkgs/tools/audio/stt/default.nix b/pkgs/tools/audio/stt/default.nix index c8fff7ddbb4a7..91e18f409a219 100644 --- a/pkgs/tools/audio/stt/default.nix +++ b/pkgs/tools/audio/stt/default.nix @@ -27,6 +27,7 @@ stdenv.mkDerivation rec { meta = with lib; { homepage = "https://github.com/coqui-ai/STT"; description = "Deep learning toolkit for Speech-to-Text, battle-tested in research and production"; + sourceProvenance = with sourceTypes; [ binaryNativeCode ]; license = licenses.mpl20; platforms = [ "x86_64-linux" ]; maintainers = with maintainers; [ rvolosatovs ]; diff --git a/pkgs/tools/cd-dvd/ventoy-bin/default.nix b/pkgs/tools/cd-dvd/ventoy-bin/default.nix index 4e88ac1864834..07d73f980525a 100644 --- a/pkgs/tools/cd-dvd/ventoy-bin/default.nix +++ b/pkgs/tools/cd-dvd/ventoy-bin/default.nix @@ -187,6 +187,7 @@ in stdenv.mkDerivation rec { 800+ image files are tested. 90%+ distros in DistroWatch supported. ''; changelog = "https://www.ventoy.net/doc_news.html"; + sourceProvenance = with sourceTypes; [ binaryNativeCode ]; license = licenses.gpl3Plus; platforms = [ "x86_64-linux" "i686-linux" "aarch64-linux" "mipsel-linux" ]; maintainers = with maintainers; [ k4leg ]; diff --git a/pkgs/tools/compression/kzipmix/default.nix b/pkgs/tools/compression/kzipmix/default.nix index 4bfc39e87186f..bde65af03e907 100644 --- a/pkgs/tools/compression/kzipmix/default.nix +++ b/pkgs/tools/compression/kzipmix/default.nix @@ -19,6 +19,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "A tool that aggressively optimizes the sizes of Zip archives"; + sourceProvenance = with sourceTypes; [ binaryNativeCode ]; license = licenses.unfree; homepage = "http://advsys.net/ken/utils.htm"; maintainers = [ maintainers.sander ]; diff --git a/pkgs/tools/filesystems/yandex-disk/default.nix b/pkgs/tools/filesystems/yandex-disk/default.nix index 4b8de7402a62c..109781f612a26 100644 --- a/pkgs/tools/filesystems/yandex-disk/default.nix +++ b/pkgs/tools/filesystems/yandex-disk/default.nix @@ -56,6 +56,7 @@ stdenv.mkDerivation rec { description = "A free cloud file storage service"; maintainers = with lib.maintainers; [ smironov jagajaga ]; platforms = ["i686-linux" "x86_64-linux"]; + sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ]; license = lib.licenses.unfree; longDescription = '' Yandex.Disk console client for Linux lets you manage files on Disk without diff --git a/pkgs/tools/games/opentracker/default.nix b/pkgs/tools/games/opentracker/default.nix index a184aa381a5f7..33dc69ff4e68c 100644 --- a/pkgs/tools/games/opentracker/default.nix +++ b/pkgs/tools/games/opentracker/default.nix @@ -57,6 +57,12 @@ buildDotnetModule rec { meta = with lib; { description = "A tracking application for A Link to the Past Randomizer"; homepage = "https://github.com/trippsc2/OpenTracker"; + sourceProvenance = with sourceTypes; [ + fromSource + # deps + binaryBytecode + binaryNativeCode + ]; license = licenses.mit; maintainers = [ maintainers.ivar ]; mainProgram = "OpenTracker"; diff --git a/pkgs/tools/graphics/agi/default.nix b/pkgs/tools/graphics/agi/default.nix index 4fad46f295ae5..cad785372dce3 100644 --- a/pkgs/tools/graphics/agi/default.nix +++ b/pkgs/tools/graphics/agi/default.nix @@ -60,7 +60,10 @@ stdenv.mkDerivation rec { meta = with lib; { homepage = "https://github.com/google/agi/"; description = "Android GPU Inspector"; - sourceProvenance = with sourceTypes; [ binaryBytecode ]; + sourceProvenance = with sourceTypes; [ + binaryBytecode + binaryNativeCode + ]; license = licenses.asl20; platforms = [ "x86_64-linux" ]; maintainers = [ maintainers.ivar ]; diff --git a/pkgs/tools/graphics/pngout/default.nix b/pkgs/tools/graphics/pngout/default.nix index 02f3930a09c86..2b86f5e5e1365 100644 --- a/pkgs/tools/graphics/pngout/default.nix +++ b/pkgs/tools/graphics/pngout/default.nix @@ -41,6 +41,7 @@ stdenv.mkDerivation rec { meta = { description = "A tool that aggressively optimizes the sizes of PNG images"; + sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ]; license = lib.licenses.unfreeRedistributable; homepage = "http://advsys.net/ken/utils.htm"; platforms = lib.attrNames platforms; diff --git a/pkgs/tools/misc/chafa/default.nix b/pkgs/tools/misc/chafa/default.nix index 85b52dd398c25..55b83f7de332f 100644 --- a/pkgs/tools/misc/chafa/default.nix +++ b/pkgs/tools/misc/chafa/default.nix @@ -4,14 +4,14 @@ }: stdenv.mkDerivation rec { - version = "1.10.3"; + version = "1.12.3"; pname = "chafa"; src = fetchFromGitHub { owner = "hpjansson"; repo = "chafa"; rev = version; - sha256 = "sha256-GRPn0xPWtCayOdmA6M+KQrObAHtZIJLEydXaKhhO5IU="; + sha256 = "sha256-Aejm3VR4f69jDdG16vud2sj/9jQ8n5f34oed1SGEcXo="; }; nativeBuildInputs = [ autoconf diff --git a/pkgs/tools/misc/cpulimit/default.nix b/pkgs/tools/misc/cpulimit/default.nix index 7fdaa319619df..a0ee76ec46fae 100644 --- a/pkgs/tools/misc/cpulimit/default.nix +++ b/pkgs/tools/misc/cpulimit/default.nix @@ -1,27 +1,29 @@ -{lib, stdenv, fetchurl}: +{ lib, stdenv, fetchFromGitHub }: stdenv.mkDerivation rec { pname = "cpulimit"; - version = "2.7"; + version = "0.2"; - src = fetchurl { - url = "mirror://sourceforge/limitcpu/${pname}-${version}.tar.gz"; - sha256 = "sha256-HeBApPikDf6MegJf6YB1ZzRo+8P8zMvCMbx0AvYuxKA="; + src = fetchFromGitHub { + owner = "opsengine"; + repo = "cpulimit"; + rev = "v${version}"; + sha256 = "1dz045yhcsw1rdamzpz4bk8mw888in7fyqk1q1b3m1yk4pd1ahkh"; }; - buildFlags = with stdenv; [ ( - if isDarwin then "osx" - else if isFreeBSD then "freebsd" - else "cpulimit" - ) ]; + patches = [ ./remove-sys-sysctl.h.patch ./get-missing-basename.patch ]; - installFlags = [ "PREFIX=$(out)" ]; + + installPhase = '' + mkdir -p $out/bin + cp src/cpulimit $out/bin + ''; meta = with lib; { - homepage = "http://limitcpu.sourceforge.net/"; - description = "A tool to throttle the CPU usage of programs"; - platforms = with platforms; linux ++ freebsd; + homepage = "https://github.com/opsengine/cpulimit"; + description = "CPU usage limiter"; + platforms = platforms.unix; license = licenses.gpl2; - maintainers = [maintainers.rycee]; + maintainers = [ maintainers.jsoo1 ]; }; } diff --git a/pkgs/tools/misc/cpulimit/get-missing-basename.patch b/pkgs/tools/misc/cpulimit/get-missing-basename.patch new file mode 100644 index 0000000000000..d27eda0b6fa90 --- /dev/null +++ b/pkgs/tools/misc/cpulimit/get-missing-basename.patch @@ -0,0 +1,12 @@ +diff --git a/src/process_group.c b/src/process_group.c +index 06d73a6..3ca66b0 100644 +--- a/src/process_group.c ++++ b/src/process_group.c +@@ -20,6 +20,7 @@ + */ + + #include <string.h> ++#include <libgen.h> + #include <stdlib.h> + #include <limits.h> + #include <sys/time.h> diff --git a/pkgs/tools/misc/cpulimit/remove-sys-sysctl.h.patch b/pkgs/tools/misc/cpulimit/remove-sys-sysctl.h.patch new file mode 100644 index 0000000000000..a152cab3acc78 --- /dev/null +++ b/pkgs/tools/misc/cpulimit/remove-sys-sysctl.h.patch @@ -0,0 +1,21 @@ +Remove references to sys/sysctl.h which were deprecated long ago. + +diff --git a/src/cpulimit.c b/src/cpulimit.c +index 50eabea..eba4615 100644 +--- a/src/cpulimit.c ++++ b/src/cpulimit.c +@@ -38,7 +38,9 @@ + #include <string.h> + #include <sys/stat.h> + #include <sys/time.h> ++#ifdef __APPLE__ + #include <sys/sysctl.h> ++#endif + #include <sys/resource.h> + #include <sys/types.h> + #include <sys/wait.h> + +-#ifdef __APPLE__ || __FREEBSD__ ++#if defined(__APPLE__) || defined(__FREEBSD__) + #include <libgen.h> + #endif \ No newline at end of file diff --git a/pkgs/tools/misc/fxlinuxprintutil/default.nix b/pkgs/tools/misc/fxlinuxprintutil/default.nix index b97e082128aca..ce78ae0d7afec 100644 --- a/pkgs/tools/misc/fxlinuxprintutil/default.nix +++ b/pkgs/tools/misc/fxlinuxprintutil/default.nix @@ -52,6 +52,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "Optional configuration tool for fxlinuxprint"; homepage = "https://onlinesupport.fujixerox.com"; + sourceProvenance = with sourceTypes; [ binaryNativeCode ]; license = licenses.unfree; maintainers = with maintainers; [ delan ]; platforms = platforms.linux; diff --git a/pkgs/tools/misc/geekbench/4.nix b/pkgs/tools/misc/geekbench/4.nix index 03a79644ffb26..d7b6152e07855 100644 --- a/pkgs/tools/misc/geekbench/4.nix +++ b/pkgs/tools/misc/geekbench/4.nix @@ -34,6 +34,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "Cross-platform benchmark"; homepage = "https://geekbench.com/"; + sourceProvenance = with sourceTypes; [ binaryNativeCode ]; license = licenses.unfree; maintainers = [ maintainers.michalrus ]; platforms = [ "x86_64-linux" ]; diff --git a/pkgs/tools/misc/geekbench/default.nix b/pkgs/tools/misc/geekbench/default.nix index bb25b7502f185..ba9117a29722e 100644 --- a/pkgs/tools/misc/geekbench/default.nix +++ b/pkgs/tools/misc/geekbench/default.nix @@ -34,6 +34,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "Cross-platform benchmark"; homepage = "https://geekbench.com/"; + sourceProvenance = with sourceTypes; [ binaryNativeCode ]; license = licenses.unfree; maintainers = [ maintainers.michalrus ]; platforms = [ "x86_64-linux" ]; diff --git a/pkgs/tools/misc/goreleaser/default.nix b/pkgs/tools/misc/goreleaser/default.nix index a5f1f21e0204a..9c1c36da9ee51 100644 --- a/pkgs/tools/misc/goreleaser/default.nix +++ b/pkgs/tools/misc/goreleaser/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "goreleaser"; - version = "1.9.2"; + version = "1.10.1"; src = fetchFromGitHub { owner = "goreleaser"; repo = pname; rev = "v${version}"; - sha256 = "sha256-lr/yTxtWjTZoiZjfqstl53V1CBf16IRkSo7+YkZ6Yxc="; + sha256 = "sha256-m42Gu1ExHs29cCTWo8V2q67bXBJ4kyn2ElR9kqVREjU="; }; - vendorSha256 = "sha256-MyhrFXg/A3zb2p/OlJ//lkqjFjNiEP0B0/vO0iuHDRo="; + vendorSha256 = "sha256-/fZbKLmGhB8b33NqLkETtYa664ZEq+KY8GJ4pOZJhLo="; ldflags = [ "-s" diff --git a/pkgs/tools/misc/limitcpu/default.nix b/pkgs/tools/misc/limitcpu/default.nix new file mode 100644 index 0000000000000..2d7fb55dcd9c9 --- /dev/null +++ b/pkgs/tools/misc/limitcpu/default.nix @@ -0,0 +1,27 @@ +{lib, stdenv, fetchurl}: + +stdenv.mkDerivation rec { + pname = "limitcpu"; + version = "2.7"; + + src = fetchurl { + url = "mirror://sourceforge/limitcpu/cpulimit-${version}.tar.gz"; + sha256 = "sha256-HeBApPikDf6MegJf6YB1ZzRo+8P8zMvCMbx0AvYuxKA="; + }; + + buildFlags = with stdenv; [ ( + if isDarwin then "osx" + else if isFreeBSD then "freebsd" + else "cpulimit" + ) ]; + + installFlags = [ "PREFIX=$(out)" ]; + + meta = with lib; { + homepage = "http://limitcpu.sourceforge.net/"; + description = "A tool to throttle the CPU usage of programs"; + platforms = with platforms; linux ++ freebsd; + license = licenses.gpl2; + maintainers = [maintainers.rycee]; + }; +} diff --git a/pkgs/tools/misc/logstash/6.x.nix b/pkgs/tools/misc/logstash/6.x.nix index c1136ed887689..4de78cf4cbd74 100644 --- a/pkgs/tools/misc/logstash/6.x.nix +++ b/pkgs/tools/misc/logstash/6.x.nix @@ -53,6 +53,11 @@ let this = stdenv.mkDerivation rec { meta = with lib; { description = "A data pipeline that helps you process logs and other event data from a variety of systems"; homepage = "https://www.elastic.co/products/logstash"; + sourceProvenance = with sourceTypes; [ + fromSource + binaryBytecode # source bundles dependencies as jars + binaryNativeCode # bundled jruby includes native code + ]; license = if enableUnfree then licenses.elastic else licenses.asl20; platforms = platforms.unix; maintainers = with maintainers; [ wjlroe offline basvandijk ]; diff --git a/pkgs/tools/misc/logstash/7.x.nix b/pkgs/tools/misc/logstash/7.x.nix index f0a760e42f28d..2dabcee2a0529 100644 --- a/pkgs/tools/misc/logstash/7.x.nix +++ b/pkgs/tools/misc/logstash/7.x.nix @@ -68,6 +68,11 @@ let meta = with lib; { description = "Logstash is a data pipeline that helps you process logs and other event data from a variety of systems"; homepage = "https://www.elastic.co/products/logstash"; + sourceProvenance = with sourceTypes; [ + fromSource + binaryBytecode # source bundles dependencies as jars + binaryNativeCode # bundled jruby includes native code + ]; license = if enableUnfree then licenses.elastic else licenses.asl20; platforms = platforms.unix; maintainers = with maintainers; [ wjlroe offline basvandijk ]; diff --git a/pkgs/tools/misc/megacli/default.nix b/pkgs/tools/misc/megacli/default.nix index 3f86a073c096c..e2eef587f27c5 100644 --- a/pkgs/tools/misc/megacli/default.nix +++ b/pkgs/tools/misc/megacli/default.nix @@ -34,6 +34,7 @@ stdenv.mkDerivation rec { meta = { description = "CLI program for LSI MegaRAID cards, which also works with some Dell PERC RAID cards"; + sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ]; license = lib.licenses.unfree; platforms = [ "x86_64-linux" ]; }; diff --git a/pkgs/tools/networking/logmein-hamachi/default.nix b/pkgs/tools/networking/logmein-hamachi/default.nix index 4512e1dc6254d..74d32b452381a 100644 --- a/pkgs/tools/networking/logmein-hamachi/default.nix +++ b/pkgs/tools/networking/logmein-hamachi/default.nix @@ -38,6 +38,7 @@ in stdenv.mkDerivation rec { meta = with lib; { description = "A hosted VPN service that lets you securely extend LAN-like networks to distributed teams"; homepage = "https://secure.logmein.com/products/hamachi/"; + sourceProvenance = with sourceTypes; [ binaryNativeCode ]; license = licenses.unfreeRedistributable; maintainers = with maintainers; [ abbradar ]; platforms = platforms.linux; diff --git a/pkgs/tools/security/enpass/default.nix b/pkgs/tools/security/enpass/default.nix index 00c161eeb7307..e7a3eb8bae3c0 100644 --- a/pkgs/tools/security/enpass/default.nix +++ b/pkgs/tools/security/enpass/default.nix @@ -54,6 +54,7 @@ let meta = with lib; { description = "A well known password manager"; homepage = "https://www.enpass.io/"; + sourceProvenance = with sourceTypes; [ binaryNativeCode ]; license = licenses.unfree; platforms = [ "x86_64-linux" "i686-linux"]; maintainers = with maintainers; [ ewok ]; diff --git a/pkgs/tools/security/gorilla-bin/default.nix b/pkgs/tools/security/gorilla-bin/default.nix index 228271742c640..388996c62fb51 100644 --- a/pkgs/tools/security/gorilla-bin/default.nix +++ b/pkgs/tools/security/gorilla-bin/default.nix @@ -35,6 +35,7 @@ stdenv.mkDerivation rec { homepage = "https://github.com/zdia/gorilla/wiki"; maintainers = [ lib.maintainers.namore ]; platforms = [ "x86_64-linux" ]; + sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ]; license = lib.licenses.gpl2; }; } diff --git a/pkgs/tools/security/pcsc-scm-scl011/default.nix b/pkgs/tools/security/pcsc-scm-scl011/default.nix index aa1580e24598e..af3a95f0a2aac 100644 --- a/pkgs/tools/security/pcsc-scm-scl011/default.nix +++ b/pkgs/tools/security/pcsc-scm-scl011/default.nix @@ -41,6 +41,7 @@ stdenv.mkDerivation rec { description = "SCM Microsystems SCL011 chipcard reader user space driver"; homepage = "https://www.scm-pc-card.de/index.php?lang=en&page=product&function=show_product&product_id=630"; downloadPage = "https://support.identiv.com/scl010-scl011/"; + sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ]; license = licenses.unfreeRedistributable; maintainers = with maintainers; [ sephalon ]; platforms = platforms.linux; diff --git a/pkgs/tools/security/vault/vault-bin.nix b/pkgs/tools/security/vault/vault-bin.nix index 0e679ccb7afe1..b52d30e3dd633 100644 --- a/pkgs/tools/security/vault/vault-bin.nix +++ b/pkgs/tools/security/vault/vault-bin.nix @@ -54,6 +54,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "A tool for managing secrets, this binary includes the UI"; homepage = "https://www.vaultproject.io"; + sourceProvenance = with sourceTypes; [ binaryNativeCode ]; license = licenses.mpl20; maintainers = with maintainers; teams.serokell.members ++ [ offline psyanticy Chili-Man techknowlogick ]; mainProgram = "vault"; diff --git a/pkgs/tools/system/mlc/default.nix b/pkgs/tools/system/mlc/default.nix index 257cd31c0606d..447ab30d49758 100644 --- a/pkgs/tools/system/mlc/default.nix +++ b/pkgs/tools/system/mlc/default.nix @@ -23,6 +23,7 @@ stdenv.mkDerivation rec { meta = with lib; { homepage = "https://software.intel.com/content/www/us/en/develop/articles/intelr-memory-latency-checker.html"; description = "Intel Memory Latency Checker"; + sourceProvenance = with sourceTypes; [ binaryNativeCode ]; license = licenses.unfree; maintainers = with maintainers; [ basvandijk ]; platforms = with platforms; linux; diff --git a/pkgs/tools/text/gpt2tc/default.nix b/pkgs/tools/text/gpt2tc/default.nix index 4d6ac33d61d91..93cf684c1990b 100644 --- a/pkgs/tools/text/gpt2tc/default.nix +++ b/pkgs/tools/text/gpt2tc/default.nix @@ -37,6 +37,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "Text completion and compression using GPT-2"; homepage = "https://bellard.org/libnc/gpt2tc.html"; + sourceProvenance = with sourceTypes; [ binaryNativeCode ]; license = licenses.unfree; platforms = [ "x86_64-linux" ]; maintainers = with maintainers; [ anna328p ]; diff --git a/pkgs/tools/virtualization/ovftool/default.nix b/pkgs/tools/virtualization/ovftool/default.nix index c4b4acdbb48d3..9db01094bb301 100644 --- a/pkgs/tools/virtualization/ovftool/default.nix +++ b/pkgs/tools/virtualization/ovftool/default.nix @@ -179,6 +179,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "VMWare tools for working with OVF, OVA, and VMX images"; + sourceProvenance = with sourceTypes; [ binaryNativeCode ]; license = licenses.unfree; maintainers = with maintainers; [ numinit wolfangaukang ]; platforms = builtins.attrNames ovftoolSystems; diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index 24f0572f5e044..22efa20655eb0 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -1293,6 +1293,7 @@ mapAliases ({ smbclient = throw "'smbclient' has been renamed to/replaced by 'samba'"; # Converted to throw 2022-02-22 smugline = throw "smugline has been removed from nixpkgs, as it's unmaintained and depends on deprecated libraries"; # Added 2020-11-04 snack = throw "snack has been removed: broken for 5+ years"; # Added 2022-04-21 + soldat-unstable = opensoldat; # Added 2022-07-02 solr_8 = solr; # Added 2021-01-30 # Added 2020-02-10 diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index ddc13c945db5f..1218e36bb1ee1 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -4054,6 +4054,8 @@ with pkgs; lifeograph = callPackage ../applications/editors/lifeograph { }; + limitcpu = callPackage ../tools/misc/limitcpu { }; + link-grammar = callPackage ../tools/text/link-grammar { }; linuxptp = callPackage ../os-specific/linux/linuxptp { }; @@ -4979,6 +4981,8 @@ with pkgs; inherit (gnome) gnome-common; }; + m17-cxx-demod = callPackage ../applications/radio/m17-cxx-demod { }; + m17n_db = callPackage ../tools/inputmethods/m17n-db { }; m17n_lib = callPackage ../tools/inputmethods/m17n-lib { }; @@ -15169,7 +15173,8 @@ with pkgs; electron_15 electron_16 electron_17 - electron_18; + electron_18 + electron_19; autobuild = callPackage ../development/tools/misc/autobuild { }; @@ -23340,6 +23345,8 @@ with pkgs; # unstable until the first 1.x release fscrypt-experimental = callPackage ../os-specific/linux/fscrypt { }; + fsverity-utils = callPackage ../os-specific/linux/fsverity-utils { }; + fwanalyzer = callPackage ../tools/filesystems/fwanalyzer { }; fwupd = callPackage ../os-specific/linux/firmware/fwupd { }; @@ -32464,6 +32471,8 @@ with pkgs; openmw-tes3mp = libsForQt5.callPackage ../games/openmw/tes3mp.nix { }; + opensoldat = callPackage ../games/opensoldat { }; + portmod = callPackage ../games/portmod { }; tetrio-desktop = callPackage ../games/tetrio-desktop { }; @@ -32682,8 +32691,6 @@ with pkgs; solarus = libsForQt5.callPackage ../games/solarus { }; solarus-quest-editor = libsForQt5.callPackage ../development/tools/solarus-quest-editor { }; - soldat-unstable = callPackage ../games/soldat-unstable { }; - sollya = callPackage ../development/interpreters/sollya { }; # You still can override by passing more arguments. diff --git a/pkgs/top-level/python-aliases.nix b/pkgs/top-level/python-aliases.nix index a6c676ea60156..c1e4d27d3ff3d 100644 --- a/pkgs/top-level/python-aliases.nix +++ b/pkgs/top-level/python-aliases.nix @@ -117,6 +117,7 @@ mapAliases ({ pycallgraph = throw "pycallgraph has been removed, it was using setuptools 2to3 translation feature, which has been removed in setuptools 58"; # added 2022-01-18 pycryptodome-test-vectors = throw "pycryptodome-test-vectors has been removed because it is an internal package to pycryptodome"; # added 2022-05-28 pyialarmxr = pyialarmxr-homeassistant; # added 2022-06-07 + pyialarmxr-homeassistant = throw "The package was removed together with the component support in home-assistant 2022.7.0"; # added 2022-07-07 pylibgen = throw "pylibgen is unmaintained upstreamed, and removed from nixpkgs"; # added 2020-06-20 PyLD = pyld; # added 2022-06-22 pymc3 = pymc; # added 2022-06-05, module was rename starting with 4.0.0 diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 0006a47025ef2..df044ef44b38f 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -1618,6 +1618,8 @@ in { cgroup-utils = callPackage ../development/python-modules/cgroup-utils { }; + chacha20poly1305-reuseable = callPackage ../development/python-modules/chacha20poly1305-reuseable { }; + chai = callPackage ../development/python-modules/chai { }; chainer = callPackage ../development/python-modules/chainer { @@ -7519,8 +7521,6 @@ in { pyialarm = callPackage ../development/python-modules/pyialarm { }; - pyialarmxr-homeassistant = callPackage ../development/python-modules/pyialarmxr-homeassistant { }; - pyicloud = callPackage ../development/python-modules/pyicloud { }; PyICU = callPackage ../development/python-modules/pyicu { }; diff --git a/pkgs/top-level/release-haskell.nix b/pkgs/top-level/release-haskell.nix index 0777b448d5b4b..0d4100c25c137 100644 --- a/pkgs/top-level/release-haskell.nix +++ b/pkgs/top-level/release-haskell.nix @@ -381,9 +381,6 @@ let compilerNames.ghc902 compilerNames.ghc923 ]; - purescript = [ - compilerNames.ghc8107 - ]; purescript-cst = [ compilerNames.ghc8107 ]; |