diff options
758 files changed, 4731 insertions, 5525 deletions
diff --git a/doc/stdenv/stdenv.chapter.md b/doc/stdenv/stdenv.chapter.md index 4daeaf7c8c2..7219b5e80f7 100644 --- a/doc/stdenv/stdenv.chapter.md +++ b/doc/stdenv/stdenv.chapter.md @@ -463,6 +463,12 @@ The prefix under which the package must be installed, passed via the `--prefix` The key to use when specifying the prefix. By default, this is set to `--prefix=` as that is used by the majority of packages. +##### `dontAddStaticConfigureFlags` + +By default, when building statically, stdenv will try to add build system appropriate configure flags to try to enable static builds. + +If this is undesirable, set this variable to true. + ##### `dontAddDisableDepTrack` {#var-stdenv-dontAddDisableDepTrack} By default, the flag `--disable-dependency-tracking` is added to the configure flags to speed up Automake-based builds. If this is undesirable, set this variable to true. @@ -475,7 +481,7 @@ By default, the configure phase applies some special hackery to all files called By default, when the configure script has `--enable-static`, the option `--disable-static` is added to the configure flags. -If this is undesirable, set this variable to true. +If this is undesirable, set this variable to true. It is automatically set to true when building statically, for example through `pkgsStatic`. ##### `configurePlatforms` {#var-stdenv-configurePlatforms} diff --git a/lib/systems/doubles.nix b/lib/systems/doubles.nix index c6d90ba9850..61ba7dad7cc 100644 --- a/lib/systems/doubles.nix +++ b/lib/systems/doubles.nix @@ -96,5 +96,5 @@ in { embedded = filterDoubles predicates.isNone; - mesaPlatforms = ["i686-linux" "x86_64-linux" "x86_64-darwin" "armv5tel-linux" "armv6l-linux" "armv7l-linux" "armv7a-linux" "aarch64-linux" "powerpc64-linux" "powerpc64le-linux" "aarch64-darwin"]; + mesaPlatforms = ["i686-linux" "x86_64-linux" "x86_64-darwin" "armv5tel-linux" "armv6l-linux" "armv7l-linux" "armv7a-linux" "aarch64-linux" "powerpc64-linux" "powerpc64le-linux" "aarch64-darwin" "riscv64-linux"]; } diff --git a/nixos/lib/make-disk-image.nix b/nixos/lib/make-disk-image.nix index 7d40d3b5548..55643facea0 100644 --- a/nixos/lib/make-disk-image.nix +++ b/nixos/lib/make-disk-image.nix @@ -278,7 +278,7 @@ let format' = format; in let additionalSpace=$(( $(numfmt --from=iec '${additionalSpace}') + reservedSpace )) # Compute required space in filesystem blocks - diskUsage=$(find . ! -type d -exec 'du' '--apparent-size' '--block-size' "${blockSize}" '{}' ';' | cut -f1 | sum_lines) + diskUsage=$(find . ! -type d -print0 | du --files0-from=- --apparent-size --block-size "${blockSize}" | cut -f1 | sum_lines) # Each inode takes space! numInodes=$(find . | wc -l) # Convert to bytes, inodes take two blocks each! diff --git a/nixos/modules/hardware/system-76.nix b/nixos/modules/hardware/system-76.nix index 3a50c5aa0f0..d4896541dba 100644 --- a/nixos/modules/hardware/system-76.nix +++ b/nixos/modules/hardware/system-76.nix @@ -35,7 +35,7 @@ let }; }; - power-pkg = pkgs.system76-power; + power-pkg = config.boot.kernelPackages.system76-power; powerConfig = mkIf cfg.power-daemon.enable { # Make system76-power usable by root from the command line. environment.systemPackages = [ power-pkg ]; diff --git a/nixos/modules/module-list.nix b/nixos/modules/module-list.nix index 8a96b42c556..84620ba3eb2 100644 --- a/nixos/modules/module-list.nix +++ b/nixos/modules/module-list.nix @@ -697,6 +697,7 @@ ./services/networking/gdomap.nix ./services/networking/ghostunnel.nix ./services/networking/git-daemon.nix + ./services/networking/globalprotect-vpn.nix ./services/networking/gnunet.nix ./services/networking/go-neb.nix ./services/networking/go-shadowsocks2.nix diff --git a/nixos/modules/security/pam.nix b/nixos/modules/security/pam.nix index 3cde7e95155..5699025601f 100644 --- a/nixos/modules/security/pam.nix +++ b/nixos/modules/security/pam.nix @@ -397,8 +397,6 @@ let "auth required pam_faillock.so"} ${optionalString (config.security.pam.enableSSHAgentAuth && cfg.sshAgentAuth) "auth sufficient ${pkgs.pam_ssh_agent_auth}/libexec/pam_ssh_agent_auth.so file=${lib.concatStringsSep ":" config.services.openssh.authorizedKeysFiles}"} - ${optionalString cfg.fprintAuth - "auth sufficient ${pkgs.fprintd}/lib/security/pam_fprintd.so"} ${let p11 = config.security.pam.p11; in optionalString cfg.p11Auth "auth ${p11.control} ${pkgs.pam_p11}/lib/security/pam_p11.so ${pkgs.opensc}/lib/opensc-pkcs11.so"} ${let u2f = config.security.pam.u2f; in optionalString cfg.u2fAuth @@ -409,6 +407,8 @@ let "auth requisite ${pkgs.oathToolkit}/lib/security/pam_oath.so window=${toString oath.window} usersfile=${toString oath.usersFile} digits=${toString oath.digits}"} ${let yubi = config.security.pam.yubico; in optionalString cfg.yubicoAuth "auth ${yubi.control} ${pkgs.yubico-pam}/lib/security/pam_yubico.so mode=${toString yubi.mode} ${optionalString (yubi.mode == "client") "id=${toString yubi.id}"} ${optionalString yubi.debug "debug"}"} + ${optionalString cfg.fprintAuth + "auth sufficient ${pkgs.fprintd}/lib/security/pam_fprintd.so"} '' + # Modules in this block require having the password set in PAM_AUTHTOK. # pam_unix is marked as 'sufficient' on NixOS which means nothing will run diff --git a/nixos/modules/services/databases/redis.nix b/nixos/modules/services/databases/redis.nix index c4d51958e23..9c0740f28c9 100644 --- a/nixos/modules/services/databases/redis.nix +++ b/nixos/modules/services/databases/redis.nix @@ -52,7 +52,7 @@ in { }; port = mkOption { - type = types.int; + type = types.port; default = 6379; description = "The port for Redis to listen to."; }; diff --git a/nixos/modules/services/games/terraria.nix b/nixos/modules/services/games/terraria.nix index 9e8e5ae8759..7312c7e6b63 100644 --- a/nixos/modules/services/games/terraria.nix +++ b/nixos/modules/services/games/terraria.nix @@ -42,7 +42,7 @@ in }; port = mkOption { - type = types.int; + type = types.port; default = 7777; description = '' Specifies the port to listen on. @@ -50,7 +50,7 @@ in }; maxPlayers = mkOption { - type = types.int; + type = types.ints.u8; default = 255; description = '' Sets the max number of players (between 1 and 255). diff --git a/nixos/modules/services/misc/gitlab.nix b/nixos/modules/services/misc/gitlab.nix index d5b328afc6c..237c20e4b7f 100644 --- a/nixos/modules/services/misc/gitlab.nix +++ b/nixos/modules/services/misc/gitlab.nix @@ -462,7 +462,7 @@ in { }; port = mkOption { - type = types.int; + type = types.port; default = 8080; description = '' GitLab server port for copy-paste URLs, e.g. 80 or 443 if you're diff --git a/nixos/modules/services/misc/matrix-synapse.nix b/nixos/modules/services/misc/matrix-synapse.nix index eedb44fbe12..3c734a94819 100644 --- a/nixos/modules/services/misc/matrix-synapse.nix +++ b/nixos/modules/services/misc/matrix-synapse.nix @@ -238,7 +238,7 @@ in { type = types.listOf (types.submodule { options = { port = mkOption { - type = types.int; + type = types.port; example = 8448; description = '' The port to listen for HTTP(S) requests on. diff --git a/nixos/modules/services/networking/firefox/sync-server.nix b/nixos/modules/services/networking/firefox/sync-server.nix index 6842aa73561..24f76864953 100644 --- a/nixos/modules/services/networking/firefox/sync-server.nix +++ b/nixos/modules/services/networking/firefox/sync-server.nix @@ -67,7 +67,7 @@ in }; listen.port = mkOption { - type = types.int; + type = types.port; default = 5000; description = '' Port on which the sync server listen to. diff --git a/nixos/modules/services/networking/git-daemon.nix b/nixos/modules/services/networking/git-daemon.nix index 52c895215fb..98f80dd4bc4 100644 --- a/nixos/modules/services/networking/git-daemon.nix +++ b/nixos/modules/services/networking/git-daemon.nix @@ -74,7 +74,7 @@ in }; port = mkOption { - type = types.int; + type = types.port; default = 9418; description = "Port to listen on."; }; diff --git a/nixos/modules/services/networking/globalprotect-vpn.nix b/nixos/modules/services/networking/globalprotect-vpn.nix new file mode 100644 index 00000000000..80183f55d32 --- /dev/null +++ b/nixos/modules/services/networking/globalprotect-vpn.nix @@ -0,0 +1,43 @@ +{ config, lib, pkgs, ... }: + +with lib; + +let + cfg = config.services.globalprotect; + + execStart = if cfg.csdWrapper == null then + "${pkgs.globalprotect-openconnect}/bin/gpservice" + else + "${pkgs.globalprotect-openconnect}/bin/gpservice --csd-wrapper=${cfg.csdWrapper}"; +in + +{ + options.services.globalprotect = { + enable = mkEnableOption "globalprotect"; + + csdWrapper = mkOption { + description = '' + A script that will produce a Host Integrity Protection (HIP) report, + as described at <link xlink:href="https://www.infradead.org/openconnect/hip.html" /> + ''; + default = null; + example = literalExample "\${pkgs.openconnect}/libexec/openconnect/hipreport.sh"; + type = types.nullOr types.path; + }; + }; + + config = { + services.dbus.packages = [ pkgs.globalprotect-openconnect ]; + + systemd.services.gpservice = { + description = "GlobalProtect openconnect DBus service"; + serviceConfig = { + Type="dbus"; + BusName="com.yuezk.qt.GPService"; + ExecStart=execStart; + }; + wantedBy = [ "multi-user.target" ]; + after = [ "network.target" ]; + }; + }; +} diff --git a/nixos/modules/services/networking/go-neb.nix b/nixos/modules/services/networking/go-neb.nix index 991ae38f30a..765834fad83 100644 --- a/nixos/modules/services/networking/go-neb.nix +++ b/nixos/modules/services/networking/go-neb.nix @@ -5,7 +5,8 @@ with lib; let cfg = config.services.go-neb; - configFile = pkgs.writeText "config.yml" (builtins.toJSON cfg.config); + settingsFormat = pkgs.formats.yaml {}; + configFile = settingsFormat.generate "config.yaml" cfg.config; in { options.services.go-neb = { enable = mkEnableOption "Extensible matrix bot written in Go"; @@ -16,13 +17,26 @@ in { default = ":4050"; }; + secretFile = mkOption { + type = types.nullOr types.path; + default = null; + example = "/run/keys/go-neb.env"; + description = '' + Environment variables from this file will be interpolated into the + final config file using envsubst with this syntax: <literal>$ENVIRONMENT</literal> + or <literal>''${VARIABLE}</literal>. + The file should contain lines formatted as <literal>SECRET_VAR=SECRET_VALUE</literal>. + This is useful to avoid putting secrets into the nix store. + ''; + }; + baseUrl = mkOption { type = types.str; description = "Public-facing endpoint that can receive webhooks."; }; config = mkOption { - type = types.uniq types.attrs; + inherit (settingsFormat) type; description = '' Your <filename>config.yaml</filename> as a Nix attribute set. See <link xlink:href="https://github.com/matrix-org/go-neb/blob/master/config.sample.yaml">config.sample.yaml</link> @@ -32,18 +46,30 @@ in { }; config = mkIf cfg.enable { - systemd.services.go-neb = { + systemd.services.go-neb = let + finalConfigFile = if cfg.secretFile == null then configFile else "/var/run/go-neb/config.yaml"; + in { description = "Extensible matrix bot written in Go"; after = [ "network.target" ]; wantedBy = [ "multi-user.target" ]; environment = { BASE_URL = cfg.baseUrl; BIND_ADDRESS = cfg.bindAddress; - CONFIG_FILE = configFile; + CONFIG_FILE = finalConfigFile; }; serviceConfig = { + ExecStartPre = lib.optional (cfg.secretFile != null) + (pkgs.writeShellScript "pre-start" '' + umask 077 + export $(xargs < ${cfg.secretFile}) + ${pkgs.envsubst}/bin/envsubst -i "${configFile}" > ${finalConfigFile} + chown go-neb ${finalConfigFile} + ''); + PermissionsStartOnly = true; + RuntimeDirectory = "go-neb"; ExecStart = "${pkgs.go-neb}/bin/go-neb"; + User = "go-neb"; DynamicUser = true; }; }; diff --git a/nixos/modules/services/networking/monero.nix b/nixos/modules/services/networking/monero.nix index 952d1d47ca6..9a9084e4ce1 100644 --- a/nixos/modules/services/networking/monero.nix +++ b/nixos/modules/services/networking/monero.nix @@ -110,7 +110,7 @@ in }; rpc.port = mkOption { - type = types.int; + type = types.port; default = 18081; description = '' Port the RPC server will bind to. diff --git a/nixos/modules/services/web-apps/discourse.nix b/nixos/modules/services/web-apps/discourse.nix index 49958fc6190..9c7166f381a 100644 --- a/nixos/modules/services/web-apps/discourse.nix +++ b/nixos/modules/services/web-apps/discourse.nix @@ -356,7 +356,7 @@ in }; port = lib.mkOption { - type = lib.types.int; + type = lib.types.port; default = 25; description = '' The port of the SMTP server Discourse should use to diff --git a/nixos/modules/services/web-servers/darkhttpd.nix b/nixos/modules/services/web-servers/darkhttpd.nix index d6649fd472d..f6b693139a1 100644 --- a/nixos/modules/services/web-servers/darkhttpd.nix +++ b/nixos/modules/services/web-servers/darkhttpd.nix @@ -19,7 +19,7 @@ in { port = mkOption { default = 80; - type = ints.u16; + type = types.port; description = '' Port to listen on. Pass 0 to let the system choose any free port for you. diff --git a/nixos/modules/services/web-servers/lighttpd/default.nix b/nixos/modules/services/web-servers/lighttpd/default.nix index d1cb8a8dc25..7a691aa7891 100644 --- a/nixos/modules/services/web-servers/lighttpd/default.nix +++ b/nixos/modules/services/web-servers/lighttpd/default.nix @@ -134,7 +134,7 @@ in port = mkOption { default = 80; - type = types.int; + type = types.port; description = '' TCP port number for lighttpd to bind to. ''; diff --git a/nixos/tests/all-tests.nix b/nixos/tests/all-tests.nix index a8e06a0cee1..b5126be8af7 100644 --- a/nixos/tests/all-tests.nix +++ b/nixos/tests/all-tests.nix @@ -201,6 +201,7 @@ in jitsi-meet = handleTest ./jitsi-meet.nix {}; k3s = handleTest ./k3s.nix {}; kafka = handleTest ./kafka.nix {}; + kbd-setfont-decompress = handleTest ./kbd-setfont-decompress.nix {}; keepalived = handleTest ./keepalived.nix {}; keepassxc = handleTest ./keepassxc.nix {}; kerberos = handleTest ./kerberos/default.nix {}; diff --git a/nixos/tests/go-neb.nix b/nixos/tests/go-neb.nix index f8801ff68d6..4bd03dcf3c6 100644 --- a/nixos/tests/go-neb.nix +++ b/nixos/tests/go-neb.nix @@ -10,10 +10,11 @@ import ./make-test-python.nix ({ pkgs, ... }: services.go-neb = { enable = true; baseUrl = "http://localhost"; + secretFile = pkgs.writeText "secrets" "ACCESS_TOKEN=changeme"; config = { clients = [ { UserId = "@test:localhost"; - AccessToken = "changeme"; + AccessToken = "$ACCESS_TOKEN"; HomeServerUrl = "http://localhost"; Sync = false; AutoJoinRooms = false; @@ -33,11 +34,10 @@ import ./make-test-python.nix ({ pkgs, ... }: testScript = '' start_all() server.wait_for_unit("go-neb.service") - server.wait_until_succeeds( - "curl -fL http://localhost:4050/services/hooks/d2lraXBlZGlhX3NlcnZpY2U" - ) - server.wait_until_succeeds( - "journalctl -eu go-neb -o cat | grep -q service_id=wikipedia_service" + server.wait_until_succeeds("curl -fL http://localhost:4050/services/hooks/d2lraXBlZGlhX3NlcnZpY2U") + server.succeed( + "journalctl -eu go-neb -o cat | grep -q service_id=wikipedia_service", + "grep -q changeme /var/run/go-neb/config.yaml", ) ''; diff --git a/nixos/tests/kbd-setfont-decompress.nix b/nixos/tests/kbd-setfont-decompress.nix new file mode 100644 index 00000000000..c3a495afac8 --- /dev/null +++ b/nixos/tests/kbd-setfont-decompress.nix @@ -0,0 +1,21 @@ +import ./make-test-python.nix ({ lib, pkgs, ... }: +{ + name = "kbd-setfont-decompress"; + + meta.maintainers = with lib.maintainers; [ oxalica ]; + + machine = { ... }: {}; + + testScript = '' + machine.succeed("gzip -cd ${pkgs.terminus_font}/share/consolefonts/ter-v16b.psf.gz >font.psf") + machine.succeed("gzip <font.psf >font.psf.gz") + machine.succeed("bzip2 <font.psf >font.psf.bz2") + machine.succeed("xz <font.psf >font.psf.xz") + machine.succeed("zstd <font.psf >font.psf.zst") + # setfont returns 0 even on error. + assert machine.succeed("PATH= ${pkgs.kbd}/bin/setfont font.psf.gz 2>&1") == "" + assert machine.succeed("PATH= ${pkgs.kbd}/bin/setfont font.psf.bz2 2>&1") == "" + assert machine.succeed("PATH= ${pkgs.kbd}/bin/setfont font.psf.xz 2>&1") == "" + assert machine.succeed("PATH= ${pkgs.kbd}/bin/setfont font.psf.zst 2>&1") == "" + ''; +}) diff --git a/pkgs/applications/audio/cdparanoia/default.nix b/pkgs/applications/audio/cdparanoia/default.nix index 29359b097d2..11c141e9c55 100644 --- a/pkgs/applications/audio/cdparanoia/default.nix +++ b/pkgs/applications/audio/cdparanoia/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, autoreconfHook, gnu-config, IOKit, Carbon }: +{ lib, stdenv, fetchurl, gnu-config, IOKit, Carbon }: stdenv.mkDerivation rec { name = "cdparanoia-III-10.2"; @@ -20,8 +20,6 @@ stdenv.mkDerivation rec { ] ++ lib.optional stdenv.hostPlatform.isMusl ./utils.patch ++ [./fix_private_keyword.patch]; - nativeBuildInputs = lib.optional stdenv.isAarch64 autoreconfHook; - propagatedBuildInputs = lib.optionals stdenv.isDarwin [ Carbon IOKit @@ -29,7 +27,9 @@ stdenv.mkDerivation rec { hardeningDisable = [ "format" ]; - preConfigure = "unset CC" + lib.optionalString stdenv.isAarch64 ''; + preConfigure = '' + unset CC + '' + lib.optionalString (!stdenv.hostPlatform.isx86) '' cp ${gnu-config}/config.sub configure.sub cp ${gnu-config}/config.guess configure.guess ''; diff --git a/pkgs/applications/audio/jamulus/default.nix b/pkgs/applications/audio/jamulus/default.nix index bf054b118e1..185df48ff6f 100644 --- a/pkgs/applications/audio/jamulus/default.nix +++ b/pkgs/applications/audio/jamulus/default.nix @@ -3,12 +3,12 @@ mkDerivation rec { pname = "jamulus"; - version = "3.7.0"; + version = "3.8.0"; src = fetchFromGitHub { owner = "jamulussoftware"; repo = "jamulus"; rev = "r${lib.replaceStrings [ "." ] [ "_" ] version}"; - sha256 = "sha256-8zCPT0jo4ExgmZWxGinumv3JauH4csM9DtuHmOiJQAM="; + sha256 = "sha256-Ni6N7XW34OFNuEkqBEgMcYGmIqb+UZ0uhLt/shRkWRs="; }; nativeBuildInputs = [ pkg-config qmake ]; diff --git a/pkgs/applications/audio/whipper/default.nix b/pkgs/applications/audio/whipper/default.nix index e96a6bfef20..d66c161664f 100644 --- a/pkgs/applications/audio/whipper/default.nix +++ b/pkgs/applications/audio/whipper/default.nix @@ -1,6 +1,7 @@ { lib , python3 , fetchFromGitHub +, fetchpatch , libcdio-paranoia , cdrdao , libsndfile @@ -22,6 +23,15 @@ in python3.pkgs.buildPythonApplication rec { sha256 = "00cq03cy5dyghmibsdsq5sdqv3bzkzhshsng74bpnb5lasxp3ia5"; }; + patches = [ + (fetchpatch { + # Use custom YAML subclass to be compatible with ruamel_yaml>=0.17 + # https://github.com/whipper-team/whipper/pull/543 + url = "https://github.com/whipper-team/whipper/commit/3ce5964dfe8be1e625c3e3b091360dd0bc34a384.patch"; + sha256 = "0n9dmib884y8syvypsg88j0h71iy42n1qsrh0am8pwna63sl15ah"; + }) + ]; + nativeBuildInputs = with python3.pkgs; [ setuptools-scm docutils diff --git a/pkgs/applications/editors/neovim/neovide/Cargo.lock b/pkgs/applications/editors/neovim/neovide/Cargo.lock deleted file mode 100644 index 4e37d0fbfa1..00000000000 --- a/pkgs/applications/editors/neovim/neovide/Cargo.lock +++ /dev/null @@ -1,3292 +0,0 @@ -# This file is automatically @generated by Cargo. -# It is not intended for manual editing. -version = 3 - -[[package]] -name = "ab_glyph_rasterizer" -version = "0.1.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d9fe5e32de01730eb1f6b7f5b51c17e03e2325bf40a74f754f04f130043affff" - -[[package]] -name = "adler" -version = "1.0.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f26201604c87b1e01bd3d98f8d5d9a8fcbb815e8cedb41ffccbeb4bf593a35fe" - -[[package]] -name = "adler32" -version = "1.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "aae1277d39aeec15cb388266ecc24b11c80469deae6067e17a1a7aa9e5c1f234" - -[[package]] -name = "ahash" -version = "0.2.19" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "29661b60bec623f0586702976ff4d0c9942dcb6723161c2df0eea78455cfedfb" -dependencies = [ - "const-random", -] - -[[package]] -name = "aho-corasick" -version = "0.7.18" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1e37cfd5e7657ada45f742d6e99ca5788580b5c529dc78faf11ece6dc702656f" -dependencies = [ - "memchr", -] - -[[package]] -name = "andrew" -version = "0.2.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9b7f09f89872c2b6b29e319377b1fbe91c6f5947df19a25596e121cf19a7b35e" -dependencies = [ - "bitflags", - "line_drawing", - "rusttype 0.7.9", - "walkdir", - "xdg", - "xml-rs", -] - -[[package]] -name = "andrew" -version = "0.3.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8c4afb09dd642feec8408e33f92f3ffc4052946f6b20f32fb99c1f58cd4fa7cf" -dependencies = [ - "bitflags", - "rusttype 0.9.2", - "walkdir", - "xdg", - "xml-rs", -] - -[[package]] -name = "android_log-sys" -version = "0.1.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b8052e2d8aabbb8d556d6abbcce2a22b9590996c5f849b9c7ce4544a2e3b984e" - -[[package]] -name = "ansi_term" -version = "0.11.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ee49baf6cb617b853aa8d93bf420db2383fab46d314482ca2803b40d5fde979b" -dependencies = [ - "winapi 0.3.9", -] - -[[package]] -name = "anyhow" -version = "1.0.40" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "28b2cd92db5cbd74e8e5028f7e27dd7aa3090e89e4f2a197cc7c8dfb69c7063b" - -[[package]] -name = "approx" -version = "0.3.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f0e60b75072ecd4168020818c0107f2857bb6c4e64252d8d3983f6263b40a5c3" -dependencies = [ - "num-traits", -] - -[[package]] -name = "ash" -version = "0.31.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c69a8137596e84c22d57f3da1b5de1d4230b1742a710091c85f4d7ce50f00f38" -dependencies = [ - "libloading 0.6.7", -] - -[[package]] -name = "ash-window" -version = "0.5.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "905c4ca25f752e7ab3c3e8f2882625f876e4c3ea5feffbc83f81d697e043afd6" -dependencies = [ - "ash", - "raw-window-handle", - "raw-window-metal", -] - -[[package]] -name = "async-trait" -version = "0.1.50" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0b98e84bbb4cbcdd97da190ba0c58a1bb0de2c1fdf67d159e192ed766aeca722" -dependencies = [ - "proc-macro2 1.0.26", - "quote 1.0.9", - "syn 1.0.72", -] - -[[package]] -name = "atty" -version = "0.2.14" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d9b39be18770d11421cdb1b9947a45dd3f37e93092cbf377614828a319d5fee8" -dependencies = [ - "hermit-abi", - "libc", - "winapi 0.3.9", -] - -[[package]] -name = "autocfg" -version = "0.1.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1d49d90015b3c36167a20fe2810c5cd875ad504b39cff3d4eae7977e6b7c1cb2" - -[[package]] -name = "autocfg" -version = "1.0.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cdb031dd78e28731d87d56cc8ffef4a8f36ca26c38fe2de700543e627f8a464a" - -[[package]] -name = "bindgen" -version = "0.55.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "75b13ce559e6433d360c26305643803cb52cfbabbc2b9c47ce04a58493dfb443" -dependencies = [ - "bitflags", - "cexpr", - "cfg-if 0.1.10", - "clang-sys", - "clap", - "env_logger", - "lazy_static", - "lazycell", - "log", - "peeking_take_while", - "proc-macro2 1.0.26", - "quote 1.0.9", - "regex", - "rustc-hash", - "shlex", - "which 3.1.1", -] - -[[package]] -name = "bitflags" -version = "1.2.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cf1de2fe8c75bc145a2f577add951f8134889b4795d47466a54a5c846d691693" - -[[package]] -name = "block" -version = "0.1.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0d8c1fef690941d3e7788d328517591fecc684c084084702d6ff1641e993699a" - -[[package]] -name = "byteorder" -version = "1.4.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "14c189c53d098945499cdfa7ecc63567cf3886b3332b312a5b4585d8d3a6a610" - -[[package]] -name = "bytes" -version = "0.4.12" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "206fdffcfa2df7cbe15601ef46c813fce0965eb3286db6b56c583b814b51c81c" -dependencies = [ - "byteorder", - "iovec", -] - -[[package]] -name = "bytes" -version = "0.5.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0e4cec68f03f32e44924783795810fa50a7035d8c8ebe78580ad7e6c703fba38" - -[[package]] -name = "calloop" -version = "0.4.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7aa2097be53a00de9e8fc349fea6d76221f398f5c4fa550d420669906962d160" -dependencies = [ - "mio", - "mio-extras", - "nix 0.14.1", -] - -[[package]] -name = "calloop" -version = "0.6.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0b036167e76041694579972c28cf4877b4f92da222560ddb49008937b6a6727c" -dependencies = [ - "log", - "nix 0.18.0", -] - -[[package]] -name = "cargo-husky" -version = "1.5.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7b02b629252fe8ef6460461409564e2c21d0c8e77e0944f3d189ff06c4e932ad" - -[[package]] -name = "cc" -version = "1.0.67" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e3c69b077ad434294d3ce9f1f6143a2a4b89a8a2d54ef813d85003a4fd1137fd" - -[[package]] -name = "cexpr" -version = "0.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f4aedb84272dbe89af497cf81375129abda4fc0a9e7c5d317498c15cc30c0d27" -dependencies = [ - "nom 5.1.2", -] - -[[package]] -name = "cfg-if" -version = "0.1.10" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4785bdd1c96b2a846b2bd7cc02e86b6b3dbf14e7e53446c4f54c92a361040822" - -[[package]] -name = "cfg-if" -version = "1.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd" - -[[package]] -name = "chrono" -version = "0.4.19" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "670ad68c9088c2a963aaa298cb369688cf3f9465ce5e2d4ca10e6e0098a1ce73" -dependencies = [ - "libc", - "num-integer", - "num-traits", - "time", - "winapi 0.3.9", -] - -[[package]] -name = "clang-sys" -version = "1.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "853eda514c284c2287f4bf20ae614f8781f40a81d32ecda6e91449304dfe077c" -dependencies = [ - "glob", - "libc", - "libloading 0.7.0", -] - -[[package]] -name = "clap" -version = "2.33.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "37e58ac78573c40708d45522f0d80fa2f01cc4f9b4e2bf749807255454312002" -dependencies = [ - "ansi_term", - "atty", - "bitflags", - "strsim 0.8.0", - "textwrap", - "unicode-width", - "vec_map", -] - -[[package]] -name = "cloudabi" -version = "0.0.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ddfc5b9aa5d4507acaf872de71051dfd0e309860e88966e1051e462a077aac4f" -dependencies = [ - "bitflags", -] - -[[package]] -name = "cmake" -version = "0.1.45" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "eb6210b637171dfba4cda12e579ac6dc73f5165ad56133e5d72ef3131f320855" -dependencies = [ - "cc", -] - -[[package]] -name = "cocoa" -version = "0.20.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0c49e86fc36d5704151f5996b7b3795385f50ce09e3be0f47a0cfde869681cf8" -dependencies = [ - "bitflags", - "block", - "core-foundation 0.7.0", - "core-graphics 0.19.2", - "foreign-types", - "libc", - "objc", -] - -[[package]] -name = "cocoa" -version = "0.23.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c54201c07dcf3a5ca33fececb8042aed767ee4bfd5a0235a8ceabcda956044b2" -dependencies = [ - "bitflags", - "block", - "cocoa-foundation", - "core-foundation 0.9.1", - "core-graphics 0.22.2", - "foreign-types", - "libc", - "objc", -] - -[[package]] -name = "cocoa" -version = "0.24.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6f63902e9223530efb4e26ccd0cf55ec30d592d3b42e21a28defc42a9586e832" -dependencies = [ - "bitflags", - "block", - "cocoa-foundation", - "core-foundation 0.9.1", - "core-graphics 0.22.2", - "foreign-types", - "libc", - "objc", -] - -[[package]] -name = "cocoa-foundation" -version = "0.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7ade49b65d560ca58c403a479bb396592b155c0185eada742ee323d1d68d6318" -dependencies = [ - "bitflags", - "block", - "core-foundation 0.9.1", - "core-graphics-types", - "foreign-types", - "libc", - "objc", -] - -[[package]] -name = "color_quant" -version = "1.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3d7b894f5411737b7867f4827955924d7c254fc9f4d91a6aad6b097804b1018b" - -[[package]] -name = "const-random" -version = "0.1.13" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f590d95d011aa80b063ffe3253422ed5aa462af4e9867d43ce8337562bac77c4" -dependencies = [ - "const-random-macro", - "proc-macro-hack", -] - -[[package]] -name = "const-random-macro" -version = "0.1.13" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "615f6e27d000a2bffbc7f2f6a8669179378fa27ee4d0a509e985dfc0a7defb40" -dependencies = [ - "getrandom 0.2.2", - "lazy_static", - "proc-macro-hack", - "tiny-keccak", -] - -[[package]] -name = "core-foundation" -version = "0.7.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "57d24c7a13c43e870e37c1556b74555437870a04514f7685f5b354e090567171" -dependencies = [ - "core-foundation-sys 0.7.0", - "libc", -] - -[[package]] -name = "core-foundation" -version = "0.9.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0a89e2ae426ea83155dccf10c0fa6b1463ef6d5fcb44cee0b224a408fa640a62" -dependencies = [ - "core-foundation-sys 0.8.2", - "libc", -] - -[[package]] -name = "core-foundation-sys" -version = "0.7.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b3a71ab494c0b5b860bdc8407ae08978052417070c2ced38573a9157ad75b8ac" - -[[package]] -name = "core-foundation-sys" -version = "0.8.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ea221b5284a47e40033bf9b66f35f984ec0ea2931eb03505246cd27a963f981b" - -[[package]] -name = "core-graphics" -version = "0.19.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b3889374e6ea6ab25dba90bb5d96202f61108058361f6dc72e8b03e6f8bbe923" -dependencies = [ - "bitflags", - "core-foundation 0.7.0", - "foreign-types", - "libc", -] - -[[package]] -name = "core-graphics" -version = "0.22.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "269f35f69b542b80e736a20a89a05215c0ce80c2c03c514abb2e318b78379d86" -dependencies = [ - "bitflags", - "core-foundation 0.9.1", - "core-graphics-types", - "foreign-types", - "libc", -] - -[[package]] -name = "core-graphics-types" -version = "0.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3a68b68b3446082644c91ac778bf50cd4104bfb002b5a6a7c44cca5a2c70788b" -dependencies = [ - "bitflags", - "core-foundation 0.9.1", - "foreign-types", - "libc", -] - -[[package]] -name = "core-text" -version = "19.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "99d74ada66e07c1cefa18f8abfba765b486f250de2e4a999e5727fc0dd4b4a25" -dependencies = [ - "core-foundation 0.9.1", - "core-graphics 0.22.2", - "foreign-types", - "libc", -] - -[[package]] -name = "core-video-sys" -version = "0.1.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "34ecad23610ad9757664d644e369246edde1803fcb43ed72876565098a5d3828" -dependencies = [ - "cfg-if 0.1.10", - "core-foundation-sys 0.7.0", - "core-graphics 0.19.2", - "libc", - "objc", -] - -[[package]] -name = "crc32fast" -version = "1.2.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "81156fece84ab6a9f2afdb109ce3ae577e42b1228441eded99bd77f627953b1a" -dependencies = [ - "cfg-if 1.0.0", -] - -[[package]] -name = "crossbeam" -version = "0.7.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "69323bff1fb41c635347b8ead484a5ca6c3f11914d784170b158d8449ab07f8e" -dependencies = [ - "cfg-if 0.1.10", - "crossbeam-channel 0.4.4", - "crossbeam-deque 0.7.3", - "crossbeam-epoch 0.8.2", - "crossbeam-queue", - "crossbeam-utils 0.7.2", -] - -[[package]] -name = "crossbeam-channel" -version = "0.4.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b153fe7cbef478c567df0f972e02e6d736db11affe43dfc9c56a9374d1adfb87" -dependencies = [ - "crossbeam-utils 0.7.2", - "maybe-uninit", -] - -[[package]] -name = "crossbeam-channel" -version = "0.5.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "06ed27e177f16d65f0f0c22a213e17c696ace5dd64b14258b52f9417ccb52db4" -dependencies = [ - "cfg-if 1.0.0", - "crossbeam-utils 0.8.4", -] - -[[package]] -name = "crossbeam-deque" -version = "0.7.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9f02af974daeee82218205558e51ec8768b48cf524bd01d550abe5573a608285" -dependencies = [ - "crossbeam-epoch 0.8.2", - "crossbeam-utils 0.7.2", - "maybe-uninit", -] - -[[package]] -name = "crossbeam-deque" -version = "0.8.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "94af6efb46fef72616855b036a624cf27ba656ffc9be1b9a3c931cfc7749a9a9" -dependencies = [ - "cfg-if 1.0.0", - "crossbeam-epoch 0.9.4", - "crossbeam-utils 0.8.4", -] - -[[package]] -name = "crossbeam-epoch" -version = "0.8.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "058ed274caafc1f60c4997b5fc07bf7dc7cca454af7c6e81edffe5f33f70dace" -dependencies = [ - "autocfg 1.0.1", - "cfg-if 0.1.10", - "crossbeam-utils 0.7.2", - "lazy_static", - "maybe-uninit", - "memoffset 0.5.6", - "scopeguard", -] - -[[package]] -name = "crossbeam-epoch" -version = "0.9.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "52fb27eab85b17fbb9f6fd667089e07d6a2eb8743d02639ee7f6a7a7729c9c94" -dependencies = [ - "cfg-if 1.0.0", - "crossbeam-utils 0.8.4", - "lazy_static", - "memoffset 0.6.3", - "scopeguard", -] - -[[package]] -name = "crossbeam-queue" -version = "0.2.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "774ba60a54c213d409d5353bda12d49cd68d14e45036a285234c8d6f91f92570" -dependencies = [ - "cfg-if 0.1.10", - "crossbeam-utils 0.7.2", - "maybe-uninit", -] - -[[package]] -name = "crossbeam-utils" -version = "0.7.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c3c7c73a2d1e9fc0886a08b93e98eb643461230d5f1925e4036204d5f2e261a8" -dependencies = [ - "autocfg 1.0.1", - "cfg-if 0.1.10", - "lazy_static", -] - -[[package]] -name = "crossbeam-utils" -version = "0.8.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4feb231f0d4d6af81aed15928e58ecf5816aa62a2393e2c82f46973e92a9a278" -dependencies = [ - "autocfg 1.0.1", - "cfg-if 1.0.0", - "lazy_static", -] - -[[package]] -name = "crossfire" -version = "0.1.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8434f61eb40fc72030b18a370f7a06b428d27de66b0281977967216312b14dc7" -dependencies = [ - "async-trait", - "crossbeam", - "futures 0.3.15", -] - -[[package]] -name = "crunchy" -version = "0.2.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7a81dae078cea95a014a339291cec439d2f232ebe854a9d672b796c6afafa9b7" - -[[package]] -name = "curl" -version = "0.4.37" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "adba2012502267c1fdde381e0e3acc44bf8be96b2f7d455089dcc2c8ad2f67bd" -dependencies = [ - "curl-sys", - "libc", - "openssl-probe", - "openssl-sys", - "schannel", - "socket2", - "winapi 0.3.9", -] - -[[package]] -name = "curl-sys" -version = "0.4.43+curl-7.76.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a802c7a9828b7d139efaed1bc92471ab6681ed86d19a105605f5eadcb0837d11" -dependencies = [ - "cc", - "libc", - "libz-sys", - "openssl-sys", - "pkg-config", - "vcpkg", - "winapi 0.3.9", -] - -[[package]] -name = "darling" -version = "0.10.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0d706e75d87e35569db781a9b5e2416cff1236a47ed380831f959382ccd5f858" -dependencies = [ - "darling_core", - "darling_macro", -] - -[[package]] -name = "darling_core" -version = "0.10.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f0c960ae2da4de88a91b2d920c2a7233b400bc33cb28453a2987822d8392519b" -dependencies = [ - "fnv", - "ident_case", - "proc-macro2 1.0.26", - "quote 1.0.9", - "strsim 0.9.3", - "syn 1.0.72", -] - -[[package]] -name = "darling_macro" -version = "0.10.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d9b5a2f4ac4969822c62224815d069952656cadc7084fdca9751e6d959189b72" -dependencies = [ - "darling_core", - "quote 1.0.9", - "syn 1.0.72", -] - -[[package]] -name = "deflate" -version = "0.7.20" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "707b6a7b384888a70c8d2e8650b3e60170dfc6a67bb4aa67b6dfca57af4bedb4" -dependencies = [ - "adler32", - "byteorder", -] - -[[package]] -name = "derivative" -version = "2.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fcc3dd5e9e9c0b295d6e1e4d811fb6f157d5ffd784b8d202fc62eac8035a770b" -dependencies = [ - "proc-macro2 1.0.26", - "quote 1.0.9", - "syn 1.0.72", -] - -[[package]] -name = "derive-new" -version = "0.5.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3418329ca0ad70234b9735dc4ceed10af4df60eff9c8e7b06cb5e520d92c3535" -dependencies = [ - "proc-macro2 1.0.26", - "quote 1.0.9", - "syn 1.0.72", -] - -[[package]] -name = "difference" -version = "2.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "524cbf6897b527295dff137cec09ecf3a05f4fddffd7dfcd1585403449e74198" - -[[package]] -name = "dirs" -version = "2.0.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "13aea89a5c93364a98e9b37b2fa237effbb694d5cfe01c5b70941f7eb087d5e3" -dependencies = [ - "cfg-if 0.1.10", - "dirs-sys", -] - -[[package]] -name = "dirs-sys" -version = "0.3.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "03d86534ed367a67548dc68113a0f5db55432fdfbb6e6f9d77704397d95d5780" -dependencies = [ - "libc", - "redox_users", - "winapi 0.3.9", -] - -[[package]] -name = "dispatch" -version = "0.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bd0c93bb4b0c6d9b77f4435b0ae98c24d17f1c45b2ff844c6151a07256ca923b" - -[[package]] -name = "dlib" -version = "0.4.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b11f15d1e3268f140f68d390637d5e76d849782d971ae7063e0da69fe9709a76" -dependencies = [ - "libloading 0.6.7", -] - -[[package]] -name = "dlib" -version = "0.5.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ac1b7517328c04c2aa68422fc60a41b92208182142ed04a25879c26c8f878794" -dependencies = [ - "libloading 0.7.0", -] - -[[package]] -name = "downcast" -version = "0.10.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4bb454f0228b18c7f4c3b0ebbee346ed9c52e7443b0999cd543ff3571205701d" - -[[package]] -name = "downcast-rs" -version = "1.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9ea835d29036a4087793836fa931b08837ad5e957da9e23886b29586fb9b6650" - -[[package]] -name = "dwrote" -version = "0.11.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "439a1c2ba5611ad3ed731280541d36d2e9c4ac5e7fb818a27b604bdc5a6aa65b" -dependencies = [ - "lazy_static", - "libc", - "winapi 0.3.9", - "wio", -] - -[[package]] -name = "either" -version = "1.6.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e78d4f1cc4ae33bbfc157ed5d5a5ef3bc29227303d595861deb238fcec4e9457" - -[[package]] -name = "encoding_rs" -version = "0.8.28" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "80df024fbc5ac80f87dfef0d9f5209a252f2a497f7f42944cff24d8253cac065" -dependencies = [ - "cfg-if 1.0.0", -] - -[[package]] -name = "env_logger" -version = "0.7.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "44533bbbb3bb3c1fa17d9f2e4e38bbbaf8396ba82193c4cb1b6445d711445d36" -dependencies = [ - "atty", - "humantime", - "log", - "regex", - "termcolor", -] - -[[package]] -name = "euclid" -version = "0.20.14" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2bb7ef65b3777a325d1eeefefab5b6d4959da54747e33bd6258e789640f307ad" -dependencies = [ - "num-traits", -] - -[[package]] -name = "expat-sys" -version = "2.1.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "658f19728920138342f68408b7cf7644d90d4784353d8ebc32e7e8663dbe45fa" -dependencies = [ - "cmake", - "pkg-config", -] - -[[package]] -name = "filetime" -version = "0.2.14" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1d34cfa13a63ae058bfa601fe9e313bbdb3746427c1459185464ce0fcf62e1e8" -dependencies = [ - "cfg-if 1.0.0", - "libc", - "redox_syscall 0.2.8", - "winapi 0.3.9", -] - -[[package]] -name = "flate2" -version = "1.0.20" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cd3aec53de10fe96d7d8c565eb17f2c687bb5518a2ec453b5b1252964526abe0" -dependencies = [ - "cfg-if 1.0.0", - "crc32fast", - "libc", - "miniz_oxide", -] - -[[package]] -name = "flexi_logger" -version = "0.14.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "515fb7f6541dafe542c87c12a7ab6a52190cccb6c348b5951ef62d9978189ae8" -dependencies = [ - "chrono", - "glob", - "log", - "regex", -] - -[[package]] -name = "float-cmp" -version = "0.8.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e1267f4ac4f343772758f7b1bdcbe767c218bbab93bb432acbf5162bbf85a6c4" -dependencies = [ - "num-traits", -] - -[[package]] -name = "float-ord" -version = "0.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7bad48618fdb549078c333a7a8528acb57af271d0433bdecd523eb620628364e" - -[[package]] -name = "fnv" -version = "1.0.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3f9eec918d3f24069decb9af1554cad7c880e2da24a9afd88aca000531ab82c1" - -[[package]] -name = "font-kit" -version = "0.10.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1f9042cb45150fb2b2a012fc03d0f1d2071f18e90397b9d2a5ec8ade8464bf20" -dependencies = [ - "bitflags", - "byteorder", - "core-foundation 0.9.1", - "core-graphics 0.22.2", - "core-text", - "dirs", - "dwrote", - "float-ord", - "freetype", - "lazy_static", - "libc", - "log", - "pathfinder_geometry", - "pathfinder_simd", - "servo-fontconfig", - "walkdir", - "winapi 0.3.9", -] - -[[package]] -name = "foreign-types" -version = "0.3.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f6f339eb8adc052cd2ca78910fda869aefa38d22d5cb648e6485e4d3fc06f3b1" -dependencies = [ - "foreign-types-shared", -] - -[[package]] -name = "foreign-types-shared" -version = "0.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "00b0228411908ca8685dba7fc2cdd70ec9990a6e753e89b6ac91a84c40fbaf4b" - -[[package]] -name = "fragile" -version = "1.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "69a039c3498dc930fe810151a34ba0c1c70b02b8625035592e74432f678591f2" - -[[package]] -name = "freetype" -version = "0.7.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bee38378a9e3db1cc693b4f88d166ae375338a0ff75cb8263e1c601d51f35dc6" -dependencies = [ - "freetype-sys", - "libc", -] - -[[package]] -name = "freetype-sys" -version = "0.13.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a37d4011c0cc628dfa766fcc195454f4b068d7afdc2adfd28861191d866e731a" -dependencies = [ - "cmake", - "libc", - "pkg-config", -] - -[[package]] -name = "fuchsia-zircon" -version = "0.3.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2e9763c69ebaae630ba35f74888db465e49e259ba1bc0eda7d06f4a067615d82" -dependencies = [ - "bitflags", - "fuchsia-zircon-sys", -] - -[[package]] -name = "fuchsia-zircon-sys" -version = "0.3.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3dcaa9ae7725d12cdb85b3ad99a434db70b468c09ded17e012d86b5c1010f7a7" - -[[package]] -name = "futures" -version = "0.1.31" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3a471a38ef8ed83cd6e40aa59c1ffe17db6855c18e3604d9c4ed8c08ebc28678" - -[[package]] -name = "futures" -version = "0.3.15" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0e7e43a803dae2fa37c1f6a8fe121e1f7bf9548b4dfc0522a42f34145dadfc27" -dependencies = [ - "futures-channel", - "futures-core", - "futures-executor", - "futures-io", - "futures-sink", - "futures-task", - "futures-util", -] - -[[package]] -name = "futures-channel" -version = "0.3.15" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e682a68b29a882df0545c143dc3646daefe80ba479bcdede94d5a703de2871e2" -dependencies = [ - "futures-core", - "futures-sink", -] - -[[package]] -name = "futures-core" -version = "0.3.15" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0402f765d8a89a26043b889b26ce3c4679d268fa6bb22cd7c6aad98340e179d1" - -[[package]] -name = "futures-executor" -version = "0.3.15" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "badaa6a909fac9e7236d0620a2f57f7664640c56575b71a7552fbd68deafab79" -dependencies = [ - "futures-core", - "futures-task", - "futures-util", -] - -[[package]] -name = "futures-io" -version = "0.3.15" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "acc499defb3b348f8d8f3f66415835a9131856ff7714bf10dadfc4ec4bdb29a1" - -[[package]] -name = "futures-macro" -version = "0.3.15" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a4c40298486cdf52cc00cd6d6987892ba502c7656a16a4192a9992b1ccedd121" -dependencies = [ - "autocfg 1.0.1", - "proc-macro-hack", - "proc-macro2 1.0.26", - "quote 1.0.9", - "syn 1.0.72", -] - -[[package]] -name = "futures-sink" -version = "0.3.15" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a57bead0ceff0d6dde8f465ecd96c9338121bb7717d3e7b108059531870c4282" - -[[package]] -name = "futures-task" -version = "0.3.15" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8a16bef9fc1a4dddb5bee51c989e3fbba26569cbb0e31f5b303c184e3dd33dae" - -[[package]] -name = "futures-util" -version = "0.3.15" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "feb5c238d27e2bf94ffdfd27b2c29e3df4a68c4193bb6427384259e2bf191967" -dependencies = [ - "autocfg 1.0.1", - "futures 0.1.31", - "futures-channel", - "futures-core", - "futures-io", - "futures-macro", - "futures-sink", - "futures-task", - "memchr", - "pin-project-lite 0.2.6", - "pin-utils", - "proc-macro-hack", - "proc-macro-nested", - "slab", - "tokio-io", -] - -[[package]] -name = "getrandom" -version = "0.1.16" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8fc3cb4d91f53b50155bdcfd23f6a4c39ae1969c2ae85982b135750cccaf5fce" -dependencies = [ - "cfg-if 1.0.0", - "libc", - "wasi 0.9.0+wasi-snapshot-preview1", -] - -[[package]] -name = "getrandom" -version = "0.2.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c9495705279e7140bf035dde1f6e750c162df8b625267cd52cc44e0b156732c8" -dependencies = [ - "cfg-if 1.0.0", - "libc", - "wasi 0.10.2+wasi-snapshot-preview1", -] - -[[package]] -name = "gif" -version = "0.10.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "471d90201b3b223f3451cd4ad53e34295f16a1df17b1edf3736d47761c3981af" -dependencies = [ - "color_quant", - "lzw", -] - -[[package]] -name = "glob" -version = "0.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9b919933a397b79c37e33b77bb2aa3dc8eb6e165ad809e58ff75bc7db2e34574" - -[[package]] -name = "harfbuzz" -version = "0.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "776caa9519beb53f697d578b6777eebd1262265c84ae797620b7f8f9b3648d91" -dependencies = [ - "harfbuzz-sys", -] - -[[package]] -name = "harfbuzz-sys" -version = "0.5.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bf8c27ca13930dc4ffe474880040fe9e0f03c2121600dc9c95423624cab3e467" -dependencies = [ - "cc", - "core-graphics 0.22.2", - "core-text", - "foreign-types", - "freetype", - "pkg-config", -] - -[[package]] -name = "hashbrown" -version = "0.6.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8e6073d0ca812575946eb5f35ff68dbe519907b25c42530389ff946dc84c6ead" -dependencies = [ - "ahash", - "autocfg 0.1.7", -] - -[[package]] -name = "heck" -version = "0.3.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "87cbf45460356b7deeb5e3415b5563308c0a9b057c85e12b06ad551f98d0a6ac" -dependencies = [ - "unicode-segmentation", -] - -[[package]] -name = "hermit-abi" -version = "0.1.18" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "322f4de77956e22ed0e5032c359a0f1273f1f7f0d79bfa3b8ffbc730d7fbcc5c" -dependencies = [ - "libc", -] - -[[package]] -name = "humantime" -version = "1.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "df004cfca50ef23c36850aaaa59ad52cc70d0e90243c3c7737a4dd32dc7a3c4f" -dependencies = [ - "quick-error", -] - -[[package]] -name = "ident_case" -version = "1.0.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b9e0384b61958566e926dc50660321d12159025e767c18e043daf26b70104c39" - -[[package]] -name = "image" -version = "0.22.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "08ed2ada878397b045454ac7cfb011d73132c59f31a955d230bd1f1c2e68eb4a" -dependencies = [ - "byteorder", - "gif", - "jpeg-decoder", - "num-iter", - "num-rational", - "num-traits", - "png", - "scoped_threadpool", - "tiff", -] - -[[package]] -name = "inflate" -version = "0.4.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1cdb29978cc5797bd8dcc8e5bf7de604891df2a8dc576973d71a281e916db2ff" -dependencies = [ - "adler32", -] - -[[package]] -name = "instant" -version = "0.1.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "61124eeebbd69b8190558df225adf7e4caafce0d743919e5d6b19652314ec5ec" -dependencies = [ - "cfg-if 1.0.0", -] - -[[package]] -name = "iovec" -version = "0.1.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b2b3ea6ff95e175473f8ffe6a7eb7c00d054240321b84c57051175fe3c1e075e" -dependencies = [ - "libc", -] - -[[package]] -name = "itoa" -version = "0.4.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dd25036021b0de88a0aff6b850051563c6516d0bf53f8638938edbb9de732736" - -[[package]] -name = "jni-sys" -version = "0.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8eaf4bc02d17cbdd7ff4c7438cafcdf7fb9a4613313ad11b4f8fefe7d3fa0130" - -[[package]] -name = "jpeg-decoder" -version = "0.1.22" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "229d53d58899083193af11e15917b5640cd40b29ff475a1fe4ef725deb02d0f2" -dependencies = [ - "rayon", -] - -[[package]] -name = "kernel32-sys" -version = "0.2.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7507624b29483431c0ba2d82aece8ca6cdba9382bff4ddd0f7490560c056098d" -dependencies = [ - "winapi 0.2.8", - "winapi-build", -] - -[[package]] -name = "lazy_static" -version = "1.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e2abad23fbc42b3700f2f279844dc832adb2b2eb069b2df918f455c4e18cc646" - -[[package]] -name = "lazycell" -version = "1.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "830d08ce1d1d941e6b30645f1a0eb5643013d835ce3779a5fc208261dbe10f55" - -[[package]] -name = "libc" -version = "0.2.94" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "18794a8ad5b29321f790b55d93dfba91e125cb1a9edbd4f8e3150acc771c1a5e" - -[[package]] -name = "libloading" -version = "0.6.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "351a32417a12d5f7e82c368a66781e307834dae04c6ce0cd4456d52989229883" -dependencies = [ - "cfg-if 1.0.0", - "winapi 0.3.9", -] - -[[package]] -name = "libloading" -version = "0.7.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6f84d96438c15fcd6c3f244c8fce01d1e2b9c6b5623e9c711dc9286d8fc92d6a" -dependencies = [ - "cfg-if 1.0.0", - "winapi 0.3.9", -] - -[[package]] -name = "libz-sys" -version = "1.1.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "de5435b8549c16d423ed0c03dbaafe57cf6c3344744f1242520d59c9d8ecec66" -dependencies = [ - "cc", - "libc", - "pkg-config", - "vcpkg", -] - -[[package]] -name = "line_drawing" -version = "0.7.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5cc7ad3d82c845bdb5dde34ffdcc7a5fb4d2996e1e1ee0f19c33bc80e15196b9" -dependencies = [ - "num-traits", -] - -[[package]] -name = "lock_api" -version = "0.3.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c4da24a77a3d8a6d4862d95f72e6fdb9c09a643ecdb402d754004a557f2bec75" -dependencies = [ - "scopeguard", -] - -[[package]] -name = "lock_api" -version = "0.4.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0382880606dff6d15c9476c416d18690b72742aa7b605bb6dd6ec9030fbf07eb" -dependencies = [ - "scopeguard", -] - -[[package]] -name = "log" -version = "0.4.14" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "51b9bbe6c47d51fc3e1a9b945965946b4c44142ab8792c50835a980d362c2710" -dependencies = [ - "cfg-if 1.0.0", -] - -[[package]] -name = "lru" -version = "0.4.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0609345ddee5badacf857d4f547e0e5a2e987db77085c24cd887f73573a04237" -dependencies = [ - "hashbrown", -] - -[[package]] -name = "lzw" -version = "0.10.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7d947cbb889ed21c2a84be6ffbaebf5b4e0f4340638cba0444907e38b56be084" - -[[package]] -name = "malloc_buf" -version = "0.0.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "62bb907fe88d54d8d9ce32a3cceab4218ed2f6b7d35617cafe9adf84e43919cb" -dependencies = [ - "libc", -] - -[[package]] -name = "maybe-uninit" -version = "2.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "60302e4db3a61da70c0cb7991976248362f30319e88850c487b9b95bbf059e00" - -[[package]] -name = "memchr" -version = "2.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b16bd47d9e329435e309c58469fe0791c2d0d1ba96ec0954152a5ae2b04387dc" - -[[package]] -name = "memmap" -version = "0.7.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6585fd95e7bb50d6cc31e20d4cf9afb4e2ba16c5846fc76793f11218da9c475b" -dependencies = [ - "libc", - "winapi 0.3.9", -] - -[[package]] -name = "memmap2" -version = "0.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d9b70ca2a6103ac8b665dc150b142ef0e4e89df640c9e6cf295d189c3caebe5a" -dependencies = [ - "libc", -] - -[[package]] -name = "memoffset" -version = "0.5.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "043175f069eda7b85febe4a74abbaeff828d9f8b448515d3151a14a3542811aa" -dependencies = [ - "autocfg 1.0.1", -] - -[[package]] -name = "memoffset" -version = "0.6.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f83fb6581e8ed1f85fd45c116db8405483899489e38406156c25eb743554361d" -dependencies = [ - "autocfg 1.0.1", -] - -[[package]] -name = "miniz_oxide" -version = "0.4.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a92518e98c078586bc6c934028adcca4c92a53d6a958196de835170a01d84e4b" -dependencies = [ - "adler", - "autocfg 1.0.1", -] - -[[package]] -name = "mio" -version = "0.6.23" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4afd66f5b91bf2a3bc13fad0e21caedac168ca4c707504e75585648ae80e4cc4" -dependencies = [ - "cfg-if 0.1.10", - "fuchsia-zircon", - "fuchsia-zircon-sys", - "iovec", - "kernel32-sys", - "libc", - "log", - "miow 0.2.2", - "net2", - "slab", - "winapi 0.2.8", -] - -[[package]] -name = "mio-extras" -version = "2.0.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "52403fe290012ce777c4626790c8951324a2b9e3316b3143779c72b029742f19" -dependencies = [ - "lazycell", - "log", - "mio", - "slab", -] - -[[package]] -name = "mio-named-pipes" -version = "0.1.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0840c1c50fd55e521b247f949c241c9997709f23bd7f023b9762cd561e935656" -dependencies = [ - "log", - "mio", - "miow 0.3.7", - "winapi 0.3.9", -] - -[[package]] -name = "mio-uds" -version = "0.6.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "afcb699eb26d4332647cc848492bbc15eafb26f08d0304550d5aa1f612e066f0" -dependencies = [ - "iovec", - "libc", - "mio", -] - -[[package]] -name = "miow" -version = "0.2.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ebd808424166322d4a38da87083bfddd3ac4c131334ed55856112eb06d46944d" -dependencies = [ - "kernel32-sys", - "net2", - "winapi 0.2.8", - "ws2_32-sys", -] - -[[package]] -name = "miow" -version = "0.3.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b9f1c5b025cda876f66ef43a113f91ebc9f4ccef34843000e0adf6ebbab84e21" -dependencies = [ - "winapi 0.3.9", -] - -[[package]] -name = "mockall" -version = "0.7.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "01458f8a19b10cb28195290942e3149161c75acf67ebc8fbf714ab67a2b943bc" -dependencies = [ - "cfg-if 0.1.10", - "downcast", - "fragile", - "lazy_static", - "mockall_derive", - "predicates", - "predicates-tree", -] - -[[package]] -name = "mockall_derive" -version = "0.7.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a673cb441f78cd9af4f5919c28576a3cc325fb6b54e42f7047dacce3c718c17b" -dependencies = [ - "cfg-if 0.1.10", - "proc-macro2 1.0.26", - "quote 1.0.9", - "syn 1.0.72", -] - -[[package]] -name = "ndk" -version = "0.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "95a356cafe20aee088789830bfea3a61336e84ded9e545e00d3869ce95dcb80c" -dependencies = [ - "jni-sys", - "ndk-sys 0.1.0", - "num_enum", -] - -[[package]] -name = "ndk" -version = "0.2.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5eb167c1febed0a496639034d0c76b3b74263636045db5489eee52143c246e73" -dependencies = [ - "jni-sys", - "ndk-sys 0.2.1", - "num_enum", - "thiserror", -] - -[[package]] -name = "ndk-glue" -version = "0.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d1730ee2e3de41c3321160a6da815f008c4006d71b095880ea50e17cf52332b8" -dependencies = [ - "android_log-sys", - "lazy_static", - "libc", - "log", - "ndk 0.1.0", - "ndk-sys 0.1.0", -] - -[[package]] -name = "ndk-glue" -version = "0.2.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bdf399b8b7a39c6fb153c4ec32c72fd5fe789df24a647f229c239aa7adb15241" -dependencies = [ - "lazy_static", - "libc", - "log", - "ndk 0.2.1", - "ndk-macro", - "ndk-sys 0.2.1", -] - -[[package]] -name = "ndk-macro" -version = "0.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "05d1c6307dc424d0f65b9b06e94f88248e6305726b14729fd67a5e47b2dc481d" -dependencies = [ - "darling", - "proc-macro-crate", - "proc-macro2 1.0.26", - "quote 1.0.9", - "syn 1.0.72", -] - -[[package]] -name = "ndk-sys" -version = "0.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2b2820aca934aba5ed91c79acc72b6a44048ceacc5d36c035ed4e051f12d887d" - -[[package]] -name = "ndk-sys" -version = "0.2.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c44922cb3dbb1c70b5e5f443d63b64363a898564d739ba5198e3a9138442868d" - -[[package]] -name = "neovide" -version = "0.7.0" -dependencies = [ - "anyhow", - "async-trait", - "cargo-husky", - "cfg-if 0.1.10", - "crossfire", - "derive-new", - "dirs", - "euclid", - "flexi_logger", - "font-kit", - "futures 0.3.15", - "image", - "lazy_static", - "log", - "lru", - "mockall", - "neovide-derive", - "nvim-rs", - "parking_lot 0.10.2", - "pin-project", - "rand", - "rmpv", - "rust-embed", - "sdl2-sys", - "skia-safe", - "skribo", - "skulpin", - "tokio", - "unicode-segmentation", - "which 4.1.0", - "winapi 0.3.9", - "winres", -] - -[[package]] -name = "neovide-derive" -version = "0.1.0" -dependencies = [ - "quote 1.0.9", - "syn 1.0.72", -] - -[[package]] -name = "net2" -version = "0.2.37" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "391630d12b68002ae1e25e8f974306474966550ad82dac6886fb8910c19568ae" -dependencies = [ - "cfg-if 0.1.10", - "libc", - "winapi 0.3.9", -] - -[[package]] -name = "nix" -version = "0.14.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6c722bee1037d430d0f8e687bbdbf222f27cc6e4e68d5caf630857bb2b6dbdce" -dependencies = [ - "bitflags", - "cc", - "cfg-if 0.1.10", - "libc", - "void", -] - -[[package]] -name = "nix" -version = "0.18.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "83450fe6a6142ddd95fb064b746083fc4ef1705fe81f64a64e1d4b39f54a1055" -dependencies = [ - "bitflags", - "cc", - "cfg-if 0.1.10", - "libc", -] - -[[package]] -name = "nix" -version = "0.20.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fa9b4819da1bc61c0ea48b63b7bc8604064dd43013e7cc325df098d49cd7c18a" -dependencies = [ - "bitflags", - "cc", - "cfg-if 1.0.0", - "libc", -] - -[[package]] -name = "nom" -version = "5.1.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ffb4262d26ed83a1c0a33a38fe2bb15797329c85770da05e6b828ddb782627af" -dependencies = [ - "memchr", - "version_check", -] - -[[package]] -name = "nom" -version = "6.1.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e7413f999671bd4745a7b624bd370a569fb6bc574b23c83a3c5ed2e453f3d5e2" -dependencies = [ - "memchr", - "version_check", -] - -[[package]] -name = "normalize-line-endings" -version = "0.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "61807f77802ff30975e01f4f071c8ba10c022052f98b3294119f3e615d13e5be" - -[[package]] -name = "num-derive" -version = "0.2.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "eafd0b45c5537c3ba526f79d3e75120036502bebacbb3f3220914067ce39dbf2" -dependencies = [ - "proc-macro2 0.4.30", - "quote 0.6.13", - "syn 0.15.44", -] - -[[package]] -name = "num-integer" -version = "0.1.44" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d2cc698a63b549a70bc047073d2949cce27cd1c7b0a4a862d08a8031bc2801db" -dependencies = [ - "autocfg 1.0.1", - "num-traits", -] - -[[package]] -name = "num-iter" -version = "0.1.42" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b2021c8337a54d21aca0d59a92577a029af9431cb59b909b03252b9c164fad59" -dependencies = [ - "autocfg 1.0.1", - "num-integer", - "num-traits", -] - -[[package]] -name = "num-rational" -version = "0.2.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5c000134b5dbf44adc5cb772486d335293351644b801551abe8f75c84cfa4aef" -dependencies = [ - "autocfg 1.0.1", - "num-integer", - "num-traits", -] - -[[package]] -name = "num-traits" -version = "0.2.14" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9a64b1ec5cda2586e284722486d802acf1f7dbdc623e2bfc57e65ca1cd099290" -dependencies = [ - "autocfg 1.0.1", -] - -[[package]] -name = "num_cpus" -version = "1.13.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "05499f3756671c15885fee9034446956fff3f243d6077b91e5767df161f766b3" -dependencies = [ - "hermit-abi", - "libc", -] - -[[package]] -name = "num_enum" -version = "0.4.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ca565a7df06f3d4b485494f25ba05da1435950f4dc263440eda7a6fa9b8e36e4" -dependencies = [ - "derivative", - "num_enum_derive", -] - -[[package]] -name = "num_enum_derive" -version = "0.4.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ffa5a33ddddfee04c0283a7653987d634e880347e96b5b2ed64de07efb59db9d" -dependencies = [ - "proc-macro-crate", - "proc-macro2 1.0.26", - "quote 1.0.9", - "syn 1.0.72", -] - -[[package]] -name = "nvim-rs" -version = "0.1.1-alpha.0" -source = "git+https://github.com/kethku/nvim-rs#109feea9e345fcbb2674384b0d6914ba4b8fc61e" -dependencies = [ - "async-trait", - "futures 0.3.15", - "log", - "pin-project", - "rmp", - "rmpv", - "tokio", -] - -[[package]] -name = "objc" -version = "0.2.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "915b1b472bc21c53464d6c8461c9d3af805ba1ef837e1cac254428f4a77177b1" -dependencies = [ - "malloc_buf", -] - -[[package]] -name = "once_cell" -version = "1.7.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "af8b08b04175473088b46763e51ee54da5f9a164bc162f615b91bc179dbf15a3" - -[[package]] -name = "openssl-probe" -version = "0.1.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "28988d872ab76095a6e6ac88d99b54fd267702734fd7ffe610ca27f533ddb95a" - -[[package]] -name = "openssl-sys" -version = "0.9.63" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b6b0d6fb7d80f877617dfcb014e605e2b5ab2fb0afdf27935219bb6bd984cb98" -dependencies = [ - "autocfg 1.0.1", - "cc", - "libc", - "pkg-config", - "vcpkg", -] - -[[package]] -name = "ordered-float" -version = "1.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3305af35278dd29f46fcdd139e0b1fbfae2153f0e5928b39b035542dd31e37b7" -dependencies = [ - "num-traits", -] - -[[package]] -name = "owned_ttf_parser" -version = "0.6.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9f923fb806c46266c02ab4a5b239735c144bdeda724a50ed058e5226f594cde3" -dependencies = [ - "ttf-parser", -] - -[[package]] -name = "parking_lot" -version = "0.10.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d3a704eb390aafdc107b0e392f56a82b668e3a71366993b5340f5833fd62505e" -dependencies = [ - "lock_api 0.3.4", - "parking_lot_core 0.7.2", -] - -[[package]] -name = "parking_lot" -version = "0.11.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6d7744ac029df22dca6284efe4e898991d28e3085c706c972bcd7da4a27a15eb" -dependencies = [ - "instant", - "lock_api 0.4.4", - "parking_lot_core 0.8.3", -] - -[[package]] -name = "parking_lot_core" -version = "0.7.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d58c7c768d4ba344e3e8d72518ac13e259d7c7ade24167003b8488e10b6740a3" -dependencies = [ - "cfg-if 0.1.10", - "cloudabi", - "libc", - "redox_syscall 0.1.57", - "smallvec", - "winapi 0.3.9", -] - -[[package]] -name = "parking_lot_core" -version = "0.8.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fa7a782938e745763fe6907fc6ba86946d72f49fe7e21de074e08128a99fb018" -dependencies = [ - "cfg-if 1.0.0", - "instant", - "libc", - "redox_syscall 0.2.8", - "smallvec", - "winapi 0.3.9", -] - -[[package]] -name = "pathfinder_geometry" -version = "0.5.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0b7b7e7b4ea703700ce73ebf128e1450eb69c3a8329199ffbfb9b2a0418e5ad3" -dependencies = [ - "log", - "pathfinder_simd", -] - -[[package]] -name = "pathfinder_simd" -version = "0.5.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b451513912d6b3440e443aa75a73ab22203afedc4a90df8526d008c0f86f7cb3" -dependencies = [ - "rustc_version", -] - -[[package]] -name = "peeking_take_while" -version = "0.1.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "19b17cddbe7ec3f8bc800887bab5e717348c95ea2ca0b1bf0837fb964dc67099" - -[[package]] -name = "percent-encoding" -version = "2.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d4fd5641d01c8f18a23da7b6fe29298ff4b55afcccdf78973b24cf3175fee32e" - -[[package]] -name = "pin-project" -version = "0.4.28" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "918192b5c59119d51e0cd221f4d49dde9112824ba717369e903c97d076083d0f" -dependencies = [ - "pin-project-internal", -] - -[[package]] -name = "pin-project-internal" -version = "0.4.28" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3be26700300be6d9d23264c73211d8190e755b6b5ca7a1b28230025511b52a5e" -dependencies = [ - "proc-macro2 1.0.26", - "quote 1.0.9", - "syn 1.0.72", -] - -[[package]] -name = "pin-project-lite" -version = "0.1.12" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "257b64915a082f7811703966789728173279bdebb956b143dbcd23f6f970a777" - -[[package]] -name = "pin-project-lite" -version = "0.2.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dc0e1f259c92177c30a4c9d177246edd0a3568b25756a977d0632cf8fa37e905" - -[[package]] -name = "pin-utils" -version = "0.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8b870d8c151b6f2fb93e84a13146138f05d02ed11c7e7c54f8826aaaf7c9f184" - -[[package]] -name = "pkg-config" -version = "0.3.19" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3831453b3449ceb48b6d9c7ad7c96d5ea673e9b470a1dc578c2ce6521230884c" - -[[package]] -name = "png" -version = "0.15.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ef859a23054bbfee7811284275ae522f0434a3c8e7f4b74bd4a35ae7e1c4a283" -dependencies = [ - "bitflags", - "crc32fast", - "deflate", - "inflate", -] - -[[package]] -name = "ppv-lite86" -version = "0.2.10" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ac74c624d6b2d21f425f752262f42188365d7b8ff1aff74c82e45136510a4857" - -[[package]] -name = "predicates" -version = "1.0.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f49cfaf7fdaa3bfacc6fa3e7054e65148878354a5cfddcf661df4c851f8021df" -dependencies = [ - "difference", - "float-cmp", - "normalize-line-endings", - "predicates-core", - "regex", -] - -[[package]] -name = "predicates-core" -version = "1.0.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "57e35a3326b75e49aa85f5dc6ec15b41108cf5aee58eabb1f274dd18b73c2451" - -[[package]] -name = "predicates-tree" -version = "1.0.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "15f553275e5721409451eb85e15fd9a860a6e5ab4496eb215987502b5f5391f2" -dependencies = [ - "predicates-core", - "treeline", -] - -[[package]] -name = "proc-macro-crate" -version = "0.1.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1d6ea3c4595b96363c13943497db34af4460fb474a95c43f4446ad341b8c9785" -dependencies = [ - "toml", -] - -[[package]] -name = "proc-macro-hack" -version = "0.5.19" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dbf0c48bc1d91375ae5c3cd81e3722dff1abcf81a30960240640d223f59fe0e5" - -[[package]] -name = "proc-macro-nested" -version = "0.1.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bc881b2c22681370c6a780e47af9840ef841837bc98118431d4e1868bd0c1086" - -[[package]] -name = "proc-macro2" -version = "0.4.30" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cf3d2011ab5c909338f7887f4fc896d35932e29146c12c8d01da6b22a80ba759" -dependencies = [ - "unicode-xid 0.1.0", -] - -[[package]] -name = "proc-macro2" -version = "1.0.26" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a152013215dca273577e18d2bf00fa862b89b24169fb78c4c95aeb07992c9cec" -dependencies = [ - "unicode-xid 0.2.2", -] - -[[package]] -name = "quick-error" -version = "1.2.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a1d01941d82fa2ab50be1e79e6714289dd7cde78eba4c074bc5a4374f650dfe0" - -[[package]] -name = "quote" -version = "0.6.13" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6ce23b6b870e8f94f81fb0a363d65d86675884b34a09043c81e5562f11c1f8e1" -dependencies = [ - "proc-macro2 0.4.30", -] - -[[package]] -name = "quote" -version = "1.0.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c3d0b9745dc2debf507c8422de05d7226cc1f0644216dfdfead988f9b1ab32a7" -dependencies = [ - "proc-macro2 1.0.26", -] - -[[package]] -name = "rand" -version = "0.7.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6a6b1679d49b24bbfe0c803429aa1874472f50d9b363131f0e89fc356b544d03" -dependencies = [ - "getrandom 0.1.16", - "libc", - "rand_chacha", - "rand_core", - "rand_hc", -] - -[[package]] -name = "rand_chacha" -version = "0.2.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f4c8ed856279c9737206bf725bf36935d8666ead7aa69b52be55af369d193402" -dependencies = [ - "ppv-lite86", - "rand_core", -] - -[[package]] -name = "rand_core" -version = "0.5.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "90bde5296fc891b0cef12a6d03ddccc162ce7b2aff54160af9338f8d40df6d19" -dependencies = [ - "getrandom 0.1.16", -] - -[[package]] -name = "rand_hc" -version = "0.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ca3129af7b92a17112d59ad498c6f81eaf463253766b90396d39ea7a39d6613c" -dependencies = [ - "rand_core", -] - -[[package]] -name = "raw-window-handle" -version = "0.3.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0a441a7a6c80ad6473bd4b74ec1c9a4c951794285bf941c2126f607c72e48211" -dependencies = [ - "libc", -] - -[[package]] -name = "raw-window-metal" -version = "0.1.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2cd21ed1cdef7f1b1579b972148ba6058b5b545959a14d91ea83c4f0ea9f289b" -dependencies = [ - "cocoa 0.24.0", - "core-graphics 0.22.2", - "objc", - "raw-window-handle", -] - -[[package]] -name = "rayon" -version = "1.5.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8b0d8e0819fadc20c74ea8373106ead0600e3a67ef1fe8da56e39b9ae7275674" -dependencies = [ - "autocfg 1.0.1", - "crossbeam-deque 0.8.0", - "either", - "rayon-core", -] - -[[package]] -name = "rayon-core" -version = "1.9.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9ab346ac5921dc62ffa9f89b7a773907511cdfa5490c572ae9be1be33e8afa4a" -dependencies = [ - "crossbeam-channel 0.5.1", - "crossbeam-deque 0.8.0", - "crossbeam-utils 0.8.4", - "lazy_static", - "num_cpus", -] - -[[package]] -name = "redox_syscall" -version = "0.1.57" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "41cc0f7e4d5d4544e8861606a285bb08d3e70712ccc7d2b84d7c0ccfaf4b05ce" - -[[package]] -name = "redox_syscall" -version = "0.2.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "742739e41cd49414de871ea5e549afb7e2a3ac77b589bcbebe8c82fab37147fc" -dependencies = [ - "bitflags", -] - -[[package]] -name = "redox_users" -version = "0.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "528532f3d801c87aec9def2add9ca802fe569e44a544afe633765267840abe64" -dependencies = [ - "getrandom 0.2.2", - "redox_syscall 0.2.8", -] - -[[package]] -name = "regex" -version = "1.5.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d07a8629359eb56f1e2fb1652bb04212c072a87ba68546a04065d525673ac461" -dependencies = [ - "aho-corasick", - "memchr", - "regex-syntax", -] - -[[package]] -name = "regex-syntax" -version = "0.6.25" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f497285884f3fcff424ffc933e56d7cbca511def0c9831a7f9b5f6153e3cc89b" - -[[package]] -name = "rmp" -version = "0.8.10" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4f55e5fa1446c4d5dd1f5daeed2a4fe193071771a2636274d0d7a3b082aa7ad6" -dependencies = [ - "byteorder", - "num-traits", -] - -[[package]] -name = "rmpv" -version = "0.4.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7c760afe11955e16121e36485b6b828326c3f0eaff1c31758d96dbeb5cf09fd5" -dependencies = [ - "num-traits", - "rmp", -] - -[[package]] -name = "rust-embed" -version = "5.9.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2fe1fe6aac5d6bb9e1ffd81002340363272a7648234ec7bdfac5ee202cb65523" -dependencies = [ - "rust-embed-impl", - "rust-embed-utils", - "walkdir", -] - -[[package]] -name = "rust-embed-impl" -version = "5.9.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3ed91c41c42ef7bf687384439c312e75e0da9c149b0390889b94de3c7d9d9e66" -dependencies = [ - "proc-macro2 1.0.26", - "quote 1.0.9", - "rust-embed-utils", - "syn 1.0.72", - "walkdir", -] - -[[package]] -name = "rust-embed-utils" -version = "5.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2a512219132473ab0a77b52077059f1c47ce4af7fbdc94503e9862a34422876d" -dependencies = [ - "walkdir", -] - -[[package]] -name = "rustc-hash" -version = "1.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "08d43f7aa6b08d49f382cde6a7982047c3426db949b1424bc4b7ec9ae12c6ce2" - -[[package]] -name = "rustc_version" -version = "0.2.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "138e3e0acb6c9fb258b19b67cb8abd63c00679d2851805ea151465464fe9030a" -dependencies = [ - "semver", -] - -[[package]] -name = "rusttype" -version = "0.7.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "310942406a39981bed7e12b09182a221a29e0990f3e7e0c971f131922ed135d5" -dependencies = [ - "rusttype 0.8.3", -] - -[[package]] -name = "rusttype" -version = "0.8.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9f61411055101f7b60ecf1041d87fb74205fb20b0c7a723f07ef39174cf6b4c0" -dependencies = [ - "approx", - "ordered-float", - "stb_truetype", -] - -[[package]] -name = "rusttype" -version = "0.9.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dc7c727aded0be18c5b80c1640eae0ac8e396abf6fa8477d96cb37d18ee5ec59" -dependencies = [ - "ab_glyph_rasterizer", - "owned_ttf_parser", -] - -[[package]] -name = "ryu" -version = "1.0.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "71d301d4193d031abdd79ff7e3dd721168a9572ef3fe51a1517aba235bd8f86e" - -[[package]] -name = "same-file" -version = "1.0.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "93fc1dc3aaa9bfed95e02e6eadabb4baf7e3078b0bd1b4d7b6b0b68378900502" -dependencies = [ - "winapi-util", -] - -[[package]] -name = "schannel" -version = "0.1.19" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8f05ba609c234e60bee0d547fe94a4c7e9da733d1c962cf6e59efa4cd9c8bc75" -dependencies = [ - "lazy_static", - "winapi 0.3.9", -] - -[[package]] -name = "scoped-tls" -version = "1.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ea6a9290e3c9cf0f18145ef7ffa62d68ee0bf5fcd651017e586dc7fd5da448c2" - -[[package]] -name = "scoped_threadpool" -version = "0.1.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1d51f5df5af43ab3f1360b429fa5e0152ac5ce8c0bd6485cae490332e96846a8" - -[[package]] -name = "scopeguard" -version = "1.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d29ab0c6d3fc0ee92fe66e2d99f700eab17a8d57d1c1d3b748380fb20baa78cd" - -[[package]] -name = "sdl2" -version = "0.34.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "deecbc3fa9460acff5a1e563e05cb5f31bba0aa0c214bb49a43db8159176d54b" -dependencies = [ - "bitflags", - "lazy_static", - "libc", - "raw-window-handle", - "sdl2-sys", -] - -[[package]] -name = "sdl2-sys" -version = "0.34.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "41a29aa21f175b5a41a6e26da572d5e5d1ee5660d35f9f9d0913e8a802098f74" -dependencies = [ - "cfg-if 0.1.10", - "cmake", - "flate2", - "libc", - "tar", - "unidiff", - "version-compare", -] - -[[package]] -name = "semver" -version = "0.9.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1d7eb9ef2c18661902cc47e535f9bc51b78acd254da71d375c2f6720d9a40403" -dependencies = [ - "semver-parser", -] - -[[package]] -name = "semver-parser" -version = "0.7.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "388a1df253eca08550bef6c72392cfe7c30914bf41df5269b68cbd6ff8f570a3" - -[[package]] -name = "serde" -version = "1.0.126" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ec7505abeacaec74ae4778d9d9328fe5a5d04253220a85c4ee022239fc996d03" - -[[package]] -name = "serde_json" -version = "1.0.64" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "799e97dc9fdae36a5c8b8f2cae9ce2ee9fdce2058c57a93e6099d919fd982f79" -dependencies = [ - "itoa", - "ryu", - "serde", -] - -[[package]] -name = "servo-fontconfig" -version = "0.5.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c7e3e22fe5fd73d04ebf0daa049d3efe3eae55369ce38ab16d07ddd9ac5c217c" -dependencies = [ - "libc", - "servo-fontconfig-sys", -] - -[[package]] -name = "servo-fontconfig-sys" -version = "5.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e36b879db9892dfa40f95da1c38a835d41634b825fbd8c4c418093d53c24b388" -dependencies = [ - "expat-sys", - "freetype-sys", - "pkg-config", -] - -[[package]] -name = "shlex" -version = "0.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7fdf1b9db47230893d76faad238fd6097fd6d6a9245cd7a4d90dbd639536bbd2" - -[[package]] -name = "signal-hook-registry" -version = "1.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "16f1d0fef1604ba8f7a073c7e701f213e056707210e9020af4528e0101ce11a6" -dependencies = [ - "libc", -] - -[[package]] -name = "skia-bindings" -version = "0.35.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e158e83da2315e0b82eaf21e8aa771b9d32c7fd92ce56f247a8c63be8acc7a3e" -dependencies = [ - "bindgen", - "cc", - "curl", - "flate2", - "heck", - "regex", - "serde_json", - "tar", - "toml", -] - -[[package]] -name = "skia-safe" -version = "0.35.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "85dd8abb714b094d5cb22b53aecc5d23aaa7219067d2347fbc9a7c3bc5118633" -dependencies = [ - "bitflags", - "lazy_static", - "skia-bindings", -] - -[[package]] -name = "skribo" -version = "0.1.0" -source = "git+https://github.com/linebender/skribo#62fabc1257e4ba4460a7e32087026e85e694ecc6" -dependencies = [ - "font-kit", - "harfbuzz", - "harfbuzz-sys", - "log", - "pathfinder_geometry", - "unicode-normalization", -] - -[[package]] -name = "skulpin" -version = "0.11.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d11f1c75af5e20eaa1dd985692b42b697b49f3581eb8088526688120a951b1ad" -dependencies = [ - "log", - "skulpin-app-winit", - "skulpin-renderer", - "skulpin-renderer-sdl2", - "skulpin-renderer-winit", -] - -[[package]] -name = "skulpin-app-winit" -version = "0.5.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "daf156763a67080ce9a8965bba2b1c7cdee9f51f4e1fdb2b3ef6dcf7d9fbf63f" -dependencies = [ - "log", - "skulpin-renderer", - "skulpin-renderer-winit", -] - -[[package]] -name = "skulpin-renderer" -version = "0.5.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "19f77569926563e91b3e8a5b1b77d192be6a8db8e3f0c4e05e887843998dd47e" -dependencies = [ - "ash", - "log", - "skia-bindings", - "skia-safe", -] - -[[package]] -name = "skulpin-renderer-sdl2" -version = "0.5.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2391513a1fcb62aad9e95fa0c7ab2ecaf0565dd68fee8bf096f1ed9a25abf936" -dependencies = [ - "ash-window", - "log", - "raw-window-handle", - "sdl2", - "skulpin-renderer", -] - -[[package]] -name = "skulpin-renderer-winit" -version = "0.5.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bc972e8252690259199c00f3e0a307082c6b666e57b72d629cf608e0396a0f01" -dependencies = [ - "ash-window", - "log", - "raw-window-handle", - "skulpin-renderer", - "winit 0.22.2", - "winit 0.23.0", -] - -[[package]] -name = "slab" -version = "0.4.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f173ac3d1a7e3b28003f40de0b5ce7fe2710f9b9dc3fc38664cebee46b3b6527" - -[[package]] -name = "smallvec" -version = "1.6.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fe0f37c9e8f3c5a4a66ad655a93c74daac4ad00c441533bf5c6e7990bb42604e" - -[[package]] -name = "smithay-client-toolkit" -version = "0.6.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "421c8dc7acf5cb205b88160f8b4cc2c5cfabe210e43b2f80f009f4c1ef910f1d" -dependencies = [ - "andrew 0.2.1", - "bitflags", - "dlib 0.4.2", - "lazy_static", - "memmap", - "nix 0.14.1", - "wayland-client 0.23.6", - "wayland-protocols 0.23.6", -] - -[[package]] -name = "smithay-client-toolkit" -version = "0.12.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4750c76fd5d3ac95fa3ed80fe667d6a3d8590a960e5b575b98eea93339a80b80" -dependencies = [ - "andrew 0.3.1", - "bitflags", - "calloop 0.6.5", - "dlib 0.4.2", - "lazy_static", - "log", - "memmap2", - "nix 0.18.0", - "wayland-client 0.28.5", - "wayland-cursor", - "wayland-protocols 0.28.5", -] - -[[package]] -name = "socket2" -version = "0.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9e3dfc207c526015c632472a77be09cf1b6e46866581aecae5cc38fb4235dea2" -dependencies = [ - "libc", - "winapi 0.3.9", -] - -[[package]] -name = "stb_truetype" -version = "0.3.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f77b6b07e862c66a9f3e62a07588fee67cd90a9135a2b942409f195507b4fb51" -dependencies = [ - "byteorder", -] - -[[package]] -name = "strsim" -version = "0.8.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8ea5119cdb4c55b55d432abb513a0429384878c15dde60cc77b1c99de1a95a6a" - -[[package]] -name = "strsim" -version = "0.9.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6446ced80d6c486436db5c078dde11a9f73d42b57fb273121e160b84f63d894c" - -[[package]] -name = "syn" -version = "0.15.44" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9ca4b3b69a77cbe1ffc9e198781b7acb0c7365a883670e8f1c1bc66fba79a5c5" -dependencies = [ - "proc-macro2 0.4.30", - "quote 0.6.13", - "unicode-xid 0.1.0", -] - -[[package]] -name = "syn" -version = "1.0.72" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a1e8cdbefb79a9a5a65e0db8b47b723ee907b7c7f8496c76a1770b5c310bab82" -dependencies = [ - "proc-macro2 1.0.26", - "quote 1.0.9", - "unicode-xid 0.2.2", -] - -[[package]] -name = "tar" -version = "0.4.33" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c0bcfbd6a598361fda270d82469fff3d65089dc33e175c9a131f7b4cd395f228" -dependencies = [ - "filetime", - "libc", - "xattr", -] - -[[package]] -name = "termcolor" -version = "1.1.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2dfed899f0eb03f32ee8c6a0aabdb8a7949659e3466561fc0adf54e26d88c5f4" -dependencies = [ - "winapi-util", -] - -[[package]] -name = "textwrap" -version = "0.11.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d326610f408c7a4eb6f51c37c330e496b08506c9457c9d34287ecc38809fb060" -dependencies = [ - "unicode-width", -] - -[[package]] -name = "thiserror" -version = "1.0.24" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e0f4a65597094d4483ddaed134f409b2cb7c1beccf25201a9f73c719254fa98e" -dependencies = [ - "thiserror-impl", -] - -[[package]] -name = "thiserror-impl" -version = "1.0.24" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7765189610d8241a44529806d6fd1f2e0a08734313a35d5b3a556f92b381f3c0" -dependencies = [ - "proc-macro2 1.0.26", - "quote 1.0.9", - "syn 1.0.72", -] - -[[package]] -name = "tiff" -version = "0.3.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d7b7c2cfc4742bd8a32f2e614339dd8ce30dbcf676bb262bd63a2327bc5df57d" -dependencies = [ - "byteorder", - "lzw", - "num-derive", - "num-traits", -] - -[[package]] -name = "time" -version = "0.1.43" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ca8a50ef2360fbd1eeb0ecd46795a87a19024eb4b53c5dc916ca1fd95fe62438" -dependencies = [ - "libc", - "winapi 0.3.9", -] - -[[package]] -name = "tiny-keccak" -version = "2.0.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2c9d3793400a45f954c52e73d068316d76b6f4e36977e3fcebb13a2721e80237" -dependencies = [ - "crunchy", -] - -[[package]] -name = "tinyvec" -version = "1.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5b5220f05bb7de7f3f53c7c065e1199b3172696fe2db9f9c4d8ad9b4ee74c342" -dependencies = [ - "tinyvec_macros", -] - -[[package]] -name = "tinyvec_macros" -version = "0.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cda74da7e1a664f795bb1f8a87ec406fb89a02522cf6e50620d016add6dbbf5c" - -[[package]] -name = "tokio" -version = "0.2.25" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6703a273949a90131b290be1fe7b039d0fc884aa1935860dfcbe056f28cd8092" -dependencies = [ - "bytes 0.5.6", - "fnv", - "iovec", - "lazy_static", - "libc", - "memchr", - "mio", - "mio-named-pipes", - "mio-uds", - "num_cpus", - "pin-project-lite 0.1.12", - "signal-hook-registry", - "slab", - "tokio-macros", - "winapi 0.3.9", -] - -[[package]] -name = "tokio-io" -version = "0.1.13" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "57fc868aae093479e3131e3d165c93b1c7474109d13c90ec0dda2a1bbfff0674" -dependencies = [ - "bytes 0.4.12", - "futures 0.1.31", - "log", -] - -[[package]] -name = "tokio-macros" -version = "0.2.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e44da00bfc73a25f814cd8d7e57a68a5c31b74b3152a0a1d1f590c97ed06265a" -dependencies = [ - "proc-macro2 1.0.26", - "quote 1.0.9", - "syn 1.0.72", -] - -[[package]] -name = "toml" -version = "0.5.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a31142970826733df8241ef35dc040ef98c679ab14d7c3e54d827099b3acecaa" -dependencies = [ - "serde", -] - -[[package]] -name = "treeline" -version = "0.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a7f741b240f1a48843f9b8e0444fb55fb2a4ff67293b50a9179dfd5ea67f8d41" - -[[package]] -name = "ttf-parser" -version = "0.6.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3e5d7cd7ab3e47dda6e56542f4bbf3824c15234958c6e1bd6aaa347e93499fdc" - -[[package]] -name = "unicode-normalization" -version = "0.1.17" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "07fbfce1c8a97d547e8b5334978438d9d6ec8c20e38f56d4a4374d181493eaef" -dependencies = [ - "tinyvec", -] - -[[package]] -name = "unicode-segmentation" -version = "1.7.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bb0d2e7be6ae3a5fa87eed5fb451aff96f2573d2694942e40543ae0bbe19c796" - -[[package]] -name = "unicode-width" -version = "0.1.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9337591893a19b88d8d87f2cec1e73fad5cdfd10e5a6f349f498ad6ea2ffb1e3" - -[[package]] -name = "unicode-xid" -version = "0.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fc72304796d0818e357ead4e000d19c9c174ab23dc11093ac919054d20a6a7fc" - -[[package]] -name = "unicode-xid" -version = "0.2.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8ccb82d61f80a663efe1f787a51b16b5a51e3314d6ac365b08639f52387b33f3" - -[[package]] -name = "unidiff" -version = "0.3.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d8a62719acf1933bfdbeb73a657ecd9ecece70b405125267dd549e2e2edc232c" -dependencies = [ - "encoding_rs", - "lazy_static", - "regex", -] - -[[package]] -name = "vcpkg" -version = "0.2.12" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cbdbff6266a24120518560b5dc983096efb98462e51d0d68169895b237be3e5d" - -[[package]] -name = "vec_map" -version = "0.8.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f1bddf1187be692e79c5ffeab891132dfb0f236ed36a43c7ed39f1165ee20191" - -[[package]] -name = "version-compare" -version = "0.0.10" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d63556a25bae6ea31b52e640d7c41d1ab27faba4ccb600013837a3d0b3994ca1" - -[[package]] -name = "version_check" -version = "0.9.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5fecdca9a5291cc2b8dcf7dc02453fee791a280f3743cb0905f8822ae463b3fe" - -[[package]] -name = "void" -version = "1.0.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6a02e4885ed3bc0f2de90ea6dd45ebcbb66dacffe03547fadbb0eeae2770887d" - -[[package]] -name = "walkdir" -version = "2.3.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "808cf2735cd4b6866113f648b791c6adc5714537bc222d9347bb203386ffda56" -dependencies = [ - "same-file", - "winapi 0.3.9", - "winapi-util", -] - -[[package]] -name = "wasi" -version = "0.9.0+wasi-snapshot-preview1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cccddf32554fecc6acb585f82a32a72e28b48f8c4c1883ddfeeeaa96f7d8e519" - -[[package]] -name = "wasi" -version = "0.10.2+wasi-snapshot-preview1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fd6fbd9a79829dd1ad0cc20627bf1ed606756a7f77edff7b66b7064f9cb327c6" - -[[package]] -name = "wayland-client" -version = "0.23.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "af1080ebe0efabcf12aef2132152f616038f2d7dcbbccf7b2d8c5270fe14bcda" -dependencies = [ - "bitflags", - "calloop 0.4.4", - "downcast-rs", - "libc", - "mio", - "nix 0.14.1", - "wayland-commons 0.23.6", - "wayland-scanner 0.23.6", - "wayland-sys 0.23.6", -] - -[[package]] -name = "wayland-client" -version = "0.28.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "06ca44d86554b85cf449f1557edc6cc7da935cc748c8e4bf1c507cbd43bae02c" -dependencies = [ - "bitflags", - "downcast-rs", - "libc", - "nix 0.20.0", - "scoped-tls", - "wayland-commons 0.28.5", - "wayland-scanner 0.28.5", - "wayland-sys 0.28.5", -] - -[[package]] -name = "wayland-commons" -version = "0.23.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bb66b0d1a27c39bbce712b6372131c6e25149f03ffb0cd017cf8f7de8d66dbdb" -dependencies = [ - "nix 0.14.1", - "wayland-sys 0.23.6", -] - -[[package]] -name = "wayland-commons" -version = "0.28.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8bd75ae380325dbcff2707f0cd9869827ea1d2d6d534cff076858d3f0460fd5a" -dependencies = [ - "nix 0.20.0", - "once_cell", - "smallvec", - "wayland-sys 0.28.5", -] - -[[package]] -name = "wayland-cursor" -version = "0.28.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b37e5455ec72f5de555ec39b5c3704036ac07c2ecd50d0bffe02d5fe2d4e65ab" -dependencies = [ - "nix 0.20.0", - "wayland-client 0.28.5", - "xcursor", -] - -[[package]] -name = "wayland-protocols" -version = "0.23.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6cc286643656742777d55dc8e70d144fa4699e426ca8e9d4ef454f4bf15ffcf9" -dependencies = [ - "bitflags", - "wayland-client 0.23.6", - "wayland-commons 0.23.6", - "wayland-scanner 0.23.6", -] - -[[package]] -name = "wayland-protocols" -version = "0.28.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "95df3317872bcf9eec096c864b69aa4769a1d5d6291a5b513f8ba0af0efbd52c" -dependencies = [ - "bitflags", - "wayland-client 0.28.5", - "wayland-commons 0.28.5", - "wayland-scanner 0.28.5", -] - -[[package]] -name = "wayland-scanner" -version = "0.23.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "93b02247366f395b9258054f964fe293ddd019c3237afba9be2ccbe9e1651c3d" -dependencies = [ - "proc-macro2 0.4.30", - "quote 0.6.13", - "xml-rs", -] - -[[package]] -name = "wayland-scanner" -version = "0.28.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "389d680d7bd67512dc9c37f39560224327038deb0f0e8d33f870900441b68720" -dependencies = [ - "proc-macro2 1.0.26", - "quote 1.0.9", - "xml-rs", -] - -[[package]] -name = "wayland-sys" -version = "0.23.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d94e89a86e6d6d7c7c9b19ebf48a03afaac4af6bc22ae570e9a24124b75358f4" -dependencies = [ - "dlib 0.4.2", - "lazy_static", -] - -[[package]] -name = "wayland-sys" -version = "0.28.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2907bd297eef464a95ba9349ea771611771aa285b932526c633dc94d5400a8e2" -dependencies = [ - "dlib 0.5.0", - "lazy_static", - "pkg-config", -] - -[[package]] -name = "which" -version = "3.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d011071ae14a2f6671d0b74080ae0cd8ebf3a6f8c9589a2cd45f23126fe29724" -dependencies = [ - "libc", -] - -[[package]] -name = "which" -version = "4.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b55551e42cbdf2ce2bedd2203d0cc08dba002c27510f86dab6d0ce304cba3dfe" -dependencies = [ - "either", - "libc", -] - -[[package]] -name = "winapi" -version = "0.2.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "167dc9d6949a9b857f3451275e911c3f44255842c1f7a76f33c55103a909087a" - -[[package]] -name = "winapi" -version = "0.3.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5c839a674fcd7a98952e593242ea400abe93992746761e38641405d28b00f419" -dependencies = [ - "winapi-i686-pc-windows-gnu", - "winapi-x86_64-pc-windows-gnu", -] - -[[package]] -name = "winapi-build" -version = "0.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2d315eee3b34aca4797b2da6b13ed88266e6d612562a0c46390af8299fc699bc" - -[[package]] -name = "winapi-i686-pc-windows-gnu" -version = "0.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ac3b87c63620426dd9b991e5ce0329eff545bccbbb34f3be09ff6fb6ab51b7b6" - -[[package]] -name = "winapi-util" -version = "0.1.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "70ec6ce85bb158151cae5e5c87f95a8e97d2c0c4b001223f33a334e3ce5de178" -dependencies = [ - "winapi 0.3.9", -] - -[[package]] -name = "winapi-x86_64-pc-windows-gnu" -version = "0.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f" - -[[package]] -name = "winit" -version = "0.22.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1e4ccbf7ddb6627828eace16cacde80fc6bf4dbb3469f88487262a02cf8e7862" -dependencies = [ - "bitflags", - "cocoa 0.20.2", - "core-foundation 0.7.0", - "core-graphics 0.19.2", - "core-video-sys", - "dispatch", - "instant", - "lazy_static", - "libc", - "log", - "mio", - "mio-extras", - "ndk 0.1.0", - "ndk-glue 0.1.0", - "ndk-sys 0.1.0", - "objc", - "parking_lot 0.10.2", - "percent-encoding", - "raw-window-handle", - "smithay-client-toolkit 0.6.6", - "wayland-client 0.23.6", - "winapi 0.3.9", - "x11-dl", -] - -[[package]] -name = "winit" -version = "0.23.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b5bc559da567d8aa671bbcd08304d49e982c7bf2cb91e10288b9188931c1b772" -dependencies = [ - "bitflags", - "cocoa 0.23.0", - "core-foundation 0.9.1", - "core-graphics 0.22.2", - "core-video-sys", - "dispatch", - "instant", - "lazy_static", - "libc", - "log", - "mio", - "mio-extras", - "ndk 0.2.1", - "ndk-glue 0.2.1", - "ndk-sys 0.2.1", - "objc", - "parking_lot 0.11.1", - "percent-encoding", - "raw-window-handle", - "smithay-client-toolkit 0.12.3", - "wayland-client 0.28.5", - "winapi 0.3.9", - "x11-dl", -] - -[[package]] -name = "winres" -version = "0.1.11" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ff4fb510bbfe5b8992ff15f77a2e6fe6cf062878f0eda00c0f44963a807ca5dc" -dependencies = [ - "toml", -] - -[[package]] -name = "wio" -version = "0.2.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5d129932f4644ac2396cb456385cbf9e63b5b30c6e8dc4820bdca4eb082037a5" -dependencies = [ - "winapi 0.3.9", -] - -[[package]] -name = "ws2_32-sys" -version = "0.2.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d59cefebd0c892fa2dd6de581e937301d8552cb44489cdff035c6187cb63fa5e" -dependencies = [ - "winapi 0.2.8", - "winapi-build", -] - -[[package]] -name = "x11-dl" -version = "2.18.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2bf981e3a5b3301209754218f962052d4d9ee97e478f4d26d4a6eced34c1fef8" -dependencies = [ - "lazy_static", - "libc", - "maybe-uninit", - "pkg-config", -] - -[[package]] -name = "xattr" -version = "0.2.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "244c3741f4240ef46274860397c7c74e50eb23624996930e484c16679633a54c" -dependencies = [ - "libc", -] - -[[package]] -name = "xcursor" -version = "0.3.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3a9a231574ae78801646617cefd13bfe94be907c0e4fa979cfd8b770aa3c5d08" -dependencies = [ - "nom 6.1.2", -] - -[[package]] -name = "xdg" -version = "2.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d089681aa106a86fade1b0128fb5daf07d5867a509ab036d99988dec80429a57" - -[[package]] -name = "xml-rs" -version = "0.8.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b07db065a5cf61a7e4ba64f29e67db906fb1787316516c4e6e5ff0fea1efcd8a" diff --git a/pkgs/applications/editors/neovim/neovide/default.nix b/pkgs/applications/editors/neovim/neovide/default.nix index c0a54487329..7157de7d927 100644 --- a/pkgs/applications/editors/neovim/neovide/default.nix +++ b/pkgs/applications/editors/neovim/neovide/default.nix @@ -9,65 +9,58 @@ , expat , openssl , SDL2 -, vulkan-loader , fontconfig , ninja , gn , llvmPackages , makeFontsConf +, libglvnd +, libxkbcommon +, xorg }: rustPlatform.buildRustPackage rec { pname = "neovide"; - version = "20210515"; + version = "unstable-2021-06-21"; - src = - let - repo = fetchFromGitHub { - owner = "Kethku"; - repo = "neovide"; - rev = "0b976c3d28bbd24e6c83a2efc077aa96dde1e9eb"; - sha256 = "sha256-asaOxcAenKdy/yJvch3HFfgnrBnQagL02UpWYnz7sa8="; - }; - in - runCommand "source" { } '' - cp -R ${repo} $out - chmod -R +w $out - # Reasons for patching Cargo.toml: - # - I got neovide built with latest compatible skia-save version 0.35.1 - # and I did not try to get it with 0.32.1 working. Changing the skia - # version is time consuming, because of manual dependecy tracking and - # long compilation runs. - sed -i $out/Cargo.toml \ - -e '/skia-safe/s;0.32.1;0.35.1;' - cp ${./Cargo.lock} $out/Cargo.lock - ''; + src = fetchFromGitHub { + owner = "Kethku"; + repo = "neovide"; + rev = "4159c47ff4f30073b92b9d63fc6ab70e07b74b6d"; + sha256 = "sha256-XwirJGXMGxc/NkpSeHBUc16ppvJ+H4ECnrOVu030Qfg="; + }; - cargoSha256 = "sha256-XMPRM3BAfCleS0LXQv03A3lQhlUhAP8/9PdVbAUnfG0="; + cargoSha256 = "sha256-WCk9kt81DtBwpEEdKH9gKQSVxAvH+vkyP2y24tU+vzY="; - SKIA_OFFLINE_SOURCE_DIR = + SKIA_SOURCE_DIR = let repo = fetchFromGitHub { owner = "rust-skia"; repo = "skia"; - # see rust-skia/Cargo.toml#package.metadata skia - rev = "m86-0.35.0"; - sha256 = "sha256-uTSgtiEkbE9e08zYOkRZyiHkwOLr/FbBYkr2d+NZ8J0="; + # see rust-skia:skia-bindings/Cargo.toml#package.metadata skia + rev = "m90-0.38.3"; + sha256 = "sha256-l8c4vfO1PELAT8bDyr/yQGZetZsaufAlJ6bBOXz7E1w="; }; # The externals for skia are taken from skia/DEPS externals = lib.mapAttrs (n: v: fetchgit v) (lib.importJSON ./skia-externals.json); in - runCommand "source" { } ('' - cp -R ${repo} $out - chmod -R +w $out + runCommand "source" {} ( + '' + cp -R ${repo} $out + chmod -R +w $out - mkdir -p $out/third_party/externals - cd $out/third_party/externals - '' + (builtins.concatStringsSep "\n" (lib.mapAttrsToList (name: value: "cp -ra ${value} ${name}") externals))); + mkdir -p $out/third_party/externals + cd $out/third_party/externals + '' + (builtins.concatStringsSep "\n" (lib.mapAttrsToList (name: value: "cp -ra ${value} ${name}") externals)) + ); - SKIA_OFFLINE_NINJA_COMMAND = "${ninja}/bin/ninja"; - SKIA_OFFLINE_GN_COMMAND = "${gn}/bin/gn"; + SKIA_NINJA_COMMAND = "${ninja}/bin/ninja"; + SKIA_GN_COMMAND = "${gn}/bin/gn"; LIBCLANG_PATH = "${llvmPackages.libclang.lib}/lib"; + preConfigure = '' + unset CC CXX + ''; + # test needs a valid fontconfig file FONTCONFIG_FILE = makeFontsConf { fontDirectories = [ ]; }; @@ -92,9 +85,9 @@ rustPlatform.buildRustPackage rec { ]; postFixup = '' - wrapProgram $out/bin/neovide \ - --prefix LD_LIBRARY_PATH : ${vulkan-loader}/lib - ''; + wrapProgram $out/bin/neovide \ + --prefix LD_LIBRARY_PATH : ${lib.makeLibraryPath [ libglvnd libxkbcommon xorg.libXcursor xorg.libXext xorg.libXrandr xorg.libXi ]} + ''; postInstall = '' for n in 16x16 32x32 48x48 256x256; do diff --git a/pkgs/applications/editors/neovim/neovide/skia-externals.json b/pkgs/applications/editors/neovim/neovide/skia-externals.json index be1fdb181c2..3c0de3008d7 100644 --- a/pkgs/applications/editors/neovim/neovide/skia-externals.json +++ b/pkgs/applications/editors/neovim/neovide/skia-externals.json @@ -16,8 +16,8 @@ }, "zlib": { "url": "https://chromium.googlesource.com/chromium/src/third_party/zlib", - "rev": "eaf99a4e2009b0e5759e6070ad1760ac1dd75461", - "sha256": "sha256-B4PgeSVBU/MSkPkXTu9jPIa37dNJPm2HpmiVf6XuOGE=" + "rev": "c876c8f87101c5a75f6014b0f832499afeb65b73", + "sha256": "sha256-mwozVo8ymyrYN4tw+/ZnSI+xogSTZQ6PUBba/jQqRkE=" }, "harfbuzz": { "url": "https://chromium.googlesource.com/external/github.com/harfbuzz/harfbuzz.git", @@ -31,7 +31,7 @@ }, "libgifcodec": { "url": "https://skia.googlesource.com/libgifcodec", - "rev": "d06d2a6d42baf6c0c91cacc28df2542a911d05fe", - "sha256": "sha256-ke1X5iyj2ah2NqGVdFv8GuoRAzXg1aCeTdZwUM8wvCI=" + "rev": "fd59fa92a0c86788dcdd84d091e1ce81eda06a77", + "sha256": "sha256-spyZU4QhV2xrHcBRoYqYgCR0wEM5lgfhGh8pqJE5yXM=" } } diff --git a/pkgs/applications/graphics/ImageMagick/6.x.nix b/pkgs/applications/graphics/ImageMagick/6.x.nix index bab1d6cfab7..5fea254ce08 100644 --- a/pkgs/applications/graphics/ImageMagick/6.x.nix +++ b/pkgs/applications/graphics/ImageMagick/6.x.nix @@ -16,13 +16,13 @@ in stdenv.mkDerivation rec { pname = "imagemagick"; - version = "6.9.12-16"; + version = "6.9.12-17"; src = fetchFromGitHub { owner = "ImageMagick"; repo = "ImageMagick6"; rev = version; - sha256 = "sha256-kg8vt88G6huRbJlVYztKxHiFPhGz/QHuNKtbhmai790="; + sha256 = "sha256-yZXvxl9Tbl3JRBmRcfsjbkaxywtD08SuUnJayKfwk9M="; }; outputs = [ "out" "dev" "doc" ]; # bin/ isn't really big diff --git a/pkgs/applications/graphics/ImageMagick/7.0.nix b/pkgs/applications/graphics/ImageMagick/7.0.nix index d7840a78bb4..e2fdb19127d 100644 --- a/pkgs/applications/graphics/ImageMagick/7.0.nix +++ b/pkgs/applications/graphics/ImageMagick/7.0.nix @@ -18,13 +18,13 @@ in stdenv.mkDerivation rec { pname = "imagemagick"; - version = "7.0.11-12"; + version = "7.1.0-0"; src = fetchFromGitHub { owner = "ImageMagick"; repo = "ImageMagick"; rev = version; - sha256 = "sha256-vTCfpHcja0z/aplcunUDlg/90EbfrR/xQ9bzdG0n2RY="; + sha256 = "sha256-TmyJMzj5tHMrVm6xRguZmXIg7c6mHmqusMMdJAHNqNg="; }; outputs = [ "out" "dev" "doc" ]; # bin/ isn't really big diff --git a/pkgs/applications/graphics/graphicsmagick/default.nix b/pkgs/applications/graphics/graphicsmagick/default.nix index 583dcf7c618..13752bfc05d 100644 --- a/pkgs/applications/graphics/graphicsmagick/default.nix +++ b/pkgs/applications/graphics/graphicsmagick/default.nix @@ -1,6 +1,6 @@ { lib, stdenv, fetchurl, bzip2, freetype, graphviz, ghostscript , libjpeg, libpng, libtiff, libxml2, zlib, libtool, xz, libX11 -, libwebp, quantumdepth ? 8, fixDarwinDylibNames }: +, libwebp, quantumdepth ? 8, fixDarwinDylibNames, nukeReferences }: stdenv.mkDerivation rec { pname = "graphicsmagick"; @@ -27,8 +27,14 @@ stdenv.mkDerivation rec { zlib libtool libwebp ]; - nativeBuildInputs = [ xz ] - ++ lib.optional stdenv.hostPlatform.isDarwin fixDarwinDylibNames; + nativeBuildInputs = [ xz nukeReferences ] + ++ lib.optional stdenv.hostPlatform.isDarwin fixDarwinDylibNames; + + # Remove CFLAGS from the binaries to avoid closure bloat. + # In the past we have had -dev packages in the closure of the binaries soley due to the string references. + postConfigure = '' + nuke-refs ./magick/magick_config.h + ''; postInstall = '' sed -i 's/-ltiff.*'\'/\'/ $out/bin/* diff --git a/pkgs/applications/graphics/inkscape/default.nix b/pkgs/applications/graphics/inkscape/default.nix index 813db098475..c65dfa1b6c0 100644 --- a/pkgs/applications/graphics/inkscape/default.nix +++ b/pkgs/applications/graphics/inkscape/default.nix @@ -4,6 +4,7 @@ , cairo , cmake , fetchurl +, fetchpatch , gettext , ghostscript , glib @@ -71,6 +72,15 @@ stdenv.mkDerivation rec { # e.g., those from the "Effects" menu. python3 = "${python3Env}/bin/python"; }) + + # Fix parsing paths by Python extensions. + # https://gitlab.com/inkscape/extensions/-/merge_requests/342 + (fetchpatch { + url = "https://gitlab.com/inkscape/extensions/-/commit/a82c382c610d37837c8f3f5b13224bab8fd3667e.patch"; + sha256 = "YWrgjCnQ9q6BUsxSLQojIXnDzPxM/SgrIfj1gxQ/JKM="; + stripLen = 1; + extraPrefix = "share/extensions/"; + }) ]; postPatch = '' diff --git a/pkgs/applications/graphics/inkscape/extensions.nix b/pkgs/applications/graphics/inkscape/extensions.nix index affd934e936..63010a19f14 100644 --- a/pkgs/applications/graphics/inkscape/extensions.nix +++ b/pkgs/applications/graphics/inkscape/extensions.nix @@ -2,9 +2,12 @@ , fetchFromGitHub , runCommand , inkcut +, callPackage }: { + applytransforms = callPackage ./extensions/applytransforms { }; + hexmap = stdenv.mkDerivation { name = "hexmap"; version = "2020-06-06"; diff --git a/pkgs/applications/graphics/inkscape/extensions/applytransforms/default.nix b/pkgs/applications/graphics/inkscape/extensions/applytransforms/default.nix new file mode 100644 index 00000000000..131daffffb9 --- /dev/null +++ b/pkgs/applications/graphics/inkscape/extensions/applytransforms/default.nix @@ -0,0 +1,42 @@ +{ lib +, stdenv +, fetchFromGitHub +, python3 +}: + +stdenv.mkDerivation { + pname = "inkscape-applytransforms"; + version = "0.0.0+unstable=2021-05-11"; + + src = fetchFromGitHub { + owner = "Klowner"; + repo = "inkscape-applytransforms"; + rev = "5b3ed4af0fb66e399e686fc2b649b56db84f6042"; + sha256 = "XWwkuw+Um/cflRWjIeIgQUxJLrk2DLDmx7K+pMWvIlI="; + }; + + checkInputs = [ + python3.pkgs.inkex + python3.pkgs.pytestCheckHook + ]; + + dontBuild = true; + + doCheck = true; + + installPhase = '' + runHook preInstall + + install -Dt "$out/share/inkscape/extensions" *.inx *.py + + runHook postInstall + ''; + + meta = with lib; { + description = "Inkscape extension which removes all matrix transforms by applying them recursively to shapes"; + homepage = "https://github.com/Klowner/inkscape-applytransforms"; + license = licenses.gpl2Only; + maintainers = with maintainers; [ jtojnar ]; + platforms = platforms.all; + }; +} diff --git a/pkgs/applications/graphics/inkscape/with-extensions.nix b/pkgs/applications/graphics/inkscape/with-extensions.nix index c558a6bb062..14fffadd036 100644 --- a/pkgs/applications/graphics/inkscape/with-extensions.nix +++ b/pkgs/applications/graphics/inkscape/with-extensions.nix @@ -2,13 +2,19 @@ , inkscape , symlinkJoin , makeWrapper -, inkscapeExtensions ? [] +, inkscapeExtensions ? [ ] +, inkscape-extensions }: +let + allExtensions = lib.filter (pkg: lib.isDerivation pkg && !pkg.meta.broken or false) (lib.attrValues inkscape-extensions); + selectedExtensions = if inkscapeExtensions == null then allExtensions else inkscapeExtensions; +in + symlinkJoin { name = "inkscape-with-extensions-${lib.getVersion inkscape}"; - paths = [ inkscape ] ++ inkscapeExtensions; + paths = [ inkscape ] ++ selectedExtensions; nativeBuildInputs = [ makeWrapper ]; diff --git a/pkgs/applications/networking/instant-messengers/go-neb/default.nix b/pkgs/applications/networking/instant-messengers/go-neb/default.nix index 04418dc64fc..f1e335133d7 100644 --- a/pkgs/applications/networking/instant-messengers/go-neb/default.nix +++ b/pkgs/applications/networking/instant-messengers/go-neb/default.nix @@ -1,20 +1,20 @@ -{ lib, buildGoModule, fetchFromGitHub, nixosTests }: +{ lib, buildGoModule, fetchFromGitHub, nixosTests, olm }: buildGoModule { pname = "go-neb"; - version = "unstable-2020-04-09"; + version = "unstable-2021-03-24"; src = fetchFromGitHub { owner = "matrix-org"; repo = "go-neb"; - rev = "1e297c50ad2938e511a3c86f4b190fd3fc3559d6"; - sha256 = "1azwy4s4kmypps1fjbz76flpi1b7sjzjj4qwx94cry0hn3qfnrc6"; + rev = "b6edd50d6e33de3bcdb35055fa6c5f0157f45321"; + sha256 = "sha256-wFqkN4C0rWzWxa6+/LiHMMS8i/g3Q57f5z4cG2XZQzs="; }; subPackages = [ "." ]; - patches = [ ./go-mod.patch ]; + buildInputs = [ olm ]; - vendorSha256 = "1k3980yf6zl00dkd1djwhm2f9nnffzrsbs3kq3alpw2gm0aln739"; + vendorSha256 = "sha256-sWrLWjODf25Z8QqCDg4KyVWmTc3PRiYpRL88yxK0j/M"; doCheck = false; diff --git a/pkgs/applications/networking/instant-messengers/go-neb/go-mod.patch b/pkgs/applications/networking/instant-messengers/go-neb/go-mod.patch deleted file mode 100644 index 1c725652d43..00000000000 --- a/pkgs/applications/networking/instant-messengers/go-neb/go-mod.patch +++ /dev/null @@ -1,50 +0,0 @@ -diff --git a/go.mod b/go.mod -index 8ed4e68..83526e7 100644 ---- a/go.mod -+++ b/go.mod -@@ -4,24 +4,15 @@ go 1.14 - - require ( - github.com/PuerkitoBio/goquery v1.5.1 // indirect -- github.com/alecthomas/template v0.0.0-20190718012654-fb15b899a751 // indirect -- github.com/alecthomas/units v0.0.0-20190717042225-c3de453c63f4 // indirect - github.com/andygrunwald/go-jira v1.11.0 - github.com/beorn7/perks v1.0.1 // indirect -- github.com/cespare/xxhash/v2 v2.1.1 // indirect - github.com/dghubble/oauth1 v0.6.0 - github.com/die-net/lrucache v0.0.0-20190707192454-883874fe3947 -- github.com/go-kit/kit v0.9.0 // indirect -- github.com/go-logfmt/logfmt v0.4.0 // indirect -- github.com/go-stack/stack v1.8.0 // indirect -- github.com/gogo/protobuf v1.1.1 // indirect - github.com/golang/protobuf v1.3.2 // indirect - github.com/google/go-cmp v0.4.0 // indirect - github.com/google/go-github v2.0.1-0.20160719063544-b5e5babef39c+incompatible - github.com/gregjones/httpcache v0.0.0-20190611155906-901d90724c79 - github.com/jaytaylor/html2text v0.0.0-20200220170450-61d9dc4d7195 -- github.com/json-iterator/go v1.1.9 // indirect -- github.com/julienschmidt/httprouter v1.2.0 // indirect - github.com/kr/pretty v0.1.0 // indirect - github.com/lib/pq v1.3.0 - github.com/matrix-org/dugong v0.0.0-20180820122854-51a565b5666b -@@ -32,9 +23,6 @@ require ( - github.com/matttproud/golang_protobuf_extensions v1.0.1 // indirect - github.com/mmcdole/gofeed v1.0.0-beta2 - github.com/mmcdole/goxpp v0.0.0-20181012175147-0068e33feabf // indirect -- github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect -- github.com/modern-go/reflect2 v1.0.1 // indirect -- github.com/mwitkow/go-conntrack v0.0.0-20161129095857-cc309e4a2223 // indirect - github.com/olekukonko/tablewriter v0.0.4 // indirect - github.com/pkg/errors v0.8.1 // indirect - github.com/prometheus/client_golang v0.8.1-0.20160916180340-5636dc67ae77 -@@ -47,10 +35,7 @@ require ( - github.com/stretchr/testify v1.4.0 // indirect - golang.org/x/net v0.0.0-20200301022130-244492dfa37a - golang.org/x/oauth2 v0.0.0-20200107190931-bf48bf16ab8d -- golang.org/x/sync v0.0.0-20190911185100-cd5d95a43a6e // indirect - golang.org/x/sys v0.0.0-20200122134326-e047566fdf82 // indirect -- golang.org/x/tools v0.0.0-20200311090712-aafaee8bce8c // indirect -- gopkg.in/alecthomas/kingpin.v2 v2.2.6 // indirect - gopkg.in/check.v1 v1.0.0-20190902080502-41f04d3bba15 // indirect - gopkg.in/yaml.v2 v2.2.8 - ) diff --git a/pkgs/applications/networking/maestral-qt/default.nix b/pkgs/applications/networking/maestral-qt/default.nix index 69d3bde42e8..d35120e575b 100644 --- a/pkgs/applications/networking/maestral-qt/default.nix +++ b/pkgs/applications/networking/maestral-qt/default.nix @@ -6,14 +6,14 @@ python3.pkgs.buildPythonApplication rec { pname = "maestral-qt"; - version = "1.4.3"; + version = "1.4.4"; disabled = python3.pkgs.pythonOlder "3.6"; src = fetchFromGitHub { owner = "SamSchott"; repo = "maestral-qt"; rev = "v${version}"; - sha256 = "sha256-+eBwBZx+kp2ACbFjtYK6ux9lcPmEQsunvxAAZ2HgAYw="; + sha256 = "sha256-4IrLwpdMepXBxjgR6euENuVKaPRU0dLiApJO45DB2C4="; }; propagatedBuildInputs = with python3.pkgs; [ @@ -45,6 +45,6 @@ python3.pkgs.buildPythonApplication rec { license = licenses.mit; maintainers = with maintainers; [ peterhoeg ]; platforms = platforms.linux; - inherit (src.meta) homepage; + homepage = "https://maestral.app"; }; } diff --git a/pkgs/applications/networking/mailreaders/claws-mail/default.nix b/pkgs/applications/networking/mailreaders/claws-mail/default.nix index 4a13cf68a88..e28680c245f 100644 --- a/pkgs/applications/networking/mailreaders/claws-mail/default.nix +++ b/pkgs/applications/networking/mailreaders/claws-mail/default.nix @@ -21,7 +21,7 @@ , enableLdap ? true, openldap , enableNetworkManager ? true, networkmanager , enableLibetpan ? true, libetpan -, enableValgrind ? true, valgrind +, enableValgrind ? !stdenv.isDarwin && lib.meta.availableOn stdenv.hostPlatform valgrind, valgrind , enableSvg ? true, librsvg # Configure claws-mail's plugins diff --git a/pkgs/applications/version-management/git-and-tools/git/default.nix b/pkgs/applications/version-management/git-and-tools/git/default.nix index 2db4b4ed7bd..075524340bf 100644 --- a/pkgs/applications/version-management/git-and-tools/git/default.nix +++ b/pkgs/applications/version-management/git-and-tools/git/default.nix @@ -25,7 +25,7 @@ assert sendEmailSupport -> perlSupport; assert svnSupport -> perlSupport; let - version = "2.31.1"; + version = "2.32.0"; svn = subversionClient.override { perlBindings = perlSupport; }; gitwebPerlLibs = with perlPackages; [ CGI HTMLParser CGIFast FCGI FCGIProcManager HTMLTagCloud ]; @@ -37,7 +37,7 @@ stdenv.mkDerivation { src = fetchurl { url = "https://www.kernel.org/pub/software/scm/git/git-${version}.tar.xz"; - sha256 = "10367n5sv4nsgaxy486pbp7nscx34vjk8vrb06jm9ffm8ix42qcz"; + sha256 = "08rnm3ipjqdd2n31dw7mxl3iv9g4nxgc409krmz892a37kd43a38"; }; outputs = [ "out" ] ++ lib.optional withManual "doc"; @@ -290,11 +290,13 @@ stdenv.mkDerivation { fi } - # Shared permissions are forbidden in sandbox builds. - disable_test t0001-init shared + # Shared permissions are forbidden in sandbox builds: + substituteInPlace t/test-lib.sh \ + --replace "test_set_prereq POSIXPERM" "" + # TODO: Investigate while these still fail (without POSIXPERM): + disable_test t0001-init 'shared overrides system' + disable_test t0001-init 'init honors global core.sharedRepository' disable_test t1301-shared-repo - disable_test t5324-split-commit-graph 'split commit-graph respects core.sharedrepository' - disable_test t4129-apply-samemode 'do not use core.sharedRepository for working tree files' # Our patched gettext never fallbacks disable_test t0201-gettext-fallbacks diff --git a/pkgs/applications/window-managers/cage/default.nix b/pkgs/applications/window-managers/cage/default.nix index d9623f474f7..7aabdf27197 100644 --- a/pkgs/applications/window-managers/cage/default.nix +++ b/pkgs/applications/window-managers/cage/default.nix @@ -8,20 +8,15 @@ stdenv.mkDerivation rec { pname = "cage"; - version = "0.1.3"; + version = "0.1.4"; src = fetchFromGitHub { owner = "Hjdskes"; repo = "cage"; rev = "v${version}"; - sha256 = "0ixl45g0m8b75gvbjm3gf5qg0yplspgs0xpm2619wn5sygc47sb1"; + sha256 = "0vm96gxinhy48m3x9p1sfldyd03w3gk6iflb7n9kn06j1vqyswr6"; }; - patches = [ - # To fix the build with wlroots 0.14.0: - ./wlroots-0_14.patch - ]; - nativeBuildInputs = [ meson ninja pkg-config wayland scdoc makeWrapper ]; buildInputs = [ diff --git a/pkgs/applications/window-managers/hikari/default.nix b/pkgs/applications/window-managers/hikari/default.nix index 23c7d9f680f..2ec1ff26a79 100644 --- a/pkgs/applications/window-managers/hikari/default.nix +++ b/pkgs/applications/window-managers/hikari/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchzip, +{ lib, stdenv, fetchzip, fetchpatch, pkg-config, bmake, cairo, glib, libevdev, libinput, libxkbcommon, linux-pam, pango, pixman, libucl, wayland, wayland-protocols, wlroots, mesa, @@ -23,6 +23,15 @@ stdenv.mkDerivation { sha256 = "0vxwma2r9mb2h0c3dkpvf8dbrc2x2ykhc5bb0vd72sl9pwj4jxmy"; }; + patches = [ + # To fix the build with wlroots 0.14.0: + (fetchpatch { + url = "https://cgit.freebsd.org/ports/plain/x11-wm/hikari/files/patch-wlroots-0.14?id=f2820b6cc2170feef17989c422f2cf46644a5b57"; + sha256 = "1kpbcmgdm4clmf2ryrs5pv3ghycnq4glvs3d3ll6zr244ks5yf43"; + extraPrefix = ""; + }) + ]; + nativeBuildInputs = [ pkg-config bmake ]; buildInputs = [ diff --git a/pkgs/applications/window-managers/sway/bg.nix b/pkgs/applications/window-managers/sway/bg.nix index 57b81c7831c..c2740530791 100644 --- a/pkgs/applications/window-managers/sway/bg.nix +++ b/pkgs/applications/window-managers/sway/bg.nix @@ -1,6 +1,7 @@ { lib, stdenv, fetchFromGitHub , meson, ninja, pkg-config, scdoc , wayland, wayland-protocols, cairo, gdk-pixbuf +, wayland-scanner }: stdenv.mkDerivation rec { @@ -14,7 +15,7 @@ stdenv.mkDerivation rec { sha256 = "1lmqz5bmig90gq2m7lwf02d2g7z4hzf8fhqz78c8vk92c6p4xwbc"; }; - nativeBuildInputs = [ meson ninja pkg-config scdoc ]; + nativeBuildInputs = [ meson ninja pkg-config scdoc wayland-scanner ]; buildInputs = [ wayland wayland-protocols cairo gdk-pixbuf ]; mesonFlags = [ diff --git a/pkgs/build-support/bintools-wrapper/ld-wrapper.sh b/pkgs/build-support/bintools-wrapper/ld-wrapper.sh index e54dd6f4714..2f96480f80c 100644 --- a/pkgs/build-support/bintools-wrapper/ld-wrapper.sh +++ b/pkgs/build-support/bintools-wrapper/ld-wrapper.sh @@ -20,15 +20,25 @@ if [ -z "${NIX_BINTOOLS_WRAPPER_FLAGS_SET_@suffixSalt@:-}" ]; then source @out@/nix-support/add-flags.sh fi -setDynamicLinker=1 # Optionally filter out paths not refering to the store. expandResponseParams "$@" + +# NIX_LINK_TYPE is set if ld has been called through our cc wrapper. We take +# advantage of this to avoid both recalculating it, and also repeating other +# processing cc wrapper has already done. +if [[ -n "${NIX_LINK_TYPE_@suffixSalt@:-}" ]]; then + linkType=$NIX_LINK_TYPE_@suffixSalt@ +else + linkType=$(checkLinkType "$@") +fi + if [[ "${NIX_ENFORCE_PURITY:-}" = 1 && -n "${NIX_STORE:-}" - && ( -z "$NIX_IGNORE_LD_THROUGH_GCC_@suffixSalt@" || -z "${NIX_LDFLAGS_SET_@suffixSalt@:-}" ) ]]; then + && ( -z "$NIX_IGNORE_LD_THROUGH_GCC_@suffixSalt@" || -z "${NIX_LINK_TYPE_@suffixSalt@:-}" ) ]]; then rest=() nParams=${#params[@]} declare -i n=0 + while (( "$n" < "$nParams" )); do p=${params[n]} p2=${params[n+1]:-} # handle `p` being last one @@ -48,11 +58,6 @@ if [[ "${NIX_ENFORCE_PURITY:-}" = 1 && -n "${NIX_STORE:-}" # Our ld is not built with sysroot support (Can we fix that?) : else - if [[ "$p" = -static || "$p" = -static-pie ]]; then - # Using a dynamic linker for static binaries can lead to crashes. - # This was observed for rust binaries. - setDynamicLinker=0 - fi rest+=("$p") fi n+=1 @@ -61,22 +66,24 @@ if [[ "${NIX_ENFORCE_PURITY:-}" = 1 && -n "${NIX_STORE:-}" params=(${rest+"${rest[@]}"}) fi + source @out@/nix-support/add-hardening.sh extraAfter=() extraBefore=(${hardeningLDFlags[@]+"${hardeningLDFlags[@]}"}) -if [ -z "${NIX_LDFLAGS_SET_@suffixSalt@:-}" ]; then - extraAfter+=($NIX_LDFLAGS_@suffixSalt@) - extraBefore+=($NIX_LDFLAGS_BEFORE_@suffixSalt@) +if [ -z "${NIX_LINK_TYPE_@suffixSalt@:-}" ]; then + extraAfter+=($(filterRpathFlags "$linkType" $NIX_LDFLAGS_@suffixSalt@)) + extraBefore+=($(filterRpathFlags "$linkType" $NIX_LDFLAGS_BEFORE_@suffixSalt@)) + # By adding dynamic linker to extraBefore we allow the users set their # own dynamic linker as NIX_LD_FLAGS will override earlier set flags - if [[ "$setDynamicLinker" = 1 && -n "$NIX_DYNAMIC_LINKER_@suffixSalt@" ]]; then + if [[ "$linkType" == dynamic && -n "$NIX_DYNAMIC_LINKER_@suffixSalt@" ]]; then extraBefore+=("-dynamic-linker" "$NIX_DYNAMIC_LINKER_@suffixSalt@") fi fi -extraAfter+=($NIX_LDFLAGS_AFTER_@suffixSalt@) +extraAfter+=($(filterRpathFlags "$linkType" $NIX_LDFLAGS_AFTER_@suffixSalt@)) # These flags *must not* be pulled up to -Wl, flags, so they can't go in # add-flags.sh. They must always be set, so must not be disabled by @@ -173,7 +180,7 @@ do prev="$p" done -if [[ "$link32" = "1" && "$setDynamicLinker" = 1 && -e "@out@/nix-support/dynamic-linker-m32" ]]; then +if [[ "$link32" == "1" && "$linkType" == dynamic && -e "@out@/nix-support/dynamic-linker-m32" ]]; then # We have an alternate 32-bit linker and we're producing a 32-bit ELF, let's # use it. extraAfter+=( @@ -183,7 +190,7 @@ if [[ "$link32" = "1" && "$setDynamicLinker" = 1 && -e "@out@/nix-support/dynami fi # Add all used dynamic libraries to the rpath. -if [ "$NIX_DONT_SET_RPATH_@suffixSalt@" != 1 ]; then +if [[ "$NIX_DONT_SET_RPATH_@suffixSalt@" != 1 && "$linkType" != static-pie ]]; then # For each directory in the library search path (-L...), # see if it contains a dynamic library used by a -l... flag. If # so, add the directory to the rpath. diff --git a/pkgs/build-support/cc-wrapper/cc-wrapper.sh b/pkgs/build-support/cc-wrapper/cc-wrapper.sh index 2e62aef4604..aa25de33641 100644 --- a/pkgs/build-support/cc-wrapper/cc-wrapper.sh +++ b/pkgs/build-support/cc-wrapper/cc-wrapper.sh @@ -29,9 +29,10 @@ cc1=0 cxxInclude=1 cxxLibrary=1 cInclude=1 -setDynamicLinker=1 expandResponseParams "$@" +linkType=$(checkLinkType "$@") + declare -i n=0 nParams=${#params[@]} while (( "$n" < "$nParams" )); do @@ -60,8 +61,6 @@ while (( "$n" < "$nParams" )); do cxxInclude=0 elif [ "$p" = -nostdinc++ ]; then cxxInclude=0 - elif [[ "$p" = -static || "$p" = -static-pie ]]; then - setDynamicLinker=0 elif [[ "$p" != -?* ]]; then # A dash alone signifies standard input; it is not a flag nonFlagArgs=1 @@ -151,24 +150,24 @@ if [ "$dontLink" != 1 ]; then # Add the flags that should only be passed to the compiler when # linking. - extraAfter+=($NIX_CFLAGS_LINK_@suffixSalt@) + extraAfter+=($(filterRpathFlags "$linkType" $NIX_CFLAGS_LINK_@suffixSalt@)) # Add the flags that should be passed to the linker (and prevent # `ld-wrapper' from adding NIX_LDFLAGS_@suffixSalt@ again). - for i in $NIX_LDFLAGS_BEFORE_@suffixSalt@; do + for i in $(filterRpathFlags "$linkType" $NIX_LDFLAGS_BEFORE_@suffixSalt@); do extraBefore+=("-Wl,$i") done - if [[ "$setDynamicLinker" = 1 && -n "$NIX_DYNAMIC_LINKER_@suffixSalt@" ]]; then + if [[ "$linkType" == dynamic && -n "$NIX_DYNAMIC_LINKER_@suffixSalt@" ]]; then extraBefore+=("-Wl,-dynamic-linker=$NIX_DYNAMIC_LINKER_@suffixSalt@") fi - for i in $NIX_LDFLAGS_@suffixSalt@; do + for i in $(filterRpathFlags "$linkType" $NIX_LDFLAGS_@suffixSalt@); do if [ "${i:0:3}" = -L/ ]; then extraAfter+=("$i") else extraAfter+=("-Wl,$i") fi done - export NIX_LDFLAGS_SET_@suffixSalt@=1 + export NIX_LINK_TYPE_@suffixSalt@=$linkType fi # As a very special hack, if the arguments are just `-v', then don't diff --git a/pkgs/build-support/wrapper-common/utils.bash b/pkgs/build-support/wrapper-common/utils.bash index f773270f7de..cb3552ebc54 100644 --- a/pkgs/build-support/wrapper-common/utils.bash +++ b/pkgs/build-support/wrapper-common/utils.bash @@ -129,3 +129,38 @@ expandResponseParams() { fi done } + +checkLinkType() { + local arg mode + type="dynamic" + for arg in "$@"; do + if [[ "$arg" = -static ]]; then + type="static" + elif [[ "$arg" = -static-pie ]]; then + type="static-pie" + fi + done + echo "$type" +} + +# When building static-pie executables we cannot have rpath +# set. At least glibc requires rpath to be empty +filterRpathFlags() { + local linkType=$1 ret="" i + shift + + if [[ "$linkType" == "static-pie" ]]; then + while [[ "$#" -gt 0 ]]; do + i="$1"; shift 1 + if [[ "$i" == -rpath ]]; then + # also skip its argument + shift + else + ret+="$i " + fi + done + else + ret=$@ + fi + echo $ret +} diff --git a/pkgs/data/misc/cacert/default.nix b/pkgs/data/misc/cacert/default.nix index 17bb30a54b8..b4a8ebc4ef2 100644 --- a/pkgs/data/misc/cacert/default.nix +++ b/pkgs/data/misc/cacert/default.nix @@ -10,7 +10,7 @@ with lib; let - version = "3.63"; + version = "3.66"; underscoreVersion = builtins.replaceStrings ["."] ["_"] version; in @@ -20,7 +20,7 @@ stdenv.mkDerivation { src = fetchurl { url = "mirror://mozilla/security/nss/releases/NSS_${underscoreVersion}_RTM/src/nss-${version}.tar.gz"; - sha256 = "0892xbjcaw6g4rd2rs4qa37nbda248cjrgxa4faaw0licbpjyb8q"; + sha256 = "1jfdnh5l4k57r2vb07s06hqi7m2qzk0d9x25lsdsrw3cflx9x9w9"; }; certdata2pem = fetchurl { diff --git a/pkgs/data/misc/shared-mime-info/default.nix b/pkgs/data/misc/shared-mime-info/default.nix index c69a9802c0c..a2e301f40ec 100644 --- a/pkgs/data/misc/shared-mime-info/default.nix +++ b/pkgs/data/misc/shared-mime-info/default.nix @@ -1,8 +1,11 @@ -{ lib, stdenv -, fetchurl +{ stdenv +, lib +, fetchFromGitLab +, fetchpatch +, meson +, ninja , pkg-config , gettext -, perlPackages , itstool , libxml2 , glib @@ -10,31 +13,47 @@ stdenv.mkDerivation rec { pname = "shared-mime-info"; - version = "1.13.1"; + version = "2.1"; - src = fetchurl { - url = "https://gitlab.freedesktop.org/xdg/${pname}/uploads/5349e18c86eb96eee258a5c1f19122d0/${pname}-${version}.tar.xz"; - sha256 = "1bic8z5nz08qxv1x6zlxnx2j4cmlzm12kygrn3rrh1djqxdhma3f"; + src = fetchFromGitLab { + domain = "gitlab.freedesktop.org"; + owner = "xdg"; + repo = pname; + rev = version; + sha256 = "07bxv44p43pqq4ymfnyy50yli7lwdqymhvclna42rkn1cazq3vb5"; }; + patches = [ + # xmlto is only used for building the docs, which are not installed anyways. + (fetchpatch { + name = "xmlto-optional.patch"; + url = "https://gitlab.freedesktop.org/xdg/shared-mime-info/-/merge_requests/110.patch"; + sha256 = "0p5gxlcmn8ji5bc7pd105s1halqwa1d28lfx9yj43rn6mav7allx"; + }) + ]; + nativeBuildInputs = [ + meson + ninja pkg-config gettext itstool - ] ++ (with perlPackages; [ - perl XMLParser - ]); + ]; buildInputs = [ libxml2 glib ]; + mesonFlags = [ + "-Dupdate-mimedb=true" + ]; + meta = with lib; { description = "A database of common MIME types"; homepage = "http://freedesktop.org/wiki/Software/shared-mime-info"; license = licenses.gpl2Plus; platforms = platforms.unix; - maintainers = [ maintainers.mimame ]; + maintainers = teams.freedesktop.members ++ [ maintainers.mimame ]; }; } diff --git a/pkgs/data/misc/tzdata/default.nix b/pkgs/data/misc/tzdata/default.nix index 7ab25da3cc4..aa3d9e787b6 100644 --- a/pkgs/data/misc/tzdata/default.nix +++ b/pkgs/data/misc/tzdata/default.nix @@ -2,16 +2,16 @@ stdenv.mkDerivation rec { pname = "tzdata"; - version = "2020f"; + version = "2021a"; srcs = [ (fetchurl { url = "https://data.iana.org/time-zones/releases/tzdata${version}.tar.gz"; - sha256 = "10b8cr55x6ji14n3kqkn3avj1s9b79b8gszh81fxrrisij8k248j"; + sha256 = "022fn6gkmp7pamlgab04x0dm5hnyn2m2fcnyr3pvm36612xd5rrr"; }) (fetchurl { url = "https://data.iana.org/time-zones/releases/tzcode${version}.tar.gz"; - sha256 = "1i998crd9fxdfhv4jd241j1arx0ng7j7cvczpmj4y5j5fwmfmvng"; + sha256 = "1l02b0jiwp3fl0xd6227i69d26rmx3yrnq0ssq9vvdmm4jhvyipb"; }) ]; @@ -68,6 +68,10 @@ stdenv.mkDerivation rec { homepage = "http://www.iana.org/time-zones"; description = "Database of current and historical time zones"; changelog = "https://github.com/eggert/tz/blob/${version}/NEWS"; + license = with licenses; [ + bsd3 # tzcode + publicDomain # tzdata + ]; platforms = platforms.all; maintainers = with maintainers; [ fpletz ]; }; diff --git a/pkgs/development/compilers/ghc/8.10.4.nix b/pkgs/development/compilers/ghc/8.10.4.nix index fe42d0c1c6a..f007dcf7898 100644 --- a/pkgs/development/compilers/ghc/8.10.4.nix +++ b/pkgs/development/compilers/ghc/8.10.4.nix @@ -125,6 +125,9 @@ stdenv.mkDerivation (rec { # upstream patch. Don't forget to check backport status of the upstream patch # when adding new GHC releases in nixpkgs. ./respect-ar-path.patch + # Fix documentation configuration which causes a syntax error with sphinx 4.* + # See https://gitlab.haskell.org/ghc/ghc/-/issues/19962, remove at 8.10.6. + ./sphinx-4-configuration.patch ] ++ lib.optionals stdenv.isDarwin [ # Make Block.h compile with c++ compilers. Remove with the next release (fetchpatch { diff --git a/pkgs/development/compilers/ghc/8.8.4.nix b/pkgs/development/compilers/ghc/8.8.4.nix index 002d83ef6be..544b96f5e4f 100644 --- a/pkgs/development/compilers/ghc/8.8.4.nix +++ b/pkgs/development/compilers/ghc/8.8.4.nix @@ -134,6 +134,9 @@ stdenv.mkDerivation (rec { # upstream patch. Don't forget to check backport status of the upstream patch # when adding new GHC releases in nixpkgs. ./respect-ar-path.patch + # Fix documentation configuration which causes a syntax error with sphinx 4.* + # See also https://gitlab.haskell.org/ghc/ghc/-/issues/19962 + ./sphinx-4-configuration.patch ]; postPatch = "patchShebangs ."; diff --git a/pkgs/development/compilers/ghc/sphinx-4-configuration.patch b/pkgs/development/compilers/ghc/sphinx-4-configuration.patch new file mode 100644 index 00000000000..884a0bb39a5 --- /dev/null +++ b/pkgs/development/compilers/ghc/sphinx-4-configuration.patch @@ -0,0 +1,11 @@ +--- ghc-8.10.4/docs/users_guide/conf.py.orig 2021-06-21 13:46:34.196383559 +0200 ++++ ghc-8.10.4/docs/users_guide/conf.py 2021-06-21 13:46:54.839349941 +0200 +@@ -100,7 +100,7 @@ + latex_elements = { + 'inputenc': '', + 'utf8extra': '', +- 'preamble': ''' ++ 'preamble': r''' + \usepackage{fontspec} + \usepackage{makeidx} + \setsansfont{DejaVu Sans} diff --git a/pkgs/development/compilers/rust/make-rust-platform.nix b/pkgs/development/compilers/rust/make-rust-platform.nix index 53ce0391e45..b7379ac6772 100644 --- a/pkgs/development/compilers/rust/make-rust-platform.nix +++ b/pkgs/development/compilers/rust/make-rust-platform.nix @@ -8,10 +8,12 @@ rec { }; fetchCargoTarball = buildPackages.callPackage ../../../build-support/rust/fetchCargoTarball.nix { + git = buildPackages.gitMinimal; inherit cargo; }; buildRustPackage = callPackage ../../../build-support/rust { + git = buildPackages.gitMinimal; inherit cargoBuildHook cargoCheckHook cargoInstallHook cargoSetupHook fetchCargoTarball importCargoLock rustc; }; diff --git a/pkgs/development/interpreters/php/generic.nix b/pkgs/development/interpreters/php/generic.nix index 558fa45a1fd..d64349eaa93 100644 --- a/pkgs/development/interpreters/php/generic.nix +++ b/pkgs/development/interpreters/php/generic.nix @@ -28,7 +28,7 @@ let , embedSupport ? false , ipv6Support ? true , systemdSupport ? stdenv.isLinux - , valgrindSupport ? !stdenv.isDarwin + , valgrindSupport ? !stdenv.isDarwin && lib.meta.availableOn stdenv.hostPlatform valgrind , ztsSupport ? apxs2Support }@args: diff --git a/pkgs/development/interpreters/python/fetchpypi.nix b/pkgs/development/interpreters/python/fetchpypi.nix index e60c9df1f8b..ebd277cd2bd 100644 --- a/pkgs/development/interpreters/python/fetchpypi.nix +++ b/pkgs/development/interpreters/python/fetchpypi.nix @@ -5,10 +5,10 @@ let computeUrl = {format ? "setuptools", ... } @attrs: let - computeWheelUrl = {pname, version, python ? "py2.py3", abi ? "none", platform ? "any"}: + computeWheelUrl = {pname, version, dist ? "py2.py3", python ? "py2.py3", abi ? "none", platform ? "any"}: # Fetch a wheel. By default we fetch an universal wheel. # See https://www.python.org/dev/peps/pep-0427/#file-name-convention for details regarding the optional arguments. - "https://files.pythonhosted.org/packages/${python}/${builtins.substring 0 1 pname}/${pname}/${pname}-${version}-${python}-${abi}-${platform}.whl"; + "https://files.pythonhosted.org/packages/${dist}/${builtins.substring 0 1 pname}/${pname}/${pname}-${version}-${python}-${abi}-${platform}.whl"; computeSourceUrl = {pname, version, extension ? "tar.gz"}: # Fetch a source tarball. diff --git a/pkgs/development/interpreters/python/hooks/python-remove-tests-dir-hook.sh b/pkgs/development/interpreters/python/hooks/python-remove-tests-dir-hook.sh index 83bea786db6..ad9e3c07cf2 100644 --- a/pkgs/development/interpreters/python/hooks/python-remove-tests-dir-hook.sh +++ b/pkgs/development/interpreters/python/hooks/python-remove-tests-dir-hook.sh @@ -5,6 +5,7 @@ pythonRemoveTestsDir() { echo "Executing pythonRemoveTestsDir" rm -rf $out/@pythonSitePackages@/tests + rm -rf $out/@pythonSitePackages@/test echo "Finished executing pythonRemoveTestsDir" } @@ -12,4 +13,3 @@ pythonRemoveTestsDir() { if [ -z "${dontUsePythonRemoveTestsDir-}" ]; then postFixupHooks+=(pythonRemoveTestsDir) fi - diff --git a/pkgs/development/interpreters/python/update-python-libraries/update-python-libraries.py b/pkgs/development/interpreters/python/update-python-libraries/update-python-libraries.py index 9054195ab7e..d3642592ae4 100755 --- a/pkgs/development/interpreters/python/update-python-libraries/update-python-libraries.py +++ b/pkgs/development/interpreters/python/update-python-libraries/update-python-libraries.py @@ -217,8 +217,15 @@ def _get_latest_version_github(package, extension, current_version, target): release = next(filter(lambda x: strip_prefix(x['tag_name']) == version, releases)) prefix = get_prefix(release['tag_name']) - sha256 = subprocess.check_output(["nix-prefetch-url", "--type", "sha256", "--unpack", f"{release['tarball_url']}"], stderr=subprocess.DEVNULL)\ - .decode('utf-8').strip() + try: + sha256 = subprocess.check_output(["nix-prefetch-url", "--type", "sha256", "--unpack", f"{release['tarball_url']}"], stderr=subprocess.DEVNULL)\ + .decode('utf-8').strip() + except: + # this may fail if they have both a branch and a tag of the same name, attempt tag name + tag_url = str(release['tarball_url']).replace("tarball","tarball/refs/tags") + sha256 = subprocess.check_output(["nix-prefetch-url", "--type", "sha256", "--unpack", tag_url], stderr=subprocess.DEVNULL)\ + .decode('utf-8').strip() + return version, sha256, prefix diff --git a/pkgs/development/interpreters/spidermonkey/78.nix b/pkgs/development/interpreters/spidermonkey/78.nix index 23f24ca8ba4..9b81dcc55e7 100644 --- a/pkgs/development/interpreters/spidermonkey/78.nix +++ b/pkgs/development/interpreters/spidermonkey/78.nix @@ -1,5 +1,6 @@ { lib, stdenv , fetchurl +, fetchpatch , autoconf213 , pkg-config , perl @@ -20,13 +21,22 @@ stdenv.mkDerivation rec { pname = "spidermonkey"; - version = "78.8.0"; + version = "78.11.0"; src = fetchurl { url = "mirror://mozilla/firefox/releases/${version}esr/source/firefox-${version}esr.source.tar.xz"; - sha256 = "0451hhjrj9hb6limxim7sbhvw4gs6dd2gmnfxjjx07z3wbgdzwhw"; + sha256 = "0zjpzkxx3wc2840d7q4b9lnkj1kwk1qps29s9c83jf5y6xclnf9q"; }; + patches = [ + # Fix build failure on armv7l using Debian patch + # Upstream bug: https://bugzilla.mozilla.org/show_bug.cgi?id=1526653 + (fetchpatch { + url = "https://salsa.debian.org/mozilla-team/firefox/commit/fd6847c9416f9eebde636e21d794d25d1be8791d.patch"; + sha256 = "02b7zwm6vxmk61aj79a6m32s1k5sr0hwm3q1j4v6np9jfyd10g1j"; + }) + ]; + outputs = [ "out" "dev" ]; setOutputFlags = false; # Configure script only understands --includedir diff --git a/pkgs/development/libraries/acl/default.nix b/pkgs/development/libraries/acl/default.nix index e0b1f05516c..936e793cafe 100644 --- a/pkgs/development/libraries/acl/default.nix +++ b/pkgs/development/libraries/acl/default.nix @@ -6,11 +6,11 @@ # files. stdenv.mkDerivation rec { - name = "acl-2.3.0"; + name = "acl-2.3.1"; src = fetchurl { url = "mirror://savannah/acl/${name}.tar.gz"; - sha256 = "sha256-vTj9u7A8eTdK9RRn6+VJfLwDNbgld/MMlRpBqVtTMAk="; + sha256 = "sha256-dgxhxokBs3/dXu/ur0wMeia9/disdHoe3/HODiQ8Ea8="; }; outputs = [ "bin" "dev" "out" "man" "doc" ]; diff --git a/pkgs/development/libraries/expat/default.nix b/pkgs/development/libraries/expat/default.nix index ba9fb2b177d..fe30b701ed0 100644 --- a/pkgs/development/libraries/expat/default.nix +++ b/pkgs/development/libraries/expat/default.nix @@ -5,14 +5,13 @@ # cgit) that are needed here should be included directly in Nixpkgs as # files. -let - version = "2.2.10"; -in stdenv.mkDerivation rec { - name = "expat-${version}"; +stdenv.mkDerivation rec { + pname = "expat"; + version = "2.4.1"; src = fetchurl { - url = "https://github.com/libexpat/libexpat/releases/download/R_${lib.replaceStrings ["."] ["_"] version}/${name}.tar.xz"; - sha256 = "sha256-Xf5Tj4tbY/A+mO2sUg19mmpNIuSC5cltTQb8xUhcJfI="; + url = "https://github.com/libexpat/libexpat/releases/download/R_${lib.replaceStrings ["."] ["_"] version}/${pname}-${version}.tar.xz"; + sha256 = "sha256-zwMtDbqbkoY2VI4ysyei1msaq2PE9KE90TLC0dLy+2o="; }; outputs = [ "out" "dev" ]; # TODO: fix referrers @@ -25,12 +24,11 @@ in stdenv.mkDerivation rec { doCheck = true; # not cross; preCheck = '' - patchShebangs ./run.sh - patchShebangs ./test-driver-wrapper.sh + patchShebangs ./configure ./run.sh ./test-driver-wrapper.sh ''; meta = with lib; { - homepage = "http://www.libexpat.org/"; + homepage = "https://libexpat.github.io/"; description = "A stream-oriented XML parser library written in C"; platforms = platforms.all; license = licenses.mit; # expat version diff --git a/pkgs/development/libraries/gdk-pixbuf/default.nix b/pkgs/development/libraries/gdk-pixbuf/default.nix index fd2d62a032c..7f63d5f67e7 100644 --- a/pkgs/development/libraries/gdk-pixbuf/default.nix +++ b/pkgs/development/libraries/gdk-pixbuf/default.nix @@ -22,11 +22,16 @@ , lib }: +let + withGtkDoc = stdenv.buildPlatform == stdenv.hostPlatform; +in stdenv.mkDerivation rec { pname = "gdk-pixbuf"; version = "2.42.6"; - outputs = [ "out" "dev" "man" "devdoc" "installedTests" ]; + outputs = [ "out" "dev" "man" ] + ++ lib.optional withGtkDoc "devdoc" + ++ lib.optional (stdenv.buildPlatform == stdenv.hostPlatform) "installedTests"; src = fetchurl { url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; @@ -63,8 +68,8 @@ stdenv.mkDerivation rec { ]; mesonFlags = [ - "-Dgtk_doc=true" - "-Dintrospection=${if gobject-introspection != null then "enabled" else "disabled"}" + "-Dgtk_doc=${lib.boolToString withGtkDoc}" + "-Dintrospection=${if (stdenv.buildPlatform == stdenv.hostPlatform) then "enabled" else "disabled"}" "-Dgio_sniffing=false" ]; @@ -85,9 +90,6 @@ stdenv.mkDerivation rec { moveToOutput "bin" "$dev" moveToOutput "bin/gdk-pixbuf-thumbnailer" "$out" - # So that devhelp can find this. - mkdir -p "$devdoc/share/devhelp" - mv "$out/share/doc" "$devdoc/share/devhelp/books" '' + lib.optionalString stdenv.isDarwin '' # meson erroneously installs loaders with .dylib extension on Darwin. # Their @rpath has to be replaced before gdk-pixbuf-query-loaders looks at them. @@ -98,6 +100,10 @@ stdenv.mkDerivation rec { '' + lib.optionalString (stdenv.hostPlatform == stdenv.buildPlatform) '' # We need to install 'loaders.cache' in lib/gdk-pixbuf-2.0/2.10.0/ $dev/bin/gdk-pixbuf-query-loaders --update-cache + '' + lib.optionalString withGtkDoc '' + # So that devhelp can find this. + mkdir -p "$devdoc/share/devhelp" + mv "$out/share/doc" "$devdoc/share/devhelp/books" ''; # The fixDarwinDylibNames hook doesn't patch binaries. diff --git a/pkgs/development/libraries/glibc/2.32-master.patch.gz b/pkgs/development/libraries/glibc/2.32-master.patch.gz index 2fda4294130..8ea998b5bea 100644 --- a/pkgs/development/libraries/glibc/2.32-master.patch.gz +++ b/pkgs/development/libraries/glibc/2.32-master.patch.gz Binary files differdiff --git a/pkgs/development/libraries/glibc/common.nix b/pkgs/development/libraries/glibc/common.nix index 888548d79f0..93f8f7a8641 100644 --- a/pkgs/development/libraries/glibc/common.nix +++ b/pkgs/development/libraries/glibc/common.nix @@ -42,7 +42,7 @@ let version = "2.32"; - patchSuffix = "-46"; + patchSuffix = "-48"; sha256 = "0di848ibffrnwq7g2dvgqrnn4xqhj3h96csn69q4da51ymafl9qn"; in @@ -61,7 +61,7 @@ stdenv.mkDerivation ({ [ /* No tarballs for stable upstream branch, only https://sourceware.org/git/glibc.git and using git would complicate bootstrapping. $ git fetch --all -p && git checkout origin/release/2.32/master && git describe - glibc-2.32-46-g1799ac8eab + glibc-2.32-48-g16949aeaa0 $ git show --minimal --reverse glibc-2.32.. | gzip -9n --rsyncable - > 2.32-master.patch.gz To compare the archive contents zdiff can be used. @@ -153,6 +153,8 @@ stdenv.mkDerivation ({ "--enable-add-ons" "--sysconfdir=/etc" "--enable-stackguard-randomization" + "--enable-static-pie" + "--enable-bind-now" (lib.withFeatureAs withLinuxHeaders "headers" "${linuxHeaders}/include") (lib.enableFeature profilingLibraries "profile") ] ++ lib.optionals withLinuxHeaders [ diff --git a/pkgs/development/libraries/gnutls/default.nix b/pkgs/development/libraries/gnutls/default.nix index 2d9d280ba75..4c4094987dd 100644 --- a/pkgs/development/libraries/gnutls/default.nix +++ b/pkgs/development/libraries/gnutls/default.nix @@ -8,23 +8,22 @@ assert guileBindings -> guile != null; let - version = "3.7.1"; # XXX: Gnulib's `test-select' fails on FreeBSD: # https://hydra.nixos.org/build/2962084/nixlog/1/raw . - doCheck = !stdenv.isFreeBSD && !stdenv.isDarwin && lib.versionAtLeast version "3.4" + doCheck = !stdenv.isFreeBSD && !stdenv.isDarwin && stdenv.buildPlatform == stdenv.hostPlatform; inherit (stdenv.hostPlatform) isDarwin; in -stdenv.mkDerivation { - name = "gnutls-${version}"; - inherit version; +stdenv.mkDerivation rec { + pname = "gnutls"; + version = "3.7.2"; src = fetchurl { - url = "mirror://gnupg/gnutls/v3.7/gnutls-${version}.tar.xz"; - sha256 = "0vxcbig87sdc73h58pmcpbi4al1zgcxid1jn67mhcpna7sbdfxrp"; + url = "mirror://gnupg/gnutls/v${lib.versions.majorMinor version}/gnutls-${version}.tar.xz"; + sha256 = "646e6c5a9a185faa4cea796d378a1ba8e1148dbb197ca6605f95986a25af2752"; }; outputs = [ "bin" "dev" "out" "man" "devdoc" ]; @@ -42,7 +41,7 @@ stdenv.mkDerivation { # - trust-store: default trust store path (/etc/ssl/...) is missing in sandbox (3.5.11) # - psk-file: no idea; it broke between 3.6.3 and 3.6.4 # Change p11-kit test to use pkg-config to find p11-kit - postPatch = lib.optionalString (lib.versionAtLeast version "3.6") '' + postPatch = '' sed '2iexit 77' -i tests/{pkgconfig,fastopen}.sh sed '/^void doit(void)/,/^{/ s/{/{ exit(77);/' -i tests/{trust-store,psk-file}.c sed 's:/usr/lib64/pkcs11/ /usr/lib/pkcs11/ /usr/lib/x86_64-linux-gnu/pkcs11/:`pkg-config --variable=p11_module_path p11-kit-1`:' -i tests/p11-kit-trust.sh diff --git a/pkgs/development/libraries/gnutls/fix-gnulib-tests-arm.patch b/pkgs/development/libraries/gnutls/fix-gnulib-tests-arm.patch deleted file mode 100644 index 5a222a9cb88..00000000000 --- a/pkgs/development/libraries/gnutls/fix-gnulib-tests-arm.patch +++ /dev/null @@ -1,45 +0,0 @@ ->From 175e0bc72808d564074c4adcc72aeadb74adfcc6 Mon Sep 17 00:00:00 2001 -From: Paul Eggert <eggert@cs.ucla.edu> -Date: Thu, 27 Aug 2020 17:52:58 -0700 -Subject: [PATCH] perror, strerror_r: remove unportable tests - -Problem reported by Florian Weimer in: -https://lists.gnu.org/r/bug-gnulib/2020-08/msg00220.html -* tests/test-perror2.c (main): -* tests/test-strerror_r.c (main): Omit unportable tests. ---- - tests/test-perror2.c | 3 --- - tests/test-strerror_r.c | 3 --- - 2 files changed, 6 deletions(-) - -diff --git a/gl/tests/test-perror2.c b/gl/tests/test-perror2.c -index 1d14eda7b..c6214dd25 100644 ---- a/gl/tests/test-perror2.c -+++ b/gl/tests/test-perror2.c -@@ -79,9 +79,6 @@ main (void) - errno = -5; - perror (""); - ASSERT (!ferror (stderr)); -- ASSERT (msg1 == msg2 || msg1 == msg4 || STREQ (msg1, str1)); -- ASSERT (msg2 == msg4 || STREQ (msg2, str2)); -- ASSERT (msg3 == msg4 || STREQ (msg3, str3)); - ASSERT (STREQ (msg4, str4)); - - free (str1); -diff --git a/gl/tests/test-strerror_r.c b/gl/tests/test-strerror_r.c -index b11d6fd9f..c1dbcf837 100644 ---- a/gl/tests/test-strerror_r.c -+++ b/gl/tests/test-strerror_r.c -@@ -165,9 +165,6 @@ main (void) - - strerror_r (EACCES, buf, sizeof buf); - strerror_r (-5, buf, sizeof buf); -- ASSERT (msg1 == msg2 || msg1 == msg4 || STREQ (msg1, str1)); -- ASSERT (msg2 == msg4 || STREQ (msg2, str2)); -- ASSERT (msg3 == msg4 || STREQ (msg3, str3)); - ASSERT (STREQ (msg4, str4)); - - free (str1); --- -2.17.1 - diff --git a/pkgs/development/libraries/harfbuzz/default.nix b/pkgs/development/libraries/harfbuzz/default.nix index d2287526278..db142286fe4 100644 --- a/pkgs/development/libraries/harfbuzz/default.nix +++ b/pkgs/development/libraries/harfbuzz/default.nix @@ -1,30 +1,44 @@ -{ lib, stdenv, fetchFromGitHub, pkg-config, glib, freetype, cairo, libintl -, meson, ninja +{ lib +, stdenv +, fetchFromGitHub +, pkg-config +, glib +, freetype +, fontconfig +, libintl +, meson +, ninja , gobject-introspection -, icu, graphite2, harfbuzz # The icu variant uses and propagates the non-icu one. -, ApplicationServices, CoreText +, icu +, graphite2 +, harfbuzz # The icu variant uses and propagates the non-icu one. +, ApplicationServices +, CoreText , withCoreText ? false , withIcu ? false # recommended by upstream as default, but most don't needed and it's big , withGraphite2 ? true # it is small and major distros do include it , python3 -, gtk-doc, docbook-xsl-nons, docbook_xml_dtd_43 +, gtk-doc +, docbook-xsl-nons +, docbook_xml_dtd_43 }: let - version = "2.8.0"; + version = "2.8.1"; inherit (lib) optional optionals optionalString; mesonFeatureFlag = opt: b: "-D${opt}=${if b then "enabled" else "disabled"}"; + isNativeCompilation = stdenv.buildPlatform == stdenv.hostPlatform; in stdenv.mkDerivation { name = "harfbuzz${optionalString withIcu "-icu"}-${version}"; src = fetchFromGitHub { - owner = "harfbuzz"; - repo = "harfbuzz"; - rev = version; - sha256 = "sha256-JnvOFGK2HWIpzuwgZtyt0IfKfnoXD1LMeVb3RzMmyY4="; + owner = "harfbuzz"; + repo = "harfbuzz"; + rev = version; + sha256 = "107l9jhvwy6pnq5032kr7r21md65qg09j7iikr4jihf9pvh7gn5w"; }; postPatch = '' @@ -40,9 +54,17 @@ stdenv.mkDerivation { outputBin = "dev"; mesonFlags = [ + # upstream recommends cairo, but it is only used for development purposes + # and is not part of the library. + # Cairo causes transitive (build) dependencies on various X11 or other + # GUI-related libraries, so it shouldn't be re-added lightly. + (mesonFeatureFlag "cairo" false) + # chafa is only used in a development utility, not in the library + (mesonFeatureFlag "chafa" false) + (mesonFeatureFlag "coretext" withCoreText) (mesonFeatureFlag "graphite" withGraphite2) (mesonFeatureFlag "icu" withIcu) - (mesonFeatureFlag "coretext" withCoreText) + (mesonFeatureFlag "introspection" isNativeCompilation) ]; nativeBuildInputs = [ @@ -57,11 +79,11 @@ stdenv.mkDerivation { docbook_xml_dtd_43 ]; - buildInputs = [ glib freetype cairo ] # recommended by upstream - ++ lib.optionals withCoreText [ ApplicationServices CoreText ]; + buildInputs = [ glib freetype ] + ++ lib.optionals withCoreText [ ApplicationServices CoreText ] + ++ lib.optionals isNativeCompilation [ gobject-introspection ]; - propagatedBuildInputs = [] - ++ optional withGraphite2 graphite2 + propagatedBuildInputs = optional withGraphite2 graphite2 ++ optionals withIcu [ icu harfbuzz ]; doCheck = true; diff --git a/pkgs/development/libraries/libaom/default.nix b/pkgs/development/libraries/libaom/default.nix index 83f5de4d013..ef76f61efa9 100644 --- a/pkgs/development/libraries/libaom/default.nix +++ b/pkgs/development/libraries/libaom/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "libaom"; - version = "3.1.0"; + version = "3.1.1"; src = fetchzip { url = "https://aomedia.googlesource.com/aom/+archive/v${version}.tar.gz"; - sha256 = "1v3i34jmbz1p3x8msj3vx46nl6jdzxbkr2lfbh06vard8adb16il"; + sha256 = "11fy2xw35ladkjcz71samhcpqlqr3y0n1n17nk90i13aydrll66f"; stripRoot = false; }; diff --git a/pkgs/development/libraries/libass/default.nix b/pkgs/development/libraries/libass/default.nix index 3a8c2a2655a..afc99220534 100644 --- a/pkgs/development/libraries/libass/default.nix +++ b/pkgs/development/libraries/libass/default.nix @@ -1,13 +1,11 @@ { lib, stdenv, fetchurl, pkg-config, yasm , freetype, fribidi, harfbuzz -, encaSupport ? true, enca ? null # enca support , fontconfigSupport ? true, fontconfig ? null # fontconfig support , rasterizerSupport ? false # Internal rasterizer , largeTilesSupport ? false # Use larger tiles in the rasterizer , libiconv }: -assert encaSupport -> enca != null; assert fontconfigSupport -> fontconfig != null; let @@ -25,7 +23,6 @@ stdenv.mkDerivation rec { }; configureFlags = [ - (mkFlag encaSupport "enca") (mkFlag fontconfigSupport "fontconfig") (mkFlag rasterizerSupport "rasterizer") (mkFlag largeTilesSupport "large-tiles") @@ -34,7 +31,6 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkg-config yasm ]; buildInputs = [ freetype fribidi harfbuzz ] - ++ optional encaSupport enca ++ optional fontconfigSupport fontconfig ++ optional stdenv.isDarwin libiconv; diff --git a/pkgs/development/libraries/libedit/default.nix b/pkgs/development/libraries/libedit/default.nix index dc5a384569c..daf0f292841 100644 --- a/pkgs/development/libraries/libedit/default.nix +++ b/pkgs/development/libraries/libedit/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "libedit"; - version = "20210216-3.1"; + version = "20210522-3.1"; src = fetchurl { url = "https://thrysoee.dk/editline/${pname}-${version}.tar.gz"; - sha256 = "sha256-IoP3QdKquTXIxSwEtXv5UtAsLALmURcvisgR93sfx3o="; + sha256 = "sha256-AiC8IEfpJ8DBmE7197TrKpRppbe/ErpXPKOyPKAru28="; }; outputs = [ "out" "dev" ]; diff --git a/pkgs/development/libraries/libhandy/default.nix b/pkgs/development/libraries/libhandy/default.nix index 891bd04ea54..0d69a5b93e1 100644 --- a/pkgs/development/libraries/libhandy/default.nix +++ b/pkgs/development/libraries/libhandy/default.nix @@ -27,7 +27,7 @@ stdenv.mkDerivation rec { pname = "libhandy"; - version = "1.2.2"; + version = "1.2.3"; outputs = [ "out" @@ -40,7 +40,7 @@ stdenv.mkDerivation rec { src = fetchurl { url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "sha256-R//Shl0CvRyleVIt6t1+L5U2Lx8gJGL9XuriuBZosEg="; + sha256 = "sha256-kuxKWB7BtB3Qek6PqvXVKuN8q7fh+n+UTWyvvllrbWE="; }; nativeBuildInputs = [ diff --git a/pkgs/development/libraries/libidn/default.nix b/pkgs/development/libraries/libidn/default.nix index afe5e550b33..15d7ca33025 100644 --- a/pkgs/development/libraries/libidn/default.nix +++ b/pkgs/development/libraries/libidn/default.nix @@ -1,24 +1,20 @@ { fetchurl, lib, stdenv, libiconv }: stdenv.mkDerivation rec { - name = "libidn-1.36"; + pname = "libidn"; + version = "1.37"; src = fetchurl { - url = "mirror://gnu/libidn/${name}.tar.gz"; - sha256 = "0f20n634whpmdwr81c2r0vxxjwchgkvhsr1i8s2bm0ad6h473dhl"; + url = "mirror://gnu/libidn/${pname}-${version}.tar.gz"; + sha256 = "1hljls9rkilh04dwiwg388wk8djkac8idijrdysqq2nqbh6rg3iw"; }; outputs = [ "bin" "dev" "out" "info" "devdoc" ]; - # broken with gcc-7 - #doCheck = !stdenv.isDarwin && !stdenv.hostPlatform.isMusl; - hardeningDisable = [ "format" ]; buildInputs = lib.optional stdenv.isDarwin libiconv; - doCheck = false; # fails - meta = { homepage = "https://www.gnu.org/software/libidn/"; description = "Library for internationalized domain names"; @@ -42,6 +38,6 @@ stdenv.mkDerivation rec { repositories.git = "git://git.savannah.gnu.org/libidn.git"; license = lib.licenses.lgpl2Plus; platforms = lib.platforms.all; - maintainers = [ ]; + maintainers = with lib.maintainers; [ lsix ]; }; } diff --git a/pkgs/development/libraries/libimagequant/default.nix b/pkgs/development/libraries/libimagequant/default.nix index bc649241872..8a575141148 100644 --- a/pkgs/development/libraries/libimagequant/default.nix +++ b/pkgs/development/libraries/libimagequant/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "libimagequant"; - version = "2.14.1"; + version = "2.15.1"; src = fetchFromGitHub { owner = "ImageOptim"; repo = pname; rev = version; - sha256 = "sha256-yWtwBTAs6dlrZz3Bd/4DUb488IJsahPKwjluukTlv/o="; + sha256 = "sha256-ElMwLeUdrJeJJ9YoieCF/CUNcNMwj5WcjXmMW/nMyAw="; }; preConfigure = '' diff --git a/pkgs/development/libraries/libnftnl/default.nix b/pkgs/development/libraries/libnftnl/default.nix index 44f0f8d62ec..276ee52ed54 100644 --- a/pkgs/development/libraries/libnftnl/default.nix +++ b/pkgs/development/libraries/libnftnl/default.nix @@ -1,12 +1,12 @@ { lib, stdenv, fetchurl, pkg-config, libmnl }: stdenv.mkDerivation rec { - version = "1.1.9"; + version = "1.2.0"; pname = "libnftnl"; src = fetchurl { url = "https://netfilter.org/projects/${pname}/files/${pname}-${version}.tar.bz2"; - sha256 = "16jbp4fs5dz2yf4c3bl1sb48x9x9wi1chv39zwmfgya1k9pimcp9"; + sha256 = "1xblq1cbcxhr6qmjpy98i1qdza148idgz99vbhjc7s4vzvfizc4h"; }; nativeBuildInputs = [ pkg-config ]; diff --git a/pkgs/development/libraries/libpcap/default.nix b/pkgs/development/libraries/libpcap/default.nix index a44fde01860..f3d3587c14f 100644 --- a/pkgs/development/libraries/libpcap/default.nix +++ b/pkgs/development/libraries/libpcap/default.nix @@ -4,11 +4,11 @@ with lib; stdenv.mkDerivation rec { pname = "libpcap"; - version = "1.10.0"; + version = "1.10.1"; src = fetchurl { url = "https://www.tcpdump.org/release/${pname}-${version}.tar.gz"; - sha256 = "sha256-jRK0JiPu7+6HLxI70NyF1TWwDfTULoZfmTxA97/JKx4="; + sha256 = "sha256-7ShfSsyvBTRPkJdXV7Pb/ncrpB0cQBwmSLf6RbcRvdQ="; }; nativeBuildInputs = [ flex bison ] diff --git a/pkgs/development/libraries/libpsl/default.nix b/pkgs/development/libraries/libpsl/default.nix index e68219f6348..85afe93ea7a 100644 --- a/pkgs/development/libraries/libpsl/default.nix +++ b/pkgs/development/libraries/libpsl/default.nix @@ -14,7 +14,9 @@ , publicsuffix-list }: -stdenv.mkDerivation rec { +let + enableValgrindTests = !stdenv.isDarwin && lib.meta.availableOn stdenv.hostPlatform valgrind; +in stdenv.mkDerivation rec { pname = "libpsl"; version = "0.21.0"; @@ -32,7 +34,7 @@ stdenv.mkDerivation rec { pkg-config python3 libxslt - ] ++ lib.optionals (!stdenv.isDarwin) [ + ] ++ lib.optionals enableValgrindTests [ valgrind ]; @@ -60,7 +62,7 @@ stdenv.mkDerivation rec { "--with-psl-distfile=${publicsuffix-list}/share/publicsuffix/public_suffix_list.dat" "--with-psl-file=${publicsuffix-list}/share/publicsuffix/public_suffix_list.dat" "--with-psl-testfile=${publicsuffix-list}/share/publicsuffix/test_psl.txt" - ] ++ lib.optionals (!stdenv.isDarwin) [ + ] ++ lib.optionals enableValgrindTests [ "--enable-valgrind-tests" ]; diff --git a/pkgs/development/libraries/librsvg/default.nix b/pkgs/development/libraries/librsvg/default.nix index 02cd9accbaf..c5e4b6e8215 100644 --- a/pkgs/development/libraries/librsvg/default.nix +++ b/pkgs/development/libraries/librsvg/default.nix @@ -22,13 +22,13 @@ stdenv.mkDerivation rec { pname = "librsvg"; - version = "2.50.5"; + version = "2.50.6"; outputs = [ "out" "dev" "installedTests" ]; src = fetchurl { url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "0wlj5g1jgp93sj3rr6qspj282whz13ahnv8ca99d7zilq9s1aw1j"; + sha256 = "iAdJGZOoevVgxdP1I7jUpLugxQilYPH5NxdytRR3rFc="; }; nativeBuildInputs = [ diff --git a/pkgs/development/libraries/libtasn1/default.nix b/pkgs/development/libraries/libtasn1/default.nix index 2239d7311f5..4d7b57c1f08 100644 --- a/pkgs/development/libraries/libtasn1/default.nix +++ b/pkgs/development/libraries/libtasn1/default.nix @@ -1,11 +1,11 @@ { lib, stdenv, fetchurl, perl, texinfo }: stdenv.mkDerivation rec { - name = "libtasn1-4.16.0"; + name = "libtasn1-4.17.0"; src = fetchurl { url = "mirror://gnu/libtasn1/${name}.tar.gz"; - sha256 = "179jskl7dmfp1rd2khkzmlibzgki4wi6hvmmwfv7q49r728b03qf"; + sha256 = "sha256-7OdVHOp5IrjhDX68cLwiSNH91zNRZGotao1oqUIcRaU="; }; outputs = [ "out" "dev" "devdoc" ]; diff --git a/pkgs/development/libraries/libva/default.nix b/pkgs/development/libraries/libva/default.nix index 69a59326856..32ecc34a287 100644 --- a/pkgs/development/libraries/libva/default.nix +++ b/pkgs/development/libraries/libva/default.nix @@ -7,13 +7,13 @@ stdenv.mkDerivation rec { name = "libva-${lib.optionalString minimal "minimal-"}${version}"; - version = "2.11.0"; + version = "2.12.0"; src = fetchFromGitHub { owner = "intel"; repo = "libva"; rev = version; - sha256 = "0qk30p53mnwiqh2x68vyif11vg3gyjvw8v4qihg099m41qb44hws"; + sha256 = "1zfv4kjx0715sy62lkpv0s31f9xwy232z5zwqi5all4w1jr630i7"; }; outputs = [ "dev" "out" ]; diff --git a/pkgs/development/libraries/libva/utils.nix b/pkgs/development/libraries/libva/utils.nix index c358ebb1a7e..6b5246d09ef 100644 --- a/pkgs/development/libraries/libva/utils.nix +++ b/pkgs/development/libraries/libva/utils.nix @@ -4,13 +4,13 @@ stdenv.mkDerivation rec { pname = "libva-utils"; - version = "2.11.1"; + version = "2.12.0"; src = fetchFromGitHub { owner = "intel"; repo = "libva-utils"; rev = version; - sha256 = "1arp5r0csahjbbsmdmf0dzpgwcpps9s2hlh68lgg6n5n85zkd4b5"; + sha256 = "1a4d75gc7rcfwpsh7fn8mygvi4w0jym4szdhw6jpfywvll37lffi"; }; nativeBuildInputs = [ meson ninja pkg-config ]; diff --git a/pkgs/development/libraries/mesa/default.nix b/pkgs/development/libraries/mesa/default.nix index 3c7ea16b26a..bdecfe0d57a 100644 --- a/pkgs/development/libraries/mesa/default.nix +++ b/pkgs/development/libraries/mesa/default.nix @@ -10,7 +10,7 @@ , vulkanDrivers ? ["auto"] , eglPlatforms ? [ "x11" ] ++ lib.optionals stdenv.isLinux [ "wayland" ] , OpenGL, Xplugin -, withValgrind ? stdenv.hostPlatform.isLinux && !stdenv.hostPlatform.isAarch32, valgrind-light +, withValgrind ? !stdenv.isDarwin && lib.meta.availableOn stdenv.hostPlatform valgrind-light, valgrind-light , enableGalliumNine ? stdenv.isLinux , enableOSMesa ? stdenv.isLinux }: @@ -31,7 +31,7 @@ with lib; let # Release calendar: https://www.mesa3d.org/release-calendar.html # Release frequency: https://www.mesa3d.org/releasing.html#schedule - version = "21.1.2"; + version = "21.1.3"; branch = versions.major version; self = stdenv.mkDerivation { @@ -45,7 +45,7 @@ self = stdenv.mkDerivation { "ftp://ftp.freedesktop.org/pub/mesa/${version}/mesa-${version}.tar.xz" "ftp://ftp.freedesktop.org/pub/mesa/older-versions/${branch}.x/${version}/mesa-${version}.tar.xz" ]; - sha256 = "0pw2wba4q66rhdx0hpimvxmrl7k2vv315gmmk17kl7snc0vvdd13"; + sha256 = "0s8yi7y63xsyqw19ihil18fykkjxr6ibcir2fvymz1vh4ql23qnb"; }; prePatch = "patchShebangs ."; @@ -64,6 +64,12 @@ self = stdenv.mkDerivation { url = "https://gitlab.freedesktop.org/mesa/mesa/commit/aebbf819df6d1e.patch"; sha256 = "17248hyzg43d73c86p077m4lv1pkncaycr3l27hwv9k4ija9zl8q"; }) + # For RISC-V support: + (fetchpatch { + name = "add-riscv-default-selections.patch"; + url = "https://gitlab.freedesktop.org/mesa/mesa/-/commit/9908da1b7a5eaf0156d458e0e24b694c070ba345.patch"; + sha256 = "036gv95m5gzzs6qpgkydf5fwgdlm7kpbdfalg8vmayghd260rw1w"; + }) ] ++ optionals (stdenv.isDarwin && stdenv.isAarch64) [ # Fix aarch64-darwin build, remove when upstreaam supports it out of the box. # See: https://gitlab.freedesktop.org/mesa/mesa/-/issues/1020 diff --git a/pkgs/development/libraries/nettle/default.nix b/pkgs/development/libraries/nettle/default.nix index 3eec9c97ff1..0e3c18c0ac3 100644 --- a/pkgs/development/libraries/nettle/default.nix +++ b/pkgs/development/libraries/nettle/default.nix @@ -1,10 +1,10 @@ { callPackage, fetchurl }: callPackage ./generic.nix rec { - version = "3.7.2"; + version = "3.7.3"; src = fetchurl { url = "mirror://gnu/nettle/nettle-${version}.tar.gz"; - sha256 = "0qpi1qp3bcvqdsaxy2pzg530db95x8qjahkynxgwvr6dy5760ald"; + sha256 = "1w5wwc3q0r97d2ifhx77cw7y8s20bm8x52is9j93p2h47yq5w7v6"; }; } diff --git a/pkgs/development/libraries/nspr/default.nix b/pkgs/development/libraries/nspr/default.nix index 159f343cf4d..91532b3771e 100644 --- a/pkgs/development/libraries/nspr/default.nix +++ b/pkgs/development/libraries/nspr/default.nix @@ -2,15 +2,13 @@ , CoreServices ? null , buildPackages }: -let version = "4.30"; in - -stdenv.mkDerivation { +stdenv.mkDerivation rec { pname = "nspr"; - inherit version; + version = "4.31"; src = fetchurl { url = "mirror://mozilla/nspr/releases/v${version}/src/nspr-${version}.tar.gz"; - sha256 = "0fwivizfz88625lwv1ngxirnal7w9csq1q9i7m6dr14l83wdhk4d"; + sha256 = "1j5b2m8cjlhnnv8sq34587avaagkqvh521w4f95miwgvsn3xlaap"; }; patches = [ diff --git a/pkgs/development/libraries/nss/default.nix b/pkgs/development/libraries/nss/default.nix index 962204268d7..ced72d33e17 100644 --- a/pkgs/development/libraries/nss/default.nix +++ b/pkgs/development/libraries/nss/default.nix @@ -18,7 +18,7 @@ let # It will rebuild itself using the version of this package (NSS) and if # an update is required do the required changes to the expression. # Example: nix-shell ./maintainers/scripts/update.nix --argstr package cacert - version = "3.64"; + version = "3.67"; underscoreVersion = builtins.replaceStrings ["."] ["_"] version; in stdenv.mkDerivation rec { @@ -27,7 +27,7 @@ in stdenv.mkDerivation rec { src = fetchurl { url = "mirror://mozilla/security/nss/releases/NSS_${underscoreVersion}_RTM/src/${pname}-${version}.tar.gz"; - sha256 = "09hivz4qf3dw7m21lshw34l0yncinwn4ax5w3rpkm71f2wkm85yk"; + sha256 = "0zyfi27lbdz1bmk9dmsivcya4phx25rzlxqcnjab69yd928rlm7n"; }; depsBuildBuild = [ buildPackages.stdenv.cc ]; @@ -106,7 +106,7 @@ in stdenv.mkDerivation rec { runHook postBuild ''; - NIX_CFLAGS_COMPILE = "-Wno-error -DNIX_NSS_LIBDIR=\"${placeholder "out"}/lib/\""; + NIX_CFLAGS_COMPILE = "-Wno-error -DNIX_NSS_LIBDIR=\"${placeholder "out"}/lib/\" " + lib.optionalString stdenv.hostPlatform.is64bit "-DNSS_USE_64=1"; installPhase = '' runHook preInstall diff --git a/pkgs/development/libraries/openssl/default.nix b/pkgs/development/libraries/openssl/default.nix index 77a6b513ee6..d4be8cc2428 100644 --- a/pkgs/development/libraries/openssl/default.nix +++ b/pkgs/development/libraries/openssl/default.nix @@ -96,6 +96,8 @@ let throw "Not sure what configuration to use for ${stdenv.hostPlatform.config}" ); + # OpenSSL doesn't like the `--enable-static` / `--disable-shared` flags. + dontAddStaticConfigureFlags = true; configureFlags = [ "shared" # "shared" builds both shared and static libraries "--libdir=lib" diff --git a/pkgs/development/libraries/popt/default.nix b/pkgs/development/libraries/popt/default.nix index 92c143f2417..307408e4db1 100644 --- a/pkgs/development/libraries/popt/default.nix +++ b/pkgs/development/libraries/popt/default.nix @@ -1,11 +1,11 @@ -{lib, stdenv, fetchurl}: +{ lib, stdenv, fetchurl }: stdenv.mkDerivation rec { pname = "popt"; version = "1.18"; src = fetchurl { - url = "mirror://debian/pool/main/p/popt/popt_${version}.orig.tar.gz"; + url = "https://ftp.osuosl.org/pub/rpm/popt/releases/popt-1.x/popt-${version}.tar.gz"; sha256 = "1lf5zlj5rbg6s4bww7hbhpca97prgprnarx978vcwa0bl81vqnai"; }; @@ -17,8 +17,10 @@ stdenv.mkDerivation rec { doCheck = false; # fails meta = with lib; { + homepage = "https://github.com/rpm-software-management/popt"; description = "Command line option parsing library"; - platforms = platforms.unix; + maintainers = with maintainers; [ qyliss ]; license = licenses.mit; + platforms = platforms.unix; }; } diff --git a/pkgs/development/libraries/science/math/openblas/default.nix b/pkgs/development/libraries/science/math/openblas/default.nix index ccb37d295bf..5d3c3f40f1d 100644 --- a/pkgs/development/libraries/science/math/openblas/default.nix +++ b/pkgs/development/libraries/science/math/openblas/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, perl, which +{ lib, stdenv, fetchFromGitHub, fetchpatch, perl, which # Most packages depending on openblas expect integer width to match # pointer width, but some expect to use 32-bit integers always # (for compatibility with reference BLAS). @@ -17,6 +17,10 @@ , target ? null # Select whether DYNAMIC_ARCH is enabled or not. , dynamicArch ? null +# enable AVX512 optimized kernels. +# These kernels have been a source of trouble in the past. +# Use with caution. +, enableAVX512 ? false , enableStatic ? stdenv.hostPlatform.isStatic , enableShared ? !stdenv.hostPlatform.isStatic }: @@ -71,6 +75,7 @@ let BINARY = 64; TARGET = setTarget "ATHLON"; DYNAMIC_ARCH = setDynamicArch true; + NO_AVX512 = !enableAVX512; USE_OPENMP = false; MACOSX_DEPLOYMENT_TARGET = "10.7"; }; @@ -79,6 +84,7 @@ let BINARY = 64; TARGET = setTarget "ATHLON"; DYNAMIC_ARCH = setDynamicArch true; + NO_AVX512 = !enableAVX512; USE_OPENMP = !stdenv.hostPlatform.isMusl; }; @@ -88,6 +94,13 @@ let DYNAMIC_ARCH = setDynamicArch true; USE_OPENMP = !stdenv.hostPlatform.isMusl; }; + + riscv64-linux = { + BINARY = 64; + TARGET = setTarget "RISCV64_GENERIC"; + DYNAMIC_ARCH = setDynamicArch false; + USE_OPENMP = true; + }; }; in @@ -127,6 +140,20 @@ stdenv.mkDerivation rec { sha256 = "1qjr02cqncv20abdp1yzr55n7smhx6h9chqvb0xbp18byynvj87w"; }; + # remove both patches when updating to 0.3.16 + patches = [ + (fetchpatch { + name = "riscv64-imin-fix-wrong-comparison.patch"; + url = "https://github.com/xianyi/OpenBLAS/commit/1e0192a5ccac28fc0c749f49d36ec7eda9757428.patch"; + sha256 = "0kjkmrj8023vcjxhgin5dqs5w3gf93hzhwdhg0vsjhdra2ghkwzj"; + }) + (fetchpatch { + name = "riscv64-generic-use-generic-kernel-for-dsdot.patch"; + url = "https://github.com/xianyi/OpenBLAS/commit/3521cd48cbfb3d50f6ae9a10377382d37075c696.patch"; + sha256 = "0ljwbldff4db377s8rzmqxrszilqdivy656yqvfq46x5338v3gi0"; + }) + ]; + inherit blas64; # Some hardening features are disabled due to sporadic failures in diff --git a/pkgs/development/libraries/sqlite/default.nix b/pkgs/development/libraries/sqlite/default.nix index 50b52b905a9..e2331d89751 100644 --- a/pkgs/development/libraries/sqlite/default.nix +++ b/pkgs/development/libraries/sqlite/default.nix @@ -12,12 +12,12 @@ in stdenv.mkDerivation rec { pname = "sqlite"; - version = "3.35.2"; + version = "3.35.5"; # NB! Make sure to update ./tools.nix src (in the same directory). src = fetchurl { url = "https://sqlite.org/2021/sqlite-autoconf-${archiveVersion version}.tar.gz"; - sha256 = "1bfczv5006ycwr1vw7xbq7cmys0jvfr8awmx7wi1b40zyj0yss8j"; + sha256 = "9StypcMZw+UW7XqS4SMTmm6Hrwii3EPXdXck9hMubbA="; }; outputs = [ "bin" "dev" "out" ]; @@ -25,6 +25,11 @@ stdenv.mkDerivation rec { buildInputs = [ zlib ] ++ optionals interactive [ readline ncurses ]; + # required for aarch64 but applied for all arches for simplicity + preConfigure = '' + patchShebangs configure + ''; + configureFlags = [ "--enable-threadsafe" ] ++ optional interactive "--enable-readline"; NIX_CFLAGS_COMPILE = toString [ diff --git a/pkgs/development/libraries/sqlite/tools.nix b/pkgs/development/libraries/sqlite/tools.nix index 45bcda727ed..6c89a8496e8 100644 --- a/pkgs/development/libraries/sqlite/tools.nix +++ b/pkgs/development/libraries/sqlite/tools.nix @@ -4,11 +4,11 @@ let archiveVersion = import ./archive-version.nix lib; mkTool = { pname, makeTarget, description, homepage }: stdenv.mkDerivation rec { inherit pname; - version = "3.35.2"; + version = "3.35.5"; src = assert version == sqlite.version; fetchurl { url = "https://sqlite.org/2021/sqlite-src-${archiveVersion version}.zip"; - sha256 = "00w7qggrdxpcrs4rfpqkjhcghi8pcx6zzjim9wlz6vsrxlr9dwva"; + sha256 = "049vdpk50sba786345ibmlxnkzk5zp4xj859658ancswb6jyrgpl"; }; nativeBuildInputs = [ unzip ]; diff --git a/pkgs/development/libraries/webrtc-audio-processing/default.nix b/pkgs/development/libraries/webrtc-audio-processing/default.nix index efd2ce3b1fc..d757789fc26 100644 --- a/pkgs/development/libraries/webrtc-audio-processing/default.nix +++ b/pkgs/development/libraries/webrtc-audio-processing/default.nix @@ -8,6 +8,8 @@ stdenv.mkDerivation rec { sha256 = "1gsx7k77blfy171b6g3m0k0s0072v6jcawhmx1kjs9w5zlwdkzd0"; }; + patches = [ ./enable-riscv.patch ]; + buildInputs = lib.optionals stdenv.isDarwin (with darwin.apple_sdk.frameworks; [ ApplicationServices ]); patchPhase = lib.optionalString stdenv.hostPlatform.isMusl '' diff --git a/pkgs/development/libraries/webrtc-audio-processing/enable-riscv.patch b/pkgs/development/libraries/webrtc-audio-processing/enable-riscv.patch new file mode 100644 index 00000000000..d61c33548a7 --- /dev/null +++ b/pkgs/development/libraries/webrtc-audio-processing/enable-riscv.patch @@ -0,0 +1,18 @@ +diff --git a/webrtc/typedefs.h b/webrtc/typedefs.h +index d875490..ce1f3e8 100644 +--- a/webrtc/typedefs.h ++++ b/webrtc/typedefs.h +@@ -26,6 +26,13 @@ + #elif defined(__aarch64__) + #define WEBRTC_ARCH_64_BITS + #define WEBRTC_ARCH_LITTLE_ENDIAN ++#elif defined(__riscv) || defined(__riscv__) ++#define WEBRTC_ARCH_LITTLE_ENDIAN ++#if __riscv_xlen == 64 ++#define WEBRTC_ARCH_64_BITS ++#else ++#define WEBRTC_ARCH_32_BITS ++#endif + #elif defined(_M_IX86) || defined(__i386__) + #define WEBRTC_ARCH_X86_FAMILY + #define WEBRTC_ARCH_X86 diff --git a/pkgs/development/ocaml-modules/ocaml-migrate-parsetree/2.1.x.nix b/pkgs/development/ocaml-modules/ocaml-migrate-parsetree/2.x.nix index ca88fe32416..dab537df221 100644 --- a/pkgs/development/ocaml-modules/ocaml-migrate-parsetree/2.1.x.nix +++ b/pkgs/development/ocaml-modules/ocaml-migrate-parsetree/2.x.nix @@ -2,15 +2,15 @@ buildDunePackage rec { pname = "ocaml-migrate-parsetree"; - version = "2.1.0"; + version = "2.2.0"; useDune2 = true; - minimumOCamlVersion = "4.02"; + minimalOCamlVersion = "4.02"; src = fetchurl { url = "https://github.com/ocaml-ppx/${pname}/releases/download/v${version}/${pname}-v${version}.tbz"; - sha256 = "07x7lm45kny0mi0fjvzw51445brm0dgy099cw0gpyly0wj77hyrq"; + sha256 = "188v3z09bg4gyv80c138fa3a3j2w54w5gc4r1ajw7klr70yqz9mj"; }; meta = { diff --git a/pkgs/development/ocaml-modules/ppx_deriving/default.nix b/pkgs/development/ocaml-modules/ppx_deriving/default.nix index 7d415bd894e..5563e611346 100644 --- a/pkgs/development/ocaml-modules/ppx_deriving/default.nix +++ b/pkgs/development/ocaml-modules/ppx_deriving/default.nix @@ -7,7 +7,7 @@ , result , ounit , ocaml-migrate-parsetree -, ocaml-migrate-parsetree-2-1 +, ocaml-migrate-parsetree-2 }: let params = @@ -40,7 +40,7 @@ buildDunePackage rec { buildInputs = [ ppxlib cppo ]; propagatedBuildInputs = [ (if params.useOMP2 - then ocaml-migrate-parsetree-2-1 + then ocaml-migrate-parsetree-2 else ocaml-migrate-parsetree) ppx_derivers result diff --git a/pkgs/development/ocaml-modules/ppxlib/default.nix b/pkgs/development/ocaml-modules/ppxlib/default.nix index c92992197d2..a19d8cce52f 100644 --- a/pkgs/development/ocaml-modules/ppxlib/default.nix +++ b/pkgs/development/ocaml-modules/ppxlib/default.nix @@ -4,7 +4,7 @@ then if lib.versionAtLeast ocaml.version "4.08" then "0.22.0" else "0.15.0" else "0.13.0" , ocaml-compiler-libs, ocaml-migrate-parsetree, ppx_derivers, stdio -, stdlib-shims, ocaml-migrate-parsetree-2-1 +, stdlib-shims, ocaml-migrate-parsetree-2 }: let param = { @@ -57,7 +57,7 @@ buildDunePackage rec { propagatedBuildInputs = [ ocaml-compiler-libs (if param.useOMP2 or true - then ocaml-migrate-parsetree-2-1 + then ocaml-migrate-parsetree-2 else ocaml-migrate-parsetree) ppx_derivers stdio diff --git a/pkgs/development/ocaml-modules/torch/default.nix b/pkgs/development/ocaml-modules/torch/default.nix index 5f59b4ae056..4126e330486 100644 --- a/pkgs/development/ocaml-modules/torch/default.nix +++ b/pkgs/development/ocaml-modules/torch/default.nix @@ -56,5 +56,6 @@ buildDunePackage rec { description = "Ocaml bindings to Pytorch"; maintainers = [ maintainers.bcdarwin ]; license = licenses.asl20; + broken = true; }; } diff --git a/pkgs/development/python-modules/Babel/default.nix b/pkgs/development/python-modules/Babel/default.nix index 183478396eb..3143a800768 100644 --- a/pkgs/development/python-modules/Babel/default.nix +++ b/pkgs/development/python-modules/Babel/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "Babel"; - version = "2.9.0"; + version = "2.9.1"; src = fetchPypi { inherit pname version; - sha256 = "018yg7g2pa6vjixx1nx41cfispgfi0azzp0a1chlycbj8jsil0ys"; + sha256 = "bc0c176f9f6a994582230df350aa6e05ba2ebe4b3ac317eab29d9be5d2768da0"; }; propagatedBuildInputs = [ pytz ]; diff --git a/pkgs/development/python-modules/GitPython/default.nix b/pkgs/development/python-modules/GitPython/default.nix index 547be5dc4dc..eda574e69cb 100644 --- a/pkgs/development/python-modules/GitPython/default.nix +++ b/pkgs/development/python-modules/GitPython/default.nix @@ -6,16 +6,18 @@ , git , gitdb , ddt +, pythonOlder +, typing-extensions }: buildPythonPackage rec { pname = "GitPython"; - version = "3.1.14"; + version = "3.1.18"; disabled = isPy27; # no longer supported src = fetchPypi { inherit pname version; - sha256 = "be27633e7509e58391f10207cd32b2a6cf5b908f92d9cd30da2e514e1137af61"; + sha256 = "b838a895977b45ab6f0cc926a9045c8d1c44e2b653c1fcc39fe91f42c6e8f05b"; }; patches = [ @@ -25,7 +27,12 @@ buildPythonPackage rec { }) ]; - propagatedBuildInputs = [ gitdb ddt ]; + propagatedBuildInputs = [ + gitdb + ddt + ] ++ lib.optionals (pythonOlder "3.8") [ + typing-extensions + ]; # Tests require a git repo doCheck = false; diff --git a/pkgs/development/python-modules/JPype1/default.nix b/pkgs/development/python-modules/JPype1/default.nix index d7c199f7146..af435c5f088 100644 --- a/pkgs/development/python-modules/JPype1/default.nix +++ b/pkgs/development/python-modules/JPype1/default.nix @@ -9,12 +9,12 @@ buildPythonPackage rec { pname = "JPype1"; - version = "1.2.1"; + version = "1.3.0"; disabled = isPy27; src = fetchPypi { inherit pname version; - sha256 = "f210646127d24be73cfc6d807e2cda1c6b2ab39b7a293008e8b46367af6f2204"; + sha256 = "4fc27dba89750cb0c9d692466341ce60c0fe86a16051091cb5347a37cf884151"; }; propagatedBuildInputs = lib.optionals (pythonOlder "3.8") [ diff --git a/pkgs/development/python-modules/Pygments/default.nix b/pkgs/development/python-modules/Pygments/default.nix index 1f4795ac382..640c95bfcf9 100644 --- a/pkgs/development/python-modules/Pygments/default.nix +++ b/pkgs/development/python-modules/Pygments/default.nix @@ -6,11 +6,11 @@ buildPythonPackage rec { pname = "Pygments"; - version = "2.8.1"; + version = "2.9.0"; src = fetchPypi { inherit pname version; - sha256 = "153zyxigm879sk2n71lfv03y2pgxb7dl0dlsbwkz9aydxnkf2mi6"; + sha256 = "a18f47b506a429f6f4b9df81bb02beab9ca21d0a5fee38ed15aef65f0545519f"; }; propagatedBuildInputs = [ docutils ]; diff --git a/pkgs/development/python-modules/absl-py/default.nix b/pkgs/development/python-modules/absl-py/default.nix index ddb6ae1c2e9..8ad21f54bbd 100644 --- a/pkgs/development/python-modules/absl-py/default.nix +++ b/pkgs/development/python-modules/absl-py/default.nix @@ -8,11 +8,11 @@ buildPythonPackage rec { pname = "absl-py"; - version = "0.12.0"; + version = "0.13.0"; src = fetchPypi { inherit pname version; - sha256 = "b44f68984a5ceb2607d135a615999b93924c771238a63920d17d3387b0d229d5"; + sha256 = "6953272383486044699fd0e9f00aad167a27e08ce19aae66c6c4b10e7e767793"; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/adal/default.nix b/pkgs/development/python-modules/adal/default.nix index fab4c0839e2..31e0e73016c 100644 --- a/pkgs/development/python-modules/adal/default.nix +++ b/pkgs/development/python-modules/adal/default.nix @@ -3,11 +3,11 @@ buildPythonPackage rec { pname = "adal"; - version = "1.2.6"; + version = "1.2.7"; src = fetchPypi { inherit pname version; - sha256 = "08b94d30676ceb78df31bce9dd0f05f1bc2b6172e44c437cbf5b968a00ac6489"; + sha256 = "d74f45b81317454d96e982fd1c50e6fb5c99ac2223728aea8764433a39f566f1"; }; propagatedBuildInputs = [ requests pyjwt dateutil ]; diff --git a/pkgs/development/python-modules/aio-geojson-client/default.nix b/pkgs/development/python-modules/aio-geojson-client/default.nix index 2c64230db26..f347ed5cd1b 100644 --- a/pkgs/development/python-modules/aio-geojson-client/default.nix +++ b/pkgs/development/python-modules/aio-geojson-client/default.nix @@ -12,13 +12,13 @@ buildPythonPackage rec { pname = "aio-geojson-client"; - version = "0.14"; + version = "0.15"; src = fetchFromGitHub { owner = "exxamalte"; repo = "python-aio-geojson-client"; rev = "v${version}"; - sha256 = "1nk0mas71n1bn4wc7pcv279i1b5mxy9phyc8ppxlb16kbjnjj0h8"; + sha256 = "0sbzrzmny7x4bkbg6z0cjn4d10r50nxdyaq7g6lagwd8ijpkg8l3"; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/aio-geojson-geonetnz-volcano/default.nix b/pkgs/development/python-modules/aio-geojson-geonetnz-volcano/default.nix index 97adb2f8fe0..3cc46ae3afb 100644 --- a/pkgs/development/python-modules/aio-geojson-geonetnz-volcano/default.nix +++ b/pkgs/development/python-modules/aio-geojson-geonetnz-volcano/default.nix @@ -12,13 +12,13 @@ buildPythonPackage rec { pname = "aio-geojson-geonetnz-volcano"; - version = "0.5"; + version = "0.6"; src = fetchFromGitHub { owner = "exxamalte"; repo = "python-aio-geojson-geonetnz-volcano"; rev = "v${version}"; - sha256 = "0x4i9gjwb2j788aw4j47bxin0d2ma3khssprq4ga3cjzx2qjwjvn"; + sha256 = "0n97kij2fprzajh57sy1z57kaqiil7pd5y67lq2hqm2cnvkar5ci"; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/aio-georss-client/default.nix b/pkgs/development/python-modules/aio-georss-client/default.nix index 1ac37e8b602..2b40028721a 100644 --- a/pkgs/development/python-modules/aio-georss-client/default.nix +++ b/pkgs/development/python-modules/aio-georss-client/default.nix @@ -15,14 +15,14 @@ buildPythonPackage rec { pname = "aio-georss-client"; - version = "0.7"; + version = "0.8"; disabled = pythonOlder "3.7"; src = fetchFromGitHub { owner = "exxamalte"; repo = "python-aio-georss-client"; rev = "v${version}"; - sha256 = "1nhw2sf92dbizxdcil1wdmbaa3hbmsiriy8jfzpqxsliw5dc0kmh"; + sha256 = "0447scp5n906p8kfzy0lwdq06f6hkq71r2zala6g3vr6b3kla6h8"; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/aiobotocore/default.nix b/pkgs/development/python-modules/aiobotocore/default.nix index 1ebf66a2597..e07b56d3f26 100644 --- a/pkgs/development/python-modules/aiobotocore/default.nix +++ b/pkgs/development/python-modules/aiobotocore/default.nix @@ -10,12 +10,12 @@ buildPythonPackage rec { pname = "aiobotocore"; - version = "1.3.0"; + version = "1.3.1"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - sha256 = "17pcdi69bwdfw2wv3a0fhira5gimw88sp2wf47yqz50z1ckhv2c1"; + sha256 = "8ecee55346651e0f4cbda883e3e16cfe11460b8d7adcc08d0017cbb867636ae1"; }; # relax version constraints: aiobotocore works with newer botocore versions diff --git a/pkgs/development/python-modules/aioesphomeapi/default.nix b/pkgs/development/python-modules/aioesphomeapi/default.nix index 795657262f4..896b9c71a70 100644 --- a/pkgs/development/python-modules/aioesphomeapi/default.nix +++ b/pkgs/development/python-modules/aioesphomeapi/default.nix @@ -2,13 +2,13 @@ buildPythonPackage rec { pname = "aioesphomeapi"; - version = "2.8.0"; + version = "2.9.0"; disabled = !isPy3k; src = fetchPypi { inherit pname version; - sha256 = "1j25i7vh4fg56rzhzxlaj4ys1rvswld15ia44mwwzxfggw8w3rbk"; + sha256 = "11259cd1f115d31b91512a209779fa813dded747408100805bc8ecf7c1c1fa82"; }; propagatedBuildInputs = [ attrs protobuf zeroconf ]; diff --git a/pkgs/development/python-modules/aiofiles/default.nix b/pkgs/development/python-modules/aiofiles/default.nix index fd77a558788..ffa176edc8d 100644 --- a/pkgs/development/python-modules/aiofiles/default.nix +++ b/pkgs/development/python-modules/aiofiles/default.nix @@ -6,11 +6,11 @@ buildPythonPackage rec { pname = "aiofiles"; - version = "0.6.0"; + version = "0.7.0"; src = fetchPypi { inherit pname version; - sha256 = "e0281b157d3d5d59d803e3f4557dcc9a3dff28a4dd4829a9ff478adae50ca092"; + sha256 = "a1c4fc9b2ff81568c83e21392a82f344ea9d23da906e4f6a52662764545e19d4"; }; disabled = pythonOlder "3.3"; diff --git a/pkgs/development/python-modules/aiohttp/default.nix b/pkgs/development/python-modules/aiohttp/default.nix index c0722c8c978..d6203c1ebeb 100644 --- a/pkgs/development/python-modules/aiohttp/default.nix +++ b/pkgs/development/python-modules/aiohttp/default.nix @@ -15,7 +15,6 @@ , freezegun , gunicorn , pytest-mock -, pytest-xdist , pytestCheckHook , re-assert , trustme @@ -52,16 +51,11 @@ buildPythonPackage rec { freezegun gunicorn pytest-mock - pytest-xdist pytestCheckHook re-assert trustme ]; - pytestFlagsArray = [ - "-n auto" - ]; - disabledTests = [ # Disable tests that require network access "test_mark_formdata_as_processed" diff --git a/pkgs/development/python-modules/aiohue/default.nix b/pkgs/development/python-modules/aiohue/default.nix index 641dd4ffa4f..990228039dd 100644 --- a/pkgs/development/python-modules/aiohue/default.nix +++ b/pkgs/development/python-modules/aiohue/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "01ywyiwqa7nyd4kprqxcycv50xydsi95q3lzidpm2r3kn1byis1y"; + sha256 = "3ee8e857b07364516f8b9f0e5c52d4cd775036f3ace37c2769de1e8579f4dc07"; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/aiopvpc/default.nix b/pkgs/development/python-modules/aiopvpc/default.nix index 0b079e0d1a5..efbe695673a 100644 --- a/pkgs/development/python-modules/aiopvpc/default.nix +++ b/pkgs/development/python-modules/aiopvpc/default.nix @@ -4,6 +4,7 @@ , backports-zoneinfo , buildPythonPackage , fetchFromGitHub +, holidays , poetry-core , pytest-asyncio , pytest-timeout @@ -14,7 +15,7 @@ buildPythonPackage rec { pname = "aiopvpc"; - version = "2.1.2"; + version = "2.2.0"; disabled = pythonOlder "3.8"; format = "pyproject"; @@ -22,7 +23,7 @@ buildPythonPackage rec { owner = "azogue"; repo = pname; rev = "v${version}"; - sha256 = "0s8ki46dh39kw6qvsjcfcxa0gblyi33m3hry137kbi4lw5ws6qhr"; + sha256 = "1hk3giwzzlcqnpw9kx3zrr808nmdb7qwac60fki5395qffd2fpqw"; }; nativeBuildInputs = [ @@ -32,6 +33,7 @@ buildPythonPackage rec { propagatedBuildInputs = [ aiohttp backports-zoneinfo + holidays tzdata async-timeout ]; diff --git a/pkgs/development/python-modules/aiosmb/default.nix b/pkgs/development/python-modules/aiosmb/default.nix index 5e8482eff7e..86686d2055e 100644 --- a/pkgs/development/python-modules/aiosmb/default.nix +++ b/pkgs/development/python-modules/aiosmb/default.nix @@ -19,7 +19,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "1b5bqpl8wbs0nm6025wlz4n5sns6ca1x6kgw9wx227flwf3qjlgm"; + sha256 = "f5518987e3d41d213a4ffc4dd38362465b5d2cf99417014cb5402f8ee8c5abac"; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/aiostream/default.nix b/pkgs/development/python-modules/aiostream/default.nix index b51a7105699..0bdab3bb283 100644 --- a/pkgs/development/python-modules/aiostream/default.nix +++ b/pkgs/development/python-modules/aiostream/default.nix @@ -9,14 +9,14 @@ buildPythonPackage rec { pname = "aiostream"; - version = "0.4.2"; + version = "0.4.3"; disabled = pythonOlder "3.6"; src = fetchFromGitHub { owner = "vxgmichel"; repo = pname; rev = "v${version}"; - sha256 = "0ss41hzvlnyll5xc5ddxqyqqw4gnd67yyhci25xnb1vpcz0jqsq8"; + sha256 = "1r3x9qwl08yscmzvhafc6gsmq84lr17s6p7a1qxr49cmdvjzsc13"; }; checkInputs = [ pytestCheckHook pytestcov pytest-asyncio ]; diff --git a/pkgs/development/python-modules/aiowinreg/default.nix b/pkgs/development/python-modules/aiowinreg/default.nix index 3b02916d229..17d9160ce56 100644 --- a/pkgs/development/python-modules/aiowinreg/default.nix +++ b/pkgs/development/python-modules/aiowinreg/default.nix @@ -2,19 +2,22 @@ , buildPythonPackage , fetchPypi , pythonOlder +, winacl }: buildPythonPackage rec { pname = "aiowinreg"; - version = "0.0.4"; + version = "0.0.5"; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - sha256 = "956278a90ef6958f9e2392891b2a305273f695b15b14489cd2097197d6cbe155"; + sha256 = "096663ec3db35fdc7ccc1c2d0d64a11cf64f4baa48955088e42b6a649ce418a5"; }; + propagatedBuildInputs = [ winacl ]; + # Project doesn't have tests doCheck = false; pythonImportsCheck = [ "aiowinreg" ]; diff --git a/pkgs/development/python-modules/alembic/default.nix b/pkgs/development/python-modules/alembic/default.nix index 899bea2acb8..c820ee81ee2 100644 --- a/pkgs/development/python-modules/alembic/default.nix +++ b/pkgs/development/python-modules/alembic/default.nix @@ -5,11 +5,11 @@ buildPythonPackage rec { pname = "alembic"; - version = "1.5.8"; + version = "1.6.5"; src = fetchPypi { inherit pname version; - sha256 = "e27fd67732c97a1c370c33169ef4578cf96436fa0e7dcfaeeef4a917d0737d56"; + sha256 = "a21fedebb3fb8f6bbbba51a11114f08c78709377051384c9c5ead5705ee93a51"; }; buildInputs = [ pytest pytestcov mock coverage ]; diff --git a/pkgs/development/python-modules/amazon_kclpy/default.nix b/pkgs/development/python-modules/amazon_kclpy/default.nix index 44dc739f1ca..b39d3902740 100644 --- a/pkgs/development/python-modules/amazon_kclpy/default.nix +++ b/pkgs/development/python-modules/amazon_kclpy/default.nix @@ -2,13 +2,13 @@ buildPythonPackage rec { pname = "amazon_kclpy"; - version = "2.0.1"; + version = "2.0.2"; src = fetchFromGitHub { owner = "awslabs"; repo = "amazon-kinesis-client-python"; rev = "v${version}"; - sha256 = "13iq217fg0bxafp2rl684pg1rz4jbwid8cc8ip4rim07kzn65lbg"; + sha256 = "12yxcwml6g86sv1pj3wc2k97md9szdj6xx07qwri1mr9bdkzw7rv"; }; # argparse is just required for python2.6 diff --git a/pkgs/development/python-modules/ambee/default.nix b/pkgs/development/python-modules/ambee/default.nix index b6fe6851aea..2649d0fdd0b 100644 --- a/pkgs/development/python-modules/ambee/default.nix +++ b/pkgs/development/python-modules/ambee/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { pname = "ambee"; - version = "0.2.1"; + version = "0.3.0"; disabled = pythonOlder "3.8"; format = "pyproject"; @@ -20,7 +20,7 @@ buildPythonPackage rec { owner = "frenck"; repo = "python-ambee"; rev = "v${version}"; - sha256 = "11liw2206lyrnx09giqapjpi25lr2qnbmigi6rgynr2a1i9vxy1s"; + sha256 = "0vivzpfsmb4gy7k5wlbk5ylkpqy4jhki9lbgxyrrqj5yhhzz6cwy"; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/amqp/default.nix b/pkgs/development/python-modules/amqp/default.nix index 6e6d95ba8f9..6156472896a 100644 --- a/pkgs/development/python-modules/amqp/default.nix +++ b/pkgs/development/python-modules/amqp/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "amqp"; - version = "5.0.5"; + version = "5.0.6"; src = fetchPypi { inherit pname version; - sha256 = "affdd263d8b8eb3c98170b78bf83867cdb6a14901d586e00ddb65bfe2f0c4e60"; + sha256 = "03e16e94f2b34c31f8bf1206d8ddd3ccaa4c315f7f6a1879b7b1210d229568c2"; }; propagatedBuildInputs = [ vine ]; diff --git a/pkgs/development/python-modules/ansicolor/default.nix b/pkgs/development/python-modules/ansicolor/default.nix index 99a419a60fa..07a8190727b 100644 --- a/pkgs/development/python-modules/ansicolor/default.nix +++ b/pkgs/development/python-modules/ansicolor/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "ansicolor"; - version = "0.2.6"; + version = "0.3.2"; src = fetchPypi { inherit pname version; - sha256 = "d17e1b07b9dd7ded31699fbca53ae6cd373584f9b6dcbc124d1f321ebad31f1d"; + sha256 = "3b840a6b1184b5f1568635b1adab28147947522707d41ceba02d5ed0a0877279"; }; meta = with lib; { diff --git a/pkgs/development/python-modules/anyio/default.nix b/pkgs/development/python-modules/anyio/default.nix index 86fa3bafa2a..9ac37cdc599 100644 --- a/pkgs/development/python-modules/anyio/default.nix +++ b/pkgs/development/python-modules/anyio/default.nix @@ -3,6 +3,7 @@ , buildPythonPackage , fetchFromGitHub , pythonOlder +, setuptools-scm , idna , sniffio , typing-extensions @@ -18,7 +19,7 @@ buildPythonPackage rec { pname = "anyio"; - version = "3.1.0"; + version = "3.2.0"; format = "pyproject"; disabled = pythonOlder "3.7"; @@ -29,6 +30,14 @@ buildPythonPackage rec { sha256 = "sha256-zQiSAQN7cp1s+8hDTvYaMkHUXV1ccNwIsl2IOztH7J8="; }; + preBuild = '' + export SETUPTOOLS_SCM_PRETEND_VERSION=${version} + ''; + + nativeBuildInputs = [ + setuptools-scm + ]; + propagatedBuildInputs = [ idna sniffio diff --git a/pkgs/development/python-modules/apispec/default.nix b/pkgs/development/python-modules/apispec/default.nix index 1262bb3338a..2db76ab2483 100644 --- a/pkgs/development/python-modules/apispec/default.nix +++ b/pkgs/development/python-modules/apispec/default.nix @@ -12,12 +12,12 @@ buildPythonPackage rec { pname = "apispec"; - version = "4.4.1"; + version = "4.6.0"; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - sha256 = "sha256-qt7UrkUXUsWLcOV5kj2Nt9rwtx9i3vjI/noqUr18BqI="; + sha256 = "a896f97394b7d046d46c65262e51e45241dd8d9d71eedebcdb2d7024b775eec4"; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/applicationinsights/default.nix b/pkgs/development/python-modules/applicationinsights/default.nix index 9f77d435264..7576bcbdf1d 100644 --- a/pkgs/development/python-modules/applicationinsights/default.nix +++ b/pkgs/development/python-modules/applicationinsights/default.nix @@ -5,12 +5,12 @@ }: buildPythonPackage rec { - version = "0.11.9"; + version = "0.11.10"; pname = "applicationinsights"; src = fetchPypi { inherit pname version; - sha256 = "1hyjdv6xnswgqvip8y164piwfach9hjkbp7vc2qzhd7amjpim89h"; + sha256 = "0b761f3ef0680acf4731906dfc1807faa6f2a57168ae74592db0084a6099f7b3"; }; propagatedBuildInputs = [ portalocker ]; diff --git a/pkgs/development/python-modules/argcomplete/default.nix b/pkgs/development/python-modules/argcomplete/default.nix index f2a9db40f60..6c62fd104f2 100644 --- a/pkgs/development/python-modules/argcomplete/default.nix +++ b/pkgs/development/python-modules/argcomplete/default.nix @@ -7,11 +7,11 @@ }: buildPythonPackage rec { pname = "argcomplete"; - version = "1.12.2"; + version = "1.12.3"; src = fetchPypi { inherit pname version; - sha256 = "de0e1282330940d52ea92a80fea2e4b9e0da1932aaa570f84d268939d1897b04"; + sha256 = "2c7dbffd8c045ea534921e63b0be6fe65e88599990d8dc408ac8c542b72a5445"; }; doCheck = false; # meant to be ran with interactive interpreter diff --git a/pkgs/development/python-modules/arpeggio/default.nix b/pkgs/development/python-modules/arpeggio/default.nix index 29c5e438103..97718a30069 100644 --- a/pkgs/development/python-modules/arpeggio/default.nix +++ b/pkgs/development/python-modules/arpeggio/default.nix @@ -8,11 +8,11 @@ buildPythonPackage rec { pname = "Arpeggio"; - version = "1.10.1"; + version = "1.10.2"; src = fetchPypi { inherit pname version; - sha256 = "920d12cc762edb2eb56daae64a14c93e43dc181b481c88fc79314c0df6ee639e"; + sha256 = "bfe349f252f82f82d84cb886f1d5081d1a31451e6045275e9f90b65d0daa06f1"; }; # Shall not be needed for next release diff --git a/pkgs/development/python-modules/arrow/default.nix b/pkgs/development/python-modules/arrow/default.nix index 159ef917f52..d47dd61c3d4 100644 --- a/pkgs/development/python-modules/arrow/default.nix +++ b/pkgs/development/python-modules/arrow/default.nix @@ -12,13 +12,13 @@ buildPythonPackage rec { pname = "arrow"; - version = "1.0.3"; + version = "1.1.0"; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - sha256 = "399c9c8ae732270e1aa58ead835a79a40d7be8aa109c579898eb41029b5a231d"; + sha256 = "1n2vzyrirfj7fp0zn6iipm3i8bch0g4m14z02nrvlyjiyfmi7zmq"; }; postPatch = '' @@ -41,6 +41,8 @@ buildPythonPackage rec { "test_parse_tz_name_zzz" ]; + pythonImportsCheck = [ "arrow" ]; + meta = with lib; { description = "Python library for date manipulation"; homepage = "https://github.com/crsmithdev/arrow"; diff --git a/pkgs/development/python-modules/asciimatics/default.nix b/pkgs/development/python-modules/asciimatics/default.nix index cbddf962bd1..0d7286c171f 100644 --- a/pkgs/development/python-modules/asciimatics/default.nix +++ b/pkgs/development/python-modules/asciimatics/default.nix @@ -12,11 +12,11 @@ buildPythonPackage rec { pname = "asciimatics"; - version = "1.12.0"; + version = "1.13.0"; src = fetchPypi { inherit pname version; - sha256 = "4120461a3fb345638dee4fe0f8a3d3f9b6d2d2e003f95c5f914523f94463158d"; + sha256 = "a041826ec5add03fb882d8981c1debf9b9e98274f4f2d52ec21ef30de70c2c6e"; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/async-upnp-client/default.nix b/pkgs/development/python-modules/async-upnp-client/default.nix index 46084fcd8a9..369288293e1 100644 --- a/pkgs/development/python-modules/async-upnp-client/default.nix +++ b/pkgs/development/python-modules/async-upnp-client/default.nix @@ -13,14 +13,14 @@ buildPythonPackage rec { pname = "async-upnp-client"; - version = "0.18.0"; - disabled = pythonOlder "3.5"; + version = "0.19.0"; + disabled = pythonOlder "3.6"; src = fetchFromGitHub { owner = "StevenLooman"; repo = "async_upnp_client"; rev = version; - sha256 = "sha256-pntOy7J4dPtAS8ZzxLLV79VQ36r+0sXMImJFhDk9bQw="; + sha256 = "0xj3j54nasl59gs1k84h3fixjsaqn7whg33h6wi99l5yfbwfqv8p"; }; propagatedBuildInputs = [ @@ -36,6 +36,24 @@ buildPythonPackage rec { pytest-asyncio ]; + disabledTests = [ + # socket.gaierror: [Errno -2] Name or service not known + "test_get_local_ip" + "test_async_get_local_ip" + # OSError: [Errno 101] Network is unreachable + "test_subscribe_fail" + "test_subscribe_auto_resubscribe" + "test_subscribe_manual_resubscribe" + "test_auto_resubscribe_fail" + "test_on_notify_dlna_event" + "test_on_notify_upnp_event" + "test_unsubscribe" + "test_subscribe" + "test_subscribe_renew" + "test_start_server" + "test_init" + ]; + pythonImportsCheck = [ "async_upnp_client" ]; meta = with lib; { diff --git a/pkgs/development/python-modules/asyncio_mqtt/default.nix b/pkgs/development/python-modules/asyncio_mqtt/default.nix index bb2ead70d71..522f406da42 100644 --- a/pkgs/development/python-modules/asyncio_mqtt/default.nix +++ b/pkgs/development/python-modules/asyncio_mqtt/default.nix @@ -9,11 +9,11 @@ buildPythonPackage rec { pname = "asyncio_mqtt"; - version = "0.8.1"; + version = "0.9.1"; src = fetchPypi { inherit pname version; - sha256 = "c1b3bea68a35c83d290a89903079ffb311106195cd56867e201633a1ee1cad0c"; + sha256 = "0550229cecde6ff1751c49dd5ea26b02bf52b7e9bbe9bf763da765f35bb281de"; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/asyncpg/default.nix b/pkgs/development/python-modules/asyncpg/default.nix index 674212bf922..5525f7940c2 100644 --- a/pkgs/development/python-modules/asyncpg/default.nix +++ b/pkgs/development/python-modules/asyncpg/default.nix @@ -3,12 +3,12 @@ buildPythonPackage rec { pname = "asyncpg"; - version = "0.22.0"; + version = "0.23.0"; disabled = !isPy3k; src = fetchPypi { inherit pname version; - sha256 = "348ad471d9bdd77f0609a00c860142f47c81c9123f4064d13d65c8569415d802"; + sha256 = "812dafa4c9e264d430adcc0f5899f0dc5413155a605088af696f952d72d36b5e"; }; checkInputs = [ diff --git a/pkgs/development/python-modules/asyncssh/default.nix b/pkgs/development/python-modules/asyncssh/default.nix index f6d59c633cd..f02f5291bf1 100644 --- a/pkgs/development/python-modules/asyncssh/default.nix +++ b/pkgs/development/python-modules/asyncssh/default.nix @@ -5,12 +5,12 @@ buildPythonPackage rec { pname = "asyncssh"; - version = "2.5.0"; + version = "2.6.0"; disabled = pythonOlder "3.4"; src = fetchPypi { inherit pname version; - sha256 = "0b65e2af73a2e39a271bd627abbe4f7e4b0345486ed403e65987d79c72fcb70b"; + sha256 = "20f0ef553a1e64a7d38db86ba3a2f3907e72f1e81f3dfec5edb191383783c7d1"; }; patches = [ diff --git a/pkgs/development/python-modules/asyncwhois/default.nix b/pkgs/development/python-modules/asyncwhois/default.nix index fe055d7f197..3dffc71a9d5 100644 --- a/pkgs/development/python-modules/asyncwhois/default.nix +++ b/pkgs/development/python-modules/asyncwhois/default.nix @@ -10,14 +10,14 @@ buildPythonPackage rec { pname = "asyncwhois"; - version = "0.3.1"; + version = "0.3.2"; disabled = pythonOlder "3.7"; src = fetchFromGitHub { owner = "pogzyb"; repo = pname; rev = "v${version}"; - sha256 = "1wp6pwnc1inzzn9nhkwq9m9ab1aylw0hzq94w6p2dsm2njfqma8h"; + sha256 = "0cxmvxc82dxrg18kcc321hfmp877knl76pa6dpfhwphwfs2v02f1"; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/atpublic/default.nix b/pkgs/development/python-modules/atpublic/default.nix index f2173399104..5f00955eef9 100644 --- a/pkgs/development/python-modules/atpublic/default.nix +++ b/pkgs/development/python-modules/atpublic/default.nix @@ -7,12 +7,12 @@ buildPythonPackage rec { pname = "atpublic"; - version = "2.1.3"; + version = "2.3"; disabled = !isPy3k; src = fetchPypi { inherit pname version; - sha256 = "e0b274759bfbcb6eeb7c7b44a7a46391990a43ac77aa55359b075765b54d9f5d"; + sha256 = "d6b9167fc3e09a2de2d2adcfc9a1b48d84eab70753c97de3800362e1703e3367"; }; propagatedBuildInputs = lib.optionals (pythonOlder "3.8") [ diff --git a/pkgs/development/python-modules/atsim_potentials/default.nix b/pkgs/development/python-modules/atsim_potentials/default.nix index 4802ea867b7..b692c900977 100644 --- a/pkgs/development/python-modules/atsim_potentials/default.nix +++ b/pkgs/development/python-modules/atsim_potentials/default.nix @@ -10,12 +10,12 @@ }: buildPythonPackage rec { - version = "0.3.0"; + version = "0.4.0"; pname = "atsim.potentials"; src = fetchPypi { inherit pname version; - sha256 = "70082fc40b0ab7565a671c2d764fe3db08bc6ce45da44e1c1e8b77a65d1f7a23"; + sha256 = "0c3e4e2323e969880f17a9924642e0991be5761f50b254bcbadd046db3be6390"; }; checkInputs = [ pytest ]; diff --git a/pkgs/development/python-modules/attrs/default.nix b/pkgs/development/python-modules/attrs/default.nix index 7513aa04f30..08730e3d689 100644 --- a/pkgs/development/python-modules/attrs/default.nix +++ b/pkgs/development/python-modules/attrs/default.nix @@ -1,27 +1,36 @@ -{ lib, stdenv, buildPythonPackage, fetchPypi, pytest, hypothesis, zope_interface -, pympler, coverage, six, clang }: +{ lib +, callPackage +, buildPythonPackage +, fetchPypi +}: buildPythonPackage rec { pname = "attrs"; - version = "20.3.0"; + version = "21.2.0"; src = fetchPypi { inherit pname version; - sha256 = "832aa3cde19744e49938b91fea06d69ecb9e649c93ba974535d08ad92164f700"; + sha256 = "ef6aaac3ca6cd92904cdd0d83f629a15f18053ec84e6432106f7a4d04ae4f5fb"; }; - # macOS needs clang for testing - checkInputs = [ - pytest hypothesis zope_interface pympler coverage six - ] ++ lib.optionals (stdenv.isDarwin) [ clang ]; + outputs = [ "out" "testout" ]; - checkPhase = '' - py.test + postInstall = '' + # Install tests as the tests output. + mkdir $testout + cp -R tests $testout/tests ''; - # To prevent infinite recursion with pytest + pythonImportsCheck = [ "attr" ]; + + # pytest depends on attrs, so we can't do this out-of-the-box. + # Instead, we do this as a passthru.tests test. doCheck = false; + passthru.tests = { + pytest = callPackage ./tests.nix { }; + }; + meta = with lib; { description = "Python attributes without boilerplate"; homepage = "https://github.com/hynek/attrs"; diff --git a/pkgs/development/python-modules/attrs/tests.nix b/pkgs/development/python-modules/attrs/tests.nix new file mode 100644 index 00000000000..c9fae9e0228 --- /dev/null +++ b/pkgs/development/python-modules/attrs/tests.nix @@ -0,0 +1,21 @@ +{ buildPythonPackage +, pytestCheckHook +, attrs +, hypothesis +}: + +buildPythonPackage { + pname = "attrs-tests"; + inherit (attrs) version; + + srcs = attrs.testout; + + dontBuild = true; + dontInstall = true; + + checkInputs = [ + attrs + hypothesis + pytestCheckHook + ]; +} diff --git a/pkgs/development/python-modules/auth0-python/default.nix b/pkgs/development/python-modules/auth0-python/default.nix index 81aee196a3b..67701afc0eb 100644 --- a/pkgs/development/python-modules/auth0-python/default.nix +++ b/pkgs/development/python-modules/auth0-python/default.nix @@ -18,6 +18,7 @@ buildPythonPackage rec { propagatedBuildInputs = [ requests + pyjwt ]; checkInputs = [ diff --git a/pkgs/development/python-modules/awkward/default.nix b/pkgs/development/python-modules/awkward/default.nix index 4057758155e..b39a7290387 100644 --- a/pkgs/development/python-modules/awkward/default.nix +++ b/pkgs/development/python-modules/awkward/default.nix @@ -10,11 +10,11 @@ buildPythonPackage rec { pname = "awkward"; - version = "1.2.3"; + version = "1.3.0"; src = fetchPypi { inherit pname version; - sha256 = "7d727542927a926f488fa62d04e2c5728c72660f17f822e627f349285f295063"; + sha256 = "b6021694adec9813842bad1987b837e439dabaf5b0dff9041201d238fca71fb4"; }; nativeBuildInputs = [ cmake ]; diff --git a/pkgs/development/python-modules/aws-lambda-builders/default.nix b/pkgs/development/python-modules/aws-lambda-builders/default.nix index 30059fe5a93..e1a955fbb81 100644 --- a/pkgs/development/python-modules/aws-lambda-builders/default.nix +++ b/pkgs/development/python-modules/aws-lambda-builders/default.nix @@ -12,14 +12,14 @@ buildPythonPackage rec { pname = "aws-lambda-builders"; - version = "1.3.0"; + version = "1.4.0"; # No tests available in PyPI tarball src = fetchFromGitHub { owner = "awslabs"; repo = "aws-lambda-builders"; rev = "v${version}"; - sha256 = "1cfacp0a5qsaf3crcybslhbfwm1mqfyafj71dlvnidzx7b9bm60v"; + sha256 = "0g7qj74mgazc7y1w0d9vs276vmfb3svi5whn2c87bryhrwq650vf"; }; # Package is not compatible with Python 3.5 diff --git a/pkgs/development/python-modules/aws-sam-translator/default.nix b/pkgs/development/python-modules/aws-sam-translator/default.nix index d996c34b503..166ba0b7249 100644 --- a/pkgs/development/python-modules/aws-sam-translator/default.nix +++ b/pkgs/development/python-modules/aws-sam-translator/default.nix @@ -10,11 +10,11 @@ buildPythonPackage rec { pname = "aws-sam-translator"; - version = "1.35.0"; + version = "1.36.0"; src = fetchPypi { inherit pname version; - sha256 = "5cf7faab3566843f3b44ef1a42a9c106ffb50809da4002faab818076dcc7bff8"; + sha256 = "fa1b990d9329d19052e7b91cf0b19371ed9d31a529054b616005884cd662b584"; }; # Tests are not included in the PyPI package diff --git a/pkgs/development/python-modules/aws-xray-sdk/default.nix b/pkgs/development/python-modules/aws-xray-sdk/default.nix index 0e1c272b3c8..a304fae19df 100644 --- a/pkgs/development/python-modules/aws-xray-sdk/default.nix +++ b/pkgs/development/python-modules/aws-xray-sdk/default.nix @@ -12,11 +12,11 @@ buildPythonPackage rec { pname = "aws-xray-sdk"; - version = "2.7.0"; + version = "2.8.0"; src = fetchPypi { inherit pname version; - sha256 = "697c9068e84dd5d2c1456def3fd0865f226046b5db4db56d738050e425960adf"; + sha256 = "90c2fcc982a770e86d009a4c3d2b5c3e372da91cb8284d982bae458e2c0bb268"; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/awscrt/default.nix b/pkgs/development/python-modules/awscrt/default.nix index 26c4334e319..08e0563b966 100644 --- a/pkgs/development/python-modules/awscrt/default.nix +++ b/pkgs/development/python-modules/awscrt/default.nix @@ -2,7 +2,7 @@ buildPythonPackage rec { pname = "awscrt"; - version = "0.11.13"; + version = "0.11.24"; buildInputs = lib.optionals stdenv.isDarwin (with darwin.apple_sdk.frameworks; [ CoreFoundation Security ]); @@ -23,7 +23,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "sha256-G/bf2AzWp8AHL4of0zfX3jIYyTtmTLBIC2ZKiMi19c0="; + sha256 = "b8aa68bca404bf0085be0570eff5b542d01f7e8e3c0f9b0859abfe5e070162ff"; }; meta = with lib; { diff --git a/pkgs/development/python-modules/awslambdaric/default.nix b/pkgs/development/python-modules/awslambdaric/default.nix index ff26bb6245d..db55543ca5a 100644 --- a/pkgs/development/python-modules/awslambdaric/default.nix +++ b/pkgs/development/python-modules/awslambdaric/default.nix @@ -3,14 +3,14 @@ buildPythonPackage rec { pname = "awslambdaric"; - version = "1.0.0"; + version = "1.1.1"; disabled = isPy27; src = fetchFromGitHub { owner = "aws"; repo = "aws-lambda-python-runtime-interface-client"; - rev = "v${version}"; - sha256 = "13v1lsp3lxbqknvlb3gvljjf3wyrx5jg8sf9yfiaj1sm8pb8pmrf"; + rev = version; + sha256 = "1f8828y32yrf87bc933jhmjrvj746baibvpn0w21x3ji81vf6mri"; }; propagatedBuildInputs = [ simplejson ]; diff --git a/pkgs/development/python-modules/azure-cosmos/default.nix b/pkgs/development/python-modules/azure-cosmos/default.nix index 4fa05ada850..47e6fb6f039 100644 --- a/pkgs/development/python-modules/azure-cosmos/default.nix +++ b/pkgs/development/python-modules/azure-cosmos/default.nix @@ -7,12 +7,12 @@ }: buildPythonPackage rec { - version = "3.1.2"; + version = "3.2.0"; pname = "azure-cosmos"; src = fetchPypi { inherit pname version; - sha256 = "7f8ac99e4e40c398089fc383bfadcdc83376f72b88532b0cac0b420357cd08c7"; + sha256 = "4f77cc558fecffac04377ba758ac4e23f076dc1c54e2cf2515f85bc15cbde5c6"; }; propagatedBuildInputs = [ six requests ]; diff --git a/pkgs/development/python-modules/azure-eventgrid/default.nix b/pkgs/development/python-modules/azure-eventgrid/default.nix index f83040a4b3c..8d2c8f21f2b 100644 --- a/pkgs/development/python-modules/azure-eventgrid/default.nix +++ b/pkgs/development/python-modules/azure-eventgrid/default.nix @@ -9,12 +9,12 @@ buildPythonPackage rec { pname = "azure-eventgrid"; - version = "4.2.0"; + version = "4.3.0"; src = fetchPypi { inherit pname version; extension = "zip"; - sha256 = "77af2c20abde7d8342da7993781605b440aeac0f95c4af13bb87465c3bd5fe35"; + sha256 = "bf50c8a4dc022ff9b1810800cb431b2c68b748eed160dd71fb8eb9bd860c7ecc"; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/azure-mgmt-kusto/azure-mgmt-apimanagement/default.nix b/pkgs/development/python-modules/azure-mgmt-kusto/azure-mgmt-apimanagement/default.nix index 9f5c04adb26..6cf775c2118 100644 --- a/pkgs/development/python-modules/azure-mgmt-kusto/azure-mgmt-apimanagement/default.nix +++ b/pkgs/development/python-modules/azure-mgmt-kusto/azure-mgmt-apimanagement/default.nix @@ -5,13 +5,13 @@ }: buildPythonPackage rec { - version = "0.1.0"; + version = "0.3.0"; pname = "azure-mgmt-apimanagement"; disabled = isPy27; src = fetchPypi { inherit pname version; - sha256 = "06bqqkn5mx127x1z7ycm6rl8ajxlrmrm2kcdpgkbl4baii1x6iax"; + sha256 = "ec363581ef950945447e45d259441cb690a4b790057c7b8470ad8a6eeca04feb"; extension = "zip"; }; diff --git a/pkgs/development/python-modules/azure-storage-file-share/default.nix b/pkgs/development/python-modules/azure-storage-file-share/default.nix index a1322c03c9f..eb2fb40b336 100644 --- a/pkgs/development/python-modules/azure-storage-file-share/default.nix +++ b/pkgs/development/python-modules/azure-storage-file-share/default.nix @@ -12,13 +12,13 @@ buildPythonPackage rec { pname = "azure-storage-file-share"; - version = "12.4.2"; + version = "12.5.0"; disabled = !isPy3k; src = fetchPypi { inherit pname version; extension = "zip"; - sha256 = "6c458d1e3db38fdd502d8f77107c81e6859654f02c0e7f2a98214289d9e0dde2"; + sha256 = "ed82e9bf8d25d62e50996604fce701cec6a39ec0ceba6efbf8790f7f8b7746a8"; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/b2sdk/default.nix b/pkgs/development/python-modules/b2sdk/default.nix index 47ed0fe5fd6..c6122e15a83 100644 --- a/pkgs/development/python-modules/b2sdk/default.nix +++ b/pkgs/development/python-modules/b2sdk/default.nix @@ -16,12 +16,12 @@ buildPythonPackage rec { pname = "b2sdk"; - version = "1.7.0"; + version = "1.9.0"; disabled = isPy27; src = fetchPypi { inherit pname version; - sha256 = "sha256-8X5XLh9SxZI1P7/2ZjOy8ipcEzTcriJfGI7KlMXncv4="; + sha256 = "ff9c27c89f53583fd83c711d0a642d9b3bdbb8682c2e8e2315674b517cb441ec"; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/backports_functools_lru_cache/default.nix b/pkgs/development/python-modules/backports_functools_lru_cache/default.nix index 8a9bc228385..586176300b7 100644 --- a/pkgs/development/python-modules/backports_functools_lru_cache/default.nix +++ b/pkgs/development/python-modules/backports_functools_lru_cache/default.nix @@ -11,11 +11,11 @@ buildPythonPackage rec { pname = "backports.functools_lru_cache"; - version = "1.6.3"; + version = "1.6.4"; src = fetchPypi { inherit pname version; - sha256 = "d84e126e2a29e4fde8931ff8131240bbf30a0e7dbcc3897a8dbd8ea5ac11419c"; + sha256 = "d5ed2169378b67d3c545e5600d363a923b09c456dab1593914935a68ad478271"; }; nativeBuildInputs = [ setuptools-scm ]; diff --git a/pkgs/development/python-modules/batchspawner/default.nix b/pkgs/development/python-modules/batchspawner/default.nix index 2acfa5ecd17..2b7cd1b21ec 100644 --- a/pkgs/development/python-modules/batchspawner/default.nix +++ b/pkgs/development/python-modules/batchspawner/default.nix @@ -7,14 +7,14 @@ buildPythonPackage rec { pname = "batchspawner"; - version = "1.0.1"; + version = "1.1.0"; disabled = isPy27; src = fetchFromGitHub { owner = "jupyterhub"; repo = "batchspawner"; rev = "v${version}"; - sha256 = "0vqf3qc2yp52441s6xwgixgl37976qqgpd9sshbgh924j314v1yv"; + sha256 = "0zv485b7fk5zlwgp5fyibanqzbpisdl2a0gz70fwdj4kl462axnw"; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/bids-validator/default.nix b/pkgs/development/python-modules/bids-validator/default.nix index d62c929e877..aee7147f5b4 100644 --- a/pkgs/development/python-modules/bids-validator/default.nix +++ b/pkgs/development/python-modules/bids-validator/default.nix @@ -4,12 +4,12 @@ }: buildPythonPackage rec { - version = "1.6.0"; + version = "1.7.2"; pname = "bids-validator"; src = fetchPypi { inherit pname version; - sha256 = "6858eab83068d34a9d41155c931ca8db9faef2272710d9730c2135915c19be82"; + sha256 = "12398831a3a3a2ed7c67e693cf596610c23dd23e0889bfeae0830bbd1d41e5b9"; }; # needs packages which are not available in nixpkgs diff --git a/pkgs/development/python-modules/billiard/default.nix b/pkgs/development/python-modules/billiard/default.nix index 2d4eabf215e..79aca1e4a99 100644 --- a/pkgs/development/python-modules/billiard/default.nix +++ b/pkgs/development/python-modules/billiard/default.nix @@ -1,23 +1,27 @@ -{ lib, buildPythonPackage, fetchPypi, isPyPy, pytestCheckHook, case, psutil, fetchpatch }: +{ lib +, buildPythonPackage +, fetchPypi +, isPyPy +, pytestCheckHook +, case +, psutil +}: buildPythonPackage rec { pname = "billiard"; - version = "3.6.3.0"; + version = "3.6.4.0"; disabled = isPyPy; src = fetchPypi { inherit pname version; - sha256 = "0spssl3byzqsplra166d59jx8iqfxyzvcbx7vybkmwr5ck72a5yr"; + sha256 = "0ismj2p8c66ykpss94rs0bfra5agxxmljz8r3gaq79r8valfb799"; }; - patches = [(fetchpatch { - # Add Python 3.9 support to spawnv_passfds() - # Should be included in next release after 3.6.3.0 - url = "https://github.com/celery/billiard/pull/310/commits/a508ebafadcfe2e25554b029593f3e66d01ede6c.patch"; - sha256 = "05zsr1bvjgi01qg7r274c0qvbn65iig3clyz14c08mpfyn38h84i"; - excludes = [ "tox.ini" ]; - })]; - checkInputs = [ pytestCheckHook case psutil ]; + checkInputs = [ + case + psutil + pytestCheckHook + ]; meta = with lib; { homepage = "https://github.com/celery/billiard"; diff --git a/pkgs/development/python-modules/biopython/default.nix b/pkgs/development/python-modules/biopython/default.nix index 43b48aa03a4..002b3ce2e29 100644 --- a/pkgs/development/python-modules/biopython/default.nix +++ b/pkgs/development/python-modules/biopython/default.nix @@ -7,11 +7,11 @@ buildPythonPackage rec { pname = "biopython"; - version = "1.78"; + version = "1.79"; src = fetchPypi { inherit pname version; - sha256 = "1ee0a0b6c2376680fea6642d5080baa419fd73df104a62d58a8baf7a8bbe4564"; + sha256 = "edb07eac99d3b8abd7ba56ff4bedec9263f76dfc3c3f450e7d2e2bcdecf8559b"; }; disabled = !isPy3k; diff --git a/pkgs/development/python-modules/bip_utils/default.nix b/pkgs/development/python-modules/bip_utils/default.nix index 94f6e3df8f2..3d3c85eea3b 100644 --- a/pkgs/development/python-modules/bip_utils/default.nix +++ b/pkgs/development/python-modules/bip_utils/default.nix @@ -8,7 +8,7 @@ buildPythonPackage rec { pname = "bip_utils"; - version = "1.9.0"; + version = "1.11.1"; disabled = pythonOlder "3.6"; @@ -16,7 +16,7 @@ buildPythonPackage rec { owner = "ebellocchia"; repo = pname; rev = "v${version}"; - sha256 = "0i1jdpdsrc8cal5x0b1am9mgbca69ymxlaqpkw0y4d0m3m6vs33k"; + sha256 = "0r8h979rklq7cvl0b449mfrx62dv367s31zgwfqn81kj72i3ndg4"; }; propagatedBuildInputs = [ ecdsa pysha3 ]; diff --git a/pkgs/development/python-modules/bitarray/default.nix b/pkgs/development/python-modules/bitarray/default.nix index 2119474c7bc..985c5429f7e 100644 --- a/pkgs/development/python-modules/bitarray/default.nix +++ b/pkgs/development/python-modules/bitarray/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "1q4p592i3kv2yrgax1g03yz8316rzzydpyfsnmqrbc7ilxrgyjm2"; + sha256 = "a24aff72a7f1b09571b5daf9dbfcffd98481be1fe085ae5ef662cf11452a97e0"; }; checkPhase = '' diff --git a/pkgs/development/python-modules/blessed/default.nix b/pkgs/development/python-modules/blessed/default.nix index 6be290f0f79..f3a6a9dd3b4 100644 --- a/pkgs/development/python-modules/blessed/default.nix +++ b/pkgs/development/python-modules/blessed/default.nix @@ -4,11 +4,11 @@ buildPythonPackage rec { pname = "blessed"; - version = "1.18.0"; + version = "1.18.1"; src = fetchPypi { inherit pname version; - sha256 = "1312879f971330a1b7f2c6341f2ae7e2cbac244bfc9d0ecfbbecd4b0293bc755"; + sha256 = "8b09936def6bc06583db99b65636b980075733e13550cb6af262ce724a55da23"; }; checkInputs = [ pytest mock glibcLocales ]; diff --git a/pkgs/development/python-modules/bokeh/default.nix b/pkgs/development/python-modules/bokeh/default.nix index 18fea103664..6677d9ceacb 100644 --- a/pkgs/development/python-modules/bokeh/default.nix +++ b/pkgs/development/python-modules/bokeh/default.nix @@ -34,11 +34,11 @@ buildPythonPackage rec { pname = "bokeh"; # update together with panel which is not straightforward - version = "2.3.0"; + version = "2.3.2"; src = fetchPypi { inherit pname version; - sha256 = "dd417708f90702190222b1068a645acae99e66d4b58d7a336d545aeaa04e9b40"; + sha256 = "fcc0d0a3129ae457cdb0a4f503843a4d13d1f5d07af7748424ea8c7ddfc321f1"; }; patches = [ diff --git a/pkgs/development/python-modules/boto3/default.nix b/pkgs/development/python-modules/boto3/default.nix index 73cb44d0811..c8b8210f650 100644 --- a/pkgs/development/python-modules/boto3/default.nix +++ b/pkgs/development/python-modules/boto3/default.nix @@ -13,11 +13,11 @@ buildPythonPackage rec { pname = "boto3"; - version = "1.17.88"; # N.B: if you change this, change botocore and awscli to a matching version + version = "1.17.97"; # N.B: if you change this, change botocore and awscli to a matching version src = fetchPypi { inherit pname version; - sha256 = "sha256-pxXKbERX1W6j4+/em9yL5BwpsvKpBPvRK+/bnLXiieQ="; + sha256 = "0ab5afc51461c30f27aebef944211d16f47697b98ff8d2e2f6e49e59584853bb"; }; propagatedBuildInputs = [ botocore jmespath s3transfer ] ++ lib.optionals (!isPy3k) [ futures ]; diff --git a/pkgs/development/python-modules/botocore/default.nix b/pkgs/development/python-modules/botocore/default.nix index a3c77e1fab7..8a21eb455e0 100644 --- a/pkgs/development/python-modules/botocore/default.nix +++ b/pkgs/development/python-modules/botocore/default.nix @@ -13,11 +13,11 @@ buildPythonPackage rec { pname = "botocore"; - version = "1.20.88"; # N.B: if you change this, change boto3 and awscli to a matching version + version = "1.20.97"; # N.B: if you change this, change boto3 and awscli to a matching version src = fetchPypi { inherit pname version; - sha256 = "sha256-vJie2rUtR4iq3Y0a/5JfXGp8vGiQC/2443mWWurBcxc="; + sha256 = "f7e119cf3e0f4a36100f0e983583afa91a84fb27c479a1716820aee4f2e190ab"; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/braintree/default.nix b/pkgs/development/python-modules/braintree/default.nix index 7e1c8f5a583..6d64def54ab 100644 --- a/pkgs/development/python-modules/braintree/default.nix +++ b/pkgs/development/python-modules/braintree/default.nix @@ -6,11 +6,11 @@ buildPythonPackage rec { pname = "braintree"; - version = "4.7.0"; + version = "4.10.0"; src = fetchPypi { inherit pname version; - sha256 = "25a95f95acb7f180b37f8dcf4df7efa84ae0ba6ad9dc4ba0e724e2cc534c3483"; + sha256 = "f934a329c7a2b3f7058d5c733cc95da694f66afb5a789162ec701ba4d26a0d90"; }; propagatedBuildInputs = [ requests ]; diff --git a/pkgs/development/python-modules/breathe/default.nix b/pkgs/development/python-modules/breathe/default.nix index 1ca33222ef5..d863d946399 100644 --- a/pkgs/development/python-modules/breathe/default.nix +++ b/pkgs/development/python-modules/breathe/default.nix @@ -1,13 +1,13 @@ { lib, fetchPypi, buildPythonPackage, docutils, six, sphinx, isPy3k, isPy27 }: buildPythonPackage rec { - version = "4.28.0"; + version = "4.30.0"; pname = "breathe"; disabled = isPy27; src = fetchPypi { inherit pname version; - sha256 = "11e35a5fed7545554be51b70eea4578643d8c08972bea43774f413943006b17a"; + sha256 = "363dec85abc0c4b3f22628b0cf82cc2dc46c4397d8a18312d1a7d1365d49b014"; }; propagatedBuildInputs = [ docutils six sphinx ]; diff --git a/pkgs/development/python-modules/browser-cookie3/default.nix b/pkgs/development/python-modules/browser-cookie3/default.nix index 7b579a84ba1..d4d52b9b03b 100644 --- a/pkgs/development/python-modules/browser-cookie3/default.nix +++ b/pkgs/development/python-modules/browser-cookie3/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "browser-cookie3"; - version = "0.12.0"; + version = "0.12.1"; src = fetchPypi { inherit pname version; - sha256 = "5f26422091ad0e97375d565f8fbacfaf314d0722db35c921635eab23686e4fc4"; + sha256 = "72c1e6aa6a98adab3a6797b889664bdbfddc287474dd8e774da37a854ec32185"; }; disabled = !isPy3k; diff --git a/pkgs/development/python-modules/bsdiff4/default.nix b/pkgs/development/python-modules/bsdiff4/default.nix index 339e649c53a..5687e9c7bf7 100644 --- a/pkgs/development/python-modules/bsdiff4/default.nix +++ b/pkgs/development/python-modules/bsdiff4/default.nix @@ -6,11 +6,11 @@ buildPythonPackage rec { pname = "bsdiff4"; - version = "1.2.0"; + version = "1.2.1"; src = fetchPypi { inherit pname version; - sha256 = "17fc0dd4204x5gqapvbrc4kv83jdajs00jxm739586pl0iapybrw"; + sha256 = "87cffc7522effdda03fd1564b212ad2279c0af50d16c3e65776f80acb6705d4b"; }; checkPhase = '' diff --git a/pkgs/development/python-modules/btrees/default.nix b/pkgs/development/python-modules/btrees/default.nix index 3da6852c54d..1fadf927a44 100644 --- a/pkgs/development/python-modules/btrees/default.nix +++ b/pkgs/development/python-modules/btrees/default.nix @@ -9,7 +9,7 @@ buildPythonPackage rec { pname = "BTrees"; - version = "4.7.2"; + version = "4.9.2"; buildInputs = [ transaction ]; propagatedBuildInputs = [ persistent zope_interface ]; @@ -23,7 +23,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "7ce4a5eb5c135bcb5c06b5bd1ca6fd7fd39d8631306182307ed8bc30d3033846"; + sha256 = "d33323655924192c4ac998d9ee3002e787915d19c1e17a6baf47c9a63d9556e3"; }; meta = with lib; { diff --git a/pkgs/development/python-modules/bugsnag/default.nix b/pkgs/development/python-modules/bugsnag/default.nix index 33845368480..65cfa74777a 100644 --- a/pkgs/development/python-modules/bugsnag/default.nix +++ b/pkgs/development/python-modules/bugsnag/default.nix @@ -8,12 +8,12 @@ buildPythonPackage rec { pname = "bugsnag"; - version = "4.0.2"; + version = "4.0.3"; disabled = pythonOlder "3.5"; src = fetchPypi { inherit pname version; - sha256 = "7a49dacf055a8c6dda4ce714acd91fabe9546f1ad826276918a26603a8b5489a"; + sha256 = "0b70bc95e4e4f98b2eef7a3dadfdc50c1a40da7f50446adf43be05574a4b9f7c"; }; propagatedBuildInputs = [ six webob ]; diff --git a/pkgs/development/python-modules/cachetools/default.nix b/pkgs/development/python-modules/cachetools/default.nix index a160c5ea94c..fe7ad48274e 100644 --- a/pkgs/development/python-modules/cachetools/default.nix +++ b/pkgs/development/python-modules/cachetools/default.nix @@ -7,7 +7,7 @@ buildPythonPackage rec { pname = "cachetools"; - version = "4.2.1"; + version = "4.2.2"; disabled = isPy27; @@ -15,7 +15,7 @@ buildPythonPackage rec { owner = "tkem"; repo = pname; rev = "v${version}"; - sha256 = "1b662ph8m2d05d2vi3izgnr6v7h9zfvscfsaaw8nhdmmm15ivfa6"; + sha256 = "sha256-JTm8ht2Ubn34uQLR0yjUjXSdDQggWfYUlS0T628OUoI="; }; checkInputs = [ pytestCheckHook ]; diff --git a/pkgs/development/python-modules/carbon/default.nix b/pkgs/development/python-modules/carbon/default.nix index b651a654d5e..acc3aa144eb 100644 --- a/pkgs/development/python-modules/carbon/default.nix +++ b/pkgs/development/python-modules/carbon/default.nix @@ -4,11 +4,11 @@ buildPythonPackage rec { pname = "carbon"; - version = "1.1.7"; + version = "1.1.8"; src = fetchPypi { inherit pname version; - sha256 = "08ndphpcbdx2ab4f5jsn2y4l5p55h9wscbg7clhbyyh03r5hianr"; + sha256 = "95918c4b14e1c525d9499554d5e03b349f87e0c2bc17ec5c64d18679a30b69f1"; }; # Carbon-s default installation is /opt/graphite. This env variable ensures diff --git a/pkgs/development/python-modules/casbin/default.nix b/pkgs/development/python-modules/casbin/default.nix index ea6e2ed079a..3f2b26e9c5f 100644 --- a/pkgs/development/python-modules/casbin/default.nix +++ b/pkgs/development/python-modules/casbin/default.nix @@ -8,7 +8,7 @@ buildPythonPackage rec { pname = "casbin"; - version = "0.19.1"; + version = "0.20.0"; disabled = isPy27; @@ -16,7 +16,7 @@ buildPythonPackage rec { owner = pname; repo = "pycasbin"; rev = "v${version}"; - sha256 = "0fkkz5k3h4pkxacrbacamnh4yfghxgajdzzmdlck7i4v5x06vz8f"; + sha256 = "1j7kd4rvf4myg4x4sm4njlhzkxm2m3cva9wmp9vx0nnpfdlyb67f"; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/cbor2/default.nix b/pkgs/development/python-modules/cbor2/default.nix index 534ba3c9af5..7f417acd360 100644 --- a/pkgs/development/python-modules/cbor2/default.nix +++ b/pkgs/development/python-modules/cbor2/default.nix @@ -9,11 +9,11 @@ buildPythonPackage rec { pname = "cbor2"; - version = "5.2.0"; + version = "5.4.0"; src = fetchPypi { inherit pname version; - sha256 = "a33aa2e5534fd74401ac95686886e655e3b2ce6383b3f958199b6e70a87c94bf"; + sha256 = "a7926f7244b08c413f1a4fa71a81aa256771c75bdf1a4fd77308547a2d63dd48"; }; nativeBuildInputs = [ setuptools-scm ]; diff --git a/pkgs/development/python-modules/celery/default.nix b/pkgs/development/python-modules/celery/default.nix index f0fe81f85e2..480f7acb3d1 100644 --- a/pkgs/development/python-modules/celery/default.nix +++ b/pkgs/development/python-modules/celery/default.nix @@ -5,11 +5,11 @@ buildPythonPackage rec { pname = "celery"; - version = "5.0.5"; + version = "5.1.1"; src = fetchPypi { inherit pname version; - sha256 = "f4efebe6f8629b0da2b8e529424de376494f5b7a743c321c8a2ddc2b1414921c"; + sha256 = "54436cd97b031bf2e08064223240e2a83d601d9414bcb1b702f94c6c33c29485"; }; postPatch = '' diff --git a/pkgs/development/python-modules/cerberus/default.nix b/pkgs/development/python-modules/cerberus/default.nix index cdf6519d325..7686b919272 100644 --- a/pkgs/development/python-modules/cerberus/default.nix +++ b/pkgs/development/python-modules/cerberus/default.nix @@ -1,20 +1,38 @@ -{ lib, buildPythonPackage, fetchPypi, pytestrunner, pytest }: +{ lib +, buildPythonPackage +, fetchFromGitHub +, pytestCheckHook +}: buildPythonPackage rec { pname = "Cerberus"; - version = "1.3.2"; + version = "1.3.4"; - src = fetchPypi { - inherit pname version; - sha256 = "12cm547hpypqd7bwcl4wr4w6varibc1dagzicg5qbp86yaa6cbih"; + src = fetchFromGitHub { + owner = "pyeve"; + repo = "cerberus"; + rev = version; + sha256 = "03kj15cf1pbd11mxsik96m5w1m6p0fbdc4ia5ihzmq8rz28razpq"; }; - checkInputs = [ pytestrunner pytest ]; + checkInputs = [ + pytestCheckHook + ]; - checkPhase = '' - pytest -k 'not nested_oneofs' + preCheck = '' + export TESTDIR=$(mktemp -d) + cp -R ./cerberus/tests $TESTDIR + pushd $TESTDIR ''; + postCheck = '' + popd + ''; + + pythonImportsCheck = [ + "cerberus" + ]; + meta = with lib; { homepage = "http://python-cerberus.org/"; description = "Lightweight, extensible schema and data validation tool for Python dictionaries"; diff --git a/pkgs/development/python-modules/certbot/default.nix b/pkgs/development/python-modules/certbot/default.nix index 12e541d9007..0f6b5fa2859 100644 --- a/pkgs/development/python-modules/certbot/default.nix +++ b/pkgs/development/python-modules/certbot/default.nix @@ -9,13 +9,13 @@ buildPythonPackage rec { pname = "certbot"; - version = "1.15.0"; + version = "1.16.0"; src = fetchFromGitHub { owner = pname; repo = pname; rev = "v${version}"; - sha256 = "sha256-Z5ZIA0ib+N7La6Z0Taf6DovCF6fXnEDppPQt6Vgwl0c="; + sha256 = "0jdq6pvq7af2x483857qyp1qvqs4yb4nqcv66qi70glmbanhlxd4"; }; sourceRoot = "source/${pname}"; diff --git a/pkgs/development/python-modules/certifi/default.nix b/pkgs/development/python-modules/certifi/default.nix index a5b66f0d2e6..e21719245c8 100644 --- a/pkgs/development/python-modules/certifi/default.nix +++ b/pkgs/development/python-modules/certifi/default.nix @@ -1,28 +1,33 @@ { lib -, fetchPypi , buildPythonPackage , isPy27 +, fetchFromGitHub +, pytestCheckHook }: buildPythonPackage rec { pname = "certifi"; - version = "2020.12.5"; + version = "2021.05.30"; disabled = isPy27; - src = fetchPypi { - inherit pname version; - sha256 = "177mdbw0livdjvp17sz6wsfrc32838m9y59v871gpgv2888raj8s"; + src = fetchFromGitHub { + owner = pname; + repo = "python-certifi"; + rev = version; + sha256 = "1i4ljsc47iac6kl1w4w6x0qia08s9z394z9lbyzc05pm7y8a3cmj"; }; - pythonImportsCheck = [ "certifi" ]; + checkInputs = [ + pytestCheckHook + ]; - dontUseSetuptoolsCheck = true; + pythonImportsCheck = [ "certifi" ]; - meta = { + meta = with lib; { homepage = "https://certifi.io/"; description = "Python package for providing Mozilla's CA Bundle"; - license = lib.licenses.isc; - maintainers = with lib.maintainers; [ koral ]; + license = licenses.isc; + maintainers = with maintainers; [ koral ]; }; } diff --git a/pkgs/development/python-modules/cfgv/default.nix b/pkgs/development/python-modules/cfgv/default.nix index ab9a97729a1..306019b54b7 100644 --- a/pkgs/development/python-modules/cfgv/default.nix +++ b/pkgs/development/python-modules/cfgv/default.nix @@ -2,12 +2,12 @@ buildPythonPackage rec { pname = "cfgv"; - version = "3.2.0"; + version = "3.3.0"; disabled = isPy27; src = fetchPypi { inherit pname version; - sha256 = "cf22deb93d4bcf92f345a5c3cd39d3d41d6340adc60c78bbbd6588c384fda6a1"; + sha256 = "9e600479b3b99e8af981ecdfc80a0296104ee610cab48a5ae4ffd0b668650eb1"; }; propagatedBuildInputs = [ six ]; diff --git a/pkgs/development/python-modules/cfn-lint/default.nix b/pkgs/development/python-modules/cfn-lint/default.nix index a5f22908993..dcfc6d8ecaa 100644 --- a/pkgs/development/python-modules/cfn-lint/default.nix +++ b/pkgs/development/python-modules/cfn-lint/default.nix @@ -21,13 +21,13 @@ buildPythonPackage rec { pname = "cfn-lint"; - version = "0.48.0"; + version = "0.51.0"; src = fetchFromGitHub { owner = "aws-cloudformation"; repo = "cfn-python-lint"; rev = "v${version}"; - sha256 = "03j5w9cyvpbxh634jd2dhkgfs3c2hmgqh77w664855lgy2ph9zll"; + sha256 = "1027s243sik25c6sqw6gla7k7vl3jdicrik5zdsa8pafxh2baja4"; }; postPatch = '' diff --git a/pkgs/development/python-modules/cftime/default.nix b/pkgs/development/python-modules/cftime/default.nix index 1f52c04e9a9..bec5f03cd88 100644 --- a/pkgs/development/python-modules/cftime/default.nix +++ b/pkgs/development/python-modules/cftime/default.nix @@ -10,11 +10,11 @@ buildPythonPackage rec { pname = "cftime"; - version = "1.4.1"; + version = "1.5.0"; src = fetchPypi { inherit pname version; - sha256 = "7c55540bc164746c3c4f86a07c9c7b9ed4dfb0b0d988348ec63cec065c58766d"; + sha256 = "b644bcb53346b6f4fe2fcc9f3b574740a2097637492dcca29632c817e0604f29"; }; checkInputs = [ diff --git a/pkgs/development/python-modules/chainer/default.nix b/pkgs/development/python-modules/chainer/default.nix index 9dd656efa88..1ccce2caeeb 100644 --- a/pkgs/development/python-modules/chainer/default.nix +++ b/pkgs/development/python-modules/chainer/default.nix @@ -5,7 +5,7 @@ buildPythonPackage rec { pname = "chainer"; - version = "7.7.0"; + version = "7.8.0"; disabled = !isPy3k; # python2.7 abandoned upstream # no tests in Pypi tarball @@ -13,7 +13,7 @@ buildPythonPackage rec { owner = "chainer"; repo = "chainer"; rev = "v${version}"; - sha256 = "0m97k5bv4pcp5rvbczvrr2vxddwzw2h42cm021f5y779jx5ghclh"; + sha256 = "1zfj3pk54gzxd4nid0qjx4kw1wdngwscvn4hk4cijxvwqi4a5zxj"; }; checkInputs = [ diff --git a/pkgs/development/python-modules/chalice/default.nix b/pkgs/development/python-modules/chalice/default.nix index 70aa31a0d8b..d93737d8ad0 100644 --- a/pkgs/development/python-modules/chalice/default.nix +++ b/pkgs/development/python-modules/chalice/default.nix @@ -23,11 +23,11 @@ buildPythonPackage rec { pname = "chalice"; - version = "1.22.3"; + version = "1.23.0"; src = fetchPypi { inherit pname version; - sha256 = "5a84a73c4a8d8b22bb64e06ff99060d7f222097db4237e58749dcad5165f082d"; + sha256 = "8e3b26f8ec15197d8c04cd1edb0d692a490cb5ec179560183a403de63f21c1d7"; }; checkInputs = [ watchdog pytest hypothesis mock ]; diff --git a/pkgs/development/python-modules/cheetah3/default.nix b/pkgs/development/python-modules/cheetah3/default.nix index 5efb2629084..01a6948e3ca 100644 --- a/pkgs/development/python-modules/cheetah3/default.nix +++ b/pkgs/development/python-modules/cheetah3/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "Cheetah3"; - version = "3.2.6.post1"; + version = "3.2.6.post2"; src = fetchPypi { inherit pname version; - sha256 = "58b5d84e5fbff6cf8e117414b3ea49ef51654c02ee887d155113c5b91d761967"; + sha256 = "63157d7a00a273b59676b5be5aa817c75c37efc88478231f1a160f4cfb7f7878"; }; doCheck = false; # Circular dependency diff --git a/pkgs/development/python-modules/citeproc-py/default.nix b/pkgs/development/python-modules/citeproc-py/default.nix index bd1ae0c563a..b404fa4a5cb 100644 --- a/pkgs/development/python-modules/citeproc-py/default.nix +++ b/pkgs/development/python-modules/citeproc-py/default.nix @@ -9,11 +9,11 @@ buildPythonPackage rec { pname = "citeproc-py"; - version = "0.5.1"; + version = "0.6.0"; src = fetchPypi { inherit pname version; - sha256 = "00aaff50jy4j0nakdzq9258z1gzrac9baarli2ymgspj88jg5968"; + sha256 = "d9e3a224f936fe2e5033b5d9ffdacab769cedb61d96c4e0cf2f0b488f1d24b4e"; }; buildInputs = [ rnc2rng ]; diff --git a/pkgs/development/python-modules/click-default-group/default.nix b/pkgs/development/python-modules/click-default-group/default.nix index 58da038faae..3ed81e598d1 100644 --- a/pkgs/development/python-modules/click-default-group/default.nix +++ b/pkgs/development/python-modules/click-default-group/default.nix @@ -1,4 +1,10 @@ -{ lib, buildPythonPackage, fetchFromGitHub, click, pytest }: +{ lib +, buildPythonPackage +, fetchFromGitHub +, fetchpatch +, click +, pytestCheckHook +}: buildPythonPackage rec { pname = "click-default-group"; @@ -12,9 +18,19 @@ buildPythonPackage rec { sha256 = "0nk39lmkn208w8kvq6f4h3a6qzxrrvxixahpips6ik3zflbkss86"; }; + patches = [ + # make tests compatible with click 8 + (fetchpatch { + url = "https://github.com/click-contrib/click-default-group/commit/9415c77d05cf7d16876e7d70a49a41a6189983b4.patch"; + sha256 = "1czzma8nmwyxhwhnr8rfw5bjw6d46b3s5r5bfb8ly3sjwqjlwhw2"; + }) + ]; + propagatedBuildInputs = [ click ]; - checkInputs = [ pytest ]; + checkInputs = [ pytestCheckHook ]; + + pythonImportsCheck = [ "click_default_group" ]; meta = with lib; { homepage = "https://github.com/click-contrib/click-default-group"; diff --git a/pkgs/development/python-modules/click-repl/default.nix b/pkgs/development/python-modules/click-repl/default.nix index ee8773999ff..ec4cffe0d39 100644 --- a/pkgs/development/python-modules/click-repl/default.nix +++ b/pkgs/development/python-modules/click-repl/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "click-repl"; - version = "0.1.6"; + version = "0.2.0"; src = fetchPypi { inherit pname version; - sha256 = "1mcmz95595nrp4r58spy1ac993db26hk4q97isghbmn4md99vwmr"; + sha256 = "cd12f68d745bf6151210790540b4cb064c7b13e571bc64b6957d98d120dacfd8"; }; propagatedBuildInputs = [ click prompt_toolkit ]; diff --git a/pkgs/development/python-modules/click/7.nix b/pkgs/development/python-modules/click/7.nix new file mode 100644 index 00000000000..fcbd4d0981a --- /dev/null +++ b/pkgs/development/python-modules/click/7.nix @@ -0,0 +1,28 @@ +{ lib, buildPythonPackage, fetchPypi, locale, pytestCheckHook }: + +buildPythonPackage rec { + pname = "click"; + version = "7.1.2"; + + src = fetchPypi { + inherit pname version; + sha256 = "d2b5255c7c6349bc1bd1e59e08cd12acbbd63ce649f2588755783aa94dfb6b1a"; + }; + + postPatch = '' + substituteInPlace src/click/_unicodefun.py \ + --replace "'locale'" "'${locale}/bin/locale'" + ''; + + checkInputs = [ pytestCheckHook ]; + + meta = with lib; { + homepage = "https://click.palletsprojects.com/"; + description = "Create beautiful command line interfaces in Python"; + longDescription = '' + A Python package for creating beautiful command line interfaces in a + composable way, with as little code as necessary. + ''; + license = licenses.bsd3; + }; +} diff --git a/pkgs/development/python-modules/click/default.nix b/pkgs/development/python-modules/click/default.nix index fcbd4d0981a..d20322e3b84 100644 --- a/pkgs/development/python-modules/click/default.nix +++ b/pkgs/development/python-modules/click/default.nix @@ -1,12 +1,19 @@ -{ lib, buildPythonPackage, fetchPypi, locale, pytestCheckHook }: +{ lib +, buildPythonPackage +, pythonOlder +, fetchPypi +, importlib-metadata +, locale +, pytestCheckHook +}: buildPythonPackage rec { pname = "click"; - version = "7.1.2"; + version = "8.0.1"; src = fetchPypi { inherit pname version; - sha256 = "d2b5255c7c6349bc1bd1e59e08cd12acbbd63ce649f2588755783aa94dfb6b1a"; + sha256 = "0ymdyf37acq4qxh038q0xx44qgj6y2kf0jd0ivvix6qij88w214c"; }; postPatch = '' @@ -14,7 +21,13 @@ buildPythonPackage rec { --replace "'locale'" "'${locale}/bin/locale'" ''; - checkInputs = [ pytestCheckHook ]; + propagatedBuildInputs = lib.optionals (pythonOlder "3.8") [ + importlib-metadata + ]; + + checkInputs = [ + pytestCheckHook + ]; meta = with lib; { homepage = "https://click.palletsprojects.com/"; diff --git a/pkgs/development/python-modules/cliff/default.nix b/pkgs/development/python-modules/cliff/default.nix index 54cc7534171..bb856736d92 100644 --- a/pkgs/development/python-modules/cliff/default.nix +++ b/pkgs/development/python-modules/cliff/default.nix @@ -16,11 +16,11 @@ buildPythonPackage rec { pname = "cliff"; - version = "3.7.0"; + version = "3.8.0"; src = fetchPypi { inherit pname version; - sha256 = "389c81960de13f05daf1cbd546f33199e86c518ba4266c79ec7a153a280980ea"; + sha256 = "8dd215d0a84c9a3ab2fa2aa700849f4e7b786639f66caa0ad4108c85dca95a7c"; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/cligj/default.nix b/pkgs/development/python-modules/cligj/default.nix index b44f4e0ec17..7806da7fb16 100644 --- a/pkgs/development/python-modules/cligj/default.nix +++ b/pkgs/development/python-modules/cligj/default.nix @@ -4,13 +4,13 @@ buildPythonPackage rec { pname = "cligj"; - version = "0.5.0"; + version = "0.7.2"; src = fetchFromGitHub { owner = "mapbox"; repo = "cligj"; rev = version; - sha256 = "13vlibbn86dhh6iy8k831vsa249746jnk419wcr9vvr3pqxml6g2"; + sha256 = "sha256-0f9+I6ozX93Vn0l7+WR0mpddDZymJQ3+Krovt6co22Y="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/cock/default.nix b/pkgs/development/python-modules/cock/default.nix index c11646decd7..683234b8872 100644 --- a/pkgs/development/python-modules/cock/default.nix +++ b/pkgs/development/python-modules/cock/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "cock"; - version = "0.8.0"; + version = "0.9.0"; src = fetchPypi { inherit pname version; - sha256 = "1gwaklvwlyvhz2c07hdmhbnqqmpybssxzzr0399dpjk7dgdqgam3"; + sha256 = "0d9021c2d9ce0dbf495a3c5ef960a9996a0681bb96ff6099f37302a3813a184e"; }; propagatedBuildInputs = [ click sortedcontainers pyyaml ]; diff --git a/pkgs/development/python-modules/commoncode/default.nix b/pkgs/development/python-modules/commoncode/default.nix index dfb82cccea3..16d529b17f5 100644 --- a/pkgs/development/python-modules/commoncode/default.nix +++ b/pkgs/development/python-modules/commoncode/default.nix @@ -14,11 +14,11 @@ }: buildPythonPackage rec { pname = "commoncode"; - version = "21.1.21"; + version = "21.6.11"; src = fetchPypi { inherit pname version; - sha256 = "6e2daa34fac2d91307b23d9df5f01a6168fdffb12bf5d161bd6776bade29b479"; + sha256 = "d6c8c985746a541913d5bb534c770f2422e5b4ac7a4ef765abc05c287a40ff4b"; }; dontConfigure = true; diff --git a/pkgs/development/python-modules/confluent-kafka/default.nix b/pkgs/development/python-modules/confluent-kafka/default.nix index d07930b5e54..d9e7ee93728 100644 --- a/pkgs/development/python-modules/confluent-kafka/default.nix +++ b/pkgs/development/python-modules/confluent-kafka/default.nix @@ -1,12 +1,12 @@ { lib, buildPythonPackage, fetchPypi, isPy3k, rdkafka, requests, avro3k, avro ? null, futures ? null, enum34 ? null }: buildPythonPackage rec { - version = "1.6.0"; + version = "1.7.0"; pname = "confluent-kafka"; src = fetchPypi { inherit pname version; - sha256 = "8a9caabdb02e87cd65c7f10f689ba3f1a15f8774de455e96fa5fc56eecfee63c"; + sha256 = "80e01b4791513c27eded8517af847530dfdf04c43d99ff132ed9c3085933b75b"; }; buildInputs = [ rdkafka requests ] ++ (if isPy3k then [ avro3k ] else [ enum34 avro futures ]) ; diff --git a/pkgs/development/python-modules/construct/default.nix b/pkgs/development/python-modules/construct/default.nix index 3a3a3d32718..4ad78ddad3b 100644 --- a/pkgs/development/python-modules/construct/default.nix +++ b/pkgs/development/python-modules/construct/default.nix @@ -5,7 +5,7 @@ buildPythonPackage rec { pname = "construct"; - version = "2.10.63"; + version = "2.10.67"; disabled = pythonOlder "3.6"; @@ -14,7 +14,7 @@ buildPythonPackage rec { owner = pname; repo = pname; rev = "v${version}"; - sha256 = "0dnj815qdxrn0q6bpwsmkca2jy02gjy6d3amqg4y6gha1kc1mymv"; + sha256 = "1nciwim745qk41l1ck4chx3vxpfr6cq4k3a4i7vfnnrd3s6szzsw"; }; # not an explicit dependency, but it's imported by an entrypoint diff --git a/pkgs/development/python-modules/cornice/default.nix b/pkgs/development/python-modules/cornice/default.nix index ba6df4fd24a..5a576f3e6c4 100644 --- a/pkgs/development/python-modules/cornice/default.nix +++ b/pkgs/development/python-modules/cornice/default.nix @@ -9,11 +9,11 @@ buildPythonPackage rec { pname = "cornice"; - version = "5.1.0"; + version = "5.2.0"; src = fetchPypi { inherit pname version; - sha256 = "c81cd9429759c0de475f580bbff92d5646cfc5f43e8aa24492037e2e90677ee6"; + sha256 = "50f86a5e9fb73d664d20e8dd0bdc3ce419145eb17813591a5a40e8a9d567b9c5"; }; propagatedBuildInputs = [ pyramid simplejson six venusian ]; diff --git a/pkgs/development/python-modules/coveralls/default.nix b/pkgs/development/python-modules/coveralls/default.nix index 46002fae4f2..5d5b07ffd05 100644 --- a/pkgs/development/python-modules/coveralls/default.nix +++ b/pkgs/development/python-modules/coveralls/default.nix @@ -16,13 +16,13 @@ buildPythonPackage rec { pname = "coveralls"; - version = "3.0.1"; + version = "3.1.0"; disabled = isPy27; # wanted by tests src = fetchPypi { inherit pname version; - sha256 = "cbb942ae5ef3d2b55388cb5b43e93a269544911535f1e750e1c656aef019ce60"; + sha256 = "9b3236e086627340bf2c95f89f757d093cbed43d17179d3f4fb568c347e7d29a"; }; checkInputs = [ diff --git a/pkgs/development/python-modules/cucumber-tag-expressions/default.nix b/pkgs/development/python-modules/cucumber-tag-expressions/default.nix index 789a58bb6a7..d90e53ac365 100644 --- a/pkgs/development/python-modules/cucumber-tag-expressions/default.nix +++ b/pkgs/development/python-modules/cucumber-tag-expressions/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "cucumber-tag-expressions"; - version = "3.0.0"; + version = "3.0.1"; src = fetchPypi { inherit pname version; - sha256 = "0kb8dq458sflwl2agb2v9hp04qwygslrhdps819vq27wc44jabxw"; + sha256 = "71823468f567726332b87f40530b27fc83b35daea6514f5cbb03f0533d96e5be"; }; checkInputs = [ pytest pytest-html ]; diff --git a/pkgs/development/python-modules/cupy/default.nix b/pkgs/development/python-modules/cupy/default.nix index f5d262f0b8f..6a072ab8e1a 100644 --- a/pkgs/development/python-modules/cupy/default.nix +++ b/pkgs/development/python-modules/cupy/default.nix @@ -7,12 +7,12 @@ buildPythonPackage rec { pname = "cupy"; - version = "8.5.0"; + version = "8.6.0"; disabled = !isPy3k; src = fetchPypi { inherit pname version; - sha256 = "fb3f8d3b3454beb249b9880502a45fe493c5a44efacc4c72914cbe1a5dbdf803"; + sha256 = "f3ed02ba18e38b4f3ed2c324fa08967e6714f59357ccb0b28badd9572e77500b"; }; preConfigure = '' diff --git a/pkgs/development/python-modules/cx_freeze/default.nix b/pkgs/development/python-modules/cx_freeze/default.nix index c3c3618033e..b6edb2ced1f 100644 --- a/pkgs/development/python-modules/cx_freeze/default.nix +++ b/pkgs/development/python-modules/cx_freeze/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "cx_Freeze"; - version = "6.5.3"; + version = "6.6"; src = fetchPypi { inherit pname version; - sha256 = "e0d03cabcdf9b9c21354807ed9f06fa9481a8fd5a0838968a830f01a70820ff1"; + sha256 = "c4af8ad3f7e7d71e291c1dec5d0fb26bbe92df834b098ed35434c901fbd6762f"; }; disabled = pythonOlder "3.5"; diff --git a/pkgs/development/python-modules/cx_oracle/default.nix b/pkgs/development/python-modules/cx_oracle/default.nix index c81443e0990..a5606ac3dd2 100644 --- a/pkgs/development/python-modules/cx_oracle/default.nix +++ b/pkgs/development/python-modules/cx_oracle/default.nix @@ -2,13 +2,13 @@ buildPythonPackage rec { pname = "cx_Oracle"; - version = "8.1.0"; + version = "8.2.1"; buildInputs = [ odpic ]; src = fetchPypi { inherit pname version; - sha256 = "e1698c5522ee1355e552b30bfa0a58e6e772475b882c5d69d158bd7e6aed45de"; + sha256 = "12e7e913a7a10fd8caafb9855e6703a601b7dd5cc596fcd489d0ac9529608b6c"; }; preConfigure = '' diff --git a/pkgs/development/python-modules/dash-core-components/default.nix b/pkgs/development/python-modules/dash-core-components/default.nix index 2782342c1b5..8802f0f0e7e 100644 --- a/pkgs/development/python-modules/dash-core-components/default.nix +++ b/pkgs/development/python-modules/dash-core-components/default.nix @@ -5,11 +5,11 @@ buildPythonPackage rec { pname = "dash_core_components"; - version = "1.15.0"; + version = "1.16.0"; src = fetchPypi { inherit pname version; - sha256 = "b61cb37322de91b4feb0d4d823694cbba8686f6459db774b53d553135350c71e"; + sha256 = "e8cdfaf3580577670bb2d1c3168efa06f5a7b439fbe5527cfaefa3e32394542f"; }; # No tests in archive diff --git a/pkgs/development/python-modules/dash-html-components/default.nix b/pkgs/development/python-modules/dash-html-components/default.nix index 3d290544677..28faf244817 100644 --- a/pkgs/development/python-modules/dash-html-components/default.nix +++ b/pkgs/development/python-modules/dash-html-components/default.nix @@ -5,11 +5,11 @@ buildPythonPackage rec { pname = "dash_html_components"; - version = "1.1.2"; + version = "1.1.3"; src = fetchPypi { inherit pname version; - sha256 = "83eaa39667b7c3e6cbefa360743e6e536d913269ea15db14308ad022c78bc301"; + sha256 = "88adb77a674d5d7d0835d71c469f6e7b4aa692f9673808a474d244b71863c58a"; }; # No tests in archive diff --git a/pkgs/development/python-modules/dash-renderer/default.nix b/pkgs/development/python-modules/dash-renderer/default.nix index 5c8f524e423..bc489ff8f96 100644 --- a/pkgs/development/python-modules/dash-renderer/default.nix +++ b/pkgs/development/python-modules/dash-renderer/default.nix @@ -5,11 +5,11 @@ buildPythonPackage rec { pname = "dash_renderer"; - version = "1.9.0"; + version = "1.9.1"; src = fetchPypi { inherit pname version; - sha256 = "3c5519a781beb2261ee73b2d193bef6f212697636f204acd7d58cd986ba88e30"; + sha256 = "73a69e3d145880e68e42723ad10182251d92b44f3efe92b8763145cfd2158e7e"; }; # No tests in archive diff --git a/pkgs/development/python-modules/dash-table/default.nix b/pkgs/development/python-modules/dash-table/default.nix index 8374d8694ac..31be5e6853f 100644 --- a/pkgs/development/python-modules/dash-table/default.nix +++ b/pkgs/development/python-modules/dash-table/default.nix @@ -5,11 +5,11 @@ buildPythonPackage rec { pname = "dash_table"; - version = "4.11.2"; + version = "4.11.3"; src = fetchPypi { inherit pname version; - sha256 = "90fbdd12eaaf657aa80d429263de4bbeef982649eb5981ebeb2410d67c1d20eb"; + sha256 = "0a4f22a5cf5120882a252a3348fc15ef45a1b75bf900934783e338aceac52f56"; }; # No tests in archive diff --git a/pkgs/development/python-modules/dash/default.nix b/pkgs/development/python-modules/dash/default.nix index 89ff61f6c5e..c9b259b0732 100644 --- a/pkgs/development/python-modules/dash/default.nix +++ b/pkgs/development/python-modules/dash/default.nix @@ -16,13 +16,13 @@ buildPythonPackage rec { pname = "dash"; - version = "1.19.0"; + version = "1.20.0"; src = fetchFromGitHub { owner = "plotly"; repo = pname; rev = "v${version}"; - sha256 = "067ipkp186h26j7whfid8hjf6cwjmw2b5jp6fvvg280j7q9bjsa9"; + sha256 = "1205xwi0w33g3c8gcba50fjj38dzgn7nhfk5w186kd6dwmvz02yg"; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/dask-ml/default.nix b/pkgs/development/python-modules/dask-ml/default.nix index ff1b145ee8a..62f2a30507b 100644 --- a/pkgs/development/python-modules/dask-ml/default.nix +++ b/pkgs/development/python-modules/dask-ml/default.nix @@ -17,13 +17,13 @@ }: buildPythonPackage rec { - version = "1.8.0"; + version = "1.9.0"; pname = "dask-ml"; disabled = pythonOlder "3.6"; # >= 3.6 src = fetchPypi { inherit pname version; - sha256 = "8fc4ac3ec1915e382fb8cae9ff1ec9b5ac1bee0b6f4c6975d6e6cb7191a4a815"; + sha256 = "2f376a7114133b484a6d393f62298473116fc49c79ec7d50d5b031d752f54307"; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/databricks-connect/default.nix b/pkgs/development/python-modules/databricks-connect/default.nix index 17116eb130f..afb8e13dc5a 100644 --- a/pkgs/development/python-modules/databricks-connect/default.nix +++ b/pkgs/development/python-modules/databricks-connect/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "databricks-connect"; - version = "8.1.0"; + version = "8.1.6"; src = fetchPypi { inherit pname version; - sha256 = "3726c648cc60796294356e2617acc534d2503824ccfbdff26abbea595eb83135"; + sha256 = "2d6989491a2a33853eb10500574eb62dbcb98ac691d7e98022c5f18e23ad18b2"; }; sourceRoot = "."; diff --git a/pkgs/development/python-modules/dataclasses-json/default.nix b/pkgs/development/python-modules/dataclasses-json/default.nix index 4a2a410c4ad..f97217cd29e 100644 --- a/pkgs/development/python-modules/dataclasses-json/default.nix +++ b/pkgs/development/python-modules/dataclasses-json/default.nix @@ -11,13 +11,13 @@ buildPythonPackage rec { pname = "dataclasses-json"; - version = "0.5.2"; + version = "0.5.4"; src = fetchFromGitHub { owner = "lidatong"; repo = pname; rev = "v${version}"; - sha256 = "1gcnm41rwg0jvq4vhr57vv9hyasws425zl8h4p05x2nzq86l0w1n"; + sha256 = "193xklf1xrsin7fr24yqx5ckr4m5s9v1bdyr00qr51j74hiy8qsv"; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/debugpy/default.nix b/pkgs/development/python-modules/debugpy/default.nix index 059f2110fd5..da1f25ad2c3 100644 --- a/pkgs/development/python-modules/debugpy/default.nix +++ b/pkgs/development/python-modules/debugpy/default.nix @@ -2,6 +2,7 @@ , stdenv , buildPythonPackage , fetchFromGitHub +, fetchpatch , substituteAll , gdb , flask @@ -48,6 +49,12 @@ buildPythonPackage rec { # To avoid this issue, debugpy should be installed using python.withPackages: # python.withPackages (ps: with ps; [ debugpy ]) ./fix-test-pythonpath.patch + + # Fix tests with flask>=2.0 + (fetchpatch { + url = "https://github.com/microsoft/debugpy/commit/0a7f2cd67dda27ea4d38389b49a4e2a1899b834e.patch"; + sha256 = "1g070fn07n7jj01jaf5s570zn70akf6klkamigs3ix11gh736rpn"; + }) ]; # Remove pre-compiled "attach" libraries and recompile for host platform diff --git a/pkgs/development/python-modules/deezer-python/default.nix b/pkgs/development/python-modules/deezer-python/default.nix index cff9a666691..cd24ae0fd3e 100644 --- a/pkgs/development/python-modules/deezer-python/default.nix +++ b/pkgs/development/python-modules/deezer-python/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { pname = "deezer-python"; - version = "2.2.2"; + version = "2.2.4"; disabled = pythonOlder "3.6"; format = "pyproject"; @@ -20,7 +20,7 @@ buildPythonPackage rec { owner = "browniebroke"; repo = pname; rev = "v${version}"; - sha256 = "1l8l4lxlqsj921gk1mxcilp11jx31addiyd9pk604aldgqma709y"; + sha256 = "11gqmyf350256gbppak2qv20lg2bmszand4kmks93wphq5yp2iiy"; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/diagrams/default.nix b/pkgs/development/python-modules/diagrams/default.nix index 37e23d730e6..d34fc3b899f 100644 --- a/pkgs/development/python-modules/diagrams/default.nix +++ b/pkgs/development/python-modules/diagrams/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { pname = "diagrams"; - version = "0.19.1"; + version = "0.20.0"; format = "pyproject"; disabled = pythonOlder "3.6"; @@ -22,9 +22,14 @@ buildPythonPackage rec { owner = "mingrammer"; repo = pname; rev = "v${version}"; - sha256 = "0qvk0cp3026n5jmwp9z7m70b6pws0h6a7slxr23glg18baxr44d4"; + sha256 = "1lcqsy3bvlnlnakjysp8qjhy26bhkp1izi5dvzq2fpsffgxk4si4"; }; + postPatch = '' + substituteInPlace pyproject.toml \ + --replace 'jinja2 = "^2.10"' 'jinja2 = "*"' + ''; + preConfigure = '' patchShebangs autogen.sh ./autogen.sh diff --git a/pkgs/development/python-modules/dictpath/default.nix b/pkgs/development/python-modules/dictpath/default.nix new file mode 100644 index 00000000000..2809d859589 --- /dev/null +++ b/pkgs/development/python-modules/dictpath/default.nix @@ -0,0 +1,34 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, pytestCheckHook +}: + +buildPythonPackage rec { + pname = "dictpath"; + version = "0.1.3"; + + src = fetchFromGitHub { + owner = "p1c2u"; + repo = "dictpath"; + rev = version; + sha256 = "0314i8wky2z83a66zggc53m8qa1rjgkrznrl2ixsgiq0prcn6v16"; + }; + + postPatch = '' + sed -i "/^addopts/d" setup.cfg + ''; + + checkInputs = [ + pytestCheckHook + ]; + + pythonImportsCheck = [ "dictpath" ]; + + meta = with lib; { + description = "Object-oriented dictionary paths"; + homepage = "https://github.com/p1c2u/dictpath"; + license = licenses.asl20; + maintainers = with maintainers; [ dotlambda ]; + }; +} diff --git a/pkgs/development/python-modules/diff_cover/default.nix b/pkgs/development/python-modules/diff_cover/default.nix index 5c340bf7ac8..7eeb378ff41 100644 --- a/pkgs/development/python-modules/diff_cover/default.nix +++ b/pkgs/development/python-modules/diff_cover/default.nix @@ -17,7 +17,7 @@ buildPythonPackage rec { pname = "diff_cover"; - version = "5.0.1"; + version = "5.2.0"; preCheck = '' export LC_ALL=en_US.UTF-8; @@ -25,7 +25,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "e80f7a4979b7a9d373903776588279ed2898f17729e608255c4119462c822edb"; + sha256 = "a1cd54232d2e48bd4c1eabc96cfe4a8727a9a92fd2556b52ff8f65bb8adf8768"; }; propagatedBuildInputs = [ chardet jinja2 jinja2_pluralize pygments six inflect ]; diff --git a/pkgs/development/python-modules/distlib/default.nix b/pkgs/development/python-modules/distlib/default.nix index 12e05b58c4c..002c0923c26 100644 --- a/pkgs/development/python-modules/distlib/default.nix +++ b/pkgs/development/python-modules/distlib/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "distlib"; - version = "0.3.1"; + version = "0.3.2"; src = fetchPypi { inherit pname version; - sha256 = "edf6116872c863e1aa9d5bb7cb5e05a022c519a4594dc703843343a9ddd9bff1"; + sha256 = "106fef6dc37dd8c0e2c0a60d3fca3e77460a48907f335fa28420463a6f799736"; extension = "zip"; }; diff --git a/pkgs/development/python-modules/django-anymail/default.nix b/pkgs/development/python-modules/django-anymail/default.nix index 9b5c8e1d00b..06dd78989fe 100644 --- a/pkgs/development/python-modules/django-anymail/default.nix +++ b/pkgs/development/python-modules/django-anymail/default.nix @@ -12,13 +12,13 @@ buildPythonPackage rec { pname = "django-anymail"; - version = "8.2"; + version = "8.4"; src = fetchFromGitHub { owner = "anymail"; repo = pname; rev = "v${version}"; - sha256 = "0zd4w707az36pp8wimlz6sfxwy9w190qp93brl78pva3rhnx5p97"; + sha256 = "08ac24hrafkk1jg3milfjky3qni1cz5qggp1rgzq9r7ina4akjma"; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/django-auth-ldap/default.nix b/pkgs/development/python-modules/django-auth-ldap/default.nix index d89bc6023c6..ed6ee01e34e 100644 --- a/pkgs/development/python-modules/django-auth-ldap/default.nix +++ b/pkgs/development/python-modules/django-auth-ldap/default.nix @@ -7,11 +7,11 @@ buildPythonPackage rec { pname = "django-auth-ldap"; - version = "2.3.0"; + version = "2.4.0"; disabled = isPy27; src = fetchPypi { inherit pname version; - sha256 = "5894317122a086c9955ed366562869a81459cf6b663636b152857bb5d3a0a3b7"; + sha256 = "60fcbfc3141c99c3c49d3ccd7311a3992a231c319d94b6d2c143968f63676676"; }; propagatedBuildInputs = [ ldap django ]; diff --git a/pkgs/development/python-modules/django-cleanup/default.nix b/pkgs/development/python-modules/django-cleanup/default.nix index 83dbbc5d197..faddf562081 100644 --- a/pkgs/development/python-modules/django-cleanup/default.nix +++ b/pkgs/development/python-modules/django-cleanup/default.nix @@ -4,10 +4,10 @@ buildPythonPackage rec { pname = "django-cleanup"; - version = "5.1.0"; + version = "5.2.0"; src = fetchPypi { inherit pname version; - sha256 = "8976aec12a22913afb3d1fcb541b1aedde2f5ec243e4260c5ff78bb6aa75a089"; + sha256 = "909d10ff574f5ce1a40fa63bd5c94c9ed866fd7ae770994c46cdf66c3db3e846"; }; checkInputs = [ django ]; diff --git a/pkgs/development/python-modules/django-jinja2/default.nix b/pkgs/development/python-modules/django-jinja2/default.nix index 13b5354e17e..8f20313556f 100644 --- a/pkgs/development/python-modules/django-jinja2/default.nix +++ b/pkgs/development/python-modules/django-jinja2/default.nix @@ -4,7 +4,7 @@ buildPythonPackage rec { pname = "django-jinja"; - version = "2.7.0"; + version = "2.8.0"; meta = { description = "Simple and nonobstructive jinja2 integration with Django"; @@ -14,7 +14,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "d56ecddaa6d3caf508509aae5a979ebd8a3427477c34fcbcac14bf8389a21a12"; + sha256 = "bba30a7ea4394bccfaa9bc8620996c25ede446ab06104b51b3a16fe81232cbf2"; }; buildInputs = [ django pytz tox ]; diff --git a/pkgs/development/python-modules/django-logentry-admin/default.nix b/pkgs/development/python-modules/django-logentry-admin/default.nix index 7bba272c155..1a3998dc8c1 100644 --- a/pkgs/development/python-modules/django-logentry-admin/default.nix +++ b/pkgs/development/python-modules/django-logentry-admin/default.nix @@ -2,13 +2,13 @@ buildPythonPackage rec { pname = "django-logentry-admin"; - version = "1.0.4"; + version = "1.1.0"; src = fetchFromGitHub { owner = "yprez"; repo = pname; rev = "v${version}"; - sha256 = "1ji04qklzhjb7fx6644vzikjb2196rxyi8hrwf2knsz41ndvq1l9"; + sha256 = "1bndxgvisw8kk52zfdifvly6dl4833wqilxf77pg473172yaf5gq"; }; checkInputs = [ pytest pytest-django ]; diff --git a/pkgs/development/python-modules/django-q/default.nix b/pkgs/development/python-modules/django-q/default.nix index 3d9d885daf7..c9c5410416a 100644 --- a/pkgs/development/python-modules/django-q/default.nix +++ b/pkgs/development/python-modules/django-q/default.nix @@ -3,11 +3,11 @@ buildPythonPackage rec { pname = "django-q"; - version = "1.3.5"; + version = "1.3.8"; src = fetchPypi { inherit pname version; - sha256 = "8871c602e2c7e892fbedc271d5b91c4a96803b689c3ee2f15464931f99f4e32b"; + sha256 = "db30266fadd6ab9336a8824291910ff1d1c28f7bc9d6e52cdaf33cc275ae6146"; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/django-raster/default.nix b/pkgs/development/python-modules/django-raster/default.nix index 609388a311c..713e7214cfb 100644 --- a/pkgs/development/python-modules/django-raster/default.nix +++ b/pkgs/development/python-modules/django-raster/default.nix @@ -6,14 +6,14 @@ if lib.versionOlder django.version "2.0" then throw "django-raster requires Django >= 2.0. Consider overiding the python package set to use django_2." else buildPythonPackage rec { - version = "0.8"; + version = "0.8.1"; pname = "django-raster"; disabled = !isPy3k; src = fetchPypi { inherit pname version; - sha256 = "9417d8a17930dffee4719f79a38c6ab5d20ac7145d4edf88df0abcb5a360de51"; + sha256 = "213758fe96d74be502f69f2620f7666961a85caa0551d14573637315035a9745"; }; # Tests require a postgresql + postgis server diff --git a/pkgs/development/python-modules/django-versatileimagefield/default.nix b/pkgs/development/python-modules/django-versatileimagefield/default.nix index 4307fc69d45..dc7cde76a6b 100644 --- a/pkgs/development/python-modules/django-versatileimagefield/default.nix +++ b/pkgs/development/python-modules/django-versatileimagefield/default.nix @@ -9,11 +9,11 @@ buildPythonPackage rec { pname = "django-versatileimagefield"; - version = "2.0"; + version = "2.1"; src = fetchPypi { inherit pname version; - sha256 = "b197e7066f23bb73b001a61525f2b1cae3dd654bf208a944a7ff5a3fe6107b51"; + sha256 = "e98f7b0abfbf2559d55b08be40911dcc44b6f3437a6c40d81bf66b6914837fdf"; }; propagatedBuildInputs = [ pillow python_magic ]; diff --git a/pkgs/development/python-modules/django/2.nix b/pkgs/development/python-modules/django/2.nix index e0d3cd12f8f..67946ab0d72 100644 --- a/pkgs/development/python-modules/django/2.nix +++ b/pkgs/development/python-modules/django/2.nix @@ -6,13 +6,13 @@ buildPythonPackage rec { pname = "Django"; - version = "2.2.22"; + version = "2.2.24"; disabled = !isPy3k; src = fetchPypi { inherit pname version; - sha256 = "db2214db1c99017cbd971e58824e6f424375154fe358afc30e976f5b99fc6060"; + sha256 = "1dvx3x85lggm91x7mpvaf9nmpxyz7r97pbpnmr2k1qfy0c7gyf9k"; }; patches = lib.optional withGdal diff --git a/pkgs/development/python-modules/django/3.nix b/pkgs/development/python-modules/django/3.nix index 321582946b3..ae6187e207e 100644 --- a/pkgs/development/python-modules/django/3.nix +++ b/pkgs/development/python-modules/django/3.nix @@ -13,13 +13,13 @@ buildPythonPackage rec { pname = "Django"; - version = "3.2.2"; + version = "3.2.4"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - sha256 = "0a1d195ad65c52bf275b8277b3d49680bd1137a5f55039a806f25f6b9752ce3d"; + sha256 = "15pjwyvrx4n8gi8n51b14wp54bg4jqapr25p52597zn6ikdxijb6"; }; patches = lib.optional withGdal diff --git a/pkgs/development/python-modules/django_compressor/default.nix b/pkgs/development/python-modules/django_compressor/default.nix index edf5faa5af4..2e58047d8a9 100644 --- a/pkgs/development/python-modules/django_compressor/default.nix +++ b/pkgs/development/python-modules/django_compressor/default.nix @@ -2,11 +2,11 @@ rcssmin, rjsmin, django_appconf }: buildPythonPackage rec { pname = "django_compressor"; - version = "2.4"; + version = "2.4.1"; src = fetchPypi { inherit pname version; - sha256 = "0kx7bclfa0sxlsz6ka70zr9ra00lks0hmv1kc99wbanx6xhirvfj"; + sha256 = "3358077605c146fdcca5f9eaffb50aa5dbe15f238f8854679115ebf31c0415e0"; }; postPatch = '' substituteInPlace setup.py --replace 'rcssmin == 1.0.6' 'rcssmin' \ diff --git a/pkgs/development/python-modules/django_guardian/default.nix b/pkgs/development/python-modules/django_guardian/default.nix index 957944f01d3..0e3eaff6cb5 100644 --- a/pkgs/development/python-modules/django_guardian/default.nix +++ b/pkgs/development/python-modules/django_guardian/default.nix @@ -4,11 +4,11 @@ }: buildPythonPackage rec { pname = "django-guardian"; - version = "2.3.0"; + version = "2.4.0"; src = fetchPypi { inherit pname version; - sha256 = "ed2de26e4defb800919c5749fb1bbe370d72829fbd72895b6cf4f7f1a7607e1b"; + sha256 = "c58a68ae76922d33e6bdc0e69af1892097838de56e93e78a8361090bcd9f89a0"; }; checkInputs = [ pytest pytestrunner pytest-django django_environ mock ]; diff --git a/pkgs/development/python-modules/django_taggit/default.nix b/pkgs/development/python-modules/django_taggit/default.nix index b51f0421fd9..cbfcc103c5c 100644 --- a/pkgs/development/python-modules/django_taggit/default.nix +++ b/pkgs/development/python-modules/django_taggit/default.nix @@ -11,12 +11,12 @@ buildPythonPackage rec { pname = "django-taggit"; - version = "1.3.0"; + version = "1.4.0"; disabled = !isPy3k; src = fetchPypi { inherit pname version; - sha256 = "4a833bf71f4c2deddd9745924eee53be1c075d7f0020a06f12e29fa3d752732d"; + sha256 = "b9ed6e94bad0bed3bf062a6be7ee3db117fda02c6419c680d614197364ea018b"; }; propagatedBuildInputs = [ isort django ]; diff --git a/pkgs/development/python-modules/djangoql/default.nix b/pkgs/development/python-modules/djangoql/default.nix index ef9e6be1d3c..c538a373148 100644 --- a/pkgs/development/python-modules/djangoql/default.nix +++ b/pkgs/development/python-modules/djangoql/default.nix @@ -3,11 +3,11 @@ buildPythonPackage rec { pname = "djangoql"; - version = "0.14.3"; + version = "0.15.0"; src = fetchPypi { inherit pname version; - sha256 = "d1b1344cb1e037f094c04ccc67b809e8df80dea1e88cfb919078426131737018"; + sha256 = "ddd876b640faf941aface6e8554dc7e79a79ec00fee12da8a20f9f74301f7943"; }; propagatedBuildInputs = [ ply ]; diff --git a/pkgs/development/python-modules/djangorestframework-simplejwt/default.nix b/pkgs/development/python-modules/djangorestframework-simplejwt/default.nix index 9fb7f882567..82ff51fd382 100644 --- a/pkgs/development/python-modules/djangorestframework-simplejwt/default.nix +++ b/pkgs/development/python-modules/djangorestframework-simplejwt/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "djangorestframework_simplejwt"; - version = "4.6.0"; + version = "4.7.1"; src = fetchPypi { inherit pname version; - sha256 = "7adc913ba0d2ed7f46e0b9bf6e86f9bd9248f1c4201722b732b8213e0ea66f9f"; + sha256 = "c0e9b617da337becb55e67935eb992fad84f861418e7ab5fb3e77a3fd18d4137"; }; propagatedBuildInputs = [ django djangorestframework pyjwt ]; diff --git a/pkgs/development/python-modules/dnachisel/default.nix b/pkgs/development/python-modules/dnachisel/default.nix index 50ba05aca6f..12f81d644a8 100644 --- a/pkgs/development/python-modules/dnachisel/default.nix +++ b/pkgs/development/python-modules/dnachisel/default.nix @@ -15,13 +15,13 @@ buildPythonPackage rec { pname = "dnachisel"; - version = "3.2.6"; + version = "3.2.7"; src = fetchFromGitHub { owner = "Edinburgh-Genome-Foundry"; repo = "DnaChisel"; rev = "v${version}"; - sha256 = "0m88biw7sycjwsmncdybj9n3yf4n9cyvifv9zv7irm8ha3scchji"; + sha256 = "1zhq7cai47649njjp3m8zaglsv9ci6ci855dymyip8qx5ppnkfj0"; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/dnslib/default.nix b/pkgs/development/python-modules/dnslib/default.nix index 25a2ffea2f0..7e0402999f0 100644 --- a/pkgs/development/python-modules/dnslib/default.nix +++ b/pkgs/development/python-modules/dnslib/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "dnslib"; - version = "0.9.14"; + version = "0.9.16"; src = fetchPypi { inherit pname version; - sha256 = "1yz63cgiv910wkx90if09bql1n63lq6hy4wfpqink0q4sxy0mlpv"; + sha256 = "2d66b43d563d60c469117c8cb615843e7d05bf8fb2e6cb00a637281d26b7ec7d"; }; checkPhase = "VERSIONS=${python.interpreter} ./run_tests.sh"; diff --git a/pkgs/development/python-modules/dockerfile-parse/default.nix b/pkgs/development/python-modules/dockerfile-parse/default.nix index 45fe856f6f0..7afe92b4337 100644 --- a/pkgs/development/python-modules/dockerfile-parse/default.nix +++ b/pkgs/development/python-modules/dockerfile-parse/default.nix @@ -1,12 +1,12 @@ { lib, buildPythonPackage, fetchPypi, six, pytestcov, pytest }: buildPythonPackage rec { - version = "1.1.0"; + version = "1.2.0"; pname = "dockerfile-parse"; src = fetchPypi { inherit pname version; - sha256 = "f37bfa327fada7fad6833aebfaac4a3aaf705e4cf813b737175feded306109e8"; + sha256 = "07e65eec313978e877da819855870b3ae47f3fac94a40a965b9ede10484dacc5"; }; postPatch = '' diff --git a/pkgs/development/python-modules/docplex/default.nix b/pkgs/development/python-modules/docplex/default.nix index 0d2b355b38a..670ccae6542 100644 --- a/pkgs/development/python-modules/docplex/default.nix +++ b/pkgs/development/python-modules/docplex/default.nix @@ -9,12 +9,12 @@ buildPythonPackage rec { pname = "docplex"; - version = "2.20.204"; + version = "2.21.207"; # No source available from official repo src = fetchPypi { inherit pname version; - sha256 = "sha256-JNjD9UtLHsMGwTuXydZ+L5+pPQ2eobkr26Yt9pgs1qA="; + sha256 = "4f1781592be2b093db939772db8c6575a0f017041fb0cfd784bedf4222ac5e58"; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/docutils/default.nix b/pkgs/development/python-modules/docutils/default.nix index bae0acc1d45..292fc34e328 100644 --- a/pkgs/development/python-modules/docutils/default.nix +++ b/pkgs/development/python-modules/docutils/default.nix @@ -9,11 +9,11 @@ buildPythonPackage rec { pname = "docutils"; - version = "0.16"; + version = "0.17.1"; src = fetchPypi { inherit pname version; - sha256 = "c2de3a60e9e7d07be26b7f2b00ca0309c207e06c100f9cc2a94931fc75a478fc"; + sha256 = "686577d2e4c32380bb50cbb22f575ed742d58168cee37e99117a854bcd88f125"; }; # Only Darwin needs LANG, but we could set it in general. diff --git a/pkgs/development/python-modules/dogpile.cache/default.nix b/pkgs/development/python-modules/dogpile.cache/default.nix index 4b53045e249..6e14355c293 100644 --- a/pkgs/development/python-modules/dogpile.cache/default.nix +++ b/pkgs/development/python-modules/dogpile.cache/default.nix @@ -12,12 +12,12 @@ buildPythonPackage rec { pname = "dogpile.cache"; - version = "1.1.2"; + version = "1.1.3"; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - sha256 = "2134464672a3deb7ef1366a8691726686d8c62540e4208f1a40c9aaa1a0b6a45"; + sha256 = "6f0bcf97c73bfec1a7bf14e5a248488cee00c2d494bf63f3789ea6d95a57c1cf"; }; # Disable concurrency tests that often fail, diff --git a/pkgs/development/python-modules/dpkt/default.nix b/pkgs/development/python-modules/dpkt/default.nix index ebaa4c88b96..e2522136059 100644 --- a/pkgs/development/python-modules/dpkt/default.nix +++ b/pkgs/development/python-modules/dpkt/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "dpkt"; - version = "1.9.5"; + version = "1.9.6"; src = fetchPypi { inherit pname version; - sha256 = "141cab4defcb4ead83e664765ebb045f55dbe73e17d617acafd6eaf368d7c55e"; + sha256 = "b5737010fd420d142e02ed04fa616edd1fc05e414980baef594f72287c875eef"; }; meta = with lib; { diff --git a/pkgs/development/python-modules/dropbox/default.nix b/pkgs/development/python-modules/dropbox/default.nix index 8fc4ee1358b..c6751eede2f 100644 --- a/pkgs/development/python-modules/dropbox/default.nix +++ b/pkgs/development/python-modules/dropbox/default.nix @@ -3,11 +3,11 @@ buildPythonPackage rec { pname = "dropbox"; - version = "11.4.1"; + version = "11.11.0"; src = fetchPypi { inherit pname version; - sha256 = "7ba43384029424779a4b3ec8d5832362c5c0f37cd644be2fb87e2b30a569849e"; + sha256 = "14dd51e0e3981cb81384a8e13a308de0df13c7c4b6ba7f080177ede947761cbb"; }; postPatch = '' diff --git a/pkgs/development/python-modules/duecredit/default.nix b/pkgs/development/python-modules/duecredit/default.nix index ba51405e5e9..dfbfe9b183d 100644 --- a/pkgs/development/python-modules/duecredit/default.nix +++ b/pkgs/development/python-modules/duecredit/default.nix @@ -14,12 +14,12 @@ buildPythonPackage rec { pname = "duecredit"; - version = "0.8.1"; + version = "0.9.1"; disabled = isPy27; src = fetchPypi { inherit pname version; - sha256 = "43b3f01ab5fb2bf2ecc27d3fcf92b873c6b288f44becef3e2e87c96cb89d7b01"; + sha256 = "f6192ce9315b35f6a67174761291e61d0831e496e8ff4acbc061731e7604faf8"; }; # bin/duecredit requires setuptools at runtime diff --git a/pkgs/development/python-modules/ecdsa/default.nix b/pkgs/development/python-modules/ecdsa/default.nix index 3c892185687..15d034bae40 100644 --- a/pkgs/development/python-modules/ecdsa/default.nix +++ b/pkgs/development/python-modules/ecdsa/default.nix @@ -7,11 +7,11 @@ buildPythonPackage rec { pname = "ecdsa"; - version = "0.16.1"; + version = "0.17.0"; src = fetchPypi { inherit pname version; - sha256 = "cfc046a2ddd425adbd1a78b3c46f0d1325c657811c0f45ecc3a0a6236c1e50ff"; + sha256 = "b9f500bb439e4153d0330610f5d26baaf18d17b8ced1bc54410d189385ea68aa"; }; propagatedBuildInputs = [ six ]; diff --git a/pkgs/development/python-modules/elasticsearch/default.nix b/pkgs/development/python-modules/elasticsearch/default.nix index 8fe4686f7a7..86e7477ab31 100644 --- a/pkgs/development/python-modules/elasticsearch/default.nix +++ b/pkgs/development/python-modules/elasticsearch/default.nix @@ -7,11 +7,11 @@ buildPythonPackage (rec { pname = "elasticsearch"; - version = "7.12.0"; + version = "7.13.1"; src = fetchPypi { inherit pname version; - sha256 = "9a77172be02bc4855210d83f0f1346a1e7d421e3cb2ca47ba81ac0c5a717b3a0"; + sha256 = "d6bcca0b2e5665d08e6fe6fadc2d4d321affd76ce483603078fc9d3ccd2bc0f9"; }; # Check is disabled because running them destroy the content of the local cluster! diff --git a/pkgs/development/python-modules/elementpath/default.nix b/pkgs/development/python-modules/elementpath/default.nix index 3bb9269d460..30ff8d0717c 100644 --- a/pkgs/development/python-modules/elementpath/default.nix +++ b/pkgs/development/python-modules/elementpath/default.nix @@ -1,7 +1,7 @@ { lib, buildPythonPackage, fetchFromGitHub, isPy27 }: buildPythonPackage rec { - version = "2.2.2"; + version = "2.2.3"; pname = "elementpath"; disabled = isPy27; # uses incompatible class syntax @@ -9,7 +9,7 @@ buildPythonPackage rec { owner = "sissaschool"; repo = "elementpath"; rev = "v${version}"; - sha256 = "sha256-n4zIn2WmFHaVaah2J0mz7Q6G4Ptb8Ms0dwQYbh0Ofcs="; + sha256 = "142w8xbxdvz6949nqd4malqijyxfcv917cls4lsv4x7164b4naf7"; }; # avoid circular dependency with xmlschema which directly depends on this diff --git a/pkgs/development/python-modules/email-validator/default.nix b/pkgs/development/python-modules/email-validator/default.nix index 5d9f0ca88fa..b6112bb87dc 100644 --- a/pkgs/development/python-modules/email-validator/default.nix +++ b/pkgs/development/python-modules/email-validator/default.nix @@ -1,20 +1,47 @@ -{ lib, buildPythonPackage, fetchPypi, isPy3k, dnspython, idna, ipaddress }: +{ lib +, buildPythonPackage +, fetchFromGitHub +, dnspython +, idna +, pytestCheckHook +}: buildPythonPackage rec { pname = "email-validator"; - version = "1.1.2"; + version = "1.1.3"; - src = fetchPypi { - inherit pname version; - sha256 = "1a13bd6050d1db4475f13e444e169b6fe872434922d38968c67cea9568cce2f0"; + src = fetchFromGitHub { + owner = "JoshData"; + repo = "python-${pname}"; + rev = "v${version}"; + sha256 = "19n6p75m96kwg38bpfsa7ksj26aki02p5pr5f36q8wv3af84s61c"; }; - doCheck = false; - propagatedBuildInputs = [ dnspython idna - ] ++ (if isPy3k then [ ] else [ ipaddress ]); + ]; + + checkInputs = [ + pytestCheckHook + ]; + + disabledTests = [ + # fails with dns.resolver.NoResolverConfiguration due to network sandboxing + "test_deliverability_no_records" + "test_deliverability_found" + "test_deliverability_fails" + "test_deliverability_dns_timeout" + "test_main_single_good_input" + "test_main_multi_input" + "test_main_input_shim" + "test_validate_email__with_caching_resolver" + "test_validate_email__with_configured_resolver" + ]; + + pythonImportsCheck = [ + "email_validator" + ]; meta = with lib; { description = "A robust email syntax and deliverability validation library for Python 2.x/3.x."; diff --git a/pkgs/development/python-modules/emv/default.nix b/pkgs/development/python-modules/emv/default.nix index f68729a42b6..c636af4d8cb 100644 --- a/pkgs/development/python-modules/emv/default.nix +++ b/pkgs/development/python-modules/emv/default.nix @@ -15,7 +15,15 @@ buildPythonPackage rec { hash = "sha256:1715hcba3fdi0i5awnrjdjnk74p66sxm9349pd8bb717zrh4gpj7"; }; - checkInputs = [ pytestCheckHook ]; + postPatch = '' + # argparse is part of the standard libary since python 2.7/3.2 + sed -i '/argparse==1.4.0/d' setup.py + + substituteInPlace setup.py \ + --replace "click==7.1.2" "click" \ + --replace "pyscard==2.0.0" "pyscard" + ''; + propagatedBuildInputs = [ enum-compat click @@ -24,11 +32,9 @@ buildPythonPackage rec { terminaltables ]; - # argparse is part of the standardlib - prePatch = '' - substituteInPlace setup.py \ - --replace '"argparse==1.4.0",' "" - ''; + checkInputs = [ + pytestCheckHook + ]; meta = with lib; { homepage = "https://github.com/russss/python-emv"; diff --git a/pkgs/development/python-modules/enamlx/default.nix b/pkgs/development/python-modules/enamlx/default.nix index 344000fa118..947076dfc42 100644 --- a/pkgs/development/python-modules/enamlx/default.nix +++ b/pkgs/development/python-modules/enamlx/default.nix @@ -8,21 +8,15 @@ buildPythonPackage rec { pname = "enamlx"; - version = "0.4.3"; + version = "0.4.6"; src = fetchFromGitHub { owner = "frmdstryr"; repo = pname; rev = "v${version}"; - sha256 = "1rlrx3cw6h1zl9svnqbzwdfy8469qa1y7w6576lbhdwpfhpipscy"; + sha256 = "144bsh6lfrrjk6dygrbc2bfhlv742avj53awxnhgai04hab0214r"; }; - patches = [ - # Minimally modified version of https://github.com/frmdstryr/enamlx/commit/16df11227b8cee724624541d274e481802ea67e3 - # (without the change to setup.py), already on master and expected in the first post-0.4.3 release - ./replace-unicode-with-str.patch - ]; - propagatedBuildInputs = [ enaml # Until https://github.com/inkcut/inkcut/issues/105 perhaps diff --git a/pkgs/development/python-modules/entrance/default.nix b/pkgs/development/python-modules/entrance/default.nix index ca6158bd5e9..215e69138d0 100644 --- a/pkgs/development/python-modules/entrance/default.nix +++ b/pkgs/development/python-modules/entrance/default.nix @@ -18,11 +18,11 @@ in buildPythonPackage rec { pname = "entrance"; - version = "1.1.15"; + version = "1.1.17"; src = fetchPypi { inherit pname version; - sha256 = "5b354ecf03226edae567511c8a8db95038cc9c3da20fcfcf5546d1e197eb3aef"; + sha256 = "dee5b4f3330f633fcd4e665f1781bf6e53b375ffdc7a24434257dfba6b1c2d7f"; }; # The versions of `sanic` and `websockets` in nixpkgs only support 3.6 or later diff --git a/pkgs/development/python-modules/entrypoint2/default.nix b/pkgs/development/python-modules/entrypoint2/default.nix index d62361e7be0..d1325f6f0e1 100644 --- a/pkgs/development/python-modules/entrypoint2/default.nix +++ b/pkgs/development/python-modules/entrypoint2/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "entrypoint2"; - version = "0.2.3"; + version = "0.2.4"; src = fetchPypi { inherit pname version; - sha256 = "4ac1a8f08477d93282c422faa90875ce5edaa941e1f3fd410b95cb31d9f473a7"; + sha256 = "4770c3afcf3865c606a6e5f7cfcc5c59212f555fcee9b2540270399149c1dde3"; }; propagatedBuildInputs = [ ]; diff --git a/pkgs/development/python-modules/envs/default.nix b/pkgs/development/python-modules/envs/default.nix index 133e99912cb..25e6d235cff 100644 --- a/pkgs/development/python-modules/envs/default.nix +++ b/pkgs/development/python-modules/envs/default.nix @@ -1,5 +1,12 @@ -{ lib, buildPythonPackage, fetchPypi -, mock, jinja2, click, terminaltables +{ lib +, buildPythonPackage +, fetchPypi +, fetchpatch +, click +, jinja2 +, terminaltables +, mock +, nose }: buildPythonPackage rec { @@ -11,7 +18,32 @@ buildPythonPackage rec { sha256 = "ccf5cd85ddb8ed335e39ed8a22e0d23658f5a6d7da430f225e6f750c6f50ae42"; }; - checkInputs = [ mock jinja2 click terminaltables ]; + patches = [ + # https://github.com/capless/envs/pull/19 + (fetchpatch { + url = "https://github.com/capless/envs/commit/6947043fa9120a7b17094fd43ee0e1edf808f42b.patch"; + sha256 = "0zswg8kp2g922mkc7x34ps37qli1d1mjwna2jfrbnsq2fg4mk818"; + }) + ]; + + propagatedBuildInputs = [ + click + jinja2 + terminaltables + ]; + + checkInputs = [ + mock + nose + ]; + + checkPhase = '' + runHook preCheck + + nosetests --with-isolation + + runHook postCheck + ''; meta = with lib; { description = "Easy access to environment variables from Python"; diff --git a/pkgs/development/python-modules/eventlet/default.nix b/pkgs/development/python-modules/eventlet/default.nix index 4eaba48922a..28c7e9c6eea 100644 --- a/pkgs/development/python-modules/eventlet/default.nix +++ b/pkgs/development/python-modules/eventlet/default.nix @@ -12,11 +12,11 @@ buildPythonPackage rec { pname = "eventlet"; - version = "0.30.2"; + version = "0.31.0"; src = fetchPypi { inherit pname version; - sha256 = "1811b122d9a45eb5bafba092d36911bca825f835cb648a862bbf984030acff9d"; + sha256 = "b36ec2ecc003de87fc87b93197d77fea528aa0f9204a34fdf3b2f8d0f01e017b"; }; propagatedBuildInputs = [ dnspython greenlet monotonic six ] diff --git a/pkgs/development/python-modules/exchangelib/default.nix b/pkgs/development/python-modules/exchangelib/default.nix index bf9ae2284f7..c41b0479083 100644 --- a/pkgs/development/python-modules/exchangelib/default.nix +++ b/pkgs/development/python-modules/exchangelib/default.nix @@ -9,7 +9,7 @@ buildPythonPackage rec { pname = "exchangelib"; - version = "4.1.0"; + version = "4.4.0"; disabled = pythonOlder "3.5"; # tests are not present in the PyPI version @@ -17,7 +17,7 @@ buildPythonPackage rec { owner = "ecederstrand"; repo = pname; rev = "v${version}"; - sha256 = "0lkhjiz78x00d5gzn455660f31f8y4fcrqcn6rh0m41r1ar5im17"; + sha256 = "0d6hfbawp68x18ryxamkamf8kgc55xbrll89g3swrqnm2rrhzrqf"; }; checkInputs = [ psutil requests-mock pyyaml diff --git a/pkgs/development/python-modules/execnet/default.nix b/pkgs/development/python-modules/execnet/default.nix index 57a4af2fc0c..0c75727e744 100644 --- a/pkgs/development/python-modules/execnet/default.nix +++ b/pkgs/development/python-modules/execnet/default.nix @@ -9,11 +9,11 @@ buildPythonPackage rec { pname = "execnet"; - version = "1.8.0"; + version = "1.9.0"; src = fetchPypi { inherit pname version; - sha256 = "sha256-tzxVZeUX8kti3qilzqwXjGYcQwnTqgw+QghWwHLEEbQ="; + sha256 = "8f694f3ba9cc92cab508b152dcfe322153975c29bda272e2fd7f3f00f36e47c5"; }; checkInputs = [ pytestCheckHook ]; diff --git a/pkgs/development/python-modules/extractcode/default.nix b/pkgs/development/python-modules/extractcode/default.nix index 481324d7292..28dece127b1 100644 --- a/pkgs/development/python-modules/extractcode/default.nix +++ b/pkgs/development/python-modules/extractcode/default.nix @@ -11,11 +11,11 @@ }: buildPythonPackage rec { pname = "extractcode"; - version = "21.2.24"; + version = "21.6.2"; src = fetchPypi { inherit pname version; - sha256 = "f91638dbf523b80df90ac184c25d5cd1ea24cac53f67a6bb7d7b389867e0744b"; + sha256 = "e665501438fedeb6e75335d880c8913a8cd894fd8adcf9c243eb6d48fad2d01c"; }; dontConfigure = true; @@ -45,6 +45,10 @@ buildPythonPackage rec { disabledTests = [ "test_uncompress_lz4_basic" "test_extract_tarlz4_basic" + # tries to parse /boot/vmlinuz-*, which is not available in the nix sandbox + "test_can_extract_qcow2_vm_image_as_tarball" + "test_can_extract_qcow2_vm_image_not_as_tarball" + "test_can_listfs_from_qcow2_image" ]; pythonImportsCheck = [ diff --git a/pkgs/development/python-modules/faker/default.nix b/pkgs/development/python-modules/faker/default.nix index 8175e1ffb83..12f30b20a42 100644 --- a/pkgs/development/python-modules/faker/default.nix +++ b/pkgs/development/python-modules/faker/default.nix @@ -11,11 +11,11 @@ buildPythonPackage rec { pname = "Faker"; - version = "6.6.2"; + version = "6.6.3"; src = fetchPypi { inherit pname version; - sha256 = "f43ac743c34affb1c7fccca8b06450371cd482b6ddcb4110e420acb24356e70b"; + sha256 = "c2852cadc99a4ebdbf06934e4c15e30f2307d414ead21d15605759602645f152"; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/fakeredis/default.nix b/pkgs/development/python-modules/fakeredis/default.nix index b0cf3b546fd..bd4c85a3bb6 100644 --- a/pkgs/development/python-modules/fakeredis/default.nix +++ b/pkgs/development/python-modules/fakeredis/default.nix @@ -16,12 +16,12 @@ buildPythonPackage rec { pname = "fakeredis"; - version = "1.5.0"; + version = "1.5.2"; disabled = pythonOlder "3.5"; src = fetchPypi { inherit pname version; - sha256 = "1ac0cef767c37f51718874a33afb5413e69d132988cb6a80c6e6dbeddf8c7623"; + sha256 = "18fc1808d2ce72169d3f11acdb524a00ef96bd29970c6d34cfeb2edb3fc0c020"; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/fastapi/default.nix b/pkgs/development/python-modules/fastapi/default.nix index 0f1c7ec6bdc..b804d4943b2 100644 --- a/pkgs/development/python-modules/fastapi/default.nix +++ b/pkgs/development/python-modules/fastapi/default.nix @@ -17,14 +17,14 @@ buildPythonPackage rec { pname = "fastapi"; - version = "0.65.0"; + version = "0.65.2"; format = "flit"; src = fetchFromGitHub { owner = "tiangolo"; repo = "fastapi"; rev = version; - sha256 = "sha256-DPfijCGORF3ThZblqaYTKN0H8+wlhtdIS8lfKfJl/bY="; + sha256 = "032srvbfdy02m1b664x67lkdcx6b2bd4c9a9cb176lscjk213240"; }; postPatch = '' diff --git a/pkgs/development/python-modules/fasteners/default.nix b/pkgs/development/python-modules/fasteners/default.nix index 1cf4c6b30d4..0364022fa28 100644 --- a/pkgs/development/python-modules/fasteners/default.nix +++ b/pkgs/development/python-modules/fasteners/default.nix @@ -13,11 +13,11 @@ buildPythonPackage rec { pname = "fasteners"; - version = "0.16"; + version = "0.16.3"; src = fetchPypi { inherit pname version; - sha256 = "c995d8c26b017c5d6a6de9ad29a0f9cdd57de61ae1113d28fac26622b06a0933"; + sha256 = "b1ab4e5adfbc28681ce44b3024421c4f567e705cc3963c732bf1cba3348307de"; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/fastimport/default.nix b/pkgs/development/python-modules/fastimport/default.nix index 383a0e4fbd5..c036f5cacb7 100644 --- a/pkgs/development/python-modules/fastimport/default.nix +++ b/pkgs/development/python-modules/fastimport/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "fastimport"; - version = "0.9.8"; + version = "0.9.13"; src = fetchPypi { inherit pname version; - sha256 = "b2f2e8eb97000256e1aab83d2a0a053fc7b93c3aa4f7e9b971a5703dfc5963b9"; + sha256 = "486135a39edb85808fdbbe2c8009197978800a4544fca56cc2074df32e1304f3"; }; checkPhase = '' diff --git a/pkgs/development/python-modules/fiona/default.nix b/pkgs/development/python-modules/fiona/default.nix index 7318d1dc511..a71e6fbaa7e 100644 --- a/pkgs/development/python-modules/fiona/default.nix +++ b/pkgs/development/python-modules/fiona/default.nix @@ -7,11 +7,11 @@ buildPythonPackage rec { pname = "Fiona"; - version = "1.8.19"; + version = "1.8.20"; src = fetchPypi { inherit pname version; - sha256 = "b9059e0b29c2e9e6b817e53f941e77e1aca7075f986005d38db307067b60458f"; + sha256 = "a70502d2857b82f749c09cb0dea3726787747933a2a1599b5ab787d74e3c143b"; }; CXXFLAGS = lib.optionalString stdenv.cc.isClang "-std=c++11"; diff --git a/pkgs/development/python-modules/flake8/default.nix b/pkgs/development/python-modules/flake8/default.nix index 7c81967d070..b6f287669c5 100644 --- a/pkgs/development/python-modules/flake8/default.nix +++ b/pkgs/development/python-modules/flake8/default.nix @@ -5,11 +5,11 @@ buildPythonPackage rec { pname = "flake8"; - version = "3.9.0"; + version = "3.9.2"; src = fetchPypi { inherit pname version; - sha256 = "78873e372b12b093da7b5e5ed302e8ad9e988b38b063b61ad937f26ca58fc5f0"; + sha256 = "07528381786f2a6237b061f6e96610a4167b226cb926e2aa2b6b1d78057c576b"; }; checkInputs = [ pytest mock pytestrunner ]; diff --git a/pkgs/development/python-modules/flask-api/default.nix b/pkgs/development/python-modules/flask-api/default.nix index 3bc3061b3b5..841b11a1a83 100644 --- a/pkgs/development/python-modules/flask-api/default.nix +++ b/pkgs/development/python-modules/flask-api/default.nix @@ -2,13 +2,13 @@ buildPythonPackage rec { pname = "Flask-API"; - version = "2.0"; + version = "3.0.post1"; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - sha256 = "6986642e5b25b7def710ca9489ed2b88c94006bfc06eca01c78da7cf447e66e5"; + sha256 = "1khw0f9ywn1mbdlcl0xspacqjz2pxq00m4g73bksbc1k0i88j61k"; }; propagatedBuildInputs = [ flask markdown ]; diff --git a/pkgs/development/python-modules/flask-compress/default.nix b/pkgs/development/python-modules/flask-compress/default.nix index 06c91670f44..5d8359885bd 100644 --- a/pkgs/development/python-modules/flask-compress/default.nix +++ b/pkgs/development/python-modules/flask-compress/default.nix @@ -3,12 +3,12 @@ }: buildPythonPackage rec { - version = "1.9.0"; + version = "1.10.1"; pname = "Flask-Compress"; src = fetchPypi { inherit pname version; - sha256 = "d93edd8fc02ae74b73c3df10a8e7ee26dee489c65dedce0b3a1d2ce05ac3d1be"; + sha256 = "28352387efbbe772cfb307570019f81957a13ff718d994a9125fa705efb73680"; }; propagatedBuildInputs = [ flask brotli ]; diff --git a/pkgs/development/python-modules/flask-jwt-extended/default.nix b/pkgs/development/python-modules/flask-jwt-extended/default.nix index a49aefd5ebc..d58ae431039 100644 --- a/pkgs/development/python-modules/flask-jwt-extended/default.nix +++ b/pkgs/development/python-modules/flask-jwt-extended/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "Flask-JWT-Extended"; - version = "4.1.0"; + version = "4.2.1"; src = fetchPypi { inherit pname version; - sha256 = "77ca23f23e80480ea42b9c1d9b0fca214e08db7192583e782c2421416b4a4655"; + sha256 = "76461f2dbdf502261c69ddecd858eaf4164fbcfbf05aa456f3927fc2ab0315de"; }; propagatedBuildInputs = [ dateutil flask pyjwt werkzeug ]; diff --git a/pkgs/development/python-modules/flask-migrate/default.nix b/pkgs/development/python-modules/flask-migrate/default.nix index 5297c83d64b..26f2ab4aea1 100644 --- a/pkgs/development/python-modules/flask-migrate/default.nix +++ b/pkgs/development/python-modules/flask-migrate/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "Flask-Migrate"; - version = "2.7.0"; + version = "3.0.1"; src = fetchPypi { inherit pname version; - sha256 = "ae2f05671588762dd83a21d8b18c51fe355e86783e24594995ff8d7380dffe38"; + sha256 = "00m76kgdkk0w5bfq8hbqszpyaqk0yxdvmz4s67lvd36pc7wfhhjd"; }; checkInputs = [ flask_script ] ++ lib.optional isPy3k glibcLocales; diff --git a/pkgs/development/python-modules/flask-restful/default.nix b/pkgs/development/python-modules/flask-restful/default.nix index d5b48fd0428..db7a63c5ed4 100644 --- a/pkgs/development/python-modules/flask-restful/default.nix +++ b/pkgs/development/python-modules/flask-restful/default.nix @@ -1,30 +1,46 @@ -{ lib, buildPythonPackage, fetchPypi, fetchpatch, isPy3k -, nose, mock, blinker, pytest -, flask, six, pytz, aniso8601, pycrypto +{ lib +, buildPythonPackage +, fetchPypi +, aniso8601 +, flask +, pytz +, six +, blinker +, mock +, nose +, pytestCheckHook }: buildPythonPackage rec { pname = "Flask-RESTful"; - version = "0.3.8"; + version = "0.3.9"; src = fetchPypi { inherit pname version; - sha256 = "05b9lzx5yc3wgml2bcq50lq35h66m8zpj6dc9advcb5z3acsbaay"; + sha256 = "0gm5dz088v3d2k1dkcp9b3nnqpkk0fp2jly870hijj2xhc5nbv6c"; }; - propagatedBuildInputs = [ flask six pytz aniso8601 pycrypto ]; + propagatedBuildInputs = [ + aniso8601 + flask + pytz + six + ]; - checkInputs = [ pytest nose mock blinker ]; - - # test_reqparse.py: werkzeug move Multidict location (only imported in tests) - # handle_non_api_error isn't updated for addition encoding argument - checkPhase = '' - pytest --ignore=tests/test_reqparse.py -k 'not handle_non_api_error' - ''; + checkInputs = [ + pytestCheckHook + mock + nose + blinker + ]; meta = with lib; { - homepage = "https://flask-restful.readthedocs.io/"; - description = "REST API building blocks for Flask"; + homepage = "https://flask-restful.readthedocs.io"; + description = "Simple framework for creating REST APIs"; + longDescription = '' + Flask-RESTful provides the building blocks for creating a great + REST API. + ''; license = licenses.bsd3; }; } diff --git a/pkgs/development/python-modules/flask-wtf/default.nix b/pkgs/development/python-modules/flask-wtf/default.nix index 00af0ce61e9..36437ffafa9 100644 --- a/pkgs/development/python-modules/flask-wtf/default.nix +++ b/pkgs/development/python-modules/flask-wtf/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "Flask-WTF"; - version = "0.14.3"; + version = "0.15.1"; src = fetchPypi { inherit pname version; - sha256 = "086pvg2x69n0nczcq7frknfjd8am1zdy8qqpva1sanwb02hf65yl"; + sha256 = "ff177185f891302dc253437fe63081e7a46a4e99aca61dfe086fb23e54fff2dc"; }; propagatedBuildInputs = [ flask wtforms nose ]; diff --git a/pkgs/development/python-modules/flask/1.nix b/pkgs/development/python-modules/flask/1.nix new file mode 100644 index 00000000000..27f436c3c53 --- /dev/null +++ b/pkgs/development/python-modules/flask/1.nix @@ -0,0 +1,28 @@ +{ lib, buildPythonPackage, fetchPypi +, itsdangerous, click, werkzeug, jinja2, pytest }: + +buildPythonPackage rec { + version = "1.1.2"; + pname = "Flask"; + + src = fetchPypi { + inherit pname version; + sha256 = "4efa1ae2d7c9865af48986de8aeb8504bf32c7f3d6fdc9353d34b21f4b127060"; + }; + + checkInputs = [ pytest ]; + propagatedBuildInputs = [ itsdangerous click werkzeug jinja2 ]; + + checkPhase = '' + py.test + ''; + + # Tests require extra dependencies + doCheck = false; + + meta = with lib; { + homepage = "http://flask.pocoo.org/"; + description = "A microframework based on Werkzeug, Jinja 2, and good intentions"; + license = licenses.bsd3; + }; +} diff --git a/pkgs/development/python-modules/flask/default.nix b/pkgs/development/python-modules/flask/default.nix index 27f436c3c53..166b30ac985 100644 --- a/pkgs/development/python-modules/flask/default.nix +++ b/pkgs/development/python-modules/flask/default.nix @@ -1,28 +1,47 @@ -{ lib, buildPythonPackage, fetchPypi -, itsdangerous, click, werkzeug, jinja2, pytest }: +{ lib +, buildPythonPackage +, fetchPypi +, asgiref +, click +, itsdangerous +, jinja2 +, python-dotenv +, werkzeug +, pytestCheckHook +}: buildPythonPackage rec { - version = "1.1.2"; + version = "2.0.1"; pname = "Flask"; src = fetchPypi { inherit pname version; - sha256 = "4efa1ae2d7c9865af48986de8aeb8504bf32c7f3d6fdc9353d34b21f4b127060"; + sha256 = "0mcgwq7b4qd99mf5bsvs3wphchxarf8kgil4hwww3blj31xjak0w"; }; - checkInputs = [ pytest ]; - propagatedBuildInputs = [ itsdangerous click werkzeug jinja2 ]; + propagatedBuildInputs = [ + asgiref + python-dotenv + click + itsdangerous + jinja2 + werkzeug + ]; - checkPhase = '' - py.test - ''; - - # Tests require extra dependencies - doCheck = false; + checkInputs = [ + pytestCheckHook + ]; meta = with lib; { homepage = "http://flask.pocoo.org/"; - description = "A microframework based on Werkzeug, Jinja 2, and good intentions"; + description = "The Python micro framework for building web applications"; + longDescription = '' + Flask is a lightweight WSGI web application framework. It is + designed to make getting started quick and easy, with the ability + to scale up to complex applications. It began as a simple wrapper + around Werkzeug and Jinja and has become one of the most popular + Python web application frameworks. + ''; license = licenses.bsd3; }; } diff --git a/pkgs/development/python-modules/fs/default.nix b/pkgs/development/python-modules/fs/default.nix index c14b169bea9..88aba155444 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.12"; + version = "2.4.13"; src = fetchPypi { inherit pname version; - sha256 = "c10ba188b14d6213a1ca950efd004931abbfa64b294c80bbf1045753831bf42f"; + sha256 = "caab4dc1561d63c92f36ee78976f6a4a01381830d8420ce34a78d4f1bb1dc95f"; }; buildInputs = [ glibcLocales ]; diff --git a/pkgs/development/python-modules/fsspec/default.nix b/pkgs/development/python-modules/fsspec/default.nix index e1a5611dfd3..8fb7771dbbe 100644 --- a/pkgs/development/python-modules/fsspec/default.nix +++ b/pkgs/development/python-modules/fsspec/default.nix @@ -14,14 +14,14 @@ buildPythonPackage rec { pname = "fsspec"; - version = "2021.05.0"; + version = "2021.06.0"; disabled = pythonOlder "3.6"; src = fetchFromGitHub { owner = "intake"; repo = "filesystem_spec"; rev = version; - sha256 = "sha256-MQjUBLmx3Lb3nZNU/AgBKUQ/qNOd+XH+2YI51wV8AO0="; + sha256 = "sha256-2yTjaAuORlZMACKnXkZ6QLMV2o71sPMM2O/bDPaPHD0="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/funcy/default.nix b/pkgs/development/python-modules/funcy/default.nix index 515f0925caf..3bb16d64f1f 100644 --- a/pkgs/development/python-modules/funcy/default.nix +++ b/pkgs/development/python-modules/funcy/default.nix @@ -5,11 +5,11 @@ buildPythonPackage rec { pname = "funcy"; - version = "1.15"; + version = "1.16"; src = fetchPypi { inherit pname version; - sha256 = "65b746fed572b392d886810a98d56939c6e0d545abb750527a717c21ced21008"; + sha256 = "2775409b7dc9106283f1224d97e6df5f2c02e7291c8caed72764f5a115dffb50"; }; # No tests diff --git a/pkgs/development/python-modules/fuse-python/default.nix b/pkgs/development/python-modules/fuse-python/default.nix index 14f2cb584ea..f1bf6e39a06 100644 --- a/pkgs/development/python-modules/fuse-python/default.nix +++ b/pkgs/development/python-modules/fuse-python/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "fuse-python"; - version = "1.0.1"; + version = "1.0.4"; src = fetchPypi { inherit pname version; - sha256 = "da42d4f596a2e91602bcdf46cc51747df31c074a3ceb78bccc253c483a8a75fb"; + sha256 = "b9a69c38b3909ffd35d77cb1a73ebfdc3a103a6d4cdd20c86c70ed1141771580"; }; buildInputs = [ fuse ]; diff --git a/pkgs/development/python-modules/gcsfs/default.nix b/pkgs/development/python-modules/gcsfs/default.nix index c71794b106e..201813b2ec7 100644 --- a/pkgs/development/python-modules/gcsfs/default.nix +++ b/pkgs/development/python-modules/gcsfs/default.nix @@ -17,14 +17,14 @@ buildPythonPackage rec { pname = "gcsfs"; - version = "2021.05.0"; + version = "2021.06.0"; disabled = pythonOlder "3.6"; src = fetchFromGitHub { owner = "dask"; repo = pname; rev = version; - sha256 = "sha256-I17eWaijxn0+8CzfzvzXVc0t9gQ03vx29a/i+QCQ0/U="; + sha256 = "sha256-tJeCSGK24WC8E7NKupg6/Tv861idWg6WYir+ZXeU+e0="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/gdown/default.nix b/pkgs/development/python-modules/gdown/default.nix index 8195bb0d403..bbb7c195d90 100644 --- a/pkgs/development/python-modules/gdown/default.nix +++ b/pkgs/development/python-modules/gdown/default.nix @@ -10,11 +10,11 @@ buildPythonApplication rec { pname = "gdown"; - version = "3.12.2"; + version = "3.13.0"; src = fetchPypi { inherit pname version; - sha256 = "4b3a1301e57bfd8dce939bf25ef8fbb4b23967fd0f878eede328bdcc41386bac"; + sha256 = "d5f9389539673875712beba4936c4ace95d24324953c6f0408a858c534c0bf21"; }; propagatedBuildInputs = [ filelock requests tqdm setuptools six ]; diff --git a/pkgs/development/python-modules/genanki/default.nix b/pkgs/development/python-modules/genanki/default.nix index 3f217afd8bb..f755bb8cf8f 100644 --- a/pkgs/development/python-modules/genanki/default.nix +++ b/pkgs/development/python-modules/genanki/default.nix @@ -4,11 +4,11 @@ buildPythonPackage rec { pname = "genanki"; - version = "0.10.1"; + version = "0.11.0"; src = fetchPypi { inherit pname version; - sha256 = "ced1ddcaecc37289c65c26affb20027705e3821e692327e354e0d5b9b0fd8446"; + sha256 = "f2be87e3c2850bba21627d26728238f9655b448e564f8c70ab47caef558b63ef"; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/geoalchemy2/default.nix b/pkgs/development/python-modules/geoalchemy2/default.nix index 06139b40c38..698cd67bbc3 100644 --- a/pkgs/development/python-modules/geoalchemy2/default.nix +++ b/pkgs/development/python-modules/geoalchemy2/default.nix @@ -9,11 +9,11 @@ buildPythonPackage rec { pname = "GeoAlchemy2"; - version = "0.8.4"; + version = "0.9.0"; src = fetchPypi { inherit pname version; - sha256 = "02jbad9vbnjx8bmfvxg77z18nymrry6li8hy9pwi0yiyvwbnycyr"; + sha256 = "c32023bc2fb8fbb136f00a0e9c2feba21f3e1040af0f619c888661f6ee72dd28"; }; nativeBuildInputs = [ setuptools-scm ]; diff --git a/pkgs/development/python-modules/geoip2/default.nix b/pkgs/development/python-modules/geoip2/default.nix index c0e6580e8a9..7cb37780a58 100644 --- a/pkgs/development/python-modules/geoip2/default.nix +++ b/pkgs/development/python-modules/geoip2/default.nix @@ -8,13 +8,13 @@ }: buildPythonPackage rec { - version = "4.1.0"; + version = "4.2.0"; pname = "geoip2"; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - sha256 = "57d8d15de2527e0697bbef44fc16812bba709f03a07ef99297bd56c1df3b1efd"; + sha256 = "906a1dbf15a179a1af3522970e8420ab15bb3e0afc526942cc179e12146d9c1d"; }; patchPhase = '' diff --git a/pkgs/development/python-modules/georss-ingv-centro-nazionale-terremoti-client/default.nix b/pkgs/development/python-modules/georss-ingv-centro-nazionale-terremoti-client/default.nix index a4b317407ea..dc253dafe1e 100644 --- a/pkgs/development/python-modules/georss-ingv-centro-nazionale-terremoti-client/default.nix +++ b/pkgs/development/python-modules/georss-ingv-centro-nazionale-terremoti-client/default.nix @@ -8,14 +8,14 @@ buildPythonPackage rec { pname = "georss-ingv-centro-nazionale-terremoti-client"; - version = "0.4"; + version = "0.5"; disabled = pythonOlder "3.7"; src = fetchFromGitHub { owner = "exxamalte"; repo = "python-georss-ingv-centro-nazionale-terremoti-client"; rev = "v${version}"; - sha256 = "06qhxczznckb208bnfly0q5099scq1yj5rk67a6fqczpsmzcln6x"; + sha256 = "1pd0qsr0n8f1169p2nz8s0zrbrxh0rdzaxdb3jmdymzp4xz28wb0"; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/georss-nrcan-earthquakes-client/default.nix b/pkgs/development/python-modules/georss-nrcan-earthquakes-client/default.nix index fc482e220c9..089a72ef811 100644 --- a/pkgs/development/python-modules/georss-nrcan-earthquakes-client/default.nix +++ b/pkgs/development/python-modules/georss-nrcan-earthquakes-client/default.nix @@ -8,14 +8,14 @@ buildPythonPackage rec { pname = "georss-nrcan-earthquakes-client"; - version = "0.2"; + version = "0.3"; disabled = pythonOlder "3.7"; src = fetchFromGitHub { owner = "exxamalte"; repo = "python-georss-nrcan-earthquakes-client"; rev = "v${version}"; - sha256 = "0d5cdvi35wj30yvql1sr5n4vz0g4ydrslhql3bya1b7pndfs0h3y"; + sha256 = "1brn6ycsw3d3znbqi2w2cxjw8hyfb44p2lra18rx2gyvgnkxg19l"; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/georss-tfs-incidents-client/default.nix b/pkgs/development/python-modules/georss-tfs-incidents-client/default.nix index 27d43d900fd..5428dfcbc53 100644 --- a/pkgs/development/python-modules/georss-tfs-incidents-client/default.nix +++ b/pkgs/development/python-modules/georss-tfs-incidents-client/default.nix @@ -8,14 +8,14 @@ buildPythonPackage rec { pname = "georss-tfs-incidents-client"; - version = "0.2"; + version = "0.3"; disabled = pythonOlder "3.7"; src = fetchFromGitHub { owner = "exxamalte"; repo = "python-georss-tfs-incidents-client"; rev = "v${version}"; - sha256 = "10qscn7kncb7h0b8mjykkf5kmm3ga9l8gss4acb888iaigcjgavf"; + sha256 = "11nvwrjzax4yy6aj971yym05yyizwfafy4ccsyy1qpwbs6dwbw7m"; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/georss-wa-dfes-client/default.nix b/pkgs/development/python-modules/georss-wa-dfes-client/default.nix index 1f478151bb3..ec6a5cd5f2e 100644 --- a/pkgs/development/python-modules/georss-wa-dfes-client/default.nix +++ b/pkgs/development/python-modules/georss-wa-dfes-client/default.nix @@ -8,14 +8,14 @@ buildPythonPackage rec { pname = "georss-wa-dfes-client"; - version = "0.2"; + version = "0.3"; disabled = pythonOlder "3.7"; src = fetchFromGitHub { owner = "exxamalte"; repo = "python-georss-wa-dfes-client"; rev = "v${version}"; - sha256 = "0zfjq6yyrss61vwgdrykwkikb009q63kg9ab6ryb2509wiwwfwvk"; + sha256 = "01fk67kc6ww88yzsans8g81i6j7s0276gma5fk76la1c8vj2ifs7"; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/gidgethub/default.nix b/pkgs/development/python-modules/gidgethub/default.nix index 9d9cc2095e6..a65de61b6db 100644 --- a/pkgs/development/python-modules/gidgethub/default.nix +++ b/pkgs/development/python-modules/gidgethub/default.nix @@ -16,13 +16,13 @@ buildPythonPackage rec { pname = "gidgethub"; - version = "5.0.0"; + version = "5.0.1"; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - sha256 = "a4a8d8b1ab629757b557d3bcb98a5a77790a3d00b320f5f881a1754cf0e21086"; + sha256 = "3efbd6998600254ec7a2869318bd3ffde38edc3a0d37be0c14bc46b45947b682"; }; nativeBuildInputs = [ setuptools pytestrunner ]; diff --git a/pkgs/development/python-modules/gipc/default.nix b/pkgs/development/python-modules/gipc/default.nix index 57db65268d5..8dc87ffa886 100644 --- a/pkgs/development/python-modules/gipc/default.nix +++ b/pkgs/development/python-modules/gipc/default.nix @@ -6,11 +6,11 @@ buildPythonPackage rec { pname = "gipc"; - version = "1.1.1"; + version = "1.2.0"; src = fetchPypi { inherit pname version; - sha256 = "f9a9d557e65e17bab8d7ff727ee3f1935e25bd52b01e63c23c7b3b52415728a5"; + sha256 = "6045b22dfbd8aec5542fe15d71684e46df0a4de852ccae6a02c9db3a24076e01"; }; propagatedBuildInputs = [ gevent ]; diff --git a/pkgs/development/python-modules/gitdb/default.nix b/pkgs/development/python-modules/gitdb/default.nix index 1ad0b320da8..a5fa1157814 100644 --- a/pkgs/development/python-modules/gitdb/default.nix +++ b/pkgs/development/python-modules/gitdb/default.nix @@ -7,12 +7,12 @@ buildPythonPackage rec { pname = "gitdb"; - version = "4.0.5"; + version = "4.0.7"; disabled = !isPy3k; src = fetchPypi { inherit pname version; - sha256 = "c9e1f2d0db7ddb9a704c2a0217be31214e91a4fe1dea1efad19ae42ba0c285c9"; + sha256 = "96bf5c08b157a666fec41129e6d327235284cca4c81e92109260f353ba138005"; }; propagatedBuildInputs = [ smmap ]; diff --git a/pkgs/development/python-modules/goalzero/default.nix b/pkgs/development/python-modules/goalzero/default.nix index e0e52b6702d..c533af8b7fd 100644 --- a/pkgs/development/python-modules/goalzero/default.nix +++ b/pkgs/development/python-modules/goalzero/default.nix @@ -8,13 +8,13 @@ buildPythonPackage rec { pname = "goalzero"; - version = "0.1.7"; + version = "0.1.59"; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - sha256 = "1f6a2755a745ea14e65d6bf3e56bd090a508bf6f63ccb76b9b89ce3d844a2160"; + sha256 = "0d0f11aa31672f3ef4ab617db92c87ef6f143804473022405f6da9d830f17638"; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/goocalendar/default.nix b/pkgs/development/python-modules/goocalendar/default.nix index 6c371496ffa..65cf304acc2 100644 --- a/pkgs/development/python-modules/goocalendar/default.nix +++ b/pkgs/development/python-modules/goocalendar/default.nix @@ -11,13 +11,13 @@ buildPythonPackage rec { pname = "GooCalendar"; - version = "0.7.1"; + version = "0.7.2"; disabled = !isPy3k; src = fetchPypi { inherit pname version; - sha256 = "1ccvw1w7xinl574h16hqs6dh3fkpm5n1jrqwjqz3ignxvli5sr38"; + sha256 = "318b3b7790ac9d6d98881eee3b676fc9c17fc15d21dcdaff486e3c303333b41a"; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/google-api-core/default.nix b/pkgs/development/python-modules/google-api-core/default.nix index c24419b01e2..653786ace63 100644 --- a/pkgs/development/python-modules/google-api-core/default.nix +++ b/pkgs/development/python-modules/google-api-core/default.nix @@ -15,11 +15,11 @@ buildPythonPackage rec { pname = "google-api-core"; - version = "1.26.3"; + version = "1.30.0"; src = fetchPypi { inherit pname version; - sha256 = "sha256-uRQ0XH6iOGEWJpOidwO6uASlVQT35umryv8XTYDfMqw="; + sha256 = "0724d354d394b3d763bc10dfee05807813c5210f0bd9b8e2ddf6b6925603411c"; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/google-api-python-client/default.nix b/pkgs/development/python-modules/google-api-python-client/default.nix index e2b15ccca65..2d0af0717b1 100644 --- a/pkgs/development/python-modules/google-api-python-client/default.nix +++ b/pkgs/development/python-modules/google-api-python-client/default.nix @@ -4,11 +4,11 @@ buildPythonPackage rec { pname = "google-api-python-client"; - version = "2.7.0"; + version = "2.9.0"; src = fetchPypi { inherit pname version; - sha256 = "sha256-mHm40dGCEq6Ss1urYejqntXqY++cjKhHk4U42hDdGTs="; + sha256 = "2b5274f06799d80222fd3f20fd4ebcd19f57c009703bd4cf7b00492e7e05e15a"; }; # No tests included in archive diff --git a/pkgs/development/python-modules/google-auth/default.nix b/pkgs/development/python-modules/google-auth/default.nix index 81753d11b35..1a39296d629 100644 --- a/pkgs/development/python-modules/google-auth/default.nix +++ b/pkgs/development/python-modules/google-auth/default.nix @@ -10,6 +10,7 @@ , mock , oauth2client , pyasn1-modules +, pyu2f , pytest-localserver , responses , rsa @@ -19,11 +20,11 @@ buildPythonPackage rec { pname = "google-auth"; - version = "1.28.0"; + version = "1.31.0"; src = fetchPypi { inherit pname version; - sha256 = "9bd436d19ab047001a1340720d2b629eb96dd503258c524921ec2af3ee88a80e"; + sha256 = "154f7889c5d679a6f626f36adb12afbd4dbb0a9a04ec575d989d6ba79c4fd65e"; }; propagatedBuildInputs = [ @@ -32,6 +33,7 @@ buildPythonPackage rec { rsa six pyopenssl + pyu2f ]; checkInputs = [ diff --git a/pkgs/development/python-modules/google-cloud-access-context-manager/default.nix b/pkgs/development/python-modules/google-cloud-access-context-manager/default.nix index dd1dd0e34d1..79dce752780 100644 --- a/pkgs/development/python-modules/google-cloud-access-context-manager/default.nix +++ b/pkgs/development/python-modules/google-cloud-access-context-manager/default.nix @@ -6,7 +6,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "sha256-VFPmTKiFwwL1THpjDeFeHgssXvIRB+ppvZb9aU1yPV4="; + sha256 = "5453e64ca885c302f54c7a630de15e1e0b2c5ef21107ea69bd96fd694d723d5e"; }; propagatedBuildInputs = [ google-api-core ]; diff --git a/pkgs/development/python-modules/google-cloud-automl/default.nix b/pkgs/development/python-modules/google-cloud-automl/default.nix index 899eef02c9a..1d40dcac268 100644 --- a/pkgs/development/python-modules/google-cloud-automl/default.nix +++ b/pkgs/development/python-modules/google-cloud-automl/default.nix @@ -18,7 +18,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "sha256-UjYzSWtP4cp0p7Is2qIGWBgEhjgTv0YeL0N9D7etIbY="; + sha256 = "523633496b4fe1ca74a7b22cdaa206581804863813bf461e2f437d0fb7ad21b6"; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/google-cloud-bigquery-datatransfer/default.nix b/pkgs/development/python-modules/google-cloud-bigquery-datatransfer/default.nix index c7df1160631..ec3be9e2ab0 100644 --- a/pkgs/development/python-modules/google-cloud-bigquery-datatransfer/default.nix +++ b/pkgs/development/python-modules/google-cloud-bigquery-datatransfer/default.nix @@ -15,7 +15,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "sha256-msjNBqYL/cUE85+80IblGAyGhM/+/ndFqf9qY5xXVik="; + sha256 = "9ac8cd06a60bfdc504f39fbcd086e5180c8684cffefe7745a9ff6a639c575629"; }; propagatedBuildInputs = [ google-api-core libcst proto-plus ]; diff --git a/pkgs/development/python-modules/google-cloud-bigquery/default.nix b/pkgs/development/python-modules/google-cloud-bigquery/default.nix index f79916e5115..acb66394bd4 100644 --- a/pkgs/development/python-modules/google-cloud-bigquery/default.nix +++ b/pkgs/development/python-modules/google-cloud-bigquery/default.nix @@ -17,11 +17,11 @@ buildPythonPackage rec { pname = "google-cloud-bigquery"; - version = "2.18.0"; + version = "2.20.0"; src = fetchPypi { inherit pname version; - sha256 = "sha256-0JLyWfQKN7kYnXW/DRJp3ZH+EesLv7/CXJPmxXYtb4M="; + sha256 = "ff728f9a4a64d6b4ec5beb7fd2f6ed550b49bfe2b8bb3755c00821716e0d1f91"; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/google-cloud-container/default.nix b/pkgs/development/python-modules/google-cloud-container/default.nix index d3fea60d33b..095e0a84479 100644 --- a/pkgs/development/python-modules/google-cloud-container/default.nix +++ b/pkgs/development/python-modules/google-cloud-container/default.nix @@ -16,7 +16,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "sha256-59k8o5ndb7X9D5kZAkhTHJxYPRqF580snuSFSVRZ7ng="; + sha256 = "e7d93ca399dd6fb5fd0f99190248531c9c583d1a85e7cd2c9ee485495459ee78"; }; propagatedBuildInputs = [ google-api-core grpc_google_iam_v1 libcst proto-plus ]; diff --git a/pkgs/development/python-modules/google-cloud-core/default.nix b/pkgs/development/python-modules/google-cloud-core/default.nix index 3ac6544c156..3e9a3d1851b 100644 --- a/pkgs/development/python-modules/google-cloud-core/default.nix +++ b/pkgs/development/python-modules/google-cloud-core/default.nix @@ -11,11 +11,11 @@ buildPythonPackage rec { pname = "google-cloud-core"; - version = "1.6.0"; + version = "1.7.0"; src = fetchPypi { inherit pname version; - sha256 = "c6abb18527545379fc82efc4de75ce9a3772ccad2fc645adace593ba097cbb02"; + sha256 = "2ab0cf260c11d0cc334573301970419abb6a1f3909c6cd136e4be996616372fe"; }; propagatedBuildInputs = [ google-api-core ]; diff --git a/pkgs/development/python-modules/google-cloud-dataproc/default.nix b/pkgs/development/python-modules/google-cloud-dataproc/default.nix index c7dce6cba11..e98c8be0b4f 100644 --- a/pkgs/development/python-modules/google-cloud-dataproc/default.nix +++ b/pkgs/development/python-modules/google-cloud-dataproc/default.nix @@ -15,7 +15,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "sha256-blNz/r5CDisjddIlKychKfEaN/8biKdYcyKTEGO+jTg="; + sha256 = "6e5373febe420e2b2375d2252b272129f11a37ff1b88a7587322931063be8d38"; }; propagatedBuildInputs = [ google-api-core libcst proto-plus ]; diff --git a/pkgs/development/python-modules/google-cloud-datastore/default.nix b/pkgs/development/python-modules/google-cloud-datastore/default.nix index dae19022d06..5ffeac605e5 100644 --- a/pkgs/development/python-modules/google-cloud-datastore/default.nix +++ b/pkgs/development/python-modules/google-cloud-datastore/default.nix @@ -17,7 +17,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "sha256-56UQdZudVf9jyYPjxCy/XDX5tzEPTWEevjaX2mV2vLQ="; + sha256 = "e7a510759b9d55ff63c983e3c42cbf5c35f9b7310f4d611ebe3697da6576bcb4"; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/google-cloud-dlp/default.nix b/pkgs/development/python-modules/google-cloud-dlp/default.nix index 4674c1ce1dd..ea5d20142d5 100644 --- a/pkgs/development/python-modules/google-cloud-dlp/default.nix +++ b/pkgs/development/python-modules/google-cloud-dlp/default.nix @@ -12,11 +12,11 @@ buildPythonPackage rec { pname = "google-cloud-dlp"; - version = "3.1.0"; + version = "3.1.1"; src = fetchPypi { inherit pname version; - sha256 = "sha256-sPSPx5Y36MOjd81D8qDMpkWJ3YWQfRlEHqBn3N75NB4="; + sha256 = "0863e90f9a9cae70af7962dd17d99cb6dde44bf3a029ce5990cb8226557a9e95"; }; propagatedBuildInputs = [ google-api-core libcst proto-plus ]; diff --git a/pkgs/development/python-modules/google-cloud-dns/default.nix b/pkgs/development/python-modules/google-cloud-dns/default.nix index 3e80f9def44..94576499b98 100644 --- a/pkgs/development/python-modules/google-cloud-dns/default.nix +++ b/pkgs/development/python-modules/google-cloud-dns/default.nix @@ -9,11 +9,11 @@ buildPythonPackage rec { pname = "google-cloud-dns"; - version = "0.32.2"; + version = "0.32.3"; src = fetchPypi { inherit pname version; - sha256 = "0ec98a9933b2abd95b174c9cae0477b90aa4c1f5068b69a9f8ced6d20db1cd5a"; + sha256 = "bbb1c855524bd3f0f2a3b3db883af0d3f618befb976aa694d7e507dd68fc7a71"; }; propagatedBuildInputs = [ google-api-core google-cloud-core ]; diff --git a/pkgs/development/python-modules/google-cloud-firestore/default.nix b/pkgs/development/python-modules/google-cloud-firestore/default.nix index 4ff4c920c8a..1c2dfe88a6e 100644 --- a/pkgs/development/python-modules/google-cloud-firestore/default.nix +++ b/pkgs/development/python-modules/google-cloud-firestore/default.nix @@ -13,11 +13,11 @@ buildPythonPackage rec { pname = "google-cloud-firestore"; - version = "2.1.1"; + version = "2.1.3"; src = fetchPypi { inherit pname version; - sha256 = "sha256-73sKlKHX7ThsdZJyT22wiqbema7o3aOIaWS8WYrri+w="; + sha256 = "143a88ef2b90c98f16d2b0bc192631ca3e2b7c66a236d93ba9961de64e50870e"; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/google-cloud-iam/default.nix b/pkgs/development/python-modules/google-cloud-iam/default.nix index ddcc20c66bc..873e8169bf9 100644 --- a/pkgs/development/python-modules/google-cloud-iam/default.nix +++ b/pkgs/development/python-modules/google-cloud-iam/default.nix @@ -16,7 +16,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "sha256-H2S3jIVMBinyCQMBHW3vKMmBzlaCpSIQMfauHKoKH+o="; + sha256 = "1f64b78c854c0629f20903011d6def28c981ce5682a5221031f6ae1caa0a1fea"; }; propagatedBuildInputs = [ google-api-core libcst proto-plus ]; diff --git a/pkgs/development/python-modules/google-cloud-iot/default.nix b/pkgs/development/python-modules/google-cloud-iot/default.nix index f9be06a827e..5fc87b31c30 100644 --- a/pkgs/development/python-modules/google-cloud-iot/default.nix +++ b/pkgs/development/python-modules/google-cloud-iot/default.nix @@ -12,11 +12,11 @@ buildPythonPackage rec { pname = "google-cloud-iot"; - version = "2.0.2"; + version = "2.1.0"; src = fetchPypi { inherit pname version; - sha256 = "768ccd567b87bf0030f9458d796cc0a846c40825fa2896b77e9cc7a4af30ba2b"; + sha256 = "f4d7c55636e8cb57a4dde41d933cd8663b1369ab3542b287957959ee59828559"; }; propagatedBuildInputs = [ grpc_google_iam_v1 google-api-core libcst proto-plus ]; diff --git a/pkgs/development/python-modules/google-cloud-kms/default.nix b/pkgs/development/python-modules/google-cloud-kms/default.nix index 94dd7c1ba8f..1caf22bdd27 100644 --- a/pkgs/development/python-modules/google-cloud-kms/default.nix +++ b/pkgs/development/python-modules/google-cloud-kms/default.nix @@ -12,11 +12,11 @@ buildPythonPackage rec { pname = "google-cloud-kms"; - version = "2.2.0"; + version = "2.3.0"; src = fetchPypi { inherit pname version; - sha256 = "0f3k2ixp1zsgydpvkj75bs2mb805389snyw30hn41c38qq5ksdga"; + sha256 = "39c6aa1633e45dc0364397b24c83718bd63f833db41d8c93b76019c16208d0f1"; }; propagatedBuildInputs = [ grpc_google_iam_v1 google-api-core libcst proto-plus ]; diff --git a/pkgs/development/python-modules/google-cloud-language/default.nix b/pkgs/development/python-modules/google-cloud-language/default.nix index c43c51d97f7..b6414355a19 100644 --- a/pkgs/development/python-modules/google-cloud-language/default.nix +++ b/pkgs/development/python-modules/google-cloud-language/default.nix @@ -11,11 +11,11 @@ buildPythonPackage rec { pname = "google-cloud-language"; - version = "2.0.0"; + version = "2.1.0"; src = fetchPypi { inherit pname version; - sha256 = "123vqfrn7pyn3ia7cmhx8bgafd4gxxlmhf33s3vgspyjck6sprxb"; + sha256 = "63ca2d772e16e4440858848e8c3298859b931b1652f663683fb5d7413b7c9a1b"; }; propagatedBuildInputs = [ google-api-core libcst proto-plus ]; diff --git a/pkgs/development/python-modules/google-cloud-logging/default.nix b/pkgs/development/python-modules/google-cloud-logging/default.nix index 458d5b720c0..6e11f78347a 100644 --- a/pkgs/development/python-modules/google-cloud-logging/default.nix +++ b/pkgs/development/python-modules/google-cloud-logging/default.nix @@ -15,11 +15,11 @@ buildPythonPackage rec { pname = "google-cloud-logging"; - version = "2.4.0"; + version = "2.5.0"; src = fetchPypi { inherit pname version; - sha256 = "sha256-BuAqNkK817Zz4dbI16ttoVnapR+8DDrp8RGDZtUej7s="; + sha256 = "ab9d6ee1156cabe8c2483ca5a67bdf3a8582c596dd4e498a59781b6670b085f0"; }; propagatedBuildInputs = [ google-api-core google-cloud-core proto-plus ]; diff --git a/pkgs/development/python-modules/google-cloud-monitoring/default.nix b/pkgs/development/python-modules/google-cloud-monitoring/default.nix index 4c63df9f174..2638a4bda8d 100644 --- a/pkgs/development/python-modules/google-cloud-monitoring/default.nix +++ b/pkgs/development/python-modules/google-cloud-monitoring/default.nix @@ -13,11 +13,11 @@ buildPythonPackage rec { pname = "google-cloud-monitoring"; - version = "2.2.1"; + version = "2.3.0"; src = fetchPypi { inherit pname version; - sha256 = "sha256-QeMJBJKjW3Zu0p0mSmo5dVOJNwRmmA5FKXRXjCd+zN4="; + sha256 = "fcbf644622709277d47b0dd8884efd1d62703bffda3c1030e06404709690c06c"; }; propagatedBuildInputs = [ libcst google-api-core proto-plus ]; diff --git a/pkgs/development/python-modules/google-cloud-org-policy/default.nix b/pkgs/development/python-modules/google-cloud-org-policy/default.nix index 56932ec4859..dbeb2c3004d 100644 --- a/pkgs/development/python-modules/google-cloud-org-policy/default.nix +++ b/pkgs/development/python-modules/google-cloud-org-policy/default.nix @@ -6,7 +6,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "sha256-7qVemc7siW/8mO4wUXEKJBt9M18kagRyu/+7DLLe9FM="; + sha256 = "eea55e99ceec896ffc98ee3051710a241b7d335f246a0472bbffbb0cb2def453"; }; propagatedBuildInputs = [ google-api-core proto-plus ]; 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 dcb820640a6..766ed903767 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.1.0"; + version = "1.2.0"; src = fetchPypi { inherit pname version; - sha256 = "c993129ecb1db6ab9b49cacfa11f368f30c7d897640c56f52558edf542c08ade"; + sha256 = "2b828513c1cea481d03d0218516e5c5d8b53756db3637f02cd69ae3c171832dc"; }; 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 6bce8cc5a89..f0615bd5a21 100644 --- a/pkgs/development/python-modules/google-cloud-pubsub/default.nix +++ b/pkgs/development/python-modules/google-cloud-pubsub/default.nix @@ -17,7 +17,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "sha256-hwZVe3FTLHauxIQJ3KwYnKrEfPLey4hQrnVpS/cDJrI="; + sha256 = "8706557b71532c76aec48409dcac189caac47cf2decb8850ae75694bf70326b2"; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/google-cloud-redis/default.nix b/pkgs/development/python-modules/google-cloud-redis/default.nix index 9070d2f083e..fe4ea4249c0 100644 --- a/pkgs/development/python-modules/google-cloud-redis/default.nix +++ b/pkgs/development/python-modules/google-cloud-redis/default.nix @@ -15,7 +15,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "sha256-2X/ek2ECarZ/U1V6j+nz2yYSGVmrWG/kU/QqQB1A+0w="; + sha256 = "d97fde9361026ab67f53557a8fe9f3db26121959ab586fe453f42a401d40fb4c"; }; propagatedBuildInputs = [ google-api-core libcst proto-plus ]; diff --git a/pkgs/development/python-modules/google-cloud-runtimeconfig/default.nix b/pkgs/development/python-modules/google-cloud-runtimeconfig/default.nix index 588918ad62e..6e741a4e297 100644 --- a/pkgs/development/python-modules/google-cloud-runtimeconfig/default.nix +++ b/pkgs/development/python-modules/google-cloud-runtimeconfig/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "sha256-UoWu+Y/bmmkefFR4nnxJPFFnS253/myWcXKujq27oCY="; + sha256 = "5285aef98fdb9a691e7c54789e7c493c51674b6e77fe6c967172ae8eadbba026"; }; propagatedBuildInputs = [ google-api-core google-cloud-core ]; diff --git a/pkgs/development/python-modules/google-cloud-secret-manager/default.nix b/pkgs/development/python-modules/google-cloud-secret-manager/default.nix index 47e23c21422..cf1ac538f15 100644 --- a/pkgs/development/python-modules/google-cloud-secret-manager/default.nix +++ b/pkgs/development/python-modules/google-cloud-secret-manager/default.nix @@ -12,11 +12,11 @@ buildPythonPackage rec { pname = "google-cloud-secret-manager"; - version = "2.4.0"; + version = "2.5.0"; src = fetchPypi { inherit pname version; - sha256 = "sha256-/ROngNZJld6iA8WjbJLLNzu5vFWPFUNdTikc70kNkQ4="; + sha256 = "e99eb9f77373b97bfc1becb7d23fae5574a33fd9e44b44a3e700abcbfbc9f94d"; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/google-cloud-securitycenter/default.nix b/pkgs/development/python-modules/google-cloud-securitycenter/default.nix index ac630ba27c4..cc83868079f 100644 --- a/pkgs/development/python-modules/google-cloud-securitycenter/default.nix +++ b/pkgs/development/python-modules/google-cloud-securitycenter/default.nix @@ -12,11 +12,11 @@ buildPythonPackage rec { pname = "google-cloud-securitycenter"; - version = "1.3.0"; + version = "1.3.1"; src = fetchPypi { inherit pname version; - sha256 = "sha256-cyJ58BPB7mYWbmHFxPAxnf2JX0b8kqLJF4hdcppaNNI="; + sha256 = "872507adad97f452e0998730cd1993c0433c05a0757c268f5c02fbfabe7720d4"; }; propagatedBuildInputs = [ grpc_google_iam_v1 google-api-core libcst proto-plus ]; diff --git a/pkgs/development/python-modules/google-cloud-spanner/default.nix b/pkgs/development/python-modules/google-cloud-spanner/default.nix index eae38f5dfc1..17fe6be9717 100644 --- a/pkgs/development/python-modules/google-cloud-spanner/default.nix +++ b/pkgs/development/python-modules/google-cloud-spanner/default.nix @@ -14,11 +14,11 @@ buildPythonPackage rec { pname = "google-cloud-spanner"; - version = "3.4.0"; + version = "3.5.0"; src = fetchPypi { inherit pname version; - sha256 = "sha256-8o7pr9msuMfIN7UMX+/gppmD3MWXt2hBqb7vcLUE22M="; + sha256 = "19656140f180aef84e023c3a8fd534ac964247a52199317ea33abc701d5a8c5a"; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/google-cloud-speech/default.nix b/pkgs/development/python-modules/google-cloud-speech/default.nix index bccc2ad8bac..8a72a3e006c 100644 --- a/pkgs/development/python-modules/google-cloud-speech/default.nix +++ b/pkgs/development/python-modules/google-cloud-speech/default.nix @@ -15,7 +15,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "sha256-mR7gYBvJVhEOhzruGnREHWYiexDNWBGVV1Q1iEOE84s="; + sha256 = "991ee0601bc956110e873aee1a74441d66227b10cd581195575435884384f38b"; }; propagatedBuildInputs = [ libcst google-api-core proto-plus ]; diff --git a/pkgs/development/python-modules/google-cloud-storage/default.nix b/pkgs/development/python-modules/google-cloud-storage/default.nix index e54a5247982..037e96c0e73 100644 --- a/pkgs/development/python-modules/google-cloud-storage/default.nix +++ b/pkgs/development/python-modules/google-cloud-storage/default.nix @@ -17,7 +17,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "sha256-FiAR1m9kuNxdeTZgml2vAGbMUhIxVGrqAsEmpVWURsQ="; + sha256 = "162011d66f64b8dc5d7936609a5daf0066cc521231546aea02c126a5559446c4"; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/google-cloud-tasks/default.nix b/pkgs/development/python-modules/google-cloud-tasks/default.nix index d04c996acf9..420aacb1e4b 100644 --- a/pkgs/development/python-modules/google-cloud-tasks/default.nix +++ b/pkgs/development/python-modules/google-cloud-tasks/default.nix @@ -16,7 +16,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "sha256-fMJNOJBzxAr0Hi/AkUF97G5YrwfbmxKVhT/D1UXIDP4="; + sha256 = "7cc24d389073c40af41e2fc091417dec6e58af07db9b1295853fc3d545c80cfe"; }; propagatedBuildInputs = [ google-api-core grpc_google_iam_v1 libcst proto-plus ]; diff --git a/pkgs/development/python-modules/google-cloud-texttospeech/default.nix b/pkgs/development/python-modules/google-cloud-texttospeech/default.nix index f1cbf3f307a..44055e84ce6 100644 --- a/pkgs/development/python-modules/google-cloud-texttospeech/default.nix +++ b/pkgs/development/python-modules/google-cloud-texttospeech/default.nix @@ -15,7 +15,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "sha256-xQzCG134i2lmgNiqw6tshoIMDk0HHWpdzZtjSkVs9Z8="; + sha256 = "c50cc21b5df88b696680d8aac3ab6c86820c0e4d071d6a5dcd9b634a456cf59f"; }; propagatedBuildInputs = [ libcst google-api-core proto-plus ]; diff --git a/pkgs/development/python-modules/google-cloud-trace/default.nix b/pkgs/development/python-modules/google-cloud-trace/default.nix index 9f814c36c2b..3e96e06c8a0 100644 --- a/pkgs/development/python-modules/google-cloud-trace/default.nix +++ b/pkgs/development/python-modules/google-cloud-trace/default.nix @@ -16,7 +16,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "sha256-NoNHel10dFEzKjjWyM6mUrWZHbH25MOZB/o2eXCKwhg="; + sha256 = "3683477a5d747451332a38d6c8cea652b5991db1f6e4c39907fa3679708ac218"; }; propagatedBuildInputs = [ google-api-core google-cloud-core proto-plus ]; diff --git a/pkgs/development/python-modules/google-cloud-translate/default.nix b/pkgs/development/python-modules/google-cloud-translate/default.nix index b1167433b4c..3469043cdad 100644 --- a/pkgs/development/python-modules/google-cloud-translate/default.nix +++ b/pkgs/development/python-modules/google-cloud-translate/default.nix @@ -18,7 +18,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "sha256-jNlX9LKajHqYPgpCfCcSUzxBu3AHt2qMyI1sZQdcZ5o="; + sha256 = "8cd957f4b29a8c7a983e0a427c2712533c41bb7007b76a8cc88d6c65075c679a"; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/google-cloud-videointelligence/default.nix b/pkgs/development/python-modules/google-cloud-videointelligence/default.nix index c68db2bfece..4240a4aa2e0 100644 --- a/pkgs/development/python-modules/google-cloud-videointelligence/default.nix +++ b/pkgs/development/python-modules/google-cloud-videointelligence/default.nix @@ -15,7 +15,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "sha256-CBBt3uyQon9Lxwb3Jn7BxS8r/3Rbr9RxC8aJhGDI6aY="; + sha256 = "08106ddeec90a27f4bc706f7267ec1c52f2bff745bafd4710bc6898460c8e9a6"; }; propagatedBuildInputs = [ google-api-core proto-plus ]; diff --git a/pkgs/development/python-modules/google-cloud-vision/default.nix b/pkgs/development/python-modules/google-cloud-vision/default.nix index 2a98edced7a..96360d8dc4e 100644 --- a/pkgs/development/python-modules/google-cloud-vision/default.nix +++ b/pkgs/development/python-modules/google-cloud-vision/default.nix @@ -11,11 +11,11 @@ buildPythonPackage rec { pname = "google-cloud-vision"; - version = "2.3.1"; + version = "2.3.2"; src = fetchPypi { inherit pname version; - sha256 = "sha256-Nnqm+f2OSKBRTOpuB7PQBvAaunCA8XoontDfkuh/f4Q="; + sha256 = "65ed06725377670fc1b21d474237922f29674d0f99a472b0c84683aa02af70a4"; }; propagatedBuildInputs = [ libcst google-api-core proto-plus]; diff --git a/pkgs/development/python-modules/google-cloud-websecurityscanner/default.nix b/pkgs/development/python-modules/google-cloud-websecurityscanner/default.nix index 5598a98cf83..a5e462b64ad 100644 --- a/pkgs/development/python-modules/google-cloud-websecurityscanner/default.nix +++ b/pkgs/development/python-modules/google-cloud-websecurityscanner/default.nix @@ -11,11 +11,11 @@ buildPythonPackage rec { pname = "google-cloud-websecurityscanner"; - version = "1.2.0"; + version = "1.3.0"; src = fetchPypi { inherit pname version; - sha256 = "sha256-Lg6yoqOu88lZHT/H9FPdgVgSDm7oLUaPm7T1UsXB8Fo="; + sha256 = "632ac3c50eee704ed2a6e87d5a09379589841cf53459813c76f8bea01e77c49d"; }; propagatedBuildInputs = [ google-api-core libcst proto-plus ]; diff --git a/pkgs/development/python-modules/google-resumable-media/default.nix b/pkgs/development/python-modules/google-resumable-media/default.nix index 531dc1a2860..77346282cd7 100644 --- a/pkgs/development/python-modules/google-resumable-media/default.nix +++ b/pkgs/development/python-modules/google-resumable-media/default.nix @@ -12,11 +12,11 @@ buildPythonPackage rec { pname = "google-resumable-media"; - version = "1.2.0"; + version = "1.3.1"; src = fetchPypi { inherit pname version; - sha256 = "0hwxdgsqh6933kp4jkv6hwwdcqs7bgjn9j08ga399njv3s9b367f"; + sha256 = "1a1eb743d13f782d1405437c266b2c815ef13c2b141ba40835c74a3317539d01"; }; propagatedBuildInputs = [ google-auth google-crc32c requests ]; diff --git a/pkgs/development/python-modules/gorilla/default.nix b/pkgs/development/python-modules/gorilla/default.nix index 42da4541647..22e71df3245 100644 --- a/pkgs/development/python-modules/gorilla/default.nix +++ b/pkgs/development/python-modules/gorilla/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "gorilla"; - version = "0.3.0"; + version = "0.4.0"; src = fetchPypi { inherit pname version; - sha256 = "feb2899b923935c25420b94aa8c266ccb5c0315199c685b725303a73195d802c"; + sha256 = "005ab8853b037162a7c77bb824604c6e081878ee03c09ad01ef41744856019d3"; }; meta = with lib; { diff --git a/pkgs/development/python-modules/gpy/default.nix b/pkgs/development/python-modules/gpy/default.nix index 9c444f465f3..217039277ba 100644 --- a/pkgs/development/python-modules/gpy/default.nix +++ b/pkgs/development/python-modules/gpy/default.nix @@ -12,11 +12,11 @@ buildPythonPackage rec { pname = "GPy"; - version = "1.9.9"; + version = "1.10.0"; src = fetchPypi { inherit pname version; - sha256 = "04faf0c24eacc4dea60727c50a48a07ddf9b5751a3b73c382105e2a31657c7ed"; + sha256 = "a2b793ef8d0ac71739e7ba1c203bc8a5afa191058b42caa617e0e29aa52aa6fb"; }; buildInputs = [ cython ]; diff --git a/pkgs/development/python-modules/gpyopt/default.nix b/pkgs/development/python-modules/gpyopt/default.nix index 85b6efabaa8..8852c569675 100644 --- a/pkgs/development/python-modules/gpyopt/default.nix +++ b/pkgs/development/python-modules/gpyopt/default.nix @@ -1,17 +1,19 @@ { lib, buildPythonPackage, fetchFromGitHub, setuptools -, numpy, scipy, gpy, emcee, nose }: +, numpy, scipy, gpy, emcee, nose, cython }: buildPythonPackage rec { pname = "GPyOpt"; - version = "unstable-2019-09-25"; + version = "1.2.6"; src = fetchFromGitHub { repo = pname; owner = "SheffieldML"; - rev = "249b8ff29c52c12ed867f145a627d529372022d8"; - sha256 = "1ywaw1kpdr7dv4s4cr7afmci86sw7w61178gs45b0lq08652zdlb"; + rev = "v${version}"; + sha256 = "1sv13svaks67i9z560746hz4hslakdna0zd3gxj828il1cv7cslm"; }; + nativeBuildInputs = [ cython ]; + doCheck = false; # requires several packages not available in Nix checkInputs = [ nose ]; @@ -20,6 +22,8 @@ buildPythonPackage rec { propagatedBuildInputs = [ setuptools numpy scipy gpy emcee ]; + pythonImportsCheck = [ "GPyOpt" ]; + meta = with lib; { description = "Bayesian optimization toolbox in Python"; homepage = "https://sheffieldml.github.io/GPyOpt"; diff --git a/pkgs/development/python-modules/gradient/default.nix b/pkgs/development/python-modules/gradient/default.nix index 9a2f89e8c41..92ddbbd73f7 100644 --- a/pkgs/development/python-modules/gradient/default.nix +++ b/pkgs/development/python-modules/gradient/default.nix @@ -22,11 +22,11 @@ buildPythonPackage rec { pname = "gradient"; - version = "1.4.3"; + version = "1.5.5"; src = fetchPypi { inherit pname version; - sha256 = "a8fa91669c97440049132119019e90d0a9cf09e96352cf43c7c6ca244894bd4e"; + sha256 = "fee5016afe5e61a640bb9d7e234a10926c17c9e83c876b617438ff5f5ce039ad"; }; postPatch = '' diff --git a/pkgs/development/python-modules/graphite-web/default.nix b/pkgs/development/python-modules/graphite-web/default.nix index 08125bfc71a..cf188e1d5d1 100644 --- a/pkgs/development/python-modules/graphite-web/default.nix +++ b/pkgs/development/python-modules/graphite-web/default.nix @@ -17,11 +17,11 @@ buildPythonPackage rec { pname = "graphite-web"; - version = "1.1.7"; + version = "1.1.8"; src = fetchPypi { inherit pname version; - sha256 = "b3cb3b9affe1b9e3777aab046416b3d545390ceea4d35d55c753b1e4732eaad0"; + sha256 = "54240b0f1e069b53e2ce92d4e534e21b195fb0ebd64b6ad8a49c44284e3eb0b1"; }; patches = [ diff --git a/pkgs/development/python-modules/graphql-core/default.nix b/pkgs/development/python-modules/graphql-core/default.nix index 85021d126a1..7ac25424616 100644 --- a/pkgs/development/python-modules/graphql-core/default.nix +++ b/pkgs/development/python-modules/graphql-core/default.nix @@ -8,14 +8,14 @@ buildPythonPackage rec { pname = "graphql-core"; - version = "3.1.4"; + version = "3.1.5"; disabled = pythonOlder "3.6"; src = fetchFromGitHub { owner = "graphql-python"; repo = pname; rev = "v${version}"; - sha256 = "sha256-lamV5Rd37WvFBJ+zJUb+UhqxoNUrRhoMJx1NodbQUjs="; + sha256 = "055gfvyax781f4zk4pl60y8yd90bnn4rkqh5i48pczaff0lwlfj1"; }; checkInputs = [ diff --git a/pkgs/development/python-modules/green/default.nix b/pkgs/development/python-modules/green/default.nix index 8123f188d6e..934c363245d 100644 --- a/pkgs/development/python-modules/green/default.nix +++ b/pkgs/development/python-modules/green/default.nix @@ -8,13 +8,13 @@ buildPythonPackage rec { pname = "green"; - version = "3.2.5"; + version = "3.2.6"; disabled = !isPy3k; src = fetchPypi { inherit pname version; - sha256 = "11d595d98afc3363d79e237141ad862c0574a62f92325d9e541ed1b1a54a72ae"; + sha256 = "e51d4ff6e6885942d944304fedc7440a8f87917aa09526beeecb31a0dae655b8"; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/greenlet/default.nix b/pkgs/development/python-modules/greenlet/default.nix index c1de32eff51..8762d62e59b 100644 --- a/pkgs/development/python-modules/greenlet/default.nix +++ b/pkgs/development/python-modules/greenlet/default.nix @@ -8,12 +8,12 @@ buildPythonPackage rec { pname = "greenlet"; - version = "1.0.0"; + version = "1.1.0"; disabled = isPyPy; # builtin for pypy src = fetchPypi { inherit pname version; - sha256 = "1y6wbg9yhm9dw6m768n4yslp56h85pnxkk3drz6icn15g6f1d7ki"; + sha256 = "c87df8ae3f01ffb4483c796fe1b15232ce2b219f0b18126948616224d3f658ee"; }; propagatedBuildInputs = [ six ]; diff --git a/pkgs/development/python-modules/gsd/default.nix b/pkgs/development/python-modules/gsd/default.nix index b23cfc71e60..8891b513421 100644 --- a/pkgs/development/python-modules/gsd/default.nix +++ b/pkgs/development/python-modules/gsd/default.nix @@ -4,7 +4,7 @@ }: buildPythonPackage rec { - version = "2.4.1"; + version = "2.4.2"; pname = "gsd"; disabled = isPy27; @@ -12,7 +12,7 @@ buildPythonPackage rec { owner = "glotzerlab"; repo = pname; rev = "v${version}"; - sha256 = "02zxfmqw7a5kz8qjdph9a9961mbkd4haxwwa28yjkxs5hzs5x3c8"; + sha256 = "1yv84girmqm155yjhhkiy1gdflf62110m2kgjiv4vcsjpy2i6has"; }; nativeBuildInputs = [ cython ]; diff --git a/pkgs/development/python-modules/gtts/default.nix b/pkgs/development/python-modules/gtts/default.nix index f3e8162b714..cc08c48f694 100644 --- a/pkgs/development/python-modules/gtts/default.nix +++ b/pkgs/development/python-modules/gtts/default.nix @@ -15,13 +15,13 @@ buildPythonPackage rec { pname = "gtts"; - version = "2.2.2"; + version = "2.2.3"; src = fetchFromGitHub { owner = "pndurette"; repo = "gTTS"; rev = "v${version}"; - sha256 = "052l7gk1v0zckraavyba1bc2cqvmrbffwxxjsklgnslbdcg5h514"; + sha256 = "1pj7lyd1r72nxs3sgd78awpbsz41g4idjvbsjjp4chfq4qnsq0ji"; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/gunicorn/default.nix b/pkgs/development/python-modules/gunicorn/default.nix index 3f3eceee378..c1f36c20566 100644 --- a/pkgs/development/python-modules/gunicorn/default.nix +++ b/pkgs/development/python-modules/gunicorn/default.nix @@ -8,12 +8,12 @@ buildPythonPackage rec { pname = "gunicorn"; - version = "20.0.4"; + version = "20.1.0"; disabled = isPy27; src = fetchPypi { inherit pname version; - sha256 = "1904bb2b8a43658807108d59c3f3d56c2b6121a701161de0ddf9ad140073c626"; + sha256 = "e0a968b5ba15f8a328fdfd7ab1fcb5af4470c28aaf7e55df02a99bc13138e6e8"; }; propagatedBuildInputs = [ setuptools ]; diff --git a/pkgs/development/python-modules/h2/default.nix b/pkgs/development/python-modules/h2/default.nix index ba681658e9a..fccc1643216 100644 --- a/pkgs/development/python-modules/h2/default.nix +++ b/pkgs/development/python-modules/h2/default.nix @@ -1,18 +1,48 @@ -{ lib, buildPythonPackage, fetchPypi -, enum34, hpack, hyperframe, pytestCheckHook, hypothesis }: +{ lib +, buildPythonPackage +, pythonOlder +, fetchPypi +, fetchpatch +, hpack +, hyperframe +, pytestCheckHook +, hypothesis +}: buildPythonPackage rec { pname = "h2"; version = "4.0.0"; + format = "setuptools"; + disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; sha256 = "bb7ac7099dd67a857ed52c815a6192b6b1f5ba6b516237fc24a085341340593d"; }; - propagatedBuildInputs = [ enum34 hpack hyperframe ]; + patches = [ + # Workaround issues with hypothesis 6.6 + # https://github.com/python-hyper/h2/pull/1248 + (fetchpatch { + url = "https://github.com/python-hyper/h2/commit/0646279dab694a89562846c810202ce2c0b49be3.patch"; + sha256 = "1k0fsxwq9wbv15sc9ixls4qmxxghlzpflf3awm66ar9m2ikahiak"; + }) + ]; - checkInputs = [ pytestCheckHook hypothesis ]; + propagatedBuildInputs = [ + hpack + hyperframe + ]; + + checkInputs = [ + pytestCheckHook + hypothesis + ]; + + pythonImportCheck = [ + "h2.connection" + "h2.config" + ]; meta = with lib; { description = "HTTP/2 State-Machine based protocol implementation"; diff --git a/pkgs/development/python-modules/h3/default.nix b/pkgs/development/python-modules/h3/default.nix index 3552b6922fc..6e5965053f4 100644 --- a/pkgs/development/python-modules/h3/default.nix +++ b/pkgs/development/python-modules/h3/default.nix @@ -13,14 +13,14 @@ buildPythonPackage rec { pname = "h3"; - version = "3.7.2"; + version = "3.7.3"; # pypi version does not include tests src = fetchFromGitHub { owner = "uber"; repo = "h3-py"; rev = "v${version}"; - sha256 = "00yi5ncfhi2wpakwm9visi1jlnnaaha66y90fjcsfyvi4hkm8xv2"; + sha256 = "0wc1fz8v59r97wlayr4lnsgwzd4fxm991xbs9690d4vwdkapafll"; }; dontConfigure = true; diff --git a/pkgs/development/python-modules/hbmqtt/default.nix b/pkgs/development/python-modules/hbmqtt/default.nix index c457da91886..37a4762bfc1 100644 --- a/pkgs/development/python-modules/hbmqtt/default.nix +++ b/pkgs/development/python-modules/hbmqtt/default.nix @@ -18,6 +18,10 @@ buildPythonPackage rec { ]; postPatch = '' + # https://github.com/beerfactory/hbmqtt/pull/241 + substituteInPlace hbmqtt/adapters.py \ + --replace "websockets.protocol" "websockets.legacy.protocol" + # test tries to bind same port multiple times and fails rm tests/test_client.py ''; diff --git a/pkgs/development/python-modules/hijri-converter/default.nix b/pkgs/development/python-modules/hijri-converter/default.nix index 07f3956c54d..d7ae17ed61a 100644 --- a/pkgs/development/python-modules/hijri-converter/default.nix +++ b/pkgs/development/python-modules/hijri-converter/default.nix @@ -6,11 +6,11 @@ buildPythonPackage rec { pname = "hijri-converter"; - version = "2.1.1"; + version = "2.1.2"; src = fetchPypi { inherit pname version; - sha256 = "08gv6ypn2zd0i8yrv24m448xkic492qrgxj349slp1achhg9p7ln"; + sha256 = "43b5ac566e7a7deeab364a2397e94405a65fd24ea786073eb3d4c740ebda7b9b"; }; checkInputs = [ pytestCheckHook ]; diff --git a/pkgs/development/python-modules/holoviews/default.nix b/pkgs/development/python-modules/holoviews/default.nix index 667da5aa649..0cf33a8f580 100644 --- a/pkgs/development/python-modules/holoviews/default.nix +++ b/pkgs/development/python-modules/holoviews/default.nix @@ -16,11 +16,11 @@ buildPythonPackage rec { pname = "holoviews"; - version = "1.14.2"; + version = "1.14.4"; src = fetchPypi { inherit pname version; - sha256 = "64f85cf2c99b083b96f26cd26452aec4b41ced6d9e57f56ae8d72b88defc61c9"; + sha256 = "08e8be82c2e514e1700a75f02307f414179dc0ecfa2202702dd304a381909eaa"; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/howdoi/default.nix b/pkgs/development/python-modules/howdoi/default.nix index f75a84c01b8..b886e3c8b4f 100644 --- a/pkgs/development/python-modules/howdoi/default.nix +++ b/pkgs/development/python-modules/howdoi/default.nix @@ -11,11 +11,11 @@ buildPythonPackage rec { pname = "howdoi"; - version = "2.0.14"; + version = "2.0.16"; src = fetchPypi { inherit pname version; - sha256 = "9416be3c8a319fc0764a743a2ad05fa374876dab71dbe15ce86c3a05ece44a0a"; + sha256 = "0257fbb328eb3a15ed3acc498314902f00908b130209073509eec21cb7235b2b"; }; postPatch = '' diff --git a/pkgs/development/python-modules/html-sanitizer/default.nix b/pkgs/development/python-modules/html-sanitizer/default.nix index 17783f38d1f..546f1acad09 100644 --- a/pkgs/development/python-modules/html-sanitizer/default.nix +++ b/pkgs/development/python-modules/html-sanitizer/default.nix @@ -1,4 +1,10 @@ -{ lib, buildPythonPackage, fetchFromGitHub, lxml, beautifulsoup4, pytest, pytestrunner }: +{ lib +, buildPythonPackage +, fetchFromGitHub +, lxml +, beautifulsoup4 +, pytestCheckHook +}: buildPythonPackage rec { pname = "html-sanitizer"; @@ -11,11 +17,23 @@ buildPythonPackage rec { sha256 = "0nnv34924r0yn01rwlk749j5ijy7yxyj302s1i57yjrkqr3zlvas"; }; - propagatedBuildInputs = [ lxml beautifulsoup4 ]; + propagatedBuildInputs = [ + lxml + beautifulsoup4 + ]; + + checkInputs = [ + pytestCheckHook + ]; + + pytestFlagsArray = [ "html_sanitizer/tests.py" ]; + + pythonImportsCheck = [ "html_sanitizer" ]; meta = with lib; { - description = "An allowlist-based and very opinionated HTML sanitizer that can be used both for untrusted and trusted sources."; + description = "Allowlist-based and very opinionated HTML sanitizer"; homepage = "https://github.com/matthiask/html-sanitizer"; - license = licenses.bsd3; + license = with licenses; [ bsd3 ]; + maintainers = with maintainers; [ fab ]; }; } diff --git a/pkgs/development/python-modules/httpcore/default.nix b/pkgs/development/python-modules/httpcore/default.nix index 7781dbe8b31..de2f9b00f53 100644 --- a/pkgs/development/python-modules/httpcore/default.nix +++ b/pkgs/development/python-modules/httpcore/default.nix @@ -44,12 +44,6 @@ buildPythonPackage rec { uvicorn ]; - postPatch = '' - # The anyio 3.1.0 release is not picked-up proberly - substituteInPlace setup.py --replace "anyio==3.*" "anyio" - ''; - - disabledTestPaths = [ # these tests fail during dns lookups: httpcore.ConnectError: [Errno -2] Name or service not known "tests/test_threadsafety.py" diff --git a/pkgs/development/python-modules/httpretty/default.nix b/pkgs/development/python-modules/httpretty/default.nix index b4a82d04fa1..f0c0b9b2ee9 100644 --- a/pkgs/development/python-modules/httpretty/default.nix +++ b/pkgs/development/python-modules/httpretty/default.nix @@ -19,7 +19,7 @@ buildPythonPackage rec { pname = "httpretty"; - version = "1.0.5"; + version = "1.1.3"; # drop this for version > 0.9.7 # Flaky tests: https://github.com/gabrielfalcao/HTTPretty/pull/394 @@ -27,7 +27,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "e53c927c4d3d781a0761727f1edfad64abef94e828718e12b672a678a8b3e0b5"; + sha256 = "229ade39175ea4324e767f29dc24e5f846fbc72bf80e1a919b2547a6574ff601"; }; propagatedBuildInputs = [ six ]; diff --git a/pkgs/development/python-modules/httptools/default.nix b/pkgs/development/python-modules/httptools/default.nix index ed25195e3f2..54b512be1fd 100644 --- a/pkgs/development/python-modules/httptools/default.nix +++ b/pkgs/development/python-modules/httptools/default.nix @@ -6,12 +6,12 @@ buildPythonPackage rec { pname = "httptools"; - version = "0.1.1"; + version = "0.2.0"; disabled = isPy27; src = fetchPypi { inherit pname version; - sha256 = "41b573cf33f64a8f8f3400d0a7faf48e1888582b6f6e02b82b9bd4f0bf7497ce"; + sha256 = "94505026be56652d7a530ab03d89474dc6021019d6b8682281977163b3471ea0"; }; # tests are not included in pypi tarball diff --git a/pkgs/development/python-modules/humanfriendly/default.nix b/pkgs/development/python-modules/humanfriendly/default.nix index 81ea4286c96..b88fc963379 100644 --- a/pkgs/development/python-modules/humanfriendly/default.nix +++ b/pkgs/development/python-modules/humanfriendly/default.nix @@ -7,11 +7,11 @@ buildPythonPackage rec { pname = "humanfriendly"; - version = "9.1"; + version = "9.2"; src = fetchPypi { inherit pname version; - sha256 = "sha256-BmVilWY5qyH/JnbR/aC1mH6YXFNPx2cAoZvVS8uBEh0="; + sha256 = "f7dba53ac7935fd0b4a2fc9a29e316ddd9ea135fb3052d3d0279d10c18ff9c48"; }; propagatedBuildInputs = lib.optional (pythonOlder "3.3") monotonic; diff --git a/pkgs/development/python-modules/humanize/default.nix b/pkgs/development/python-modules/humanize/default.nix index 5184f83881f..4c5bd0e3af2 100644 --- a/pkgs/development/python-modules/humanize/default.nix +++ b/pkgs/development/python-modules/humanize/default.nix @@ -9,13 +9,13 @@ }: buildPythonPackage rec { - version = "3.3.0"; + version = "3.9.0"; pname = "humanize"; disabled = isPy27; # setup.py no longer compatible src = fetchPypi { inherit pname version; - sha256 = "8bf7abd672b867f38b8b04593829b85b9b6199a61ef6586bf3629cc06458ff35"; + sha256 = "892a5b7b87763c4c6997a58382c2b1f4614048a2e01c23ef1bb0456e6f9d4d5d"; }; nativeBuildInputs = [ setuptools-scm ]; diff --git a/pkgs/development/python-modules/hvplot/default.nix b/pkgs/development/python-modules/hvplot/default.nix index c5fb601ea42..e0d2500bd56 100644 --- a/pkgs/development/python-modules/hvplot/default.nix +++ b/pkgs/development/python-modules/hvplot/default.nix @@ -18,11 +18,11 @@ buildPythonPackage rec { pname = "hvplot"; - version = "0.7.1"; + version = "0.7.2"; src = fetchPypi { inherit pname version; - sha256 = "cdb61183d3cdb1296c7f63c6aab59ee72b7b79b9ddc18abce2ebd3214e8de9db"; + sha256 = "f0dcfcb5e46ae3c29a646c341435986e332ef38af1057bf7b76abadff0bbaca4"; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/hyperframe/default.nix b/pkgs/development/python-modules/hyperframe/default.nix index 6cdee9948b9..d10ecc6c075 100644 --- a/pkgs/development/python-modules/hyperframe/default.nix +++ b/pkgs/development/python-modules/hyperframe/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "hyperframe"; - version = "6.0.0"; + version = "6.0.1"; src = fetchPypi { inherit pname version; - sha256 = "742d2a4bc3152a340a49d59f32e33ec420aa8e7054c1444ef5c7efff255842f1"; + sha256 = "ae510046231dc8e9ecb1a6586f63d2347bf4c8905914aa84ba585ae85f28a914"; }; checkInputs = [ pytestCheckHook ]; diff --git a/pkgs/development/python-modules/hypothesis/default.nix b/pkgs/development/python-modules/hypothesis/default.nix index e956cb9cc46..35f53864eb9 100644 --- a/pkgs/development/python-modules/hypothesis/default.nix +++ b/pkgs/development/python-modules/hypothesis/default.nix @@ -18,14 +18,14 @@ buildPythonPackage rec { # If you need these, you can just add them to your environment. pname = "hypothesis"; - version = "5.49.0"; + version = "6.14.0"; # Use github tarballs that includes tests src = fetchFromGitHub { owner = "HypothesisWorks"; repo = "hypothesis-python"; rev = "hypothesis-python-${version}"; - sha256 = "1lr9a93vdx70s9i1zazazif5hy8fbqhvwqq402ygpf53yw4lgi2w"; + sha256 = "0yns81j3fnpdfaphk722xcnidqhgy0kmd7ik6aw7l795l0wivhxj"; }; postUnpack = "sourceRoot=$sourceRoot/hypothesis-python"; diff --git a/pkgs/development/python-modules/ibm-cloud-sdk-core/default.nix b/pkgs/development/python-modules/ibm-cloud-sdk-core/default.nix index 828f51ae28f..973b792f5bc 100644 --- a/pkgs/development/python-modules/ibm-cloud-sdk-core/default.nix +++ b/pkgs/development/python-modules/ibm-cloud-sdk-core/default.nix @@ -14,11 +14,11 @@ buildPythonPackage rec { pname = "ibm-cloud-sdk-core"; - version = "3.9.0"; + version = "3.10.0"; src = fetchPypi { inherit pname version; - sha256 = "1gwx0z6yqlym9af6wnzq5alcrx8pfsywxn18a0yxhm1j00rkyh2i"; + sha256 = "ab9520be99066ec41a24e31ac653c28953adc8fc349f0fa53a598e1802a79cd6"; }; checkInputs = [ diff --git a/pkgs/development/python-modules/ibm-watson/default.nix b/pkgs/development/python-modules/ibm-watson/default.nix index 1c59878b478..7684f1a689c 100644 --- a/pkgs/development/python-modules/ibm-watson/default.nix +++ b/pkgs/development/python-modules/ibm-watson/default.nix @@ -14,13 +14,13 @@ buildPythonPackage rec { pname = "ibm-watson"; - version = "5.1.0"; + version = "5.2.0"; src = fetchFromGitHub { owner = "watson-developer-cloud"; repo = "python-sdk"; rev = "v${version}"; - sha256 = "sha256:16llw7kybwndgf2ryrg5698v4j3rhrdx52lf3kdzhxdi0q3kmwdn"; + sha256 = "1abink5mv9nw506nwm9hlvnr1lq6dkxxj2j12iwphcyd7xs63n2s"; }; checkInputs = [ diff --git a/pkgs/development/python-modules/idna/default.nix b/pkgs/development/python-modules/idna/default.nix index 9bb639f95d5..cb8636f135a 100644 --- a/pkgs/development/python-modules/idna/default.nix +++ b/pkgs/development/python-modules/idna/default.nix @@ -6,11 +6,11 @@ buildPythonPackage rec { pname = "idna"; - version = "3.1"; + version = "3.2"; src = fetchPypi { inherit pname version; - sha256 = "c5b02147e01ea9920e6b0a3f1f7bb833612d507592c837a6c49552768f4054e1"; + sha256 = "467fbad99067910785144ce333826c71fb0e63a425657295239737f7ecd125f3"; }; checkInputs = [ pytestCheckHook ]; diff --git a/pkgs/development/python-modules/ignite/default.nix b/pkgs/development/python-modules/ignite/default.nix index f745b735f34..b82fe568e2a 100644 --- a/pkgs/development/python-modules/ignite/default.nix +++ b/pkgs/development/python-modules/ignite/default.nix @@ -14,13 +14,13 @@ buildPythonPackage rec { pname = "ignite"; - version = "0.4.4.post1"; + version = "0.4.5"; src = fetchFromGitHub { owner = "pytorch"; repo = pname; rev = "v${version}"; - sha256 = "1a7vs4dzm5lmyck50ygi3j2d2wd6nxr5x91dpx0rmf97i6lywpyb"; + sha256 = "057v8v5p2picmgiidr9lzjbh7nj54pv95m6lyya3y7dw4vzaamij"; }; checkInputs = [ pytestCheckHook matplotlib mock pytest_xdist ]; diff --git a/pkgs/development/python-modules/imageio-ffmpeg/default.nix b/pkgs/development/python-modules/imageio-ffmpeg/default.nix index bb186d6594c..9d1755d81b9 100644 --- a/pkgs/development/python-modules/imageio-ffmpeg/default.nix +++ b/pkgs/development/python-modules/imageio-ffmpeg/default.nix @@ -9,13 +9,13 @@ buildPythonPackage rec { pname = "imageio-ffmpeg"; - version = "0.4.3"; + version = "0.4.4"; disabled = !isPy3k; src = fetchPypi { inherit pname version; - sha256 = "f826260a3207b872f1a4ba87ec0c8e02c00afba4fd03348a59049bdd8215841e"; + sha256 = "73640a7a54f95e607addd637c766d56be31d975a64ddb97d14df012575ef1a5d"; }; patches = [ diff --git a/pkgs/development/python-modules/iminuit/default.nix b/pkgs/development/python-modules/iminuit/default.nix index 5bfb66fe4c6..42a1d7c4ffd 100644 --- a/pkgs/development/python-modules/iminuit/default.nix +++ b/pkgs/development/python-modules/iminuit/default.nix @@ -2,12 +2,12 @@ buildPythonPackage rec { pname = "iminuit"; - version = "2.4.0"; + version = "2.6.1"; disabled = !isPy3k; src = fetchPypi { inherit pname version; - sha256 = "350c13d33f3ec5884335aea1cc11a17ae49dd8e6b2181c3f1b3c9c27e2e0b228"; + sha256 = "5fb8786bcad53762648ddacb008d18b49704ba5c011ade240004bfc5a628b4f6"; }; nativeBuildInputs = [ cmake ]; diff --git a/pkgs/development/python-modules/impacket/default.nix b/pkgs/development/python-modules/impacket/default.nix index 43fdfb6a9ce..71f932ebe95 100644 --- a/pkgs/development/python-modules/impacket/default.nix +++ b/pkgs/development/python-modules/impacket/default.nix @@ -6,7 +6,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "113isxb9rd2n761nnh3skg3vqa0v5dalz9kbavyczqyv1jjyh6qw"; + sha256 = "1c1be8a50cdbe3cffc566ba64f552b1b28bcc79b7a406b833956b49c56d77184"; }; propagatedBuildInputs = [ flask ldapdomaindump pycryptodomex pyasn1 pyopenssl chardet ]; diff --git a/pkgs/development/python-modules/inform/default.nix b/pkgs/development/python-modules/inform/default.nix index 7646d25ee42..86bad819a6f 100644 --- a/pkgs/development/python-modules/inform/default.nix +++ b/pkgs/development/python-modules/inform/default.nix @@ -9,13 +9,13 @@ buildPythonPackage rec { pname = "inform"; - version = "1.23"; + version = "1.24"; src = fetchFromGitHub { owner = "KenKundert"; repo = "inform"; rev = "v${version}"; - sha256 = "02zlprvidkz51aypss4knhv7dbr0sbpz3caqjzf9am2n1jx2viyy"; + sha256 = "114cyff00j9r7qm2ld4w1a4kklr5gx570vk67p56gpr2553dkmly"; }; nativeBuildInputs = [ pytestrunner ]; diff --git a/pkgs/development/python-modules/inkex/default.nix b/pkgs/development/python-modules/inkex/default.nix new file mode 100644 index 00000000000..c1c5479dfd8 --- /dev/null +++ b/pkgs/development/python-modules/inkex/default.nix @@ -0,0 +1,41 @@ +{ buildPythonPackage +, inkscape +, lxml +, python +}: + +buildPythonPackage { + pname = "inkex"; + inherit (inkscape) version; + + format = "other"; + + propagatedBuildInputs = [ + lxml + ]; + + # We just copy the files. + dontUnpack = true; + dontBuild = true; + + # No tests installed. + doCheck = false; + + installPhase = '' + runHook preInstall + + mkdir -p "$out/${python.sitePackages}" + cp -r "${inkscape}/share/inkscape/extensions/inkex" "$out/${python.sitePackages}" + + runHook postInstall + ''; + + meta = inkscape.meta // { + description = "Inkscape Extensions Library"; + longDescription = '' + This module provides support for inkscape extensions, it includes support for opening svg files and processing them. + + Standalone, it is especially useful for running tests for Inkscape extensions. + ''; + }; +} diff --git a/pkgs/development/python-modules/ipdb/default.nix b/pkgs/development/python-modules/ipdb/default.nix index b34aa13bbcf..363c8a4f576 100644 --- a/pkgs/development/python-modules/ipdb/default.nix +++ b/pkgs/development/python-modules/ipdb/default.nix @@ -9,12 +9,12 @@ buildPythonPackage rec { pname = "ipdb"; - version = "0.13.7"; + version = "0.13.9"; disabled = isPyPy; # setupterm: could not find terminfo database src = fetchPypi { inherit pname version; - sha256 = "178c367a61c1039e44e17c56fcc4a6e7dc11b33561261382d419b6ddb4401810"; + sha256 = "951bd9a64731c444fd907a5ce268543020086a697f6be08f7cc2c9a752a278c5"; }; propagatedBuildInputs = [ ipython toml ]; diff --git a/pkgs/development/python-modules/ipydatawidgets/default.nix b/pkgs/development/python-modules/ipydatawidgets/default.nix index e6e1e605cca..a0efa9b575d 100644 --- a/pkgs/development/python-modules/ipydatawidgets/default.nix +++ b/pkgs/development/python-modules/ipydatawidgets/default.nix @@ -13,13 +13,13 @@ buildPythonPackage rec { pname = "ipydatawidgets"; - version = "4.1.0"; + version = "4.2.0"; disabled = isPy27; src = fetchPypi { inherit pname version; - sha256 = "d9f94828c11e3b40350fb14a02e027f42670a7c372bcb30db18d552dcfab7c01"; + sha256 = "d0e4b58b59b508165e8562b8f5d1dbfcd739855847ec0477bd9185a5e9b7c5bc"; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/ipykernel/default.nix b/pkgs/development/python-modules/ipykernel/default.nix index 98944d2543c..0d44c406349 100644 --- a/pkgs/development/python-modules/ipykernel/default.nix +++ b/pkgs/development/python-modules/ipykernel/default.nix @@ -14,11 +14,11 @@ buildPythonPackage rec { pname = "ipykernel"; - version = "5.5.0"; + version = "5.5.5"; src = fetchPypi { inherit pname version; - sha256 = "98321abefdf0505fb3dc7601f60fc4087364d394bd8fad53107eb1adee9ff475"; + sha256 = "e976751336b51082a89fc2099fb7f96ef20f535837c398df6eab1283c2070884"; }; propagatedBuildInputs = [ ipython jupyter_client traitlets tornado ]; diff --git a/pkgs/development/python-modules/ipython/default.nix b/pkgs/development/python-modules/ipython/default.nix index d9447e91385..cd68bb62a12 100644 --- a/pkgs/development/python-modules/ipython/default.nix +++ b/pkgs/development/python-modules/ipython/default.nix @@ -11,6 +11,7 @@ # Runtime dependencies , jedi , decorator +, matplotlib-inline , pickleshare , traitlets , prompt_toolkit @@ -22,12 +23,12 @@ buildPythonPackage rec { pname = "ipython"; - version = "7.21.0"; + version = "7.24.1"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - sha256 = "04323f72d5b85b606330b6d7e2dc8d2683ad46c3905e955aa96ecc7a99388e70"; + sha256 = "9bc24a99f5d19721fb8a2d1408908e9c0520a17fff2233ffe82620847f17f1b6"; }; prePatch = lib.optionalString stdenv.isDarwin '' @@ -41,6 +42,7 @@ buildPythonPackage rec { propagatedBuildInputs = [ jedi decorator + matplotlib-inline pickleshare traitlets prompt_toolkit diff --git a/pkgs/development/python-modules/ipyvuetify/default.nix b/pkgs/development/python-modules/ipyvuetify/default.nix index b581c49d43f..280ba747df7 100644 --- a/pkgs/development/python-modules/ipyvuetify/default.nix +++ b/pkgs/development/python-modules/ipyvuetify/default.nix @@ -7,12 +7,12 @@ buildPythonPackage rec { pname = "ipyvuetify"; - version = "1.6.2"; + version = "1.7.0"; # GitHub version tries to run npm (Node JS) src = fetchPypi { inherit pname version; - sha256 = "056776d359b55343442f707cb4ccd5607800599a36bee06e1f01ef0277f03ddc"; + sha256 = "ea951e3819fcfe8a2ba0a0fe8a51f07b01dca7986eaf57f1840b3c71848cc7c3"; }; propagatedBuildInputs = [ ipyvue ]; diff --git a/pkgs/development/python-modules/iterm2/default.nix b/pkgs/development/python-modules/iterm2/default.nix index da44563208e..3b98f25c566 100644 --- a/pkgs/development/python-modules/iterm2/default.nix +++ b/pkgs/development/python-modules/iterm2/default.nix @@ -5,11 +5,11 @@ buildPythonPackage rec { pname = "iterm2"; - version = "1.19"; + version = "1.21"; src = fetchPypi { inherit pname version; - sha256 = "04fad95b2258135814677317529654ab0de92b0a4576e4410689181a6a535805"; + sha256 = "06be59e0314a2f0f32753eb2d44eb563e85253875bc8da64df5b4eeba7fc05bd"; }; propagatedBuildInputs = [ protobuf websockets ]; diff --git a/pkgs/development/python-modules/itsdangerous/1.nix b/pkgs/development/python-modules/itsdangerous/1.nix new file mode 100644 index 00000000000..d1669a1ed5b --- /dev/null +++ b/pkgs/development/python-modules/itsdangerous/1.nix @@ -0,0 +1,21 @@ +{ lib +, buildPythonPackage +, fetchPypi +}: + +buildPythonPackage rec { + pname = "itsdangerous"; + version = "1.1.0"; + + src = fetchPypi { + inherit pname version; + sha256 = "321b033d07f2a4136d3ec762eac9f16a10ccd60f53c0c91af90217ace7ba1f19"; + }; + + meta = with lib; { + description = "Helpers to pass trusted data to untrusted environments and back"; + homepage = "https://pypi.python.org/pypi/itsdangerous/"; + license = licenses.bsd0; + }; + +} diff --git a/pkgs/development/python-modules/itsdangerous/default.nix b/pkgs/development/python-modules/itsdangerous/default.nix index d1669a1ed5b..35cdf8836a8 100644 --- a/pkgs/development/python-modules/itsdangerous/default.nix +++ b/pkgs/development/python-modules/itsdangerous/default.nix @@ -1,21 +1,30 @@ { lib , buildPythonPackage +, pythonOlder , fetchPypi +, freezegun +, pytestCheckHook }: buildPythonPackage rec { pname = "itsdangerous"; - version = "1.1.0"; + version = "2.0.1"; + disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - sha256 = "321b033d07f2a4136d3ec762eac9f16a10ccd60f53c0c91af90217ace7ba1f19"; + sha256 = "1w6gfb2zhbcmrfj6digwzw1z68w6zg1q87rm6la2m412zil4swly"; }; + checkInputs = [ + freezegun + pytestCheckHook + ]; + meta = with lib; { - description = "Helpers to pass trusted data to untrusted environments and back"; - homepage = "https://pypi.python.org/pypi/itsdangerous/"; - license = licenses.bsd0; + description = "Safely pass data to untrusted environments and back"; + homepage = "https://itsdangerous.palletsprojects.com"; + license = licenses.bsd3; }; } diff --git a/pkgs/development/python-modules/jaraco_collections/default.nix b/pkgs/development/python-modules/jaraco_collections/default.nix index 17bb30e1352..060d4593811 100644 --- a/pkgs/development/python-modules/jaraco_collections/default.nix +++ b/pkgs/development/python-modules/jaraco_collections/default.nix @@ -4,10 +4,10 @@ buildPythonPackage rec { pname = "jaraco.collections"; - version = "3.2.0"; + version = "3.3.0"; src = fetchPypi { inherit pname version; - sha256 = "6d179770493c4f5802395ae5a29e07c66d826dc3cd680ad0b0f0fb9fd6cdf533"; + sha256 = "3662267424b55f10bf15b6f5dee6a6e48a2865c0ec50cc7a16040c81c55a98dc"; }; pythonNamespaces = [ "jaraco" ]; diff --git a/pkgs/development/python-modules/jaraco_functools/default.nix b/pkgs/development/python-modules/jaraco_functools/default.nix index 534b18764f3..1fca58ebf73 100644 --- a/pkgs/development/python-modules/jaraco_functools/default.nix +++ b/pkgs/development/python-modules/jaraco_functools/default.nix @@ -4,11 +4,11 @@ buildPythonPackage rec { pname = "jaraco.functools"; - version = "3.2.1"; + version = "3.3.0"; src = fetchPypi { inherit pname version; - sha256 = "97cf88b46ab544c266e2d81fa17bb183622268722a7dd1a3711ea426e9c26f94"; + sha256 = "bfcf7da71e2a0e980189b0744b59dba6c1dcf66dcd7a30f8a4413e478046b314"; }; nativeBuildInputs = [ setuptools-scm toml ]; diff --git a/pkgs/development/python-modules/javaobj-py3/default.nix b/pkgs/development/python-modules/javaobj-py3/default.nix index 421b63a6640..ecdc0b82a74 100644 --- a/pkgs/development/python-modules/javaobj-py3/default.nix +++ b/pkgs/development/python-modules/javaobj-py3/default.nix @@ -7,12 +7,12 @@ buildPythonPackage rec { pname = "javaobj-py3"; - version = "0.4.2"; + version = "0.4.3"; disabled = isPy27; src = fetchPypi { inherit pname version; - sha256 = "sha256-7Tsf/P058WVynLU1h8ygKrC/pMMyyDepLV/+au9cgBA="; + sha256 = "38f74db3a57e9998a9774e3614afb95cb396f139f29b3fdb130c5af554435259"; }; propagatedBuildInputs = [ numpy ]; diff --git a/pkgs/development/python-modules/jc/default.nix b/pkgs/development/python-modules/jc/default.nix index 61c9e85ced2..10f09d912e7 100644 --- a/pkgs/development/python-modules/jc/default.nix +++ b/pkgs/development/python-modules/jc/default.nix @@ -10,14 +10,14 @@ buildPythonPackage rec { pname = "jc"; - version = "1.14.4"; + version = "1.15.4"; disabled = isPy27; src = fetchFromGitHub { owner = "kellyjonbrazil"; repo = "jc"; rev = "v${version}"; - sha256 = "sha256-RJiJByORpdMWZkA7q7A+WoV4S/UcOP/VZ5TVxFMLYSg="; + sha256 = "1y3807i9rlif78qp1vq9n5hpzmc60i9h5ycw70gvf8mgzxxrl8jx"; }; propagatedBuildInputs = [ ruamel_yaml xmltodict pygments ]; diff --git a/pkgs/development/python-modules/jinja2/2.nix b/pkgs/development/python-modules/jinja2/2.nix new file mode 100644 index 00000000000..dce93d33ab5 --- /dev/null +++ b/pkgs/development/python-modules/jinja2/2.nix @@ -0,0 +1,41 @@ +{ lib, stdenv +, buildPythonPackage +, isPy3k +, fetchPypi +, pytest +, markupsafe +, setuptools +}: + +buildPythonPackage rec { + pname = "Jinja2"; + version = "2.11.3"; + + src = fetchPypi { + inherit pname version; + sha256 = "a6d58433de0ae800347cab1fa3043cebbabe8baa9d29e668f1c768cb87a333c6"; + }; + + checkInputs = [ pytest ]; + propagatedBuildInputs = [ markupsafe setuptools ]; + + # Multiple tests run out of stack space on 32bit systems with python2. + # See https://github.com/pallets/jinja/issues/1158 + doCheck = !stdenv.is32bit || isPy3k; + + checkPhase = '' + pytest -v tests + ''; + + meta = with lib; { + homepage = "http://jinja.pocoo.org/"; + description = "Stand-alone template engine"; + license = licenses.bsd3; + longDescription = '' + Jinja2 is a template engine written in pure Python. It provides a + Django inspired non-XML syntax but supports inline expressions and + an optional sandboxed environment. + ''; + maintainers = with maintainers; [ pierron sjourdois ]; + }; +} diff --git a/pkgs/development/python-modules/jinja2/default.nix b/pkgs/development/python-modules/jinja2/default.nix index dce93d33ab5..d54372379b8 100644 --- a/pkgs/development/python-modules/jinja2/default.nix +++ b/pkgs/development/python-modules/jinja2/default.nix @@ -1,39 +1,44 @@ -{ lib, stdenv +{ lib +, stdenv , buildPythonPackage -, isPy3k +, pythonOlder , fetchPypi -, pytest +, Babel , markupsafe -, setuptools +, pytestCheckHook }: buildPythonPackage rec { pname = "Jinja2"; - version = "2.11.3"; + version = "3.0.1"; + disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - sha256 = "a6d58433de0ae800347cab1fa3043cebbabe8baa9d29e668f1c768cb87a333c6"; + sha256 = "197ms1wimxql650245v63wkv04n8bicj549wfhp51bx68x5lhgvh"; }; - checkInputs = [ pytest ]; - propagatedBuildInputs = [ markupsafe setuptools ]; + propagatedBuildInputs = [ + Babel + markupsafe + ]; # Multiple tests run out of stack space on 32bit systems with python2. # See https://github.com/pallets/jinja/issues/1158 - doCheck = !stdenv.is32bit || isPy3k; + doCheck = !stdenv.is32bit; - checkPhase = '' - pytest -v tests - ''; + checkInputs = [ + pytestCheckHook + ]; meta = with lib; { homepage = "http://jinja.pocoo.org/"; description = "Stand-alone template engine"; license = licenses.bsd3; longDescription = '' - Jinja2 is a template engine written in pure Python. It provides a - Django inspired non-XML syntax but supports inline expressions and + Jinja is a fast, expressive, extensible templating engine. Special + placeholders in the template allow writing code similar to Python + syntax. Then the template is passed data to render the final document. an optional sandboxed environment. ''; maintainers = with maintainers; [ pierron sjourdois ]; diff --git a/pkgs/development/python-modules/jsbeautifier/default.nix b/pkgs/development/python-modules/jsbeautifier/default.nix index 09eb45f964c..a0818e1e571 100644 --- a/pkgs/development/python-modules/jsbeautifier/default.nix +++ b/pkgs/development/python-modules/jsbeautifier/default.nix @@ -2,14 +2,14 @@ buildPythonApplication rec { pname = "jsbeautifier"; - version = "1.13.5"; + version = "1.14.0"; propagatedBuildInputs = [ six editorconfig ]; checkInputs = [ pytest ]; src = fetchPypi { inherit pname version; - sha256 = "4532a6bc85ba91ffc542b55d65cd13cedc971a934f26f51ed56d4c680b3fbe66"; + sha256 = "84fdb008d8af89619269a6aca702288b48f837a99427a0f529aa57ecfb36ee3c"; }; meta = with lib; { diff --git a/pkgs/development/python-modules/jsondiff/default.nix b/pkgs/development/python-modules/jsondiff/default.nix index 2a622d913a8..0b6f0120981 100644 --- a/pkgs/development/python-modules/jsondiff/default.nix +++ b/pkgs/development/python-modules/jsondiff/default.nix @@ -5,11 +5,11 @@ buildPythonPackage rec { pname = "jsondiff"; - version = "1.2.0"; + version = "1.3.0"; src = fetchPypi { inherit pname version; - sha256 = "00v3689175aqzdscrxpffm712ylp8jvcpqdg51ca22ni6721p51l"; + sha256 = "5122bf4708a031b02db029366184a87c5d0ddd5a327a5884ee6cf0193e599d71"; }; postPatch = '' diff --git a/pkgs/development/python-modules/jsonrpc-base/default.nix b/pkgs/development/python-modules/jsonrpc-base/default.nix index 008b181b9ef..62fbf0130cb 100644 --- a/pkgs/development/python-modules/jsonrpc-base/default.nix +++ b/pkgs/development/python-modules/jsonrpc-base/default.nix @@ -1,21 +1,23 @@ { lib , buildPythonPackage , fetchFromGitHub +, pytest-asyncio , pytestCheckHook }: buildPythonPackage rec { pname = "jsonrpc-base"; - version = "2.0.0"; + version = "2.1.0"; src = fetchFromGitHub { owner = "emlove"; repo = pname; rev = version; - sha256 = "0xxhn0vb7mr8k1w9xbqhhyx9qkgkc318qkyflgfbvjc926n50680"; + sha256 = "1cd83m831ngck2v8m08pb2g29z4vr9iggi73l7h506v6clkb4n3y"; }; checkInputs = [ + pytest-asyncio pytestCheckHook ]; diff --git a/pkgs/development/python-modules/jsonrpc-websocket/default.nix b/pkgs/development/python-modules/jsonrpc-websocket/default.nix index faecca760d3..530c08dbaa0 100644 --- a/pkgs/development/python-modules/jsonrpc-websocket/default.nix +++ b/pkgs/development/python-modules/jsonrpc-websocket/default.nix @@ -9,11 +9,11 @@ buildPythonPackage rec { pname = "jsonrpc-websocket"; - version = "3.0.0"; + version = "3.1.0"; src = fetchPypi { inherit pname version; - sha256 = "0fmw8xjzlhi7r84swn4w3njy389qqll5ad5ljdq5n2wpg424k98h"; + sha256 = "eeaaac2330f6f1cdafd378ddf5287a47a7c8609ab212a2f576121c1e61c7a344"; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/jsonrpclib/default.nix b/pkgs/development/python-modules/jsonrpclib/default.nix index d37b4ce3ccb..b1b4648e903 100644 --- a/pkgs/development/python-modules/jsonrpclib/default.nix +++ b/pkgs/development/python-modules/jsonrpclib/default.nix @@ -7,13 +7,13 @@ buildPythonPackage rec { pname = "jsonrpclib"; - version = "0.1.7"; + version = "0.2.1"; disabled = isPy3k; src = fetchPypi { inherit pname version; - sha256 = "02vgirw2bcgvpcxhv5hf3yvvb4h5wzd1lpjx8na5psdmaffj6l3z"; + sha256 = "8138078fd0f2a5b1df7925e4fa0b82a7c17a4be75bf5634af20463172f44f5c0"; }; propagatedBuildInputs = [ cjson ]; diff --git a/pkgs/development/python-modules/junos-eznc/default.nix b/pkgs/development/python-modules/junos-eznc/default.nix index 60ec37dbde9..c98f20be523 100644 --- a/pkgs/development/python-modules/junos-eznc/default.nix +++ b/pkgs/development/python-modules/junos-eznc/default.nix @@ -18,13 +18,18 @@ buildPythonPackage rec { pname = "junos-eznc"; - version = "2.5.4"; + version = "2.6.1"; src = fetchPypi { inherit pname version; - sha256 = "bf036d0af9ee5c5e4f517cb5fc902fe891fa120e18f459805862c53d4a97193a"; + sha256 = "2f5de7dedaac8dd71bfea23c6a7d883e29947c91de1ba299a9242e0a4406ee46"; }; + postPatch = '' + substituteInPlace requirements.txt \ + --replace "ncclient==0.6.9" "ncclient" + ''; + checkInputs = [ nose ]; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/jupyter-packaging/default.nix b/pkgs/development/python-modules/jupyter-packaging/default.nix index da45616dfad..f6ea3fc610f 100644 --- a/pkgs/development/python-modules/jupyter-packaging/default.nix +++ b/pkgs/development/python-modules/jupyter-packaging/default.nix @@ -10,13 +10,13 @@ buildPythonPackage rec { pname = "jupyter-packaging"; - version = "0.8.2"; + version = "0.10.2"; disabled = pythonOlder "3.7"; src = fetchPypi { pname = "jupyter_packaging"; inherit version; - sha256 = "sha256-ddzJDcFyY5Iida4QvpACh0FRBIy95IQHCEF5HQl5QbI="; + sha256 = "sha256-iEX0ht1IwWYM+tGOUJHRwDVA6y6fvzzs8h7LIrabh3A="; }; propagatedBuildInputs = [ deprecation packaging tomlkit ]; diff --git a/pkgs/development/python-modules/jupyter_server/default.nix b/pkgs/development/python-modules/jupyter_server/default.nix index f90c521b553..a8ae35e2bdd 100644 --- a/pkgs/development/python-modules/jupyter_server/default.nix +++ b/pkgs/development/python-modules/jupyter_server/default.nix @@ -19,24 +19,20 @@ , terminado , prometheus_client , anyio +, websocket-client , requests }: buildPythonPackage rec { pname = "jupyter_server"; - version = "1.5.0"; + version = "1.8.0"; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - sha256 = "ff127713a57ab7aa7b23f7df9b082951cc4b05d8d64cc0949d01ea02ac24c70c"; + sha256 = "8f0c75e0a577536125ad62a442ebb7cf02746f1a69d907e8a273c6225d281237"; }; - postPatch = '' - substituteInPlace setup.py \ - --replace "anyio>=2.0.2" "anyio" - ''; - propagatedBuildInputs = [ argon2_cffi jinja2 @@ -52,6 +48,7 @@ buildPythonPackage rec { terminado prometheus_client anyio + websocket-client ]; checkInputs = [ @@ -80,7 +77,7 @@ buildPythonPackage rec { __darwinAllowLocalNetworking = true; meta = with lib; { - description = "The backend—i.e. core services, APIs, and REST endpoints—to Jupyter web applications."; + description = "The backend—i.e. core services, APIs, and REST endpoints—to Jupyter web applications"; homepage = "https://github.com/jupyter-server/jupyter_server"; license = licenses.bsdOriginal; maintainers = [ maintainers.elohmeier ]; diff --git a/pkgs/development/python-modules/jupyterlab-git/default.nix b/pkgs/development/python-modules/jupyterlab-git/default.nix index 3219bd5730b..67769e24b32 100644 --- a/pkgs/development/python-modules/jupyterlab-git/default.nix +++ b/pkgs/development/python-modules/jupyterlab-git/default.nix @@ -10,12 +10,12 @@ buildPythonPackage rec { pname = "jupyterlab_git"; - version = "0.23.3"; + version = "0.30.1"; disabled = pythonOlder "3.5"; src = fetchPypi { inherit pname version; - sha256 = "20a4954d8d1b1eb6f9111cd15d6a598bd7ff72b08797cf5e86c5a55827c85a1d"; + sha256 = "f44a33cf59b424e0b5ff984b18eae33e45dab1ef9dc1901b1dd23f9adff15df2"; }; propagatedBuildInputs = [ notebook nbdime git ]; diff --git a/pkgs/development/python-modules/jupyterlab/default.nix b/pkgs/development/python-modules/jupyterlab/default.nix index ba2c0ed4883..95ef2138859 100644 --- a/pkgs/development/python-modules/jupyterlab/default.nix +++ b/pkgs/development/python-modules/jupyterlab/default.nix @@ -10,12 +10,12 @@ buildPythonPackage rec { pname = "jupyterlab"; - version = "3.0.14"; + version = "3.0.16"; disabled = pythonOlder "3.5"; src = fetchPypi { inherit pname version; - sha256 = "sha256-cTqEmR38yowLwmCRHxvVSsJaOGqGKFcTuVVaYPeVBZs="; + sha256 = "7ad4fbe1f6d38255869410fd151a8b15692a663ca97c0a8146b3f5c40e275c23"; }; nativeBuildInputs = [ jupyter-packaging ]; diff --git a/pkgs/development/python-modules/jupyterlab_server/default.nix b/pkgs/development/python-modules/jupyterlab_server/default.nix index d5d1318ed63..7f1a729b5b1 100644 --- a/pkgs/development/python-modules/jupyterlab_server/default.nix +++ b/pkgs/development/python-modules/jupyterlab_server/default.nix @@ -8,37 +8,51 @@ , pyjson5 , Babel , jupyter_server +, openapi-core , pytest-tornasync , pytestcov +, ruamel-yaml , strict-rfc3339 }: buildPythonPackage rec { pname = "jupyterlab_server"; - version = "2.3.0"; - disabled = pythonOlder "3.5"; + version = "2.6.0"; + disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - sha256 = "sha256-56AkWqPeI6GAPeLv9AHkykWUU42fWYBhNPMEGabYtqM="; + sha256 = "f300adf6bb0a952bebe9c807a3b2a345d62da39b476b4f69ea0dc6b5f3f6b97d"; }; + postPatch = '' + sed -i "/^addopts/d" pyproject.toml + ''; + propagatedBuildInputs = [ requests jsonschema pyjson5 Babel jupyter_server ]; checkInputs = [ + openapi-core pytestCheckHook pytest-tornasync - pytestcov + ruamel-yaml strict-rfc3339 ]; + pytestFlagsArray = [ "--pyargs" "jupyterlab_server" ]; + disabledTests = [ - "test_get_locale" - "test_get_installed_language_pack_locales_passes" - "test_get_installed_package_locales" - "test_get_installed_packages_locale" - "test_get_language_packs" - "test_get_language_pack" + # AttributeError: 'SpecPath' object has no attribute 'paths' + "test_get_listing" + "test_get_settings" + "test_get_federated" + "test_listing" + "test_patch" + "test_patch_unicode" + "test_get_theme" + "test_delete" + "test_get_non_existant" + "test_get" ]; __darwinAllowLocalNetworking = true; diff --git a/pkgs/development/python-modules/jwcrypto/default.nix b/pkgs/development/python-modules/jwcrypto/default.nix index 42ed4cf8794..182cfd0d485 100644 --- a/pkgs/development/python-modules/jwcrypto/default.nix +++ b/pkgs/development/python-modules/jwcrypto/default.nix @@ -2,19 +2,21 @@ , buildPythonPackage , fetchPypi , cryptography +, deprecated }: buildPythonPackage rec { pname = "jwcrypto"; - version = "0.8"; + version = "0.9.1"; src = fetchPypi { inherit pname version; - sha256 = "b7fee2635bbefdf145399392f5be26ad54161c8271c66b5fe107b4b452f06c24"; + sha256 = "63531529218ba9869e14ef8c9e7b516865ede3facf9b0ef3d3ba68014da211f9"; }; propagatedBuildInputs = [ cryptography + deprecated ]; meta = with lib; { diff --git a/pkgs/development/python-modules/kajiki/default.nix b/pkgs/development/python-modules/kajiki/default.nix index 471ee4416b6..3f202bd51f9 100644 --- a/pkgs/development/python-modules/kajiki/default.nix +++ b/pkgs/development/python-modules/kajiki/default.nix @@ -4,20 +4,20 @@ , Babel , pytz , nine -, nose +, pytestCheckHook }: buildPythonPackage rec { - pname = "Kajiki"; - version = "0.8.2"; + pname = "kajiki"; + version = "0.8.3"; src = fetchPypi { inherit pname version; - sha256 = "bbec46b19285d42769d7c4f5a8a0195b72a62b54cd360a26a8875319d58efef6"; + sha256 = "c7a1f033b5cfaafa97bda5a475f58a7abcd76b348494995428fdcf6c8f648ad9"; }; propagatedBuildInputs = [ Babel pytz nine ]; - checkInputs = [ nose ]; + checkInputs = [ pytestCheckHook ]; meta = with lib; { description = "Kajiki provides fast well-formed XML templates"; diff --git a/pkgs/development/python-modules/karton-dashboard/default.nix b/pkgs/development/python-modules/karton-dashboard/default.nix index 3ec455a8ace..c2251a0e236 100644 --- a/pkgs/development/python-modules/karton-dashboard/default.nix +++ b/pkgs/development/python-modules/karton-dashboard/default.nix @@ -27,7 +27,8 @@ buildPythonPackage rec { postPatch = '' substituteInPlace requirements.txt \ - --replace "Flask==1.1.1" "Flask" + --replace "Flask==1.1.1" "Flask" \ + --replace "prometheus_client==0.9.0" "prometheus-client" ''; # Project has no tests. pythonImportsCheck requires MinIO configuration diff --git a/pkgs/development/python-modules/kmapper/default.nix b/pkgs/development/python-modules/kmapper/default.nix index 87f22172c49..630c025e093 100644 --- a/pkgs/development/python-modules/kmapper/default.nix +++ b/pkgs/development/python-modules/kmapper/default.nix @@ -15,13 +15,13 @@ buildPythonPackage rec { pname = "kmapper"; - version = "2.0.0"; + version = "2.0.1"; src = fetchFromGitHub { owner = "scikit-tda"; repo = "kepler-mapper"; rev = "v${version}"; - sha256 = "0djm27si2bn18khrbb7rwhflc5ma6g9smhikhk5i1apwn5avm6l4"; + sha256 = "1jqqrn7ig9kylcc8xbslxmchzghr9jgffaab3g3y3nyghk8azlgj"; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/kombu/default.nix b/pkgs/development/python-modules/kombu/default.nix index a5ca1a7ab2a..3ba2291da79 100644 --- a/pkgs/development/python-modules/kombu/default.nix +++ b/pkgs/development/python-modules/kombu/default.nix @@ -1,40 +1,44 @@ -{ lib, buildPythonPackage, fetchPypi +{ lib +, buildPythonPackage +, pythonOlder +, fetchPypi , amqp -, botocore +, vine +, cached-property +, importlib-metadata +, azure-servicebus , case , Pyro4 -, pytest +, pytestCheckHook , pytz -, sqlalchemy -, importlib-metadata -, pythonOlder }: buildPythonPackage rec { pname = "kombu"; - version = "5.0.2"; + version = "5.1.0"; + + disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - sha256 = "f4965fba0a4718d47d470beeb5d6446e3357a62402b16c510b6a2f251e05ac3c"; + sha256 = "01481d99f4606f6939cdc9b637264ed353ee9e3e4f62cfb582324142c41a572d"; }; - postPatch = '' - substituteInPlace requirements/test.txt \ - --replace "pytest-sugar" "" - ''; - propagatedBuildInputs = [ amqp + vine ] ++ lib.optionals (pythonOlder "3.8") [ + cached-property importlib-metadata ]; - checkInputs = [ botocore pytest case pytz Pyro4 sqlalchemy ]; - # test_redis requires fakeredis, which isn't trivial to package - checkPhase = '' - pytest --ignore t/unit/transport/test_redis.py - ''; + checkInputs = [ + azure-servicebus + case + Pyro4 + pytestCheckHook + pytz + ]; meta = with lib; { description = "Messaging library for Python"; diff --git a/pkgs/development/python-modules/krakenex/default.nix b/pkgs/development/python-modules/krakenex/default.nix new file mode 100644 index 00000000000..bf907eb847d --- /dev/null +++ b/pkgs/development/python-modules/krakenex/default.nix @@ -0,0 +1,33 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, requests +}: + +buildPythonPackage rec { + pname = "krakenex"; + version = "2.1.0"; + + src = fetchFromGitHub { + owner = "veox"; + repo = "python3-krakenex"; + rev = "v${version}"; + sha256 = "0j8qmpk6lm57h80i5njhgvm1qnxllm18dlqxfd4kyxdb93si4z2p"; + }; + + propagatedBuildInputs = [ + requests + ]; + + # no tests implemented + doCheck = false; + + pythonImportsCheck = [ "krakenex" ]; + + meta = with lib; { + description = "Kraken.com cryptocurrency exchange API"; + homepage = "https://github.com/veox/python3-krakenex"; + license = licenses.lgpl3Plus; + maintainers = with maintainers; [ dotlambda ]; + }; +} diff --git a/pkgs/development/python-modules/labelbox/default.nix b/pkgs/development/python-modules/labelbox/default.nix index 957b8ad5fd1..423185b6f22 100644 --- a/pkgs/development/python-modules/labelbox/default.nix +++ b/pkgs/development/python-modules/labelbox/default.nix @@ -19,14 +19,14 @@ buildPythonPackage rec { pname = "labelbox"; - version = "2.5.4"; + version = "2.6.0"; disabled = pythonOlder "3.6"; src = fetchFromGitHub { owner = "Labelbox"; repo = "labelbox-python"; - rev = "v${version}"; - sha256 = "0182klvm8bjcm8fkl9w8ypj12s026czgid8ldl6jjvmzhxpmss68"; + rev = "V${version}"; + sha256 = "1lkvc926i3c7isqhaja6k013qgla44cdhvkx76gpdyywq53i9mcb"; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/libcst/default.nix b/pkgs/development/python-modules/libcst/default.nix index 314bc82cd4f..5a1ef3b7f73 100644 --- a/pkgs/development/python-modules/libcst/default.nix +++ b/pkgs/development/python-modules/libcst/default.nix @@ -15,7 +15,7 @@ buildPythonPackage rec { pname = "libcst"; - version = "0.3.18"; + version = "0.3.19"; disabled = pythonOlder "3.6"; # Some files for tests missing from PyPi @@ -24,7 +24,7 @@ buildPythonPackage rec { owner = "instagram"; repo = pname; rev = "v${version}"; - sha256 = "sha256-19yGaKBLpGASSPv/aSX0kx9lh2JxKExHJDKKtuBbuqI="; + sha256 = "012g1hyaj015k2sf38a7jnpzjic0f8j97ar84d0f00w2ifzwx4ma"; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/librosa/default.nix b/pkgs/development/python-modules/librosa/default.nix index 45f6bffd661..cb8f4c023bc 100644 --- a/pkgs/development/python-modules/librosa/default.nix +++ b/pkgs/development/python-modules/librosa/default.nix @@ -14,11 +14,11 @@ buildPythonPackage rec { pname = "librosa"; - version = "0.8.0"; + version = "0.8.1"; src = fetchPypi { inherit pname version; - sha256 = "af0b9f2ed4bbf6aecbc448a4cd27c16453c397cb6bef0f0cfba0e63afea2b839"; + sha256 = "c53d05e768ae4a3e553ae21c2e5015293e5efbfd5c12d497f1104cb519cca6b3"; }; propagatedBuildInputs = [ joblib matplotlib six scikit-learn decorator audioread resampy soundfile pooch ]; diff --git a/pkgs/development/python-modules/libtmux/default.nix b/pkgs/development/python-modules/libtmux/default.nix index e019951f6ff..5d2a8dd38a7 100644 --- a/pkgs/development/python-modules/libtmux/default.nix +++ b/pkgs/development/python-modules/libtmux/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "libtmux"; - version = "0.8.5"; + version = "0.10.1"; src = fetchPypi { inherit pname version; - sha256 = "1d35b9f8451944d31c5ed22ed9e6c8e18034adcc75718fcc5b27fbd9621543e1"; + sha256 = "c8bc81499616ba899538704e419463a1c83ba7ca21e53b1efc6abbe98eb26b61"; }; checkInputs = [ pytest ]; diff --git a/pkgs/development/python-modules/lightgbm/default.nix b/pkgs/development/python-modules/lightgbm/default.nix index fbe9e04b643..46306feb936 100644 --- a/pkgs/development/python-modules/lightgbm/default.nix +++ b/pkgs/development/python-modules/lightgbm/default.nix @@ -10,11 +10,11 @@ buildPythonPackage rec { pname = "lightgbm"; - version = "3.2.0"; + version = "3.2.1"; src = fetchPypi { inherit pname version; - sha256 = "000c6e0e225834a8a94a84571cf41e4b7c7b97a0db6d286c1237de8ba6066726"; + sha256 = "bd98e3b501b4c24dc127f4ad93e467f42923fe3eefa99e143b5b93158f024395"; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/limnoria/default.nix b/pkgs/development/python-modules/limnoria/default.nix index 6f0532a390a..b8b13fab29c 100644 --- a/pkgs/development/python-modules/limnoria/default.nix +++ b/pkgs/development/python-modules/limnoria/default.nix @@ -7,12 +7,12 @@ buildPythonPackage rec { pname = "limnoria"; - version = "2021.03.13"; + version = "2021.06.15"; disabled = isPy27; # abandoned upstream src = fetchPypi { inherit pname version; - sha256 = "c13dd7a84eddfcf9c3068d57f3c9da90ea7c0d11688dc3f78f9265f3f093c6ea"; + sha256 = "47290281f3f945261a7f8d8c6f207dcb1d277b241f58827d5a76ab8cd453a1d0"; }; patchPhase = '' diff --git a/pkgs/development/python-modules/line_profiler/default.nix b/pkgs/development/python-modules/line_profiler/default.nix index b99e60b8199..aac026cea92 100644 --- a/pkgs/development/python-modules/line_profiler/default.nix +++ b/pkgs/development/python-modules/line_profiler/default.nix @@ -11,11 +11,11 @@ buildPythonPackage rec { pname = "line_profiler"; - version = "3.1.0"; + version = "3.3.0"; src = fetchPypi { inherit pname version; - sha256 = "e73ff429236d59d48ce7028484becfa01449b3d52abdcf7337e0ff2acdc5093c"; + sha256 = "8bd8353e9403b226def4438dbfdb57cafefb24488e49a6039cc63906c0bc8836"; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/lsassy/default.nix b/pkgs/development/python-modules/lsassy/default.nix index ad9d09b3266..19d9141a0d3 100644 --- a/pkgs/development/python-modules/lsassy/default.nix +++ b/pkgs/development/python-modules/lsassy/default.nix @@ -8,13 +8,13 @@ buildPythonPackage rec { pname = "lsassy"; - version = "2.1.3"; + version = "2.1.5"; src = fetchFromGitHub { owner = "Hackndo"; repo = pname; rev = "v${version}"; - sha256 = "1zig34ymc1h18gjc2ji0w0711im5sm9xm6nydc01c13yfpvvj1rh"; + sha256 = "15w12asy797dxsz57avbxy6dbi7va9p5jx6i3gm9df9mbj0j3lcc"; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/maestral/default.nix b/pkgs/development/python-modules/maestral/default.nix index 63425b6c853..86794cba4d1 100644 --- a/pkgs/development/python-modules/maestral/default.nix +++ b/pkgs/development/python-modules/maestral/default.nix @@ -9,14 +9,14 @@ buildPythonPackage rec { pname = "maestral"; - version = "1.4.3"; + version = "1.4.4"; disabled = pythonOlder "3.6"; src = fetchFromGitHub { owner = "SamSchott"; repo = "maestral"; rev = "v${version}"; - sha256 = "sha256-3GleQNkJrGIkFqOL2Dq0jTpgw7ts9ecpovKbyh3OrEI="; + sha256 = "03scg4y13jbi8n454hc4vq8p02isbhppqx0zhbady639p7l3ggfg"; }; propagatedBuildInputs = [ @@ -52,6 +52,6 @@ buildPythonPackage rec { license = licenses.mit; maintainers = with maintainers; [ peterhoeg ]; platforms = platforms.unix; - inherit (src.meta) homepage; + homepage = "https://maestral.app"; }; } diff --git a/pkgs/development/python-modules/mailchimp/default.nix b/pkgs/development/python-modules/mailchimp/default.nix index 91563b7fe7e..787ecb0316f 100644 --- a/pkgs/development/python-modules/mailchimp/default.nix +++ b/pkgs/development/python-modules/mailchimp/default.nix @@ -6,12 +6,12 @@ }: buildPythonPackage rec { - version = "2.0.9"; + version = "2.0.10"; pname = "mailchimp"; src = fetchPypi { inherit pname version; - sha256 = "0351ai0jqv3dzx0xxm1138sa7mb42si6xfygl5ak8wnfc95ff770"; + sha256 = "5227999904233a7d2e9ce5eac5225b9a5fac0318ae5107e3ed09c8bf89286768"; }; buildInputs = [ docopt ]; diff --git a/pkgs/development/python-modules/makefun/default.nix b/pkgs/development/python-modules/makefun/default.nix index 731226fdbfb..12655c0d6de 100644 --- a/pkgs/development/python-modules/makefun/default.nix +++ b/pkgs/development/python-modules/makefun/default.nix @@ -6,11 +6,11 @@ buildPythonPackage rec { pname = "makefun"; - version = "1.11.2"; + version = "1.11.3"; src = fetchPypi { inherit pname version; - sha256 = "sha256-2qNQpILtWLVyREPGUUMhkem5ewyDdDh50JExccaigIU="; + sha256 = "033eed65e2c1804fca84161a38d1fc8bb8650d32a89ac1c5dc7e54b2b2c2e88c"; }; nativeBuildInputs = [ setuptools-scm ]; diff --git a/pkgs/development/python-modules/manhole/default.nix b/pkgs/development/python-modules/manhole/default.nix index 2019d7e3180..34be99bc8df 100644 --- a/pkgs/development/python-modules/manhole/default.nix +++ b/pkgs/development/python-modules/manhole/default.nix @@ -8,11 +8,11 @@ buildPythonPackage rec { pname = "manhole"; - version = "1.7.0"; + version = "1.8.0"; src = fetchPypi { inherit pname version; - sha256 = "224985bf1dd032f2dc0ca4107f727835b6f50e1df6d78781d6c9f4cae8b585e2"; + sha256 = "bada20a25b547b395d472e2e08928f0437df26bbdbda4797c55863198e29a21f"; }; # test_help expects architecture-dependent Linux signal numbers. diff --git a/pkgs/development/python-modules/marisa-trie/default.nix b/pkgs/development/python-modules/marisa-trie/default.nix index e646ee71ec4..69f272c409d 100644 --- a/pkgs/development/python-modules/marisa-trie/default.nix +++ b/pkgs/development/python-modules/marisa-trie/default.nix @@ -3,7 +3,7 @@ , fetchPypi , cython , pytestrunner -, pytest +, pytestCheckHook , hypothesis }: @@ -21,13 +21,26 @@ buildPythonPackage rec { --replace "hypothesis==" "hypothesis>=" ''; - nativeBuildInputs = [ cython pytestrunner ]; + nativeBuildInputs = [ + cython + pytestrunner + ]; preBuild = '' ./update_cpp.sh ''; - checkInputs = [ pytest hypothesis ]; + checkInputs = [ + pytestCheckHook + hypothesis + ]; + + disabledTests = [ + # Pins hypothesis==2.0.0 from 2016/01 which complains about + # hypothesis.errors.FailedHealthCheck: tests/test_trie.py::[...] uses the 'tmpdir' fixture, which is reset between function calls but not between test cases generated by `@given(...)`. + "test_saveload" + "test_mmap" + ]; meta = with lib; { description = "Static memory-efficient Trie-like structures for Python (2.x and 3.x) based on marisa-trie C++ library"; diff --git a/pkgs/development/python-modules/markdown-it-py/default.nix b/pkgs/development/python-modules/markdown-it-py/default.nix index 322c4ac533d..dc8866350b1 100644 --- a/pkgs/development/python-modules/markdown-it-py/default.nix +++ b/pkgs/development/python-modules/markdown-it-py/default.nix @@ -1,4 +1,9 @@ -{ lib, buildPythonPackage, fetchFromGitHub, pytestCheckHook, pythonOlder +{ lib +, buildPythonPackage +, fetchFromGitHub +, fetchpatch +, pytestCheckHook +, pythonOlder , attrs , linkify-it-py , psutil @@ -21,6 +26,15 @@ buildPythonPackage rec { hash = "sha256-GA7P2I8N+i2ISsVgx58zyhrfKMcZ7pL4X9T/trbsr1Y="; }; + patches = [ + (fetchpatch { + # :arrow_up: UPGRADE: attrs -> v21 (#165) + # https://github.com/executablebooks/markdown-it-py/pull/165 + url = "https://github.com/executablebooks/markdown-it-py/commit/78381ffe1a651741594dc93e693b761422512fa2.patch"; + sha256 = "1kxhblpi4sycrs3rv50achr8g0wlgq33abg2acra26l736hlsya1"; + }) + ]; + propagatedBuildInputs = [ attrs linkify-it-py ] ++ lib.optional (pythonOlder "3.8") typing-extensions; diff --git a/pkgs/development/python-modules/markdown/default.nix b/pkgs/development/python-modules/markdown/default.nix index c0175a2e888..c1eff88b926 100644 --- a/pkgs/development/python-modules/markdown/default.nix +++ b/pkgs/development/python-modules/markdown/default.nix @@ -1,36 +1,37 @@ { lib , buildPythonPackage -, fetchPypi -, setuptools -, nose -, pyyaml , pythonOlder +, fetchPypi , importlib-metadata -, isPy3k +, pyyaml +, python }: buildPythonPackage rec { pname = "Markdown"; version = "3.3.4"; + disabled = pythonOlder "3.6"; + src = fetchPypi { inherit pname version; sha256 = "31b5b491868dcc87d6c24b7e3d19a0d730d59d3e46f4eea6430a321bed387a49"; }; - propagatedBuildInputs = [ - setuptools - ] ++ lib.optionals (pythonOlder "3.8") [ + propagatedBuildInputs = lib.optionals (pythonOlder "3.8") [ importlib-metadata ]; - disabled = !isPy3k; + checkInputs = [ pyyaml ]; - checkInputs = [ nose pyyaml ]; + checkPhase = '' + ${python.interpreter} -m unittest discover + ''; - meta = { + meta = with lib; { description = "A Python implementation of John Gruber's Markdown with Extension support"; homepage = "https://github.com/Python-Markdown/markdown"; - license = lib.licenses.bsd3; + license = licenses.bsd3; + maintainers = with maintainers; [ dotlambda ]; }; } diff --git a/pkgs/development/python-modules/markupsafe/1.nix b/pkgs/development/python-modules/markupsafe/1.nix new file mode 100644 index 00000000000..ae0878c7a97 --- /dev/null +++ b/pkgs/development/python-modules/markupsafe/1.nix @@ -0,0 +1,22 @@ +{ lib +, buildPythonPackage +, fetchPypi +}: + +buildPythonPackage rec { + pname = "MarkupSafe"; + version = "1.1.1"; + + src = fetchPypi { + inherit pname version; + sha256 = "29872e92839765e546828bb7754a68c418d927cd064fd4708fab9fe9c8bb116b"; + }; + + meta = with lib; { + description = "Implements a XML/HTML/XHTML Markup safe string"; + homepage = "http://dev.pocoo.org"; + license = licenses.bsd3; + maintainers = with maintainers; [ domenkozar ]; + }; + +} diff --git a/pkgs/development/python-modules/markupsafe/default.nix b/pkgs/development/python-modules/markupsafe/default.nix index ae0878c7a97..d48359af0fc 100644 --- a/pkgs/development/python-modules/markupsafe/default.nix +++ b/pkgs/development/python-modules/markupsafe/default.nix @@ -1,17 +1,24 @@ { lib , buildPythonPackage +, pythonOlder , fetchPypi +, pytestCheckHook }: buildPythonPackage rec { pname = "MarkupSafe"; - version = "1.1.1"; + version = "2.0.1"; + disabled = pythonOlder "3.6"; - src = fetchPypi { + src = fetchPypi { inherit pname version; - sha256 = "29872e92839765e546828bb7754a68c418d927cd064fd4708fab9fe9c8bb116b"; + sha256 = "02k2ynmqvvd0z0gakkf8s4idyb606r7zgga41jrkhqmigy06fk2r"; }; + checkInputs = [ + pytestCheckHook + ]; + meta = with lib; { description = "Implements a XML/HTML/XHTML Markup safe string"; homepage = "http://dev.pocoo.org"; diff --git a/pkgs/development/python-modules/marshmallow-sqlalchemy/default.nix b/pkgs/development/python-modules/marshmallow-sqlalchemy/default.nix index a5483245d66..1aeaa04e172 100644 --- a/pkgs/development/python-modules/marshmallow-sqlalchemy/default.nix +++ b/pkgs/development/python-modules/marshmallow-sqlalchemy/default.nix @@ -10,12 +10,12 @@ buildPythonPackage rec { pname = "marshmallow-sqlalchemy"; - version = "0.25.0"; + version = "0.26.1"; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - sha256 = "0i39ckrixh1w9fmkm0wl868gvza72j5la0x6dd0cij9shf1iyjgi"; + sha256 = "d8525f74de51554b5c8491effe036f60629a426229befa33ff614c8569a16a73"; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/matplotlib-inline/default.nix b/pkgs/development/python-modules/matplotlib-inline/default.nix new file mode 100644 index 00000000000..f4c220dea6c --- /dev/null +++ b/pkgs/development/python-modules/matplotlib-inline/default.nix @@ -0,0 +1,35 @@ +{ lib, buildPythonPackage, fetchPypi +, matplotlib +, traitlets + +# tests +, ipython +}: + +buildPythonPackage rec { + pname = "matplotlib-inline"; + version = "0.1.2"; + + src = fetchPypi { + inherit pname version; + sha256 = "0glrhcv1zqck1whsh3p75x0chda588xw22swbmvqalwz7kvmy7gl"; + }; + + propagatedBuildInputs = [ + matplotlib # not documented, but required + traitlets + ]; + + # wants to import ipython, which creates a circular dependency + doCheck = false; + pythonImportsCheck = [ "matplotlib_inline" ]; + + passthru.tests = { inherit ipython; }; + + meta = with lib; { + description = "Matplotlib Inline Back-end for IPython and Jupyter"; + homepage = "https://github.com/ipython/matplotlib-inline"; + license = licenses.bsd3; + maintainers = with maintainers; [ jonringer ]; + }; +} diff --git a/pkgs/development/python-modules/matplotlib/default.nix b/pkgs/development/python-modules/matplotlib/default.nix index 12ef896117a..75f75e981ce 100644 --- a/pkgs/development/python-modules/matplotlib/default.nix +++ b/pkgs/development/python-modules/matplotlib/default.nix @@ -17,14 +17,14 @@ let in buildPythonPackage rec { - version = "3.4.1"; + version = "3.4.2"; pname = "matplotlib"; disabled = !isPy3k; src = fetchPypi { inherit pname version; - sha256 = "84d4c4f650f356678a5d658a43ca21a41fca13f9b8b00169c0b76e6a6a948908"; + sha256 = "d8d994cefdff9aaba45166eb3de4f5211adb4accac85cbf97137e98f26ea0219"; }; XDG_RUNTIME_DIR = "/tmp"; diff --git a/pkgs/development/python-modules/matrix-nio/default.nix b/pkgs/development/python-modules/matrix-nio/default.nix index 3e613fd89a5..4fad524bfa7 100644 --- a/pkgs/development/python-modules/matrix-nio/default.nix +++ b/pkgs/development/python-modules/matrix-nio/default.nix @@ -38,6 +38,11 @@ buildPythonPackage rec { sha256 = "QHNirglqSxGMmbST96LUp9MHoGj0yAwLoTRlsbMqwaM="; }; + postPatch = '' + substituteInPlace pyproject.toml \ + --replace 'aiofiles = "^0.6.0"' 'aiofiles = "*"' + ''; + nativeBuildInputs = [ git poetry-core diff --git a/pkgs/development/python-modules/mcstatus/default.nix b/pkgs/development/python-modules/mcstatus/default.nix index 221410fa3ea..43906cd95aa 100644 --- a/pkgs/development/python-modules/mcstatus/default.nix +++ b/pkgs/development/python-modules/mcstatus/default.nix @@ -20,7 +20,7 @@ buildPythonPackage rec { owner = "Dinnerbone"; repo = pname; rev = "v${version}"; - sha256 = "sha256-ncw8ILOD+i5aW78opv62VRcV58MQb5IG33MGTqNgDRk="; + sha256 = "068dc2ilw1kkvw394vqhqgkia5smnvzaca5zbdd2xyl3nch3rk4x"; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/meshtastic/default.nix b/pkgs/development/python-modules/meshtastic/default.nix index c8a9d78e7c1..6826298699e 100644 --- a/pkgs/development/python-modules/meshtastic/default.nix +++ b/pkgs/development/python-modules/meshtastic/default.nix @@ -15,12 +15,12 @@ buildPythonPackage rec { pname = "meshtastic"; - version = "1.2.30"; + version = "1.2.40"; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - sha256 = "1kjflc2jwnsgxyr2zx1gyykhak9fsgy6hxaxlggsz5sw9b8rdrby"; + sha256 = "be8464037d0c8085350065b38e7a7b028db15f2524764dec0e3548ea5b53500f"; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/mido/default.nix b/pkgs/development/python-modules/mido/default.nix index ae737dc7166..909c224685c 100644 --- a/pkgs/development/python-modules/mido/default.nix +++ b/pkgs/development/python-modules/mido/default.nix @@ -12,11 +12,11 @@ buildPythonPackage rec { pname = "mido"; - version = "1.2.9"; + version = "1.2.10"; src = fetchPypi { inherit pname version; - sha256 = "1k3sgkxc7j49bapib3b5jnircb1yhyyd8mi0mbfd78zgix9db9y4"; + sha256 = "17b38a8e4594497b850ec6e78b848eac3661706bfc49d484a36d91335a373499"; }; patches = [ diff --git a/pkgs/development/python-modules/miniaudio/default.nix b/pkgs/development/python-modules/miniaudio/default.nix new file mode 100644 index 00000000000..61b7c68d53f --- /dev/null +++ b/pkgs/development/python-modules/miniaudio/default.nix @@ -0,0 +1,38 @@ +{ lib +, buildPythonPackage +, pythonOlder +, fetchFromGitHub +, cffi +, pytestCheckHook +}: + +buildPythonPackage rec { + pname = "miniaudio"; + version = "1.44"; + + disabled = pythonOlder "3.6"; + + src = fetchFromGitHub { + owner = "irmen"; + repo = "pyminiaudio"; + rev = "v${version}"; + sha256 = "1na3vx10lc41gkk14h6s3fm4bnrd2bwf4qbf1l6bfvhs92b9k111"; + }; + + propagatedBuildInputs = [ + cffi + ]; + + checkInputs = [ + pytestCheckHook + ]; + + pythonImportsCheck = [ "miniaudio" ]; + + meta = with lib; { + description = "Python bindings for the miniaudio library and its decoders"; + homepage = "https://github.com/irmen/pyminiaudio"; + license = licenses.mit; + maintainers = with maintainers; [ dotlambda ]; + }; +} diff --git a/pkgs/development/python-modules/mkl-service/default.nix b/pkgs/development/python-modules/mkl-service/default.nix index c8531299620..c54da3055e7 100644 --- a/pkgs/development/python-modules/mkl-service/default.nix +++ b/pkgs/development/python-modules/mkl-service/default.nix @@ -2,13 +2,13 @@ buildPythonPackage rec { pname = "mkl-service"; - version = "2.3.0"; + version = "2.4.0"; src = fetchFromGitHub { owner = "IntelPython"; repo = "mkl-service"; rev = "v${version}"; - sha256 = "1b4dkkl439rfaa86ywzc2zf9ifawhvdlaiqcg0il83cn5bzs7g5z"; + sha256 = "1x8j0ij582dyhay0gaqq45a2jz1m4fr8xw0v65ngviajj3cxmcpb"; }; MKLROOT = mkl; diff --git a/pkgs/development/python-modules/mlflow/default.nix b/pkgs/development/python-modules/mlflow/default.nix index 13cfc0b63df..2940c111e5d 100644 --- a/pkgs/development/python-modules/mlflow/default.nix +++ b/pkgs/development/python-modules/mlflow/default.nix @@ -25,12 +25,12 @@ buildPythonPackage rec { pname = "mlflow"; - version = "1.14.1"; + version = "1.18.0"; disabled = isPy27; src = fetchPypi { inherit pname version; - sha256 = "e3abff0831564d9a4b5d5a15e5ee76b0f5b4580b362c24a58ee821634c8fb1a3"; + sha256 = "8942089589d08c05c8a7fc66828c02a9233be462c421881b50bc2a0b183dfdbe"; }; # run into https://stackoverflow.com/questions/51203641/attributeerror-module-alembic-context-has-no-attribute-config diff --git a/pkgs/development/python-modules/mne-python/default.nix b/pkgs/development/python-modules/mne-python/default.nix index d8add2608b6..77e6f9c2468 100644 --- a/pkgs/development/python-modules/mne-python/default.nix +++ b/pkgs/development/python-modules/mne-python/default.nix @@ -16,7 +16,7 @@ buildPythonPackage rec { pname = "mne-python"; - version = "0.22.0"; + version = "0.23.0"; disabled = isPy27; @@ -25,7 +25,7 @@ buildPythonPackage rec { owner = "mne-tools"; repo = pname; rev = "v${version}"; - sha256 = "1s9pshrl40gkcsdwf4qdga3hjfmdbrvbgjcz0cfx3kl796x3im11"; + sha256 = "02fcnfsrc6sccv6x2rnx86g0zw0ivk5s8gx230g6pxfg3lap6knv"; }; propagatedBuildInputs = [ numpy scipy ]; diff --git a/pkgs/development/python-modules/mongoengine/default.nix b/pkgs/development/python-modules/mongoengine/default.nix index 06f2c210415..d609f465e27 100644 --- a/pkgs/development/python-modules/mongoengine/default.nix +++ b/pkgs/development/python-modules/mongoengine/default.nix @@ -12,14 +12,14 @@ buildPythonPackage rec { pname = "mongoengine"; - version = "0.23.0"; + version = "0.23.1"; disabled = isPy27; src = fetchFromGitHub { owner = "MongoEngine"; repo = pname; rev = "v${version}"; - sha256 = "0mzh5pv0n81ms046yxb9rzql8bpbsf26jv6dihmhi0ds4yqkw836"; + sha256 = "1lj33pgdrp4rvjzcg2glvz1f87np1pfnqhlwbdcijav9rxqc0w70"; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/monty/default.nix b/pkgs/development/python-modules/monty/default.nix index 4690f9f8820..ff236d9becc 100644 --- a/pkgs/development/python-modules/monty/default.nix +++ b/pkgs/development/python-modules/monty/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { pname = "monty"; - version = "2021.3.3"; + version = "2021.6.10"; disabled = pythonOlder "3.5"; # uses type annotations # No tests in Pypi @@ -21,7 +21,7 @@ buildPythonPackage rec { owner = "materialsvirtuallab"; repo = pname; rev = "v${version}"; - sha256 = "1nbv0ys0fv70rgzskkk8gsfr9dsmm7ykim5wv36li840zsj83b1l"; + sha256 = "01fhl4pl5gj4ahph4lxcm0fmglh0bjw6jz9ckmgzviasg4l1j6h4"; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/more-itertools/default.nix b/pkgs/development/python-modules/more-itertools/default.nix index 2f26cc0c86f..d523a0bdb1e 100644 --- a/pkgs/development/python-modules/more-itertools/default.nix +++ b/pkgs/development/python-modules/more-itertools/default.nix @@ -9,11 +9,11 @@ buildPythonPackage rec { pname = "more-itertools"; - version = "8.7.0"; + version = "8.8.0"; src = fetchPypi { inherit pname version; - sha256 = "c5d6da9ca3ff65220c3bfd2a8db06d698f05d4d2b9be57e1deb2be5a45019713"; + sha256 = "83f0308e05477c68f56ea3a888172c78ed5d5b3c282addb67508e7ba6c8f813a"; }; checkInputs = [ nose ]; diff --git a/pkgs/development/python-modules/moto/default.nix b/pkgs/development/python-modules/moto/default.nix index 7f9b7010c52..4d9156349e4 100644 --- a/pkgs/development/python-modules/moto/default.nix +++ b/pkgs/development/python-modules/moto/default.nix @@ -39,6 +39,7 @@ buildPythonPackage rec { substituteInPlace setup.py \ --replace "ecdsa<0.15" "ecdsa" \ --replace "idna<3,>=2.5" "idna" \ + --replace "MarkupSafe<2.0" "MarkupSafe" \ ''; patches = [ diff --git a/pkgs/development/python-modules/msal/default.nix b/pkgs/development/python-modules/msal/default.nix index 735d74b5237..b5095cc5910 100644 --- a/pkgs/development/python-modules/msal/default.nix +++ b/pkgs/development/python-modules/msal/default.nix @@ -9,11 +9,11 @@ buildPythonPackage rec { pname = "msal"; - version = "1.11.0"; + version = "1.12.0"; src = fetchPypi { inherit pname version; - sha256 = "sha256-RnrwK7lKh6G2lbUb+GdmfoKKzA3Twd5fpUP2kALbSfo="; + sha256 = "5cc93f09523c703d4e00a901cf719ade4faf2c3d14961ba52060ae78d5b25327"; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/mwparserfromhell/default.nix b/pkgs/development/python-modules/mwparserfromhell/default.nix index 56aa4661516..8c29971afe7 100644 --- a/pkgs/development/python-modules/mwparserfromhell/default.nix +++ b/pkgs/development/python-modules/mwparserfromhell/default.nix @@ -1,17 +1,24 @@ { lib , buildPythonPackage , fetchPypi +, pytestCheckHook +, pytestrunner }: buildPythonPackage rec { pname = "mwparserfromhell"; - version = "0.6"; + version = "0.6.2"; src = fetchPypi { inherit pname version; - sha256 = "75787b6ab140ab267b313d37d045f3276f5dc6a9741074eddfbabc1635cb2efc"; + sha256 = "d3f74c0101f81ff73c61985b67f2e7048a30dc5f6a578ea1544e69133988d874"; }; + checkInputs = [ + pytestCheckHook + pytestrunner + ]; + meta = with lib; { description = "MWParserFromHell is a parser for MediaWiki wikicode"; homepage = "https://mwparserfromhell.readthedocs.io/en/latest/"; diff --git a/pkgs/development/python-modules/mypy-boto3-s3/default.nix b/pkgs/development/python-modules/mypy-boto3-s3/default.nix index bbbcc5a1492..b25e838c96f 100644 --- a/pkgs/development/python-modules/mypy-boto3-s3/default.nix +++ b/pkgs/development/python-modules/mypy-boto3-s3/default.nix @@ -8,12 +8,12 @@ buildPythonPackage rec { pname = "mypy-boto3-s3"; - version = "1.17.88"; + version = "1.17.97"; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - sha256 = "sha256-ba7ohsScaag3tDnUbs1eWYO/YSWcgJlo9VpkdU40x5o="; + sha256 = "cc12897498213e6aa1530d9f75dadb3916fcd3ce376639560c2fede2c93c51b9"; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/nbclassic/default.nix b/pkgs/development/python-modules/nbclassic/default.nix index a6aa34a88ec..0e6630281c0 100644 --- a/pkgs/development/python-modules/nbclassic/default.nix +++ b/pkgs/development/python-modules/nbclassic/default.nix @@ -10,15 +10,15 @@ buildPythonPackage rec { pname = "nbclassic"; - version = "0.2.6"; - disabled = pythonOlder "3.5"; + version = "0.3.1"; + disabled = pythonOlder "3.6"; # tests only on github src = fetchFromGitHub { owner = "jupyterlab"; repo = pname; rev = version; - sha256 = "sha256-stp0LZJAOCrnObvJIPEVt8mMb8yL29nlHECypbTg3ec="; + sha256 = "sha256-gx086w/qYB02UFEDly+0mUsV5BvAVAuhqih4wev2p/w="; }; propagatedBuildInputs = [ jupyter_server notebook ]; diff --git a/pkgs/development/python-modules/nbformat/default.nix b/pkgs/development/python-modules/nbformat/default.nix index a3143780e1c..a8e6993d645 100644 --- a/pkgs/development/python-modules/nbformat/default.nix +++ b/pkgs/development/python-modules/nbformat/default.nix @@ -12,11 +12,11 @@ buildPythonPackage rec { pname = "nbformat"; - version = "5.1.2"; + version = "5.1.3"; src = fetchPypi { inherit pname version; - sha256 = "sha256-HSI+ZKGL+nzfLbLpuoqBgxL8KgcB0ukQtY32aAk4WlY="; + sha256 = "b516788ad70771c6250977c1374fcca6edebe6126fd2adb5a69aa5c2356fd1c8"; }; LC_ALL="en_US.utf8"; diff --git a/pkgs/development/python-modules/nbsphinx/default.nix b/pkgs/development/python-modules/nbsphinx/default.nix index c02baa571ed..8611059eb31 100644 --- a/pkgs/development/python-modules/nbsphinx/default.nix +++ b/pkgs/development/python-modules/nbsphinx/default.nix @@ -12,11 +12,11 @@ buildPythonPackage rec { pname = "nbsphinx"; - version = "0.8.2"; + version = "0.8.6"; src = fetchPypi { inherit pname version; - sha256 = "53352237e2363079f6e38637a8ce90b47e720c8e2eb133a6a6f66fc13ff494cb"; + sha256 = "097dee333558f400e9abbb53ce7d4fa64a257cfa89dd20f7554dca7f0cd5e143"; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/nclib/default.nix b/pkgs/development/python-modules/nclib/default.nix index 0e15bfb6cc4..e28dbefca92 100644 --- a/pkgs/development/python-modules/nclib/default.nix +++ b/pkgs/development/python-modules/nclib/default.nix @@ -6,12 +6,12 @@ buildPythonPackage rec { pname = "nclib"; - version = "1.0.0"; + version = "1.0.1"; disabled = pythonOlder "3.5"; src = fetchPypi { inherit pname version; - sha256 = "0kf8x30lrwhijab586i54g70s3sxvm2945al48zj27grj0pagh7g"; + sha256 = "9d41adb7df01a3fead10bc9698a175936b263d6bd18997078ed17e4fa61734d1"; }; # Project has no tests diff --git a/pkgs/development/python-modules/netifaces/default.nix b/pkgs/development/python-modules/netifaces/default.nix index b7b28c678ee..66feb7be026 100644 --- a/pkgs/development/python-modules/netifaces/default.nix +++ b/pkgs/development/python-modules/netifaces/default.nix @@ -4,12 +4,12 @@ }: buildPythonPackage rec { - version = "0.10.9"; + version = "0.11.0"; pname = "netifaces"; src = fetchPypi { inherit pname version; - sha256 = "2dee9ffdd16292878336a58d04a20f0ffe95555465fee7c9bd23b3490ef2abf3"; + sha256 = "043a79146eb2907edf439899f262b3dfe41717d34124298ed281139a8b93ca32"; }; doCheck = false; # no tests implemented diff --git a/pkgs/development/python-modules/networkx/default.nix b/pkgs/development/python-modules/networkx/default.nix index 27f6082ac56..c92db16fc6b 100644 --- a/pkgs/development/python-modules/networkx/default.nix +++ b/pkgs/development/python-modules/networkx/default.nix @@ -10,11 +10,11 @@ buildPythonPackage rec { pname = "networkx"; # upgrade may break sage, please test the sage build or ping @timokau on upgrade - version = "2.5"; + version = "2.5.1"; src = fetchPypi { inherit pname version; - sha256 = "7978955423fbc9639c10498878be59caf99b44dc304c2286162fd24b458c1602"; + sha256 = "109cd585cac41297f71103c3c42ac6ef7379f29788eb54cb751be5a663bb235a"; }; propagatedBuildInputs = [ decorator setuptools ]; diff --git a/pkgs/development/python-modules/nilearn/default.nix b/pkgs/development/python-modules/nilearn/default.nix index 39edd7e34da..6e3158b2796 100644 --- a/pkgs/development/python-modules/nilearn/default.nix +++ b/pkgs/development/python-modules/nilearn/default.nix @@ -3,11 +3,11 @@ buildPythonPackage rec { pname = "nilearn"; - version = "0.7.1"; + version = "0.8.0"; src = fetchPypi { inherit pname version; - sha256 = "8b1409a5e1f0f6d1a1f02555c2f11115a2364f45f1e57bcb5fb3c9ea11f346fa"; + sha256 = "f2d3dc81005f829f3a183efa6c90d698ea6818c06264d2e3f03e805c4340febb"; }; checkInputs = [ pytestCheckHook ]; diff --git a/pkgs/development/python-modules/nipy/default.nix b/pkgs/development/python-modules/nipy/default.nix index 6229baef32a..5bdf6fdcd44 100644 --- a/pkgs/development/python-modules/nipy/default.nix +++ b/pkgs/development/python-modules/nipy/default.nix @@ -12,13 +12,13 @@ }: buildPythonPackage rec { - version = "0.4.2"; + version = "0.5.0"; pname = "nipy"; disabled = pythonOlder "2.6"; src = fetchPypi { inherit pname version; - sha256 = "1pn731nsczrx198i2gadffqmfbhviglrclv6xxwhnbv6w5hfs2yk"; + sha256 = "a8a2c97ce854fece4aced5a6394b9fdca5846150ad6d2a36b86590924af3c848"; }; buildInputs = lib.optional doCheck [ nose ]; diff --git a/pkgs/development/python-modules/nipype/default.nix b/pkgs/development/python-modules/nipype/default.nix index 5f847007bdc..3d72748a1e7 100644 --- a/pkgs/development/python-modules/nipype/default.nix +++ b/pkgs/development/python-modules/nipype/default.nix @@ -49,12 +49,12 @@ in buildPythonPackage rec { pname = "nipype"; - version = "1.6.0"; + version = "1.6.1"; disabled = isPy27; src = fetchPypi { inherit pname version; - sha256 = "bc56ce63f74c9a9a23c6edeaf77631377e8ad2bea928c898cc89527a47f101cf"; + sha256 = "8428cfc633d8e3b8c5650e241e9eedcf637b7969bcd40f3423334d4c6b0992b5"; }; postPatch = '' diff --git a/pkgs/development/python-modules/nltk/default.nix b/pkgs/development/python-modules/nltk/default.nix index c87a935a306..253ac874ea1 100644 --- a/pkgs/development/python-modules/nltk/default.nix +++ b/pkgs/development/python-modules/nltk/default.nix @@ -6,13 +6,13 @@ }: buildPythonPackage rec { - version = "3.5"; + version = "3.6.2"; pname = "nltk"; src = fetchPypi { inherit pname version; extension = "zip"; - sha256 = "845365449cd8c5f9731f7cb9f8bd6fd0767553b9d53af9eb1b3abf7700936b35"; + sha256 = "57d556abed621ab9be225cc6d2df1edce17572efb67a3d754630c9f8381503eb"; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/nodeenv/default.nix b/pkgs/development/python-modules/nodeenv/default.nix index 821a2d1bccf..d88661ae757 100644 --- a/pkgs/development/python-modules/nodeenv/default.nix +++ b/pkgs/development/python-modules/nodeenv/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "nodeenv"; - version = "1.5.0"; + version = "1.6.0"; src = fetchPypi { inherit pname version; - sha256 = "ab45090ae383b716c4ef89e690c41ff8c2b257b85b309f01f3654df3d084bd7c"; + sha256 = "3ef13ff90291ba2a4a7a4ff9a979b63ffdd00a464dbe04acf0ea6471517a4c2b"; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/notebook/default.nix b/pkgs/development/python-modules/notebook/default.nix index c7dc40d7079..435b4f13765 100644 --- a/pkgs/development/python-modules/notebook/default.nix +++ b/pkgs/development/python-modules/notebook/default.nix @@ -27,12 +27,12 @@ buildPythonPackage rec { pname = "notebook"; - version = "6.3.0"; + version = "6.4.0"; disabled = !isPy3k; src = fetchPypi { inherit pname version; - sha256 = "cbc9398d6c81473e9cdb891d2cae9c0d3718fca289dda6d26df5cb660fcadc7d"; + sha256 = "9c4625e2a2aa49d6eae4ce20cbc3d8976db19267e32d2a304880e0c10bf8aef9"; }; LC_ALL = "en_US.utf8"; diff --git a/pkgs/development/python-modules/ntplib/default.nix b/pkgs/development/python-modules/ntplib/default.nix index be8a370f3f3..399d27695ad 100644 --- a/pkgs/development/python-modules/ntplib/default.nix +++ b/pkgs/development/python-modules/ntplib/default.nix @@ -5,11 +5,11 @@ buildPythonPackage rec { pname = "ntplib"; - version = "0.3.4"; + version = "0.4.0"; src = fetchPypi { inherit pname version; - sha256 = "9fc99f71b14641b31698e4ced3d5f974eec225bfbae089ebe44b5808ba890f71"; + sha256 = "899d8fb5f8c2555213aea95efca02934c7343df6ace9d7628a5176b176906267"; }; # Require networking diff --git a/pkgs/development/python-modules/numba/default.nix b/pkgs/development/python-modules/numba/default.nix index c49a4105abe..e4af2ddadb5 100644 --- a/pkgs/development/python-modules/numba/default.nix +++ b/pkgs/development/python-modules/numba/default.nix @@ -12,14 +12,14 @@ }: buildPythonPackage rec { - version = "0.53.0"; + version = "0.53.1"; pname = "numba"; # uses f-strings, python 3.9 is not yet supported disabled = pythonOlder "3.6" || pythonAtLeast "3.9"; src = fetchPypi { inherit pname version; - sha256 = "55c11d7edbba2ba715f2b56f5294cad55cfd87bff98e2627c3047c2d5cc52d16"; + sha256 = "9cd4e5216acdc66c4e9dab2dfd22ddb5bef151185c070d4a3cd8e78638aff5b0"; }; NIX_CFLAGS_COMPILE = lib.optionalString stdenv.isDarwin "-I${lib.getDev libcxx}/include/c++/v1"; diff --git a/pkgs/development/python-modules/numcodecs/default.nix b/pkgs/development/python-modules/numcodecs/default.nix index ca31e34d297..ab529e0439d 100644 --- a/pkgs/development/python-modules/numcodecs/default.nix +++ b/pkgs/development/python-modules/numcodecs/default.nix @@ -13,12 +13,12 @@ buildPythonPackage rec { pname = "numcodecs"; - version = "0.7.3"; + version = "0.8.0"; disabled = isPy27; src = fetchPypi { inherit pname version; - sha256 = "022b12ad83eb623ec53f154859d49f6ec43b15c36052fa864eaf2d9ee786dd85"; + sha256 = "7c7d0ea56b5e2a267ae785bdce47abed62829ef000f03be8e32e30df62d3749c"; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/numpy-stl/default.nix b/pkgs/development/python-modules/numpy-stl/default.nix index 2176b5f9497..53577567bf6 100644 --- a/pkgs/development/python-modules/numpy-stl/default.nix +++ b/pkgs/development/python-modules/numpy-stl/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "numpy-stl"; - version = "2.15.1"; + version = "2.16.0"; src = fetchPypi { inherit pname version; - sha256 = "f57fdb3c0e420f729dbe54ec3add9bdbbd19b62183aa8f4576e00e5834b2ef52"; + sha256 = "411c633d2a03c295d98fb26023a6e7f574ceead04015d06e80cdab20b630a742"; }; checkInputs = [ pytest pytestrunner ]; diff --git a/pkgs/development/python-modules/numpy/default.nix b/pkgs/development/python-modules/numpy/default.nix index c5f6053058d..dbbd750acf5 100644 --- a/pkgs/development/python-modules/numpy/default.nix +++ b/pkgs/development/python-modules/numpy/default.nix @@ -40,14 +40,14 @@ let }; in buildPythonPackage rec { pname = "numpy"; - version = "1.20.2"; + version = "1.20.3"; format = "pyproject.toml"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; extension = "zip"; - sha256 = "1vkc1739lwqx0n9dwxzmy18axlz22za034xa8jh0lmfpbazj52c7"; + sha256 = "e55185e51b18d788e49fe8305fd73ef4470596b33fc2c1ceb304566b99c71a69"; }; patches = lib.optionals python.hasDistutilsCxxPatch [ @@ -75,8 +75,6 @@ in buildPythonPackage rec { enableParallelBuilding = true; - doCheck = !isPyPy; # numpy 1.16+ hits a bug in pypy's ctypes, using either numpy or pypy HEAD fixes this (https://github.com/numpy/numpy/issues/13807) - checkInputs = [ pytest hypothesis diff --git a/pkgs/development/python-modules/nunavut/default.nix b/pkgs/development/python-modules/nunavut/default.nix index 5bb173b9153..e8d032e16ab 100644 --- a/pkgs/development/python-modules/nunavut/default.nix +++ b/pkgs/development/python-modules/nunavut/default.nix @@ -7,12 +7,12 @@ buildPythonPackage rec { pname = "nunavut"; - version = "1.0.3"; + version = "1.2.2"; disabled = pythonOlder "3.5"; # only python>=3.5 is supported src = fetchPypi { inherit pname version; - sha256 = "474392035e9e20b2c74dced7df8bda135fd5c0ead2b2cf64523a4968c785ea73"; + sha256 = "78ab56951172ecd92f9b66dbf9b0ea986dcc6899d462eeef74563ddf33a5a9a5"; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/openapi-core/default.nix b/pkgs/development/python-modules/openapi-core/default.nix new file mode 100644 index 00000000000..e41f7fd5809 --- /dev/null +++ b/pkgs/development/python-modules/openapi-core/default.nix @@ -0,0 +1,81 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, isodate +, dictpath +, openapi-spec-validator +, openapi-schema-validator +, six +, lazy-object-proxy +, attrs +, werkzeug +, parse +, more-itertools +, pytestCheckHook +, falcon +, flask +, django +, djangorestframework +, responses +}: + +buildPythonPackage rec { + pname = "openapi-core"; + version = "0.14.2"; + + src = fetchFromGitHub { + owner = "p1c2u"; + repo = "openapi-core"; + rev = version; + sha256 = "1npsibyf8zx6z230yl19kyap8g25kqvgm7z1w6rm6jxv58yqsp7r"; + }; + + postPatch = '' + sed -i "/^addopts/d" setup.cfg + ''; + + propagatedBuildInputs = [ + isodate + dictpath + openapi-spec-validator + openapi-schema-validator + six + lazy-object-proxy + attrs + werkzeug + parse + more-itertools + ]; + + checkInputs = [ + pytestCheckHook + falcon + flask + django + djangorestframework + responses + ]; + + disabledTestPaths = [ + # AttributeError: 'str' object has no attribute '__name__' + "tests/integration/validation" + ]; + + disabledTests = [ + # TypeError: Unexpected keyword arguments passed to pytest.raises: message + "test_string_format_invalid_value" + ]; + + pythonImportsCheck = [ + "openapi_core" + "openapi_core.validation.request.validators" + "openapi_core.validation.response.validators" + ]; + + meta = with lib; { + description = "Client-side and server-side support for the OpenAPI Specification v3"; + homepage = "https://github.com/p1c2u/openapi-core"; + license = licenses.bsd3; + maintainers = with maintainers; [ dotlambda ]; + }; +} diff --git a/pkgs/development/python-modules/openapi-spec-validator/default.nix b/pkgs/development/python-modules/openapi-spec-validator/default.nix index 88455e72610..b431ef50752 100644 --- a/pkgs/development/python-modules/openapi-spec-validator/default.nix +++ b/pkgs/development/python-modules/openapi-spec-validator/default.nix @@ -4,11 +4,11 @@ buildPythonPackage rec { pname = "openapi-spec-validator"; - version = "0.3.0"; + version = "0.3.1"; src = fetchPypi { inherit pname version; - sha256 = "53ba3d884e98ff2062d5ada025aa590541dcd665b8f81067dc82dd61c0923759"; + sha256 = "3d70e6592754799f7e77a45b98c6a91706bdd309a425169d17d8e92173e198a2"; }; propagatedBuildInputs = [ jsonschema openapi-schema-validator pyyaml six setuptools ] diff --git a/pkgs/development/python-modules/optuna/default.nix b/pkgs/development/python-modules/optuna/default.nix index 78694618f73..0b496b5ef0f 100644 --- a/pkgs/development/python-modules/optuna/default.nix +++ b/pkgs/development/python-modules/optuna/default.nix @@ -30,14 +30,14 @@ buildPythonPackage rec { pname = "optuna"; - version = "2.6.0"; + version = "2.8.0"; disabled = isPy27; src = fetchFromGitHub { owner = "optuna"; repo = pname; rev = "v${version}"; - sha256 = "11mskhb7i55i04cy0vkxi7kpaifbz8zc2m8x9s5y6yyyjinvly36"; + sha256 = "1w5vyl36mbk78a5028qa7dlzhavrs1dkx3q8m50ij37pa5cnyksz"; }; checkInputs = [ diff --git a/pkgs/development/python-modules/owslib/default.nix b/pkgs/development/python-modules/owslib/default.nix index 661754d89c3..3ccd3d916b6 100644 --- a/pkgs/development/python-modules/owslib/default.nix +++ b/pkgs/development/python-modules/owslib/default.nix @@ -1,11 +1,11 @@ { lib, buildPythonPackage, fetchPypi, dateutil, requests, pytz, pyproj , pytest, pyyaml } : buildPythonPackage rec { pname = "OWSLib"; - version = "0.23.0"; + version = "0.24.1"; src = fetchPypi { inherit pname version; - sha256 = "0a03a9978673f377df45107024e2aae006f85afe7ef7bf4640ef663167a4386f"; + sha256 = "4973c2ba65ec850a3fcc1fb94cefe5ed2fed83aaf2a5e2135c78810ad2a8f0e1"; }; buildInputs = [ pytest ]; diff --git a/pkgs/development/python-modules/packet-python/default.nix b/pkgs/development/python-modules/packet-python/default.nix index 1552148ae37..1bbb713f40b 100644 --- a/pkgs/development/python-modules/packet-python/default.nix +++ b/pkgs/development/python-modules/packet-python/default.nix @@ -12,10 +12,10 @@ buildPythonPackage rec { pname = "packet-python"; - version = "1.43.1"; + version = "1.44.0"; src = fetchPypi { inherit pname version; - sha256 = "e333fb5ce45a3f283ddeb6261d061b39328b82eb440a89233fa08ce3fec2fcf0"; + sha256 = "4af12f2fbcc9713878ab4ed571e9fda028bc68add34cde0e7226af4d833a4d38"; }; nativeBuildInputs = [ pytestrunner ]; propagatedBuildInputs = [ requests ]; diff --git a/pkgs/development/python-modules/pandas/default.nix b/pkgs/development/python-modules/pandas/default.nix index f3505e3c9a6..2d502016821 100644 --- a/pkgs/development/python-modules/pandas/default.nix +++ b/pkgs/development/python-modules/pandas/default.nix @@ -33,11 +33,11 @@ buildPythonPackage rec { pname = "pandas"; - version = "1.2.3"; + version = "1.2.4"; src = fetchPypi { inherit pname version; - sha256 = "078b4nncn6778ymmqn80j2q6n7fcs4d6bbaraar5nypgbaw10vyz"; + sha256 = "649ecab692fade3cbfcf967ff936496b0cfba0af00a55dfaacd82bdda5cb2279"; }; nativeBuildInputs = [ cython ]; diff --git a/pkgs/development/python-modules/panflute/default.nix b/pkgs/development/python-modules/panflute/default.nix index da08b858b1b..332c4c16bd6 100644 --- a/pkgs/development/python-modules/panflute/default.nix +++ b/pkgs/development/python-modules/panflute/default.nix @@ -7,14 +7,14 @@ }: buildPythonPackage rec{ - version = "2.0.5"; + version = "2.1.0"; pname = "panflute"; disabled = !isPy3k; src = fetchPypi { inherit pname version; - sha256 = "1ssmqcyr91f0gpl49lz6a9jkl17l06h6qcik24rlmva28ii6aszz"; + sha256 = "8a3d5dd2a10c3aa6fa8167713fedb47400f0e8ae6ea8346fd4b599842bb1882d"; }; propagatedBuildInputs = [ click pyyaml ]; diff --git a/pkgs/development/python-modules/parfive/default.nix b/pkgs/development/python-modules/parfive/default.nix index 7b32cbb55bb..b525c39de22 100644 --- a/pkgs/development/python-modules/parfive/default.nix +++ b/pkgs/development/python-modules/parfive/default.nix @@ -13,11 +13,11 @@ buildPythonPackage rec { pname = "parfive"; - version = "1.2.0"; + version = "1.3.0"; src = fetchPypi { inherit pname version; - sha256 = "118a0994bbb9536fd4574995a8485b6c4b97db247c55bc86ae4f4ae8fd9b0add"; + sha256 = "c3067e6ca9d6fb88a10958338360bd9c47edfd8ab11098d4c601f7f2887edadd"; }; buildInputs = [ diff --git a/pkgs/development/python-modules/partd/default.nix b/pkgs/development/python-modules/partd/default.nix index 584b4b4315c..9b5a94fa910 100644 --- a/pkgs/development/python-modules/partd/default.nix +++ b/pkgs/development/python-modules/partd/default.nix @@ -12,12 +12,12 @@ buildPythonPackage rec { pname = "partd"; - version = "1.1.0"; + version = "1.2.0"; disabled = isPy27; src = fetchPypi { inherit pname version; - sha256 = "6e258bf0810701407ad1410d63d1a15cfd7b773fd9efe555dac6bb82cc8832b0"; + sha256 = "aa67897b84d522dcbc86a98b942afab8c6aa2f7f677d904a616b74ef5ddbc3eb"; }; checkInputs = [ pytest ]; diff --git a/pkgs/development/python-modules/parts/default.nix b/pkgs/development/python-modules/parts/default.nix index 1bf7f26adfd..83d7d7046f9 100644 --- a/pkgs/development/python-modules/parts/default.nix +++ b/pkgs/development/python-modules/parts/default.nix @@ -5,11 +5,11 @@ buildPythonPackage rec { pname = "parts"; - version = "1.0.2"; + version = "1.0.3"; src = fetchPypi { inherit pname version; - sha256 = "1ym238hxwsw15ivvf6gzmkmla08b9hwhdyc3v6rs55wga9j3a4db"; + sha256 = "a4137612bc050f606b4d6f9e6a554ebfb50633c8dd9699481f82271f84d9425f"; }; # Project has no tests diff --git a/pkgs/development/python-modules/pastescript/default.nix b/pkgs/development/python-modules/pastescript/default.nix index a526d383393..e7d8b844929 100644 --- a/pkgs/development/python-modules/pastescript/default.nix +++ b/pkgs/development/python-modules/pastescript/default.nix @@ -9,12 +9,12 @@ }: buildPythonPackage rec { - version = "3.2.0"; + version = "3.2.1"; pname = "PasteScript"; src = fetchPypi { inherit pname version; - sha256 = "9b0f5c0f1c6a510a353fa7c3dc4fdaab9071462d60d24573de76a001fbc172ac"; + sha256 = "f3ef819785e1b284e6fc108a131bce7e740b18255d96cd2e99ee3f00fd452468"; }; buildInputs = [ nose ]; diff --git a/pkgs/development/python-modules/patiencediff/default.nix b/pkgs/development/python-modules/patiencediff/default.nix index 921fbe4c431..0d4e7d51348 100644 --- a/pkgs/development/python-modules/patiencediff/default.nix +++ b/pkgs/development/python-modules/patiencediff/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "patiencediff"; - version = "0.2.1"; + version = "0.2.2"; src = fetchPypi { inherit pname version; - sha256 = "0nm2242xgg59l06m54rzxp41aly3lxjh0a1s7h6dk7ryxjh002lv"; + sha256 = "456d9fc47fe43f9aea863059ea2c6df5b997285590e4b7f9ee8fbb6c3419b5a7"; }; meta = with lib; { diff --git a/pkgs/development/python-modules/pbr/default.nix b/pkgs/development/python-modules/pbr/default.nix index 6b204a946b3..9ce3d72a20d 100644 --- a/pkgs/development/python-modules/pbr/default.nix +++ b/pkgs/development/python-modules/pbr/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "pbr"; - version = "5.5.1"; + version = "5.6.0"; src = fetchPypi { inherit pname version; - sha256 = "5fad80b613c402d5b7df7bd84812548b2a61e9977387a80a5fc5c396492b13c9"; + sha256 = "42df03e7797b796625b1029c0400279c7c34fd7df24a7d7818a1abb5b38710dd"; }; # circular dependencies with fixtures diff --git a/pkgs/development/python-modules/pdf2image/default.nix b/pkgs/development/python-modules/pdf2image/default.nix index 4eddc028a25..43a319716ec 100644 --- a/pkgs/development/python-modules/pdf2image/default.nix +++ b/pkgs/development/python-modules/pdf2image/default.nix @@ -2,13 +2,13 @@ buildPythonPackage rec { pname = "pdf2image"; - version = "1.14.0"; + version = "1.15.1"; propagatedBuildInputs = [ pillow poppler_utils ]; src = fetchPypi { inherit pname version; - sha256 = "066527e1bf954762fb4369c677ae3bc15f2ce8707eee830cccef8471fde736d7"; + sha256 = "aa6013c1b5b25ceb90caa34834f1ed343e969cfa532100e1472cfe0e96a639b5"; }; meta = with lib; { diff --git a/pkgs/development/python-modules/pdftotext/default.nix b/pkgs/development/python-modules/pdftotext/default.nix index a52160363df..400dc76c0d3 100644 --- a/pkgs/development/python-modules/pdftotext/default.nix +++ b/pkgs/development/python-modules/pdftotext/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "pdftotext"; - version = "2.1.5"; + version = "2.1.6"; src = fetchPypi { inherit pname version; - sha256 = "98aeb8b07a4127e1a30223bd933ef080bbd29aa88f801717ca6c5618380b8aa6"; + sha256 = "caf8ddbaeaf0a5897f07655a71747242addab2e695e84c5d47f2ea92dfe2a594"; }; buildInputs = [ poppler ]; diff --git a/pkgs/development/python-modules/perfplot/default.nix b/pkgs/development/python-modules/perfplot/default.nix index 70af6cc9c8a..76f2f8d2931 100644 --- a/pkgs/development/python-modules/perfplot/default.nix +++ b/pkgs/development/python-modules/perfplot/default.nix @@ -13,14 +13,14 @@ buildPythonPackage rec { pname = "perfplot"; - version = "0.8.10"; + version = "0.9.5"; disabled = isPy27; src = fetchFromGitHub { owner = "nschloe"; repo = "perfplot"; rev = "v${version}"; - sha256 = "17xx33fk95fpkd8h2whblpwfls9vyqbv7anq34kpigjy8zxfi2qk"; + sha256 = "1nr31a7qvipqjycw2flkabnhnc4drbi1xpjm8yjxw2gjzznd1jg4"; }; format = "pyproject"; diff --git a/pkgs/development/python-modules/periodictable/default.nix b/pkgs/development/python-modules/periodictable/default.nix index ea42f7ea7fe..783d85b6c08 100644 --- a/pkgs/development/python-modules/periodictable/default.nix +++ b/pkgs/development/python-modules/periodictable/default.nix @@ -2,13 +2,13 @@ buildPythonPackage rec { pname = "periodictable"; - version = "1.5.3"; + version = "1.6.0"; propagatedBuildInputs = [numpy pyparsing]; src = fetchPypi { inherit pname version; - sha256 = "1d09c359468e2de74b43fc3a7dcb0d3d71e0ff53adb85995215d8d7796451af6"; + sha256 = "52e925220005c20e97601e7b04ad6cebc271680947ab9adcbb1a796ddbaa0f23"; }; checkInputs = [ pytestcov pytestCheckHook ]; diff --git a/pkgs/development/python-modules/persim/default.nix b/pkgs/development/python-modules/persim/default.nix index 2868cea4aea..4ac21159d95 100644 --- a/pkgs/development/python-modules/persim/default.nix +++ b/pkgs/development/python-modules/persim/default.nix @@ -13,11 +13,11 @@ buildPythonPackage rec { pname = "persim"; - version = "0.3.0"; + version = "0.3.1"; src = fetchPypi { inherit pname version; - sha256 = "5db2f7f65b1ad7b2cbfa254afb692ca0a91aeb686e82d6905838c41f516e6a13"; + sha256 = "ef0f0a247adcf6104ecac14117db0b24581710ea8a8d964816805395700b4975"; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/persistent/default.nix b/pkgs/development/python-modules/persistent/default.nix index 07ba3ecd1cf..f8ba8d3cf24 100644 --- a/pkgs/development/python-modules/persistent/default.nix +++ b/pkgs/development/python-modules/persistent/default.nix @@ -7,14 +7,14 @@ buildPythonPackage rec { pname = "persistent"; - version = "4.6.4"; + version = "4.7.0"; nativeBuildInputs = [ sphinx manuel ]; propagatedBuildInputs = [ zope_interface cffi ]; src = fetchPypi { inherit pname version; - sha256 = "f83f54355a44cf8ec38c29ce47b378a8c70444e9a745581dbb13d201a24cb546"; + sha256 = "0ef7c05a6dca0104dc224fe7ff31feb30a63d970421c9462104a4752148ac333"; }; meta = { diff --git a/pkgs/development/python-modules/pex/default.nix b/pkgs/development/python-modules/pex/default.nix index f8374a02a9b..7f65b19bba9 100644 --- a/pkgs/development/python-modules/pex/default.nix +++ b/pkgs/development/python-modules/pex/default.nix @@ -6,11 +6,11 @@ buildPythonPackage rec { pname = "pex"; - version = "2.1.34"; + version = "2.1.42"; src = fetchPypi { inherit pname version; - sha256 = "988e6a4e12933522e0c647da78c6e30fc42e3a172ba52cfb0332affcfc9ee29e"; + sha256 = "2deb088a3943891d07f9871e47409407e6308fbff3ee9514a0238791dc8da99f"; }; nativeBuildInputs = [ setuptools ]; diff --git a/pkgs/development/python-modules/pgspecial/default.nix b/pkgs/development/python-modules/pgspecial/default.nix index c49d6bae313..308e8c9c8b6 100644 --- a/pkgs/development/python-modules/pgspecial/default.nix +++ b/pkgs/development/python-modules/pgspecial/default.nix @@ -10,11 +10,11 @@ buildPythonPackage rec { pname = "pgspecial"; - version = "1.12.1"; + version = "1.13.0"; src = fetchPypi { inherit pname version; - sha256 = "b68feb0005f57861573d3fbb82c5c777950decfbb2d1624af57aec825db02c02"; + sha256 = "3847e205b19469f16ded05bda24b4758056d67ade4075a5ded4ce6628a9bad01"; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/phonenumbers/default.nix b/pkgs/development/python-modules/phonenumbers/default.nix index 64884393b79..a7ab39c7c1c 100644 --- a/pkgs/development/python-modules/phonenumbers/default.nix +++ b/pkgs/development/python-modules/phonenumbers/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "phonenumbers"; - version = "8.12.20"; + version = "8.12.25"; src = fetchPypi { inherit pname version; - sha256 = "ee5a8508c4a414262abad92ec33f050347f681973ed0fb36e98b52bfe159f6b8"; + sha256 = "de4db4e2582f989a9cbae54364a647b24a72a7b0126be50d8356cf02217dc6c9"; }; meta = with lib; { diff --git a/pkgs/development/python-modules/phonopy/default.nix b/pkgs/development/python-modules/phonopy/default.nix index 1c401b62647..2ca29ffd8e3 100644 --- a/pkgs/development/python-modules/phonopy/default.nix +++ b/pkgs/development/python-modules/phonopy/default.nix @@ -11,11 +11,11 @@ buildPythonPackage rec { pname = "phonopy"; - version = "2.9.3"; + version = "2.10.0"; src = fetchPypi { inherit pname version; - sha256 = "389dd33f5bfe35733c8346af6cc43bbd015ccf0efa947eb04b38bd5cb9d0b89b"; + sha256 = "58485042ab7d88fc8b83744d18b2aefd677adb071c8a717ac3710458192743d7"; }; propagatedBuildInputs = [ numpy pyyaml matplotlib h5py spglib ]; diff --git a/pkgs/development/python-modules/pikepdf/default.nix b/pkgs/development/python-modules/pikepdf/default.nix index c536f4c69f0..c5462a555b5 100644 --- a/pkgs/development/python-modules/pikepdf/default.nix +++ b/pkgs/development/python-modules/pikepdf/default.nix @@ -24,12 +24,12 @@ buildPythonPackage rec { pname = "pikepdf"; - version = "2.11.1"; + version = "2.12.2"; disabled = ! isPy3k; src = fetchPypi { inherit pname version; - sha256 = "0vs7qa3s4scfhyldfw99hhxpna6rj49rsbr2k0j6b4qx1bw8h141"; + sha256 = "5ff35499b1ae7b181277f78ce5b1bcc8d3009182bb389917791c5dc811fcc8e4"; }; buildInputs = [ diff --git a/pkgs/development/python-modules/pkgconfig/default.nix b/pkgs/development/python-modules/pkgconfig/default.nix index 098b79a15d0..d51a83a0547 100644 --- a/pkgs/development/python-modules/pkgconfig/default.nix +++ b/pkgs/development/python-modules/pkgconfig/default.nix @@ -2,7 +2,7 @@ buildPythonPackage rec { pname = "pkgconfig"; - version = "1.5.2"; + version = "1.5.4"; inherit (pkg-config) setupHooks @@ -14,7 +14,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "38d612488f0633755a2e7a8acab6c01d20d63dbc31af75e2a9ac98a6f638ca94"; + sha256 = "c34503829fd226822fd93c902b1cf275516908a023a24be0a02ba687f3a00399"; }; diff --git a/pkgs/development/python-modules/plaid-python/default.nix b/pkgs/development/python-modules/plaid-python/default.nix index 040b51b9f6e..567fdd42d0d 100644 --- a/pkgs/development/python-modules/plaid-python/default.nix +++ b/pkgs/development/python-modules/plaid-python/default.nix @@ -1,12 +1,12 @@ { lib, buildPythonPackage, fetchPypi, requests, pytest }: buildPythonPackage rec { - version = "7.2.1"; + version = "7.4.0"; pname = "plaid-python"; src = fetchPypi { inherit pname version; - sha256 = "af2ad326e8377c8c86d97184f60c0be41cd71f5075201dfdb3331cc85d4de513"; + sha256 = "ab70467116adc110b56eb5a1fdeed726307cc216e04dda46a782aa1a1468ce0e"; }; checkInputs = [ pytest ]; diff --git a/pkgs/development/python-modules/plone-testing/default.nix b/pkgs/development/python-modules/plone-testing/default.nix index c951800454d..13114dd7845 100644 --- a/pkgs/development/python-modules/plone-testing/default.nix +++ b/pkgs/development/python-modules/plone-testing/default.nix @@ -8,11 +8,11 @@ buildPythonPackage rec { pname = "plone.testing"; - version = "8.0.2"; + version = "8.0.3"; src = fetchPypi { inherit pname version; - sha256 = "082b03aebe81d0bdcc44a917a795ae60d3add2c2abbee11e7c335fb13d5e7ca7"; + sha256 = "39bc23bbb59b765702090ad61fe579f8bd9fe1f005f4dd1c2988a5bd1a71faf0"; }; propagatedBuildInputs = [ six setuptools zope_testing ]; diff --git a/pkgs/development/python-modules/pluginbase/default.nix b/pkgs/development/python-modules/pluginbase/default.nix index 697717eeca6..b8df04a1b32 100644 --- a/pkgs/development/python-modules/pluginbase/default.nix +++ b/pkgs/development/python-modules/pluginbase/default.nix @@ -1,12 +1,12 @@ { lib, fetchPypi, buildPythonPackage, pytest }: buildPythonPackage rec { - version = "1.0.0"; + version = "1.0.1"; pname = "pluginbase"; src = fetchPypi { inherit pname version; - sha256 = "497894df38d0db71e1a4fbbfaceb10c3ef49a3f95a0582e11b75f8adaa030005"; + sha256 = "ff6c33a98fce232e9c73841d787a643de574937069f0d18147028d70d7dee287"; }; checkInputs = [ pytest ]; diff --git a/pkgs/development/python-modules/plyfile/default.nix b/pkgs/development/python-modules/plyfile/default.nix index d3042c92e32..130fba959ea 100644 --- a/pkgs/development/python-modules/plyfile/default.nix +++ b/pkgs/development/python-modules/plyfile/default.nix @@ -3,11 +3,11 @@ buildPythonPackage rec { pname = "plyfile"; - version = "0.7.3"; + version = "0.7.4"; src = fetchPypi { inherit pname version; - sha256 = "5ac55b685cfcb3e8f70f3c5c2660bd1f6431a892a5319a612792b1ec09aec0f0"; + sha256 = "9e9a18d22a3158fcd74df38761d43a7facc6df75126f2ab9f4e9a5d4d2188652"; }; propagatedBuildInputs = [ numpy ]; diff --git a/pkgs/development/python-modules/polib/default.nix b/pkgs/development/python-modules/polib/default.nix index 00353ac0cca..6190824e68e 100644 --- a/pkgs/development/python-modules/polib/default.nix +++ b/pkgs/development/python-modules/polib/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "polib"; - version = "1.1.0"; + version = "1.1.1"; src = fetchPypi { inherit pname version; - sha256 = "fad87d13696127ffb27ea0882d6182f1a9cf8a5e2b37a587751166c51e5a332a"; + sha256 = "e02c355ae5e054912e3b0d16febc56510eff7e49d60bf22aecb463bd2f2a2dfa"; }; # error: invalid command 'test' diff --git a/pkgs/development/python-modules/pooch/default.nix b/pkgs/development/python-modules/pooch/default.nix index de0ba145828..25efef9ef08 100644 --- a/pkgs/development/python-modules/pooch/default.nix +++ b/pkgs/development/python-modules/pooch/default.nix @@ -2,6 +2,7 @@ , buildPythonPackage , isPy27 , fetchPypi +, setuptools-scm , pytestCheckHook , packaging , appdirs @@ -10,14 +11,16 @@ buildPythonPackage rec { pname = "pooch"; - version = "1.3.0"; + version = "1.4.0"; disabled = isPy27; src = fetchPypi { inherit pname version; - sha256 = "30d448e825904e2d763bbbe418831a788813c32f636b21c8d60ee5f474532898"; + sha256 = "f827e79ab51b21a8964a4b1ea8972aa4a1079cb9c1ff8e9ec61893eb7dab50cb"; }; + nativeBuildInputs = [ setuptools-scm ]; + propagatedBuildInputs = [ packaging appdirs requests ]; preCheck = "HOME=$TMPDIR"; diff --git a/pkgs/development/python-modules/portpicker/default.nix b/pkgs/development/python-modules/portpicker/default.nix index 30ac0015560..90ed4b34b70 100644 --- a/pkgs/development/python-modules/portpicker/default.nix +++ b/pkgs/development/python-modules/portpicker/default.nix @@ -5,11 +5,12 @@ buildPythonPackage rec { pname = "portpicker"; - version = "1.3.1"; + version = "1.4.0"; + format = "pyproject"; src = fetchPypi { inherit pname version; - sha256 = "0rwn5ca7ns3yh6bp785zdd2l4018ccpd5i0m2d1fsd9nhxvcgkfj"; + sha256 = "c2831ff4328a21e928ffc9e52124bcafacaf5816d38a1a72dc329680dc1bb7ba"; }; meta = { diff --git a/pkgs/development/python-modules/prance/default.nix b/pkgs/development/python-modules/prance/default.nix index f9d5b6f80b1..b13808f1a9d 100644 --- a/pkgs/development/python-modules/prance/default.nix +++ b/pkgs/development/python-modules/prance/default.nix @@ -14,11 +14,11 @@ buildPythonPackage rec { pname = "prance"; - version = "0.20.2"; + version = "0.21.2"; src = fetchPypi { inherit pname version; - sha256 = "4ffcddae6218cf6753a02af36ca9fb1c92eec4689441789ee2e9963230882388"; + sha256 = "43ebe3a5b38f0c65c428427004c4d8ce8d7155ddad50610276c89c192680f138"; }; buildInputs = [ diff --git a/pkgs/development/python-modules/prawcore/default.nix b/pkgs/development/python-modules/prawcore/default.nix index 129275b2987..686487c0256 100644 --- a/pkgs/development/python-modules/prawcore/default.nix +++ b/pkgs/development/python-modules/prawcore/default.nix @@ -19,7 +19,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "08wiij1r3flpnqzdx8bf536yf7lqyhg9461aybhcykcw8nnjzr5x"; + sha256 = "bde42fad459c4dcfe0f22a18921ef4981ee7cd286ea1de3eb697ba91838c9123"; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/premailer/default.nix b/pkgs/development/python-modules/premailer/default.nix index c69ec9a05a1..8523a47b71a 100644 --- a/pkgs/development/python-modules/premailer/default.nix +++ b/pkgs/development/python-modules/premailer/default.nix @@ -4,12 +4,12 @@ buildPythonPackage rec { pname = "premailer"; - version = "3.7.0"; + version = "3.9.0"; disabled = isPy27; # no longer compatible with urllib src = fetchPypi { inherit pname version; - sha256 = "5eec9603e84cee583a390de69c75192e50d76e38ef0292b027bd64923766aca7"; + sha256 = "da18b9e8cb908893b67ab9b7451276fef7c0ab179f40189378545f6bb0ab3695"; }; buildInputs = [ mock nose ]; diff --git a/pkgs/development/python-modules/process-tests/default.nix b/pkgs/development/python-modules/process-tests/default.nix index abf175b5531..5f50b2a4d18 100644 --- a/pkgs/development/python-modules/process-tests/default.nix +++ b/pkgs/development/python-modules/process-tests/default.nix @@ -5,11 +5,11 @@ buildPythonPackage rec { pname = "process-tests"; - version = "2.1.1"; + version = "2.1.2"; src = fetchPypi { inherit pname version; - sha256 = "15yrgr1hb7i0fq31dh6k8hmc3jnk6yn5nh4xh3gmszk9vag5zrqk"; + sha256 = "a3747ad947bdfc93e5c986bdb17a6d718f3f26e8577a0807a00962f29e26deba"; }; # No tests diff --git a/pkgs/development/python-modules/prometheus_client/default.nix b/pkgs/development/python-modules/prometheus_client/default.nix index e4cf4e85af0..7ce36e588d7 100644 --- a/pkgs/development/python-modules/prometheus_client/default.nix +++ b/pkgs/development/python-modules/prometheus_client/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "prometheus_client"; - version = "0.9.0"; + version = "0.11.0"; src = fetchPypi { inherit pname version; - sha256 = "9da7b32f02439d8c04f7777021c304ed51d9ec180604700c1ba72a4d44dceb03"; + sha256 = "3a8baade6cb80bcfe43297e33e7623f3118d660d41387593758e2fb1ea173a86"; }; doCheck = false; diff --git a/pkgs/development/python-modules/prompt_toolkit/default.nix b/pkgs/development/python-modules/prompt_toolkit/default.nix index ac128c098ec..266ac3c90c3 100644 --- a/pkgs/development/python-modules/prompt_toolkit/default.nix +++ b/pkgs/development/python-modules/prompt_toolkit/default.nix @@ -8,11 +8,11 @@ buildPythonPackage rec { pname = "prompt_toolkit"; - version = "3.0.18"; + version = "3.0.19"; src = fetchPypi { inherit pname version; - sha256 = "e1b4f11b9336a28fa11810bc623c357420f69dfdb6d2dac41ca2c21a55c033bc"; + sha256 = "08360ee3a3148bdb5163621709ee322ec34fc4375099afa4bbf751e9b7b7fa4f"; }; checkPhase = '' py.test -k 'not test_pathcompleter_can_expanduser' diff --git a/pkgs/development/python-modules/psycopg2/default.nix b/pkgs/development/python-modules/psycopg2/default.nix index 4e0a2771e9a..1af8fd38bad 100644 --- a/pkgs/development/python-modules/psycopg2/default.nix +++ b/pkgs/development/python-modules/psycopg2/default.nix @@ -1,25 +1,40 @@ -{ stdenv, lib, buildPythonPackage, isPyPy, fetchPypi, postgresql, openssl }: +{ stdenv +, lib +, buildPythonPackage +, pythonOlder +, isPyPy +, fetchPypi +, postgresql +, openssl +}: buildPythonPackage rec { pname = "psycopg2"; - version = "2.8.6"; + version = "2.9.1"; # Extension modules don't work well with PyPy. Use psycopg2cffi instead. # c.f. https://github.com/NixOS/nixpkgs/pull/104151#issuecomment-729750892 - disabled = isPyPy; + disabled = pythonOlder "3.6" || isPyPy; src = fetchPypi { inherit pname version; - sha256 = "fb23f6c71107c37fd667cb4ea363ddeb936b348bbd6449278eb92c189699f543"; + sha256 = "0z0v2d5gpgy0wf2ypqxv955c9k44yszd7r20km5s79yhy6k06lyy"; }; - buildInputs = lib.optional stdenv.isDarwin openssl; - nativeBuildInputs = [ postgresql ]; + nativeBuildInputs = [ + postgresql + ]; + buildInputs = lib.optionals stdenv.isDarwin [ + openssl + ]; + + # requires setting up a postgresql database doCheck = false; meta = with lib; { description = "PostgreSQL database adapter for the Python programming language"; - license = with licenses; [ gpl2 zpl20 ]; + homepage = "https://www.psycopg.org"; + license = with licenses; [ lgpl3 zpl20 ]; }; } diff --git a/pkgs/development/python-modules/pubnub/default.nix b/pkgs/development/python-modules/pubnub/default.nix index c2f1a9fb34d..89dd4d1cbf0 100644 --- a/pkgs/development/python-modules/pubnub/default.nix +++ b/pkgs/development/python-modules/pubnub/default.nix @@ -13,13 +13,13 @@ buildPythonPackage rec { pname = "pubnub"; - version = "5.1.1"; + version = "5.1.3"; src = fetchFromGitHub { owner = pname; repo = "python"; rev = "v${version}"; - sha256 = "sha256-ir8f8A6XuN1ZQIYQbArChLzTlYu4ZKpkoOXQtSLOvKg="; + sha256 = "0mpw2wzbpb60lnrsnw8mc88mxxhslpnc5nvkjyc3v2dbqs5cnmy5"; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/pwntools/default.nix b/pkgs/development/python-modules/pwntools/default.nix index b9f71de8e94..e6ee7d4f983 100644 --- a/pkgs/development/python-modules/pwntools/default.nix +++ b/pkgs/development/python-modules/pwntools/default.nix @@ -27,12 +27,12 @@ let debuggerName = lib.strings.getName debugger; in buildPythonPackage rec { - version = "4.5.0"; + version = "4.5.1"; pname = "pwntools"; src = fetchPypi { inherit pname version; - sha256 = "sha256-IWHMorSASG/po8ib1whS3xPuoUUlD0tbbWI35DI2SIY="; + sha256 = "97f945aed7ffa9d3e87f8759df83a5eac6dc2112907f35d0aee66a9bf62fd8eb"; }; postPatch = '' diff --git a/pkgs/development/python-modules/py-vapid/default.nix b/pkgs/development/python-modules/py-vapid/default.nix index dd8cbdcc5f0..69dde8ca38e 100644 --- a/pkgs/development/python-modules/py-vapid/default.nix +++ b/pkgs/development/python-modules/py-vapid/default.nix @@ -5,11 +5,11 @@ buildPythonPackage rec { pname = "py-vapid"; - version = "1.8.0"; + version = "1.8.2"; src = fetchPypi { inherit pname version; - sha256 = "9e8de790cce397d9bc567a2148c3c5d88740f668342c59aaff9ed004f716a111"; + sha256 = "874f21910f2103c56228cded941d6e733dd8f1eb12876137919533bfacb65a48"; }; propagatedBuildInputs = [ cryptography ]; diff --git a/pkgs/development/python-modules/py3status/default.nix b/pkgs/development/python-modules/py3status/default.nix index b41b7ddf320..1471d7b1733 100644 --- a/pkgs/development/python-modules/py3status/default.nix +++ b/pkgs/development/python-modules/py3status/default.nix @@ -24,11 +24,11 @@ buildPythonPackage rec { pname = "py3status"; - version = "3.35"; + version = "3.37"; src = fetchPypi { inherit pname version; - sha256 = "1508fa481a2f1b55b9a9792f0480c7f54cad107c668ffc98a7c73622676e1c23"; + sha256 = "e05fe64df57de0f86e9b1aca907cd6f080d85909085e594868af488ce3557809"; }; doCheck = false; diff --git a/pkgs/development/python-modules/pyTelegramBotAPI/default.nix b/pkgs/development/python-modules/pyTelegramBotAPI/default.nix index 76e9954a024..b7432f26b2f 100644 --- a/pkgs/development/python-modules/pyTelegramBotAPI/default.nix +++ b/pkgs/development/python-modules/pyTelegramBotAPI/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "pyTelegramBotAPI"; - version = "3.7.6"; + version = "3.7.9"; src = fetchPypi { inherit pname version; - sha256 = "859136cbd50e99922e1ea495d4ebe8235b2cb10fe419a5421f28855249db4278"; + sha256 = "7774314ff429852d423d5dfebe8fc1011dca93a028f1ccb0c56db6817245b752"; }; propagatedBuildInputs = [ requests ]; diff --git a/pkgs/development/python-modules/py_scrypt/default.nix b/pkgs/development/python-modules/py_scrypt/default.nix index b5ae4193f18..db26b16e272 100644 --- a/pkgs/development/python-modules/py_scrypt/default.nix +++ b/pkgs/development/python-modules/py_scrypt/default.nix @@ -6,11 +6,11 @@ buildPythonPackage rec { pname = "scrypt"; - version = "0.8.17"; + version = "0.8.18"; src = fetchPypi { inherit pname version; - sha256 = "25b5075f2238be93af1cd574540a5ea01b8547f9b678aa72d22fce22577475ec"; + sha256 = "bcf04257af12e6d52974d177a7b08e314b66f350a73f9b6f7b232d69a6a1e041"; }; buildInputs = [ openssl ]; diff --git a/pkgs/development/python-modules/pyamg/default.nix b/pkgs/development/python-modules/pyamg/default.nix index f229ef5839e..6ca3166fb19 100644 --- a/pkgs/development/python-modules/pyamg/default.nix +++ b/pkgs/development/python-modules/pyamg/default.nix @@ -9,11 +9,11 @@ buildPythonPackage rec { pname = "pyamg"; - version = "4.0.0"; + version = "4.1.0"; src = fetchPypi { inherit pname version; - sha256 = "3ceb38ffd86e29774e759486f2961599c8ed847459c68727493cadeaf115a38a"; + sha256 = "b4cacfcfd13379762a4551ac059a2e52a093b476ca1ad44b9202e736490a8863"; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/pyatmo/default.nix b/pkgs/development/python-modules/pyatmo/default.nix index 12449d4fa2b..8df35cb39bb 100644 --- a/pkgs/development/python-modules/pyatmo/default.nix +++ b/pkgs/development/python-modules/pyatmo/default.nix @@ -8,20 +8,21 @@ , requests_oauthlib , freezegun , pytest-asyncio +, pytest-mock , pytestCheckHook , requests-mock }: buildPythonPackage rec { pname = "pyatmo"; - version = "5.0.1"; + version = "5.1.0"; disabled = pythonOlder "3.7"; src = fetchFromGitHub { owner = "jabesq"; repo = "pyatmo"; rev = "v${version}"; - sha256 = "0can9v602iqfn0l01fd7gr63qzvcngfm0qka4s1x0pldh6avxmfh"; + sha256 = "0szk3wjcrllzvpix66iq3li54pw0c1knlx8wn1z9kqhkrb8r200x"; }; postPatch = '' @@ -40,6 +41,7 @@ buildPythonPackage rec { checkInputs = [ freezegun pytest-asyncio + pytest-mock pytestCheckHook requests-mock ]; diff --git a/pkgs/development/python-modules/pyatv/default.nix b/pkgs/development/python-modules/pyatv/default.nix index ddf2c9695a4..cf7fd53d165 100644 --- a/pkgs/development/python-modules/pyatv/default.nix +++ b/pkgs/development/python-modules/pyatv/default.nix @@ -1,15 +1,16 @@ { lib , buildPythonPackage , aiohttp -, aiozeroconf +, audio-metadata +, bitarray , cryptography , deepdiff , fetchFromGitHub +, miniaudio , netifaces , protobuf , pytest-aiohttp , pytest-asyncio -, pytest-runner , pytest-timeout , pytestCheckHook , srptools @@ -18,21 +19,26 @@ buildPythonPackage rec { pname = "pyatv"; - version = "0.7.7"; + version = "0.8.0"; src = fetchFromGitHub { owner = "postlund"; repo = pname; rev = "v${version}"; - sha256 = "sha256-dPnh8XZN7ZVR2rYNnj7GSYXW5I2GNQwD/KRDTgs2AtI="; + sha256 = "1slr6l0gw0mf1zhp40bjf5bib45arw1cy4fqkg0gvdk1hx79828m"; }; - nativeBuildInputs = [ pytest-runner]; + postPatch = '' + substituteInPlace setup.py \ + --replace "pytest-runner" "" + ''; propagatedBuildInputs = [ aiohttp - aiozeroconf + audio-metadata + bitarray cryptography + miniaudio netifaces protobuf srptools diff --git a/pkgs/development/python-modules/pybind11/default.nix b/pkgs/development/python-modules/pybind11/default.nix index 3bd88368e75..2208cca708d 100644 --- a/pkgs/development/python-modules/pybind11/default.nix +++ b/pkgs/development/python-modules/pybind11/default.nix @@ -3,12 +3,12 @@ , buildPythonPackage , fetchFromGitHub , fetchpatch -, python -, pytest , cmake +, eigen +, python , catch , numpy -, eigen +, pytest , scipy }: @@ -33,38 +33,41 @@ buildPythonPackage rec { nativeBuildInputs = [ cmake ]; - buildInputs = [ catch ]; + dontUseCmakeBuildDir = true; cmakeFlags = [ "-DEIGEN3_INCLUDE_DIR=${eigen}/include/eigen3" + "-DBUILD_TESTING=on" ] ++ lib.optionals (python.isPy3k && !stdenv.cc.isClang) [ - # Enable some tests only on Python 3. The "test_string_view" test - # 'testTypeError: string_view16_chars(): incompatible function arguments' - # fails on Python 2. - "-DPYBIND11_CPP_STANDARD=-std=c++17" + "-DPYBIND11_CXX_STANDARD=-std=c++17" ]; - dontUseSetuptoolsBuild = true; - dontUsePipInstall = true; - dontUseSetuptoolsCheck = true; + postBuild = '' + # build tests + make + ''; - preFixup = '' - pushd .. - export PYBIND11_USE_CMAKE=1 - setuptoolsBuildPhase - pipInstallPhase + postInstall = '' + make install # Symlink the CMake-installed headers to the location expected by setuptools mkdir -p $out/include/${python.libPrefix} ln -sf $out/include/pybind11 $out/include/${python.libPrefix}/pybind11 - popd ''; checkInputs = [ - pytest + catch numpy - scipy + pytest ]; + checkPhase = '' + runHook preCheck + + make check + + runHook postCheck + ''; + meta = with lib; { homepage = "https://github.com/pybind/pybind11"; description = "Seamless operability between C++11 and Python"; @@ -74,6 +77,6 @@ buildPythonPackage rec { bindings of existing C++ code. ''; license = licenses.bsd3; - maintainers = with maintainers;[ yuriaisaka ]; + maintainers = with maintainers; [ yuriaisaka dotlambda ]; }; } diff --git a/pkgs/development/python-modules/pybindgen/default.nix b/pkgs/development/python-modules/pybindgen/default.nix index 496ae04876d..18d688c3db3 100644 --- a/pkgs/development/python-modules/pybindgen/default.nix +++ b/pkgs/development/python-modules/pybindgen/default.nix @@ -1,11 +1,11 @@ { lib, fetchPypi, buildPythonPackage, isPy3k, setuptools-scm, pygccxml }: buildPythonPackage rec { pname = "PyBindGen"; - version = "0.21.0"; + version = "0.22.0"; src = fetchPypi { inherit pname version; - sha256 = "4501aa3954fdac7bb4c049894f8aa1f0f4e1c1f50cc2303feef9bbe3aecfe364"; + sha256 = "5b4837d3138ac56863d93fe462f1dac39fb87bd50898e0da4c57fefd645437ac"; }; buildInputs = [ setuptools-scm ]; diff --git a/pkgs/development/python-modules/pybullet/default.nix b/pkgs/development/python-modules/pybullet/default.nix index 195167b2437..f2afba4d2d5 100644 --- a/pkgs/development/python-modules/pybullet/default.nix +++ b/pkgs/development/python-modules/pybullet/default.nix @@ -8,11 +8,11 @@ buildPythonPackage rec { pname = "pybullet"; - version = "3.1.0"; + version = "3.1.7"; src = fetchPypi { inherit pname version; - sha256 = "ced62167216c75b58d5550adc74a0d328a166ded8b37b52ce90bc9736f597187"; + sha256 = "c343b90c4f3d529a0fbee8bec2b3e35d444f32e92d5ce974fe590544360fe310"; }; buildInputs = [ diff --git a/pkgs/development/python-modules/pycairo/default.nix b/pkgs/development/python-modules/pycairo/default.nix index c8df65c2b7e..587013e30f8 100644 --- a/pkgs/development/python-modules/pycairo/default.nix +++ b/pkgs/development/python-modules/pycairo/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { pname = "pycairo"; - version = "1.20.0"; + version = "1.20.1"; disabled = pythonOlder "3.6"; @@ -22,7 +22,7 @@ buildPythonPackage rec { owner = "pygobject"; repo = "pycairo"; rev = "v${version}"; - sha256 = "0ifw4wjbml512w9kqj80y9gfqa7fkgfa1zkvi478k5krghjgk3lr"; + sha256 = "09aisph7ycgb4xi2xglvrn59i3cyqms8jbb876cl9763g7yqbcr6"; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/pychromecast/default.nix b/pkgs/development/python-modules/pychromecast/default.nix index cc68d83d02b..6c97b3e3f44 100644 --- a/pkgs/development/python-modules/pychromecast/default.nix +++ b/pkgs/development/python-modules/pychromecast/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "PyChromecast"; - version = "9.1.2"; + version = "9.2.0"; src = fetchPypi { inherit pname version; - sha256 = "sha256-kHZWzqRtOdDpPsgVl5V470+29lX9i/TojmQh/NeCToU="; + sha256 = "6d34593575cf77565df47af4c75dd47c6a65831ec18a8c10b5367b2f1c172f0a"; }; disabled = !isPy3k; diff --git a/pkgs/development/python-modules/pycoin/default.nix b/pkgs/development/python-modules/pycoin/default.nix index d42cfcadfee..eb57096b981 100644 --- a/pkgs/development/python-modules/pycoin/default.nix +++ b/pkgs/development/python-modules/pycoin/default.nix @@ -8,11 +8,11 @@ buildPythonPackage rec { pname = "pycoin"; - version = "0.90.20201031"; + version = "0.91.20210515"; src = fetchPypi { inherit pname version; - sha256 = "65c19204cb7aece4aae30c44b5e08beecb9c118370a9f9994d6cddaee17c351d"; + sha256 = "d2231a8d11b2524c26472d08cf1b76569849ab44507495d0510165ae0af4858e"; }; propagatedBuildInputs = [ setuptools ]; diff --git a/pkgs/development/python-modules/pydantic/default.nix b/pkgs/development/python-modules/pydantic/default.nix index 11879159b4f..69a080c1d71 100644 --- a/pkgs/development/python-modules/pydantic/default.nix +++ b/pkgs/development/python-modules/pydantic/default.nix @@ -12,14 +12,14 @@ buildPythonPackage rec { pname = "pydantic"; - version = "1.8.1"; + version = "1.8.2"; disabled = pythonOlder "3.7"; src = fetchFromGitHub { owner = "samuelcolvin"; repo = pname; rev = "v${version}"; - sha256 = "1zvcmx3927fgx37gdhi8g8igvrkri1v78rn3118p4wssqhgfwa6n"; + sha256 = "06162dss6mvi7wiy2lzxwvzajwxgy8b2fyym7qipaj7zibcqalq2"; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/pydsdl/default.nix b/pkgs/development/python-modules/pydsdl/default.nix index 08029d35df5..b1c6fab9f8a 100644 --- a/pkgs/development/python-modules/pydsdl/default.nix +++ b/pkgs/development/python-modules/pydsdl/default.nix @@ -2,14 +2,14 @@ buildPythonPackage rec { pname = "pydsdl"; - version = "1.9.4"; + version = "1.12.1"; disabled = pythonOlder "3.5"; # only python>=3.5 is supported src = fetchFromGitHub { owner = "UAVCAN"; repo = pname; rev = version; - sha256 = "1hmmc4sg6dckbx2ghcjpi74yprapa6lkxxzy0h446mvyngp0kwfv"; + sha256 = "sha256-5AwwqduIvLSZk6WcI59frwRKwjniQXfNWWVsy6V6I1E="; }; # allow for writable directory for darwin diff --git a/pkgs/development/python-modules/pyfakefs/default.nix b/pkgs/development/python-modules/pyfakefs/default.nix index cc7031db54a..ab4c2f36076 100644 --- a/pkgs/development/python-modules/pyfakefs/default.nix +++ b/pkgs/development/python-modules/pyfakefs/default.nix @@ -7,13 +7,13 @@ }: buildPythonPackage rec { - version = "4.4.0"; + version = "4.5.0"; pname = "pyfakefs"; disabled = pythonOlder "3.5"; src = fetchPypi { inherit pname version; - sha256 = "082d863e0e2a74351f697da404e329a91e18e5055942e59d1b836e8459b2c94c"; + sha256 = "58b017b3437bbe97803a23755876c6d6aeb5aea37e52cec15e5d86b59c4c7295"; }; postPatch = '' diff --git a/pkgs/development/python-modules/pyfma/default.nix b/pkgs/development/python-modules/pyfma/default.nix index 405098113ac..d53c62e2f3a 100644 --- a/pkgs/development/python-modules/pyfma/default.nix +++ b/pkgs/development/python-modules/pyfma/default.nix @@ -10,13 +10,13 @@ buildPythonPackage rec { pname = "pyfma"; - version = "0.1.2"; + version = "0.1.4"; disabled = isPy27; src = fetchPypi { inherit pname version; - sha256 = "3a9e2503fd01baa4978af5f491b79b7646d7872df9ecc7ab63ba10c250c50d8a"; + sha256 = "5bc6bf57d960a5232b7a56bd38e9fe3dce0911016746029931044b66bdec46e9"; }; buildInputs = [ diff --git a/pkgs/development/python-modules/pygccxml/default.nix b/pkgs/development/python-modules/pygccxml/default.nix index 7d7bc459b62..f07340ce2fb 100644 --- a/pkgs/development/python-modules/pygccxml/default.nix +++ b/pkgs/development/python-modules/pygccxml/default.nix @@ -2,13 +2,13 @@ llvmPackages }: buildPythonPackage rec { pname = "pygccxml"; - version = "2.1.0"; + version = "2.2.1"; src = fetchFromGitHub { owner = "gccxml"; repo = "pygccxml"; rev = "v${version}"; - sha256 = "1vsxnfzz6qhiv8ac98qgk6w3s4j1jp661qy48gc9plcg2r952453"; + sha256 = "1msqpg3dqn7wjlf91ddljxzz01a3b1p2sy91n36lrsy87lz499gh"; }; buildInputs = [ castxml llvmPackages.libcxxStdenv]; diff --git a/pkgs/development/python-modules/pygit2/default.nix b/pkgs/development/python-modules/pygit2/default.nix index 46117d13f41..4d9538dbc34 100644 --- a/pkgs/development/python-modules/pygit2/default.nix +++ b/pkgs/development/python-modules/pygit2/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "pygit2"; - version = "1.5.0"; + version = "1.6.0"; src = fetchPypi { inherit pname version; - sha256 = "9711367bd05f96ad6fc9c91d88fa96126ba2d1f1c3ea6f23c11402c243d66a20"; + sha256 = "7aacea4e57011777f4774421228e5d0ddb9a6ddb87ac4b542346d17ab12a4d62"; }; preConfigure = lib.optionalString stdenv.isDarwin '' diff --git a/pkgs/development/python-modules/pyhiveapi/default.nix b/pkgs/development/python-modules/pyhiveapi/default.nix index 96b361d0271..f62d8bd1305 100644 --- a/pkgs/development/python-modules/pyhiveapi/default.nix +++ b/pkgs/development/python-modules/pyhiveapi/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { pname = "pyhiveapi"; - version = "0.4.2"; + version = "0.4.3"; format = "pyproject"; @@ -23,7 +23,7 @@ buildPythonPackage rec { owner = "Pyhass"; repo = "Pyhiveapi"; rev = "v${version}"; - sha256 = "0x9cfxfdpccz360azpyfhvn09xxkw7vxy42npgbqhpy2g6mh5sif"; + sha256 = "sha256-SCMASYBOdq9nko5RSQ5BEbRLjOB4FlgwOKwdDggiOv8="; }; postPatch = '' diff --git a/pkgs/development/python-modules/pyicu/default.nix b/pkgs/development/python-modules/pyicu/default.nix index 1b01f1904e0..45a24851150 100644 --- a/pkgs/development/python-modules/pyicu/default.nix +++ b/pkgs/development/python-modules/pyicu/default.nix @@ -8,11 +8,11 @@ buildPythonPackage rec { pname = "PyICU"; - version = "2.7.3"; + version = "2.7.4"; src = fetchPypi { inherit pname version; - sha256 = "1jv1pds94agvn3zs33a8p8f0mk7f5pjwmczmg1s05ri5p0kzk4h8"; + sha256 = "c0655302e2aea16f9acefe04152f74e5d7d70542e9e15c89ee8d763c8e097f56"; }; nativeBuildInputs = [ icu68 ]; # for icu-config, but should be replaced with pkg-config diff --git a/pkgs/development/python-modules/pykrakenapi/default.nix b/pkgs/development/python-modules/pykrakenapi/default.nix new file mode 100644 index 00000000000..e3620e7de6a --- /dev/null +++ b/pkgs/development/python-modules/pykrakenapi/default.nix @@ -0,0 +1,36 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, krakenex +, pandas +, pytestCheckHook +}: + +buildPythonPackage rec { + pname = "pykrakenapi"; + version = "0.2.1"; + + src = fetchFromGitHub { + owner = "dominiktraxl"; + repo = "pykrakenapi"; + rev = "v${version}"; + sha256 = "0byqa4qk6a8ww1y822izpcfscv4frcfjysw6lx1pqyqjr23bfnbh"; + }; + + propagatedBuildInputs = [ + krakenex + pandas + ]; + + # tests require network connection + doCheck = false; + + pythonImportsCheck = [ "pykrakenapi" ]; + + meta = with lib; { + description = "Python implementation of the Kraken API"; + homepage = "https://github.com/dominiktraxl/pykrakenapi"; + license = licenses.lgpl3Plus; + maintainers = with maintainers; [ dotlambda ]; + }; +} diff --git a/pkgs/development/python-modules/pyls-spyder/default.nix b/pkgs/development/python-modules/pyls-spyder/default.nix index aa83253ed2d..4e0029783eb 100644 --- a/pkgs/development/python-modules/pyls-spyder/default.nix +++ b/pkgs/development/python-modules/pyls-spyder/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "pyls-spyder"; - version = "0.3.2"; + version = "0.4.0"; src = fetchPypi { inherit pname version; - sha256 = "f2be1b05f2c7a72565b28de7289d2c2b16052b88e46914279a2d631e074ed158"; + sha256 = "45a321c83f64267d82907492c55199fccabda45bc872dd23bf1efd08edac1b0b"; }; propagatedBuildInputs = [ python-language-server ]; diff --git a/pkgs/development/python-modules/pymatgen/default.nix b/pkgs/development/python-modules/pymatgen/default.nix index f6f2ebe6210..d75af9158c6 100644 --- a/pkgs/development/python-modules/pymatgen/default.nix +++ b/pkgs/development/python-modules/pymatgen/default.nix @@ -21,11 +21,11 @@ buildPythonPackage rec { pname = "pymatgen"; - version = "2022.0.5"; + version = "2022.0.8"; src = fetchPypi { inherit pname version; - sha256 = "69c370ebd2ff9aceb15bb6efd364473609ffb23d2b2f02a3eb64fd537df69de0"; + sha256 = "4f12ac87657e8efe833087c575ec4430900dfcece890bb0486e07f034a2b34a0"; }; nativeBuildInputs = [ glibcLocales ]; diff --git a/pkgs/development/python-modules/pymediainfo/default.nix b/pkgs/development/python-modules/pymediainfo/default.nix index ac054bef956..50ea8c5cef0 100644 --- a/pkgs/development/python-modules/pymediainfo/default.nix +++ b/pkgs/development/python-modules/pymediainfo/default.nix @@ -5,11 +5,11 @@ buildPythonPackage rec { pname = "pymediainfo"; - version = "5.0.3"; + version = "5.1.0"; src = fetchPypi { inherit pname version; - sha256 = "ea61a3b0e0ed6de42ebb2233cf1a9312c57dce95101c025f9f081c10ecec48fb"; + sha256 = "d996c69d50081a24d6dca9679abf43ffd2be368b065f953c2c9082e5d649c734"; }; postPatch = '' diff --git a/pkgs/development/python-modules/pymemcache/default.nix b/pkgs/development/python-modules/pymemcache/default.nix index d0089e8edbe..ab01259a77f 100644 --- a/pkgs/development/python-modules/pymemcache/default.nix +++ b/pkgs/development/python-modules/pymemcache/default.nix @@ -8,13 +8,13 @@ buildPythonPackage rec { pname = "pymemcache"; - version = "3.4.0"; + version = "3.4.4"; src = fetchFromGitHub { owner = "pinterest"; repo = pname; rev = "v${version}"; - sha256 = "0xkw76y4059jg2a902wlpk6psyh2g4x6j6vlj9gzd5vqb7ihg2y7"; + sha256 = "1ajlhirxhd4pbzgd84k44znjazjbnbdfm3sk64avs0vgcgclq2n7"; }; checkInputs = [ diff --git a/pkgs/development/python-modules/pymongo/default.nix b/pkgs/development/python-modules/pymongo/default.nix index c5cfa004996..b81edaac668 100644 --- a/pkgs/development/python-modules/pymongo/default.nix +++ b/pkgs/development/python-modules/pymongo/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "pymongo"; - version = "3.11.3"; + version = "3.11.4"; src = fetchPypi { inherit pname version; - sha256 = "db5098587f58fbf8582d9bda2462762b367207246d3e19623782fb449c3c5fcc"; + sha256 = "539d4cb1b16b57026999c53e5aab857fe706e70ae5310cc8c232479923f932e6"; }; # Tests call a running mongodb instance diff --git a/pkgs/development/python-modules/pynetdicom/default.nix b/pkgs/development/python-modules/pynetdicom/default.nix index 278508fa37f..bd27ff7fde6 100644 --- a/pkgs/development/python-modules/pynetdicom/default.nix +++ b/pkgs/development/python-modules/pynetdicom/default.nix @@ -10,13 +10,13 @@ buildPythonPackage rec { pname = "pynetdicom"; - version = "1.5.6"; + version = "1.5.7"; src = fetchFromGitHub { owner = "pydicom"; repo = pname; rev = "v${version}"; - sha256 = "09v0bp9zgwbs4zwcncvfccrna5rnihkhs3l4qy0f1lq8gnzjg365"; + sha256 = "0wr6nh0xrhzwf05gnf3dwg5r3lhn9nfwch3l16zkbj6fli871brc"; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/pyobjc/default.nix b/pkgs/development/python-modules/pyobjc/default.nix index cd100d005db..6aa0d733049 100644 --- a/pkgs/development/python-modules/pyobjc/default.nix +++ b/pkgs/development/python-modules/pyobjc/default.nix @@ -2,7 +2,7 @@ buildPythonPackage rec { pname = "pyobjc"; - version = "7.1"; + version = "7.3"; # Gives "No matching distribution found for # pyobjc-framework-Collaboration==4.0b1 (from pyobjc==4.0b1)" @@ -10,7 +10,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "1dfce78545df1af25d1dcd710309dd243083d90c977a8c84c483f8254967417b"; + sha256 = "322b07420f91b2dd7f624823e53046b922cab4aad28baab01a62463728b7e0c5"; }; meta = with lib; { diff --git a/pkgs/development/python-modules/pyopencl/default.nix b/pkgs/development/python-modules/pyopencl/default.nix index d983e2bc14c..7650ba22b0a 100644 --- a/pkgs/development/python-modules/pyopencl/default.nix +++ b/pkgs/development/python-modules/pyopencl/default.nix @@ -21,7 +21,7 @@ let if stdenv.isDarwin then [ mesa_drivers.dev ] else [ ocl-icd ]; in buildPythonPackage rec { pname = "pyopencl"; - version = "2021.1.4"; + version = "2021.2.2"; checkInputs = [ pytest ]; buildInputs = [ opencl-headers pybind11 ] ++ os-specific-buildInputs; @@ -30,7 +30,7 @@ in buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "6a9665e89c15e1c684789263bd3a632567e7c7bd25a657092df4b185b3468971"; + sha256 = "50876f16624bc623fa2eff98a91259761b51471e186f535d4d4e7bce58292f0c"; }; # py.test is not needed during runtime, so remove it from `install_requires` diff --git a/pkgs/development/python-modules/pyprind/default.nix b/pkgs/development/python-modules/pyprind/default.nix index 9c13a953570..082ebb2a49b 100644 --- a/pkgs/development/python-modules/pyprind/default.nix +++ b/pkgs/development/python-modules/pyprind/default.nix @@ -4,11 +4,11 @@ buildPythonPackage rec { pname = "PyPrind"; - version = "2.11.2"; + version = "2.11.3"; src = fetchPypi { inherit pname version; - sha256 = "0xg6m5hr33h9bdlrr42kc58jm2m87a9zsagy7n2m4n407d2snv64"; + sha256 = "e37dcab6e1a9c8e0a7f0fce65fde7a79e2deda1c75aa015910a49e2137b54cbf"; }; buildInputs = [ psutil ]; diff --git a/pkgs/development/python-modules/pyqtgraph/default.nix b/pkgs/development/python-modules/pyqtgraph/default.nix index fbc4853ab61..fd2b9d46185 100644 --- a/pkgs/development/python-modules/pyqtgraph/default.nix +++ b/pkgs/development/python-modules/pyqtgraph/default.nix @@ -9,11 +9,11 @@ buildPythonPackage rec { pname = "pyqtgraph"; - version = "0.11.1"; + version = "0.12.1"; src = fetchPypi { inherit pname version; - sha256 = "7d1417f36b5b92d1365671633a91711513e5afbcc82f32475d0690317607714e"; + sha256 = "d2ef3b5289184fb48dfe5f44ccb58d9d64ffb5452fc524a2bd7a640a36b3874d"; }; propagatedBuildInputs = [ numpy pyopengl pyqt5 scipy ]; diff --git a/pkgs/development/python-modules/pyramid/default.nix b/pkgs/development/python-modules/pyramid/default.nix index a26eff37ef2..95333f746d0 100644 --- a/pkgs/development/python-modules/pyramid/default.nix +++ b/pkgs/development/python-modules/pyramid/default.nix @@ -18,11 +18,11 @@ buildPythonPackage rec { pname = "pyramid"; - version = "1.10.5"; + version = "1.10.8"; src = fetchPypi { inherit pname version; - sha256 = "fe1bd1140e6b79fe07f0053981d49be2dc66656cc8b481dd7ffcaa872fc25467"; + sha256 = "b7cd66595bef92f81764b976ddde2b2fa8e4f5f325e02f65f6ec7f3708b29cf6"; }; checkInputs = [ webtest zope_component ]; diff --git a/pkgs/development/python-modules/pyroute2-core/default.nix b/pkgs/development/python-modules/pyroute2-core/default.nix index 4ee37e4bfed..b6143713471 100644 --- a/pkgs/development/python-modules/pyroute2-core/default.nix +++ b/pkgs/development/python-modules/pyroute2-core/default.nix @@ -6,12 +6,12 @@ buildPythonPackage rec { pname = "pyroute2-core"; - version = "0.6.1"; + version = "0.6.4"; src = fetchPypi { pname = "pyroute2.core"; inherit version; - sha256 = "04v10rzz844w2wfpy4pkh8fxn6dminjmfm1q7ngg5wvpk5r691rj"; + sha256 = "1kd5wda7nqcmrwy6b42nqgz570y99yjw3m6a1kxr8ag3859fwga5"; }; # pyroute2 sub-modules have no tests diff --git a/pkgs/development/python-modules/pyroute2-ethtool/default.nix b/pkgs/development/python-modules/pyroute2-ethtool/default.nix index 4e671b4e193..812b71ef756 100644 --- a/pkgs/development/python-modules/pyroute2-ethtool/default.nix +++ b/pkgs/development/python-modules/pyroute2-ethtool/default.nix @@ -6,12 +6,12 @@ buildPythonPackage rec { pname = "pyroute2-ethtool"; - version = "0.6.1"; + version = "0.6.4"; src = fetchPypi { pname = "pyroute2.ethtool"; inherit version; - sha256 = "1gd2vvdkjf6ppiql3znrlzc9xg8c4gsyg2jfm76c2xf329hi66n7"; + sha256 = "04wxx2nn3rdsjcmck7fidzfdc42gpsjva2jc8p7a987b0j58r17s"; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/pyroute2-ipdb/default.nix b/pkgs/development/python-modules/pyroute2-ipdb/default.nix index 733988f20f5..0e9c457698b 100644 --- a/pkgs/development/python-modules/pyroute2-ipdb/default.nix +++ b/pkgs/development/python-modules/pyroute2-ipdb/default.nix @@ -6,12 +6,12 @@ buildPythonPackage rec { pname = "pyroute2-ipdb"; - version = "0.6.1"; + version = "0.6.4"; src = fetchPypi { pname = "pyroute2.ipdb"; inherit version; - sha256 = "0wnzvy72pjipsdcfnwxpqp0jimg2l3w6gwd3r4b3mhvhackgsvs6"; + sha256 = "0r4xq7h39qac309lpl7haaa4rqf6qzsypkgnsiran3w9jgr1hg75"; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/pyroute2-ipset/default.nix b/pkgs/development/python-modules/pyroute2-ipset/default.nix index 5ea6c7ce5d4..34a99898e74 100644 --- a/pkgs/development/python-modules/pyroute2-ipset/default.nix +++ b/pkgs/development/python-modules/pyroute2-ipset/default.nix @@ -6,12 +6,12 @@ buildPythonPackage rec { pname = "pyroute2-ipset"; - version = "0.6.1"; + version = "0.6.4"; src = fetchPypi { pname = "pyroute2.ipset"; inherit version; - sha256 = "1d5l9f028y7fjfbxpp5wls9ffdgrln24dlz8k4p11b5n445liakx"; + sha256 = "sha256-V6aUGYv4PGhxHoEjgNuqoRbd6ftqirO/ofNDQEACTy8="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/pyroute2-ndb/default.nix b/pkgs/development/python-modules/pyroute2-ndb/default.nix index 7b34b3d341a..4dcb6544074 100644 --- a/pkgs/development/python-modules/pyroute2-ndb/default.nix +++ b/pkgs/development/python-modules/pyroute2-ndb/default.nix @@ -6,12 +6,12 @@ buildPythonPackage rec { pname = "pyroute2-ndb"; - version = "0.6.1"; + version = "0.6.4"; src = fetchPypi { pname = "pyroute2.ndb"; inherit version; - sha256 = "0lzvh0vva8i86h00add0b45s4f5dn6zbgysfvmzrxxasvda7fhlj"; + sha256 = "0q3py2n6w7nhdxi4l6vx8xpxh5if6hav4lcl5nwk8c4pgcrfd4vn"; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/pyroute2-nftables/default.nix b/pkgs/development/python-modules/pyroute2-nftables/default.nix index 594d57cba1b..9554dd8cbe3 100644 --- a/pkgs/development/python-modules/pyroute2-nftables/default.nix +++ b/pkgs/development/python-modules/pyroute2-nftables/default.nix @@ -6,12 +6,12 @@ buildPythonPackage rec { pname = "pyroute2-nftables"; - version = "0.6.1"; + version = "0.6.4"; src = fetchPypi { pname = "pyroute2.nftables"; inherit version; - sha256 = "0g93jsjf77sxjxmgmd8pzy8daxnqnzp2fk9gbh9kxk1n1958p100"; + sha256 = "0mj897h86ifk4ncms71nz6qrrfzfq8hd81198vf1hm41wppgyxn1"; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/pyroute2-nslink/default.nix b/pkgs/development/python-modules/pyroute2-nslink/default.nix index e1076c1d0a0..e5b6fae9024 100644 --- a/pkgs/development/python-modules/pyroute2-nslink/default.nix +++ b/pkgs/development/python-modules/pyroute2-nslink/default.nix @@ -6,12 +6,12 @@ buildPythonPackage rec { pname = "pyroute2-nslink"; - version = "0.6.1"; + version = "0.6.4"; src = fetchPypi { pname = "pyroute2.nslink"; inherit version; - sha256 = "0hjdi863imppirjrwr87xk2mfbw2djcsh7x94cq4xwps7bxmmkwk"; + sha256 = "0iz4vrv05x678ihhl2wdppxda82fxrq3d3sh7mka0pyb66a8mrik"; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/pyroute2-protocols/default.nix b/pkgs/development/python-modules/pyroute2-protocols/default.nix index 389ca2ab44d..bce291494a2 100644 --- a/pkgs/development/python-modules/pyroute2-protocols/default.nix +++ b/pkgs/development/python-modules/pyroute2-protocols/default.nix @@ -6,12 +6,12 @@ buildPythonPackage rec { pname = "pyroute2-protocols"; - version = "0.6.1"; + version = "0.6.4"; src = fetchPypi { pname = "pyroute2.protocols"; inherit version; - sha256 = "16c22ygyxdn1mhnd2f34q9b2mqa27klk6di91w27ycb3aczmadlm"; + sha256 = "0gb5r1msd14fhalfknhmg67l2hm802r4771i1srgl4rix1sk0yw8"; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/pyroute2/default.nix b/pkgs/development/python-modules/pyroute2/default.nix index f18bc12caa6..b4e035e89cc 100644 --- a/pkgs/development/python-modules/pyroute2/default.nix +++ b/pkgs/development/python-modules/pyroute2/default.nix @@ -13,11 +13,11 @@ buildPythonPackage rec { pname = "pyroute2"; - version = "0.6.1"; + version = "0.6.4"; src = fetchPypi { inherit pname version; - sha256 = "sha256-nvG1PcuyQoZPrfMS4atsXsvpInjYt1bUIeX6Ol5DsO8="; + sha256 = "560b48a751b1150056ba553c89a31d563cc18ae2675b3793666adcaeb4fabfda"; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/pysaml2/default.nix b/pkgs/development/python-modules/pysaml2/default.nix index 1bb096dc0c7..30fcfc52cba 100644 --- a/pkgs/development/python-modules/pysaml2/default.nix +++ b/pkgs/development/python-modules/pysaml2/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { pname = "pysaml2"; - version = "6.5.1"; + version = "6.5.2"; disabled = !isPy3k; @@ -19,7 +19,7 @@ buildPythonPackage rec { owner = "IdentityPython"; repo = pname; rev = "v${version}"; - sha256 = "1gh74csjk6af23agyigk4id79s4li1xnkmbpp73aqyvlly2kd0b7"; + sha256 = "1p0i88v2ng9fzs0fzjam1dc1idnihqc1wgagvnavqjrih721qcpi"; }; patches = [ diff --git a/pkgs/development/python-modules/pyscard/default.nix b/pkgs/development/python-modules/pyscard/default.nix index 28c40e5ec5f..fd31b15fdc7 100644 --- a/pkgs/development/python-modules/pyscard/default.nix +++ b/pkgs/development/python-modules/pyscard/default.nix @@ -6,12 +6,12 @@ let in buildPythonPackage rec { - version = "2.0.0"; + version = "2.0.1"; pname = "pyscard"; src = fetchPypi { inherit pname version; - sha256 = "0yap0p8mp6dx58n3nina6ryhc2cysaj75sq98wf3qybf33cxjr5k"; + sha256 = "2ba5ed0db0ed3c98e95f9e34016aa3a57de1bc42dd9030b77a546036ee7e46d8"; }; postPatch = if withApplePCSC then '' diff --git a/pkgs/development/python-modules/pysiaalarm/default.nix b/pkgs/development/python-modules/pysiaalarm/default.nix new file mode 100644 index 00000000000..206d24a40dc --- /dev/null +++ b/pkgs/development/python-modules/pysiaalarm/default.nix @@ -0,0 +1,54 @@ +{ lib +, buildPythonPackage +, pythonOlder +, fetchPypi +, dataclasses-json +, pycryptodome +, setuptools +, pytest-asyncio +, pytest-cases +, pytestCheckHook +}: + +buildPythonPackage rec { + pname = "pysiaalarm"; + version = "3.0.0"; + + disabled = pythonOlder "3.8"; + + src = fetchPypi { + inherit pname version; + sha256 = "b1c3a3d48d399bc91014167f59b23af601044d182db9267c23a9cf3559922122"; + }; + + postPatch = '' + substituteInPlace setup.cfg \ + --replace "==" ">=" + substituteInPlace pytest.ini \ + --replace "--cov pysiaalarm --cov-report term-missing" "" + ''; + + propagatedBuildInputs = [ + dataclasses-json + pycryptodome + setuptools + ]; + + checkInputs = [ + pytest-asyncio + pytest-cases + pytestCheckHook + ]; + + pythonImportsCheck = [ + "pysiaalarm" + "pysiaalarm.aio" + ]; + + meta = with lib; { + description = "Python package for creating a client that talks with SIA-based alarm systems"; + homepage = "https://github.com/eavanvalkenburg/pysiaalarm"; + license = licenses.mit; + maintainers = with maintainers; [ dotlambda ]; + }; +} diff --git a/pkgs/development/python-modules/pysigset/default.nix b/pkgs/development/python-modules/pysigset/default.nix index ccacb412924..43c8e81f5aa 100644 --- a/pkgs/development/python-modules/pysigset/default.nix +++ b/pkgs/development/python-modules/pysigset/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "pysigset"; - version = "0.3.2"; + version = "0.4.0"; src = fetchPypi { inherit pname version; - sha256 = "0ym44z3nwp8chfi7snmknkqnl2q9bghzv9p923r8w748i5hvyxx8"; + sha256 = "13ef98b058489ff572b6667c38970a544699895c0844cb3ac2494e3a59ac51e6"; }; meta = with lib; { diff --git a/pkgs/development/python-modules/pysma/default.nix b/pkgs/development/python-modules/pysma/default.nix index 55b6b727845..8a6452fb668 100644 --- a/pkgs/development/python-modules/pysma/default.nix +++ b/pkgs/development/python-modules/pysma/default.nix @@ -9,11 +9,11 @@ buildPythonPackage rec { pname = "pysma"; - version = "0.4.3"; + version = "0.6.0"; src = fetchPypi { inherit pname version; - sha256 = "sha256-vriMnJFS7yfTyDT1f4sx1xEBTQjqc4ZHmkdHp1vcd+Q="; + sha256 = "8e997cf28c3ae7ccc90caa84aa3a3ed9245fac3e9cf76efb1467e4f4800143dc"; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/pysmb/default.nix b/pkgs/development/python-modules/pysmb/default.nix index 1382dc7efff..ba4d7df48a0 100644 --- a/pkgs/development/python-modules/pysmb/default.nix +++ b/pkgs/development/python-modules/pysmb/default.nix @@ -8,13 +8,13 @@ buildPythonPackage rec { pname = "pysmb"; - version = "1.2.6"; + version = "1.2.7"; src = fetchPypi { inherit pname version; format = "setuptools"; extension = "zip"; - sha256 = "f16e5e796b9dcc1d17ee76f87d53dd471f205fa19b4045eeda5bc7558a57d579"; + sha256 = "298605b8f467ce15b412caaf9af331c135e88fa2172333af14b1b2916361cb6b"; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/pyspark/default.nix b/pkgs/development/python-modules/pyspark/default.nix index 064a8db88e2..625041fd81b 100644 --- a/pkgs/development/python-modules/pyspark/default.nix +++ b/pkgs/development/python-modules/pyspark/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "pyspark"; - version = "3.1.1"; + version = "3.1.2"; src = fetchPypi { inherit pname version; - sha256 = "104abc146d4ffb72d4c683d25d7af5a6bf955d94590a76f542ee23185670aa7e"; + sha256 = "5e25ebb18756e9715f4d26848cc7e558035025da74b4fc325a0ebc05ff538e65"; }; # pypandoc is broken with pandoc2, so we just lose docs. diff --git a/pkgs/development/python-modules/pyspice/default.nix b/pkgs/development/python-modules/pyspice/default.nix index 53fb7e6d248..0119c38099c 100644 --- a/pkgs/development/python-modules/pyspice/default.nix +++ b/pkgs/development/python-modules/pyspice/default.nix @@ -15,12 +15,12 @@ buildPythonPackage rec { pname = "PySpice"; - version = "1.4.3"; + version = "1.5"; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - sha256 = "0mnyy8nr06d1al99kniyqcm0p9a8dvkg719s42sajl8yf51sayc9"; + sha256 = "d28448accad98959e0f5932af8736e90a1f3f9ff965121c6881d24cdfca23d22"; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/pysqlcipher3/default.nix b/pkgs/development/python-modules/pysqlcipher3/default.nix index ab3f949cf1e..9c98664af1c 100644 --- a/pkgs/development/python-modules/pysqlcipher3/default.nix +++ b/pkgs/development/python-modules/pysqlcipher3/default.nix @@ -2,13 +2,13 @@ buildPythonPackage rec { pname = "pysqlcipher3"; - version = "1.0.3"; + version = "1.0.4"; disabled = pythonAtLeast "3.9"; src = fetchPypi { inherit pname version; - sha256 = "0c54m18h52llwkfc9zaag3qkmfzzp5a1w9jzsm5hd2nfdsxmnkk9"; + sha256 = "75d6b9d023d7ab76c841f97fd9d108d87516e281268e61518411d08cb7062663"; }; buildInputs = [ sqlcipher ]; diff --git a/pkgs/development/python-modules/pytest-ansible/default.nix b/pkgs/development/python-modules/pytest-ansible/default.nix index 10b9b0ec482..8285996170a 100644 --- a/pkgs/development/python-modules/pytest-ansible/default.nix +++ b/pkgs/development/python-modules/pytest-ansible/default.nix @@ -8,13 +8,13 @@ buildPythonPackage rec { pname = "pytest-ansible"; - version = "2.2.3"; + version = "2.2.4"; src = fetchFromGitHub { owner = "ansible"; repo = "pytest-ansible"; rev = "v${version}"; - sha256 = "0vh2f34qxs8qfv15hf1q7li2iqjiydjsb4c86i2ma1b7vhi73j57"; + sha256 = "0vr015msciwzz20zplxalfmfx5hbg8rkf8vwjdg3z12fba8z8ks4"; }; patchPhase = '' diff --git a/pkgs/development/python-modules/pytest-asyncio/default.nix b/pkgs/development/python-modules/pytest-asyncio/default.nix index 0f37d09a9e0..3ec6392f884 100644 --- a/pkgs/development/python-modules/pytest-asyncio/default.nix +++ b/pkgs/development/python-modules/pytest-asyncio/default.nix @@ -1,13 +1,13 @@ { lib, buildPythonPackage, fetchPypi, pytest, isPy3k, isPy35, async_generator }: buildPythonPackage rec { pname = "pytest-asyncio"; - version = "0.14.0"; + version = "0.15.1"; disabled = !isPy3k; src = fetchPypi { inherit pname version; - sha256 = "9882c0c6b24429449f5f969a5158b528f39bde47dc32e85b9f0403965017e700"; + sha256 = "2564ceb9612bbd560d19ca4b41347b54e7835c2f792c504f698e05395ed63f6f"; }; buildInputs = [ pytest ] diff --git a/pkgs/development/python-modules/pytest-cases/default.nix b/pkgs/development/python-modules/pytest-cases/default.nix index 2914b3cf9aa..018ca0c46de 100644 --- a/pkgs/development/python-modules/pytest-cases/default.nix +++ b/pkgs/development/python-modules/pytest-cases/default.nix @@ -10,12 +10,12 @@ buildPythonPackage rec { pname = "pytest-cases"; - version = "3.4.6"; + version = "3.6.1"; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - sha256 = "17w4s6622i97q81g15zamqm536ib00grgdfk2f4kk9bw2k7sdlq6"; + sha256 = "2009845554d3169dca99a7397d9904e5dbb58726c7417e8c308dda86f8966311"; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/pytest-celery/default.nix b/pkgs/development/python-modules/pytest-celery/default.nix index 4b3999ec86b..77de2d9698b 100644 --- a/pkgs/development/python-modules/pytest-celery/default.nix +++ b/pkgs/development/python-modules/pytest-celery/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "pytest-celery"; - version = "0.0.0a1"; + version = "0.0.0"; src = fetchPypi { inherit pname version; - sha256 = "0qifwi7q8dfwbzz2vm5m40lw23qh2fzibngbmw6qgwnkq8bhh3iy"; + sha256 = "cfd060fc32676afa1e4f51b2938f903f7f75d952186b8c6cf631628c4088f406"; }; patches = [ ./no-celery.patch ]; diff --git a/pkgs/development/python-modules/pytest-cov/default.nix b/pkgs/development/python-modules/pytest-cov/default.nix index a41c26b753b..87f5972a747 100644 --- a/pkgs/development/python-modules/pytest-cov/default.nix +++ b/pkgs/development/python-modules/pytest-cov/default.nix @@ -1,17 +1,23 @@ -{ lib, buildPythonPackage, fetchPypi -, pytest, coverage }: +{ lib +, buildPythonPackage +, fetchPypi +, pytest +, coverage +, toml +}: buildPythonPackage rec { pname = "pytest-cov"; - version = "2.11.1"; + version = "2.12.1"; src = fetchPypi { inherit pname version; - sha256 = "359952d9d39b9f822d9d29324483e7ba04a3a17dd7d05aa6beb7ea01e359e5f7"; + sha256 = "1mzl06m8qcgsac1r2krixrkqdwq0nqk8asrpkcj2ddr7qawfw716"; }; buildInputs = [ pytest ]; - propagatedBuildInputs = [ coverage ]; + + propagatedBuildInputs = [ coverage toml ]; # xdist related tests fail with the following error # OSError: [Errno 13] Permission denied: 'py/_code' @@ -22,6 +28,8 @@ buildPythonPackage rec { py.test tests ''; + pythonImportsCheck = [ "pytest_cov" ]; + meta = with lib; { description = "Plugin for coverage reporting with support for both centralised and distributed testing, including subprocesses and multiprocessing"; homepage = "https://github.com/pytest-dev/pytest-cov"; diff --git a/pkgs/development/python-modules/pytest-django/default.nix b/pkgs/development/python-modules/pytest-django/default.nix index c147996705e..0253ed5a513 100644 --- a/pkgs/development/python-modules/pytest-django/default.nix +++ b/pkgs/development/python-modules/pytest-django/default.nix @@ -10,11 +10,11 @@ }: buildPythonPackage rec { pname = "pytest-django"; - version = "4.1.0"; + version = "4.4.0"; src = fetchPypi { inherit pname version; - sha256 = "26f02c16d36fd4c8672390deebe3413678d89f30720c16efb8b2a6bf63b9041f"; + sha256 = "b5171e3798bf7e3fc5ea7072fe87324db67a4dd9f1192b037fed4cc3c1b7f455"; }; nativeBuildInputs = [ pytest setuptools-scm ]; diff --git a/pkgs/development/python-modules/pytest-helpers-namespace/default.nix b/pkgs/development/python-modules/pytest-helpers-namespace/default.nix index b405afea215..eac8cf6377d 100644 --- a/pkgs/development/python-modules/pytest-helpers-namespace/default.nix +++ b/pkgs/development/python-modules/pytest-helpers-namespace/default.nix @@ -10,12 +10,12 @@ buildPythonPackage rec { pname = "pytest-helpers-namespace"; - version = "2021.3.24"; + version = "2021.4.29"; disabled = isPy27; src = fetchPypi { inherit pname version; - sha256 = "0pyj2d45zagmzlajzqdnkw5yz8k49pkihbydsqkzm413qnkzb38q"; + sha256 = "183524e3db4e2a1fea92e0ca3662a624ba44c9f3568da15679d7535ba6838a6a"; }; nativeBuildInputs = [ setuptools setuptools-declarative-requirements setuptools-scm ]; diff --git a/pkgs/development/python-modules/pytest-mock/default.nix b/pkgs/development/python-modules/pytest-mock/default.nix index 5be8529433f..a8127e276f4 100644 --- a/pkgs/development/python-modules/pytest-mock/default.nix +++ b/pkgs/development/python-modules/pytest-mock/default.nix @@ -8,11 +8,11 @@ buildPythonPackage rec { pname = "pytest-mock"; - version = "3.5.1"; + version = "3.6.1"; src = fetchPypi { inherit pname version; - sha256 = "1z6r3n78bilfzkbxj083p0ib04ia1bhfgnj2qq9x6q4mmykapqm1"; + sha256 = "40217a058c52a63f1042f0784f62009e976ba824c418cced42e88d5f40ab0e62"; }; nativeBuildInputs = [ setuptools-scm ]; diff --git a/pkgs/development/python-modules/pytest-snapshot/default.nix b/pkgs/development/python-modules/pytest-snapshot/default.nix index f38f3954320..140994cbf26 100644 --- a/pkgs/development/python-modules/pytest-snapshot/default.nix +++ b/pkgs/development/python-modules/pytest-snapshot/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "pytest-snapshot"; - version = "0.5.0"; + version = "0.6.1"; src = fetchPypi { inherit pname version; - sha256 = "77d736073598a6224825eef8b8e0c760812a61410af2180cb070b27eb79f257d"; + sha256 = "ee8e9af118ff55ed13bf8e8b520714c52665ae44f6228563a600a08d62839b54"; }; nativeBuildInputs = [ setuptools-scm ]; diff --git a/pkgs/development/python-modules/pytest-subtests/default.nix b/pkgs/development/python-modules/pytest-subtests/default.nix index c07832c0b05..6b556abeaa4 100644 --- a/pkgs/development/python-modules/pytest-subtests/default.nix +++ b/pkgs/development/python-modules/pytest-subtests/default.nix @@ -8,12 +8,12 @@ buildPythonPackage rec { pname = "pytest-subtests"; - version = "0.4.0"; + version = "0.5.0"; disabled = pythonOlder "3.5"; src = fetchPypi { inherit pname version; - sha256 = "sha256-jZ4sHR3OEfe30snQkgLr/HdXt/8MrJtyrTKO3+fuA3s="; + sha256 = "5bd1e4bf0eda4c89a6cd42b0ee28e1d2ca0848de3fd67ad8cdd6d559ed00f120"; }; nativeBuildInputs = [ setuptools-scm ]; diff --git a/pkgs/development/python-modules/pytest-testmon/default.nix b/pkgs/development/python-modules/pytest-testmon/default.nix index 7d2e07db01f..fa63cc035ad 100644 --- a/pkgs/development/python-modules/pytest-testmon/default.nix +++ b/pkgs/development/python-modules/pytest-testmon/default.nix @@ -8,12 +8,12 @@ buildPythonPackage rec { pname = "pytest-testmon"; - version = "1.1.0"; + version = "1.1.1"; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - sha256 = "sha256-+IpT0o+Jg2UJcy6d7mEdZsYfW4IXIBu4IqBFbywyPRk="; + sha256 = "c8810f991545e352f646fb382e5962ff54b8aa52b09d62d35ae04f0d7a9c58d9"; }; propagatedBuildInputs = [ coverage ]; diff --git a/pkgs/development/python-modules/pytest-xdist/default.nix b/pkgs/development/python-modules/pytest-xdist/default.nix index f87169a630b..e9b13177d9d 100644 --- a/pkgs/development/python-modules/pytest-xdist/default.nix +++ b/pkgs/development/python-modules/pytest-xdist/default.nix @@ -1,7 +1,7 @@ { lib , buildPythonPackage , fetchPypi -, isPy27 +, pythonOlder , setuptools-scm , pytestCheckHook , filelock @@ -13,12 +13,12 @@ buildPythonPackage rec { pname = "pytest-xdist"; - version = "2.2.1"; - disabled = isPy27; + version = "2.3.0"; + disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - sha256 = "718887296892f92683f6a51f25a3ae584993b06f7076ce1e1fd482e59a8220a2"; + sha256 = "e8ecde2f85d88fbcadb7d28cb33da0fa29bca5cf7d5967fa89fc0e97e5299ea5"; }; nativeBuildInputs = [ setuptools-scm ]; @@ -39,7 +39,7 @@ buildPythonPackage rec { ]; meta = with lib; { - description = "py.test xdist plugin for distributed testing and loop-on-failing modes"; + description = "Pytest xdist plugin for distributed testing and loop-on-failing modes"; homepage = "https://github.com/pytest-dev/pytest-xdist"; license = licenses.mit; maintainers = with maintainers; [ dotlambda ]; diff --git a/pkgs/development/python-modules/pytest/default.nix b/pkgs/development/python-modules/pytest/default.nix index 07e4a44ccd3..19289426d71 100644 --- a/pkgs/development/python-modules/pytest/default.nix +++ b/pkgs/development/python-modules/pytest/default.nix @@ -19,12 +19,12 @@ buildPythonPackage rec { pname = "pytest"; - version = "6.2.3"; + version = "6.2.4"; disabled = !isPy3k; src = fetchPypi { inherit pname version; - sha256 = "0d5nx7xqr9khagbvg6ac2cjjvcxrvvjp0chwim4z7w2ddsj3h4k7"; + sha256 = "50bcad0a0b9c5a72c8e4e7c9855a3ad496ca6a881a3641b4260605450772c54b"; }; nativeBuildInputs = [ setuptools-scm ]; diff --git a/pkgs/development/python-modules/pytestrunner/default.nix b/pkgs/development/python-modules/pytestrunner/default.nix index 897efebf1dc..d99f72299dd 100644 --- a/pkgs/development/python-modules/pytestrunner/default.nix +++ b/pkgs/development/python-modules/pytestrunner/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "pytest-runner"; - version = "5.3.0"; + version = "5.3.1"; src = fetchPypi { inherit pname version; - sha256 = "ca3f58ff4957e8be6c54c55d575b235725cbbcf4dc0d5091c29c6444cfc8a5fe"; + sha256 = "0fce5b8dc68760f353979d99fdd6b3ad46330b6b1837e2077a89ebcf204aac91"; }; nativeBuildInputs = [ setuptools-scm pytest ]; diff --git a/pkgs/development/python-modules/python-docx/default.nix b/pkgs/development/python-modules/python-docx/default.nix index 025a13958cd..fd22adc3774 100644 --- a/pkgs/development/python-modules/python-docx/default.nix +++ b/pkgs/development/python-modules/python-docx/default.nix @@ -10,11 +10,11 @@ buildPythonPackage rec { pname = "python-docx"; - version = "0.8.10"; + version = "0.8.11"; src = fetchPypi { inherit pname version; - sha256 = "bc76ecac6b2d00ce6442a69d03a6f35c71cd72293cd8405a7472dfe317920024"; + sha256 = "1105d233a0956dd8dd1e710d20b159e2d72ac3c301041b95f4d4ceb3e0ebebc4"; }; checkInputs = [ behave mock pyparsing pytest ]; diff --git a/pkgs/development/python-modules/python-dotenv/default.nix b/pkgs/development/python-modules/python-dotenv/default.nix index 1d8a9a85457..6fbda114d33 100644 --- a/pkgs/development/python-modules/python-dotenv/default.nix +++ b/pkgs/development/python-modules/python-dotenv/default.nix @@ -11,12 +11,12 @@ buildPythonPackage rec { pname = "python-dotenv"; - version = "0.15.0"; + version = "0.17.1"; disabled = pythonOlder "3.5"; src = fetchPypi { inherit pname version; - sha256 = "587825ed60b1711daea4832cf37524dfd404325b7db5e25ebe88c495c9f807a0"; + sha256 = "b1ae5e9643d5ed987fc57cc2583021e38db531946518130777734f9589b3141f"; }; propagatedBuildInputs = [ click ]; diff --git a/pkgs/development/python-modules/python-gitlab/default.nix b/pkgs/development/python-modules/python-gitlab/default.nix index 4d7f7a289cb..34fbcff42f1 100644 --- a/pkgs/development/python-modules/python-gitlab/default.nix +++ b/pkgs/development/python-modules/python-gitlab/default.nix @@ -15,7 +15,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "0081jgjgqi4mqpr436ivw2q571hxi3hv2pa8d0z0nfl13s6lldpk"; + sha256 = "f3364a8d1e813a0b3e68485db1e1881d8653b0e03b9a41f2c59544fce4930101"; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/python-miio/default.nix b/pkgs/development/python-modules/python-miio/default.nix index 2374c6797f2..b441971d44d 100644 --- a/pkgs/development/python-modules/python-miio/default.nix +++ b/pkgs/development/python-modules/python-miio/default.nix @@ -35,6 +35,7 @@ buildPythonPackage rec { postPatch = '' substituteInPlace pyproject.toml \ + --replace 'click = "^7"' 'click = "*"' \ --replace 'croniter = "^0"' 'croniter = "*"' \ --replace 'defusedxml = "^0.6"' 'defusedxml = "*"' ''; @@ -44,24 +45,24 @@ buildPythonPackage rec { ]; propagatedBuildInputs = [ + android-backup + appdirs + attrs click - cryptography construct - zeroconf - attrs - pytz - appdirs - tqdm - netifaces - android-backup croniter + cryptography defusedxml + netifaces + pytz + pyyaml + tqdm + zeroconf ] ++ lib.optional (pythonOlder "3.8") importlib-metadata; checkInputs = [ pytestCheckHook pytest-mock - pyyaml ]; pythonImportsCheck = [ "miio" ]; diff --git a/pkgs/development/python-modules/python-rtmidi/default.nix b/pkgs/development/python-modules/python-rtmidi/default.nix index 781231749fd..335a085277a 100644 --- a/pkgs/development/python-modules/python-rtmidi/default.nix +++ b/pkgs/development/python-modules/python-rtmidi/default.nix @@ -4,12 +4,12 @@ buildPythonPackage rec { pname = "python-rtmidi"; - version = "1.4.7"; + version = "1.4.9"; disabled = isPy27; src = fetchPypi { inherit pname version; - sha256 = "d7dbc2b174b09015dfbee449a672a072aa72b367be40b13e04ee35a2e2e399e3"; + sha256 = "bfeb4ed99d0cccf6fa2837566907652ded7adc1c03b69f2160c9de4082301302"; }; nativeBuildInputs = [ pkg-config ]; diff --git a/pkgs/development/python-modules/python-sql/default.nix b/pkgs/development/python-modules/python-sql/default.nix index 90dc5835e45..a07941e5de4 100644 --- a/pkgs/development/python-modules/python-sql/default.nix +++ b/pkgs/development/python-modules/python-sql/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "python-sql"; - version = "1.2.1"; + version = "1.2.2"; src = fetchPypi { inherit pname version; - sha256 = "306999bd311fbf50804d76f346655af0a6ff18881ce46c1329256fee40f492c0"; + sha256 = "2d916357a0172c35eccac29064cd18cd41616fc60109a37dac0e9d11a0b1183a"; }; meta = { diff --git a/pkgs/development/python-modules/python-telegram-bot/default.nix b/pkgs/development/python-modules/python-telegram-bot/default.nix index 7fc92a2236b..4d223c54838 100644 --- a/pkgs/development/python-modules/python-telegram-bot/default.nix +++ b/pkgs/development/python-modules/python-telegram-bot/default.nix @@ -1,27 +1,29 @@ { lib , APScheduler , buildPythonPackage +, cachetools , certifi , decorator , fetchPypi , future -, isPy3k , tornado , urllib3 +, pythonOlder }: buildPythonPackage rec { pname = "python-telegram-bot"; - version = "13.5"; - disabled = !isPy3k; + version = "13.6"; + disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - sha256 = "sha256-g9v0zUYyf9gYu2ZV8lCAJKCt5o69s1RNo1xGmtwjvds="; + sha256 = "37cfe8faba16fb68a8b5ab41a10e787c385f6296200c84256cc54d7c16334643"; }; propagatedBuildInputs = [ APScheduler + cachetools certifi decorator future diff --git a/pkgs/development/python-modules/pythonegardia/default.nix b/pkgs/development/python-modules/pythonegardia/default.nix index 4c2394421fb..318059d2466 100644 --- a/pkgs/development/python-modules/pythonegardia/default.nix +++ b/pkgs/development/python-modules/pythonegardia/default.nix @@ -6,11 +6,11 @@ buildPythonPackage rec { pname = "pythonegardia"; - version = "1.0.40"; + version = "1.0.51"; src = fetchPypi { inherit pname version; - sha256 = "1rv6m5zaflf3nanpl1xmfmfcpg8kzcnmniq1hhgrybsspkc7mvry"; + sha256 = "b99217e34c59bfae059db400acef99d3d32237d13da6fdce9e0d4decc9a07e61"; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/pytools/default.nix b/pkgs/development/python-modules/pytools/default.nix index 83de3cb459a..79fff887573 100644 --- a/pkgs/development/python-modules/pytools/default.nix +++ b/pkgs/development/python-modules/pytools/default.nix @@ -11,12 +11,12 @@ buildPythonPackage rec { pname = "pytools"; - version = "2021.2.1"; + version = "2021.2.7"; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - sha256 = "ebbcc38c7a30b1a0ce1a74816c85db9f2556bb4d5b9a71f85f5d88f69ddcb96b"; + sha256 = "0538f6fe7f00bf765ca5ab38518db48df72de818460006e54b0575accd24d9fb"; }; checkInputs = [ pytest ]; diff --git a/pkgs/development/python-modules/pytorch-metric-learning/default.nix b/pkgs/development/python-modules/pytorch-metric-learning/default.nix index e340d5eefad..0c1ca751eb1 100644 --- a/pkgs/development/python-modules/pytorch-metric-learning/default.nix +++ b/pkgs/development/python-modules/pytorch-metric-learning/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { pname = "pytorch-metric-learning"; - version = "0.9.97"; + version = "0.9.99"; disabled = isPy27; @@ -20,7 +20,7 @@ buildPythonPackage rec { owner = "KevinMusgrave"; repo = pname; rev = "v${version}"; - sha256 = "1hipby54swwpfw50wlxzgbphzqkk1fbs5x44smz4rrngqpsp3g67"; + sha256 = "1ahs2b7q3hxi6yv4g2fjy7mvl899h56dvlpc2r9301440qsgkdzr"; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/pytube/default.nix b/pkgs/development/python-modules/pytube/default.nix index 6d7435d12cf..9cedb1ac944 100644 --- a/pkgs/development/python-modules/pytube/default.nix +++ b/pkgs/development/python-modules/pytube/default.nix @@ -7,7 +7,7 @@ buildPythonPackage rec { pname = "pytube"; - version = "10.8.4"; + version = "10.8.5"; disabled = pythonOlder "3.6"; @@ -15,7 +15,7 @@ buildPythonPackage rec { owner = "pytube"; repo = "pytube"; rev = "v${version}"; - sha256 = "sha256-07roF/rHBvGv50XL5KBOsk2WFITAWDput+KNgfTtXlI="; + sha256 = "05w2jlrm1kqki3yq4ssf3ydmy0sf4zcychz94wxsppgr2xrghnhn"; }; checkInputs = [ diff --git a/pkgs/development/python-modules/pyturbojpeg/default.nix b/pkgs/development/python-modules/pyturbojpeg/default.nix index 0011bc69bc5..50f5c4559e4 100644 --- a/pkgs/development/python-modules/pyturbojpeg/default.nix +++ b/pkgs/development/python-modules/pyturbojpeg/default.nix @@ -10,12 +10,12 @@ buildPythonPackage rec { pname = "pyturbojpeg"; - version = "1.5.0"; + version = "1.5.1"; src = fetchPypi { pname = "PyTurboJPEG"; inherit version; - sha256 = "sha256-juy8gVqOXKSGGq+gOBO2BuJEL2RHjjCWJDrwRCvrZIE="; + sha256 = "sha256-56FnJpnQzFPlz0v506CrwIHf9uV3R1LibnuEL7RcFCg="; }; patches = [ diff --git a/pkgs/development/python-modules/pyunifi/default.nix b/pkgs/development/python-modules/pyunifi/default.nix index dfbae696b8e..0ac0a694125 100644 --- a/pkgs/development/python-modules/pyunifi/default.nix +++ b/pkgs/development/python-modules/pyunifi/default.nix @@ -3,11 +3,11 @@ buildPythonPackage rec { pname = "pyunifi"; - version = "2.20.1"; + version = "2.21"; src = fetchPypi { inherit pname version; - sha256 = "b52d1b0d87365fcfed8572b5dbd8d675bffece4ab3484bf083863f278c727d3d"; + sha256 = "ea7919caee14abe741016d8e37e96bc67a43e22f77c079e55962273f39dbea4e"; }; propagatedBuildInputs = [ requests ]; diff --git a/pkgs/development/python-modules/pyvmomi/default.nix b/pkgs/development/python-modules/pyvmomi/default.nix index b6a775327f4..3c7082d0e67 100644 --- a/pkgs/development/python-modules/pyvmomi/default.nix +++ b/pkgs/development/python-modules/pyvmomi/default.nix @@ -2,13 +2,13 @@ buildPythonPackage rec { pname = "pyvmomi"; - version = "7.0.1"; + version = "7.0.2"; src = fetchFromGitHub { owner = "vmware"; repo = pname; rev = "v${version}"; - sha256 = "1i7zni4ygdikc22wfrbnzwqh6qy402s3di6sdlfcvky2y7fzx52x"; + sha256 = "0li6g72ps1vxjzqhz10n02fl6cs069173jd9y4ih5am7vwhrwgpa"; }; # requires old version of vcrpy diff --git a/pkgs/development/python-modules/pywbem/default.nix b/pkgs/development/python-modules/pywbem/default.nix index d6c389c22ae..be1d0607098 100644 --- a/pkgs/development/python-modules/pywbem/default.nix +++ b/pkgs/development/python-modules/pywbem/default.nix @@ -7,11 +7,11 @@ buildPythonPackage rec { pname = "pywbem"; - version = "1.1.3"; + version = "1.2.0"; src = fetchPypi { inherit pname version; - sha256 = "2abb6443f4debae56af7abefadb9fa5b8af9b53fc9bcf67f6c01a78db1064300"; + sha256 = "8ef48185e0adbaeb9bd5181c4c5de951f6d58d54e2e1d7e87a9834e10eabe957"; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/pywinrm/default.nix b/pkgs/development/python-modules/pywinrm/default.nix index 798364afd0d..629c75bfeaf 100644 --- a/pkgs/development/python-modules/pywinrm/default.nix +++ b/pkgs/development/python-modules/pywinrm/default.nix @@ -13,12 +13,12 @@ buildPythonPackage rec { pname = "pywinrm"; - version = "0.4.1"; + version = "0.4.2"; disabled = isPy38; src = fetchPypi { inherit pname version; - sha256 = "4ede5c6c85b53780ad0dbf9abef2fa2ea58f44c82256a84a63eae5f1205cea81"; + sha256 = "e7865ec5e46e7fedb859c656cfaba4fcf669de7c042b5a7d8a759544636bcfb7"; }; checkInputs = [ mock pytest ]; diff --git a/pkgs/development/python-modules/pyworld/default.nix b/pkgs/development/python-modules/pyworld/default.nix index 73cd1fcea22..bbe5a4c135e 100644 --- a/pkgs/development/python-modules/pyworld/default.nix +++ b/pkgs/development/python-modules/pyworld/default.nix @@ -7,11 +7,11 @@ buildPythonPackage rec { pname = "pyworld"; - version = "0.2.12"; + version = "0.3.0"; src = fetchPypi { inherit pname version; - sha256 = "896c910696975855578d855f490f94d7a57119e0a75f7f15e11fdf58ba891627"; + sha256 = "e19b5d8445e0c4fc45ded71863aeaaf2680064b4626b0e7c90f72e9ace9f6b5b"; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/pyzmq/default.nix b/pkgs/development/python-modules/pyzmq/default.nix index 953a327d199..5aca8d6d66c 100644 --- a/pkgs/development/python-modules/pyzmq/default.nix +++ b/pkgs/development/python-modules/pyzmq/default.nix @@ -9,11 +9,11 @@ buildPythonPackage rec { pname = "pyzmq"; - version = "22.0.3"; + version = "22.1.0"; src = fetchPypi { inherit pname version; - sha256 = "f7f63ce127980d40f3e6a5fdb87abf17ce1a7c2bd8bf2c7560e1bbce8ab1f92d"; + sha256 = "7040d6dd85ea65703904d023d7f57fab793d7ffee9ba9e14f3b897f34ff2415d"; }; checkInputs = [ diff --git a/pkgs/development/python-modules/qiling/default.nix b/pkgs/development/python-modules/qiling/default.nix index 9513280f3cf..0bd86c3caf5 100644 --- a/pkgs/development/python-modules/qiling/default.nix +++ b/pkgs/development/python-modules/qiling/default.nix @@ -11,11 +11,11 @@ }: buildPythonPackage rec { pname = "qiling"; - version = "1.2.3"; + version = "1.2.4"; src = fetchPypi { inherit pname version; - sha256 = "e3ed09f9e080559e73e2a9199649b934b3594f653079d1e7da4992340c19eb64"; + sha256 = "ecaa4415eea44f6f48021c1f7794c0d9fae7d64c8e43a3ff1d5de8e99bd963aa"; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/qserve/default.nix b/pkgs/development/python-modules/qserve/default.nix index 0548b6fdf17..f316e3fb65c 100644 --- a/pkgs/development/python-modules/qserve/default.nix +++ b/pkgs/development/python-modules/qserve/default.nix @@ -6,13 +6,13 @@ buildPythonPackage rec { pname = "qserve"; - version = "0.2.8"; + version = "0.3.0"; disabled = isPy3k; src = fetchPypi { inherit pname version; extension = "zip"; - sha256 = "0b04b2d4d11b464ff1efd42a9ea9f8136187d59f4076f57c9ba95361d41cd7ed"; + sha256 = "dac1ee4ec60af6beb9af8f3f02d08d6db4cc9868b0915d626cb900a50d003ed4"; }; meta = with lib; { diff --git a/pkgs/development/python-modules/qtconsole/default.nix b/pkgs/development/python-modules/qtconsole/default.nix index 47c36fcc126..a5173a0a257 100644 --- a/pkgs/development/python-modules/qtconsole/default.nix +++ b/pkgs/development/python-modules/qtconsole/default.nix @@ -15,11 +15,11 @@ buildPythonPackage rec { pname = "qtconsole"; - version = "5.0.3"; + version = "5.1.0"; src = fetchPypi { inherit pname version; - sha256 = "c091a35607d2a2432e004c4a112d241ce908086570cf68594176dd52ccaa212d"; + sha256 = "12c734494901658787339dea9bbd82f3dc0d5e394071377a1c77b4a0954d7d8b"; }; checkInputs = [ nose ] ++ lib.optionals isPy27 [mock]; diff --git a/pkgs/development/python-modules/queuelib/default.nix b/pkgs/development/python-modules/queuelib/default.nix index 3814663c044..7534974237a 100644 --- a/pkgs/development/python-modules/queuelib/default.nix +++ b/pkgs/development/python-modules/queuelib/default.nix @@ -6,11 +6,11 @@ buildPythonPackage rec { pname = "queuelib"; - version = "1.5.0"; + version = "1.6.1"; src = fetchPypi { inherit pname version; - sha256 = "42b413295551bdc24ed9376c1a2cd7d0b1b0fa4746b77b27ca2b797a276a1a17"; + sha256 = "631d067c9be57e395c382d680d3653ca1452cd29e8da25c5e8d94b5c0c528c31"; }; buildInputs = [ pytest ]; diff --git a/pkgs/development/python-modules/radish-bdd/default.nix b/pkgs/development/python-modules/radish-bdd/default.nix index b2d22346dd7..ac01b853c87 100644 --- a/pkgs/development/python-modules/radish-bdd/default.nix +++ b/pkgs/development/python-modules/radish-bdd/default.nix @@ -18,14 +18,14 @@ buildPythonPackage rec { pname = "radish-bdd"; - version = "0.13.2"; + version = "0.13.4"; # Pypi package does not have necessary test fixtures. src = fetchFromGitHub { owner = pname; repo = "radish"; rev = "v${version}"; - sha256 = "1k7l0j8w221pa6k990x4rfm7km4asx5zy4zpzvh029lb9nw2pp8b"; + sha256 = "1slfgh61648i009qj8156qipy21a6zm8qzjk00kbm5kk5z9jfryi"; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/regex/default.nix b/pkgs/development/python-modules/regex/default.nix index efb299161b8..0445b02c1f3 100644 --- a/pkgs/development/python-modules/regex/default.nix +++ b/pkgs/development/python-modules/regex/default.nix @@ -2,30 +2,30 @@ , buildPythonPackage , fetchPypi , python +, isPy27 }: - buildPythonPackage rec { pname = "regex"; - version = "2021.3.17"; + version = "2021.4.4"; src = fetchPypi { inherit pname version; - sha256 = "4b8a1fb724904139149a43e172850f35aa6ea97fb0545244dc0b805e0154ed68"; + sha256 = "sha256-Uro9P5uULEnX5LwQW7KFUcRAZfE5plBiq3kSvvEMmvs="; }; - postCheck = '' - echo "We now run tests ourselves, since the setuptools installer doesn't." - ${python.interpreter} -c 'import test_regex; test_regex.test_main();' + # Sources for different Python releases are located in same folder + checkPhase = '' + rm -r ${if !isPy27 then "regex_2" else "regex_3"} + ${python.interpreter} -m unittest ''; - # No tests in archive - doCheck = false; + pythonImportsCheck = [ "regex" ]; - meta = { + meta = with lib; { description = "Alternative regular expression module, to replace re"; homepage = "https://bitbucket.org/mrabarnett/mrab-regex"; - license = lib.licenses.psfl; - maintainers = with lib.maintainers; [ abbradar ]; + license = licenses.psfl; + maintainers = with maintainers; [ abbradar ]; }; } diff --git a/pkgs/development/python-modules/relatorio/default.nix b/pkgs/development/python-modules/relatorio/default.nix index b723cd0b185..9e673de9266 100644 --- a/pkgs/development/python-modules/relatorio/default.nix +++ b/pkgs/development/python-modules/relatorio/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "relatorio"; - version = "0.9.2"; + version = "0.9.3"; src = fetchPypi { inherit pname version; - sha256 = "0753e78b235b1e8da275509351257a861cf2cf9fafe1b414f8c1deb858a4f94e"; + sha256 = "1d5d08f5323a1cdf6d860cd13c3408482a822d9924899927a8c7cd2ebeaa8699"; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/reportlab/default.nix b/pkgs/development/python-modules/reportlab/default.nix index 7b5cc0a8c20..c9f2600efe1 100644 --- a/pkgs/development/python-modules/reportlab/default.nix +++ b/pkgs/development/python-modules/reportlab/default.nix @@ -11,11 +11,11 @@ let ft = freetype.overrideAttrs (oldArgs: { dontDisableStatic = true; }); in buildPythonPackage rec { pname = "reportlab"; - version = "3.5.66"; + version = "3.5.67"; src = fetchPypi { inherit pname version; - sha256 = "63fba51babad0047def4ffaa41d0065248ca39d680e98dc9e3010de5425539b4"; + sha256 = "0cf2206c73fbca752c8bd39e12bb9ad7f2d01e6fcb2b25b9eaf94ea042fe86c9"; }; checkInputs = [ glibcLocales ]; diff --git a/pkgs/development/python-modules/requests-aws4auth/default.nix b/pkgs/development/python-modules/requests-aws4auth/default.nix index 3267b0a7865..fa97942e226 100644 --- a/pkgs/development/python-modules/requests-aws4auth/default.nix +++ b/pkgs/development/python-modules/requests-aws4auth/default.nix @@ -3,11 +3,11 @@ with lib; buildPythonPackage rec { pname = "requests-aws4auth"; - version = "1.0.1"; + version = "1.1.1"; src = fetchPypi { inherit pname version; - sha256 = "9a4a5f4a61c49f098f5f669410308ac5b0ea2682fd511ee3a4f9ff73b5bb275a"; + sha256 = "c0883346ce30b5018903a67da88df72f73ff06e1a320845bba9cd85e811ba0ba"; }; propagatedBuildInputs = [ requests six ]; diff --git a/pkgs/development/python-modules/requests-cache/default.nix b/pkgs/development/python-modules/requests-cache/default.nix index d39fcc5f2a6..35cf74ca842 100644 --- a/pkgs/development/python-modules/requests-cache/default.nix +++ b/pkgs/development/python-modules/requests-cache/default.nix @@ -1,21 +1,58 @@ -{ lib, buildPythonPackage, fetchPypi -, mock, requests, six, urllib3 }: +{ lib +, buildPythonPackage +, pythonOlder +, fetchFromGitHub +, attrs +, itsdangerous +, requests +, url-normalize +, pytestCheckHook +, requests-mock +, timeout-decorator +}: buildPythonPackage rec { pname = "requests-cache"; - version = "0.5.2"; + version = "0.6.4"; - src = fetchPypi { - inherit pname version; - sha256 = "813023269686045f8e01e2289cc1e7e9ae5ab22ddd1e2849a9093ab3ab7270eb"; + disabled = pythonOlder "3.6"; + + format = "pyproject"; + + src = fetchFromGitHub { + owner = "reclosedev"; + repo = "requests-cache"; + rev = "v${version}"; + sha256 = "10rvs611j16kakqx38kpqpc1v0dfb9rmbz2whpskswb1lsksv3j9"; }; - buildInputs = [ mock ]; - propagatedBuildInputs = [ requests six urllib3 ]; + propagatedBuildInputs = [ + attrs + itsdangerous + requests + url-normalize + ]; + + checkInputs = [ + pytestCheckHook + requests-mock + timeout-decorator + ]; + + disabledTestPaths = [ + # connect to database on localhost + "tests/integration/test_cache.py" + "tests/integration/test_dynamodb.py" + "tests/integration/test_gridfs.py" + "tests/integration/test_mongodb.py" + "tests/integration/test_redis.py" + ]; + + pythonImportsCheck = [ "requests_cache" ]; meta = with lib; { description = "Persistent cache for requests library"; - homepage = "https://pypi.python.org/pypi/requests-cache"; + homepage = "https://github.com/reclosedev/requests-cache"; license = licenses.bsd3; }; } diff --git a/pkgs/development/python-modules/requests-hawk/default.nix b/pkgs/development/python-modules/requests-hawk/default.nix index 188e66b5c7a..c59cf9cd88a 100644 --- a/pkgs/development/python-modules/requests-hawk/default.nix +++ b/pkgs/development/python-modules/requests-hawk/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "requests-hawk"; - version = "1.1.0"; + version = "1.1.1"; src = fetchPypi { inherit pname version; - sha256 = "1a5e61cab14627f1b5ba7de0e3fb2b681007ff7b2a49110d504e5cd6d7fd62d6"; + sha256 = "4c74bd31b581f6d2b36d575bb537b1f29469509f560f5050339a48195d48929b"; }; propagatedBuildInputs = [ mohawk requests ]; diff --git a/pkgs/development/python-modules/requests-mock/default.nix b/pkgs/development/python-modules/requests-mock/default.nix index 5e85ba7d38b..85d7c47baae 100644 --- a/pkgs/development/python-modules/requests-mock/default.nix +++ b/pkgs/development/python-modules/requests-mock/default.nix @@ -10,11 +10,11 @@ buildPythonPackage rec { pname = "requests-mock"; - version = "1.8.0"; + version = "1.9.3"; src = fetchPypi { inherit pname version; - sha256 = "e68f46844e4cee9d447150343c9ae875f99fa8037c6dcf5f15bf1fe9ab43d226"; + sha256 = "8d72abe54546c1fc9696fa1516672f1031d72a55a1d66c85184f972a24ba0eba"; }; patchPhase = '' diff --git a/pkgs/development/python-modules/requests/0001-Prefer-NixOS-Nix-default-CA-bundles-over-certifi.patch b/pkgs/development/python-modules/requests/0001-Prefer-NixOS-Nix-default-CA-bundles-over-certifi.patch new file mode 100644 index 00000000000..de6a4b5c1b5 --- /dev/null +++ b/pkgs/development/python-modules/requests/0001-Prefer-NixOS-Nix-default-CA-bundles-over-certifi.patch @@ -0,0 +1,60 @@ +From b36083efafec5a3c1c5864cd0b62367ddf3856ae Mon Sep 17 00:00:00 2001 +From: Keshav Kini <keshav.kini@gmail.com> +Date: Sun, 16 May 2021 20:35:24 -0700 +Subject: [PATCH] Prefer NixOS/Nix default CA bundles over certifi + +Normally, requests gets its default CA bundle from the certifi +package. On NixOS and when using Nix on non-NixOS platforms, we would +rather default to using our own certificate bundles controlled by the +Nix/NixOS user. + +This commit overrides requests.certs.where(), which previously was +just aliased to certifi.where(), so that now it does the following: + +- When run by Nix on non-NixOS, the environment variable + $NIX_SSL_CERT_FILE will point to the CA bundle we're using, so we + use that. + +- When running on NixOS, the CA bundle we're using has the static path + /etc/ssl/certs/ca-certificates.crt , so we use that. + +- Otherwise, we fall back to the original behavior of using certifi's + CA bundle. Higher in the call stack, users of requests can also + explicitly specify a CA bundle to use, which overrides all this + logic. +--- + requests/certs.py | 18 +++++++++++++++++- + 1 file changed, 17 insertions(+), 1 deletion(-) + +diff --git a/requests/certs.py b/requests/certs.py +index d1a378d7..faf462b7 100644 +--- a/requests/certs.py ++++ b/requests/certs.py +@@ -12,7 +12,23 @@ If you are packaging Requests, e.g., for a Linux distribution or a managed + environment, you can change the definition of where() to return a separately + packaged CA bundle. + """ +-from certifi import where ++ ++import os ++ ++import certifi ++ ++ ++def where(): ++ nix_ssl_cert_file = os.getenv("NIX_SSL_CERT_FILE") ++ if nix_ssl_cert_file and os.path.exists(nix_ssl_cert_file): ++ return nix_ssl_cert_file ++ ++ nixos_ca_bundle = "/etc/ssl/certs/ca-certificates.crt" ++ if os.path.exists(nixos_ca_bundle): ++ return nixos_ca_bundle ++ ++ return certifi.where() ++ + + if __name__ == '__main__': + print(where()) +-- +2.31.1 + diff --git a/pkgs/development/python-modules/requests/default.nix b/pkgs/development/python-modules/requests/default.nix index 72feafc771e..8b5514f6393 100644 --- a/pkgs/development/python-modules/requests/default.nix +++ b/pkgs/development/python-modules/requests/default.nix @@ -20,6 +20,8 @@ buildPythonPackage rec { sha256 = "sha256-J5c91KkEpPE7JjoZyGbBO5KjntHJZGVfAl8/jT11uAQ="; }; + patches = [ ./0001-Prefer-NixOS-Nix-default-CA-bundles-over-certifi.patch ]; + postPatch = '' # Use latest idna substituteInPlace setup.py --replace ",<3" "" diff --git a/pkgs/development/python-modules/responses/default.nix b/pkgs/development/python-modules/responses/default.nix index 6b2bd4ac197..8b700701d31 100644 --- a/pkgs/development/python-modules/responses/default.nix +++ b/pkgs/development/python-modules/responses/default.nix @@ -3,11 +3,11 @@ buildPythonPackage rec { pname = "responses"; - version = "0.13.1"; + version = "0.13.3"; src = fetchPypi { inherit pname version; - sha256 = "cf62ab0f4119b81d485521b2c950d8aa55a885c90126488450b7acb8ee3f77ac"; + sha256 = "18a5b88eb24143adbf2b4100f328a2f5bfa72fbdacf12d97d41f07c26c45553d"; }; propagatedBuildInputs = [ cookies mock requests six ]; diff --git a/pkgs/development/python-modules/rfc3986/default.nix b/pkgs/development/python-modules/rfc3986/default.nix index 93f2f2ce37d..71a7d0730bd 100644 --- a/pkgs/development/python-modules/rfc3986/default.nix +++ b/pkgs/development/python-modules/rfc3986/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "rfc3986"; - version = "1.4.0"; + version = "1.5.0"; src = fetchPypi { inherit pname version; - sha256 = "17dvx15m3r49bmif5zlli8kzjd6bys6psixzbp14sd5367d9h8qi"; + sha256 = "270aaf10d87d0d4e095063c65bf3ddbc6ee3d0b226328ce21e036f946e421835"; }; propagatedBuildInputs = [ idna ]; diff --git a/pkgs/development/python-modules/rich/default.nix b/pkgs/development/python-modules/rich/default.nix index 16ec0095cd1..e939d3fc933 100644 --- a/pkgs/development/python-modules/rich/default.nix +++ b/pkgs/development/python-modules/rich/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { pname = "rich"; - version = "10.1.0"; + version = "10.4.0"; format = "pyproject"; disabled = pythonOlder "3.6"; @@ -21,7 +21,7 @@ buildPythonPackage rec { owner = "willmcgugan"; repo = pname; rev = "v${version}"; - sha256 = "sha256-HH+k9uiK34yoqu83rknCIe2DpoqJRHkcqABuj8zjzqs="; + sha256 = "0z01bvn8zx69simk26jv5ngvqv35fs7i0wbg1hjcd37lmv3v6261"; }; nativeBuildInputs = [ poetry-core ]; diff --git a/pkgs/development/python-modules/robotframework-requests/default.nix b/pkgs/development/python-modules/robotframework-requests/default.nix index 5935c23185f..f5ab684f746 100644 --- a/pkgs/development/python-modules/robotframework-requests/default.nix +++ b/pkgs/development/python-modules/robotframework-requests/default.nix @@ -8,12 +8,12 @@ }: buildPythonPackage rec { - version = "0.8.1"; + version = "0.9.1"; pname = "robotframework-requests"; src = fetchPypi { inherit pname version; - sha256 = "b26f4ae617ff8c4b522fba422b7c8f83545a98aec3e2deb7f1aa53dcd68defe2"; + sha256 = "22ea105846b28ddfc49713c59a363ad636ece5e308476dea59e73e3c9b544755"; }; buildInputs = [ unittest2 ]; diff --git a/pkgs/development/python-modules/robotframework/default.nix b/pkgs/development/python-modules/robotframework/default.nix index 027d0af303e..449af6d0890 100644 --- a/pkgs/development/python-modules/robotframework/default.nix +++ b/pkgs/development/python-modules/robotframework/default.nix @@ -2,13 +2,13 @@ buildPythonPackage rec { pname = "robotframework"; - version = "4.0.1"; + version = "4.0.3"; src = fetchFromGitHub { owner = pname; repo = pname; rev = "v${version}"; - sha256 = "1nkph0slrhss6y52y8jgbdc6m8hbqjilrwp3r00wwyqdifrfa1i6"; + sha256 = "1wqz7szbq2g3kkm7frwik4jb5m7517306sz8nxx8hxaw4n6y1i5d"; }; checkInputs = [ jsonschema ]; diff --git a/pkgs/development/python-modules/rpy2/default.nix b/pkgs/development/python-modules/rpy2/default.nix index f27bc76cc3a..6e83db8a96c 100644 --- a/pkgs/development/python-modules/rpy2/default.nix +++ b/pkgs/development/python-modules/rpy2/default.nix @@ -24,13 +24,13 @@ }: buildPythonPackage rec { - version = "3.4.3"; + version = "3.4.5"; pname = "rpy2"; disabled = isPyPy; src = fetchPypi { inherit version pname; - sha256 = "a39f2d75c24c688d5f48dfb2ef82efc006f2a51591941743026e1182353bf558"; + sha256 = "5d31a5ea43f5a59f6dec30faca87edb01fc9b8affa0beae96a99be923bd7dab3"; }; patches = [ diff --git a/pkgs/development/python-modules/rq/default.nix b/pkgs/development/python-modules/rq/default.nix index 71381e5cf24..e11a48f6a37 100644 --- a/pkgs/development/python-modules/rq/default.nix +++ b/pkgs/development/python-modules/rq/default.nix @@ -2,14 +2,14 @@ buildPythonPackage rec { pname = "rq"; - version = "1.7.0"; + version = "1.8.1"; disabled = isPy27; src = fetchFromGitHub { owner = "rq"; repo = "rq"; rev = "v${version}"; - sha256 = "1i7cbcrzqx52immwy8h5ps7x46sqfk9r2lgwjf01nv9mkc3ab8cj"; + sha256 = "1lfv3sb27v5xw3y67lirp877gg9230d28qmykxipvhcqwzqc2dqb"; }; # test require a running redis rerver, which is something we can't do yet diff --git a/pkgs/development/python-modules/ruamel_yaml/0.16.nix b/pkgs/development/python-modules/ruamel_yaml/0.16.nix new file mode 100644 index 00000000000..ed2ddf33065 --- /dev/null +++ b/pkgs/development/python-modules/ruamel_yaml/0.16.nix @@ -0,0 +1,40 @@ +{ lib +, buildPythonPackage +, fetchPypi +, ruamel_base +, ruamel_ordereddict ? null +, ruamel_yaml_clib ? null +, isPy3k +, isPyPy +}: + +buildPythonPackage rec { + pname = "ruamel.yaml"; + version = "0.16.13"; + + src = fetchPypi { + inherit pname version; + sha256 = "0hm9yg785f46bkrgqknd6fdvmkby9dpzjnm0b63qf0i748acaj5v"; + }; + + # Tests use relative paths + doCheck = false; + + propagatedBuildInputs = [ ruamel_base ] + ++ lib.optional (!isPy3k) ruamel_ordereddict + ++ lib.optional (!isPyPy) ruamel_yaml_clib; + + # causes namespace clash on py27 + dontUsePythonImportsCheck = !isPy3k; + pythonImportsCheck = [ + "ruamel.yaml" + "ruamel.base" + ]; + + meta = with lib; { + description = "YAML parser/emitter that supports roundtrip preservation of comments, seq/map flow style, and map key order"; + homepage = "https://sourceforge.net/projects/ruamel-yaml/"; + license = licenses.mit; + }; + +} diff --git a/pkgs/development/python-modules/ruamel_yaml/default.nix b/pkgs/development/python-modules/ruamel_yaml/default.nix index 1eaf86d69c0..863b62c1bcc 100644 --- a/pkgs/development/python-modules/ruamel_yaml/default.nix +++ b/pkgs/development/python-modules/ruamel_yaml/default.nix @@ -10,11 +10,11 @@ buildPythonPackage rec { pname = "ruamel.yaml"; - version = "0.16.13"; + version = "0.17.9"; src = fetchPypi { inherit pname version; - sha256 = "bb48c514222702878759a05af96f4b7ecdba9b33cd4efcf25c86b882cef3a942"; + sha256 = "374373b4743aee9f6d9f40bea600fe020a7ac7ae36b838b4a6a93f72b584a14c"; }; # Tests use relative paths diff --git a/pkgs/development/python-modules/rx/default.nix b/pkgs/development/python-modules/rx/default.nix index 5fd9064020a..5febbe9f9a9 100644 --- a/pkgs/development/python-modules/rx/default.nix +++ b/pkgs/development/python-modules/rx/default.nix @@ -2,7 +2,7 @@ buildPythonPackage rec { pname = "rx"; - version = "3.1.1"; + version = "3.2.0"; disabled = pythonOlder "3.6"; # There are no tests on the pypi source @@ -10,7 +10,7 @@ buildPythonPackage rec { owner = "ReactiveX"; repo = "rxpy"; rev = "v${version}"; - sha256 = "0p0cs67l40npkvwgn5sb18l1b6df1b9fg6rzlqkwk2aa0v3cpvhf"; + sha256 = "159ln0c721rrdz0mqyl3zvv6qsry7ql7ddlpwpnxs9q15ik15mnj"; }; checkInputs = [ nose ]; diff --git a/pkgs/development/python-modules/s3fs/default.nix b/pkgs/development/python-modules/s3fs/default.nix index 63a9e722f2c..467fe26d244 100644 --- a/pkgs/development/python-modules/s3fs/default.nix +++ b/pkgs/development/python-modules/s3fs/default.nix @@ -8,11 +8,11 @@ buildPythonPackage rec { pname = "s3fs"; - version = "2021.5.0"; + version = "2021.6.0"; src = fetchPypi { inherit pname version; - sha256 = "sha256-cEJVMIFMaC3E9829ofKTCtgy2/G+40G1yQURxUzBJpA="; + sha256 = "53790061e220713918602c1f110e6a84d6e3e22aaba27b8e134cc56a3ab6284c"; }; buildInputs = [ diff --git a/pkgs/development/python-modules/sagemaker/default.nix b/pkgs/development/python-modules/sagemaker/default.nix index c9bad89d93c..b61d8e96991 100644 --- a/pkgs/development/python-modules/sagemaker/default.nix +++ b/pkgs/development/python-modules/sagemaker/default.nix @@ -16,11 +16,11 @@ buildPythonPackage rec { pname = "sagemaker"; - version = "2.38.0"; + version = "2.46.0"; src = fetchPypi { inherit pname version; - sha256 = "sha256-7cIGr49fKI0zQmX4/9v/gW5yB4kfeQJ3H/Vvgl9CKuY="; + sha256 = "4f66f8c56b870e7a6f9a3882790a4074f2df26a0fe9605bc5d71e186db193525"; }; pythonImportsCheck = [ diff --git a/pkgs/development/python-modules/sanic-testing/default.nix b/pkgs/development/python-modules/sanic-testing/default.nix index 71af4a0a117..b59781e5c45 100644 --- a/pkgs/development/python-modules/sanic-testing/default.nix +++ b/pkgs/development/python-modules/sanic-testing/default.nix @@ -10,13 +10,13 @@ buildPythonPackage rec { pname = "sanic-testing"; - version = "0.4.0"; + version = "0.6.0"; src = fetchFromGitHub { owner = "sanic-org"; repo = "sanic-testing"; rev = "v${version}"; - sha256 = "0li984imqmqc001iw4m4b6cqik3d9nb4b3yvamvbwkb6hgd94sck"; + sha256 = "1pf619cd3dckn3d8gh18vbn7dflvb0mzpf6frx4y950x2j3rdplk"; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/sasmodels/default.nix b/pkgs/development/python-modules/sasmodels/default.nix index 08c9e7ce3eb..0e9b563f0f7 100644 --- a/pkgs/development/python-modules/sasmodels/default.nix +++ b/pkgs/development/python-modules/sasmodels/default.nix @@ -12,13 +12,13 @@ buildPythonPackage rec { pname = "sasmodels"; - version = "1.0.4"; + version = "1.0.5"; src = fetchFromGitHub { owner = "SasView"; repo = "sasmodels"; rev = "v${version}"; - sha256 = "0h2k81dm92sm0z086qy3ipw6y6cfgpb7ppl7lhjmx6816s3k50sa"; + sha256 = "19h30kcgpvg1qirzjm0vhgvp1yn60ivlglc8a8n2b4d9fp0acfyd"; }; buildInputs = [ opencl-headers ]; diff --git a/pkgs/development/python-modules/scancode-toolkit/default.nix b/pkgs/development/python-modules/scancode-toolkit/default.nix index f27a2d40bf3..fa7dabc2729 100644 --- a/pkgs/development/python-modules/scancode-toolkit/default.nix +++ b/pkgs/development/python-modules/scancode-toolkit/default.nix @@ -37,12 +37,12 @@ }: buildPythonPackage rec { pname = "scancode-toolkit"; - version = "21.3.31"; + version = "21.6.7"; disabled = !isPy3k; src = fetchPypi { inherit pname version; - sha256 = "7e0301031a302dedbb4304a91249534f3d036f84a119170b8a9fe70bd57cff95"; + sha256 = "056923ce556cd6d402e5cc98567cb0331a1b6349d03ec565f8ce1c9c37f3a783"; }; dontConfigure = true; diff --git a/pkgs/development/python-modules/schedule/default.nix b/pkgs/development/python-modules/schedule/default.nix index e6028d2c6cb..55dc8387806 100644 --- a/pkgs/development/python-modules/schedule/default.nix +++ b/pkgs/development/python-modules/schedule/default.nix @@ -6,11 +6,11 @@ buildPythonPackage rec { pname = "schedule"; - version = "1.0.0"; + version = "1.1.0"; src = fetchPypi { inherit pname version; - sha256 = "1654cf70860a6d4d58236c98b0f1bb71521cc2a4bbf031b6cc39c96e77d59a91"; + sha256 = "e6ca13585e62c810e13a08682e0a6a8ad245372e376ba2b8679294f377dfc8e4"; }; buildInputs = [ mock ]; diff --git a/pkgs/development/python-modules/scikit-hep-testdata/default.nix b/pkgs/development/python-modules/scikit-hep-testdata/default.nix index 28156460110..7c3ca7a6387 100644 --- a/pkgs/development/python-modules/scikit-hep-testdata/default.nix +++ b/pkgs/development/python-modules/scikit-hep-testdata/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { pname = "scikit-hep-testdata"; - version = "0.4.3"; + version = "0.4.4"; format = "pyproject"; # fetch from github as we want the data files @@ -20,7 +20,7 @@ buildPythonPackage rec { owner = "scikit-hep"; repo = pname; rev = "v${version}"; - sha256 = "sha256-3uy2uZb0Y9nOHlXtsDd9LGALvTXl1ZQ6P3m2dQ2ceHo="; + sha256 = "1kd1nl62bydb2rk47ymh30l33jbaji3mb9zbvxlvxladrbqnxagp"; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/scipy/default.nix b/pkgs/development/python-modules/scipy/default.nix index 0bc8499a373..19fa8e50728 100644 --- a/pkgs/development/python-modules/scipy/default.nix +++ b/pkgs/development/python-modules/scipy/default.nix @@ -1,24 +1,17 @@ -{lib, fetchPypi, python, buildPythonPackage, gfortran, nose, pytest, numpy, pybind11}: - -let - pybind = pybind11.overridePythonAttrs(oldAttrs: { - cmakeFlags = oldAttrs.cmakeFlags ++ [ - "-DPYBIND11_TEST=off" - ]; - doCheck = false; # Circular test dependency - }); -in buildPythonPackage rec { +{lib, fetchPypi, python, buildPythonPackage, gfortran, nose, pytest, pytest-xdist, numpy, pybind11 }: + +buildPythonPackage rec { pname = "scipy"; - version = "1.6.1"; + version = "1.6.3"; src = fetchPypi { inherit pname version; - sha256 = "048vd4c843xaq45yk3kn491gvqnvhp2i9rxhg671ddlh923fpz64"; + sha256 = "a75b014d3294fce26852a9d04ea27b5671d86736beb34acdfc05859246260707"; }; - checkInputs = [ nose pytest ]; + checkInputs = [ nose pytest pytest-xdist ]; nativeBuildInputs = [ gfortran ]; - buildInputs = [ numpy.blas pybind ]; + buildInputs = [ numpy.blas pybind11 ]; propagatedBuildInputs = [ numpy ]; # Remove tests because of broken wrapper @@ -40,7 +33,7 @@ in buildPythonPackage rec { checkPhase = '' runHook preCheck pushd dist - ${python.interpreter} -c 'import scipy; scipy.test("fast", verbose=10)' + ${python.interpreter} -c "import scipy; scipy.test('fast', verbose=10, parallel=$NIX_BUILD_CORES)" popd runHook postCheck ''; diff --git a/pkgs/development/python-modules/scp/default.nix b/pkgs/development/python-modules/scp/default.nix index abbe932c267..e0c6769b07d 100644 --- a/pkgs/development/python-modules/scp/default.nix +++ b/pkgs/development/python-modules/scp/default.nix @@ -7,11 +7,11 @@ buildPythonPackage rec { pname = "scp"; - version = "0.13.3"; + version = "0.13.4"; src = fetchPypi { inherit pname version; - sha256 = "8bd748293d7362073169b96ce4b8c4f93bcc62cfc5f7e1d949e01e406a025bd4"; + sha256 = "e60948dd3e1aa13da21aa1bf8a025fabbbc2816ed04f1a1272410247d1a86f15"; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/screenlogicpy/default.nix b/pkgs/development/python-modules/screenlogicpy/default.nix index 1713e4c2521..c8e7a81df1f 100644 --- a/pkgs/development/python-modules/screenlogicpy/default.nix +++ b/pkgs/development/python-modules/screenlogicpy/default.nix @@ -7,14 +7,14 @@ buildPythonPackage rec { pname = "screenlogicpy"; - version = "0.4.1"; + version = "0.4.2"; disabled = pythonOlder "3.6"; src = fetchFromGitHub { owner = "dieselrabbit"; repo = pname; rev = "v${version}"; - sha256 = "1rmjxqqbkfcv2xz8ilml799bzffls678fvq784fab2xdv595fndd"; + sha256 = "158y34d140bh93l143plq53l7n7mcnmqi5mj7hj0j1ljccxpjcnj"; }; checkInputs = [ diff --git a/pkgs/development/python-modules/secure/default.nix b/pkgs/development/python-modules/secure/default.nix index 49fcb52a154..890d022f1a9 100644 --- a/pkgs/development/python-modules/secure/default.nix +++ b/pkgs/development/python-modules/secure/default.nix @@ -4,15 +4,15 @@ }: buildPythonPackage rec { - version = "0.2.1"; + version = "0.3.0"; pname = "secure"; disabled = isPy27; src = fetchFromGitHub { owner = "typeerror"; repo = "secure.py"; - rev = "v${version}"; - sha256 = "1nbxwi0zccrha6js14ibd596kdi1wpqr7jgs442mqclw4b3f77q5"; + rev = version; + sha256 = "1ajz1nx0nnhsc80xbgbc42ib2h08qnccvsp5i583rd9b0f9pklwk"; }; propagatedBuildInputs = [ maya requests ]; diff --git a/pkgs/development/python-modules/serpent/default.nix b/pkgs/development/python-modules/serpent/default.nix index 50f6e0b63a6..12abfba056d 100644 --- a/pkgs/development/python-modules/serpent/default.nix +++ b/pkgs/development/python-modules/serpent/default.nix @@ -10,11 +10,11 @@ buildPythonPackage rec { pname = "serpent"; - version = "1.30.2"; + version = "1.40"; src = fetchPypi { inherit pname version; - sha256 = "72753820246a7d8486e8b385353e3bbf769abfceec2e850fa527a288b084ff7a"; + sha256 = "10b34e7f8e3207ee6fb70dcdc9bce473851ee3daf0b47c58aec1b48032ac11ce"; }; propagatedBuildInputs = lib.optionals isPy27 [ enum34 ]; diff --git a/pkgs/development/python-modules/sh/default.nix b/pkgs/development/python-modules/sh/default.nix index 964512460bf..c8da91750f0 100644 --- a/pkgs/development/python-modules/sh/default.nix +++ b/pkgs/development/python-modules/sh/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "sh"; - version = "1.14.1"; + version = "1.14.2"; src = fetchPypi { inherit pname version; - sha256 = "39aa9af22f6558a0c5d132881cf43e34828ca03e4ae11114852ca6a55c7c1d8e"; + sha256 = "9d7bd0334d494b2a4609fe521b2107438cdb21c0e469ffeeb191489883d6fe0d"; }; patches = [ diff --git a/pkgs/development/python-modules/shamir-mnemonic/default.nix b/pkgs/development/python-modules/shamir-mnemonic/default.nix index ceb3b9abcd8..74ca2228d8b 100644 --- a/pkgs/development/python-modules/shamir-mnemonic/default.nix +++ b/pkgs/development/python-modules/shamir-mnemonic/default.nix @@ -21,6 +21,11 @@ buildPythonPackage rec { sha256 = "1mi1n01yw8yycbiv1l0xnfzlhhq2arappyvyi2jm5yq65jln77kg"; }; + postPatch = '' + substituteInPlace setup.py \ + --replace "click>=7,<8" "click" + ''; + propagatedBuildInputs = [ attrs click diff --git a/pkgs/development/python-modules/simple-salesforce/default.nix b/pkgs/development/python-modules/simple-salesforce/default.nix index af92f345950..592e2357809 100644 --- a/pkgs/development/python-modules/simple-salesforce/default.nix +++ b/pkgs/development/python-modules/simple-salesforce/default.nix @@ -12,13 +12,13 @@ buildPythonPackage rec { pname = "simple-salesforce"; - version = "1.11.0"; + version = "1.11.2"; src = fetchFromGitHub { owner = pname; repo = pname; rev = "v${version}"; - sha256 = "16c34xnqa1xkdfjbxx0q584zb6aqci2z6j4211hmzjqs74ddvysm"; + sha256 = "1xysym0b1qnxck4hbj5d0l5wapwfahmkr280f6iskz2hi5j2j1yb"; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/singledispatch/default.nix b/pkgs/development/python-modules/singledispatch/default.nix index 0a9b2353bf1..8fa62e835f2 100644 --- a/pkgs/development/python-modules/singledispatch/default.nix +++ b/pkgs/development/python-modules/singledispatch/default.nix @@ -8,11 +8,11 @@ buildPythonPackage rec { pname = "singledispatch"; - version = "3.6.1"; + version = "3.6.2"; src = fetchPypi { inherit pname version; - sha256 = "58b46ce1cc4d43af0aac3ac9a047bdb0f44e05f0b2fa2eec755863331700c865"; + sha256 = "d5bb9405a4b8de48e36709238e8b91b4f6f300f81a5132ba2531a9a738eca391"; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/six/default.nix b/pkgs/development/python-modules/six/default.nix index 8d8cd790cde..24fe639211d 100644 --- a/pkgs/development/python-modules/six/default.nix +++ b/pkgs/development/python-modules/six/default.nix @@ -6,11 +6,11 @@ buildPythonPackage rec { pname = "six"; - version = "1.15.0"; + version = "1.16.0"; src = fetchPypi { inherit pname version; - sha256 = "30639c035cdb23534cd4aa2dd52c3bf48f06e5f4a941509c8bafd8ce11080259"; + sha256 = "1e61c37477a1626458e36f7b1d82aa5c9b094fa4802892072e49de9c60c4c926"; }; checkInputs = [ pytest ]; diff --git a/pkgs/development/python-modules/slack-sdk/default.nix b/pkgs/development/python-modules/slack-sdk/default.nix index 1d884959831..862789ce569 100644 --- a/pkgs/development/python-modules/slack-sdk/default.nix +++ b/pkgs/development/python-modules/slack-sdk/default.nix @@ -21,14 +21,14 @@ buildPythonPackage rec { pname = "slack-sdk"; - version = "3.6.0"; + version = "3.7.0"; disabled = !isPy3k; src = fetchFromGitHub { owner = "slackapi"; repo = "python-slack-sdk"; rev = "v${version}"; - sha256 = "sha256-OSRz8yH1yrWhN2a6ir4nxsPahwg8oHfVlJ020Swlb+Q="; + sha256 = "0bc52v5n8r3b2fy1c90w253r1abl752kaqdk6bgzkwsvbhgcxf2s"; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/slither-analyzer/default.nix b/pkgs/development/python-modules/slither-analyzer/default.nix index 57168b1d915..a4f907a1aae 100644 --- a/pkgs/development/python-modules/slither-analyzer/default.nix +++ b/pkgs/development/python-modules/slither-analyzer/default.nix @@ -14,12 +14,12 @@ buildPythonPackage rec { pname = "slither-analyzer"; - version = "0.7.1"; + version = "0.8.0"; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - sha256 = "sha256-v/UuxxgMmkGfP962AfOQU05MI8xJocpD8SkENCZi04I="; + sha256 = "0b8a2e2145daefd9443ffa43639608203532e78a858af99c4c52c2b128ca681f"; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/snowflake-connector-python/default.nix b/pkgs/development/python-modules/snowflake-connector-python/default.nix index 237f36e201b..0007b4380b4 100644 --- a/pkgs/development/python-modules/snowflake-connector-python/default.nix +++ b/pkgs/development/python-modules/snowflake-connector-python/default.nix @@ -25,12 +25,12 @@ buildPythonPackage rec { pname = "snowflake-connector-python"; - version = "2.4.3"; + version = "2.4.5"; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - sha256 = "sha256-+jAfUwaofWM5Ef1kk4AEAbBM/UES8/ZzLd4QJfkEQsM="; + sha256 = "f5bd11228e192b4754587869ebd85752327ecb945fcc19c2ed1f66958443ad08"; }; propagatedBuildInputs = [ @@ -58,6 +58,7 @@ buildPythonPackage rec { # https://github.com/snowflakedb/snowflake-connector-python/issues/705 substituteInPlace setup.py \ --replace "idna>=2.5,<3" "idna" \ + --replace "certifi<2021.0.0" "certifi" \ --replace "chardet>=3.0.2,<4" "chardet" ''; diff --git a/pkgs/development/python-modules/soco/default.nix b/pkgs/development/python-modules/soco/default.nix index c1db4dd0158..edadde8995e 100644 --- a/pkgs/development/python-modules/soco/default.nix +++ b/pkgs/development/python-modules/soco/default.nix @@ -14,14 +14,14 @@ buildPythonPackage rec { pname = "soco"; - version = "0.22.3"; + version = "0.22.6"; disabled = pythonOlder "3.6"; src = fetchFromGitHub { owner = "SoCo"; repo = "SoCo"; rev = "v${version}"; - sha256 = "sha256-RCWXXk5aQQYqyxm65M96XBoMS5UlYqyAz3aM/DVghRw="; + sha256 = "06qar4syi6g3x84klnk0mg6w5ryl50c5k3s1hag4rimbkap3x6ks"; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/sopel/default.nix b/pkgs/development/python-modules/sopel/default.nix index b7569efadf5..f74fa560adc 100644 --- a/pkgs/development/python-modules/sopel/default.nix +++ b/pkgs/development/python-modules/sopel/default.nix @@ -13,12 +13,12 @@ buildPythonPackage rec { pname = "sopel"; - version = "7.0.7"; + version = "7.1.0"; disabled = isPyPy; src = fetchPypi { inherit pname version; - sha256 = "84d42708d176aecfb7b95299af0e484896f5f80df61f43c92d8e7a53de0b2099"; + sha256 = "74057d4c86cff744b1f1062f3a9c4ae99eb4f1b17048ceb083293d5f4c7e989b"; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/sortedcontainers/default.nix b/pkgs/development/python-modules/sortedcontainers/default.nix index 3f4a6840672..8920336f8db 100644 --- a/pkgs/development/python-modules/sortedcontainers/default.nix +++ b/pkgs/development/python-modules/sortedcontainers/default.nix @@ -5,11 +5,11 @@ buildPythonPackage rec { pname = "sortedcontainers"; - version = "2.3.0"; + version = "2.4.0"; src = fetchPypi { inherit pname version; - sha256 = "59cc937650cf60d677c16775597c89a960658a09cf7c1a668f86e1e4464b10a1"; + sha256 = "25caa5a06cc30b6b83d11423433f65d1f9d76c4c6a0c90e3379eaa43b9bfdb88"; }; # pypi tarball does not come with tests diff --git a/pkgs/development/python-modules/sphinx/default.nix b/pkgs/development/python-modules/sphinx/default.nix index 5e31b6b19fa..d37ccd3e448 100644 --- a/pkgs/development/python-modules/sphinx/default.nix +++ b/pkgs/development/python-modules/sphinx/default.nix @@ -29,14 +29,14 @@ buildPythonPackage rec { pname = "sphinx"; - version = "3.5.4"; + version = "4.0.2"; disabled = pythonOlder "3.5"; src = fetchFromGitHub { owner = "sphinx-doc"; repo = pname; rev = "v${version}"; - sha256 = "1xjii3dl01rq8x2bsxc6zywiy1s7arfgxrg5l8ml54w1748shadd"; + sha256 = "sha256-0QdgHFX4r40BDHjpi9R40lXqT4n5ZgrIny+w070LZPE="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/sphinx_rtd_theme/default.nix b/pkgs/development/python-modules/sphinx_rtd_theme/default.nix index 06338ec118f..f5ec90755c1 100644 --- a/pkgs/development/python-modules/sphinx_rtd_theme/default.nix +++ b/pkgs/development/python-modules/sphinx_rtd_theme/default.nix @@ -1,29 +1,41 @@ { lib , buildPythonPackage , fetchPypi +, docutils , sphinx , readthedocs-sphinx-ext -, pytest +, pytestCheckHook }: buildPythonPackage rec { pname = "sphinx_rtd_theme"; - version = "0.5.1"; + version = "0.5.2"; src = fetchPypi { inherit pname version; - sha256 = "19c31qhfiqbm6y7mamglrc2mc7l6n4lasb8jry01lc67l3nqk9pd"; + sha256 = "32bd3b5d13dc8186d7a42fc816a23d32e83a4827d7d9882948e7b837c232da5a"; }; - propagatedBuildInputs = [ sphinx ]; - - checkInputs = [ readthedocs-sphinx-ext pytest ]; - CI=1; # Don't use NPM to fetch assets. Assets are included in sdist. + postPatch = '' + substituteInPlace setup.py \ + --replace "docutils<0.17" "docutils" + ''; - checkPhase = '' - py.test + preBuild = '' + # Don't use NPM to fetch assets. Assets are included in sdist. + export CI=1 ''; + propagatedBuildInputs = [ + docutils + sphinx + ]; + + checkInputs = [ + readthedocs-sphinx-ext + pytestCheckHook + ]; + meta = with lib; { description = "ReadTheDocs.org theme for Sphinx"; homepage = "https://github.com/readthedocs/sphinx_rtd_theme"; diff --git a/pkgs/development/python-modules/sphinxcontrib-autoapi/default.nix b/pkgs/development/python-modules/sphinxcontrib-autoapi/default.nix index c60d99d5e62..484b692f69f 100644 --- a/pkgs/development/python-modules/sphinxcontrib-autoapi/default.nix +++ b/pkgs/development/python-modules/sphinxcontrib-autoapi/default.nix @@ -13,12 +13,12 @@ buildPythonPackage rec { pname = "sphinx-autoapi"; - version = "1.7.0"; + version = "1.8.1"; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - sha256 = "48caa054a99c21156e9a1d26559281dc27f86ab8ef8bb6ef160f8cd9f4a0053d"; + sha256 = "842c0a8f49c824803f7edee31cb1cabd5001a987553bec7b4681283ec9e47d4a"; }; propagatedBuildInputs = [ astroid jinja2 pyyaml sphinx unidecode ]; diff --git a/pkgs/development/python-modules/sphinxcontrib-bibtex/default.nix b/pkgs/development/python-modules/sphinxcontrib-bibtex/default.nix index b31c79c3f75..5930c7e71b7 100644 --- a/pkgs/development/python-modules/sphinxcontrib-bibtex/default.nix +++ b/pkgs/development/python-modules/sphinxcontrib-bibtex/default.nix @@ -9,14 +9,14 @@ }: buildPythonPackage rec { - version = "2.2.0"; + version = "2.3.0"; pname = "sphinxcontrib-bibtex"; disabled = !isPy3k; src = fetchPypi { inherit pname version; - sha256 = "7500843e154d76983c23bca5ca7380965e0725c46b8f484c1322d0b58a6ce3b2"; + sha256 = "1aae1005935ae8e6499750b4ef1c8251a14ba16e025d0c0154fe2b6bf45defc0"; }; propagatedBuildInputs = [ oset pybtex pybtex-docutils sphinx ]; diff --git a/pkgs/development/python-modules/sphinxcontrib-katex/default.nix b/pkgs/development/python-modules/sphinxcontrib-katex/default.nix index 6fcafd438ba..dd38d8110f3 100644 --- a/pkgs/development/python-modules/sphinxcontrib-katex/default.nix +++ b/pkgs/development/python-modules/sphinxcontrib-katex/default.nix @@ -2,7 +2,7 @@ buildPythonPackage rec { pname = "sphinxcontrib-katex"; - version = "0.7.1"; + version = "0.8.6"; # pkgutil namespaces are broken in nixpkgs (because they can't scan multiple # directories). But python2 is EOL, so not supporting it should be ok. @@ -10,7 +10,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "fa80aba8af9d78f70a0a255815d44e33e8aca8e806ca6101e0eb18b2b7243246"; + sha256 = "c3dcdb2984626a0e6c1b11bc2580c7bbc6ab3711879b23bbf26c028a0f4fd4f2"; }; propagatedBuildInputs = [ sphinx ]; diff --git a/pkgs/development/python-modules/sphinxcontrib-serializinghtml/default.nix b/pkgs/development/python-modules/sphinxcontrib-serializinghtml/default.nix index b898e9cb67d..a238c0191a7 100644 --- a/pkgs/development/python-modules/sphinxcontrib-serializinghtml/default.nix +++ b/pkgs/development/python-modules/sphinxcontrib-serializinghtml/default.nix @@ -6,12 +6,12 @@ buildPythonPackage rec { pname = "sphinxcontrib-serializinghtml"; - version = "1.1.4"; + version = "1.1.5"; disabled = isPy27; src = fetchPypi { inherit pname version; - sha256 = "eaa0eccc86e982a9b939b2b82d12cc5d013385ba5eadcc7e4fed23f4405f77bc"; + sha256 = "aa5f6de5dfdf809ef505c4895e51ef5c9eac17d0f287933eb49ec495280b6952"; }; diff --git a/pkgs/development/python-modules/sphinxcontrib-spelling/default.nix b/pkgs/development/python-modules/sphinxcontrib-spelling/default.nix index 35b7cf38aa9..51885c4b7f3 100644 --- a/pkgs/development/python-modules/sphinxcontrib-spelling/default.nix +++ b/pkgs/development/python-modules/sphinxcontrib-spelling/default.nix @@ -10,11 +10,11 @@ buildPythonPackage rec { pname = "sphinxcontrib-spelling"; - version = "7.1.0"; + version = "7.2.1"; src = fetchPypi { inherit pname version; - sha256 = "5b4240808a6d21eab9c49e69ad5ac0cb3efb03fe2e94763d23c860f85ec6a799"; + sha256 = "f2578653014931b32c8c30d1a9930d998ae053b0d8b7adfbea0eb95a63e7a737"; }; propagatedBuildInputs = [ sphinx pyenchant pbr ] diff --git a/pkgs/development/python-modules/sphinxcontrib-tikz/default.nix b/pkgs/development/python-modules/sphinxcontrib-tikz/default.nix index facd37e9c32..19f386d7d27 100644 --- a/pkgs/development/python-modules/sphinxcontrib-tikz/default.nix +++ b/pkgs/development/python-modules/sphinxcontrib-tikz/default.nix @@ -9,11 +9,11 @@ buildPythonPackage rec { pname = "sphinxcontrib-tikz"; - version = "0.4.11"; + version = "0.4.13"; src = fetchPypi { inherit pname version; - sha256 = "5c5194055d3219e2ed8d02b52b664d399674154f3db9724ae09e881d091b3d10"; + sha256 = "882e3ccfa202559bf77b90c93ee5eb13ec50cdd7714b3673dc6580dea7236740"; }; patches = [ diff --git a/pkgs/development/python-modules/sphinxcontrib_plantuml/default.nix b/pkgs/development/python-modules/sphinxcontrib_plantuml/default.nix index 51fd34803df..473a625ae63 100644 --- a/pkgs/development/python-modules/sphinxcontrib_plantuml/default.nix +++ b/pkgs/development/python-modules/sphinxcontrib_plantuml/default.nix @@ -7,11 +7,11 @@ buildPythonPackage rec { pname = "sphinxcontrib-plantuml"; - version = "0.20"; + version = "0.21"; src = fetchPypi { inherit pname version; - sha256 = "041d8f79599522949eda129146a60955d0b7544963790411106fff6f9f3daab4"; + sha256 = "53e1808dc2b1f3ec20c177fa3fa6d438d75ef572a25a489e330bb01130508d87"; }; # No tests included. diff --git a/pkgs/development/python-modules/spyder-kernels/default.nix b/pkgs/development/python-modules/spyder-kernels/default.nix index 410e1ad0616..fa29236563e 100644 --- a/pkgs/development/python-modules/spyder-kernels/default.nix +++ b/pkgs/development/python-modules/spyder-kernels/default.nix @@ -3,11 +3,11 @@ buildPythonPackage rec { pname = "spyder-kernels"; - version = "1.10.2"; + version = "1.10.3"; src = fetchPypi { inherit pname version; - sha256 = "a507397f5ff0426cff50f1b67996b191bdc8148583aa565f5dffd3d0111c0262"; + sha256 = "cecb0ca0115a42bab864c199a737c859a8534a510fc7edfa33dc42abcbb5287f"; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/spyder/default.nix b/pkgs/development/python-modules/spyder/default.nix index 12dd743751f..5aaf4cb4a75 100644 --- a/pkgs/development/python-modules/spyder/default.nix +++ b/pkgs/development/python-modules/spyder/default.nix @@ -8,13 +8,13 @@ buildPythonPackage rec { pname = "spyder"; - version = "4.2.4"; + version = "4.2.5"; disabled = isPy27; src = fetchPypi { inherit pname version; - sha256 = "ec3a6949a3210f7a35142ddd0e8ec529bdd382ae0cae9d1537f2009f557214c8"; + sha256 = "03159003f6ea51458e10000091e65e77888b095dba48e64ca2b36c75a648580c"; }; nativeBuildInputs = [ pyqtwebengine.wrapQtAppsHook ]; diff --git a/pkgs/development/python-modules/sqlalchemy-i18n/default.nix b/pkgs/development/python-modules/sqlalchemy-i18n/default.nix index 84be4587e66..b3038c5d242 100644 --- a/pkgs/development/python-modules/sqlalchemy-i18n/default.nix +++ b/pkgs/development/python-modules/sqlalchemy-i18n/default.nix @@ -8,11 +8,11 @@ buildPythonPackage rec { pname = "SQLAlchemy-i18n"; - version = "1.0.3"; + version = "1.1.0"; src = fetchPypi { inherit pname version; - sha256 = "15xah8643p29kciz365ixs9pbsflj92pzr2d9anbdh2biyf4cka8"; + sha256 = "de33376483a581ca14218d8f57a114466c5f72b674a95839b6c4564a6e67796f"; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/sqlalchemy-imageattach/default.nix b/pkgs/development/python-modules/sqlalchemy-imageattach/default.nix index 15ac7dc3a55..55026b2b553 100644 --- a/pkgs/development/python-modules/sqlalchemy-imageattach/default.nix +++ b/pkgs/development/python-modules/sqlalchemy-imageattach/default.nix @@ -36,6 +36,7 @@ buildPythonPackage rec { homepage = "https://github.com/dahlia/sqlalchemy-imageattach"; description = "SQLAlchemy extension for attaching images to entity objects"; license = licenses.mit; + broken = true; # Incompatible with sqlalchemy>=1.4 (https://github.com/dahlia/sqlalchemy-imageattach/issues/47) }; } diff --git a/pkgs/development/python-modules/sqlalchemy-utils/default.nix b/pkgs/development/python-modules/sqlalchemy-utils/default.nix index 657ec7ac072..b59209f4295 100644 --- a/pkgs/development/python-modules/sqlalchemy-utils/default.nix +++ b/pkgs/development/python-modules/sqlalchemy-utils/default.nix @@ -5,12 +5,12 @@ buildPythonPackage rec { pname = "sqlalchemy-utils"; - version = "0.36.6"; + version = "0.37.7"; src = fetchPypi { inherit version; pname = "SQLAlchemy-Utils"; - sha256 = "0srs5w486wp5zydjs70igi5ypgxhm6h73grb85jz03fqpqaanzvs"; + sha256 = "sha256-cW2dlZIljbllGlEdA+ayVTJCwqRAhV7j99WBK7tV2es="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/sqlalchemy/default.nix b/pkgs/development/python-modules/sqlalchemy/default.nix index 5eb1a19c891..605334adf0c 100644 --- a/pkgs/development/python-modules/sqlalchemy/default.nix +++ b/pkgs/development/python-modules/sqlalchemy/default.nix @@ -14,11 +14,11 @@ buildPythonPackage rec { pname = "SQLAlchemy"; - version = "1.4.16"; + version = "1.4.18"; src = fetchPypi { inherit pname version; - sha256 = "15yl9frbxsq90hq5b8znqy34fg5kqdw1jjw933kz709rbpxw4lzd"; + sha256 = "0k3yfarfa0hcc0bza6nccy685gnmq6gikynqayrvddx6y7si0lnj"; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/sqlite-utils/default.nix b/pkgs/development/python-modules/sqlite-utils/default.nix index a6dd6e41dc5..67a6dba1a8e 100644 --- a/pkgs/development/python-modules/sqlite-utils/default.nix +++ b/pkgs/development/python-modules/sqlite-utils/default.nix @@ -15,12 +15,12 @@ buildPythonPackage rec { pname = "sqlite-utils"; - version = "3.6"; + version = "3.9.1"; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - sha256 = "sha256-WCqbz0tssy7i76Sg2PeexjDollypPGnOqqfUJOHAFWA="; + sha256 = "a08ed62eb269e26ae9c35b9be9cd3d395b0522157e6543128a40cc5302d8aa81"; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/sqlmap/default.nix b/pkgs/development/python-modules/sqlmap/default.nix index 065228eca21..5b32cb8b64a 100644 --- a/pkgs/development/python-modules/sqlmap/default.nix +++ b/pkgs/development/python-modules/sqlmap/default.nix @@ -7,11 +7,11 @@ buildPythonPackage rec { pname = "sqlmap"; - version = "1.5.3"; + version = "1.5.6"; src = fetchPypi { inherit pname version; - sha256 = "sha256-b2Q5Zelz0AWbNQotOLWdwN5+20Q5jATH3nzLEJQRwno="; + sha256 = "fc4be53bb7f64b1cc2e8058e7660059d8f5afb9857cc033084953ea615a10305"; }; postPatch = '' diff --git a/pkgs/development/python-modules/srp/default.nix b/pkgs/development/python-modules/srp/default.nix index 31f77b0ee08..17a3ab51cc7 100644 --- a/pkgs/development/python-modules/srp/default.nix +++ b/pkgs/development/python-modules/srp/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "srp"; - version = "1.0.17"; + version = "1.0.18"; src = fetchPypi { inherit pname version; - sha256 = "f2e3fed4e5cbfd6b481edc9cdd51a8c39a609eae117210218556004bdc9016b2"; + sha256 = "1582317ccd383dc39d54f223424c588254d73d1cfb2c5c24d945e018ec9516bb"; }; propagatedBuildInputs = [ six ]; diff --git a/pkgs/development/python-modules/starkbank-ecdsa/default.nix b/pkgs/development/python-modules/starkbank-ecdsa/default.nix index 70b66b9a468..9d935444339 100644 --- a/pkgs/development/python-modules/starkbank-ecdsa/default.nix +++ b/pkgs/development/python-modules/starkbank-ecdsa/default.nix @@ -6,13 +6,13 @@ buildPythonPackage rec { pname = "starkbank-ecdsa"; - version = "1.1.0"; + version = "1.1.1"; src = fetchFromGitHub { owner = "starkbank"; repo = "ecdsa-python"; rev = "v${version}"; - sha256 = "03smk33zhmv1j1svgjnykak0jnw8yl0yv03i1gsasx71f33zmfwi"; + sha256 = "1x86ia0385c76nzqa00qyrvnn4j174n6piq85m7ar5i0ij7qky9a"; }; checkInputs = [ pytestCheckHook ]; diff --git a/pkgs/development/python-modules/stripe/default.nix b/pkgs/development/python-modules/stripe/default.nix index 4be51c488d4..cfdc173995c 100644 --- a/pkgs/development/python-modules/stripe/default.nix +++ b/pkgs/development/python-modules/stripe/default.nix @@ -2,7 +2,7 @@ buildPythonPackage rec { pname = "stripe"; - version = "2.56.0"; + version = "2.58.0"; # Tests require network connectivity and there's no easy way to disable # them. ~ C. @@ -10,7 +10,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "2ff904fb8dee0d25f135059468a876852d24dc8cbe0b45d7aff56a028045777c"; + sha256 = "34829b528e652ffc919d40eff2ba78021149818bab76e33c07801382921cf6d5"; }; propagatedBuildInputs = [ requests ]; diff --git a/pkgs/development/python-modules/sumo/default.nix b/pkgs/development/python-modules/sumo/default.nix index cc47eafd1af..204bb80e587 100644 --- a/pkgs/development/python-modules/sumo/default.nix +++ b/pkgs/development/python-modules/sumo/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { pname = "sumo"; - version = "2.2.4"; + version = "2.2.5"; disabled = pythonOlder "3.6"; @@ -23,7 +23,7 @@ buildPythonPackage rec { owner = "SMTG-UCL"; repo = "sumo"; rev = "v${version}"; - sha256 = "051353gsxmh4qnabshfnc00mmzdbh1fgk1xdfnsfgcnijxgw25bb"; + sha256 = "1vwqyv215yf51j1278cn7l8mpqmy1grm9j7z3hxjlz4w65cff324"; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/surepy/default.nix b/pkgs/development/python-modules/surepy/default.nix index ff2b588e470..39be204a3d3 100644 --- a/pkgs/development/python-modules/surepy/default.nix +++ b/pkgs/development/python-modules/surepy/default.nix @@ -2,6 +2,7 @@ , aiodns , aiohttp , async-timeout +, attrs , brotlipy , buildPythonPackage , cchardet @@ -28,12 +29,19 @@ buildPythonPackage rec { sha256 = "sha256-XoYiZPBc9SybyKocui1HqSA+YPiPpbupJWMCfmQT5RU="; }; + postPatch = '' + substituteInPlace pyproject.toml \ + --replace 'click = "^7.1.2"' 'click = "*"' \ + --replace 'attrs = "^20.3.0"' 'attrs = "*"' + ''; + nativeBuildInputs = [ poetry-core ]; propagatedBuildInputs = [ aiodns aiohttp async-timeout + attrs brotlipy cchardet click diff --git a/pkgs/development/python-modules/svglib/default.nix b/pkgs/development/python-modules/svglib/default.nix index acd8fcb7816..1bc1e58f1ae 100644 --- a/pkgs/development/python-modules/svglib/default.nix +++ b/pkgs/development/python-modules/svglib/default.nix @@ -12,11 +12,11 @@ buildPythonPackage rec { pname = "svglib"; - version = "1.0.1"; + version = "1.1.0"; src = fetchPypi { inherit pname version; - sha256 = "ff01593e8c07ea462d3742e1f4141bfa261cbd4400ceb25dfb8fec3508ad0e50"; + sha256 = "520ee5290ee2ebeebd20ca0d7d995c08c903b364fcf515826bab43a1288d422e"; }; disabled = !isPy3k; diff --git a/pkgs/development/python-modules/symengine/default.nix b/pkgs/development/python-modules/symengine/default.nix index 831583c1324..c20f2338fa2 100644 --- a/pkgs/development/python-modules/symengine/default.nix +++ b/pkgs/development/python-modules/symengine/default.nix @@ -11,13 +11,13 @@ buildPythonPackage rec { pname = "symengine"; - version = "0.7.0.post3"; + version = "0.7.2"; src = fetchFromGitHub { owner = "symengine"; repo = "symengine.py"; rev = "v${version}"; - sha256 = "1hpwnnv6f7f2wj33zaaj3i2r0d0qj0jwm3fd4ayicj0rvqya50rx"; + sha256 = "1xaclpvk7m6mbp70zrsvi3blz4v89pbsf7b6rpmx5903m6kxqr4m"; }; postConfigure = '' diff --git a/pkgs/development/python-modules/sympy/default.nix b/pkgs/development/python-modules/sympy/default.nix index c935176e0d5..0d9cf098e66 100644 --- a/pkgs/development/python-modules/sympy/default.nix +++ b/pkgs/development/python-modules/sympy/default.nix @@ -8,11 +8,11 @@ buildPythonPackage rec { pname = "sympy"; - version = "1.7.1"; + version = "1.8"; src = fetchPypi { inherit pname version; - sha256 = "sha256-o96SYel1Nbg7uGB7DaLH0DEmZQ+v6isniWV7Ipwkay4="; + sha256 = "1ca588a9f6ce6a323c5592f9635159c2093572826668a1022c75c75bdf0297cb"; }; checkInputs = [ glibcLocales ]; diff --git a/pkgs/development/python-modules/tempora/default.nix b/pkgs/development/python-modules/tempora/default.nix index 734bfc64502..b06a53cb333 100644 --- a/pkgs/development/python-modules/tempora/default.nix +++ b/pkgs/development/python-modules/tempora/default.nix @@ -6,11 +6,11 @@ buildPythonPackage rec { pname = "tempora"; - version = "4.0.1"; + version = "4.0.2"; src = fetchPypi { inherit pname version; - sha256 = "9af06854fafb26d3d40d3dd6402e8baefaf57f90e48fdc9a94f6b22827a60fb3"; + sha256 = "10fdc29bf85fa0df39a230a225bb6d093982fc0825b648a414bbc06bddd79909"; }; disabled = pythonOlder "3.2"; diff --git a/pkgs/development/python-modules/tensorboardx/default.nix b/pkgs/development/python-modules/tensorboardx/default.nix index f83467520c9..6d04506cf8c 100644 --- a/pkgs/development/python-modules/tensorboardx/default.nix +++ b/pkgs/development/python-modules/tensorboardx/default.nix @@ -18,13 +18,13 @@ buildPythonPackage rec { pname = "tensorboardx"; - version = "2.1"; + version = "2.2"; src = fetchFromGitHub { owner = "lanpa"; repo = "tensorboardX"; rev = "v${version}"; - sha256 = "1palz91y0b39pcmwg6wdmqfal38hai99dd6r88i3imqxdbmjghih"; + sha256 = "0wjlh5fhamrrff3rm8j5ws9ncblwjgwf3nanxgr1bkn7asgynhys"; }; # apparently torch API changed a bit at 1.6 diff --git a/pkgs/development/python-modules/terminado/default.nix b/pkgs/development/python-modules/terminado/default.nix index 846c8157b75..27c159349b0 100644 --- a/pkgs/development/python-modules/terminado/default.nix +++ b/pkgs/development/python-modules/terminado/default.nix @@ -7,11 +7,11 @@ buildPythonPackage rec { pname = "terminado"; - version = "0.9.3"; + version = "0.10.1"; src = fetchPypi { inherit pname version; - sha256 = "261c0b7825fecf629666e1820b484a5380f7e54d6b8bd889fa482e99dcf9bde4"; + sha256 = "89d5dac2f4e2b39758a0ff9a3b643707c95a020a6df36e70583b88297cd59cbe"; }; propagatedBuildInputs = [ ptyprocess tornado ]; diff --git a/pkgs/development/python-modules/termplotlib/default.nix b/pkgs/development/python-modules/termplotlib/default.nix index adccc99ac2f..dae40dcb993 100644 --- a/pkgs/development/python-modules/termplotlib/default.nix +++ b/pkgs/development/python-modules/termplotlib/default.nix @@ -9,13 +9,13 @@ buildPythonPackage rec { pname = "termplotlib"; - version = "0.3.4"; + version = "0.3.5"; src = fetchFromGitHub { owner = "nschloe"; repo = pname; rev = "v${version}"; - sha256 = "17d2727bz6kqhxczixx6nxzz4hzyi2cssylzazjimk07syvycd6n"; + sha256 = "1z6bw6lkbrgjyq3ndsx20gwpai4scm1q9rjh4rdz0rvja4jdcv3z"; }; format = "pyproject"; diff --git a/pkgs/development/python-modules/tern/default.nix b/pkgs/development/python-modules/tern/default.nix index 7eb889c873a..e00e06561f0 100644 --- a/pkgs/development/python-modules/tern/default.nix +++ b/pkgs/development/python-modules/tern/default.nix @@ -15,11 +15,11 @@ }: buildPythonPackage rec { pname = "tern"; - version = "2.5.0"; + version = "2.6.1"; src = fetchPypi { inherit pname version; - sha256 = "606c62944991b2cbcccf3f5353be693305d6d7d318c3865b9ecca49dbeab2727"; + sha256 = "749c18ef493ebe3ac28624b2b26c6e38f77de2afd6a6579d2c92393d8fbdbd46"; }; patches = [ diff --git a/pkgs/development/python-modules/testpath/default.nix b/pkgs/development/python-modules/testpath/default.nix index c95bd0c78b6..be332ac791a 100644 --- a/pkgs/development/python-modules/testpath/default.nix +++ b/pkgs/development/python-modules/testpath/default.nix @@ -1,18 +1,22 @@ { lib , buildPythonPackage , fetchPypi +, pytestCheckHook }: buildPythonPackage rec { pname = "testpath"; - version = "0.4.4"; - format = "wheel"; + version = "0.5.0"; src = fetchPypi { - inherit pname version format; - sha256 = "bfcf9411ef4bf3db7579063e0546938b1edda3d69f4e1fb8756991f5951f85d4"; + inherit pname version; + sha256 = "05z4s4d5i1ja16hiv4jhqv63fvg1a4vw77s0ay1sw11hrl5pmkqs"; }; + checkInputs = [ + pytestCheckHook + ]; + meta = with lib; { description = "Test utilities for code working with files and commands"; license = licenses.mit; diff --git a/pkgs/development/python-modules/thespian/default.nix b/pkgs/development/python-modules/thespian/default.nix index 589ff573ca5..7f353a19207 100644 --- a/pkgs/development/python-modules/thespian/default.nix +++ b/pkgs/development/python-modules/thespian/default.nix @@ -1,13 +1,13 @@ { fetchPypi, buildPythonPackage, lib }: buildPythonPackage rec { - version = "3.10.3"; + version = "3.10.5"; pname = "thespian"; src = fetchPypi { inherit pname version; extension = "zip"; - sha256 = "d9152089f239c80339eb0431b9561966a841fb3ab0d043b36fa47934fc7956f2"; + sha256 = "17adad8afbc4779a01f34a6595c63fceccfd21f10556b85a261338eb99b5d306"; }; # Do not run the test suite: it takes a long time and uses diff --git a/pkgs/development/python-modules/tifffile/default.nix b/pkgs/development/python-modules/tifffile/default.nix index 70b815c4ec9..40654366ea2 100644 --- a/pkgs/development/python-modules/tifffile/default.nix +++ b/pkgs/development/python-modules/tifffile/default.nix @@ -13,11 +13,11 @@ buildPythonPackage rec { pname = "tifffile"; - version = "2021.3.17"; + version = "2021.6.14"; src = fetchPypi { inherit pname version; - sha256 = "1b72c92ecd2273e52686c0f8792d1d1c4da4109b241dd1723dfe56ef4d1ad612"; + sha256 = "a2f83d82800a8d83cbd04340f9d65a6873a970874947a6b823b1b1238e84cba6"; }; patches = lib.optional isPy27 ./python2-regex-compat.patch; diff --git a/pkgs/development/python-modules/titlecase/default.nix b/pkgs/development/python-modules/titlecase/default.nix index 9dc09db98f4..7a250c680e3 100644 --- a/pkgs/development/python-modules/titlecase/default.nix +++ b/pkgs/development/python-modules/titlecase/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "titlecase"; - version = "2.0.0"; + version = "2.2.0"; src = fetchPypi { inherit pname version; - sha256 = "d6b24c4bfce6b05ee55da48901a1aa39eac20f223160b7872dcf1b8182214bec"; + sha256 = "5d97ee51da37fb57c8753b79efa8edfdf3f10c0060de926efee970081e28d52f"; }; propagatedBuildInputs = [ regex ]; diff --git a/pkgs/development/python-modules/tld/default.nix b/pkgs/development/python-modules/tld/default.nix index ed601a2620c..875ab959a78 100644 --- a/pkgs/development/python-modules/tld/default.nix +++ b/pkgs/development/python-modules/tld/default.nix @@ -11,11 +11,11 @@ buildPythonPackage rec { pname = "tld"; - version = "0.12.5"; + version = "0.12.6"; src = fetchPypi { inherit pname version; - sha256 = "0d1lbbg2qdw5jjxks0dqlf69bki5885mhj8ysvgylmrni56hjqqv"; + sha256 = "69fed19d26bb3f715366fb4af66fdeace896c55c052b00e8aaba3a7b63f3e7f0"; }; checkInputs = [ diff --git a/pkgs/development/python-modules/tomlkit/default.nix b/pkgs/development/python-modules/tomlkit/default.nix index cabe2ebcd5e..fd6cec70f06 100644 --- a/pkgs/development/python-modules/tomlkit/default.nix +++ b/pkgs/development/python-modules/tomlkit/default.nix @@ -4,11 +4,11 @@ buildPythonPackage rec { pname = "tomlkit"; - version = "0.7.0"; + version = "0.7.2"; src = fetchPypi { inherit pname version; - sha256 = "ac57f29693fab3e309ea789252fcce3061e19110085aa31af5446ca749325618"; + sha256 = "d7a454f319a7e9bd2e249f239168729327e4dd2d27b17dc68be264ad1ce36754"; }; propagatedBuildInputs = diff --git a/pkgs/development/python-modules/torchvision/default.nix b/pkgs/development/python-modules/torchvision/default.nix index 8f3cb085b65..a42c517ede9 100644 --- a/pkgs/development/python-modules/torchvision/default.nix +++ b/pkgs/development/python-modules/torchvision/default.nix @@ -14,13 +14,13 @@ buildPythonPackage rec { pname = "torchvision"; - version = "0.9.0"; + version = "0.10.0"; src = fetchFromGitHub { owner = "pytorch"; repo = "vision"; rev = "v${version}"; - sha256 = "0rw186nki7q8igk481p2mvx4n763i3kpn663yp3dibkimddpnf9k"; + sha256 = "13j04ij0jmi58nhav1p69xrm8dg7jisg23268i3n6lnms37n02kc"; }; nativeBuildInputs = [ libpng ninja which ]; diff --git a/pkgs/development/python-modules/towncrier/default.nix b/pkgs/development/python-modules/towncrier/default.nix index a7573e669a8..6b699a2fbc2 100644 --- a/pkgs/development/python-modules/towncrier/default.nix +++ b/pkgs/development/python-modules/towncrier/default.nix @@ -11,11 +11,11 @@ buildPythonPackage rec { pname = "towncrier"; - version = "19.2.0"; + version = "19.9.0"; src = fetchPypi { inherit pname version; - sha256 = "15l1gb0hhi9pf3mhhb9vpc93w6w3hrih2ljmzbkgfb3dwqd1l9a8"; + sha256 = "19916889879353a8863f3de8cb1ef19b305a0b5cfd9d36159d76ca2fef08e9aa"; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/tox/default.nix b/pkgs/development/python-modules/tox/default.nix index a90b3dcfdf1..035bb9701bb 100644 --- a/pkgs/development/python-modules/tox/default.nix +++ b/pkgs/development/python-modules/tox/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { pname = "tox"; - version = "3.23.0"; + version = "3.23.1"; buildInputs = [ setuptools-scm ]; propagatedBuildInputs = [ packaging pluggy py six virtualenv toml filelock ]; @@ -22,7 +22,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "05a4dbd5e4d3d8269b72b55600f0b0303e2eb47ad5c6fe76d3576f4c58d93661"; + sha256 = "307a81ddb82bd463971a273f33e9533a24ed22185f27db8ce3386bff27d324e3"; }; meta = with lib; { diff --git a/pkgs/development/python-modules/tqdm/default.nix b/pkgs/development/python-modules/tqdm/default.nix index fe16fb6ddec..fe2eb35d4df 100644 --- a/pkgs/development/python-modules/tqdm/default.nix +++ b/pkgs/development/python-modules/tqdm/default.nix @@ -14,11 +14,11 @@ buildPythonPackage rec { pname = "tqdm"; - version = "4.60.0"; + version = "4.61.1"; src = fetchPypi { inherit pname version; - sha256 = "ebdebdb95e3477ceea267decfc0784859aa3df3e27e22d23b83e9b272bf157ae"; + sha256 = "24be966933e942be5f074c29755a95b315c69a91f839a29139bf26ffffe2d3fd"; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/trackpy/default.nix b/pkgs/development/python-modules/trackpy/default.nix index ff4c4a76758..2c2df4878e3 100644 --- a/pkgs/development/python-modules/trackpy/default.nix +++ b/pkgs/development/python-modules/trackpy/default.nix @@ -12,13 +12,13 @@ buildPythonPackage rec { pname = "trackpy"; - version = "0.4.2"; + version = "0.5.0"; src = fetchFromGitHub { owner = "soft-matter"; repo = pname; rev = "v${version}"; - sha256 = "16mc22z3104fvygky4gy3gvifjijm42db48v2z1y0fmyf6whi9p6"; + sha256 = "0if069f4sjyjl7wvzyzk8k9q9qjixswcc6aszrrgfb4a4mix3h1g"; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/traitsui/default.nix b/pkgs/development/python-modules/traitsui/default.nix index 5748ff91db1..774a42fc13a 100644 --- a/pkgs/development/python-modules/traitsui/default.nix +++ b/pkgs/development/python-modules/traitsui/default.nix @@ -4,11 +4,11 @@ buildPythonPackage rec { pname = "traitsui"; - version = "7.1.1"; + version = "7.2.1"; src = fetchPypi { inherit pname version; - sha256 = "77d9dc5830c4e7ab94f9225bc2f082430399d95c943f1616db41e83a94df38e5"; + sha256 = "dfc39015faf0591f9927e3d4d22bd95a16d49c85db30e60acd4ba7b85c7c5d5b"; }; propagatedBuildInputs = [ traits pyface six ]; diff --git a/pkgs/development/python-modules/transmission-rpc/default.nix b/pkgs/development/python-modules/transmission-rpc/default.nix index 533b34ca343..50e112583f1 100644 --- a/pkgs/development/python-modules/transmission-rpc/default.nix +++ b/pkgs/development/python-modules/transmission-rpc/default.nix @@ -9,11 +9,11 @@ buildPythonPackage rec { pname = "transmission-rpc"; - version = "3.2.4"; + version = "3.2.5"; src = fetchPypi { inherit pname version; - sha256 = "f852d1afd0f0d4f515fe20f0de94d57b6d2e36cbac45e07da43ea0b6518f535c"; + sha256 = "59598c9aa338703951686420fea292d9ba2d83d2a81361f16b64c2603c4ebb45"; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/treq/default.nix b/pkgs/development/python-modules/treq/default.nix index 8bfbd534f57..85c5e10e8cb 100644 --- a/pkgs/development/python-modules/treq/default.nix +++ b/pkgs/development/python-modules/treq/default.nix @@ -4,11 +4,11 @@ buildPythonPackage rec { pname = "treq"; - version = "21.1.0"; + version = "21.5.0"; src = fetchPypi { inherit pname version; - sha256 = "fdae0c872c444ed96c3cb11be8445d22e4afb731e87fdddae3b00c609e77199f"; + sha256 = "02ea86383fc4b57539c45a965eaa1e9fd28302cdf382d21da8430050c97be9b8"; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/trimesh/default.nix b/pkgs/development/python-modules/trimesh/default.nix index aad81957d72..e9b80d79794 100644 --- a/pkgs/development/python-modules/trimesh/default.nix +++ b/pkgs/development/python-modules/trimesh/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "trimesh"; - version = "3.9.10"; + version = "3.9.20"; src = fetchPypi { inherit pname version; - sha256 = "7ed243bc818f7a9a021d8dd39f69ae7ed366dfd9582b13d686e1b1e8c8326bcf"; + sha256 = "476173507224bd07febc94070d30e5d704f541b48cd2db4c3bc2fe562498e22c"; }; propagatedBuildInputs = [ numpy ]; diff --git a/pkgs/development/python-modules/trio/default.nix b/pkgs/development/python-modules/trio/default.nix index baaff068dbc..acd7c7acfb4 100644 --- a/pkgs/development/python-modules/trio/default.nix +++ b/pkgs/development/python-modules/trio/default.nix @@ -18,12 +18,12 @@ buildPythonPackage rec { pname = "trio"; - version = "0.18.0"; + version = "0.19.0"; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - sha256 = "0xm0bd1rrlb4l9q0nf2n1wg7xh42ljdnm4i4j0651zi73zk6m9l7"; + sha256 = "895e318e5ec5e8cea9f60b473b6edb95b215e82d99556a03eb2d20c5e027efe1"; }; checkInputs = [ astor pytestCheckHook pyopenssl trustme jedi pylint yapf ]; diff --git a/pkgs/development/python-modules/trustme/default.nix b/pkgs/development/python-modules/trustme/default.nix index a959bef1682..556ca3e2e6e 100644 --- a/pkgs/development/python-modules/trustme/default.nix +++ b/pkgs/development/python-modules/trustme/default.nix @@ -13,11 +13,11 @@ buildPythonPackage rec { pname = "trustme"; - version = "0.7.0"; + version = "0.8.0"; src = fetchPypi { inherit pname version; - sha256 = "1fde1dd27052ab5e5693e1fbe3ba091a6496daf1125409d73232561145fca369"; + sha256 = "3dcfbe186bf33d146347c6180b67564257f2708960027ab6d24fea2865daabca"; }; checkInputs = [ diff --git a/pkgs/development/python-modules/trytond/default.nix b/pkgs/development/python-modules/trytond/default.nix index 1be8fc18d27..f0cb79b0a8b 100644 --- a/pkgs/development/python-modules/trytond/default.nix +++ b/pkgs/development/python-modules/trytond/default.nix @@ -23,12 +23,12 @@ buildPythonApplication rec { pname = "trytond"; - version = "5.8.5"; + version = "5.8.9"; disabled = pythonOlder "3.5"; src = fetchPypi { inherit pname version; - sha256 = "62753cebdae2d9e2d6bf8a5dde840ef77540414c4df76c8ed202c0c0d0bedb02"; + sha256 = "5f14e9615ff91e18c146c74eb4c1cd56112662361a52c73389f15baced0bef18"; }; # Tells the tests which database to use diff --git a/pkgs/development/python-modules/tubeup/default.nix b/pkgs/development/python-modules/tubeup/default.nix index 9d63e466e29..c8e5db2680d 100644 --- a/pkgs/development/python-modules/tubeup/default.nix +++ b/pkgs/development/python-modules/tubeup/default.nix @@ -9,13 +9,13 @@ buildPythonPackage rec { pname = "tubeup"; - version = "0.0.25"; + version = "0.0.26"; disabled = isPy27; src = fetchPypi { inherit pname version; - sha256 = "c1869363eddb85f39c05971d159bb2bf8cafa596acff3b9117635ebebfd1d342"; + sha256 = "842bc03c354d8f952436109264db6cd9146f26cee281d1540d5d7c3aa7371bcc"; }; postPatch = '' diff --git a/pkgs/development/python-modules/tvdb_api/default.nix b/pkgs/development/python-modules/tvdb_api/default.nix index 845aff673b7..2af25abf3ed 100644 --- a/pkgs/development/python-modules/tvdb_api/default.nix +++ b/pkgs/development/python-modules/tvdb_api/default.nix @@ -7,11 +7,11 @@ buildPythonPackage rec { pname = "tvdb_api"; - version = "3.0.2"; + version = "3.1.0"; src = fetchPypi { inherit pname version; - sha256 = "6a0135815cb680da38d78121d4d659d8e54a25f4db2816cd86d62916b92f23b2"; + sha256 = "f63f6db99441bb202368d44aaabc956acc4202b18fc343a66bf724383ee1f563"; }; propagatedBuildInputs = [ requests-cache ]; diff --git a/pkgs/development/python-modules/tvnamer/default.nix b/pkgs/development/python-modules/tvnamer/default.nix index 6a720421c72..a9439d3e887 100644 --- a/pkgs/development/python-modules/tvnamer/default.nix +++ b/pkgs/development/python-modules/tvnamer/default.nix @@ -7,11 +7,11 @@ buildPythonPackage rec { pname = "tvnamer"; - version = "3.0.2"; + version = "3.0.4"; src = fetchPypi { inherit pname version; - sha256 = "a5ff916e104b2c0b567c2c7f2d8ae15a66a7ac57d67390e7c67207a33b79022f"; + sha256 = "dc2ea8188df6ac56439343630466b874c57756dd0b2538dd8e7905048f425f04"; }; checkInputs = [ pytest ]; diff --git a/pkgs/development/python-modules/twiggy/default.nix b/pkgs/development/python-modules/twiggy/default.nix index 45e59860227..748d4517661 100644 --- a/pkgs/development/python-modules/twiggy/default.nix +++ b/pkgs/development/python-modules/twiggy/default.nix @@ -6,11 +6,11 @@ buildPythonPackage rec { pname = "Twiggy"; - version = "0.5.0"; + version = "0.5.1"; src = fetchPypi { inherit pname version; - sha256 = "259ae96cb22e80c49e75c37dc2f7497028c5dc19018958f05fa00ec08fc2569f"; + sha256 = "7938840275972f6ce89994a5bdfb0b84f0386301a043a960af6364952e78ffe4"; }; propagatedBuildInputs = [ six ]; diff --git a/pkgs/development/python-modules/twitter/default.nix b/pkgs/development/python-modules/twitter/default.nix index 7114dc661f4..f8a5124f2df 100644 --- a/pkgs/development/python-modules/twitter/default.nix +++ b/pkgs/development/python-modules/twitter/default.nix @@ -1,17 +1,19 @@ { lib , buildPythonPackage , fetchPypi +, setuptools-scm }: buildPythonPackage rec { pname = "twitter"; - version = "1.18.0"; + version = "1.19.3"; src = fetchPypi { inherit pname version; - sha256 = "acdc85e5beea752967bb64c63bde8b915c49a31a01db1b2fecccf9f2c1d5c44d"; + sha256 = "a56ff9575fbd50a51ce91107dcb5a4c3fd00c2ba1bcb172ce538b0948d3626e6"; }; + nativeBuildInputs = [ setuptools-scm ]; doCheck = false; meta = with lib; { diff --git a/pkgs/development/python-modules/typecode/default.nix b/pkgs/development/python-modules/typecode/default.nix index c1208193f01..baed3c7fe41 100644 --- a/pkgs/development/python-modules/typecode/default.nix +++ b/pkgs/development/python-modules/typecode/default.nix @@ -13,11 +13,11 @@ }: buildPythonPackage rec { pname = "typecode"; - version = "21.2.24"; + version = "21.6.1"; src = fetchPypi { inherit pname version; - sha256 = "eaac8aee0b9c6142ad44671252ba00748202d218347d1c0451ce6cd76561e01b"; + sha256 = "d3a82859df5607c900972e08e1bca31e3fe2daed37afd1b8231cad2ef613d8d6"; }; dontConfigure = true; diff --git a/pkgs/development/python-modules/typeguard/default.nix b/pkgs/development/python-modules/typeguard/default.nix index 2ee404cb18e..0385bd70706 100644 --- a/pkgs/development/python-modules/typeguard/default.nix +++ b/pkgs/development/python-modules/typeguard/default.nix @@ -10,11 +10,11 @@ buildPythonPackage rec { pname = "typeguard"; - version = "2.12.0"; + version = "2.12.1"; src = fetchPypi { inherit pname version; - sha256 = "sha256-/Kd/1My6Y0ZbQhzburWhqOOZTm1vGLRdortHXAnxR+8="; + sha256 = "c2af8b9bdd7657f4bd27b45336e7930171aead796711bc4cfc99b4731bb9d051"; }; buildInputs = [ setuptools-scm ]; diff --git a/pkgs/development/python-modules/typing-extensions/default.nix b/pkgs/development/python-modules/typing-extensions/default.nix index 655b3384af1..fd8a25a485b 100644 --- a/pkgs/development/python-modules/typing-extensions/default.nix +++ b/pkgs/development/python-modules/typing-extensions/default.nix @@ -4,11 +4,11 @@ let in buildPythonPackage rec { pname = "typing_extensions"; - version = "3.7.4.3"; + version = "3.10.0.0"; src = fetchPypi { inherit pname version; - sha256 = "99d4073b617d30288f569d3f13d2bd7548c3a7e4c8de87db09a9d29bb3a4a60c"; + sha256 = "50b6f157849174217d0656f99dc82fe932884fb250826c18350e159ec6cdf342"; }; checkInputs = lib.optional (pythonOlder "3.5") typing; diff --git a/pkgs/development/python-modules/typing/default.nix b/pkgs/development/python-modules/typing/default.nix index 823ee2af29e..b3dcea20323 100644 --- a/pkgs/development/python-modules/typing/default.nix +++ b/pkgs/development/python-modules/typing/default.nix @@ -6,11 +6,11 @@ let in buildPythonPackage rec { pname = "typing"; - version = "3.7.4.3"; + version = "3.10.0.0"; src = fetchPypi { inherit pname version; - sha256 = "1187fb9c82fd670d10aa07bbb6cfcfe4bdda42d6fab8d5134f04e8c4d0b71cc9"; + sha256 = "13b4ad211f54ddbf93e5901a9967b1e07720c1d1b78d596ac6a439641aa1b130"; }; disabled = pythonAtLeast "3.5"; diff --git a/pkgs/development/python-modules/upb-lib/default.nix b/pkgs/development/python-modules/upb-lib/default.nix new file mode 100644 index 00000000000..356a290241e --- /dev/null +++ b/pkgs/development/python-modules/upb-lib/default.nix @@ -0,0 +1,36 @@ +{ lib +, buildPythonPackage +, pythonOlder +, fetchPypi +, pyserial-asyncio +, pytz +}: + +buildPythonPackage rec { + pname = "upb-lib"; + version = "0.4.12"; + + disabled = pythonOlder "3.7"; + + src = fetchPypi { + inherit pname version; + sha256 = "e668055d9c389aefd09203afb96a950a320095f225ef0a1aa611e592db92a71b"; + }; + + propagatedBuildInputs = [ + pyserial-asyncio + pytz + ]; + + # no tests on PyPI, no tags on GitHub + doCheck = false; + + pythonImportsCheck = [ "upb_lib" ]; + + meta = with lib; { + description = "Library for interacting with UPB PIM"; + homepage = "https://github.com/gwww/upb-lib"; + license = licenses.mit; + maintainers = with maintainers; [ dotlambda ]; + }; +} diff --git a/pkgs/development/python-modules/uritools/default.nix b/pkgs/development/python-modules/uritools/default.nix index d90bf39f336..1d915042808 100644 --- a/pkgs/development/python-modules/uritools/default.nix +++ b/pkgs/development/python-modules/uritools/default.nix @@ -2,12 +2,12 @@ buildPythonPackage rec { pname = "uritools"; - version = "3.0.1"; + version = "3.0.2"; disabled = isPy27; src = fetchPypi { inherit pname version; - sha256 = "a3e9c794d44fdbd54642dcb7d6ef3ba9866d953eb34f65aeca3754b7ad5c1ea0"; + sha256 = "28ffef82ce3b2793237d36e45aa7cde28dae6502f6a93fdbd05ede401520e279"; }; meta = with lib; { diff --git a/pkgs/development/python-modules/urllib3/default.nix b/pkgs/development/python-modules/urllib3/default.nix index 35cb0b25564..eec8e284c0e 100644 --- a/pkgs/development/python-modules/urllib3/default.nix +++ b/pkgs/development/python-modules/urllib3/default.nix @@ -19,11 +19,11 @@ buildPythonPackage rec { pname = "urllib3"; - version = "1.26.4"; + version = "1.26.5"; src = fetchPypi { inherit pname version; - sha256 = "0dw9w9bs3hmr5dp3r3h43jyzzb1g1046ag7lj8pqf58i4kvj3c77"; + sha256 = "sha256-p6zQl3ElMl9Ra9qXNfpxQrkJqNAeiy5MgQjQmE5uAJg="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/uvicorn/default.nix b/pkgs/development/python-modules/uvicorn/default.nix index 36e8b12929e..22e291c4b59 100644 --- a/pkgs/development/python-modules/uvicorn/default.nix +++ b/pkgs/development/python-modules/uvicorn/default.nix @@ -1,67 +1,71 @@ -{ stdenv -, lib +{ lib , buildPythonPackage +, callPackage , fetchFromGitHub +, asgiref , click +, colorama , h11 , httptools -, uvloop -, websockets -, wsproto -, pytestCheckHook -, pytest-mock +, python-dotenv , pyyaml , requests -, trustme , typing-extensions -, isPy27 +, uvloop +, watchgod +, websockets +, wsproto , pythonOlder }: buildPythonPackage rec { pname = "uvicorn"; - version = "0.13.2"; - disabled = isPy27; + version = "0.14.0"; + disabled = pythonOlder "3.6"; src = fetchFromGitHub { owner = "encode"; repo = pname; rev = version; - sha256 = "04zgmp9z46k72ay6cz7plga6d3w3a6x41anabm7ramp7jdqf6na9"; + sha256 = "164x92k3rs47ihkmwq5av396576dxp4rzv6557pwgc1ign2ikqy1"; }; + outputs = [ + "out" + "testsout" + ]; + propagatedBuildInputs = [ + asgiref click + colorama h11 httptools + python-dotenv + pyyaml uvloop + watchgod websockets wsproto ] ++ lib.optionals (pythonOlder "3.8") [ typing-extensions ]; - checkInputs = [ - pytestCheckHook - pytest-mock - pyyaml - requests - trustme - ]; - - doCheck = !stdenv.isDarwin; + postInstall = '' + mkdir $testsout + cp -R tests $testsout/tests + ''; - __darwinAllowLocalNetworking = true; - - pytestFlagsArray = [ - # watchgod required the watchgod package, which isn't available in nixpkgs - "--ignore=tests/supervisors/test_reload.py" + pythonImportsCheck = [ + "uvicorn" ]; - disabledTests = [ - "test_supported_upgrade_request" - "test_invalid_upgrade" - ]; + # check in passthru.tests.pytest to escape infinite recursion with httpx/httpcore + doCheck = false; + + passthru.tests = { + pytest = callPackage ./tests.nix { }; + }; meta = with lib; { homepage = "https://www.uvicorn.org/"; diff --git a/pkgs/development/python-modules/uvicorn/tests.nix b/pkgs/development/python-modules/uvicorn/tests.nix new file mode 100644 index 00000000000..2fc0e932b8e --- /dev/null +++ b/pkgs/development/python-modules/uvicorn/tests.nix @@ -0,0 +1,40 @@ +{ stdenv +, buildPythonPackage +, uvicorn +, httpx +, pytest-asyncio +, pytestCheckHook +, pytest-mock +, requests +, trustme +}: + +buildPythonPackage rec { + pname = "uvicorn-tests"; + inherit (uvicorn) version; + + src = uvicorn.testsout; + + dontBuild = true; + dontInstall = true; + + checkInputs = [ + uvicorn + httpx + pytestCheckHook + pytest-asyncio + pytest-mock + requests + trustme + ]; + + doCheck = !stdenv.isDarwin; + + __darwinAllowLocalNetworking = true; + + disabledTests = [ + "test_supported_upgrade_request" + "test_invalid_upgrade" + ]; +} + diff --git a/pkgs/development/python-modules/vega/default.nix b/pkgs/development/python-modules/vega/default.nix index 04c38838a43..50fc4275c9b 100644 --- a/pkgs/development/python-modules/vega/default.nix +++ b/pkgs/development/python-modules/vega/default.nix @@ -3,12 +3,12 @@ buildPythonPackage rec { pname = "vega"; - version = "3.4.0"; + version = "3.5.0"; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - sha256 = "f343ceb11add58d24cd320d69e410b111a56c98c9069ebb4ef89c608c4c1950d"; + sha256 = "1c22877758cef97e81dbb665c83d31f7427bbc804a01503fa2845a35403c54ad"; }; propagatedBuildInputs = [ jupyter jupyter_core pandas ipywidgets ]; diff --git a/pkgs/development/python-modules/vilfo-api-client/default.nix b/pkgs/development/python-modules/vilfo-api-client/default.nix new file mode 100644 index 00000000000..cdc01d93a85 --- /dev/null +++ b/pkgs/development/python-modules/vilfo-api-client/default.nix @@ -0,0 +1,51 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, setuptools-scm +, getmac +, requests +, pytestCheckHook +, responses +}: + +buildPythonPackage rec { + pname = "vilfo-api-client"; + version = "0.3.3"; + + src = fetchFromGitHub { + owner = "ManneW"; + repo = "vilfo-api-client-python"; + rev = "v${version}"; + sha256 = "1gy5gpsg99rcm1cc3m30232za00r9i46sp74zpd12p3vzz1wyyqf"; + }; + + postPatch = '' + substituteInPlace setup.cfg \ + --replace "get-mac" "getmac" + ''; + + nativeBuildInputs = [ + setuptools-scm + ]; + + SETUPTOOLS_SCM_PRETEND_VERSION = version; + + propagatedBuildInputs = [ + getmac + requests + ]; + + checkInputs = [ + pytestCheckHook + responses + ]; + + pythonImportsCheck = [ "vilfo" ]; + + meta = with lib; { + description = "Simple wrapper client for the Vilfo router API"; + homepage = "https://github.com/ManneW/vilfo-api-client-python"; + license = licenses.mit; + maintainers = with maintainers; [ dotlambda ]; + }; +} diff --git a/pkgs/development/python-modules/virtual-display/default.nix b/pkgs/development/python-modules/virtual-display/default.nix index bf47297b1c5..f2f6dd31a50 100644 --- a/pkgs/development/python-modules/virtual-display/default.nix +++ b/pkgs/development/python-modules/virtual-display/default.nix @@ -2,13 +2,13 @@ buildPythonPackage rec { pname = "PyVirtualDisplay"; - version = "2.1"; + version = "2.2"; propagatedBuildInputs = [ EasyProcess ]; src = fetchPypi { inherit pname version; - sha256 = "9d4c6957ec2c4753b5293fb6a60a90d7c27fc01bc5de9b5aa863f7c1e3fb4efc"; + sha256 = "3ecda6b183b03ba65dcfdf0019809722480d7b7e10eea6e3a40bf1ba3146bab7"; }; # requires X server diff --git a/pkgs/development/python-modules/virtualenv/default.nix b/pkgs/development/python-modules/virtualenv/default.nix index b25f162baef..2bcfa88b6ae 100644 --- a/pkgs/development/python-modules/virtualenv/default.nix +++ b/pkgs/development/python-modules/virtualenv/default.nix @@ -23,11 +23,11 @@ buildPythonPackage rec { pname = "virtualenv"; - version = "20.4.3"; + version = "20.4.7"; src = fetchPypi { inherit pname version; - sha256 = "49ec4eb4c224c6f7dd81bb6d0a28a09ecae5894f4e593c89b0db0885f565a107"; + sha256 = "14fdf849f80dbb29a4eb6caa9875d476ee2a5cf76a5f5415fa2f1606010ab467"; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/vivisect/default.nix b/pkgs/development/python-modules/vivisect/default.nix index 0d86f2ffbd9..43e54bda9d6 100644 --- a/pkgs/development/python-modules/vivisect/default.nix +++ b/pkgs/development/python-modules/vivisect/default.nix @@ -10,12 +10,12 @@ }: buildPythonPackage rec { pname = "vivisect"; - version = "0.1.0"; + version = "0.2.1"; disabled = isPy3k; src = fetchPypi { inherit pname version; - sha256 = "ed5e8c24684841d30dc7b41f2bee87c0198816a453417ae2e130b7845ccb2629"; + sha256 = "8fc4d2097a1d0d8d97aa8c540984cb52432df759f04f2281a21a4e1b7d1a95a7"; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/vowpalwabbit/default.nix b/pkgs/development/python-modules/vowpalwabbit/default.nix index c4822113204..0a75600bb0f 100644 --- a/pkgs/development/python-modules/vowpalwabbit/default.nix +++ b/pkgs/development/python-modules/vowpalwabbit/default.nix @@ -15,11 +15,11 @@ buildPythonPackage rec { pname = "vowpalwabbit"; - version = "8.9.0"; + version = "8.10.2"; src = fetchPypi{ inherit pname version; - sha256 = "37fb7a400f3a7923a04df9921b3eef1bbe96117424ef083dcfed0e4eea77fa08"; + sha256 = "e9f7d525a6e88ebff41406409a5c31f79bb008f524fc63a61dc74bac6a1ac887"; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/watchdog/default.nix b/pkgs/development/python-modules/watchdog/default.nix index 441630fe6f6..e5d742bef28 100644 --- a/pkgs/development/python-modules/watchdog/default.nix +++ b/pkgs/development/python-modules/watchdog/default.nix @@ -5,6 +5,7 @@ , argh , pathtools , pyyaml +, flaky , pytest-timeout , pytestCheckHook , CoreServices @@ -28,6 +29,7 @@ buildPythonPackage rec { ]; checkInputs = [ + flaky pytest-timeout pytestCheckHook ]; diff --git a/pkgs/development/python-modules/wcmatch/default.nix b/pkgs/development/python-modules/wcmatch/default.nix index bda48d3ec58..0cc08a9bf2c 100644 --- a/pkgs/development/python-modules/wcmatch/default.nix +++ b/pkgs/development/python-modules/wcmatch/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "wcmatch"; - version = "8.1.2"; + version = "8.2"; src = fetchPypi { inherit pname version; - sha256 = "efda751de15201b395b6d6e64e6ae3b6b03dc502a64c3c908aa5cad14c27eee5"; + sha256 = "4d54ddb506c90b5a5bba3a96a1cfb0bb07127909e19046a71d689ddfb18c3617"; }; propagatedBuildInputs = [ bracex ]; diff --git a/pkgs/development/python-modules/werkzeug/1.nix b/pkgs/development/python-modules/werkzeug/1.nix new file mode 100644 index 00000000000..73bebd8366e --- /dev/null +++ b/pkgs/development/python-modules/werkzeug/1.nix @@ -0,0 +1,30 @@ +{ lib, stdenv, buildPythonPackage, fetchPypi +, itsdangerous, hypothesis +, pytestCheckHook, requests +, pytest-timeout +, isPy3k + }: + +buildPythonPackage rec { + pname = "Werkzeug"; + version = "1.0.1"; + + src = fetchPypi { + inherit pname version; + sha256 = "6c80b1e5ad3665290ea39320b91e1be1e0d5f60652b964a3070216de83d2e47c"; + }; + + propagatedBuildInputs = [ itsdangerous ]; + checkInputs = [ pytestCheckHook requests hypothesis pytest-timeout ]; + + disabledTests = lib.optionals stdenv.isDarwin [ + "test_get_machine_id" + ]; + + meta = with lib; { + homepage = "https://palletsprojects.com/p/werkzeug/"; + description = "A WSGI utility library for Python"; + license = licenses.bsd3; + maintainers = [ ]; + }; +} diff --git a/pkgs/development/python-modules/werkzeug/default.nix b/pkgs/development/python-modules/werkzeug/default.nix index 73bebd8366e..d3dce5018d9 100644 --- a/pkgs/development/python-modules/werkzeug/default.nix +++ b/pkgs/development/python-modules/werkzeug/default.nix @@ -1,30 +1,57 @@ -{ lib, stdenv, buildPythonPackage, fetchPypi -, itsdangerous, hypothesis -, pytestCheckHook, requests +{ lib +, stdenv +, buildPythonPackage +, pythonOlder +, fetchPypi +, watchdog +, dataclasses , pytest-timeout -, isPy3k +, pytest-xprocess +, pytestCheckHook }: buildPythonPackage rec { pname = "Werkzeug"; - version = "1.0.1"; + version = "2.0.1"; + disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - sha256 = "6c80b1e5ad3665290ea39320b91e1be1e0d5f60652b964a3070216de83d2e47c"; + sha256 = "0hlwawnn8c41f254qify5jnjj8xb97n294h09bqimzqhs0qdpq8x"; }; - propagatedBuildInputs = [ itsdangerous ]; - checkInputs = [ pytestCheckHook requests hypothesis pytest-timeout ]; + propagatedBuildInputs = lib.optionals (!stdenv.isDarwin) [ + # watchdog requires macos-sdk 10.13+ + watchdog + ] ++ lib.optionals (pythonOlder "3.7") [ + dataclasses + ]; + + checkInputs = [ + pytest-timeout + pytest-xprocess + pytestCheckHook + ]; disabledTests = lib.optionals stdenv.isDarwin [ "test_get_machine_id" ]; + pytestFlagsArray = [ + # don't run tests that are marked with filterwarnings, they fail with + # warnings._OptionError: unknown warning category: 'pytest.PytestUnraisableExceptionWarning' + "-m 'not filterwarnings'" + ]; + meta = with lib; { homepage = "https://palletsprojects.com/p/werkzeug/"; - description = "A WSGI utility library for Python"; + description = "The comprehensive WSGI web application library"; + longDescription = '' + Werkzeug is a comprehensive WSGI web application library. It + began as a simple collection of various utilities for WSGI + applications and has become one of the most advanced WSGI + utility libraries. + ''; license = licenses.bsd3; - maintainers = [ ]; }; } diff --git a/pkgs/development/python-modules/west/default.nix b/pkgs/development/python-modules/west/default.nix index 6b937509314..fff9582e0b8 100644 --- a/pkgs/development/python-modules/west/default.nix +++ b/pkgs/development/python-modules/west/default.nix @@ -3,14 +3,14 @@ }: buildPythonPackage rec { - version = "0.10.1"; + version = "0.11.0"; pname = "west"; disabled = !isPy3k; src = fetchPypi { inherit pname version; - sha256 = "sha256-gwbrxnQ0j0FV2Cv+hQEoK0HthstEw/xjaozPjgV7GEc="; + sha256 = "67fdc85f44be308383b331940dced0756c8c81a85f753c6b97eb0d65d973f31a"; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/whisper/default.nix b/pkgs/development/python-modules/whisper/default.nix index 7b084c16267..d25053f1236 100644 --- a/pkgs/development/python-modules/whisper/default.nix +++ b/pkgs/development/python-modules/whisper/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "whisper"; - version = "1.1.7"; + version = "1.1.8"; src = fetchPypi { inherit pname version; - sha256 = "08biw3g6x6p2aa1nlvfazbgcs1xvf6m0hvskdjhgwnsbwxk1xq46"; + sha256 = "345f35d0dccaf181e0aa4353e6c13f40f5cceda10a3c7021dafab29f004f62ae"; }; propagatedBuildInputs = [ six ]; diff --git a/pkgs/development/python-modules/wurlitzer/default.nix b/pkgs/development/python-modules/wurlitzer/default.nix index e6897830fb7..f37d6de1359 100644 --- a/pkgs/development/python-modules/wurlitzer/default.nix +++ b/pkgs/development/python-modules/wurlitzer/default.nix @@ -9,11 +9,11 @@ buildPythonPackage rec { pname = "wurlitzer"; - version = "2.0.1"; + version = "2.1.0"; src = fetchPypi { inherit pname version; - sha256 = "0hvmbc41kdwrjns8z1s4a59a4azdvzb8q3vs7nn1li4qm4l0g3yh"; + sha256 = "0144228960a992ef46e339e8aa560600bd34cd64e018bfebad88c0dd61bd8ba5"; }; propagatedBuildInputs = lib.optionals isPy27 [ selectors2 ]; diff --git a/pkgs/development/python-modules/xarray/default.nix b/pkgs/development/python-modules/xarray/default.nix index e69e144ccfe..675461a63cc 100644 --- a/pkgs/development/python-modules/xarray/default.nix +++ b/pkgs/development/python-modules/xarray/default.nix @@ -11,12 +11,12 @@ buildPythonPackage rec { pname = "xarray"; - version = "0.17.0"; + version = "0.18.2"; disabled = !isPy3k; src = fetchPypi { inherit pname version; - sha256 = "9c2edad2a4e588f9117c666a4249920b9717fb75703b96998cf65fcd4f60551f"; + sha256 = "5d2e72a228286fcf60f66e16876bd27629a1a70bf64822c565f16515c4d10284"; }; nativeBuildInputs = [ setuptools-scm ]; diff --git a/pkgs/development/python-modules/xlsx2csv/default.nix b/pkgs/development/python-modules/xlsx2csv/default.nix index 47576e6ee60..e22c0d96591 100644 --- a/pkgs/development/python-modules/xlsx2csv/default.nix +++ b/pkgs/development/python-modules/xlsx2csv/default.nix @@ -5,11 +5,11 @@ buildPythonPackage rec { pname = "xlsx2csv"; - version = "0.7.7"; + version = "0.7.8"; src = fetchPypi { inherit pname version; - sha256 = "09vigknmz15izirfddkmb3a39h1rp2jmc00bnrff12i757n7jjl4"; + sha256 = "c3aaf0c5febd9c5e48488026e7a58af37a67bf3da5e221cc57d371328b3b7dd3"; }; meta = with lib; { diff --git a/pkgs/development/python-modules/xml2rfc/default.nix b/pkgs/development/python-modules/xml2rfc/default.nix index 5b50716f2f1..9837128a7fd 100644 --- a/pkgs/development/python-modules/xml2rfc/default.nix +++ b/pkgs/development/python-modules/xml2rfc/default.nix @@ -4,12 +4,12 @@ buildPythonPackage rec { pname = "xml2rfc"; - version = "3.6.0"; + version = "3.8.0"; disabled = pythonAtLeast "3.9"; src = fetchPypi { inherit pname version; - sha256 = "a9aa2e7c156a1acb0931086637d31efe9302a771641bc35938383cefbd27ba9d"; + sha256 = "8e25a9d73acf57ade798fc67841277dbbdb81ced390e6f84362370305b127426"; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/xstatic-pygments/default.nix b/pkgs/development/python-modules/xstatic-pygments/default.nix index 8542747d2dd..68fc2339f55 100644 --- a/pkgs/development/python-modules/xstatic-pygments/default.nix +++ b/pkgs/development/python-modules/xstatic-pygments/default.nix @@ -5,11 +5,11 @@ buildPythonPackage rec { pname = "XStatic-Pygments"; - version = "2.7.2.1"; + version = "2.9.0.1"; src = fetchPypi { inherit version pname; - sha256 = "b22b0a59ce17bf06e26508fdd264fff74409ebd9968af87a0a63402fce838dc2"; + sha256 = "082c1e9fe606fbbef474f78b6fdb19e9a2efcc7a9b7d94163cf66f7bfae75762"; }; # no tests implemented diff --git a/pkgs/development/python-modules/xxhash/default.nix b/pkgs/development/python-modules/xxhash/default.nix index 08bcfcdacde..df3c0c85269 100644 --- a/pkgs/development/python-modules/xxhash/default.nix +++ b/pkgs/development/python-modules/xxhash/default.nix @@ -4,12 +4,12 @@ }: buildPythonPackage rec { - version = "2.0.0"; + version = "2.0.2"; pname = "xxhash"; src = fetchPypi { inherit pname version; - sha256 = "58ca818554c1476fa1456f6cd4b87002e2294f09baf0f81e5a2a4968e62c423c"; + sha256 = "b7bead8cf6210eadf9cecf356e17af794f57c0939a3d420a00d87ea652f87b49"; }; meta = with lib; { diff --git a/pkgs/development/python-modules/yara-python/default.nix b/pkgs/development/python-modules/yara-python/default.nix index 569bf0ef80d..fc4c3bb56ff 100644 --- a/pkgs/development/python-modules/yara-python/default.nix +++ b/pkgs/development/python-modules/yara-python/default.nix @@ -7,13 +7,13 @@ buildPythonPackage rec { pname = "yara-python"; - version = "4.0.5"; + version = "4.1.0"; src = fetchFromGitHub { owner = "VirusTotal"; repo = "yara-python"; rev = "v${version}"; - sha256 = "1qd0aw5p48ay77hgj0hgzpvbmq1933mknk134aqdb32036rlc5sq"; + sha256 = "1w48skmjbb5529g8fyzdjj9jkmavqiq6wh1dr004xdp3nhlqn9y7"; }; buildInputs = [ diff --git a/pkgs/development/python-modules/yq/default.nix b/pkgs/development/python-modules/yq/default.nix index 1dde1405bf6..922276e3889 100644 --- a/pkgs/development/python-modules/yq/default.nix +++ b/pkgs/development/python-modules/yq/default.nix @@ -12,11 +12,11 @@ buildPythonPackage rec { pname = "yq"; - version = "2.12.0"; + version = "2.12.2"; src = fetchPypi { inherit pname version; - sha256 = "sha256-HSrUA1BNMGtSWLhsaY+YVtetWLe7F6K4dWkaanuMTCA="; + sha256 = "2f156d0724b61487ac8752ed4eaa702a5737b804d5afa46fa55866951cd106d2"; }; patches = [ diff --git a/pkgs/development/python-modules/zarr/default.nix b/pkgs/development/python-modules/zarr/default.nix index 5c43494d28d..c7990de55e0 100644 --- a/pkgs/development/python-modules/zarr/default.nix +++ b/pkgs/development/python-modules/zarr/default.nix @@ -12,12 +12,12 @@ buildPythonPackage rec { pname = "zarr"; - version = "2.6.1"; + version = "2.8.3"; disabled = isPy27; src = fetchPypi { inherit pname version; - sha256 = "fa7eac1e4ff47ff82d09c42bb4679e18e8a05a73ee81ce59cee6a441a210b2fd"; + sha256 = "8aece33269ba3ee2af9320aa528d5fe93f76c30e4ad7fdbfb604b1db3f0d779f"; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/zope_interface/default.nix b/pkgs/development/python-modules/zope_interface/default.nix index 15a179c0d64..c1f61a4cbee 100644 --- a/pkgs/development/python-modules/zope_interface/default.nix +++ b/pkgs/development/python-modules/zope_interface/default.nix @@ -6,11 +6,11 @@ buildPythonPackage rec { pname = "zope.interface"; - version = "5.3.0"; + version = "5.4.0"; src = fetchPypi { inherit pname version; - sha256 = "b18a855f8504743e0a2d8b75d008c7720d44e4c76687e13f959e35d9a13eb397"; + sha256 = "5dba5f530fec3f0988d83b78cc591b58c0b6eb8431a85edd1569a0539a8a5a0e"; }; propagatedBuildInputs = [ zope_event ]; diff --git a/pkgs/development/python-modules/zstd/default.nix b/pkgs/development/python-modules/zstd/default.nix index 1d8fa8d93e9..e7ee8dd68cb 100644 --- a/pkgs/development/python-modules/zstd/default.nix +++ b/pkgs/development/python-modules/zstd/default.nix @@ -4,11 +4,11 @@ buildPythonPackage rec { pname = "zstd"; - version = "1.4.8.1"; + version = "1.5.0.2"; src = fetchPypi { inherit pname version; - sha256 = "b62b21eb850abd6b8c0046bfc1c5c773c873eeb94f1904ef1ff304e98b62b80e"; + sha256 = "8d3388a15135c481b28ca67d079cb5fd79a9691626fd9979e6b4ec00eabb9e79"; }; postPatch = '' diff --git a/pkgs/development/tools/analysis/flow/default.nix b/pkgs/development/tools/analysis/flow/default.nix index ab0696f14ed..599908b4931 100644 --- a/pkgs/development/tools/analysis/flow/default.nix +++ b/pkgs/development/tools/analysis/flow/default.nix @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { install -Dm644 resources/shell/bash-completion $out/share/bash-completion/completions/flow ''; - buildInputs = (with ocamlPackages; [ ocaml findlib ocamlbuild ocaml-migrate-parsetree-2-1 dtoa core_kernel sedlex_2 ocaml_lwt lwt_log lwt_ppx ppx_deriving ppx_gen_rec ppx_tools_versioned visitors wtf8 ]) + buildInputs = (with ocamlPackages; [ ocaml findlib ocamlbuild ocaml-migrate-parsetree-2 dtoa core_kernel sedlex_2 ocaml_lwt lwt_log lwt_ppx ppx_deriving ppx_gen_rec ppx_tools_versioned visitors wtf8 ]) ++ lib.optionals stdenv.isDarwin [ CoreServices ]; meta = with lib; { diff --git a/pkgs/development/tools/backblaze-b2/default.nix b/pkgs/development/tools/backblaze-b2/default.nix index fd1cc241195..171885d989a 100644 --- a/pkgs/development/tools/backblaze-b2/default.nix +++ b/pkgs/development/tools/backblaze-b2/default.nix @@ -12,15 +12,17 @@ let in python3Packages.buildPythonApplication rec { pname = "backblaze-b2"; - version = "2.4.0"; + version = "2.5.0"; src = python3Packages.fetchPypi { inherit version; pname = "b2"; - sha256 = "sha256-nNQDdSjUolj3PjWRn1fPBAEtPlgeent2PxzHqwH1Z6s="; + sha256 = "0sh9k9fnj73ydqnk056m01xkilpxh7f4597cnczqhy21lxzr3d45"; }; postPatch = '' + substituteInPlace requirements.txt \ + --replace 'docutils==0.16' 'docutils' substituteInPlace setup.py \ --replace 'setuptools_scm<6.0' 'setuptools_scm' ''; diff --git a/pkgs/development/tools/electron/default.nix b/pkgs/development/tools/electron/default.nix index a04905705d4..ebcfcf1c55d 100644 --- a/pkgs/development/tools/electron/default.nix +++ b/pkgs/development/tools/electron/default.nix @@ -115,13 +115,13 @@ rec { headers = "1qis2k8yc7g1klvhiysjrgl5gclx4idxdz60kh8ldrji5a0lgha1"; }; - electron_13 = mkElectron "13.1.3" { - x86_64-linux = "33646b1bace221edd636f172b5d3ae391fe519dd6a49aaeef4e50916d636fcfb"; - x86_64-darwin = "246356862f4e97bdba31d9b0f2dadc45b1d7c689d0762bc27b89251cafcdd14c"; - i686-linux = "1237ab5043b22f00236d52e12b771778f740fd0d5c06d0f5aee4219afb9b5b38"; - armv7l-linux = "7106ef6720162d9f38927583968dd9b45f4c678d4bdbe549604aa3b6a40f7f50"; - aarch64-linux = "3213bb087e6f3a9091c2fe2de13a597a9d122735a996872ba51e17c138148cae"; - aarch64-darwin = "35bb2b36e73df228c295c5e820ac7f4206b3ea9e546b61e32a4b080fd1f08234"; - headers = "020xka91w4i5p24i56zlk2i6xsynwwvryh3fim336mmkjryqhqxp"; + electron_13 = mkElectron "13.1.4" { + x86_64-linux = "096909396be9fac888ca35093d16bdb50a965e3200823f2384574c359f15cd4f"; + x86_64-darwin = "3d9980f8062766be3cfcfd54b9fd9f469993df06d538a2324c4879eae1284c84"; + i686-linux = "73c8b1fc01a89a5f9b12de38ed70bd01686e50a55d817f0cdf5914e953bdc868"; + armv7l-linux = "db2fe2f499865ea697cacef992fc0042ac0f75da4c016d64e5c41deae7f5eb72"; + aarch64-linux = "4acdd4eae499e1ed42871ed8b744fdef9f608f5613742090cc20e4f6b5314ae8"; + aarch64-darwin = "e961b7d361c378e4adab7903211ac7200684cb91044c3b300acde04ca24d0468"; + headers = "1h1sr5nk37asbj1fadgjzksgr876wxdmq3b017bb9k5kcgajcmqr"; }; } diff --git a/pkgs/development/tools/ginkgo/default.nix b/pkgs/development/tools/ginkgo/default.nix index 833f87e4a02..0f54d7ca53e 100644 --- a/pkgs/development/tools/ginkgo/default.nix +++ b/pkgs/development/tools/ginkgo/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "ginkgo"; - version = "1.16.2"; + version = "1.16.3"; src = fetchFromGitHub { owner = "onsi"; repo = "ginkgo"; rev = "v${version}"; - sha256 = "sha256-u2roJsZZ5oG2dHo4kmSsoySjm1HRQJ659+D2M+LezCc="; + sha256 = "sha256-MDxDDZaNgjZz98lAoIIpWbIg7Cr/6kohSh+WL/1Ljyo="; }; vendorSha256 = "sha256-tS8YCGVOsfQp02vY6brmE3pxi70GG9DYcp1JDkcVG9Y="; doCheck = false; diff --git a/pkgs/development/tools/misc/autoconf/default.nix b/pkgs/development/tools/misc/autoconf/default.nix index 3b70e819c89..a2c160f5662 100644 --- a/pkgs/development/tools/misc/autoconf/default.nix +++ b/pkgs/development/tools/misc/autoconf/default.nix @@ -6,10 +6,11 @@ # files. stdenv.mkDerivation rec { - name = "autoconf-2.71"; + pname = "autoconf"; + version = "2.71"; src = fetchurl { - url = "mirror://gnu/autoconf/${name}.tar.xz"; + url = "mirror://gnu/autoconf/autoconf-${version}.tar.xz"; sha256 = "197sl23irn6s9pd54rxj5vcp5y8dv65jb9yfqgr2g56cxg7q6k7i"; }; diff --git a/pkgs/development/tools/ocaml/ocamlformat/generic.nix b/pkgs/development/tools/ocaml/ocamlformat/generic.nix index 6f3ce218713..536fcd4acb1 100644 --- a/pkgs/development/tools/ocaml/ocamlformat/generic.nix +++ b/pkgs/development/tools/ocaml/ocamlformat/generic.nix @@ -83,7 +83,7 @@ buildDunePackage { ocaml-version # Changed since 0.16.0: (ppxlib.override { version = "0.22.0"; }) - ocaml-migrate-parsetree-2-1 + ocaml-migrate-parsetree-2 ] else if lib.versionAtLeast version "0.15.1" then [ diff --git a/pkgs/development/tools/turbogit/default.nix b/pkgs/development/tools/turbogit/default.nix index 68bd1068354..7d3e88f6cb4 100644 --- a/pkgs/development/tools/turbogit/default.nix +++ b/pkgs/development/tools/turbogit/default.nix @@ -1,20 +1,21 @@ -{ fetchFromGitHub, buildGoModule, lib, installShellFiles }: +{ fetchFromGitHub, buildGoModule, lib, installShellFiles, libgit2, pkg-config }: buildGoModule rec { pname = "turbogit"; - version = "1.2.0"; + version = "2.0.0"; src = fetchFromGitHub { owner = "b4nst"; repo = pname; rev = "v${version}"; - sha256 = "sha256-alVgXnsoC2nmUe6i/l0ttUjoXpKLHr0n/7p6WbIIGBU="; + sha256 = "sha256-UIPI1r6BnfD5ukk5yGg3VJHMyaMp30MXhJfOkoNT6vs="; }; - vendorSha256 = "sha256-6fxbxpROYiNw5SYdQAIdy5NfqzOcFfAlJ+vTQyFtink="; + vendorSha256 = "sha256-SX0VPENcfw8ysL+dDGPSJ/FNdyecjENx4+UHXdu71O8="; subPackages = [ "." ]; - nativeBuildInputs = [ installShellFiles ]; + buildInputs = [ libgit2 ]; + nativeBuildInputs = [ installShellFiles pkg-config ]; postInstall = '' # Move turbogit binary to tug ln -s $out/bin/turbogit $out/bin/tug @@ -37,6 +38,7 @@ buildGoModule rec { ''; homepage = "https://b4nst.github.io/turbogit"; license = licenses.mit; + platforms = platforms.linux ++ platforms.darwin; maintainers = [ maintainers.yusdacra ]; }; } diff --git a/pkgs/development/web/twitter-bootstrap/default.nix b/pkgs/development/web/twitter-bootstrap/default.nix index 65625ca7d21..8e3fd36b73f 100644 --- a/pkgs/development/web/twitter-bootstrap/default.nix +++ b/pkgs/development/web/twitter-bootstrap/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "bootstrap"; - version = "5.0.1"; + version = "5.0.2"; src = fetchurl { url = "https://github.com/twbs/bootstrap/releases/download/v${version}/${pname}-${version}-dist.zip"; - sha256 = "sha256-eep9s1YxTHeDDh+WhDMENho/N3AfJHVitis22bIGa6w="; + sha256 = "sha256-ZvvBNDF9sjcO4JnLPRkzC1B1YG3fcMyjM9qwFlAg9sE="; }; nativeBuildInputs = [ unzip ]; diff --git a/pkgs/os-specific/bsd/netbsd/default.nix b/pkgs/os-specific/bsd/netbsd/default.nix index 479ab92c797..bb0984d9738 100644 --- a/pkgs/os-specific/bsd/netbsd/default.nix +++ b/pkgs/os-specific/bsd/netbsd/default.nix @@ -113,7 +113,7 @@ in lib.makeScopeWithSplicing makeMinimal = mkDerivation { path = "tools/make"; sha256 = "0fh0nrnk18m613m5blrliq2aydciv51qhc0ihsj4k63incwbk90n"; - version = "9.1"; + version = "9.2"; buildInputs = with self; []; nativeBuildInputs = with buildPackages.netbsd; [ bsdSetupHook ]; @@ -145,7 +145,7 @@ in lib.makeScopeWithSplicing }; compat = mkDerivation (let - version = "9.1"; + version = "9.2"; commonDeps = [ zlib ]; in { path = "tools/compat"; @@ -216,9 +216,9 @@ in lib.makeScopeWithSplicing --subst-var-by version ${version} ''; extraPaths = with self; [ include.src libc.src libutil.src - (fetchNetBSD "external/bsd/flex" "9.1" "0h98jpfj7vx5zh7vd7bk6b1hmzgkcb757a8j6d9zgygxxv13v43m") - (fetchNetBSD "sys/sys" "9.1" "1xx633pvmdgdb0h1x0bw1rvkc63h29ziwh51166rc3q5bil7y01n") - (fetchNetBSD "common/include/rpc/types.h" "9.1" "0n2df12mlc3cbc48jxq35yzl1y7ghgpykvy7jnfh898rdhac7m9a") + (fetchNetBSD "external/bsd/flex" "9.2" "0h98jpfj7vx5zh7vd7bk6b1hmzgkcb757a8j6d9zgygxxv13v43m") + (fetchNetBSD "sys/sys" "9.2" "0zawhw51klaigqqwkx0lzrx3mim2jywrc24cm7c66qsf1im9awgd") + (fetchNetBSD "common/include/rpc/types.h" "9.2" "0n2df12mlc3cbc48jxq35yzl1y7ghgpykvy7jnfh898rdhac7m9a") ] ++ libutil.extraPaths ++ _mainLibcExtraPaths; }); @@ -231,7 +231,7 @@ in lib.makeScopeWithSplicing xinstall "$@" ''; in mkDerivation { path = "usr.bin/xinstall"; - version = "9.1"; + version = "9.2"; sha256 = "1f6pbz3qv1qcrchdxif8p5lbmnwl8b9nq615hsd3cyl4avd5bfqj"; extraPaths = with self; [ mtree.src make.src ]; nativeBuildInputs = with buildPackages.netbsd; [ @@ -257,15 +257,15 @@ in lib.makeScopeWithSplicing pname = "fts"; path = "include/fts.h"; sha256 = "01d4fpxvz1pgzfk5xznz5dcm0x0gdzwcsfm1h3d0xc9kc6hj2q77"; - version = "9.1"; + version = "9.2"; nativeBuildInputs = with buildPackages.netbsd; [ bsdSetupHook ]; propagatedBuildInputs = with self; compatIfNeeded; extraPaths = with self; [ - (fetchNetBSD "lib/libc/gen/fts.c" "9.1" "1a8hmf26242nmv05ipn3ircxb0jqmmi66rh78kkyi9vjwkfl3qn7") - (fetchNetBSD "lib/libc/include/namespace.h" "9.1" "0kksr3pdwdc1cplqf5z12ih4cml6l11lqrz91f7hjjm64y7785kc") - (fetchNetBSD "lib/libc/gen/fts.3" "9.1" "1asxw0n3fhjdadwkkq3xplfgqgl3q32w1lyrvbakfa3gs0wz5zc1") + (fetchNetBSD "lib/libc/gen/fts.c" "9.2" "1a8hmf26242nmv05ipn3ircxb0jqmmi66rh78kkyi9vjwkfl3qn7") + (fetchNetBSD "lib/libc/include/namespace.h" "9.2" "0kksr3pdwdc1cplqf5z12ih4cml6l11lqrz91f7hjjm64y7785kc") + (fetchNetBSD "lib/libc/gen/fts.3" "9.2" "1asxw0n3fhjdadwkkq3xplfgqgl3q32w1lyrvbakfa3gs0wz5zc1") ]; skipIncludesPhase = true; buildPhase = '' @@ -292,7 +292,7 @@ in lib.makeScopeWithSplicing # Don't add this to nativeBuildInputs directly. Use statHook instead. stat = mkDerivation { path = "usr.bin/stat"; - version = "9.1"; + version = "9.2"; sha256 = "18nqwlndfc34qbbgqx5nffil37jfq9aw663ippasfxd2hlyc106x"; nativeBuildInputs = with buildPackages.netbsd; [ bsdSetupHook @@ -314,7 +314,7 @@ in lib.makeScopeWithSplicing tsort = mkDerivation { path = "usr.bin/tsort"; - version = "9.1"; + version = "9.2"; sha256 = "1dqvf9gin29nnq3c4byxc7lfd062pg7m84843zdy6n0z63hnnwiq"; nativeBuildInputs = with buildPackages.netbsd; [ bsdSetupHook @@ -325,7 +325,7 @@ in lib.makeScopeWithSplicing lorder = mkDerivation { path = "usr.bin/lorder"; - version = "9.1"; + version = "9.2"; sha256 = "0rjf9blihhm0n699vr2bg88m4yjhkbxh6fxliaay3wxkgnydjwn2"; nativeBuildInputs = with buildPackages.netbsd; [ bsdSetupHook @@ -342,8 +342,8 @@ in lib.makeScopeWithSplicing ## make = mkDerivation { path = "usr.bin/make"; - sha256 = "09szl3lp9s081h7f3nci5h9zc78wlk9a6g18mryrznrss90q9ngx"; - version = "9.1"; + sha256 = "0vi73yicbmbp522qzqvd979cx6zm5jakhy77xh73c1kygf8klccs"; + version = "9.2"; postPatch = '' # make needs this to pick up our sys make files export NIX_CFLAGS_COMPILE+=" -D_PATH_DEFSYSPATH=\"$out/share/mk\"" @@ -361,39 +361,39 @@ in lib.makeScopeWithSplicing make -C $BSDSRCDIR/share/mk FILESDIR=$out/share/mk install ''; extraPaths = [ - (fetchNetBSD "share/mk" "9.1" "0qi3ypd5dsxk2c33885fsn68a550nibsxb1jwf5w6bfrvcblzn2z") + (fetchNetBSD "share/mk" "9.2" "0w9x77cfnm6zwy40slradzi0ip9gz80x6lk7pvnlxzsr2m5ra5sy") ]; }; mtree = mkDerivation { path = "usr.sbin/mtree"; - version = "9.1"; + version = "9.2"; sha256 = "04p7w540vz9npvyb8g8hcf2xa05phn1y88hsyrcz3vwanvpc0yv9"; extraPaths = with self; [ mknod.src ]; }; mknod = mkDerivation { path = "sbin/mknod"; - version = "9.1"; + version = "9.2"; sha256 = "1d9369shzwgixz3nph991i8q5vk7hr04py3n9avbfbhzy4gndqs2"; }; getent = mkDerivation { path = "usr.bin/getent"; sha256 = "1qngywcmm0y7nl8h3n8brvkxq4jw63szbci3kc1q6a6ndhycbbvr"; - version = "9.1"; + version = "9.2"; patches = [ ./getent.patch ]; }; getconf = mkDerivation { path = "usr.bin/getconf"; sha256 = "122vslz4j3h2mfs921nr2s6m078zcj697yrb75rwp2hnw3qz4s8q"; - version = "9.1"; + version = "9.2"; }; locale = mkDerivation { path = "usr.bin/locale"; - version = "9.1"; + version = "9.2"; sha256 = "0kk6v9k2bygq0wf9gbinliqzqpzs9bgxn0ndyl2wcv3hh2bmsr9p"; patches = [ ./locale.patch ]; NIX_CFLAGS_COMPILE = "-DYESSTR=__YESSTR -DNOSTR=__NOSTR"; @@ -401,31 +401,31 @@ in lib.makeScopeWithSplicing rpcgen = mkDerivation { path = "usr.bin/rpcgen"; - version = "9.1"; + version = "9.2"; sha256 = "1kfgfx54jg98wbg0d95p0rvf4w0302v8fz724b0bdackdsrd4988"; }; genassym = mkDerivation { path = "usr.bin/genassym"; - version = "9.1"; + version = "9.2"; sha256 = "1acl1dz5kvh9h5806vkz2ap95rdsz7phmynh5i3x5y7agbki030c"; }; gencat = mkDerivation { path = "usr.bin/gencat"; - version = "9.1"; + version = "9.2"; sha256 = "0gd463x1hg36bhr7y0xryb5jyxk0z0g7xvy8rgk82nlbnlnsbbwb"; }; nbperf = mkDerivation { path = "usr.bin/nbperf"; - version = "9.1"; + version = "9.2"; sha256 = "1nxc302vgmjhm3yqdivqyfzslrg0vjpbss44s74rcryrl19mma9r"; }; tic = mkDerivation { path = "tools/tic"; - version = "9.1"; + version = "9.2"; sha256 = "092y7db7k4kh2jq8qc55126r5qqvlb8lq8mhmy5ipbi36hwb4zrz"; HOSTPROG = "tic"; buildInputs = with self; compatIfNeeded; @@ -437,29 +437,29 @@ in lib.makeScopeWithSplicing makeFlags = [ "TOOLDIR=$(out)" ]; extraPaths = with self; [ libterminfo.src - (fetchNetBSD "usr.bin/tic" "9.1" "1mwdfg7yx1g43ss378qsgl5rqhsxskqvsd2mqvrn38qw54i8v5i1") - (fetchNetBSD "tools/Makefile.host" "9.1" "15b4ab0n36lqj00j5lz2xs83g7l8isk3wx1wcapbrn66qmzz2sxy") + (fetchNetBSD "usr.bin/tic" "9.2" "1mwdfg7yx1g43ss378qsgl5rqhsxskqvsd2mqvrn38qw54i8v5i1") + (fetchNetBSD "tools/Makefile.host" "9.2" "15b4ab0n36lqj00j5lz2xs83g7l8isk3wx1wcapbrn66qmzz2sxy") ]; }; uudecode = mkDerivation { path = "usr.bin/uudecode"; - version = "9.1"; + version = "9.2"; sha256 = "00a3zmh15pg4vx6hz0kaa5mi8d2b1sj4h512d7p6wbvxq6mznwcn"; NIX_CFLAGS_COMPILE = lib.optional stdenv.isLinux "-DNO_BASE64"; }; cksum = mkDerivation { path = "usr.bin/cksum"; - version = "9.1"; + version = "9.2"; sha256 = "0msfhgyvh5c2jmc6qjnf12c378dhw32ffsl864qz4rdb2b98rfcq"; meta.platforms = lib.platforms.netbsd; }; config = mkDerivation { path = "usr.bin/config"; - version = "9.1"; - sha256 = "08mqq0izd9550dwk181smni51cbiim7rwp208phf25c4mqzaznf4"; + version = "9.2"; + sha256 = "1yz3n4hncdkk6kp595fh2q5lg150vpqg8iw2dccydkyw4y3hgsjj"; NIX_CFLAGS_COMPILE = [ "-DMAKE_BOOTSTRAP" ]; nativeBuildInputs = with buildPackages.netbsd; [ bsdSetupHook @@ -477,8 +477,8 @@ in lib.makeScopeWithSplicing ## include = mkDerivation { path = "include"; - version = "9.1"; - sha256 = "127kj61prvj3klc2an5rpgavgah2g6igfgprl45255i264wyg8v3"; + version = "9.2"; + sha256 = "0nxnmj4c8s3hb9n3fpcmd0zl3l1nmhivqgi9a35sis943qvpgl9h"; nativeBuildInputs = with buildPackages.netbsd; [ bsdSetupHook makeMinimal @@ -491,13 +491,13 @@ in lib.makeScopeWithSplicing makeFlags = [ "RPCGEN_CPP=${buildPackages.stdenv.cc.cc}/bin/cpp" ]; }; - common = fetchNetBSD "common" "9.1" "000n9frjm02h1bdwhb9rbr7wphs8vrj7n09l3v9hhnqrkn7nhy30"; + common = fetchNetBSD "common" "9.2" "1pfylz9r3ap5wnwwbwczbfjb1m5qdyspzbnmxmcdkpzz2zgj64b9"; sys-headers = mkDerivation { pname = "sys-headers"; path = "sys"; - version = "9.1"; - sha256 = "03sv6d7nvnkas4m5z87zxh1rpmggr91ls7di88fwc3cwd3mg3iyx"; + version = "9.2"; + sha256 = "03s18q8d9giipf05bx199fajc2qwikji0djz7hw63d2lya6bfnpj"; # Fix this error when building bootia32.efi and bootx64.efi: # error: PHDR segment not covered by LOAD segment @@ -549,7 +549,7 @@ in lib.makeScopeWithSplicing }; headers = symlinkJoin { - name = "netbsd-headers-9.1"; + name = "netbsd-headers-9.2"; paths = with self; [ include sys-headers @@ -566,7 +566,7 @@ in lib.makeScopeWithSplicing ## libutil = mkDerivation { path = "lib/libutil"; - version = "9.1"; + version = "9.2"; sha256 = "02gm5a5zhh8qp5r5q5r7x8x6x50ir1i0ncgsnfwh1vnrz6mxbq7z"; extraPaths = with self; [ common libc.src sys.src ]; nativeBuildInputs = with buildPackages.netbsd; [ @@ -580,7 +580,7 @@ in lib.makeScopeWithSplicing libedit = mkDerivation { path = "lib/libedit"; - version = "9.1"; + version = "9.2"; sha256 = "1wqhngraxwqk4jgrf5f18jy195yrp7c06n1gf31pbplq79mg1bcj"; buildInputs = with self; [ libterminfo libcurses ]; propagatedBuildInputs = with self; compatIfNeeded; @@ -601,7 +601,7 @@ in lib.makeScopeWithSplicing libterminfo = mkDerivation { path = "lib/libterminfo"; - version = "9.1"; + version = "9.2"; sha256 = "0pq05k3dj0dfsczv07frnnji92mazmy2qqngqbx2zgqc1x251414"; nativeBuildInputs = with buildPackages.netbsd; [ bsdSetupHook @@ -621,13 +621,13 @@ in lib.makeScopeWithSplicing make -C $BSDSRCDIR/share/terminfo $makeFlags BINDIR=$out/share install ''; extraPaths = with self; [ - (fetchNetBSD "share/terminfo" "9.1" "1vh9rl4w8118a9qdpblfxmv1wkpm83rm9gb4rzz5bpm56i6d7kk7") + (fetchNetBSD "share/terminfo" "9.2" "1vh9rl4w8118a9qdpblfxmv1wkpm83rm9gb4rzz5bpm56i6d7kk7") ]; }; libcurses = mkDerivation { path = "lib/libcurses"; - version = "9.1"; + version = "9.2"; sha256 = "0pd0dggl3w4bv5i5h0s1wrc8hr66n4hkv3zlklarwfdhc692fqal"; buildInputs = with self; [ libterminfo ]; NIX_CFLAGS_COMPILE = [ @@ -649,20 +649,20 @@ in lib.makeScopeWithSplicing column = mkDerivation { path = "usr.bin/column"; - version = "9.1"; + version = "9.2"; sha256 = "0r6b0hjn5ls3j3sv6chibs44fs32yyk2cg8kh70kb4cwajs4ifyl"; }; libossaudio = mkDerivation { path = "lib/libossaudio"; - version = "9.1"; + version = "9.2"; sha256 = "16l3bfy6dcwqnklvh3x0ps8ld1y504vf57v9rx8f9adzhb797jh0"; meta.platforms = lib.platforms.netbsd; }; librpcsvc = mkDerivation { path = "lib/librpcsvc"; - version = "9.1"; + version = "9.2"; sha256 = "1q34pfiyjbrgrdqm46jwrsqms49ly6z3b0xh1wg331zga900vq5n"; makeFlags = [ "INCSDIR=$(out)/include/rpcsvc" ]; meta.platforms = lib.platforms.netbsd; @@ -675,7 +675,7 @@ in lib.makeScopeWithSplicing librt = mkDerivation { path = "lib/librt"; - version = "9.1"; + version = "9.2"; sha256 = "07f8mpjcqh5kig5z5sp97fg55mc4dz6aa1x5g01nv2pvbmqczxc6"; meta.platforms = lib.platforms.netbsd; extraPaths = with self; [ libc.src ] ++ libc.extraPaths; @@ -687,7 +687,7 @@ in lib.makeScopeWithSplicing libcrypt = mkDerivation { path = "lib/libcrypt"; - version = "9.1"; + version = "9.2"; sha256 = "0siqan1wdqmmhchh2n8w6a8x1abbff8n4yb6jrqxap3hqn8ay54g"; SHLIBINSTALLDIR = "$(out)/lib"; meta.platforms = lib.platforms.netbsd; @@ -696,7 +696,7 @@ in lib.makeScopeWithSplicing libpthread-headers = mkDerivation { pname = "libpthread-headers"; path = "lib/libpthread"; - version = "9.1"; + version = "9.2"; sha256 = "0mlmc31k509dwfmx5s2x010wxjc44mr6y0cbmk30cfipqh8c962h"; installPhase = "includesPhase"; dontBuild = true; @@ -716,7 +716,7 @@ in lib.makeScopeWithSplicing libresolv = mkDerivation { path = "lib/libresolv"; - version = "9.1"; + version = "9.2"; sha256 = "1am74s74mf1ynwz3p4ncjkg63f78a1zjm983q166x4sgzps15626"; meta.platforms = lib.platforms.netbsd; extraPaths = with self; [ libc.src ]; @@ -724,7 +724,7 @@ in lib.makeScopeWithSplicing libm = mkDerivation { path = "lib/libm"; - version = "9.1"; + version = "9.2"; sha256 = "1apwfr26shdmbqqnmg7hxf7bkfxw44ynqnnnghrww9bnhqdnsy92"; SHLIBINSTALLDIR = "$(out)/lib"; meta.platforms = lib.platforms.netbsd; @@ -733,7 +733,7 @@ in lib.makeScopeWithSplicing i18n_module = mkDerivation { path = "lib/i18n_module"; - version = "9.1"; + version = "9.2"; sha256 = "0w6y5v3binm7gf2kn7y9jja8k18rhnyl55cvvfnfipjqdxvxd9jd"; meta.platforms = lib.platforms.netbsd; extraPaths = with self; [ libc.src ]; @@ -741,7 +741,7 @@ in lib.makeScopeWithSplicing csu = mkDerivation { path = "lib/csu"; - version = "9.1"; + version = "9.2"; sha256 = "0al5jfazvhlzn9hvmnrbchx4d0gm282hq5gp4xs2zmj9ycmf6d03"; meta.platforms = lib.platforms.netbsd; nativeBuildInputs = with buildPackages.netbsd; [ @@ -756,7 +756,7 @@ in lib.makeScopeWithSplicing ld_elf_so = mkDerivation { path = "libexec/ld.elf_so"; - version = "9.1"; + version = "9.2"; sha256 = "0ia9mqzdljly0vqfwflm5mzz55k7qsr4rw2bzhivky6k30vgirqa"; meta.platforms = lib.platforms.netbsd; LIBC_PIC = "${self.libc}/lib/libc_pic.a"; @@ -775,12 +775,12 @@ in lib.makeScopeWithSplicing libc = mkDerivation { path = "lib/libc"; - version = "9.1"; - sha256 = "0jg6kpi1xn4wvlqpwnkcv8655hxi0nhcxbk8lzbj7mlr6srxci8j"; + version = "9.2"; + sha256 = "1y9c13igg0kai07sqvf9cm6yqmd8lhfd8hq3q7biilbgs1l99as3"; USE_FORT = "yes"; MKPROFILE = "no"; extraPaths = with self; _mainLibcExtraPaths ++ [ - (fetchNetBSD "external/bsd/jemalloc" "9.1" "0cq704swa0h2yxv4gc79z2lwxibk9k7pxh3q5qfs7axx3jx3n8kb") + (fetchNetBSD "external/bsd/jemalloc" "9.2" "0cq704swa0h2yxv4gc79z2lwxibk9k7pxh3q5qfs7axx3jx3n8kb") ]; nativeBuildInputs = with buildPackages.netbsd; [ bsdSetupHook @@ -846,7 +846,7 @@ in lib.makeScopeWithSplicing dict = mkDerivation { path = "share/dict"; noCC = true; - version = "9.1"; + version = "9.2"; sha256 = "0svfc0byk59ri37pyjslv4c4rc7zw396r73mr593i78d39q5g3ad"; makeFlags = [ "BINDIR=$(out)/share" ]; }; @@ -854,7 +854,7 @@ in lib.makeScopeWithSplicing misc = mkDerivation { path = "share/misc"; noCC = true; - version = "9.1"; + version = "9.2"; sha256 = "1j2cdssdx6nncv8ffj7f7ybl7m9hadjj8vm8611skqdvxnjg6nbc"; makeFlags = [ "BINDIR=$(out)/share" ]; }; @@ -862,8 +862,8 @@ in lib.makeScopeWithSplicing man = mkDerivation { path = "share/man"; noCC = true; - version = "9.1"; - sha256 = "14sfvz9a5x0kmr9ywsdz09jhw8r1cmhq45wrrz2xwy09b8ykhip6"; + version = "9.2"; + sha256 = "1l4lmj4kmg8dl86x94sr45w0xdnkz8dn4zjx0ipgr9bnq98663zl"; makeFlags = [ "FILESDIR=$(out)/share" ]; }; # diff --git a/pkgs/os-specific/linux/alsa-project/alsa-lib/default.nix b/pkgs/os-specific/linux/alsa-project/alsa-lib/default.nix index 2511c88f3f1..7d2615824a6 100644 --- a/pkgs/os-specific/linux/alsa-project/alsa-lib/default.nix +++ b/pkgs/os-specific/linux/alsa-project/alsa-lib/default.nix @@ -1,24 +1,21 @@ -{ lib, stdenv, fetchurl, fetchpatch, alsa-ucm-conf, alsa-topology-conf }: +{ lib +, stdenv +, fetchurl +, alsa-topology-conf +, alsa-ucm-conf +}: stdenv.mkDerivation rec { pname = "alsa-lib"; - version = "1.2.4"; + version = "1.2.5"; src = fetchurl { url = "mirror://alsa/lib/${pname}-${version}.tar.bz2"; - sha256 = "sha256-91VL4aVs3/RotY/BwpuVtkhkxZADjdMJx6l4xxFpCPc="; + sha256 = "067ga0l6zr782kw8jdsqvbb20pcgnl0vkpnnz2n36fq8ii58k4lh"; }; patches = [ ./alsa-plugin-conf-multilib.patch - (fetchpatch { - # plucked from upstream master, delete in next release - # without this patch alsa 1.2.4 fails to compile against musl-libc - # due to an overly conservative ifdef gate in a new feature - name = "fix-dlo.patch"; - url = "https://github.com/alsa-project/alsa-lib/commit/ad8c8e5503980295dd8e5e54a6285d2d7e32eb1e.patch"; - sha256 = "QQP4C1dSnJP1MNKt2el7Wn3KmtwtYzvyIHWdrHs+Jw4="; - }) ]; enableParallelBuilding = true; diff --git a/pkgs/os-specific/linux/alsa-project/alsa-plugins/default.nix b/pkgs/os-specific/linux/alsa-project/alsa-plugins/default.nix index 684ecc23688..747979b1037 100644 --- a/pkgs/os-specific/linux/alsa-project/alsa-plugins/default.nix +++ b/pkgs/os-specific/linux/alsa-project/alsa-plugins/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "alsa-plugins"; - version = "1.2.2"; + version = "1.2.5"; src = fetchurl { url = "mirror://alsa/plugins/${pname}-${version}.tar.bz2"; - sha256 = "0z9k3ssbfk2ky2w13avgyf202j1drsz9sv3834bp33cj1i2hc3qw"; + sha256 = "086z2g2f95570vfvp9d5bakib4k18fb4bszf3lgx3j6j6f2gkvj2"; }; nativeBuildInputs = [ pkg-config ]; diff --git a/pkgs/os-specific/linux/alsa-project/alsa-topology-conf/default.nix b/pkgs/os-specific/linux/alsa-project/alsa-topology-conf/default.nix index 2328fea91fd..97960f833e1 100644 --- a/pkgs/os-specific/linux/alsa-project/alsa-topology-conf/default.nix +++ b/pkgs/os-specific/linux/alsa-project/alsa-topology-conf/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "alsa-topology-conf-${version}"; - version = "1.2.4"; + version = "1.2.5"; src = fetchurl { url = "mirror://alsa/lib/${name}.tar.bz2"; - sha256 = "01zdg6q4s6d01k39z96wi4vbhrfw1i2g4yi5dijwfk6a5vjfdq2m"; + sha256 = "sha256-i/qDBspj4dDL6AvphGYCc7kb1bfdCACmxapx3YyNd1w="; }; dontBuild = true; diff --git a/pkgs/os-specific/linux/alsa-project/alsa-ucm-conf/default.nix b/pkgs/os-specific/linux/alsa-project/alsa-ucm-conf/default.nix index d667cd3d51b..d87f3eebb84 100644 --- a/pkgs/os-specific/linux/alsa-project/alsa-ucm-conf/default.nix +++ b/pkgs/os-specific/linux/alsa-project/alsa-ucm-conf/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "alsa-ucm-conf-${version}"; - version = "1.2.4"; + version = "1.2.5"; src = fetchurl { url = "mirror://alsa/lib/${name}.tar.bz2"; - sha256 = "0h6kzi1cfdqyxp4pwpqh5wb89c8s9wrgix315bvamffwfxf56frc"; + sha256 = "sha256-CTrj2Fpeb9LNHMJ/7aQA1xkTgvuLXl4jSXKGyHwVB6U="; }; dontBuild = true; diff --git a/pkgs/os-specific/linux/alsa-project/alsa-utils/default.nix b/pkgs/os-specific/linux/alsa-project/alsa-utils/default.nix index ae2a9f21a6d..37bda86b0a6 100644 --- a/pkgs/os-specific/linux/alsa-project/alsa-utils/default.nix +++ b/pkgs/os-specific/linux/alsa-project/alsa-utils/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "alsa-utils"; - version = "1.2.4"; + version = "1.2.5"; src = fetchurl { url = "mirror://alsa/utils/${pname}-${version}.tar.bz2"; - sha256 = "09m4dnn4kplawprd2bl15nwa0b4r1brab3x44ga7f1fyk7aw5zwq"; + sha256 = "15wrl7jsprpcqdk01a3hdh2lak5jhp5jgflkr80h1crqb3q0m5q9"; }; nativeBuildInputs = [ gettext makeWrapper ]; @@ -17,7 +17,8 @@ stdenv.mkDerivation rec { installFlags = [ "ASOUND_STATE_DIR=$(TMPDIR)/dummy" ]; postFixup = '' - wrapProgram $out/bin/alsa-info.sh --prefix PATH : "${lib.makeBinPath [ which pciutils ]}" + mv $out/bin/alsa-info.sh $out/bin/alsa-info + wrapProgram $out/bin/alsa-info --prefix PATH : "${lib.makeBinPath [ which pciutils ]}" ''; meta = with lib; { diff --git a/pkgs/os-specific/linux/kbd/default.nix b/pkgs/os-specific/linux/kbd/default.nix index 467de4b029a..c7a59e59cab 100644 --- a/pkgs/os-specific/linux/kbd/default.nix +++ b/pkgs/os-specific/linux/kbd/default.nix @@ -8,6 +8,10 @@ , check , pam , coreutils +, gzip +, bzip2 +, xz +, zstd }: stdenv.mkDerivation rec { @@ -38,6 +42,13 @@ stdenv.mkDerivation rec { mv fgGIod/trf{,-fgGIod}.map mv colemak/{en-latin9,colemak}.map popd + + # Fix paths to decompressors. Trailing space to avoid replacing `xz` in `".xz"`. + substituteInPlace src/libkbdfile/kbdfile.c \ + --replace 'gzip ' '${gzip}/bin/gzip ' \ + --replace 'bzip2 ' '${bzip2.bin}/bin/bzip2 ' \ + --replace 'xz ' '${xz.bin}/bin/xz ' \ + --replace 'zstd ' '${zstd.bin}/bin/zstd ' ''; postInstall = '' @@ -50,7 +61,9 @@ stdenv.mkDerivation rec { buildInputs = [ check pam ]; nativeBuildInputs = [ autoreconfHook pkg-config flex ]; - passthru.tests = nixosTests.keymap; + passthru.tests = { + inherit (nixosTests) keymap kbd-setfont-decompress; + }; meta = with lib; { homepage = "https://kbd-project.org/"; diff --git a/pkgs/os-specific/linux/nftables/default.nix b/pkgs/os-specific/linux/nftables/default.nix index bb5e3f51964..f5fdee14c15 100644 --- a/pkgs/os-specific/linux/nftables/default.nix +++ b/pkgs/os-specific/linux/nftables/default.nix @@ -10,12 +10,12 @@ with lib; stdenv.mkDerivation rec { - version = "0.9.8"; + version = "0.9.9"; pname = "nftables"; src = fetchurl { url = "https://netfilter.org/projects/nftables/files/${pname}-${version}.tar.bz2"; - sha256 = "1r4g22grhd4s1918wws9vggb8821sv4kkj8197ygxr6sar301z30"; + sha256 = "1d7iwc8xlyfsbgn6qx1sdfcq7jhpl8wpfj39hcd06y8dzp3jvvvn"; }; nativeBuildInputs = [ diff --git a/pkgs/os-specific/linux/rdma-core/default.nix b/pkgs/os-specific/linux/rdma-core/default.nix index dff451a01d3..25a8f3bdafa 100644 --- a/pkgs/os-specific/linux/rdma-core/default.nix +++ b/pkgs/os-specific/linux/rdma-core/default.nix @@ -3,7 +3,7 @@ } : let - version = "34.0"; + version = "35.0"; in stdenv.mkDerivation { pname = "rdma-core"; @@ -13,7 +13,7 @@ in stdenv.mkDerivation { owner = "linux-rdma"; repo = "rdma-core"; rev = "v${version}"; - sha256 = "sha256-2HFtj595sDmWqAewIMwKMaiSDVVWKdQA9l0QsPcw8qA="; + sha256 = "0ra0m1s0029qgcq0li7md6pkri7pcc4iy3cd6jrrqs9c6n1clnnd"; }; nativeBuildInputs = [ cmake pkg-config pandoc docutils ]; diff --git a/pkgs/os-specific/linux/sd-switch/default.nix b/pkgs/os-specific/linux/sd-switch/default.nix index d4b3d9116b9..987f32664c1 100644 --- a/pkgs/os-specific/linux/sd-switch/default.nix +++ b/pkgs/os-specific/linux/sd-switch/default.nix @@ -2,16 +2,16 @@ rustPlatform.buildRustPackage rec { pname = "sd-switch"; - version = "0.2.2"; + version = "0.2.3"; src = fetchFromGitLab { owner = "rycee"; repo = pname; rev = version; - sha256 = "0vqvwly1vidzl3d89s7jysd5lc29d6skd52pf5ibxfwhrir50sw0"; + sha256 = "12h2d7v7pdz7b0hrna64561kf35nbpwb2kzxa791xk8raxc2b72k"; }; - cargoSha256 = "1m08qrz2qhf71d1fxw08wc93gfyj0hrh2hp3s17g4g1cw0jvcmm5"; + cargoSha256 = "12ny3cir2nxzrmf4vwq6sgc35dbpq88hav53xqdp44rigdf4vzbs"; nativeBuildInputs = [ pkg-config ]; buildInputs = [ dbus ]; diff --git a/pkgs/servers/home-assistant/cli.nix b/pkgs/servers/home-assistant/cli.nix index 9b678a5071d..baa418776c5 100644 --- a/pkgs/servers/home-assistant/cli.nix +++ b/pkgs/servers/home-assistant/cli.nix @@ -4,11 +4,11 @@ python3.pkgs.buildPythonApplication rec { pname = "homeassistant-cli"; - version = "0.9.3"; + version = "0.9.4"; src = python3.pkgs.fetchPypi { inherit pname version; - sha256 = "18h6bc99skzb0a1pffb6lr2z04928srrcz1w2zy66bndasic5yfs"; + sha256 = "03kiyqpp3zf8rg30d12h4fapihh0rqwpv5p8jfxb3iq0chfmjx2f"; }; postPatch = '' @@ -30,11 +30,13 @@ python3.pkgs.buildPythonApplication rec { tabulate ]; - postInstall = '' - mkdir -p "$out/share/bash-completion/completions" "$out/share/zsh/site-functions" - $out/bin/hass-cli completion bash > "$out/share/bash-completion/completions/hass-cli" - $out/bin/hass-cli completion zsh > "$out/share/zsh/site-functions/_hass-cli" - ''; + # Completion needs to be ported to work with click > 8.0 + # https://github.com/home-assistant-ecosystem/home-assistant-cli/issues/367 + #postInstall = '' + # mkdir -p "$out/share/bash-completion/completions" "$out/share/zsh/site-functions" + # $out/bin/hass-cli completion bash > "$out/share/bash-completion/completions/hass-cli" + # $out/bin/hass-cli completion zsh > "$out/share/zsh/site-functions/_hass-cli" + #''; checkInputs = with python3.pkgs; [ pytestCheckHook @@ -43,7 +45,7 @@ python3.pkgs.buildPythonApplication rec { meta = with lib; { description = "Command-line tool for Home Assistant"; - homepage = "https://github.com/home-assistant/home-assistant-cli"; + homepage = "https://github.com/home-assistant-ecosystem/home-assistant-cli"; changelog = "https://github.com/home-assistant-ecosystem/home-assistant-cli/releases/tag/${version}"; license = licenses.asl20; maintainers = teams.home-assistant.members; diff --git a/pkgs/servers/home-assistant/component-packages.nix b/pkgs/servers/home-assistant/component-packages.nix index c17cb8d1714..8fff6d0c3df 100644 --- a/pkgs/servers/home-assistant/component-packages.nix +++ b/pkgs/servers/home-assistant/component-packages.nix @@ -432,7 +432,7 @@ "kodi" = ps: with ps; [ pykodi ]; "konnected" = ps: with ps; [ aiohttp-cors konnected ]; "kostal_plenticore" = ps: with ps; [ ]; # missing inputs: kostal_plenticore - "kraken" = ps: with ps; [ ]; # missing inputs: krakenex pykrakenapi + "kraken" = ps: with ps; [ krakenex pykrakenapi ]; "kulersky" = ps: with ps; [ pykulersky ]; "kwb" = ps: with ps; [ ]; # missing inputs: pykwb "lacrosse" = ps: with ps; [ pylacrosse ]; @@ -750,7 +750,7 @@ "shodan" = ps: with ps; [ shodan ]; "shopping_list" = ps: with ps; [ aiohttp-cors ]; "sht31" = ps: with ps; [ ]; # missing inputs: Adafruit-GPIO Adafruit-SHT31 - "sia" = ps: with ps; [ ]; # missing inputs: pysiaalarm + "sia" = ps: with ps; [ pysiaalarm ]; "sigfox" = ps: with ps; [ ]; "sighthound" = ps: with ps; [ pillow simplehound ]; "signal_messenger" = ps: with ps; [ ]; # missing inputs: pysignalclirestapi @@ -903,7 +903,7 @@ "unifi_direct" = ps: with ps; [ pexpect ]; "unifiled" = ps: with ps; [ unifiled ]; "universal" = ps: with ps; [ ]; - "upb" = ps: with ps; [ ]; # missing inputs: upb_lib + "upb" = ps: with ps; [ upb-lib ]; "upc_connect" = ps: with ps; [ connect-box ]; "upcloud" = ps: with ps; [ ]; # missing inputs: upcloud-api "updater" = ps: with ps; [ distro ]; @@ -927,7 +927,7 @@ "vesync" = ps: with ps; [ pyvesync ]; "viaggiatreno" = ps: with ps; [ ]; "vicare" = ps: with ps; [ pyvicare ]; - "vilfo" = ps: with ps; [ ]; # missing inputs: vilfo-api-client + "vilfo" = ps: with ps; [ vilfo-api-client ]; "vivotek" = ps: with ps; [ ]; # missing inputs: libpyvivotek "vizio" = ps: with ps; [ pyvizio ]; "vlc" = ps: with ps; [ python-vlc ]; diff --git a/pkgs/servers/home-assistant/default.nix b/pkgs/servers/home-assistant/default.nix index e00b355f0c3..eb05ecd9e6e 100644 --- a/pkgs/servers/home-assistant/default.nix +++ b/pkgs/servers/home-assistant/default.nix @@ -23,27 +23,16 @@ let defaultOverrides = [ # Override the version of some packages pinned in Home Assistant's setup.py and requirements_all.txt - # https://github.com/NixOS/nixpkgs/pull/125414 - (mkOverride "flask" "2.0.1" "0mcgwq7b4qd99mf5bsvs3wphchxarf8kgil4hwww3blj31xjak0w") - (mkOverride "itsdangerous" "2.0.1" "1w6gfb2zhbcmrfj6digwzw1z68w6zg1q87rm6la2m412zil4swly") - (mkOverride "jinja2" "3.0.1" "197ms1wimxql650245v63wkv04n8bicj549wfhp51bx68x5lhgvh") - (mkOverride "markupsafe" "2.0.1" "02k2ynmqvvd0z0gakkf8s4idyb606r7zgga41jrkhqmigy06fk2r") + # Pinned due to API changes in aiopvpc>=2.2.0, remove after 2021.7.0 (self: super: { - werkzeug = super.werkzeug.overridePythonAttrs (oldAttrs: rec { - version = "2.0.1"; - src = oldAttrs.src.override { - inherit version; - sha256 = "0hlwawnn8c41f254qify5jnjj8xb97n294h09bqimzqhs0qdpq8x"; + aiopvpc = super.aiopvpc.overridePythonAttrs (oldAttr: rec { + version = "2.1.2"; + src = fetchFromGitHub { + owner = "azogue"; + repo = "aiopvpc"; + rev = "v${version}"; + sha256 = "0s8ki46dh39kw6qvsjcfcxa0gblyi33m3hry137kbi4lw5ws6qhr"; }; - checkInputs = oldAttrs.checkInputs ++ [ python3.pkgs.pytest-xprocess ]; - pytestFlagsArray = [ "-m 'not filterwarnings'" ]; - }); - }) - (mkOverride "flask-restful" "0.3.9" "0gm5dz088v3d2k1dkcp9b3nnqpkk0fp2jly870hijj2xhc5nbv6c") - (self: super: { - debugpy = super.debugpy.overridePythonAttrs (oldAttrs: rec { - # tests fail with flask/werkezug>=2.0 - doCheck = false; }); }) @@ -81,6 +70,32 @@ let (mkOverride "ring-doorbell" "0.6.2" "fbd537722a27b3b854c26506d894b7399bb8dc57ff36083285971227a2d46560") + # Pinned due to API changes in pyatmo>=5.1.0 + (self: super: { + pyatmo = super.pyatmo.overridePythonAttrs (oldAttrs: rec { + version = "5.0.1"; + src = fetchFromGitHub { + owner = "jabesq"; + repo = "pyatmo"; + rev = "v${version}"; + sha256 = "0can9v602iqfn0l01fd7gr63qzvcngfm0qka4s1x0pldh6avxmfh"; + }; + }); + }) + + # Pinned due to API changes in pyatv>=0.8.0 + (self: super: { + pyatv = super.pyatv.overridePythonAttrs (olAttrs: rec { + version = "0.7.7"; + src = fetchFromGitHub { + owner = "postlund"; + repo = "pyatv"; + rev = "v${version}"; + sha256 = "sha256-dPnh8XZN7ZVR2rYNnj7GSYXW5I2GNQwD/KRDTgs2AtI="; + }; + }); + }) + # Pinned due to API changes in pyflunearyou>=2.0 (self: super: { pyflunearyou = super.pyflunearyou.overridePythonAttrs (oldAttrs: rec { @@ -134,6 +149,8 @@ let }); }) + (mkOverride "pysma" "0.4.3" "sha256-vriMnJFS7yfTyDT1f4sx1xEBTQjqc4ZHmkdHp1vcd+Q=") + # Pinned due to API changes in eebrightbox>=0.0.5 (self: super: { eebrightbox = super.eebrightbox.overridePythonAttrs (oldAttrs: rec { @@ -495,6 +512,7 @@ in with py.pkgs; buildPythonApplication rec { "knx" "kodi" "konnected" + "kraken" "kulersky" "lastfm" "lcn" @@ -627,6 +645,7 @@ in with py.pkgs; buildPythonApplication rec { "shell_command" "shelly" "shopping_list" + "sia" "sigfox" "sighthound" "simplisafe" @@ -662,6 +681,7 @@ in with py.pkgs; buildPythonApplication rec { "surepetcare" "switch" "switcher_kis" + "syncthing" "system_health" "system_log" "tado" @@ -671,7 +691,8 @@ in with py.pkgs; buildPythonApplication rec { "telegram" "tellduslive" "template" - "tesla" + # disable tesla comonent tests while typer is incompatible with click>=8.0 + # "tesla" "threshold" "tibber" "tile" @@ -694,6 +715,7 @@ in with py.pkgs; buildPythonApplication rec { "unifi" "unifi_direct" "universal" + "upb" "updater" "upnp" "uptime" @@ -707,6 +729,7 @@ in with py.pkgs; buildPythonApplication rec { "verisure" "version" "vesync" + "vilfo" "vizio" "voicerss" "volumio" diff --git a/pkgs/servers/matrix-synapse/tools/synadm.nix b/pkgs/servers/matrix-synapse/tools/synadm.nix index b9a0ff3acd9..76f5106c08c 100644 --- a/pkgs/servers/matrix-synapse/tools/synadm.nix +++ b/pkgs/servers/matrix-synapse/tools/synadm.nix @@ -12,6 +12,11 @@ with python3Packages; buildPythonApplication rec { sha256 = "1vy30nwsns4jnv0s5i9jpyplxpclgwyw0gldpywv4z3fljs0lzik"; }; + postPatch = '' + substituteInPlace setup.py \ + --replace "Click>=7.0,<8.0" "Click" + ''; + propagatedBuildInputs = [ click click-option-group diff --git a/pkgs/servers/pinnwand/default.nix b/pkgs/servers/pinnwand/default.nix index 44dc87d1989..3962ce97110 100644 --- a/pkgs/servers/pinnwand/default.nix +++ b/pkgs/servers/pinnwand/default.nix @@ -17,6 +17,13 @@ with python3.pkgs; buildPythonApplication rec { sha256 = "046xk2y59wa0pdp7s3hp1gh8sqdw0yl4xab22r2x44iwwcyb0gy5"; }; + postPatch = '' + substituteInPlace pyproject.toml \ + --replace 'click = "^7.0"' 'click = "*"' \ + --replace 'docutils = "^0.16"' 'docutils = "*"' \ + --replace 'sqlalchemy = "^1.3"' 'sqlalchemy = "*"' + ''; + nativeBuildInputs = [ poetry-core ]; @@ -34,6 +41,11 @@ with python3.pkgs; buildPythonApplication rec { checkInputs = [ pytestCheckHook ]; + disabledTests = [ + # pygments renamed rst to restructuredText, hence a mismatch on this test + "test_guess_language" + ]; + __darwinAllowLocalNetworking = true; passthru.tests = nixosTests.pinnwand; diff --git a/pkgs/servers/pinnwand/steck.nix b/pkgs/servers/pinnwand/steck.nix index 8d44f8160d0..52efdc148ab 100644 --- a/pkgs/servers/pinnwand/steck.nix +++ b/pkgs/servers/pinnwand/steck.nix @@ -1,4 +1,8 @@ -{ lib, pkgs, python3Packages, nixosTests }: +{ lib +, pkgs +, python3Packages +, nixosTests +}: python3Packages.buildPythonApplication rec { pname = "steck"; @@ -9,6 +13,11 @@ python3Packages.buildPythonApplication rec { sha256 = "1a3l427ibwck9zzzy1sp10hmjgminya08i4r9j4559qzy7lxghs1"; }; + postPatch = '' + substituteInPlace setup.py \ + --replace 'click>=7.0,<8.0' 'click' + ''; + propagatedBuildInputs = with python3Packages; [ pkgs.git appdirs diff --git a/pkgs/servers/sql/postgresql/default.nix b/pkgs/servers/sql/postgresql/default.nix index 933ff6292e8..e13c23ddeee 100644 --- a/pkgs/servers/sql/postgresql/default.nix +++ b/pkgs/servers/sql/postgresql/default.nix @@ -196,18 +196,18 @@ let in self: { postgresql_9_6 = self.callPackage generic { - version = "9.6.21"; + version = "9.6.22"; psqlSchema = "9.6"; - sha256 = "0d0ngpadf1i7c0i2psaxcbmiwx8334ibcsn283n9fp4853pyl3wk"; + sha256 = "0c19kzrj5ib5ygmavf5d6qvxdwrxzzz6jz1r2dl5b815208cscix"; this = self.postgresql_9_6; thisAttr = "postgresql_9_6"; inherit self; }; postgresql_10 = self.callPackage generic { - version = "10.16"; + version = "10.17"; psqlSchema = "10.0"; # should be 10, but changing it is invasive - sha256 = "1cvv8qw0gkkczqhiwx6ns7w88dwkvdz4cvb2d4ff14363f5p2p53"; + sha256 = "0v5jahkqm6gkq67s4bac3h7297bscn2ab6y128idi73cc1qq1wjs"; this = self.postgresql_10; thisAttr = "postgresql_10"; inherit self; @@ -215,27 +215,27 @@ in self: { }; postgresql_11 = self.callPackage generic { - version = "11.11"; + version = "11.12"; psqlSchema = "11.1"; # should be 11, but changing it is invasive - sha256 = "0v0qk298nxmpzpgsxcsxma328hdkyzd7fwjs0zsn6zavl5zpnq20"; + sha256 = "016bacpmqxc676ipzc1l8zv1jj44mjz7dv7jhqazg3ibdfqxiyc7"; this = self.postgresql_11; thisAttr = "postgresql_11"; inherit self; }; postgresql_12 = self.callPackage generic { - version = "12.6"; + version = "12.7"; psqlSchema = "12"; - sha256 = "028asz92mi3706zabfs8w9z03mzyx62d1l71qy9zdwfabj6xjzfz"; + sha256 = "15frsmsl1n2i4p76ji0wng4lvnlzw6f01br4cs5xr3n88wgp9444"; this = self.postgresql_12; thisAttr = "postgresql_12"; inherit self; }; postgresql_13 = self.callPackage generic { - version = "13.2"; + version = "13.3"; psqlSchema = "13"; - sha256 = "1z5d847jnajcfr3wa6jn52a8xjhamvwzmz18xlm5nvxqip8grmsz"; + sha256 = "18dliq7h2l8irffhyyhdmfwx3si515q6gds3cxdjb9n7m17lbn9w"; this = self.postgresql_13; thisAttr = "postgresql_13"; inherit self; diff --git a/pkgs/servers/x11/xorg/default.nix b/pkgs/servers/x11/xorg/default.nix index d3f62c1b60d..125c329c4bd 100644 --- a/pkgs/servers/x11/xorg/default.nix +++ b/pkgs/servers/x11/xorg/default.nix @@ -7,7 +7,8 @@ lib.makeScope newScope (self: with self; { # THIS IS A GENERATED FILE. DO NOT EDIT! appres = callPackage ({ stdenv, pkg-config, fetchurl, libX11, xorgproto, libXt }: stdenv.mkDerivation { - name = "appres-1.0.5"; + pname = "appres"; + version = "1.0.5"; builder = ./builder.sh; src = fetchurl { url = "mirror://xorg/individual/app/appres-1.0.5.tar.bz2"; @@ -21,7 +22,8 @@ lib.makeScope newScope (self: with self; { # THIS IS A GENERATED FILE. DO NOT EDIT! bdftopcf = callPackage ({ stdenv, pkg-config, fetchurl }: stdenv.mkDerivation { - name = "bdftopcf-1.1"; + pname = "bdftopcf"; + version = "1.1"; builder = ./builder.sh; src = fetchurl { url = "mirror://xorg/individual/app/bdftopcf-1.1.tar.bz2"; @@ -35,7 +37,8 @@ lib.makeScope newScope (self: with self; { # THIS IS A GENERATED FILE. DO NOT EDIT! bitmap = callPackage ({ stdenv, pkg-config, fetchurl, libX11, libXaw, xbitmaps, libXmu, xorgproto, libXt }: stdenv.mkDerivation { - name = "bitmap-1.0.9"; + pname = "bitmap"; + version = "1.0.9"; builder = ./builder.sh; src = fetchurl { url = "mirror://xorg/individual/app/bitmap-1.0.9.tar.gz"; @@ -49,7 +52,8 @@ lib.makeScope newScope (self: with self; { # THIS IS A GENERATED FILE. DO NOT EDIT! editres = callPackage ({ stdenv, pkg-config, fetchurl, libX11, libXaw, libXmu, xorgproto, libXt }: stdenv.mkDerivation { - name = "editres-1.0.7"; + pname = "editres"; + version = "1.0.7"; builder = ./builder.sh; src = fetchurl { url = "mirror://xorg/individual/app/editres-1.0.7.tar.bz2"; @@ -63,7 +67,8 @@ lib.makeScope newScope (self: with self; { # THIS IS A GENERATED FILE. DO NOT EDIT! encodings = callPackage ({ stdenv, pkg-config, fetchurl }: stdenv.mkDerivation { - name = "encodings-1.0.5"; + pname = "encodings"; + version = "1.0.5"; builder = ./builder.sh; src = fetchurl { url = "mirror://xorg/individual/font/encodings-1.0.5.tar.bz2"; @@ -77,7 +82,8 @@ lib.makeScope newScope (self: with self; { # THIS IS A GENERATED FILE. DO NOT EDIT! fontadobe100dpi = callPackage ({ stdenv, pkg-config, fetchurl, bdftopcf, fontutil, mkfontscale }: stdenv.mkDerivation { - name = "font-adobe-100dpi-1.0.3"; + pname = "font-adobe-100dpi"; + version = "1.0.3"; builder = ./builder.sh; src = fetchurl { url = "mirror://xorg/individual/font/font-adobe-100dpi-1.0.3.tar.bz2"; @@ -92,7 +98,8 @@ lib.makeScope newScope (self: with self; { # THIS IS A GENERATED FILE. DO NOT EDIT! fontadobe75dpi = callPackage ({ stdenv, pkg-config, fetchurl, bdftopcf, fontutil, mkfontscale }: stdenv.mkDerivation { - name = "font-adobe-75dpi-1.0.3"; + pname = "font-adobe-75dpi"; + version = "1.0.3"; builder = ./builder.sh; src = fetchurl { url = "mirror://xorg/individual/font/font-adobe-75dpi-1.0.3.tar.bz2"; @@ -107,7 +114,8 @@ lib.makeScope newScope (self: with self; { # THIS IS A GENERATED FILE. DO NOT EDIT! fontadobeutopia100dpi = callPackage ({ stdenv, pkg-config, fetchurl, bdftopcf, fontutil, mkfontscale }: stdenv.mkDerivation { - name = "font-adobe-utopia-100dpi-1.0.4"; + pname = "font-adobe-utopia-100dpi"; + version = "1.0.4"; builder = ./builder.sh; src = fetchurl { url = "mirror://xorg/individual/font/font-adobe-utopia-100dpi-1.0.4.tar.bz2"; @@ -122,7 +130,8 @@ lib.makeScope newScope (self: with self; { # THIS IS A GENERATED FILE. DO NOT EDIT! fontadobeutopia75dpi = callPackage ({ stdenv, pkg-config, fetchurl, bdftopcf, fontutil, mkfontscale }: stdenv.mkDerivation { - name = "font-adobe-utopia-75dpi-1.0.4"; + pname = "font-adobe-utopia-75dpi"; + version = "1.0.4"; builder = ./builder.sh; src = fetchurl { url = "mirror://xorg/individual/font/font-adobe-utopia-75dpi-1.0.4.tar.bz2"; @@ -137,7 +146,8 @@ lib.makeScope newScope (self: with self; { # THIS IS A GENERATED FILE. DO NOT EDIT! fontadobeutopiatype1 = callPackage ({ stdenv, pkg-config, fetchurl, mkfontscale }: stdenv.mkDerivation { - name = "font-adobe-utopia-type1-1.0.4"; + pname = "font-adobe-utopia-type1"; + version = "1.0.4"; builder = ./builder.sh; src = fetchurl { url = "mirror://xorg/individual/font/font-adobe-utopia-type1-1.0.4.tar.bz2"; @@ -152,7 +162,8 @@ lib.makeScope newScope (self: with self; { # THIS IS A GENERATED FILE. DO NOT EDIT! fontalias = callPackage ({ stdenv, pkg-config, fetchurl }: stdenv.mkDerivation { - name = "font-alias-1.0.3"; + pname = "font-alias"; + version = "1.0.3"; builder = ./builder.sh; src = fetchurl { url = "mirror://xorg/individual/font/font-alias-1.0.3.tar.bz2"; @@ -166,7 +177,8 @@ lib.makeScope newScope (self: with self; { # THIS IS A GENERATED FILE. DO NOT EDIT! fontarabicmisc = callPackage ({ stdenv, pkg-config, fetchurl, bdftopcf, mkfontscale }: stdenv.mkDerivation { - name = "font-arabic-misc-1.0.3"; + pname = "font-arabic-misc"; + version = "1.0.3"; builder = ./builder.sh; src = fetchurl { url = "mirror://xorg/individual/font/font-arabic-misc-1.0.3.tar.bz2"; @@ -181,7 +193,8 @@ lib.makeScope newScope (self: with self; { # THIS IS A GENERATED FILE. DO NOT EDIT! fontbh100dpi = callPackage ({ stdenv, pkg-config, fetchurl, bdftopcf, fontutil, mkfontscale }: stdenv.mkDerivation { - name = "font-bh-100dpi-1.0.3"; + pname = "font-bh-100dpi"; + version = "1.0.3"; builder = ./builder.sh; src = fetchurl { url = "mirror://xorg/individual/font/font-bh-100dpi-1.0.3.tar.bz2"; @@ -196,7 +209,8 @@ lib.makeScope newScope (self: with self; { # THIS IS A GENERATED FILE. DO NOT EDIT! fontbh75dpi = callPackage ({ stdenv, pkg-config, fetchurl, bdftopcf, fontutil, mkfontscale }: stdenv.mkDerivation { - name = "font-bh-75dpi-1.0.3"; + pname = "font-bh-75dpi"; + version = "1.0.3"; builder = ./builder.sh; src = fetchurl { url = "mirror://xorg/individual/font/font-bh-75dpi-1.0.3.tar.bz2"; @@ -211,7 +225,8 @@ lib.makeScope newScope (self: with self; { # THIS IS A GENERATED FILE. DO NOT EDIT! fontbhlucidatypewriter100dpi = callPackage ({ stdenv, pkg-config, fetchurl, bdftopcf, fontutil, mkfontscale }: stdenv.mkDerivation { - name = "font-bh-lucidatypewriter-100dpi-1.0.3"; + pname = "font-bh-lucidatypewriter-100dpi"; + version = "1.0.3"; builder = ./builder.sh; src = fetchurl { url = "mirror://xorg/individual/font/font-bh-lucidatypewriter-100dpi-1.0.3.tar.bz2"; @@ -226,7 +241,8 @@ lib.makeScope newScope (self: with self; { # THIS IS A GENERATED FILE. DO NOT EDIT! fontbhlucidatypewriter75dpi = callPackage ({ stdenv, pkg-config, fetchurl, bdftopcf, fontutil, mkfontscale }: stdenv.mkDerivation { - name = "font-bh-lucidatypewriter-75dpi-1.0.3"; + pname = "font-bh-lucidatypewriter-75dpi"; + version = "1.0.3"; builder = ./builder.sh; src = fetchurl { url = "mirror://xorg/individual/font/font-bh-lucidatypewriter-75dpi-1.0.3.tar.bz2"; @@ -241,7 +257,8 @@ lib.makeScope newScope (self: with self; { # THIS IS A GENERATED FILE. DO NOT EDIT! fontbhttf = callPackage ({ stdenv, pkg-config, fetchurl, mkfontscale }: stdenv.mkDerivation { - name = "font-bh-ttf-1.0.3"; + pname = "font-bh-ttf"; + version = "1.0.3"; builder = ./builder.sh; src = fetchurl { url = "mirror://xorg/individual/font/font-bh-ttf-1.0.3.tar.bz2"; @@ -256,7 +273,8 @@ lib.makeScope newScope (self: with self; { # THIS IS A GENERATED FILE. DO NOT EDIT! fontbhtype1 = callPackage ({ stdenv, pkg-config, fetchurl, mkfontscale }: stdenv.mkDerivation { - name = "font-bh-type1-1.0.3"; + pname = "font-bh-type1"; + version = "1.0.3"; builder = ./builder.sh; src = fetchurl { url = "mirror://xorg/individual/font/font-bh-type1-1.0.3.tar.bz2"; @@ -271,7 +289,8 @@ lib.makeScope newScope (self: with self; { # THIS IS A GENERATED FILE. DO NOT EDIT! fontbitstream100dpi = callPackage ({ stdenv, pkg-config, fetchurl, bdftopcf, mkfontscale }: stdenv.mkDerivation { - name = "font-bitstream-100dpi-1.0.3"; + pname = "font-bitstream-100dpi"; + version = "1.0.3"; builder = ./builder.sh; src = fetchurl { url = "mirror://xorg/individual/font/font-bitstream-100dpi-1.0.3.tar.bz2"; @@ -286,7 +305,8 @@ lib.makeScope newScope (self: with self; { # THIS IS A GENERATED FILE. DO NOT EDIT! fontbitstream75dpi = callPackage ({ stdenv, pkg-config, fetchurl, bdftopcf, mkfontscale }: stdenv.mkDerivation { - name = "font-bitstream-75dpi-1.0.3"; + pname = "font-bitstream-75dpi"; + version = "1.0.3"; builder = ./builder.sh; src = fetchurl { url = "mirror://xorg/individual/font/font-bitstream-75dpi-1.0.3.tar.bz2"; @@ -301,7 +321,8 @@ lib.makeScope newScope (self: with self; { # THIS IS A GENERATED FILE. DO NOT EDIT! fontbitstreamtype1 = callPackage ({ stdenv, pkg-config, fetchurl, mkfontscale }: stdenv.mkDerivation { - name = "font-bitstream-type1-1.0.3"; + pname = "font-bitstream-type1"; + version = "1.0.3"; builder = ./builder.sh; src = fetchurl { url = "mirror://xorg/individual/font/font-bitstream-type1-1.0.3.tar.bz2"; @@ -316,7 +337,8 @@ lib.makeScope newScope (self: with self; { # THIS IS A GENERATED FILE. DO NOT EDIT! fontcronyxcyrillic = callPackage ({ stdenv, pkg-config, fetchurl, bdftopcf, mkfontscale }: stdenv.mkDerivation { - name = "font-cronyx-cyrillic-1.0.3"; + pname = "font-cronyx-cyrillic"; + version = "1.0.3"; builder = ./builder.sh; src = fetchurl { url = "mirror://xorg/individual/font/font-cronyx-cyrillic-1.0.3.tar.bz2"; @@ -331,7 +353,8 @@ lib.makeScope newScope (self: with self; { # THIS IS A GENERATED FILE. DO NOT EDIT! fontcursormisc = callPackage ({ stdenv, pkg-config, fetchurl, bdftopcf, mkfontscale }: stdenv.mkDerivation { - name = "font-cursor-misc-1.0.3"; + pname = "font-cursor-misc"; + version = "1.0.3"; builder = ./builder.sh; src = fetchurl { url = "mirror://xorg/individual/font/font-cursor-misc-1.0.3.tar.bz2"; @@ -346,7 +369,8 @@ lib.makeScope newScope (self: with self; { # THIS IS A GENERATED FILE. DO NOT EDIT! fontdaewoomisc = callPackage ({ stdenv, pkg-config, fetchurl, bdftopcf, mkfontscale }: stdenv.mkDerivation { - name = "font-daewoo-misc-1.0.3"; + pname = "font-daewoo-misc"; + version = "1.0.3"; builder = ./builder.sh; src = fetchurl { url = "mirror://xorg/individual/font/font-daewoo-misc-1.0.3.tar.bz2"; @@ -361,7 +385,8 @@ lib.makeScope newScope (self: with self; { # THIS IS A GENERATED FILE. DO NOT EDIT! fontdecmisc = callPackage ({ stdenv, pkg-config, fetchurl, bdftopcf, mkfontscale }: stdenv.mkDerivation { - name = "font-dec-misc-1.0.3"; + pname = "font-dec-misc"; + version = "1.0.3"; builder = ./builder.sh; src = fetchurl { url = "mirror://xorg/individual/font/font-dec-misc-1.0.3.tar.bz2"; @@ -376,7 +401,8 @@ lib.makeScope newScope (self: with self; { # THIS IS A GENERATED FILE. DO NOT EDIT! fontibmtype1 = callPackage ({ stdenv, pkg-config, fetchurl, mkfontscale }: stdenv.mkDerivation { - name = "font-ibm-type1-1.0.3"; + pname = "font-ibm-type1"; + version = "1.0.3"; builder = ./builder.sh; src = fetchurl { url = "mirror://xorg/individual/font/font-ibm-type1-1.0.3.tar.bz2"; @@ -391,7 +417,8 @@ lib.makeScope newScope (self: with self; { # THIS IS A GENERATED FILE. DO NOT EDIT! fontisasmisc = callPackage ({ stdenv, pkg-config, fetchurl, bdftopcf, mkfontscale }: stdenv.mkDerivation { - name = "font-isas-misc-1.0.3"; + pname = "font-isas-misc"; + version = "1.0.3"; builder = ./builder.sh; src = fetchurl { url = "mirror://xorg/individual/font/font-isas-misc-1.0.3.tar.bz2"; @@ -406,7 +433,8 @@ lib.makeScope newScope (self: with self; { # THIS IS A GENERATED FILE. DO NOT EDIT! fontjismisc = callPackage ({ stdenv, pkg-config, fetchurl, bdftopcf, mkfontscale }: stdenv.mkDerivation { - name = "font-jis-misc-1.0.3"; + pname = "font-jis-misc"; + version = "1.0.3"; builder = ./builder.sh; src = fetchurl { url = "mirror://xorg/individual/font/font-jis-misc-1.0.3.tar.bz2"; @@ -421,7 +449,8 @@ lib.makeScope newScope (self: with self; { # THIS IS A GENERATED FILE. DO NOT EDIT! fontmicromisc = callPackage ({ stdenv, pkg-config, fetchurl, bdftopcf, mkfontscale }: stdenv.mkDerivation { - name = "font-micro-misc-1.0.3"; + pname = "font-micro-misc"; + version = "1.0.3"; builder = ./builder.sh; src = fetchurl { url = "mirror://xorg/individual/font/font-micro-misc-1.0.3.tar.bz2"; @@ -436,7 +465,8 @@ lib.makeScope newScope (self: with self; { # THIS IS A GENERATED FILE. DO NOT EDIT! fontmisccyrillic = callPackage ({ stdenv, pkg-config, fetchurl, bdftopcf, mkfontscale }: stdenv.mkDerivation { - name = "font-misc-cyrillic-1.0.3"; + pname = "font-misc-cyrillic"; + version = "1.0.3"; builder = ./builder.sh; src = fetchurl { url = "mirror://xorg/individual/font/font-misc-cyrillic-1.0.3.tar.bz2"; @@ -451,7 +481,8 @@ lib.makeScope newScope (self: with self; { # THIS IS A GENERATED FILE. DO NOT EDIT! fontmiscethiopic = callPackage ({ stdenv, pkg-config, fetchurl, mkfontscale }: stdenv.mkDerivation { - name = "font-misc-ethiopic-1.0.3"; + pname = "font-misc-ethiopic"; + version = "1.0.3"; builder = ./builder.sh; src = fetchurl { url = "mirror://xorg/individual/font/font-misc-ethiopic-1.0.3.tar.bz2"; @@ -466,7 +497,8 @@ lib.makeScope newScope (self: with self; { # THIS IS A GENERATED FILE. DO NOT EDIT! fontmiscmeltho = callPackage ({ stdenv, pkg-config, fetchurl, mkfontscale }: stdenv.mkDerivation { - name = "font-misc-meltho-1.0.3"; + pname = "font-misc-meltho"; + version = "1.0.3"; builder = ./builder.sh; src = fetchurl { url = "mirror://xorg/individual/font/font-misc-meltho-1.0.3.tar.bz2"; @@ -481,7 +513,8 @@ lib.makeScope newScope (self: with self; { # THIS IS A GENERATED FILE. DO NOT EDIT! fontmiscmisc = callPackage ({ stdenv, pkg-config, fetchurl, bdftopcf, fontutil, mkfontscale }: stdenv.mkDerivation { - name = "font-misc-misc-1.1.2"; + pname = "font-misc-misc"; + version = "1.1.2"; builder = ./builder.sh; src = fetchurl { url = "mirror://xorg/individual/font/font-misc-misc-1.1.2.tar.bz2"; @@ -496,7 +529,8 @@ lib.makeScope newScope (self: with self; { # THIS IS A GENERATED FILE. DO NOT EDIT! fontmuttmisc = callPackage ({ stdenv, pkg-config, fetchurl, bdftopcf, mkfontscale }: stdenv.mkDerivation { - name = "font-mutt-misc-1.0.3"; + pname = "font-mutt-misc"; + version = "1.0.3"; builder = ./builder.sh; src = fetchurl { url = "mirror://xorg/individual/font/font-mutt-misc-1.0.3.tar.bz2"; @@ -511,7 +545,8 @@ lib.makeScope newScope (self: with self; { # THIS IS A GENERATED FILE. DO NOT EDIT! fontschumachermisc = callPackage ({ stdenv, pkg-config, fetchurl, bdftopcf, fontutil, mkfontscale }: stdenv.mkDerivation { - name = "font-schumacher-misc-1.1.2"; + pname = "font-schumacher-misc"; + version = "1.1.2"; builder = ./builder.sh; src = fetchurl { url = "mirror://xorg/individual/font/font-schumacher-misc-1.1.2.tar.bz2"; @@ -526,7 +561,8 @@ lib.makeScope newScope (self: with self; { # THIS IS A GENERATED FILE. DO NOT EDIT! fontscreencyrillic = callPackage ({ stdenv, pkg-config, fetchurl, bdftopcf, mkfontscale }: stdenv.mkDerivation { - name = "font-screen-cyrillic-1.0.4"; + pname = "font-screen-cyrillic"; + version = "1.0.4"; builder = ./builder.sh; src = fetchurl { url = "mirror://xorg/individual/font/font-screen-cyrillic-1.0.4.tar.bz2"; @@ -541,7 +577,8 @@ lib.makeScope newScope (self: with self; { # THIS IS A GENERATED FILE. DO NOT EDIT! fontsonymisc = callPackage ({ stdenv, pkg-config, fetchurl, bdftopcf, mkfontscale }: stdenv.mkDerivation { - name = "font-sony-misc-1.0.3"; + pname = "font-sony-misc"; + version = "1.0.3"; builder = ./builder.sh; src = fetchurl { url = "mirror://xorg/individual/font/font-sony-misc-1.0.3.tar.bz2"; @@ -556,7 +593,8 @@ lib.makeScope newScope (self: with self; { # THIS IS A GENERATED FILE. DO NOT EDIT! fontsunmisc = callPackage ({ stdenv, pkg-config, fetchurl, bdftopcf, mkfontscale }: stdenv.mkDerivation { - name = "font-sun-misc-1.0.3"; + pname = "font-sun-misc"; + version = "1.0.3"; builder = ./builder.sh; src = fetchurl { url = "mirror://xorg/individual/font/font-sun-misc-1.0.3.tar.bz2"; @@ -571,7 +609,8 @@ lib.makeScope newScope (self: with self; { # THIS IS A GENERATED FILE. DO NOT EDIT! fonttosfnt = callPackage ({ stdenv, pkg-config, fetchurl, libfontenc, freetype, xorgproto }: stdenv.mkDerivation { - name = "fonttosfnt-1.2.2"; + pname = "fonttosfnt"; + version = "1.2.2"; builder = ./builder.sh; src = fetchurl { url = "mirror://xorg/individual/app/fonttosfnt-1.2.2.tar.bz2"; @@ -585,7 +624,8 @@ lib.makeScope newScope (self: with self; { # THIS IS A GENERATED FILE. DO NOT EDIT! fontutil = callPackage ({ stdenv, pkg-config, fetchurl }: stdenv.mkDerivation { - name = "font-util-1.3.1"; + pname = "font-util"; + version = "1.3.1"; builder = ./builder.sh; src = fetchurl { url = "mirror://xorg/individual/font/font-util-1.3.1.tar.bz2"; @@ -599,7 +639,8 @@ lib.makeScope newScope (self: with self; { # THIS IS A GENERATED FILE. DO NOT EDIT! fontwinitzkicyrillic = callPackage ({ stdenv, pkg-config, fetchurl, bdftopcf, mkfontscale }: stdenv.mkDerivation { - name = "font-winitzki-cyrillic-1.0.3"; + pname = "font-winitzki-cyrillic"; + version = "1.0.3"; builder = ./builder.sh; src = fetchurl { url = "mirror://xorg/individual/font/font-winitzki-cyrillic-1.0.3.tar.bz2"; @@ -614,7 +655,8 @@ lib.makeScope newScope (self: with self; { # THIS IS A GENERATED FILE. DO NOT EDIT! fontxfree86type1 = callPackage ({ stdenv, pkg-config, fetchurl, mkfontscale }: stdenv.mkDerivation { - name = "font-xfree86-type1-1.0.4"; + pname = "font-xfree86-type1"; + version = "1.0.4"; builder = ./builder.sh; src = fetchurl { url = "mirror://xorg/individual/font/font-xfree86-type1-1.0.4.tar.bz2"; @@ -629,7 +671,8 @@ lib.makeScope newScope (self: with self; { # THIS IS A GENERATED FILE. DO NOT EDIT! gccmakedep = callPackage ({ stdenv, pkg-config, fetchurl }: stdenv.mkDerivation { - name = "gccmakedep-1.0.3"; + pname = "gccmakedep"; + version = "1.0.3"; builder = ./builder.sh; src = fetchurl { url = "mirror://xorg/individual/util/gccmakedep-1.0.3.tar.bz2"; @@ -643,7 +686,8 @@ lib.makeScope newScope (self: with self; { # THIS IS A GENERATED FILE. DO NOT EDIT! iceauth = callPackage ({ stdenv, pkg-config, fetchurl, libICE, xorgproto }: stdenv.mkDerivation { - name = "iceauth-1.0.8"; + pname = "iceauth"; + version = "1.0.8"; builder = ./builder.sh; src = fetchurl { url = "mirror://xorg/individual/app/iceauth-1.0.8.tar.bz2"; @@ -657,7 +701,8 @@ lib.makeScope newScope (self: with self; { # THIS IS A GENERATED FILE. DO NOT EDIT! ico = callPackage ({ stdenv, pkg-config, fetchurl, libX11, xorgproto }: stdenv.mkDerivation { - name = "ico-1.0.5"; + pname = "ico"; + version = "1.0.5"; builder = ./builder.sh; src = fetchurl { url = "mirror://xorg/individual/app/ico-1.0.5.tar.bz2"; @@ -671,7 +716,8 @@ lib.makeScope newScope (self: with self; { # THIS IS A GENERATED FILE. DO NOT EDIT! imake = callPackage ({ stdenv, pkg-config, fetchurl, xorgproto }: stdenv.mkDerivation { - name = "imake-1.0.8"; + pname = "imake"; + version = "1.0.8"; builder = ./builder.sh; src = fetchurl { url = "mirror://xorg/individual/util/imake-1.0.8.tar.bz2"; @@ -685,7 +731,8 @@ lib.makeScope newScope (self: with self; { # THIS IS A GENERATED FILE. DO NOT EDIT! libAppleWM = callPackage ({ stdenv, pkg-config, fetchurl, xorgproto, libX11, libXext }: stdenv.mkDerivation { - name = "libAppleWM-1.4.1"; + pname = "libAppleWM"; + version = "1.4.1"; builder = ./builder.sh; src = fetchurl { url = "mirror://xorg/individual/lib/libAppleWM-1.4.1.tar.bz2"; @@ -699,7 +746,8 @@ lib.makeScope newScope (self: with self; { # THIS IS A GENERATED FILE. DO NOT EDIT! libFS = callPackage ({ stdenv, pkg-config, fetchurl, xorgproto, xtrans }: stdenv.mkDerivation { - name = "libFS-1.0.8"; + pname = "libFS"; + version = "1.0.8"; builder = ./builder.sh; src = fetchurl { url = "mirror://xorg/individual/lib/libFS-1.0.8.tar.bz2"; @@ -713,7 +761,8 @@ lib.makeScope newScope (self: with self; { # THIS IS A GENERATED FILE. DO NOT EDIT! libICE = callPackage ({ stdenv, pkg-config, fetchurl, xorgproto, xtrans }: stdenv.mkDerivation { - name = "libICE-1.0.10"; + pname = "libICE"; + version = "1.0.10"; builder = ./builder.sh; src = fetchurl { url = "mirror://xorg/individual/lib/libICE-1.0.10.tar.bz2"; @@ -727,7 +776,8 @@ lib.makeScope newScope (self: with self; { # THIS IS A GENERATED FILE. DO NOT EDIT! libSM = callPackage ({ stdenv, pkg-config, fetchurl, libICE, libuuid, xorgproto, xtrans }: stdenv.mkDerivation { - name = "libSM-1.2.3"; + pname = "libSM"; + version = "1.2.3"; builder = ./builder.sh; src = fetchurl { url = "mirror://xorg/individual/lib/libSM-1.2.3.tar.bz2"; @@ -741,7 +791,8 @@ lib.makeScope newScope (self: with self; { # THIS IS A GENERATED FILE. DO NOT EDIT! libWindowsWM = callPackage ({ stdenv, pkg-config, fetchurl, xorgproto, libX11, libXext }: stdenv.mkDerivation { - name = "libWindowsWM-1.0.1"; + pname = "libWindowsWM"; + version = "1.0.1"; builder = ./builder.sh; src = fetchurl { url = "mirror://xorg/individual/lib/libWindowsWM-1.0.1.tar.bz2"; @@ -755,11 +806,12 @@ lib.makeScope newScope (self: with self; { # THIS IS A GENERATED FILE. DO NOT EDIT! libX11 = callPackage ({ stdenv, pkg-config, fetchurl, xorgproto, libxcb, xtrans }: stdenv.mkDerivation { - name = "libX11-1.7.1"; + pname = "libX11"; + version = "1.7.2"; builder = ./builder.sh; src = fetchurl { - url = "mirror://xorg/individual/lib/libX11-1.7.1.tar.bz2"; - sha256 = "0isxad59hvdwggbxqqjjjg3zmih9xiq4d9mdsnqbyb2nmbg46kp6"; + url = "mirror://xorg/individual/lib/libX11-1.7.2.tar.bz2"; + sha256 = "0v7aj8q3rlchdyfwdna7n7vgpyzyir391dlv5rwy9fxagbikbyhw"; }; hardeningDisable = [ "bindnow" "relro" ]; nativeBuildInputs = [ pkg-config ]; @@ -769,7 +821,8 @@ lib.makeScope newScope (self: with self; { # THIS IS A GENERATED FILE. DO NOT EDIT! libXScrnSaver = callPackage ({ stdenv, pkg-config, fetchurl, xorgproto, libX11, libXext }: stdenv.mkDerivation { - name = "libXScrnSaver-1.2.3"; + pname = "libXScrnSaver"; + version = "1.2.3"; builder = ./builder.sh; src = fetchurl { url = "mirror://xorg/individual/lib/libXScrnSaver-1.2.3.tar.bz2"; @@ -783,7 +836,8 @@ lib.makeScope newScope (self: with self; { # THIS IS A GENERATED FILE. DO NOT EDIT! libXTrap = callPackage ({ stdenv, pkg-config, fetchurl, xorgproto, libX11, libXext, libXt }: stdenv.mkDerivation { - name = "libXTrap-1.0.1"; + pname = "libXTrap"; + version = "1.0.1"; builder = ./builder.sh; src = fetchurl { url = "mirror://xorg/individual/lib/libXTrap-1.0.1.tar.bz2"; @@ -797,7 +851,8 @@ lib.makeScope newScope (self: with self; { # THIS IS A GENERATED FILE. DO NOT EDIT! libXau = callPackage ({ stdenv, pkg-config, fetchurl, xorgproto }: stdenv.mkDerivation { - name = "libXau-1.0.9"; + pname = "libXau"; + version = "1.0.9"; builder = ./builder.sh; src = fetchurl { url = "mirror://xorg/individual/lib/libXau-1.0.9.tar.bz2"; @@ -811,7 +866,8 @@ lib.makeScope newScope (self: with self; { # THIS IS A GENERATED FILE. DO NOT EDIT! libXaw = callPackage ({ stdenv, pkg-config, fetchurl, libX11, libXext, xorgproto, libXmu, libXpm, libXt }: stdenv.mkDerivation { - name = "libXaw-1.0.14"; + pname = "libXaw"; + version = "1.0.14"; builder = ./builder.sh; src = fetchurl { url = "mirror://xorg/individual/lib/libXaw-1.0.14.tar.bz2"; @@ -825,7 +881,8 @@ lib.makeScope newScope (self: with self; { # THIS IS A GENERATED FILE. DO NOT EDIT! libXaw3d = callPackage ({ stdenv, pkg-config, fetchurl, libX11, libXext, libXmu, libXpm, xorgproto, libXt }: stdenv.mkDerivation { - name = "libXaw3d-1.6.3"; + pname = "libXaw3d"; + version = "1.6.3"; builder = ./builder.sh; src = fetchurl { url = "mirror://xorg/individual/lib/libXaw3d-1.6.3.tar.bz2"; @@ -839,7 +896,8 @@ lib.makeScope newScope (self: with self; { # THIS IS A GENERATED FILE. DO NOT EDIT! libXcomposite = callPackage ({ stdenv, pkg-config, fetchurl, xorgproto, libX11, libXfixes }: stdenv.mkDerivation { - name = "libXcomposite-0.4.5"; + pname = "libXcomposite"; + version = "0.4.5"; builder = ./builder.sh; src = fetchurl { url = "mirror://xorg/individual/lib/libXcomposite-0.4.5.tar.bz2"; @@ -853,7 +911,8 @@ lib.makeScope newScope (self: with self; { # THIS IS A GENERATED FILE. DO NOT EDIT! libXcursor = callPackage ({ stdenv, pkg-config, fetchurl, xorgproto, libX11, libXfixes, libXrender }: stdenv.mkDerivation { - name = "libXcursor-1.2.0"; + pname = "libXcursor"; + version = "1.2.0"; builder = ./builder.sh; src = fetchurl { url = "mirror://xorg/individual/lib/libXcursor-1.2.0.tar.bz2"; @@ -867,7 +926,8 @@ lib.makeScope newScope (self: with self; { # THIS IS A GENERATED FILE. DO NOT EDIT! libXdamage = callPackage ({ stdenv, pkg-config, fetchurl, xorgproto, libX11, libXfixes }: stdenv.mkDerivation { - name = "libXdamage-1.1.5"; + pname = "libXdamage"; + version = "1.1.5"; builder = ./builder.sh; src = fetchurl { url = "mirror://xorg/individual/lib/libXdamage-1.1.5.tar.bz2"; @@ -881,7 +941,8 @@ lib.makeScope newScope (self: with self; { # THIS IS A GENERATED FILE. DO NOT EDIT! libXdmcp = callPackage ({ stdenv, pkg-config, fetchurl, xorgproto }: stdenv.mkDerivation { - name = "libXdmcp-1.1.3"; + pname = "libXdmcp"; + version = "1.1.3"; builder = ./builder.sh; src = fetchurl { url = "mirror://xorg/individual/lib/libXdmcp-1.1.3.tar.bz2"; @@ -895,7 +956,8 @@ lib.makeScope newScope (self: with self; { # THIS IS A GENERATED FILE. DO NOT EDIT! libXext = callPackage ({ stdenv, pkg-config, fetchurl, libX11, xorgproto }: stdenv.mkDerivation { - name = "libXext-1.3.4"; + pname = "libXext"; + version = "1.3.4"; builder = ./builder.sh; src = fetchurl { url = "mirror://xorg/individual/lib/libXext-1.3.4.tar.bz2"; @@ -909,11 +971,12 @@ lib.makeScope newScope (self: with self; { # THIS IS A GENERATED FILE. DO NOT EDIT! libXfixes = callPackage ({ stdenv, pkg-config, fetchurl, xorgproto, libX11 }: stdenv.mkDerivation { - name = "libXfixes-5.0.3"; + pname = "libXfixes"; + version = "6.0.0"; builder = ./builder.sh; src = fetchurl { - url = "mirror://xorg/individual/lib/libXfixes-5.0.3.tar.bz2"; - sha256 = "1miana3y4hwdqdparsccmygqr3ic3hs5jrqfzp70hvi2zwxd676y"; + url = "mirror://xorg/individual/lib/libXfixes-6.0.0.tar.bz2"; + sha256 = "0k2v4i4r24y3kdr5ici1qqhp69djnja919xfqp54c2rylm6s5hd7"; }; hardeningDisable = [ "bindnow" "relro" ]; nativeBuildInputs = [ pkg-config ]; @@ -923,7 +986,8 @@ lib.makeScope newScope (self: with self; { # THIS IS A GENERATED FILE. DO NOT EDIT! libXfont = callPackage ({ stdenv, pkg-config, fetchurl, libfontenc, xorgproto, freetype, xtrans, zlib }: stdenv.mkDerivation { - name = "libXfont-1.5.4"; + pname = "libXfont"; + version = "1.5.4"; builder = ./builder.sh; src = fetchurl { url = "mirror://xorg/individual/lib/libXfont-1.5.4.tar.bz2"; @@ -937,7 +1001,8 @@ lib.makeScope newScope (self: with self; { # THIS IS A GENERATED FILE. DO NOT EDIT! libXfont2 = callPackage ({ stdenv, pkg-config, fetchurl, libfontenc, xorgproto, freetype, xtrans, zlib }: stdenv.mkDerivation { - name = "libXfont2-2.0.4"; + pname = "libXfont2"; + version = "2.0.4"; builder = ./builder.sh; src = fetchurl { url = "mirror://xorg/individual/lib/libXfont2-2.0.4.tar.bz2"; @@ -951,7 +1016,8 @@ lib.makeScope newScope (self: with self; { # THIS IS A GENERATED FILE. DO NOT EDIT! libXft = callPackage ({ stdenv, pkg-config, fetchurl, fontconfig, freetype, libX11, xorgproto, libXrender }: stdenv.mkDerivation { - name = "libXft-2.3.3"; + pname = "libXft"; + version = "2.3.3"; builder = ./builder.sh; src = fetchurl { url = "mirror://xorg/individual/lib/libXft-2.3.3.tar.bz2"; @@ -965,7 +1031,8 @@ lib.makeScope newScope (self: with self; { # THIS IS A GENERATED FILE. DO NOT EDIT! libXi = callPackage ({ stdenv, pkg-config, fetchurl, xorgproto, libX11, libXext, libXfixes }: stdenv.mkDerivation { - name = "libXi-1.7.10"; + pname = "libXi"; + version = "1.7.10"; builder = ./builder.sh; src = fetchurl { url = "mirror://xorg/individual/lib/libXi-1.7.10.tar.bz2"; @@ -979,7 +1046,8 @@ lib.makeScope newScope (self: with self; { # THIS IS A GENERATED FILE. DO NOT EDIT! libXinerama = callPackage ({ stdenv, pkg-config, fetchurl, libX11, libXext, xorgproto }: stdenv.mkDerivation { - name = "libXinerama-1.1.4"; + pname = "libXinerama"; + version = "1.1.4"; builder = ./builder.sh; src = fetchurl { url = "mirror://xorg/individual/lib/libXinerama-1.1.4.tar.bz2"; @@ -993,7 +1061,8 @@ lib.makeScope newScope (self: with self; { # THIS IS A GENERATED FILE. DO NOT EDIT! libXmu = callPackage ({ stdenv, pkg-config, fetchurl, libX11, libXext, xorgproto, libXt }: stdenv.mkDerivation { - name = "libXmu-1.1.3"; + pname = "libXmu"; + version = "1.1.3"; builder = ./builder.sh; src = fetchurl { url = "mirror://xorg/individual/lib/libXmu-1.1.3.tar.bz2"; @@ -1007,7 +1076,8 @@ lib.makeScope newScope (self: with self; { # THIS IS A GENERATED FILE. DO NOT EDIT! libXp = callPackage ({ stdenv, pkg-config, fetchurl, xorgproto, libX11, libXau, libXext }: stdenv.mkDerivation { - name = "libXp-1.0.3"; + pname = "libXp"; + version = "1.0.3"; builder = ./builder.sh; src = fetchurl { url = "mirror://xorg/individual/lib/libXp-1.0.3.tar.bz2"; @@ -1021,7 +1091,8 @@ lib.makeScope newScope (self: with self; { # THIS IS A GENERATED FILE. DO NOT EDIT! libXpm = callPackage ({ stdenv, pkg-config, fetchurl, libX11, libXext, xorgproto, libXt, gettext }: stdenv.mkDerivation { - name = "libXpm-3.5.13"; + pname = "libXpm"; + version = "3.5.13"; builder = ./builder.sh; src = fetchurl { url = "mirror://xorg/individual/lib/libXpm-3.5.13.tar.bz2"; @@ -1035,7 +1106,8 @@ lib.makeScope newScope (self: with self; { # THIS IS A GENERATED FILE. DO NOT EDIT! libXpresent = callPackage ({ stdenv, pkg-config, fetchurl, xorgproto, libX11 }: stdenv.mkDerivation { - name = "libXpresent-1.0.0"; + pname = "libXpresent"; + version = "1.0.0"; builder = ./builder.sh; src = fetchurl { url = "mirror://xorg/individual/lib/libXpresent-1.0.0.tar.bz2"; @@ -1049,7 +1121,8 @@ lib.makeScope newScope (self: with self; { # THIS IS A GENERATED FILE. DO NOT EDIT! libXrandr = callPackage ({ stdenv, pkg-config, fetchurl, xorgproto, libX11, libXext, libXrender }: stdenv.mkDerivation { - name = "libXrandr-1.5.2"; + pname = "libXrandr"; + version = "1.5.2"; builder = ./builder.sh; src = fetchurl { url = "mirror://xorg/individual/lib/libXrandr-1.5.2.tar.bz2"; @@ -1063,7 +1136,8 @@ lib.makeScope newScope (self: with self; { # THIS IS A GENERATED FILE. DO NOT EDIT! libXrender = callPackage ({ stdenv, pkg-config, fetchurl, xorgproto, libX11 }: stdenv.mkDerivation { - name = "libXrender-0.9.10"; + pname = "libXrender"; + version = "0.9.10"; builder = ./builder.sh; src = fetchurl { url = "mirror://xorg/individual/lib/libXrender-0.9.10.tar.bz2"; @@ -1077,7 +1151,8 @@ lib.makeScope newScope (self: with self; { # THIS IS A GENERATED FILE. DO NOT EDIT! libXres = callPackage ({ stdenv, pkg-config, fetchurl, xorgproto, libX11, libXext }: stdenv.mkDerivation { - name = "libXres-1.2.1"; + pname = "libXres"; + version = "1.2.1"; builder = ./builder.sh; src = fetchurl { url = "mirror://xorg/individual/lib/libXres-1.2.1.tar.bz2"; @@ -1091,7 +1166,8 @@ lib.makeScope newScope (self: with self; { # THIS IS A GENERATED FILE. DO NOT EDIT! libXt = callPackage ({ stdenv, pkg-config, fetchurl, libICE, xorgproto, libSM, libX11 }: stdenv.mkDerivation { - name = "libXt-1.2.1"; + pname = "libXt"; + version = "1.2.1"; builder = ./builder.sh; src = fetchurl { url = "mirror://xorg/individual/lib/libXt-1.2.1.tar.bz2"; @@ -1105,7 +1181,8 @@ lib.makeScope newScope (self: with self; { # THIS IS A GENERATED FILE. DO NOT EDIT! libXtst = callPackage ({ stdenv, pkg-config, fetchurl, xorgproto, libX11, libXext, libXi }: stdenv.mkDerivation { - name = "libXtst-1.2.3"; + pname = "libXtst"; + version = "1.2.3"; builder = ./builder.sh; src = fetchurl { url = "mirror://xorg/individual/lib/libXtst-1.2.3.tar.bz2"; @@ -1119,7 +1196,8 @@ lib.makeScope newScope (self: with self; { # THIS IS A GENERATED FILE. DO NOT EDIT! libXv = callPackage ({ stdenv, pkg-config, fetchurl, xorgproto, libX11, libXext }: stdenv.mkDerivation { - name = "libXv-1.0.11"; + pname = "libXv"; + version = "1.0.11"; builder = ./builder.sh; src = fetchurl { url = "mirror://xorg/individual/lib/libXv-1.0.11.tar.bz2"; @@ -1133,7 +1211,8 @@ lib.makeScope newScope (self: with self; { # THIS IS A GENERATED FILE. DO NOT EDIT! libXvMC = callPackage ({ stdenv, pkg-config, fetchurl, xorgproto, libX11, libXext, libXv }: stdenv.mkDerivation { - name = "libXvMC-1.0.12"; + pname = "libXvMC"; + version = "1.0.12"; builder = ./builder.sh; src = fetchurl { url = "mirror://xorg/individual/lib/libXvMC-1.0.12.tar.bz2"; @@ -1147,7 +1226,8 @@ lib.makeScope newScope (self: with self; { # THIS IS A GENERATED FILE. DO NOT EDIT! libXxf86dga = callPackage ({ stdenv, pkg-config, fetchurl, libX11, libXext, xorgproto }: stdenv.mkDerivation { - name = "libXxf86dga-1.1.5"; + pname = "libXxf86dga"; + version = "1.1.5"; builder = ./builder.sh; src = fetchurl { url = "mirror://xorg/individual/lib/libXxf86dga-1.1.5.tar.bz2"; @@ -1161,7 +1241,8 @@ lib.makeScope newScope (self: with self; { # THIS IS A GENERATED FILE. DO NOT EDIT! libXxf86misc = callPackage ({ stdenv, pkg-config, fetchurl, libX11, libXext, xorgproto }: stdenv.mkDerivation { - name = "libXxf86misc-1.0.4"; + pname = "libXxf86misc"; + version = "1.0.4"; builder = ./builder.sh; src = fetchurl { url = "mirror://xorg/individual/lib/libXxf86misc-1.0.4.tar.bz2"; @@ -1175,7 +1256,8 @@ lib.makeScope newScope (self: with self; { # THIS IS A GENERATED FILE. DO NOT EDIT! libXxf86vm = callPackage ({ stdenv, pkg-config, fetchurl, libX11, libXext, xorgproto }: stdenv.mkDerivation { - name = "libXxf86vm-1.1.4"; + pname = "libXxf86vm"; + version = "1.1.4"; builder = ./builder.sh; src = fetchurl { url = "mirror://xorg/individual/lib/libXxf86vm-1.1.4.tar.bz2"; @@ -1189,7 +1271,8 @@ lib.makeScope newScope (self: with self; { # THIS IS A GENERATED FILE. DO NOT EDIT! libdmx = callPackage ({ stdenv, pkg-config, fetchurl, xorgproto, libX11, libXext }: stdenv.mkDerivation { - name = "libdmx-1.1.4"; + pname = "libdmx"; + version = "1.1.4"; builder = ./builder.sh; src = fetchurl { url = "mirror://xorg/individual/lib/libdmx-1.1.4.tar.bz2"; @@ -1203,7 +1286,8 @@ lib.makeScope newScope (self: with self; { # THIS IS A GENERATED FILE. DO NOT EDIT! libfontenc = callPackage ({ stdenv, pkg-config, fetchurl, xorgproto, zlib }: stdenv.mkDerivation { - name = "libfontenc-1.1.4"; + pname = "libfontenc"; + version = "1.1.4"; builder = ./builder.sh; src = fetchurl { url = "mirror://xorg/individual/lib/libfontenc-1.1.4.tar.bz2"; @@ -1217,7 +1301,8 @@ lib.makeScope newScope (self: with self; { # THIS IS A GENERATED FILE. DO NOT EDIT! libpciaccess = callPackage ({ stdenv, pkg-config, fetchurl, zlib }: stdenv.mkDerivation { - name = "libpciaccess-0.16"; + pname = "libpciaccess"; + version = "0.16"; builder = ./builder.sh; src = fetchurl { url = "mirror://xorg/individual/lib/libpciaccess-0.16.tar.bz2"; @@ -1231,7 +1316,8 @@ lib.makeScope newScope (self: with self; { # THIS IS A GENERATED FILE. DO NOT EDIT! libpthreadstubs = callPackage ({ stdenv, pkg-config, fetchurl }: stdenv.mkDerivation { - name = "libpthread-stubs-0.4"; + pname = "libpthread-stubs"; + version = "0.4"; builder = ./builder.sh; src = fetchurl { url = "https://xcb.freedesktop.org/dist/libpthread-stubs-0.4.tar.bz2"; @@ -1245,7 +1331,8 @@ lib.makeScope newScope (self: with self; { # THIS IS A GENERATED FILE. DO NOT EDIT! libxcb = callPackage ({ stdenv, pkg-config, fetchurl, libxslt, libpthreadstubs, libXau, xcbproto, libXdmcp, python3 }: stdenv.mkDerivation { - name = "libxcb-1.14"; + pname = "libxcb"; + version = "1.14"; builder = ./builder.sh; src = fetchurl { url = "mirror://xorg/individual/lib/libxcb-1.14.tar.xz"; @@ -1259,7 +1346,8 @@ lib.makeScope newScope (self: with self; { # THIS IS A GENERATED FILE. DO NOT EDIT! libxkbfile = callPackage ({ stdenv, pkg-config, fetchurl, xorgproto, libX11 }: stdenv.mkDerivation { - name = "libxkbfile-1.1.0"; + pname = "libxkbfile"; + version = "1.1.0"; builder = ./builder.sh; src = fetchurl { url = "mirror://xorg/individual/lib/libxkbfile-1.1.0.tar.bz2"; @@ -1273,7 +1361,8 @@ lib.makeScope newScope (self: with self; { # THIS IS A GENERATED FILE. DO NOT EDIT! libxshmfence = callPackage ({ stdenv, pkg-config, fetchurl, xorgproto }: stdenv.mkDerivation { - name = "libxshmfence-1.3"; + pname = "libxshmfence"; + version = "1.3"; builder = ./builder.sh; src = fetchurl { url = "mirror://xorg/individual/lib/libxshmfence-1.3.tar.bz2"; @@ -1287,7 +1376,8 @@ lib.makeScope newScope (self: with self; { # THIS IS A GENERATED FILE. DO NOT EDIT! listres = callPackage ({ stdenv, pkg-config, fetchurl, libXaw, libXmu, xorgproto, libXt }: stdenv.mkDerivation { - name = "listres-1.0.4"; + pname = "listres"; + version = "1.0.4"; builder = ./builder.sh; src = fetchurl { url = "mirror://xorg/individual/app/listres-1.0.4.tar.bz2"; @@ -1301,7 +1391,8 @@ lib.makeScope newScope (self: with self; { # THIS IS A GENERATED FILE. DO NOT EDIT! lndir = callPackage ({ stdenv, pkg-config, fetchurl, xorgproto }: stdenv.mkDerivation { - name = "lndir-1.0.3"; + pname = "lndir"; + version = "1.0.3"; builder = ./builder.sh; src = fetchurl { url = "mirror://xorg/individual/util/lndir-1.0.3.tar.bz2"; @@ -1315,7 +1406,8 @@ lib.makeScope newScope (self: with self; { # THIS IS A GENERATED FILE. DO NOT EDIT! luit = callPackage ({ stdenv, pkg-config, fetchurl }: stdenv.mkDerivation { - name = "luit-20190106"; + pname = "luit"; + version = "20190106"; builder = ./builder.sh; src = fetchurl { url = "https://invisible-mirror.net/archives/luit/luit-20190106.tgz"; @@ -1329,7 +1421,8 @@ lib.makeScope newScope (self: with self; { # THIS IS A GENERATED FILE. DO NOT EDIT! makedepend = callPackage ({ stdenv, pkg-config, fetchurl, xorgproto }: stdenv.mkDerivation { - name = "makedepend-1.0.6"; + pname = "makedepend"; + version = "1.0.6"; builder = ./builder.sh; src = fetchurl { url = "mirror://xorg/individual/util/makedepend-1.0.6.tar.bz2"; @@ -1343,7 +1436,8 @@ lib.makeScope newScope (self: with self; { # THIS IS A GENERATED FILE. DO NOT EDIT! mkfontscale = callPackage ({ stdenv, pkg-config, fetchurl, libfontenc, freetype, xorgproto, zlib }: stdenv.mkDerivation { - name = "mkfontscale-1.2.1"; + pname = "mkfontscale"; + version = "1.2.1"; builder = ./builder.sh; src = fetchurl { url = "mirror://xorg/individual/app/mkfontscale-1.2.1.tar.bz2"; @@ -1357,7 +1451,8 @@ lib.makeScope newScope (self: with self; { # THIS IS A GENERATED FILE. DO NOT EDIT! oclock = callPackage ({ stdenv, pkg-config, fetchurl, libxkbfile, libX11, libXext, libXmu, libXt }: stdenv.mkDerivation { - name = "oclock-1.0.4"; + pname = "oclock"; + version = "1.0.4"; builder = ./builder.sh; src = fetchurl { url = "mirror://xorg/individual/app/oclock-1.0.4.tar.bz2"; @@ -1371,7 +1466,8 @@ lib.makeScope newScope (self: with self; { # THIS IS A GENERATED FILE. DO NOT EDIT! sessreg = callPackage ({ stdenv, pkg-config, fetchurl, xorgproto }: stdenv.mkDerivation { - name = "sessreg-1.1.2"; + pname = "sessreg"; + version = "1.1.2"; builder = ./builder.sh; src = fetchurl { url = "mirror://xorg/individual/app/sessreg-1.1.2.tar.bz2"; @@ -1385,7 +1481,8 @@ lib.makeScope newScope (self: with self; { # THIS IS A GENERATED FILE. DO NOT EDIT! setxkbmap = callPackage ({ stdenv, pkg-config, fetchurl, libX11, libxkbfile }: stdenv.mkDerivation { - name = "setxkbmap-1.3.2"; + pname = "setxkbmap"; + version = "1.3.2"; builder = ./builder.sh; src = fetchurl { url = "mirror://xorg/individual/app/setxkbmap-1.3.2.tar.bz2"; @@ -1399,7 +1496,8 @@ lib.makeScope newScope (self: with self; { # THIS IS A GENERATED FILE. DO NOT EDIT! smproxy = callPackage ({ stdenv, pkg-config, fetchurl, libICE, libSM, libXmu, libXt }: stdenv.mkDerivation { - name = "smproxy-1.0.6"; + pname = "smproxy"; + version = "1.0.6"; builder = ./builder.sh; src = fetchurl { url = "mirror://xorg/individual/app/smproxy-1.0.6.tar.bz2"; @@ -1413,7 +1511,8 @@ lib.makeScope newScope (self: with self; { # THIS IS A GENERATED FILE. DO NOT EDIT! transset = callPackage ({ stdenv, pkg-config, fetchurl, libX11, xorgproto }: stdenv.mkDerivation { - name = "transset-1.0.2"; + pname = "transset"; + version = "1.0.2"; builder = ./builder.sh; src = fetchurl { url = "mirror://xorg/individual/app/transset-1.0.2.tar.bz2"; @@ -1427,7 +1526,8 @@ lib.makeScope newScope (self: with self; { # THIS IS A GENERATED FILE. DO NOT EDIT! twm = callPackage ({ stdenv, pkg-config, fetchurl, libICE, libSM, libX11, libXext, libXmu, xorgproto, libXt }: stdenv.mkDerivation { - name = "twm-1.0.10"; + pname = "twm"; + version = "1.0.10"; builder = ./builder.sh; src = fetchurl { url = "mirror://xorg/individual/app/twm-1.0.10.tar.bz2"; @@ -1441,7 +1541,8 @@ lib.makeScope newScope (self: with self; { # THIS IS A GENERATED FILE. DO NOT EDIT! utilmacros = callPackage ({ stdenv, pkg-config, fetchurl }: stdenv.mkDerivation { - name = "util-macros-1.19.3"; + pname = "util-macros"; + version = "1.19.3"; builder = ./builder.sh; src = fetchurl { url = "mirror://xorg/individual/util/util-macros-1.19.3.tar.bz2"; @@ -1455,7 +1556,8 @@ lib.makeScope newScope (self: with self; { # THIS IS A GENERATED FILE. DO NOT EDIT! viewres = callPackage ({ stdenv, pkg-config, fetchurl, libXaw, libXmu, libXt }: stdenv.mkDerivation { - name = "viewres-1.0.5"; + pname = "viewres"; + version = "1.0.5"; builder = ./builder.sh; src = fetchurl { url = "mirror://xorg/individual/app/viewres-1.0.5.tar.bz2"; @@ -1469,7 +1571,8 @@ lib.makeScope newScope (self: with self; { # THIS IS A GENERATED FILE. DO NOT EDIT! x11perf = callPackage ({ stdenv, pkg-config, fetchurl, libX11, libXext, libXft, libXmu, xorgproto, libXrender }: stdenv.mkDerivation { - name = "x11perf-1.6.1"; + pname = "x11perf"; + version = "1.6.1"; builder = ./builder.sh; src = fetchurl { url = "mirror://xorg/individual/app/x11perf-1.6.1.tar.bz2"; @@ -1483,7 +1586,8 @@ lib.makeScope newScope (self: with self; { # THIS IS A GENERATED FILE. DO NOT EDIT! xauth = callPackage ({ stdenv, pkg-config, fetchurl, libX11, libXau, libXext, libXmu, xorgproto }: stdenv.mkDerivation { - name = "xauth-1.1"; + pname = "xauth"; + version = "1.1"; builder = ./builder.sh; src = fetchurl { url = "mirror://xorg/individual/app/xauth-1.1.tar.bz2"; @@ -1497,7 +1601,8 @@ lib.makeScope newScope (self: with self; { # THIS IS A GENERATED FILE. DO NOT EDIT! xbacklight = callPackage ({ stdenv, pkg-config, fetchurl, libxcb, xcbutil }: stdenv.mkDerivation { - name = "xbacklight-1.2.3"; + pname = "xbacklight"; + version = "1.2.3"; builder = ./builder.sh; src = fetchurl { url = "mirror://xorg/individual/app/xbacklight-1.2.3.tar.bz2"; @@ -1511,7 +1616,8 @@ lib.makeScope newScope (self: with self; { # THIS IS A GENERATED FILE. DO NOT EDIT! xbitmaps = callPackage ({ stdenv, pkg-config, fetchurl }: stdenv.mkDerivation { - name = "xbitmaps-1.1.2"; + pname = "xbitmaps"; + version = "1.1.2"; builder = ./builder.sh; src = fetchurl { url = "mirror://xorg/individual/data/xbitmaps-1.1.2.tar.bz2"; @@ -1525,7 +1631,8 @@ lib.makeScope newScope (self: with self; { # THIS IS A GENERATED FILE. DO NOT EDIT! xcalc = callPackage ({ stdenv, pkg-config, fetchurl, libX11, libXaw, xorgproto, libXt }: stdenv.mkDerivation { - name = "xcalc-1.1.0"; + pname = "xcalc"; + version = "1.1.0"; builder = ./builder.sh; src = fetchurl { url = "mirror://xorg/individual/app/xcalc-1.1.0.tar.bz2"; @@ -1539,7 +1646,8 @@ lib.makeScope newScope (self: with self; { # THIS IS A GENERATED FILE. DO NOT EDIT! xcbproto = callPackage ({ stdenv, pkg-config, fetchurl, python3 }: stdenv.mkDerivation { - name = "xcb-proto-1.14.1"; + pname = "xcb-proto"; + version = "1.14.1"; builder = ./builder.sh; src = fetchurl { url = "mirror://xorg/individual/proto/xcb-proto-1.14.1.tar.xz"; @@ -1553,7 +1661,8 @@ lib.makeScope newScope (self: with self; { # THIS IS A GENERATED FILE. DO NOT EDIT! xcbutil = callPackage ({ stdenv, pkg-config, fetchurl, gperf, libxcb, xorgproto, m4 }: stdenv.mkDerivation { - name = "xcb-util-0.4.0"; + pname = "xcb-util"; + version = "0.4.0"; builder = ./builder.sh; src = fetchurl { url = "https://xcb.freedesktop.org/dist/xcb-util-0.4.0.tar.bz2"; @@ -1567,7 +1676,8 @@ lib.makeScope newScope (self: with self; { # THIS IS A GENERATED FILE. DO NOT EDIT! xcbutilcursor = callPackage ({ stdenv, pkg-config, fetchurl, gperf, libxcb, xcbutilimage, xcbutilrenderutil, xorgproto, m4 }: stdenv.mkDerivation { - name = "xcb-util-cursor-0.1.3"; + pname = "xcb-util-cursor"; + version = "0.1.3"; builder = ./builder.sh; src = fetchurl { url = "https://xcb.freedesktop.org/dist/xcb-util-cursor-0.1.3.tar.bz2"; @@ -1581,7 +1691,8 @@ lib.makeScope newScope (self: with self; { # THIS IS A GENERATED FILE. DO NOT EDIT! xcbutilerrors = callPackage ({ stdenv, pkg-config, fetchurl, gperf, libxcb, xcbproto, xorgproto, m4 }: stdenv.mkDerivation { - name = "xcb-util-errors-1.0"; + pname = "xcb-util-errors"; + version = "1.0"; builder = ./builder.sh; src = fetchurl { url = "https://xcb.freedesktop.org/dist/xcb-util-errors-1.0.tar.bz2"; @@ -1595,7 +1706,8 @@ lib.makeScope newScope (self: with self; { # THIS IS A GENERATED FILE. DO NOT EDIT! xcbutilimage = callPackage ({ stdenv, pkg-config, fetchurl, gperf, libxcb, xcbutil, xorgproto, m4 }: stdenv.mkDerivation { - name = "xcb-util-image-0.4.0"; + pname = "xcb-util-image"; + version = "0.4.0"; builder = ./builder.sh; src = fetchurl { url = "https://xcb.freedesktop.org/dist/xcb-util-image-0.4.0.tar.bz2"; @@ -1609,7 +1721,8 @@ lib.makeScope newScope (self: with self; { # THIS IS A GENERATED FILE. DO NOT EDIT! xcbutilkeysyms = callPackage ({ stdenv, pkg-config, fetchurl, gperf, libxcb, xorgproto, m4 }: stdenv.mkDerivation { - name = "xcb-util-keysyms-0.4.0"; + pname = "xcb-util-keysyms"; + version = "0.4.0"; builder = ./builder.sh; src = fetchurl { url = "https://xcb.freedesktop.org/dist/xcb-util-keysyms-0.4.0.tar.bz2"; @@ -1623,7 +1736,8 @@ lib.makeScope newScope (self: with self; { # THIS IS A GENERATED FILE. DO NOT EDIT! xcbutilrenderutil = callPackage ({ stdenv, pkg-config, fetchurl, gperf, libxcb, xorgproto, m4 }: stdenv.mkDerivation { - name = "xcb-util-renderutil-0.3.9"; + pname = "xcb-util-renderutil"; + version = "0.3.9"; builder = ./builder.sh; src = fetchurl { url = "https://xcb.freedesktop.org/dist/xcb-util-renderutil-0.3.9.tar.bz2"; @@ -1637,7 +1751,8 @@ lib.makeScope newScope (self: with self; { # THIS IS A GENERATED FILE. DO NOT EDIT! xcbutilwm = callPackage ({ stdenv, pkg-config, fetchurl, gperf, libxcb, xorgproto, m4 }: stdenv.mkDerivation { - name = "xcb-util-wm-0.4.1"; + pname = "xcb-util-wm"; + version = "0.4.1"; builder = ./builder.sh; src = fetchurl { url = "https://xcb.freedesktop.org/dist/xcb-util-wm-0.4.1.tar.bz2"; @@ -1651,7 +1766,8 @@ lib.makeScope newScope (self: with self; { # THIS IS A GENERATED FILE. DO NOT EDIT! xclock = callPackage ({ stdenv, pkg-config, fetchurl, libX11, libXaw, libXft, libxkbfile, libXmu, xorgproto, libXrender, libXt }: stdenv.mkDerivation { - name = "xclock-1.0.9"; + pname = "xclock"; + version = "1.0.9"; builder = ./builder.sh; src = fetchurl { url = "mirror://xorg/individual/app/xclock-1.0.9.tar.bz2"; @@ -1665,7 +1781,8 @@ lib.makeScope newScope (self: with self; { # THIS IS A GENERATED FILE. DO NOT EDIT! xcmsdb = callPackage ({ stdenv, pkg-config, fetchurl, libX11 }: stdenv.mkDerivation { - name = "xcmsdb-1.0.5"; + pname = "xcmsdb"; + version = "1.0.5"; builder = ./builder.sh; src = fetchurl { url = "mirror://xorg/individual/app/xcmsdb-1.0.5.tar.bz2"; @@ -1679,7 +1796,8 @@ lib.makeScope newScope (self: with self; { # THIS IS A GENERATED FILE. DO NOT EDIT! xcompmgr = callPackage ({ stdenv, pkg-config, fetchurl, libXcomposite, libXdamage, libXext, libXfixes, libXrender }: stdenv.mkDerivation { - name = "xcompmgr-1.1.8"; + pname = "xcompmgr"; + version = "1.1.8"; builder = ./builder.sh; src = fetchurl { url = "mirror://xorg/individual/app/xcompmgr-1.1.8.tar.bz2"; @@ -1693,7 +1811,8 @@ lib.makeScope newScope (self: with self; { # THIS IS A GENERATED FILE. DO NOT EDIT! xconsole = callPackage ({ stdenv, pkg-config, fetchurl, libX11, libXaw, libXmu, xorgproto, libXt }: stdenv.mkDerivation { - name = "xconsole-1.0.7"; + pname = "xconsole"; + version = "1.0.7"; builder = ./builder.sh; src = fetchurl { url = "mirror://xorg/individual/app/xconsole-1.0.7.tar.bz2"; @@ -1707,7 +1826,8 @@ lib.makeScope newScope (self: with self; { # THIS IS A GENERATED FILE. DO NOT EDIT! xcursorgen = callPackage ({ stdenv, pkg-config, fetchurl, libpng, libX11, libXcursor }: stdenv.mkDerivation { - name = "xcursorgen-1.0.7"; + pname = "xcursorgen"; + version = "1.0.7"; builder = ./builder.sh; src = fetchurl { url = "mirror://xorg/individual/app/xcursorgen-1.0.7.tar.bz2"; @@ -1721,7 +1841,8 @@ lib.makeScope newScope (self: with self; { # THIS IS A GENERATED FILE. DO NOT EDIT! xcursorthemes = callPackage ({ stdenv, pkg-config, fetchurl, libXcursor }: stdenv.mkDerivation { - name = "xcursor-themes-1.0.6"; + pname = "xcursor-themes"; + version = "1.0.6"; builder = ./builder.sh; src = fetchurl { url = "mirror://xorg/individual/data/xcursor-themes-1.0.6.tar.bz2"; @@ -1735,7 +1856,8 @@ lib.makeScope newScope (self: with self; { # THIS IS A GENERATED FILE. DO NOT EDIT! xdm = callPackage ({ stdenv, pkg-config, fetchurl, libX11, libXau, libXaw, libXdmcp, libXext, libXft, libXinerama, libXmu, libXpm, xorgproto, libXrender, libXt }: stdenv.mkDerivation { - name = "xdm-1.1.12"; + pname = "xdm"; + version = "1.1.12"; builder = ./builder.sh; src = fetchurl { url = "mirror://xorg/individual/app/xdm-1.1.12.tar.bz2"; @@ -1749,7 +1871,8 @@ lib.makeScope newScope (self: with self; { # THIS IS A GENERATED FILE. DO NOT EDIT! xdpyinfo = callPackage ({ stdenv, pkg-config, fetchurl, libdmx, libX11, libxcb, libXcomposite, libXext, libXi, libXinerama, xorgproto, libXrender, libXtst, libXxf86dga, libXxf86misc, libXxf86vm }: stdenv.mkDerivation { - name = "xdpyinfo-1.3.2"; + pname = "xdpyinfo"; + version = "1.3.2"; builder = ./builder.sh; src = fetchurl { url = "mirror://xorg/individual/app/xdpyinfo-1.3.2.tar.bz2"; @@ -1763,7 +1886,8 @@ lib.makeScope newScope (self: with self; { # THIS IS A GENERATED FILE. DO NOT EDIT! xdriinfo = callPackage ({ stdenv, pkg-config, fetchurl, libGL, xorgproto, libX11 }: stdenv.mkDerivation { - name = "xdriinfo-1.0.6"; + pname = "xdriinfo"; + version = "1.0.6"; builder = ./builder.sh; src = fetchurl { url = "mirror://xorg/individual/app/xdriinfo-1.0.6.tar.bz2"; @@ -1777,7 +1901,8 @@ lib.makeScope newScope (self: with self; { # THIS IS A GENERATED FILE. DO NOT EDIT! xev = callPackage ({ stdenv, pkg-config, fetchurl, libX11, xorgproto, libXrandr }: stdenv.mkDerivation { - name = "xev-1.2.3"; + pname = "xev"; + version = "1.2.3"; builder = ./builder.sh; src = fetchurl { url = "mirror://xorg/individual/app/xev-1.2.3.tar.bz2"; @@ -1791,7 +1916,8 @@ lib.makeScope newScope (self: with self; { # THIS IS A GENERATED FILE. DO NOT EDIT! xeyes = callPackage ({ stdenv, pkg-config, fetchurl, libX11, libXext, libXmu, xorgproto, libXrender, libXt }: stdenv.mkDerivation { - name = "xeyes-1.1.2"; + pname = "xeyes"; + version = "1.1.2"; builder = ./builder.sh; src = fetchurl { url = "mirror://xorg/individual/app/xeyes-1.1.2.tar.bz2"; @@ -1805,7 +1931,8 @@ lib.makeScope newScope (self: with self; { # THIS IS A GENERATED FILE. DO NOT EDIT! xf86inputevdev = callPackage ({ stdenv, pkg-config, fetchurl, xorgproto, libevdev, udev, mtdev, xorgserver }: stdenv.mkDerivation { - name = "xf86-input-evdev-2.10.6"; + pname = "xf86-input-evdev"; + version = "2.10.6"; builder = ./builder.sh; src = fetchurl { url = "mirror://xorg/individual/driver/xf86-input-evdev-2.10.6.tar.bz2"; @@ -1819,7 +1946,8 @@ lib.makeScope newScope (self: with self; { # THIS IS A GENERATED FILE. DO NOT EDIT! xf86inputjoystick = callPackage ({ stdenv, pkg-config, fetchurl, xorgproto, xorgserver }: stdenv.mkDerivation { - name = "xf86-input-joystick-1.6.3"; + pname = "xf86-input-joystick"; + version = "1.6.3"; builder = ./builder.sh; src = fetchurl { url = "mirror://xorg/individual/driver/xf86-input-joystick-1.6.3.tar.bz2"; @@ -1833,7 +1961,8 @@ lib.makeScope newScope (self: with self; { # THIS IS A GENERATED FILE. DO NOT EDIT! xf86inputkeyboard = callPackage ({ stdenv, pkg-config, fetchurl, xorgproto, xorgserver }: stdenv.mkDerivation { - name = "xf86-input-keyboard-1.9.0"; + pname = "xf86-input-keyboard"; + version = "1.9.0"; builder = ./builder.sh; src = fetchurl { url = "mirror://xorg/individual/driver/xf86-input-keyboard-1.9.0.tar.bz2"; @@ -1847,7 +1976,8 @@ lib.makeScope newScope (self: with self; { # THIS IS A GENERATED FILE. DO NOT EDIT! xf86inputlibinput = callPackage ({ stdenv, pkg-config, fetchurl, xorgproto, libinput, xorgserver }: stdenv.mkDerivation { - name = "xf86-input-libinput-1.1.0"; + pname = "xf86-input-libinput"; + version = "1.1.0"; builder = ./builder.sh; src = fetchurl { url = "mirror://xorg/individual/driver/xf86-input-libinput-1.1.0.tar.bz2"; @@ -1861,7 +1991,8 @@ lib.makeScope newScope (self: with self; { # THIS IS A GENERATED FILE. DO NOT EDIT! xf86inputmouse = callPackage ({ stdenv, pkg-config, fetchurl, xorgproto, xorgserver }: stdenv.mkDerivation { - name = "xf86-input-mouse-1.9.3"; + pname = "xf86-input-mouse"; + version = "1.9.3"; builder = ./builder.sh; src = fetchurl { url = "mirror://xorg/individual/driver/xf86-input-mouse-1.9.3.tar.bz2"; @@ -1875,7 +2006,8 @@ lib.makeScope newScope (self: with self; { # THIS IS A GENERATED FILE. DO NOT EDIT! xf86inputsynaptics = callPackage ({ stdenv, pkg-config, fetchurl, xorgproto, libevdev, libX11, libXi, xorgserver, libXtst }: stdenv.mkDerivation { - name = "xf86-input-synaptics-1.9.1"; + pname = "xf86-input-synaptics"; + version = "1.9.1"; builder = ./builder.sh; src = fetchurl { url = "mirror://xorg/individual/driver/xf86-input-synaptics-1.9.1.tar.bz2"; @@ -1889,7 +2021,8 @@ lib.makeScope newScope (self: with self; { # THIS IS A GENERATED FILE. DO NOT EDIT! xf86inputvmmouse = callPackage ({ stdenv, pkg-config, fetchurl, xorgproto, udev, xorgserver }: stdenv.mkDerivation { - name = "xf86-input-vmmouse-13.1.0"; + pname = "xf86-input-vmmouse"; + version = "13.1.0"; builder = ./builder.sh; src = fetchurl { url = "mirror://xorg/individual/driver/xf86-input-vmmouse-13.1.0.tar.bz2"; @@ -1903,7 +2036,8 @@ lib.makeScope newScope (self: with self; { # THIS IS A GENERATED FILE. DO NOT EDIT! xf86inputvoid = callPackage ({ stdenv, pkg-config, fetchurl, xorgserver, xorgproto }: stdenv.mkDerivation { - name = "xf86-input-void-1.4.1"; + pname = "xf86-input-void"; + version = "1.4.1"; builder = ./builder.sh; src = fetchurl { url = "mirror://xorg/individual/driver/xf86-input-void-1.4.1.tar.bz2"; @@ -1917,7 +2051,8 @@ lib.makeScope newScope (self: with self; { # THIS IS A GENERATED FILE. DO NOT EDIT! xf86videoamdgpu = callPackage ({ stdenv, pkg-config, fetchurl, xorgproto, mesa, libGL, libdrm, udev, xorgserver }: stdenv.mkDerivation { - name = "xf86-video-amdgpu-19.1.0"; + pname = "xf86-video-amdgpu"; + version = "19.1.0"; builder = ./builder.sh; src = fetchurl { url = "mirror://xorg/individual/driver/xf86-video-amdgpu-19.1.0.tar.bz2"; @@ -1931,7 +2066,8 @@ lib.makeScope newScope (self: with self; { # THIS IS A GENERATED FILE. DO NOT EDIT! xf86videoapm = callPackage ({ stdenv, pkg-config, fetchurl, xorgproto, libpciaccess, xorgserver }: stdenv.mkDerivation { - name = "xf86-video-apm-1.3.0"; + pname = "xf86-video-apm"; + version = "1.3.0"; builder = ./builder.sh; src = fetchurl { url = "mirror://xorg/individual/driver/xf86-video-apm-1.3.0.tar.bz2"; @@ -1945,7 +2081,8 @@ lib.makeScope newScope (self: with self; { # THIS IS A GENERATED FILE. DO NOT EDIT! xf86videoark = callPackage ({ stdenv, pkg-config, fetchurl, xorgproto, libpciaccess, xorgserver }: stdenv.mkDerivation { - name = "xf86-video-ark-0.7.5"; + pname = "xf86-video-ark"; + version = "0.7.5"; builder = ./builder.sh; src = fetchurl { url = "mirror://xorg/individual/driver/xf86-video-ark-0.7.5.tar.bz2"; @@ -1959,7 +2096,8 @@ lib.makeScope newScope (self: with self; { # THIS IS A GENERATED FILE. DO NOT EDIT! xf86videoast = callPackage ({ stdenv, pkg-config, fetchurl, xorgproto, libpciaccess, xorgserver }: stdenv.mkDerivation { - name = "xf86-video-ast-1.1.5"; + pname = "xf86-video-ast"; + version = "1.1.5"; builder = ./builder.sh; src = fetchurl { url = "mirror://xorg/individual/driver/xf86-video-ast-1.1.5.tar.bz2"; @@ -1973,7 +2111,8 @@ lib.makeScope newScope (self: with self; { # THIS IS A GENERATED FILE. DO NOT EDIT! xf86videoati = callPackage ({ stdenv, pkg-config, fetchurl, xorgproto, mesa, libGL, libdrm, udev, libpciaccess, xorgserver }: stdenv.mkDerivation { - name = "xf86-video-ati-19.1.0"; + pname = "xf86-video-ati"; + version = "19.1.0"; builder = ./builder.sh; src = fetchurl { url = "mirror://xorg/individual/driver/xf86-video-ati-19.1.0.tar.bz2"; @@ -1987,7 +2126,8 @@ lib.makeScope newScope (self: with self; { # THIS IS A GENERATED FILE. DO NOT EDIT! xf86videochips = callPackage ({ stdenv, pkg-config, fetchurl, xorgproto, libpciaccess, xorgserver }: stdenv.mkDerivation { - name = "xf86-video-chips-1.4.0"; + pname = "xf86-video-chips"; + version = "1.4.0"; builder = ./builder.sh; src = fetchurl { url = "mirror://xorg/individual/driver/xf86-video-chips-1.4.0.tar.bz2"; @@ -2001,7 +2141,8 @@ lib.makeScope newScope (self: with self; { # THIS IS A GENERATED FILE. DO NOT EDIT! xf86videocirrus = callPackage ({ stdenv, pkg-config, fetchurl, xorgproto, libpciaccess, xorgserver }: stdenv.mkDerivation { - name = "xf86-video-cirrus-1.5.3"; + pname = "xf86-video-cirrus"; + version = "1.5.3"; builder = ./builder.sh; src = fetchurl { url = "mirror://xorg/individual/driver/xf86-video-cirrus-1.5.3.tar.bz2"; @@ -2015,7 +2156,8 @@ lib.makeScope newScope (self: with self; { # THIS IS A GENERATED FILE. DO NOT EDIT! xf86videodummy = callPackage ({ stdenv, pkg-config, fetchurl, xorgproto, xorgserver }: stdenv.mkDerivation { - name = "xf86-video-dummy-0.3.8"; + pname = "xf86-video-dummy"; + version = "0.3.8"; builder = ./builder.sh; src = fetchurl { url = "mirror://xorg/individual/driver/xf86-video-dummy-0.3.8.tar.bz2"; @@ -2029,7 +2171,8 @@ lib.makeScope newScope (self: with self; { # THIS IS A GENERATED FILE. DO NOT EDIT! xf86videofbdev = callPackage ({ stdenv, pkg-config, fetchurl, xorgproto, libpciaccess, xorgserver }: stdenv.mkDerivation { - name = "xf86-video-fbdev-0.5.0"; + pname = "xf86-video-fbdev"; + version = "0.5.0"; builder = ./builder.sh; src = fetchurl { url = "mirror://xorg/individual/driver/xf86-video-fbdev-0.5.0.tar.bz2"; @@ -2043,7 +2186,8 @@ lib.makeScope newScope (self: with self; { # THIS IS A GENERATED FILE. DO NOT EDIT! xf86videogeode = callPackage ({ stdenv, pkg-config, fetchurl, xorgproto, libpciaccess, xorgserver }: stdenv.mkDerivation { - name = "xf86-video-geode-2.11.19"; + pname = "xf86-video-geode"; + version = "2.11.19"; builder = ./builder.sh; src = fetchurl { url = "mirror://xorg/individual/driver/xf86-video-geode-2.11.19.tar.bz2"; @@ -2057,7 +2201,8 @@ lib.makeScope newScope (self: with self; { # THIS IS A GENERATED FILE. DO NOT EDIT! xf86videoglide = callPackage ({ stdenv, pkg-config, fetchurl, xorgproto, xorgserver }: stdenv.mkDerivation { - name = "xf86-video-glide-1.2.2"; + pname = "xf86-video-glide"; + version = "1.2.2"; builder = ./builder.sh; src = fetchurl { url = "mirror://xorg/individual/driver/xf86-video-glide-1.2.2.tar.bz2"; @@ -2071,7 +2216,8 @@ lib.makeScope newScope (self: with self; { # THIS IS A GENERATED FILE. DO NOT EDIT! xf86videoglint = callPackage ({ stdenv, pkg-config, fetchurl, libpciaccess, xorgproto, xorgserver }: stdenv.mkDerivation { - name = "xf86-video-glint-1.2.9"; + pname = "xf86-video-glint"; + version = "1.2.9"; builder = ./builder.sh; src = fetchurl { url = "mirror://xorg/individual/driver/xf86-video-glint-1.2.9.tar.bz2"; @@ -2085,7 +2231,8 @@ lib.makeScope newScope (self: with self; { # THIS IS A GENERATED FILE. DO NOT EDIT! xf86videoi128 = callPackage ({ stdenv, pkg-config, fetchurl, xorgproto, libpciaccess, xorgserver }: stdenv.mkDerivation { - name = "xf86-video-i128-1.4.0"; + pname = "xf86-video-i128"; + version = "1.4.0"; builder = ./builder.sh; src = fetchurl { url = "mirror://xorg/individual/driver/xf86-video-i128-1.4.0.tar.bz2"; @@ -2099,7 +2246,8 @@ lib.makeScope newScope (self: with self; { # THIS IS A GENERATED FILE. DO NOT EDIT! xf86videoi740 = callPackage ({ stdenv, pkg-config, fetchurl, xorgproto, libpciaccess, xorgserver }: stdenv.mkDerivation { - name = "xf86-video-i740-1.4.0"; + pname = "xf86-video-i740"; + version = "1.4.0"; builder = ./builder.sh; src = fetchurl { url = "mirror://xorg/individual/driver/xf86-video-i740-1.4.0.tar.bz2"; @@ -2113,7 +2261,8 @@ lib.makeScope newScope (self: with self; { # THIS IS A GENERATED FILE. DO NOT EDIT! xf86videointel = callPackage ({ stdenv, pkg-config, fetchurl, cairo, xorgproto, libdrm, libpng, udev, libpciaccess, libX11, xcbutil, libxcb, libXcursor, libXdamage, libXext, libXfixes, xorgserver, libXrandr, libXrender, libxshmfence, libXtst, libXvMC }: stdenv.mkDerivation { - name = "xf86-video-intel-2.99.917"; + pname = "xf86-video-intel"; + version = "2.99.917"; builder = ./builder.sh; src = fetchurl { url = "mirror://xorg/individual/driver/xf86-video-intel-2.99.917.tar.bz2"; @@ -2127,7 +2276,8 @@ lib.makeScope newScope (self: with self; { # THIS IS A GENERATED FILE. DO NOT EDIT! xf86videomach64 = callPackage ({ stdenv, pkg-config, fetchurl, xorgproto, libdrm, libpciaccess, xorgserver }: stdenv.mkDerivation { - name = "xf86-video-mach64-6.9.6"; + pname = "xf86-video-mach64"; + version = "6.9.6"; builder = ./builder.sh; src = fetchurl { url = "mirror://xorg/individual/driver/xf86-video-mach64-6.9.6.tar.bz2"; @@ -2141,7 +2291,8 @@ lib.makeScope newScope (self: with self; { # THIS IS A GENERATED FILE. DO NOT EDIT! xf86videomga = callPackage ({ stdenv, pkg-config, fetchurl, xorgproto, libdrm, libpciaccess, xorgserver }: stdenv.mkDerivation { - name = "xf86-video-mga-2.0.0"; + pname = "xf86-video-mga"; + version = "2.0.0"; builder = ./builder.sh; src = fetchurl { url = "mirror://xorg/individual/driver/xf86-video-mga-2.0.0.tar.bz2"; @@ -2155,7 +2306,8 @@ lib.makeScope newScope (self: with self; { # THIS IS A GENERATED FILE. DO NOT EDIT! xf86videoneomagic = callPackage ({ stdenv, pkg-config, fetchurl, xorgproto, libpciaccess, xorgserver }: stdenv.mkDerivation { - name = "xf86-video-neomagic-1.3.0"; + pname = "xf86-video-neomagic"; + version = "1.3.0"; builder = ./builder.sh; src = fetchurl { url = "mirror://xorg/individual/driver/xf86-video-neomagic-1.3.0.tar.bz2"; @@ -2169,7 +2321,8 @@ lib.makeScope newScope (self: with self; { # THIS IS A GENERATED FILE. DO NOT EDIT! xf86videonewport = callPackage ({ stdenv, pkg-config, fetchurl, xorgproto, xorgserver }: stdenv.mkDerivation { - name = "xf86-video-newport-0.2.4"; + pname = "xf86-video-newport"; + version = "0.2.4"; builder = ./builder.sh; src = fetchurl { url = "mirror://xorg/individual/driver/xf86-video-newport-0.2.4.tar.bz2"; @@ -2183,7 +2336,8 @@ lib.makeScope newScope (self: with self; { # THIS IS A GENERATED FILE. DO NOT EDIT! xf86videonouveau = callPackage ({ stdenv, pkg-config, fetchurl, xorgproto, libdrm, udev, libpciaccess, xorgserver }: stdenv.mkDerivation { - name = "xf86-video-nouveau-1.0.17"; + pname = "xf86-video-nouveau"; + version = "1.0.17"; builder = ./builder.sh; src = fetchurl { url = "mirror://xorg/individual/driver/xf86-video-nouveau-1.0.17.tar.bz2"; @@ -2197,7 +2351,8 @@ lib.makeScope newScope (self: with self; { # THIS IS A GENERATED FILE. DO NOT EDIT! xf86videonv = callPackage ({ stdenv, pkg-config, fetchurl, xorgproto, libpciaccess, xorgserver }: stdenv.mkDerivation { - name = "xf86-video-nv-2.1.21"; + pname = "xf86-video-nv"; + version = "2.1.21"; builder = ./builder.sh; src = fetchurl { url = "mirror://xorg/individual/driver/xf86-video-nv-2.1.21.tar.bz2"; @@ -2211,7 +2366,8 @@ lib.makeScope newScope (self: with self; { # THIS IS A GENERATED FILE. DO NOT EDIT! xf86videoomap = callPackage ({ stdenv, pkg-config, fetchurl, xorgproto, libdrm, xorgserver }: stdenv.mkDerivation { - name = "xf86-video-omap-0.4.5"; + pname = "xf86-video-omap"; + version = "0.4.5"; builder = ./builder.sh; src = fetchurl { url = "mirror://xorg/individual/driver/xf86-video-omap-0.4.5.tar.bz2"; @@ -2225,7 +2381,8 @@ lib.makeScope newScope (self: with self; { # THIS IS A GENERATED FILE. DO NOT EDIT! xf86videoopenchrome = callPackage ({ stdenv, pkg-config, fetchurl, xorgproto, libdrm, udev, libpciaccess, libX11, libXext, xorgserver, libXvMC }: stdenv.mkDerivation { - name = "xf86-video-openchrome-0.6.0"; + pname = "xf86-video-openchrome"; + version = "0.6.0"; builder = ./builder.sh; src = fetchurl { url = "mirror://xorg/individual/driver/xf86-video-openchrome-0.6.0.tar.bz2"; @@ -2239,7 +2396,8 @@ lib.makeScope newScope (self: with self; { # THIS IS A GENERATED FILE. DO NOT EDIT! xf86videoqxl = callPackage ({ stdenv, pkg-config, fetchurl, xorgproto, libdrm, udev, libpciaccess, xorgserver }: stdenv.mkDerivation { - name = "xf86-video-qxl-0.1.5"; + pname = "xf86-video-qxl"; + version = "0.1.5"; builder = ./builder.sh; src = fetchurl { url = "mirror://xorg/individual/driver/xf86-video-qxl-0.1.5.tar.bz2"; @@ -2253,7 +2411,8 @@ lib.makeScope newScope (self: with self; { # THIS IS A GENERATED FILE. DO NOT EDIT! xf86videor128 = callPackage ({ stdenv, pkg-config, fetchurl, xorgproto, libdrm, libpciaccess, xorgserver }: stdenv.mkDerivation { - name = "xf86-video-r128-6.11.0"; + pname = "xf86-video-r128"; + version = "6.11.0"; builder = ./builder.sh; src = fetchurl { url = "mirror://xorg/individual/driver/xf86-video-r128-6.11.0.tar.bz2"; @@ -2267,7 +2426,8 @@ lib.makeScope newScope (self: with self; { # THIS IS A GENERATED FILE. DO NOT EDIT! xf86videorendition = callPackage ({ stdenv, pkg-config, fetchurl, xorgproto, libpciaccess, xorgserver }: stdenv.mkDerivation { - name = "xf86-video-rendition-4.2.7"; + pname = "xf86-video-rendition"; + version = "4.2.7"; builder = ./builder.sh; src = fetchurl { url = "mirror://xorg/individual/driver/xf86-video-rendition-4.2.7.tar.bz2"; @@ -2281,7 +2441,8 @@ lib.makeScope newScope (self: with self; { # THIS IS A GENERATED FILE. DO NOT EDIT! xf86videos3virge = callPackage ({ stdenv, pkg-config, fetchurl, xorgproto, libpciaccess, xorgserver }: stdenv.mkDerivation { - name = "xf86-video-s3virge-1.11.0"; + pname = "xf86-video-s3virge"; + version = "1.11.0"; builder = ./builder.sh; src = fetchurl { url = "mirror://xorg/individual/driver/xf86-video-s3virge-1.11.0.tar.bz2"; @@ -2295,7 +2456,8 @@ lib.makeScope newScope (self: with self; { # THIS IS A GENERATED FILE. DO NOT EDIT! xf86videosavage = callPackage ({ stdenv, pkg-config, fetchurl, xorgproto, libdrm, libpciaccess, xorgserver }: stdenv.mkDerivation { - name = "xf86-video-savage-2.3.9"; + pname = "xf86-video-savage"; + version = "2.3.9"; builder = ./builder.sh; src = fetchurl { url = "mirror://xorg/individual/driver/xf86-video-savage-2.3.9.tar.bz2"; @@ -2309,7 +2471,8 @@ lib.makeScope newScope (self: with self; { # THIS IS A GENERATED FILE. DO NOT EDIT! xf86videosiliconmotion = callPackage ({ stdenv, pkg-config, fetchurl, xorgproto, libpciaccess, xorgserver }: stdenv.mkDerivation { - name = "xf86-video-siliconmotion-1.7.9"; + pname = "xf86-video-siliconmotion"; + version = "1.7.9"; builder = ./builder.sh; src = fetchurl { url = "mirror://xorg/individual/driver/xf86-video-siliconmotion-1.7.9.tar.bz2"; @@ -2323,7 +2486,8 @@ lib.makeScope newScope (self: with self; { # THIS IS A GENERATED FILE. DO NOT EDIT! xf86videosis = callPackage ({ stdenv, pkg-config, fetchurl, xorgproto, libdrm, libpciaccess, xorgserver }: stdenv.mkDerivation { - name = "xf86-video-sis-0.11.0"; + pname = "xf86-video-sis"; + version = "0.11.0"; builder = ./builder.sh; src = fetchurl { url = "mirror://xorg/individual/driver/xf86-video-sis-0.11.0.tar.bz2"; @@ -2337,7 +2501,8 @@ lib.makeScope newScope (self: with self; { # THIS IS A GENERATED FILE. DO NOT EDIT! xf86videosisusb = callPackage ({ stdenv, pkg-config, fetchurl, xorgproto, libpciaccess, xorgserver }: stdenv.mkDerivation { - name = "xf86-video-sisusb-0.9.7"; + pname = "xf86-video-sisusb"; + version = "0.9.7"; builder = ./builder.sh; src = fetchurl { url = "mirror://xorg/individual/driver/xf86-video-sisusb-0.9.7.tar.bz2"; @@ -2351,7 +2516,8 @@ lib.makeScope newScope (self: with self; { # THIS IS A GENERATED FILE. DO NOT EDIT! xf86videosuncg6 = callPackage ({ stdenv, pkg-config, fetchurl, xorgproto, xorgserver }: stdenv.mkDerivation { - name = "xf86-video-suncg6-1.1.2"; + pname = "xf86-video-suncg6"; + version = "1.1.2"; builder = ./builder.sh; src = fetchurl { url = "mirror://xorg/individual/driver/xf86-video-suncg6-1.1.2.tar.bz2"; @@ -2365,7 +2531,8 @@ lib.makeScope newScope (self: with self; { # THIS IS A GENERATED FILE. DO NOT EDIT! xf86videosunffb = callPackage ({ stdenv, pkg-config, fetchurl, xorgproto, xorgserver }: stdenv.mkDerivation { - name = "xf86-video-sunffb-1.2.2"; + pname = "xf86-video-sunffb"; + version = "1.2.2"; builder = ./builder.sh; src = fetchurl { url = "mirror://xorg/individual/driver/xf86-video-sunffb-1.2.2.tar.bz2"; @@ -2379,7 +2546,8 @@ lib.makeScope newScope (self: with self; { # THIS IS A GENERATED FILE. DO NOT EDIT! xf86videosunleo = callPackage ({ stdenv, pkg-config, fetchurl, xorgproto, xorgserver }: stdenv.mkDerivation { - name = "xf86-video-sunleo-1.2.2"; + pname = "xf86-video-sunleo"; + version = "1.2.2"; builder = ./builder.sh; src = fetchurl { url = "mirror://xorg/individual/driver/xf86-video-sunleo-1.2.2.tar.bz2"; @@ -2393,7 +2561,8 @@ lib.makeScope newScope (self: with self; { # THIS IS A GENERATED FILE. DO NOT EDIT! xf86videotdfx = callPackage ({ stdenv, pkg-config, fetchurl, xorgproto, libdrm, libpciaccess, xorgserver }: stdenv.mkDerivation { - name = "xf86-video-tdfx-1.5.0"; + pname = "xf86-video-tdfx"; + version = "1.5.0"; builder = ./builder.sh; src = fetchurl { url = "mirror://xorg/individual/driver/xf86-video-tdfx-1.5.0.tar.bz2"; @@ -2407,7 +2576,8 @@ lib.makeScope newScope (self: with self; { # THIS IS A GENERATED FILE. DO NOT EDIT! xf86videotga = callPackage ({ stdenv, pkg-config, fetchurl, xorgproto, libpciaccess, xorgserver }: stdenv.mkDerivation { - name = "xf86-video-tga-1.2.2"; + pname = "xf86-video-tga"; + version = "1.2.2"; builder = ./builder.sh; src = fetchurl { url = "mirror://xorg/individual/driver/xf86-video-tga-1.2.2.tar.bz2"; @@ -2421,7 +2591,8 @@ lib.makeScope newScope (self: with self; { # THIS IS A GENERATED FILE. DO NOT EDIT! xf86videotrident = callPackage ({ stdenv, pkg-config, fetchurl, xorgproto, libpciaccess, xorgserver }: stdenv.mkDerivation { - name = "xf86-video-trident-1.3.8"; + pname = "xf86-video-trident"; + version = "1.3.8"; builder = ./builder.sh; src = fetchurl { url = "mirror://xorg/individual/driver/xf86-video-trident-1.3.8.tar.bz2"; @@ -2435,7 +2606,8 @@ lib.makeScope newScope (self: with self; { # THIS IS A GENERATED FILE. DO NOT EDIT! xf86videov4l = callPackage ({ stdenv, pkg-config, fetchurl, xorgproto, xorgserver }: stdenv.mkDerivation { - name = "xf86-video-v4l-0.3.0"; + pname = "xf86-video-v4l"; + version = "0.3.0"; builder = ./builder.sh; src = fetchurl { url = "mirror://xorg/individual/driver/xf86-video-v4l-0.3.0.tar.bz2"; @@ -2449,7 +2621,8 @@ lib.makeScope newScope (self: with self; { # THIS IS A GENERATED FILE. DO NOT EDIT! xf86videovboxvideo = callPackage ({ stdenv, pkg-config, fetchurl, xorgproto, libpciaccess, xorgserver }: stdenv.mkDerivation { - name = "xf86-video-vboxvideo-1.0.0"; + pname = "xf86-video-vboxvideo"; + version = "1.0.0"; builder = ./builder.sh; src = fetchurl { url = "mirror://xorg/individual/driver/xf86-video-vboxvideo-1.0.0.tar.bz2"; @@ -2463,7 +2636,8 @@ lib.makeScope newScope (self: with self; { # THIS IS A GENERATED FILE. DO NOT EDIT! xf86videovesa = callPackage ({ stdenv, pkg-config, fetchurl, xorgproto, libpciaccess, xorgserver }: stdenv.mkDerivation { - name = "xf86-video-vesa-2.5.0"; + pname = "xf86-video-vesa"; + version = "2.5.0"; builder = ./builder.sh; src = fetchurl { url = "mirror://xorg/individual/driver/xf86-video-vesa-2.5.0.tar.bz2"; @@ -2477,7 +2651,8 @@ lib.makeScope newScope (self: with self; { # THIS IS A GENERATED FILE. DO NOT EDIT! xf86videovmware = callPackage ({ stdenv, pkg-config, fetchurl, xorgproto, libdrm, udev, libpciaccess, libX11, libXext, xorgserver }: stdenv.mkDerivation { - name = "xf86-video-vmware-13.3.0"; + pname = "xf86-video-vmware"; + version = "13.3.0"; builder = ./builder.sh; src = fetchurl { url = "mirror://xorg/individual/driver/xf86-video-vmware-13.3.0.tar.bz2"; @@ -2491,7 +2666,8 @@ lib.makeScope newScope (self: with self; { # THIS IS A GENERATED FILE. DO NOT EDIT! xf86videovoodoo = callPackage ({ stdenv, pkg-config, fetchurl, xorgproto, libpciaccess, xorgserver }: stdenv.mkDerivation { - name = "xf86-video-voodoo-1.2.5"; + pname = "xf86-video-voodoo"; + version = "1.2.5"; builder = ./builder.sh; src = fetchurl { url = "mirror://xorg/individual/driver/xf86-video-voodoo-1.2.5.tar.bz2"; @@ -2505,7 +2681,8 @@ lib.makeScope newScope (self: with self; { # THIS IS A GENERATED FILE. DO NOT EDIT! xf86videowsfb = callPackage ({ stdenv, pkg-config, fetchurl, xorgserver, xorgproto }: stdenv.mkDerivation { - name = "xf86-video-wsfb-0.4.0"; + pname = "xf86-video-wsfb"; + version = "0.4.0"; builder = ./builder.sh; src = fetchurl { url = "mirror://xorg/individual/driver/xf86-video-wsfb-0.4.0.tar.bz2"; @@ -2519,7 +2696,8 @@ lib.makeScope newScope (self: with self; { # THIS IS A GENERATED FILE. DO NOT EDIT! xf86videoxgi = callPackage ({ stdenv, pkg-config, fetchurl, xorgproto, libdrm, libpciaccess, xorgserver }: stdenv.mkDerivation { - name = "xf86-video-xgi-1.6.1"; + pname = "xf86-video-xgi"; + version = "1.6.1"; builder = ./builder.sh; src = fetchurl { url = "mirror://xorg/individual/driver/xf86-video-xgi-1.6.1.tar.bz2"; @@ -2533,7 +2711,8 @@ lib.makeScope newScope (self: with self; { # THIS IS A GENERATED FILE. DO NOT EDIT! xfd = callPackage ({ stdenv, pkg-config, fetchurl, libxkbfile, fontconfig, libXaw, libXft, libXmu, xorgproto, libXrender, libXt, gettext }: stdenv.mkDerivation { - name = "xfd-1.1.3"; + pname = "xfd"; + version = "1.1.3"; builder = ./builder.sh; src = fetchurl { url = "mirror://xorg/individual/app/xfd-1.1.3.tar.bz2"; @@ -2547,7 +2726,8 @@ lib.makeScope newScope (self: with self; { # THIS IS A GENERATED FILE. DO NOT EDIT! xfontsel = callPackage ({ stdenv, pkg-config, fetchurl, libX11, libXaw, libXmu, libXt }: stdenv.mkDerivation { - name = "xfontsel-1.0.6"; + pname = "xfontsel"; + version = "1.0.6"; builder = ./builder.sh; src = fetchurl { url = "mirror://xorg/individual/app/xfontsel-1.0.6.tar.bz2"; @@ -2561,7 +2741,8 @@ lib.makeScope newScope (self: with self; { # THIS IS A GENERATED FILE. DO NOT EDIT! xfs = callPackage ({ stdenv, pkg-config, fetchurl, libXfont2, xorgproto, xtrans }: stdenv.mkDerivation { - name = "xfs-1.2.0"; + pname = "xfs"; + version = "1.2.0"; builder = ./builder.sh; src = fetchurl { url = "mirror://xorg/individual/app/xfs-1.2.0.tar.bz2"; @@ -2575,7 +2756,8 @@ lib.makeScope newScope (self: with self; { # THIS IS A GENERATED FILE. DO NOT EDIT! xfsinfo = callPackage ({ stdenv, pkg-config, fetchurl, libFS, xorgproto }: stdenv.mkDerivation { - name = "xfsinfo-1.0.6"; + pname = "xfsinfo"; + version = "1.0.6"; builder = ./builder.sh; src = fetchurl { url = "mirror://xorg/individual/app/xfsinfo-1.0.6.tar.bz2"; @@ -2589,7 +2771,8 @@ lib.makeScope newScope (self: with self; { # THIS IS A GENERATED FILE. DO NOT EDIT! xgamma = callPackage ({ stdenv, pkg-config, fetchurl, libX11, xorgproto, libXxf86vm }: stdenv.mkDerivation { - name = "xgamma-1.0.6"; + pname = "xgamma"; + version = "1.0.6"; builder = ./builder.sh; src = fetchurl { url = "mirror://xorg/individual/app/xgamma-1.0.6.tar.bz2"; @@ -2603,7 +2786,8 @@ lib.makeScope newScope (self: with self; { # THIS IS A GENERATED FILE. DO NOT EDIT! xgc = callPackage ({ stdenv, pkg-config, fetchurl, libXaw, libXt }: stdenv.mkDerivation { - name = "xgc-1.0.5"; + pname = "xgc"; + version = "1.0.5"; builder = ./builder.sh; src = fetchurl { url = "mirror://xorg/individual/app/xgc-1.0.5.tar.bz2"; @@ -2617,7 +2801,8 @@ lib.makeScope newScope (self: with self; { # THIS IS A GENERATED FILE. DO NOT EDIT! xhost = callPackage ({ stdenv, pkg-config, fetchurl, libX11, libXau, libXmu, xorgproto }: stdenv.mkDerivation { - name = "xhost-1.0.8"; + pname = "xhost"; + version = "1.0.8"; builder = ./builder.sh; src = fetchurl { url = "mirror://xorg/individual/app/xhost-1.0.8.tar.bz2"; @@ -2631,7 +2816,8 @@ lib.makeScope newScope (self: with self; { # THIS IS A GENERATED FILE. DO NOT EDIT! xinit = callPackage ({ stdenv, pkg-config, fetchurl, libX11, xorgproto }: stdenv.mkDerivation { - name = "xinit-1.4.1"; + pname = "xinit"; + version = "1.4.1"; builder = ./builder.sh; src = fetchurl { url = "mirror://xorg/individual/app/xinit-1.4.1.tar.bz2"; @@ -2645,7 +2831,8 @@ lib.makeScope newScope (self: with self; { # THIS IS A GENERATED FILE. DO NOT EDIT! xinput = callPackage ({ stdenv, pkg-config, fetchurl, xorgproto, libX11, libXext, libXi, libXinerama, libXrandr }: stdenv.mkDerivation { - name = "xinput-1.6.3"; + pname = "xinput"; + version = "1.6.3"; builder = ./builder.sh; src = fetchurl { url = "mirror://xorg/individual/app/xinput-1.6.3.tar.bz2"; @@ -2659,7 +2846,8 @@ lib.makeScope newScope (self: with self; { # THIS IS A GENERATED FILE. DO NOT EDIT! xkbcomp = callPackage ({ stdenv, pkg-config, fetchurl, libX11, libxkbfile, xorgproto }: stdenv.mkDerivation { - name = "xkbcomp-1.4.5"; + pname = "xkbcomp"; + version = "1.4.5"; builder = ./builder.sh; src = fetchurl { url = "mirror://xorg/individual/app/xkbcomp-1.4.5.tar.bz2"; @@ -2673,7 +2861,8 @@ lib.makeScope newScope (self: with self; { # THIS IS A GENERATED FILE. DO NOT EDIT! xkbevd = callPackage ({ stdenv, pkg-config, fetchurl, libX11, libxkbfile }: stdenv.mkDerivation { - name = "xkbevd-1.1.4"; + pname = "xkbevd"; + version = "1.1.4"; builder = ./builder.sh; src = fetchurl { url = "mirror://xorg/individual/app/xkbevd-1.1.4.tar.bz2"; @@ -2687,7 +2876,8 @@ lib.makeScope newScope (self: with self; { # THIS IS A GENERATED FILE. DO NOT EDIT! xkbprint = callPackage ({ stdenv, pkg-config, fetchurl, libX11, libxkbfile, xorgproto }: stdenv.mkDerivation { - name = "xkbprint-1.0.4"; + pname = "xkbprint"; + version = "1.0.4"; builder = ./builder.sh; src = fetchurl { url = "mirror://xorg/individual/app/xkbprint-1.0.4.tar.bz2"; @@ -2701,7 +2891,8 @@ lib.makeScope newScope (self: with self; { # THIS IS A GENERATED FILE. DO NOT EDIT! xkbutils = callPackage ({ stdenv, pkg-config, fetchurl, xorgproto, libX11, libXaw, libXt }: stdenv.mkDerivation { - name = "xkbutils-1.0.4"; + pname = "xkbutils"; + version = "1.0.4"; builder = ./builder.sh; src = fetchurl { url = "mirror://xorg/individual/app/xkbutils-1.0.4.tar.bz2"; @@ -2715,11 +2906,12 @@ lib.makeScope newScope (self: with self; { # THIS IS A GENERATED FILE. DO NOT EDIT! xkeyboardconfig = callPackage ({ stdenv, pkg-config, fetchurl, libX11, xorgproto, python3 }: stdenv.mkDerivation { - name = "xkeyboard-config-2.31"; + pname = "xkeyboard-config"; + version = "2.33"; builder = ./builder.sh; src = fetchurl { - url = "mirror://xorg/individual/data/xkeyboard-config/xkeyboard-config-2.31.tar.bz2"; - sha256 = "18xddaxh83zm698syh50w983jg6b7b8zgv0dfaf7ha485hgihi6s"; + url = "mirror://xorg/individual/data/xkeyboard-config/xkeyboard-config-2.33.tar.bz2"; + sha256 = "1g6kn7l0mixw50kgn7d97gwv1990c5rczr2x776q3xywss8dfzv5"; }; hardeningDisable = [ "bindnow" "relro" ]; nativeBuildInputs = [ pkg-config python3 ]; @@ -2729,7 +2921,8 @@ lib.makeScope newScope (self: with self; { # THIS IS A GENERATED FILE. DO NOT EDIT! xkill = callPackage ({ stdenv, pkg-config, fetchurl, libX11, libXmu, xorgproto }: stdenv.mkDerivation { - name = "xkill-1.0.5"; + pname = "xkill"; + version = "1.0.5"; builder = ./builder.sh; src = fetchurl { url = "mirror://xorg/individual/app/xkill-1.0.5.tar.bz2"; @@ -2743,7 +2936,8 @@ lib.makeScope newScope (self: with self; { # THIS IS A GENERATED FILE. DO NOT EDIT! xload = callPackage ({ stdenv, pkg-config, fetchurl, libX11, libXaw, libXmu, xorgproto, libXt, gettext }: stdenv.mkDerivation { - name = "xload-1.1.3"; + pname = "xload"; + version = "1.1.3"; builder = ./builder.sh; src = fetchurl { url = "mirror://xorg/individual/app/xload-1.1.3.tar.bz2"; @@ -2757,7 +2951,8 @@ lib.makeScope newScope (self: with self; { # THIS IS A GENERATED FILE. DO NOT EDIT! xlsatoms = callPackage ({ stdenv, pkg-config, fetchurl, libxcb }: stdenv.mkDerivation { - name = "xlsatoms-1.1.3"; + pname = "xlsatoms"; + version = "1.1.3"; builder = ./builder.sh; src = fetchurl { url = "mirror://xorg/individual/app/xlsatoms-1.1.3.tar.bz2"; @@ -2771,7 +2966,8 @@ lib.makeScope newScope (self: with self; { # THIS IS A GENERATED FILE. DO NOT EDIT! xlsclients = callPackage ({ stdenv, pkg-config, fetchurl, libxcb }: stdenv.mkDerivation { - name = "xlsclients-1.1.4"; + pname = "xlsclients"; + version = "1.1.4"; builder = ./builder.sh; src = fetchurl { url = "mirror://xorg/individual/app/xlsclients-1.1.4.tar.bz2"; @@ -2785,7 +2981,8 @@ lib.makeScope newScope (self: with self; { # THIS IS A GENERATED FILE. DO NOT EDIT! xlsfonts = callPackage ({ stdenv, pkg-config, fetchurl, libX11, xorgproto }: stdenv.mkDerivation { - name = "xlsfonts-1.0.6"; + pname = "xlsfonts"; + version = "1.0.6"; builder = ./builder.sh; src = fetchurl { url = "mirror://xorg/individual/app/xlsfonts-1.0.6.tar.bz2"; @@ -2799,7 +2996,8 @@ lib.makeScope newScope (self: with self; { # THIS IS A GENERATED FILE. DO NOT EDIT! xmag = callPackage ({ stdenv, pkg-config, fetchurl, libX11, libXaw, libXmu, libXt }: stdenv.mkDerivation { - name = "xmag-1.0.6"; + pname = "xmag"; + version = "1.0.6"; builder = ./builder.sh; src = fetchurl { url = "mirror://xorg/individual/app/xmag-1.0.6.tar.bz2"; @@ -2813,7 +3011,8 @@ lib.makeScope newScope (self: with self; { # THIS IS A GENERATED FILE. DO NOT EDIT! xmessage = callPackage ({ stdenv, pkg-config, fetchurl, libXaw, libXt }: stdenv.mkDerivation { - name = "xmessage-1.0.5"; + pname = "xmessage"; + version = "1.0.5"; builder = ./builder.sh; src = fetchurl { url = "mirror://xorg/individual/app/xmessage-1.0.5.tar.bz2"; @@ -2827,7 +3026,8 @@ lib.makeScope newScope (self: with self; { # THIS IS A GENERATED FILE. DO NOT EDIT! xmodmap = callPackage ({ stdenv, pkg-config, fetchurl, libX11, xorgproto }: stdenv.mkDerivation { - name = "xmodmap-1.0.10"; + pname = "xmodmap"; + version = "1.0.10"; builder = ./builder.sh; src = fetchurl { url = "mirror://xorg/individual/app/xmodmap-1.0.10.tar.bz2"; @@ -2841,7 +3041,8 @@ lib.makeScope newScope (self: with self; { # THIS IS A GENERATED FILE. DO NOT EDIT! xmore = callPackage ({ stdenv, pkg-config, fetchurl, libXaw, libXt }: stdenv.mkDerivation { - name = "xmore-1.0.3"; + pname = "xmore"; + version = "1.0.3"; builder = ./builder.sh; src = fetchurl { url = "mirror://xorg/individual/app/xmore-1.0.3.tar.bz2"; @@ -2855,7 +3056,8 @@ lib.makeScope newScope (self: with self; { # THIS IS A GENERATED FILE. DO NOT EDIT! xorgcffiles = callPackage ({ stdenv, pkg-config, fetchurl }: stdenv.mkDerivation { - name = "xorg-cf-files-1.0.6"; + pname = "xorg-cf-files"; + version = "1.0.6"; builder = ./builder.sh; src = fetchurl { url = "mirror://xorg/individual/util/xorg-cf-files-1.0.6.tar.bz2"; @@ -2869,7 +3071,8 @@ lib.makeScope newScope (self: with self; { # THIS IS A GENERATED FILE. DO NOT EDIT! xorgdocs = callPackage ({ stdenv, pkg-config, fetchurl }: stdenv.mkDerivation { - name = "xorg-docs-1.7.1"; + pname = "xorg-docs"; + version = "1.7.1"; builder = ./builder.sh; src = fetchurl { url = "mirror://xorg/individual/doc/xorg-docs-1.7.1.tar.bz2"; @@ -2882,22 +3085,24 @@ lib.makeScope newScope (self: with self; { }) {}; # THIS IS A GENERATED FILE. DO NOT EDIT! - xorgproto = callPackage ({ stdenv, pkg-config, fetchurl, libXt }: stdenv.mkDerivation { - name = "xorgproto-2021.3"; + xorgproto = callPackage ({ stdenv, pkg-config, fetchurl, libXt, python3 }: stdenv.mkDerivation { + pname = "xorgproto"; + version = "2021.4"; builder = ./builder.sh; src = fetchurl { - url = "mirror://xorg/individual/proto/xorgproto-2021.3.tar.bz2"; - sha256 = "0dypp7cvjf0rvwa7cn1zp7djw5ynhs1rwk9p0r1vczbwzha2nwsc"; + url = "mirror://xorg/individual/proto/xorgproto-2021.4.tar.bz2"; + sha256 = "1gwz8lhvczjinndrq2jb0swfvhk7p65rprkwiqwlp132041mfl8g"; }; hardeningDisable = [ "bindnow" "relro" ]; - nativeBuildInputs = [ pkg-config ]; + nativeBuildInputs = [ pkg-config python3 ]; buildInputs = [ libXt ]; meta.platforms = lib.platforms.unix; }) {}; # THIS IS A GENERATED FILE. DO NOT EDIT! xorgserver = callPackage ({ stdenv, pkg-config, fetchurl, xorgproto, openssl, libX11, libXau, libXaw, libxcb, xcbutil, xcbutilwm, xcbutilimage, xcbutilkeysyms, xcbutilrenderutil, libXdmcp, libXfixes, libxkbfile, libXmu, libXpm, libXrender, libXres, libXt }: stdenv.mkDerivation { - name = "xorg-server-1.20.11"; + pname = "xorg-server"; + version = "1.20.11"; builder = ./builder.sh; src = fetchurl { url = "mirror://xorg/individual/xserver/xorg-server-1.20.11.tar.bz2"; @@ -2911,7 +3116,8 @@ lib.makeScope newScope (self: with self; { # THIS IS A GENERATED FILE. DO NOT EDIT! xorgsgmldoctools = callPackage ({ stdenv, pkg-config, fetchurl }: stdenv.mkDerivation { - name = "xorg-sgml-doctools-1.11"; + pname = "xorg-sgml-doctools"; + version = "1.11"; builder = ./builder.sh; src = fetchurl { url = "mirror://xorg/individual/doc/xorg-sgml-doctools-1.11.tar.bz2"; @@ -2925,7 +3131,8 @@ lib.makeScope newScope (self: with self; { # THIS IS A GENERATED FILE. DO NOT EDIT! xpr = callPackage ({ stdenv, pkg-config, fetchurl, libX11, libXmu, xorgproto }: stdenv.mkDerivation { - name = "xpr-1.0.5"; + pname = "xpr"; + version = "1.0.5"; builder = ./builder.sh; src = fetchurl { url = "mirror://xorg/individual/app/xpr-1.0.5.tar.bz2"; @@ -2939,7 +3146,8 @@ lib.makeScope newScope (self: with self; { # THIS IS A GENERATED FILE. DO NOT EDIT! xprop = callPackage ({ stdenv, pkg-config, fetchurl, libX11, xorgproto }: stdenv.mkDerivation { - name = "xprop-1.2.5"; + pname = "xprop"; + version = "1.2.5"; builder = ./builder.sh; src = fetchurl { url = "mirror://xorg/individual/app/xprop-1.2.5.tar.bz2"; @@ -2953,7 +3161,8 @@ lib.makeScope newScope (self: with self; { # THIS IS A GENERATED FILE. DO NOT EDIT! xrandr = callPackage ({ stdenv, pkg-config, fetchurl, libX11, xorgproto, libXrandr, libXrender }: stdenv.mkDerivation { - name = "xrandr-1.5.1"; + pname = "xrandr"; + version = "1.5.1"; builder = ./builder.sh; src = fetchurl { url = "mirror://xorg/individual/app/xrandr-1.5.1.tar.xz"; @@ -2967,7 +3176,8 @@ lib.makeScope newScope (self: with self; { # THIS IS A GENERATED FILE. DO NOT EDIT! xrdb = callPackage ({ stdenv, pkg-config, fetchurl, libX11, libXmu, xorgproto }: stdenv.mkDerivation { - name = "xrdb-1.2.0"; + pname = "xrdb"; + version = "1.2.0"; builder = ./builder.sh; src = fetchurl { url = "mirror://xorg/individual/app/xrdb-1.2.0.tar.bz2"; @@ -2981,7 +3191,8 @@ lib.makeScope newScope (self: with self; { # THIS IS A GENERATED FILE. DO NOT EDIT! xrefresh = callPackage ({ stdenv, pkg-config, fetchurl, libX11, xorgproto }: stdenv.mkDerivation { - name = "xrefresh-1.0.6"; + pname = "xrefresh"; + version = "1.0.6"; builder = ./builder.sh; src = fetchurl { url = "mirror://xorg/individual/app/xrefresh-1.0.6.tar.bz2"; @@ -2995,7 +3206,8 @@ lib.makeScope newScope (self: with self; { # THIS IS A GENERATED FILE. DO NOT EDIT! xset = callPackage ({ stdenv, pkg-config, fetchurl, libX11, libXext, libXmu, xorgproto, libXxf86misc }: stdenv.mkDerivation { - name = "xset-1.2.4"; + pname = "xset"; + version = "1.2.4"; builder = ./builder.sh; src = fetchurl { url = "mirror://xorg/individual/app/xset-1.2.4.tar.bz2"; @@ -3009,7 +3221,8 @@ lib.makeScope newScope (self: with self; { # THIS IS A GENERATED FILE. DO NOT EDIT! xsetroot = callPackage ({ stdenv, pkg-config, fetchurl, libX11, xbitmaps, libXcursor, libXmu, xorgproto }: stdenv.mkDerivation { - name = "xsetroot-1.1.2"; + pname = "xsetroot"; + version = "1.1.2"; builder = ./builder.sh; src = fetchurl { url = "mirror://xorg/individual/app/xsetroot-1.1.2.tar.bz2"; @@ -3023,7 +3236,8 @@ lib.makeScope newScope (self: with self; { # THIS IS A GENERATED FILE. DO NOT EDIT! xsm = callPackage ({ stdenv, pkg-config, fetchurl, libICE, libSM, libX11, libXaw, libXt }: stdenv.mkDerivation { - name = "xsm-1.0.4"; + pname = "xsm"; + version = "1.0.4"; builder = ./builder.sh; src = fetchurl { url = "mirror://xorg/individual/app/xsm-1.0.4.tar.bz2"; @@ -3037,7 +3251,8 @@ lib.makeScope newScope (self: with self; { # THIS IS A GENERATED FILE. DO NOT EDIT! xstdcmap = callPackage ({ stdenv, pkg-config, fetchurl, libX11, libXmu, xorgproto }: stdenv.mkDerivation { - name = "xstdcmap-1.0.4"; + pname = "xstdcmap"; + version = "1.0.4"; builder = ./builder.sh; src = fetchurl { url = "mirror://xorg/individual/app/xstdcmap-1.0.4.tar.bz2"; @@ -3051,7 +3266,8 @@ lib.makeScope newScope (self: with self; { # THIS IS A GENERATED FILE. DO NOT EDIT! xtrans = callPackage ({ stdenv, pkg-config, fetchurl }: stdenv.mkDerivation { - name = "xtrans-1.4.0"; + pname = "xtrans"; + version = "1.4.0"; builder = ./builder.sh; src = fetchurl { url = "mirror://xorg/individual/lib/xtrans-1.4.0.tar.bz2"; @@ -3065,7 +3281,8 @@ lib.makeScope newScope (self: with self; { # THIS IS A GENERATED FILE. DO NOT EDIT! xtrap = callPackage ({ stdenv, pkg-config, fetchurl, libX11, libXt, libXTrap }: stdenv.mkDerivation { - name = "xtrap-1.0.3"; + pname = "xtrap"; + version = "1.0.3"; builder = ./builder.sh; src = fetchurl { url = "mirror://xorg/individual/app/xtrap-1.0.3.tar.bz2"; @@ -3079,7 +3296,8 @@ lib.makeScope newScope (self: with self; { # THIS IS A GENERATED FILE. DO NOT EDIT! xvinfo = callPackage ({ stdenv, pkg-config, fetchurl, libX11, xorgproto, libXv }: stdenv.mkDerivation { - name = "xvinfo-1.1.4"; + pname = "xvinfo"; + version = "1.1.4"; builder = ./builder.sh; src = fetchurl { url = "mirror://xorg/individual/app/xvinfo-1.1.4.tar.bz2"; @@ -3093,7 +3311,8 @@ lib.makeScope newScope (self: with self; { # THIS IS A GENERATED FILE. DO NOT EDIT! xwd = callPackage ({ stdenv, pkg-config, fetchurl, libxkbfile, libX11, xorgproto }: stdenv.mkDerivation { - name = "xwd-1.0.7"; + pname = "xwd"; + version = "1.0.7"; builder = ./builder.sh; src = fetchurl { url = "mirror://xorg/individual/app/xwd-1.0.7.tar.bz2"; @@ -3107,7 +3326,8 @@ lib.makeScope newScope (self: with self; { # THIS IS A GENERATED FILE. DO NOT EDIT! xwininfo = callPackage ({ stdenv, pkg-config, fetchurl, libX11, libxcb, xorgproto }: stdenv.mkDerivation { - name = "xwininfo-1.1.4"; + pname = "xwininfo"; + version = "1.1.4"; builder = ./builder.sh; src = fetchurl { url = "mirror://xorg/individual/app/xwininfo-1.1.4.tar.bz2"; @@ -3121,7 +3341,8 @@ lib.makeScope newScope (self: with self; { # THIS IS A GENERATED FILE. DO NOT EDIT! xwud = callPackage ({ stdenv, pkg-config, fetchurl, libX11, xorgproto }: stdenv.mkDerivation { - name = "xwud-1.0.5"; + pname = "xwud"; + version = "1.0.5"; builder = ./builder.sh; src = fetchurl { url = "mirror://xorg/individual/app/xwud-1.0.5.tar.bz2"; diff --git a/pkgs/servers/x11/xorg/generate-expr-from-tarballs.pl b/pkgs/servers/x11/xorg/generate-expr-from-tarballs.pl index 6ec75517147..e18479c0d7a 100755 --- a/pkgs/servers/x11/xorg/generate-expr-from-tarballs.pl +++ b/pkgs/servers/x11/xorg/generate-expr-from-tarballs.pl @@ -17,6 +17,7 @@ use File::Temp; my %pkgURLs; my %pkgHashes; my %pkgNames; +my %pkgVersions; my %pkgRequires; my %pkgNativeRequires; @@ -73,8 +74,12 @@ while (<>) { next; } + # split by first occurence of hyphen followd by only numbers ends line or another hyphen follows + my ($name, $version) = split(/-(?=[.0-9]+(?:$|-))/, $pkgName, 2); + $pkgURLs{$pkg} = $tarball; - $pkgNames{$pkg} = $pkgName; + $pkgNames{$pkg} = $name; + $pkgVersions{$pkg} = $version; my $cachePath = catdir($downloadCache, basename($tarball)); my $hash; @@ -303,7 +308,8 @@ foreach my $pkg (sort (keys %pkgURLs)) { print OUT <<EOF # THIS IS A GENERATED FILE. DO NOT EDIT! $pkg = callPackage ({ $argumentsStr }: stdenv.mkDerivation { - name = "$pkgNames{$pkg}"; + pname = "$pkgNames{$pkg}"; + version = "$pkgVersions{$pkg}"; builder = ./builder.sh; src = fetchurl { url = "$pkgURLs{$pkg}"; diff --git a/pkgs/servers/x11/xorg/overrides.nix b/pkgs/servers/x11/xorg/overrides.nix index ae05e54d0e1..7e8eee77a08 100644 --- a/pkgs/servers/x11/xorg/overrides.nix +++ b/pkgs/servers/x11/xorg/overrides.nix @@ -668,7 +668,7 @@ self: super: ( # assert() keeps runtime reference xorgserver-dev in xf86-video-intel and others cd "$dev" for f in include/xorg/*.h; do - sed "1i#line 1 \"${attrs.name}/$f\"" -i "$f" + sed "1i#line 1 \"${attrs.pname}-${attrs.version}/$f\"" -i "$f" done ) ''; diff --git a/pkgs/servers/x11/xorg/tarballs.list b/pkgs/servers/x11/xorg/tarballs.list index 8f69a025859..4bb1867903e 100644 --- a/pkgs/servers/x11/xorg/tarballs.list +++ b/pkgs/servers/x11/xorg/tarballs.list @@ -75,7 +75,7 @@ mirror://xorg/individual/app/xwininfo-1.1.4.tar.bz2 mirror://xorg/individual/app/xwud-1.0.5.tar.bz2 mirror://xorg/individual/data/xbitmaps-1.1.2.tar.bz2 mirror://xorg/individual/data/xcursor-themes-1.0.6.tar.bz2 -mirror://xorg/individual/data/xkeyboard-config/xkeyboard-config-2.31.tar.bz2 +mirror://xorg/individual/data/xkeyboard-config/xkeyboard-config-2.33.tar.bz2 mirror://xorg/individual/doc/xorg-docs-1.7.1.tar.bz2 mirror://xorg/individual/doc/xorg-sgml-doctools-1.11.tar.bz2 mirror://xorg/individual/driver/xf86-input-evdev-2.10.6.tar.bz2 @@ -175,7 +175,7 @@ mirror://xorg/individual/lib/libICE-1.0.10.tar.bz2 mirror://xorg/individual/lib/libpciaccess-0.16.tar.bz2 mirror://xorg/individual/lib/libSM-1.2.3.tar.bz2 mirror://xorg/individual/lib/libWindowsWM-1.0.1.tar.bz2 -mirror://xorg/individual/lib/libX11-1.7.1.tar.bz2 +mirror://xorg/individual/lib/libX11-1.7.2.tar.bz2 mirror://xorg/individual/lib/libXau-1.0.9.tar.bz2 mirror://xorg/individual/lib/libXaw-1.0.14.tar.bz2 mirror://xorg/individual/lib/libXaw3d-1.6.3.tar.bz2 @@ -185,7 +185,7 @@ mirror://xorg/individual/lib/libXcursor-1.2.0.tar.bz2 mirror://xorg/individual/lib/libXdamage-1.1.5.tar.bz2 mirror://xorg/individual/lib/libXdmcp-1.1.3.tar.bz2 mirror://xorg/individual/lib/libXext-1.3.4.tar.bz2 -mirror://xorg/individual/lib/libXfixes-5.0.3.tar.bz2 +mirror://xorg/individual/lib/libXfixes-6.0.0.tar.bz2 mirror://xorg/individual/lib/libXfont-1.5.4.tar.bz2 mirror://xorg/individual/lib/libXfont2-2.0.4.tar.bz2 mirror://xorg/individual/lib/libXft-2.3.3.tar.bz2 @@ -211,7 +211,7 @@ mirror://xorg/individual/lib/libXxf86misc-1.0.4.tar.bz2 mirror://xorg/individual/lib/libXxf86vm-1.1.4.tar.bz2 mirror://xorg/individual/lib/xtrans-1.4.0.tar.bz2 mirror://xorg/individual/proto/xcb-proto-1.14.1.tar.xz -mirror://xorg/individual/proto/xorgproto-2021.3.tar.bz2 +mirror://xorg/individual/proto/xorgproto-2021.4.tar.bz2 mirror://xorg/individual/util/gccmakedep-1.0.3.tar.bz2 mirror://xorg/individual/util/imake-1.0.8.tar.bz2 mirror://xorg/individual/util/lndir-1.0.3.tar.bz2 diff --git a/pkgs/stdenv/adapters.nix b/pkgs/stdenv/adapters.nix index d8f73d5a7e3..a8e984d6174 100644 --- a/pkgs/stdenv/adapters.nix +++ b/pkgs/stdenv/adapters.nix @@ -44,6 +44,7 @@ rec { then throw "Cannot build fully static binaries on Darwin/macOS" else stdenv'.mkDerivation (args // { NIX_CFLAGS_LINK = toString (args.NIX_CFLAGS_LINK or "") + " -static"; + } // pkgs.lib.optionalAttrs (!(args.dontAddStaticConfigureFlags or false)) { configureFlags = (args.configureFlags or []) ++ [ "--disable-shared" # brrr... ]; @@ -56,6 +57,7 @@ rec { makeStaticLibraries = stdenv: stdenv // { mkDerivation = args: stdenv.mkDerivation (args // { dontDisableStatic = true; + } // pkgs.lib.optionalAttrs (!(args.dontAddStaticConfigureFlags or false)) { configureFlags = (args.configureFlags or []) ++ [ "--enable-static" "--disable-shared" diff --git a/pkgs/test/cc-wrapper/default.nix b/pkgs/test/cc-wrapper/default.nix index d82ba296e2f..b483372dea0 100644 --- a/pkgs/test/cc-wrapper/default.nix +++ b/pkgs/test/cc-wrapper/default.nix @@ -35,8 +35,7 @@ in stdenv.mkDerivation { printf "checking whether compiler builds valid static C binaries... " >&2 $CC ${staticLibc} -static -o cc-static ${./cc-main.c} ./cc-static - # our glibc does not have pie enabled yet. - ${lib.optionalString (stdenv.hostPlatform.isMusl && stdenv.cc.isGNU) '' + ${lib.optionalString (stdenv.cc.isGNU && lib.versionAtLeast (lib.getVersion stdenv.cc.name) "8.0.0") '' printf "checking whether compiler builds valid static pie C binaries... " >&2 $CC ${staticLibc} -static-pie -o cc-static-pie ${./cc-main.c} ./cc-static-pie diff --git a/pkgs/tools/admin/awscli/default.nix b/pkgs/tools/admin/awscli/default.nix index 885aaaa1214..0d0d2ec80ff 100644 --- a/pkgs/tools/admin/awscli/default.nix +++ b/pkgs/tools/admin/awscli/default.nix @@ -21,11 +21,11 @@ let in with py.pkgs; buildPythonApplication rec { pname = "awscli"; - version = "1.19.88"; # N.B: if you change this, change botocore and boto3 to a matching version too + version = "1.19.97"; # N.B: if you change this, change botocore and boto3 to a matching version too src = fetchPypi { inherit pname version; - sha256 = "sha256-LfWSE3dDTJ0BHcaaY49Nd9RAZgj5b++NFeYhkIfwQX0="; + sha256 = "sha256-kecuyQMk4GWH9G0/f4Gi/hWtW4Zme9Q4i7XclcZTlNc="; }; # https://github.com/aws/aws-cli/issues/4837 diff --git a/pkgs/tools/admin/azure-cli/default.nix b/pkgs/tools/admin/azure-cli/default.nix index 7c75e34f019..877ddf8a5e9 100644 --- a/pkgs/tools/admin/azure-cli/default.nix +++ b/pkgs/tools/admin/azure-cli/default.nix @@ -28,6 +28,7 @@ py.pkgs.toPythonApplication (py.pkgs.buildAzureCliPackage { substituteInPlace setup.py \ --replace "javaproperties==0.5.1" "javaproperties" \ --replace "pytz==2019.1" "pytz" \ + --replace "jsondiff==1.2.0" "jsondiff~=1.2" \ --replace "antlr4-python3-runtime~=4.7.2" "antlr4-python3-runtime~=4.7" \ --replace "mock~=4.0" "mock" diff --git a/pkgs/tools/audio/spotdl/default.nix b/pkgs/tools/audio/spotdl/default.nix index 38f69b4d2b7..71e8615a114 100644 --- a/pkgs/tools/audio/spotdl/default.nix +++ b/pkgs/tools/audio/spotdl/default.nix @@ -6,13 +6,13 @@ python3.pkgs.buildPythonApplication rec { pname = "spotdl"; - version = "3.6.1"; + version = "3.6.3"; src = fetchFromGitHub { owner = "spotDL"; repo = "spotify-downloader"; rev = "v${version}"; - sha256 = "sha256-F3bP8f1LtcFZL7qahYkCUvhtc27fcL8WBnmyLcS9lCY="; + sha256 = "sha256-Ok8DOw+Joy35IqN7sNOQcUWYJS8tqBeQ5/I8fUSly7Q="; }; propagatedBuildInputs = with python3.pkgs; [ diff --git a/pkgs/tools/backup/borgbackup/default.nix b/pkgs/tools/backup/borgbackup/default.nix index 86eee2bc9aa..d0e48454a36 100644 --- a/pkgs/tools/backup/borgbackup/default.nix +++ b/pkgs/tools/backup/borgbackup/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, python3, acl, libb2, lz4, zstd, openssl, openssh, nixosTests }: +{ lib, stdenv, python3, fetchpatch, acl, libb2, lz4, zstd, openssl, openssh, nixosTests }: python3.pkgs.buildPythonApplication rec { pname = "borgbackup"; @@ -9,6 +9,15 @@ python3.pkgs.buildPythonApplication rec { sha256 = "0l1dqfwrd9l34rg30cmzmq5bs6yha6kg4vy313jq611jsqj94mmw"; }; + patches = [ + # fix compatibility with sphinx 4 + (fetchpatch { + url = "https://github.com/borgbackup/borg/commit/6a1f31bf2914d167e2f5051f1d531d5d4a19f54b.patch"; + includes = [ "docs/conf.py" ]; + sha256 = "0aa4kyb3j4apgwqcy1hzg6lxvpf60m2mijcj60vh101b42410hiz"; + }) + ]; + nativeBuildInputs = with python3.pkgs; [ setuptools-scm # For building documentation: diff --git a/pkgs/tools/compression/lz4/default.nix b/pkgs/tools/compression/lz4/default.nix index e2bb98a4b80..94f739a6c53 100644 --- a/pkgs/tools/compression/lz4/default.nix +++ b/pkgs/tools/compression/lz4/default.nix @@ -14,6 +14,19 @@ stdenv.mkDerivation rec { owner = pname; }; + patches = [ + (fetchpatch { # https://github.com/lz4/lz4/pull/972 + name = "CVE-2021-3520.patch"; + url = "https://github.com/lz4/lz4/commit/8301a21773ef61656225e264f4f06ae14462bca7.patch"; + sha256 = "0r1cwpqdkdc8im0pf2r5jp7mwwn69xcw405rrk7rc0mpjcp5ydfk"; + }) + (fetchpatch { # https://github.com/lz4/lz4/pull/973 + name = "avoid-null-pointer-dereference.patch"; + url = "https://github.com/lz4/lz4/commit/29a6a1f4941e7243241fe00d6c13b749fd6b60c2.patch"; + sha256 = "0v5yl5hd3qrfm3xm7m06j4b21qwllb4cqkjn2az7x1vnzqgpf8y7"; + }) + ]; + # TODO(@Ericson2314): Separate binaries and libraries outputs = [ "bin" "out" "dev" ]; diff --git a/pkgs/tools/compression/zstd/default.nix b/pkgs/tools/compression/zstd/default.nix index e890518a45a..a89453b55f4 100644 --- a/pkgs/tools/compression/zstd/default.nix +++ b/pkgs/tools/compression/zstd/default.nix @@ -7,13 +7,13 @@ stdenv.mkDerivation rec { pname = "zstd"; - version = "1.4.9"; + version = "1.5.0"; src = fetchFromGitHub { owner = "facebook"; repo = "zstd"; rev = "v${version}"; - sha256 = "18alxnym54gswsmsr5ra82q4k1q5fyzsyx0jykb2sk2nkpvx7334"; + sha256 = "0icc0x89c35rq5bxd4d241vqxnz2i1qj2wwy01xls63p0z93brj7"; }; nativeBuildInputs = [ cmake ] diff --git a/pkgs/tools/compression/zstd/playtests-darwin.patch b/pkgs/tools/compression/zstd/playtests-darwin.patch index f829c93c705..bcb895a697c 100644 --- a/pkgs/tools/compression/zstd/playtests-darwin.patch +++ b/pkgs/tools/compression/zstd/playtests-darwin.patch @@ -1,6 +1,6 @@ --- a/tests/playTests.sh +++ b/tests/playTests.sh -@@ -112,17 +112,10 @@ case "$OS" in +@@ -112,22 +112,12 @@ case "$OS" in esac case "$UNAME" in @@ -16,13 +16,18 @@ - Darwin | FreeBSD | OpenBSD | NetBSD) MTIME="stat -f %m" ;; -esac - DIFF="diff" - case "$UNAME" in -@@ -842,7 +835,6 @@ $MD5SUM dirTestDict/* > tmph1 + GET_PERMS="stat -c %a" +-case "$UNAME" in +- Darwin | FreeBSD | OpenBSD | NetBSD) GET_PERMS="stat -f %Lp" ;; +-esac + + assertFilePermissions() { + STAT1=$($GET_PERMS "$1") +@@ -967,7 +957,6 @@ $MD5SUM dirTestDict/* > tmph1 zstd -f --rm dirTestDict/* -D tmpDictC zstd -d --rm dirTestDict/*.zst -D tmpDictC # note : use internal checksum by default case "$UNAME" in - Darwin) println "md5sum -c not supported on OS-X : test skipped" ;; # not compatible with OS-X's md5 *) $MD5SUM -c tmph1 ;; esac - rm -rf dirTestDict \ No newline at end of file + rm -rf dirTestDict diff --git a/pkgs/tools/graphics/gnuplot/default.nix b/pkgs/tools/graphics/gnuplot/default.nix index 2ad99c727d9..b46fd88ab99 100644 --- a/pkgs/tools/graphics/gnuplot/default.nix +++ b/pkgs/tools/graphics/gnuplot/default.nix @@ -20,11 +20,11 @@ let in (if withQt then mkDerivation else stdenv.mkDerivation) rec { pname = "gnuplot"; - version = "5.4.1"; + version = "5.4.2"; src = fetchurl { url = "mirror://sourceforge/gnuplot/${pname}-${version}.tar.gz"; - sha256 = "03jrqs5lvxmbbz2c4g17dn2hrxqwd3hfadk9q8wbkbkyas2h8sbb"; + sha256 = "sha256-5Xx14TGBM5UdMqg7zcSv8X/tKHIsTnHyMFz8KuHK57o="; }; nativeBuildInputs = [ makeWrapper pkg-config texinfo ] ++ lib.optional withQt qttools; diff --git a/pkgs/tools/graphics/graphviz/base.nix b/pkgs/tools/graphics/graphviz/base.nix index 000e2b28089..1a387042b2d 100644 --- a/pkgs/tools/graphics/graphviz/base.nix +++ b/pkgs/tools/graphics/graphviz/base.nix @@ -21,7 +21,14 @@ let buildCommand = "sed s/dot_root/agroot/g ${raw_patch} > $out"; }; # 2.42 has the patch included - patches = optional (lib.versionOlder version "2.42") patchToUse; + patches = optional (lib.versionOlder version "2.42") patchToUse + ++ optionals (lib.versionOlder version "2.46.0") [ + (fetchpatch { + name = "CVE-2020-18032.patch"; + url = "https://gitlab.com/graphviz/graphviz/-/commit/784411ca3655c80da0f6025ab20634b2a6ff696b.patch"; + sha256 = "1nkw9ism8lkfvxsp5fh95i2l5s5cbjsidbb3g1kjfv10rxkyb41m"; + }) + ]; in stdenv.mkDerivation { diff --git a/pkgs/tools/misc/coreboot-utils/default.nix b/pkgs/tools/misc/coreboot-utils/default.nix index a8c0f7f8378..95f9c74f5ad 100644 --- a/pkgs/tools/misc/coreboot-utils/default.nix +++ b/pkgs/tools/misc/coreboot-utils/default.nix @@ -43,7 +43,7 @@ let }; cbmem = generic { pname = "cbmem"; - meta.description = "Coreboot console log reader"; + meta.description = "coreboot console log reader"; }; ifdtool = generic { pname = "ifdtool"; diff --git a/pkgs/tools/misc/coreutils/default.nix b/pkgs/tools/misc/coreutils/default.nix index bfe5c5c5045..0b2b03ba8db 100644 --- a/pkgs/tools/misc/coreutils/default.nix +++ b/pkgs/tools/misc/coreutils/default.nix @@ -68,6 +68,12 @@ stdenv.mkDerivation (rec { for f in gnulib-tests/{test-chown.c,test-fchownat.c,test-lchown.c}; do echo "int main() { return 77; }" > "$f" done + + # tests try to access user 1000 which is forbidden in sandbox + sed '2i print "Skipping id uid test"; exit 77' -i ./tests/id/uid.sh + sed '2i print "Skipping id zero test"; exit 77' -i ./tests/id/zero.sh + sed '2i print "Skipping misc help-versiob test"; exit 77' -i ./tests/misc/help-version.sh + sed '2i print "Skipping chown separator test"; exit 77' -i ./tests/chown/separator.sh '' + optionalString (stdenv.hostPlatform.libc == "musl") (lib.concatStringsSep "\n" [ '' echo "int main() { return 77; }" > gnulib-tests/test-parse-datetime.c @@ -136,20 +142,15 @@ stdenv.mkDerivation (rec { meta = { homepage = "https://www.gnu.org/software/coreutils/"; description = "The basic file, shell and text manipulation utilities of the GNU operating system"; - longDescription = '' The GNU Core Utilities are the basic file, shell and text manipulation utilities of the GNU operating system. These are the core utilities which are expected to exist on every operating system. ''; - license = licenses.gpl3Plus; - platforms = platforms.unix ++ platforms.windows; - priority = 10; - maintainers = [ maintainers.eelco ]; }; } // optionalAttrs stdenv.hostPlatform.isMusl { diff --git a/pkgs/tools/misc/goreleaser/default.nix b/pkgs/tools/misc/goreleaser/default.nix index a5c3fbad32d..19840144cda 100644 --- a/pkgs/tools/misc/goreleaser/default.nix +++ b/pkgs/tools/misc/goreleaser/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "goreleaser"; - version = "0.166.2"; + version = "0.168.0"; src = fetchFromGitHub { owner = "goreleaser"; repo = pname; rev = "v${version}"; - sha256 = "sha256-+8hh4BR6sTpQyNeiaXgcp/ezPptvbZESky6VAAg1dfI="; + sha256 = "sha256-+WDKpkjUlwR39nVB99saSB03NScPzPiyR8xvRBfASTQ="; }; - vendorSha256 = "sha256-PkSvdpP9SuftxdcZMA5xG1zSb87e1Ui/oX+HdLBEW0E="; + vendorSha256 = "sha256-W/G5AMfYyA9adVFOT/IXI+Bds/6osBOrQ6CtgeHZ8R8="; buildFlagsArray = [ "-ldflags=" diff --git a/pkgs/tools/misc/ytfzf/default.nix b/pkgs/tools/misc/ytfzf/default.nix index 302839a3038..a35e9200a71 100644 --- a/pkgs/tools/misc/ytfzf/default.nix +++ b/pkgs/tools/misc/ytfzf/default.nix @@ -16,13 +16,13 @@ stdenv.mkDerivation rec { pname = "ytfzf"; - version = "1.1.6"; + version = "1.2.0"; src = fetchFromGitHub { owner = "pystardust"; repo = "ytfzf"; rev = "v${version}"; - sha256 = "sha256-HXn/8Lrt6tNZWW1AeKMArOiW9t1v7MzlynSLryNdI5Y="; + sha256 = "sha256-3wbjCtRmnd9tm8kqKaIF6VmMdKsWznhOvQkEsrAJpAE="; }; patches = [ diff --git a/pkgs/tools/misc/ytfzf/no-update.patch b/pkgs/tools/misc/ytfzf/no-update.patch index e023914083d..e71582f6364 100644 --- a/pkgs/tools/misc/ytfzf/no-update.patch +++ b/pkgs/tools/misc/ytfzf/no-update.patch @@ -1,8 +1,8 @@ diff --git a/ytfzf b/ytfzf -index d5ff8c9..96f9c8f 100755 +index f4d2e0d..7a3b4b6 100755 --- a/ytfzf +++ b/ytfzf -@@ -934,23 +934,8 @@ send_notify () { +@@ -1260,22 +1260,8 @@ EOF } update_ytfzf () { @@ -12,19 +12,18 @@ index d5ff8c9..96f9c8f 100755 - - if sed -n '1p' < "$updatefile" | grep -q '#!/bin/sh'; then - chmod 755 "$updatefile" -- if [ "$(uname)" = "Darwin" ]; then -- sudo cp "$updatefile" "/usr/local/bin/ytfzf" -- else -- sudo cp "$updatefile" "/usr/bin/ytfzf" -- fi +- [ "$(uname)" = "Darwin" ] && prefix="/usr/local/bin" || prefix="/usr/bin" +- function_exists "sudo" && doasroot="sudo" || doasroot="doas" +- $doasroot cp "$updatefile" "$prefix/ytfzf" +- unset prefix doasroot - else - printf "%bFailed to update ytfzf. Try again later.%b" "$c_red" "$c_reset" - fi - - rm "$updatefile" -- exit +- exit 0 + printf "%bUpdates have to be installed through Nix.%b\n" "$c_red" "$c_reset" + exit 1 } - sort_video_data_date () { + #gives a value to sort by (this will give the unix time the video was uploaded) diff --git a/pkgs/tools/networking/burpsuite/default.nix b/pkgs/tools/networking/burpsuite/default.nix index a42746c6fa2..53d1a3d4f23 100644 --- a/pkgs/tools/networking/burpsuite/default.nix +++ b/pkgs/tools/networking/burpsuite/default.nix @@ -2,7 +2,7 @@ stdenv.mkDerivation rec { pname = "burpsuite"; - version = "2021.5.1"; + version = "2021.6"; src = fetchurl { name = "burpsuite.jar"; @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { "https://portswigger.net/Burp/Releases/Download?productId=100&version=${version}&type=Jar" "https://web.archive.org/web/https://portswigger.net/Burp/Releases/Download?productId=100&version=${version}&type=Jar" ]; - sha256 = "sha256-nPz6IZpXCyg6cg2nuyqK2f5BI4dNb5tA2NriH3ZC198="; + sha256 = "sha256-DPUi/KRnJkwrc7KMq10+LE6+MX9yJLgrgIHKhlfL+vc="; }; dontUnpack = true; diff --git a/pkgs/tools/networking/curl/CVE-2021-22897.patch b/pkgs/tools/networking/curl/CVE-2021-22897.patch new file mode 100644 index 00000000000..a4888879503 --- /dev/null +++ b/pkgs/tools/networking/curl/CVE-2021-22897.patch @@ -0,0 +1,64 @@ +From bbb71507b7bab52002f9b1e0880bed6a32834511 Mon Sep 17 00:00:00 2001 +From: Daniel Stenberg <daniel@haxx.se> +Date: Fri, 23 Apr 2021 10:54:10 +0200 +Subject: [PATCH] schannel: don't use static to store selected ciphers + +CVE-2021-22897 + +Bug: https://curl.se/docs/CVE-2021-22897.html +--- + lib/vtls/schannel.c | 9 +++++---- + lib/vtls/schannel.h | 3 +++ + 2 files changed, 8 insertions(+), 4 deletions(-) + +diff --git a/lib/vtls/schannel.c b/lib/vtls/schannel.c +index 8c25ac5dd5a5..dba7072273a9 100644 +--- a/lib/vtls/schannel.c ++++ b/lib/vtls/schannel.c +@@ -328,12 +328,12 @@ get_alg_id_by_name(char *name) + } + + static CURLcode +-set_ssl_ciphers(SCHANNEL_CRED *schannel_cred, char *ciphers) ++set_ssl_ciphers(SCHANNEL_CRED *schannel_cred, char *ciphers, ++ int *algIds) + { + char *startCur = ciphers; + int algCount = 0; +- static ALG_ID algIds[45]; /*There are 45 listed in the MS headers*/ +- while(startCur && (0 != *startCur) && (algCount < 45)) { ++ while(startCur && (0 != *startCur) && (algCount < NUMOF_CIPHERS)) { + long alg = strtol(startCur, 0, 0); + if(!alg) + alg = get_alg_id_by_name(startCur); +@@ -593,7 +593,8 @@ schannel_connect_step1(struct Curl_easy *data, struct connectdata *conn, + } + + if(SSL_CONN_CONFIG(cipher_list)) { +- result = set_ssl_ciphers(&schannel_cred, SSL_CONN_CONFIG(cipher_list)); ++ result = set_ssl_ciphers(&schannel_cred, SSL_CONN_CONFIG(cipher_list), ++ BACKEND->algIds); + if(CURLE_OK != result) { + failf(data, "Unable to set ciphers to passed via SSL_CONN_CONFIG"); + return result; +diff --git a/lib/vtls/schannel.h b/lib/vtls/schannel.h +index 2952caa1a5a1..77853aa30f96 100644 +--- a/lib/vtls/schannel.h ++++ b/lib/vtls/schannel.h +@@ -71,6 +71,8 @@ CURLcode Curl_verify_certificate(struct Curl_easy *data, + #endif + #endif + ++#define NUMOF_CIPHERS 45 /* There are 45 listed in the MS headers */ ++ + struct Curl_schannel_cred { + CredHandle cred_handle; + TimeStamp time_stamp; +@@ -102,6 +104,7 @@ struct ssl_backend_data { + #ifdef HAS_MANUAL_VERIFY_API + bool use_manual_cred_validation; /* true if manual cred validation is used */ + #endif ++ ALG_ID algIds[NUMOF_CIPHERS]; + }; + #endif /* EXPOSE_SCHANNEL_INTERNAL_STRUCTS */ + diff --git a/pkgs/tools/networking/curl/CVE-2021-22898.patch b/pkgs/tools/networking/curl/CVE-2021-22898.patch new file mode 100644 index 00000000000..ea4d2cb37e8 --- /dev/null +++ b/pkgs/tools/networking/curl/CVE-2021-22898.patch @@ -0,0 +1,25 @@ +From 39ce47f219b09c380b81f89fe54ac586c8db6bde Mon Sep 17 00:00:00 2001 +From: Harry Sintonen <sintonen@iki.fi> +Date: Fri, 7 May 2021 13:09:57 +0200 +Subject: [PATCH] telnet: check sscanf() for correct number of matches + +CVE-2021-22898 + +Bug: https://curl.se/docs/CVE-2021-22898.html +--- + lib/telnet.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/lib/telnet.c b/lib/telnet.c +index 26e0658ba9cc..fdd137fb0c04 100644 +--- a/lib/telnet.c ++++ b/lib/telnet.c +@@ -922,7 +922,7 @@ static void suboption(struct Curl_easy *data) + size_t tmplen = (strlen(v->data) + 1); + /* Add the variable only if it fits */ + if(len + tmplen < (int)sizeof(temp)-6) { +- if(sscanf(v->data, "%127[^,],%127s", varname, varval)) { ++ if(sscanf(v->data, "%127[^,],%127s", varname, varval) == 2) { + msnprintf((char *)&temp[len], sizeof(temp) - len, + "%c%s%c%s", CURL_NEW_ENV_VAR, varname, + CURL_NEW_ENV_VALUE, varval); diff --git a/pkgs/tools/networking/curl/CVE-2021-22901.patch b/pkgs/tools/networking/curl/CVE-2021-22901.patch new file mode 100644 index 00000000000..6bd70aa41b1 --- /dev/null +++ b/pkgs/tools/networking/curl/CVE-2021-22901.patch @@ -0,0 +1,437 @@ +Based on upstream 7f4a9a9b2a49547eae24d2e19bc5c346e9026479, modified by ris to +apply without 0c55fbab45bedb761766109d41c3da49c4bc66c6 + +diff --git a/lib/multi.c b/lib/multi.c +index 54365f399e9b..1b3e261c682a 100644 +--- a/lib/multi.c ++++ b/lib/multi.c +@@ -878,8 +878,10 @@ bool Curl_multiplex_wanted(const struct Curl_multi *multi) + void Curl_detach_connnection(struct Curl_easy *data) + { + struct connectdata *conn = data->conn; +- if(conn) ++ if(conn) { + Curl_llist_remove(&conn->easyq, &data->conn_queue, NULL); ++ Curl_ssl_detach_conn(data, conn); ++ } + data->conn = NULL; + } + +@@ -896,6 +898,7 @@ void Curl_attach_connnection(struct Curl_easy *data, + data->conn = conn; + Curl_llist_insert_next(&conn->easyq, conn->easyq.tail, data, + &data->conn_queue); ++ Curl_ssl_associate_conn(data, conn); + } + + static int waitconnect_getsock(struct connectdata *conn, +diff --git a/lib/vtls/gskit.c b/lib/vtls/gskit.c +index c648f624579b..ca953769d1ba 100644 +--- a/lib/vtls/gskit.c ++++ b/lib/vtls/gskit.c +@@ -1304,7 +1304,9 @@ const struct Curl_ssl Curl_ssl_gskit = { + Curl_none_set_engine_default, /* set_engine_default */ + Curl_none_engines_list, /* engines_list */ + Curl_none_false_start, /* false_start */ +- NULL /* sha256sum */ ++ NULL, /* sha256sum */ ++ NULL, /* associate_connection */ ++ NULL /* disassociate_connection */ + }; + + #endif /* USE_GSKIT */ +diff --git a/lib/vtls/gtls.c b/lib/vtls/gtls.c +index a10c0dbcca05..ecde5c44deeb 100644 +--- a/lib/vtls/gtls.c ++++ b/lib/vtls/gtls.c +@@ -1656,7 +1656,9 @@ const struct Curl_ssl Curl_ssl_gnutls = { + Curl_none_set_engine_default, /* set_engine_default */ + Curl_none_engines_list, /* engines_list */ + Curl_none_false_start, /* false_start */ +- gtls_sha256sum /* sha256sum */ ++ gtls_sha256sum, /* sha256sum */ ++ NULL, /* associate_connection */ ++ NULL /* disassociate_connection */ + }; + + #endif /* USE_GNUTLS */ +diff --git a/lib/vtls/mbedtls.c b/lib/vtls/mbedtls.c +index ca77de58667c..3a0be0f04b4f 100644 +--- a/lib/vtls/mbedtls.c ++++ b/lib/vtls/mbedtls.c +@@ -1093,7 +1093,9 @@ const struct Curl_ssl Curl_ssl_mbedtls = { + Curl_none_set_engine_default, /* set_engine_default */ + Curl_none_engines_list, /* engines_list */ + Curl_none_false_start, /* false_start */ +- mbedtls_sha256sum /* sha256sum */ ++ mbedtls_sha256sum, /* sha256sum */ ++ NULL, /* associate_connection */ ++ NULL /* disassociate_connection */ + }; + + #endif /* USE_MBEDTLS */ +diff --git a/lib/vtls/mesalink.c b/lib/vtls/mesalink.c +index f16c77c27fe0..bf8600d3230b 100644 +--- a/lib/vtls/mesalink.c ++++ b/lib/vtls/mesalink.c +@@ -666,7 +666,9 @@ const struct Curl_ssl Curl_ssl_mesalink = { + Curl_none_set_engine_default, /* set_engine_default */ + Curl_none_engines_list, /* engines_list */ + Curl_none_false_start, /* false_start */ +- NULL /* sha256sum */ ++ NULL, /* sha256sum */ ++ NULL, /* associate_connection */ ++ NULL /* disassociate_connection */ + }; + + #endif +diff --git a/lib/vtls/nss.c b/lib/vtls/nss.c +index 2aa4bdaa134f..1582b1e580a9 100644 +--- a/lib/vtls/nss.c ++++ b/lib/vtls/nss.c +@@ -2465,7 +2465,9 @@ const struct Curl_ssl Curl_ssl_nss = { + Curl_none_set_engine_default, /* set_engine_default */ + Curl_none_engines_list, /* engines_list */ + nss_false_start, /* false_start */ +- nss_sha256sum /* sha256sum */ ++ nss_sha256sum, /* sha256sum */ ++ NULL, /* associate_connection */ ++ NULL /* disassociate_connection */ + }; + + #endif /* USE_NSS */ +diff --git a/lib/vtls/openssl.c b/lib/vtls/openssl.c +index 1521600dd5f6..ebd7abc3b4ac 100644 +--- a/lib/vtls/openssl.c ++++ b/lib/vtls/openssl.c +@@ -240,6 +240,10 @@ struct ssl_backend_data { + #endif + }; + ++static void ossl_associate_connection(struct Curl_easy *data, ++ struct connectdata *conn, ++ int sockindex); ++ + /* + * Number of bytes to read from the random number seed file. This must be + * a finite value (because some entropy "files" like /dev/urandom have +@@ -2581,6 +2585,7 @@ static CURLcode ossl_connect_step1(struct Curl_easy *data, + curl_socket_t sockfd = conn->sock[sockindex]; + struct ssl_connect_data *connssl = &conn->ssl[sockindex]; + ctx_option_t ctx_options = 0; ++ void *ssl_sessionid = NULL; + + #ifdef SSL_CTRL_SET_TLSEXT_HOSTNAME + bool sni; +@@ -3225,46 +3230,23 @@ static CURLcode ossl_connect_step1(struct Curl_easy *data, + } + #endif + +- /* Check if there's a cached ID we can/should use here! */ +- if(SSL_SET_OPTION(primary.sessionid)) { +- void *ssl_sessionid = NULL; +- int data_idx = ossl_get_ssl_data_index(); +- int connectdata_idx = ossl_get_ssl_conn_index(); +- int sockindex_idx = ossl_get_ssl_sockindex_index(); +- int proxy_idx = ossl_get_proxy_index(); +- +- if(data_idx >= 0 && connectdata_idx >= 0 && sockindex_idx >= 0 && +- proxy_idx >= 0) { +- /* Store the data needed for the "new session" callback. +- * The sockindex is stored as a pointer to an array element. */ +- SSL_set_ex_data(backend->handle, data_idx, data); +- SSL_set_ex_data(backend->handle, connectdata_idx, conn); +- SSL_set_ex_data(backend->handle, sockindex_idx, conn->sock + sockindex); +-#ifndef CURL_DISABLE_PROXY +- SSL_set_ex_data(backend->handle, proxy_idx, SSL_IS_PROXY() ? (void *) 1: +- NULL); +-#else +- SSL_set_ex_data(backend->handle, proxy_idx, NULL); +-#endif +- +- } ++ ossl_associate_connection(data, conn, sockindex); + +- Curl_ssl_sessionid_lock(data); +- if(!Curl_ssl_getsessionid(data, conn, SSL_IS_PROXY() ? TRUE : FALSE, +- &ssl_sessionid, NULL, sockindex)) { +- /* we got a session id, use it! */ +- if(!SSL_set_session(backend->handle, ssl_sessionid)) { +- Curl_ssl_sessionid_unlock(data); +- failf(data, "SSL: SSL_set_session failed: %s", +- ossl_strerror(ERR_get_error(), error_buffer, +- sizeof(error_buffer))); +- return CURLE_SSL_CONNECT_ERROR; +- } +- /* Informational message */ +- infof(data, "SSL re-using session ID\n"); ++ Curl_ssl_sessionid_lock(data); ++ if(!Curl_ssl_getsessionid(data, conn, SSL_IS_PROXY() ? TRUE : FALSE, ++ &ssl_sessionid, NULL, sockindex)) { ++ /* we got a session id, use it! */ ++ if(!SSL_set_session(backend->handle, ssl_sessionid)) { ++ Curl_ssl_sessionid_unlock(data); ++ failf(data, "SSL: SSL_set_session failed: %s", ++ ossl_strerror(ERR_get_error(), error_buffer, ++ sizeof(error_buffer))); ++ return CURLE_SSL_CONNECT_ERROR; + } +- Curl_ssl_sessionid_unlock(data); ++ /* Informational message */ ++ infof(data, "SSL re-using session ID\n"); + } ++ Curl_ssl_sessionid_unlock(data); + + #ifndef CURL_DISABLE_PROXY + if(conn->proxy_ssl[sockindex].use) { +@@ -4498,6 +4480,90 @@ static void *ossl_get_internals(struct ssl_connect_data *connssl, + (void *)backend->ctx : (void *)backend->handle; + } + ++static void ossl_associate_connection(struct Curl_easy *data, ++ struct connectdata *conn, ++ int sockindex) ++{ ++ struct ssl_connect_data *connssl = &conn->ssl[sockindex]; ++ struct ssl_backend_data *backend = connssl->backend; ++ ++ /* If we don't have SSL context, do nothing. */ ++ if(!backend->handle) ++ return; ++ ++ if(SSL_SET_OPTION(primary.sessionid)) { ++ int data_idx = ossl_get_ssl_data_index(); ++ int connectdata_idx = ossl_get_ssl_conn_index(); ++ int sockindex_idx = ossl_get_ssl_sockindex_index(); ++ int proxy_idx = ossl_get_proxy_index(); ++ ++ if(data_idx >= 0 && connectdata_idx >= 0 && sockindex_idx >= 0 && ++ proxy_idx >= 0) { ++ /* Store the data needed for the "new session" callback. ++ * The sockindex is stored as a pointer to an array element. */ ++ SSL_set_ex_data(backend->handle, data_idx, data); ++ SSL_set_ex_data(backend->handle, connectdata_idx, conn); ++ SSL_set_ex_data(backend->handle, sockindex_idx, conn->sock + sockindex); ++#ifndef CURL_DISABLE_PROXY ++ SSL_set_ex_data(backend->handle, proxy_idx, SSL_IS_PROXY() ? (void *) 1: ++ NULL); ++#else ++ SSL_set_ex_data(backend->handle, proxy_idx, NULL); ++#endif ++ } ++ } ++} ++ ++/* ++ * Starting with TLS 1.3, the ossl_new_session_cb callback gets called after ++ * the handshake. If the transfer that sets up the callback gets killed before ++ * this callback arrives, we must make sure to properly clear the data to ++ * avoid UAF problems. A future optimization could be to instead store another ++ * transfer that might still be using the same connection. ++ */ ++ ++static void ossl_disassociate_connection(struct Curl_easy *data, ++ int sockindex) ++{ ++ struct connectdata *conn = data->conn; ++ struct ssl_connect_data *connssl = &conn->ssl[sockindex]; ++ struct ssl_backend_data *backend = connssl->backend; ++ ++ /* If we don't have SSL context, do nothing. */ ++ if(!backend->handle) ++ return; ++ ++ if(SSL_SET_OPTION(primary.sessionid)) { ++ bool isproxy = FALSE; ++ bool incache; ++ void *old_ssl_sessionid = NULL; ++ int data_idx = ossl_get_ssl_data_index(); ++ int connectdata_idx = ossl_get_ssl_conn_index(); ++ int sockindex_idx = ossl_get_ssl_sockindex_index(); ++ int proxy_idx = ossl_get_proxy_index(); ++ ++ if(data_idx >= 0 && connectdata_idx >= 0 && sockindex_idx >= 0 && ++ proxy_idx >= 0) { ++ /* Invalidate the session cache entry, if any */ ++ isproxy = SSL_get_ex_data(backend->handle, proxy_idx) ? TRUE : FALSE; ++ ++ /* Disable references to data in "new session" callback to avoid ++ * accessing a stale pointer. */ ++ SSL_set_ex_data(backend->handle, data_idx, NULL); ++ SSL_set_ex_data(backend->handle, connectdata_idx, NULL); ++ SSL_set_ex_data(backend->handle, sockindex_idx, NULL); ++ SSL_set_ex_data(backend->handle, proxy_idx, NULL); ++ } ++ ++ Curl_ssl_sessionid_lock(data); ++ incache = !(Curl_ssl_getsessionid(data, conn, isproxy, ++ &old_ssl_sessionid, NULL, sockindex)); ++ if(incache) ++ Curl_ssl_delsessionid(data, old_ssl_sessionid); ++ Curl_ssl_sessionid_unlock(data); ++ } ++} ++ + const struct Curl_ssl Curl_ssl_openssl = { + { CURLSSLBACKEND_OPENSSL, "openssl" }, /* info */ + +@@ -4533,10 +4599,12 @@ const struct Curl_ssl Curl_ssl_openssl = { + ossl_engines_list, /* engines_list */ + Curl_none_false_start, /* false_start */ + #if (OPENSSL_VERSION_NUMBER >= 0x0090800fL) && !defined(OPENSSL_NO_SHA256) +- ossl_sha256sum /* sha256sum */ ++ ossl_sha256sum, /* sha256sum */ + #else +- NULL /* sha256sum */ ++ NULL, /* sha256sum */ + #endif ++ ossl_associate_connection, /* associate_connection */ ++ ossl_disassociate_connection /* disassociate_connection */ + }; + + #endif /* USE_OPENSSL */ +diff --git a/lib/vtls/rustls.c b/lib/vtls/rustls.c +index 9dfbd2c3c4c2..161f3bf51d75 100644 +--- a/lib/vtls/rustls.c ++++ b/lib/vtls/rustls.c +@@ -604,7 +604,9 @@ const struct Curl_ssl Curl_ssl_rustls = { + Curl_none_set_engine_default, /* set_engine_default */ + Curl_none_engines_list, /* engines_list */ + Curl_none_false_start, /* false_start */ +- NULL /* sha256sum */ ++ NULL, /* sha256sum */ ++ NULL, /* associate_connection */ ++ NULL /* disassociate_connection */ + }; + + #endif /* USE_RUSTLS */ +diff --git a/lib/vtls/schannel.c b/lib/vtls/schannel.c +index dba7072273a9..2bcf11db2576 100644 +--- a/lib/vtls/schannel.c ++++ b/lib/vtls/schannel.c +@@ -329,7 +329,7 @@ get_alg_id_by_name(char *name) + + static CURLcode + set_ssl_ciphers(SCHANNEL_CRED *schannel_cred, char *ciphers, +- int *algIds) ++ ALG_ID *algIds) + { + char *startCur = ciphers; + int algCount = 0; +@@ -2433,7 +2433,9 @@ const struct Curl_ssl Curl_ssl_schannel = { + Curl_none_set_engine_default, /* set_engine_default */ + Curl_none_engines_list, /* engines_list */ + Curl_none_false_start, /* false_start */ +- schannel_sha256sum /* sha256sum */ ++ schannel_sha256sum, /* sha256sum */ ++ NULL, /* associate_connection */ ++ NULL /* disassociate_connection */ + }; + + #endif /* USE_SCHANNEL */ +diff --git a/lib/vtls/sectransp.c b/lib/vtls/sectransp.c +index 4276b89cfb3a..8b1e84ed7715 100644 +--- a/lib/vtls/sectransp.c ++++ b/lib/vtls/sectransp.c +@@ -3453,6 +3453,8 @@ const struct Curl_ssl Curl_ssl_sectransp = { + Curl_none_engines_list, /* engines_list */ + sectransp_false_start, /* false_start */ + sectransp_sha256sum /* sha256sum */ ++ NULL, /* associate_connection */ ++ NULL /* disassociate_connection */ + }; + + #ifdef __clang__ +diff --git a/lib/vtls/vtls.c b/lib/vtls/vtls.c +index d63fd5c76386..65f4f773dd63 100644 +--- a/lib/vtls/vtls.c ++++ b/lib/vtls/vtls.c +@@ -586,6 +586,25 @@ CURLcode Curl_ssl_addsessionid(struct Curl_easy *data, + return CURLE_OK; + } + ++void Curl_ssl_associate_conn(struct Curl_easy *data, ++ struct connectdata *conn) ++{ ++ if(Curl_ssl->associate_connection) { ++ Curl_ssl->associate_connection(data, conn, FIRSTSOCKET); ++ if(conn->sock[SECONDARYSOCKET] && conn->bits.sock_accepted) ++ Curl_ssl->associate_connection(data, conn, SECONDARYSOCKET); ++ } ++} ++ ++void Curl_ssl_detach_conn(struct Curl_easy *data, ++ struct connectdata *conn) ++{ ++ if(Curl_ssl->disassociate_connection) { ++ Curl_ssl->disassociate_connection(data, FIRSTSOCKET); ++ if(conn->sock[SECONDARYSOCKET] && conn->bits.sock_accepted) ++ Curl_ssl->disassociate_connection(data, SECONDARYSOCKET); ++ } ++} + + void Curl_ssl_close_all(struct Curl_easy *data) + { +@@ -1214,7 +1233,9 @@ static const struct Curl_ssl Curl_ssl_multi = { + Curl_none_set_engine_default, /* set_engine_default */ + Curl_none_engines_list, /* engines_list */ + Curl_none_false_start, /* false_start */ +- NULL /* sha256sum */ ++ NULL, /* sha256sum */ ++ NULL, /* associate_connection */ ++ NULL /* disassociate_connection */ + }; + + const struct Curl_ssl *Curl_ssl = +diff --git a/lib/vtls/vtls.h b/lib/vtls/vtls.h +index a22d526ca810..7f93e7aedb21 100644 +--- a/lib/vtls/vtls.h ++++ b/lib/vtls/vtls.h +@@ -84,6 +84,11 @@ struct Curl_ssl { + bool (*false_start)(void); + CURLcode (*sha256sum)(const unsigned char *input, size_t inputlen, + unsigned char *sha256sum, size_t sha256sumlen); ++ ++ void (*associate_connection)(struct Curl_easy *data, ++ struct connectdata *conn, ++ int sockindex); ++ void (*disassociate_connection)(struct Curl_easy *data, int sockindex); + }; + + #ifdef USE_SSL +@@ -283,6 +288,11 @@ bool Curl_ssl_cert_status_request(void); + + bool Curl_ssl_false_start(void); + ++void Curl_ssl_associate_conn(struct Curl_easy *data, ++ struct connectdata *conn); ++void Curl_ssl_detach_conn(struct Curl_easy *data, ++ struct connectdata *conn); ++ + #define SSL_SHUTDOWN_TIMEOUT 10000 /* ms */ + + #else /* if not USE_SSL */ +@@ -309,6 +319,8 @@ bool Curl_ssl_false_start(void); + #define Curl_ssl_cert_status_request() FALSE + #define Curl_ssl_false_start() FALSE + #define Curl_ssl_tls13_ciphersuites() FALSE ++#define Curl_ssl_associate_conn(a,b) Curl_nop_stmt ++#define Curl_ssl_detach_conn(a,b) Curl_nop_stmt + #endif + + #endif /* HEADER_CURL_VTLS_H */ +diff --git a/lib/vtls/wolfssl.c b/lib/vtls/wolfssl.c +index 02fcd236697e..60e27e366252 100644 +--- a/lib/vtls/wolfssl.c ++++ b/lib/vtls/wolfssl.c +@@ -1125,7 +1125,9 @@ const struct Curl_ssl Curl_ssl_wolfssl = { + Curl_none_set_engine_default, /* set_engine_default */ + Curl_none_engines_list, /* engines_list */ + Curl_none_false_start, /* false_start */ +- wolfssl_sha256sum /* sha256sum */ ++ wolfssl_sha256sum, /* sha256sum */ ++ NULL, /* associate_connection */ ++ NULL /* disassociate_connection */ + }; + + #endif diff --git a/pkgs/tools/networking/curl/default.nix b/pkgs/tools/networking/curl/default.nix index 05b91bfba05..984a6ecaaef 100644 --- a/pkgs/tools/networking/curl/default.nix +++ b/pkgs/tools/networking/curl/default.nix @@ -52,6 +52,12 @@ stdenv.mkDerivation rec { sha256 = "1scmfrp0c27pkd7yva9k50miprjpsyfbb33apx72qc9igm6ii3ks"; }; + patches = [ + ./CVE-2021-22897.patch + ./CVE-2021-22898.patch + ./CVE-2021-22901.patch + ]; + outputs = [ "bin" "dev" "out" "man" "devdoc" ]; separateDebugInfo = stdenv.isLinux; diff --git a/pkgs/tools/networking/dhcp/default.nix b/pkgs/tools/networking/dhcp/default.nix index 08b3543c5c0..5d71f9641fd 100644 --- a/pkgs/tools/networking/dhcp/default.nix +++ b/pkgs/tools/networking/dhcp/default.nix @@ -5,11 +5,11 @@ stdenv.mkDerivation rec { pname = "dhcp"; - version = "4.4.2"; + version = "4.4.2-P1"; src = fetchurl { url = "https://ftp.isc.org/isc/dhcp/${version}/${pname}-${version}.tar.gz"; - sha256 = "08a5003zdxgl41b29zjkxa92h2i40zyjgxg0npvnhpkfl5jcsz0s"; + sha256 = "06jsr0cg5rsmyibshrpcb9za0qgwvqccashdma7mlm1rflrh8pmh"; }; patches = diff --git a/pkgs/tools/networking/globalprotect-openconnect/default.nix b/pkgs/tools/networking/globalprotect-openconnect/default.nix new file mode 100644 index 00000000000..d61668f7b65 --- /dev/null +++ b/pkgs/tools/networking/globalprotect-openconnect/default.nix @@ -0,0 +1,43 @@ +{ stdenv, lib, fetchFromGitHub +, qmake, qtwebsockets, qtwebengine, wrapQtAppsHook, openconnect +}: + +stdenv.mkDerivation rec { + pname = "globalprotect-openconnect"; + version = "1.2.6"; + + src = fetchFromGitHub { + owner = "yuezk"; + repo = "GlobalProtect-openconnect"; + rev = "c14a6ad1d2b62f8d297bc4cfbcb1dcea4d99112f"; + fetchSubmodules = true; + sha256 = "1zkc3vk1j31n2zs5ammzv23dah7x163gfrzz222ynbkvsccrhzrk"; + }; + + nativeBuildInputs = [ qmake wrapQtAppsHook ]; + + buildInputs = [ openconnect qtwebsockets qtwebengine ]; + + patchPhase = '' + for f in GPClient/GPClient.pro \ + GPClient/com.yuezk.qt.gpclient.desktop \ + GPService/GPService.pro \ + GPService/dbus/com.yuezk.qt.GPService.service \ + GPService/systemd/gpservice.service; do + substituteInPlace $f \ + --replace /usr $out \ + --replace /etc $out/lib; + done; + + substituteInPlace GPService/gpservice.h \ + --replace /usr/local/bin/openconnect ${openconnect}/bin/openconnect; + ''; + + meta = with lib; { + description = "GlobalProtect VPN client (GUI) for Linux based on OpenConnect that supports SAML auth mode"; + homepage = "https://github.com/yuezk/GlobalProtect-openconnect"; + license = licenses.gpl3Only; + maintainers = [ maintainers.jerith666 ]; + platforms = platforms.linux; + }; +} diff --git a/pkgs/tools/networking/openconnect/default.nix b/pkgs/tools/networking/openconnect/default.nix index 8afe546c459..0e1da29320f 100644 --- a/pkgs/tools/networking/openconnect/default.nix +++ b/pkgs/tools/networking/openconnect/default.nix @@ -8,8 +8,8 @@ , libxml2 , stoken , zlib -, fetchgit -, darwin +, vpnc-scripts +, PCSC , head ? false , fetchFromGitLab , autoreconfHook @@ -17,13 +17,7 @@ assert (openssl != null) == (gnutls == null); -let vpnc = fetchgit { - url = "git://git.infradead.org/users/dwmw2/vpnc-scripts.git"; - rev = "c0122e891f7e033f35f047dad963702199d5cb9e"; - sha256 = "11b1ls012mb704jphqxjmqrfbbhkdjb64j2q4k8wb5jmja8jnd14"; -}; - -in stdenv.mkDerivation rec { +stdenv.mkDerivation rec { pname = "openconnect${lib.optionalString head "-head"}"; version = if head then "2021-05-05" else "8.10"; @@ -42,19 +36,19 @@ in stdenv.mkDerivation rec { outputs = [ "out" "dev" ]; configureFlags = [ - "--with-vpnc-script=${vpnc}/vpnc-script" + "--with-vpnc-script=${vpnc-scripts}/bin/vpnc-script" "--disable-nls" "--without-openssl-version-check" ]; buildInputs = [ openssl gnutls gmp libxml2 stoken zlib ] - ++ lib.optional stdenv.isDarwin darwin.apple_sdk.frameworks.PCSC; + ++ lib.optional stdenv.isDarwin PCSC; nativeBuildInputs = [ pkg-config ] ++ lib.optional head autoreconfHook; meta = with lib; { description = "VPN Client for Cisco's AnyConnect SSL VPN"; - homepage = "http://www.infradead.org/openconnect/"; + homepage = "https://www.infradead.org/openconnect/"; license = licenses.lgpl21Only; maintainers = with maintainers; [ pradeepchhetri tricktron ]; platforms = lib.platforms.linux ++ lib.platforms.darwin; diff --git a/pkgs/tools/networking/vpnc-scripts/default.nix b/pkgs/tools/networking/vpnc-scripts/default.nix new file mode 100644 index 00000000000..734c6d9f4ec --- /dev/null +++ b/pkgs/tools/networking/vpnc-scripts/default.nix @@ -0,0 +1,41 @@ +{ lib, stdenv, fetchgit +, makeWrapper +, nettools, gawk, systemd, openresolv, coreutils, gnugrep +}: + +stdenv.mkDerivation { + pname = "vpnc-scripts"; + version = "unstable-2021-03-21"; + src = fetchgit { + url = "git://git.infradead.org/users/dwmw2/vpnc-scripts.git"; + rev = "8fff06090ed193c4a7285e9a10b42e6679e8ecf3"; + sha256 = "14bzzpwz7kdmlbx825h6s4jjdml9q6ziyrq8311lp8caql68qdq1"; + }; + + nativeBuildInputs = [ makeWrapper ]; + + installPhase = '' + mkdir -p $out/bin + cp vpnc-script $out/bin + ''; + + preFixup = '' + substituteInPlace $out/bin/vpnc-script \ + --replace "which" "type -P" + '' + lib.optionalString stdenv.isLinux '' + substituteInPlace $out/bin/vpnc-script \ + --replace "/sbin/resolvconf" "${openresolv}/bin/resolvconf" \ + --replace "/usr/bin/resolvectl" "${systemd}/bin/resolvectl" + '' + '' + wrapProgram $out/bin/vpnc-script \ + --prefix PATH : "${lib.makeBinPath ([ nettools gawk coreutils gnugrep ] ++ lib.optionals stdenv.isLinux [ openresolv ])}" + ''; + + meta = with lib; { + description = "script for vpnc to configure the network routing and name service"; + homepage = "https://www.infradead.org/openconnect/"; + license = licenses.gpl2Only; + maintainers = with maintainers; [ jerith666 ]; + platforms = platforms.linux ++ platforms.darwin; + }; +} diff --git a/pkgs/tools/security/exploitdb/default.nix b/pkgs/tools/security/exploitdb/default.nix index 0e73ac2325e..d5d9138a15a 100644 --- a/pkgs/tools/security/exploitdb/default.nix +++ b/pkgs/tools/security/exploitdb/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "exploitdb"; - version = "2021-06-23"; + version = "2021-06-25"; src = fetchFromGitHub { owner = "offensive-security"; repo = pname; rev = version; - sha256 = "15gxxs5wjxvcjh5q9h17p163byzl33zg5yjlay1f1n2ng8nypygi"; + sha256 = "sha256-xaRk/H2jITtU+93+7KxrYTTl0cCObvqcd+F9NNhjMjo="; }; installPhase = '' diff --git a/pkgs/tools/security/gau/default.nix b/pkgs/tools/security/gau/default.nix index 46498e49cff..fec4e4e013b 100644 --- a/pkgs/tools/security/gau/default.nix +++ b/pkgs/tools/security/gau/default.nix @@ -5,16 +5,16 @@ buildGoModule rec { pname = "gau"; - version = "1.1.0"; + version = "1.2.0"; src = fetchFromGitHub { owner = "lc"; repo = pname; rev = "v${version}"; - sha256 = "1srbql603vvlxc6p1ibw0982icdq9kcr1iamxlr8bmgldbm8215w"; + sha256 = "sha256-hUIUDDP9NtMmJXj5GCD/ISUUcx5prKCVVFztff9txoU="; }; - vendorSha256 = "17ag2wvaxv2dyx3yx3fvlf36ww4a44660pn4gvpbrwacsan9as5s"; + vendorSha256 = "sha256-WMoFbqtBMcjTWX51mEMzpgDEAndCElldNqjG27yXd2w="; meta = with lib; { description = "Tool to fetch known URLs"; diff --git a/pkgs/tools/security/ghidra/default.nix b/pkgs/tools/security/ghidra/default.nix index 140ced9ff4b..835f607206f 100644 --- a/pkgs/tools/security/ghidra/default.nix +++ b/pkgs/tools/security/ghidra/default.nix @@ -24,12 +24,12 @@ let in stdenv.mkDerivation rec { pname = "ghidra"; - version = "9.2.3"; - versiondate = "20210325"; + version = "10.0"; + versiondate = "20210621"; src = fetchzip { - url = "https://www.ghidra-sre.org/ghidra_${version}_PUBLIC_${versiondate}.zip"; - sha256 = "sha256-/rQ3JeOR/D+HxzkJ+nV+pd/7V81+tCyTOndwpXI05hg="; + url = "https://github.com/NationalSecurityAgency/ghidra/releases/download/Ghidra_${version}_build/ghidra_${version}_PUBLIC_${versiondate}.zip"; + sha256 = "0m1ksng2fkmcg7m22lqil10qn95s06gxnxdz7ih9qpbx67pmmq9x"; }; nativeBuildInputs = [ diff --git a/pkgs/tools/security/gpg-tui/default.nix b/pkgs/tools/security/gpg-tui/default.nix index acef238c1fe..50a014374f1 100644 --- a/pkgs/tools/security/gpg-tui/default.nix +++ b/pkgs/tools/security/gpg-tui/default.nix @@ -9,16 +9,16 @@ rustPlatform.buildRustPackage rec { pname = "gpg-tui"; - version = "0.5.0"; + version = "0.6.0"; src = fetchFromGitHub { owner = "orhun"; repo = "gpg-tui"; rev = "v${version}"; - sha256 = "sha256-D3H1tJ+7ObNssrc/eMzYQPxeA8cOpGgRF/5VX2kfha0="; + sha256 = "sha256-aKMO/T7jojlQGdtOqsEqTtnSBkVjyFuXmPxvFjVYl4Y="; }; - cargoSha256 = "sha256-0NctI16ZsOAEkuCRQ45aOl4p2a3N6Nx88HwtbWht/UY="; + cargoSha256 = "sha256-hRpzW2kISPZ2lwun+nqTi8vIv+9j6r/0yI1TjtH+ltw="; nativeBuildInputs = [ gpgme # for gpgme-config diff --git a/pkgs/tools/security/rhash/default.nix b/pkgs/tools/security/rhash/default.nix index c602ec622cd..68bf35a751e 100644 --- a/pkgs/tools/security/rhash/default.nix +++ b/pkgs/tools/security/rhash/default.nix @@ -1,4 +1,6 @@ -{ lib, stdenv, fetchFromGitHub, which }: +{ lib, stdenv, fetchFromGitHub, which +, enableStatic ? stdenv.hostPlatform.isStatic +}: stdenv.mkDerivation rec { version = "1.4.1"; @@ -14,13 +16,20 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ which ]; # configure script is not autotools-based, doesn't support these options + dontAddStaticConfigureFlags = true; configurePlatforms = [ ]; + configureFlags = [ + "--ar=${stdenv.cc.targetPrefix}ar" + (lib.enableFeature enableStatic "static") + (lib.enableFeature enableStatic "lib-static") + ]; doCheck = true; checkTarget = "test-full"; - installTargets = [ "install" "install-lib-shared" "install-lib-so-link" "install-lib-headers" ]; + installTargets = [ "install" "install-lib-headers" ] + ++ lib.optional (!enableStatic) "install-lib-so-link"; meta = with lib; { homepage = "http://rhash.sourceforge.net/"; diff --git a/pkgs/tools/system/gptfdisk/default.nix b/pkgs/tools/system/gptfdisk/default.nix index bf6589eb66b..0e7aff32bf0 100644 --- a/pkgs/tools/system/gptfdisk/default.nix +++ b/pkgs/tools/system/gptfdisk/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "gptfdisk"; - version = "1.0.7"; + version = "1.0.8"; src = fetchurl { # https://www.rodsbooks.com/gdisk/${name}.tar.gz also works, but the home # page clearly implies a preference for using SourceForge's bandwidth: url = "mirror://sourceforge/gptfdisk/${pname}-${version}.tar.gz"; - sha256 = "sha256-dUAEt/hbJ5KHx6w8BGmx1+Dq4EOpei5YewVgyl84KMA="; + sha256 = "sha256-ldGYVvAE2rxLjDQrJhLo0KnuvdUgBClxiDafFS6dxt8="; }; postPatch = '' diff --git a/pkgs/tools/typesetting/asciidoc/default.nix b/pkgs/tools/typesetting/asciidoc/default.nix index 6716d764d5d..ce3b142fbc5 100644 --- a/pkgs/tools/typesetting/asciidoc/default.nix +++ b/pkgs/tools/typesetting/asciidoc/default.nix @@ -146,7 +146,7 @@ in stdenv.mkDerivation rec { pname = "asciidoc"; - version = "9.0.4"; + version = "9.1.0"; # Note: a substitution to improve reproducibility should be updated once 10.0.0 is # released. See the comment in `patchPhase` for more information. @@ -154,7 +154,7 @@ stdenv.mkDerivation rec { owner = "asciidoc"; repo = "asciidoc-py3"; rev = version; - sha256 = "1gspxw5i0axymxdjzj5rmhf10gyl2gqr666gz141nv042l9dm5vi"; + sha256 = "1clf1axkns23wfmh48xfspzsnw04pjh4mq1pshpzvj0cwxhz0yaq"; }; nativeBuildInputs = [ python3 unzip autoreconfHook ]; diff --git a/pkgs/tools/video/rav1e/default.nix b/pkgs/tools/video/rav1e/default.nix index 17c1b39a92c..53e139cde3b 100644 --- a/pkgs/tools/video/rav1e/default.nix +++ b/pkgs/tools/video/rav1e/default.nix @@ -1,6 +1,8 @@ -{ stdenv, rustPlatform, fetchurl, fetchFromGitHub, lib, nasm, cargo-c, libiconv }: +{ stdenv, rustPlatform, rust, fetchurl, fetchFromGitHub, lib, nasm, cargo-c, libiconv }: -rustPlatform.buildRustPackage rec { +let + rustTargetPlatformSpec = rust.toRustTargetSpec stdenv.hostPlatform; +in rustPlatform.buildRustPackage rec { pname = "rav1e"; version = "0.4.1"; @@ -31,11 +33,11 @@ rustPlatform.buildRustPackage rec { buildInputs = lib.optionals stdenv.isDarwin [ libiconv ]; postBuild = '' - cargo cbuild --release --frozen --prefix=${placeholder "out"} + cargo cbuild --release --frozen --prefix=${placeholder "out"} --target ${rustTargetPlatformSpec} ''; postInstall = '' - cargo cinstall --release --frozen --prefix=${placeholder "out"} + cargo cinstall --release --frozen --prefix=${placeholder "out"} --target ${rustTargetPlatformSpec} ''; meta = with lib; { diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 7cb7d00ea09..f24f626394e 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -9618,6 +9618,8 @@ in vpnc = callPackage ../tools/networking/vpnc { }; + vpnc-scripts = callPackage ../tools/networking/vpnc-scripts { }; + vpn-slice = python3Packages.callPackage ../tools/networking/vpn-slice { }; vp = callPackage ../applications/misc/vp { @@ -9630,18 +9632,23 @@ in openconnect = openconnect_gnutls; openconnect_openssl = callPackage ../tools/networking/openconnect { + inherit (darwin.apple_sdk.frameworks) PCSC; gnutls = null; }; openconnect_gnutls = callPackage ../tools/networking/openconnect { + inherit (darwin.apple_sdk.frameworks) PCSC; openssl = null; }; openconnect_head = callPackage ../tools/networking/openconnect { + inherit (darwin.apple_sdk.frameworks) PCSC; head = true; openssl = null; }; + globalprotect-openconnect = libsForQt5.callPackage ../tools/networking/globalprotect-openconnect { }; + ding-libs = callPackage ../tools/misc/ding-libs { }; sssd = callPackage ../os-specific/linux/sssd { @@ -11556,6 +11563,8 @@ in llvm_5 = llvmPackages_5.llvm; llvmPackages = let + latest_version = lib.toInt + (lib.versions.major llvmPackages_latest.llvm.version); # This returns the minimum supported version for the platform. The # assumption is that or any later version is good. choose = platform: @@ -11564,7 +11573,7 @@ in else if platform.isAndroid then 12 else if platform.isLinux then (if platform.isRiscV then 11 else 7) else if platform.isWasm then 8 - else 11; # latest + else latest_version; # We take the "max of the mins". Why? Since those are lower bounds of the # supported version set, this is like intersecting those sets and then # taking the min bound of that. @@ -11624,7 +11633,7 @@ in stdenv = gcc7Stdenv; })); - llvmPackages_latest = llvmPackages_11; + llvmPackages_latest = llvmPackages_12; llvmPackages_rocm = recurseIntoAttrs (callPackage ../development/compilers/llvm/rocm { }); @@ -24586,9 +24595,7 @@ in wbg = callPackage ../applications/misc/wbg { }; - hikari = callPackage ../applications/window-managers/hikari { - wlroots = wlroots_0_13; - }; + hikari = callPackage ../applications/window-managers/hikari { }; i3 = callPackage ../applications/window-managers/i3 { xcb-util-cursor = if stdenv.isDarwin then xcb-util-cursor-HEAD else xcb-util-cursor; diff --git a/pkgs/top-level/ocaml-packages.nix b/pkgs/top-level/ocaml-packages.nix index efe1808b922..e040cef1575 100644 --- a/pkgs/top-level/ocaml-packages.nix +++ b/pkgs/top-level/ocaml-packages.nix @@ -611,7 +611,7 @@ let }; lwt = callPackage ../development/ocaml-modules/lwt { - ocaml-migrate-parsetree = ocaml-migrate-parsetree-2-1; + ocaml-migrate-parsetree = ocaml-migrate-parsetree-2; }; ocaml_lwt = lwt; @@ -847,12 +847,12 @@ let ocaml-migrate-parsetree-1-8 = callPackage ../development/ocaml-modules/ocaml-migrate-parsetree/1.8.x.nix { }; - ocaml-migrate-parsetree-2-1 = callPackage ../development/ocaml-modules/ocaml-migrate-parsetree/2.1.x.nix { }; + ocaml-migrate-parsetree-2 = callPackage ../development/ocaml-modules/ocaml-migrate-parsetree/2.x.nix { }; ocamlmod = callPackage ../development/tools/ocaml/ocamlmod { }; ocaml-monadic = callPackage ../development/ocaml-modules/ocaml-monadic { - ocaml-migrate-parsetree = ocaml-migrate-parsetree-2-1; + ocaml-migrate-parsetree = ocaml-migrate-parsetree-2; }; ocaml_mysql = callPackage ../development/ocaml-modules/mysql { }; diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 36efc12582c..5ec39ab41f0 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -8092,7 +8092,7 @@ let sha256 = "0wm87gpagb35d7c4nyaf9z3ry0jb3g5xpyjfzcxqcfxyj2zy9ip2"; }; doCheck = false; # Failed test 'desktop file is the right one' - buildInputs = [ FileBaseDir FileDesktopEntry ]; + buildInputs = [ FileBaseDir FileDesktopEntry EncodeLocale ]; }; FileMMagic = buildPerlPackage { diff --git a/pkgs/top-level/php-packages.nix b/pkgs/top-level/php-packages.nix index 5575c1d429c..744e40c95dd 100644 --- a/pkgs/top-level/php-packages.nix +++ b/pkgs/top-level/php-packages.nix @@ -364,7 +364,7 @@ lib.makeScope pkgs.newScope (self: with self; { # oci8 (7.4, 7.3, 7.2) # odbc (7.4, 7.3, 7.2) { name = "opcache"; - buildInputs = [ pcre2 ] ++ lib.optionals (!stdenv.isDarwin && lib.versionAtLeast php.version "8.0") [ + buildInputs = [ pcre2 ] ++ lib.optionals (lib.versionAtLeast php.version "8.0" && !stdenv.isDarwin && lib.meta.availableOn stdenv.hostPlatform valgrind) [ valgrind.dev ]; patches = lib.optionals (lib.versionOlder php.version "7.4") [ diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 8a12c1556ab..723751e7877 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -1909,6 +1909,8 @@ in { dictionaries = callPackage ../development/python-modules/dictionaries { }; + dictpath = callPackage ../development/python-modules/dictpath { }; + dicttoxml = callPackage ../development/python-modules/dicttoxml { }; diff_cover = callPackage ../development/python-modules/diff_cover { }; @@ -3498,6 +3500,8 @@ in { injector = callPackage ../development/python-modules/injector { }; + inkex = callPackage ../development/python-modules/inkex { }; + inotify-simple = callPackage ../development/python-modules/inotify-simple { }; inquirer = callPackage ../development/python-modules/inquirer { }; @@ -3882,6 +3886,8 @@ in { korean-lunar-calendar = callPackage ../development/python-modules/korean-lunar-calendar { }; + krakenex = callPackage ../development/python-modules/krakenex { }; + kubernetes = callPackage ../development/python-modules/kubernetes { }; labelbox = callPackage ../development/python-modules/labelbox { }; @@ -4221,15 +4227,7 @@ in { macropy = callPackage ../development/python-modules/macropy { }; - maestral = callPackage ../development/python-modules/maestral { - keyring = self.keyring.overridePythonAttrs (old: rec { - version = "22.0.1"; - src = old.src.override { - inherit version; - sha256 = "sha256-mss+FFLtu3VEgisS/SVFkHh2nlYPpR9Bi20Ar6pheN8="; - }; - }); - }; + maestral = callPackage ../development/python-modules/maestral { }; magic = callPackage ../development/python-modules/magic { }; @@ -4318,6 +4316,8 @@ in { inherit (pkgs.darwin.apple_sdk.frameworks) Cocoa; }; + matplotlib-inline = callPackage ../development/python-modules/matplotlib-inline { }; + matrix-api-async = callPackage ../development/python-modules/matrix-api-async { }; matrix-client = callPackage ../development/python-modules/matrix-client { }; @@ -4416,6 +4416,8 @@ in { millheater = callPackage ../development/python-modules/millheater { }; + miniaudio = callPackage ../development/python-modules/miniaudio { }; + minidb = callPackage ../development/python-modules/minidb { }; minidump = callPackage ../development/python-modules/minidump { }; @@ -5213,6 +5215,8 @@ in { phonenumbers = callPackage ../development/python-modules/phonenumbers { }; + openapi-core = callPackage ../development/python-modules/openapi-core { }; + pdunehd = callPackage ../development/python-modules/pdunehd { }; phonopy = callPackage ../development/python-modules/phonopy { }; @@ -5309,6 +5313,8 @@ in { pyisy = callPackage ../development/python-modules/pyisy { }; + pykrakenapi = callPackage ../development/python-modules/pykrakenapi { }; + pynndescent = callPackage ../development/python-modules/pynndescent { }; pynobo = callPackage ../development/python-modules/pynobo { }; @@ -5325,6 +5331,8 @@ in { pyshark = callPackage ../development/python-modules/pyshark { }; + pysiaalarm = callPackage ../development/python-modules/pysiaalarm { }; + pytest-subprocess = callPackage ../development/python-modules/pytest-subprocess { }; python-codon-tables = callPackage ../development/python-modules/python-codon-tables { }; @@ -8831,6 +8839,8 @@ in { upass = callPackage ../development/python-modules/upass { }; + upb-lib = callPackage ../development/python-modules/upb-lib { }; + update_checker = callPackage ../development/python-modules/update_checker { }; update-copyright = callPackage ../development/python-modules/update-copyright { }; @@ -8933,6 +8943,8 @@ in { viewstate = callPackage ../development/python-modules/viewstate { }; + vilfo-api-client = callPackage ../development/python-modules/vilfo-api-client { }; + vincenty = callPackage ../development/python-modules/vincenty { }; vine = callPackage ../development/python-modules/vine { }; diff --git a/pkgs/top-level/python2-packages.nix b/pkgs/top-level/python2-packages.nix index e9ac9fbfeb2..32d9872b51a 100644 --- a/pkgs/top-level/python2-packages.nix +++ b/pkgs/top-level/python2-packages.nix @@ -56,6 +56,8 @@ with self; with super; { cliapp = callPackage ../development/python-modules/cliapp { }; + click = callPackage ../development/python-modules/click/7.nix { }; + closure-linter = callPackage ../development/python-modules/closure-linter { }; cmdtest = callPackage ../development/python-modules/cmdtest { }; @@ -98,6 +100,8 @@ with self; with super; { feedparser = callPackage ../development/python-modules/feedparser/5.nix { }; + flask = callPackage ../development/python-modules/flask/1.nix { }; + flask_ldap_login = callPackage ../development/python-modules/flask-ldap-login { }; flit = disabled super.flit; @@ -188,10 +192,14 @@ with self; with super; { isort = callPackage ../development/python-modules/isort/4.nix { }; + itsdangerous = callPackage ../development/python-modules/itsdangerous/1.nix { }; + jaraco_functools = callPackage ../development/python-modules/jaraco_functools/2.nix { }; jaraco_stream = callPackage ../development/python-modules/jaraco_stream/2.nix { }; + jinja2 = callPackage ../development/python-modules/jinja2/2.nix { }; + jsonrpclib = callPackage ../development/python-modules/jsonrpclib { }; jupyter_client = callPackage ../development/python-modules/jupyter_client/5.nix { }; @@ -256,6 +264,8 @@ with self; with super; { markdown = callPackage ../development/python-modules/markdown/3_1.nix { }; + markupsafe = callPackage ../development/python-modules/markupsafe/1.nix { }; + matplotlib = callPackage ../development/python-modules/matplotlib/2.nix { stdenv = if stdenv.isDarwin then pkgs.clangStdenv else pkgs.stdenv; inherit (pkgs.darwin.apple_sdk.frameworks) Cocoa; @@ -512,6 +522,9 @@ with self; with super; { ruamel-ordereddict = self.ruamel_ordereddict; ruamel_ordereddict = callPackage ../development/python-modules/ruamel_ordereddict { }; + ruamel_yaml = self.ruamel-yaml; + ruamel-yaml = callPackage ../development/python-modules/ruamel_yaml/0.16.nix { }; + runsnakerun = callPackage ../development/python-modules/runsnakerun { }; rpm = disabled super.rpm; @@ -626,6 +639,8 @@ with self; with super; { wptserve = callPackage ../development/python-modules/wptserve { }; + werkzeug = callPackage ../development/python-modules/werkzeug/1.nix { }; + WSGIProxy = callPackage ../development/python-modules/wsgiproxy { }; wxPython30 = callPackage ../development/python-modules/wxPython/3.0.nix { diff --git a/pkgs/top-level/static.nix b/pkgs/top-level/static.nix index 32559c0e799..0c9af250e87 100644 --- a/pkgs/top-level/static.nix +++ b/pkgs/top-level/static.nix @@ -50,14 +50,10 @@ self: super: let # ++ optional (super.stdenv.hostPlatform.libc == "glibc") ((flip overrideInStdenv) [ self.stdenv.glibc.static ]) ; - removeUnknownConfigureFlags = f: with self.lib; - remove "--disable-shared" - (remove "--enable-static" f); - ocamlFixPackage = b: b.overrideAttrs (o: { configurePlatforms = [ ]; - configureFlags = removeUnknownConfigureFlags (o.configureFlags or [ ]); + dontAddStaticConfigureFlags = true; buildInputs = o.buildInputs ++ o.nativeBuildInputs or [ ]; propagatedNativeBuildInputs = o.propagatedBuildInputs or [ ]; }); @@ -75,7 +71,8 @@ self: super: let preConfigure = '' configureFlagsArray+=("-cc" "$CC" "-as" "$AS" "-partialld" "$LD -r") ''; - configureFlags = (removeUnknownConfigureFlags o.configureFlags) ++ [ + dontAddStaticConfigureFlags = true; + configureFlags = [ "--no-shared-libs" "-host ${o.stdenv.hostPlatform.config}" "-target ${o.stdenv.targetPlatform.config}" @@ -124,11 +121,6 @@ in { if set ? overrideScope' then set.overrideScope' ocamlStaticAdapter else set ) super.ocaml-ng; - openssl = super.openssl_1_1.overrideAttrs (o: { - # OpenSSL doesn't like the `--enable-static` / `--disable-shared` flags. - configureFlags = (removeUnknownConfigureFlags o.configureFlags); - }); - perl = super.perl.override { # Don’t use new stdenv zlib because # it doesn’t like the --disable-shared flag |