diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index b10c15775ed6..6d9da62e2ddf 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -85,6 +85,12 @@ githubId = 56617252; matrix = "@oxc45:matrix.org"; }; + _0xd61 = { + email = "dgl@degit.co"; + name = "Daniel Glinka"; + github = "0xd61"; + githubId = 8351869; + }; _1000101 = { email = "b1000101@pm.me"; github = "1000101"; @@ -2768,6 +2774,15 @@ githubId = 16895361; name = "Deniz Alp Durmaz"; }; + DAlperin = { + email = "git@dov.dev"; + github = "DAlperin"; + githubId = 16063713; + name = "Dov Alperin"; + keys = [{ + fingerprint = "4EED 5096 B925 86FA 1101 6673 7F2C 07B9 1B52 BB61"; + }]; + }; DamienCassou = { email = "damien@cassou.me"; github = "DamienCassou"; @@ -6707,7 +6722,7 @@ }; kilimnik = { email = "mail@kilimnik.de"; - github = "killercup"; + github = "kilimnik"; githubId = 5883283; name = "Daniel Kilimnik"; }; diff --git a/nixos/modules/config/i18n.nix b/nixos/modules/config/i18n.nix index c55726d09c60..60af360a2a54 100644 --- a/nixos/modules/config/i18n.nix +++ b/nixos/modules/config/i18n.nix @@ -55,14 +55,18 @@ with lib; type = types.listOf types.str; default = builtins.map (l: l + "/UTF-8") (unique ( - [ config.i18n.defaultLocale ] ++ - (attrValues (filterAttrs (n: v: n != "LANGUAGE") config.i18n.extraLocaleSettings)) + [ + "C.UTF-8" + config.i18n.defaultLocale + ] ++ (attrValues (filterAttrs (n: v: n != "LANGUAGE") config.i18n.extraLocaleSettings)) )); defaultText = literalExpression '' builtins.map (l: l + "/UTF-8") (unique ( - [ config.i18n.defaultLocale ] ++ - (attrValues (filterAttrs (n: v: n != "LANGUAGE") config.i18n.extraLocaleSettings)) + [ + "C.UTF-8" + config.i18n.defaultLocale + ] ++ (attrValues (filterAttrs (n: v: n != "LANGUAGE") config.i18n.extraLocaleSettings)) )) ''; example = ["en_US.UTF-8/UTF-8" "nl_NL.UTF-8/UTF-8" "nl_NL/ISO-8859-1"]; diff --git a/nixos/modules/services/logging/logrotate.nix b/nixos/modules/services/logging/logrotate.nix index dfc58d7d539c..893d951ee234 100644 --- a/nixos/modules/services/logging/logrotate.nix +++ b/nixos/modules/services/logging/logrotate.nix @@ -167,22 +167,23 @@ let sed -e "s/\bsu\s.*/su $user $group/" \ -e "s/\b\(create\s\+[0-9]*\s*\|createolddir\s\+[0-9]*\s\+\).*/\1$user $group/" \ -e "1imissingok" -e "s/\bnomissingok\b//" \ - $out > /tmp/logrotate.conf + $out > logrotate.conf # Since this makes for very verbose builds only show real error. # There is no way to control log level, but logrotate hardcodes # 'error:' at common log level, so we can use grep, taking care # to keep error codes set -o pipefail - if ! ${pkgs.buildPackages.logrotate}/sbin/logrotate --debug /tmp/logrotate.conf 2>&1 \ - | ( ! grep "error:" ) > /tmp/logrotate-error; then + if ! ${pkgs.buildPackages.logrotate}/sbin/logrotate -s logrotate.status \ + --debug logrotate.conf 2>&1 \ + | ( ! grep "error:" ) > logrotate-error; then echo "Logrotate configuration check failed." echo "The failing configuration (after adjustments to pass tests in sandbox) was:" printf "%s\n" "-------" - cat /tmp/logrotate.conf + cat logrotate.conf printf "%s\n" "-------" echo "The error reported by logrotate was as follow:" printf "%s\n" "-------" - cat /tmp/logrotate-error + cat logrotate-error printf "%s\n" "-------" echo "You can disable this check with services.logrotate.checkConfig = false," echo "but if you think it should work please report this failure along with" diff --git a/pkgs/applications/audio/faustPhysicalModeling/default.nix b/pkgs/applications/audio/faustPhysicalModeling/default.nix index bea08b0bfc9f..5fd4eb2fb7d3 100644 --- a/pkgs/applications/audio/faustPhysicalModeling/default.nix +++ b/pkgs/applications/audio/faustPhysicalModeling/default.nix @@ -1,13 +1,13 @@ { stdenv, lib, fetchFromGitHub, faust2jaqt, faust2lv2 }: stdenv.mkDerivation rec { pname = "faustPhysicalModeling"; - version = "2.40.0"; + version = "2.41.1"; src = fetchFromGitHub { owner = "grame-cncm"; repo = "faust"; rev = version; - sha256 = "sha256-t3I3j5s2ACHfub+fxxaTwu+5ptEwH0JQpVdmHYOzbCA="; + sha256 = "sha256-I5No9J7TLOf++B+lx1RfGY8LBoDAApq/EV8016wH9Hc="; }; buildInputs = [ faust2jaqt faust2lv2 ]; diff --git a/pkgs/applications/blockchains/go-ethereum/default.nix b/pkgs/applications/blockchains/go-ethereum/default.nix index ef79e514638a..767d8e7ba00c 100644 --- a/pkgs/applications/blockchains/go-ethereum/default.nix +++ b/pkgs/applications/blockchains/go-ethereum/default.nix @@ -9,16 +9,16 @@ let in buildGoModule rec { pname = "go-ethereum"; - version = "1.10.18"; + version = "1.10.20"; src = fetchFromGitHub { owner = "ethereum"; repo = pname; rev = "v${version}"; - sha256 = "1jfyhzklznjrdki6m8wjgqzp63b6n6vy7ws3l0al58zkaybnpikw"; + sha256 = "sha256-PIQP08QxGJmla7LKEtnEXmwJxDYh02q4fmRHZsYtthU="; }; - vendorSha256 = "10xpxz8ybgwqizqy9d3phza8mlxxpsbk4qsf271r7ls4qr5q1wxz"; + vendorSha256 = "sha256-AlXfKytDrQrp0gvnC5/gTlJAVJBAQNHm4MoBu9O9jM4="; doCheck = false; diff --git a/pkgs/applications/blockchains/ledger-live-desktop/default.nix b/pkgs/applications/blockchains/ledger-live-desktop/default.nix index adf2119f3ebf..d9bde2a54302 100644 --- a/pkgs/applications/blockchains/ledger-live-desktop/default.nix +++ b/pkgs/applications/blockchains/ledger-live-desktop/default.nix @@ -2,11 +2,11 @@ let pname = "ledger-live-desktop"; - version = "2.43.1"; + version = "2.44.0"; src = fetchurl { url = "https://download.live.ledger.com/${pname}-${version}-linux-x86_64.AppImage"; - hash = "sha256-qjlTYIe7Ep3maS3+3vjrtrD2T9plELOTddZfaaL2SXI="; + hash = "sha256-STUkvQ22WnMm8AApz9zjfNeFXhtEUsl/OJIZkFgkd5s="; }; appimageContents = appimageTools.extractType2 { @@ -42,7 +42,7 @@ appimageTools.wrapType2 rec { description = "Wallet app for Ledger Nano S and Ledger Blue"; homepage = "https://www.ledger.com/live"; license = licenses.mit; - maintainers = with maintainers; [ andresilva thedavidmeister nyanloutre RaghavSood th0rgal ]; + maintainers = with maintainers; [ andresilva thedavidmeister nyanloutre RaghavSood th0rgal WeebSorceress ]; platforms = [ "x86_64-linux" ]; }; } diff --git a/pkgs/applications/graphics/feh/default.nix b/pkgs/applications/graphics/feh/default.nix index 9c75742d52ba..3865848ff209 100644 --- a/pkgs/applications/graphics/feh/default.nix +++ b/pkgs/applications/graphics/feh/default.nix @@ -1,17 +1,27 @@ -{ lib, stdenv, fetchurl, makeWrapper -, xorg, imlib2, libjpeg, libpng +{ lib, stdenv, fetchFromGitHub, makeWrapper +, xorg, imlib2, libjpeg, libpng, fetchpatch , curl, libexif, jpegexiforient, perl , enableAutoreload ? !stdenv.hostPlatform.isDarwin }: stdenv.mkDerivation rec { pname = "feh"; - version = "3.8"; + version = "3.9"; - src = fetchurl { - url = "https://feh.finalrewind.org/${pname}-${version}.tar.bz2"; - sha256 = "1a9bsq5j9sl2drzkab0hdhnamalpaszw9mz2prz6scrr5dak8g3z"; + src = fetchFromGitHub { + owner = "derf"; + repo = pname; + rev = version; + sha256 = "sha256-rgNC4M1TJ5EPeWmVHVzgaxTGLY7CYQf7uOsOn5bkwKE="; }; + patches = [ + # fix test failure when magic=0 is set + (fetchpatch { + url = "https://github.com/derf/feh/commit/3c1076b31e2e4e3429a5c3d334d555e549fb72d2.patch"; + sha256 = "sha256-F9N+N/BAeclyPHQYlO9ZV1U8S1VWfHl/8dMKUqA7DF8="; + }) + ]; + outputs = [ "out" "man" "doc" ]; nativeBuildInputs = [ makeWrapper xorg.libXt ]; diff --git a/pkgs/applications/misc/bibletime/default.nix b/pkgs/applications/misc/bibletime/default.nix index b08c418e1e08..f5b027a9b2de 100644 --- a/pkgs/applications/misc/bibletime/default.nix +++ b/pkgs/applications/misc/bibletime/default.nix @@ -1,4 +1,5 @@ -{ lib, mkDerivation +{ lib +, stdenv , fetchFromGitHub , cmake , docbook_xml_dtd_45 @@ -14,15 +15,15 @@ , sword }: -mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "bibletime"; - version = "3.0.2"; + version = "3.0.3"; src = fetchFromGitHub { owner = "bibletime"; - repo = "bibletime"; - rev = "v${version}"; - hash = "sha256-8X5LkquALFnG0yRayZYjeymHDcOzINBv0MXeVBsOnfI="; + repo = finalAttrs.pname; + rev = "v${finalAttrs.version}"; + hash = "sha256-4O8F5/EyoJFJBEWOAs9lzN3TKuu/CEdKfPaOF8gNqps="; }; nativeBuildInputs = [ @@ -55,10 +56,10 @@ mkDerivation rec { ]; meta = with lib; { - description = "A powerful cross platform Bible study tool"; homepage = "http://www.bibletime.info/"; - platforms = platforms.linux; + description = "A powerful cross platform Bible study tool"; license = licenses.gpl2Plus; - maintainers = [ ]; + maintainers = with maintainers; [ AndersonTorres ]; + platforms = platforms.linux; }; -} +}) diff --git a/pkgs/applications/misc/josm/default.nix b/pkgs/applications/misc/josm/default.nix index d35a526dfdb3..fa3b360b1cb2 100644 --- a/pkgs/applications/misc/josm/default.nix +++ b/pkgs/applications/misc/josm/default.nix @@ -3,20 +3,20 @@ }: let pname = "josm"; - version = "18463"; + version = "18513"; srcs = { jar = fetchurl { url = "https://josm.openstreetmap.de/download/josm-snapshot-${version}.jar"; - sha256 = "sha256-++8XtzAykJ+85Kvzy3xgaZoKaVlJwz+Ct1xb/QkC1Gc="; + sha256 = "sha256-rKBDKPq6hn4VGlzW4ad/gBU4eCVRF9JgRLrDaTKjCbI="; }; macosx = fetchurl { url = "https://josm.openstreetmap.de/download/macosx/josm-macos-${version}-java17.zip"; - sha256 = "sha256-n7GlUWYOAXw4G59SBsO8HZ1OaiUWwzOsiURPFBYq31E="; + sha256 = "sha256-M8ZV3FXZJHqaegPKQnjQkMYMWt2BUiKzM8Tit4NqtU4="; }; pkg = fetchsvn { url = "https://josm.openstreetmap.de/svn/trunk/native/linux/tested"; rev = version; - sha256 = "sha256-AyfUFE0y8d8FtgfhxSscQGE1IVNwYYNymH6jTnrUBTs="; + sha256 = "sha256-cguvKl9yvthNWcLD6YDLKiialJmutJTa9egMdfKHRpU="; }; }; in diff --git a/pkgs/applications/networking/browsers/chromium/upstream-info.json b/pkgs/applications/networking/browsers/chromium/upstream-info.json index 548910540fa5..74cf6526d05f 100644 --- a/pkgs/applications/networking/browsers/chromium/upstream-info.json +++ b/pkgs/applications/networking/browsers/chromium/upstream-info.json @@ -1,8 +1,8 @@ { "stable": { - "version": "103.0.5060.53", - "sha256": "00di0nw6h3kb0qp2wp3ny3zsar1ayn1lyx5zr28dl1h5cwaaxjqf", - "sha256bin64": "19wxd4jl6fyjpcpy2331ckz6dgzrfj52wvdkp0kb18n0sym17fyn", + "version": "103.0.5060.114", + "sha256": "0rarcd2q1ggl10cw3vwjk7j9aka7i129a0qv8qr7751vy083as3p", + "sha256bin64": "1qxbnnnq0miizazprwynvxxvgaaw9dd9y7bssybvmga3g2c00fk9", "deps": { "gn": { "version": "2022-05-11", @@ -12,10 +12,10 @@ } }, "chromedriver": { - "version": "103.0.5060.24", - "sha256_linux": "0snsv9n9db314adrr7hhcf49mgrkak6bvq84q9l5yvpl8ihvd0xr", - "sha256_darwin": "1rdai2vvnj7156lbbg0zambcz638hq7a3i9npbmlsl826l61m8wm", - "sha256_darwin_aarch64": "15f5q9fdqa63mb9yjm4dql69fh6w85f0xj428sv4grfhrn8w0bh3" + "version": "103.0.5060.53", + "sha256_linux": "1gpxfrqf2wm2c76701rnw0h5ppmaqzf5ygcrasj1mmwjsfk49v5d", + "sha256_darwin": "03ibi0ybr3mmk02mmn6dp7ygjn7c9wwvahbhm2syh0fhxyyxmf0p", + "sha256_darwin_aarch64": "13bb2ai32b1q4lvyhcgp5315zzxwbi6609xxb67h7h3i3rb2yhcd" } }, "beta": { @@ -32,15 +32,15 @@ } }, "dev": { - "version": "104.0.5112.20", - "sha256": "0adzdk3m2l4pjlk82sqavwgxf6a5darbiwchmlrsxc58p9xxag4s", - "sha256bin64": "13p2w4wwd8ji5ydgz4x7w2q4rmn74w3z2fl999q7zaq1cra21pzd", + "version": "105.0.5148.2", + "sha256": "0qnkpda0chsxgfby5g38xmpkilyz2v12mrwlayfsp2iqhc7d07vz", + "sha256bin64": "045czwsra17iclgyzsnbbjr55lrmhzf97c2k0wwjrmd59cx4b1sa", "deps": { "gn": { - "version": "2022-06-08", + "version": "2022-06-22", "url": "https://gn.googlesource.com/gn", - "rev": "2ecd43a10266bd091c98e6dcde507c64f6a0dad3", - "sha256": "1q06vsz9b4bb764wy1wy8n177z2pgpm97kq3rl1hmq185mz5fhra" + "rev": "29accf5ac2eadfc53e687081583b7bc1592a8839", + "sha256": "0z9gaw8p88yhb7fi844pvylsbgjy3ni7bnca1yx37928fjw3ppln" } } }, diff --git a/pkgs/applications/networking/browsers/offpunk/default.nix b/pkgs/applications/networking/browsers/offpunk/default.nix index dcfe1d4b6570..c3e73e18de0c 100644 --- a/pkgs/applications/networking/browsers/offpunk/default.nix +++ b/pkgs/applications/networking/browsers/offpunk/default.nix @@ -7,7 +7,6 @@ python3, ripgrep, stdenv, - testVersion, timg, xdg-utils, xsel, diff --git a/pkgs/applications/networking/cluster/atlantis/default.nix b/pkgs/applications/networking/cluster/atlantis/default.nix index d7f685ee14f2..9b615f151c25 100644 --- a/pkgs/applications/networking/cluster/atlantis/default.nix +++ b/pkgs/applications/networking/cluster/atlantis/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "atlantis"; - version = "0.19.4"; + version = "0.19.6"; src = fetchFromGitHub { owner = "runatlantis"; repo = "atlantis"; rev = "v${version}"; - sha256 = "sha256-OvUcSccSBLuWci0DZPd6+ztthnAf47CvuAxu2NnqRQ0="; + sha256 = "sha256-A4OJNZHCERV2Sd/XQgt29xeBP+8PEIrpk22QypeVQ/A="; }; - vendorSha256 = "sha256-LActkTCZ7/KlvFmJ+58I8hTQWdxFxlRN09Jmj1vDa2U="; + vendorSha256 = "sha256-k8FvHvo2qrQcYNKXH0LiAjaW+J+BKEflhjaulQ3SRMI="; subPackages = [ "." ]; diff --git a/pkgs/applications/networking/instant-messengers/slack/default.nix b/pkgs/applications/networking/instant-messengers/slack/default.nix index 953d5134377b..5d497546095b 100644 --- a/pkgs/applications/networking/instant-messengers/slack/default.nix +++ b/pkgs/applications/networking/instant-messengers/slack/default.nix @@ -44,14 +44,14 @@ let pname = "slack"; - x86_64-darwin-version = "4.26.1"; - x86_64-darwin-sha256 = "0883nnnwjaii89x6idqcl68acw1fbijyhhrwy7inwgrdw233qqcd"; + x86_64-darwin-version = "4.27.154"; + x86_64-darwin-sha256 = "0a3cc9kkiq18vr4hk532vc59cza1hq8qh9x9hlhli4n72n3h7y3n"; - x86_64-linux-version = "4.26.1"; - x86_64-linux-sha256 = "0nw3cfypinzp8csli1myh3b9hvv2pg1d8p9izg7znfpnlwps8gy1"; + x86_64-linux-version = "4.27.156"; + x86_64-linux-sha256 = "sha256-/xtD+/+KGtPr4vQJm8ZczvpyPxfMBw0OE7hzTzFhSs0="; - aarch64-darwin-version = "4.26.1"; - aarch64-darwin-sha256 = "1p5qn5zyibpyiv5is70g1la9y6wc038j3sxjyxflgqsdvania7vq"; + aarch64-darwin-version = "4.27.154"; + aarch64-darwin-sha256 = "1n3vgcsbi1w49w4xqc5hyadb9qwvsqdiirfw9v4s65wsnark1iz6"; version = { x86_64-darwin = x86_64-darwin-version; diff --git a/pkgs/applications/networking/powerdns-admin/default.nix b/pkgs/applications/networking/powerdns-admin/default.nix index 82d011281fe6..81195c4e212b 100644 --- a/pkgs/applications/networking/powerdns-admin/default.nix +++ b/pkgs/applications/networking/powerdns-admin/default.nix @@ -1,27 +1,16 @@ { lib, stdenv, fetchFromGitHub, mkYarnPackage, nixosTests, writeText, python3 }: let - version = "0.2.4"; + version = "0.3.0"; src = fetchFromGitHub { owner = "ngoduykhanh"; repo = "PowerDNS-Admin"; rev = "v${version}"; - sha256 = "sha256-xJ0NNnDVwGl+t9q1INPhCxcTmQayYBYdjEG0PbPCI9E="; + hash = "sha256-e11u0jdJr+2TDXvBAPlDfnuuDwSfBq+JtvnDUTNKp/c="; }; python = python3.override { packageOverrides = self: super: { - dnspython = super.dnspython.overridePythonAttrs (oldAttrs: rec { - version = "1.16.0"; - src = oldAttrs.src.override { - inherit version; - extension = "zip"; - sha256 = "36c5e8e38d4369a08b6780b7f27d790a292b2b08eea01607865bf0936c558e01"; - }; - # Needs networking for some tests - doCheck = false; - }); - # The bravado-core dependency is incompatible with jschonschema 4.0: # https://github.com/Yelp/bravado-core/pull/385 jsonschema = super.jsonschema.overridePythonAttrs (oldAttrs: rec { @@ -43,8 +32,8 @@ let flask flask_assets flask_login flask_sqlalchemy flask_migrate flask-seasurf flask_mail flask-session flask-sslify mysqlclient psycopg2 sqlalchemy cffi configobj cryptography bcrypt requests ldap pyotp qrcode dnspython - gunicorn python3-saml pyopenssl pytz cssmin jsmin authlib bravado-core - lima pytimeparse pyyaml + gunicorn python3-saml pytz cssmin rjsmin authlib bravado-core + lima pytimeparse pyyaml jinja2 itsdangerous werkzeug ]; assets = mkYarnPackage { diff --git a/pkgs/applications/networking/powerdns-admin/package.json b/pkgs/applications/networking/powerdns-admin/package.json index 84f495920744..21119525d434 100644 --- a/pkgs/applications/networking/powerdns-admin/package.json +++ b/pkgs/applications/networking/powerdns-admin/package.json @@ -2,6 +2,7 @@ "dependencies": { "admin-lte": "2.4.9", "bootstrap": "^3.4.1", + "bootstrap-datepicker": "^1.8.0", "bootstrap-validator": "^0.11.9", "datatables.net-plugins": "^1.10.19", "icheck": "^1.0.2", @@ -12,5 +13,5 @@ "multiselect": "^0.9.12" }, "name": "powerdns-admin-assets", - "version": "0.2.4" + "version": "0.3.0" } diff --git a/pkgs/applications/networking/powerdns-admin/yarndeps.nix b/pkgs/applications/networking/powerdns-admin/yarndeps.nix index 7dcd54b53c21..7181d9e741e5 100644 --- a/pkgs/applications/networking/powerdns-admin/yarndeps.nix +++ b/pkgs/applications/networking/powerdns-admin/yarndeps.nix @@ -38,7 +38,7 @@ path = fetchurl { name = "admin_lte___admin_lte_2.4.9.tgz"; url = "https://registry.yarnpkg.com/admin-lte/-/admin-lte-2.4.9.tgz"; - sha1 = "effc04dbb587ccb7d674d4cf663cc141f925ed73"; + sha512 = "+u3zt5sWPPT8HmBvRg4F8IGZPaE5wD0K10+IjXoynfe/jEUrMMj+4eA1LGH9fMK6QulmFr1NCtc1Tk+mTgC24A=="; }; } { @@ -49,30 +49,6 @@ sha1 = "a0e7c95ac7624d6417b4494b1e68bff693168a20"; }; } - { - name = "array_filter___array_filter_0.0.1.tgz"; - path = fetchurl { - name = "array_filter___array_filter_0.0.1.tgz"; - url = "https://registry.yarnpkg.com/array-filter/-/array-filter-0.0.1.tgz"; - sha1 = "7da8cf2e26628ed732803581fd21f67cacd2eeec"; - }; - } - { - name = "array_map___array_map_0.0.0.tgz"; - path = fetchurl { - name = "array_map___array_map_0.0.0.tgz"; - url = "https://registry.yarnpkg.com/array-map/-/array-map-0.0.0.tgz"; - sha1 = "88a2bab73d1cf7bcd5c1b118a003f66f665fa662"; - }; - } - { - name = "array_reduce___array_reduce_0.0.0.tgz"; - path = fetchurl { - name = "array_reduce___array_reduce_0.0.0.tgz"; - url = "https://registry.yarnpkg.com/array-reduce/-/array-reduce-0.0.0.tgz"; - sha1 = "173899d3ffd1c7d9383e4479525dbe278cab5f2b"; - }; - } { name = "asn1.js___asn1.js_4.10.1.tgz"; path = fetchurl { @@ -118,7 +94,7 @@ path = fetchurl { name = "bn.js___bn.js_4.12.0.tgz"; url = "https://registry.yarnpkg.com/bn.js/-/bn.js-4.12.0.tgz"; - sha1 = "775b3f278efbb9718eec7361f483fb36fbbfea88"; + sha512 = "c98Bf3tPniI+scsdk237ku1Dc3ujXQTSgyiPUDEOe7tRkhrqridvh8klBv0HCEso1OLOYcHuCv/cS6DNxKH+ZA=="; }; } { @@ -126,7 +102,7 @@ path = fetchurl { name = "bootstrap_colorpicker___bootstrap_colorpicker_2.5.3.tgz"; url = "https://registry.yarnpkg.com/bootstrap-colorpicker/-/bootstrap-colorpicker-2.5.3.tgz"; - sha1 = "b50aff8590fbaa6b5aa63a5624e4213f1659a49d"; + sha512 = "xdllX8LSMvKULs3b8JrgRXTvyvjkSMHHHVuHjjN5FNMqr6kRe5NPiMHFmeAFjlgDF73MspikudLuEwR28LbzLw=="; }; } { @@ -134,7 +110,7 @@ path = fetchurl { name = "bootstrap_datepicker___bootstrap_datepicker_1.8.0.tgz"; url = "https://registry.yarnpkg.com/bootstrap-datepicker/-/bootstrap-datepicker-1.8.0.tgz"; - sha1 = "c63513931e6f09f16ae9f11b62f32d950df3958e"; + sha512 = "213St/G8KT3mjs4qu4qwww74KWysMaIeqgq5OhrboZjIjemIpyuxlSo9FNNI5+KzpkkxkRRba+oewiRGV42B1A=="; }; } { @@ -174,7 +150,7 @@ path = fetchurl { name = "bootstrap___bootstrap_3.4.1.tgz"; url = "https://registry.yarnpkg.com/bootstrap/-/bootstrap-3.4.1.tgz"; - sha1 = "c3a347d419e289ad11f4033e3c4132b87c081d72"; + sha512 = "yN5oZVmRCwe5aKwzRj6736nSmKDX7pLYwsXiCj/EYmo16hODaBiT4En5btW/jhBF/seV+XMx3aYwukYC3A49DA=="; }; } { @@ -190,7 +166,7 @@ path = fetchurl { name = "brorand___brorand_1.1.0.tgz"; url = "https://registry.yarnpkg.com/brorand/-/brorand-1.1.0.tgz"; - sha1 = "12c25efe40a45e3c323eb8675a0a0ce57b22371f"; + sha1 = "EsJe/kCkXjwyPrhnWgoM5XsiNx8="; }; } { @@ -298,11 +274,11 @@ }; } { - name = "cached_path_relative___cached_path_relative_1.0.2.tgz"; + name = "cached_path_relative___cached_path_relative_1.1.0.tgz"; path = fetchurl { - name = "cached_path_relative___cached_path_relative_1.0.2.tgz"; - url = "https://registry.yarnpkg.com/cached-path-relative/-/cached-path-relative-1.0.2.tgz"; - sha1 = "a13df4196d26776220cc3356eb147a52dba2c6db"; + name = "cached_path_relative___cached_path_relative_1.1.0.tgz"; + url = "https://registry.yarnpkg.com/cached-path-relative/-/cached-path-relative-1.1.0.tgz"; + sha512 = "WF0LihfemtesFcJgO7xfOoOcnWzY/QHR4qeDqV44jPU3HTI54+LnfXK3SA27AVVGCdZFgjjFFaqUA9Jx7dMJZA=="; }; } { @@ -334,7 +310,7 @@ path = fetchurl { name = "ckeditor___ckeditor_4.11.3.tgz"; url = "https://registry.yarnpkg.com/ckeditor/-/ckeditor-4.11.3.tgz"; - sha1 = "91f66d7ddb5bff3874514fe539779686874ed655"; + sha512 = "v6G+v16WAcukKuQH6m+trA9RCOQntFM2nxPO/GFiLYsdD/5IbZAZ2n7GwMxQmxDXpx4AixpnMWF+yAE1t9wq6Q=="; }; } { @@ -438,7 +414,7 @@ path = fetchurl { name = "datatables.net_bs___datatables.net_bs_1.10.19.tgz"; url = "https://registry.yarnpkg.com/datatables.net-bs/-/datatables.net-bs-1.10.19.tgz"; - sha1 = "08763b4e4d0cef1a427d019dc15e717c7ed67a4d"; + sha512 = "5gxoI2n+duZP06+4xVC2TtH6zcY369/TRKTZ1DdSgDcDUl4OYQsrXCuaLJmbVzna/5Y5lrMmK7CxgvYgIynICA=="; }; } { @@ -446,7 +422,7 @@ path = fetchurl { name = "datatables.net_plugins___datatables.net_plugins_1.10.20.tgz"; url = "https://registry.yarnpkg.com/datatables.net-plugins/-/datatables.net-plugins-1.10.20.tgz"; - sha1 = "c89f6bed3fa7e6605cbeaa35d60f223659e84c8c"; + sha512 = "rnhNmRHe9UEzvM7gtjBay1QodkWUmxLUhHNbmJMYhhUggjtm+BRSlE0PRilkeUkwckpNWzq+0fPd7/i0fpQgzA=="; }; } { @@ -454,7 +430,7 @@ path = fetchurl { name = "datatables.net___datatables.net_1.10.19.tgz"; url = "https://registry.yarnpkg.com/datatables.net/-/datatables.net-1.10.19.tgz"; - sha1 = "97a1ed41c85e62d61040603481b59790a172dd1f"; + sha512 = "+ljXcI6Pj3PTGy5pesp3E5Dr3x3AV45EZe0o1r0gKENN2gafBKXodVnk2ypKwl2tTmivjxbkiqoWnipTefyBTA=="; }; } { @@ -534,7 +510,7 @@ path = fetchurl { name = "elliptic___elliptic_6.5.4.tgz"; url = "https://registry.yarnpkg.com/elliptic/-/elliptic-6.5.4.tgz"; - sha1 = "da37cebd31e79a1367e941b592ed1fbebd58abbb"; + sha512 = "iLhC6ULemrljPZb+QutR5TQGB+pdW6KGD5RSegS+8sorOZT+rdQFbsQFJgvN3eRqNALqJer4oQ16YvJHlU8hzQ=="; }; } { @@ -574,7 +550,7 @@ path = fetchurl { name = "flot___flot_0.8.3.tgz"; url = "https://registry.yarnpkg.com/flot/-/flot-0.8.3.tgz"; - sha1 = "6d9b93c7aa2cfb30dfa1af9c1ec4c94070b1217f"; + sha512 = "xg2otcTJDvS+ERK+my4wxG/ASq90QURXtoM4LhacCq0jQW2jbyjdttbRNqU2cPykrpMvJ6b2uSp6SAgYAzj9tQ=="; }; } { @@ -598,7 +574,7 @@ path = fetchurl { name = "fullcalendar___fullcalendar_3.10.0.tgz"; url = "https://registry.yarnpkg.com/fullcalendar/-/fullcalendar-3.10.0.tgz"; - sha1 = "cc5e87d518fd6550e142816a31dd191664847919"; + sha512 = "0OtsHhmdYhtFmQwXzyo8VqHzYgamg+zVOoytv5N13gI+iF6CGjevpCi/yBaQs0O4wY3OAp8I688IxdNYe0iAvw=="; }; } { @@ -638,7 +614,7 @@ path = fetchurl { name = "hash.js___hash.js_1.1.7.tgz"; url = "https://registry.yarnpkg.com/hash.js/-/hash.js-1.1.7.tgz"; - sha1 = "0babca538e8d4ee4a0f8988d68866537a003cf42"; + sha512 = "taOaskGt4z4SOANNseOviYDvjEJinIkRgmp7LbKP2YTTmVxWBl87s/uzK9r+44BclBSp2X7K1hqeNfz9JbBeXA=="; }; } { @@ -646,7 +622,7 @@ path = fetchurl { name = "hmac_drbg___hmac_drbg_1.0.1.tgz"; url = "https://registry.yarnpkg.com/hmac-drbg/-/hmac-drbg-1.0.1.tgz"; - sha1 = "d2745701025a6c775a6c545793ed502fc0c649a1"; + sha1 = "0nRXAQJabHdabFRXk+1QL8DGSaE="; }; } { @@ -694,7 +670,7 @@ path = fetchurl { name = "inherits___inherits_2.0.4.tgz"; url = "https://registry.yarnpkg.com/inherits/-/inherits-2.0.4.tgz"; - sha1 = "0fa2c64f932917c3433a0ded55363aae37416b7c"; + sha512 = "k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ=="; }; } { @@ -742,7 +718,7 @@ path = fetchurl { name = "ion_rangeslider___ion_rangeslider_2.3.0.tgz"; url = "https://registry.yarnpkg.com/ion-rangeslider/-/ion-rangeslider-2.3.0.tgz"; - sha1 = "7957ce2e78acfc956b8c43009373da91f743347e"; + sha512 = "7TtH9/X4Aq/xCzboWxjwlv20gVqR90Ysc3aehMlTuH2/ULaSxpB80hq+yvD1N0FwWbPDtxQpjQrz/iX+LWXKmg=="; }; } { @@ -818,11 +794,11 @@ }; } { - name = "jquery_ui___jquery_ui_1.12.1.tgz"; + name = "jquery_ui___jquery_ui_1.13.0.tgz"; path = fetchurl { - name = "jquery_ui___jquery_ui_1.12.1.tgz"; - url = "https://registry.yarnpkg.com/jquery-ui/-/jquery-ui-1.12.1.tgz"; - sha1 = "bcb4045c8dd0539c134bc1488cdd3e768a7a9e51"; + name = "jquery_ui___jquery_ui_1.13.0.tgz"; + url = "https://registry.yarnpkg.com/jquery-ui/-/jquery-ui-1.13.0.tgz"; + sha512 = "Osf7ECXNTYHtKBkn9xzbIf9kifNrBhfywFEKxOeB/OVctVmLlouV9mfc2qXCp6uyO4Pn72PXKOnj09qXetopCw=="; }; } { @@ -830,15 +806,15 @@ path = fetchurl { name = "jquery.quicksearch___jquery.quicksearch_2.4.0.tgz"; url = "https://registry.yarnpkg.com/jquery.quicksearch/-/jquery.quicksearch-2.4.0.tgz"; - sha1 = "240c9f435e936c63bf8fbba355144ffdddf9ea26"; + sha512 = "20FJSCW3kTawO6Jvy/6MtUCURvgUZFqRUOAGTxH/VaPlwLG4kba82sKaM3ghTi1DsmSZrM2BvrwLUwNWmwDXiw=="; }; } { - name = "jquery___jquery_3.3.1.tgz"; + name = "jquery___jquery_3.6.0.tgz"; path = fetchurl { - name = "jquery___jquery_3.3.1.tgz"; - url = "https://registry.yarnpkg.com/jquery/-/jquery-3.3.1.tgz"; - sha1 = "958ce29e81c9790f31be7792df5d4d95fc57fbca"; + name = "jquery___jquery_3.6.0.tgz"; + url = "https://registry.yarnpkg.com/jquery/-/jquery-3.6.0.tgz"; + sha512 = "JVzAR/AjBvVt2BmYhxRCSYysDsPcssdmTFnzyLEts9qNwmjmu4JTAMYubEfwVOSwpQ1I1sKKFcxhZCI2buerfw=="; }; } { @@ -870,7 +846,7 @@ path = fetchurl { name = "jtimeout___jtimeout_3.1.0.tgz"; url = "https://registry.yarnpkg.com/jtimeout/-/jtimeout-3.1.0.tgz"; - sha1 = "4cd65b28eff8b9f8c61d08889a9ac3abdf5d9893"; + sha512 = "xA2TlImMGj4c0yAiM9BUq+8aAFVYVYUX2tkcC8u8das9qoZSs13SxhVcfWqI4cHOsv3huj2D0VRNHeVCLO3mVQ=="; }; } { @@ -926,7 +902,7 @@ path = fetchurl { name = "minimalistic_assert___minimalistic_assert_1.0.1.tgz"; url = "https://registry.yarnpkg.com/minimalistic-assert/-/minimalistic-assert-1.0.1.tgz"; - sha1 = "2e194de044626d4a10e7f7fbc00ce73e83e4d5c7"; + sha512 = "UtJcAD4yEaGtjPezWuO9wC4nwUnVH/8/Im3yEHQP4b67cXlD/Qr9hdITCU1xDbSEXg2XKNaP8jsReV7vQd00/A=="; }; } { @@ -934,7 +910,7 @@ path = fetchurl { name = "minimalistic_crypto_utils___minimalistic_crypto_utils_1.0.1.tgz"; url = "https://registry.yarnpkg.com/minimalistic-crypto-utils/-/minimalistic-crypto-utils-1.0.1.tgz"; - sha1 = "f6c00c1c0b082246e5c4d99dfb8c7c083b2b582a"; + sha1 = "9sAMHAsIIkblxNmd+4x8CDsrWCo="; }; } { @@ -978,19 +954,11 @@ }; } { - name = "moment___moment_2.24.0.tgz"; + name = "moment___moment_2.29.2.tgz"; path = fetchurl { - name = "moment___moment_2.24.0.tgz"; - url = "https://registry.yarnpkg.com/moment/-/moment-2.24.0.tgz"; - sha1 = "0d055d53f5052aa653c9f6eb68bb5d12bf5c2b5b"; - }; - } - { - name = "moment___moment_2.22.2.tgz"; - path = fetchurl { - name = "moment___moment_2.22.2.tgz"; - url = "https://registry.yarnpkg.com/moment/-/moment-2.22.2.tgz"; - sha1 = "3c257f9839fc0e93ff53149632239eb90783ff66"; + name = "moment___moment_2.29.2.tgz"; + url = "https://registry.yarnpkg.com/moment/-/moment-2.29.2.tgz"; + sha512 = "UgzG4rvxYpN15jgCmVJwac49h9ly9NurikMWGPdVxm8GZD6XjkKPxDTjQQ43gtGgnV3X0cAyWDdP2Wexoquifg=="; }; } { @@ -1074,11 +1042,11 @@ }; } { - name = "path_parse___path_parse_1.0.5.tgz"; + name = "path_parse___path_parse_1.0.7.tgz"; path = fetchurl { - name = "path_parse___path_parse_1.0.5.tgz"; - url = "https://registry.yarnpkg.com/path-parse/-/path-parse-1.0.5.tgz"; - sha1 = "3c1adf871ea9cd6c9431b6ea2bd74a0ff055c4c1"; + name = "path_parse___path_parse_1.0.7.tgz"; + url = "https://registry.yarnpkg.com/path-parse/-/path-parse-1.0.7.tgz"; + sha512 = "LDJzPVEEEPR+y48z93A0Ed0yXb8pAByGWo/k5YYdYgpY2/2EsOsksJrq7lOHxryrVOn1ejG6oAp8ahvOIQD8sw=="; }; } { @@ -1250,11 +1218,11 @@ }; } { - name = "shell_quote___shell_quote_1.6.1.tgz"; + name = "shell_quote___shell_quote_1.7.3.tgz"; path = fetchurl { - name = "shell_quote___shell_quote_1.6.1.tgz"; - url = "https://registry.yarnpkg.com/shell-quote/-/shell-quote-1.6.1.tgz"; - sha1 = "f4781949cce402697127430ea3b3c5476f481767"; + name = "shell_quote___shell_quote_1.7.3.tgz"; + url = "https://registry.yarnpkg.com/shell-quote/-/shell-quote-1.7.3.tgz"; + sha512 = "Vpfqwm4EnqGdlsBFNmHhxhElJYrdfcxPThu+ryKS5J8L/fhAwLazFZtq+S+TWZ9ANj2piSQLGj6NQg+lKPmxrw=="; }; } { diff --git a/pkgs/applications/science/electronics/nvc/default.nix b/pkgs/applications/science/electronics/nvc/default.nix new file mode 100644 index 000000000000..3def53dbd2e4 --- /dev/null +++ b/pkgs/applications/science/electronics/nvc/default.nix @@ -0,0 +1,67 @@ +{ lib +, stdenv +, fetchFromGitHub +, autoreconfHook +, check +, flex +, pkg-config +, which +, elfutils +, libelf +, llvm +, zlib +}: + +stdenv.mkDerivation rec { + pname = "nvc"; + version = "1.6.2"; + + src = fetchFromGitHub { + owner = "nickg"; + repo = pname; + rev = "r${version}"; + sha256 = "sha256-BtUMpT1MKRFGRlIbCEGo4OBZ/r9es1VRmJdgmk1oZFQ="; + }; + + nativeBuildInputs = [ + autoreconfHook + check + flex + pkg-config + which + ]; + + buildInputs = [ + llvm + zlib + ] ++ [ + (if stdenv.isLinux then elfutils else libelf) + ]; + + # TODO: remove me on 1.7.0 + postPatch = '' + sed -i "/vests22/d;/vhpi4/d" test/regress/testlist.txt + ''; + + preConfigure = '' + mkdir build + cd build + ''; + + configureScript = "../configure"; + + configureFlags = [ + "--enable-vhpi" + "--disable-lto" + ]; + + doCheck = true; + + meta = with lib; { + description = "VHDL compiler and simulator"; + homepage = "https://www.nickg.me.uk/nvc/"; + license = licenses.gpl3Plus; + platforms = platforms.unix; + maintainers = with maintainers; [ wegank ]; + }; +} diff --git a/pkgs/data/misc/v2ray-domain-list-community/default.nix b/pkgs/data/misc/v2ray-domain-list-community/default.nix index a5bbb2b5c013..5323348c2f3c 100644 --- a/pkgs/data/misc/v2ray-domain-list-community/default.nix +++ b/pkgs/data/misc/v2ray-domain-list-community/default.nix @@ -3,12 +3,12 @@ let generator = pkgsBuildBuild.buildGoModule rec { pname = "v2ray-domain-list-community"; - version = "20220624025859"; + version = "20220708161253"; src = fetchFromGitHub { owner = "v2fly"; repo = "domain-list-community"; rev = version; - sha256 = "sha256-/4wfTtRsBzOCbx3I3H28tB935xDZPPwHOFFmjiV7kEI="; + sha256 = "sha256-RLfb4DmigoQAKp00RHjGKGjQhCHqxSOLNnphiv1ub8s="; }; vendorSha256 = "sha256-Igx8yGWWVmVEogvbrosaK13LVs+ZZuYLBNji7iSfzdo="; meta = with lib; { diff --git a/pkgs/data/misc/v2ray-geoip/default.nix b/pkgs/data/misc/v2ray-geoip/default.nix index e4ab5df75842..790c323e57fc 100644 --- a/pkgs/data/misc/v2ray-geoip/default.nix +++ b/pkgs/data/misc/v2ray-geoip/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "v2ray-geoip"; - version = "202206230045"; + version = "202207070057"; src = fetchFromGitHub { owner = "v2fly"; repo = "geoip"; - rev = "2e2aba7f3dfb4139e8a882f85350045f2ef522d1"; - sha256 = "sha256-WFvS51RmkAWivYj0HFAT6S3euJk+GSYLDTN3cmkcCNs="; + rev = "cbabee03cf7b7b60b1167a8a14ba1eba9d9dbb77"; + sha256 = "sha256-bWhsV7+aj75nd8NDeb5D5UjvCChhtXq9lpkaZN41wDk="; }; installPhase = '' diff --git a/pkgs/desktops/gnome/core/epiphany/default.nix b/pkgs/desktops/gnome/core/epiphany/default.nix index 2dcd037fa500..88cbbee0d0be 100644 --- a/pkgs/desktops/gnome/core/epiphany/default.nix +++ b/pkgs/desktops/gnome/core/epiphany/default.nix @@ -40,11 +40,11 @@ stdenv.mkDerivation rec { pname = "epiphany"; - version = "42.2"; + version = "42.3"; src = fetchurl { url = "mirror://gnome/sources/${pname}/${lib.versions.major version}/${pname}-${version}.tar.xz"; - sha256 = "ksAs+IbRDSzP9d5ljhpCDqsx0gu1DnRtQw6VNbSFGS0="; + sha256 = "cxbTxlAOgl2OVyk/pYBHxWcnvuFs1rasgE/+XZsilWA="; }; patches = lib.optionals withPantheon [ diff --git a/pkgs/development/compilers/mlkit/default.nix b/pkgs/development/compilers/mlkit/default.nix index 04e9e8a1630e..eb2866629721 100644 --- a/pkgs/development/compilers/mlkit/default.nix +++ b/pkgs/development/compilers/mlkit/default.nix @@ -2,18 +2,18 @@ stdenv.mkDerivation rec { pname = "mlkit"; - version = "4.5.9"; + version = "4.6.1"; src = fetchFromGitHub { owner = "melsman"; repo = "mlkit"; rev = "v${version}"; - sha256 = "sha256-b+iPuGB82a0r0zl49+RbalxR6OpFNXOxZgubzKE+2M4="; + sha256 = "sha256-04G9G14fhEh8wwgqHwUR+sbYU3zaZcFV0q5SoAKcyjY="; }; nativeBuildInputs = [ autoreconfHook mlton ]; - buildFlags = ["mlkit" "mlkit_libs"]; + buildFlags = [ "mlkit" "mlkit_libs" ]; meta = with lib; { description = "Standard ML Compiler and Toolkit"; diff --git a/pkgs/development/interpreters/php/8.0.nix b/pkgs/development/interpreters/php/8.0.nix index 55a8f55a6799..193eabe6c01f 100644 --- a/pkgs/development/interpreters/php/8.0.nix +++ b/pkgs/development/interpreters/php/8.0.nix @@ -2,8 +2,8 @@ let base = callPackage ./generic.nix (_args // { - version = "8.0.20"; - sha256 = "y3Zmv2ftn2yYfUg2yvA9SzZFN+anXlbNXJhnYOzC/dg="; + version = "8.0.21"; + hash = "sha256-HLd2LR/+zOruuvufbiQTLKI/sUQ8tWMND8z1PwTPoSY="; }); in diff --git a/pkgs/development/interpreters/php/8.1.nix b/pkgs/development/interpreters/php/8.1.nix index 7c289dbb6cbd..e56ff13864bb 100644 --- a/pkgs/development/interpreters/php/8.1.nix +++ b/pkgs/development/interpreters/php/8.1.nix @@ -2,8 +2,8 @@ let base = callPackage ./generic.nix (_args // { - version = "8.1.7"; - sha256 = "uBZ1PrAFUR5pXZCUXCcJPDI2zHPbEmJlbZ+t1z6tfp0="; + version = "8.1.8"; + hash = "sha256-uIFaWgJDFFPUJh41mL0fKFFuTANU8yjBKJDyV4cOTAE="; }); in diff --git a/pkgs/development/interpreters/php/generic.nix b/pkgs/development/interpreters/php/generic.nix index 70052197d220..5984113574c2 100644 --- a/pkgs/development/interpreters/php/generic.nix +++ b/pkgs/development/interpreters/php/generic.nix @@ -29,7 +29,7 @@ let , xcbuild , version - , sha256 + , hash , extraPatches ? [ ] , packageOverrides ? (final: prev: { }) , phpAttrsOverrides ? (attrs: { }) @@ -290,7 +290,7 @@ let src = fetchurl { url = "https://www.php.net/distributions/php-${version}.tar.bz2"; - inherit sha256; + inherit hash; }; patches = [ ./fix-paths-php7.patch ] ++ extraPatches; diff --git a/pkgs/development/libraries/capnproto/default.nix b/pkgs/development/libraries/capnproto/default.nix index 3f1d12198994..eeeaaed4236d 100644 --- a/pkgs/development/libraries/capnproto/default.nix +++ b/pkgs/development/libraries/capnproto/default.nix @@ -6,14 +6,14 @@ stdenv.mkDerivation rec { pname = "capnproto"; - version = "0.10.1"; + version = "0.10.2"; # release tarballs are missing some ekam rules src = fetchFromGitHub { owner = "capnproto"; repo = "capnproto"; rev = "v${version}"; - sha256 = "sha256-VdeoTU802kAqTdu8CJTIhy3xHM3ZCPqb5YNUS2k1x7E="; + sha256 = "sha256-vBp4CAfPpd7/hdGk7JBxMTjtFFvXx16ODOfqDd8bAjc="; }; nativeBuildInputs = [ cmake ] diff --git a/pkgs/development/libraries/folly/default.nix b/pkgs/development/libraries/folly/default.nix index fdda2b3a6205..8cc763f229d6 100644 --- a/pkgs/development/libraries/folly/default.nix +++ b/pkgs/development/libraries/folly/default.nix @@ -21,13 +21,13 @@ stdenv.mkDerivation rec { pname = "folly"; - version = "2022.06.13.00"; + version = "2022.07.04.00"; src = fetchFromGitHub { owner = "facebook"; repo = "folly"; rev = "v${version}"; - sha256 = "sha256-30Fzk97wVK0JR/6YllyBjW9KlYrFj+GJpuV+V2bKXL8="; + sha256 = "sha256-TUtqwFBxYMnjXpygwXYWK7FNvTPL4a7T+rn1TMtUIPc="; }; nativeBuildInputs = [ diff --git a/pkgs/development/libraries/libmd/default.nix b/pkgs/development/libraries/libmd/default.nix index a429cb219d58..ad3d8f0cce40 100644 --- a/pkgs/development/libraries/libmd/default.nix +++ b/pkgs/development/libraries/libmd/default.nix @@ -1,14 +1,26 @@ -{ lib, stdenv, fetchurl, autoreconfHook }: +{ lib, stdenv, fetchurl, fetchpatch, autoreconfHook }: stdenv.mkDerivation rec { pname = "libmd"; version = "1.0.4"; src = fetchurl { - url = "https://archive.hadrons.org/software/${pname}/${pname}-${version}.tar.xz"; + urls = [ + "https://archive.hadrons.org/software/libmd/libmd-${version}.tar.xz" + "https://libbsd.freedesktop.org/releases/libmd-${version}.tar.xz" + ]; sha256 = "sha256-9RySEELjS+3e3tS3VVdlZVnPWx8kSAM7TB7sEcB+Uw8="; }; + patches = [ + # Drop aliases for SHA384 functions, because such aliases are not supported on Darwin. + (fetchpatch { + url = "https://github.com/macports/macports-ports/raw/8332f5dbcaf05a02bc31fbd4ccf735e7d5c9a5b0/devel/libmd/files/patch-symbol-alias.diff"; + sha256 = "sha256-py5hMpKYKwtBzhWn01lFc2a6+OZN72YCYXyhg1qe6rg="; + extraPrefix = ""; + }) + ]; + nativeBuildInputs = [ autoreconfHook ]; meta = with lib; { @@ -18,6 +30,6 @@ stdenv.mkDerivation rec { description = "Message Digest functions from BSD systems"; license = with licenses; [ bsd3 bsd2 isc beerware publicDomain ]; maintainers = with maintainers; [ primeos ]; - platforms = platforms.linux; + platforms = platforms.unix; }; } diff --git a/pkgs/development/libraries/libpg_query/default.nix b/pkgs/development/libraries/libpg_query/default.nix index 7c654c07f03a..f7736b380fd6 100644 --- a/pkgs/development/libraries/libpg_query/default.nix +++ b/pkgs/development/libraries/libpg_query/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "libpg_query"; - version = "13-2.1.1"; + version = "13-2.1.2"; src = fetchFromGitHub { owner = "pganalyze"; repo = "libpg_query"; rev = version; - sha256 = "sha256-195WNTTdXHHPbQg2Ipwa3v/qPEeAtehvZa2OC1egoFo="; + sha256 = "sha256-Y0oIcpZ0CPbFvyTC6YrSjcs14jk/K5pIyJjTo5vV5sQ="; }; nativeBuildInputs = [ which ]; diff --git a/pkgs/development/libraries/rdkafka/default.nix b/pkgs/development/libraries/rdkafka/default.nix index 829b298107f9..1a289393ef1e 100644 --- a/pkgs/development/libraries/rdkafka/default.nix +++ b/pkgs/development/libraries/rdkafka/default.nix @@ -1,17 +1,17 @@ -{ lib, stdenv, fetchFromGitHub, zlib, zstd, pkg-config, python3, openssl }: +{ lib, stdenv, fetchFromGitHub, zlib, zstd, pkg-config, python3, openssl, which }: stdenv.mkDerivation rec { pname = "rdkafka"; - version = "1.8.2"; + version = "1.9.1"; src = fetchFromGitHub { owner = "edenhill"; repo = "librdkafka"; rev = "v${version}"; - sha256 = "sha256-YagvXeusHThUo5/1mMs+r+Nr03vAagdnFMkwX3hJsq4="; + sha256 = "sha256-r5H02HLqiixbShgXDEaYEe4OrQK2En5zuLtMOajEIBM="; }; - nativeBuildInputs = [ pkg-config python3 ]; + nativeBuildInputs = [ pkg-config python3 which ]; buildInputs = [ zlib zstd openssl ]; diff --git a/pkgs/development/ocaml-modules/nocrypto/default.nix b/pkgs/development/ocaml-modules/nocrypto/default.nix deleted file mode 100644 index e34e3ae01462..000000000000 --- a/pkgs/development/ocaml-modules/nocrypto/default.nix +++ /dev/null @@ -1,73 +0,0 @@ -{ stdenv, lib, fetchurl, fetchpatch, ocaml, findlib, ocamlbuild, topkg -, cpuid, ocb-stubblr, sexplib -, cstruct, zarith, ppx_sexp_conv, ppx_deriving, writeScriptBin -, cstruct-lwt ? null -}: - -with lib; -let - withLwt = cstruct-lwt != null; - # the build system will call 'cc' with no way to override - # this is wrong when we're cross-compiling, so insert a wrapper - cc-wrapper = writeScriptBin "cc" '' - set -e - $CC "$@" - ''; -in - -if versionOlder ocaml.version "4.08" -then throw "nocrypto is not available for OCaml ${ocaml.version}" -else - -stdenv.mkDerivation rec { - pname = "ocaml${ocaml.version}-nocrypto"; - version = "0.5.4"; - - src = fetchurl { - url = "https://github.com/mirleft/ocaml-nocrypto/releases/download/v${version}/nocrypto-${version}.tbz"; - sha256 = "0zshi9hlhcz61n5z1k6fx6rsi0pl4xgahsyl2jp0crqkaf3hqwlg"; - }; - - patches = [ - (fetchpatch { - url = "https://raw.githubusercontent.com/ocaml/opam-repository/master/packages/nocrypto/nocrypto.0.5.4-1/files/0001-add-missing-runtime-dependencies-in-_tags.patch"; - sha256 = "1asybwj3rl07b4q4cxwy80a7j17j0i5vzz77p38hymilhc2ky7xn"; - }) - (fetchpatch { - url = "https://raw.githubusercontent.com/ocaml/opam-repository/master/packages/nocrypto/nocrypto.0.5.4-1/files/0002-add-ppx_sexp_conv-as-a-runtime-dependency-in-the-pac.patch"; - sha256 = "0zmp64n5fgkawpkyw0vv0bg0i2c3xbsxqy17vwy92nf5rbardi1r"; - }) - (fetchpatch { - url = "https://raw.githubusercontent.com/ocaml/opam-repository/master/packages/nocrypto/nocrypto.0.5.4-1/files/0003-Auto-detect-ppx_sexp_conv-runtime-library.patch"; - sha256 = "0lngbg5gyd5gs56lbjh6g86cps1y8x1xsqzi0vi1v28al1gn5dhw"; - }) - (fetchpatch { - url = "https://raw.githubusercontent.com/ocaml/opam-repository/master/packages/nocrypto/nocrypto.0.5.4-1/files/0004-pack-package-workaround-ocamlbuild-272.patch"; - sha256 = "16k0w78plvqhl17qiqq1mckxhhcdysqgs94l54a1bn0l6fx3rvb9"; - }) - (fetchpatch { - url = "https://raw.githubusercontent.com/ocaml/opam-repository/master/packages/nocrypto/nocrypto.0.5.4-1/files/0005-use-modern-cstruct-findlib.patch"; - sha256 = "021k38zbdidw6g7j4vjxlnbsrnzq07bnavxzdjq23nbwlifs2nq9"; - }) - (fetchpatch { - url = "https://raw.githubusercontent.com/ocaml/opam-repository/master/packages/nocrypto/nocrypto.0.5.4-1/files/0006-explicit-dependency-on-sexplib.patch"; - sha256 = "15kd0qgi96yxr3qkmaqny591l0s6qmwpprxd5xdx9qwv72hq813z"; - }) - ]; - - nativeBuildInputs = [ ocaml findlib ocamlbuild cc-wrapper ]; - buildInputs = [ topkg cpuid ocb-stubblr ocamlbuild ]; - propagatedBuildInputs = [ cstruct ppx_deriving ppx_sexp_conv sexplib zarith ] ++ optional withLwt cstruct-lwt; - - strictDeps = true; - - buildPhase = "${topkg.buildPhase} --accelerate false --with-lwt ${boolToString withLwt}"; - inherit (topkg) installPhase; - - meta = { - homepage = "https://github.com/mirleft/ocaml-nocrypto"; - description = "Simplest possible crypto to support TLS"; - license = lib.licenses.bsd2; - maintainers = with lib.maintainers; [ vbgl ]; - }; -} diff --git a/pkgs/development/ocaml-modules/noise/default.nix b/pkgs/development/ocaml-modules/noise/default.nix deleted file mode 100644 index 59ca274c88dc..000000000000 --- a/pkgs/development/ocaml-modules/noise/default.nix +++ /dev/null @@ -1,60 +0,0 @@ -{ lib -, buildDunePackage -, fetchurl - -, callipyge -, chacha -, digestif -, hex -, lwt -, lwt_ppx -, nocrypto -, ounit -, ppxlib -, ppx_let -, ppx_deriving -, ppx_deriving_yojson -}: - -buildDunePackage rec { - pname = "noise"; - version = "0.2.0"; - - src = fetchurl { - url = "https://github.com/emillon/ocaml-noise/releases/download/v${version}/${pname}-v${version}.tbz"; - sha256 = "sha256-fe3pT7fsuF2hCvXpInsRg6OvARs/eAh1Un454s1osDs="; - }; - - useDune2 = true; - - minimumOCamlVersion = "4.04"; - - nativeBuildInputs = [ - ppxlib - ppx_deriving - ppx_let - ]; - - propagatedBuildInputs = [ - callipyge - chacha - digestif - hex - nocrypto - ]; - - doCheck = true; - checkInputs = [ - lwt - lwt_ppx - ounit - ppx_deriving_yojson - ]; - - meta = { - homepage = "https://github.com/emillon/ocaml-noise"; - description = "OCaml implementation of the Noise Protocol Framework"; - license = lib.licenses.bsd2; - maintainers = with lib.maintainers; [ fufexan ]; - }; -} diff --git a/pkgs/development/ocaml-modules/wodan/default.nix b/pkgs/development/ocaml-modules/wodan/default.nix index 64ca29f20308..f33d7b9861f6 100644 --- a/pkgs/development/ocaml-modules/wodan/default.nix +++ b/pkgs/development/ocaml-modules/wodan/default.nix @@ -1,5 +1,5 @@ { lib, buildDunePackage, fetchFromGitHub, lwt_ppx, ppx_cstruct, optint -, checkseum, diet, bitv, nocrypto, logs, lru, io-page, mirage-block }: +, checkseum, diet, bitv, logs, lru, io-page, mirage-block }: buildDunePackage rec { pname = "wodan"; @@ -24,7 +24,7 @@ buildDunePackage rec { checkseum diet bitv - nocrypto + /* nocrypto */ logs lru io-page @@ -32,6 +32,7 @@ buildDunePackage rec { ]; meta = with lib; { + broken = true; # nocrypto is no longer available in nixpkgs inherit (src.meta) homepage; description = "A flash-friendly, safe and flexible filesystem library"; license = licenses.isc; diff --git a/pkgs/development/python-modules/aioairzone/default.nix b/pkgs/development/python-modules/aioairzone/default.nix index 1862c3e6a317..83019e202e5f 100644 --- a/pkgs/development/python-modules/aioairzone/default.nix +++ b/pkgs/development/python-modules/aioairzone/default.nix @@ -7,7 +7,7 @@ buildPythonPackage rec { pname = "aioairzone"; - version = "0.4.5"; + version = "0.4.6"; format = "setuptools"; disabled = pythonOlder "3.8"; @@ -16,7 +16,7 @@ buildPythonPackage rec { owner = "Noltari"; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-sNlqG5A8a8AIgKc9xDAEwxBeKJ/HaW847BZR4WdcsrQ="; + hash = "sha256-DDp9gtKavO3LCDnaZsYYLTWwoy0kQaTitJeALSPlXaQ="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/aiopyarr/default.nix b/pkgs/development/python-modules/aiopyarr/default.nix index b3789c291f70..a2e66b42af74 100644 --- a/pkgs/development/python-modules/aiopyarr/default.nix +++ b/pkgs/development/python-modules/aiopyarr/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { pname = "aiopyarr"; - version = "22.6.0"; + version = "22.7.0"; format = "setuptools"; disabled = pythonOlder "3.9"; @@ -19,7 +19,7 @@ buildPythonPackage rec { owner = "tkdrob"; repo = pname; rev = version; - hash = "sha256-LfZEM1vPccQBrvNz9CGVlihg6YAB7FAvUZogu/ngZ4Y="; + hash = "sha256-ALFaWy/wY8PTuMixHEWaXXmKNSLf9Cm2pgffVHnAWLg="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/aioqsw/default.nix b/pkgs/development/python-modules/aioqsw/default.nix index aca857ab6e68..4bc5ae32d753 100644 --- a/pkgs/development/python-modules/aioqsw/default.nix +++ b/pkgs/development/python-modules/aioqsw/default.nix @@ -8,7 +8,7 @@ buildPythonPackage rec { pname = "aioqsw"; - version = "0.1.0"; + version = "0.1.1"; format = "setuptools"; disabled = pythonOlder "3.8"; @@ -17,7 +17,7 @@ buildPythonPackage rec { owner = "Noltari"; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-/4d7FXz0LBKKnJemmhOXZrnRrVuFaKojLaUn0SXcFaw="; + hash = "sha256-ASFdV/4IH3eaxJJ+Hj7YRZ7Ejp35bqT9DH2NUcD3S9A="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/aioskybell/default.nix b/pkgs/development/python-modules/aioskybell/default.nix index db2573fa9599..0f3e8c041e0c 100644 --- a/pkgs/development/python-modules/aioskybell/default.nix +++ b/pkgs/development/python-modules/aioskybell/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { pname = "aioskybell"; - version = "22.6.1"; + version = "22.7.0"; format = "setuptools"; disabled = pythonOlder "3.9"; @@ -20,7 +20,7 @@ buildPythonPackage rec { owner = "tkdrob"; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-VaG8r4ULbjI7LkIPCit3bILZgOi9k7ddRQXwVzplaCM="; + hash = "sha256-aBT1fDFtq1vasTvCnAXKV2vmZ6LBLZqRCiepv1HDJ+Q="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/asf-search/default.nix b/pkgs/development/python-modules/asf-search/default.nix index 0e534aa0f283..616402aa7174 100644 --- a/pkgs/development/python-modules/asf-search/default.nix +++ b/pkgs/development/python-modules/asf-search/default.nix @@ -16,7 +16,7 @@ buildPythonPackage rec { pname = "asf-search"; - version = "4.0.1"; + version = "4.0.3"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -25,7 +25,7 @@ buildPythonPackage rec { owner = "asfadmin"; repo = "Discovery-asf_search"; rev = "refs/tags/v${version}"; - hash = "sha256-58roOxLFTu7WddgifuvaMoFlEh+iHrrL0rSJjAw35d0="; + hash = "sha256-Af6Nyrl1mrYTG24/nIv+x5Znk20HOubjjPAUvbdnj+Y="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/atomicwrites-homeassistant/default.nix b/pkgs/development/python-modules/atomicwrites-homeassistant/default.nix new file mode 100644 index 000000000000..d905e590af0a --- /dev/null +++ b/pkgs/development/python-modules/atomicwrites-homeassistant/default.nix @@ -0,0 +1,35 @@ +{ lib +, buildPythonPackage +, fetchPypi +, pytestCheckHook +}: + +let + pname = "atomicwrites-homeassistant"; + version = "1.4.1"; +in + +buildPythonPackage { + inherit pname version; + format = "setuptools"; + + src = fetchPypi { + inherit pname version; + hash = "sha256-JWpnIQbxZ0VEUijZZiQLd7VfRqCW0gMFkBpXql0fTC8="; + }; + + pythonImportsCheck = [ + "atomicwrites" + ]; + + checkInputs = [ + pytestCheckHook + ]; + + meta = with lib; { + description = "Atomic file writes"; + homepage = "https://pypi.org/project/atomicwrites-homeassistant/"; + license = licenses.mit; + maintainers = with maintainers; [ hexa ]; + }; +} diff --git a/pkgs/development/python-modules/azure-servicebus/default.nix b/pkgs/development/python-modules/azure-servicebus/default.nix index 7ea0941441f8..47849c9c6f1a 100644 --- a/pkgs/development/python-modules/azure-servicebus/default.nix +++ b/pkgs/development/python-modules/azure-servicebus/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { pname = "azure-servicebus"; - version = "7.7.0"; + version = "7.8.0"; format = "setuptools"; disabled = pythonOlder "3.6"; @@ -21,7 +21,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; extension = "zip"; - hash = "sha256-D9CdVfPU7FwiAQd2Pw/CMJsHj8psYtVq3wYJlVHVA1s="; + hash = "sha256-KTvJXOJ3o2KUL9iPcus6m0qS3hAAB3Wz0uPgCttFqlk="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/browser-cookie3/default.nix b/pkgs/development/python-modules/browser-cookie3/default.nix index 50310cff8ef5..cfb9364c30d8 100644 --- a/pkgs/development/python-modules/browser-cookie3/default.nix +++ b/pkgs/development/python-modules/browser-cookie3/default.nix @@ -12,14 +12,14 @@ buildPythonPackage rec { pname = "browser-cookie3"; - version = "0.16.0"; + version = "0.16.1"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-2JXs7KGS6XyhRwsoWlt+4gL40t1JNWbRO8n84zX5Cf4="; + hash = "sha256-Gamys354RIvUQOelN8YDY6GfpJanC7CjWXC1plmh/jU="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/cmd2/default.nix b/pkgs/development/python-modules/cmd2/default.nix index 8a7f9a5e1c8a..79cd6187ddb2 100644 --- a/pkgs/development/python-modules/cmd2/default.nix +++ b/pkgs/development/python-modules/cmd2/default.nix @@ -12,7 +12,6 @@ , pythonOlder , setuptools-scm , typing-extensions -, vim , wcwidth }: @@ -47,7 +46,12 @@ buildPythonPackage rec { pytestCheckHook glibcLocales pytest-mock - vim + ]; + + disabledTests = [ + # don't require vim for tests, it causes lots of rebuilds + "test_find_editor_not_specified" + "test_transcript" ]; postPatch = '' diff --git a/pkgs/development/python-modules/dogpile-cache/default.nix b/pkgs/development/python-modules/dogpile-cache/default.nix index fe700abedd7a..f5fde969a862 100644 --- a/pkgs/development/python-modules/dogpile-cache/default.nix +++ b/pkgs/development/python-modules/dogpile-cache/default.nix @@ -11,13 +11,13 @@ buildPythonPackage rec { pname = "dogpile-cache"; - version = "1.1.6"; + version = "1.1.7"; disabled = pythonOlder "3.6"; src = fetchPypi { pname = "dogpile.cache"; inherit version; - sha256 = "sha256-7tweMn5myT8MFah0BWmrdO89iSkELxCPmP3tnjX6/1U="; + sha256 = "sha256-IItZCpn6omXG4dEcLOnKZqsLgaU6zXL1aoJe7dI+5cg="; }; preCheck = '' diff --git a/pkgs/development/python-modules/dvc-objects/default.nix b/pkgs/development/python-modules/dvc-objects/default.nix index ec487e0bbae7..490d0bb54513 100644 --- a/pkgs/development/python-modules/dvc-objects/default.nix +++ b/pkgs/development/python-modules/dvc-objects/default.nix @@ -16,7 +16,7 @@ buildPythonPackage rec { pname = "dvc-objects"; - version = "0.0.19"; + version = "0.0.20"; format = "pyproject"; disabled = pythonOlder "3.8"; @@ -25,7 +25,7 @@ buildPythonPackage rec { owner = "iterative"; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-nuGsFNWJBsdL0QdnhYYz6rR6a9aNxCFnun7Xb2eZO3U="; + hash = "sha256-n5knh8MbT0CUvPBABRAewMN9AU5afV5CBAM8hqgdHw0="; }; SETUPTOOLS_SCM_PRETEND_VERSION = version; diff --git a/pkgs/development/python-modules/elastic-apm/default.nix b/pkgs/development/python-modules/elastic-apm/default.nix index 0d016b92ec3a..f4fea05b4110 100644 --- a/pkgs/development/python-modules/elastic-apm/default.nix +++ b/pkgs/development/python-modules/elastic-apm/default.nix @@ -6,7 +6,6 @@ , certifi , ecs-logging , fetchFromGitHub -, fetchpatch , httpx , jinja2 , jsonschema @@ -29,7 +28,7 @@ buildPythonPackage rec { pname = "elastic-apm"; - version = "6.9.1"; + version = "6.10.1"; format = "setuptools"; disabled = pythonOlder "3.8"; @@ -38,17 +37,9 @@ buildPythonPackage rec { owner = "elastic"; repo = "apm-agent-python"; rev = "v${version}"; - sha256 = "sha256-IaCl39rhsFLQwvQdPcqKruV/Mo3f7WH91UVgMG/cnOc="; + hash = "sha256-ql6qBnZXa0JL1qEXj2OzzP3onjYrMx6+Be6K3SDuWf4="; }; - 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/elkm1-lib/default.nix b/pkgs/development/python-modules/elkm1-lib/default.nix index 40f9aa451b69..f0815b15c71d 100644 --- a/pkgs/development/python-modules/elkm1-lib/default.nix +++ b/pkgs/development/python-modules/elkm1-lib/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { pname = "elkm1-lib"; - version = "2.0.0"; + version = "2.0.2"; format = "pyproject"; disabled = pythonOlder "3.9"; @@ -20,7 +20,7 @@ buildPythonPackage rec { owner = "gwww"; repo = "elkm1"; rev = version; - hash = "sha256-o0RQgAP38W7paVJonrfj54y2OhMmTihT9xiipEyNVaM="; + hash = "sha256-2UneQL8LT/zm0iusKay9SxeJClGrDi6yL0lRA8ugUms="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/extractcode/default.nix b/pkgs/development/python-modules/extractcode/default.nix index 8af4cb865fd3..0c776abb4dbd 100644 --- a/pkgs/development/python-modules/extractcode/default.nix +++ b/pkgs/development/python-modules/extractcode/default.nix @@ -8,15 +8,19 @@ , extractcode-7z , pytestCheckHook , pytest-xdist +, pythonOlder }: buildPythonPackage rec { pname = "extractcode"; version = "31.0.0"; + format = "setuptools"; + + disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - sha256 = "sha256-gIGTkum8+BKfdNiQT+ipjA3+0ngjVoQnNygsAoMRPYg="; + hash = "sha256-gIGTkum8+BKfdNiQT+ipjA3+0ngjVoQnNygsAoMRPYg="; }; dontConfigure = true; @@ -51,6 +55,7 @@ buildPythonPackage rec { "test_can_extract_qcow2_vm_image_as_tarball" "test_can_extract_qcow2_vm_image_not_as_tarball" "test_can_listfs_from_qcow2_image" + "test_get_extractor_qcow2" ]; pythonImportsCheck = [ diff --git a/pkgs/development/python-modules/fonttools/default.nix b/pkgs/development/python-modules/fonttools/default.nix index ba9929caacce..88789f6b57f3 100644 --- a/pkgs/development/python-modules/fonttools/default.nix +++ b/pkgs/development/python-modules/fonttools/default.nix @@ -57,12 +57,14 @@ buildPythonPackage rec { checkInputs = [ pytestCheckHook - ] ++ lib.concatLists (lib.attrVals [ + ] ++ lib.concatLists (lib.attrVals ([ "woff" "interpolatable" - "pathops" + ] ++ lib.optionals (!skia-pathops.meta.broken) [ + "pathops" # broken + ] ++ [ "repacker" - ] passthru.optional-dependencies); + ]) passthru.optional-dependencies); pythonImportsCheck = [ "fontTools" ]; diff --git a/pkgs/development/python-modules/fs/default.nix b/pkgs/development/python-modules/fs/default.nix index 6915ba8d050c..32b5dd747dda 100644 --- a/pkgs/development/python-modules/fs/default.nix +++ b/pkgs/development/python-modules/fs/default.nix @@ -20,11 +20,11 @@ buildPythonPackage rec { pname = "fs"; - version = "2.4.15"; + version = "2.4.16"; src = fetchPypi { inherit pname version; - sha256 = "sha256-sJ0CwxH0rdHm4rdXJMRQ6vz+7MkXV5IkyorSHazQoYI="; + sha256 = "sha256-rpfH1RIT9LcLapWCklMCiQkN46fhWEHhCPvhRPBp0xM="; }; buildInputs = [ glibcLocales ]; diff --git a/pkgs/development/python-modules/geopandas/default.nix b/pkgs/development/python-modules/geopandas/default.nix index 9bacb9fd818c..02601febe6a2 100644 --- a/pkgs/development/python-modules/geopandas/default.nix +++ b/pkgs/development/python-modules/geopandas/default.nix @@ -1,51 +1,63 @@ -{ lib, stdenv, buildPythonPackage, fetchFromGitHub, fetchpatch, pythonOlder -, pandas, shapely, fiona, pyproj -, pytestCheckHook, Rtree }: +{ lib +, stdenv +, buildPythonPackage +, fetchFromGitHub +, fiona +, packaging +, pandas +, pyproj +, pytestCheckHook +, pythonOlder +, Rtree +, shapely +}: buildPythonPackage rec { pname = "geopandas"; - version = "0.10.2"; - disabled = pythonOlder "3.6"; + version = "0.11.0"; + format = "setuptools"; + + disabled = pythonOlder "3.8"; src = fetchFromGitHub { owner = "geopandas"; repo = "geopandas"; rev = "v${version}"; - sha256 = "14azl3gppqn90k8h4hpjilsivj92k6p1jh7mdr6p4grbww1b7sdq"; + hash = "sha256-w3F2Uqr/+DdG2Td5YmHdF/LII2y29rQkGK5ooMUcfRk="; }; - patches = [ - # Fixes a test, will be included in the next release after 0.10.2 - (fetchpatch { - url = "https://github.com/geopandas/geopandas/pull/2219/commits/ac67515c9df745b672cca1669adf05eaf5cb0f3b.patch"; - sha256 = "sha256-XcaoFhD6Rq0nfEpMbOJiAWPbaPDrMwFwoyppayq8NHc="; - }) - # 5 commits from post 0.10.2 that fix the test suite compatibility with pandas >=1.4 - (fetchpatch { - url = "https://github.com/geopandas/geopandas/pull/2289.patch"; - sha256 = "sha256-BcZVdaO/DdpZoVGUWaw9etFvvgwizAgrkaBISEOhV4A="; - }) + propagatedBuildInputs = [ + fiona + packaging + pandas + pyproj + shapely ]; - propagatedBuildInputs = [ - pandas - shapely - fiona - pyproj + checkInputs = [ + pytestCheckHook + Rtree ]; doCheck = !stdenv.isDarwin; + preCheck = '' - # Wants to write test files into $HOME. - export HOME="$TMPDIR" + export HOME=$(mktemp -d); ''; - checkInputs = [ pytestCheckHook Rtree ]; + disabledTests = [ - # requires network access + # Requires network access "test_read_file_remote_geojson_url" "test_read_file_remote_zipfile_url" ]; - pytestFlagsArray = [ "geopandas" ]; + + pytestFlagsArray = [ + "geopandas" + ]; + + pythonImportsCheck = [ + "geopandas" + ]; meta = with lib; { description = "Python geospatial data analysis framework"; diff --git a/pkgs/development/python-modules/google-cloud-bigquery-storage/default.nix b/pkgs/development/python-modules/google-cloud-bigquery-storage/default.nix index e013cac9f610..4e2082ba3b55 100644 --- a/pkgs/development/python-modules/google-cloud-bigquery-storage/default.nix +++ b/pkgs/development/python-modules/google-cloud-bigquery-storage/default.nix @@ -9,11 +9,11 @@ buildPythonPackage rec { pname = "google-cloud-bigquery-storage"; - version = "2.13.2"; + version = "2.14.0"; src = fetchPypi { inherit pname version; - sha256 = "sha256-rEznNOgFrKfnOmlhexTTHmkKETRGE26SKSp04diz47I="; + sha256 = "sha256-udzLm/aYwXjeyBV70J/NjjhUMLHJ7wXHMS8OSlnrrZU="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/google-cloud-iam-logging/default.nix b/pkgs/development/python-modules/google-cloud-iam-logging/default.nix index b867c40140ba..ca0db441abcf 100644 --- a/pkgs/development/python-modules/google-cloud-iam-logging/default.nix +++ b/pkgs/development/python-modules/google-cloud-iam-logging/default.nix @@ -12,14 +12,14 @@ buildPythonPackage rec { pname = "google-cloud-iam-logging"; - version = "1.0.2"; + version = "1.0.3"; format = "setuptools"; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - hash = "sha256-f5ZETn1zLrC+1Gil47zzJGanx7cFBisdoFPoDe1FFwo="; + hash = "sha256-JUrzCSON1oMVH0U1d4tfl1nGDc+IyIMOSL4PxEflDAU="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/google-cloud-monitoring/default.nix b/pkgs/development/python-modules/google-cloud-monitoring/default.nix index b68f3b4ce4e3..3325942f04d8 100644 --- a/pkgs/development/python-modules/google-cloud-monitoring/default.nix +++ b/pkgs/development/python-modules/google-cloud-monitoring/default.nix @@ -14,14 +14,14 @@ buildPythonPackage rec { pname = "google-cloud-monitoring"; - version = "2.9.2"; + version = "2.10.0"; format = "setuptools"; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - hash = "sha256-ePJGEBzo5lXBnCDMuZQPVoU9gT4yfDs8YZB50x4xb90="; + hash = "sha256-hnDzNkFluRjq/Bxk6NIXezGLDEMAcW4MLQG7F5U9Ez8="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/google-cloud-os-config/default.nix b/pkgs/development/python-modules/google-cloud-os-config/default.nix index d2235b44cf60..d18c35a464f6 100644 --- a/pkgs/development/python-modules/google-cloud-os-config/default.nix +++ b/pkgs/development/python-modules/google-cloud-os-config/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "google-cloud-os-config"; - version = "1.11.2"; + version = "1.12.0"; src = fetchPypi { inherit pname version; - sha256 = "sha256-n3bCKr+fszqHsi6uDmOXSfzoPP8JfpZRAGXIzE3gOVU="; + sha256 = "sha256-k68hDx0D2b59PJpUjMcwDtIqnwhrQxEpxDZCo5JQuXc="; }; propagatedBuildInputs = [ google-api-core libcst proto-plus ]; diff --git a/pkgs/development/python-modules/google-cloud-pubsub/default.nix b/pkgs/development/python-modules/google-cloud-pubsub/default.nix index aac222df0ac3..553a76396383 100644 --- a/pkgs/development/python-modules/google-cloud-pubsub/default.nix +++ b/pkgs/development/python-modules/google-cloud-pubsub/default.nix @@ -15,14 +15,14 @@ buildPythonPackage rec { pname = "google-cloud-pubsub"; - version = "2.13.0"; + version = "2.13.1"; format = "setuptools"; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - hash = "sha256-pcLgXIPWC7F6FS5Znn9DJMn/tsjNpE/7YlCxYoDDg+Y="; + hash = "sha256-P5x5cUxSKYueJJpGZgwb8NRX9nkovOzw2Ox6BrzGzFQ="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/h5netcdf/default.nix b/pkgs/development/python-modules/h5netcdf/default.nix index 23a8c4ddcb26..7afa664c1a85 100644 --- a/pkgs/development/python-modules/h5netcdf/default.nix +++ b/pkgs/development/python-modules/h5netcdf/default.nix @@ -6,23 +6,24 @@ , pytestCheckHook , netcdf4 , pythonOlder +, setuptools-scm }: buildPythonPackage rec { pname = "h5netcdf"; - version = "0.8.1"; + version = "1.0.1"; + format = "setuptools"; + + disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - sha256 = "09bbnpsvwksb07wijn7flyyza56h5b2g2cw0hb3slmwxz6cgcjmr"; + hash = "sha256-d2cE+s2LgiRtbUBoxQXDibO3C5v5kgzPusfzXNxjTaw="; }; - patches = [ - (fetchpatch{ - url = "https://patch-diff.githubusercontent.com/raw/h5netcdf/h5netcdf/pull/82.patch"; - sha256 = "0x9bq9jl4kvw152adkpcyqslhpi7miv80hrnpl2w2y798mmbs0s4"; - }) - ]; + nativeBuildInputs = [ + setuptools-scm + ]; propagatedBuildInputs = [ h5py @@ -33,14 +34,16 @@ buildPythonPackage rec { netcdf4 ]; - disabled = pythonOlder "3.6"; - dontUseSetuptoolsCheck = true; - meta = { + pythonImportsCheck = [ + "h5netcdf" + ]; + + meta = with lib; { description = "netCDF4 via h5py"; homepage = "https://github.com/shoyer/h5netcdf"; - license = lib.licenses.bsd3; + license = licenses.bsd3; + maintainers = with maintainers; [ ]; }; - } diff --git a/pkgs/development/python-modules/hahomematic/default.nix b/pkgs/development/python-modules/hahomematic/default.nix index ff6c4bf2cdb3..4fcc26b7137a 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.9.4"; + version = "2022.7.1"; format = "pyproject"; disabled = pythonOlder "3.9"; @@ -23,7 +23,7 @@ buildPythonPackage rec { owner = "danielperna84"; repo = pname; rev = "refs/tags/${version}"; - sha256 = "sha256-swi9m2vM573h+im3p97DT73LtalipoCnGMbcnBFyCfw="; + sha256 = "sha256-V+g4TlwnTuirmxoMmq/A0dGKqubEH8ObPuroXKbSH8U="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/hass-nabucasa/default.nix b/pkgs/development/python-modules/hass-nabucasa/default.nix index 3b0531084244..36b626e4dc02 100644 --- a/pkgs/development/python-modules/hass-nabucasa/default.nix +++ b/pkgs/development/python-modules/hass-nabucasa/default.nix @@ -2,7 +2,7 @@ , acme , aiohttp , asynctest -, atomicwrites +, atomicwrites-homeassistant , attrs , buildPythonPackage , fetchFromGitHub @@ -15,13 +15,13 @@ buildPythonPackage rec { pname = "hass-nabucasa"; - version = "0.54.0"; + version = "0.54.1"; src = fetchFromGitHub { owner = "nabucasa"; repo = pname; rev = version; - sha256 = "sha256-UL7HPmii65p+WO22y0qv8zq3yICKarRORqE+FK1u7OE="; + sha256 = "sha256-usxyONJZQOfLWtfuGUOOHL/Js2ROo7nODqgw++LgTis="; }; postPatch = '' @@ -35,7 +35,7 @@ buildPythonPackage rec { propagatedBuildInputs = [ acme aiohttp - atomicwrites + atomicwrites-homeassistant attrs pycognito snitun diff --git a/pkgs/development/python-modules/holoviews/default.nix b/pkgs/development/python-modules/holoviews/default.nix index 57797ff8acd1..d0d2de64660d 100644 --- a/pkgs/development/python-modules/holoviews/default.nix +++ b/pkgs/development/python-modules/holoviews/default.nix @@ -17,14 +17,14 @@ buildPythonPackage rec { pname = "holoviews"; - version = "1.14.9"; + version = "1.15.0"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-mRI5CqJ58/vb5N81UYsS6Hy+zNeRXnIZEd7lVW22MGo="; + hash = "sha256-MS5g0kQGw6euxGJhg2s426JYXjZrzLReR0eVBIBetbo="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/ics/default.nix b/pkgs/development/python-modules/ics/default.nix index e9851d78cef1..c62b738b28bd 100644 --- a/pkgs/development/python-modules/ics/default.nix +++ b/pkgs/development/python-modules/ics/default.nix @@ -10,14 +10,14 @@ buildPythonPackage rec { pname = "ics"; - version = "0.7.1"; + version = "0.7.2"; disabled = pythonOlder "3.6"; src = fetchFromGitHub { owner = "ics-py"; repo = "ics-py"; rev = "refs/tags/v${version}"; - sha256 = "sha256-scT8TKZb88HYFN8Y1rGgoJLfSxD0jjbvZYpXsCXw9uo="; + sha256 = "sha256-hdtnET7YfSb85+TGwpwzoxOfxPT7VSj9eKSiV6AXUS8="; }; propagatedBuildInputs = [ @@ -55,6 +55,6 @@ buildPythonPackage rec { homepage = "http://icspy.readthedocs.org/en/stable/"; changelog = "https://github.com/ics-py/ics-py/releases/tag/v${version}"; license = licenses.asl20; - maintainers = with maintainers; [ primeos ]; + maintainers = with maintainers; [ ]; }; } diff --git a/pkgs/development/python-modules/moku/default.nix b/pkgs/development/python-modules/moku/default.nix index 3ed68ce8b47a..de17bca79916 100644 --- a/pkgs/development/python-modules/moku/default.nix +++ b/pkgs/development/python-modules/moku/default.nix @@ -8,7 +8,7 @@ buildPythonPackage rec { pname = "moku"; - version = "2.3"; + version = "2.4"; /* @@ -22,7 +22,7 @@ buildPythonPackage rec { */ src = fetchPypi { inherit pname version; - hash = "sha256-EzVcECjJyrr2NLQkG0Yp/jYBMnsEP1/FnS5O3UplszI="; + hash = "sha256-yFA2NkiRt6wjXJk6i7oxrjD597acAligWId3MDYwTd0="; }; /* diff --git a/pkgs/development/python-modules/mongomock/default.nix b/pkgs/development/python-modules/mongomock/default.nix index 85e574f0b6d5..e3dc90ef8082 100644 --- a/pkgs/development/python-modules/mongomock/default.nix +++ b/pkgs/development/python-modules/mongomock/default.nix @@ -1,19 +1,23 @@ { lib , buildPythonPackage , fetchPypi +, packaging , pbr -, sentinels -, six , pytestCheckHook +, pythonOlder +, sentinels }: buildPythonPackage rec { pname = "mongomock"; - version = "4.0.0"; + version = "4.1.2"; + format = "setuptools"; + + disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - sha256 = "sha256-sYMsN0jUdETBiGc3PlzqdUwub2RKDPv9Zn8Xj2i97Pw="; + hash = "sha256-8GzWKvuK4+9jujE0mr0iCmV+8N1PAkOilYfFIT+TG30="; }; nativeBuildInputs = [ @@ -21,15 +25,17 @@ buildPythonPackage rec { ]; propagatedBuildInputs = [ + packaging sentinels - six ]; checkInputs = [ pytestCheckHook ]; - pythonImportsCheck = [ "mongomock" ]; + pythonImportsCheck = [ + "mongomock" + ]; meta = with lib; { homepage = "https://github.com/mongomock/mongomock"; diff --git a/pkgs/development/python-modules/nomadnet/default.nix b/pkgs/development/python-modules/nomadnet/default.nix index 815ec9d77c87..33af46900375 100644 --- a/pkgs/development/python-modules/nomadnet/default.nix +++ b/pkgs/development/python-modules/nomadnet/default.nix @@ -9,7 +9,7 @@ buildPythonPackage rec { pname = "nomadnet"; - version = "0.2.0"; + version = "0.2.1"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -18,7 +18,7 @@ buildPythonPackage rec { owner = "markqvist"; repo = "NomadNet"; rev = version; - hash = "sha256-1Ur8iLzOIc1l5bFo8LDY2awHYJ97V9ih4aep6/wt4ns="; + hash = "sha256-VNfsuCN251C+6uvywosHmuz76f263wCeIisQldvFRVg="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/ormar/default.nix b/pkgs/development/python-modules/ormar/default.nix index 19f5ebf94c0e..cc028df3233f 100644 --- a/pkgs/development/python-modules/ormar/default.nix +++ b/pkgs/development/python-modules/ormar/default.nix @@ -70,8 +70,8 @@ buildPythonPackage rec { postPatch = '' substituteInPlace pyproject.toml \ - --replace 'SQLAlchemy = ">=1.3.18,<=1.4.31"' 'SQLAlchemy = ">=1.3.18"' \ - --replace 'databases = ">=0.3.2,!=0.5.0,!=0.5.1,!=0.5.2,!=0.5.3,<=0.5.5"' 'databases = ">=0.5.5"' + --replace 'SQLAlchemy = ">=1.3.18,<1.4.39"' 'SQLAlchemy = ">=1.3.18"' \ + --replace 'databases = ">=0.3.2,!=0.5.0,!=0.5.1,!=0.5.2,!=0.5.3,<0.6.1"' 'databases = ">=0.5.5"' ''; disabledTests = [ diff --git a/pkgs/development/python-modules/peaqevcore/default.nix b/pkgs/development/python-modules/peaqevcore/default.nix index dec654a4872c..13bd0826fede 100644 --- a/pkgs/development/python-modules/peaqevcore/default.nix +++ b/pkgs/development/python-modules/peaqevcore/default.nix @@ -6,14 +6,14 @@ buildPythonPackage rec { pname = "peaqevcore"; - version = "3.1.3"; + version = "3.1.6"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-+gD+IYw02WcWQqLrahJlUklxyfuP9AQwY0FeCYTtWkY="; + hash = "sha256-ZKW1RpBF1iKumr2dB/spj7VLrfHFcomZnslos/ecKxQ="; }; postPatch = '' diff --git a/pkgs/development/python-modules/peewee/default.nix b/pkgs/development/python-modules/peewee/default.nix index deb7fcde1795..65e1fdd0af5e 100644 --- a/pkgs/development/python-modules/peewee/default.nix +++ b/pkgs/development/python-modules/peewee/default.nix @@ -10,18 +10,21 @@ , mysql-connector , withPostgres ? false , psycopg2 +, pythonOlder }: buildPythonPackage rec { pname = "peewee"; - version = "3.14.10"; + version = "3.15.0"; format = "setuptools"; + disabled = pythonOlder "3.7"; + src = fetchFromGitHub { owner = "coleifer"; repo = pname; rev = version; - hash = "sha256-k3kKAImE1aVlmsSPXpaIkAVspAsAo5Hz6/n7u6+zTzA="; + hash = "sha256-nmqq1RJzHZKp6f0RAxuUAejy04vsupV0IH8dHXM/WVw="; }; buildInputs = [ diff --git a/pkgs/development/python-modules/pex/default.nix b/pkgs/development/python-modules/pex/default.nix index 6a7a9a7745cd..44e4dcf277b7 100644 --- a/pkgs/development/python-modules/pex/default.nix +++ b/pkgs/development/python-modules/pex/default.nix @@ -7,14 +7,14 @@ buildPythonPackage rec { pname = "pex"; - version = "2.1.94"; + version = "2.1.95"; format = "flit"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-TG73+WAcRjY0NC+n2Q3ASCfTG03dL5yz+QOmY93WmME="; + hash = "sha256-704uEFlVHUEr0tv5OFZ7LbjY2r3bzX9HaE9GAkE+JvY="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/pycec/default.nix b/pkgs/development/python-modules/pycec/default.nix index c65ea3a695ff..640cc6b36561 100644 --- a/pkgs/development/python-modules/pycec/default.nix +++ b/pkgs/development/python-modules/pycec/default.nix @@ -3,17 +3,21 @@ , fetchFromGitHub , libcec , pytestCheckHook +, pythonOlder }: buildPythonPackage rec { pname = "pycec"; - version = "0.5.1"; + version = "0.5.2"; + format = "setuptools"; + + disabled = pythonOlder "3.7"; src = fetchFromGitHub { owner = "konikvranik"; repo = pname; rev = "v${version}"; - sha256 = "1ivnmihajhfkwwghgl0f8n9ragpirbmbj1mhj9bmjjc29zzdc3m6"; + sha256 = "sha256-H18petSiUdftZN8Q3fPmfSJA3OZks+gI+FAq9LwkRsk="; }; propagatedBuildInputs = [ @@ -24,7 +28,9 @@ buildPythonPackage rec { pytestCheckHook ]; - pythonImportsCheck = [ "pycec" ]; + pythonImportsCheck = [ + "pycec" + ]; meta = with lib; { description = "Python modules to access HDMI CEC devices"; diff --git a/pkgs/development/python-modules/pydeconz/default.nix b/pkgs/development/python-modules/pydeconz/default.nix index a8e661e58d72..a61e45d2c48b 100644 --- a/pkgs/development/python-modules/pydeconz/default.nix +++ b/pkgs/development/python-modules/pydeconz/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { pname = "pydeconz"; - version = "96"; + version = "98"; format = "setuptools"; disabled = pythonOlder "3.9"; @@ -21,7 +21,7 @@ buildPythonPackage rec { owner = "Kane610"; repo = "deconz"; rev = "refs/tags/v${version}"; - hash = "sha256-6W8GPsIvFlbgXkkN5tJEXyGKsjLfdJzgP8VS07lYZn4="; + hash = "sha256-hCJRoyDWDxrBrxs2g6mVh7MOe6UMd+S8+ftfWyzWgH8="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/pyezviz/default.nix b/pkgs/development/python-modules/pyezviz/default.nix index 1d01f491676e..35f8eb4bfa44 100644 --- a/pkgs/development/python-modules/pyezviz/default.nix +++ b/pkgs/development/python-modules/pyezviz/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { pname = "pyezviz"; - version = "0.2.0.8"; + version = "0.2.0.9"; format = "setuptools"; disabled = pythonOlder "3.6"; @@ -20,7 +20,7 @@ buildPythonPackage rec { owner = "baqs"; repo = "pyEzviz"; rev = version; - sha256 = "sha256-W2JtqRyNVUo74esmCvCQygIMB1+v77OW/ll48IMVj/Y="; + sha256 = "sha256-HdtyERk2Af+O7/ei7S1+JO6zQxNXrSX95k9707SQuwE="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/pysigma/default.nix b/pkgs/development/python-modules/pysigma/default.nix index 26308cb18e8a..633c71d0675f 100644 --- a/pkgs/development/python-modules/pysigma/default.nix +++ b/pkgs/development/python-modules/pysigma/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { pname = "pysigma"; - version = "0.6.4"; + version = "0.6.5"; format = "pyproject"; disabled = pythonOlder "3.8"; @@ -20,7 +20,7 @@ buildPythonPackage rec { owner = "SigmaHQ"; repo = "pySigma"; rev = "refs/tags/v${version}"; - hash = "sha256-qOGde74wImDYxNzGlZJfRLBHyRg6U/cgxbWDKIg90/U="; + hash = "sha256-DZ5cnzvcYMiqu8WjIfxQV+1uJeSRGK+nupfWtryoF2E="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/pyxiaomigateway/default.nix b/pkgs/development/python-modules/pyxiaomigateway/default.nix index 1d3a83177edb..015d07be09b9 100644 --- a/pkgs/development/python-modules/pyxiaomigateway/default.nix +++ b/pkgs/development/python-modules/pyxiaomigateway/default.nix @@ -6,13 +6,13 @@ buildPythonPackage rec { pname = "pyxiaomigateway"; - version = "0.13.4"; + version = "0.14.1"; src = fetchFromGitHub { owner = "Danielhiversen"; repo = "PyXiaomiGateway"; rev = version; - sha256 = "1xg89sdds04wgil88ihs84cjr3df6lajjbkyb1aymj638ibdyqns"; + sha256 = "sha256-e/FqqUl90VFDJD6ZFbFqXKH3s2sBaDjSFEvaKJhDlGg="; }; propagatedBuildInputs = [ cryptography ]; diff --git a/pkgs/development/python-modules/qcelemental/default.nix b/pkgs/development/python-modules/qcelemental/default.nix index d40252c563b7..6032a98f7065 100644 --- a/pkgs/development/python-modules/qcelemental/default.nix +++ b/pkgs/development/python-modules/qcelemental/default.nix @@ -1,37 +1,47 @@ { stdenv -, buildPythonPackage, lib, fetchPypi +, buildPythonPackage +, lib +, fetchPypi , networkx , numpy , pint , pydantic , pytestCheckHook -} : +, pythonOlder +}: buildPythonPackage rec { pname = "qcelemental"; version = "0.25.0"; + format = "setuptools"; + + disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - sha256 = "sha256-v1yu6yBEtgVsheku/8YaIaXrsVgMzcFlWAuySPhYgyQ="; + hash = "sha256-v1yu6yBEtgVsheku/8YaIaXrsVgMzcFlWAuySPhYgyQ="; }; propagatedBuildInputs = [ - numpy - pydantic - pint networkx + numpy + pint + pydantic ]; - checkInputs = [ pytestCheckHook ]; + checkInputs = [ + pytestCheckHook + ]; - doCheck = true; + pythonImportsCheck = [ + "qcelemental" + ]; meta = with lib; { broken = stdenv.isDarwin; - description = "Periodic table, physical constants, and molecule parsing for quantum chemistry"; - homepage = "http://docs.qcarchive.molssi.org/projects/qcelemental/en/latest/"; + description = "Periodic table, physical constants and molecule parsing for quantum chemistry"; + homepage = "http://docs.qcarchive.molssi.org/projects/qcelemental/"; license = licenses.bsd3; - maintainers = [ maintainers.sheepforce ]; + maintainers = with maintainers; [ sheepforce ]; }; } diff --git a/pkgs/development/python-modules/qcengine/default.nix b/pkgs/development/python-modules/qcengine/default.nix index 795b8460b5db..2290bfbc3247 100644 --- a/pkgs/development/python-modules/qcengine/default.nix +++ b/pkgs/development/python-modules/qcengine/default.nix @@ -1,19 +1,26 @@ -{ buildPythonPackage -, lib +{ lib +, buildPythonPackage , fetchPypi , psutil , py-cpuinfo , pydantic +, pytestCheckHook +, pythonOlder , pyyaml , qcelemental -, pytestCheckHook }: buildPythonPackage rec { pname = "qcengine"; - version = "0.23.0"; + version = "0.24.0"; + format = "setuptools"; - checkInputs = [ pytestCheckHook ]; + disabled = pythonOlder "3.7"; + + src = fetchPypi { + inherit pname version; + hash = "sha256-T6/gC3HHCnI3O1Gkj/MdistL93bwymtEfNF6PmA7TN0="; + }; propagatedBuildInputs = [ psutil @@ -23,18 +30,18 @@ buildPythonPackage rec { qcelemental ]; - src = fetchPypi { - inherit pname version; - sha256 = "sha256-gDn0Nu6ALTr3KyZnYDSA6RE3S5JQj562FP2RI9U3Gxs="; - }; + checkInputs = [ + pytestCheckHook + ]; - doCheck = true; + pythonImportsCheck = [ + "qcengine" + ]; meta = with lib; { description = "Quantum chemistry program executor and IO standardizer (QCSchema) for quantum chemistry"; - homepage = "http://docs.qcarchive.molssi.org/projects/qcelemental/en/latest/"; + homepage = "http://docs.qcarchive.molssi.org/projects/qcelemental/"; license = licenses.bsd3; - platforms = [ "x86_64-linux" ]; - maintainers = [ maintainers.sheepforce ]; + maintainers = with maintainers; [ sheepforce ]; }; } diff --git a/pkgs/development/python-modules/regenmaschine/default.nix b/pkgs/development/python-modules/regenmaschine/default.nix index 0493459a7aa7..da13a28b67f8 100644 --- a/pkgs/development/python-modules/regenmaschine/default.nix +++ b/pkgs/development/python-modules/regenmaschine/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { pname = "regenmaschine"; - version = "2022.06.1"; + version = "2022.07.0"; format = "pyproject"; disabled = pythonOlder "3.8"; @@ -23,7 +23,7 @@ buildPythonPackage rec { owner = "bachya"; repo = pname; rev = "refs/tags/${version}"; - sha256 = "sha256-Q29e2f/6r0QFN5EPL8Gs1Z4CcvKXrZaYcEMgCJ9uuW8="; + sha256 = "sha256-zUef2AMC+vNINUi78xv3rSfBJ9peG7dlDVVmn+WFAsk="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/resampy/default.nix b/pkgs/development/python-modules/resampy/default.nix index 151d5ee97b61..90dd3e680e4b 100644 --- a/pkgs/development/python-modules/resampy/default.nix +++ b/pkgs/development/python-modules/resampy/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { pname = "resampy"; - version = "0.3.0"; + version = "0.3.1"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -20,7 +20,7 @@ buildPythonPackage rec { owner = "bmcfee"; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-OVj5dQafIoKeA04yTGBKTinldMjEccxrdiuRFIvRzcE="; + hash = "sha256-kqRWW50VQO8H02vHgbdHo578c2jXX4fgF8AY6JuQOSI="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/rns/default.nix b/pkgs/development/python-modules/rns/default.nix index c6e1d109fac8..df8222bf0bcc 100644 --- a/pkgs/development/python-modules/rns/default.nix +++ b/pkgs/development/python-modules/rns/default.nix @@ -9,7 +9,7 @@ buildPythonPackage rec { pname = "rns"; - version = "0.3.9"; + version = "0.3.11"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -18,7 +18,7 @@ buildPythonPackage rec { owner = "markqvist"; repo = "Reticulum"; rev = "refs/tags/${version}"; - hash = "sha256-dueVAX6/83OeOyVpBnXOYpS0U/4CQvZfq5ivj+HvG48="; + hash = "sha256-LANk104sO9we7n681a+yVmWOcd9SBQ/kiQAN38xaq80="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/rstcheck-core/default.nix b/pkgs/development/python-modules/rstcheck-core/default.nix new file mode 100644 index 000000000000..a867a9434820 --- /dev/null +++ b/pkgs/development/python-modules/rstcheck-core/default.nix @@ -0,0 +1,63 @@ +{ lib +, buildPythonPackage +, docutils +, fetchFromGitHub +, importlib-metadata +, mock +, poetry-core +, pydantic +, pytest-mock +, pytestCheckHook +, pythonOlder +, types-docutils +, typing-extensions +}: + +buildPythonPackage rec { + pname = "rstcheck-core"; + version = "1.0.2"; + format = "pyproject"; + + disabled = pythonOlder "3.7"; + + src = fetchFromGitHub { + owner = "rstcheck"; + repo = pname; + rev = "v${version}"; + hash = "sha256-XNr+prK9VDP66ZaFvh3Qrx+eJs6mnVO8lvoMC/qrCLs="; + }; + + nativeBuildInputs = [ + poetry-core + ]; + + propagatedBuildInputs = [ + docutils + importlib-metadata + pydantic + types-docutils + typing-extensions + ]; + + checkInputs = [ + mock + pytest-mock + pytestCheckHook + ]; + + postPatch = '' + substituteInPlace pyproject.toml \ + --replace 'types-docutils = ">=0.18, <0.19"' 'types-docutils = ">=0.18"' + ''; + + pythonImportsCheck = [ + "rstcheck_core" + ]; + + meta = with lib; { + description = "Library for checking syntax of reStructuredText"; + homepage = "https://github.com/rstcheck/rstcheck-core"; + license = licenses.mit; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/pkgs/development/python-modules/rstcheck/default.nix b/pkgs/development/python-modules/rstcheck/default.nix index 5bf519e99ec6..b5a3ccefc08c 100644 --- a/pkgs/development/python-modules/rstcheck/default.nix +++ b/pkgs/development/python-modules/rstcheck/default.nix @@ -1,26 +1,32 @@ { lib , buildPythonPackage +, colorama , docutils , fetchFromGitHub +, importlib-metadata , poetry-core +, pydantic , pytestCheckHook , pythonOlder +, rstcheck-core +, shellingham +, typer , types-docutils , typing-extensions }: buildPythonPackage rec { pname = "rstcheck"; - version = "5.0.0"; + version = "6.0.0.post1"; format = "pyproject"; disabled = pythonOlder "3.7"; src = fetchFromGitHub { - owner = "myint"; + owner = "rstcheck"; repo = pname; rev = "v${version}"; - hash = "sha256-vTUa/eP6/flxRLBuzdHoNoPoGAg6XWwu922az8tLgJM="; + hash = "sha256-Ljg1cciT9qKL9xtBxQ8OLygDpV/1yR5XiJOzHrLr6xw="; }; nativeBuildInputs = [ @@ -28,15 +34,28 @@ buildPythonPackage rec { ]; propagatedBuildInputs = [ + colorama docutils + rstcheck-core + shellingham types-docutils typing-extensions + pydantic + typer + ] ++ lib.optionals (pythonOlder "3.8") [ + typing-extensions + importlib-metadata ]; checkInputs = [ pytestCheckHook ]; + postPatch = '' + substituteInPlace pyproject.toml \ + --replace 'types-docutils = ">=0.18, <0.19"' 'types-docutils = ">=0.18"' + ''; + pythonImportsCheck = [ "rstcheck" ]; diff --git a/pkgs/development/python-modules/sagemaker/default.nix b/pkgs/development/python-modules/sagemaker/default.nix index aff2aca70915..34dd01607ca0 100644 --- a/pkgs/development/python-modules/sagemaker/default.nix +++ b/pkgs/development/python-modules/sagemaker/default.nix @@ -17,14 +17,14 @@ buildPythonPackage rec { pname = "sagemaker"; - version = "2.98.0"; + version = "2.99.0"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-mNCThiZvmKvbYQEMOPkr3MHOI/oFMGCLpWw5zJz16dQ="; + hash = "sha256-az3SmbDgA5bbyV6BPYVIWf2fgXLqNu67/6NoM/K7NL8="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/schwifty/default.nix b/pkgs/development/python-modules/schwifty/default.nix index 256a6069c368..a3e390a0d6ed 100644 --- a/pkgs/development/python-modules/schwifty/default.nix +++ b/pkgs/development/python-modules/schwifty/default.nix @@ -12,14 +12,14 @@ buildPythonPackage rec { pname = "schwifty"; - version = "2022.6.3"; + version = "2022.7.0"; format = "pyproject"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - sha256 = "sha256-IBkEfc6sKk9fDFZF/4Xfcl4GbMPro75e7DmrF94ARlU="; + sha256 = "sha256-pvuyK++Te/SACKj3k/1SlitRkFD6t4GrAghhqoIdUgE="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/skia-pathops/default.nix b/pkgs/development/python-modules/skia-pathops/default.nix index 82f13876ac0e..b537d5a9bf6f 100644 --- a/pkgs/development/python-modules/skia-pathops/default.nix +++ b/pkgs/development/python-modules/skia-pathops/default.nix @@ -46,5 +46,6 @@ buildPythonPackage rec { homepage = "https://skia.org/dev/present/pathops"; license = lib.licenses.bsd3; maintainers = [ lib.maintainers.BarinovMaxim ]; + broken = stdenv.isDarwin && stdenv.isAarch64; # clang-11: error: the clang compiler does not support '-march=armv7-a' }; } diff --git a/pkgs/development/python-modules/tldextract/default.nix b/pkgs/development/python-modules/tldextract/default.nix index fe32af267133..f92ea4b8dd8a 100644 --- a/pkgs/development/python-modules/tldextract/default.nix +++ b/pkgs/development/python-modules/tldextract/default.nix @@ -14,14 +14,14 @@ buildPythonPackage rec { pname = "tldextract"; - version = "3.3.0"; + version = "3.3.1"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-rc0kq/Ic40UEF81aAPI7fldVTOiugnM03RK/y7YnTPE="; + hash = "sha256-/hWsMgXlolthaJNp+Yy0XHd4qPKvET18EVWezlGV8tY="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/typecode/default.nix b/pkgs/development/python-modules/typecode/default.nix index a177b845b4b3..2fa0010bdd03 100644 --- a/pkgs/development/python-modules/typecode/default.nix +++ b/pkgs/development/python-modules/typecode/default.nix @@ -49,6 +49,7 @@ buildPythonPackage rec { "TestFileTypesDataDriven" # AssertionError: assert 'application/x-bytecode.python'... "test_compiled_python_1" + "test_package_json" ]; pythonImportsCheck = [ diff --git a/pkgs/development/python-modules/types-docutils/default.nix b/pkgs/development/python-modules/types-docutils/default.nix index ed7e9126a842..14b3e6ed5d25 100644 --- a/pkgs/development/python-modules/types-docutils/default.nix +++ b/pkgs/development/python-modules/types-docutils/default.nix @@ -5,12 +5,12 @@ buildPythonPackage rec { pname = "types-docutils"; - version = "0.18.3"; + version = "0.19.0"; format = "setuptools"; src = fetchPypi { inherit pname version; - hash = "sha256-oO+DHcIGNfNQ+pz/WRIxwx0n51dx5Z/WyXm2wMfgMpI="; + hash = "sha256-lJNrGWGqzaYexrsKzxFpzXgwtSMLZFhVwdR4m68ZaF4="; }; # Module doesn't have tests diff --git a/pkgs/development/python-modules/types-setuptools/default.nix b/pkgs/development/python-modules/types-setuptools/default.nix index 28c29d0c5de8..19708ad5733d 100644 --- a/pkgs/development/python-modules/types-setuptools/default.nix +++ b/pkgs/development/python-modules/types-setuptools/default.nix @@ -5,12 +5,12 @@ buildPythonPackage rec { pname = "types-setuptools"; - version = "57.4.18"; + version = "62.6.0"; format = "setuptools"; src = fetchPypi { inherit pname version; - sha256 = "sha256-juA9gj/n/aC9Nfrq4z01y1wltJcmPmpYs0xM/QX0C88="; + sha256 = "sha256-x3oytRZ7ng2Zwfezm39aPsABxxCZMd1jxRZS+eRmPQc="; }; # Module doesn't have tests diff --git a/pkgs/development/python-modules/vertica-python/default.nix b/pkgs/development/python-modules/vertica-python/default.nix index 5836069d9992..3b994b7e50d0 100644 --- a/pkgs/development/python-modules/vertica-python/default.nix +++ b/pkgs/development/python-modules/vertica-python/default.nix @@ -12,14 +12,14 @@ buildPythonPackage rec { pname = "vertica-python"; - version = "1.1.0"; + version = "1.1.1"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-XccIN5lmrRTNAmK52XeMBZzuNOxSvXFK7COLh5lacDY="; + hash = "sha256-3t9W12tnZztNV6E/f5br3FeznqZQuT6/DAXrbR0sDAU="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/tools/build-managers/bazel/bazel-remote/default.nix b/pkgs/development/tools/build-managers/bazel/bazel-remote/default.nix index f519ce5233ef..cd5e90af73f3 100644 --- a/pkgs/development/tools/build-managers/bazel/bazel-remote/default.nix +++ b/pkgs/development/tools/build-managers/bazel/bazel-remote/default.nix @@ -5,13 +5,13 @@ buildGoModule rec { pname = "bazel-remote"; - version = "2.3.7"; + version = "2.3.8"; src = fetchFromGitHub { owner = "buchgr"; repo = pname; rev = "v${version}"; - sha256 = "sha256-5VxPCfartTRYCmjwNrH7SM0o7IQ4+Tq8Q2IM8hFWyVc="; + sha256 = "sha256-iMVBkmZmjk4w5WN1sPBJQWC5Ktbl3Y6g62IpyGuM0Xg="; }; vendorSha256 = "sha256-wXgW7HigMIeUZAcZpm5TH9thfCHmpz+M42toWHgwIYo="; diff --git a/pkgs/development/tools/cloud-nuke/default.nix b/pkgs/development/tools/cloud-nuke/default.nix index 3354b6f69371..666ddd647f36 100644 --- a/pkgs/development/tools/cloud-nuke/default.nix +++ b/pkgs/development/tools/cloud-nuke/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "cloud-nuke"; - version = "0.11.8"; + version = "0.12.2"; src = fetchFromGitHub { owner = "gruntwork-io"; repo = pname; rev = "v${version}"; - sha256 = "sha256-0GP7T/OspaJVATd0dYNVniDh0XAiL09dopNnOQrLpCs="; + sha256 = "sha256-ZBhuRv5IF2VmbvGtXLzVnY3eSso+TSCS05UvCbjtSZ0="; }; - vendorSha256 = "sha256-4BUKUDr0bcd4AcMGIDC7HIhDI7pdTu2efkLqRD7Piw0="; + vendorSha256 = "sha256-N4oyyWY/ANuRFxnfBBAGwacofaYR5/ZH867W/2sm+Gk="; ldflags = [ "-s" "-w" "-X main.VERSION=${version}" ]; diff --git a/pkgs/development/tools/datree/default.nix b/pkgs/development/tools/datree/default.nix index e94917f15d7c..84b53a08c67d 100644 --- a/pkgs/development/tools/datree/default.nix +++ b/pkgs/development/tools/datree/default.nix @@ -1,30 +1,47 @@ -{ lib, buildGoModule, fetchFromGitHub }: +{ lib, buildGoModule, fetchFromGitHub, installShellFiles }: buildGoModule rec { pname = "datree"; - version = "0.15.22"; + version = "1.5.25"; src = fetchFromGitHub { owner = "datreeio"; repo = "datree"; rev = version; - hash = "sha256-g5u2QQtVmNp01KtUKwC8uoEIuoBDLHsOlRz1Mv0n/y8="; + hash = "sha256-OB5o/ouA6a2/OUnhibTKYCskCFmJIuDcXLrNTNWtNEQ="; }; - vendorSha256 = "1cvlvlwdk41f145kzifg7rv7ymwhc9k0ck91bn106240rq1igcr0"; + vendorSha256 = "sha256-6Ve7Ui90KHsFwRs6/uyjqHgRY6U7zFWijSFcVuOXdEM="; ldflags = [ + "-extldflags '-static'" "-s" "-w" "-X github.com/datreeio/datree/cmd.CliVersion=${version}" ]; + nativeBuildInputs = [ installShellFiles ]; + + doInstallCheck = true; + installCheckPhase = '' + $out/bin/datree version | grep ${version} > /dev/null + ''; + + postInstall = '' + for shell in bash fish zsh; do + $out/bin/datree completion $shell > datree.$shell + installShellCompletion datree.$shell + done + ''; + doCheck = true; meta = with lib; { - description = "CLI tool to ensure K8s manifests and Helm charts follow best practices as well as your organization’s policies"; + description = + "CLI tool to ensure K8s manifests and Helm charts follow best practices as well as your organization’s policies"; homepage = "https://datree.io/"; license = [ licenses.asl20 ]; maintainers = [ maintainers.jceb ]; + mainProgram = "datree"; }; } diff --git a/pkgs/development/tools/fundoc/default.nix b/pkgs/development/tools/fundoc/default.nix index 47484b78759c..f7a81a27701f 100644 --- a/pkgs/development/tools/fundoc/default.nix +++ b/pkgs/development/tools/fundoc/default.nix @@ -2,16 +2,16 @@ rustPlatform.buildRustPackage rec { pname = "fundoc"; - version = "0.4.1"; + version = "0.4.2"; src = fetchFromGitHub { owner = "csssr"; repo = pname; rev = "v${version}"; - sha256 = "0nd03c2lz07ghaab67kgl5pw8z8mv6kwx3xzr4pqr7v5b983py6v"; + sha256 = "sha256-qmsr4bhErpMzS71NhLep0EWimZb/S3aEhMbeBNa5y8E="; }; - cargoSha256 = "sha256-6riBlCyqNN2nzgwfVfbRy1avT9b0PdetOrbmbaltsjE="; + cargoSha256 = "sha256-G2KRjkccS/rfrb7BtotbG6L4WaVnfwY1UEXLnVBLSzM="; meta = with lib; { description = "Language agnostic documentation generator"; diff --git a/pkgs/development/tools/misc/gf/build-use-optional-freetype-with-pkg-config.patch b/pkgs/development/tools/misc/gf/build-use-optional-freetype-with-pkg-config.patch new file mode 100644 index 000000000000..7e748dca244e --- /dev/null +++ b/pkgs/development/tools/misc/gf/build-use-optional-freetype-with-pkg-config.patch @@ -0,0 +1,13 @@ +diff --git a/build.sh b/build.sh +index e471563..32bdfab 100755 +--- a/build.sh ++++ b/build.sh +@@ -5,7 +5,7 @@ gdb --version > /dev/null 2>&1 || printf "\033[0;31mWarning\033[0m: GDB not dete + echo q | gdb | grep "(gdb)" > /dev/null 2>&1 || printf "\033[0;31mWarning\033[0m: Your copy of GDB appears to be non-standard or has been heavily reconfigured with .gdbinit.\nIf you are using GDB plugins like 'GDB Dashboard' you must remove them,\nas otherwise gf will be unable to communicate with GDB.\n" + + # Check if FreeType is available. +-if [ -d /usr/include/freetype2 ]; then extra_flags="$extra_flags -lfreetype -D UI_FREETYPE -I /usr/include/freetype2"; ++if pkg-config --cflags freetype2 > /dev/null; then extra_flags="$extra_flags -D UI_FREETYPE $(pkg-config --cflags --libs freetype2)"; + else printf "\033[0;31mWarning\033[0m: FreeType could not be found. The fallback font will be used.\n"; fi + + # Check if SSE2 is available. diff --git a/pkgs/development/tools/misc/gf/default.nix b/pkgs/development/tools/misc/gf/default.nix new file mode 100644 index 000000000000..f460b844ada0 --- /dev/null +++ b/pkgs/development/tools/misc/gf/default.nix @@ -0,0 +1,64 @@ +{ lib +, stdenv +, makeWrapper +, fetchFromGitHub +, libX11 +, pkg-config +, gdb +, freetype +, freetypeSupport ? true +, extensions ? [ ] +}: + +stdenv.mkDerivation rec { + pname = "gf"; + version = "unstable-2022-06-22"; + + src = fetchFromGitHub { + repo = "gf"; + owner = "nakst"; + rev = "e0d6d2f59344f853a4a204d5313db6b6a5e5de7d"; + sha256 = "01fln4wnn1caqr4wa1nhcp0rqdx5m5nqyn2amvclp5hhi3h3qaiq"; + }; + + nativeBuildInputs = [ makeWrapper pkg-config ]; + buildInputs = [ libX11 gdb ] + ++ lib.optional freetypeSupport freetype; + + patches = [ + ./build-use-optional-freetype-with-pkg-config.patch + ]; + + postPatch = lib.forEach extensions (ext: '' + cp ${ext} ./${ext.name or (builtins.baseNameOf ext)} + ''); + + preConfigure = '' + patchShebangs build.sh + ''; + + buildPhase = '' + runHook preBuild + extra_flags=-DUI_FREETYPE_SUBPIXEL ./build.sh + runHook postBuild + ''; + + installPhase = '' + runHook preInstall + mkdir -p "$out/bin" + cp gf2 "$out/bin/" + runHook postInstall + ''; + + postFixup = '' + wrapProgram $out/bin/gf2 --prefix PATH : ${lib.makeBinPath[ gdb ]} + ''; + + meta = with lib; { + description = "A GDB Frontend"; + homepage = "https://github.com/nakst/gf"; + license = licenses.mit; + platforms = platforms.linux; + maintainers = with maintainers; [ _0xd61 ]; + }; +} diff --git a/pkgs/development/tools/pip-audit/default.nix b/pkgs/development/tools/pip-audit/default.nix index 13fcc054dd6a..9b8ebf07197c 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.4.0"; + version = "2.4.1"; format = "pyproject"; src = fetchFromGitHub { owner = "trailofbits"; repo = pname; rev = "v${version}"; - hash = "sha256-l1oefdveAmmkRKnEOvdVp4efYd/nFkyDyVP5dxAG1CI="; + hash = "sha256-Uko8ZtVMu9a/WrgSREFY3c8O+psE6cWpyHKVrOTJOJE="; }; nativeBuildInputs = [ diff --git a/pkgs/development/tools/poetry2nix/poetry2nix/default.nix b/pkgs/development/tools/poetry2nix/poetry2nix/default.nix index 073bd6e7fab2..0575e38135d5 100644 --- a/pkgs/development/tools/poetry2nix/poetry2nix/default.nix +++ b/pkgs/development/tools/poetry2nix/poetry2nix/default.nix @@ -5,7 +5,7 @@ }: let # Poetry2nix version - version = "1.30.0"; + version = "1.31.0"; inherit (poetryLib) isCompatible readTOML moduleName; diff --git a/pkgs/development/tools/poetry2nix/poetry2nix/mk-poetry-dep.nix b/pkgs/development/tools/poetry2nix/poetry2nix/mk-poetry-dep.nix index a5c19f873616..63f8403de115 100644 --- a/pkgs/development/tools/poetry2nix/poetry2nix/mk-poetry-dep.nix +++ b/pkgs/development/tools/poetry2nix/poetry2nix/mk-poetry-dep.nix @@ -98,6 +98,7 @@ pythonPackages.callPackage "packaging" "six" "pyparsing" + "typing-extensions" ]; baseBuildInputs = lib.optional (! lib.elem name skipSetupToolsSCM) pythonPackages.setuptools-scm; format = if isDirectory || isGit || isUrl then "pyproject" else fileInfo.format; diff --git a/pkgs/development/tools/poetry2nix/poetry2nix/overrides/build-systems.json b/pkgs/development/tools/poetry2nix/poetry2nix/overrides/build-systems.json index df66d2be5664..73550b488fe6 100644 --- a/pkgs/development/tools/poetry2nix/poetry2nix/overrides/build-systems.json +++ b/pkgs/development/tools/poetry2nix/poetry2nix/overrides/build-systems.json @@ -174,6 +174,9 @@ "boltztrap2": [ "cython" ], + "bracex": [ + "hatchling" + ], "bsblan": [ "poetry-core" ], @@ -564,6 +567,9 @@ "ipwhl": [ "flitBuildHook" ], + "ipykernel": [ + "hatchling" + ], "iso8601": [ "poetry-core" ], @@ -591,6 +597,13 @@ "json-schema-for-humans": [ "poetry-core" ], + "jsonschema": [ + { "buildSystem": "hatchling", "from": "4.6.0" }, + { "buildSystem": "hatch-vcs", "from": "4.6.0" } + ], + "jupyter-client": [ + "hatchling" + ], "jupyter-server": [ "jupyter-packaging" ], @@ -642,6 +655,9 @@ "linecache2": [ "pbr" ], + "linz-logger": [ + "poetry-core" + ], "llfuse": [ "cython" ], @@ -1421,6 +1437,9 @@ "rtmixer": [ "cython" ], + "sane-python": [ + "poetry-core" + ], "sanic": [ "poetry-core" ], @@ -1613,6 +1632,9 @@ "terminaltables": [ "poetry" ], + "terminado": [ + "hatchling" + ], "tern": [ "pbr" ], @@ -1690,7 +1712,8 @@ "pbr" ], "traitlets": [ - "flit-core" + { "buildSystem": "flit-core", "until": "5.2.1" }, + { "buildSystem": "hatchling", "from": "5.2.1" } ], "transmission-rpc": [ "poetry-core" @@ -1740,6 +1763,9 @@ "wakeonlan": [ "poetry-core" ], + "wcmatch": [ + "hatchling" + ], "weasyprint": [ "flit-core" ], diff --git a/pkgs/development/tools/poetry2nix/poetry2nix/overrides/default.nix b/pkgs/development/tools/poetry2nix/poetry2nix/overrides/default.nix index 47efe53d4ee3..7efb61e98a9f 100644 --- a/pkgs/development/tools/poetry2nix/poetry2nix/overrides/default.nix +++ b/pkgs/development/tools/poetry2nix/poetry2nix/overrides/default.nix @@ -11,7 +11,28 @@ let , extraAttrs ? [ ] }: let - buildSystem = if attr == "cython" then self.python.pythonForBuild.pkgs.cython else self.${attr}; + buildSystem = + if builtins.isAttrs attr then + let + fromIsValid = + if builtins.hasAttr "from" attr then + lib.versionAtLeast drv.version attr.from + else + true; + untilIsValid = + if builtins.hasAttr "until" attr then + lib.versionOlder drv.version attr.until + else + true; + intendedBuildSystem = + if attr.buildSystem == "cython" then + self.python.pythonForBuild.cython + else + self.${attr.buildSystem}; + in + if fromIsValid && untilIsValid then intendedBuildSystem else null + else + if attr == "cython" then self.python.pythonForBuild.pkgs.cython else self.${attr}; in ( # Flit only works on Python3 @@ -24,7 +45,10 @@ let { } else { - nativeBuildInputs = (old.nativeBuildInputs or [ ]) ++ [ self.${attr} ] ++ map (a: self.${a}) extraAttrs; + nativeBuildInputs = + (old.nativeBuildInputs or [ ]) + ++ lib.optionals (!(builtins.isNull buildSystem)) [ buildSystem ] + ++ map (a: self.${a}) extraAttrs; } ) ); @@ -301,7 +325,10 @@ lib.composeManyExtensions [ "36.0.1" = "sha256-kozYXkqt1Wpqyo9GYCwN08J+zV92ZWFJY/f+rulxmeQ="; "36.0.2" = "1a0ni1a3dbv2dvh6gx2i54z8v5j9m6asqg97kkv7gqb1ivihsbp8"; "37.0.2" = "sha256-qvrxvneoBXjP96AnUPyrtfmCnZo+IriHR5HbtWQ5Gk8="; - }.${version} or null; + "37.0.4" = "sha256-f8r6QclTwkgK20CNe9i65ZOqvSUeDc4Emv6BFBhh1hI"; + }.${version} or ( + lib.warn "Unknown cryptography version: '${version}'. Please update getCargoHash." lib.fakeHash + ); sha256 = getCargoHash super.cryptography.version; scrypto = if lib.versionAtLeast super.cryptography.version "35" && sha256 == null then @@ -504,6 +531,12 @@ lib.composeManyExtensions [ ''; }); + evdev = super.evdev.overridePythonAttrs (old: { + preConfigure = '' + substituteInPlace setup.py --replace /usr/include/linux ${pkgs.linuxHeaders}/include/linux + ''; + }); + faker = super.faker.overridePythonAttrs ( old: { buildInputs = (old.buildInputs or [ ]) ++ [ self.pytest-runner ]; @@ -853,6 +886,16 @@ lib.composeManyExtensions [ propagatedBuildInputs = [ pkgs.libvirt ]; }); + lightgbm = super.lightgbm.overridePythonAttrs ( + old: { + nativeBuildInputs = [ pkgs.cmake ] ++ old.nativeBuildInputs; + dontUseCmakeConfigure = true; + postConfigure = '' + export HOME=$(mktemp -d) + ''; + } + ); + llvmlite = super.llvmlite.overridePythonAttrs ( old: let @@ -1112,8 +1155,8 @@ lib.composeManyExtensions [ }) ] ++ lib.optionals (lib.strings.versionAtLeast old.version "0.960") [ (pkgs.fetchpatch { - url = "https://github.com/python/mypy/compare/a6166b2f..5b3c9888.patch"; - sha256 = "sha256-3QY99ctkIv9PoNfcTKF9TZFBwAIVOqPLKBVP6rDQ9FU="; + url = "https://github.com/python/mypy/commit/2004ae023b9d3628d9f09886cbbc20868aee8554.patch"; + sha256 = "sha256-y+tXvgyiECO5+66YLvaje8Bz5iPvfWNIBJcsnZ2nOdI="; }) ]; } @@ -1217,6 +1260,7 @@ lib.composeManyExtensions [ getCargoHash = version: { "3.6.7" = "sha256-sz2k9podPB6QSptkyOu7+BoVTrKhefizRtYU+MICPt4="; "3.6.8" = "sha256-vpfceVtYkU09xszNIihY1xbqGWieqDquxwsAmDH8jd4="; + "3.7.2" = "sha256-2U37IhftNYjH7sV7Nh51YpR/WjmPmmzX/aGuHsFgwf4="; }.${version} or null; in super.orjson.overridePythonAttrs (old: { @@ -1555,6 +1599,14 @@ lib.composeManyExtensions [ } ); + pynput = super.pynput.overridePythonAttrs (old: { + nativeBuildInputs = (old.nativeBuildInputs or [ ]) + ++ [ self.sphinx ]; + + propagatedBuildInputs = (old.propagatedBuildInputs or [ ]) + ++ [ self.setuptools-lint ]; + }); + pymssql = super.pymssql.overridePythonAttrs (old: { buildInputs = (old.buildInputs or [ ]) ++ [ pkgs.openssl ]; @@ -1898,7 +1950,8 @@ lib.composeManyExtensions [ # Local setuptools versions like "x.y.post0" confuse an internal check postPatch = '' substituteInPlace setup.py \ - --replace 'setuptools_version.' '"${self.setuptools.version}".' + --replace 'setuptools_version.' '"${self.setuptools.version}".' \ + --replace 'pytest-runner==' 'pytest-runner>=' ''; }); @@ -2369,6 +2422,16 @@ lib.composeManyExtensions [ buildInputs = (old.buildInputs or [ ]) ++ [ self.Babel ]; }); + nbconvert = super.nbconvert.overridePythonAttrs (_: { + postPatch = lib.optionalString (lib.versionAtLeast self.nbconvert.version "6.5.0") '' + substituteInPlace \ + ./nbconvert/exporters/templateexporter.py \ + --replace \ + 'root_dirs.extend(jupyter_path())' \ + 'root_dirs.extend(jupyter_path() + [os.path.join("@out@", "share", "jupyter")])' \ + --subst-var out + ''; + }); } ) diff --git a/pkgs/development/tools/poetry2nix/poetry2nix/pkgs/poetry/poetry.lock b/pkgs/development/tools/poetry2nix/poetry2nix/pkgs/poetry/poetry.lock index 528b840cfd8c..5d1e6d671dfb 100644 --- a/pkgs/development/tools/poetry2nix/poetry2nix/pkgs/poetry/poetry.lock +++ b/pkgs/development/tools/poetry2nix/poetry2nix/pkgs/poetry/poetry.lock @@ -77,7 +77,7 @@ python-versions = "*" [[package]] name = "cffi" -version = "1.15.0" +version = "1.15.1" description = "Foreign Function Interface for Python calling C code." category = "main" optional = false @@ -129,7 +129,7 @@ typing-extensions = {version = ">=3.6,<4.0", markers = "python_version >= \"3.5\ [[package]] name = "colorama" -version = "0.4.4" +version = "0.4.5" description = "Cross-platform colored terminal text." category = "dev" optional = false @@ -175,7 +175,7 @@ test = ["pytest (>=3.6.0,!=3.9.0,!=3.9.1,!=3.9.2)", "pretend", "iso8601", "pytz" [[package]] name = "cryptography" -version = "37.0.2" +version = "37.0.4" description = "cryptography is a package which provides cryptographic recipes and primitives to Python developers." category = "main" optional = false @@ -727,7 +727,7 @@ python-versions = ">=2.7, !=3.0.*, !=3.1.*, !=3.2.*, !=3.3.*, !=3.4.*" [[package]] name = "tox" -version = "3.25.0" +version = "3.25.1" description = "tox is a generic virtualenv management and test command line tool" category = "dev" optional = false @@ -771,7 +771,7 @@ socks = ["PySocks (>=1.5.6,!=1.5.7,<2.0)"] [[package]] name = "virtualenv" -version = "20.14.1" +version = "20.15.1" description = "Virtual Python Environment builder" category = "main" optional = false @@ -846,56 +846,70 @@ certifi = [ {file = "certifi-2021.10.8.tar.gz", hash = "sha256:78884e7c1d4b00ce3cea67b44566851c4343c120abd683433ce934a68ea58872"}, ] cffi = [ - {file = "cffi-1.15.0-cp27-cp27m-macosx_10_9_x86_64.whl", hash = "sha256:c2502a1a03b6312837279c8c1bd3ebedf6c12c4228ddbad40912d671ccc8a962"}, - {file = "cffi-1.15.0-cp27-cp27m-manylinux1_i686.whl", hash = "sha256:23cfe892bd5dd8941608f93348c0737e369e51c100d03718f108bf1add7bd6d0"}, - {file = "cffi-1.15.0-cp27-cp27m-manylinux1_x86_64.whl", hash = "sha256:41d45de54cd277a7878919867c0f08b0cf817605e4eb94093e7516505d3c8d14"}, - {file = "cffi-1.15.0-cp27-cp27m-win32.whl", hash = "sha256:4a306fa632e8f0928956a41fa8e1d6243c71e7eb59ffbd165fc0b41e316b2474"}, - {file = "cffi-1.15.0-cp27-cp27m-win_amd64.whl", hash = "sha256:e7022a66d9b55e93e1a845d8c9eba2a1bebd4966cd8bfc25d9cd07d515b33fa6"}, - {file = "cffi-1.15.0-cp27-cp27mu-manylinux1_i686.whl", hash = "sha256:14cd121ea63ecdae71efa69c15c5543a4b5fbcd0bbe2aad864baca0063cecf27"}, - {file = "cffi-1.15.0-cp27-cp27mu-manylinux1_x86_64.whl", hash = "sha256:d4d692a89c5cf08a8557fdeb329b82e7bf609aadfaed6c0d79f5a449a3c7c023"}, - {file = "cffi-1.15.0-cp310-cp310-macosx_10_9_x86_64.whl", hash = "sha256:0104fb5ae2391d46a4cb082abdd5c69ea4eab79d8d44eaaf79f1b1fd806ee4c2"}, - {file = "cffi-1.15.0-cp310-cp310-macosx_11_0_arm64.whl", hash = "sha256:91ec59c33514b7c7559a6acda53bbfe1b283949c34fe7440bcf917f96ac0723e"}, - {file = "cffi-1.15.0-cp310-cp310-manylinux_2_12_i686.manylinux2010_i686.whl", hash = "sha256:f5c7150ad32ba43a07c4479f40241756145a1f03b43480e058cfd862bf5041c7"}, - {file = "cffi-1.15.0-cp310-cp310-manylinux_2_12_x86_64.manylinux2010_x86_64.whl", hash = "sha256:00c878c90cb53ccfaae6b8bc18ad05d2036553e6d9d1d9dbcf323bbe83854ca3"}, - {file = "cffi-1.15.0-cp310-cp310-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:abb9a20a72ac4e0fdb50dae135ba5e77880518e742077ced47eb1499e29a443c"}, - {file = "cffi-1.15.0-cp310-cp310-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:a5263e363c27b653a90078143adb3d076c1a748ec9ecc78ea2fb916f9b861962"}, - {file = "cffi-1.15.0-cp310-cp310-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:f54a64f8b0c8ff0b64d18aa76675262e1700f3995182267998c31ae974fbc382"}, - {file = "cffi-1.15.0-cp310-cp310-win32.whl", hash = "sha256:c21c9e3896c23007803a875460fb786118f0cdd4434359577ea25eb556e34c55"}, - {file = "cffi-1.15.0-cp310-cp310-win_amd64.whl", hash = "sha256:5e069f72d497312b24fcc02073d70cb989045d1c91cbd53979366077959933e0"}, - {file = "cffi-1.15.0-cp36-cp36m-macosx_10_9_x86_64.whl", hash = "sha256:64d4ec9f448dfe041705426000cc13e34e6e5bb13736e9fd62e34a0b0c41566e"}, - {file = "cffi-1.15.0-cp36-cp36m-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:2756c88cbb94231c7a147402476be2c4df2f6078099a6f4a480d239a8817ae39"}, - {file = "cffi-1.15.0-cp36-cp36m-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:3b96a311ac60a3f6be21d2572e46ce67f09abcf4d09344c49274eb9e0bf345fc"}, - {file = "cffi-1.15.0-cp36-cp36m-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:75e4024375654472cc27e91cbe9eaa08567f7fbdf822638be2814ce059f58032"}, - {file = "cffi-1.15.0-cp36-cp36m-manylinux_2_5_i686.manylinux1_i686.whl", hash = "sha256:59888172256cac5629e60e72e86598027aca6bf01fa2465bdb676d37636573e8"}, - {file = "cffi-1.15.0-cp36-cp36m-manylinux_2_5_x86_64.manylinux1_x86_64.whl", hash = "sha256:27c219baf94952ae9d50ec19651a687b826792055353d07648a5695413e0c605"}, - {file = "cffi-1.15.0-cp36-cp36m-win32.whl", hash = "sha256:4958391dbd6249d7ad855b9ca88fae690783a6be9e86df65865058ed81fc860e"}, - {file = "cffi-1.15.0-cp36-cp36m-win_amd64.whl", hash = "sha256:f6f824dc3bce0edab5f427efcfb1d63ee75b6fcb7282900ccaf925be84efb0fc"}, - {file = "cffi-1.15.0-cp37-cp37m-macosx_10_9_x86_64.whl", hash = "sha256:06c48159c1abed75c2e721b1715c379fa3200c7784271b3c46df01383b593636"}, - {file = "cffi-1.15.0-cp37-cp37m-manylinux_2_12_i686.manylinux2010_i686.whl", hash = "sha256:c2051981a968d7de9dd2d7b87bcb9c939c74a34626a6e2f8181455dd49ed69e4"}, - {file = "cffi-1.15.0-cp37-cp37m-manylinux_2_12_x86_64.manylinux2010_x86_64.whl", hash = "sha256:fd8a250edc26254fe5b33be00402e6d287f562b6a5b2152dec302fa15bb3e997"}, - {file = "cffi-1.15.0-cp37-cp37m-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:91d77d2a782be4274da750752bb1650a97bfd8f291022b379bb8e01c66b4e96b"}, - {file = "cffi-1.15.0-cp37-cp37m-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:45db3a33139e9c8f7c09234b5784a5e33d31fd6907800b316decad50af323ff2"}, - {file = "cffi-1.15.0-cp37-cp37m-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:263cc3d821c4ab2213cbe8cd8b355a7f72a8324577dc865ef98487c1aeee2bc7"}, - {file = "cffi-1.15.0-cp37-cp37m-win32.whl", hash = "sha256:17771976e82e9f94976180f76468546834d22a7cc404b17c22df2a2c81db0c66"}, - {file = "cffi-1.15.0-cp37-cp37m-win_amd64.whl", hash = "sha256:3415c89f9204ee60cd09b235810be700e993e343a408693e80ce7f6a40108029"}, - {file = "cffi-1.15.0-cp38-cp38-macosx_10_9_x86_64.whl", hash = "sha256:4238e6dab5d6a8ba812de994bbb0a79bddbdf80994e4ce802b6f6f3142fcc880"}, - {file = "cffi-1.15.0-cp38-cp38-manylinux_2_12_i686.manylinux2010_i686.whl", hash = "sha256:0808014eb713677ec1292301ea4c81ad277b6cdf2fdd90fd540af98c0b101d20"}, - {file = "cffi-1.15.0-cp38-cp38-manylinux_2_12_x86_64.manylinux2010_x86_64.whl", hash = "sha256:57e9ac9ccc3101fac9d6014fba037473e4358ef4e89f8e181f8951a2c0162024"}, - {file = "cffi-1.15.0-cp38-cp38-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:8b6c2ea03845c9f501ed1313e78de148cd3f6cad741a75d43a29b43da27f2e1e"}, - {file = "cffi-1.15.0-cp38-cp38-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:10dffb601ccfb65262a27233ac273d552ddc4d8ae1bf93b21c94b8511bffe728"}, - {file = "cffi-1.15.0-cp38-cp38-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:786902fb9ba7433aae840e0ed609f45c7bcd4e225ebb9c753aa39725bb3e6ad6"}, - {file = "cffi-1.15.0-cp38-cp38-win32.whl", hash = "sha256:da5db4e883f1ce37f55c667e5c0de439df76ac4cb55964655906306918e7363c"}, - {file = "cffi-1.15.0-cp38-cp38-win_amd64.whl", hash = "sha256:181dee03b1170ff1969489acf1c26533710231c58f95534e3edac87fff06c443"}, - {file = "cffi-1.15.0-cp39-cp39-macosx_10_9_x86_64.whl", hash = "sha256:45e8636704eacc432a206ac7345a5d3d2c62d95a507ec70d62f23cd91770482a"}, - {file = "cffi-1.15.0-cp39-cp39-macosx_11_0_arm64.whl", hash = "sha256:31fb708d9d7c3f49a60f04cf5b119aeefe5644daba1cd2a0fe389b674fd1de37"}, - {file = "cffi-1.15.0-cp39-cp39-manylinux_2_12_i686.manylinux2010_i686.whl", hash = "sha256:6dc2737a3674b3e344847c8686cf29e500584ccad76204efea14f451d4cc669a"}, - {file = "cffi-1.15.0-cp39-cp39-manylinux_2_12_x86_64.manylinux2010_x86_64.whl", hash = "sha256:74fdfdbfdc48d3f47148976f49fab3251e550a8720bebc99bf1483f5bfb5db3e"}, - {file = "cffi-1.15.0-cp39-cp39-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:ffaa5c925128e29efbde7301d8ecaf35c8c60ffbcd6a1ffd3a552177c8e5e796"}, - {file = "cffi-1.15.0-cp39-cp39-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:3f7d084648d77af029acb79a0ff49a0ad7e9d09057a9bf46596dac9514dc07df"}, - {file = "cffi-1.15.0-cp39-cp39-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:ef1f279350da2c586a69d32fc8733092fd32cc8ac95139a00377841f59a3f8d8"}, - {file = "cffi-1.15.0-cp39-cp39-win32.whl", hash = "sha256:2a23af14f408d53d5e6cd4e3d9a24ff9e05906ad574822a10563efcef137979a"}, - {file = "cffi-1.15.0-cp39-cp39-win_amd64.whl", hash = "sha256:3773c4d81e6e818df2efbc7dd77325ca0dcb688116050fb2b3011218eda36139"}, - {file = "cffi-1.15.0.tar.gz", hash = "sha256:920f0d66a896c2d99f0adbb391f990a84091179542c205fa53ce5787aff87954"}, + {file = "cffi-1.15.1-cp27-cp27m-macosx_10_9_x86_64.whl", hash = "sha256:a66d3508133af6e8548451b25058d5812812ec3798c886bf38ed24a98216fab2"}, + {file = "cffi-1.15.1-cp27-cp27m-manylinux1_i686.whl", hash = "sha256:470c103ae716238bbe698d67ad020e1db9d9dba34fa5a899b5e21577e6d52ed2"}, + {file = "cffi-1.15.1-cp27-cp27m-manylinux1_x86_64.whl", hash = "sha256:9ad5db27f9cabae298d151c85cf2bad1d359a1b9c686a275df03385758e2f914"}, + {file = "cffi-1.15.1-cp27-cp27m-win32.whl", hash = "sha256:b3bbeb01c2b273cca1e1e0c5df57f12dce9a4dd331b4fa1635b8bec26350bde3"}, + {file = "cffi-1.15.1-cp27-cp27m-win_amd64.whl", hash = "sha256:e00b098126fd45523dd056d2efba6c5a63b71ffe9f2bbe1a4fe1716e1d0c331e"}, + {file = "cffi-1.15.1-cp27-cp27mu-manylinux1_i686.whl", hash = "sha256:d61f4695e6c866a23a21acab0509af1cdfd2c013cf256bbf5b6b5e2695827162"}, + {file = "cffi-1.15.1-cp27-cp27mu-manylinux1_x86_64.whl", hash = "sha256:ed9cb427ba5504c1dc15ede7d516b84757c3e3d7868ccc85121d9310d27eed0b"}, + {file = "cffi-1.15.1-cp310-cp310-macosx_10_9_x86_64.whl", hash = "sha256:39d39875251ca8f612b6f33e6b1195af86d1b3e60086068be9cc053aa4376e21"}, + {file = "cffi-1.15.1-cp310-cp310-macosx_11_0_arm64.whl", hash = "sha256:285d29981935eb726a4399badae8f0ffdff4f5050eaa6d0cfc3f64b857b77185"}, + {file = "cffi-1.15.1-cp310-cp310-manylinux_2_12_i686.manylinux2010_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:3eb6971dcff08619f8d91607cfc726518b6fa2a9eba42856be181c6d0d9515fd"}, + {file = "cffi-1.15.1-cp310-cp310-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:21157295583fe8943475029ed5abdcf71eb3911894724e360acff1d61c1d54bc"}, + {file = "cffi-1.15.1-cp310-cp310-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:5635bd9cb9731e6d4a1132a498dd34f764034a8ce60cef4f5319c0541159392f"}, + {file = "cffi-1.15.1-cp310-cp310-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:2012c72d854c2d03e45d06ae57f40d78e5770d252f195b93f581acf3ba44496e"}, + {file = "cffi-1.15.1-cp310-cp310-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:dd86c085fae2efd48ac91dd7ccffcfc0571387fe1193d33b6394db7ef31fe2a4"}, + {file = "cffi-1.15.1-cp310-cp310-musllinux_1_1_i686.whl", hash = "sha256:fa6693661a4c91757f4412306191b6dc88c1703f780c8234035eac011922bc01"}, + {file = "cffi-1.15.1-cp310-cp310-musllinux_1_1_x86_64.whl", hash = "sha256:59c0b02d0a6c384d453fece7566d1c7e6b7bae4fc5874ef2ef46d56776d61c9e"}, + {file = "cffi-1.15.1-cp310-cp310-win32.whl", hash = "sha256:cba9d6b9a7d64d4bd46167096fc9d2f835e25d7e4c121fb2ddfc6528fb0413b2"}, + {file = "cffi-1.15.1-cp310-cp310-win_amd64.whl", hash = "sha256:ce4bcc037df4fc5e3d184794f27bdaab018943698f4ca31630bc7f84a7b69c6d"}, + {file = "cffi-1.15.1-cp311-cp311-macosx_10_9_x86_64.whl", hash = "sha256:3d08afd128ddaa624a48cf2b859afef385b720bb4b43df214f85616922e6a5ac"}, + {file = "cffi-1.15.1-cp311-cp311-macosx_11_0_arm64.whl", hash = "sha256:3799aecf2e17cf585d977b780ce79ff0dc9b78d799fc694221ce814c2c19db83"}, + {file = "cffi-1.15.1-cp311-cp311-manylinux_2_12_i686.manylinux2010_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:a591fe9e525846e4d154205572a029f653ada1a78b93697f3b5a8f1f2bc055b9"}, + {file = "cffi-1.15.1-cp311-cp311-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:3548db281cd7d2561c9ad9984681c95f7b0e38881201e157833a2342c30d5e8c"}, + {file = "cffi-1.15.1-cp311-cp311-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:91fc98adde3d7881af9b59ed0294046f3806221863722ba7d8d120c575314325"}, + {file = "cffi-1.15.1-cp311-cp311-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:94411f22c3985acaec6f83c6df553f2dbe17b698cc7f8ae751ff2237d96b9e3c"}, + {file = "cffi-1.15.1-cp311-cp311-musllinux_1_1_i686.whl", hash = "sha256:03425bdae262c76aad70202debd780501fabeaca237cdfddc008987c0e0f59ef"}, + {file = "cffi-1.15.1-cp311-cp311-musllinux_1_1_x86_64.whl", hash = "sha256:cc4d65aeeaa04136a12677d3dd0b1c0c94dc43abac5860ab33cceb42b801c1e8"}, + {file = "cffi-1.15.1-cp311-cp311-win32.whl", hash = "sha256:a0f100c8912c114ff53e1202d0078b425bee3649ae34d7b070e9697f93c5d52d"}, + {file = "cffi-1.15.1-cp311-cp311-win_amd64.whl", hash = "sha256:04ed324bda3cda42b9b695d51bb7d54b680b9719cfab04227cdd1e04e5de3104"}, + {file = "cffi-1.15.1-cp36-cp36m-macosx_10_9_x86_64.whl", hash = "sha256:50a74364d85fd319352182ef59c5c790484a336f6db772c1a9231f1c3ed0cbd7"}, + {file = "cffi-1.15.1-cp36-cp36m-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:e263d77ee3dd201c3a142934a086a4450861778baaeeb45db4591ef65550b0a6"}, + {file = "cffi-1.15.1-cp36-cp36m-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:cec7d9412a9102bdc577382c3929b337320c4c4c4849f2c5cdd14d7368c5562d"}, + {file = "cffi-1.15.1-cp36-cp36m-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:4289fc34b2f5316fbb762d75362931e351941fa95fa18789191b33fc4cf9504a"}, + {file = "cffi-1.15.1-cp36-cp36m-manylinux_2_5_i686.manylinux1_i686.whl", hash = "sha256:173379135477dc8cac4bc58f45db08ab45d228b3363adb7af79436135d028405"}, + {file = "cffi-1.15.1-cp36-cp36m-manylinux_2_5_x86_64.manylinux1_x86_64.whl", hash = "sha256:6975a3fac6bc83c4a65c9f9fcab9e47019a11d3d2cf7f3c0d03431bf145a941e"}, + {file = "cffi-1.15.1-cp36-cp36m-win32.whl", hash = "sha256:2470043b93ff09bf8fb1d46d1cb756ce6132c54826661a32d4e4d132e1977adf"}, + {file = "cffi-1.15.1-cp36-cp36m-win_amd64.whl", hash = "sha256:30d78fbc8ebf9c92c9b7823ee18eb92f2e6ef79b45ac84db507f52fbe3ec4497"}, + {file = "cffi-1.15.1-cp37-cp37m-macosx_10_9_x86_64.whl", hash = "sha256:198caafb44239b60e252492445da556afafc7d1e3ab7a1fb3f0584ef6d742375"}, + {file = "cffi-1.15.1-cp37-cp37m-manylinux_2_12_i686.manylinux2010_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:5ef34d190326c3b1f822a5b7a45f6c4535e2f47ed06fec77d3d799c450b2651e"}, + {file = "cffi-1.15.1-cp37-cp37m-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:8102eaf27e1e448db915d08afa8b41d6c7ca7a04b7d73af6514df10a3e74bd82"}, + {file = "cffi-1.15.1-cp37-cp37m-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:5df2768244d19ab7f60546d0c7c63ce1581f7af8b5de3eb3004b9b6fc8a9f84b"}, + {file = "cffi-1.15.1-cp37-cp37m-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:a8c4917bd7ad33e8eb21e9a5bbba979b49d9a97acb3a803092cbc1133e20343c"}, + {file = "cffi-1.15.1-cp37-cp37m-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:0e2642fe3142e4cc4af0799748233ad6da94c62a8bec3a6648bf8ee68b1c7426"}, + {file = "cffi-1.15.1-cp37-cp37m-win32.whl", hash = "sha256:e229a521186c75c8ad9490854fd8bbdd9a0c9aa3a524326b55be83b54d4e0ad9"}, + {file = "cffi-1.15.1-cp37-cp37m-win_amd64.whl", hash = "sha256:a0b71b1b8fbf2b96e41c4d990244165e2c9be83d54962a9a1d118fd8657d2045"}, + {file = "cffi-1.15.1-cp38-cp38-macosx_10_9_x86_64.whl", hash = "sha256:320dab6e7cb2eacdf0e658569d2575c4dad258c0fcc794f46215e1e39f90f2c3"}, + {file = "cffi-1.15.1-cp38-cp38-manylinux_2_12_i686.manylinux2010_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:1e74c6b51a9ed6589199c787bf5f9875612ca4a8a0785fb2d4a84429badaf22a"}, + {file = "cffi-1.15.1-cp38-cp38-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:a5c84c68147988265e60416b57fc83425a78058853509c1b0629c180094904a5"}, + {file = "cffi-1.15.1-cp38-cp38-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:3b926aa83d1edb5aa5b427b4053dc420ec295a08e40911296b9eb1b6170f6cca"}, + {file = "cffi-1.15.1-cp38-cp38-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:87c450779d0914f2861b8526e035c5e6da0a3199d8f1add1a665e1cbc6fc6d02"}, + {file = "cffi-1.15.1-cp38-cp38-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:4f2c9f67e9821cad2e5f480bc8d83b8742896f1242dba247911072d4fa94c192"}, + {file = "cffi-1.15.1-cp38-cp38-win32.whl", hash = "sha256:8b7ee99e510d7b66cdb6c593f21c043c248537a32e0bedf02e01e9553a172314"}, + {file = "cffi-1.15.1-cp38-cp38-win_amd64.whl", hash = "sha256:00a9ed42e88df81ffae7a8ab6d9356b371399b91dbdf0c3cb1e84c03a13aceb5"}, + {file = "cffi-1.15.1-cp39-cp39-macosx_10_9_x86_64.whl", hash = "sha256:54a2db7b78338edd780e7ef7f9f6c442500fb0d41a5a4ea24fff1c929d5af585"}, + {file = "cffi-1.15.1-cp39-cp39-macosx_11_0_arm64.whl", hash = "sha256:fcd131dd944808b5bdb38e6f5b53013c5aa4f334c5cad0c72742f6eba4b73db0"}, + {file = "cffi-1.15.1-cp39-cp39-manylinux_2_12_i686.manylinux2010_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:7473e861101c9e72452f9bf8acb984947aa1661a7704553a9f6e4baa5ba64415"}, + {file = "cffi-1.15.1-cp39-cp39-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:6c9a799e985904922a4d207a94eae35c78ebae90e128f0c4e521ce339396be9d"}, + {file = "cffi-1.15.1-cp39-cp39-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:3bcde07039e586f91b45c88f8583ea7cf7a0770df3a1649627bf598332cb6984"}, + {file = "cffi-1.15.1-cp39-cp39-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:33ab79603146aace82c2427da5ca6e58f2b3f2fb5da893ceac0c42218a40be35"}, + {file = "cffi-1.15.1-cp39-cp39-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:5d598b938678ebf3c67377cdd45e09d431369c3b1a5b331058c338e201f12b27"}, + {file = "cffi-1.15.1-cp39-cp39-musllinux_1_1_i686.whl", hash = "sha256:db0fbb9c62743ce59a9ff687eb5f4afbe77e5e8403d6697f7446e5f609976f76"}, + {file = "cffi-1.15.1-cp39-cp39-musllinux_1_1_x86_64.whl", hash = "sha256:98d85c6a2bef81588d9227dde12db8a7f47f639f4a17c9ae08e773aa9c697bf3"}, + {file = "cffi-1.15.1-cp39-cp39-win32.whl", hash = "sha256:40f4774f5a9d4f5e344f31a32b5096977b5d48560c5592e2f3d2c4374bd543ee"}, + {file = "cffi-1.15.1-cp39-cp39-win_amd64.whl", hash = "sha256:70df4e3b545a17496c9b3f41f5115e69a4f2e77e94e1d2a8e1070bc0c38c8a3c"}, + {file = "cffi-1.15.1.tar.gz", hash = "sha256:d400bfb9a37b1351253cb402671cea7e89bdecc294e8016a707f6d1d8ac934f9"}, ] cfgv = [ {file = "cfgv-3.3.1-py2.py3-none-any.whl", hash = "sha256:c6a0883f3917a037485059700b9e75da2464e6c27051014ad85ba6aaa5884426"}, @@ -914,8 +928,8 @@ clikit = [ {file = "clikit-0.6.2.tar.gz", hash = "sha256:442ee5db9a14120635c5990bcdbfe7c03ada5898291f0c802f77be71569ded59"}, ] colorama = [ - {file = "colorama-0.4.4-py2.py3-none-any.whl", hash = "sha256:9f47eda37229f68eee03b24b9748937c7dc3868f906e8ba69fbcbdd3bc5dc3e2"}, - {file = "colorama-0.4.4.tar.gz", hash = "sha256:5941b2b48a20143d2267e95b1c2a7603ce057ee39fd88e7329b0c292aa16869b"}, + {file = "colorama-0.4.5-py2.py3-none-any.whl", hash = "sha256:854bf444933e37f5824ae7bfc1e98d5bce2ebe4160d46b5edf346a89358e99da"}, + {file = "colorama-0.4.5.tar.gz", hash = "sha256:e6c6b4334fc50988a639d9b98aa429a0b57da6e17b9a44f0451f930b6967b7a4"}, ] coverage = [ {file = "coverage-5.5-cp27-cp27m-macosx_10_9_x86_64.whl", hash = "sha256:b6d534e4b2ab35c9f93f46229363e17f63c53ad01330df9f2d6bd1187e5eaacf"}, @@ -998,28 +1012,28 @@ cryptography = [ {file = "cryptography-3.2.1-cp38-cp38-win32.whl", hash = "sha256:3cd75a683b15576cfc822c7c5742b3276e50b21a06672dc3a800a2d5da4ecd1b"}, {file = "cryptography-3.2.1-cp38-cp38-win_amd64.whl", hash = "sha256:d25cecbac20713a7c3bc544372d42d8eafa89799f492a43b79e1dfd650484851"}, {file = "cryptography-3.2.1.tar.gz", hash = "sha256:d3d5e10be0cf2a12214ddee45c6bd203dab435e3d83b4560c03066eda600bfe3"}, - {file = "cryptography-37.0.2-cp36-abi3-macosx_10_10_universal2.whl", hash = "sha256:ef15c2df7656763b4ff20a9bc4381d8352e6640cfeb95c2972c38ef508e75181"}, - {file = "cryptography-37.0.2-cp36-abi3-macosx_10_10_x86_64.whl", hash = "sha256:3c81599befb4d4f3d7648ed3217e00d21a9341a9a688ecdd615ff72ffbed7336"}, - {file = "cryptography-37.0.2-cp36-abi3-manylinux_2_12_x86_64.manylinux2010_x86_64.whl", hash = "sha256:2bd1096476aaac820426239ab534b636c77d71af66c547b9ddcd76eb9c79e004"}, - {file = "cryptography-37.0.2-cp36-abi3-manylinux_2_17_aarch64.manylinux2014_aarch64.manylinux_2_24_aarch64.whl", hash = "sha256:31fe38d14d2e5f787e0aecef831457da6cec68e0bb09a35835b0b44ae8b988fe"}, - {file = "cryptography-37.0.2-cp36-abi3-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:093cb351031656d3ee2f4fa1be579a8c69c754cf874206be1d4cf3b542042804"}, - {file = "cryptography-37.0.2-cp36-abi3-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:59b281eab51e1b6b6afa525af2bd93c16d49358404f814fe2c2410058623928c"}, - {file = "cryptography-37.0.2-cp36-abi3-manylinux_2_24_x86_64.whl", hash = "sha256:0cc20f655157d4cfc7bada909dc5cc228211b075ba8407c46467f63597c78178"}, - {file = "cryptography-37.0.2-cp36-abi3-musllinux_1_1_aarch64.whl", hash = "sha256:f8ec91983e638a9bcd75b39f1396e5c0dc2330cbd9ce4accefe68717e6779e0a"}, - {file = "cryptography-37.0.2-cp36-abi3-musllinux_1_1_x86_64.whl", hash = "sha256:46f4c544f6557a2fefa7ac8ac7d1b17bf9b647bd20b16decc8fbcab7117fbc15"}, - {file = "cryptography-37.0.2-cp36-abi3-win32.whl", hash = "sha256:731c8abd27693323b348518ed0e0705713a36d79fdbd969ad968fbef0979a7e0"}, - {file = "cryptography-37.0.2-cp36-abi3-win_amd64.whl", hash = "sha256:471e0d70201c069f74c837983189949aa0d24bb2d751b57e26e3761f2f782b8d"}, - {file = "cryptography-37.0.2-pp37-pypy37_pp73-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:a68254dd88021f24a68b613d8c51d5c5e74d735878b9e32cc0adf19d1f10aaf9"}, - {file = "cryptography-37.0.2-pp37-pypy37_pp73-manylinux_2_24_x86_64.whl", hash = "sha256:a7d5137e556cc0ea418dca6186deabe9129cee318618eb1ffecbd35bee55ddc1"}, - {file = "cryptography-37.0.2-pp38-pypy38_pp73-macosx_10_10_x86_64.whl", hash = "sha256:aeaba7b5e756ea52c8861c133c596afe93dd716cbcacae23b80bc238202dc023"}, - {file = "cryptography-37.0.2-pp38-pypy38_pp73-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:95e590dd70642eb2079d280420a888190aa040ad20f19ec8c6e097e38aa29e06"}, - {file = "cryptography-37.0.2-pp38-pypy38_pp73-manylinux_2_24_x86_64.whl", hash = "sha256:1b9362d34363f2c71b7853f6251219298124aa4cc2075ae2932e64c91a3e2717"}, - {file = "cryptography-37.0.2-pp38-pypy38_pp73-win_amd64.whl", hash = "sha256:e53258e69874a306fcecb88b7534d61820db8a98655662a3dd2ec7f1afd9132f"}, - {file = "cryptography-37.0.2-pp39-pypy39_pp73-macosx_10_10_x86_64.whl", hash = "sha256:1f3bfbd611db5cb58ca82f3deb35e83af34bb8cf06043fa61500157d50a70982"}, - {file = "cryptography-37.0.2-pp39-pypy39_pp73-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:419c57d7b63f5ec38b1199a9521d77d7d1754eb97827bbb773162073ccd8c8d4"}, - {file = "cryptography-37.0.2-pp39-pypy39_pp73-manylinux_2_24_x86_64.whl", hash = "sha256:dc26bb134452081859aa21d4990474ddb7e863aa39e60d1592800a8865a702de"}, - {file = "cryptography-37.0.2-pp39-pypy39_pp73-win_amd64.whl", hash = "sha256:3b8398b3d0efc420e777c40c16764d6870bcef2eb383df9c6dbb9ffe12c64452"}, - {file = "cryptography-37.0.2.tar.gz", hash = "sha256:f224ad253cc9cea7568f49077007d2263efa57396a2f2f78114066fd54b5c68e"}, + {file = "cryptography-37.0.4-cp36-abi3-macosx_10_10_universal2.whl", hash = "sha256:549153378611c0cca1042f20fd9c5030d37a72f634c9326e225c9f666d472884"}, + {file = "cryptography-37.0.4-cp36-abi3-macosx_10_10_x86_64.whl", hash = "sha256:a958c52505c8adf0d3822703078580d2c0456dd1d27fabfb6f76fe63d2971cd6"}, + {file = "cryptography-37.0.4-cp36-abi3-manylinux_2_12_x86_64.manylinux2010_x86_64.whl", hash = "sha256:f721d1885ecae9078c3f6bbe8a88bc0786b6e749bf32ccec1ef2b18929a05046"}, + {file = "cryptography-37.0.4-cp36-abi3-manylinux_2_17_aarch64.manylinux2014_aarch64.manylinux_2_24_aarch64.whl", hash = "sha256:3d41b965b3380f10e4611dbae366f6dc3cefc7c9ac4e8842a806b9672ae9add5"}, + {file = "cryptography-37.0.4-cp36-abi3-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:80f49023dd13ba35f7c34072fa17f604d2f19bf0989f292cedf7ab5770b87a0b"}, + {file = "cryptography-37.0.4-cp36-abi3-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:f2dcb0b3b63afb6df7fd94ec6fbddac81b5492513f7b0436210d390c14d46ee8"}, + {file = "cryptography-37.0.4-cp36-abi3-manylinux_2_24_x86_64.whl", hash = "sha256:b7f8dd0d4c1f21759695c05a5ec8536c12f31611541f8904083f3dc582604280"}, + {file = "cryptography-37.0.4-cp36-abi3-musllinux_1_1_aarch64.whl", hash = "sha256:30788e070800fec9bbcf9faa71ea6d8068f5136f60029759fd8c3efec3c9dcb3"}, + {file = "cryptography-37.0.4-cp36-abi3-musllinux_1_1_x86_64.whl", hash = "sha256:190f82f3e87033821828f60787cfa42bff98404483577b591429ed99bed39d59"}, + {file = "cryptography-37.0.4-cp36-abi3-win32.whl", hash = "sha256:b62439d7cd1222f3da897e9a9fe53bbf5c104fff4d60893ad1355d4c14a24157"}, + {file = "cryptography-37.0.4-cp36-abi3-win_amd64.whl", hash = "sha256:f7a6de3e98771e183645181b3627e2563dcde3ce94a9e42a3f427d2255190327"}, + {file = "cryptography-37.0.4-pp37-pypy37_pp73-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:6bc95ed67b6741b2607298f9ea4932ff157e570ef456ef7ff0ef4884a134cc4b"}, + {file = "cryptography-37.0.4-pp37-pypy37_pp73-manylinux_2_24_x86_64.whl", hash = "sha256:f8c0a6e9e1dd3eb0414ba320f85da6b0dcbd543126e30fcc546e7372a7fbf3b9"}, + {file = "cryptography-37.0.4-pp38-pypy38_pp73-macosx_10_10_x86_64.whl", hash = "sha256:e007f052ed10cc316df59bc90fbb7ff7950d7e2919c9757fd42a2b8ecf8a5f67"}, + {file = "cryptography-37.0.4-pp38-pypy38_pp73-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:7bc997818309f56c0038a33b8da5c0bfbb3f1f067f315f9abd6fc07ad359398d"}, + {file = "cryptography-37.0.4-pp38-pypy38_pp73-manylinux_2_24_x86_64.whl", hash = "sha256:d204833f3c8a33bbe11eda63a54b1aad7aa7456ed769a982f21ec599ba5fa282"}, + {file = "cryptography-37.0.4-pp38-pypy38_pp73-win_amd64.whl", hash = "sha256:75976c217f10d48a8b5a8de3d70c454c249e4b91851f6838a4e48b8f41eb71aa"}, + {file = "cryptography-37.0.4-pp39-pypy39_pp73-macosx_10_10_x86_64.whl", hash = "sha256:7099a8d55cd49b737ffc99c17de504f2257e3787e02abe6d1a6d136574873441"}, + {file = "cryptography-37.0.4-pp39-pypy39_pp73-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:2be53f9f5505673eeda5f2736bea736c40f051a739bfae2f92d18aed1eb54596"}, + {file = "cryptography-37.0.4-pp39-pypy39_pp73-manylinux_2_24_x86_64.whl", hash = "sha256:91ce48d35f4e3d3f1d83e29ef4a9267246e6a3be51864a5b7d2247d5086fa99a"}, + {file = "cryptography-37.0.4-pp39-pypy39_pp73-win_amd64.whl", hash = "sha256:4c590ec31550a724ef893c50f9a97a0c14e9c851c85621c5650d699a7b88f7ab"}, + {file = "cryptography-37.0.4.tar.gz", hash = "sha256:63f9c17c0e2474ccbebc9302ce2f07b55b3b3fcb211ded18a42d5764f5c10a82"}, ] distlib = [ {file = "distlib-0.3.4-py2.py3-none-any.whl", hash = "sha256:6564fe0a8f51e734df6333d08b8b94d4ea8ee6b99b5ed50613f731fd4089f34b"}, @@ -1280,8 +1294,8 @@ tomlkit = [ {file = "tomlkit-0.7.2.tar.gz", hash = "sha256:d7a454f319a7e9bd2e249f239168729327e4dd2d27b17dc68be264ad1ce36754"}, ] tox = [ - {file = "tox-3.25.0-py2.py3-none-any.whl", hash = "sha256:0805727eb4d6b049de304977dfc9ce315a1938e6619c3ab9f38682bb04662a5a"}, - {file = "tox-3.25.0.tar.gz", hash = "sha256:37888f3092aa4e9f835fc8cc6dadbaaa0782651c41ef359e3a5743fcb0308160"}, + {file = "tox-3.25.1-py2.py3-none-any.whl", hash = "sha256:c38e15f4733683a9cc0129fba078633e07eb0961f550a010ada879e95fb32632"}, + {file = "tox-3.25.1.tar.gz", hash = "sha256:c138327815f53bc6da4fe56baec5f25f00622ae69ef3fe4e1e385720e22486f9"}, ] typing-extensions = [ {file = "typing_extensions-3.10.0.2-py2-none-any.whl", hash = "sha256:d8226d10bc02a29bcc81df19a26e56a9647f8b0a6d4a83924139f4a8b01f17b7"}, @@ -1293,8 +1307,8 @@ urllib3 = [ {file = "urllib3-1.26.9.tar.gz", hash = "sha256:aabaf16477806a5e1dd19aa41f8c2b7950dd3c746362d7e3223dbe6de6ac448e"}, ] virtualenv = [ - {file = "virtualenv-20.14.1-py2.py3-none-any.whl", hash = "sha256:e617f16e25b42eb4f6e74096b9c9e37713cf10bf30168fb4a739f3fa8f898a3a"}, - {file = "virtualenv-20.14.1.tar.gz", hash = "sha256:ef589a79795589aada0c1c5b319486797c03b67ac3984c48c669c0e4f50df3a5"}, + {file = "virtualenv-20.15.1-py2.py3-none-any.whl", hash = "sha256:b30aefac647e86af6d82bfc944c556f8f1a9c90427b2fb4e3bfbf338cb82becf"}, + {file = "virtualenv-20.15.1.tar.gz", hash = "sha256:288171134a2ff3bfb1a2f54f119e77cd1b81c29fc1265a2356f3e8d14c7d58c4"}, ] wcwidth = [ {file = "wcwidth-0.2.5-py2.py3-none-any.whl", hash = "sha256:beb4802a9cebb9144e99086eff703a642a13d6a0052920003a230f3294bbe784"}, diff --git a/pkgs/development/tools/poetry2nix/poetry2nix/pkgs/poetry/pyproject.toml b/pkgs/development/tools/poetry2nix/poetry2nix/pkgs/poetry/pyproject.toml index 63d1fc11af66..41f8d30edcba 100644 --- a/pkgs/development/tools/poetry2nix/poetry2nix/pkgs/poetry/pyproject.toml +++ b/pkgs/development/tools/poetry2nix/poetry2nix/pkgs/poetry/pyproject.toml @@ -1,6 +1,6 @@ [tool.poetry] name = "poetry" -version = "1.1.13" +version = "1.1.14" description = "Python dependency management and packaging made easy." authors = [ "Sébastien Eustace " diff --git a/pkgs/development/tools/poetry2nix/poetry2nix/pkgs/poetry/src.json b/pkgs/development/tools/poetry2nix/poetry2nix/pkgs/poetry/src.json index 7b35dc31494e..3bdc2f2ab825 100644 --- a/pkgs/development/tools/poetry2nix/poetry2nix/pkgs/poetry/src.json +++ b/pkgs/development/tools/poetry2nix/poetry2nix/pkgs/poetry/src.json @@ -1,7 +1,8 @@ { "owner": "python-poetry", "repo": "poetry", - "rev": "1.1.13", - "sha256": "0zm73wcxjfad3841wl1xpx20drhynrqlxsjh1d1gsh618b7ldpib", + "rev": "1.1.14", + "sha256": "1yx2a1xzid9zclf88wwczz7wgphsgpp3ksmha2jiacq898wrkwcz", "fetchSubmodules": true } + diff --git a/pkgs/development/tools/sumneko-lua-language-server/default.nix b/pkgs/development/tools/sumneko-lua-language-server/default.nix index 9e73c566ef89..efe13a52d07a 100644 --- a/pkgs/development/tools/sumneko-lua-language-server/default.nix +++ b/pkgs/development/tools/sumneko-lua-language-server/default.nix @@ -4,13 +4,13 @@ let in stdenv.mkDerivation rec { pname = "sumneko-lua-language-server"; - version = "3.2.3"; + version = "3.4.1"; src = fetchFromGitHub { owner = "sumneko"; repo = "lua-language-server"; rev = version; - sha256 = "sha256-n54PWkiB+vXAqIOZ5FOTUNgGhAdBs81Q1WYxJ2XIb8o="; + sha256 = "sha256-A5a3cOhdPkheMooPjcZW5jneziDcFB0o3gfY2nEOJ4Y="; fetchSubmodules = true; }; diff --git a/pkgs/development/tools/wails/default.nix b/pkgs/development/tools/wails/default.nix index 51de7ae38708..131bd38d6425 100644 --- a/pkgs/development/tools/wails/default.nix +++ b/pkgs/development/tools/wails/default.nix @@ -15,16 +15,16 @@ buildGoModule rec { pname = "wails"; - version = "2.0.0-beta.37"; + version = "2.0.0-beta.38"; src = fetchFromGitHub { owner = "wailsapp"; repo = pname; rev = "v${version}"; - sha256 = "sha256-KelPMb0ANEh0eW0vBGMydrwWm93wiwcIBoOetQ6EJgM="; + sha256 = "sha256-yZgqdJMc48IKd3fimCWPLNkCdUEeIiQs4Xi4D9f5sHA="; } + "/v2"; - vendorSha256 = "sha256-rrwlFZQT7sHhUqtU4UzwEqZbjWd/1fudfj/xdTGFUmQ="; + vendorSha256 = "sha256-tUNOMNQ2NoYvNt2AdKzkMa+oiPNszBjuhs9EgbDVcTU="; proxyVendor = true; diff --git a/pkgs/development/web/bun/default.nix b/pkgs/development/web/bun/default.nix new file mode 100644 index 000000000000..04124379b147 --- /dev/null +++ b/pkgs/development/web/bun/default.nix @@ -0,0 +1,61 @@ +{ stdenvNoCC, callPackage, fetchurl, autoPatchelfHook, unzip, openssl, lib }: +let + dists = { + aarch64-darwin = { + arch = "aarch64"; + shortName = "darwin"; + sha256 = "06kf4dyb8y486r2bbpz8znnaxah9y2hwc9km3cigacfchi4dy28j"; + }; + + x86_64-darwin = { + arch = "x64"; + shortName = "darwin"; + sha256 = "06q8cajxra8lgyd1ap6iqzqdw31gkvlc6l2ma0mm22y63msgdn8b"; + }; + + x86_64-linux = { + arch = "x64"; + shortName = "linux"; + sha256 = "038w54yyk94042hg27hfm49w12xsg8wh0skza9l9iybvc9qlvh2i"; + }; + }; + dist = dists.${stdenvNoCC.hostPlatform.system} or (throw "Unsupported system: ${stdenvNoCC.hostPlatform.system}"); +in +stdenvNoCC.mkDerivation rec { + version = "0.1.1"; + pname = "bun"; + + src = fetchurl { + url = "https://github.com/Jarred-Sumner/bun-releases-for-updater/releases/download/bun-v${version}/bun-${dist.shortName}-${dist.arch}.zip"; + sha256 = dist.sha256; + }; + + strictDeps = true; + nativeBuildInputs = [ unzip ] ++ lib.optionals stdenvNoCC.isLinux [ autoPatchelfHook ]; + buildInputs = [ openssl ]; + + dontConfigure = true; + dontBuild = true; + + installPhase = '' + runHook preInstall + install -Dm 755 ./bun $out/bin/bun + runHook postInstall + ''; + + meta = with lib; { + homepage = "https://bun.sh"; + changelog = "https://github.com/Jarred-Sumner/bun/releases/tag/bun-v${version}"; + description = "Incredibly fast JavaScript runtime, bundler, transpiler and package manager – all in one"; + sourceProvenance = with sourceTypes; [ binaryNativeCode ]; + longDescription = '' + All in one fast & easy-to-use tool. Instead of 1,000 node_modules for development, you only need bun. + ''; + license = with licenses; [ + mit # bun core + lgpl21Only # javascriptcore and webkit + ]; + maintainers = with maintainers; [ DAlperin jk ]; + platforms = builtins.attrNames dists; + }; +} diff --git a/pkgs/development/web/nodejs/v14.nix b/pkgs/development/web/nodejs/v14.nix index 7cae7dd557a2..ab2d2c01bc18 100644 --- a/pkgs/development/web/nodejs/v14.nix +++ b/pkgs/development/web/nodejs/v14.nix @@ -7,7 +7,7 @@ let in buildNodejs { inherit enableNpm; - version = "14.19.3"; - sha256 = "sha256-XPRbHxrKd1I6zzYkDB1TqZknkHCncR6r8jNG+IsMyZQ="; + version = "14.20.0"; + sha256 = "0slrcgiwwn8isp2ih5i2v1d6lsafz7bg6qwxf2lydlc9i14rhl1b"; patches = lib.optional stdenv.isDarwin ./bypass-xcodebuild.diff; } diff --git a/pkgs/development/web/nodejs/v18.nix b/pkgs/development/web/nodejs/v18.nix index a2c10d1b96b2..78cb2a687931 100644 --- a/pkgs/development/web/nodejs/v18.nix +++ b/pkgs/development/web/nodejs/v18.nix @@ -7,8 +7,8 @@ let in buildNodejs { inherit enableNpm; - version = "18.4.0"; - sha256 = "sha256-lNbxmpcDYfjIrRdFBgQJU4n1HKagDc3lnCHzc+lau7U="; + version = "18.5.0"; + sha256 = "0c50y6c52pmbxc8x1zhkzq608bwvcma4fj39cd1mvc40wfa5d2rn"; patches = [ ./disable-darwin-v8-system-instrumentation.patch ]; diff --git a/pkgs/games/gnubg/default.nix b/pkgs/games/gnubg/default.nix index 6f50869e6c69..90d54638b61c 100644 --- a/pkgs/games/gnubg/default.nix +++ b/pkgs/games/gnubg/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, pkg-config, glib, python3, gtk2, readline }: +{ lib, stdenv, fetchurl, pkg-config, glib, python, gtk2, readline }: stdenv.mkDerivation rec { pname = "gnubg"; @@ -9,8 +9,9 @@ stdenv.mkDerivation rec { sha256 = "11xwhcli1h12k6rnhhyq4jphzrhfik7i8ah3k32pqw803460n6yf"; }; - nativeBuildInputs = [ pkg-config python3 glib ]; - buildInputs = [ gtk2 readline ]; + nativeBuildInputs = [ pkg-config python glib ]; + + buildInputs = [ gtk2 readline ]; strictDeps = true; diff --git a/pkgs/misc/fastly/default.nix b/pkgs/misc/fastly/default.nix index 1a376271d18d..4462603d3eed 100644 --- a/pkgs/misc/fastly/default.nix +++ b/pkgs/misc/fastly/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "fastly"; - version = "3.1.0"; + version = "3.1.1"; src = fetchFromGitHub { owner = "fastly"; repo = "cli"; rev = "v${version}"; - sha256 = "sha256-Su4ZwiuI+pMoLAGhc3dWcwgcfwe5cZGTg8kEnpM4JbA="; + sha256 = "sha256-mUWGvFyei5Ep3xRDVVZoa6tMiqfV89hn82/Uai+Gh8Y="; # The git commit is part of the `fastly version` original output; # leave that output the same in nixpkgs. Use the `.git` directory # to retrieve the commit SHA, and remove the directory afterwards, @@ -23,7 +23,7 @@ buildGoModule rec { subPackages = [ "cmd/fastly" ]; - vendorSha256 = "sha256-5MvJS10f7YLvO+wCmUJleU27hCJbsNrOIfUZnniGw+E="; + vendorSha256 = "sha256-glztVmAAdkEccJEFIHGWjNzz/+MjExSX18GDX66sdxA="; nativeBuildInputs = [ installShellFiles ]; diff --git a/pkgs/os-specific/linux/bpftrace/btf-dump-new-0.6.0.patch b/pkgs/os-specific/linux/bpftrace/btf-dump-new-0.6.0.patch deleted file mode 100644 index b5037192203c..000000000000 --- a/pkgs/os-specific/linux/bpftrace/btf-dump-new-0.6.0.patch +++ /dev/null @@ -1,39 +0,0 @@ -diff -ur source/src/btf.cpp new/src/btf.cpp ---- source/src/btf.cpp 1970-01-01 09:00:01.000000000 +0900 -+++ new/src/btf.cpp 2021-12-04 21:46:59.337023489 +0900 -@@ -225,7 +225,7 @@ - char err_buf[256]; - int err; - -- dump = btf_dump__new(btf, nullptr, &opts, dump_printf); -+ dump = btf_dump__new_deprecated(btf, nullptr, &opts, dump_printf); - err = libbpf_get_error(dump); - if (err) - { -@@ -496,7 +496,7 @@ - char err_buf[256]; - int err; - -- dump = btf_dump__new(btf, nullptr, &opts, dump_printf); -+ dump = btf_dump__new_deprecated(btf, nullptr, &opts, dump_printf); - err = libbpf_get_error(dump); - if (err) - { -@@ -554,7 +554,7 @@ - char err_buf[256]; - int err; - -- dump = btf_dump__new(btf, nullptr, &opts, dump_printf); -+ dump = btf_dump__new_deprecated(btf, nullptr, &opts, dump_printf); - err = libbpf_get_error(dump); - if (err) - { -@@ -648,7 +648,7 @@ - char err_buf[256]; - int err; - -- dump = btf_dump__new(btf, nullptr, &opts, dump_printf); -+ dump = btf_dump__new_deprecated(btf, nullptr, &opts, dump_printf); - err = libbpf_get_error(dump); - if (err) - { diff --git a/pkgs/os-specific/linux/bpftrace/default.nix b/pkgs/os-specific/linux/bpftrace/default.nix index cbf5eb4a6dd9..cf7517718f2f 100644 --- a/pkgs/os-specific/linux/bpftrace/default.nix +++ b/pkgs/os-specific/linux/bpftrace/default.nix @@ -9,7 +9,7 @@ stdenv.mkDerivation rec { pname = "bpftrace"; - version = "0.14.1"; + version = "0.15.0"; # Cherry-picked from merged PR, remove this hook on next update # https://github.com/iovisor/bpftrace/pull/2242 @@ -33,14 +33,9 @@ stdenv.mkDerivation rec { owner = "iovisor"; repo = "bpftrace"; rev = "v${version}"; - sha256 = "sha256-QDqHAEVM/XHCFMS0jMLdKJfDUOpkUqONOf8+Fbd5dCY="; + sha256 = "sha256-9adZAKSn00W2yNwVDbVB1/O5Y+10c4EkVJGCHyd4Tgg="; }; - # libbpf 0.6.0 relies on typeof in bpf/btf.h to pick the right version of - # btf_dump__new() but that's not valid c++. - # see https://github.com/iovisor/bpftrace/issues/2068 - patches = [ ./btf-dump-new-0.6.0.patch ]; - buildInputs = with llvmPackages; [ llvm libclang elfutils libelf bcc diff --git a/pkgs/os-specific/linux/kernel/zen-kernels.nix b/pkgs/os-specific/linux/kernel/zen-kernels.nix index dbe93b778b89..10245a00a9b8 100644 --- a/pkgs/os-specific/linux/kernel/zen-kernels.nix +++ b/pkgs/os-specific/linux/kernel/zen-kernels.nix @@ -4,16 +4,16 @@ let # comments with variant added for update script # ./update-zen.py zen zenVariant = { - version = "5.18.9"; #zen + version = "5.18.10"; #zen suffix = "zen1"; #zen - sha256 = "0smmy7axz874x22s8yram3k64n3w9npfh4irgan1if8k87pgx474"; #zen + sha256 = "0kqzs3g9w1sfin61sapc403pc65acsy18qk8ldkhzhjzv90fw4im"; #zen isLqx = false; }; # ./update-zen.py lqx lqxVariant = { - version = "5.18.9"; #lqx + version = "5.18.10"; #lqx suffix = "lqx1"; #lqx - sha256 = "1dvdav0d3fw9frp1l2k525yai071gvign2z81fna3j63ddy2bxp1"; #lqx + sha256 = "0b666lwqhiydkikca2x55ljgpw9sba8r7jvcvp6nghm4yf3a11mp"; #lqx isLqx = true; }; zenKernelsFor = { version, suffix, sha256, isLqx }: buildLinux (args // { diff --git a/pkgs/os-specific/linux/libbpf/default.nix b/pkgs/os-specific/linux/libbpf/default.nix index cb2f4611fde0..e9b04ff64181 100644 --- a/pkgs/os-specific/linux/libbpf/default.nix +++ b/pkgs/os-specific/linux/libbpf/default.nix @@ -1,6 +1,5 @@ { fetchFromGitHub -, fetchpatch -, libelf +, elfutils , pkg-config , stdenv , zlib @@ -10,17 +9,17 @@ stdenv.mkDerivation rec { pname = "libbpf"; - version = "0.7.0"; + version = "0.8.0"; src = fetchFromGitHub { owner = "libbpf"; repo = "libbpf"; rev = "v${version}"; - sha256 = "sha256-NFVJ8JquWVzu+QoaaOMzhnu6/IqdP1FPhtJFidXA4L4="; + sha256 = "sha256-D2ASqSZFNShCdRCH8LDocLP/O4sME9nT73rk1KsJeJE="; }; nativeBuildInputs = [ pkg-config ]; - buildInputs = [ libelf zlib ]; + buildInputs = [ elfutils zlib ]; enableParallelBuilding = true; makeFlags = [ "PREFIX=$(out)" "-C src" ]; diff --git a/pkgs/servers/home-assistant/component-packages.nix b/pkgs/servers/home-assistant/component-packages.nix index 1c65fce6e7fe..109e058b169d 100644 --- a/pkgs/servers/home-assistant/component-packages.nix +++ b/pkgs/servers/home-assistant/component-packages.nix @@ -2,7 +2,7 @@ # Do not edit! { - version = "2022.7.0"; + version = "2022.7.2"; components = { "abode" = ps: with ps; [ abodepy diff --git a/pkgs/servers/home-assistant/default.nix b/pkgs/servers/home-assistant/default.nix index b343971f0442..a6c615cc3c1d 100644 --- a/pkgs/servers/home-assistant/default.nix +++ b/pkgs/servers/home-assistant/default.nix @@ -190,7 +190,7 @@ let extraPackagesFile = writeText "home-assistant-packages" (lib.concatMapStringsSep "\n" (pkg: pkg.pname) extraBuildInputs); # Don't forget to run parse-requirements.py after updating - hassVersion = "2022.7.0"; + hassVersion = "2022.7.2"; in python.pkgs.buildPythonApplication rec { pname = "homeassistant"; @@ -208,7 +208,7 @@ in python.pkgs.buildPythonApplication rec { owner = "home-assistant"; repo = "core"; rev = version; - hash = "sha256-DDRut+3wJutXcQVOf2KU+XuHs5XuKkd5R7dQIXwOIrU="; + hash = "sha256-POOt5SjDa9jnBqxhD0LUopfAmZ9lpnb7mj7SSVoqTr0="; }; # leave this in, so users don't have to constantly update their downstream patch handling @@ -245,7 +245,7 @@ in python.pkgs.buildPythonApplication rec { aiohttp astral async-timeout - atomicwrites + atomicwrites-homeassistant attrs awesomeversion bcrypt diff --git a/pkgs/servers/home-assistant/frontend.nix b/pkgs/servers/home-assistant/frontend.nix index f92314f83df0..0d067d7d3db2 100644 --- a/pkgs/servers/home-assistant/frontend.nix +++ b/pkgs/servers/home-assistant/frontend.nix @@ -4,7 +4,7 @@ buildPythonPackage rec { # the frontend version corresponding to a specific home-assistant version can be found here # https://github.com/home-assistant/home-assistant/blob/master/homeassistant/components/frontend/manifest.json pname = "home-assistant-frontend"; - version = "20220706.0"; + version = "20220707.0"; format = "wheel"; src = fetchPypi { @@ -12,7 +12,7 @@ buildPythonPackage rec { pname = "home_assistant_frontend"; dist = "py3"; python = "py3"; - sha256 = "sha256-hTdfe+S9D6Grtku5AkRJpCNBvYv2JspSPmXRHHfEPrA="; + sha256 = "sha256-ZNaa+YyY77b8Pg462tVewUe+K7ePTflESjZ+ar1cFc4="; }; # there is nothing to strip in this package diff --git a/pkgs/tools/X11/xnotify/default.nix b/pkgs/tools/X11/xnotify/default.nix new file mode 100644 index 000000000000..8f93e1b1c9f9 --- /dev/null +++ b/pkgs/tools/X11/xnotify/default.nix @@ -0,0 +1,59 @@ +{ lib +, stdenv +, fetchFromGitHub +, writeText +, fontconfig +, imlib2 +, libX11 +, libXft +, libXinerama +, conf ? null +, nix-update-script +}: + +stdenv.mkDerivation rec { + pname = "xnotify"; + version = "unstable-2022-02-18"; + + src = fetchFromGitHub { + owner = "phillbush"; + repo = "xnotify"; + rev = "58c7d5763c3fb1c32a76560c85d20a25f59d4687"; + sha256 = "sha256-BSZesuBGAWYp3IMiiZi6CAyZEiz3sBJLQe6/JnxviLs="; + }; + + buildInputs = [ + fontconfig + imlib2 + libX11 + libXft + libXinerama + ]; + + postPatch = with lib; + let + configFile = + if isDerivation conf || builtins.isPath conf + then conf else writeText "config.h" conf; + in + optionalString (conf != null) "cp ${configFile} config.h"; + + makeFlags = [ "PREFIX=$(out)" ]; + + passthru.updateScript = nix-update-script { + attrPath = pname; + }; + + meta = with lib; { + description = "A tool to read notifications from stdin and pop them up on the screen"; + longDescription = '' + XNotify displays a notification on the screen. XNotify receives a + notification specification in stdin and shows a notification for the user + on the screen. + ''; + homepage = "https://github.com/phillbush/xnotify"; + license = licenses.mit; + maintainers = with maintainers; [ azahi ]; + platforms = platforms.unix; + }; +} diff --git a/pkgs/tools/X11/xprompt/default.nix b/pkgs/tools/X11/xprompt/default.nix new file mode 100644 index 000000000000..69149b3889b8 --- /dev/null +++ b/pkgs/tools/X11/xprompt/default.nix @@ -0,0 +1,56 @@ +{ lib +, stdenv +, fetchFromGitHub +, writeText +, fontconfig +, libX11 +, libXft +, libXinerama +, conf ? null +, nix-update-script +}: + +stdenv.mkDerivation rec { + pname = "xprompt"; + version = "2.5.0"; + + src = fetchFromGitHub { + owner = "phillbush"; + repo = "xprompt"; + rev = "v${version}"; + sha256 = "sha256-pOayKngUlrMY3bFsP4Fi+VsOLKCUQU3tdkZ+0OY1SCo="; + }; + + buildInputs = [ + fontconfig + libX11 + libXft + libXinerama + ]; + + postPatch = with lib; + let + configFile = + if isDerivation conf || builtins.isPath conf + then conf else writeText "config.h" conf; + in + optionalString (conf != null) "cp ${configFile} config.h"; + + makeFlags = [ "PREFIX=$(out)" ]; + + passthru.updateScript = nix-update-script { + attrPath = pname; + }; + + meta = with lib; { + description = "A dmenu rip-off with contextual completion"; + longDescription = '' + XPrompt is a prompt for X. XPrompt features a text input field where the + user can type in a text subject to tab-completion. + ''; + homepage = "https://github.com/phillbush/xprompt"; + license = licenses.mit; + maintainers = with maintainers; [ azahi ]; + platforms = platforms.unix; + }; +} diff --git a/pkgs/tools/admin/eksctl/default.nix b/pkgs/tools/admin/eksctl/default.nix index 8448b24e5991..812b5e715bd7 100644 --- a/pkgs/tools/admin/eksctl/default.nix +++ b/pkgs/tools/admin/eksctl/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "eksctl"; - version = "0.104.0"; + version = "0.105.0"; src = fetchFromGitHub { owner = "weaveworks"; repo = pname; rev = version; - sha256 = "sha256-s/7RoFVf7mejPsMz6lMBHDGG8+N1KBMzUesXu9MPrzo="; + sha256 = "sha256-ur9gMo/GR24mSWyNj+2uJJkp1neNMHrPk07l9rjrd1M="; }; vendorSha256 = "sha256-mwQahKRHR9cy2Yb4IGCIRtA0j38QJoPKNtpS/T4ndC4="; diff --git a/pkgs/tools/audio/tts/default.nix b/pkgs/tools/audio/tts/default.nix index 0072c8c26028..159d68feac0f 100644 --- a/pkgs/tools/audio/tts/default.nix +++ b/pkgs/tools/audio/tts/default.nix @@ -43,6 +43,7 @@ python.pkgs.buildPythonApplication rec { postPatch = let relaxedConstraints = [ + "cython" "gruut" "librosa" "mecab-python3" diff --git a/pkgs/tools/filesystems/ceph/default.nix b/pkgs/tools/filesystems/ceph/default.nix index 47a76c33c80e..db02bedf7f94 100644 --- a/pkgs/tools/filesystems/ceph/default.nix +++ b/pkgs/tools/filesystems/ceph/default.nix @@ -138,10 +138,10 @@ let ]); sitePackages = ceph-python-env.python.sitePackages; - version = "16.2.7"; + version = "16.2.9"; src = fetchurl { url = "http://download.ceph.com/tarballs/ceph-${version}.tar.gz"; - sha256 = "0n7vpdcxji49bqaa5b7zxif1r80rrkbh0dfacbibvf20kzzbn2fz"; + sha256 = "sha256-CNj48myJvYwj8cWQRWrTSPiPHS+AFcXfqzd1ytMUxvk="; }; in rec { ceph = stdenv.mkDerivation { diff --git a/pkgs/tools/misc/diffoscope/default.nix b/pkgs/tools/misc/diffoscope/default.nix index 2307dddf6cac..de8fdfdea55b 100644 --- a/pkgs/tools/misc/diffoscope/default.nix +++ b/pkgs/tools/misc/diffoscope/default.nix @@ -11,11 +11,11 @@ # Note: when upgrading this package, please run the list-missing-tools.sh script as described below! python3Packages.buildPythonApplication rec { pname = "diffoscope"; - version = "217"; + version = "218"; src = fetchurl { url = "https://diffoscope.org/archive/diffoscope-${version}.tar.bz2"; - sha256 = "sha256-JS6lzxOsE3K4gH3VHsRY5Iucq5PBH3jFD5lSmNZWEG4="; + sha256 = "sha256-W4adsal6l1TdlUhITNGnNUmYUIpEsOZRro2/SEdzV2Y="; }; outputs = [ "out" "man" ]; diff --git a/pkgs/tools/misc/librespeed-cli/default.nix b/pkgs/tools/misc/librespeed-cli/default.nix index 09d6de6ad9d3..fba0942dab52 100644 --- a/pkgs/tools/misc/librespeed-cli/default.nix +++ b/pkgs/tools/misc/librespeed-cli/default.nix @@ -5,13 +5,13 @@ buildGoModule rec { pname = "librespeed-cli"; - version = "1.0.9"; + version = "1.0.10"; src = fetchFromGitHub { owner = "librespeed"; repo = "speedtest-cli"; rev = "v${version}"; - sha256 = "sha256-rtZZgx5QNwYd6vXSts/ICSiXv7sMZA8ihHgxTjZ/6KQ="; + sha256 = "sha256-LFGlKYWUaHi/byoRPD6zsdr0U5r0zWxxRa2NJNB2yb8="; }; vendorSha256 = "sha256-psZyyySpY06J+ji+9uHUtX7Ks1hzZC3zINszYP75NfQ="; diff --git a/pkgs/tools/misc/steampipe/default.nix b/pkgs/tools/misc/steampipe/default.nix index cf6051d7bdde..6ff87a680313 100644 --- a/pkgs/tools/misc/steampipe/default.nix +++ b/pkgs/tools/misc/steampipe/default.nix @@ -1,17 +1,17 @@ -{ stdenv, lib, buildGoModule, fetchFromGitHub, installShellFiles }: +{ stdenv, lib, buildGo118Module, fetchFromGitHub, installShellFiles }: -buildGoModule rec { +buildGo118Module rec { pname = "steampipe"; - version = "0.13.4"; + version = "0.15.0"; src = fetchFromGitHub { owner = "turbot"; repo = "steampipe"; rev = "v${version}"; - sha256 = "sha256-Qq8i/uU2TtrEpvTPFmnZdku2vNo5O240dAT2OQKel1U="; + sha256 = "sha256-ly64p8shbhixLbK9hpDNYhmBKoAt4iXB//pdFSIYZMc="; }; - vendorSha256 = "sha256-pEQG9BHhsVDVSOoKJBocLXMLjmP72RM+GXz4nYD4D7s="; + vendorSha256 = "sha256-/VU8VNDqU7CMm/lIBqTChyUWP4svVCgsw0CBcp/u+U0="; proxyVendor = true; nativeBuildInputs = [ installShellFiles ]; diff --git a/pkgs/tools/misc/ytarchive/default.nix b/pkgs/tools/misc/ytarchive/default.nix index ecf1fe9ff694..65b801c76186 100644 --- a/pkgs/tools/misc/ytarchive/default.nix +++ b/pkgs/tools/misc/ytarchive/default.nix @@ -1,21 +1,21 @@ -{ lib, buildGoModule, fetchFromGitHub, makeWrapper, ffmpeg }: +{ lib, buildGoModule, fetchFromGitHub, makeBinaryWrapper, ffmpeg }: buildGoModule rec { pname = "ytarchive"; - version = "unstable-2022-03-11"; + version = "unstable-2022-05-28"; src = fetchFromGitHub { owner = "Kethsar"; repo = "ytarchive"; - rev = "34825e8777637ca114a0ab394a4b4fead6ad7c88"; - sha256 = "sha256-/x6YcF2EyjOFnIHlsh+ZESF+7AYO3QRNaqbJgycQai4="; + rev = "8d48052f432ec6f78c6aed326e8a1db31ee8e706"; + sha256 = "sha256-IsG0YPVBzsbHLNs1m/AruDmm0n7vwN9Fj1KMOoQJQ+c="; }; vendorSha256 = "sha256-r9fDFSCDItQ7YSj9aTY1LXRrFE9T3XD0X36ywCfu0R8="; - nativeBuildInputs = [ makeWrapper ]; + nativeBuildInputs = [ makeBinaryWrapper ]; - ldflags = [ "-s" "-w" ]; + ldflags = [ "-s" "-w" "-X main.Commit=-${src.rev}" ]; postInstall = '' wrapProgram $out/bin/ytarchive --prefix PATH : ${lib.makeBinPath [ ffmpeg ]} diff --git a/pkgs/tools/networking/dnsproxy/default.nix b/pkgs/tools/networking/dnsproxy/default.nix index 7fd740a9035b..15b0e23493d8 100644 --- a/pkgs/tools/networking/dnsproxy/default.nix +++ b/pkgs/tools/networking/dnsproxy/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "dnsproxy"; - version = "0.43.0"; + version = "0.43.1"; src = fetchFromGitHub { owner = "AdguardTeam"; repo = pname; rev = "v${version}"; - sha256 = "sha256-rhhfXdtPxNnHqMgkLfm9ZMXWbKHMAPnFzeyMxt3LbeA="; + sha256 = "sha256-q+MLFdZTn14FhJ+gV3j5gVusL19lR7Cpd1BGxGvi848="; }; vendorSha256 = null; diff --git a/pkgs/tools/package-management/dpkg/default.nix b/pkgs/tools/package-management/dpkg/default.nix index ad55c6b88b47..f92a7b23280f 100644 --- a/pkgs/tools/package-management/dpkg/default.nix +++ b/pkgs/tools/package-management/dpkg/default.nix @@ -4,11 +4,11 @@ stdenv.mkDerivation rec { pname = "dpkg"; - version = "1.20.9ubuntu2"; + version = "1.21.1ubuntu2.1"; src = fetchurl { url = "mirror://ubuntu/pool/main/d/dpkg/dpkg_${version}.tar.xz"; - sha256 = "sha256-BuCofGpi9R0cyhvkZqu9IxupqZvZhbE2J/B4wgUqMQw="; + sha256 = "sha256-YvVQbQn2MhOIOE43VO0H1QsKIYCsjNAFzKMoFeSrqZk="; }; configureFlags = [ diff --git a/pkgs/tools/package-management/smlpkg/default.nix b/pkgs/tools/package-management/smlpkg/default.nix index f3f7750f1bdd..b92ced4842a0 100644 --- a/pkgs/tools/package-management/smlpkg/default.nix +++ b/pkgs/tools/package-management/smlpkg/default.nix @@ -37,6 +37,7 @@ stdenv.mkDerivation rec { description = "Generic package manager for Standard ML libraries and programs"; homepage = "https://github.com/diku-dk/smlpkg"; license = licenses.mit; + platforms = mlton.meta.platforms; maintainers = with maintainers; [ athas ]; }; } diff --git a/pkgs/tools/security/decoder/default.nix b/pkgs/tools/security/decoder/default.nix index baaacac5da8a..76dd3003d500 100644 --- a/pkgs/tools/security/decoder/default.nix +++ b/pkgs/tools/security/decoder/default.nix @@ -1,6 +1,7 @@ { lib , stdenv , fetchFromGitHub +, fetchpatch , openssl }: @@ -15,6 +16,16 @@ stdenv.mkDerivation rec { sha256 = "sha256-1sT1/iwtc2ievmLuNuooy9b14pTs1ZC5noDwzFelk7w="; }; + patches = [ + # Pull fix pending upstream inclusion for -fno-common toolchains: + # https://github.com/PeterPawn/decoder/pull/29 + (fetchpatch { + name = "fno-common.patch"; + url = "https://github.com/PeterPawn/decoder/commit/843ac477c31108023d8008581bf91c5a3acc1859.patch"; + sha256 = "sha256-rRylz8cxgNyPSqL/THdgEBpzcVx1K+xbjUn4PwP9Jn4="; + }) + ]; + buildInputs = [ openssl ]; diff --git a/pkgs/tools/security/kubeaudit/default.nix b/pkgs/tools/security/kubeaudit/default.nix index b6ee9f6dc0e1..2c9d32501ce9 100644 --- a/pkgs/tools/security/kubeaudit/default.nix +++ b/pkgs/tools/security/kubeaudit/default.nix @@ -5,16 +5,16 @@ buildGoModule rec { pname = "kubeaudit"; - version = "0.18.0"; + version = "0.19.0"; src = fetchFromGitHub { owner = "Shopify"; repo = pname; rev = "v${version}"; - hash = "sha256-aMnhEY16SybE5Oavc6stw7xoyNblCwFJpzYHsDBENX4="; + hash = "sha256-exJGjFeqk3hM52Zgfs+2JEVdzVZf79ZRQH2krusiw8c="; }; - vendorSha256 = "sha256-plsnzeRIaJNNzrkzQYtxOqWejTDntPRemIhcfpxXgBg="; + vendorSha256 = "sha256-hi83C05eEXqQ6kMGv6n/fjsYAXveyVRqKZds5iv8Oio="; postInstall = '' mv $out/bin/cmd $out/bin/$pname diff --git a/pkgs/tools/security/kubescape/default.nix b/pkgs/tools/security/kubescape/default.nix index 499d66a43e4e..e8c9aa896e77 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.160"; + version = "2.0.161"; src = fetchFromGitHub { owner = "armosec"; repo = pname; rev = "v${version}"; - hash = "sha256-IQ80AnI+mHdZxqgVuZvDLO6LuhLdgRGu6Hyz1kJ2v38="; + hash = "sha256-rsO6ZTQg5fmpp+5Zx36tQnDW1vf2k+FCI3cFbGZifVM="; }; - vendorSha256 = "sha256-x+Sxe4fBhOvE5An0dIqL5q3eEKzNJwugToGZ8NZ5GGA="; + vendorSha256 = "sha256-EinrVdGdYroh0X/ACAVD2gw4k0jrPHQ3Ucb3TUYKd8Q="; nativeBuildInputs = [ installShellFiles diff --git a/pkgs/tools/text/crowdin-cli/default.nix b/pkgs/tools/text/crowdin-cli/default.nix index f79f6670625a..d76d4e3ac949 100644 --- a/pkgs/tools/text/crowdin-cli/default.nix +++ b/pkgs/tools/text/crowdin-cli/default.nix @@ -14,11 +14,11 @@ stdenv.mkDerivation rec { pname = "crowdin-cli"; - version = "3.7.8"; + version = "3.7.9"; src = fetchurl { url = "https://github.com/crowdin/${pname}/releases/download/${version}/${pname}.zip"; - sha256 = "sha256-z9c12KKrh4hV7A92qinNCQGTxZI6IsmJ3Z+3ZcZZljk="; + sha256 = "sha256-goRqj/3BM7DPWlfJH9kgW9JQP1lGWQod6DO8fmcRPqc="; }; nativeBuildInputs = [ installShellFiles makeWrapper unzip ]; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 1489ef9761ee..c05be7583114 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -11856,6 +11856,8 @@ with pkgs; xfstests = callPackage ../tools/misc/xfstests { }; + xprompt = callPackage ../tools/X11/xprompt { }; + xprintidle = callPackage ../tools/X11/xprintidle {}; xprintidle-ng = callPackage ../tools/X11/xprintidle-ng {}; @@ -12579,6 +12581,8 @@ with pkgs; tex = texlive.combined.scheme-full; }; + bun = callPackage ../development/web/bun { }; + cakelisp = callPackage ../development/compilers/cakelisp { }; ciao = callPackage ../development/compilers/ciao { }; @@ -15647,7 +15651,9 @@ with pkgs; cli11 = callPackage ../development/tools/misc/cli11 { }; - datree = callPackage ../development/tools/datree { }; + datree = callPackage ../development/tools/datree { + buildGoModule = buildGo118Module; + }; dcadec = callPackage ../development/tools/dcadec { }; @@ -16738,6 +16744,8 @@ with pkgs; readline = readline81; }; + gf = callPackage ../development/tools/misc/gf { }; + java-language-server = callPackage ../development/tools/java/java-language-server { }; jprofiler = callPackage ../development/tools/java/jprofiler { @@ -31384,6 +31392,8 @@ with pkgs; xnee = callPackage ../tools/X11/xnee { }; + xnotify = callPackage ../tools/X11/xnotify { }; + xvidcap = callPackage ../applications/video/xvidcap { inherit (gnome2) scrollkeeper libglade; }; @@ -34017,6 +34027,8 @@ with pkgs; ngspice = callPackage ../applications/science/electronics/ngspice { }; + nvc = callPackage ../applications/science/electronics/nvc { }; + openems = callPackage ../applications/science/electronics/openems { qcsxcad = libsForQt5.qcsxcad; }; diff --git a/pkgs/top-level/ocaml-packages.nix b/pkgs/top-level/ocaml-packages.nix index bc315c0675b7..55817beb5c87 100644 --- a/pkgs/top-level/ocaml-packages.nix +++ b/pkgs/top-level/ocaml-packages.nix @@ -921,10 +921,6 @@ let netchannel = callPackage ../development/ocaml-modules/netchannel { }; - nocrypto = callPackage ../development/ocaml-modules/nocrypto { }; - - noise = callPackage ../development/ocaml-modules/noise { }; - nonstd = callPackage ../development/ocaml-modules/nonstd { }; notty = callPackage ../development/ocaml-modules/notty { }; diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index df044ef44b38..6f11745db65f 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -771,6 +771,8 @@ in { atomicwrites = callPackage ../development/python-modules/atomicwrites { }; + atomicwrites-homeassistant = callPackage ../development/python-modules/atomicwrites-homeassistant { }; + atomman = callPackage ../development/python-modules/atomman { }; atpublic = callPackage ../development/python-modules/atpublic { }; @@ -9417,6 +9419,8 @@ in { rstcheck = callPackage ../development/python-modules/rstcheck { }; + rstcheck-core = callPackage ../development/python-modules/rstcheck-core { }; + rtmidi-python = callPackage ../development/python-modules/rtmidi-python { inherit (pkgs.darwin.apple_sdk.frameworks) CoreAudio CoreMIDI CoreServices; };