diff --git a/doc/languages-frameworks/index.xml b/doc/languages-frameworks/index.xml index 516bddf67fd4..49cdf94a44ab 100644 --- a/doc/languages-frameworks/index.xml +++ b/doc/languages-frameworks/index.xml @@ -20,9 +20,9 @@ + - diff --git a/doc/languages-frameworks/javascript.section.md b/doc/languages-frameworks/javascript.section.md new file mode 100644 index 000000000000..008424ff458b --- /dev/null +++ b/doc/languages-frameworks/javascript.section.md @@ -0,0 +1,203 @@ +# Javascript {#language-javascript} + +## Introduction {#javascript-introduction} + +This contains instructions on how to package javascript applications. For instructions on how to add a cli package from npm please consult the #node.js section + +The various tools available will be listed in the [tools-overview](#javascript-tools-overview). Some general principles for packaging will follow. Finally some tool specific instructions will be given. + +## Tools overview {#javascript-tools-overview} + +## General principles {#javascript-general-principles} + +The following principles are given in order of importance with potential exceptions. + +### Try to use the same node version used upstream {#javascript-upstream-node-version} + +It is often not documented which node version is used upstream, but if it is, try to use the same version when packaging. + +This can be a problem if upstream is using the latest and greatest and you are trying to use an earlier version of node. Some cryptic errors regarding V8 may appear. + +An exception to this: + +### Try to respect the package manager originally used by upstream (and use the upstream lock file) {#javascript-upstream-package-manager} + +A lock file (package-lock.json, yarn.lock...) is supposed to make reproducible installations of node_modules for each tool. + +Guidelines of package managers, recommend to commit those lock files to the repos. If a particular lock file is present, it is a strong indication of which package manager is used upstream. + +It's better to try to use a nix tool that understand the lock file. Using a different tool might give you hard to understand error because different packages have been installed. An example of problems that could arise can be found [here](https://github.com/NixOS/nixpkgs/pull/126629). Upstream uses npm, but this is an attempt to package it with yarn2nix (that uses yarn.lock) + +Using a different tool forces to commit a lock file to the repository. Those files are fairly large, so when packaging for nixpkgs, this approach does not scale well. + +Exceptions to this rule are: + +- when you encounter one of the bugs from a nix tool. In each of the tool specific instructions, known problems will be detailed. If you have a problem with a particular tool, then it's best to try another tool, even if this means you will have to recreate a lock file and commit it to nixpkgs. In general yarn2nix has less known problems and so a simple search in nixpkgs will reveal many yarn.lock files commited +- Some lock files contain particular version of a package that has been pulled off npm for some reason. In that case, you can recreate upstream lock (by removing the original and `npm install`, `yarn`, ...) and commit this to nixpkgs. +- The only tool that supports workspaces (a feature of npm that helps manage sub-directories with different package.json from a single top level package.json) is yarn2nix. If upstream has workspaces you should try yarn2nix. + +### Try to use upstream package.json {#javascript-upstream-package-json} + +Exceptions to this rule are + +- Sometimes the upstream repo assumes some dependencies be installed globally. In that case you can add them manually to the upstream package.json (`yarn add xxx` or `npm install xxx`, ...). Dependencies that are installed locally can be executed with `npx` for cli tools. (e.g. `npx postcss ...`, this is how you can call those dependencies in the phases). +- Sometimes there is a version conflict between some dependency requirements. In that case you can fix a version (by removing the `^`). +- Sometimes the script defined in the package.json does not work as is. Some scripts for example use cli tools that might not be available, or cd in directory with a different package.json (for workspaces notably). In that case, it's perfectly fine to look at what the particular script is doing and break this down in the phases. In the build script you can see `build:*` calling in turns several other build scripts like `build:ui` or `build:server`. If one of those fails, you can try to separate those into: + +```Shell +yarn build:ui +yarn build:server +# OR +npm run build:ui +npm run build:server +``` + +when you need to override a package.json. It's nice to use the one from the upstream src and do some explicit override. Here is an example. + +```nix +patchedPackageJSON = final.runCommand "package.json" { } '' + ${jq}/bin/jq '.version = "0.4.0" | + .devDependencies."@jsdoc/cli" = "^0.2.5" + ${sonar-src}/package.json > $out +''; +``` + +you will still need to commit the modified version of the lock files, but at least the overrides are explicit for everyone to see. + +### Using node_modules directly {#javascript-using-node_modules} + +each tool has an abstraction to just build the node_modules (dependencies) directory. you can always use the stdenv.mkDerivation with the node_modules to build the package (symlink the node_modules directory and then use the package build command). the node_modules abstraction can be also used to build some web framework frontends. For an example of this see how [plausible](https://github.com/NixOS/nixpkgs/blob/master/pkgs/servers/web-apps/plausible/default.nix) is built. mkYarnModules to make the derivation containing node_modules. Then when building the frontend you can just symlink the node_modules directory + +## javascript packages inside nixpkgs {#javascript-packages-nixpkgs} + +The `pkgs/development/node-packages` folder contains a generated collection of +[NPM packages](https://npmjs.com/) that can be installed with the Nix package +manager. + +As a rule of thumb, the package set should only provide _end user_ software +packages, such as command-line utilities. Libraries should only be added to the +package set if there is a non-NPM package that requires it. + +When it is desired to use NPM libraries in a development project, use the +`node2nix` generator directly on the `package.json` configuration file of the +project. + +The package set provides support for the official stable Node.js versions. +The latest stable LTS release in `nodePackages`, as well as the latest stable +Current release in `nodePackages_latest`. + +If your package uses native addons, you need to examine what kind of native +build system it uses. Here are some examples: + +- `node-gyp` +- `node-gyp-builder` +- `node-pre-gyp` + +After you have identified the correct system, you need to override your package +expression while adding in build system as a build input. For example, `dat` +requires `node-gyp-build`, so [we override](https://github.com/NixOS/nixpkgs/blob/32f5e5da4a1b3f0595527f5195ac3a91451e9b56/pkgs/development/node-packages/default.nix#L37-L40) its expression in [`default.nix`](https://github.com/NixOS/nixpkgs/blob/master/pkgs/development/node-packages/default.nix): + +```nix + dat = super.dat.override { + buildInputs = [ self.node-gyp-build pkgs.libtool pkgs.autoconf pkgs.automake ]; + meta.broken = since "12"; + }; +``` + +To add a package from NPM to nixpkgs: + +1. Modify `pkgs/development/node-packages/node-packages.json` to add, update + or remove package entries to have it included in `nodePackages` and + `nodePackages_latest`. +2. Run the script: `cd pkgs/development/node-packages && ./generate.sh`. +3. Build your new package to test your changes: + `cd /path/to/nixpkgs && nix-build -A nodePackages.`. + To build against the latest stable Current Node.js version (e.g. 14.x): + `nix-build -A nodePackages_latest.` +4. Add and commit all modified and generated files. + +For more information about the generation process, consult the +[README.md](https://github.com/svanderburg/node2nix) file of the `node2nix` +tool. + +## Tool specific instructions {#javascript-tool-specific} + +### node2nix {#javascript-node2nix} + +#### Preparation {#javascript-node2nix-preparation} + +you will need to generate a nix expression for the dependencies + +- don't forget the `-l package-lock.json` if there is a lock file +- Most probably you will need the `--development` to include the `devDependencies` + +so the command will most likely be +`node2nix --developmennt -l package-lock.json` + +[link to the doc in the repo](https://github.com/svanderburg/node2nix) + +#### Pitfalls {#javascript-node2nix-pitfalls} + +- if upstream package.json does not have a "version" attribute, node2nix will crash. You will need to add it like shown in [the package.json section](#javascript-upstream-package-json) +- node2nix has some [bugs](https://github.com/svanderburg/node2nix/issues/238). related to working with lock files from npm distributed with nodejs-16_x +- node2nix does not like missing packages from npm. If you see something like `Cannot resolve version: vue-loader-v16@undefined` then you might want to try another tool. The package might have been pulled off of npm. + +### yarn2nix {#javascript-yarn2nix} + +#### Preparation {#javascript-yarn2nix-preparation} + +you will need at least a yarn.lock and yarn.nix file + +- generate a yarn.lock in upstream if it is not already there +- `yarn2nix > yarn.nix` will generate the dependencies in a nix format + +#### mkYarnPackage {#javascript-yarn2nix-mkYarnPackage} + +this will by default try to generate a binary. For package only generating static assets (Svelte, Vue, React...), you will need to explicitely override the build step with your instructions. It's important to use the `--offline` flag. For example if you script is `"build": "something"` in package.json use + +```nix +buildPhase = '' + yarn build --offline +''; +``` + +The dist phase is also trying to build a binary, the only way to override it is with + +```nix +distPhase = "true"; +``` + +the configure phase can sometimes fail because it tries to be too clever. +One common override is + +```nix +configurePhase = "ln -s $node_modules node_modules"; +``` + +#### mkYarnModules {#javascript-yarn2nix-mkYarnModules} + +this will generate a derivation including the node_modules. If you have to build a derivation for an integrated web framework (rails, phoenix..), this is probably the easiest way. [Plausible](https://github.com/NixOS/nixpkgs/blob/master/pkgs/servers/web-apps/plausible/default.nix#L39) offers a good example of how to do this. + +#### Pitfalls {#javascript-yarn2nix-pitfalls} + +- if version is missing from upstream package.json, yarn will silently install nothing. In that case, you will need to override package.json as shown in the [package.json section](#javascript-upstream-package-json) + +## Outside of nixpkgs {#javascript-outside-nixpkgs} + +There are some other options available that can't be used inside nixpkgs. Those other options are written in nix. Importing them in nixpkgs will require moving the source code into nixpkgs. Using [Import From Derivation](https://nixos.wiki/wiki/Import_From_Derivation) is not allowed in hydra at present. If you are packaging something outside nixpkgs, those can be considered + +### npmlock2nix {#javascript-npmlock2nix} + +[npmlock2nix](https://github.com/nix-community/npmlock2nix) aims at building node_modules without code generation. It hasn't reached v1 yet, the api might be suject to change. + +#### Pitfalls {#javascript-npmlock2nix-pitfalls} + +- there are some [problems with npm v7](https://github.com/tweag/npmlock2nix/issues/45). + +### nix-npm-buildpackage {#javascript-nix-npm-buildpackage} + +[nix-npm-buildpackage](https://github.com/serokell/nix-npm-buildpackage) aims at building node_modules without code generation. It hasn't reached v1 yet, the api might change. It supports both package-lock.json and yarn.lock. + +#### Pitfalls {#javascript-nix-npm-buildpackage-pitfalls} + +- there are some [problems with npm v7](https://github.com/serokell/nix-npm-buildpackage/issues/33). diff --git a/doc/languages-frameworks/node.section.md b/doc/languages-frameworks/node.section.md deleted file mode 100644 index e04932a492d1..000000000000 --- a/doc/languages-frameworks/node.section.md +++ /dev/null @@ -1,51 +0,0 @@ -# Node.js {#node.js} - -The `pkgs/development/node-packages` folder contains a generated collection of -[NPM packages](https://npmjs.com/) that can be installed with the Nix package -manager. - -As a rule of thumb, the package set should only provide *end user* software -packages, such as command-line utilities. Libraries should only be added to the -package set if there is a non-NPM package that requires it. - -When it is desired to use NPM libraries in a development project, use the -`node2nix` generator directly on the `package.json` configuration file of the -project. - -The package set provides support for the official stable Node.js versions. -The latest stable LTS release in `nodePackages`, as well as the latest stable -Current release in `nodePackages_latest`. - -If your package uses native addons, you need to examine what kind of native -build system it uses. Here are some examples: - -* `node-gyp` -* `node-gyp-builder` -* `node-pre-gyp` - -After you have identified the correct system, you need to override your package -expression while adding in build system as a build input. For example, `dat` -requires `node-gyp-build`, so [we override](https://github.com/NixOS/nixpkgs/blob/32f5e5da4a1b3f0595527f5195ac3a91451e9b56/pkgs/development/node-packages/default.nix#L37-L40) its expression in [`default.nix`](https://github.com/NixOS/nixpkgs/blob/master/pkgs/development/node-packages/default.nix): - -```nix - dat = super.dat.override { - buildInputs = [ self.node-gyp-build pkgs.libtool pkgs.autoconf pkgs.automake ]; - meta.broken = since "12"; - }; -``` - -To add a package from NPM to nixpkgs: - - 1. Modify `pkgs/development/node-packages/node-packages.json` to add, update - or remove package entries to have it included in `nodePackages` and - `nodePackages_latest`. - 2. Run the script: `cd pkgs/development/node-packages && ./generate.sh`. - 3. Build your new package to test your changes: - `cd /path/to/nixpkgs && nix-build -A nodePackages.`. - To build against the latest stable Current Node.js version (e.g. 14.x): - `nix-build -A nodePackages_latest.` - 4. Add and commit all modified and generated files. - -For more information about the generation process, consult the -[README.md](https://github.com/svanderburg/node2nix) file of the `node2nix` -tool. diff --git a/doc/languages-frameworks/perl.section.md b/doc/languages-frameworks/perl.section.md index dcb7dcb77b65..c992b9d658bb 100644 --- a/doc/languages-frameworks/perl.section.md +++ b/doc/languages-frameworks/perl.section.md @@ -122,7 +122,7 @@ ImageExifTool = buildPerlPackage { }; buildInputs = lib.optional stdenv.isDarwin shortenPerlShebang; - postInstall = lib.optional stdenv.isDarwin '' + postInstall = lib.optionalString stdenv.isDarwin '' shortenPerlShebang $out/bin/exiftool ''; }; diff --git a/doc/stdenv/meta.chapter.md b/doc/stdenv/meta.chapter.md index e4970f7e9649..ac518cee524c 100644 --- a/doc/stdenv/meta.chapter.md +++ b/doc/stdenv/meta.chapter.md @@ -114,6 +114,10 @@ For details, see [Licenses](#sec-meta-license). A list of the maintainers of this Nix expression. Maintainers are defined in [`nixpkgs/maintainers/maintainer-list.nix`](https://github.com/NixOS/nixpkgs/blob/master/maintainers/maintainer-list.nix). There is no restriction to becoming a maintainer, just add yourself to that list in a separate commit titled “maintainers: add alice”, and reference maintainers with `maintainers = with lib.maintainers; [ alice bob ]`. +### `mainProgram` {#var-meta-mainProgram} + +The name of the main binary for the package. This effects the binary `nix run` executes and falls back to the name of the package. Example: `"rg"` + ### `priority` {#var-meta-priority} The *priority* of the package, used by `nix-env` to resolve file name conflicts between packages. See the Nix manual page for `nix-env` for details. Example: `"10"` (a low-priority package). diff --git a/lib/systems/platforms.nix b/lib/systems/platforms.nix index d7efe84e2b85..2a5f630c3de9 100644 --- a/lib/systems/platforms.nix +++ b/lib/systems/platforms.nix @@ -233,7 +233,7 @@ rec { }; }; - scaleway-c1 = lib.recursiveUpdate armv7l-hf-multiplatform { + scaleway-c1 = armv7l-hf-multiplatform // { gcc = { cpu = "cortex-a9"; fpu = "vfpv3"; diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index fcef6345b8ab..568f00696f78 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -4247,6 +4247,16 @@ githubId = 147689; name = "Hans-Christian Esperer"; }; + hdhog = { + name = "Serg Larchenko"; + email = "hdhog@hdhog.ru"; + github = "hdhog"; + githubId = 386666; + keys = [{ + longkeyid = "rsa496/952EACB76703BA63"; + fingerprint = "A25F 6321 AAB4 4151 4085 9924 952E ACB7 6703 BA63"; + }]; + }; hectorj = { email = "hector.jusforgues+nixos@gmail.com"; github = "hectorj"; @@ -5358,7 +5368,7 @@ }; juaningan = { email = "juaningan@gmail.com"; - github = "juaningan"; + github = "uningan"; githubId = 810075; name = "Juan Rodal"; }; @@ -5668,6 +5678,16 @@ githubId = 148352; name = "Jim Fowler"; }; + kittywitch = { + email = "kat@kittywit.ch"; + github = "kittywitch"; + githubId = 67870215; + name = "kat witch"; + keys = [{ + longkeyid = "rsa4096/0x7248991EFA8EFBEE"; + fingerprint = "01F5 0A29 D4AA 9117 5A11 BDB1 7248 991E FA8E FBEE"; + }]; + }; kiwi = { email = "envy1988@gmail.com"; github = "Kiwi"; 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 37dfc3987341..a138d4c8780c 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 @@ -182,6 +182,16 @@ + + + + fluidd, a + Klipper web interface for managing 3d printers using + moonraker. Available as + fluidd. + + +
Backward Incompatibilities @@ -273,7 +283,7 @@ Superuser created successfully. The staticjinja package has been upgraded - from 1.0.4 to 3.0.1 + from 1.0.4 to 4.1.0 @@ -880,6 +890,14 @@ Superuser created successfully. New In Python 3.9 post for more information. + + + qtile hase been updated from + 0.16.0 to 0.18.0, please check + qtile + changelog for changes. + + The claws-mail package now references the diff --git a/nixos/doc/manual/release-notes/rl-2111.section.md b/nixos/doc/manual/release-notes/rl-2111.section.md index 2c1886a4deb2..35d65dc43cf3 100644 --- a/nixos/doc/manual/release-notes/rl-2111.section.md +++ b/nixos/doc/manual/release-notes/rl-2111.section.md @@ -56,6 +56,8 @@ pt-services.clipcat.enable). * [navidrome](https://www.navidrome.org/), a personal music streaming server with subsonic-compatible api. Available as [navidrome](#opt-services.navidrome.enable). +- [fluidd](https://docs.fluidd.xyz/), a Klipper web interface for managing 3d printers using moonraker. Available as [fluidd](#opt-services.fluidd.enable). + ## Backward Incompatibilities {#sec-release-21.11-incompatibilities} - The `paperless` module and package have been removed. All users should migrate to the @@ -105,7 +107,7 @@ subsonic-compatible api. Available as [navidrome](#opt-services.navidrome.enable Superuser created successfully. ``` -- The `staticjinja` package has been upgraded from 1.0.4 to 3.0.1 +- The `staticjinja` package has been upgraded from 1.0.4 to 4.1.0 - The `erigon` ethereum node has moved to a new database format in `2021-05-04`, and requires a full resync @@ -254,6 +256,8 @@ To be able to access the web UI this port needs to be opened in the firewall. - `python3` now defaults to Python 3.9. Python 3.9 introduces many deprecation warnings, please look at the [What's New In Python 3.9 post](https://docs.python.org/3/whatsnew/3.9.html) for more information. +- `qtile` hase been updated from '0.16.0' to '0.18.0', please check [qtile changelog](https://github.com/qtile/qtile/blob/master/CHANGELOG) for changes. + - The `claws-mail` package now references the new GTK+ 3 release branch, major version 4. To use the GTK+ 2 releases, one can install the `claws-mail-gtk2` package. - The wordpress module provides a new interface which allows to use different webservers with the new option [`services.wordpress.webserver`](options.html#opt-services.wordpress.webserver). Currently `httpd` and `nginx` are supported. The definitions of wordpress sites should now be set in [`services.wordpress.sites`](options.html#opt-services.wordpress.sites). diff --git a/nixos/modules/hardware/all-firmware.nix b/nixos/modules/hardware/all-firmware.nix index a4e4fa8d0ed3..bdf90816740c 100644 --- a/nixos/modules/hardware/all-firmware.nix +++ b/nixos/modules/hardware/all-firmware.nix @@ -62,7 +62,7 @@ in { zd1211fw alsa-firmware sof-firmware - openelec-dvb-firmware + libreelec-dvb-firmware ] ++ optional (pkgs.stdenv.hostPlatform.isAarch32 || pkgs.stdenv.hostPlatform.isAarch64) raspberrypiWirelessFirmware ++ optionals (versionOlder config.boot.kernelPackages.kernel.version "4.13") [ rtl8723bs-firmware diff --git a/nixos/modules/module-list.nix b/nixos/modules/module-list.nix index 931b9d039ab7..2473bf2f55fb 100644 --- a/nixos/modules/module-list.nix +++ b/nixos/modules/module-list.nix @@ -953,6 +953,7 @@ ./services/web-apps/documize.nix ./services/web-apps/dokuwiki.nix ./services/web-apps/engelsystem.nix + ./services/web-apps/fluidd.nix ./services/web-apps/galene.nix ./services/web-apps/gerrit.nix ./services/web-apps/gotify-server.nix diff --git a/nixos/modules/profiles/headless.nix b/nixos/modules/profiles/headless.nix index 46a9b6a7d8d5..c17cb287b72b 100644 --- a/nixos/modules/profiles/headless.nix +++ b/nixos/modules/profiles/headless.nix @@ -9,7 +9,7 @@ with lib; boot.vesa = false; # Don't start a tty on the serial consoles. - systemd.services."serial-getty@ttyS0".enable = false; + systemd.services."serial-getty@ttyS0".enable = lib.mkDefault false; systemd.services."serial-getty@hvc0".enable = false; systemd.services."getty@tty1".enable = false; systemd.services."autovt@".enable = false; diff --git a/nixos/modules/services/mail/dovecot.nix b/nixos/modules/services/mail/dovecot.nix index 1ccfb357750b..bac437c752dc 100644 --- a/nixos/modules/services/mail/dovecot.nix +++ b/nixos/modules/services/mail/dovecot.nix @@ -467,10 +467,6 @@ in ]; assertions = [ - { - assertion = intersectLists cfg.protocols [ "pop3" "imap" ] != []; - message = "dovecot needs at least one of the IMAP or POP3 listeners enabled"; - } { assertion = (cfg.sslServerCert == null) == (cfg.sslServerKey == null) && (cfg.sslCACert != null -> !(cfg.sslServerCert == null || cfg.sslServerKey == null)); diff --git a/nixos/modules/services/web-apps/fluidd.nix b/nixos/modules/services/web-apps/fluidd.nix new file mode 100644 index 000000000000..c632b8ff7199 --- /dev/null +++ b/nixos/modules/services/web-apps/fluidd.nix @@ -0,0 +1,64 @@ +{ config, lib, pkgs, ... }: +with lib; +let + cfg = config.services.fluidd; + moonraker = config.services.moonraker; +in +{ + options.services.fluidd = { + enable = mkEnableOption "Fluidd, a Klipper web interface for managing your 3d printer"; + + package = mkOption { + type = types.package; + description = "Fluidd package to be used in the module"; + default = pkgs.fluidd; + defaultText = "pkgs.fluidd"; + }; + + hostName = mkOption { + type = types.str; + default = "localhost"; + description = "Hostname to serve fluidd on"; + }; + + nginx = mkOption { + type = types.submodule + (import ../web-servers/nginx/vhost-options.nix { inherit config lib; }); + default = { }; + example = { + serverAliases = [ "fluidd.\${config.networking.domain}" ]; + }; + description = "Extra configuration for the nginx virtual host of fluidd."; + }; + }; + + config = mkIf cfg.enable { + services.nginx = { + enable = true; + upstreams.fluidd-apiserver.servers."${moonraker.address}:${toString moonraker.port}" = { }; + virtualHosts."${cfg.hostName}" = mkMerge [ + cfg.nginx + { + root = mkForce "${cfg.package}/share/fluidd/htdocs"; + locations = { + "/" = { + index = "index.html"; + tryFiles = "$uri $uri/ /index.html"; + }; + "/index.html".extraConfig = '' + add_header Cache-Control "no-store, no-cache, must-revalidate"; + ''; + "/websocket" = { + proxyWebsockets = true; + proxyPass = "http://fluidd-apiserver/websocket"; + }; + "~ ^/(printer|api|access|machine|server)/" = { + proxyWebsockets = true; + proxyPass = "http://fluidd-apiserver$request_uri"; + }; + }; + } + ]; + }; + }; +} diff --git a/nixos/modules/services/web-servers/apache-httpd/default.nix b/nixos/modules/services/web-servers/apache-httpd/default.nix index df7035c03cc2..17cfdfb24462 100644 --- a/nixos/modules/services/web-servers/apache-httpd/default.nix +++ b/nixos/modules/services/web-servers/apache-httpd/default.nix @@ -36,11 +36,12 @@ let dependentCertNames = unique (map (hostOpts: hostOpts.certName) acmeEnabledVhosts); mkListenInfo = hostOpts: - if hostOpts.listen != [] then hostOpts.listen - else ( - optional (hostOpts.onlySSL || hostOpts.addSSL || hostOpts.forceSSL) { ip = "*"; port = 443; ssl = true; } ++ - optional (!hostOpts.onlySSL) { ip = "*"; port = 80; ssl = false; } - ); + if hostOpts.listen != [] then + hostOpts.listen + else + optionals (hostOpts.onlySSL || hostOpts.addSSL || hostOpts.forceSSL) (map (addr: { ip = addr; port = 443; ssl = true; }) hostOpts.listenAddresses) ++ + optionals (!hostOpts.onlySSL) (map (addr: { ip = addr; port = 80; ssl = false; }) hostOpts.listenAddresses) + ; listenInfo = unique (concatMap mkListenInfo vhosts); diff --git a/nixos/modules/services/web-servers/apache-httpd/vhost-options.nix b/nixos/modules/services/web-servers/apache-httpd/vhost-options.nix index 394f9a305546..3f732a5c9f33 100644 --- a/nixos/modules/services/web-servers/apache-httpd/vhost-options.nix +++ b/nixos/modules/services/web-servers/apache-httpd/vhost-options.nix @@ -47,12 +47,29 @@ in ]; description = '' Listen addresses and ports for this virtual host. - + + This option overrides addSSL, forceSSL and onlySSL. - + + + If you only want to set the addresses manually and not the ports, take a look at listenAddresses. + + ''; }; + listenAddresses = mkOption { + type = with types; nonEmptyListOf str; + + description = '' + Listen addresses for this virtual host. + Compared to listen this only sets the addreses + and the ports are chosen automatically. + ''; + default = [ "*" ]; + example = [ "127.0.0.1" ]; + }; + enableSSL = mkOption { type = types.bool; visible = false; diff --git a/nixos/modules/services/x11/window-managers/qtile.nix b/nixos/modules/services/x11/window-managers/qtile.nix index cadc316bbc4f..835b41d4ada9 100644 --- a/nixos/modules/services/x11/window-managers/qtile.nix +++ b/nixos/modules/services/x11/window-managers/qtile.nix @@ -15,7 +15,7 @@ in services.xserver.windowManager.session = [{ name = "qtile"; start = '' - ${pkgs.qtile}/bin/qtile & + ${pkgs.qtile}/bin/qtile start & waitPID=$! ''; }]; diff --git a/nixos/modules/virtualisation/amazon-image.nix b/nixos/modules/virtualisation/amazon-image.nix index 26297a7d0f1f..bf5c04543a70 100644 --- a/nixos/modules/virtualisation/amazon-image.nix +++ b/nixos/modules/virtualisation/amazon-image.nix @@ -18,7 +18,15 @@ let in { - imports = [ ../profiles/headless.nix ./ec2-data.nix ./amazon-init.nix ]; + imports = [ + ../profiles/headless.nix + # Note: While we do use the headless profile, we also explicitly + # turn on the serial console on ttyS0 below. This is because + # AWS does support accessing the serial console: + # https://docs.aws.amazon.com/AWSEC2/latest/UserGuide/configure-access-to-serial-console.html + ./ec2-data.nix + ./amazon-init.nix + ]; config = { @@ -49,7 +57,7 @@ in ]; boot.initrd.kernelModules = [ "xen-blkfront" "xen-netfront" ]; boot.initrd.availableKernelModules = [ "ixgbevf" "ena" "nvme" ]; - boot.kernelParams = mkIf cfg.hvm [ "console=ttyS0" "random.trust_cpu=on" ]; + boot.kernelParams = mkIf cfg.hvm [ "console=ttyS0,115200n8" "random.trust_cpu=on" ]; # Prevent the nouveau kernel module from being loaded, as it # interferes with the nvidia/nvidia-uvm modules needed for CUDA. @@ -63,7 +71,12 @@ in boot.loader.grub.extraPerEntryConfig = mkIf (!cfg.hvm) "root (hd0)"; boot.loader.grub.efiSupport = cfg.efi; boot.loader.grub.efiInstallAsRemovable = cfg.efi; - boot.loader.timeout = 0; + boot.loader.timeout = 1; + boot.loader.grub.extraConfig = '' + serial --unit=0 --speed=115200 --word=8 --parity=no --stop=1 + terminal_output console serial + terminal_input console serial + ''; boot.initrd.network.enable = true; @@ -127,15 +140,14 @@ in copy_bin_and_libs ${pkgs.util-linux}/sbin/swapon ''; - # Don't put old configurations in the GRUB menu. The user has no - # way to select them anyway. - boot.loader.grub.configurationLimit = 0; - # Allow root logins only using the SSH key that the user specified # at instance creation time. services.openssh.enable = true; services.openssh.permitRootLogin = "prohibit-password"; + # Enable the serial console on ttyS0 + systemd.services."serial-getty@ttyS0".enable = true; + # Creates symlinks for block device names. services.udev.packages = [ pkgs.ec2-utils ]; diff --git a/nixos/tests/all-tests.nix b/nixos/tests/all-tests.nix index d17904c776e7..314c031bb3d4 100644 --- a/nixos/tests/all-tests.nix +++ b/nixos/tests/all-tests.nix @@ -136,6 +136,7 @@ in fish = handleTest ./fish.nix {}; flannel = handleTestOn ["x86_64-linux"] ./flannel.nix {}; fluentd = handleTest ./fluentd.nix {}; + fluidd = handleTest ./fluidd.nix {}; fontconfig-default-fonts = handleTest ./fontconfig-default-fonts.nix {}; freeswitch = handleTest ./freeswitch.nix {}; fsck = handleTest ./fsck.nix {}; diff --git a/nixos/tests/fluidd.nix b/nixos/tests/fluidd.nix new file mode 100644 index 000000000000..f49a4110d714 --- /dev/null +++ b/nixos/tests/fluidd.nix @@ -0,0 +1,21 @@ +import ./make-test-python.nix ({ lib, ... }: + +with lib; + +{ + name = "fluidd"; + meta.maintainers = with maintainers; [ vtuan10 ]; + + nodes.machine = { pkgs, ... }: { + services.fluidd = { + enable = true; + }; + }; + + testScript = '' + machine.start() + machine.wait_for_unit("nginx.service") + machine.wait_for_open_port(80) + machine.succeed("curl -sSfL http://localhost/ | grep 'fluidd'") + ''; +}) diff --git a/pkgs/applications/audio/mpg123/default.nix b/pkgs/applications/audio/mpg123/default.nix index 44788467d8f6..6f55a82e13b8 100644 --- a/pkgs/applications/audio/mpg123/default.nix +++ b/pkgs/applications/audio/mpg123/default.nix @@ -1,30 +1,52 @@ -{ lib, stdenv +{ lib +, stdenv , fetchurl , makeWrapper -, alsa-lib +, pkg-config , perl -, withConplay ? !stdenv.targetPlatform.isWindows +, withAlsa ? stdenv.hostPlatform.isLinux +, alsa-lib +, withPulse ? stdenv.hostPlatform.isLinux +, libpulseaudio +, withCoreAudio ? stdenv.hostPlatform.isDarwin +, AudioUnit +, AudioToolbox +, withJack ? stdenv.hostPlatform.isUnix +, jack +, withConplay ? !stdenv.hostPlatform.isWindows }: stdenv.mkDerivation rec { pname = "mpg123"; - version = "1.26.5"; + version = "1.28.2"; src = fetchurl { url = "mirror://sourceforge/${pname}/${pname}-${version}.tar.bz2"; - sha256 = "sha256-UCqX4Nk1vn432YczgCHY8wG641wohPKoPVnEtSRm7wY="; + sha256 = "006v44nz4nkpgvxz1k2vbbrfpa2m47hyydscs0wf3iysiyvd9vvy"; }; outputs = [ "out" ] ++ lib.optionals withConplay [ "conplay" ]; - nativeBuildInputs = lib.optionals withConplay [ makeWrapper ]; + nativeBuildInputs = lib.optionals withConplay [ makeWrapper ] + ++ lib.optionals (withPulse || withJack) [ pkg-config ]; buildInputs = lib.optionals withConplay [ perl ] - ++ lib.optionals (!stdenv.isDarwin && !stdenv.targetPlatform.isWindows) [ alsa-lib ]; + ++ lib.optionals withAlsa [ alsa-lib ] + ++ lib.optionals withPulse [ libpulseaudio ] + ++ lib.optionals withCoreAudio [ AudioUnit AudioToolbox ] + ++ lib.optionals withJack [ jack ]; - configureFlags = lib.optional - (stdenv.hostPlatform ? mpg123) - "--with-cpu=${stdenv.hostPlatform.mpg123.cpu}"; + configureFlags = [ + "--with-audio=${lib.strings.concatStringsSep "," ( + lib.optional withJack "jack" + ++ lib.optional withPulse "pulse" + ++ lib.optional withAlsa "alsa" + ++ lib.optional withCoreAudio "coreaudio" + ++ [ "dummy" ] + )}" + ] ++ lib.optional (stdenv.hostPlatform ? mpg123) "--with-cpu=${stdenv.hostPlatform.mpg123.cpu}"; + + enableParallelBuilding = true; postInstall = lib.optionalString withConplay '' mkdir -p $conplay/bin @@ -43,8 +65,8 @@ stdenv.mkDerivation rec { meta = with lib; { description = "Fast console MPEG Audio Player and decoder library"; homepage = "https://mpg123.org"; - license = licenses.lgpl21; - maintainers = [ maintainers.ftrvxmtrx ]; + license = licenses.lgpl21Only; + maintainers = with maintainers; [ ftrvxmtrx ]; platforms = platforms.all; }; } diff --git a/pkgs/applications/audio/zynaddsubfx/default.nix b/pkgs/applications/audio/zynaddsubfx/default.nix index 986e3215b93f..4b3cbb171bd0 100644 --- a/pkgs/applications/audio/zynaddsubfx/default.nix +++ b/pkgs/applications/audio/zynaddsubfx/default.nix @@ -91,7 +91,7 @@ in stdenv.mkDerivation rec { # When building with zest GUI, patch plugins # and standalone executable to properly locate zest - postFixup = lib.optional (guiModule == "zest") '' + postFixup = lib.optionalString (guiModule == "zest") '' patchelf --set-rpath "${mruby-zest}:$(patchelf --print-rpath "$out/lib/lv2/ZynAddSubFX.lv2/ZynAddSubFX_ui.so")" \ "$out/lib/lv2/ZynAddSubFX.lv2/ZynAddSubFX_ui.so" diff --git a/pkgs/applications/blockchains/bisq-desktop/default.nix b/pkgs/applications/blockchains/bisq-desktop/default.nix index 715de18a8fa3..16bcc71653bd 100644 --- a/pkgs/applications/blockchains/bisq-desktop/default.nix +++ b/pkgs/applications/blockchains/bisq-desktop/default.nix @@ -8,63 +8,50 @@ , openjdk11 , dpkg , writeScript -, coreutils , bash , tor -, psmisc +, gnutar +, zip +, xz }: let bisq-launcher = writeScript "bisq-launcher" '' #! ${bash}/bin/bash - # Setup a temporary Tor instance - TMPDIR=$(${coreutils}/bin/mktemp -d) - CONTROLPORT=$(${coreutils}/bin/shuf -i 9100-9499 -n 1) - SOCKSPORT=$(${coreutils}/bin/shuf -i 9500-9999 -n 1) - ${coreutils}/bin/head -c 1024 < /dev/urandom > $TMPDIR/cookie + # This is just a comment to convince Nix that Tor is a + # runtime dependency; The Tor binary is in a *.jar file, + # whereas Nix only scans for hashes in uncompressed text. + # ${bisq-tor} - ${tor}/bin/tor --SocksPort $SOCKSPORT --ControlPort $CONTROLPORT \ - --ControlPortWriteToFile $TMPDIR/port --CookieAuthFile $TMPDIR/cookie \ - --CookieAuthentication 1 >$TMPDIR/tor.log --RunAsDaemon 1 + JAVA_TOOL_OPTIONS="-XX:+UseG1GC -XX:MaxHeapFreeRatio=10 -XX:MinHeapFreeRatio=5 -XX:+UseStringDeduplication" bisq-desktop-wrapped "$@" + ''; - torpid=$(${psmisc}/bin/fuser $CONTROLPORT/tcp) + bisq-tor = writeScript "bisq-tor" '' + #! ${bash}/bin/bash - echo Temp directory: $TMPDIR - echo Tor PID: $torpid - echo Tor control port: $CONTROLPORT - echo Tor SOCKS port: $SOCKSPORT - echo Tor log: $TMPDIR/tor.log - echo Bisq log file: $TMPDIR/bisq.log - - JAVA_TOOL_OPTIONS="-XX:MaxRAM=4g" bisq-desktop-wrapped \ - --torControlCookieFile=$TMPDIR/cookie \ - --torControlUseSafeCookieAuth \ - --torControlPort $CONTROLPORT "$@" > $TMPDIR/bisq.log - - echo Bisq exited. Killing Tor... - kill $torpid + exec ${tor}/bin/tor "$@" ''; in stdenv.mkDerivation rec { pname = "bisq-desktop"; - version = "1.7.0"; + version = "1.7.2"; src = fetchurl { url = "https://github.com/bisq-network/bisq/releases/download/v${version}/Bisq-64bit-${version}.deb"; - sha256 = "0crry5k7crmrqn14wxiyrnhk09ac8a9ksqrwwky7jsnyah0bx5k4"; + sha256 = "0b2rh9sphc9wffkawprrl20frgv0rah7y2k5sfxpjc3shgkqsw80"; }; - nativeBuildInputs = [ makeWrapper copyDesktopItems dpkg ]; + nativeBuildInputs = [ makeWrapper copyDesktopItems imagemagick dpkg gnutar zip xz ]; desktopItems = [ (makeDesktopItem { name = "Bisq"; exec = "bisq-desktop"; icon = "bisq"; - desktopName = "Bisq"; + desktopName = "Bisq ${version}"; genericName = "Decentralized bitcoin exchange"; - categories = "Network;Utility;"; + categories = "Network;P2P;"; }) ]; @@ -72,6 +59,16 @@ stdenv.mkDerivation rec { dpkg -x $src . ''; + buildPhase = '' + # Replace the embedded Tor binary (which is in a Tar archive) + # with one from Nixpkgs. + + mkdir -p native/linux/x64/ + cp ${bisq-tor} ./tor + tar -cJf native/linux/x64/tor.tar.xz tor + zip -r opt/bisq/lib/app/desktop-${version}-all.jar native + ''; + installPhase = '' runHook preInstall @@ -86,13 +83,15 @@ stdenv.mkDerivation rec { for n in 16 24 32 48 64 96 128 256; do size=$n"x"$n - ${imagemagick}/bin/convert opt/bisq/lib/Bisq.png -resize $size bisq.png + convert opt/bisq/lib/Bisq.png -resize $size bisq.png install -Dm644 -t $out/share/icons/hicolor/$size/apps bisq.png done; runHook postInstall ''; + passthru.updateScript = ./update.sh; + meta = with lib; { description = "A decentralized bitcoin exchange network"; homepage = "https://bisq.network"; diff --git a/pkgs/applications/blockchains/bisq-desktop/update.sh b/pkgs/applications/blockchains/bisq-desktop/update.sh new file mode 100755 index 000000000000..393447834bba --- /dev/null +++ b/pkgs/applications/blockchains/bisq-desktop/update.sh @@ -0,0 +1,22 @@ +#!/usr/bin/env nix-shell +#!nix-shell -i bash -p curl jq gnused gnupg common-updater-scripts + +set -eu -o pipefail + +version="$(curl -s https://api.github.com/repos/bisq-network/bisq/releases| jq '.[] | {name,prerelease} | select(.prerelease==false) | limit(1;.[])' | sed 's/[\"v]//g' | head -n 1)" +depname="Bisq-64bit-$version.deb" +src="https://github.com/bisq-network/bisq/releases/download/v$version/$depname" +signature="$src.asc" +key="CB36 D7D2 EBB2 E35D 9B75 500B CD5D C1C5 29CD FD3B" + +pushd $(mktemp -d --suffix=-bisq-updater) +export GNUPGHOME=$PWD/gnupg +mkdir -m 700 -p "$GNUPGHOME" +curl -L -o "$depname" -- "$src" +curl -L -o signature.asc -- "$signature" +gpg --batch --recv-keys "$key" +gpg --batch --verify signature.asc "$depname" +sha256=$(nix-prefetch-url --type sha256 "file://$PWD/$depname") +popd + +update-source-version bisq-desktop "$version" "$sha256" diff --git a/pkgs/applications/blockchains/bitcoin/default.nix b/pkgs/applications/blockchains/bitcoin/default.nix index 00727d294df2..8bbeda2e0d4e 100644 --- a/pkgs/applications/blockchains/bitcoin/default.nix +++ b/pkgs/applications/blockchains/bitcoin/default.nix @@ -53,7 +53,7 @@ stdenv.mkDerivation rec { ++ optionals withWallet [ db48 sqlite ] ++ optionals withGui [ qrencode qtbase qttools ]; - postInstall = optional withGui '' + postInstall = optionalString withGui '' install -Dm644 ${desktop} $out/share/applications/bitcoin-qt.desktop substituteInPlace $out/share/applications/bitcoin-qt.desktop --replace "Icon=bitcoin128" "Icon=bitcoin" install -Dm644 share/pixmaps/bitcoin256.png $out/share/pixmaps/bitcoin.png diff --git a/pkgs/applications/blockchains/go-ethereum/default.nix b/pkgs/applications/blockchains/go-ethereum/default.nix index f087741254a6..8257aa43dd28 100644 --- a/pkgs/applications/blockchains/go-ethereum/default.nix +++ b/pkgs/applications/blockchains/go-ethereum/default.nix @@ -55,6 +55,6 @@ in buildGoModule rec { homepage = "https://geth.ethereum.org/"; description = "Official golang implementation of the Ethereum protocol"; license = with licenses; [ lgpl3Plus gpl3Plus ]; - maintainers = with maintainers; [ adisbladis lionello xrelkd RaghavSood ]; + maintainers = with maintainers; [ adisbladis lionello RaghavSood ]; }; } diff --git a/pkgs/applications/blockchains/openethereum/default.nix b/pkgs/applications/blockchains/openethereum/default.nix index be2373941b32..39f35f211f90 100644 --- a/pkgs/applications/blockchains/openethereum/default.nix +++ b/pkgs/applications/blockchains/openethereum/default.nix @@ -44,7 +44,7 @@ rustPlatform.buildRustPackage rec { description = "Fast, light, robust Ethereum implementation"; homepage = "http://parity.io/ethereum"; license = licenses.gpl3; - maintainers = with maintainers; [ akru xrelkd ]; + maintainers = with maintainers; [ akru ]; platforms = lib.platforms.unix; }; } diff --git a/pkgs/applications/editors/jetbrains/common.nix b/pkgs/applications/editors/jetbrains/common.nix index 985c36ee052a..3992fc5c2ec4 100644 --- a/pkgs/applications/editors/jetbrains/common.nix +++ b/pkgs/applications/editors/jetbrains/common.nix @@ -1,5 +1,5 @@ { stdenv, lib, makeDesktopItem, makeWrapper, patchelf, writeText -, coreutils, gnugrep, which, git, unzip, libsecret, libnotify +, coreutils, gnugrep, which, git, unzip, libsecret, libnotify, e2fsprogs , vmopts ? null }: @@ -78,7 +78,7 @@ with stdenv; lib.makeOverridable mkDerivation rec { --prefix PATH : "$out/libexec/${name}:${lib.optionalString (stdenv.isDarwin) "${jdk}/jdk/Contents/Home/bin:"}${lib.makeBinPath [ jdk coreutils gnugrep which git ]}" \ --prefix LD_LIBRARY_PATH : "${lib.makeLibraryPath ([ # Some internals want libstdc++.so.6 - stdenv.cc.cc.lib libsecret + stdenv.cc.cc.lib libsecret e2fsprogs libnotify ] ++ extraLdPath)}" \ --set JDK_HOME "$jdk" \ diff --git a/pkgs/applications/graphics/dosage/default.nix b/pkgs/applications/graphics/dosage/default.nix index db0012a184be..e5e77dccbbb4 100644 --- a/pkgs/applications/graphics/dosage/default.nix +++ b/pkgs/applications/graphics/dosage/default.nix @@ -1,28 +1,30 @@ -{ lib, python3Packages, fetchFromGitHub }: +{ lib, python3Packages }: python3Packages.buildPythonApplication rec { pname = "dosage"; - version = "2018.04.08"; - PBR_VERSION = version; + version = "2.17"; - src = fetchFromGitHub { - owner = "webcomics"; - repo = "dosage"; - rev = "b2fdc13feb65b93762928f7e99bac7b1b7b31591"; - sha256 = "1p6vllqaf9s6crj47xqp97hkglch1kd4y8y4lxvzx3g2shhhk9hh"; + src = python3Packages.fetchPypi { + inherit pname version; + sha256 = "0vmxgn9wd3j80hp4gr5iq06jrl4gryz5zgfdd2ah30d12sfcfig0"; }; - checkInputs = with python3Packages; [ pytest responses ]; - propagatedBuildInputs = with python3Packages; [ colorama lxml requests pbr setuptools ]; + + checkInputs = with python3Packages; [ + pytestCheckHook pytest-xdist responses + ]; + + nativeBuildInputs = with python3Packages; [ setuptools-scm ]; + + propagatedBuildInputs = with python3Packages; [ + colorama imagesize lxml requests setuptools six + ]; disabled = python3Packages.pythonOlder "3.3"; - checkPhase = '' - py.test tests/ - ''; - meta = { description = "A comic strip downloader and archiver"; homepage = "https://dosage.rocks/"; license = lib.licenses.mit; + maintainers = with lib.maintainers; [ toonn ]; }; } diff --git a/pkgs/applications/graphics/drawpile/default.nix b/pkgs/applications/graphics/drawpile/default.nix index f46e1f499c4d..fb5308921d4e 100644 --- a/pkgs/applications/graphics/drawpile/default.nix +++ b/pkgs/applications/graphics/drawpile/default.nix @@ -2,7 +2,6 @@ , lib , mkDerivation , fetchFromGitHub -, fetchpatch , extra-cmake-modules # common deps diff --git a/pkgs/applications/graphics/rx/default.nix b/pkgs/applications/graphics/rx/default.nix index a40371ddb466..fe3d10bae635 100644 --- a/pkgs/applications/graphics/rx/default.nix +++ b/pkgs/applications/graphics/rx/default.nix @@ -29,7 +29,7 @@ rustPlatform.buildRustPackage rec { # FIXME: GLFW (X11) requires DISPLAY env variable for all tests doCheck = false; - postInstall = optional stdenv.isLinux '' + postInstall = optionalString stdenv.isLinux '' mkdir -p $out/share/applications cp $src/rx.desktop $out/share/applications wrapProgram $out/bin/rx --prefix LD_LIBRARY_PATH : ${libGL}/lib diff --git a/pkgs/applications/misc/anytype/default.nix b/pkgs/applications/misc/anytype/default.nix index 5574caad9021..c479820ba08e 100644 --- a/pkgs/applications/misc/anytype/default.nix +++ b/pkgs/applications/misc/anytype/default.nix @@ -15,9 +15,8 @@ in appimageTools.wrapType2 { inherit name src; - extraPkgs = { pkgs, ... }@args: [ - pkgs.gnome3.libsecret - ] ++ appimageTools.defaultFhsEnvArgs.multiPkgs args; + extraPkgs = pkgs: (appimageTools.defaultFhsEnvArgs.multiPkgs pkgs) + ++ [ pkgs.libsecret ]; extraInstallCommands = '' mv $out/bin/${name} $out/bin/${pname} diff --git a/pkgs/applications/misc/moonlight-embedded/default.nix b/pkgs/applications/misc/moonlight-embedded/default.nix index 854714f6636b..d711f43ad570 100644 --- a/pkgs/applications/misc/moonlight-embedded/default.nix +++ b/pkgs/applications/misc/moonlight-embedded/default.nix @@ -18,10 +18,10 @@ stdenv.mkDerivation rec { outputs = [ "out" "man" ]; - nativeBuildInputs = [ cmake perl ]; + nativeBuildInputs = [ cmake perl pkg-config ]; buildInputs = [ alsa-lib libevdev libopus udev SDL2 - ffmpeg pkg-config xorg.libxcb libvdpau libpulseaudio libcec + ffmpeg xorg.libxcb libvdpau libpulseaudio libcec xorg.libpthreadstubs curl expat avahi libuuid libva ]; diff --git a/pkgs/applications/misc/pwsafe/default.nix b/pkgs/applications/misc/pwsafe/default.nix index 6aa1099c35c8..534f6adecdf8 100644 --- a/pkgs/applications/misc/pwsafe/default.nix +++ b/pkgs/applications/misc/pwsafe/default.nix @@ -6,13 +6,13 @@ stdenv.mkDerivation rec { pname = "pwsafe"; - version = "3.55.0"; + version = "3.56.0"; src = fetchFromGitHub { owner = pname; repo = pname; rev = version; - sha256 = "sha256-+Vfwz8xGmSzFNdiN5XYkRqGmFuBVIgexXdH3B+XYY3o="; + sha256 = "sha256-ZLX/3cs1cdia5+32QEwE6q3V0uFNkkmiIGboKW6Xej8="; }; nativeBuildInputs = [ diff --git a/pkgs/applications/misc/surface-control/default.nix b/pkgs/applications/misc/surface-control/default.nix index d78904f59880..e4b354845dde 100644 --- a/pkgs/applications/misc/surface-control/default.nix +++ b/pkgs/applications/misc/surface-control/default.nix @@ -31,7 +31,7 @@ rustPlatform.buildRustPackage rec { "Control various aspects of Microsoft Surface devices on Linux from the Command-Line"; homepage = "https://github.com/linux-surface/surface-control"; license = licenses.mit; - maintainers = with maintainers; [ winterqt ]; + maintainers = with maintainers; [ ]; platforms = platforms.linux; }; } diff --git a/pkgs/applications/misc/ticker/default.nix b/pkgs/applications/misc/ticker/default.nix index a3e2dc11c6f7..8e70a70423b9 100644 --- a/pkgs/applications/misc/ticker/default.nix +++ b/pkgs/applications/misc/ticker/default.nix @@ -16,9 +16,9 @@ buildGoModule rec { vendorSha256 = "sha256-XBfTVd3X3IDxLCAaNnijf6E5bw+AZ94UdOG9w7BOdBU="; - preBuild = '' - buildFlagsArray+=("-ldflags" "-s -w -X github.com/achannarasappa/ticker/cmd.Version=v${version}") - ''; + ldflags = [ + "-s" "-w" "-X github.com/achannarasappa/ticker/cmd.Version=v${version}" + ]; # Tests require internet doCheck = false; diff --git a/pkgs/applications/misc/waybar/default.nix b/pkgs/applications/misc/waybar/default.nix index 88f0e13e91ba..a38c1002a01f 100644 --- a/pkgs/applications/misc/waybar/default.nix +++ b/pkgs/applications/misc/waybar/default.nix @@ -78,7 +78,7 @@ stdenv.mkDerivation rec { "-Dman-pages=enabled" ]; - preFixup = lib.optional withMediaPlayer '' + preFixup = lib.optionalString withMediaPlayer '' cp $src/resources/custom_modules/mediaplayer.py $out/bin/waybar-mediaplayer.py wrapProgram $out/bin/waybar-mediaplayer.py \ diff --git a/pkgs/applications/misc/wmname/default.nix b/pkgs/applications/misc/wmname/default.nix index d501869770e0..cb4f5ec34425 100644 --- a/pkgs/applications/misc/wmname/default.nix +++ b/pkgs/applications/misc/wmname/default.nix @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { buildInputs = [ libX11 ]; - preConfigure = [ ''sed -i "s@PREFIX = /usr/local@PREFIX = $out@g" config.mk'' ]; + preConfigure = ''sed -i "s@PREFIX = /usr/local@PREFIX = $out@g" config.mk''; meta = { description = "Prints or set the window manager name property of the root window"; diff --git a/pkgs/applications/networking/browsers/brave/default.nix b/pkgs/applications/networking/browsers/brave/default.nix index 924b9a7fb827..fe7cfb6c7b36 100644 --- a/pkgs/applications/networking/browsers/brave/default.nix +++ b/pkgs/applications/networking/browsers/brave/default.nix @@ -90,11 +90,11 @@ in stdenv.mkDerivation rec { pname = "brave"; - version = "1.28.105"; + version = "1.28.106"; src = fetchurl { url = "https://github.com/brave/brave-browser/releases/download/v${version}/brave-browser_${version}_amd64.deb"; - sha256 = "1E2KWG5vHYBuph6Pv9J6FBOsUpegx4Ix/H99ZQ/x4zI="; + sha256 = "gr8d5Dh6ZHb2kThVOA61BoGo64MB77qF7ualUY2RRq0="; }; dontConfigure = true; diff --git a/pkgs/applications/networking/browsers/tor-browser-bundle-bin/default.nix b/pkgs/applications/networking/browsers/tor-browser-bundle-bin/default.nix index ca57c27ba50d..ac063cb1a644 100644 --- a/pkgs/applications/networking/browsers/tor-browser-bundle-bin/default.nix +++ b/pkgs/applications/networking/browsers/tor-browser-bundle-bin/default.nix @@ -88,19 +88,19 @@ let fteLibPath = makeLibraryPath [ stdenv.cc.cc gmp ]; # Upstream source - version = "10.5.2"; + version = "10.5.5"; lang = "en-US"; srcs = { x86_64-linux = fetchurl { url = "https://dist.torproject.org/torbrowser/${version}/tor-browser-linux64-${version}_${lang}.tar.xz"; - sha256 = "16zk7d0sxm2j00vb002mjj38wxcxxlahnfdb9lmkmkfms9p9xfkb"; + sha256 = "0847lib2z21fgb7x5szwvprc77fhdpmp4z5d6n1sk6d40dd34spn"; }; i686-linux = fetchurl { url = "https://dist.torproject.org/torbrowser/${version}/tor-browser-linux32-${version}_${lang}.tar.xz"; - sha256 = "0xc3ac2y9xf7ff3pqrp5n6l9j8i5hk3y2y3zwykwhnycnfi6dfv4"; + sha256 = "0i26fb0r234nrwnvb2c9vk9yn869qghq0n4qlm1d7mr62dy6prxa"; }; }; in diff --git a/pkgs/applications/networking/browsers/vivaldi/default.nix b/pkgs/applications/networking/browsers/vivaldi/default.nix index d13687386641..6477f4fbe06e 100644 --- a/pkgs/applications/networking/browsers/vivaldi/default.nix +++ b/pkgs/applications/networking/browsers/vivaldi/default.nix @@ -18,11 +18,11 @@ let vivaldiName = if isSnapshot then "vivaldi-snapshot" else "vivaldi"; in stdenv.mkDerivation rec { pname = "vivaldi"; - version = "4.1.2369.18-1"; + version = "4.1.2369.21-1"; src = fetchurl { url = "https://downloads.vivaldi.com/${branch}/vivaldi-${branch}_${version}_amd64.deb"; - sha256 = "062zh7a4mr52h9m09dnqrdc48ajnkq887kcbcvzcd20wsnvivi48"; + sha256 = "03062mik6paqp219jz420jsg762jjrfxmj1daq129z2zgzq0qr8l"; }; unpackPhase = '' diff --git a/pkgs/applications/networking/cluster/bosh-cli/default.nix b/pkgs/applications/networking/cluster/bosh-cli/default.nix index 2354a41a6a66..90105b1c4ebb 100644 --- a/pkgs/applications/networking/cluster/bosh-cli/default.nix +++ b/pkgs/applications/networking/cluster/bosh-cli/default.nix @@ -8,13 +8,13 @@ buildGoModule rec { pname = "bosh-cli"; - version = "6.4.4"; + version = "6.4.5"; src = fetchFromGitHub { owner = "cloudfoundry"; repo = pname; rev = "v${version}"; - sha256 = "sha256-N7GrxePNewxhHnkQP/XBdUIEL5FsFD4avouZaIO+BKc="; + sha256 = "sha256-/1JRje7SNrIsb3V1tq5ZW5zsURaQUzM/Jp3TMR0MfKw="; }; vendorSha256 = null; diff --git a/pkgs/applications/networking/cluster/cilium/default.nix b/pkgs/applications/networking/cluster/cilium/default.nix new file mode 100644 index 000000000000..1ee8f31ed890 --- /dev/null +++ b/pkgs/applications/networking/cluster/cilium/default.nix @@ -0,0 +1,23 @@ +{ lib, buildGoModule, fetchFromGitHub }: + +buildGoModule rec { + pname = "cilium-cli"; + version = "0.8.6"; + + src = fetchFromGitHub { + owner = "cilium"; + repo = pname; + rev = "v${version}"; + sha256 = "07p62zifycw7gnwkd3230jsjns80k2q9fbj8drzp84s9cp7ddpa9"; + }; + + vendorSha256 = null; + + meta = with lib; { + description = "CLI to install, manage & troubleshoot Kubernetes clusters running Cilium"; + license = licenses.asl20; + homepage = "https://www.cilium.io/"; + maintainers = with maintainers; [ humancalico ]; + mainProgram = "cilium"; + }; +} diff --git a/pkgs/applications/networking/cluster/cloudfoundry-cli/default.nix b/pkgs/applications/networking/cluster/cloudfoundry-cli/default.nix index a251886ebdd7..287640bf5a54 100644 --- a/pkgs/applications/networking/cluster/cloudfoundry-cli/default.nix +++ b/pkgs/applications/networking/cluster/cloudfoundry-cli/default.nix @@ -2,17 +2,17 @@ buildGoModule rec { pname = "cloudfoundry-cli"; - version = "7.2.0"; + version = "7.3.0"; src = fetchFromGitHub { owner = "cloudfoundry"; repo = "cli"; rev = "v${version}"; - sha256 = "0cf5vshyz6j70sv7x43r1404hdcmkzxgdb7514kjilp5z6wsr1nv"; + sha256 = "sha256-I+4tFAMmmsmi5WH9WKXIja1vVWsPHNGkWbvjWGUCmkU="; }; # vendor directory stale deleteVendor = true; - vendorSha256 = "0p0s0dr7kpmmnim4fps62vj4zki2qxxdq5ww0fzrf1372xbl4kp2"; + vendorSha256 = null; subPackages = [ "." ]; diff --git a/pkgs/applications/networking/cluster/cni/plugins.nix b/pkgs/applications/networking/cluster/cni/plugins.nix index 3c0b97f0bacb..0b862718cfb2 100644 --- a/pkgs/applications/networking/cluster/cni/plugins.nix +++ b/pkgs/applications/networking/cluster/cni/plugins.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "cni-plugins"; - version = "0.9.1"; + version = "1.0.0"; src = fetchFromGitHub { owner = "containernetworking"; repo = "plugins"; rev = "v${version}"; - sha256 = "sha256-n+OtFXgFmW0xsGEtC6ua0qjdsJSbEjn08mAl5Z51Kp8="; + sha256 = "sha256-RcDZW/iOAcJodGiuzmeZk3obtD0/mQoMF9vL0xNehbQ="; }; vendorSha256 = null; @@ -32,7 +32,6 @@ buildGoModule rec { "plugins/main/vlan" "plugins/meta/bandwidth" "plugins/meta/firewall" - "plugins/meta/flannel" "plugins/meta/portmap" "plugins/meta/sbr" "plugins/meta/tuning" diff --git a/pkgs/applications/networking/cluster/kube3d/default.nix b/pkgs/applications/networking/cluster/kube3d/default.nix index e565657a5cbd..3652405194f5 100644 --- a/pkgs/applications/networking/cluster/kube3d/default.nix +++ b/pkgs/applications/networking/cluster/kube3d/default.nix @@ -17,10 +17,10 @@ buildGoModule rec { excludedPackages = "\\(tools\\|docgen\\)"; - preBuild = let t = "github.com/rancher/k3d/v4/version"; in - '' - buildFlagsArray+=("-ldflags" "-s -w -X ${t}.Version=v${version} -X ${t}.K3sVersion=v${k3sVersion}") - ''; + ldflags = let t = "github.com/rancher/k3d/v4/version"; in + [ + "-s" "-w" "-X ${t}.Version=v${version}" "-X ${t}.K3sVersion=v${k3sVersion}" + ]; doCheck = false; 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 7dc1a3c7d9cf..9679f5bd2e03 100644 --- a/pkgs/applications/networking/cluster/octant/plugins/starboard-octant-plugin.nix +++ b/pkgs/applications/networking/cluster/octant/plugins/starboard-octant-plugin.nix @@ -13,9 +13,9 @@ buildGoModule rec { vendorSha256 = "sha256-EM0lPwwWJuLD+aqZWshz1ILaeEtUU4wJ0Puwv1Ikgf4="; - preBuild = '' - buildFlagsArray+=("-ldflags" "-s -w") - ''; + ldflags = [ + "-s" "-w" + ]; meta = with lib; { homepage = "https://github.com/aquasecurity/starboard-octant-plugin"; diff --git a/pkgs/applications/networking/cluster/starboard/default.nix b/pkgs/applications/networking/cluster/starboard/default.nix index d92518c0b4cc..066b70e8e254 100644 --- a/pkgs/applications/networking/cluster/starboard/default.nix +++ b/pkgs/applications/networking/cluster/starboard/default.nix @@ -16,9 +16,9 @@ buildGoModule rec { # Don't build and check the integration tests excludedPackages = "itest"; - preBuild = '' - buildFlagsArray+=("-ldflags" "-s -w -X main.version=v${version}") - ''; + ldflags = [ + "-s" "-w" "-X main.version=v${version}" + ]; preCheck = '' # Remove test that requires networking diff --git a/pkgs/applications/networking/mumble/default.nix b/pkgs/applications/networking/mumble/default.nix index d93fea1f702a..c7500d903288 100644 --- a/pkgs/applications/networking/mumble/default.nix +++ b/pkgs/applications/networking/mumble/default.nix @@ -104,7 +104,7 @@ let server = source: generic { type = "murmur"; - postPatch = lib.optional iceSupport '' + postPatch = lib.optionalString iceSupport '' grep -Rl '/usr/share/Ice' . | xargs sed -i 's,/usr/share/Ice/,${zeroc-ice.dev}/share/ice/,g' ''; diff --git a/pkgs/applications/networking/onionshare/default.nix b/pkgs/applications/networking/onionshare/default.nix index 529b871d20c8..f80fb3a73953 100644 --- a/pkgs/applications/networking/onionshare/default.nix +++ b/pkgs/applications/networking/onionshare/default.nix @@ -23,12 +23,12 @@ }: let - version = "2.3.2"; + version = "2.3.3"; src = fetchFromGitHub { owner = "micahflee"; repo = "onionshare"; rev = "v${version}"; - sha256 = "sha256-mzLDvvpO82iGDnzY42wx1KCNmAxUgVhpaDVprtb+YOI="; + sha256 = "sha256-wU2020RNXlwJ2y9uzcLxIX4EECev1Z9YvNyiBalLj/Y="; }; meta = with lib; { description = "Securely and anonymously send and receive files"; @@ -94,6 +94,11 @@ in rec { # Tests use the home directory export HOME="$(mktemp -d)" ''; + + disabledTests = [ + "test_firefox_like_behavior" + "test_if_unmodified_since" + ]; }; onionshare-gui = buildPythonApplication { diff --git a/pkgs/applications/science/biology/neuron/default.nix b/pkgs/applications/science/biology/neuron/default.nix index 7bfef3a82fed..804407968e1c 100644 --- a/pkgs/applications/science/biology/neuron/default.nix +++ b/pkgs/applications/science/biology/neuron/default.nix @@ -60,13 +60,13 @@ stdenv.mkDerivation rec { else ["--without-mpi"]); - postInstall = lib.optionals (python != null) [ '' + postInstall = lib.optionalString (python != null) '' ## standardise python neuron install dir if any if [[ -d $out/lib/python ]]; then mkdir -p ''${out}/${python.sitePackages} mv ''${out}/lib/python/* ''${out}/${python.sitePackages}/ fi - '']; + ''; propagatedBuildInputs = [ readline ncurses which libtool ]; diff --git a/pkgs/applications/science/electronics/kicad/base.nix b/pkgs/applications/science/electronics/kicad/base.nix index 596083c27098..d7398f39ec43 100644 --- a/pkgs/applications/science/electronics/kicad/base.nix +++ b/pkgs/applications/science/electronics/kicad/base.nix @@ -64,7 +64,7 @@ assert lib.assertMsg (!(sanitizeAddress && sanitizeThreads)) "'sanitizeAddress' and 'sanitizeThreads' are mutually exclusive, use one."; let - inherit (lib) optional optionals; + inherit (lib) optional optionals optionalString; in stdenv.mkDerivation rec { pname = "kicad-base"; @@ -172,7 +172,7 @@ stdenv.mkDerivation rec { dontStrip = debug; - postInstall = optional (withI18n) '' + postInstall = optionalString (withI18n) '' mkdir -p $out/share lndir ${i18n}/share $out/share ''; diff --git a/pkgs/applications/science/math/ginac/default.nix b/pkgs/applications/science/math/ginac/default.nix index 0a6f1569cd4e..78b64d7f587a 100644 --- a/pkgs/applications/science/math/ginac/default.nix +++ b/pkgs/applications/science/math/ginac/default.nix @@ -1,30 +1,34 @@ { lib, stdenv, fetchurl, cln, pkg-config, readline, gmp, python3 }: stdenv.mkDerivation rec { - name = "ginac-1.8.1"; + pname = "ginac"; + version = "1.8.1"; src = fetchurl { - url = "${meta.homepage}/${name}.tar.bz2"; + url = "https://www.ginac.de/ginac-${version}.tar.bz2"; sha256 = "sha256-8WldvWsYcGHvP7pQdkjJ1tukOPczsFjBb5J4y9z14as="; }; propagatedBuildInputs = [ cln ]; - buildInputs = [ readline ] ++ lib.optional stdenv.isDarwin gmp; + buildInputs = [ readline ] + ++ lib.optional stdenv.isDarwin gmp; nativeBuildInputs = [ pkg-config python3 ]; strictDeps = true; - preConfigure = "patchShebangs ginsh"; + preConfigure = '' + patchShebangs ginsh + ''; configureFlags = [ "--disable-rpath" ]; meta = with lib; { description = "GiNaC is Not a CAS"; - homepage = "https://www.ginac.de/"; + homepage = "https://www.ginac.de/"; maintainers = with maintainers; [ lovek323 ]; license = licenses.gpl2; - platforms = platforms.all; + platforms = platforms.all; }; } diff --git a/pkgs/applications/science/physics/sherpa/default.nix b/pkgs/applications/science/physics/sherpa/default.nix index ba519cc2d032..eb718be12e4a 100644 --- a/pkgs/applications/science/physics/sherpa/default.nix +++ b/pkgs/applications/science/physics/sherpa/default.nix @@ -9,7 +9,7 @@ stdenv.mkDerivation rec { sha256 = "1iwa17s8ipj6a2b8zss5csb1k5y9s5js38syvq932rxcinbyjsl4"; }; - postPatch = lib.optional (stdenv.hostPlatform.libc == "glibc") '' + postPatch = lib.optionalString (stdenv.hostPlatform.libc == "glibc") '' sed -ie '/sys\/sysctl.h/d' ATOOLS/Org/Run_Parameter.C ''; diff --git a/pkgs/applications/system/glances/default.nix b/pkgs/applications/system/glances/default.nix index 8ddee9c0b49c..7c3120f57040 100644 --- a/pkgs/applications/system/glances/default.nix +++ b/pkgs/applications/system/glances/default.nix @@ -9,14 +9,14 @@ buildPythonApplication rec { pname = "glances"; - version = "3.2.3"; + version = "3.2.3.1"; disabled = isPyPy; src = fetchFromGitHub { owner = "nicolargo"; repo = "glances"; rev = "v${version}"; - sha256 = "1nc8bdzzrzaircq3myd32w6arpy2prn739886cq2h47cpinxmvpr"; + sha256 = "0h7y36z4rizl1lyxacq32vpmvbwn9w2nrvrxn791060cksfw4xwd"; }; # Some tests fail in the sandbox (they e.g. require access to /sys/class/power_supply): @@ -31,7 +31,7 @@ buildPythonApplication rec { ]; doCheck = true; - preCheck = lib.optional stdenv.isDarwin '' + preCheck = lib.optionalString stdenv.isDarwin '' export DYLD_FRAMEWORK_PATH=/System/Library/Frameworks ''; diff --git a/pkgs/applications/terminal-emulators/kitty/default.nix b/pkgs/applications/terminal-emulators/kitty/default.nix index 441c9904c071..cfd46a613f77 100644 --- a/pkgs/applications/terminal-emulators/kitty/default.nix +++ b/pkgs/applications/terminal-emulators/kitty/default.nix @@ -21,14 +21,14 @@ with python3Packages; buildPythonApplication rec { pname = "kitty"; - version = "0.21.2"; + version = "0.23.1"; format = "other"; src = fetchFromGitHub { owner = "kovidgoyal"; repo = "kitty"; rev = "v${version}"; - sha256 = "0y0mg8rr18mn0wzym7v48x6kl0ixd5q387kr5jhbdln55ph2jk9d"; + sha256 = "sha256-2RwDU6EOJWF0u2ikJFg9U2yqSXergDkJH3h2i+QJ7G4="; }; buildInputs = [ @@ -52,8 +52,14 @@ buildPythonApplication rec { ]; nativeBuildInputs = [ - pkg-config sphinx ncurses installShellFiles + ncurses + pkg-config + sphinx + furo + sphinx-copybutton + sphinxext-opengraph + sphinx-inline-tabs ] ++ lib.optionals stdenv.isDarwin [ imagemagick libicns # For the png2icns tool. @@ -111,12 +117,12 @@ buildPythonApplication rec { cp -r linux-package/{bin,share,lib} $out ''} wrapProgram "$out/bin/kitty" --prefix PATH : "$out/bin:${lib.makeBinPath [ imagemagick xsel ncurses.dev ]}" - runHook postInstall installShellCompletion --cmd kitty \ --bash <("$out/bin/kitty" + complete setup bash) \ --fish <("$out/bin/kitty" + complete setup fish) \ --zsh <("$out/bin/kitty" + complete setup zsh) + runHook postInstall ''; postInstall = '' @@ -136,7 +142,7 @@ buildPythonApplication rec { homepage = "https://github.com/kovidgoyal/kitty"; description = "A modern, hackable, featureful, OpenGL based terminal emulator"; license = licenses.gpl3Only; - changelog = "https://sw.kovidgoyal.net/kitty/changelog.html"; + changelog = "https://sw.kovidgoyal.net/kitty/changelog/"; platforms = platforms.darwin ++ platforms.linux; maintainers = with maintainers; [ tex rvolosatovs Luflosi ]; }; diff --git a/pkgs/applications/version-management/gitlab-triage/Gemfile.lock b/pkgs/applications/version-management/gitlab-triage/Gemfile.lock index adec5b524f34..e5df89d66090 100644 --- a/pkgs/applications/version-management/gitlab-triage/Gemfile.lock +++ b/pkgs/applications/version-management/gitlab-triage/Gemfile.lock @@ -1,27 +1,35 @@ GEM remote: https://rubygems.org/ specs: - activesupport (5.2.4.4) + activesupport (5.2.6) concurrent-ruby (~> 1.0, >= 1.0.2) i18n (>= 0.7, < 2) minitest (~> 5.1) tzinfo (~> 1.1) - concurrent-ruby (1.1.7) - gitlab-triage (1.13.0) + concurrent-ruby (1.1.9) + gitlab-triage (1.20.0) activesupport (~> 5.1) + globalid (~> 0.4) + graphql-client (~> 0.16) httparty (~> 0.17) + globalid (0.5.2) + activesupport (>= 5.0) + graphql (1.12.14) + graphql-client (0.16.0) + activesupport (>= 3.0) + graphql (~> 1.8) httparty (0.18.1) mime-types (~> 3.0) multi_xml (>= 0.5.2) - i18n (1.8.5) + i18n (1.8.10) concurrent-ruby (~> 1.0) mime-types (3.3.1) mime-types-data (~> 3.2015) - mime-types-data (3.2020.0512) - minitest (5.14.2) + mime-types-data (3.2021.0704) + minitest (5.14.4) multi_xml (0.6.0) thread_safe (0.3.6) - tzinfo (1.2.7) + tzinfo (1.2.9) thread_safe (~> 0.1) PLATFORMS diff --git a/pkgs/applications/version-management/gitlab-triage/gemset.nix b/pkgs/applications/version-management/gitlab-triage/gemset.nix index 527487706615..519ddc8bec0b 100644 --- a/pkgs/applications/version-management/gitlab-triage/gemset.nix +++ b/pkgs/applications/version-management/gitlab-triage/gemset.nix @@ -5,31 +5,63 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0dpnk20s754fz6jfz9sp3ri49hn46ksw4hf6ycnlw7s3hsdxqgcd"; + sha256 = "1vybx4cj42hr6m8cdwbrqq2idh98zms8c11kr399xjczhl9ywjbj"; type = "gem"; }; - version = "5.2.4.4"; + version = "5.2.6"; }; concurrent-ruby = { groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1vnxrbhi7cq3p4y2v9iwd10v1c7l15is4var14hwnb2jip4fyjzz"; + sha256 = "0nwad3211p7yv9sda31jmbyw6sdafzmdi2i2niaz6f0wk5nq9h0f"; type = "gem"; }; - version = "1.1.7"; + version = "1.1.9"; }; gitlab-triage = { - dependencies = ["activesupport" "httparty"]; + dependencies = ["activesupport" "globalid" "graphql-client" "httparty"]; groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "11sas3h3n638gni1mysck1ahyakqnl8gg6g21pc3krs6jrg9qxj9"; + sha256 = "sha256-sg/YgRnp1+EcTcBqsm8vZrV0YuHTSJEFk/whhW8An6g="; type = "gem"; }; - version = "1.13.0"; + version = "1.20.0"; + }; + globalid = { + dependencies = ["activesupport"]; + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0k6ww3shk3mv119xvr9m99l6ql0czq91xhd66hm8hqssb18r2lvm"; + type = "gem"; + }; + version = "0.5.2"; + }; + graphql = { + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "sha256-iweRDvp7EWY02B52iwbebEpiwL7Mj9E9RyeHYMuqc/o="; + type = "gem"; + }; + version = "1.12.14"; + }; + graphql-client = { + dependencies = ["activesupport" "graphql"]; + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0g971rccyrs3rk8812r6az54p28g66m4ngdcbszg31mvddjaqkr4"; + type = "gem"; + }; + version = "0.16.0"; }; httparty = { dependencies = ["mime-types" "multi_xml"]; @@ -48,10 +80,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "153sx77p16vawrs4qpkv7qlzf9v5fks4g7xqcj1dwk40i6g7rfzk"; + sha256 = "0g2fnag935zn2ggm5cn6k4s4xvv53v2givj1j90szmvavlpya96a"; type = "gem"; }; - version = "1.8.5"; + version = "1.8.10"; }; mime-types = { dependencies = ["mime-types-data"]; @@ -69,20 +101,20 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1z75svngyhsglx0y2f9rnil2j08f9ab54b3l95bpgz67zq2if753"; + sha256 = "0dlxwc75iy0dj23x824cxpvpa7c8aqcpskksrmb32j6m66h5mkcy"; type = "gem"; }; - version = "3.2020.0512"; + version = "3.2021.0704"; }; minitest = { groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "170y2cvx51gm3cm3nhdf7j36sxnkh6vv8ls36p90ric7w8w16h4v"; + sha256 = "19z7wkhg59y8abginfrm2wzplz7py3va8fyngiigngqvsws6cwgl"; type = "gem"; }; - version = "5.14.2"; + version = "5.14.4"; }; multi_xml = { groups = ["default"]; @@ -110,9 +142,9 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1i3jh086w1kbdj3k5l60lc3nwbanmzdf8yjj3mlrx9b2gjjxhi9r"; + sha256 = "0zwqqh6138s8b321fwvfbywxy00lw1azw4ql3zr0xh1aqxf8cnvj"; type = "gem"; }; - version = "1.2.7"; + version = "1.2.9"; }; } diff --git a/pkgs/applications/window-managers/qtile/0001-Substitution-vars-for-absolute-paths.patch b/pkgs/applications/window-managers/qtile/0001-Substitution-vars-for-absolute-paths.patch deleted file mode 100644 index ed22ed99b078..000000000000 --- a/pkgs/applications/window-managers/qtile/0001-Substitution-vars-for-absolute-paths.patch +++ /dev/null @@ -1,31 +0,0 @@ -diff --git a/libqtile/backend/x11/xcursors.py b/libqtile/backend/x11/xcursors.py -index 24454b83..ef37875c 100644 ---- a/libqtile/backend/x11/xcursors.py -+++ b/libqtile/backend/x11/xcursors.py -@@ -107,7 +107,7 @@ class Cursors(dict): - - def _setup_xcursor_binding(self): - try: -- xcursor = ffi.dlopen('libxcb-cursor.so.0') -+ xcursor = ffi.dlopen('@xcb-cursor@/lib/libxcb-cursor.so.0') - except OSError: - logger.warning("xcb-cursor not found, fallback to font pointer") - return False -diff --git a/libqtile/pangocffi.py b/libqtile/pangocffi.py -index dbae27ed..54c2c35f 100644 ---- a/libqtile/pangocffi.py -+++ b/libqtile/pangocffi.py -@@ -52,10 +52,9 @@ try: - except ImportError: - raise ImportError("No module named libqtile._ffi_pango, be sure to run `./scripts/ffibuild`") - --gobject = ffi.dlopen('libgobject-2.0.so.0') --pango = ffi.dlopen('libpango-1.0.so.0') --pangocairo = ffi.dlopen('libpangocairo-1.0.so.0') -- -+gobject = ffi.dlopen('@glib@/lib/libgobject-2.0.so.0') -+pango = ffi.dlopen('@pango@/lib/libpango-1.0.so.0') -+pangocairo = ffi.dlopen('@pango@/lib/libpangocairo-1.0.so.0') - - def patch_cairo_context(cairo_t): - def create_layout(): diff --git a/pkgs/applications/window-managers/qtile/0002-Restore-PATH-and-PYTHONPATH.patch b/pkgs/applications/window-managers/qtile/0002-Restore-PATH-and-PYTHONPATH.patch deleted file mode 100644 index 1eaa5b84174c..000000000000 --- a/pkgs/applications/window-managers/qtile/0002-Restore-PATH-and-PYTHONPATH.patch +++ /dev/null @@ -1,71 +0,0 @@ -diff --git a/bin/qshell b/bin/qshell -index 5c652b7a..2d169eb2 100755 ---- a/bin/qshell -+++ b/bin/qshell -@@ -28,5 +28,6 @@ base_dir = os.path.abspath(os.path.join(this_dir, "..")) - sys.path.insert(0, base_dir) - - if __name__ == '__main__': -+ __import__("importlib").import_module("libqtile.utils").restore_os_environment() - from libqtile.scripts import qshell - qshell.main() -diff --git a/bin/qtile b/bin/qtile -index ebc8fab5..08a965ef 100755 ---- a/bin/qtile -+++ b/bin/qtile -@@ -29,5 +29,6 @@ base_dir = os.path.abspath(os.path.join(this_dir, "..")) - sys.path.insert(0, base_dir) - - if __name__ == '__main__': -+ __import__("importlib").import_module("libqtile.utils").restore_os_environment() - from libqtile.scripts import qtile - qtile.main() -diff --git a/bin/qtile-cmd b/bin/qtile-cmd -index a2136ee6..3d37a6d9 100755 ---- a/bin/qtile-cmd -+++ b/bin/qtile-cmd -@@ -8,5 +8,6 @@ base_dir = os.path.abspath(os.path.join(this_dir, "..")) - sys.path.insert(0, base_dir) - - if __name__ == '__main__': -+ __import__("importlib").import_module("libqtile.utils").restore_os_environment() - from libqtile.scripts import qtile_cmd - qtile_cmd.main() -diff --git a/bin/qtile-run b/bin/qtile-run -index ac4cb1fd..74c589cb 100755 ---- a/bin/qtile-run -+++ b/bin/qtile-run -@@ -8,5 +8,6 @@ base_dir = os.path.abspath(os.path.join(this_dir, "..")) - sys.path.insert(0, base_dir) - - if __name__ == '__main__': -+ __import__("importlib").import_module("libqtile.utils").restore_os_environment() - from libqtile.scripts import qtile_run - qtile_run.main() -diff --git a/bin/qtile-top b/bin/qtile-top -index a6251f27..0d524b1d 100755 ---- a/bin/qtile-top -+++ b/bin/qtile-top -@@ -8,5 +8,6 @@ base_dir = os.path.abspath(os.path.join(this_dir, "..")) - sys.path.insert(0, base_dir) - - if __name__ == '__main__': -+ __import__("importlib").import_module("libqtile.utils").restore_os_environment() - from libqtile.scripts import qtile_top - qtile_top.main() -diff --git a/libqtile/utils.py b/libqtile/utils.py -index 2628c898..05117be7 100644 ---- a/libqtile/utils.py -+++ b/libqtile/utils.py -@@ -270,3 +270,10 @@ def guess_terminal(): - return terminal - - logger.error('Default terminal has not been found.') -+ -+def restore_os_environment(): -+ pythonpath = os.environ.pop("QTILE_SAVED_PYTHONPATH", "") -+ os.environ["PYTHONPATH"] = pythonpath -+ path = os.environ.pop("QTILE_SAVED_PATH", None) -+ if path: -+ os.environ["PATH"] = path - diff --git a/pkgs/applications/window-managers/qtile/0003-Restart-executable.patch b/pkgs/applications/window-managers/qtile/0003-Restart-executable.patch deleted file mode 100644 index c04d8a83c1a2..000000000000 --- a/pkgs/applications/window-managers/qtile/0003-Restart-executable.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/libqtile/core/manager.py b/libqtile/core/manager.py -index c22eeb6a..2ffe4eab 100644 ---- a/libqtile/core/manager.py -+++ b/libqtile/core/manager.py -@@ -278,7 +278,7 @@ class Qtile(CommandObject): - logger.error("Unable to pickle qtile state") - argv = [s for s in argv if not s.startswith('--with-state')] - argv.append('--with-state=' + buf.getvalue().decode()) -- self._restart = (sys.executable, argv) -+ self._restart = (os.environ.get("QTILE_WRAPPER", "@out@/bin/qtile"), argv[1:]) - self.stop() - - async def finalize(self): diff --git a/pkgs/applications/window-managers/qtile/default.nix b/pkgs/applications/window-managers/qtile/default.nix index 08b3a9834b6a..cd7b5a159e2a 100644 --- a/pkgs/applications/window-managers/qtile/default.nix +++ b/pkgs/applications/window-managers/qtile/default.nix @@ -1,66 +1,66 @@ -{ lib, fetchFromGitHub, python37Packages, glib, cairo, pango, pkg-config, libxcb, xcbutilcursor }: +{ lib, fetchFromGitHub, python3, glib, cairo, pango, pkg-config, libxcb, xcbutilcursor }: -let cairocffi-xcffib = python37Packages.cairocffi.override { +let + enabled-xcffib = cairocffi-xcffib: cairocffi-xcffib.override { withXcffib = true; }; + + # make it easier to reference python + python = python3; + pythonPackages = python.pkgs; + + unwrapped = pythonPackages.buildPythonPackage rec { + name = "qtile-${version}"; + version = "0.18.0"; + + src = fetchFromGitHub { + owner = "qtile"; + repo = "qtile"; + rev = "v${version}"; + sha256 = "sha256-S9G/EI18p9EAyWgI1ajDrLimeE+ETBC9feUDb/QthqI="; + }; + + postPatch = '' + substituteInPlace libqtile/pangocffi.py \ + --replace libgobject-2.0.so.0 ${glib.out}/lib/libgobject-2.0.so.0 \ + --replace libpangocairo-1.0.so.0 ${pango.out}/lib/libpangocairo-1.0.so.0 \ + --replace libpango-1.0.so.0 ${pango.out}/lib/libpango-1.0.so.0 + substituteInPlace libqtile/backend/x11/xcursors.py \ + --replace libxcb-cursor.so.0 ${xcbutilcursor.out}/lib/libxcb-cursor.so.0 + ''; + + SETUPTOOLS_SCM_PRETEND_VERSION = version; + + nativeBuildInputs = [ + pkg-config + ] ++ (with pythonPackages; [ + setuptools-scm + ]); + + propagatedBuildInputs = with pythonPackages; [ + xcffib + (enabled-xcffib cairocffi) + setuptools + python-dateutil + dbus-python + mpd2 + psutil + pyxdg + pygobject3 + ]; + + doCheck = false; # Requires X server #TODO this can be worked out with the existing NixOS testing infrastructure. + + meta = with lib; { + homepage = "http://www.qtile.org/"; + license = licenses.mit; + description = "A small, flexible, scriptable tiling window manager written in Python"; + platforms = platforms.linux; + maintainers = with maintainers; [ kamilchm ]; + }; + }; in - -python37Packages.buildPythonApplication rec { - name = "qtile-${version}"; - version = "0.16.0"; - - src = fetchFromGitHub { - owner = "qtile"; - repo = "qtile"; - rev = "v${version}"; - sha256 = "1klv1k9847nyx71sfrhqyl1k51k2w8phqnp2bns4dvbqii7q125l"; - }; - - patches = [ - ./0001-Substitution-vars-for-absolute-paths.patch - ./0002-Restore-PATH-and-PYTHONPATH.patch - ./0003-Restart-executable.patch - ]; - - postPatch = '' - substituteInPlace libqtile/core/manager.py --subst-var-by out $out - substituteInPlace libqtile/pangocffi.py --subst-var-by glib ${glib.out} - substituteInPlace libqtile/pangocffi.py --subst-var-by pango ${pango.out} - substituteInPlace libqtile/backend/x11/xcursors.py --subst-var-by xcb-cursor ${xcbutilcursor.out} - ''; - - SETUPTOOLS_SCM_PRETEND_VERSION = version; - - nativeBuildInputs = [ pkg-config ]; - buildInputs = [ glib libxcb cairo pango python37Packages.xcffib ]; - - pythonPath = with python37Packages; [ - xcffib - cairocffi-xcffib - setuptools - setuptools-scm - python-dateutil - dbus-python - mpd2 - psutil - pyxdg - pygobject3 - ]; - - postInstall = '' - wrapProgram $out/bin/qtile \ - --run 'export QTILE_WRAPPER=$0' \ - --run 'export QTILE_SAVED_PYTHONPATH=$PYTHONPATH' \ - --run 'export QTILE_SAVED_PATH=$PATH' - ''; - - doCheck = false; # Requires X server #TODO this can be worked out with the existing NixOS testing infrastructure. - - meta = with lib; { - homepage = "http://www.qtile.org/"; - license = licenses.mit; - description = "A small, flexible, scriptable tiling window manager written in Python"; - platforms = platforms.linux; - maintainers = with maintainers; [ kamilchm ]; - }; -} + (python.withPackages (ps: [ unwrapped ])).overrideAttrs (_: { + # export underlying qtile package + passthru = { inherit unwrapped; }; + }) diff --git a/pkgs/build-support/fetchgx/default.nix b/pkgs/build-support/fetchgx/default.nix index 3ccf5d273fc5..93f60c0a9cac 100644 --- a/pkgs/build-support/fetchgx/default.nix +++ b/pkgs/build-support/fetchgx/default.nix @@ -12,7 +12,9 @@ stdenvNoCC.mkDerivation { outputHashMode = "recursive"; outputHash = sha256; - phases = [ "unpackPhase" "buildPhase" "installPhase" ]; + dontConfigure = true; + doCheck = false; + doInstallCheck = false; buildPhase = '' export GOPATH=$(pwd)/vendor diff --git a/pkgs/build-support/templaterpm/default.nix b/pkgs/build-support/templaterpm/default.nix index efe70efe6c44..c98716a3fedb 100644 --- a/pkgs/build-support/templaterpm/default.nix +++ b/pkgs/build-support/templaterpm/default.nix @@ -7,7 +7,7 @@ stdenv.mkDerivation { nativeBuildInputs = [ makeWrapper ]; buildInputs = [ python toposort rpm ]; - phases = [ "installPhase" "fixupPhase" ]; + dontUnpack = true; installPhase = '' mkdir -p $out/bin diff --git a/pkgs/data/fonts/julia-mono/default.nix b/pkgs/data/fonts/julia-mono/default.nix index 014d6bd6f853..88f9683e34f2 100644 --- a/pkgs/data/fonts/julia-mono/default.nix +++ b/pkgs/data/fonts/julia-mono/default.nix @@ -1,13 +1,13 @@ { lib, fetchzip }: let - version = "0.040"; + version = "0.041"; in fetchzip { name = "JuliaMono-ttf-${version}"; url = "https://github.com/cormullion/juliamono/releases/download/v${version}/JuliaMono-ttf.tar.gz"; - sha256 = "sha256-Rrsvs682aWXZqydnOifXTJMa4uPl/aCGbVNRPGxkZng="; + sha256 = "sha256-OjguPR2MFjbY72/PF0R43/g6i95uAPVPbXk+HS0B360="; postFetch = '' mkdir -p $out/share/fonts/truetype diff --git a/pkgs/data/fonts/libertinus/default.nix b/pkgs/data/fonts/libertinus/default.nix index 7d95b6a26ff3..8f58cb92baa4 100644 --- a/pkgs/data/fonts/libertinus/default.nix +++ b/pkgs/data/fonts/libertinus/default.nix @@ -1,29 +1,29 @@ -{ lib, fetchFromGitHub }: +{ lib, fetchurl }: let - version = "6.9"; -in fetchFromGitHub rec { + version = "7.040"; +in fetchurl rec { name = "libertinus-${version}"; + url = "https://github.com/alerque/libertinus/releases/download/v${version}/Libertinus-${version}.tar.xz"; + sha256 = "0z658r88p52dyrcslv0wlccw0sw7m5jz8nbqizv95nf7bfw96iyk"; - owner = "alif-type"; - repo = "libertinus"; - rev = "v${version}"; + downloadToTemp = true; + recursiveHash = true; postFetch = '' tar xf $downloadedFile --strip=1 - install -m444 -Dt $out/share/fonts/opentype *.otf - install -m444 -Dt $out/share/doc/${name} *.txt + install -m644 -Dt $out/share/fonts/opentype static/OTF/*.otf ''; - sha256 = "0765a7w0askkhrjmjk638gcm9h6fcm1jpaza8iw9afr3sz1s0xlq"; meta = with lib; { - description = "A fork of the Linux Libertine and Linux Biolinum fonts"; + description = "The Libertinus font family"; longDescription = '' - Libertinus fonts is a fork of the Linux Libertine and Linux Biolinum fonts - that started as an OpenType math companion of the Libertine font family, - but grown as a full fork to address some of the bugs in the fonts. + The Libertinus font project began as a fork of the Linux Libertine and + Linux Biolinum fonts. The original impetus was to add an OpenType math + companion to the Libertine font families. Over time it grew into to a + full-fledged fork addressing many of the bugs in the Libertine fonts. ''; - homepage = "https://github.com/alif-type/libertinus"; + homepage = "https://github.com/alerque/libertinus"; license = licenses.ofl; maintainers = with maintainers; [ siddharthist ]; platforms = platforms.all; diff --git a/pkgs/desktops/gnome/core/gnome-shell/default.nix b/pkgs/desktops/gnome/core/gnome-shell/default.nix index aa7efdf51c83..6a7cb1742ba6 100644 --- a/pkgs/desktops/gnome/core/gnome-shell/default.nix +++ b/pkgs/desktops/gnome/core/gnome-shell/default.nix @@ -66,13 +66,13 @@ let in stdenv.mkDerivation rec { pname = "gnome-shell"; - version = "40.3"; + version = "40.4"; outputs = [ "out" "devdoc" ]; src = fetchurl { url = "mirror://gnome/sources/gnome-shell/${lib.versions.major version}/${pname}-${version}.tar.xz"; - sha256 = "sha256-erEMbulpmCjdch6/jOHeRk3KqpHUlYI79LhMiTmejCs="; + sha256 = "160z8bz2kqmrs6a4cs2gakv0rl9ba69p3ij2xjakqav50n9r3i9b"; }; patches = [ diff --git a/pkgs/desktops/mate/atril/default.nix b/pkgs/desktops/mate/atril/default.nix index 7e8afde588c6..81c5bdcd78ec 100644 --- a/pkgs/desktops/mate/atril/default.nix +++ b/pkgs/desktops/mate/atril/default.nix @@ -24,11 +24,11 @@ with lib; stdenv.mkDerivation rec { pname = "atril"; - version = "1.24.1"; + version = "1.26.0"; src = fetchurl { url = "https://pub.mate-desktop.org/releases/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "06nyicj96dqcv035yqnzmm6pk3m35glxj0ny6lk1vwqkk2l750xl"; + sha256 = "0pz44k3axhjhhwfrfvnwvxak1dmjkwqs63rhrbcaagyymrp7cpki"; }; nativeBuildInputs = [ diff --git a/pkgs/desktops/mate/caja-dropbox/default.nix b/pkgs/desktops/mate/caja-dropbox/default.nix index 3b96f67b12a9..27bf56cf5160 100644 --- a/pkgs/desktops/mate/caja-dropbox/default.nix +++ b/pkgs/desktops/mate/caja-dropbox/default.nix @@ -7,11 +7,11 @@ let in stdenv.mkDerivation rec { pname = "caja-dropbox"; - version = "1.24.0"; + version = "1.26.0"; src = fetchurl { url = "https://pub.mate-desktop.org/releases/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "1rcn82q58mv9hn5xamvzay2pw1szfk6zns94362476fcp786lji2"; + sha256 = "16w4r0zjps12lmzwiwpb9qnmbvd0p391q97296sxa8k88b1x14wn"; }; patches = [ diff --git a/pkgs/desktops/mate/caja-extensions/default.nix b/pkgs/desktops/mate/caja-extensions/default.nix index 5c08074f0450..0b21f2721dba 100644 --- a/pkgs/desktops/mate/caja-extensions/default.nix +++ b/pkgs/desktops/mate/caja-extensions/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "caja-extensions"; - version = "1.24.1"; + version = "1.26.0"; src = fetchurl { url = "https://pub.mate-desktop.org/releases/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "13jkynanqj8snys0if8lv6yx1y0jrm778s2152n4x65hsghc6cw5"; + sha256 = "03zwv3yl5553cnp6jjn7vr4l28dcdhsap7qimlrbvy20119kj5gh"; }; nativeBuildInputs = [ diff --git a/pkgs/desktops/mate/caja/caja-extension-dirs.patch b/pkgs/desktops/mate/caja/caja-extension-dirs.patch deleted file mode 100644 index 0b1453bd4689..000000000000 --- a/pkgs/desktops/mate/caja/caja-extension-dirs.patch +++ /dev/null @@ -1,46 +0,0 @@ -From 35e9e6a6f3ba6cbe62a3957044eb67864f5d8e66 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Jos=C3=A9=20Romildo=20Malaquias?= -Date: Tue, 11 Feb 2020 17:49:13 -0300 -Subject: [PATCH] Look for caja extentions at $CAJA_EXTENTSION_DIRS - -CAJA_EXTENSION_DIRS is a list of paths where caja extensions are -looked for. It is needed for distributions like NixOS that do not -install all extensions in the same directory. In NixOS each package is -installed in a self contained directory. ---- - libcaja-private/caja-module.c | 14 ++++++++++++++ - 1 file changed, 14 insertions(+) - -diff --git a/libcaja-private/caja-module.c b/libcaja-private/caja-module.c -index d54d7cf..9794e56 100644 ---- a/libcaja-private/caja-module.c -+++ b/libcaja-private/caja-module.c -@@ -258,11 +258,25 @@ void - caja_module_setup (void) - { - static gboolean initialized = FALSE; -+ gchar *caja_extension_dirs; -+ gchar **dir_vector; - - if (!initialized) - { - initialized = TRUE; - -+ caja_extension_dirs = (gchar *) g_getenv ("CAJA_EXTENSION_DIRS"); -+ -+ if (caja_extension_dirs) -+ { -+ dir_vector = g_strsplit (caja_extension_dirs, G_SEARCHPATH_SEPARATOR_S, 0); -+ -+ for (gchar **dir = dir_vector; *dir != NULL; ++ dir) -+ load_module_dir (*dir); -+ -+ g_strfreev(dir_vector); -+ } -+ - load_module_dir (CAJA_EXTENSIONDIR); - - eel_debug_call_at_shutdown (free_module_objects); --- -2.25.0 - diff --git a/pkgs/desktops/mate/caja/default.nix b/pkgs/desktops/mate/caja/default.nix index c533f78849cc..65d6e1a21ebc 100644 --- a/pkgs/desktops/mate/caja/default.nix +++ b/pkgs/desktops/mate/caja/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "caja"; - version = "1.24.1"; + version = "1.26.0"; src = fetchurl { url = "https://pub.mate-desktop.org/releases/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "0ylgb4b31vwgqmmknrhm4m9gfa1rzb9azpdd9myi0hscrr3h22z5"; + sha256 = "1m0ai2r8b2mvlr8bqj9n6vg1pwzlwa46fqpq206wgyx5sgxac052"; }; nativeBuildInputs = [ @@ -25,10 +25,6 @@ stdenv.mkDerivation rec { hicolor-icon-theme ]; - patches = [ - ./caja-extension-dirs.patch - ]; - configureFlags = [ "--disable-update-mimedb" ]; enableParallelBuilding = true; diff --git a/pkgs/desktops/mate/default.nix b/pkgs/desktops/mate/default.nix index 291d26afcd5c..e9822f0242d6 100644 --- a/pkgs/desktops/mate/default.nix +++ b/pkgs/desktops/mate/default.nix @@ -52,7 +52,7 @@ let mate-user-share = callPackage ./mate-user-share { }; mate-utils = callPackage ./mate-utils { }; mozo = callPackage ./mozo { }; - pluma = callPackage ./pluma { }; + pluma = callPackage ./pluma { inherit (pkgs.gnome) adwaita-icon-theme; }; python-caja = callPackage ./python-caja { }; basePackages = [ diff --git a/pkgs/desktops/mate/engrampa/default.nix b/pkgs/desktops/mate/engrampa/default.nix index 81d34b8b1259..b9627dae02ca 100644 --- a/pkgs/desktops/mate/engrampa/default.nix +++ b/pkgs/desktops/mate/engrampa/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "engrampa"; - version = "1.24.2"; + version = "1.26.0"; src = fetchurl { url = "https://pub.mate-desktop.org/releases/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "0x26djz73g3fjwzcpr7k60xb6qx5izhw7lf2ggn34iwpihl0sa7f"; + sha256 = "1qsy0ynhj1v0kyn3g3yf62g31rwxmpglfh9xh0w5lc9j5k1b5kcp"; }; nativeBuildInputs = [ diff --git a/pkgs/desktops/mate/eom/default.nix b/pkgs/desktops/mate/eom/default.nix index 27c120796541..7947247bf1c6 100644 --- a/pkgs/desktops/mate/eom/default.nix +++ b/pkgs/desktops/mate/eom/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "eom"; - version = "1.24.2"; + version = "1.26.0"; src = fetchurl { url = "https://pub.mate-desktop.org/releases/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "08rjckr1hdw7c31f2hzz3vq0rn0c5z3hmvl409y6k6ns583k1bgf"; + sha256 = "1nv7q0yw11grgxr5lyvll0f7fl823kpjp05z81bwgnvd76m6kw97"; }; nativeBuildInputs = [ diff --git a/pkgs/desktops/mate/libmatekbd/default.nix b/pkgs/desktops/mate/libmatekbd/default.nix index 8d0b567f1615..967e223f2b0e 100644 --- a/pkgs/desktops/mate/libmatekbd/default.nix +++ b/pkgs/desktops/mate/libmatekbd/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "libmatekbd"; - version = "1.24.1"; + version = "1.26.0"; src = fetchurl { url = "https://pub.mate-desktop.org/releases/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "17mcxfkvl14p04id3n5kbhpjwjq00c8wmbyciyy2hm7kwdln6zx8"; + sha256 = "1b8iv2hmy8z2zzdsx8j5g583ddxh178bq8dnlqng9ifbn35fh3i2"; }; nativeBuildInputs = [ pkg-config gettext ]; diff --git a/pkgs/desktops/mate/libmatemixer/default.nix b/pkgs/desktops/mate/libmatemixer/default.nix index 4fe73fadbc4a..2824c958de2f 100644 --- a/pkgs/desktops/mate/libmatemixer/default.nix +++ b/pkgs/desktops/mate/libmatemixer/default.nix @@ -7,11 +7,11 @@ stdenv.mkDerivation rec { pname = "libmatemixer"; - version = "1.24.1"; + version = "1.26.0"; src = fetchurl { url = "https://pub.mate-desktop.org/releases/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "1n6rq7k66zvfd6sb7h92xihh021w9hysfa4yd1mzjcbb7c62ybqx"; + sha256 = "1wcz4ppg696m31f5x7rkyvxxdriik2vprsr83b4wbs97bdhcr6ws"; }; nativeBuildInputs = [ pkg-config gettext ]; diff --git a/pkgs/desktops/mate/libmateweather/default.nix b/pkgs/desktops/mate/libmateweather/default.nix index b042df0fe1ae..b325de3b3c02 100644 --- a/pkgs/desktops/mate/libmateweather/default.nix +++ b/pkgs/desktops/mate/libmateweather/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "libmateweather"; - version = "1.24.1"; + version = "1.26.0"; src = fetchurl { url = "https://pub.mate-desktop.org/releases/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "02d7c59pami1fzxg73mp6risa9hvsdpgs68f62wkg09nrppzsk4v"; + sha256 = "05bvc220p135l6qnhh3qskljxffds0f7fjbjnrpq524w149rgzd7"; }; nativeBuildInputs = [ pkg-config gettext ]; diff --git a/pkgs/desktops/mate/marco/default.nix b/pkgs/desktops/mate/marco/default.nix index 8c6df49fd127..e7e6547284db 100644 --- a/pkgs/desktops/mate/marco/default.nix +++ b/pkgs/desktops/mate/marco/default.nix @@ -1,13 +1,13 @@ { lib, stdenv, fetchurl, pkg-config, gettext, itstool, libxml2, libcanberra-gtk3, libgtop -, libXdamage, libXpresent, libstartup_notification, gnome, gtk3, mate-settings-daemon, wrapGAppsHook, mateUpdateScript }: +, libXdamage, libXpresent, libstartup_notification, gnome, glib, gtk3, mate-settings-daemon, wrapGAppsHook, mateUpdateScript }: stdenv.mkDerivation rec { pname = "marco"; - version = "1.24.2"; + version = "1.26.0"; src = fetchurl { url = "https://pub.mate-desktop.org/releases/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "19s2y2s9immp86ni3395mgxl605m2wn10m8399y9qkgw2b5m10s9"; + sha256 = "01avxrg2fc6grfrp6hl8b0im4scy9xf6011swfrhli87ig6hhg7n"; }; nativeBuildInputs = [ @@ -29,6 +29,8 @@ stdenv.mkDerivation rec { mate-settings-daemon ]; + NIX_CFLAGS_COMPILE = "-I${glib.dev}/include/gio-unix-2.0"; + enableParallelBuilding = true; passthru.updateScript = mateUpdateScript { inherit pname version; }; diff --git a/pkgs/desktops/mate/mate-applets/default.nix b/pkgs/desktops/mate/mate-applets/default.nix index 3a34d7af7157..f06db0adc1be 100644 --- a/pkgs/desktops/mate/mate-applets/default.nix +++ b/pkgs/desktops/mate/mate-applets/default.nix @@ -1,37 +1,39 @@ -{ lib, stdenv, fetchurl, pkg-config, gettext, itstool, gnome, glib, gtk3, gtksourceview3, libwnck -, libgtop, libxml2, libnotify, polkit, upower, wirelesstools, mate, hicolor-icon-theme, wrapGAppsHook -, mateUpdateScript }: +{ lib, stdenv, fetchurl, pkg-config, gettext, itstool, dbus-glib, glib, gtk3, gtksourceview3 +, gucharmap, libmateweather, libnl, libwnck, libgtop, libxml2, libnotify, mate-panel, polkit +, upower, wirelesstools, mate, hicolor-icon-theme, wrapGAppsHook, mateUpdateScript }: stdenv.mkDerivation rec { pname = "mate-applets"; - version = "1.24.1"; + version = "1.26.0"; src = fetchurl { url = "https://pub.mate-desktop.org/releases/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "0h70i4x3bk017pgv4zn280682wm58vwdjm7kni91ni8rmblnnvyp"; + sha256 = "0xy9dwiqvmimqshbfq80jxq65aznlgx491lqq8rl4x8c9sdl7q5p"; }; nativeBuildInputs = [ - pkg-config gettext itstool + pkg-config wrapGAppsHook ]; buildInputs = [ + dbus-glib gtk3 gtksourceview3 - gnome.gucharmap - libwnck + gucharmap + hicolor-icon-theme libgtop - libxml2 + libmateweather + libnl libnotify + libwnck + libxml2 + mate-panel polkit upower wirelesstools - mate.libmateweather - mate.mate-panel - hicolor-icon-theme ]; configureFlags = [ "--enable-suid=no" ]; diff --git a/pkgs/desktops/mate/mate-backgrounds/default.nix b/pkgs/desktops/mate/mate-backgrounds/default.nix index cfe1325b839f..3fa6f37b2a1f 100644 --- a/pkgs/desktops/mate/mate-backgrounds/default.nix +++ b/pkgs/desktops/mate/mate-backgrounds/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "mate-backgrounds"; - version = "1.24.2"; + version = "1.26.0"; src = fetchurl { url = "https://pub.mate-desktop.org/releases/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "1ixb2vlm3dr52ibp4ggrbkf38m3q6i5lxjg4ix82gxbb6h6a3gp5"; + sha256 = "0379hngy3ap1r5kmqvmzs9r710k2c9nal2ps3hq765df4ir15j8d"; }; nativeBuildInputs = [ diff --git a/pkgs/desktops/mate/mate-calc/default.nix b/pkgs/desktops/mate/mate-calc/default.nix index a3e8d3b5951d..4344e970758c 100644 --- a/pkgs/desktops/mate/mate-calc/default.nix +++ b/pkgs/desktops/mate/mate-calc/default.nix @@ -1,24 +1,26 @@ -{ lib, stdenv, fetchurl, pkg-config, gettext, itstool, gtk3, libxml2, wrapGAppsHook, mateUpdateScript }: +{ lib, stdenv, fetchurl, pkg-config, gettext, itstool, gtk3, libmpc, libxml2, mpfr, wrapGAppsHook, mateUpdateScript }: stdenv.mkDerivation rec { pname = "mate-calc"; - version = "1.24.2"; + version = "1.26.0"; src = fetchurl { url = "https://pub.mate-desktop.org/releases/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "1yg8j0dqy37fljd20pwxdgna3f1v7k9wmdr9l4r1nqf4a7zwi96l"; + sha256 = "0mddfh9ixhh60nfgx5kcprcl9liavwqyina11q3pnpfs3n02df3y"; }; nativeBuildInputs = [ - pkg-config gettext itstool + pkg-config wrapGAppsHook ]; buildInputs = [ gtk3 + libmpc libxml2 + mpfr ]; enableParallelBuilding = true; diff --git a/pkgs/desktops/mate/mate-common/default.nix b/pkgs/desktops/mate/mate-common/default.nix index 58314df673ab..159fb75426ab 100644 --- a/pkgs/desktops/mate/mate-common/default.nix +++ b/pkgs/desktops/mate/mate-common/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "mate-common"; - version = "1.24.2"; + version = "1.26.0"; src = fetchurl { url = "https://pub.mate-desktop.org/releases/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "0srb2ly5pjq1g0cs8m39nbfv33dvsc2j4g2gw081xis3awzh3lki"; + sha256 = "014wpfqpqmfkzv81paap4fz15mj1gsyvaxlrfqsp9a3yxw4f7jaf"; }; enableParallelBuilding = true; diff --git a/pkgs/desktops/mate/mate-control-center/default.nix b/pkgs/desktops/mate/mate-control-center/default.nix index b94e7ecfd06d..9c1186a692ea 100644 --- a/pkgs/desktops/mate/mate-control-center/default.nix +++ b/pkgs/desktops/mate/mate-control-center/default.nix @@ -6,11 +6,11 @@ stdenv.mkDerivation rec { pname = "mate-control-center"; - version = "1.24.2"; + version = "1.26.0"; src = fetchurl { url = "https://pub.mate-desktop.org/releases/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "18vsqkcl4n3k5aa05fqha61jc3133zw07gd604sm0krslwrwdn39"; + sha256 = "0jhkn0vaz8glji4j5ar6im8l2wf40kssl07gfkz40rcgfzm18rr8"; }; nativeBuildInputs = [ diff --git a/pkgs/desktops/mate/mate-desktop/default.nix b/pkgs/desktops/mate/mate-desktop/default.nix index 62e0b5b3195b..19ad26656f21 100644 --- a/pkgs/desktops/mate/mate-desktop/default.nix +++ b/pkgs/desktops/mate/mate-desktop/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "mate-desktop"; - version = "1.24.1"; + version = "1.26.0"; src = fetchurl { url = "https://pub.mate-desktop.org/releases/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "1nd1dn8mm1z6x4r68a25q4vzys1a6fmbzc94ss1z1n1872pczs6i"; + sha256 = "18sj8smf0b998m5qvki37hxg0agcx7wmgz9z7cwv6v48i2dnnz2z"; }; nativeBuildInputs = [ diff --git a/pkgs/desktops/mate/mate-icon-theme/default.nix b/pkgs/desktops/mate/mate-icon-theme/default.nix index cf18cf528f28..0e4fc7f0c30d 100644 --- a/pkgs/desktops/mate/mate-icon-theme/default.nix +++ b/pkgs/desktops/mate/mate-icon-theme/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "mate-icon-theme"; - version = "1.24.0"; + version = "1.26.0"; src = fetchurl { url = "https://pub.mate-desktop.org/releases/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "0a2lz61ivwwcdznmwlmgjr6ipr9sdl5g2czbagnpxkwz8f3m77na"; + sha256 = "0nha555fhhn0j5wmzmdc7bh93ckzwwdm8mwmzma5whkzslv09xa1"; }; nativeBuildInputs = [ pkg-config gettext iconnamingutils ]; diff --git a/pkgs/desktops/mate/mate-indicator-applet/default.nix b/pkgs/desktops/mate/mate-indicator-applet/default.nix index 804bf2352d08..3cf2ac9b4c34 100644 --- a/pkgs/desktops/mate/mate-indicator-applet/default.nix +++ b/pkgs/desktops/mate/mate-indicator-applet/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "mate-indicator-applet"; - version = "1.24.0"; + version = "1.26.0"; src = fetchurl { url = "https://pub.mate-desktop.org/releases/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "0m7pvbs5hhy5f400wqb8wp0dw3pyjpjnjax9qzc73j97l1k3zawf"; + sha256 = "144fh9f3lag2cqnmb6zxlh8k83ya8kha6rmd7r8gg3z5w3nzpyz4"; }; nativeBuildInputs = [ diff --git a/pkgs/desktops/mate/mate-media/default.nix b/pkgs/desktops/mate/mate-media/default.nix index 6072e81fb3cc..c4e9a9d5b0c2 100644 --- a/pkgs/desktops/mate/mate-media/default.nix +++ b/pkgs/desktops/mate/mate-media/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "mate-media"; - version = "1.24.1"; + version = "1.26.0"; src = fetchurl { url = "https://pub.mate-desktop.org/releases/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "118i4w2i2g3hfgbfn3hjzjkfq8vjj6049r7my3vna9js23b7ab92"; + sha256 = "0fiwzsir8i1bqz7g7b20g5zs28qq63j41v9c5z69q8fq7wh1nwwb"; }; buildInputs = [ diff --git a/pkgs/desktops/mate/mate-menus/default.nix b/pkgs/desktops/mate/mate-menus/default.nix index 5b11c20380a8..33f437446532 100644 --- a/pkgs/desktops/mate/mate-menus/default.nix +++ b/pkgs/desktops/mate/mate-menus/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "mate-menus"; - version = "1.24.1"; + version = "1.26.0"; src = fetchurl { url = "https://pub.mate-desktop.org/releases/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "17zc9fn14jykhn30z8iwlw0qwk32ivj6gxgww3xrqvqk0da5yaas"; + sha256 = "1r7zf64aclaplz77hkl9kq0xnz6jk1l49z64i8v56c41pm59c283"; }; nativeBuildInputs = [ pkg-config gettext gobject-introspection ]; diff --git a/pkgs/desktops/mate/mate-netbook/default.nix b/pkgs/desktops/mate/mate-netbook/default.nix index de452f456a2c..f4908906ff95 100644 --- a/pkgs/desktops/mate/mate-netbook/default.nix +++ b/pkgs/desktops/mate/mate-netbook/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "mate-netbook"; - version = "1.24.0"; + version = "1.26.0"; src = fetchurl { url = "https://pub.mate-desktop.org/releases/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "1bmk9gq5gcqkvfppa7i1hqfph8sajc3xs189s4ha97g0ifwd98a8"; + sha256 = "12gdy69nfysl8vmd8lv8b0lknkaagplrrz88nh6n0rmjkxnipgz3"; }; nativeBuildInputs = [ diff --git a/pkgs/desktops/mate/mate-notification-daemon/default.nix b/pkgs/desktops/mate/mate-notification-daemon/default.nix index ac5e5376a8e7..8bc730032f6e 100644 --- a/pkgs/desktops/mate/mate-notification-daemon/default.nix +++ b/pkgs/desktops/mate/mate-notification-daemon/default.nix @@ -1,13 +1,13 @@ { lib, stdenv, fetchurl, pkg-config, gettext, glib, libcanberra-gtk3, - libnotify, libwnck, gtk3, libxml2, wrapGAppsHook, mateUpdateScript }: + libnotify, libwnck, gtk3, libxml2, mate-desktop, mate-panel, wrapGAppsHook, mateUpdateScript }: stdenv.mkDerivation rec { pname = "mate-notification-daemon"; - version = "1.24.2"; + version = "1.26.0"; src = fetchurl { url = "https://pub.mate-desktop.org/releases/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "02mf9186cbziyvz7ycb0j9b7rn085a7f9hrm03n28q5kz0z1k92q"; + sha256 = "1fmr6hlcy2invp2yxqfqgpdx1dp4qa8xskjq2rm6v4gmz20nag5j"; }; nativeBuildInputs = [ @@ -22,6 +22,8 @@ stdenv.mkDerivation rec { libnotify libwnck gtk3 + mate-desktop + mate-panel ]; NIX_CFLAGS_COMPILE = "-I${glib.dev}/include/gio-unix-2.0"; diff --git a/pkgs/desktops/mate/mate-panel/default.nix b/pkgs/desktops/mate/mate-panel/default.nix index cd73408d4c80..d0e54bab5850 100644 --- a/pkgs/desktops/mate/mate-panel/default.nix +++ b/pkgs/desktops/mate/mate-panel/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "mate-panel"; - version = "1.24.2"; + version = "1.26.0"; src = fetchurl { url = "https://pub.mate-desktop.org/releases/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "1sj851h71nq4ssrsd4k5b0vayxmspl5x3rhf488b2xpcj81vmi9h"; + sha256 = "0r7a8wy9p2x6r0c4qaa81qhhjc080rxnc6fznz7i6fkv2z91wbh9"; }; nativeBuildInputs = [ diff --git a/pkgs/desktops/mate/mate-polkit/default.nix b/pkgs/desktops/mate/mate-polkit/default.nix index 174e2e466248..8ec813ce833d 100644 --- a/pkgs/desktops/mate/mate-polkit/default.nix +++ b/pkgs/desktops/mate/mate-polkit/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "mate-polkit"; - version = "1.24.0"; + version = "1.26.0"; src = fetchurl { url = "https://pub.mate-desktop.org/releases/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "1450bqzlnvwy3xa98lj102j2cf7piqbxcd1cy2zp41rdl8ri3gvn"; + sha256 = "0kkjv025l1l8352m5ky1g7hmk7isgi3dnfnh7sqg9pyhml97i9dd"; }; nativeBuildInputs = [ diff --git a/pkgs/desktops/mate/mate-power-manager/default.nix b/pkgs/desktops/mate/mate-power-manager/default.nix index fd7b19e1de37..c7b6690d2e3c 100644 --- a/pkgs/desktops/mate/mate-power-manager/default.nix +++ b/pkgs/desktops/mate/mate-power-manager/default.nix @@ -1,12 +1,12 @@ -{ lib, stdenv, fetchurl, pkg-config, gettext, glib, itstool, libxml2, mate-panel, libnotify, libcanberra-gtk3, dbus-glib, upower, gnome, gtk3, libtool, polkit, wrapGAppsHook, mateUpdateScript }: +{ lib, stdenv, fetchurl, pkg-config, gettext, glib, itstool, libxml2, mate-panel, libnotify, libcanberra-gtk3, libsecret, dbus-glib, upower, gtk3, libtool, polkit, wrapGAppsHook, mateUpdateScript }: stdenv.mkDerivation rec { pname = "mate-power-manager"; - version = "1.24.3"; + version = "1.26.0"; src = fetchurl { url = "https://pub.mate-desktop.org/releases/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "1rmcrpii3hl35qjznk6h5cq72n60cs12n294hjyakxr9kvgns7l6"; + sha256 = "0ybvwv24g8awxjl2asgvx6l2ghn4limcm48ylha68dkpy3607di6"; }; nativeBuildInputs = [ @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { libxml2 libcanberra-gtk3 gtk3 - gnome.libgnome-keyring + libsecret libnotify dbus-glib upower diff --git a/pkgs/desktops/mate/mate-screensaver/default.nix b/pkgs/desktops/mate/mate-screensaver/default.nix index f132bbcd26df..b87ec4b68d08 100644 --- a/pkgs/desktops/mate/mate-screensaver/default.nix +++ b/pkgs/desktops/mate/mate-screensaver/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "mate-screensaver"; - version = "1.24.2"; + version = "1.26.0"; src = fetchurl { url = "https://pub.mate-desktop.org/releases/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "18hxhglryfcbpbns9izigiws7lvdv5dnsaaz226ih3aar5db1ysy"; + sha256 = "0xmgzrb5nk7x6ganf7jd4gmdafanx7f0znga0lhsd8kd40r40la1"; }; nativeBuildInputs = [ diff --git a/pkgs/desktops/mate/mate-sensors-applet/default.nix b/pkgs/desktops/mate/mate-sensors-applet/default.nix index 849f767c7c20..7e77f898051d 100644 --- a/pkgs/desktops/mate/mate-sensors-applet/default.nix +++ b/pkgs/desktops/mate/mate-sensors-applet/default.nix @@ -3,11 +3,11 @@ stdenv.mkDerivation rec { pname = "mate-sensors-applet"; - version = "1.24.1"; + version = "1.26.0"; src = fetchurl { url = "https://pub.mate-desktop.org/releases/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "1nb4fy3mcymv7pmnc0czpxgp1sqvs533jwnqv1b5cqby415ljb16"; + sha256 = "0s19r30fsicqvvcnz57lv158pi35w9zn5i7h5hz59224y0zpqhsc"; }; nativeBuildInputs = [ diff --git a/pkgs/desktops/mate/mate-session-manager/default.nix b/pkgs/desktops/mate/mate-session-manager/default.nix index f790b0f65dc3..152ecf572d78 100644 --- a/pkgs/desktops/mate/mate-session-manager/default.nix +++ b/pkgs/desktops/mate/mate-session-manager/default.nix @@ -5,11 +5,11 @@ stdenv.mkDerivation rec { pname = "mate-session-manager"; - version = "1.24.3"; + version = "1.26.0"; src = fetchurl { url = "https://pub.mate-desktop.org/releases/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "18mhv8dq18hvx28gi88c9499s3s1nsq55m64sas8fqlvnp2sx84h"; + sha256 = "05hqi8wlwjr07mp5njhp7h06mgnv98zsxaxkmxc5w3iwb3va45ar"; }; patches = [ diff --git a/pkgs/desktops/mate/mate-settings-daemon/default.nix b/pkgs/desktops/mate/mate-settings-daemon/default.nix index 6c35a1d63120..3ece77dc08c4 100644 --- a/pkgs/desktops/mate/mate-settings-daemon/default.nix +++ b/pkgs/desktops/mate/mate-settings-daemon/default.nix @@ -5,11 +5,11 @@ stdenv.mkDerivation rec { pname = "mate-settings-daemon"; - version = "1.24.2"; + version = "1.26.0"; src = fetchurl { url = "https://pub.mate-desktop.org/releases/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "051r7xrx1byllsszbwsk646sq4izyag9yxg8jw2rm6x6mgwb89cc"; + sha256 = "0hbdwqagxh1mdpxfdqr1ps3yqvk0v0c5zm0bwk56y6l1zwbs0ymp"; }; nativeBuildInputs = [ diff --git a/pkgs/desktops/mate/mate-system-monitor/default.nix b/pkgs/desktops/mate/mate-system-monitor/default.nix index fed7dc12629c..d94695ac80a4 100644 --- a/pkgs/desktops/mate/mate-system-monitor/default.nix +++ b/pkgs/desktops/mate/mate-system-monitor/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "mate-system-monitor"; - version = "1.24.2"; + version = "1.26.0"; src = fetchurl { url = "https://pub.mate-desktop.org/releases/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "1mbny5hs5805398krvcsvi1jfhyq9a9dfciyrnis67n2yisr1hzp"; + sha256 = "13rkrk7c326ng8164aqfp6i7334n7zrmbg61ncpjprbrvlx2qiw3"; }; nativeBuildInputs = [ diff --git a/pkgs/desktops/mate/mate-terminal/default.nix b/pkgs/desktops/mate/mate-terminal/default.nix index 2c4d4223eccc..ed7ba49c18fe 100644 --- a/pkgs/desktops/mate/mate-terminal/default.nix +++ b/pkgs/desktops/mate/mate-terminal/default.nix @@ -1,31 +1,27 @@ -{ lib, stdenv, fetchurl, pkg-config, gettext, glib, itstool, libxml2, mate, dconf, gtk3, vte, pcre2, wrapGAppsHook, mateUpdateScript }: +{ lib, stdenv, fetchurl, pkg-config, gettext, itstool, libxml2, mate-desktop, dconf, vte, pcre2, wrapGAppsHook, mateUpdateScript }: stdenv.mkDerivation rec { pname = "mate-terminal"; - version = "1.24.1"; + version = "1.26.0"; src = fetchurl { url = "https://pub.mate-desktop.org/releases/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "0qmyhxmarwkxad8k1m9q1iwx70zhfp6zc2mh74nv26nj4gr3h3am"; + sha256 = "08mgxbviik2dwwnbclp0518wlag2fhcr6c2yadgcbhwiq4aff9vp"; }; - buildInputs = [ - glib - itstool - libxml2 - - mate.mate-desktop - - vte - gtk3 - dconf - pcre2 + nativeBuildInputs = [ + gettext + itstool + pkg-config + wrapGAppsHook ]; - nativeBuildInputs = [ - pkg-config - gettext - wrapGAppsHook + buildInputs = [ + dconf + libxml2 + mate-desktop + pcre2 + vte ]; enableParallelBuilding = true; @@ -33,7 +29,7 @@ stdenv.mkDerivation rec { passthru.updateScript = mateUpdateScript { inherit pname version; }; meta = with lib; { - description = "The MATE Terminal Emulator"; + description = "MATE desktop terminal emulator"; homepage = "https://mate-desktop.org"; license = licenses.gpl3Plus; platforms = platforms.unix; diff --git a/pkgs/desktops/mate/mate-user-guide/default.nix b/pkgs/desktops/mate/mate-user-guide/default.nix index d7c83cc98209..8a5aadb936db 100644 --- a/pkgs/desktops/mate/mate-user-guide/default.nix +++ b/pkgs/desktops/mate/mate-user-guide/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "mate-user-guide"; - version = "1.24.0"; + version = "1.26.0"; src = fetchurl { url = "https://pub.mate-desktop.org/releases/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "0ddxya84iydvy85dbqls0wmz2rph87wri3rsdhv4rkbhh5g4sd7f"; + sha256 = "1h620ngryqc4m8ybvc92ba8404djnm0l65f34mlw38g9ad8d9085"; }; nativeBuildInputs = [ itstool gettext libxml2 ]; diff --git a/pkgs/desktops/mate/mate-user-share/default.nix b/pkgs/desktops/mate/mate-user-share/default.nix index 1126e5851352..9907552f3c07 100644 --- a/pkgs/desktops/mate/mate-user-share/default.nix +++ b/pkgs/desktops/mate/mate-user-share/default.nix @@ -3,11 +3,11 @@ stdenv.mkDerivation rec { pname = "mate-user-share"; - version = "1.24.0"; + version = "1.26.0"; src = fetchurl { url = "https://pub.mate-desktop.org/releases/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "1h4aabcby96nsg557brzzb0an1qvnawhim2rinzlzg4fhkvdfnr5"; + sha256 = "1wh0b4qw5wzpl7sg44lpwjb9r6xllch3xfz8c2cchl8rcgbh2kph"; }; nativeBuildInputs = [ diff --git a/pkgs/desktops/mate/mate-utils/default.nix b/pkgs/desktops/mate/mate-utils/default.nix index 0b7b181bd576..6801368dc43c 100644 --- a/pkgs/desktops/mate/mate-utils/default.nix +++ b/pkgs/desktops/mate/mate-utils/default.nix @@ -3,11 +3,11 @@ stdenv.mkDerivation rec { pname = "mate-utils"; - version = "1.24.0"; + version = "1.26.0"; src = fetchurl { url = "https://pub.mate-desktop.org/releases/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "1b16n1628gcsym5mph6lr9x5xm4rgkxsa8xwr2wlx8g2gw2775i1"; + sha256 = "0bkqj8qwwml9xyvb680yy06lv3dzwkv89yrzz5jamvz88ar6m9bw"; }; nativeBuildInputs = [ diff --git a/pkgs/desktops/mate/mozo/default.nix b/pkgs/desktops/mate/mozo/default.nix index 4122e8231654..037989083bc3 100644 --- a/pkgs/desktops/mate/mozo/default.nix +++ b/pkgs/desktops/mate/mozo/default.nix @@ -2,14 +2,14 @@ python3.pkgs.buildPythonApplication rec { pname = "mozo"; - version = "1.24.1"; + version = "1.26.0"; format = "other"; doCheck = false; src = fetchurl { url = "https://pub.mate-desktop.org/releases/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "14ps43gdh1sfvq49yhl58gxq3rc0d25i2d7r4ghlzf07ssxl53b0"; + sha256 = "1hnxqdk69g7j809k6picgq8y626hnyznlzxd0pi743gshpwwnhj6"; }; nativeBuildInputs = [ pkg-config gettext gobject-introspection wrapGAppsHook ]; diff --git a/pkgs/desktops/mate/pluma/default.nix b/pkgs/desktops/mate/pluma/default.nix index 5e226f4d8869..9eb0f9283be7 100644 --- a/pkgs/desktops/mate/pluma/default.nix +++ b/pkgs/desktops/mate/pluma/default.nix @@ -1,32 +1,32 @@ { lib, stdenv, fetchurl, pkg-config, gettext, perl, itstool, isocodes, enchant, libxml2, python3 -, gnome, gtksourceview3, libpeas, mate, wrapGAppsHook, mateUpdateScript }: +, adwaita-icon-theme, gtksourceview4, libpeas, mate-desktop, wrapGAppsHook, mateUpdateScript }: stdenv.mkDerivation rec { pname = "pluma"; - version = "1.24.2"; + version = "1.26.0"; src = fetchurl { url = "https://pub.mate-desktop.org/releases/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "183frfhll3sb4r12p24160j1c1cfd102nlp5rrwvyv5qqm7i2fg4"; + sha256 = "0lway12q2xygiwjgrx7chgka838jbnmlzz98g7agag1rwzd481ii"; }; nativeBuildInputs = [ - pkg-config gettext - perl - itstool isocodes + itstool + perl + pkg-config wrapGAppsHook ]; buildInputs = [ + adwaita-icon-theme enchant - libxml2 - python3 - gtksourceview3 + gtksourceview4 libpeas - gnome.adwaita-icon-theme - mate.mate-desktop + libxml2 + mate-desktop + python3 ]; enableParallelBuilding = true; diff --git a/pkgs/desktops/mate/python-caja/default.nix b/pkgs/desktops/mate/python-caja/default.nix index 8104da3420e1..ccee7b046887 100644 --- a/pkgs/desktops/mate/python-caja/default.nix +++ b/pkgs/desktops/mate/python-caja/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "python-caja"; - version = "1.24.0"; + version = "1.26.0"; src = fetchurl { url = "https://pub.mate-desktop.org/releases/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "1wp61q64cgzr3syd3niclj6rjk87wlib5m86i0myf5ph704r3qgg"; + sha256 = "181zcs1pi3762chm4xraqs8048jm7jzwnvgwla1v3z2nqzpp3xr1"; }; nativeBuildInputs = [ diff --git a/pkgs/development/compilers/mono/6.nix b/pkgs/development/compilers/mono/6.nix index 04028648a255..1a7297af918e 100644 --- a/pkgs/development/compilers/mono/6.nix +++ b/pkgs/development/compilers/mono/6.nix @@ -2,8 +2,8 @@ callPackage ./generic.nix ({ inherit Foundation libobjc; - version = "6.12.0.90"; + version = "6.12.0.122"; srcArchiveSuffix = "tar.xz"; - sha256 = "1b6d0926rd0nkmsppwjgmwsxx1479jjvr1gm7zwk64siml15rpji"; + sha256 = "sha256-KcJ3Zg/F51ExB67hy/jFBXyTcKTN/tovx4G+aYbYnSM="; enableParallelBuilding = true; }) diff --git a/pkgs/development/compilers/vala/default.nix b/pkgs/development/compilers/vala/default.nix index bd001d5a10e8..8f93a6746ea2 100644 --- a/pkgs/development/compilers/vala/default.nix +++ b/pkgs/development/compilers/vala/default.nix @@ -69,7 +69,7 @@ let # so that it can be used to regenerate documentation. patches = lib.optionals disableGraphviz [ graphvizPatch ./gvc-compat.patch ]; configureFlags = lib.optional disableGraphviz "--disable-graphviz"; - preBuild = lib.optional disableGraphviz "buildFlagsArray+=(\"VALAC=$(pwd)/compiler/valac\")"; + preBuild = lib.optionalString disableGraphviz "buildFlagsArray+=(\"VALAC=$(pwd)/compiler/valac\")"; outputs = [ "out" "devdoc" ]; diff --git a/pkgs/development/interpreters/lua-5/default.nix b/pkgs/development/interpreters/lua-5/default.nix index 3e36f77dab43..f2b2961c4c77 100644 --- a/pkgs/development/interpreters/lua-5/default.nix +++ b/pkgs/development/interpreters/lua-5/default.nix @@ -54,4 +54,9 @@ rec { inherit callPackage; }; + luajit_openresty = import ../luajit/openresty.nix { + self = luajit_openresty; + inherit callPackage; + }; + } diff --git a/pkgs/development/interpreters/luajit/2.0.nix b/pkgs/development/interpreters/luajit/2.0.nix index 153b11aaa5fc..ceb796f0433e 100644 --- a/pkgs/development/interpreters/luajit/2.0.nix +++ b/pkgs/development/interpreters/luajit/2.0.nix @@ -1,6 +1,8 @@ { self, callPackage, lib }: callPackage ./default.nix { inherit self; + owner = "LuaJIT"; + repo = "LuaJIT"; version = "2.0.5-2021-06-08"; rev = "98f95f69180d48ce49289d6428b46a9ccdd67a46"; isStable = true; diff --git a/pkgs/development/interpreters/luajit/2.1.nix b/pkgs/development/interpreters/luajit/2.1.nix index d11514c07c62..87976a45dfe1 100644 --- a/pkgs/development/interpreters/luajit/2.1.nix +++ b/pkgs/development/interpreters/luajit/2.1.nix @@ -1,6 +1,8 @@ { self, callPackage }: callPackage ./default.nix { inherit self; + owner = "LuaJIT"; + repo = "LuaJIT"; version = "2.1.0-2021-06-25"; rev = "e957737650e060d5bf1c2909b741cc3dffe073ac"; isStable = false; diff --git a/pkgs/development/interpreters/luajit/default.nix b/pkgs/development/interpreters/luajit/default.nix index 860642b0fd2f..728161598282 100644 --- a/pkgs/development/interpreters/luajit/default.nix +++ b/pkgs/development/interpreters/luajit/default.nix @@ -1,6 +1,8 @@ { lib, stdenv, fetchFromGitHub, buildPackages , name ? "luajit-${version}" , isStable +, owner +, repo , sha256 , rev , version @@ -41,9 +43,7 @@ in stdenv.mkDerivation rec { inherit name version; src = fetchFromGitHub { - owner = "LuaJIT"; - repo = "LuaJIT"; - inherit sha256 rev; + inherit owner repo sha256 rev; }; luaversion = "5.1"; diff --git a/pkgs/development/interpreters/luajit/openresty.nix b/pkgs/development/interpreters/luajit/openresty.nix new file mode 100644 index 000000000000..78e06f46f1d0 --- /dev/null +++ b/pkgs/development/interpreters/luajit/openresty.nix @@ -0,0 +1,10 @@ +{ self, callPackage }: +callPackage ./default.nix rec { + inherit self; + owner = "openresty"; + repo = "luajit2"; + version = "2.1-20210510"; + rev = "v${version}"; + isStable = true; + sha256 = "1h21w5axwka2j9jb86yc69qrprcavccyr2qihiw4b76r1zxzalvd"; +} diff --git a/pkgs/development/libraries/SDL2_image/default.nix b/pkgs/development/libraries/SDL2_image/default.nix index a0f770178cc9..3c7c13319991 100644 --- a/pkgs/development/libraries/SDL2_image/default.nix +++ b/pkgs/development/libraries/SDL2_image/default.nix @@ -12,8 +12,18 @@ stdenv.mkDerivation rec { buildInputs = [ SDL2 libpng libjpeg libtiff giflib libwebp libXpm zlib ] ++ lib.optional stdenv.isDarwin Foundation; - - configureFlags = lib.optional stdenv.isDarwin "--disable-sdltest"; + configureFlags = [ + # Disable dynamically loaded dependencies + "--disable-jpg-shared" + "--disable-png-shared" + "--disable-tif-shared" + "--disable-webp-shared" + ] ++ lib.optionals stdenv.isDarwin [ + # Darwin headless will hang when trying to run the SDL test program + "--disable-sdltest" + # Don't use native macOS frameworks + "--disable-imageio" + ]; enableParallelBuilding = true; diff --git a/pkgs/development/libraries/codec2/default.nix b/pkgs/development/libraries/codec2/default.nix index 88b35f16c308..a860470af317 100644 --- a/pkgs/development/libraries/codec2/default.nix +++ b/pkgs/development/libraries/codec2/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "codec2"; - version = "0.9.2"; + version = "1.0.0"; src = fetchFromGitHub { owner = "drowe67"; repo = "codec2"; rev = "v${version}"; - sha256 = "1jpvr7bra8srz8jvnlbmhf8andbaavq5v01qjnp2f61za93rzwba"; + sha256 = "sha256-R4H6gwmc8nPgRfhNms7n7jMCHhkzX7i/zfGT4CYSsY8="; }; nativeBuildInputs = [ cmake ]; diff --git a/pkgs/development/libraries/flatbuffers/1.12.nix b/pkgs/development/libraries/flatbuffers/1.12.nix index df2980ba204f..1ad490d3a01b 100644 --- a/pkgs/development/libraries/flatbuffers/1.12.nix +++ b/pkgs/development/libraries/flatbuffers/1.12.nix @@ -20,7 +20,7 @@ callPackage ./generic.nix { }) ]; - preConfigure = lib.optional stdenv.buildPlatform.isDarwin '' + preConfigure = lib.optionalString stdenv.buildPlatform.isDarwin '' rm BUILD ''; } diff --git a/pkgs/development/libraries/imath/default.nix b/pkgs/development/libraries/imath/default.nix new file mode 100644 index 000000000000..7950667c190c --- /dev/null +++ b/pkgs/development/libraries/imath/default.nix @@ -0,0 +1,27 @@ +{ lib +, stdenv +, fetchFromGitHub +, cmake +}: + +stdenv.mkDerivation rec { + pname = "imath"; + version = "3.0.5"; + + src = fetchFromGitHub { + owner = "AcademySoftwareFoundation"; + repo = "imath"; + rev = "v${version}"; + sha256 = "0nwf8622j01p699nkkbal6xxs1snzzhz4cn6d76yppgvdhgyahsc"; + }; + + nativeBuildInputs = [ cmake ]; + + meta = with lib; { + description = "Imath is a C++ and python library of 2D and 3D vector, matrix, and math operations for computer graphics"; + homepage = "https://github.com/AcademySoftwareFoundation/Imath"; + license = licenses.bsd3; + maintainers = with maintainers; [ paperdigits ]; + platforms = platforms.all; + }; +} diff --git a/pkgs/development/libraries/libantlr3c/default.nix b/pkgs/development/libraries/libantlr3c/default.nix index aac75fcc2257..f61c0bfafc7b 100644 --- a/pkgs/development/libraries/libantlr3c/default.nix +++ b/pkgs/development/libraries/libantlr3c/default.nix @@ -8,7 +8,10 @@ stdenv.mkDerivation rec { sha256 ="0lpbnb4dq4azmsvlhp6khq1gy42kyqyjv8gww74g5lm2y6blm4fa"; }; - configureFlags = lib.optional stdenv.is64bit "--enable-64bit"; + configureFlags = lib.optional stdenv.is64bit "--enable-64bit" + # libantlr3c wrongly emits the abi flags -m64 and -m32 which imply x86 archs + # https://github.com/antlr/antlr3/issues/205 + ++ lib.optional (!stdenv.hostPlatform.isx86) "--disable-abiflags"; meta = with lib; { description = "C runtime libraries of ANTLR v3"; @@ -16,12 +19,5 @@ stdenv.mkDerivation rec { license = licenses.bsd3; platforms = platforms.unix; maintainers = with maintainers; [ vbgl ]; - # The package failed to build with error: - # gcc: error: unrecognized command line option '-m64' - # - # See: - # https://gist.github.com/r-rmcgibbo/15bf2ca9b297e8357887e146076fff7d - # https://gist.github.com/r-rmcgibbo/a362535e4b174d4bfb68112503a49fcd - broken = stdenv.hostPlatform.isAarch64; }; } diff --git a/pkgs/development/libraries/libfm/default.nix b/pkgs/development/libraries/libfm/default.nix index 255ddfa22ad7..5d7389b6d188 100644 --- a/pkgs/development/libraries/libfm/default.nix +++ b/pkgs/development/libraries/libfm/default.nix @@ -13,7 +13,7 @@ let gtk = if withGtk3 then gtk3 else gtk2; - inherit (lib) optional; + inherit (lib) optional optionalString; in stdenv.mkDerivation rec { pname = if extraOnly @@ -37,7 +37,7 @@ stdenv.mkDerivation rec { installFlags = [ "sysconfdir=${placeholder "out"}/etc" ]; # libfm-extra is pulled in by menu-cache and thus leads to a collision for libfm - postInstall = optional (!extraOnly) '' + postInstall = optionalString (!extraOnly) '' rm $out/lib/libfm-extra.so $out/lib/libfm-extra.so.* $out/lib/libfm-extra.la $out/lib/pkgconfig/libfm-extra.pc ''; diff --git a/pkgs/development/libraries/mbedtls/default.nix b/pkgs/development/libraries/mbedtls/default.nix index 90e2c9bd9a73..9210f18ed962 100644 --- a/pkgs/development/libraries/mbedtls/default.nix +++ b/pkgs/development/libraries/mbedtls/default.nix @@ -28,7 +28,7 @@ stdenv.mkDerivation rec { strictDeps = true; - postConfigure = lib.optionals enableThreading '' + postConfigure = lib.optionalString enableThreading '' perl scripts/config.pl set MBEDTLS_THREADING_C # Threading abstraction layer perl scripts/config.pl set MBEDTLS_THREADING_PTHREAD # POSIX thread wrapper layer for the threading layer. ''; diff --git a/pkgs/development/libraries/ndpi/default.nix b/pkgs/development/libraries/ndpi/default.nix index 4048f28e5d77..a45884f72dc6 100644 --- a/pkgs/development/libraries/ndpi/default.nix +++ b/pkgs/development/libraries/ndpi/default.nix @@ -1,23 +1,31 @@ -{ lib, stdenv, fetchFromGitHub, which, autoconf, automake, libtool, libpcap +{ lib +, stdenv +, fetchFromGitHub +, which +, autoconf +, automake +, libtool +, libpcap +, json_c , pkg-config }: stdenv.mkDerivation rec { pname = "ndpi"; - version = "3.4"; + version = "4.0"; src = fetchFromGitHub { owner = "ntop"; repo = "nDPI"; rev = version; - sha256 = "0xjh9gv0mq0213bjfs5ahrh6m7l7g99jjg8104c0pw54hz0p5pq1"; + sha256 = "0snzvlracc6s7r2pgdn0jqcc7nxjxzcivsa579h90g5ibhhplv5x"; }; configureScript = "./autogen.sh"; - nativeBuildInputs = [which autoconf automake libtool]; + nativeBuildInputs = [ which autoconf automake libtool pkg-config ]; buildInputs = [ libpcap - pkg-config + json_c ]; meta = with lib; { diff --git a/pkgs/development/libraries/openexr/3.nix b/pkgs/development/libraries/openexr/3.nix new file mode 100644 index 000000000000..03539076e6f2 --- /dev/null +++ b/pkgs/development/libraries/openexr/3.nix @@ -0,0 +1,32 @@ +{ lib +, stdenv +, fetchFromGitHub +, zlib +, cmake +, imath +}: + +stdenv.mkDerivation rec { + pname = "openexr"; + version = "3.0.5"; + + outputs = [ "bin" "dev" "out" "doc" ]; + + src = fetchFromGitHub { + owner = "AcademySoftwareFoundation"; + repo = "openexr"; + rev = "v${version}"; + sha256 = "0inmpby1syyxxzr0sazqvpb8j63vpj09vpkp4xi7m2qd4rxynkph"; + }; + + nativeBuildInputs = [ cmake ]; + propagatedBuildInputs = [ imath zlib ]; + + meta = with lib; { + description = "A high dynamic-range (HDR) image file format"; + homepage = "https://www.openexr.com/"; + license = licenses.bsd3; + maintainers = with maintainers; [ paperdigits ]; + platforms = platforms.all; + }; +} diff --git a/pkgs/development/libraries/s2n-tls/default.nix b/pkgs/development/libraries/s2n-tls/default.nix index 944c3477fbf1..be4b9710533b 100644 --- a/pkgs/development/libraries/s2n-tls/default.nix +++ b/pkgs/development/libraries/s2n-tls/default.nix @@ -20,6 +20,7 @@ stdenv.mkDerivation rec { cmakeFlags = [ "-DBUILD_SHARED_LIBS=ON" "-DCMAKE_SKIP_BUILD_RPATH=OFF" + "-DUNSAFE_TREAT_WARNINGS_AS_ERRORS=OFF" # disable -Werror ]; propagatedBuildInputs = [ openssl ]; # s2n-config has find_dependency(LibCrypto). diff --git a/pkgs/development/libraries/silgraphite/graphite2.nix b/pkgs/development/libraries/silgraphite/graphite2.nix index 25f4b5e13177..b047d6870746 100644 --- a/pkgs/development/libraries/silgraphite/graphite2.nix +++ b/pkgs/development/libraries/silgraphite/graphite2.nix @@ -28,7 +28,7 @@ stdenv.mkDerivation rec { # Remove a test that fails to statically link (undefined reference to png and # freetype symbols) - postConfigure = lib.optionals static '' + postConfigure = lib.optionalString static '' sed -e '/freetype freetype.c/d' -i ../tests/examples/CMakeLists.txt ''; diff --git a/pkgs/development/libraries/t1lib/default.nix b/pkgs/development/libraries/t1lib/default.nix index 495993a64ab6..5bd4b02b61d9 100644 --- a/pkgs/development/libraries/t1lib/default.nix +++ b/pkgs/development/libraries/t1lib/default.nix @@ -28,7 +28,7 @@ stdenv.mkDerivation { buildInputs = [ libX11 libXaw ]; buildFlags = [ "without_doc" ]; - postInstall = lib.optional (!stdenv.isDarwin) "chmod +x $out/lib/*.so.*"; # ?? + postInstall = lib.optionalString (!stdenv.isDarwin) "chmod +x $out/lib/*.so.*"; # ?? meta = with lib; { description = "A type 1 font rasterizer library for UNIX/X11"; diff --git a/pkgs/development/libraries/zeroc-ice/3.6.nix b/pkgs/development/libraries/zeroc-ice/3.6.nix index 896973e32eb8..725af51487c8 100644 --- a/pkgs/development/libraries/zeroc-ice/3.6.nix +++ b/pkgs/development/libraries/zeroc-ice/3.6.nix @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { sourceRoot=$sourceRoot/cpp ''; - prePatch = lib.optional stdenv.isDarwin '' + prePatch = lib.optionalString stdenv.isDarwin '' substituteInPlace config/Make.rules.Darwin \ --replace xcrun "" ''; diff --git a/pkgs/development/libraries/zeroc-ice/default.nix b/pkgs/development/libraries/zeroc-ice/default.nix index ef16e381bcfd..f522c1810397 100644 --- a/pkgs/development/libraries/zeroc-ice/default.nix +++ b/pkgs/development/libraries/zeroc-ice/default.nix @@ -35,7 +35,7 @@ in stdenv.mkDerivation rec { NIX_CFLAGS_COMPILE = "-Wno-error=class-memaccess -Wno-error=deprecated-copy"; - prePatch = lib.optional stdenv.isDarwin '' + prePatch = lib.optionalString stdenv.isDarwin '' substituteInPlace Make.rules.Darwin \ --replace xcrun "" ''; diff --git a/pkgs/development/mobile/androidenv/compose-android-packages.nix b/pkgs/development/mobile/androidenv/compose-android-packages.nix index f528fcd8558f..316c1ba8313e 100644 --- a/pkgs/development/mobile/androidenv/compose-android-packages.nix +++ b/pkgs/development/mobile/androidenv/compose-android-packages.nix @@ -3,8 +3,8 @@ }: { toolsVersion ? "26.1.1" -, platformToolsVersion ? "31.0.2" -, buildToolsVersions ? [ "30.0.3" ] +, platformToolsVersion ? "31.0.3" +, buildToolsVersions ? [ "31.0.0" ] , includeEmulator ? false , emulatorVersion ? "30.6.3" , platformVersions ? [] diff --git a/pkgs/development/mobile/androidenv/repo.json b/pkgs/development/mobile/androidenv/repo.json index e8e0bf080fef..d8d55e641bbf 100644 --- a/pkgs/development/mobile/androidenv/repo.json +++ b/pkgs/development/mobile/androidenv/repo.json @@ -1400,6 +1400,27 @@ }, "29": { "google_apis_playstore": { + "arm64-v8a": { + "archives": [ + { + "os": "macosx", + "sha1": "47705387b8fbbfe87e3679d272c29f7064defba8", + "size": 1242979582, + "url": "https://dl.google.com/android/repository/sys-img/google_apis_playstore/arm64-v8a-29_r09-darwin.zip" + }, + { + "os": "linux", + "sha1": "47705387b8fbbfe87e3679d272c29f7064defba8", + "size": 1242979582, + "url": "https://dl.google.com/android/repository/sys-img/google_apis_playstore/arm64-v8a-29_r09-linux.zip" + } + ], + "displayName": "Google Play ARM 64 v8a System Image", + "license": "android-sdk-arm-dbt-license", + "name": "system-image-29-google_apis_playstore-arm64-v8a", + "path": "system-images/android-29/google_apis_playstore/arm64-v8a", + "revision": "29-google_apis_playstore-arm64-v8a" + }, "x86": { "archives": [ { @@ -1462,15 +1483,15 @@ "archives": [ { "os": "macosx", - "sha1": "38dc28908c1784a15fbaf64dd8f8d58279d9ce75", - "size": 1207055010, - "url": "https://dl.google.com/android/repository/sys-img/google_apis_playstore/arm64-v8a-30_r09-darwin.zip" + "sha1": "7208c0b72b51adb561595e62891763d7322964a0", + "size": 1308440072, + "url": "https://dl.google.com/android/repository/sys-img/google_apis_playstore/arm64-v8a-30_r10-darwin.zip" }, { "os": "linux", - "sha1": "38dc28908c1784a15fbaf64dd8f8d58279d9ce75", - "size": 1207055010, - "url": "https://dl.google.com/android/repository/sys-img/google_apis_playstore/arm64-v8a-30_r09-linux.zip" + "sha1": "7208c0b72b51adb561595e62891763d7322964a0", + "size": 1308440072, + "url": "https://dl.google.com/android/repository/sys-img/google_apis_playstore/arm64-v8a-30_r10-linux.zip" } ], "displayName": "Google Play ARM 64 v8a System Image", @@ -1535,55 +1556,55 @@ } } }, - "S": { + "31": { "google_apis_playstore": { "arm64-v8a": { "archives": [ { "os": "macosx", - "sha1": "528e302e9966e8320d1c2bdc8235762fe4a9e733", - "size": 1333046412, - "url": "https://dl.google.com/android/repository/sys-img/google_apis_playstore/arm64-v8a-S_r03-darwin.zip" + "sha1": "bef2699f7fd74fe0c4106a8898833074de72984d", + "size": 1394878415, + "url": "https://dl.google.com/android/repository/sys-img/google_apis_playstore/arm64-v8a-31_r06-darwin.zip" }, { "os": "linux", - "sha1": "528e302e9966e8320d1c2bdc8235762fe4a9e733", - "size": 1333046412, - "url": "https://dl.google.com/android/repository/sys-img/google_apis_playstore/arm64-v8a-S_r03-linux.zip" + "sha1": "bef2699f7fd74fe0c4106a8898833074de72984d", + "size": 1394878415, + "url": "https://dl.google.com/android/repository/sys-img/google_apis_playstore/arm64-v8a-31_r06-linux.zip" } ], "displayName": "Google Play ARM 64 v8a System Image", "license": "android-sdk-arm-dbt-license", - "name": "system-image-S-google_apis_playstore-arm64-v8a", - "path": "system-images/android-S/google_apis_playstore/arm64-v8a", - "revision": "S-google_apis_playstore-arm64-v8a" + "name": "system-image-31-google_apis_playstore-arm64-v8a", + "path": "system-images/android-31/google_apis_playstore/arm64-v8a", + "revision": "31-google_apis_playstore-arm64-v8a" }, "x86_64": { "archives": [ { "os": "windows", - "sha1": "093e0537cb18b25d8399a1af3ec955d2085f15ff", - "size": 1384401947, - "url": "https://dl.google.com/android/repository/sys-img/google_apis_playstore/x86_64-S_r03-windows.zip" + "sha1": "6450e33574aba4746682cfa72edd4e89947fed38", + "size": 1433583169, + "url": "https://dl.google.com/android/repository/sys-img/google_apis_playstore/x86_64-31_r06-windows.zip" }, { "os": "macosx", - "sha1": "093e0537cb18b25d8399a1af3ec955d2085f15ff", - "size": 1384401947, - "url": "https://dl.google.com/android/repository/sys-img/google_apis_playstore/x86_64-S_r03-darwin.zip" + "sha1": "6450e33574aba4746682cfa72edd4e89947fed38", + "size": 1433583169, + "url": "https://dl.google.com/android/repository/sys-img/google_apis_playstore/x86_64-31_r06-darwin.zip" }, { "os": "linux", - "sha1": "093e0537cb18b25d8399a1af3ec955d2085f15ff", - "size": 1384401947, - "url": "https://dl.google.com/android/repository/sys-img/google_apis_playstore/x86_64-S_r03-linux.zip" + "sha1": "6450e33574aba4746682cfa72edd4e89947fed38", + "size": 1433583169, + "url": "https://dl.google.com/android/repository/sys-img/google_apis_playstore/x86_64-31_r06-linux.zip" } ], "displayName": "Google Play Intel x86 Atom_64 System Image", "license": "android-sdk-preview-license", - "name": "system-image-S-google_apis_playstore-x86_64", - "path": "system-images/android-S/google_apis_playstore/x86_64", - "revision": "S-google_apis_playstore-x86_64" + "name": "system-image-31-google_apis_playstore-x86_64", + "path": "system-images/android-31/google_apis_playstore/x86_64", + "revision": "31-google_apis_playstore-x86_64" } } } @@ -3101,32 +3122,32 @@ "path": "build-tools/30.0.3", "revision": "30.0.3" }, - "31.0.0-rc3": { + "31.0.0": { "archives": [ - { - "os": "macosx", - "sha1": "e75dfb7a975809ba0ca0d25c2b82f7fd56444a4b", - "size": 53224980, - "url": "https://dl.google.com/android/repository/012061446cfd98341585d0d07401d0bd1a4c30f6.build-tools_r31-rc3-macosx.zip" - }, { "os": "windows", - "sha1": "9d9ce209353c9046abe16285d58ef893c4b42221", - "size": 57592553, - "url": "https://dl.google.com/android/repository/41966dc138d44a3e3797b92fb68bf70552011d5d.build-tools_r31-rc3-windows.zip" + "sha1": "032da328482814e6ef7fe918665c07e8f8f806ca", + "size": 56688233, + "url": "https://dl.google.com/android/repository/09489e417c0a266f2862ddd82b4ac29a1b7af55e.build-tools_r31-windows.zip" }, { "os": "linux", - "sha1": "6859f11348d3984afbfcc74984802bd2e31cc0e2", - "size": 54724181, - "url": "https://dl.google.com/android/repository/build-tools_r31-rc3-linux.zip" + "sha1": "9dbebfdb9ff4c0dbc4ef00677986bf571ddcf99c", + "size": 54931191, + "url": "https://dl.google.com/android/repository/build-tools_r31-linux.zip" + }, + { + "os": "macosx", + "sha1": "c9b4215affd183974b1b2d1c5745911203f56de5", + "size": 52867497, + "url": "https://dl.google.com/android/repository/d32e21a8aa8492ef8b86a489f601da425842b5da.build-tools_r31-macosx.zip" } ], - "displayName": "Android SDK Build-Tools 31-rc3", - "license": "android-sdk-preview-license", + "displayName": "Android SDK Build-Tools 31", + "license": "android-sdk-license", "name": "build-tools", - "path": "build-tools/31.0.0-rc3", - "revision": "31.0.0-rc3" + "path": "build-tools/31.0.0", + "revision": "31.0.0" } }, "cmake": { @@ -3321,115 +3342,115 @@ "path": "cmdline-tools/3.0", "revision": "3.0" }, - "4.0-rc01": { + "4.0": { "archives": [ { "os": "linux", - "sha1": "98d3f2715f6bfbacef063d1376d7765fe5b93309", - "size": 99514756, - "url": "https://dl.google.com/android/repository/commandlinetools-linux-6987402_latest.zip" + "sha1": "87e7cd8879ed469117f20090dc4d454a24e30170", + "size": 103957858, + "url": "https://dl.google.com/android/repository/commandlinetools-linux-7302050_latest.zip" }, { "os": "macosx", - "sha1": "573d312a3fdc7700d9c395d647292d90b193d4ee", - "size": 99514744, - "url": "https://dl.google.com/android/repository/commandlinetools-mac-6987402_latest.zip" + "sha1": "8fcf59d208cb5d48e1233979aa5187e7dfb98cf3", + "size": 103957846, + "url": "https://dl.google.com/android/repository/commandlinetools-mac-7302050_latest.zip" }, { "os": "windows", - "sha1": "72fae22d41fb8aa4f22e408e18c9d00f06050f7b", - "size": 99496635, - "url": "https://dl.google.com/android/repository/commandlinetools-win-6987402_latest.zip" + "sha1": "ede5b054c06a7fea51bfd27041a100bae5521803", + "size": 103939737, + "url": "https://dl.google.com/android/repository/commandlinetools-win-7302050_latest.zip" } ], "displayName": "Android SDK Command-line Tools", - "license": "android-sdk-preview-license", + "license": "android-sdk-license", "name": "cmdline-tools", - "path": "cmdline-tools/4.0-beta01", - "revision": "4.0-rc01" + "path": "cmdline-tools/4.0", + "revision": "4.0" }, - "5.0-rc01": { + "5.0": { "archives": [ { "os": "linux", - "sha1": "f06b1642396ef1e431b990dbe386d5f1e3deabcc", - "size": 102189958, - "url": "https://dl.google.com/android/repository/commandlinetools-linux-7006259_latest.zip" + "sha1": "0885385de11983c020ff0d47039987fe372160d2", + "size": 109673042, + "url": "https://dl.google.com/android/repository/commandlinetools-linux-7583922_latest.zip" }, { "os": "macosx", - "sha1": "0752424530724f76cb5a28de84d663e63739e6ee", - "size": 102189946, - "url": "https://dl.google.com/android/repository/commandlinetools-mac-7006259_latest.zip" + "sha1": "49538fa064c077b188bdb51f3aa57bb2882b0abd", + "size": 109673028, + "url": "https://dl.google.com/android/repository/commandlinetools-mac-7583922_latest.zip" }, { "os": "windows", - "sha1": "6f8e359dba91af39c046a791ea32e3ca5149a078", - "size": 102171837, - "url": "https://dl.google.com/android/repository/commandlinetools-win-7006259_latest.zip" + "sha1": "a2f359fb8b075acebcb3e3e48b4170cfe4071882", + "size": 109651902, + "url": "https://dl.google.com/android/repository/commandlinetools-win-7583922_latest.zip" } ], "displayName": "Android SDK Command-line Tools", - "license": "android-sdk-preview-license", + "license": "android-sdk-license", "name": "cmdline-tools", - "path": "cmdline-tools/5.0-alpha01", - "revision": "5.0-rc01" + "path": "cmdline-tools/5.0", + "revision": "5.0" } }, "emulator": { - "30.5.5": { + "30.8.4": { "archives": [ - { - "os": "macosx", - "sha1": "90f8a9942253db75ab4d13f791377e9739a88617", - "size": 300476485, - "url": "https://dl.google.com/android/repository/emulator-darwin_x64-7285888.zip" - }, { "os": "linux", - "sha1": "ccdee1aa99e4ec39f5a762d6912682ac248b92f0", - "size": 272500365, - "url": "https://dl.google.com/android/repository/emulator-linux_x64-7285888.zip" + "sha1": "140f833321684f7696e4b9012636c45eaa5b6a4a", + "size": 277522999, + "url": "https://dl.google.com/android/repository/emulator-linux_x64-7600983.zip" }, { "os": "windows", - "sha1": "84c3105ba1a3a94963e1f99b3f706d0231948fc9", - "size": 324371999, - "url": "https://dl.google.com/android/repository/emulator-windows_x64-7285888.zip" + "sha1": "c26170db8aba1bbfcfe63481e95a90bc7b2ff129", + "size": 326723360, + "url": "https://dl.google.com/android/repository/emulator-windows_x64-7600983.zip" + }, + { + "os": "macosx", + "sha1": "9811a649c516153681471f897a02398947640045", + "size": 315292647, + "url": "https://dl.google.com/android/repository/emulator-darwin_x64-7600983.zip" } ], "displayName": "Android Emulator", "license": "android-sdk-license", "name": "emulator", "path": "emulator", - "revision": "30.5.5" + "revision": "30.8.4" }, - "30.6.3": { + "30.9.0": { "archives": [ { "os": "macosx", - "sha1": "66c9b788de49548d0faab052274f97b042f7241d", - "size": 308984491, - "url": "https://dl.google.com/android/repository/emulator-darwin_x64-7266284.zip" + "sha1": "b197e04e0543271899a1bd956a3f828e1159086b", + "size": 315330447, + "url": "https://dl.google.com/android/repository/emulator-darwin_x64-7634933.zip" }, { "os": "linux", - "sha1": "ecd9b55fe4784b6c8683faa4b1d2c951b8929154", - "size": 272243636, - "url": "https://dl.google.com/android/repository/emulator-linux_x64-7266284.zip" + "sha1": "5cdfb2b27f24ded22348535f2de28ec373e203c8", + "size": 277557089, + "url": "https://dl.google.com/android/repository/emulator-linux_x64-7634933.zip" }, { "os": "windows", - "sha1": "5736749dc46ad950ec84e8275dfde2606d3e8a80", - "size": 324657514, - "url": "https://dl.google.com/android/repository/emulator-windows_x64-7266284.zip" + "sha1": "aed5ba827d0c1d68c8663a4d786f184aaeb939ed", + "size": 326205048, + "url": "https://dl.google.com/android/repository/emulator-windows_x64-7634933.zip" } ], "displayName": "Android Emulator", "license": "android-sdk-preview-license", "name": "emulator", "path": "emulator", - "revision": "30.6.3" + "revision": "30.9.0" } }, "extras": { @@ -3460,32 +3481,32 @@ "path": "extras/google/auto", "revision": "1.1" }, - "2.0-rc1": { + "2.0-rc2": { "archives": [ { "os": "linux", - "sha1": "b480489e604371301da10731a793b234b01b8f42", - "size": 4527281, - "url": "https://dl.google.com/android/repository/desktop-head-unit-linux_r02.0.rc1.zip" + "sha1": "dbb771c2be299fd88ca05d8b0e381c369a7f7009", + "size": 6947111, + "url": "https://dl.google.com/android/repository/desktop-head-unit-linux_r02.0.rc2.zip" }, { "os": "macosx", - "sha1": "3adaf99d06eaeeb31f7bdbb62ae841e740bfc156", - "size": 5592023, - "url": "https://dl.google.com/android/repository/desktop-head-unit-macosx_r02.0.rc1.zip" + "sha1": "ec1f68f9acc234f8493f4ba24954d1d45291b736", + "size": 8593497, + "url": "https://dl.google.com/android/repository/desktop-head-unit-macosx_r02.0.rc2.zip" }, { "os": "windows", - "sha1": "e07788ed91d8e6dd3374f77da1cf78afb2664cc0", - "size": 5703857, - "url": "https://dl.google.com/android/repository/desktop-head-unit-windows_r02.0.rc1.zip" + "sha1": "471ae94176512f859580e6ac9e8b8f5010632c78", + "size": 7130894, + "url": "https://dl.google.com/android/repository/desktop-head-unit-windows_r02.0.rc2.zip" } ], "displayName": "Android Auto Desktop Head Unit Emulator", "license": "android-sdk-preview-license", "name": "extras", "path": "extras/google/auto", - "revision": "2.0-rc1" + "revision": "2.0-rc2" } }, "ndk": { @@ -4136,6 +4157,114 @@ "name": "ndk", "path": "ndk/23.0.7272597", "revision": "23.0.7272597-rc3" + }, + "23.0.7344513-rc4": { + "archives": [ + { + "os": "macosx", + "sha1": "a8fedcf0dd3b3a340e68684a5a2308154a952039", + "size": 694920487, + "url": "https://dl.google.com/android/repository/android-ndk-r23-beta4-darwin-x86_64.zip" + }, + { + "os": "linux", + "sha1": "5f44bc1789042358a73c15e0ef732ea729cf47cc", + "size": 724510864, + "url": "https://dl.google.com/android/repository/android-ndk-r23-beta4-linux-x86_64.zip" + }, + { + "os": "windows", + "sha1": "4492af1296d07c0c65ce42f10ecac06c3c307b94", + "size": 785615074, + "url": "https://dl.google.com/android/repository/android-ndk-r23-beta4-windows-x86_64.zip" + } + ], + "displayName": "NDK (Side by side) 23.0.7344513", + "license": "android-sdk-preview-license", + "name": "ndk", + "path": "ndk/23.0.7344513", + "revision": "23.0.7344513-rc4" + }, + "23.0.7421159-rc5": { + "archives": [ + { + "os": "macosx", + "sha1": "9ef60fcc7a4bb0477d4189c711853cbc12b24efe", + "size": 694850942, + "url": "https://dl.google.com/android/repository/android-ndk-r23-beta5-darwin.zip" + }, + { + "os": "linux", + "sha1": "453ba0ca124e43337318f8a40d26cab114e7092c", + "size": 724438684, + "url": "https://dl.google.com/android/repository/android-ndk-r23-beta5-linux.zip" + }, + { + "os": "windows", + "sha1": "ace75623181ce86bc70df312155c04b9d8ff3e46", + "size": 785543078, + "url": "https://dl.google.com/android/repository/android-ndk-r23-beta5-windows.zip" + } + ], + "displayName": "NDK (Side by side) 23.0.7421159", + "license": "android-sdk-preview-license", + "name": "ndk", + "path": "ndk/23.0.7421159", + "revision": "23.0.7421159-rc5" + }, + "23.0.7530507-rc6": { + "archives": [ + { + "os": "macosx", + "sha1": "af299c3e4f6fd3e6f05b1699a0181d84a95068c4", + "size": 695336572, + "url": "https://dl.google.com/android/repository/android-ndk-r23-beta6-darwin.zip" + }, + { + "os": "linux", + "sha1": "b3118a9daeff8ad1801c4dbaeda1e5e5fb33b8a5", + "size": 725026229, + "url": "https://dl.google.com/android/repository/android-ndk-r23-beta6-linux.zip" + }, + { + "os": "windows", + "sha1": "386f5c80217f6f33d6420f7de4f935eaff831868", + "size": 786033634, + "url": "https://dl.google.com/android/repository/android-ndk-r23-beta6-windows.zip" + } + ], + "displayName": "NDK (Side by side) 23.0.7530507", + "license": "android-sdk-preview-license", + "name": "ndk", + "path": "ndk/23.0.7530507", + "revision": "23.0.7530507-rc6" + }, + "23.0.7599858": { + "archives": [ + { + "os": "macosx", + "sha1": "c19f4a29e03689ea31bebe77f2d0a256d8e16925", + "size": 691981924, + "url": "https://dl.google.com/android/repository/android-ndk-r23-darwin.zip" + }, + { + "os": "linux", + "sha1": "9bad35f442caeda747780ba1dd92f2d98609d9cd", + "size": 721667870, + "url": "https://dl.google.com/android/repository/android-ndk-r23-linux.zip" + }, + { + "os": "windows", + "sha1": "14af52e23af9f7a9e7576a17e1814701192745be", + "size": 782684423, + "url": "https://dl.google.com/android/repository/android-ndk-r23-windows.zip" + } + ], + "displayName": "NDK (Side by side) 23.0.7599858", + "license": "android-sdk-license", + "name": "ndk", + "path": "ndk/23.0.7599858", + "revision": "23.0.7599858" } }, "ndk-bundle": { @@ -4786,6 +4915,33 @@ "name": "ndk-bundle", "path": "ndk-bundle", "revision": "23.0.7272597-rc3" + }, + "23.0.7344513-rc4": { + "archives": [ + { + "os": "macosx", + "sha1": "a8fedcf0dd3b3a340e68684a5a2308154a952039", + "size": 694920487, + "url": "https://dl.google.com/android/repository/android-ndk-r23-beta4-darwin-x86_64.zip" + }, + { + "os": "linux", + "sha1": "5f44bc1789042358a73c15e0ef732ea729cf47cc", + "size": 724510864, + "url": "https://dl.google.com/android/repository/android-ndk-r23-beta4-linux-x86_64.zip" + }, + { + "os": "windows", + "sha1": "4492af1296d07c0c65ce42f10ecac06c3c307b94", + "size": 785615074, + "url": "https://dl.google.com/android/repository/android-ndk-r23-beta4-windows-x86_64.zip" + } + ], + "displayName": "NDK", + "license": "android-sdk-preview-license", + "name": "ndk-bundle", + "path": "ndk-bundle", + "revision": "23.0.7344513-rc4" } }, "patcher": { @@ -4806,32 +4962,32 @@ } }, "platform-tools": { - "31.0.2": { + "31.0.3": { "archives": [ { "os": "macosx", - "sha1": "78937049851e1db90317612c6b831759f56fc86d", - "size": 13829393, - "url": "https://dl.google.com/android/repository/42b081e1e068bb936179551684cdcb30315e245c.platform-tools_r31.0.2-darwin.zip" + "sha1": "15f6f7e97b35994d538a0fc5147ad5fb502ba03d", + "size": 13227985, + "url": "https://dl.google.com/android/repository/e8b2b4cbe47c728c1e54c5f524440b52d4e1a33c.platform-tools_r31.0.3-darwin.zip" }, { "os": "linux", - "sha1": "ff02a9d8c6fa9687e1207fc0c4b84033925d452d", - "size": 13876419, - "url": "https://dl.google.com/android/repository/platform-tools_r31.0.2-linux.zip" + "sha1": "f09581347ed39978abb3a99c6bb286de6adc98ef", + "size": 13302579, + "url": "https://dl.google.com/android/repository/platform-tools_r31.0.3-linux.zip" }, { "os": "windows", - "sha1": "9cc0f642a66706a978214395b85c8e8228c24f2f", - "size": 12537668, - "url": "https://dl.google.com/android/repository/platform-tools_r31.0.2-windows.zip" + "sha1": "26bc02bbd920e8ed461ae526cc4c69d773b72395", + "size": 11912013, + "url": "https://dl.google.com/android/repository/platform-tools_r31.0.3-windows.zip" } ], "displayName": "Android SDK Platform-Tools", "license": "android-sdk-license", "name": "platform-tools", "path": "platform-tools", - "revision": "31.0.2" + "revision": "31.0.3" } }, "platforms": { @@ -5204,6 +5360,21 @@ "path": "platforms/android-30", "revision": "30" }, + "31": { + "archives": [ + { + "os": "all", + "sha1": "ca5bcaa565cb37e9d287051d6dd0e49a5426ec29", + "size": 56475526, + "url": "https://dl.google.com/android/repository/platform-31_r01.zip" + } + ], + "displayName": "Android SDK Platform 31", + "license": "android-sdk-license", + "name": "platforms", + "path": "platforms/android-31", + "revision": "31" + }, "4": { "archives": [ { @@ -5329,50 +5500,35 @@ "name": "platforms", "path": "platforms/android-9", "revision": "9" - }, - "S": { - "archives": [ - { - "os": "all", - "sha1": "3aee3ad760dc7becf657d6421629fe360215f92e", - "size": 56206479, - "url": "https://dl.google.com/android/repository/platform-S_r03.zip" - } - ], - "displayName": "Android SDK Platform S", - "license": "android-sdk-license", - "name": "platforms", - "path": "platforms/android-S", - "revision": "S" } }, "skiaparser": { - "2": { + "3": { "archives": [ { "os": "linux", - "sha1": "2703a570224a5ced1f73eb3efbdb3192a1ecec81", - "size": 6681896, - "url": "https://dl.google.com/android/repository/skiaparser-7248848-linux.zip" + "sha1": "36e2c30f7745f4c062129a0fd549d29ab991db41", + "size": 6767192, + "url": "https://dl.google.com/android/repository/skiaparser-7478287-linux.zip" }, { "os": "macosx", - "sha1": "ecf8794beccf578d4130bb9f7f2c7fa0c40c62c2", - "size": 7340904, - "url": "https://dl.google.com/android/repository/skiaparser-7248848-mac.zip" + "sha1": "04a834a8ab3efd4612300da7cef7f43a6b257468", + "size": 7401688, + "url": "https://dl.google.com/android/repository/skiaparser-7478287-mac.zip" }, { "os": "windows", - "sha1": "84c28480ca057e48e8d2fed0ae8f52fc21aa7e61", - "size": 6450856, - "url": "https://dl.google.com/android/repository/skiaparser-7248848-win.zip" + "sha1": "567f24512f9d9487a3b948032a136261f5d59c92", + "size": 6532776, + "url": "https://dl.google.com/android/repository/skiaparser-7478287-win.zip" } ], "displayName": "Layout Inspector image server for API S", "license": "android-sdk-license", "name": "skiaparser", "path": "skiaparser/2", - "revision": "2" + "revision": "3" }, "6": { "archives": [ diff --git a/pkgs/development/mobile/cocoapods/Gemfile-beta.lock b/pkgs/development/mobile/cocoapods/Gemfile-beta.lock index 6f4522ebf1c9..c7115baa422a 100644 --- a/pkgs/development/mobile/cocoapods/Gemfile-beta.lock +++ b/pkgs/development/mobile/cocoapods/Gemfile-beta.lock @@ -1,23 +1,27 @@ +GEM + specs: + GEM remote: https://rubygems.org/ specs: CFPropertyList (3.0.3) - activesupport (5.2.4.5) + activesupport (6.1.4) concurrent-ruby (~> 1.0, >= 1.0.2) - i18n (>= 0.7, < 2) - minitest (~> 5.1) - tzinfo (~> 1.1) - addressable (2.7.0) + i18n (>= 1.6, < 2) + minitest (>= 5.1) + tzinfo (~> 2.0) + zeitwerk (~> 2.3) + addressable (2.8.0) public_suffix (>= 2.0.2, < 5.0) algoliasearch (1.27.5) httpclient (~> 2.8, >= 2.8.3) json (>= 1.5.1) atomos (0.1.3) claide (1.0.3) - cocoapods (1.10.1) - addressable (~> 2.6) + cocoapods (1.11.0.beta.2) + addressable (~> 2.8) claide (>= 1.0.2, < 2.0) - cocoapods-core (= 1.10.1) + cocoapods-core (= 1.11.0.beta.2) cocoapods-deintegrate (>= 1.0.3, < 2.0) cocoapods-downloader (>= 1.4.0, < 2.0) cocoapods-plugins (>= 1.0.0, < 2.0) @@ -28,66 +32,68 @@ GEM escape (~> 0.0.4) fourflusher (>= 2.3.0, < 3.0) gh_inspector (~> 1.0) - molinillo (~> 0.6.6) + molinillo (~> 0.8.0) nap (~> 1.0) - ruby-macho (~> 1.4) - xcodeproj (>= 1.19.0, < 2.0) - cocoapods-core (1.10.1) - activesupport (> 5.0, < 6) - addressable (~> 2.6) + ruby-macho (>= 1.0, < 3.0) + xcodeproj (>= 1.21.0, < 2.0) + cocoapods-core (1.11.0.beta.2) + activesupport (>= 5.0, < 7) + addressable (~> 2.8) algoliasearch (~> 1.0) concurrent-ruby (~> 1.1) fuzzy_match (~> 2.0.4) nap (~> 1.0) netrc (~> 0.11) - public_suffix + public_suffix (~> 4.0) typhoeus (~> 1.0) - cocoapods-deintegrate (1.0.4) + cocoapods-deintegrate (1.0.5) cocoapods-downloader (1.4.0) cocoapods-plugins (1.0.0) nap - cocoapods-search (1.0.0) + cocoapods-search (1.0.1) cocoapods-trunk (1.5.0) nap (>= 0.8, < 2.0) netrc (~> 0.11) cocoapods-try (1.2.0) colored2 (3.1.2) - concurrent-ruby (1.1.8) + concurrent-ruby (1.1.9) escape (0.0.4) - ethon (0.12.0) - ffi (>= 1.3.0) - ffi (1.15.0) + ethon (0.14.0) + ffi (>= 1.15.0) + ffi (1.15.3) fourflusher (2.3.1) fuzzy_match (2.0.4) gh_inspector (1.1.3) httpclient (2.8.3) - i18n (1.8.9) + i18n (1.8.10) concurrent-ruby (~> 1.0) json (2.5.1) minitest (5.14.4) - molinillo (0.6.6) + molinillo (0.8.0) nanaimo (0.3.0) nap (1.1.0) netrc (0.11.0) public_suffix (4.0.6) - ruby-macho (1.4.0) - thread_safe (0.3.6) + rexml (3.2.5) + ruby-macho (2.5.1) typhoeus (1.4.0) ethon (>= 0.9.0) - tzinfo (1.2.9) - thread_safe (~> 0.1) - xcodeproj (1.19.0) + tzinfo (2.0.4) + concurrent-ruby (~> 1.0) + xcodeproj (1.21.0) CFPropertyList (>= 2.3.3, < 4.0) atomos (~> 0.1.3) claide (>= 1.0.2, < 2.0) colored2 (~> 3.1) nanaimo (~> 0.3.0) + rexml (~> 3.2.4) + zeitwerk (2.4.2) PLATFORMS - ruby + arm64-darwin-20 DEPENDENCIES cocoapods (>= 1.7.0.beta.1)! BUNDLED WITH - 2.1.4 + 2.2.20 diff --git a/pkgs/development/mobile/cocoapods/Gemfile.lock b/pkgs/development/mobile/cocoapods/Gemfile.lock index cf718b02c087..c29ad34d4efd 100644 --- a/pkgs/development/mobile/cocoapods/Gemfile.lock +++ b/pkgs/development/mobile/cocoapods/Gemfile.lock @@ -1,23 +1,26 @@ +GEM + specs: + GEM remote: https://rubygems.org/ specs: CFPropertyList (3.0.3) - activesupport (5.2.4.5) + activesupport (5.2.6) concurrent-ruby (~> 1.0, >= 1.0.2) i18n (>= 0.7, < 2) minitest (~> 5.1) tzinfo (~> 1.1) - addressable (2.7.0) + addressable (2.8.0) public_suffix (>= 2.0.2, < 5.0) algoliasearch (1.27.5) httpclient (~> 2.8, >= 2.8.3) json (>= 1.5.1) atomos (0.1.3) claide (1.0.3) - cocoapods (1.10.1) + cocoapods (1.10.2) addressable (~> 2.6) claide (>= 1.0.2, < 2.0) - cocoapods-core (= 1.10.1) + cocoapods-core (= 1.10.2) cocoapods-deintegrate (>= 1.0.3, < 2.0) cocoapods-downloader (>= 1.4.0, < 2.0) cocoapods-plugins (>= 1.0.0, < 2.0) @@ -32,7 +35,7 @@ GEM nap (~> 1.0) ruby-macho (~> 1.4) xcodeproj (>= 1.19.0, < 2.0) - cocoapods-core (1.10.1) + cocoapods-core (1.10.2) activesupport (> 5.0, < 6) addressable (~> 2.6) algoliasearch (~> 1.0) @@ -42,26 +45,26 @@ GEM netrc (~> 0.11) public_suffix typhoeus (~> 1.0) - cocoapods-deintegrate (1.0.4) + cocoapods-deintegrate (1.0.5) cocoapods-downloader (1.4.0) cocoapods-plugins (1.0.0) nap - cocoapods-search (1.0.0) + cocoapods-search (1.0.1) cocoapods-trunk (1.5.0) nap (>= 0.8, < 2.0) netrc (~> 0.11) cocoapods-try (1.2.0) colored2 (3.1.2) - concurrent-ruby (1.1.8) + concurrent-ruby (1.1.9) escape (0.0.4) - ethon (0.12.0) - ffi (>= 1.3.0) - ffi (1.15.0) + ethon (0.14.0) + ffi (>= 1.15.0) + ffi (1.15.3) fourflusher (2.3.1) fuzzy_match (2.0.4) gh_inspector (1.1.3) httpclient (2.8.3) - i18n (1.8.9) + i18n (1.8.10) concurrent-ruby (~> 1.0) json (2.5.1) minitest (5.14.4) @@ -70,24 +73,26 @@ GEM nap (1.1.0) netrc (0.11.0) public_suffix (4.0.6) + rexml (3.2.5) ruby-macho (1.4.0) thread_safe (0.3.6) typhoeus (1.4.0) ethon (>= 0.9.0) tzinfo (1.2.9) thread_safe (~> 0.1) - xcodeproj (1.19.0) + xcodeproj (1.21.0) CFPropertyList (>= 2.3.3, < 4.0) atomos (~> 0.1.3) claide (>= 1.0.2, < 2.0) colored2 (~> 3.1) nanaimo (~> 0.3.0) + rexml (~> 3.2.4) PLATFORMS - ruby + arm64-darwin-20 DEPENDENCIES cocoapods! BUNDLED WITH - 2.1.4 + 2.2.20 diff --git a/pkgs/development/mobile/cocoapods/gemset-beta.nix b/pkgs/development/mobile/cocoapods/gemset-beta.nix index 9c18d393bcb9..b64d6b189ad5 100644 --- a/pkgs/development/mobile/cocoapods/gemset-beta.nix +++ b/pkgs/development/mobile/cocoapods/gemset-beta.nix @@ -1,14 +1,14 @@ { activesupport = { - dependencies = ["concurrent-ruby" "i18n" "minitest" "tzinfo"]; + dependencies = ["concurrent-ruby" "i18n" "minitest" "tzinfo" "zeitwerk"]; groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0fp4gr3g25qgl01y3pd88wfh4pjc5zj3bz4v7rkxxwaxdjg7a9cc"; + sha256 = "0kqgywy4cj3h5142dh7pl0xx5nybp25jn0ykk0znziivzks68xdk"; type = "gem"; }; - version = "5.2.4.5"; + version = "6.1.4"; }; addressable = { dependencies = ["public_suffix"]; @@ -16,10 +16,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1fvchp2rhp2rmigx7qglf69xvjqvzq7x0g49naliw29r2bz656sy"; + sha256 = "022r3m9wdxljpbya69y2i3h9g3dhhfaqzidf95m6qjzms792jvgp"; type = "gem"; }; - version = "2.7.0"; + version = "2.8.0"; }; algoliasearch = { dependencies = ["httpclient" "json"]; @@ -68,10 +68,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0k1fgp93nbgvp5m76wf067jcqy5zzbx0kczcxvhrzdxkkixzm30a"; + sha256 = "1rvmvxday0fg1p1ardmqc62xam212c6iaaf1djahvz70631grprq"; type = "gem"; }; - version = "1.10.1"; + version = "1.11.0.beta.2"; }; cocoapods-core = { dependencies = ["activesupport" "addressable" "algoliasearch" "concurrent-ruby" "fuzzy_match" "nap" "netrc" "public_suffix" "typhoeus"]; @@ -79,20 +79,20 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0x5lh6ws3rn2zxv7bagam54rkcslxrx6w1anwd35rjxsn4xx0d83"; + sha256 = "0cnnmbajllp3mw2w2b2bs2y42cnh1y1zbq63m3asg097z4d1a9h1"; type = "gem"; }; - version = "1.10.1"; + version = "1.11.0.beta.2"; }; cocoapods-deintegrate = { groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0bf524f1za92i6rlr4cr6jm3c4vfjszsdc9lsr6wk5125c76ipzn"; + sha256 = "18pnng0lv5z6kpp8hnki0agdxx979iq6hxkfkglsyqzmir22lz2i"; type = "gem"; }; - version = "1.0.4"; + version = "1.0.5"; }; cocoapods-downloader = { groups = ["default"]; @@ -120,10 +120,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "02wmy5rbjk29c65zn62bffxv30qs11slql23qx65snkm0vd93mn6"; + sha256 = "12amy0nknv09bvzix8bkmcjn996c50c4ms20v2dl7v8rcw73n4qv"; type = "gem"; }; - version = "1.0.0"; + version = "1.0.1"; }; cocoapods-trunk = { dependencies = ["nap" "netrc"]; @@ -161,10 +161,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0mr23wq0szj52xnj0zcn1k0c7j4v79wlwbijkpfcscqww3l6jlg3"; + sha256 = "0nwad3211p7yv9sda31jmbyw6sdafzmdi2i2niaz6f0wk5nq9h0f"; type = "gem"; }; - version = "1.1.8"; + version = "1.1.9"; }; escape = { groups = ["default"]; @@ -182,20 +182,20 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0gggrgkcq839mamx7a8jbnp2h7x2ykfn34ixwskwb0lzx2ak17g9"; + sha256 = "1bby4hbq96vnzcdbbybcbddin8dxdnj1ns758kcr4akykningqhh"; type = "gem"; }; - version = "0.12.0"; + version = "0.14.0"; }; ffi = { groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0nq1fb3vbfylccwba64zblxy96qznxbys5900wd7gm9bpplmf432"; + sha256 = "1wgvaclp4h9y8zkrgz8p2hqkrgr4j7kz0366mik0970w532cbmcq"; type = "gem"; }; - version = "1.15.0"; + version = "1.15.3"; }; fourflusher = { groups = ["default"]; @@ -243,10 +243,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "08p6b13p99j1rrcrw1l3v0kb9mxbsvy6nk31r8h4rnszdgzpga32"; + sha256 = "0g2fnag935zn2ggm5cn6k4s4xvv53v2givj1j90szmvavlpya96a"; type = "gem"; }; - version = "1.8.9"; + version = "1.8.10"; }; json = { groups = ["default"]; @@ -273,10 +273,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1hh40z1adl4lw16dj4hxgabx4rr28mgqycih1y1d91bwww0jjdg6"; + sha256 = "0p846facmh1j5xmbrpgzadflspvk7bzs3sykrh5s7qi4cdqz5gzg"; type = "gem"; }; - version = "0.6.6"; + version = "0.8.0"; }; nanaimo = { groups = ["default"]; @@ -318,25 +318,25 @@ }; version = "4.0.6"; }; + rexml = { + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "08ximcyfjy94pm1rhcx04ny1vx2sk0x4y185gzn86yfsbzwkng53"; + type = "gem"; + }; + version = "3.2.5"; + }; ruby-macho = { groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0lhdjn91jkifsy2hzq2hgcm0pp8pbik87m58zmw1ifh6hkp9adjb"; + sha256 = "1jgmhj4srl7cck1ipbjys6q4klcs473gq90bm59baw4j1wpfaxch"; type = "gem"; }; - version = "1.4.0"; - }; - thread_safe = { - groups = ["default"]; - platforms = []; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "0nmhcgq6cgz44srylra07bmaw99f5271l0dpsvl5f75m44l0gmwy"; - type = "gem"; - }; - version = "0.3.6"; + version = "2.5.1"; }; typhoeus = { dependencies = ["ethon"]; @@ -350,25 +350,35 @@ version = "1.4.0"; }; tzinfo = { - dependencies = ["thread_safe"]; + dependencies = ["concurrent-ruby"]; groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0zwqqh6138s8b321fwvfbywxy00lw1azw4ql3zr0xh1aqxf8cnvj"; + sha256 = "10qp5x7f9hvlc0psv9gsfbxg4a7s0485wsbq1kljkxq94in91l4z"; type = "gem"; }; - version = "1.2.9"; + version = "2.0.4"; }; xcodeproj = { - dependencies = ["CFPropertyList" "atomos" "claide" "colored2" "nanaimo"]; + dependencies = ["CFPropertyList" "atomos" "claide" "colored2" "nanaimo" "rexml"]; groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1411j6sfnz0cx4fiw52f0yqx4bgcn8cmpgi3i5rwmmahayyjz2fn"; + sha256 = "0xmzb1mdsnkpf7v07whz0n2wc8kg6785sc7i5zyawd8dl8517rp4"; type = "gem"; }; - version = "1.19.0"; + version = "1.21.0"; + }; + zeitwerk = { + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1746czsjarixq0x05f7p3hpzi38ldg6wxnxxw74kbjzh1sdjgmpl"; + type = "gem"; + }; + version = "2.4.2"; }; } diff --git a/pkgs/development/mobile/cocoapods/gemset.nix b/pkgs/development/mobile/cocoapods/gemset.nix index 90c1687aeaba..7a6b63200281 100644 --- a/pkgs/development/mobile/cocoapods/gemset.nix +++ b/pkgs/development/mobile/cocoapods/gemset.nix @@ -5,10 +5,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0fp4gr3g25qgl01y3pd88wfh4pjc5zj3bz4v7rkxxwaxdjg7a9cc"; + sha256 = "1vybx4cj42hr6m8cdwbrqq2idh98zms8c11kr399xjczhl9ywjbj"; type = "gem"; }; - version = "5.2.4.5"; + version = "5.2.6"; }; addressable = { dependencies = ["public_suffix"]; @@ -16,10 +16,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1fvchp2rhp2rmigx7qglf69xvjqvzq7x0g49naliw29r2bz656sy"; + sha256 = "022r3m9wdxljpbya69y2i3h9g3dhhfaqzidf95m6qjzms792jvgp"; type = "gem"; }; - version = "2.7.0"; + version = "2.8.0"; }; algoliasearch = { dependencies = ["httpclient" "json"]; @@ -66,10 +66,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0k1fgp93nbgvp5m76wf067jcqy5zzbx0kczcxvhrzdxkkixzm30a"; + sha256 = "0d0vlzjizqkw2m6am9gcnjkxy73zl74ill28v17v0s2v8fzd7nbg"; type = "gem"; }; - version = "1.10.1"; + version = "1.10.2"; }; cocoapods-core = { dependencies = ["activesupport" "addressable" "algoliasearch" "concurrent-ruby" "fuzzy_match" "nap" "netrc" "public_suffix" "typhoeus"]; @@ -77,20 +77,20 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0x5lh6ws3rn2zxv7bagam54rkcslxrx6w1anwd35rjxsn4xx0d83"; + sha256 = "1j1sapw5l3xc5d8mli09az1bbmfdynlx7xv8lbghvm9i1md14dl5"; type = "gem"; }; - version = "1.10.1"; + version = "1.10.2"; }; cocoapods-deintegrate = { groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0bf524f1za92i6rlr4cr6jm3c4vfjszsdc9lsr6wk5125c76ipzn"; + sha256 = "18pnng0lv5z6kpp8hnki0agdxx979iq6hxkfkglsyqzmir22lz2i"; type = "gem"; }; - version = "1.0.4"; + version = "1.0.5"; }; cocoapods-downloader = { groups = ["default"]; @@ -112,12 +112,14 @@ version = "1.0.0"; }; cocoapods-search = { + groups = ["default"]; + platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "02wmy5rbjk29c65zn62bffxv30qs11slql23qx65snkm0vd93mn6"; + sha256 = "12amy0nknv09bvzix8bkmcjn996c50c4ms20v2dl7v8rcw73n4qv"; type = "gem"; }; - version = "1.0.0"; + version = "1.0.1"; }; cocoapods-trunk = { dependencies = ["nap" "netrc"]; @@ -153,10 +155,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0mr23wq0szj52xnj0zcn1k0c7j4v79wlwbijkpfcscqww3l6jlg3"; + sha256 = "0nwad3211p7yv9sda31jmbyw6sdafzmdi2i2niaz6f0wk5nq9h0f"; type = "gem"; }; - version = "1.1.8"; + version = "1.1.9"; }; escape = { source = { @@ -172,20 +174,20 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0gggrgkcq839mamx7a8jbnp2h7x2ykfn34ixwskwb0lzx2ak17g9"; + sha256 = "1bby4hbq96vnzcdbbybcbddin8dxdnj1ns758kcr4akykningqhh"; type = "gem"; }; - version = "0.12.0"; + version = "0.14.0"; }; ffi = { groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0nq1fb3vbfylccwba64zblxy96qznxbys5900wd7gm9bpplmf432"; + sha256 = "1wgvaclp4h9y8zkrgz8p2hqkrgr4j7kz0366mik0970w532cbmcq"; type = "gem"; }; - version = "1.15.0"; + version = "1.15.3"; }; fourflusher = { groups = ["default"]; @@ -229,10 +231,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "08p6b13p99j1rrcrw1l3v0kb9mxbsvy6nk31r8h4rnszdgzpga32"; + sha256 = "0g2fnag935zn2ggm5cn6k4s4xvv53v2givj1j90szmvavlpya96a"; type = "gem"; }; - version = "1.8.9"; + version = "1.8.10"; }; json = { groups = ["default"]; @@ -298,6 +300,16 @@ }; version = "4.0.6"; }; + rexml = { + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "08ximcyfjy94pm1rhcx04ny1vx2sk0x4y185gzn86yfsbzwkng53"; + type = "gem"; + }; + version = "3.2.5"; + }; ruby-macho = { groups = ["default"]; platforms = []; @@ -339,14 +351,14 @@ version = "1.2.9"; }; xcodeproj = { - dependencies = ["CFPropertyList" "atomos" "claide" "colored2" "nanaimo"]; + dependencies = ["CFPropertyList" "atomos" "claide" "colored2" "nanaimo" "rexml"]; groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1411j6sfnz0cx4fiw52f0yqx4bgcn8cmpgi3i5rwmmahayyjz2fn"; + sha256 = "0xmzb1mdsnkpf7v07whz0n2wc8kg6785sc7i5zyawd8dl8517rp4"; type = "gem"; }; - version = "1.19.0"; + version = "1.21.0"; }; } diff --git a/pkgs/development/node-packages/README.md b/pkgs/development/node-packages/README.md index 9760285a915e..38d1ff2018c4 100644 --- a/pkgs/development/node-packages/README.md +++ b/pkgs/development/node-packages/README.md @@ -1 +1 @@ -Moved to [/doc/languages-frameworks/node.section.md](/doc/languages-frameworks/node.section.md) +Moved to [/doc/languages-frameworks/javascript.section.md](/doc/languages-frameworks/javascript.section.md) diff --git a/pkgs/development/node-packages/node-packages.json b/pkgs/development/node-packages/node-packages.json index 31e015b06647..7d1b6a924694 100644 --- a/pkgs/development/node-packages/node-packages.json +++ b/pkgs/development/node-packages/node-packages.json @@ -5,6 +5,7 @@ , "@bitwarden/cli" , "@hyperspace/cli" , "@nestjs/cli" +, "@squoosh/cli" , "@vue/cli" , "@webassemblyjs/cli" , "@webassemblyjs/repl" @@ -72,6 +73,7 @@ , "coffee-script" , "coinmon" , "configurable-http-proxy" +, "conventional-changelog-cli" , "cordova" , "cpy-cli" , "create-cycle-app" diff --git a/pkgs/development/node-packages/node-packages.nix b/pkgs/development/node-packages/node-packages.nix index 97e465202256..0406e4659448 100644 --- a/pkgs/development/node-packages/node-packages.nix +++ b/pkgs/development/node-packages/node-packages.nix @@ -2074,13 +2074,13 @@ let sha512 = "J6KFFz5QCYUJq3pf0mjEcCJVERbzv71PUIDczuh9JkwGEzced6CO5ADLHB1rbf/+oPBtoPfMYNOpGDzCANlbXw=="; }; }; - "@exodus/schemasafe-1.0.0-rc.3" = { + "@exodus/schemasafe-1.0.0-rc.4" = { name = "_at_exodus_slash_schemasafe"; packageName = "@exodus/schemasafe"; - version = "1.0.0-rc.3"; + version = "1.0.0-rc.4"; src = fetchurl { - url = "https://registry.npmjs.org/@exodus/schemasafe/-/schemasafe-1.0.0-rc.3.tgz"; - sha512 = "GoXw0U2Qaa33m3eUcxuHnHpNvHjNlLo0gtV091XBpaRINaB4X6FGCG5XKxSFNFiPpugUDqNruHzaqpTdDm4AOg=="; + url = "https://registry.npmjs.org/@exodus/schemasafe/-/schemasafe-1.0.0-rc.4.tgz"; + sha512 = "zHISeJ5jcHSo3i2bI5RHb0XEJ1JGxQ/QQzU2FLPcJxohNohJV8jHCM1FSrOUxTspyDRSSULg3iKQa1FJ4EsSiQ=="; }; }; "@expo/apple-utils-0.0.0-alpha.20" = { @@ -2101,22 +2101,22 @@ let sha512 = "Ydf4LidRB/EBI+YrB+cVLqIseiRfjUI/AeHBgjGMtq3GroraDu81OV7zqophRgupngoL3iS3JUMDMnxO7g39qA=="; }; }; - "@expo/config-5.0.7" = { + "@expo/config-5.0.8" = { name = "_at_expo_slash_config"; packageName = "@expo/config"; - version = "5.0.7"; + version = "5.0.8"; src = fetchurl { - url = "https://registry.npmjs.org/@expo/config/-/config-5.0.7.tgz"; - sha512 = "7Wzao9uALHmRSf59FMsHk1vxW4m4alDCJmfo+enXnl5o6UYiCDYfjNXctMwnW+fBM3opta4FbmmPGIftfXOesw=="; + url = "https://registry.npmjs.org/@expo/config/-/config-5.0.8.tgz"; + sha512 = "chxcjQh4H/suzvYi+p30VnGXSHbsiVsGFwEYIZbOw4ByjrCnzeD644KolbpeQ2/oWK3atci01Qcxc1TADSixHQ=="; }; }; - "@expo/config-plugins-3.0.7" = { + "@expo/config-plugins-3.0.8" = { name = "_at_expo_slash_config-plugins"; packageName = "@expo/config-plugins"; - version = "3.0.7"; + version = "3.0.8"; src = fetchurl { - url = "https://registry.npmjs.org/@expo/config-plugins/-/config-plugins-3.0.7.tgz"; - sha512 = "7YOoFtxB6XqDil+OlGXi7iredKHxXVFCAOIVfFyEDzO3oo0gBmWGmUnHgrPDvpMj0q+adCCh5BL8OcvGfc9ITQ=="; + url = "https://registry.npmjs.org/@expo/config-plugins/-/config-plugins-3.0.8.tgz"; + sha512 = "reNYaYklOIq8QUY5ua1ubSRhVgY7hllvjingo22HHSaGhX4UvFFKDGYrjBdjcutHD6jw/eYLa8yJS74o1/rqkg=="; }; }; "@expo/config-types-42.0.0" = { @@ -2128,22 +2128,22 @@ let sha512 = "Rj02OMZke2MrGa/1Y/EScmR7VuWbDEHPJyvfFyyLbadUt+Yv6isCdeFzDt71I7gJlPR9T4fzixeYLrtXXOTq0w=="; }; }; - "@expo/dev-server-0.1.82" = { + "@expo/dev-server-0.1.83" = { name = "_at_expo_slash_dev-server"; packageName = "@expo/dev-server"; - version = "0.1.82"; + version = "0.1.83"; src = fetchurl { - url = "https://registry.npmjs.org/@expo/dev-server/-/dev-server-0.1.82.tgz"; - sha512 = "g7H4FDxcdt9y41MpivtpYqgNwEqoaSKA+lrR+qPCVPcZbIcq+xRq/coYfeXhp/L203vAab67cNVnqTQetj1T3A=="; + url = "https://registry.npmjs.org/@expo/dev-server/-/dev-server-0.1.83.tgz"; + sha512 = "4slFmSvQcjwNk3Mb7keNyAAdBIzWqeb8KUqSPYsqo10NGPtEbzmt0jlfqqi/df6cxUFJSgdSo/RJG9W5FT7lAA=="; }; }; - "@expo/dev-tools-0.13.113" = { + "@expo/dev-tools-0.13.114" = { name = "_at_expo_slash_dev-tools"; packageName = "@expo/dev-tools"; - version = "0.13.113"; + version = "0.13.114"; src = fetchurl { - url = "https://registry.npmjs.org/@expo/dev-tools/-/dev-tools-0.13.113.tgz"; - sha512 = "3z1gIBSnDATukcyvN1Q6ywT5FExJrf/wfg+1T0nQ8OZcyzFbi6u/tdns0mjT5Z+AyXDKtyHbQzGnRzegy82i3Q=="; + url = "https://registry.npmjs.org/@expo/dev-tools/-/dev-tools-0.13.114.tgz"; + sha512 = "iPatLxBcGoAzHVzFp7SpP1XbBMe+Qut2K2dU9PgZwcUVOeiESVi/48CXIOgS2PTkm/AJ1qOXprgkEROLlcrnjQ=="; }; }; "@expo/devcert-1.0.0" = { @@ -2173,13 +2173,13 @@ let sha512 = "CDnhjdirUs6OdN5hOSTJ2y3i9EiJMk7Z5iDljC5xyCHCrUex7oyI8vbRsZEojAahxZccgL/PrO+CjakiFFWurg=="; }; }; - "@expo/metro-config-0.1.82" = { + "@expo/metro-config-0.1.83" = { name = "_at_expo_slash_metro-config"; packageName = "@expo/metro-config"; - version = "0.1.82"; + version = "0.1.83"; src = fetchurl { - url = "https://registry.npmjs.org/@expo/metro-config/-/metro-config-0.1.82.tgz"; - sha512 = "rgx0ykWFvu+7jXDSe/cJB0fpIKqJX4X2k+azBIS9KmVLl5/ceKuCr6Abjy70HZTAXX/SQ7fS0C+FhzIX2Upgrg=="; + url = "https://registry.npmjs.org/@expo/metro-config/-/metro-config-0.1.83.tgz"; + sha512 = "nbmHRzAjnUmUoQjbVdTh8Xq1AXABmwqDi77otD+MxxfVmppMYLKYfMteZnrl75tmWkQY4JfVLD4DfKA3K+bKGA=="; }; }; "@expo/osascript-2.0.30" = { @@ -2191,13 +2191,13 @@ let sha512 = "IlBCyso1wJl8AbgS8n5lcUcXa/8TTU/rHgurWvJRWjErtFOELsqV4O+NCcB7jr4bvv8uZHeRKHQpsoyZWmmk/g=="; }; }; - "@expo/package-manager-0.0.46" = { + "@expo/package-manager-0.0.47" = { name = "_at_expo_slash_package-manager"; packageName = "@expo/package-manager"; - version = "0.0.46"; + version = "0.0.47"; src = fetchurl { - url = "https://registry.npmjs.org/@expo/package-manager/-/package-manager-0.0.46.tgz"; - sha512 = "+Mo7UzRNUy52uzefRkeKv8+YEE+2NhBpXfvZ1Btha2/zSJ+8fxDT0mTQUiupiaeMRPyCMqdkoE39qjF26xifYA=="; + url = "https://registry.npmjs.org/@expo/package-manager/-/package-manager-0.0.47.tgz"; + sha512 = "guFnGAiNLW/JsienEq3NkZk5khTP+RdT/czk/teJUiYLkBy0hLmMTJsNXurGgFwI33+ScEbDvFmN5IOEBGpUDQ=="; }; }; "@expo/plist-0.0.13" = { @@ -2209,13 +2209,13 @@ let sha512 = "zGPSq9OrCn7lWvwLLHLpHUUq2E40KptUFXn53xyZXPViI0k9lbApcR9KlonQZ95C+ELsf0BQ3gRficwK92Ivcw=="; }; }; - "@expo/prebuild-config-2.0.7" = { + "@expo/prebuild-config-2.0.8" = { name = "_at_expo_slash_prebuild-config"; packageName = "@expo/prebuild-config"; - version = "2.0.7"; + version = "2.0.8"; src = fetchurl { - url = "https://registry.npmjs.org/@expo/prebuild-config/-/prebuild-config-2.0.7.tgz"; - sha512 = "EMgo4ywR9hk+I90XEwtl/UHWOlw8GE01BQtrLWQbIR0pr+bvDOYINfe8PzA21oODPGUkbMvp5Z8E79VZBqqjfg=="; + url = "https://registry.npmjs.org/@expo/prebuild-config/-/prebuild-config-2.0.8.tgz"; + sha512 = "mPL7rsZkybohTskB3SdepZx27LM94No3cmS4DLPFxWbtv4gJn7RL+e4eWmIkj2vOGuDnGRwiui7Hh7SFVvRsrg=="; }; }; "@expo/results-1.0.0" = { @@ -2227,6 +2227,15 @@ let sha512 = "qECzzXX5oJot3m2Gu9pfRDz50USdBieQVwYAzeAtQRUTD3PVeTK1tlRUoDcrK8PSruDLuVYdKkLebX4w/o55VA=="; }; }; + "@expo/rudder-sdk-node-1.0.7" = { + name = "_at_expo_slash_rudder-sdk-node"; + packageName = "@expo/rudder-sdk-node"; + version = "1.0.7"; + src = fetchurl { + url = "https://registry.npmjs.org/@expo/rudder-sdk-node/-/rudder-sdk-node-1.0.7.tgz"; + sha512 = "TQuHUwugxzJGCYOFN/ZIQ+rNSdLPv2pgxaH2Ky7y80RDvWN8DNKeTbrgX0tPnVd/aLjKhxADx8C2se//lZR24w=="; + }; + }; "@expo/schemer-1.3.31" = { name = "_at_expo_slash_schemer"; packageName = "@expo/schemer"; @@ -2254,13 +2263,13 @@ let sha512 = "LB7jWkqrHo+5fJHNrLAFdimuSXQ2MQ4lA7SQW5bf/HbsXuV2VrT/jN/M8f/KoWt0uJMGN4k/j7Opx4AvOOxSew=="; }; }; - "@expo/webpack-config-0.14.0" = { + "@expo/webpack-config-0.14.1" = { name = "_at_expo_slash_webpack-config"; packageName = "@expo/webpack-config"; - version = "0.14.0"; + version = "0.14.1"; src = fetchurl { - url = "https://registry.npmjs.org/@expo/webpack-config/-/webpack-config-0.14.0.tgz"; - sha512 = "YsWLjOQIUN/+pJ5CEmhWfERwjpp6KGjxbd2Nm2KWx4v69wphyPudyrKJaD/b/41Iw5TKHGjV3hlHrYWvZ6OFaA=="; + url = "https://registry.npmjs.org/@expo/webpack-config/-/webpack-config-0.14.1.tgz"; + sha512 = "5FVcpwbTYmMoFwQ3WMyT/NP9sTuXYz7gYhtjZflPfNAWA8vVGuYlELce0P7bHkudQ/RWbpKOTG7uyRwDkjFIvA=="; }; }; "@expo/xcpretty-3.1.4" = { @@ -4009,13 +4018,13 @@ let sha512 = "W6CLUJ2eBMw3Rec70qrsEW0jOm/3twwJv21mrmj2yORiaVmVYGS4sSS5yUwvQc1ZlDLYGPnClVWmUUMagKNsfA=="; }; }; - "@microsoft/load-themed-styles-1.10.202" = { + "@microsoft/load-themed-styles-1.10.203" = { name = "_at_microsoft_slash_load-themed-styles"; packageName = "@microsoft/load-themed-styles"; - version = "1.10.202"; + version = "1.10.203"; src = fetchurl { - url = "https://registry.npmjs.org/@microsoft/load-themed-styles/-/load-themed-styles-1.10.202.tgz"; - sha512 = "pWoN9hl1vfXnPfu2tS5VndXXKMe+UEWLJXDKNGXSNpmfszVLzG8Ns0TlZHlwtgpSaSD3f0kdVDfqAek8aflD4w=="; + url = "https://registry.npmjs.org/@microsoft/load-themed-styles/-/load-themed-styles-1.10.203.tgz"; + sha512 = "9UV+1kIAEdV1a8JI58iOpDc7mmFdgTW5qI4pAyL4Drk468ZCPmg/tHPbgAM/Pg8EtkWyIJm5E6KVofo+meavQQ=="; }; }; "@mitmaro/errors-1.0.0" = { @@ -4090,13 +4099,13 @@ let sha512 = "b+MGNyP9/LXkapreJzNUzcvuzZslj/RGgdVVJ16P2wSlYatfLycPObImqVJSmNAdyeShvNeM/pl3sVZsObFueg=="; }; }; - "@netlify/build-18.4.1" = { + "@netlify/build-18.4.2" = { name = "_at_netlify_slash_build"; packageName = "@netlify/build"; - version = "18.4.1"; + version = "18.4.2"; src = fetchurl { - url = "https://registry.npmjs.org/@netlify/build/-/build-18.4.1.tgz"; - sha512 = "9gHamMyLwQJWdgnvPss+N1KS/GCuLgufEJwQ95p9Yb88MCI85zL42tgTTIpySE0mI2J+Spp1BiiXNeC8XT6+Uw=="; + url = "https://registry.npmjs.org/@netlify/build/-/build-18.4.2.tgz"; + sha512 = "q6eZ4D09agpeW6Y1DVyfXslRarAv/zR37vbFQC0kzZxdEkH6IjBKNT0eXDuG+OiL+BMi52M1MqlWI5lH8P/ELg=="; }; }; "@netlify/cache-utils-2.0.3" = { @@ -4315,22 +4324,13 @@ let sha512 = "F1YcF2kje0Ttj+t5Cn5d6ojGQcKj4i/GMWgQuoZGVjQ31ToNcDXIbBm5SBKIkMMpNejtR1wF+1a0Q+aBPWiZVQ=="; }; }; - "@netlify/zip-it-and-ship-it-4.17.0" = { + "@netlify/zip-it-and-ship-it-4.19.0" = { name = "_at_netlify_slash_zip-it-and-ship-it"; packageName = "@netlify/zip-it-and-ship-it"; - version = "4.17.0"; + version = "4.19.0"; src = fetchurl { - url = "https://registry.npmjs.org/@netlify/zip-it-and-ship-it/-/zip-it-and-ship-it-4.17.0.tgz"; - sha512 = "xcumwEFH7m/cw/XEcmv3OB8U94J5zWVsMhjROdfUdT+BE5QU5InEggYS6HnDoTOMgGpVM+mY1vgBQzdgaC+NZw=="; - }; - }; - "@netlify/zip-it-and-ship-it-4.18.0" = { - name = "_at_netlify_slash_zip-it-and-ship-it"; - packageName = "@netlify/zip-it-and-ship-it"; - version = "4.18.0"; - src = fetchurl { - url = "https://registry.npmjs.org/@netlify/zip-it-and-ship-it/-/zip-it-and-ship-it-4.18.0.tgz"; - sha512 = "x3x5Q1eeqdo7i47fuvZhhwDT0WyZ35izTXZ3xJEzsddyLMgrmYvV1+lc7QQCUd8u1bDOj3pbhI+7enU79wSvIQ=="; + url = "https://registry.npmjs.org/@netlify/zip-it-and-ship-it/-/zip-it-and-ship-it-4.19.0.tgz"; + sha512 = "kEK7NkbBda0pyfW+HogEWviYPNw9sVt4B+Btd2PIKsKxehA7X9xSwJLIqnllVXv3FEIl5uMQWQwPzqTK+o2H4Q=="; }; }; "@node-red/editor-api-2.0.5" = { @@ -5395,13 +5395,13 @@ let sha512 = "tU8fQs0D76ZKhJ2cWtnfQthWqiZgGBx0gH0+5D8JvaBEBaqA8foPPBt3Nonwr3ygyv5xrw2IzKWgIY86BlGs+w=="; }; }; - "@redocly/openapi-core-1.0.0-beta.54" = { + "@redocly/openapi-core-1.0.0-beta.55" = { name = "_at_redocly_slash_openapi-core"; packageName = "@redocly/openapi-core"; - version = "1.0.0-beta.54"; + version = "1.0.0-beta.55"; src = fetchurl { - url = "https://registry.npmjs.org/@redocly/openapi-core/-/openapi-core-1.0.0-beta.54.tgz"; - sha512 = "uYs0N1Trjkh7u8IMIuCU2VxCXhMyGWSZUkP/WNdTR1OgBUtvNdF9C32zoQV+hyCIH4gVu42ROHkjisy333ZX+w=="; + url = "https://registry.npmjs.org/@redocly/openapi-core/-/openapi-core-1.0.0-beta.55.tgz"; + sha512 = "n/uukofKgqLdF1RyaqIOz+QneonKudV77M8j8SnGxP+bg7ujn+lmjcLy96ECtLvom0+BTbbzSMQpJeEix6MGuQ=="; }; }; "@redocly/react-dropdown-aria-2.0.12" = { @@ -5962,6 +5962,15 @@ let sha512 = "kLfFGckSmyKe667UGPyWzR/H7/Trkt4fD8O/ktElOx1zWgmivpLm0Symb4RCfEmz9irWv+N6zIKRrfSNdytcPQ=="; }; }; + "@squoosh/lib-0.4.0" = { + name = "_at_squoosh_slash_lib"; + packageName = "@squoosh/lib"; + version = "0.4.0"; + src = fetchurl { + url = "https://registry.npmjs.org/@squoosh/lib/-/lib-0.4.0.tgz"; + sha512 = "O1LyugWLZjMI4JZeZMA5vzfhfPjfMZXH5/HmVkRagP8B70wH3uoR7tjxfGNdSavey357MwL8YJDxbGwBBdHp7Q=="; + }; + }; "@starptech/expression-parser-0.10.0" = { name = "_at_starptech_slash_expression-parser"; packageName = "@starptech/expression-parser"; @@ -7348,6 +7357,15 @@ let sha512 = "LSw8TZt12ZudbpHc6EkIyDM3nHVWKYrAvGy6EAJfNfjusbwnThqjqxUKKRwuV3iWYeW/LYMzNgaq3MaLffQ2xA=="; }; }; + "@types/node-16.7.0" = { + name = "_at_types_slash_node"; + packageName = "@types/node"; + version = "16.7.0"; + src = fetchurl { + url = "https://registry.npmjs.org/@types/node/-/node-16.7.0.tgz"; + sha512 = "e66BrnjWQ3BRBZ2+iA5e85fcH9GLNe4S0n1H0T3OalK2sXg5XWEFTO4xvmGrYQ3edy+q6fdOh5t0/HOY8OAqBg=="; + }; + }; "@types/node-6.14.13" = { name = "_at_types_slash_node"; packageName = "@types/node"; @@ -8815,6 +8833,15 @@ let sha512 = "WwB53ikYudh9pIorgxrkHKrQZcCqNM/Q/bDzZBffEaGUKGuHrRb3zZUT9Sh2qw9yogC7SsdRmQ1ER0pqvd3bfw=="; }; }; + "@xmldom/xmldom-0.7.2" = { + name = "_at_xmldom_slash_xmldom"; + packageName = "@xmldom/xmldom"; + version = "0.7.2"; + src = fetchurl { + url = "https://registry.npmjs.org/@xmldom/xmldom/-/xmldom-0.7.2.tgz"; + sha512 = "t/Zqo0ewes3iq6zGqEqJNUWI27Acr3jkmSUNp6E3nl0Z2XbtqAG5XYqPNLdYonILmhcxANsIidh69tHzjXtuRg=="; + }; + }; "@xstate/fsm-1.6.1" = { name = "_at_xstate_slash_fsm"; packageName = "@xstate/fsm"; @@ -8824,15 +8851,6 @@ let sha512 = "xYKDNuPR36/fUK+jmhM+oauBmbdUAfuJKnDjg3/7NbN+Pj03TX7e94LXnzkwGgAR+U/HWoMqM5UPTuGIYfIx9g=="; }; }; - "@xmldom/xmldom-0.7.1" = { - name = "_at_xmldom_slash_xmldom"; - packageName = "@xmldom/xmldom"; - version = "0.7.1"; - src = fetchurl { - url = "https://registry.npmjs.org/@xmldom/xmldom/-/xmldom-0.7.1.tgz"; - sha512 = "EOzJBMOjJ657nmlTt5RsyEwJrMTMu0aX15pI96GmpyFPj33a9J4mkcEk0KqYGplqInQ6JsPUxv/R25jR+I5ADA=="; - }; - }; "@xtuc/ieee754-1.2.0" = { name = "_at_xtuc_slash_ieee754"; packageName = "@xtuc/ieee754"; @@ -11632,6 +11650,15 @@ let sha512 = "Hdw8qdNiqdJ8LqT0iK0sVzkFbzg6fhnQqqfWhBDxcHZvU75+B+ayzTy8x+k5Ix0Y92XOhOUlx74ps+bA6BeYMQ=="; }; }; + "auto-changelog-1.16.4" = { + name = "auto-changelog"; + packageName = "auto-changelog"; + version = "1.16.4"; + src = fetchurl { + url = "https://registry.npmjs.org/auto-changelog/-/auto-changelog-1.16.4.tgz"; + sha512 = "h7diyELoq692AA4oqO50ULoYKIomUdzuQ+NW+eFPwIX0xzVbXEu9cIcgzZ3TYNVbpkGtcNKh51aRfAQNef7HVA=="; + }; + }; "autocast-0.0.4" = { name = "autocast"; packageName = "autocast"; @@ -11713,6 +11740,15 @@ let sha512 = "oRRjz68Yej/wz5JLc41zeG1m7QCvSj+Y2IOFqDflgwpDy4/M7Lp5HmCK2IK0d62FsKvG63b/9JL6+60ybGcsow=="; }; }; + "aws-sdk-2.973.0" = { + name = "aws-sdk"; + packageName = "aws-sdk"; + version = "2.973.0"; + src = fetchurl { + url = "https://registry.npmjs.org/aws-sdk/-/aws-sdk-2.973.0.tgz"; + sha512 = "IhVDIrI+7x+643S7HKDZ8bA8rTKfkCLSlxUZcP9W39PD5y04Hwamxou/kNTtXzdg1yyriq3d5tCVu6w5Z5QFDQ=="; + }; + }; "aws-sign2-0.6.0" = { name = "aws-sign2"; packageName = "aws-sign2"; @@ -13234,13 +13270,13 @@ let sha1 = "ffd2eabc141d36ed5c1817df7e992f91fd7fc65c"; }; }; - "bittorrent-tracker-9.17.4" = { + "bittorrent-tracker-9.18.0" = { name = "bittorrent-tracker"; packageName = "bittorrent-tracker"; - version = "9.17.4"; + version = "9.18.0"; src = fetchurl { - url = "https://registry.npmjs.org/bittorrent-tracker/-/bittorrent-tracker-9.17.4.tgz"; - sha512 = "ykhdVQHtLfn4DYSJUQD/zFAbP8YwnF6nGlj2SBnCY4xkW5bhwXPeFZUhryAtdITl0qNL/FpmFOamBZfxIwkbxg=="; + url = "https://registry.npmjs.org/bittorrent-tracker/-/bittorrent-tracker-9.18.0.tgz"; + sha512 = "bZhW94TOExkRhn9g67SLWjGfT6seSlT//+oG7+AFve0wQP6DMNSnu7ued6McsTMaL+XivNFCE9YVWPbQ4moTYA=="; }; }; "bl-1.2.3" = { @@ -13819,6 +13855,15 @@ let sha512 = "z0M+byMThzQmD9NILRniCUXYsYpjwnlO8N5uCFaCqIOpqRsJCrQL9NK3JsD67CN5a08nF5oIL2bD6loTdHOuKw=="; }; }; + "bplist-parser-0.3.0" = { + name = "bplist-parser"; + packageName = "bplist-parser"; + version = "0.3.0"; + src = fetchurl { + url = "https://registry.npmjs.org/bplist-parser/-/bplist-parser-0.3.0.tgz"; + sha512 = "zgmaRvT6AN1JpPPV+S0a1/FAtoxSreYDccZGIqEMSvZl9DMe70mJ7MFzpxa1X+gHVdkToE2haRUHHMiW1OdejA=="; + }; + }; "brace-expansion-1.1.11" = { name = "brace-expansion"; packageName = "brace-expansion"; @@ -14594,6 +14639,15 @@ let sha512 = "GtKwd/4etuk1hNeprXoESBO1RSeRYJMXKf+O0qHmWdUomLT8ysNEfX/4bZFXr3BK6eukpHiEnhY2uMtEHDM2ng=="; }; }; + "bull-3.29.0" = { + name = "bull"; + packageName = "bull"; + version = "3.29.0"; + src = fetchurl { + url = "https://registry.npmjs.org/bull/-/bull-3.29.0.tgz"; + sha512 = "ad9BvfPczwzkQ9wpM6jtAUNthyAGdHoJZVpY3dTp8jPYHETH9l4LdxJYjrKNBHjT4YUeqLzj/2r1L2MYre2ETg=="; + }; + }; "bunyan-1.5.1" = { name = "bunyan"; packageName = "bunyan"; @@ -16619,6 +16673,15 @@ let sha512 = "ZZjKqOeNgXtz40seJmSYbfAsIGJVzDIAn30w0QRmnyXHFrjEXhW/K8ZgRw5FtsezYFQEuZXSp93S0UkKJHuhKg=="; }; }; + "cluster-key-slot-1.1.0" = { + name = "cluster-key-slot"; + packageName = "cluster-key-slot"; + version = "1.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/cluster-key-slot/-/cluster-key-slot-1.1.0.tgz"; + sha512 = "2Nii8p3RwAPiFwsnZvukotvow2rIHM+yQ6ZcBXGHdniadkYGZYiGmkHJIbZPIV9nfv7m/U1IPMVVcAhoWFeklw=="; + }; + }; "cmd-shim-2.1.0" = { name = "cmd-shim"; packageName = "cmd-shim"; @@ -18006,6 +18069,15 @@ let sha512 = "jx44cconVqkCEEyLSKWwkvUXwO561jXMa3LPjTPsm5QR22PA0/mhe33FT4Xb5y74JDvt/Cq+5lm8S8rskLv9ZA=="; }; }; + "conventional-changelog-3.1.24" = { + name = "conventional-changelog"; + packageName = "conventional-changelog"; + version = "3.1.24"; + src = fetchurl { + url = "https://registry.npmjs.org/conventional-changelog/-/conventional-changelog-3.1.24.tgz"; + sha512 = "ed6k8PO00UVvhExYohroVPXcOJ/K1N0/drJHx/faTH37OIZthlecuLIRX/T6uOp682CAoVoFpu+sSEaeuH6Asg=="; + }; + }; "conventional-changelog-angular-5.0.12" = { name = "conventional-changelog-angular"; packageName = "conventional-changelog-angular"; @@ -18015,6 +18087,33 @@ let sha512 = "5GLsbnkR/7A89RyHLvvoExbiGbd9xKdKqDTrArnPbOqBqG/2wIosu0fHwpeIRI8Tl94MhVNBXcLJZl92ZQ5USw=="; }; }; + "conventional-changelog-atom-2.0.8" = { + name = "conventional-changelog-atom"; + packageName = "conventional-changelog-atom"; + version = "2.0.8"; + src = fetchurl { + url = "https://registry.npmjs.org/conventional-changelog-atom/-/conventional-changelog-atom-2.0.8.tgz"; + sha512 = "xo6v46icsFTK3bb7dY/8m2qvc8sZemRgdqLb/bjpBsH2UyOS8rKNTgcb5025Hri6IpANPApbXMg15QLb1LJpBw=="; + }; + }; + "conventional-changelog-codemirror-2.0.8" = { + name = "conventional-changelog-codemirror"; + packageName = "conventional-changelog-codemirror"; + version = "2.0.8"; + src = fetchurl { + url = "https://registry.npmjs.org/conventional-changelog-codemirror/-/conventional-changelog-codemirror-2.0.8.tgz"; + sha512 = "z5DAsn3uj1Vfp7po3gpt2Boc+Bdwmw2++ZHa5Ak9k0UKsYAO5mH1UBTN0qSCuJZREIhX6WU4E1p3IW2oRCNzQw=="; + }; + }; + "conventional-changelog-conventionalcommits-4.6.0" = { + name = "conventional-changelog-conventionalcommits"; + packageName = "conventional-changelog-conventionalcommits"; + version = "4.6.0"; + src = fetchurl { + url = "https://registry.npmjs.org/conventional-changelog-conventionalcommits/-/conventional-changelog-conventionalcommits-4.6.0.tgz"; + sha512 = "sj9tj3z5cnHaSJCYObA9nISf7eq/YjscLPoq6nmew4SiOjxqL2KRpK20fjnjVbpNDjJ2HR3MoVcWKXwbVvzS0A=="; + }; + }; "conventional-changelog-core-4.2.3" = { name = "conventional-changelog-core"; packageName = "conventional-changelog-core"; @@ -18024,6 +18123,51 @@ let sha512 = "MwnZjIoMRL3jtPH5GywVNqetGILC7g6RQFvdb8LRU/fA/338JbeWAku3PZ8yQ+mtVRViiISqJlb0sOz0htBZig=="; }; }; + "conventional-changelog-ember-2.0.9" = { + name = "conventional-changelog-ember"; + packageName = "conventional-changelog-ember"; + version = "2.0.9"; + src = fetchurl { + url = "https://registry.npmjs.org/conventional-changelog-ember/-/conventional-changelog-ember-2.0.9.tgz"; + sha512 = "ulzIReoZEvZCBDhcNYfDIsLTHzYHc7awh+eI44ZtV5cx6LVxLlVtEmcO+2/kGIHGtw+qVabJYjdI5cJOQgXh1A=="; + }; + }; + "conventional-changelog-eslint-3.0.9" = { + name = "conventional-changelog-eslint"; + packageName = "conventional-changelog-eslint"; + version = "3.0.9"; + src = fetchurl { + url = "https://registry.npmjs.org/conventional-changelog-eslint/-/conventional-changelog-eslint-3.0.9.tgz"; + sha512 = "6NpUCMgU8qmWmyAMSZO5NrRd7rTgErjrm4VASam2u5jrZS0n38V7Y9CzTtLT2qwz5xEChDR4BduoWIr8TfwvXA=="; + }; + }; + "conventional-changelog-express-2.0.6" = { + name = "conventional-changelog-express"; + packageName = "conventional-changelog-express"; + version = "2.0.6"; + src = fetchurl { + url = "https://registry.npmjs.org/conventional-changelog-express/-/conventional-changelog-express-2.0.6.tgz"; + sha512 = "SDez2f3iVJw6V563O3pRtNwXtQaSmEfTCaTBPCqn0oG0mfkq0rX4hHBq5P7De2MncoRixrALj3u3oQsNK+Q0pQ=="; + }; + }; + "conventional-changelog-jquery-3.0.11" = { + name = "conventional-changelog-jquery"; + packageName = "conventional-changelog-jquery"; + version = "3.0.11"; + src = fetchurl { + url = "https://registry.npmjs.org/conventional-changelog-jquery/-/conventional-changelog-jquery-3.0.11.tgz"; + sha512 = "x8AWz5/Td55F7+o/9LQ6cQIPwrCjfJQ5Zmfqi8thwUEKHstEn4kTIofXub7plf1xvFA2TqhZlq7fy5OmV6BOMw=="; + }; + }; + "conventional-changelog-jshint-2.0.9" = { + name = "conventional-changelog-jshint"; + packageName = "conventional-changelog-jshint"; + version = "2.0.9"; + src = fetchurl { + url = "https://registry.npmjs.org/conventional-changelog-jshint/-/conventional-changelog-jshint-2.0.9.tgz"; + sha512 = "wMLdaIzq6TNnMHMy31hql02OEQ8nCQfExw1SE0hYL5KvU+JCTuPaDO+7JiogGT2gJAxiUGATdtYYfh+nT+6riA=="; + }; + }; "conventional-changelog-preset-loader-2.3.4" = { name = "conventional-changelog-preset-loader"; packageName = "conventional-changelog-preset-loader"; @@ -18672,6 +18816,15 @@ let sha512 = "Gk2c4y6xKEO8FSAUTklqtfSr7oTq0CiPQeLBG5Fl0qoXpZyMcj1SG59YL+hqq04bu6/IuEA7lMkYDAplQNKkyg=="; }; }; + "cron-parser-2.18.0" = { + name = "cron-parser"; + packageName = "cron-parser"; + version = "2.18.0"; + src = fetchurl { + url = "https://registry.npmjs.org/cron-parser/-/cron-parser-2.18.0.tgz"; + sha512 = "s4odpheTyydAbTBQepsqd2rNWGa2iV3cyo8g7zbI2QQYGLVsfbhmwukayS1XHppe02Oy1fg7mg6xoaraVJeEcg=="; + }; + }; "cronosjs-1.7.1" = { name = "cronosjs"; packageName = "cronosjs"; @@ -22974,6 +23127,15 @@ let sha512 = "YcSRImHt6JZZ2sSuQ4Bzajtk98igQ0iKkksqlzZLzbh4p0OIyJRSvUbsgqfcR8txdfsoYCc4ym306t4p2kP/aw=="; }; }; + "electron-to-chromium-1.3.814" = { + name = "electron-to-chromium"; + packageName = "electron-to-chromium"; + version = "1.3.814"; + src = fetchurl { + url = "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.3.814.tgz"; + sha512 = "0mH03cyjh6OzMlmjauGg0TLd87ErIJqWiYxMcOLKf5w6p0YEOl7DJAj7BDlXEFmCguY5CQaKVOiMjAMODO2XDw=="; + }; + }; "electrum-client-git://github.com/janoside/electrum-client" = { name = "electrum-client"; packageName = "electrum-client"; @@ -24929,13 +25091,13 @@ let sha1 = "a793d3ac0cad4c6ab571e9968fbbab6cb2532929"; }; }; - "expo-pwa-0.0.92" = { + "expo-pwa-0.0.93" = { name = "expo-pwa"; packageName = "expo-pwa"; - version = "0.0.92"; + version = "0.0.93"; src = fetchurl { - url = "https://registry.npmjs.org/expo-pwa/-/expo-pwa-0.0.92.tgz"; - sha512 = "lY+m28IQkqpCPZQdAlMBUGgm5HbTEHVaMNt0QnMAeX/siN11rfhxBr2nFQRYfK0R5Kklh6yUTyAjz+vOd2bSKw=="; + url = "https://registry.npmjs.org/expo-pwa/-/expo-pwa-0.0.93.tgz"; + sha512 = "WxmDFqFDtHwyzqHb0p5XDXxm0bWNTkTiViWQl48tGGAhCNKcLOVTFIfMwBK0VGrq6yWopNCNEu3E+nldnJq15g=="; }; }; "express-2.5.11" = { @@ -32095,6 +32257,15 @@ let sha512 = "UnU0bS3+cMA2UvYrF5RXp/Hm7v/nYiA3F0GVCOeRmDiZmXAt/eO7KdqyRzewopvhBlev7F7t7GZzRRYY1XE3xg=="; }; }; + "ioredis-4.27.8" = { + name = "ioredis"; + packageName = "ioredis"; + version = "4.27.8"; + src = fetchurl { + url = "https://registry.npmjs.org/ioredis/-/ioredis-4.27.8.tgz"; + sha512 = "AcMEevap2wKxNcYEybZ/Qp+MR2HbNNUwGjG4sVCC3cAJ/zR9HXKAkolXOuR6YcOGPf7DHx9mWb/JKtAGujyPow=="; + }; + }; "iota-array-1.0.0" = { name = "iota-array"; packageName = "iota-array"; @@ -32914,6 +33085,15 @@ let sha512 = "VTPuvvGQtxvCeghwspQu1rBgjYUT6FGxPlvFKbYuFtgc4ADsX3U5ihZOYN0qyU6u+d4X9xXb0IT5O6QpXKt87A=="; }; }; + "is-nan-1.3.2" = { + name = "is-nan"; + packageName = "is-nan"; + version = "1.3.2"; + src = fetchurl { + url = "https://registry.npmjs.org/is-nan/-/is-nan-1.3.2.tgz"; + sha512 = "E+zBKpQ2t6MEo1VsonYmluk9NxGrbzpeeLC2xIViuO2EjU2xsXsBPwTr3Ykv9l08UYEVEdWeRZNouaZqF6RN0w=="; + }; + }; "is-natural-number-4.0.1" = { name = "is-natural-number"; packageName = "is-natural-number"; @@ -35624,6 +35804,15 @@ let sha512 = "eTIzlVOSUR+JxdDFepEYcBMtZ9Qqdef+rnzWdRZuMbOywu5tO2w2N7rqjoANZ5k9vywhL6Br1VRjUIgTQx4E8w=="; }; }; + "kleur-4.1.4" = { + name = "kleur"; + packageName = "kleur"; + version = "4.1.4"; + src = fetchurl { + url = "https://registry.npmjs.org/kleur/-/kleur-4.1.4.tgz"; + sha512 = "8QADVssbrFjivHWQU7KkMgptGTl6WAcSdlbBPY4uNF+mWr6DGcKrvY2w4FQJoXch7+fKMjj0dRrL75vk3k23OA=="; + }; + }; "knockout-3.5.1" = { name = "knockout"; packageName = "knockout"; @@ -37964,6 +38153,15 @@ let sha1 = "a3a17bbf62eeb6240f491846e97c1c4e2a5e1e21"; }; }; + "lodash.uniqby-4.7.0" = { + name = "lodash.uniqby"; + packageName = "lodash.uniqby"; + version = "4.7.0"; + src = fetchurl { + url = "https://registry.npmjs.org/lodash.uniqby/-/lodash.uniqby-4.7.0.tgz"; + sha1 = "d99c07a669e9e6d24e1362dfe266c67616af1302"; + }; + }; "lodash.upperfirst-4.3.1" = { name = "lodash.upperfirst"; packageName = "lodash.upperfirst"; @@ -55572,6 +55770,15 @@ let sha512 = "FkMq+MQc5hzYgM86nLuHI98Acwi3p4wX+a5BO9Hhw4JdK4L7WueIiZ4tXEobImPqBz2sVcV0+Mu3GRB30IGang=="; }; }; + "smart-buffer-1.1.15" = { + name = "smart-buffer"; + packageName = "smart-buffer"; + version = "1.1.15"; + src = fetchurl { + url = "https://registry.npmjs.org/smart-buffer/-/smart-buffer-1.1.15.tgz"; + sha1 = "7f114b5b65fab3e2a35aa775bb12f0d1c649bf16"; + }; + }; "smart-buffer-4.2.0" = { name = "smart-buffer"; packageName = "smart-buffer"; @@ -56076,6 +56283,15 @@ let sha512 = "VnVAb663fosipI/m6pqRXakEOw7nvd7TUgdr3PlR/8V2I95QIdwT8L4nMxhyU8SmDBHYXU1TOElaKOmKLfYzeQ=="; }; }; + "socks-1.1.10" = { + name = "socks"; + packageName = "socks"; + version = "1.1.10"; + src = fetchurl { + url = "https://registry.npmjs.org/socks/-/socks-1.1.10.tgz"; + sha1 = "5b8b7fc7c8f341c53ed056e929b7bf4de8ba7b5a"; + }; + }; "socks-2.6.1" = { name = "socks"; packageName = "socks"; @@ -57399,6 +57615,15 @@ let sha1 = "51f9c6a08c146473fcd021af551c9f32ed5c7b9d"; }; }; + "standard-as-callback-2.1.0" = { + name = "standard-as-callback"; + packageName = "standard-as-callback"; + version = "2.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/standard-as-callback/-/standard-as-callback-2.1.0.tgz"; + sha512 = "qoRRSyROncaz1z0mvYqIE4lCd9p2R90i6GxW3uZv5ucSu8tU7B5HXUP1gG8pVZsYNVaXjk8ClXHPttLyxAL48A=="; + }; + }; "standard-error-1.1.0" = { name = "standard-error"; packageName = "standard-error"; @@ -59641,6 +59866,15 @@ let sha512 = "HIeWmj77uOOHb0QX7siN3OtwV3CTntquin6TNVg6SHOqCP3hYKmox90eeFOGaY1MqJ9WYDDjkyZrW6qS5AWpbw=="; }; }; + "tempfile-3.0.0" = { + name = "tempfile"; + packageName = "tempfile"; + version = "3.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/tempfile/-/tempfile-3.0.0.tgz"; + sha512 = "uNFCg478XovRi85iD42egu+eSFUmmka750Jy7L5tfHI5hQKKtbPnxaSaXAbBqCDYrw3wx4tXjKwci4/QmsZJxw=="; + }; + }; "tempy-0.1.0" = { name = "tempy"; packageName = "tempy"; @@ -65276,6 +65510,15 @@ let sha512 = "rpJyN222KWIvHJ/F53XSZv0Zl/accqHR8et1kpaMTD/fLCRxtV8iX8czMzY7sVZupTI3zcUTg8eycS2kNF9l6w=="; }; }; + "wasm-feature-detect-1.2.11" = { + name = "wasm-feature-detect"; + packageName = "wasm-feature-detect"; + version = "1.2.11"; + src = fetchurl { + url = "https://registry.npmjs.org/wasm-feature-detect/-/wasm-feature-detect-1.2.11.tgz"; + sha512 = "HUqwaodrQGaZgz1lZaNioIkog9tkeEJjrM3eq4aUL04whXOVDRc/o2EGb/8kV0QX411iAYWEqq7fMBmJ6dKS6w=="; + }; + }; "watch-1.0.2" = { name = "watch"; packageName = "watch"; @@ -65393,6 +65636,15 @@ let sha512 = "tB0F+ccobsfw5jTWBinWJKyd/YdCdRbKj+CFSnsJeEgFYysOULvWFYyeCxn9KuQvG/3UF1t3cTAcJzBec5LCWA=="; }; }; + "web-streams-polyfill-3.1.0" = { + name = "web-streams-polyfill"; + packageName = "web-streams-polyfill"; + version = "3.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/web-streams-polyfill/-/web-streams-polyfill-3.1.0.tgz"; + sha512 = "wO9r1YnYe7kFBLHyyVEhV1H8VRWoNiNnuP+v/HUUmSTaRF8F93Kmd3JMrETx0f11GXxRek6OcL2QtjFIdc5WYw=="; + }; + }; "web-tree-sitter-0.17.1" = { name = "web-tree-sitter"; packageName = "web-tree-sitter"; @@ -65726,13 +65978,13 @@ let sha512 = "OqedPIGOfsDlo31UNwYbCFMSaO9m9G/0faIHj5/dZFDMFqPTcx6UwqyOy3COEaEOg/9VsGIpdqn62W5KhoKSpg=="; }; }; - "webtorrent-1.5.1" = { + "webtorrent-1.5.3" = { name = "webtorrent"; packageName = "webtorrent"; - version = "1.5.1"; + version = "1.5.3"; src = fetchurl { - url = "https://registry.npmjs.org/webtorrent/-/webtorrent-1.5.1.tgz"; - sha512 = "9e3zVkrOgxlYi512r3G0a/cU/KXahJ7hbnv5NL+DQcO6iMUX1HOWgP4VyyLSqYF59Jv3ruiCCCF6uelr/sWD4A=="; + url = "https://registry.npmjs.org/webtorrent/-/webtorrent-1.5.3.tgz"; + sha512 = "iWPFQgfVPNzpl2d3Gf2H4oycO7d15sKIpx/6lnl27WshyHXgcEPAg+RqbVL0BdXEfbiKHSYM3XplCwYiaOMUBw=="; }; }; "well-known-symbols-2.0.0" = { @@ -66653,13 +66905,13 @@ let sha512 = "N1XQngeqMBoj9wM4ZFadVV2MymImeiFfYD+fJrNlcVcOHsJFFQe7n3b+aBoTPwARuq2HQxukfzVpQmAk1gN4sQ=="; }; }; - "xdl-59.0.53" = { + "xdl-59.0.54" = { name = "xdl"; packageName = "xdl"; - version = "59.0.53"; + version = "59.0.54"; src = fetchurl { - url = "https://registry.npmjs.org/xdl/-/xdl-59.0.53.tgz"; - sha512 = "U98lIdfMfwwUTmXwsF5t9Pu/VJSe+Bxb/1v0HWq6UK1VoA13EE2cE5JRBGFmu0+mkrust/Mp6AN289VKpguilw=="; + url = "https://registry.npmjs.org/xdl/-/xdl-59.0.54.tgz"; + sha512 = "ucHQcVgjfzZwQqv1LavCWeubsLPtfmoTus9WpdX3/MzCvrMOt1EP7I8GQGmSOoidhpoFnV4Zqly5sMKppH5qlg=="; }; }; "xenvar-0.5.1" = { @@ -69415,6 +69667,63 @@ in bypassCache = true; reconstructLock = true; }; + "@squoosh/cli" = nodeEnv.buildNodePackage { + name = "_at_squoosh_slash_cli"; + packageName = "@squoosh/cli"; + version = "0.7.2"; + src = fetchurl { + url = "https://registry.npmjs.org/@squoosh/cli/-/cli-0.7.2.tgz"; + sha512 = "uMnUWMx4S8UApO/EfPyRyvUmw+0jI9wwAfdHfGjvVg4DAIvEgsA+VWK2KOBnJiChvVd768K27g09ESzptyX93w=="; + }; + dependencies = [ + sources."@squoosh/lib-0.4.0" + sources."ansi-regex-5.0.0" + sources."ansi-styles-4.3.0" + sources."base64-js-1.5.1" + sources."bl-4.1.0" + sources."buffer-5.7.1" + sources."chalk-4.1.2" + sources."cli-cursor-3.1.0" + sources."cli-spinners-2.6.0" + sources."clone-1.0.4" + sources."color-convert-2.0.1" + sources."color-name-1.1.4" + sources."commander-7.2.0" + sources."defaults-1.0.3" + sources."has-flag-4.0.0" + sources."ieee754-1.2.1" + sources."inherits-2.0.4" + sources."is-interactive-1.0.0" + sources."is-unicode-supported-0.1.0" + sources."json5-2.2.0" + sources."kleur-4.1.4" + sources."log-symbols-4.1.0" + sources."mimic-fn-2.1.0" + sources."minimist-1.2.5" + sources."onetime-5.1.2" + sources."ora-5.4.1" + sources."readable-stream-3.6.0" + sources."restore-cursor-3.1.0" + sources."safe-buffer-5.2.1" + sources."signal-exit-3.0.3" + sources."string_decoder-1.3.0" + sources."strip-ansi-6.0.0" + sources."supports-color-7.2.0" + sources."util-deprecate-1.0.2" + sources."wasm-feature-detect-1.2.11" + sources."wcwidth-1.0.1" + sources."web-streams-polyfill-3.1.0" + ]; + buildInputs = globalBuildInputs; + meta = { + description = "A CLI for Squoosh"; + homepage = "https://github.com/GoogleChromeLabs/squoosh"; + license = "Apache-2.0"; + }; + production = true; + bypassCache = true; + reconstructLock = true; + }; "@vue/cli" = nodeEnv.buildNodePackage { name = "_at_vue_slash_cli"; packageName = "@vue/cli"; @@ -76894,10 +77203,10 @@ in coc-tsserver = nodeEnv.buildNodePackage { name = "coc-tsserver"; packageName = "coc-tsserver"; - version = "1.8.5"; + version = "1.8.6"; src = fetchurl { - url = "https://registry.npmjs.org/coc-tsserver/-/coc-tsserver-1.8.5.tgz"; - sha512 = "wFjtKm9KeXOpI/po5unbnju1H6/pm1wT3fHHfNo3LYF5PVKgz39Suvv09XCEAUSBC5PPu8wXNZLoBeVRMI4yuQ=="; + url = "https://registry.npmjs.org/coc-tsserver/-/coc-tsserver-1.8.6.tgz"; + sha512 = "RTet29nZNYrOWEuquBOAv3yFtWyHPE7xGbsHjRdNbTP6g9PF+2nV2TnDO+c/T5HAk/1J0lKKZBu6hZTnEJ2f4w=="; }; dependencies = [ sources."typescript-4.3.5" @@ -77538,6 +77847,227 @@ in bypassCache = true; reconstructLock = true; }; + conventional-changelog-cli = nodeEnv.buildNodePackage { + name = "conventional-changelog-cli"; + packageName = "conventional-changelog-cli"; + version = "2.1.1"; + src = fetchurl { + url = "https://registry.npmjs.org/conventional-changelog-cli/-/conventional-changelog-cli-2.1.1.tgz"; + sha512 = "xMGQdKJ+4XFDDgfX5aK7UNFduvJMbvF5BB+g0OdVhA3rYdYyhctrIE2Al+WYdZeKTdg9YzMWF2iFPT8MupIwng=="; + }; + dependencies = [ + sources."@babel/code-frame-7.14.5" + sources."@babel/helper-validator-identifier-7.14.9" + sources."@babel/highlight-7.14.5" + sources."@hutson/parse-repository-url-3.0.2" + sources."@types/minimist-1.2.2" + sources."@types/normalize-package-data-2.4.1" + sources."JSONStream-1.3.5" + sources."add-stream-1.0.0" + sources."ansi-styles-3.2.1" + sources."array-ify-1.0.0" + sources."arrify-1.0.1" + sources."camelcase-5.3.1" + sources."camelcase-keys-6.2.2" + sources."chalk-2.4.2" + sources."color-convert-1.9.3" + sources."color-name-1.1.3" + sources."compare-func-2.0.0" + sources."conventional-changelog-3.1.24" + sources."conventional-changelog-angular-5.0.12" + sources."conventional-changelog-atom-2.0.8" + sources."conventional-changelog-codemirror-2.0.8" + sources."conventional-changelog-conventionalcommits-4.6.0" + sources."conventional-changelog-core-4.2.3" + sources."conventional-changelog-ember-2.0.9" + sources."conventional-changelog-eslint-3.0.9" + sources."conventional-changelog-express-2.0.6" + sources."conventional-changelog-jquery-3.0.11" + sources."conventional-changelog-jshint-2.0.9" + sources."conventional-changelog-preset-loader-2.3.4" + sources."conventional-changelog-writer-5.0.0" + sources."conventional-commits-filter-2.0.7" + sources."conventional-commits-parser-3.2.1" + sources."core-util-is-1.0.2" + sources."dargs-7.0.0" + sources."dateformat-3.0.3" + sources."decamelize-1.2.0" + (sources."decamelize-keys-1.1.0" // { + dependencies = [ + sources."map-obj-1.0.1" + ]; + }) + sources."dot-prop-5.3.0" + sources."error-ex-1.3.2" + sources."escape-string-regexp-1.0.5" + sources."find-up-4.1.0" + sources."function-bind-1.1.1" + (sources."get-pkg-repo-4.1.2" // { + dependencies = [ + sources."meow-7.1.1" + (sources."normalize-package-data-2.5.0" // { + dependencies = [ + sources."hosted-git-info-2.8.9" + ]; + }) + (sources."read-pkg-5.2.0" // { + dependencies = [ + sources."type-fest-0.6.0" + ]; + }) + (sources."read-pkg-up-7.0.1" // { + dependencies = [ + sources."type-fest-0.8.1" + ]; + }) + sources."readable-stream-2.3.7" + sources."safe-buffer-5.1.2" + sources."semver-5.7.1" + sources."string_decoder-1.1.1" + sources."through2-2.0.5" + ]; + }) + sources."git-raw-commits-2.0.10" + sources."git-remote-origin-url-2.0.0" + sources."git-semver-tags-4.1.1" + sources."gitconfiglocal-1.0.0" + sources."graceful-fs-4.2.8" + sources."handlebars-4.7.7" + sources."hard-rejection-2.1.0" + sources."has-1.0.3" + sources."has-flag-3.0.0" + sources."hosted-git-info-4.0.2" + sources."indent-string-4.0.0" + sources."inherits-2.0.4" + sources."ini-1.3.8" + sources."is-arrayish-0.2.1" + sources."is-core-module-2.6.0" + sources."is-obj-2.0.0" + sources."is-plain-obj-1.1.0" + sources."is-text-path-1.0.1" + sources."isarray-1.0.0" + sources."js-tokens-4.0.0" + sources."json-parse-better-errors-1.0.2" + sources."json-parse-even-better-errors-2.3.1" + sources."json-stringify-safe-5.0.1" + sources."jsonparse-1.3.1" + sources."kind-of-6.0.3" + sources."lines-and-columns-1.1.6" + (sources."load-json-file-4.0.0" // { + dependencies = [ + sources."parse-json-4.0.0" + sources."pify-3.0.0" + ]; + }) + sources."locate-path-5.0.0" + sources."lodash-4.17.21" + sources."lodash.ismatch-4.4.0" + sources."lru-cache-6.0.0" + sources."map-obj-4.2.1" + (sources."meow-8.1.2" // { + dependencies = [ + sources."hosted-git-info-2.8.9" + (sources."read-pkg-5.2.0" // { + dependencies = [ + sources."normalize-package-data-2.5.0" + sources."type-fest-0.6.0" + ]; + }) + (sources."read-pkg-up-7.0.1" // { + dependencies = [ + sources."type-fest-0.8.1" + ]; + }) + sources."semver-5.7.1" + sources."type-fest-0.18.1" + sources."yargs-parser-20.2.9" + ]; + }) + sources."min-indent-1.0.1" + sources."minimist-1.2.5" + sources."minimist-options-4.1.0" + sources."modify-values-1.0.1" + sources."neo-async-2.6.2" + (sources."normalize-package-data-3.0.3" // { + dependencies = [ + sources."semver-7.3.5" + ]; + }) + sources."p-limit-2.3.0" + sources."p-locate-4.1.0" + sources."p-try-2.2.0" + sources."parse-json-5.2.0" + sources."path-exists-4.0.0" + sources."path-parse-1.0.7" + (sources."path-type-3.0.0" // { + dependencies = [ + sources."pify-3.0.0" + ]; + }) + sources."pify-2.3.0" + sources."process-nextick-args-2.0.1" + sources."q-1.5.1" + sources."quick-lru-4.0.1" + (sources."read-pkg-3.0.0" // { + dependencies = [ + sources."hosted-git-info-2.8.9" + sources."normalize-package-data-2.5.0" + sources."semver-5.7.1" + ]; + }) + (sources."read-pkg-up-3.0.0" // { + dependencies = [ + sources."find-up-2.1.0" + sources."locate-path-2.0.0" + sources."p-limit-1.3.0" + sources."p-locate-2.0.0" + sources."p-try-1.0.0" + sources."path-exists-3.0.0" + ]; + }) + sources."readable-stream-3.6.0" + sources."redent-3.0.0" + sources."resolve-1.20.0" + sources."safe-buffer-5.2.1" + sources."semver-6.3.0" + sources."source-map-0.6.1" + sources."spdx-correct-3.1.1" + sources."spdx-exceptions-2.3.0" + sources."spdx-expression-parse-3.0.1" + sources."spdx-license-ids-3.0.10" + sources."split-1.0.1" + sources."split2-3.2.2" + sources."string_decoder-1.3.0" + sources."strip-bom-3.0.0" + sources."strip-indent-3.0.0" + sources."supports-color-5.5.0" + sources."temp-dir-2.0.0" + sources."tempfile-3.0.0" + sources."text-extensions-1.9.0" + sources."through-2.3.8" + sources."through2-4.0.2" + sources."trim-newlines-3.0.1" + sources."trim-off-newlines-1.0.1" + sources."type-fest-0.13.1" + sources."uglify-js-3.14.1" + sources."util-deprecate-1.0.2" + sources."uuid-3.4.0" + sources."validate-npm-package-license-3.0.4" + sources."wordwrap-1.0.0" + sources."xtend-4.0.2" + sources."yallist-4.0.0" + sources."yargs-parser-18.1.3" + ]; + buildInputs = globalBuildInputs; + meta = { + description = "Generate a changelog from git metadata"; + homepage = "https://github.com/conventional-changelog/conventional-changelog/tree/master/packages/conventional-changelog-cli#readme"; + license = "MIT"; + }; + production = true; + bypassCache = true; + reconstructLock = true; + }; cordova = nodeEnv.buildNodePackage { name = "cordova"; packageName = "cordova"; @@ -81556,7 +82086,7 @@ in sources."normalize-path-2.1.1" ]; }) - sources."@microsoft/load-themed-styles-1.10.202" + sources."@microsoft/load-themed-styles-1.10.203" sources."@nodelib/fs.scandir-2.1.5" sources."@nodelib/fs.stat-2.0.5" sources."@nodelib/fs.walk-1.2.8" @@ -83570,10 +84100,10 @@ in expo-cli = nodeEnv.buildNodePackage { name = "expo-cli"; packageName = "expo-cli"; - version = "4.10.0"; + version = "4.10.1"; src = fetchurl { - url = "https://registry.npmjs.org/expo-cli/-/expo-cli-4.10.0.tgz"; - sha512 = "NHQQBPygck2bQUo5nvCB52BHa+JsjxSlXvdQ39lvonJwvbOdn7IACxlqrkmaxvjfopCLBiBADj3yk1uSYh2cnQ=="; + url = "https://registry.npmjs.org/expo-cli/-/expo-cli-4.10.1.tgz"; + sha512 = "jo0wFTBIal3AtClvjYRnLbipzwnjhjC2FrErZFigRzYCd7jhh2BAvOapiaPIgcSxWvL+BKKBbNFKLRB7O4UabA=="; }; dependencies = [ sources."@babel/code-frame-7.10.4" @@ -83684,16 +84214,17 @@ in ]; }) sources."@babel/types-7.15.0" + sources."@dabh/diagnostics-2.0.2" sources."@expo/apple-utils-0.0.0-alpha.20" sources."@expo/bunyan-4.0.0" - sources."@expo/config-5.0.7" - (sources."@expo/config-plugins-3.0.7" // { + sources."@expo/config-5.0.8" + (sources."@expo/config-plugins-3.0.8" // { dependencies = [ sources."semver-7.3.5" ]; }) sources."@expo/config-types-42.0.0" - (sources."@expo/dev-server-0.1.82" // { + (sources."@expo/dev-server-0.1.83" // { dependencies = [ sources."body-parser-1.19.0" sources."bytes-3.1.0" @@ -83710,7 +84241,7 @@ in sources."temp-dir-2.0.0" ]; }) - sources."@expo/dev-tools-0.13.113" + sources."@expo/dev-tools-0.13.114" (sources."@expo/devcert-1.0.0" // { dependencies = [ sources."debug-3.2.7" @@ -83725,9 +84256,9 @@ in ]; }) sources."@expo/json-file-8.2.33" - sources."@expo/metro-config-0.1.82" + sources."@expo/metro-config-0.1.83" sources."@expo/osascript-2.0.30" - (sources."@expo/package-manager-0.0.46" // { + (sources."@expo/package-manager-0.0.47" // { dependencies = [ sources."npm-package-arg-7.0.0" sources."rimraf-3.0.2" @@ -83740,8 +84271,13 @@ in sources."xmldom-0.5.0" ]; }) - sources."@expo/prebuild-config-2.0.7" + sources."@expo/prebuild-config-2.0.8" sources."@expo/results-1.0.0" + (sources."@expo/rudder-sdk-node-1.0.7" // { + dependencies = [ + sources."uuid-3.4.0" + ]; + }) (sources."@expo/schemer-1.3.31" // { dependencies = [ sources."ajv-5.5.2" @@ -83751,7 +84287,7 @@ in }) sources."@expo/sdk-runtime-versions-1.0.0" sources."@expo/spawn-async-1.5.0" - (sources."@expo/webpack-config-0.14.0" // { + (sources."@expo/webpack-config-0.14.1" // { dependencies = [ (sources."@babel/core-7.9.0" // { dependencies = [ @@ -83936,12 +84472,18 @@ in }) sources."assert-plus-1.0.0" sources."assign-symbols-1.0.0" - sources."async-1.5.2" + sources."async-3.2.1" sources."async-each-1.0.3" sources."async-limiter-1.0.1" sources."asynckit-0.4.0" sources."at-least-node-1.0.0" sources."atob-2.1.2" + (sources."auto-changelog-1.16.4" // { + dependencies = [ + sources."commander-5.1.0" + sources."semver-6.3.0" + ]; + }) sources."aws-sign2-0.7.0" sources."aws4-1.11.0" sources."axios-0.21.1" @@ -84019,6 +84561,12 @@ in sources."buffer-xor-1.0.3" sources."builtin-status-codes-3.0.0" sources."builtins-1.0.3" + (sources."bull-3.29.0" // { + dependencies = [ + sources."get-port-5.1.1" + sources."p-timeout-3.2.0" + ]; + }) sources."bytes-3.0.0" (sources."cacache-15.2.0" // { dependencies = [ @@ -84106,6 +84654,7 @@ in }) sources."clone-1.0.4" sources."clone-response-1.0.2" + sources."cluster-key-slot-1.1.0" sources."co-4.6.0" (sources."coa-2.0.2" // { dependencies = [ @@ -84114,12 +84663,13 @@ in }) sources."code-point-at-1.1.0" sources."collection-visit-1.0.0" - sources."color-3.2.1" + sources."color-3.0.0" sources."color-convert-1.9.3" sources."color-name-1.1.3" sources."color-string-1.6.0" sources."colorette-1.3.0" sources."colors-1.4.0" + sources."colorspace-1.1.2" sources."combined-stream-1.0.8" sources."command-exists-1.2.9" sources."commander-2.17.1" @@ -84172,8 +84722,10 @@ in }) sources."pkg-dir-4.2.0" sources."semver-6.3.0" + sources."serialize-javascript-4.0.0" ]; }) + sources."core-js-3.16.2" (sources."core-js-compat-3.16.2" // { dependencies = [ sources."browserslist-4.16.8" @@ -84189,6 +84741,7 @@ in }) sources."create-hash-1.2.0" sources."create-hmac-1.1.7" + sources."cron-parser-2.18.0" (sources."cross-spawn-6.0.5" // { dependencies = [ sources."semver-5.7.1" @@ -84237,6 +84790,7 @@ in sources."dashdash-1.14.1" sources."dateformat-3.0.3" sources."debug-4.3.2" + sources."debuglog-1.0.1" sources."decache-4.4.0" sources."decamelize-1.2.0" sources."decode-uri-component-0.2.0" @@ -84261,6 +84815,7 @@ in }) sources."delayed-stream-1.0.0" sources."delegates-1.0.0" + sources."denque-1.5.1" sources."depd-1.1.2" sources."deprecated-decorator-0.1.6" sources."des.js-1.0.1" @@ -84315,6 +84870,7 @@ in }) sources."emoji-regex-7.0.3" sources."emojis-list-3.0.0" + sources."enabled-2.0.0" sources."encodeurl-1.0.2" (sources."encoding-0.1.13" // { dependencies = [ @@ -84334,7 +84890,11 @@ in sources."eol-0.9.1" sources."err-code-2.0.3" sources."errno-0.1.8" - sources."error-ex-1.3.2" + (sources."error-ex-1.3.2" // { + dependencies = [ + sources."is-arrayish-0.2.1" + ]; + }) sources."errorhandler-1.5.1" sources."es-abstract-1.18.5" sources."es-to-primitive-1.2.1" @@ -84381,7 +84941,7 @@ in sources."ms-2.0.0" ]; }) - (sources."expo-pwa-0.0.92" // { + (sources."expo-pwa-0.0.93" // { dependencies = [ sources."commander-2.20.0" ]; @@ -84408,8 +84968,10 @@ in sources."fast-deep-equal-3.1.3" sources."fast-glob-3.2.7" sources."fast-json-stable-stringify-2.1.0" + sources."fast-safe-stringify-2.0.8" sources."fastq-1.12.0" sources."faye-websocket-0.10.0" + sources."fecha-4.2.1" sources."figgy-pudding-3.5.2" sources."figures-3.2.0" sources."file-loader-6.0.0" @@ -84426,7 +84988,9 @@ in sources."find-up-5.0.0" sources."find-yarn-workspace-root-2.0.0" sources."flush-write-stream-1.1.1" + sources."fn.name-1.1.0" sources."follow-redirects-1.14.2" + sources."for-each-0.3.3" sources."for-in-1.0.2" sources."forever-agent-0.6.1" (sources."fork-ts-checker-webpack-plugin-4.1.6" // { @@ -84500,6 +85064,11 @@ in }) sources."gzip-size-5.1.1" sources."handle-thing-2.0.1" + (sources."handlebars-4.7.7" // { + dependencies = [ + sources."source-map-0.6.1" + ]; + }) sources."har-schema-2.0.0" sources."har-validator-5.1.5" sources."has-1.0.3" @@ -84519,7 +85088,11 @@ in sources."kind-of-4.0.0" ]; }) - sources."hasbin-1.2.3" + (sources."hasbin-1.2.3" // { + dependencies = [ + sources."async-1.5.2" + ]; + }) (sources."hash-base-3.1.0" // { dependencies = [ sources."readable-stream-3.6.0" @@ -84545,6 +85118,7 @@ in (sources."html-webpack-plugin-4.3.0" // { dependencies = [ sources."loader-utils-1.4.0" + sources."util.promisify-1.0.0" ]; }) sources."htmlparser2-4.1.0" @@ -84600,13 +85174,18 @@ in sources."internal-ip-4.3.0" sources."internal-slot-1.0.3" sources."invariant-2.2.4" + (sources."ioredis-4.27.8" // { + dependencies = [ + sources."p-map-2.1.0" + ]; + }) sources."ip-1.1.5" sources."ip-regex-2.1.0" sources."ipaddr.js-1.9.1" sources."is-absolute-url-2.1.0" sources."is-accessor-descriptor-1.0.0" sources."is-arguments-1.1.1" - sources."is-arrayish-0.2.1" + sources."is-arrayish-0.3.2" sources."is-bigint-1.0.4" sources."is-binary-path-2.1.0" sources."is-boolean-object-1.1.2" @@ -84630,6 +85209,7 @@ in ]; }) sources."is-lambda-1.0.1" + sources."is-nan-1.3.2" sources."is-negative-zero-2.0.1" sources."is-number-7.0.0" sources."is-number-object-1.0.6" @@ -84726,6 +85306,7 @@ in sources."killable-1.0.1" sources."kind-of-6.0.3" sources."kleur-3.0.3" + sources."kuler-2.0.0" sources."last-call-webpack-plugin-3.0.0" sources."latest-version-5.1.0" sources."leven-3.1.0" @@ -84740,15 +85321,20 @@ in sources."lodash-4.17.21" sources."lodash.assign-4.2.0" sources."lodash.debounce-4.0.8" + sources."lodash.defaults-4.2.0" + sources."lodash.flatten-4.4.0" + sources."lodash.isarguments-3.1.0" sources."lodash.isobject-3.0.2" sources."lodash.isstring-4.0.1" sources."lodash.memoize-4.1.2" sources."lodash.uniq-4.5.0" + sources."lodash.uniqby-4.7.0" (sources."log-symbols-2.2.0" // { dependencies = [ sources."chalk-2.4.2" ]; }) + sources."logform-2.2.0" sources."loglevel-1.7.1" sources."loose-envify-1.4.0" (sources."lower-case-2.0.2" // { @@ -84856,6 +85442,8 @@ in ]; }) sources."mkdirp-0.5.5" + sources."moment-2.29.1" + sources."moment-timezone-0.5.33" (sources."move-concurrently-1.0.1" // { dependencies = [ sources."rimraf-2.7.1" @@ -84961,6 +85549,7 @@ in sources."on-finished-2.3.0" sources."on-headers-1.0.2" sources."once-1.4.0" + sources."one-time-1.0.0" sources."onetime-2.0.1" sources."open-7.4.2" (sources."opn-5.5.0" // { @@ -85035,6 +85624,7 @@ in ]; }) sources."parse-asn1-5.1.6" + sources."parse-github-url-1.0.2" sources."parse-json-4.0.0" sources."parse-png-2.1.0" sources."parse-srcset-1.0.2" @@ -85233,6 +85823,7 @@ in sources."progress-2.0.3" sources."promise-inflight-1.0.1" sources."promise-retry-2.0.1" + sources."promise.prototype.finally-3.1.2" sources."prompts-2.4.1" sources."proxy-addr-2.0.7" sources."prr-1.0.1" @@ -85296,6 +85887,9 @@ in sources."readable-stream-2.3.7" sources."readdirp-3.6.0" sources."recursive-readdir-2.2.2" + sources."redis-commands-1.7.0" + sources."redis-errors-1.2.0" + sources."redis-parser-3.0.0" sources."regenerate-1.4.2" sources."regenerate-unicode-properties-8.2.0" sources."regenerator-runtime-0.13.9" @@ -85384,7 +85978,7 @@ in sources."type-fest-0.12.0" ]; }) - sources."serialize-javascript-4.0.0" + sources."serialize-javascript-5.0.1" (sources."serve-index-1.9.1" // { dependencies = [ sources."debug-2.6.9" @@ -85407,11 +86001,7 @@ in sources."side-channel-1.0.4" sources."signal-exit-3.0.3" sources."simple-plist-1.1.1" - (sources."simple-swizzle-0.2.2" // { - dependencies = [ - sources."is-arrayish-0.3.2" - ]; - }) + sources."simple-swizzle-0.2.2" sources."sisteransi-1.0.5" sources."slash-3.0.0" sources."slugify-1.6.0" @@ -85481,6 +86071,7 @@ in }) sources."stable-0.1.8" sources."stack-trace-0.0.10" + sources."standard-as-callback-2.1.0" (sources."static-extend-0.1.2" // { dependencies = [ sources."define-property-0.2.5" @@ -85556,6 +86147,7 @@ in sources."domelementtype-1.3.1" sources."domutils-1.7.0" sources."nth-check-1.0.2" + sources."util.promisify-1.0.1" ]; }) sources."symbol-observable-1.2.0" @@ -85596,9 +86188,11 @@ in }) sources."pkg-dir-4.2.0" sources."semver-6.3.0" + sources."serialize-javascript-4.0.0" sources."source-map-0.6.1" ]; }) + sources."text-hex-1.0.0" sources."text-table-0.2.0" sources."thenify-3.3.1" sources."thenify-all-1.6.0" @@ -85623,6 +86217,7 @@ in sources."tough-cookie-2.5.0" sources."traverse-0.6.6" sources."tree-kill-1.2.2" + sources."triple-beam-1.3.0" sources."ts-interface-checker-0.1.13" sources."ts-invariant-0.4.4" sources."ts-pnp-1.2.0" @@ -85634,6 +86229,7 @@ in sources."type-fest-0.3.1" sources."type-is-1.6.18" sources."typedarray-0.0.6" + sources."uglify-js-3.14.1" sources."ultron-1.1.1" sources."unbox-primitive-1.0.1" sources."unicode-canonical-property-names-ecmascript-1.0.4" @@ -85688,7 +86284,7 @@ in ]; }) sources."util-deprecate-1.0.2" - sources."util.promisify-1.0.0" + sources."util.promisify-1.1.1" sources."utila-0.4.0" sources."utils-merge-1.0.1" sources."uuid-8.3.2" @@ -85737,6 +86333,7 @@ in sources."micromatch-3.1.10" sources."rimraf-2.7.1" sources."schema-utils-1.0.0" + sources."serialize-javascript-4.0.0" sources."source-map-0.6.1" sources."ssri-6.0.2" sources."terser-webpack-plugin-1.4.5" @@ -85860,7 +86457,14 @@ in ]; }) sources."widest-line-3.1.0" + (sources."winston-3.3.3" // { + dependencies = [ + sources."readable-stream-3.6.0" + ]; + }) + sources."winston-transport-4.4.0" sources."with-open-file-0.1.7" + sources."wordwrap-1.0.0" sources."worker-farm-1.7.0" sources."worker-rpc-0.1.1" (sources."wrap-ansi-7.0.0" // { @@ -85878,8 +86482,9 @@ in sources."uuid-7.0.3" ]; }) - (sources."xdl-59.0.53" // { + (sources."xdl-59.0.54" // { dependencies = [ + sources."bplist-parser-0.3.0" sources."chownr-1.1.4" sources."fs-minipass-1.2.7" sources."minipass-2.9.0" @@ -90309,7 +90914,7 @@ in sources."supports-color-5.5.0" ]; }) - sources."@exodus/schemasafe-1.0.0-rc.3" + sources."@exodus/schemasafe-1.0.0-rc.4" sources."@graphql-cli/common-4.1.0" sources."@graphql-cli/init-4.1.0" (sources."@graphql-tools/batch-execute-7.1.2" // { @@ -92152,10 +92757,10 @@ in http-server = nodeEnv.buildNodePackage { name = "http-server"; packageName = "http-server"; - version = "13.0.0"; + version = "13.0.1"; src = fetchurl { - url = "https://registry.npmjs.org/http-server/-/http-server-13.0.0.tgz"; - sha512 = "tqOx2M1CiZ3aVaE7Ue/0lup9kOG+Zqg6wdT1HygvxFnvPpU9doBMPcQ1ffT0/QS3J9ua35gipg0o3Dr8N0K0Tg=="; + url = "https://registry.npmjs.org/http-server/-/http-server-13.0.1.tgz"; + sha512 = "ke9rphoNuqsOCHy4tA3b3W4Yuxy7VUIXcTHSLz6bkMDAJPQD4twjEatquelJBIPwNhZuC3+FYj/+dSaGHdKTCw=="; }; dependencies = [ sources."async-2.6.3" @@ -93131,7 +93736,7 @@ in sources."@ot-builder/var-store-1.1.0" sources."@ot-builder/variance-1.1.0" sources."@unicode/unicode-13.0.0-1.2.0" - sources."@xmldom/xmldom-0.7.1" + sources."@xmldom/xmldom-0.7.2" sources."aglfn-1.0.2" sources."amdefine-1.0.1" sources."ansi-regex-5.0.0" @@ -93615,7 +94220,7 @@ in sources."asynckit-0.4.0" sources."at-least-node-1.0.0" sources."atob-2.1.2" - (sources."aws-sdk-2.972.0" // { + (sources."aws-sdk-2.973.0" // { dependencies = [ sources."buffer-4.9.2" sources."ieee754-1.1.13" @@ -96084,7 +96689,7 @@ in sources."@types/component-emitter-1.2.10" sources."@types/cookie-0.4.1" sources."@types/cors-2.8.12" - sources."@types/node-16.6.2" + sources."@types/node-16.7.0" sources."accepts-1.3.7" sources."ansi-regex-5.0.0" sources."ansi-styles-4.3.0" @@ -98903,7 +99508,7 @@ in sources."@types/istanbul-lib-report-3.0.0" sources."@types/istanbul-reports-1.1.2" sources."@types/json-schema-7.0.9" - sources."@types/node-16.6.2" + sources."@types/node-16.7.0" sources."@types/normalize-package-data-2.4.1" sources."@types/resolve-0.0.8" sources."@types/yargs-15.0.14" @@ -100541,7 +101146,7 @@ in sources."@percy/config-1.0.0-beta.65" sources."@percy/logger-1.0.0-beta.65" sources."@percy/migrate-0.10.0" - sources."@types/node-16.6.2" + sources."@types/node-16.7.0" sources."@types/parse-json-4.0.0" sources."@types/yauzl-2.9.2" sources."agent-base-6.0.2" @@ -101115,10 +101720,10 @@ in sources."@fluentui/style-utilities-8.3.0" sources."@fluentui/theme-2.2.2" sources."@fluentui/utilities-8.3.0" - sources."@microsoft/load-themed-styles-1.10.202" + sources."@microsoft/load-themed-styles-1.10.203" sources."@sindresorhus/is-0.14.0" sources."@szmarczak/http-timer-1.1.2" - sources."@types/node-16.6.2" + sources."@types/node-16.7.0" sources."@types/uuid-3.4.10" sources."@types/ws-6.0.4" sources."accepts-1.3.7" @@ -101753,10 +102358,10 @@ in netlify-cli = nodeEnv.buildNodePackage { name = "netlify-cli"; packageName = "netlify-cli"; - version = "6.7.0"; + version = "6.7.1"; src = fetchurl { - url = "https://registry.npmjs.org/netlify-cli/-/netlify-cli-6.7.0.tgz"; - sha512 = "lb3OrOjHAuSeFzq9hWMmKrZRqAtH3ZcCJnd2UsRTCG/IhHYhpmoCdVjwRKVjGmH0Px43qZo6dn/Gn9AOQF8P8g=="; + url = "https://registry.npmjs.org/netlify-cli/-/netlify-cli-6.7.1.tgz"; + sha512 = "+PkGIfVEATLs0FTkp1sIanyizH0AOJckhlMTA342YtXPmAVbwGINQ7eV0SU2i6VfNesu9It7JEjSq3SuAkF9gg=="; }; dependencies = [ sources."@babel/code-frame-7.14.5" @@ -101891,14 +102496,8 @@ in sources."@dabh/diagnostics-2.0.2" sources."@jest/types-26.6.2" sources."@mrmlnc/readdir-enhanced-2.2.1" - (sources."@netlify/build-18.4.1" // { + (sources."@netlify/build-18.4.2" // { dependencies = [ - (sources."@netlify/zip-it-and-ship-it-4.18.0" // { - dependencies = [ - sources."yargs-16.2.0" - ]; - }) - sources."cp-file-9.1.0" sources."resolve-2.0.0-next.3" ]; }) @@ -101943,17 +102542,21 @@ in (sources."@netlify/plugin-edge-handlers-1.11.22" // { dependencies = [ sources."@types/node-14.17.10" - sources."typescript-4.3.5" ]; }) sources."@netlify/plugins-list-3.3.0" sources."@netlify/routing-local-proxy-0.31.0" sources."@netlify/run-utils-2.0.1" - (sources."@netlify/zip-it-and-ship-it-4.17.0" // { + (sources."@netlify/zip-it-and-ship-it-4.19.0" // { dependencies = [ + sources."ansi-styles-4.3.0" + sources."cliui-7.0.4" sources."cp-file-9.1.0" sources."resolve-2.0.0-next.3" + sources."wrap-ansi-7.0.0" + sources."y18n-5.0.8" sources."yargs-16.2.0" + sources."yargs-parser-20.2.9" ]; }) (sources."@nodelib/fs.scandir-2.1.5" // { @@ -102008,6 +102611,7 @@ in (sources."@oclif/core-0.5.31" // { dependencies = [ sources."@nodelib/fs.stat-2.0.5" + sources."ansi-styles-4.3.0" sources."array-union-2.1.0" sources."braces-3.0.2" sources."dir-glob-3.0.1" @@ -102024,9 +102628,15 @@ in sources."to-regex-range-5.0.1" sources."tslib-2.3.1" sources."universalify-2.0.0" + sources."wrap-ansi-7.0.0" + ]; + }) + (sources."@oclif/errors-1.3.5" // { + dependencies = [ + sources."ansi-styles-4.3.0" + sources."wrap-ansi-7.0.0" ]; }) - sources."@oclif/errors-1.3.5" sources."@oclif/linewrap-1.0.0" (sources."@oclif/parser-3.8.5" // { dependencies = [ @@ -102119,7 +102729,7 @@ in sources."@types/istanbul-reports-3.0.1" sources."@types/keyv-3.1.2" sources."@types/minimatch-3.0.5" - sources."@types/node-16.6.2" + sources."@types/node-16.7.0" sources."@types/node-fetch-2.5.12" sources."@types/normalize-package-data-2.4.1" sources."@types/resolve-1.17.1" @@ -102244,7 +102854,9 @@ in }) (sources."boxen-5.0.1" // { dependencies = [ + sources."ansi-styles-4.3.0" sources."type-fest-0.20.2" + sources."wrap-ansi-7.0.0" ]; }) sources."brace-expansion-1.1.11" @@ -102350,7 +102962,7 @@ in ]; }) sources."cli-width-2.2.1" - sources."cliui-7.0.4" + sources."cliui-6.0.0" sources."clone-1.0.4" sources."clone-response-1.0.2" sources."code-point-at-1.1.0" @@ -102496,7 +103108,11 @@ in sources."detective-sass-3.0.1" sources."detective-scss-2.0.1" sources."detective-stylus-1.0.0" - sources."detective-typescript-7.0.0" + (sources."detective-typescript-7.0.0" // { + dependencies = [ + sources."typescript-3.9.10" + ]; + }) (sources."dir-glob-2.2.2" // { dependencies = [ sources."path-type-3.0.0" @@ -103553,7 +104169,7 @@ in sources."type-fest-0.21.3" sources."type-is-1.6.18" sources."typedarray-to-buffer-3.1.5" - sources."typescript-3.9.10" + sources."typescript-4.3.5" sources."uid-safe-2.1.5" sources."unbzip2-stream-1.4.3" sources."unicode-canonical-property-names-ecmascript-1.0.4" @@ -103622,7 +104238,7 @@ in ]; }) sources."word-wrap-1.2.3" - (sources."wrap-ansi-7.0.0" // { + (sources."wrap-ansi-6.2.0" // { dependencies = [ sources."ansi-styles-4.3.0" ]; @@ -103631,23 +104247,21 @@ in sources."write-file-atomic-3.0.3" sources."xdg-basedir-4.0.0" sources."xtend-4.0.2" - sources."y18n-5.0.8" + sources."y18n-4.0.3" sources."yallist-4.0.0" (sources."yargs-15.4.1" // { dependencies = [ - sources."ansi-styles-4.3.0" - sources."camelcase-5.3.1" - sources."cliui-6.0.0" sources."find-up-4.1.0" sources."locate-path-5.0.0" sources."p-limit-2.3.0" sources."p-locate-4.1.0" - sources."wrap-ansi-6.2.0" - sources."y18n-4.0.3" - sources."yargs-parser-18.1.3" ]; }) - sources."yargs-parser-20.2.9" + (sources."yargs-parser-18.1.3" // { + dependencies = [ + sources."camelcase-5.3.1" + ]; + }) sources."yarn-1.22.11" sources."yauzl-2.10.0" sources."yocto-queue-0.1.0" @@ -104234,7 +104848,7 @@ in sources."@types/cacheable-request-6.0.2" sources."@types/http-cache-semantics-4.0.1" sources."@types/keyv-3.1.2" - sources."@types/node-16.6.2" + sources."@types/node-16.7.0" sources."@types/responselike-1.0.0" sources."abbrev-1.1.1" sources."accepts-1.3.7" @@ -104994,7 +105608,7 @@ in sources."@types/http-cache-semantics-4.0.1" sources."@types/keyv-3.1.2" sources."@types/minimist-1.2.2" - sources."@types/node-16.6.2" + sources."@types/node-16.7.0" sources."@types/normalize-package-data-2.4.1" sources."@types/parse-json-4.0.0" sources."@types/responselike-1.0.0" @@ -109745,7 +110359,7 @@ in sources."@types/glob-7.1.4" sources."@types/json-schema-7.0.9" sources."@types/minimatch-3.0.5" - sources."@types/node-16.6.2" + sources."@types/node-16.7.0" sources."@types/parse-json-4.0.0" sources."@types/q-1.5.5" sources."@webassemblyjs/ast-1.9.0" @@ -111550,9 +112164,9 @@ in sources."@emotion/memoize-0.7.4" sources."@emotion/stylis-0.8.5" sources."@emotion/unitless-0.7.5" - sources."@exodus/schemasafe-1.0.0-rc.3" + sources."@exodus/schemasafe-1.0.0-rc.4" sources."@redocly/ajv-8.6.2" - (sources."@redocly/openapi-core-1.0.0-beta.54" // { + (sources."@redocly/openapi-core-1.0.0-beta.55" // { dependencies = [ sources."@types/node-14.17.10" ]; @@ -112870,7 +113484,7 @@ in sources."@types/keyv-3.1.2" sources."@types/lodash-4.14.172" sources."@types/long-4.0.1" - sources."@types/node-16.6.2" + sources."@types/node-16.7.0" sources."@types/request-2.48.7" sources."@types/request-promise-native-1.0.18" sources."@types/responselike-1.0.0" @@ -112931,7 +113545,7 @@ in sources."async-2.6.3" sources."asynckit-0.4.0" sources."at-least-node-1.0.0" - (sources."aws-sdk-2.972.0" // { + (sources."aws-sdk-2.973.0" // { dependencies = [ sources."buffer-4.9.2" sources."ieee754-1.1.13" @@ -114286,10 +114900,10 @@ in snyk = nodeEnv.buildNodePackage { name = "snyk"; packageName = "snyk"; - version = "1.683.0"; + version = "1.684.0"; src = fetchurl { - url = "https://registry.npmjs.org/snyk/-/snyk-1.683.0.tgz"; - sha512 = "cvdSuSuHyb7ijF68afG/Nbxm4wxnPQQCMjB0SYqTln+W7tMY8wLUr86QaQZIBN2Umb7zgY40gBRDq2R2nYVZGQ=="; + url = "https://registry.npmjs.org/snyk/-/snyk-1.684.0.tgz"; + sha512 = "Pwfr6hQdp6xrFA5Go3zOm+epQrfjygnbgsuH3g8j1eMXvFuq6pDbkvf802slTIb6kPLsIi2Ot9NW1AlT0oqutQ=="; }; dependencies = [ sources."@arcanis/slice-ansi-1.0.2" @@ -114982,7 +115596,7 @@ in sources."@types/component-emitter-1.2.10" sources."@types/cookie-0.4.1" sources."@types/cors-2.8.12" - sources."@types/node-16.6.2" + sources."@types/node-16.7.0" sources."accepts-1.3.7" sources."base64-arraybuffer-0.1.4" sources."base64id-2.0.0" @@ -116208,7 +116822,7 @@ in sources."async-1.5.2" sources."async-limiter-1.0.1" sources."asynckit-0.4.0" - (sources."aws-sdk-2.972.0" // { + (sources."aws-sdk-2.973.0" // { dependencies = [ sources."uuid-3.3.2" ]; @@ -117324,7 +117938,7 @@ in sha512 = "eGEuZ3UEanOhlpQhICLjKejDxcZ9uYJlGnBGKAPW7uugolaBE6HpEBIiKFZN/TMRFFHQUURgGvsVn8/HJUBfeQ=="; }; dependencies = [ - sources."@types/node-16.6.2" + sources."@types/node-16.7.0" sources."@types/pug-2.0.5" sources."@types/sass-1.16.1" sources."ansi-styles-4.3.0" @@ -117395,7 +118009,7 @@ in sources."@emmetio/abbreviation-2.2.2" sources."@emmetio/css-abbreviation-2.1.4" sources."@emmetio/scanner-1.0.0" - sources."@types/node-16.6.2" + sources."@types/node-16.7.0" sources."@types/pug-2.0.5" sources."@types/sass-1.16.1" sources."anymatch-3.1.2" @@ -119560,7 +120174,7 @@ in sources."@types/cacheable-request-6.0.2" sources."@types/http-cache-semantics-4.0.1" sources."@types/keyv-3.1.2" - sources."@types/node-16.6.2" + sources."@types/node-16.7.0" sources."@types/responselike-1.0.0" sources."abbrev-1.1.1" sources."abstract-logging-2.0.1" @@ -120855,7 +121469,7 @@ in sha512 = "N+ENrder8z9zJQF9UM7K3/1LcfVW60omqeyaQsu6GN1BGdCgPm8gdHssn7WRD7vx+ABKc82IE1+pJyHOPkwe+w=="; }; dependencies = [ - sources."@types/node-16.6.2" + sources."@types/node-16.7.0" sources."@types/unist-2.0.6" sources."@types/vfile-3.0.2" sources."@types/vfile-message-2.0.0" @@ -121233,7 +121847,7 @@ in dependencies = [ sources."@sindresorhus/is-0.14.0" sources."@szmarczak/http-timer-1.1.2" - sources."@types/node-16.6.2" + sources."@types/node-16.7.0" sources."@vercel/build-utils-2.12.2" sources."@vercel/go-1.2.3" sources."@vercel/node-1.12.1" @@ -121864,7 +122478,7 @@ in sources."domelementtype-2.2.0" sources."domhandler-4.2.0" sources."domutils-2.7.0" - sources."electron-to-chromium-1.3.813" + sources."electron-to-chromium-1.3.814" sources."emoji-regex-8.0.0" sources."emojis-list-3.0.0" sources."enhanced-resolve-5.8.2" @@ -122430,7 +123044,7 @@ in sources."@starptech/rehype-webparser-0.10.0" sources."@starptech/webparser-0.10.0" sources."@szmarczak/http-timer-1.1.2" - sources."@types/node-16.6.2" + sources."@types/node-16.7.0" sources."@types/unist-2.0.6" sources."@types/vfile-3.0.2" sources."@types/vfile-message-2.0.0" @@ -123611,7 +124225,7 @@ in sources."@sindresorhus/is-0.14.0" sources."@szmarczak/http-timer-1.1.2" sources."@types/minimatch-3.0.5" - sources."@types/node-16.6.2" + sources."@types/node-16.7.0" sources."@types/yauzl-2.9.1" sources."acorn-7.4.1" sources."acorn-jsx-5.3.2" @@ -124182,7 +124796,7 @@ in sources."@types/eslint-scope-3.7.1" sources."@types/estree-0.0.50" sources."@types/json-schema-7.0.9" - sources."@types/node-16.6.2" + sources."@types/node-16.7.0" sources."@webassemblyjs/ast-1.11.1" sources."@webassemblyjs/floating-point-hex-parser-1.11.1" sources."@webassemblyjs/helper-api-error-1.11.1" @@ -124210,7 +124824,7 @@ in sources."chrome-trace-event-1.0.3" sources."colorette-1.3.0" sources."commander-2.20.3" - sources."electron-to-chromium-1.3.813" + sources."electron-to-chromium-1.3.814" sources."enhanced-resolve-5.8.2" sources."es-module-lexer-0.7.1" sources."escalade-3.1.1" @@ -124350,7 +124964,7 @@ in sources."@nodelib/fs.walk-1.2.8" sources."@types/http-proxy-1.17.7" sources."@types/json-schema-7.0.9" - sources."@types/node-16.6.2" + sources."@types/node-16.7.0" sources."@types/retry-0.12.1" sources."accepts-1.3.7" sources."aggregate-error-3.1.0" @@ -124733,7 +125347,7 @@ in sources."@protobufjs/pool-1.1.0" sources."@protobufjs/utf8-1.1.0" sources."@types/long-4.0.1" - sources."@types/node-16.6.2" + sources."@types/node-16.7.0" sources."addr-to-ip-port-1.5.4" sources."airplay-js-0.3.0" sources."ansi-regex-5.0.0" @@ -124763,7 +125377,7 @@ in sources."ms-2.1.2" ]; }) - (sources."bittorrent-tracker-9.17.4" // { + (sources."bittorrent-tracker-9.18.0" // { dependencies = [ sources."debug-4.3.2" sources."decompress-response-6.0.0" @@ -124804,6 +125418,7 @@ in }) sources."chunk-store-stream-4.3.0" sources."cliui-7.0.4" + sources."clone-1.0.4" sources."color-convert-2.0.1" sources."color-name-1.1.4" sources."common-tags-1.8.0" @@ -124980,6 +125595,8 @@ in sources."ms-2.1.2" ]; }) + sources."smart-buffer-1.1.15" + sources."socks-1.1.10" sources."speed-limiter-1.0.2" sources."speedometer-1.1.0" sources."split-1.0.1" @@ -125024,7 +125641,7 @@ in sources."utp-native-2.5.3" sources."videostream-3.2.2" sources."vlc-command-1.2.0" - (sources."webtorrent-1.5.1" // { + (sources."webtorrent-1.5.3" // { dependencies = [ sources."debug-4.3.2" sources."decompress-response-6.0.0" @@ -126100,7 +126717,7 @@ in sources."@nodelib/fs.walk-1.2.8" sources."@types/fs-extra-9.0.12" sources."@types/minimist-1.2.2" - sources."@types/node-16.6.2" + sources."@types/node-16.7.0" sources."@types/node-fetch-2.5.12" sources."ansi-styles-4.3.0" sources."array-union-3.0.1" diff --git a/pkgs/development/ocaml-modules/luv/default.nix b/pkgs/development/ocaml-modules/luv/default.nix index 8aaf1bcbddb4..fec487aeac20 100644 --- a/pkgs/development/ocaml-modules/luv/default.nix +++ b/pkgs/development/ocaml-modules/luv/default.nix @@ -6,12 +6,12 @@ buildDunePackage rec { pname = "luv"; - version = "0.5.9"; + version = "0.5.10"; useDune2 = true; src = fetchurl { url = "https://github.com/aantron/luv/releases/download/${version}/luv-${version}.tar.gz"; - sha256 = "0bbv28vgv5mnfbn1gag5fh3n4d9nkffqy3bif3pf47677c493ym2"; + sha256 = "0zygir01d6vglfs4b3klnbg90glvyl9agq5xnzn8hmsb6d8z0jqp"; }; postConfigure = '' diff --git a/pkgs/development/python-modules/aiorun/default.nix b/pkgs/development/python-modules/aiorun/default.nix index 414f8a6d9a64..ddcd11d4eebd 100644 --- a/pkgs/development/python-modules/aiorun/default.nix +++ b/pkgs/development/python-modules/aiorun/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { pname = "aiorun"; - version = "2020.12.1"; + version = "2021.8.1"; format = "flit"; disabled = pythonOlder "3.5"; @@ -18,7 +18,7 @@ buildPythonPackage rec { owner = "cjrh"; repo = pname; rev = "v${version}"; - sha256 = "sha256-ktc2cmoPNYcsVyKCWs+ivhV5onywFIrdDRBiBKrdiF4="; + sha256 = "sha256-aehYPZ1+GEO+bNSsE5vVgjtVo4MRMH+vNurk+bJ1/Io="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/arcam-fmj/default.nix b/pkgs/development/python-modules/arcam-fmj/default.nix index 55e629d9358e..8d74db04d1fa 100644 --- a/pkgs/development/python-modules/arcam-fmj/default.nix +++ b/pkgs/development/python-modules/arcam-fmj/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { pname = "arcam-fmj"; - version = "0.10.0"; + version = "0.11.1"; disabled = pythonOlder "3.8"; @@ -20,7 +20,7 @@ buildPythonPackage rec { owner = "elupus"; repo = "arcam_fmj"; rev = version; - sha256 = "sha256-pPPBeOwB2HgyxxMnR5yU3ZwDaJVP0v7/fkeDkeGGhPM="; + sha256 = "sha256-Vs32LGRN6kxG8sswvuUwuUbLv9GXuhJeK0CUGoo2EgE="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/async-upnp-client/default.nix b/pkgs/development/python-modules/async-upnp-client/default.nix index 13c78783ed06..4b89204ca5e6 100644 --- a/pkgs/development/python-modules/async-upnp-client/default.nix +++ b/pkgs/development/python-modules/async-upnp-client/default.nix @@ -1,4 +1,5 @@ { lib +, stdenv , aiohttp , async-timeout , buildPythonPackage @@ -13,14 +14,14 @@ buildPythonPackage rec { pname = "async-upnp-client"; - version = "0.19.1"; + version = "0.19.2"; disabled = pythonOlder "3.6"; src = fetchFromGitHub { owner = "StevenLooman"; repo = "async_upnp_client"; rev = version; - sha256 = "sha256-qxEn9UrQuwRaP7sZlu3854gDI7Gqku055DF8KvsU6p4="; + sha256 = "1v8d2lvxihqasn7866zssys16s0lgxkk6ri2dp4rr7wr8g9ixvdr"; }; propagatedBuildInputs = [ @@ -52,6 +53,8 @@ buildPythonPackage rec { "test_subscribe_renew" "test_start_server" "test_init" + ] ++ lib.optionals stdenv.isDarwin [ + "test_deferred_callback_url" ]; pythonImportsCheck = [ "async_upnp_client" ]; diff --git a/pkgs/development/python-modules/cassandra-driver/default.nix b/pkgs/development/python-modules/cassandra-driver/default.nix index e5b1a4c4fb0f..1243aad64cc4 100644 --- a/pkgs/development/python-modules/cassandra-driver/default.nix +++ b/pkgs/development/python-modules/cassandra-driver/default.nix @@ -35,6 +35,10 @@ buildPythonPackage rec { sha256 = "1dn7iiavsrhh6i9hcyw0mk8j95r5ym0gbrvdca998hx2rnz5ark6"; }; + postPatch = '' + substituteInPlace setup.py --replace 'geomet>=0.1,<0.3' 'geomet' + ''; + nativeBuildInputs = [ cython ]; buildInputs = [ libev ]; propagatedBuildInputs = [ six geomet ] @@ -80,6 +84,8 @@ buildPythonPackage rec { "_PoolTests" # attempts to make connection to localhost "test_connection_initialization" + # time-sensitive + "test_nts_token_performance" ]; meta = with lib; { diff --git a/pkgs/development/python-modules/cloudsplaining/default.nix b/pkgs/development/python-modules/cloudsplaining/default.nix new file mode 100644 index 000000000000..d99f66943d96 --- /dev/null +++ b/pkgs/development/python-modules/cloudsplaining/default.nix @@ -0,0 +1,55 @@ +{ lib +, boto3 +, botocore +, buildPythonPackage +, cached-property +, click +, click-option-group +, fetchFromGitHub +, jinja2 +, markdown +, policy-sentry +, pytestCheckHook +, pythonOlder +, pyyaml +, schema +}: + +buildPythonPackage rec { + pname = "cloudsplaining"; + version = "0.4.5"; + disabled = pythonOlder "3.6"; + + src = fetchFromGitHub { + owner = "salesforce"; + repo = pname; + rev = version; + sha256 = "0s446jji3c9x1gw0lsb03giir91cnv6dgh4nzxg9mc1rm9wy7gzw"; + }; + + propagatedBuildInputs = [ + boto3 + botocore + cached-property + click + click-option-group + jinja2 + markdown + policy-sentry + pyyaml + schema + ]; + + checkInputs = [ + pytestCheckHook + ]; + + pythonImportsCheck = [ "cloudsplaining" ]; + + meta = with lib; { + description = "Python module for AWS IAM security assessment"; + homepage = "https://github.com/salesforce/cloudsplaining"; + license = licenses.bsd3; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/pkgs/development/python-modules/cmd2/default.nix b/pkgs/development/python-modules/cmd2/default.nix index dee6c2ab499e..b5bbc88c341f 100644 --- a/pkgs/development/python-modules/cmd2/default.nix +++ b/pkgs/development/python-modules/cmd2/default.nix @@ -15,7 +15,7 @@ buildPythonPackage rec { LC_ALL="en_US.UTF-8"; - postPatch = lib.optional stdenv.isDarwin '' + postPatch = lib.optionalString stdenv.isDarwin '' # Fake the impure dependencies pbpaste and pbcopy mkdir bin echo '#!${stdenv.shell}' > bin/pbpaste diff --git a/pkgs/development/python-modules/cvxpy/default.nix b/pkgs/development/python-modules/cvxpy/default.nix index 9068814ffd79..b7b5c7f55af0 100644 --- a/pkgs/development/python-modules/cvxpy/default.nix +++ b/pkgs/development/python-modules/cvxpy/default.nix @@ -36,7 +36,7 @@ buildPythonPackage rec { ]; # Required flags from https://github.com/cvxgrp/cvxpy/releases/tag/v1.1.11 - preBuild = lib.optional useOpenmp '' + preBuild = lib.optionalString useOpenmp '' export CFLAGS="-fopenmp" export LDFLAGS="-lgomp" ''; diff --git a/pkgs/development/python-modules/docopt-ng/default.nix b/pkgs/development/python-modules/docopt-ng/default.nix new file mode 100644 index 000000000000..7a18bfbc7cfa --- /dev/null +++ b/pkgs/development/python-modules/docopt-ng/default.nix @@ -0,0 +1,24 @@ +{ lib +, buildPythonPackage +, fetchPypi +}: + +buildPythonPackage rec { + pname = "docopt-ng"; + version = "0.7.2"; + + src = fetchPypi { + inherit pname version; + sha256 = "sha256-hs7qAy8M+lnmB3brDPOKxzZTWBAihyMg9H3IdGeNckQ="; + }; + + pythonImportsCheck = [ "docopt" ]; + doCheck = false; # no tests in the package + + meta = with lib; { + description = "More-magic command line arguments parser. Now with more maintenance!"; + homepage = "https://github.com/bazaar-projects/docopt-ng"; + license = licenses.mit; + maintainers = with maintainers; [ fgaz ]; + }; +} diff --git a/pkgs/development/python-modules/dpkt/default.nix b/pkgs/development/python-modules/dpkt/default.nix index a64ed8e2dc40..74817e60cbcf 100644 --- a/pkgs/development/python-modules/dpkt/default.nix +++ b/pkgs/development/python-modules/dpkt/default.nix @@ -1,4 +1,7 @@ -{ lib, fetchPypi, buildPythonPackage }: +{ lib +, fetchPypi +, buildPythonPackage +}: buildPythonPackage rec { pname = "dpkt"; @@ -9,6 +12,11 @@ buildPythonPackage rec { sha256 = "74899d557ec4e337db29cecc80548b23a1205384d30ee407397cfb9ab178e3d4"; }; + # Project has no tests + doCheck = false; + + pythonImportsCheck = [ "dpkt" ]; + meta = with lib; { description = "Fast, simple packet creation / parsing, with definitions for the basic TCP/IP protocols"; homepage = "https://github.com/kbandla/dpkt"; diff --git a/pkgs/development/python-modules/geomet/default.nix b/pkgs/development/python-modules/geomet/default.nix index a4df450098df..bace792ee84a 100644 --- a/pkgs/development/python-modules/geomet/default.nix +++ b/pkgs/development/python-modules/geomet/default.nix @@ -1,31 +1,22 @@ { lib , buildPythonPackage , fetchFromGitHub -, fetchpatch , click , six }: buildPythonPackage rec { pname = "geomet"; - version = "0.2.1"; + version = "0.3.0"; # pypi tarball doesn't include tests src = fetchFromGitHub { owner = "geomet"; repo = "geomet"; rev = version; - sha256 = "0fdi26glsmrsyqk86rnsfcqw79svn2b0ikdv89pq98ihrpwhn85y"; + sha256 = "1lb0df78gkivsb7hy3ix0xccvcznvskip11hr5sgq5y76qnfc8p0"; }; - patches = [ - (fetchpatch { - name = "python-3.8-support.patch"; - url = "https://github.com/geomet/geomet/commit/dc4cb4a856d3ad814b57b4b7487d86d9e0f0fad4.patch"; - sha256 = "1f1cdfqyp3z01jdjvax77219l3gc75glywqrisqpd2k0m0g7fwh3"; - }) - ]; - propagatedBuildInputs = [ click six ]; meta = with lib; { diff --git a/pkgs/development/python-modules/google-cloud-resource-manager/default.nix b/pkgs/development/python-modules/google-cloud-resource-manager/default.nix index 8e7953384eaa..a18872d562ba 100644 --- a/pkgs/development/python-modules/google-cloud-resource-manager/default.nix +++ b/pkgs/development/python-modules/google-cloud-resource-manager/default.nix @@ -11,11 +11,11 @@ buildPythonPackage rec { pname = "google-cloud-resource-manager"; - version = "1.0.2"; + version = "1.1.0"; src = fetchPypi { inherit pname version; - sha256 = "sha256-5njC5yO7NTU81i9vmJoe1RBYPS1fU/3K5tgH7twyT+I="; + sha256 = "a88f21b7a110dc9b5fd8e5bc9c07330fafc9ef150921505250aec0f0b25cf5e8"; }; propagatedBuildInputs = [ google-api-core google-cloud-core grpc-google-iam-v1 proto-plus ]; diff --git a/pkgs/development/python-modules/influxdb-client/default.nix b/pkgs/development/python-modules/influxdb-client/default.nix index 5f94d61c7fda..437c10c3d849 100644 --- a/pkgs/development/python-modules/influxdb-client/default.nix +++ b/pkgs/development/python-modules/influxdb-client/default.nix @@ -14,14 +14,14 @@ buildPythonPackage rec { pname = "influxdb-client"; - version = "1.19.0"; + version = "1.20.0"; disabled = pythonOlder "3.6"; src = fetchFromGitHub { owner = "influxdata"; repo = "influxdb-client-python"; rev = "v${version}"; - sha256 = "0k1qcwd2qdw8mcr8ywy3wi1x9j6i57axgcps5kmkbx773s8qf155"; + sha256 = "sha256-VBKGzoLn71BQ5drbdiDjbpfHuYKGqHhuSwq0iNwdfh4="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/jinja2-git/default.nix b/pkgs/development/python-modules/jinja2-git/default.nix new file mode 100644 index 000000000000..59b34f6a4fb3 --- /dev/null +++ b/pkgs/development/python-modules/jinja2-git/default.nix @@ -0,0 +1,33 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, jinja2 +, poetry-core +}: + +buildPythonPackage rec { + pname = "jinja2-git"; + version = "unstable-2021-07-20"; + format = "pyproject"; + + src = fetchFromGitHub { + owner = "wemake-services"; + repo = "jinja2-git"; + # this is master, we can't patch because of poetry.lock :( + # luckily, there appear to have been zero API changes since then, only + # dependency upgrades + rev = "c6d19b207eb6ac07182dc8fea35251d286c82512"; + sha256 = "0yw0318w57ksn8azmdyk3zmyzfhw0k281fddnxyf4115bx3aph0g"; + }; + + nativeBuildInputs = [ poetry-core ]; + propagatedBuildInputs = [ jinja2 ]; + pythonImportsCheck = [ "jinja2_git" ]; + + meta = with lib; { + homepage = "https://github.com/wemake-services/jinja2-git"; + description = "Jinja2 extension to handle git-specific things"; + license = licenses.mit; + maintainers = with maintainers; [ cpcloud ]; + }; +} diff --git a/pkgs/development/python-modules/libagent/default.nix b/pkgs/development/python-modules/libagent/default.nix index 24d8ada58902..a485bf3a604b 100644 --- a/pkgs/development/python-modules/libagent/default.nix +++ b/pkgs/development/python-modules/libagent/default.nix @@ -2,6 +2,8 @@ unidecode, mock, pytest , backports-shutil-which, configargparse, python-daemon, pymsgbox }: +# XXX: when changing this package, please test the package onlykey-agent. + buildPythonPackage rec { pname = "libagent"; version = "0.14.1"; diff --git a/pkgs/development/python-modules/mcstatus/default.nix b/pkgs/development/python-modules/mcstatus/default.nix index 31ce83512af2..45e0c2d00aa6 100644 --- a/pkgs/development/python-modules/mcstatus/default.nix +++ b/pkgs/development/python-modules/mcstatus/default.nix @@ -13,14 +13,14 @@ buildPythonPackage rec { pname = "mcstatus"; - version = "6.4.0"; + version = "6.5.0"; disabled = pythonOlder "3.6"; src = fetchFromGitHub { owner = "Dinnerbone"; repo = pname; rev = "v${version}"; - sha256 = "sha256-pJ5TY9tbdhVW+kou+n5fMgCdHVBK6brBrlGIuO+VIK0="; + sha256 = "00xi3452lap4zx38msx89vvhrzkzb2dvwis1fcmx24qngj9g3yfr"; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/netcdf4/default.nix b/pkgs/development/python-modules/netcdf4/default.nix index 35e5e063bb7c..5285db9e71ae 100644 --- a/pkgs/development/python-modules/netcdf4/default.nix +++ b/pkgs/development/python-modules/netcdf4/default.nix @@ -3,13 +3,13 @@ }: buildPythonPackage rec { pname = "netCDF4"; - version = "1.5.6"; + version = "1.5.7"; disabled = isPyPy; src = fetchPypi { inherit pname version; - sha256 = "7577f4656af8431b2fa6b6797acb45f81fa1890120e9123b3645e14765da5a7c"; + sha256 = "d145f9c12da29da3922d8b8aafea2a2a89501bcb28a219a46b7b828b57191594"; }; checkInputs = [ pytest ]; diff --git a/pkgs/development/python-modules/oauthenticator/default.nix b/pkgs/development/python-modules/oauthenticator/default.nix index 25e81c89c255..738f7fafca2a 100644 --- a/pkgs/development/python-modules/oauthenticator/default.nix +++ b/pkgs/development/python-modules/oauthenticator/default.nix @@ -14,12 +14,12 @@ buildPythonPackage rec { pname = "oauthenticator"; - version = "14.0.0"; + version = "14.2.0"; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - sha256 = "1zfcl3dq9ladqg7fnpx6kgxf1ckjzlc8v3j6wa8w6iwglm40ax4r"; + sha256 = "4baa02ff2c159cbba06f8d07fe11a6e624285ca2f813b1258b4c68766c0ee46b"; }; propagatedBuildInputs = [ @@ -36,12 +36,6 @@ buildPythonPackage rec { requests-mock ]; - postPatch = '' - # The constraint was removed. No longer needed for > 14.0.0 - # https://github.com/jupyterhub/oauthenticator/pull/431 - substituteInPlace test-requirements.txt --replace "pyjwt>=1.7,<2.0" "pyjwt" - ''; - disabledTests = [ # Test are outdated, https://github.com/jupyterhub/oauthenticator/issues/432 "test_azuread" diff --git a/pkgs/development/python-modules/pex/default.nix b/pkgs/development/python-modules/pex/default.nix index 7f65b19bba97..ea10276ae407 100644 --- a/pkgs/development/python-modules/pex/default.nix +++ b/pkgs/development/python-modules/pex/default.nix @@ -6,11 +6,11 @@ buildPythonPackage rec { pname = "pex"; - version = "2.1.42"; + version = "2.1.45"; src = fetchPypi { inherit pname version; - sha256 = "2deb088a3943891d07f9871e47409407e6308fbff3ee9514a0238791dc8da99f"; + sha256 = "e5b0de7b23e1f578f93559a08a01630481b0af3dc9fb3e130b14b99baa83491b"; }; nativeBuildInputs = [ setuptools ]; diff --git a/pkgs/development/python-modules/pip-tools/default.nix b/pkgs/development/python-modules/pip-tools/default.nix index 51da889621f7..9ac877be8848 100644 --- a/pkgs/development/python-modules/pip-tools/default.nix +++ b/pkgs/development/python-modules/pip-tools/default.nix @@ -15,13 +15,13 @@ buildPythonPackage rec { pname = "pip-tools"; - version = "6.1.0"; + version = "6.2.0"; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - sha256 = "sha256-QAv3finMpIwxq8IQBCkyu1LcwTjvTqTVLF20KaqK5u4="; + sha256 = "9ed38c73da4993e531694ea151f77048b4dbf2ba7b94c4a569daa39568cc6564"; }; LC_ALL = "en_US.UTF-8"; diff --git a/pkgs/development/python-modules/policy-sentry/default.nix b/pkgs/development/python-modules/policy-sentry/default.nix new file mode 100644 index 000000000000..8240e86af2b3 --- /dev/null +++ b/pkgs/development/python-modules/policy-sentry/default.nix @@ -0,0 +1,45 @@ +{ lib +, beautifulsoup4 +, buildPythonPackage +, click +, fetchFromGitHub +, pytestCheckHook +, pythonOlder +, pyyaml +, requests +, schema +}: + +buildPythonPackage rec { + pname = "policy-sentry"; + version = "0.11.16"; + disabled = pythonOlder "3.6"; + + src = fetchFromGitHub { + owner = "salesforce"; + repo = "policy_sentry"; + rev = version; + sha256 = "0m3sr1mhnmm22xgd3h9dgkrq20pdghwx505xld4pahj686z4bva2"; + }; + + propagatedBuildInputs = [ + beautifulsoup4 + click + requests + pyyaml + schema + ]; + + checkInputs = [ + pytestCheckHook + ]; + + pythonImportsCheck = [ "policy_sentry" ]; + + meta = with lib; { + description = "Python module for generating IAM least privilege policies"; + homepage = "https://github.com/salesforce/policy_sentry"; + license = licenses.bsd3; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/pkgs/development/python-modules/pyclipper/default.nix b/pkgs/development/python-modules/pyclipper/default.nix index 0fe3998b3e89..0dbcdfbc260a 100644 --- a/pkgs/development/python-modules/pyclipper/default.nix +++ b/pkgs/development/python-modules/pyclipper/default.nix @@ -3,16 +3,18 @@ , buildPythonPackage , setuptools-scm , cython +, pytestCheckHook +, unittest2 }: buildPythonPackage rec { pname = "pyclipper"; - version = "1.2.1"; + version = "1.3.0"; src = fetchPypi { inherit pname version; extension = "zip"; - sha256 = "ca3751e93559f0438969c46f17459d07f983281dac170c3479de56492e152855"; + sha256 = "48a1b5c585aea10e5b9c0b82d6abe2642fafd9ef158b9921852bc4af815ca20c"; }; nativeBuildInputs = [ @@ -20,10 +22,7 @@ buildPythonPackage rec { cython ]; - # Requires pytest_runner to perform tests, which requires deprecated - # features of setuptools. Seems better to not run tests. This should - # be fixed upstream. - doCheck = false; + checkInputs = [ pytestCheckHook unittest2 ]; pythonImportsCheck = [ "pyclipper" ]; meta = with lib; { diff --git a/pkgs/development/python-modules/pyfronius/default.nix b/pkgs/development/python-modules/pyfronius/default.nix index c9c6bb3e6153..5ad12130fa45 100644 --- a/pkgs/development/python-modules/pyfronius/default.nix +++ b/pkgs/development/python-modules/pyfronius/default.nix @@ -8,14 +8,14 @@ buildPythonPackage rec { pname = "pyfronius"; - version = "0.6.0"; + version = "0.6.2"; disabled = pythonOlder "3.6"; src = fetchFromGitHub { owner = "nielstron"; repo = pname; rev = "release-${version}"; - sha256 = "sha256-z7sIDT6dxgLWcnpZ4NOp5Bz5C9xduwQJ3xmDfTyI+Gs="; + sha256 = "03szfgf2g0hs4r92p8jb8alzl7byzrirxsa25630zygmkadzgrz2"; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/pygame/default.nix b/pkgs/development/python-modules/pygame/default.nix index bcdce070c633..7ae4c96702ad 100644 --- a/pkgs/development/python-modules/pygame/default.nix +++ b/pkgs/development/python-modules/pygame/default.nix @@ -1,6 +1,6 @@ -{ lib, fetchPypi, buildPythonPackage, python, pkg-config, libX11 -, SDL2, SDL2_image, SDL2_mixer, SDL2_ttf, libpng, libjpeg, portmidi, freetype -, fontconfig +{ stdenv, lib, substituteAll, fetchPypi, buildPythonPackage, python, pkg-config, libX11 +, SDL2, SDL2_image, SDL2_mixer, SDL2_ttf, libpng, libjpeg, portmidi, freetype, fontconfig +, AppKit, CoreMIDI }: buildPythonPackage rec { @@ -12,6 +12,27 @@ buildPythonPackage rec { sha256 = "8b1e7b63f47aafcdd8849933b206778747ef1802bd3d526aca45ed77141e4001"; }; + patches = [ + # Patch pygame's dependency resolution to let it find build inputs + (substituteAll { + src = ./fix-dependency-finding.patch; + buildinputs_include = builtins.toJSON (builtins.concatMap (dep: [ + "${lib.getDev dep}/" + "${lib.getDev dep}/include" + ]) buildInputs); + buildinputs_lib = builtins.toJSON (builtins.concatMap (dep: [ + "${lib.getLib dep}/" + "${lib.getLib dep}/lib" + ]) buildInputs); + }) + ]; + + postPatch = '' + substituteInPlace src_py/sysfont.py \ + --replace 'path="fc-list"' 'path="${fontconfig}/bin/fc-list"' \ + --replace /usr/X11/bin/fc-list ${fontconfig}/bin/fc-list + ''; + nativeBuildInputs = [ pkg-config SDL2 ]; @@ -19,37 +40,33 @@ buildPythonPackage rec { buildInputs = [ SDL2 SDL2_image SDL2_mixer SDL2_ttf libpng libjpeg portmidi libX11 freetype + ] ++ lib.optionals stdenv.isDarwin [ + AppKit CoreMIDI ]; preConfigure = '' - sed \ - -e "s/origincdirs = .*/origincdirs = []/" \ - -e "s/origlibdirs = .*/origlibdirs = []/" \ - -e "/linux-gnu/d" \ - -i buildconfig/config_unix.py - ${lib.concatMapStrings (dep: '' - sed \ - -e "/origincdirs =/a\ origincdirs += ['${lib.getDev dep}/include']" \ - -e "/origlibdirs =/a\ origlibdirs += ['${lib.getLib dep}/lib']" \ - -i buildconfig/config_unix.py - '') buildInputs - } LOCALBASE=/ ${python.interpreter} buildconfig/config.py ''; - checkInputs = [ fontconfig ]; + checkPhase = '' + runHook preCheck - preCheck = '' # No audio or video device in test environment export SDL_VIDEODRIVER=dummy export SDL_AUDIODRIVER=disk export SDL_DISKAUDIOFILE=/dev/null + + ${python.interpreter} -m pygame.tests -v --exclude opengl,timing --time_out 300 + + runHook postCheck ''; + pythonImportsCheck = [ "pygame" ]; meta = with lib; { description = "Python library for games"; homepage = "https://www.pygame.org/"; license = licenses.lgpl21Plus; - platforms = platforms.linux; + maintainers = with maintainers; [ angustrau ]; + platforms = platforms.unix; }; } diff --git a/pkgs/development/python-modules/pygame/fix-dependency-finding.patch b/pkgs/development/python-modules/pygame/fix-dependency-finding.patch new file mode 100644 index 000000000000..11b705f1b1ad --- /dev/null +++ b/pkgs/development/python-modules/pygame/fix-dependency-finding.patch @@ -0,0 +1,64 @@ +diff --git a/buildconfig/config_darwin.py b/buildconfig/config_darwin.py +index 8d84683f..70df8f9c 100644 +--- a/buildconfig/config_darwin.py ++++ b/buildconfig/config_darwin.py +@@ -56,10 +56,10 @@ class Dependency: + class FrameworkDependency(Dependency): + def configure(self, incdirs, libdirs): + BASE_DIRS = '/', os.path.expanduser('~/'), '/System/' +- for n in BASE_DIRS: ++ for n in incdirs + libdirs: + n += 'Library/Frameworks/' + fmwk = n + self.libs + '.framework/Versions/Current/' +- if os.path.isfile(fmwk + self.libs): ++ if os.path.isfile(fmwk + self.libs + '.tbd'): + print ('Framework ' + self.libs + ' found') + self.found = 1 + self.inc_dir = fmwk + 'Headers' +@@ -158,19 +158,8 @@ def main(sdl2=False): + ]) + + print ('Hunting dependencies...') +- incdirs = ['/usr/local/include'] +- if sdl2: +- incdirs.append('/usr/local/include/SDL2') +- else: +- incdirs.append('/usr/local/include/SDL') +- +- incdirs.extend([ +- #'/usr/X11/include', +- '/opt/local/include', +- '/opt/local/include/freetype2/freetype'] +- ) +- #libdirs = ['/usr/local/lib', '/usr/X11/lib', '/opt/local/lib'] +- libdirs = ['/usr/local/lib', '/opt/local/lib'] ++ incdirs = @buildinputs_include@ ++ libdirs = @buildinputs_lib@ + + for d in DEPS: + if isinstance(d, (list, tuple)): +diff --git a/buildconfig/config_unix.py b/buildconfig/config_unix.py +index f6a4ea4b..f7f5be76 100644 +--- a/buildconfig/config_unix.py ++++ b/buildconfig/config_unix.py +@@ -224,18 +224,8 @@ def main(sdl2=False): + if not DEPS[0].found: + raise RuntimeError('Unable to run "sdl-config". Please make sure a development version of SDL is installed.') + +- incdirs = [] +- libdirs = [] +- for extrabase in extrabases: +- incdirs += [extrabase + d for d in origincdirs] +- libdirs += [extrabase + d for d in origlibdirs] +- incdirs += ["/usr"+d for d in origincdirs] +- libdirs += ["/usr"+d for d in origlibdirs] +- incdirs += ["/usr/local"+d for d in origincdirs] +- libdirs += ["/usr/local"+d for d in origlibdirs] +- if localbase: +- incdirs = [localbase+d for d in origincdirs] +- libdirs = [localbase+d for d in origlibdirs] ++ incdirs = @buildinputs_include@ ++ libdirs = @buildinputs_lib@ + + for arg in DEPS[0].cflags.split(): + if arg[:2] == '-I': diff --git a/pkgs/development/python-modules/pymunk/default.nix b/pkgs/development/python-modules/pymunk/default.nix index 4ee22feed1df..216e2488674a 100644 --- a/pkgs/development/python-modules/pymunk/default.nix +++ b/pkgs/development/python-modules/pymunk/default.nix @@ -10,12 +10,12 @@ buildPythonPackage rec { pname = "pymunk"; - version = "6.0.0"; + version = "6.1.0"; src = fetchPypi { inherit pname version; extension = "zip"; - sha256 = "04jqqd2y0wzzkqppbl08vyzgbcpl5qj946w8da2ilypqdx7j2akp"; + sha256 = "1k1ncrssywvfrbmai7d20h2mg4lzhq16rhw3dkg4ad5nhik3k0sl"; }; propagatedBuildInputs = [ cffi ]; diff --git a/pkgs/development/python-modules/python-lsp-server/default.nix b/pkgs/development/python-modules/python-lsp-server/default.nix index 9c6b8c31e120..c1a2de0a079c 100644 --- a/pkgs/development/python-modules/python-lsp-server/default.nix +++ b/pkgs/development/python-modules/python-lsp-server/default.nix @@ -26,14 +26,14 @@ buildPythonPackage rec { pname = "python-lsp-server"; - version = "1.2.0"; + version = "1.2.1"; disabled = pythonOlder "3.6"; src = fetchFromGitHub { owner = "python-lsp"; repo = pname; rev = "v${version}"; - sha256 = "09wnnbf7lqqni6xkpzzk7nmcqjm5bx49xqzmp5fkb9jk50ivcrdz"; + sha256 = "sha256-TyXKlXeXMyq+bQq9ngDm0SuW+rAhDlOVlC3mDI1THwk="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/pyupgrade/default.nix b/pkgs/development/python-modules/pyupgrade/default.nix index 411aa23254ce..f5b338680bdf 100644 --- a/pkgs/development/python-modules/pyupgrade/default.nix +++ b/pkgs/development/python-modules/pyupgrade/default.nix @@ -8,14 +8,14 @@ buildPythonPackage rec { pname = "pyupgrade"; - version = "2.23.3"; + version = "2.24.0"; disabled = pythonOlder "3.6"; src = fetchFromGitHub { owner = "asottile"; repo = pname; rev = "v${version}"; - sha256 = "sha256-Z17Bs3Mr1PJ9bYP2vsXTaJ85jOoIIlKLWR6D6s7enFs="; + sha256 = "sha256-vWju0D5O3RtDiv9uYQqd9kEwTIcV9QTHYXM/icB/rM0="; }; checkInputs = [ pytestCheckHook ]; diff --git a/pkgs/development/python-modules/sagemaker/default.nix b/pkgs/development/python-modules/sagemaker/default.nix index b61d8e969915..2b16b99bea73 100644 --- a/pkgs/development/python-modules/sagemaker/default.nix +++ b/pkgs/development/python-modules/sagemaker/default.nix @@ -16,11 +16,11 @@ buildPythonPackage rec { pname = "sagemaker"; - version = "2.46.0"; + version = "2.54.0"; src = fetchPypi { inherit pname version; - sha256 = "4f66f8c56b870e7a6f9a3882790a4074f2df26a0fe9605bc5d71e186db193525"; + sha256 = "sha256-uLsBHqzpcuTugRXBihdbib64l396m+os39OhP+tLLCM="; }; pythonImportsCheck = [ diff --git a/pkgs/development/python-modules/smart-open/default.nix b/pkgs/development/python-modules/smart-open/default.nix index d4ad901fb9b7..5e86281642af 100644 --- a/pkgs/development/python-modules/smart-open/default.nix +++ b/pkgs/development/python-modules/smart-open/default.nix @@ -15,7 +15,7 @@ buildPythonPackage rec { pname = "smart-open"; - version = "5.1.0"; + version = "5.2.0"; disabled = pythonOlder "3.5"; @@ -23,7 +23,7 @@ buildPythonPackage rec { owner = "RaRe-Technologies"; repo = "smart_open"; rev = "v${version}"; - sha256 = "0gv3vxpglnhh6d80wsqigxi7psn6s7ylz20kx5ahblcx5rqyhjmi"; + sha256 = "sha256-eC9BYHeACzGp382QBNgLcNMYDkHi0WXyEj/Re9ShXuA="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/spacy/models.nix b/pkgs/development/python-modules/spacy/models.nix index c34bbdfb83d8..0e0f1f19640f 100644 --- a/pkgs/development/python-modules/spacy/models.nix +++ b/pkgs/development/python-modules/spacy/models.nix @@ -25,7 +25,7 @@ let ++ lib.optionals (lang == "ru") [ pymorphy2 ] ++ lib.optionals (pname == "fr_dep_news_trf") [ sentencepiece ]; - postPatch = lib.optionals (pname == "fr_dep_news_trf") '' + postPatch = lib.optionalString (pname == "fr_dep_news_trf") '' substituteInPlace meta.json \ --replace "sentencepiece==0.1.91" "sentencepiece>=0.1.91" ''; diff --git a/pkgs/development/python-modules/staticjinja/default.nix b/pkgs/development/python-modules/staticjinja/default.nix index dc36066ec304..2223f4b6c529 100644 --- a/pkgs/development/python-modules/staticjinja/default.nix +++ b/pkgs/development/python-modules/staticjinja/default.nix @@ -2,7 +2,7 @@ , fetchFromGitHub , buildPythonPackage , poetry -, docopt +, docopt-ng , easywatch , jinja2 , pytestCheckHook @@ -14,7 +14,7 @@ buildPythonPackage rec { pname = "staticjinja"; - version = "3.0.1"; + version = "4.1.0"; format = "pyproject"; # No tests in pypi @@ -22,7 +22,7 @@ buildPythonPackage rec { owner = "staticjinja"; repo = pname; rev = version; - sha256 = "sha256-W4q0vG8Kl2gCmA8UnUbdiGRtghhdnWxIJXFIIa6BogA="; + sha256 = "sha256-4IL+7ncJPd1e7k5oFRjQ6yvDjozcBAAZPf88biNTiLU="; }; nativeBuildInputs = [ @@ -31,7 +31,7 @@ buildPythonPackage rec { propagatedBuildInputs = [ jinja2 - docopt + docopt-ng easywatch ]; diff --git a/pkgs/development/python-modules/trimesh/default.nix b/pkgs/development/python-modules/trimesh/default.nix index e9b80d79794a..12179e6a60a7 100644 --- a/pkgs/development/python-modules/trimesh/default.nix +++ b/pkgs/development/python-modules/trimesh/default.nix @@ -1,12 +1,16 @@ -{ lib, buildPythonPackage, fetchPypi, numpy }: +{ lib +, buildPythonPackage +, fetchPypi +, numpy +}: buildPythonPackage rec { pname = "trimesh"; - version = "3.9.20"; + version = "3.9.29"; src = fetchPypi { inherit pname version; - sha256 = "476173507224bd07febc94070d30e5d704f541b48cd2db4c3bc2fe562498e22c"; + sha256 = "sha256-YEddrun9rLcWk2u3Tfus8W014bU4BKWXWOOhCW/jSlY="; }; propagatedBuildInputs = [ numpy ]; @@ -15,8 +19,10 @@ buildPythonPackage rec { # optional dependencies doCheck = false; + pythonImportsCheck = [ "trimesh" ]; + meta = with lib; { - description = "Python library for loading and using triangular meshes."; + description = "Python library for loading and using triangular meshes"; homepage = "https://trimsh.org/"; license = licenses.mit; maintainers = with maintainers; [ gebner ]; diff --git a/pkgs/development/python-modules/whisper/default.nix b/pkgs/development/python-modules/whisper/default.nix index d25053f12364..28a2c15a8dbd 100644 --- a/pkgs/development/python-modules/whisper/default.nix +++ b/pkgs/development/python-modules/whisper/default.nix @@ -1,19 +1,40 @@ -{ lib, buildPythonPackage, fetchPypi, mock, six }: +{ lib +, buildPythonPackage +, fetchFromGitHub +, mock +, six +, pytestCheckHook +}: buildPythonPackage rec { pname = "whisper"; version = "1.1.8"; - src = fetchPypi { - inherit pname version; - sha256 = "345f35d0dccaf181e0aa4353e6c13f40f5cceda10a3c7021dafab29f004f62ae"; + src = fetchFromGitHub { + owner = "graphite-project"; + repo = pname; + rev = version; + sha256 = "11f7sarj62zgpw3ak4a2q55lj7ap4039l9ybc3a6yvs1ppvrcn7x"; }; - propagatedBuildInputs = [ six ]; - checkInputs = [ mock ]; + propagatedBuildInputs = [ + six + ]; + + checkInputs = [ + mock + pytestCheckHook + ]; + + disabledTests = [ + # whisper-resize.py: not found + "test_resize_with_aggregate" + ]; + + pythonImportsCheck = [ "whisper" ]; meta = with lib; { - homepage = "http://graphite.wikidot.com/"; + homepage = "https://github.com/graphite-project/whisper"; description = "Fixed size round-robin style database"; maintainers = with maintainers; [ offline basvandijk ]; license = licenses.asl20; diff --git a/pkgs/development/python-modules/whitenoise/default.nix b/pkgs/development/python-modules/whitenoise/default.nix index 3c63c727c0d7..5598b189afac 100644 --- a/pkgs/development/python-modules/whitenoise/default.nix +++ b/pkgs/development/python-modules/whitenoise/default.nix @@ -1,21 +1,51 @@ -{ lib, fetchPypi, buildPythonPackage, isPy27 }: +{ lib +, brotli +, buildPythonPackage +, fetchFromGitHub +, pytestCheckHook +, pythonOlder +, requests +}: buildPythonPackage rec { pname = "whitenoise"; - version = "5.2.0"; - disabled = isPy27; + version = "5.3.0"; + disabled = pythonOlder "3.5"; - src = fetchPypi { - inherit pname version; - sha256 = "05ce0be39ad85740a78750c86a93485c40f08ad8c62a6006de0233765996e5c7"; + src = fetchFromGitHub { + owner = "evansd"; + repo = pname; + rev = "v${version}"; + sha256 = "17j1rml1hb43c7fs7kf4ygkpmnjppzgsbnyw3plq9w3yh9w5hkhg"; }; - # No tests - doCheck = false; + propagatedBuildInputs = [ + brotli + ]; + + checkInputs = [ + pytestCheckHook + requests + ]; + + disabledTestPaths = [ + # Don't run Django tests + "tests/test_django_whitenoise.py" + "tests/test_runserver_nostatic.py" + "tests/test_storage.py" + ]; + + disabledTests = [ + # Test fails with AssertionError + "test_modified" + ]; + + pythonImportsCheck = [ "whitenoise" ]; meta = with lib; { description = "Radically simplified static file serving for WSGI applications"; homepage = "http://whitenoise.evans.io/"; license = licenses.mit; + maintainers = with maintainers; [ ]; }; } diff --git a/pkgs/development/tools/analysis/radare2/default.nix b/pkgs/development/tools/analysis/radare2/default.nix index 5c239cfc63e1..1c7c290405fc 100644 --- a/pkgs/development/tools/analysis/radare2/default.nix +++ b/pkgs/development/tools/analysis/radare2/default.nix @@ -26,17 +26,32 @@ , luaBindings ? false }: +let + # FIXME: how to keep this up-to-date + # https://github.com/radareorg/vector35-arch-arm64/ + arm64 = fetchFromGitHub { + owner = "radareorg"; + repo = "vector35-arch-arm64"; + rev = "5837915960c2ce862a77c99a374abfb7d18a8534"; + sha256 = "sha256-bs8wjOX+txB193oqIIZ7yx9pwpVhR3HAaWuDLPLG7m4="; + }; +in stdenv.mkDerivation rec { pname = "radare2"; - version = "5.3.1"; + version = "5.4.0"; src = fetchFromGitHub { owner = "radare"; repo = "radare2"; rev = version; - sha256 = "sha256-VS8eG5RXwKtJSLmyaSifopJU7WYGMUcznn+burPqEYE="; + sha256 = "sha256-KRHMJ0lW0OF8ejcrigp4caPsuR3iaGcglCYxJSUhGJw="; }; + preBuild = '' + cp -r ${arm64} libr/asm/arch/arm/v35arm64/arch-arm64 + chmod -R +w libr/asm/arch/arm/v35arm64/arch-arm64 + ''; + postInstall = '' install -D -m755 $src/binr/r2pm/r2pm $out/bin/r2pm ''; diff --git a/pkgs/development/tools/build-managers/cmake/default.nix b/pkgs/development/tools/build-managers/cmake/default.nix index 2de586f97cbf..a29ac38eb136 100644 --- a/pkgs/development/tools/build-managers/cmake/default.nix +++ b/pkgs/development/tools/build-managers/cmake/default.nix @@ -102,7 +102,7 @@ stdenv.mkDerivation rec { ]; # make install attempts to use the just-built cmake - preInstall = lib.optional (stdenv.hostPlatform != stdenv.buildPlatform) '' + preInstall = lib.optionalString (stdenv.hostPlatform != stdenv.buildPlatform) '' sed -i 's|bin/cmake|${buildPackages.cmakeMinimal}/bin/cmake|g' Makefile ''; diff --git a/pkgs/development/tools/buildah/default.nix b/pkgs/development/tools/buildah/default.nix index 93fe34aba245..7584adc0417f 100644 --- a/pkgs/development/tools/buildah/default.nix +++ b/pkgs/development/tools/buildah/default.nix @@ -14,13 +14,13 @@ buildGoModule rec { pname = "buildah"; - version = "1.22.2"; + version = "1.22.3"; src = fetchFromGitHub { owner = "containers"; repo = "buildah"; rev = "v${version}"; - sha256 = "sha256-hGw6qpCQZp/lRbagP0lap22oRzsEb+C6Vqn7R6Ckvhs="; + sha256 = "sha256-e4Y398VyvoDo5WYyLeZJUMmb0HgWNBWj+hCPxdUlZNY="; }; outputs = [ "out" "man" ]; diff --git a/pkgs/development/tools/continuous-integration/drone-cli/default.nix b/pkgs/development/tools/continuous-integration/drone-cli/default.nix index 4534298d395e..21dbbcf0b72c 100644 --- a/pkgs/development/tools/continuous-integration/drone-cli/default.nix +++ b/pkgs/development/tools/continuous-integration/drone-cli/default.nix @@ -9,9 +9,9 @@ buildGoModule rec { doCheck = false; - preBuild = '' - buildFlagsArray+=("-ldflags" "-X main.version=${version}") - ''; + ldflags = [ + "-X main.version=${version}" + ]; src = fetchFromGitHub { owner = "drone"; diff --git a/pkgs/development/tools/dockle/default.nix b/pkgs/development/tools/dockle/default.nix index 437f7f2da581..084f5eea21d3 100644 --- a/pkgs/development/tools/dockle/default.nix +++ b/pkgs/development/tools/dockle/default.nix @@ -16,9 +16,9 @@ buildGoModule rec { nativeBuildInputs = [ pkg-config ]; buildInputs = [ btrfs-progs lvm2 ]; - preBuild = '' - buildFlagsArray+=("-ldflags" "-s -w -X main.version=${version}") - ''; + ldflags = [ + "-s" "-w" "-X main.version=${version}" + ]; preCheck = '' # Remove tests that use networking diff --git a/pkgs/development/tools/golangci-lint/default.nix b/pkgs/development/tools/golangci-lint/default.nix index 4e7711926eac..3512c1bf087c 100644 --- a/pkgs/development/tools/golangci-lint/default.nix +++ b/pkgs/development/tools/golangci-lint/default.nix @@ -19,9 +19,9 @@ buildGoModule rec { nativeBuildInputs = [ installShellFiles ]; - preBuild = '' - buildFlagsArray+=("-ldflags=-s -w -X main.version=${version} -X main.commit=v${version} -X main.date=19700101-00:00:00") - ''; + ldflags = [ + "-s" "-w" "-X main.version=${version}" "-X main.commit=v${version}" "-X main.date=19700101-00:00:00" + ]; postInstall = '' for shell in bash zsh; do diff --git a/pkgs/development/tools/parsing/flex/2.5.35.nix b/pkgs/development/tools/parsing/flex/2.5.35.nix index b2245ff9c9b9..ec2c9eeb2d1c 100644 --- a/pkgs/development/tools/parsing/flex/2.5.35.nix +++ b/pkgs/development/tools/parsing/flex/2.5.35.nix @@ -16,10 +16,10 @@ stdenv.mkDerivation { propagatedBuildInputs = [ m4 ]; - preConfigure = lib.optionals (stdenv.hostPlatform != stdenv.buildPlatform) [ - "ac_cv_func_malloc_0_nonnull=yes" - "ac_cv_func_realloc_0_nonnull=yes" - ]; + preConfigure = lib.optionalString (stdenv.hostPlatform != stdenv.buildPlatform) '' + ac_cv_func_malloc_0_nonnull=yes + ac_cv_func_realloc_0_nonnull=yes + ''; doCheck = false; # fails 2 out of 46 tests diff --git a/pkgs/development/tools/parsing/flex/2.6.1.nix b/pkgs/development/tools/parsing/flex/2.6.1.nix index cc0ecb148c44..aeb141649772 100644 --- a/pkgs/development/tools/parsing/flex/2.6.1.nix +++ b/pkgs/development/tools/parsing/flex/2.6.1.nix @@ -18,10 +18,10 @@ stdenv.mkDerivation { propagatedBuildInputs = [ m4 ]; - preConfigure = lib.optionals (stdenv.hostPlatform != stdenv.buildPlatform) [ - "ac_cv_func_malloc_0_nonnull=yes" - "ac_cv_func_realloc_0_nonnull=yes" - ]; + preConfigure = lib.optionalString (stdenv.hostPlatform != stdenv.buildPlatform) '' + ac_cv_func_malloc_0_nonnull=yes + ac_cv_func_realloc_0_nonnull=yes + ''; postConfigure = lib.optionalString (stdenv.isDarwin || stdenv.isCygwin) '' sed -i Makefile -e 's/-no-undefined//;' diff --git a/pkgs/development/tools/parsing/flex/default.nix b/pkgs/development/tools/parsing/flex/default.nix index 0bc26db57504..e0895bab68d8 100644 --- a/pkgs/development/tools/parsing/flex/default.nix +++ b/pkgs/development/tools/parsing/flex/default.nix @@ -33,10 +33,10 @@ stdenv.mkDerivation rec { buildInputs = [ bison ]; propagatedBuildInputs = [ m4 ]; - preConfigure = lib.optionals (stdenv.hostPlatform != stdenv.buildPlatform) [ - "export ac_cv_func_malloc_0_nonnull=yes" - "export ac_cv_func_realloc_0_nonnull=yes" - ]; + preConfigure = lib.optionalString (stdenv.hostPlatform != stdenv.buildPlatform) '' + export ac_cv_func_malloc_0_nonnull=yes + export ac_cv_func_realloc_0_nonnull=yes + ''; postConfigure = lib.optionalString (stdenv.isDarwin || stdenv.isCygwin) '' sed -i Makefile -e 's/-no-undefined//;' diff --git a/pkgs/development/tools/parsing/ragel/default.nix b/pkgs/development/tools/parsing/ragel/default.nix index 6bbcf36cd2c2..c23b352decea 100644 --- a/pkgs/development/tools/parsing/ragel/default.nix +++ b/pkgs/development/tools/parsing/ragel/default.nix @@ -15,7 +15,7 @@ let buildInputs = lib.optional build-manual [ transfig ghostscript tex ]; - preConfigure = lib.optional build-manual '' + preConfigure = lib.optionalString build-manual '' sed -i "s/build_manual=no/build_manual=yes/g" DIST ''; diff --git a/pkgs/development/tools/pscale/default.nix b/pkgs/development/tools/pscale/default.nix index 657b1965012e..477827b75a14 100644 --- a/pkgs/development/tools/pscale/default.nix +++ b/pkgs/development/tools/pscale/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "pscale"; - version = "0.63.0"; + version = "0.65.0"; src = fetchFromGitHub { owner = "planetscale"; repo = "cli"; rev = "v${version}"; - sha256 = "sha256-LYVR8vcMS6ErYH4sGRi1JT9E4ElYe5mloc3C1TudzSE="; + sha256 = "sha256-RIyxO2nTysJLdYQvlmhZpS8R2kkwN+XeTlk4Ocbk9C8="; }; - vendorSha256 = "sha256-3LuzdvwLYSL7HaGbKDfrqBz2FV2yr6YUdI5kXXiIvbU="; + vendorSha256 = "sha256-8zgWM5e+aKggGbLoL/Fmy7AuALVlLa74eHBxNGjTSy4="; meta = with lib; { homepage = "https://www.planetscale.com/"; diff --git a/pkgs/development/tools/qtcreator/default.nix b/pkgs/development/tools/qtcreator/default.nix index 5926b3fda5eb..9df547308f56 100644 --- a/pkgs/development/tools/qtcreator/default.nix +++ b/pkgs/development/tools/qtcreator/default.nix @@ -68,7 +68,7 @@ mkDerivation rec { --replace 'LLVM_CXXFLAGS ~= s,-gsplit-dwarf,' '${lib.concatStringsSep "\n" ["LLVM_CXXFLAGS ~= s,-gsplit-dwarf," " LLVM_CXXFLAGS += -fno-rtti"]}' ''; - preBuild = optional withDocumentation '' + preBuild = optionalString withDocumentation '' ln -s ${getLib qtbase}/$qtDocPrefix $NIX_QT5_TMP/share ''; diff --git a/pkgs/development/tools/rust/sqlx-cli/default.nix b/pkgs/development/tools/rust/sqlx-cli/default.nix index 48af8f957b34..15b6b085bb05 100644 --- a/pkgs/development/tools/rust/sqlx-cli/default.nix +++ b/pkgs/development/tools/rust/sqlx-cli/default.nix @@ -2,16 +2,16 @@ rustPlatform.buildRustPackage rec { pname = "sqlx-cli"; - version = "0.5.6"; + version = "0.5.7"; src = fetchFromGitHub { owner = "launchbadge"; repo = "sqlx"; rev = "v${version}"; - sha256 = "sha256-Ir9n2Z3+dKCe2GLrVLV1dnxeKKtPJk/kd5wbtsKHtbw="; + sha256 = "sha256-BYTAAzex3h9iEKFuPCyCXKokPLcgA0k9Zk6aMcWac+c="; }; - cargoSha256 = "sha256-MfLxzulcQSEcNGmer8m2ph2+lK2M3MN1PwAHDGzn3NQ="; + cargoSha256 = "sha256-3Fdoo8gvoLXe9fEAzKh7XY0LDVGsYsqB6NRlU8NqCMI="; doCheck = false; cargoBuildFlags = [ "-p sqlx-cli" ]; diff --git a/pkgs/development/tools/skopeo/default.nix b/pkgs/development/tools/skopeo/default.nix index 6bfd2354a79c..b162861f1512 100644 --- a/pkgs/development/tools/skopeo/default.nix +++ b/pkgs/development/tools/skopeo/default.nix @@ -14,13 +14,13 @@ buildGoModule rec { pname = "skopeo"; - version = "1.4.0"; + version = "1.4.1"; src = fetchFromGitHub { rev = "v${version}"; owner = "containers"; repo = "skopeo"; - sha256 = "sha256-ocbZs4z6jxLC4l6po07QPyM7R5vFowK7hsMRfwALfoY="; + sha256 = "sha256-K+Zn+L7yylUj+iMrsXocWRD4O8HmxdsIsjO36SCkWiU="; }; outputs = [ "out" "man" ]; diff --git a/pkgs/games/factorio/versions.json b/pkgs/games/factorio/versions.json index acbc0c4cbc22..a8e395b2731b 100644 --- a/pkgs/games/factorio/versions.json +++ b/pkgs/games/factorio/versions.json @@ -2,20 +2,20 @@ "x86_64-linux": { "alpha": { "experimental": { - "name": "factorio_alpha_x64-1.1.37.tar.xz", + "name": "factorio_alpha_x64-1.1.38.tar.xz", "needsAuth": true, - "sha256": "0aj8w38lx8bx3d894qxr416x515ijadrlcynvvqjaj1zx3acldzh", + "sha256": "0cjhfyz4j06yn08n239ajjjpgykh39hzifhmd0ygr5szw9gdc851", "tarDirectory": "x64", - "url": "https://factorio.com/get-download/1.1.37/alpha/linux64", - "version": "1.1.37" + "url": "https://factorio.com/get-download/1.1.38/alpha/linux64", + "version": "1.1.38" }, "stable": { - "name": "factorio_alpha_x64-1.1.37.tar.xz", + "name": "factorio_alpha_x64-1.1.38.tar.xz", "needsAuth": true, - "sha256": "0aj8w38lx8bx3d894qxr416x515ijadrlcynvvqjaj1zx3acldzh", + "sha256": "0cjhfyz4j06yn08n239ajjjpgykh39hzifhmd0ygr5szw9gdc851", "tarDirectory": "x64", - "url": "https://factorio.com/get-download/1.1.37/alpha/linux64", - "version": "1.1.37" + "url": "https://factorio.com/get-download/1.1.38/alpha/linux64", + "version": "1.1.38" } }, "demo": { @@ -28,30 +28,30 @@ "version": "1.1.37" }, "stable": { - "name": "factorio_demo_x64-1.1.37.tar.xz", + "name": "factorio_demo_x64-1.1.38.tar.xz", "needsAuth": false, - "sha256": "06qwx9wd3990d3256y9y5qsxa0936076jgwhinmrlvjp9lxwl4ly", + "sha256": "0y53w01dyfmavw1yxbjqjiirmvw32bnf9bqz0isnd72dvkg0kziv", "tarDirectory": "x64", - "url": "https://factorio.com/get-download/1.1.37/demo/linux64", - "version": "1.1.37" + "url": "https://factorio.com/get-download/1.1.38/demo/linux64", + "version": "1.1.38" } }, "headless": { "experimental": { - "name": "factorio_headless_x64-1.1.37.tar.xz", + "name": "factorio_headless_x64-1.1.38.tar.xz", "needsAuth": false, - "sha256": "0hawwjdaxgbrkb80vn9jk6dn0286mq35zkgg5vvv5zhi339pqwwg", + "sha256": "1c929pa9ifz0cvmx9k5yd267hjd5p7fdbln0czl3dq1vlskk1w71", "tarDirectory": "x64", - "url": "https://factorio.com/get-download/1.1.37/headless/linux64", - "version": "1.1.37" + "url": "https://factorio.com/get-download/1.1.38/headless/linux64", + "version": "1.1.38" }, "stable": { - "name": "factorio_headless_x64-1.1.37.tar.xz", + "name": "factorio_headless_x64-1.1.38.tar.xz", "needsAuth": false, - "sha256": "0hawwjdaxgbrkb80vn9jk6dn0286mq35zkgg5vvv5zhi339pqwwg", + "sha256": "1c929pa9ifz0cvmx9k5yd267hjd5p7fdbln0czl3dq1vlskk1w71", "tarDirectory": "x64", - "url": "https://factorio.com/get-download/1.1.37/headless/linux64", - "version": "1.1.37" + "url": "https://factorio.com/get-download/1.1.38/headless/linux64", + "version": "1.1.38" } } } diff --git a/pkgs/games/spring/default.nix b/pkgs/games/spring/default.nix index 21aca5730628..b6e6505fd088 100644 --- a/pkgs/games/spring/default.nix +++ b/pkgs/games/spring/default.nix @@ -7,9 +7,9 @@ stdenv.mkDerivation rec { pname = "spring"; - version = "104.0.1-${buildId}-g${shortRev}"; + version = "105.0.1-${buildId}-g${shortRev}"; # usually the latest in https://github.com/spring/spring/commits/maintenance - rev = "f266c8107b3e5dda5a78061ef00ca0ed8736d6f2"; + rev = "8581792eac65e07cbed182ccb1e90424ce3bd8fc"; shortRev = builtins.substring 0 7 rev; buildId = "1486"; @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { owner = "spring"; repo = pname; inherit rev; - sha256 = "1nx68d894yfmqc6df72hmk75ph26fqdvlmmq58cca0vbwpz9hf5v"; + sha256 = "05lvd8grqmv7vl8rrx02rhl0qhmm58dyi6s78b64j3fkia4sfj1r"; fetchSubmodules = true; }; @@ -60,7 +60,5 @@ stdenv.mkDerivation rec { license = licenses.gpl2; maintainers = with maintainers; [ phreedom qknight domenkozar sorki ]; platforms = platforms.linux; - # error: 'snprintf' was not declared in this scope - broken = true; }; } diff --git a/pkgs/games/warzone2100/default.nix b/pkgs/games/warzone2100/default.nix index 6f31dcf9be9d..3d811f50d4a2 100644 --- a/pkgs/games/warzone2100/default.nix +++ b/pkgs/games/warzone2100/default.nix @@ -39,11 +39,11 @@ in stdenv.mkDerivation rec { inherit pname; - version = "4.1.1"; + version = "4.1.3"; src = fetchurl { url = "mirror://sourceforge/${pname}/releases/${version}/${pname}_src.tar.xz"; - sha256 = "sha256-CnMt3FytpTDAtibU3V24i6EvWRc9UkAuvC9ingphCM8="; + sha256 = "sha256-sKZiDjWwVFXT6RiY+zT+0S6Zb3uCC0CaZzOQYEWpWNs="; }; buildInputs = [ diff --git a/pkgs/misc/vim-plugins/overrides.nix b/pkgs/misc/vim-plugins/overrides.nix index bd977960f42e..f26258de3ba4 100644 --- a/pkgs/misc/vim-plugins/overrides.nix +++ b/pkgs/misc/vim-plugins/overrides.nix @@ -834,7 +834,7 @@ self: super: { }); vim-xdebug = super.vim-xdebug.overrideAttrs (old: { - postInstall = false; + postInstall = null; }); vim-xkbswitch = super.vim-xkbswitch.overrideAttrs (old: { diff --git a/pkgs/os-specific/linux/firmware/libreelec-dvb-firmware/default.nix b/pkgs/os-specific/linux/firmware/libreelec-dvb-firmware/default.nix new file mode 100644 index 000000000000..2103012d3ed9 --- /dev/null +++ b/pkgs/os-specific/linux/firmware/libreelec-dvb-firmware/default.nix @@ -0,0 +1,31 @@ +{ stdenv, fetchFromGitHub, lib}: + +stdenv.mkDerivation rec { + pname = "libreelec-dvb-firmware"; + version = "1.4.2"; + + src = fetchFromGitHub { + repo = "dvb-firmware"; + owner = "LibreElec"; + rev = version; + sha256 = "1xnfl4gp6d81gpdp86v5xgcqiqz2nf1i43sb3a4i5jqs8kxcap2k"; + }; + + installPhase = '' + runHook preInstall + + mkdir -p $out/lib + cp -rv firmware $out/lib + find $out/lib \( -name 'README.*' -or -name 'LICEN[SC]E.*' -or -name '*.txt' \) | xargs rm + + runHook postInstall + ''; + + meta = with lib; { + description = "DVB firmware from LibreELEC"; + homepage = "https://github.com/LibreELEC/dvb-firmware"; + license = licenses.unfreeRedistributableFirmware; + maintainers = with maintainers; [ kittywitch ]; + platforms = platforms.linux; + }; +} diff --git a/pkgs/os-specific/linux/firmware/openelec-dvb-firmware/default.nix b/pkgs/os-specific/linux/firmware/openelec-dvb-firmware/default.nix deleted file mode 100644 index 4ef9370c8444..000000000000 --- a/pkgs/os-specific/linux/firmware/openelec-dvb-firmware/default.nix +++ /dev/null @@ -1,28 +0,0 @@ -{ lib, stdenv, fetchurl }: - -stdenv.mkDerivation rec { - pname = "openelec-dvb-firmware"; - version = "0.0.51"; - - src = fetchurl { - url = "https://github.com/OpenELEC/dvb-firmware/archive/${version}.tar.gz"; - sha256 = "cef3ce537d213e020af794cecf9de207e2882c375ceda39102eb6fa2580bad8d"; - }; - - installPhase = '' - runHook preInstall - - DESTDIR="$out" ./install - find $out \( -name 'README.*' -or -name 'LICEN[SC]E.*' -or -name '*.txt' \) | xargs rm - - runHook postInstall - ''; - - meta = with lib; { - description = "DVB firmware from OpenELEC"; - homepage = "https://github.com/OpenELEC/dvb-firmware"; - license = licenses.unfreeRedistributableFirmware; - platforms = platforms.linux; - priority = 7; - }; -} diff --git a/pkgs/os-specific/linux/iptables/default.nix b/pkgs/os-specific/linux/iptables/default.nix index 912d9078c947..fe0e82c4a8e6 100644 --- a/pkgs/os-specific/linux/iptables/default.nix +++ b/pkgs/os-specific/linux/iptables/default.nix @@ -32,7 +32,7 @@ stdenv.mkDerivation rec { outputs = [ "out" "dev" ]; - postInstall = optional nftablesCompat '' + postInstall = optionalString nftablesCompat '' rm $out/sbin/{iptables,iptables-restore,iptables-save,ip6tables,ip6tables-restore,ip6tables-save} ln -sv xtables-nft-multi $out/bin/iptables ln -sv xtables-nft-multi $out/bin/iptables-restore diff --git a/pkgs/os-specific/linux/wooting-udev-rules/default.nix b/pkgs/os-specific/linux/wooting-udev-rules/default.nix index f1ae20692353..f34e106727c1 100644 --- a/pkgs/os-specific/linux/wooting-udev-rules/default.nix +++ b/pkgs/os-specific/linux/wooting-udev-rules/default.nix @@ -2,7 +2,7 @@ stdenv.mkDerivation rec { pname = "wooting-udev-rules"; - version = "20190601"; + version = "20210525"; # Source: https://wooting.helpscoutdocs.com/article/68-wootility-configuring-device-access-for-wootility-under-linux-udev-rules src = [ ./wooting.rules ]; diff --git a/pkgs/os-specific/linux/wooting-udev-rules/wooting.rules b/pkgs/os-specific/linux/wooting-udev-rules/wooting.rules index d906df3d4c6a..fa4148d87438 100644 --- a/pkgs/os-specific/linux/wooting-udev-rules/wooting.rules +++ b/pkgs/os-specific/linux/wooting-udev-rules/wooting.rules @@ -7,3 +7,8 @@ SUBSYSTEM=="hidraw", ATTRS{idVendor}=="03eb", ATTRS{idProduct}=="2402", MODE:="0 SUBSYSTEM=="hidraw", ATTRS{idVendor}=="03eb", ATTRS{idProduct}=="ff02", MODE:="0660", GROUP="input" # Wooting Two update mode SUBSYSTEM=="hidraw", ATTRS{idVendor}=="03eb", ATTRS{idProduct}=="2403", MODE:="0660", GROUP="input" + +# Wooting Two Lekker Edition +SUBSYSTEM=="hidraw", ATTRS{idVendor}=="31e3", ATTRS{idProduct}=="1210", MODE:="0660", GROUP="input" +# Wooting Two Lekker Edition update mode +SUBSYSTEM=="hidraw", ATTRS{idVendor}=="31e3", ATTRS{idProduct}=="121f", MODE:="0660", GROUP="input" diff --git a/pkgs/servers/home-assistant/component-packages.nix b/pkgs/servers/home-assistant/component-packages.nix index bef068f085ce..6d91d5fa72bc 100644 --- a/pkgs/servers/home-assistant/component-packages.nix +++ b/pkgs/servers/home-assistant/component-packages.nix @@ -2,7 +2,7 @@ # Do not edit! { - version = "2021.8.7"; + version = "2021.8.8"; components = { "abode" = ps: with ps; [ abodepy ]; "accuweather" = ps: with ps; [ accuweather ]; diff --git a/pkgs/servers/home-assistant/default.nix b/pkgs/servers/home-assistant/default.nix index a3a2b07c149d..7dd6edf17ded 100644 --- a/pkgs/servers/home-assistant/default.nix +++ b/pkgs/servers/home-assistant/default.nix @@ -134,7 +134,7 @@ let extraBuildInputs = extraPackages py.pkgs; # Don't forget to run parse-requirements.py after updating - hassVersion = "2021.8.7"; + hassVersion = "2021.8.8"; in with py.pkgs; buildPythonApplication rec { pname = "homeassistant"; @@ -151,7 +151,7 @@ in with py.pkgs; buildPythonApplication rec { owner = "home-assistant"; repo = "core"; rev = version; - sha256 = "0f69jcpxyr0kzziwl6bfj2jbn23hrj1796ml6jsk9mnpfkdsd9vi"; + sha256 = "1fj16qva04d9qhpnfxxacsp82vqqfha5c2zg4f850kld4qhwrgky"; }; # leave this in, so users don't have to constantly update their downstream patch handling diff --git a/pkgs/servers/klipper/default.nix b/pkgs/servers/klipper/default.nix index f120454ac84a..aa933b0fb660 100644 --- a/pkgs/servers/klipper/default.nix +++ b/pkgs/servers/klipper/default.nix @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { }; # We have no LTO on i686 since commit 22284b0 - postPatch = lib.optional stdenv.isi686 '' + postPatch = lib.optionalString stdenv.isi686 '' substituteInPlace chelper/__init__.py \ --replace "-flto -fwhole-program " "" ''; diff --git a/pkgs/servers/monitoring/prometheus/fritzbox-exporter-deps.nix b/pkgs/servers/monitoring/prometheus/fritzbox-exporter-deps.nix deleted file mode 100644 index 2d94ffeba26a..000000000000 --- a/pkgs/servers/monitoring/prometheus/fritzbox-exporter-deps.nix +++ /dev/null @@ -1,93 +0,0 @@ -# This file was generated by https://github.com/kamilchm/go2nix v1.3.0 -[ - { - goPackagePath = "github.com/123Haynes/go-http-digest-auth-client"; - fetch = { - type = "git"; - url = "https://github.com/123Haynes/go-http-digest-auth-client"; - rev = "4c2ff1556cab0c8c14069d8d116c34db59c50c54"; - sha256 = "0hpynnvwlxcdrrplvzibqk3179lzwkv8zlp03r6cd1vsd28b11ja"; - }; - } - { - goPackagePath = "github.com/beorn7/perks"; - fetch = { - type = "git"; - url = "https://github.com/beorn7/perks"; - rev = "4b2b341e8d7715fae06375aa633dbb6e91b3fb46"; - sha256 = "1i1nz1f6g55xi2y3aiaz5kqfgvknarbfl4f0sx4nyyb4s7xb1z9x"; - }; - } - { - goPackagePath = "github.com/golang/protobuf"; - fetch = { - type = "git"; - url = "https://github.com/golang/protobuf"; - rev = "e91709a02e0e8ff8b86b7aa913fdc9ae9498e825"; - sha256 = "16arbb7nwvs7lkpr7i9vrv8mk9h77zd3blzp3z9b0infqla4ddzc"; - }; - } - { - goPackagePath = "github.com/matttproud/golang_protobuf_extensions"; - fetch = { - type = "git"; - url = "https://github.com/matttproud/golang_protobuf_extensions"; - rev = "c182affec369e30f25d3eb8cd8a478dee585ae7d"; - sha256 = "1xqsf9vpcrd4hp95rl6kgmjvkv1df4aicfw4l5vfcxcwxknfx2xs"; - }; - } - { - goPackagePath = "github.com/mxschmitt/golang-env-struct"; - fetch = { - type = "git"; - url = "https://github.com/mxschmitt/golang-env-struct"; - rev = "0c54aeca83972d1c7adf812b37dc53a6cbf58fb7"; - sha256 = "19h840xhkglxwfbwx6w1qyndzg775b14kpz3xpq0lfrkfxdq0w9l"; - }; - } - { - goPackagePath = "github.com/pkg/errors"; - fetch = { - type = "git"; - url = "https://github.com/pkg/errors"; - rev = "27936f6d90f9c8e1145f11ed52ffffbfdb9e0af7"; - sha256 = "0yzmgi6g4ak4q8y7w6x0n5cbinlcn8yc3gwgzy4yck00qdn25d6y"; - }; - } - { - goPackagePath = "github.com/prometheus/client_golang"; - fetch = { - type = "git"; - url = "https://github.com/prometheus/client_golang"; - rev = "3f6cbd95606771ac9f7b1c9247d2ca186cb72cb9"; - sha256 = "1d9qc9jwqsgh6r5x5qkf6c6pkfb5jfhxls431ilhawn05fbyyypq"; - }; - } - { - goPackagePath = "github.com/prometheus/client_model"; - fetch = { - type = "git"; - url = "https://github.com/prometheus/client_model"; - rev = "fd36f4220a901265f90734c3183c5f0c91daa0b8"; - sha256 = "1bs5d72k361llflgl94c22n0w53j30rsfh84smgk8mbjbcmjsaa5"; - }; - } - { - goPackagePath = "github.com/prometheus/common"; - fetch = { - type = "git"; - url = "https://github.com/prometheus/common"; - rev = "c873fb1f9420b83ee703b4361c61183b4619f74d"; - sha256 = "1fmigir3c35nxmsj4bqwfp69kaxy415qk0ssi4wplcyd1g656lbg"; - }; - } - { - goPackagePath = "github.com/prometheus/procfs"; - fetch = { - type = "git"; - url = "https://github.com/prometheus/procfs"; - rev = "87a4384529e0652f5035fb5cc8095faf73ea9b0b"; - sha256 = "1rjd7hf5nvsdw2jpqpapfw6nv3w3zphfhkrh5p7nryakal6kcgmh"; - }; - } -] diff --git a/pkgs/servers/monitoring/prometheus/fritzbox-exporter.nix b/pkgs/servers/monitoring/prometheus/fritzbox-exporter.nix index cefa4579069f..bd8f667b11c2 100644 --- a/pkgs/servers/monitoring/prometheus/fritzbox-exporter.nix +++ b/pkgs/servers/monitoring/prometheus/fritzbox-exporter.nix @@ -1,28 +1,27 @@ -{ lib, buildGoPackage, fetchFromGitHub, nixosTests }: +{ lib, buildGoModule, fetchFromGitHub, nixosTests }: -buildGoPackage rec { +buildGoModule rec { pname = "fritzbox-exporter"; - version = "v1.0-32-g90fc0c5"; - rev = "90fc0c572d3340803f7c2aafc4b097db7af1f871"; + version = "unstable-2021-04-13"; src = fetchFromGitHub { - inherit rev; + rev = "fd36539bd7db191b3734e17934b5f1e78e4e9829"; owner = "mxschmitt"; repo = "fritzbox_exporter"; - sha256 = "08gcc60g187x1d14vh7n7s52zkqgj3fvg5v84i6dw55rmb6zzxri"; + sha256 = "0w9gdcnfc61q6mzm95i7kphsf1rngn8rb6kz1b6knrh5d8w61p1n"; }; - goPackagePath = "github.com/mxschmitt/fritzbox_exporter"; + subPackages = [ "cmd/exporter" ]; - goDeps = ./fritzbox-exporter-deps.nix; + vendorSha256 = "0k6bd052pjfg5c1ba1yhni8msv3wl512vfzy2hrk49jibh8h052n"; passthru.tests = { inherit (nixosTests.prometheus-exporters) fritzbox; }; meta = with lib; { description = "Prometheus Exporter for FRITZ!Box (TR64 and UPnP)"; - homepage = "https://github.com/ndecker/fritzbox_exporter"; + homepage = "https://github.com/mxschmitt/fritzbox_exporter"; license = licenses.asl20; - maintainers = with maintainers; [ bachp flokli ]; + maintainers = with maintainers; [ bachp flokli sbruder ]; platforms = platforms.unix; }; } diff --git a/pkgs/servers/monitoring/telegraf/default.nix b/pkgs/servers/monitoring/telegraf/default.nix index ef7b144a5b13..d92219ea71d8 100644 --- a/pkgs/servers/monitoring/telegraf/default.nix +++ b/pkgs/servers/monitoring/telegraf/default.nix @@ -2,7 +2,7 @@ buildGoModule rec { pname = "telegraf"; - version = "1.19.1"; + version = "1.19.3"; excludedPackages = "test"; @@ -12,15 +12,15 @@ buildGoModule rec { owner = "influxdata"; repo = "telegraf"; rev = "v${version}"; - sha256 = "sha256-8shyNKwSg3pUxfQsIHBNnIaks/86vHuHN/SroDE3QFU="; + sha256 = "sha256-14nwSLCurI9vNgZwad3qc2/yrvpc8Og8jojTCAfJ5F0="; }; - vendorSha256 = "sha256-GMNyeWa2dz+q4RYS+DDkpj9sx1PlPvSuWYcHSM2umRE="; + vendorSha256 = "sha256-J48ezMi9+PxohDKFhBpbcu6fdojlZPXnQQw2IcyimTA="; proxyVendor = true; - preBuild = '' - buildFlagsArray+=("-ldflags=-w -s -X main.version=${version}") - ''; + ldflags = [ + "-w" "-s" "-X main.version=${version}" + ]; passthru.tests = { inherit (nixosTests) telegraf; }; diff --git a/pkgs/servers/rpiplay/default.nix b/pkgs/servers/rpiplay/default.nix new file mode 100644 index 000000000000..672c6746abcb --- /dev/null +++ b/pkgs/servers/rpiplay/default.nix @@ -0,0 +1,49 @@ +{ lib, stdenv, pkg-config, fetchFromGitHub, fetchpatch, cmake, wrapGAppsHook, avahi, avahi-compat, openssl, gst_all_1, libplist }: + +stdenv.mkDerivation rec { + pname = "rpiplay"; + version = "unstable-2021-06-14"; + + src = fetchFromGitHub { + owner = "FD-"; + repo = "RPiPlay"; + rev = "35dd995fceed29183cbfad0d4110ae48e0635786"; + sha256 = "sha256-qe7ZTT45NYvzgnhRmz15uGT/FnGi9uppbKVbmch5B9A="; + }; + + patches = [ + # allow rpiplay to be used with firewall enabled. + # sets static ports 7000 7100 (tcp) and 6000 6001 7011 (udp) + (fetchpatch { + name = "use-static-ports.patch"; + url = "https://github.com/FD-/RPiPlay/commit/2ffc287ba822e1d2b2ed0fc0e41a2bb3d9dab105.patch"; + sha256 = "08dy829gyhyzw2n54zn5m3176cmd24k5hij24vpww5bhbwkbabww"; + }) + ]; + + nativeBuildInputs = [ + cmake + openssl + libplist + pkg-config + wrapGAppsHook + ]; + + buildInputs = [ + avahi + avahi-compat + gst_all_1.gstreamer + gst_all_1.gst-plugins-base + gst_all_1.gst-plugins-good + gst_all_1.gst-plugins-bad + gst_all_1.gst-plugins-ugly + ]; + + meta = with lib; { + homepage = "https://github.com/FD-/RPiPlay"; + description = "An open-source implementation of an AirPlay mirroring server."; + license = licenses.gpl3Plus; + maintainers = with maintainers; [ mschneider ]; + platforms = platforms.unix; + }; +} diff --git a/pkgs/servers/sql/mysql/5.7.x.nix b/pkgs/servers/sql/mysql/5.7.x.nix index 36e26d38fc48..c1ce4d9e1e14 100644 --- a/pkgs/servers/sql/mysql/5.7.x.nix +++ b/pkgs/servers/sql/mysql/5.7.x.nix @@ -16,7 +16,7 @@ self = stdenv.mkDerivation rec { sha256 = "1fhv16zr46pxm1j8vb8x8mh3nwzglg01arz8gnazbmjqldr5idpq"; }; - preConfigure = lib.optional stdenv.isDarwin '' + preConfigure = lib.optionalString stdenv.isDarwin '' ln -s /bin/ps $TMPDIR/ps export PATH=$PATH:$TMPDIR ''; diff --git a/pkgs/tools/admin/nomachine-client/default.nix b/pkgs/tools/admin/nomachine-client/default.nix index 0daa65cc9804..be4bef1e1609 100644 --- a/pkgs/tools/admin/nomachine-client/default.nix +++ b/pkgs/tools/admin/nomachine-client/default.nix @@ -1,9 +1,9 @@ { lib, stdenv, file, fetchurl, makeWrapper, autoPatchelfHook, jsoncpp, libpulseaudio }: let - versionMajor = "7.4"; - versionMinor = "1"; - versionBuild_x86_64 = "1"; + versionMajor = "7.6"; + versionMinor = "2"; + versionBuild_x86_64 = "4"; versionBuild_i686 = "1"; in stdenv.mkDerivation rec { @@ -14,12 +14,12 @@ in if stdenv.hostPlatform.system == "x86_64-linux" then fetchurl { url = "https://download.nomachine.com/download/${versionMajor}/Linux/nomachine_${version}_${versionBuild_x86_64}_x86_64.tar.gz"; - sha256 = "1qir9ii0h5ali87mjzjl72dm1ky626d7y59jfpglakqxzqhjamdz"; + sha256 = "1kkdf9dlp4j453blnwp1sds4r3h3fy863pvhdh466mrq3f10qca8"; } else if stdenv.hostPlatform.system == "i686-linux" then fetchurl { url = "https://download.nomachine.com/download/${versionMajor}/Linux/nomachine_${version}_${versionBuild_i686}_i686.tar.gz"; - sha256 = "1gxiysc09k3jz1pkkyfqgw2fygcnmrnskk6b9vn4fjnvsab4py60"; + sha256 = "0h4c90hzhbg0qdb585bc9gry9cf9hd8r53m2jha4fdqhzd95ydln"; } else throw "NoMachine client is not supported on ${stdenv.hostPlatform.system}"; @@ -90,4 +90,3 @@ in platforms = [ "x86_64-linux" "i686-linux" ]; }; } - diff --git a/pkgs/tools/admin/trivy/default.nix b/pkgs/tools/admin/trivy/default.nix index 50ca76f0d6d3..c3b90d99bafb 100644 --- a/pkgs/tools/admin/trivy/default.nix +++ b/pkgs/tools/admin/trivy/default.nix @@ -15,9 +15,9 @@ buildGoModule rec { excludedPackages = "misc"; - preBuild = '' - buildFlagsArray+=("-ldflags" "-s -w -X main.version=v${version}") - ''; + ldflags = [ + "-s" "-w" "-X main.version=v${version}" + ]; doInstallCheck = true; installCheckPhase = '' diff --git a/pkgs/tools/audio/beets/default.nix b/pkgs/tools/audio/beets/default.nix index 059174ae0a27..94f97e29af2f 100644 --- a/pkgs/tools/audio/beets/default.nix +++ b/pkgs/tools/audio/beets/default.nix @@ -100,18 +100,13 @@ let in pythonPackages.buildPythonApplication rec { pname = "beets"; - # While there is a stable version, 1.4.9, it is more than 1000 commits behind - # master and lacks many bug fixes and improvements[1]. Also important, - # unstable does not require bs1770gain[2]. - # [1]: https://discourse.beets.io/t/forming-a-beets-core-team/639 - # [2]: https://github.com/NixOS/nixpkgs/pull/90504 - version = "unstable-2021-05-13"; + version = "1.5.0"; src = fetchFromGitHub { owner = "beetbox"; repo = "beets"; - rev = "1faa41f8c558d3f4415e5e48cf4513d50b466d34"; - sha256 = "sha256-P0bV7WNqCYe9+3lqnFmAoRlb2asdsBUjzRMc24RngpU="; + rev = "v${version}"; + sha256 = "sha256-yQMCJUwpjDDhPffBS6LUq6z4iT1VyFQE0R27XEbYXbY="; }; propagatedBuildInputs = [ @@ -266,7 +261,6 @@ in pythonPackages.buildPythonApplication rec { passthru = { # FIXME: remove in favor of pkgs.beetsExternalPlugins externalPlugins = beetsExternalPlugins; - updateScript = unstableGitUpdater { url = "https://github.com/beetbox/beets"; }; }; meta = with lib; { diff --git a/pkgs/tools/audio/yabridge/default.nix b/pkgs/tools/audio/yabridge/default.nix index cbe35765cb4f..ac5767b24219 100644 --- a/pkgs/tools/audio/yabridge/default.nix +++ b/pkgs/tools/audio/yabridge/default.nix @@ -1,5 +1,5 @@ { lib -, stdenv +, multiStdenv , fetchFromGitHub , substituteAll , meson @@ -8,6 +8,7 @@ , wine , boost , libxcb +, pkgsi686Linux }: let @@ -55,16 +56,16 @@ let sha256 = "sha256-39pvfcg4fvf7DAbAPzEHA1ja1LFL6r88nEwNYwaDC8w="; }; }; -in stdenv.mkDerivation rec { +in multiStdenv.mkDerivation rec { pname = "yabridge"; - version = "3.3.1"; + version = "3.5.2"; # NOTE: Also update yabridgectl's cargoHash when this is updated src = fetchFromGitHub { owner = "robbert-vdh"; repo = pname; rev = version; - hash = "sha256-3B+6YuCWVJljqdyGpePjPf5JDwLSWFNgOCeLt8e4mO8="; + hash = "sha256-SLiksc8lQo2A5sefKbcaJyhi8vPdp2p2Jbc7bvM0sDw="; }; # Unpack subproject sources @@ -109,6 +110,7 @@ in stdenv.mkDerivation rec { mesonFlags = [ "--cross-file" "cross-wine.conf" + "-Dwith-bitbridge=true" # Requires CMake and is unnecessary "-Dtomlplusplus:GENERATE_CMAKE_CONFIG=disabled" @@ -118,11 +120,16 @@ in stdenv.mkDerivation rec { "-Dtomlplusplus:BUILD_TESTS=disabled" ]; + preConfigure = '' + sed -i "214s|xcb.*|xcb_32bit_dep = winegcc.find_library('xcb', dirs: [ '${lib.getLib pkgsi686Linux.xorg.libxcb}/lib', ])|" meson.build + sed -i "192 i '${lib.getLib pkgsi686Linux.boost}/lib'," meson.build + ''; + installPhase = '' runHook preInstall mkdir -p "$out/bin" "$out/lib" - cp yabridge-group.exe{,.so} "$out/bin" - cp yabridge-host.exe{,.so} "$out/bin" + cp yabridge-group*.exe{,.so} "$out/bin" + cp yabridge-host*.exe{,.so} "$out/bin" cp libyabridge-vst2.so "$out/lib" cp libyabridge-vst3.so "$out/lib" runHook postInstall diff --git a/pkgs/tools/audio/yabridge/hardcode-wine.patch b/pkgs/tools/audio/yabridge/hardcode-wine.patch index 2b6ce1f448fa..d58aedeb27ff 100644 --- a/pkgs/tools/audio/yabridge/hardcode-wine.patch +++ b/pkgs/tools/audio/yabridge/hardcode-wine.patch @@ -1,13 +1,13 @@ diff --git a/src/plugin/utils.cpp b/src/plugin/utils.cpp -index 1ff05bc..0723456 100644 +index 7fb7d1b3..eb227101 100644 --- a/src/plugin/utils.cpp +++ b/src/plugin/utils.cpp -@@ -351,7 +351,7 @@ std::string get_wine_version() { +@@ -105,5 +105,5 @@ std::string PluginInfo::wine_version() const { access(wineloader_path.c_str(), X_OK) == 0) { wine_path = wineloader_path; } else { - wine_path = bp::search_path("wine").string(); + wine_path = "@wine@/bin/wine"; } - + bp::ipstream output; diff --git a/pkgs/tools/audio/yabridgectl/default.nix b/pkgs/tools/audio/yabridgectl/default.nix index bf0913372beb..35c8b0c5aeff 100644 --- a/pkgs/tools/audio/yabridgectl/default.nix +++ b/pkgs/tools/audio/yabridgectl/default.nix @@ -11,7 +11,7 @@ rustPlatform.buildRustPackage rec { src = yabridge.src; sourceRoot = "source/tools/yabridgectl"; - cargoHash = "sha256-f5k5OF+bEzH0b6M14Mdp8t4Qd5dP5Qj2fDsdiG1MkYk="; + cargoHash = "sha256-2x3qB0LbCBUZ4zqKIXPtYdWis+4QANTaJdFvoFbccGE="; patches = [ # By default, yabridgectl locates libyabridge.so by using diff --git a/pkgs/tools/filesystems/moosefs/default.nix b/pkgs/tools/filesystems/moosefs/default.nix index e07ca270b5c8..dc1d77bfa7ed 100644 --- a/pkgs/tools/filesystems/moosefs/default.nix +++ b/pkgs/tools/filesystems/moosefs/default.nix @@ -35,7 +35,7 @@ stdenv.mkDerivation rec { "/usr/local/lib/pkgconfig" "/nonexistent" ''; - preBuild = lib.optional stdenv.isDarwin '' + preBuild = lib.optionalString stdenv.isDarwin '' substituteInPlace config.h --replace \ "#define HAVE_STRUCT_STAT_ST_BIRTHTIME 1" \ "#undef HAVE_STRUCT_STAT_ST_BIRTHTIME" diff --git a/pkgs/tools/graphics/agi/default.nix b/pkgs/tools/graphics/agi/default.nix index b78cafe566a6..7aaf28764d2b 100644 --- a/pkgs/tools/graphics/agi/default.nix +++ b/pkgs/tools/graphics/agi/default.nix @@ -14,11 +14,11 @@ stdenv.mkDerivation rec { pname = "agi"; - version = "2.1.0-dev-20210809"; + version = "2.1.0-dev-20210820"; src = fetchzip { url = "https://github.com/google/agi-dev-releases/releases/download/v${version}/agi-${version}-linux.zip"; - sha256 = "sha256-n1a35syStFbhpVGyi/7oxWzBb2lXyVZd3K8/Bt8b0Lg="; + sha256 = "sha256-XsjWrih+8D3z1I41N5ZoLar/+5FV9mPN9aMbyZK2m/0="; }; nativeBuildInputs = [ diff --git a/pkgs/tools/inputmethods/emote/default.nix b/pkgs/tools/inputmethods/emote/default.nix new file mode 100644 index 000000000000..d65831d5202e --- /dev/null +++ b/pkgs/tools/inputmethods/emote/default.nix @@ -0,0 +1,56 @@ +{ lib, fetchFromGitHub, python3Packages, wrapGAppsHook, gobject-introspection, gtk3, keybinder3, xdotool, pango, gdk-pixbuf, atk, librsvg }: + +python3Packages.buildPythonApplication rec { + pname = "emote"; + version = "2.0.0"; + + src = fetchFromGitHub { + owner = "tom-james-watson"; + repo = "Emote"; + rev = "v${version}"; + sha256 = "kYXFD6VBnuEZ0ZMsF6ZmN4V0JN83puxRILpNlllVsKQ="; + }; + + postPatch = '' + substituteInPlace setup.py --replace "pygobject==3.36.0" "pygobject" + substituteInPlace emote/config.py --replace 'os.environ.get("SNAP")' "'$out/share/emote'" + substituteInPlace snap/gui/emote.desktop --replace "Icon=\''${SNAP}/usr/share/icons/emote.svg" "Icon=emote.svg" + ''; + + nativeBuildInputs = [ + wrapGAppsHook + gobject-introspection + keybinder3 + pango + gdk-pixbuf + atk + ]; + + propagatedBuildInputs = [ + python3Packages.pygobject3 + gtk3 + xdotool + librsvg + ]; + + postInstall = '' + install -D snap/gui/emote.desktop $out/share/applications/emote.desktop + install -D snap/gui/emote.svg $out/share/pixmaps/emote.svg + install -D -t $out/share/emote/static static/{emojis.json,logo.svg,style.css} + ''; + + dontWrapGApps = true; + preFixup = '' + makeWrapperArgs+=("''${gappsWrapperArgs[@]}") + ''; + + doCheck = false; + + meta = with lib; { + description = "A modern emoji picker for Linux"; + homepage = "https://github.com/tom-james-watson/emote"; + license = licenses.gpl3Plus; + maintainers = with maintainers; [ angustrau ]; + platforms = platforms.linux; + }; +} diff --git a/pkgs/tools/misc/disfetch/default.nix b/pkgs/tools/misc/disfetch/default.nix index 7a8035fa7cf4..13e60072adee 100644 --- a/pkgs/tools/misc/disfetch/default.nix +++ b/pkgs/tools/misc/disfetch/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "disfetch"; - version = "2.12"; + version = "2.13"; src = fetchFromGitHub { owner = "q60"; repo = "disfetch"; rev = version; - sha256 = "sha256-+6U5BdLmdTaFzgZmjSH7rIL9JTwIX7bFkQqm0rNuTRY="; + sha256 = "sha256-+0WWhf7VYqPWgt1IwKQ74HLCLfhXsstA7Eh9VU/BKhg="; }; dontBuild = true; diff --git a/pkgs/tools/misc/envdir-go/default.nix b/pkgs/tools/misc/envdir-go/default.nix index eafc71030ac8..8f847df3d5d1 100644 --- a/pkgs/tools/misc/envdir-go/default.nix +++ b/pkgs/tools/misc/envdir-go/default.nix @@ -14,10 +14,10 @@ buildGoPackage rec { sha256 = "1wdlblj127skgynf9amk7waabc3abbyxys9dvyc6c72zpcpdy5nc"; }; - preBuild = '' - # TODO: is there a way to get the commit ref so we can set main.buildCommit? - buildFlagsArray+=("-ldflags" "-X main.buildDate=1970-01-01T00:00:00+0000 -X main.buildVersion=${version}") -''; + # TODO: is there a way to get the commit ref so we can set main.buildCommit? + ldflags = [ + "-X main.buildDate=1970-01-01T00:00:00+0000" "-X main.buildVersion=${version}" + ]; meta = { description = "A go rewrite of envdir"; diff --git a/pkgs/tools/misc/goss/default.nix b/pkgs/tools/misc/goss/default.nix index bbe947ecd120..c4396bfae9fb 100644 --- a/pkgs/tools/misc/goss/default.nix +++ b/pkgs/tools/misc/goss/default.nix @@ -14,9 +14,9 @@ buildGoModule rec { vendorSha256 = "1lyqjkwj8hybj5swyrv6357hs8sxmf4wim0c8yhfb9mv7fsxhrv7"; CGO_ENABLED = 0; - preBuild = '' - buildFlagsArray+=("-ldflags" "-s -w -X main.version=v${version}") - ''; + ldflags = [ + "-s" "-w" "-X main.version=v${version}" + ]; meta = with lib; { homepage = "https://github.com/aelsabbahy/goss/"; diff --git a/pkgs/tools/misc/noti/default.nix b/pkgs/tools/misc/noti/default.nix index 9bfc7e259d5b..c964a8872f83 100644 --- a/pkgs/tools/misc/noti/default.nix +++ b/pkgs/tools/misc/noti/default.nix @@ -16,9 +16,9 @@ buildGoPackage rec { goPackagePath = "github.com/variadico/noti"; - preBuild = '' - buildFlagsArray+=("-ldflags" "-X ${goPackagePath}/internal/command.Version=${version}") - ''; + ldflags = [ + "-X ${goPackagePath}/internal/command.Version=${version}" + ]; postInstall = '' install -Dm444 -t $out/share/man/man1 $src/docs/man/*.1 diff --git a/pkgs/tools/misc/pgmetrics/default.nix b/pkgs/tools/misc/pgmetrics/default.nix index 54e7093747bf..955444ff8c87 100644 --- a/pkgs/tools/misc/pgmetrics/default.nix +++ b/pkgs/tools/misc/pgmetrics/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "pgmetrics"; - version = "1.10.5"; + version = "1.11.0"; src = fetchFromGitHub { owner = "rapidloop"; repo = pname; rev = "v${version}"; - sha256 = "sha256-rqaK94Rw0K1+r7+7jHI2bzBupCGTkokeC4heJ3Yu6pQ="; + sha256 = "sha256-8E4rciuoZrj8Oz2EXqtFgrPxvb8GJO3n1s2FpXrR0Q0="; }; - vendorSha256 = "sha256-5f2hkOgAE4TrHNz7xx1RU9fozxjFZAl4HilhAqsbo5s="; + vendorSha256 = "sha256-scaaRjaDE/RG6Ei83CJBkfQCd1e5pH/Cs2vEbdl9Oyg="; doCheck = false; diff --git a/pkgs/tools/misc/traefik-certs-dumper/default.nix b/pkgs/tools/misc/traefik-certs-dumper/default.nix new file mode 100644 index 000000000000..fc0062185b23 --- /dev/null +++ b/pkgs/tools/misc/traefik-certs-dumper/default.nix @@ -0,0 +1,23 @@ +{ fetchFromGitHub, buildGoModule, lib }: + +buildGoModule rec { + pname = "traefik-certs-dumper"; + version = "2.7.4"; + + src = fetchFromGitHub { + owner = "ldez"; + repo = pname; + rev = "v${version}"; + sha256 = "sha256-exkBDrNGvpOz/VD6yfE1PKL4hzs/oZ+RxMwm/ytuV/0="; + }; + + vendorSha256 = "sha256-NmYfdX5BKHZvFzlkh/kkK0voOzNj1EPn53Mz/B7eLd0="; + excludedPackages = "integrationtest"; + + meta = with lib; { + description = "dump ACME data from traefik to certificates"; + homepage = "https://github.com/ldez/traefik-certs-dumper"; + license = licenses.asl20; + maintainers = with maintainers; [ nickcao ]; + }; +} diff --git a/pkgs/tools/networking/aria2/default.nix b/pkgs/tools/networking/aria2/default.nix index 7e4f06302f2e..db239e034f51 100644 --- a/pkgs/tools/networking/aria2/default.nix +++ b/pkgs/tools/networking/aria2/default.nix @@ -6,13 +6,13 @@ stdenv.mkDerivation rec { pname = "aria2"; - version = "1.35.0"; + version = "1.36.0"; src = fetchFromGitHub { owner = "aria2"; repo = "aria2"; rev = "release-${version}"; - sha256 = "195r3711ly3drf9jkygwdc2m7q99hiqlfrig3ip1127b837gzsf9"; + sha256 = "sha256-ErjFfSJDIgZq0qy0Zn5uZ9bZS2AtJq4FuBVuUuQgPTI="; }; nativeBuildInputs = [ pkg-config autoreconfHook sphinx ]; diff --git a/pkgs/tools/networking/assh/default.nix b/pkgs/tools/networking/assh/default.nix index 7d3c662b368f..5bbedf0f7e5b 100644 --- a/pkgs/tools/networking/assh/default.nix +++ b/pkgs/tools/networking/assh/default.nix @@ -20,9 +20,9 @@ buildGoModule rec { doCheck = false; - preBuild = '' - buildFlagsArray+=("-ldflags" "-s -w -X moul.io/assh/v2/pkg/version.Version=${version}") - ''; + ldflags = [ + "-s" "-w" "-X moul.io/assh/v2/pkg/version.Version=${version}" + ]; nativeBuildInputs = [ makeWrapper ]; diff --git a/pkgs/tools/networking/dhcpcd/default.nix b/pkgs/tools/networking/dhcpcd/default.nix index cc1bad106f75..0962335ad1a3 100644 --- a/pkgs/tools/networking/dhcpcd/default.nix +++ b/pkgs/tools/networking/dhcpcd/default.nix @@ -44,7 +44,7 @@ stdenv.mkDerivation rec { installFlags = [ "DBDIR=$(TMPDIR)/db" "SYSCONFDIR=${placeholder "out"}/etc" ]; # Check that the udev plugin got built. - postInstall = lib.optional (udev != null) "[ -e ${placeholder "out"}/lib/dhcpcd/dev/udev.so ]"; + postInstall = lib.optionalString (udev != null) "[ -e ${placeholder "out"}/lib/dhcpcd/dev/udev.so ]"; meta = with lib; { description = "A client for the Dynamic Host Configuration Protocol (DHCP)"; diff --git a/pkgs/tools/networking/mu/default.nix b/pkgs/tools/networking/mu/default.nix index 468bc127228a..694c1f5e721f 100644 --- a/pkgs/tools/networking/mu/default.nix +++ b/pkgs/tools/networking/mu/default.nix @@ -7,13 +7,13 @@ stdenv.mkDerivation rec { pname = "mu"; - version = "1.6.3"; + version = "1.6.4"; src = fetchFromGitHub { owner = "djcb"; repo = "mu"; rev = version; - sha256 = "hmP2bcoBWMd2GZBE8XtJ5QePpWnkJV5pu69aDmL5V4g="; + sha256 = "rRBi6bgxkVQ94wLBqVQikIE0jVkvm1fjtEzFMsQTJz8="; }; postPatch = lib.optionalString (batchSize != null) '' diff --git a/pkgs/tools/networking/ofono/default.nix b/pkgs/tools/networking/ofono/default.nix index 93e1415b91c4..c1d6b7615471 100644 --- a/pkgs/tools/networking/ofono/default.nix +++ b/pkgs/tools/networking/ofono/default.nix @@ -46,6 +46,10 @@ stdenv.mkDerivation rec { "--enable-external-ell" ]; + installFlags = [ + "SYSCONFDIR=${placeholder "out"}/etc" + ]; + postInstall = '' rm -r $out/etc/ofono ln -s /etc/ofono $out/etc/ofono diff --git a/pkgs/tools/networking/stunnel/default.nix b/pkgs/tools/networking/stunnel/default.nix index befc1c3c3eef..68c2fc935fcd 100644 --- a/pkgs/tools/networking/stunnel/default.nix +++ b/pkgs/tools/networking/stunnel/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "stunnel"; - version = "5.59"; + version = "5.60"; src = fetchurl { url = "https://www.stunnel.org/downloads/${pname}-${version}.tar.gz"; - sha256 = "sha256-E3d232vo8XAfHNWQt3eZMuEjR5+5HlGSFxwWeYgVzp8="; + sha256 = "sha256-xF12WxUhhh/qmwO0JbndfUizBVEowK7Gc7ul75uPeH0="; # please use the contents of "https://www.stunnel.org/downloads/${name}.tar.gz.sha256", # not the output of `nix-prefetch-url` }; diff --git a/pkgs/tools/security/bettercap/default.nix b/pkgs/tools/security/bettercap/default.nix index 9d2adfd9a7d2..cdd50aaa809a 100644 --- a/pkgs/tools/security/bettercap/default.nix +++ b/pkgs/tools/security/bettercap/default.nix @@ -10,16 +10,16 @@ buildGoModule rec { pname = "bettercap"; - version = "2.31.1"; + version = "2.32.0"; src = fetchFromGitHub { owner = pname; repo = pname; rev = "v${version}"; - sha256 = "sha256-vZajnKjuIFoNnjxSsFkkpxyCR27VWqVN4lGf9SadmPU="; + sha256 = "sha256-OND8WPqU/95rKykqMAPWmDsJ+AjsjGjrncZ2/m3mpt0="; }; - vendorSha256 = "sha256-et6D+M+xJbxIiDP7JRRABZ8UqUCpt9ZVI5DP45tyTGM="; + vendorSha256 = "sha256-QKv8F9QLRi+1Bqj9KywJsTErjs7o6gFM4tJLA8y52MY="; doCheck = false; diff --git a/pkgs/tools/security/exploitdb/default.nix b/pkgs/tools/security/exploitdb/default.nix index 0adad70f86a2..24b45aae1332 100644 --- a/pkgs/tools/security/exploitdb/default.nix +++ b/pkgs/tools/security/exploitdb/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "exploitdb"; - version = "2021-08-19"; + version = "2021-08-21"; src = fetchFromGitHub { owner = "offensive-security"; repo = pname; rev = version; - sha256 = "sha256-4GUjQ36FXgDZpLkGXSLy1GEx5+SYYumRpRR2Ucqzeuc="; + sha256 = "sha256-3XSk6a8gaCF8X1Plyfyi1Jtfp2sDLgbstv67hvlM3Gk="; }; installPhase = '' diff --git a/pkgs/tools/security/gitleaks/default.nix b/pkgs/tools/security/gitleaks/default.nix index 3cd4ae69b9f9..13c44c49c61e 100644 --- a/pkgs/tools/security/gitleaks/default.nix +++ b/pkgs/tools/security/gitleaks/default.nix @@ -16,9 +16,9 @@ buildGoModule rec { vendorSha256 = "sha256-Cc4DJPpOMHxDcH22S7znYo7QHNRXv8jOJhznu09kaE4="; - preBuild = '' - buildFlagsArray+=("-ldflags" "-s -w -X github.com/zricethezav/gitleaks/v${lib.versions.major version}/version.Version=${version}") - ''; + ldflags = [ + "-s" "-w" "-X github.com/zricethezav/gitleaks/v${lib.versions.major version}/version.Version=${version}" + ]; meta = with lib; { description = "Scan git repos (or files) for secrets"; diff --git a/pkgs/tools/security/grype/default.nix b/pkgs/tools/security/grype/default.nix index c24515dd1bbb..571bf03d1b06 100644 --- a/pkgs/tools/security/grype/default.nix +++ b/pkgs/tools/security/grype/default.nix @@ -19,9 +19,9 @@ buildGoModule rec { propagatedBuildInputs = [ docker ]; - preBuild = '' - buildFlagsArray+=("-ldflags" "-s -w -X github.com/anchore/grype/internal/version.version=${version}") - ''; + ldflags = [ + "-s" "-w" "-X github.com/anchore/grype/internal/version.version=${version}" + ]; # Tests require a running Docker instance doCheck = false; diff --git a/pkgs/tools/security/kiterunner/default.nix b/pkgs/tools/security/kiterunner/default.nix index a553202b6c1b..a455c17d717c 100644 --- a/pkgs/tools/security/kiterunner/default.nix +++ b/pkgs/tools/security/kiterunner/default.nix @@ -16,9 +16,9 @@ buildGoModule rec { vendorSha256 = "1nczzzsnh38qi949ki5268y39ggkwncanc1pv7727qpwllzl62vy"; - preBuild = '' - buildFlagsArray+=("-ldflags" "-s -w -X github.com/assetnote/kiterunner/cmd/kiterunner/cmd.Version=${version}") - ''; + ldflags = [ + "-s" "-w" "-X github.com/assetnote/kiterunner/cmd/kiterunner/cmd.Version=${version}" + ]; subPackages = [ "./cmd/kiterunner" ]; diff --git a/pkgs/tools/security/onlykey-agent/default.nix b/pkgs/tools/security/onlykey-agent/default.nix new file mode 100644 index 000000000000..84c65b913458 --- /dev/null +++ b/pkgs/tools/security/onlykey-agent/default.nix @@ -0,0 +1,61 @@ +{ lib +, python3Packages +, onlykey-cli +}: + +let + # onlykey requires a patched version of libagent + lib-agent = with python3Packages; libagent.overridePythonAttrs (oa: rec{ + version = "1.0.2"; + src = fetchPypi { + inherit version; + pname = "lib-agent"; + sha256 = "sha256-NAimivO3m4UUPM4JgLWGq2FbXOaXdQEL/DqZAcy+kEw="; + }; + propagatedBuildInputs = oa.propagatedBuildInputs or [ ] ++ [ + pynacl + docutils + pycryptodome + wheel + ]; + + # turn off testing because I can't get it to work + doCheck = false; + pythonImportsCheck = [ "libagent" ]; + + meta = oa.meta // { + description = "Using OnlyKey as hardware SSH and GPG agent"; + homepage = "https://github.com/trustcrypto/onlykey-agent/tree/ledger"; + maintainers = with maintainers; [ kalbasit ]; + }; + }); +in +python3Packages.buildPythonApplication rec { + pname = "onlykey-agent"; + version = "1.1.11"; + + src = python3Packages.fetchPypi { + inherit pname version; + sha256 = "sha256-YH/cqQOVy5s6dTp2JwxM3s4xRTXgwhOr00whtHAwZZI="; + }; + + propagatedBuildInputs = with python3Packages; [ lib-agent onlykey-cli ]; + + # move the python library into the sitePackages. + postInstall = '' + mkdir $out/${python3Packages.python.sitePackages}/onlykey_agent + mv $out/bin/onlykey_agent.py $out/${python3Packages.python.sitePackages}/onlykey_agent/__init__.py + chmod a-x $out/${python3Packages.python.sitePackages}/onlykey_agent/__init__.py + ''; + + # no tests + doCheck = false; + pythonImportsCheck = [ "onlykey_agent" ]; + + meta = with lib; { + description = " The OnlyKey agent is essentially middleware that lets you use OnlyKey as a hardware SSH/GPG device."; + homepage = "https://github.com/trustcrypto/onlykey-agent"; + license = licenses.lgpl3Only; + maintainers = with maintainers; [ kalbasit ]; + }; +} diff --git a/pkgs/tools/security/safe/default.nix b/pkgs/tools/security/safe/default.nix index 503cfbd9e868..747528b0ac4e 100644 --- a/pkgs/tools/security/safe/default.nix +++ b/pkgs/tools/security/safe/default.nix @@ -18,9 +18,9 @@ buildGoPackage rec { goPackagePath = "github.com/starkandwayne/safe"; - preBuild = '' - buildFlagsArray+=("-ldflags" "-X main.Version=${version}") - ''; + ldflags = [ + "-X main.Version=${version}" + ]; meta = with lib; { description = "A Vault CLI"; diff --git a/pkgs/tools/security/teler/default.nix b/pkgs/tools/security/teler/default.nix index a4bcc87eedf9..ffcab3a41877 100644 --- a/pkgs/tools/security/teler/default.nix +++ b/pkgs/tools/security/teler/default.nix @@ -16,9 +16,9 @@ buildGoModule rec { vendorSha256 = "sha256-TQjwPem+RMuoF5T02CL/CTvBS6W7Q786gTvYUFIvxjE="; - preBuild = '' - buildFlagsArray+=("-ldflags" "-s -w -X ktbs.dev/teler/common.Version=${version}") - ''; + ldflags = [ + "-s" "-w" "-X ktbs.dev/teler/common.Version=${version}" + ]; # test require internet access doCheck = false; diff --git a/pkgs/tools/system/battop/battery.patch b/pkgs/tools/system/battop/battery.patch new file mode 100644 index 000000000000..218359d904fe --- /dev/null +++ b/pkgs/tools/system/battop/battery.patch @@ -0,0 +1,588 @@ +diff --git a/Cargo.lock b/Cargo.lock +index 57ee609..d156cd2 100644 +--- a/Cargo.lock ++++ b/Cargo.lock +@@ -1,430 +1,429 @@ + # This file is automatically @generated by Cargo. + # It is not intended for manual editing. ++version = 3 ++ + [[package]] + name = "autocfg" + version = "0.1.4" + source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "0e49efa51329a5fd37e7c79db4621af617cd4e3e5bc224939808d076077077bf" + + [[package]] + name = "battery" +-version = "0.7.4" ++version = "0.7.8" + source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "b4b624268937c0e0a3edb7c27843f9e547c320d730c610d3b8e6e8e95b2026e4" + dependencies = [ +- "cfg-if 0.1.9 (registry+https://github.com/rust-lang/crates.io-index)", +- "core-foundation 0.6.4 (registry+https://github.com/rust-lang/crates.io-index)", +- "lazycell 1.2.1 (registry+https://github.com/rust-lang/crates.io-index)", +- "libc 0.2.58 (registry+https://github.com/rust-lang/crates.io-index)", +- "mach 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)", +- "nix 0.14.0 (registry+https://github.com/rust-lang/crates.io-index)", +- "num-traits 0.2.8 (registry+https://github.com/rust-lang/crates.io-index)", +- "uom 0.23.1 (registry+https://github.com/rust-lang/crates.io-index)", +- "winapi 0.3.7 (registry+https://github.com/rust-lang/crates.io-index)", ++ "cfg-if 1.0.0", ++ "core-foundation", ++ "lazycell", ++ "libc", ++ "mach", ++ "nix", ++ "num-traits", ++ "uom", ++ "winapi", + ] + + [[package]] + name = "battop" + version = "0.2.4" + dependencies = [ +- "battery 0.7.4 (registry+https://github.com/rust-lang/crates.io-index)", +- "humantime 1.2.0 (registry+https://github.com/rust-lang/crates.io-index)", +- "itertools 0.8.0 (registry+https://github.com/rust-lang/crates.io-index)", +- "log 0.4.6 (registry+https://github.com/rust-lang/crates.io-index)", +- "stderrlog 0.4.1 (registry+https://github.com/rust-lang/crates.io-index)", +- "structopt 0.2.17 (registry+https://github.com/rust-lang/crates.io-index)", +- "termion 1.5.2 (registry+https://github.com/rust-lang/crates.io-index)", +- "tui 0.6.0 (registry+https://github.com/rust-lang/crates.io-index)", ++ "battery", ++ "humantime", ++ "itertools", ++ "log", ++ "stderrlog", ++ "structopt", ++ "termion", ++ "tui", + ] + + [[package]] + name = "bitflags" +-version = "1.0.4" ++version = "1.2.1" + source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "cf1de2fe8c75bc145a2f577add951f8134889b4795d47466a54a5c846d691693" + + [[package]] + name = "cassowary" + version = "0.3.0" + source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "df8670b8c7b9dae1793364eafadf7239c40d669904660c5960d74cfd80b46a53" + + [[package]] + name = "cc" + version = "1.0.37" + source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "39f75544d7bbaf57560d2168f28fd649ff9c76153874db88bdbdfd839b1a7e7d" + + [[package]] + name = "cfg-if" + version = "0.1.9" + source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "b486ce3ccf7ffd79fdeb678eac06a9e6c09fc88d33836340becb8fffe87c5e33" ++ ++[[package]] ++name = "cfg-if" ++version = "1.0.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd" + + [[package]] + name = "chrono" + version = "0.4.6" + source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "45912881121cb26fad7c38c17ba7daa18764771836b34fab7d3fbd93ed633878" + dependencies = [ +- "num-integer 0.1.41 (registry+https://github.com/rust-lang/crates.io-index)", +- "num-traits 0.2.8 (registry+https://github.com/rust-lang/crates.io-index)", +- "time 0.1.42 (registry+https://github.com/rust-lang/crates.io-index)", ++ "num-integer", ++ "num-traits", ++ "time", + ] + + [[package]] + name = "clap" + version = "2.33.0" + source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "5067f5bb2d80ef5d68b4c87db81601f0b75bca627bc2ef76b141d7b846a3c6d9" + dependencies = [ +- "bitflags 1.0.4 (registry+https://github.com/rust-lang/crates.io-index)", +- "textwrap 0.11.0 (registry+https://github.com/rust-lang/crates.io-index)", +- "unicode-width 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)", ++ "bitflags", ++ "textwrap", ++ "unicode-width", + ] + + [[package]] + name = "core-foundation" +-version = "0.6.4" ++version = "0.7.0" + source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "57d24c7a13c43e870e37c1556b74555437870a04514f7685f5b354e090567171" + dependencies = [ +- "core-foundation-sys 0.6.2 (registry+https://github.com/rust-lang/crates.io-index)", +- "libc 0.2.58 (registry+https://github.com/rust-lang/crates.io-index)", ++ "core-foundation-sys", ++ "libc", + ] + + [[package]] + name = "core-foundation-sys" +-version = "0.6.2" ++version = "0.7.0" + source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "b3a71ab494c0b5b860bdc8407ae08978052417070c2ced38573a9157ad75b8ac" + + [[package]] + name = "either" + version = "1.5.2" + source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "5527cfe0d098f36e3f8839852688e63c8fff1c90b2b405aef730615f9a7bcf7b" + + [[package]] + name = "heck" + version = "0.3.1" + source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "20564e78d53d2bb135c343b3f47714a56af2061f1c928fdb541dc7b9fdd94205" + dependencies = [ +- "unicode-segmentation 1.3.0 (registry+https://github.com/rust-lang/crates.io-index)", ++ "unicode-segmentation", + ] + + [[package]] + name = "humantime" + version = "1.2.0" + source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "3ca7e5f2e110db35f93b837c81797f3714500b81d517bf20c431b16d3ca4f114" + dependencies = [ +- "quick-error 1.2.2 (registry+https://github.com/rust-lang/crates.io-index)", ++ "quick-error", + ] + + [[package]] + name = "itertools" + version = "0.8.0" + source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "5b8467d9c1cebe26feb08c640139247fac215782d35371ade9a2136ed6085358" + dependencies = [ +- "either 1.5.2 (registry+https://github.com/rust-lang/crates.io-index)", ++ "either", + ] + + [[package]] + name = "lazy_static" + version = "1.3.0" + source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "bc5729f27f159ddd61f4df6228e827e86643d4d3e7c32183cb30a1c08f604a14" + + [[package]] + name = "lazycell" +-version = "1.2.1" ++version = "1.3.0" + source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "830d08ce1d1d941e6b30645f1a0eb5643013d835ce3779a5fc208261dbe10f55" + + [[package]] + name = "libc" +-version = "0.2.58" ++version = "0.2.98" + source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "320cfe77175da3a483efed4bc0adc1968ca050b098ce4f2f1c13a56626128790" + + [[package]] + name = "log" + version = "0.4.6" + source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "c84ec4b527950aa83a329754b01dbe3f58361d1c5efacd1f6d68c494d08a17c6" + dependencies = [ +- "cfg-if 0.1.9 (registry+https://github.com/rust-lang/crates.io-index)", ++ "cfg-if 0.1.9", + ] + + [[package]] + name = "mach" +-version = "0.2.3" ++version = "0.3.2" + source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "b823e83b2affd8f40a9ee8c29dbc56404c1e34cd2710921f2801e2cf29527afa" + dependencies = [ +- "libc 0.2.58 (registry+https://github.com/rust-lang/crates.io-index)", ++ "libc", + ] + + [[package]] + name = "nix" +-version = "0.14.0" ++version = "0.19.1" + source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "b2ccba0cfe4fdf15982d1674c69b1fd80bad427d293849982668dfe454bd61f2" + dependencies = [ +- "bitflags 1.0.4 (registry+https://github.com/rust-lang/crates.io-index)", +- "cc 1.0.37 (registry+https://github.com/rust-lang/crates.io-index)", +- "cfg-if 0.1.9 (registry+https://github.com/rust-lang/crates.io-index)", +- "libc 0.2.58 (registry+https://github.com/rust-lang/crates.io-index)", +- "void 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)", ++ "bitflags", ++ "cc", ++ "cfg-if 1.0.0", ++ "libc", + ] + + [[package]] + name = "num-integer" + version = "0.1.41" + source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "b85e541ef8255f6cf42bbfe4ef361305c6c135d10919ecc26126c4e5ae94bc09" + dependencies = [ +- "autocfg 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)", +- "num-traits 0.2.8 (registry+https://github.com/rust-lang/crates.io-index)", ++ "autocfg", ++ "num-traits", + ] + + [[package]] + name = "num-traits" + version = "0.2.8" + source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "6ba9a427cfca2be13aa6f6403b0b7e7368fe982bfa16fccc450ce74c46cd9b32" + dependencies = [ +- "autocfg 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)", ++ "autocfg", + ] + + [[package]] + name = "numtoa" + version = "0.1.0" + source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "b8f8bdf33df195859076e54ab11ee78a1b208382d3a26ec40d142ffc1ecc49ef" + + [[package]] + name = "proc-macro2" + version = "0.4.30" + source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "cf3d2011ab5c909338f7887f4fc896d35932e29146c12c8d01da6b22a80ba759" + dependencies = [ +- "unicode-xid 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)", ++ "unicode-xid", + ] + + [[package]] + name = "quick-error" + version = "1.2.2" + source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "9274b940887ce9addde99c4eee6b5c44cc494b182b97e73dc8ffdcb3397fd3f0" + + [[package]] + name = "quote" + version = "0.6.12" + source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "faf4799c5d274f3868a4aae320a0a182cbd2baee377b378f080e16a23e9d80db" + dependencies = [ +- "proc-macro2 0.4.30 (registry+https://github.com/rust-lang/crates.io-index)", ++ "proc-macro2", + ] + + [[package]] + name = "redox_syscall" + version = "0.1.54" + source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "12229c14a0f65c4f1cb046a3b52047cdd9da1f4b30f8a39c5063c8bae515e252" + + [[package]] + name = "redox_termios" + version = "0.1.1" + source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "7e891cfe48e9100a70a3b6eb652fef28920c117d366339687bd5576160db0f76" + dependencies = [ +- "redox_syscall 0.1.54 (registry+https://github.com/rust-lang/crates.io-index)", ++ "redox_syscall", + ] + + [[package]] + name = "stderrlog" + version = "0.4.1" + source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "61dc66b7ae72b65636dbf36326f9638fb3ba27871bb737a62e2c309b87d91b70" + dependencies = [ +- "chrono 0.4.6 (registry+https://github.com/rust-lang/crates.io-index)", +- "log 0.4.6 (registry+https://github.com/rust-lang/crates.io-index)", +- "termcolor 0.3.6 (registry+https://github.com/rust-lang/crates.io-index)", +- "thread_local 0.3.6 (registry+https://github.com/rust-lang/crates.io-index)", ++ "chrono", ++ "log", ++ "termcolor", ++ "thread_local", + ] + + [[package]] + name = "structopt" + version = "0.2.17" + source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "c767a8971f53d7324583085deee2e230903be09e52fb27df9af94c5cb2b43c31" + dependencies = [ +- "clap 2.33.0 (registry+https://github.com/rust-lang/crates.io-index)", +- "structopt-derive 0.2.17 (registry+https://github.com/rust-lang/crates.io-index)", ++ "clap", ++ "structopt-derive", + ] + + [[package]] + name = "structopt-derive" + version = "0.2.17" + source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "c57a30c87454ced2186f62f940e981746e8cbbe026d52090c8c4352b636f8235" + dependencies = [ +- "heck 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)", +- "proc-macro2 0.4.30 (registry+https://github.com/rust-lang/crates.io-index)", +- "quote 0.6.12 (registry+https://github.com/rust-lang/crates.io-index)", +- "syn 0.15.34 (registry+https://github.com/rust-lang/crates.io-index)", ++ "heck", ++ "proc-macro2", ++ "quote", ++ "syn", + ] + + [[package]] + name = "syn" + version = "0.15.34" + source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "a1393e4a97a19c01e900df2aec855a29f71cf02c402e2f443b8d2747c25c5dbe" + dependencies = [ +- "proc-macro2 0.4.30 (registry+https://github.com/rust-lang/crates.io-index)", +- "quote 0.6.12 (registry+https://github.com/rust-lang/crates.io-index)", +- "unicode-xid 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)", ++ "proc-macro2", ++ "quote", ++ "unicode-xid", + ] + + [[package]] + name = "termcolor" + version = "0.3.6" + source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "adc4587ead41bf016f11af03e55a624c06568b5a19db4e90fde573d805074f83" + dependencies = [ +- "wincolor 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)", ++ "wincolor", + ] + + [[package]] + name = "termion" + version = "1.5.2" + source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "dde0593aeb8d47accea5392b39350015b5eccb12c0d98044d856983d89548dea" + dependencies = [ +- "libc 0.2.58 (registry+https://github.com/rust-lang/crates.io-index)", +- "numtoa 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)", +- "redox_syscall 0.1.54 (registry+https://github.com/rust-lang/crates.io-index)", +- "redox_termios 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)", ++ "libc", ++ "numtoa", ++ "redox_syscall", ++ "redox_termios", + ] + + [[package]] + name = "textwrap" + version = "0.11.0" + source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "d326610f408c7a4eb6f51c37c330e496b08506c9457c9d34287ecc38809fb060" + dependencies = [ +- "unicode-width 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)", ++ "unicode-width", + ] + + [[package]] + name = "thread_local" + version = "0.3.6" + source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "c6b53e329000edc2b34dbe8545fd20e55a333362d0a321909685a19bd28c3f1b" + dependencies = [ +- "lazy_static 1.3.0 (registry+https://github.com/rust-lang/crates.io-index)", ++ "lazy_static", + ] + + [[package]] + name = "time" + version = "0.1.42" + source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "db8dcfca086c1143c9270ac42a2bbd8a7ee477b78ac8e45b19abfb0cbede4b6f" + dependencies = [ +- "libc 0.2.58 (registry+https://github.com/rust-lang/crates.io-index)", +- "redox_syscall 0.1.54 (registry+https://github.com/rust-lang/crates.io-index)", +- "winapi 0.3.7 (registry+https://github.com/rust-lang/crates.io-index)", ++ "libc", ++ "redox_syscall", ++ "winapi", + ] + + [[package]] + name = "tui" + version = "0.6.0" + source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "8896d3a5cb81557cddef234cdeaa2a219d2af5fa9ccbb3cbdfbb52a576feb86f" + dependencies = [ +- "bitflags 1.0.4 (registry+https://github.com/rust-lang/crates.io-index)", +- "cassowary 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)", +- "either 1.5.2 (registry+https://github.com/rust-lang/crates.io-index)", +- "itertools 0.8.0 (registry+https://github.com/rust-lang/crates.io-index)", +- "log 0.4.6 (registry+https://github.com/rust-lang/crates.io-index)", +- "termion 1.5.2 (registry+https://github.com/rust-lang/crates.io-index)", +- "unicode-segmentation 1.3.0 (registry+https://github.com/rust-lang/crates.io-index)", +- "unicode-width 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)", ++ "bitflags", ++ "cassowary", ++ "either", ++ "itertools", ++ "log", ++ "termion", ++ "unicode-segmentation", ++ "unicode-width", + ] + + [[package]] + name = "typenum" + version = "1.10.0" + source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "612d636f949607bdf9b123b4a6f6d966dedf3ff669f7f045890d3a4a73948169" + + [[package]] + name = "unicode-segmentation" + version = "1.3.0" + source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "1967f4cdfc355b37fd76d2a954fb2ed3871034eb4f26d60537d88795cfc332a9" + + [[package]] + name = "unicode-width" + version = "0.1.5" + source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "882386231c45df4700b275c7ff55b6f3698780a650026380e72dabe76fa46526" + + [[package]] + name = "unicode-xid" + version = "0.1.0" + source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "fc72304796d0818e357ead4e000d19c9c174ab23dc11093ac919054d20a6a7fc" + + [[package]] + name = "uom" +-version = "0.23.1" ++version = "0.30.0" + source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "e76503e636584f1e10b9b3b9498538279561adcef5412927ba00c2b32c4ce5ed" + dependencies = [ +- "num-traits 0.2.8 (registry+https://github.com/rust-lang/crates.io-index)", +- "typenum 1.10.0 (registry+https://github.com/rust-lang/crates.io-index)", ++ "num-traits", ++ "typenum", + ] + +-[[package]] +-name = "void" +-version = "1.0.2" +-source = "registry+https://github.com/rust-lang/crates.io-index" +- + [[package]] + name = "winapi" + version = "0.3.7" + source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "f10e386af2b13e47c89e7236a7a14a086791a2b88ebad6df9bf42040195cf770" + dependencies = [ +- "winapi-i686-pc-windows-gnu 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)", +- "winapi-x86_64-pc-windows-gnu 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)", ++ "winapi-i686-pc-windows-gnu", ++ "winapi-x86_64-pc-windows-gnu", + ] + + [[package]] + name = "winapi-i686-pc-windows-gnu" + version = "0.4.0" + source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "ac3b87c63620426dd9b991e5ce0329eff545bccbbb34f3be09ff6fb6ab51b7b6" + + [[package]] + name = "winapi-x86_64-pc-windows-gnu" + version = "0.4.0" + source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f" + + [[package]] + name = "wincolor" + version = "0.1.6" + source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "eeb06499a3a4d44302791052df005d5232b927ed1a9658146d842165c4de7767" + dependencies = [ +- "winapi 0.3.7 (registry+https://github.com/rust-lang/crates.io-index)", ++ "winapi", + ] +- +-[metadata] +-"checksum autocfg 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)" = "0e49efa51329a5fd37e7c79db4621af617cd4e3e5bc224939808d076077077bf" +-"checksum battery 0.7.4 (registry+https://github.com/rust-lang/crates.io-index)" = "7a6d6fe5630049e900227cd89afce4c1204b88ec8e61a2581bb96fcce26f047b" +-"checksum bitflags 1.0.4 (registry+https://github.com/rust-lang/crates.io-index)" = "228047a76f468627ca71776ecdebd732a3423081fcf5125585bcd7c49886ce12" +-"checksum cassowary 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)" = "df8670b8c7b9dae1793364eafadf7239c40d669904660c5960d74cfd80b46a53" +-"checksum cc 1.0.37 (registry+https://github.com/rust-lang/crates.io-index)" = "39f75544d7bbaf57560d2168f28fd649ff9c76153874db88bdbdfd839b1a7e7d" +-"checksum cfg-if 0.1.9 (registry+https://github.com/rust-lang/crates.io-index)" = "b486ce3ccf7ffd79fdeb678eac06a9e6c09fc88d33836340becb8fffe87c5e33" +-"checksum chrono 0.4.6 (registry+https://github.com/rust-lang/crates.io-index)" = "45912881121cb26fad7c38c17ba7daa18764771836b34fab7d3fbd93ed633878" +-"checksum clap 2.33.0 (registry+https://github.com/rust-lang/crates.io-index)" = "5067f5bb2d80ef5d68b4c87db81601f0b75bca627bc2ef76b141d7b846a3c6d9" +-"checksum core-foundation 0.6.4 (registry+https://github.com/rust-lang/crates.io-index)" = "25b9e03f145fd4f2bf705e07b900cd41fc636598fe5dc452fd0db1441c3f496d" +-"checksum core-foundation-sys 0.6.2 (registry+https://github.com/rust-lang/crates.io-index)" = "e7ca8a5221364ef15ce201e8ed2f609fc312682a8f4e0e3d4aa5879764e0fa3b" +-"checksum either 1.5.2 (registry+https://github.com/rust-lang/crates.io-index)" = "5527cfe0d098f36e3f8839852688e63c8fff1c90b2b405aef730615f9a7bcf7b" +-"checksum heck 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)" = "20564e78d53d2bb135c343b3f47714a56af2061f1c928fdb541dc7b9fdd94205" +-"checksum humantime 1.2.0 (registry+https://github.com/rust-lang/crates.io-index)" = "3ca7e5f2e110db35f93b837c81797f3714500b81d517bf20c431b16d3ca4f114" +-"checksum itertools 0.8.0 (registry+https://github.com/rust-lang/crates.io-index)" = "5b8467d9c1cebe26feb08c640139247fac215782d35371ade9a2136ed6085358" +-"checksum lazy_static 1.3.0 (registry+https://github.com/rust-lang/crates.io-index)" = "bc5729f27f159ddd61f4df6228e827e86643d4d3e7c32183cb30a1c08f604a14" +-"checksum lazycell 1.2.1 (registry+https://github.com/rust-lang/crates.io-index)" = "b294d6fa9ee409a054354afc4352b0b9ef7ca222c69b8812cbea9e7d2bf3783f" +-"checksum libc 0.2.58 (registry+https://github.com/rust-lang/crates.io-index)" = "6281b86796ba5e4366000be6e9e18bf35580adf9e63fbe2294aadb587613a319" +-"checksum log 0.4.6 (registry+https://github.com/rust-lang/crates.io-index)" = "c84ec4b527950aa83a329754b01dbe3f58361d1c5efacd1f6d68c494d08a17c6" +-"checksum mach 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)" = "86dd2487cdfea56def77b88438a2c915fb45113c5319bfe7e14306ca4cd0b0e1" +-"checksum nix 0.14.0 (registry+https://github.com/rust-lang/crates.io-index)" = "0d10caafde29a846a82ae0af70414e4643e072993441033b2c93217957e2f867" +-"checksum num-integer 0.1.41 (registry+https://github.com/rust-lang/crates.io-index)" = "b85e541ef8255f6cf42bbfe4ef361305c6c135d10919ecc26126c4e5ae94bc09" +-"checksum num-traits 0.2.8 (registry+https://github.com/rust-lang/crates.io-index)" = "6ba9a427cfca2be13aa6f6403b0b7e7368fe982bfa16fccc450ce74c46cd9b32" +-"checksum numtoa 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)" = "b8f8bdf33df195859076e54ab11ee78a1b208382d3a26ec40d142ffc1ecc49ef" +-"checksum proc-macro2 0.4.30 (registry+https://github.com/rust-lang/crates.io-index)" = "cf3d2011ab5c909338f7887f4fc896d35932e29146c12c8d01da6b22a80ba759" +-"checksum quick-error 1.2.2 (registry+https://github.com/rust-lang/crates.io-index)" = "9274b940887ce9addde99c4eee6b5c44cc494b182b97e73dc8ffdcb3397fd3f0" +-"checksum quote 0.6.12 (registry+https://github.com/rust-lang/crates.io-index)" = "faf4799c5d274f3868a4aae320a0a182cbd2baee377b378f080e16a23e9d80db" +-"checksum redox_syscall 0.1.54 (registry+https://github.com/rust-lang/crates.io-index)" = "12229c14a0f65c4f1cb046a3b52047cdd9da1f4b30f8a39c5063c8bae515e252" +-"checksum redox_termios 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)" = "7e891cfe48e9100a70a3b6eb652fef28920c117d366339687bd5576160db0f76" +-"checksum stderrlog 0.4.1 (registry+https://github.com/rust-lang/crates.io-index)" = "61dc66b7ae72b65636dbf36326f9638fb3ba27871bb737a62e2c309b87d91b70" +-"checksum structopt 0.2.17 (registry+https://github.com/rust-lang/crates.io-index)" = "c767a8971f53d7324583085deee2e230903be09e52fb27df9af94c5cb2b43c31" +-"checksum structopt-derive 0.2.17 (registry+https://github.com/rust-lang/crates.io-index)" = "c57a30c87454ced2186f62f940e981746e8cbbe026d52090c8c4352b636f8235" +-"checksum syn 0.15.34 (registry+https://github.com/rust-lang/crates.io-index)" = "a1393e4a97a19c01e900df2aec855a29f71cf02c402e2f443b8d2747c25c5dbe" +-"checksum termcolor 0.3.6 (registry+https://github.com/rust-lang/crates.io-index)" = "adc4587ead41bf016f11af03e55a624c06568b5a19db4e90fde573d805074f83" +-"checksum termion 1.5.2 (registry+https://github.com/rust-lang/crates.io-index)" = "dde0593aeb8d47accea5392b39350015b5eccb12c0d98044d856983d89548dea" +-"checksum textwrap 0.11.0 (registry+https://github.com/rust-lang/crates.io-index)" = "d326610f408c7a4eb6f51c37c330e496b08506c9457c9d34287ecc38809fb060" +-"checksum thread_local 0.3.6 (registry+https://github.com/rust-lang/crates.io-index)" = "c6b53e329000edc2b34dbe8545fd20e55a333362d0a321909685a19bd28c3f1b" +-"checksum time 0.1.42 (registry+https://github.com/rust-lang/crates.io-index)" = "db8dcfca086c1143c9270ac42a2bbd8a7ee477b78ac8e45b19abfb0cbede4b6f" +-"checksum tui 0.6.0 (registry+https://github.com/rust-lang/crates.io-index)" = "8896d3a5cb81557cddef234cdeaa2a219d2af5fa9ccbb3cbdfbb52a576feb86f" +-"checksum typenum 1.10.0 (registry+https://github.com/rust-lang/crates.io-index)" = "612d636f949607bdf9b123b4a6f6d966dedf3ff669f7f045890d3a4a73948169" +-"checksum unicode-segmentation 1.3.0 (registry+https://github.com/rust-lang/crates.io-index)" = "1967f4cdfc355b37fd76d2a954fb2ed3871034eb4f26d60537d88795cfc332a9" +-"checksum unicode-width 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)" = "882386231c45df4700b275c7ff55b6f3698780a650026380e72dabe76fa46526" +-"checksum unicode-xid 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)" = "fc72304796d0818e357ead4e000d19c9c174ab23dc11093ac919054d20a6a7fc" +-"checksum uom 0.23.1 (registry+https://github.com/rust-lang/crates.io-index)" = "3ef5bbe8385736e498dbb0033361f764ab43a435192513861447b9f7714b3fec" +-"checksum void 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)" = "6a02e4885ed3bc0f2de90ea6dd45ebcbb66dacffe03547fadbb0eeae2770887d" +-"checksum winapi 0.3.7 (registry+https://github.com/rust-lang/crates.io-index)" = "f10e386af2b13e47c89e7236a7a14a086791a2b88ebad6df9bf42040195cf770" +-"checksum winapi-i686-pc-windows-gnu 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)" = "ac3b87c63620426dd9b991e5ce0329eff545bccbbb34f3be09ff6fb6ab51b7b6" +-"checksum winapi-x86_64-pc-windows-gnu 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)" = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f" +-"checksum wincolor 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)" = "eeb06499a3a4d44302791052df005d5232b927ed1a9658146d842165c4de7767" +diff --git a/Cargo.toml b/Cargo.toml +index 3d3df77..34b9bc5 100644 +--- a/Cargo.toml ++++ b/Cargo.toml +@@ -17,7 +17,7 @@ travis-ci = { repository = "svartalf/rust-battop", branch = "master" } + maintenance = { status = "actively-developed" } + + [dependencies] +-battery = "^0.7" ++battery = "^0.7.7" + structopt = { version = "0.2", default-features = false } + log = "0.4.6" + stderrlog = "0.4.1" diff --git a/pkgs/tools/system/battop/default.nix b/pkgs/tools/system/battop/default.nix new file mode 100644 index 000000000000..e28789b835ec --- /dev/null +++ b/pkgs/tools/system/battop/default.nix @@ -0,0 +1,25 @@ +{ lib, fetchFromGitHub, rustPlatform }: + +rustPlatform.buildRustPackage rec { + pname = "battop"; + version = "0.2.4"; + + src = fetchFromGitHub { + owner = "svartalf"; + repo = "rust-battop"; + rev = "v${version}"; + sha256 = "0p53jl3r2p1w9m2fvhzzrj8d9gwpzs22df5sbm7wwja4pxn7ay1w"; + }; + + # https://github.com/svartalf/rust-battop/issues/11 + cargoPatches = [ ./battery.patch ]; + + cargoSha256 = "0ipmnrn6lmf6rqzsqmaxzy9lblrxyrxzkji968356nxxmwzfbfvh"; + + meta = with lib; { + description = "is an interactive battery viewer"; + homepage = "https://github.com/svartalf/rust-battop"; + license = licenses.asl20; + maintainers = with maintainers; [ hdhog ]; + }; +} diff --git a/pkgs/tools/system/throttled/default.nix b/pkgs/tools/system/throttled/default.nix index 9b92635d1d78..2729a16b8687 100644 --- a/pkgs/tools/system/throttled/default.nix +++ b/pkgs/tools/system/throttled/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "throttled"; - version = "0.8"; + version = "0.9.2"; src = fetchFromGitHub { owner = "erpalma"; repo = pname; rev = "v${version}"; - sha256 = "0qw124gdgjqij3xhgg8j1mdsg6j0xg340as5qf8hd3gwc38sqi9x"; + sha256 = "sha256-4aDa6REDHO7gr1czIv6NlepeMVJI93agxJjE2vHiEmk="; }; nativeBuildInputs = [ python3Packages.wrapPython ]; diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index 3a2c62af78ff..50c2a23bb4b5 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -561,6 +561,7 @@ mapAliases ({ olifant = throw "olifant has been removed from nixpkgs, as it was unmaintained."; # added 2021-08-05 opencl-icd = ocl-icd; # added 2017-01-20 openconnect_pa = throw "openconnect_pa fork has been discontinued, support for GlobalProtect is now available in openconnect"; # added 2021-05-21 + openelec-dvb-firmware = libreelec-dvb-firmware; # added 2021-05-10 openexr_ctl = ctl; # added 2018-04-25 openisns = open-isns; # added 2020-01-28 openjpeg_1 = throw "openjpeg_1 has been removed, use openjpeg_2 instead"; # added 2021-01-24 diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 4a30f2625c8f..4722d4daf417 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -2180,6 +2180,8 @@ with pkgs; traefik = callPackage ../servers/traefik { }; + traefik-certs-dumper = callPackage ../tools/misc/traefik-certs-dumper { }; + calamares = libsForQt514.callPackage ../tools/misc/calamares { python = python3; boost = pkgs.boost.override { python = python3; }; @@ -3701,6 +3703,8 @@ with pkgs; cicero-tui = callPackage ../tools/misc/cicero-tui { }; + cilium-cli = callPackage ../applications/networking/cluster/cilium { }; + cipherscan = callPackage ../tools/security/cipherscan { openssl = if stdenv.hostPlatform.system == "x86_64-linux" then openssl-chacha @@ -4448,6 +4452,8 @@ with pkgs; autoreconfHook = buildPackages.autoreconfHook269; }; + emote = callPackage ../tools/inputmethods/emote { }; + engauge-digitizer = libsForQt5.callPackage ../applications/science/math/engauge-digitizer { }; epubcheck = callPackage ../tools/text/epubcheck { }; @@ -7687,6 +7693,8 @@ with pkgs; onioncircuits = callPackage ../tools/security/onioncircuits { }; + onlykey-agent = callPackage ../tools/security/onlykey-agent { }; + onlykey-cli = callPackage ../tools/security/onlykey-cli { }; onlykey = callPackage ../tools/security/onlykey { node_webkit = nwjs; }; @@ -12670,7 +12678,7 @@ with pkgs; ### LUA interpreters luaInterpreters = callPackage ./../development/interpreters/lua-5 {}; - inherit (luaInterpreters) lua5_1 lua5_2 lua5_2_compat lua5_3 lua5_3_compat lua5_4 lua5_4_compat luajit_2_1 luajit_2_0; + inherit (luaInterpreters) lua5_1 lua5_2 lua5_2_compat lua5_3 lua5_3_compat lua5_4 lua5_4_compat luajit_openresty luajit_2_1 luajit_2_0; lua5 = lua5_2_compat; lua = lua5; @@ -18023,7 +18031,11 @@ with pkgs; opencv = opencv4; - openexr = callPackage ../development/libraries/openexr { }; + imath = callPackage ../development/libraries/imath { }; + + openexr = openexr_2; + openexr_2 = callPackage ../development/libraries/openexr { }; + openexr_3 = callPackage ../development/libraries/openexr/3.nix { }; openexrid-unstable = callPackage ../development/libraries/openexrid-unstable { }; @@ -20466,6 +20478,8 @@ with pkgs; roon-bridge = callPackage ../servers/roon-bridge { }; + rpiplay = callPackage ../servers/rpiplay { }; + roon-server = callPackage ../servers/roon-server { }; s6 = skawarePackages.s6; @@ -21059,7 +21073,7 @@ with pkgs; linuxConsoleTools = callPackage ../os-specific/linux/consoletools { }; - openelec-dvb-firmware = callPackage ../os-specific/linux/firmware/openelec-dvb-firmware { }; + libreelec-dvb-firmware = callPackage ../os-specific/linux/firmware/libreelec-dvb-firmware { }; openiscsi = callPackage ../os-specific/linux/open-iscsi { }; @@ -26072,7 +26086,10 @@ with pkgs; mpc123 = callPackage ../applications/audio/mpc123 { }; - mpg123 = callPackage ../applications/audio/mpg123 { }; + mpg123 = callPackage ../applications/audio/mpg123 { + inherit (darwin.apple_sdk.frameworks) AudioUnit AudioToolbox; + jack = libjack2; + }; mpg321 = callPackage ../applications/audio/mpg321 { }; @@ -27983,31 +28000,11 @@ with pkgs; wrapNeovimUnstable = callPackage ../applications/editors/neovim/wrapper.nix { }; wrapNeovim = neovim-unwrapped: lib.makeOverridable (neovimUtils.legacyWrapper neovim-unwrapped); neovim-unwrapped = callPackage ../applications/editors/neovim { - # neovim doesn't build with luajit on aarch64-darwin : - # ./luarocks init - # PANIC: unprotected error in call to Lua API (module 'luarocks.core.hardcoded' not found: - # no field package.preload['luarocks.core.hardcoded'] - # no file '/private/tmp/nix-build-luarocks-3.2.1.drv-0/source/src/luarocks/core/hardcoded.lua' - # no file './luarocks/core/hardcoded.lua' - # no file '/nix/store/3s6c509q9vvq3db87rfi7qa38wzxwz8w-luajit-2.1.0-2021-05-29/share/luajit-2.1.0-beta3/luarocks/core/hardcoded.lua' - # no file '/usr/local/share/lua/5.1/luarocks/core/hardcoded.lua' - # no file '/usr/local/share/lua/5.1/luarocks/core/hardcoded/init.lua' - # no file '/nix/store/3s6c509q9vvq3db87rfi7qa38wzxwz8w-luajit-2.1.0-2021-05-29/share/lua/5.1/luarocks/core/hardcoded.lua' - # no file '/nix/store/3s6c509q9vvq3db87rfi7qa38wzxwz8w-luajit-2.1.0-2021-05-29/share/lua/5.1/luarocks/core/hardcoded/init.lua' - # no file './luarocks/core/hardcoded.so' - # no file '/usr/local/lib/lua/5.1/luarocks/core/hardcoded.so' - # no file '/nix/store/3s6c509q9vvq3db87rfi7qa38wzxwz8w-luajit-2.1.0-2021-05-29/lib/lua/5.1/luarocks/core/hardcoded.so' - # no file '/usr/local/lib/lua/5.1/loadall.so' - # no file './luarocks.so' - # no file '/usr/local/lib/lua/5.1/luarocks.so' - # no file '/nix/store/3s6c509q9vvq3db87rfi7qa38wzxwz8w-luajit-2.1.0-2021-05-29/lib/lua/5.1/luarocks.so' - # no file '/usr/local/lib/lua/5.1/loadall.so') - # make: *** [GNUmakefile:57: luarocks] Error 1 - # - # See https://github.com/NixOS/nixpkgs/issues/129099 - # Possibly related: https://github.com/neovim/neovim/issues/7879 + # See: + # - https://github.com/NixOS/nixpkgs/issues/129099 + # - https://github.com/NixOS/nixpkgs/issues/128959 lua = - if (stdenv.isDarwin && stdenv.isAarch64) then lua5_1 else + if (stdenv.isDarwin && stdenv.isAarch64) then luajit_openresty else luajit; }; diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 4361f2eccdaa..eed731fcaebe 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -16905,12 +16905,32 @@ let sha256 = "2ad194f91ef24df4698369c2562d4164e9bf74f2d5565c681841abf79789ed82"; }; buildInputs = [ TestDeep ]; + nativeBuildInputs = lib.optional stdenv.isDarwin shortenPerlShebang; propagatedBuildInputs = [ BKeywords ConfigTiny FileWhich ListMoreUtils ModulePluggable PPIxQuoteLike PPIxRegexp PPIxUtilities PerlTidy PodSpell StringFormat ]; meta = { homepage = "http://perlcritic.com"; description = "Critique Perl source code for best-practices"; license = with lib.licenses; [ artistic1 gpl1Plus ]; }; + postInstall = lib.optionalString stdenv.isDarwin '' + shortenPerlShebang $out/bin/perlcritic + ''; + }; + + PerlCriticCommunity = buildPerlModule { + pname = "Perl-Critic-Community"; + version = "1.0.0"; + src = fetchurl { + url = "mirror://cpan/authors/id/D/DB/DBOOK/Perl-Critic-Community-v1.0.0.tar.gz"; + sha256 = "311b775da4193e9de94cf5225e993cc54dd096ae1e7ef60738cdae1d9b8854e7"; + }; + buildInputs = [ ModuleBuildTiny ]; + propagatedBuildInputs = [ PPI PathTiny PerlCritic PerlCriticPolicyVariablesProhibitLoopOnHash PerlCriticPulp ]; + meta = { + homepage = "https://github.com/Grinnz/Perl-Critic-Community"; + description = "Community-inspired Perl::Critic policies"; + license = lib.licenses.artistic2; + }; }; PerlCriticMoose = buildPerlPackage rec { @@ -16927,6 +16947,35 @@ let }; }; + PerlCriticPolicyVariablesProhibitLoopOnHash = buildPerlPackage { + pname = "Perl-Critic-Policy-Variables-ProhibitLoopOnHash"; + version = "0.008"; + src = fetchurl { + url = "mirror://cpan/authors/id/X/XS/XSAWYERX/Perl-Critic-Policy-Variables-ProhibitLoopOnHash-0.008.tar.gz"; + sha256 = "12f5f0be96ea1bdc7828058577bd1c5c63ca23c17fac9c3709452b3dff5b84e0"; + }; + propagatedBuildInputs = [ PerlCritic ]; + meta = { + description = "Don't write loops on hashes, only on keys and values of hashes"; + license = with lib.licenses; [ artistic1 gpl1Plus ]; + }; + }; + + PerlCriticPulp = buildPerlPackage { + pname = "Perl-Critic-Pulp"; + version = "99"; + src = fetchurl { + url = "mirror://cpan/authors/id/K/KR/KRYDE/Perl-Critic-Pulp-99.tar.gz"; + sha256 = "b8fda842fcbed74d210257c0a284b6dc7b1d0554a47a3de5d97e7d542e23e7fe"; + }; + propagatedBuildInputs = [ IOString ListMoreUtils PPI PerlCritic PodMinimumVersion ]; + meta = { + homepage = "http://user42.tuxfamily.org/perl-critic-pulp/index.html"; + description = "Some add-on policies for Perl::Critic"; + license = lib.licenses.gpl3Plus; + }; + }; + PerlDestructLevel = buildPerlPackage { pname = "Perl-Destruct-Level"; version = "0.02"; @@ -17305,6 +17354,21 @@ let Po4a = callPackage ../development/perl-modules/Po4a { }; + PodMinimumVersion = buildPerlPackage { + pname = "Pod-MinimumVersion"; + version = "50"; + src = fetchurl { + url = "mirror://cpan/authors/id/K/KR/KRYDE/Pod-MinimumVersion-50.tar.gz"; + sha256 = "0bd2812d9aacbd99bb71fa103a4bb129e955c138ba7598734207dc9fb67b5a6f"; + }; + propagatedBuildInputs = [ IOString PodParser ]; + meta = { + homepage = "http://user42.tuxfamily.org/pod-minimumversion/index.html"; + description = "Determine minimum Perl version of POD directives"; + license = lib.licenses.free; + }; + }; + POE = buildPerlPackage { pname = "POE"; version = "1.368"; diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 3fefa1c45f6d..431d4a9959e3 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -1539,6 +1539,8 @@ in { cloudsmith-api = callPackage ../development/python-modules/cloudsmith-api { }; + cloudsplaining = callPackage ../development/python-modules/cloudsplaining { }; + clustershell = callPackage ../development/python-modules/clustershell { }; clvm = callPackage ../development/python-modules/clvm { }; @@ -2163,6 +2165,8 @@ in { docopt = callPackage ../development/python-modules/docopt { }; + docopt-ng = callPackage ../development/python-modules/docopt-ng { }; + docplex = callPackage ../development/python-modules/docplex { }; docrep = callPackage ../development/python-modules/docrep { }; @@ -3734,6 +3738,8 @@ in { jinja2 = callPackage ../development/python-modules/jinja2 { }; + jinja2-git = callPackage ../development/python-modules/jinja2-git { }; + jinja2_pluralize = callPackage ../development/python-modules/jinja2_pluralize { }; jinja2_time = callPackage ../development/python-modules/jinja2_time { }; @@ -5542,6 +5548,8 @@ in { polib = callPackage ../development/python-modules/polib { }; + policy-sentry = callPackage ../development/python-modules/policy-sentry { }; + policyuniverse = callPackage ../development/python-modules/policyuniverse { }; polyline = callPackage ../development/python-modules/polyline { }; @@ -6073,7 +6081,9 @@ in { pygal = callPackage ../development/python-modules/pygal { }; - pygame = callPackage ../development/python-modules/pygame { }; + pygame = callPackage ../development/python-modules/pygame { + inherit (pkgs.darwin.apple_sdk.frameworks) AppKit CoreMIDI; + }; pygame_sdl2 = callPackage ../development/python-modules/pygame_sdl2 { };