Merge branch 'master' into staging-next

The purpose is to integrate the usual Haskell rebuild.
This commit is contained in:
Vladimír Čunát 2022-07-07 18:50:02 +02:00
commit c869aa9ac9
No known key found for this signature in database
GPG key ID: E747DF1F9575A3AA
124 changed files with 2175 additions and 1434 deletions

View file

@ -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";

View file

@ -20,6 +20,9 @@ in
path = with pkgs; [
csdr
digiham
codec2
js8call
m17-cxx-demod
alsaUtils
netcat
];

View file

@ -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" ];
};
}

View file

@ -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.

View file

@ -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;

View file

@ -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;
};
}

View file

@ -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,15 +5935,6 @@ let
sha512 = "x2284lgYvjOMj3Za7kqzRcUSxBboHqtgRE2zlos1qWaOye5yUmHn42LB1250NJBLRwEcdrB0JRwyPTEPhfQjiQ==";
};
};
"vue-eslint-parser-7.11.0" = {
name = "vue-eslint-parser";
packageName = "vue-eslint-parser";
version = "7.11.0";
src = fetchurl {
url = "https://registry.npmjs.org/vue-eslint-parser/-/vue-eslint-parser-7.11.0.tgz";
sha512 = "qh3VhDLeh773wjgNTl7ss0VejY9bMMa0GoDG2fQVyDzRFdiU3L7fw74tWZDHNQXdZqxO3EveQroa9ct39D2nqg==";
};
};
"vue-eslint-parser-8.3.0" = {
name = "vue-eslint-parser";
packageName = "vue-eslint-parser";
@ -6052,6 +5944,15 @@ let
sha512 = "dzHGG3+sYwSf6zFBa0Gi9ZDshD7+ad14DGOdTLjruRVgZXe2J+DcZ9iUhyR48z5g1PqRa20yt3Njna/veLJL/g==";
};
};
"vue-eslint-parser-9.0.2" = {
name = "vue-eslint-parser";
packageName = "vue-eslint-parser";
version = "9.0.2";
src = fetchurl {
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" = {
name = "vue-hot-reload-api";
packageName = "vue-hot-reload-api";
@ -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;

View file

@ -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 ];

View file

@ -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",

View file

@ -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;

View file

@ -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;

View file

@ -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 ];

View file

@ -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 = [

View file

@ -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;
};
}

View file

@ -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

View file

@ -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

View file

@ -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"
}

View file

@ -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 {

View file

@ -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 {

View file

@ -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.

View file

@ -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;
})

View file

@ -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;

View file

@ -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

View file

@ -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

View file

@ -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

View file

@ -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

View file

@ -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.

File diff suppressed because it is too large Load diff

View file

@ -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))

View file

@ -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

View file

@ -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 ];

View file

@ -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;
};
}

View file

@ -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

View file

@ -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; {

View file

@ -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 = [

View file

@ -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 = [

View file

@ -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 = [

View file

@ -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 ];
};
}

View file

@ -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 ];

View file

@ -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 = [

View file

@ -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 = [

View file

@ -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
];

View file

@ -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;

View file

@ -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 = [

View file

@ -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 = [

View file

@ -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:

View file

@ -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";

View file

@ -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

View file

@ -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 = [

View file

@ -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 = ''

View file

@ -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 ];
};
}

View file

@ -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 = [

View file

@ -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

View file

@ -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"
}
]

View file

@ -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 ];

View file

@ -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;

View file

@ -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 ];

View file

@ -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 = [

View file

@ -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 = [

View file

@ -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 ];

View file

@ -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 ];

View file

@ -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 = [

View file

@ -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 = [

View file

@ -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;

View file

@ -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; {

View file

@ -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"

View file

@ -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";
};
}

View file

@ -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;

View file

@ -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:

View file

@ -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 ];
};
}

View file

@ -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;

View file

@ -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 ];

View file

@ -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";

View file

@ -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

View file

@ -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
};
}

View file

@ -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()

View file

@ -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;
};
}

View file

@ -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)|" \

View file

@ -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 = {

View file

@ -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;

View file

@ -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"

View file

@ -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

View file

@ -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

View file

@ -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

View file

@ -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"
];

View file

@ -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 ];

View file

@ -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" ];

View file

@ -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" ];

View file

@ -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 ];

View file

@ -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 ];

View file

@ -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 ];

View file

@ -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" ];

View file

@ -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 ];

View file

@ -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 ];

View file

@ -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 ];

View file

@ -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

View file

@ -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";

View file

@ -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 ];

View file

@ -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;

View file

@ -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

Some files were not shown because too many files have changed in this diff Show more