diff options
Diffstat (limited to 'pkgs')
141 files changed, 1368 insertions, 992 deletions
diff --git a/pkgs/applications/audio/clementine/default.nix b/pkgs/applications/audio/clementine/default.nix index a7f58e0d68bb6..aa6c862641a4a 100644 --- a/pkgs/applications/audio/clementine/default.nix +++ b/pkgs/applications/audio/clementine/default.nix @@ -23,12 +23,11 @@ , libpulseaudio , gvfs , libcdio -, libechonest , libspotify , pcre , projectm , protobuf -, qca2 +, qca-qt5 , pkg-config , sparsehash , config @@ -87,13 +86,12 @@ let gst_all_1.gst-plugins-bad gst_all_1.gstreamer gvfs - libechonest liblastfm libpulseaudio pcre projectm protobuf - qca2 + qca-qt5 qjson qtbase qtx11extras diff --git a/pkgs/applications/blockchains/btcpayserver/default.nix b/pkgs/applications/blockchains/btcpayserver/default.nix index d983b9910e3b9..4acb4c448f52b 100644 --- a/pkgs/applications/blockchains/btcpayserver/default.nix +++ b/pkgs/applications/blockchains/btcpayserver/default.nix @@ -3,13 +3,13 @@ buildDotnetModule rec { pname = "btcpayserver"; - version = "1.5.1"; + version = "1.5.3"; src = fetchFromGitHub { owner = pname; repo = pname; rev = "v${version}"; - sha256 = "sha256-DcxRrVUen+JxMpiLDPfknpwCe962ifaekBeBnxJ0y88="; + sha256 = "sha256-jPR996MEBCTT3k12qOdW1AO8LxA/pvQnw0qiW6//lcs="; }; projectFile = "BTCPayServer/BTCPayServer.csproj"; diff --git a/pkgs/applications/blockchains/btcpayserver/deps.nix b/pkgs/applications/blockchains/btcpayserver/deps.nix index ceefa656de305..0a070407a6009 100644 --- a/pkgs/applications/blockchains/btcpayserver/deps.nix +++ b/pkgs/applications/blockchains/btcpayserver/deps.nix @@ -31,43 +31,43 @@ }) (fetchNuGet { pname = "BTCPayServer.Lightning.All"; - version = "1.3.6"; - sha256 = "0jdpqy6kxg0lyh4n88wsvrcqc0kk7s7zn5lw7ivwys716m69qrdl"; + version = "1.3.8"; + sha256 = "0xjhxxp8gc06ivbxjbmcacq4pq1c3l3b03pwd785kblxbh7d8zxj"; }) (fetchNuGet { pname = "BTCPayServer.Lightning.Charge"; - version = "1.3.2"; - sha256 = "0v5rss6dg7297kq1frhn2pj9gd0rd8g1p5d316x5wkd4w7pmrm2w"; + version = "1.3.4"; + sha256 = "1ic2kz9mpgcjkmj6a0kscn3iqqp905a4768bn2fx454swpn2w6f9"; }) (fetchNuGet { pname = "BTCPayServer.Lightning.CLightning"; - version = "1.3.2"; - sha256 = "0qs5p6pm54il23j8yysw0pzvrki37y6z8cd2gdknpz2f3wg7slm9"; + version = "1.3.5"; + sha256 = "0k9v28h0kvcbwxrjmalk14sna505li125i9aigcj6lddsg1d3xr7"; }) (fetchNuGet { pname = "BTCPayServer.Lightning.Common"; - version = "1.2.7"; - sha256 = "1hz4bn3aw537r253ipdpa6sydwhb6dh3r82xp1jizn9a6mnw54x6"; + version = "1.3.2"; + sha256 = "119zplkc7iy9wc95iz1qnyi42fr99ar4hp8a11p708a22w941yi0"; }) (fetchNuGet { pname = "BTCPayServer.Lightning.Common"; - version = "1.3.2"; - sha256 = "119zplkc7iy9wc95iz1qnyi42fr99ar4hp8a11p708a22w941yi0"; + version = "1.3.4"; + sha256 = "1bic7hxw731c0mkjgak0pwlrc7a4yqsr1xi7r3x04cz98nvdlqfc"; }) (fetchNuGet { pname = "BTCPayServer.Lightning.Eclair"; - version = "1.3.2"; - sha256 = "08gw1gqng1khxzvvhlwsg6lw1w56ylilg738wi6cbcwy7vl7f6bb"; + version = "1.3.4"; + sha256 = "0im3nzr7ki0nlr5miy7i7b9869vi7frq5g1idwfshqincpgps05g"; }) (fetchNuGet { pname = "BTCPayServer.Lightning.LNBank"; - version = "1.3.4"; - sha256 = "1vyz63pi5j31y8pz0b4hp9c4j249rszzfcymk3z3b2clwq32s4i4"; + version = "1.3.6"; + sha256 = "08myhnk41l1zc3ih1h8l6583g4spgfgl1i65sjp02ab9v4i9lalw"; }) (fetchNuGet { pname = "BTCPayServer.Lightning.LND"; - version = "1.3.3"; - sha256 = "137azpxxmp2q69bp07ky1jsgnfy9lf0dg5ba8l654flvvrgxaq6y"; + version = "1.3.5"; + sha256 = "1k5i4x382hx3zwczpjvzpxv4nmmlnnlaxcy018bz7b4hvd0l49wq"; }) (fetchNuGet { pname = "BuildBundlerMinifier"; @@ -181,8 +181,8 @@ }) (fetchNuGet { pname = "LNURL"; - version = "0.0.15"; - sha256 = "1fy6ywzqs5y9c6d156v08dg8c6689d5xb4y1ar7gqgz6f3cl842n"; + version = "0.0.18"; + sha256 = "1dy0if091s8j0klv58v8xy0lnwyw0mxl89m09wkfcs0d4kzmjsrj"; }) (fetchNuGet { pname = "MailKit"; @@ -210,6 +210,11 @@ sha256 = "1j0wbdmycj5xbk06p32f7xrddc40sbj3yca4d7ywg611yk26mvi1"; }) (fetchNuGet { + pname = "Microsoft.AspNet.WebApi.Client"; + version = "5.2.8"; + sha256 = "1dbwdbxr6npyc82zwl0g9bhifkpcqfzyhx1ihd8rzcmzprw70yfj"; + }) + (fetchNuGet { pname = "Microsoft.AspNetCore.Connections.Abstractions"; version = "3.1.10"; sha256 = "05drcgbpzq700kvxnfxha10w3jgfp2jp0r2h4hpczjxj6cywbbi6"; @@ -351,11 +356,6 @@ }) (fetchNuGet { pname = "Microsoft.CSharp"; - version = "4.3.0"; - sha256 = "0gw297dgkh0al1zxvgvncqs0j15lsna9l1wpqas4rflmys440xvb"; - }) - (fetchNuGet { - pname = "Microsoft.CSharp"; version = "4.5.0"; sha256 = "01i28nvzccxbqmiz217fxs6hnjwmd5fafs37rd49a6qp53y6623l"; }) @@ -836,11 +836,6 @@ }) (fetchNuGet { pname = "NBitcoin"; - version = "6.0.3"; - sha256 = "1kfq1q86844ssp8myy5vmvg33h3x0p9gqrlc99fl9gm1vzjc723f"; - }) - (fetchNuGet { - pname = "NBitcoin"; version = "6.0.8"; sha256 = "1f90zyrd35fzx0vgvd83jhd6hczd4037h2k198xiyxj04l4m3wm5"; }) @@ -881,11 +876,6 @@ }) (fetchNuGet { pname = "Newtonsoft.Json"; - version = "10.0.3"; - sha256 = "06vy67bkshclpz69kps4vgzc9h2cgg41c8vlqmdbwclfky7c4haq"; - }) - (fetchNuGet { - pname = "Newtonsoft.Json"; version = "11.0.2"; sha256 = "1784xi44f4k8v1fr696hsccmwpy94bz7kixxqlri98zhcxn406b2"; }) @@ -1081,18 +1071,18 @@ }) (fetchNuGet { pname = "Selenium.Support"; - version = "3.141.0"; - sha256 = "1gqwzbfq7i9jz830b0jibsis0qfxs8sl10n1nja02c6s637cwzib"; + version = "4.1.1"; + sha256 = "1bcvvcybbw22yv9bz10jdms5za2ajczil9kzwjh9zs6yy41gqnwl"; }) (fetchNuGet { pname = "Selenium.WebDriver.ChromeDriver"; - version = "100.0.4896.6000"; - sha256 = "1pfdvxjy4xiw1j7787lf07w9nr0dmj589vf6p4aqmk2cfz8j35c6"; + version = "101.0.4951.4100"; + sha256 = "0iqkcmfgzvir4h24qz3namgv7pc14hancb26gqa9j3izb1813ndf"; }) (fetchNuGet { pname = "Selenium.WebDriver"; - version = "3.141.0"; - sha256 = "09g0zhz6n7yhxmxlrpzjdykfavr3m4z1gb4cmq304dw0gr8s89mq"; + version = "4.1.1"; + sha256 = "0gavlsanyiff9rxn34cinv0q2m3a8wh66ynlm9mxwkmmybzbbqz4"; }) (fetchNuGet { pname = "Serilog.AspNetCore"; @@ -1210,16 +1200,6 @@ sha256 = "1js98kmjn47ivcvkjqdmyipzknb9xbndssczm8gq224pbaj1p88c"; }) (fetchNuGet { - pname = "System.Collections.NonGeneric"; - version = "4.3.0"; - sha256 = "07q3k0hf3mrcjzwj8fwk6gv3n51cb513w4mgkfxzm3i37sc9kz7k"; - }) - (fetchNuGet { - pname = "System.Collections.Specialized"; - version = "4.3.0"; - sha256 = "1sdwkma4f6j85m3dpb53v9vcgd0zyc9jb33f8g63byvijcj39n20"; - }) - (fetchNuGet { pname = "System.Collections"; version = "4.0.11"; sha256 = "1ga40f5lrwldiyw6vy67d0sg7jd7ww6kgwbksm19wrvq9hr0bsm6"; @@ -1230,21 +1210,6 @@ sha256 = "19r4y64dqyrq6k4706dnyhhw7fs24kpp3awak7whzss39dakpxk9"; }) (fetchNuGet { - pname = "System.ComponentModel.Primitives"; - version = "4.3.0"; - sha256 = "1svfmcmgs0w0z9xdw2f2ps05rdxmkxxhf0l17xk9l1l8xfahkqr0"; - }) - (fetchNuGet { - pname = "System.ComponentModel.TypeConverter"; - version = "4.3.0"; - sha256 = "17ng0p7v3nbrg3kycz10aqrrlw4lz9hzhws09pfh8gkwicyy481x"; - }) - (fetchNuGet { - pname = "System.ComponentModel"; - version = "4.3.0"; - sha256 = "0986b10ww3nshy30x9sjyzm0jx339dkjxjj3401r3q0f6fx2wkcb"; - }) - (fetchNuGet { pname = "System.Configuration.ConfigurationManager"; version = "4.5.0"; sha256 = "1frpy24mn6q7hgwayj98kkx89z861f5dmia4j6zc0a2ydgx8x02c"; @@ -1305,11 +1270,6 @@ sha256 = "1pla2dx8gkidf7xkciig6nifdsb494axjvzvann8g2lp3dbqasm9"; }) (fetchNuGet { - pname = "System.Dynamic.Runtime"; - version = "4.3.0"; - sha256 = "1d951hrvrpndk7insiag80qxjbf2y0y39y8h5hnq9612ws661glk"; - }) - (fetchNuGet { pname = "System.Formats.Asn1"; version = "5.0.0"; sha256 = "1axc8z0839yvqi2cb63l73l6d9j6wd20lsbdymwddz9hvrsgfwpn"; @@ -1670,21 +1630,11 @@ sha256 = "19rav39sr5dky7afygh309qamqqmi9kcwvz3i0c5700v0c5cg61z"; }) (fetchNuGet { - pname = "System.Runtime.Serialization.Formatters"; - version = "4.3.0"; - sha256 = "114j35n8gcvn3sqv9ar36r1jjq0y1yws9r0yk8i6wm4aq7n9rs0m"; - }) - (fetchNuGet { pname = "System.Runtime.Serialization.Primitives"; version = "4.1.1"; sha256 = "042rfjixknlr6r10vx2pgf56yming8lkjikamg3g4v29ikk78h7k"; }) (fetchNuGet { - pname = "System.Runtime.Serialization.Primitives"; - version = "4.3.0"; - sha256 = "01vv2p8h4hsz217xxs0rixvb7f2xzbh6wv1gzbfykcbfrza6dvnf"; - }) - (fetchNuGet { pname = "System.Runtime"; version = "4.1.0"; sha256 = "02hdkgk13rvsd6r9yafbwzss8kr55wnj8d5c7xjnp8gqrwc8sn0m"; @@ -1960,11 +1910,6 @@ sha256 = "0ihsnkvyc76r4dcky7v3ansnbyqjzkbyyia0ir5zvqirzan0bnl1"; }) (fetchNuGet { - pname = "System.Xml.XmlDocument"; - version = "4.3.0"; - sha256 = "0bmz1l06dihx52jxjr22dyv5mxv6pj4852lx68grjm7bivhrbfwi"; - }) - (fetchNuGet { pname = "System.Xml.XPath.XmlDocument"; version = "4.0.1"; sha256 = "0l7yljgif41iv5g56l3nxy97hzzgck2a7rhnfnljhx9b0ry41bvc"; diff --git a/pkgs/applications/blockchains/nbxplorer/default.nix b/pkgs/applications/blockchains/nbxplorer/default.nix index b7a517c3dbef1..4d684f6a93505 100644 --- a/pkgs/applications/blockchains/nbxplorer/default.nix +++ b/pkgs/applications/blockchains/nbxplorer/default.nix @@ -2,13 +2,13 @@ buildDotnetModule rec { pname = "nbxplorer"; - version = "2.3.20"; + version = "2.3.26"; src = fetchFromGitHub { owner = "dgarage"; repo = "NBXplorer"; rev = "v${version}"; - sha256 = "sha256-cAko5s1bFSI7HOcXg/tZtdMMe0S9zkRBeZ6bispxgwc="; + sha256 = "sha256-PaunSwbIf9hGmZeS8ZI4M0C6T76bLCalnS4/x9TWrtY="; }; projectFile = "NBXplorer/NBXplorer.csproj"; diff --git a/pkgs/applications/blockchains/nbxplorer/util/create-deps.sh b/pkgs/applications/blockchains/nbxplorer/util/create-deps.sh index 2d3f41f25866c..2a862c31c881e 100755 --- a/pkgs/applications/blockchains/nbxplorer/util/create-deps.sh +++ b/pkgs/applications/blockchains/nbxplorer/util/create-deps.sh @@ -1,5 +1,5 @@ #!/usr/bin/env nix-shell -#!nix-shell -i bash -p dotnet-sdk_3 +#!nix-shell -i bash -p dotnet-sdk_6 set -euo pipefail # Writes deps for dotnet package in $pkgSrc to $depsFile. diff --git a/pkgs/applications/blockchains/nbxplorer/util/update-common.sh b/pkgs/applications/blockchains/nbxplorer/util/update-common.sh index 1ca9ef3444b5e..033a7bbf4b6fc 100755 --- a/pkgs/applications/blockchains/nbxplorer/util/update-common.sh +++ b/pkgs/applications/blockchains/nbxplorer/util/update-common.sh @@ -1,11 +1,13 @@ #!/usr/bin/env nix-shell -#!nix-shell -i bash -p coreutils curl jq common-updater-scripts dotnet-sdk_3 git gnupg nixFlakes +#!nix-shell -i bash -p coreutils curl jq common-updater-scripts dotnet-sdk_6 git gnupg nixFlakes set -euo pipefail # This script uses the following env vars: # getVersionFromTags # refetch +trap 'echo "Error at ${BASH_SOURCE[0]}:$LINENO"' ERR + pkgName=$1 depsFile=$2 customFlags=$3 diff --git a/pkgs/applications/editors/apostrophe/default.nix b/pkgs/applications/editors/apostrophe/default.nix index ce8d32f465e29..fc6ddd93567c4 100644 --- a/pkgs/applications/editors/apostrophe/default.nix +++ b/pkgs/applications/editors/apostrophe/default.nix @@ -13,14 +13,14 @@ let in stdenv.mkDerivation rec { pname = "apostrophe"; - version = "2.6.2"; + version = "2.6.3"; src = fetchFromGitLab { owner = "World"; repo = pname; domain = "gitlab.gnome.org"; rev = "v${version}"; - sha256 = "sha256-At3kaVJE07j/QWXerYnvxleE2Cbn0FjlBXH69tkuFys="; + sha256 = "sha256-RBrrG1TO810LidIelYGNaK7PjDq84D0cA8VcMojAW3M="; }; nativeBuildInputs = [ meson ninja pkg-config desktop-file-utils diff --git a/pkgs/applications/editors/setzer/default.nix b/pkgs/applications/editors/setzer/default.nix index cc1d08cc3f9b6..10fb4e0a97e65 100644 --- a/pkgs/applications/editors/setzer/default.nix +++ b/pkgs/applications/editors/setzer/default.nix @@ -51,7 +51,7 @@ python3.pkgs.buildPythonApplication rec { propagatedBuildInputs = with python3.pkgs; [ pygobject3 pyxdg - pdfminer + pdfminer-six pycairo pexpect ]; diff --git a/pkgs/applications/editors/vscode/extensions/default.nix b/pkgs/applications/editors/vscode/extensions/default.nix index ac8ae6885625d..21c1187c4ad46 100644 --- a/pkgs/applications/editors/vscode/extensions/default.nix +++ b/pkgs/applications/editors/vscode/extensions/default.nix @@ -1700,7 +1700,8 @@ let }; }; - matklad.rust-analyzer = callPackage ./rust-analyzer { }; + rust-lang.rust-analyzer = callPackage ./rust-analyzer { }; + matklad.rust-analyzer = self.rust-lang.rust-analyzer; # Previous publisher ocamllabs.ocaml-platform = buildVscodeMarketplaceExtension { meta = with lib; { diff --git a/pkgs/applications/misc/visidata/default.nix b/pkgs/applications/misc/visidata/default.nix index 99657d60bd703..e73c6e7b5dc3a 100644 --- a/pkgs/applications/misc/visidata/default.nix +++ b/pkgs/applications/misc/visidata/default.nix @@ -14,7 +14,7 @@ , pyshp , fonttools , pyyaml -, pdfminer +, pdfminer-six , vobject , tabulate , wcwidth @@ -55,7 +55,7 @@ buildPythonApplication rec { pyyaml #namestand #datapackage - pdfminer + pdfminer-six #tabula vobject tabulate diff --git a/pkgs/applications/networking/breitbandmessung/default.nix b/pkgs/applications/networking/breitbandmessung/default.nix index 31f33be38670e..ff14695cce845 100644 --- a/pkgs/applications/networking/breitbandmessung/default.nix +++ b/pkgs/applications/networking/breitbandmessung/default.nix @@ -1,32 +1,12 @@ { lib , stdenv -, alsa-lib -, at-spi2-atk -, at-spi2-core -, atk -, autoPatchelfHook -, cairo -, cups -, dbus -, dpkg -, expat , fetchurl -, gdk-pixbuf -, glib -, gtk3 -, libdrm -, libxkbcommon +, dpkg +, electron_16 , makeWrapper -, mesa , nixosTests -, nspr -, nss -, pango -, pciutils -, systemd +, nodePackages , undmg -, writeShellScriptBin -, xorg }: let @@ -34,19 +14,6 @@ let version = "3.1.0"; - # At first start, the program checks for supported operating systems by calling `lsb_release -a` - # and only runs when it finds Debian/Ubuntu. So we present us as Debian an make it happy. - fake-lsb-release = writeShellScriptBin "lsb_release" '' - echo "Distributor ID: Debian" - echo "Description: Debian GNU/Linux 10 (buster)" - echo "Release: 10" - echo "Codename: buster" - ''; - - binPath = lib.makeBinPath [ - fake-lsb-release - ]; - systemArgs = rec { x86_64-linux = rec { src = fetchurl { @@ -54,68 +21,41 @@ let sha256 = "sha256-jSP+H9ej9Wd+swBZSy9uMi2ExSTZ191FGZhqaocTl7w="; }; - dontUnpack = true; - nativeBuildInputs = [ - autoPatchelfHook dpkg makeWrapper + nodePackages.asar ]; - buildInputs = runtimeDependencies; - - runtimeDependencies = [ - alsa-lib - at-spi2-atk - at-spi2-core - atk - cairo - cups - dbus - expat - gdk-pixbuf - glib - gtk3 - libdrm - libxkbcommon - mesa - nspr - nss - pango - pciutils - systemd - xorg.libX11 - xorg.libXcomposite - xorg.libXdamage - xorg.libXext - xorg.libXfixes - xorg.libXrandr - xorg.libxcb - xorg.libxshmfence - ]; + unpackPhase = "dpkg-deb -x $src ."; installPhase = '' - dpkg-deb -x $src $out mkdir -p $out/bin - - chmod -R g-w $out - - addAutoPatchelfSearchPath --no-recurse $out/opt/Breitbandmessung - autoPatchelfFile $out/opt/Breitbandmessung/breitbandmessung - - makeWrapper $out/opt/Breitbandmessung/breitbandmessung $out/bin/breitbandmessung \ - --prefix PATH : ${binPath} - - mv $out/usr/share $out/share - rmdir $out/usr + mv usr/share $out/share + mkdir -p $out/share/breitbandmessung/resources + + asar e opt/Breitbandmessung/resources/app.asar $out/share/breitbandmessung/resources + + # At first start, the program checks for supported operating systems by using the `bizzby-lsb-release` + # module and only runs when it finds Debian/Ubuntu. So we present us as Debian and make it happy. + cat <<EOF > $out/share/breitbandmessung/resources/node_modules/bizzby-lsb-release/lib/lsb-release.js + module.exports = function release() { + return { + distributorID: "Debian", + description: "Debian GNU/Linux 10 (buster)", + release: "10", + codename: "buster" + } + } + EOF + + makeWrapper ${electron_16}/bin/electron $out/bin/breitbandmessung \ + --add-flags $out/share/breitbandmessung/resources/build/electron.js # Fix the desktop link substituteInPlace $out/share/applications/breitbandmessung.desktop \ --replace /opt/Breitbandmessung $out/bin ''; - - dontAutoPatchelf = true; - dontPatchELF = true; }; x86_64-darwin = { diff --git a/pkgs/applications/networking/browsers/asuka/default.nix b/pkgs/applications/networking/browsers/asuka/default.nix index 54b8a1d315694..a89d2bb36e877 100644 --- a/pkgs/applications/networking/browsers/asuka/default.nix +++ b/pkgs/applications/networking/browsers/asuka/default.nix @@ -2,16 +2,16 @@ rustPlatform.buildRustPackage rec { pname = "asuka"; - version = "0.8.3"; + version = "0.8.5"; src = fetchFromSourcehut { owner = "~julienxx"; repo = pname; rev = version; - sha256 = "sha256-l3SgIyApASllHVhAc2yoUYc2x7QtCdzBrMYaXCp65m8="; + sha256 = "sha256-+rj6P3ejc4Qb/uqbf3N9MqyqDT7yg9JFE0yfW/uzd6M="; }; - cargoSha256 = "sha256-twECZM1KcWeQptLhlKlIz16r3Q/xMb0e+lBG+EX79mU="; + cargoSha256 = "sha256-XrFpvH3qiMvpgbH7Q+KC1zFAqJT4rjxux6Q5KLY2ufI="; nativeBuildInputs = [ pkg-config ]; diff --git a/pkgs/applications/networking/browsers/chromium/common.nix b/pkgs/applications/networking/browsers/chromium/common.nix index 993f95a6bfffb..cfd6b122d6cc7 100644 --- a/pkgs/applications/networking/browsers/chromium/common.nix +++ b/pkgs/applications/networking/browsers/chromium/common.nix @@ -166,7 +166,7 @@ let ./patches/m102-fix-dawn_version_generator-failure.patch ]; - postPatch = optionalString (chromiumVersionAtLeast "102") '' + postPatch = '' # Workaround/fix for https://bugs.chromium.org/p/chromium/issues/detail?id=1313361: substituteInPlace BUILD.gn \ --replace '"//infra/orchestrator:orchestrator_all",' "" @@ -174,7 +174,6 @@ let substituteInPlace build/config/compiler/BUILD.gn \ --replace '"-Xclang",' "" \ --replace '"-no-opaque-pointers",' "" - '' + '' # remove unused third-party for lib in ${toString gnSystemLibraries}; do if [ -d "third_party/$lib" ]; then @@ -194,7 +193,7 @@ let --replace "/usr/bin/env -S make -f" "/usr/bin/make -f" fi chmod -x third_party/webgpu-cts/src/tools/run_deno - ${lib.optionalString (chromiumVersionAtLeast "102") "chmod -x third_party/dawn/third_party/webgpu-cts/tools/run_deno"} + chmod -x third_party/dawn/third_party/webgpu-cts/tools/run_deno # We want to be able to specify where the sandbox is via CHROME_DEVEL_SANDBOX substituteInPlace sandbox/linux/suid/client/setuid_sandbox_host.cc \ diff --git a/pkgs/applications/networking/browsers/chromium/upstream-info.json b/pkgs/applications/networking/browsers/chromium/upstream-info.json index ba54f13ef1336..6cc8e60a39c1a 100644 --- a/pkgs/applications/networking/browsers/chromium/upstream-info.json +++ b/pkgs/applications/networking/browsers/chromium/upstream-info.json @@ -32,9 +32,9 @@ } }, "dev": { - "version": "103.0.5060.13", - "sha256": "1y7nadfmw4yxc2za7ln3h7xywlzdiscmsa8kjar17gmqz6ic69id", - "sha256bin64": "0crs07sjqhgpr22vxa7c52ai8xvxp6c4cs82kaqzc5cgg97076gq", + "version": "103.0.5060.24", + "sha256": "1vdnq7vd0jdxkpc00xwvvk1mmyq2hcydms64l16nv3v8jgvizrha", + "sha256bin64": "0590ffrbpnd4v8z1wzn1baqvj59gx2yc3zp3qvhvmfrdmxz9i9b4", "deps": { "gn": { "version": "2022-05-11", @@ -45,19 +45,19 @@ } }, "ungoogled-chromium": { - "version": "101.0.4951.64", - "sha256": "1xyqm32y9v1hn8ji6qfw6maynqgg3266j58dq4x4aqsm2gj9cn4w", - "sha256bin64": "14ijrj7h2y72ppyysz6jv40c01lbnan7z69cl24asch2zjlgwv8v", + "version": "102.0.5005.61", + "sha256": "07vbi3gn9g4n04b2qi2hm34r122snrqaifa46yk3pyh1d79rfdqs", + "sha256bin64": "100n8k3d9k5bq58irc36ig6m5m0lxggffyk4crqqqcib2anqd0zv", "deps": { "gn": { - "version": "2022-03-14", + "version": "2022-04-14", "url": "https://gn.googlesource.com/gn", - "rev": "bd99dbf98cbdefe18a4128189665c5761263bcfb", - "sha256": "0nql15ckjqkm001xajq3qyn4h4q80i7x6dm9zinxxr1a8q5lppx3" + "rev": "fd9f2036f26d83f9fcfe93042fb952e5a7fe2167", + "sha256": "0b5xs0chcv3hfhy71rycsmgxnqbm375a333hwav8929k9cbi5p9h" }, "ungoogled-patches": { - "rev": "101.0.4951.64-1", - "sha256": "0k7w6xvjf1yzyak9ywvcdw762d8zbx6d8haz35q87jz0mxfn2mr3" + "rev": "102.0.5005.61-1", + "sha256": "1hlyi6k894blkkqmqsizx72bag2vj6wlpza0fvi8db5wp6i5b58g" } } } diff --git a/pkgs/applications/networking/browsers/elinks/default.nix b/pkgs/applications/networking/browsers/elinks/default.nix index 84f46f1b60d89..1daa5d351a8c8 100644 --- a/pkgs/applications/networking/browsers/elinks/default.nix +++ b/pkgs/applications/networking/browsers/elinks/default.nix @@ -4,7 +4,7 @@ , # Incompatible licenses, LGPLv3 - GPLv2 enableGuile ? false, guile ? null , enablePython ? false, python ? null -, enablePerl ? (stdenv.hostPlatform == stdenv.buildPlatform), perl ? null +, enablePerl ? (!stdenv.isDarwin) && (stdenv.hostPlatform == stdenv.buildPlatform), perl ? null # re-add javascript support when upstream supports modern spidermonkey }: diff --git a/pkgs/applications/networking/flexget/default.nix b/pkgs/applications/networking/flexget/default.nix index 642fbc5ed7b2e..32b785c5cfb20 100644 --- a/pkgs/applications/networking/flexget/default.nix +++ b/pkgs/applications/networking/flexget/default.nix @@ -5,14 +5,14 @@ python3Packages.buildPythonApplication rec { pname = "flexget"; - version = "3.3.13"; + version = "3.3.14"; # Fetch from GitHub in order to use `requirements.in` src = fetchFromGitHub { owner = "flexget"; repo = "flexget"; rev = "refs/tags/v${version}"; - hash = "sha256-QfsHVP2FIp2kn6blKbeerNxUOWXbxpgRkSBGorViVYs="; + hash = "sha256-v52QVyd2Rl1nixKD1TY1YQaSPKRsbw4BCtfRly9aMrM="; }; postPatch = '' diff --git a/pkgs/applications/networking/instant-messengers/gajim/default.nix b/pkgs/applications/networking/instant-messengers/gajim/default.nix index aad4b24d74045..24b65db364d0a 100644 --- a/pkgs/applications/networking/instant-messengers/gajim/default.nix +++ b/pkgs/applications/networking/instant-messengers/gajim/default.nix @@ -43,21 +43,6 @@ python3.pkgs.buildPythonApplication rec { gettext wrapGAppsHook ]; - # Workaround for https://dev.gajim.org/gajim/gajim/-/issues/10719. - # We don't use plugin release URL because it's updated in place. - plugins = fetchFromGitLab { - domain = "dev.gajim.org"; - owner = "gajim"; - repo = "gajim-plugins"; - rev = "fea522e4360cec6ceacbf1df92644ab3343d4b99"; - sha256 = "sha256-CmwEiLsdldoOfgHfWL/5hf/dp0HEDNAIlc5N0Np20KE="; - }; - - postPatch = '' - mkdir -p gajim/data/plugins - cp -r $plugins/plugin_installer gajim/data/plugins - ''; - dontWrapGApps = true; preFixup = '' @@ -65,7 +50,7 @@ python3.pkgs.buildPythonApplication rec { ''; propagatedBuildInputs = with python3.pkgs; [ - nbxmpp pygobject3 dbus-python pillow css-parser precis-i18n keyring setuptools packaging + nbxmpp pygobject3 dbus-python pillow css-parser precis-i18n keyring setuptools packaging gssapi ] ++ lib.optionals enableE2E [ pycrypto python-gnupg ] ++ lib.optional enableRST docutils ++ lib.optionals enableOmemoPluginDependencies [ python-axolotl qrcode ] @@ -88,7 +73,7 @@ python3.pkgs.buildPythonApplication rec { description = "Jabber client written in PyGTK"; license = lib.licenses.gpl3Plus; maintainers = with lib.maintainers; [ raskin abbradar ]; - downloadPage = "http://gajim.org/downloads.php"; + downloadPage = "http://gajim.org/download/"; platforms = lib.platforms.linux; }; } diff --git a/pkgs/applications/networking/mailreaders/mailspring/default.nix b/pkgs/applications/networking/mailreaders/mailspring/default.nix index b522b51906397..4bc80b84b8470 100644 --- a/pkgs/applications/networking/mailreaders/mailspring/default.nix +++ b/pkgs/applications/networking/mailreaders/mailspring/default.nix @@ -21,11 +21,11 @@ stdenv.mkDerivation rec { pname = "mailspring"; - version = "1.10.2"; + version = "1.10.3"; src = fetchurl { url = "https://github.com/Foundry376/Mailspring/releases/download/${version}/mailspring-${version}-amd64.deb"; - sha256 = "sha256-6KHhkmHWhj/AgECYqNuJ0iSPEYyuBDac/3fW6J0fgTg="; + sha256 = "sha256-+H2KeaRBApveUG6Vz+Z8LWpmNpZ4lwyeX1LK0AKx/bw="; }; nativeBuildInputs = [ diff --git a/pkgs/applications/networking/wgcf/default.nix b/pkgs/applications/networking/wgcf/default.nix new file mode 100644 index 0000000000000..3487ad6395cf5 --- /dev/null +++ b/pkgs/applications/networking/wgcf/default.nix @@ -0,0 +1,25 @@ +{ lib, buildGoModule, fetchFromGitHub }: + +buildGoModule rec { + pname = "wgcf"; + version = "2.2.14"; + + src = fetchFromGitHub { + owner = "ViRb3"; + repo = pname; + rev = "v${version}"; + hash = "sha256-6V4fIoFB0fuCEu1Rj8QWGDNdgystrD/gefjbshvxVsw="; + }; + + subPackages = "."; + + vendorSha256 = "sha256-NGlV/qcnUlNLvt3uVRdfx+lUDgqAEBEowW9WIHBY+AI="; + + meta = with lib; { + description = "Cross-platform, unofficial CLI for Cloudflare Warp"; + homepage = "https://github.com/ViRb3/wgcf"; + license = licenses.mit; + platforms = platforms.unix; + maintainers = with maintainers; [ yureien ]; + }; +} diff --git a/pkgs/applications/office/paperless-ngx/default.nix b/pkgs/applications/office/paperless-ngx/default.nix index 358b66fb589a2..2b07b9bd47b3c 100644 --- a/pkgs/applications/office/paperless-ngx/default.nix +++ b/pkgs/applications/office/paperless-ngx/default.nix @@ -92,7 +92,7 @@ py.pkgs.pythonPackages.buildPythonApplication rec { numpy ocrmypdf pathvalidate - pdfminer + pdfminer-six pikepdf pillow pluggy diff --git a/pkgs/applications/office/scribus/1_4.nix b/pkgs/applications/office/scribus/1_4.nix new file mode 100644 index 0000000000000..a6427d0f890b8 --- /dev/null +++ b/pkgs/applications/office/scribus/1_4.nix @@ -0,0 +1,52 @@ +{ lib, stdenv, fetchurl, pkg-config, freetype, lcms, libtiff, libxml2 +, libart_lgpl, qt4, python2, cups, fontconfig, libjpeg +, zlib, libpng, xorg, cairo, podofo, hunspell, boost, cmake, imagemagick, ghostscript }: + +let + icon = fetchurl { + url = "https://gist.githubusercontent.com/ejpcmac/a74b762026c9bc4000be624c3d085517/raw/18edc497c5cb6fdeef1c8aede37a0ee68413f9d3/scribus-icon-centered.svg"; + sha256 = "0hq3i7c2l50445an9glhhg47kj26y16svfajc6naqn307ph9vzc3"; + }; + + pythonEnv = python2.withPackages(ps: [ps.tkinter ps.pillow]); +in stdenv.mkDerivation rec { + pname = "scribus"; + version = "1.4.8"; + + src = fetchurl { + url = "mirror://sourceforge/${pname}/${pname}/${pname}-${version}.tar.xz"; + sha256 = "0bq433myw6h1siqlsakxv6ghb002rp3mfz5k12bg68s0k6skn992"; + }; + + nativeBuildInputs = [ pkg-config cmake ]; + buildInputs = with xorg; + [ freetype lcms libtiff libxml2 libart_lgpl qt4 + pythonEnv cups fontconfig + libjpeg zlib libpng podofo hunspell cairo + boost # for internal 2geom library + libXaw libXext libX11 libXtst libXi libXinerama + libpthreadstubs libXau libXdmcp + imagemagick # To build the icon + ]; + + postPatch = '' + substituteInPlace scribus/util_ghostscript.cpp \ + --replace 'QString gsName("gs");' \ + 'QString gsName("${ghostscript}/bin/gs");' + ''; + + postInstall = '' + for i in 16 24 48 64 96 128 256 512; do + mkdir -p $out/share/icons/hicolor/''${i}x''${i}/apps + convert -background none -resize ''${i}x''${i} ${icon} $out/share/icons/hicolor/''${i}x''${i}/apps/scribus.png + done + ''; + + meta = { + maintainers = [ lib.maintainers.marcweber ]; + platforms = lib.platforms.linux; + description = "Desktop Publishing (DTP) and Layout program for Linux"; + homepage = "https://www.scribus.net"; + license = lib.licenses.gpl2; + }; +} diff --git a/pkgs/applications/office/scribus/default.nix b/pkgs/applications/office/scribus/default.nix index a6427d0f890b8..d3f706bbf0549 100644 --- a/pkgs/applications/office/scribus/default.nix +++ b/pkgs/applications/office/scribus/default.nix @@ -1,52 +1,143 @@ -{ lib, stdenv, fetchurl, pkg-config, freetype, lcms, libtiff, libxml2 -, libart_lgpl, qt4, python2, cups, fontconfig, libjpeg -, zlib, libpng, xorg, cairo, podofo, hunspell, boost, cmake, imagemagick, ghostscript }: +{ boost +, cairo +, cmake +, cups +, fetchurl +, fetchpatch +, fontconfig +, freetype +, harfbuzzFull +, hunspell +, lcms2 +, libjpeg +, libtiff +, libxml2 +, mkDerivation +, pixman +, pkg-config +, podofo +, poppler +, poppler_data +, python3 +, qtbase +, qtimageformats +, qttools +, lib +}: let - icon = fetchurl { - url = "https://gist.githubusercontent.com/ejpcmac/a74b762026c9bc4000be624c3d085517/raw/18edc497c5cb6fdeef1c8aede37a0ee68413f9d3/scribus-icon-centered.svg"; - sha256 = "0hq3i7c2l50445an9glhhg47kj26y16svfajc6naqn307ph9vzc3"; - }; - - pythonEnv = python2.withPackages(ps: [ps.tkinter ps.pillow]); -in stdenv.mkDerivation rec { + pythonEnv = python3.withPackages ( + ps: [ + ps.pillow + ps.tkinter + ] + ); +in +mkDerivation rec { pname = "scribus"; - version = "1.4.8"; + + version = "1.5.7"; src = fetchurl { - url = "mirror://sourceforge/${pname}/${pname}/${pname}-${version}.tar.xz"; - sha256 = "0bq433myw6h1siqlsakxv6ghb002rp3mfz5k12bg68s0k6skn992"; + url = "mirror://sourceforge/${pname}/${pname}-devel/${pname}-${version}.tar.xz"; + sha256 = "sha256-MYMWss/Hp2GR0+DT+MImUUfa6gVwFiAo4kPCktgm+M4="; }; - nativeBuildInputs = [ pkg-config cmake ]; - buildInputs = with xorg; - [ freetype lcms libtiff libxml2 libart_lgpl qt4 - pythonEnv cups fontconfig - libjpeg zlib libpng podofo hunspell cairo - boost # for internal 2geom library - libXaw libXext libX11 libXtst libXi libXinerama - libpthreadstubs libXau libXdmcp - imagemagick # To build the icon - ]; + patches = [ + # For harfbuzz >= 2.9.0 + (fetchpatch { + url = "https://github.com/scribusproject/scribus/commit/1b546978bc4ea0b2a73fbe4d7cf947887e865162.patch"; + sha256 = "sha256-noRCaN63ZYFfXmAluEYXdFPNOk3s5W3KBAsLU1Syxv4="; + }) + # For harfbuzz >= 3.0 + (fetchpatch { + url = "https://github.com/scribusproject/scribus/commit/68ec41169eaceea4a6e1d6f359762a191c7e61d5.patch"; + sha256 = "sha256-xhp65qVvaof0md1jb3XHZw7uFX1RtNxPfUOaVnvZV1Y="; + }) + # For Poppler 22.02 + (fetchpatch { + url = "https://github.com/scribusproject/scribus/commit/85c0dff3422fa3c26fbc2e8d8561f597ec24bd92.patch"; + sha256 = "YR0ii09EVU8Qazz6b8KAIWsUMTwPIwO8JuQPymAWKdw="; + }) + (fetchpatch { + url = "https://github.com/scribusproject/scribus/commit/f75c1613db67f4067643d0218a2db3235e42ec9f.patch"; + sha256 = "vJU8HsKHE3oXlhcXQk9uCYINPYVPF5IGmrWYFQ6Py5c="; + }) + # For Poppler 22.03 + (fetchpatch { + url = "https://github.com/scribusproject/scribus/commit/553d1fd5f76ffb3743583b88c78a7232b076a965.patch"; + sha256 = "56JrEG3eCzyALTH04yjzurKRj2PocpjO6b4PusMRxjY="; + }) + (fetchpatch { + url = "https://github.com/scribusproject/scribus/commit/1f82e38be0782b065910f5fb4cece23f690349ae.patch"; + sha256 = "qektUfel5KeA327D3THyqi8dznP1SQQFToUC5Kd0+W4="; + }) + (fetchpatch { + url = "https://github.com/scribusproject/scribus/commit/f19410ac3b27e33dd62105746784e61e85b90a1d.patch"; + sha256 = "JHdgntYcioYatPeqpmym3c9dORahj0CinGOzbGtA4ds="; + }) + (fetchpatch { + url = "https://github.com/scribusproject/scribus/commit/e013e8126d2100e8e56dea5b836ad43275429389.patch"; + sha256 = "+siPNtJq9Is9V2PgADeQJB+b4lkl5g8uk6zKBu10Jqw="; + }) + (fetchpatch { + url = "https://github.com/scribusproject/scribus/commit/48263954a7dee0be815b00f417ae365ab26cdd85.patch"; + sha256 = "1WE9kALFw79bQH88NUafXaZ1Y/vJEKTIWxlk5c+opsQ="; + }) + # For Poppler 22.04 + (fetchpatch { + url = "https://github.com/scribusproject/scribus/commit/f2237b8f0b5cf7690e864a22ef7a63a6d769fa36.patch"; + sha256 = "FXpLoX/a2Jy3GcfzrUUyVUfEAp5wAy2UfzfVA5lhwJw="; + }) + ]; + + nativeBuildInputs = [ + cmake + pkg-config + ]; - postPatch = '' - substituteInPlace scribus/util_ghostscript.cpp \ - --replace 'QString gsName("gs");' \ - 'QString gsName("${ghostscript}/bin/gs");' - ''; - - postInstall = '' - for i in 16 24 48 64 96 128 256 512; do - mkdir -p $out/share/icons/hicolor/''${i}x''${i}/apps - convert -background none -resize ''${i}x''${i} ${icon} $out/share/icons/hicolor/''${i}x''${i}/apps/scribus.png - done - ''; - - meta = { - maintainers = [ lib.maintainers.marcweber ]; - platforms = lib.platforms.linux; + buildInputs = [ + boost + cairo + cups + fontconfig + freetype + harfbuzzFull + hunspell + lcms2 + libjpeg + libtiff + libxml2 + pixman + podofo + poppler + poppler_data + pythonEnv + qtbase + qtimageformats + qttools + ]; + + cmakeFlags = [ + # poppler uses std::optional + "-DWANT_CPP17=ON" + ]; + + meta = with lib; { + maintainers = with maintainers; [ + erictapen + kiwi + ]; + platforms = platforms.linux; description = "Desktop Publishing (DTP) and Layout program for Linux"; homepage = "https://www.scribus.net"; - license = lib.licenses.gpl2; + # There are a lot of licenses... + # https://github.com/scribusproject/scribus/blob/20508d69ca4fc7030477db8dee79fd1e012b52d2/COPYING#L15-L19 + license = with licenses; [ + bsd3 + gpl2Plus + mit + publicDomain + ]; }; } diff --git a/pkgs/applications/office/scribus/unstable.nix b/pkgs/applications/office/scribus/unstable.nix deleted file mode 100644 index d3f706bbf0549..0000000000000 --- a/pkgs/applications/office/scribus/unstable.nix +++ /dev/null @@ -1,143 +0,0 @@ -{ boost -, cairo -, cmake -, cups -, fetchurl -, fetchpatch -, fontconfig -, freetype -, harfbuzzFull -, hunspell -, lcms2 -, libjpeg -, libtiff -, libxml2 -, mkDerivation -, pixman -, pkg-config -, podofo -, poppler -, poppler_data -, python3 -, qtbase -, qtimageformats -, qttools -, lib -}: - -let - pythonEnv = python3.withPackages ( - ps: [ - ps.pillow - ps.tkinter - ] - ); -in -mkDerivation rec { - pname = "scribus"; - - version = "1.5.7"; - - src = fetchurl { - url = "mirror://sourceforge/${pname}/${pname}-devel/${pname}-${version}.tar.xz"; - sha256 = "sha256-MYMWss/Hp2GR0+DT+MImUUfa6gVwFiAo4kPCktgm+M4="; - }; - - patches = [ - # For harfbuzz >= 2.9.0 - (fetchpatch { - url = "https://github.com/scribusproject/scribus/commit/1b546978bc4ea0b2a73fbe4d7cf947887e865162.patch"; - sha256 = "sha256-noRCaN63ZYFfXmAluEYXdFPNOk3s5W3KBAsLU1Syxv4="; - }) - # For harfbuzz >= 3.0 - (fetchpatch { - url = "https://github.com/scribusproject/scribus/commit/68ec41169eaceea4a6e1d6f359762a191c7e61d5.patch"; - sha256 = "sha256-xhp65qVvaof0md1jb3XHZw7uFX1RtNxPfUOaVnvZV1Y="; - }) - # For Poppler 22.02 - (fetchpatch { - url = "https://github.com/scribusproject/scribus/commit/85c0dff3422fa3c26fbc2e8d8561f597ec24bd92.patch"; - sha256 = "YR0ii09EVU8Qazz6b8KAIWsUMTwPIwO8JuQPymAWKdw="; - }) - (fetchpatch { - url = "https://github.com/scribusproject/scribus/commit/f75c1613db67f4067643d0218a2db3235e42ec9f.patch"; - sha256 = "vJU8HsKHE3oXlhcXQk9uCYINPYVPF5IGmrWYFQ6Py5c="; - }) - # For Poppler 22.03 - (fetchpatch { - url = "https://github.com/scribusproject/scribus/commit/553d1fd5f76ffb3743583b88c78a7232b076a965.patch"; - sha256 = "56JrEG3eCzyALTH04yjzurKRj2PocpjO6b4PusMRxjY="; - }) - (fetchpatch { - url = "https://github.com/scribusproject/scribus/commit/1f82e38be0782b065910f5fb4cece23f690349ae.patch"; - sha256 = "qektUfel5KeA327D3THyqi8dznP1SQQFToUC5Kd0+W4="; - }) - (fetchpatch { - url = "https://github.com/scribusproject/scribus/commit/f19410ac3b27e33dd62105746784e61e85b90a1d.patch"; - sha256 = "JHdgntYcioYatPeqpmym3c9dORahj0CinGOzbGtA4ds="; - }) - (fetchpatch { - url = "https://github.com/scribusproject/scribus/commit/e013e8126d2100e8e56dea5b836ad43275429389.patch"; - sha256 = "+siPNtJq9Is9V2PgADeQJB+b4lkl5g8uk6zKBu10Jqw="; - }) - (fetchpatch { - url = "https://github.com/scribusproject/scribus/commit/48263954a7dee0be815b00f417ae365ab26cdd85.patch"; - sha256 = "1WE9kALFw79bQH88NUafXaZ1Y/vJEKTIWxlk5c+opsQ="; - }) - # For Poppler 22.04 - (fetchpatch { - url = "https://github.com/scribusproject/scribus/commit/f2237b8f0b5cf7690e864a22ef7a63a6d769fa36.patch"; - sha256 = "FXpLoX/a2Jy3GcfzrUUyVUfEAp5wAy2UfzfVA5lhwJw="; - }) - ]; - - nativeBuildInputs = [ - cmake - pkg-config - ]; - - buildInputs = [ - boost - cairo - cups - fontconfig - freetype - harfbuzzFull - hunspell - lcms2 - libjpeg - libtiff - libxml2 - pixman - podofo - poppler - poppler_data - pythonEnv - qtbase - qtimageformats - qttools - ]; - - cmakeFlags = [ - # poppler uses std::optional - "-DWANT_CPP17=ON" - ]; - - meta = with lib; { - maintainers = with maintainers; [ - erictapen - kiwi - ]; - platforms = platforms.linux; - description = "Desktop Publishing (DTP) and Layout program for Linux"; - homepage = "https://www.scribus.net"; - # There are a lot of licenses... - # https://github.com/scribusproject/scribus/blob/20508d69ca4fc7030477db8dee79fd1e012b52d2/COPYING#L15-L19 - license = with licenses; [ - bsd3 - gpl2Plus - mit - publicDomain - ]; - }; -} diff --git a/pkgs/applications/science/math/qalculate-gtk/default.nix b/pkgs/applications/science/math/qalculate-gtk/default.nix index 9571588040b33..fc4e822e208ad 100644 --- a/pkgs/applications/science/math/qalculate-gtk/default.nix +++ b/pkgs/applications/science/math/qalculate-gtk/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "qalculate-gtk"; - version = "4.1.1"; + version = "4.2.0"; src = fetchFromGitHub { owner = "qalculate"; repo = "qalculate-gtk"; rev = "v${version}"; - sha256 = "sha256-itYNKcdWYMoqlvZ7CYJ6WMv7rS/y1SVdt3O7ahkjPOk="; + sha256 = "sha256-SphruQ/b8z5S/wKb9yhbEy9/pwiY+frZltdIYj0CJBM="; }; hardeningDisable = [ "format" ]; diff --git a/pkgs/applications/science/math/sage/default.nix b/pkgs/applications/science/math/sage/default.nix index 44ae404112136..f399099d4dac0 100644 --- a/pkgs/applications/science/math/sage/default.nix +++ b/pkgs/applications/science/math/sage/default.nix @@ -172,6 +172,6 @@ let in # A wrapper around sage that makes sure sage finds its docs (if they were build). callPackage ./sage.nix { - inherit sage-tests sage-with-env sagedoc jupyter-kernel-specs; + inherit sage-tests sage-with-env sagedoc jupyter-kernel-definition jupyter-kernel-specs; inherit withDoc requireSageTests; } diff --git a/pkgs/applications/science/math/sage/sage.nix b/pkgs/applications/science/math/sage/sage.nix index 78fd8d598d0b6..87f3e1137b190 100644 --- a/pkgs/applications/science/math/sage/sage.nix +++ b/pkgs/applications/science/math/sage/sage.nix @@ -2,6 +2,7 @@ , makeWrapper , sage-tests , sage-with-env +, jupyter-kernel-definition , jupyter-kernel-specs , sagedoc , withDoc @@ -49,7 +50,7 @@ stdenv.mkDerivation rec { quicktest = sage-tests.override { longTests = false; timeLimit = 600; }; # as many tests as possible in ~10m doc = sagedoc; lib = sage-with-env.env.lib; - kernelspec = jupyter-kernel-specs.definition.sagemath; + kernelspec = jupyter-kernel-definition; }; meta = with lib; { diff --git a/pkgs/applications/version-management/git-and-tools/ghq/default.nix b/pkgs/applications/version-management/git-and-tools/ghq/default.nix index b2f5346bbfce0..26632abe4694b 100644 --- a/pkgs/applications/version-management/git-and-tools/ghq/default.nix +++ b/pkgs/applications/version-management/git-and-tools/ghq/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "ghq"; - version = "1.2.1"; + version = "1.3.0"; src = fetchFromGitHub { owner = "x-motemen"; repo = "ghq"; rev = "v${version}"; - sha256 = "sha256-86ZFKkzDAhx3UYWxreQI2OJJmqGnqaH2TgwQunuYhv4="; + sha256 = "sha256-tGublfC6EeY3T/45lxmsm5zsmlgq/guS64OutAWy6AY="; }; - vendorSha256 = "sha256-5Eth9v98z1gxf1Fz5Lbn2roX7dSBmA7GRzg8uvT0hTI="; + vendorSha256 = "sha256-ZUnnvZERWXnOs4hybw8JDlGdM7QFaMfs6o3SYy0UwTM="; doCheck = false; diff --git a/pkgs/applications/virtualization/appvm/0001-Remove-menu-bar.patch b/pkgs/applications/virtualization/appvm/0001-Remove-menu-bar.patch new file mode 100644 index 0000000000000..5a15686353a30 --- /dev/null +++ b/pkgs/applications/virtualization/appvm/0001-Remove-menu-bar.patch @@ -0,0 +1,12 @@ +diff --git a/src/resources/ui/virt-viewer.ui b/src/resources/ui/virt-viewer.ui +index 430f879..68856fc 100644 +--- a/src/resources/ui/virt-viewer.ui ++++ b/src/resources/ui/virt-viewer.ui +@@ -137,7 +137,6 @@ + </child> + <child type="titlebar"> + <object class="GtkHeaderBar" id="header"> +- <property name="visible">True</property> + <property name="can-focus">False</property> + <property name="show-close-button">True</property> + <child> diff --git a/pkgs/applications/virtualization/appvm/0002-Do-not-grab-keyboard-mouse.patch b/pkgs/applications/virtualization/appvm/0002-Do-not-grab-keyboard-mouse.patch new file mode 100644 index 0000000000000..012c37be64521 --- /dev/null +++ b/pkgs/applications/virtualization/appvm/0002-Do-not-grab-keyboard-mouse.patch @@ -0,0 +1,15 @@ +diff --git a/src/virt-viewer-display-spice.c b/src/virt-viewer-display-spice.c +index 2265f02..1d60d81 100644 +--- a/src/virt-viewer-display-spice.c ++++ b/src/virt-viewer-display-spice.c +@@ -317,8 +317,8 @@ virt_viewer_display_spice_new(VirtViewerSessionSpice *session, + gtk_container_add(GTK_CONTAINER(self), GTK_WIDGET(self->display)); + gtk_widget_show(GTK_WIDGET(self->display)); + g_object_set(self->display, +- "grab-keyboard", TRUE, +- "grab-mouse", TRUE, ++ "grab-keyboard", FALSE, ++ "grab-mouse", FALSE, + "resize-guest", FALSE, + "scaling", TRUE, + NULL); diff --git a/pkgs/applications/virtualization/appvm/0003-Use-name-of-appvm-applications-as-a-title.patch b/pkgs/applications/virtualization/appvm/0003-Use-name-of-appvm-applications-as-a-title.patch new file mode 100644 index 0000000000000..51a47bbbac6db --- /dev/null +++ b/pkgs/applications/virtualization/appvm/0003-Use-name-of-appvm-applications-as-a-title.patch @@ -0,0 +1,14 @@ +diff --git a/src/virt-viewer-window.c b/src/virt-viewer-window.c +index fe740ce..d45fd4f 100644 +--- a/src/virt-viewer-window.c ++++ b/src/virt-viewer-window.c +@@ -1342,6 +1342,9 @@ virt_viewer_window_update_title(VirtViewerWindow *self) + grabhint, + g_get_application_name()); + } ++ } else if (g_str_has_prefix(self->subtitle, "appvm_")) { ++ /* Use name of the application as a title */ ++ title = g_strdup_printf(_("%s"), &self->subtitle[strlen("appvm_")]); + } else if (self->subtitle) { + /* translators: + * This is "<subtitle> - <appname>" diff --git a/pkgs/applications/virtualization/appvm/0004-Use-title-application-name-as-subtitle.patch b/pkgs/applications/virtualization/appvm/0004-Use-title-application-name-as-subtitle.patch new file mode 100644 index 0000000000000..3c517867aac7a --- /dev/null +++ b/pkgs/applications/virtualization/appvm/0004-Use-title-application-name-as-subtitle.patch @@ -0,0 +1,12 @@ +diff --git a/src/virt-viewer-app.c b/src/virt-viewer-app.c +index b977b7b..36bce34 100644 +--- a/src/virt-viewer-app.c ++++ b/src/virt-viewer-app.c +@@ -976,6 +976,7 @@ virt_viewer_app_set_window_subtitle(VirtViewerApp *app, + *d = '%'; + } else + subtitle = g_strdup_printf("%s (%s)", title, desc); ++ subtitle = g_strdup_printf("%s", title); + g_free(desc); + } + diff --git a/pkgs/applications/virtualization/appvm/default.nix b/pkgs/applications/virtualization/appvm/default.nix new file mode 100644 index 0000000000000..27002bac405fb --- /dev/null +++ b/pkgs/applications/virtualization/appvm/default.nix @@ -0,0 +1,48 @@ +{ lib +, buildGoModule +, fetchFromGitHub +, nix +, virt-viewer +, fetchpatch +, makeWrapper }: + +let + # Upstream patches fail with newer virt-viewer. These are own ports to the + # newest virt-viewer version, see: + # https://github.com/jollheef/appvm/issues/28 + virt-manager-without-menu = virt-viewer.overrideAttrs(oldAttrs: { + patches = oldAttrs.patches ++ [ + ./0001-Remove-menu-bar.patch + ./0002-Do-not-grab-keyboard-mouse.patch + ./0003-Use-name-of-appvm-applications-as-a-title.patch + ./0004-Use-title-application-name-as-subtitle.patch + ]; + }); +in +buildGoModule rec { + pname = "appvm"; + version = "unstable-2021-12-20"; + + src = fetchFromGitHub { + owner = "jollheef"; + repo = pname; + rev = "17f17be7846d872e7e26d5cb6759a52ea4113587"; + sha256 = "sha256-FL5olOy1KufULyqI2dJeS0OnKzC3LfPWxnia2i4f4yY="; + }; + + vendorSha256 = "sha256-8eU+Mf5dxL/bAMMShXvj8I1Kdd4ysBTWvgYIXwLStPI="; + + buildInputs = [ makeWrapper ]; + + postFixup = '' + wrapProgram $out/bin/appvm \ + --prefix PATH : "${lib.makeBinPath [ nix virt-manager-without-menu ]}" + ''; + + meta = with lib; { + description = "Nix-based app VMs"; + homepage = "https://code.dumpstack.io/tools/${pname}"; + maintainers = with maintainers; [ dump_stack cab404 onny ]; + license = licenses.gpl3; + }; +} diff --git a/pkgs/build-support/kernel/compress-firmware-xz.nix b/pkgs/build-support/kernel/compress-firmware-xz.nix index 56595131c891d..6a797226aa671 100644 --- a/pkgs/build-support/kernel/compress-firmware-xz.nix +++ b/pkgs/build-support/kernel/compress-firmware-xz.nix @@ -7,7 +7,7 @@ runCommand "${firmware.name}-xz" {} '' (cd ${firmware} && find lib/firmware -type d -print0) | (cd $out && xargs -0 mkdir -v --) (cd ${firmware} && find lib/firmware -type f -print0) | - (cd $out && xargs -0tP "$NIX_BUILD_CORES" -n1 \ + (cd $out && xargs -0rtP "$NIX_BUILD_CORES" -n1 \ sh -c 'xz -9c -T1 -C crc32 --lzma2=dict=2MiB "${firmware}/$1" > "$1.xz"' --) (cd ${firmware} && find lib/firmware -type l) | while read link; do target="$(readlink "${firmware}/$link")" diff --git a/pkgs/data/themes/flat-remix-gtk/default.nix b/pkgs/data/themes/flat-remix-gtk/default.nix index 7bea0226195fd..77c753d00f839 100644 --- a/pkgs/data/themes/flat-remix-gtk/default.nix +++ b/pkgs/data/themes/flat-remix-gtk/default.nix @@ -6,13 +6,13 @@ stdenv.mkDerivation rec { pname = "flat-remix-gtk"; - version = "20220412"; + version = "20220427"; src = fetchFromGitHub { owner = "daniruiz"; repo = pname; rev = version; - sha256 = "sha256-LIGYPsOoPN3KIe0XrjCIf7yV3p3Gfzx8zci57+HzW18="; + sha256 = "sha256-nuhJZNsnD/DZ3WOsW+bBYH/OT6ma/qemlGoKaFzfj4c="; }; dontBuild = true; diff --git a/pkgs/development/compilers/flutter/default.nix b/pkgs/development/compilers/flutter/default.nix index 9eba677344857..acff9dd030eb5 100644 --- a/pkgs/development/compilers/flutter/default.nix +++ b/pkgs/development/compilers/flutter/default.nix @@ -10,19 +10,19 @@ let # Decouples flutter derivation from dart derivation, # use specific dart version to not need to bump dart derivation when bumping flutter. - dartVersion = "2.16.1"; + dartVersion = "2.16.2"; dartSourceBase = "https://storage.googleapis.com/dart-archive/channels"; dartForFlutter = dart.override { version = dartVersion; sources = { "${dartVersion}-x86_64-linux" = fetchurl { url = "${dartSourceBase}/stable/release/${dartVersion}/sdk/dartsdk-linux-x64-release.zip"; - sha256 = "sha256-PMY6DCFQC8XrlnFzOEPcwgBAs5/cAvNd78969Z+I1Fk="; + sha256 = "sha256-egrYd7B4XhkBiHPIFE2zopxKtQ58GqlogAKA/UeiXnI="; }; }; }; in { - mkFlutter = mkFlutter; + inherit mkFlutter; stable = mkFlutter rec { inherit version; dart = dartForFlutter; diff --git a/pkgs/development/compilers/ghc/8.10.7.nix b/pkgs/development/compilers/ghc/8.10.7.nix index cdf4faf3ffc7c..7a56d7c0e5c81 100644 --- a/pkgs/development/compilers/ghc/8.10.7.nix +++ b/pkgs/development/compilers/ghc/8.10.7.nix @@ -12,7 +12,7 @@ libffi ? null , useLLVM ? !(stdenv.targetPlatform.isx86 - || stdenv.targetPlatform.isPowerPC + || stdenv.targetPlatform.isPower || stdenv.targetPlatform.isSparc) , # LLVM is conceptually a run-time-only depedendency, but for # non-x86, we need LLVM to bootstrap later stages, so it becomes a diff --git a/pkgs/development/compilers/ghc/8.8.4.nix b/pkgs/development/compilers/ghc/8.8.4.nix index af01582b1081f..907d995a250a0 100644 --- a/pkgs/development/compilers/ghc/8.8.4.nix +++ b/pkgs/development/compilers/ghc/8.8.4.nix @@ -11,7 +11,7 @@ libffi ? null , useLLVM ? !(stdenv.targetPlatform.isx86 - || stdenv.targetPlatform.isPowerPC + || stdenv.targetPlatform.isPower || stdenv.targetPlatform.isSparc) , # LLVM is conceptually a run-time-only depedendency, but for # non-x86, we need LLVM to bootstrap later stages, so it becomes a diff --git a/pkgs/development/compilers/ghc/9.0.2.nix b/pkgs/development/compilers/ghc/9.0.2.nix index a4cefe7294d89..6de0f201599f3 100644 --- a/pkgs/development/compilers/ghc/9.0.2.nix +++ b/pkgs/development/compilers/ghc/9.0.2.nix @@ -14,7 +14,7 @@ libffi ? null , useLLVM ? !(stdenv.targetPlatform.isx86 - || stdenv.targetPlatform.isPowerPC + || stdenv.targetPlatform.isPower || stdenv.targetPlatform.isSparc) , # LLVM is conceptually a run-time-only depedendency, but for # non-x86, we need LLVM to bootstrap later stages, so it becomes a diff --git a/pkgs/development/compilers/ghc/9.2.2.nix b/pkgs/development/compilers/ghc/9.2.2.nix index 0a572bff7ef23..880db43378936 100644 --- a/pkgs/development/compilers/ghc/9.2.2.nix +++ b/pkgs/development/compilers/ghc/9.2.2.nix @@ -13,7 +13,7 @@ libffi ? null , useLLVM ? !(stdenv.targetPlatform.isx86 - || stdenv.targetPlatform.isPowerPC + || stdenv.targetPlatform.isPower || stdenv.targetPlatform.isSparc || (stdenv.targetPlatform.isAarch64 && stdenv.targetPlatform.isDarwin)) , # LLVM is conceptually a run-time-only depedendency, but for diff --git a/pkgs/development/compilers/ghc/head.nix b/pkgs/development/compilers/ghc/head.nix index a2afb7400c202..4f52ba0a6182e 100644 --- a/pkgs/development/compilers/ghc/head.nix +++ b/pkgs/development/compilers/ghc/head.nix @@ -19,7 +19,7 @@ , elfutils # for DWARF support , useLLVM ? !(stdenv.targetPlatform.isx86 - || stdenv.targetPlatform.isPowerPC + || stdenv.targetPlatform.isPower || stdenv.targetPlatform.isSparc || (stdenv.targetPlatform.isAarch64 && stdenv.targetPlatform.isDarwin)) , # LLVM is conceptually a run-time-only depedendency, but for diff --git a/pkgs/development/compilers/gleam/default.nix b/pkgs/development/compilers/gleam/default.nix index 3f704b5257220..30d4882a50bef 100644 --- a/pkgs/development/compilers/gleam/default.nix +++ b/pkgs/development/compilers/gleam/default.nix @@ -2,13 +2,13 @@ rustPlatform.buildRustPackage rec { pname = "gleam"; - version = "0.20.1"; + version = "0.21.0"; src = fetchFromGitHub { owner = "gleam-lang"; repo = pname; rev = "v${version}"; - sha256 = "sha256-AK+eb0eJyI7ALn7sg0wz4GzHthxrJWd1PVT5bL9LKWA="; + sha256 = "sha256-BI8qEaNasNxcMJ7jJYKyFP3ypgh+P39F9tAzzqxA4BI="; }; nativeBuildInputs = [ pkg-config ]; @@ -16,7 +16,7 @@ rustPlatform.buildRustPackage rec { buildInputs = [ openssl ] ++ lib.optionals stdenv.isDarwin [ Security libiconv ]; - cargoSha256 = "sha256-kFTAPbP42sbhsvP069ua0ys1Dw7W+Gdsv2YaGrzorIk="; + cargoSha256 = "sha256-avwdgX7FaBIOMumJknWBLc50JgtzGpM6S+Du7U/FE6Q="; meta = with lib; { description = "A statically typed language for the Erlang VM"; diff --git a/pkgs/development/compilers/ocaml/ber-metaocaml.nix b/pkgs/development/compilers/ocaml/ber-metaocaml.nix index 0825c2db66031..36ea949d1ece0 100644 --- a/pkgs/development/compilers/ocaml/ber-metaocaml.nix +++ b/pkgs/development/compilers/ocaml/ber-metaocaml.nix @@ -9,9 +9,9 @@ let x11deps = [ libX11 xorgproto ]; inherit (lib) optionals; - baseOcamlBranch = "4.07"; + baseOcamlBranch = "4.11"; baseOcamlVersion = "${baseOcamlBranch}.1"; - metaocamlPatch = "107"; + metaocamlPatch = "111"; in stdenv.mkDerivation rec { @@ -20,12 +20,12 @@ stdenv.mkDerivation rec { src = fetchurl { url = "https://caml.inria.fr/pub/distrib/ocaml-${baseOcamlBranch}/ocaml-${baseOcamlVersion}.tar.gz"; - sha256 = "1x4sln131mcspisr22qc304590rvg720rbl7g2i4xiymgvhkpm1a"; + sha256 = "sha256-3Yi2OFvZLgrZInMuKMxoyHd4QXcOoAPCC9FS9dtEFc4="; }; metaocaml = fetchurl { - url = "http://okmij.org/ftp/ML/ber-metaocaml-107.tar.gz"; - sha256 = "0xy6n0yj1f53pk612zfmn49pn04bd75qa40xgmr0w0lzx6dqsfmm"; + url = "http://okmij.org/ftp/ML/ber-metaocaml-${metaocamlPatch}.tar.gz"; + sha256 = "sha256-hDb0w0ZCm0hCz8jktZKmr/7gPSfBoKPT/cc7sPjt0yE="; }; x11env = buildEnv { name = "x11env"; paths = x11deps; }; @@ -33,11 +33,7 @@ stdenv.mkDerivation rec { x11inc = "${x11env}/include"; prefixKey = "-prefix "; - configureFlags = optionals useX11 - [ "-x11lib" x11lib - "-x11include" x11inc - "-flambda" - ]; + configureFlags = optionals useX11 [ "--enable-flambda" ]; dontStrip = true; buildInputs = [ ncurses ] ++ optionals useX11 x11deps; @@ -48,8 +44,8 @@ stdenv.mkDerivation rec { # used SIGSTKSZ as the size of a statically-allocated array. This # patch is also applied by the ocaml/4.07.nix expression. (fetchpatch { - url = "https://github.com/ocaml/ocaml/commit/00b8c4d503732343d5d01761ad09650fe50ff3a0.patch"; - sha256 = "sha256:02cfya5ff5szx0fsl5x8ax76jyrla9zmf3qxavf3adhwq5ssrfcv"; + url = "https://github.com/ocaml/ocaml/commit/dd28ac0cf4365bd0ea1bcc374cbc5e95a6f39bea.patch"; + sha256 = "sha256-OmyovAu+8sgg3n5YD29Cytx3u/9PO2ofMsmrwiKUxks="; }) ]; diff --git a/pkgs/development/embedded/avrdude/default.nix b/pkgs/development/embedded/avrdude/default.nix index 995af6bb92b31..83dbf2a18fae3 100644 --- a/pkgs/development/embedded/avrdude/default.nix +++ b/pkgs/development/embedded/avrdude/default.nix @@ -7,11 +7,11 @@ assert docSupport -> texLive != null && texinfo != null && texi2html != null; stdenv.mkDerivation rec { pname = "avrdude"; - version = "6.4"; + version = "7.0"; src = fetchurl { url = "mirror://savannah/${pname}/${pname}-${version}.tar.gz"; - sha256 = "sha256-qb5wZvcKnc9L8HNvz1MdtqMlCu0aJMxkOt0nZBtxEPk="; + sha256 = "sha256-wO9l2Y1gQMoLTytwDVFGPCoflGZUQfOdFdl0Qtu3m1Q="; }; configureFlags = lib.optionals docSupport "--enable-doc"; diff --git a/pkgs/development/libraries/flint/default.nix b/pkgs/development/libraries/flint/default.nix index 0c2a07149d206..79b0e4caa1f05 100644 --- a/pkgs/development/libraries/flint/default.nix +++ b/pkgs/development/libraries/flint/default.nix @@ -13,11 +13,11 @@ assert withBlas -> openblas != null && blas.implementation == "openblas" && lapa stdenv.mkDerivation rec { pname = "flint"; - version = "2.8.4"; + version = "2.8.5"; src = fetchurl { url = "https://www.flintlib.org/flint-${version}.tar.gz"; - sha256 = "sha256-Yd+S6oyOncaS1Gxx1/UKqgmjPUugjQKheEcwpEXl5L4="; + sha256 = "sha256-WRH+3/kREA8VeB8146T6k0/mDkrqAqjBDMiRgQHB7tg="; }; buildInputs = [ diff --git a/pkgs/development/libraries/libechonest/default.nix b/pkgs/development/libraries/libechonest/default.nix deleted file mode 100644 index 6f160bdb6dcc3..0000000000000 --- a/pkgs/development/libraries/libechonest/default.nix +++ /dev/null @@ -1,39 +0,0 @@ -{ lib, stdenv, fetchFromGitHub, fetchpatch, cmake, doxygen, qt4, qjson }: - -stdenv.mkDerivation rec { - pname = "libechonest"; - version = "2.3.1"; - - src = fetchFromGitHub { - owner = "lfranchi"; - repo = pname; - rev = version; - sha256 = "0xbavf9f355dl1d3qv59x4ryypqrdanh9xdvw2d0q66l008crdkq"; - }; - - # Fix build with GCC 11. - NIX_CFLAGS_COMPILE = [ "-std=c++14" ]; - - patches = [ - (fetchpatch { - url = "https://github.com/lfranchi/libechonest/commit/009514f65044823ef29045397d4b58dd04d09977.patch"; - sha256 = "0dmmpi7hixdngwiv045ilqrzyzkf56xpfyihcsx5i3xya2m0mynx"; - }) - (fetchpatch { - url = "https://github.com/lfranchi/libechonest/commit/3ce779536d56a163656e8098913f923e6cda2b5c.patch"; - sha256 = "1vasd3sgqah562vxk71jibyws5cbihjjfnffd50qvdm2xqgvbx94"; - }) - ]; - - nativeBuildInputs = [ cmake doxygen ]; - buildInputs = [ qt4 qjson ]; - - doCheck = false; # requires network access - - meta = { - description = "A C++/Qt wrapper around the Echo Nest API"; - homepage = "https://projects.kde.org/projects/playground/libs/libechonest"; - license = lib.licenses.gpl2Plus; - platforms = lib.platforms.unix; - }; -} diff --git a/pkgs/development/libraries/libqalculate/default.nix b/pkgs/development/libraries/libqalculate/default.nix index afc2313df7a34..d83a4e0a707a6 100644 --- a/pkgs/development/libraries/libqalculate/default.nix +++ b/pkgs/development/libraries/libqalculate/default.nix @@ -3,13 +3,13 @@ stdenv.mkDerivation rec { pname = "libqalculate"; - version = "4.1.1"; + version = "4.2.0"; src = fetchFromGitHub { owner = "qalculate"; repo = "libqalculate"; rev = "v${version}"; - sha256 = "sha256-y9GNf2xR3bZ8Pj99Y8qSBbK+hQEkg/+xOzUdyFI5HLw="; + sha256 = "sha256-mIzHizoDsdSVcepWACeVkCTgt4gxd99WKXrrGi+qASo="; }; outputs = [ "out" "dev" "doc" ]; diff --git a/pkgs/development/libraries/poppler/default.nix b/pkgs/development/libraries/poppler/default.nix index 3e22483eb07f5..f5613d493680e 100644 --- a/pkgs/development/libraries/poppler/default.nix +++ b/pkgs/development/libraries/poppler/default.nix @@ -19,7 +19,7 @@ , openjpeg , pkg-config , python3 -, scribusUnstable +, scribus , texlive , zlib , withData ? true, poppler_data @@ -35,7 +35,7 @@ let in stdenv.mkDerivation rec { pname = "poppler-${suffix}"; - version = "22.04.0"; # beware: updates often break cups-filters build, check texlive and scribusUnstable too! + version = "22.04.0"; # beware: updates often break cups-filters build, check texlive and scribus too! outputs = [ "out" "dev" ]; @@ -97,7 +97,7 @@ stdenv.mkDerivation rec { passthru = { tests = { # These depend on internal poppler code that frequently changes. - inherit inkscape cups-filters texlive scribusUnstable; + inherit inkscape cups-filters texlive scribus; }; }; diff --git a/pkgs/development/libraries/qjson/default.nix b/pkgs/development/libraries/qjson/default.nix index a6ee272a38b5c..7ab0d8c1ae7e9 100644 --- a/pkgs/development/libraries/qjson/default.nix +++ b/pkgs/development/libraries/qjson/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, cmake, qt4 }: +{ lib, stdenv, fetchFromGitHub, cmake, qtbase }: stdenv.mkDerivation rec { version = "0.9.0"; @@ -12,12 +12,12 @@ stdenv.mkDerivation rec { }; nativeBuildInputs = [ cmake ]; - buildInputs = [ qt4 ]; + buildInputs = [ qtbase ]; + dontWrapQtApps = true; meta = with lib; { description = "Lightweight data-interchange format"; homepage = "http://qjson.sourceforge.net/"; license = licenses.lgpl21; - inherit (qt4.meta) platforms; }; } diff --git a/pkgs/development/python-modules/androidtv/default.nix b/pkgs/development/python-modules/androidtv/default.nix index 456186e45ab3e..5af0c0b63cdcf 100644 --- a/pkgs/development/python-modules/androidtv/default.nix +++ b/pkgs/development/python-modules/androidtv/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { pname = "androidtv"; - version = "0.0.67"; + version = "0.0.68"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -20,7 +20,7 @@ buildPythonPackage rec { owner = "JeffLIrion"; repo = "python-androidtv"; rev = "v${version}"; - hash = "sha256-MAlKD2PDQJQaKPiMQDu1CMvn4xnxb8FmeYqzcW4hso0="; + hash = "sha256-cRupsdHpzzxV57ZsuWqZBvtbMYWwXFSVLqsNJ7kfpPA="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/arviz/default.nix b/pkgs/development/python-modules/arviz/default.nix index 82fa11897b049..4b5ed5ca687bb 100644 --- a/pkgs/development/python-modules/arviz/default.nix +++ b/pkgs/development/python-modules/arviz/default.nix @@ -9,97 +9,97 @@ , numpy , pandas , pytest +, setuptools , cloudpickle +, pytestCheckHook , scipy -, setuptools +, packaging , typing-extensions -# , tensorflow-probability (incompatible version) +, pythonOlder , xarray +, xarray-einstats , zarr , h5py -#, pymc3 (broken) -#, pyro-ppl (broken) -#, pystan (not packaged) -#, numpyro (not packaged) +, jaxlib +, torchvision +, jax + # , pymc3 (circular dependency) +, pyro-ppl + #, pystan (not packaged) +, numpyro }: buildPythonPackage rec { pname = "arviz"; version = "0.12.0"; + format = "setuptools"; + + disabled = pythonOlder "3.7"; src = fetchFromGitHub { owner = "arviz-devs"; - repo = "arviz"; + repo = pname; rev = "v${version}"; - sha256 = "sha256-ClARxgfji/CavEy8g5oeYK7pwSZS1yUIZnBiyTbZ/zU="; + hash = "sha256-ClARxgfji/CavEy8g5oeYK7pwSZS1yUIZnBiyTbZ/zU="; }; propagatedBuildInputs = [ - # needed to install matplotlib netcdf4 - pandas - xarray - # needed to import - setuptools - # not needed to import, but used by many functions - # and is listed as a dependency in the documentation numpy + packaging + pandas scipy + setuptools + xarray + xarray-einstats ]; - postPatch = '' - substituteInPlace requirements.txt \ - --replace "typing_extensions>=3.7.4.3,<4" "typing_extensions>=3.7.4.3" - ''; - checkInputs = [ bokeh + cloudpickle emcee + h5py + jax + jaxlib numba - pytest - cloudpickle + numpyro + # pymc3 (circular dependency) + pyro-ppl + # pystan (not packaged) + pytestCheckHook + torchvision zarr - #tensorflow-probability (used by disabled tests) - h5py - #pymc3 (broken, used by disabled tests) - #pyro-ppl (broken, used by disabled tests) - #pystan (not packaged) - #numpyro (not packaged, used by disabled tests) ]; - # check requires pymc3 and pyro-ppl, which are currently broken, and pystan - # and numpyro, which are not yet packaged, and an incompatible (old) version - # of tensorflow-probability. some checks also need to make - # directories and do not have permission to do so. So we can only check part - # of the package - # Additionally, there are some failures with the plots test, which revolve - # around attempting to output .mp4 files through an interface that only wants - # to output .html files. - # The following test have been disabled as a result: data_cmdstanpy, - # data_numpyro, data_pyro, data_pystan, data_tfp, data_pymc3 and plots. - checkPhase = '' - cd arviz/tests/ - export HOME=$TMPDIR - pytest \ - base_tests/test_data.py \ - base_tests/test_diagnostics.py \ - base_tests/test_plot_utils.py \ - base_tests/test_rcparams.py \ - base_tests/test_stats.py \ - base_tests/test_stats_numba.py \ - base_tests/test_stats_utils.py \ - base_tests/test_utils.py \ - base_tests/test_utils_numba.py \ - base_tests/test_data_zarr.py \ - external_tests/test_data_cmdstan.py \ - external_tests/test_data_emcee.py + preCheck = '' + export HOME=$(mktemp -d); ''; + pytestFlagsArray = [ + "arviz/tests/base_tests/" + ]; + + disabledTestPaths = [ + # Remove tests as dependency creates a circular dependency + "arviz/tests/external_tests/test_data_pymc.py" + ]; + + disabledTests = [ + # Tests require network access + "test_plot_separation" + "test_plot_trace_legend" + "test_cov" + ]; + + pythonImportsCheck = [ + "arviz" + ]; + meta = with lib; { - description = "ArviZ is a Python package for exploratory analysis of Bayesian models"; + description = "Library for exploratory analysis of Bayesian models"; homepage = "https://arviz-devs.github.io/arviz/"; license = licenses.asl20; - maintainers = [ maintainers.omnipotententity ]; + maintainers = with maintainers; [ omnipotententity ]; }; } diff --git a/pkgs/development/python-modules/drf-spectacular/default.nix b/pkgs/development/python-modules/drf-spectacular/default.nix new file mode 100644 index 0000000000000..8e41d24c9e1b8 --- /dev/null +++ b/pkgs/development/python-modules/drf-spectacular/default.nix @@ -0,0 +1,77 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, dj-rest-auth +, django +, django-allauth +, django-filter +, django-oauth-toolkit +, django-polymorphic +, django-rest-auth +, django-rest-polymorphic +, djangorestframework +, djangorestframework-camel-case +, djangorestframework-dataclasses +, djangorestframework-recursive +, djangorestframework-simplejwt +, drf-jwt +, drf-nested-routers +, drf-spectacular-sidecar +, inflection +, jsonschema +, psycopg2 +, pytest-django +, pytestCheckHook +, pyyaml +, uritemplate +}: + +buildPythonPackage rec { + pname = "drf-spectacular"; + version = "0.22.1"; + + src = fetchFromGitHub { + owner = "tfranzel"; + repo = "drf-spectacular"; + rev = version; + sha256 = "sha256-SgzyIzgFBXsNHfY2OfCq0LhJyi/ZCOSA8QveKNduIBc="; + }; + + propagatedBuildInputs = [ + django + djangorestframework + inflection + jsonschema + pyyaml + uritemplate + ]; + + checkInputs = [ + dj-rest-auth + django-allauth + django-filter + django-oauth-toolkit + django-polymorphic + django-rest-auth + django-rest-polymorphic + djangorestframework-camel-case + djangorestframework-dataclasses + djangorestframework-recursive + djangorestframework-simplejwt + drf-jwt + drf-nested-routers + drf-spectacular-sidecar + psycopg2 + pytest-django + pytestCheckHook + ]; + + pythonImportsCheck = [ "drf_spectacular" ]; + + meta = with lib; { + description = "Sane and flexible OpenAPI 3 schema generation for Django REST framework"; + homepage = "https://github.com/tfranzel/drf-spectacular"; + license = licenses.bsd3; + maintainers = with maintainers; [ SuperSandro2000 ]; + }; +} diff --git a/pkgs/development/python-modules/dulwich/default.nix b/pkgs/development/python-modules/dulwich/default.nix index ea3511e843a33..570598e1a993a 100644 --- a/pkgs/development/python-modules/dulwich/default.nix +++ b/pkgs/development/python-modules/dulwich/default.nix @@ -17,7 +17,7 @@ }: buildPythonPackage rec { - version = "0.20.40"; + version = "0.20.42"; pname = "dulwich"; format = "setuptools"; @@ -25,7 +25,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - hash = "sha256-vtcO/gt91RpHvOqbmEqwamdddDi3izLaHLr891D7utc="; + hash = "sha256-cro7YK5qVU0TMrO0CjRf6+FuxGnPYBS7RDtxmQLjPvA="; }; LC_ALL = "en_US.UTF-8"; diff --git a/pkgs/development/python-modules/elastic-apm/default.nix b/pkgs/development/python-modules/elastic-apm/default.nix index 98e2394d0bdbd..0d016b92ec3aa 100644 --- a/pkgs/development/python-modules/elastic-apm/default.nix +++ b/pkgs/development/python-modules/elastic-apm/default.nix @@ -6,6 +6,7 @@ , certifi , ecs-logging , fetchFromGitHub +, fetchpatch , httpx , jinja2 , jsonschema @@ -40,6 +41,14 @@ buildPythonPackage rec { sha256 = "sha256-IaCl39rhsFLQwvQdPcqKruV/Mo3f7WH91UVgMG/cnOc="; }; + patches = [ + (fetchpatch { + # fix tests with sanic>=22.3.0 + url = "https://github.com/elastic/apm-agent-python/commit/114ee6ca998b4d6a5cb075a289af39cb963cf08a.patch"; + hash = "sha256-M6yEHjThKDCRQOmR0L94KEt8tUun1tPRULI6PNIlE/8="; + }) + ]; + propagatedBuildInputs = [ aiohttp blinker diff --git a/pkgs/development/python-modules/feedparser/default.nix b/pkgs/development/python-modules/feedparser/default.nix index d594f8c8ad5ba..6fb99a9183960 100644 --- a/pkgs/development/python-modules/feedparser/default.nix +++ b/pkgs/development/python-modules/feedparser/default.nix @@ -8,14 +8,14 @@ buildPythonPackage rec { pname = "feedparser"; - version = "6.0.9"; + version = "6.0.10"; format = "setuptools"; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - sha256 = "sha256-2tQue+rsVfmcCLKwz3KIvHz9JLb3LI74VHi8tVZIzUI="; + sha256 = "sha256-J9pIX0Y3znFjzeqxOoAxK5O30MG3db70pHYpoxELylE="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/flux-led/default.nix b/pkgs/development/python-modules/flux-led/default.nix index 590f1d9f824e5..17555cc50c638 100644 --- a/pkgs/development/python-modules/flux-led/default.nix +++ b/pkgs/development/python-modules/flux-led/default.nix @@ -8,7 +8,7 @@ buildPythonPackage rec { pname = "flux-led"; - version = "0.28.29"; + version = "0.28.30"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -16,8 +16,8 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "Danielhiversen"; repo = "flux_led"; - rev = version; - sha256 = "sha256-Hwe8eshY5j+10fARCp7fMnZf2Sxal7+7Vj5DYVPNXks="; + rev = "refs/tags/${version}"; + sha256 = "sha256-ujox3Q8oyPw8+SBdF9O7ezu8FC/NnWxeSGW8Nfh7tZ8="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/hahomematic/default.nix b/pkgs/development/python-modules/hahomematic/default.nix index 74cf302990dd4..a815625bf6eef 100644 --- a/pkgs/development/python-modules/hahomematic/default.nix +++ b/pkgs/development/python-modules/hahomematic/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { pname = "hahomematic"; - version = "1.5.3"; + version = "1.5.4"; format = "pyproject"; disabled = pythonOlder "3.9"; @@ -23,7 +23,7 @@ buildPythonPackage rec { owner = "danielperna84"; repo = pname; rev = "refs/tags/${version}"; - sha256 = "sha256-4fB0IIKZNNU7MfHRhdjNhP7RQMWcvfqawj2P01LIPa0="; + sha256 = "sha256-V9wQXXPeoplxVcFDIhQcJFnKkewwDEaoQfTsQ7IyjOU="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/hsluv/default.nix b/pkgs/development/python-modules/hsluv/default.nix index b6573db532680..00e50e8259d7f 100644 --- a/pkgs/development/python-modules/hsluv/default.nix +++ b/pkgs/development/python-modules/hsluv/default.nix @@ -7,14 +7,14 @@ buildPythonPackage rec { pname = "hsluv"; - version = "5.0.2"; + version = "5.0.3"; disabled = pythonOlder "3.6"; src = fetchFromGitHub { owner = "hsluv"; repo = "hsluv-python"; rev = "v${version}"; - sha256 = "0r0w8ycjwfg3pmzjghzrs0lkam93fzvgiqvrwh3nl9jnqlpw7v7j"; + sha256 = "sha256-p3KD+zhHCOs/rLUVf1IkW/isfpUPQstB2VHGmZ/aEPU="; }; checkInputs = [ diff --git a/pkgs/development/python-modules/lomond/default.nix b/pkgs/development/python-modules/lomond/default.nix index 3efe41e007974..f5bfef6a0a278 100644 --- a/pkgs/development/python-modules/lomond/default.nix +++ b/pkgs/development/python-modules/lomond/default.nix @@ -1,5 +1,18 @@ -{ buildPythonPackage, freezegun, fetchFromGitHub, lib, pytestCheckHook -, pytest-mock, pytest-runner, six, tornado_4 }: +{ buildPythonPackage +, fetchFromGitHub +, lib +, pythonAtLeast +, pythonOlder + +# runtime +, six + +# tests +, freezegun +, pytest-mock +, pytestCheckHook +, tornado_4 +}: buildPythonPackage rec { pname = "lomond"; @@ -12,11 +25,33 @@ buildPythonPackage rec { sha256 = "0lydq0imala08wxdyg2iwhqa6gcdrn24ah14h91h2zcxjhjk4gv8"; }; - nativeBuildInputs = [ pytest-runner ]; - propagatedBuildInputs = [ six ]; - checkInputs = [ pytestCheckHook freezegun pytest-mock tornado_4 ]; - # Makes HTTP requests - disabledTests = [ "test_proxy" "test_live" ]; + postPatch = '' + substituteInPlace setup.py \ + --replace "'pytest-runner'" "" + ''; + + propagatedBuildInputs = [ + six + ]; + + checkInputs = [ + freezegun + pytest-mock + pytestCheckHook + ] ++ lib.optionals (pythonOlder "3.10") [ + tornado_4 + ]; + + disabledTests = [ + # Makes HTTP requests + "test_proxy" + "test_live" + ]; + + disabledTestPaths = lib.optionals (pythonAtLeast "3.10") [ + # requires tornado_4, which is not compatible with python3.10 + "tests/test_integration.py" + ]; meta = with lib; { description = "Websocket Client Library"; diff --git a/pkgs/development/python-modules/numpyro/default.nix b/pkgs/development/python-modules/numpyro/default.nix new file mode 100644 index 0000000000000..d9a1273c33e9b --- /dev/null +++ b/pkgs/development/python-modules/numpyro/default.nix @@ -0,0 +1,62 @@ +{ lib +, buildPythonPackage +, fetchPypi +, jax +, jaxlib +, multipledispatch +, numpy +, pytestCheckHook +, pythonOlder +, tqdm +}: + +buildPythonPackage rec { + pname = "numpyro"; + version = "0.9.2"; + format = "setuptools"; + + disabled = pythonOlder "3.7"; + + src = fetchPypi { + inherit version pname; + hash = "sha256-TbzyIt17/z56juc8kH1L8rTkvSgcsT5ah6xmvWTo6tM="; + }; + + propagatedBuildInputs = [ + jax + jaxlib + numpy + multipledispatch + tqdm + ]; + + checkInputs = [ + pytestCheckHook + ]; + + pythonImportsCheck = [ + "numpyro" + ]; + + disabledTests = [ + # AssertionError due to tolerance issues + "test_beta_binomial_log_prob" + "test_collapse_beta" + "test_cpu" + "test_gamma_poisson" + "test_gof" + "test_hpdi" + "test_kl_univariate" + "test_mean_var" + # Tests want to download data + "data_load" + "test_jsb_chorales" + ]; + + meta = with lib; { + description = "Library for probabilistic programming with NumPy"; + homepage = "https://num.pyro.ai/"; + license = licenses.asl20; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/pkgs/development/python-modules/ocrmypdf/default.nix b/pkgs/development/python-modules/ocrmypdf/default.nix index 168777594aef3..1a427dc379fd3 100644 --- a/pkgs/development/python-modules/ocrmypdf/default.nix +++ b/pkgs/development/python-modules/ocrmypdf/default.nix @@ -7,7 +7,7 @@ , importlib-metadata , importlib-resources , jbig2enc -, pdfminer +, pdfminer-six , pikepdf , pillow , pluggy @@ -63,7 +63,7 @@ buildPythonPackage rec { propagatedBuildInputs = [ coloredlogs img2pdf - pdfminer + pdfminer-six pikepdf pillow pluggy diff --git a/pkgs/development/python-modules/panel/default.nix b/pkgs/development/python-modules/panel/default.nix index dca9b44c81738..466f3e1e6dfa8 100644 --- a/pkgs/development/python-modules/panel/default.nix +++ b/pkgs/development/python-modules/panel/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { pname = "panel"; - version = "0.13.0"; + version = "0.13.1"; format = "wheel"; @@ -23,7 +23,7 @@ buildPythonPackage rec { # tries to fetch even more artifacts src = fetchPypi { inherit pname version format; - hash = "sha256-Iv1Lb45n2XUHSluZzdF2Bf/hXZmgs++9/av26rHgePc="; + hash = "sha256-1GC119AUfmse3fhQQxSi9eDJJorYvt2NeE7UY1GrW3E="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/pdfminer_six/default.nix b/pkgs/development/python-modules/pdfminer-six/default.nix index b52106af285ba..3911794b89cbf 100644 --- a/pkgs/development/python-modules/pdfminer_six/default.nix +++ b/pkgs/development/python-modules/pdfminer-six/default.nix @@ -9,8 +9,8 @@ }: buildPythonPackage rec { - pname = "pdfminer_six"; - version = "20220506"; + pname = "pdfminer-six"; + version = "20220524"; disabled = !isPy3k; @@ -18,7 +18,7 @@ buildPythonPackage rec { owner = "pdfminer"; repo = "pdfminer.six"; rev = version; - sha256 = "sha256-Lq+ou7+Lmr1H69L8X/vuky+/tXDD3bBBaCysymeRuXA="; + sha256 = "sha256-XO9sdHeS/8MgVW0mxbTe2AY5BDfnBSDNzZwLsSKmQh0="; }; propagatedBuildInputs = [ charset-normalizer cryptography ]; diff --git a/pkgs/development/python-modules/pdfx/default.nix b/pkgs/development/python-modules/pdfx/default.nix index 25efc4418bf9e..aaffa0f93818f 100644 --- a/pkgs/development/python-modules/pdfx/default.nix +++ b/pkgs/development/python-modules/pdfx/default.nix @@ -1,4 +1,4 @@ -{ lib, buildPythonPackage, fetchFromGitHub, pdfminer, chardet, pytestCheckHook }: +{ lib, buildPythonPackage, fetchFromGitHub, pdfminer-six, chardet, pytestCheckHook }: buildPythonPackage rec { pname = "pdfx"; @@ -17,7 +17,7 @@ buildPythonPackage rec { --replace "pdfminer.six==20201018" "pdfminer.six" ''; - propagatedBuildInputs = [ pdfminer chardet ]; + propagatedBuildInputs = [ pdfminer-six chardet ]; checkInputs = [ pytestCheckHook ]; diff --git a/pkgs/development/python-modules/pot/default.nix b/pkgs/development/python-modules/pot/default.nix index f017ff5fb54f4..2cc9e3368c76a 100644 --- a/pkgs/development/python-modules/pot/default.nix +++ b/pkgs/development/python-modules/pot/default.nix @@ -61,6 +61,9 @@ buildPythonPackage rec { --replace " --junit-xml=junit-results.xml" "" substituteInPlace setup.py \ --replace '"oldest-supported-numpy", ' "" + + # we don't need setup.py to find the macos sdk for us + sed -i '/sdk_path/d' setup.py ''; # To prevent importing of an incomplete package from the build directory diff --git a/pkgs/development/python-modules/pybtex-docutils/default.nix b/pkgs/development/python-modules/pybtex-docutils/default.nix index a4abd26a043f4..1bffde00e8e80 100644 --- a/pkgs/development/python-modules/pybtex-docutils/default.nix +++ b/pkgs/development/python-modules/pybtex-docutils/default.nix @@ -1,17 +1,37 @@ -{ lib, buildPythonPackage, fetchPypi, docutils, pybtex, six }: +{ lib +, buildPythonPackage +, docutils +, fetchPypi +, pybtex +, pytestCheckHook +, pythonOlder +}: buildPythonPackage rec { - version = "1.0.1"; pname = "pybtex-docutils"; + version = "1.0.2"; + format = "setuptools"; - doCheck = false; - buildInputs = [ docutils pybtex six ]; + disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - sha256 = "d53aa0c31dc94d61fd30ea3f06c749e6f510f9ff0e78cb2765a9300f173d8626"; + hash = "sha256-Q6o1O21Jj9WsMPAHOpjjMtBh00/mGdPVDRdh+P1KoBY="; }; + buildInputs = [ + docutils + pybtex + ]; + + checkInputs = [ + pytestCheckHook + ]; + + pythonImportsCheck = [ + "pybtex_docutils" + ]; + meta = with lib; { description = "A docutils backend for pybtex"; homepage = "https://github.com/mcmtroffaes/pybtex-docutils"; diff --git a/pkgs/development/python-modules/pyfronius/default.nix b/pkgs/development/python-modules/pyfronius/default.nix index b78aeb19545ee..8a27fb0bae9cd 100644 --- a/pkgs/development/python-modules/pyfronius/default.nix +++ b/pkgs/development/python-modules/pyfronius/default.nix @@ -2,6 +2,7 @@ , aiohttp , buildPythonPackage , fetchFromGitHub +, fetchpatch , pythonOlder , pytestCheckHook }: @@ -19,6 +20,14 @@ buildPythonPackage rec { sha256 = "1xwx0c1dp2374bwigzwhvcj4577vrxyhn6i5zv73k9ydc7w1xgyz"; }; + patches = [ + (fetchpatch { + # Python3.10 compatibility; https://github.com/nielstron/pyfronius/pull/7 + url = "https://github.com/nielstron/pyfronius/commit/9deb209d4246ff575cd3c4c5373037bf11df6719.patch"; + hash = "sha256-srXYCvp86kGYUYZIXMcu68hEbkTspD945J+hc/AhqSw="; + }) + ]; + propagatedBuildInputs = [ aiohttp ]; diff --git a/pkgs/development/python-modules/pygit2/default.nix b/pkgs/development/python-modules/pygit2/default.nix index 2d4deb16276b3..71589deae6f60 100644 --- a/pkgs/development/python-modules/pygit2/default.nix +++ b/pkgs/development/python-modules/pygit2/default.nix @@ -1,12 +1,27 @@ -{ stdenv, lib, buildPythonPackage, fetchPypi, isPyPy, isPy3k, libgit2, cached-property, pytestCheckHook, cffi, cacert }: +{ lib +, stdenv +, buildPythonPackage +, cacert +, cached-property +, cffi +, fetchPypi +, isPyPy +, libgit2 +, pycparser +, pytestCheckHook +, pythonOlder +}: buildPythonPackage rec { pname = "pygit2"; - version = "1.9.1"; + version = "1.9.2"; + format = "setuptools"; + + disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - sha256 = "sha256-72R5w7YZKCUxawVjNtt36/9ueEmusfu4i3YAGsM3uck="; + hash = "sha256-IIlEM98RRkgarK434rDzu7/eoCbbL1UGEXC9mCPkCxk="; }; preConfigure = lib.optionalString stdenv.isDarwin '' @@ -19,14 +34,21 @@ buildPythonPackage rec { propagatedBuildInputs = [ cached-property - ] ++ lib.optional (!isPyPy) cffi; + pycparser + ] ++ lib.optional (!isPyPy) [ + cffi + ]; - propagatedNativeBuildInputs = lib.optional (!isPyPy) cffi; + propagatedNativeBuildInputs = lib.optional (!isPyPy) [ + cffi + ]; - checkInputs = [ pytestCheckHook ]; + checkInputs = [ + pytestCheckHook + ]; disabledTestPaths = [ - # disable tests that require networking + # Disable tests that require networking "test/test_repository.py" "test/test_credentials.py" "test/test_submodule.py" @@ -44,10 +66,14 @@ buildPythonPackage rec { # https://github.com/NixOS/nixpkgs/pull/72544#issuecomment-582681068 doCheck = false; + pythonImportsCheck = [ + "pygit2" + ]; + meta = with lib; { description = "A set of Python bindings to the libgit2 shared library"; - homepage = "https://pypi.python.org/pypi/pygit2"; - license = licenses.gpl2; + homepage = "https://github.com/libgit2/pygit2"; + license = licenses.gpl2Only; maintainers = with maintainers; [ ]; }; } diff --git a/pkgs/development/python-modules/pykeepass/default.nix b/pkgs/development/python-modules/pykeepass/default.nix index 27470b66a6244..7ee7b7e2c5b40 100644 --- a/pkgs/development/python-modules/pykeepass/default.nix +++ b/pkgs/development/python-modules/pykeepass/default.nix @@ -6,13 +6,13 @@ buildPythonPackage rec { pname = "pykeepass"; - version = "4.0.1"; + version = "4.0.2"; src = fetchFromGitHub { owner = "libkeepass"; repo = "pykeepass"; - rev = version; - sha256 = "sha256-D+loaPBpKdXyiqpdth3ANDjH6IewuKYhj/DzRE2hDn4="; + rev = "v${version}"; + hash = "sha256-q6cBowEki5iJh04Hp1jwbWdteEu3HXtD3tG/TsYDRNI="; }; postPatch = '' @@ -30,9 +30,11 @@ buildPythonPackage rec { ${python.interpreter} -m unittest tests.tests ''; + pythonImportsCheck = [ "pykeepass" ]; + meta = with lib; { homepage = "https://github.com/libkeepass/pykeepass"; - changelog = "https://github.com/libkeepass/pykeepass/blob/${version}/CHANGELOG.rst"; + changelog = "https://github.com/libkeepass/pykeepass/blob/${src.rev}/CHANGELOG.rst"; description = "Python library to interact with keepass databases (supports KDBX3 and KDBX4)"; license = licenses.gpl3Only; maintainers = with maintainers; [ dotlambda ]; diff --git a/pkgs/development/python-modules/pymc3/default.nix b/pkgs/development/python-modules/pymc3/default.nix index 54a12481e116d..1d31188c9c89f 100644 --- a/pkgs/development/python-modules/pymc3/default.nix +++ b/pkgs/development/python-modules/pymc3/default.nix @@ -1,72 +1,64 @@ { lib -, fetchPypi +, aeppl +, aesara +, arviz , buildPythonPackage -, pythonOlder -, theano-pymc -, pandas -, patsy -, joblib , cachetools -, tqdm -, six -, h5py -, arviz -, packaging -, pytest -, nose -, parameterized +, cloudpickle , fastprogress +, fetchFromGitHub +, numpy +, pythonOlder +, scipy , typing-extensions -, dill -, semver }: buildPythonPackage rec { pname = "pymc3"; - version = "3.11.5"; - disabled = pythonOlder "3.5"; + version = "unstable-2022-05-23"; + format = "setuptools"; - src = fetchPypi { - inherit pname version; - sha256 = "sha256-M0HLvZYpCROLfV6+TtfP7in0Cy/nyt64iLOda7wXE4w="; - }; + disabled = pythonOlder "3.7"; - # No need for coverage stats in Nix builds - postPatch = '' - substituteInPlace setup.py --replace ", 'pytest-cov'" "" - ''; + src = fetchFromGitHub { + owner = "pymc-devs"; + repo = "pymc3"; + rev = "b5a5b569779673914c9420c1cc0135b118505ff5"; + hash = "sha256-vkIFwdjX2Rex8oqscVMP4xh0K4bjmN/RL7aQmOI//Dw="; + }; propagatedBuildInputs = [ - pandas - patsy - joblib - tqdm - six - h5py + aeppl + aesara arviz - packaging + cachetools + cloudpickle fastprogress + numpy + scipy typing-extensions - dill - theano-pymc - cachetools - semver ]; + postPatch = '' + substituteInPlace setup.py \ + --replace ', "pytest-cov"' "" + substituteInPlace requirements.txt \ + --replace "aesara==2.6.2" "aesara" \ + --replace "aeppl==0.0.28" "aeppl" + ''; + # The test suite is computationally intensive and test failures are not # indicative for package usability hence tests are disabled by default. doCheck = false; - pythonImportsCheck = [ "pymc3" ]; - # For some reason tests are run as a part of the *install* phase if enabled. - # Theano writes compiled code to ~/.theano hence we set $HOME. - preInstall = "export HOME=$(mktemp -d)"; - postInstall = "rm -rf $HOME"; + pythonImportsCheck = [ + "pymc" + ]; - meta = { + meta = with lib; { description = "Bayesian estimation, particularly using Markov chain Monte Carlo (MCMC)"; homepage = "https://github.com/pymc-devs/pymc3"; - license = lib.licenses.asl20; - maintainers = with lib.maintainers; [ nidabdella ]; + license = licenses.asl20; + maintainers = with maintainers; [ nidabdella ]; }; } diff --git a/pkgs/development/python-modules/pyprecice/default.nix b/pkgs/development/python-modules/pyprecice/default.nix index 7c278d6e1be9f..621850742af26 100644 --- a/pkgs/development/python-modules/pyprecice/default.nix +++ b/pkgs/development/python-modules/pyprecice/default.nix @@ -1,20 +1,40 @@ -{ lib, buildPythonPackage, fetchFromGitHub, precice, numpy, mpi4py, cython }: +{ lib +, buildPythonPackage +, cython +, fetchFromGitHub +, mpi4py +, numpy +, precice +, pythonOlder +}: buildPythonPackage rec { pname = "pyprecice"; - version = "2.3.0.1"; + version = "2.4.0.0"; + format = "setuptools"; + + disabled = pythonOlder "3.7"; src = fetchFromGitHub { owner = "precice"; repo = "python-bindings"; - rev = "v${version}"; - sha256 = "1yz96pif63ms797bzxbfrjba4mgz7cz5dqrqghn5sg0g1b9qxnn5"; + rev = "refs/tags/v${version}"; + hash = "sha256-Endy5oiC1OWdtZlVPUkIdkzoDTc1b5TaQ6VEUWq5iSg="; }; - nativeBuildInputs = [ cython ]; - propagatedBuildInputs = [ numpy mpi4py precice ]; + nativeBuildInputs = [ + cython + ]; + + propagatedBuildInputs = [ + numpy + mpi4py + precice + ]; + + # Disable Test because everything depends on open mpi which requires network + doCheck = false; - doCheck = false; # Disable Test because everything depends on open mpi which requires network. # Do not use pythonImportsCheck because this will also initialize mpi which requires a network interface meta = with lib; { diff --git a/pkgs/development/python-modules/pyro-ppl/default.nix b/pkgs/development/python-modules/pyro-ppl/default.nix index d4837dd9fb141..7bc6ac00925df 100644 --- a/pkgs/development/python-modules/pyro-ppl/default.nix +++ b/pkgs/development/python-modules/pyro-ppl/default.nix @@ -1,29 +1,62 @@ -{ buildPythonPackage, fetchPypi, lib, pytorch, contextlib2 -, graphviz, networkx, six, opt-einsum, tqdm, pyro-api }: +{ lib +, buildPythonPackage +, fetchPypi +, graphviz +, jupyter +, matplotlib +, networkx +, opt-einsum +, pandas +, pillow +, pyro-api +, pythonOlder +, pytorch +, scikit-learn +, seaborn +, torchvision +, tqdm +, wget +}: buildPythonPackage rec { - version = "1.8.1"; pname = "pyro-ppl"; + version = "1.8.1"; + format = "setuptools"; + + disabled = pythonOlder "3.7"; src = fetchPypi { inherit version pname; - sha256 = "sha256-18BJ6y50haYStN2ZwkwwnMhgx8vGsZczhwNPVDbRyNY="; + hash = "sha256-18BJ6y50haYStN2ZwkwwnMhgx8vGsZczhwNPVDbRyNY="; }; propagatedBuildInputs = [ pyro-api pytorch - contextlib2 - # TODO(tom): graphviz pulls in a lot of dependencies - make - # optional when some time to figure out how. - graphviz networkx - six opt-einsum tqdm ]; + passthru.optional-dependencies = { + extras = [ + graphviz + jupyter + # lap + matplotlib + pandas + pillow + scikit-learn + seaborn + torchvision + # visdom + wget + ]; + }; + # pyro not shipping tests do simple smoke test instead + doCheck = false; + pythonImportsCheck = [ "pyro" "pyro.distributions" @@ -31,12 +64,10 @@ buildPythonPackage rec { "pyro.optim" ]; - doCheck = false; - - meta = { - description = "A Python library for probabilistic modeling and inference"; + meta = with lib; { + description = "Library for probabilistic modeling and inference"; homepage = "http://pyro.ai"; - license = lib.licenses.mit; - maintainers = with lib.maintainers; [ teh georgewhewell ]; + license = licenses.asl20; + maintainers = with maintainers; [ teh georgewhewell ]; }; } diff --git a/pkgs/development/python-modules/sanic-auth/default.nix b/pkgs/development/python-modules/sanic-auth/default.nix index c854017ae782d..9e915dd66ed12 100644 --- a/pkgs/development/python-modules/sanic-auth/default.nix +++ b/pkgs/development/python-modules/sanic-auth/default.nix @@ -25,6 +25,11 @@ buildPythonPackage rec { sanic-testing ]; + disabledTests = [ + # incompatible with sanic>=22.3.0 + "test_login_required" + ]; + postPatch = '' # Support for httpx>=0.20.0 substituteInPlace tests/test_auth.py \ diff --git a/pkgs/development/python-modules/sanic-routing/default.nix b/pkgs/development/python-modules/sanic-routing/default.nix index b0ecc5ed122c3..cb06b5d1f2b3b 100644 --- a/pkgs/development/python-modules/sanic-routing/default.nix +++ b/pkgs/development/python-modules/sanic-routing/default.nix @@ -7,13 +7,13 @@ buildPythonPackage rec { pname = "sanic-routing"; - version = "0.7.2"; + version = "22.3.0"; src = fetchFromGitHub { owner = "sanic-org"; repo = "sanic-routing"; rev = "v${version}"; - hash = "sha256-MN6A8CtDVxj34eehr3UIwCT09VOfcruVX+/iImr1MgY="; + hash = "sha256-dX+uxrVjtPxX0ba3WUE/JKgj0PZzvFdKr/lXQgASN6Y="; }; checkInputs = [ pytestCheckHook pytest-asyncio ]; diff --git a/pkgs/development/python-modules/sanic-testing/default.nix b/pkgs/development/python-modules/sanic-testing/default.nix index 3fb60ebaa9e5c..173e2b91ff791 100644 --- a/pkgs/development/python-modules/sanic-testing/default.nix +++ b/pkgs/development/python-modules/sanic-testing/default.nix @@ -9,13 +9,13 @@ buildPythonPackage rec { pname = "sanic-testing"; - version = "0.8.2"; + version = "22.3.0"; src = fetchFromGitHub { owner = "sanic-org"; repo = "sanic-testing"; rev = "v${version}"; - sha256 = "17fbb78gvic5s9nlcgwj817fq1f9j9d1d7z6n2ahhinmvyzl9gc8"; + sha256 = "sha256-ZsLQA8rP4RrbVSUy5n0WZs903fnF7jtFqrIe5JVuRIg="; }; outputs = [ @@ -23,11 +23,6 @@ buildPythonPackage rec { "testsout" ]; - postPatch = '' - substituteInPlace setup.py \ - --replace "httpx>=0.18,<0.22" "httpx" - ''; - propagatedBuildInputs = [ httpx sanic diff --git a/pkgs/development/python-modules/sanic/default.nix b/pkgs/development/python-modules/sanic/default.nix index ff76e2c563134..e69579c935898 100644 --- a/pkgs/development/python-modules/sanic/default.nix +++ b/pkgs/development/python-modules/sanic/default.nix @@ -24,32 +24,23 @@ buildPythonPackage rec { pname = "sanic"; - version = "21.12.1"; + version = "22.3.2"; format = "setuptools"; - disabled = pythonOlder "3.7" || - pythonAtLeast "3.10"; # see GHSA-7p79-6x2v-5h88 + disabled = pythonOlder "3.7"; src = fetchFromGitHub { owner = "sanic-org"; repo = pname; rev = "v${version}"; - sha256 = "0jyl23q7b7fyqzan97qflkqcvmfpzbxbzv0qgygxasrzh80zx67g"; + hash = "sha256-4zdPp3X22dfZ5YlW3G5/OqeUxrt+NiFO9dk2XjEKXEg="; }; postPatch = '' # Loosen dependency requirements. substituteInPlace setup.py \ --replace "pytest==6.2.5" "pytest" \ - --replace "gunicorn==20.0.4" "gunicorn" \ - --replace "multidict>=5.0,<6.0" "multidict" - - sed '/pytest-sanic/d' setup.py - - # Patch a request headers test to allow brotli encoding - # (we build httpx with brotli support, upstream doesn't). - substituteInPlace tests/test_headers.py \ - --replace "deflate\r\n" "deflate, br\r\n" + --replace "gunicorn==20.0.4" "gunicorn" ''; propagatedBuildInputs = [ @@ -66,8 +57,6 @@ buildPythonPackage rec { beautifulsoup4 gunicorn pytest-asyncio - pytest-benchmark - pytest-sugar pytestCheckHook sanic-testing uvicorn @@ -95,49 +84,34 @@ buildPythonPackage rec { ]; disabledTests = [ - # Lack of uvloop setup through fixtures - "test_create_asyncio_server" - "test_listeners_triggered_async" - "test_tls_options" - # Tests are flaky - "test_keep_alive_client_timeout" - "test_check_timeouts_request_timeout" - "test_check_timeouts_response_timeout" - "test_reloader_live" - "test_zero_downtime" - # Not working from 21.9.1 - "test_create_server_main" - "test_create_server_main_convenience" - "test_debug" + # Fails to parse cmdline arguments + "test_dev" "test_auto_reload" - "test_no_exceptions_when_cancel_pending_request" - "test_ipv6_address_is_not_wrapped" - # Failure of the redirect tests seems to be related to httpx>0.20.0 - "test_redirect" - "test_chained_redirect" - "test_unix_connection" - # These appear to be very sensitive to output of commands - "test_access_logs" - "test_auto_reload" - "test_host_port" - "test_no_exceptions_when_cancel_pending_request" + "test_host_port_ipv6_loopback" "test_num_workers" - "test_server_run" - "test_version" - # Sensitive comparison of raw HTTP header fails - "test_raw_headers" - # noisy_exceptions sometimes missing from sanic stdout + "test_debug" + "test_access_logs" "test_noisy_exceptions" - ] ++ lib.optionals (stdenv.hostPlatform.system == "aarch64-linux") [ - # test fail on aarch64 - "test_tls_wrong_options" - "test_cookie_expires" - "test_gunicorn_worker" - "test_gunicorn_worker_no_logs" - "test_gunicorn_worker_with_logs" + # OSError: foo + "test_bad_headers" + "test_create_server_trigger_events" + "test_json_body_requests" + "test_missing_startup_raises_exception" + "test_no_body_requests" + "test_oserror_warning" + "test_running_multiple_offset_warning" + "test_streaming_body_requests" + "test_trigger_before_events_create_server" + "test_keep_alive_connection_context" + # Racy tests + "test_keep_alive_client_timeout" + "test_keep_alive_server_timeout" + "test_zero_downtime" ]; disabledTestPaths = [ + # We are not interested in benchmarks + "benchmark/" # unable to create async loop "test_app.py" "test_asgi.py" diff --git a/pkgs/development/python-modules/sentry-sdk/default.nix b/pkgs/development/python-modules/sentry-sdk/default.nix index 1a6c5c1418d0b..542178a3cae30 100644 --- a/pkgs/development/python-modules/sentry-sdk/default.nix +++ b/pkgs/development/python-modules/sentry-sdk/default.nix @@ -1,43 +1,47 @@ { lib , stdenv +, buildPythonPackage +, fetchFromGitHub +, pythonOlder + +# runtime +, certifi +, urllib3 + +# optionals , aiohttp -, asttokens +, apache-beam , blinker , botocore , bottle -, buildPythonPackage , celery -, certifi , chalice , django -, executing -, fakeredis , falcon -, fetchFromGitHub +, flask , flask_login -, gevent , httpx -, iana-etc -, isPy3k -, jsonschema -, libredirect , pure-eval , pyramid , pyspark -, pytest-django -, pytest-forked -, pytest-localserver -, pytestCheckHook -, pythonOlder , rq , sanic -, sanic-testing , sqlalchemy , tornado , trytond -, urllib3 , werkzeug -, multidict + +# tests +, asttokens +, executing +, gevent +, jsonschema +, mock +, pyrsistent +, pytest-forked +, pytest-localserver +, pytest-watch +, pytestCheckHook }: buildPythonPackage rec { @@ -59,37 +63,73 @@ buildPythonPackage rec { urllib3 ]; + passthru.optional-dependencies = { + aiohttp = [ + aiohttp + ]; + beam = [ + apache-beam + ]; + bottle = [ + bottle + ]; + celery = [ + celery + ]; + chalice = [ + chalice + ]; + django = [ + django + ]; + falcon = [ + falcon + ]; + flask = [ + flask + blinker + ]; + httpx = [ + httpx + ]; + pyspark = [ + pyspark + ]; + pure_eval = [ + asttokens + executing + pure-eval + ]; + quart = [ + # quart missing + blinker + ]; + rq = [ + rq + ]; + sanic = [ + sanic + ]; + sqlalchemy = [ + sqlalchemy + ]; + tornado = [ + tornado + ]; + }; + checkInputs = [ - aiohttp asttokens - blinker - botocore - bottle - celery - chalice - django executing - fakeredis - falcon - flask_login gevent - httpx jsonschema + mock pure-eval - pyramid - pyspark - pytest-django + pyrsistent pytest-forked pytest-localserver + pytest-watch pytestCheckHook - rq - sanic - sanic-testing - sqlalchemy - tornado - trytond - werkzeug - multidict ]; doCheck = !stdenv.isDarwin; @@ -97,53 +137,15 @@ buildPythonPackage rec { disabledTests = [ # Issue with the asseration "test_auto_enabling_integrations_catches_import_error" - # Output mismatch in sqlalchemy test - "test_too_large_event_truncated" - # Failing falcon tests - "test_has_context" - "uri_template-" - "path-" - "test_falcon_large_json_request" - "test_falcon_empty_json_request" - "test_falcon_raw_data_request" - # Failing spark tests - "test_set_app_properties" - "test_start_sentry_listener" - # Failing threading test - "test_circular_references" - # Failing wsgi tests - "test_session_mode_defaults_to_request_mode_in_wsgi_handler" - "test_auto_session_tracking_with_aggregates" - # Network requests to public web - "test_crumb_capture" - # TypeError: cannot unpack non-iterable TestResponse object - "test_rpc_error_page" ]; disabledTestPaths = [ - # Some tests are failing (network access, assertion errors) - "tests/integrations/aiohttp/" - "tests/integrations/gcp/" - "tests/integrations/httpx/" - "tests/integrations/stdlib/test_httplib.py" - # Tests are blocking - "tests/integrations/celery/" - # pytest-chalice is not available in nixpkgs yet - "tests/integrations/chalice/" - # broken since rq-1.10.1: https://github.com/getsentry/sentry-python/issues/1274 - "tests/integrations/rq/" - # broken since pytest 7.0.1; AssertionError: previous item was not torn down properly - "tests/utils/test_contextvars.py" - # broken since Flask and Werkzeug update to 2.1.0 (different error messages) - "tests/integrations/flask/test_flask.py" - "tests/integrations/bottle/test_bottle.py" - "tests/integrations/django/test_basic.py" - "tests/integrations/pyramid/test_pyramid.py" - ] - # test crashes on aarch64 - ++ lib.optionals (stdenv.buildPlatform != "x86_64-linux") [ + # Varius integration tests fail every once in a while when we + # upgrade depencies, so don't bother testing them. + "tests/integrations/" + ] ++ lib.optionals (stdenv.buildPlatform != "x86_64-linux") [ + # test crashes on aarch64 "tests/test_transport.py" - "tests/integrations/threading/test_threading.py" ]; pythonImportsCheck = [ diff --git a/pkgs/development/python-modules/sphinxcontrib-spelling/default.nix b/pkgs/development/python-modules/sphinxcontrib-spelling/default.nix index 0a0c0ec6ddeb3..5ffdc0221e7cc 100644 --- a/pkgs/development/python-modules/sphinxcontrib-spelling/default.nix +++ b/pkgs/development/python-modules/sphinxcontrib-spelling/default.nix @@ -10,14 +10,14 @@ buildPythonPackage rec { pname = "sphinxcontrib-spelling"; - version = "7.3.3"; + version = "7.4.0"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-OBnRJinZXgyQkiT6QLRipn4K2zIdUCg9f8DRFobIrH4="; + hash = "sha256-GLsQu912pXRg7dejBka9lXZt+oxv50/T7J2ZQ2BlmGA="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/trimesh/default.nix b/pkgs/development/python-modules/trimesh/default.nix index 2d021e0a502df..08325e2106c0e 100644 --- a/pkgs/development/python-modules/trimesh/default.nix +++ b/pkgs/development/python-modules/trimesh/default.nix @@ -6,11 +6,11 @@ buildPythonPackage rec { pname = "trimesh"; - version = "3.12.3"; + version = "3.12.4"; src = fetchPypi { inherit pname version; - sha256 = "sha256-MrvfSC6Uz/EJXQ3F5jAbWR0YJYRjqjwO7SIe0AUSOfA="; + sha256 = "sha256-lAbeCTjEUsNnjhJZNHs4ir8V0bJZUnBIGYYEXV80wyg="; }; propagatedBuildInputs = [ numpy ]; diff --git a/pkgs/development/python-modules/typecode/default.nix b/pkgs/development/python-modules/typecode/default.nix index 7b3a01a53a8ac..a177b845b4b33 100644 --- a/pkgs/development/python-modules/typecode/default.nix +++ b/pkgs/development/python-modules/typecode/default.nix @@ -3,7 +3,7 @@ , buildPythonPackage , setuptools-scm , attrs -, pdfminer +, pdfminer-six , commoncode , plugincode , binaryornot @@ -33,7 +33,7 @@ buildPythonPackage rec { propagatedBuildInputs = [ attrs - pdfminer + pdfminer-six commoncode plugincode binaryornot diff --git a/pkgs/development/python-modules/types-requests/default.nix b/pkgs/development/python-modules/types-requests/default.nix index 96d009a0b473d..c908eade20592 100644 --- a/pkgs/development/python-modules/types-requests/default.nix +++ b/pkgs/development/python-modules/types-requests/default.nix @@ -6,12 +6,12 @@ buildPythonPackage rec { pname = "types-requests"; - version = "2.27.27"; + version = "2.27.29"; format = "setuptools"; src = fetchPypi { inherit pname version; - sha256 = "sha256-1hjZgJ+jL1FM8XzqhGCBTaZxxWNm+xyQiszKi/GDESs="; + sha256 = "sha256-+0U7OnakjspmOBzqgAT+quoSg16DgZb1x6yHx1xcGe8="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/uvicorn/default.nix b/pkgs/development/python-modules/uvicorn/default.nix index a3238d4c5484e..2ed3bec5a73b7 100644 --- a/pkgs/development/python-modules/uvicorn/default.nix +++ b/pkgs/development/python-modules/uvicorn/default.nix @@ -19,14 +19,14 @@ buildPythonPackage rec { pname = "uvicorn"; - version = "0.17.5"; + version = "0.17.6"; disabled = pythonOlder "3.6"; src = fetchFromGitHub { owner = "encode"; repo = pname; rev = version; - sha256 = "sha256-66wPVnBLy2HK4p0m/b/DRxy12sk8AsVFZoFVcWRkL4s="; + hash = "sha256-iJlAU7zZl9X3FcQlJoJ7KlETZOx6WsE9FcpCK4Cm/Fo="; }; outputs = [ @@ -68,6 +68,7 @@ buildPythonPackage rec { meta = with lib; { homepage = "https://www.uvicorn.org/"; + changelog = "https://github.com/encode/uvicorn/blob/${src.rev}/CHANGELOG.md"; description = "The lightning-fast ASGI server"; license = licenses.bsd3; maintainers = with maintainers; [ wd15 ]; diff --git a/pkgs/development/python-modules/weboob/default.nix b/pkgs/development/python-modules/weboob/default.nix index 094dcb3bfbdff..6ceefbaa20ce2 100644 --- a/pkgs/development/python-modules/weboob/default.nix +++ b/pkgs/development/python-modules/weboob/default.nix @@ -12,7 +12,7 @@ , lxml , mechanize , nose -, pdfminer +, pdfminer-six , pillow , prettytable , pyqt5 @@ -54,7 +54,7 @@ buildPythonPackage rec { libyaml lxml mechanize - pdfminer + pdfminer-six pillow prettytable pyqt5 diff --git a/pkgs/development/python-modules/weconnect-mqtt/default.nix b/pkgs/development/python-modules/weconnect-mqtt/default.nix index 29736366f6742..0016fa76bf4ff 100644 --- a/pkgs/development/python-modules/weconnect-mqtt/default.nix +++ b/pkgs/development/python-modules/weconnect-mqtt/default.nix @@ -19,7 +19,7 @@ buildPythonPackage rec { owner = "tillsteinbach"; repo = "WeConnect-mqtt"; rev = "v${version}"; - sha256 = "sha256-Gj+hXgGkOqKnZ4W2iZ9P6JN3lYMoREMSF/wfGwLL/tc="; + hash = "sha256-Gj+hXgGkOqKnZ4W2iZ9P6JN3lYMoREMSF/wfGwLL/tc="; }; propagatedBuildInputs = [ @@ -35,7 +35,7 @@ buildPythonPackage rec { --replace "--cov=weconnect_mqtt --cov-config=.coveragerc --cov-report html" "" \ --replace "pytest-cov" "" substituteInPlace requirements.txt \ - --replace "weconnect[Images]~=0.35.1" "weconnect" + --replace "weconnect[Images]~=0.40.0" "weconnect" ''; checkInputs = [ diff --git a/pkgs/development/python-modules/weconnect/default.nix b/pkgs/development/python-modules/weconnect/default.nix index 906d240c9e754..5ea840e61ee5c 100644 --- a/pkgs/development/python-modules/weconnect/default.nix +++ b/pkgs/development/python-modules/weconnect/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { pname = "weconnect"; - version = "0.40.0"; + version = "0.41.0"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -21,7 +21,7 @@ buildPythonPackage rec { owner = "tillsteinbach"; repo = "WeConnect-python"; rev = "v${version}"; - sha256 = "sha256-NXINATb8/yDPnpwQEbPhuazdTlsZqv7BUPzedIg0IV4="; + hash = "sha256-y8vHniQ32WDQYPKfnOin1uLmr24KC1t6zSpxGdgwXOg="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/woob/default.nix b/pkgs/development/python-modules/woob/default.nix index a681b523a32e7..e9f5ec19d1d12 100644 --- a/pkgs/development/python-modules/woob/default.nix +++ b/pkgs/development/python-modules/woob/default.nix @@ -13,7 +13,7 @@ , lxml , mechanize , nose -, pdfminer +, pdfminer-six , pillow , prettytable , pyqt5 @@ -57,7 +57,7 @@ buildPythonPackage rec { libyaml lxml mechanize - pdfminer + pdfminer-six pillow prettytable pyqt5 diff --git a/pkgs/development/python-modules/xarray-einstats/default.nix b/pkgs/development/python-modules/xarray-einstats/default.nix new file mode 100644 index 0000000000000..921bedaae8bca --- /dev/null +++ b/pkgs/development/python-modules/xarray-einstats/default.nix @@ -0,0 +1,59 @@ +{ lib +, buildPythonPackage +, einops +, fetchFromGitHub +, flit-core +, numba +, numpy +, pandas +, pytestCheckHook +, pythonOlder +, scipy +, xarray +}: + +buildPythonPackage rec { + pname = "xarray-einstats"; + version = "0.2.2"; + format = "pyproject"; + + disabled = pythonOlder "3.7"; + + src = fetchFromGitHub { + owner = "arviz-devs"; + repo = pname; + rev = "v${version}"; + hash = "sha256-yc2dWKL9XhSSB7rUKS2uDCa4IyH/ajUf632Of2beY+4="; + }; + + nativeBuildInputs = [ + flit-core + ]; + + propagatedBuildInputs = [ + numpy + scipy + xarray + ]; + + checkInputs = [ + einops + numba + pytestCheckHook + ]; + + pythonImportsCheck = [ + "xarray_einstats" + ]; + + pytestFlagsArray = [ + "src/xarray_einstats/tests/" + ]; + + meta = with lib; { + description = "Stats, linear algebra and einops for xarray"; + homepage = "https://github.com/arviz-devs/xarray-einstats"; + license = licenses.asl20; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/pkgs/development/tools/analysis/checkstyle/default.nix b/pkgs/development/tools/analysis/checkstyle/default.nix index 8d84eed32b100..78537a64d50f6 100644 --- a/pkgs/development/tools/analysis/checkstyle/default.nix +++ b/pkgs/development/tools/analysis/checkstyle/default.nix @@ -1,12 +1,12 @@ { lib, stdenv, fetchurl, makeWrapper, jre }: stdenv.mkDerivation rec { - version = "10.1"; + version = "10.2"; pname = "checkstyle"; src = fetchurl { url = "https://github.com/checkstyle/checkstyle/releases/download/checkstyle-${version}/checkstyle-${version}-all.jar"; - sha256 = "sha256-raVTkfJou6mLgjZd4vriPOAeM+mrlWf3lo9kFstMpT8="; + sha256 = "sha256-jcu7KMeYbHZW4zswaV/cLkY4CLX9vJIcElXJq06EfRY="; }; nativeBuildInputs = [ makeWrapper ]; diff --git a/pkgs/development/tools/dapr/cli/default.nix b/pkgs/development/tools/dapr/cli/default.nix index d0d32de0ce137..2b09f72b868d4 100644 --- a/pkgs/development/tools/dapr/cli/default.nix +++ b/pkgs/development/tools/dapr/cli/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "dapr-cli"; - version = "1.7.0"; + version = "1.7.1"; src = fetchFromGitHub { owner = "dapr"; repo = "cli"; rev = "v${version}"; - sha256 = "sha256-+P1oXG+uvnFDGis5pz9VUQ4n1C7mjuetXz1OtN7IIrg="; + sha256 = "sha256-gEYN9r5hHRya1nqle8qHaUaOpuBN8cSLJx2FBRqyztw="; }; - vendorSha256 = "sha256-EvOyOy7DFQtFavOC9eBUZRJsj3pNdx7jumVmZ/THdaM="; + vendorSha256 = "sha256-RGEoewLDKo+D9Wp/v8PI/LPjCh2rFrdLO/AS4RWFliY="; nativeBuildInputs = [ installShellFiles ]; diff --git a/pkgs/development/tools/dprint/default.nix b/pkgs/development/tools/dprint/default.nix index a111cbb8744a3..ae84a786de3fd 100644 --- a/pkgs/development/tools/dprint/default.nix +++ b/pkgs/development/tools/dprint/default.nix @@ -2,14 +2,14 @@ rustPlatform.buildRustPackage rec { pname = "dprint"; - version = "0.28.0"; + version = "0.29.1"; src = fetchCrate { inherit pname version; - sha256 = "sha256-MGAkjjP6efdME4SncV18aLOOC4XxWutaYTINSIRCSp0="; + sha256 = "sha256-uLNZUIp8+fKr6l+vi8rqjXn9PrwAmpYnYuwtYjl2y+o="; }; - cargoSha256 = "sha256-k2BrkdLRFmppQcPm2dkbQIOlmIv/jsfwD8S/rsLxm+0="; + cargoSha256 = "sha256-bmbrnzUZfHvO5waMixZoD0DmWxVGtUXhIwZLLlHqPhs="; buildInputs = lib.optionals stdenv.isDarwin [ Security ]; diff --git a/pkgs/development/tools/esbuild/default.nix b/pkgs/development/tools/esbuild/default.nix index 1af15e82110e6..ce8ade8d6b3b4 100644 --- a/pkgs/development/tools/esbuild/default.nix +++ b/pkgs/development/tools/esbuild/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "esbuild"; - version = "0.14.38"; + version = "0.14.39"; src = fetchFromGitHub { owner = "evanw"; repo = "esbuild"; rev = "v${version}"; - sha256 = "sha256-rvMi1oC7qGidvi4zrm9KCMMntu6LJGVOGN6VmU2ivQE="; + sha256 = "sha256-li8uVs7SZ3KX0AbzyTDUesiqm8dQecrzyLjYKnQncj8="; }; vendorSha256 = "sha256-QPkBR+FscUc3jOvH7olcGUhM6OW4vxawmNJuRQxPuGs="; diff --git a/pkgs/development/tools/go-task/default.nix b/pkgs/development/tools/go-task/default.nix index ff8a8174fd750..a416b5b504243 100644 --- a/pkgs/development/tools/go-task/default.nix +++ b/pkgs/development/tools/go-task/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "go-task"; - version = "3.12.0"; + version = "3.12.1"; src = fetchFromGitHub { owner = pname; repo = "task"; rev = "v${version}"; - sha256 = "sha256-FArt9w4nZJW/Kql3Y2rr/IVz+SnWCS2lzNMWF6TN0Bg="; + sha256 = "sha256-N/xx5gATuLrHcWnMXgFMmz3wbFtaHsiPfDaNhdTbk5c="; }; vendorSha256 = "sha256-73DtLYyq3sltzv4VtZMlZaSbP9zA9RZw2wgXVkzwrso="; diff --git a/pkgs/development/tools/golangci-lint/default.nix b/pkgs/development/tools/golangci-lint/default.nix index 28b15172e4056..b47bdcbc15430 100644 --- a/pkgs/development/tools/golangci-lint/default.nix +++ b/pkgs/development/tools/golangci-lint/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "golangci-lint"; - version = "1.45.2"; + version = "1.46.2"; src = fetchFromGitHub { owner = "golangci"; repo = "golangci-lint"; rev = "v${version}"; - sha256 = "sha256-Mr45nJbpyzxo0ZPwx22JW2WrjyjI9FPpl+gZ7NIc6WQ="; + sha256 = "sha256-7sDAwWz+qoB/ngeH35tsJ5FZUfAQvQsU6kU9rUHIHMk="; }; - vendorSha256 = "sha256-pcbKg1ePN8pObS9EzP3QYjtaty27L9sroKUs/qEPtJo="; + vendorSha256 = "sha256-w38OKN6HPoz37utG/2QSPMai55IRDXCIIymeMe6ogIU="; doCheck = false; diff --git a/pkgs/development/tools/misc/saleae-logic-2/default.nix b/pkgs/development/tools/misc/saleae-logic-2/default.nix index a0f1b097a98a8..04526f59bd498 100644 --- a/pkgs/development/tools/misc/saleae-logic-2/default.nix +++ b/pkgs/development/tools/misc/saleae-logic-2/default.nix @@ -1,10 +1,10 @@ { lib, fetchurl, makeDesktopItem, appimageTools }: let name = "saleae-logic-2"; - version = "2.3.52"; + version = "2.3.53"; src = fetchurl { url = "https://downloads.saleae.com/logic2/Logic-${version}-master.AppImage"; - sha256 = "sha256-Z1xDVb1qFPtTi40dZ1CBw6ZqtQbYjuUjeUinBV+wdw8="; + sha256 = "sha256-RZrOyL0tb1nH5SX7P6d4TFkxSwDZiJUpu1eZaXqX3ew="; }; desktopItem = makeDesktopItem { inherit name; diff --git a/pkgs/development/tools/pip-audit/default.nix b/pkgs/development/tools/pip-audit/default.nix index 453104014d80a..942d87c32e20a 100644 --- a/pkgs/development/tools/pip-audit/default.nix +++ b/pkgs/development/tools/pip-audit/default.nix @@ -25,14 +25,14 @@ with py.pkgs; buildPythonApplication rec { pname = "pip-audit"; - version = "2.3.0"; + version = "2.3.1"; format = "pyproject"; src = fetchFromGitHub { owner = "trailofbits"; repo = pname; rev = "v${version}"; - hash = "sha256-OaWyBswqfzbo9pqN3oa92XNbfkMGARog2yH9kIyOzIk="; + hash = "sha256-W7g2ZV1Xf1s5sGRJiZdQcreBD6zp1/VRQPGs+VIOJE0="; }; nativeBuildInputs = [ diff --git a/pkgs/development/tools/rust/cargo-insta/default.nix b/pkgs/development/tools/rust/cargo-insta/default.nix index 727e9b38c053b..aa70a576d37c2 100644 --- a/pkgs/development/tools/rust/cargo-insta/default.nix +++ b/pkgs/development/tools/rust/cargo-insta/default.nix @@ -2,17 +2,17 @@ rustPlatform.buildRustPackage rec { pname = "cargo-insta"; - version = "1.13.0"; + version = "1.14.0"; src = fetchFromGitHub { owner = "mitsuhiko"; repo = "insta"; rev = version; - sha256 = "sha256-cSQEwsUqn+Q0ZWndBVatHL0btO7xLOJWO+MMjtSL0Zo="; + sha256 = "sha256-kTICdLL3paJIj779w4i7QUzhdynzyjo+YjtBorJsms4="; }; sourceRoot = "source/cargo-insta"; - cargoSha256 = "sha256-rn4ln/MeaDAQmWpxeTn3mGH4sEvO4876o1VPYiz/CR8="; + cargoSha256 = "sha256-Hfjz3arOvRbMIvV3o60zjRB2p4JbBUFPj66OpHZdIJg="; buildInputs = lib.optionals stdenv.isDarwin [ libiconv ]; meta = with lib; { diff --git a/pkgs/os-specific/linux/cfs-zen-tweaks/default.nix b/pkgs/os-specific/linux/cfs-zen-tweaks/default.nix new file mode 100644 index 0000000000000..a894e0bd4b69b --- /dev/null +++ b/pkgs/os-specific/linux/cfs-zen-tweaks/default.nix @@ -0,0 +1,43 @@ +{ lib +, stdenv +, fetchFromGitHub +, cmake +, makeWrapper +, gawk +}: + +stdenv.mkDerivation rec { + pname = "cfs-zen-tweaks"; + version = "1.2.0"; + + src = fetchFromGitHub { + owner = "igo95862"; + repo = "cfs-zen-tweaks"; + rev = version; + sha256 = "HRR2tdjNmWyrpbcMlihSdb/7g/tHma3YyXogQpRCVyo="; + }; + + postPatch = '' + patchShebangs set-cfs-zen-tweaks.bash + chmod +x set-cfs-zen-tweaks.bash + substituteInPlace set-cfs-zen-tweaks.bash \ + --replace '$(gawk' '$(${gawk}/bin/gawk' + ''; + + buildInputs = [ + gawk + ]; + + nativeBuildInputs = [ + cmake + makeWrapper + ]; + + meta = with lib; { + description = "Tweak Linux CPU scheduler for desktop responsiveness"; + homepage = "https://github.com/igo95862/cfs-zen-tweaks"; + license = licenses.gpl2Only; + platforms = platforms.linux; + maintainers = with maintainers; [ mkg20001 ]; + }; +} diff --git a/pkgs/os-specific/linux/kernel-headers/default.nix b/pkgs/os-specific/linux/kernel-headers/default.nix index 0c1514d01c253..aa9f4e3763b85 100644 --- a/pkgs/os-specific/linux/kernel-headers/default.nix +++ b/pkgs/os-specific/linux/kernel-headers/default.nix @@ -24,7 +24,7 @@ let flex bison python rsync ]; - extraIncludeDirs = lib.optional stdenvNoCC.hostPlatform.isPowerPC ["ppc"]; + extraIncludeDirs = lib.optional (with stdenvNoCC.hostPlatform; isPower && is32bit && isBigEndian) ["ppc"]; inherit patches; diff --git a/pkgs/os-specific/linux/kernel/common-config.nix b/pkgs/os-specific/linux/kernel/common-config.nix index 76f8122e477c2..20532d75e7642 100644 --- a/pkgs/os-specific/linux/kernel/common-config.nix +++ b/pkgs/os-specific/linux/kernel/common-config.nix @@ -29,7 +29,7 @@ let mkIf (stdenv.hostPlatform.isAarch32 || stdenv.hostPlatform.isAarch64 || stdenv.hostPlatform.isx86_64 || - (stdenv.hostPlatform.isPowerPC && stdenv.hostPlatform.is64bit) || + (stdenv.hostPlatform.isPower && stdenv.hostPlatform.is64bit) || (stdenv.hostPlatform.isMips && stdenv.hostPlatform.is64bit)); options = { diff --git a/pkgs/os-specific/linux/kernel/hardened/patches.json b/pkgs/os-specific/linux/kernel/hardened/patches.json index e66a432836da2..b6485a32851c7 100644 --- a/pkgs/os-specific/linux/kernel/hardened/patches.json +++ b/pkgs/os-specific/linux/kernel/hardened/patches.json @@ -2,61 +2,61 @@ "4.14": { "patch": { "extra": "-hardened1", - "name": "linux-hardened-4.14.280-hardened1.patch", - "sha256": "0hkn7rbgvnv9v7pzrg5g6ygmdzlrjl3yama9kp9aw0xw2akghmb4", - "url": "https://github.com/anthraxx/linux-hardened/releases/download/4.14.280-hardened1/linux-hardened-4.14.280-hardened1.patch" + "name": "linux-hardened-4.14.281-hardened1.patch", + "sha256": "1i70qrv9dfpp0szl2m6icrnzpgw1r21nr4b6bbpdf1gmq22y9gf1", + "url": "https://github.com/anthraxx/linux-hardened/releases/download/4.14.281-hardened1/linux-hardened-4.14.281-hardened1.patch" }, - "sha256": "01jr0f7mq919s7xxvv8sc1mg6isc1ggij33l2s0n6jvykm23ghrr", - "version": "4.14.280" + "sha256": "0pivb1m2cwqnlm8bhd4ccnlq9pwp2r5lmn77gp91k6vbjv3gkqis", + "version": "4.14.281" }, "4.19": { "patch": { "extra": "-hardened1", - "name": "linux-hardened-4.19.244-hardened1.patch", - "sha256": "063q4vd0spk602s4if751341jaansh0764qq7fhy764j31678n0j", - "url": "https://github.com/anthraxx/linux-hardened/releases/download/4.19.244-hardened1/linux-hardened-4.19.244-hardened1.patch" + "name": "linux-hardened-4.19.245-hardened1.patch", + "sha256": "181bsz4zzw1hmk3l0cxrgfxlf1z5gy86bxrnwxh08n3j35biywf2", + "url": "https://github.com/anthraxx/linux-hardened/releases/download/4.19.245-hardened1/linux-hardened-4.19.245-hardened1.patch" }, - "sha256": "1g9562v6ny196rw2n3kj43nrz65qa7imwnmfasvj6x8fm8bdhz79", - "version": "4.19.244" + "sha256": "1s58qci6xhmss12glzkqk41kp60pqmzh4d84kyz4m4nf4xhdvzcr", + "version": "4.19.245" }, "5.10": { "patch": { "extra": "-hardened1", - "name": "linux-hardened-5.10.117-hardened1.patch", - "sha256": "1l53sjknm8q76r1jljm321cmh6ic36pc9w5rmi68lbds19ndfpx3", - "url": "https://github.com/anthraxx/linux-hardened/releases/download/5.10.117-hardened1/linux-hardened-5.10.117-hardened1.patch" + "name": "linux-hardened-5.10.118-hardened1.patch", + "sha256": "0kn33lzb92p80rvy3jzkhnv5izr8h082x400s6ihxp1sqdal0fb7", + "url": "https://github.com/anthraxx/linux-hardened/releases/download/5.10.118-hardened1/linux-hardened-5.10.118-hardened1.patch" }, - "sha256": "1iyw3nmsga2binmrhfnzsf1pvn2bs21a8jw6vm89k26z5h8zfgkh", - "version": "5.10.117" + "sha256": "0jqbzvgbvaldwwarvg27mcv2kfcgmfw72zpy4h4sp5d1hzqj1q65", + "version": "5.10.118" }, "5.15": { "patch": { "extra": "-hardened1", - "name": "linux-hardened-5.15.41-hardened1.patch", - "sha256": "1y98rvn4qyx8w8bjchfzsd7g9gkhfm20cwaj3p88sgq7q81kyz8s", - "url": "https://github.com/anthraxx/linux-hardened/releases/download/5.15.41-hardened1/linux-hardened-5.15.41-hardened1.patch" + "name": "linux-hardened-5.15.43-hardened1.patch", + "sha256": "03ilpzhr01567aaadwwk3qdnh9hlm427ihyrr59dwlwsfcqy2fd9", + "url": "https://github.com/anthraxx/linux-hardened/releases/download/5.15.43-hardened1/linux-hardened-5.15.43-hardened1.patch" }, - "sha256": "07jrsr54rvhry3g401h58r1773zinq49dbrkb9v1p6q27gyb2z1w", - "version": "5.15.41" + "sha256": "04hwaykdjdqhcdk1pr6p4kkyw6h3z6ig4qpsra2klxsqklx92jq6", + "version": "5.15.43" }, "5.17": { "patch": { "extra": "-hardened1", - "name": "linux-hardened-5.17.9-hardened1.patch", - "sha256": "0n7zz04vnajpsfn662fxx75jinnr0kpqwzyypgwn99v4lmsxvza1", - "url": "https://github.com/anthraxx/linux-hardened/releases/download/5.17.9-hardened1/linux-hardened-5.17.9-hardened1.patch" + "name": "linux-hardened-5.17.11-hardened1.patch", + "sha256": "01l4k1j23ckkifjxwaq9lcfp7ynpasyn5f7nqsff6xx2wcg0qyxf", + "url": "https://github.com/anthraxx/linux-hardened/releases/download/5.17.11-hardened1/linux-hardened-5.17.11-hardened1.patch" }, - "sha256": "0y2rmn86z3cvgv71b6sjjyafnlbanlib1kjpjjqzjbgg86y2890p", - "version": "5.17.9" + "sha256": "0c8vz02lbfm0zkgsr1gvdp8bzxz255dk863pnakw6d77z9bfc22p", + "version": "5.17.11" }, "5.4": { "patch": { "extra": "-hardened1", - "name": "linux-hardened-5.4.195-hardened1.patch", - "sha256": "1q7a211jw22nl1yz3k3cv6g4h7csir0wwyypzij54xbg3k7by0p9", - "url": "https://github.com/anthraxx/linux-hardened/releases/download/5.4.195-hardened1/linux-hardened-5.4.195-hardened1.patch" + "name": "linux-hardened-5.4.196-hardened1.patch", + "sha256": "11q9sadncbz84yhsai7xdbrgmcbghj0hc1lqc45767v1f3snmpyi", + "url": "https://github.com/anthraxx/linux-hardened/releases/download/5.4.196-hardened1/linux-hardened-5.4.196-hardened1.patch" }, - "sha256": "078380qhds2jwfmrchna6p27wpfb74pvnj4xiyc5k38gysfmnbzj", - "version": "5.4.195" + "sha256": "1x5irgki792f21hm5146xary0260cl9r475kvw8vm9w32vyx18ig", + "version": "5.4.196" } } diff --git a/pkgs/os-specific/linux/kernel/linux-4.14.nix b/pkgs/os-specific/linux/kernel/linux-4.14.nix index 4c4d7c9324507..bfed578429ef9 100644 --- a/pkgs/os-specific/linux/kernel/linux-4.14.nix +++ b/pkgs/os-specific/linux/kernel/linux-4.14.nix @@ -3,7 +3,7 @@ with lib; buildLinux (args // rec { - version = "4.14.280"; + version = "4.14.281"; # modDirVersion needs to be x.y.z, will automatically add .0 if needed modDirVersion = if (modDirVersionArg == null) then concatStringsSep "." (take 3 (splitVersion "${version}.0")) else modDirVersionArg; @@ -13,6 +13,6 @@ buildLinux (args // rec { src = fetchurl { url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz"; - sha256 = "01jr0f7mq919s7xxvv8sc1mg6isc1ggij33l2s0n6jvykm23ghrr"; + sha256 = "0pivb1m2cwqnlm8bhd4ccnlq9pwp2r5lmn77gp91k6vbjv3gkqis"; }; } // (args.argsOverride or {})) diff --git a/pkgs/os-specific/linux/kernel/linux-4.19.nix b/pkgs/os-specific/linux/kernel/linux-4.19.nix index ea79db67ed75f..606fe18413fe3 100644 --- a/pkgs/os-specific/linux/kernel/linux-4.19.nix +++ b/pkgs/os-specific/linux/kernel/linux-4.19.nix @@ -3,7 +3,7 @@ with lib; buildLinux (args // rec { - version = "4.19.244"; + version = "4.19.245"; # modDirVersion needs to be x.y.z, will automatically add .0 if needed modDirVersion = if (modDirVersionArg == null) then concatStringsSep "." (take 3 (splitVersion "${version}.0")) else modDirVersionArg; @@ -13,6 +13,6 @@ buildLinux (args // rec { src = fetchurl { url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz"; - sha256 = "1g9562v6ny196rw2n3kj43nrz65qa7imwnmfasvj6x8fm8bdhz79"; + sha256 = "1s58qci6xhmss12glzkqk41kp60pqmzh4d84kyz4m4nf4xhdvzcr"; }; } // (args.argsOverride or {})) diff --git a/pkgs/os-specific/linux/kernel/linux-4.9.nix b/pkgs/os-specific/linux/kernel/linux-4.9.nix index 9f82f1805e909..93570b9b5c0ea 100644 --- a/pkgs/os-specific/linux/kernel/linux-4.9.nix +++ b/pkgs/os-specific/linux/kernel/linux-4.9.nix @@ -1,12 +1,12 @@ { buildPackages, fetchurl, perl, buildLinux, nixosTests, stdenv, ... } @ args: buildLinux (args // rec { - version = "4.9.315"; + version = "4.9.316"; extraMeta.branch = "4.9"; extraMeta.broken = stdenv.isAarch64; src = fetchurl { url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz"; - sha256 = "1171p90s00jxg1clyz8kp81ilmdzygg131mxysr6lpkaisahkjg6"; + sha256 = "05yd7djm6dcxv3vaylhmj3p0yml421azv8qabmhv4ric1f99idjp"; }; } // (args.argsOverride or {})) diff --git a/pkgs/os-specific/linux/kernel/linux-5.10.nix b/pkgs/os-specific/linux/kernel/linux-5.10.nix index daeabc5383709..aa4a489692d99 100644 --- a/pkgs/os-specific/linux/kernel/linux-5.10.nix +++ b/pkgs/os-specific/linux/kernel/linux-5.10.nix @@ -3,7 +3,7 @@ with lib; buildLinux (args // rec { - version = "5.10.117"; + version = "5.10.118"; # modDirVersion needs to be x.y.z, will automatically add .0 if needed modDirVersion = if (modDirVersionArg == null) then concatStringsSep "." (take 3 (splitVersion "${version}.0")) else modDirVersionArg; @@ -13,6 +13,6 @@ buildLinux (args // rec { src = fetchurl { url = "mirror://kernel/linux/kernel/v5.x/linux-${version}.tar.xz"; - sha256 = "1iyw3nmsga2binmrhfnzsf1pvn2bs21a8jw6vm89k26z5h8zfgkh"; + sha256 = "0jqbzvgbvaldwwarvg27mcv2kfcgmfw72zpy4h4sp5d1hzqj1q65"; }; } // (args.argsOverride or {})) diff --git a/pkgs/os-specific/linux/kernel/linux-5.15.nix b/pkgs/os-specific/linux/kernel/linux-5.15.nix index f2d550a285b1e..5c559fc866453 100644 --- a/pkgs/os-specific/linux/kernel/linux-5.15.nix +++ b/pkgs/os-specific/linux/kernel/linux-5.15.nix @@ -3,7 +3,7 @@ with lib; buildLinux (args // rec { - version = "5.15.41"; + version = "5.15.43"; # modDirVersion needs to be x.y.z, will automatically add .0 if needed modDirVersion = if (modDirVersionArg == null) then concatStringsSep "." (take 3 (splitVersion "${version}.0")) else modDirVersionArg; @@ -15,6 +15,6 @@ buildLinux (args // rec { src = fetchurl { url = "mirror://kernel/linux/kernel/v5.x/linux-${version}.tar.xz"; - sha256 = "07jrsr54rvhry3g401h58r1773zinq49dbrkb9v1p6q27gyb2z1w"; + sha256 = "04hwaykdjdqhcdk1pr6p4kkyw6h3z6ig4qpsra2klxsqklx92jq6"; }; } // (args.argsOverride or { })) diff --git a/pkgs/os-specific/linux/kernel/linux-5.17.nix b/pkgs/os-specific/linux/kernel/linux-5.17.nix index 46384061684db..19e521432fde9 100644 --- a/pkgs/os-specific/linux/kernel/linux-5.17.nix +++ b/pkgs/os-specific/linux/kernel/linux-5.17.nix @@ -3,7 +3,7 @@ with lib; buildLinux (args // rec { - version = "5.17.9"; + version = "5.17.11"; # modDirVersion needs to be x.y.z, will automatically add .0 if needed modDirVersion = if (modDirVersionArg == null) then concatStringsSep "." (take 3 (splitVersion "${version}.0")) else modDirVersionArg; @@ -13,6 +13,6 @@ buildLinux (args // rec { src = fetchurl { url = "mirror://kernel/linux/kernel/v5.x/linux-${version}.tar.xz"; - sha256 = "0y2rmn86z3cvgv71b6sjjyafnlbanlib1kjpjjqzjbgg86y2890p"; + sha256 = "0c8vz02lbfm0zkgsr1gvdp8bzxz255dk863pnakw6d77z9bfc22p"; }; } // (args.argsOverride or { })) diff --git a/pkgs/os-specific/linux/kernel/linux-5.4.nix b/pkgs/os-specific/linux/kernel/linux-5.4.nix index 1d5bbc07832fd..b2d9a81d0f8bc 100644 --- a/pkgs/os-specific/linux/kernel/linux-5.4.nix +++ b/pkgs/os-specific/linux/kernel/linux-5.4.nix @@ -3,7 +3,7 @@ with lib; buildLinux (args // rec { - version = "5.4.195"; + version = "5.4.196"; # modDirVersion needs to be x.y.z, will automatically add .0 if needed modDirVersion = if (modDirVersionArg == null) then concatStringsSep "." (take 3 (splitVersion "${version}.0")) else modDirVersionArg; @@ -13,6 +13,6 @@ buildLinux (args // rec { src = fetchurl { url = "mirror://kernel/linux/kernel/v5.x/linux-${version}.tar.xz"; - sha256 = "078380qhds2jwfmrchna6p27wpfb74pvnj4xiyc5k38gysfmnbzj"; + sha256 = "1x5irgki792f21hm5146xary0260cl9r475kvw8vm9w32vyx18ig"; }; } // (args.argsOverride or {})) diff --git a/pkgs/servers/dex/default.nix b/pkgs/servers/dex/default.nix index 92cf4cd66588c..3352911a4434a 100644 --- a/pkgs/servers/dex/default.nix +++ b/pkgs/servers/dex/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "dex"; - version = "2.31.1"; + version = "2.31.2"; src = fetchFromGitHub { owner = "dexidp"; repo = pname; rev = "v${version}"; - sha256 = "sha256-4BmZpN3k1qDYLdkXm4AX73bX5hBiyLv0nVKYVwD/HCM="; + sha256 = "sha256-x9U+LtcgVYODQoiTkFShdALFfrTIhingrJ43RpHbc78="; }; vendorSha256 = "sha256-l+/qjYokg5zHAFkKxtkdX49HqVW6kfz7OHqs6SRKDYg="; @@ -32,7 +32,7 @@ buildGoModule rec { description = "OpenID Connect and OAuth2 identity provider with pluggable connectors"; homepage = "https://github.com/dexidp/dex"; license = licenses.asl20; - maintainers = with maintainers; [ benley ]; + maintainers = with maintainers; [ benley techknowlogick ]; platforms = platforms.unix; }; } diff --git a/pkgs/servers/monitoring/telegraf/default.nix b/pkgs/servers/monitoring/telegraf/default.nix index 5c1f2e6862bd3..2285693df678d 100644 --- a/pkgs/servers/monitoring/telegraf/default.nix +++ b/pkgs/servers/monitoring/telegraf/default.nix @@ -2,7 +2,7 @@ buildGoModule rec { pname = "telegraf"; - version = "1.22.1"; + version = "1.22.4"; excludedPackages = "test"; @@ -12,10 +12,10 @@ buildGoModule rec { owner = "influxdata"; repo = "telegraf"; rev = "v${version}"; - sha256 = "sha256-W6o+dFUdnH4c+SLwqhoutOsXf+XLu2qNjYytPp43fjk="; + sha256 = "sha256-Cftxm+Lb3ekK8YZrklD/C+p0EpyEVU/xxVI5oiNgBxk="; }; - vendorSha256 = "sha256-28Xz8fIlrdCVkG0x5toJXht+RIkBmey4wi6WGqsq80k="; + vendorSha256 = "sha256-E1p9hnxNFse7Zg8FGcZrbVqThrGTVSP04nH/ZP8WBlk="; proxyVendor = true; ldflags = [ diff --git a/pkgs/servers/redpanda/default.nix b/pkgs/servers/redpanda/default.nix index c2060560c594b..f7c11fe39f636 100644 --- a/pkgs/servers/redpanda/default.nix +++ b/pkgs/servers/redpanda/default.nix @@ -1,14 +1,14 @@ { lib, stdenv, fetchzip }: let - version = "21.11.15"; + version = "22.1.3"; platform = if stdenv.isLinux then "linux" else "darwin"; arch = if stdenv.isAarch64 then "arm" else "amd"; sha256s = { - darwin.amd = "sha256-Yf4O7lVcf+nmb0wFTx7jLjUSmdAItoUfPlkhHveI9UY="; - darwin.arm = "sha256-vKfFBheDZtvcbg0zbj3rqUEQczZvySuGuM3RopnDJG8="; - linux.amd = "sha256:0vpxn7kcpqylk0nc74m6yxgwwf8ns8pyb6kxnmnmv2x58f8x4c8n"; - linux.arm = "sha256-1AQSB2V5zGivU0UinTST2kOydQf/bmLbpjdW0Yo4ptE="; + darwin.amd = "sha256-AXk3aP1SGiHTfHTCBRTagX0DAVmdcVVIkxWaTnZxB8g="; + darwin.arm = "sha256-pvOVvNc8lZ2d2fVZVYWvumVWYpnLORNY/3o1t4BN2N4="; + linux.amd = "sha256-Uz7KjbsH3lKRL0iI73DxwS5rcIkPQiMFkIQsc06gF0k="; + linux.arm = "sha256-WHjYAbytiu747jFqN0KZ/CkIwAVI7fb32ywtRiQOBm8="; }; in stdenv.mkDerivation rec { pname = "redpanda"; @@ -25,6 +25,12 @@ in stdenv.mkDerivation rec { mkdir -p $out/bin cp rpk $out/bin + ${lib.optionalString stdenv.isLinux '' + patchelf \ + --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \ + $out/bin/rpk + ''} + runHook postInstall ''; diff --git a/pkgs/servers/sql/mariadb/default.nix b/pkgs/servers/sql/mariadb/default.nix index 50989a42e3e3f..71b638b9ab8c2 100644 --- a/pkgs/servers/sql/mariadb/default.nix +++ b/pkgs/servers/sql/mariadb/default.nix @@ -60,7 +60,7 @@ commonOptions = packageSettings: rec { # attributes common to both builds cmakeFlags = [ "-DBUILD_CONFIG=mysql_release" - "-DMANUFACTURER=NixOS.org" + "-DMANUFACTURER=nixos.org" "-DDEFAULT_CHARSET=utf8mb4" "-DDEFAULT_COLLATION=utf8mb4_unicode_ci" "-DSECURITY_HARDENED=ON" diff --git a/pkgs/servers/sql/postgresql/ext/pgvector.nix b/pkgs/servers/sql/postgresql/ext/pgvector.nix index 654d9a30f30db..1b71dd01c8e8c 100644 --- a/pkgs/servers/sql/postgresql/ext/pgvector.nix +++ b/pkgs/servers/sql/postgresql/ext/pgvector.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "pgvector"; - version = "0.2.5"; + version = "0.2.6"; src = fetchFromGitHub { owner = "ankane"; repo = pname; rev = "v${version}"; - sha256 = "sha256-5tnitx2KdyARgeaaDINWbn5JtQ4j0aq2BQBljRZOmsk="; + sha256 = "sha256-NmUI4pXwf6PHuLbkFy/hoA67j++A2Ju7zG/4og9U+qk="; }; buildInputs = [ postgresql ]; diff --git a/pkgs/shells/fish/default.nix b/pkgs/shells/fish/default.nix index e9555c7f21f8e..3969fdace8ba7 100644 --- a/pkgs/shells/fish/default.nix +++ b/pkgs/shells/fish/default.nix @@ -186,6 +186,7 @@ let rm tests/pexpects/exit_handlers.py ''; + outputs = [ "out" "doc" ]; strictDeps = true; nativeBuildInputs = [ cmake @@ -199,7 +200,7 @@ let ]; cmakeFlags = [ - "-DCMAKE_INSTALL_DOCDIR=${placeholder "out"}/share/doc/fish" + "-DCMAKE_INSTALL_DOCDIR=${placeholder "doc"}/share/doc/fish" ] ++ lib.optionals stdenv.isDarwin [ "-DMAC_CODESIGN_ID=OFF" ]; diff --git a/pkgs/tools/admin/syft/default.nix b/pkgs/tools/admin/syft/default.nix index 73e3136c711e0..73c2553ba71b6 100644 --- a/pkgs/tools/admin/syft/default.nix +++ b/pkgs/tools/admin/syft/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "syft"; - version = "0.46.2"; + version = "0.46.3"; src = fetchFromGitHub { owner = "anchore"; repo = pname; rev = "v${version}"; - sha256 = "sha256-eVW8Ho23Yylo8B7m7h175yCDjDuh7dbI+ZeiB4SCNAM="; + sha256 = "sha256-4Yo9CIAVEOtAvsvGzSXerTwCbvylo7MjwJwWU6uJAX8="; # populate values that require us to use git. By doing this in postFetch we # can delete .git afterwards and maintain better reproducibility of the src. leaveDotGit = true; diff --git a/pkgs/tools/admin/trivy/default.nix b/pkgs/tools/admin/trivy/default.nix index a3bd6bca4dc1e..1208fcc5eba5e 100644 --- a/pkgs/tools/admin/trivy/default.nix +++ b/pkgs/tools/admin/trivy/default.nix @@ -6,15 +6,15 @@ buildGoModule rec { pname = "trivy"; - version = "0.28.0"; + version = "0.28.1"; src = fetchFromGitHub { owner = "aquasecurity"; repo = pname; rev = "v${version}"; - sha256 = "sha256-zyTUGAxUAfrigRNiw03ZXFK+UkpuxwuU2xviZmAPuR8="; + sha256 = "sha256-x9mojwA86zgXRwKDp1kIh5/LRdHjm02119CKYlIkZgw="; }; - vendorSha256 = "sha256-dgiKWHSm49/CB4dWrNWIzkkmj6Aw4l+9iLa6xe/umq0="; + vendorSha256 = "sha256-7rX4j188IXhSS4E4NStAsJq4FEfAFxIys7jucDCCe+4="; excludedPackages = "misc"; diff --git a/pkgs/tools/games/minecraft/packwiz/default.nix b/pkgs/tools/games/minecraft/packwiz/default.nix new file mode 100644 index 0000000000000..3be2798312e77 --- /dev/null +++ b/pkgs/tools/games/minecraft/packwiz/default.nix @@ -0,0 +1,38 @@ +{ lib +, buildGoModule +, fetchFromGitHub +, installShellFiles +}: + +buildGoModule rec { + pname = "packwiz"; + version = "unstable-2022-5-25"; + + src = fetchFromGitHub { + owner = "packwiz"; + repo = "packwiz"; + rev = "e71b63ea98283c8c1f0e03ee51ae40f452f22a61"; + sha256 = "sha256-XwGacEVfQAduDCSMQFRw7Xnx4bND2zaV7l27B+2u5xg="; + }; + + vendorSha256 = "sha256-M9u7N4IrL0B4pPRQwQG5TlMaGT++w3ZKHZ0RdxEHPKk="; + + nativeBuildInputs = [ + installShellFiles + ]; + + postInstall = '' + installShellCompletion --cmd packwiz \ + --bash <($out/bin/packwiz completion bash) \ + --fish <($out/bin/packwiz completion fish) \ + --zsh <($out/bin/packwiz completion zsh) + ''; + + meta = with lib; { + description = "A command line tool for editing and distributing Minecraft modpacks, using a git-friendly TOML format"; + homepage = "https://packwiz.infra.link/"; + license = licenses.mit; + maintainers = with maintainers; [ infinidoge ]; + mainProgram = "packwiz"; + }; +} diff --git a/pkgs/tools/inputmethods/fcitx5/fcitx5-hangul.nix b/pkgs/tools/inputmethods/fcitx5/fcitx5-hangul.nix index 7a612f6810dff..62161bcfafdfb 100644 --- a/pkgs/tools/inputmethods/fcitx5/fcitx5-hangul.nix +++ b/pkgs/tools/inputmethods/fcitx5/fcitx5-hangul.nix @@ -10,13 +10,13 @@ stdenv.mkDerivation rec { pname = "fcitx5-hangul"; - version = "5.0.8"; + version = "5.0.9"; src = fetchFromGitHub { owner = "fcitx"; repo = pname; rev = version; - sha256 = "sha256-b8vxPzTmvmvWkO5H/yf+Kg9xPQ/53tR9jQsD11KjzJw="; + sha256 = "sha256-jT9k5QXW3fdG6s91NjFZ3lrjADy8wxf2SRiVDSnr6So="; }; nativeBuildInputs = [ diff --git a/pkgs/tools/inputmethods/fcitx5/fcitx5-lua.nix b/pkgs/tools/inputmethods/fcitx5/fcitx5-lua.nix index 2c59c2539afde..72d7cb6480db2 100644 --- a/pkgs/tools/inputmethods/fcitx5/fcitx5-lua.nix +++ b/pkgs/tools/inputmethods/fcitx5/fcitx5-lua.nix @@ -10,13 +10,13 @@ stdenv.mkDerivation rec { pname = "fcitx5-lua"; - version = "5.0.7"; + version = "5.0.8"; src = fetchFromGitHub { owner = "fcitx"; repo = pname; rev = version; - sha256 = "sha256-ZZwPjELIJczF3AJxQqJcwA6J8vGuPdit/0dEHS+g7J0="; + sha256 = "sha256-VHGHKV5KLbfIMWLErLRNl8pOQOkYkc/f6VjZUSqluFk="; }; nativeBuildInputs = [ diff --git a/pkgs/tools/inputmethods/fcitx5/fcitx5-m17n.nix b/pkgs/tools/inputmethods/fcitx5/fcitx5-m17n.nix index ab2219bfb9a86..214d7ea699d1b 100644 --- a/pkgs/tools/inputmethods/fcitx5/fcitx5-m17n.nix +++ b/pkgs/tools/inputmethods/fcitx5/fcitx5-m17n.nix @@ -13,13 +13,13 @@ stdenv.mkDerivation rec { pname = "fcitx5-m17n"; - version = "5.0.8"; + version = "5.0.9"; src = fetchFromGitHub { owner = "fcitx"; repo = pname; rev = version; - sha256 = "sha256-Mh3a7PzfNmGGXzKb/6QUgLmRw7snsM3WSOduFdxj6OM="; + sha256 = "sha256-JySEzWyPZqVrvgRA4Hc0ZSGLdS29n8uoSQsFEMK6kbs="; }; nativeBuildInputs = [ diff --git a/pkgs/tools/inputmethods/fcitx5/fcitx5-rime.nix b/pkgs/tools/inputmethods/fcitx5/fcitx5-rime.nix index fac81c8dea12b..2dfa238225a7f 100644 --- a/pkgs/tools/inputmethods/fcitx5/fcitx5-rime.nix +++ b/pkgs/tools/inputmethods/fcitx5/fcitx5-rime.nix @@ -10,13 +10,13 @@ stdenv.mkDerivation rec { pname = "fcitx5-rime"; - version = "5.0.12"; + version = "5.0.13"; src = fetchFromGitHub { owner = "fcitx"; repo = pname; rev = version; - sha256 = "sha256-8ETSRBTznd4AKzYbSW/zIMZXV+yuHXLhfTJV3DJ2ahc="; + sha256 = "sha256-/oQdBCDV5obSHw7dzdceC+zWHcNve3NDlA50GhvkK8o="; }; cmakeFlags = [ diff --git a/pkgs/tools/inputmethods/fcitx5/fcitx5-table-extra.nix b/pkgs/tools/inputmethods/fcitx5/fcitx5-table-extra.nix index 7531fa074c14f..8076cccb68c7e 100644 --- a/pkgs/tools/inputmethods/fcitx5/fcitx5-table-extra.nix +++ b/pkgs/tools/inputmethods/fcitx5/fcitx5-table-extra.nix @@ -10,13 +10,13 @@ stdenv.mkDerivation rec { pname = "fcitx5-table-extra"; - version = "5.0.9"; + version = "5.0.10"; src = fetchFromGitHub { owner = "fcitx"; repo = pname; rev = version; - sha256 = "sha256-FEpBpEfq9qRLQ+j+313ua3zhZnphdaYy9jPKyb8oUG8="; + sha256 = "sha256-fKT1nCr6kAFJEdacff4qBr3uI5fvIwMDPkHVFGTQf10="; }; nativeBuildInputs = [ diff --git a/pkgs/tools/inputmethods/fcitx5/fcitx5-table-other.nix b/pkgs/tools/inputmethods/fcitx5/fcitx5-table-other.nix index d723f613136c7..da12f8057b2f4 100644 --- a/pkgs/tools/inputmethods/fcitx5/fcitx5-table-other.nix +++ b/pkgs/tools/inputmethods/fcitx5/fcitx5-table-other.nix @@ -10,13 +10,13 @@ stdenv.mkDerivation rec { pname = "fcitx5-table-other"; - version = "5.0.8"; + version = "5.0.9"; src = fetchFromGitHub { owner = "fcitx"; repo = pname; rev = version; - sha256 = "sha256-aCZqcPqokkxBWx9kPBfxbslW1RZBIoZ63e7fPItl5yg="; + sha256 = "sha256-y/OY7m136VQvK75079OTFqLLR2o0NCIc5llljrJ91DU="; }; nativeBuildInputs = [ diff --git a/pkgs/tools/misc/diffoscope/default.nix b/pkgs/tools/misc/diffoscope/default.nix index 6bac37c98e75d..d2ab1a9ba44f1 100644 --- a/pkgs/tools/misc/diffoscope/default.nix +++ b/pkgs/tools/misc/diffoscope/default.nix @@ -57,7 +57,7 @@ python3Packages.buildPythonApplication rec { ++ lib.optionals enableBloat ([ abootimg apksigner apktool cbfstool colord enjarify ffmpeg fpc ghc ghostscriptX giflib gnupg gnumeric hdf5 imagemagick libcaca llvm jdk mono ocaml odt2txt oggvideotools openssh pdftk poppler_utils procyon qemu R tcpdump ubootTools wabt radare2 xmlbeans - ] ++ (with python3Packages; [ androguard binwalk guestfs h5py pdfminer ])); + ] ++ (with python3Packages; [ androguard binwalk guestfs h5py pdfminer-six ])); checkInputs = with python3Packages; [ pytestCheckHook ] ++ pythonPath; diff --git a/pkgs/tools/misc/fselect/default.nix b/pkgs/tools/misc/fselect/default.nix index fbdb90b12b70d..c58508f4195e0 100644 --- a/pkgs/tools/misc/fselect/default.nix +++ b/pkgs/tools/misc/fselect/default.nix @@ -2,16 +2,16 @@ rustPlatform.buildRustPackage rec { pname = "fselect"; - version = "0.8.0"; + version = "0.8.1"; src = fetchFromGitHub { owner = "jhspetersson"; repo = "fselect"; rev = version; - sha256 = "sha256-nFfzvTCiNlv+EzK51w04JHh8tfsim/8hFCxnZZue5No="; + sha256 = "sha256-oJyaK39ZCY7RB1U2yBMJg0tvJxnLE5iRLSnywYe9LNU="; }; - cargoSha256 = "sha256-B7uJ9hLN/WhLA/bqoO7WZ38tN0tDMZ2KW/vjfOgcQ3A="; + cargoSha256 = "sha256-sT/WfnROBi4PNcEbs381cMGyKPRuQ3PdJ2kzr/paycQ="; nativeBuildInputs = [ installShellFiles ]; buildInputs = lib.optional stdenv.isDarwin libiconv; diff --git a/pkgs/tools/misc/goaccess/default.nix b/pkgs/tools/misc/goaccess/default.nix index b0eea87789386..c23005e96d772 100644 --- a/pkgs/tools/misc/goaccess/default.nix +++ b/pkgs/tools/misc/goaccess/default.nix @@ -10,14 +10,14 @@ }: stdenv.mkDerivation rec { - version = "1.5.6"; + version = "1.5.7"; pname = "goaccess"; src = fetchFromGitHub { owner = "allinurl"; repo = pname; rev = "v${version}"; - sha256 = "sha256-1yvFyTH5m+KIN/x61cbUNgweK38WFdIUDvnkFYmST9s="; + sha256 = "sha256-ElDsQliB2+4X/psiavGr/bHQ1tMw7VMJroqCPMkOGOs="; }; nativeBuildInputs = [ diff --git a/pkgs/tools/networking/ferm/default.nix b/pkgs/tools/networking/ferm/default.nix index 580ca848c62bd..518bb5c26daa7 100644 --- a/pkgs/tools/networking/ferm/default.nix +++ b/pkgs/tools/networking/ferm/default.nix @@ -3,12 +3,12 @@ let inherit (lib.versions) majorMinor; in stdenv.mkDerivation rec { - version = "2.6"; + version = "2.7"; pname = "ferm"; src = fetchurl { url = "http://ferm.foo-projects.org/download/${majorMinor version}/ferm-${version}.tar.xz"; - sha256 = "sha256-aJVBRl58Bzy9YEyc0Y8RPDHAtBuxJhRyalmxfkQFiIU="; + sha256 = "sha256-wA2RDVOU5pZ1YI617g9QTVz9pB6ZCi2akbqsbfk+P5I="; }; # perl is used at build time to gather the ferm version. diff --git a/pkgs/tools/networking/tridactyl-native/default.nix b/pkgs/tools/networking/tridactyl-native/default.nix index ce7325975fb34..6c21ff1490e09 100644 --- a/pkgs/tools/networking/tridactyl-native/default.nix +++ b/pkgs/tools/networking/tridactyl-native/default.nix @@ -1,44 +1,29 @@ -{ lib, stdenv -, fetchFromGitHub -, python3 -}: +{ lib, nimPackages, fetchFromGitHub }: -stdenv.mkDerivation rec { - pname = "tridactyl-native"; - # this is actually the version of tridactyl itself; the native messenger will - # probably not change with every tridactyl version - version = "1.20.4"; +nimPackages.buildNimPackage rec { + pname = "tridactly-native"; + version = "0.3.6"; src = fetchFromGitHub { owner = "tridactyl"; - repo = "tridactyl"; - rev = version; - sha256 = "sha256-BjjRB9VadQ/MSwNK2QLbcTDoRs6Ua+5MONHtmfq4xz0="; + repo = "native_messenger"; + rev = "5cc315da79a1caa8fd5b27b192377d8824a311c1"; + sha256 = "sha256-9IyVDJgdZleeNltD1b4PfqxeWAtFsPHtmq1ZC5Z0O9k="; }; - sourceRoot = "source/native"; - - nativeBuildInputs = [ - python3.pkgs.wrapPython - ]; - - buildPhase = '' - sed -i -e "s|REPLACE_ME_WITH_SED|$out/share/tridactyl/native_main.py|" "tridactyl.json" - ''; + buildInputs = with nimPackages; [ tempfile ]; installPhase = '' mkdir -p "$out/lib/mozilla/native-messaging-hosts" + sed -i -e "s|REPLACE_ME_WITH_SED|$out/bin/native_main|" "tridactyl.json" cp tridactyl.json "$out/lib/mozilla/native-messaging-hosts/" - - mkdir -p "$out/share/tridactyl" - cp native_main.py "$out/share/tridactyl" - wrapPythonProgramsIn "$out/share/tridactyl" ''; meta = with lib; { - description = "Tridactyl native messaging host application"; - homepage = "https://github.com/tridactyl/tridactyl"; - license = licenses.asl20; + description = + "Native messenger for Tridactyl, a vim-like Firefox webextension"; + homepage = "https://github.com/tridactyl/native_messenger"; + license = licenses.bsd2; platforms = platforms.all; - maintainers = with maintainers; [ timokau ]; + maintainers = with maintainers; [ timokau dit7ya ]; }; } diff --git a/pkgs/tools/security/exploitdb/default.nix b/pkgs/tools/security/exploitdb/default.nix index 8ac6771f3589f..40bab69b763a8 100644 --- a/pkgs/tools/security/exploitdb/default.nix +++ b/pkgs/tools/security/exploitdb/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "exploitdb"; - version = "2022-05-18"; + version = "2022-05-26"; src = fetchFromGitHub { owner = "offensive-security"; repo = pname; rev = "refs/tags/${version}"; - sha256 = "sha256-E2QPeSlsJCRhnwgxr1NerLkSFbLLaTSLl8oeYsHQM+U="; + sha256 = "sha256-yLbPgU8BAAcXZtG4fIo6oVtD1tRBlGgNeFglyGJ8Uhk="; }; nativeBuildInputs = [ makeWrapper ]; diff --git a/pkgs/tools/security/ffuf/default.nix b/pkgs/tools/security/ffuf/default.nix index a3600b89694c7..18862b7940df9 100644 --- a/pkgs/tools/security/ffuf/default.nix +++ b/pkgs/tools/security/ffuf/default.nix @@ -5,13 +5,13 @@ buildGoModule rec { pname = "ffuf"; - version = "1.4.1"; + version = "1.5.0"; src = fetchFromGitHub { owner = pname; repo = pname; rev = "v${version}"; - sha256 = "sha256-m+L78fVsqntD7JfgWS9foUJUhIVr+CtJ6K8etsLuNzw="; + sha256 = "sha256-dqABifXA104NCPdrWhB79cZQloJrqwJ45rlh+M/lRrs="; }; vendorSha256 = "sha256-szT08rIozAuliOmge5RFX4NeVrJ2pCVyfotrHuvc0UU="; diff --git a/pkgs/tools/security/gitleaks/default.nix b/pkgs/tools/security/gitleaks/default.nix index d03a0ce1cac84..cc4f60f1fb370 100644 --- a/pkgs/tools/security/gitleaks/default.nix +++ b/pkgs/tools/security/gitleaks/default.nix @@ -5,13 +5,13 @@ buildGoModule rec { pname = "gitleaks"; - version = "8.8.4"; + version = "8.8.5"; src = fetchFromGitHub { owner = "zricethezav"; repo = pname; rev = "v${version}"; - sha256 = "sha256-EW5skmSnnQiMCMqyh51t1q4F5JVYWLSuj1qTqfWp/ok="; + sha256 = "sha256-+vuT60RtynjWNjBPpUzeKstqKrEg7pmZbl6qpGs3H/s="; }; vendorSha256 = "sha256-X8z9iKRR3PptNHwy1clZG8QsClsjbW45nZb2fHGfSYk="; diff --git a/pkgs/tools/security/kubescape/default.nix b/pkgs/tools/security/kubescape/default.nix index 23f52e3b52ed7..9b45000199829 100644 --- a/pkgs/tools/security/kubescape/default.nix +++ b/pkgs/tools/security/kubescape/default.nix @@ -6,15 +6,15 @@ buildGoModule rec { pname = "kubescape"; - version = "2.0.152"; + version = "2.0.155"; src = fetchFromGitHub { owner = "armosec"; repo = pname; rev = "v${version}"; - hash = "sha256-hibXmA2JerfnkGiSnBUCMHGPm4Tefnsl/x2VAS5z0Fo="; + hash = "sha256-ZBjwgrF0Pkour1yXMcY4cZt3W2biCzmPd+EYcY4Ppz0="; }; - vendorSha256 = "sha256-HfsQfoz1n3FEd2eVBBz3Za2jYCSrozXpL34Z8CgQsTA="; + vendorSha256 = "sha256-zj2gDx5333AguLs1Gzu3bYXslDwvPFSbMmOTOFxmq6A="; nativeBuildInputs = [ installShellFiles @@ -37,7 +37,17 @@ buildGoModule rec { go list ./... | grep -v httphandler } - rm core/pkg/resourcehandler/{repositoryscanner,urlloader}_test.go + # remove tests that use networking + rm core/pkg/resourcehandler/urlloader_test.go + + # remove tests that use networking + substituteInPlace core/pkg/resourcehandler/repositoryscanner_test.go \ + --replace "TestScanRepository" "SkipScanRepository" \ + --replace "TestGit" "SkipGit" + + # without networking the branch context can't be fetched and is empty + substituteInPlace core/cautils/scaninfo_test.go \ + --replace 'assert.Equal(t, "master", ctx.RepoContextMetadata.Branch)' 'assert.Equal(t, "", ctx.RepoContextMetadata.Branch)' ''; postInstall = '' diff --git a/pkgs/tools/security/lynis/default.nix b/pkgs/tools/security/lynis/default.nix index 3c198e9b70106..17e70a3113c78 100644 --- a/pkgs/tools/security/lynis/default.nix +++ b/pkgs/tools/security/lynis/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "lynis"; - version = "3.0.7"; + version = "3.0.8"; src = fetchFromGitHub { owner = "CISOfy"; repo = pname; rev = version; - sha256 = "sha256-tO9/egY4eNwQpCZU0zx8G3k4UYsf7S3tUdr6pCMTAWU="; + sha256 = "sha256-fPQX/Iz+dc3nF3xMPt0bek4JC2XSHe4aC4O0tZwLf6Y="; }; nativeBuildInputs = [ installShellFiles makeWrapper ]; diff --git a/pkgs/tools/system/gdu/default.nix b/pkgs/tools/system/gdu/default.nix index 4204bf8994b29..f6f0e1fe7f373 100644 --- a/pkgs/tools/system/gdu/default.nix +++ b/pkgs/tools/system/gdu/default.nix @@ -7,13 +7,13 @@ buildGoModule rec { pname = "gdu"; - version = "5.13.2"; + version = "5.14.0"; src = fetchFromGitHub { owner = "dundee"; repo = pname; rev = "v${version}"; - sha256 = "sha256-2HADEp1nDkIl56e5oxY6bC+lRWanQwjlCChm0aI0N9Q="; + sha256 = "sha256-a0H/OqIHgutuW1egqlhMy5mX2FMYxmAwCbhecCrXuOU="; }; vendorSha256 = "sha256-9+Zez33oET0nx/Xm3fXh1WFoQduMBodvml1oGO6jUYc="; diff --git a/pkgs/tools/text/choose/default.nix b/pkgs/tools/text/choose/default.nix index b214c65b534cf..f40fcd1e3b6d4 100644 --- a/pkgs/tools/text/choose/default.nix +++ b/pkgs/tools/text/choose/default.nix @@ -5,16 +5,16 @@ rustPlatform.buildRustPackage rec { pname = "choose"; - version = "1.3.3"; + version = "1.3.4"; src = fetchFromGitHub { owner = "theryangeary"; repo = pname; rev = "v${version}"; - sha256 = "sha256-HYwlAgFKbi6or2eblERdMMjJOJdtt2FCQECUg3MzO8E="; + sha256 = "sha256-yW1quDyQn2xhrlhhPj9DKq7g8LlYKvEKDFj3xSagRTU="; }; - cargoSha256 = "sha256-55/B+LxdbekfaKKyng0lUCU3QnqL34M+QnLUxaPqkqI="; + cargoSha256 = "sha256-0INC0LFzlnFnt5pCiU4xePxU8a6GiU1L8bg7zcuFl2k="; meta = with lib; { description = "A human-friendly and fast alternative to cut and (sometimes) awk"; diff --git a/pkgs/tools/text/difftastic/default.nix b/pkgs/tools/text/difftastic/default.nix index 500aae3fc080c..f33eee62549fb 100644 --- a/pkgs/tools/text/difftastic/default.nix +++ b/pkgs/tools/text/difftastic/default.nix @@ -9,13 +9,13 @@ rustPlatform.buildRustPackage rec { pname = "difftastic"; - version = "0.27.0"; + version = "0.28.0"; src = fetchFromGitHub { owner = "wilfred"; repo = pname; rev = version; - sha256 = "sha256-jdkyDsuOOG1dJmgRmMp2KhY9ermccjrxK2JAIzpO6nw="; + sha256 = "sha256-krY1NbFilUHn6ePMRX4+EddsIu33Y7W8Wt5bIeB6wRE="; }; depsExtraArgs = { @@ -40,7 +40,7 @@ rustPlatform.buildRustPackage rec { popd ''; }; - cargoSha256 = "12a12ng9wz2rrj3xzhgrqlg3lxpqxwdgvkz3fxny17nysmmpnhvv"; + cargoSha256 = "sha256-nE6sl8n12fHLWH/tEXZhDjVBxGDoLyFDtVC5GFNClzM="; passthru.tests.version = testers.testVersion { package = difftastic; }; diff --git a/pkgs/tools/text/invoice2data/default.nix b/pkgs/tools/text/invoice2data/default.nix index 941f2d6f4938c..d234861590131 100644 --- a/pkgs/tools/text/invoice2data/default.nix +++ b/pkgs/tools/text/invoice2data/default.nix @@ -25,7 +25,7 @@ python3.pkgs.buildPythonApplication rec { propagatedBuildInputs = with python3.pkgs; [ chardet dateparser - pdfminer + pdfminer-six pillow pyyaml unidecode diff --git a/pkgs/tools/typesetting/tex/texlive/bin.nix b/pkgs/tools/typesetting/tex/texlive/bin.nix index 2827f808678d6..4b278c12a3f8e 100644 --- a/pkgs/tools/typesetting/tex/texlive/bin.nix +++ b/pkgs/tools/typesetting/tex/texlive/bin.nix @@ -33,7 +33,7 @@ let ''; configureFlags = [ - "--with-banner-add=/NixOS.org" + "--with-banner-add=/nixos.org" "--disable-missing" "--disable-native-texlive-build" "--enable-shared" # "--enable-cxx-runtime-hack" # static runtime "--enable-tex-synctex" diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index 129a064841393..51f51534635e9 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -1207,6 +1207,7 @@ mapAliases ({ scallion = throw "scallion has been removed, because it is currently unmaintained upstream"; # added 2021-12-15 scim = throw "'scim' has been renamed to/replaced by 'sc-im'"; # Converted to throw 2022-02-22 scollector = throw "'scollector' has been renamed to/replaced by 'bosun'"; # Converted to throw 2022-02-22 + scribusUnstable = throw "'scribusUnstable' has been renamed to 'scribus'"; # Added 2022-05-13 scyther = throw "scyther has been removed since it currently only supports Python 2, see https://github.com/cascremers/scyther/issues/20"; # Added 2021-10-07 sdlmame = mame; # Added 2019-10-30 seeks = throw "seeks has been removed from nixpkgs, as it was unmaintained"; # Added 2020-06-21 diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index d9a20d8406cd2..187b6fedb4793 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -1356,6 +1356,10 @@ with pkgs; python = python3; }; + packwiz = callPackage ../tools/games/minecraft/packwiz { + buildGoModule = buildGo118Module; + }; + pcem = callPackage ../applications/emulators/pcem { }; pcsx2 = callPackage ../applications/emulators/pcsx2 { @@ -4851,6 +4855,8 @@ with pkgs; cfssl = callPackage ../tools/security/cfssl { }; + cfs-zen-tweaks = callPackage ../os-specific/linux/cfs-zen-tweaks { }; + chafa = callPackage ../tools/misc/chafa { inherit (darwin.apple_sdk.frameworks) Foundation; }; @@ -9277,7 +9283,7 @@ with pkgs; pdftoipe = callPackage ../tools/graphics/pdftoipe { }; - pdfminer = with python3Packages; toPythonApplication pdfminer; + pdfminer = with python3Packages; toPythonApplication pdfminer-six; pdf-quench = callPackage ../applications/misc/pdf-quench { }; @@ -11720,6 +11726,8 @@ with pkgs; wg-bond = callPackage ../applications/networking/wg-bond { }; + wgcf = callPackage ../applications/networking/wgcf { }; + which = callPackage ../tools/system/which { }; whsniff = callPackage ../applications/networking/sniffers/whsniff { }; @@ -18571,8 +18579,6 @@ with pkgs; icu = icu67; }; - libechonest = callPackage ../development/libraries/libechonest { }; - libemf2svg = callPackage ../development/libraries/libemf2svg { }; libev = callPackage ../development/libraries/libev { }; @@ -20159,8 +20165,6 @@ with pkgs; qimageblitz = callPackage ../development/libraries/qimageblitz {}; - qjson = callPackage ../development/libraries/qjson { }; - qolibri = libsForQt5.callPackage ../applications/misc/qolibri { }; qt4 = qt48; @@ -25089,6 +25093,8 @@ with pkgs; adobe-reader = pkgsi686Linux.callPackage ../applications/misc/adobe-reader { }; + appvm = callPackage ../applications/virtualization/appvm { }; + masterpdfeditor = libsForQt5.callPackage ../applications/misc/masterpdfeditor { }; masterpdfeditor4 = libsForQt5.callPackage ../applications/misc/masterpdfeditor4 { }; @@ -29427,11 +29433,12 @@ with pkgs; scli = callPackage ../applications/misc/scli { }; - scribus = callPackage ../applications/office/scribus { + scribus_1_4 = callPackage ../applications/office/scribus/1_4.nix { inherit (gnome2) libart_lgpl; }; - scribusUnstable = libsForQt5.callPackage ../applications/office/scribus/unstable.nix { }; + scribus_1_5 = libsForQt5.callPackage ../applications/office/scribus/default.nix { }; + scribus = scribus_1_5; seafile-client = libsForQt5.callPackage ../applications/networking/seafile-client { }; diff --git a/pkgs/top-level/python-aliases.nix b/pkgs/top-level/python-aliases.nix index 325b5e69b0c78..003f9a516f36d 100644 --- a/pkgs/top-level/python-aliases.nix +++ b/pkgs/top-level/python-aliases.nix @@ -97,6 +97,7 @@ mapAliases ({ pam = python-pam; # added 2020-09-07. PasteDeploy = pastedeploy; # added 2021-10-07 pathpy = path; # added 2022-04-12 + pdfminer = pdfminer-six; # added 2022-05-25 pep257 = pydocstyle; # added 2022-04-12 postorius = throw "Please use pkgs.mailmanPackages.postorius"; # added 2022-04-29 powerlineMemSegment = powerline-mem-segment; # added 2021-10-08 diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 0f10b43dfd67d..3d4ff7c5ebb89 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -2548,6 +2548,8 @@ in { drf-nested-routers = callPackage ../development/python-modules/drf-nested-routers { }; + drf-spectacular = callPackage ../development/python-modules/drf-spectacular { }; + drf-spectacular-sidecar = callPackage ../development/python-modules/drf-spectacular-sidecar { }; drf-yasg = callPackage ../development/python-modules/drf-yasg { }; @@ -5870,6 +5872,8 @@ in { numpy-stl = callPackage ../development/python-modules/numpy-stl { }; + numpyro = callPackage ../development/python-modules/numpyro { }; + nunavut = callPackage ../development/python-modules/nunavut { }; nutils = callPackage ../development/python-modules/nutils { }; @@ -6256,7 +6260,7 @@ in { pdfkit = callPackage ../development/python-modules/pdfkit { }; - pdfminer = callPackage ../development/python-modules/pdfminer_six { }; + pdfminer-six = callPackage ../development/python-modules/pdfminer-six { }; pdfposter = callPackage ../development/python-modules/pdfposter { }; @@ -11165,6 +11169,8 @@ in { xarray = callPackage ../development/python-modules/xarray { }; + xarray-einstats = callPackage ../development/python-modules/xarray-einstats { }; + xattr = callPackage ../development/python-modules/xattr { }; xbox-webapi = callPackage ../development/python-modules/xbox-webapi { }; diff --git a/pkgs/top-level/qt5-packages.nix b/pkgs/top-level/qt5-packages.nix index 770cf90112006..270766f36511d 100644 --- a/pkgs/top-level/qt5-packages.nix +++ b/pkgs/top-level/qt5-packages.nix @@ -181,6 +181,8 @@ in (kdeFrameworks // plasmaMobileGear // plasma5 // plasma5.thirdParty // kdeGea qcsxcad = callPackage ../development/libraries/science/electronics/qcsxcad { }; + qjson = callPackage ../development/libraries/qjson { }; + qmltermwidget = callPackage ../development/libraries/qmltermwidget { inherit (pkgs.darwin.apple_sdk.libs) utmp; }; |