diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index 35eb360c9211..acbd83369c52 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -12540,4 +12540,11 @@ github = "rski"; githubId = 2960312; }; + mbprtpmnr = { + name = "mbprtpmnr"; + email = "mbprtpmnr@pm.me"; + github = "mbprtpmnr"; + githubId = 88109321; + }; + } diff --git a/nixos/doc/manual/from_md/release-notes/rl-2111.section.xml b/nixos/doc/manual/from_md/release-notes/rl-2111.section.xml index 3c60226b224d..75513ed7e733 100644 --- a/nixos/doc/manual/from_md/release-notes/rl-2111.section.xml +++ b/nixos/doc/manual/from_md/release-notes/rl-2111.section.xml @@ -1240,6 +1240,19 @@ Superuser created successfully. directories, thus increasing the purity of the build. + + + Three new options, + xdg.mime.addedAssociations, + xdg.mime.defaultApplications, + and + xdg.mime.removedAssociations + have been added to the + xdg.mime module to + allow the configuration of + /etc/xdg/mimeapps.list. + + diff --git a/nixos/doc/manual/release-notes/rl-2111.section.md b/nixos/doc/manual/release-notes/rl-2111.section.md index 256c15fb4988..a55fbbe2afdb 100644 --- a/nixos/doc/manual/release-notes/rl-2111.section.md +++ b/nixos/doc/manual/release-notes/rl-2111.section.md @@ -367,3 +367,5 @@ To be able to access the web UI this port needs to be opened in the firewall. - `lua` and `luajit` interpreters have been patched to avoid looking into /usr/lib directories, thus increasing the purity of the build. + +- Three new options, [xdg.mime.addedAssociations](#opt-xdg.mime.addedAssociations), [xdg.mime.defaultApplications](#opt-xdg.mime.defaultApplications), and [xdg.mime.removedAssociations](#opt-xdg.mime.removedAssociations) have been added to the [xdg.mime](#opt-xdg.mime.enable) module to allow the configuration of `/etc/xdg/mimeapps.list`. diff --git a/nixos/modules/config/xdg/mime.nix b/nixos/modules/config/xdg/mime.nix index 4cdb3f30994b..9b6dd4cab5f5 100644 --- a/nixos/modules/config/xdg/mime.nix +++ b/nixos/modules/config/xdg/mime.nix @@ -1,9 +1,17 @@ { config, lib, pkgs, ... }: with lib; + +let + cfg = config.xdg.mime; + associationOptions = with types; attrsOf ( + coercedTo (either (listOf str) str) (x: concatStringsSep ";" (toList x)) str + ); +in + { meta = { - maintainers = teams.freedesktop.members; + maintainers = teams.freedesktop.members ++ (with maintainers; [ figsoda ]); }; options = { @@ -16,9 +24,63 @@ with lib; XDG MIME Applications specification. ''; }; + + xdg.mime.addedAssociations = mkOption { + type = associationOptions; + default = {}; + example = { + "application/pdf" = "firefox.desktop"; + "text/xml" = [ "nvim.desktop" "codium.desktop" ]; + }; + description = '' + Adds associations between mimetypes and applications. See the + + specifications for more information. + ''; + }; + + xdg.mime.defaultApplications = mkOption { + type = associationOptions; + default = {}; + example = { + "application/pdf" = "firefox.desktop"; + "image/png" = [ "sxiv.desktop" "gimp.desktop" ]; + }; + description = '' + Sets the default applications for given mimetypes. See the + + specifications for more information. + ''; + }; + + xdg.mime.removedAssociations = mkOption { + type = associationOptions; + default = {}; + example = { + "audio/mp3" = [ "mpv.desktop" "umpv.desktop" ]; + "inode/directory" = "codium.desktop"; + }; + description = '' + Removes associations between mimetypes and applications. See the + + specifications for more information. + ''; + }; }; - config = mkIf config.xdg.mime.enable { + config = mkIf cfg.enable { + environment.etc."xdg/mimeapps.list" = mkIf ( + cfg.addedAssociations != {} + || cfg.defaultApplications != {} + || cfg.removedAssociations != {} + ) { + text = generators.toINI { } { + "Added Associations" = cfg.addedAssociations; + "Default Applications" = cfg.defaultApplications; + "Removed Associations" = cfg.removedAssociations; + }; + }; + environment.pathsToLink = [ "/share/mime" ]; environment.systemPackages = [ diff --git a/nixos/modules/services/networking/pleroma.xml b/nixos/modules/services/networking/pleroma.xml index 9ab0be3d947c..ad0a481af28b 100644 --- a/nixos/modules/services/networking/pleroma.xml +++ b/nixos/modules/services/networking/pleroma.xml @@ -4,129 +4,185 @@ version="5.0" xml:id="module-services-pleroma"> Pleroma - Pleroma is a lightweight activity pub server. -
- Quick Start - To get quickly started, you can use this sample NixOS configuration and adapt it to your use case. - - { - security.acme = { - email = "root@tld"; - acceptTerms = true; - certs = { - "social.tld.com" = { - webroot = "/var/www/social.tld.com"; - email = "root@tld"; - group = "nginx"; - }; - }; - }; - services = { - pleroma = { - enable = true; - secretConfigFile = "/var/lib/pleroma/secrets.exs"; - configs = [ - '' - import Config + + Pleroma is a lightweight activity pub server. +
+ Generating the Pleroma config + The pleroma_ctl CLI utility will prompt you some questions and it will generate an initial config file. This is an example of usage + +$ mkdir tmp-pleroma +$ cd tmp-pleroma +$ nix-shell -p pleroma-otp +$ pleroma_ctl instance gen --output config.exs --output-psql setup.psql + + + The config.exs file can be further customized following the instructions on the upstream documentation. Many refinements can be applied also after the service is running. +
+
+ Initializing the database + First, the Postgresql service must be enabled in the NixOS configuration + +services.postgresql = { + enable = true; + package = pkgs.postgresql_13; +}; + +and activated with the usual + +$ nixos-rebuild switch + + + Then you can create and seed the database, using the setup.psql file that you generated in the previous section, by running + +$ sudo -u postgres psql -f setup.psql + + +
+
+ Enabling the Pleroma service locally + In this section we will enable the Pleroma service only locally, so its configurations can be improved incrementally. + This is an example of configuration, where services.pleroma.configs option contains the content of the file config.exs, generated in the first section, but with the secrets (database password, endpoint secret key, salts, etc.) removed. Removing secrets is important, because otherwise they will be stored publicly in the Nix store. + +services.pleroma = { + enable = true; + secretConfigFile = "/var/lib/pleroma/secrets.exs"; + configs = [ + '' + import Config - config :pleroma, Pleroma.Web.Endpoint, - url: [host: "social.tld.com", scheme: "https", port: 443], - http: [ip: {127, 0, 0, 1}, port: 4000] + config :pleroma, Pleroma.Web.Endpoint, + url: [host: "pleroma.example.net", scheme: "https", port: 443], + http: [ip: {127, 0, 0, 1}, port: 4000] - config :pleroma, :instance, - name: "NixOS test pleroma server", - email: "pleroma@social.tld.com", - notify_email: "pleroma@social.tld.com", - limit: 5000, - registrations_open: true + config :pleroma, :instance, + name: "Test", + email: "admin@example.net", + notify_email: "admin@example.net", + limit: 5000, + registrations_open: true - config :pleroma, :media_proxy, - enabled: false, - redirect_on_failure: true - #base_url: "https://cache.pleroma.social" + config :pleroma, :media_proxy, + enabled: false, + redirect_on_failure: true - config :pleroma, Pleroma.Repo, - adapter: Ecto.Adapters.Postgres, - username: "pleroma", - password: "${test-db-passwd}", - database: "pleroma", - hostname: "localhost", - pool_size: 10, - prepare: :named, - parameters: [ - plan_cache_mode: "force_custom_plan" - ] + config :pleroma, Pleroma.Repo, + adapter: Ecto.Adapters.Postgres, + username: "pleroma", + database: "pleroma", + hostname: "localhost" - config :pleroma, :database, rum_enabled: false - config :pleroma, :instance, static_dir: "/var/lib/pleroma/static" - config :pleroma, Pleroma.Uploaders.Local, uploads: "/var/lib/pleroma/uploads" - config :pleroma, configurable_from_database: false - '' - ]; - }; - postgresql = { - enable = true; - package = pkgs.postgresql_12; - }; - nginx = { - enable = true; - addSSL = true; - sslCertificate = "/var/lib/acme/social.tld.com/fullchain.pem"; - sslCertificateKey = "/var/lib/acme/social.tld.com/key.pem"; - root = "/var/www/social.tld.com"; - # ACME endpoint - locations."/.well-known/acme-challenge" = { - root = "/var/www/social.tld.com/"; - }; - virtualHosts."social.tld.com" = { - addSSL = true; - locations."/" = { - proxyPass = "http://127.0.0.1:4000"; - extraConfig = '' - add_header 'Access-Control-Allow-Origin' '*' always; - add_header 'Access-Control-Allow-Methods' 'POST, PUT, DELETE, GET, PATCH, OPTIONS' always; - add_header 'Access-Control-Allow-Headers' 'Authorization, Content-Type, Idempotency-Key' always; - add_header 'Access-Control-Expose-Headers' 'Link, X-RateLimit-Reset, X-RateLimit-Limit, X-RateLimit-Remaining, X-Request-Id' always; - if ($request_method = OPTIONS) { - return 204; - } - add_header X-XSS-Protection "1; mode=block"; - add_header X-Permitted-Cross-Domain-Policies none; - add_header X-Frame-Options DENY; - add_header X-Content-Type-Options nosniff; - add_header Referrer-Policy same-origin; - add_header X-Download-Options noopen; - proxy_http_version 1.1; - proxy_set_header Upgrade $http_upgrade; - proxy_set_header Connection "upgrade"; - proxy_set_header Host $host; - client_max_body_size 16m; - ''; - }; - }; - }; + # Configure web push notifications + config :web_push_encryption, :vapid_details, + subject: "mailto:admin@example.net" + + # ... TO CONTINUE ... + '' + ]; +}; + + + Secrets must be moved into a file pointed by services.pleroma.secretConfigFile, in our case /var/lib/pleroma/secrets.exs. This file can be created copying the previously generated config.exs file and then removing all the settings, except the secrets. This is an example + +# Pleroma instance passwords + +import Config + +config :pleroma, Pleroma.Web.Endpoint, + secret_key_base: "<the secret generated by pleroma_ctl>", + signing_salt: "<the secret generated by pleroma_ctl>" + +config :pleroma, Pleroma.Repo, + password: "<the secret generated by pleroma_ctl>" + +# Configure web push notifications +config :web_push_encryption, :vapid_details, + public_key: "<the secret generated by pleroma_ctl>", + private_key: "<the secret generated by pleroma_ctl>" + +# ... TO CONTINUE ... + + Note that the lines of the same configuration group are comma separated (i.e. all the lines end with a comma, except the last one), so when the lines with passwords are added or removed, commas must be adjusted accordingly. + + The service can be enabled with the usual + +$ nixos-rebuild switch + + + The service is accessible only from the local 127.0.0.1:4000 port. It can be tested using a port forwarding like this + +$ ssh -L 4000:localhost:4000 myuser@example.net + +and then accessing http://localhost:4000 from a web browser. +
+
+ Creating the admin user + After Pleroma service is running, all Pleroma administration utilities can be used. In particular an admin user can be created with + +$ pleroma_ctl user new <nickname> <email> --admin --moderator --password <password> + + +
+
+ Configuring Nginx + In this configuration, Pleroma is listening only on the local port 4000. Nginx can be configured as a Reverse Proxy, for forwarding requests from public ports to the Pleroma service. This is an example of configuration, using +Let's Encrypt for the TLS certificates + +security.acme = { + email = "root@example.net"; + acceptTerms = true; +}; + +services.nginx = { + enable = true; + addSSL = true; + + recommendedTlsSettings = true; + recommendedOptimisation = true; + recommendedGzipSettings = true; + + recommendedProxySettings = false; + # NOTE: if enabled, the NixOS proxy optimizations will override the Pleroma + # specific settings, and they will enter in conflict. + + virtualHosts = { + "pleroma.example.net" = { + http2 = true; + enableACME = true; + forceSSL = true; + + locations."/" = { + proxyPass = "http://127.0.0.1:4000"; + + extraConfig = '' + etag on; + gzip on; + + add_header 'Access-Control-Allow-Origin' '*' always; + add_header 'Access-Control-Allow-Methods' 'POST, PUT, DELETE, GET, PATCH, OPTIONS' always; + add_header 'Access-Control-Allow-Headers' 'Authorization, Content-Type, Idempotency-Key' always; + add_header 'Access-Control-Expose-Headers' 'Link, X-RateLimit-Reset, X-RateLimit-Limit, X-RateLimit-Remaining, X-Request-Id' always; + if ($request_method = OPTIONS) { + return 204; + } + add_header X-XSS-Protection "1; mode=block"; + add_header X-Permitted-Cross-Domain-Policies none; + add_header X-Frame-Options DENY; + add_header X-Content-Type-Options nosniff; + add_header Referrer-Policy same-origin; + add_header X-Download-Options noopen; + proxy_http_version 1.1; + proxy_set_header Upgrade $http_upgrade; + proxy_set_header Connection "upgrade"; + proxy_set_header Host $host; + + client_max_body_size 16m; + # NOTE: increase if users need to upload very big files + ''; }; }; - - Note that you'll need to seed your database and upload your pleroma secrets to the path pointed by config.pleroma.secretConfigFile. You can find more informations about how to do that in the next section. -
-
- Generating the Pleroma Config and Seed the Database - - Before using this service, you'll need to generate your -server configuration and its associated database seed. The -pleroma_ctl CLI utility can help you with that. You -can start with pleroma_ctl instance gen --output config.exs ---output-psql setup.psql, this will prompt you some -questions and will generate both your config file and database initial -migration. -For more details about this configuration format, please have a look at the upstream documentation. -To seed your database, you can use the setup.psql file you just generated by running - - sudo -u postgres psql -f setup.psql - - In regard of the pleroma service configuration you also just generated, you'll need to split it in two parts. The "public" part, which do not contain any secrets and thus can be safely stored in the Nix store and its "private" counterpart containing some secrets (database password, endpoint secret key, salts, etc.). - - The public part will live in your NixOS machine configuration in the services.pleroma.configs option. However, it's up to you to upload the secret pleroma configuration to the path pointed by services.pleroma.secretConfigFile. You can do that manually or rely on a third party tool such as Morph or NixOps. + }; +}; + +
diff --git a/pkgs/applications/accessibility/squeekboard/default.nix b/pkgs/applications/accessibility/squeekboard/default.nix index cca36c38e771..18bcb04c65c9 100644 --- a/pkgs/applications/accessibility/squeekboard/default.nix +++ b/pkgs/applications/accessibility/squeekboard/default.nix @@ -14,6 +14,7 @@ , rustPlatform , feedbackd , wrapGAppsHook +, fetchpatch }: stdenv.mkDerivation rec { @@ -37,6 +38,15 @@ stdenv.mkDerivation rec { sha256 = "0148ynzmapxfrlccikf20ikmi0ssbkn9fl5wi6nh6azflv50pzzn"; }; + patches = [ + # remove when updating from 1.14.0 + (fetchpatch { + name = "fix-rust-1.54-build.patch"; + url = "https://gitlab.gnome.org/World/Phosh/squeekboard/-/commit/9cd56185c59ace535a6af26384ef6beca4423816.patch"; + sha256 = "sha256-8rWcfhQmGiwlc2lpkRvJ95XQp1Xg7St+0K85x8nQ0mk="; + }) + ]; + nativeBuildInputs = [ meson ninja diff --git a/pkgs/applications/audio/pt2-clone/default.nix b/pkgs/applications/audio/pt2-clone/default.nix index c713c2ca52e1..6abc120379d6 100644 --- a/pkgs/applications/audio/pt2-clone/default.nix +++ b/pkgs/applications/audio/pt2-clone/default.nix @@ -8,13 +8,13 @@ stdenv.mkDerivation rec { pname = "pt2-clone"; - version = "1.33"; + version = "1.34"; src = fetchFromGitHub { owner = "8bitbubsy"; repo = "pt2-clone"; rev = "v${version}"; - sha256 = "sha256-XPQRFbIgSU3oCTbLe4gYkMNBvcLZdJvU/YQHtUvgt9k="; + sha256 = "sha256-JT3I06qm3oljsySIgK5xP2RC3KAb5QBrNVdip0ds4KE="; }; nativeBuildInputs = [ cmake ]; diff --git a/pkgs/applications/graphics/darktable/default.nix b/pkgs/applications/graphics/darktable/default.nix index 540a74e6524f..50e26677377f 100644 --- a/pkgs/applications/graphics/darktable/default.nix +++ b/pkgs/applications/graphics/darktable/default.nix @@ -7,12 +7,12 @@ }: stdenv.mkDerivation rec { - version = "3.6.0"; + version = "3.6.1"; pname = "darktable"; src = fetchurl { url = "https://github.com/darktable-org/darktable/releases/download/release-${version}/darktable-${version}.tar.xz"; - sha256 = "sha256:0f8aqwkgw4gs97b5i4ygiqk5zilwq7ax7zwdd31r72zk98cd1g46"; + sha256 = "sha256-or/HwQO4JJRUV6m/7Z5S8Af6HQMPnbyz/wMnhRvkLRQ="; }; nativeBuildInputs = [ cmake ninja llvm pkg-config intltool perl desktop-file-utils wrapGAppsHook ]; diff --git a/pkgs/applications/misc/bleachbit/default.nix b/pkgs/applications/misc/bleachbit/default.nix index 4b78cda35648..d40a57323a13 100644 --- a/pkgs/applications/misc/bleachbit/default.nix +++ b/pkgs/applications/misc/bleachbit/default.nix @@ -12,13 +12,13 @@ python3Packages.buildPythonApplication rec { pname = "bleachbit"; - version = "4.0.0"; + version = "4.4.0"; format = "other"; src = fetchurl { url = "mirror://sourceforge/${pname}/${pname}-${version}.tar.bz2"; - sha256 = "1dn3h6lr9ldbfpvgq9sdlk972sxhwalgj2f377qbqibm3yfxzpil"; + sha256 = "0kqqfzq6bh03n7kxb9vd483bqi1cklfvj35a7h4iqk96sq1xv8z6"; }; nativeBuildInputs = [ @@ -44,6 +44,7 @@ python3Packages.buildPythonApplication rec { postPatch = '' find -type f -exec sed -i -e 's@/usr/share@${placeholder "out"}/share@g' {} \; find -type f -exec sed -i -e 's@/usr/bin@${placeholder "out"}/bin@g' {} \; + find -type f -exec sed -i -e 's@${placeholder "out"}/bin/python3@${python3Packages.python}/bin/python3@' {} \; ''; dontBuild = true; @@ -52,7 +53,7 @@ python3Packages.buildPythonApplication rec { "prefix=${placeholder "out"}" ]; - # prevent double wrapping from wrapGApps and wrapPythonProgram + # Prevent double wrapping from wrapGApps and wrapPythonProgram dontWrapGApps = true; makeWrapperArgs = [ "\${gappsWrapperArgs[@]}" @@ -65,6 +66,6 @@ python3Packages.buildPythonApplication rec { description = "A program to clean your computer"; longDescription = "BleachBit helps you easily clean your computer to free space and maintain privacy."; license = licenses.gpl3; - maintainers = with maintainers; [ leonardoce ]; + maintainers = with maintainers; [ leonardoce mbprtpmnr ]; }; } diff --git a/pkgs/applications/misc/moolticute/default.nix b/pkgs/applications/misc/moolticute/default.nix index bd6173a0c525..653e8e9a1cc4 100644 --- a/pkgs/applications/misc/moolticute/default.nix +++ b/pkgs/applications/misc/moolticute/default.nix @@ -9,13 +9,13 @@ mkDerivation rec { pname = "moolticute"; - version = "0.50.0"; + version = "0.52.0"; src = fetchFromGitHub { owner = "mooltipass"; repo = pname; rev = "v${version}"; - sha256 = "sha256-/luba+qYRATP3EjNMB+GIRP6JQOlADsvpF8PzRFqFlM="; + sha256 = "sha256-6o0Tf6qBxCEOvfSuEP2Qz72T9Oexp95knRCtwImlpsA="; }; outputs = [ "out" "udev" ]; diff --git a/pkgs/applications/misc/pueue/default.nix b/pkgs/applications/misc/pueue/default.nix index 31879d376f9c..ac79f5be8460 100644 --- a/pkgs/applications/misc/pueue/default.nix +++ b/pkgs/applications/misc/pueue/default.nix @@ -2,16 +2,16 @@ rustPlatform.buildRustPackage rec { pname = "pueue"; - version = "1.0.2"; + version = "1.0.3"; src = fetchFromGitHub { owner = "Nukesor"; repo = pname; rev = "v${version}"; - sha256 = "sha256-rU+/fW7yF71MG5kEqjeJDC3uSBzCy0aUH5aVRpImYE8="; + sha256 = "sha256-1iAXLs3O7EV7LfbXnajlDm75tQtanFInfNWZmnittlk="; }; - cargoSha256 = "sha256-cmtxVNkYyrkrVXWb7xoJUByl7k1+uYRRVXI8jIHCC7Y="; + cargoSha256 = "sha256-x/qRNxZS++DBq5B9+/9eXN95QZN/FSLi+3XyJ06Y1hg="; nativeBuildInputs = [ installShellFiles ]; diff --git a/pkgs/applications/networking/cluster/octant/plugins/starboard-octant-plugin.nix b/pkgs/applications/networking/cluster/octant/plugins/starboard-octant-plugin.nix index 9679f5bd2e03..4d3662ea8750 100644 --- a/pkgs/applications/networking/cluster/octant/plugins/starboard-octant-plugin.nix +++ b/pkgs/applications/networking/cluster/octant/plugins/starboard-octant-plugin.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "starboard-octant-plugin"; - version = "0.11.0"; + version = "0.12.0"; src = fetchFromGitHub { owner = "aquasecurity"; repo = pname; rev = "v${version}"; - sha256 = "sha256-XHc/1rqTEVOjCm0kFniUmmjVeRsr9Npt0OpQ6Oy7Rxo="; + sha256 = "sha256-JTSZtIRVFdUjhQsp2EMukeoVIo6nNx4xofq+3iOZUIk="; }; - vendorSha256 = "sha256-EM0lPwwWJuLD+aqZWshz1ILaeEtUU4wJ0Puwv1Ikgf4="; + vendorSha256 = "sha256-1zrB+CobUBgdpBHRJPpfDYCD6oVWY4j4Met9EqNQQbE="; ldflags = [ "-s" "-w" diff --git a/pkgs/applications/networking/cluster/starboard/default.nix b/pkgs/applications/networking/cluster/starboard/default.nix index 066b70e8e254..6c22203eaaf1 100644 --- a/pkgs/applications/networking/cluster/starboard/default.nix +++ b/pkgs/applications/networking/cluster/starboard/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "starboard"; - version = "0.11.0"; + version = "0.12.0"; src = fetchFromGitHub { owner = "aquasecurity"; repo = pname; rev = "v${version}"; - sha256 = "sha256-NV37K5JUfGPK8TwCi/4XY7MQUvp76vzdxsHUNPlYpYk="; + sha256 = "sha256-6QIQsxqTKERo5x2Knv4IBeNt5KjvfoW0ryFJLlALqrA="; }; - vendorSha256 = "sha256-4CmAf1s+tK7cKxwetgv0YewLLROsZ5g1Zd30FCep5k8="; + vendorSha256 = "sha256-r6wMSeW5Et6hYwoEKufmcOmucuHlYuBDOMuXXMT4W2Y="; # Don't build and check the integration tests excludedPackages = "itest"; diff --git a/pkgs/applications/networking/instant-messengers/element/element-desktop-package.json b/pkgs/applications/networking/instant-messengers/element/element-desktop-package.json index 340e8e22f642..65093878da2d 100644 --- a/pkgs/applications/networking/instant-messengers/element/element-desktop-package.json +++ b/pkgs/applications/networking/instant-messengers/element/element-desktop-package.json @@ -2,7 +2,7 @@ "name": "element-desktop", "productName": "Element", "main": "lib/electron-main.js", - "version": "1.8.4", + "version": "1.8.5", "description": "A feature-rich client for Matrix.org", "author": "Element", "repository": { @@ -54,7 +54,7 @@ "@types/minimist": "^1.2.1", "@typescript-eslint/eslint-plugin": "^4.17.0", "@typescript-eslint/parser": "^4.17.0", - "allchange": "^1.0.0", + "allchange": "^1.0.2", "asar": "^2.0.1", "chokidar": "^3.5.2", "electron": "^13.1.9", @@ -83,7 +83,7 @@ }, "build": { "appId": "im.riot.app", - "electronVersion": "13.1.9", + "electronVersion": "13.2.2", "files": [ "package.json", { diff --git a/pkgs/applications/networking/instant-messengers/element/element-desktop-yarndeps.nix b/pkgs/applications/networking/instant-messengers/element/element-desktop-yarndeps.nix index 12ec78a6af1c..45f2a5638ed7 100644 --- a/pkgs/applications/networking/instant-messengers/element/element-desktop-yarndeps.nix +++ b/pkgs/applications/networking/instant-messengers/element/element-desktop-yarndeps.nix @@ -10,11 +10,11 @@ }; } { - name = "_actions_core___core_1.4.0.tgz"; + name = "_actions_core___core_1.5.0.tgz"; path = fetchurl { - name = "_actions_core___core_1.4.0.tgz"; - url = "https://registry.yarnpkg.com/@actions/core/-/core-1.4.0.tgz"; - sha1 = "cf2e6ee317e314b03886adfeb20e448d50d6e524"; + name = "_actions_core___core_1.5.0.tgz"; + url = "https://registry.yarnpkg.com/@actions/core/-/core-1.5.0.tgz"; + sha1 = "885b864700001a1b9a6fba247833a036e75ad9d3"; }; } { @@ -42,11 +42,11 @@ }; } { - name = "_babel_generator___generator_7.14.8.tgz"; + name = "_babel_generator___generator_7.15.0.tgz"; path = fetchurl { - name = "_babel_generator___generator_7.14.8.tgz"; - url = "https://registry.yarnpkg.com/@babel/generator/-/generator-7.14.8.tgz"; - sha1 = "bf86fd6af96cf3b74395a8ca409515f89423e070"; + name = "_babel_generator___generator_7.15.0.tgz"; + url = "https://registry.yarnpkg.com/@babel/generator/-/generator-7.15.0.tgz"; + sha1 = "a7d0c172e0d814974bad5aa77ace543b97917f15"; }; } { @@ -82,11 +82,11 @@ }; } { - name = "_babel_helper_validator_identifier___helper_validator_identifier_7.14.8.tgz"; + name = "_babel_helper_validator_identifier___helper_validator_identifier_7.14.9.tgz"; path = fetchurl { - name = "_babel_helper_validator_identifier___helper_validator_identifier_7.14.8.tgz"; - url = "https://registry.yarnpkg.com/@babel/helper-validator-identifier/-/helper-validator-identifier-7.14.8.tgz"; - sha1 = "32be33a756f29e278a0d644fa08a2c9e0f88a34c"; + name = "_babel_helper_validator_identifier___helper_validator_identifier_7.14.9.tgz"; + url = "https://registry.yarnpkg.com/@babel/helper-validator-identifier/-/helper-validator-identifier-7.14.9.tgz"; + sha1 = "6654d171b2024f6d8ee151bf2509699919131d48"; }; } { @@ -98,19 +98,19 @@ }; } { - name = "_babel_parser___parser_7.14.8.tgz"; + name = "_babel_parser___parser_7.15.3.tgz"; path = fetchurl { - name = "_babel_parser___parser_7.14.8.tgz"; - url = "https://registry.yarnpkg.com/@babel/parser/-/parser-7.14.8.tgz"; - sha1 = "66fd41666b2d7b840bd5ace7f7416d5ac60208d4"; + name = "_babel_parser___parser_7.15.3.tgz"; + url = "https://registry.yarnpkg.com/@babel/parser/-/parser-7.15.3.tgz"; + sha1 = "3416d9bea748052cfcb63dbcc27368105b1ed862"; }; } { - name = "_babel_runtime___runtime_7.14.8.tgz"; + name = "_babel_runtime___runtime_7.15.3.tgz"; path = fetchurl { - name = "_babel_runtime___runtime_7.14.8.tgz"; - url = "https://registry.yarnpkg.com/@babel/runtime/-/runtime-7.14.8.tgz"; - sha1 = "7119a56f421018852694290b9f9148097391b446"; + name = "_babel_runtime___runtime_7.15.3.tgz"; + url = "https://registry.yarnpkg.com/@babel/runtime/-/runtime-7.15.3.tgz"; + sha1 = "2e1c2880ca118e5b2f9988322bd8a7656a32502b"; }; } { @@ -122,19 +122,19 @@ }; } { - name = "_babel_traverse___traverse_7.14.8.tgz"; + name = "_babel_traverse___traverse_7.15.0.tgz"; path = fetchurl { - name = "_babel_traverse___traverse_7.14.8.tgz"; - url = "https://registry.yarnpkg.com/@babel/traverse/-/traverse-7.14.8.tgz"; - sha1 = "c0253f02677c5de1a8ff9df6b0aacbec7da1a8ce"; + name = "_babel_traverse___traverse_7.15.0.tgz"; + url = "https://registry.yarnpkg.com/@babel/traverse/-/traverse-7.15.0.tgz"; + sha1 = "4cca838fd1b2a03283c1f38e141f639d60b3fc98"; }; } { - name = "_babel_types___types_7.14.8.tgz"; + name = "_babel_types___types_7.15.0.tgz"; path = fetchurl { - name = "_babel_types___types_7.14.8.tgz"; - url = "https://registry.yarnpkg.com/@babel/types/-/types-7.14.8.tgz"; - sha1 = "38109de8fcadc06415fbd9b74df0065d4d41c728"; + name = "_babel_types___types_7.15.0.tgz"; + url = "https://registry.yarnpkg.com/@babel/types/-/types-7.15.0.tgz"; + sha1 = "61af11f2286c4e9c69ca8deb5f4375a73c72dcbd"; }; } { @@ -146,11 +146,11 @@ }; } { - name = "_electron_get___get_1.12.4.tgz"; + name = "_electron_get___get_1.13.0.tgz"; path = fetchurl { - name = "_electron_get___get_1.12.4.tgz"; - url = "https://registry.yarnpkg.com/@electron/get/-/get-1.12.4.tgz"; - sha1 = "a5971113fc1bf8fa12a8789dc20152a7359f06ab"; + name = "_electron_get___get_1.13.0.tgz"; + url = "https://registry.yarnpkg.com/@electron/get/-/get-1.13.0.tgz"; + sha1 = "95c6bcaff4f9a505ea46792424f451efea89228c"; }; } { @@ -498,11 +498,11 @@ }; } { - name = "_npmcli_run_script___run_script_1.8.5.tgz"; + name = "_npmcli_run_script___run_script_1.8.6.tgz"; path = fetchurl { - name = "_npmcli_run_script___run_script_1.8.5.tgz"; - url = "https://registry.yarnpkg.com/@npmcli/run-script/-/run-script-1.8.5.tgz"; - sha1 = "f250a0c5e1a08a792d775a315d0ff42fc3a51e1d"; + name = "_npmcli_run_script___run_script_1.8.6.tgz"; + url = "https://registry.yarnpkg.com/@npmcli/run-script/-/run-script-1.8.6.tgz"; + sha1 = "18314802a6660b0d4baa4c3afe7f1ad39d8c28b7"; }; } { @@ -537,14 +537,6 @@ sha1 = "0c3f5bed440822182e972317122acb65d311a5ed"; }; } - { - name = "_octokit_openapi_types___openapi_types_9.3.0.tgz"; - path = fetchurl { - name = "_octokit_openapi_types___openapi_types_9.3.0.tgz"; - url = "https://registry.yarnpkg.com/@octokit/openapi-types/-/openapi-types-9.3.0.tgz"; - sha1 = "160347858d727527901c6aae7f7d5c2414cc1f2e"; - }; - } { name = "_octokit_openapi_types___openapi_types_9.7.0.tgz"; path = fetchurl { @@ -561,14 +553,6 @@ sha1 = "264189dd3ce881c6c33758824aac05a4002e056a"; }; } - { - name = "_octokit_plugin_paginate_rest___plugin_paginate_rest_2.15.0.tgz"; - path = fetchurl { - name = "_octokit_plugin_paginate_rest___plugin_paginate_rest_2.15.0.tgz"; - url = "https://registry.yarnpkg.com/@octokit/plugin-paginate-rest/-/plugin-paginate-rest-2.15.0.tgz"; - sha1 = "9c956c3710b2bd786eb3814eaf5a2b17392c150d"; - }; - } { name = "_octokit_plugin_request_log___plugin_request_log_1.0.4.tgz"; path = fetchurl { @@ -577,14 +561,6 @@ sha1 = "5e50ed7083a613816b1e4a28aeec5fb7f1462e85"; }; } - { - name = "_octokit_plugin_rest_endpoint_methods___plugin_rest_endpoint_methods_5.6.0.tgz"; - path = fetchurl { - name = "_octokit_plugin_rest_endpoint_methods___plugin_rest_endpoint_methods_5.6.0.tgz"; - url = "https://registry.yarnpkg.com/@octokit/plugin-rest-endpoint-methods/-/plugin-rest-endpoint-methods-5.6.0.tgz"; - sha1 = "c28833b88d0f07bf94093405d02d43d73c7de99b"; - }; - } { name = "_octokit_plugin_rest_endpoint_methods___plugin_rest_endpoint_methods_5.8.0.tgz"; path = fetchurl { @@ -602,27 +578,19 @@ }; } { - name = "_octokit_request___request_5.6.0.tgz"; + name = "_octokit_request___request_5.6.1.tgz"; path = fetchurl { - name = "_octokit_request___request_5.6.0.tgz"; - url = "https://registry.yarnpkg.com/@octokit/request/-/request-5.6.0.tgz"; - sha1 = "6084861b6e4fa21dc40c8e2a739ec5eff597e672"; + name = "_octokit_request___request_5.6.1.tgz"; + url = "https://registry.yarnpkg.com/@octokit/request/-/request-5.6.1.tgz"; + sha1 = "f97aff075c37ab1d427c49082fefeef0dba2d8ce"; }; } { - name = "_octokit_rest___rest_18.8.0.tgz"; + name = "_octokit_rest___rest_18.9.1.tgz"; path = fetchurl { - name = "_octokit_rest___rest_18.8.0.tgz"; - url = "https://registry.yarnpkg.com/@octokit/rest/-/rest-18.8.0.tgz"; - sha1 = "ba24f7ba554f015a7ae2b7cc2aecef5386ddfea5"; - }; - } - { - name = "_octokit_types___types_6.23.0.tgz"; - path = fetchurl { - name = "_octokit_types___types_6.23.0.tgz"; - url = "https://registry.yarnpkg.com/@octokit/types/-/types-6.23.0.tgz"; - sha1 = "b39f242b20036e89fa8f34f7962b4e9b7ff8f65b"; + name = "_octokit_rest___rest_18.9.1.tgz"; + url = "https://registry.yarnpkg.com/@octokit/rest/-/rest-18.9.1.tgz"; + sha1 = "db1d7ac1d7b10e908f7d4b78fe35a392554ccb26"; }; } { @@ -674,11 +642,11 @@ }; } { - name = "_types_debug___debug_4.1.6.tgz"; + name = "_types_debug___debug_4.1.7.tgz"; path = fetchurl { - name = "_types_debug___debug_4.1.6.tgz"; - url = "https://registry.yarnpkg.com/@types/debug/-/debug-4.1.6.tgz"; - sha1 = "0b7018723084918a865eff99249c490505df2163"; + name = "_types_debug___debug_4.1.7.tgz"; + url = "https://registry.yarnpkg.com/@types/debug/-/debug-4.1.7.tgz"; + sha1 = "7cc0ea761509124709b8b2d1090d8f6c17aadb82"; }; } { @@ -698,11 +666,11 @@ }; } { - name = "_types_json_schema___json_schema_7.0.8.tgz"; + name = "_types_json_schema___json_schema_7.0.9.tgz"; path = fetchurl { - name = "_types_json_schema___json_schema_7.0.8.tgz"; - url = "https://registry.yarnpkg.com/@types/json-schema/-/json-schema-7.0.8.tgz"; - sha1 = "edf1bf1dbf4e04413ca8e5b17b3b7d7d54b59818"; + name = "_types_json_schema___json_schema_7.0.9.tgz"; + url = "https://registry.yarnpkg.com/@types/json-schema/-/json-schema-7.0.9.tgz"; + sha1 = "97edc9037ea0c38585320b28964dde3b39e4660d"; }; } { @@ -722,19 +690,27 @@ }; } { - name = "_types_node___node_16.4.0.tgz"; + name = "_types_ms___ms_0.7.31.tgz"; path = fetchurl { - name = "_types_node___node_16.4.0.tgz"; - url = "https://registry.yarnpkg.com/@types/node/-/node-16.4.0.tgz"; - sha1 = "2c219eaa3b8d1e4d04f4dd6e40bc68c7467d5272"; + name = "_types_ms___ms_0.7.31.tgz"; + url = "https://registry.yarnpkg.com/@types/ms/-/ms-0.7.31.tgz"; + sha1 = "31b7ca6407128a3d2bbc27fe2d21b345397f6197"; }; } { - name = "_types_node___node_14.17.5.tgz"; + name = "_types_node___node_16.7.1.tgz"; path = fetchurl { - name = "_types_node___node_14.17.5.tgz"; - url = "https://registry.yarnpkg.com/@types/node/-/node-14.17.5.tgz"; - sha1 = "b59daf6a7ffa461b5648456ca59050ba8e40ed54"; + name = "_types_node___node_16.7.1.tgz"; + url = "https://registry.yarnpkg.com/@types/node/-/node-16.7.1.tgz"; + sha1 = "c6b9198178da504dfca1fd0be9b2e1002f1586f0"; + }; + } + { + name = "_types_node___node_14.17.11.tgz"; + path = fetchurl { + name = "_types_node___node_14.17.11.tgz"; + url = "https://registry.yarnpkg.com/@types/node/-/node-14.17.11.tgz"; + sha1 = "82d266d657aec5ff01ca59f2ffaff1bb43f7bf0f"; }; } { @@ -770,59 +746,59 @@ }; } { - name = "_typescript_eslint_eslint_plugin___eslint_plugin_4.28.4.tgz"; + name = "_typescript_eslint_eslint_plugin___eslint_plugin_4.29.3.tgz"; path = fetchurl { - name = "_typescript_eslint_eslint_plugin___eslint_plugin_4.28.4.tgz"; - url = "https://registry.yarnpkg.com/@typescript-eslint/eslint-plugin/-/eslint-plugin-4.28.4.tgz"; - sha1 = "e73c8cabbf3f08dee0e1bda65ed4e622ae8f8921"; + name = "_typescript_eslint_eslint_plugin___eslint_plugin_4.29.3.tgz"; + url = "https://registry.yarnpkg.com/@typescript-eslint/eslint-plugin/-/eslint-plugin-4.29.3.tgz"; + sha1 = "95cb8029a8bd8bd9c7f4ab95074a7cb2115adefa"; }; } { - name = "_typescript_eslint_experimental_utils___experimental_utils_4.28.4.tgz"; + name = "_typescript_eslint_experimental_utils___experimental_utils_4.29.3.tgz"; path = fetchurl { - name = "_typescript_eslint_experimental_utils___experimental_utils_4.28.4.tgz"; - url = "https://registry.yarnpkg.com/@typescript-eslint/experimental-utils/-/experimental-utils-4.28.4.tgz"; - sha1 = "9c70c35ebed087a5c70fb0ecd90979547b7fec96"; + name = "_typescript_eslint_experimental_utils___experimental_utils_4.29.3.tgz"; + url = "https://registry.yarnpkg.com/@typescript-eslint/experimental-utils/-/experimental-utils-4.29.3.tgz"; + sha1 = "52e437a689ccdef73e83c5106b34240a706f15e1"; }; } { - name = "_typescript_eslint_parser___parser_4.28.4.tgz"; + name = "_typescript_eslint_parser___parser_4.29.3.tgz"; path = fetchurl { - name = "_typescript_eslint_parser___parser_4.28.4.tgz"; - url = "https://registry.yarnpkg.com/@typescript-eslint/parser/-/parser-4.28.4.tgz"; - sha1 = "bc462dc2779afeefdcf49082516afdc3e7b96fab"; + name = "_typescript_eslint_parser___parser_4.29.3.tgz"; + url = "https://registry.yarnpkg.com/@typescript-eslint/parser/-/parser-4.29.3.tgz"; + sha1 = "2ac25535f34c0e98f50c0e6b28c679c2357d45f2"; }; } { - name = "_typescript_eslint_scope_manager___scope_manager_4.28.4.tgz"; + name = "_typescript_eslint_scope_manager___scope_manager_4.29.3.tgz"; path = fetchurl { - name = "_typescript_eslint_scope_manager___scope_manager_4.28.4.tgz"; - url = "https://registry.yarnpkg.com/@typescript-eslint/scope-manager/-/scope-manager-4.28.4.tgz"; - sha1 = "bdbce9b6a644e34f767bd68bc17bb14353b9fe7f"; + name = "_typescript_eslint_scope_manager___scope_manager_4.29.3.tgz"; + url = "https://registry.yarnpkg.com/@typescript-eslint/scope-manager/-/scope-manager-4.29.3.tgz"; + sha1 = "497dec66f3a22e459f6e306cf14021e40ec86e19"; }; } { - name = "_typescript_eslint_types___types_4.28.4.tgz"; + name = "_typescript_eslint_types___types_4.29.3.tgz"; path = fetchurl { - name = "_typescript_eslint_types___types_4.28.4.tgz"; - url = "https://registry.yarnpkg.com/@typescript-eslint/types/-/types-4.28.4.tgz"; - sha1 = "41acbd79b5816b7c0dd7530a43d97d020d3aeb42"; + name = "_typescript_eslint_types___types_4.29.3.tgz"; + url = "https://registry.yarnpkg.com/@typescript-eslint/types/-/types-4.29.3.tgz"; + sha1 = "d7980c49aef643d0af8954c9f14f656b7fd16017"; }; } { - name = "_typescript_eslint_typescript_estree___typescript_estree_4.28.4.tgz"; + name = "_typescript_eslint_typescript_estree___typescript_estree_4.29.3.tgz"; path = fetchurl { - name = "_typescript_eslint_typescript_estree___typescript_estree_4.28.4.tgz"; - url = "https://registry.yarnpkg.com/@typescript-eslint/typescript-estree/-/typescript-estree-4.28.4.tgz"; - sha1 = "252e6863278dc0727244be9e371eb35241c46d00"; + name = "_typescript_eslint_typescript_estree___typescript_estree_4.29.3.tgz"; + url = "https://registry.yarnpkg.com/@typescript-eslint/typescript-estree/-/typescript-estree-4.29.3.tgz"; + sha1 = "1bafad610015c4ded35c85a70b6222faad598b40"; }; } { - name = "_typescript_eslint_visitor_keys___visitor_keys_4.28.4.tgz"; + name = "_typescript_eslint_visitor_keys___visitor_keys_4.29.3.tgz"; path = fetchurl { - name = "_typescript_eslint_visitor_keys___visitor_keys_4.28.4.tgz"; - url = "https://registry.yarnpkg.com/@typescript-eslint/visitor-keys/-/visitor-keys-4.28.4.tgz"; - sha1 = "92dacfefccd6751cbb0a964f06683bfd72d0c4d3"; + name = "_typescript_eslint_visitor_keys___visitor_keys_4.29.3.tgz"; + url = "https://registry.yarnpkg.com/@typescript-eslint/visitor-keys/-/visitor-keys-4.29.3.tgz"; + sha1 = "c691760a00bd86bf8320d2a90a93d86d322f1abf"; }; } { @@ -898,11 +874,11 @@ }; } { - name = "allchange___allchange_1.0.0.tgz"; + name = "allchange___allchange_1.0.2.tgz"; path = fetchurl { - name = "allchange___allchange_1.0.0.tgz"; - url = "https://registry.yarnpkg.com/allchange/-/allchange-1.0.0.tgz"; - sha1 = "f5177b7d97f8e97a2d059a1524db9a72d94dc6d2"; + name = "allchange___allchange_1.0.2.tgz"; + url = "https://registry.yarnpkg.com/allchange/-/allchange-1.0.2.tgz"; + sha1 = "86b9190e12b7ede4f230ae763cbd504c48fd907b"; }; } { @@ -1122,11 +1098,11 @@ }; } { - name = "async___async_3.2.0.tgz"; + name = "async___async_3.2.1.tgz"; path = fetchurl { - name = "async___async_3.2.0.tgz"; - url = "https://registry.yarnpkg.com/async/-/async-3.2.0.tgz"; - sha1 = "b3a2685c5ebb641d3de02d161002c60fc9f85720"; + name = "async___async_3.2.1.tgz"; + url = "https://registry.yarnpkg.com/async/-/async-3.2.1.tgz"; + sha1 = "d3274ec66d107a47476a4c49136aacdb00665fc8"; }; } { @@ -1250,11 +1226,11 @@ }; } { - name = "boolean___boolean_3.1.2.tgz"; + name = "boolean___boolean_3.1.4.tgz"; path = fetchurl { - name = "boolean___boolean_3.1.2.tgz"; - url = "https://registry.yarnpkg.com/boolean/-/boolean-3.1.2.tgz"; - sha1 = "e30f210a26b02458482a8cc353ab06f262a780c2"; + name = "boolean___boolean_3.1.4.tgz"; + url = "https://registry.yarnpkg.com/boolean/-/boolean-3.1.4.tgz"; + sha1 = "f51a2fb5838a99e06f9b6ec1edb674de67026435"; }; } { @@ -1306,11 +1282,11 @@ }; } { - name = "buffer_from___buffer_from_1.1.1.tgz"; + name = "buffer_from___buffer_from_1.1.2.tgz"; path = fetchurl { - name = "buffer_from___buffer_from_1.1.1.tgz"; - url = "https://registry.yarnpkg.com/buffer-from/-/buffer-from-1.1.1.tgz"; - sha1 = "32713bc028f75c02fdb710d7c7bcec1f2c6070ef"; + name = "buffer_from___buffer_from_1.1.2.tgz"; + url = "https://registry.yarnpkg.com/buffer-from/-/buffer-from-1.1.2.tgz"; + sha1 = "2b146a6fd72e80b4f55d255f35ed59a3a9a41bd5"; }; } { @@ -1394,11 +1370,11 @@ }; } { - name = "chalk___chalk_4.1.1.tgz"; + name = "chalk___chalk_4.1.2.tgz"; path = fetchurl { - name = "chalk___chalk_4.1.1.tgz"; - url = "https://registry.yarnpkg.com/chalk/-/chalk-4.1.1.tgz"; - sha1 = "c80b3fab28bf6371e6863325eee67e618b77e6ad"; + name = "chalk___chalk_4.1.2.tgz"; + url = "https://registry.yarnpkg.com/chalk/-/chalk-4.1.2.tgz"; + sha1 = "aac4e2b7734a740867aeb16bf02aad556a1e7a01"; }; } { @@ -1634,11 +1610,11 @@ }; } { - name = "core_js___core_js_3.15.2.tgz"; + name = "core_js___core_js_3.16.3.tgz"; path = fetchurl { - name = "core_js___core_js_3.15.2.tgz"; - url = "https://registry.yarnpkg.com/core-js/-/core-js-3.15.2.tgz"; - sha1 = "740660d2ff55ef34ce664d7e2455119c5bdd3d61"; + name = "core_js___core_js_3.16.3.tgz"; + url = "https://registry.yarnpkg.com/core-js/-/core-js-3.16.3.tgz"; + sha1 = "1f2d43c51a9ed014cc6c83440af14697ae4b75f2"; }; } { @@ -1970,11 +1946,11 @@ }; } { - name = "electron_notarize___electron_notarize_1.0.0.tgz"; + name = "electron_notarize___electron_notarize_1.1.0.tgz"; path = fetchurl { - name = "electron_notarize___electron_notarize_1.0.0.tgz"; - url = "https://registry.yarnpkg.com/electron-notarize/-/electron-notarize-1.0.0.tgz"; - sha1 = "bc925b1ccc3f79e58e029e8c4706572b01a9fd8f"; + name = "electron_notarize___electron_notarize_1.1.0.tgz"; + url = "https://registry.yarnpkg.com/electron-notarize/-/electron-notarize-1.1.0.tgz"; + sha1 = "00ed0182366b97f5593cb5ccdcf1120f1de37179"; }; } { @@ -2002,11 +1978,11 @@ }; } { - name = "electron___electron_13.1.9.tgz"; + name = "electron___electron_13.2.2.tgz"; path = fetchurl { - name = "electron___electron_13.1.9.tgz"; - url = "https://registry.yarnpkg.com/electron/-/electron-13.1.9.tgz"; - sha1 = "668e2632b81e9fa21edfd32876282d3e2ff7fd76"; + name = "electron___electron_13.2.2.tgz"; + url = "https://registry.yarnpkg.com/electron/-/electron-13.2.2.tgz"; + sha1 = "332d91891d0db4f9a1d22d4d0bc3b500e59dc051"; }; } { @@ -2298,11 +2274,11 @@ }; } { - name = "ext___ext_1.4.0.tgz"; + name = "ext___ext_1.5.0.tgz"; path = fetchurl { - name = "ext___ext_1.4.0.tgz"; - url = "https://registry.yarnpkg.com/ext/-/ext-1.4.0.tgz"; - sha1 = "89ae7a07158f79d35517882904324077e4379244"; + name = "ext___ext_1.5.0.tgz"; + url = "https://registry.yarnpkg.com/ext/-/ext-1.5.0.tgz"; + sha1 = "e93b97ae0cb23f8370380f6107d2d2b7887687ad"; }; } { @@ -2370,11 +2346,11 @@ }; } { - name = "fastq___fastq_1.11.1.tgz"; + name = "fastq___fastq_1.12.0.tgz"; path = fetchurl { - name = "fastq___fastq_1.11.1.tgz"; - url = "https://registry.yarnpkg.com/fastq/-/fastq-1.11.1.tgz"; - sha1 = "5d8175aae17db61947f8b162cfc7f63264d22807"; + name = "fastq___fastq_1.12.0.tgz"; + url = "https://registry.yarnpkg.com/fastq/-/fastq-1.12.0.tgz"; + sha1 = "ed7b6ab5d62393fb2cc591c853652a5c318bf794"; }; } { @@ -2442,11 +2418,11 @@ }; } { - name = "flatted___flatted_3.2.1.tgz"; + name = "flatted___flatted_3.2.2.tgz"; path = fetchurl { - name = "flatted___flatted_3.2.1.tgz"; - url = "https://registry.yarnpkg.com/flatted/-/flatted-3.2.1.tgz"; - sha1 = "bbef080d95fca6709362c73044a1634f7c6e7d05"; + name = "flatted___flatted_3.2.2.tgz"; + url = "https://registry.yarnpkg.com/flatted/-/flatted-3.2.2.tgz"; + sha1 = "64bfed5cb68fe3ca78b3eb214ad97b63bedce561"; }; } { @@ -2682,11 +2658,11 @@ }; } { - name = "graceful_fs___graceful_fs_4.2.6.tgz"; + name = "graceful_fs___graceful_fs_4.2.8.tgz"; path = fetchurl { - name = "graceful_fs___graceful_fs_4.2.6.tgz"; - url = "https://registry.yarnpkg.com/graceful-fs/-/graceful-fs-4.2.6.tgz"; - sha1 = "ff040b2b0853b23c3d31027523706f1885d76bee"; + name = "graceful_fs___graceful_fs_4.2.8.tgz"; + url = "https://registry.yarnpkg.com/graceful-fs/-/graceful-fs-4.2.8.tgz"; + sha1 = "e412b8d33f5e006593cbd3cee6df9f2cebbe802a"; }; } { @@ -3490,11 +3466,11 @@ }; } { - name = "make_fetch_happen___make_fetch_happen_9.0.4.tgz"; + name = "make_fetch_happen___make_fetch_happen_9.1.0.tgz"; path = fetchurl { - name = "make_fetch_happen___make_fetch_happen_9.0.4.tgz"; - url = "https://registry.yarnpkg.com/make-fetch-happen/-/make-fetch-happen-9.0.4.tgz"; - sha1 = "ceaa100e60e0ef9e8d1ede94614bb2ba83c8bb24"; + name = "make_fetch_happen___make_fetch_happen_9.1.0.tgz"; + url = "https://registry.yarnpkg.com/make-fetch-happen/-/make-fetch-happen-9.1.0.tgz"; + sha1 = "53085a09e7971433e6765f7971bf63f4e05cb968"; }; } { @@ -3538,19 +3514,19 @@ }; } { - name = "mime_db___mime_db_1.48.0.tgz"; + name = "mime_db___mime_db_1.49.0.tgz"; path = fetchurl { - name = "mime_db___mime_db_1.48.0.tgz"; - url = "https://registry.yarnpkg.com/mime-db/-/mime-db-1.48.0.tgz"; - sha1 = "e35b31045dd7eada3aaad537ed88a33afbef2d1d"; + name = "mime_db___mime_db_1.49.0.tgz"; + url = "https://registry.yarnpkg.com/mime-db/-/mime-db-1.49.0.tgz"; + sha1 = "f3dfde60c99e9cf3bc9701d687778f537001cbed"; }; } { - name = "mime_types___mime_types_2.1.31.tgz"; + name = "mime_types___mime_types_2.1.32.tgz"; path = fetchurl { - name = "mime_types___mime_types_2.1.31.tgz"; - url = "https://registry.yarnpkg.com/mime-types/-/mime-types-2.1.31.tgz"; - sha1 = "a00d76b74317c61f9c2db2218b8e9f8e9c5c9e6b"; + name = "mime_types___mime_types_2.1.32.tgz"; + url = "https://registry.yarnpkg.com/mime-types/-/mime-types-2.1.32.tgz"; + sha1 = "1d00e89e7de7fe02008db61001d9e02852670fd5"; }; } { @@ -3746,11 +3722,11 @@ }; } { - name = "needle___needle_2.8.0.tgz"; + name = "needle___needle_2.9.0.tgz"; path = fetchurl { - name = "needle___needle_2.8.0.tgz"; - url = "https://registry.yarnpkg.com/needle/-/needle-2.8.0.tgz"; - sha1 = "1c8ef9c1a2c29dcc1e83d73809d7bc681c80a048"; + name = "needle___needle_2.9.0.tgz"; + url = "https://registry.yarnpkg.com/needle/-/needle-2.9.0.tgz"; + sha1 = "c680e401f99b6c3d8d1f315756052edf3dc3bdff"; }; } { @@ -4106,11 +4082,11 @@ }; } { - name = "parse_headers___parse_headers_2.0.3.tgz"; + name = "parse_headers___parse_headers_2.0.4.tgz"; path = fetchurl { - name = "parse_headers___parse_headers_2.0.3.tgz"; - url = "https://registry.yarnpkg.com/parse-headers/-/parse-headers-2.0.3.tgz"; - sha1 = "5e8e7512383d140ba02f0c7aa9f49b4399c92515"; + name = "parse_headers___parse_headers_2.0.4.tgz"; + url = "https://registry.yarnpkg.com/parse-headers/-/parse-headers-2.0.4.tgz"; + sha1 = "9eaf2d02bed2d1eff494331ce3df36d7924760bf"; }; } { @@ -4202,11 +4178,11 @@ }; } { - name = "plist___plist_3.0.2.tgz"; + name = "plist___plist_3.0.3.tgz"; path = fetchurl { - name = "plist___plist_3.0.2.tgz"; - url = "https://registry.yarnpkg.com/plist/-/plist-3.0.2.tgz"; - sha1 = "74bbf011124b90421c22d15779cee60060ba95bc"; + name = "plist___plist_3.0.3.tgz"; + url = "https://registry.yarnpkg.com/plist/-/plist-3.0.3.tgz"; + sha1 = "007df34c7be0e2c3dcfcf460d623e6485457857d"; }; } { @@ -4370,11 +4346,11 @@ }; } { - name = "read_package_json_fast___read_package_json_fast_2.0.2.tgz"; + name = "read_package_json_fast___read_package_json_fast_2.0.3.tgz"; path = fetchurl { - name = "read_package_json_fast___read_package_json_fast_2.0.2.tgz"; - url = "https://registry.yarnpkg.com/read-package-json-fast/-/read-package-json-fast-2.0.2.tgz"; - sha1 = "2dcb24d9e8dd50fb322042c8c35a954e6cc7ac9e"; + name = "read_package_json_fast___read_package_json_fast_2.0.3.tgz"; + url = "https://registry.yarnpkg.com/read-package-json-fast/-/read-package-json-fast-2.0.3.tgz"; + sha1 = "323ca529630da82cb34b36cc0b996693c98c2b83"; }; } { @@ -4410,11 +4386,11 @@ }; } { - name = "regenerator_runtime___regenerator_runtime_0.13.7.tgz"; + name = "regenerator_runtime___regenerator_runtime_0.13.9.tgz"; path = fetchurl { - name = "regenerator_runtime___regenerator_runtime_0.13.7.tgz"; - url = "https://registry.yarnpkg.com/regenerator-runtime/-/regenerator-runtime-0.13.7.tgz"; - sha1 = "cac2dacc8a1ea675feaabaeb8ae833898ae46f55"; + name = "regenerator_runtime___regenerator_runtime_0.13.9.tgz"; + url = "https://registry.yarnpkg.com/regenerator-runtime/-/regenerator-runtime-0.13.9.tgz"; + sha1 = "8925742a98ffd90814988d7566ad30ca3b263b52"; }; } { @@ -4682,19 +4658,19 @@ }; } { - name = "smart_buffer___smart_buffer_4.1.0.tgz"; + name = "smart_buffer___smart_buffer_4.2.0.tgz"; path = fetchurl { - name = "smart_buffer___smart_buffer_4.1.0.tgz"; - url = "https://registry.yarnpkg.com/smart-buffer/-/smart-buffer-4.1.0.tgz"; - sha1 = "91605c25d91652f4661ea69ccf45f1b331ca21ba"; + name = "smart_buffer___smart_buffer_4.2.0.tgz"; + url = "https://registry.yarnpkg.com/smart-buffer/-/smart-buffer-4.2.0.tgz"; + sha1 = "6e1d71fa4f18c05f7d0ff216dd16a481d0e8d9ae"; }; } { - name = "socks_proxy_agent___socks_proxy_agent_5.0.1.tgz"; + name = "socks_proxy_agent___socks_proxy_agent_6.0.0.tgz"; path = fetchurl { - name = "socks_proxy_agent___socks_proxy_agent_5.0.1.tgz"; - url = "https://registry.yarnpkg.com/socks-proxy-agent/-/socks-proxy-agent-5.0.1.tgz"; - sha1 = "032fb583048a29ebffec2e6a73fca0761f48177e"; + name = "socks_proxy_agent___socks_proxy_agent_6.0.0.tgz"; + url = "https://registry.yarnpkg.com/socks-proxy-agent/-/socks-proxy-agent-6.0.0.tgz"; + sha1 = "9f8749cdc05976505fa9f9a958b1818d0e60573b"; }; } { @@ -4906,19 +4882,19 @@ }; } { - name = "tar___tar_4.4.13.tgz"; + name = "tar___tar_4.4.19.tgz"; path = fetchurl { - name = "tar___tar_4.4.13.tgz"; - url = "https://registry.yarnpkg.com/tar/-/tar-4.4.13.tgz"; - sha1 = "43b364bc52888d555298637b10d60790254ab525"; + name = "tar___tar_4.4.19.tgz"; + url = "https://registry.yarnpkg.com/tar/-/tar-4.4.19.tgz"; + sha1 = "2e4d7263df26f2b914dee10c825ab132123742f3"; }; } { - name = "tar___tar_6.1.2.tgz"; + name = "tar___tar_6.1.10.tgz"; path = fetchurl { - name = "tar___tar_6.1.2.tgz"; - url = "https://registry.yarnpkg.com/tar/-/tar-6.1.2.tgz"; - sha1 = "1f045a90a6eb23557a603595f41a16c57d47adc6"; + name = "tar___tar_6.1.10.tgz"; + url = "https://registry.yarnpkg.com/tar/-/tar-6.1.10.tgz"; + sha1 = "8a320a74475fba54398fa136cd9883aa8ad11175"; }; } { @@ -5042,11 +5018,11 @@ }; } { - name = "tslib___tslib_2.3.0.tgz"; + name = "tslib___tslib_2.3.1.tgz"; path = fetchurl { - name = "tslib___tslib_2.3.0.tgz"; - url = "https://registry.yarnpkg.com/tslib/-/tslib-2.3.0.tgz"; - sha1 = "803b8cdab3e12ba581a4ca41c8839bbb0dacb09e"; + name = "tslib___tslib_2.3.1.tgz"; + url = "https://registry.yarnpkg.com/tslib/-/tslib-2.3.1.tgz"; + sha1 = "e8a335add5ceae51aa261d32a490158ef042ef01"; }; } { @@ -5434,11 +5410,11 @@ }; } { - name = "xmldom___xmldom_0.5.0.tgz"; + name = "xmldom___xmldom_0.6.0.tgz"; path = fetchurl { - name = "xmldom___xmldom_0.5.0.tgz"; - url = "https://registry.yarnpkg.com/xmldom/-/xmldom-0.5.0.tgz"; - sha1 = "193cb96b84aa3486127ea6272c4596354cb4962e"; + name = "xmldom___xmldom_0.6.0.tgz"; + url = "https://registry.yarnpkg.com/xmldom/-/xmldom-0.6.0.tgz"; + sha1 = "43a96ecb8beece991cef382c08397d82d4d0c46f"; }; } { @@ -5490,11 +5466,11 @@ }; } { - name = "yargs___yargs_17.0.1.tgz"; + name = "yargs___yargs_17.1.1.tgz"; path = fetchurl { - name = "yargs___yargs_17.0.1.tgz"; - url = "https://registry.yarnpkg.com/yargs/-/yargs-17.0.1.tgz"; - sha1 = "6a1ced4ed5ee0b388010ba9fd67af83b9362e0bb"; + name = "yargs___yargs_17.1.1.tgz"; + url = "https://registry.yarnpkg.com/yargs/-/yargs-17.1.1.tgz"; + sha1 = "c2a8091564bdb196f7c0a67c1d12e5b85b8067ba"; }; } { diff --git a/pkgs/applications/networking/instant-messengers/element/element-desktop.nix b/pkgs/applications/networking/instant-messengers/element/element-desktop.nix index 2df11e3b2265..27a5204e9e96 100644 --- a/pkgs/applications/networking/instant-messengers/element/element-desktop.nix +++ b/pkgs/applications/networking/instant-messengers/element/element-desktop.nix @@ -7,8 +7,6 @@ , electron , element-web , callPackage -, fetchpatch - , Security , AppKit , CoreServices @@ -21,12 +19,12 @@ let executableName = "element-desktop"; - version = "1.8.4"; + version = "1.8.5"; src = fetchFromGitHub { owner = "vector-im"; repo = "element-desktop"; rev = "v${version}"; - sha256 = "sha256-MmrO9Ref/qpW7ssjw8IAb7dYZHMRBfdfH2whsZJq/14="; + sha256 = "sha256-i9PWGEcf+EOn6j++GuYt6xmwYycmW5hE5xhpRMOFBGM="; }; electron_exec = if stdenv.isDarwin then "${electron}/Applications/Electron.app/Contents/MacOS/Electron" else "${electron}/bin/electron"; in @@ -34,13 +32,6 @@ mkYarnPackage rec { name = "element-desktop-${version}"; inherit version src; - patches = [ - (fetchpatch { - url = "https://github.com/vector-im/element-desktop/commit/96e5389779f60c91b8fe80d7bd9af413d72ec61f.patch"; - sha256 = "sha256-82I5BDNDWIfp+m2HpzTA5+39hMv2bTbmJlXfM4YUjDY="; - }) - ]; - packageJSON = ./element-desktop-package.json; yarnNix = ./element-desktop-yarndeps.nix; diff --git a/pkgs/applications/networking/instant-messengers/element/element-web.nix b/pkgs/applications/networking/instant-messengers/element/element-web.nix index a46bc6ea5c59..05c5e732ced5 100644 --- a/pkgs/applications/networking/instant-messengers/element/element-web.nix +++ b/pkgs/applications/networking/instant-messengers/element/element-web.nix @@ -12,11 +12,11 @@ let in stdenv.mkDerivation rec { pname = "element-web"; - version = "1.8.4"; + version = "1.8.5"; src = fetchurl { url = "https://github.com/vector-im/element-web/releases/download/v${version}/element-v${version}.tar.gz"; - sha256 = "sha256-V4ekSs6FmSCpUFlAipTyrde4z+ErQCb9zzktbX8YtC8="; + sha256 = "sha256-E3H6iXBRi4mnhu0mu96ly9f8AYOiMFf9zTcpjDmfHy4="; }; installPhase = '' diff --git a/pkgs/applications/terminal-emulators/darktile/default.nix b/pkgs/applications/terminal-emulators/darktile/default.nix new file mode 100644 index 000000000000..f63232949501 --- /dev/null +++ b/pkgs/applications/terminal-emulators/darktile/default.nix @@ -0,0 +1,68 @@ +{ stdenv +, buildGoModule +, fetchFromGitHub +, lib +, go +, pkg-config +, libX11 +, libXcursor +, libXrandr +, libXinerama +, libXi +, libXext +, libXxf86vm +, libGL +}: + +stdenv.mkDerivation rec { + pname = "darktile"; + version = "0.0.10"; + + src = fetchFromGitHub { + owner = "liamg"; + repo = "darktile"; + rev = "v${version}"; + sha256 = "0pdj4yv3qrq56gb67p85ara3g8qrzw5ha787bl2ls4vcx85q7303"; + }; + + nativeBuildInputs = [ go pkg-config ]; + + buildInputs = [ + libX11 + libXcursor + libXrandr + libXinerama + libXi + libXext + libXxf86vm + libGL + ]; + + postPatch = '' + substituteInPlace scripts/build.sh \ + --replace "bash" "sh" + ''; + + postConfigure = '' + export GOPATH=$TMP/go + ''; + + makeFlags = [ "HOME=$TMP" ]; + + installPhase = '' + runHook preInstall + + install -Dm755 darktile -t $out/bin + + runHook postInstall + ''; + + meta = with lib; { + description = "A GPU rendered terminal emulator designed for tiling window managers"; + homepage = "https://github.com/liamg/darktile"; + downloadPage = "https://github.com/liamg/darktile/releases"; + changelog = "https://github.com/liamg/darktile/releases/tag/v${version}"; + license = licenses.mit; + maintainers = with maintainers; [ flexagoon ]; + }; +} diff --git a/pkgs/build-support/cc-wrapper/default.nix b/pkgs/build-support/cc-wrapper/default.nix index 804f59286c7a..3738f628b187 100644 --- a/pkgs/build-support/cc-wrapper/default.nix +++ b/pkgs/build-support/cc-wrapper/default.nix @@ -463,6 +463,9 @@ stdenv.mkDerivation { + optionalString (targetPlatform ? gcc.mode) '' echo "-mmode=${targetPlatform.gcc.mode}" >> $out/nix-support/cc-cflags-before '' + + optionalString (targetPlatform ? gcc.thumb) '' + echo "-m${if targetPlatform.gcc.thumb then "thumb" else "arm"}" >> $out/nix-support/cc-cflags-before + '' + optionalString (targetPlatform ? gcc.tune && isGccArchSupported targetPlatform.gcc.tune) '' echo "-mtune=${targetPlatform.gcc.tune}" >> $out/nix-support/cc-cflags-before diff --git a/pkgs/desktops/plasma-5/plasma-desktop/default.nix b/pkgs/desktops/plasma-5/plasma-desktop/default.nix index 37134f240dc3..1dc3d99b5e4c 100644 --- a/pkgs/desktops/plasma-5/plasma-desktop/default.nix +++ b/pkgs/desktops/plasma-5/plasma-desktop/default.nix @@ -1,5 +1,5 @@ { - mkDerivation, lib, + mkDerivation, lib, fetchpatch, extra-cmake-modules, kdoctools, boost, fontconfig, ibus, libXcursor, libXft, libcanberra_kde, libpulseaudio, @@ -21,7 +21,8 @@ mkDerivation { nativeBuildInputs = [ extra-cmake-modules kdoctools ]; buildInputs = [ boost fontconfig ibus libcanberra_kde libpulseaudio libXcursor libXft xorgserver - libxkbfile phonon xf86inputevdev xf86inputsynaptics xinput xkeyboard_config + libxkbfile phonon xf86inputlibinput xf86inputevdev xf86inputsynaptics xinput + xkeyboard_config accounts-qt qtdeclarative qtquickcontrols qtquickcontrols2 qtsvg qtx11extras @@ -35,10 +36,12 @@ mkDerivation { patches = [ ./hwclock-path.patch ./tzdir.patch + # https://invent.kde.org/plasma/plasma-desktop/-/merge_requests/563 + (fetchpatch { + url = "https://invent.kde.org/plasma/plasma-desktop/-/commit/8d9bf2032b8a2e5de75edf5713c42866f5b80649.patch"; + sha256 = "sha256-2jqqFjBljbhf7I+fTsIvuFs3Ic662KTKRnbcSm5Jing="; + }) ]; - postPatch = '' - sed '1i#include ' -i kcms/touchpad/backends/x11/synapticstouchpad.cpp - ''; CXXFLAGS = [ ''-DNIXPKGS_HWCLOCK=\"${lib.getBin util-linux}/sbin/hwclock\"'' ]; diff --git a/pkgs/development/compilers/llvm/13/default.nix b/pkgs/development/compilers/llvm/13/default.nix index 76a46492cf74..fa46bafa295d 100644 --- a/pkgs/development/compilers/llvm/13/default.nix +++ b/pkgs/development/compilers/llvm/13/default.nix @@ -19,7 +19,7 @@ let release_version = "13.0.0"; - candidate = "rc2"; # empty or "rcN" + candidate = "rc3"; # empty or "rcN" dash-candidate = lib.optionalString (candidate != "") "-${candidate}"; rev = ""; # When using a Git commit rev-version = ""; # When using a Git commit @@ -30,7 +30,7 @@ let owner = "llvm"; repo = "llvm-project"; rev = if rev != "" then rev else "llvmorg-${version}"; - sha256 = "06cy6v231w067g310bwpk6a654j6q9rcxa0y0wz5sc5rrh61zjrn"; + sha256 = "1c781jdq0zmhhgdci201yvgl6hlpjqqmmrd6sm91azm3i99n8gw2"; }; llvm_meta = { diff --git a/pkgs/development/compilers/ocaml/4.13.nix b/pkgs/development/compilers/ocaml/4.13.nix index 86e386a2f413..6b0d379193e2 100644 --- a/pkgs/development/compilers/ocaml/4.13.nix +++ b/pkgs/development/compilers/ocaml/4.13.nix @@ -1,9 +1,9 @@ import ./generic.nix { major_version = "4"; minor_version = "13"; - patch_version = "0-rc1"; + patch_version = "0-rc2"; src = fetchTarball { - url = "https://caml.inria.fr/pub/distrib/ocaml-4.13/ocaml-4.13.0~rc1.tar.xz"; - sha256 = "0vp19qwdny5z428yjvdn0yxvf3i5l23axjb83y5ccj0rpza1k0im"; + url = "https://caml.inria.fr/pub/distrib/ocaml-4.13/ocaml-4.13.0~rc2.tar.xz"; + sha256 = "1w4sdrs5s1bhbisgz44ysi2j1n13qd3slgs34ppglpwmqqw6ply2"; }; } diff --git a/pkgs/development/libraries/opendht/default.nix b/pkgs/development/libraries/opendht/default.nix index 3cf29b7351e9..2de005d885a1 100644 --- a/pkgs/development/libraries/opendht/default.nix +++ b/pkgs/development/libraries/opendht/default.nix @@ -5,13 +5,13 @@ stdenv.mkDerivation rec { pname = "opendht"; - version = "2.2.0"; + version = "2.3.1"; src = fetchFromGitHub { owner = "savoirfairelinux"; repo = "opendht"; rev = version; - sha256 = "sha256-u4MWMUbnq2q4FH0TMpbrbhS5erAfT4/3HYGLXaLTz+I="; + sha256 = "sha256-Os5PRYTZMVekQrbwNODWsHANTx6RSC5vzGJ5JoYtvtE="; }; nativeBuildInputs = diff --git a/pkgs/development/libraries/poco/default.nix b/pkgs/development/libraries/poco/default.nix index 8f963bb366a9..57e8fb1a5a75 100644 --- a/pkgs/development/libraries/poco/default.nix +++ b/pkgs/development/libraries/poco/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, cmake, pkg-config, zlib, pcre, expat, sqlite, openssl, unixODBC, libmysqlclient }: +{ lib, stdenv, fetchurl, fetchpatch, cmake, pkg-config, zlib, pcre, expat, sqlite, openssl, unixODBC, libmysqlclient }: stdenv.mkDerivation rec { pname = "poco"; @@ -10,9 +10,31 @@ stdenv.mkDerivation rec { sha256 = "1jilzh0h6ik5lr167nax7q6nrpzxl99p11pkl202ig06pgh32nbz"; }; + patches = [ + # Use GNUInstallDirs (https://github.com/pocoproject/poco/pull/3105) + (fetchpatch { + name = "use-gnuinstalldirs.patch"; + url = "https://github.com/pocoproject/poco/commit/9e8f84dff4575f01be02e0b07364efd1561ce66c.patch"; + sha256 = "1bj4i93gxr7pwx33bfyhg20ad4ak1rbxkrlpsgzk7rm6mh0mld26"; + # Files not included in release tarball + excludes = [ + "Encodings/Compiler/CMakeLists.txt" + "PocoDoc/CMakeLists.txt" + "NetSSL_Win/CMakeLists.txt" + "PDF/CMakeLists.txt" + "SevenZip/CMakeLists.txt" + "ApacheConnector/CMakeLists.txt" + "CppParser/CMakeLists.txt" + ]; + }) + ]; + nativeBuildInputs = [ cmake pkg-config ]; - buildInputs = [ zlib pcre expat sqlite openssl unixODBC libmysqlclient ]; + buildInputs = [ openssl unixODBC libmysqlclient ]; + propagatedBuildInputs = [ zlib pcre expat sqlite ]; + + outputs = [ "out" "dev" ]; MYSQL_DIR = libmysqlclient; MYSQL_INCLUDE_DIR = "${MYSQL_DIR}/include/mysql"; diff --git a/pkgs/development/python-modules/acme-tiny/default.nix b/pkgs/development/python-modules/acme-tiny/default.nix index dcbb9a688f57..79c1ecffb037 100644 --- a/pkgs/development/python-modules/acme-tiny/default.nix +++ b/pkgs/development/python-modules/acme-tiny/default.nix @@ -9,11 +9,11 @@ buildPythonPackage rec { pname = "acme-tiny"; - version = "4.1.1"; + version = "5.0.1"; src = fetchPypi { inherit pname version; - sha256 = "b7050b9428d45319e14ab9ea77f0ff4eb40451e5a68325d4c5358a87cff0e793"; + sha256 = "378549808eece574c3b5dcea82b216534949423d5c7ac241d9419212d676bc8d"; }; patchPhase = '' diff --git a/pkgs/development/python-modules/agate-sql/default.nix b/pkgs/development/python-modules/agate-sql/default.nix index e9747b6f393d..c2e741bef176 100644 --- a/pkgs/development/python-modules/agate-sql/default.nix +++ b/pkgs/development/python-modules/agate-sql/default.nix @@ -11,13 +11,13 @@ buildPythonPackage rec { pname = "agate-sql"; - version = "0.5.7"; + version = "0.5.8"; disabled = isPy27; src = fetchPypi { inherit pname version; - sha256 = "7622c1f243b5a9a5efddfe28c36eeeb30081e43e3eb72e8f3da22c2edaecf4d8"; + sha256 = "581e062ae878cc087d3d0948670d46b16589df0790bf814524b0587a359f2ada"; }; propagatedBuildInputs = [ agate sqlalchemy ]; diff --git a/pkgs/development/python-modules/amcrest/default.nix b/pkgs/development/python-modules/amcrest/default.nix index 478ab1811e48..23b4c78024c3 100644 --- a/pkgs/development/python-modules/amcrest/default.nix +++ b/pkgs/development/python-modules/amcrest/default.nix @@ -3,6 +3,7 @@ , buildPythonPackage , fetchFromGitHub , mock +, httpx , pytestCheckHook , pythonOlder , requests @@ -13,18 +14,19 @@ buildPythonPackage rec { pname = "amcrest"; - version = "1.8.1"; + version = "1.9.2"; disabled = pythonOlder "3.6"; src = fetchFromGitHub { owner = "tchellomello"; repo = "python-amcrest"; rev = version; - sha256 = "sha256-a23AjLRNghu5CT3GHvnti0BHnku9CxLP1EkE0GrwB3w="; + sha256 = "sha256-xBrXe3BUvLfSk7zBHVJLh/K3lGVkFKOCq0RNAOb9GqI="; }; propagatedBuildInputs = [ argcomplete + httpx requests urllib3 typing-extensions diff --git a/pkgs/development/python-modules/ansible/base.nix b/pkgs/development/python-modules/ansible/base.nix index 68063f0d7787..3156ba18e106 100644 --- a/pkgs/development/python-modules/ansible/base.nix +++ b/pkgs/development/python-modules/ansible/base.nix @@ -28,11 +28,11 @@ let in buildPythonPackage rec { pname = "ansible-base"; - version = "2.10.13"; + version = "2.10.14"; src = fetchPypi { inherit pname version; - sha256 = "sha256-0sKbGUblrgh4SgdiuMSMMvg15GSNb5l6bCqBt4/0860="; + sha256 = "sha256-gAxGRsWKWJf3HyIwFn21YmoZbeuiCPDvRWChg//Z39o="; }; # ansible_connection is already wrapped, so don't pass it through diff --git a/pkgs/development/python-modules/ansible/core.nix b/pkgs/development/python-modules/ansible/core.nix index 0e2d705cc887..b64942b10780 100644 --- a/pkgs/development/python-modules/ansible/core.nix +++ b/pkgs/development/python-modules/ansible/core.nix @@ -23,17 +23,17 @@ let ansible-collections = callPackage ./collections.nix { - version = "4.4.0"; - sha256 = "031n22j0lsmh69x6i6gkva81j68b4yzh1pbg3q2h4bknl85q46ag"; + version = "4.5.0"; + sha256 = "1c8dspqy4in7sgz10y1pggwnh1hv79wap7p7xhai0f0s6nr54lyc"; }; in buildPythonPackage rec { pname = "ansible-core"; - version = "2.11.4"; + version = "2.11.5"; src = fetchPypi { inherit pname version; - sha256 = "sha256-Iuqnwt/myHXprjgDI/HLpiWcYFCl5MiBn4X5KzaD6kk="; + sha256 = "sha256-fTzkcBQSKQdFRwQ2NIXkhRP4rQ8AE4uIhw622IlT0SE="; }; # ansible_connection is already wrapped, so don't pass it through diff --git a/pkgs/development/python-modules/ansible/legacy.nix b/pkgs/development/python-modules/ansible/legacy.nix index e7687f9b99de..3957e109c7c0 100644 --- a/pkgs/development/python-modules/ansible/legacy.nix +++ b/pkgs/development/python-modules/ansible/legacy.nix @@ -18,11 +18,11 @@ buildPythonPackage rec { pname = "ansible"; - version = "2.9.25"; + version = "2.9.26"; src = fetchPypi { inherit pname version; - sha256 = "sha256-i88sL1xgnluREUyosOQibWA7h/K+cdyzOOi30626oo8="; + sha256 = "sha256-OuAqrSu+3PtBnOdevSpkjp3rc+ni2N6GyC1gR7G962M="; }; prePatch = '' diff --git a/pkgs/development/python-modules/azure-mgmt-storage/default.nix b/pkgs/development/python-modules/azure-mgmt-storage/default.nix index 86c5005c8769..3c47f7f0dad2 100644 --- a/pkgs/development/python-modules/azure-mgmt-storage/default.nix +++ b/pkgs/development/python-modules/azure-mgmt-storage/default.nix @@ -8,14 +8,14 @@ }: buildPythonPackage rec { - version = "18.0.0"; + version = "19.0.0"; pname = "azure-mgmt-storage"; disabled = !isPy3k; src = fetchPypi { inherit pname version; extension = "zip"; - sha256 = "d17beb34273797fa89863632ff0e1eb9b6a55198abb8c7f05d84980762e5f71f"; + sha256 = "f05963e5a8696d0fd4dcadda4feecb9b382a380d2e461b3647704ac787d79876"; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/boto3/1_17.nix b/pkgs/development/python-modules/boto3/1_17.nix new file mode 100644 index 000000000000..c8b8210f6503 --- /dev/null +++ b/pkgs/development/python-modules/boto3/1_17.nix @@ -0,0 +1,50 @@ +{ lib +, buildPythonPackage +, fetchPypi +, botocore +, jmespath +, s3transfer +, futures ? null +, docutils +, nose +, mock +, isPy3k +}: + +buildPythonPackage rec { + pname = "boto3"; + version = "1.17.97"; # N.B: if you change this, change botocore and awscli to a matching version + + src = fetchPypi { + inherit pname version; + sha256 = "0ab5afc51461c30f27aebef944211d16f47697b98ff8d2e2f6e49e59584853bb"; + }; + + propagatedBuildInputs = [ botocore jmespath s3transfer ] ++ lib.optionals (!isPy3k) [ futures ]; + checkInputs = [ docutils nose mock ]; + + checkPhase = '' + runHook preCheck + # This method is not in mock. It might have appeared in some versions. + sed -i 's/action.assert_called_once()/self.assertEqual(action.call_count, 1)/' \ + tests/unit/resources/test_factory.py + nosetests -d tests/unit --verbose + runHook postCheck + ''; + + # Network access + doCheck = false; + + pythonImportsCheck = [ "boto3" ]; + + meta = { + homepage = "https://github.com/boto/boto3"; + license = lib.licenses.asl20; + description = "AWS SDK for Python"; + longDescription = '' + Boto3 is the Amazon Web Services (AWS) Software Development Kit (SDK) for + Python, which allows Python developers to write software that makes use of + services like Amazon S3 and Amazon EC2. + ''; + }; +} diff --git a/pkgs/development/python-modules/boto3/default.nix b/pkgs/development/python-modules/boto3/default.nix index 07a79a6a886b..3ecc2034d483 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.106"; # N.B: if you change this, change botocore and awscli to a matching version + version = "1.18.31"; # N.B: if you change this, change botocore and awscli to a matching version src = fetchPypi { inherit pname version; - sha256 = "sha256-wHQDeLkTylP1/A26kemadSxaMK57WKDF5U4+KmjfJsU="; + sha256 = "sha256-WURdDh1VyMlnVpfqQcmKDYIImkvjB26mDjqHy+lNwUE="; }; propagatedBuildInputs = [ botocore jmespath s3transfer ] ++ lib.optionals (!isPy3k) [ futures ]; diff --git a/pkgs/development/python-modules/botocore/1_20.nix b/pkgs/development/python-modules/botocore/1_20.nix new file mode 100644 index 000000000000..d05c2decf497 --- /dev/null +++ b/pkgs/development/python-modules/botocore/1_20.nix @@ -0,0 +1,48 @@ +{ lib +, buildPythonPackage +, fetchPypi +, python-dateutil +, jmespath +, docutils +, ordereddict +, simplejson +, mock +, nose +, urllib3 +}: + +buildPythonPackage rec { + pname = "botocore"; + version = "1.20.97"; # N.B: if you change this, change boto3 and awscli to a matching version + + src = fetchPypi { + inherit pname version; + sha256 = "f7e119cf3e0f4a36100f0e983583afa91a84fb27c479a1716820aee4f2e190ab"; + }; + + propagatedBuildInputs = [ + python-dateutil + jmespath + docutils + ordereddict + simplejson + urllib3 + ]; + + checkInputs = [ mock nose ]; + + checkPhase = '' + nosetests -v + ''; + + # Network access + doCheck = false; + + pythonImportsCheck = [ "botocore" ]; + + meta = with lib; { + homepage = "https://github.com/boto/botocore"; + license = licenses.asl20; + description = "A low-level interface to a growing number of Amazon Web Services"; + }; +} diff --git a/pkgs/development/python-modules/botocore/default.nix b/pkgs/development/python-modules/botocore/default.nix index fc275edcc9de..cdb3f54c855e 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.106"; # N.B: if you change this, change boto3 and awscli to a matching version + version = "1.21.31"; # N.B: if you change this, change boto3 and awscli to a matching version src = fetchPypi { inherit pname version; - sha256 = "sha256-bVyYOAix0AQ39W0MCEEr2C2fgBL9t35VX5cneh/U1d8="; + sha256 = "sha256-WM0xXirglxrNs9fNqcnDa0HHMYH0GUOnRDgS1tPJrRg="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/breathe/default.nix b/pkgs/development/python-modules/breathe/default.nix index d863d9463992..7770996f423d 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.30.0"; + version = "4.31.0"; pname = "breathe"; disabled = isPy27; src = fetchPypi { inherit pname version; - sha256 = "363dec85abc0c4b3f22628b0cf82cc2dc46c4397d8a18312d1a7d1365d49b014"; + sha256 = "925eeff96c6640cd857e4ddeae6f75464a1d5e2e08ee56dccce4043583ae2050"; }; propagatedBuildInputs = [ docutils six sphinx ]; diff --git a/pkgs/development/python-modules/gdown/default.nix b/pkgs/development/python-modules/gdown/default.nix index bbb7c195d902..1528136bc394 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.13.0"; + version = "3.13.1"; src = fetchPypi { inherit pname version; - sha256 = "d5f9389539673875712beba4936c4ace95d24324953c6f0408a858c534c0bf21"; + sha256 = "sha256-vh1NKRPk1e5cT3cVj8IrzmpaZ9yY2KtWrTGsCU9KkP4="; }; propagatedBuildInputs = [ filelock requests tqdm setuptools six ]; diff --git a/pkgs/development/python-modules/gensim/default.nix b/pkgs/development/python-modules/gensim/default.nix index 8972b356805a..ca185d517b14 100644 --- a/pkgs/development/python-modules/gensim/default.nix +++ b/pkgs/development/python-modules/gensim/default.nix @@ -11,12 +11,12 @@ buildPythonPackage rec { pname = "gensim"; - version = "4.1.0"; + version = "4.1.1"; disabled = !isPy3k; src = fetchPypi { inherit pname version; - sha256 = "0b09983048a97c7915ab50500bc53eeec438d26366041598709ec156db3eef1f"; + sha256 = "7c762daa4029046dfbe467fdd79f911aa140748bf50dc64dbeddc8eaa07f760b"; }; propagatedBuildInputs = [ smart-open numpy six scipy ]; 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 30174afcbb05..6436fe9d6089 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.7.0"; + version = "2.7.1"; src = fetchPypi { inherit pname version; - sha256 = "sha256-gfNoCfh2ssHgYcQ1kfQedcfhpqsu3x50hdYrm11SKGo="; + sha256 = "84ae86a2320425df2e78d981d4ab26bff591ade1b978c18c929188b741a7b37d"; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/green/default.nix b/pkgs/development/python-modules/green/default.nix index 0320a3858be1..540d3027b94e 100644 --- a/pkgs/development/python-modules/green/default.nix +++ b/pkgs/development/python-modules/green/default.nix @@ -1,9 +1,11 @@ -{ lib, buildPythonPackage, fetchPypi, isPy3k +{ lib +, buildPythonPackage +, isPy3k +, fetchPypi , colorama , coverage -, termstyle -, lxml , unidecode +, lxml }: buildPythonPackage rec { @@ -17,13 +19,22 @@ buildPythonPackage rec { sha256 = "a4d86f2dfa4ccbc86f24bcb9c9ab8bf34219c876c24e9f0603aab4dfe73bb575"; }; + patches = [ + ./tests.patch + ]; + + postPatch = '' + substituteInPlace green/test/test_integration.py \ + --subst-var-by green "$out/bin/green" + ''; + propagatedBuildInputs = [ - colorama coverage termstyle unidecode lxml + colorama coverage unidecode lxml ]; # let green run it's own test suite checkPhase = '' - $out/bin/green green + $out/bin/green -tvvv green ''; meta = with lib; { diff --git a/pkgs/development/python-modules/green/tests.patch b/pkgs/development/python-modules/green/tests.patch new file mode 100644 index 000000000000..7e1c3be62e3f --- /dev/null +++ b/pkgs/development/python-modules/green/tests.patch @@ -0,0 +1,22 @@ +diff --git a/green/test/test_integration.py b/green/test/test_integration.py +index 0cf8cbb..40d9f6b 100644 +--- a/green/test/test_integration.py ++++ b/green/test/test_integration.py +@@ -41,9 +41,7 @@ class TestFinalizer(unittest.TestCase): + ) + fh.close() + args = [ +- sys.executable, +- "-m", +- "green.cmdline", ++ "@green@", + "--finalizer=test_finalizer0.msg", + "--maxtasksperchild=1", + ] +@@ -58,6 +56,5 @@ class TestFinalizer(unittest.TestCase): + stdout=subprocess.PIPE, + stderr=subprocess.STDOUT, + env=env, +- timeout=10, + ).stdout.decode("utf-8") + self.assertIn("finalizer worked", output) diff --git a/pkgs/development/python-modules/gssapi/default.nix b/pkgs/development/python-modules/gssapi/default.nix index cbb81d3c7f61..ce2ba8d3730f 100644 --- a/pkgs/development/python-modules/gssapi/default.nix +++ b/pkgs/development/python-modules/gssapi/default.nix @@ -17,14 +17,14 @@ buildPythonPackage rec { pname = "gssapi"; - version = "1.6.14"; + version = "1.7.0"; disabled = pythonOlder "3.6"; src = fetchFromGitHub { owner = "pythongssapi"; repo = "python-${pname}"; rev = "v${version}"; - sha256 = "sha256-pL8uvHUdev+nDG0nGh7j7VIJCIQv0egPoTa9hUMuEZc="; + sha256 = "0ybijgsr4ra7x1w86sva4qljhm54ilm2zv4z0ry1r14kq9hmjfa4"; }; # It's used to locate headers diff --git a/pkgs/development/python-modules/lark-parser/default.nix b/pkgs/development/python-modules/lark-parser/default.nix index 9f787563e5a4..c1c67fd4c1ea 100644 --- a/pkgs/development/python-modules/lark-parser/default.nix +++ b/pkgs/development/python-modules/lark-parser/default.nix @@ -7,13 +7,13 @@ buildPythonPackage rec { pname = "lark-parser"; - version = "0.11.3"; + version = "0.12.0"; src = fetchFromGitHub { owner = "lark-parser"; repo = "lark"; rev = version; - sha256 = "1ggvlzpdzlrxl46fgi8cfq2rzlwn21shpdkm4pknnhfjlsinv913"; + sha256 = "sha256-zcMGCn3ixD3dJg3GlC/ijs+U1JN1BodHLTXZc/5UR7Y="; }; # Optional import, but fixes some re known bugs & allows advanced regex features diff --git a/pkgs/development/python-modules/mypy-protobuf/default.nix b/pkgs/development/python-modules/mypy-protobuf/default.nix index 17b0d068c981..c7194d19b5cb 100644 --- a/pkgs/development/python-modules/mypy-protobuf/default.nix +++ b/pkgs/development/python-modules/mypy-protobuf/default.nix @@ -1,4 +1,4 @@ -{ lib, fetchPypi, buildPythonApplication, protobuf, pythonOlder }: +{ lib, fetchPypi, buildPythonApplication, protobuf, types-protobuf, grpcio-tools, pythonOlder }: buildPythonApplication rec { pname = "mypy-protobuf"; @@ -11,7 +11,7 @@ buildPythonApplication rec { sha256 = "278172935d7121c2f8c7c0a05518dd565a2b76d9e9c4a0a3fcd08a21fa685d43"; }; - propagatedBuildInputs = [ protobuf ]; + propagatedBuildInputs = [ protobuf types-protobuf grpcio-tools ]; meta = with lib; { description = "Generate mypy stub files from protobuf specs"; diff --git a/pkgs/development/python-modules/ptpython/default.nix b/pkgs/development/python-modules/ptpython/default.nix index f6befe1bd622..cfe65a24ece3 100644 --- a/pkgs/development/python-modules/ptpython/default.nix +++ b/pkgs/development/python-modules/ptpython/default.nix @@ -10,12 +10,12 @@ buildPythonPackage rec { pname = "ptpython"; - version = "3.0.19"; + version = "3.0.20"; disabled = !isPy3k; src = fetchPypi { inherit pname version; - sha256 = "b3d41ce7c2ce0e7e55051347eae400fc56b9b42b1c4a9db25b19ccf6195bfc12"; + sha256 = "eafd4ced27ca5dc370881d4358d1ab5041b32d88d31af8e3c24167fe4af64ed6"; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/pypandoc/default.nix b/pkgs/development/python-modules/pypandoc/default.nix index 3d3af7f4669b..ecb87d951b31 100644 --- a/pkgs/development/python-modules/pypandoc/default.nix +++ b/pkgs/development/python-modules/pypandoc/default.nix @@ -4,13 +4,13 @@ buildPythonPackage rec { pname = "pypandoc"; - version = "1.6.3"; + version = "1.6.4"; src = fetchFromGitHub { owner = "NicklasTegner"; repo = pname; - rev = version; - sha256 = "163wkcm06klr68dadr9mb8gblj0ls26w097bjrg4f5j0533ysdpp"; + rev = "v${version}"; + sha256 = "0rssjig3nwdi4qvsjq7v7k8jyv6l9szfl5dp1a8s54c4j4dw37nh"; }; patches = [ diff --git a/pkgs/development/python-modules/python-sql/default.nix b/pkgs/development/python-modules/python-sql/default.nix index a07941e5de4a..a32dcfa5f003 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.2"; + version = "1.3.0"; src = fetchPypi { inherit pname version; - sha256 = "2d916357a0172c35eccac29064cd18cd41616fc60109a37dac0e9d11a0b1183a"; + sha256 = "9d603a6273f2f5966bab7ce77e1f50e88818d5237ac85e566e2dc84ebfabd176"; }; meta = { diff --git a/pkgs/development/python-modules/s3transfer/0_4.nix b/pkgs/development/python-modules/s3transfer/0_4.nix new file mode 100644 index 000000000000..8cfd324f00a5 --- /dev/null +++ b/pkgs/development/python-modules/s3transfer/0_4.nix @@ -0,0 +1,52 @@ +{ lib +, fetchPypi +, pythonOlder +, buildPythonPackage +, docutils +, mock +, nose +, coverage +, wheel +, unittest2 +, botocore +, futures ? null +}: + +buildPythonPackage rec { + pname = "s3transfer"; + version = "0.4.2"; + + src = fetchPypi { + inherit pname version; + sha256 = "sha256-ywIvSxZVHt67sxo3fT8JYA262nNj2MXbeXbn9Hcy4bI="; + }; + + propagatedBuildInputs = + [ + botocore + ] ++ lib.optional (pythonOlder "3") futures; + + buildInputs = [ + docutils + mock + nose + coverage + wheel + unittest2 + ]; + + checkPhase = '' + pushd s3transfer/tests + nosetests -v unit/ functional/ + popd + ''; + + # version on pypi has no tests/ dir + doCheck = false; + + meta = with lib; { + homepage = "https://github.com/boto/s3transfer"; + license = licenses.asl20; + description = "A library for managing Amazon S3 transfers"; + }; +} diff --git a/pkgs/development/python-modules/s3transfer/default.nix b/pkgs/development/python-modules/s3transfer/default.nix index e41e4165b9cb..9ed50fb9e49e 100644 --- a/pkgs/development/python-modules/s3transfer/default.nix +++ b/pkgs/development/python-modules/s3transfer/default.nix @@ -14,15 +14,16 @@ buildPythonPackage rec { pname = "s3transfer"; - version = "0.4.2"; + version = "0.5.0"; src = fetchPypi { inherit pname version; - sha256 = "sha256-ywIvSxZVHt67sxo3fT8JYA262nNj2MXbeXbn9Hcy4bI="; + sha256 = "sha256-UO2CPh3FhorUDI3JIHL3V6oOZToZKEXJSjtnb0pi2kw="; }; propagatedBuildInputs = - [ botocore + [ + botocore ] ++ lib.optional (pythonOlder "3") futures; buildInputs = [ diff --git a/pkgs/development/python-modules/spacy/legacy.nix b/pkgs/development/python-modules/spacy/legacy.nix index f8b011d83ccf..9bb37e9beb18 100644 --- a/pkgs/development/python-modules/spacy/legacy.nix +++ b/pkgs/development/python-modules/spacy/legacy.nix @@ -6,11 +6,11 @@ buildPythonPackage rec { pname = "spacy-legacy"; - version = "3.0.5"; + version = "3.0.8"; src = fetchPypi { inherit pname version; - sha256 = "sha256-Uy94rjFllSj622RTzd6UJaQmIniCw4gpeq/X57QcIpA="; + sha256 = "b4725c5c161f0685ab4fce3fc912bc68aefdb7e102ba9848e852bb5842256c2f"; }; # checkInputs = [ pytestCheckHook spacy ]; diff --git a/pkgs/development/python-modules/sphinx-argparse/default.nix b/pkgs/development/python-modules/sphinx-argparse/default.nix index 3f1a80c3c97b..bd7197b2bf2b 100644 --- a/pkgs/development/python-modules/sphinx-argparse/default.nix +++ b/pkgs/development/python-modules/sphinx-argparse/default.nix @@ -7,11 +7,11 @@ buildPythonPackage rec { pname = "sphinx-argparse"; - version = "0.2.5"; + version = "0.3.1"; src = fetchPypi { inherit pname version; - sha256 = "05wc8f5hb3jsg2vh2jf7jsyan8d4i09ifrz2c8fp6f7x1zw9iav0"; + sha256 = "82151cbd43ccec94a1530155f4ad34f251aaca6a0ffd5516d7fadf952d32dc1e"; }; checkInputs = [ diff --git a/pkgs/development/python-modules/teslajsonpy/default.nix b/pkgs/development/python-modules/teslajsonpy/default.nix index 6fefda407f90..d66ce20d697e 100644 --- a/pkgs/development/python-modules/teslajsonpy/default.nix +++ b/pkgs/development/python-modules/teslajsonpy/default.nix @@ -14,14 +14,14 @@ buildPythonPackage rec { pname = "teslajsonpy"; - version = "0.19.0"; + version = "0.21.0"; format = "pyproject"; src = fetchFromGitHub { owner = "zabuldon"; repo = pname; rev = "v${version}"; - sha256 = "04ihjxysfmppwa7rnz86nd89wrqks2gwvcza8707yddzfp5hh8id"; + sha256 = "1rwp3aag21hdkis2wx680ckja0203grm7naldaj8d2kpy4697m54"; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/types-futures/default.nix b/pkgs/development/python-modules/types-futures/default.nix new file mode 100644 index 000000000000..5e9ebe7fa7fd --- /dev/null +++ b/pkgs/development/python-modules/types-futures/default.nix @@ -0,0 +1,18 @@ +{ buildPythonPackage, fetchPypi, lib }: + +buildPythonPackage rec { + pname = "types-futures"; + version = "3.3.0"; + + src = fetchPypi { + inherit pname version; + sha256 = "1p00wb93af01b6fw9wxk9qm4kbhqwb48nszmm16slsrc1nx4px25"; + }; + + meta = with lib; { + description = "Typing stubs for futures"; + homepage = "https://github.com/python/typeshed"; + license = licenses.asl20; + maintainers = with maintainers; [ andersk ]; + }; +} diff --git a/pkgs/development/python-modules/types-protobuf/default.nix b/pkgs/development/python-modules/types-protobuf/default.nix new file mode 100644 index 000000000000..5d9737c5803e --- /dev/null +++ b/pkgs/development/python-modules/types-protobuf/default.nix @@ -0,0 +1,20 @@ +{ buildPythonPackage, fetchPypi, lib, types-futures }: + +buildPythonPackage rec { + pname = "types-protobuf"; + version = "3.17.4"; + + src = fetchPypi { + inherit pname version; + sha256 = "0r42kzspqna2b2jiz9bjzagrd4gbh0sd6jp4v7i9nv09y0ifrkrn"; + }; + + propagatedBuildInputs = [ types-futures ]; + + meta = with lib; { + description = "Typing stubs for protobuf"; + homepage = "https://github.com/python/typeshed"; + license = licenses.asl20; + maintainers = with maintainers; [ andersk ]; + }; +} diff --git a/pkgs/development/python-modules/velbus-aio/default.nix b/pkgs/development/python-modules/velbus-aio/default.nix new file mode 100644 index 000000000000..e7fc0f62d5e3 --- /dev/null +++ b/pkgs/development/python-modules/velbus-aio/default.nix @@ -0,0 +1,38 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, pythonOlder +, pyserial-asyncio +, pytestCheckHook +}: + +buildPythonPackage rec { + pname = "velbus-aio"; + version = "2021.9.1"; + + disabled = pythonOlder "3.7"; + + src = fetchFromGitHub { + owner = "Cereal2nd"; + repo = pname; + rev = version; + sha256 = "0q7jrjljp65lrazv2yjsiw69240vmhcss3dqrgxhq79dpyck6zfl"; + }; + + propagatedBuildInputs = [ + pyserial-asyncio + ]; + + checkInputs = [ + pytestCheckHook + ]; + + pythonImportsCheck = [ " velbusaio" ]; + + meta = with lib; { + description = "Python library to support the Velbus home automation system"; + homepage = "https://github.com/Cereal2nd/velbus-aio"; + license = with licenses; [ asl20 ]; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/pkgs/development/python-modules/vidstab/default.nix b/pkgs/development/python-modules/vidstab/default.nix index 7137205b3508..b4a16c44a072 100644 --- a/pkgs/development/python-modules/vidstab/default.nix +++ b/pkgs/development/python-modules/vidstab/default.nix @@ -9,12 +9,12 @@ }: buildPythonPackage rec { - version = "1.7.3"; + version = "1.7.4"; pname = "vidstab"; src = fetchPypi { inherit pname version; - sha256 = "649a77a0c1b670d13a1bf411451945d7da439364dc0c33ee3636a23f1d82b456"; + sha256 = "865c4a097e2a8527aa8bfc96ab0bcc0d280a88cc93eabcc36531268f5d343ce1"; }; propagatedBuildInputs = [ numpy pandas imutils progress matplotlib ]; diff --git a/pkgs/development/python-modules/ytmusicapi/default.nix b/pkgs/development/python-modules/ytmusicapi/default.nix index 77a579eba9c7..ea832db8a648 100644 --- a/pkgs/development/python-modules/ytmusicapi/default.nix +++ b/pkgs/development/python-modules/ytmusicapi/default.nix @@ -7,13 +7,13 @@ buildPythonPackage rec { pname = "ytmusicapi"; - version = "0.19.1"; + version = "0.19.2"; disabled = isPy27; src = fetchPypi { inherit pname version; - sha256 = "1b8a050e2208b3d05359106d8c44c3d62e60edf6753529bd8a207788a6caeb95"; + sha256 = "sha256-Vmf3eZpeRPDYWy6fc8VRYsQZJrwwX3KTs0njfPy6HRE="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/tools/misc/cvise/default.nix b/pkgs/development/tools/misc/cvise/default.nix index e24c133e8b90..80d2a73cc425 100644 --- a/pkgs/development/tools/misc/cvise/default.nix +++ b/pkgs/development/tools/misc/cvise/default.nix @@ -1,4 +1,4 @@ -{ lib, buildPythonApplication, fetchFromGitHub, cmake, flex +{ lib, buildPythonApplication, fetchFromGitHub, bash, cmake, flex , libclang, llvm, unifdef , pebble, psutil, pytestCheckHook, pytest-flake8 }: @@ -20,10 +20,16 @@ buildPythonApplication rec { ]; nativeBuildInputs = [ cmake flex llvm.dev ]; - buildInputs = [ libclang llvm llvm.dev unifdef ]; + buildInputs = [ bash libclang llvm llvm.dev unifdef ]; propagatedBuildInputs = [ pebble psutil ]; checkInputs = [ pytestCheckHook pytest-flake8 unifdef ]; + # 'cvise --command=...' generates a script with hardcoded shebang. + postPatch = '' + substituteInPlace cvise.py \ + --replace "#!/bin/bash" "#!${bash}/bin/bash" + ''; + preCheck = '' patchShebangs cvise.py ''; diff --git a/pkgs/development/tools/tabnine/default.nix b/pkgs/development/tools/tabnine/default.nix index 3259a5fc41bd..2a4d1718a790 100644 --- a/pkgs/development/tools/tabnine/default.nix +++ b/pkgs/development/tools/tabnine/default.nix @@ -3,16 +3,16 @@ let platform = if stdenv.hostPlatform.system == "x86_64-linux" then { name = "x86_64-unknown-linux-musl"; - sha256 = "sha256-uy3+/+XMq56rO75mmSeOmE1HW7hhefaGwfY/QJPk3Ok="; + sha256 = "sha256-+jxjHE2/6IGptMlKXGebHcaIVokOP76ut325EbkdaA0="; } else if stdenv.hostPlatform.system == "x86_64-darwin" then { name = "x86_64-apple-darwin"; - sha256 = "sha256-EK7FbRzgaCXviOuBcRf/ElllRdakhDmOLsKkwrIEhBU="; + sha256 = "sha256-87Hy1akNrZWQbKutkv4CToTyMcxRc7Y24o1+vI4pev8="; } else throw "Not supported on ${stdenv.hostPlatform.system}"; in stdenv.mkDerivation rec { pname = "tabnine"; # You can check the latest version with `curl -sS https://update.tabnine.com/bundles/version` - version = "3.5.49"; + version = "3.6.8"; src = fetchurl { url = "https://update.tabnine.com/bundles/${version}/${platform.name}/TabNine.zip"; diff --git a/pkgs/games/qtads/default.nix b/pkgs/games/qtads/default.nix index f966798ce4e6..13593044451e 100644 --- a/pkgs/games/qtads/default.nix +++ b/pkgs/games/qtads/default.nix @@ -4,13 +4,13 @@ mkDerivation rec { pname = "qtads"; - version = "3.0.0"; + version = "3.1.0"; src = fetchFromGitHub { owner = "realnc"; repo = pname; rev = "v${version}"; - sha256 = "02kk2hs20h9ffhylwms9f8zikmmlrz1nvbrm97gis9iljkyx035c"; + sha256 = "sha256-DxbVYFHIVFF/5ZeHIeu3k+btCvw/qfM7uoH5mb1ikoE="; }; nativeBuildInputs = [ pkg-config qmake ]; diff --git a/pkgs/misc/vim-plugins/overrides.nix b/pkgs/misc/vim-plugins/overrides.nix index a80ed2061e58..77cd302d13ab 100644 --- a/pkgs/misc/vim-plugins/overrides.nix +++ b/pkgs/misc/vim-plugins/overrides.nix @@ -142,7 +142,7 @@ self: super: { dependencies = with self; [ completion-nvim ]; buildInputs = [ tabnine ]; postFixup = '' - mkdir $target/binaries + mkdir -p $target/binaries ln -s ${tabnine}/bin/TabNine $target/binaries/TabNine_$(uname -s) ''; }); diff --git a/pkgs/servers/libreddit/default.nix b/pkgs/servers/libreddit/default.nix index 6963f508c855..be33c6ffc741 100644 --- a/pkgs/servers/libreddit/default.nix +++ b/pkgs/servers/libreddit/default.nix @@ -8,16 +8,16 @@ rustPlatform.buildRustPackage rec { pname = "libreddit"; - version = "0.15.1"; + version = "0.15.2"; src = fetchFromGitHub { owner = "spikecodes"; repo = pname; rev = "v${version}"; - sha256 = "sha256-Df2WedLOz4wpot0Isy3JCF5p1sV9Hx3bkTNp1KkSfHQ="; + sha256 = "sha256-+oROogXovkHLjLf5KLrolF2AzTd3krXMMzUyiCIHrgE="; }; - cargoSha256 = "sha256-eR/0gpuEBQ7gHrSmJqGaM4vqKwg9WZdVVnBU4DgJcVQ="; + cargoSha256 = "sha256-JixEh9xmWzKwC7Rr5xVmRFrGbgqvbxqIGKmGGSeLllQ="; buildInputs = lib.optional stdenv.isDarwin Security; diff --git a/pkgs/servers/minio/default.nix b/pkgs/servers/minio/default.nix index 9293b4c48f01..7fba57a94be6 100644 --- a/pkgs/servers/minio/default.nix +++ b/pkgs/servers/minio/default.nix @@ -15,16 +15,16 @@ let in buildGoModule rec { pname = "minio"; - version = "2021-08-25T00-41-18Z"; + version = "2021-09-15T04-54-25Z"; src = fetchFromGitHub { owner = "minio"; repo = "minio"; rev = "RELEASE.${version}"; - sha256 = "sha256-gwP1q+5vjgCnrnvWTxPC66fugVrilC1WbLk3SP4NXqA="; + sha256 = "sha256-h1RuYRduCZFCklwa/gvkTZXTi71UDb8ofMPb+X9KIuA="; }; - vendorSha256 = "sha256-JcgMJ6xz3h3YJ1zoSJLCWdWGmd12MPvxcIPX1ZbhpaM="; + vendorSha256 = "sha256-ccqa5ltblk1Z/RRJkC1h+EpkxylWdKXfNRYOeOzrPb4="; doCheck = false; diff --git a/pkgs/tools/admin/awscli/default.nix b/pkgs/tools/admin/awscli/default.nix index 556539eddd2b..cf87652ab39e 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.106"; # N.B: if you change this, change botocore and boto3 to a matching version too + version = "1.20.31"; # N.B: if you change this, change botocore and boto3 to a matching version too src = fetchPypi { inherit pname version; - sha256 = "sha256-6o24GUcT3efgK5+Wa7n4+EeA5qXmAGhybzed7ybdT9Q="; + sha256 = "sha256-qDKnxh4M+LOXYp1xCvW0S0IE5NnwvFpYelUCCjA18zQ="; }; # https://github.com/aws/aws-cli/issues/4837 diff --git a/pkgs/tools/admin/eksctl/default.nix b/pkgs/tools/admin/eksctl/default.nix index d152ef128392..9dcdfef17e78 100644 --- a/pkgs/tools/admin/eksctl/default.nix +++ b/pkgs/tools/admin/eksctl/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "eksctl"; - version = "0.62.0"; + version = "0.66.0"; src = fetchFromGitHub { owner = "weaveworks"; repo = pname; rev = version; - sha256 = "sha256-1WIkUXqcDagrAivozgLjXsiIUsVQ7mOp2ODivHEfNkQ="; + sha256 = "sha256-taKLOL3bdKFdLc6WbF7Q1vCqkRvv/X1NTvSSaYRYHyU="; }; - vendorSha256 = "sha256-AWNTjqEeSEoXO9wcpEXM3y1AeqQYlbswjr0kXvXqGjk="; + vendorSha256 = "sha256-AHkMFuL1zWnv6Z4kCnKsZdqZZaYsQ8AIDmMOLQ+HvkI="; doCheck = false; diff --git a/pkgs/tools/admin/stripe-cli/default.nix b/pkgs/tools/admin/stripe-cli/default.nix index 5420916b884d..549b60c6dbeb 100644 --- a/pkgs/tools/admin/stripe-cli/default.nix +++ b/pkgs/tools/admin/stripe-cli/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "stripe-cli"; - version = "1.7.1"; + version = "1.7.3"; src = fetchFromGitHub { owner = "stripe"; repo = pname; rev = "v${version}"; - sha256 = "sha256-nu4QcL6r7ivp8wQ8SFe4bOfYX6Iui2czHQ3ucy7K+dk="; + sha256 = "sha256-Hlh2nfqQD+HMoJ2n1vfffn5ieEKSMtXpdoM0ydFQqrc="; }; - vendorSha256 = "sha256-LOSHoEP0YRjfHav3MXSYPPrrjX6/ItxeVMOihRx0DTQ="; + vendorSha256 = "sha256-DTNwgerJ7qZxH4imdrST7TaR20oevDluEDgAlubg5hw="; subPackages = [ "cmd/stripe" diff --git a/pkgs/tools/misc/cloud-sql-proxy/default.nix b/pkgs/tools/misc/cloud-sql-proxy/default.nix index 6f5a6ec25fbb..f1f7d1bf2392 100644 --- a/pkgs/tools/misc/cloud-sql-proxy/default.nix +++ b/pkgs/tools/misc/cloud-sql-proxy/default.nix @@ -1,27 +1,24 @@ -{ lib, buildGoPackage, fetchgit }: +{ lib, buildGoModule, fetchFromGitHub }: -buildGoPackage rec { +buildGoModule rec { pname = "cloud-sql-proxy"; - version = "1.13"; + version = "1.25.0"; - goPackagePath = "github.com/GoogleCloudPlatform/cloudsql-proxy"; + src = fetchFromGitHub { + owner = "GoogleCloudPlatform"; + repo = "cloudsql-proxy"; + rev = "v${version}"; + sha256 = "0vz5fm1bgh2g7b320hchpfb4iql1src1rpm7324sqcd26p7w3mnl"; + }; subPackages = [ "cmd/cloud_sql_proxy" ]; - src = fetchgit { - rev = version; - url = "https://${goPackagePath}"; - sha256 = "07n2hfhqa9hinabmx79aqqwxzzkky76x3jvpd89kch14fijbh532"; - }; - - goDeps = ./deps.nix; - - ldflags = [ "-X main.versionString=${version}" ]; + vendorSha256 = "04y6zx3jdyj07d68a4vk4p5rzvvjnvdwk9kkipmlmqg1xqwlb84m"; meta = with lib; { description = "An authenticating proxy for Second Generation Google Cloud SQL databases"; - homepage = "https://${goPackagePath}"; + homepage = "https://github.com/GoogleCloudPlatform/cloudsql-proxy"; license = licenses.asl20; - maintainers = [ maintainers.nicknovitski ]; + maintainers = with maintainers; [ nicknovitski ]; }; } diff --git a/pkgs/tools/misc/cloud-sql-proxy/deps.nix b/pkgs/tools/misc/cloud-sql-proxy/deps.nix deleted file mode 100644 index 6898833b6f12..000000000000 --- a/pkgs/tools/misc/cloud-sql-proxy/deps.nix +++ /dev/null @@ -1,48 +0,0 @@ -# This file was generated by https://github.com/kamilchm/go2nix v1.2.1 -[ - { - goPackagePath = "bazil.org/fuse"; - fetch = { - type = "git"; - url = "https://github.com/bazil/fuse"; - rev = "65cc252bf6691cb3c7014bcb2c8dc29de91e3a7e"; - sha256 = "0qjm9yrhc5h632wwhklqzhalid4lxcm9iwsqs3jahp303rm27vpk"; - }; - } - { - goPackagePath = "cloud.google.com/go"; - fetch = { - type = "git"; - url = "https://code.googlesource.com/gocloud"; - rev = "dba8c2c195294739180b3e6865f8893eb808676e"; - sha256 = "1l6aj26sd7byjcgi2b4k452fcg949v28lff2fkw5nq2qr2fjnqxy"; - }; - } - { - goPackagePath = "golang.org/x/net"; - fetch = { - type = "git"; - url = "https://go.googlesource.com/net"; - rev = "9b4f9f5ad5197c79fd623a3638e70d8b26cef344"; - sha256 = "06hvxy113h76f31gv1mq6vdr6xja1zv0fdig686l2b4y2b6swych"; - }; - } - { - goPackagePath = "golang.org/x/oauth2"; - fetch = { - type = "git"; - url = "https://go.googlesource.com/oauth2"; - rev = "9dcd33a902f40452422c2367fefcb95b54f9f8f8"; - sha256 = "15lfa780h2ff50qvcdl7sfs9f9j13fa5kfj6fb292rk3fwxhnx4i"; - }; - } - { - goPackagePath = "google.golang.org/api"; - fetch = { - type = "git"; - url = "https://code.googlesource.com/google-api-go-client"; - rev = "39567f0042a03aeb2691599961ed4454e43d5063"; - sha256 = "0c5gx156v1pk0gqvl9w43l06z0rh9g2sackpl9ghds0asnyqx04d"; - }; - } -] diff --git a/pkgs/tools/misc/vimpager/build.nix b/pkgs/tools/misc/vimpager/build.nix index ec1766d7af31..a610a461656c 100644 --- a/pkgs/tools/misc/vimpager/build.nix +++ b/pkgs/tools/misc/vimpager/build.nix @@ -18,7 +18,8 @@ stdenv.mkDerivation { rev = version; }; - buildInputs = [ coreutils sharutils ]; # for uuencode + nativeBuildInputs = [ sharutils ]; # for uuencode + buildInputs = [ coreutils ]; makeFlags = [ "PREFIX=$(out)" diff --git a/pkgs/tools/networking/xh/default.nix b/pkgs/tools/networking/xh/default.nix index 90f99120cd49..75eaa8774df2 100644 --- a/pkgs/tools/networking/xh/default.nix +++ b/pkgs/tools/networking/xh/default.nix @@ -3,16 +3,16 @@ rustPlatform.buildRustPackage rec { pname = "xh"; - version = "0.12.0"; + version = "0.13.0"; src = fetchFromGitHub { owner = "ducaale"; repo = "xh"; rev = "v${version}"; - sha256 = "sha256-icJBQdFWdiHCYrZ7U90g6CdXdAkv3Y/WJu0IfZAdGv0="; + sha256 = "sha256-fTd4VSUUj9Im+kCEuFgDsA7eofM1xQfrRzigr1vyJ3I="; }; - cargoSha256 = "sha256-htv5OQnat4Qi6A6lmVonuz+8/DWz8fOGYPbnCnlizBo="; + cargoSha256 = "sha256-yZdGw/6iVg8PaUyjTrxj6h/2yhBtqEqvMhdRHhMwDZc="; nativeBuildInputs = [ installShellFiles pkg-config ]; diff --git a/pkgs/tools/virtualization/shipyard/default.nix b/pkgs/tools/virtualization/shipyard/default.nix index 7fe09aa6b426..6994cc25b384 100644 --- a/pkgs/tools/virtualization/shipyard/default.nix +++ b/pkgs/tools/virtualization/shipyard/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "shipyard"; - version = "0.3.27"; + version = "0.3.30"; src = fetchFromGitHub { rev = "v${version}"; owner = "shipyard-run"; repo = pname; - sha256 = "sha256-VbcOoIMhY4FpfQbC2ESFaPoV9AS5DpGvid8jcQxLuEE="; + sha256 = "sha256-NaCG0oG9j1yoXOsfnQXFd+PdZfJTOdvYndFIftIAnxE="; }; vendorSha256 = "sha256-YClNdtnakJJOEytTbopTXeZy218N4vHP3tQLavLgPbg="; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 5f3300b6df99..e1747a5f4d53 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -960,6 +960,8 @@ with pkgs; inherit (lxqt) qtermwidget; }; + darktile = callPackage ../applications/terminal-emulators/darktile { }; + eterm = callPackage ../applications/terminal-emulators/eterm { }; evilvte = callPackage ../applications/terminal-emulators/evilvte (config.evilvte or {}); diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 8c005de4611b..19ee538be2d8 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -9133,6 +9133,10 @@ in { types-decorator = callPackage ../development/python-modules/types-decorator { }; + types-futures = callPackage ../development/python-modules/types-futures { }; + + types-protobuf = callPackage ../development/python-modules/types-protobuf { }; + types-pytz = callPackage ../development/python-modules/types-pytz { }; types-requests = callPackage ../development/python-modules/types-requests { }; @@ -9321,6 +9325,8 @@ in { venusian = callPackage ../development/python-modules/venusian { }; + velbus-aio = callPackage ../development/python-modules/velbus-aio { }; + verboselogs = callPackage ../development/python-modules/verboselogs { }; versioneer = callPackage ../development/python-modules/versioneer { }; diff --git a/pkgs/top-level/python2-packages.nix b/pkgs/top-level/python2-packages.nix index 57e6987e6703..07773c29e801 100644 --- a/pkgs/top-level/python2-packages.nix +++ b/pkgs/top-level/python2-packages.nix @@ -36,6 +36,10 @@ with self; with super; { box2d = callPackage ../development/python-modules/box2d { }; + boto3 = callPackage ../development/python-modules/boto3/1_17.nix {}; + + botocore = callPackage ../development/python-modules/botocore/1_20.nix {}; + browsermob-proxy = callPackage ../development/python-modules/browsermob-proxy { }; cairocffi = callPackage ../development/python-modules/cairocffi/0_9.nix { }; @@ -544,6 +548,8 @@ with self; with super; { rsa = callPackage ../development/python-modules/rsa/4_0.nix { }; + s3transfer = callPackage ../development/python-modules/s3transfer/0_4.nix { }; + sandboxlib = callPackage ../development/python-modules/sandboxlib { }; scandir = callPackage ../development/python-modules/scandir { };