diff --git a/third_party/nixpkgs/doc/contributing/submitting-changes.chapter.md b/third_party/nixpkgs/doc/contributing/submitting-changes.chapter.md
index 44e981f12a..13f15b929c 100644
--- a/third_party/nixpkgs/doc/contributing/submitting-changes.chapter.md
+++ b/third_party/nixpkgs/doc/contributing/submitting-changes.chapter.md
@@ -68,15 +68,16 @@
Security fixes are submitted in the same way as other changes and thus the same guidelines apply.
-If the security fix comes in the form of a patch and a CVE is available, then the name of the patch should be the CVE identifier, so e.g. `CVE-2019-13636.patch` in the case of a patch that is included in the Nixpkgs tree. If a patch is fetched the name needs to be set as well, e.g.:
-
-```nix
-(fetchpatch {
- name = "CVE-2019-11068.patch";
- url = "https://gitlab.gnome.org/GNOME/libxslt/commit/e03553605b45c88f0b4b2980adfbbb8f6fca2fd6.patch";
- sha256 = "0pkpb4837km15zgg6h57bncp66d5lwrlvkr73h0lanywq7zrwhj8";
-})
-```
+- If a new version fixing the vulnerability has been released, update the package;
+- If the security fix comes in the form of a patch and a CVE is available, then add the patch to the Nixpkgs tree, and apply it to the package.
+ The name of the patch should be the CVE identifier, so e.g. `CVE-2019-13636.patch`; If a patch is fetched the name needs to be set as well, e.g.:
+ ```nix
+ (fetchpatch {
+ name = "CVE-2019-11068.patch";
+ url = "https://gitlab.gnome.org/GNOME/libxslt/commit/e03553605b45c88f0b4b2980adfbbb8f6fca2fd6.patch";
+ sha256 = "0pkpb4837km15zgg6h57bncp66d5lwrlvkr73h0lanywq7zrwhj8";
+ })
+ ```
If a security fix applies to both master and a stable release then, similar to regular changes, they are preferably delivered via master first and cherry-picked to the release branch.
diff --git a/third_party/nixpkgs/doc/contributing/vulnerability-roundup.chapter.md b/third_party/nixpkgs/doc/contributing/vulnerability-roundup.chapter.md
new file mode 100644
index 0000000000..d451420f98
--- /dev/null
+++ b/third_party/nixpkgs/doc/contributing/vulnerability-roundup.chapter.md
@@ -0,0 +1,45 @@
+# Vulnerability Roundup {#chap-vulnerability-roundup}
+
+## Issues {#vulnerability-roundup-issues}
+
+Vulnerable packages in Nixpkgs are managed using issues.
+Currently opened ones can be found using the following:
+
+[github.com/NixOS/nixpkgs/issues?q=is:issue+is:open+"Vulnerability+roundup"](https://github.com/NixOS/nixpkgs/issues?q=is%3Aissue+is%3Aopen+%22Vulnerability+roundup%22)
+
+Each issue correspond to a vulnerable version of a package; As a consequence:
+
+- One issue can contain several CVEs;
+- One CVE can be shared across several issues;
+- A single package can be concerned by several issues.
+
+
+A "Vulnerability roundup" issue usually respects the following format:
+
+```txt
+,
+
+
+
+
+
+
+```
+
+Note that there can be an extra comment containing links to previously reported (and still open) issues for the same package.
+
+
+## Triaging and Fixing {#vulnerability-roundup-triaging-and-fixing}
+
+**Note**: An issue can be a "false positive" (i.e. automatically opened, but without the package it refers to being actually vulnerable).
+If you find such a "false positive", comment on the issue an explanation of why it falls into this category, linking as much information as the necessary to help maintainers double check.
+
+If you are investigating a "true positive":
+
+- Find the earliest patched version or a code patch in the CVE details;
+- Is the issue already patched (version up-to-date or patch applied manually) in Nixpkgs's `master` branch?
+ - **No**:
+ - [Submit a security fix](#submitting-changes-submitting-security-fixes);
+ - Once the fix is merged into `master`, [submit the change to the vulnerable release branch(es)](https://nixos.org/manual/nixpkgs/stable/#submitting-changes-stable-release-branches);
+ - **Yes**: [Backport the change to the vulnerable release branch(es)](https://nixos.org/manual/nixpkgs/stable/#submitting-changes-stable-release-branches).
+- When the patch has made it into all the relevant branches (`master`, and the vulnerable releases), close the relevant issue(s).
diff --git a/third_party/nixpkgs/doc/languages-frameworks/rust.section.md b/third_party/nixpkgs/doc/languages-frameworks/rust.section.md
index 020201d086..8121d03e04 100644
--- a/third_party/nixpkgs/doc/languages-frameworks/rust.section.md
+++ b/third_party/nixpkgs/doc/languages-frameworks/rust.section.md
@@ -72,8 +72,8 @@ For `cargoHash` you can use:
Per the instructions in the [Cargo Book](https://doc.rust-lang.org/cargo/guide/cargo-toml-vs-cargo-lock.html)
best practices guide, Rust applications should always commit the `Cargo.lock`
file in git to ensure a reproducible build. However, a few packages do not, and
-Nix depends on this file, so if it missing you can use `cargoPatches` to apply
-it in the `patchPhase`. Consider sending a PR upstream with a note to the
+Nix depends on this file, so if it is missing you can use `cargoPatches` to
+apply it in the `patchPhase`. Consider sending a PR upstream with a note to the
maintainer describing why it's important to include in the application.
The fetcher will verify that the `Cargo.lock` file is in sync with the `src`
@@ -146,6 +146,7 @@ where they are known to differ. But there are ways to customize the argument:
rustc.platform = { foo = ""; bar = ""; };
};
}
+ ```
will result in:
```shell
--target /nix/store/asdfasdfsadf-thumb-crazy.json # contains {"foo":"","bar":""}
@@ -156,7 +157,7 @@ path) can be passed directly to `buildRustPackage`:
```nix
pkgs.rustPlatform.buildRustPackage {
- (...)
+ /* ... */
target = "x86_64-fortanix-unknown-sgx";
}
```
@@ -191,6 +192,13 @@ rustPlatform.buildRustPackage {
Please note that the code will be compiled twice here: once in `release` mode
for the `buildPhase`, and again in `debug` mode for the `checkPhase`.
+Test flags, e.g., `--features xxx/yyy`, can be passed to `cargo test` via the
+`cargoTestFlags` attribute.
+
+Another attribute, called `checkFlags`, is used to pass arguments to the test
+binary itself, as stated
+(here)[https://doc.rust-lang.org/cargo/commands/cargo-test.html].
+
#### Tests relying on the structure of the `target/` directory
Some tests may rely on the structure of the `target/` directory. Those tests
@@ -320,9 +328,10 @@ attributes can also be used:
variable `buildAndTestSubdir` can be used to build a crate in a
Cargo workspace. Additional maturin flags can be passed through
`maturinBuildFlags`.
-* `cargoCheckHook`: run tests using Cargo. Additional flags can be
- passed to Cargo using `checkFlags` and `checkFlagsArray`. By
- default, tests are run in parallel. This can be disabled by setting
+* `cargoCheckHook`: run tests using Cargo. The build type for checks
+ can be set using `cargoCheckType`. Additional flags can be passed to
+ the tests using `checkFlags` and `checkFlagsArray`. By default,
+ tests are run in parallel. This can be disabled by setting
`dontUseCargoParallelTests`.
* `cargoInstallHook`: install binaries and static/shared libraries
that were built using `cargoBuildHook`.
diff --git a/third_party/nixpkgs/doc/manual.xml b/third_party/nixpkgs/doc/manual.xml
index 375e2394ff..1c5a7bbcaa 100644
--- a/third_party/nixpkgs/doc/manual.xml
+++ b/third_party/nixpkgs/doc/manual.xml
@@ -35,6 +35,7 @@
+
diff --git a/third_party/nixpkgs/lib/licenses.nix b/third_party/nixpkgs/lib/licenses.nix
index 993783db3e..46ac0443a0 100644
--- a/third_party/nixpkgs/lib/licenses.nix
+++ b/third_party/nixpkgs/lib/licenses.nix
@@ -603,6 +603,11 @@ lib.mapAttrs (n: v: v // { shortName = n; }) ({
free = false;
};
+ odbl = spdx {
+ spdxId = "ODbL-1.0";
+ fullName = "Open Data Commons Open Database License v1.0";
+ };
+
ofl = spdx {
spdxId = "OFL-1.1";
fullName = "SIL Open Font License 1.1";
diff --git a/third_party/nixpkgs/lib/systems/default.nix b/third_party/nixpkgs/lib/systems/default.nix
index 1bbe976c4d..1e38dbf531 100644
--- a/third_party/nixpkgs/lib/systems/default.nix
+++ b/third_party/nixpkgs/lib/systems/default.nix
@@ -107,6 +107,11 @@ rec {
powerpc64le = "ppc64le";
}.${final.parsed.cpu.name} or final.parsed.cpu.name;
+ darwinArch = {
+ armv7a = "armv7";
+ aarch64 = "arm64";
+ }.${final.parsed.cpu.name} or final.parsed.cpu.name;
+
emulator = pkgs: let
qemu-user = pkgs.qemu.override {
smartcardSupport = false;
diff --git a/third_party/nixpkgs/maintainers/maintainer-list.nix b/third_party/nixpkgs/maintainers/maintainer-list.nix
index 9efca53200..8b265d59e6 100644
--- a/third_party/nixpkgs/maintainers/maintainer-list.nix
+++ b/third_party/nixpkgs/maintainers/maintainer-list.nix
@@ -1859,6 +1859,12 @@
fingerprint = "68B8 0D57 B2E5 4AC3 EC1F 49B0 B37E 0F23 7101 6A4C";
}];
};
+ collares = {
+ email = "mauricio@collares.org";
+ github = "collares";
+ githubId = 244239;
+ name = "Mauricio Collares";
+ };
copumpkin = {
email = "pumpkingod@gmail.com";
github = "copumpkin";
@@ -2889,6 +2895,12 @@
githubId = 3787281;
name = "Erik Rybakken";
};
+ erin = {
+ name = "Erin van der Veen";
+ email = "erin@erinvanderveen.nl";
+ github = "ErinvanderVeen";
+ githubId = 10973664;
+ };
erosennin = {
email = "ag@sologoc.com";
github = "erosennin";
@@ -4153,6 +4165,12 @@
github = "j0hax";
githubId = 3802620;
};
+ j4m3s = {
+ name = "James Landrein";
+ email = "github@j4m3s.eu";
+ github = "j4m3s-s";
+ githubId = 9413812;
+ };
jacg = {
name = "Jacek Generowicz";
email = "jacg@my-post-office.net";
@@ -4177,6 +4195,12 @@
githubId = 175537;
name = "Johannes Lötzsch";
};
+ jackgerrits = {
+ email = "jack@jackgerrits.com";
+ github = "jackgerrits";
+ githubId = 7558482;
+ name = "Jack Gerrits";
+ };
jagajaga = {
email = "ars.seroka@gmail.com";
github = "jagajaga";
@@ -5530,6 +5554,12 @@
githubId = 7622248;
name = "Sebastian Zivota";
};
+ locallycompact = {
+ email = "dan.firth@homotopic.tech";
+ github = "locallycompact";
+ githubId = 1267527;
+ name = "Daniel Firth";
+ };
lopsided98 = {
email = "benwolsieffer@gmail.com";
github = "lopsided98";
@@ -6987,6 +7017,12 @@
githubId = 3359345;
name = "obadz";
};
+ obsidian-systems-maintenance = {
+ name = "Obsidian Systems Maintenance";
+ email = "maintainer@obsidian.systems";
+ github = "obsidian-systems-maintenance";
+ githubId = 80847921;
+ };
odi = {
email = "oliver.dunkl@gmail.com";
github = "odi";
diff --git a/third_party/nixpkgs/maintainers/scripts/pluginupdate.py b/third_party/nixpkgs/maintainers/scripts/pluginupdate.py
index 79c79c0f09..9ac1ccffb7 100644
--- a/third_party/nixpkgs/maintainers/scripts/pluginupdate.py
+++ b/third_party/nixpkgs/maintainers/scripts/pluginupdate.py
@@ -514,7 +514,7 @@ def update_plugins(editor: Editor):
)
for plugin_line in args.add_plugins:
- rewrite_input(args.input_fil, editor.deprecated, append=(plugin_line + "\n",))
+ rewrite_input(args.input_file, editor.deprecated, append=(plugin_line + "\n",))
update()
plugin = fetch_plugin_from_pluginline(plugin_line)
commit(
diff --git a/third_party/nixpkgs/maintainers/team-list.nix b/third_party/nixpkgs/maintainers/team-list.nix
index 7d778a8ae3..0575b87b74 100644
--- a/third_party/nixpkgs/maintainers/team-list.nix
+++ b/third_party/nixpkgs/maintainers/team-list.nix
@@ -134,6 +134,7 @@ with lib.maintainers; {
timokau
omasanori
raskin
+ collares
];
scope = "Maintain SageMath and the dependencies that are likely to break it.";
};
diff --git a/third_party/nixpkgs/nixos/modules/config/update-users-groups.pl b/third_party/nixpkgs/nixos/modules/config/update-users-groups.pl
index 44040217b0..bef08dc402 100644
--- a/third_party/nixpkgs/nixos/modules/config/update-users-groups.pl
+++ b/third_party/nixpkgs/nixos/modules/config/update-users-groups.pl
@@ -288,7 +288,7 @@ foreach my $u (values %usersOut) {
push @shadowNew, join(":", $u->{name}, $hashedPassword, "1::::::") . "\n";
}
-updateFile("/etc/shadow", \@shadowNew, 0600);
+updateFile("/etc/shadow", \@shadowNew, 0640);
{
my $uid = getpwnam "root";
my $gid = getgrnam "shadow";
diff --git a/third_party/nixpkgs/nixos/modules/module-list.nix b/third_party/nixpkgs/nixos/modules/module-list.nix
index 3a1907ee20..07774dd1d2 100644
--- a/third_party/nixpkgs/nixos/modules/module-list.nix
+++ b/third_party/nixpkgs/nixos/modules/module-list.nix
@@ -155,6 +155,7 @@
./programs/nm-applet.nix
./programs/npm.nix
./programs/oblogout.nix
+ ./programs/partition-manager.nix
./programs/plotinus.nix
./programs/proxychains.nix
./programs/qt5ct.nix
@@ -177,6 +178,7 @@
./programs/tmux.nix
./programs/traceroute.nix
./programs/tsm-client.nix
+ ./programs/turbovnc.nix
./programs/udevil.nix
./programs/usbtop.nix
./programs/vim.nix
@@ -882,6 +884,7 @@
./services/web-apps/atlassian/confluence.nix
./services/web-apps/atlassian/crowd.nix
./services/web-apps/atlassian/jira.nix
+ ./services/web-apps/bookstack.nix
./services/web-apps/convos.nix
./services/web-apps/cryptpad.nix
./services/web-apps/documize.nix
diff --git a/third_party/nixpkgs/nixos/modules/programs/partition-manager.nix b/third_party/nixpkgs/nixos/modules/programs/partition-manager.nix
new file mode 100644
index 0000000000..1be2f0a69a
--- /dev/null
+++ b/third_party/nixpkgs/nixos/modules/programs/partition-manager.nix
@@ -0,0 +1,19 @@
+{ config, lib, pkgs, ... }:
+
+with lib;
+
+{
+ meta.maintainers = [ maintainers.oxalica ];
+
+ ###### interface
+ options = {
+ programs.partition-manager.enable = mkEnableOption "KDE Partition Manager";
+ };
+
+ ###### implementation
+ config = mkIf config.programs.partition-manager.enable {
+ services.dbus.packages = [ pkgs.libsForQt5.kpmcore ];
+ # `kpmcore` need to be installed to pull in polkit actions.
+ environment.systemPackages = [ pkgs.libsForQt5.kpmcore pkgs.partition-manager ];
+ };
+}
diff --git a/third_party/nixpkgs/nixos/modules/programs/sway.nix b/third_party/nixpkgs/nixos/modules/programs/sway.nix
index 038d76c6c9..107e783c0c 100644
--- a/third_party/nixpkgs/nixos/modules/programs/sway.nix
+++ b/third_party/nixpkgs/nixos/modules/programs/sway.nix
@@ -90,7 +90,7 @@ in {
rxvt-unicode # For backward compatibility (old default terminal)
];
defaultText = literalExample ''
- with pkgs; [ swaylock swayidle xwayland rxvt-unicode dmenu ];
+ with pkgs; [ swaylock swayidle rxvt-unicode alacritty dmenu ];
'';
example = literalExample ''
with pkgs; [
diff --git a/third_party/nixpkgs/nixos/modules/programs/turbovnc.nix b/third_party/nixpkgs/nixos/modules/programs/turbovnc.nix
new file mode 100644
index 0000000000..e6f8836aa3
--- /dev/null
+++ b/third_party/nixpkgs/nixos/modules/programs/turbovnc.nix
@@ -0,0 +1,54 @@
+# Global configuration for the SSH client.
+
+{ config, lib, pkgs, ... }:
+
+with lib;
+
+let
+ cfg = config.programs.turbovnc;
+in
+{
+ options = {
+
+ programs.turbovnc = {
+
+ ensureHeadlessSoftwareOpenGL = mkOption {
+ type = types.bool;
+ default = false;
+ description = ''
+ Whether to set up NixOS such that TurboVNC's built-in software OpenGL
+ implementation works.
+
+ This will enable so that OpenGL
+ programs can find Mesa's llvmpipe drivers.
+
+ Setting this option to false does not mean that software
+ OpenGL won't work; it may still work depending on your system
+ configuration.
+
+ This option is also intended to generate warnings if you are using some
+ configuration that's incompatible with using headless software OpenGL
+ in TurboVNC.
+ '';
+ };
+
+ };
+
+ };
+
+ config = mkIf cfg.ensureHeadlessSoftwareOpenGL {
+
+ # TurboVNC has builtin support for Mesa llvmpipe's `swrast`
+ # software rendering to implemnt GLX (OpenGL on Xorg).
+ # However, just building TurboVNC with support for that is not enough
+ # (it only takes care of the X server side part of OpenGL);
+ # the indiviudual applications (e.g. `glxgears`) also need to directly load
+ # the OpenGL libs.
+ # Thus, this creates `/run/opengl-driver` populated by Mesa so that the applications
+ # can find the llvmpipe `swrast.so` software rendering DRI lib via `libglvnd`.
+ # This comment exists to explain why `hardware.` is involved,
+ # even though 100% software rendering is used.
+ hardware.opengl.enable = true;
+
+ };
+}
diff --git a/third_party/nixpkgs/nixos/modules/services/computing/slurm/slurm.nix b/third_party/nixpkgs/nixos/modules/services/computing/slurm/slurm.nix
index 7363441e53..0b52f8afed 100644
--- a/third_party/nixpkgs/nixos/modules/services/computing/slurm/slurm.nix
+++ b/third_party/nixpkgs/nixos/modules/services/computing/slurm/slurm.nix
@@ -274,6 +274,15 @@ in
'';
};
+ etcSlurm = mkOption {
+ type = types.path;
+ internal = true;
+ default = etcSlurm;
+ description = ''
+ Path to directory with slurm config files. This option is set by default from the
+ Slurm module and is meant to make the Slurm config file available to other modules.
+ '';
+ };
};
@@ -308,7 +317,7 @@ in
#!/bin/sh
if [ -z "$SLURM_CONF" ]
then
- SLURM_CONF="${etcSlurm}/slurm.conf" "$EXE" "\$@"
+ SLURM_CONF="${cfg.etcSlurm}/slurm.conf" "$EXE" "\$@"
else
"$EXE" "\$0"
fi
diff --git a/third_party/nixpkgs/nixos/modules/services/misc/redmine.nix b/third_party/nixpkgs/nixos/modules/services/misc/redmine.nix
index 8b53eb471d..e0055576d6 100644
--- a/third_party/nixpkgs/nixos/modules/services/misc/redmine.nix
+++ b/third_party/nixpkgs/nixos/modules/services/misc/redmine.nix
@@ -28,7 +28,7 @@ let
unpack = id: (name: source:
pkgs.stdenv.mkDerivation {
name = "redmine-${id}-${name}";
- buildInputs = [ pkgs.unzip ];
+ nativeBuildInputs = [ pkgs.unzip ];
buildCommand = ''
mkdir -p $out
cd $out
diff --git a/third_party/nixpkgs/nixos/modules/services/monitoring/prometheus/exporters/postgres.nix b/third_party/nixpkgs/nixos/modules/services/monitoring/prometheus/exporters/postgres.nix
index 1ece73a115..dd3bec8ec1 100644
--- a/third_party/nixpkgs/nixos/modules/services/monitoring/prometheus/exporters/postgres.nix
+++ b/third_party/nixpkgs/nixos/modules/services/monitoring/prometheus/exporters/postgres.nix
@@ -30,12 +30,49 @@ in
Whether to run the exporter as the local 'postgres' super user.
'';
};
+
+ # TODO perhaps LoadCredential would be more appropriate
+ environmentFile = mkOption {
+ type = types.nullOr types.path;
+ default = null;
+ example = "/root/prometheus-postgres-exporter.env";
+ description = ''
+ Environment file as defined in
+ systemd.exec5
+ .
+
+ Secrets may be passed to the service without adding them to the
+ world-readable Nix store, by specifying placeholder variables as
+ the option value in Nix and setting these variables accordingly in the
+ environment file.
+
+ Environment variables from this file will be interpolated into the
+ config file using envsubst with this syntax:
+ $ENVIRONMENT ''${VARIABLE}
+
+ The main use is to set the DATA_SOURCE_NAME that contains the
+ postgres password
+
+ note that contents from this file will override dataSourceName
+ if you have set it from nix.
+
+
+ # Content of the environment file
+ DATA_SOURCE_NAME=postgresql://username:password@localhost:5432/postgres?sslmode=disable
+
+
+ Note that this file needs to be available on the host on which
+ this exporter is running.
+ '';
+ };
+
};
serviceOpts = {
environment.DATA_SOURCE_NAME = cfg.dataSourceName;
serviceConfig = {
DynamicUser = false;
User = mkIf cfg.runAsLocalSuperUser (mkForce "postgres");
+ EnvironmentFile = mkIf (cfg.environmentFile != null) [ cfg.environmentFile ];
ExecStart = ''
${pkgs.prometheus-postgres-exporter}/bin/postgres_exporter \
--web.listen-address ${cfg.listenAddress}:${toString cfg.port} \
diff --git a/third_party/nixpkgs/nixos/modules/services/system/localtime.nix b/third_party/nixpkgs/nixos/modules/services/system/localtime.nix
index 8f8e2e2e93..bb99e5e36f 100644
--- a/third_party/nixpkgs/nixos/modules/services/system/localtime.nix
+++ b/third_party/nixpkgs/nixos/modules/services/system/localtime.nix
@@ -29,15 +29,14 @@ in {
};
};
- # We use the 'out' output, since localtime has its 'bin' output
- # first, so that is what we get if we use the derivation bare.
# Install the polkit rules.
- environment.systemPackages = [ pkgs.localtime.out ];
+ environment.systemPackages = [ pkgs.localtime ];
# Install the systemd unit.
- systemd.packages = [ pkgs.localtime.out ];
+ systemd.packages = [ pkgs.localtime ];
users.users.localtimed = {
- description = "Taskserver user";
+ description = "localtime daemon";
+ isSystemUser = true;
};
systemd.services.localtime = {
diff --git a/third_party/nixpkgs/nixos/modules/services/web-apps/bookstack.nix b/third_party/nixpkgs/nixos/modules/services/web-apps/bookstack.nix
new file mode 100644
index 0000000000..83d05ffbad
--- /dev/null
+++ b/third_party/nixpkgs/nixos/modules/services/web-apps/bookstack.nix
@@ -0,0 +1,365 @@
+{ config, lib, pkgs, ... }:
+
+with lib;
+
+let
+ cfg = config.services.bookstack;
+ bookstack = pkgs.bookstack.override {
+ dataDir = cfg.dataDir;
+ };
+ db = cfg.database;
+ mail = cfg.mail;
+
+ user = cfg.user;
+ group = cfg.group;
+
+ # shell script for local administration
+ artisan = pkgs.writeScriptBin "bookstack" ''
+ #! ${pkgs.runtimeShell}
+ cd ${bookstack}
+ sudo=exec
+ if [[ "$USER" != ${user} ]]; then
+ sudo='exec /run/wrappers/bin/sudo -u ${user}'
+ fi
+ $sudo ${pkgs.php}/bin/php artisan $*
+ '';
+
+
+in {
+ options.services.bookstack = {
+
+ enable = mkEnableOption "BookStack";
+
+ user = mkOption {
+ default = "bookstack";
+ description = "User bookstack runs as.";
+ type = types.str;
+ };
+
+ group = mkOption {
+ default = "bookstack";
+ description = "Group bookstack runs as.";
+ type = types.str;
+ };
+
+ appKeyFile = mkOption {
+ description = ''
+ A file containing the AppKey.
+ Used for encryption where needed. Can be generated with head -c 32 /dev/urandom| base64 and must be prefixed with base64:.
+ '';
+ example = "/run/keys/bookstack-appkey";
+ type = types.path;
+ };
+
+ appURL = mkOption {
+ description = ''
+ The root URL that you want to host BookStack on. All URLs in BookStack will be generated using this value.
+ If you change this in the future you may need to run a command to update stored URLs in the database. Command example: php artisan bookstack:update-url https://old.example.com https://new.example.com
+ '';
+ example = "https://example.com";
+ type = types.str;
+ };
+
+ cacheDir = mkOption {
+ description = "BookStack cache directory";
+ default = "/var/cache/bookstack";
+ type = types.path;
+ };
+
+ dataDir = mkOption {
+ description = "BookStack data directory";
+ default = "/var/lib/bookstack";
+ type = types.path;
+ };
+
+ database = {
+ host = mkOption {
+ type = types.str;
+ default = "localhost";
+ description = "Database host address.";
+ };
+ port = mkOption {
+ type = types.port;
+ default = 3306;
+ description = "Database host port.";
+ };
+ name = mkOption {
+ type = types.str;
+ default = "bookstack";
+ description = "Database name.";
+ };
+ user = mkOption {
+ type = types.str;
+ default = user;
+ defaultText = "\${user}";
+ description = "Database username.";
+ };
+ passwordFile = mkOption {
+ type = with types; nullOr path;
+ default = null;
+ example = "/run/keys/bookstack-dbpassword";
+ description = ''
+ A file containing the password corresponding to
+ .
+ '';
+ };
+ createLocally = mkOption {
+ type = types.bool;
+ default = false;
+ description = "Create the database and database user locally.";
+ };
+ };
+
+ mail = {
+ driver = mkOption {
+ type = types.enum [ "smtp" "sendmail" ];
+ default = "smtp";
+ description = "Mail driver to use.";
+ };
+ host = mkOption {
+ type = types.str;
+ default = "localhost";
+ description = "Mail host address.";
+ };
+ port = mkOption {
+ type = types.port;
+ default = 1025;
+ description = "Mail host port.";
+ };
+ fromName = mkOption {
+ type = types.str;
+ default = "BookStack";
+ description = "Mail \"from\" name.";
+ };
+ from = mkOption {
+ type = types.str;
+ default = "mail@bookstackapp.com";
+ description = "Mail \"from\" email.";
+ };
+ user = mkOption {
+ type = with types; nullOr str;
+ default = null;
+ example = "bookstack";
+ description = "Mail username.";
+ };
+ passwordFile = mkOption {
+ type = with types; nullOr path;
+ default = null;
+ example = "/run/keys/bookstack-mailpassword";
+ description = ''
+ A file containing the password corresponding to
+ .
+ '';
+ };
+ encryption = mkOption {
+ type = with types; nullOr (enum [ "tls" ]);
+ default = null;
+ description = "SMTP encryption mechanism to use.";
+ };
+ };
+
+ maxUploadSize = mkOption {
+ type = types.str;
+ default = "18M";
+ example = "1G";
+ description = "The maximum size for uploads (e.g. images).";
+ };
+
+ poolConfig = mkOption {
+ type = with types; attrsOf (oneOf [ str int bool ]);
+ default = {
+ "pm" = "dynamic";
+ "pm.max_children" = 32;
+ "pm.start_servers" = 2;
+ "pm.min_spare_servers" = 2;
+ "pm.max_spare_servers" = 4;
+ "pm.max_requests" = 500;
+ };
+ description = ''
+ Options for the bookstack PHP pool. See the documentation on php-fpm.conf
+ for details on configuration directives.
+ '';
+ };
+
+ nginx = mkOption {
+ type = types.submodule (
+ recursiveUpdate
+ (import ../web-servers/nginx/vhost-options.nix { inherit config lib; }) {}
+ );
+ default = {};
+ example = {
+ serverAliases = [
+ "bookstack.\${config.networking.domain}"
+ ];
+ # To enable encryption and let let's encrypt take care of certificate
+ forceSSL = true;
+ enableACME = true;
+ };
+ description = ''
+ With this option, you can customize the nginx virtualHost settings.
+ '';
+ };
+
+ extraConfig = mkOption {
+ type = types.nullOr types.lines;
+ default = null;
+ example = ''
+ ALLOWED_IFRAME_HOSTS="https://example.com"
+ WKHTMLTOPDF=/home/user/bins/wkhtmltopdf
+ '';
+ description = ''
+ Lines to be appended verbatim to the BookStack configuration.
+ Refer to for details on supported values.
+ '';
+ };
+
+ };
+
+ config = mkIf cfg.enable {
+
+ assertions = [
+ { assertion = db.createLocally -> db.user == user;
+ message = "services.bookstack.database.user must be set to ${user} if services.mediawiki.database.createLocally is set true.";
+ }
+ { assertion = db.createLocally -> db.passwordFile == null;
+ message = "services.bookstack.database.passwordFile cannot be specified if services.bookstack.database.createLocally is set to true.";
+ }
+ ];
+
+ environment.systemPackages = [ artisan ];
+
+ services.mysql = mkIf db.createLocally {
+ enable = true;
+ package = mkDefault pkgs.mariadb;
+ ensureDatabases = [ db.name ];
+ ensureUsers = [
+ { name = db.user;
+ ensurePermissions = { "${db.name}.*" = "ALL PRIVILEGES"; };
+ }
+ ];
+ };
+
+ services.phpfpm.pools.bookstack = {
+ inherit user;
+ inherit group;
+ phpOptions = ''
+ log_errors = on
+ post_max_size = ${cfg.maxUploadSize}
+ upload_max_filesize = ${cfg.maxUploadSize}
+ '';
+ settings = {
+ "listen.mode" = "0660";
+ "listen.owner" = user;
+ "listen.group" = group;
+ } // cfg.poolConfig;
+ };
+
+ services.nginx = {
+ enable = mkDefault true;
+ virtualHosts.bookstack = mkMerge [ cfg.nginx {
+ root = mkForce "${bookstack}/public";
+ extraConfig = optionalString (cfg.nginx.addSSL || cfg.nginx.forceSSL || cfg.nginx.onlySSL || cfg.nginx.enableACME) "fastcgi_param HTTPS on;";
+ locations = {
+ "/" = {
+ index = "index.php";
+ extraConfig = ''try_files $uri $uri/ /index.php?$query_string;'';
+ };
+ "~ \.php$" = {
+ extraConfig = ''
+ try_files $uri $uri/ /index.php?$query_string;
+ include ${pkgs.nginx}/conf/fastcgi_params;
+ fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name;
+ fastcgi_param REDIRECT_STATUS 200;
+ fastcgi_pass unix:${config.services.phpfpm.pools."bookstack".socket};
+ ${optionalString (cfg.nginx.addSSL || cfg.nginx.forceSSL || cfg.nginx.onlySSL || cfg.nginx.enableACME) "fastcgi_param HTTPS on;"}
+ '';
+ };
+ "~ \.(js|css|gif|png|ico|jpg|jpeg)$" = {
+ extraConfig = "expires 365d;";
+ };
+ };
+ }];
+ };
+
+ systemd.services.bookstack-setup = {
+ description = "Preperation tasks for BookStack";
+ before = [ "phpfpm-bookstack.service" ];
+ after = optional db.createLocally "mysql.service";
+ wantedBy = [ "multi-user.target" ];
+ serviceConfig = {
+ Type = "oneshot";
+ User = user;
+ WorkingDirectory = "${bookstack}";
+ };
+ script = ''
+ # create .env file
+ echo "
+ APP_KEY=base64:$(head -n1 ${cfg.appKeyFile})
+ APP_URL=${cfg.appURL}
+ DB_HOST=${db.host}
+ DB_PORT=${toString db.port}
+ DB_DATABASE=${db.name}
+ DB_USERNAME=${db.user}
+ MAIL_DRIVER=${mail.driver}
+ MAIL_FROM_NAME=\"${mail.fromName}\"
+ MAIL_FROM=${mail.from}
+ MAIL_HOST=${mail.host}
+ MAIL_PORT=${toString mail.port}
+ ${optionalString (mail.user != null) "MAIL_USERNAME=${mail.user};"}
+ ${optionalString (mail.encryption != null) "MAIL_ENCRYPTION=${mail.encryption};"}
+ ${optionalString (db.passwordFile != null) "DB_PASSWORD=$(head -n1 ${db.passwordFile})"}
+ ${optionalString (mail.passwordFile != null) "MAIL_PASSWORD=$(head -n1 ${mail.passwordFile})"}
+ APP_SERVICES_CACHE=${cfg.cacheDir}/services.php
+ APP_PACKAGES_CACHE=${cfg.cacheDir}/packages.php
+ APP_CONFIG_CACHE=${cfg.cacheDir}/config.php
+ APP_ROUTES_CACHE=${cfg.cacheDir}/routes-v7.php
+ APP_EVENTS_CACHE=${cfg.cacheDir}/events.php
+ ${optionalString (cfg.nginx.addSSL || cfg.nginx.forceSSL || cfg.nginx.onlySSL || cfg.nginx.enableACME) "SESSION_SECURE_COOKIE=true"}
+ ${toString cfg.extraConfig}
+ " > "${cfg.dataDir}/.env"
+ # set permissions
+ chmod 700 "${cfg.dataDir}/.env"
+
+ # migrate db
+ ${pkgs.php}/bin/php artisan migrate --force
+
+ # create caches
+ ${pkgs.php}/bin/php artisan config:cache
+ ${pkgs.php}/bin/php artisan route:cache
+ ${pkgs.php}/bin/php artisan view:cache
+ '';
+ };
+
+ systemd.tmpfiles.rules = [
+ "d ${cfg.cacheDir} 0700 ${user} ${group} - -"
+ "d ${cfg.dataDir} 0710 ${user} ${group} - -"
+ "d ${cfg.dataDir}/public 0750 ${user} ${group} - -"
+ "d ${cfg.dataDir}/public/uploads 0750 ${user} ${group} - -"
+ "d ${cfg.dataDir}/storage 0700 ${user} ${group} - -"
+ "d ${cfg.dataDir}/storage/app 0700 ${user} ${group} - -"
+ "d ${cfg.dataDir}/storage/fonts 0700 ${user} ${group} - -"
+ "d ${cfg.dataDir}/storage/framework 0700 ${user} ${group} - -"
+ "d ${cfg.dataDir}/storage/framework/cache 0700 ${user} ${group} - -"
+ "d ${cfg.dataDir}/storage/framework/sessions 0700 ${user} ${group} - -"
+ "d ${cfg.dataDir}/storage/framework/views 0700 ${user} ${group} - -"
+ "d ${cfg.dataDir}/storage/logs 0700 ${user} ${group} - -"
+ "d ${cfg.dataDir}/storage/uploads 0700 ${user} ${group} - -"
+ ];
+
+ users = {
+ users = mkIf (user == "bookstack") {
+ bookstack = {
+ inherit group;
+ isSystemUser = true;
+ };
+ "${config.services.nginx.user}".extraGroups = [ group ];
+ };
+ groups = mkIf (group == "bookstack") {
+ bookstack = {};
+ };
+ };
+
+ };
+
+ meta.maintainers = with maintainers; [ ymarkus ];
+}
diff --git a/third_party/nixpkgs/nixos/modules/services/web-apps/dokuwiki.nix b/third_party/nixpkgs/nixos/modules/services/web-apps/dokuwiki.nix
index 1ce584c6a4..685cb49670 100644
--- a/third_party/nixpkgs/nixos/modules/services/web-apps/dokuwiki.nix
+++ b/third_party/nixpkgs/nixos/modules/services/web-apps/dokuwiki.nix
@@ -193,7 +193,7 @@ let
};
sourceRoot = ".";
# We need unzip to build this package
- buildInputs = [ pkgs.unzip ];
+ nativeBuildInputs = [ pkgs.unzip ];
# Installing simply means copying all files to the output directory
installPhase = "mkdir -p $out; cp -R * $out/";
};
@@ -220,7 +220,7 @@ let
sha256 = "4de5ff31d54dd61bbccaf092c9e74c1af3a4c53e07aa59f60457a8f00cfb23a6";
};
# We need unzip to build this package
- buildInputs = [ pkgs.unzip ];
+ nativeBuildInputs = [ pkgs.unzip ];
# Installing simply means copying all files to the output directory
installPhase = "mkdir -p $out; cp -R * $out/";
};
diff --git a/third_party/nixpkgs/nixos/modules/services/web-apps/wordpress.nix b/third_party/nixpkgs/nixos/modules/services/web-apps/wordpress.nix
index 5fbe53221a..f251cfe32d 100644
--- a/third_party/nixpkgs/nixos/modules/services/web-apps/wordpress.nix
+++ b/third_party/nixpkgs/nixos/modules/services/web-apps/wordpress.nix
@@ -109,7 +109,7 @@ let
sha256 = "1rhba5h5fjlhy8p05zf0p14c9iagfh96y91r36ni0rmk6y891lyd";
};
# We need unzip to build this package
- buildInputs = [ pkgs.unzip ];
+ nativeBuildInputs = [ pkgs.unzip ];
# Installing simply means copying all files to the output directory
installPhase = "mkdir -p $out; cp -R * $out/";
};
@@ -136,7 +136,7 @@ let
sha256 = "0rjwm811f4aa4q43r77zxlpklyb85q08f9c8ns2akcarrvj5ydx3";
};
# We need unzip to build this package
- buildInputs = [ pkgs.unzip ];
+ nativeBuildInputs = [ pkgs.unzip ];
# Installing simply means copying all files to the output directory
installPhase = "mkdir -p $out; cp -R * $out/";
};
diff --git a/third_party/nixpkgs/nixos/modules/services/web-servers/nginx/default.nix b/third_party/nixpkgs/nixos/modules/services/web-servers/nginx/default.nix
index f3175793eb..6c8341c111 100644
--- a/third_party/nixpkgs/nixos/modules/services/web-servers/nginx/default.nix
+++ b/third_party/nixpkgs/nixos/modules/services/web-servers/nginx/default.nix
@@ -804,7 +804,7 @@ in
ProtectControlGroups = true;
RestrictAddressFamilies = [ "AF_UNIX" "AF_INET" "AF_INET6" ];
LockPersonality = true;
- MemoryDenyWriteExecute = !(builtins.any (mod: (mod.allowMemoryWriteExecute or false)) cfg.package.modules);
+ MemoryDenyWriteExecute = !(builtins.any (mod: (mod.allowMemoryWriteExecute or false)) (optionals (cfg.package ? modules) cfg.package.modules));
RestrictRealtime = true;
RestrictSUIDSGID = true;
PrivateMounts = true;
diff --git a/third_party/nixpkgs/nixos/tests/all-tests.nix b/third_party/nixpkgs/nixos/tests/all-tests.nix
index 251f24a9a0..3ce71b0abe 100644
--- a/third_party/nixpkgs/nixos/tests/all-tests.nix
+++ b/third_party/nixpkgs/nixos/tests/all-tests.nix
@@ -408,6 +408,7 @@ in
trickster = handleTest ./trickster.nix {};
trilium-server = handleTestOn ["x86_64-linux"] ./trilium-server.nix {};
tuptime = handleTest ./tuptime.nix {};
+ turbovnc-headless-server = handleTest ./turbovnc-headless-server.nix {};
ucg = handleTest ./ucg.nix {};
udisks2 = handleTest ./udisks2.nix {};
unbound = handleTest ./unbound.nix {};
diff --git a/third_party/nixpkgs/nixos/tests/dokuwiki.nix b/third_party/nixpkgs/nixos/tests/dokuwiki.nix
index 40475d789d..2664e1500e 100644
--- a/third_party/nixpkgs/nixos/tests/dokuwiki.nix
+++ b/third_party/nixpkgs/nixos/tests/dokuwiki.nix
@@ -9,7 +9,7 @@ let
sha256 = "4de5ff31d54dd61bbccaf092c9e74c1af3a4c53e07aa59f60457a8f00cfb23a6";
};
# We need unzip to build this package
- buildInputs = [ pkgs.unzip ];
+ nativeBuildInputs = [ pkgs.unzip ];
# Installing simply means copying all files to the output directory
installPhase = "mkdir -p $out; cp -R * $out/";
};
@@ -24,7 +24,7 @@ let
sha256 = "e40ed7dd6bbe7fe3363bbbecb4de481d5e42385b5a0f62f6a6ce6bf3a1f9dfa8";
};
# We need unzip to build this package
- buildInputs = [ pkgs.unzip ];
+ nativeBuildInputs = [ pkgs.unzip ];
sourceRoot = ".";
# Installing simply means copying all files to the output directory
installPhase = "mkdir -p $out; cp -R * $out/";
diff --git a/third_party/nixpkgs/nixos/tests/turbovnc-headless-server.nix b/third_party/nixpkgs/nixos/tests/turbovnc-headless-server.nix
new file mode 100644
index 0000000000..35da9a53d2
--- /dev/null
+++ b/third_party/nixpkgs/nixos/tests/turbovnc-headless-server.nix
@@ -0,0 +1,171 @@
+import ./make-test-python.nix ({ pkgs, lib, ... }: {
+ name = "turbovnc-headless-server";
+ meta = {
+ maintainers = with lib.maintainers; [ nh2 ];
+ };
+
+ machine = { pkgs, ... }: {
+
+ environment.systemPackages = with pkgs; [
+ glxinfo
+ procps # for `pkill`, `pidof` in the test
+ scrot # for screenshotting Xorg
+ turbovnc
+ ];
+
+ programs.turbovnc.ensureHeadlessSoftwareOpenGL = true;
+
+ networking.firewall = {
+ # Reject instead of drop, for failures instead of hangs.
+ rejectPackets = true;
+ allowedTCPPorts = [
+ 5900 # VNC :0, for seeing what's going on in the server
+ ];
+ };
+
+ # So that we can ssh into the VM, see e.g.
+ # http://blog.patapon.info/nixos-local-vm/#accessing-the-vm-with-ssh
+ services.openssh.enable = true;
+ services.openssh.permitRootLogin = "yes";
+ users.extraUsers.root.password = "";
+ users.mutableUsers = false;
+ };
+
+ testScript = ''
+ def wait_until_terminated_or_succeeds(
+ termination_check_shell_command,
+ success_check_shell_command,
+ get_detail_message_fn,
+ retries=60,
+ retry_sleep=0.5,
+ ):
+ def check_success():
+ command_exit_code, _output = machine.execute(success_check_shell_command)
+ return command_exit_code == 0
+
+ for _ in range(retries):
+ exit_check_exit_code, _output = machine.execute(termination_check_shell_command)
+ is_terminated = exit_check_exit_code != 0
+ if is_terminated:
+ if check_success():
+ return
+ else:
+ details = get_detail_message_fn()
+ raise Exception(
+ f"termination check ({termination_check_shell_command}) triggered without command succeeding ({success_check_shell_command}); details: {details}"
+ )
+ else:
+ if check_success():
+ return
+ time.sleep(retry_sleep)
+
+ if not check_success():
+ details = get_detail_message_fn()
+ raise Exception(
+ f"action timed out ({success_check_shell_command}); details: {details}"
+ )
+
+
+ # Below we use the pattern:
+ # (cmd | tee stdout.log) 3>&1 1>&2 2>&3 | tee stderr.log
+ # to capture both stderr and stdout while also teeing them, see:
+ # https://unix.stackexchange.com/questions/6430/how-to-redirect-stderr-and-stdout-to-different-files-and-also-display-in-termina/6431#6431
+
+
+ # Starts headless VNC server, backgrounding it.
+ def start_xvnc():
+ xvnc_command = " ".join(
+ [
+ "Xvnc",
+ ":0",
+ "-iglx",
+ "-auth /root/.Xauthority",
+ "-geometry 1240x900",
+ "-depth 24",
+ "-rfbwait 5000",
+ "-deferupdate 1",
+ "-verbose",
+ "-securitytypes none",
+ # We don't enforce localhost listening such that we
+ # can connect from outside the VM using
+ # env QEMU_NET_OPTS=hostfwd=tcp::5900-:5900 $(nix-build nixos/tests/turbovnc-headless-server.nix -A driver)/bin/nixos-test-driver
+ # for testing purposes, and so that we can in the future
+ # add another test case that connects the TurboVNC client.
+ # "-localhost",
+ ]
+ )
+ machine.execute(
+ # Note trailing & for backgrounding.
+ f"({xvnc_command} | tee /tmp/Xvnc.stdout) 3>&1 1>&2 2>&3 | tee /tmp/Xvnc.stderr &",
+ )
+
+
+ # Waits until the server log message that tells us that GLX is ready
+ # (requires `-verbose` above), avoiding screenshoting racing below.
+ def wait_until_xvnc_glx_ready():
+ machine.wait_until_succeeds("test -f /tmp/Xvnc.stderr")
+ wait_until_terminated_or_succeeds(
+ termination_check_shell_command="pidof Xvnc",
+ success_check_shell_command="grep 'GLX: Initialized DRISWRAST' /tmp/Xvnc.stderr",
+ get_detail_message_fn=lambda: "Contents of /tmp/Xvnc.stderr:\n"
+ + machine.succeed("cat /tmp/Xvnc.stderr"),
+ )
+
+
+ # Checks that we detect glxgears failing when
+ # `LIBGL_DRIVERS_PATH=/nonexistent` is set
+ # (in which case software rendering should not work).
+ def test_glxgears_failing_with_bad_driver_path():
+ machine.execute(
+ # Note trailing & for backgrounding.
+ "(env DISPLAY=:0 LIBGL_DRIVERS_PATH=/nonexistent glxgears -info | tee /tmp/glxgears-should-fail.stdout) 3>&1 1>&2 2>&3 | tee /tmp/glxgears-should-fail.stderr &"
+ )
+ machine.wait_until_succeeds("test -f /tmp/glxgears-should-fail.stderr")
+ wait_until_terminated_or_succeeds(
+ termination_check_shell_command="pidof glxgears",
+ success_check_shell_command="grep 'libGL error: failed to load driver: swrast' /tmp/glxgears-should-fail.stderr",
+ get_detail_message_fn=lambda: "Contents of /tmp/glxgears-should-fail.stderr:\n"
+ + machine.succeed("cat /tmp/glxgears-should-fail.stderr"),
+ )
+ machine.wait_until_fails("pidof glxgears")
+
+
+ # Starts glxgears, backgrounding it. Waits until it prints the `GL_RENDERER`.
+ # Does not quit glxgears.
+ def test_glxgears_prints_renderer():
+ machine.execute(
+ # Note trailing & for backgrounding.
+ "(env DISPLAY=:0 glxgears -info | tee /tmp/glxgears.stdout) 3>&1 1>&2 2>&3 | tee /tmp/glxgears.stderr &"
+ )
+ machine.wait_until_succeeds("test -f /tmp/glxgears.stderr")
+ wait_until_terminated_or_succeeds(
+ termination_check_shell_command="pidof glxgears",
+ success_check_shell_command="grep 'GL_RENDERER' /tmp/glxgears.stdout",
+ get_detail_message_fn=lambda: "Contents of /tmp/glxgears.stderr:\n"
+ + machine.succeed("cat /tmp/glxgears.stderr"),
+ )
+
+
+ with subtest("Start Xvnc"):
+ start_xvnc()
+ wait_until_xvnc_glx_ready()
+
+ with subtest("Ensure bad driver path makes glxgears fail"):
+ test_glxgears_failing_with_bad_driver_path()
+
+ with subtest("Run 3D application (glxgears)"):
+ test_glxgears_prints_renderer()
+
+ # Take screenshot; should display the glxgears.
+ machine.succeed("scrot --display :0 /tmp/glxgears.png")
+
+ # Copy files down.
+ machine.copy_from_vm("/tmp/glxgears.png")
+ machine.copy_from_vm("/tmp/glxgears.stdout")
+ machine.copy_from_vm("/tmp/glxgears-should-fail.stdout")
+ machine.copy_from_vm("/tmp/glxgears-should-fail.stderr")
+ machine.copy_from_vm("/tmp/Xvnc.stdout")
+ machine.copy_from_vm("/tmp/Xvnc.stderr")
+ '';
+
+})
diff --git a/third_party/nixpkgs/pkgs/applications/accessibility/squeekboard/default.nix b/third_party/nixpkgs/pkgs/applications/accessibility/squeekboard/default.nix
new file mode 100644
index 0000000000..08042a7701
--- /dev/null
+++ b/third_party/nixpkgs/pkgs/applications/accessibility/squeekboard/default.nix
@@ -0,0 +1,70 @@
+{ lib
+, stdenv
+, fetchFromGitLab
+, meson
+, ninja
+, pkg-config
+, gnome3
+, glib
+, gtk3
+, wayland
+, wayland-protocols
+, libxml2
+, libxkbcommon
+, rustPlatform
+, feedbackd
+, wrapGAppsHook
+}:
+
+stdenv.mkDerivation rec {
+ pname = "squeekboard";
+ version = "unstable-2021-03-09";
+
+ src = fetchFromGitLab {
+ domain = "source.puri.sm";
+ owner = "Librem5";
+ repo = pname;
+ rev = "bffd212e102bf71a94c599aac0359a8d30d19008";
+ sha256 = "1j10zhyb8wyrcbryfj6f3drn9b0l9x0l7hnhy2imnjbfbnwwm4w7";
+ };
+
+ cargoDeps = rustPlatform.fetchCargoTarball {
+ inherit src;
+ cargoUpdateHook = ''
+ cat Cargo.toml.in Cargo.deps > Cargo.toml
+ '';
+ name = "${pname}-${version}";
+ sha256 = "1qaqiaxqc4x2x5bd31na4c49vbjwrmz5clmgli7733dv55rxxias";
+ };
+
+ nativeBuildInputs = [
+ meson
+ ninja
+ pkg-config
+ glib
+ wayland
+ wrapGAppsHook
+ ] ++ (with rustPlatform; [
+ cargoSetupHook
+ rust.cargo
+ rust.rustc
+ ]);
+
+ buildInputs = [
+ gtk3
+ gnome3.gnome-desktop
+ wayland
+ wayland-protocols
+ libxml2
+ libxkbcommon
+ feedbackd
+ ];
+
+ meta = with lib; {
+ description = "A virtual keyboard supporting Wayland";
+ homepage = "https://source.puri.sm/Librem5/squeekboard";
+ license = licenses.gpl3Plus;
+ maintainers = with maintainers; [ artturin ];
+ platforms = platforms.linux;
+ };
+}
diff --git a/third_party/nixpkgs/pkgs/applications/audio/ardour/5.nix b/third_party/nixpkgs/pkgs/applications/audio/ardour/5.nix
index 4a0656ed9c..9e8c075bfb 100644
--- a/third_party/nixpkgs/pkgs/applications/audio/ardour/5.nix
+++ b/third_party/nixpkgs/pkgs/applications/audio/ardour/5.nix
@@ -8,7 +8,6 @@
, doxygen
, fftwSinglePrec
, flac
-, glibc
, glibmm
, graphviz
, gtkmm2
diff --git a/third_party/nixpkgs/pkgs/applications/audio/callaudiod/default.nix b/third_party/nixpkgs/pkgs/applications/audio/callaudiod/default.nix
index d742961939..6529cd860c 100644
--- a/third_party/nixpkgs/pkgs/applications/audio/callaudiod/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/audio/callaudiod/default.nix
@@ -11,14 +11,14 @@
stdenv.mkDerivation rec {
pname = "callaudiod";
- version = "0.0.4";
+ version = "0.1.0";
src = fetchFromGitLab {
domain = "gitlab.com";
owner = "mobian1";
repo = pname;
rev = version;
- sha256 = "07k7xp5a9c4d4lq7amaj6cg6b3gsd77x9wvf7nzcf4vpaph4yiyj";
+ sha256 = "087589z45xvldn2m1g79y0xbwzylwkjmfk83s5xjixyq0wqmfppd";
};
nativeBuildInputs = [
diff --git a/third_party/nixpkgs/pkgs/applications/audio/cheesecutter/default.nix b/third_party/nixpkgs/pkgs/applications/audio/cheesecutter/default.nix
index 84f6b18303..6c14cc67f8 100644
--- a/third_party/nixpkgs/pkgs/applications/audio/cheesecutter/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/audio/cheesecutter/default.nix
@@ -8,13 +8,13 @@
}:
stdenv.mkDerivation rec {
pname = "cheesecutter";
- version = "unstable-2020-04-03";
+ version = "unstable-2021-02-27";
src = fetchFromGitHub {
owner = "theyamo";
repo = "CheeseCutter";
- rev = "68d6518f0e6249a2a5d122fc80201578337c1277";
- sha256 = "0xspzjhc6cp3m0yd0mwxncg8n1wklizamxvidrnn21jgj3mnaq2q";
+ rev = "84450d3614b8fb2cabda87033baab7bedd5a5c98";
+ sha256 = "sha256:0q4a791nayya6n01l0f4kk497rdq6kiq0n72fqdpwqy138pfwydn";
};
patches = [
diff --git a/third_party/nixpkgs/pkgs/applications/audio/espeak/default.nix b/third_party/nixpkgs/pkgs/applications/audio/espeak/default.nix
index b155c1c41b..675f31b478 100644
--- a/third_party/nixpkgs/pkgs/applications/audio/espeak/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/audio/espeak/default.nix
@@ -8,7 +8,8 @@ stdenv.mkDerivation rec {
sha256 = "0n86gwh9pw0jqqpdz7mxggllfr8k0r7pc67ayy7w5z6z79kig6mz";
};
- buildInputs = [ unzip portaudio ];
+ nativeBuildInputs = [ unzip ];
+ buildInputs = [ portaudio ];
patches = [
./gcc6.patch
diff --git a/third_party/nixpkgs/pkgs/applications/audio/espeak/edit.nix b/third_party/nixpkgs/pkgs/applications/audio/espeak/edit.nix
index aa0dc90adf..0b9fa3dfbe 100644
--- a/third_party/nixpkgs/pkgs/applications/audio/espeak/edit.nix
+++ b/third_party/nixpkgs/pkgs/applications/audio/espeak/edit.nix
@@ -8,8 +8,8 @@ stdenv.mkDerivation rec {
sha256 = "0x8s7vpb7rw5x37yjzy1f98m4f2csdg89libb74fm36gn8ly0hli";
};
- nativeBuildInputs = [ pkg-config ];
- buildInputs = [ unzip portaudio wxGTK ];
+ nativeBuildInputs = [ pkg-config unzip ];
+ buildInputs = [ portaudio wxGTK ];
# TODO:
# Uhm, seems like espeakedit still wants espeak-data/ in $HOME, even thought
diff --git a/third_party/nixpkgs/pkgs/applications/audio/gnome-podcasts/default.nix b/third_party/nixpkgs/pkgs/applications/audio/gnome-podcasts/default.nix
index 6524700ae1..f4099f49ec 100644
--- a/third_party/nixpkgs/pkgs/applications/audio/gnome-podcasts/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/audio/gnome-podcasts/default.nix
@@ -75,5 +75,7 @@ stdenv.mkDerivation rec {
license = licenses.gpl3Plus;
maintainers = teams.gnome.members;
platforms = platforms.unix;
+ # couldn't read /build/source/build/podcasts-gtk/resources/resources.gresource: No such file or directory (os error 2)
+ broken = true;
};
}
diff --git a/third_party/nixpkgs/pkgs/applications/audio/mp3gain/default.nix b/third_party/nixpkgs/pkgs/applications/audio/mp3gain/default.nix
index fb774476a2..bf0a347d14 100644
--- a/third_party/nixpkgs/pkgs/applications/audio/mp3gain/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/audio/mp3gain/default.nix
@@ -7,7 +7,8 @@ stdenv.mkDerivation {
sha256 = "0varr6y7k8zarr56b42r0ad9g3brhn5vv3xjg1c0v19jxwr4gh2w";
};
- buildInputs = [ unzip mpg123 ];
+ nativeBuildInputs = [ unzip ];
+ buildInputs = [ mpg123 ];
sourceRoot = ".";
diff --git a/third_party/nixpkgs/pkgs/applications/audio/mpg123/default.nix b/third_party/nixpkgs/pkgs/applications/audio/mpg123/default.nix
index 0b46cffd19..5c7eb6b88c 100644
--- a/third_party/nixpkgs/pkgs/applications/audio/mpg123/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/audio/mpg123/default.nix
@@ -7,11 +7,11 @@
}:
stdenv.mkDerivation rec {
- name = "mpg123-1.26.3";
+ name = "mpg123-1.26.4";
src = fetchurl {
url = "mirror://sourceforge/mpg123/${name}.tar.bz2";
- sha256 = "0vkcfdx0mqq6lmpczsmpa2jsb0s6dryx3i7gvr32i3w9b9w9ij9h";
+ sha256 = "sha256-CBmRVA33pmaykEmthw8pPPoohjs2SIq01Yzqp7WEZFQ=";
};
outputs = [ "out" "conplay" ];
diff --git a/third_party/nixpkgs/pkgs/applications/audio/pd-plugins/helmholtz/default.nix b/third_party/nixpkgs/pkgs/applications/audio/pd-plugins/helmholtz/default.nix
index 9b50b40a5b..feaf9ed70c 100644
--- a/third_party/nixpkgs/pkgs/applications/audio/pd-plugins/helmholtz/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/audio/pd-plugins/helmholtz/default.nix
@@ -10,7 +10,8 @@ stdenv.mkDerivation {
sha256 = "0h1fj7lmvq9j6rmw33rb8k0byxb898bi2xhcwkqalb84avhywgvs";
};
- buildInputs = [ unzip puredata ];
+ nativeBuildInputs = [ unzip ];
+ buildInputs = [ puredata ];
unpackPhase = ''
unzip $src
diff --git a/third_party/nixpkgs/pkgs/applications/audio/pd-plugins/puremapping/default.nix b/third_party/nixpkgs/pkgs/applications/audio/pd-plugins/puremapping/default.nix
index 1eb6eb3893..811b8c2ee9 100644
--- a/third_party/nixpkgs/pkgs/applications/audio/pd-plugins/puremapping/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/audio/pd-plugins/puremapping/default.nix
@@ -10,7 +10,8 @@ stdenv.mkDerivation rec {
sha256 = "1h7qgqd8srrxw2y1rkdw5js4k6f5vc8x6nlm2mq9mq9vjck7n1j7";
};
- buildInputs = [ unzip puredata ];
+ nativeBuildInputs = [ unzip ];
+ buildInputs = [ puredata ];
unpackPhase = ''
unzip $src
diff --git a/third_party/nixpkgs/pkgs/applications/audio/pd-plugins/timbreid/default.nix b/third_party/nixpkgs/pkgs/applications/audio/pd-plugins/timbreid/default.nix
index e5e67ec44d..7fd2adefce 100644
--- a/third_party/nixpkgs/pkgs/applications/audio/pd-plugins/timbreid/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/audio/pd-plugins/timbreid/default.nix
@@ -9,7 +9,8 @@ stdenv.mkDerivation rec {
sha256 = "14k2xk5zrzrw1zprdbwx45hrlc7ck8vq4drpd3l455i5r8yk4y6b";
};
- buildInputs = [ unzip puredata fftw ];
+ nativeBuildInputs = [ unzip ];
+ buildInputs = [ puredata fftw ];
unpackPhase = ''
mkdir source
diff --git a/third_party/nixpkgs/pkgs/applications/audio/plexamp/default.nix b/third_party/nixpkgs/pkgs/applications/audio/plexamp/default.nix
index a26af9023a..cb682f91b6 100644
--- a/third_party/nixpkgs/pkgs/applications/audio/plexamp/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/audio/plexamp/default.nix
@@ -2,13 +2,13 @@
let
pname = "plexamp";
- version = "3.4.3";
+ version = "3.4.4";
name = "${pname}-${version}";
src = fetchurl {
url = "https://plexamp.plex.tv/plexamp.plex.tv/desktop/Plexamp-${version}.AppImage";
name="${pname}-${version}.AppImage";
- sha256 = "1rzhrc5yr5f6bxydgmcjwrg85vkbkn6lqj72512lyhq5gg7zmm1w";
+ sha256 = "1iz6qi12ljafb49l73rba5rwi5sdbd8ck5h2r6jiy260lgr2iiyk";
};
appimageContents = appimageTools.extractType2 {
@@ -32,7 +32,7 @@ in appimageTools.wrapType2 {
meta = with lib; {
description = "A beautiful Plex music player for audiophiles, curators, and hipsters";
homepage = "https://plexamp.com/";
- changelog = "https://forums.plex.tv/t/plexamp-release-notes/221280/25";
+ changelog = "https://forums.plex.tv/t/plexamp-release-notes/221280/26";
license = licenses.unfree;
maintainers = with maintainers; [ killercup synthetica ];
platforms = [ "x86_64-linux" ];
diff --git a/third_party/nixpkgs/pkgs/applications/audio/renoise/default.nix b/third_party/nixpkgs/pkgs/applications/audio/renoise/default.nix
index 45f4e76bf5..fd9a9f0050 100644
--- a/third_party/nixpkgs/pkgs/applications/audio/renoise/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/audio/renoise/default.nix
@@ -28,7 +28,7 @@ stdenv.mkDerivation rec {
}
else
releasePath
- else throw "Platform is not supported by Renoise";
+ else throw "Platform is not supported. Use instalation native to your platform https://www.renoise.com/";
buildInputs = [ alsaLib libjack2 libX11 libXcursor libXext libXrandr ];
@@ -47,6 +47,16 @@ stdenv.mkDerivation rec {
mkdir $out/bin
ln -s $out/renoise $out/bin/renoise
+
+ # Desktop item
+ mkdir -p $out/share/applications
+ cp -r Installer/renoise.desktop $out/share/applications/renoise.desktop
+
+ # Desktop item icons
+ mkdir -p $out/share/icons/hicolor/{48x48,64x64,128x128}/apps
+ cp Installer/renoise-48.png $out/share/icons/hicolor/48x48/apps/renoise.png
+ cp Installer/renoise-64.png $out/share/icons/hicolor/64x64/apps/renoise.png
+ cp Installer/renoise-128.png $out/share/icons/hicolor/128x128/apps/renoise.png
'';
postFixup = ''
@@ -61,6 +71,9 @@ stdenv.mkDerivation rec {
--set-rpath $out/lib \
$path
done
+
+ substituteInPlace $out/share/applications/renoise.desktop \
+ --replace Exec=renoise Exec=$out/bin/renoise
'';
meta = {
diff --git a/third_party/nixpkgs/pkgs/applications/audio/samplv1/default.nix b/third_party/nixpkgs/pkgs/applications/audio/samplv1/default.nix
index 4b06a99d47..8f0a480812 100644
--- a/third_party/nixpkgs/pkgs/applications/audio/samplv1/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/audio/samplv1/default.nix
@@ -5,11 +5,11 @@
mkDerivation rec {
pname = "samplv1";
- version = "0.9.18";
+ version = "0.9.20";
src = fetchurl {
url = "mirror://sourceforge/samplv1/${pname}-${version}.tar.gz";
- sha256 = "ePhM9OTLJp1Wa2D9Y1Dqq/69WlEhEp3ih9yNUIJU5Y4=";
+ sha256 = "sha256-9tm72lV9i/155TVweNwO2jpPsCJkh6r82g7Z1wCI1ho=";
};
nativeBuildInputs = [ qttools pkg-config ];
diff --git a/third_party/nixpkgs/pkgs/applications/audio/strawberry/default.nix b/third_party/nixpkgs/pkgs/applications/audio/strawberry/default.nix
index eb7aac16c6..fc13c8862c 100644
--- a/third_party/nixpkgs/pkgs/applications/audio/strawberry/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/audio/strawberry/default.nix
@@ -35,13 +35,13 @@
mkDerivation rec {
pname = "strawberry";
- version = "0.8.5";
+ version = "0.9.1";
src = fetchFromGitHub {
owner = "jonaski";
repo = pname;
rev = version;
- sha256 = "sha256-+ZQ80J94Teqt4Gy6fw/pS7FwILK/TPehtJDy72Bdy1E=";
+ sha256 = "sha256-1aXHMvjLK5WiE0mut/a3ynuMfNHgPbUzAZdmaVJBDXQ=";
};
buildInputs = [
diff --git a/third_party/nixpkgs/pkgs/applications/audio/sunvox/default.nix b/third_party/nixpkgs/pkgs/applications/audio/sunvox/default.nix
index abc31d9f18..ef7133630b 100644
--- a/third_party/nixpkgs/pkgs/applications/audio/sunvox/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/audio/sunvox/default.nix
@@ -20,7 +20,7 @@ stdenv.mkDerivation rec {
sha256 = "0lqzr68n2c6aifw2vbyars91wn1chmgb9xfdk463g4vjqiava3ih";
};
- buildInputs = [ unzip ];
+ nativeBuildInputs = [ unzip ];
unpackPhase = "unzip $src";
@@ -44,5 +44,7 @@ stdenv.mkDerivation rec {
homepage = "http://www.warmplace.ru/soft/sunvox/";
maintainers = with maintainers; [ puffnfresh ];
platforms = [ "i686-linux" "x86_64-linux" ];
+ # hash mismatch
+ broken = true;
};
}
diff --git a/third_party/nixpkgs/pkgs/applications/audio/surge/default.nix b/third_party/nixpkgs/pkgs/applications/audio/surge/default.nix
index 8312532469..ed15d49cfe 100644
--- a/third_party/nixpkgs/pkgs/applications/audio/surge/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/audio/surge/default.nix
@@ -4,13 +4,13 @@
stdenv.mkDerivation rec {
pname = "surge";
- version = "1.7.1";
+ version = "1.8.1";
src = fetchFromGitHub {
owner = "surge-synthesizer";
repo = pname;
rev = "release_${version}";
- sha256 = "1b3ccc78vrpzy18w7070zfa250dnd1bww147xxcnj457vd6n065s";
+ sha256 = "0lla860g7zgn9n1zgy14g4j72d5n5y7isyxz2w5xy2fzdpdg24ql";
leaveDotGit = true; # for SURGE_VERSION
fetchSubmodules = true;
};
@@ -20,9 +20,10 @@ stdenv.mkDerivation rec {
postPatch = ''
substituteInPlace src/common/SurgeStorage.cpp --replace "/usr/share/Surge" "$out/share/surge"
- substituteInPlace src/common/gui/PopupEditorDialog.cpp --replace '"zenity' '"${zenity}/bin/zenity'
substituteInPlace src/linux/UserInteractionsLinux.cpp --replace '"zenity' '"${zenity}/bin/zenity'
substituteInPlace vstgui.surge/vstgui/lib/platform/linux/x11fileselector.cpp --replace /usr/bin/zenity ${zenity}/bin/zenity
+ patchShebangs scripts/linux/emit-vector-piggy
+ patchShebangs scripts/linux/generate-lv2-ttl
'';
installPhase = ''
diff --git a/third_party/nixpkgs/pkgs/applications/blockchains/ledger-live-desktop/default.nix b/third_party/nixpkgs/pkgs/applications/blockchains/ledger-live-desktop/default.nix
index 8c928cafa5..2dea189dca 100644
--- a/third_party/nixpkgs/pkgs/applications/blockchains/ledger-live-desktop/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/blockchains/ledger-live-desktop/default.nix
@@ -2,12 +2,12 @@
let
pname = "ledger-live-desktop";
- version = "2.23.0";
+ version = "2.24.0";
name = "${pname}-${version}";
src = fetchurl {
url = "https://github.com/LedgerHQ/${pname}/releases/download/v${version}/${pname}-${version}-linux-x86_64.AppImage";
- sha256 = "0id9zbpfq3knv8qwkhplbl9pwrvdkn212pafwh4vpjbbp4yimhq5";
+ sha256 = "1xdqj825vwh3kg35v7568zr1jhvldb4wcazzgzcaawkr4qzfdb2n";
};
appimageContents = appimageTools.extractType2 {
diff --git a/third_party/nixpkgs/pkgs/applications/blockchains/monero-gui/default.nix b/third_party/nixpkgs/pkgs/applications/blockchains/monero-gui/default.nix
index 9bf1ca586c..5f430bc886 100644
--- a/third_party/nixpkgs/pkgs/applications/blockchains/monero-gui/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/blockchains/monero-gui/default.nix
@@ -10,15 +10,13 @@
, randomx, zeromq, libgcrypt, libgpgerror
, hidapi, rapidjson, quirc
, trezorSupport ? true
-, libusb1 ? null
-, protobuf ? null
-, python3 ? null
+, libusb1
+, protobuf
+, python3
}:
with lib;
-assert trezorSupport -> all (x: x!=null) [ libusb1 protobuf python3 ];
-
let
arch = if stdenv.isx86_64 then "x86-64"
else if stdenv.isi686 then "i686"
diff --git a/third_party/nixpkgs/pkgs/applications/editors/android-studio/common.nix b/third_party/nixpkgs/pkgs/applications/editors/android-studio/common.nix
index 6be6defd19..678d6a0a35 100644
--- a/third_party/nixpkgs/pkgs/applications/editors/android-studio/common.nix
+++ b/third_party/nixpkgs/pkgs/applications/editors/android-studio/common.nix
@@ -65,9 +65,9 @@ let
sha256 = sha256Hash;
};
+ nativeBuildInputs = [ unzip ];
buildInputs = [
makeWrapper
- unzip
];
installPhase = ''
cp -r . $out
diff --git a/third_party/nixpkgs/pkgs/applications/editors/android-studio/default.nix b/third_party/nixpkgs/pkgs/applications/editors/android-studio/default.nix
index fa4f7a40d9..466dfb2516 100644
--- a/third_party/nixpkgs/pkgs/applications/editors/android-studio/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/editors/android-studio/default.nix
@@ -9,18 +9,18 @@ let
inherit buildFHSUserEnv;
};
stableVersion = {
- version = "4.1.2.0"; # "Android Studio 4.1.2"
- build = "201.7042882";
- sha256Hash = "1f9bclvyvm3sg9an7wxlfwd8jwnb9cl726dvggmysa6r7shc7xw9";
+ version = "4.1.3.0"; # "Android Studio 4.1.3"
+ build = "201.7199119";
+ sha256Hash = "06xwgk7bwcmljka8xa56cfwwg858r0bl0xp2jb9hdnkwljf796gm";
};
betaVersion = {
- version = "4.2.0.21"; # "Android Studio 4.2 Beta 5"
- build = "202.7141121";
- sha256Hash = "05610xf9zz3yxarx6fv83fynlvqw9jl7h2a40yj3xx5kb7mzdnf2";
+ version = "4.2.0.22"; # "Android Studio 4.2 Beta 6"
+ build = "202.7188722";
+ sha256Hash = "0mzwkx1csx194wzg7dc1cii3c16wbmlbq1jdv9ly4nmdxlvc2rxb";
};
latestVersion = { # canary & dev
- version = "2020.3.1.7"; # "Android Studio Arctic Fox (2020.3.1) Canary 7"
- sha256Hash = "03gq4s8rmg7si0r2y1w26v9bjwhj6gzmrdny5z3j5pq8xsfjfqiw";
+ version = "2020.3.1.10"; # "Android Studio Arctic Fox (2020.3.1) Canary 10"
+ sha256Hash = "15xxyjjjy5pnimc66dcwnqb7z4lq7ll4fl401a3br5ca4d1hpgsj";
};
in {
# Attributes are named by their corresponding release channels
diff --git a/third_party/nixpkgs/pkgs/applications/editors/edit/default.nix b/third_party/nixpkgs/pkgs/applications/editors/edit/default.nix
index 25e620c51e..7ef81a4ebc 100644
--- a/third_party/nixpkgs/pkgs/applications/editors/edit/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/editors/edit/default.nix
@@ -2,39 +2,39 @@
stdenv.mkDerivation {
pname = "edit-nightly";
- version = "20160425";
+ version = "20180228";
src = fetchgit {
url = "git://c9x.me/ed.git";
- rev = "323d49b68c5e804ed3b8cada0e2274f1589b3484";
- sha256 = "0wv8i3ii7cd9bqhjpahwp2g5fcmyk365nc7ncmvl79cxbz3f7y8v";
+ rev = "77d96145b163d79186c722a7ffccfff57601157c";
+ sha256 = "0rsmp7ydmrq3xx5q19566is9a2v2w5yfsphivfc7j4ljp32jlyyy";
};
- buildInputs = [
- unzip
- pkg-config
- ncurses
- libX11
- libXft
- cwebbin
+ nativeBuildInputs = [
+ unzip
+ pkg-config
+ cwebbin
];
- buildPhase = ''
+ buildInputs = [
+ ncurses
+ libX11
+ libXft
+ ];
+
+ preBuild = ''
ctangle *.w
- make
'';
installPhase = ''
- mkdir -p $out/bin/
- cp obj/edit $out/bin/edit
+ install -Dm755 obj/edit -t $out/bin
'';
meta = with lib; {
description = "A relaxing mix of Vi and ACME";
- homepage = "http://c9x.me/edit";
+ homepage = "https://c9x.me/edit";
license = licenses.publicDomain;
maintainers = [ maintainers.vrthra ];
- platforms = platforms.linux;
+ platforms = platforms.all;
};
}
-
diff --git a/third_party/nixpkgs/pkgs/applications/editors/fte/default.nix b/third_party/nixpkgs/pkgs/applications/editors/fte/default.nix
index 3814c8a879..4f78267dbe 100644
--- a/third_party/nixpkgs/pkgs/applications/editors/fte/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/editors/fte/default.nix
@@ -3,7 +3,8 @@
stdenv.mkDerivation rec {
name = "fte-0.50.02";
- buildInputs = [ unzip perl libX11 libXpm gpm ncurses slang ];
+ nativeBuildInputs = [ unzip ];
+ buildInputs = [ perl libX11 libXpm gpm ncurses slang ];
ftesrc = fetchurl {
url = "mirror://sourceforge/fte/fte-20110708-src.zip";
diff --git a/third_party/nixpkgs/pkgs/applications/editors/jetbrains/default.nix b/third_party/nixpkgs/pkgs/applications/editors/jetbrains/default.nix
index 31551f1b72..7f36bc35cb 100644
--- a/third_party/nixpkgs/pkgs/applications/editors/jetbrains/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/editors/jetbrains/default.nix
@@ -337,7 +337,7 @@ in
name = "mps-${version}";
version = "2020.3.1"; /* updated by script */
description = "Create your own domain-specific language";
- license = lib.licenses.unfree;
+ license = lib.licenses.asl20;
src = fetchurl {
url = "https://download.jetbrains.com/mps/2020.3/MPS-${version}.tar.gz";
sha256 = "0qvl724mm53rxfhafl6561rhpwppcadmwr9sh0hpsfgsprh2xznv"; /* updated by script */
diff --git a/third_party/nixpkgs/pkgs/applications/editors/jetbrains/update.pl b/third_party/nixpkgs/pkgs/applications/editors/jetbrains/update.pl
index b4a96228db..6f0a451849 100755
--- a/third_party/nixpkgs/pkgs/applications/editors/jetbrains/update.pl
+++ b/third_party/nixpkgs/pkgs/applications/editors/jetbrains/update.pl
@@ -1,5 +1,5 @@
#!/usr/bin/env nix-shell
-#!nix-shell -i perl -p perl perlPackages.LWPProtocolhttps perlPackages.FileSlurp
+#!nix-shell -i perl -p perl perlPackages.LWPProtocolHttps perlPackages.FileSlurp
use strict;
use List::Util qw(reduce);
diff --git a/third_party/nixpkgs/pkgs/applications/editors/monodevelop/default.nix b/third_party/nixpkgs/pkgs/applications/editors/monodevelop/default.nix
index e5fde3e501..12b66370d5 100644
--- a/third_party/nixpkgs/pkgs/applications/editors/monodevelop/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/editors/monodevelop/default.nix
@@ -34,10 +34,10 @@ stdenv.mkDerivation rec {
patchFlags = [ "-p2" ];
patches = [ ./git-revert-12d610fb3f6dce121df538e36f21d8c2eeb0a6e3.patch ];
- nativeBuildInputs = [ pkg-config ];
+ nativeBuildInputs = [ pkg-config unzip ];
buildInputs = [
autoconf automake shared-mime-info intltool
- mono gtk-sharp-2_0 gnome-sharp unzip
+ mono gtk-sharp-2_0 gnome-sharp
dotnetPackages.NUnit
dotnetPackages.NUnitRunners
dotnetPackages.Nuget
diff --git a/third_party/nixpkgs/pkgs/applications/editors/netbeans/default.nix b/third_party/nixpkgs/pkgs/applications/editors/netbeans/default.nix
index f968b85c6f..c0345dbf8e 100644
--- a/third_party/nixpkgs/pkgs/applications/editors/netbeans/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/editors/netbeans/default.nix
@@ -56,8 +56,8 @@ stdenv.mkDerivation {
ln -s ${desktopItem}/share/applications/* $out/share/applications
'';
- nativeBuildInputs = [ makeWrapper ];
- buildInputs = [ perl python unzip libicns imagemagick ];
+ nativeBuildInputs = [ makeWrapper unzip ];
+ buildInputs = [ perl python libicns imagemagick ];
meta = {
description = "An integrated development environment for Java, C, C++ and PHP";
diff --git a/third_party/nixpkgs/pkgs/applications/editors/textadept/10/default.nix b/third_party/nixpkgs/pkgs/applications/editors/textadept/10/default.nix
index 9d86bdc4c5..fe22f3424f 100644
--- a/third_party/nixpkgs/pkgs/applications/editors/textadept/10/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/editors/textadept/10/default.nix
@@ -4,9 +4,9 @@ stdenv.mkDerivation rec {
version = "10.8";
pname = "textadept";
- nativeBuildInputs = [ pkg-config ];
+ nativeBuildInputs = [ pkg-config unzip ];
buildInputs = [
- gtk2 ncurses glib unzip zip
+ gtk2 ncurses glib zip
];
src = fetchhg {
diff --git a/third_party/nixpkgs/pkgs/applications/editors/textadept/11/default.nix b/third_party/nixpkgs/pkgs/applications/editors/textadept/11/default.nix
index a0037ca6c2..ec310639c3 100644
--- a/third_party/nixpkgs/pkgs/applications/editors/textadept/11/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/editors/textadept/11/default.nix
@@ -4,9 +4,9 @@ stdenv.mkDerivation rec {
version = "11.0_beta";
pname = "textadept11";
- nativeBuildInputs = [ pkg-config ];
+ nativeBuildInputs = [ pkg-config unzip ];
buildInputs = [
- gtk2 ncurses glib unzip zip
+ gtk2 ncurses glib zip
];
src = fetchFromGitHub {
diff --git a/third_party/nixpkgs/pkgs/applications/editors/vscode/generic.nix b/third_party/nixpkgs/pkgs/applications/editors/vscode/generic.nix
index 470683bad4..370d5b1561 100644
--- a/third_party/nixpkgs/pkgs/applications/editors/vscode/generic.nix
+++ b/third_party/nixpkgs/pkgs/applications/editors/vscode/generic.nix
@@ -1,5 +1,5 @@
{ stdenv, lib, makeDesktopItem
-, unzip, libsecret, libXScrnSaver, wrapGAppsHook
+, unzip, libsecret, libXScrnSaver, libxshmfence, wrapGAppsHook
, gtk2, atomEnv, at-spi2-atk, autoPatchelfHook
, systemd, fontconfig, libdbusmenu
@@ -60,14 +60,12 @@ in
'';
};
- buildInputs = (if stdenv.isDarwin
- then [ unzip ]
- else [ gtk2 at-spi2-atk wrapGAppsHook ] ++ atomEnv.packages)
- ++ [ libsecret libXScrnSaver ];
+ buildInputs = [ libsecret libXScrnSaver libxshmfence ]
+ ++ lib.optionals (!stdenv.isDarwin) ([ gtk2 at-spi2-atk wrapGAppsHook ] ++ atomEnv.packages);
runtimeDependencies = lib.optional (stdenv.isLinux) [ (lib.getLib systemd) fontconfig.lib libdbusmenu ];
- nativeBuildInputs = lib.optional (!stdenv.isDarwin) autoPatchelfHook;
+ nativeBuildInputs = [unzip] ++ lib.optional (!stdenv.isDarwin) autoPatchelfHook;
dontBuild = true;
dontConfigure = true;
diff --git a/third_party/nixpkgs/pkgs/applications/graphics/avocode/default.nix b/third_party/nixpkgs/pkgs/applications/graphics/avocode/default.nix
index 0a90b84892..0e4f182ea5 100644
--- a/third_party/nixpkgs/pkgs/applications/graphics/avocode/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/graphics/avocode/default.nix
@@ -58,8 +58,8 @@ stdenv.mkDerivation rec {
comment = "The bridge between designers and developers";
};
- nativeBuildInputs = [makeWrapper wrapGAppsHook];
- buildInputs = [ unzip gtk3 gnome3.adwaita-icon-theme ];
+ nativeBuildInputs = [makeWrapper wrapGAppsHook unzip];
+ buildInputs = [ gtk3 gnome3.adwaita-icon-theme ];
# src is producing multiple folder on unzip so we must
# override unpackCmd to extract it into newly created folder
diff --git a/third_party/nixpkgs/pkgs/applications/graphics/fondo/default.nix b/third_party/nixpkgs/pkgs/applications/graphics/fondo/default.nix
index 49e8fee513..04ac87c55d 100644
--- a/third_party/nixpkgs/pkgs/applications/graphics/fondo/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/graphics/fondo/default.nix
@@ -21,13 +21,13 @@
stdenv.mkDerivation rec {
pname = "fondo";
- version = "1.5.1";
+ version = "1.5.2";
src = fetchFromGitHub {
owner = "calo001";
repo = pname;
rev = version;
- sha256 = "sha256-eGHgZm9Q6JnY6OQNAyrFvRsuyuFnruMJNckOCCiO4Ug=";
+ sha256 = "sha256-EATZRmYSGUzWYaPqFT4mLTGGvwUp+Mn93yMF2JsPaYo=";
};
nativeBuildInputs = [
diff --git a/third_party/nixpkgs/pkgs/applications/graphics/freecad/default.nix b/third_party/nixpkgs/pkgs/applications/graphics/freecad/default.nix
index 57d1f794d0..56994e1721 100644
--- a/third_party/nixpkgs/pkgs/applications/graphics/freecad/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/graphics/freecad/default.nix
@@ -1,48 +1,114 @@
-{ lib, mkDerivation, fetchFromGitHub, fetchpatch, cmake, ninja, coin3d,
-xercesc, ode, eigen, qtbase, qttools, qtwebengine, qtxmlpatterns, wrapQtAppsHook,
-opencascade-occt, gts, hdf5, vtk, medfile, zlib, python3Packages, swig,
-gfortran, libXmu, soqt, libf2c, libGLU, makeWrapper, pkg-config, mpi,
-spaceNavSupport ? true, libspnav, qtx11extras }:
+{ lib
+, mkDerivation
+, fetchFromGitHub
+, fetchpatch
+, cmake
+, ninja
+, GitPython
+, boost
+, coin3d
+, eigen
+, gfortran
+, gts
+, hdf5
+, libGLU
+, libXmu
+, libf2c
+, libspnav
+, matplotlib
+, medfile
+, mpi
+, ode
+, opencascade-occt
+, pivy
+, pkg-config
+, pycollada
+, pyside2
+, pyside2-tools
+, python
+, pyyaml
+, qtbase
+, qttools
+, qtwebengine
+, qtx11extras
+, qtxmlpatterns
+, scipy
+, shiboken2
+, soqt
+, spaceNavSupport ? true
+, swig
+, vtk
+, wrapQtAppsHook
+, xercesc
+, zlib
+}:
-let
- pythonPackages = python3Packages;
-in mkDerivation rec {
- pname = "freecad-unstable";
- version = "2020-12-08";
+mkDerivation rec {
+ pname = "freecad";
+ version = "0.19.1";
src = fetchFromGitHub {
owner = "FreeCAD";
repo = "FreeCAD";
- rev = "daea30341ea2d5eaf2bfb65614128a5fa2abc8b7";
- sha256 = "1fza64lygqq35v7kzgqmiq5dvl5rpgkhlzv06f9dszdz44hznina";
+ rev = version;
+ hash = "sha256-itIrO+/mKXOPNs+2POKT8u4YZuqx/QAwVBWrHgKP1qQ=";
};
nativeBuildInputs = [
cmake
ninja
pkg-config
- pythonPackages.pyside2-tools
+ pyside2-tools
wrapQtAppsHook
];
buildInputs = [
- coin3d xercesc ode eigen opencascade-occt gts
- zlib swig gfortran soqt libf2c makeWrapper mpi vtk hdf5 medfile
- libGLU libXmu qtbase qttools qtwebengine qtxmlpatterns
- ] ++ (with pythonPackages; [
- matplotlib pycollada shiboken2 pyside2 pyside2-tools pivy python boost
GitPython # for addon manager
- scipy pyyaml # (at least for) PyrateWorkbench
- ]) ++ lib.optionals spaceNavSupport [ libspnav qtx11extras ];
+ boost
+ coin3d
+ eigen
+ gfortran
+ gts
+ hdf5
+ libGLU
+ libXmu
+ libf2c
+ matplotlib
+ medfile
+ mpi
+ ode
+ opencascade-occt
+ pivy
+ pycollada
+ pyside2
+ pyside2-tools
+ python
+ pyyaml # (at least for) PyrateWorkbench
+ qtbase
+ qttools
+ qtwebengine
+ qtxmlpatterns
+ scipy
+ shiboken2
+ soqt
+ swig
+ vtk
+ xercesc
+ zlib
+ ] ++ lib.optionals spaceNavSupport [
+ libspnav
+ qtx11extras
+ ];
cmakeFlags = [
+ "-DBUILD_FLAT_MESH:BOOL=ON"
"-DBUILD_QT5=ON"
- "-DSHIBOKEN_INCLUDE_DIR=${pythonPackages.shiboken2}/include"
+ "-DSHIBOKEN_INCLUDE_DIR=${shiboken2}/include"
"-DSHIBOKEN_LIBRARY=Shiboken2::libshiboken"
- ("-DPYSIDE_INCLUDE_DIR=${pythonPackages.pyside2}/include"
- + ";${pythonPackages.pyside2}/include/PySide2/QtCore"
- + ";${pythonPackages.pyside2}/include/PySide2/QtWidgets"
- + ";${pythonPackages.pyside2}/include/PySide2/QtGui"
+ ("-DPYSIDE_INCLUDE_DIR=${pyside2}/include"
+ + ";${pyside2}/include/PySide2/QtCore"
+ + ";${pyside2}/include/PySide2/QtWidgets"
+ + ";${pyside2}/include/PySide2/QtGui"
)
"-DPYSIDE_LIBRARY=PySide2::pyside2"
];
@@ -65,13 +131,31 @@ in mkDerivation rec {
postFixup = ''
mv $out/share/doc $out
+ ln -s $out/bin/FreeCAD $out/bin/freecad
+ ln -s $out/bin/FreeCADCmd $out/bin/freecadcmd
'';
meta = with lib; {
- description = "General purpose Open Source 3D CAD/MCAD/CAx/CAE/PLM modeler";
homepage = "https://www.freecadweb.org/";
+ description = "General purpose Open Source 3D CAD/MCAD/CAx/CAE/PLM modeler";
+ longDescription = ''
+ FreeCAD is an open-source parametric 3D modeler made primarily to design
+ real-life objects of any size. Parametric modeling allows you to easily
+ modify your design by going back into your model history and changing its
+ parameters.
+
+ FreeCAD allows you to sketch geometry constrained 2D shapes and use them
+ as a base to build other objects. It contains many components to adjust
+ dimensions or extract design details from 3D models to create high quality
+ production ready drawings.
+
+ FreeCAD is designed to fit a wide range of uses including product design,
+ mechanical engineering and architecture. Whether you are a hobbyist, a
+ programmer, an experienced CAD user, a student or a teacher, you will feel
+ right at home with FreeCAD.
+ '';
license = licenses.lgpl2Plus;
- maintainers = with maintainers; [ viric gebner ];
+ maintainers = with maintainers; [ viric gebner AndersonTorres ];
platforms = platforms.linux;
};
}
diff --git a/third_party/nixpkgs/pkgs/applications/graphics/gimp/default.nix b/third_party/nixpkgs/pkgs/applications/graphics/gimp/default.nix
index 62f1a36277..2491d8d3a8 100644
--- a/third_party/nixpkgs/pkgs/applications/graphics/gimp/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/graphics/gimp/default.nix
@@ -1,6 +1,7 @@
{ stdenv
, lib
, fetchurl
+, fetchpatch
, substituteAll
, autoreconfHook
, pkg-config
@@ -72,6 +73,12 @@ in stdenv.mkDerivation rec {
# Use absolute paths instead of relying on PATH
# to make sure plug-ins are loaded by the correct interpreter.
./hardcode-plugin-interpreters.patch
+
+ # Fix crash without dot.
+ (fetchpatch {
+ url = "https://gitlab.gnome.org/GNOME/gimp/-/commit/f83fd22c4b8701ffc4ce14383e5e22756a4bce04.patch";
+ sha256 = "POuvBhOSStO7hBGp4HgNx5F9pElFRoqN3W+i3u4zOnk=";
+ })
];
nativeBuildInputs = [
diff --git a/third_party/nixpkgs/pkgs/applications/graphics/imagej/default.nix b/third_party/nixpkgs/pkgs/applications/graphics/imagej/default.nix
index 312316b339..65d3c9735d 100644
--- a/third_party/nixpkgs/pkgs/applications/graphics/imagej/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/graphics/imagej/default.nix
@@ -15,8 +15,7 @@ let
url = "https://wsr.imagej.net/distros/cross-platform/ij150.zip";
sha256 = "97aba6fc5eb908f5160243aebcdc4965726693cb1353d9c0d71b8f5dd832cb7b";
};
- nativeBuildInputs = [ makeWrapper ];
- buildInputs = [ unzip ];
+ nativeBuildInputs = [ makeWrapper unzip ];
inherit jre;
# JAR files that are intended to be used by other packages
diff --git a/third_party/nixpkgs/pkgs/applications/graphics/leocad/default.nix b/third_party/nixpkgs/pkgs/applications/graphics/leocad/default.nix
index 39a287900a..9c16e23ebb 100644
--- a/third_party/nixpkgs/pkgs/applications/graphics/leocad/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/graphics/leocad/default.nix
@@ -1,31 +1,53 @@
+{ lib
+, mkDerivation
+, fetchFromGitHub
+, fetchurl
+, qmake
+, qttools
+, zlib
+}:
+
/*
To use aditional parts libraries
set the variable LEOCAD_LIB=/path/to/libs/ or use option -l /path/to/libs/
*/
-{ lib, stdenv, fetchFromGitHub, qt4, qmake4Hook, zlib }:
+let
+ parts = fetchurl {
+ url = "https://web.archive.org/web/20190715142541/https://www.ldraw.org/library/updates/complete.zip";
+ sha256 = "sha256-PW3XCbFwRaNkx4EgCnl2rXH7QgmpNgjTi17kZ5bladA=";
+ };
-stdenv.mkDerivation rec {
+in
+mkDerivation rec {
pname = "leocad";
- version = "19.07.1";
+ version = "21.03";
src = fetchFromGitHub {
owner = "leozide";
repo = "leocad";
rev = "v${version}";
- sha256 = "02kv1m18g6s4dady9jv4sjivfkrp192bmdw2a3d9lzlp60zks0p2";
+ sha256 = "sha256-69Ocfk5dBXwcRqAZWEP9Xg41o/tAQo76dIOk9oYhCUE=";
};
- nativeBuildInputs = [ qmake4Hook ];
- buildInputs = [ qt4 zlib ];
- postPatch = ''
- export qmakeFlags="$qmakeFlags INSTALL_PREFIX=$out"
- '';
+ nativeBuildInputs = [ qmake qttools ];
+
+ buildInputs = [ zlib ];
+
+ qmakeFlags = [
+ "INSTALL_PREFIX=${placeholder "out"}"
+ "DISABLE_UPDATE_CHECK=1"
+ ];
+
+ qtWrapperArgs = [
+ "--set-default LEOCAD_LIB ${parts}"
+ ];
meta = with lib; {
description = "CAD program for creating virtual LEGO models";
homepage = "https://www.leocad.org/";
- license = licenses.gpl2;
+ license = licenses.gpl2Only;
+ maintainers = with maintainers; [ peterhoeg ];
platforms = platforms.linux;
};
}
diff --git a/third_party/nixpkgs/pkgs/applications/graphics/zgrviewer/default.nix b/third_party/nixpkgs/pkgs/applications/graphics/zgrviewer/default.nix
index c47c41a1cd..b5fc70494f 100644
--- a/third_party/nixpkgs/pkgs/applications/graphics/zgrviewer/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/graphics/zgrviewer/default.nix
@@ -6,7 +6,8 @@ stdenv.mkDerivation rec {
url = "mirror://sourceforge/zvtm/${pname}/${version}/${pname}-${version}.zip";
sha256 = "1yg2rck81sqqrgfi5kn6c1bz42dr7d0zqpcsdjhicssi1y159f23";
};
- buildInputs = [jre unzip];
+ nativeBuildInputs = [ unzip ];
+ buildInputs = [jre];
buildPhase = "";
installPhase = ''
mkdir -p "$out"/{bin,share/java/zvtm/plugins,share/doc/zvtm}
diff --git a/third_party/nixpkgs/pkgs/applications/kde/fetch.sh b/third_party/nixpkgs/pkgs/applications/kde/fetch.sh
index d659c551bd..861cd5f835 100644
--- a/third_party/nixpkgs/pkgs/applications/kde/fetch.sh
+++ b/third_party/nixpkgs/pkgs/applications/kde/fetch.sh
@@ -1 +1 @@
-WGET_ARGS=( http://download.kde.org/stable/release-service/20.12.1/src -A '*.tar.xz' )
+WGET_ARGS=( http://download.kde.org/stable/release-service/20.12.2/src -A '*.tar.xz' )
diff --git a/third_party/nixpkgs/pkgs/applications/kde/srcs.nix b/third_party/nixpkgs/pkgs/applications/kde/srcs.nix
index f78d29db6b..c1def1bd61 100644
--- a/third_party/nixpkgs/pkgs/applications/kde/srcs.nix
+++ b/third_party/nixpkgs/pkgs/applications/kde/srcs.nix
@@ -4,1795 +4,1795 @@
{
akonadi = {
- version = "20.12.1";
+ version = "20.12.2";
src = fetchurl {
- url = "${mirror}/stable/release-service/20.12.1/src/akonadi-20.12.1.tar.xz";
- sha256 = "1173365c84fq5vn58blsmbdp9x34gf2yrwvsi89i0l7xhpz8zx5k";
- name = "akonadi-20.12.1.tar.xz";
+ url = "${mirror}/stable/release-service/20.12.2/src/akonadi-20.12.2.tar.xz";
+ sha256 = "0659vgj8y77i0axdwwajaw6kxfa48j6s56nl6xhnv8686ss8plkw";
+ name = "akonadi-20.12.2.tar.xz";
};
};
akonadi-calendar = {
- version = "20.12.1";
+ version = "20.12.2";
src = fetchurl {
- url = "${mirror}/stable/release-service/20.12.1/src/akonadi-calendar-20.12.1.tar.xz";
- sha256 = "0zzy4f03zypj4crjy0fhk5xjgipflal3gpfibav2wcmgx034znw5";
- name = "akonadi-calendar-20.12.1.tar.xz";
+ url = "${mirror}/stable/release-service/20.12.2/src/akonadi-calendar-20.12.2.tar.xz";
+ sha256 = "0vzv4yycb2nnz5ifsydv0k080wgnhjzim6lfd6qrh38mgxpb2hzw";
+ name = "akonadi-calendar-20.12.2.tar.xz";
};
};
akonadi-calendar-tools = {
- version = "20.12.1";
+ version = "20.12.2";
src = fetchurl {
- url = "${mirror}/stable/release-service/20.12.1/src/akonadi-calendar-tools-20.12.1.tar.xz";
- sha256 = "1x5zmv32iaf17n9b8y034yhwq0dhwjwxw3i5cj97k4dpyar5s72q";
- name = "akonadi-calendar-tools-20.12.1.tar.xz";
+ url = "${mirror}/stable/release-service/20.12.2/src/akonadi-calendar-tools-20.12.2.tar.xz";
+ sha256 = "06bzha5h14x6m4xzbbz2h3s00v4pc2a8d716dav9bqi0pvvq3cj0";
+ name = "akonadi-calendar-tools-20.12.2.tar.xz";
};
};
akonadiconsole = {
- version = "20.12.1";
+ version = "20.12.2";
src = fetchurl {
- url = "${mirror}/stable/release-service/20.12.1/src/akonadiconsole-20.12.1.tar.xz";
- sha256 = "0rf7ckra0yjkwspmd4401lssiss2p8qrw9rd6j5gbw7kii05bcmz";
- name = "akonadiconsole-20.12.1.tar.xz";
+ url = "${mirror}/stable/release-service/20.12.2/src/akonadiconsole-20.12.2.tar.xz";
+ sha256 = "12fslhpxah99fzvg3a1g67n69mi4xvgz9ra787pdvzrs0lca9xa0";
+ name = "akonadiconsole-20.12.2.tar.xz";
};
};
akonadi-contacts = {
- version = "20.12.1";
+ version = "20.12.2";
src = fetchurl {
- url = "${mirror}/stable/release-service/20.12.1/src/akonadi-contacts-20.12.1.tar.xz";
- sha256 = "0gxcs8nn07y6ln5ymsbdhcm63zqxcq2ja2sxziim65bfg9g85arl";
- name = "akonadi-contacts-20.12.1.tar.xz";
+ url = "${mirror}/stable/release-service/20.12.2/src/akonadi-contacts-20.12.2.tar.xz";
+ sha256 = "05y1rpvq1shiqlgql56k052glsslawy742q4n2hs301xhg0izavz";
+ name = "akonadi-contacts-20.12.2.tar.xz";
};
};
akonadi-import-wizard = {
- version = "20.12.1";
+ version = "20.12.2";
src = fetchurl {
- url = "${mirror}/stable/release-service/20.12.1/src/akonadi-import-wizard-20.12.1.tar.xz";
- sha256 = "1wdhgvv2zblyhcxrvby7ic3449hdmcnn3hvcswgwrgbcy4bzz7zz";
- name = "akonadi-import-wizard-20.12.1.tar.xz";
+ url = "${mirror}/stable/release-service/20.12.2/src/akonadi-import-wizard-20.12.2.tar.xz";
+ sha256 = "1gqjr5k6kkxi77vq0f6mc5mr31qvjsiicj6sxwpbm0c34vydfzym";
+ name = "akonadi-import-wizard-20.12.2.tar.xz";
};
};
akonadi-mime = {
- version = "20.12.1";
+ version = "20.12.2";
src = fetchurl {
- url = "${mirror}/stable/release-service/20.12.1/src/akonadi-mime-20.12.1.tar.xz";
- sha256 = "1xsrc8572zlslabn47km58sr48wdb0pmfrh3jbn9227w9iwir3z5";
- name = "akonadi-mime-20.12.1.tar.xz";
+ url = "${mirror}/stable/release-service/20.12.2/src/akonadi-mime-20.12.2.tar.xz";
+ sha256 = "0zdgkny32zwa2r2yhi285f56jkj0ini6p3sv5hi7f43mi7r5m994";
+ name = "akonadi-mime-20.12.2.tar.xz";
};
};
akonadi-notes = {
- version = "20.12.1";
+ version = "20.12.2";
src = fetchurl {
- url = "${mirror}/stable/release-service/20.12.1/src/akonadi-notes-20.12.1.tar.xz";
- sha256 = "15d23wm0kymifcxcbip0hpnzwmzdjwxmcvqvmwgq00vy81j6k7wm";
- name = "akonadi-notes-20.12.1.tar.xz";
+ url = "${mirror}/stable/release-service/20.12.2/src/akonadi-notes-20.12.2.tar.xz";
+ sha256 = "0rbg2vwk0a1zbfw5cmz0jx3yzap7j6yi7c0igq1fgg3an7sw4j2v";
+ name = "akonadi-notes-20.12.2.tar.xz";
};
};
akonadi-search = {
- version = "20.12.1";
+ version = "20.12.2";
src = fetchurl {
- url = "${mirror}/stable/release-service/20.12.1/src/akonadi-search-20.12.1.tar.xz";
- sha256 = "065qp3nf8274fh0bna8hjs28p030wgfnr3gnp7b2791kzp25l488";
- name = "akonadi-search-20.12.1.tar.xz";
+ url = "${mirror}/stable/release-service/20.12.2/src/akonadi-search-20.12.2.tar.xz";
+ sha256 = "0m7l7f26gj018d5pipbgmmxiqky98avpypxbydrms6afdglvi5ja";
+ name = "akonadi-search-20.12.2.tar.xz";
};
};
akregator = {
- version = "20.12.1";
+ version = "20.12.2";
src = fetchurl {
- url = "${mirror}/stable/release-service/20.12.1/src/akregator-20.12.1.tar.xz";
- sha256 = "0xs5adbq9ra0ziccl1z0nsm6kvrf8vjwa8djd3nwc2csjw8wim5k";
- name = "akregator-20.12.1.tar.xz";
+ url = "${mirror}/stable/release-service/20.12.2/src/akregator-20.12.2.tar.xz";
+ sha256 = "11y2mmf2svbxvqb1bjwzrivkq8w508fwg7513bzl62pbjqa8g3gk";
+ name = "akregator-20.12.2.tar.xz";
};
};
analitza = {
- version = "20.12.1";
+ version = "20.12.2";
src = fetchurl {
- url = "${mirror}/stable/release-service/20.12.1/src/analitza-20.12.1.tar.xz";
- sha256 = "1qnqqbrjpzndbffjwqlyfqmxxxz04fi3i2g8dx6y8q79z927fzkd";
- name = "analitza-20.12.1.tar.xz";
+ url = "${mirror}/stable/release-service/20.12.2/src/analitza-20.12.2.tar.xz";
+ sha256 = "09qpqjyps9h8wc8dvbnj8iz2xc4naxjdicqxsbfwfly5wbf8xq6x";
+ name = "analitza-20.12.2.tar.xz";
};
};
ark = {
- version = "20.12.1";
+ version = "20.12.2";
src = fetchurl {
- url = "${mirror}/stable/release-service/20.12.1/src/ark-20.12.1.tar.xz";
- sha256 = "18zaaawwhlci23hkzjl535qsi8wdjc05hij3r76225jb1jb6cwrm";
- name = "ark-20.12.1.tar.xz";
+ url = "${mirror}/stable/release-service/20.12.2/src/ark-20.12.2.tar.xz";
+ sha256 = "1p8ylvk4g1x2mmfdprz911iivcvr4mciam427b6ygdrhqc7rbbqb";
+ name = "ark-20.12.2.tar.xz";
};
};
artikulate = {
- version = "20.12.1";
+ version = "20.12.2";
src = fetchurl {
- url = "${mirror}/stable/release-service/20.12.1/src/artikulate-20.12.1.tar.xz";
- sha256 = "1cvpya408r521p9398mk0xn8pb6awqm74qcjy2r0ylx0l6bkv3ca";
- name = "artikulate-20.12.1.tar.xz";
+ url = "${mirror}/stable/release-service/20.12.2/src/artikulate-20.12.2.tar.xz";
+ sha256 = "0s6vjhipb4i6bv9ff7nzm9gza8jghih9kf7f7ynq10109fk8gy6i";
+ name = "artikulate-20.12.2.tar.xz";
};
};
audiocd-kio = {
- version = "20.12.1";
+ version = "20.12.2";
src = fetchurl {
- url = "${mirror}/stable/release-service/20.12.1/src/audiocd-kio-20.12.1.tar.xz";
- sha256 = "1rlr1w0cy3q31jsaqiv50frqcl3x5jq31pnrkmyhgy23mays8ly1";
- name = "audiocd-kio-20.12.1.tar.xz";
+ url = "${mirror}/stable/release-service/20.12.2/src/audiocd-kio-20.12.2.tar.xz";
+ sha256 = "0kd7yxl571pwrijwn78pigdclwqpmd50b5cj4lna481q78f91zsa";
+ name = "audiocd-kio-20.12.2.tar.xz";
};
};
baloo-widgets = {
- version = "20.12.1";
+ version = "20.12.2";
src = fetchurl {
- url = "${mirror}/stable/release-service/20.12.1/src/baloo-widgets-20.12.1.tar.xz";
- sha256 = "115y0cdlsdzx6c017gr8x6in9jxyw0sqyamakqgfyy5phn203yr3";
- name = "baloo-widgets-20.12.1.tar.xz";
+ url = "${mirror}/stable/release-service/20.12.2/src/baloo-widgets-20.12.2.tar.xz";
+ sha256 = "0w9jrx2mz1kyn2az6jx4kympl6zd950waz4zj97cjrcq2dg5a85g";
+ name = "baloo-widgets-20.12.2.tar.xz";
};
};
blinken = {
- version = "20.12.1";
+ version = "20.12.2";
src = fetchurl {
- url = "${mirror}/stable/release-service/20.12.1/src/blinken-20.12.1.tar.xz";
- sha256 = "05dbmh1lk1ag735yiv7vql6fx15lw9a3qihxflzhbfrgng7dsxks";
- name = "blinken-20.12.1.tar.xz";
+ url = "${mirror}/stable/release-service/20.12.2/src/blinken-20.12.2.tar.xz";
+ sha256 = "0a0nkmbx1bkqjs7cf5qqm877wqvzdx9cxm9395jfxcycn5pyfps9";
+ name = "blinken-20.12.2.tar.xz";
};
};
bomber = {
- version = "20.12.1";
+ version = "20.12.2";
src = fetchurl {
- url = "${mirror}/stable/release-service/20.12.1/src/bomber-20.12.1.tar.xz";
- sha256 = "07iy6b8hwklb5mgrf8sagmrza78p3yf7i4x7w9lb2z9v2x5qw22y";
- name = "bomber-20.12.1.tar.xz";
+ url = "${mirror}/stable/release-service/20.12.2/src/bomber-20.12.2.tar.xz";
+ sha256 = "08lyj6rn9jhhwzpwh2c14v8jiwishi1wk19nm5wazy2iajbd88jv";
+ name = "bomber-20.12.2.tar.xz";
};
};
bovo = {
- version = "20.12.1";
+ version = "20.12.2";
src = fetchurl {
- url = "${mirror}/stable/release-service/20.12.1/src/bovo-20.12.1.tar.xz";
- sha256 = "1wrw81xrayhjadvjfi0zdc0vw445f4zmd32n0rca78i68ls5qbxv";
- name = "bovo-20.12.1.tar.xz";
+ url = "${mirror}/stable/release-service/20.12.2/src/bovo-20.12.2.tar.xz";
+ sha256 = "05xx11rqqsxm084hfxnx1wzmr2wdpny3w608h8g5vby2jgdj47b7";
+ name = "bovo-20.12.2.tar.xz";
};
};
calendarsupport = {
- version = "20.12.1";
+ version = "20.12.2";
src = fetchurl {
- url = "${mirror}/stable/release-service/20.12.1/src/calendarsupport-20.12.1.tar.xz";
- sha256 = "1accj2vx6zvqp632i5c85q4rzpg54xlihzf1rs80sdb9lch8nwrp";
- name = "calendarsupport-20.12.1.tar.xz";
+ url = "${mirror}/stable/release-service/20.12.2/src/calendarsupport-20.12.2.tar.xz";
+ sha256 = "0gz3p4az49430zwgmlqjcfzjlgnaf7cl1x0qaaxyl8il14ambrbd";
+ name = "calendarsupport-20.12.2.tar.xz";
};
};
cantor = {
- version = "20.12.1";
+ version = "20.12.2";
src = fetchurl {
- url = "${mirror}/stable/release-service/20.12.1/src/cantor-20.12.1.tar.xz";
- sha256 = "1qj6lmcgmqr110qw2r906b0kp73f9gzvm75ry1gdb77bza5g67x2";
- name = "cantor-20.12.1.tar.xz";
+ url = "${mirror}/stable/release-service/20.12.2/src/cantor-20.12.2.tar.xz";
+ sha256 = "1w513a06xshdw4fcn6wmliygpjsyvqcbmfjg2bdibpsnznmk4y4p";
+ name = "cantor-20.12.2.tar.xz";
};
};
cervisia = {
- version = "20.12.1";
+ version = "20.12.2";
src = fetchurl {
- url = "${mirror}/stable/release-service/20.12.1/src/cervisia-20.12.1.tar.xz";
- sha256 = "0hnpysp01z5a3gmm2jr2m1y7a5hcfl32lhmnrm0rg589pdxb30xf";
- name = "cervisia-20.12.1.tar.xz";
+ url = "${mirror}/stable/release-service/20.12.2/src/cervisia-20.12.2.tar.xz";
+ sha256 = "08m962r6wkvih1yfj22z3nyfx6r3ac9pcc7i7dxxdkfcxhqpprhb";
+ name = "cervisia-20.12.2.tar.xz";
};
};
dolphin = {
- version = "20.12.1";
+ version = "20.12.2";
src = fetchurl {
- url = "${mirror}/stable/release-service/20.12.1/src/dolphin-20.12.1.tar.xz";
- sha256 = "0n2g8mqq28xrjy17jyja4siaf2ac2b8gppqc19wjxn981zs545mp";
- name = "dolphin-20.12.1.tar.xz";
+ url = "${mirror}/stable/release-service/20.12.2/src/dolphin-20.12.2.tar.xz";
+ sha256 = "19mss2vs074xv5qc644y87f8v99mdndhhd7hclqgq6gckxcjzy2r";
+ name = "dolphin-20.12.2.tar.xz";
};
};
dolphin-plugins = {
- version = "20.12.1";
+ version = "20.12.2";
src = fetchurl {
- url = "${mirror}/stable/release-service/20.12.1/src/dolphin-plugins-20.12.1.tar.xz";
- sha256 = "0kn79c3w6qx70d7f8kdavl5ifq1pmcs4dc88i0zma8hskgvcjvcj";
- name = "dolphin-plugins-20.12.1.tar.xz";
+ url = "${mirror}/stable/release-service/20.12.2/src/dolphin-plugins-20.12.2.tar.xz";
+ sha256 = "0zjy429cqb6nspmiharvszjhpn662y23s9wbdqs04h2p6pi8raxn";
+ name = "dolphin-plugins-20.12.2.tar.xz";
};
};
dragon = {
- version = "20.12.1";
+ version = "20.12.2";
src = fetchurl {
- url = "${mirror}/stable/release-service/20.12.1/src/dragon-20.12.1.tar.xz";
- sha256 = "0nj2cba4w7q4q1w7lv63s9zgqrvha5figp5w9apklqps4z1d2p0s";
- name = "dragon-20.12.1.tar.xz";
+ url = "${mirror}/stable/release-service/20.12.2/src/dragon-20.12.2.tar.xz";
+ sha256 = "0yssqbfgm92bls5cfy0xcqnqfqx00ns2i6rlwdlx38kfh0r47cag";
+ name = "dragon-20.12.2.tar.xz";
};
};
elisa = {
- version = "20.12.1";
+ version = "20.12.2";
src = fetchurl {
- url = "${mirror}/stable/release-service/20.12.1/src/elisa-20.12.1.tar.xz";
- sha256 = "1lmgxi7xdyzjyi15ighkp2ylc6riqzgjmnfjc7p6na88vl2h2diy";
- name = "elisa-20.12.1.tar.xz";
+ url = "${mirror}/stable/release-service/20.12.2/src/elisa-20.12.2.tar.xz";
+ sha256 = "1sl55kynkwxaypdm6zjdk85yxxq9754xm6ybxm7qdafq691g9zjr";
+ name = "elisa-20.12.2.tar.xz";
};
};
eventviews = {
- version = "20.12.1";
+ version = "20.12.2";
src = fetchurl {
- url = "${mirror}/stable/release-service/20.12.1/src/eventviews-20.12.1.tar.xz";
- sha256 = "10nq8gx1bybhjx5dnrx2x5gslg8nw3vazy22jz03slgspm0gsajc";
- name = "eventviews-20.12.1.tar.xz";
+ url = "${mirror}/stable/release-service/20.12.2/src/eventviews-20.12.2.tar.xz";
+ sha256 = "1g4aqhh2b5s45m0qqp46wazcc7rzcp3mmds4q9x3isckqpijzp39";
+ name = "eventviews-20.12.2.tar.xz";
};
};
ffmpegthumbs = {
- version = "20.12.1";
+ version = "20.12.2";
src = fetchurl {
- url = "${mirror}/stable/release-service/20.12.1/src/ffmpegthumbs-20.12.1.tar.xz";
- sha256 = "17p9xqyfsaibhkfkhbx9mxjkdl5xdc3h91gsrkkwkqyfa5vs9c5g";
- name = "ffmpegthumbs-20.12.1.tar.xz";
+ url = "${mirror}/stable/release-service/20.12.2/src/ffmpegthumbs-20.12.2.tar.xz";
+ sha256 = "0iw1g7x31jkbmniawvjwy8wk573rv05idk08q1vavxa5vixxqsbg";
+ name = "ffmpegthumbs-20.12.2.tar.xz";
};
};
filelight = {
- version = "20.12.1";
+ version = "20.12.2";
src = fetchurl {
- url = "${mirror}/stable/release-service/20.12.1/src/filelight-20.12.1.tar.xz";
- sha256 = "0k7ia3q1j520n3i1va7v4nhdfycxv54sis6vq62ihm53kb0jrj4i";
- name = "filelight-20.12.1.tar.xz";
+ url = "${mirror}/stable/release-service/20.12.2/src/filelight-20.12.2.tar.xz";
+ sha256 = "0m38il0rz7zip9rxing4j5fppwyrjgv1d7n3vrp3x4wnmd08j46q";
+ name = "filelight-20.12.2.tar.xz";
};
};
granatier = {
- version = "20.12.1";
+ version = "20.12.2";
src = fetchurl {
- url = "${mirror}/stable/release-service/20.12.1/src/granatier-20.12.1.tar.xz";
- sha256 = "0mhqjg0wznvf1dc7f9dmw6ccva84g09cds2jls37zzblqbfdnzw3";
- name = "granatier-20.12.1.tar.xz";
+ url = "${mirror}/stable/release-service/20.12.2/src/granatier-20.12.2.tar.xz";
+ sha256 = "0gssfcqq1czh5l1dwi5lpj0f9bgv2jf0wma9i5j0aqrf9b086g7f";
+ name = "granatier-20.12.2.tar.xz";
};
};
grantlee-editor = {
- version = "20.12.1";
+ version = "20.12.2";
src = fetchurl {
- url = "${mirror}/stable/release-service/20.12.1/src/grantlee-editor-20.12.1.tar.xz";
- sha256 = "1684k6gpmvbbxjha5qkvfvas2lws0zm5v5s41z6yjxyshrbc29jh";
- name = "grantlee-editor-20.12.1.tar.xz";
+ url = "${mirror}/stable/release-service/20.12.2/src/grantlee-editor-20.12.2.tar.xz";
+ sha256 = "0fbb9zia4kjc7rw4s27vsy6isvkx56k50gn6y1cyfl0gqy70v4cw";
+ name = "grantlee-editor-20.12.2.tar.xz";
};
};
grantleetheme = {
- version = "20.12.1";
+ version = "20.12.2";
src = fetchurl {
- url = "${mirror}/stable/release-service/20.12.1/src/grantleetheme-20.12.1.tar.xz";
- sha256 = "1w87pz09lb3n511w0qir70c317j4gqgc7iyw3cgs2pqzz9f19vcx";
- name = "grantleetheme-20.12.1.tar.xz";
+ url = "${mirror}/stable/release-service/20.12.2/src/grantleetheme-20.12.2.tar.xz";
+ sha256 = "1cv23ias36mp4zm84fk21f3f7nx3jz7xpiyz0nvz6xcsiww77762";
+ name = "grantleetheme-20.12.2.tar.xz";
};
};
gwenview = {
- version = "20.12.1";
+ version = "20.12.2";
src = fetchurl {
- url = "${mirror}/stable/release-service/20.12.1/src/gwenview-20.12.1.tar.xz";
- sha256 = "0xjipr1ib8r42xsd75ack2198q6gf3xxl1zc9ir2ihdk3sg6lsb1";
- name = "gwenview-20.12.1.tar.xz";
+ url = "${mirror}/stable/release-service/20.12.2/src/gwenview-20.12.2.tar.xz";
+ sha256 = "0cr6jjnvin8jv6hnajxg6zlph5syg2zjrcwd784dlzv23hna9v5n";
+ name = "gwenview-20.12.2.tar.xz";
};
};
incidenceeditor = {
- version = "20.12.1";
+ version = "20.12.2";
src = fetchurl {
- url = "${mirror}/stable/release-service/20.12.1/src/incidenceeditor-20.12.1.tar.xz";
- sha256 = "1hdyy1sisavxjhwgpxh4ab4a3cvsvjj6hfa9w8kn8ypipd6nmqac";
- name = "incidenceeditor-20.12.1.tar.xz";
+ url = "${mirror}/stable/release-service/20.12.2/src/incidenceeditor-20.12.2.tar.xz";
+ sha256 = "1q48ydma2rcpn3dnf9p08mqfs481n5fhc9m5wl2cvm6as54sfmp8";
+ name = "incidenceeditor-20.12.2.tar.xz";
};
};
itinerary = {
- version = "20.12.1";
+ version = "20.12.2";
src = fetchurl {
- url = "${mirror}/stable/release-service/20.12.1/src/itinerary-20.12.1.tar.xz";
- sha256 = "02mmbj32ankv06mlgdrfyppkfi1dkgy9ky22d6bnz3l1vyld76s9";
- name = "itinerary-20.12.1.tar.xz";
+ url = "${mirror}/stable/release-service/20.12.2/src/itinerary-20.12.2.tar.xz";
+ sha256 = "1dkgsiqww9z6k0xbvn15w630jdhmxr1kkz5dcv1n9yl7bgj32s35";
+ name = "itinerary-20.12.2.tar.xz";
};
};
juk = {
- version = "20.12.1";
+ version = "20.12.2";
src = fetchurl {
- url = "${mirror}/stable/release-service/20.12.1/src/juk-20.12.1.tar.xz";
- sha256 = "0rx4dmnk15xrf9knwsvjmf963xn59rlzwwsa6wrjjpi8r6br8x4r";
- name = "juk-20.12.1.tar.xz";
+ url = "${mirror}/stable/release-service/20.12.2/src/juk-20.12.2.tar.xz";
+ sha256 = "1dc6n07hkd8as2q1i2l3jzqcijw3qd4ihx1205nzn7z256bby58n";
+ name = "juk-20.12.2.tar.xz";
};
};
k3b = {
- version = "20.12.1";
+ version = "20.12.2";
src = fetchurl {
- url = "${mirror}/stable/release-service/20.12.1/src/k3b-20.12.1.tar.xz";
- sha256 = "02ybzn8gg82r7i7rg8swyza30zwsf3fassmp6hqffn15g4kc2lrp";
- name = "k3b-20.12.1.tar.xz";
+ url = "${mirror}/stable/release-service/20.12.2/src/k3b-20.12.2.tar.xz";
+ sha256 = "0gqg8r2p6nksbdg4c8wqz57dj8d1cw7cmrgzc1l2pin4v3qdx94g";
+ name = "k3b-20.12.2.tar.xz";
};
};
kaccounts-integration = {
- version = "20.12.1";
+ version = "20.12.2";
src = fetchurl {
- url = "${mirror}/stable/release-service/20.12.1/src/kaccounts-integration-20.12.1.tar.xz";
- sha256 = "01xy3ih2fw4xnf5jkadrbq1dzmvvvrslbq4afj9501vhzyfqgm92";
- name = "kaccounts-integration-20.12.1.tar.xz";
+ url = "${mirror}/stable/release-service/20.12.2/src/kaccounts-integration-20.12.2.tar.xz";
+ sha256 = "15py7fp6sajvx0c7zi7zhfx16sqn8kkkvglkvcq0b9kglswpvkfj";
+ name = "kaccounts-integration-20.12.2.tar.xz";
};
};
kaccounts-providers = {
- version = "20.12.1";
+ version = "20.12.2";
src = fetchurl {
- url = "${mirror}/stable/release-service/20.12.1/src/kaccounts-providers-20.12.1.tar.xz";
- sha256 = "1f3gr63jwm7b8nkpdmpkgvsrhrpaxf7wcl0gczhdli1v6svjv8vq";
- name = "kaccounts-providers-20.12.1.tar.xz";
+ url = "${mirror}/stable/release-service/20.12.2/src/kaccounts-providers-20.12.2.tar.xz";
+ sha256 = "0205l3k3nzx6cnar90zrbgmabapyry4a991lqflkpxgdrkh0ajc0";
+ name = "kaccounts-providers-20.12.2.tar.xz";
};
};
kaddressbook = {
- version = "20.12.1";
+ version = "20.12.2";
src = fetchurl {
- url = "${mirror}/stable/release-service/20.12.1/src/kaddressbook-20.12.1.tar.xz";
- sha256 = "0j6mjj902h5zpipywp5xhbifrbgrb1lz1cg317md7ya4wc7z36fp";
- name = "kaddressbook-20.12.1.tar.xz";
+ url = "${mirror}/stable/release-service/20.12.2/src/kaddressbook-20.12.2.tar.xz";
+ sha256 = "0xqsl7fav1vqq4iqy2m02s92rnr28pi1ak3sv0ra7q1gb89rhi0y";
+ name = "kaddressbook-20.12.2.tar.xz";
};
};
kajongg = {
- version = "20.12.1";
+ version = "20.12.2";
src = fetchurl {
- url = "${mirror}/stable/release-service/20.12.1/src/kajongg-20.12.1.tar.xz";
- sha256 = "0v9sq5l6w3x78dpimdlbm36g9n4qy06xr0bzfzn2jf3bzgzrn2zk";
- name = "kajongg-20.12.1.tar.xz";
+ url = "${mirror}/stable/release-service/20.12.2/src/kajongg-20.12.2.tar.xz";
+ sha256 = "0vh6qb3d54nnxrxacq9fn7jq1hshhhnvw9ff0wgh214jlr0gnbqk";
+ name = "kajongg-20.12.2.tar.xz";
};
};
kalarm = {
- version = "20.12.1";
+ version = "20.12.2";
src = fetchurl {
- url = "${mirror}/stable/release-service/20.12.1/src/kalarm-20.12.1.tar.xz";
- sha256 = "0k4fxrzxb6vvpdqlln4g7iz1s34d9jkk415c44f1i34kl2mfsyq0";
- name = "kalarm-20.12.1.tar.xz";
+ url = "${mirror}/stable/release-service/20.12.2/src/kalarm-20.12.2.tar.xz";
+ sha256 = "1lpg1viwn868hw0dd8zs11iafkhzlr3cydfplnh4ss6visga50kb";
+ name = "kalarm-20.12.2.tar.xz";
};
};
kalarmcal = {
- version = "20.12.1";
+ version = "20.12.2";
src = fetchurl {
- url = "${mirror}/stable/release-service/20.12.1/src/kalarmcal-20.12.1.tar.xz";
- sha256 = "104fbq2mf20p67rs7x76h36qk8d0srkkll2pq39ln4hc7nhsrws5";
- name = "kalarmcal-20.12.1.tar.xz";
+ url = "${mirror}/stable/release-service/20.12.2/src/kalarmcal-20.12.2.tar.xz";
+ sha256 = "17lll9671318dxhxpnjaih31xz5b971gw6kmrgz2ljq5nz1l027b";
+ name = "kalarmcal-20.12.2.tar.xz";
};
};
kalgebra = {
- version = "20.12.1";
+ version = "20.12.2";
src = fetchurl {
- url = "${mirror}/stable/release-service/20.12.1/src/kalgebra-20.12.1.tar.xz";
- sha256 = "10y9zygpik418y5781xmy5xysvf3xa97sbzdbch8lrvxwprbmkzm";
- name = "kalgebra-20.12.1.tar.xz";
+ url = "${mirror}/stable/release-service/20.12.2/src/kalgebra-20.12.2.tar.xz";
+ sha256 = "0dwvm4b0wpkd3i79q3xs2v3majwa56hgq8r4vv071a8ci8fn27bz";
+ name = "kalgebra-20.12.2.tar.xz";
};
};
kalzium = {
- version = "20.12.1";
+ version = "20.12.2";
src = fetchurl {
- url = "${mirror}/stable/release-service/20.12.1/src/kalzium-20.12.1.tar.xz";
- sha256 = "1n1ar12zq2maa4dn5yq7m6l3m60n7c98c460mrd6rp7f73kadnsj";
- name = "kalzium-20.12.1.tar.xz";
+ url = "${mirror}/stable/release-service/20.12.2/src/kalzium-20.12.2.tar.xz";
+ sha256 = "0jdg0akxmylbvh80cz31cycrdqvyafsv9j7hfpdhrizdy7vvqywg";
+ name = "kalzium-20.12.2.tar.xz";
};
};
kamera = {
- version = "20.12.1";
+ version = "20.12.2";
src = fetchurl {
- url = "${mirror}/stable/release-service/20.12.1/src/kamera-20.12.1.tar.xz";
- sha256 = "1bj01d9h26ifq8nsa1bw49xfihmisnbk7p557zpqvixxayq6v8dq";
- name = "kamera-20.12.1.tar.xz";
+ url = "${mirror}/stable/release-service/20.12.2/src/kamera-20.12.2.tar.xz";
+ sha256 = "1licmi05g1qpfh88annqd89av77jsmhxnsidgkvf4ffczwd097l6";
+ name = "kamera-20.12.2.tar.xz";
};
};
kamoso = {
- version = "20.12.1";
+ version = "20.12.2";
src = fetchurl {
- url = "${mirror}/stable/release-service/20.12.1/src/kamoso-20.12.1.tar.xz";
- sha256 = "087m9lphj6s0xssaryyh91gh9v3ji5423rjd549dkd3vscgda4lb";
- name = "kamoso-20.12.1.tar.xz";
+ url = "${mirror}/stable/release-service/20.12.2/src/kamoso-20.12.2.tar.xz";
+ sha256 = "0ar19nlw2bxrbn4wky8ky3x5m70rf7fb0fviniblqcrggyymgmb9";
+ name = "kamoso-20.12.2.tar.xz";
};
};
kanagram = {
- version = "20.12.1";
+ version = "20.12.2";
src = fetchurl {
- url = "${mirror}/stable/release-service/20.12.1/src/kanagram-20.12.1.tar.xz";
- sha256 = "0bflybrm3kz1p1n6fksihvd8m0h0jj968b2wjz88663bs48jqf6q";
- name = "kanagram-20.12.1.tar.xz";
+ url = "${mirror}/stable/release-service/20.12.2/src/kanagram-20.12.2.tar.xz";
+ sha256 = "00p2mpprbq9zi1zzscb4d0fdj2knnfkjxclf3q982jz4laxyqalf";
+ name = "kanagram-20.12.2.tar.xz";
};
};
kapman = {
- version = "20.12.1";
+ version = "20.12.2";
src = fetchurl {
- url = "${mirror}/stable/release-service/20.12.1/src/kapman-20.12.1.tar.xz";
- sha256 = "1hs88q4h5l58fvr09vb5ns9pdj4k064ax5ccnj9yan4bn0s9b4f9";
- name = "kapman-20.12.1.tar.xz";
+ url = "${mirror}/stable/release-service/20.12.2/src/kapman-20.12.2.tar.xz";
+ sha256 = "1fs33p9g52k5nywpih7nns3mh0apfhnn174k9711vwnamr73ph6k";
+ name = "kapman-20.12.2.tar.xz";
};
};
kapptemplate = {
- version = "20.12.1";
+ version = "20.12.2";
src = fetchurl {
- url = "${mirror}/stable/release-service/20.12.1/src/kapptemplate-20.12.1.tar.xz";
- sha256 = "1a8fpwbvs2zmmak7zyv75z67ja31vx68s9lz9vldmiik9rrslyy6";
- name = "kapptemplate-20.12.1.tar.xz";
+ url = "${mirror}/stable/release-service/20.12.2/src/kapptemplate-20.12.2.tar.xz";
+ sha256 = "19rnxw0q8w890ns237vpaapipm3zjz7n0rn9yzxa5cqaf30l7jv5";
+ name = "kapptemplate-20.12.2.tar.xz";
};
};
kate = {
- version = "20.12.1";
+ version = "20.12.2";
src = fetchurl {
- url = "${mirror}/stable/release-service/20.12.1/src/kate-20.12.1.tar.xz";
- sha256 = "13m24b3fxb1d1k9rg2xfa7i28cjx68g9dbjrbd34acmpg01vp6vk";
- name = "kate-20.12.1.tar.xz";
+ url = "${mirror}/stable/release-service/20.12.2/src/kate-20.12.2.tar.xz";
+ sha256 = "1kdznizqh28parijpsi67jmb8mlx4gn7z4szlh5kjd1mv9rikvm7";
+ name = "kate-20.12.2.tar.xz";
};
};
katomic = {
- version = "20.12.1";
+ version = "20.12.2";
src = fetchurl {
- url = "${mirror}/stable/release-service/20.12.1/src/katomic-20.12.1.tar.xz";
- sha256 = "15s5kwddd1m9g5lhpc61bj6yzxpwzcc8fm24yhslb8l44nk685id";
- name = "katomic-20.12.1.tar.xz";
+ url = "${mirror}/stable/release-service/20.12.2/src/katomic-20.12.2.tar.xz";
+ sha256 = "1sxh6x09is33b3zdgj3d6zn9z19qc25v4hskffmw5xivnwz9vzfl";
+ name = "katomic-20.12.2.tar.xz";
};
};
kbackup = {
- version = "20.12.1";
+ version = "20.12.2";
src = fetchurl {
- url = "${mirror}/stable/release-service/20.12.1/src/kbackup-20.12.1.tar.xz";
- sha256 = "043dkgpdk56jmx0z8izlgj8r9j8h9rvjc3yalpqd5nrlgmj0smym";
- name = "kbackup-20.12.1.tar.xz";
+ url = "${mirror}/stable/release-service/20.12.2/src/kbackup-20.12.2.tar.xz";
+ sha256 = "138x20p27a0yx4n6xamc660nk0zzrap7zhkkwpy9ayh07rgh1222";
+ name = "kbackup-20.12.2.tar.xz";
};
};
kblackbox = {
- version = "20.12.1";
+ version = "20.12.2";
src = fetchurl {
- url = "${mirror}/stable/release-service/20.12.1/src/kblackbox-20.12.1.tar.xz";
- sha256 = "001yf4j14xzpabwg37yisls5na9rpxpgs45d4wdlqa90d50syzl7";
- name = "kblackbox-20.12.1.tar.xz";
+ url = "${mirror}/stable/release-service/20.12.2/src/kblackbox-20.12.2.tar.xz";
+ sha256 = "1c6by0hi9bzs6j1y0qxrvz6ahdxhzivnw9hg4jndmhgbsqqix4q5";
+ name = "kblackbox-20.12.2.tar.xz";
};
};
kblocks = {
- version = "20.12.1";
+ version = "20.12.2";
src = fetchurl {
- url = "${mirror}/stable/release-service/20.12.1/src/kblocks-20.12.1.tar.xz";
- sha256 = "029dxqg2d6c08r99ng16lc3b1dnnrj5bpz25zgv90aygzx31qq4s";
- name = "kblocks-20.12.1.tar.xz";
+ url = "${mirror}/stable/release-service/20.12.2/src/kblocks-20.12.2.tar.xz";
+ sha256 = "06slcac3hvdmb5lymyqb1z8mn3r756xz2ghwdqz1d2mn3n2jd0bw";
+ name = "kblocks-20.12.2.tar.xz";
};
};
kbounce = {
- version = "20.12.1";
+ version = "20.12.2";
src = fetchurl {
- url = "${mirror}/stable/release-service/20.12.1/src/kbounce-20.12.1.tar.xz";
- sha256 = "1vdc7xhbh0wpvk66sqs0xly0mmbpw922vg4kjjn21awamv4r52pm";
- name = "kbounce-20.12.1.tar.xz";
+ url = "${mirror}/stable/release-service/20.12.2/src/kbounce-20.12.2.tar.xz";
+ sha256 = "19xvvxmbwpwkwsm0mxjnh92m352lkshsjgi8yrax1hdblymr60v1";
+ name = "kbounce-20.12.2.tar.xz";
};
};
kbreakout = {
- version = "20.12.1";
+ version = "20.12.2";
src = fetchurl {
- url = "${mirror}/stable/release-service/20.12.1/src/kbreakout-20.12.1.tar.xz";
- sha256 = "11bx32lffagmyvxx2wss794fy3icz9k5yq4mjs2qxpf9pyvg6qgd";
- name = "kbreakout-20.12.1.tar.xz";
+ url = "${mirror}/stable/release-service/20.12.2/src/kbreakout-20.12.2.tar.xz";
+ sha256 = "1n1vrj08j1drc1apikhgwdbmb5daypgnkw6yxhqc3xi2a3wglkqz";
+ name = "kbreakout-20.12.2.tar.xz";
};
};
kbruch = {
- version = "20.12.1";
+ version = "20.12.2";
src = fetchurl {
- url = "${mirror}/stable/release-service/20.12.1/src/kbruch-20.12.1.tar.xz";
- sha256 = "06sbr6wrn4nh69hq96i5rgzbr9g0rc6c54h9g2zpnpff339lnsqi";
- name = "kbruch-20.12.1.tar.xz";
+ url = "${mirror}/stable/release-service/20.12.2/src/kbruch-20.12.2.tar.xz";
+ sha256 = "0hjwmzsdlpg8przlmpp0xsa19v7376bpjk5kwyajywhayzzw99xp";
+ name = "kbruch-20.12.2.tar.xz";
};
};
kcachegrind = {
- version = "20.12.1";
+ version = "20.12.2";
src = fetchurl {
- url = "${mirror}/stable/release-service/20.12.1/src/kcachegrind-20.12.1.tar.xz";
- sha256 = "0v06y1mybda4rmvjrjxhmxp7bj0wp6v45xahn08j253d20k7qixi";
- name = "kcachegrind-20.12.1.tar.xz";
+ url = "${mirror}/stable/release-service/20.12.2/src/kcachegrind-20.12.2.tar.xz";
+ sha256 = "0ich4hxfmq909zkn06p8pgxpf7sg9ndq51b533h2clbq3m9qwy2w";
+ name = "kcachegrind-20.12.2.tar.xz";
};
};
kcalc = {
- version = "20.12.1";
+ version = "20.12.2";
src = fetchurl {
- url = "${mirror}/stable/release-service/20.12.1/src/kcalc-20.12.1.tar.xz";
- sha256 = "1p59i6k0kq4xgcfsgcsb9z3yrrzgk564fh0apwmbawrmg6pp78dw";
- name = "kcalc-20.12.1.tar.xz";
+ url = "${mirror}/stable/release-service/20.12.2/src/kcalc-20.12.2.tar.xz";
+ sha256 = "0dv8519wnlfdp2d2ml2r5qx3gjh8g6im742vqqk7m1660ijgc8zx";
+ name = "kcalc-20.12.2.tar.xz";
};
};
kcalutils = {
- version = "20.12.1";
+ version = "20.12.2";
src = fetchurl {
- url = "${mirror}/stable/release-service/20.12.1/src/kcalutils-20.12.1.tar.xz";
- sha256 = "0b7w9n8sf31qbpxiw998xd4dls46mxf2bvl4n937vgzisfwb5sxs";
- name = "kcalutils-20.12.1.tar.xz";
+ url = "${mirror}/stable/release-service/20.12.2/src/kcalutils-20.12.2.tar.xz";
+ sha256 = "1k4cr1iq945zs6c35f3s1w8kfm3kh7aybmk5py3lsz0zmlab36hc";
+ name = "kcalutils-20.12.2.tar.xz";
};
};
kcharselect = {
- version = "20.12.1";
+ version = "20.12.2";
src = fetchurl {
- url = "${mirror}/stable/release-service/20.12.1/src/kcharselect-20.12.1.tar.xz";
- sha256 = "1ss5zwp0zggk9phdccj7bcn8h49p9avzg8qm38c3wnwddgaw1pdb";
- name = "kcharselect-20.12.1.tar.xz";
+ url = "${mirror}/stable/release-service/20.12.2/src/kcharselect-20.12.2.tar.xz";
+ sha256 = "0fqf6bw98l499a144xk7hslxm6zdlpa0lcq0bgwnfsd0fs03wlp3";
+ name = "kcharselect-20.12.2.tar.xz";
};
};
kcolorchooser = {
- version = "20.12.1";
+ version = "20.12.2";
src = fetchurl {
- url = "${mirror}/stable/release-service/20.12.1/src/kcolorchooser-20.12.1.tar.xz";
- sha256 = "07qvwk8amvmgiwxrl6gbyf25ms666hradmg1vl8lf3hmfxx6j40z";
- name = "kcolorchooser-20.12.1.tar.xz";
+ url = "${mirror}/stable/release-service/20.12.2/src/kcolorchooser-20.12.2.tar.xz";
+ sha256 = "08y4qzr43nikgzli14yzj7w8vqzl905f0rwx0ri5247259jna3rk";
+ name = "kcolorchooser-20.12.2.tar.xz";
};
};
kcron = {
- version = "20.12.1";
+ version = "20.12.2";
src = fetchurl {
- url = "${mirror}/stable/release-service/20.12.1/src/kcron-20.12.1.tar.xz";
- sha256 = "01xabwaxhxgwk6kh44rz3fm20jis2f6g9mrska5s03gxk7n0p1dc";
- name = "kcron-20.12.1.tar.xz";
+ url = "${mirror}/stable/release-service/20.12.2/src/kcron-20.12.2.tar.xz";
+ sha256 = "025a647zl125568l8vqnljir110jbnkxd4921a892ip7pnhp0v95";
+ name = "kcron-20.12.2.tar.xz";
};
};
kdebugsettings = {
- version = "20.12.1";
+ version = "20.12.2";
src = fetchurl {
- url = "${mirror}/stable/release-service/20.12.1/src/kdebugsettings-20.12.1.tar.xz";
- sha256 = "1jlxp6v6yci4cff1mcz0w7dz0hfjig0wck9cc9maaw1a9swqc3r1";
- name = "kdebugsettings-20.12.1.tar.xz";
+ url = "${mirror}/stable/release-service/20.12.2/src/kdebugsettings-20.12.2.tar.xz";
+ sha256 = "1dzdvscklgbcfjalcc1mfh3vgiai2dvbsz00b4c96r8jxpm7bvcn";
+ name = "kdebugsettings-20.12.2.tar.xz";
};
};
kdeconnect-kde = {
- version = "20.12.1";
+ version = "20.12.2";
src = fetchurl {
- url = "${mirror}/stable/release-service/20.12.1/src/kdeconnect-kde-20.12.1.tar.xz";
- sha256 = "0q11319ydibn1jgch98r66gzh3n6nb67l7xgzg0crdalm3dvf5gw";
- name = "kdeconnect-kde-20.12.1.tar.xz";
+ url = "${mirror}/stable/release-service/20.12.2/src/kdeconnect-kde-20.12.2.tar.xz";
+ sha256 = "0wcx1bn121b62pwdkf7k24sa03kgixvrbp5y5iy11im7kj5i3ji1";
+ name = "kdeconnect-kde-20.12.2.tar.xz";
};
};
kde-dev-scripts = {
- version = "20.12.1";
+ version = "20.12.2";
src = fetchurl {
- url = "${mirror}/stable/release-service/20.12.1/src/kde-dev-scripts-20.12.1.tar.xz";
- sha256 = "0hlabgf75qmww1161nd4ggqccp6h9ibsfkzpxdqvgxr9f1f31zz5";
- name = "kde-dev-scripts-20.12.1.tar.xz";
+ url = "${mirror}/stable/release-service/20.12.2/src/kde-dev-scripts-20.12.2.tar.xz";
+ sha256 = "03kqd01yhii2b6g4gsjg09vwmzv53vr5d7y3d4db13kgg0f1z352";
+ name = "kde-dev-scripts-20.12.2.tar.xz";
};
};
kde-dev-utils = {
- version = "20.12.1";
+ version = "20.12.2";
src = fetchurl {
- url = "${mirror}/stable/release-service/20.12.1/src/kde-dev-utils-20.12.1.tar.xz";
- sha256 = "1bir6ifq5wlwgdna48s5c1al7hfq6vl9pi2yvbnzf0rz4ix1sw4r";
- name = "kde-dev-utils-20.12.1.tar.xz";
+ url = "${mirror}/stable/release-service/20.12.2/src/kde-dev-utils-20.12.2.tar.xz";
+ sha256 = "105pp4yhgynn3gq0bi7q1vyy1qn8pcd0hgx17v674hf8afy4627r";
+ name = "kde-dev-utils-20.12.2.tar.xz";
};
};
kdeedu-data = {
- version = "20.12.1";
+ version = "20.12.2";
src = fetchurl {
- url = "${mirror}/stable/release-service/20.12.1/src/kdeedu-data-20.12.1.tar.xz";
- sha256 = "1hzrwkb2333dkvp1n50p18gfci21klafibaknm4hdrk96b3s4fxp";
- name = "kdeedu-data-20.12.1.tar.xz";
+ url = "${mirror}/stable/release-service/20.12.2/src/kdeedu-data-20.12.2.tar.xz";
+ sha256 = "04x8papz62m5kanrqpjddzijda761i4j8y4cmqpnxkg2jrwfqqls";
+ name = "kdeedu-data-20.12.2.tar.xz";
};
};
kdegraphics-mobipocket = {
- version = "20.12.1";
+ version = "20.12.2";
src = fetchurl {
- url = "${mirror}/stable/release-service/20.12.1/src/kdegraphics-mobipocket-20.12.1.tar.xz";
- sha256 = "1n3x4cf5ck0lfn70d9g0iiy4pddc0r49gwir71q5six5l4pz21hd";
- name = "kdegraphics-mobipocket-20.12.1.tar.xz";
+ url = "${mirror}/stable/release-service/20.12.2/src/kdegraphics-mobipocket-20.12.2.tar.xz";
+ sha256 = "02a4ivpvfziaa464l8c9ivydagcb912ld95isgvc5jl4g85lm166";
+ name = "kdegraphics-mobipocket-20.12.2.tar.xz";
};
};
kdegraphics-thumbnailers = {
- version = "20.12.1";
+ version = "20.12.2";
src = fetchurl {
- url = "${mirror}/stable/release-service/20.12.1/src/kdegraphics-thumbnailers-20.12.1.tar.xz";
- sha256 = "0lrijvphyc6wbkb499zf0gjpmqrjgrx5li93kvpsil1ivfpflv7w";
- name = "kdegraphics-thumbnailers-20.12.1.tar.xz";
+ url = "${mirror}/stable/release-service/20.12.2/src/kdegraphics-thumbnailers-20.12.2.tar.xz";
+ sha256 = "1p47fvb6mdk23rx9jhm9x60sny9z6plgdjih5lzy9k3hvl0sl8zk";
+ name = "kdegraphics-thumbnailers-20.12.2.tar.xz";
};
};
kdenetwork-filesharing = {
- version = "20.12.1";
+ version = "20.12.2";
src = fetchurl {
- url = "${mirror}/stable/release-service/20.12.1/src/kdenetwork-filesharing-20.12.1.tar.xz";
- sha256 = "0axi5vdgqkjdcbq0x34b3lnh1497vk54p9aca9d2wfhkd55zjbcv";
- name = "kdenetwork-filesharing-20.12.1.tar.xz";
+ url = "${mirror}/stable/release-service/20.12.2/src/kdenetwork-filesharing-20.12.2.tar.xz";
+ sha256 = "0y60az09hkhd1hvwa7h7c834dc0mfnd89f78v8m31il8g2xniziz";
+ name = "kdenetwork-filesharing-20.12.2.tar.xz";
};
};
kdenlive = {
- version = "20.12.1";
+ version = "20.12.2";
src = fetchurl {
- url = "${mirror}/stable/release-service/20.12.1/src/kdenlive-20.12.1.tar.xz";
- sha256 = "0n543nswn0gxasc1445nqg35z5466a3ssivigxz4acqw66nj4vlv";
- name = "kdenlive-20.12.1.tar.xz";
+ url = "${mirror}/stable/release-service/20.12.2/src/kdenlive-20.12.2.tar.xz";
+ sha256 = "0gh1cjhakdl7hx236rsxiv62mafd2vvvpg5ndwlp0zfpsx7kzjrz";
+ name = "kdenlive-20.12.2.tar.xz";
};
};
kdepim-addons = {
- version = "20.12.1";
+ version = "20.12.2";
src = fetchurl {
- url = "${mirror}/stable/release-service/20.12.1/src/kdepim-addons-20.12.1.tar.xz";
- sha256 = "1dc5sl9ksk5i2sgs2vf41blb5cdpl8fv3vzmrrz9sl3r75pga5m0";
- name = "kdepim-addons-20.12.1.tar.xz";
+ url = "${mirror}/stable/release-service/20.12.2/src/kdepim-addons-20.12.2.tar.xz";
+ sha256 = "0zj22ggn98sqz3nnvzffhbv2cq672j885f2p8qla6swhyw91cq8n";
+ name = "kdepim-addons-20.12.2.tar.xz";
};
};
kdepim-runtime = {
- version = "20.12.1";
+ version = "20.12.2";
src = fetchurl {
- url = "${mirror}/stable/release-service/20.12.1/src/kdepim-runtime-20.12.1.tar.xz";
- sha256 = "1np7xbdhm2wczm04cmsr25a74421i28iln39myiybq01im2ahapq";
- name = "kdepim-runtime-20.12.1.tar.xz";
+ url = "${mirror}/stable/release-service/20.12.2/src/kdepim-runtime-20.12.2.tar.xz";
+ sha256 = "0p5c4l4xixcvpzx7mri2jxa3nwk4824lp5sy93sspf2nlgdv3zsn";
+ name = "kdepim-runtime-20.12.2.tar.xz";
};
};
kdesdk-kioslaves = {
- version = "20.12.1";
+ version = "20.12.2";
src = fetchurl {
- url = "${mirror}/stable/release-service/20.12.1/src/kdesdk-kioslaves-20.12.1.tar.xz";
- sha256 = "18yy2s39sxfzi5lcky1jvlv7z77ygidhnfa4zhwas27yhcc6h0w4";
- name = "kdesdk-kioslaves-20.12.1.tar.xz";
+ url = "${mirror}/stable/release-service/20.12.2/src/kdesdk-kioslaves-20.12.2.tar.xz";
+ sha256 = "1xgp3fi6nnygjw2p832ylmhsj70dm33c4rf3h79sc2dp7aihnapy";
+ name = "kdesdk-kioslaves-20.12.2.tar.xz";
};
};
kdesdk-thumbnailers = {
- version = "20.12.1";
+ version = "20.12.2";
src = fetchurl {
- url = "${mirror}/stable/release-service/20.12.1/src/kdesdk-thumbnailers-20.12.1.tar.xz";
- sha256 = "1hgqd2d2a9iwaxvd4xd7sdj7pyf3p3v2xg6v9dyy9y39q2f1qs23";
- name = "kdesdk-thumbnailers-20.12.1.tar.xz";
+ url = "${mirror}/stable/release-service/20.12.2/src/kdesdk-thumbnailers-20.12.2.tar.xz";
+ sha256 = "0jk2x2b8qwhfbf9hy8j0yslggn3zwp18q21ip299b4cpx1w72bgq";
+ name = "kdesdk-thumbnailers-20.12.2.tar.xz";
};
};
kdf = {
- version = "20.12.1";
+ version = "20.12.2";
src = fetchurl {
- url = "${mirror}/stable/release-service/20.12.1/src/kdf-20.12.1.tar.xz";
- sha256 = "0ba67hs4vlb3qyvdzhnpmf8p62df12s8aqw4hzf9vnxff3qix5k1";
- name = "kdf-20.12.1.tar.xz";
+ url = "${mirror}/stable/release-service/20.12.2/src/kdf-20.12.2.tar.xz";
+ sha256 = "0fx9b5njsmvzznrgz2r9xz8yh977v865zvsih60hdrz6gaflg1rx";
+ name = "kdf-20.12.2.tar.xz";
};
};
kdialog = {
- version = "20.12.1";
+ version = "20.12.2";
src = fetchurl {
- url = "${mirror}/stable/release-service/20.12.1/src/kdialog-20.12.1.tar.xz";
- sha256 = "13n6bc3aqi9v6i4p4vkwzjv4rsqinx45n028ls6ndlapayd750f4";
- name = "kdialog-20.12.1.tar.xz";
+ url = "${mirror}/stable/release-service/20.12.2/src/kdialog-20.12.2.tar.xz";
+ sha256 = "1v2yflxpqg2h2jgxql1mnk8c1v1n4ljard5bgh1dw898r7b8g2xd";
+ name = "kdialog-20.12.2.tar.xz";
};
};
kdiamond = {
- version = "20.12.1";
+ version = "20.12.2";
src = fetchurl {
- url = "${mirror}/stable/release-service/20.12.1/src/kdiamond-20.12.1.tar.xz";
- sha256 = "0iaq3cai1sn3vlym4zshfziviy9k4s7pm92c7bzwa9adfak6y9h4";
- name = "kdiamond-20.12.1.tar.xz";
+ url = "${mirror}/stable/release-service/20.12.2/src/kdiamond-20.12.2.tar.xz";
+ sha256 = "17z1g2jxz26pqx5xjc5h7w5s2xy72p00ydnfhsv1bi1kfd79ry8k";
+ name = "kdiamond-20.12.2.tar.xz";
};
};
keditbookmarks = {
- version = "20.12.1";
+ version = "20.12.2";
src = fetchurl {
- url = "${mirror}/stable/release-service/20.12.1/src/keditbookmarks-20.12.1.tar.xz";
- sha256 = "1a41zpl2wzqdmp13m915agcc2nlxndyamy5aqyn98y3s8k5n6d9p";
- name = "keditbookmarks-20.12.1.tar.xz";
+ url = "${mirror}/stable/release-service/20.12.2/src/keditbookmarks-20.12.2.tar.xz";
+ sha256 = "0slma1vrm0cmr2v970ingbckqa3viw6jgfss0z7fpx4bilw65bd7";
+ name = "keditbookmarks-20.12.2.tar.xz";
};
};
kfind = {
- version = "20.12.1";
+ version = "20.12.2";
src = fetchurl {
- url = "${mirror}/stable/release-service/20.12.1/src/kfind-20.12.1.tar.xz";
- sha256 = "0rlxq4dl221ycxcybav7yf88wz23v07n5yzp7jgrd602lk5k8jdp";
- name = "kfind-20.12.1.tar.xz";
+ url = "${mirror}/stable/release-service/20.12.2/src/kfind-20.12.2.tar.xz";
+ sha256 = "0vfi5ipwncq7d4z1gbilw6kyyrn5d986wr3f2zhsyhpwmsh9ycnb";
+ name = "kfind-20.12.2.tar.xz";
};
};
kfloppy = {
- version = "20.12.1";
+ version = "20.12.2";
src = fetchurl {
- url = "${mirror}/stable/release-service/20.12.1/src/kfloppy-20.12.1.tar.xz";
- sha256 = "1wpcv2ipx0izg60rbgf8qwhys3bhw8i36qpsvh8bihkzij28xc84";
- name = "kfloppy-20.12.1.tar.xz";
+ url = "${mirror}/stable/release-service/20.12.2/src/kfloppy-20.12.2.tar.xz";
+ sha256 = "1sz6bgw54w8s4bdyyajy0zgxw5kcm45p0gizf7ghw33x5vxryg4g";
+ name = "kfloppy-20.12.2.tar.xz";
};
};
kfourinline = {
- version = "20.12.1";
+ version = "20.12.2";
src = fetchurl {
- url = "${mirror}/stable/release-service/20.12.1/src/kfourinline-20.12.1.tar.xz";
- sha256 = "1fv68smci1f59xzqzqj36qry2ibgr0ps731vhvafn210q8h2f5b5";
- name = "kfourinline-20.12.1.tar.xz";
+ url = "${mirror}/stable/release-service/20.12.2/src/kfourinline-20.12.2.tar.xz";
+ sha256 = "1ld2srgmriab70j08nvqbaswjp2miljwd8rbpy2dyvzfprmci3xk";
+ name = "kfourinline-20.12.2.tar.xz";
};
};
kgeography = {
- version = "20.12.1";
+ version = "20.12.2";
src = fetchurl {
- url = "${mirror}/stable/release-service/20.12.1/src/kgeography-20.12.1.tar.xz";
- sha256 = "13jsrfv17lzlwi9rg7i8q2sfl8n19k15qdbv1y5lggykvf8prp8h";
- name = "kgeography-20.12.1.tar.xz";
+ url = "${mirror}/stable/release-service/20.12.2/src/kgeography-20.12.2.tar.xz";
+ sha256 = "0v1355y3fwzq63hq0wz9rskzncnlfdybmqcx23pk57jazsmv6ndi";
+ name = "kgeography-20.12.2.tar.xz";
};
};
kget = {
- version = "20.12.1";
+ version = "20.12.2";
src = fetchurl {
- url = "${mirror}/stable/release-service/20.12.1/src/kget-20.12.1.tar.xz";
- sha256 = "03s8wpfrzl3j6whxbfbmbydghaghcnr8xbskf4wkyk9kvyk4bqha";
- name = "kget-20.12.1.tar.xz";
+ url = "${mirror}/stable/release-service/20.12.2/src/kget-20.12.2.tar.xz";
+ sha256 = "1xya4raai9jqqzb3kga3mrm7jznkaa0fr4sq8j28qd45bgx2385p";
+ name = "kget-20.12.2.tar.xz";
};
};
kgoldrunner = {
- version = "20.12.1";
+ version = "20.12.2";
src = fetchurl {
- url = "${mirror}/stable/release-service/20.12.1/src/kgoldrunner-20.12.1.tar.xz";
- sha256 = "0n96clxf0bmhm8hlyvd7q9w1zhjn5irvh2vrf9d79ng44zgygjvh";
- name = "kgoldrunner-20.12.1.tar.xz";
+ url = "${mirror}/stable/release-service/20.12.2/src/kgoldrunner-20.12.2.tar.xz";
+ sha256 = "1ai5hfhwlsiw6ywpmwg9q85hsn3ih44v7n3wj70fsrldh87cn9ps";
+ name = "kgoldrunner-20.12.2.tar.xz";
};
};
kgpg = {
- version = "20.12.1";
+ version = "20.12.2";
src = fetchurl {
- url = "${mirror}/stable/release-service/20.12.1/src/kgpg-20.12.1.tar.xz";
- sha256 = "05wwdbx90wg3rm6hcin1dykbrbzz82g01dxnkgh21zzab72wmx8a";
- name = "kgpg-20.12.1.tar.xz";
+ url = "${mirror}/stable/release-service/20.12.2/src/kgpg-20.12.2.tar.xz";
+ sha256 = "1szg6fmmnxi94s5r2gxn4mlsiqahharyh05bisy5w7cl9w9c70xg";
+ name = "kgpg-20.12.2.tar.xz";
};
};
khangman = {
- version = "20.12.1";
+ version = "20.12.2";
src = fetchurl {
- url = "${mirror}/stable/release-service/20.12.1/src/khangman-20.12.1.tar.xz";
- sha256 = "0ljavjbh69qyp2323pqlkibzjkwgddmdjd35m0m5n4nwvnz3l5y7";
- name = "khangman-20.12.1.tar.xz";
+ url = "${mirror}/stable/release-service/20.12.2/src/khangman-20.12.2.tar.xz";
+ sha256 = "1bhcdr2v6zgawn819vbqnvgrm52xymgjyr396qbx5mc0srz88bzk";
+ name = "khangman-20.12.2.tar.xz";
};
};
khelpcenter = {
- version = "20.12.1";
+ version = "20.12.2";
src = fetchurl {
- url = "${mirror}/stable/release-service/20.12.1/src/khelpcenter-20.12.1.tar.xz";
- sha256 = "1cba8siq3g78xjap4mhfkgvk9n031qy81ir08fpwk6zp9fkkgqb6";
- name = "khelpcenter-20.12.1.tar.xz";
+ url = "${mirror}/stable/release-service/20.12.2/src/khelpcenter-20.12.2.tar.xz";
+ sha256 = "1mxs0imw64av8dybh91xxy4mmdcikjkqv6apsw29pp3s29irxpdx";
+ name = "khelpcenter-20.12.2.tar.xz";
};
};
kidentitymanagement = {
- version = "20.12.1";
+ version = "20.12.2";
src = fetchurl {
- url = "${mirror}/stable/release-service/20.12.1/src/kidentitymanagement-20.12.1.tar.xz";
- sha256 = "1f8l8xbwy7qk5hadvknr45ihhg1j7zpqvpf5wxj3h6zg9fmadly9";
- name = "kidentitymanagement-20.12.1.tar.xz";
+ url = "${mirror}/stable/release-service/20.12.2/src/kidentitymanagement-20.12.2.tar.xz";
+ sha256 = "1vcpfcriinx0ywz3jz26810h2cqmlfvyyxd0mzh3jp7rl0kkasgj";
+ name = "kidentitymanagement-20.12.2.tar.xz";
};
};
kig = {
- version = "20.12.1";
+ version = "20.12.2";
src = fetchurl {
- url = "${mirror}/stable/release-service/20.12.1/src/kig-20.12.1.tar.xz";
- sha256 = "0ns4rhk822p7jjqy9wnhkbrbais4ih1viw405rl5r5xlqn9bvsiz";
- name = "kig-20.12.1.tar.xz";
+ url = "${mirror}/stable/release-service/20.12.2/src/kig-20.12.2.tar.xz";
+ sha256 = "08wvgykrhzf2j4qb0fz4irbyaxjp5ka7jmmjn8y27srz0x4zgkrz";
+ name = "kig-20.12.2.tar.xz";
};
};
kigo = {
- version = "20.12.1";
+ version = "20.12.2";
src = fetchurl {
- url = "${mirror}/stable/release-service/20.12.1/src/kigo-20.12.1.tar.xz";
- sha256 = "0lvcc423mw3gs6c5x4lrlny07q93pa8ivaqphq6y4771n5y5dqqa";
- name = "kigo-20.12.1.tar.xz";
+ url = "${mirror}/stable/release-service/20.12.2/src/kigo-20.12.2.tar.xz";
+ sha256 = "1a4hv5g2wdpvf56zrr0rna6hdvm2cy6sz1jlhj7hf1lcx3lgfj9g";
+ name = "kigo-20.12.2.tar.xz";
};
};
killbots = {
- version = "20.12.1";
+ version = "20.12.2";
src = fetchurl {
- url = "${mirror}/stable/release-service/20.12.1/src/killbots-20.12.1.tar.xz";
- sha256 = "0cdlixd7rakcxa8f5pf3pmq86mlipg7yhygnii858165v0gwkpx3";
- name = "killbots-20.12.1.tar.xz";
+ url = "${mirror}/stable/release-service/20.12.2/src/killbots-20.12.2.tar.xz";
+ sha256 = "01lmkflndqmrzyrabmh5jqrk2zywcn5s82aag3m0wdqbyrqc5pas";
+ name = "killbots-20.12.2.tar.xz";
};
};
kimagemapeditor = {
- version = "20.12.1";
+ version = "20.12.2";
src = fetchurl {
- url = "${mirror}/stable/release-service/20.12.1/src/kimagemapeditor-20.12.1.tar.xz";
- sha256 = "0vj2w3bgkq020gdi5q1zh650ipf4zc0hvzx5fpjknx4hd8b52rf8";
- name = "kimagemapeditor-20.12.1.tar.xz";
+ url = "${mirror}/stable/release-service/20.12.2/src/kimagemapeditor-20.12.2.tar.xz";
+ sha256 = "06awvhcjg8nd0wjcqqzccnlpci6cd35flvfs3k05czk70sgqzysq";
+ name = "kimagemapeditor-20.12.2.tar.xz";
};
};
kimap = {
- version = "20.12.1";
+ version = "20.12.2";
src = fetchurl {
- url = "${mirror}/stable/release-service/20.12.1/src/kimap-20.12.1.tar.xz";
- sha256 = "1x6lapmb3srw3pddi7rmlzjdsw54x94pkr6jyrncpfpqqsgb3l4v";
- name = "kimap-20.12.1.tar.xz";
+ url = "${mirror}/stable/release-service/20.12.2/src/kimap-20.12.2.tar.xz";
+ sha256 = "14kjgn6b1qnfr3zsr3r73wf15n47qqx9vw5z11yv161andrr105d";
+ name = "kimap-20.12.2.tar.xz";
};
};
kio-extras = {
- version = "20.12.1";
+ version = "20.12.2";
src = fetchurl {
- url = "${mirror}/stable/release-service/20.12.1/src/kio-extras-20.12.1.tar.xz";
- sha256 = "1ym07jzy4w21frf3j5aadxg8ny7bgrm5dbhrc3xdyyj2rwh3iygg";
- name = "kio-extras-20.12.1.tar.xz";
+ url = "${mirror}/stable/release-service/20.12.2/src/kio-extras-20.12.2.tar.xz";
+ sha256 = "1r2sw8i7lf0zyb5bvz4002vdi2bf9jv01735caiw9smxr1lgcz93";
+ name = "kio-extras-20.12.2.tar.xz";
};
};
kio-gdrive = {
- version = "20.12.1";
+ version = "20.12.2";
src = fetchurl {
- url = "${mirror}/stable/release-service/20.12.1/src/kio-gdrive-20.12.1.tar.xz";
- sha256 = "0axh8138rcfpa0a7s5w8zi8i6chz3z1q7560v497x6rd3d1z2zp0";
- name = "kio-gdrive-20.12.1.tar.xz";
+ url = "${mirror}/stable/release-service/20.12.2/src/kio-gdrive-20.12.2.tar.xz";
+ sha256 = "0rwwakhsn9bnmxxnr0620jyp00x7iqqsaz5nd2lmhyjkc4mqv2km";
+ name = "kio-gdrive-20.12.2.tar.xz";
};
};
kipi-plugins = {
- version = "20.12.1";
+ version = "20.12.2";
src = fetchurl {
- url = "${mirror}/stable/release-service/20.12.1/src/kipi-plugins-20.12.1.tar.xz";
- sha256 = "0pv5f6v37n75vrz4vaw755bjyyqk1mm9dla26k0jy3qr76g8bg9d";
- name = "kipi-plugins-20.12.1.tar.xz";
+ url = "${mirror}/stable/release-service/20.12.2/src/kipi-plugins-20.12.2.tar.xz";
+ sha256 = "120yi7kfqv74368c78s4gfg7fp2h32v1c3jic2lnsy5y3iad22l8";
+ name = "kipi-plugins-20.12.2.tar.xz";
};
};
kirigami-gallery = {
- version = "20.12.1";
+ version = "20.12.2";
src = fetchurl {
- url = "${mirror}/stable/release-service/20.12.1/src/kirigami-gallery-20.12.1.tar.xz";
- sha256 = "00f3alhlvlphcz81465nfrdvvabbzy5n1s06bvwzsvf290h5chbh";
- name = "kirigami-gallery-20.12.1.tar.xz";
+ url = "${mirror}/stable/release-service/20.12.2/src/kirigami-gallery-20.12.2.tar.xz";
+ sha256 = "039ddgrvw1l4jvc3yjs0c6fi8kss5ma8hs6cbs8xvw0cyi9604qw";
+ name = "kirigami-gallery-20.12.2.tar.xz";
};
};
kiriki = {
- version = "20.12.1";
+ version = "20.12.2";
src = fetchurl {
- url = "${mirror}/stable/release-service/20.12.1/src/kiriki-20.12.1.tar.xz";
- sha256 = "07qsmyf1ylgcwy704s8x9g1h4kalsipqz4z3bj1z5m5a2y9l8y8q";
- name = "kiriki-20.12.1.tar.xz";
+ url = "${mirror}/stable/release-service/20.12.2/src/kiriki-20.12.2.tar.xz";
+ sha256 = "0bslysqnnxkjfyxv8vkfmvwjhlw2zdlghbngg21k1ljvgr2jfx6j";
+ name = "kiriki-20.12.2.tar.xz";
};
};
kiten = {
- version = "20.12.1";
+ version = "20.12.2";
src = fetchurl {
- url = "${mirror}/stable/release-service/20.12.1/src/kiten-20.12.1.tar.xz";
- sha256 = "0dfz2wdscgn0f967lnhzpyb3iz1iw068x0l10542pm5dh32afs4m";
- name = "kiten-20.12.1.tar.xz";
+ url = "${mirror}/stable/release-service/20.12.2/src/kiten-20.12.2.tar.xz";
+ sha256 = "18p4g9cqn25s2zjygwvi9s81ma0b8rhfj9z0i2kd415b2sxalk3y";
+ name = "kiten-20.12.2.tar.xz";
};
};
kitinerary = {
- version = "20.12.1";
+ version = "20.12.2";
src = fetchurl {
- url = "${mirror}/stable/release-service/20.12.1/src/kitinerary-20.12.1.tar.xz";
- sha256 = "07zjd3ikbx6rw39ndy04aia8q35r75p5n52fijwnc4fkfc40xyxz";
- name = "kitinerary-20.12.1.tar.xz";
+ url = "${mirror}/stable/release-service/20.12.2/src/kitinerary-20.12.2.tar.xz";
+ sha256 = "0z9jyj9wlda44qdncjnp6cyp7dwk89dl9nj68j5birmn83ykaawp";
+ name = "kitinerary-20.12.2.tar.xz";
};
};
kjumpingcube = {
- version = "20.12.1";
+ version = "20.12.2";
src = fetchurl {
- url = "${mirror}/stable/release-service/20.12.1/src/kjumpingcube-20.12.1.tar.xz";
- sha256 = "0li9bq7j30fbdzg981i6jkpxgrv1z84bpig8m5mxfyfhs5c55j69";
- name = "kjumpingcube-20.12.1.tar.xz";
+ url = "${mirror}/stable/release-service/20.12.2/src/kjumpingcube-20.12.2.tar.xz";
+ sha256 = "04qry2b82yk2k4v1pj8pvqi27my42k5ssmc5rpzkh0vq8pzwgkjh";
+ name = "kjumpingcube-20.12.2.tar.xz";
};
};
kldap = {
- version = "20.12.1";
+ version = "20.12.2";
src = fetchurl {
- url = "${mirror}/stable/release-service/20.12.1/src/kldap-20.12.1.tar.xz";
- sha256 = "02w4hk9j1f1d81k0j8dzrj4hxwk2xwrf48305hzmm658wjvkv4k3";
- name = "kldap-20.12.1.tar.xz";
+ url = "${mirror}/stable/release-service/20.12.2/src/kldap-20.12.2.tar.xz";
+ sha256 = "1njgsxbqgz0grqagf695qv285x8slgnp4rg377jz1cnz597nzl6b";
+ name = "kldap-20.12.2.tar.xz";
};
};
kleopatra = {
- version = "20.12.1";
+ version = "20.12.2";
src = fetchurl {
- url = "${mirror}/stable/release-service/20.12.1/src/kleopatra-20.12.1.tar.xz";
- sha256 = "1g06mq8vl1jhkyrjfrgsbl44v7yq04m8xbb8dxlyhyv40dwlz7l6";
- name = "kleopatra-20.12.1.tar.xz";
+ url = "${mirror}/stable/release-service/20.12.2/src/kleopatra-20.12.2.tar.xz";
+ sha256 = "12ayl3gar9bi06v418sflr6fr5k86m8x2ls4laig1ymansbvnwlz";
+ name = "kleopatra-20.12.2.tar.xz";
};
};
klettres = {
- version = "20.12.1";
+ version = "20.12.2";
src = fetchurl {
- url = "${mirror}/stable/release-service/20.12.1/src/klettres-20.12.1.tar.xz";
- sha256 = "0k66xdkyv6i1zgk9nvz9633pmxygv1bwm4nkbg3izlh4g23rn3kk";
- name = "klettres-20.12.1.tar.xz";
+ url = "${mirror}/stable/release-service/20.12.2/src/klettres-20.12.2.tar.xz";
+ sha256 = "0ixykb36a7hgz89zxc8x7fp0di67vmalvpa9rivdff3lp7il87n3";
+ name = "klettres-20.12.2.tar.xz";
};
};
klickety = {
- version = "20.12.1";
+ version = "20.12.2";
src = fetchurl {
- url = "${mirror}/stable/release-service/20.12.1/src/klickety-20.12.1.tar.xz";
- sha256 = "17ml80p02sndhac5q6lkf7bb1kz9snsia991fghhahcjvd1g2qn6";
- name = "klickety-20.12.1.tar.xz";
+ url = "${mirror}/stable/release-service/20.12.2/src/klickety-20.12.2.tar.xz";
+ sha256 = "0dgv6bnz7aw95nxjqkhcanl06hpdx4g8qwkrvnfsiphjbldhfig7";
+ name = "klickety-20.12.2.tar.xz";
};
};
klines = {
- version = "20.12.1";
+ version = "20.12.2";
src = fetchurl {
- url = "${mirror}/stable/release-service/20.12.1/src/klines-20.12.1.tar.xz";
- sha256 = "1ba71n90x0s8nf300p53libzfjd0j9r6m0fng636m1qjaz6z9a3c";
- name = "klines-20.12.1.tar.xz";
+ url = "${mirror}/stable/release-service/20.12.2/src/klines-20.12.2.tar.xz";
+ sha256 = "14mrqfw7y5xcq237a6prfqy8pj34iz5mnfqs373p0jbvdqkc5843";
+ name = "klines-20.12.2.tar.xz";
};
};
kmag = {
- version = "20.12.1";
+ version = "20.12.2";
src = fetchurl {
- url = "${mirror}/stable/release-service/20.12.1/src/kmag-20.12.1.tar.xz";
- sha256 = "0m4zy1ybk2p4wzdfrdf64n06ck39sn7s0nb82miizcpscaxqswhj";
- name = "kmag-20.12.1.tar.xz";
+ url = "${mirror}/stable/release-service/20.12.2/src/kmag-20.12.2.tar.xz";
+ sha256 = "1vwn5n3c8kq3d3d7sssqpq8iz9g0af4xnvcvjqh4s7fcxmsr3ryv";
+ name = "kmag-20.12.2.tar.xz";
};
};
kmahjongg = {
- version = "20.12.1";
+ version = "20.12.2";
src = fetchurl {
- url = "${mirror}/stable/release-service/20.12.1/src/kmahjongg-20.12.1.tar.xz";
- sha256 = "1hszrp81pffg7rp0rk54qx49v3acmqfdi0if47kh9w124iicsi3z";
- name = "kmahjongg-20.12.1.tar.xz";
+ url = "${mirror}/stable/release-service/20.12.2/src/kmahjongg-20.12.2.tar.xz";
+ sha256 = "055nihkvfij6a71qn6lw3sbb74zz5r7cp2dghlkai9405ri4gdyc";
+ name = "kmahjongg-20.12.2.tar.xz";
};
};
kmail = {
- version = "20.12.1";
+ version = "20.12.2";
src = fetchurl {
- url = "${mirror}/stable/release-service/20.12.1/src/kmail-20.12.1.tar.xz";
- sha256 = "128l57x29mqg3fcx50hviqydl7gw6n2zbjnmzrj7fzgl6gafcdgw";
- name = "kmail-20.12.1.tar.xz";
+ url = "${mirror}/stable/release-service/20.12.2/src/kmail-20.12.2.tar.xz";
+ sha256 = "09idfdh04687jzh125jw2244ymaqhx6j3563m2cbf2spph0r1vqj";
+ name = "kmail-20.12.2.tar.xz";
};
};
kmail-account-wizard = {
- version = "20.12.1";
+ version = "20.12.2";
src = fetchurl {
- url = "${mirror}/stable/release-service/20.12.1/src/kmail-account-wizard-20.12.1.tar.xz";
- sha256 = "1gl4pvn7lyyc9rsk70yp5mikpdbakp4zgwx3plypqhmqd1z92pin";
- name = "kmail-account-wizard-20.12.1.tar.xz";
+ url = "${mirror}/stable/release-service/20.12.2/src/kmail-account-wizard-20.12.2.tar.xz";
+ sha256 = "0a9pz1m3jabi21nrlcj0fqrj1hsgmarw91sxx5qvs74fp2b59368";
+ name = "kmail-account-wizard-20.12.2.tar.xz";
};
};
kmailtransport = {
- version = "20.12.1";
+ version = "20.12.2";
src = fetchurl {
- url = "${mirror}/stable/release-service/20.12.1/src/kmailtransport-20.12.1.tar.xz";
- sha256 = "08i4fmhkpxil7q6vn045xha54x00jkm19kibphx2q3sb3c6s3plm";
- name = "kmailtransport-20.12.1.tar.xz";
+ url = "${mirror}/stable/release-service/20.12.2/src/kmailtransport-20.12.2.tar.xz";
+ sha256 = "11knn52fc5r637s1w3fzbkapjx6xs1n9v9933ji17zhry7c5rlzv";
+ name = "kmailtransport-20.12.2.tar.xz";
};
};
kmbox = {
- version = "20.12.1";
+ version = "20.12.2";
src = fetchurl {
- url = "${mirror}/stable/release-service/20.12.1/src/kmbox-20.12.1.tar.xz";
- sha256 = "1w172gqanhpkmcd9hc62lsmrkylg8mlfyk3nq3n89k6m2dkcfvqd";
- name = "kmbox-20.12.1.tar.xz";
+ url = "${mirror}/stable/release-service/20.12.2/src/kmbox-20.12.2.tar.xz";
+ sha256 = "0r76s03g4da2sds6y632gvg228gwsl7gs8ml9rf0fdjb8ymql1hl";
+ name = "kmbox-20.12.2.tar.xz";
};
};
kmime = {
- version = "20.12.1";
+ version = "20.12.2";
src = fetchurl {
- url = "${mirror}/stable/release-service/20.12.1/src/kmime-20.12.1.tar.xz";
- sha256 = "0hr5mh8a4b9bi0dqs055x4mpig7awqy9sd6j0i8lxix4cngcb6a2";
- name = "kmime-20.12.1.tar.xz";
+ url = "${mirror}/stable/release-service/20.12.2/src/kmime-20.12.2.tar.xz";
+ sha256 = "1jpfhsac2pji80cad0yab59lq7q7c1han0gajvwys1j15jyj11gi";
+ name = "kmime-20.12.2.tar.xz";
};
};
kmines = {
- version = "20.12.1";
+ version = "20.12.2";
src = fetchurl {
- url = "${mirror}/stable/release-service/20.12.1/src/kmines-20.12.1.tar.xz";
- sha256 = "18jzzn03c6mlmc02qg5fimid77b8gs0h4lci6wmj11fmb94g1hic";
- name = "kmines-20.12.1.tar.xz";
+ url = "${mirror}/stable/release-service/20.12.2/src/kmines-20.12.2.tar.xz";
+ sha256 = "0378cd1zh6w8slap4wry8m69l27nvi7j2dwz2vwkl76zh31q4pwi";
+ name = "kmines-20.12.2.tar.xz";
};
};
kmix = {
- version = "20.12.1";
+ version = "20.12.2";
src = fetchurl {
- url = "${mirror}/stable/release-service/20.12.1/src/kmix-20.12.1.tar.xz";
- sha256 = "1q1jz33mwnr5nr2mw92g40g7paclaxhwcvqik91la6dnvl0vpi8p";
- name = "kmix-20.12.1.tar.xz";
+ url = "${mirror}/stable/release-service/20.12.2/src/kmix-20.12.2.tar.xz";
+ sha256 = "12kij1y2lbyx71bg32pwb9s9p928pyw44flz9bv2jrzkkf4zwfxk";
+ name = "kmix-20.12.2.tar.xz";
};
};
kmousetool = {
- version = "20.12.1";
+ version = "20.12.2";
src = fetchurl {
- url = "${mirror}/stable/release-service/20.12.1/src/kmousetool-20.12.1.tar.xz";
- sha256 = "1nahq9cgffcd4llqc8lwkicxjw8nwphvpws9xkalwsswb7ai9jrk";
- name = "kmousetool-20.12.1.tar.xz";
+ url = "${mirror}/stable/release-service/20.12.2/src/kmousetool-20.12.2.tar.xz";
+ sha256 = "0ybrczxsmfrj43nr931ylbdgpqmcfx47ifbv2qjn72i8iggrv0cl";
+ name = "kmousetool-20.12.2.tar.xz";
};
};
kmouth = {
- version = "20.12.1";
+ version = "20.12.2";
src = fetchurl {
- url = "${mirror}/stable/release-service/20.12.1/src/kmouth-20.12.1.tar.xz";
- sha256 = "0qhparw2qszv7z7lrzb76kyvkcgr9sgry9ir9965dd0sp4c1fhgc";
- name = "kmouth-20.12.1.tar.xz";
+ url = "${mirror}/stable/release-service/20.12.2/src/kmouth-20.12.2.tar.xz";
+ sha256 = "1vq41r1vhr5iaxlb5dzpq3vwqk1rn1zxw3k4j7g2xq5xxmibj944";
+ name = "kmouth-20.12.2.tar.xz";
};
};
kmplot = {
- version = "20.12.1";
+ version = "20.12.2";
src = fetchurl {
- url = "${mirror}/stable/release-service/20.12.1/src/kmplot-20.12.1.tar.xz";
- sha256 = "0iz61jjr7z0j5bh5nqdv9nbdbiz0jhda89bxjds0n9636q42rifm";
- name = "kmplot-20.12.1.tar.xz";
+ url = "${mirror}/stable/release-service/20.12.2/src/kmplot-20.12.2.tar.xz";
+ sha256 = "0l6j68zg9xdrgglw7gnji0spjf7pcggym90cccw67jdn2wxc8g6q";
+ name = "kmplot-20.12.2.tar.xz";
};
};
knavalbattle = {
- version = "20.12.1";
+ version = "20.12.2";
src = fetchurl {
- url = "${mirror}/stable/release-service/20.12.1/src/knavalbattle-20.12.1.tar.xz";
- sha256 = "0k7kqnc8zp3n0ckrmmih12x6h1vgn9s7hrgp7n37bns2g39ij0xn";
- name = "knavalbattle-20.12.1.tar.xz";
+ url = "${mirror}/stable/release-service/20.12.2/src/knavalbattle-20.12.2.tar.xz";
+ sha256 = "0x47rzs7afqygcy45crc10ix4dsivnpmxis9r0w4lpzbq3qzd585";
+ name = "knavalbattle-20.12.2.tar.xz";
};
};
knetwalk = {
- version = "20.12.1";
+ version = "20.12.2";
src = fetchurl {
- url = "${mirror}/stable/release-service/20.12.1/src/knetwalk-20.12.1.tar.xz";
- sha256 = "0px8yfi5h9nipgdjcgskrm66dr23yg5ks0kyxjsly6mv41qxjiw8";
- name = "knetwalk-20.12.1.tar.xz";
+ url = "${mirror}/stable/release-service/20.12.2/src/knetwalk-20.12.2.tar.xz";
+ sha256 = "11h7b5amm4bcng0h8hfcn1r1nkd82h0rl47wvnqczsgjqp2r9h6a";
+ name = "knetwalk-20.12.2.tar.xz";
};
};
knights = {
- version = "20.12.1";
+ version = "20.12.2";
src = fetchurl {
- url = "${mirror}/stable/release-service/20.12.1/src/knights-20.12.1.tar.xz";
- sha256 = "098ywblshbr3qx7b8m4qj0036dq3c3mackmsbjnr85acb0204bjb";
- name = "knights-20.12.1.tar.xz";
+ url = "${mirror}/stable/release-service/20.12.2/src/knights-20.12.2.tar.xz";
+ sha256 = "1p5w61x4ldb5sp77l1c0v7aczi62xpvf1084316byhb5cqmxsqm9";
+ name = "knights-20.12.2.tar.xz";
};
};
knotes = {
- version = "20.12.1";
+ version = "20.12.2";
src = fetchurl {
- url = "${mirror}/stable/release-service/20.12.1/src/knotes-20.12.1.tar.xz";
- sha256 = "11gfk2p240a2gqxgkn9ymf7ds2zpij8h2vbbkax6ariddmhmlqk0";
- name = "knotes-20.12.1.tar.xz";
+ url = "${mirror}/stable/release-service/20.12.2/src/knotes-20.12.2.tar.xz";
+ sha256 = "11dvczl04lmzlhbmqp508bqrsrqqmmprp3nsvakmmidpgnvcm26l";
+ name = "knotes-20.12.2.tar.xz";
};
};
kolf = {
- version = "20.12.1";
+ version = "20.12.2";
src = fetchurl {
- url = "${mirror}/stable/release-service/20.12.1/src/kolf-20.12.1.tar.xz";
- sha256 = "12b424dl6rizj2pdcd4cr01lmp4kmirii79k40v22hn0yn6a9qdv";
- name = "kolf-20.12.1.tar.xz";
+ url = "${mirror}/stable/release-service/20.12.2/src/kolf-20.12.2.tar.xz";
+ sha256 = "1jw22m7a2jdw9zmssiihwm35zpq7bg8zk0a68fh5nxbyv43q8fj5";
+ name = "kolf-20.12.2.tar.xz";
};
};
kollision = {
- version = "20.12.1";
+ version = "20.12.2";
src = fetchurl {
- url = "${mirror}/stable/release-service/20.12.1/src/kollision-20.12.1.tar.xz";
- sha256 = "1hxv4qd5dl61d5440r4hnd9r24prn78ibmnk3m06c15zc3hfdsdn";
- name = "kollision-20.12.1.tar.xz";
+ url = "${mirror}/stable/release-service/20.12.2/src/kollision-20.12.2.tar.xz";
+ sha256 = "0g0mf9p1pz9wahc92k9iw1vb8v64y1kj7zgiyzmil6qr1pjyzlgm";
+ name = "kollision-20.12.2.tar.xz";
};
};
kolourpaint = {
- version = "20.12.1";
+ version = "20.12.2";
src = fetchurl {
- url = "${mirror}/stable/release-service/20.12.1/src/kolourpaint-20.12.1.tar.xz";
- sha256 = "1a2wgrf9hirvj61k2nd8x7rv5v8i9r1vrvpdmi9ik4qdg6lpvqay";
- name = "kolourpaint-20.12.1.tar.xz";
+ url = "${mirror}/stable/release-service/20.12.2/src/kolourpaint-20.12.2.tar.xz";
+ sha256 = "13pb09r9qrgwaii9x3a6qk3qgk288a821p4xgiwaiv9lcbjz56fn";
+ name = "kolourpaint-20.12.2.tar.xz";
};
};
kompare = {
- version = "20.12.1";
+ version = "20.12.2";
src = fetchurl {
- url = "${mirror}/stable/release-service/20.12.1/src/kompare-20.12.1.tar.xz";
- sha256 = "13di8dzp7xzlfacas5f92h1vwiqf64cd0rkc4yv4l2g8aq2jzcqh";
- name = "kompare-20.12.1.tar.xz";
+ url = "${mirror}/stable/release-service/20.12.2/src/kompare-20.12.2.tar.xz";
+ sha256 = "18n5sw52kwwmbgyb2q5lizpa57by8gmx665bj68wi2hvzdihmxmv";
+ name = "kompare-20.12.2.tar.xz";
};
};
konqueror = {
- version = "20.12.1";
+ version = "20.12.2";
src = fetchurl {
- url = "${mirror}/stable/release-service/20.12.1/src/konqueror-20.12.1.tar.xz";
- sha256 = "026f8fybr8azq3diw2k3p3qpmqj9lk6n9ipcl3xkwdss7i5v5w3y";
- name = "konqueror-20.12.1.tar.xz";
+ url = "${mirror}/stable/release-service/20.12.2/src/konqueror-20.12.2.tar.xz";
+ sha256 = "0zvr71yz2053y341b12zw92v0yk5whgivcr0iyz488lfw9wq0n4d";
+ name = "konqueror-20.12.2.tar.xz";
};
};
konquest = {
- version = "20.12.1";
+ version = "20.12.2";
src = fetchurl {
- url = "${mirror}/stable/release-service/20.12.1/src/konquest-20.12.1.tar.xz";
- sha256 = "1s08mvj7z91r86i0zwkcv05fnnr4lzhp596qr38d2yv6rxf5vr57";
- name = "konquest-20.12.1.tar.xz";
+ url = "${mirror}/stable/release-service/20.12.2/src/konquest-20.12.2.tar.xz";
+ sha256 = "0p4y7s37a3vchplpidlv4bc94gwnsm4k7sl4s2ra0prqga83yxbj";
+ name = "konquest-20.12.2.tar.xz";
};
};
konsole = {
- version = "20.12.1";
+ version = "20.12.2";
src = fetchurl {
- url = "${mirror}/stable/release-service/20.12.1/src/konsole-20.12.1.tar.xz";
- sha256 = "1v39sx00c115apnm32wn00yir69z1h0y3lblmjmvbjk24hwvx45n";
- name = "konsole-20.12.1.tar.xz";
+ url = "${mirror}/stable/release-service/20.12.2/src/konsole-20.12.2.tar.xz";
+ sha256 = "0wq8xbppg4fla8x669rvkz4mrpbpaplr0ysdvnc4djbwnzabs6zw";
+ name = "konsole-20.12.2.tar.xz";
};
};
kontact = {
- version = "20.12.1";
+ version = "20.12.2";
src = fetchurl {
- url = "${mirror}/stable/release-service/20.12.1/src/kontact-20.12.1.tar.xz";
- sha256 = "0dr59jj97zxkgc61zgwa8i26m81sfxvymxcrh5midwd24z8nslkz";
- name = "kontact-20.12.1.tar.xz";
+ url = "${mirror}/stable/release-service/20.12.2/src/kontact-20.12.2.tar.xz";
+ sha256 = "05pvrbsbrz39znim2jrcslnji8n4imig8f717jv89nlmllp5sk2i";
+ name = "kontact-20.12.2.tar.xz";
};
};
kontactinterface = {
- version = "20.12.1";
+ version = "20.12.2";
src = fetchurl {
- url = "${mirror}/stable/release-service/20.12.1/src/kontactinterface-20.12.1.tar.xz";
- sha256 = "0sdlgmwvir2s9ys466i4bj4raf2af43w838and64jwsr9qb1hg4j";
- name = "kontactinterface-20.12.1.tar.xz";
+ url = "${mirror}/stable/release-service/20.12.2/src/kontactinterface-20.12.2.tar.xz";
+ sha256 = "0i3kxim4rc4mvqlq06g0a8h106gb93v4s0kymysd4a4yw3pq4fas";
+ name = "kontactinterface-20.12.2.tar.xz";
};
};
kontrast = {
- version = "20.12.1";
+ version = "20.12.2";
src = fetchurl {
- url = "${mirror}/stable/release-service/20.12.1/src/kontrast-20.12.1.tar.xz";
- sha256 = "0cs31sn4va2hhfi7ps3bz9sy2hlxb8cawn5vijfdhzb9mmc962br";
- name = "kontrast-20.12.1.tar.xz";
+ url = "${mirror}/stable/release-service/20.12.2/src/kontrast-20.12.2.tar.xz";
+ sha256 = "0cqqclyqm0z59n296jh6pnb2zdzligmvsd2icb1qzxn2r69inipa";
+ name = "kontrast-20.12.2.tar.xz";
};
};
konversation = {
- version = "20.12.1";
+ version = "20.12.2";
src = fetchurl {
- url = "${mirror}/stable/release-service/20.12.1/src/konversation-20.12.1.tar.xz";
- sha256 = "1x6pyiv73avc3qmxlbnwwzk3gz6qbr991p896f9yb4rqfqj8j7j4";
- name = "konversation-20.12.1.tar.xz";
+ url = "${mirror}/stable/release-service/20.12.2/src/konversation-20.12.2.tar.xz";
+ sha256 = "0m13qpvzxm5arawsqh2hygs266jv9915lhc3xhs0b1wbhjb3ii8l";
+ name = "konversation-20.12.2.tar.xz";
};
};
kopete = {
- version = "20.12.1";
+ version = "20.12.2";
src = fetchurl {
- url = "${mirror}/stable/release-service/20.12.1/src/kopete-20.12.1.tar.xz";
- sha256 = "1cfbl3jalmaphwrzw443l4q5k1fx4nja65ajgrv3nly8rfabfnfl";
- name = "kopete-20.12.1.tar.xz";
+ url = "${mirror}/stable/release-service/20.12.2/src/kopete-20.12.2.tar.xz";
+ sha256 = "0ahcxkvi5ibdl3krm3aw5gamcyfi4s4af2wl6r3sk73l7q4kpxvi";
+ name = "kopete-20.12.2.tar.xz";
};
};
korganizer = {
- version = "20.12.1";
+ version = "20.12.2";
src = fetchurl {
- url = "${mirror}/stable/release-service/20.12.1/src/korganizer-20.12.1.tar.xz";
- sha256 = "1ci6ca6w3a77gf3d7fh9rjkblm5qa2jic176rwmax79qgvjjq8wm";
- name = "korganizer-20.12.1.tar.xz";
+ url = "${mirror}/stable/release-service/20.12.2/src/korganizer-20.12.2.tar.xz";
+ sha256 = "1f2j60gdx3hxz64lhx9cyi7sa75s2qr8zghhk8h1wgdwaz9hvjz8";
+ name = "korganizer-20.12.2.tar.xz";
};
};
kosmindoormap = {
- version = "20.12.1";
+ version = "20.12.2";
src = fetchurl {
- url = "${mirror}/stable/release-service/20.12.1/src/kosmindoormap-20.12.1.tar.xz";
- sha256 = "186kfqaznxyxqchwqsrb4dvk4v69rhqwfg93fcjsp43l14ml5rnx";
- name = "kosmindoormap-20.12.1.tar.xz";
+ url = "${mirror}/stable/release-service/20.12.2/src/kosmindoormap-20.12.2.tar.xz";
+ sha256 = "0rr6lgfbjdvnxipx0dnzp4hlrvq61ha015mz7qkly88ckwp6m05q";
+ name = "kosmindoormap-20.12.2.tar.xz";
};
};
kpat = {
- version = "20.12.1";
+ version = "20.12.2";
src = fetchurl {
- url = "${mirror}/stable/release-service/20.12.1/src/kpat-20.12.1.tar.xz";
- sha256 = "1kd3i7qhjwxi04x8dkc7q9rgx73zyx3njm5rhq0hc1v32m8nn659";
- name = "kpat-20.12.1.tar.xz";
+ url = "${mirror}/stable/release-service/20.12.2/src/kpat-20.12.2.tar.xz";
+ sha256 = "1gcv343aabwcgx3kb9khkvilnxipq200pz14d8qdj41lsa71cynx";
+ name = "kpat-20.12.2.tar.xz";
};
};
kpimtextedit = {
- version = "20.12.1";
+ version = "20.12.2";
src = fetchurl {
- url = "${mirror}/stable/release-service/20.12.1/src/kpimtextedit-20.12.1.tar.xz";
- sha256 = "15m26qssw80nxv1m51jq3q629nginhh4hb69a5y15jgvrv4k59b4";
- name = "kpimtextedit-20.12.1.tar.xz";
+ url = "${mirror}/stable/release-service/20.12.2/src/kpimtextedit-20.12.2.tar.xz";
+ sha256 = "1ccvzwbxbsbb4b5hfjvf30fv44b1byjzb08x4vagbrqb47ck763y";
+ name = "kpimtextedit-20.12.2.tar.xz";
};
};
kpkpass = {
- version = "20.12.1";
+ version = "20.12.2";
src = fetchurl {
- url = "${mirror}/stable/release-service/20.12.1/src/kpkpass-20.12.1.tar.xz";
- sha256 = "09idbgf9gnzyr520indlzhwb9pr5hx3dag26qrfi7l8ywzdkrsr2";
- name = "kpkpass-20.12.1.tar.xz";
+ url = "${mirror}/stable/release-service/20.12.2/src/kpkpass-20.12.2.tar.xz";
+ sha256 = "1m0cqlrpjmfam0lyjjzpd8wgsv9v0x6fr76qr5ndyrfbfcv0qin3";
+ name = "kpkpass-20.12.2.tar.xz";
};
};
kpmcore = {
- version = "20.12.1";
+ version = "20.12.2";
src = fetchurl {
- url = "${mirror}/stable/release-service/20.12.1/src/kpmcore-20.12.1.tar.xz";
- sha256 = "0nyqz1jfr9h9n80npvp7yyizbyga6iv8yljq52myk6b40vs9q41v";
- name = "kpmcore-20.12.1.tar.xz";
+ url = "${mirror}/stable/release-service/20.12.2/src/kpmcore-20.12.2.tar.xz";
+ sha256 = "1z8fln51jsgar69m2x8rb95zxbq6r28cycpa7y52gaiywahbsin4";
+ name = "kpmcore-20.12.2.tar.xz";
};
};
kpublictransport = {
- version = "20.12.1";
+ version = "20.12.2";
src = fetchurl {
- url = "${mirror}/stable/release-service/20.12.1/src/kpublictransport-20.12.1.tar.xz";
- sha256 = "0saqykqb9rrm3ngvcx910dmhyh1hc3n0x3qfzlzrxlq678ag94hq";
- name = "kpublictransport-20.12.1.tar.xz";
+ url = "${mirror}/stable/release-service/20.12.2/src/kpublictransport-20.12.2.tar.xz";
+ sha256 = "1n7gy9pnykxd39ralfxrrvbsgxn68f1jzvbmkyvj759xrl2na1kq";
+ name = "kpublictransport-20.12.2.tar.xz";
};
};
kqtquickcharts = {
- version = "20.12.1";
+ version = "20.12.2";
src = fetchurl {
- url = "${mirror}/stable/release-service/20.12.1/src/kqtquickcharts-20.12.1.tar.xz";
- sha256 = "0025vj4n0k3g5bsmjq6ydx80izvpx6g73jxz27hp69vbl8p4ylpc";
- name = "kqtquickcharts-20.12.1.tar.xz";
+ url = "${mirror}/stable/release-service/20.12.2/src/kqtquickcharts-20.12.2.tar.xz";
+ sha256 = "06lrvckmddyxl11kyic99dhfn8il88hs1vsnr89y3m8543ij885n";
+ name = "kqtquickcharts-20.12.2.tar.xz";
};
};
krdc = {
- version = "20.12.1";
+ version = "20.12.2";
src = fetchurl {
- url = "${mirror}/stable/release-service/20.12.1/src/krdc-20.12.1.tar.xz";
- sha256 = "067xrhs55di2ff0lxvcl2x7qblmv2pbrgjkc5bjsx6ai6w9bv4dh";
- name = "krdc-20.12.1.tar.xz";
+ url = "${mirror}/stable/release-service/20.12.2/src/krdc-20.12.2.tar.xz";
+ sha256 = "0wzv25pdalwgcb74dav4jkxpvak0nix46njn04w2vhy3rdlgplzr";
+ name = "krdc-20.12.2.tar.xz";
};
};
kreversi = {
- version = "20.12.1";
+ version = "20.12.2";
src = fetchurl {
- url = "${mirror}/stable/release-service/20.12.1/src/kreversi-20.12.1.tar.xz";
- sha256 = "1yw9lxzqyxk6fsh2lzsrp2cmdw545hszdz9253lm6b5ppax6z42a";
- name = "kreversi-20.12.1.tar.xz";
+ url = "${mirror}/stable/release-service/20.12.2/src/kreversi-20.12.2.tar.xz";
+ sha256 = "1c0xisbbq6p6ghl5rvhiddpgsa91m4bq8hmrpdw8s02j4g8aix39";
+ name = "kreversi-20.12.2.tar.xz";
};
};
krfb = {
- version = "20.12.1";
+ version = "20.12.2";
src = fetchurl {
- url = "${mirror}/stable/release-service/20.12.1/src/krfb-20.12.1.tar.xz";
- sha256 = "0pfxd0nci9g4wkh4qcgk3yhm9rl9yx2d4jpfxgdmiacfp9hkqxj6";
- name = "krfb-20.12.1.tar.xz";
+ url = "${mirror}/stable/release-service/20.12.2/src/krfb-20.12.2.tar.xz";
+ sha256 = "0js84sc9s8h7b1zkdg2k83qhh2q3dz5yfk17am480b3889pyjyd8";
+ name = "krfb-20.12.2.tar.xz";
};
};
kross-interpreters = {
- version = "20.12.1";
+ version = "20.12.2";
src = fetchurl {
- url = "${mirror}/stable/release-service/20.12.1/src/kross-interpreters-20.12.1.tar.xz";
- sha256 = "1csk3xkkkqvffms5ivy08hyd2mizg7ywcrdapxx40m5kwsn6vpxs";
- name = "kross-interpreters-20.12.1.tar.xz";
+ url = "${mirror}/stable/release-service/20.12.2/src/kross-interpreters-20.12.2.tar.xz";
+ sha256 = "04g8fqcr88k7b8sivkqasj8d5fywhmm69g4spv1rpm4m89gr70jn";
+ name = "kross-interpreters-20.12.2.tar.xz";
};
};
kruler = {
- version = "20.12.1";
+ version = "20.12.2";
src = fetchurl {
- url = "${mirror}/stable/release-service/20.12.1/src/kruler-20.12.1.tar.xz";
- sha256 = "1jiz9s647bndpi4gg3f7wwg0c0cv8wf1myjxwdpx5a0ggdr2xh3q";
- name = "kruler-20.12.1.tar.xz";
+ url = "${mirror}/stable/release-service/20.12.2/src/kruler-20.12.2.tar.xz";
+ sha256 = "0xayhfav4723m5z5bgv4zxa95zvsfgvfh0wf80y8c7wwfgsyn9ja";
+ name = "kruler-20.12.2.tar.xz";
};
};
kshisen = {
- version = "20.12.1";
+ version = "20.12.2";
src = fetchurl {
- url = "${mirror}/stable/release-service/20.12.1/src/kshisen-20.12.1.tar.xz";
- sha256 = "1awnpj66080g2y41014g2pgb5llyqw56b54z6ydhfya4a0a8gsds";
- name = "kshisen-20.12.1.tar.xz";
+ url = "${mirror}/stable/release-service/20.12.2/src/kshisen-20.12.2.tar.xz";
+ sha256 = "079sr9k8zg01imy2c54wx371fcxlzsm122ng0zl4cn69dndczjkf";
+ name = "kshisen-20.12.2.tar.xz";
};
};
ksirk = {
- version = "20.12.1";
+ version = "20.12.2";
src = fetchurl {
- url = "${mirror}/stable/release-service/20.12.1/src/ksirk-20.12.1.tar.xz";
- sha256 = "11bcmxjjyf095i790f5r3cr5hskw2x9458vwfm7yd57qx3r01axz";
- name = "ksirk-20.12.1.tar.xz";
+ url = "${mirror}/stable/release-service/20.12.2/src/ksirk-20.12.2.tar.xz";
+ sha256 = "10ksb77ljwfm25m8jrxh4cbss0lrjdmiigjbmyppxcls1rz8a6cn";
+ name = "ksirk-20.12.2.tar.xz";
};
};
ksmtp = {
- version = "20.12.1";
+ version = "20.12.2";
src = fetchurl {
- url = "${mirror}/stable/release-service/20.12.1/src/ksmtp-20.12.1.tar.xz";
- sha256 = "1yahcgchfhk742n6hmpr2b2fll6jrw0vs1hrfvms3n7w7vxnkyxg";
- name = "ksmtp-20.12.1.tar.xz";
+ url = "${mirror}/stable/release-service/20.12.2/src/ksmtp-20.12.2.tar.xz";
+ sha256 = "0rcs5zcrj8sscr0h0vx4ndbj3ziyxns5glk5bzpj1092b11pwllw";
+ name = "ksmtp-20.12.2.tar.xz";
};
};
ksnakeduel = {
- version = "20.12.1";
+ version = "20.12.2";
src = fetchurl {
- url = "${mirror}/stable/release-service/20.12.1/src/ksnakeduel-20.12.1.tar.xz";
- sha256 = "1647m2a918kr762fmvffj2ipamhvcihc8yg8z80b8lwinpspcdfc";
- name = "ksnakeduel-20.12.1.tar.xz";
+ url = "${mirror}/stable/release-service/20.12.2/src/ksnakeduel-20.12.2.tar.xz";
+ sha256 = "1cd1nldrmhimc1f059hqjkb8g8yjri7gf9cyxz7j0p48dxg93ns4";
+ name = "ksnakeduel-20.12.2.tar.xz";
};
};
kspaceduel = {
- version = "20.12.1";
+ version = "20.12.2";
src = fetchurl {
- url = "${mirror}/stable/release-service/20.12.1/src/kspaceduel-20.12.1.tar.xz";
- sha256 = "17i2saa48xq62j0aca555lqjxf6ry3wkxw5vm5v32g3kwkr10m78";
- name = "kspaceduel-20.12.1.tar.xz";
+ url = "${mirror}/stable/release-service/20.12.2/src/kspaceduel-20.12.2.tar.xz";
+ sha256 = "0mz3s5q8fyl76ck8b9s65w2q90a5cz2p4clnbxam8f72fk2g0g1v";
+ name = "kspaceduel-20.12.2.tar.xz";
};
};
ksquares = {
- version = "20.12.1";
+ version = "20.12.2";
src = fetchurl {
- url = "${mirror}/stable/release-service/20.12.1/src/ksquares-20.12.1.tar.xz";
- sha256 = "085bvcx5p13j32017c0vm3zvcr0r0dzcbxpp21mvrp1xzy2dw7v2";
- name = "ksquares-20.12.1.tar.xz";
+ url = "${mirror}/stable/release-service/20.12.2/src/ksquares-20.12.2.tar.xz";
+ sha256 = "11mfyyjrdlh8dzpzwvyr48rfg758hr14sb0cw1zvd7d7cz86dr31";
+ name = "ksquares-20.12.2.tar.xz";
};
};
ksudoku = {
- version = "20.12.1";
+ version = "20.12.2";
src = fetchurl {
- url = "${mirror}/stable/release-service/20.12.1/src/ksudoku-20.12.1.tar.xz";
- sha256 = "0a0i87ddxa75admnxl181dsqmab4cwbb6pncl34z4sppf272z8km";
- name = "ksudoku-20.12.1.tar.xz";
+ url = "${mirror}/stable/release-service/20.12.2/src/ksudoku-20.12.2.tar.xz";
+ sha256 = "01i4niy1nlikbw1j7qlwldcaniwb1pl4hr4p6icgsvfzr8pjl09z";
+ name = "ksudoku-20.12.2.tar.xz";
};
};
ksystemlog = {
- version = "20.12.1";
+ version = "20.12.2";
src = fetchurl {
- url = "${mirror}/stable/release-service/20.12.1/src/ksystemlog-20.12.1.tar.xz";
- sha256 = "0535s6sq4wccdxv0xw12x3zzjkp0746s3hmlk93sginwq5fixxc0";
- name = "ksystemlog-20.12.1.tar.xz";
+ url = "${mirror}/stable/release-service/20.12.2/src/ksystemlog-20.12.2.tar.xz";
+ sha256 = "1fyrpkk5ipp5q8sairmyx9bayndbbr9srrwdhp7grhbiw8kbjlc7";
+ name = "ksystemlog-20.12.2.tar.xz";
};
};
kteatime = {
- version = "20.12.1";
+ version = "20.12.2";
src = fetchurl {
- url = "${mirror}/stable/release-service/20.12.1/src/kteatime-20.12.1.tar.xz";
- sha256 = "0j9c3wy398z61ciyf91hv7l3bxski827di9ib94wyjkwqd6516zx";
- name = "kteatime-20.12.1.tar.xz";
+ url = "${mirror}/stable/release-service/20.12.2/src/kteatime-20.12.2.tar.xz";
+ sha256 = "18rpnvagrcmd62qss31rkv81kkjcz9kcisj9q0j41p770jvan8id";
+ name = "kteatime-20.12.2.tar.xz";
};
};
ktimer = {
- version = "20.12.1";
+ version = "20.12.2";
src = fetchurl {
- url = "${mirror}/stable/release-service/20.12.1/src/ktimer-20.12.1.tar.xz";
- sha256 = "0iac06mzszg6g1flbs0mzj8ddnvh6kdgbhakjxl969in4c1frz9w";
- name = "ktimer-20.12.1.tar.xz";
+ url = "${mirror}/stable/release-service/20.12.2/src/ktimer-20.12.2.tar.xz";
+ sha256 = "17sw7wl9844sg180h0x2skaj4bnkv6qin6cwklsp058wyf06w5wy";
+ name = "ktimer-20.12.2.tar.xz";
};
};
ktnef = {
- version = "20.12.1";
+ version = "20.12.2";
src = fetchurl {
- url = "${mirror}/stable/release-service/20.12.1/src/ktnef-20.12.1.tar.xz";
- sha256 = "1pq4mabh7glpxl2iwj5rrfwim4x6xfg2vlpx7z0d0n13gh85b4fd";
- name = "ktnef-20.12.1.tar.xz";
+ url = "${mirror}/stable/release-service/20.12.2/src/ktnef-20.12.2.tar.xz";
+ sha256 = "147dxalzgqfmacr0f44pbxg0ks5p7ck607gkbzf5asxgn4dlvgxq";
+ name = "ktnef-20.12.2.tar.xz";
};
};
ktorrent = {
- version = "20.12.1";
+ version = "20.12.2";
src = fetchurl {
- url = "${mirror}/stable/release-service/20.12.1/src/ktorrent-20.12.1.tar.xz";
- sha256 = "0m43wsz0k87ncvg3zdffsp06nwdrlfnw52fi1ry12z2rnkcm4pwc";
- name = "ktorrent-20.12.1.tar.xz";
+ url = "${mirror}/stable/release-service/20.12.2/src/ktorrent-20.12.2.tar.xz";
+ sha256 = "1fvbg3700my5algzif4dyy7zsc74qrby7ldfbj7snlxa4scws042";
+ name = "ktorrent-20.12.2.tar.xz";
};
};
ktouch = {
- version = "20.12.1";
+ version = "20.12.2";
src = fetchurl {
- url = "${mirror}/stable/release-service/20.12.1/src/ktouch-20.12.1.tar.xz";
- sha256 = "10lm2p8w26c9n6lhvw3301myfss0dq7hl7rawzb3hsy1lqvmvdib";
- name = "ktouch-20.12.1.tar.xz";
+ url = "${mirror}/stable/release-service/20.12.2/src/ktouch-20.12.2.tar.xz";
+ sha256 = "0j3xzm5ghnfvqb98xwrjzkrdm991af8rgnay38s081ykvj2hxj3n";
+ name = "ktouch-20.12.2.tar.xz";
};
};
ktp-accounts-kcm = {
- version = "20.12.1";
+ version = "20.12.2";
src = fetchurl {
- url = "${mirror}/stable/release-service/20.12.1/src/ktp-accounts-kcm-20.12.1.tar.xz";
- sha256 = "0440s2rrh03x8h5bp6xywidngrb1pinndsigaj4k4yvz122j2y53";
- name = "ktp-accounts-kcm-20.12.1.tar.xz";
+ url = "${mirror}/stable/release-service/20.12.2/src/ktp-accounts-kcm-20.12.2.tar.xz";
+ sha256 = "0dyr3600yrd2hjs2s54210h1kj95w5mz9pl2fpwzcqgkmmd9vss5";
+ name = "ktp-accounts-kcm-20.12.2.tar.xz";
};
};
ktp-approver = {
- version = "20.12.1";
+ version = "20.12.2";
src = fetchurl {
- url = "${mirror}/stable/release-service/20.12.1/src/ktp-approver-20.12.1.tar.xz";
- sha256 = "14ygpqvjhyzryrlinz0i2a6nyn1gnxs0hwx35imiz8hg4sb9402k";
- name = "ktp-approver-20.12.1.tar.xz";
+ url = "${mirror}/stable/release-service/20.12.2/src/ktp-approver-20.12.2.tar.xz";
+ sha256 = "1h3fi19qqmik6f7h12manb8yval0qqj7jdhrpp07ck67m7mibwzr";
+ name = "ktp-approver-20.12.2.tar.xz";
};
};
ktp-auth-handler = {
- version = "20.12.1";
+ version = "20.12.2";
src = fetchurl {
- url = "${mirror}/stable/release-service/20.12.1/src/ktp-auth-handler-20.12.1.tar.xz";
- sha256 = "1bysipq957kqbl33zj88m1g987b02v25gmh5lpnmrnlqznxw0ws7";
- name = "ktp-auth-handler-20.12.1.tar.xz";
+ url = "${mirror}/stable/release-service/20.12.2/src/ktp-auth-handler-20.12.2.tar.xz";
+ sha256 = "158n88pcxj7hdmsmhcqbfpqc4lhrpzighxgb4wdrzizi9dwpxb3h";
+ name = "ktp-auth-handler-20.12.2.tar.xz";
};
};
ktp-call-ui = {
- version = "20.12.1";
+ version = "20.12.2";
src = fetchurl {
- url = "${mirror}/stable/release-service/20.12.1/src/ktp-call-ui-20.12.1.tar.xz";
- sha256 = "154zgg84ln823al40s5fwxf10k3p73mz4fjn2lyhdqgsx68l08sy";
- name = "ktp-call-ui-20.12.1.tar.xz";
+ url = "${mirror}/stable/release-service/20.12.2/src/ktp-call-ui-20.12.2.tar.xz";
+ sha256 = "0xhf79gqr6b8hiscv6jnmjnl8nb7c6vsvxn7hzvri9nm7hfmldya";
+ name = "ktp-call-ui-20.12.2.tar.xz";
};
};
ktp-common-internals = {
- version = "20.12.1";
+ version = "20.12.2";
src = fetchurl {
- url = "${mirror}/stable/release-service/20.12.1/src/ktp-common-internals-20.12.1.tar.xz";
- sha256 = "1f8l1ywccxga3ff8qvf4ybabkd57apidkx7ky49dfi785kgvym16";
- name = "ktp-common-internals-20.12.1.tar.xz";
+ url = "${mirror}/stable/release-service/20.12.2/src/ktp-common-internals-20.12.2.tar.xz";
+ sha256 = "06m8g80lj2cnx5cnfi6m1fy6pg6rm78kxg7v1493xcsfzizlc276";
+ name = "ktp-common-internals-20.12.2.tar.xz";
};
};
ktp-contact-list = {
- version = "20.12.1";
+ version = "20.12.2";
src = fetchurl {
- url = "${mirror}/stable/release-service/20.12.1/src/ktp-contact-list-20.12.1.tar.xz";
- sha256 = "122p2xp6wqmvk7mbplgnilsbnk6hfzrgbxpr39n462pkwbmvs44j";
- name = "ktp-contact-list-20.12.1.tar.xz";
+ url = "${mirror}/stable/release-service/20.12.2/src/ktp-contact-list-20.12.2.tar.xz";
+ sha256 = "037si47l8nc18d7yzh6d7i3gy710y5npxv4wcal6yg8mlr2qzjli";
+ name = "ktp-contact-list-20.12.2.tar.xz";
};
};
ktp-contact-runner = {
- version = "20.12.1";
+ version = "20.12.2";
src = fetchurl {
- url = "${mirror}/stable/release-service/20.12.1/src/ktp-contact-runner-20.12.1.tar.xz";
- sha256 = "1w8jp1nmjwaaqpim2jfpbv3d7w9asn93qi2ag2d6wx6mcc2q84jb";
- name = "ktp-contact-runner-20.12.1.tar.xz";
+ url = "${mirror}/stable/release-service/20.12.2/src/ktp-contact-runner-20.12.2.tar.xz";
+ sha256 = "1pv7smf5mld5rgld2nsqjwgl7vwsf99f3z4hamlbq6bpdg02w936";
+ name = "ktp-contact-runner-20.12.2.tar.xz";
};
};
ktp-desktop-applets = {
- version = "20.12.1";
+ version = "20.12.2";
src = fetchurl {
- url = "${mirror}/stable/release-service/20.12.1/src/ktp-desktop-applets-20.12.1.tar.xz";
- sha256 = "0z3vv7q5kk27fm32bmhffpj6w72mldcdxsq6p3d33zf6rkz2rb74";
- name = "ktp-desktop-applets-20.12.1.tar.xz";
+ url = "${mirror}/stable/release-service/20.12.2/src/ktp-desktop-applets-20.12.2.tar.xz";
+ sha256 = "1mx1q1gk756pkbpwghsvkspj3npgfzp2lf4jqldkyygvyqn3gxx4";
+ name = "ktp-desktop-applets-20.12.2.tar.xz";
};
};
ktp-filetransfer-handler = {
- version = "20.12.1";
+ version = "20.12.2";
src = fetchurl {
- url = "${mirror}/stable/release-service/20.12.1/src/ktp-filetransfer-handler-20.12.1.tar.xz";
- sha256 = "0b8ha1jxhrdk67mzwrd0ypz99shlfr6sanxbbv0j3xh77sjcqpq3";
- name = "ktp-filetransfer-handler-20.12.1.tar.xz";
+ url = "${mirror}/stable/release-service/20.12.2/src/ktp-filetransfer-handler-20.12.2.tar.xz";
+ sha256 = "16ys5cyx1pzcv0affy8agp0sbci9rkvpknfffldrvlgqppxza5rd";
+ name = "ktp-filetransfer-handler-20.12.2.tar.xz";
};
};
ktp-kded-module = {
- version = "20.12.1";
+ version = "20.12.2";
src = fetchurl {
- url = "${mirror}/stable/release-service/20.12.1/src/ktp-kded-module-20.12.1.tar.xz";
- sha256 = "1hbb5pj3gaw9sg5rj2rb7a8xqrixfhr040rcdjsln337zyy98iqf";
- name = "ktp-kded-module-20.12.1.tar.xz";
+ url = "${mirror}/stable/release-service/20.12.2/src/ktp-kded-module-20.12.2.tar.xz";
+ sha256 = "1wkvi5l9fvq24c3vdflg0azjxykid61i6mi59cnrnr866a1rbgrg";
+ name = "ktp-kded-module-20.12.2.tar.xz";
};
};
ktp-send-file = {
- version = "20.12.1";
+ version = "20.12.2";
src = fetchurl {
- url = "${mirror}/stable/release-service/20.12.1/src/ktp-send-file-20.12.1.tar.xz";
- sha256 = "1vgfqa062h5yxdsz71h2zz247mzv6mn0zm7dz1v8p4pzns9kscq1";
- name = "ktp-send-file-20.12.1.tar.xz";
+ url = "${mirror}/stable/release-service/20.12.2/src/ktp-send-file-20.12.2.tar.xz";
+ sha256 = "0j32c81rabbxh3m0jnnahny01qz2h7yc7l90w39r2jkv9r5f3yvf";
+ name = "ktp-send-file-20.12.2.tar.xz";
};
};
ktp-text-ui = {
- version = "20.12.1";
+ version = "20.12.2";
src = fetchurl {
- url = "${mirror}/stable/release-service/20.12.1/src/ktp-text-ui-20.12.1.tar.xz";
- sha256 = "13cx2pv4wqmrgbi4sg51fhp418r50ajjhc9yz5mv7ad2gxml5c61";
- name = "ktp-text-ui-20.12.1.tar.xz";
+ url = "${mirror}/stable/release-service/20.12.2/src/ktp-text-ui-20.12.2.tar.xz";
+ sha256 = "09wkpyadf3dvnrbxrasr66yw4hqnb3kbk6va9bs836fvcaiwagwd";
+ name = "ktp-text-ui-20.12.2.tar.xz";
};
};
ktuberling = {
- version = "20.12.1";
+ version = "20.12.2";
src = fetchurl {
- url = "${mirror}/stable/release-service/20.12.1/src/ktuberling-20.12.1.tar.xz";
- sha256 = "06la1cvwvpiqjdwv7icdg55dd8pkc587bfwwjdq2fhp2pyh3ws6j";
- name = "ktuberling-20.12.1.tar.xz";
+ url = "${mirror}/stable/release-service/20.12.2/src/ktuberling-20.12.2.tar.xz";
+ sha256 = "0yndqhgw9s2hydfsz2x3lr1m22ii2whc4kcp2jbkj9ssiymp8s68";
+ name = "ktuberling-20.12.2.tar.xz";
};
};
kturtle = {
- version = "20.12.1";
+ version = "20.12.2";
src = fetchurl {
- url = "${mirror}/stable/release-service/20.12.1/src/kturtle-20.12.1.tar.xz";
- sha256 = "12jr4sbchjpvc730cy4bp2cccdsd8vw901dgyq0nar8p0pvg4ybb";
- name = "kturtle-20.12.1.tar.xz";
+ url = "${mirror}/stable/release-service/20.12.2/src/kturtle-20.12.2.tar.xz";
+ sha256 = "1a46c6j7jng9l789wdpp7qj639872dfj268hj8nq63n27f82whr0";
+ name = "kturtle-20.12.2.tar.xz";
};
};
kubrick = {
- version = "20.12.1";
+ version = "20.12.2";
src = fetchurl {
- url = "${mirror}/stable/release-service/20.12.1/src/kubrick-20.12.1.tar.xz";
- sha256 = "1hdkm9vw9wpc8b3mw0yy9cz5ylm0h75zbg51rw4glai48bb3gs8i";
- name = "kubrick-20.12.1.tar.xz";
+ url = "${mirror}/stable/release-service/20.12.2/src/kubrick-20.12.2.tar.xz";
+ sha256 = "0g3zxdbj5l28msvs8gpn15g739pwwids7wxmky6w3b4qyn427j8m";
+ name = "kubrick-20.12.2.tar.xz";
};
};
kwalletmanager = {
- version = "20.12.1";
+ version = "20.12.2";
src = fetchurl {
- url = "${mirror}/stable/release-service/20.12.1/src/kwalletmanager-20.12.1.tar.xz";
- sha256 = "0nsg2xjzz6qvjqpxj1bbzzikvcl1ipqjwwab2kdwg71vlp99ravj";
- name = "kwalletmanager-20.12.1.tar.xz";
+ url = "${mirror}/stable/release-service/20.12.2/src/kwalletmanager-20.12.2.tar.xz";
+ sha256 = "02lx3p7860pigslx6s3bjg54sjjv1q93f9aknv5d32iblv2gaxiw";
+ name = "kwalletmanager-20.12.2.tar.xz";
};
};
kwave = {
- version = "20.12.1";
+ version = "20.12.2";
src = fetchurl {
- url = "${mirror}/stable/release-service/20.12.1/src/kwave-20.12.1.tar.xz";
- sha256 = "1w5r7di9401dm60p3bkp8qg41pvlz4226szki5s6pmmq89dixdgq";
- name = "kwave-20.12.1.tar.xz";
+ url = "${mirror}/stable/release-service/20.12.2/src/kwave-20.12.2.tar.xz";
+ sha256 = "0nankggamy1jxllnsv642kav57kwkbxpkd2mz6rarjinfnnqi7kd";
+ name = "kwave-20.12.2.tar.xz";
};
};
kwordquiz = {
- version = "20.12.1";
+ version = "20.12.2";
src = fetchurl {
- url = "${mirror}/stable/release-service/20.12.1/src/kwordquiz-20.12.1.tar.xz";
- sha256 = "1dvbvfwaja4n2v9binj8pbdjizqz4zp49fiq8b4k5jxygcsgnx2p";
- name = "kwordquiz-20.12.1.tar.xz";
+ url = "${mirror}/stable/release-service/20.12.2/src/kwordquiz-20.12.2.tar.xz";
+ sha256 = "1iik5khnsarxjipmd8znbiqs20bd65hanhmdmp7awqs7p0k4a0sq";
+ name = "kwordquiz-20.12.2.tar.xz";
};
};
libgravatar = {
- version = "20.12.1";
+ version = "20.12.2";
src = fetchurl {
- url = "${mirror}/stable/release-service/20.12.1/src/libgravatar-20.12.1.tar.xz";
- sha256 = "12byf7p0fwsfy61gcv112bhq3zczjy5n1dm32x2lrjyis2dh2z9j";
- name = "libgravatar-20.12.1.tar.xz";
+ url = "${mirror}/stable/release-service/20.12.2/src/libgravatar-20.12.2.tar.xz";
+ sha256 = "07pnj708wrvfmmy7j2vsx9j1sl9wx3hd7vfnpqa4zd24ci7x7y3d";
+ name = "libgravatar-20.12.2.tar.xz";
};
};
libkcddb = {
- version = "20.12.1";
+ version = "20.12.2";
src = fetchurl {
- url = "${mirror}/stable/release-service/20.12.1/src/libkcddb-20.12.1.tar.xz";
- sha256 = "07ky4ly72689gb58jxqqzq5bgmb9wslxkqj0ldam6v82ldk8ss7k";
- name = "libkcddb-20.12.1.tar.xz";
+ url = "${mirror}/stable/release-service/20.12.2/src/libkcddb-20.12.2.tar.xz";
+ sha256 = "1px7cgc75ypxaqknamqgxps4796388j99ycrbgrlyrhzws1mva8k";
+ name = "libkcddb-20.12.2.tar.xz";
};
};
libkcompactdisc = {
- version = "20.12.1";
+ version = "20.12.2";
src = fetchurl {
- url = "${mirror}/stable/release-service/20.12.1/src/libkcompactdisc-20.12.1.tar.xz";
- sha256 = "101szps2js8dhxdn913mj9b2z953rp47ikkbrrdjl1fq1i8dh6ib";
- name = "libkcompactdisc-20.12.1.tar.xz";
+ url = "${mirror}/stable/release-service/20.12.2/src/libkcompactdisc-20.12.2.tar.xz";
+ sha256 = "0yj2gkl1d76mf2lp02apxh4lmb9rnzvp0c8y0992ssnfsrivalp4";
+ name = "libkcompactdisc-20.12.2.tar.xz";
};
};
libkdcraw = {
- version = "20.12.1";
+ version = "20.12.2";
src = fetchurl {
- url = "${mirror}/stable/release-service/20.12.1/src/libkdcraw-20.12.1.tar.xz";
- sha256 = "1vkjyccyax622a3jvqdfnppansabxaxplyk9prn302zqmgvl05h3";
- name = "libkdcraw-20.12.1.tar.xz";
+ url = "${mirror}/stable/release-service/20.12.2/src/libkdcraw-20.12.2.tar.xz";
+ sha256 = "1hgw087frq9yzzwp2mkl3xqz2gd4v82kyiym2316i1xpmbkgcqfm";
+ name = "libkdcraw-20.12.2.tar.xz";
};
};
libkdegames = {
- version = "20.12.1";
+ version = "20.12.2";
src = fetchurl {
- url = "${mirror}/stable/release-service/20.12.1/src/libkdegames-20.12.1.tar.xz";
- sha256 = "1zy44k98xjjydsa35bagf152kfb394wxpdx0c06vcf404jkhk7ng";
- name = "libkdegames-20.12.1.tar.xz";
+ url = "${mirror}/stable/release-service/20.12.2/src/libkdegames-20.12.2.tar.xz";
+ sha256 = "0fcl06z5zl1hycj8f8q9dz6fc9lb0dqd5ciha4yig98ybzi3zn8r";
+ name = "libkdegames-20.12.2.tar.xz";
};
};
libkdepim = {
- version = "20.12.1";
+ version = "20.12.2";
src = fetchurl {
- url = "${mirror}/stable/release-service/20.12.1/src/libkdepim-20.12.1.tar.xz";
- sha256 = "0kp2xssl1qbl3ziskxl3hhvyp8nc35d2fijk6hl99j3sxpdi2s4f";
- name = "libkdepim-20.12.1.tar.xz";
+ url = "${mirror}/stable/release-service/20.12.2/src/libkdepim-20.12.2.tar.xz";
+ sha256 = "0f9c96w7ijlvfg9dr0w9wwaf05fn0z32zx8nn8jp42pzcbn6yr56";
+ name = "libkdepim-20.12.2.tar.xz";
};
};
libkeduvocdocument = {
- version = "20.12.1";
+ version = "20.12.2";
src = fetchurl {
- url = "${mirror}/stable/release-service/20.12.1/src/libkeduvocdocument-20.12.1.tar.xz";
- sha256 = "0kqnhaabfi91clqg7nlnjcybl5ca0p3ysn5zlwhxz1fcjxm83g4w";
- name = "libkeduvocdocument-20.12.1.tar.xz";
+ url = "${mirror}/stable/release-service/20.12.2/src/libkeduvocdocument-20.12.2.tar.xz";
+ sha256 = "0lki60mv82ygss2bxgwg178xabvfn85zlg0pwk2gj30zg0jiaw66";
+ name = "libkeduvocdocument-20.12.2.tar.xz";
};
};
libkexiv2 = {
- version = "20.12.1";
+ version = "20.12.2";
src = fetchurl {
- url = "${mirror}/stable/release-service/20.12.1/src/libkexiv2-20.12.1.tar.xz";
- sha256 = "1vylyl3gxk3xais7c640kdnp4s4jwd9y2xxkwmf36ax0dv8wdcv0";
- name = "libkexiv2-20.12.1.tar.xz";
+ url = "${mirror}/stable/release-service/20.12.2/src/libkexiv2-20.12.2.tar.xz";
+ sha256 = "10j82xk7y7vf9y9ss83hc9fd9c1dbd55nwjf28bj7myqaji4wdpb";
+ name = "libkexiv2-20.12.2.tar.xz";
};
};
libkgapi = {
- version = "20.12.1";
+ version = "20.12.2";
src = fetchurl {
- url = "${mirror}/stable/release-service/20.12.1/src/libkgapi-20.12.1.tar.xz";
- sha256 = "0cx8lbzq8ambz2lbslakczzcfmhri4268p7zf7hnf3ymd17a5y8d";
- name = "libkgapi-20.12.1.tar.xz";
+ url = "${mirror}/stable/release-service/20.12.2/src/libkgapi-20.12.2.tar.xz";
+ sha256 = "1yaas07ixxjnb5a37dq93skqs0vk08rdr9ll30jr7kdll311s5ni";
+ name = "libkgapi-20.12.2.tar.xz";
};
};
libkipi = {
- version = "20.12.1";
+ version = "20.12.2";
src = fetchurl {
- url = "${mirror}/stable/release-service/20.12.1/src/libkipi-20.12.1.tar.xz";
- sha256 = "1ln4f1n9ghiqb9h4lpw6qcwz7wrvm8jlcqn1ingjh9s58zw8wqsg";
- name = "libkipi-20.12.1.tar.xz";
+ url = "${mirror}/stable/release-service/20.12.2/src/libkipi-20.12.2.tar.xz";
+ sha256 = "1axjvkrmjszxyh0fdm9k25g4gpzmn4hsw222k2qj3smvnhdj37zk";
+ name = "libkipi-20.12.2.tar.xz";
};
};
libkleo = {
- version = "20.12.1";
+ version = "20.12.2";
src = fetchurl {
- url = "${mirror}/stable/release-service/20.12.1/src/libkleo-20.12.1.tar.xz";
- sha256 = "0dq86pg0jchlpsynk0355wwq3pggqkj0mxhyvgi6a0xb2riy2r4a";
- name = "libkleo-20.12.1.tar.xz";
+ url = "${mirror}/stable/release-service/20.12.2/src/libkleo-20.12.2.tar.xz";
+ sha256 = "0xsljfiqqggdp31c7irjn6lgacdds5kb7sr3khg24bsgip9488k1";
+ name = "libkleo-20.12.2.tar.xz";
};
};
libkmahjongg = {
- version = "20.12.1";
+ version = "20.12.2";
src = fetchurl {
- url = "${mirror}/stable/release-service/20.12.1/src/libkmahjongg-20.12.1.tar.xz";
- sha256 = "0cq0bcl7hkgj1v7giqzbrvlds2933ji52fg53cakz29fkgxibj3x";
- name = "libkmahjongg-20.12.1.tar.xz";
+ url = "${mirror}/stable/release-service/20.12.2/src/libkmahjongg-20.12.2.tar.xz";
+ sha256 = "1yl2smx0ybr164pl8nv5a7jibq3pmpf0v4ijvardp53j51bs2c2q";
+ name = "libkmahjongg-20.12.2.tar.xz";
};
};
libkomparediff2 = {
- version = "20.12.1";
+ version = "20.12.2";
src = fetchurl {
- url = "${mirror}/stable/release-service/20.12.1/src/libkomparediff2-20.12.1.tar.xz";
- sha256 = "04klqvhh8zl5lyblpqgm92wycq4r0hh6gx18nqnsgx6lknlrx9y3";
- name = "libkomparediff2-20.12.1.tar.xz";
+ url = "${mirror}/stable/release-service/20.12.2/src/libkomparediff2-20.12.2.tar.xz";
+ sha256 = "03fn3l1qhzivck7jzfp7fwpgix701paj03rzvc46rs4f1bfmb1d9";
+ name = "libkomparediff2-20.12.2.tar.xz";
};
};
libksane = {
- version = "20.12.1";
+ version = "20.12.2";
src = fetchurl {
- url = "${mirror}/stable/release-service/20.12.1/src/libksane-20.12.1.tar.xz";
- sha256 = "07xsfs0lkh35nj0fy7y1r46nkdmm26nbpsm846v18lh7wflxi36j";
- name = "libksane-20.12.1.tar.xz";
+ url = "${mirror}/stable/release-service/20.12.2/src/libksane-20.12.2.tar.xz";
+ sha256 = "1bhwfsyfd2z4hagfggz3ckxbyqrifcbwyn79h59qpng7nkzsgw4b";
+ name = "libksane-20.12.2.tar.xz";
};
};
libksieve = {
- version = "20.12.1";
+ version = "20.12.2";
src = fetchurl {
- url = "${mirror}/stable/release-service/20.12.1/src/libksieve-20.12.1.tar.xz";
- sha256 = "07zgcsdl38fdy5pskp51rj5p7m3pz9szwidyg24mdyzb08k5xpdz";
- name = "libksieve-20.12.1.tar.xz";
+ url = "${mirror}/stable/release-service/20.12.2/src/libksieve-20.12.2.tar.xz";
+ sha256 = "0rjchcpc4sx53siv3b9hq6s12qh96rrb4xmnk3gjhsvqq9gmyq3j";
+ name = "libksieve-20.12.2.tar.xz";
};
};
libktorrent = {
- version = "20.12.1";
+ version = "20.12.2";
src = fetchurl {
- url = "${mirror}/stable/release-service/20.12.1/src/libktorrent-20.12.1.tar.xz";
- sha256 = "18mcrb064gizqb699cs9bvm918gg06wm6sq33pi87kwki5cniamv";
- name = "libktorrent-20.12.1.tar.xz";
+ url = "${mirror}/stable/release-service/20.12.2/src/libktorrent-20.12.2.tar.xz";
+ sha256 = "15ywv00vklvqw7x6id4vycf4rmi4j3s6z70c68h1b6v8n9j3rz3b";
+ name = "libktorrent-20.12.2.tar.xz";
};
};
lokalize = {
- version = "20.12.1";
+ version = "20.12.2";
src = fetchurl {
- url = "${mirror}/stable/release-service/20.12.1/src/lokalize-20.12.1.tar.xz";
- sha256 = "0mxzk9s0yrjf8gj70dpl1wbvnrkzc3ncqab2bj3yx0xk05hagjlx";
- name = "lokalize-20.12.1.tar.xz";
+ url = "${mirror}/stable/release-service/20.12.2/src/lokalize-20.12.2.tar.xz";
+ sha256 = "1ms7x5aw5z63q2xy6f3x8dl1k39yjqbabzh8qznaqs172bwmwzz7";
+ name = "lokalize-20.12.2.tar.xz";
};
};
lskat = {
- version = "20.12.1";
+ version = "20.12.2";
src = fetchurl {
- url = "${mirror}/stable/release-service/20.12.1/src/lskat-20.12.1.tar.xz";
- sha256 = "0p8n2cgfdxxjbx4jcpqf85h6k36nggj32h982yj3ig5dh1csym5d";
- name = "lskat-20.12.1.tar.xz";
+ url = "${mirror}/stable/release-service/20.12.2/src/lskat-20.12.2.tar.xz";
+ sha256 = "087zrwy5pabyy7zpkplxn9is2msr9kpa8r7bpc6kxylx85sd4nsr";
+ name = "lskat-20.12.2.tar.xz";
};
};
mailcommon = {
- version = "20.12.1";
+ version = "20.12.2";
src = fetchurl {
- url = "${mirror}/stable/release-service/20.12.1/src/mailcommon-20.12.1.tar.xz";
- sha256 = "191d6l314njlj227qhz7qqmkjkz9zm7xnvm9rlfj302san90a338";
- name = "mailcommon-20.12.1.tar.xz";
+ url = "${mirror}/stable/release-service/20.12.2/src/mailcommon-20.12.2.tar.xz";
+ sha256 = "0qbbr5m5glcp7rh3aljkrfs27ypdcb5b72q602irivhbgv56c6v5";
+ name = "mailcommon-20.12.2.tar.xz";
};
};
mailimporter = {
- version = "20.12.1";
+ version = "20.12.2";
src = fetchurl {
- url = "${mirror}/stable/release-service/20.12.1/src/mailimporter-20.12.1.tar.xz";
- sha256 = "0jqdckpwlipc4zxxwnvysl44ri19h0hgr37dp36k99sxa3688jxc";
- name = "mailimporter-20.12.1.tar.xz";
+ url = "${mirror}/stable/release-service/20.12.2/src/mailimporter-20.12.2.tar.xz";
+ sha256 = "16alrfyvgwih9i7fzvmfhbmlsp0l942qml43w2rwkg974g8188yv";
+ name = "mailimporter-20.12.2.tar.xz";
};
};
marble = {
- version = "20.12.1";
+ version = "20.12.2";
src = fetchurl {
- url = "${mirror}/stable/release-service/20.12.1/src/marble-20.12.1.tar.xz";
- sha256 = "0w398igxx7pmyd4bj65ppbxfc4fiz4hsjmcffya88dnxxz73djb5";
- name = "marble-20.12.1.tar.xz";
+ url = "${mirror}/stable/release-service/20.12.2/src/marble-20.12.2.tar.xz";
+ sha256 = "0kgiwsx58yhng92v5c90bz02vsn70p6y7gf6qr5fvljbldrxq3a2";
+ name = "marble-20.12.2.tar.xz";
};
};
markdownpart = {
- version = "20.12.1";
+ version = "20.12.2";
src = fetchurl {
- url = "${mirror}/stable/release-service/20.12.1/src/markdownpart-20.12.1.tar.xz";
- sha256 = "1389hswbhcssl9ybb605h9i50fv6jajggldkiyfwqxbi7aysghwk";
- name = "markdownpart-20.12.1.tar.xz";
+ url = "${mirror}/stable/release-service/20.12.2/src/markdownpart-20.12.2.tar.xz";
+ sha256 = "08fifhw40q2xhi3lp76a3b7jgipq3v1gvp1f5id83jvv9bg5m85k";
+ name = "markdownpart-20.12.2.tar.xz";
};
};
mbox-importer = {
- version = "20.12.1";
+ version = "20.12.2";
src = fetchurl {
- url = "${mirror}/stable/release-service/20.12.1/src/mbox-importer-20.12.1.tar.xz";
- sha256 = "1kgbiq933f93sb8m2nqmpp1x6qkqqcm2hcb3ihk5741dcpdmxx9n";
- name = "mbox-importer-20.12.1.tar.xz";
+ url = "${mirror}/stable/release-service/20.12.2/src/mbox-importer-20.12.2.tar.xz";
+ sha256 = "1jiapp7pblanra83p720nj1rzqd566ij28za9jrkn3nj3xv2zm62";
+ name = "mbox-importer-20.12.2.tar.xz";
};
};
messagelib = {
- version = "20.12.1";
+ version = "20.12.2";
src = fetchurl {
- url = "${mirror}/stable/release-service/20.12.1/src/messagelib-20.12.1.tar.xz";
- sha256 = "0yjh7s80ksyyi78vxjw4i5f1bmsfziphwm6flgnw18gfzj3pyyy7";
- name = "messagelib-20.12.1.tar.xz";
+ url = "${mirror}/stable/release-service/20.12.2/src/messagelib-20.12.2.tar.xz";
+ sha256 = "07mzwsn0bmfsrsn6wlmz7kwrix4d33b007jvx37nckmarr6xcx54";
+ name = "messagelib-20.12.2.tar.xz";
};
};
minuet = {
- version = "20.12.1";
+ version = "20.12.2";
src = fetchurl {
- url = "${mirror}/stable/release-service/20.12.1/src/minuet-20.12.1.tar.xz";
- sha256 = "13jlz2m57x379zyv4x5zk2h6jc0qcz1zymkyrzs431bfmhyhdna2";
- name = "minuet-20.12.1.tar.xz";
+ url = "${mirror}/stable/release-service/20.12.2/src/minuet-20.12.2.tar.xz";
+ sha256 = "00d08qwfa4pvlcysp1af3n91bwb8idkl6gjwxrin3kliwns0ivfj";
+ name = "minuet-20.12.2.tar.xz";
};
};
okular = {
- version = "20.12.1";
+ version = "20.12.2";
src = fetchurl {
- url = "${mirror}/stable/release-service/20.12.1/src/okular-20.12.1.tar.xz";
- sha256 = "0gpm7n47yijsjg4yba561j5pbvd98hgvr93w1kvzk851nb87m89c";
- name = "okular-20.12.1.tar.xz";
+ url = "${mirror}/stable/release-service/20.12.2/src/okular-20.12.2.tar.xz";
+ sha256 = "1959flll9rrwsgb3gpifvsciyvl70j46xb0acfx9zrvsddvbpabq";
+ name = "okular-20.12.2.tar.xz";
};
};
palapeli = {
- version = "20.12.1";
+ version = "20.12.2";
src = fetchurl {
- url = "${mirror}/stable/release-service/20.12.1/src/palapeli-20.12.1.tar.xz";
- sha256 = "05d3f0snbg0iz78ggxk7hv1qn3blvpnpclhrhzcw1c5znr7al2xm";
- name = "palapeli-20.12.1.tar.xz";
+ url = "${mirror}/stable/release-service/20.12.2/src/palapeli-20.12.2.tar.xz";
+ sha256 = "1z80892gp6hg75vl6aicfvf5013412b5xglrpsp86lbx2r7d6ikw";
+ name = "palapeli-20.12.2.tar.xz";
};
};
parley = {
- version = "20.12.1";
+ version = "20.12.2";
src = fetchurl {
- url = "${mirror}/stable/release-service/20.12.1/src/parley-20.12.1.tar.xz";
- sha256 = "00xc1dv3fj783brfqh3ggvrwv26m840k35vrx2izzq5lqx2g1p5a";
- name = "parley-20.12.1.tar.xz";
+ url = "${mirror}/stable/release-service/20.12.2/src/parley-20.12.2.tar.xz";
+ sha256 = "16lymvvwglzvrfl74p7w9l2vahhrkm58fn6iicn5w1751bavjiq7";
+ name = "parley-20.12.2.tar.xz";
};
};
partitionmanager = {
- version = "20.12.1";
+ version = "20.12.2";
src = fetchurl {
- url = "${mirror}/stable/release-service/20.12.1/src/partitionmanager-20.12.1.tar.xz";
- sha256 = "1zypkah2smmqclni2r8571sd6qd5cbc0915r6gzf800yyccsfb65";
- name = "partitionmanager-20.12.1.tar.xz";
+ url = "${mirror}/stable/release-service/20.12.2/src/partitionmanager-20.12.2.tar.xz";
+ sha256 = "1f0nmz99fhp6c48sg92fwssxdvmwx2bj4l7phb0gqfnfqk4sw1xd";
+ name = "partitionmanager-20.12.2.tar.xz";
};
};
picmi = {
- version = "20.12.1";
+ version = "20.12.2";
src = fetchurl {
- url = "${mirror}/stable/release-service/20.12.1/src/picmi-20.12.1.tar.xz";
- sha256 = "0aiaq99sb57vvz5wjwdwm0jj456nj26qs4m6vwibb1f0f8js4i03";
- name = "picmi-20.12.1.tar.xz";
+ url = "${mirror}/stable/release-service/20.12.2/src/picmi-20.12.2.tar.xz";
+ sha256 = "024afpylfb6n6dd0g1iif257a0mgzmmmjl24h2riz4cyfvd26mkc";
+ name = "picmi-20.12.2.tar.xz";
};
};
pimcommon = {
- version = "20.12.1";
+ version = "20.12.2";
src = fetchurl {
- url = "${mirror}/stable/release-service/20.12.1/src/pimcommon-20.12.1.tar.xz";
- sha256 = "1w5avmvssqnvxl31xrlh1xfns6q386w8ixlzfbzjkz5m95m4wr57";
- name = "pimcommon-20.12.1.tar.xz";
+ url = "${mirror}/stable/release-service/20.12.2/src/pimcommon-20.12.2.tar.xz";
+ sha256 = "0fbmahp9m1jzi626rggmp09j3338z8f86hszvwfnk7ydn16hy5rs";
+ name = "pimcommon-20.12.2.tar.xz";
};
};
pim-data-exporter = {
- version = "20.12.1";
+ version = "20.12.2";
src = fetchurl {
- url = "${mirror}/stable/release-service/20.12.1/src/pim-data-exporter-20.12.1.tar.xz";
- sha256 = "0k9lh3llkzx0n5x8q14hkbjjrkczm10kr246bzr1zz8lcv1za1jc";
- name = "pim-data-exporter-20.12.1.tar.xz";
+ url = "${mirror}/stable/release-service/20.12.2/src/pim-data-exporter-20.12.2.tar.xz";
+ sha256 = "13z8r2rq1453zprvpjnf5y5v3x1828l8gyvbivf0dmfhb3hi1bih";
+ name = "pim-data-exporter-20.12.2.tar.xz";
};
};
pim-sieve-editor = {
- version = "20.12.1";
+ version = "20.12.2";
src = fetchurl {
- url = "${mirror}/stable/release-service/20.12.1/src/pim-sieve-editor-20.12.1.tar.xz";
- sha256 = "0lifarfkpcpdvwmn61gmfd45k5i0dbf3sjrb0z1yaqsq7m158di1";
- name = "pim-sieve-editor-20.12.1.tar.xz";
+ url = "${mirror}/stable/release-service/20.12.2/src/pim-sieve-editor-20.12.2.tar.xz";
+ sha256 = "11ji1033yq4lwpi2b331i4f5kpak66h6zyviv344wyab05ljkyhd";
+ name = "pim-sieve-editor-20.12.2.tar.xz";
};
};
poxml = {
- version = "20.12.1";
+ version = "20.12.2";
src = fetchurl {
- url = "${mirror}/stable/release-service/20.12.1/src/poxml-20.12.1.tar.xz";
- sha256 = "1smjvblx0jcv3afs2sr4qcmvhqd44iw24hvr9fppa3nxhrmjwmlk";
- name = "poxml-20.12.1.tar.xz";
+ url = "${mirror}/stable/release-service/20.12.2/src/poxml-20.12.2.tar.xz";
+ sha256 = "1hnm13x102fq7g4pginhdpq473dw9y52kw497773b72my94yj2zz";
+ name = "poxml-20.12.2.tar.xz";
};
};
print-manager = {
- version = "20.12.1";
+ version = "20.12.2";
src = fetchurl {
- url = "${mirror}/stable/release-service/20.12.1/src/print-manager-20.12.1.tar.xz";
- sha256 = "1nx442bi41gd64i4j0nc8hx0wdv6ayvnp2wydn4l7sgsf0ms4x6y";
- name = "print-manager-20.12.1.tar.xz";
+ url = "${mirror}/stable/release-service/20.12.2/src/print-manager-20.12.2.tar.xz";
+ sha256 = "1r19fsgnqdlmrpgbby13nj4v97nqlxlx8c0f7yv3izgncpavr0id";
+ name = "print-manager-20.12.2.tar.xz";
};
};
rocs = {
- version = "20.12.1";
+ version = "20.12.2";
src = fetchurl {
- url = "${mirror}/stable/release-service/20.12.1/src/rocs-20.12.1.tar.xz";
- sha256 = "11gg2pmx21wfrw63qv7w8bjzcsxf86j5ripa2dwqfl3355wvi5mb";
- name = "rocs-20.12.1.tar.xz";
+ url = "${mirror}/stable/release-service/20.12.2/src/rocs-20.12.2.tar.xz";
+ sha256 = "06sy6g32cigls1znvh5wvs7gw9h492d8zjqm6b50wsw0hbx61kvz";
+ name = "rocs-20.12.2.tar.xz";
};
};
signon-kwallet-extension = {
- version = "20.12.1";
+ version = "20.12.2";
src = fetchurl {
- url = "${mirror}/stable/release-service/20.12.1/src/signon-kwallet-extension-20.12.1.tar.xz";
- sha256 = "0m48a5mqmwrjl4wc4m30n5csl7fwp8g70pv0nib0v36lp0424xjb";
- name = "signon-kwallet-extension-20.12.1.tar.xz";
+ url = "${mirror}/stable/release-service/20.12.2/src/signon-kwallet-extension-20.12.2.tar.xz";
+ sha256 = "0ycr0dn8bp51dc510gqxik0rm0wk5728px7cps9csy33izfjpx9p";
+ name = "signon-kwallet-extension-20.12.2.tar.xz";
};
};
spectacle = {
- version = "20.12.1";
+ version = "20.12.2";
src = fetchurl {
- url = "${mirror}/stable/release-service/20.12.1/src/spectacle-20.12.1.tar.xz";
- sha256 = "04jsm0ipfaccc80qxnhhbfc9fn009cxa7dys89iqfqza6ssvq51l";
- name = "spectacle-20.12.1.tar.xz";
+ url = "${mirror}/stable/release-service/20.12.2/src/spectacle-20.12.2.tar.xz";
+ sha256 = "0v0vzspr0vwqi7m7yhnhavxzkfqdnz1g06ispfl1lmpjg1xh90by";
+ name = "spectacle-20.12.2.tar.xz";
};
};
step = {
- version = "20.12.1";
+ version = "20.12.2";
src = fetchurl {
- url = "${mirror}/stable/release-service/20.12.1/src/step-20.12.1.tar.xz";
- sha256 = "05xj4zv4r82nnz5rzb0rmrps4dagnkw9f5lapil5mi1i1gwqfi2k";
- name = "step-20.12.1.tar.xz";
+ url = "${mirror}/stable/release-service/20.12.2/src/step-20.12.2.tar.xz";
+ sha256 = "1drdv95rimdsgarcc00jlfm3jmcan2ln32yq0q2nbbxsj0c502k7";
+ name = "step-20.12.2.tar.xz";
};
};
svgpart = {
- version = "20.12.1";
+ version = "20.12.2";
src = fetchurl {
- url = "${mirror}/stable/release-service/20.12.1/src/svgpart-20.12.1.tar.xz";
- sha256 = "09n0pf5saww8gppmd501i3dfr13yvn4r2rfbdz42zlvcpcpgxdry";
- name = "svgpart-20.12.1.tar.xz";
+ url = "${mirror}/stable/release-service/20.12.2/src/svgpart-20.12.2.tar.xz";
+ sha256 = "1v1qd5sgb89gkvb62jad8ava2y599a4acb6hkqyh758y798ylgwj";
+ name = "svgpart-20.12.2.tar.xz";
};
};
sweeper = {
- version = "20.12.1";
+ version = "20.12.2";
src = fetchurl {
- url = "${mirror}/stable/release-service/20.12.1/src/sweeper-20.12.1.tar.xz";
- sha256 = "06a9a9vbkfhmlcc927ysa0qnp5qqbl5iywhkgbvyz90nsdaw3jjl";
- name = "sweeper-20.12.1.tar.xz";
+ url = "${mirror}/stable/release-service/20.12.2/src/sweeper-20.12.2.tar.xz";
+ sha256 = "0yh6dqw37v8l54635k7g27dnsrl319kfxrkiiy09cx6pjzf87k1h";
+ name = "sweeper-20.12.2.tar.xz";
};
};
umbrello = {
- version = "20.12.1";
+ version = "20.12.2";
src = fetchurl {
- url = "${mirror}/stable/release-service/20.12.1/src/umbrello-20.12.1.tar.xz";
- sha256 = "07fxxyw5zn1xj05kjr16rkgpj7ms9xvgpj4zlg428037gfa8g9vl";
- name = "umbrello-20.12.1.tar.xz";
+ url = "${mirror}/stable/release-service/20.12.2/src/umbrello-20.12.2.tar.xz";
+ sha256 = "0zzic469brh0w41w4ni66mfrj0p44xm1h32iwbb7imgnpw6dqksf";
+ name = "umbrello-20.12.2.tar.xz";
};
};
yakuake = {
- version = "20.12.1";
+ version = "20.12.2";
src = fetchurl {
- url = "${mirror}/stable/release-service/20.12.1/src/yakuake-20.12.1.tar.xz";
- sha256 = "02pal9xx1wbpw7dimvs2aw1xnyjqlvbjlybkkfhf8x7c6m1r63aa";
- name = "yakuake-20.12.1.tar.xz";
+ url = "${mirror}/stable/release-service/20.12.2/src/yakuake-20.12.2.tar.xz";
+ sha256 = "16irzxl6xfyanr7lrvap0ng911lml10bbjr0axk2a7m0gc1llrn4";
+ name = "yakuake-20.12.2.tar.xz";
};
};
zeroconf-ioslave = {
- version = "20.12.1";
+ version = "20.12.2";
src = fetchurl {
- url = "${mirror}/stable/release-service/20.12.1/src/zeroconf-ioslave-20.12.1.tar.xz";
- sha256 = "1lx94qgrqhyva3nv7sgzy0blbdgx3b6m0g0i0psg74qckdh8glas";
- name = "zeroconf-ioslave-20.12.1.tar.xz";
+ url = "${mirror}/stable/release-service/20.12.2/src/zeroconf-ioslave-20.12.2.tar.xz";
+ sha256 = "0yqni8vwwwya3cv006cf5svs1jhn6369clvrl6m79iacy0iirynk";
+ name = "zeroconf-ioslave-20.12.2.tar.xz";
};
};
}
diff --git a/third_party/nixpkgs/pkgs/applications/misc/1password-gui/default.nix b/third_party/nixpkgs/pkgs/applications/misc/1password-gui/default.nix
index fc653953e5..41fd8683c5 100644
--- a/third_party/nixpkgs/pkgs/applications/misc/1password-gui/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/misc/1password-gui/default.nix
@@ -8,11 +8,11 @@
stdenv.mkDerivation rec {
pname = "1password";
- version = "8.0.27";
+ version = "8.0.28";
src = fetchurl {
url = "https://onepassword.s3.amazonaws.com/linux/appimage/${pname}-${version}.AppImage";
- hash = "sha256-qzZXs7ak4052Igq+YWuzgDqJ7143q5qw5P3b3eN3NkU=";
+ hash = "sha256-okLeyok/5rihGXaQaUR06dGkpuqqW02qJ6q6VVLtZsE=";
};
nativeBuildInputs = [ makeWrapper ];
diff --git a/third_party/nixpkgs/pkgs/applications/misc/audio/soxr/arm64-check.patch b/third_party/nixpkgs/pkgs/applications/misc/audio/soxr/arm64-check.patch
new file mode 100644
index 0000000000..ac16a214c3
--- /dev/null
+++ b/third_party/nixpkgs/pkgs/applications/misc/audio/soxr/arm64-check.patch
@@ -0,0 +1,79 @@
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: Misty De Meo
+Date: Tue, 15 Sep 2020 16:57:26 -0700
+Subject: [PATCH] Check for __arm64__, not just __arm__
+
+On at least one 64-bit ARM processor I've tested (Apple Silicon on macOS),
+__arm__ isn't defined but __arm64__ is. As a result, some of the
+ARM-specific macros are missing and calls to them fail.
+---
+ src/cr-core.c | 2 +-
+ src/dev32s.h | 2 +-
+ src/pffft-wrap.c | 2 +-
+ src/pffft.c | 4 ++--
+ 4 files changed, 5 insertions(+), 5 deletions(-)
+
+diff --git a/src/cr-core.c b/src/cr-core.c
+index 159a5d9..fe5ea8a 100644
+--- a/src/cr-core.c
++++ b/src/cr-core.c
+@@ -80,7 +80,7 @@ static void cubic_stage_fn(stage_t * p, fifo_t * output_fifo)
+ #define DEFINED_X86 0
+ #endif
+
+-#if defined __arm__
++#if defined(__arm__) || defined(__arm64__)
+ #define DEFINED_ARM 1
+ #else
+ #define DEFINED_ARM 0
+diff --git a/src/dev32s.h b/src/dev32s.h
+index 7edae86..a14d7ad 100644
+--- a/src/dev32s.h
++++ b/src/dev32s.h
+@@ -31,7 +31,7 @@ SIMD_INLINE(void) vStorSum(float * a, v4_t b) {
+ v4_t t = vAdd(_mm_movehl_ps(b, b), b);
+ _mm_store_ss(a, vAdd(t, _mm_shuffle_ps(t,t,1)));}
+
+-#elif defined __arm__
++#elif defined(__arm__) || defined(__arm64__)
+
+ #include
+
+diff --git a/src/pffft-wrap.c b/src/pffft-wrap.c
+index c920f06..1641fc4 100644
+--- a/src/pffft-wrap.c
++++ b/src/pffft-wrap.c
+@@ -40,7 +40,7 @@ static void pffft_zconvolve(PFFFT_Setup *s, const float *a, const float *b, floa
+
+ float ar, ai, br, bi;
+
+-#ifdef __arm__
++#if defined(__arm__) || defined(__arm64__)
+ __builtin_prefetch(va);
+ __builtin_prefetch(vb);
+ __builtin_prefetch(va+2);
+diff --git a/src/pffft.c b/src/pffft.c
+index 46c841e..8c775a9 100644
+--- a/src/pffft.c
++++ b/src/pffft.c
+@@ -157,7 +157,7 @@ typedef __m128 v4sf;
+ /*
+ ARM NEON support macros
+ */
+-#elif !defined(PFFFT_SIMD_DISABLE) && defined(__arm__)
++#elif !defined(PFFFT_SIMD_DISABLE) && (defined(__arm__) || defined(__arm64__))
+ # include
+ typedef float32x4_t v4sf;
+ # define SIMD_SZ 4
+@@ -1732,7 +1732,7 @@ void pffft_zconvolve_accumulate(PFFFT_Setup *s, const float *a, const float *b,
+ const v4sf * RESTRICT vb = (const v4sf*)b;
+ v4sf * RESTRICT vab = (v4sf*)ab;
+
+-#ifdef __arm__
++#if defined(__arm__) || defined(__arm64__)
+ __builtin_prefetch(va);
+ __builtin_prefetch(vb);
+ __builtin_prefetch(vab);
+--
+2.30.1
+
diff --git a/third_party/nixpkgs/pkgs/applications/misc/audio/soxr/default.nix b/third_party/nixpkgs/pkgs/applications/misc/audio/soxr/default.nix
index 3f3ed0a0b1..8460b4856d 100644
--- a/third_party/nixpkgs/pkgs/applications/misc/audio/soxr/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/misc/audio/soxr/default.nix
@@ -8,6 +8,11 @@ stdenv.mkDerivation rec {
sha256 = "12aql6svkplxq5fjycar18863hcq84c5kx8g6f4rj0lcvigw24di";
};
+ patches = [
+ # Remove once https://sourceforge.net/p/soxr/code/merge-requests/5/ is merged.
+ ./arm64-check.patch
+ ];
+
outputs = [ "out" "doc" ]; # headers are just two and very small
preConfigure = if stdenv.isDarwin then ''
diff --git a/third_party/nixpkgs/pkgs/applications/misc/avrdudess/default.nix b/third_party/nixpkgs/pkgs/applications/misc/avrdudess/default.nix
index 29469d9fff..14b372d91e 100644
--- a/third_party/nixpkgs/pkgs/applications/misc/avrdudess/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/misc/avrdudess/default.nix
@@ -8,7 +8,7 @@ stdenv.mkDerivation {
sha256 = "18llpvjsfhypzijrvfbzmcg3g141f307mzsrg11wcdxh9syxqak6";
};
- buildInputs = [ unzip ];
+ nativeBuildInputs = [ unzip ];
phases = [ "buildPhase" ];
diff --git a/third_party/nixpkgs/pkgs/applications/misc/bemenu/default.nix b/third_party/nixpkgs/pkgs/applications/misc/bemenu/default.nix
index 8de0ceeae6..42c0f7d05f 100644
--- a/third_party/nixpkgs/pkgs/applications/misc/bemenu/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/misc/bemenu/default.nix
@@ -2,12 +2,12 @@
, pango, fribidi, harfbuzz, pcre, pkg-config
, ncursesSupport ? true, ncurses ? null
, waylandSupport ? true, wayland ? null, wayland-protocols ? null
-, x11Support ? true, xlibs ? null, xorg ? null
+, x11Support ? true, xorg ? null
}:
assert ncursesSupport -> ncurses != null;
assert waylandSupport -> ! lib.elem null [wayland wayland-protocols];
-assert x11Support -> xlibs != null && xorg != null;
+assert x11Support -> xorg != null;
stdenv.mkDerivation rec {
pname = "bemenu";
@@ -38,7 +38,7 @@ stdenv.mkDerivation rec {
] ++ optional ncursesSupport ncurses
++ optionals waylandSupport [ wayland wayland-protocols ]
++ optionals x11Support [
- xlibs.libX11 xlibs.libXinerama xlibs.libXft
+ xorg.libX11 xorg.libXinerama xorg.libXft
xorg.libXdmcp xorg.libpthreadstubs xorg.libxcb
];
diff --git a/third_party/nixpkgs/pkgs/applications/misc/birdtray/default.nix b/third_party/nixpkgs/pkgs/applications/misc/birdtray/default.nix
index ce8db160a7..f007fb7137 100644
--- a/third_party/nixpkgs/pkgs/applications/misc/birdtray/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/misc/birdtray/default.nix
@@ -36,11 +36,15 @@ mkDerivation rec {
--subst-var-by qttranslations ${qttranslations}
'';
+ # Wayland support is broken.
+ # https://github.com/gyunaev/birdtray/issues/113#issuecomment-621742315
+ qtWrapperArgs = [ "--set QT_QPA_PLATFORM xcb" ];
+
meta = with lib; {
description = "Mail system tray notification icon for Thunderbird";
homepage = "https://github.com/gyunaev/birdtray";
license = licenses.gpl3Plus;
- maintainers = with maintainers; [ Flakebi ];
+ maintainers = with maintainers; [ Flakebi oxalica ];
platforms = platforms.linux;
};
}
diff --git a/third_party/nixpkgs/pkgs/applications/misc/extract_url/default.nix b/third_party/nixpkgs/pkgs/applications/misc/extract_url/default.nix
index 9daaf7268c..35ea33bde3 100644
--- a/third_party/nixpkgs/pkgs/applications/misc/extract_url/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/misc/extract_url/default.nix
@@ -5,7 +5,7 @@
let
perlDeps =
- [ perlPackages.MIMEtools perlPackages.HTMLParser ]
+ [ perlPackages.MIMETools perlPackages.HTMLParser ]
++ lib.optional cursesSupport perlPackages.CursesUI
++ lib.optional uriFindSupport perlPackages.URIFind;
diff --git a/third_party/nixpkgs/pkgs/applications/misc/gcstar/default.nix b/third_party/nixpkgs/pkgs/applications/misc/gcstar/default.nix
index f482b8af28..f77bf04c2c 100644
--- a/third_party/nixpkgs/pkgs/applications/misc/gcstar/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/misc/gcstar/default.nix
@@ -31,7 +31,7 @@ stdenv.mkDerivation rec {
JSON
ImageExifTool
librelative
- LWPUserAgent
+ LWP
LWPProtocolHttps
MP3Info
MP3Tag
diff --git a/third_party/nixpkgs/pkgs/applications/misc/jrnl/default.nix b/third_party/nixpkgs/pkgs/applications/misc/jrnl/default.nix
index 8d2cabb5b8..7a5615bf40 100644
--- a/third_party/nixpkgs/pkgs/applications/misc/jrnl/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/misc/jrnl/default.nix
@@ -18,14 +18,14 @@
buildPythonApplication rec {
pname = "jrnl";
- version = "2.7";
+ version = "2.7.1";
format = "pyproject";
src = fetchFromGitHub {
owner = "jrnl-org";
repo = pname;
rev = "v${version}";
- sha256 = "1hyjjw9mxy73n3pkliaaif135h2sd4iy43pw9d5zynid5abnr3yz";
+ sha256 = "1m1shgnvwzzs0g6ph7rprwxd7w8zj0x4sbgiqsv9z41k6li7xj4r";
};
nativeBuildInputs = [ poetry ];
diff --git a/third_party/nixpkgs/pkgs/applications/misc/kdbplus/default.nix b/third_party/nixpkgs/pkgs/applications/misc/kdbplus/default.nix
index d27a10af20..8ee8337bea 100644
--- a/third_party/nixpkgs/pkgs/applications/misc/kdbplus/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/misc/kdbplus/default.nix
@@ -22,7 +22,7 @@ stdenv.mkDerivation rec {
};
dontStrip = true;
- buildInputs = [ unzip ];
+ nativeBuildInputs = [ unzip ];
phases = "unpackPhase installPhase";
unpackPhase = "mkdir ${pname}-${version} && cd ${pname}-${version} && unzip -qq ${src}";
diff --git a/third_party/nixpkgs/pkgs/applications/misc/keepass/default.nix b/third_party/nixpkgs/pkgs/applications/misc/keepass/default.nix
index 6388d005fe..843193bba1 100644
--- a/third_party/nixpkgs/pkgs/applications/misc/keepass/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/misc/keepass/default.nix
@@ -12,8 +12,8 @@ with builtins; buildDotnetPackage rec {
sourceRoot = ".";
- nativeBuildInputs = [ makeWrapper ];
- buildInputs = [ unzip icoutils ];
+ nativeBuildInputs = [ makeWrapper unzip ];
+ buildInputs = [ icoutils ];
patches = [
(substituteAll {
diff --git a/third_party/nixpkgs/pkgs/applications/misc/lyx/default.nix b/third_party/nixpkgs/pkgs/applications/misc/lyx/default.nix
index 800de77f1c..7cab86df96 100644
--- a/third_party/nixpkgs/pkgs/applications/misc/lyx/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/misc/lyx/default.nix
@@ -3,12 +3,12 @@
}:
mkDerivation rec {
- version = "2.3.6";
+ version = "2.3.6.1";
pname = "lyx";
src = fetchurl {
url = "ftp://ftp.lyx.org/pub/lyx/stable/2.3.x/${pname}-${version}.tar.xz";
- sha256 = "160whjwwrmxizdakjlkf9xc86bhqfnslw47fixgqq4qhbapcxxkg";
+ sha256 = "sha256-xr7SYzQZiY4Bp8w1AxDX2TS/WRyrcln8JYGqTADq+ng=";
};
# LaTeX is used from $PATH, as people often want to have it with extra pkgs
diff --git a/third_party/nixpkgs/pkgs/applications/misc/marktext/default.nix b/third_party/nixpkgs/pkgs/applications/misc/marktext/default.nix
index 83a7aabaef..c98d40ab2e 100644
--- a/third_party/nixpkgs/pkgs/applications/misc/marktext/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/misc/marktext/default.nix
@@ -25,7 +25,7 @@ appimageTools.wrapType2 rec {
multiPkgs = null; # no 32bit needed
extraPkgs = p: (appimageTools.defaultFhsEnvArgs.multiPkgs p) ++ [
p.libsecret
- p.xlibs.libxkbfile
+ p.xorg.libxkbfile
];
# Strip version from binary name.
diff --git a/third_party/nixpkgs/pkgs/applications/misc/megasync/default.nix b/third_party/nixpkgs/pkgs/applications/misc/megasync/default.nix
index 1c87747eac..9ae6fda9fc 100644
--- a/third_party/nixpkgs/pkgs/applications/misc/megasync/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/misc/megasync/default.nix
@@ -38,7 +38,7 @@ mkDerivation rec {
};
nativeBuildInputs =
- [ autoconf automake doxygen lsb-release pkg-config qttools swig ];
+ [ autoconf automake doxygen lsb-release pkg-config qttools swig unzip ];
buildInputs = [
c-ares
cryptopp
@@ -53,7 +53,6 @@ mkDerivation rec {
qtbase
qtx11extras
sqlite
- unzip
wget
];
diff --git a/third_party/nixpkgs/pkgs/applications/misc/metadata-cleaner/default.nix b/third_party/nixpkgs/pkgs/applications/misc/metadata-cleaner/default.nix
new file mode 100644
index 0000000000..de715bf315
--- /dev/null
+++ b/third_party/nixpkgs/pkgs/applications/misc/metadata-cleaner/default.nix
@@ -0,0 +1,61 @@
+{ lib
+, python3
+, fetchFromGitLab
+, appstream
+, desktop-file-utils
+, glib
+, gobject-introspection
+, gtk3
+, libhandy
+, librsvg
+, meson
+, ninja
+, pkg-config
+, poppler_gi
+, wrapGAppsHook
+}:
+
+python3.pkgs.buildPythonApplication rec {
+ pname = "metadata-cleaner";
+ version = "1.0.3";
+
+ format = "other";
+
+ src = fetchFromGitLab {
+ owner = "rmnvgr";
+ repo = "metadata-cleaner";
+ rev = "v${version}";
+ sha256 = "06dzfcnjb1xd8lk0r7bi4i784gfj8r7habbjbk2c4vn2847v71lf";
+ };
+
+ nativeBuildInputs = [
+ appstream
+ desktop-file-utils
+ glib
+ gtk3
+ meson
+ ninja
+ pkg-config
+ wrapGAppsHook
+ ];
+
+ buildInputs = [
+ gobject-introspection
+ gtk3
+ libhandy
+ librsvg
+ poppler_gi
+ ];
+
+ propagatedBuildInputs = with python3.pkgs; [
+ mat2
+ pygobject3
+ ];
+
+ meta = with lib; {
+ description = "Python GTK application to view and clean metadata in files, using mat2";
+ homepage = "https://gitlab.com/rmnvgr/metadata-cleaner";
+ license = with licenses; [ gpl3Plus cc-by-sa-40 ];
+ maintainers = with maintainers; [ dotlambda ];
+ };
+}
diff --git a/third_party/nixpkgs/pkgs/applications/misc/milu/default.nix b/third_party/nixpkgs/pkgs/applications/misc/milu/default.nix
index 23da8abc66..a941f62514 100644
--- a/third_party/nixpkgs/pkgs/applications/misc/milu/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/misc/milu/default.nix
@@ -22,10 +22,9 @@ stdenv.mkDerivation {
cp bin/milu $out/bin
'';
- nativeBuildInputs = [ pkg-config ];
+ nativeBuildInputs = [ pkg-config unzip ];
buildInputs = [
glib
- unzip
llvmPackages.libclang
];
diff --git a/third_party/nixpkgs/pkgs/applications/misc/nnn/default.nix b/third_party/nixpkgs/pkgs/applications/misc/nnn/default.nix
index 4a72eecf9b..a39e8267cf 100644
--- a/third_party/nixpkgs/pkgs/applications/misc/nnn/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/misc/nnn/default.nix
@@ -7,13 +7,13 @@ assert withNerdIcons -> withIcons == false;
stdenv.mkDerivation rec {
pname = "nnn";
- version = "3.5";
+ version = "3.6";
src = fetchFromGitHub {
owner = "jarun";
repo = pname;
rev = "v${version}";
- sha256 = "1fa7cmwrzn6kx87kms8i98p9azdlwyh2gnif29l340syl9hkr5qy";
+ sha256 = "1hwv7ncp8pmzdir30877ni4qlmczmb3yjdkbfd1pssr08y1srsc7";
};
configFile = lib.optionalString (conf != null) (builtins.toFile "nnn.h" conf);
@@ -22,10 +22,8 @@ stdenv.mkDerivation rec {
nativeBuildInputs = [ pkg-config ];
buildInputs = [ readline ncurses ];
- makeFlags = [
- "DESTDIR=${placeholder "out"}"
- "PREFIX="
- ] ++ lib.optional withIcons [ "O_ICONS=1" ]
+ makeFlags = [ "PREFIX=$(out)" ]
+ ++ lib.optional withIcons [ "O_ICONS=1" ]
++ lib.optional withNerdIcons [ "O_NERD=1" ];
# shell completions
@@ -38,6 +36,7 @@ stdenv.mkDerivation rec {
meta = with lib; {
description = "Small ncurses-based file browser forked from noice";
homepage = "https://github.com/jarun/nnn";
+ changelog = "https://github.com/jarun/nnn/blob/v${version}/CHANGELOG";
license = licenses.bsd2;
platforms = platforms.all;
maintainers = with maintainers; [ jfrankenau Br1ght0ne ];
diff --git a/third_party/nixpkgs/pkgs/applications/misc/omegat.nix b/third_party/nixpkgs/pkgs/applications/misc/omegat.nix
index 2bb3d14e1d..0a46393bd2 100644
--- a/third_party/nixpkgs/pkgs/applications/misc/omegat.nix
+++ b/third_party/nixpkgs/pkgs/applications/misc/omegat.nix
@@ -9,8 +9,7 @@ stdenv.mkDerivation {
sha256 = "0axz7r30p34z5hgvdglznc82g7yvm3g56dv5190jixskx6ba58rs";
};
- nativeBuildInputs = [ makeWrapper ];
- buildInputs = [ unzip ];
+ nativeBuildInputs = [ makeWrapper unzip ];
unpackCmd = "unzip -o $curSrc"; # tries to go interactive without -o
diff --git a/third_party/nixpkgs/pkgs/applications/misc/openjump/default.nix b/third_party/nixpkgs/pkgs/applications/misc/openjump/default.nix
index b3e93ce512..d6b20a7f01 100644
--- a/third_party/nixpkgs/pkgs/applications/misc/openjump/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/misc/openjump/default.nix
@@ -18,8 +18,7 @@ stdenv.mkDerivation {
cd $out; unzip $src
'';
- nativeBuildInputs = [ makeWrapper ];
- buildInputs = [ unzip ];
+ nativeBuildInputs = [ makeWrapper unzip ];
installPhase = ''
dir=$(echo $out/OpenJUMP-*)
diff --git a/third_party/nixpkgs/pkgs/applications/misc/pdfslicer/default.nix b/third_party/nixpkgs/pkgs/applications/misc/pdfslicer/default.nix
new file mode 100644
index 0000000000..31bc471401
--- /dev/null
+++ b/third_party/nixpkgs/pkgs/applications/misc/pdfslicer/default.nix
@@ -0,0 +1,48 @@
+{ lib
+, stdenv
+, fetchFromGitHub
+, cmake
+, gettext
+, intltool
+, pkg-config
+, wrapGAppsHook
+, gtkmm3
+, libuuid
+, poppler
+, qpdf
+}:
+
+stdenv.mkDerivation rec {
+ pname = "pdfslicer";
+ version = "1.8.8";
+
+ src = fetchFromGitHub {
+ owner = "junrrein";
+ repo = "pdfslicer";
+ rev = "v${version}";
+ fetchSubmodules = true;
+ sha256 = "0sja0ddd9c8wjjpzk2ag8q1lxpj09adgmhd7wnsylincqnj2jyls";
+ };
+
+ nativeBuildInputs = [
+ cmake
+ gettext
+ intltool
+ pkg-config
+ wrapGAppsHook
+ ];
+
+ buildInputs = [
+ gtkmm3
+ libuuid
+ poppler
+ qpdf
+ ];
+
+ meta = with lib; {
+ description = "A simple application to extract, merge, rotate and reorder pages of PDF documents";
+ homepage = "https://junrrein.github.io/pdfslicer/";
+ license = licenses.gpl3Plus;
+ maintainers = with maintainers; [ dotlambda ];
+ };
+}
diff --git a/third_party/nixpkgs/pkgs/applications/misc/qcad/default.nix b/third_party/nixpkgs/pkgs/applications/misc/qcad/default.nix
index c6b9d82bcf..6b2418ab57 100644
--- a/third_party/nixpkgs/pkgs/applications/misc/qcad/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/misc/qcad/default.nix
@@ -15,16 +15,17 @@
mkDerivationWith stdenv.mkDerivation rec {
pname = "qcad";
- version = "3.25.2.0";
+ version = "3.26.0.1";
src = fetchFromGitHub {
owner = "qcad";
repo = "qcad";
rev = "v${version}";
- sha256 = "1lz6q9n2p0l7k8rwqsdj6av9p3426423g5avc4y6s7nbk36280mz";
+ sha256 = "sha256-V+QlwM8BWmcarwZtqJfc+MYHOZgIH1W5R8m2EHhNJls=";
};
patches = [
+ # Patch directory lookup, remove __DATE__ and executable name
./application-dir.patch
];
@@ -90,12 +91,10 @@ mkDerivationWith stdenv.mkDerivation rec {
qttools
];
- enableParallelBuilding = true;
-
meta = with lib; {
description = "2D CAD package based on Qt";
homepage = "https://qcad.org";
- license = licenses.gpl3;
+ license = licenses.gpl3Only;
maintainers = with maintainers; [ yvesf ];
platforms = qtbase.meta.platforms;
};
diff --git a/third_party/nixpkgs/pkgs/applications/misc/reddsaver/default.nix b/third_party/nixpkgs/pkgs/applications/misc/reddsaver/default.nix
index bdb589d8f9..279d3e4b15 100644
--- a/third_party/nixpkgs/pkgs/applications/misc/reddsaver/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/misc/reddsaver/default.nix
@@ -8,22 +8,22 @@
rustPlatform.buildRustPackage rec {
pname = "reddsaver";
- version = "0.3.1";
+ version = "0.3.2";
src = fetchFromGitHub {
owner = "manojkarthick";
repo = "reddsaver";
rev = "v${version}";
- sha256 = "0kww3abgvxr7azr7yb8aiw28fz13qb4sn3x7nnz1ihmd4yczi9fg";
+ sha256 = "0ffci3as50f55n1v36hji4n0b3lkch5ylc75awjz65jz2gd2y2j4";
};
- cargoSha256 = "09xm22vgmd3dc0wr6n3jczxvhwpcsijwfbv50dz1lnsx57g8mgmd";
+ cargoSha256 = "1cx3sqr7zb1vlfdvbcxp0yva9xh654qczpy8s09c8cviy8hac5sr";
nativeBuildInputs = [ pkg-config ];
buildInputs = [ openssl ]
++ lib.optional stdenv.isDarwin Security;
- # package does not contain tests as of v0.3.1
+ # package does not contain tests as of v0.3.2
docCheck = false;
meta = with lib; {
diff --git a/third_party/nixpkgs/pkgs/applications/misc/regextester/default.nix b/third_party/nixpkgs/pkgs/applications/misc/regextester/default.nix
index eac131d6ef..b7eb236752 100644
--- a/third_party/nixpkgs/pkgs/applications/misc/regextester/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/misc/regextester/default.nix
@@ -6,7 +6,7 @@
, pkg-config
, glib
, gtk3
-, gnome3
+, libgee
, meson
, ninja
, gobject-introspection
@@ -40,7 +40,7 @@ stdenv.mkDerivation rec {
pantheon.elementary-icon-theme
pantheon.granite
glib
- gnome3.libgee
+ libgee
gsettings-desktop-schemas
gtk3
];
diff --git a/third_party/nixpkgs/pkgs/applications/misc/tickrs/default.nix b/third_party/nixpkgs/pkgs/applications/misc/tickrs/default.nix
index fb6bfc6efe..601380fc6c 100644
--- a/third_party/nixpkgs/pkgs/applications/misc/tickrs/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/misc/tickrs/default.nix
@@ -2,16 +2,16 @@
rustPlatform.buildRustPackage rec {
pname = "tickrs";
- version = "0.14.2";
+ version = "0.14.3";
src = fetchFromGitHub {
owner = "tarkah";
repo = pname;
rev = "v${version}";
- sha256 = "sha256-8m4mIXTqc6rDMIjODbHJL7ipH5Y4WwgsWcSmw/SaiIo=";
+ sha256 = "sha256-mHMBhYI9pJkuK/6tCg1fXPjTfGFe0gkMzplesuFvl5M=";
};
- cargoSha256 = "sha256-ZcRFQT2CxqpO35UqK79g2Jq5SPOLZ88WiG36issC5kY=";
+ cargoSha256 = "sha256-XmLobbVTYO8dA8YVtI/ntlD1RB9sO3poP6NBdDOPIlE=";
nativeBuildInputs = [ perl ];
diff --git a/third_party/nixpkgs/pkgs/applications/misc/zathura/pdf-mupdf/default.nix b/third_party/nixpkgs/pkgs/applications/misc/zathura/pdf-mupdf/default.nix
index d787705be1..05f6c2b6a6 100644
--- a/third_party/nixpkgs/pkgs/applications/misc/zathura/pdf-mupdf/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/misc/zathura/pdf-mupdf/default.nix
@@ -6,7 +6,7 @@
, jbig2dec
, libjpeg
, mupdf
-, openjpeg_2
+, openjpeg
, pkg-config
, zathura_core
}:
@@ -29,7 +29,7 @@ stdenv.mkDerivation rec {
jbig2dec
libjpeg
mupdf
- openjpeg_2
+ openjpeg
zathura_core
] ++ lib.optional stdenv.isDarwin gtk-mac-integration;
diff --git a/third_party/nixpkgs/pkgs/applications/networking/browsers/brave/default.nix b/third_party/nixpkgs/pkgs/applications/networking/browsers/brave/default.nix
index 12848b9689..f544660913 100644
--- a/third_party/nixpkgs/pkgs/applications/networking/browsers/brave/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/networking/browsers/brave/default.nix
@@ -90,11 +90,11 @@ in
stdenv.mkDerivation rec {
pname = "brave";
- version = "1.21.76";
+ version = "1.21.77";
src = fetchurl {
url = "https://github.com/brave/brave-browser/releases/download/v${version}/brave-browser_${version}_amd64.deb";
- sha256 = "JFZaPS9NmwZeyEdDqOrKG9VEQP7wIyqkR/Sk44GVxps=";
+ sha256 = "Q7paeGAvdmc4+FP28ASLlJhN1ui7M5fDpxnrh+gbEm4=";
};
dontConfigure = true;
diff --git a/third_party/nixpkgs/pkgs/applications/networking/browsers/chromium/browser.nix b/third_party/nixpkgs/pkgs/applications/networking/browsers/chromium/browser.nix
index c4a5508b75..989368f198 100644
--- a/third_party/nixpkgs/pkgs/applications/networking/browsers/chromium/browser.nix
+++ b/third_party/nixpkgs/pkgs/applications/networking/browsers/chromium/browser.nix
@@ -89,5 +89,6 @@ mkChromiumDerivation (base: rec {
then ["aarch64-linux" "x86_64-linux"]
else [];
timeout = 172800; # 48 hours (increased from the Hydra default of 10h)
+ broken = elem channel [ "beta" "dev" ]; # Build requires LLVM 12
};
})
diff --git a/third_party/nixpkgs/pkgs/applications/networking/browsers/chromium/upstream-info.json b/third_party/nixpkgs/pkgs/applications/networking/browsers/chromium/upstream-info.json
index 78d70cc7ab..da36f2de68 100644
--- a/third_party/nixpkgs/pkgs/applications/networking/browsers/chromium/upstream-info.json
+++ b/third_party/nixpkgs/pkgs/applications/networking/browsers/chromium/upstream-info.json
@@ -18,9 +18,9 @@
}
},
"beta": {
- "version": "90.0.4430.19",
- "sha256": "174isyx4g62d8ggn9imp41dfklcbxi3y5nfprm4jbjmn5cb7v8xa",
- "sha256bin64": "0z665iykdsmjrjbijsrcq80y2anvcfykasznf8w4brg9l9k59wv8",
+ "version": "90.0.4430.30",
+ "sha256": "01b6naziii72pvw35wphfqz3inih75is038yf1mdp1847jbvxpwp",
+ "sha256bin64": "0k48mfzmyjb0w75fkm2j7ll340qgmzvmskz12awc2l19hgnw1s8p",
"deps": {
"gn": {
"version": "2021-02-09",
@@ -31,15 +31,15 @@
}
},
"dev": {
- "version": "91.0.4442.4",
- "sha256": "0cmm2pimkghb6s956bkqf2k77lj69dz51nlydgkqbvw0sc8n784k",
- "sha256bin64": "1hbfx8n51p7dwwz1vbp94jdmlb96vvxrbql2af4kmvx1bmzr2ism",
+ "version": "91.0.4449.6",
+ "sha256": "1y6z7p64fi4dxyrxrnlmg0wwczgw58cinrsywhnrpl2wp2y3v6m3",
+ "sha256bin64": "1baxra0hg981awinyyvm1x46rlskjmhs2m1h0zf72l11y1jyj5vc",
"deps": {
"gn": {
- "version": "2021-02-09",
+ "version": "2021-03-12",
"url": "https://gn.googlesource.com/gn",
- "rev": "dfcbc6fed0a8352696f92d67ccad54048ad182b3",
- "sha256": "1941bzg37c4dpsk3sh6ga3696gpq6vjzpcw9rsnf6kdr9mcgdxvn"
+ "rev": "64b3b9401c1c3ed5f3c43c1cac00b91f83597ab8",
+ "sha256": "14whk4gyx21cqxy1560xm8p1mc1581dh9g7xy120g8vvcylknjlm"
}
}
},
diff --git a/third_party/nixpkgs/pkgs/applications/networking/browsers/firefox-bin/release_sources.nix b/third_party/nixpkgs/pkgs/applications/networking/browsers/firefox-bin/release_sources.nix
index 07a2caca85..5a71b9d707 100644
--- a/third_party/nixpkgs/pkgs/applications/networking/browsers/firefox-bin/release_sources.nix
+++ b/third_party/nixpkgs/pkgs/applications/networking/browsers/firefox-bin/release_sources.nix
@@ -1,965 +1,965 @@
{
- version = "86.0";
+ version = "86.0.1";
sources = [
- { url = "http://archive.mozilla.org/pub/firefox/releases/86.0/linux-x86_64/ach/firefox-86.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/86.0.1/linux-x86_64/ach/firefox-86.0.1.tar.bz2";
locale = "ach";
arch = "linux-x86_64";
- sha256 = "96cf6afb631f36dd18f0d109bfc31abbff5960e7972b59e4fa51ac0c2c81f9ed";
+ sha256 = "b9006b2c0251ae2264a60be3763dcf9610f3a8569f2a05f266e59c8232400e8c";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/86.0/linux-x86_64/af/firefox-86.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/86.0.1/linux-x86_64/af/firefox-86.0.1.tar.bz2";
locale = "af";
arch = "linux-x86_64";
- sha256 = "38d4588b8498917717ea58419a35751c6c3ae987372ee6a37590a7630eb68c35";
+ sha256 = "7f4268d613acee2e003fe8042dc2e969bd0f6f14b906b35ce6b8c727fbb13d76";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/86.0/linux-x86_64/an/firefox-86.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/86.0.1/linux-x86_64/an/firefox-86.0.1.tar.bz2";
locale = "an";
arch = "linux-x86_64";
- sha256 = "942c9cf4dc6f5baa6c5225a15a2856bd72c7366bcb6224b8ba5a1428cfd974f6";
+ sha256 = "8a892626b4f34413423f4da61d7e0099e215bc9e597092bbd625445e27998d17";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/86.0/linux-x86_64/ar/firefox-86.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/86.0.1/linux-x86_64/ar/firefox-86.0.1.tar.bz2";
locale = "ar";
arch = "linux-x86_64";
- sha256 = "a616e3dfac2bcae832bc6538692a9d811604aadb71079641f77f9b3db105fabd";
+ sha256 = "c837e97ca8b46de448fbc9fd2120ffbb735474ade8a6f64f7ded8dbdfc4c7406";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/86.0/linux-x86_64/ast/firefox-86.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/86.0.1/linux-x86_64/ast/firefox-86.0.1.tar.bz2";
locale = "ast";
arch = "linux-x86_64";
- sha256 = "0e026de4affddbdf9e5915818c02acb018b214cd005c5122593e86e821919016";
+ sha256 = "8c3b990b899d70c46827ac5a7f32faf9cf44bfba195283bf47d277ccc8da8cbe";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/86.0/linux-x86_64/az/firefox-86.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/86.0.1/linux-x86_64/az/firefox-86.0.1.tar.bz2";
locale = "az";
arch = "linux-x86_64";
- sha256 = "761e129a070f017b28ce51c1f96fa95be8d98e687b44e9e97d95d18db85ad9aa";
+ sha256 = "8fa2a9e6cb6c70fd92b43e2ae145956337f87dd21b468ac375a90a7d18551bce";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/86.0/linux-x86_64/be/firefox-86.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/86.0.1/linux-x86_64/be/firefox-86.0.1.tar.bz2";
locale = "be";
arch = "linux-x86_64";
- sha256 = "9e80115c8a78ab5ff3eec38e31c1ec29decba3660ebc95cb909aedf3db4390ab";
+ sha256 = "dddbf1e9eb8ecc928b534ef5fd77cb52edd0c67f68a522bbc377d5943cfaaa90";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/86.0/linux-x86_64/bg/firefox-86.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/86.0.1/linux-x86_64/bg/firefox-86.0.1.tar.bz2";
locale = "bg";
arch = "linux-x86_64";
- sha256 = "b5149b21a8ae9b08ee3abfa2fdb894582e620464af36037c43c2cd0b6667c174";
+ sha256 = "c4eac8234b58f40b40ec5be3fc37817f768d35804f2f923b9d0effa5cf906782";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/86.0/linux-x86_64/bn/firefox-86.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/86.0.1/linux-x86_64/bn/firefox-86.0.1.tar.bz2";
locale = "bn";
arch = "linux-x86_64";
- sha256 = "0b5ed8e2859e54ce7d64ac8b0626c69229209cfadf14e8d55225272f702a6f8f";
+ sha256 = "41efed647c468ad3da21090e11a4bb861d26106471e0543c3709016d1ca2bd06";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/86.0/linux-x86_64/br/firefox-86.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/86.0.1/linux-x86_64/br/firefox-86.0.1.tar.bz2";
locale = "br";
arch = "linux-x86_64";
- sha256 = "7fb1cdb85510bb8e41f2ce5e856a0ef93c83c430bbe64079a2e3c362bd557ab0";
+ sha256 = "53076688c25034f02b3c30455fbdbea0287bfdd8d5100c0f5edb77ad32955f36";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/86.0/linux-x86_64/bs/firefox-86.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/86.0.1/linux-x86_64/bs/firefox-86.0.1.tar.bz2";
locale = "bs";
arch = "linux-x86_64";
- sha256 = "2259ddd7f35d5a8d8830a429f0dec92da5ee101d5c42ff5d9f8ff003f76e5b8a";
+ sha256 = "304d9fa41a95f6abf61c16f765ec4651a159af0cabb09b1ce76f805d27746dc4";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/86.0/linux-x86_64/ca-valencia/firefox-86.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/86.0.1/linux-x86_64/ca-valencia/firefox-86.0.1.tar.bz2";
locale = "ca-valencia";
arch = "linux-x86_64";
- sha256 = "5214a48525eabc0ae4cda08e70ceba59b0e9fd51976d578f512b02fefbf48b8c";
+ sha256 = "e845d6cbff2cd88b9e1f7526e8aa9eac4aa53c116301ba861e1beb04f9deb4e7";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/86.0/linux-x86_64/ca/firefox-86.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/86.0.1/linux-x86_64/ca/firefox-86.0.1.tar.bz2";
locale = "ca";
arch = "linux-x86_64";
- sha256 = "250f4bf5659a04dfb20a651899a92bccd9d24c2e9d3186bb17acc4f452b0b648";
+ sha256 = "5159eb68a571fb035c4621cbeae9d7a88d40172876a00b3ab6512a8701f43f59";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/86.0/linux-x86_64/cak/firefox-86.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/86.0.1/linux-x86_64/cak/firefox-86.0.1.tar.bz2";
locale = "cak";
arch = "linux-x86_64";
- sha256 = "959c3cf7aace0b80adc6ae2bedc578b74de66adf261de7b67654e0c57e6ee2f5";
+ sha256 = "efab62e54fa41a65d5989078ee594dc2c2e8c355bd656828321cc342cc167def";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/86.0/linux-x86_64/cs/firefox-86.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/86.0.1/linux-x86_64/cs/firefox-86.0.1.tar.bz2";
locale = "cs";
arch = "linux-x86_64";
- sha256 = "aaed7891e891ba8926ed5904a798e6201cbc355ba11c341546f779e0f2815abc";
+ sha256 = "1cc3e58c1c2790bd13346b752b2209bc8db08a9470960e06857913a70a7826dc";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/86.0/linux-x86_64/cy/firefox-86.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/86.0.1/linux-x86_64/cy/firefox-86.0.1.tar.bz2";
locale = "cy";
arch = "linux-x86_64";
- sha256 = "064c2419e8fd43e350e055d7bcd4ae1689c4f7667b51996be9037bc4d1c529a3";
+ sha256 = "230d79e979cdc350164fe37ea4ba84183db935ba973efab1ab14b56f0a12344f";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/86.0/linux-x86_64/da/firefox-86.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/86.0.1/linux-x86_64/da/firefox-86.0.1.tar.bz2";
locale = "da";
arch = "linux-x86_64";
- sha256 = "484f1bdd24689a7a7dd7a8b4556b2f32aeb50509aa3f9d645e151dbfaab9e71b";
+ sha256 = "04d50be5260cafde33729aca15cd9731f6fb1550da2db86719e6d672639607fb";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/86.0/linux-x86_64/de/firefox-86.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/86.0.1/linux-x86_64/de/firefox-86.0.1.tar.bz2";
locale = "de";
arch = "linux-x86_64";
- sha256 = "12670011be25e5420a5721e23d1e37592e4d1ca9a2efac85db02545398454e65";
+ sha256 = "a4b5c447cb34b91ac5053153e73520d9f5fc8b06a390f5694cda6bc2131efe12";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/86.0/linux-x86_64/dsb/firefox-86.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/86.0.1/linux-x86_64/dsb/firefox-86.0.1.tar.bz2";
locale = "dsb";
arch = "linux-x86_64";
- sha256 = "2851664d7d9dd90f8e444e13b5c9f20bd6271b6e77ae857db1e3aa55429b8b83";
+ sha256 = "eea691c668126056cb1e4137cf4f6e8d40fe46f79a00c73ccd59723cfb63e404";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/86.0/linux-x86_64/el/firefox-86.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/86.0.1/linux-x86_64/el/firefox-86.0.1.tar.bz2";
locale = "el";
arch = "linux-x86_64";
- sha256 = "ec24c6634f20da95f820623c32d92f492f2b939280a49e327a1f465b0046632f";
+ sha256 = "d6774ba0cdc0e89091cb57bc1669927f58ed9811617cfbd358567e2a85f977d2";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/86.0/linux-x86_64/en-CA/firefox-86.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/86.0.1/linux-x86_64/en-CA/firefox-86.0.1.tar.bz2";
locale = "en-CA";
arch = "linux-x86_64";
- sha256 = "6c5a19ac4ac5f174569483ee5c1f053e692efc189edfca7e78f9428f05454338";
+ sha256 = "8cb49ea8e3db760de1f3d97f1583f4219c3039d09632f5ef186311145aa2c3c9";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/86.0/linux-x86_64/en-GB/firefox-86.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/86.0.1/linux-x86_64/en-GB/firefox-86.0.1.tar.bz2";
locale = "en-GB";
arch = "linux-x86_64";
- sha256 = "919d6e6c731d53ade97bbb330cd2e425f70565c330233a86ffe9295ff3692001";
+ sha256 = "2ee2ead0c7765e9e5744dff5d7bdfe2ac890cb6859362426bf8244e393f1bb5a";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/86.0/linux-x86_64/en-US/firefox-86.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/86.0.1/linux-x86_64/en-US/firefox-86.0.1.tar.bz2";
locale = "en-US";
arch = "linux-x86_64";
- sha256 = "c643dd519fe8b0b6d2d2241b5c241aa1b43ece397f49268865b4d1888c19173e";
+ sha256 = "d419da5168312f5d023481668fb4767a27799f02248b4ea90fef98a54ab73b86";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/86.0/linux-x86_64/eo/firefox-86.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/86.0.1/linux-x86_64/eo/firefox-86.0.1.tar.bz2";
locale = "eo";
arch = "linux-x86_64";
- sha256 = "d20b007ba86bdfdd7aa4bdaae08b283107a4464d88a4a9fc34bd4c95781f48d3";
+ sha256 = "0b73a3695f0291c3afdc1635976e6129f94d72d9a9a422ebd3a0cfbbb9343697";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/86.0/linux-x86_64/es-AR/firefox-86.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/86.0.1/linux-x86_64/es-AR/firefox-86.0.1.tar.bz2";
locale = "es-AR";
arch = "linux-x86_64";
- sha256 = "3d4ed05801d31a92c072384e660d7b874be835edd3b6b37741b71bec32a0fa6f";
+ sha256 = "4fe2c2428ce205054d16ee33f432dd865e4d919b63f7c2f0a458bd5b80c9c0b8";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/86.0/linux-x86_64/es-CL/firefox-86.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/86.0.1/linux-x86_64/es-CL/firefox-86.0.1.tar.bz2";
locale = "es-CL";
arch = "linux-x86_64";
- sha256 = "8ec51d79baefe2808024c33105fd4c1a8e4f5061b72530a4c01bc8a23d6b6cd5";
+ sha256 = "f5d1850c5c10051b04a445001a2991e52a3c1b93002b3534030e85ee0a3c6b5f";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/86.0/linux-x86_64/es-ES/firefox-86.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/86.0.1/linux-x86_64/es-ES/firefox-86.0.1.tar.bz2";
locale = "es-ES";
arch = "linux-x86_64";
- sha256 = "38781952508f86d9b4aa7a0c4fae927494e207970e54ba1070943008283c2e23";
+ sha256 = "b99f0532bdc3ab04c421442cf0ea4c24db19a87104ad7d2eff51acb0a383b154";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/86.0/linux-x86_64/es-MX/firefox-86.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/86.0.1/linux-x86_64/es-MX/firefox-86.0.1.tar.bz2";
locale = "es-MX";
arch = "linux-x86_64";
- sha256 = "29817ccf3aad1e38f195f18ab628bca8f9bc4dcd931919cdd9d5d22c6461ce87";
+ sha256 = "56bc322d4c7c160fe1bf095039b5b6e31fcfa234bd5d66ba0995f22af49f5bae";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/86.0/linux-x86_64/et/firefox-86.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/86.0.1/linux-x86_64/et/firefox-86.0.1.tar.bz2";
locale = "et";
arch = "linux-x86_64";
- sha256 = "d4ddde9103e9355a91186e0343315f99bf0eb53b2502abb80b8fcb1056ea82e2";
+ sha256 = "962dcd00ed62c5ca6ef86ede3e965e699f403435de9ce933457dac940141c293";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/86.0/linux-x86_64/eu/firefox-86.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/86.0.1/linux-x86_64/eu/firefox-86.0.1.tar.bz2";
locale = "eu";
arch = "linux-x86_64";
- sha256 = "85744b3d7e3bcd5de92ca4ec5a0ade8421689dda5a3c53e361656f3de3178a91";
+ sha256 = "2ba0643490d449ad39b07e98713f8693ecc16b368cc459a9ea89a35a1ed74978";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/86.0/linux-x86_64/fa/firefox-86.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/86.0.1/linux-x86_64/fa/firefox-86.0.1.tar.bz2";
locale = "fa";
arch = "linux-x86_64";
- sha256 = "60e6ebb40f1e11a61ad63d2543acd7d83cef58c0fd4dc22f1c553749a36e3fb8";
+ sha256 = "11566ef20d466b2930841f4fce2f92960ceeb1771b82449c274f6a4fcfb85e0d";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/86.0/linux-x86_64/ff/firefox-86.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/86.0.1/linux-x86_64/ff/firefox-86.0.1.tar.bz2";
locale = "ff";
arch = "linux-x86_64";
- sha256 = "878d7155fe73ff6585e8566399416361a39080cb54afd61448e1bd0e191046a0";
+ sha256 = "110cbb0d3662bbc73273535abd2846091bb16dda3c221a60a2f7023ef756f764";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/86.0/linux-x86_64/fi/firefox-86.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/86.0.1/linux-x86_64/fi/firefox-86.0.1.tar.bz2";
locale = "fi";
arch = "linux-x86_64";
- sha256 = "d02f24944f5bbd57273e05aa4fe701b375ad8d8905d0070ec9396a55d104203d";
+ sha256 = "decb87ed765911a9564e15dd97fc7e35164b0af1ab84167dcd598689c8972d30";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/86.0/linux-x86_64/fr/firefox-86.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/86.0.1/linux-x86_64/fr/firefox-86.0.1.tar.bz2";
locale = "fr";
arch = "linux-x86_64";
- sha256 = "ac6497f8a4bfa4e37798840bf4dc9b84463bf095074d2ba3c931e89a402a3fc8";
+ sha256 = "31fa08ae30af62b65b39c16718ee6c6f132cb157a92fc149a3d36870016abde1";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/86.0/linux-x86_64/fy-NL/firefox-86.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/86.0.1/linux-x86_64/fy-NL/firefox-86.0.1.tar.bz2";
locale = "fy-NL";
arch = "linux-x86_64";
- sha256 = "456ff8a1bed8769cd9fc05b29ed23edd29c48514dda4e73ac8e8663593cc3b4b";
+ sha256 = "f75d128c1c6a1b3171132f20f42aca2b798180e1d58f20e264d4defa0e4508d8";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/86.0/linux-x86_64/ga-IE/firefox-86.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/86.0.1/linux-x86_64/ga-IE/firefox-86.0.1.tar.bz2";
locale = "ga-IE";
arch = "linux-x86_64";
- sha256 = "b0778c1217f9ee6e631c62ef024991212cb679a43394e07401a5f61ca2b88459";
+ sha256 = "9902efeb4b30b0935be5dec5a7f85c4ec659b8d8f236e012b2d1187a52f3b667";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/86.0/linux-x86_64/gd/firefox-86.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/86.0.1/linux-x86_64/gd/firefox-86.0.1.tar.bz2";
locale = "gd";
arch = "linux-x86_64";
- sha256 = "37eba79d0db2bf84faa2d89efa0c5b9b34f7fc732636f4b436a3e118792ba610";
+ sha256 = "42c779be313524a365dd59013f5486e79b0378d0dc4fe805b5a6769d44ac98d0";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/86.0/linux-x86_64/gl/firefox-86.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/86.0.1/linux-x86_64/gl/firefox-86.0.1.tar.bz2";
locale = "gl";
arch = "linux-x86_64";
- sha256 = "ef06e70653f712c4ab594a00c4d571ba098db740ff508cf78e08e859123096dc";
+ sha256 = "cc5d2239946d4b01e31b6da4604a75862f501cc529aecd7962956d4af4dcc970";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/86.0/linux-x86_64/gn/firefox-86.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/86.0.1/linux-x86_64/gn/firefox-86.0.1.tar.bz2";
locale = "gn";
arch = "linux-x86_64";
- sha256 = "c7bbe33c8f839b24ee6928d74d5b0cff18918ab5f2a55e4b3bc1319049b19e4b";
+ sha256 = "4a94e0f10f9002721ac57e622da7ab43cd1788683288564e87f667069fdac427";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/86.0/linux-x86_64/gu-IN/firefox-86.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/86.0.1/linux-x86_64/gu-IN/firefox-86.0.1.tar.bz2";
locale = "gu-IN";
arch = "linux-x86_64";
- sha256 = "71ceee81509cb6d505b836dd494eb9dba73857aa2c976ec1aab2fa57a50f1519";
+ sha256 = "f81a85e1bea666d339774e0cadd316fccf52752c11a0b5a53a82ac22d6d8dabf";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/86.0/linux-x86_64/he/firefox-86.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/86.0.1/linux-x86_64/he/firefox-86.0.1.tar.bz2";
locale = "he";
arch = "linux-x86_64";
- sha256 = "cca354d947d83c616035fdd64019b50d1bb86c3d01e05090eae2d07953ae566b";
+ sha256 = "347130466e2f42d06707d56e486b4f262874e50c36b69e2badcb7287ff73376b";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/86.0/linux-x86_64/hi-IN/firefox-86.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/86.0.1/linux-x86_64/hi-IN/firefox-86.0.1.tar.bz2";
locale = "hi-IN";
arch = "linux-x86_64";
- sha256 = "a151d3a3d85f0cf96837f51b2a0df9a0a9652148dbcb53733025e15686451669";
+ sha256 = "9600a709b7e4b2bb8f0c57cde08627aff892341cd68edda563cb4d0366ca13f6";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/86.0/linux-x86_64/hr/firefox-86.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/86.0.1/linux-x86_64/hr/firefox-86.0.1.tar.bz2";
locale = "hr";
arch = "linux-x86_64";
- sha256 = "00e3301bef430e243c6516d5c94e0b5fe6e27ca58fd0192955423956395fb2d4";
+ sha256 = "bea906c0745f77fc99a830594a2eef1ce609b03596a93cefaaf49044edd483c3";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/86.0/linux-x86_64/hsb/firefox-86.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/86.0.1/linux-x86_64/hsb/firefox-86.0.1.tar.bz2";
locale = "hsb";
arch = "linux-x86_64";
- sha256 = "34c2666668499c8034e732565b244fc5b0cc7b0f544296be1e86942aa62b9167";
+ sha256 = "56bf66c8f38567771b57e9f6008b0e86845cd71873b8ee4aa2c056e2c47d3f9c";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/86.0/linux-x86_64/hu/firefox-86.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/86.0.1/linux-x86_64/hu/firefox-86.0.1.tar.bz2";
locale = "hu";
arch = "linux-x86_64";
- sha256 = "d33f5467d9be5a2c6317a10fbd5285c4db7ed4191ceddc317d4ec923bd6ef7df";
+ sha256 = "e7da1098e56e1ad7e1baa3b6075defc6169e28306846c77c8f26c424c748f565";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/86.0/linux-x86_64/hy-AM/firefox-86.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/86.0.1/linux-x86_64/hy-AM/firefox-86.0.1.tar.bz2";
locale = "hy-AM";
arch = "linux-x86_64";
- sha256 = "a008343614e5fa43d8ce90ac5f2afc0bec98419d28efc191b836ce835b6f48a1";
+ sha256 = "ce3660bf256ed1cccb9c73d0c895907c68104f7f1cc28e7163363a060a747036";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/86.0/linux-x86_64/ia/firefox-86.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/86.0.1/linux-x86_64/ia/firefox-86.0.1.tar.bz2";
locale = "ia";
arch = "linux-x86_64";
- sha256 = "9140874f06ed6e135ae70fa40600b4e1e570b6dc6901191658870916f73d1c17";
+ sha256 = "b6ebccd0e4c84d71e7da95ae99d6fa2e1a95fe94d6ed200fbf23ea7ff22aff70";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/86.0/linux-x86_64/id/firefox-86.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/86.0.1/linux-x86_64/id/firefox-86.0.1.tar.bz2";
locale = "id";
arch = "linux-x86_64";
- sha256 = "c1dea9043a7f06708498acfda90a7b166b1f7bf839bf86dc2fbb90cf7a00269f";
+ sha256 = "7d6844743e6a3e56a29f9d5ee599850bdef09f449de70f14e03664c02bebb31a";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/86.0/linux-x86_64/is/firefox-86.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/86.0.1/linux-x86_64/is/firefox-86.0.1.tar.bz2";
locale = "is";
arch = "linux-x86_64";
- sha256 = "50a804f9b7dd594b8c449ce6dd137b5f2bce41ab29baa35f6a14977a5c7af486";
+ sha256 = "28bc14cf54090b9f52ae8fcbc7703f201407520e72f5aa6cd0b9f953d4db1777";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/86.0/linux-x86_64/it/firefox-86.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/86.0.1/linux-x86_64/it/firefox-86.0.1.tar.bz2";
locale = "it";
arch = "linux-x86_64";
- sha256 = "3ea5e01722a7a03a5dc498977410fd2cde90352b026489669bcb7ebaa571ffdf";
+ sha256 = "1d1a9a7108ebcc0cb796dadbdd9ddf0d8943e5d21c6d56588f33c583e7517b8a";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/86.0/linux-x86_64/ja/firefox-86.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/86.0.1/linux-x86_64/ja/firefox-86.0.1.tar.bz2";
locale = "ja";
arch = "linux-x86_64";
- sha256 = "efac929a1ace0484b5bce056bbd3d3ff4f26f897d4b1739f128d1dfd91c3c375";
+ sha256 = "64342a2674eba04cda7f38e7382b7b2fa93efa1b5c555f0a01e6c59314913f31";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/86.0/linux-x86_64/ka/firefox-86.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/86.0.1/linux-x86_64/ka/firefox-86.0.1.tar.bz2";
locale = "ka";
arch = "linux-x86_64";
- sha256 = "95261b88327b5b20739d8adb2a99bb0de5d1311099e2d3fc0999405fbc918ae6";
+ sha256 = "38fd38b9a257ba42928e72fed0c3047e000d2a603d37eba1d879ac1d3a87c371";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/86.0/linux-x86_64/kab/firefox-86.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/86.0.1/linux-x86_64/kab/firefox-86.0.1.tar.bz2";
locale = "kab";
arch = "linux-x86_64";
- sha256 = "f7b4f440f27ab9141b24f2673e4b850193744d1fc03451c2134a6890b4884f37";
+ sha256 = "24570eeeaf5129ce8891320efe6a77203a3eb213285c71c9f2312da1c1d15303";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/86.0/linux-x86_64/kk/firefox-86.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/86.0.1/linux-x86_64/kk/firefox-86.0.1.tar.bz2";
locale = "kk";
arch = "linux-x86_64";
- sha256 = "652aeb8d66ffb884983a043ff1d2ba10ff3a03aafe8cd55217a8f6a8068a3e59";
+ sha256 = "cbc294b8e6988e2e010d08608fd1a822f05cf54bb3b3d6772eea13f1a17ee491";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/86.0/linux-x86_64/km/firefox-86.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/86.0.1/linux-x86_64/km/firefox-86.0.1.tar.bz2";
locale = "km";
arch = "linux-x86_64";
- sha256 = "39deb82ca935780959e4a0f71d85cee3b90c6228237a508b239ad2a1f5a35a07";
+ sha256 = "ba9acd0c686ea2ef2d6d8af279c6cd75852021d16aa9e6d8a0bb429de605d8fc";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/86.0/linux-x86_64/kn/firefox-86.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/86.0.1/linux-x86_64/kn/firefox-86.0.1.tar.bz2";
locale = "kn";
arch = "linux-x86_64";
- sha256 = "886370871c27c6637a74e4d8ced9ef2a9ec5062a8aae45fad5fea1dc358e38f4";
+ sha256 = "bba2d328021359961fc0bdf7f5676fe47d72476b4bdb54cd41b09506f49ef0c5";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/86.0/linux-x86_64/ko/firefox-86.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/86.0.1/linux-x86_64/ko/firefox-86.0.1.tar.bz2";
locale = "ko";
arch = "linux-x86_64";
- sha256 = "9acea882760a961e228344c2cac9dfdb8d40c6c4c874744a4f2fffc356f6499c";
+ sha256 = "983f9e165840452aae854b780a480c215f3e030801ff8184424d53b541e1c8b0";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/86.0/linux-x86_64/lij/firefox-86.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/86.0.1/linux-x86_64/lij/firefox-86.0.1.tar.bz2";
locale = "lij";
arch = "linux-x86_64";
- sha256 = "fd76e82cda32813d43d80ae4acaed5610882162d68e98b4ae47dd1ddc8487d82";
+ sha256 = "d57f27ef2a5ab4d8032cb823fa9cb6fc566baced92517dca8ed61560641af96d";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/86.0/linux-x86_64/lt/firefox-86.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/86.0.1/linux-x86_64/lt/firefox-86.0.1.tar.bz2";
locale = "lt";
arch = "linux-x86_64";
- sha256 = "afcc203f0d080560364277e7cca0f4080c74011dfc0fe07c751124e341e5b729";
+ sha256 = "1866f926855aed60846004450b34fb341faddc992cfc603ad2b689019e888c8c";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/86.0/linux-x86_64/lv/firefox-86.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/86.0.1/linux-x86_64/lv/firefox-86.0.1.tar.bz2";
locale = "lv";
arch = "linux-x86_64";
- sha256 = "1b8a5cc4941d669f12593dc078d6658751609bd094a3704e9a9949341413ba9d";
+ sha256 = "ac79432c516df059b15737c1bb492a3eec6dcd5261a2ebe17698720ae7085cae";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/86.0/linux-x86_64/mk/firefox-86.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/86.0.1/linux-x86_64/mk/firefox-86.0.1.tar.bz2";
locale = "mk";
arch = "linux-x86_64";
- sha256 = "72d374b828e3316f119d592bde6ebfe91ac4907d63cde43f6391d4be81119bc4";
+ sha256 = "5d9eefd2926d1554d1feb4526c460506315a805c7e149ca4f87e0ebcb24b3d12";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/86.0/linux-x86_64/mr/firefox-86.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/86.0.1/linux-x86_64/mr/firefox-86.0.1.tar.bz2";
locale = "mr";
arch = "linux-x86_64";
- sha256 = "17a2dec82a1d89fe74e71f924a21bb175cdb89d801ba50e5f0f0b4625fdabc1d";
+ sha256 = "a5095a4eeea48bea9c52b843023756a9912a979aa8441aa2160785287bdefd1a";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/86.0/linux-x86_64/ms/firefox-86.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/86.0.1/linux-x86_64/ms/firefox-86.0.1.tar.bz2";
locale = "ms";
arch = "linux-x86_64";
- sha256 = "9af2d0b5f81d573c8fed4ff54446b2f3a77080ccec5138b1d0e707fb1c37e164";
+ sha256 = "47b1bc88d7a5f3d0feddbdb0d9e30a5cd9e420b85f3fb360bd6429a4ca1e4bc2";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/86.0/linux-x86_64/my/firefox-86.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/86.0.1/linux-x86_64/my/firefox-86.0.1.tar.bz2";
locale = "my";
arch = "linux-x86_64";
- sha256 = "3a2815eed7a1288991c769045614cc50ec3fed2810ff143652092cd32aef5e1b";
+ sha256 = "420e4b3ef4b31bd850374fdd4098e41d455d02ab2bbf52b5c575d28ea6350afe";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/86.0/linux-x86_64/nb-NO/firefox-86.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/86.0.1/linux-x86_64/nb-NO/firefox-86.0.1.tar.bz2";
locale = "nb-NO";
arch = "linux-x86_64";
- sha256 = "a8255d1dffb5dcba012a15d5b0f62b9e6e4e60720ae6dc139c23f77aaf6ea99e";
+ sha256 = "6f6656a5370de01fc90eeeab8088d69d71c2e55cd9793b285f0bb88b61d44131";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/86.0/linux-x86_64/ne-NP/firefox-86.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/86.0.1/linux-x86_64/ne-NP/firefox-86.0.1.tar.bz2";
locale = "ne-NP";
arch = "linux-x86_64";
- sha256 = "e1c563748ae230a44939d27d7fa246e63ad49d242df236082af2eb0c38af8046";
+ sha256 = "e7ac9e8e6914624349fd4cbb230faa96eed54502ec8019cdf2032606654e4464";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/86.0/linux-x86_64/nl/firefox-86.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/86.0.1/linux-x86_64/nl/firefox-86.0.1.tar.bz2";
locale = "nl";
arch = "linux-x86_64";
- sha256 = "56ab4fedc5c3a71b91693d33eb70f79ba3f0095dda66eae44e3e15f885491d5c";
+ sha256 = "a425e62f533d9e360ec2690946cd9ec5fa4f7da9ce6891558fb50a1bf3be6adc";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/86.0/linux-x86_64/nn-NO/firefox-86.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/86.0.1/linux-x86_64/nn-NO/firefox-86.0.1.tar.bz2";
locale = "nn-NO";
arch = "linux-x86_64";
- sha256 = "216e2d4434c66fd4361114467ed5e4635342ed53b74eae287d1d69ba63ac85d6";
+ sha256 = "69c939c97646fcd628fe3facd0643c2d43790d7997b902a921190b6269dbf88e";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/86.0/linux-x86_64/oc/firefox-86.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/86.0.1/linux-x86_64/oc/firefox-86.0.1.tar.bz2";
locale = "oc";
arch = "linux-x86_64";
- sha256 = "0f6822824131d1709c09de64643a9f6e3b03e30741d079f66229efdfb5096e21";
+ sha256 = "6a4c2ace18b9e00ee25a4600e115af847d305e60d89335203209d5a519ce89fc";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/86.0/linux-x86_64/pa-IN/firefox-86.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/86.0.1/linux-x86_64/pa-IN/firefox-86.0.1.tar.bz2";
locale = "pa-IN";
arch = "linux-x86_64";
- sha256 = "9a15f3ea177314500e72ef123ed9dc36bfb9e10b92e5ab20cdaa6e7e1fa3367f";
+ sha256 = "d81d8fda4acd4ccad2cae15a47123cecdd91afa66f93cd635ea13ed6af074fa8";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/86.0/linux-x86_64/pl/firefox-86.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/86.0.1/linux-x86_64/pl/firefox-86.0.1.tar.bz2";
locale = "pl";
arch = "linux-x86_64";
- sha256 = "18d19ed1597d3862d08d6daf52dd1bfb8f21c005f7cc44ce4d2e8177b4509aee";
+ sha256 = "cb4b300ff0e8e8b0d874dce5349202b8b29e5a4ff79ab6044df74a53f5c72dc8";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/86.0/linux-x86_64/pt-BR/firefox-86.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/86.0.1/linux-x86_64/pt-BR/firefox-86.0.1.tar.bz2";
locale = "pt-BR";
arch = "linux-x86_64";
- sha256 = "287c3c117532b23e45d726d4541ee726056139e976bf43210f35b529834c3884";
+ sha256 = "654cc5d0a0e35823733e6c9d440c43e4483233a4423c6c9bcaf91cb8fcbeb5ae";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/86.0/linux-x86_64/pt-PT/firefox-86.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/86.0.1/linux-x86_64/pt-PT/firefox-86.0.1.tar.bz2";
locale = "pt-PT";
arch = "linux-x86_64";
- sha256 = "26915b7725a325db052cbc165454c34f19e7a1346aa400b1306234707bccdf9b";
+ sha256 = "a944bf18dc7490ce80779af4cce82c20521b48ddb691ed5504d70075116af0d7";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/86.0/linux-x86_64/rm/firefox-86.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/86.0.1/linux-x86_64/rm/firefox-86.0.1.tar.bz2";
locale = "rm";
arch = "linux-x86_64";
- sha256 = "4d5c14e2607efc653f5cae75290332229286b5ee606da635871dc04e20495fc3";
+ sha256 = "674921eeca942cc77b08e8c33a273d327357d90df7be91140e468517a59a7cbd";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/86.0/linux-x86_64/ro/firefox-86.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/86.0.1/linux-x86_64/ro/firefox-86.0.1.tar.bz2";
locale = "ro";
arch = "linux-x86_64";
- sha256 = "a41bab63866e22712861a825aae272e3468470783f92c23117e1c116b9d66771";
+ sha256 = "8cbc8f6246455b6deae4a8e619f065ba218b59e711747033b08adffbed8498d1";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/86.0/linux-x86_64/ru/firefox-86.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/86.0.1/linux-x86_64/ru/firefox-86.0.1.tar.bz2";
locale = "ru";
arch = "linux-x86_64";
- sha256 = "edec67a8079f55c5f22b6928bf1d55a2e1d31aff931c9e41e503ff1b7acf2ecf";
+ sha256 = "6d2f6c1d4d8503ee78769c69c97a3cbefa6544a8a1ffb662f10460b6d78fa209";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/86.0/linux-x86_64/si/firefox-86.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/86.0.1/linux-x86_64/si/firefox-86.0.1.tar.bz2";
locale = "si";
arch = "linux-x86_64";
- sha256 = "0357b913e6528214f30ff5ffd4a0f1c0e26bf079d3afdc166a82ee24e8c099ad";
+ sha256 = "af33afea872e8e2b8825a01d5fcbc40a5b7674813b60735855b5fd0b886c57ac";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/86.0/linux-x86_64/sk/firefox-86.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/86.0.1/linux-x86_64/sk/firefox-86.0.1.tar.bz2";
locale = "sk";
arch = "linux-x86_64";
- sha256 = "5a38f953d93cf4cb8b4e2dbb0206fc0a9fa3262c55d91fa4cfc3a8605098403e";
+ sha256 = "7ecd39362865c864d6a5412bed20f8946019e3cb845923ce2ee30112d8e6444b";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/86.0/linux-x86_64/sl/firefox-86.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/86.0.1/linux-x86_64/sl/firefox-86.0.1.tar.bz2";
locale = "sl";
arch = "linux-x86_64";
- sha256 = "0c2c41f6d7c3f72e56cb84c921207a606f959993ec6a3cc5619bbb894ce6ef8a";
+ sha256 = "93c000e695b37f389356d4f3c48c55de6839688826c507e0cf76fee105409dfa";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/86.0/linux-x86_64/son/firefox-86.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/86.0.1/linux-x86_64/son/firefox-86.0.1.tar.bz2";
locale = "son";
arch = "linux-x86_64";
- sha256 = "cfdedeaacf244b3bc63343f76ed817a165a15b2a727f04327581cd373e76ac86";
+ sha256 = "25df54b6e83be77fa22622905d17667a5db613eca263582daffea9c0079031cc";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/86.0/linux-x86_64/sq/firefox-86.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/86.0.1/linux-x86_64/sq/firefox-86.0.1.tar.bz2";
locale = "sq";
arch = "linux-x86_64";
- sha256 = "daac917a1e105b7871a0361db364558251b931898e08c36515c64269c760d6b4";
+ sha256 = "6c8eb230a6de1b5056e530bd76ef0d6f6f35ee29a9d814440c6c2a32460b2de1";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/86.0/linux-x86_64/sr/firefox-86.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/86.0.1/linux-x86_64/sr/firefox-86.0.1.tar.bz2";
locale = "sr";
arch = "linux-x86_64";
- sha256 = "c1993cabde0e7df92e45101bd62cd14a86d023763c48c18a7e00018dcfea282f";
+ sha256 = "a7b82f4383608dae512dd528068d9b4b2d4ca194f118098b328fd1b817bed14c";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/86.0/linux-x86_64/sv-SE/firefox-86.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/86.0.1/linux-x86_64/sv-SE/firefox-86.0.1.tar.bz2";
locale = "sv-SE";
arch = "linux-x86_64";
- sha256 = "eb04be61ab3d029437f57dedbf1b66d0bfc6c0a9b29e41fe4fb7aec7b5ab47b0";
+ sha256 = "dd856d068f32271ad024649c945ea4665faabf81a4057a8c7efe4f1cce302eb2";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/86.0/linux-x86_64/ta/firefox-86.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/86.0.1/linux-x86_64/ta/firefox-86.0.1.tar.bz2";
locale = "ta";
arch = "linux-x86_64";
- sha256 = "fbd105183afb74dc7887dfe5cc0e518e96cb8bf79c53fc502d154bbaededacd7";
+ sha256 = "9cb7ec3e3150a3594ae1a460b70d81ce1ddb9fe42696710a0e7eb1baf7c5aa17";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/86.0/linux-x86_64/te/firefox-86.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/86.0.1/linux-x86_64/te/firefox-86.0.1.tar.bz2";
locale = "te";
arch = "linux-x86_64";
- sha256 = "e049b79ce8a81749caa83d6b42ae710414fe08ae2f28a2c1af7c7d47f83b24e0";
+ sha256 = "a3960a97ab3a7a28fe8c218457fe36a5f72827d602ebced3ff74d02f9941100a";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/86.0/linux-x86_64/th/firefox-86.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/86.0.1/linux-x86_64/th/firefox-86.0.1.tar.bz2";
locale = "th";
arch = "linux-x86_64";
- sha256 = "2b3ca062e1e53d5fca726e5c5a9eb7a3a639e4f6e7f5b455bf33e305eda475cc";
+ sha256 = "c342893afcc7b68ba09c8875a55bec4ef2a8c5af40c0ae96a13a662eb0d73115";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/86.0/linux-x86_64/tl/firefox-86.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/86.0.1/linux-x86_64/tl/firefox-86.0.1.tar.bz2";
locale = "tl";
arch = "linux-x86_64";
- sha256 = "0fce4ea1fc379ab87c0f565c12f8ee16205108048d7fe89d7850802653247c16";
+ sha256 = "3b0de00b254c2d984bbece1d3ca3acaffdc316a44d7270f4cff4c35425310913";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/86.0/linux-x86_64/tr/firefox-86.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/86.0.1/linux-x86_64/tr/firefox-86.0.1.tar.bz2";
locale = "tr";
arch = "linux-x86_64";
- sha256 = "e0a1c0a5d31225fb6af2b5b2c4d7386dc10d9c5c56081c1282615cc8d5da51ba";
+ sha256 = "db36a0260fe69a99d3c834e526a6bdd305334490dd3e644dbd8a48606487209e";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/86.0/linux-x86_64/trs/firefox-86.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/86.0.1/linux-x86_64/trs/firefox-86.0.1.tar.bz2";
locale = "trs";
arch = "linux-x86_64";
- sha256 = "129d9b5d54cc807664a27fba1fd4f003430bdccf0385cbb53ea77517ce30879f";
+ sha256 = "94bc2723028e39d161bb7e95a27e9ce935671c80646674aecc871205a6c602ae";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/86.0/linux-x86_64/uk/firefox-86.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/86.0.1/linux-x86_64/uk/firefox-86.0.1.tar.bz2";
locale = "uk";
arch = "linux-x86_64";
- sha256 = "d50f3c3f21af6c805bc8c86f886af9f1be2b2d5cb5ad061a000633fa9b7e2641";
+ sha256 = "7ad9a53018e54fcdb860cacc5fad9eb34a08e879ab69d47af21eb31f3d6c2803";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/86.0/linux-x86_64/ur/firefox-86.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/86.0.1/linux-x86_64/ur/firefox-86.0.1.tar.bz2";
locale = "ur";
arch = "linux-x86_64";
- sha256 = "ac9240e7896f695f48526ad275d887ddef7eb98aa3dd94800a1b4da081110876";
+ sha256 = "6d333e34bb8a332efbff91b9f7d69092b69e377c324693b765eb48b49a7ba108";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/86.0/linux-x86_64/uz/firefox-86.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/86.0.1/linux-x86_64/uz/firefox-86.0.1.tar.bz2";
locale = "uz";
arch = "linux-x86_64";
- sha256 = "94bd2d3f2f95e32381f6b945f4b1149f355dffcc27ec829fd0849ec4895a6da7";
+ sha256 = "5d111ce8b55637ab03c94fef0ed2e5737bbeee4f80a1ca4ff1847c2e9133c31d";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/86.0/linux-x86_64/vi/firefox-86.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/86.0.1/linux-x86_64/vi/firefox-86.0.1.tar.bz2";
locale = "vi";
arch = "linux-x86_64";
- sha256 = "e7c8034074e6d1f8f6987321e24dffdbe8acfa11d6784b8c8d033e690a5ed145";
+ sha256 = "7fafefae0afc2142a01d7304cfeda60ce1f6302c29abe2d906391dcafea0f25a";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/86.0/linux-x86_64/xh/firefox-86.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/86.0.1/linux-x86_64/xh/firefox-86.0.1.tar.bz2";
locale = "xh";
arch = "linux-x86_64";
- sha256 = "b8f0f3ee8aeeec6fdac5ee15cf688735809994c71cbe4f01b238a3cc1386006a";
+ sha256 = "0d177c264ec9b357be2e616fb02958b4c9d7c6baf292f3c76bbeae84fd2202bf";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/86.0/linux-x86_64/zh-CN/firefox-86.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/86.0.1/linux-x86_64/zh-CN/firefox-86.0.1.tar.bz2";
locale = "zh-CN";
arch = "linux-x86_64";
- sha256 = "47b4f3411306839882f5755b3eb2038f9c7bfd1c2ae72927db54c4816c97217d";
+ sha256 = "2203d75b4a62bfe3cbb51c02665420700ea00686b7b9d4002b9a9a6ddca13f36";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/86.0/linux-x86_64/zh-TW/firefox-86.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/86.0.1/linux-x86_64/zh-TW/firefox-86.0.1.tar.bz2";
locale = "zh-TW";
arch = "linux-x86_64";
- sha256 = "5fb11410c30a813fd0db58c928fb07c488405776308eacf64b238daa0fbffbc1";
+ sha256 = "7d19a8791c79c0bd9fa03ea568f896221cf6432c826f4a59f99ec78139966817";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/86.0/linux-i686/ach/firefox-86.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/86.0.1/linux-i686/ach/firefox-86.0.1.tar.bz2";
locale = "ach";
arch = "linux-i686";
- sha256 = "06d2dbe0f799d22e98b715528b54566b167a22db4d16d3ad60d84a6e6a8b9e5e";
+ sha256 = "caa9485d62e682e5b06e39528857975d1c862ef23e62c9f4147c5db4027c867f";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/86.0/linux-i686/af/firefox-86.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/86.0.1/linux-i686/af/firefox-86.0.1.tar.bz2";
locale = "af";
arch = "linux-i686";
- sha256 = "536fdd221aa5f872cc8028f39fcfa7b9eecfe09a215da3d50fbfa9e256a1394d";
+ sha256 = "ea114ce9ca7f2c4e5675d25224ffaf7805ec9361097ff47649bd4371937032f7";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/86.0/linux-i686/an/firefox-86.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/86.0.1/linux-i686/an/firefox-86.0.1.tar.bz2";
locale = "an";
arch = "linux-i686";
- sha256 = "ba6eff6a355361862fc78879264965f5f1c0adebefe934d1b6d51994023d3bc4";
+ sha256 = "c022590875868195664c4920a3da7bec6bf9942a233190176827d603529a74f1";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/86.0/linux-i686/ar/firefox-86.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/86.0.1/linux-i686/ar/firefox-86.0.1.tar.bz2";
locale = "ar";
arch = "linux-i686";
- sha256 = "0b465097dcfd4f2a50eba984b0bb30fedceb1a409e2a98f22c45709cdd1117ae";
+ sha256 = "66ac4afbde7ed45e1d0239e3364c62f788ac26c8bd652b5c571a9f965ae632ce";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/86.0/linux-i686/ast/firefox-86.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/86.0.1/linux-i686/ast/firefox-86.0.1.tar.bz2";
locale = "ast";
arch = "linux-i686";
- sha256 = "614241f31f38a71782faf76f0a31cd81d2520523ff85d8a5dfee32a77e48829b";
+ sha256 = "3962d9728bc8a0fde06ab64d6da1f40328938db7689db7b402919191c5286f3e";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/86.0/linux-i686/az/firefox-86.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/86.0.1/linux-i686/az/firefox-86.0.1.tar.bz2";
locale = "az";
arch = "linux-i686";
- sha256 = "4fd682f83c0eee3031c6e452d1c7cde3e54d0e52bb8316b0e2224360665d4fc4";
+ sha256 = "84e786225936123aec5c0f2bb27df9dafcd1ceb2e50e8235749dbc081adfd4eb";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/86.0/linux-i686/be/firefox-86.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/86.0.1/linux-i686/be/firefox-86.0.1.tar.bz2";
locale = "be";
arch = "linux-i686";
- sha256 = "c15417c21f42212337bd921c869b05124a720c6d8730e4a16d30ddd9c10aca97";
+ sha256 = "0cfac785cbb8f0c179788dca2a54484473cdfd5e0618894665bbc70d4c2e36f5";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/86.0/linux-i686/bg/firefox-86.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/86.0.1/linux-i686/bg/firefox-86.0.1.tar.bz2";
locale = "bg";
arch = "linux-i686";
- sha256 = "fda51760d2dfa07d559673605120a34706f8a6546dc4e673dab55b71cbc501ec";
+ sha256 = "8c99908f307fa77fe6e92e58d26ea295471e6421181218fd0ca022c767e1f5f2";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/86.0/linux-i686/bn/firefox-86.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/86.0.1/linux-i686/bn/firefox-86.0.1.tar.bz2";
locale = "bn";
arch = "linux-i686";
- sha256 = "f61419c6dd7b20cbdc48cb0faf51cc831fa90f37a721a162bf32753d85a40aff";
+ sha256 = "28b303305691ea7f8228580135acde6c17d745719a96e82c60b8d6738fdf2bde";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/86.0/linux-i686/br/firefox-86.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/86.0.1/linux-i686/br/firefox-86.0.1.tar.bz2";
locale = "br";
arch = "linux-i686";
- sha256 = "7d60c5f6be2270e9b40612dfb1072ab5d29bd02d070f463f1df915f8d13873d3";
+ sha256 = "83a76a0e7dad03453178dbb3a792aab03500359b623851b9a6ec9a4c1e0af084";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/86.0/linux-i686/bs/firefox-86.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/86.0.1/linux-i686/bs/firefox-86.0.1.tar.bz2";
locale = "bs";
arch = "linux-i686";
- sha256 = "4707568c61df2d2050e3f1c18d3a2dee1c5bcfd091f32bd615f2e75ed06949fc";
+ sha256 = "0700c7d655136ac51134a6da9def1747a27d84ee21b523dfcc6f30042f9b8632";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/86.0/linux-i686/ca-valencia/firefox-86.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/86.0.1/linux-i686/ca-valencia/firefox-86.0.1.tar.bz2";
locale = "ca-valencia";
arch = "linux-i686";
- sha256 = "fe52cf8f5f531143ef28e728753610b442443de53f34a4a8d6318d5124a10caf";
+ sha256 = "d7738e186c6bd3f4a35c53bc6cf39876ad7774a45bbb3a44529c322f48a490b0";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/86.0/linux-i686/ca/firefox-86.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/86.0.1/linux-i686/ca/firefox-86.0.1.tar.bz2";
locale = "ca";
arch = "linux-i686";
- sha256 = "8e6baa8ac94878448f65598042d47b9789352fba55d4e4f91cbe319f9676780e";
+ sha256 = "ca63b150369c02a048ddbfaaa2f2faeb2729fb46086937c97a93d684975e2837";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/86.0/linux-i686/cak/firefox-86.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/86.0.1/linux-i686/cak/firefox-86.0.1.tar.bz2";
locale = "cak";
arch = "linux-i686";
- sha256 = "006a887bfaea07c40ee0f67ebccb1aa538f56e28f625cf2b085242c26ebe7bf0";
+ sha256 = "2a8a8ebe18dce87a021c71e87e2815b227b03e3251d141f044c083d7a4c942dd";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/86.0/linux-i686/cs/firefox-86.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/86.0.1/linux-i686/cs/firefox-86.0.1.tar.bz2";
locale = "cs";
arch = "linux-i686";
- sha256 = "27f1c5634e101d3681885a8d2d572b73f8c9db2215e4836a6cd71fbcd0a5b8dc";
+ sha256 = "5e60175642fa8260c4125b90412564fbd49b8f91ca204c30dc687108273184db";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/86.0/linux-i686/cy/firefox-86.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/86.0.1/linux-i686/cy/firefox-86.0.1.tar.bz2";
locale = "cy";
arch = "linux-i686";
- sha256 = "9e56e8f88baae2a4c99ae12041ed9c766dedc99b7ffd75bffbba92a7c19d98b9";
+ sha256 = "ee6e49cc30f01f5604cdb317801ced10c24809ed64f6505f44b6a33cb359641a";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/86.0/linux-i686/da/firefox-86.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/86.0.1/linux-i686/da/firefox-86.0.1.tar.bz2";
locale = "da";
arch = "linux-i686";
- sha256 = "eb317f12d74ac8b636c87dfe9c1cb0ce267a15ffeedb79956e1c15e971d1b7e4";
+ sha256 = "8c447626d889aa067bd758a56e4dce720f01192e283c7e01997c6f85f0265f89";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/86.0/linux-i686/de/firefox-86.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/86.0.1/linux-i686/de/firefox-86.0.1.tar.bz2";
locale = "de";
arch = "linux-i686";
- sha256 = "8a736a3a9c257f2b4509e3ec2f74259f655369159981cfedf8468de9cb1fb22a";
+ sha256 = "12d52ecbf5c4b9313c3e9cb61a353f812319142c6b20594f7fbee01a339d98ef";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/86.0/linux-i686/dsb/firefox-86.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/86.0.1/linux-i686/dsb/firefox-86.0.1.tar.bz2";
locale = "dsb";
arch = "linux-i686";
- sha256 = "a8fbd4dd6d1172f67744e9283efb6cb644421cb07e3568cae0d3c68c479d653b";
+ sha256 = "5064e20ca27adaf48d5c4041c12db3738c95b9143f667ddbc28230ef9387b28e";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/86.0/linux-i686/el/firefox-86.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/86.0.1/linux-i686/el/firefox-86.0.1.tar.bz2";
locale = "el";
arch = "linux-i686";
- sha256 = "59baec30ea1d8e30982f52279003b6e1be0148c02f38fdf283325c53ad900ee5";
+ sha256 = "a625d2caf3be1a5039a90c3515d1598b5acb87a4e4df4e0ea22f0a63b0405ae7";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/86.0/linux-i686/en-CA/firefox-86.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/86.0.1/linux-i686/en-CA/firefox-86.0.1.tar.bz2";
locale = "en-CA";
arch = "linux-i686";
- sha256 = "a4e0ea60acf339a61c19272170d2efdb4f519325bf2f71bcbf82af70ca304af0";
+ sha256 = "cc1c18c8d4d53495fc4236c95b353bbe40c3de16ded002b2bb991a824fc67210";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/86.0/linux-i686/en-GB/firefox-86.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/86.0.1/linux-i686/en-GB/firefox-86.0.1.tar.bz2";
locale = "en-GB";
arch = "linux-i686";
- sha256 = "6c82da02a7560977faad1ca3d4c3973d08583fc0ce75e1de6e5aee2c9d372b38";
+ sha256 = "c76f7607b28bfee12eebf2aae7590fea71ed2a4f3bb0ce3903f0331187640122";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/86.0/linux-i686/en-US/firefox-86.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/86.0.1/linux-i686/en-US/firefox-86.0.1.tar.bz2";
locale = "en-US";
arch = "linux-i686";
- sha256 = "eeec3b446c30c65d4af72d04d58c6d5ddb04c13e871a5351921a737f7e1cf234";
+ sha256 = "fe6bb788d3c5264943ae5a287cee691f6aea8b3502f11e386f6d723a08dc545f";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/86.0/linux-i686/eo/firefox-86.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/86.0.1/linux-i686/eo/firefox-86.0.1.tar.bz2";
locale = "eo";
arch = "linux-i686";
- sha256 = "4cbb1144cadfd901082829f8e67e311c51df96ecd08aa2082772421d6445f2fa";
+ sha256 = "39af3debe06726ddd02a4914bfecda2d023d9445e7c735e8974ad73f45955298";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/86.0/linux-i686/es-AR/firefox-86.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/86.0.1/linux-i686/es-AR/firefox-86.0.1.tar.bz2";
locale = "es-AR";
arch = "linux-i686";
- sha256 = "c875473caefc7e18a4f7a0a3e7d44ce659a2271fc1b21d435a70c921092b8af4";
+ sha256 = "2d66f2f28958157da1dfda56827f5330f6d7b9fb192899b2ad60ecd6d18e9505";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/86.0/linux-i686/es-CL/firefox-86.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/86.0.1/linux-i686/es-CL/firefox-86.0.1.tar.bz2";
locale = "es-CL";
arch = "linux-i686";
- sha256 = "d1bf9c2a1df028b5d6eca5b41c975afc6378701c6f33d888b46511da5ce5e498";
+ sha256 = "cb69afb6ac3b47721176934047ec9ab3b1127b7d36da7b9ae9af9aec72bb8289";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/86.0/linux-i686/es-ES/firefox-86.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/86.0.1/linux-i686/es-ES/firefox-86.0.1.tar.bz2";
locale = "es-ES";
arch = "linux-i686";
- sha256 = "5ee1967bc61259869441f61061fec2f24ee3a4179c64b245768387e94acafdce";
+ sha256 = "3c0ae2ce17078ef568ac71d5cf8ceb0769fdb8298ce17c58468cf57ab7a95af8";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/86.0/linux-i686/es-MX/firefox-86.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/86.0.1/linux-i686/es-MX/firefox-86.0.1.tar.bz2";
locale = "es-MX";
arch = "linux-i686";
- sha256 = "6b4669581f26a18fbd0bda8d605b9d22b3aa98eb193ea81f7ebce1db4d39a263";
+ sha256 = "cd07a75c8c96ac8d31cb988d9d394e5e2eb9bb6cfd6df33d6e60d38a6406a4a8";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/86.0/linux-i686/et/firefox-86.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/86.0.1/linux-i686/et/firefox-86.0.1.tar.bz2";
locale = "et";
arch = "linux-i686";
- sha256 = "0c41ec2c1df4cbd295d349a7b6ad7a7e974662319d4a1d458e9f6bd31c4830c0";
+ sha256 = "cced1ea2d54c9d305b61ff1d1025aaa5f23bfe86fca3b0e915f2dcde1384d042";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/86.0/linux-i686/eu/firefox-86.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/86.0.1/linux-i686/eu/firefox-86.0.1.tar.bz2";
locale = "eu";
arch = "linux-i686";
- sha256 = "e7bb380e013f5cf35edba5b698a5e3fafd7af63593c663e0029e2754f6854b4f";
+ sha256 = "9105eebe6f606292b82eda26eb68b399dd13e1756f1ca88395f0b7714089ea4a";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/86.0/linux-i686/fa/firefox-86.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/86.0.1/linux-i686/fa/firefox-86.0.1.tar.bz2";
locale = "fa";
arch = "linux-i686";
- sha256 = "d2601f3b84b31d9852a3f2ec35ae8b43f8640da18976f5f4c8a77cf7ad360a22";
+ sha256 = "9956fc5949d1e111265dfcd71373d8ada4cb2f554b9ffa2dbda0c430296ece56";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/86.0/linux-i686/ff/firefox-86.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/86.0.1/linux-i686/ff/firefox-86.0.1.tar.bz2";
locale = "ff";
arch = "linux-i686";
- sha256 = "a13ee0463fc23cff51f88072d527a6b758fd313276cc7e5f3c8a0c4c8d5f5404";
+ sha256 = "02a6a2f711db26b74094744e9f198ddc05a1188fef0fa330949e9e5056c7ffba";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/86.0/linux-i686/fi/firefox-86.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/86.0.1/linux-i686/fi/firefox-86.0.1.tar.bz2";
locale = "fi";
arch = "linux-i686";
- sha256 = "76a153c9e398eb259c69b30d15782b7d7a9ebd156283f1034c20182cd72e13f7";
+ sha256 = "368c2a59f1446d61a7a27892ddaaa5f933cbbcb9e3f238db5f9e9cb77873e37c";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/86.0/linux-i686/fr/firefox-86.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/86.0.1/linux-i686/fr/firefox-86.0.1.tar.bz2";
locale = "fr";
arch = "linux-i686";
- sha256 = "6f5d6e07251f75d6355f52558f2734d2788bb87e1e53ccfb800e03173094f765";
+ sha256 = "d543125a0e0402245064dc763eafcb3b00237c217a929b04f44db6755319ae2d";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/86.0/linux-i686/fy-NL/firefox-86.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/86.0.1/linux-i686/fy-NL/firefox-86.0.1.tar.bz2";
locale = "fy-NL";
arch = "linux-i686";
- sha256 = "785a30a785e55158c7251e623683350ed4840bb4b6f002d34cdee82d91b33d10";
+ sha256 = "ad28252c39eac70b9ce15631c65dfe520950d36212a547587978c635bf835187";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/86.0/linux-i686/ga-IE/firefox-86.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/86.0.1/linux-i686/ga-IE/firefox-86.0.1.tar.bz2";
locale = "ga-IE";
arch = "linux-i686";
- sha256 = "f32f8a0e5f0b5fd2a1dd147b32880605186a4b9435e39a53fc87f42eb8706979";
+ sha256 = "a16c0117757cadacc408f95a81e38b7f7e9489a4b6ceef30b8a65796fa6a2ca2";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/86.0/linux-i686/gd/firefox-86.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/86.0.1/linux-i686/gd/firefox-86.0.1.tar.bz2";
locale = "gd";
arch = "linux-i686";
- sha256 = "2893dd13353b3504a00e02f65f0b2a0a72dd43771148d45cca271aa752a0c520";
+ sha256 = "83b61f8e5801607f7b71fe2fa5fd7aede2cd56e4b46b25057935afb23f28ba01";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/86.0/linux-i686/gl/firefox-86.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/86.0.1/linux-i686/gl/firefox-86.0.1.tar.bz2";
locale = "gl";
arch = "linux-i686";
- sha256 = "b5bcf0eff53f6bda0e394be3e483c3f314d962a919473492a7d1005b6976b861";
+ sha256 = "a603031b44679e8e9dfa14c2094690c786b4ded18d736bb16d683e978346fefe";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/86.0/linux-i686/gn/firefox-86.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/86.0.1/linux-i686/gn/firefox-86.0.1.tar.bz2";
locale = "gn";
arch = "linux-i686";
- sha256 = "c979d766174b2e4df72de6a375084b509e879f11a13c1972c97b5ba0accb67d7";
+ sha256 = "5146bded3c264c6a77a9e4e9a1c5523e63858eed5077e8ded56d52b94fafa7fc";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/86.0/linux-i686/gu-IN/firefox-86.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/86.0.1/linux-i686/gu-IN/firefox-86.0.1.tar.bz2";
locale = "gu-IN";
arch = "linux-i686";
- sha256 = "0e053f93d56a8fd9c07bfef4e93f1f338f951f519be669f5ff18157ca4216025";
+ sha256 = "d177f05815889cd026879d6ddb3c03d3c62bb3b2787ca68a97902671977400e7";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/86.0/linux-i686/he/firefox-86.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/86.0.1/linux-i686/he/firefox-86.0.1.tar.bz2";
locale = "he";
arch = "linux-i686";
- sha256 = "05435889024f622f69d82a0007c19b50b1842f2cfa558748b39859a94a7addaf";
+ sha256 = "c3534b56a9fb43e959c8c6055f6af0c1ce9e512bee8786fa4a1028ba0813cd73";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/86.0/linux-i686/hi-IN/firefox-86.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/86.0.1/linux-i686/hi-IN/firefox-86.0.1.tar.bz2";
locale = "hi-IN";
arch = "linux-i686";
- sha256 = "7fb87408064c024305295c38938c42b34a0c627b177cacb00ed9e79a0ff974c8";
+ sha256 = "a4885b1515cee1352bd534de17742af432502169d8cf2f34426950a5482647cc";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/86.0/linux-i686/hr/firefox-86.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/86.0.1/linux-i686/hr/firefox-86.0.1.tar.bz2";
locale = "hr";
arch = "linux-i686";
- sha256 = "924141a867793aa4fb3d2b87b75c1d60cc39bb3a3591eaaf6ee3381fcf28fcc6";
+ sha256 = "1d9d49b4360efa296ec8b6750aaf8e09a24d749e3694d30dca446480b350a733";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/86.0/linux-i686/hsb/firefox-86.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/86.0.1/linux-i686/hsb/firefox-86.0.1.tar.bz2";
locale = "hsb";
arch = "linux-i686";
- sha256 = "7ce0f09c144462f9c94dc6805165543d12afbf0e44e327dae4554fecf272601e";
+ sha256 = "65b890ced9ffc672d92d8fe998ff4f5deb485f22ec4d1525525fac81ed30c2e6";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/86.0/linux-i686/hu/firefox-86.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/86.0.1/linux-i686/hu/firefox-86.0.1.tar.bz2";
locale = "hu";
arch = "linux-i686";
- sha256 = "8997e6d5620e0f565939cd8f127c4e86da0c46828c66fab7333073c3cbb8054e";
+ sha256 = "90e32c53ad910ecce1558c99f10514775b72efc207451e9c61127051c92fe450";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/86.0/linux-i686/hy-AM/firefox-86.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/86.0.1/linux-i686/hy-AM/firefox-86.0.1.tar.bz2";
locale = "hy-AM";
arch = "linux-i686";
- sha256 = "aeff6c4b8c7d164b63bf22808ea234236f893e6da2b3d9142f95d89e9ec7178e";
+ sha256 = "02c1dc969487809e432f4053b39b996ffcf51c81c7827146d3cd7a25ff050abf";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/86.0/linux-i686/ia/firefox-86.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/86.0.1/linux-i686/ia/firefox-86.0.1.tar.bz2";
locale = "ia";
arch = "linux-i686";
- sha256 = "0590e0469ac2e562325d786dcb68e2ca2111aa8ae1ff3717ef8db2259e6ec149";
+ sha256 = "81d027c3facbe67258151046d9aa53a7d832d1a120aa671532524c87b79efe80";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/86.0/linux-i686/id/firefox-86.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/86.0.1/linux-i686/id/firefox-86.0.1.tar.bz2";
locale = "id";
arch = "linux-i686";
- sha256 = "ef8dc62e52df3e6b1d37aea5f9b9a214a26e51ef9fd378f56ac8b2245de54613";
+ sha256 = "7a54acb6b8f14cac3d2a7e21fba5990dbaab9d4efef8d2a55642ff120905cbd9";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/86.0/linux-i686/is/firefox-86.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/86.0.1/linux-i686/is/firefox-86.0.1.tar.bz2";
locale = "is";
arch = "linux-i686";
- sha256 = "aeabfd51aa160ba259850b7fac88829f81bcc0dd8ccc9168c7add07ce0d4efc3";
+ sha256 = "c1611ebeceaf431883e5dd61b15aef2954007feaea3cc7503573216ba4cbcb0e";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/86.0/linux-i686/it/firefox-86.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/86.0.1/linux-i686/it/firefox-86.0.1.tar.bz2";
locale = "it";
arch = "linux-i686";
- sha256 = "c6069c0a86344af00150be03cb0f2c26984b713ad386352f5a10b39b79b13cac";
+ sha256 = "76042e19b820c69b1d7d39f3be87069142a4fb6c0327b8f67f78b87821454cc9";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/86.0/linux-i686/ja/firefox-86.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/86.0.1/linux-i686/ja/firefox-86.0.1.tar.bz2";
locale = "ja";
arch = "linux-i686";
- sha256 = "9be7b40e66723583b17657ea805919955dda703957ba21d541baa22390a1befe";
+ sha256 = "6e2d8fe15275935a02e3f07ebf14b61f657a35cdff262d50e3a0f10e3ff587be";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/86.0/linux-i686/ka/firefox-86.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/86.0.1/linux-i686/ka/firefox-86.0.1.tar.bz2";
locale = "ka";
arch = "linux-i686";
- sha256 = "2e8a57b44b3bec627793f46df84f7f25ab0aedd0f8b1f08202c75cc58d7e14c1";
+ sha256 = "93f59b3150795ee6a1d5cd446cd0147f5ccee359939fcecae63a262f28eea0ca";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/86.0/linux-i686/kab/firefox-86.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/86.0.1/linux-i686/kab/firefox-86.0.1.tar.bz2";
locale = "kab";
arch = "linux-i686";
- sha256 = "5777a6b5eb3055ab2c93f98bc597343f13bff7d0a846809d24c97e9ba1a0ca7d";
+ sha256 = "d71c30914f32b0f5f25c1492e94d0a397997f946f1ff58c85997d9c6c55ddd4e";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/86.0/linux-i686/kk/firefox-86.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/86.0.1/linux-i686/kk/firefox-86.0.1.tar.bz2";
locale = "kk";
arch = "linux-i686";
- sha256 = "84a8fbf2a859d81aae2aae6bc95f12a8e2982cff77090072a01d28daccbf21f9";
+ sha256 = "9c3b1b80d46c75526c5c9b53229e74aa7cb7219a3110218ecbd099e1d05037ac";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/86.0/linux-i686/km/firefox-86.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/86.0.1/linux-i686/km/firefox-86.0.1.tar.bz2";
locale = "km";
arch = "linux-i686";
- sha256 = "55982f15b467ddea6203fbcf98081496d0e313d3cd281f807d2bb75b4e79077e";
+ sha256 = "95b59cdaa6caeb5cfbcfc673faed614650dbd44458c79684ca7f2ee4ef678e4f";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/86.0/linux-i686/kn/firefox-86.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/86.0.1/linux-i686/kn/firefox-86.0.1.tar.bz2";
locale = "kn";
arch = "linux-i686";
- sha256 = "18aedab4f324448da412ddebd1da9b01be51edcd5052c9455672a763ae1f673b";
+ sha256 = "31d79f5609140fb213e19b60d638811ef576bb3db8be533aa92a02ffd22d4df5";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/86.0/linux-i686/ko/firefox-86.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/86.0.1/linux-i686/ko/firefox-86.0.1.tar.bz2";
locale = "ko";
arch = "linux-i686";
- sha256 = "5baa361fb97a76d12bfbf5b87c092cbe8079d34dd08842dae9def133383f587a";
+ sha256 = "f05215e9004a651b239475bf02de19709fb2ceacd99f0da22ba4ae91dfd899f6";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/86.0/linux-i686/lij/firefox-86.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/86.0.1/linux-i686/lij/firefox-86.0.1.tar.bz2";
locale = "lij";
arch = "linux-i686";
- sha256 = "35bf3aeba596135231b1ddff2e2550ab2a3e0c5bc796d7b628c5f78ac46ce40f";
+ sha256 = "309ce372ace38efc2cd907df32d18fad97e8fe66728c52efcbc36a36e91163f4";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/86.0/linux-i686/lt/firefox-86.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/86.0.1/linux-i686/lt/firefox-86.0.1.tar.bz2";
locale = "lt";
arch = "linux-i686";
- sha256 = "eedf7ba2cf4634ab18c2f2926266845a29c9bce8ba747554d413b276445b9eb1";
+ sha256 = "1426fae07194ec4dde7fd797631cbb561726af5b1c255b72c13a96b54034a440";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/86.0/linux-i686/lv/firefox-86.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/86.0.1/linux-i686/lv/firefox-86.0.1.tar.bz2";
locale = "lv";
arch = "linux-i686";
- sha256 = "a1c5f04c16f6d50a0797e466d6a8836de40219567f04928cda7f64d967d8afa7";
+ sha256 = "48be4205b0d9ba8de2545a73950a4c2836db3d046707ae5db7e2cba0dadaa3a5";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/86.0/linux-i686/mk/firefox-86.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/86.0.1/linux-i686/mk/firefox-86.0.1.tar.bz2";
locale = "mk";
arch = "linux-i686";
- sha256 = "8de29502640b51ac9f586ae7713903612911cf01cd7aecb6d74175a816cce6a3";
+ sha256 = "6cc5019e2d41510a67cec8850451fa16e868da753dceb8a38a0cec893814f07a";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/86.0/linux-i686/mr/firefox-86.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/86.0.1/linux-i686/mr/firefox-86.0.1.tar.bz2";
locale = "mr";
arch = "linux-i686";
- sha256 = "f4cb4ddcac3b5ede422e54c69c05902506be788b45a79cfee6e21a0b7b8c3ca5";
+ sha256 = "ba73c1ceac1ad36912f6367a23bcdc4455627d16f2bb589cde4abb5304b06d67";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/86.0/linux-i686/ms/firefox-86.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/86.0.1/linux-i686/ms/firefox-86.0.1.tar.bz2";
locale = "ms";
arch = "linux-i686";
- sha256 = "aa09b472e21b453f6875e25dc7922ca062934527a306f3b338cd32636076c021";
+ sha256 = "09935a83eb75eb9f89847d9b279c5728c524bef37d063969ec3e44346ef74c12";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/86.0/linux-i686/my/firefox-86.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/86.0.1/linux-i686/my/firefox-86.0.1.tar.bz2";
locale = "my";
arch = "linux-i686";
- sha256 = "4a4ad99aac0614aa25fd77c4c740c49f509db2333c37f797018362b15f38d1d4";
+ sha256 = "55b7adcbe1bb47dc49e1d51d99fa3b3a9aa3028a56fe2c53848ec9591503360a";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/86.0/linux-i686/nb-NO/firefox-86.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/86.0.1/linux-i686/nb-NO/firefox-86.0.1.tar.bz2";
locale = "nb-NO";
arch = "linux-i686";
- sha256 = "45814c2d731cd8435a92c31e9311c333d4357dc38e9196fbc24358289004df8b";
+ sha256 = "87e7f1d1ecb402f9484e40078a3460b18aa41d88f0bedf61edeb937474ab3e69";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/86.0/linux-i686/ne-NP/firefox-86.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/86.0.1/linux-i686/ne-NP/firefox-86.0.1.tar.bz2";
locale = "ne-NP";
arch = "linux-i686";
- sha256 = "008ecc3d7bf7932a320b6ec12404a5259032930539a65e60f8aa2f98f9018524";
+ sha256 = "0c5e84344df03c41ab835c3af847772d13fe48d3395fc2aeef020eab04f76baa";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/86.0/linux-i686/nl/firefox-86.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/86.0.1/linux-i686/nl/firefox-86.0.1.tar.bz2";
locale = "nl";
arch = "linux-i686";
- sha256 = "0202adc844602502b48d078a665b1e9012c65172deda406ac9db972e05456fc7";
+ sha256 = "75f54fc189ee6f43277066a2600bd340375fa5820e64dc340a3ac93a1f0a6ea0";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/86.0/linux-i686/nn-NO/firefox-86.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/86.0.1/linux-i686/nn-NO/firefox-86.0.1.tar.bz2";
locale = "nn-NO";
arch = "linux-i686";
- sha256 = "28f34c957628178a112ad6a7c16d9dd20e58bc3a9068fb1e59ef5e656ac8f02f";
+ sha256 = "e1dd0adfc33ac73890d849c685d3072a8bfbe6ad3b5ad0bcfa0a04c9ec817c1c";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/86.0/linux-i686/oc/firefox-86.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/86.0.1/linux-i686/oc/firefox-86.0.1.tar.bz2";
locale = "oc";
arch = "linux-i686";
- sha256 = "4645cc6de115ff73444dfa4165a82b3ba1b0adbe3c4eff6fd854c9ec594a7bbb";
+ sha256 = "2eea8f40976373fa98d7d32c016dbf0e05fb8f53f3c0f038a087220ea91999a6";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/86.0/linux-i686/pa-IN/firefox-86.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/86.0.1/linux-i686/pa-IN/firefox-86.0.1.tar.bz2";
locale = "pa-IN";
arch = "linux-i686";
- sha256 = "3fbe8e5c7b4fb420a6a6c62475bd01fead342d7431578b96f391a829cf184be4";
+ sha256 = "03c1dface09201be51bd8df92a420b67ce885a712231754dec5e42a4e5cb8cd8";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/86.0/linux-i686/pl/firefox-86.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/86.0.1/linux-i686/pl/firefox-86.0.1.tar.bz2";
locale = "pl";
arch = "linux-i686";
- sha256 = "6850d14c02c152fb6252b08a111ff6bccbaee6a6ff76a99c018b497a8a014ab0";
+ sha256 = "1d4fad5713d1b6606551aa9b9527c4919e548fc9fb50b921404609dd7a43c76f";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/86.0/linux-i686/pt-BR/firefox-86.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/86.0.1/linux-i686/pt-BR/firefox-86.0.1.tar.bz2";
locale = "pt-BR";
arch = "linux-i686";
- sha256 = "a0aac09a39302df30a48c54e64ae422166eb781ef349dbc58927e077310fae5f";
+ sha256 = "53defe8219ee88152a542e24526a3bb9d75e0117e606a3e976d798f441acd64e";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/86.0/linux-i686/pt-PT/firefox-86.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/86.0.1/linux-i686/pt-PT/firefox-86.0.1.tar.bz2";
locale = "pt-PT";
arch = "linux-i686";
- sha256 = "e577444bd6ef376b0277cc2181bf50bc1ac3e377bed171f30616f536fa2d516b";
+ sha256 = "d91483eca2e1972ce6a0ac97b0393a9cf28a36eb1e923cd863d37b8fc66f4edd";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/86.0/linux-i686/rm/firefox-86.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/86.0.1/linux-i686/rm/firefox-86.0.1.tar.bz2";
locale = "rm";
arch = "linux-i686";
- sha256 = "2a4f5f35caa3ec5b9f20c1160dd038ce3d689593650771c3e63246cc53b23cfe";
+ sha256 = "926234371843aae60cc81886ab7ebaca7bceb6f705ab9d2560ddf996e46f6aa3";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/86.0/linux-i686/ro/firefox-86.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/86.0.1/linux-i686/ro/firefox-86.0.1.tar.bz2";
locale = "ro";
arch = "linux-i686";
- sha256 = "c68f195f10bcd7d19aa76084450419008068ee5d30c34acc02d7621ea250211a";
+ sha256 = "9c63bcf8b603b65f355460d0de6827e363ec0797bddb9d446e116b641a5f430e";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/86.0/linux-i686/ru/firefox-86.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/86.0.1/linux-i686/ru/firefox-86.0.1.tar.bz2";
locale = "ru";
arch = "linux-i686";
- sha256 = "e6e7dcc74dac1c331d3202a141df71dbe2e5a398e2b97c9da1358707823d76b4";
+ sha256 = "f4cb8e70dd3c0b2bb97b28c6f85654786f65daf6705559a3dba87a5aa4f0ae18";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/86.0/linux-i686/si/firefox-86.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/86.0.1/linux-i686/si/firefox-86.0.1.tar.bz2";
locale = "si";
arch = "linux-i686";
- sha256 = "1bf321805bd46e0214568921b89eaf5ea4d394e43fb1d475ee61c7de8439d997";
+ sha256 = "b305cfa2be37591ae0bf49de8da37ffa3a5c69b242196073d84124dd02dd094e";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/86.0/linux-i686/sk/firefox-86.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/86.0.1/linux-i686/sk/firefox-86.0.1.tar.bz2";
locale = "sk";
arch = "linux-i686";
- sha256 = "221667dd6eead982d13e911e0ee9d6fb0e6288d689c59c7adc403e8eeab6fd4f";
+ sha256 = "23772e40241f955d20a1579f283c6d648e180ae7da21ef0a914156733f89e6a6";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/86.0/linux-i686/sl/firefox-86.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/86.0.1/linux-i686/sl/firefox-86.0.1.tar.bz2";
locale = "sl";
arch = "linux-i686";
- sha256 = "5df6f40394d0c2561c5103cb0600d3566b2bf42dca4d6a3194bee725577f1dad";
+ sha256 = "7213f902b853bbce4594db2f5555e437a82adaeb506a9d1421ff9015d29a9659";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/86.0/linux-i686/son/firefox-86.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/86.0.1/linux-i686/son/firefox-86.0.1.tar.bz2";
locale = "son";
arch = "linux-i686";
- sha256 = "8ce2f3d67ea7e1889fce2f534e90320403350b27bd63e97263a9c14544d7f212";
+ sha256 = "7b45520bd7305b28803bd4e2f22d41216707754ef46cf6981f0c299b03efeedc";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/86.0/linux-i686/sq/firefox-86.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/86.0.1/linux-i686/sq/firefox-86.0.1.tar.bz2";
locale = "sq";
arch = "linux-i686";
- sha256 = "a4f403eefa8da37d7308bda7a10cf62dbe9ff74f848e9e3603d9b787c1629b05";
+ sha256 = "11b0b971a705d483f3dd7fab066d034f0a30dd95e16bb7d7aece44d8ccabf450";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/86.0/linux-i686/sr/firefox-86.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/86.0.1/linux-i686/sr/firefox-86.0.1.tar.bz2";
locale = "sr";
arch = "linux-i686";
- sha256 = "7f3d5fb8cb77c2405403f9899257d41f4e9fcdb45a1af945e337228d7648f79d";
+ sha256 = "07369958e98d1959be2e52b33145ed1075dd85220de38fcaf617d207217a0066";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/86.0/linux-i686/sv-SE/firefox-86.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/86.0.1/linux-i686/sv-SE/firefox-86.0.1.tar.bz2";
locale = "sv-SE";
arch = "linux-i686";
- sha256 = "261886fc3f3c9c40123a6b6ae0040fffb281d90cbc34506f85bcd73cb94276f2";
+ sha256 = "7671a24d1b81b26c34a21cedea05b6c132963045d3cbc28ee264f9c56302cefd";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/86.0/linux-i686/ta/firefox-86.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/86.0.1/linux-i686/ta/firefox-86.0.1.tar.bz2";
locale = "ta";
arch = "linux-i686";
- sha256 = "3df7b4c5eb395b123d8c9a67d58e2eda268bd931394e38941545cded144b97e7";
+ sha256 = "bf605ceac99dfc2ed058ada9bb9fbd7ae56fdea3453d7dea23ca13dc284391bb";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/86.0/linux-i686/te/firefox-86.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/86.0.1/linux-i686/te/firefox-86.0.1.tar.bz2";
locale = "te";
arch = "linux-i686";
- sha256 = "b27fe9f6d6e4920e5714a74f439900238900e164cce584f1a1548a02105caa10";
+ sha256 = "8aea95f2069a59cbb575f386a7e90d04ecd0f4c4139aefc6dcba54b9b56e7aac";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/86.0/linux-i686/th/firefox-86.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/86.0.1/linux-i686/th/firefox-86.0.1.tar.bz2";
locale = "th";
arch = "linux-i686";
- sha256 = "e4eadb2885d09a082c40e27eb41e5a8f721ddd45ef79ed0ccba02f18d7fc3d6a";
+ sha256 = "4985ee399155bd0854c9b9068fa747f396855b1251610c3261fc5c7da5e5894c";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/86.0/linux-i686/tl/firefox-86.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/86.0.1/linux-i686/tl/firefox-86.0.1.tar.bz2";
locale = "tl";
arch = "linux-i686";
- sha256 = "392368f316cf89668e2ff9a42e0b170b55bfc610c84b0a605866914a39273fce";
+ sha256 = "d328338029e0282ca5e3c7e0bcff73faddfbb4bdcb47a2978622c80e2dd8d0b3";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/86.0/linux-i686/tr/firefox-86.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/86.0.1/linux-i686/tr/firefox-86.0.1.tar.bz2";
locale = "tr";
arch = "linux-i686";
- sha256 = "e9c7f55b656860dc6d2b28fcca66dbc6e7290d2f418da238ca06ccfe68fdd579";
+ sha256 = "a438f5504b0fb62173a8a739645e7f269647e33316a35a96c5dce71d9d87bb0a";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/86.0/linux-i686/trs/firefox-86.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/86.0.1/linux-i686/trs/firefox-86.0.1.tar.bz2";
locale = "trs";
arch = "linux-i686";
- sha256 = "9cd24da9a1dbc0665b589ea8d1f5e5a3546a8b7babbd0f9f2f27641d5c81eeaf";
+ sha256 = "41c90f6a5de249fc5b0dcec21d5d2684b5d3be2767d6073529101f31bec569a5";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/86.0/linux-i686/uk/firefox-86.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/86.0.1/linux-i686/uk/firefox-86.0.1.tar.bz2";
locale = "uk";
arch = "linux-i686";
- sha256 = "0bbd4c03dd422901bf2ff1a6e000ec4c6ed798bfa66ade8db03551f5509efc40";
+ sha256 = "06419fe5e671a6476500a8ecfe736237adbafdb39148d56d514fc7f07ff09e87";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/86.0/linux-i686/ur/firefox-86.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/86.0.1/linux-i686/ur/firefox-86.0.1.tar.bz2";
locale = "ur";
arch = "linux-i686";
- sha256 = "c0f807c2c7365f281d921fd347a173ce2538fce79b1e74beedf928f392422236";
+ sha256 = "f5c1729584fc7843da5febf2411196d4615d4d5b490dc9a0f7b0709496b61ad0";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/86.0/linux-i686/uz/firefox-86.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/86.0.1/linux-i686/uz/firefox-86.0.1.tar.bz2";
locale = "uz";
arch = "linux-i686";
- sha256 = "f561501fdf1a0edf9f58289fe608b9d47c00ef666c7f980972f0f3112470ad27";
+ sha256 = "a1a898dae70288fac86c0ff36b92731e7b3400652b5bef485db73cd8ed933e8b";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/86.0/linux-i686/vi/firefox-86.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/86.0.1/linux-i686/vi/firefox-86.0.1.tar.bz2";
locale = "vi";
arch = "linux-i686";
- sha256 = "12ce7eae83ef3100039871e82784ba7a63742ef8f132c48ceccac22641074c1e";
+ sha256 = "7c12e8fe3b30ae8b8bb106a3ce866b23dcdcdb7924ca41e8c9b3d541e0300963";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/86.0/linux-i686/xh/firefox-86.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/86.0.1/linux-i686/xh/firefox-86.0.1.tar.bz2";
locale = "xh";
arch = "linux-i686";
- sha256 = "9def9420b6e6e252839268167e978cc357add46e54e77a0f5bf8e03a2183a855";
+ sha256 = "97f40f99c9d0204db12d1da1e58088dac2fcd02be6f4fd5c477d20f0149d1f56";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/86.0/linux-i686/zh-CN/firefox-86.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/86.0.1/linux-i686/zh-CN/firefox-86.0.1.tar.bz2";
locale = "zh-CN";
arch = "linux-i686";
- sha256 = "03cea12f34a9eb22e730d6b28f294bc2a1578e9c357a15bcf189ab1fb925e337";
+ sha256 = "309e7670632171133fef52c1426a1f42fb4e14c4d99a8f9543439b21105425f4";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/86.0/linux-i686/zh-TW/firefox-86.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/86.0.1/linux-i686/zh-TW/firefox-86.0.1.tar.bz2";
locale = "zh-TW";
arch = "linux-i686";
- sha256 = "cf5e5cdf7230bf231f63750b3747b625d64026194c29b36c3d00ff9851960745";
+ sha256 = "5993ffa86327a42ea91aa884e90bdb8626d4108a8299acb2f80623e8aaf3ed3e";
}
];
}
diff --git a/third_party/nixpkgs/pkgs/applications/networking/browsers/firefox/common.nix b/third_party/nixpkgs/pkgs/applications/networking/browsers/firefox/common.nix
index a42bfb502d..ad9a4618dc 100644
--- a/third_party/nixpkgs/pkgs/applications/networking/browsers/firefox/common.nix
+++ b/third_party/nixpkgs/pkgs/applications/networking/browsers/firefox/common.nix
@@ -161,7 +161,7 @@ buildStdenv.mkDerivation ({
xorg.libX11 xorg.libXrender xorg.libXft xorg.libXt file
xorg.pixman yasm libGLU libGL
xorg.xorgproto
- xorg.libXext unzip makeWrapper
+ xorg.libXext makeWrapper
libevent libstartup_notification /* cairo */
libpng jemalloc glib
nasm icu67 libvpx_1_8
@@ -222,6 +222,7 @@ buildStdenv.mkDerivation ({
rust-cbindgen
rustc
which
+ unzip
]
++ lib.optional gtk3Support wrapGAppsHook
++ lib.optionals buildStdenv.isDarwin [ xcbuild rsync ]
diff --git a/third_party/nixpkgs/pkgs/applications/networking/browsers/palemoon/default.nix b/third_party/nixpkgs/pkgs/applications/networking/browsers/palemoon/default.nix
index df672e5160..cf5f13fa74 100644
--- a/third_party/nixpkgs/pkgs/applications/networking/browsers/palemoon/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/networking/browsers/palemoon/default.nix
@@ -43,14 +43,14 @@ in stdenv.mkDerivation rec {
'';
nativeBuildInputs = [
- desktop-file-utils file gnum4 perl pkg-config python2 wget which wrapGAppsHook
+ desktop-file-utils file gnum4 perl pkg-config python2 wget which wrapGAppsHook unzip
];
buildInputs = [
alsaLib bzip2 cairo dbus dbus-glib ffmpeg fontconfig freetype
gnome2.GConf gtk2 hunspell libevent libjpeg libnotify
libstartup_notification libGLU libGL
- libpulseaudio unzip yasm zip zlib
+ libpulseaudio yasm zip zlib
]
++ (with xorg; [
libX11 libXext libXft libXi libXrender libXScrnSaver
diff --git a/third_party/nixpkgs/pkgs/applications/networking/browsers/vivaldi/widevine.nix b/third_party/nixpkgs/pkgs/applications/networking/browsers/vivaldi/widevine.nix
index 3b3a0a8589..81c95418e6 100644
--- a/third_party/nixpkgs/pkgs/applications/networking/browsers/vivaldi/widevine.nix
+++ b/third_party/nixpkgs/pkgs/applications/networking/browsers/vivaldi/widevine.nix
@@ -11,7 +11,7 @@ stdenv.mkDerivation rec {
sha256 = "0l743f2yyaq1vvc3iicajgnfpjxjsfvjcqvanndbxs23skgjcv6r";
};
- buildInputs = [ unzip ];
+ nativeBuildInputs = [ unzip ];
unpackPhase = ''
unzip $src
diff --git a/third_party/nixpkgs/pkgs/applications/networking/browsers/webbrowser/default.nix b/third_party/nixpkgs/pkgs/applications/networking/browsers/webbrowser/default.nix
index d9e997f514..327fc5f31e 100644
--- a/third_party/nixpkgs/pkgs/applications/networking/browsers/webbrowser/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/networking/browsers/webbrowser/default.nix
@@ -41,12 +41,12 @@ in stdenv.mkDerivation rec {
};
nativeBuildInputs = [
- gnum4 makeWrapper perl pkg-config python2
+ gnum4 makeWrapper perl pkg-config python2 unzip
];
buildInputs = [
alsaLib dbus dbus-glib ffmpeg fontconfig freetype yasm zip jack2 gtk2
- unzip gnome2.GConf xorg.libXt
+ gnome2.GConf xorg.libXt
];
enableParallelBuilding = true;
diff --git a/third_party/nixpkgs/pkgs/applications/networking/calls/default.nix b/third_party/nixpkgs/pkgs/applications/networking/calls/default.nix
index fcd27eceaa..8937404e91 100644
--- a/third_party/nixpkgs/pkgs/applications/networking/calls/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/networking/calls/default.nix
@@ -3,7 +3,6 @@
, fetchFromGitLab
, meson
, ninja
-, cmake
, pkg-config
, libhandy
, modemmanager
@@ -13,35 +12,46 @@
, feedbackd
, callaudiod
, evolution-data-server
+, glib
, folks
, desktop-file-utils
+, appstream-glib
, libpeas
, dbus
, vala
, wrapGAppsHook
, xvfb_run
+, gtk-doc
+, docbook-xsl-nons
+, docbook_xml_dtd_43
+, gobject-introspection
}:
stdenv.mkDerivation rec {
pname = "calls";
- version = "0.2.0";
+ version = "0.3.1";
src = fetchFromGitLab {
domain = "source.puri.sm";
owner = "Librem5";
repo = pname;
rev = "v${version}";
- sha256 = "1qmjdhnr95dawccw1ss8hc3lk0cypj86xg2amjq7avzn86ryd76l";
+ sha256 = "0igap5ynq269xqaky6fqhdg2dpsvxa008z953ywa4s5b5g5dk3dd";
};
+ outputs = [ "out" "devdoc" ];
+
nativeBuildInputs = [
meson
ninja
pkg-config
desktop-file-utils
+ appstream-glib
vala
- cmake
wrapGAppsHook
+ gtk-doc
+ docbook-xsl-nons
+ docbook_xml_dtd_43
];
buildInputs = [
@@ -62,10 +72,10 @@ stdenv.mkDerivation rec {
xvfb_run
];
+ NIX_CFLAGS_COMPILE = "-I${glib.dev}/include/gio-unix-2.0";
+
mesonFlags = [
- # docs fail to build
- # https://source.puri.sm/Librem5/calls/issues/99
- "-Dgtk_doc=false"
+ "-Dgtk_doc=true"
];
doCheck = true;
@@ -73,6 +83,7 @@ stdenv.mkDerivation rec {
checkPhase = ''
runHook preCheck
NO_AT_BRIDGE=1 \
+ XDG_DATA_DIRS=${folks}/share/gsettings-schemas/${folks.name} \
xvfb-run -s '-screen 0 800x600x24' dbus-run-session \
--config-file=${dbus.daemon}/share/dbus-1/session.conf \
meson test --print-errorlogs
diff --git a/third_party/nixpkgs/pkgs/applications/networking/cluster/fluxctl/default.nix b/third_party/nixpkgs/pkgs/applications/networking/cluster/fluxctl/default.nix
index e0ae7636f6..852088ec47 100644
--- a/third_party/nixpkgs/pkgs/applications/networking/cluster/fluxctl/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/networking/cluster/fluxctl/default.nix
@@ -2,16 +2,16 @@
buildGoModule rec {
pname = "fluxctl";
- version = "1.21.2";
+ version = "1.22.0";
src = fetchFromGitHub {
owner = "weaveworks";
repo = "flux";
rev = version;
- sha256 = "sha256-pI/LGAjTWFXiDKSV+dZl0wXK/TZmN9DuWf5Nu8EYNYc=";
+ sha256 = "sha256-7uS8704YZ7lQTSSnbVvc6T5iadl02TeVpwVPf2uS9L4=";
};
- vendorSha256 = "sha256-Q8gIhJSZqdjBXrIcJfCd25BniDScwVzUwZ9Vc8p/z3c=";
+ vendorSha256 = "sha256-oqfJaQA8ybh0UNWYJ2ukoWkwdgORwvXzRCquGstwA4M=";
nativeBuildInputs = [ installShellFiles ];
diff --git a/third_party/nixpkgs/pkgs/applications/networking/cluster/kubectl-doctor/default.nix b/third_party/nixpkgs/pkgs/applications/networking/cluster/kubectl-doctor/default.nix
new file mode 100644
index 0000000000..5d05690726
--- /dev/null
+++ b/third_party/nixpkgs/pkgs/applications/networking/cluster/kubectl-doctor/default.nix
@@ -0,0 +1,27 @@
+{ lib, buildGoModule, fetchFromGitHub }:
+
+buildGoModule rec {
+ pname = "kubectl-doctor";
+ version = "0.3.0";
+
+ src = fetchFromGitHub {
+ owner = "emirozer";
+ repo = pname;
+ rev = version;
+ sha256 = "0x784jbcwd34vzdnhg2yldh5ivkxvs2qlbsvaammbxkn04ch1ijz";
+ };
+
+ vendorSha256 = "04xq5kp1m7c98gb4fd0dni258vpfnhv535gl2qllfcp2mvk3mn55";
+
+ postInstall = ''
+ mv $out/bin/{cmd,kubectl-doctor}
+ '';
+
+ meta = with lib; {
+ description = "kubectl cluster triage plugin for k8s";
+ homepage = "https://github.com/emirozer/kubectl-doctor";
+ changelog = "https://github.com/emirozer/kubectl-doctor/releases/tag/v${version}";
+ license = licenses.asl20;
+ maintainers = [ maintainers.zimbatm ];
+ };
+}
diff --git a/third_party/nixpkgs/pkgs/applications/networking/cluster/lens/default.nix b/third_party/nixpkgs/pkgs/applications/networking/cluster/lens/default.nix
index 656badfe5a..6b303ce0f4 100644
--- a/third_party/nixpkgs/pkgs/applications/networking/cluster/lens/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/networking/cluster/lens/default.nix
@@ -2,12 +2,12 @@
let
pname = "lens";
- version = "3.6.7";
+ version = "4.1.4";
name = "${pname}-${version}";
src = fetchurl {
- url = "https://github.com/lensapp/lens/releases/download/v${version}/Lens-${version}.AppImage";
- sha256 = "0var7d31ab6lq2vq6brk2dnhlnhqjp2gdqhygif567cdmcpn4vz8";
+ url = "https://github.com/lensapp/lens/releases/download/v${version}/Lens-${version}.x86_64.AppImage";
+ sha256 = "0g7k3sld6m31qi0zc9z5gydi60waw7ykwz48qnyg77xz1cpm6z5x";
name="${pname}.AppImage";
};
diff --git a/third_party/nixpkgs/pkgs/applications/networking/cluster/nixops/shell.nix b/third_party/nixpkgs/pkgs/applications/networking/cluster/nixops/shell.nix
index 6d298b8df8..3fc06b0bc7 100644
--- a/third_party/nixpkgs/pkgs/applications/networking/cluster/nixops/shell.nix
+++ b/third_party/nixpkgs/pkgs/applications/networking/cluster/nixops/shell.nix
@@ -3,7 +3,7 @@
pkgs.mkShell {
buildInputs = [
pkgs.poetry2nix.cli
- pkgs.pkgconfig
+ pkgs.pkg-config
pkgs.libvirt
pkgs.poetry
];
diff --git a/third_party/nixpkgs/pkgs/applications/networking/cluster/terragrunt/default.nix b/third_party/nixpkgs/pkgs/applications/networking/cluster/terragrunt/default.nix
index f65bc86938..c7097f6868 100644
--- a/third_party/nixpkgs/pkgs/applications/networking/cluster/terragrunt/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/networking/cluster/terragrunt/default.nix
@@ -2,16 +2,16 @@
buildGoModule rec {
pname = "terragrunt";
- version = "0.28.12";
+ version = "0.28.15";
src = fetchFromGitHub {
owner = "gruntwork-io";
repo = pname;
rev = "v${version}";
- sha256 = "sha256-oHujPgnS76FYihzZV5ZzPP+4+77zNtYozH9jhqJJyVI=";
+ sha256 = "sha256-PhTFgYoSaGv54uak8QB7p963OBSgo9s1UM9/XBmYC8g=";
};
- vendorSha256 = "sha256-SVrDBDGK809O+RaE3gOa9U1agY6hSGI/k3FUCgm+5PA=";
+ vendorSha256 = "sha256-vHKqowc3euQQyvgfaTbIgSXOhPcf2nSoteQK0a574Kc=";
doCheck = false;
diff --git a/third_party/nixpkgs/pkgs/applications/networking/cluster/waypoint/default.nix b/third_party/nixpkgs/pkgs/applications/networking/cluster/waypoint/default.nix
index f28754005e..7675dc0de8 100644
--- a/third_party/nixpkgs/pkgs/applications/networking/cluster/waypoint/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/networking/cluster/waypoint/default.nix
@@ -2,17 +2,17 @@
buildGoModule rec {
pname = "waypoint";
- version = "0.2.3";
+ version = "0.2.4";
src = fetchFromGitHub {
owner = "hashicorp";
repo = pname;
rev = "v${version}";
- sha256 = "sha256-FTBBDKFUoyC+Xdm3+2QWXK57fLwitYrFP89OvAyHHVY=";
+ sha256 = "sha256-6sV2e/m0qVSRWgdvVZ9VxEL/J57nTcTClxHF5X8/8PQ=";
};
deleteVendor = true;
- vendorSha256 = "sha256-ihelAumTRgLALevJdVq3V3SISitiRPCQZUh2h5/eczA=";
+ vendorSha256 = "sha256-NPE3YHulqllWDGrxQgPmy/KKE7xFPOUorLQNIU8cP50=";
nativeBuildInputs = [ go-bindata ];
diff --git a/third_party/nixpkgs/pkgs/applications/networking/flexget/default.nix b/third_party/nixpkgs/pkgs/applications/networking/flexget/default.nix
index b58c30aee5..fd68dfc49f 100644
--- a/third_party/nixpkgs/pkgs/applications/networking/flexget/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/networking/flexget/default.nix
@@ -2,11 +2,11 @@
python3Packages.buildPythonApplication rec {
pname = "FlexGet";
- version = "3.1.103";
+ version = "3.1.106";
src = python3Packages.fetchPypi {
inherit pname version;
- sha256 = "da635a01ae7d15ba31b41081ab3e0214b8c5ab5e4662c381246495d7d1eba9be";
+ sha256 = "f0ff300a1762d701b77eb16142dcc13d9d099bbed695f1e950392c1d1bb988eb";
};
postPatch = ''
diff --git a/third_party/nixpkgs/pkgs/applications/networking/ftp/filezilla/default.nix b/third_party/nixpkgs/pkgs/applications/networking/ftp/filezilla/default.nix
index 877cdec4ca..b4c1e95087 100644
--- a/third_party/nixpkgs/pkgs/applications/networking/ftp/filezilla/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/networking/ftp/filezilla/default.nix
@@ -17,11 +17,11 @@
stdenv.mkDerivation rec {
pname = "filezilla";
- version = "3.51.0";
+ version = "3.52.2";
src = fetchurl {
url = "https://download.filezilla-project.org/client/FileZilla_${version}_src.tar.bz2";
- sha256 = "0k3c7gm16snc6dr9a3xgq14ajyqj4hxcrd6hk6jk5fsi9x51rgl2";
+ sha256 = "sha256-wHiIFpKKJuiGPH3CaxWGROcb7ylAbffS7aN9xIENbN8=";
};
# https://www.linuxquestions.org/questions/slackware-14/trouble-building-filezilla-3-47-2-1-current-4175671182/#post6099769
diff --git a/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/deltachat-electron/default.nix b/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/deltachat-electron/default.nix
index c579220cdd..396dec1cd0 100644
--- a/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/deltachat-electron/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/deltachat-electron/default.nix
@@ -2,12 +2,12 @@
let
pname = "deltachat-electron";
- version = "1.15.2";
+ version = "1.15.3";
name = "${pname}-${version}";
src = fetchurl {
url = "https://download.delta.chat/desktop/v${version}/DeltaChat-${version}.AppImage";
- sha256 = "sha256-iw2tU8qqXWbtEdLGlW8HNBHx8F2CgnCGCBUWpM407us=";
+ sha256 = "sha256-cYb0uruuWpNr1jF5WZ48quBZRIVXiHr99mLPLKMOX5M=";
};
appimageContents = appimageTools.extract { inherit name src; };
diff --git a/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/element/element-desktop-package.json b/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/element/element-desktop-package.json
index caf80c2460..19c499b319 100644
--- a/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/element/element-desktop-package.json
+++ b/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/element/element-desktop-package.json
@@ -2,7 +2,7 @@
"name": "element-desktop",
"productName": "Element",
"main": "src/electron-main.js",
- "version": "1.7.22",
+ "version": "1.7.23",
"description": "A feature-rich client for Matrix.org",
"author": "Element",
"repository": {
diff --git a/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/element/element-desktop.nix b/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/element/element-desktop.nix
index f147918cdc..30dffe0c16 100644
--- a/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/element/element-desktop.nix
+++ b/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/element/element-desktop.nix
@@ -8,12 +8,12 @@
let
executableName = "element-desktop";
- version = "1.7.22";
+ version = "1.7.23";
src = fetchFromGitHub {
owner = "vector-im";
repo = "element-desktop";
rev = "v${version}";
- sha256 = "152ggkkk997pg3xdcdzn3samv3vsb6qifgkyl82bnwchy8y3611d";
+ sha256 = "0vvjbh81h6sg6dbm9d6ffav0dim9sadvs67jcm702677qgigkc53";
};
in mkYarnPackage rec {
name = "element-desktop-${version}";
diff --git a/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/element/element-web.nix b/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/element/element-web.nix
index a75b02ef8a..be3c075db7 100644
--- a/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/element/element-web.nix
+++ b/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/element/element-web.nix
@@ -12,11 +12,11 @@ let
in stdenv.mkDerivation rec {
pname = "element-web";
- version = "1.7.22";
+ version = "1.7.23";
src = fetchurl {
url = "https://github.com/vector-im/element-web/releases/download/v${version}/element-v${version}.tar.gz";
- sha256 = "1aaa986h38kkrnyhb1y65d73idsxmkmi201511az9zlz9210ih59";
+ sha256 = "10n899gc3qcjy2cskk0whwz60pnvh500x1b57kn22l9bhkg9xkvp";
};
installPhase = ''
diff --git a/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/fractal/default.nix b/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/fractal/default.nix
index 9f5cd6f69b..ca6537fdfb 100644
--- a/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/fractal/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/fractal/default.nix
@@ -87,8 +87,9 @@ stdenv.mkDerivation rec {
meta = with lib; {
description = "Matrix group messaging app";
homepage = "https://gitlab.gnome.org/GNOME/fractal";
- license = licenses.gpl3Plus;
- broken = stdenv.isDarwin;
+ license = licenses.gpl3;
+ # couldn't read /build/source/build/podcasts-gtk/resources/resources.gresource: No such file or directory (os error 2)
+ broken = true;
maintainers = with maintainers; [ dtzWill worldofpeace ];
};
}
diff --git a/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/pidgin-plugins/carbons/default.nix b/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/pidgin-plugins/carbons/default.nix
index 46f8458f15..f702a667ae 100644
--- a/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/pidgin-plugins/carbons/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/pidgin-plugins/carbons/default.nix
@@ -2,13 +2,13 @@
stdenv.mkDerivation rec {
pname = "pidgin-carbons";
- version = "0.2.2";
+ version = "0.2.3";
src = fetchFromGitHub {
owner = "gkdr";
repo = "carbons";
rev = "v${version}";
- sha256 = "1aq9bwgpmbwrigq6ywf0pjkngqcm0qxncygaj1fi57npjhcjs6ln";
+ sha256 = "sha256-qiyIvmJbRmCrAi/93UxDVtO76nSdtzUVfT/sZGxxAh8=";
};
makeFlags = [ "PURPLE_PLUGIN_DIR=$(out)/lib/pidgin" ];
diff --git a/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/profanity/default.nix b/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/profanity/default.nix
index c373d23948..5aaed6eb21 100644
--- a/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/profanity/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/profanity/default.nix
@@ -4,7 +4,7 @@
, autoAwaySupport ? true, libXScrnSaver ? null, libX11 ? null
, notifySupport ? true, libnotify ? null, gdk-pixbuf ? null
-, traySupport ? true, gnome2 ? null
+, traySupport ? true, gtk2 ? null
, pgpSupport ? true, gpgme ? null
, pythonPluginSupport ? true, python ? null
, omemoSupport ? true, libsignal-protocol-c ? null, libgcrypt ? null
@@ -12,7 +12,7 @@
assert autoAwaySupport -> libXScrnSaver != null && libX11 != null;
assert notifySupport -> libnotify != null && gdk-pixbuf != null;
-assert traySupport -> gnome2 != null;
+assert traySupport -> gtk2 != null;
assert pgpSupport -> gpgme != null;
assert pythonPluginSupport -> python != null;
assert omemoSupport -> libsignal-protocol-c != null && libgcrypt != null;
@@ -45,7 +45,7 @@ stdenv.mkDerivation rec {
curl libmesode cmocka libmicrohttpd sqlite
] ++ optionals autoAwaySupport [ libXScrnSaver libX11 ]
++ optionals notifySupport [ libnotify gdk-pixbuf ]
- ++ optionals traySupport [ gnome2.gtk ]
+ ++ optionals traySupport [ gtk2 ]
++ optionals pgpSupport [ gpgme ]
++ optionals pythonPluginSupport [ python ]
++ optionals omemoSupport [ libsignal-protocol-c libgcrypt ];
diff --git a/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/stride/default.nix b/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/stride/default.nix
index 0ce5f76412..47027da9a9 100644
--- a/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/stride/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/stride/default.nix
@@ -1,5 +1,5 @@
{ lib, stdenv, fetchurl, dpkg, alsaLib, atk, cairo, cups, dbus, expat, fontconfig
-, freetype, gdk-pixbuf, glib, gnome2, nspr, nss, pango, udev, xorg }:
+, freetype, gdk-pixbuf, glib, gnome2, gtk2, nspr, nss, pango, udev, xorg }:
let
fullPath = lib.makeLibraryPath [
alsaLib
@@ -13,7 +13,7 @@ let
gdk-pixbuf
glib
gnome2.GConf
- gnome2.gtk
+ gtk2
nspr
nss
pango
diff --git a/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/teams/default.nix b/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/teams/default.nix
index 9e7a1f8154..aaa00e031d 100644
--- a/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/teams/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/teams/default.nix
@@ -82,6 +82,11 @@ stdenv.mkDerivation rec {
echo "Adding runtime dependencies to RPATH of Node module $mod"
patchelf --set-rpath "$runtime_rpath:$mod_rpath" "$mod"
done;
+
+ # fix for https://docs.microsoft.com/en-us/answers/questions/298724/open-teams-meeting-link-on-linux-doens39t-work.html?childToView=309406#comment-309406
+ # while we create the wrapper ourselves, gappsWrapperArgs leads to the same issue
+ # another option would be to introduce gappsWrapperAppendedArgs, to allow control of positioning
+ substituteInPlace "$out/bin/teams" --replace '.teams-wrapped" --disable-namespace-sandbox --disable-setuid-sandbox "$@"' '.teams-wrapped" "$@" --disable-namespace-sandbox --disable-setuid-sandbox'
'';
meta = with lib; {
diff --git a/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/torchat/default.nix b/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/torchat/default.nix
index 087dd50294..dfc2613d3e 100644
--- a/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/torchat/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/torchat/default.nix
@@ -9,7 +9,8 @@ stdenv.mkDerivation rec {
sha256 = "0rb4lvv40pz6ab5kxq40ycvh7kh1yxn7swzgv2ff2nbhi62xnzp0";
};
- buildInputs = [ python unzip wxPython wrapPython ];
+ nativeBuildInputs = [ unzip ];
+ buildInputs = [ python wxPython wrapPython ];
pythonPath = [ wxPython ];
preConfigure = "cd torchat/src; rm portable.txt";
diff --git a/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/vk-messenger/default.nix b/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/vk-messenger/default.nix
index d7deb7ee05..27312a18ec 100644
--- a/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/vk-messenger/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/vk-messenger/default.nix
@@ -1,54 +1,73 @@
-{ stdenv, lib, fetchurl, rpmextract, autoPatchelfHook
+{ stdenv, lib, fetchurl, rpmextract, undmg, autoPatchelfHook
, xorg, gtk3, gnome2, nss, alsaLib, udev, libnotify
, wrapGAppsHook }:
let
- version = "5.0.1";
-in stdenv.mkDerivation {
pname = "vk-messenger";
- inherit version;
+ version = "5.2.3";
+
src = {
i686-linux = fetchurl {
url = "https://desktop.userapi.com/rpm/master/vk-${version}.i686.rpm";
- sha256 = "1ji23x13lzbkiqfrrwx1pj6gmms0p58cjmjc0y4g16kqhlxl60v6";
+ sha256 = "09zi2rzsank6lhw1z9yar1rp634y6qskvr2i0rvqg2fij7cy6w19";
};
x86_64-linux = fetchurl {
url = "https://desktop.userapi.com/rpm/master/vk-${version}.x86_64.rpm";
- sha256 = "01vvmia2qrxvrvavk9hkkyvfg4pg15m01grwb28884vy4nqw400y";
+ sha256 = "1m6saanpv1k5wc5s58jpf0wsgjsj7haabx8nycm1fjyhky1chirb";
+ };
+ x86_64-darwin = fetchurl {
+ url = "https://web.archive.org/web/20210310071550/https://desktop.userapi.com/mac/master/vk.dmg";
+ sha256 = "0j5qsr0fyl55d0x46xm4h2ykwr4y9z1dsllhqx5lnc15nc051s9b";
};
}.${stdenv.system} or (throw "Unsupported system: ${stdenv.system}");
- nativeBuildInputs = [ rpmextract autoPatchelfHook wrapGAppsHook ];
- buildInputs = (with xorg; [
- libXdamage libXtst libXScrnSaver libxkbfile
- ]) ++ [
- gtk3 nss alsaLib
- ];
- runtimeDependencies = [ (lib.getLib udev) libnotify ];
-
- unpackPhase = ''
- rpmextract $src
- '';
-
- buildPhase = ''
- substituteInPlace usr/share/applications/vk.desktop \
- --replace /usr/share/pixmaps/vk.png vk
- '';
-
- installPhase = ''
- mkdir $out
- cd usr
- cp -r --parents bin $out
- cp -r --parents share/vk $out
- cp -r --parents share/applications $out
- cp -r --parents share/pixmaps $out
- '';
-
meta = with lib; {
description = "Simple and Convenient Messaging App for VK";
homepage = "https://vk.com/messenger";
license = licenses.unfree;
maintainers = [ maintainers.gnidorah ];
- platforms = ["i686-linux" "x86_64-linux"];
+ platforms = ["i686-linux" "x86_64-linux" "x86_64-darwin"];
};
-}
+
+ linux = stdenv.mkDerivation {
+ inherit pname version src meta;
+
+ nativeBuildInputs = [ rpmextract autoPatchelfHook wrapGAppsHook ];
+ buildInputs = (with xorg; [
+ libXdamage libXtst libXScrnSaver libxkbfile
+ ]) ++ [ gtk3 nss alsaLib ];
+
+ runtimeDependencies = [ (lib.getLib udev) libnotify ];
+
+ unpackPhase = ''
+ rpmextract $src
+ '';
+
+ buildPhase = ''
+ substituteInPlace usr/share/applications/vk.desktop \
+ --replace /usr/share/pixmaps/vk.png vk
+ '';
+
+ installPhase = ''
+ mkdir $out
+ cd usr
+ cp -r --parents bin $out
+ cp -r --parents share/vk $out
+ cp -r --parents share/applications $out
+ cp -r --parents share/pixmaps $out
+ '';
+ };
+
+ darwin = stdenv.mkDerivation {
+ inherit pname version src meta;
+
+ nativeBuildInputs = [ undmg ];
+
+ sourceRoot = ".";
+
+ installPhase = ''
+ mkdir -p $out/Applications
+ cp -r *.app $out/Applications
+ '';
+ };
+in if stdenv.isDarwin then darwin else linux
diff --git a/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/wire-desktop/default.nix b/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/wire-desktop/default.nix
index 09a5d781c4..1abedf5802 100644
--- a/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/wire-desktop/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/wire-desktop/default.nix
@@ -22,13 +22,13 @@ let
pname = "wire-desktop";
version = {
- x86_64-darwin = "3.21.3959";
- x86_64-linux = "3.22.2937";
+ x86_64-darwin = "3.23.4046";
+ x86_64-linux = "3.23.2938";
}.${system} or throwSystem;
sha256 = {
- x86_64-darwin = "0fgzzqf1wnkjbcr0j0vjn6sggkz0z1kx6w4gi7gk4c4markdicm1";
- x86_64-linux = "1pl2dsrgckkd8mm0cpxrz8i8rn4jfx7b9lvdyc8392sbq4chjcb7";
+ x86_64-darwin = "19k8102chh4yphk89kiz83yarawnzdnsq0hbsqpjdhbmarqjcd9s";
+ x86_64-linux = "1cx5azl5dvya1hf0gayafm4rg6ccmmq978xsgm6lf0rlb4kirj65";
}.${system} or throwSystem;
meta = with lib; {
diff --git a/third_party/nixpkgs/pkgs/applications/networking/irc/convos/default.nix b/third_party/nixpkgs/pkgs/applications/networking/irc/convos/default.nix
index 9a42d0aa99..4bbc1589ed 100644
--- a/third_party/nixpkgs/pkgs/applications/networking/irc/convos/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/networking/irc/convos/default.nix
@@ -6,13 +6,13 @@ with lib;
perlPackages.buildPerlPackage rec {
pname = "convos";
- version = "5.11";
+ version = "6.06";
src = fetchFromGitHub {
- owner = "Nordaaker";
+ owner = "convos-chat";
repo = pname;
- rev = version;
- sha256 = "08k8dqdgz2b3p8g1zfg9i74r5nm1w0sqdm759d1f3jcyp737r47x";
+ rev = "v${version}";
+ sha256 = "0b3c8hj9cjmpzy9k949vdv1y3v7b94nh0mq15rcv3ax0sj3gd0qr";
};
nativeBuildInputs = [ makeWrapper ]
@@ -28,7 +28,7 @@ perlPackages.buildPerlPackage rec {
propagatedBuildInputs = [ openssl ];
- checkInputs = with perlPackages; [ TestDeep TestMore ];
+ checkInputs = with perlPackages; [ TestDeep ];
postPatch = ''
patchShebangs script/convos
@@ -54,6 +54,9 @@ perlPackages.buildPerlPackage rec {
#
rm t/web-user.t
+ # Another web test fails, so we also remove this.
+ rm t/web-login.t
+
# Module::Install is a runtime dependency not covered by the tests, so we add
# a test for it.
#
diff --git a/third_party/nixpkgs/pkgs/applications/networking/mailreaders/mblaze/default.nix b/third_party/nixpkgs/pkgs/applications/networking/mailreaders/mblaze/default.nix
index 2ac32f3430..b7527d04cb 100644
--- a/third_party/nixpkgs/pkgs/applications/networking/mailreaders/mblaze/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/networking/mailreaders/mblaze/default.nix
@@ -2,7 +2,7 @@
stdenv.mkDerivation rec {
pname = "mblaze";
- version = "1.0";
+ version = "1.1";
nativeBuildInputs = [ installShellFiles ];
buildInputs = [ ruby ] ++ lib.optionals stdenv.isDarwin [ libiconv ];
@@ -11,7 +11,7 @@ stdenv.mkDerivation rec {
owner = "leahneukirchen";
repo = "mblaze";
rev = "v${version}";
- sha256 = "0hxy3mjjv4hg856sl1r15fdmqaw4s9c26b3lidsd5x0kpqy601ai";
+ sha256 = "sha256-Ho2Qoxs93ig4yYUOaoqdYnLA8Y4+7CfRM0dju89JOa4=";
};
makeFlags = [ "PREFIX=$(out)" ];
diff --git a/third_party/nixpkgs/pkgs/applications/networking/mailreaders/thunderbird/68.nix b/third_party/nixpkgs/pkgs/applications/networking/mailreaders/thunderbird/68.nix
index f3594d9780..4433551d2e 100644
--- a/third_party/nixpkgs/pkgs/applications/networking/mailreaders/thunderbird/68.nix
+++ b/third_party/nixpkgs/pkgs/applications/networking/mailreaders/thunderbird/68.nix
@@ -98,6 +98,7 @@ stdenv.mkDerivation rec {
rustc
which
yasm
+ unzip
] ++ lib.optional gtk3Support wrapGAppsHook;
buildInputs = [
@@ -125,7 +126,6 @@ stdenv.mkDerivation rec {
pango
perl
sqlite
- unzip
xorg.libX11
xorg.libXScrnSaver
xorg.libXcursor
diff --git a/third_party/nixpkgs/pkgs/applications/networking/mailreaders/thunderbird/default.nix b/third_party/nixpkgs/pkgs/applications/networking/mailreaders/thunderbird/default.nix
index 6104163938..495cf3cf76 100644
--- a/third_party/nixpkgs/pkgs/applications/networking/mailreaders/thunderbird/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/networking/mailreaders/thunderbird/default.nix
@@ -99,6 +99,7 @@ stdenv.mkDerivation rec {
rustc
which
yasm
+ unzip
] ++ lib.optional gtk3Support wrapGAppsHook;
buildInputs = [
@@ -126,7 +127,6 @@ stdenv.mkDerivation rec {
pango
perl
sqlite
- unzip
xorg.libX11
xorg.libXScrnSaver
xorg.libXcursor
diff --git a/third_party/nixpkgs/pkgs/applications/networking/mpop/default.nix b/third_party/nixpkgs/pkgs/applications/networking/mpop/default.nix
index 01528df856..a488817a0c 100644
--- a/third_party/nixpkgs/pkgs/applications/networking/mpop/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/networking/mpop/default.nix
@@ -4,11 +4,11 @@ with lib;
stdenv.mkDerivation rec {
pname = "mpop";
- version = "1.4.11";
+ version = "1.4.12";
src = fetchurl {
url = "https://marlam.de/${pname}/releases/${pname}-${version}.tar.xz";
- sha256 = "1gcxvhin5y0q47svqbf90r5aip0cgywm8sq6m84ygda7km8xylwv";
+ sha256 = "sha256-X2NVtS2cNgYZYjpAxmwaVXHjk7Q/5YN1wN41QprDSAo=";
};
nativeBuildInputs = [ pkg-config ];
diff --git a/third_party/nixpkgs/pkgs/applications/networking/msmtp/default.nix b/third_party/nixpkgs/pkgs/applications/networking/msmtp/default.nix
index 02131b41ea..d8f53f4b25 100644
--- a/third_party/nixpkgs/pkgs/applications/networking/msmtp/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/networking/msmtp/default.nix
@@ -9,11 +9,11 @@ let
in stdenv.mkDerivation rec {
pname = "msmtp";
- version = "1.8.14";
+ version = "1.8.15";
src = fetchurl {
url = "https://marlam.de/${pname}/releases/${pname}-${version}.tar.xz";
- sha256 = "1W8GXXEUhunCNGGFFaAqSKSNq0BRs08+EI++y2+3c7Q=";
+ sha256 = "sha256-ImXcY56/Lt8waf/+CjvXZ0n4tY9AAdXN6uGYc5SQmc4=";
};
patches = [
diff --git a/third_party/nixpkgs/pkgs/applications/networking/p2p/gnunet/gtk.nix b/third_party/nixpkgs/pkgs/applications/networking/p2p/gnunet/gtk.nix
index 4090814b3d..2532671bc2 100644
--- a/third_party/nixpkgs/pkgs/applications/networking/p2p/gnunet/gtk.nix
+++ b/third_party/nixpkgs/pkgs/applications/networking/p2p/gnunet/gtk.nix
@@ -1,5 +1,5 @@
{ stdenv, fetchurl
-, gnome3
+, glade
, gnunet
, gnutls
, gtk3
@@ -25,7 +25,7 @@ stdenv.mkDerivation rec {
];
buildInputs = [
- gnome3.glade
+ glade
gnunet
gnutls
gtk3
@@ -39,5 +39,7 @@ stdenv.mkDerivation rec {
meta = gnunet.meta // {
description = "GNUnet GTK User Interface";
homepage = "https://git.gnunet.org/gnunet-gtk.git";
+ # configure: error: compiling gnunet-gtk requires GNUnet core headers
+ broken = true;
};
}
diff --git a/third_party/nixpkgs/pkgs/applications/networking/p2p/transgui/default.nix b/third_party/nixpkgs/pkgs/applications/networking/p2p/transgui/default.nix
index 809e4528df..ceccf44819 100644
--- a/third_party/nixpkgs/pkgs/applications/networking/p2p/transgui/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/networking/p2p/transgui/default.nix
@@ -12,9 +12,9 @@ stdenv.mkDerivation rec {
sha256 = "1dyx778756zhvz5sxgdvy49p2c0x44w4nmcfd90wqrmgfknncnf5";
};
- nativeBuildInputs = [ pkg-config ];
+ nativeBuildInputs = [ pkg-config unzip ];
buildInputs = [
- unzip fpc lazarus stdenv.cc
+ fpc lazarus stdenv.cc
libX11 glib gtk2 gdk-pixbuf pango atk cairo openssl
];
diff --git a/third_party/nixpkgs/pkgs/applications/networking/p2p/transmission/default.nix b/third_party/nixpkgs/pkgs/applications/networking/p2p/transmission/default.nix
index 8cc674b1ea..7e8b6b671c 100644
--- a/third_party/nixpkgs/pkgs/applications/networking/p2p/transmission/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/networking/p2p/transmission/default.nix
@@ -12,7 +12,7 @@
, pcre
# Build options
, enableGTK3 ? false
-, gnome3
+, gtk3
, xorg
, wrapGAppsHook
, enableQt ? false
@@ -65,7 +65,7 @@ in stdenv.mkDerivation {
pcre
]
++ lib.optionals enableQt [ qt5.qttools qt5.qtbase ]
- ++ lib.optionals enableGTK3 [ gnome3.gtk xorg.libpthreadstubs ]
+ ++ lib.optionals enableGTK3 [ gtk3 xorg.libpthreadstubs ]
++ lib.optionals enableSystemd [ systemd ]
++ lib.optionals stdenv.isLinux [ inotify-tools ]
;
diff --git a/third_party/nixpkgs/pkgs/applications/networking/p2p/tribler/default.nix b/third_party/nixpkgs/pkgs/applications/networking/p2p/tribler/default.nix
index 6e2533621e..3aa5b4a8da 100644
--- a/third_party/nixpkgs/pkgs/applications/networking/p2p/tribler/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/networking/p2p/tribler/default.nix
@@ -85,5 +85,6 @@ stdenv.mkDerivation rec {
description = "A completely decentralised P2P filesharing client based on the Bittorrent protocol";
license = licenses.lgpl21;
platforms = platforms.linux;
+ broken = true; # 2021-03-17 see https://github.com/NixOS/nixpkgs/issues/93053
};
}
diff --git a/third_party/nixpkgs/pkgs/applications/networking/pcloud/default.nix b/third_party/nixpkgs/pkgs/applications/networking/pcloud/default.nix
index 4229fef4fe..08a8bc98e1 100644
--- a/third_party/nixpkgs/pkgs/applications/networking/pcloud/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/networking/pcloud/default.nix
@@ -21,7 +21,7 @@
# Runtime dependencies;
# A few additional ones (e.g. Node) are already shipped together with the
# AppImage, so we don't have to duplicate them here.
- alsaLib, dbus-glib, fuse, gnome3, libdbusmenu-gtk2, udev, nss
+ alsaLib, dbus-glib, fuse, gnome3, gtk3, libdbusmenu-gtk2, udev, nss
}:
let
@@ -56,7 +56,7 @@ in stdenv.mkDerivation {
alsaLib
dbus-glib
fuse
- gnome3.gtk
+ gtk3
libdbusmenu-gtk2
nss
udev
@@ -92,7 +92,7 @@ in stdenv.mkDerivation {
# This is required for the file picker dialog - otherwise pcloud just
# crashes
- export XDG_DATA_DIRS="${gnome3.gsettings-desktop-schemas}/share/gsettings-schemas/${gnome3.gsettings-desktop-schemas.name}:${gnome3.gtk}/share/gsettings-schemas/${gnome3.gtk.name}:$XDG_DATA_DIRS"
+ export XDG_DATA_DIRS="${gnome3.gsettings-desktop-schemas}/share/gsettings-schemas/${gnome3.gsettings-desktop-schemas.name}:${gtk3}/share/gsettings-schemas/${gtk3.name}:$XDG_DATA_DIRS"
exec "$out/app/pcloud"
EOF
diff --git a/third_party/nixpkgs/pkgs/applications/networking/remote/freerdp/default.nix b/third_party/nixpkgs/pkgs/applications/networking/remote/freerdp/default.nix
index 10b3f2d175..8e0f4dde81 100644
--- a/third_party/nixpkgs/pkgs/applications/networking/remote/freerdp/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/networking/remote/freerdp/default.nix
@@ -18,13 +18,13 @@ let
in stdenv.mkDerivation rec {
pname = "freerdp";
- version = "2.3.1";
+ version = "2.3.2";
src = fetchFromGitHub {
owner = "FreeRDP";
repo = "FreeRDP";
rev = version;
- sha256 = "sha256-qKvzxIFUiRoX/fCTDoGOGFMfzMTCRq+A5b9K2J2Wnwk=";
+ sha256 = "sha256-qqpdMBDcVfXm/KB54zv23O8raGqBhAKqXo6Kj2VaI8w=";
};
postPatch = ''
diff --git a/third_party/nixpkgs/pkgs/applications/networking/sync/onedrive/default.nix b/third_party/nixpkgs/pkgs/applications/networking/sync/onedrive/default.nix
index ec983276de..300214e58b 100644
--- a/third_party/nixpkgs/pkgs/applications/networking/sync/onedrive/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/networking/sync/onedrive/default.nix
@@ -4,13 +4,13 @@
stdenv.mkDerivation rec {
pname = "onedrive";
- version = "2.4.7";
+ version = "2.4.10";
src = fetchFromGitHub {
owner = "abraunegg";
repo = pname;
rev = "v${version}";
- sha256 = "12g2z6c4f65y8cc7vyhk9nlg1mpbsmlsj7ghlny452qhr13m7qpn";
+ sha256 = "sha256:0dvxjkni66g82j9wr6yy07sn7d7yr7bbc0py89pxybvsbid88l65";
};
nativeBuildInputs = [ autoreconfHook ldc installShellFiles pkg-config ];
diff --git a/third_party/nixpkgs/pkgs/applications/office/ib/controller/default.nix b/third_party/nixpkgs/pkgs/applications/office/ib/controller/default.nix
index 35aebf2326..0815dfc898 100644
--- a/third_party/nixpkgs/pkgs/applications/office/ib/controller/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/office/ib/controller/default.nix
@@ -11,7 +11,8 @@ stdenv.mkDerivation rec {
phases = [ "unpackPhase" "installPhase" ];
- buildInputs = [ unzip jdk ib-tws ];
+ nativeBuildInputs = [ unzip ];
+ buildInputs = [ jdk ib-tws ];
installPhase = ''
mkdir -p $out $out/bin $out/etc/ib/controller $out/share/IBController
diff --git a/third_party/nixpkgs/pkgs/applications/office/onlyoffice-bin/default.nix b/third_party/nixpkgs/pkgs/applications/office/onlyoffice-bin/default.nix
index 711c90879b..bfd3c3529e 100644
--- a/third_party/nixpkgs/pkgs/applications/office/onlyoffice-bin/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/office/onlyoffice-bin/default.nix
@@ -15,7 +15,7 @@
, gdk-pixbuf
, glib
, glibc
-, gnome3
+, gsettings-desktop-schemas
, gst_all_1
, gtk2
, gtk3
@@ -95,7 +95,7 @@ in stdenv.mkDerivation rec {
fontconfig
gdk-pixbuf
glib
- gnome3.gsettings_desktop_schemas
+ gsettings-desktop-schemas
gst_all_1.gst-plugins-base
gst_all_1.gstreamer
gtk2
diff --git a/third_party/nixpkgs/pkgs/applications/office/portfolio/default.nix b/third_party/nixpkgs/pkgs/applications/office/portfolio/default.nix
index 95d4ef34af..73cd5d7cd6 100644
--- a/third_party/nixpkgs/pkgs/applications/office/portfolio/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/office/portfolio/default.nix
@@ -24,11 +24,11 @@ let
in
stdenv.mkDerivation rec {
pname = "PortfolioPerformance";
- version = "0.51.1";
+ version = "0.51.2";
src = fetchurl {
url = "https://github.com/buchen/portfolio/releases/download/${version}/PortfolioPerformance-${version}-linux.gtk.x86_64.tar.gz";
- sha256 = "sha256-sQisFv+MVGod/gmF0/EWNDvYzkpF3qbDuL5eDr7w0Bs=";
+ sha256 = "sha256-5wBzGj4DkTOqtN7X8/EBDoiBtbYB6vGJJ5IkuME7a9A=";
};
nativeBuildInputs = [
diff --git a/third_party/nixpkgs/pkgs/applications/office/skrooge/default.nix b/third_party/nixpkgs/pkgs/applications/office/skrooge/default.nix
index 067b06747d..8f5beee384 100644
--- a/third_party/nixpkgs/pkgs/applications/office/skrooge/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/office/skrooge/default.nix
@@ -7,11 +7,11 @@
mkDerivation rec {
pname = "skrooge";
- version = "2.23.0";
+ version = "2.24.6";
src = fetchurl {
url = "http://download.kde.org/stable/skrooge/${pname}-${version}.tar.xz";
- sha256 = "10k3j67x5xm5whsvb84k9p70bkn4jbbbvdfan7q49dh2mmpair5a";
+ sha256 = "sha256-DReIm9lcq0j761wWTpJu7HnfEWz9QsRGgUtyVaXFs6A=";
};
nativeBuildInputs = [
diff --git a/third_party/nixpkgs/pkgs/applications/radio/dablin/default.nix b/third_party/nixpkgs/pkgs/applications/radio/dablin/default.nix
index e74cc551d4..a9f5fc991f 100644
--- a/third_party/nixpkgs/pkgs/applications/radio/dablin/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/radio/dablin/default.nix
@@ -1,5 +1,5 @@
{ lib, stdenv, fetchFromGitHub, cmake, pkg-config
-, mpg123, SDL2, gnome3, faad2, pcre
+, mpg123, SDL2, gtkmm3, faad2, pcre
} :
stdenv.mkDerivation rec {
@@ -15,7 +15,7 @@ stdenv.mkDerivation rec {
nativeBuildInputs = [ cmake pkg-config ];
- buildInputs = [ faad2 mpg123 SDL2 gnome3.gtkmm pcre ];
+ buildInputs = [ faad2 mpg123 SDL2 gtkmm3 pcre ];
meta = with lib; {
description = "Play DAB/DAB+ from ETI-NI aligned stream";
diff --git a/third_party/nixpkgs/pkgs/applications/science/biology/sambamba/default.nix b/third_party/nixpkgs/pkgs/applications/science/biology/sambamba/default.nix
index 8802736efa..7b5141302f 100644
--- a/third_party/nixpkgs/pkgs/applications/science/biology/sambamba/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/science/biology/sambamba/default.nix
@@ -1,18 +1,18 @@
-{ lib, stdenv, fetchFromGitHub, python3, which, dmd, ldc, zlib }:
+{ lib, stdenv, fetchFromGitHub, python3, which, ldc, zlib }:
stdenv.mkDerivation rec {
pname = "sambamba";
- version = "0.7.1";
+ version = "0.8.0";
src = fetchFromGitHub {
owner = "biod";
repo = "sambamba";
rev = "v${version}";
- sha256 = "0k5wy06zrbsc40x6answgz7rz2phadyqwlhi9nqxbfqanbg9kq20";
+ sha256 = "sha256:0kx5a0fmvv9ldz2hnh7qavgf7711kqc73zxf51k4cca4hr58zxr9";
fetchSubmodules = true;
};
- nativeBuildInputs = [ which python3 dmd ldc ];
+ nativeBuildInputs = [ which python3 ldc ];
buildInputs = [ zlib ];
# Upstream's install target is broken; copy manually
diff --git a/third_party/nixpkgs/pkgs/applications/science/biology/snpeff/default.nix b/third_party/nixpkgs/pkgs/applications/science/biology/snpeff/default.nix
index b48e13ecf0..4c32516b29 100644
--- a/third_party/nixpkgs/pkgs/applications/science/biology/snpeff/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/science/biology/snpeff/default.nix
@@ -9,8 +9,8 @@ stdenv.mkDerivation rec {
sha256 = "0i12mv93bfv8xjwc3rs2x73d6hkvi7kgbbbx3ry984l3ly4p6nnm";
};
- nativeBuildInputs = [ makeWrapper ];
- buildInputs = [ unzip jre ];
+ nativeBuildInputs = [ makeWrapper unzip ];
+ buildInputs = [ jre ];
sourceRoot = "snpEff";
diff --git a/third_party/nixpkgs/pkgs/applications/science/electronics/gtkwave/default.nix b/third_party/nixpkgs/pkgs/applications/science/electronics/gtkwave/default.nix
index 971891a5b0..3a3994d9ad 100644
--- a/third_party/nixpkgs/pkgs/applications/science/electronics/gtkwave/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/science/electronics/gtkwave/default.nix
@@ -2,11 +2,11 @@
stdenv.mkDerivation rec {
pname = "gtkwave";
- version = "3.3.107";
+ version = "3.3.108";
src = fetchurl {
url = "mirror://sourceforge/gtkwave/${pname}-gtk3-${version}.tar.gz";
- sha256 = "0ma30jyc94iid3v3m8aw4i2lyiqfxkpsdvdmmaibynk400cbzivl";
+ sha256 = "sha256-LtlexZKih+Si/pH3oQpWdpzfZ6j+41Otgfx7nLMfFSQ=";
};
nativeBuildInputs = [ pkg-config wrapGAppsHook ];
diff --git a/third_party/nixpkgs/pkgs/applications/science/electronics/horizon-eda/default.nix b/third_party/nixpkgs/pkgs/applications/science/electronics/horizon-eda/default.nix
index ef68eb999f..dee0a851bf 100644
--- a/third_party/nixpkgs/pkgs/applications/science/electronics/horizon-eda/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/science/electronics/horizon-eda/default.nix
@@ -6,7 +6,7 @@
, epoxy
, fetchFromGitHub
, glm
-, gnome3
+, gtkmm3
, lib
, libgit2
, librsvg
@@ -37,7 +37,7 @@ stdenv.mkDerivation rec {
curl
epoxy
glm
- gnome3.gtkmm
+ gtkmm3
libgit2
librsvg
libuuid
diff --git a/third_party/nixpkgs/pkgs/applications/science/electronics/kicad/default.nix b/third_party/nixpkgs/pkgs/applications/science/electronics/kicad/default.nix
index dcf51e657c..b91b5ad14a 100644
--- a/third_party/nixpkgs/pkgs/applications/science/electronics/kicad/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/science/electronics/kicad/default.nix
@@ -1,6 +1,7 @@
{ lib, stdenv
, fetchFromGitLab
, gnome3
+, dconf
, wxGTK30
, wxGTK31
, makeWrapper
@@ -186,12 +187,12 @@ stdenv.mkDerivation rec {
makeWrapperArgs = with passthru.libraries; [
"--prefix XDG_DATA_DIRS : ${base}/share"
"--prefix XDG_DATA_DIRS : ${hicolor-icon-theme}/share"
- "--prefix XDG_DATA_DIRS : ${gnome3.defaultIconTheme}/share"
+ "--prefix XDG_DATA_DIRS : ${gnome3.adwaita-icon-theme}/share"
"--prefix XDG_DATA_DIRS : ${wxGTK.gtk}/share/gsettings-schemas/${wxGTK.gtk.name}"
"--prefix XDG_DATA_DIRS : ${gsettings-desktop-schemas}/share/gsettings-schemas/${gsettings-desktop-schemas.name}"
# wrapGAppsHook did these two as well, no idea if it matters...
"--prefix XDG_DATA_DIRS : ${cups}/share"
- "--prefix GIO_EXTRA_MODULES : ${gnome3.dconf}/lib/gio/modules"
+ "--prefix GIO_EXTRA_MODULES : ${dconf}/lib/gio/modules"
"--set-default KISYSMOD ${footprints}/share/kicad/modules"
"--set-default KICAD_SYMBOL_DIR ${symbols}/share/kicad/library"
diff --git a/third_party/nixpkgs/pkgs/applications/science/logic/coq/default.nix b/third_party/nixpkgs/pkgs/applications/science/logic/coq/default.nix
index 8713abe4bc..2ac5a7dd67 100644
--- a/third_party/nixpkgs/pkgs/applications/science/logic/coq/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/science/logic/coq/default.nix
@@ -127,7 +127,7 @@ self = stdenv.mkDerivation {
buildInputs = [ ncurses ] ++ ocamlBuildInputs
++ optionals buildIde
(if versionAtLeast "8.10"
- then [ ocamlPackages.lablgtk3-sourceview3 glib gnome3.defaultIconTheme wrapGAppsHook ]
+ then [ ocamlPackages.lablgtk3-sourceview3 glib gnome3.adwaita-icon-theme wrapGAppsHook ]
else [ ocamlPackages.lablgtk ]);
postPatch = ''
diff --git a/third_party/nixpkgs/pkgs/applications/science/machine-learning/vowpal-wabbit/default.nix b/third_party/nixpkgs/pkgs/applications/science/machine-learning/vowpal-wabbit/default.nix
new file mode 100644
index 0000000000..771d6227a8
--- /dev/null
+++ b/third_party/nixpkgs/pkgs/applications/science/machine-learning/vowpal-wabbit/default.nix
@@ -0,0 +1,46 @@
+{ lib, stdenv, fetchFromGitHub, cmake, boost169, rapidjson, zlib }:
+
+stdenv.mkDerivation rec {
+ pname = "vowpal-wabbit";
+ version = "8.9.2";
+
+ src = fetchFromGitHub {
+ owner = "VowpalWabbit";
+ repo = "vowpal_wabbit";
+ rev = version;
+ sha256 = "0ng1kip7sh3br85691xvszxd6lhv8nhfkgqkpwxd89wy85znzhmd";
+ };
+
+ nativeBuildInputs = [ cmake ];
+
+ buildInputs = [
+ boost169
+ rapidjson
+ zlib
+ ];
+
+ # -DBUILD_TESTS=OFF is set as both it saves time in the build and the default
+ # cmake flags appended by the builder include -DBUILD_TESTING=OFF for which
+ # this is the equivalent flag.
+ cmakeFlags = [
+ "-DVW_INSTALL=ON"
+ "-DBUILD_TESTS=OFF"
+ "-DBUILD_JAVA=OFF"
+ "-DBUILD_PYTHON=OFF"
+ "-DUSE_LATEST_STD=ON"
+ "-DRAPIDJSON_SYS_DEP=ON"
+ ];
+
+ meta = with lib; {
+ broken = stdenv.isAarch32 || stdenv.isAarch64;
+ description = "Machine learning system focused on online reinforcement learning";
+ homepage = "https://github.com/VowpalWabbit/vowpal_wabbit/";
+ license = licenses.bsd3;
+ longDescription = ''
+ Machine learning system which pushes the frontier of machine learning with techniques such as online,
+ hashing, allreduce, reductions, learning2search, active, and interactive and reinforcement learning
+ '';
+ maintainers = with maintainers; [ jackgerrits ];
+ platforms = platforms.unix;
+ };
+}
diff --git a/third_party/nixpkgs/pkgs/applications/science/math/gfm/default.nix b/third_party/nixpkgs/pkgs/applications/science/math/gfm/default.nix
index a8031b3e8a..1078be99c3 100644
--- a/third_party/nixpkgs/pkgs/applications/science/math/gfm/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/science/math/gfm/default.nix
@@ -5,6 +5,7 @@
, pkg-config
, autoreconfHook
, gnome2
+, gtk2
, glib
, libtifiles2
, libticables2
@@ -32,7 +33,7 @@ stdenv.mkDerivation rec {
];
buildInputs = [
- gnome2.gtk
+ gtk2
gnome2.libglade
glib
libtifiles2
diff --git a/third_party/nixpkgs/pkgs/applications/science/math/perseus/default.nix b/third_party/nixpkgs/pkgs/applications/science/math/perseus/default.nix
index 242f2e2cea..d53236d807 100644
--- a/third_party/nixpkgs/pkgs/applications/science/math/perseus/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/science/math/perseus/default.nix
@@ -3,7 +3,7 @@
stdenv.mkDerivation {
name = "perseus-4-beta";
version = "4-beta";
- buildInputs = [ unzip ];
+ nativeBuildInputs = [ unzip ];
hardeningDisable = [ "stackprotector" ];
diff --git a/third_party/nixpkgs/pkgs/applications/science/math/sage/sagelib.nix b/third_party/nixpkgs/pkgs/applications/science/math/sage/sagelib.nix
index 1c2235bf71..822cb0a2bd 100644
--- a/third_party/nixpkgs/pkgs/applications/science/math/sage/sagelib.nix
+++ b/third_party/nixpkgs/pkgs/applications/science/math/sage/sagelib.nix
@@ -32,7 +32,6 @@
, ntl
, numpy
, pari
-, pkgconfig
, pkg-config
, planarity
, ppl
@@ -86,7 +85,6 @@ buildPythonPackage rec {
cypari2
jinja2
numpy
- pkgconfig
boost
arb
brial
diff --git a/third_party/nixpkgs/pkgs/applications/science/math/tilp2/default.nix b/third_party/nixpkgs/pkgs/applications/science/math/tilp2/default.nix
index 1b46f982b4..ebcca69f09 100644
--- a/third_party/nixpkgs/pkgs/applications/science/math/tilp2/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/science/math/tilp2/default.nix
@@ -7,6 +7,7 @@
, intltool
, glib
, gnome2
+, gtk2
, gfm
, libticables2
, libticalcs2
@@ -36,7 +37,7 @@ stdenv.mkDerivation rec {
buildInputs = [
glib
- gnome2.gtk
+ gtk2
gnome2.libglade
gfm
libticables2
diff --git a/third_party/nixpkgs/pkgs/applications/science/math/weka/default.nix b/third_party/nixpkgs/pkgs/applications/science/math/weka/default.nix
index 05b95140b1..9d18763aa3 100644
--- a/third_party/nixpkgs/pkgs/applications/science/math/weka/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/science/math/weka/default.nix
@@ -9,8 +9,7 @@ stdenv.mkDerivation rec {
sha256 = "0zwmhspmqb0a7cm6k6i0s6q3w19ws1g9dx3cp2v3g3vsif6cdh31";
};
- nativeBuildInputs = [ makeWrapper ];
- buildInputs = [ unzip ];
+ nativeBuildInputs = [ makeWrapper unzip ];
# The -Xmx1000M comes suggested from their download page:
# http://www.cs.waikato.ac.nz/ml/weka/downloading.html
diff --git a/third_party/nixpkgs/pkgs/applications/science/robotics/betaflight-configurator/default.nix b/third_party/nixpkgs/pkgs/applications/science/robotics/betaflight-configurator/default.nix
index 9a304272fe..2fafa2ebf8 100644
--- a/third_party/nixpkgs/pkgs/applications/science/robotics/betaflight-configurator/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/science/robotics/betaflight-configurator/default.nix
@@ -19,9 +19,9 @@ stdenv.mkDerivation rec {
sha256 = "07r60n9422g5sm7x5b62p044cp961l51vx0s8ig2hy24s74hkam1";
};
- nativeBuildInputs = [ wrapGAppsHook ];
+ nativeBuildInputs = [ wrapGAppsHook unzip ];
- buildInputs = [ unzip gsettings-desktop-schemas gtk3 ];
+ buildInputs = [ gsettings-desktop-schemas gtk3 ];
installPhase = ''
mkdir -p $out/bin \
diff --git a/third_party/nixpkgs/pkgs/applications/terminal-emulators/evilvte/default.nix b/third_party/nixpkgs/pkgs/applications/terminal-emulators/evilvte/default.nix
index 06dafe0916..5d5ce5d772 100644
--- a/third_party/nixpkgs/pkgs/applications/terminal-emulators/evilvte/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/terminal-emulators/evilvte/default.nix
@@ -1,5 +1,5 @@
{ lib, stdenv, fetchgit, makeWrapper, pkg-config,
- gnome2, glib, pango, cairo, gdk-pixbuf, atk, freetype, xorg,
+ gnome2, gtk2, glib, pango, cairo, gdk-pixbuf, atk, freetype, xorg,
configH ? ""
}:
@@ -14,7 +14,7 @@ stdenv.mkDerivation {
};
buildInputs = [
- gnome2.vte glib pango gnome2.gtk cairo gdk-pixbuf atk freetype xorg.libX11
+ gnome2.vte glib pango gtk2 cairo gdk-pixbuf atk freetype xorg.libX11
xorg.xorgproto xorg.libXext makeWrapper pkg-config
];
diff --git a/third_party/nixpkgs/pkgs/applications/terminal-emulators/kgx/default.nix b/third_party/nixpkgs/pkgs/applications/terminal-emulators/kgx/default.nix
index 9f8b3444ff..4e8cf06c1f 100644
--- a/third_party/nixpkgs/pkgs/applications/terminal-emulators/kgx/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/terminal-emulators/kgx/default.nix
@@ -4,6 +4,7 @@
, fetchFromGitLab
, gettext
, gnome3
+, libgtop
, gtk3
, libhandy
, pcre2
@@ -33,7 +34,7 @@ stdenv.mkDerivation {
buildInputs = [
gettext
- gnome3.libgtop
+ libgtop
gnome3.nautilus
gtk3
libhandy
diff --git a/third_party/nixpkgs/pkgs/applications/terminal-emulators/tilix/default.nix b/third_party/nixpkgs/pkgs/applications/terminal-emulators/tilix/default.nix
index 80956a5124..c0f4ea3257 100644
--- a/third_party/nixpkgs/pkgs/applications/terminal-emulators/tilix/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/terminal-emulators/tilix/default.nix
@@ -5,7 +5,7 @@
, ninja
, python3
, pkg-config
-, dmd
+, ldc
, dconf
, dbus
, gsettings-desktop-schemas
@@ -16,17 +16,18 @@
, glib
, wrapGAppsHook
, libunwind
+, appstream
}:
-stdenv.mkDerivation {
+stdenv.mkDerivation rec {
pname = "tilix";
- version = "unstable-2019-10-02";
+ version = "1.9.4";
src = fetchFromGitHub {
owner = "gnunn1";
repo = "tilix";
- rev = "ffcd31e3c0e1a560ce89468152d8726065e8fb1f";
- sha256 = "1bzv7xiqhyblz1rw8ln4zpspmml49vnshn1zsv9di5q7kfgpqrgq";
+ rev = "${version}";
+ sha256 = "sha256:020gr4q7kmqq8vnsh8rw97gf1p2n1yq4d7ncyjjh9l13zkaxqqv9";
};
# Default upstream else LDC fails to link
@@ -36,12 +37,13 @@ stdenv.mkDerivation {
nativeBuildInputs = [
desktop-file-utils
- dmd
+ ldc
meson
ninja
pkg-config
python3
wrapGAppsHook
+ appstream
];
buildInputs = [
diff --git a/third_party/nixpkgs/pkgs/applications/version-management/git-and-tools/lab/default.nix b/third_party/nixpkgs/pkgs/applications/version-management/git-and-tools/lab/default.nix
index a9138fa0c8..856ee616ef 100644
--- a/third_party/nixpkgs/pkgs/applications/version-management/git-and-tools/lab/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/version-management/git-and-tools/lab/default.nix
@@ -2,18 +2,18 @@
buildGoModule rec {
pname = "lab";
- version = "0.20.0";
+ version = "0.21.0";
src = fetchFromGitHub {
owner = "zaquestion";
repo = "lab";
rev = "v${version}";
- sha256 = "sha256-EQqbWM/4CInFNndfD+k7embPUFLXgxRT44e/+Ik2TDs=";
+ sha256 = "sha256-mkhJmrKpIISd0m0m8fQ9vKuEr6h23BBxK6yo5fB+xcA=";
};
subPackages = [ "." ];
- vendorSha256 = "sha256-T6kGhje3K2HnR8xRuio6AsYbSwIdbWvAk3ZSnbm1NsA=";
+ vendorSha256 = "sha256-cf+DVnGjSNV2eZ8S/Vk+VPlykoSjngrQuPeA9IshBUg=";
doCheck = false;
diff --git a/third_party/nixpkgs/pkgs/applications/version-management/gitlab/data.json b/third_party/nixpkgs/pkgs/applications/version-management/gitlab/data.json
index 001d0b158b..b3a5d25c93 100644
--- a/third_party/nixpkgs/pkgs/applications/version-management/gitlab/data.json
+++ b/third_party/nixpkgs/pkgs/applications/version-management/gitlab/data.json
@@ -1,11 +1,11 @@
{
- "version": "13.8.5",
- "repo_hash": "0dpyqynd6rscg07s58y0cjn7vfj2h21h51ja0fm6ll76wb02sbm6",
+ "version": "13.8.6",
+ "repo_hash": "0izzvr4bw86nbrqkf44gkcf63ham10cw4vp5yk0ylgm7w0kimv8v",
"owner": "gitlab-org",
"repo": "gitlab",
- "rev": "v13.8.5-ee",
+ "rev": "v13.8.6-ee",
"passthru": {
- "GITALY_SERVER_VERSION": "13.8.5",
+ "GITALY_SERVER_VERSION": "13.8.6",
"GITLAB_PAGES_VERSION": "1.34.0",
"GITLAB_SHELL_VERSION": "13.15.1",
"GITLAB_WORKHORSE_VERSION": "8.59.2"
diff --git a/third_party/nixpkgs/pkgs/applications/version-management/gitlab/gitaly/default.nix b/third_party/nixpkgs/pkgs/applications/version-management/gitlab/gitaly/default.nix
index a201d79a12..db2ac513b2 100644
--- a/third_party/nixpkgs/pkgs/applications/version-management/gitlab/gitaly/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/version-management/gitlab/gitaly/default.nix
@@ -33,14 +33,14 @@ let
};
};
in buildGoModule rec {
- version = "13.8.5";
+ version = "13.8.6";
pname = "gitaly";
src = fetchFromGitLab {
owner = "gitlab-org";
repo = "gitaly";
rev = "v${version}";
- sha256 = "sha256-hKIjKltPPmz50Ru7elpHdeoyGAqgp+txR3fKleqY7hM=";
+ sha256 = "sha256-6ocP4SMafvLI2jfvcB8jk1AemAI/TiBQ1iaVxK7I54A=";
};
vendorSha256 = "sha256-oVw6vXI3CyOn4l02PkYx3HVpZfzQPi3yBuf9tRvoWoM=";
diff --git a/third_party/nixpkgs/pkgs/applications/version-management/mercurial/4.9.nix b/third_party/nixpkgs/pkgs/applications/version-management/mercurial/4.9.nix
index f499be17f7..d2511e2786 100644
--- a/third_party/nixpkgs/pkgs/applications/version-management/mercurial/4.9.nix
+++ b/third_party/nixpkgs/pkgs/applications/version-management/mercurial/4.9.nix
@@ -21,8 +21,8 @@ in python2Packages.buildPythonApplication {
inherit python; # pass it so that the same version can be used in hg2git
- nativeBuildInputs = [ makeWrapper ];
- buildInputs = [ docutils unzip ]
+ nativeBuildInputs = [ makeWrapper unzip ];
+ buildInputs = [ docutils ]
++ lib.optionals stdenv.isDarwin [ ApplicationServices ];
propagatedBuildInputs = [ hg-git dulwich ];
diff --git a/third_party/nixpkgs/pkgs/applications/version-management/mercurial/default.nix b/third_party/nixpkgs/pkgs/applications/version-management/mercurial/default.nix
index 7c0a96583e..26d263b060 100644
--- a/third_party/nixpkgs/pkgs/applications/version-management/mercurial/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/version-management/mercurial/default.nix
@@ -19,8 +19,8 @@ in python3Packages.buildPythonApplication rec {
passthru = { inherit python; }; # pass it so that the same version can be used in hg2git
- nativeBuildInputs = [ makeWrapper ];
- buildInputs = [ docutils unzip ]
+ nativeBuildInputs = [ makeWrapper unzip ];
+ buildInputs = [ docutils ]
++ lib.optionals stdenv.isDarwin [ ApplicationServices ];
makeFlags = [ "PREFIX=$(out)" ];
diff --git a/third_party/nixpkgs/pkgs/applications/version-management/monotone-viz/graphviz-2.0.nix b/third_party/nixpkgs/pkgs/applications/version-management/monotone-viz/graphviz-2.0.nix
index 8ecc5bf9ac..d7ec4a8646 100644
--- a/third_party/nixpkgs/pkgs/applications/version-management/monotone-viz/graphviz-2.0.nix
+++ b/third_party/nixpkgs/pkgs/applications/version-management/monotone-viz/graphviz-2.0.nix
@@ -2,8 +2,6 @@
, yacc, libtool, fontconfig, pango, gd, libwebp
}:
-assert libpng != null && libjpeg != null && expat != null;
-
stdenv.mkDerivation rec {
name = "graphviz-2.0";
diff --git a/third_party/nixpkgs/pkgs/applications/video/clipgrab/default.nix b/third_party/nixpkgs/pkgs/applications/video/clipgrab/default.nix
index 6db2450d13..b24ff43ac6 100644
--- a/third_party/nixpkgs/pkgs/applications/video/clipgrab/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/video/clipgrab/default.nix
@@ -5,10 +5,10 @@
mkDerivation rec {
pname = "clipgrab";
- version = "3.9.5";
+ version = "3.9.6";
src = fetchurl {
- sha256 = "1p8pqa5s70basdm2zpmahc54shsxrr0fr7chvv425n5a9sqba4dh";
+ sha256 = "sha256-1rQu2Gh9PKSbC0tuQxLwFhzy280z4obpa+eXvDBzDW0=";
# The .tar.bz2 "Download" link is a binary blob, the source is the .tar.gz!
url = "https://download.clipgrab.org/${pname}-${version}.tar.gz";
};
diff --git a/third_party/nixpkgs/pkgs/applications/video/kodi-packages/addon-update-script/default.nix b/third_party/nixpkgs/pkgs/applications/video/kodi-packages/addon-update-script/default.nix
new file mode 100644
index 0000000000..17c1d45783
--- /dev/null
+++ b/third_party/nixpkgs/pkgs/applications/video/kodi-packages/addon-update-script/default.nix
@@ -0,0 +1,23 @@
+{ writeShellScript
+, nix
+, curl
+, gzip
+, xmlstarlet
+, common-updater-scripts
+}:
+
+{ attrPath }:
+
+let
+ url = "http://mirrors.kodi.tv/addons/matrix/addons.xml.gz";
+ updateScript = writeShellScript "update.sh" ''
+ set -ex
+
+ attrPath=$1
+ namespace=$(${nix}/bin/nix-instantiate $systemArg --eval -E "with import ./. {}; $attrPath.namespace" | tr -d '"')
+ version=$(${curl}/bin/curl -s -L ${url} | ${gzip}/bin/gunzip -c | ${xmlstarlet}/bin/xml select -T -t -m "//addons/addon[@id='$namespace']" -v @version)
+
+ ${common-updater-scripts}/bin/update-source-version "$attrPath" "$version"
+ '';
+in
+ [ updateScript attrPath ]
diff --git a/third_party/nixpkgs/pkgs/applications/video/kodi-packages/certifi/default.nix b/third_party/nixpkgs/pkgs/applications/video/kodi-packages/certifi/default.nix
new file mode 100644
index 0000000000..bfce47b7b2
--- /dev/null
+++ b/third_party/nixpkgs/pkgs/applications/video/kodi-packages/certifi/default.nix
@@ -0,0 +1,21 @@
+{ lib, buildKodiAddon, fetchzip, addonUpdateScript }:
+buildKodiAddon rec {
+ pname = "certifi";
+ namespace = "script.module.certifi";
+ version = "2019.11.28+matrix.1";
+
+ src = fetchzip {
+ url = "https://mirrors.kodi.tv/addons/matrix/${namespace}/${namespace}-${version}.zip";
+ sha256 = "0vsd68izv1ix0hb1gm74qq3zff0sxmhfhjyh7y9005zzp2gpi62v";
+ };
+
+ passthru.updateScript = addonUpdateScript {
+ attrPath = "kodi.packages.certifi";
+ };
+
+ meta = with lib; {
+ homepage = "https://certifi.io";
+ description = "Python package for providing Mozilla's CA Bundle";
+ license = licenses.mpl20;
+ };
+}
diff --git a/third_party/nixpkgs/pkgs/applications/video/kodi-packages/chardet/default.nix b/third_party/nixpkgs/pkgs/applications/video/kodi-packages/chardet/default.nix
new file mode 100644
index 0000000000..1e37f6b46e
--- /dev/null
+++ b/third_party/nixpkgs/pkgs/applications/video/kodi-packages/chardet/default.nix
@@ -0,0 +1,21 @@
+{ lib, buildKodiAddon, fetchzip, addonUpdateScript }:
+buildKodiAddon rec {
+ pname = "chardet";
+ namespace = "script.module.chardet";
+ version = "3.0.4+matrix.3";
+
+ src = fetchzip {
+ url = "https://mirrors.kodi.tv/addons/matrix/${namespace}/${namespace}-${version}.zip";
+ sha256 = "05928dj4fsj2zg8ajdial3sdf8izddq64sr0al3zy1gqw91jp80f";
+ };
+
+ passthru.updateScript = addonUpdateScript {
+ attrPath = "kodi.packages.chardet";
+ };
+
+ meta = with lib; {
+ homepage = "https://github.com/Freso/script.module.chardet";
+ description = "Universal encoding detector";
+ license = licenses.lgpl2Only;
+ };
+}
diff --git a/third_party/nixpkgs/pkgs/applications/video/kodi-packages/controllers/default.nix b/third_party/nixpkgs/pkgs/applications/video/kodi-packages/controllers/default.nix
new file mode 100644
index 0000000000..bd29b7c0f7
--- /dev/null
+++ b/third_party/nixpkgs/pkgs/applications/video/kodi-packages/controllers/default.nix
@@ -0,0 +1,21 @@
+{ lib, buildKodiAddon, fetchFromGitHub, controller }:
+buildKodiAddon rec {
+ pname = "game-controller-${controller}";
+ namespace = "game.controller.${controller}";
+ version = "1.0.3";
+
+ sourceDir = "addons/" + namespace;
+
+ src = fetchFromGitHub {
+ owner = "kodi-game";
+ repo = "kodi-game-controllers";
+ rev = "01acb5b6e8b85392b3cb298b034aadb1b24ccf18";
+ sha256 = "0sbc0w0fwbp7rbmbgb6a1kglhnn5g85hijcbbvf5x6jdq9v3f1qb";
+ };
+
+ meta = with lib; {
+ description = "Add support for different gaming controllers.";
+ platforms = platforms.all;
+ maintainers = with maintainers; [ edwtjo ];
+ };
+}
diff --git a/third_party/nixpkgs/pkgs/applications/video/kodi-packages/idna/default.nix b/third_party/nixpkgs/pkgs/applications/video/kodi-packages/idna/default.nix
new file mode 100644
index 0000000000..abe5635e82
--- /dev/null
+++ b/third_party/nixpkgs/pkgs/applications/video/kodi-packages/idna/default.nix
@@ -0,0 +1,21 @@
+{ lib, buildKodiAddon, fetchzip, addonUpdateScript }:
+buildKodiAddon rec {
+ pname = "idna";
+ namespace = "script.module.idna";
+ version = "2.8.1+matrix.1";
+
+ src = fetchzip {
+ url = "https://mirrors.kodi.tv/addons/matrix/${namespace}/${namespace}-${version}.zip";
+ sha256 = "02s75fhfmbs3a38wvxba51aj3lv5bidshjdkl6yjfji6waxpr9xh";
+ };
+
+ passthru.updateScript = addonUpdateScript {
+ attrPath = "kodi.packages.idna";
+ };
+
+ meta = with lib; {
+ homepage = "https://github.com/Freso/script.module.idna";
+ description = "Internationalized Domain Names for Python";
+ license = licenses.bsd3;
+ };
+}
diff --git a/third_party/nixpkgs/pkgs/applications/video/kodi-packages/inputstream-adaptive/default.nix b/third_party/nixpkgs/pkgs/applications/video/kodi-packages/inputstream-adaptive/default.nix
new file mode 100644
index 0000000000..cd4c5aca11
--- /dev/null
+++ b/third_party/nixpkgs/pkgs/applications/video/kodi-packages/inputstream-adaptive/default.nix
@@ -0,0 +1,28 @@
+{ stdenv, lib, rel, addonDir, buildKodiBinaryAddon, fetchFromGitHub, expat, glib, nspr, nss }:
+buildKodiBinaryAddon rec {
+ pname = "inputstream-adaptive";
+ namespace = "inputstream.adaptive";
+ version = "2.6.7";
+
+ src = fetchFromGitHub {
+ owner = "peak3d";
+ repo = "inputstream.adaptive";
+ rev = "${version}-${rel}";
+ sha256 = "1pwqmbr78wp12jn6rwv63npdfc456adwz0amlxf6gvgg43li6p7s";
+ };
+
+ extraBuildInputs = [ expat ];
+
+ extraRuntimeDependencies = [ glib nspr nss stdenv.cc.cc.lib ];
+
+ extraInstallPhase = let n = namespace; in ''
+ ln -s $out/lib/addons/${n}/libssd_wv.so $out/${addonDir}/${n}/libssd_wv.so
+ '';
+
+ meta = with lib; {
+ homepage = "https://github.com/peak3d/inputstream.adaptive";
+ description = "Kodi inputstream addon for several manifest types";
+ platforms = platforms.all;
+ maintainers = with maintainers; [ sephalon ];
+ };
+}
diff --git a/third_party/nixpkgs/pkgs/applications/video/kodi-packages/inputstreamhelper/default.nix b/third_party/nixpkgs/pkgs/applications/video/kodi-packages/inputstreamhelper/default.nix
new file mode 100644
index 0000000000..2bbcc6d9d2
--- /dev/null
+++ b/third_party/nixpkgs/pkgs/applications/video/kodi-packages/inputstreamhelper/default.nix
@@ -0,0 +1,21 @@
+{ lib, buildKodiAddon, fetchzip, addonUpdateScript }:
+buildKodiAddon rec {
+ pname = "inputstreamhelper";
+ namespace = "script.module.inputstreamhelper";
+ version = "0.5.2+matrix.1";
+
+ src = fetchzip {
+ url = "https://mirrors.kodi.tv/addons/matrix/${namespace}/${namespace}-${version}.zip";
+ sha256 = "18lkksljfa57w69yklbldf7dgyykrm84pd10mdjdqdm88fdiiijk";
+ };
+
+ passthru.updateScript = addonUpdateScript {
+ attrPath = "kodi.packages.inputstreamhelper";
+ };
+
+ meta = with lib; {
+ homepage = "https://github.com/emilsvennesson/script.module.inputstreamhelper";
+ description = "A simple Kodi module that makes life easier for add-on developers relying on InputStream based add-ons and DRM playback";
+ license = licenses.mit;
+ };
+}
diff --git a/third_party/nixpkgs/pkgs/applications/video/kodi-packages/joystick/default.nix b/third_party/nixpkgs/pkgs/applications/video/kodi-packages/joystick/default.nix
new file mode 100644
index 0000000000..321ddce905
--- /dev/null
+++ b/third_party/nixpkgs/pkgs/applications/video/kodi-packages/joystick/default.nix
@@ -0,0 +1,21 @@
+{ lib, rel, buildKodiBinaryAddon, fetchFromGitHub, tinyxml, udev }:
+buildKodiBinaryAddon rec {
+ pname = namespace;
+ namespace = "peripheral.joystick";
+ version = "1.7.1";
+
+ src = fetchFromGitHub {
+ owner = "xbmc";
+ repo = namespace;
+ rev = "${version}-${rel}";
+ sha256 = "1dhj4afr9kj938xx70fq5r409mz6lbw4n581ljvdjj9lq7akc914";
+ };
+
+ meta = with lib; {
+ description = "Binary addon for raw joystick input.";
+ platforms = platforms.all;
+ maintainers = with maintainers; [ edwtjo ];
+ };
+
+ extraBuildInputs = [ tinyxml udev ];
+}
diff --git a/third_party/nixpkgs/pkgs/applications/video/kodi-packages/kodi-platform/default.nix b/third_party/nixpkgs/pkgs/applications/video/kodi-packages/kodi-platform/default.nix
new file mode 100644
index 0000000000..6d458f7377
--- /dev/null
+++ b/third_party/nixpkgs/pkgs/applications/video/kodi-packages/kodi-platform/default.nix
@@ -0,0 +1,15 @@
+{ stdenv, fetchFromGitHub, cmake, kodi, libcec_platform, tinyxml }:
+stdenv.mkDerivation rec {
+ pname = "kodi-platform";
+ version = "17.1";
+
+ src = fetchFromGitHub {
+ owner = "xbmc";
+ repo = pname;
+ rev = "c8188d82678fec6b784597db69a68e74ff4986b5";
+ sha256 = "1r3gs3c6zczmm66qcxh9mr306clwb3p7ykzb70r3jv5jqggiz199";
+ };
+
+ nativeBuildInputs = [ cmake ];
+ buildInputs = [ kodi libcec_platform tinyxml ];
+}
diff --git a/third_party/nixpkgs/pkgs/applications/video/kodi-packages/myconnpy/default.nix b/third_party/nixpkgs/pkgs/applications/video/kodi-packages/myconnpy/default.nix
new file mode 100644
index 0000000000..a1b2557652
--- /dev/null
+++ b/third_party/nixpkgs/pkgs/applications/video/kodi-packages/myconnpy/default.nix
@@ -0,0 +1,21 @@
+{ lib, buildKodiAddon, fetchzip, addonUpdateScript }:
+buildKodiAddon rec {
+ pname = "myconnpy";
+ namespace = "script.module.myconnpy";
+ version = "8.0.18+matrix.1";
+
+ src = fetchzip {
+ url = "https://mirrors.kodi.tv/addons/matrix/${namespace}/${namespace}-${version}.zip";
+ sha256 = "1cx3qdzw9lkkmbyvyrmc2i193is20fihn2sfl7kmv43f708vam0k";
+ };
+
+ passthru.updateScript = addonUpdateScript {
+ attrPath = "kodi.packages.myconnpy";
+ };
+
+ meta = with lib; {
+ homepage = "http://dev.mysql.com/doc/connector-python/en/index.html";
+ description = "MySQL Connector/Python";
+ license = licenses.gpl2Only;
+ };
+}
diff --git a/third_party/nixpkgs/pkgs/applications/video/kodi-packages/netflix/default.nix b/third_party/nixpkgs/pkgs/applications/video/kodi-packages/netflix/default.nix
new file mode 100644
index 0000000000..20440153f7
--- /dev/null
+++ b/third_party/nixpkgs/pkgs/applications/video/kodi-packages/netflix/default.nix
@@ -0,0 +1,26 @@
+{ lib, buildKodiAddon, fetchFromGitHub, signals, inputstreamhelper, requests, myconnpy }:
+buildKodiAddon rec {
+ pname = "netflix";
+ namespace = "plugin.video.netflix";
+ version = "1.14.1";
+
+ src = fetchFromGitHub {
+ owner = "CastagnaIT";
+ repo = namespace;
+ rev = "v${version}";
+ sha256 = "0vv3234gg4brp0gvrsl4vdskmpfbyk4z7cjmmj31zn4m8j33japn";
+ };
+
+ propagatedBuildInputs = [
+ signals
+ inputstreamhelper
+ requests
+ myconnpy
+ ];
+
+ meta = with lib; {
+ homepage = "https://github.com/CastagnaIT/plugin.video.netflix";
+ description = "Netflix VOD Services Add-on";
+ license = licenses.mit;
+ };
+}
diff --git a/third_party/nixpkgs/pkgs/applications/video/kodi-packages/osmc-skin/default.nix b/third_party/nixpkgs/pkgs/applications/video/kodi-packages/osmc-skin/default.nix
new file mode 100644
index 0000000000..c83fd66a43
--- /dev/null
+++ b/third_party/nixpkgs/pkgs/applications/video/kodi-packages/osmc-skin/default.nix
@@ -0,0 +1,21 @@
+{ lib, buildKodiAddon, fetchFromGitHub }:
+buildKodiAddon rec {
+ pname = "osmc-skin";
+ namespace = "skin.osmc";
+ version = "18.0.0";
+
+ src = fetchFromGitHub {
+ owner = "osmc";
+ repo = namespace;
+ rev = "40a6c318641e2cbeac58fb0e7dde9c2beac737a0";
+ sha256 = "1l7hyfj5zvjxjdm94y325bmy1naak455b9l8952sb0gllzrcwj6s";
+ };
+
+ meta = with lib; {
+ homepage = "https://github.com/osmc/skin.osmc";
+ description = "The default skin for OSMC";
+ platforms = platforms.all;
+ maintainers = with maintainers; [ worldofpeace ];
+ license = licenses.cc-by-nc-sa-30;
+ };
+}
diff --git a/third_party/nixpkgs/pkgs/applications/video/kodi-packages/pdfreader/default.nix b/third_party/nixpkgs/pkgs/applications/video/kodi-packages/pdfreader/default.nix
new file mode 100644
index 0000000000..430b9be3fd
--- /dev/null
+++ b/third_party/nixpkgs/pkgs/applications/video/kodi-packages/pdfreader/default.nix
@@ -0,0 +1,19 @@
+{ lib, buildKodiAddon, fetchFromGitHub }:
+buildKodiAddon rec {
+ pname = "pdfreader";
+ namespace = "plugin.image.pdf";
+ version = "2.0.2";
+
+ src = fetchFromGitHub {
+ owner = "i96751414";
+ repo = "plugin.image.pdfreader";
+ rev = "v${version}";
+ sha256 = "0nkqhlm1gyagq6xpdgqvd5qxyr2ngpml9smdmzfabc8b972mwjml";
+ };
+
+ meta = with lib; {
+ homepage = "https://forum.kodi.tv/showthread.php?tid=187421";
+ description = "A comic book reader";
+ maintainers = with maintainers; [ edwtjo ];
+ };
+}
diff --git a/third_party/nixpkgs/pkgs/applications/video/kodi-packages/pvr-hdhomerun/default.nix b/third_party/nixpkgs/pkgs/applications/video/kodi-packages/pvr-hdhomerun/default.nix
new file mode 100644
index 0000000000..3920120b90
--- /dev/null
+++ b/third_party/nixpkgs/pkgs/applications/video/kodi-packages/pvr-hdhomerun/default.nix
@@ -0,0 +1,22 @@
+{ lib, rel, buildKodiBinaryAddon, fetchFromGitHub, jsoncpp, libhdhomerun }:
+buildKodiBinaryAddon rec {
+ pname = "pvr-hdhomerun";
+ namespace = "pvr.hdhomerun";
+ version = "7.1.0";
+
+ src = fetchFromGitHub {
+ owner = "kodi-pvr";
+ repo = "pvr.hdhomerun";
+ rev = "${version}-${rel}";
+ sha256 = "0gbwjssnd319csq2kwlyjj1rskg19m1dxac5dl2dymvx5hn3zrgm";
+ };
+
+ meta = with lib; {
+ homepage = "https://github.com/kodi-pvr/pvr.hdhomerun";
+ description = "Kodi's HDHomeRun PVR client addon";
+ platforms = platforms.all;
+ maintainers = with maintainers; [ titanous ];
+ };
+
+ extraBuildInputs = [ jsoncpp libhdhomerun ];
+}
diff --git a/third_party/nixpkgs/pkgs/applications/video/kodi-packages/pvr-hts/default.nix b/third_party/nixpkgs/pkgs/applications/video/kodi-packages/pvr-hts/default.nix
new file mode 100644
index 0000000000..935238758a
--- /dev/null
+++ b/third_party/nixpkgs/pkgs/applications/video/kodi-packages/pvr-hts/default.nix
@@ -0,0 +1,21 @@
+{ lib, rel, buildKodiBinaryAddon, fetchFromGitHub }:
+buildKodiBinaryAddon rec {
+ pname = "pvr-hts";
+ namespace = "pvr.hts";
+ version = "8.2.2";
+
+ src = fetchFromGitHub {
+ owner = "kodi-pvr";
+ repo = "pvr.hts";
+ rev = "${version}-${rel}";
+ sha256 = "0jnn9gfjl556acqjf92wzzn371gxymhbbi665nqgg2gjcan0a49q";
+ };
+
+ meta = with lib; {
+ homepage = "https://github.com/kodi-pvr/pvr.hts";
+ description = "Kodi's Tvheadend HTSP client addon";
+ platforms = platforms.all;
+ maintainers = with maintainers; [ cpages ];
+ };
+
+}
diff --git a/third_party/nixpkgs/pkgs/applications/video/kodi-packages/pvr-iptvsimple/default.nix b/third_party/nixpkgs/pkgs/applications/video/kodi-packages/pvr-iptvsimple/default.nix
new file mode 100644
index 0000000000..b508eae8c7
--- /dev/null
+++ b/third_party/nixpkgs/pkgs/applications/video/kodi-packages/pvr-iptvsimple/default.nix
@@ -0,0 +1,22 @@
+{ lib, rel, buildKodiBinaryAddon, fetchFromGitHub, zlib, pugixml }:
+buildKodiBinaryAddon rec {
+ pname = "pvr-iptvsimple";
+ namespace = "pvr.iptvsimple";
+ version = "7.4.2";
+
+ src = fetchFromGitHub {
+ owner = "kodi-pvr";
+ repo = "pvr.iptvsimple";
+ rev = "${version}-${rel}";
+ sha256 = "062i922qi0izkvn7v47yhyy2cf3fa7xc3k95b1gm9abfdwkk8ywr";
+ };
+
+ meta = with lib; {
+ homepage = "https://github.com/kodi-pvr/pvr.iptvsimple";
+ description = "Kodi's IPTV Simple client addon";
+ platforms = platforms.all;
+ license = licenses.gpl2Plus;
+ };
+
+ extraBuildInputs = [ zlib pugixml ];
+}
diff --git a/third_party/nixpkgs/pkgs/applications/video/kodi-packages/requests/default.nix b/third_party/nixpkgs/pkgs/applications/video/kodi-packages/requests/default.nix
new file mode 100644
index 0000000000..05288b74b6
--- /dev/null
+++ b/third_party/nixpkgs/pkgs/applications/video/kodi-packages/requests/default.nix
@@ -0,0 +1,28 @@
+{ lib, buildKodiAddon, fetchzip, addonUpdateScript, certifi, chardet, idna, urllib3 }:
+buildKodiAddon rec {
+ pname = "requests";
+ namespace = "script.module.requests";
+ version = "2.22.0+matrix.1";
+
+ src = fetchzip {
+ url = "https://mirrors.kodi.tv/addons/matrix/${namespace}/${namespace}-${version}.zip";
+ sha256 = "09576galkyzhw8fhy2h4aablm5rm2v08g0mdmg9nn55dlxhkkljq";
+ };
+
+ propagatedBuildInputs = [
+ certifi
+ chardet
+ idna
+ urllib3
+ ];
+
+ passthru.updateScript = addonUpdateScript {
+ attrPath = "kodi.packages.requests";
+ };
+
+ meta = with lib; {
+ homepage = "http://python-requests.org";
+ description = "Python HTTP for Humans";
+ license = licenses.asl20;
+ };
+}
diff --git a/third_party/nixpkgs/pkgs/applications/video/kodi-packages/signals/default.nix b/third_party/nixpkgs/pkgs/applications/video/kodi-packages/signals/default.nix
new file mode 100644
index 0000000000..9d49e63272
--- /dev/null
+++ b/third_party/nixpkgs/pkgs/applications/video/kodi-packages/signals/default.nix
@@ -0,0 +1,21 @@
+{ lib, buildKodiAddon, fetchzip, addonUpdateScript }:
+buildKodiAddon rec {
+ pname = "signals";
+ namespace = "script.module.addon.signals";
+ version = "0.0.6+matrix.1";
+
+ src = fetchzip {
+ url = "https://mirrors.kodi.tv/addons/matrix/${namespace}/${namespace}-${version}.zip";
+ sha256 = "1qcjbakch8hvx02wc01zv014nmzgn6ahc4n2bj5mzr114ppd3hjs";
+ };
+
+ passthru.updateScript = addonUpdateScript {
+ attrPath = "kodi.packages.signals";
+ };
+
+ meta = with lib; {
+ homepage = "https://github.com/ruuk/script.module.addon.signals";
+ description = "Provides signal/slot mechanism for inter-addon communication";
+ license = licenses.lgpl21Only;
+ };
+}
diff --git a/third_party/nixpkgs/pkgs/applications/video/kodi-packages/steam-controller/default.nix b/third_party/nixpkgs/pkgs/applications/video/kodi-packages/steam-controller/default.nix
new file mode 100644
index 0000000000..5eee0eff94
--- /dev/null
+++ b/third_party/nixpkgs/pkgs/applications/video/kodi-packages/steam-controller/default.nix
@@ -0,0 +1,22 @@
+{ lib, buildKodiBinaryAddon, fetchFromGitHub, libusb1 }:
+buildKodiBinaryAddon rec {
+ pname = namespace;
+ namespace = "peripheral.steamcontroller";
+ version = "0.11.0";
+
+ src = fetchFromGitHub {
+ owner = "kodi-game";
+ repo = namespace;
+ rev = "f68140ca44f163a03d3a625d1f2005a6edef96cb";
+ sha256 = "09lm8i119xlsxxk0c64rnp8iw0crr90v7m8iwi9r31qdmxrdxpmg";
+ };
+
+ extraBuildInputs = [ libusb1 ];
+
+ meta = with lib; {
+ description = "Binary addon for steam controller.";
+ platforms = platforms.all;
+ maintainers = with maintainers; [ edwtjo ];
+ };
+
+}
diff --git a/third_party/nixpkgs/pkgs/applications/video/kodi-packages/steam-launcher/default.nix b/third_party/nixpkgs/pkgs/applications/video/kodi-packages/steam-launcher/default.nix
new file mode 100644
index 0000000000..cb140b4fb4
--- /dev/null
+++ b/third_party/nixpkgs/pkgs/applications/video/kodi-packages/steam-launcher/default.nix
@@ -0,0 +1,28 @@
+{ lib, buildKodiAddon, fetchFromGitHub, steam }:
+buildKodiAddon {
+ pname = "steam-launcher";
+ namespace = "script.steam.launcher";
+ version = "3.5.1";
+
+ src = fetchFromGitHub rec {
+ owner = "teeedubb";
+ repo = owner + "-xbmc-repo";
+ rev = "8260bf9b464846a1f1965da495d2f2b7ceb81d55";
+ sha256 = "1fj3ry5s44nf1jzxk4bmnpa4b9p23nrpmpj2a4i6xf94h7jl7p5k";
+ };
+
+ propagatedBuildInputs = [ steam ];
+
+ meta = with lib; {
+ homepage = "https://forum.kodi.tv/showthread.php?tid=157499";
+ description = "Launch Steam in Big Picture Mode from Kodi";
+ longDescription = ''
+ This add-on will close/minimise Kodi, launch Steam in Big
+ Picture Mode and when Steam BPM is exited (either by quitting
+ Steam or returning to the desktop) Kodi will
+ restart/maximise. Running pre/post Steam scripts can be
+ configured via the addon.
+ '';
+ maintainers = with maintainers; [ edwtjo ];
+ };
+}
diff --git a/third_party/nixpkgs/pkgs/applications/video/kodi-packages/svtplay/default.nix b/third_party/nixpkgs/pkgs/applications/video/kodi-packages/svtplay/default.nix
new file mode 100644
index 0000000000..cc7d350fa3
--- /dev/null
+++ b/third_party/nixpkgs/pkgs/applications/video/kodi-packages/svtplay/default.nix
@@ -0,0 +1,26 @@
+{ lib, buildKodiAddon, fetchFromGitHub }:
+buildKodiAddon rec {
+ pname = "svtplay";
+ namespace = "plugin.video.svtplay";
+ version = "5.1.12";
+
+ src = fetchFromGitHub {
+ owner = "nilzen";
+ repo = "xbmc-" + pname;
+ rev = "v${version}";
+ sha256 = "04j1nhm7mh9chs995lz6bv1vsq5xzk7a7c0lmk4bnfv8jrfpj0w6";
+ };
+
+ meta = with lib; {
+ homepage = "https://forum.kodi.tv/showthread.php?tid=67110";
+ description = "Watch content from SVT Play";
+ longDescription = ''
+ With this addon you can stream content from SVT Play
+ (svtplay.se). The plugin fetches the video URL from the SVT
+ Play website and feeds it to the Kodi video player. HLS (m3u8)
+ is the preferred video format by the plugin.
+ '';
+ platforms = platforms.all;
+ maintainers = with maintainers; [ edwtjo ];
+ };
+}
diff --git a/third_party/nixpkgs/pkgs/applications/video/kodi-packages/urllib3/default.nix b/third_party/nixpkgs/pkgs/applications/video/kodi-packages/urllib3/default.nix
new file mode 100644
index 0000000000..e814698791
--- /dev/null
+++ b/third_party/nixpkgs/pkgs/applications/video/kodi-packages/urllib3/default.nix
@@ -0,0 +1,21 @@
+{ lib, buildKodiAddon, fetchzip, addonUpdateScript }:
+buildKodiAddon rec {
+ pname = "urllib3";
+ namespace = "script.module.urllib3";
+ version = "1.25.8+matrix.1";
+
+ src = fetchzip {
+ url = "https://mirrors.kodi.tv/addons/matrix/${namespace}/${namespace}-${version}.zip";
+ sha256 = "080yq8ns0sag6rmdag1hjwi0whcmp35wzqjp3by92m81cpszs75q";
+ };
+
+ passthru.updateScript = addonUpdateScript {
+ attrPath = "kodi.packages.urllib3";
+ };
+
+ meta = with lib; {
+ homepage = "https://urllib3.readthedocs.io/en/latest/";
+ description = "HTTP library with thread-safe connection pooling, file post, and more";
+ license = licenses.mit;
+ };
+}
diff --git a/third_party/nixpkgs/pkgs/applications/video/kodi-packages/vfs-libarchive/default.nix b/third_party/nixpkgs/pkgs/applications/video/kodi-packages/vfs-libarchive/default.nix
new file mode 100644
index 0000000000..13100b0dd3
--- /dev/null
+++ b/third_party/nixpkgs/pkgs/applications/video/kodi-packages/vfs-libarchive/default.nix
@@ -0,0 +1,22 @@
+{ lib, rel, buildKodiBinaryAddon, fetchFromGitHub, libarchive, lzma, bzip2, zlib, lz4, lzo, openssl }:
+buildKodiBinaryAddon rec {
+ pname = namespace;
+ namespace = "vfs.libarchive";
+ version = "2.0.0";
+
+ src = fetchFromGitHub {
+ owner = "xbmc";
+ repo = namespace;
+ rev = "${version}-${rel}";
+ sha256 = "1q62p1i6rvqk2zv6f1cpffkh95lgclys2xl4dwyhj3acmqdxd9i5";
+ };
+
+ meta = with lib; {
+ description = "LibArchive Virtual Filesystem add-on for Kodi";
+ license = licenses.gpl2Plus;
+ platforms = platforms.all;
+ maintainers = with maintainers; [ minijackson ];
+ };
+
+ extraBuildInputs = [ libarchive lzma bzip2 zlib lz4 lzo openssl ];
+}
diff --git a/third_party/nixpkgs/pkgs/applications/video/kodi-packages/vfs-sftp/default.nix b/third_party/nixpkgs/pkgs/applications/video/kodi-packages/vfs-sftp/default.nix
new file mode 100644
index 0000000000..7910ab640e
--- /dev/null
+++ b/third_party/nixpkgs/pkgs/applications/video/kodi-packages/vfs-sftp/default.nix
@@ -0,0 +1,22 @@
+{ lib, rel, buildKodiBinaryAddon, fetchFromGitHub, openssl, libssh, zlib }:
+buildKodiBinaryAddon rec {
+ pname = namespace;
+ namespace = "vfs.sftp";
+ version = "2.0.0";
+
+ src = fetchFromGitHub {
+ owner = "xbmc";
+ repo = namespace;
+ rev = "${version}-${rel}";
+ sha256 = "06w74sh8yagrrp7a7rjaz3xrh1j3wdqald9c4b72c33gpk5997dk";
+ };
+
+ meta = with lib; {
+ description = "SFTP Virtual Filesystem add-on for Kodi";
+ license = licenses.gpl2Plus;
+ platforms = platforms.all;
+ maintainers = with maintainers; [ minijackson ];
+ };
+
+ extraBuildInputs = [ openssl libssh zlib ];
+}
diff --git a/third_party/nixpkgs/pkgs/applications/video/kodi/build-kodi-addon.nix b/third_party/nixpkgs/pkgs/applications/video/kodi/build-kodi-addon.nix
new file mode 100644
index 0000000000..cd768b6fa9
--- /dev/null
+++ b/third_party/nixpkgs/pkgs/applications/video/kodi/build-kodi-addon.nix
@@ -0,0 +1,21 @@
+{ stdenv, toKodiAddon, addonDir }:
+{ name ? "${attrs.pname}-${attrs.version}"
+, namespace
+, sourceDir ? ""
+, ... } @ attrs:
+toKodiAddon (stdenv.mkDerivation ({
+ name = "kodi-" + name;
+
+ dontStrip = true;
+
+ extraRuntimeDependencies = [ ];
+
+ installPhase = ''
+ cd $src/$sourceDir
+ d=$out${addonDir}/${namespace}
+ mkdir -p $d
+ sauce="."
+ [ -d ${namespace} ] && sauce=${namespace}
+ cp -R "$sauce/"* $d
+ '';
+} // attrs))
diff --git a/third_party/nixpkgs/pkgs/applications/video/kodi/build-kodi-binary-addon.nix b/third_party/nixpkgs/pkgs/applications/video/kodi/build-kodi-binary-addon.nix
new file mode 100644
index 0000000000..74ce508ab6
--- /dev/null
+++ b/third_party/nixpkgs/pkgs/applications/video/kodi/build-kodi-binary-addon.nix
@@ -0,0 +1,31 @@
+{ stdenv, toKodiAddon, addonDir, cmake, kodi, kodi-platform, libcec_platform }:
+{ name ? "${attrs.pname}-${attrs.version}"
+, namespace
+, version
+, extraBuildInputs ? []
+, extraRuntimeDependencies ? []
+, extraInstallPhase ? "", ... } @ attrs:
+toKodiAddon (stdenv.mkDerivation ({
+ name = "kodi-" + name;
+
+ dontStrip = true;
+
+ nativeBuildInputs = [ cmake ];
+ buildInputs = [ kodi kodi-platform libcec_platform ] ++ extraBuildInputs;
+
+ inherit extraRuntimeDependencies;
+
+ # disables check ensuring install prefix is that of kodi
+ cmakeFlags = [
+ "-DOVERRIDE_PATHS=1"
+ ];
+
+ # kodi checks for addon .so libs existance in the addon folder (share/...)
+ # and the non-wrapped kodi lib/... folder before even trying to dlopen
+ # them. Symlinking .so, as setting LD_LIBRARY_PATH is of no use
+ installPhase = let n = namespace; in ''
+ make install
+ ln -s $out/lib/addons/${n}/${n}.so.${version} $out${addonDir}/${n}/${n}.so.${version}
+ ${extraInstallPhase}
+ '';
+} // attrs))
diff --git a/third_party/nixpkgs/pkgs/applications/video/kodi/default.nix b/third_party/nixpkgs/pkgs/applications/video/kodi/default.nix
index 55ba84cc45..3f382efff1 100644
--- a/third_party/nixpkgs/pkgs/applications/video/kodi/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/video/kodi/default.nix
@@ -1,7 +1,7 @@
{ callPackage, ... } @ args:
let
unwrapped = callPackage ./unwrapped.nix (removeAttrs args [ "callPackage" ]);
- kodiPackages = callPackage ./packages.nix { kodi = unwrapped; };
+ kodiPackages = callPackage ../../../top-level/kodi-packages.nix { kodi = unwrapped; };
in
unwrapped.overrideAttrs (oldAttrs: {
passthru = oldAttrs.passthru // {
diff --git a/third_party/nixpkgs/pkgs/applications/video/kodi/packages.nix b/third_party/nixpkgs/pkgs/applications/video/kodi/packages.nix
deleted file mode 100644
index 8e0ecbf9b9..0000000000
--- a/third_party/nixpkgs/pkgs/applications/video/kodi/packages.nix
+++ /dev/null
@@ -1,560 +0,0 @@
-{ lib, stdenv, callPackage, fetchFromGitHub
-, cmake, kodi, libcec_platform, tinyxml, pugixml
-, steam, udev, libusb1, jsoncpp, libhdhomerun, zlib
-, python3Packages, expat, glib, nspr, nss, openssl
-, libssh, libarchive, lzma, bzip2, lz4, lzo }:
-
-with lib;
-
-let self = rec {
-
- addonDir = "/share/kodi/addons";
- rel = "Matrix";
-
- inherit kodi;
-
- # Convert derivation to a kodi module. Stolen from ../../../top-level/python-packages.nix
- toKodiAddon = drv: drv.overrideAttrs(oldAttrs: {
- # Use passthru in order to prevent rebuilds when possible.
- passthru = (oldAttrs.passthru or {})// {
- kodiAddonFor = kodi;
- requiredKodiAddons = requiredKodiAddons drv.propagatedBuildInputs;
- };
- });
-
- # Check whether a derivation provides a Kodi addon.
- hasKodiAddon = drv: drv ? kodiAddonFor && drv.kodiAddonFor == kodi;
-
- # Get list of required Kodi addons given a list of derivations.
- requiredKodiAddons = drvs: let
- modules = filter hasKodiAddon drvs;
- in unique (modules ++ concatLists (catAttrs "requiredKodiAddons" modules));
-
- kodi-platform = stdenv.mkDerivation rec {
- project = "kodi-platform";
- version = "17.1";
- name = "${project}-${version}";
-
- src = fetchFromGitHub {
- owner = "xbmc";
- repo = project;
- rev = "c8188d82678fec6b784597db69a68e74ff4986b5";
- sha256 = "1r3gs3c6zczmm66qcxh9mr306clwb3p7ykzb70r3jv5jqggiz199";
- };
-
- nativeBuildInputs = [ cmake ];
- buildInputs = [ kodi libcec_platform tinyxml ];
- };
-
- buildKodiAddon =
- { name ? "${attrs.pname}-${attrs.version}"
- , namespace
- , sourceDir ? ""
- , ... } @ attrs:
- toKodiAddon (stdenv.mkDerivation ({
- name = "kodi-" + name;
-
- dontStrip = true;
-
- extraRuntimeDependencies = [ ];
-
- installPhase = ''
- cd $src/$sourceDir
- d=$out${addonDir}/${namespace}
- mkdir -p $d
- sauce="."
- [ -d ${namespace} ] && sauce=${namespace}
- cp -R "$sauce/"* $d
- '';
- } // attrs));
-
- buildKodiBinaryAddon =
- { name ? "${attrs.pname}-${attrs.version}"
- , namespace
- , version
- , extraBuildInputs ? []
- , extraRuntimeDependencies ? []
- , extraInstallPhase ? "", ... } @ attrs:
- toKodiAddon (stdenv.mkDerivation ({
- name = "kodi-" + name;
-
- dontStrip = true;
-
- nativeBuildInputs = [ cmake ];
- buildInputs = [ kodi kodi-platform libcec_platform ] ++ extraBuildInputs;
-
- inherit extraRuntimeDependencies;
-
- # disables check ensuring install prefix is that of kodi
- cmakeFlags = [
- "-DOVERRIDE_PATHS=1"
- ];
-
- # kodi checks for addon .so libs existance in the addon folder (share/...)
- # and the non-wrapped kodi lib/... folder before even trying to dlopen
- # them. Symlinking .so, as setting LD_LIBRARY_PATH is of no use
- installPhase = let n = namespace; in ''
- make install
- ln -s $out/lib/addons/${n}/${n}.so.${version} $out${addonDir}/${n}/${n}.so.${version}
- ${extraInstallPhase}
- '';
- } // attrs));
-
- advanced-launcher = buildKodiAddon rec {
-
- pname = "advanced-launcher";
- namespace = "plugin.program.advanced.launcher";
- version = "2.5.8";
-
- src = fetchFromGitHub {
- owner = "edwtjo";
- repo = pname;
- rev = version;
- sha256 = "142vvgs37asq5m54xqhjzqvgmb0xlirvm0kz6lxaqynp0vvgrkx2";
- };
-
- meta = {
- homepage = "https://forum.kodi.tv/showthread.php?tid=85724";
- description = "A program launcher for Kodi";
- longDescription = ''
- Advanced Launcher allows you to start any Linux, Windows and
- macOS external applications (with command line support or not)
- directly from the Kodi GUI. Advanced Launcher also give you
- the possibility to edit, download (from Internet resources)
- and manage all the meta-data (informations and images) related
- to these applications.
- '';
- platforms = platforms.all;
- maintainers = with maintainers; [ edwtjo ];
- broken = true; # requires port to python3
- };
-
- };
-
- advanced-emulator-launcher = buildKodiAddon rec {
-
- pname = "advanced-emulator-launcher";
- namespace = "plugin.program.advanced.emulator.launcher";
- version = "0.9.6";
-
- src = fetchFromGitHub {
- owner = "Wintermute0110";
- repo = namespace;
- rev = version;
- sha256 = "1sv9z77jj6bam6llcnd9b3dgkbvhwad2m1v541rv3acrackms2z2";
- };
-
- meta = {
- homepage = "https://forum.kodi.tv/showthread.php?tid=287826";
- description = "A program launcher for Kodi";
- longDescription = ''
- Advanced Emulator Launcher is a multi-emulator front-end for Kodi
- scalable to collections of thousands of ROMs. Includes offline scrapers
- for MAME and No-Intro ROM sets and also supports scrapping ROM metadata
- and artwork online. ROM auditing for No-Intro ROMs using No-Intro XML
- DATs. Launching of games and standalone applications is also available.
- '';
- platforms = platforms.all;
- maintainers = with maintainers; [ edwtjo ];
- broken = true; # requires port to python3
- };
-
- };
-
- controllers = let
- pname = "game-controller";
- version = "1.0.3";
-
- src = fetchFromGitHub {
- owner = "kodi-game";
- repo = "kodi-game-controllers";
- rev = "01acb5b6e8b85392b3cb298b034aadb1b24ccf18";
- sha256 = "0sbc0w0fwbp7rbmbgb6a1kglhnn5g85hijcbbvf5x6jdq9v3f1qb";
- };
-
- meta = {
- description = "Add support for different gaming controllers.";
- platforms = platforms.all;
- maintainers = with maintainers; [ edwtjo ];
- };
-
- mkController = controller: {
- ${controller} = buildKodiAddon rec {
- pname = pname + "-" + controller;
- namespace = "game.controller." + controller;
- sourceDir = "addons/" + namespace;
- inherit version src meta;
- };
- };
- in (mkController "default")
- // (mkController "dreamcast")
- // (mkController "gba")
- // (mkController "genesis")
- // (mkController "mouse")
- // (mkController "n64")
- // (mkController "nes")
- // (mkController "ps")
- // (mkController "snes");
-
- hyper-launcher = let
- pname = "hyper-launcher";
- version = "1.5.2";
- src = fetchFromGitHub rec {
- name = pname + "-" + version + ".tar.gz";
- owner = "teeedubb";
- repo = owner + "-xbmc-repo";
- rev = "f958ba93fe85b9c9025b1745d89c2db2e7dd9bf6";
- sha256 = "1dvff24fbas25k5kvca4ssks9l1g5rfa3hl8lqxczkaqi3pp41j5";
- };
- meta = {
- homepage = "https://forum.kodi.tv/showthread.php?tid=258159";
- description = "A ROM launcher for Kodi that uses HyperSpin assets.";
- maintainers = with maintainers; [ edwtjo ];
- broken = true; # requires port to python3
- };
- in {
- service = buildKodiAddon {
- pname = pname + "-service";
- version = "1.2.1";
- namespace = "service.hyper.launcher";
- inherit src meta;
- };
- plugin = buildKodiAddon {
- namespace = "plugin.hyper.launcher";
- inherit pname version src meta;
- };
- };
-
- joystick = buildKodiBinaryAddon rec {
- pname = namespace;
- namespace = "peripheral.joystick";
- version = "1.7.1";
-
- src = fetchFromGitHub {
- owner = "xbmc";
- repo = namespace;
- rev = "${version}-${rel}";
- sha256 = "1dhj4afr9kj938xx70fq5r409mz6lbw4n581ljvdjj9lq7akc914";
- };
-
- meta = {
- description = "Binary addon for raw joystick input.";
- platforms = platforms.all;
- maintainers = with maintainers; [ edwtjo ];
- };
-
- extraBuildInputs = [ tinyxml udev ];
- };
-
- simpleplugin = buildKodiAddon rec {
- pname = "simpleplugin";
- namespace = "script.module.simpleplugin";
- version = "2.3.2";
-
- src = fetchFromGitHub {
- owner = "romanvm";
- repo = namespace;
- rev = "v.${version}";
- sha256 = "0myar8dqjigb75pcc8zx3i5z79p1ifgphgb82s5syqywk0zaxm3j";
- };
-
- meta = {
- homepage = src.meta.homepage;
- description = "Simpleplugin API";
- license = licenses.gpl3;
- broken = true; # requires port to python3
- };
- };
-
- svtplay = buildKodiAddon rec {
-
- pname = "svtplay";
- namespace = "plugin.video.svtplay";
- version = "5.1.12";
-
- src = fetchFromGitHub {
- name = pname + "-" + version + ".tar.gz";
- owner = "nilzen";
- repo = "xbmc-" + pname;
- rev = "v${version}";
- sha256 = "04j1nhm7mh9chs995lz6bv1vsq5xzk7a7c0lmk4bnfv8jrfpj0w6";
- };
-
- meta = {
- homepage = "https://forum.kodi.tv/showthread.php?tid=67110";
- description = "Watch content from SVT Play";
- longDescription = ''
- With this addon you can stream content from SVT Play
- (svtplay.se). The plugin fetches the video URL from the SVT
- Play website and feeds it to the Kodi video player. HLS (m3u8)
- is the preferred video format by the plugin.
- '';
- platforms = platforms.all;
- maintainers = with maintainers; [ edwtjo ];
- };
-
- };
-
- steam-controller = buildKodiBinaryAddon rec {
- pname = namespace;
- namespace = "peripheral.steamcontroller";
- version = "0.11.0";
-
- src = fetchFromGitHub {
- owner = "kodi-game";
- repo = namespace;
- rev = "f68140ca44f163a03d3a625d1f2005a6edef96cb";
- sha256 = "09lm8i119xlsxxk0c64rnp8iw0crr90v7m8iwi9r31qdmxrdxpmg";
- };
-
- extraBuildInputs = [ libusb1 ];
-
- meta = {
- description = "Binary addon for steam controller.";
- platforms = platforms.all;
- maintainers = with maintainers; [ edwtjo ];
- };
-
- };
-
- steam-launcher = buildKodiAddon {
-
- pname = "steam-launcher";
- namespace = "script.steam.launcher";
- version = "3.5.1";
-
- src = fetchFromGitHub rec {
- owner = "teeedubb";
- repo = owner + "-xbmc-repo";
- rev = "8260bf9b464846a1f1965da495d2f2b7ceb81d55";
- sha256 = "1fj3ry5s44nf1jzxk4bmnpa4b9p23nrpmpj2a4i6xf94h7jl7p5k";
- };
-
- propagatedBuildInputs = [ steam ];
-
- meta = {
- homepage = "https://forum.kodi.tv/showthread.php?tid=157499";
- description = "Launch Steam in Big Picture Mode from Kodi";
- longDescription = ''
- This add-on will close/minimise Kodi, launch Steam in Big
- Picture Mode and when Steam BPM is exited (either by quitting
- Steam or returning to the desktop) Kodi will
- restart/maximise. Running pre/post Steam scripts can be
- configured via the addon.
- '';
- maintainers = with maintainers; [ edwtjo ];
- };
- };
-
- pdfreader = buildKodiAddon rec {
- pname = "pdfreader";
- namespace = "plugin.image.pdf";
- version = "2.0.2";
-
- src = fetchFromGitHub {
- owner = "i96751414";
- repo = "plugin.image.pdfreader";
- rev = "v${version}";
- sha256 = "0nkqhlm1gyagq6xpdgqvd5qxyr2ngpml9smdmzfabc8b972mwjml";
- };
-
- meta = {
- homepage = "https://forum.kodi.tv/showthread.php?tid=187421";
- description = "A comic book reader";
- maintainers = with maintainers; [ edwtjo ];
- };
- };
-
- pvr-hts = buildKodiBinaryAddon rec {
-
- pname = "pvr-hts";
- namespace = "pvr.hts";
- version = "8.2.2";
-
- src = fetchFromGitHub {
- owner = "kodi-pvr";
- repo = "pvr.hts";
- rev = "${version}-${rel}";
- sha256 = "0jnn9gfjl556acqjf92wzzn371gxymhbbi665nqgg2gjcan0a49q";
- };
-
- meta = {
- homepage = "https://github.com/kodi-pvr/pvr.hts";
- description = "Kodi's Tvheadend HTSP client addon";
- platforms = platforms.all;
- maintainers = with maintainers; [ cpages ];
- };
-
- };
-
- pvr-hdhomerun = buildKodiBinaryAddon rec {
-
- pname = "pvr-hdhomerun";
- namespace = "pvr.hdhomerun";
- version = "7.1.0";
-
- src = fetchFromGitHub {
- owner = "kodi-pvr";
- repo = "pvr.hdhomerun";
- rev = "${version}-${rel}";
- sha256 = "0gbwjssnd319csq2kwlyjj1rskg19m1dxac5dl2dymvx5hn3zrgm";
- };
-
- meta = {
- homepage = "https://github.com/kodi-pvr/pvr.hdhomerun";
- description = "Kodi's HDHomeRun PVR client addon";
- platforms = platforms.all;
- maintainers = with maintainers; [ titanous ];
- };
-
- extraBuildInputs = [ jsoncpp libhdhomerun ];
-
- };
-
- pvr-iptvsimple = buildKodiBinaryAddon rec {
-
- pname = "pvr-iptvsimple";
- namespace = "pvr.iptvsimple";
- version = "7.4.2";
-
- src = fetchFromGitHub {
- owner = "kodi-pvr";
- repo = "pvr.iptvsimple";
- rev = "${version}-${rel}";
- sha256 = "062i922qi0izkvn7v47yhyy2cf3fa7xc3k95b1gm9abfdwkk8ywr";
- };
-
- meta = {
- homepage = "https://github.com/kodi-pvr/pvr.iptvsimple";
- description = "Kodi's IPTV Simple client addon";
- platforms = platforms.all;
- maintainers = with maintainers; [ ];
- license = licenses.gpl2Plus;
- };
-
- extraBuildInputs = [ zlib pugixml ];
- };
-
- osmc-skin = buildKodiAddon rec {
-
- pname = "osmc-skin";
- namespace = "skin.osmc";
- version = "18.0.0";
-
- src = fetchFromGitHub {
- owner = "osmc";
- repo = namespace;
- rev = "40a6c318641e2cbeac58fb0e7dde9c2beac737a0";
- sha256 = "1l7hyfj5zvjxjdm94y325bmy1naak455b9l8952sb0gllzrcwj6s";
- };
-
- meta = {
- homepage = "https://github.com/osmc/skin.osmc";
- description = "The default skin for OSMC";
- platforms = platforms.all;
- maintainers = with maintainers; [ worldofpeace ];
- license = licenses.cc-by-nc-sa-30;
- };
- };
-
- yatp = python3Packages.toPythonModule (buildKodiAddon rec {
- pname = "yatp";
- namespace = "plugin.video.yatp";
- version = "3.3.2";
-
- src = fetchFromGitHub {
- owner = "romanvm";
- repo = "kodi.yatp";
- rev = "v.${version}";
- sha256 = "12g1f57sx7dy6wy7ljl7siz2qs1kxcmijcg7xx2xpvmq61x9qa2d";
- };
-
- patches = [ ./yatp/dont-monkey.patch ];
-
- propagatedBuildInputs = [
- simpleplugin
- python3Packages.requests
- python3Packages.libtorrent-rasterbar
- ];
-
- meta = {
- homepage = src.meta.homepage;
- description = "Yet Another Torrent Player: libtorrent-based torrent streaming for Kodi";
- license = licenses.gpl3;
- broken = true; # requires port to python3
- };
- });
-
- inputstream-adaptive = buildKodiBinaryAddon rec {
-
- pname = "inputstream-adaptive";
- namespace = "inputstream.adaptive";
- version = "2.6.7";
-
- src = fetchFromGitHub {
- owner = "peak3d";
- repo = "inputstream.adaptive";
- rev = "${version}-${rel}";
- sha256 = "1pwqmbr78wp12jn6rwv63npdfc456adwz0amlxf6gvgg43li6p7s";
- };
-
- extraBuildInputs = [ expat ];
-
- extraRuntimeDependencies = [ glib nspr nss stdenv.cc.cc.lib ];
-
- extraInstallPhase = let n = namespace; in ''
- ln -s $out/lib/addons/${n}/libssd_wv.so $out/${addonDir}/${n}/libssd_wv.so
- '';
-
- meta = {
- homepage = "https://github.com/peak3d/inputstream.adaptive";
- description = "Kodi inputstream addon for several manifest types";
- platforms = platforms.all;
- maintainers = with maintainers; [ sephalon ];
- };
- };
-
- vfs-sftp = buildKodiBinaryAddon rec {
- pname = namespace;
- namespace = "vfs.sftp";
- version = "2.0.0";
-
- src = fetchFromGitHub {
- owner = "xbmc";
- repo = namespace;
- rev = "${version}-${rel}";
- sha256 = "06w74sh8yagrrp7a7rjaz3xrh1j3wdqald9c4b72c33gpk5997dk";
- };
-
- meta = with lib; {
- description = "SFTP Virtual Filesystem add-on for Kodi";
- license = licenses.gpl2Plus;
- platforms = platforms.all;
- maintainers = with maintainers; [ minijackson ];
- };
-
- extraBuildInputs = [ openssl libssh zlib ];
- };
-
- vfs-libarchive = buildKodiBinaryAddon rec {
- pname = namespace;
- namespace = "vfs.libarchive";
- version = "2.0.0";
-
- src = fetchFromGitHub {
- owner = "xbmc";
- repo = namespace;
- rev = "${version}-${rel}";
- sha256 = "1q62p1i6rvqk2zv6f1cpffkh95lgclys2xl4dwyhj3acmqdxd9i5";
- };
-
- meta = with lib; {
- description = "LibArchive Virtual Filesystem add-on for Kodi";
- license = licenses.gpl2Plus;
- platforms = platforms.all;
- maintainers = with maintainers; [ minijackson ];
- };
-
- extraBuildInputs = [ libarchive lzma bzip2 zlib lz4 lzo openssl ];
- };
-}; in self
diff --git a/third_party/nixpkgs/pkgs/applications/video/kodi/wrapper.nix b/third_party/nixpkgs/pkgs/applications/video/kodi/wrapper.nix
index 2b4abbb500..8616468213 100644
--- a/third_party/nixpkgs/pkgs/applications/video/kodi/wrapper.nix
+++ b/third_party/nixpkgs/pkgs/applications/video/kodi/wrapper.nix
@@ -1,5 +1,10 @@
{ lib, makeWrapper, buildEnv, kodi, addons }:
+let
+ # linux distros are supposed to provide pillow and pycryptodome
+ requiredPythonPackages = with kodi.pythonPackages; [ pillow pycryptodome] ++ addons;
+in
+
buildEnv {
name = "${kodi.name}-env";
@@ -13,7 +18,7 @@ buildEnv {
for exe in kodi{,-standalone}
do
makeWrapper ${kodi}/bin/$exe $out/bin/$exe \
- --prefix PYTHONPATH : ${kodi.pythonPackages.makePythonPath addons} \
+ --prefix PYTHONPATH : ${kodi.pythonPackages.makePythonPath requiredPythonPackages} \
--prefix KODI_HOME : $out/share/kodi \
--prefix LD_LIBRARY_PATH ":" "${lib.makeLibraryPath
(lib.concatMap
diff --git a/third_party/nixpkgs/pkgs/applications/video/kodi/yatp/dont-monkey.patch b/third_party/nixpkgs/pkgs/applications/video/kodi/yatp/dont-monkey.patch
deleted file mode 100644
index 62d5d0c0d4..0000000000
--- a/third_party/nixpkgs/pkgs/applications/video/kodi/yatp/dont-monkey.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-diff --git a/plugin.video.yatp/server.py b/plugin.video.yatp/server.py
-index 1adcbb5..488b72c 100644
---- a/plugin.video.yatp/server.py
-+++ b/plugin.video.yatp/server.py
-@@ -20,24 +20,8 @@ addon = Addon()
- _ = addon.initialize_gettext()
- addon.log_notice('Starting Torrent Server...')
-
--# A monkey-patch to set the necessary librorrent version
--librorrent_addon = Addon('script.module.libtorrent')
--orig_custom_version = librorrent_addon.get_setting('custom_version', False)
--orig_set_version = librorrent_addon.get_setting('set_version', False)
--librorrent_addon.set_setting('custom_version', 'true')
--if addon.libtorrent_version == '1.0.9':
-- librorrent_addon.set_setting('set_version', '4')
--elif addon.libtorrent_version == '1.1.0':
-- librorrent_addon.set_setting('set_version', '5')
--elif addon.libtorrent_version == '1.1.1':
-- librorrent_addon.set_setting('set_version', '6')
--else:
-- librorrent_addon.set_setting('set_version', '0')
--
- from libs.server import wsgi_app
-
--librorrent_addon.set_setting('custom_version', orig_custom_version)
--librorrent_addon.set_setting('set_version', orig_set_version)
- # ======
-
- if addon.enable_limits:
diff --git a/third_party/nixpkgs/pkgs/applications/video/obs-studio/default.nix b/third_party/nixpkgs/pkgs/applications/video/obs-studio/default.nix
index 9fdb78c703..caeffa56b1 100644
--- a/third_party/nixpkgs/pkgs/applications/video/obs-studio/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/video/obs-studio/default.nix
@@ -17,6 +17,7 @@
, libv4l
, x264
, curl
+, wayland
, xorg
, makeWrapper
, pkg-config
@@ -67,6 +68,7 @@ in mkDerivation rec {
qtx11extras
qtsvg
speex
+ wayland
x264
libvlc
makeWrapper
diff --git a/third_party/nixpkgs/pkgs/applications/video/vlc/default.nix b/third_party/nixpkgs/pkgs/applications/video/vlc/default.nix
index f798992596..adb7ba970e 100644
--- a/third_party/nixpkgs/pkgs/applications/video/vlc/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/video/vlc/default.nix
@@ -38,7 +38,7 @@ stdenv.mkDerivation rec {
zlib a52dec libmad faad2 ffmpeg alsaLib libdvdnav libdvdnav.libdvdread
libbluray dbus fribidi libvorbis libtheora speex lua5 libgcrypt libgpgerror
libupnp libcaca libpulseaudio flac schroedinger libxml2 librsvg mpeg2dec
- systemd gnutls avahi libcddb SDL SDL_image libmtp unzip taglib libarchive
+ systemd gnutls avahi libcddb SDL SDL_image libmtp taglib libarchive
libkate libtiger libv4l samba libssh2 liboggz libass libdvbpsi libva
xorg.xlibsWrapper xorg.libXv xorg.libXvMC xorg.libXpm xorg.xcbutilkeysyms
libdc1394 libraw1394 libopus libebml libmatroska libvdpau libsamplerate
@@ -49,7 +49,7 @@ stdenv.mkDerivation rec {
++ optional jackSupport libjack2
++ optionals chromecastSupport [ protobuf libmicrodns ];
- nativeBuildInputs = [ autoreconfHook perl pkg-config removeReferencesTo ]
+ nativeBuildInputs = [ autoreconfHook perl pkg-config removeReferencesTo unzip ]
++ optionals withQt5 [ wrapQtAppsHook ];
enableParallelBuilding = true;
diff --git a/third_party/nixpkgs/pkgs/applications/video/webtorrent_desktop/default.nix b/third_party/nixpkgs/pkgs/applications/video/webtorrent_desktop/default.nix
index ac3dd320d3..7660edcc76 100644
--- a/third_party/nixpkgs/pkgs/applications/video/webtorrent_desktop/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/video/webtorrent_desktop/default.nix
@@ -1,6 +1,6 @@
{
alsaLib, atk, cairo, cups, dbus, dpkg, expat, fetchurl, fetchzip, fontconfig, freetype,
- gdk-pixbuf, glib, gnome3, libX11, libXScrnSaver, libXcomposite, libXcursor,
+ gdk-pixbuf, glib, gtk3, libX11, libXScrnSaver, libXcomposite, libXcursor,
libXdamage, libXext, libXfixes, libXi, libXrandr, libXrender, libXtst,
libxcb, nspr, nss, lib, stdenv, udev, libuuid, pango, at-spi2-atk, at-spi2-core
}:
@@ -19,7 +19,7 @@
freetype
gdk-pixbuf
glib
- gnome3.gtk
+ gtk3
pango
libuuid
libX11
diff --git a/third_party/nixpkgs/pkgs/applications/virtualization/docker-compose/default.nix b/third_party/nixpkgs/pkgs/applications/virtualization/docker-compose/default.nix
index a9e332e2a4..c050057678 100644
--- a/third_party/nixpkgs/pkgs/applications/virtualization/docker-compose/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/virtualization/docker-compose/default.nix
@@ -21,12 +21,12 @@ buildPythonApplication rec {
nativeBuildInputs = [ installShellFiles ];
checkInputs = [ mock pytest nose ];
propagatedBuildInputs = [
- pyyaml backports_ssl_match_hostname colorama dockerpty docker
+ pyyaml colorama dockerpty docker
ipaddress jsonschema requests six texttable websocket_client
docopt cached-property paramiko distro python-dotenv
- ] ++
- lib.optional (pythonOlder "3.4") enum34 ++
- lib.optional (pythonOlder "3.2") functools32;
+ ] ++ lib.optional (pythonOlder "3.7") backports_ssl_match_hostname
+ ++ lib.optional (pythonOlder "3.4") enum34
+ ++ lib.optional (pythonOlder "3.2") functools32;
postPatch = ''
# Remove upper bound on requires, see also
diff --git a/third_party/nixpkgs/pkgs/applications/window-managers/wayfire/wcm.nix b/third_party/nixpkgs/pkgs/applications/window-managers/wayfire/wcm.nix
index d6ac6aeb84..9d524019ad 100644
--- a/third_party/nixpkgs/pkgs/applications/window-managers/wayfire/wcm.nix
+++ b/third_party/nixpkgs/pkgs/applications/window-managers/wayfire/wcm.nix
@@ -1,5 +1,5 @@
{ stdenv, lib, fetchurl, meson, ninja, pkg-config, wayland, wrapGAppsHook
-, gnome3, libevdev, libxml2, wayfire, wayland-protocols, wf-config, wf-shell
+, gtk3, libevdev, libxml2, wayfire, wayland-protocols, wf-config, wf-shell
}:
stdenv.mkDerivation rec {
@@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
nativeBuildInputs = [ meson ninja pkg-config wayland wrapGAppsHook ];
buildInputs = [
- gnome3.gtk libevdev libxml2 wayfire wayland
+ gtk3 libevdev libxml2 wayfire wayland
wayland-protocols wf-config wf-shell
];
diff --git a/third_party/nixpkgs/pkgs/applications/window-managers/wayfire/wf-shell.nix b/third_party/nixpkgs/pkgs/applications/window-managers/wayfire/wf-shell.nix
index 3948e9a32a..cc99e79fca 100644
--- a/third_party/nixpkgs/pkgs/applications/window-managers/wayfire/wf-shell.nix
+++ b/third_party/nixpkgs/pkgs/applications/window-managers/wayfire/wf-shell.nix
@@ -1,5 +1,5 @@
{ stdenv, lib, fetchurl, meson, ninja, pkg-config, wayland, git
-, alsaLib, gnome3, gtk-layer-shell, pulseaudio, wayfire, wf-config
+, alsaLib, gtkmm3, gtk-layer-shell, pulseaudio, wayfire, wf-config
}:
stdenv.mkDerivation rec {
@@ -15,7 +15,7 @@ stdenv.mkDerivation rec {
nativeBuildInputs = [ meson ninja pkg-config wayland ];
buildInputs = [
- alsaLib gnome3.gtkmm gtk-layer-shell pulseaudio wayfire wf-config
+ alsaLib gtkmm3 gtk-layer-shell pulseaudio wayfire wf-config
];
mesonFlags = [ "--sysconfdir" "/etc" ];
diff --git a/third_party/nixpkgs/pkgs/applications/window-managers/wmii-hg/default.nix b/third_party/nixpkgs/pkgs/applications/window-managers/wmii-hg/default.nix
index b78b7c0157..0acad8edbe 100644
--- a/third_party/nixpkgs/pkgs/applications/window-managers/wmii-hg/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/window-managers/wmii-hg/default.nix
@@ -29,8 +29,8 @@ stdenv.mkDerivation rec {
EOF
'';
- nativeBuildInputs = [ pkg-config ];
- buildInputs = [ unzip libixp_hg txt2tags dash python which
+ nativeBuildInputs = [ pkg-config unzip ];
+ buildInputs = [ libixp_hg txt2tags dash python which
libX11 libXrender libXext libXinerama libXrandr libXft ];
# For some reason including mercurial in buildInputs did not help
diff --git a/third_party/nixpkgs/pkgs/build-support/bintools-wrapper/default.nix b/third_party/nixpkgs/pkgs/build-support/bintools-wrapper/default.nix
index 3243e883e4..dac1f3bd7c 100644
--- a/third_party/nixpkgs/pkgs/build-support/bintools-wrapper/default.nix
+++ b/third_party/nixpkgs/pkgs/build-support/bintools-wrapper/default.nix
@@ -306,6 +306,10 @@ stdenv.mkDerivation {
done
''
+ + optionalString stdenv.targetPlatform.isDarwin ''
+ echo "-arch ${targetPlatform.darwinArch}" >> $out/nix-support/libc-ldflags
+ ''
+
+ ''
for flags in "$out/nix-support"/*flags*; do
substituteInPlace "$flags" --replace $'\n' ' '
diff --git a/third_party/nixpkgs/pkgs/build-support/buildenv/default.nix b/third_party/nixpkgs/pkgs/build-support/buildenv/default.nix
index 7f2427777f..5fafc36273 100644
--- a/third_party/nixpkgs/pkgs/build-support/buildenv/default.nix
+++ b/third_party/nixpkgs/pkgs/build-support/buildenv/default.nix
@@ -36,8 +36,9 @@ lib.makeOverridable
, # Shell commands to run after building the symlink tree.
postBuild ? ""
-, # Additional inputs. Handy e.g. if using makeWrapper in `postBuild`.
- buildInputs ? []
+# Additional inputs
+, nativeBuildInputs ? [] # Handy e.g. if using makeWrapper in `postBuild`.
+, buildInputs ? []
, passthru ? {}
, meta ? {}
@@ -53,7 +54,8 @@ in
runCommand name
rec {
inherit manifest ignoreCollisions checkCollisionContents passthru
- meta pathsToLink extraPrefix postBuild buildInputs;
+ meta pathsToLink extraPrefix postBuild
+ nativeBuildInputs buildInputs;
pkgs = builtins.toJSON (map (drv: {
paths =
# First add the usual output(s): respect if user has chosen explicitly,
diff --git a/third_party/nixpkgs/pkgs/build-support/cc-wrapper/cc-wrapper.sh b/third_party/nixpkgs/pkgs/build-support/cc-wrapper/cc-wrapper.sh
index 1450218aff..d08fd24cd2 100644
--- a/third_party/nixpkgs/pkgs/build-support/cc-wrapper/cc-wrapper.sh
+++ b/third_party/nixpkgs/pkgs/build-support/cc-wrapper/cc-wrapper.sh
@@ -198,7 +198,15 @@ fi
PATH="$path_backup"
# Old bash workaround, see above.
-exec @prog@ \
- ${extraBefore+"${extraBefore[@]}"} \
- ${params+"${params[@]}"} \
- ${extraAfter+"${extraAfter[@]}"}
+
+if (( "${NIX_CC_USE_RESPONSE_FILE:-@use_response_file_by_default@}" >= 1 )); then
+ exec @prog@ @<(printf "%q\n" \
+ ${extraBefore+"${extraBefore[@]}"} \
+ ${params+"${params[@]}"} \
+ ${extraAfter+"${extraAfter[@]}"})
+else
+ exec @prog@ \
+ ${extraBefore+"${extraBefore[@]}"} \
+ ${params+"${params[@]}"} \
+ ${extraAfter+"${extraAfter[@]}"}
+fi
diff --git a/third_party/nixpkgs/pkgs/build-support/cc-wrapper/default.nix b/third_party/nixpkgs/pkgs/build-support/cc-wrapper/default.nix
index 65f9791597..31689022b3 100644
--- a/third_party/nixpkgs/pkgs/build-support/cc-wrapper/default.nix
+++ b/third_party/nixpkgs/pkgs/build-support/cc-wrapper/default.nix
@@ -160,6 +160,7 @@ stdenv.mkDerivation {
local dst="$1"
local wrapper="$2"
export prog="$3"
+ export use_response_file_by_default=${if isClang then "1" else "0"}
substituteAll "$wrapper" "$out/bin/$dst"
chmod +x "$out/bin/$dst"
}
@@ -484,6 +485,10 @@ stdenv.mkDerivation {
substituteAll ${../wrapper-common/utils.bash} $out/nix-support/utils.bash
''
+ + optionalString stdenv.targetPlatform.isDarwin ''
+ echo "-arch ${targetPlatform.darwinArch}" >> $out/nix-support/cc-cflags
+ ''
+
##
## Extra custom steps
##
diff --git a/third_party/nixpkgs/pkgs/build-support/expand-response-params/default.nix b/third_party/nixpkgs/pkgs/build-support/expand-response-params/default.nix
index 2a4bee7419..402f0071a5 100644
--- a/third_party/nixpkgs/pkgs/build-support/expand-response-params/default.nix
+++ b/third_party/nixpkgs/pkgs/build-support/expand-response-params/default.nix
@@ -10,7 +10,7 @@ stdenv.mkDerivation {
src=$PWD
'';
buildPhase = ''
- "$CC" -std=c99 -O3 -o "expand-response-params" expand-response-params.c
+ NIX_CC_USE_RESPONSE_FILE=0 "$CC" -std=c99 -O3 -o "expand-response-params" expand-response-params.c
'';
installPhase = ''
mkdir -p $prefix/bin
diff --git a/third_party/nixpkgs/pkgs/build-support/fetchnuget/default.nix b/third_party/nixpkgs/pkgs/build-support/fetchnuget/default.nix
index 960bc3c1ff..ad61b9a51d 100644
--- a/third_party/nixpkgs/pkgs/build-support/fetchnuget/default.nix
+++ b/third_party/nixpkgs/pkgs/build-support/fetchnuget/default.nix
@@ -19,7 +19,7 @@ else
sourceRoot = ".";
- buildInputs = [ unzip ];
+ nativeBuildInputs = [ unzip ];
dontBuild = true;
diff --git a/third_party/nixpkgs/pkgs/build-support/release/ant-build.nix b/third_party/nixpkgs/pkgs/build-support/release/ant-build.nix
index 996f4f45d0..6b59241e01 100644
--- a/third_party/nixpkgs/pkgs/build-support/release/ant-build.nix
+++ b/third_party/nixpkgs/pkgs/build-support/release/ant-build.nix
@@ -108,7 +108,8 @@ stdenv.mkDerivation (
{
name = name + (if src ? version then "-" + src.version else "");
- buildInputs = [ant jre zip unzip] ++ lib.optional (args ? buildInputs) args.buildInputs ;
+ nativeBuildInputs = [ unzip ];
+ buildInputs = [ant jre zip] ++ lib.optional (args ? buildInputs) args.buildInputs ;
postHook = ''
mkdir -p $out/nix-support
diff --git a/third_party/nixpkgs/pkgs/build-support/rust/default.nix b/third_party/nixpkgs/pkgs/build-support/rust/default.nix
index bfa6c0d17c..ff9ca642da 100644
--- a/third_party/nixpkgs/pkgs/build-support/rust/default.nix
+++ b/third_party/nixpkgs/pkgs/build-support/rust/default.nix
@@ -103,6 +103,8 @@ stdenv.mkDerivation ((removeAttrs args ["depsExtraArgs"]) // lib.optionalAttrs u
cargoBuildType = buildType;
+ cargoCheckType = checkType;
+
patchRegistryDeps = ./patch-registry-deps;
nativeBuildInputs = nativeBuildInputs ++ [
diff --git a/third_party/nixpkgs/pkgs/build-support/rust/hooks/cargo-build-hook.sh b/third_party/nixpkgs/pkgs/build-support/rust/hooks/cargo-build-hook.sh
index 54f4512d67..c10120c5aa 100644
--- a/third_party/nixpkgs/pkgs/build-support/rust/hooks/cargo-build-hook.sh
+++ b/third_party/nixpkgs/pkgs/build-support/rust/hooks/cargo-build-hook.sh
@@ -9,6 +9,10 @@ cargoBuildHook() {
pushd "${buildAndTestSubdir}"
fi
+ if [ "${cargoBuildType}" != "debug" ]; then
+ cargoBuildProfileFlag="--${cargoBuildType}"
+ fi
+
(
set -x
env \
@@ -19,7 +23,7 @@ cargoBuildHook() {
cargo build -j $NIX_BUILD_CORES \
--target @rustTargetPlatformSpec@ \
--frozen \
- --${cargoBuildType} \
+ ${cargoBuildProfileFlag} \
${cargoBuildFlags}
)
@@ -32,4 +36,6 @@ cargoBuildHook() {
echo "Finished cargoBuildHook"
}
-buildPhase=cargoBuildHook
+if [ -z "${dontCargoBuild-}" ] && [ -z "${buildPhase-}" ]; then
+ buildPhase=cargoBuildHook
+fi
diff --git a/third_party/nixpkgs/pkgs/build-support/rust/hooks/cargo-check-hook.sh b/third_party/nixpkgs/pkgs/build-support/rust/hooks/cargo-check-hook.sh
index 8c5b1a1321..f0339afb38 100644
--- a/third_party/nixpkgs/pkgs/build-support/rust/hooks/cargo-check-hook.sh
+++ b/third_party/nixpkgs/pkgs/build-support/rust/hooks/cargo-check-hook.sh
@@ -1,4 +1,5 @@
declare -a checkFlags
+declare -a cargoTestFlags
cargoCheckHook() {
echo "Executing cargoCheckHook"
@@ -15,7 +16,11 @@ cargoCheckHook() {
threads=1
fi
- argstr="--${cargoBuildType} --target @rustTargetPlatformSpec@ --frozen";
+ if [ "${cargoBuildType}" != "debug" ]; then
+ cargoBuildProfileFlag="--${cargoBuildType}"
+ fi
+
+ argstr="${cargoBuildProfileFlag} --target @rustTargetPlatformSpec@ --frozen ${cargoTestFlags}";
(
set -x
@@ -36,6 +41,6 @@ cargoCheckHook() {
runHook postCheck
}
-if [ -z "${checkPhase-}" ]; then
+if [ -z "${dontCargoCheck-}" ] && [ -z "${checkPhase-}" ]; then
checkPhase=cargoCheckHook
fi
diff --git a/third_party/nixpkgs/pkgs/build-support/rust/hooks/cargo-install-hook.sh b/third_party/nixpkgs/pkgs/build-support/rust/hooks/cargo-install-hook.sh
index e6ffa30070..69ce726693 100644
--- a/third_party/nixpkgs/pkgs/build-support/rust/hooks/cargo-install-hook.sh
+++ b/third_party/nixpkgs/pkgs/build-support/rust/hooks/cargo-install-hook.sh
@@ -43,7 +43,7 @@ cargoInstallHook() {
}
-if [ -z "${installPhase-}" ]; then
+if [ -z "${dontCargoInstall-}" ] && [ -z "${installPhase-}" ]; then
installPhase=cargoInstallHook
postBuildHooks+=(cargoInstallPostBuildHook)
fi
diff --git a/third_party/nixpkgs/pkgs/build-support/rust/hooks/cargo-setup-hook.sh b/third_party/nixpkgs/pkgs/build-support/rust/hooks/cargo-setup-hook.sh
index 0fddd30582..842e66b517 100644
--- a/third_party/nixpkgs/pkgs/build-support/rust/hooks/cargo-setup-hook.sh
+++ b/third_party/nixpkgs/pkgs/build-support/rust/hooks/cargo-setup-hook.sh
@@ -77,7 +77,9 @@ cargoSetupPostPatchHook() {
echo "Finished cargoSetupPostPatchHook"
}
-postUnpackHooks+=(cargoSetupPostUnpackHook)
+if [ -z "${dontCargoSetupPostUnpack-}" ]; then
+ postUnpackHooks+=(cargoSetupPostUnpackHook)
+fi
if [ -z ${cargoVendorDir-} ]; then
postPatchHooks+=(cargoSetupPostPatchHook)
diff --git a/third_party/nixpkgs/pkgs/data/fonts/cascadia-code/default.nix b/third_party/nixpkgs/pkgs/data/fonts/cascadia-code/default.nix
index a2b67a22e2..e09ad70f14 100644
--- a/third_party/nixpkgs/pkgs/data/fonts/cascadia-code/default.nix
+++ b/third_party/nixpkgs/pkgs/data/fonts/cascadia-code/default.nix
@@ -1,13 +1,13 @@
{ lib, fetchzip }:
let
- version = "2102.03";
+ version = "2102.25";
in
fetchzip {
name = "cascadia-code-${version}";
url = "https://github.com/microsoft/cascadia-code/releases/download/v${version}/CascadiaCode-${version}.zip";
- sha256 = "076l44cyyp3cf15qyn2hzx34kzqm73d218fgwf8n69m8a1v34hs2";
+ sha256 = "14qhawcf1jmv68zdfbi2zfqdw4cf8fpk7plxzphmkqsp7hlw9pzx";
postFetch = ''
mkdir -p $out/share/fonts/
diff --git a/third_party/nixpkgs/pkgs/data/misc/iana-etc/default.nix b/third_party/nixpkgs/pkgs/data/misc/iana-etc/default.nix
index 421054fa17..60735eb478 100644
--- a/third_party/nixpkgs/pkgs/data/misc/iana-etc/default.nix
+++ b/third_party/nixpkgs/pkgs/data/misc/iana-etc/default.nix
@@ -1,11 +1,11 @@
{ lib, fetchzip }:
let
- version = "20200729";
+ version = "20210225";
in fetchzip {
name = "iana-etc-${version}";
url = "https://github.com/Mic92/iana-etc/releases/download/${version}/iana-etc-${version}.tar.gz";
- sha256 = "05cymmisfvpyd7fwzc6axvm5fsi1v6hzs0pjr4xp1i95wvpz7qpm";
+ sha256 = "sha256-NVvZG3EJEYOXFDTBXD5m9sg/8msyMiBMkiZr+ZxWZ/g=";
postFetch = ''
tar -xzvf $downloadedFile --strip-components=1
diff --git a/third_party/nixpkgs/pkgs/data/misc/spdx-license-list-data/default.nix b/third_party/nixpkgs/pkgs/data/misc/spdx-license-list-data/default.nix
index 19f02a16f4..f4ab4c0585 100644
--- a/third_party/nixpkgs/pkgs/data/misc/spdx-license-list-data/default.nix
+++ b/third_party/nixpkgs/pkgs/data/misc/spdx-license-list-data/default.nix
@@ -2,25 +2,28 @@
stdenv.mkDerivation rec {
pname = "spdx-license-list-data";
- version = "3.11";
+ version = "3.12";
src = fetchFromGitHub {
owner = "spdx";
repo = "license-list-data";
rev = "v${version}";
- sha256 = "1iwyqhh6lh51a47mhfy98zvjan8yjsvlym8qz0isx2i1zzxlj47a";
+ sha256 = "09xci8dzblg3d30jf7s43zialbcxlxly03zrkiymcvnzixg8v48f";
};
- phases = [ "unpackPhase" "installPhase" ];
-
installPhase = ''
+ runHook preInstall
+
install -vDt $out/json json/licenses.json
+
+ runHook postInstall
'';
- meta = {
+ meta = with lib; {
description = "Various data formats for the SPDX License List";
homepage = "https://github.com/spdx/license-list-data";
- license = lib.licenses.cc0;
- platforms = lib.platforms.all;
+ license = licenses.cc0;
+ maintainers = with maintainers; [ oxzi ];
+ platforms = platforms.all;
};
}
diff --git a/third_party/nixpkgs/pkgs/desktops/gnome-3/extensions/night-theme-switcher/default.nix b/third_party/nixpkgs/pkgs/desktops/gnome-3/extensions/night-theme-switcher/default.nix
index c83ad7ef4c..f663aa8977 100644
--- a/third_party/nixpkgs/pkgs/desktops/gnome-3/extensions/night-theme-switcher/default.nix
+++ b/third_party/nixpkgs/pkgs/desktops/gnome-3/extensions/night-theme-switcher/default.nix
@@ -11,7 +11,8 @@ stdenv.mkDerivation rec {
sha256 = "0z11y18bgdc0y41hrrzzgi4lagm2cg06x12jgdnary1ycng7xja0";
};
- buildInputs = [ glib gnome3.gnome-shell unzip ];
+ nativeBuildInputs = [ unzip ];
+ buildInputs = [ glib gnome3.gnome-shell ];
uuid = "nightthemeswitcher@romainvigier.fr";
diff --git a/third_party/nixpkgs/pkgs/desktops/plasma-5/fetch.sh b/third_party/nixpkgs/pkgs/desktops/plasma-5/fetch.sh
index 43ea2d6928..1a739585ef 100644
--- a/third_party/nixpkgs/pkgs/desktops/plasma-5/fetch.sh
+++ b/third_party/nixpkgs/pkgs/desktops/plasma-5/fetch.sh
@@ -1 +1 @@
-WGET_ARGS=( https://download.kde.org/stable/plasma/5.20.5/ -A '*.tar.xz' )
+WGET_ARGS=( https://download.kde.org/stable/plasma/5.21.1/ -A '*.tar.xz' )
diff --git a/third_party/nixpkgs/pkgs/desktops/plasma-5/ksysguard.nix b/third_party/nixpkgs/pkgs/desktops/plasma-5/ksysguard.nix
index 0581b8bde7..27d0ab8a0f 100644
--- a/third_party/nixpkgs/pkgs/desktops/plasma-5/ksysguard.nix
+++ b/third_party/nixpkgs/pkgs/desktops/plasma-5/ksysguard.nix
@@ -3,7 +3,8 @@
extra-cmake-modules, kdoctools,
libcap, libpcap, lm_sensors,
kconfig, kcoreaddons, kdelibs4support, ki18n, kiconthemes, kitemviews,
- knewstuff, libksysguard, qtbase
+ knewstuff, libksysguard, qtbase,
+ networkmanager-qt, libnl
}:
mkDerivation {
@@ -12,6 +13,6 @@ mkDerivation {
nativeBuildInputs = [ extra-cmake-modules kdoctools ];
buildInputs = [
kconfig kcoreaddons kitemviews knewstuff kiconthemes libksysguard
- kdelibs4support ki18n libcap libpcap lm_sensors
+ kdelibs4support ki18n libcap libpcap lm_sensors networkmanager-qt libnl
];
}
diff --git a/third_party/nixpkgs/pkgs/desktops/plasma-5/kwin/default.nix b/third_party/nixpkgs/pkgs/desktops/plasma-5/kwin/default.nix
index f0b07fba73..f127cc37ee 100644
--- a/third_party/nixpkgs/pkgs/desktops/plasma-5/kwin/default.nix
+++ b/third_party/nixpkgs/pkgs/desktops/plasma-5/kwin/default.nix
@@ -12,7 +12,7 @@
kcoreaddons, kcrash, kdeclarative, kdecoration, kglobalaccel, ki18n,
kiconthemes, kidletime, kinit, kio, knewstuff, knotifications, kpackage,
kscreenlocker, kservice, kwayland, kwayland-server, kwidgetsaddons, kwindowsystem, kxmlgui,
- plasma-framework, libcap, libdrm, mesa
+ plasma-framework, libcap, libdrm, mesa, pipewire
}:
# TODO (ttuegel): investigate qmlplugindump failure
@@ -31,7 +31,7 @@ mkDerivation {
kcoreaddons kcrash kdeclarative kdecoration kglobalaccel ki18n kiconthemes
kidletime kinit kio knewstuff knotifications kpackage kscreenlocker kservice
kwayland kwayland-server kwidgetsaddons kwindowsystem kxmlgui plasma-framework
- libcap libdrm mesa
+ libcap libdrm mesa pipewire
];
outputs = [ "dev" "out" ];
patches = [
diff --git a/third_party/nixpkgs/pkgs/desktops/plasma-5/libkscreen/libkscreen-backends-path.patch b/third_party/nixpkgs/pkgs/desktops/plasma-5/libkscreen/libkscreen-backends-path.patch
index 48be0d037d..3d19f2d89f 100644
--- a/third_party/nixpkgs/pkgs/desktops/plasma-5/libkscreen/libkscreen-backends-path.patch
+++ b/third_party/nixpkgs/pkgs/desktops/plasma-5/libkscreen/libkscreen-backends-path.patch
@@ -2,7 +2,7 @@ Index: libkscreen-5.9.4/src/backendmanager.cpp
===================================================================
--- libkscreen-5.9.4.orig/src/backendmanager.cpp
+++ libkscreen-5.9.4/src/backendmanager.cpp
-@@ -178,17 +178,11 @@ QFileInfo BackendManager::preferredBacke
+@@ -172,14 +172,11 @@ QFileInfo BackendManager::preferredBackend(const QString &backend)
QFileInfoList BackendManager::listBackends()
{
// Compile a list of installed backends first
@@ -10,10 +10,7 @@ Index: libkscreen-5.9.4/src/backendmanager.cpp
- const QStringList paths = QCoreApplication::libraryPaths();
- QFileInfoList finfos;
- for (const QString &path : paths) {
-- const QDir dir(path + QLatin1String("/kf5/kscreen/"),
-- backendFilter,
-- QDir::SortFlags(QDir::QDir::Name),
-- QDir::NoDotAndDotDot | QDir::Files);
+- const QDir dir(path + QLatin1String("/kf5/kscreen/"), backendFilter, QDir::SortFlags(QDir::QDir::Name), QDir::NoDotAndDotDot | QDir::Files);
- finfos.append(dir.entryInfoList());
- }
- return finfos;
@@ -24,4 +21,4 @@ Index: libkscreen-5.9.4/src/backendmanager.cpp
+ return dir.entryInfoList();
}
- KScreen::AbstractBackend *BackendManager::loadBackendPlugin(QPluginLoader *loader, const QString &name,
+ KScreen::AbstractBackend *BackendManager::loadBackendPlugin(QPluginLoader *loader, const QString &name, const QVariantMap &arguments)
diff --git a/third_party/nixpkgs/pkgs/desktops/plasma-5/plasma-browser-integration.nix b/third_party/nixpkgs/pkgs/desktops/plasma-5/plasma-browser-integration.nix
index f6855cb34d..e9ad3c28c1 100644
--- a/third_party/nixpkgs/pkgs/desktops/plasma-5/plasma-browser-integration.nix
+++ b/third_party/nixpkgs/pkgs/desktops/plasma-5/plasma-browser-integration.nix
@@ -3,7 +3,7 @@
extra-cmake-modules,
qtbase,
kfilemetadata, kio, ki18n, kconfig , kdbusaddons, knotifications, kpurpose,
- krunner, kwindowsystem, kactivities,
+ krunner, kwindowsystem, kactivities, plasma-workspace
}:
mkDerivation {
@@ -13,6 +13,6 @@ mkDerivation {
];
buildInputs = [
qtbase kfilemetadata kio ki18n kconfig kdbusaddons knotifications kpurpose
- krunner kwindowsystem kactivities
+ krunner kwindowsystem kactivities plasma-workspace
];
}
diff --git a/third_party/nixpkgs/pkgs/desktops/plasma-5/plasma-desktop/hwclock-path.patch b/third_party/nixpkgs/pkgs/desktops/plasma-5/plasma-desktop/hwclock-path.patch
index 6c04081ae2..c85d66ad00 100644
--- a/third_party/nixpkgs/pkgs/desktops/plasma-5/plasma-desktop/hwclock-path.patch
+++ b/third_party/nixpkgs/pkgs/desktops/plasma-5/plasma-desktop/hwclock-path.patch
@@ -3,14 +3,14 @@ Index: plasma-desktop-5.8.5/kcms/dateandtime/helper.cpp
--- plasma-desktop-5.8.5.orig/kcms/dateandtime/helper.cpp
+++ plasma-desktop-5.8.5/kcms/dateandtime/helper.cpp
@@ -48,10 +48,6 @@
- #include
+ #include
#endif
-
+
-// We cannot rely on the $PATH environment variable, because D-Bus activation
-// clears it. So we have to use a reasonable default.
-static const QString exePath = QStringLiteral("/usr/sbin:/usr/bin:/sbin:/bin");
-
- int ClockHelper::ntp( const QStringList& ntpServers, bool ntpEnabled )
+ int ClockHelper::ntp(const QStringList &ntpServers, bool ntpEnabled)
{
int ret = 0;
@@ -227,7 +223,7 @@ int ClockHelper::tzreset()
diff --git a/third_party/nixpkgs/pkgs/desktops/plasma-5/plasma-workspace/0001-startkde.patch b/third_party/nixpkgs/pkgs/desktops/plasma-5/plasma-workspace/0001-startkde.patch
index ea8afedbe5..f9347de7d5 100644
--- a/third_party/nixpkgs/pkgs/desktops/plasma-5/plasma-workspace/0001-startkde.patch
+++ b/third_party/nixpkgs/pkgs/desktops/plasma-5/plasma-workspace/0001-startkde.patch
@@ -1,4 +1,4 @@
-From d653bc84c8aed33072237ed858194a8a73b6a2e7 Mon Sep 17 00:00:00 2001
+From 65ed69a38a9ffee21f0eb36de1f7a3f152111cad Mon Sep 17 00:00:00 2001
From: Tom Hall
Date: Mon, 7 Sep 2020 18:09:52 +0100
Subject: [PATCH] startkde
@@ -7,27 +7,27 @@ Subject: [PATCH] startkde
startkde/plasma-session/startup.cpp | 2 +-
startkde/startplasma-waylandsession.cpp | 2 +-
startkde/startplasma-x11.cpp | 2 +-
- startkde/startplasma.cpp | 22 +++++++++-------------
- 4 files changed, 12 insertions(+), 16 deletions(-)
+ startkde/startplasma.cpp | 16 ++++++++--------
+ 4 files changed, 11 insertions(+), 11 deletions(-)
diff --git a/startkde/plasma-session/startup.cpp b/startkde/plasma-session/startup.cpp
-index 89cc144ba..8ca9e81d2 100644
+index c3e77d4..88cb0e9 100644
--- a/startkde/plasma-session/startup.cpp
+++ b/startkde/plasma-session/startup.cpp
-@@ -211,7 +211,7 @@ Startup::Startup(QObject *parent):
+@@ -223,7 +223,7 @@ Startup::Startup(QObject *parent)
upAndRunning(QStringLiteral("ksmserver"));
const AutoStart autostart;
- QProcess::execute(QStringLiteral(CMAKE_INSTALL_FULL_LIBEXECDIR_KF5 "/start_kdeinit_wrapper"), QStringList());
+ QProcess::execute(QStringLiteral(NIXPKGS_START_KDEINIT_WRAPPER), QStringList());
- KJob* phase1;
+ KJob *phase1;
QProcessEnvironment kdedProcessEnv;
diff --git a/startkde/startplasma-waylandsession.cpp b/startkde/startplasma-waylandsession.cpp
-index f59654d18..5e3a93db0 100644
+index 4fbfe18..6ba916c 100644
--- a/startkde/startplasma-waylandsession.cpp
+++ b/startkde/startplasma-waylandsession.cpp
-@@ -61,7 +61,7 @@ int main(int argc, char** argv)
+@@ -65,7 +65,7 @@ int main(int argc, char **argv)
waitForKonqi();
out << "startplasma-waylandsession: Shutting down...\n";
@@ -37,10 +37,10 @@ index f59654d18..5e3a93db0 100644
cleanupX11();
out << "startplasma-waylandsession: Done.\n";
diff --git a/startkde/startplasma-x11.cpp b/startkde/startplasma-x11.cpp
-index ae1c4d101..0df24b5be 100644
+index 4ddf9f8..e0e59cd 100644
--- a/startkde/startplasma-x11.cpp
+++ b/startkde/startplasma-x11.cpp
-@@ -110,7 +110,7 @@ int main(int argc, char** argv)
+@@ -110,7 +110,7 @@ int main(int argc, char **argv)
out << "startkde: Shutting down...\n";
@@ -50,10 +50,10 @@ index ae1c4d101..0df24b5be 100644
cleanupPlasmaEnvironment();
cleanupX11();
diff --git a/startkde/startplasma.cpp b/startkde/startplasma.cpp
-index a055d5635..62afb1513 100644
+index 9809197..1250e3e 100644
--- a/startkde/startplasma.cpp
+++ b/startkde/startplasma.cpp
-@@ -41,7 +41,7 @@ QTextStream out(stderr);
+@@ -46,7 +46,7 @@ QTextStream out(stderr);
void messageBox(const QString &text)
{
out << text;
@@ -61,46 +61,56 @@ index a055d5635..62afb1513 100644
+ runSync(QStringLiteral(NIXPKGS_XMESSAGE), {QStringLiteral("-geometry"), QStringLiteral("500x100"), text});
}
- QStringList allServices(const QLatin1String& prefix)
-@@ -262,15 +262,15 @@ void setupX11()
- // If the user has overwritten fonts, the cursor font may be different now
- // so don't move this up.
+ QStringList allServices(const QLatin1String &prefix)
+@@ -267,8 +267,8 @@ void setupX11()
+ // If the user has overwritten fonts, the cursor font may be different now
+ // so don't move this up.
- runSync(QStringLiteral("xsetroot"), {QStringLiteral("-cursor_name"), QStringLiteral("left_ptr")});
-- runSync(QStringLiteral("xprop"), {QStringLiteral("-root"), QStringLiteral("-f"), QStringLiteral("KDE_FULL_SESSION"), QStringLiteral("8t"), QStringLiteral("-set"), QStringLiteral("KDE_FULL_SESSION"), QStringLiteral("true")});
-- runSync(QStringLiteral("xprop"), {QStringLiteral("-root"), QStringLiteral("-f"), QStringLiteral("KDE_SESSION_VERSION"), QStringLiteral("32c"), QStringLiteral("-set"), QStringLiteral("KDE_SESSION_VERSION"), QStringLiteral("5")});
+- runSync(QStringLiteral("xprop"),
+ runSync(QStringLiteral(NIXPKGS_XSETROOT), {QStringLiteral("-cursor_name"), QStringLiteral("left_ptr")});
-+ runSync(QStringLiteral(NIXPKGS_XPROP), {QStringLiteral("-root"), QStringLiteral("-f"), QStringLiteral("KDE_FULL_SESSION"), QStringLiteral("8t"), QStringLiteral("-set"), QStringLiteral("KDE_FULL_SESSION"), QStringLiteral("true")});
-+ runSync(QStringLiteral(NIXPKGS_XPROP), {QStringLiteral("-root"), QStringLiteral("-f"), QStringLiteral("KDE_SESSION_VERSION"), QStringLiteral("32c"), QStringLiteral("-set"), QStringLiteral("KDE_SESSION_VERSION"), QStringLiteral("5")});
- }
++ runSync(QStringLiteral(NIXPKGS_XPROP),
+ {QStringLiteral("-root"),
+ QStringLiteral("-f"),
+ QStringLiteral("KDE_FULL_SESSION"),
+@@ -276,7 +276,7 @@ void setupX11()
+ QStringLiteral("-set"),
+ QStringLiteral("KDE_FULL_SESSION"),
+ QStringLiteral("true")});
+- runSync(QStringLiteral("xprop"),
++ runSync(QStringLiteral(NIXPKGS_XPROP),
+ {QStringLiteral("-root"),
+ QStringLiteral("-f"),
+ QStringLiteral("KDE_SESSION_VERSION"),
+@@ -288,8 +288,8 @@ void setupX11()
void cleanupX11()
{
-- runSync(QStringLiteral("xprop"), { QStringLiteral("-root"), QStringLiteral("-remove"), QStringLiteral("KDE_FULL_SESSION") });
-- runSync(QStringLiteral("xprop"), { QStringLiteral("-root"), QStringLiteral("-remove"), QStringLiteral("KDE_SESSION_VERSION") });
-+ runSync(QStringLiteral(NIXPKGS_XPROP), { QStringLiteral("-root"), QStringLiteral("-remove"), QStringLiteral("KDE_FULL_SESSION") });
-+ runSync(QStringLiteral(NIXPKGS_XPROP), { QStringLiteral("-root"), QStringLiteral("-remove"), QStringLiteral("KDE_SESSION_VERSION") });
+- runSync(QStringLiteral("xprop"), {QStringLiteral("-root"), QStringLiteral("-remove"), QStringLiteral("KDE_FULL_SESSION")});
+- runSync(QStringLiteral("xprop"), {QStringLiteral("-root"), QStringLiteral("-remove"), QStringLiteral("KDE_SESSION_VERSION")});
++ runSync(QStringLiteral(NIXPKGS_XPROP), {QStringLiteral("-root"), QStringLiteral("-remove"), QStringLiteral("KDE_FULL_SESSION")});
++ runSync(QStringLiteral(NIXPKGS_XPROP), {QStringLiteral("-root"), QStringLiteral("-remove"), QStringLiteral("KDE_SESSION_VERSION")});
}
// TODO: Check if Necessary
-@@ -306,7 +302,7 @@ void setupFontDpi()
- //TODO port to c++?
+@@ -321,7 +321,7 @@ void setupFontDpi()
+ // TODO port to c++?
const QByteArray input = "Xft.dpi: " + QByteArray::number(fontsCfg.readEntry("forceFontDPI", 0));
QProcess p;
-- p.start(QStringLiteral("xrdb"), { QStringLiteral("-quiet"), QStringLiteral("-merge"), QStringLiteral("-nocpp") });
-+ p.start(QStringLiteral(NIXPKGS_XRDB), { QStringLiteral("-quiet"), QStringLiteral("-merge"), QStringLiteral("-nocpp") });
+- p.start(QStringLiteral("xrdb"), {QStringLiteral("-quiet"), QStringLiteral("-merge"), QStringLiteral("-nocpp")});
++ p.start(QStringLiteral(NIXPKGS_XRDB), {QStringLiteral("-quiet"), QStringLiteral("-merge"), QStringLiteral("-nocpp")});
p.setProcessChannelMode(QProcess::ForwardedChannels);
p.write(input);
p.closeWriteChannel();
-@@ -328,7 +324,7 @@ QProcess* setupKSplash()
+@@ -343,7 +343,7 @@ QProcess *setupKSplash()
KConfigGroup ksplashCfg = cfg.group("KSplash");
if (ksplashCfg.readEntry("Engine", QStringLiteral("KSplashQML")) == QLatin1String("KSplashQML")) {
p = new QProcess;
-- p->start(QStringLiteral("ksplashqml"), { ksplashCfg.readEntry("Theme", QStringLiteral("Breeze")) });
-+ p->start(QStringLiteral(CMAKE_INSTALL_FULL_BINDIR "/ksplashqml"), { ksplashCfg.readEntry("Theme", QStringLiteral("Breeze")) });
+- p->start(QStringLiteral("ksplashqml"), {ksplashCfg.readEntry("Theme", QStringLiteral("Breeze"))});
++ p->start(QStringLiteral(CMAKE_INSTALL_FULL_BINDIR "/ksplashqml"), {ksplashCfg.readEntry("Theme", QStringLiteral("Breeze"))});
}
}
return p;
--
-2.28.0
+2.30.0
diff --git a/third_party/nixpkgs/pkgs/desktops/plasma-5/plasma-workspace/0002-absolute-wallpaper-install-dir.patch b/third_party/nixpkgs/pkgs/desktops/plasma-5/plasma-workspace/0002-absolute-wallpaper-install-dir.patch
index 366707d270..633551f6e3 100644
--- a/third_party/nixpkgs/pkgs/desktops/plasma-5/plasma-workspace/0002-absolute-wallpaper-install-dir.patch
+++ b/third_party/nixpkgs/pkgs/desktops/plasma-5/plasma-workspace/0002-absolute-wallpaper-install-dir.patch
@@ -1,23 +1,23 @@
-From f43f15870f14b8fa17ba0765c0d7e2b225fafc3f Mon Sep 17 00:00:00 2001
+From 914d2ec5e669ecf8771cc1308028990f733fb8cc Mon Sep 17 00:00:00 2001
From: Thomas Tuegel
Date: Wed, 5 Feb 2020 05:03:11 -0600
-Subject: [PATCH 2/2] absolute-wallpaper-install-dir
+Subject: [PATCH] absolute-wallpaper-install-dir
---
sddm-theme/theme.conf.cmake | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/sddm-theme/theme.conf.cmake b/sddm-theme/theme.conf.cmake
-index 8494a5c8a..f723c1e1b 100644
+index a560da3..f723c1e 100644
--- a/sddm-theme/theme.conf.cmake
+++ b/sddm-theme/theme.conf.cmake
@@ -4,5 +4,5 @@ logo=${KDE_INSTALL_FULL_DATADIR}/sddm/themes/breeze/default-logo.svg
type=image
color=#1d99f3
fontSize=10
--background=${KDE_INSTALL_FULL_WALLPAPERDIR}/Next/contents/images/5120x2880.jpg
-+background=${NIXPKGS_BREEZE_WALLPAPERS}/Next/contents/images/5120x2880.jpg
+-background=${KDE_INSTALL_FULL_WALLPAPERDIR}/Next/contents/images/5120x2880.png
++background=${NIXPKGS_BREEZE_WALLPAPERS}/Next/contents/images/5120x2880.png
needsFullUserModel=false
--
-2.25.1
+2.30.0
diff --git a/third_party/nixpkgs/pkgs/desktops/plasma-5/plasma-workspace/default.nix b/third_party/nixpkgs/pkgs/desktops/plasma-5/plasma-workspace/default.nix
index e1becaab95..69d7d508d5 100644
--- a/third_party/nixpkgs/pkgs/desktops/plasma-5/plasma-workspace/default.nix
+++ b/third_party/nixpkgs/pkgs/desktops/plasma-5/plasma-workspace/default.nix
@@ -16,6 +16,8 @@
qtgraphicaleffects, qtquickcontrols, qtquickcontrols2, qtscript, qttools,
qtwayland, qtx11extras, qqc2-desktop-style,
+
+ pipewire, libdrm
}:
let inherit (lib) getBin getLib; in
@@ -36,6 +38,8 @@ mkDerivation {
qtgraphicaleffects qtquickcontrols qtquickcontrols2 qtscript qtwayland
qtx11extras qqc2-desktop-style
+
+ pipewire libdrm
];
propagatedUserEnvPkgs = [ qtgraphicaleffects ];
outputs = [ "out" "dev" ];
diff --git a/third_party/nixpkgs/pkgs/desktops/plasma-5/srcs.nix b/third_party/nixpkgs/pkgs/desktops/plasma-5/srcs.nix
index cfd7e57339..96a60ac5e4 100644
--- a/third_party/nixpkgs/pkgs/desktops/plasma-5/srcs.nix
+++ b/third_party/nixpkgs/pkgs/desktops/plasma-5/srcs.nix
@@ -4,395 +4,419 @@
{
bluedevil = {
- version = "5.20.5";
+ version = "5.21.1";
src = fetchurl {
- url = "${mirror}/stable/plasma/5.20.5/bluedevil-5.20.5.tar.xz";
- sha256 = "0bpbvfd6m3ddax484p33a1chvf9mf2mi61cli0vacsan7j84xpmk";
- name = "bluedevil-5.20.5.tar.xz";
+ url = "${mirror}/stable/plasma/5.21.1/bluedevil-5.21.1.tar.xz";
+ sha256 = "0b69gacp5cbl32m92k2j36cqq38lpxlybx3wnzj1148j6wvfbajn";
+ name = "bluedevil-5.21.1.tar.xz";
};
};
breeze = {
- version = "5.20.5";
+ version = "5.21.1";
src = fetchurl {
- url = "${mirror}/stable/plasma/5.20.5/breeze-5.20.5.tar.xz";
- sha256 = "01zm5hcal6flihd89wn70zi363cmcglfvnc2q6x97lq89silaf6l";
- name = "breeze-5.20.5.tar.xz";
+ url = "${mirror}/stable/plasma/5.21.1/breeze-5.21.1.tar.xz";
+ sha256 = "1xdpsc4nf0556x9iimszi287jjks8qpqi45n81iccbcz91i5bnb5";
+ name = "breeze-5.21.1.tar.xz";
};
};
breeze-grub = {
- version = "5.20.5";
+ version = "5.21.1";
src = fetchurl {
- url = "${mirror}/stable/plasma/5.20.5/breeze-grub-5.20.5.tar.xz";
- sha256 = "17g2jac96sj6pfacmyi6vvn74lfi9yhmigprcm2pwqg9z093n1m2";
- name = "breeze-grub-5.20.5.tar.xz";
+ url = "${mirror}/stable/plasma/5.21.1/breeze-grub-5.21.1.tar.xz";
+ sha256 = "0w0kkdqliliy72f41xps0a2mr0rf4kn08immichcvrm47r9bjr37";
+ name = "breeze-grub-5.21.1.tar.xz";
};
};
breeze-gtk = {
- version = "5.20.5";
+ version = "5.21.1";
src = fetchurl {
- url = "${mirror}/stable/plasma/5.20.5/breeze-gtk-5.20.5.tar.xz";
- sha256 = "1jknfswjcd4abbf249i3gclip4m4v8bp9b5x050zafyjkdcwxd5l";
- name = "breeze-gtk-5.20.5.tar.xz";
+ url = "${mirror}/stable/plasma/5.21.1/breeze-gtk-5.21.1.tar.xz";
+ sha256 = "14xq2796n8927362851kffpvxxscw82sm5j9ghsb24hr860zcdk7";
+ name = "breeze-gtk-5.21.1.tar.xz";
};
};
breeze-plymouth = {
- version = "5.20.5";
+ version = "5.21.1";
src = fetchurl {
- url = "${mirror}/stable/plasma/5.20.5/breeze-plymouth-5.20.5.tar.xz";
- sha256 = "0yiqqwms0qrnbxqb8nwmgssrp1f92jwjg8rfzapaq5jxdycl1d9m";
- name = "breeze-plymouth-5.20.5.tar.xz";
+ url = "${mirror}/stable/plasma/5.21.1/breeze-plymouth-5.21.1.tar.xz";
+ sha256 = "0xgxmh5gnjz8r5h97arsb1ddvizfpajw6zfwrkrsiw0kxkb0ppn9";
+ name = "breeze-plymouth-5.21.1.tar.xz";
};
};
discover = {
- version = "5.20.5";
+ version = "5.21.1";
src = fetchurl {
- url = "${mirror}/stable/plasma/5.20.5/discover-5.20.5.tar.xz";
- sha256 = "08dmc8rvbfi1zyk9if588h6948xqcqm9jxdp26q84mzq517x9fn5";
- name = "discover-5.20.5.tar.xz";
+ url = "${mirror}/stable/plasma/5.21.1/discover-5.21.1.tar.xz";
+ sha256 = "1a1wmils7ijkvn1x5gqrdg3rv7mcnh0gaaig9ca555qqc2ab0ivl";
+ name = "discover-5.21.1.tar.xz";
};
};
drkonqi = {
- version = "5.20.5";
+ version = "5.21.1";
src = fetchurl {
- url = "${mirror}/stable/plasma/5.20.5/drkonqi-5.20.5.tar.xz";
- sha256 = "1rl212qmmikbnkyryibpp6gxh4jpklynhgr45ym5gcn3903i3vh9";
- name = "drkonqi-5.20.5.tar.xz";
+ url = "${mirror}/stable/plasma/5.21.1/drkonqi-5.21.1.tar.xz";
+ sha256 = "1iqk9mg5bi5yn9ccalwva8yshamrmsx4kfww8imxv8mhmq9p4mib";
+ name = "drkonqi-5.21.1.tar.xz";
};
};
kactivitymanagerd = {
- version = "5.20.5";
+ version = "5.21.1";
src = fetchurl {
- url = "${mirror}/stable/plasma/5.20.5/kactivitymanagerd-5.20.5.tar.xz";
- sha256 = "1jzss3waq8jjzbs3rrxxk9dmr974pj5ryw4rdj8bpkc451wc4068";
- name = "kactivitymanagerd-5.20.5.tar.xz";
+ url = "${mirror}/stable/plasma/5.21.1/kactivitymanagerd-5.21.1.tar.xz";
+ sha256 = "1wzwkyylk4qsiab7jzlw62mfv5r3pxdk3vqyydca112836nhbdj3";
+ name = "kactivitymanagerd-5.21.1.tar.xz";
};
};
kde-cli-tools = {
- version = "5.20.5";
+ version = "5.21.1";
src = fetchurl {
- url = "${mirror}/stable/plasma/5.20.5/kde-cli-tools-5.20.5.tar.xz";
- sha256 = "0z32fwc9l8c3xfy1l7v0i26ay8icnxqwrnxz6h8qgjlv6p8b4h04";
- name = "kde-cli-tools-5.20.5.tar.xz";
+ url = "${mirror}/stable/plasma/5.21.1/kde-cli-tools-5.21.1.tar.xz";
+ sha256 = "0835323rbb3akhzdnjxb2myfbfz0wh3c5j1jih4l9zqr0ixx9lb3";
+ name = "kde-cli-tools-5.21.1.tar.xz";
};
};
kdecoration = {
- version = "5.20.5";
+ version = "5.21.1";
src = fetchurl {
- url = "${mirror}/stable/plasma/5.20.5/kdecoration-5.20.5.tar.xz";
- sha256 = "1kc166f2gqgspsnvxyk8k3k3mmd1ndhgr1dyjzknqdys32dkm5vf";
- name = "kdecoration-5.20.5.tar.xz";
+ url = "${mirror}/stable/plasma/5.21.1/kdecoration-5.21.1.tar.xz";
+ sha256 = "1qy848hvqiar3vj7cz0srszybqj9sf5lfip8ws0fwllqgsa5v505";
+ name = "kdecoration-5.21.1.tar.xz";
};
};
kde-gtk-config = {
- version = "5.20.5";
+ version = "5.21.1";
src = fetchurl {
- url = "${mirror}/stable/plasma/5.20.5/kde-gtk-config-5.20.5.tar.xz";
- sha256 = "1f3fvr201wr7jdh1hg8ff7yis7hnv7653hvx0531hx1x2hfdva1r";
- name = "kde-gtk-config-5.20.5.tar.xz";
+ url = "${mirror}/stable/plasma/5.21.1/kde-gtk-config-5.21.1.tar.xz";
+ sha256 = "0nq741x9flnyzhgj5h4r1774b11211ab0lcclhlji9ch7kqxs8dc";
+ name = "kde-gtk-config-5.21.1.tar.xz";
};
};
kdeplasma-addons = {
- version = "5.20.5";
+ version = "5.21.1";
src = fetchurl {
- url = "${mirror}/stable/plasma/5.20.5/kdeplasma-addons-5.20.5.tar.xz";
- sha256 = "1sypmn72fp6l57px3pq9ivzj2r2l3k9vy5006idnfgblzahvpi2n";
- name = "kdeplasma-addons-5.20.5.tar.xz";
+ url = "${mirror}/stable/plasma/5.21.1/kdeplasma-addons-5.21.1.tar.xz";
+ sha256 = "0xpki1kabdm4fwifx0xsb0isig9dnzks4zfglrkg9g0nafahsbf8";
+ name = "kdeplasma-addons-5.21.1.tar.xz";
};
};
kgamma5 = {
- version = "5.20.5";
+ version = "5.21.1";
src = fetchurl {
- url = "${mirror}/stable/plasma/5.20.5/kgamma5-5.20.5.tar.xz";
- sha256 = "1gy0pgsk3xi129y8h78lcif60ajs3y5fxzj1pl7mn6g72f7mwxld";
- name = "kgamma5-5.20.5.tar.xz";
+ url = "${mirror}/stable/plasma/5.21.1/kgamma5-5.21.1.tar.xz";
+ sha256 = "1316l73jj4b41mrsk1vba3g4mdj0q6hxazqqkvzrcinzwr34p3l2";
+ name = "kgamma5-5.21.1.tar.xz";
};
};
khotkeys = {
- version = "5.20.5";
+ version = "5.21.1";
src = fetchurl {
- url = "${mirror}/stable/plasma/5.20.5/khotkeys-5.20.5.tar.xz";
- sha256 = "1iw8rxdl9q45jqsnmqdm1lkymzkyxkrfgch51kxfj34vd4mi66h8";
- name = "khotkeys-5.20.5.tar.xz";
+ url = "${mirror}/stable/plasma/5.21.1/khotkeys-5.21.1.tar.xz";
+ sha256 = "1kp6s1qgzz6j5z4widy5hqnwyh90vw3adf47jk54msdzlh2ak0q7";
+ name = "khotkeys-5.21.1.tar.xz";
};
};
kinfocenter = {
- version = "5.20.5";
+ version = "5.21.1";
src = fetchurl {
- url = "${mirror}/stable/plasma/5.20.5/kinfocenter-5.20.5.tar.xz";
- sha256 = "0k3vvfwrfwmmicw8p81fpqljvmj3n8342avavc49ajmnygls7ssm";
- name = "kinfocenter-5.20.5.tar.xz";
+ url = "${mirror}/stable/plasma/5.21.1/kinfocenter-5.21.1.tar.xz";
+ sha256 = "1fy5985f4zf9v656dfb30c95pkbasx2302qamdxpfhrl465nqn5d";
+ name = "kinfocenter-5.21.1.tar.xz";
};
};
kmenuedit = {
- version = "5.20.5";
+ version = "5.21.1";
src = fetchurl {
- url = "${mirror}/stable/plasma/5.20.5/kmenuedit-5.20.5.tar.xz";
- sha256 = "0apmhglw74ppps52fhspjdsiy19b219lf68aj8jlpiiqcn80mggf";
- name = "kmenuedit-5.20.5.tar.xz";
+ url = "${mirror}/stable/plasma/5.21.1/kmenuedit-5.21.1.tar.xz";
+ sha256 = "1cksy6fn9mx96jnlglzmg0n9817vmypl1lwxdyxncxzw275k0c05";
+ name = "kmenuedit-5.21.1.tar.xz";
};
};
kscreen = {
- version = "5.20.5";
+ version = "5.21.1";
src = fetchurl {
- url = "${mirror}/stable/plasma/5.20.5/kscreen-5.20.5.tar.xz";
- sha256 = "1njjkrdgdd6g8avf7ik9fd7j9g4zdbjghli7svcfz2z8h6na626y";
- name = "kscreen-5.20.5.tar.xz";
+ url = "${mirror}/stable/plasma/5.21.1/kscreen-5.21.1.tar.xz";
+ sha256 = "0w199x0ig7vv7ki17v5paipw1jkkiavj6296zmpbnxn88n6i8jw3";
+ name = "kscreen-5.21.1.tar.xz";
};
};
kscreenlocker = {
- version = "5.20.5";
+ version = "5.21.1";
src = fetchurl {
- url = "${mirror}/stable/plasma/5.20.5/kscreenlocker-5.20.5.tar.xz";
- sha256 = "07y0lhwh4pc5rsdfr5yqb645v37ya97vh3dmy2riw9908hiyybw0";
- name = "kscreenlocker-5.20.5.tar.xz";
+ url = "${mirror}/stable/plasma/5.21.1/kscreenlocker-5.21.1.tar.xz";
+ sha256 = "1qpmysv7cby0bir4qyr1if3zc1ky43fyzhhxfqc69mcx803iabyv";
+ name = "kscreenlocker-5.21.1.tar.xz";
};
};
ksshaskpass = {
- version = "5.20.5";
+ version = "5.21.1";
src = fetchurl {
- url = "${mirror}/stable/plasma/5.20.5/ksshaskpass-5.20.5.tar.xz";
- sha256 = "1xk55ampbrz56pl739m6r150qcsjq0nw2sxxkpqykgwjh275y4ry";
- name = "ksshaskpass-5.20.5.tar.xz";
+ url = "${mirror}/stable/plasma/5.21.1/ksshaskpass-5.21.1.tar.xz";
+ sha256 = "11avkc3qqskq8pkdsq1jikpdh9izghv3algbf67lwl236s8mmdzk";
+ name = "ksshaskpass-5.21.1.tar.xz";
};
};
ksysguard = {
- version = "5.20.5";
+ version = "5.21.1";
src = fetchurl {
- url = "${mirror}/stable/plasma/5.20.5/ksysguard-5.20.5.tar.xz";
- sha256 = "0ddb3m6rygjisv31bc722vxzyb2q14940szfzijcv48z5ixj5x9j";
- name = "ksysguard-5.20.5.tar.xz";
+ url = "${mirror}/stable/plasma/5.21.1/ksysguard-5.21.1.tar.xz";
+ sha256 = "1fnccjs04b3pvdb8wwmw03g8x4h7zw5q4pxh0gfy7w705w3wkxwm";
+ name = "ksysguard-5.21.1.tar.xz";
};
};
kwallet-pam = {
- version = "5.20.5";
+ version = "5.21.1";
src = fetchurl {
- url = "${mirror}/stable/plasma/5.20.5/kwallet-pam-5.20.5.tar.xz";
- sha256 = "1wn1zm8bfxxsjvx4rbds60v9ckizj55znpq477vnzrh2xfx13rjk";
- name = "kwallet-pam-5.20.5.tar.xz";
+ url = "${mirror}/stable/plasma/5.21.1/kwallet-pam-5.21.1.tar.xz";
+ sha256 = "0ybdyalppfypvq26j6lxjfz2zm41kw1nlsyh857z06f0s65257zb";
+ name = "kwallet-pam-5.21.1.tar.xz";
};
};
kwayland-integration = {
- version = "5.20.5";
+ version = "5.21.1";
src = fetchurl {
- url = "${mirror}/stable/plasma/5.20.5/kwayland-integration-5.20.5.tar.xz";
- sha256 = "0rqzq851apw1p4c7salk7rcygjdw7ra0x95xw57vh68w19kn9wrk";
- name = "kwayland-integration-5.20.5.tar.xz";
+ url = "${mirror}/stable/plasma/5.21.1/kwayland-integration-5.21.1.tar.xz";
+ sha256 = "0s0gljcfv3sjh63d8bcjmzqgvxrqzjbxj8dsyi68w187dxzca8b4";
+ name = "kwayland-integration-5.21.1.tar.xz";
};
};
kwayland-server = {
- version = "5.20.5";
+ version = "5.21.1";
src = fetchurl {
- url = "${mirror}/stable/plasma/5.20.5/kwayland-server-5.20.5.tar.xz";
- sha256 = "0ajxjj2cbrg6rpry3r48q3zhxxkr09498j5in0v1jwijp83n9wz0";
- name = "kwayland-server-5.20.5.tar.xz";
+ url = "${mirror}/stable/plasma/5.21.1/kwayland-server-5.21.1.tar.xz";
+ sha256 = "00d14d8q3jw1h2yyn49wpxndwl5v1clxnialrqgkyli6qkwkf29m";
+ name = "kwayland-server-5.21.1.tar.xz";
};
};
kwin = {
- version = "5.20.5";
+ version = "5.21.1";
src = fetchurl {
- url = "${mirror}/stable/plasma/5.20.5/kwin-5.20.5.tar.xz";
- sha256 = "0kiq46gdvfv2811125kw1ncnk1pmpnqkvrz7p3lry72sjd1ja57c";
- name = "kwin-5.20.5.tar.xz";
+ url = "${mirror}/stable/plasma/5.21.1/kwin-5.21.1.tar.xz";
+ sha256 = "035w7b9cfg3hv9kw3rab1y9xw4r51psz7csx7nki05nwzx84812s";
+ name = "kwin-5.21.1.tar.xz";
};
};
kwrited = {
- version = "5.20.5";
+ version = "5.21.1";
src = fetchurl {
- url = "${mirror}/stable/plasma/5.20.5/kwrited-5.20.5.tar.xz";
- sha256 = "1h0vbb0bz4r26g4yf88jfzkbi8xbyf44c2y9nmlrmr5lws4bpcmz";
- name = "kwrited-5.20.5.tar.xz";
+ url = "${mirror}/stable/plasma/5.21.1/kwrited-5.21.1.tar.xz";
+ sha256 = "15xsjkxqx48wpzjawv4qpbgh8a48sfrmldgcwhn1cscq8s0marh3";
+ name = "kwrited-5.21.1.tar.xz";
};
};
libkscreen = {
- version = "5.20.5";
+ version = "5.21.1";
src = fetchurl {
- url = "${mirror}/stable/plasma/5.20.5/libkscreen-5.20.5.tar.xz";
- sha256 = "0641kk7s4xy5y94rn6xzjnrp4sbl7yn9w9qzlw4925858pgrr9qv";
- name = "libkscreen-5.20.5.tar.xz";
+ url = "${mirror}/stable/plasma/5.21.1/libkscreen-5.21.1.tar.xz";
+ sha256 = "0hrgmnvyv5v5d15wj1gynyzk83jj8p9cjhz0q2l41n2rh81rw52z";
+ name = "libkscreen-5.21.1.tar.xz";
};
};
libksysguard = {
- version = "5.20.5";
+ version = "5.21.1";
src = fetchurl {
- url = "${mirror}/stable/plasma/5.20.5/libksysguard-5.20.5.tar.xz";
- sha256 = "0v2x7sl5gg8a9i1cwx8prv03pcls4q3wfxxs5qs6g5ami1f679d8";
- name = "libksysguard-5.20.5.tar.xz";
+ url = "${mirror}/stable/plasma/5.21.1/libksysguard-5.21.1.tar.xz";
+ sha256 = "14zafjp0ikqgkdr8a04idj08xami2xn8cw3scgwfcix3y7mv0ip8";
+ name = "libksysguard-5.21.1.tar.xz";
};
};
milou = {
- version = "5.20.5";
+ version = "5.21.1";
src = fetchurl {
- url = "${mirror}/stable/plasma/5.20.5/milou-5.20.5.tar.xz";
- sha256 = "1hmpdj2zi6nidm6058a6kjgzij8qy9xihv20hi2dhk0f8ys42k3h";
- name = "milou-5.20.5.tar.xz";
+ url = "${mirror}/stable/plasma/5.21.1/milou-5.21.1.tar.xz";
+ sha256 = "095mk7592r4fwkw5f3p8mgc0p2wg8wi347qx8s1yblwjcml86a5f";
+ name = "milou-5.21.1.tar.xz";
};
};
oxygen = {
- version = "5.20.5";
+ version = "5.21.1";
src = fetchurl {
- url = "${mirror}/stable/plasma/5.20.5/oxygen-5.20.5.tar.xz";
- sha256 = "166jk8ix0dnv92svymaxjwbc08k6q8nag9xr2dc033x5lr2l59qr";
- name = "oxygen-5.20.5.tar.xz";
+ url = "${mirror}/stable/plasma/5.21.1/oxygen-5.21.1.tar.xz";
+ sha256 = "1s5bzdj5l515g4biarrzmkc7vpi0hqbk75rjjkr11fsvkghhphwg";
+ name = "oxygen-5.21.1.tar.xz";
};
};
plasma-browser-integration = {
- version = "5.20.5";
+ version = "5.21.1";
src = fetchurl {
- url = "${mirror}/stable/plasma/5.20.5/plasma-browser-integration-5.20.5.tar.xz";
- sha256 = "03zzmzdlc5a3nrx6izb66s7l3cmangkfjda2mf17g2097rrnb9n2";
- name = "plasma-browser-integration-5.20.5.tar.xz";
+ url = "${mirror}/stable/plasma/5.21.1/plasma-browser-integration-5.21.1.tar.xz";
+ sha256 = "0m99il47932ybsdp5z7apgb9l991wdhbrm3sninflcrg6ag9myp3";
+ name = "plasma-browser-integration-5.21.1.tar.xz";
};
};
plasma-desktop = {
- version = "5.20.5";
+ version = "5.21.1";
src = fetchurl {
- url = "${mirror}/stable/plasma/5.20.5/plasma-desktop-5.20.5.tar.xz";
- sha256 = "1fc74zgxkp65pj8p58prd5rq7nqspjfcgr70say2imagyj9nwrdx";
- name = "plasma-desktop-5.20.5.tar.xz";
+ url = "${mirror}/stable/plasma/5.21.1/plasma-desktop-5.21.1.tar.xz";
+ sha256 = "1ligy1ps3ajrsg6lvb9ailirgc52sswbknp0zn53n8gka176c555";
+ name = "plasma-desktop-5.21.1.tar.xz";
};
};
plasma-disks = {
- version = "5.20.5";
+ version = "5.21.1";
src = fetchurl {
- url = "${mirror}/stable/plasma/5.20.5/plasma-disks-5.20.5.tar.xz";
- sha256 = "0bcwf3g2vy2gf0igg0dyl9x5qc0xx0d5z05n4mi7asg5acl596r1";
- name = "plasma-disks-5.20.5.tar.xz";
+ url = "${mirror}/stable/plasma/5.21.1/plasma-disks-5.21.1.tar.xz";
+ sha256 = "0py662wlqbx5408rjbxnsa5ccnsaqx2wfy84fvjs4vl73wqmi2nl";
+ name = "plasma-disks-5.21.1.tar.xz";
+ };
+ };
+ plasma-firewall = {
+ version = "5.21.1";
+ src = fetchurl {
+ url = "${mirror}/stable/plasma/5.21.1/plasma-firewall-5.21.1.tar.xz";
+ sha256 = "19q7w9m1vj7gs5d3prraciw00iy0ywjfxlpjhxjiq0s0s0icf1hb";
+ name = "plasma-firewall-5.21.1.tar.xz";
};
};
plasma-integration = {
- version = "5.20.5";
+ version = "5.21.1";
src = fetchurl {
- url = "${mirror}/stable/plasma/5.20.5/plasma-integration-5.20.5.tar.xz";
- sha256 = "1wydjnmryf2kvfgg6m9kafa5waimccqr531qrq3nisdjc5p1w9x8";
- name = "plasma-integration-5.20.5.tar.xz";
+ url = "${mirror}/stable/plasma/5.21.1/plasma-integration-5.21.1.tar.xz";
+ sha256 = "0i51grmjkf9k6z1aq4j69wqdwdnn4rcryvi7b9lfpqaz1phsqhq7";
+ name = "plasma-integration-5.21.1.tar.xz";
};
};
plasma-nano = {
- version = "5.20.5";
+ version = "5.21.1";
src = fetchurl {
- url = "${mirror}/stable/plasma/5.20.5/plasma-nano-5.20.5.tar.xz";
- sha256 = "0h276i1dxbiziw258wf6az9mnysp3xxfh7nlxv0g2w1vfnhm23v5";
- name = "plasma-nano-5.20.5.tar.xz";
+ url = "${mirror}/stable/plasma/5.21.1/plasma-nano-5.21.1.tar.xz";
+ sha256 = "0qz14rmnlpk8mc1lgk854zlp032znc27j0wg6a7zsljikbx90dzm";
+ name = "plasma-nano-5.21.1.tar.xz";
};
};
plasma-nm = {
- version = "5.20.5";
+ version = "5.21.1";
src = fetchurl {
- url = "${mirror}/stable/plasma/5.20.5/plasma-nm-5.20.5.tar.xz";
- sha256 = "060f32adr0wlv2bs9swjyxcil7n74cnk48j8b8984wwhk6zz53a6";
- name = "plasma-nm-5.20.5.tar.xz";
+ url = "${mirror}/stable/plasma/5.21.1/plasma-nm-5.21.1.tar.xz";
+ sha256 = "0lg9fkk4lag5pi648jv66b8mzp645xx75y4zylj87yz3i8h9may4";
+ name = "plasma-nm-5.21.1.tar.xz";
};
};
plasma-pa = {
- version = "5.20.5";
+ version = "5.21.1";
src = fetchurl {
- url = "${mirror}/stable/plasma/5.20.5/plasma-pa-5.20.5.tar.xz";
- sha256 = "0xvkbrz3290xxfvv1rqqv7w57j3gdng8m2jyjj1j6dmaackl512d";
- name = "plasma-pa-5.20.5.tar.xz";
+ url = "${mirror}/stable/plasma/5.21.1/plasma-pa-5.21.1.tar.xz";
+ sha256 = "17vxvvrii3q46k22k3v94hicvxw7cdfl4rgaqbb8rvy94f2dhvir";
+ name = "plasma-pa-5.21.1.tar.xz";
};
};
plasma-phone-components = {
- version = "5.20.5";
+ version = "5.21.1";
src = fetchurl {
- url = "${mirror}/stable/plasma/5.20.5/plasma-phone-components-5.20.5.tar.xz";
- sha256 = "14h790b2jfs2j2lvv3dwqm20v3nlvah2909g4mhm9kwfdsmgnjms";
- name = "plasma-phone-components-5.20.5.tar.xz";
+ url = "${mirror}/stable/plasma/5.21.1/plasma-phone-components-5.21.1.tar.xz";
+ sha256 = "1fzjwc1x40n8wxq9fqm83j07yg9zniilmafcsv0rd80k6v99691i";
+ name = "plasma-phone-components-5.21.1.tar.xz";
};
};
plasma-sdk = {
- version = "5.20.5";
+ version = "5.21.1";
src = fetchurl {
- url = "${mirror}/stable/plasma/5.20.5/plasma-sdk-5.20.5.tar.xz";
- sha256 = "13cqn700nadqgmn54sy8qbf7waqkgvhzndh73jvmhb0z699z4s6y";
- name = "plasma-sdk-5.20.5.tar.xz";
+ url = "${mirror}/stable/plasma/5.21.1/plasma-sdk-5.21.1.tar.xz";
+ sha256 = "0s18lgp8baan9s9qr8wwaq3ah668255whz9xpl2xl1qv9qnr5v28";
+ name = "plasma-sdk-5.21.1.tar.xz";
+ };
+ };
+ plasma-systemmonitor = {
+ version = "5.21.1";
+ src = fetchurl {
+ url = "${mirror}/stable/plasma/5.21.1/plasma-systemmonitor-5.21.1.tar.xz";
+ sha256 = "1mfmlnsa2iy4wrdi2hghrapd7j02k3xkv4cfv44pw29i5iihvx6a";
+ name = "plasma-systemmonitor-5.21.1.tar.xz";
};
};
plasma-tests = {
- version = "5.20.5";
+ version = "5.21.1";
src = fetchurl {
- url = "${mirror}/stable/plasma/5.20.5/plasma-tests-5.20.5.tar.xz";
- sha256 = "0h6wccqp46s3i8dqc6rrh68l8fk662yvz0fdscqv295g1zwhb45j";
- name = "plasma-tests-5.20.5.tar.xz";
+ url = "${mirror}/stable/plasma/5.21.1/plasma-tests-5.21.1.tar.xz";
+ sha256 = "1qxlwvxwkqgxy6kvd9dqp7wg02gc4j37az20gxglm5s4jf9j47kr";
+ name = "plasma-tests-5.21.1.tar.xz";
};
};
plasma-thunderbolt = {
- version = "5.20.5";
+ version = "5.21.1";
src = fetchurl {
- url = "${mirror}/stable/plasma/5.20.5/plasma-thunderbolt-5.20.5.tar.xz";
- sha256 = "06l5zpgn5zmid0rkp8lx228nw72nd991s2cg29yg2h51zyvff4v0";
- name = "plasma-thunderbolt-5.20.5.tar.xz";
+ url = "${mirror}/stable/plasma/5.21.1/plasma-thunderbolt-5.21.1.tar.xz";
+ sha256 = "1v6yjxk30wpr86f1m7zn9sm5vvagcjmqz8b3s9sliv0z69n50fzx";
+ name = "plasma-thunderbolt-5.21.1.tar.xz";
};
};
plasma-vault = {
- version = "5.20.5";
+ version = "5.21.1";
src = fetchurl {
- url = "${mirror}/stable/plasma/5.20.5/plasma-vault-5.20.5.tar.xz";
- sha256 = "0b9jnzx5040sgzqsnzjz61sxnlsmbqfsk8mvqclgqphgiqsbcnm2";
- name = "plasma-vault-5.20.5.tar.xz";
+ url = "${mirror}/stable/plasma/5.21.1/plasma-vault-5.21.1.tar.xz";
+ sha256 = "0mfjmmn3s2piqg8idmndh1klrr3fllka0lx6ckx7bmj1g7z3kr0d";
+ name = "plasma-vault-5.21.1.tar.xz";
};
};
plasma-workspace = {
- version = "5.20.5";
+ version = "5.21.1";
src = fetchurl {
- url = "${mirror}/stable/plasma/5.20.5/plasma-workspace-5.20.5.tar.xz";
- sha256 = "0966nqyqs7hb7fp3a3jxhm64iqwbafd29sbagigx9d7gj8qg8zim";
- name = "plasma-workspace-5.20.5.tar.xz";
+ url = "${mirror}/stable/plasma/5.21.1/plasma-workspace-5.21.1.tar.xz";
+ sha256 = "0aq2158sijlgz3baslj57kzhmdx3m0zir80qz1svw94grfszjc2a";
+ name = "plasma-workspace-5.21.1.tar.xz";
};
};
plasma-workspace-wallpapers = {
- version = "5.20.5";
+ version = "5.21.1";
src = fetchurl {
- url = "${mirror}/stable/plasma/5.20.5/plasma-workspace-wallpapers-5.20.5.tar.xz";
- sha256 = "03z7pcba8kkmb70dn7gsqldxgb8lky6qw040p5ik1j07516xm6z3";
- name = "plasma-workspace-wallpapers-5.20.5.tar.xz";
+ url = "${mirror}/stable/plasma/5.21.1/plasma-workspace-wallpapers-5.21.1.tar.xz";
+ sha256 = "1pfgzzfhwdgczhrgizwi7rvav1hawwv6zra8nlqnfia8rc4mjs3n";
+ name = "plasma-workspace-wallpapers-5.21.1.tar.xz";
};
};
plymouth-kcm = {
- version = "5.20.5";
+ version = "5.21.1";
src = fetchurl {
- url = "${mirror}/stable/plasma/5.20.5/plymouth-kcm-5.20.5.tar.xz";
- sha256 = "0lwir088h3mjdxc6zzbd74g7alfnsrhf7m0p7ma6prncdj25pcyz";
- name = "plymouth-kcm-5.20.5.tar.xz";
+ url = "${mirror}/stable/plasma/5.21.1/plymouth-kcm-5.21.1.tar.xz";
+ sha256 = "1il5a60db4brgs0ifmbxhq1ncqg80pkz5pnddbb3vwiwgwrsjziw";
+ name = "plymouth-kcm-5.21.1.tar.xz";
};
};
polkit-kde-agent = {
- version = "1-5.20.5";
+ version = "1-5.21.1";
src = fetchurl {
- url = "${mirror}/stable/plasma/5.20.5/polkit-kde-agent-1-5.20.5.tar.xz";
- sha256 = "1rkvnci93xvxga6cvw99aaivkn8897kyqdw7p9hmk09qvg2qb92v";
- name = "polkit-kde-agent-1-5.20.5.tar.xz";
+ url = "${mirror}/stable/plasma/5.21.1/polkit-kde-agent-1-5.21.1.tar.xz";
+ sha256 = "1lm6rl3lfimlfw7yaqk81jdrdi31qbz951vzcss4prwa1iqdi7b2";
+ name = "polkit-kde-agent-1-5.21.1.tar.xz";
};
};
powerdevil = {
- version = "5.20.5";
+ version = "5.21.1";
src = fetchurl {
- url = "${mirror}/stable/plasma/5.20.5/powerdevil-5.20.5.tar.xz";
- sha256 = "1w3figagjxmrbc7hs81bllfkpq6f9mn4mwj7zjzxjf7d5fkmryrj";
- name = "powerdevil-5.20.5.tar.xz";
+ url = "${mirror}/stable/plasma/5.21.1/powerdevil-5.21.1.tar.xz";
+ sha256 = "08a9wl97lpcm0qz438ha8avdc6ybsij5vvy3p0ijkdn1psq2974b";
+ name = "powerdevil-5.21.1.tar.xz";
+ };
+ };
+ qqc2-breeze-style = {
+ version = "5.21.1";
+ src = fetchurl {
+ url = "${mirror}/stable/plasma/5.21.1/qqc2-breeze-style-5.21.1.tar.xz";
+ sha256 = "1k4zl5hbbyk2v9gila8whkh7yniv3nwcgdc73ysc75ivqyzydsix";
+ name = "qqc2-breeze-style-5.21.1.tar.xz";
};
};
sddm-kcm = {
- version = "5.20.5";
+ version = "5.21.1";
src = fetchurl {
- url = "${mirror}/stable/plasma/5.20.5/sddm-kcm-5.20.5.tar.xz";
- sha256 = "1zw9y6knrx848f529m45iszr0xplr9lnck242ddmzj3x7qz0x1az";
- name = "sddm-kcm-5.20.5.tar.xz";
+ url = "${mirror}/stable/plasma/5.21.1/sddm-kcm-5.21.1.tar.xz";
+ sha256 = "0j76zwmn2r62hjzv1gni44a9admd38x2s8s30qfc1dzc7nkv61sh";
+ name = "sddm-kcm-5.21.1.tar.xz";
};
};
systemsettings = {
- version = "5.20.5";
+ version = "5.21.1";
src = fetchurl {
- url = "${mirror}/stable/plasma/5.20.5/systemsettings-5.20.5.tar.xz";
- sha256 = "1b1j9hl9nzd4qqs255yd3svsb492w8i6l6ccihllwzqwkb1kpq5j";
- name = "systemsettings-5.20.5.tar.xz";
+ url = "${mirror}/stable/plasma/5.21.1/systemsettings-5.21.1.tar.xz";
+ sha256 = "0kzg3raa2f3lwb5qs10g8kzmv6px8fk4z2sq5jnjl3n9zqgzykkr";
+ name = "systemsettings-5.21.1.tar.xz";
};
};
xdg-desktop-portal-kde = {
- version = "5.20.5";
+ version = "5.21.1";
src = fetchurl {
- url = "${mirror}/stable/plasma/5.20.5/xdg-desktop-portal-kde-5.20.5.tar.xz";
- sha256 = "07g70517p89araa305if2xgwpfd7sdbknl880hqn2mqaqd9m83gl";
- name = "xdg-desktop-portal-kde-5.20.5.tar.xz";
+ url = "${mirror}/stable/plasma/5.21.1/xdg-desktop-portal-kde-5.21.1.tar.xz";
+ sha256 = "1xfnwycrq51sz1r57misrz8acq6yd1vrr5gjir4f1ynfclhf9aj6";
+ name = "xdg-desktop-portal-kde-5.21.1.tar.xz";
};
};
}
diff --git a/third_party/nixpkgs/pkgs/development/arduino/arduino-core/default.nix b/third_party/nixpkgs/pkgs/development/arduino/arduino-core/default.nix
index 2eff5e553e..529be6e2a5 100644
--- a/third_party/nixpkgs/pkgs/development/arduino/arduino-core/default.nix
+++ b/third_party/nixpkgs/pkgs/development/arduino/arduino-core/default.nix
@@ -116,13 +116,12 @@ stdenv.mkDerivation rec {
# the glib setup hook will populate GSETTINGS_SCHEMAS_PATH,
# wrapGAppHooks (among other things) adds it to XDG_DATA_DIRS
# so 'save as...' works:
- nativeBuildInputs = [ glib wrapGAppsHook ];
+ nativeBuildInputs = [ glib wrapGAppsHook unzip ];
buildInputs = [
jdk
ant
libusb-compat-0_1
libusb1
- unzip
zlib
ncurses5
readline
diff --git a/third_party/nixpkgs/pkgs/development/compilers/adoptopenjdk-bin/generate-sources.py b/third_party/nixpkgs/pkgs/development/compilers/adoptopenjdk-bin/generate-sources.py
index 63b807bd80..b39090b167 100755
--- a/third_party/nixpkgs/pkgs/development/compilers/adoptopenjdk-bin/generate-sources.py
+++ b/third_party/nixpkgs/pkgs/development/compilers/adoptopenjdk-bin/generate-sources.py
@@ -63,3 +63,4 @@ for release in releases:
with open("sources.json", "w") as f:
json.dump(out, f, indent=2, sort_keys=True)
+ f.write('\n')
diff --git a/third_party/nixpkgs/pkgs/development/compilers/adoptopenjdk-bin/sources.json b/third_party/nixpkgs/pkgs/development/compilers/adoptopenjdk-bin/sources.json
index 14c887554f..36d1f62123 100644
--- a/third_party/nixpkgs/pkgs/development/compilers/adoptopenjdk-bin/sources.json
+++ b/third_party/nixpkgs/pkgs/development/compilers/adoptopenjdk-bin/sources.json
@@ -4,92 +4,92 @@
"jdk": {
"hotspot": {
"aarch64": {
- "build": "11",
- "sha256": "f90c6f941a95e20e305870700328804e5b48acb69d4928dc9c4627b3c755ae8a",
- "url": "https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk-11.0.9%2B11.1/OpenJDK11U-jdk_aarch64_linux_hotspot_11.0.9_11.tar.gz",
- "version": "11.0.9"
+ "build": "9",
+ "sha256": "420c5d1e5dc66b2ed7dedd30a7bdf94bfaed10d5e1b07dc579722bf60a8114a9",
+ "url": "https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk-11.0.10%2B9/OpenJDK11U-jdk_aarch64_linux_hotspot_11.0.10_9.tar.gz",
+ "version": "11.0.10"
},
"armv6l": {
- "build": "11",
- "sha256": "082a13a9a5fbcf7ca45e67ab39e9682a9ef9e3779395e37aa0bf235e42a8eaf5",
- "url": "https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk-11.0.9%2B11/OpenJDK11U-jdk_arm_linux_hotspot_11.0.9_11.tar.gz",
- "version": "11.0.9"
+ "build": "9",
+ "sha256": "34908da9c200f5ef71b8766398b79fd166f8be44d87f97510667698b456c8d44",
+ "url": "https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk-11.0.10%2B9/OpenJDK11U-jdk_arm_linux_hotspot_11.0.10_9.tar.gz",
+ "version": "11.0.10"
},
"armv7l": {
- "build": "11",
- "sha256": "082a13a9a5fbcf7ca45e67ab39e9682a9ef9e3779395e37aa0bf235e42a8eaf5",
- "url": "https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk-11.0.9%2B11/OpenJDK11U-jdk_arm_linux_hotspot_11.0.9_11.tar.gz",
- "version": "11.0.9"
+ "build": "9",
+ "sha256": "34908da9c200f5ef71b8766398b79fd166f8be44d87f97510667698b456c8d44",
+ "url": "https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk-11.0.10%2B9/OpenJDK11U-jdk_arm_linux_hotspot_11.0.10_9.tar.gz",
+ "version": "11.0.10"
},
"packageType": "jdk",
"vmType": "hotspot",
"x86_64": {
- "build": "11",
- "sha256": "a3c52b73a76bed0f113604165eb4f2020b767e188704d8cc0bfc8bc4eb596712",
- "url": "https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk-11.0.9%2B11.1/OpenJDK11U-jdk_x64_linux_hotspot_11.0.9_11.tar.gz",
- "version": "11.0.9"
+ "build": "9",
+ "sha256": "ae78aa45f84642545c01e8ef786dfd700d2226f8b12881c844d6a1f71789cb99",
+ "url": "https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk-11.0.10%2B9/OpenJDK11U-jdk_x64_linux_hotspot_11.0.10_9.tar.gz",
+ "version": "11.0.10"
}
},
"openj9": {
"aarch64": {
- "build": "11",
- "sha256": "f0426b6d37085d471a7f577ce6f28af7cc8fe35b9b0b09a5111eccaed80a0447",
- "url": "https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk-11.0.9%2B11_openj9-0.23.0/OpenJDK11U-jdk_aarch64_linux_openj9_11.0.9_11_openj9-0.23.0.tar.gz",
- "version": "11.0.9"
+ "build": "9",
+ "sha256": "0ce9a8c38d154540610dfe03e59389734deb91c5cb9258408404c5026d4afa41",
+ "url": "https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk-11.0.10%2B9_openj9-0.24.0/OpenJDK11U-jdk_aarch64_linux_openj9_11.0.10_9_openj9-0.24.0.tar.gz",
+ "version": "11.0.10-ea"
},
"packageType": "jdk",
"vmType": "openj9",
"x86_64": {
- "build": "11",
- "sha256": "812d58fac39465802039291a1bc530b4feaaa61b58664d9c458a075921ae8091",
- "url": "https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk-11.0.9%2B11_openj9-0.23.0/OpenJDK11U-jdk_x64_linux_openj9_11.0.9_11_openj9-0.23.0.tar.gz",
- "version": "11.0.9"
+ "build": "9",
+ "sha256": "941d5df125d2ad426391340f539408b13d61d00ed31dd79142ff1ac84864a79f",
+ "url": "https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk-11.0.10%2B9_openj9-0.24.0/OpenJDK11U-jdk_x64_linux_openj9_11.0.10_9_openj9-0.24.0.tar.gz",
+ "version": "11.0.10"
}
}
},
"jre": {
"hotspot": {
"aarch64": {
- "build": "11",
- "sha256": "89b9b3108afda968a97961c5602a896bae31fea7c95195b54be5ad68b3af9e45",
- "url": "https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk-11.0.9%2B11.1/OpenJDK11U-jre_aarch64_linux_hotspot_11.0.9_11.tar.gz",
- "version": "11.0.9"
+ "build": "9",
+ "sha256": "5f9a894bd694f598f2befa4a605169685ac8bcb8ec68d25e587e8db4d2307b74",
+ "url": "https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk-11.0.10%2B9/OpenJDK11U-jre_aarch64_linux_hotspot_11.0.10_9.tar.gz",
+ "version": "11.0.10"
},
"armv6l": {
- "build": "11",
- "sha256": "8e52de3c7a24edb74e423631fa90a09f7af3193aa9e6e4837b337192669530b0",
- "url": "https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk-11.0.9%2B11/OpenJDK11U-jre_arm_linux_hotspot_11.0.9_11.tar.gz",
- "version": "11.0.9"
+ "build": "9",
+ "sha256": "2f2da2149c089c84f00b0eda63c31b77c8b51a1c080e18a70ecb5a78ba40d8c6",
+ "url": "https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk-11.0.10%2B9/OpenJDK11U-jre_arm_linux_hotspot_11.0.10_9.tar.gz",
+ "version": "11.0.10"
},
"armv7l": {
- "build": "11",
- "sha256": "8e52de3c7a24edb74e423631fa90a09f7af3193aa9e6e4837b337192669530b0",
- "url": "https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk-11.0.9%2B11/OpenJDK11U-jre_arm_linux_hotspot_11.0.9_11.tar.gz",
- "version": "11.0.9"
+ "build": "9",
+ "sha256": "2f2da2149c089c84f00b0eda63c31b77c8b51a1c080e18a70ecb5a78ba40d8c6",
+ "url": "https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk-11.0.10%2B9/OpenJDK11U-jre_arm_linux_hotspot_11.0.10_9.tar.gz",
+ "version": "11.0.10"
},
"packageType": "jre",
"vmType": "hotspot",
"x86_64": {
- "build": "11",
- "sha256": "2ed263b662afb8b5d2964d1c9941d20031d07e5af68679ebefdca35d40bb91b1",
- "url": "https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk-11.0.9%2B11.1/OpenJDK11U-jre_x64_linux_hotspot_11.0.9_11.tar.gz",
- "version": "11.0.9"
+ "build": "9",
+ "sha256": "25fdcf9427095ac27c8bdfc82096ad2e615693a3f6ea06c700fca7ffb271131a",
+ "url": "https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk-11.0.10%2B9/OpenJDK11U-jre_x64_linux_hotspot_11.0.10_9.tar.gz",
+ "version": "11.0.10"
}
},
"openj9": {
"aarch64": {
- "build": "11",
- "sha256": "b73f406dba1560dc194ac891452a1aacc2ba3b3e5e7b55e91a64559f8c2d9539",
- "url": "https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk-11.0.9%2B11_openj9-0.23.0/OpenJDK11U-jre_aarch64_linux_openj9_11.0.9_11_openj9-0.23.0.tar.gz",
- "version": "11.0.9"
+ "build": "9",
+ "sha256": "c48d2b19bf7040c74dfdcac9e395ba7b8f937522ee756c820465f2e8e3dffec2",
+ "url": "https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk-11.0.10%2B9_openj9-0.24.0/OpenJDK11U-jre_aarch64_linux_openj9_11.0.10_9_openj9-0.24.0.tar.gz",
+ "version": "11.0.10-ea"
},
"packageType": "jre",
"vmType": "openj9",
"x86_64": {
- "build": "11",
- "sha256": "54c845c167c197ba789eb6c3508faa5b1c95c9abe2ac26878123b6eecc87a111",
- "url": "https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk-11.0.9%2B11_openj9-0.23.0/OpenJDK11U-jre_x64_linux_openj9_11.0.9_11_openj9-0.23.0.tar.gz",
- "version": "11.0.9"
+ "build": "9",
+ "sha256": "7e5f97071f8b86c22c36ddfd7f821c3e8ec531c1128e2e6c931b2e64118a517a",
+ "url": "https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk-11.0.10%2B9_openj9-0.24.0/OpenJDK11U-jre_x64_linux_openj9_11.0.10_9_openj9-0.24.0.tar.gz",
+ "version": "11.0.10"
}
}
}
@@ -100,20 +100,20 @@
"packageType": "jdk",
"vmType": "hotspot",
"x86_64": {
- "build": "11",
- "sha256": "7b21961ffb2649e572721a0dfad64169b490e987937b661cb4e13a594c21e764",
- "url": "https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk-11.0.9%2B11.1/OpenJDK11U-jdk_x64_mac_hotspot_11.0.9_11.tar.gz",
- "version": "11.0.9"
+ "build": "9",
+ "sha256": "ee7c98c9d79689aca6e717965747b8bf4eec5413e89d5444cc2bd6dbd59e3811",
+ "url": "https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk-11.0.10%2B9/OpenJDK11U-jdk_x64_mac_hotspot_11.0.10_9.tar.gz",
+ "version": "11.0.10"
}
},
"openj9": {
"packageType": "jdk",
"vmType": "openj9",
"x86_64": {
- "build": "11",
- "sha256": "382238443d4495d976f9e1a66b0f6e3bc250d3d009b64d2c29d44022afd7e418",
- "url": "https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk-11.0.9%2B11.1_openj9-0.23.0/OpenJDK11U-jdk_x64_mac_openj9_11.0.9_11_openj9-0.23.0.tar.gz",
- "version": "11.0.9"
+ "build": "9",
+ "sha256": "58f931dc30160b04da2d94af32e0dfa384f4b2cf92b7217c0937fd057e668d54",
+ "url": "https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk-11.0.10%2B9_openj9-0.24.0/OpenJDK11U-jdk_x64_mac_openj9_11.0.10_9_openj9-0.24.0.tar.gz",
+ "version": "11.0.10"
}
}
},
@@ -122,20 +122,20 @@
"packageType": "jre",
"vmType": "hotspot",
"x86_64": {
- "build": "11",
- "sha256": "cd8965dc8dbd0b5b3b25b6a336857d9bb622965e039b77e3048bc825e5512e95",
- "url": "https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk-11.0.9%2B11.1/OpenJDK11U-jre_x64_mac_hotspot_11.0.9_11.tar.gz",
- "version": "11.0.9"
+ "build": "9",
+ "sha256": "215e94323d7c74fe31e5383261e3bfc8e9ca3dc03212738c48d29868b02fe875",
+ "url": "https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk-11.0.10%2B9/OpenJDK11U-jre_x64_mac_hotspot_11.0.10_9.tar.gz",
+ "version": "11.0.10"
}
},
"openj9": {
"packageType": "jre",
"vmType": "openj9",
"x86_64": {
- "build": "11",
- "sha256": "33a868f12bbe9326f658e60abe48dac658df33578b3719f551355855a87d1911",
- "url": "https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk-11.0.9%2B11.1_openj9-0.23.0/OpenJDK11U-jre_x64_mac_openj9_11.0.9_11_openj9-0.23.0.tar.gz",
- "version": "11.0.9"
+ "build": "9",
+ "sha256": "6e353f0b38a7192ad3e0522009065c7c24356e0d9329899477b21e39d2a7a8da",
+ "url": "https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk-11.0.10%2B9_openj9-0.24.0/OpenJDK11U-jre_x64_mac_openj9_11.0.10_9_openj9-0.24.0.tar.gz",
+ "version": "11.0.10"
}
}
}
@@ -146,19 +146,19 @@
"jdk": {
"hotspot": {
"aarch64": {
- "build": "8",
+ "build": "8.1",
"sha256": "0e6081cb51f8a6f3062bef4f4c45dbe1fccfd3f3b4b5d52522a3edb76581e3af",
"url": "https://github.com/AdoptOpenJDK/openjdk13-binaries/releases/download/jdk-13.0.2%2B8/OpenJDK13U-jdk_aarch64_linux_hotspot_13.0.2_8.tar.gz",
"version": "13.0.2"
},
"armv6l": {
- "build": "8",
+ "build": "8.1",
"sha256": "9beec080f2b2a7f6883b024272f4e8d5a0b027325e83647be318215781af1d1a",
"url": "https://github.com/AdoptOpenJDK/openjdk13-binaries/releases/download/jdk-13.0.2%2B8/OpenJDK13U-jdk_arm_linux_hotspot_13.0.2_8.tar.gz",
"version": "13.0.2"
},
"armv7l": {
- "build": "8",
+ "build": "8.1",
"sha256": "9beec080f2b2a7f6883b024272f4e8d5a0b027325e83647be318215781af1d1a",
"url": "https://github.com/AdoptOpenJDK/openjdk13-binaries/releases/download/jdk-13.0.2%2B8/OpenJDK13U-jdk_arm_linux_hotspot_13.0.2_8.tar.gz",
"version": "13.0.2"
@@ -166,7 +166,7 @@
"packageType": "jdk",
"vmType": "hotspot",
"x86_64": {
- "build": "8",
+ "build": "8.1",
"sha256": "9ccc063569f19899fd08e41466f8c4cd4e05058abdb5178fa374cb365dcf5998",
"url": "https://github.com/AdoptOpenJDK/openjdk13-binaries/releases/download/jdk-13.0.2%2B8/OpenJDK13U-jdk_x64_linux_hotspot_13.0.2_8.tar.gz",
"version": "13.0.2"
@@ -176,7 +176,7 @@
"packageType": "jdk",
"vmType": "openj9",
"x86_64": {
- "build": "8",
+ "build": "8.1",
"sha256": "aeecf6d30d0c847db81d07793cf97e5dc44890c29366d7d9f8f9f397f6c52590",
"url": "https://github.com/AdoptOpenJDK/openjdk13-binaries/releases/download/jdk-13.0.2%2B8_openj9-0.18.0/OpenJDK13U-jdk_x64_linux_openj9_13.0.2_8_openj9-0.18.0.tar.gz",
"version": "13.0.2"
@@ -186,7 +186,7 @@
"jre": {
"hotspot": {
"aarch64": {
- "build": "8",
+ "build": "8.1",
"sha256": "6c4b69d1609f4c65c576c80d6aa101de80048f8ce5566f890e8fff5349228bae",
"url": "https://github.com/AdoptOpenJDK/openjdk13-binaries/releases/download/jdk-13.0.2%2B8/OpenJDK13U-jre_aarch64_linux_hotspot_13.0.2_8.tar.gz",
"version": "13.0.2"
@@ -194,7 +194,7 @@
"packageType": "jre",
"vmType": "hotspot",
"x86_64": {
- "build": "8",
+ "build": "8.1",
"sha256": "897f16fe8e056395209e35d2384013bd1ff250e717465769079e3f4793628c34",
"url": "https://github.com/AdoptOpenJDK/openjdk13-binaries/releases/download/jdk-13.0.2%2B8/OpenJDK13U-jre_x64_linux_hotspot_13.0.2_8.tar.gz",
"version": "13.0.2"
@@ -204,7 +204,7 @@
"packageType": "jre",
"vmType": "openj9",
"x86_64": {
- "build": "8",
+ "build": "8.1",
"sha256": "a0ab38607811e282f64082edc68a2dea3fa6a5113391efb124a6d7d02883110a",
"url": "https://github.com/AdoptOpenJDK/openjdk13-binaries/releases/download/jdk-13.0.2%2B8_openj9-0.18.0/OpenJDK13U-jre_x64_linux_openj9_13.0.2_8_openj9-0.18.0.tar.gz",
"version": "13.0.2"
@@ -218,7 +218,7 @@
"packageType": "jdk",
"vmType": "hotspot",
"x86_64": {
- "build": "8",
+ "build": "8.1",
"sha256": "0ddb24efdf5aab541898d19b7667b149a1a64a8bd039b708fc58ee0284fa7e07",
"url": "https://github.com/AdoptOpenJDK/openjdk13-binaries/releases/download/jdk-13.0.2%2B8/OpenJDK13U-jdk_x64_mac_hotspot_13.0.2_8.tar.gz",
"version": "13.0.2"
@@ -228,7 +228,7 @@
"packageType": "jdk",
"vmType": "openj9",
"x86_64": {
- "build": "8",
+ "build": "8.1",
"sha256": "dd8d92eec98a3455ec5cd065a0a6672cc1aef280c6a68c507c372ccc1d98fbaa",
"url": "https://github.com/AdoptOpenJDK/openjdk13-binaries/releases/download/jdk-13.0.2%2B8_openj9-0.18.0/OpenJDK13U-jdk_x64_mac_openj9_13.0.2_8_openj9-0.18.0.tar.gz",
"version": "13.0.2"
@@ -240,7 +240,7 @@
"packageType": "jre",
"vmType": "hotspot",
"x86_64": {
- "build": "8",
+ "build": "8.1",
"sha256": "3149b9ebf0db1eaf2dc152df9efae82003e7971efb1cf550060e6a4798fe8c5c",
"url": "https://github.com/AdoptOpenJDK/openjdk13-binaries/releases/download/jdk-13.0.2%2B8/OpenJDK13U-jre_x64_mac_hotspot_13.0.2_8.tar.gz",
"version": "13.0.2"
@@ -250,7 +250,7 @@
"packageType": "jre",
"vmType": "openj9",
"x86_64": {
- "build": "8",
+ "build": "8.1",
"sha256": "6a8a636fca4c7e368241e232a37cd73c9867cdec8f0869fd158b1f58c6128cc2",
"url": "https://github.com/AdoptOpenJDK/openjdk13-binaries/releases/download/jdk-13.0.2%2B8_openj9-0.18.0/OpenJDK13U-jre_x64_mac_openj9_13.0.2_8_openj9-0.18.0.tar.gz",
"version": "13.0.2"
@@ -394,92 +394,92 @@
"jdk": {
"hotspot": {
"aarch64": {
- "build": "9",
- "sha256": "84398a1566d66ee5a88f3326fb7f0b70504eb510190f8f798bdb386481a3900e",
- "url": "https://github.com/AdoptOpenJDK/openjdk15-binaries/releases/download/jdk-15.0.1%2B9/OpenJDK15U-jdk_aarch64_linux_hotspot_15.0.1_9.tar.gz",
- "version": "15.0.1"
+ "build": "7",
+ "sha256": "6e8b6b037148cf20a284b5b257ec7bfdf9cc31ccc87778d0dfd95a2fddf228d4",
+ "url": "https://github.com/AdoptOpenJDK/openjdk15-binaries/releases/download/jdk-15.0.2%2B7/OpenJDK15U-jdk_aarch64_linux_hotspot_15.0.2_7.tar.gz",
+ "version": "15.0.2"
},
"armv6l": {
- "build": "9",
- "sha256": "bef5e9f4ab8a87645fa2b3d0ffb9f2b97374caa03cd1296597e8c86e8360d5a2",
- "url": "https://github.com/AdoptOpenJDK/openjdk15-binaries/releases/download/jdk-15.0.1%2B9/OpenJDK15U-jdk_arm_linux_hotspot_15.0.1_9.tar.gz",
- "version": "15.0.1"
+ "build": "7",
+ "sha256": "ff39c0380224e419d940382c4d651cb1e6297a794854e0cc459c1fd4973b3368",
+ "url": "https://github.com/AdoptOpenJDK/openjdk15-binaries/releases/download/jdk-15.0.2%2B7/OpenJDK15U-jdk_arm_linux_hotspot_15.0.2_7.tar.gz",
+ "version": "15.0.2"
},
"armv7l": {
- "build": "9",
- "sha256": "bef5e9f4ab8a87645fa2b3d0ffb9f2b97374caa03cd1296597e8c86e8360d5a2",
- "url": "https://github.com/AdoptOpenJDK/openjdk15-binaries/releases/download/jdk-15.0.1%2B9/OpenJDK15U-jdk_arm_linux_hotspot_15.0.1_9.tar.gz",
- "version": "15.0.1"
+ "build": "7",
+ "sha256": "ff39c0380224e419d940382c4d651cb1e6297a794854e0cc459c1fd4973b3368",
+ "url": "https://github.com/AdoptOpenJDK/openjdk15-binaries/releases/download/jdk-15.0.2%2B7/OpenJDK15U-jdk_arm_linux_hotspot_15.0.2_7.tar.gz",
+ "version": "15.0.2"
},
"packageType": "jdk",
"vmType": "hotspot",
"x86_64": {
- "build": "9",
- "sha256": "61045ecb9434e3320dbc2c597715f9884586b7a18a56d29851b4d4a4d48a2a5e",
- "url": "https://github.com/AdoptOpenJDK/openjdk15-binaries/releases/download/jdk-15.0.1%2B9/OpenJDK15U-jdk_x64_linux_hotspot_15.0.1_9.tar.gz",
- "version": "15.0.1"
+ "build": "7",
+ "sha256": "94f20ca8ea97773571492e622563883b8869438a015d02df6028180dd9acc24d",
+ "url": "https://github.com/AdoptOpenJDK/openjdk15-binaries/releases/download/jdk-15.0.2%2B7/OpenJDK15U-jdk_x64_linux_hotspot_15.0.2_7.tar.gz",
+ "version": "15.0.2"
}
},
"openj9": {
"aarch64": {
- "build": "9",
- "sha256": "6206643ec4a57597f73880423b72fc06c1018d92cc6b02972ec3ea3fe4d853a2",
- "url": "https://github.com/AdoptOpenJDK/openjdk15-binaries/releases/download/jdk-15.0.1%2B9_openj9-0.23.0/OpenJDK15U-jdk_aarch64_linux_openj9_15.0.1_9_openj9-0.23.0.tar.gz",
- "version": "15.0.1"
+ "build": "7",
+ "sha256": "b69a4bc87ed2e985d252cff02d53f1a11b8d83d39e0800cd4a1cab4521375314",
+ "url": "https://github.com/AdoptOpenJDK/openjdk15-binaries/releases/download/jdk-15.0.2%2B7_openj9-0.24.0/OpenJDK15U-jdk_aarch64_linux_openj9_15.0.2_7_openj9-0.24.0.tar.gz",
+ "version": "15.0.2-ea"
},
"packageType": "jdk",
"vmType": "openj9",
"x86_64": {
- "build": "9",
- "sha256": "b1561f7a69c977bfc9991e61e96dcb200c39300dd9ad423254af117c189e4a8d",
- "url": "https://github.com/AdoptOpenJDK/openjdk15-binaries/releases/download/jdk-15.0.1%2B9_openj9-0.23.0/OpenJDK15U-jdk_x64_linux_openj9_15.0.1_9_openj9-0.23.0.tar.gz",
- "version": "15.0.1"
+ "build": "7",
+ "sha256": "5515ccd79b1b5e8d8a615b80d5fe1272f7bb41100e46d94fb78ee611ea014816",
+ "url": "https://github.com/AdoptOpenJDK/openjdk15-binaries/releases/download/jdk-15.0.2%2B7_openj9-0.24.0/OpenJDK15U-jdk_x64_linux_openj9_15.0.2_7_openj9-0.24.0.tar.gz",
+ "version": "15.0.2"
}
}
},
"jre": {
"hotspot": {
"aarch64": {
- "build": "9",
- "sha256": "9eecdd39239545b922878abf51015030ba9aed4dda5c4574ddbc669a71ddab31",
- "url": "https://github.com/AdoptOpenJDK/openjdk15-binaries/releases/download/jdk-15.0.1%2B9/OpenJDK15U-jre_aarch64_linux_hotspot_15.0.1_9.tar.gz",
- "version": "15.0.1"
+ "build": "7",
+ "sha256": "1c1fc968d76004b0be0042027712835dcbe3570a6fc3a208157a4ab6adabbef2",
+ "url": "https://github.com/AdoptOpenJDK/openjdk15-binaries/releases/download/jdk-15.0.2%2B7/OpenJDK15U-jre_aarch64_linux_hotspot_15.0.2_7.tar.gz",
+ "version": "15.0.2"
},
"armv6l": {
- "build": "9",
- "sha256": "f289d1b9fc05099889eaa9a52d352275d44698f3448153cc2ef05f2fa1c04cca",
- "url": "https://github.com/AdoptOpenJDK/openjdk15-binaries/releases/download/jdk-15.0.1%2B9/OpenJDK15U-jre_arm_linux_hotspot_15.0.1_9.tar.gz",
- "version": "15.0.1"
+ "build": "7",
+ "sha256": "304be224952dbea7000cda6223b2978b3eefdf2e3749032c3b381a213c8d9c5e",
+ "url": "https://github.com/AdoptOpenJDK/openjdk15-binaries/releases/download/jdk-15.0.2%2B7/OpenJDK15U-jre_arm_linux_hotspot_15.0.2_7.tar.gz",
+ "version": "15.0.2"
},
"armv7l": {
- "build": "9",
- "sha256": "f289d1b9fc05099889eaa9a52d352275d44698f3448153cc2ef05f2fa1c04cca",
- "url": "https://github.com/AdoptOpenJDK/openjdk15-binaries/releases/download/jdk-15.0.1%2B9/OpenJDK15U-jre_arm_linux_hotspot_15.0.1_9.tar.gz",
- "version": "15.0.1"
+ "build": "7",
+ "sha256": "304be224952dbea7000cda6223b2978b3eefdf2e3749032c3b381a213c8d9c5e",
+ "url": "https://github.com/AdoptOpenJDK/openjdk15-binaries/releases/download/jdk-15.0.2%2B7/OpenJDK15U-jre_arm_linux_hotspot_15.0.2_7.tar.gz",
+ "version": "15.0.2"
},
"packageType": "jre",
"vmType": "hotspot",
"x86_64": {
- "build": "9",
- "sha256": "e619197c7a5757631f6ea9c912ab47528ebf64c27cf788cdad22bc9245779411",
- "url": "https://github.com/AdoptOpenJDK/openjdk15-binaries/releases/download/jdk-15.0.1%2B9/OpenJDK15U-jre_x64_linux_hotspot_15.0.1_9.tar.gz",
- "version": "15.0.1"
+ "build": "7",
+ "sha256": "31af7efdb1cc0ffd001bc145c3d255266889ad6b502133283ae8bf233d11334c",
+ "url": "https://github.com/AdoptOpenJDK/openjdk15-binaries/releases/download/jdk-15.0.2%2B7/OpenJDK15U-jre_x64_linux_hotspot_15.0.2_7.tar.gz",
+ "version": "15.0.2"
}
},
"openj9": {
"aarch64": {
- "build": "9",
- "sha256": "1db3c28e8c423d005fcf3b0c8a081061e56c51966273e32e3930d4c57c21bf49",
- "url": "https://github.com/AdoptOpenJDK/openjdk15-binaries/releases/download/jdk-15.0.1%2B9_openj9-0.23.0/OpenJDK15U-jre_aarch64_linux_openj9_15.0.1_9_openj9-0.23.0.tar.gz",
- "version": "15.0.1"
+ "build": "7",
+ "sha256": "37492012e75d75021dfb2b25fe5cc73664c03fee85532cec30ce4f5a4e5389c6",
+ "url": "https://github.com/AdoptOpenJDK/openjdk15-binaries/releases/download/jdk-15.0.2%2B7_openj9-0.24.0/OpenJDK15U-jre_aarch64_linux_openj9_15.0.2_7_openj9-0.24.0.tar.gz",
+ "version": "15.0.2-ea"
},
"packageType": "jre",
"vmType": "openj9",
"x86_64": {
- "build": "9",
- "sha256": "e47fdadfe91f554f3e343b24e678b6862673f9b1dce3703efd1447950188357b",
- "url": "https://github.com/AdoptOpenJDK/openjdk15-binaries/releases/download/jdk-15.0.1%2B9_openj9-0.23.0/OpenJDK15U-jre_x64_linux_openj9_15.0.1_9_openj9-0.23.0.tar.gz",
- "version": "15.0.1"
+ "build": "7",
+ "sha256": "a4ae1b7275fcfd6d87a3387edacc8e353dc95ee44f00ca5a348ea90331ec2084",
+ "url": "https://github.com/AdoptOpenJDK/openjdk15-binaries/releases/download/jdk-15.0.2%2B7_openj9-0.24.0/OpenJDK15U-jre_x64_linux_openj9_15.0.2_7_openj9-0.24.0.tar.gz",
+ "version": "15.0.2"
}
}
}
@@ -490,20 +490,20 @@
"packageType": "jdk",
"vmType": "hotspot",
"x86_64": {
- "build": "9",
- "sha256": "d32f9429c4992cef7be559a15c542011503d6bc38c89379800cd209a9d7ec539",
- "url": "https://github.com/AdoptOpenJDK/openjdk15-binaries/releases/download/jdk-15.0.1%2B9/OpenJDK15U-jdk_x64_mac_hotspot_15.0.1_9.tar.gz",
- "version": "15.0.1"
+ "build": "7",
+ "sha256": "d358a7ff03905282348c6c80562a4da2e04eb377b60ad2152be4c90f8d580b7f",
+ "url": "https://github.com/AdoptOpenJDK/openjdk15-binaries/releases/download/jdk-15.0.2%2B7/OpenJDK15U-jdk_x64_mac_hotspot_15.0.2_7.tar.gz",
+ "version": "15.0.2"
}
},
"openj9": {
"packageType": "jdk",
"vmType": "openj9",
"x86_64": {
- "build": "9",
- "sha256": "c9b19fd1fda9c581aa0bcddbf5f821204c351a1de29da1c5aa51cb680ee99517",
- "url": "https://github.com/AdoptOpenJDK/openjdk15-binaries/releases/download/jdk-15.0.1%2B9.1_openj9-0.23.0/OpenJDK15U-jdk_x64_mac_openj9_15.0.1_9_openj9-0.23.0.tar.gz",
- "version": "15.0.1"
+ "build": "7",
+ "sha256": "1336ae5529af3a0e35ae569e4188944831aeed7080a482f2490fc619380cbe53",
+ "url": "https://github.com/AdoptOpenJDK/openjdk15-binaries/releases/download/jdk-15.0.2%2B7_openj9-0.24.0/OpenJDK15U-jdk_x64_mac_openj9_15.0.2_7_openj9-0.24.0.tar.gz",
+ "version": "15.0.2"
}
}
},
@@ -512,20 +512,20 @@
"packageType": "jre",
"vmType": "hotspot",
"x86_64": {
- "build": "9",
- "sha256": "fde1713fc51e824a08f8eeb5e2b8a2acf21424d5f9a0e70cfd2e85a77c827bc4",
- "url": "https://github.com/AdoptOpenJDK/openjdk15-binaries/releases/download/jdk-15.0.1%2B9/OpenJDK15U-jre_x64_mac_hotspot_15.0.1_9.tar.gz",
- "version": "15.0.1"
+ "build": "7",
+ "sha256": "6a7150fa3ca8277394ff5bae6f56a70f61d2144a5dbbea4f008d86a3e5498795",
+ "url": "https://github.com/AdoptOpenJDK/openjdk15-binaries/releases/download/jdk-15.0.2%2B7/OpenJDK15U-jre_x64_mac_hotspot_15.0.2_7.tar.gz",
+ "version": "15.0.2"
}
},
"openj9": {
"packageType": "jre",
"vmType": "openj9",
"x86_64": {
- "build": "9",
- "sha256": "e7c3710d6cc23480ac66eba79b48d9e2bebec34ba688f3053bb5eba406a2c315",
- "url": "https://github.com/AdoptOpenJDK/openjdk15-binaries/releases/download/jdk-15.0.1%2B9.1_openj9-0.23.0/OpenJDK15U-jre_x64_mac_openj9_15.0.1_9_openj9-0.23.0.tar.gz",
- "version": "15.0.1"
+ "build": "7",
+ "sha256": "2c0ba5e66764d660037343db4bf32f1ed75ad27661e54e9a4df23d40cae448b0",
+ "url": "https://github.com/AdoptOpenJDK/openjdk15-binaries/releases/download/jdk-15.0.2%2B7_openj9-0.24.0/OpenJDK15U-jre_x64_mac_openj9_15.0.2_7_openj9-0.24.0.tar.gz",
+ "version": "15.0.2"
}
}
}
@@ -536,92 +536,92 @@
"jdk": {
"hotspot": {
"aarch64": {
- "build": "10",
- "sha256": "cfbde5191027c6d25af44af8a3d64625c6e22422dea8c4af6fe9240e7e249baa",
- "url": "https://github.com/AdoptOpenJDK/openjdk8-binaries/releases/download/jdk8u272-b10/OpenJDK8U-jdk_aarch64_linux_hotspot_8u272b10.tar.gz",
- "version": "8.0.272"
+ "build": "8",
+ "sha256": "9c07cf2099bbc6c850c46fd870bd243f5fcb6635181eabb312bdffe43ffc5080",
+ "url": "https://github.com/AdoptOpenJDK/openjdk8-binaries/releases/download/jdk8u282-b08/OpenJDK8U-jdk_aarch64_linux_hotspot_jdk8u282-b08.tar.gz",
+ "version": "8.0.282"
},
"armv6l": {
- "build": "10",
- "sha256": "b005e9e8a912aa6605debdea3685a223c077d5a4ba7c90bca02d804c5f39d0b9",
- "url": "https://github.com/AdoptOpenJDK/openjdk8-binaries/releases/download/jdk8u272-b10/OpenJDK8U-jdk_arm_linux_hotspot_8u272b10.tar.gz",
- "version": "8.0.272"
+ "build": "1",
+ "sha256": "e2e41a8705061dfcc766bfb6b7edd4c699e94aac68e4deeb28c8e76734a46fb7",
+ "url": "https://github.com/AdoptOpenJDK/openjdk8-binaries/releases/download/jdk8u275-b01/OpenJDK8U-jdk_arm_linux_hotspot_8u275b01.tar.gz",
+ "version": "8.0.275"
},
"armv7l": {
- "build": "10",
- "sha256": "b005e9e8a912aa6605debdea3685a223c077d5a4ba7c90bca02d804c5f39d0b9",
- "url": "https://github.com/AdoptOpenJDK/openjdk8-binaries/releases/download/jdk8u272-b10/OpenJDK8U-jdk_arm_linux_hotspot_8u272b10.tar.gz",
- "version": "8.0.272"
+ "build": "1",
+ "sha256": "e2e41a8705061dfcc766bfb6b7edd4c699e94aac68e4deeb28c8e76734a46fb7",
+ "url": "https://github.com/AdoptOpenJDK/openjdk8-binaries/releases/download/jdk8u275-b01/OpenJDK8U-jdk_arm_linux_hotspot_8u275b01.tar.gz",
+ "version": "8.0.275"
},
"packageType": "jdk",
"vmType": "hotspot",
"x86_64": {
- "build": "10",
- "sha256": "6f124b69d07d8d3edf39b9aa5c58473f63a380b686ddb73a5495e01d25c2939a",
- "url": "https://github.com/AdoptOpenJDK/openjdk8-binaries/releases/download/jdk8u272-b10/OpenJDK8U-jdk_x64_linux_hotspot_8u272b10.tar.gz",
- "version": "8.0.272"
+ "build": "8",
+ "sha256": "e6e6e0356649b9696fa5082cfcb0663d4bef159fc22d406e3a012e71fce83a5c",
+ "url": "https://github.com/AdoptOpenJDK/openjdk8-binaries/releases/download/jdk8u282-b08/OpenJDK8U-jdk_x64_linux_hotspot_8u282b08.tar.gz",
+ "version": "8.0.282"
}
},
"openj9": {
"aarch64": {
- "build": "10",
- "sha256": "bbc78dc8caf25372578a95287bcf672c4bf62af23939d4a988634b2a1356cd89",
- "url": "https://github.com/AdoptOpenJDK/openjdk8-binaries/releases/download/jdk8u272-b10_openj9-0.23.0/OpenJDK8U-jdk_aarch64_linux_openj9_8u272b10_openj9-0.23.0.tar.gz",
- "version": "8.0.272"
+ "build": "8",
+ "sha256": "e107d3b8092f71ee042284b0fc0f0430ef214916812ce02aa6d549aa81b6dc70",
+ "url": "https://github.com/AdoptOpenJDK/openjdk8-binaries/releases/download/jdk8u282-b08_openj9-0.24.0/OpenJDK8U-jdk_aarch64_linux_openj9_8u282b08_openj9-0.24.0.tar.gz",
+ "version": "8.0.282-ea"
},
"packageType": "jdk",
"vmType": "openj9",
"x86_64": {
- "build": "10",
- "sha256": "ca852f976e5b27ccd9b73a527a517496bda865b2ae2a85517ca74486fb8de7da",
- "url": "https://github.com/AdoptOpenJDK/openjdk8-binaries/releases/download/jdk8u272-b10_openj9-0.23.0/OpenJDK8U-jdk_x64_linux_openj9_8u272b10_openj9-0.23.0.tar.gz",
- "version": "8.0.272"
+ "build": "8",
+ "sha256": "ef10c776dccdff02da6222002a3c023c1cc47d50dd1f6f81314da3d1fe28d13e",
+ "url": "https://github.com/AdoptOpenJDK/openjdk8-binaries/releases/download/jdk8u282-b08_openj9-0.24.0/OpenJDK8U-jdk_x64_linux_openj9_8u282b08_openj9-0.24.0.tar.gz",
+ "version": "8.0.282"
}
}
},
"jre": {
"hotspot": {
"aarch64": {
- "build": "10",
- "sha256": "ed3a862d83dd1f19037fc6ccf73500f2ecf453eb245af8b70bec3fb80d084289",
- "url": "https://github.com/AdoptOpenJDK/openjdk8-binaries/releases/download/jdk8u272-b10/OpenJDK8U-jre_aarch64_linux_hotspot_8u272b10.tar.gz",
- "version": "8.0.272"
+ "build": "8",
+ "sha256": "5ffa116636b90bac486faba2882a2121aca1398a5426ef3e4ad0d913985e680d",
+ "url": "https://github.com/AdoptOpenJDK/openjdk8-binaries/releases/download/jdk8u282-b08/OpenJDK8U-jre_aarch64_linux_hotspot_jdk8u282-b08.tar.gz",
+ "version": "8.0.282"
},
"armv6l": {
- "build": "10",
- "sha256": "906113d909d81b930c4eb519512d1cc9f9be9789dfd349128d6e7efaeeb36e1c",
- "url": "https://github.com/AdoptOpenJDK/openjdk8-binaries/releases/download/jdk8u272-b10/OpenJDK8U-jre_arm_linux_hotspot_8u272b10.tar.gz",
- "version": "8.0.272"
+ "build": "1",
+ "sha256": "2e228d39d00ba8d974fd8ccdaaee0225833e79594251b64c724485c4fc94870f",
+ "url": "https://github.com/AdoptOpenJDK/openjdk8-binaries/releases/download/jdk8u275-b01/OpenJDK8U-jre_arm_linux_hotspot_8u275b01.tar.gz",
+ "version": "8.0.275"
},
"armv7l": {
- "build": "10",
- "sha256": "906113d909d81b930c4eb519512d1cc9f9be9789dfd349128d6e7efaeeb36e1c",
- "url": "https://github.com/AdoptOpenJDK/openjdk8-binaries/releases/download/jdk8u272-b10/OpenJDK8U-jre_arm_linux_hotspot_8u272b10.tar.gz",
- "version": "8.0.272"
+ "build": "1",
+ "sha256": "2e228d39d00ba8d974fd8ccdaaee0225833e79594251b64c724485c4fc94870f",
+ "url": "https://github.com/AdoptOpenJDK/openjdk8-binaries/releases/download/jdk8u275-b01/OpenJDK8U-jre_arm_linux_hotspot_8u275b01.tar.gz",
+ "version": "8.0.275"
},
"packageType": "jre",
"vmType": "hotspot",
"x86_64": {
- "build": "10",
- "sha256": "e6894601a559c5226c6dc337308df263444d356a6430f4aabb66e02607c82956",
- "url": "https://github.com/AdoptOpenJDK/openjdk8-binaries/releases/download/jdk8u272-b10/OpenJDK8U-jre_x64_linux_hotspot_8u272b10.tar.gz",
- "version": "8.0.272"
+ "build": "8",
+ "sha256": "3b2e2c6ad3ee04a58ffb8d629e3e242b0ae87b38cfd06425e4446b1f9490f521",
+ "url": "https://github.com/AdoptOpenJDK/openjdk8-binaries/releases/download/jdk8u282-b08/OpenJDK8U-jre_x64_linux_hotspot_8u282b08.tar.gz",
+ "version": "8.0.282"
}
},
"openj9": {
"aarch64": {
- "build": "10",
- "sha256": "b0891c3493a9fc6135700d065a826fc67223d54e9d0da3c41b57e6cb6897b726",
- "url": "https://github.com/AdoptOpenJDK/openjdk8-binaries/releases/download/jdk8u272-b10_openj9-0.23.0/OpenJDK8U-jre_aarch64_linux_openj9_8u272b10_openj9-0.23.0.tar.gz",
- "version": "8.0.272"
+ "build": "8",
+ "sha256": "1ffc7ac14546ee5e16e0efd616073baaf1b80f55abf61257095f132ded9da1e5",
+ "url": "https://github.com/AdoptOpenJDK/openjdk8-binaries/releases/download/jdk8u282-b08_openj9-0.24.0/OpenJDK8U-jre_aarch64_linux_openj9_8u282b08_openj9-0.24.0.tar.gz",
+ "version": "8.0.282-ea"
},
"packageType": "jre",
"vmType": "openj9",
"x86_64": {
- "build": "10",
- "sha256": "a4e58f3c15ca3bc15cb3aaa9f116de972809ca52ae81e0726f84c059442174d5",
- "url": "https://github.com/AdoptOpenJDK/openjdk8-binaries/releases/download/jdk8u272-b10_openj9-0.23.0/OpenJDK8U-jre_x64_linux_openj9_8u272b10_openj9-0.23.0.tar.gz",
- "version": "8.0.272"
+ "build": "8",
+ "sha256": "4fad259c32eb23ec98925c8b2cf28aaacbdb55e034db74c31a7636e75b6af08d",
+ "url": "https://github.com/AdoptOpenJDK/openjdk8-binaries/releases/download/jdk8u282-b08_openj9-0.24.0/OpenJDK8U-jre_x64_linux_openj9_8u282b08_openj9-0.24.0.tar.gz",
+ "version": "8.0.282"
}
}
}
@@ -632,20 +632,20 @@
"packageType": "jdk",
"vmType": "hotspot",
"x86_64": {
- "build": "10",
- "sha256": "091f9ee39b0bdbc8af8ec19f51aaa0f73e416c2e93a8fb2c79b82f4caac83ab6",
- "url": "https://github.com/AdoptOpenJDK/openjdk8-binaries/releases/download/jdk8u272-b10/OpenJDK8U-jdk_x64_mac_hotspot_8u272b10.tar.gz",
- "version": "8.0.272"
+ "build": "8",
+ "sha256": "1766d756f6e4a5d41b539f2ecf83e5a33e9336bd75f1602e8f4b4afbb8f47aaa",
+ "url": "https://github.com/AdoptOpenJDK/openjdk8-binaries/releases/download/jdk8u282-b08/OpenJDK8U-jdk_x64_mac_hotspot_8u282b08.tar.gz",
+ "version": "8.0.282"
}
},
"openj9": {
"packageType": "jdk",
"vmType": "openj9",
"x86_64": {
- "build": "10",
- "sha256": "bbd66ec27a4ea9b0b0952f501e1837e69c24262f64b316dab0408d1a8633a527",
- "url": "https://github.com/AdoptOpenJDK/openjdk8-binaries/releases/download/jdk8u272-b10.1_openj9-0.23.0/OpenJDK8U-jdk_x64_mac_openj9_8u272b10_openj9-0.23.0.tar.gz",
- "version": "8.0.272"
+ "build": "8",
+ "sha256": "265d4fb01b61ed7a3a9fae6a50bcf6322687b5f08de8598d8e42263cbd8b5772",
+ "url": "https://github.com/AdoptOpenJDK/openjdk8-binaries/releases/download/jdk8u282-b08_openj9-0.24.0/OpenJDK8U-jdk_x64_mac_openj9_8u282b08_openj9-0.24.0.tar.gz",
+ "version": "8.0.282"
}
}
},
@@ -654,20 +654,20 @@
"packageType": "jre",
"vmType": "hotspot",
"x86_64": {
- "build": "10",
- "sha256": "afb9c08cb8b93d8e7d4f1e48ced3d43cfb3082491595a2eaf1f00c48abd25428",
- "url": "https://github.com/AdoptOpenJDK/openjdk8-binaries/releases/download/jdk8u272-b10/OpenJDK8U-jre_x64_mac_hotspot_8u272b10.tar.gz",
- "version": "8.0.272"
+ "build": "8",
+ "sha256": "9e7a40d570d5151aae23a2fb017359248f5fb82c547c3ecd860c992770228afb",
+ "url": "https://github.com/AdoptOpenJDK/openjdk8-binaries/releases/download/jdk8u282-b08/OpenJDK8U-jre_x64_mac_hotspot_8u282b08.tar.gz",
+ "version": "8.0.282"
}
},
"openj9": {
"packageType": "jre",
"vmType": "openj9",
"x86_64": {
- "build": "10",
- "sha256": "4d90e85240113189d897a86731e672b37a6e345c056f35c7719cb27f3d08385b",
- "url": "https://github.com/AdoptOpenJDK/openjdk8-binaries/releases/download/jdk8u272-b10.1_openj9-0.23.0/OpenJDK8U-jre_x64_mac_openj9_8u272b10_openj9-0.23.0.tar.gz",
- "version": "8.0.272"
+ "build": "8",
+ "sha256": "884aa20b3aaed504b18ee21575c8da20838f80fb96036e78e70ff6ef613a5283",
+ "url": "https://github.com/AdoptOpenJDK/openjdk8-binaries/releases/download/jdk8u282-b08_openj9-0.24.0/OpenJDK8U-jre_x64_mac_openj9_8u282b08_openj9-0.24.0.tar.gz",
+ "version": "8.0.282"
}
}
}
diff --git a/third_party/nixpkgs/pkgs/development/compilers/clean/default.nix b/third_party/nixpkgs/pkgs/development/compilers/clean/default.nix
index f8121958e2..e360bb05f4 100644
--- a/third_party/nixpkgs/pkgs/development/compilers/clean/default.nix
+++ b/third_party/nixpkgs/pkgs/development/compilers/clean/default.nix
@@ -1,7 +1,8 @@
{ lib, stdenv, fetchurl }:
stdenv.mkDerivation {
- name = "clean-3.0";
+ pname = "clean";
+ version = "3.0";
src =
if stdenv.hostPlatform.system == "i686-linux" then (fetchurl {
@@ -45,8 +46,8 @@ stdenv.mkDerivation {
'';
homepage = "http://wiki.clean.cs.ru.nl/Clean";
- license = lib.licenses.lgpl21;
- maintainers = [ lib.maintainers.kkallio ];
+ license = lib.licenses.bsd2;
+ maintainers = [ lib.maintainers.erin ];
platforms = [ "i686-linux" "x86_64-linux" ];
};
}
diff --git a/third_party/nixpkgs/pkgs/development/compilers/crystal/default.nix b/third_party/nixpkgs/pkgs/development/compilers/crystal/default.nix
index b3be2bb220..f101f59674 100644
--- a/third_party/nixpkgs/pkgs/development/compilers/crystal/default.nix
+++ b/third_party/nixpkgs/pkgs/development/compilers/crystal/default.nix
@@ -214,6 +214,8 @@ let
license = licenses.asl20;
maintainers = with maintainers; [ david50407 fabianhjr manveru peterhoeg ];
platforms = builtins.attrNames archs;
+ # Error running at_exit handler: Nil assertion failed
+ broken = lib.versions.minor version == "32" && stdenv.isDarwin;
};
})
);
diff --git a/third_party/nixpkgs/pkgs/development/compilers/dmd/default.nix b/third_party/nixpkgs/pkgs/development/compilers/dmd/default.nix
index 074646f5f4..51f30dbabd 100644
--- a/third_party/nixpkgs/pkgs/development/compilers/dmd/default.nix
+++ b/third_party/nixpkgs/pkgs/development/compilers/dmd/default.nix
@@ -4,10 +4,10 @@
, targetPackages, fetchpatch, bash
, dmdBootstrap ? callPackage ./bootstrap.nix { }
, HOST_DMD ? "${dmdBootstrap}/bin/dmd"
-, version ? "2.091.1"
-, dmdSha256 ? "0brz0n84jdkhr4sq4k91w48p739psbhbb1jk2pi9q60psmx353yr"
-, druntimeSha256 ? "0smgpmfriffh110ksski1s5j921kmxbc2zjy0dyj9ksyrxbzklbl"
-, phobosSha256 ? "1n00anajgibrfs1xzvrmag28hvbvkc0w1fwlimqbznvhf28rhrxs"
+, version ? "2.095.1"
+, dmdSha256 ? "sha256:0faca1y42a1h16aml4lb7z118mh9k9fjx3xlw3ki5f1h3ln91xhk"
+, druntimeSha256 ? "sha256:0ad4pa5llr9m9wqbvfv4yrcra4zz9qxlh5kx43mrv48f9bcxm2ha"
+, phobosSha256 ? "sha256:04w6jw4izix2vbw62j13wvz6q3pi7vivxnmxqj0g8904j5g0cxjl"
}:
let
@@ -53,18 +53,6 @@ stdenv.mkDerivation rec {
})
];
- patchFlags = [ "--directory=dmd" "-p1" "-F3" ];
- patches = [
- (fetchpatch {
- url = "https://github.com/dlang/dmd/commit/4157298cf04f7aae9f701432afd1de7b7e05c30f.patch";
- sha256 = "0v4xgqmrx5r8vbx5a4v88s0xnm23mam9nm99yfga7s2sxr0hi5p2";
- })
- (fetchpatch {
- url = "https://github.com/dlang/dmd/commit/1b8a4c90b040bf2f0b68a2739de4991315580b13.patch";
- sha256 = "1iih6aalv4fsw9mbrlrybhngkkchzzrzg7q8zl047w36c0x397cs";
- })
- ];
-
sourceRoot = ".";
# https://issues.dlang.org/show_bug.cgi?id=19553
@@ -76,6 +64,16 @@ stdenv.mkDerivation rec {
postPatch = ''
substituteInPlace dmd/test/dshell/test6952.d --replace "/usr/bin/env bash" "${bash}/bin/bash"
+
+ rm dmd/test/runnable/gdb1.d
+ rm dmd/test/runnable/gdb10311.d
+ rm dmd/test/runnable/gdb14225.d
+ rm dmd/test/runnable/gdb14276.d
+ rm dmd/test/runnable/gdb14313.d
+ rm dmd/test/runnable/gdb14330.d
+ rm dmd/test/runnable/gdb15729.sh
+ rm dmd/test/runnable/gdb4149.d
+ rm dmd/test/runnable/gdb4181.d
''
+ lib.optionalString stdenv.hostPlatform.isLinux ''
substituteInPlace phobos/std/socket.d --replace "assert(ih.addrList[0] == 0x7F_00_00_01);" ""
@@ -171,5 +169,7 @@ stdenv.mkDerivation rec {
license = licenses.boost;
maintainers = with maintainers; [ ThomasMader lionello ];
platforms = [ "x86_64-linux" "i686-linux" "x86_64-darwin" ];
+ # many tests are failing
+ broken = true;
};
}
diff --git a/third_party/nixpkgs/pkgs/development/compilers/factor-lang/default.nix b/third_party/nixpkgs/pkgs/development/compilers/factor-lang/default.nix
index 2c9999ccdb..4ce55b5ca2 100644
--- a/third_party/nixpkgs/pkgs/development/compilers/factor-lang/default.nix
+++ b/third_party/nixpkgs/pkgs/development/compilers/factor-lang/default.nix
@@ -19,10 +19,10 @@ stdenv.mkDerivation rec {
./fuel-dir.patch
];
- nativeBuildInputs = [ makeWrapper ];
+ nativeBuildInputs = [ makeWrapper unzip ];
buildInputs = with xorg; [ git rlwrap curl pkg-config perl
libX11 pango cairo gtk2 gdk-pixbuf gtkglext
- mesa libXmu libXt libICE libSM openssl unzip ];
+ mesa libXmu libXt libICE libSM openssl ];
buildPhase = ''
sed -ie '4i GIT_LABEL = heads/master-${rev}' GNUmakefile
diff --git a/third_party/nixpkgs/pkgs/development/compilers/gnu-smalltalk/default.nix b/third_party/nixpkgs/pkgs/development/compilers/gnu-smalltalk/default.nix
index cd33baad99..e608a25462 100644
--- a/third_party/nixpkgs/pkgs/development/compilers/gnu-smalltalk/default.nix
+++ b/third_party/nixpkgs/pkgs/development/compilers/gnu-smalltalk/default.nix
@@ -1,6 +1,6 @@
{ config, lib, stdenv, fetchurl, pkg-config, libtool
, zip, libffi, libsigsegv, readline, gmp
-, gnutls, gnome2, cairo, SDL, sqlite
+, gnutls, gtk2, cairo, SDL, sqlite
, emacsSupport ? config.emacsSupport or false, emacs ? null }:
assert emacsSupport -> (emacs != null);
@@ -29,7 +29,7 @@ in stdenv.mkDerivation rec {
# http://smalltalk.gnu.org/download
nativeBuildInputs = [ pkg-config ];
buildInputs = [
- libtool zip libffi libsigsegv-shared readline gmp gnutls gnome2.gtk
+ libtool zip libffi libsigsegv-shared readline gmp gnutls gtk2
cairo SDL sqlite
]
++ lib.optional emacsSupport emacs;
diff --git a/third_party/nixpkgs/pkgs/development/compilers/go/binary.nix b/third_party/nixpkgs/pkgs/development/compilers/go/binary.nix
index 9a0dc34354..7eb8f8f7b9 100644
--- a/third_party/nixpkgs/pkgs/development/compilers/go/binary.nix
+++ b/third_party/nixpkgs/pkgs/development/compilers/go/binary.nix
@@ -8,8 +8,8 @@ let
"i686" = "386";
"x86_64" = "amd64";
"aarch64" = "arm64";
- "armv6l" = "arm";
- "armv7l" = "arm";
+ "armv6l" = "armv6l";
+ "armv7l" = "armv6l";
"powerpc64le" = "ppc64le";
}.${platform.parsed.cpu.name} or (throw "Unsupported CPU ${platform.parsed.cpu.name}");
diff --git a/third_party/nixpkgs/pkgs/development/compilers/graalvm/default.nix b/third_party/nixpkgs/pkgs/development/compilers/graalvm/default.nix
index fc30e37e4b..b54f57e9b6 100644
--- a/third_party/nixpkgs/pkgs/development/compilers/graalvm/default.nix
+++ b/third_party/nixpkgs/pkgs/development/compilers/graalvm/default.nix
@@ -89,7 +89,7 @@ let
makeMxCache = list:
stdenv.mkDerivation {
name = "mx-cache";
- buildInputs = [ unzip ];
+ nativeBuildInputs = [ unzip ];
buildCommand = with lib; ''
mkdir $out
${lib.concatMapStrings
diff --git a/third_party/nixpkgs/pkgs/development/compilers/gwt/2.4.0.nix b/third_party/nixpkgs/pkgs/development/compilers/gwt/2.4.0.nix
index e10d101203..011a7979df 100644
--- a/third_party/nixpkgs/pkgs/development/compilers/gwt/2.4.0.nix
+++ b/third_party/nixpkgs/pkgs/development/compilers/gwt/2.4.0.nix
@@ -8,7 +8,7 @@ stdenv.mkDerivation {
sha256 = "1gvyg00vx7fdqgfl2w7nhql78clg3abs6fxxy7m03pprdm5qmm17";
};
- buildInputs = [ unzip ];
+ nativeBuildInputs = [ unzip ];
installPhase = ''
mkdir -p $out
diff --git a/third_party/nixpkgs/pkgs/development/compilers/kotlin/default.nix b/third_party/nixpkgs/pkgs/development/compilers/kotlin/default.nix
index 2ddc5b3d3a..9154b7d76a 100644
--- a/third_party/nixpkgs/pkgs/development/compilers/kotlin/default.nix
+++ b/third_party/nixpkgs/pkgs/development/compilers/kotlin/default.nix
@@ -12,8 +12,7 @@ in stdenv.mkDerivation {
};
propagatedBuildInputs = [ jre ] ;
- buildInputs = [ unzip ] ;
- nativeBuildInputs = [ makeWrapper ];
+ nativeBuildInputs = [ makeWrapper unzip ];
installPhase = ''
mkdir -p $out
diff --git a/third_party/nixpkgs/pkgs/development/compilers/ldc/default.nix b/third_party/nixpkgs/pkgs/development/compilers/ldc/default.nix
index e0a689c7fa..a199747546 100644
--- a/third_party/nixpkgs/pkgs/development/compilers/ldc/default.nix
+++ b/third_party/nixpkgs/pkgs/development/compilers/ldc/default.nix
@@ -1,4 +1,4 @@
import ./generic.nix {
- version = "1.24.0";
- ldcSha256 = "0g5svf55i0kq55q49awmwqj9qi1n907cyrn1vjdjgs8nx6nn35gx";
+ version = "1.25.1";
+ ldcSha256 = "sha256-DjcW/pknvpEmTR/eXEEHECb2xEJic16evaU4CJthLUA=";
}
diff --git a/third_party/nixpkgs/pkgs/development/compilers/ocaml/generic.nix b/third_party/nixpkgs/pkgs/development/compilers/ocaml/generic.nix
index d4a6b6250b..d9853dd642 100644
--- a/third_party/nixpkgs/pkgs/development/compilers/ocaml/generic.nix
+++ b/third_party/nixpkgs/pkgs/development/compilers/ocaml/generic.nix
@@ -66,6 +66,10 @@ stdenv.mkDerivation (args // {
preConfigure = optionalString (!lib.versionAtLeast version "4.04") ''
CAT=$(type -tp cat)
sed -e "s@/bin/cat@$CAT@" -i config/auto-aux/sharpbang
+ '' + optionalString (stdenv.isDarwin && stdenv.isAarch64) ''
+ # Do what upstream does by default now: https://github.com/ocaml/ocaml/pull/10176
+ # This is required for aarch64-darwin, everything else works as is.
+ AS="${stdenv.cc}/bin/cc -c" ASPP="${stdenv.cc}/bin/cc -c"
'';
postBuild = ''
mkdir -p $out/include
diff --git a/third_party/nixpkgs/pkgs/development/compilers/openjdk/11.nix b/third_party/nixpkgs/pkgs/development/compilers/openjdk/11.nix
index a24dca373f..f9dd720565 100644
--- a/third_party/nixpkgs/pkgs/development/compilers/openjdk/11.nix
+++ b/third_party/nixpkgs/pkgs/development/compilers/openjdk/11.nix
@@ -25,9 +25,9 @@ let
sha256 = "06pm3hpz4ggiqwvkgzxr39y9kga7vk4flakfznz5979bvgb926vw";
};
- nativeBuildInputs = [ pkg-config autoconf ];
+ nativeBuildInputs = [ pkg-config autoconf unzip ];
buildInputs = [
- cpio file which unzip zip perl zlib cups freetype alsaLib libjpeg giflib
+ cpio file which zip perl zlib cups freetype alsaLib libjpeg giflib
libpng zlib lcms2 libX11 libICE libXrender libXext libXtst libXt libXtst
libXi libXinerama libXcursor libXrandr fontconfig openjdk11-bootstrap
] ++ lib.optionals (!headless && enableGnome2) [
diff --git a/third_party/nixpkgs/pkgs/development/compilers/openjdk/12.nix b/third_party/nixpkgs/pkgs/development/compilers/openjdk/12.nix
index f1c6d8493e..8c12b5be7f 100644
--- a/third_party/nixpkgs/pkgs/development/compilers/openjdk/12.nix
+++ b/third_party/nixpkgs/pkgs/development/compilers/openjdk/12.nix
@@ -22,9 +22,9 @@ let
sha256 = "1ndlxmikyy298z7lqpr1bd0zxq7yx6xidj8y3c8mw9m9fy64h9c7";
};
- nativeBuildInputs = [ pkg-config autoconf ];
+ nativeBuildInputs = [ pkg-config autoconf unzip ];
buildInputs = [
- cpio file which unzip zip perl zlib cups freetype alsaLib libjpeg giflib
+ cpio file which zip perl zlib cups freetype alsaLib libjpeg giflib
libpng zlib lcms2 libX11 libICE libXrender libXext libXtst libXt libXtst
libXi libXinerama libXcursor libXrandr fontconfig openjdk11
] ++ lib.optionals (!headless && enableGnome2) [
diff --git a/third_party/nixpkgs/pkgs/development/compilers/openjdk/13.nix b/third_party/nixpkgs/pkgs/development/compilers/openjdk/13.nix
index 05e367e631..7e4d9fc7d6 100644
--- a/third_party/nixpkgs/pkgs/development/compilers/openjdk/13.nix
+++ b/third_party/nixpkgs/pkgs/development/compilers/openjdk/13.nix
@@ -22,9 +22,9 @@ let
sha256 = "1871ziss7ny19rw8f7bay5vznmhpqbfi4ihn3yygs06wyxhm0zmv";
};
- nativeBuildInputs = [ pkg-config autoconf ];
+ nativeBuildInputs = [ pkg-config autoconf unzip ];
buildInputs = [
- cpio file which unzip zip perl zlib cups freetype alsaLib libjpeg giflib
+ cpio file which zip perl zlib cups freetype alsaLib libjpeg giflib
libpng zlib lcms2 libX11 libICE libXrender libXext libXtst libXt libXtst
libXi libXinerama libXcursor libXrandr fontconfig openjdk13-bootstrap
] ++ lib.optionals (!headless && enableGnome2) [
diff --git a/third_party/nixpkgs/pkgs/development/compilers/openjdk/14.nix b/third_party/nixpkgs/pkgs/development/compilers/openjdk/14.nix
index bda6444a8f..d98d0e9f8e 100644
--- a/third_party/nixpkgs/pkgs/development/compilers/openjdk/14.nix
+++ b/third_party/nixpkgs/pkgs/development/compilers/openjdk/14.nix
@@ -22,9 +22,9 @@ let
sha256 = "1s1pc6ihzf0awp4hbaqfxmbica0hnrg8nr7s0yd2hfn7nan8xmf3";
};
- nativeBuildInputs = [ pkg-config autoconf ];
+ nativeBuildInputs = [ pkg-config autoconf unzip ];
buildInputs = [
- cpio file which unzip zip perl zlib cups freetype alsaLib libjpeg giflib
+ cpio file which zip perl zlib cups freetype alsaLib libjpeg giflib
libpng zlib lcms2 libX11 libICE libXrender libXext libXtst libXt libXtst
libXi libXinerama libXcursor libXrandr fontconfig openjdk14-bootstrap
] ++ lib.optionals (!headless && enableGnome2) [
diff --git a/third_party/nixpkgs/pkgs/development/compilers/openjdk/8.nix b/third_party/nixpkgs/pkgs/development/compilers/openjdk/8.nix
index 96a01b0cd9..75dc722b1b 100644
--- a/third_party/nixpkgs/pkgs/development/compilers/openjdk/8.nix
+++ b/third_party/nixpkgs/pkgs/development/compilers/openjdk/8.nix
@@ -83,9 +83,9 @@ let
outputs = [ "out" "jre" ];
- nativeBuildInputs = [ pkg-config lndir ];
+ nativeBuildInputs = [ pkg-config lndir unzip ];
buildInputs = [
- cpio file which unzip zip perl openjdk8-bootstrap zlib cups freetype alsaLib
+ cpio file which zip perl openjdk8-bootstrap zlib cups freetype alsaLib
libjpeg giflib libX11 libICE libXext libXrender libXtst libXt libXtst
libXi libXinerama libXcursor libXrandr fontconfig
] ++ lib.optionals (!headless && enableGnome2) [
diff --git a/third_party/nixpkgs/pkgs/development/compilers/openjdk/darwin/11.nix b/third_party/nixpkgs/pkgs/development/compilers/openjdk/darwin/11.nix
index 069380802a..6bcd79b274 100644
--- a/third_party/nixpkgs/pkgs/development/compilers/openjdk/darwin/11.nix
+++ b/third_party/nixpkgs/pkgs/development/compilers/openjdk/darwin/11.nix
@@ -15,7 +15,8 @@ let
curlOpts = "-H Referer:https://www.azul.com/downloads/zulu/zulu-mac/";
};
- buildInputs = [ unzip freetype ];
+ nativeBuildInputs = [ unzip ];
+ buildInputs = [ freetype ];
installPhase = ''
mkdir -p $out
diff --git a/third_party/nixpkgs/pkgs/development/compilers/openjdk/darwin/8.nix b/third_party/nixpkgs/pkgs/development/compilers/openjdk/darwin/8.nix
index 4df180c1f5..a5cd15817e 100644
--- a/third_party/nixpkgs/pkgs/development/compilers/openjdk/darwin/8.nix
+++ b/third_party/nixpkgs/pkgs/development/compilers/openjdk/darwin/8.nix
@@ -18,7 +18,8 @@ let
curlOpts = "-H Referer:https://www.azul.com/downloads/zulu/zulu-linux/";
};
- buildInputs = [ unzip freetype ];
+ nativeBuildInputs = [ unzip ];
+ buildInputs = [ freetype ];
installPhase = ''
mkdir -p $out
diff --git a/third_party/nixpkgs/pkgs/development/compilers/openjdk/darwin/default.nix b/third_party/nixpkgs/pkgs/development/compilers/openjdk/darwin/default.nix
index 8885db4115..361bfdeb3c 100644
--- a/third_party/nixpkgs/pkgs/development/compilers/openjdk/darwin/default.nix
+++ b/third_party/nixpkgs/pkgs/development/compilers/openjdk/darwin/default.nix
@@ -15,7 +15,8 @@ let
curlOpts = "-H Referer:https://www.azul.com/downloads/zulu/";
};
- buildInputs = [ unzip freetype ];
+ nativeBuildInputs = [ unzip ];
+ buildInputs = [ freetype ];
installPhase = ''
mkdir -p $out
diff --git a/third_party/nixpkgs/pkgs/development/compilers/openjdk/default.nix b/third_party/nixpkgs/pkgs/development/compilers/openjdk/default.nix
index ddd523ad78..5606059c62 100644
--- a/third_party/nixpkgs/pkgs/development/compilers/openjdk/default.nix
+++ b/third_party/nixpkgs/pkgs/development/compilers/openjdk/default.nix
@@ -22,9 +22,9 @@ let
sha256 = "1h8n5figc9q0k9p8b0qggyhvqagvxanfih1lj5j492c74cd1mx1l";
};
- nativeBuildInputs = [ pkg-config autoconf ];
+ nativeBuildInputs = [ pkg-config autoconf unzip ];
buildInputs = [
- cpio file which unzip zip perl zlib cups freetype alsaLib libjpeg giflib
+ cpio file which zip perl zlib cups freetype alsaLib libjpeg giflib
libpng zlib lcms2 libX11 libICE libXrender libXext libXtst libXt libXtst
libXi libXinerama libXcursor libXrandr fontconfig openjdk15-bootstrap
] ++ lib.optionals (!headless && enableGnome2) [
diff --git a/third_party/nixpkgs/pkgs/development/compilers/rust/1_49.nix b/third_party/nixpkgs/pkgs/development/compilers/rust/1_50.nix
similarity index 59%
rename from third_party/nixpkgs/pkgs/development/compilers/rust/1_49.nix
rename to third_party/nixpkgs/pkgs/development/compilers/rust/1_50.nix
index 3e76cdfe96..06449d59da 100644
--- a/third_party/nixpkgs/pkgs/development/compilers/rust/1_49.nix
+++ b/third_party/nixpkgs/pkgs/development/compilers/rust/1_50.nix
@@ -19,8 +19,8 @@
} @ args:
import ./default.nix {
- rustcVersion = "1.49.0";
- rustcSha256 = "0yf7kll517398dgqsr7m3gldzj0iwsp3ggzxrayckpqzvylfy2mm";
+ rustcVersion = "1.50.0";
+ rustcSha256 = "0pjs7j62maiyvkmhp9zrxl528g2n0fphp4rq6ap7aqdv0a6qz5wm";
llvmSharedForBuild = pkgsBuildBuild.llvm_11.override { enableSharedLibraries = true; };
llvmSharedForHost = pkgsBuildHost.llvm_11.override { enableSharedLibraries = true; };
@@ -33,22 +33,22 @@ import ./default.nix {
# Note: the version MUST be one version prior to the version we're
# building
- bootstrapVersion = "1.48.0";
+ bootstrapVersion = "1.49.0";
# fetch hashes by running `print-hashes.sh ${bootstrapVersion}`
bootstrapHashes = {
- i686-unknown-linux-gnu = "7fdb8836a1f0427d5b47e6a2d496f67ebff04350407411f57cf20c9b3544e26f";
- x86_64-unknown-linux-gnu = "950420a35b2dd9091f1b93a9ccd5abc026ca7112e667f246b1deb79204e2038b";
- x86_64-unknown-linux-musl = "4ed9627f57b4e0b9807fc5e7513d9731f4791668b7f875b9e44e65e21072c56f";
- arm-unknown-linux-gnueabihf = "e68a81eebd4570343a0fc35cb8ee24cad911d6cee2e374f284b76546ca6636d5";
- armv7-unknown-linux-gnueabihf = "3aed4a63ebdd57690a31d11afbe95e6407edc224a6769be5694a1ed43bf899cb";
- aarch64-unknown-linux-gnu = "c4769418d8d89f432e4a3a21ad60f99629e4b13bbfc29aef7d9d51c4e8ee8a8a";
- aarch64-unknown-linux-musl = "ac4de580a28e45a9773b389b296d13bfeeb08263cb1f8343859577a54940dae9";
- x86_64-apple-darwin = "20e727cad10f43e3abcedb2a80979ae26923038e0e8a855e8a783da255054113";
- powerpc64le-unknown-linux-gnu = "e6457a0214f3b1b04bd5b2618bba7e3826e254216420dede2971b571a1c13bb1";
+ i686-unknown-linux-gnu = "5371bfa2c8e566aa283acdfa93d24b981c789d7c040ac1ca74e76bff1c7f6598";
+ x86_64-unknown-linux-gnu = "8b14446df82f3707d69cf58fed92f18e0bff91621c62baf89288ef70e3e92981";
+ x86_64-unknown-linux-musl = "f92a5a4adcfac4206a223d089a364a8375d1b6f112f3f2efa3f6d53d08a61904";
+ arm-unknown-linux-gnueabihf = "e5d93576eef874a9b22be9aa157cac5c8cdebebde8b57f0693248d4a589df42c";
+ armv7-unknown-linux-gnueabihf = "34ba3c979b144ef27d3c71d177cc1774551edf26e79d36719c86a51d9b9e34c0";
+ aarch64-unknown-linux-gnu = "b551bd482041307fa3373a687d6d6a2c4c0931c2e0a68b8b75dc80bc5cf5f002";
+ aarch64-unknown-linux-musl = "0a43d96a508c720520328112d609916d062f866a5c35f1db8f906284035d6d98";
+ x86_64-apple-darwin = "fe3e248bc4b0ee0a2595693687ad845c8a8bda824a56c9321520bcca02433716";
+ powerpc64le-unknown-linux-gnu = "365d7721dd2521e5dad12aa73651bad2be375e798e443636d2c523cad5b54359";
};
- selectRustPackage = pkgs: pkgs.rust_1_49;
+ selectRustPackage = pkgs: pkgs.rust_1_50;
rustcPatches = [
];
diff --git a/third_party/nixpkgs/pkgs/development/compilers/swi-prolog/default.nix b/third_party/nixpkgs/pkgs/development/compilers/swi-prolog/default.nix
index ce666852e3..addf641380 100644
--- a/third_party/nixpkgs/pkgs/development/compilers/swi-prolog/default.nix
+++ b/third_party/nixpkgs/pkgs/development/compilers/swi-prolog/default.nix
@@ -4,7 +4,32 @@
, cmake, libyaml, Security
, libjpeg, libX11, libXext, libXft, libXinerama
, extraLibraries ? [ jdk unixODBC libXpm libSM libXt freetype fontconfig ]
-, extraPacks ? []
+# Packs must be installed from a local directory during the build, with dependencies
+# resolved manually, e.g. to install the 'julian' pack, which depends on the 'delay', 'list_util' and 'typedef' packs:
+# julian = pkgs.fetchzip {
+# name = "swipl-pack-julian";
+# url = "https://github.com/mndrix/julian/archive/v0.1.3.zip";
+# sha256 = "1sgql7c21p3c5m14kwa0bcmlwn9fql612krn9h36gla1j9yjdfgy";
+# };
+# delay = pkgs.fetchzip {
+# name = "swipl-pack-delay";
+# url = "https://github.com/mndrix/delay/archive/v0.3.3.zip";
+# sha256 = "0ira87afxnc2dnbbmgwmrr8qvary8lhzvhqwd52dccm6yqd3nybg";
+# };
+# list_util = pkgs.fetchzip {
+# name = "swipl-pack-list_util";
+# url = "https://github.com/mndrix/list_util/archive/v0.13.0.zip";
+# sha256 = "0lx7vffflak0y8l8vg8k0g8qddwwn23ksbz02hi3f8rbarh1n89q";
+# };
+# typedef = builtins.fetchTarball {
+# name = "swipl-pack-typedef";
+# url = "https://raw.githubusercontent.com/samer--/prolog/master/typedef/release/typedef-0.1.9.tgz";
+# sha256 = "056nqjn01g18fb1b2qivv9s7hb4azk24nx2d4kvkbmm1k91f44p3";
+# };
+# swiProlog = pkgs.swiProlog.override { extraPacks = map (dep-path: "'file://${dep-path}'") [
+# julian delay list_util typedef
+# ]; };
+, extraPacks ? []
, withGui ? false
}:
@@ -26,6 +51,11 @@ stdenv.mkDerivation {
fetchSubmodules = true;
};
+ # Add the packInstall path to the swipl pack search path
+ postPatch = ''
+ echo "user:file_search_path(pack, '$out/lib/swipl/pack')." >> /build/$sourceRoot/boot/init.pl
+ '';
+
nativeBuildInputs = [ cmake pkg-config ];
buildInputs = [ gmp readline openssl
@@ -39,6 +69,10 @@ stdenv.mkDerivation {
cmakeFlags = [ "-DSWIPL_INSTALL_IN_LIB=ON" ];
+ preInstall = ''
+ mkdir -p $out/lib/swipl/pack
+ '';
+
postInstall = builtins.concatStringsSep "\n"
( builtins.map (packInstall "$out") extraPacks
);
diff --git a/third_party/nixpkgs/pkgs/development/compilers/xa/dxa.nix b/third_party/nixpkgs/pkgs/development/compilers/xa/dxa.nix
index e0ff060de8..03f2d054cc 100644
--- a/third_party/nixpkgs/pkgs/development/compilers/xa/dxa.nix
+++ b/third_party/nixpkgs/pkgs/development/compilers/xa/dxa.nix
@@ -18,9 +18,8 @@ stdenv.mkDerivation rec {
dontConfigure = true;
postPatch = ''
- substituteInPlace \
- --replace "CC = gcc" "CC = cc' \
- Makefile
+ substituteInPlace Makefile \
+ --replace "CC = gcc" "CC = ${stdenv.cc.targetPrefix}cc"
'';
installPhase = ''
diff --git a/third_party/nixpkgs/pkgs/development/compilers/xa/xa.nix b/third_party/nixpkgs/pkgs/development/compilers/xa/xa.nix
index 163b0bba51..c445940f5c 100644
--- a/third_party/nixpkgs/pkgs/development/compilers/xa/xa.nix
+++ b/third_party/nixpkgs/pkgs/development/compilers/xa/xa.nix
@@ -15,13 +15,12 @@ stdenv.mkDerivation rec {
dontConfigure = true;
postPatch = ''
- substitueInPlace \
+ substituteInPlace Makefile \
--replace "DESTDIR" "PREFIX" \
- --replace "CC = gcc" "CC = cc" \
- --replace "LDD = gcc" "LDD = ld" \
+ --replace "CC = gcc" "CC = ${stdenv.cc.targetPrefix}cc" \
+ --replace "LDD = gcc" "LDD = ${stdenv.cc.targetPrefix}cc" \
--replace "CFLAGS = -O2" "CFLAGS ?=" \
- --replace "LDFLAGS = -lc" "LDFLAGS ?= -lc" \
- Makefile
+ --replace "LDFLAGS = -lc" "LDFLAGS ?= -lc"
'';
makeFlags = [ "PREFIX=${placeholder "out"}" ];
diff --git a/third_party/nixpkgs/pkgs/development/coq-modules/coq-elpi/default.nix b/third_party/nixpkgs/pkgs/development/coq-modules/coq-elpi/default.nix
index b57671d863..2a6bfc7ad3 100644
--- a/third_party/nixpkgs/pkgs/development/coq-modules/coq-elpi/default.nix
+++ b/third_party/nixpkgs/pkgs/development/coq-modules/coq-elpi/default.nix
@@ -12,10 +12,11 @@ in mkCoqDerivation {
owner = "LPCIC";
inherit version;
defaultVersion = lib.switch coq.coq-version [
- { case = "8.13"; out = "1.9.3"; }
+ { case = "8.13"; out = "1.9.4"; }
{ case = "8.12"; out = "1.8.0"; }
{ case = "8.11"; out = "1.6.0_8.11"; }
] null;
+ release."1.9.4".sha256 = "0nii7238mya74f9g6147qmpg6gv6ic9b54x5v85nb6q60d9jh0jq";
release."1.9.3".sha256 = "198irm800fx3n8n56vx1c6f626cizp1d7jfkrc6ba4iqhb62ma0z";
release."1.9.2".sha256 = "1rr2fr8vjkc0is7vh1461aidz2iwkigdkp6bqss4hhv0c3ijnn07";
release."1.8.1".sha256 = "1fbbdccdmr8g4wwpihzp4r2xacynjznf817lhijw6kqfav75zd0r";
diff --git a/third_party/nixpkgs/pkgs/development/haskell-modules/with-packages-wrapper.nix b/third_party/nixpkgs/pkgs/development/haskell-modules/with-packages-wrapper.nix
index 32fa46fd04..0e566aa2e6 100644
--- a/third_party/nixpkgs/pkgs/development/haskell-modules/with-packages-wrapper.nix
+++ b/third_party/nixpkgs/pkgs/development/haskell-modules/with-packages-wrapper.nix
@@ -57,9 +57,8 @@ symlinkJoin {
# as a dedicated drv attribute, like `compiler-name`
name = ghc.name + "-with-packages";
paths = paths ++ [ghc];
+ nativeBuildInputs = [ makeWrapper ];
postBuild = ''
- . ${makeWrapper}/nix-support/setup-hook
-
# wrap compiler executables with correct env variables
for prg in ${ghcCommand} ${ghcCommand}i ${ghcCommand}-${ghc.version} ${ghcCommand}i-${ghc.version}; do
diff --git a/third_party/nixpkgs/pkgs/development/interpreters/angelscript/2.22.nix b/third_party/nixpkgs/pkgs/development/interpreters/angelscript/2.22.nix
index 922d964e8a..4c35f065cb 100644
--- a/third_party/nixpkgs/pkgs/development/interpreters/angelscript/2.22.nix
+++ b/third_party/nixpkgs/pkgs/development/interpreters/angelscript/2.22.nix
@@ -8,13 +8,11 @@ let
url="http://www.angelcode.com/angelscript/sdk/files/angelscript_${version}.zip";
sha256 = "1pp853lbnz383ilp9wbgc3wv1dn7lpx3idz8dmzda94rckl7sd43";
};
- buildInputs = [
- unzip
- ];
in
stdenv.mkDerivation {
inherit (s) name version;
- inherit buildInputs;
+ nativeBuildInputs = [ unzip ];
+
src = fetchurl {
inherit (s) url sha256;
};
diff --git a/third_party/nixpkgs/pkgs/development/interpreters/angelscript/default.nix b/third_party/nixpkgs/pkgs/development/interpreters/angelscript/default.nix
index fb8c6b2844..3fbd64467f 100644
--- a/third_party/nixpkgs/pkgs/development/interpreters/angelscript/default.nix
+++ b/third_party/nixpkgs/pkgs/development/interpreters/angelscript/default.nix
@@ -8,13 +8,11 @@ let
url="http://www.angelcode.com/angelscript/sdk/files/angelscript_${version}.zip";
sha256 = "sha256-AQ3UXiPnNNRvWJHXDiaGB6EsuasSUD3aQvhC2dt+iFc=";
};
- buildInputs = [
- unzip
- ];
+
in
stdenv.mkDerivation {
inherit (s) name version;
- inherit buildInputs;
+ nativeBuildInputs = [ unzip ];
src = fetchurl {
inherit (s) url sha256;
};
diff --git a/third_party/nixpkgs/pkgs/development/interpreters/bats/default.nix b/third_party/nixpkgs/pkgs/development/interpreters/bats/default.nix
index aa3abc6553..01d1b61cb8 100644
--- a/third_party/nixpkgs/pkgs/development/interpreters/bats/default.nix
+++ b/third_party/nixpkgs/pkgs/development/interpreters/bats/default.nix
@@ -2,11 +2,11 @@
stdenv.mkDerivation rec {
pname = "bats";
- version = "1.2.1";
+ version = "1.3.0";
src = fetchzip {
url = "https://github.com/bats-core/bats-core/archive/v${version}.tar.gz";
- hash = "sha256-grB/rJaDU0fuw4Hm3/9nI2px8KZnSWqRjTJPd7Mmb7s=";
+ hash = "sha256-+dboExOx2YELxV8Cwk9SVwk9G3p8EoP0LdaJ3o7GT6c=";
};
nativeBuildInputs = [ makeWrapper ];
@@ -22,6 +22,9 @@ stdenv.mkDerivation rec {
inherit doCheck;
checkPhase = ''
+ # TODO: cut if https://github.com/bats-core/bats-core/issues/418 allows
+ sed -i '/test works even if PATH is reset/a skip' test/bats.bats
+
# test generates file with absolute shebang dynamically
substituteInPlace test/install.bats --replace \
"/usr/bin/env bash" "${bash}/bin/bash"
diff --git a/third_party/nixpkgs/pkgs/development/interpreters/clojurescript/lumo/default.nix b/third_party/nixpkgs/pkgs/development/interpreters/clojurescript/lumo/default.nix
index a269d0b158..7bd3913260 100644
--- a/third_party/nixpkgs/pkgs/development/interpreters/clojurescript/lumo/default.nix
+++ b/third_party/nixpkgs/pkgs/development/interpreters/clojurescript/lumo/default.nix
@@ -149,11 +149,11 @@ stdenv.mkDerivation {
sha256 = "12agi6bacqic2wq6q3l28283badzamspajmajzqm7fbdl2aq1a4p";
};
+ nativeBuildInputs = [ unzip ];
buildInputs = [
nodejs
clojure
jre
- unzip
python
openssl
gnutar
diff --git a/third_party/nixpkgs/pkgs/development/interpreters/elixir/1.11.nix b/third_party/nixpkgs/pkgs/development/interpreters/elixir/1.11.nix
index 4e50c737e3..6e5a30a9dd 100644
--- a/third_party/nixpkgs/pkgs/development/interpreters/elixir/1.11.nix
+++ b/third_party/nixpkgs/pkgs/development/interpreters/elixir/1.11.nix
@@ -3,7 +3,7 @@
# How to obtain `sha256`:
# nix-prefetch-url --unpack https://github.com/elixir-lang/elixir/archive/v${version}.tar.gz
mkDerivation {
- version = "1.11.3";
- sha256 = "sha256-DqmKpMLxrXn23fsX/hrjDsYCmhD5jbVtvOX8EwKBakc=";
+ version = "1.11.4";
+ sha256 = "sha256-qCX6hRWUbW+E5xaUhcYxRAnhnvncASUJck8lESlcDvk=";
minimumOTPVersion = "21";
}
diff --git a/third_party/nixpkgs/pkgs/development/interpreters/groovy/default.nix b/third_party/nixpkgs/pkgs/development/interpreters/groovy/default.nix
index 114bc13f5d..9d2b9a8f03 100644
--- a/third_party/nixpkgs/pkgs/development/interpreters/groovy/default.nix
+++ b/third_party/nixpkgs/pkgs/development/interpreters/groovy/default.nix
@@ -11,8 +11,7 @@ stdenv.mkDerivation rec {
sha256 = "1xdpjqx7qaq0syw448b32q36g12pgh1hn6knyqi3k5isp0f09qmr";
};
- nativeBuildInputs = [ makeWrapper ];
- buildInputs = [ unzip ];
+ nativeBuildInputs = [ makeWrapper unzip ];
installPhase = ''
mkdir -p $out
diff --git a/third_party/nixpkgs/pkgs/development/interpreters/janet/default.nix b/third_party/nixpkgs/pkgs/development/interpreters/janet/default.nix
index 0ab90c1e06..163c255c52 100644
--- a/third_party/nixpkgs/pkgs/development/interpreters/janet/default.nix
+++ b/third_party/nixpkgs/pkgs/development/interpreters/janet/default.nix
@@ -2,13 +2,13 @@
stdenv.mkDerivation rec {
pname = "janet";
- version = "1.15.3";
+ version = "1.15.4";
src = fetchFromGitHub {
owner = "janet-lang";
repo = pname;
rev = "v${version}";
- sha256 = "sha256-GWSPNz4IxEYxSRpDPbgCXmc7WYZNi8IGVqNhSEgUaeg=";
+ sha256 = "sha256-lE2BAwiwvewydIpVYoN+zrfpzQbMbe5Nb1r0mzdxMao=";
};
nativeBuildInputs = [ meson ninja ];
diff --git a/third_party/nixpkgs/pkgs/development/interpreters/maude/default.nix b/third_party/nixpkgs/pkgs/development/interpreters/maude/default.nix
index 6dcb697d76..860f9ac3a5 100644
--- a/third_party/nixpkgs/pkgs/development/interpreters/maude/default.nix
+++ b/third_party/nixpkgs/pkgs/development/interpreters/maude/default.nix
@@ -22,8 +22,9 @@ stdenv.mkDerivation {
sha256 = "b112d7843f65217e3b5a9d40461698ef8dab7cbbe830af21216dfb924dc88a2f";
};
+ nativeBuildInputs = [ unzip ];
buildInputs = [
- flex bison ncurses buddy tecla gmpxx libsigsegv makeWrapper unzip cln yices
+ flex bison ncurses buddy tecla gmpxx libsigsegv makeWrapper cln yices
];
hardeningDisable = [ "stackprotector" ] ++
diff --git a/third_party/nixpkgs/pkgs/development/interpreters/octave/build-env.nix b/third_party/nixpkgs/pkgs/development/interpreters/octave/build-env.nix
index fee53b716d..433026f0a7 100644
--- a/third_party/nixpkgs/pkgs/development/interpreters/octave/build-env.nix
+++ b/third_party/nixpkgs/pkgs/development/interpreters/octave/build-env.nix
@@ -20,17 +20,14 @@ in buildEnv {
inherit ignoreCollisions;
extraOutputsToInstall = [ "out" ] ++ extraOutputsToInstall;
- buildInputs = [ makeWrapper texinfo wrapOctave ];
+ nativeBuildInputs = [ makeWrapper ];
+ buildInputs = [ texinfo wrapOctave ];
# During "build" we must first unlink the /share symlink to octave's /share
# Then, we can re-symlink the all of octave/share, except for /share/octave
# in env/share/octave, re-symlink everything from octave/share/octave and then
# perform the pkg install.
postBuild = ''
- . "${makeWrapper}/nix-support/setup-hook"
- # The `makeWrapper` used here is the one defined in
- # ${makeWrapper}/nix-support/setup-hook
-
if [ -L "$out/bin" ]; then
unlink $out/bin
mkdir -p "$out/bin"
diff --git a/third_party/nixpkgs/pkgs/development/interpreters/perl/aarch64-darwin.patch b/third_party/nixpkgs/pkgs/development/interpreters/perl/aarch64-darwin.patch
new file mode 100644
index 0000000000..b700c8ca6e
--- /dev/null
+++ b/third_party/nixpkgs/pkgs/development/interpreters/perl/aarch64-darwin.patch
@@ -0,0 +1,46 @@
+diff --git a/hints/darwin.sh b/hints/darwin.sh
+index 0a91bc083c0..fdfbdd4a3b9 100644
+--- a/hints/darwin.sh
++++ b/hints/darwin.sh
+@@ -301,7 +301,7 @@ case "$osvers" in # Note: osvers is the kernel version, not the 10.x
+ # We now use MACOSX_DEPLOYMENT_TARGET, if set, as an override by
+ # capturing its value and adding it to the flags.
+ case "$MACOSX_DEPLOYMENT_TARGET" in
+- 10.*)
++ [1-9][0-9].*)
+ add_macosx_version_min ccflags $MACOSX_DEPLOYMENT_TARGET
+ add_macosx_version_min ldflags $MACOSX_DEPLOYMENT_TARGET
+ ;;
+@@ -313,7 +313,7 @@ case "$osvers" in # Note: osvers is the kernel version, not the 10.x
+
+ *** Unexpected MACOSX_DEPLOYMENT_TARGET=$MACOSX_DEPLOYMENT_TARGET
+ ***
+-*** Please either set it to 10.something, or to empty.
++*** Please either set it to a valid macOS version number (e.g., 10.15) or to empty.
+
+ EOM
+ exit 1
+@@ -327,7 +327,7 @@ EOM
+ # "ProductVersion: 10.11" "10.11"
+ prodvers=`sw_vers|awk '/^ProductVersion:/{print $2}'|awk -F. '{print $1"."$2}'`
+ case "$prodvers" in
+- 10.*)
++ [1-9][0-9].*)
+ add_macosx_version_min ccflags $prodvers
+ add_macosx_version_min ldflags $prodvers
+ ;;
+@@ -342,11 +342,10 @@ EOM
+ exit 1
+ esac
+
+- # The X in 10.X
+- prodvers_minor=$(echo $prodvers|awk -F. '{print $2}')
++ darwin_major=$(echo $osvers|awk -F. '{print $1}')
+
+- # macOS (10.12) deprecated syscall().
+- if [ "$prodvers_minor" -ge 12 ]; then
++ # macOS 10.12 (darwin 16.0.0) deprecated syscall().
++ if [ "$darwin_major" -ge 16 ]; then
+ d_syscall='undef'
+ # If deploying to pre-10.12, suppress Time::HiRes's detection of the system clock_gettime()
+ case "$MACOSX_DEPLOYMENT_TARGET" in
diff --git a/third_party/nixpkgs/pkgs/development/interpreters/perl/default.nix b/third_party/nixpkgs/pkgs/development/interpreters/perl/default.nix
index 66e0b284fc..e0c72d628a 100644
--- a/third_party/nixpkgs/pkgs/development/interpreters/perl/default.nix
+++ b/third_party/nixpkgs/pkgs/development/interpreters/perl/default.nix
@@ -41,7 +41,10 @@ let
]
++ optional stdenv.isSunOS ./ld-shared.patch
++ optionals stdenv.isDarwin [ ./cpp-precomp.patch ./sw_vers.patch ]
- ++ optional crossCompiling ./MakeMaker-cross.patch;
+ ++ optional crossCompiling ./MakeMaker-cross.patch
+ # Backporting https://github.com/Perl/perl5/pull/17946, can be
+ # removed if there's ever a 5.30.x release with it included.
+ ++ optional (versionOlder version "5.32.1") ./aarch64-darwin.patch;
# This is not done for native builds because pwd may need to come from
# bootstrap tools when building bootstrap perl.
diff --git a/third_party/nixpkgs/pkgs/development/interpreters/perl/wrapper.nix b/third_party/nixpkgs/pkgs/development/interpreters/perl/wrapper.nix
index da95b5a896..e1909a15e0 100644
--- a/third_party/nixpkgs/pkgs/development/interpreters/perl/wrapper.nix
+++ b/third_party/nixpkgs/pkgs/development/interpreters/perl/wrapper.nix
@@ -17,11 +17,10 @@ let
inherit ignoreCollisions;
extraOutputsToInstall = [ "out" ] ++ extraOutputsToInstall;
+ nativeBuildInputs = [ makeWrapper ];
+
# we create wrapper for the binaries in the different packages
postBuild = ''
-
- . "${makeWrapper}/nix-support/setup-hook"
-
if [ -L "$out/bin" ]; then
unlink "$out/bin"
fi
diff --git a/third_party/nixpkgs/pkgs/development/interpreters/python/cpython/2.7/default.nix b/third_party/nixpkgs/pkgs/development/interpreters/python/cpython/2.7/default.nix
index 37d43e33d8..adeafa80e6 100644
--- a/third_party/nixpkgs/pkgs/development/interpreters/python/cpython/2.7/default.nix
+++ b/third_party/nixpkgs/pkgs/development/interpreters/python/cpython/2.7/default.nix
@@ -106,6 +106,12 @@ let
./CVE-2021-3177.patch
+ # The workaround is for unittests on Win64, which we don't support.
+ # It does break aarch64-darwin, which we do support. See:
+ # * https://bugs.python.org/issue35523
+ # * https://github.com/python/cpython/commit/e6b247c8e524
+ ../3.7/no-win64-workaround.patch
+
] ++ optionals (x11Support && stdenv.isDarwin) [
./use-correct-tcl-tk-on-darwin.patch
] ++ optionals stdenv.isLinux [
diff --git a/third_party/nixpkgs/pkgs/development/interpreters/python/cpython/3.7/no-win64-workaround.patch b/third_party/nixpkgs/pkgs/development/interpreters/python/cpython/3.7/no-win64-workaround.patch
new file mode 100644
index 0000000000..685b1e8394
--- /dev/null
+++ b/third_party/nixpkgs/pkgs/development/interpreters/python/cpython/3.7/no-win64-workaround.patch
@@ -0,0 +1,37 @@
+From e6b247c8e524dbe5fc03b3492f628d0d5348bc49 Mon Sep 17 00:00:00 2001
+From: Victor Stinner
+Date: Tue, 18 Dec 2018 14:47:21 +0100
+Subject: [PATCH] bpo-35523: Remove ctypes callback workaround (GH-11211)
+
+Remove ctypes callback workaround: no longer create a callback at startup.
+Avoid SELinux alert on "import ctypes" and "import uuid".
+---
+ Lib/ctypes/__init__.py | 5 -----
+ .../next/Library/2018-12-18-13-52-13.bpo-35523.SkoMno.rst | 2 ++
+ 2 files changed, 2 insertions(+), 5 deletions(-)
+ create mode 100644 Misc/NEWS.d/next/Library/2018-12-18-13-52-13.bpo-35523.SkoMno.rst
+
+diff --git a/Lib/ctypes/__init__.py b/Lib/ctypes/__init__.py
+index 6146773988648..5f78beda5866e 100644
+--- a/Lib/ctypes/__init__.py
++++ b/Lib/ctypes/__init__.py
+@@ -266,11 +266,6 @@ def _reset_cache():
+ # _SimpleCData.c_char_p_from_param
+ POINTER(c_char).from_param = c_char_p.from_param
+ _pointer_type_cache[None] = c_void_p
+- # XXX for whatever reasons, creating the first instance of a callback
+- # function is needed for the unittests on Win64 to succeed. This MAY
+- # be a compiler bug, since the problem occurs only when _ctypes is
+- # compiled with the MS SDK compiler. Or an uninitialized variable?
+- CFUNCTYPE(c_int)(lambda: None)
+
+ def create_unicode_buffer(init, size=None):
+ """create_unicode_buffer(aString) -> character array
+diff --git a/Misc/NEWS.d/next/Library/2018-12-18-13-52-13.bpo-35523.SkoMno.rst b/Misc/NEWS.d/next/Library/2018-12-18-13-52-13.bpo-35523.SkoMno.rst
+new file mode 100644
+index 0000000000000..94a9fd257383e
+--- /dev/null
++++ b/Misc/NEWS.d/next/Library/2018-12-18-13-52-13.bpo-35523.SkoMno.rst
+@@ -0,0 +1,2 @@
++Remove :mod:`ctypes` callback workaround: no longer create a callback at
++startup. Avoid SELinux alert on ``import ctypes`` and ``import uuid``.
diff --git a/third_party/nixpkgs/pkgs/development/interpreters/python/cpython/default.nix b/third_party/nixpkgs/pkgs/development/interpreters/python/cpython/default.nix
index 1ae8d19ac5..fdf022213c 100644
--- a/third_party/nixpkgs/pkgs/development/interpreters/python/cpython/default.nix
+++ b/third_party/nixpkgs/pkgs/development/interpreters/python/cpython/default.nix
@@ -185,6 +185,11 @@ in with passthru; stdenv.mkDerivation {
# Backport a fix for discovering `rpmbuild` command when doing `python setup.py bdist_rpm` to 3.5, 3.6, 3.7.
# See: https://bugs.python.org/issue11122
./3.7/fix-hardcoded-path-checking-for-rpmbuild.patch
+ # The workaround is for unittests on Win64, which we don't support.
+ # It does break aarch64-darwin, which we do support. See:
+ # * https://bugs.python.org/issue35523
+ # * https://github.com/python/cpython/commit/e6b247c8e524
+ ./3.7/no-win64-workaround.patch
] ++ optionals (isPy37 || isPy38 || isPy39) [
# Fix darwin build https://bugs.python.org/issue34027
./3.7/darwin-libutil.patch
diff --git a/third_party/nixpkgs/pkgs/development/interpreters/python/wrapper.nix b/third_party/nixpkgs/pkgs/development/interpreters/python/wrapper.nix
index 61ad4a8a6a..514930db35 100644
--- a/third_party/nixpkgs/pkgs/development/interpreters/python/wrapper.nix
+++ b/third_party/nixpkgs/pkgs/development/interpreters/python/wrapper.nix
@@ -1,10 +1,15 @@
-{ lib, stdenv, python, buildEnv, makeWrapper
+{ lib, stdenv, buildEnv, makeWrapper
+
+# manually pased
+, python
+, requiredPythonModules
+
+# extra opts
, extraLibs ? []
, extraOutputsToInstall ? []
, postBuild ? ""
, ignoreCollisions ? false
, permitUserSite ? false
-, requiredPythonModules
# Wrap executables with the given argument.
, makeWrapperArgs ? []
, }:
@@ -22,9 +27,9 @@ let
inherit ignoreCollisions;
extraOutputsToInstall = [ "out" ] ++ extraOutputsToInstall;
- postBuild = ''
- . "${makeWrapper}/nix-support/setup-hook"
+ nativeBuildInputs = [ makeWrapper ];
+ postBuild = ''
if [ -L "$out/bin" ]; then
unlink "$out/bin"
fi
diff --git a/third_party/nixpkgs/pkgs/development/interpreters/qnial/default.nix b/third_party/nixpkgs/pkgs/development/interpreters/qnial/default.nix
index ba46989c94..1173315192 100644
--- a/third_party/nixpkgs/pkgs/development/interpreters/qnial/default.nix
+++ b/third_party/nixpkgs/pkgs/development/interpreters/qnial/default.nix
@@ -11,7 +11,7 @@ stdenv.mkDerivation {
owner = "vrthra";
};
- nativeBuildInputs = [ makeWrapper ];
+ nativeBuildInputs = [ makeWrapper unzip ];
preConfigure = ''
cd build;
@@ -25,7 +25,6 @@ stdenv.mkDerivation {
'';
buildInputs = [
- unzip
pkg-config
ncurses
];
diff --git a/third_party/nixpkgs/pkgs/development/interpreters/rakudo/default.nix b/third_party/nixpkgs/pkgs/development/interpreters/rakudo/default.nix
index 99a812905d..358b866319 100644
--- a/third_party/nixpkgs/pkgs/development/interpreters/rakudo/default.nix
+++ b/third_party/nixpkgs/pkgs/development/interpreters/rakudo/default.nix
@@ -2,11 +2,11 @@
stdenv.mkDerivation rec {
pname = "rakudo";
- version = "2020.12";
+ version = "2021.02.1";
src = fetchurl {
url = "https://www.rakudo.org/dl/rakudo/rakudo-${version}.tar.gz";
- sha256 = "1g3ciwhlac85d6l2kqslw8pm4bjjd1z79m1c5ll0fxmr6awgpk67";
+ sha256 = "1xwqx4357bw7h5pdmwxm5wxh8wjvrcdk4rvr3wyrhg1wzy5qvsn8";
};
buildInputs = [ icu zlib gmp perl ];
diff --git a/third_party/nixpkgs/pkgs/development/interpreters/rakudo/moarvm.nix b/third_party/nixpkgs/pkgs/development/interpreters/rakudo/moarvm.nix
index f833c153b9..e5baacf5c2 100644
--- a/third_party/nixpkgs/pkgs/development/interpreters/rakudo/moarvm.nix
+++ b/third_party/nixpkgs/pkgs/development/interpreters/rakudo/moarvm.nix
@@ -3,11 +3,11 @@
stdenv.mkDerivation rec {
pname = "moarvm";
- version = "2020.12";
+ version = "2021.02";
src = fetchurl {
url = "https://www.moarvm.org/releases/MoarVM-${version}.tar.gz";
- sha256 = "18iys1bdb92asggrsz7sg1hh76j7kq63c3fgg33fnla18qf4z488";
+ sha256 = "08ri9mvbk97qfxcy6lj4cb7j3a789ck052m2vqfhis3vkrkw780r";
};
buildInputs = [ perl ] ++ lib.optionals stdenv.isDarwin [ CoreServices ApplicationServices ];
diff --git a/third_party/nixpkgs/pkgs/development/interpreters/rakudo/nqp.nix b/third_party/nixpkgs/pkgs/development/interpreters/rakudo/nqp.nix
index b4b41fa880..cd60bb3b79 100644
--- a/third_party/nixpkgs/pkgs/development/interpreters/rakudo/nqp.nix
+++ b/third_party/nixpkgs/pkgs/development/interpreters/rakudo/nqp.nix
@@ -2,11 +2,11 @@
stdenv.mkDerivation rec {
pname = "nqp";
- version = "2020.12";
+ version = "2021.02";
src = fetchurl {
url = "https://github.com/raku/nqp/releases/download/${version}/nqp-${version}.tar.gz";
- sha256 = "13h64d41fwggc3lg4bpllg4jrp64clm7nmnw4g2jyjl47cy5ni7x";
+ sha256 = "1vyl6x811f8mbdnp34yj6kfmfpxp2yfrr8cqf1w47rzmr741sjyj";
};
buildInputs = [ perl ];
diff --git a/third_party/nixpkgs/pkgs/development/interpreters/ruby/default.nix b/third_party/nixpkgs/pkgs/development/interpreters/ruby/default.nix
index 3bf8ffab0e..b13c50f18d 100644
--- a/third_party/nixpkgs/pkgs/development/interpreters/ruby/default.nix
+++ b/third_party/nixpkgs/pkgs/development/interpreters/ruby/default.nix
@@ -27,6 +27,7 @@ let
ver = version;
tag = ver.gitTag;
atLeast27 = lib.versionAtLeast ver.majMin "2.7";
+ atLeast30 = lib.versionAtLeast ver.majMin "3.0";
baseruby = self.override {
useRailsExpress = false;
docSupport = false;
@@ -109,7 +110,9 @@ let
(import ./patchsets.nix {
inherit patchSet useRailsExpress ops fetchpatch;
patchLevel = ver.patchLevel;
- }).${ver.majMinTiny};
+ }).${ver.majMinTiny}
+ ++ op atLeast27 ./do-not-regenerate-revision.h.patch
+ ++ op (atLeast30 && useRailsExpress) ./do-not-update-gems-baseruby.patch;
postUnpack = opString rubygemsSupport ''
rm -rf $sourceRoot/{lib,test}/rubygems*
@@ -121,17 +124,12 @@ let
sed -i configure.ac -e '/config.guess/d'
cp --remove-destination ${config}/config.guess tool/
cp --remove-destination ${config}/config.sub tool/
+ '' + opString (!atLeast30) ''
# Make the build reproducible for ruby <= 2.7
# See https://github.com/ruby/io-console/commit/679a941d05d869f5e575730f6581c027203b7b26#diff-d8422f096931c58d4463e2489f62a228b0f24f0492950ba88c8c89a0d741cfe6
sed -i ext/io/console/io-console.gemspec -e '/s\.date/d'
'';
- # Force the revision.h generation. Somehow `revision.tmp` is an empty
- # file and because we don't add `git` to buildInputs, hence the check is
- # always true.
- # https://github.com/ruby/ruby/commit/97a5af62a318fcd93a4e5e4428d576c0280ddbae
- buildFlags = lib.optionals atLeast27 [ "REVISION_LATEST=0" ];
-
configureFlags = ["--enable-shared" "--enable-pthread" "--with-soname=ruby-${version}"]
++ op useRailsExpress "--with-baseruby=${baseruby}/bin/ruby"
++ op (!jitSupport) "--disable-jit-support"
@@ -149,6 +147,10 @@ let
preConfigure = opString docSupport ''
configureFlagsArray+=("--with-ridir=$devdoc/share/ri")
+
+ # rdoc creates XDG_DATA_DIR (defaulting to $HOME/.local/share) even if
+ # it's not going to be used.
+ export HOME=$TMPDIR
'';
# fails with "16993 tests, 2229489 assertions, 105 failures, 14 errors, 89 skips"
@@ -261,4 +263,12 @@ in {
git = "0kbgznf1yprfp9645k31ra5f4757b7fichzi0hdg6nxkj90853s0";
};
};
+
+ ruby_3_0 = generic {
+ version = rubyVersion "3" "0" "0" "";
+ sha256 = {
+ src = "0a4fmxafxvkg1m738g2lmkhipwnmd96kzqy1m9kvk3n1l50x2gm1";
+ git = "0fvnxv97m94nridlc5nvvrlg53pr5g042dkfc5ysd327s7xj4cjp";
+ };
+ };
}
diff --git a/third_party/nixpkgs/pkgs/development/interpreters/ruby/do-not-regenerate-revision.h.patch b/third_party/nixpkgs/pkgs/development/interpreters/ruby/do-not-regenerate-revision.h.patch
new file mode 100644
index 0000000000..ddeb368ee8
--- /dev/null
+++ b/third_party/nixpkgs/pkgs/development/interpreters/ruby/do-not-regenerate-revision.h.patch
@@ -0,0 +1,23 @@
+Do not regenerate revision.h
+
+Ruby's makefile compares the shipped version with the git revision to regenerate
+revision.h [1], but since we don't include git in buildInputs, this comparison
+fails and it can't find $(REVISION_H).
+
+[1] https://github.com/ruby/ruby/commit/97a5af62a318fcd93a4e5e4428d576c0280ddbae
+
+diff -Naur ruby.old/defs/gmake.mk ruby.new/defs/gmake.mk
+--- ruby.old/defs/gmake.mk
++++ ruby.new/defs/gmake.mk
+@@ -325,11 +325,9 @@
+
+ REVISION_IN_HEADER := $(shell sed -n 's/^\#define RUBY_FULL_REVISION "\(.*\)"/\1/p' $(srcdir)/revision.h 2>/dev/null)
+ REVISION_LATEST := $(shell $(CHDIR) $(srcdir) && git log -1 --format=%H 2>/dev/null)
+-ifneq ($(REVISION_IN_HEADER),$(REVISION_LATEST))
+ # GNU make treat the target as unmodified when its dependents get
+ # updated but it is not updated, while others may not.
+ $(srcdir)/revision.h: $(REVISION_H)
+-endif
+
+ # Query on the generated rdoc
+ #
diff --git a/third_party/nixpkgs/pkgs/development/interpreters/ruby/do-not-update-gems-baseruby.patch b/third_party/nixpkgs/pkgs/development/interpreters/ruby/do-not-update-gems-baseruby.patch
new file mode 100644
index 0000000000..2de1977630
--- /dev/null
+++ b/third_party/nixpkgs/pkgs/development/interpreters/ruby/do-not-update-gems-baseruby.patch
@@ -0,0 +1,14 @@
+Do not update gems when building with base ruby
+
+diff -Naur ruby.old/defs/gmake.mk ruby.new/defs/gmake.mk
+--- ruby.old/common.mk
++++ ruby.new/common.mk
+@@ -1298,7 +1298,7 @@ update-config_files: PHONY
+ config.guess config.sub
+
+ refresh-gems: update-bundled_gems prepare-gems
+-prepare-gems: $(HAVE_BASERUBY:yes=update-gems) $(HAVE_BASERUBY:yes=extract-gems)
++prepare-gems:
+
+ update-gems$(gnumake:yes=-nongnumake): PHONY
+ $(ECHO) Downloading bundled gem files...
diff --git a/third_party/nixpkgs/pkgs/development/interpreters/ruby/patchsets.nix b/third_party/nixpkgs/pkgs/development/interpreters/ruby/patchsets.nix
index 69f2246418..3abba61bc2 100644
--- a/third_party/nixpkgs/pkgs/development/interpreters/ruby/patchsets.nix
+++ b/third_party/nixpkgs/pkgs/development/interpreters/ruby/patchsets.nix
@@ -1,11 +1,6 @@
{ patchSet, useRailsExpress, ops, patchLevel, fetchpatch }:
{
- "2.5.8" = ops useRailsExpress [
- "${patchSet}/patches/ruby/2.5/head/railsexpress/01-fix-broken-tests-caused-by-ad.patch"
- "${patchSet}/patches/ruby/2.5/head/railsexpress/02-improve-gc-stats.patch"
- "${patchSet}/patches/ruby/2.5/head/railsexpress/03-more-detailed-stacktrace.patch"
- ];
"2.6.6" = ops useRailsExpress [
"${patchSet}/patches/ruby/2.6/head/railsexpress/01-fix-broken-tests-caused-by-ad.patch"
"${patchSet}/patches/ruby/2.6/head/railsexpress/02-improve-gc-stats.patch"
@@ -16,4 +11,8 @@
"${patchSet}/patches/ruby/2.7/head/railsexpress/02-improve-gc-stats.patch"
"${patchSet}/patches/ruby/2.7/head/railsexpress/03-more-detailed-stacktrace.patch"
];
+ "3.0.0" = ops useRailsExpress [
+ "${patchSet}/patches/ruby/3.0/head/railsexpress/01-improve-gc-stats.patch"
+ "${patchSet}/patches/ruby/3.0/head/railsexpress/02-malloc-trim.patch"
+ ];
}
diff --git a/third_party/nixpkgs/pkgs/development/interpreters/ruby/rvm-patchsets.nix b/third_party/nixpkgs/pkgs/development/interpreters/ruby/rvm-patchsets.nix
index 14f932e1d6..3c2113d608 100644
--- a/third_party/nixpkgs/pkgs/development/interpreters/ruby/rvm-patchsets.nix
+++ b/third_party/nixpkgs/pkgs/development/interpreters/ruby/rvm-patchsets.nix
@@ -3,6 +3,6 @@
fetchFromGitHub {
owner = "skaes";
repo = "rvm-patchsets";
- rev = "e2f4b82e47aeaf2a3b894da3b46ba6f0ca92cbb6";
- sha256 = "059mvf8jcjrfplr8hv2y6ibc41id979k0zwfh6zdnb7dynym4bsg";
+ rev = "28c6469ce841ff3033c376e78a7043009a3bdc5c";
+ sha256 = "0kh08hahrwif61sq0qlvgyqiymxi8c8h2dw4s3ln4aq696k4gba9";
}
diff --git a/third_party/nixpkgs/pkgs/development/interpreters/spidermonkey/78.nix b/third_party/nixpkgs/pkgs/development/interpreters/spidermonkey/78.nix
index e04069f6ae..23f24ca8ba 100644
--- a/third_party/nixpkgs/pkgs/development/interpreters/spidermonkey/78.nix
+++ b/third_party/nixpkgs/pkgs/development/interpreters/spidermonkey/78.nix
@@ -1,6 +1,5 @@
{ lib, stdenv
, fetchurl
-, fetchpatch
, autoconf213
, pkg-config
, perl
@@ -21,11 +20,11 @@
stdenv.mkDerivation rec {
pname = "spidermonkey";
- version = "78.4.0";
+ version = "78.8.0";
src = fetchurl {
url = "mirror://mozilla/firefox/releases/${version}esr/source/firefox-${version}esr.source.tar.xz";
- sha256 = "1z3hj45bnd12z3g6ajv9qrgclca7fymi1sxj9l9nh9q6y6xz0g4f";
+ sha256 = "0451hhjrj9hb6limxim7sbhvw4gs6dd2gmnfxjjx07z3wbgdzwhw";
};
outputs = [ "out" "dev" ];
@@ -96,9 +95,19 @@ stdenv.mkDerivation rec {
enableParallelBuilding = true;
+ postPatch = ''
+ # This patch is a manually applied fix of
+ # https://bugzilla.mozilla.org/show_bug.cgi?id=1644600
+ # Once that bug is fixed, this can be removed.
+ # This is needed in, for example, `zeroad`.
+ substituteInPlace js/public/StructuredClone.h \
+ --replace "class SharedArrayRawBufferRefs {" \
+ "class JS_PUBLIC_API SharedArrayRawBufferRefs {"
+ '';
+
meta = with lib; {
description = "Mozilla's JavaScript engine written in C/C++";
- homepage = "https://developer.mozilla.org/en/SpiderMonkey";
+ homepage = "https://spidermonkey.dev/";
license = licenses.gpl2; # TODO: MPL/GPL/LGPL tri-license.
maintainers = with maintainers; [ abbradar lostnet ];
platforms = platforms.linux;
diff --git a/third_party/nixpkgs/pkgs/development/interpreters/unicon-lang/default.nix b/third_party/nixpkgs/pkgs/development/interpreters/unicon-lang/default.nix
index ac0a944f21..c399ef223d 100644
--- a/third_party/nixpkgs/pkgs/development/interpreters/unicon-lang/default.nix
+++ b/third_party/nixpkgs/pkgs/development/interpreters/unicon-lang/default.nix
@@ -7,7 +7,8 @@ stdenv.mkDerivation {
url = "http://unicon.org/dist/uni-2-4-2010.zip";
sha256 = "1g9l2dfp99dqih2ir2limqfjgagh3v9aqly6x0l3qavx3qkkwf61";
};
- buildInputs = [ libnsl libX11 libXt unzip ];
+ nativeBuildInputs = [ unzip ];
+ buildInputs = [ libnsl libX11 libXt ];
hardeningDisable = [ "fortify" ];
@@ -41,4 +42,3 @@ stdenv.mkDerivation {
homepage = "http://unicon.org";
};
}
-
diff --git a/third_party/nixpkgs/pkgs/development/libraries/AntTweakBar/default.nix b/third_party/nixpkgs/pkgs/development/libraries/AntTweakBar/default.nix
index c26672c1da..d46c7a6bcd 100644
--- a/third_party/nixpkgs/pkgs/development/libraries/AntTweakBar/default.nix
+++ b/third_party/nixpkgs/pkgs/development/libraries/AntTweakBar/default.nix
@@ -3,7 +3,8 @@
stdenv.mkDerivation {
name = "AntTweakBar-1.16";
- buildInputs = [ unzip xorg.libX11 libGLU libGL ];
+ nativeBuildInputs = [ unzip ];
+ buildInputs = [ xorg.libX11 libGLU libGL ];
src = fetchurl {
url = "mirror://sourceforge/project/anttweakbar/AntTweakBar_116.zip";
diff --git a/third_party/nixpkgs/pkgs/development/libraries/amrnb/default.nix b/third_party/nixpkgs/pkgs/development/libraries/amrnb/default.nix
index b226c9e36d..2316961e39 100644
--- a/third_party/nixpkgs/pkgs/development/libraries/amrnb/default.nix
+++ b/third_party/nixpkgs/pkgs/development/libraries/amrnb/default.nix
@@ -12,7 +12,7 @@ stdenv.mkDerivation {
sha256 = "1qgiw02n2a6r32pimnd97v2jkvnw449xrqmaxiivjy2jcr5h141q";
};
- buildInputs = [ unzip ];
+ nativeBuildInputs = [ unzip ];
configureFlags = [ "--cache-file=config.cache" "--with-downloader=true" ];
diff --git a/third_party/nixpkgs/pkgs/development/libraries/amrwb/default.nix b/third_party/nixpkgs/pkgs/development/libraries/amrwb/default.nix
index 776065b28b..81938bb4cb 100644
--- a/third_party/nixpkgs/pkgs/development/libraries/amrwb/default.nix
+++ b/third_party/nixpkgs/pkgs/development/libraries/amrwb/default.nix
@@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
sha256 = "1p6m9nd08mv525w14py9qzs9zwsa5i3vxf5bgcmcvc408jqmkbsw";
};
- buildInputs = [ unzip ];
+ nativeBuildInputs = [ unzip ];
configureFlags = [ "--cache-file=config.cache" "--with-downloader=true" ];
diff --git a/third_party/nixpkgs/pkgs/development/libraries/boost-process/default.nix b/third_party/nixpkgs/pkgs/development/libraries/boost-process/default.nix
index 97e8798095..148e27faa2 100644
--- a/third_party/nixpkgs/pkgs/development/libraries/boost-process/default.nix
+++ b/third_party/nixpkgs/pkgs/development/libraries/boost-process/default.nix
@@ -8,7 +8,7 @@ stdenv.mkDerivation {
sha256 = "1v9y9pffb2b7p642kp9ic4z6kg42ziizmyvbgrqd1ci0i4gn0831";
};
- buildInputs = [ unzip ];
+ nativeBuildInputs = [ unzip ];
unpackPhase = ''
mkdir $name
diff --git a/third_party/nixpkgs/pkgs/development/libraries/concurrencykit/default.nix b/third_party/nixpkgs/pkgs/development/libraries/concurrencykit/default.nix
deleted file mode 100644
index 968c395d70..0000000000
--- a/third_party/nixpkgs/pkgs/development/libraries/concurrencykit/default.nix
+++ /dev/null
@@ -1,24 +0,0 @@
-{ lib, stdenv, fetchurl }:
-
-stdenv.mkDerivation rec {
- pname = "concurrencykit";
- version = "0.6.0";
-
- src = fetchurl {
- url = "http://concurrencykit.org/releases/ck-${version}.tar.gz";
- sha256 = "1pv21p7sjwwmbs2xblpy1lqk53r2i212yrqyjlr5dr3rlv87vqnp";
- };
-
- #Deleting this line causes "Unknown option --disable-static"
- configurePhase = "./configure --prefix=$out";
-
- enableParallelBuilding = true;
-
- meta = with lib; {
- description = "A library of safe, high-performance concurrent data structures";
- homepage = "http://concurrencykit.org";
- license = licenses.bsd2;
- platforms = platforms.unix;
- maintainers = [ maintainers.thoughtpolice ];
- };
-}
diff --git a/third_party/nixpkgs/pkgs/development/libraries/cutelyst/default.nix b/third_party/nixpkgs/pkgs/development/libraries/cutelyst/default.nix
index 80ec1986f8..9f7d020fea 100644
--- a/third_party/nixpkgs/pkgs/development/libraries/cutelyst/default.nix
+++ b/third_party/nixpkgs/pkgs/development/libraries/cutelyst/default.nix
@@ -4,13 +4,13 @@
stdenv.mkDerivation rec {
pname = "cutelyst";
- version = "2.14.0";
+ version = "2.14.2";
src = fetchFromGitHub {
owner = "cutelyst";
repo = "cutelyst";
rev = "v${version}";
- sha256 = "sha256-RidUZqDnzRrgW/7LVF+BF01zNcf1cJ/kS7OF/t1Q65c=";
+ sha256 = "sha256-JUffOeUTeaZvEssP5hfSGipeRuQ7FzLF4bOizCFhe5o=";
};
nativeBuildInputs = [ cmake pkg-config wrapQtAppsHook ];
diff --git a/third_party/nixpkgs/pkgs/development/libraries/dav1d/default.nix b/third_party/nixpkgs/pkgs/development/libraries/dav1d/default.nix
index 2b9357e3ef..51df5a9254 100644
--- a/third_party/nixpkgs/pkgs/development/libraries/dav1d/default.nix
+++ b/third_party/nixpkgs/pkgs/development/libraries/dav1d/default.nix
@@ -1,5 +1,6 @@
{ lib, stdenv, fetchFromGitLab
, meson, ninja, nasm, pkg-config
+, xxHash
, withTools ? false # "dav1d" binary
, withExamples ? false, SDL2 # "dav1dplay" binary
, useVulkan ? false, libplacebo, vulkan-loader, vulkan-headers
@@ -9,19 +10,20 @@ assert useVulkan -> withExamples;
stdenv.mkDerivation rec {
pname = "dav1d";
- version = "0.8.1";
+ version = "0.8.2";
src = fetchFromGitLab {
domain = "code.videolan.org";
owner = "videolan";
repo = pname;
rev = version;
- sha256 = "1820fpmmq1vxjzjmza6ydk4fgxipb8gmcc5skybki64qn7410v7x";
+ sha256 = "0plmnxpz66yv3nqv1kgbyyfnwfqi9dqs0zbsdj488i6464a1m6si";
};
nativeBuildInputs = [ meson ninja nasm pkg-config ];
# TODO: doxygen (currently only HTML and not build by default).
- buildInputs = lib.optional withExamples SDL2
+ buildInputs = [ xxHash ]
+ ++ lib.optional withExamples SDL2
++ lib.optionals useVulkan [ libplacebo vulkan-loader vulkan-headers ];
mesonFlags= [
diff --git a/third_party/nixpkgs/pkgs/development/libraries/ffmpeg-full/default.nix b/third_party/nixpkgs/pkgs/development/libraries/ffmpeg-full/default.nix
index 916ea2772e..a09ad0e871 100644
--- a/third_party/nixpkgs/pkgs/development/libraries/ffmpeg-full/default.nix
+++ b/third_party/nixpkgs/pkgs/development/libraries/ffmpeg-full/default.nix
@@ -246,11 +246,6 @@ stdenv.mkDerivation rec {
# this should go away in the next release
patches = [
- (fetchpatch {
- url = "https://git.videolan.org/?p=ffmpeg.git;a=patch;h=7c59e1b0f285cd7c7b35fcd71f49c5fd52cf9315";
- sha256 = "sha256-dqpmpDFETTuWHWolMoLaubU4BeDEuQaBNA0wmzL1f8o=";
- name = "fix_libsrt.patch";
- })
# Patch ffmpeg for svt-av1 until version 4.4
(fetchpatch {
url = "https://raw.githubusercontent.com/AOMediaCodec/SVT-AV1/v0.8.4/ffmpeg_plugin/0001-Add-ability-for-ffmpeg-to-run-svt-av1.patch";
diff --git a/third_party/nixpkgs/pkgs/development/libraries/ffmpeg/4.nix b/third_party/nixpkgs/pkgs/development/libraries/ffmpeg/4.nix
index 2cc409fc03..95207b5386 100644
--- a/third_party/nixpkgs/pkgs/development/libraries/ffmpeg/4.nix
+++ b/third_party/nixpkgs/pkgs/development/libraries/ffmpeg/4.nix
@@ -5,8 +5,8 @@
}@args:
callPackage ./generic.nix (rec {
- version = "4.3.1";
+ version = "4.3.2";
branch = "4.3";
- sha256 = "1nghcpm2r9ir2h6xpqfn9381jq6aiwlkwlnyplxywvkbjiisr97l";
+ sha256 = "0flik4y7c5kchj65p3p908mk1dsncqgzjdvzysjs12rmf1m6sfmb";
darwinFrameworks = [ Cocoa CoreMedia VideoToolbox ];
} // args)
diff --git a/third_party/nixpkgs/pkgs/development/libraries/freetts/default.nix b/third_party/nixpkgs/pkgs/development/libraries/freetts/default.nix
index f7a605ea87..dc5f438603 100644
--- a/third_party/nixpkgs/pkgs/development/libraries/freetts/default.nix
+++ b/third_party/nixpkgs/pkgs/development/libraries/freetts/default.nix
@@ -6,7 +6,8 @@ stdenv.mkDerivation {
url = "mirror://sourceforge/freetts/freetts-1.2.2-src.zip";
sha256 = "0mnikqhpf4f4jdr0irmibr8yy0dnffx1i257y22iamxi7a6by2r7";
};
- buildInputs = [ apacheAnt unzip sharutils jdk ];
+ nativeBuildInputs = [ unzip ];
+ buildInputs = [ apacheAnt sharutils jdk ];
unpackPhase = ''
unzip $src -x META-INF/*
'';
diff --git a/third_party/nixpkgs/pkgs/development/libraries/ftgl/default.nix b/third_party/nixpkgs/pkgs/development/libraries/ftgl/default.nix
index c3fd6ffb94..5588e27356 100644
--- a/third_party/nixpkgs/pkgs/development/libraries/ftgl/default.nix
+++ b/third_party/nixpkgs/pkgs/development/libraries/ftgl/default.nix
@@ -1,40 +1,47 @@
-{ lib, stdenv, fetchurl, freetype, libGL, libGLU, OpenGL }:
+{ lib
+, stdenv
+, fetchurl
+, freetype
+, libGL
+, libGLU
+, OpenGL
+}:
-let
- name = "ftgl-2.1.3-rc5";
-in
-stdenv.mkDerivation {
- inherit name;
+stdenv.mkDerivation rec {
+ pname = "ftgl";
+ version = "2.1.3-rc5";
src = fetchurl {
- url = "mirror://sourceforge/ftgl/${name}.tar.gz";
- sha256 = "0nsn4s6vnv5xcgxcw6q031amvh2zfj2smy1r5mbnjj2548hxcn2l";
+ url = "mirror://sourceforge/${pname}-${version}.tar.gz";
+ hash = "sha256-VFjWISJFSGlXLTn4qoV0X8BdVRgAG876Y71su40mVls=";
};
- buildInputs = [ freetype ]
- ++ (if stdenv.isDarwin then
- [ OpenGL ]
- else
- [ libGL libGLU ])
- ;
+ buildInputs = [
+ freetype
+ ] ++ (if stdenv.isDarwin then [
+ OpenGL
+ ] else [
+ libGL
+ libGLU
+ ]);
- configureFlags = [ "--with-ft-prefix=${lib.getDev freetype}" ];
+ configureFlags = [
+ "--with-ft-prefix=${lib.getDev freetype}"
+ ];
enableParallelBuilding = true;
- meta = {
+ meta = with lib; {
homepage = "https://sourceforge.net/apps/mediawiki/ftgl/";
description = "Font rendering library for OpenGL applications";
- license = lib.licenses.gpl3Plus;
-
longDescription = ''
- FTGL is a free cross-platform Open Source C++ library that uses
- Freetype2 to simplify rendering fonts in OpenGL applications. FTGL
- supports bitmaps, pixmaps, texture maps, outlines, polygon mesh,
- and extruded polygon rendering modes.
+ FTGL is a free cross-platform Open Source C++ library that uses Freetype2
+ to simplify rendering fonts in OpenGL applications. FTGL supports bitmaps,
+ pixmaps, texture maps, outlines, polygon mesh, and extruded polygon
+ rendering modes.
'';
-
- platforms = lib.platforms.unix;
- maintainers = [];
+ license = licenses.gpl3Plus;
+ maintainers = with maintainers; [ AndersonTorres ];
+ platforms = platforms.unix;
};
}
diff --git a/third_party/nixpkgs/pkgs/development/libraries/gdal/2.4.nix b/third_party/nixpkgs/pkgs/development/libraries/gdal/2.4.nix
index 5df29b38a2..76c92dd9a3 100644
--- a/third_party/nixpkgs/pkgs/development/libraries/gdal/2.4.nix
+++ b/third_party/nixpkgs/pkgs/development/libraries/gdal/2.4.nix
@@ -16,7 +16,8 @@ stdenv.mkDerivation rec {
sha256 = "1n6w0m2603q9cldlz0wyscp75ci561dipc36jqbf3mjmylybv0x3";
};
- buildInputs = [ unzip libjpeg libtiff libgeotiff libpng proj openssl sqlite
+ nativeBuildInputs = [ unzip ];
+ buildInputs = [ libjpeg libtiff libgeotiff libpng proj openssl sqlite
libspatialite poppler hdf4 qhull giflib expat libxml2 proj ]
++ (with pythonPackages; [ python numpy wrapPython ])
++ lib.optional stdenv.isDarwin libiconv
diff --git a/third_party/nixpkgs/pkgs/development/libraries/gdal/default.nix b/third_party/nixpkgs/pkgs/development/libraries/gdal/default.nix
index 6c1cf1612f..15fc84895f 100644
--- a/third_party/nixpkgs/pkgs/development/libraries/gdal/default.nix
+++ b/third_party/nixpkgs/pkgs/development/libraries/gdal/default.nix
@@ -18,10 +18,9 @@ stdenv.mkDerivation rec {
sourceRoot = "source/gdal";
- nativeBuildInputs = [ autoreconfHook pkg-config ];
+ nativeBuildInputs = [ autoreconfHook pkg-config unzip ];
buildInputs = [
- unzip
libjpeg
libtiff
libpng
diff --git a/third_party/nixpkgs/pkgs/development/libraries/gdal/gdal-1_11.nix b/third_party/nixpkgs/pkgs/development/libraries/gdal/gdal-1_11.nix
index 92d17452c9..47be58c505 100644
--- a/third_party/nixpkgs/pkgs/development/libraries/gdal/gdal-1_11.nix
+++ b/third_party/nixpkgs/pkgs/development/libraries/gdal/gdal-1_11.nix
@@ -11,7 +11,8 @@ stdenv.mkDerivation rec {
sha256 = "0hphxzvy23v3vqxx1y22hhhg4cypihrb8555y12nb4mrhzlw7zfl";
};
- buildInputs = [ unzip libjpeg libtiff libgeotiff libpng python pythonPackages.numpy proj openssl ];
+ nativeBuildInputs = [ unzip ];
+ buildInputs = [ libjpeg libtiff libgeotiff libpng python pythonPackages.numpy proj openssl ];
patches = [
# This ensures that the python package is installed into gdal's prefix,
diff --git a/third_party/nixpkgs/pkgs/development/libraries/glib/default.nix b/third_party/nixpkgs/pkgs/development/libraries/glib/default.nix
index 0e8ed605a2..b18ce099dc 100644
--- a/third_party/nixpkgs/pkgs/development/libraries/glib/default.nix
+++ b/third_party/nixpkgs/pkgs/development/libraries/glib/default.nix
@@ -92,6 +92,7 @@ stdenv.mkDerivation rec {
buildInputs = [
libelf setupHook pcre
bash gnum4 # install glib-gettextize and m4 macros for other apps to use
+ gtk-doc
] ++ optionals stdenv.isLinux [
libselinux
util-linuxMinimal # for libmount
@@ -99,8 +100,10 @@ stdenv.mkDerivation rec {
AppKit Carbon Cocoa CoreFoundation CoreServices Foundation
]);
+ strictDeps = true;
+
nativeBuildInputs = [
- meson ninja pkg-config perl python3 gettext gtk-doc docbook_xsl docbook_xml_dtd_45
+ meson ninja pkg-config perl python3 gettext gtk-doc docbook_xsl docbook_xml_dtd_45 libxml2
];
propagatedBuildInputs = [ zlib libffi gettext libiconv ];
@@ -120,6 +123,8 @@ stdenv.mkDerivation rec {
"-DG_DISABLE_CAST_CHECKS"
];
+ hardeningDisable = [ "pie" ];
+
postPatch = ''
chmod +x gio/tests/gengiotypefuncs.py
patchShebangs gio/tests/gengiotypefuncs.py
@@ -144,7 +149,7 @@ stdenv.mkDerivation rec {
cp -r ${buildPackages.glib.devdoc} $devdoc
'';
- checkInputs = [ tzdata libxml2 desktop-file-utils shared-mime-info ];
+ checkInputs = [ tzdata desktop-file-utils shared-mime-info ];
preCheck = optionalString doCheck ''
export LD_LIBRARY_PATH="$NIX_BUILD_TOP/${pname}-${version}/glib/.libs''${LD_LIBRARY_PATH:+:}$LD_LIBRARY_PATH"
diff --git a/third_party/nixpkgs/pkgs/development/libraries/glpng/default.nix b/third_party/nixpkgs/pkgs/development/libraries/glpng/default.nix
new file mode 100644
index 0000000000..1194d988c0
--- /dev/null
+++ b/third_party/nixpkgs/pkgs/development/libraries/glpng/default.nix
@@ -0,0 +1,38 @@
+{ lib
+, stdenv
+, fetchFromRepoOrCz
+, cmake
+, libGL
+, libpng
+, pkg-config
+, zlib
+}:
+
+stdenv.mkDerivation rec {
+ pname = "glpng";
+ version = "1.46";
+
+ src = fetchFromRepoOrCz {
+ repo = "glpng";
+ rev = "v${version}";
+ hash = "sha256-C7EHaBN0PE/HJB6zcIaYU63+o7/MEz4WU1xr/kIOanM=";
+ };
+
+ nativeBuildInputs = [
+ cmake
+ pkg-config
+ ];
+ buildInputs = [
+ libGL
+ libpng
+ zlib
+ ];
+
+ meta = with lib; {
+ homepage = "https://repo.or.cz/glpng.git/blob_plain/HEAD:/glpng.htm";
+ description = "PNG loader for OpenGL";
+ license = licenses.mit;
+ maintainers = with maintainers; [ AndersonTorres ];
+ platforms = platforms.unix;
+ };
+}
diff --git a/third_party/nixpkgs/pkgs/development/libraries/gnome-online-accounts/default.nix b/third_party/nixpkgs/pkgs/development/libraries/gnome-online-accounts/default.nix
index c5846b523c..824d5c3831 100644
--- a/third_party/nixpkgs/pkgs/development/libraries/gnome-online-accounts/default.nix
+++ b/third_party/nixpkgs/pkgs/development/libraries/gnome-online-accounts/default.nix
@@ -30,7 +30,7 @@
stdenv.mkDerivation rec {
pname = "gnome-online-accounts";
- version = "3.38.0";
+ version = "3.38.1";
# https://gitlab.gnome.org/GNOME/gnome-online-accounts/issues/87
src = fetchFromGitLab {
@@ -38,7 +38,7 @@ stdenv.mkDerivation rec {
owner = "GNOME";
repo = "gnome-online-accounts";
rev = version;
- sha256 = "sha256-NRGab/CMJxe31rr20+5wYZF2rOzoSNdztfNVojBd5ag=";
+ sha256 = "sha256-th7P++MC3GXX+349PJFEwHGGeMhxsGgoEDGnSYpY7E4=";
};
outputs = [ "out" "man" "dev" "devdoc" ];
diff --git a/third_party/nixpkgs/pkgs/development/libraries/goffice/default.nix b/third_party/nixpkgs/pkgs/development/libraries/goffice/default.nix
index d544dd7625..64b5be2e2d 100644
--- a/third_party/nixpkgs/pkgs/development/libraries/goffice/default.nix
+++ b/third_party/nixpkgs/pkgs/development/libraries/goffice/default.nix
@@ -3,13 +3,13 @@
stdenv.mkDerivation rec {
pname = "goffice";
- version = "0.10.48";
+ version = "0.10.49";
outputs = [ "out" "dev" "devdoc" ];
src = fetchurl {
url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
- sha256 = "1z6f3q8fxkd1ysqrwdxdi0844zqa00vjpf07gq8mh3kal8picfd4";
+ sha256 = "X/wY27OF7fuFtsYlS55bTLPS/6MEK5Ms286ON/SzB+k=";
};
nativeBuildInputs = [ pkg-config intltool ];
diff --git a/third_party/nixpkgs/pkgs/development/libraries/gsm/default.nix b/third_party/nixpkgs/pkgs/development/libraries/gsm/default.nix
index 13088dda0c..f70a748a20 100644
--- a/third_party/nixpkgs/pkgs/development/libraries/gsm/default.nix
+++ b/third_party/nixpkgs/pkgs/development/libraries/gsm/default.nix
@@ -18,6 +18,8 @@ stdenv.mkDerivation rec {
};
patchPhase = ''
+ substituteInPlace Makefile \
+ --replace "= gcc " "?= gcc "
# Fix include directory
sed -e 's,$(GSM_INSTALL_ROOT)/inc,$(GSM_INSTALL_ROOT)/include/gsm,' -i Makefile
'' + optionalString (!staticSupport) (
diff --git a/third_party/nixpkgs/pkgs/development/libraries/gtdialog/default.nix b/third_party/nixpkgs/pkgs/development/libraries/gtdialog/default.nix
index 0e467b2943..ac925477ad 100644
--- a/third_party/nixpkgs/pkgs/development/libraries/gtdialog/default.nix
+++ b/third_party/nixpkgs/pkgs/development/libraries/gtdialog/default.nix
@@ -9,9 +9,9 @@ let
url="https://foicica.com/gtdialog/download/gtdialog_1.4.zip";
sha256="1lhsaz56s8m838fi6vnfcd2r6djymvy3n2pbqhii88hraapq3rfk";
};
- nativeBuildInputs = [ pkg-config ];
+ nativeBuildInputs = [ pkg-config unzip ];
buildInputs = [
- cdk unzip gtk2 glib ncurses
+ cdk gtk2 glib ncurses
];
in
stdenv.mkDerivation {
diff --git a/third_party/nixpkgs/pkgs/development/libraries/gtk/2.x.nix b/third_party/nixpkgs/pkgs/development/libraries/gtk/2.x.nix
index 4304cb388d..8f50c922f5 100644
--- a/third_party/nixpkgs/pkgs/development/libraries/gtk/2.x.nix
+++ b/third_party/nixpkgs/pkgs/development/libraries/gtk/2.x.nix
@@ -1,4 +1,4 @@
-{ config, lib, stdenv, fetchurl, pkg-config, gettext, glib, atk, pango, cairo, perl, xorg
+{ config, lib, substituteAll, stdenv, fetchurl, pkg-config, gettext, glib, atk, pango, cairo, perl, xorg
, gdk-pixbuf, xlibsWrapper, gobject-introspection
, xineramaSupport ? stdenv.isLinux
, cupsSupport ? config.gtk2.cups or stdenv.isLinux, cups ? null
@@ -12,6 +12,16 @@ assert cupsSupport -> cups != null;
with lib;
+let
+
+ gtkCleanImmodulesCache = substituteAll {
+ src = ./hooks/clean-immodules-cache.sh;
+ gtk_module_path = "gtk-2.0";
+ gtk_binary_version = "2.10.0";
+ };
+
+in
+
stdenv.mkDerivation rec {
pname = "gtk+";
version = "2.24.32";
@@ -27,8 +37,8 @@ stdenv.mkDerivation rec {
enableParallelBuilding = true;
setupHooks = [
- ./hooks/gtk2-clean-immodules-cache.sh
./hooks/drop-icon-theme-cache.sh
+ gtkCleanImmodulesCache
];
nativeBuildInputs = setupHooks ++ [ perl pkg-config gettext gobject-introspection ];
diff --git a/third_party/nixpkgs/pkgs/development/libraries/gtk/3.x.nix b/third_party/nixpkgs/pkgs/development/libraries/gtk/3.x.nix
index 159b03a26e..f9d739a43e 100644
--- a/third_party/nixpkgs/pkgs/development/libraries/gtk/3.x.nix
+++ b/third_party/nixpkgs/pkgs/development/libraries/gtk/3.x.nix
@@ -1,4 +1,6 @@
-{ lib, stdenv
+{ lib
+, stdenv
+, substituteAll
, fetchurl
, fetchpatch
, pkg-config
@@ -48,6 +50,16 @@
assert cupsSupport -> cups != null;
+let
+
+ gtkCleanImmodulesCache = substituteAll {
+ src = ./hooks/clean-immodules-cache.sh;
+ gtk_module_path = "gtk-3.0";
+ gtk_binary_version = "3.0.0";
+ };
+
+in
+
stdenv.mkDerivation rec {
pname = "gtk+3";
version = "3.24.24";
@@ -56,8 +68,8 @@ stdenv.mkDerivation rec {
outputBin = "dev";
setupHooks = [
- ./hooks/gtk3-clean-immodules-cache.sh
./hooks/drop-icon-theme-cache.sh
+ gtkCleanImmodulesCache
];
src = fetchurl {
diff --git a/third_party/nixpkgs/pkgs/development/libraries/gtk/4.x.nix b/third_party/nixpkgs/pkgs/development/libraries/gtk/4.x.nix
index b05e9ea039..28247d6c97 100644
--- a/third_party/nixpkgs/pkgs/development/libraries/gtk/4.x.nix
+++ b/third_party/nixpkgs/pkgs/development/libraries/gtk/4.x.nix
@@ -1,5 +1,6 @@
{ lib
, stdenv
+, substituteAll
, fetchurl
, pkg-config
, gettext
@@ -53,6 +54,16 @@
assert cupsSupport -> cups != null;
+let
+
+ gtkCleanImmodulesCache = substituteAll {
+ src = ./hooks/clean-immodules-cache.sh;
+ gtk_module_path = "gtk-4.0";
+ gtk_binary_version = "4.0.0";
+ };
+
+in
+
stdenv.mkDerivation rec {
pname = "gtk4";
version = "4.0.3";
@@ -61,8 +72,8 @@ stdenv.mkDerivation rec {
outputBin = "dev";
setupHooks = [
- ./hooks/gtk4-clean-immodules-cache.sh
./hooks/drop-icon-theme-cache.sh
+ gtkCleanImmodulesCache
];
src = fetchurl {
diff --git a/third_party/nixpkgs/pkgs/development/libraries/gtk/hooks/clean-immodules-cache.sh b/third_party/nixpkgs/pkgs/development/libraries/gtk/hooks/clean-immodules-cache.sh
new file mode 100644
index 0000000000..0868a4a391
--- /dev/null
+++ b/third_party/nixpkgs/pkgs/development/libraries/gtk/hooks/clean-immodules-cache.sh
@@ -0,0 +1,15 @@
+# shellcheck shell=bash
+
+fixupOutputHooks+=(_gtkCleanImmodulesCache)
+
+# Clean comments that link to generator of the file
+_gtkCleanImmodulesCache() {
+ # gtk_module_path is where the modules are installed
+ # https://gitlab.gnome.org/GNOME/gtk/-/blob/3.24.24/gtk/gtkmodules.c#L68
+ # gtk_binary_version can be retrived with:
+ # pkg-config --variable=gtk_binary_version gtk+-3.0
+ local f="${prefix:?}/lib/@gtk_module_path@/@gtk_binary_version@/immodules.cache"
+ if [ -f "$f" ]; then
+ sed 's|Created by .*bin/gtk-query-|Created by bin/gtk-query-|' -i "$f"
+ fi
+}
diff --git a/third_party/nixpkgs/pkgs/development/libraries/gtk/hooks/gtk2-clean-immodules-cache.sh b/third_party/nixpkgs/pkgs/development/libraries/gtk/hooks/gtk2-clean-immodules-cache.sh
deleted file mode 100644
index dde991fd27..0000000000
--- a/third_party/nixpkgs/pkgs/development/libraries/gtk/hooks/gtk2-clean-immodules-cache.sh
+++ /dev/null
@@ -1,12 +0,0 @@
-# shellcheck shell=bash
-
-fixupOutputHooks+=(_gtk2CleanComments)
-
-# Clean comments that link to generator of the file
-_gtk2CleanComments() {
- local f="${prefix:?}/lib/gtk-2.0/2.10.0/immodules.cache"
- if [ -f "$f" ]; then
- sed 's|Created by .*bin/gtk-query-|Created by bin/gtk-query-|' -i "$f"
- fi
-}
-
diff --git a/third_party/nixpkgs/pkgs/development/libraries/gtk/hooks/gtk3-clean-immodules-cache.sh b/third_party/nixpkgs/pkgs/development/libraries/gtk/hooks/gtk3-clean-immodules-cache.sh
deleted file mode 100644
index d2d5287831..0000000000
--- a/third_party/nixpkgs/pkgs/development/libraries/gtk/hooks/gtk3-clean-immodules-cache.sh
+++ /dev/null
@@ -1,11 +0,0 @@
-# shellcheck shell=bash
-
-fixupOutputHooks+=(_gtk3CleanComments)
-
-# Clean comments that link to generator of the file
-_gtk3CleanComments() {
- local f="${prefix:?}/lib/gtk-3.0/3.0.0/immodules.cache"
- if [ -f "$f" ]; then
- sed 's|Created by .*bin/gtk-query-|Created by bin/gtk-query-|' -i "$f"
- fi
-}
diff --git a/third_party/nixpkgs/pkgs/development/libraries/gtk/hooks/gtk4-clean-immodules-cache.sh b/third_party/nixpkgs/pkgs/development/libraries/gtk/hooks/gtk4-clean-immodules-cache.sh
deleted file mode 100644
index 49f7051aab..0000000000
--- a/third_party/nixpkgs/pkgs/development/libraries/gtk/hooks/gtk4-clean-immodules-cache.sh
+++ /dev/null
@@ -1,11 +0,0 @@
-# shellcheck shell=bash
-
-fixupOutputHooks+=(_gtk4CleanComments)
-
-# Clean comments that link to generator of the file
-_gtk4CleanComments() {
- local f="${prefix:?}/lib/gtk-4.0/4.0.0/immodules.cache"
- if [ -f "$f" ]; then
- sed 's|Created by .*bin/gtk-query-|Created by bin/gtk-query-|' -i "$f"
- fi
-}
diff --git a/third_party/nixpkgs/pkgs/development/libraries/gtkd/default.nix b/third_party/nixpkgs/pkgs/development/libraries/gtkd/default.nix
index ccaceabd4e..a3aa18b058 100644
--- a/third_party/nixpkgs/pkgs/development/libraries/gtkd/default.nix
+++ b/third_party/nixpkgs/pkgs/development/libraries/gtkd/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, fetchzip, fetchpatch, atk, cairo, dmd, gdk-pixbuf, gnome3, gst_all_1, librsvg
+{ lib, stdenv, fetchzip, fetchpatch, atk, cairo, ldc, gdk-pixbuf, gnome3, gst_all_1, librsvg
, glib, gtk3, gtksourceview4, libgda, libpeas, pango, pkg-config, which, vte }:
let
@@ -15,7 +15,7 @@ in stdenv.mkDerivation rec {
stripRoot = false;
};
- nativeBuildInputs = [ dmd pkg-config which ];
+ nativeBuildInputs = [ ldc pkg-config which ];
propagatedBuildInputs = [
atk cairo gdk-pixbuf glib gstreamer gst-plugins-base gtk3 gtksourceview4
libgda libpeas librsvg pango vte
diff --git a/third_party/nixpkgs/pkgs/development/libraries/hawknl/default.nix b/third_party/nixpkgs/pkgs/development/libraries/hawknl/default.nix
index 0525fcd0eb..aacdf0ee93 100644
--- a/third_party/nixpkgs/pkgs/development/libraries/hawknl/default.nix
+++ b/third_party/nixpkgs/pkgs/development/libraries/hawknl/default.nix
@@ -8,7 +8,7 @@ stdenv.mkDerivation {
sha256 = "11shn2fbxj3w0j77w0234pqyj1368x686kkgv09q5yqhi1cdp028";
};
- buildInputs = [ unzip ];
+ nativeBuildInputs = [ unzip ];
makefile = "makefile.linux";
diff --git a/third_party/nixpkgs/pkgs/development/libraries/herqq/default.nix b/third_party/nixpkgs/pkgs/development/libraries/herqq/default.nix
index 265289f06f..f35d7528f4 100644
--- a/third_party/nixpkgs/pkgs/development/libraries/herqq/default.nix
+++ b/third_party/nixpkgs/pkgs/development/libraries/herqq/default.nix
@@ -4,8 +4,8 @@ mkDerivation rec {
version = "unstable-20-06-26";
pname = "herqq";
- nativeBuildInputs = [ qmake ];
- buildInputs = [ qtbase unzip qtmultimedia ];
+ nativeBuildInputs = [ qmake unzip ];
+ buildInputs = [ qtbase qtmultimedia ];
outputs = [ "out" "dev" ];
diff --git a/third_party/nixpkgs/pkgs/development/libraries/hunspell/dictionaries.nix b/third_party/nixpkgs/pkgs/development/libraries/hunspell/dictionaries.nix
index 00d0933bdd..37b5678963 100644
--- a/third_party/nixpkgs/pkgs/development/libraries/hunspell/dictionaries.nix
+++ b/third_party/nixpkgs/pkgs/development/libraries/hunspell/dictionaries.nix
@@ -45,7 +45,8 @@ let
platforms = platforms.all;
};
phases = "unpackPhase patchPhase buildPhase installPhase";
- buildInputs = [ bash coreutils unzip which zip ];
+ nativeBuildInputs = [ unzip ];
+ buildInputs = [ bash coreutils which zip ];
patchPhase = ''
substituteInPlace ortograf/herramientas/make_dict.sh \
--replace /bin/bash bash \
@@ -86,7 +87,7 @@ let
license = licenses.lgpl3;
platforms = platforms.all;
};
- buildInputs = [ unzip ];
+ nativeBuildInputs = [ unzip ];
phases = "unpackPhase installPhase";
sourceRoot = ".";
unpackCmd = ''
@@ -126,7 +127,7 @@ let
maintainers = with maintainers; [ renzo ];
platforms = platforms.all;
};
- buildInputs = [ unzip ];
+ nativeBuildInputs = [ unzip ];
phases = "unpackPhase installPhase";
sourceRoot = ".";
unpackCmd = ''
@@ -155,7 +156,7 @@ let
maintainers = with maintainers; [ renzo ];
platforms = platforms.all;
};
- buildInputs = [ unzip ];
+ nativeBuildInputs = [ unzip ];
phases = "unpackPhase installPhase";
sourceRoot = ".";
unpackCmd = ''
@@ -182,7 +183,7 @@ let
maintainers = with maintainers; [ renzo ];
platforms = platforms.all;
};
- buildInputs = [ unzip ];
+ nativeBuildInputs = [ unzip ];
phases = "unpackPhase patchPhase installPhase";
sourceRoot = ".";
prePatch = ''
diff --git a/third_party/nixpkgs/pkgs/development/libraries/hwloc/default.nix b/third_party/nixpkgs/pkgs/development/libraries/hwloc/default.nix
index 6a939835cf..a6fb316d65 100644
--- a/third_party/nixpkgs/pkgs/development/libraries/hwloc/default.nix
+++ b/third_party/nixpkgs/pkgs/development/libraries/hwloc/default.nix
@@ -7,7 +7,7 @@ assert x11Support -> libX11 != null && cairo != null;
with lib;
let
- version = "2.4.0";
+ version = "2.4.1";
versmm = versions.major version + "." + versions.minor version;
name = "hwloc-${version}";
@@ -16,7 +16,7 @@ in stdenv.mkDerivation {
src = fetchurl {
url = "https://www.open-mpi.org/software/hwloc/v${versmm}/downloads/${name}.tar.bz2";
- sha256 = "1s9q70mrr4igbjw4m26din81i68f4wbfpv6wdc4i2aalvd51n7rb";
+ sha256 = "sha256-OSQh5p8mEgyKuV0VH+mJ8rS2nas8dzV0HE4KbX3l3mM=";
};
configureFlags = [
diff --git a/third_party/nixpkgs/pkgs/development/libraries/irrlicht/default.nix b/third_party/nixpkgs/pkgs/development/libraries/irrlicht/default.nix
index e283a29094..6331084597 100644
--- a/third_party/nixpkgs/pkgs/development/libraries/irrlicht/default.nix
+++ b/third_party/nixpkgs/pkgs/development/libraries/irrlicht/default.nix
@@ -27,7 +27,8 @@ stdenv.mkDerivation rec {
mkdir -p $out/lib
'';
- buildInputs = [ unzip libGLU libGL libXrandr libX11 libXxf86vm ];
+ nativeBuildInputs = [ unzip ];
+ buildInputs = [ libGLU libGL libXrandr libX11 libXxf86vm ];
meta = {
homepage = "http://irrlicht.sourceforge.net/";
diff --git a/third_party/nixpkgs/pkgs/development/libraries/irrlicht/mac.nix b/third_party/nixpkgs/pkgs/development/libraries/irrlicht/mac.nix
index b41486ce9d..1235941b2d 100644
--- a/third_party/nixpkgs/pkgs/development/libraries/irrlicht/mac.nix
+++ b/third_party/nixpkgs/pkgs/development/libraries/irrlicht/mac.nix
@@ -31,8 +31,8 @@ stdenv.mkDerivation rec {
"-DIRRLICHT_BUILD_TOOLS=OFF"
];
- nativeBuildInputs = [ cmake ];
- buildInputs = [ unzip OpenGL Cocoa IOKit ];
+ nativeBuildInputs = [ cmake unzip ];
+ buildInputs = [ OpenGL Cocoa IOKit ];
meta = {
homepage = "http://irrlicht.sourceforge.net/";
diff --git a/third_party/nixpkgs/pkgs/development/libraries/jama/default.nix b/third_party/nixpkgs/pkgs/development/libraries/jama/default.nix
index 02dd4a5635..30044eb2cc 100644
--- a/third_party/nixpkgs/pkgs/development/libraries/jama/default.nix
+++ b/third_party/nixpkgs/pkgs/development/libraries/jama/default.nix
@@ -9,7 +9,7 @@ stdenv.mkDerivation rec {
sha256 = "031ns526fvi2nv7jzzv02i7i5sjcyr0gj884i3an67qhsx8vyckl";
};
- buildInputs = [ unzip ];
+ nativeBuildInputs = [ unzip ];
propagatedBuildInputs = [ tnt ];
unpackPhase = ''
diff --git a/third_party/nixpkgs/pkgs/development/libraries/java/geoipjava/default.nix b/third_party/nixpkgs/pkgs/development/libraries/java/geoipjava/default.nix
index 4d9902cbbe..0e5b1084b4 100644
--- a/third_party/nixpkgs/pkgs/development/libraries/java/geoipjava/default.nix
+++ b/third_party/nixpkgs/pkgs/development/libraries/java/geoipjava/default.nix
@@ -6,7 +6,8 @@ stdenv.mkDerivation {
url = "https://geolite.maxmind.com/download/geoip/api/java/GeoIPJava-1.2.5.zip";
sha256 = "1gb2d0qvvq7xankz7l7ymbr3qprwk9bifpy4hlgw0sq4i6a55ypd";
};
- buildInputs = [ jdk unzip ];
+ nativeBuildInputs = [ unzip ];
+ buildInputs = [ jdk ];
buildPhase =
''
cd source
diff --git a/third_party/nixpkgs/pkgs/development/libraries/java/rhino/default.nix b/third_party/nixpkgs/pkgs/development/libraries/java/rhino/default.nix
index d34787d8b1..bc50f02065 100644
--- a/third_party/nixpkgs/pkgs/development/libraries/java/rhino/default.nix
+++ b/third_party/nixpkgs/pkgs/development/libraries/java/rhino/default.nix
@@ -31,7 +31,8 @@ stdenv.mkDerivation {
ln -sv "${xbeans}" "build/tmp-xbean/xbean.zip"
'';
- buildInputs = [ unzip ant javac jvm ];
+ nativeBuildInputs = [ unzip ];
+ buildInputs = [ ant javac jvm ];
buildPhase = "ant jar";
doCheck = false;
diff --git a/third_party/nixpkgs/pkgs/development/libraries/kde-frameworks/attica.nix b/third_party/nixpkgs/pkgs/development/libraries/kde-frameworks/attica.nix
index 0766a589a2..4cb2e8e958 100644
--- a/third_party/nixpkgs/pkgs/development/libraries/kde-frameworks/attica.nix
+++ b/third_party/nixpkgs/pkgs/development/libraries/kde-frameworks/attica.nix
@@ -4,7 +4,7 @@ mkDerivation {
name = "attica";
meta = {
maintainers = [ lib.maintainers.ttuegel ];
- broken = builtins.compareVersions qtbase.version "5.7.0" < 0;
+ broken = builtins.compareVersions qtbase.version "5.14.0" < 0;
};
nativeBuildInputs = [ extra-cmake-modules ];
buildInputs = [ qtbase ];
diff --git a/third_party/nixpkgs/pkgs/development/libraries/kde-frameworks/fetch.sh b/third_party/nixpkgs/pkgs/development/libraries/kde-frameworks/fetch.sh
index 01d6a7ba2b..3ce0ca063c 100644
--- a/third_party/nixpkgs/pkgs/development/libraries/kde-frameworks/fetch.sh
+++ b/third_party/nixpkgs/pkgs/development/libraries/kde-frameworks/fetch.sh
@@ -1 +1 @@
-WGET_ARGS=( https://download.kde.org/stable/frameworks/5.78/ -A '*.tar.xz' )
+WGET_ARGS=( https://download.kde.org/stable/frameworks/5.79/ -A '*.tar.xz' )
diff --git a/third_party/nixpkgs/pkgs/development/libraries/kde-frameworks/karchive.nix b/third_party/nixpkgs/pkgs/development/libraries/kde-frameworks/karchive.nix
index 8c55f8da6a..a5f499e674 100644
--- a/third_party/nixpkgs/pkgs/development/libraries/kde-frameworks/karchive.nix
+++ b/third_party/nixpkgs/pkgs/development/libraries/kde-frameworks/karchive.nix
@@ -8,7 +8,7 @@ mkDerivation {
name = "karchive";
meta = {
maintainers = [ lib.maintainers.ttuegel ];
- broken = builtins.compareVersions qtbase.version "5.7.0" < 0;
+ broken = builtins.compareVersions qtbase.version "5.14.0" < 0;
};
nativeBuildInputs = [ extra-cmake-modules ];
buildInputs = [ bzip2 lzma zlib ];
diff --git a/third_party/nixpkgs/pkgs/development/libraries/kde-frameworks/kcodecs.nix b/third_party/nixpkgs/pkgs/development/libraries/kde-frameworks/kcodecs.nix
index 978db644a5..357c0e1d11 100644
--- a/third_party/nixpkgs/pkgs/development/libraries/kde-frameworks/kcodecs.nix
+++ b/third_party/nixpkgs/pkgs/development/libraries/kde-frameworks/kcodecs.nix
@@ -4,7 +4,7 @@ mkDerivation {
name = "kcodecs";
meta = {
maintainers = [ lib.maintainers.ttuegel ];
- broken = builtins.compareVersions qtbase.version "5.7.0" < 0;
+ broken = builtins.compareVersions qtbase.version "5.14.0" < 0;
};
nativeBuildInputs = [ extra-cmake-modules ];
buildInputs = [ qttools gperf ];
diff --git a/third_party/nixpkgs/pkgs/development/libraries/kde-frameworks/kcompletion.nix b/third_party/nixpkgs/pkgs/development/libraries/kde-frameworks/kcompletion.nix
index 26e5a83dc2..fdfe28db6c 100644
--- a/third_party/nixpkgs/pkgs/development/libraries/kde-frameworks/kcompletion.nix
+++ b/third_party/nixpkgs/pkgs/development/libraries/kde-frameworks/kcompletion.nix
@@ -1,5 +1,5 @@
{
- mkDerivation, lib, fetchpatch,
+ mkDerivation, lib,
extra-cmake-modules,
kconfig, kwidgetsaddons, qtbase, qttools
}:
@@ -7,13 +7,6 @@
mkDerivation {
name = "kcompletion";
meta = { maintainers = [ lib.maintainers.ttuegel ]; };
- patches = [
- # https://mail.kde.org/pipermail/distributions/2021-January/000928.html
- (fetchpatch {
- url = "https://invent.kde.org/frameworks/kcompletion/commit/7acda936f06193e9fc85ae5cf9ccc8d65971f657.patch";
- sha256 = "150ff506rhr5pin5363ks222vhv8qd77y5s5nyylcbdjry3ljd3n";
- })
- ];
nativeBuildInputs = [ extra-cmake-modules ];
buildInputs = [ kconfig kwidgetsaddons qttools ];
propagatedBuildInputs = [ qtbase ];
diff --git a/third_party/nixpkgs/pkgs/development/libraries/kde-frameworks/kconfig.nix b/third_party/nixpkgs/pkgs/development/libraries/kde-frameworks/kconfig.nix
index 2650843aa5..94f4cb0480 100644
--- a/third_party/nixpkgs/pkgs/development/libraries/kde-frameworks/kconfig.nix
+++ b/third_party/nixpkgs/pkgs/development/libraries/kde-frameworks/kconfig.nix
@@ -4,7 +4,7 @@ mkDerivation {
name = "kconfig";
meta = {
maintainers = [ lib.maintainers.ttuegel ];
- broken = builtins.compareVersions qtbase.version "5.7.0" < 0;
+ broken = builtins.compareVersions qtbase.version "5.14.0" < 0;
};
nativeBuildInputs = [ extra-cmake-modules ];
buildInputs = [ qttools ];
diff --git a/third_party/nixpkgs/pkgs/development/libraries/kde-frameworks/kcoreaddons.nix b/third_party/nixpkgs/pkgs/development/libraries/kde-frameworks/kcoreaddons.nix
index d5a407ee16..6f2e3f9238 100644
--- a/third_party/nixpkgs/pkgs/development/libraries/kde-frameworks/kcoreaddons.nix
+++ b/third_party/nixpkgs/pkgs/development/libraries/kde-frameworks/kcoreaddons.nix
@@ -8,7 +8,7 @@ mkDerivation {
name = "kcoreaddons";
meta = {
maintainers = [ lib.maintainers.ttuegel ];
- broken = builtins.compareVersions qtbase.version "5.7.0" < 0;
+ broken = builtins.compareVersions qtbase.version "5.14.0" < 0;
};
nativeBuildInputs = [ extra-cmake-modules ];
buildInputs = [ qttools shared-mime-info ];
diff --git a/third_party/nixpkgs/pkgs/development/libraries/kde-frameworks/kdbusaddons.nix b/third_party/nixpkgs/pkgs/development/libraries/kde-frameworks/kdbusaddons.nix
index c94167d5d7..b497ebe1c8 100644
--- a/third_party/nixpkgs/pkgs/development/libraries/kde-frameworks/kdbusaddons.nix
+++ b/third_party/nixpkgs/pkgs/development/libraries/kde-frameworks/kdbusaddons.nix
@@ -8,7 +8,7 @@ mkDerivation {
name = "kdbusaddons";
meta = {
maintainers = [ lib.maintainers.ttuegel ];
- broken = builtins.compareVersions qtbase.version "5.7.0" < 0;
+ broken = builtins.compareVersions qtbase.version "5.14.0" < 0;
};
nativeBuildInputs = [ extra-cmake-modules ];
buildInputs = [ qttools qtx11extras ];
diff --git a/third_party/nixpkgs/pkgs/development/libraries/kde-frameworks/kdesu/kdesu-search-for-wrapped-daemon-first.patch b/third_party/nixpkgs/pkgs/development/libraries/kde-frameworks/kdesu/kdesu-search-for-wrapped-daemon-first.patch
index f82bf828e8..07da70092d 100644
--- a/third_party/nixpkgs/pkgs/development/libraries/kde-frameworks/kdesu/kdesu-search-for-wrapped-daemon-first.patch
+++ b/third_party/nixpkgs/pkgs/development/libraries/kde-frameworks/kdesu/kdesu-search-for-wrapped-daemon-first.patch
@@ -17,14 +17,14 @@ index 44fbacd..6b5abf5 100644
static QString findDaemon()
{
-- QString daemon = QFile::decodeName(CMAKE_INSTALL_FULL_LIBEXECDIR_KF5 "/kdesud");
+- QString daemon = QFile::decodeName(KDE_INSTALL_FULL_LIBEXECDIR_KF5 "/kdesud");
- if (!QFile::exists(daemon)) { // if not in libexec, find it in PATH
- daemon = QStandardPaths::findExecutable(QStringLiteral("kdesud"));
- if (daemon.isEmpty()) {
- qCWarning(KSU_LOG) << "kdesud daemon not found.";
+ QString daemon = QFile::decodeName("/run/wrappers/bin/kdesud");
+ if (!QFile::exists(daemon)) { // if not in wrappers
-+ daemon = QFile::decodeName(CMAKE_INSTALL_FULL_LIBEXECDIR_KF5 "/kdesud");
++ daemon = QFile::decodeName(KDE_INSTALL_FULL_LIBEXECDIR_KF5 "/kdesud");
+ if (!QFile::exists(daemon)) { // if not in libexec, find it in PATH
+ daemon = QStandardPaths::findExecutable(QStringLiteral("kdesud"));
+ if (daemon.isEmpty()) {
diff --git a/third_party/nixpkgs/pkgs/development/libraries/kde-frameworks/kdnssd.nix b/third_party/nixpkgs/pkgs/development/libraries/kde-frameworks/kdnssd.nix
index 9e2f827eff..b4dabba624 100644
--- a/third_party/nixpkgs/pkgs/development/libraries/kde-frameworks/kdnssd.nix
+++ b/third_party/nixpkgs/pkgs/development/libraries/kde-frameworks/kdnssd.nix
@@ -8,7 +8,7 @@ mkDerivation {
name = "kdnssd";
meta = {
maintainers = [ lib.maintainers.ttuegel ];
- broken = builtins.compareVersions qtbase.version "5.7.0" < 0;
+ broken = builtins.compareVersions qtbase.version "5.14.0" < 0;
};
nativeBuildInputs = [ extra-cmake-modules ];
buildInputs = [ avahi qttools ];
diff --git a/third_party/nixpkgs/pkgs/development/libraries/kde-frameworks/kfilemetadata/cmake-install-paths.patch b/third_party/nixpkgs/pkgs/development/libraries/kde-frameworks/kfilemetadata/cmake-install-paths.patch
index 732f7b69c8..daeaf222b6 100644
--- a/third_party/nixpkgs/pkgs/development/libraries/kde-frameworks/kfilemetadata/cmake-install-paths.patch
+++ b/third_party/nixpkgs/pkgs/development/libraries/kde-frameworks/kfilemetadata/cmake-install-paths.patch
@@ -6,7 +6,7 @@ Index: kfilemetadata-5.18.0/src/CMakeLists.txt
install(EXPORT KF5FileMetaDataTargets
NAMESPACE KF5::
-- DESTINATION ${LIB_INSTALL_DIR}/cmake/KF5FileMetaData
+- DESTINATION ${KDE_INSTALL_LIBDIR}/cmake/KF5FileMetaData
+ DESTINATION ${KDE_INSTALL_FULL_CMAKEPACKAGEDIR}/KF5FileMetaData
FILE KF5FileMetaDataTargets.cmake)
diff --git a/third_party/nixpkgs/pkgs/development/libraries/kde-frameworks/ki18n.nix b/third_party/nixpkgs/pkgs/development/libraries/kde-frameworks/ki18n.nix
index 69ad2fbc73..0733abc869 100644
--- a/third_party/nixpkgs/pkgs/development/libraries/kde-frameworks/ki18n.nix
+++ b/third_party/nixpkgs/pkgs/development/libraries/kde-frameworks/ki18n.nix
@@ -8,7 +8,7 @@ mkDerivation {
name = "ki18n";
meta = {
maintainers = [ lib.maintainers.ttuegel ];
- broken = builtins.compareVersions qtbase.version "5.7.0" < 0;
+ broken = builtins.compareVersions qtbase.version "5.14.0" < 0;
};
nativeBuildInputs = [ extra-cmake-modules ];
propagatedNativeBuildInputs = [ gettext python3 ];
diff --git a/third_party/nixpkgs/pkgs/development/libraries/kde-frameworks/kidletime.nix b/third_party/nixpkgs/pkgs/development/libraries/kde-frameworks/kidletime.nix
index a1e53bb408..883ef2862e 100644
--- a/third_party/nixpkgs/pkgs/development/libraries/kde-frameworks/kidletime.nix
+++ b/third_party/nixpkgs/pkgs/development/libraries/kde-frameworks/kidletime.nix
@@ -8,7 +8,7 @@ mkDerivation {
name = "kidletime";
meta = {
maintainers = [ lib.maintainers.ttuegel ];
- broken = builtins.compareVersions qtbase.version "5.7.0" < 0;
+ broken = builtins.compareVersions qtbase.version "5.14.0" < 0;
};
nativeBuildInputs = [ extra-cmake-modules ];
buildInputs = [ qtx11extras ];
diff --git a/third_party/nixpkgs/pkgs/development/libraries/kde-frameworks/kinit/0001-kinit-libpath.patch b/third_party/nixpkgs/pkgs/development/libraries/kde-frameworks/kinit/0001-kinit-libpath.patch
index 21477394c9..a3e4014df5 100644
--- a/third_party/nixpkgs/pkgs/development/libraries/kde-frameworks/kinit/0001-kinit-libpath.patch
+++ b/third_party/nixpkgs/pkgs/development/libraries/kde-frameworks/kinit/0001-kinit-libpath.patch
@@ -20,7 +20,7 @@ index 8fff17a..0801b75 100644
- // https://sourceware.org/bugzilla/show_bug.cgi?id=13945
- // - so we try hacking it in ourselves
- QString install_lib_dir = QFile::decodeName(
-- CMAKE_INSTALL_PREFIX "/" LIB_INSTALL_DIR "/");
+- CMAKE_INSTALL_PREFIX "/" KDE_INSTALL_LIBDIR "/");
- QString orig_libpath = libpath;
- libpath = install_lib_dir + libpath;
- l.setFileName(libpath);
diff --git a/third_party/nixpkgs/pkgs/development/libraries/kde-frameworks/kinit/0002-start_kdeinit-path.patch b/third_party/nixpkgs/pkgs/development/libraries/kde-frameworks/kinit/0002-start_kdeinit-path.patch
index bf25b98d6c..3728c3c58b 100644
--- a/third_party/nixpkgs/pkgs/development/libraries/kde-frameworks/kinit/0002-start_kdeinit-path.patch
+++ b/third_party/nixpkgs/pkgs/development/libraries/kde-frameworks/kinit/0002-start_kdeinit-path.patch
@@ -15,7 +15,7 @@ index 891f50c..ef664ad 100644
#include
#include
--#define EXECUTE CMAKE_INSTALL_FULL_LIBEXECDIR_KF5 "/start_kdeinit"
+-#define EXECUTE KDE_INSTALL_FULL_LIBEXECDIR_KF5 "/start_kdeinit"
+#define EXECUTE "/run/wrappers/bin/start_kdeinit"
#if KDEINIT_OOM_PROTECT
diff --git a/third_party/nixpkgs/pkgs/development/libraries/kde-frameworks/kinit/0003-kdeinit-extra-libs.patch b/third_party/nixpkgs/pkgs/development/libraries/kde-frameworks/kinit/0003-kdeinit-extra-libs.patch
index 9df8505b29..499c975a9e 100644
--- a/third_party/nixpkgs/pkgs/development/libraries/kde-frameworks/kinit/0003-kdeinit-extra-libs.patch
+++ b/third_party/nixpkgs/pkgs/development/libraries/kde-frameworks/kinit/0003-kdeinit-extra-libs.patch
@@ -33,7 +33,7 @@ index 0801b75..622dd5f 100644
-// Completely unrelated to plugins.
-static QString findSharedLib(const QString &lib)
-{
-- QString path = QFile::decodeName(CMAKE_INSTALL_PREFIX "/" LIB_INSTALL_DIR "/") + lib;
+- QString path = QFile::decodeName(CMAKE_INSTALL_PREFIX "/" KDE_INSTALL_LIBDIR "/") + lib;
- if (QFile::exists(path)) {
- return path;
- }
diff --git a/third_party/nixpkgs/pkgs/development/libraries/kde-frameworks/kio/default.nix b/third_party/nixpkgs/pkgs/development/libraries/kde-frameworks/kio/default.nix
index 642151913d..f4d771ab75 100644
--- a/third_party/nixpkgs/pkgs/development/libraries/kde-frameworks/kio/default.nix
+++ b/third_party/nixpkgs/pkgs/development/libraries/kde-frameworks/kio/default.nix
@@ -24,10 +24,5 @@ mkDerivation {
patches = [
./samba-search-path.patch
./kio-debug-module-loader.patch
- # https://mail.kde.org/pipermail/distributions/2021-February/000938.html
- (fetchpatch {
- url = "https://invent.kde.org/frameworks/kio/commit/a183dd0d1ee0659e5341c7cb4117df27edd6f125.patch";
- sha256 = "1msnzi93zggxgarx962gnlz1slx13nc3l54wib3rdlj0xnnlfdnd";
- })
- ];
+ ];
}
diff --git a/third_party/nixpkgs/pkgs/development/libraries/kde-frameworks/kirigami2.nix b/third_party/nixpkgs/pkgs/development/libraries/kde-frameworks/kirigami2.nix
index 751e3d7b73..60cef70486 100644
--- a/third_party/nixpkgs/pkgs/development/libraries/kde-frameworks/kirigami2.nix
+++ b/third_party/nixpkgs/pkgs/development/libraries/kde-frameworks/kirigami2.nix
@@ -3,7 +3,7 @@
mkDerivation {
name = "kirigami2";
meta = {
- broken = builtins.compareVersions qtbase.version "5.7.0" < 0;
+ broken = builtins.compareVersions qtbase.version "5.14.0" < 0;
};
nativeBuildInputs = [ extra-cmake-modules ];
buildInputs = [ qtbase qtquickcontrols2 qttranslations qtgraphicaleffects ];
diff --git a/third_party/nixpkgs/pkgs/development/libraries/kde-frameworks/kitemmodels.nix b/third_party/nixpkgs/pkgs/development/libraries/kde-frameworks/kitemmodels.nix
index 91bc3e2b98..c3266a21c0 100644
--- a/third_party/nixpkgs/pkgs/development/libraries/kde-frameworks/kitemmodels.nix
+++ b/third_party/nixpkgs/pkgs/development/libraries/kde-frameworks/kitemmodels.nix
@@ -8,7 +8,7 @@ mkDerivation {
name = "kitemmodels";
meta = {
maintainers = [ lib.maintainers.ttuegel ];
- broken = builtins.compareVersions qtbase.version "5.7.0" < 0;
+ broken = builtins.compareVersions qtbase.version "5.14.0" < 0;
};
nativeBuildInputs = [ extra-cmake-modules ];
propagatedBuildInputs = [ qtbase ];
diff --git a/third_party/nixpkgs/pkgs/development/libraries/kde-frameworks/kitemviews.nix b/third_party/nixpkgs/pkgs/development/libraries/kde-frameworks/kitemviews.nix
index 004d1ac77a..eeed5c703a 100644
--- a/third_party/nixpkgs/pkgs/development/libraries/kde-frameworks/kitemviews.nix
+++ b/third_party/nixpkgs/pkgs/development/libraries/kde-frameworks/kitemviews.nix
@@ -8,7 +8,7 @@ mkDerivation {
name = "kitemviews";
meta = {
maintainers = [ lib.maintainers.ttuegel ];
- broken = builtins.compareVersions qtbase.version "5.7.0" < 0;
+ broken = builtins.compareVersions qtbase.version "5.14.0" < 0;
};
nativeBuildInputs = [ extra-cmake-modules ];
buildInputs = [ qttools ];
diff --git a/third_party/nixpkgs/pkgs/development/libraries/kde-frameworks/kplotting.nix b/third_party/nixpkgs/pkgs/development/libraries/kde-frameworks/kplotting.nix
index 1774b044b1..f1c99e0c93 100644
--- a/third_party/nixpkgs/pkgs/development/libraries/kde-frameworks/kplotting.nix
+++ b/third_party/nixpkgs/pkgs/development/libraries/kde-frameworks/kplotting.nix
@@ -6,7 +6,7 @@ mkDerivation {
name = "kplotting";
meta = {
maintainers = [ lib.maintainers.ttuegel ];
- broken = builtins.compareVersions qtbase.version "5.7.0" < 0;
+ broken = builtins.compareVersions qtbase.version "5.14.0" < 0;
};
nativeBuildInputs = [ extra-cmake-modules ];
propagatedBuildInputs = [ qtbase qttools ];
diff --git a/third_party/nixpkgs/pkgs/development/libraries/kde-frameworks/kwayland.nix b/third_party/nixpkgs/pkgs/development/libraries/kde-frameworks/kwayland.nix
index 36e0ddc3f9..5b73cc7fce 100644
--- a/third_party/nixpkgs/pkgs/development/libraries/kde-frameworks/kwayland.nix
+++ b/third_party/nixpkgs/pkgs/development/libraries/kde-frameworks/kwayland.nix
@@ -8,7 +8,7 @@ mkDerivation {
name = "kwayland";
meta = {
maintainers = [ lib.maintainers.ttuegel ];
- broken = builtins.compareVersions qtbase.version "5.7.0" < 0;
+ broken = builtins.compareVersions qtbase.version "5.14.0" < 0;
};
nativeBuildInputs = [ extra-cmake-modules ];
buildInputs = [ plasma-wayland-protocols wayland wayland-protocols ];
diff --git a/third_party/nixpkgs/pkgs/development/libraries/kde-frameworks/kwidgetsaddons.nix b/third_party/nixpkgs/pkgs/development/libraries/kde-frameworks/kwidgetsaddons.nix
index 63a95bc217..821c703a58 100644
--- a/third_party/nixpkgs/pkgs/development/libraries/kde-frameworks/kwidgetsaddons.nix
+++ b/third_party/nixpkgs/pkgs/development/libraries/kde-frameworks/kwidgetsaddons.nix
@@ -8,7 +8,7 @@ mkDerivation {
name = "kwidgetsaddons";
meta = {
maintainers = [ lib.maintainers.ttuegel ];
- broken = builtins.compareVersions qtbase.version "5.7.0" < 0;
+ broken = builtins.compareVersions qtbase.version "5.14.0" < 0;
};
nativeBuildInputs = [ extra-cmake-modules ];
buildInputs = [ qttools ];
diff --git a/third_party/nixpkgs/pkgs/development/libraries/kde-frameworks/kwindowsystem/default.nix b/third_party/nixpkgs/pkgs/development/libraries/kde-frameworks/kwindowsystem/default.nix
index ab93966c0a..c418ca3943 100644
--- a/third_party/nixpkgs/pkgs/development/libraries/kde-frameworks/kwindowsystem/default.nix
+++ b/third_party/nixpkgs/pkgs/development/libraries/kde-frameworks/kwindowsystem/default.nix
@@ -9,7 +9,7 @@ mkDerivation {
name = "kwindowsystem";
meta = {
maintainers = [ lib.maintainers.ttuegel ];
- broken = lib.versionOlder qtbase.version "5.7.0";
+ broken = lib.versionOlder qtbase.version "5.14.0";
};
nativeBuildInputs = [ extra-cmake-modules ];
buildInputs = [ libpthreadstubs libXdmcp qttools qtx11extras ];
diff --git a/third_party/nixpkgs/pkgs/development/libraries/kde-frameworks/solid.nix b/third_party/nixpkgs/pkgs/development/libraries/kde-frameworks/solid.nix
index d1beb03fa6..f769f76854 100644
--- a/third_party/nixpkgs/pkgs/development/libraries/kde-frameworks/solid.nix
+++ b/third_party/nixpkgs/pkgs/development/libraries/kde-frameworks/solid.nix
@@ -8,7 +8,7 @@ mkDerivation {
name = "solid";
meta = {
maintainers = [ lib.maintainers.ttuegel ];
- broken = builtins.compareVersions qtbase.version "5.7.0" < 0;
+ broken = builtins.compareVersions qtbase.version "5.14.0" < 0;
};
nativeBuildInputs = [ bison extra-cmake-modules flex media-player-info ];
buildInputs = [ qtdeclarative qttools ];
diff --git a/third_party/nixpkgs/pkgs/development/libraries/kde-frameworks/sonnet.nix b/third_party/nixpkgs/pkgs/development/libraries/kde-frameworks/sonnet.nix
index 5659aaf696..431e4b8105 100644
--- a/third_party/nixpkgs/pkgs/development/libraries/kde-frameworks/sonnet.nix
+++ b/third_party/nixpkgs/pkgs/development/libraries/kde-frameworks/sonnet.nix
@@ -7,7 +7,7 @@ mkDerivation {
name = "sonnet";
meta = {
maintainers = [ lib.maintainers.ttuegel ];
- broken = builtins.compareVersions qtbase.version "5.7.0" < 0;
+ broken = builtins.compareVersions qtbase.version "5.14.0" < 0;
};
nativeBuildInputs = [ extra-cmake-modules ];
buildInputs = [ aspell qttools ];
diff --git a/third_party/nixpkgs/pkgs/development/libraries/kde-frameworks/srcs.nix b/third_party/nixpkgs/pkgs/development/libraries/kde-frameworks/srcs.nix
index 8701a43b4d..871c15d6c1 100644
--- a/third_party/nixpkgs/pkgs/development/libraries/kde-frameworks/srcs.nix
+++ b/third_party/nixpkgs/pkgs/development/libraries/kde-frameworks/srcs.nix
@@ -4,667 +4,667 @@
{
attica = {
- version = "5.78.0";
+ version = "5.79.0";
src = fetchurl {
- url = "${mirror}/stable/frameworks/5.78/attica-5.78.0.tar.xz";
- sha256 = "0xlnsh9py1v7di305qic0kzpwbq0yw41rilkq1f8p9zsixl99w8m";
- name = "attica-5.78.0.tar.xz";
+ url = "${mirror}/stable/frameworks/5.79/attica-5.79.0.tar.xz";
+ sha256 = "1p6rcpfq3ifz8c8ws5k085mzg7fya2dpv7ryd6iqwi083ys49wla";
+ name = "attica-5.79.0.tar.xz";
};
};
baloo = {
- version = "5.78.0";
+ version = "5.79.0";
src = fetchurl {
- url = "${mirror}/stable/frameworks/5.78/baloo-5.78.0.tar.xz";
- sha256 = "1p8s0lgbqajpzbrc2pb1vzga0bsfwqjb4pzvvgqdlb419ijcjlpi";
- name = "baloo-5.78.0.tar.xz";
+ url = "${mirror}/stable/frameworks/5.79/baloo-5.79.0.tar.xz";
+ sha256 = "0l7z7260pjw6gmcnzp0v57dsypl2yxnm8dxfcdiln8gw2fisryc0";
+ name = "baloo-5.79.0.tar.xz";
};
};
bluez-qt = {
- version = "5.78.0";
+ version = "5.79.0";
src = fetchurl {
- url = "${mirror}/stable/frameworks/5.78/bluez-qt-5.78.0.tar.xz";
- sha256 = "1g83sfvl8zmyc9l5kr2bb9pdfis01m1ib9pz6qq1k5zv5aq3cyz9";
- name = "bluez-qt-5.78.0.tar.xz";
+ url = "${mirror}/stable/frameworks/5.79/bluez-qt-5.79.0.tar.xz";
+ sha256 = "0snips4ak77zpz6x9bzr5lmal712lz64xns1bwlz80svzcikznpj";
+ name = "bluez-qt-5.79.0.tar.xz";
};
};
breeze-icons = {
- version = "5.78.0";
+ version = "5.79.0";
src = fetchurl {
- url = "${mirror}/stable/frameworks/5.78/breeze-icons-5.78.0.tar.xz";
- sha256 = "1fa9lirik0ic03nb56xmiirpbcg57l1b3q7dkn9r5h6scc0nsps2";
- name = "breeze-icons-5.78.0.tar.xz";
+ url = "${mirror}/stable/frameworks/5.79/breeze-icons-5.79.0.tar.xz";
+ sha256 = "06sd7grh7r6wnx8p8mhp7vfhsg3bnyafy94fj6jz6gg9m0308cn6";
+ name = "breeze-icons-5.79.0.tar.xz";
};
};
extra-cmake-modules = {
- version = "5.78.0";
+ version = "5.79.0";
src = fetchurl {
- url = "${mirror}/stable/frameworks/5.78/extra-cmake-modules-5.78.0.tar.xz";
- sha256 = "1y8js21adfzl6g5q46gj7dl8q2jhfvx0ba3ipmbclkpj4461zppf";
- name = "extra-cmake-modules-5.78.0.tar.xz";
+ url = "${mirror}/stable/frameworks/5.79/extra-cmake-modules-5.79.0.tar.xz";
+ sha256 = "1n5yd3ggz5pq4qs7f86aqvzvfmxx2khsn1i1m67xhrn5k7dh55mj";
+ name = "extra-cmake-modules-5.79.0.tar.xz";
};
};
frameworkintegration = {
- version = "5.78.0";
+ version = "5.79.0";
src = fetchurl {
- url = "${mirror}/stable/frameworks/5.78/frameworkintegration-5.78.0.tar.xz";
- sha256 = "0rvi82fqck8jaxnrh5fd8m581civ174hpczanmw6n7birxvmk2wh";
- name = "frameworkintegration-5.78.0.tar.xz";
+ url = "${mirror}/stable/frameworks/5.79/frameworkintegration-5.79.0.tar.xz";
+ sha256 = "0c0i8hqqvi65bh1ghb6ql1a8vqihxck6xhpki4g0ryipilvqmj21";
+ name = "frameworkintegration-5.79.0.tar.xz";
};
};
kactivities = {
- version = "5.78.0";
+ version = "5.79.0";
src = fetchurl {
- url = "${mirror}/stable/frameworks/5.78/kactivities-5.78.0.tar.xz";
- sha256 = "11v7rcw6lk4xd28i9al5p7bxklw5hdm97hvszhh1qd7kfrzblkhi";
- name = "kactivities-5.78.0.tar.xz";
+ url = "${mirror}/stable/frameworks/5.79/kactivities-5.79.0.tar.xz";
+ sha256 = "0d3ds43iqqlbii9xwp7f20nz338xqmq70a4v84zb5ks1mnhkz47l";
+ name = "kactivities-5.79.0.tar.xz";
};
};
kactivities-stats = {
- version = "5.78.0";
+ version = "5.79.0";
src = fetchurl {
- url = "${mirror}/stable/frameworks/5.78/kactivities-stats-5.78.0.tar.xz";
- sha256 = "0afnwswng85jfkpbmbmprkqfngjxv2qpds3s2xlb5nzrpl43hc7s";
- name = "kactivities-stats-5.78.0.tar.xz";
+ url = "${mirror}/stable/frameworks/5.79/kactivities-stats-5.79.0.tar.xz";
+ sha256 = "0s5r8891flkmrwga15ihqrmj4i12khxwp97kaa84j4mqva6zdx93";
+ name = "kactivities-stats-5.79.0.tar.xz";
};
};
kapidox = {
- version = "5.78.0";
+ version = "5.79.0";
src = fetchurl {
- url = "${mirror}/stable/frameworks/5.78/kapidox-5.78.0.tar.xz";
- sha256 = "1d8ia33nrsvg8gf9mna0r2f0sdi4c37p8mxl59hcfqdimy7inkvp";
- name = "kapidox-5.78.0.tar.xz";
+ url = "${mirror}/stable/frameworks/5.79/kapidox-5.79.0.tar.xz";
+ sha256 = "0qk4ksxdaiphlpd51mgwdddxq5vq8n55dd80s2a5q93jkcywhli7";
+ name = "kapidox-5.79.0.tar.xz";
};
};
karchive = {
- version = "5.78.0";
+ version = "5.79.0";
src = fetchurl {
- url = "${mirror}/stable/frameworks/5.78/karchive-5.78.0.tar.xz";
- sha256 = "1lqjy040c5wb76fvnvdaxsgqm63bcx9bmjinvia1caqkh11a5rw2";
- name = "karchive-5.78.0.tar.xz";
+ url = "${mirror}/stable/frameworks/5.79/karchive-5.79.0.tar.xz";
+ sha256 = "01qf46k7gp11fh53afcpmbfx0w5bi0k8jflb2db8nss7ri3bzlhc";
+ name = "karchive-5.79.0.tar.xz";
};
};
kauth = {
- version = "5.78.0";
+ version = "5.79.0";
src = fetchurl {
- url = "${mirror}/stable/frameworks/5.78/kauth-5.78.0.tar.xz";
- sha256 = "1c0xyv54g8gcxaaz602ai1v4jlk7xndc65qjad66qiig958b1czg";
- name = "kauth-5.78.0.tar.xz";
+ url = "${mirror}/stable/frameworks/5.79/kauth-5.79.0.tar.xz";
+ sha256 = "18bqfn47iyhf1zfkw3mgdxz154f9gqbkn41c3ca94qjm91mb40da";
+ name = "kauth-5.79.0.tar.xz";
};
};
kbookmarks = {
- version = "5.78.0";
+ version = "5.79.0";
src = fetchurl {
- url = "${mirror}/stable/frameworks/5.78/kbookmarks-5.78.0.tar.xz";
- sha256 = "0b7g0fkyyqdwpfw53kdw73jcyk8wz5k2ipmwzlpx2fr5gs2v00c3";
- name = "kbookmarks-5.78.0.tar.xz";
+ url = "${mirror}/stable/frameworks/5.79/kbookmarks-5.79.0.tar.xz";
+ sha256 = "109rjikqxv7mbhv22p41rbfz43510y6k7p0ahggynv0x5y5xzkqd";
+ name = "kbookmarks-5.79.0.tar.xz";
};
};
kcalendarcore = {
- version = "5.78.0";
+ version = "5.79.0";
src = fetchurl {
- url = "${mirror}/stable/frameworks/5.78/kcalendarcore-5.78.0.tar.xz";
- sha256 = "1v97swaqf9bmdvfagzif1ihsnd5d900nzv8aadic0a7ax5zqi41h";
- name = "kcalendarcore-5.78.0.tar.xz";
+ url = "${mirror}/stable/frameworks/5.79/kcalendarcore-5.79.0.tar.xz";
+ sha256 = "19vc1ji0jlk899rmr6i53l51diadn67mh6z6j787bp29jlcmnciv";
+ name = "kcalendarcore-5.79.0.tar.xz";
};
};
kcmutils = {
- version = "5.78.0";
+ version = "5.79.0";
src = fetchurl {
- url = "${mirror}/stable/frameworks/5.78/kcmutils-5.78.0.tar.xz";
- sha256 = "1ly21k3lrn6fx1j4vp0km8z9sb2l0adx0rhp9c1sasr8aflmy5k8";
- name = "kcmutils-5.78.0.tar.xz";
+ url = "${mirror}/stable/frameworks/5.79/kcmutils-5.79.0.tar.xz";
+ sha256 = "1wry88rikj7mz460m3c7gr6fwcdpdlx9jrxna2ikybnk9aw8dlkk";
+ name = "kcmutils-5.79.0.tar.xz";
};
};
kcodecs = {
- version = "5.78.0";
+ version = "5.79.0";
src = fetchurl {
- url = "${mirror}/stable/frameworks/5.78/kcodecs-5.78.0.tar.xz";
- sha256 = "0ypwx29v7gbcdpkvlpk0r5v7d8rd3xnqlnk1k11c75dvy3763d1n";
- name = "kcodecs-5.78.0.tar.xz";
+ url = "${mirror}/stable/frameworks/5.79/kcodecs-5.79.0.tar.xz";
+ sha256 = "1ab4dz6nvmd6fzsl7wbrvjlz0c0fk0bjb0jcklrj205pkhiaf7y8";
+ name = "kcodecs-5.79.0.tar.xz";
};
};
kcompletion = {
- version = "5.78.0";
+ version = "5.79.0";
src = fetchurl {
- url = "${mirror}/stable/frameworks/5.78/kcompletion-5.78.0.tar.xz";
- sha256 = "1a9z252m7v2fhd71dnibczb8yjq090ylcysx5pgwhc2j3djp4fd7";
- name = "kcompletion-5.78.0.tar.xz";
+ url = "${mirror}/stable/frameworks/5.79/kcompletion-5.79.0.tar.xz";
+ sha256 = "1znp6h4pggkl1hcbbw47vjkgmpc1rj6mx01p05x0ad143mwqpzwv";
+ name = "kcompletion-5.79.0.tar.xz";
};
};
kconfig = {
- version = "5.78.0";
+ version = "5.79.0";
src = fetchurl {
- url = "${mirror}/stable/frameworks/5.78/kconfig-5.78.0.tar.xz";
- sha256 = "1fzzrypi8pxb0vprh65bpqrpgpwlwwlspf2mz5w83s90snbiwymj";
- name = "kconfig-5.78.0.tar.xz";
+ url = "${mirror}/stable/frameworks/5.79/kconfig-5.79.0.tar.xz";
+ sha256 = "02jirbphrg6dyxd444ghzhy053s85pq4lgpppca3nmvzr2572j7r";
+ name = "kconfig-5.79.0.tar.xz";
};
};
kconfigwidgets = {
- version = "5.78.0";
+ version = "5.79.0";
src = fetchurl {
- url = "${mirror}/stable/frameworks/5.78/kconfigwidgets-5.78.0.tar.xz";
- sha256 = "0fgclbyxjyjid21x2059wh7dns73acjnh4qrgzhg0nsx2h8cvm47";
- name = "kconfigwidgets-5.78.0.tar.xz";
+ url = "${mirror}/stable/frameworks/5.79/kconfigwidgets-5.79.0.tar.xz";
+ sha256 = "1lrh2dis3invj9vclpa1mca8hrks1b82c5hkf0g0lilg69lir83y";
+ name = "kconfigwidgets-5.79.0.tar.xz";
};
};
kcontacts = {
- version = "5.78.0";
+ version = "5.79.0";
src = fetchurl {
- url = "${mirror}/stable/frameworks/5.78/kcontacts-5.78.0.tar.xz";
- sha256 = "1xjm0l8did9qmjgfvy9hsa7jbfv5mqimnwl7iiz6gxvm8sm14gcw";
- name = "kcontacts-5.78.0.tar.xz";
+ url = "${mirror}/stable/frameworks/5.79/kcontacts-5.79.0.tar.xz";
+ sha256 = "0jflvfkyd7llv54dxyd1a4h1l4xgrqggxadiqv0c6ijn4dvlsmy9";
+ name = "kcontacts-5.79.0.tar.xz";
};
};
kcoreaddons = {
- version = "5.78.0";
+ version = "5.79.0";
src = fetchurl {
- url = "${mirror}/stable/frameworks/5.78/kcoreaddons-5.78.0.tar.xz";
- sha256 = "01rvijlb3b3s5r3213am9zyk7xhfqbnfxnq175hggq0mbm6zjpv3";
- name = "kcoreaddons-5.78.0.tar.xz";
+ url = "${mirror}/stable/frameworks/5.79/kcoreaddons-5.79.0.tar.xz";
+ sha256 = "0n9nh4vkk19crp30dac3x9mzgzl4kv38jw6dcg4fwfp77gcin8kg";
+ name = "kcoreaddons-5.79.0.tar.xz";
};
};
kcrash = {
- version = "5.78.0";
+ version = "5.79.0";
src = fetchurl {
- url = "${mirror}/stable/frameworks/5.78/kcrash-5.78.0.tar.xz";
- sha256 = "0rrxzjxwi3kib0w86gc4gkkyzvnkg6l1x81ybclvk275zi724jkj";
- name = "kcrash-5.78.0.tar.xz";
+ url = "${mirror}/stable/frameworks/5.79/kcrash-5.79.0.tar.xz";
+ sha256 = "0w74d0j1ckbcd8q8lc57g3y7g50v222mgsvli77ql29imzx79apc";
+ name = "kcrash-5.79.0.tar.xz";
};
};
kdav = {
- version = "5.78.0";
+ version = "5.79.0";
src = fetchurl {
- url = "${mirror}/stable/frameworks/5.78/kdav-5.78.0.tar.xz";
- sha256 = "1iqh5z5rry644mcrlppbbf72nxli607varki61m1zgvcvwvaq00j";
- name = "kdav-5.78.0.tar.xz";
+ url = "${mirror}/stable/frameworks/5.79/kdav-5.79.0.tar.xz";
+ sha256 = "1573qan4xz8k33zfghwdmlr7pgbd4sfj0pshwv6bkx78kprd3xfl";
+ name = "kdav-5.79.0.tar.xz";
};
};
kdbusaddons = {
- version = "5.78.0";
+ version = "5.79.0";
src = fetchurl {
- url = "${mirror}/stable/frameworks/5.78/kdbusaddons-5.78.0.tar.xz";
- sha256 = "16fk4jpx93q4l0wf3vgxg7vxajjqmbxd91y08khfahr2fssx14ag";
- name = "kdbusaddons-5.78.0.tar.xz";
+ url = "${mirror}/stable/frameworks/5.79/kdbusaddons-5.79.0.tar.xz";
+ sha256 = "17sklakn9nsrjajb3nwg8ibhx64c4m86pr6ln567rdr6cahcaw90";
+ name = "kdbusaddons-5.79.0.tar.xz";
};
};
kdeclarative = {
- version = "5.78.0";
+ version = "5.79.0";
src = fetchurl {
- url = "${mirror}/stable/frameworks/5.78/kdeclarative-5.78.0.tar.xz";
- sha256 = "15s75xfy8lvwvkd789vg6y3zcxafav46g7r97psn97ans6gk2na7";
- name = "kdeclarative-5.78.0.tar.xz";
+ url = "${mirror}/stable/frameworks/5.79/kdeclarative-5.79.0.tar.xz";
+ sha256 = "05b1apviqy3dn2isqxf0bxj86r9q40pjlcqq8y15s36d6ykijyzh";
+ name = "kdeclarative-5.79.0.tar.xz";
};
};
kded = {
- version = "5.78.0";
+ version = "5.79.0";
src = fetchurl {
- url = "${mirror}/stable/frameworks/5.78/kded-5.78.0.tar.xz";
- sha256 = "0lmxqax0x2hxllzhbvwgywdg483zarhs7f2i0d1ffigr3nn6q59m";
- name = "kded-5.78.0.tar.xz";
+ url = "${mirror}/stable/frameworks/5.79/kded-5.79.0.tar.xz";
+ sha256 = "1gyb864rqbdi64mjc165fhcvnsw06z2zi8dg728428nzmw0dysbm";
+ name = "kded-5.79.0.tar.xz";
};
};
kdelibs4support = {
- version = "5.78.0";
+ version = "5.79.0";
src = fetchurl {
- url = "${mirror}/stable/frameworks/5.78/portingAids/kdelibs4support-5.78.0.tar.xz";
- sha256 = "1iclzch3sh0j73prm2ccjvd3z89hp4638kxdblzqqxxdyali9ycq";
- name = "kdelibs4support-5.78.0.tar.xz";
+ url = "${mirror}/stable/frameworks/5.79/portingAids/kdelibs4support-5.79.0.tar.xz";
+ sha256 = "049l0mlf71xan8ls4hkp8s6lrnhn2i22jcnki1d5wci01dgffhm5";
+ name = "kdelibs4support-5.79.0.tar.xz";
};
};
kdesignerplugin = {
- version = "5.78.0";
+ version = "5.79.0";
src = fetchurl {
- url = "${mirror}/stable/frameworks/5.78/portingAids/kdesignerplugin-5.78.0.tar.xz";
- sha256 = "1chg3g8xc8nmlzg4niciphfrclmiqcfb6jxwajv1j8j3s3vk7wwz";
- name = "kdesignerplugin-5.78.0.tar.xz";
+ url = "${mirror}/stable/frameworks/5.79/portingAids/kdesignerplugin-5.79.0.tar.xz";
+ sha256 = "1jgqr76sx6d3jmqc350k49lqym5jkixnl3dq66430pvlrfv47w2n";
+ name = "kdesignerplugin-5.79.0.tar.xz";
};
};
kdesu = {
- version = "5.78.0";
+ version = "5.79.0";
src = fetchurl {
- url = "${mirror}/stable/frameworks/5.78/kdesu-5.78.0.tar.xz";
- sha256 = "072bnj6hxph864gn81hr24aklh7mq974fibglihwyak0zbml5yfm";
- name = "kdesu-5.78.0.tar.xz";
+ url = "${mirror}/stable/frameworks/5.79/kdesu-5.79.0.tar.xz";
+ sha256 = "1hlz5pr72qk64gwp30qx92jhlszri5qjsisvl4cxs01ylnrqy0c1";
+ name = "kdesu-5.79.0.tar.xz";
};
};
kdewebkit = {
- version = "5.78.0";
+ version = "5.79.0";
src = fetchurl {
- url = "${mirror}/stable/frameworks/5.78/portingAids/kdewebkit-5.78.0.tar.xz";
- sha256 = "0mcnlc4s372ghdjypksdjh6casradsxwa47aaac4d4yg2qk7mqb1";
- name = "kdewebkit-5.78.0.tar.xz";
+ url = "${mirror}/stable/frameworks/5.79/portingAids/kdewebkit-5.79.0.tar.xz";
+ sha256 = "0d81p49n2ryig9xp5id1dx4rpjjd2spl78m0xlq6rczyk7yf73pz";
+ name = "kdewebkit-5.79.0.tar.xz";
};
};
kdnssd = {
- version = "5.78.0";
+ version = "5.79.1";
src = fetchurl {
- url = "${mirror}/stable/frameworks/5.78/kdnssd-5.78.0.tar.xz";
- sha256 = "1rsjbi5x05ii17xl8zvcrfjmjsq0g6vqh90qflnyys6lzhyvs0sf";
- name = "kdnssd-5.78.0.tar.xz";
+ url = "${mirror}/stable/frameworks/5.79/kdnssd-5.79.1.tar.xz";
+ sha256 = "160qyll887wblrw0lhax749lzwhlp92sckj4g259955p8gnsw5lp";
+ name = "kdnssd-5.79.1.tar.xz";
};
};
kdoctools = {
- version = "5.78.0";
+ version = "5.79.0";
src = fetchurl {
- url = "${mirror}/stable/frameworks/5.78/kdoctools-5.78.0.tar.xz";
- sha256 = "0qngw9li2am0phkys45cph3qj01fjhjhvp3dsk3ymr60szryw23s";
- name = "kdoctools-5.78.0.tar.xz";
+ url = "${mirror}/stable/frameworks/5.79/kdoctools-5.79.0.tar.xz";
+ sha256 = "03bvj3grjw6a56shdy8c3mdp11pwmc72ccp3ia00bz310ahpphzb";
+ name = "kdoctools-5.79.0.tar.xz";
};
};
kemoticons = {
- version = "5.78.0";
+ version = "5.79.0";
src = fetchurl {
- url = "${mirror}/stable/frameworks/5.78/kemoticons-5.78.0.tar.xz";
- sha256 = "14alh2n5igk3cpm1j7ms7y0xph61qy5k3n2bw8y4y5wkb8qmqg3m";
- name = "kemoticons-5.78.0.tar.xz";
+ url = "${mirror}/stable/frameworks/5.79/kemoticons-5.79.0.tar.xz";
+ sha256 = "04x1yfdcyvx3x4aqha69rsaa78j4iw6qam3hp5a4di0yf653mphp";
+ name = "kemoticons-5.79.0.tar.xz";
};
};
kfilemetadata = {
- version = "5.78.0";
+ version = "5.79.0";
src = fetchurl {
- url = "${mirror}/stable/frameworks/5.78/kfilemetadata-5.78.0.tar.xz";
- sha256 = "111w47f74kmn81hvjxjhp6n6kc4533a76fzvrv6wbprqiwc6bncx";
- name = "kfilemetadata-5.78.0.tar.xz";
+ url = "${mirror}/stable/frameworks/5.79/kfilemetadata-5.79.0.tar.xz";
+ sha256 = "0yxjapq88pfcma82mc9gz03x1bb81xl6xzrinr6jgz09206ra395";
+ name = "kfilemetadata-5.79.0.tar.xz";
};
};
kglobalaccel = {
- version = "5.78.0";
+ version = "5.79.0";
src = fetchurl {
- url = "${mirror}/stable/frameworks/5.78/kglobalaccel-5.78.0.tar.xz";
- sha256 = "08mqjdigb5lzx0kqhmw5m8gnvs01fzg3j0dan70v5203wbfnw69z";
- name = "kglobalaccel-5.78.0.tar.xz";
+ url = "${mirror}/stable/frameworks/5.79/kglobalaccel-5.79.0.tar.xz";
+ sha256 = "0qqxvv3m7b44makgdcsxdhzamm4ahm1pn94rn6cpsrqsyci8axy8";
+ name = "kglobalaccel-5.79.0.tar.xz";
};
};
kguiaddons = {
- version = "5.78.0";
+ version = "5.79.0";
src = fetchurl {
- url = "${mirror}/stable/frameworks/5.78/kguiaddons-5.78.0.tar.xz";
- sha256 = "1l3ppihibhcjajmd55dr6mcc1xd4ni2iw2rdpk2l11ran4nys2dd";
- name = "kguiaddons-5.78.0.tar.xz";
+ url = "${mirror}/stable/frameworks/5.79/kguiaddons-5.79.0.tar.xz";
+ sha256 = "118wiy3pbmbazfivmh0w2g5l10qcp10b34r3d02pj7rs2a74h05w";
+ name = "kguiaddons-5.79.0.tar.xz";
};
};
kholidays = {
- version = "5.78.0";
+ version = "5.79.0";
src = fetchurl {
- url = "${mirror}/stable/frameworks/5.78/kholidays-5.78.0.tar.xz";
- sha256 = "147ma06mrbydf2gyrh526bjh1f0xlnxiw89xp6n3wq0qmmdvhs17";
- name = "kholidays-5.78.0.tar.xz";
+ url = "${mirror}/stable/frameworks/5.79/kholidays-5.79.0.tar.xz";
+ sha256 = "1lbbq6y1xkffh9qma7hr5hi712kl85kv51gij0mj69ssv1iq2a8n";
+ name = "kholidays-5.79.0.tar.xz";
};
};
khtml = {
- version = "5.78.0";
+ version = "5.79.0";
src = fetchurl {
- url = "${mirror}/stable/frameworks/5.78/portingAids/khtml-5.78.0.tar.xz";
- sha256 = "0pai60cbl8p01xb97191nyzmsf7q00vcqvy8cdr8gfvrlx8k7dhn";
- name = "khtml-5.78.0.tar.xz";
+ url = "${mirror}/stable/frameworks/5.79/portingAids/khtml-5.79.0.tar.xz";
+ sha256 = "1916kpb3kr0d7lbf0b65lrwkxnlgickm7vrmlc3qwlmf3fyqvkhy";
+ name = "khtml-5.79.0.tar.xz";
};
};
ki18n = {
- version = "5.78.0";
+ version = "5.79.0";
src = fetchurl {
- url = "${mirror}/stable/frameworks/5.78/ki18n-5.78.0.tar.xz";
- sha256 = "0mafvkrgmdcj869dzqmgphdwhl6a2bf2lw99w7frxh2qw4n2sd8k";
- name = "ki18n-5.78.0.tar.xz";
+ url = "${mirror}/stable/frameworks/5.79/ki18n-5.79.0.tar.xz";
+ sha256 = "12sa7ycxc7m7nrsm6x7f822c8p586hy0syny5ya8vpmhwk1j3gik";
+ name = "ki18n-5.79.0.tar.xz";
};
};
kiconthemes = {
- version = "5.78.0";
+ version = "5.79.0";
src = fetchurl {
- url = "${mirror}/stable/frameworks/5.78/kiconthemes-5.78.0.tar.xz";
- sha256 = "0ssd1298pqm0g46m92b5d4yfrqxgmwf465lcbia41lndjd6px27v";
- name = "kiconthemes-5.78.0.tar.xz";
+ url = "${mirror}/stable/frameworks/5.79/kiconthemes-5.79.0.tar.xz";
+ sha256 = "0bbs8q0dpz4qyxsd1qk5jxazn600m5j2axzccxyrr21r9plbs4nx";
+ name = "kiconthemes-5.79.0.tar.xz";
};
};
kidletime = {
- version = "5.78.0";
+ version = "5.79.0";
src = fetchurl {
- url = "${mirror}/stable/frameworks/5.78/kidletime-5.78.0.tar.xz";
- sha256 = "0aw6g6p3bmp32zk22fwp2f1d20vbf7921ixnyf7a0w535r58d5ma";
- name = "kidletime-5.78.0.tar.xz";
+ url = "${mirror}/stable/frameworks/5.79/kidletime-5.79.0.tar.xz";
+ sha256 = "0pp2ii4cvxygz40ai0b3rpqdjgpq4nya2hrms9c3yxb5hizrrrak";
+ name = "kidletime-5.79.0.tar.xz";
};
};
kimageformats = {
- version = "5.78.0";
+ version = "5.79.0";
src = fetchurl {
- url = "${mirror}/stable/frameworks/5.78/kimageformats-5.78.0.tar.xz";
- sha256 = "0gv2w49cdzji8h9swaazpmbn0qqzn4ncnxj7f9rqp686q17czm7c";
- name = "kimageformats-5.78.0.tar.xz";
+ url = "${mirror}/stable/frameworks/5.79/kimageformats-5.79.0.tar.xz";
+ sha256 = "09ffc44vzcin2ikyhm0awba7ag7pbnam4cilvfr3lwnj022y7j7c";
+ name = "kimageformats-5.79.0.tar.xz";
};
};
kinit = {
- version = "5.78.0";
+ version = "5.79.0";
src = fetchurl {
- url = "${mirror}/stable/frameworks/5.78/kinit-5.78.0.tar.xz";
- sha256 = "16shlmm6q0vaf05gkrgqpmjrs5fgb8jrfgq331x7ic567hhzv4vv";
- name = "kinit-5.78.0.tar.xz";
+ url = "${mirror}/stable/frameworks/5.79/kinit-5.79.0.tar.xz";
+ sha256 = "0ppri3gaiwawydjfw8ji6accrpwc8ms0sb1s5pn59wqiyv52f5rv";
+ name = "kinit-5.79.0.tar.xz";
};
};
kio = {
- version = "5.78.0";
+ version = "5.79.0";
src = fetchurl {
- url = "${mirror}/stable/frameworks/5.78/kio-5.78.0.tar.xz";
- sha256 = "086nhyjk5sjvp97fs6kkmc99jh2303sbmpfki1qvcwzdq6idn4g2";
- name = "kio-5.78.0.tar.xz";
+ url = "${mirror}/stable/frameworks/5.79/kio-5.79.0.tar.xz";
+ sha256 = "1ri5dv8lc4ywc7jknlszri812y91mgggjx5z5qfkv971njm6fz3n";
+ name = "kio-5.79.0.tar.xz";
};
};
kirigami2 = {
- version = "5.78.0";
+ version = "5.79.0";
src = fetchurl {
- url = "${mirror}/stable/frameworks/5.78/kirigami2-5.78.0.tar.xz";
- sha256 = "0667wcxyhil332g6gk12bjg5y0c1zk15354wx6mg8krxl3i2nkjy";
- name = "kirigami2-5.78.0.tar.xz";
+ url = "${mirror}/stable/frameworks/5.79/kirigami2-5.79.0.tar.xz";
+ sha256 = "01rb678qz1avzi7393wylwnc13ndzx2pgqnz3bd0zki0pjfrrlzp";
+ name = "kirigami2-5.79.0.tar.xz";
};
};
kitemmodels = {
- version = "5.78.0";
+ version = "5.79.0";
src = fetchurl {
- url = "${mirror}/stable/frameworks/5.78/kitemmodels-5.78.0.tar.xz";
- sha256 = "1yn8gi7dml7mxyk93fzx5id2pckw6qbbkifwzmhq5i3vzpq1qdja";
- name = "kitemmodels-5.78.0.tar.xz";
+ url = "${mirror}/stable/frameworks/5.79/kitemmodels-5.79.0.tar.xz";
+ sha256 = "1g9xa0h3kq0m5v1yvwgr8f6lrq8n2x1qzqqjbbbbyg8ayavv4abs";
+ name = "kitemmodels-5.79.0.tar.xz";
};
};
kitemviews = {
- version = "5.78.0";
+ version = "5.79.0";
src = fetchurl {
- url = "${mirror}/stable/frameworks/5.78/kitemviews-5.78.0.tar.xz";
- sha256 = "10ysirhlgbzyiybb1ap111w89v3czing43ap10n5pldgh1c8ky05";
- name = "kitemviews-5.78.0.tar.xz";
+ url = "${mirror}/stable/frameworks/5.79/kitemviews-5.79.0.tar.xz";
+ sha256 = "0p21hyxhain2mr19lzfml23ilpgqwr2i27p1qg39jnwyb74jw0nl";
+ name = "kitemviews-5.79.0.tar.xz";
};
};
kjobwidgets = {
- version = "5.78.0";
+ version = "5.79.0";
src = fetchurl {
- url = "${mirror}/stable/frameworks/5.78/kjobwidgets-5.78.0.tar.xz";
- sha256 = "0cdy7w14wr08xf9na1jzbrwjvmiw5q2ciniafzf9cn55yxrvmhwv";
- name = "kjobwidgets-5.78.0.tar.xz";
+ url = "${mirror}/stable/frameworks/5.79/kjobwidgets-5.79.0.tar.xz";
+ sha256 = "059a58hp0npip07w7idjrl5sjjgl4i3bdqzv1k22hlvzdsyibggr";
+ name = "kjobwidgets-5.79.0.tar.xz";
};
};
kjs = {
- version = "5.78.0";
+ version = "5.79.0";
src = fetchurl {
- url = "${mirror}/stable/frameworks/5.78/portingAids/kjs-5.78.0.tar.xz";
- sha256 = "0sjnwj6x7dgvqh333yii5vlh7pbl1kc7zrbdjkqi38cfnbcf2w4h";
- name = "kjs-5.78.0.tar.xz";
+ url = "${mirror}/stable/frameworks/5.79/portingAids/kjs-5.79.0.tar.xz";
+ sha256 = "1v51xjmwxi1x85b4hlj8m12zxl5w0d160kjjbrrxqfn64i4302ga";
+ name = "kjs-5.79.0.tar.xz";
};
};
kjsembed = {
- version = "5.78.0";
+ version = "5.79.0";
src = fetchurl {
- url = "${mirror}/stable/frameworks/5.78/portingAids/kjsembed-5.78.0.tar.xz";
- sha256 = "0r8hxbqn5k0wsk4swym7hi15mnhd9dyvcgz8lycqnvlrz0walvr9";
- name = "kjsembed-5.78.0.tar.xz";
+ url = "${mirror}/stable/frameworks/5.79/portingAids/kjsembed-5.79.0.tar.xz";
+ sha256 = "18kjq5mim7b1a5mlhkwpwvnszjqxilhi4laqladh97wkmvsr85py";
+ name = "kjsembed-5.79.0.tar.xz";
};
};
kmediaplayer = {
- version = "5.78.0";
+ version = "5.79.0";
src = fetchurl {
- url = "${mirror}/stable/frameworks/5.78/portingAids/kmediaplayer-5.78.0.tar.xz";
- sha256 = "0yy0k2cgchj1pnk2q7gq4iihscf6rgiwdpfn6i0i8zcczkm2gyls";
- name = "kmediaplayer-5.78.0.tar.xz";
+ url = "${mirror}/stable/frameworks/5.79/portingAids/kmediaplayer-5.79.0.tar.xz";
+ sha256 = "1lgrcib9acbzgs1kv44bqfisrayiir2r1iygrrncp117fj9cqx8b";
+ name = "kmediaplayer-5.79.0.tar.xz";
};
};
knewstuff = {
- version = "5.78.0";
+ version = "5.79.0";
src = fetchurl {
- url = "${mirror}/stable/frameworks/5.78/knewstuff-5.78.0.tar.xz";
- sha256 = "1fb1ka7ljfw4wyf8sy0r5vy9nmji286p26wjzgsf2rzzskaspc6m";
- name = "knewstuff-5.78.0.tar.xz";
+ url = "${mirror}/stable/frameworks/5.79/knewstuff-5.79.0.tar.xz";
+ sha256 = "0bsg0r0s12ck2cafkvnmjldr32ykivcpqjs1zfzqqbvy5w05a81y";
+ name = "knewstuff-5.79.0.tar.xz";
};
};
knotifications = {
- version = "5.78.0";
+ version = "5.79.0";
src = fetchurl {
- url = "${mirror}/stable/frameworks/5.78/knotifications-5.78.0.tar.xz";
- sha256 = "0f93xql467jbz964lpjrsip77wf0s8qygggkjb85y8xgpcdw4zrr";
- name = "knotifications-5.78.0.tar.xz";
+ url = "${mirror}/stable/frameworks/5.79/knotifications-5.79.0.tar.xz";
+ sha256 = "11g4xsa0z9680k4blxb1axn874p6s2vd5p9h376ln3blhjmy17hj";
+ name = "knotifications-5.79.0.tar.xz";
};
};
knotifyconfig = {
- version = "5.78.0";
+ version = "5.79.0";
src = fetchurl {
- url = "${mirror}/stable/frameworks/5.78/knotifyconfig-5.78.0.tar.xz";
- sha256 = "0nzs76ii447xv3dqcg14a045xc74bnvwghfdmlb0vmh22p3a60fz";
- name = "knotifyconfig-5.78.0.tar.xz";
+ url = "${mirror}/stable/frameworks/5.79/knotifyconfig-5.79.0.tar.xz";
+ sha256 = "0c6d95bf8876czjd39cla7pd3li8sm684h04f77czf6sh1mil49d";
+ name = "knotifyconfig-5.79.0.tar.xz";
};
};
kpackage = {
- version = "5.78.0";
+ version = "5.79.0";
src = fetchurl {
- url = "${mirror}/stable/frameworks/5.78/kpackage-5.78.0.tar.xz";
- sha256 = "0d0vfh3ifaj2xifw370rfapw2yf24h7f8xwbhmx787dr6w86m47c";
- name = "kpackage-5.78.0.tar.xz";
+ url = "${mirror}/stable/frameworks/5.79/kpackage-5.79.0.tar.xz";
+ sha256 = "1xkkw4lk9hx2irni5d2k7873bffgd2w41qvvp25d786dz612fy27";
+ name = "kpackage-5.79.0.tar.xz";
};
};
kparts = {
- version = "5.78.0";
+ version = "5.79.0";
src = fetchurl {
- url = "${mirror}/stable/frameworks/5.78/kparts-5.78.0.tar.xz";
- sha256 = "1np1vshzihh2r51gzy54yvm6h898ffw5b20c3r6jaa0837g3mlvp";
- name = "kparts-5.78.0.tar.xz";
+ url = "${mirror}/stable/frameworks/5.79/kparts-5.79.0.tar.xz";
+ sha256 = "0d9dsgf6q44gqril6h9w5jfsavk0m5gclbmjdxjkcvrz3xfbjhd9";
+ name = "kparts-5.79.0.tar.xz";
};
};
kpeople = {
- version = "5.78.0";
+ version = "5.79.0";
src = fetchurl {
- url = "${mirror}/stable/frameworks/5.78/kpeople-5.78.0.tar.xz";
- sha256 = "0ccc10qfhw69s12sfgpql988pf7pssx9k8j9xcywil4y7xidk05i";
- name = "kpeople-5.78.0.tar.xz";
+ url = "${mirror}/stable/frameworks/5.79/kpeople-5.79.0.tar.xz";
+ sha256 = "0dj8hcjl0r673j7m2k83mxy2787jfi9pz6cvmfqfczbzpw20ycf4";
+ name = "kpeople-5.79.0.tar.xz";
};
};
kplotting = {
- version = "5.78.0";
+ version = "5.79.0";
src = fetchurl {
- url = "${mirror}/stable/frameworks/5.78/kplotting-5.78.0.tar.xz";
- sha256 = "00wd3rgp4c0sngfbdz613792sidsykbnazsq05lf4pk46py4xcvc";
- name = "kplotting-5.78.0.tar.xz";
+ url = "${mirror}/stable/frameworks/5.79/kplotting-5.79.0.tar.xz";
+ sha256 = "0lawpg7i36wppm95jxhhc7ghc88kb1s34px6w8p7n6cm2gxkhwn6";
+ name = "kplotting-5.79.0.tar.xz";
};
};
kpty = {
- version = "5.78.0";
+ version = "5.79.0";
src = fetchurl {
- url = "${mirror}/stable/frameworks/5.78/kpty-5.78.0.tar.xz";
- sha256 = "1nhijlp98bnnqj9c0i3g1xfpdhghw7241av4wzwhhxny67addlf3";
- name = "kpty-5.78.0.tar.xz";
+ url = "${mirror}/stable/frameworks/5.79/kpty-5.79.0.tar.xz";
+ sha256 = "1qd09r17nmsnqxggmsdw0j6l0620f11ya6mx7bc9zs2y08mgvjka";
+ name = "kpty-5.79.0.tar.xz";
};
};
kquickcharts = {
- version = "5.78.0";
+ version = "5.79.0";
src = fetchurl {
- url = "${mirror}/stable/frameworks/5.78/kquickcharts-5.78.0.tar.xz";
- sha256 = "1zq5bp3w42sqvlvkc7vx6l7h142ihzgzqpa2435j9apvx0kvjqhp";
- name = "kquickcharts-5.78.0.tar.xz";
+ url = "${mirror}/stable/frameworks/5.79/kquickcharts-5.79.0.tar.xz";
+ sha256 = "1p9a3mq7xxyavzmgjmz47vrv0hm1h9g8fsligi3r3n5az7klra6f";
+ name = "kquickcharts-5.79.0.tar.xz";
};
};
kross = {
- version = "5.78.0";
+ version = "5.79.0";
src = fetchurl {
- url = "${mirror}/stable/frameworks/5.78/portingAids/kross-5.78.0.tar.xz";
- sha256 = "07ylcvkz5xf6b9n65373a8zpp5nsby5c99l912bdxf05hrjcw8b1";
- name = "kross-5.78.0.tar.xz";
+ url = "${mirror}/stable/frameworks/5.79/portingAids/kross-5.79.0.tar.xz";
+ sha256 = "00hpyxcn2fwaz32gggqjcmx4blbcdxj3yvhldnmmkmi3k0r68dfc";
+ name = "kross-5.79.0.tar.xz";
};
};
krunner = {
- version = "5.78.0";
+ version = "5.79.0";
src = fetchurl {
- url = "${mirror}/stable/frameworks/5.78/krunner-5.78.0.tar.xz";
- sha256 = "00hy62g9i9vdzgv9ljfqjv0m45lrsmxynmp3fyp5c3amj9r64pkm";
- name = "krunner-5.78.0.tar.xz";
+ url = "${mirror}/stable/frameworks/5.79/krunner-5.79.0.tar.xz";
+ sha256 = "0v7faai6ar06cw7gikhccsa92aii085dk81g4xpyskmxlpvrraci";
+ name = "krunner-5.79.0.tar.xz";
};
};
kservice = {
- version = "5.78.0";
+ version = "5.79.0";
src = fetchurl {
- url = "${mirror}/stable/frameworks/5.78/kservice-5.78.0.tar.xz";
- sha256 = "181maly1xij1jp7f0x9ajbv5q6qszqd273sdz1snkg5j4398mric";
- name = "kservice-5.78.0.tar.xz";
+ url = "${mirror}/stable/frameworks/5.79/kservice-5.79.0.tar.xz";
+ sha256 = "1drzj4s1zbh5pffnh3r1wjsk7g1vr0np2h28mlfm4hy3bywxzrnp";
+ name = "kservice-5.79.0.tar.xz";
};
};
ktexteditor = {
- version = "5.78.0";
+ version = "5.79.0";
src = fetchurl {
- url = "${mirror}/stable/frameworks/5.78/ktexteditor-5.78.0.tar.xz";
- sha256 = "1r148n3nx3jyw2vn4rfxdl2mkywr5fn78s5ya7vq44pw2bmwar2n";
- name = "ktexteditor-5.78.0.tar.xz";
+ url = "${mirror}/stable/frameworks/5.79/ktexteditor-5.79.0.tar.xz";
+ sha256 = "1csms6cl8pp9slzwzdgsxhah1b218maakkxmiqk0ngx2sf4lbfc3";
+ name = "ktexteditor-5.79.0.tar.xz";
};
};
ktextwidgets = {
- version = "5.78.0";
+ version = "5.79.0";
src = fetchurl {
- url = "${mirror}/stable/frameworks/5.78/ktextwidgets-5.78.0.tar.xz";
- sha256 = "1gpqxvlmqm5nj5kgx2dmvl8ynjqw995wnpl9ja5c82d8bczkn4z8";
- name = "ktextwidgets-5.78.0.tar.xz";
+ url = "${mirror}/stable/frameworks/5.79/ktextwidgets-5.79.0.tar.xz";
+ sha256 = "1bnhq4jpybckdlw5518n2hbfilbpadafvchnxigg9p7671pkp85l";
+ name = "ktextwidgets-5.79.0.tar.xz";
};
};
kunitconversion = {
- version = "5.78.0";
+ version = "5.79.0";
src = fetchurl {
- url = "${mirror}/stable/frameworks/5.78/kunitconversion-5.78.0.tar.xz";
- sha256 = "17a3lpc60qn9qd53mlrjxwg5gyqvq0vnnz9wdrak481nf2c0qycc";
- name = "kunitconversion-5.78.0.tar.xz";
+ url = "${mirror}/stable/frameworks/5.79/kunitconversion-5.79.0.tar.xz";
+ sha256 = "19snm2mvvbs2aqpq7k9b3g1fbg40kpmbjmqn38g6m065mpw3372l";
+ name = "kunitconversion-5.79.0.tar.xz";
};
};
kwallet = {
- version = "5.78.0";
+ version = "5.79.0";
src = fetchurl {
- url = "${mirror}/stable/frameworks/5.78/kwallet-5.78.0.tar.xz";
- sha256 = "1a8n5d9y9qwcb4d9zbr1xhk3w390n7f6mmx52nq5akna51zrjc4p";
- name = "kwallet-5.78.0.tar.xz";
+ url = "${mirror}/stable/frameworks/5.79/kwallet-5.79.0.tar.xz";
+ sha256 = "1qickn20ry8qccirdc7rvdf40dxgb13y4n0wi80qz87xzmps3f3p";
+ name = "kwallet-5.79.0.tar.xz";
};
};
kwayland = {
- version = "5.78.0";
+ version = "5.79.0";
src = fetchurl {
- url = "${mirror}/stable/frameworks/5.78/kwayland-5.78.0.tar.xz";
- sha256 = "052avcafjnib55s2lp1fzhx7dk9mlyg4v143gfp9j8wvlqaa8sxb";
- name = "kwayland-5.78.0.tar.xz";
+ url = "${mirror}/stable/frameworks/5.79/kwayland-5.79.0.tar.xz";
+ sha256 = "14grhcav772zfdjmwnjms819by2djm8dnv71cj4ps45iq0gba6ck";
+ name = "kwayland-5.79.0.tar.xz";
};
};
kwidgetsaddons = {
- version = "5.78.0";
+ version = "5.79.0";
src = fetchurl {
- url = "${mirror}/stable/frameworks/5.78/kwidgetsaddons-5.78.0.tar.xz";
- sha256 = "0b2y9ilk2zz4zw2m1lcwrmn3hni5jh6kalclx5l9fi98686b1az4";
- name = "kwidgetsaddons-5.78.0.tar.xz";
+ url = "${mirror}/stable/frameworks/5.79/kwidgetsaddons-5.79.0.tar.xz";
+ sha256 = "0jpfwxa397cvqr1q92b2nva7wy2ngv08kz5l94xrz0wzkagxfixc";
+ name = "kwidgetsaddons-5.79.0.tar.xz";
};
};
kwindowsystem = {
- version = "5.78.0";
+ version = "5.79.0";
src = fetchurl {
- url = "${mirror}/stable/frameworks/5.78/kwindowsystem-5.78.0.tar.xz";
- sha256 = "003jypnib16qpm7l76zqbhhbqq2g23hm245l9dskbansxpncmfbc";
- name = "kwindowsystem-5.78.0.tar.xz";
+ url = "${mirror}/stable/frameworks/5.79/kwindowsystem-5.79.0.tar.xz";
+ sha256 = "15pi2vnvdchj9f3yp1p7hqxmnwd606a6fwq4h7li4pvb4w3gibmq";
+ name = "kwindowsystem-5.79.0.tar.xz";
};
};
kxmlgui = {
- version = "5.78.0";
+ version = "5.79.0";
src = fetchurl {
- url = "${mirror}/stable/frameworks/5.78/kxmlgui-5.78.0.tar.xz";
- sha256 = "05yxgxbvv8anl4m40jwwfx183y69fdljj4g7daip0nk7hs4vc37q";
- name = "kxmlgui-5.78.0.tar.xz";
+ url = "${mirror}/stable/frameworks/5.79/kxmlgui-5.79.0.tar.xz";
+ sha256 = "1j8fb5i1v7pqs5as1h43nc0s2pm3i9cwks2h5388yld325ysx0v9";
+ name = "kxmlgui-5.79.0.tar.xz";
};
};
kxmlrpcclient = {
- version = "5.78.0";
+ version = "5.79.0";
src = fetchurl {
- url = "${mirror}/stable/frameworks/5.78/portingAids/kxmlrpcclient-5.78.0.tar.xz";
- sha256 = "0591c23sjwfhrf7d7z6bgikjal1h70vpjx7xmr1ypwck6pxj8z2x";
- name = "kxmlrpcclient-5.78.0.tar.xz";
+ url = "${mirror}/stable/frameworks/5.79/portingAids/kxmlrpcclient-5.79.0.tar.xz";
+ sha256 = "1cwvglsfv5m3mb5bjl7rfas1samyw703qjfiz1pf6vxgmpxdcr4a";
+ name = "kxmlrpcclient-5.79.0.tar.xz";
};
};
modemmanager-qt = {
- version = "5.78.0";
+ version = "5.79.0";
src = fetchurl {
- url = "${mirror}/stable/frameworks/5.78/modemmanager-qt-5.78.0.tar.xz";
- sha256 = "09y3pjav7dzfmplacwn0j281d59rdhlad16myaxh6hbf9zdkmnyr";
- name = "modemmanager-qt-5.78.0.tar.xz";
+ url = "${mirror}/stable/frameworks/5.79/modemmanager-qt-5.79.0.tar.xz";
+ sha256 = "0xfbchyaaqxjj66zb19k4vxi9azijf0llbql6fzxln687s3z65wd";
+ name = "modemmanager-qt-5.79.0.tar.xz";
};
};
networkmanager-qt = {
- version = "5.78.0";
+ version = "5.79.0";
src = fetchurl {
- url = "${mirror}/stable/frameworks/5.78/networkmanager-qt-5.78.0.tar.xz";
- sha256 = "0wfyczlki8sb2wydyslpi111y4hfc6xvnar8cxj75bsn83pd9wya";
- name = "networkmanager-qt-5.78.0.tar.xz";
+ url = "${mirror}/stable/frameworks/5.79/networkmanager-qt-5.79.0.tar.xz";
+ sha256 = "04iaqa2q73zvscx300bah6mnl79dai9yrmq11d1vyil99af36m6s";
+ name = "networkmanager-qt-5.79.0.tar.xz";
};
};
oxygen-icons5 = {
- version = "5.78.0";
+ version = "5.79.0";
src = fetchurl {
- url = "${mirror}/stable/frameworks/5.78/oxygen-icons5-5.78.0.tar.xz";
- sha256 = "1xp3zg59srxfc0z5cf45x7am98rsjq3p3ms2975il03389w55kr9";
- name = "oxygen-icons5-5.78.0.tar.xz";
+ url = "${mirror}/stable/frameworks/5.79/oxygen-icons5-5.79.0.tar.xz";
+ sha256 = "1j6l9r4l82gp5qcpn3xw4dzfbhsawbpk8mypnfckk73x1bjcaqss";
+ name = "oxygen-icons5-5.79.0.tar.xz";
};
};
plasma-framework = {
- version = "5.78.0";
+ version = "5.79.0";
src = fetchurl {
- url = "${mirror}/stable/frameworks/5.78/plasma-framework-5.78.0.tar.xz";
- sha256 = "10c4d7mvnjdpjcjzxy8r5k1h3pxw9d4h9ii8bkngb2kjfblf3bj6";
- name = "plasma-framework-5.78.0.tar.xz";
+ url = "${mirror}/stable/frameworks/5.79/plasma-framework-5.79.0.tar.xz";
+ sha256 = "15hbfqdyas27kj6rd24n6d80r1dcsiiv0zgjkp12x8dnjyd3vz4x";
+ name = "plasma-framework-5.79.0.tar.xz";
};
};
prison = {
- version = "5.78.0";
+ version = "5.79.0";
src = fetchurl {
- url = "${mirror}/stable/frameworks/5.78/prison-5.78.0.tar.xz";
- sha256 = "0ygsdjcxr7l7jgllf6c38rbpc4byikg7zx71dzmas7ikg4axylfk";
- name = "prison-5.78.0.tar.xz";
+ url = "${mirror}/stable/frameworks/5.79/prison-5.79.0.tar.xz";
+ sha256 = "1rn66n67g914w1klgsirqff62qv4p2l64ahzsxnbixfwy1dwlpa2";
+ name = "prison-5.79.0.tar.xz";
};
};
purpose = {
- version = "5.78.0";
+ version = "5.79.0";
src = fetchurl {
- url = "${mirror}/stable/frameworks/5.78/purpose-5.78.0.tar.xz";
- sha256 = "13v2w4kx7ir9wqyahn6rlq7li7kxigxppffjccwpfihzpnyig029";
- name = "purpose-5.78.0.tar.xz";
+ url = "${mirror}/stable/frameworks/5.79/purpose-5.79.0.tar.xz";
+ sha256 = "1mlph5mzwfqwlkvm3df3in3r3airnx4hxhy0p56ri3k3m9k2rqpz";
+ name = "purpose-5.79.0.tar.xz";
};
};
qqc2-desktop-style = {
- version = "5.78.0";
+ version = "5.79.0";
src = fetchurl {
- url = "${mirror}/stable/frameworks/5.78/qqc2-desktop-style-5.78.0.tar.xz";
- sha256 = "0a9kxfrvx0qv079vd9vx4924vs5g8qbicdp1wfv3c80ilbmn1sik";
- name = "qqc2-desktop-style-5.78.0.tar.xz";
+ url = "${mirror}/stable/frameworks/5.79/qqc2-desktop-style-5.79.0.tar.xz";
+ sha256 = "1cykbdbzxkblwp0dmgc4r3csml9l81zhfsqcjamfai6srl10vbij";
+ name = "qqc2-desktop-style-5.79.0.tar.xz";
};
};
solid = {
- version = "5.78.0";
+ version = "5.79.0";
src = fetchurl {
- url = "${mirror}/stable/frameworks/5.78/solid-5.78.0.tar.xz";
- sha256 = "1qgx9fsaxsypjfzyp3dq79skp7vhhv59ssqb1aq4168gdsai15qj";
- name = "solid-5.78.0.tar.xz";
+ url = "${mirror}/stable/frameworks/5.79/solid-5.79.0.tar.xz";
+ sha256 = "033ss326q450phf918a5py3z6ajnjj6f1nws8ngp05zi028nkhrl";
+ name = "solid-5.79.0.tar.xz";
};
};
sonnet = {
- version = "5.78.0";
+ version = "5.79.0";
src = fetchurl {
- url = "${mirror}/stable/frameworks/5.78/sonnet-5.78.0.tar.xz";
- sha256 = "1jw00bkhjf029yr6qh7mkdpizcc96103fsf68ydkbykfqsb0xry2";
- name = "sonnet-5.78.0.tar.xz";
+ url = "${mirror}/stable/frameworks/5.79/sonnet-5.79.0.tar.xz";
+ sha256 = "09b1rb88ck50g67nmki06ixxsfnz3x3jd0f334qaz147h2jklvyq";
+ name = "sonnet-5.79.0.tar.xz";
};
};
syndication = {
- version = "5.78.0";
+ version = "5.79.0";
src = fetchurl {
- url = "${mirror}/stable/frameworks/5.78/syndication-5.78.0.tar.xz";
- sha256 = "0sy2419xrkb5yqj70x2gakb53hqz7j5631pjkvai92gvk01bcbd1";
- name = "syndication-5.78.0.tar.xz";
+ url = "${mirror}/stable/frameworks/5.79/syndication-5.79.0.tar.xz";
+ sha256 = "1jyz0c67zscgspvisn43wrdgk4pxs4i3r9pyknm8nvxwiff2p1ji";
+ name = "syndication-5.79.0.tar.xz";
};
};
syntax-highlighting = {
- version = "5.78.0";
+ version = "5.79.1";
src = fetchurl {
- url = "${mirror}/stable/frameworks/5.78/syntax-highlighting-5.78.0.tar.xz";
- sha256 = "1m6ngf6nij3p09p7dhngjr9jhmc6dl12vd2x4dkj5fs8wlfbfplb";
- name = "syntax-highlighting-5.78.0.tar.xz";
+ url = "${mirror}/stable/frameworks/5.79/syntax-highlighting-5.79.1.tar.xz";
+ sha256 = "143ra8j0x1biijclnjhp6b69v04m65avp2nic9jzj9y5wjz5x0mj";
+ name = "syntax-highlighting-5.79.1.tar.xz";
};
};
threadweaver = {
- version = "5.78.0";
+ version = "5.79.0";
src = fetchurl {
- url = "${mirror}/stable/frameworks/5.78/threadweaver-5.78.0.tar.xz";
- sha256 = "1llqfmpbq0mysa1h7vx16v020zw776sqkrh85kah9478bj7ffwnr";
- name = "threadweaver-5.78.0.tar.xz";
+ url = "${mirror}/stable/frameworks/5.79/threadweaver-5.79.0.tar.xz";
+ sha256 = "062r9nhggw3dlvgpb2l6fqyyzqv35a9lgvikh2pjdicx9r2s8z19";
+ name = "threadweaver-5.79.0.tar.xz";
};
};
}
diff --git a/third_party/nixpkgs/pkgs/development/libraries/kde-frameworks/syntax-highlighting.nix b/third_party/nixpkgs/pkgs/development/libraries/kde-frameworks/syntax-highlighting.nix
index ceb8200d4c..4b3f8440c5 100644
--- a/third_party/nixpkgs/pkgs/development/libraries/kde-frameworks/syntax-highlighting.nix
+++ b/third_party/nixpkgs/pkgs/development/libraries/kde-frameworks/syntax-highlighting.nix
@@ -6,7 +6,7 @@ mkDerivation {
name = "syntax-highlighting";
meta = {
maintainers = [ lib.maintainers.ttuegel ];
- broken = builtins.compareVersions qtbase.version "5.7.0" < 0;
+ broken = builtins.compareVersions qtbase.version "5.14.0" < 0;
};
nativeBuildInputs = [ extra-cmake-modules perl ];
buildInputs = [ qttools ];
diff --git a/third_party/nixpkgs/pkgs/development/libraries/kde-frameworks/threadweaver.nix b/third_party/nixpkgs/pkgs/development/libraries/kde-frameworks/threadweaver.nix
index b95f70dd67..70e948afda 100644
--- a/third_party/nixpkgs/pkgs/development/libraries/kde-frameworks/threadweaver.nix
+++ b/third_party/nixpkgs/pkgs/development/libraries/kde-frameworks/threadweaver.nix
@@ -8,7 +8,7 @@ mkDerivation {
name = "threadweaver";
meta = {
maintainers = [ lib.maintainers.ttuegel ];
- broken = builtins.compareVersions qtbase.version "5.7.0" < 0;
+ broken = builtins.compareVersions qtbase.version "5.14.0" < 0;
};
nativeBuildInputs = [ extra-cmake-modules ];
propagatedBuildInputs = [ qtbase ];
diff --git a/third_party/nixpkgs/pkgs/development/libraries/kerberos/heimdal.nix b/third_party/nixpkgs/pkgs/development/libraries/kerberos/heimdal.nix
index 804749bbdb..3e81b45362 100644
--- a/third_party/nixpkgs/pkgs/development/libraries/kerberos/heimdal.nix
+++ b/third_party/nixpkgs/pkgs/development/libraries/kerberos/heimdal.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, fetchFromGitHub, autoreconfHook, pkg-config, python2, perl, yacc, flex
+{ lib, stdenv, fetchFromGitHub, autoreconfHook, pkg-config, python3, perl, yacc, flex
, texinfo, perlPackages
, openldap, libcap_ng, sqlite, openssl, db, libedit, pam
, CoreFoundation, Security, SystemConfiguration
@@ -20,7 +20,7 @@ stdenv.mkDerivation rec {
patches = [ ./heimdal-make-missing-headers.patch ];
- nativeBuildInputs = [ autoreconfHook pkg-config python2 perl yacc flex texinfo ]
+ nativeBuildInputs = [ autoreconfHook pkg-config python3 perl yacc flex texinfo ]
++ (with perlPackages; [ JSON ]);
buildInputs = optionals (stdenv.isLinux) [ libcap_ng ]
++ [ db sqlite openssl libedit openldap pam]
diff --git a/third_party/nixpkgs/pkgs/development/libraries/kpmcore/default.nix b/third_party/nixpkgs/pkgs/development/libraries/kpmcore/default.nix
index 315a38197a..c3621d3758 100644
--- a/third_party/nixpkgs/pkgs/development/libraries/kpmcore/default.nix
+++ b/third_party/nixpkgs/pkgs/development/libraries/kpmcore/default.nix
@@ -1,25 +1,38 @@
-{ stdenv, lib, fetchurl, extra-cmake-modules
-, qtbase, kio
-, libatasmart, parted
-, util-linux }:
+{ stdenv, lib, fetchurl, fetchpatch, extra-cmake-modules
+, qca-qt5, kauth, kio, polkit-qt, qtbase
+, util-linux
+}:
stdenv.mkDerivation rec {
pname = "kpmcore";
- version = "3.3.0";
+ # NOTE: When changing this version, also change the version of `partition-manager`.
+ version = "4.2.0";
src = fetchurl {
url = "mirror://kde/stable/${pname}/${version}/src/${pname}-${version}.tar.xz";
- sha256 = "0s6v0jfrhjg31ri5p6h9n4w29jvasf5dj954j3vfpzl91lygmmmq";
+ hash = "sha256-MvW0CqvFZtzcJlya6DIpzorPbKJai6fxt7nKsKpJn54=";
};
+ patches = [
+ # Fix build with `kcoreaddons` >= 5.77.0
+ (fetchpatch {
+ url = "https://github.com/KDE/kpmcore/commit/07e5a3ac2858e6d38cc698e0f740e7a693e9f302.patch";
+ sha256 = "sha256-LYzea888euo2HXM+acWaylSw28iwzOdZBvPBt/gjP1s=";
+ })
+ # Fix crash when `fstab` omits mount options.
+ (fetchpatch {
+ url = "https://github.com/KDE/kpmcore/commit/eea84fb60525803a789e55bb168afb968464c130.patch";
+ sha256 = "sha256-NJ3PvyRC6SKNSOlhJPrDDjepuw7IlAoufPgvml3fap0=";
+ })
+ ];
+
buildInputs = [
- qtbase
- libatasmart
- parted # we only need the library
-
+ qca-qt5
+ kauth
kio
+ polkit-qt
- util-linux # needs blkid (note that this is not provided by util-linux-compat)
+ util-linux # Needs blkid in configure script (note that this is not provided by util-linux-compat)
];
nativeBuildInputs = [ extra-cmake-modules ];
@@ -27,8 +40,11 @@ stdenv.mkDerivation rec {
dontWrapQtApps = true;
meta = with lib; {
- maintainers = with lib.maintainers; [ peterhoeg ];
+ description = "KDE Partition Manager core library";
+ homepage = "https://invent.kde.org/system/kpmcore";
+ license = with licenses; [ cc-by-40 cc0 gpl3Plus mit ];
+ maintainers = with maintainers; [ peterhoeg oxalica ];
# The build requires at least Qt 5.14:
- broken = lib.versionOlder qtbase.version "5.14";
+ broken = versionOlder qtbase.version "5.14";
};
}
diff --git a/third_party/nixpkgs/pkgs/development/libraries/lib3ds/default.nix b/third_party/nixpkgs/pkgs/development/libraries/lib3ds/default.nix
index db0bd26f4d..6e926dfb42 100644
--- a/third_party/nixpkgs/pkgs/development/libraries/lib3ds/default.nix
+++ b/third_party/nixpkgs/pkgs/development/libraries/lib3ds/default.nix
@@ -8,7 +8,7 @@ stdenv.mkDerivation rec {
sha256 = "1qr9arfdkjf7q11xhvxwzmhxqz3nhcjkyb8zzfjpz9jm54q0rc7m";
};
- buildInputs = [ unzip ];
+ nativeBuildInputs = [ unzip ];
meta = {
description = "Library for managing 3D-Studio Release 3 and 4 \".3DS\" files";
diff --git a/third_party/nixpkgs/pkgs/development/libraries/libayatana-appindicator/default.nix b/third_party/nixpkgs/pkgs/development/libraries/libayatana-appindicator/default.nix
index c7d4846833..53b0dca091 100644
--- a/third_party/nixpkgs/pkgs/development/libraries/libayatana-appindicator/default.nix
+++ b/third_party/nixpkgs/pkgs/development/libraries/libayatana-appindicator/default.nix
@@ -4,7 +4,7 @@
, gtkVersion ? "3"
, gtk2, libayatana-indicator-gtk2, libdbusmenu-gtk2
, gtk3, libayatana-indicator-gtk3, libdbusmenu-gtk3
-, dbus-glib, python2, python2Packages
+, dbus-glib,
}:
stdenv.mkDerivation rec {
@@ -20,7 +20,7 @@ stdenv.mkDerivation rec {
sha256 = "1sba0w455rdkadkhxrx4fr63m0d9blsbb1q1hcshxw1k1z2nh1gk";
};
- nativeBuildInputs = [ pkg-config autoreconfHook gtk-doc gobject-introspection python2 python2Packages.pygtk dbus-glib ];
+ nativeBuildInputs = [ pkg-config autoreconfHook gtk-doc gobject-introspection dbus-glib ];
buildInputs =
lib.lists.optional (gtkVersion == "2") libayatana-indicator-gtk2
diff --git a/third_party/nixpkgs/pkgs/development/libraries/libb64/default.nix b/third_party/nixpkgs/pkgs/development/libraries/libb64/default.nix
index f524e9321f..41d07d58cb 100644
--- a/third_party/nixpkgs/pkgs/development/libraries/libb64/default.nix
+++ b/third_party/nixpkgs/pkgs/development/libraries/libb64/default.nix
@@ -9,7 +9,7 @@ stdenv.mkDerivation rec {
sha256 = "1lxzi6v10qsl2r6633dx0zwqyvy0j19nmwclfd0d7qybqmhqsg9l";
};
- buildInputs = [ unzip ];
+ nativeBuildInputs = [ unzip ];
installPhase = ''
mkdir -p $out $out/lib $out/bin $out/include
diff --git a/third_party/nixpkgs/pkgs/development/libraries/libck/default.nix b/third_party/nixpkgs/pkgs/development/libraries/libck/default.nix
index accb655601..a46a7b3390 100644
--- a/third_party/nixpkgs/pkgs/development/libraries/libck/default.nix
+++ b/third_party/nixpkgs/pkgs/development/libraries/libck/default.nix
@@ -21,6 +21,6 @@ stdenv.mkDerivation rec {
license = with licenses; [ asl20 bsd2 ];
homepage = "http://concurrencykit.org/";
platforms = platforms.unix;
- maintainers = with maintainers; [ chessai ];
+ maintainers = with maintainers; [ chessai thoughtpolice ];
};
}
diff --git a/third_party/nixpkgs/pkgs/development/libraries/libdeflate/default.nix b/third_party/nixpkgs/pkgs/development/libraries/libdeflate/default.nix
index f0bf60cdfb..d7a4aa91fb 100644
--- a/third_party/nixpkgs/pkgs/development/libraries/libdeflate/default.nix
+++ b/third_party/nixpkgs/pkgs/development/libraries/libdeflate/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, lib, fetchFromGitHub }:
+{ stdenv, lib, fetchFromGitHub, fixDarwinDylibNames }:
stdenv.mkDerivation rec {
pname = "libdeflate";
@@ -15,6 +15,8 @@ stdenv.mkDerivation rec {
substituteInPlace Makefile --replace /usr/local $out
'';
+ nativeBuildInputs = lib.optional stdenv.hostPlatform.isDarwin fixDarwinDylibNames;
+
configurePhase = ''
make programs/config.h
'';
diff --git a/third_party/nixpkgs/pkgs/development/libraries/libedit/default.nix b/third_party/nixpkgs/pkgs/development/libraries/libedit/default.nix
index 92f3eeb799..dc5a384569 100644
--- a/third_party/nixpkgs/pkgs/development/libraries/libedit/default.nix
+++ b/third_party/nixpkgs/pkgs/development/libraries/libedit/default.nix
@@ -2,11 +2,11 @@
stdenv.mkDerivation rec {
pname = "libedit";
- version = "20191231-3.1";
+ version = "20210216-3.1";
src = fetchurl {
url = "https://thrysoee.dk/editline/${pname}-${version}.tar.gz";
- sha256 = "0wch48nml28jj6ild889745dsg2agm7mpvrmbl1gi98nw6vjrf6v";
+ sha256 = "sha256-IoP3QdKquTXIxSwEtXv5UtAsLALmURcvisgR93sfx3o=";
};
outputs = [ "out" "dev" ];
diff --git a/third_party/nixpkgs/pkgs/development/libraries/libf2c/default.nix b/third_party/nixpkgs/pkgs/development/libraries/libf2c/default.nix
index 85ff493ca0..ce1c35c7ec 100644
--- a/third_party/nixpkgs/pkgs/development/libraries/libf2c/default.nix
+++ b/third_party/nixpkgs/pkgs/development/libraries/libf2c/default.nix
@@ -22,7 +22,7 @@ stdenv.mkDerivation rec {
cp f2c.h $out/include
'';
- buildInputs = [ unzip ];
+ nativeBuildInputs = [ unzip ];
hardeningDisable = [ "format" ];
diff --git a/third_party/nixpkgs/pkgs/development/libraries/libgcrypt/default.nix b/third_party/nixpkgs/pkgs/development/libraries/libgcrypt/default.nix
index 80cd5bc13c..6b761d2170 100644
--- a/third_party/nixpkgs/pkgs/development/libraries/libgcrypt/default.nix
+++ b/third_party/nixpkgs/pkgs/development/libraries/libgcrypt/default.nix
@@ -1,27 +1,16 @@
-{ lib, stdenv, fetchurl, gettext, libgpgerror, enableCapabilities ? false, libcap
-, buildPackages, fetchpatch
-}:
+{ lib, stdenv, fetchurl, gettext, libgpgerror, enableCapabilities ? false, libcap, buildPackages }:
assert enableCapabilities -> stdenv.isLinux;
stdenv.mkDerivation rec {
pname = "libgcrypt";
- version = "1.9.1";
+ version = "1.9.2";
src = fetchurl {
url = "mirror://gnupg/libgcrypt/${pname}-${version}.tar.bz2";
- sha256 = "1nb50bgzp83q6r5cz4v40y1mcbhpqwqyxlay87xp1lrbkf5pm9n5";
+ sha256 = "sha256-ssENCRUTsnHkcXcnRgex/7o9lbGIu/qHl/lIrskFPFo=";
};
- patches = [
- # fix build on 32bit musl
- (fetchpatch {
- name = "fix_building_with_disable-asm_on_x86.patch";
- url = "https://git.gnupg.org/cgi-bin/gitweb.cgi?p=libgcrypt.git;a=commitdiff_plain;h=af23ab5c5482d625ff52e60606cf044e2b0106c8";
- sha256 = "1m8apm8wra6fk89ggha4d0bba5absihm38zvb2khklqh9q5hj9jw";
- })
- ];
-
outputs = [ "out" "dev" "info" ];
outputBin = "dev";
diff --git a/third_party/nixpkgs/pkgs/development/libraries/libgphoto2/default.nix b/third_party/nixpkgs/pkgs/development/libraries/libgphoto2/default.nix
index 4dec3151a7..3e3fa1a725 100644
--- a/third_party/nixpkgs/pkgs/development/libraries/libgphoto2/default.nix
+++ b/third_party/nixpkgs/pkgs/development/libraries/libgphoto2/default.nix
@@ -7,13 +7,13 @@
stdenv.mkDerivation rec {
pname = "libgphoto2";
- version = "2.5.26";
+ version = "2.5.27";
src = fetchFromGitHub {
owner = "gphoto";
repo = "libgphoto2";
rev = "libgphoto2-${builtins.replaceStrings [ "." ] [ "_" ] version}-release";
- sha256 = "0lnlxflj04ng9a0hm2nb2067kqs4kp9kx1z4gg395cgbfd7lx6j6";
+ sha256 = "sha256-c7fBl6GBLAU+RL5WFC4PL+n/nEHZUfqIJ9qq1+qNNCg=";
};
patches = [];
diff --git a/third_party/nixpkgs/pkgs/development/libraries/libhttpseverywhere/default.nix b/third_party/nixpkgs/pkgs/development/libraries/libhttpseverywhere/default.nix
index f54929c537..648eb89a51 100644
--- a/third_party/nixpkgs/pkgs/development/libraries/libhttpseverywhere/default.nix
+++ b/third_party/nixpkgs/pkgs/development/libraries/libhttpseverywhere/default.nix
@@ -1,5 +1,5 @@
{ lib, stdenv, fetchurl, pkg-config, meson, ninja, makeFontsConf, vala, fetchpatch
-, gnome3, glib, json-glib, libarchive, libsoup, gobject-introspection }:
+, gnome3, libgee, glib, json-glib, libarchive, libsoup, gobject-introspection }:
let
pname = "libhttpseverywhere";
@@ -13,7 +13,7 @@ in stdenv.mkDerivation rec {
};
nativeBuildInputs = [ vala gobject-introspection meson ninja pkg-config ];
- buildInputs = [ glib gnome3.libgee json-glib libsoup libarchive ];
+ buildInputs = [ glib libgee json-glib libsoup libarchive ];
# Fixes build with vala >=0.42
patches = [
diff --git a/third_party/nixpkgs/pkgs/development/libraries/libimagequant/default.nix b/third_party/nixpkgs/pkgs/development/libraries/libimagequant/default.nix
index c988c49a6e..ad1df00c25 100644
--- a/third_party/nixpkgs/pkgs/development/libraries/libimagequant/default.nix
+++ b/third_party/nixpkgs/pkgs/development/libraries/libimagequant/default.nix
@@ -2,13 +2,13 @@
stdenv.mkDerivation rec {
pname = "libimagequant";
- version = "2.14.0";
+ version = "2.14.1";
src = fetchFromGitHub {
owner = "ImageOptim";
repo = pname;
rev = version;
- sha256 = "sha256-XP/GeZC8TCgBPqtScY9eneZHFter1kdWf/yko0p2VYQ=";
+ sha256 = "sha256-yWtwBTAs6dlrZz3Bd/4DUb488IJsahPKwjluukTlv/o=";
};
preConfigure = ''
diff --git a/third_party/nixpkgs/pkgs/development/libraries/libixp-hg/default.nix b/third_party/nixpkgs/pkgs/development/libraries/libixp-hg/default.nix
index 489f526248..77df340a55 100644
--- a/third_party/nixpkgs/pkgs/development/libraries/libixp-hg/default.nix
+++ b/third_party/nixpkgs/pkgs/development/libraries/libixp-hg/default.nix
@@ -14,7 +14,8 @@ stdenv.mkDerivation rec {
sed -i -e "s|^PREFIX.*=.*$|PREFIX = $out|" config.mk
'';
- buildInputs = [ unzip txt2tags ];
+ nativeBuildInputs = [ unzip ];
+ buildInputs = [ txt2tags ];
meta = {
homepage = "http://repo.cat-v.org/libixp/"; # see also https://libs.suckless.org/deprecated/libixp
diff --git a/third_party/nixpkgs/pkgs/development/libraries/libjson/default.nix b/third_party/nixpkgs/pkgs/development/libraries/libjson/default.nix
index 42d723b3b1..16a69f6da6 100644
--- a/third_party/nixpkgs/pkgs/development/libraries/libjson/default.nix
+++ b/third_party/nixpkgs/pkgs/development/libraries/libjson/default.nix
@@ -9,7 +9,7 @@ in stdenv.mkDerivation {
sha256 = "0xkk5qc7kjcdwz9l04kmiz1nhmi7iszl3k165phf53h3a4wpl9h7";
};
patches = [ ./install-fix.patch ];
- buildInputs = [ unzip ];
+ nativeBuildInputs = [ unzip ];
makeFlags = [ "prefix=$(out)" ];
preInstall = "mkdir -p $out/lib";
diff --git a/third_party/nixpkgs/pkgs/development/libraries/liblangtag/default.nix b/third_party/nixpkgs/pkgs/development/libraries/liblangtag/default.nix
index 5a7f2fe4b3..5c31197ebf 100644
--- a/third_party/nixpkgs/pkgs/development/libraries/liblangtag/default.nix
+++ b/third_party/nixpkgs/pkgs/development/libraries/liblangtag/default.nix
@@ -35,9 +35,8 @@ stdenv.mkDerivation rec {
"--with-locale-alias=${stdenv.cc.libc}/share/locale/locale.alias"
];
- buildInputs = [ gettext glib libxml2 gobject-introspection gnome-common
- unzip ];
- nativeBuildInputs = [ autoreconfHook gtk-doc gettext pkg-config ];
+ buildInputs = [ gettext glib libxml2 gobject-introspection gnome-common ];
+ nativeBuildInputs = [ autoreconfHook gtk-doc gettext pkg-config unzip ];
meta = {
inherit version;
diff --git a/third_party/nixpkgs/pkgs/development/libraries/libndctl/default.nix b/third_party/nixpkgs/pkgs/development/libraries/libndctl/default.nix
index b7e082f2b9..91a2c378c0 100644
--- a/third_party/nixpkgs/pkgs/development/libraries/libndctl/default.nix
+++ b/third_party/nixpkgs/pkgs/development/libraries/libndctl/default.nix
@@ -5,13 +5,13 @@
stdenv.mkDerivation rec {
pname = "libndctl";
- version = "70.1";
+ version = "71.1";
src = fetchFromGitHub {
owner = "pmem";
repo = "ndctl";
rev = "v${version}";
- sha256 = "09ymdibcr18vpmyf2n0xrnzgccfvr7iy3p2l5lbh7cgz7djyl5wq";
+ sha256 = "sha256-osux3DiKRh8ftHwyfFI+WSFx20+yJsg1nVx5nuoKJu4=";
};
outputs = [ "out" "lib" "man" "dev" ];
diff --git a/third_party/nixpkgs/pkgs/development/libraries/libproxy/default.nix b/third_party/nixpkgs/pkgs/development/libraries/libproxy/default.nix
index afd1a6365b..afe5b8dde1 100644
--- a/third_party/nixpkgs/pkgs/development/libraries/libproxy/default.nix
+++ b/third_party/nixpkgs/pkgs/development/libraries/libproxy/default.nix
@@ -3,10 +3,9 @@
, pkg-config
, cmake
, zlib
-, fetchpatch
, dbus
, networkmanager
-, spidermonkey_60
+, spidermonkey_68
, pcre
, gsettings-desktop-schemas
, glib
@@ -19,13 +18,13 @@
stdenv.mkDerivation rec {
pname = "libproxy";
- version = "0.4.15";
+ version = "0.4.17";
src = fetchFromGitHub {
owner = "libproxy";
repo = "libproxy";
rev = version;
- sha256 = "10swd3x576pinx33iwsbd4h15fbh2snmfxzcmab4c56nb08qlbrs";
+ sha256 = "0v8q4ln0pd5231kidpi8wpwh0chcjwcmawcki53czlpdrc09z96r";
};
outputs = [ "out" "dev" "py3" ];
@@ -46,7 +45,7 @@ stdenv.mkDerivation rec {
JavaScriptCore
] else [
glib
- spidermonkey_60
+ spidermonkey_68
dbus
networkmanager
]);
@@ -57,38 +56,6 @@ stdenv.mkDerivation rec {
"-DPYTHON3_SITEPKG_DIR=${placeholder "py3"}/${python3.sitePackages}"
];
- patches = [
- # Make build with spidermonkey_60
- (fetchpatch {
- url = "https://github.com/libproxy/libproxy/pull/86.patch";
- sha256 = "17c06ilinrnzr7xnnmw9pc6zrncyaxcdd6r6k1ah5p156skbykfs";
- })
- (fetchpatch {
- url = "https://github.com/libproxy/libproxy/pull/87.patch";
- sha256 = "0sagzfwm16f33inbkwsp88w9wmrd034rjmw0y8d122f7k1qfx6zc";
- })
- (fetchpatch {
- url = "https://github.com/libproxy/libproxy/pull/95.patch";
- sha256 = "18vyr6wlis9zfwml86606jpgb9mss01l9aj31iiciml8p857aixi";
- })
- (fetchpatch {
- name = "CVE-2020-25219.patch";
- url = "https://github.com/libproxy/libproxy/commit/a83dae404feac517695c23ff43ce1e116e2bfbe0.patch";
- sha256 = "0wdh9qjq99aw0jnf2840237i3hagqzy42s09hz9chfgrw8pyr72k";
- })
- (fetchpatch {
- name = "CVE-2020-26154.patch";
- url = "https://github.com/libproxy/libproxy/commit/4411b523545b22022b4be7d0cac25aa170ae1d3e.patch";
- sha256 = "0pdy9sw49lxpaiwq073cisk0npir5bkch70nimdmpszxwp3fv1d8";
- })
-
- ] ++ lib.optionals stdenv.isDarwin [
- (fetchpatch {
- url = "https://github.com/libproxy/libproxy/commit/44158f03f8522116758d335688ed840dfcb50ac8.patch";
- sha256 = "0axfvb6j7gcys6fkwi9dkn006imhvm3kqr83gpwban8419n0q5v1";
- })
- ];
-
postFixup = lib.optionalString stdenv.isLinux ''
# config_gnome3 uses the helper to find GNOME proxy settings
wrapProgram $out/libexec/pxgsettings --prefix XDG_DATA_DIRS : "${gsettings-desktop-schemas}/share/gsettings-schemas/${gsettings-desktop-schemas.name}"
diff --git a/third_party/nixpkgs/pkgs/development/libraries/libqmi/default.nix b/third_party/nixpkgs/pkgs/development/libraries/libqmi/default.nix
index 42d8cbf285..8a3179b034 100644
--- a/third_party/nixpkgs/pkgs/development/libraries/libqmi/default.nix
+++ b/third_party/nixpkgs/pkgs/development/libraries/libqmi/default.nix
@@ -1,33 +1,54 @@
-{ lib, stdenv, fetchurl, pkg-config, gobject-introspection, glib, python3, libgudev, libmbim }:
+{ lib
+, stdenv
+, fetchurl
+, pkg-config
+, gobject-introspection
+, gtk-doc
+, docbook-xsl-nons
+, docbook_xml_dtd_43
+, glib
+, python3
+, libgudev
+, libmbim
+, libqrtr-glib
+}:
stdenv.mkDerivation rec {
pname = "libqmi";
- version = "1.26.10";
-
- src = fetchurl {
- url = "https://www.freedesktop.org/software/libqmi/${pname}-${version}.tar.xz";
- sha256 = "sha256-fABD8GyHXlzx3jwMlMzH9bBYYry82eT7DV0UJ30dq1k=";
- };
+ version = "1.28.2";
outputs = [ "out" "dev" "devdoc" ];
- configureFlags = [
- "--with-udev-base-dir=${placeholder "out"}/lib/udev"
- "--enable-introspection"
- ];
+ src = fetchurl {
+ url = "https://www.freedesktop.org/software/libqmi/${pname}-${version}.tar.xz";
+ sha256 = "jIw+5xmHTSUpvOmzWwKP5DWzbwA5eaNg060JOESdt4M=";
+ };
nativeBuildInputs = [
pkg-config
gobject-introspection
python3
+ gtk-doc
+ docbook-xsl-nons
+ docbook_xml_dtd_43
];
buildInputs = [
- glib
libgudev
libmbim
];
+ propagatedBuildInputs = [
+ glib
+ libqrtr-glib
+ ];
+
+ configureFlags = [
+ "--with-udev-base-dir=${placeholder "out"}/lib/udev"
+ "--enable-gtk-doc"
+ "--enable-introspection"
+ ];
+
enableParallelBuilding = true;
doCheck = true;
@@ -35,7 +56,13 @@ stdenv.mkDerivation rec {
meta = with lib; {
homepage = "https://www.freedesktop.org/wiki/Software/libqmi/";
description = "Modem protocol helper library";
+ maintainers = teams.freedesktop.members;
platforms = platforms.linux;
- license = licenses.gpl2;
+ license = with licenses; [
+ # Library
+ lgpl2Plus
+ # Tools
+ gpl2Plus
+ ];
};
}
diff --git a/third_party/nixpkgs/pkgs/development/libraries/libqrtr-glib/default.nix b/third_party/nixpkgs/pkgs/development/libraries/libqrtr-glib/default.nix
new file mode 100644
index 0000000000..29097710a6
--- /dev/null
+++ b/third_party/nixpkgs/pkgs/development/libraries/libqrtr-glib/default.nix
@@ -0,0 +1,46 @@
+{ lib
+, stdenv
+, fetchurl
+, pkg-config
+, gobject-introspection
+, gtk-doc
+, docbook-xsl-nons
+, docbook_xml_dtd_43
+, glib
+}:
+
+stdenv.mkDerivation rec {
+ pname = "libqrtr-glib";
+ version = "1.0.0";
+
+ outputs = [ "out" "dev" "devdoc" ];
+
+ src = fetchurl {
+ url = "https://www.freedesktop.org/software/libqmi/${pname}-${version}.tar.xz";
+ sha256 = "MNh5sq3m+PRh3vOmd3VdtcAji6v2iNXIPAOz5qvjXO4=";
+ };
+
+ nativeBuildInputs = [
+ pkg-config
+ gobject-introspection
+ gtk-doc
+ docbook-xsl-nons
+ docbook_xml_dtd_43
+ ];
+
+ buildInputs = [
+ glib
+ ];
+
+ configureFlags = [
+ "--enable-gtk-doc"
+ ];
+
+ meta = with lib; {
+ homepage = "https://gitlab.freedesktop.org/mobile-broadband/libqrtr-glib";
+ description = "Qualcomm IPC Router protocol helper library";
+ maintainers = teams.freedesktop.members;
+ platforms = platforms.linux;
+ license = licenses.lgpl2Plus;
+ };
+}
diff --git a/third_party/nixpkgs/pkgs/development/libraries/libressl/default.nix b/third_party/nixpkgs/pkgs/development/libraries/libressl/default.nix
index b7724d27a0..3dffccf5f4 100644
--- a/third_party/nixpkgs/pkgs/development/libraries/libressl/default.nix
+++ b/third_party/nixpkgs/pkgs/development/libraries/libressl/default.nix
@@ -64,7 +64,12 @@ let
in {
libressl_3_1 = generic {
- version = "3.1.4";
- sha256 = "1dnbbnr43jashxivnafmh9gnn57c7ayva788ba03z633k6f18k21";
+ version = "3.1.5";
+ sha256 = "1504a1sf43frw43j14pij0q1f48rm5q86ggrlxxhw708qp7ds4rc";
+ };
+
+ libressl_3_2 = generic {
+ version = "3.2.5";
+ sha256 = "1zkwrs3b19s1ybz4q9hrb7pqsbsi8vxcs44qanfy11fkc7ynb2kr";
};
}
diff --git a/third_party/nixpkgs/pkgs/development/libraries/libseat/default.nix b/third_party/nixpkgs/pkgs/development/libraries/libseat/default.nix
new file mode 100644
index 0000000000..bdefb51b50
--- /dev/null
+++ b/third_party/nixpkgs/pkgs/development/libraries/libseat/default.nix
@@ -0,0 +1,37 @@
+{ fetchFromSourcehut
+, lib
+, meson
+, ninja
+, pkg-config
+, stdenv
+, systemd
+}:
+
+stdenv.mkDerivation rec {
+ pname = "libseat";
+ version = "0.5.0";
+
+ src = fetchFromSourcehut {
+ owner = "~kennylevinsen";
+ repo = "seatd";
+ rev = version;
+ sha256 = "sha256-JwlJLHkRgSRqfQEhXbzuFTmhxfbwKVdLICPbTDbC9M0=";
+ };
+
+ nativeBuildInputs = [ meson ninja pkg-config ];
+
+ buildInputs = [
+ systemd
+ ];
+
+ mesonFlags = [ "-Dserver=disabled" "-Dseatd=disabled" "-Dlogind=enabled"];
+
+ meta = with lib; {
+ description = "A universal seat management library";
+ changelog = "https://git.sr.ht/~kennylevinsen/seatd/refs/${version}";
+ homepage = "https://sr.ht/~kennylevinsen/seatd/";
+ license = licenses.mit;
+ platforms = platforms.linux;
+ maintainers = with maintainers; [ emantor ];
+ };
+}
diff --git a/third_party/nixpkgs/pkgs/development/libraries/libspotify/default.nix b/third_party/nixpkgs/pkgs/development/libraries/libspotify/default.nix
index b39944d13d..004460abe3 100644
--- a/third_party/nixpkgs/pkgs/development/libraries/libspotify/default.nix
+++ b/third_party/nixpkgs/pkgs/development/libraries/libspotify/default.nix
@@ -47,7 +47,7 @@ else stdenv.mkDerivation {
# darwin-specific
- buildInputs = lib.optional (stdenv.hostPlatform.system == "x86_64-darwin") unzip;
+ nativeBuildInputs = lib.optional (stdenv.hostPlatform.system == "x86_64-darwin") unzip;
# linux-specific
installFlags = lib.optional isLinux
diff --git a/third_party/nixpkgs/pkgs/development/libraries/libtiff/default.nix b/third_party/nixpkgs/pkgs/development/libraries/libtiff/default.nix
index 2fad298889..46c13bbe4a 100644
--- a/third_party/nixpkgs/pkgs/development/libraries/libtiff/default.nix
+++ b/third_party/nixpkgs/pkgs/development/libraries/libtiff/default.nix
@@ -4,18 +4,19 @@
, pkg-config
, cmake
-, zlib
+, libdeflate
, libjpeg
, xz
+, zlib
}:
stdenv.mkDerivation rec {
- version = "4.1.0";
pname = "libtiff";
+ version = "4.2.0";
src = fetchurl {
url = "https://download.osgeo.org/libtiff/tiff-${version}.tar.gz";
- sha256 = "0d46bdvxdiv59lxnb0xz9ywm8arsr6xsapi5s6y6vnys2wjz6aax";
+ sha256 = "1jrkjv0xya9radddn8idxvs2gqzp3l2b1s8knlizmn7ad3jq817b";
};
cmakeFlags = if stdenv.isDarwin then [
@@ -35,7 +36,9 @@ stdenv.mkDerivation rec {
nativeBuildInputs = [ cmake pkg-config ];
- propagatedBuildInputs = [ zlib libjpeg xz ]; #TODO: opengl support (bogus configure detection)
+ propagatedBuildInputs = [ libjpeg xz zlib ]; #TODO: opengl support (bogus configure detection)
+
+ buildInputs = [ libdeflate ]; # TODO: move all propagatedBuildInputs to buildInputs.
enableParallelBuilding = true;
diff --git a/third_party/nixpkgs/pkgs/development/libraries/libwacom/default.nix b/third_party/nixpkgs/pkgs/development/libraries/libwacom/default.nix
index 88b1f32714..c17b8be592 100644
--- a/third_party/nixpkgs/pkgs/development/libraries/libwacom/default.nix
+++ b/third_party/nixpkgs/pkgs/development/libraries/libwacom/default.nix
@@ -2,7 +2,7 @@
stdenv.mkDerivation rec {
pname = "libwacom";
- version = "1.8";
+ version = "1.9";
outputs = [ "out" "dev" ];
@@ -10,7 +10,7 @@ stdenv.mkDerivation rec {
owner = "linuxwacom";
repo = "libwacom";
rev = "libwacom-${version}";
- sha256 = "sha256-vkBkOE4aVX/6xKjslkqlZkh5jdYVEawvvBLpj8PpuiA=";
+ sha256 = "sha256-o1xCSrWKPzz1GePEVB1jgx2cGzRtw0I6c4wful08Vx4=";
};
nativeBuildInputs = [ pkg-config meson ninja doxygen ];
diff --git a/third_party/nixpkgs/pkgs/development/libraries/md4c/default.nix b/third_party/nixpkgs/pkgs/development/libraries/md4c/default.nix
new file mode 100644
index 0000000000..a711ecb7c7
--- /dev/null
+++ b/third_party/nixpkgs/pkgs/development/libraries/md4c/default.nix
@@ -0,0 +1,59 @@
+{ lib
+, stdenv
+, fetchFromGitHub
+, cmake
+, pkg-config
+}:
+
+stdenv.mkDerivation rec {
+ pname = "md4c";
+ version = "0.4.7";
+
+ src = fetchFromGitHub {
+ owner = "mity";
+ repo = pname;
+ rev = "release-${version}";
+ hash = "sha256-nfMXUP1wu3ifn1QVTO/+XcfFRsThG8PlmYRv+b8AYlQ=";
+ };
+
+ nativeBuildInputs = [
+ cmake
+ pkg-config
+ ];
+
+ meta = with lib; {
+ homepage = "https://github.com/mity/md4c";
+ description = "Markdown parser made in C";
+ longDescription = ''
+ MD4C is Markdown parser implementation in C, with the following features:
+
+ - Compliance: Generally, MD4C aims to be compliant to the latest version
+ of CommonMark specification. Currently, we are fully compliant to
+ CommonMark 0.29.
+ - Extensions: MD4C supports some commonly requested and accepted
+ extensions. See below.
+ - Performance: MD4C is very fast.
+ - Compactness: MD4C parser is implemented in one source file and one
+ header file. There are no dependencies other than standard C library.
+ - Embedding: MD4C parser is easy to reuse in other projects, its API is
+ very straightforward: There is actually just one function, md_parse().
+ - Push model: MD4C parses the complete document and calls few callback
+ functions provided by the application to inform it about a start/end of
+ every block, a start/end of every span, and with any textual contents.
+ - Portability: MD4C builds and works on Windows and POSIX-compliant
+ OSes. (It should be simple to make it run also on most other platforms,
+ at least as long as the platform provides C standard library, including
+ a heap memory management.)
+ - Encoding: MD4C by default expects UTF-8 encoding of the input
+ document. But it can be compiled to recognize ASCII-only control
+ characters (i.e. to disable all Unicode-specific code), or (on Windows)
+ to expect UTF-16 (i.e. what is on Windows commonly called just
+ "Unicode"). See more details below.
+ - Permissive license: MD4C is available under the MIT license.
+ '';
+ license = licenses.mit;
+ maintainers = with maintainers; [ AndersonTorres ];
+ platforms = platforms.all;
+ };
+}
+# TODO: enable tests (needs Python)
diff --git a/third_party/nixpkgs/pkgs/development/libraries/minizip2/default.nix b/third_party/nixpkgs/pkgs/development/libraries/minizip2/default.nix
index 16bb2b8d44..591bb8c8dc 100644
--- a/third_party/nixpkgs/pkgs/development/libraries/minizip2/default.nix
+++ b/third_party/nixpkgs/pkgs/development/libraries/minizip2/default.nix
@@ -2,13 +2,13 @@
stdenv.mkDerivation rec {
pname = "minizip";
- version = "2.10.4";
+ version = "2.10.6";
src = fetchFromGitHub {
owner = "nmoinvaz";
repo = pname;
rev = version;
- sha256 = "15bbagngvm738prkzv7lfs64pn4pq7jkhwz571j0w0nb5nw9c01x";
+ sha256 = "sha256-OAm4OZeQdP2Q/UKYI9bR7OV9RmLmYF/j2NpK5TPoE60=";
};
nativeBuildInputs = [ cmake pkg-config ];
diff --git a/third_party/nixpkgs/pkgs/development/libraries/muparser/default.nix b/third_party/nixpkgs/pkgs/development/libraries/muparser/default.nix
index 85c9f781cc..f213f39c06 100644
--- a/third_party/nixpkgs/pkgs/development/libraries/muparser/default.nix
+++ b/third_party/nixpkgs/pkgs/development/libraries/muparser/default.nix
@@ -10,9 +10,8 @@ stdenv.mkDerivation rec {
sha256 = "00l92k231yb49wijzkspa2l58mapn6vh2dlxnlg0pawjjfv33s6z";
};
- buildInputs = [
- unzip
- ] ++ lib.optionals stdenv.isDarwin [setfile];
+ nativeBuildInputs = [ unzip ];
+ buildInputs = lib.optionals stdenv.isDarwin [setfile];
meta = {
homepage = "http://muparser.sourceforge.net";
diff --git a/third_party/nixpkgs/pkgs/development/libraries/mygui/default.nix b/third_party/nixpkgs/pkgs/development/libraries/mygui/default.nix
index 4260e30561..8e63cb6812 100644
--- a/third_party/nixpkgs/pkgs/development/libraries/mygui/default.nix
+++ b/third_party/nixpkgs/pkgs/development/libraries/mygui/default.nix
@@ -14,8 +14,8 @@ in stdenv.mkDerivation rec {
sha256 = "0a4zi8w18pjj813n7kmxldl1d9r1jp0iyhkw7pbqgl8f7qaq994w";
};
- nativeBuildInputs = [ cmake pkg-config ];
- buildInputs = [ libX11 unzip ois freetype libuuid boost ]
+ nativeBuildInputs = [ cmake pkg-config unzip ];
+ buildInputs = [ libX11 ois freetype libuuid boost ]
++ (if withOgre then [ ogre ] else [ libGL libGLU ]);
# Tools are disabled due to compilation failures.
diff --git a/third_party/nixpkgs/pkgs/development/libraries/nvidia-video-sdk/default.nix b/third_party/nixpkgs/pkgs/development/libraries/nvidia-video-sdk/default.nix
index 3a63bad03d..22161e3dc1 100644
--- a/third_party/nixpkgs/pkgs/development/libraries/nvidia-video-sdk/default.nix
+++ b/third_party/nixpkgs/pkgs/development/libraries/nvidia-video-sdk/default.nix
@@ -9,7 +9,7 @@ stdenv.mkDerivation {
sha256 = "08h1vnqsv22js9v3pyim5yb80z87baxb7s2g5gsvvjax07j7w8h5";
};
- buildInputs = [ unzip ];
+ nativeBuildInputs = [ unzip ];
# We only need the header files. The library files are
# in the nvidia_x11 driver.
diff --git a/third_party/nixpkgs/pkgs/development/libraries/openexrid-unstable/default.nix b/third_party/nixpkgs/pkgs/development/libraries/openexrid-unstable/default.nix
index ce35aa1c65..1e3ee98964 100644
--- a/third_party/nixpkgs/pkgs/development/libraries/openexrid-unstable/default.nix
+++ b/third_party/nixpkgs/pkgs/development/libraries/openexrid-unstable/default.nix
@@ -25,7 +25,8 @@ stdenv.mkDerivation {
-I${openfx.dev}/include/OpenFX
'';
- buildInputs = [ unzip re2 openfx zlib ilmbase libGLU libGL openexr ];
+ nativeBuildInputs = [ unzip ];
+ buildInputs = [ re2 openfx zlib ilmbase libGLU libGL openexr ];
enableParallelBuilding = true;
diff --git a/third_party/nixpkgs/pkgs/development/libraries/openfx/default.nix b/third_party/nixpkgs/pkgs/development/libraries/openfx/default.nix
index 0d8afe53df..a26e97798a 100644
--- a/third_party/nixpkgs/pkgs/development/libraries/openfx/default.nix
+++ b/third_party/nixpkgs/pkgs/development/libraries/openfx/default.nix
@@ -11,7 +11,7 @@ stdenv.mkDerivation {
sha256 = "0k9ggzr6bisn77mipjfvawg3mv4bz50b63v8f7w1jhldi1sfy548";
};
- buildInputs = [ unzip ];
+ nativeBuildInputs = [ unzip ];
outputs = [ "dev" "out" ];
diff --git a/third_party/nixpkgs/pkgs/development/libraries/openvdb/default.nix b/third_party/nixpkgs/pkgs/development/libraries/openvdb/default.nix
index 5f3a03a3f5..b5317ce9aa 100644
--- a/third_party/nixpkgs/pkgs/development/libraries/openvdb/default.nix
+++ b/third_party/nixpkgs/pkgs/development/libraries/openvdb/default.nix
@@ -14,7 +14,8 @@ stdenv.mkDerivation rec
outputs = [ "out" ];
- buildInputs = [ unzip openexr boost tbb jemalloc c-blosc ilmbase ];
+ nativeBuildInputs = [ unzip ];
+ buildInputs = [ openexr boost tbb jemalloc c-blosc ilmbase ];
setSourceRoot = ''
sourceRoot=$(echo */openvdb)
diff --git a/third_party/nixpkgs/pkgs/development/libraries/physics/fastnlo/default.nix b/third_party/nixpkgs/pkgs/development/libraries/physics/fastnlo/default.nix
index 916303f00c..87e2ae9631 100644
--- a/third_party/nixpkgs/pkgs/development/libraries/physics/fastnlo/default.nix
+++ b/third_party/nixpkgs/pkgs/development/libraries/physics/fastnlo/default.nix
@@ -1,4 +1,15 @@
-{ lib, stdenv, fetchurl, boost, fastjet, gfortran, lhapdf, python2, root, yoda, zlib }:
+{ lib
+, stdenv
+, fetchurl
+, boost
+, fastjet
+, gfortran
+, lhapdf
+, python2
+, root
+, yoda
+, zlib
+}:
stdenv.mkDerivation rec {
pname = "fastnlo_toolkit";
@@ -9,8 +20,19 @@ stdenv.mkDerivation rec {
sha256 = "1h41xnqcz401x3zbs8i2dsb4xlhbv8i5ps0561p6y7gcyridgcbl";
};
- buildInputs = [ boost fastjet gfortran gfortran.cc.lib lhapdf python2 root yoda ];
- propagatedBuildInputs = [ zlib ];
+ buildInputs = [
+ boost
+ fastjet
+ gfortran
+ gfortran.cc.lib
+ lhapdf
+ python2
+ root
+ yoda
+ ];
+ propagatedBuildInputs = [
+ zlib
+ ];
preConfigure = ''
substituteInPlace ./fastnlotoolkit/Makefile.in \
@@ -23,11 +45,22 @@ stdenv.mkDerivation rec {
enableParallelBuilding = true;
- meta = {
- description = "A computer code to create and evaluate fast interpolation tables of pre-computed coefficients in perturbation theory for observables in hadron-induced processes";
- license = lib.licenses.gpl3;
- homepage = "http://fastnlo.hepforge.org";
- platforms = lib.platforms.unix;
- maintainers = with lib.maintainers; [ veprbl ];
+ meta = with lib; {
+ homepage = "http://fastnlo.hepforge.org";
+ description = "Fast pQCD calculations for hadron-induced processes";
+ longDescription = ''
+ The fastNLO project provides computer code to create and evaluate fast
+ interpolation tables of pre-computed coefficients in perturbation theory
+ for observables in hadron-induced processes.
+
+ This allows fast theory predictions of these observables for arbitrary
+ parton distribution functions (of regular shape), renormalization or
+ factorization scale choices, and/or values of alpha_s(Mz) as e.g. needed
+ in PDF fits or in systematic studies. Very time consuming complete
+ recalculations are thus avoided.
+ '';
+ license = licenses.gpl3Plus;
+ maintainers = with maintainers; [ veprbl ];
+ platforms = platforms.unix;
};
}
diff --git a/third_party/nixpkgs/pkgs/development/libraries/poppler/default.nix b/third_party/nixpkgs/pkgs/development/libraries/poppler/default.nix
index f3fae283e8..fd2a8ab92c 100644
--- a/third_party/nixpkgs/pkgs/development/libraries/poppler/default.nix
+++ b/third_party/nixpkgs/pkgs/development/libraries/poppler/default.nix
@@ -12,11 +12,11 @@ let
in
stdenv.mkDerivation rec {
name = "poppler-${suffix}-${version}";
- version = "21.01.0"; # beware: updates often break cups-filters build, check texlive and scribusUnstable too!
+ version = "21.02.0"; # beware: updates often break cups-filters build, check texlive and scribusUnstable too!
src = fetchurl {
url = "${meta.homepage}/poppler-${version}.tar.xz";
- sha256 = "sha256-AW3eNOX4aOqYoyypm2QzJaloIoFQCUK3ET9OyI0g4vM=";
+ sha256 = "sha256-XBR1nJmJHm5HKs7W1fD/Haz4XYDNkCbTZcVcZT7feSw=";
};
outputs = [ "out" "dev" ];
diff --git a/third_party/nixpkgs/pkgs/development/libraries/protobuf/3.15.nix b/third_party/nixpkgs/pkgs/development/libraries/protobuf/3.15.nix
new file mode 100644
index 0000000000..63e175d980
--- /dev/null
+++ b/third_party/nixpkgs/pkgs/development/libraries/protobuf/3.15.nix
@@ -0,0 +1,6 @@
+{ callPackage, ... }:
+
+callPackage ./generic-v3.nix {
+ version = "3.15.5";
+ sha256 = "1znxzy4illsr4a08642h6s83jawzrq40m6pzkp05q0cpm8hcpvda";
+}
diff --git a/third_party/nixpkgs/pkgs/development/libraries/python-qt/default.nix b/third_party/nixpkgs/pkgs/development/libraries/python-qt/default.nix
index 0fe0806b1e..2be89b3b75 100644
--- a/third_party/nixpkgs/pkgs/development/libraries/python-qt/default.nix
+++ b/third_party/nixpkgs/pkgs/development/libraries/python-qt/default.nix
@@ -13,9 +13,9 @@ stdenv.mkDerivation rec {
hardeningDisable = [ "all" ];
- nativeBuildInputs = [ qmake qtwebengine qtxmlpatterns qttools ];
+ nativeBuildInputs = [ qmake qtwebengine qtxmlpatterns qttools unzip ];
- buildInputs = [ python unzip ];
+ buildInputs = [ python ];
qmakeFlags = [ "PythonQt.pro"
"INCLUDEPATH+=${python}/include/python3.6"
diff --git a/third_party/nixpkgs/pkgs/development/libraries/rdkafka/default.nix b/third_party/nixpkgs/pkgs/development/libraries/rdkafka/default.nix
index 7a9818bce9..0d7483d3c2 100644
--- a/third_party/nixpkgs/pkgs/development/libraries/rdkafka/default.nix
+++ b/third_party/nixpkgs/pkgs/development/libraries/rdkafka/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, fetchFromGitHub, zlib, perl, pkg-config, python, openssl }:
+{ lib, stdenv, fetchFromGitHub, zlib, pkg-config, python3, openssl }:
stdenv.mkDerivation rec {
pname = "rdkafka";
@@ -11,9 +11,9 @@ stdenv.mkDerivation rec {
sha256 = "sha256-EoNzxwuLiYi6sMhyqD/x+ku6BKA+i5og4XsUy2JBN0U=";
};
- nativeBuildInputs = [ pkg-config ];
+ nativeBuildInputs = [ pkg-config python3 ];
- buildInputs = [ zlib perl python openssl ];
+ buildInputs = [ zlib openssl ];
NIX_CFLAGS_COMPILE = "-Wno-error=strict-overflow";
diff --git a/third_party/nixpkgs/pkgs/development/libraries/science/math/cudnn/generic.nix b/third_party/nixpkgs/pkgs/development/libraries/science/math/cudnn/generic.nix
index 566a17c614..d9c19e6790 100644
--- a/third_party/nixpkgs/pkgs/development/libraries/science/math/cudnn/generic.nix
+++ b/third_party/nixpkgs/pkgs/development/libraries/science/math/cudnn/generic.nix
@@ -8,6 +8,14 @@
, cudatoolkit
, fetchurl
, addOpenGLRunpath
+, # The distributed version of CUDNN includes both dynamically liked .so files,
+ # as well as statically linked .a files. However, CUDNN is quite large
+ # (multiple gigabytes), so you can save some space in your nix store by
+ # removing the statically linked libraries if you are not using them.
+ #
+ # Setting this to true removes the statically linked .a files.
+ # Setting this to false keeps these statically linked .a files.
+ removeStatic ? false
}:
stdenv.mkDerivation {
@@ -23,6 +31,8 @@ stdenv.mkDerivation {
nativeBuildInputs = [ addOpenGLRunpath ];
installPhase = ''
+ runHook preInstall
+
function fixRunPath {
p=$(patchelf --print-rpath $1)
patchelf --set-rpath "''${p:+$p:}${lib.makeLibraryPath [ stdenv.cc.cc ]}:\$ORIGIN/" $1
@@ -35,6 +45,10 @@ stdenv.mkDerivation {
mkdir -p $out
cp -a include $out/include
cp -a lib64 $out/lib64
+ '' + lib.optionalString removeStatic ''
+ rm -f $out/lib64/*.a
+ '' + ''
+ runHook postInstall
'';
# Set RUNPATH so that libcuda in /run/opengl-driver(-32)/lib can be found.
diff --git a/third_party/nixpkgs/pkgs/development/libraries/science/math/cutensor/default.nix b/third_party/nixpkgs/pkgs/development/libraries/science/math/cutensor/default.nix
new file mode 100644
index 0000000000..1b5895b02b
--- /dev/null
+++ b/third_party/nixpkgs/pkgs/development/libraries/science/math/cutensor/default.nix
@@ -0,0 +1,37 @@
+{ callPackage
+, cudatoolkit_10_1, cudatoolkit_10_2
+, cudatoolkit_11_0, cudatoolkit_11_1, cudatoolkit_11_2
+}:
+
+rec {
+ cutensor_cudatoolkit_10_1 = callPackage ./generic.nix rec {
+ version = "1.2.2.5";
+ libPath = "lib/10.1";
+ cudatoolkit = cudatoolkit_10_1;
+ # 1.2.2 is compatible with CUDA 11.0, 11.1, and 11.2:
+ # ephemeral doc at https://developer.nvidia.com/cutensor/downloads
+ sha256 = "1dl9bd71frhac9cb8lvnh71zfsnqxbxbfhndvva2zf6nh0my4klm";
+ };
+
+ cutensor_cudatoolkit_10_2 = cutensor_cudatoolkit_10_1.override {
+ libPath = "lib/10.2";
+ cudatoolkit = cudatoolkit_10_2;
+ };
+
+ cutensor_cudatoolkit_10 = cutensor_cudatoolkit_10_2;
+
+ cutensor_cudatoolkit_11_0 = cutensor_cudatoolkit_10_2.override {
+ libPath = "lib/11";
+ cudatoolkit = cudatoolkit_11_0;
+ };
+
+ cutensor_cudatoolkit_11_1 = cutensor_cudatoolkit_11_0.override {
+ cudatoolkit = cudatoolkit_11_1;
+ };
+
+ cutensor_cudatoolkit_11_2 = cutensor_cudatoolkit_11_0.override {
+ cudatoolkit = cudatoolkit_11_2;
+ };
+
+ cutensor_cudatoolkit_11 = cutensor_cudatoolkit_11_2;
+}
diff --git a/third_party/nixpkgs/pkgs/development/libraries/science/math/cutensor/generic.nix b/third_party/nixpkgs/pkgs/development/libraries/science/math/cutensor/generic.nix
new file mode 100644
index 0000000000..0b2bd31b2c
--- /dev/null
+++ b/third_party/nixpkgs/pkgs/development/libraries/science/math/cutensor/generic.nix
@@ -0,0 +1,69 @@
+{ stdenv
+, lib
+, libPath
+, cudatoolkit
+, fetchurl
+, autoPatchelfHook
+, addOpenGLRunpath
+
+, version
+, sha256
+}:
+
+let
+ mostOfVersion = builtins.concatStringsSep "."
+ (lib.take 3 (lib.versions.splitVersion version));
+in
+
+stdenv.mkDerivation {
+ pname = "cudatoolkit-${cudatoolkit.majorVersion}-cutensor";
+ inherit version;
+
+ src = fetchurl {
+ url = "https://developer.download.nvidia.com/compute/cutensor/${mostOfVersion}/local_installers/libcutensor-${stdenv.hostPlatform.parsed.kernel.name}-${stdenv.hostPlatform.parsed.cpu.name}-${version}.tar.gz";
+ inherit sha256;
+ };
+
+ outputs = [ "out" "dev" ];
+
+ nativeBuildInputs = [
+ autoPatchelfHook
+ addOpenGLRunpath
+ ];
+
+ buildInputs = [
+ stdenv.cc.cc.lib
+ ];
+
+ propagatedBuildInputs = [
+ cudatoolkit
+ ];
+
+ # Set RUNPATH so that libcuda in /run/opengl-driver(-32)/lib can be found.
+ # See the explanation in addOpenGLRunpath.
+ installPhase = ''
+ mkdir -p "$out" "$dev"
+ mv include "$dev"
+ mv ${libPath} "$out/lib"
+
+ function finalRPathFixups {
+ for lib in $out/lib/lib*.so; do
+ addOpenGLRunpath $lib
+ done
+ }
+ postFixupHooks+=(finalRPathFixups)
+ '';
+
+ passthru = {
+ inherit cudatoolkit;
+ majorVersion = lib.versions.major version;
+ };
+
+ meta = with lib; {
+ description = "cuTENSOR: A High-Performance CUDA Library For Tensor Primitives";
+ homepage = "https://developer.nvidia.com/cutensor";
+ license = licenses.unfree;
+ platforms = [ "x86_64-linux" ];
+ maintainers = with maintainers; [ obsidian-systems-maintenance ];
+ };
+}
diff --git a/third_party/nixpkgs/pkgs/development/libraries/science/math/liblapack/default.nix b/third_party/nixpkgs/pkgs/development/libraries/science/math/liblapack/default.nix
index c742cc60b2..50563f2745 100644
--- a/third_party/nixpkgs/pkgs/development/libraries/science/math/liblapack/default.nix
+++ b/third_party/nixpkgs/pkgs/development/libraries/science/math/liblapack/default.nix
@@ -3,7 +3,6 @@
fetchFromGitHub,
gfortran,
cmake,
- python2,
shared ? true
}:
let
@@ -11,7 +10,7 @@ let
version = "3.9.0";
in
-stdenv.mkDerivation {
+stdenv.mkDerivation rec {
pname = "liblapack";
inherit version;
@@ -22,17 +21,41 @@ stdenv.mkDerivation {
sha256 = "0sxnc97z67i7phdmcnq8f8lmxgw10wdwvr8ami0w3pb179cgrbpb";
};
- nativeBuildInputs = [ gfortran python2 cmake ];
+ nativeBuildInputs = [ gfortran cmake ];
+
+ # Configure stage fails on aarch64-darwin otherwise, due to either clang 11 or gfortran 10.
+ hardeningDisable = lib.optionals (stdenv.isDarwin && stdenv.isAarch64) [ "stackprotector" ];
cmakeFlags = [
"-DCMAKE_Fortran_FLAGS=-fPIC"
"-DLAPACKE=ON"
"-DCBLAS=ON"
+ "-DBUILD_TESTING=ON"
]
++ optional shared "-DBUILD_SHARED_LIBS=ON";
doCheck = true;
+ # Some CBLAS related tests fail on Darwin:
+ # 14 - CBLAS-xscblat2 (Failed)
+ # 15 - CBLAS-xscblat3 (Failed)
+ # 17 - CBLAS-xdcblat2 (Failed)
+ # 18 - CBLAS-xdcblat3 (Failed)
+ # 20 - CBLAS-xccblat2 (Failed)
+ # 21 - CBLAS-xccblat3 (Failed)
+ # 23 - CBLAS-xzcblat2 (Failed)
+ # 24 - CBLAS-xzcblat3 (Failed)
+ #
+ # Upstream issue to track:
+ # * https://github.com/Reference-LAPACK/lapack/issues/440
+ ctestArgs = lib.optionalString stdenv.isDarwin "-E '^(CBLAS-(x[sdcz]cblat[23]))$'";
+
+ checkPhase = ''
+ runHook preCheck
+ ctest ${ctestArgs}
+ runHook postCheck
+ '';
+
meta = with lib; {
inherit version;
description = "Linear Algebra PACKage";
diff --git a/third_party/nixpkgs/pkgs/development/libraries/science/math/libtorch/bin.nix b/third_party/nixpkgs/pkgs/development/libraries/science/math/libtorch/bin.nix
index 241eb5a372..481836a4e1 100644
--- a/third_party/nixpkgs/pkgs/development/libraries/science/math/libtorch/bin.nix
+++ b/third_party/nixpkgs/pkgs/development/libraries/science/math/libtorch/bin.nix
@@ -8,8 +8,8 @@
, fixDarwinDylibNames
, cudaSupport
-, cudatoolkit_10_2
-, cudnn_cudatoolkit_10_2
+, cudatoolkit_11_1
+, cudnn_cudatoolkit_11_1
}:
let
@@ -38,7 +38,7 @@ in stdenv.mkDerivation {
installPhase = ''
# Copy headers and CMake files.
- install -Dm755 -t $dev/lib lib/*.a
+ mkdir -p $dev
cp -r include $dev
cp -r share $dev
@@ -109,8 +109,8 @@ in stdenv.mkDerivation {
passthru.tests.cmake = callPackage ./test {
inherit cudaSupport;
- cudatoolkit = cudatoolkit_10_2;
- cudnn = cudnn_cudatoolkit_10_2;
+ cudatoolkit = cudatoolkit_11_1;
+ cudnn = cudnn_cudatoolkit_11_1;
};
meta = with lib; {
diff --git a/third_party/nixpkgs/pkgs/development/libraries/science/math/libtorch/binary-hashes.nix b/third_party/nixpkgs/pkgs/development/libraries/science/math/libtorch/binary-hashes.nix
index bfb708531d..208e0b7ada 100644
--- a/third_party/nixpkgs/pkgs/development/libraries/science/math/libtorch/binary-hashes.nix
+++ b/third_party/nixpkgs/pkgs/development/libraries/science/math/libtorch/binary-hashes.nix
@@ -8,7 +8,7 @@ version: {
hash = "sha256-xBaNyI7eiQnSArHMITonrQQLZnZCZK/SWKOTWnxzdpc=";
};
x86_64-linux-cuda = {
- url = "https://download.pytorch.org/libtorch/cu102/libtorch-cxx11-abi-shared-with-deps-${version}.zip";
- hash = "sha256-rNEyE4+jfeX7cU0aNYd5b0pZGYT0PNPnDnS1PIsrMeM=";
+ url = "https://download.pytorch.org/libtorch/cu111/libtorch-cxx11-abi-shared-with-deps-${version}%2Bcu111.zip";
+ hash = "sha256-uQ7ptOuzowJ0JSPIvJHyNotBfpsqAnxpMDLq7Vl6L00=";
};
}
diff --git a/third_party/nixpkgs/pkgs/development/libraries/science/math/primesieve/default.nix b/third_party/nixpkgs/pkgs/development/libraries/science/math/primesieve/default.nix
index d99026bc56..d4f16d230e 100644
--- a/third_party/nixpkgs/pkgs/development/libraries/science/math/primesieve/default.nix
+++ b/third_party/nixpkgs/pkgs/development/libraries/science/math/primesieve/default.nix
@@ -2,13 +2,13 @@
stdenv.mkDerivation rec {
pname = "primesieve";
- version = "7.5";
+ version = "7.6";
nativeBuildInputs = [cmake];
src = fetchurl {
url = "https://github.com/kimwalisch/primesieve/archive/v${version}.tar.gz";
- sha256 = "0g60br3p8di92jx3pr2bb51xh15gg57l7qvwzwn7xf7l585hgi7v";
+ sha256 = "sha256-SFZp6Pmmx05SiUfSdN9wXxPKrydtRg0PA3uNvAycCpk=";
};
meta = with lib; {
diff --git a/third_party/nixpkgs/pkgs/development/libraries/skalibs/default.nix b/third_party/nixpkgs/pkgs/development/libraries/skalibs/default.nix
index 1efac7fc5e..3d90a8ebb2 100644
--- a/third_party/nixpkgs/pkgs/development/libraries/skalibs/default.nix
+++ b/third_party/nixpkgs/pkgs/development/libraries/skalibs/default.nix
@@ -4,8 +4,8 @@ with skawarePackages;
buildPackage {
pname = "skalibs";
- version = "2.10.0.1";
- sha256 = "1chwjzlh13jbrldk77h3i4qjqv8hjpvvd3papcb8j46mvj7sxysg";
+ version = "2.10.0.2";
+ sha256 = "03qyi77wgcw3nzy7i932wd98d6j7nnzxc8ddl973vf5sa1v3vflb";
description = "A set of general-purpose C programming libraries";
diff --git a/third_party/nixpkgs/pkgs/development/libraries/slib/default.nix b/third_party/nixpkgs/pkgs/development/libraries/slib/default.nix
index 47f633f509..9973e04a67 100644
--- a/third_party/nixpkgs/pkgs/development/libraries/slib/default.nix
+++ b/third_party/nixpkgs/pkgs/development/libraries/slib/default.nix
@@ -10,7 +10,8 @@ stdenv.mkDerivation rec {
patches = [ ./catalog-in-library-vicinity.patch ];
- buildInputs = [ unzip scheme texinfo ];
+ nativeBuildInputs = [ unzip ];
+ buildInputs = [ scheme texinfo ];
postInstall = ''
ln -s mklibcat{.scm,}
diff --git a/third_party/nixpkgs/pkgs/development/libraries/speechd/default.nix b/third_party/nixpkgs/pkgs/development/libraries/speechd/default.nix
index e85b6d4cbf..b6ec4842e0 100644
--- a/third_party/nixpkgs/pkgs/development/libraries/speechd/default.nix
+++ b/third_party/nixpkgs/pkgs/development/libraries/speechd/default.nix
@@ -39,11 +39,11 @@ let
throw "You need to enable at least one output module.";
in stdenv.mkDerivation rec {
pname = "speech-dispatcher";
- version = "0.10.1";
+ version = "0.10.2";
src = fetchurl {
url = "https://github.com/brailcom/speechd/releases/download/${version}/${pname}-${version}.tar.gz";
- sha256 = "0j2lfzkmbsxrrgjw6arzvnfd4jn5pxab28xsk2djssr2ydb9x309";
+ sha256 = "sha256-sGMZ8gHhXlbGKWZTr1vPwwDLNI6XLVF9+LBurHfq4tw=";
};
patches = [
diff --git a/third_party/nixpkgs/pkgs/development/libraries/tinyobjloader/default.nix b/third_party/nixpkgs/pkgs/development/libraries/tinyobjloader/default.nix
index c7939a6be2..ad4a999e45 100644
--- a/third_party/nixpkgs/pkgs/development/libraries/tinyobjloader/default.nix
+++ b/third_party/nixpkgs/pkgs/development/libraries/tinyobjloader/default.nix
@@ -21,6 +21,6 @@ stdenv.mkDerivation rec {
description = "Tiny but powerful single file wavefront obj loader";
license = licenses.mit;
maintainers = [ maintainers.ivar ];
- platforms = platforms.linux;
+ platforms = platforms.all;
};
}
diff --git a/third_party/nixpkgs/pkgs/development/libraries/tllist/default.nix b/third_party/nixpkgs/pkgs/development/libraries/tllist/default.nix
index 11e61e93a0..c849739199 100644
--- a/third_party/nixpkgs/pkgs/development/libraries/tllist/default.nix
+++ b/third_party/nixpkgs/pkgs/development/libraries/tllist/default.nix
@@ -36,6 +36,6 @@ stdenv.mkDerivation rec {
license = licenses.mit;
maintainers = with maintainers; [ fionera AndersonTorres ];
- platforms = with platforms; linux;
+ platforms = platforms.all;
};
}
diff --git a/third_party/nixpkgs/pkgs/development/libraries/tnt/default.nix b/third_party/nixpkgs/pkgs/development/libraries/tnt/default.nix
index 932239a485..f4787271c0 100644
--- a/third_party/nixpkgs/pkgs/development/libraries/tnt/default.nix
+++ b/third_party/nixpkgs/pkgs/development/libraries/tnt/default.nix
@@ -9,7 +9,7 @@ stdenv.mkDerivation {
sha256 = "1bzkfdb598584qlc058n8wqq9vbz714gr5r57401rsa9qaxhk5j7";
};
- buildInputs = [ unzip ];
+ nativeBuildInputs = [ unzip ];
installPhase = ''
mkdir -p $out/include
diff --git a/third_party/nixpkgs/pkgs/development/libraries/utf8cpp/default.nix b/third_party/nixpkgs/pkgs/development/libraries/utf8cpp/default.nix
index e627b97849..30129992c7 100644
--- a/third_party/nixpkgs/pkgs/development/libraries/utf8cpp/default.nix
+++ b/third_party/nixpkgs/pkgs/development/libraries/utf8cpp/default.nix
@@ -27,6 +27,6 @@ stdenv.mkDerivation rec {
description = "UTF-8 with C++ in a Portable Way";
license = licenses.free;
maintainers = with maintainers; [ jobojeha ];
- platforms = platforms.linux;
+ platforms = platforms.all;
};
}
diff --git a/third_party/nixpkgs/pkgs/development/libraries/vcg/default.nix b/third_party/nixpkgs/pkgs/development/libraries/vcg/default.nix
index 380f533fe6..d8c83bf54a 100644
--- a/third_party/nixpkgs/pkgs/development/libraries/vcg/default.nix
+++ b/third_party/nixpkgs/pkgs/development/libraries/vcg/default.nix
@@ -23,7 +23,7 @@ stdenv.mkDerivation rec {
homepage = "http://vcg.isti.cnr.it/vcglib/install.html";
description = "C++ library for manipulation, processing and displaying with OpenGL of triangle and tetrahedral meshes";
license = licenses.gpl3;
- platforms = platforms.linux;
+ platforms = platforms.all;
maintainers = with maintainers; [ abbradar ];
};
}
diff --git a/third_party/nixpkgs/pkgs/development/libraries/wtk/default.nix b/third_party/nixpkgs/pkgs/development/libraries/wtk/default.nix
index 9ddc95a9cc..0bded9d92d 100644
--- a/third_party/nixpkgs/pkgs/development/libraries/wtk/default.nix
+++ b/third_party/nixpkgs/pkgs/development/libraries/wtk/default.nix
@@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
builder = ./builder.sh;
- buildInputs = [ unzip ];
+ nativeBuildInputs = [ unzip ];
libraries = [ xorg.libXpm xorg.libXt xorg.libX11 xorg.libICE xorg.libSM stdenv.cc.cc ];
diff --git a/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-overrides.nix b/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-overrides.nix
index 412fd4b8de..79a799f76f 100644
--- a/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-overrides.nix
+++ b/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-overrides.nix
@@ -225,7 +225,7 @@ $out/lib/common-lisp/query-fs"
x.deps;
};
cl-cffi-gtk-glib = addNativeLibs [pkgs.glib];
- cl-cffi-gtk-gdk-pixbuf = addNativeLibs [pkgs.gdk_pixbuf];
+ cl-cffi-gtk-gdk-pixbuf = addNativeLibs [pkgs.gdk-pixbuf];
cl-cffi-gtk-cairo = addNativeLibs [pkgs.cairo];
cl-cffi-gtk-pango = addNativeLibs [pkgs.pango];
cl-cffi-gtk-gdk = addNativeLibs [pkgs.gtk3];
diff --git a/third_party/nixpkgs/pkgs/development/lisp-modules/shell.nix b/third_party/nixpkgs/pkgs/development/lisp-modules/shell.nix
index 0201491f4c..a8ed246e6f 100644
--- a/third_party/nixpkgs/pkgs/development/lisp-modules/shell.nix
+++ b/third_party/nixpkgs/pkgs/development/lisp-modules/shell.nix
@@ -11,6 +11,6 @@ self = rec {
lispPackages.quicklisp-to-nix lispPackages.quicklisp-to-nix-system-info
];
CPATH = "${libfixposix}/include";
- LD_LIBRARY_PATH = "${openssl.out}/lib:${fuse}/lib:${libuv}/lib:${libev}/lib:${libmysqlclient}/lib:${libmysqlclient}/lib/mysql:${postgresql.lib}/lib:${sqlite.out}/lib:${libfixposix}/lib:${freetds}/lib:${openssl_lib_marked}/lib:${glib.out}/lib:${gdk_pixbuf}/lib:${cairo}/lib:${pango.out}/lib:${gtk3}/lib:${webkitgtk}/lib";
+ LD_LIBRARY_PATH = "${openssl.out}/lib:${fuse}/lib:${libuv}/lib:${libev}/lib:${libmysqlclient}/lib:${libmysqlclient}/lib/mysql:${postgresql.lib}/lib:${sqlite.out}/lib:${libfixposix}/lib:${freetds}/lib:${openssl_lib_marked}/lib:${glib.out}/lib:${gdk-pixbuf}/lib:${cairo}/lib:${pango.out}/lib:${gtk3}/lib:${webkitgtk}/lib";
};
in stdenv.mkDerivation self
diff --git a/third_party/nixpkgs/pkgs/development/misc/avr8-burn-omat/default.nix b/third_party/nixpkgs/pkgs/development/misc/avr8-burn-omat/default.nix
index 0a9d666f8b..3364fe796e 100644
--- a/third_party/nixpkgs/pkgs/development/misc/avr8-burn-omat/default.nix
+++ b/third_party/nixpkgs/pkgs/development/misc/avr8-burn-omat/default.nix
@@ -8,7 +8,7 @@ stdenv.mkDerivation {
sha256 = "02k0fd0cd3y1yqip36wr3bkxbywp8913w4y7jdg6qwqxjnii58ln";
};
- buildInputs = [ unzip ];
+ nativeBuildInputs = [ unzip ];
phases = "unpackPhase installPhase";
diff --git a/third_party/nixpkgs/pkgs/development/mobile/androidenv/emulator.nix b/third_party/nixpkgs/pkgs/development/mobile/androidenv/emulator.nix
index e08078ea67..c8fce166aa 100644
--- a/third_party/nixpkgs/pkgs/development/mobile/androidenv/emulator.nix
+++ b/third_party/nixpkgs/pkgs/development/mobile/androidenv/emulator.nix
@@ -5,16 +5,16 @@ deployAndroidPackage {
buildInputs = [ autoPatchelfHook makeWrapper ]
++ lib.optional (os == "linux") [
pkgs.glibc
- pkgs.xlibs.libX11
- pkgs.xlibs.libXext
- pkgs.xlibs.libXdamage
- pkgs.xlibs.libXfixes
- pkgs.xlibs.libxcb
- pkgs.xlibs.libXcomposite
- pkgs.xlibs.libXcursor
- pkgs.xlibs.libXi
- pkgs.xlibs.libXrender
- pkgs.xlibs.libXtst
+ pkgs.xorg.libX11
+ pkgs.xorg.libXext
+ pkgs.xorg.libXdamage
+ pkgs.xorg.libXfixes
+ pkgs.xorg.libxcb
+ pkgs.xorg.libXcomposite
+ pkgs.xorg.libXcursor
+ pkgs.xorg.libXi
+ pkgs.xorg.libXrender
+ pkgs.xorg.libXtst
pkgs.libcxx
pkgs.libGL
pkgs.libpulseaudio
diff --git a/third_party/nixpkgs/pkgs/development/mobile/androidenv/tools/26.nix b/third_party/nixpkgs/pkgs/development/mobile/androidenv/tools/26.nix
index 0234c9f3d0..a768a12054 100644
--- a/third_party/nixpkgs/pkgs/development/mobile/androidenv/tools/26.nix
+++ b/third_party/nixpkgs/pkgs/development/mobile/androidenv/tools/26.nix
@@ -4,7 +4,7 @@ deployAndroidPackage {
name = "androidsdk";
inherit os package;
buildInputs = [ autoPatchelfHook makeWrapper ]
- ++ lib.optional (os == "linux") [ pkgs.glibc pkgs.xlibs.libX11 pkgs.xlibs.libXrender pkgs.xlibs.libXext pkgs.fontconfig pkgs.freetype pkgs_i686.glibc pkgs_i686.xlibs.libX11 pkgs_i686.xlibs.libXrender pkgs_i686.xlibs.libXext pkgs_i686.fontconfig.lib pkgs_i686.freetype pkgs_i686.zlib pkgs.fontconfig.lib ];
+ ++ lib.optional (os == "linux") [ pkgs.glibc pkgs.xorg.libX11 pkgs.xorg.libXrender pkgs.xorg.libXext pkgs.fontconfig pkgs.freetype pkgs_i686.glibc pkgs_i686.xorg.libX11 pkgs_i686.xorg.libXrender pkgs_i686.xorg.libXext pkgs_i686.fontconfig.lib pkgs_i686.freetype pkgs_i686.zlib pkgs.fontconfig.lib ];
patchInstructions = ''
${lib.optionalString (os == "linux") ''
@@ -27,7 +27,7 @@ deployAndroidPackage {
# Wrap monitor script
wrapProgram $PWD/monitor \
--prefix PATH : ${pkgs.jdk8}/bin \
- --prefix LD_LIBRARY_PATH : ${lib.makeLibraryPath [ pkgs.xlibs.libX11 pkgs.xlibs.libXtst ]}
+ --prefix LD_LIBRARY_PATH : ${lib.makeLibraryPath [ pkgs.xorg.libX11 pkgs.xorg.libXtst ]}
# Patch all script shebangs
patchShebangs .
diff --git a/third_party/nixpkgs/pkgs/development/mobile/titaniumenv/titaniumsdk-7.5.nix b/third_party/nixpkgs/pkgs/development/mobile/titaniumenv/titaniumsdk-7.5.nix
index 601cac372c..89fd34bb5a 100644
--- a/third_party/nixpkgs/pkgs/development/mobile/titaniumenv/titaniumsdk-7.5.nix
+++ b/third_party/nixpkgs/pkgs/development/mobile/titaniumenv/titaniumsdk-7.5.nix
@@ -64,8 +64,7 @@ stdenv.mkDerivation {
}
else throw "Platform: ${stdenv.system} not supported!";
- nativeBuildInputs = [ makeWrapper ];
- buildInputs = [ unzip ];
+ nativeBuildInputs = [ makeWrapper unzip ];
buildCommand = ''
mkdir -p $out
diff --git a/third_party/nixpkgs/pkgs/development/mobile/titaniumenv/titaniumsdk-8.2.nix b/third_party/nixpkgs/pkgs/development/mobile/titaniumenv/titaniumsdk-8.2.nix
index 52257bfd46..fb462cc27f 100644
--- a/third_party/nixpkgs/pkgs/development/mobile/titaniumenv/titaniumsdk-8.2.nix
+++ b/third_party/nixpkgs/pkgs/development/mobile/titaniumenv/titaniumsdk-8.2.nix
@@ -64,8 +64,7 @@ stdenv.mkDerivation {
}
else throw "Platform: ${stdenv.system} not supported!";
- nativeBuildInputs = [ makeWrapper ];
- buildInputs = [ unzip ];
+ nativeBuildInputs = [ makeWrapper unzip ];
buildCommand = ''
mkdir -p $out
diff --git a/third_party/nixpkgs/pkgs/development/mobile/titaniumenv/titaniumsdk-8.3.nix b/third_party/nixpkgs/pkgs/development/mobile/titaniumenv/titaniumsdk-8.3.nix
index 78044752b5..c207b112fa 100644
--- a/third_party/nixpkgs/pkgs/development/mobile/titaniumenv/titaniumsdk-8.3.nix
+++ b/third_party/nixpkgs/pkgs/development/mobile/titaniumenv/titaniumsdk-8.3.nix
@@ -64,8 +64,7 @@ stdenv.mkDerivation {
}
else throw "Platform: ${stdenv.system} not supported!";
- nativeBuildInputs = [ makeWrapper ];
- buildInputs = [ unzip ];
+ nativeBuildInputs = [ makeWrapper unzip ];
buildCommand = ''
mkdir -p $out
diff --git a/third_party/nixpkgs/pkgs/development/node-packages/default.nix b/third_party/nixpkgs/pkgs/development/node-packages/default.nix
index 240f287003..2023cbfbfa 100644
--- a/third_party/nixpkgs/pkgs/development/node-packages/default.nix
+++ b/third_party/nixpkgs/pkgs/development/node-packages/default.nix
@@ -107,7 +107,7 @@ let
mirakurun = super.mirakurun.override rec {
nativeBuildInputs = with pkgs; [ makeWrapper ];
postInstall = let
- runtimeDeps = [ nodejs ] ++ (with pkgs; [ bash which v4l_utils ]);
+ runtimeDeps = [ nodejs ] ++ (with pkgs; [ bash which v4l-utils ]);
in
''
substituteInPlace $out/lib/node_modules/mirakurun/processes.json \
diff --git a/third_party/nixpkgs/pkgs/development/ocaml-modules/bitstring/default.nix b/third_party/nixpkgs/pkgs/development/ocaml-modules/bitstring/default.nix
index 583017d9dd..12ed4ae787 100644
--- a/third_party/nixpkgs/pkgs/development/ocaml-modules/bitstring/default.nix
+++ b/third_party/nixpkgs/pkgs/development/ocaml-modules/bitstring/default.nix
@@ -2,7 +2,7 @@
buildDunePackage rec {
pname = "bitstring";
- version = "4.0.1";
+ version = "4.1.0";
useDune2 = true;
@@ -10,7 +10,7 @@ buildDunePackage rec {
owner = "xguerin";
repo = pname;
rev = "v${version}";
- sha256 = "1z7jmgljvp52lvn3ml2cp6gssxqp4sikwyjf6ym97cycbcw0fjjm";
+ sha256 = "0mghsl8b2zd2676mh1r9142hymhvzy9cw8kgkjmirxkn56wbf56b";
};
propagatedBuildInputs = [ stdlib-shims ];
diff --git a/third_party/nixpkgs/pkgs/development/ocaml-modules/bitstring/ppx.nix b/third_party/nixpkgs/pkgs/development/ocaml-modules/bitstring/ppx.nix
index ee0a8c51f7..4d391d3458 100644
--- a/third_party/nixpkgs/pkgs/development/ocaml-modules/bitstring/ppx.nix
+++ b/third_party/nixpkgs/pkgs/development/ocaml-modules/bitstring/ppx.nix
@@ -3,6 +3,10 @@
, ounit
}:
+if !lib.versionAtLeast ppxlib.version "0.18.0"
+then throw "ppx_bitstring is not available with ppxlib-${ppxlib.version}"
+else
+
buildDunePackage rec {
pname = "ppx_bitstring";
inherit (bitstring) version useDune2 src;
diff --git a/third_party/nixpkgs/pkgs/development/ocaml-modules/carton/default.nix b/third_party/nixpkgs/pkgs/development/ocaml-modules/carton/default.nix
index 5bf7be4e77..31b864e29d 100644
--- a/third_party/nixpkgs/pkgs/development/ocaml-modules/carton/default.nix
+++ b/third_party/nixpkgs/pkgs/development/ocaml-modules/carton/default.nix
@@ -2,19 +2,19 @@
, ke, duff, decompress, cstruct, optint, bigstringaf, stdlib-shims
, bigarray-compat, checkseum, logs, psq, fmt
, result, rresult, fpath, base64, bos, digestif, mmap, alcotest
-, crowbar, alcotest-lwt, lwt, findlib, mirage-flow, cmdliner
+, crowbar, alcotest-lwt, lwt, findlib, mirage-flow, cmdliner, hxd
}:
buildDunePackage rec {
pname = "carton";
- version = "0.2.0";
+ version = "0.4.0";
useDune2 = true;
minimumOCamlVersion = "4.08";
src = fetchurl {
url = "https://github.com/mirage/ocaml-git/releases/download/${pname}-v${version}/${pname}-${pname}-v${version}.tbz";
- sha256 = "0gfns4a9p9540kijccsg52yzyn3jfvi737mb0g71yazyc89dqwhn";
+ sha256 = "777f9692b83cd63570c17527a32c5045818ab9242d923cbbde72fc23d0da0140";
};
# remove changelogs for mimic and the git* packages
@@ -30,6 +30,7 @@ buildDunePackage rec {
rresult
fpath
bos
+ hxd
];
propagatedBuildInputs = [
ke
diff --git a/third_party/nixpkgs/pkgs/development/ocaml-modules/cohttp/default.nix b/third_party/nixpkgs/pkgs/development/ocaml-modules/cohttp/default.nix
index e664d17f21..1cbc43bc28 100644
--- a/third_party/nixpkgs/pkgs/development/ocaml-modules/cohttp/default.nix
+++ b/third_party/nixpkgs/pkgs/development/ocaml-modules/cohttp/default.nix
@@ -1,11 +1,12 @@
{ lib, fetchurl, buildDunePackage
, ppx_fields_conv, ppx_sexp_conv, stdlib-shims
, base64, fieldslib, jsonm, re, stringext, uri-sexp
+, ocaml, fmt, alcotest
}:
buildDunePackage rec {
pname = "cohttp";
- version = "2.5.4";
+ version = "2.5.5";
useDune2 = true;
@@ -13,13 +14,16 @@ buildDunePackage rec {
src = fetchurl {
url = "https://github.com/mirage/ocaml-cohttp/releases/download/v${version}/cohttp-v${version}.tbz";
- sha256 = "1q04spmki5zis5p5m1vs77i3k7ijm134j62g61071vblwx25z17a";
+ sha256 = "0ywmql4lp6ps2gd064ixbjzsdnnn5vk3pipm005sswl553qqwaim";
};
buildInputs = [ jsonm ppx_fields_conv ppx_sexp_conv ];
propagatedBuildInputs = [ base64 fieldslib re stringext uri-sexp stdlib-shims ];
+ doCheck = lib.versionAtLeast ocaml.version "4.05";
+ checkInputs = [ fmt alcotest ];
+
meta = {
description = "HTTP(S) library for Lwt, Async and Mirage";
license = lib.licenses.isc;
diff --git a/third_party/nixpkgs/pkgs/development/ocaml-modules/decompress/1.2.nix b/third_party/nixpkgs/pkgs/development/ocaml-modules/decompress/1.2.nix
new file mode 100644
index 0000000000..e81202ea58
--- /dev/null
+++ b/third_party/nixpkgs/pkgs/development/ocaml-modules/decompress/1.2.nix
@@ -0,0 +1,28 @@
+{ lib, fetchurl, buildDunePackage
+, checkseum, bigarray-compat, optint
+}:
+
+buildDunePackage rec {
+ version = "1.2.0";
+ pname = "decompress";
+
+ minimumOCamlVersion = "4.07";
+
+ useDune2 = true;
+
+ src = fetchurl {
+ url = "https://github.com/mirage/decompress/releases/download/v${version}/decompress-v${version}.tbz";
+ sha256 = "1c3sq9a6kpzl0pj3gmg7w18ssjjl70yv0r3l7qjprcncjx23v62i";
+ };
+
+ propagatedBuildInputs = [ optint bigarray-compat checkseum ];
+ # required hxd version is not available in nixpkgs
+ doCheck = false;
+
+ meta = {
+ description = "Pure OCaml implementation of Zlib";
+ license = lib.licenses.mit;
+ maintainers = [ lib.maintainers.vbgl ];
+ homepage = "https://github.com/mirage/decompress";
+ };
+}
diff --git a/third_party/nixpkgs/pkgs/development/ocaml-modules/decompress/default.nix b/third_party/nixpkgs/pkgs/development/ocaml-modules/decompress/default.nix
index f53e166c66..d2cba68d73 100644
--- a/third_party/nixpkgs/pkgs/development/ocaml-modules/decompress/default.nix
+++ b/third_party/nixpkgs/pkgs/development/ocaml-modules/decompress/default.nix
@@ -1,10 +1,10 @@
{ lib, fetchurl, buildDunePackage
-, checkseum, bigarray-compat, optint
-, bigstringaf, alcotest, hxd, camlzip, base64
+, checkseum, bigarray-compat, optint, cmdliner
+, bigstringaf, alcotest, camlzip, base64, ctypes, fmt
}:
buildDunePackage rec {
- version = "1.2.0";
+ version = "1.3.0";
pname = "decompress";
minimumOCamlVersion = "4.07";
@@ -13,11 +13,12 @@ buildDunePackage rec {
src = fetchurl {
url = "https://github.com/mirage/decompress/releases/download/v${version}/decompress-v${version}.tbz";
- sha256 = "1c3sq9a6kpzl0pj3gmg7w18ssjjl70yv0r3l7qjprcncjx23v62i";
+ sha256 = "de149896939be13fedec46a4581121d5ab74850a2241d08e6aa8ae4bb18c52c4";
};
+ buildInputs = [ cmdliner ];
propagatedBuildInputs = [ optint bigarray-compat checkseum ];
- checkInputs = [ alcotest bigstringaf hxd camlzip base64 ];
+ checkInputs = [ alcotest bigstringaf ctypes fmt camlzip base64 ];
doCheck = true;
meta = {
diff --git a/third_party/nixpkgs/pkgs/development/ocaml-modules/duff/default.nix b/third_party/nixpkgs/pkgs/development/ocaml-modules/duff/default.nix
index 64a32d179d..a57f8564d9 100644
--- a/third_party/nixpkgs/pkgs/development/ocaml-modules/duff/default.nix
+++ b/third_party/nixpkgs/pkgs/development/ocaml-modules/duff/default.nix
@@ -1,17 +1,17 @@
-{ lib, fetchurl, buildDunePackage
+{ lib, fetchurl, buildDunePackage, fetchpatch
, stdlib-shims, bigarray-compat, fmt
, alcotest, hxd, crowbar, bigstringaf
}:
buildDunePackage rec {
pname = "duff";
- version = "0.3";
+ version = "0.4";
useDune2 = true;
src = fetchurl {
url = "https://github.com/mirage/duff/releases/download/v${version}/duff-v${version}.tbz";
- sha256 = "1lb67yxk93ifj94p1i3swjbnj5xy8j6xzs72bwvq6cffx5xykznm";
+ sha256 = "4795e8344a2c2562e0ef6c44ab742334b5cd807637354715889741b20a461da4";
};
propagatedBuildInputs = [ stdlib-shims bigarray-compat fmt ];
diff --git a/third_party/nixpkgs/pkgs/development/ocaml-modules/encore/default.nix b/third_party/nixpkgs/pkgs/development/ocaml-modules/encore/default.nix
index 95eb75ee7c..5924845c4f 100644
--- a/third_party/nixpkgs/pkgs/development/ocaml-modules/encore/default.nix
+++ b/third_party/nixpkgs/pkgs/development/ocaml-modules/encore/default.nix
@@ -3,13 +3,13 @@
buildDunePackage rec {
pname = "encore";
- version = "0.7";
+ version = "0.8";
minimumOCamlVersion = "4.07";
src = fetchurl {
url = "https://github.com/mirage/encore/releases/download/v${version}/encore-v${version}.tbz";
- sha256 = "0cwmhkj5jmk3z5y0agmkf5ygpgxynjkq2d7d50jgzmnqs7f6g7nh";
+ sha256 = "a406bc9863b04bb424692045939d6c170a2bb65a98521ae5608d25b0559344f6";
};
useDune2 = true;
diff --git a/third_party/nixpkgs/pkgs/development/ocaml-modules/extlib/default.nix b/third_party/nixpkgs/pkgs/development/ocaml-modules/extlib/default.nix
index a8b1810e51..2a437cd29d 100644
--- a/third_party/nixpkgs/pkgs/development/ocaml-modules/extlib/default.nix
+++ b/third_party/nixpkgs/pkgs/development/ocaml-modules/extlib/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, lib, fetchurl, ocaml, findlib, cppo, minimal ? true }:
+{ stdenv, lib, fetchurl, fetchpatch, ocaml, findlib, cppo, minimal ? true }:
assert lib.versionAtLeast (lib.getVersion ocaml) "3.11";
@@ -10,6 +10,13 @@ stdenv.mkDerivation {
sha256 = "1sxmzc1mx3kg62j8kbk0dxkx8mkf1rn70h542cjzrziflznap0s1";
};
+ patches = [
+ (fetchpatch {
+ url = "https://github.com/ygrek/ocaml-extlib/pull/55.patch";
+ sha256 = "0mj3xii56rh8j8brdyv5d06rbs6jjjcy4ib9chafkq3f3sbq795p";
+ })
+ ];
+
buildInputs = [ ocaml findlib cppo ];
createFindlibDestdir = true;
diff --git a/third_party/nixpkgs/pkgs/development/ocaml-modules/git/default.nix b/third_party/nixpkgs/pkgs/development/ocaml-modules/git/default.nix
index 8ef1c3627f..0fd66226e3 100644
--- a/third_party/nixpkgs/pkgs/development/ocaml-modules/git/default.nix
+++ b/third_party/nixpkgs/pkgs/development/ocaml-modules/git/default.nix
@@ -8,14 +8,14 @@
buildDunePackage rec {
pname = "git";
- version = "3.3.0";
+ version = "3.3.2";
minimumOCamlVersion = "4.08";
useDune2 = true;
src = fetchurl {
url = "https://github.com/mirage/ocaml-git/releases/download/${version}/git-${version}.tbz";
- sha256 = "090b67e8f8a02fb52b4d0c7aa445b5ff7353fdb2da00fb37b908f089c6776cd0";
+ sha256 = "01xcjggsb13n6018lp6ic0f6pglfl39qcg126h1k3da19hvpzhrv";
};
buildInputs = [
diff --git a/third_party/nixpkgs/pkgs/development/ocaml-modules/git/unix.nix b/third_party/nixpkgs/pkgs/development/ocaml-modules/git/unix.nix
index 58ac0204b4..f4cea47288 100644
--- a/third_party/nixpkgs/pkgs/development/ocaml-modules/git/unix.nix
+++ b/third_party/nixpkgs/pkgs/development/ocaml-modules/git/unix.nix
@@ -1,4 +1,4 @@
-{ buildDunePackage, fetchpatch, git
+{ buildDunePackage, git
, mmap, rresult, result, bigstringaf
, fmt, bos, fpath, uri, digestif, logs, lwt, git-cohttp-unix
, mirage-clock, mirage-clock-unix, astring, awa, cmdliner
@@ -15,14 +15,6 @@ buildDunePackage {
useDune2 = true;
- patches = [
- # https://github.com/mirage/ocaml-git/pull/472
- (fetchpatch {
- url = "https://github.com/sternenseemann/ocaml-git/commit/54998331eb9d5c61afe8901fabe0c74c2877f096.patch";
- sha256 = "12kd45mlfaj4hxh33k9920a22mq1q2sdrin2j41w1angvg00d3my";
- })
- ];
-
buildInputs = [
awa awa-mirage cmdliner git-cohttp-unix
mirage-clock mirage-clock-unix tcpip
diff --git a/third_party/nixpkgs/pkgs/development/ocaml-modules/hxd/default.nix b/third_party/nixpkgs/pkgs/development/ocaml-modules/hxd/default.nix
index 1d677ac1a2..0775e21b1f 100644
--- a/third_party/nixpkgs/pkgs/development/ocaml-modules/hxd/default.nix
+++ b/third_party/nixpkgs/pkgs/development/ocaml-modules/hxd/default.nix
@@ -1,11 +1,11 @@
{ lib, buildDunePackage, fetchurl
-, dune-configurator, cmdliner, angstrom
-, rresult, stdlib-shims, fmt, fpath
+, ocaml, dune-configurator, cmdliner
+, lwt, withLwt ? lib.versionAtLeast ocaml.version "4.07"
}:
buildDunePackage rec {
pname = "hxd";
- version = "0.2.0";
+ version = "0.3.1";
useDune2 = true;
@@ -13,24 +13,25 @@ buildDunePackage rec {
src = fetchurl {
url = "https://github.com/dinosaure/hxd/releases/download/v${version}/hxd-v${version}.tbz";
- sha256 = "1lyfrq058cc9x0c0hzsf3hv3ys0h8mxkwin9lldidlnj10izqf1l";
+ sha256 = "1c226c91e17cd329dec0c287bfd20f36302aa533069ff9c6ced32721f96b29bc";
};
+ # ignore yes stderr output due to trapped SIGPIPE
+ postPatch = ''
+ sed -i 's|yes ".\+"|& 2> /dev/null|' test/*.t
+ '';
+
nativeBuildInputs = [
dune-configurator
];
+ propagatedBuildInputs = lib.optional withLwt lwt;
+
buildInputs = [
cmdliner
- angstrom
- rresult
- fmt
- fpath
];
- propagatedBuildInputs = [
- stdlib-shims
- ];
+ doCheck = true;
meta = with lib; {
description = "Hexdump in OCaml";
diff --git a/third_party/nixpkgs/pkgs/development/ocaml-modules/labltk/default.nix b/third_party/nixpkgs/pkgs/development/ocaml-modules/labltk/default.nix
index 65ea4d4b82..3ee09b2d51 100644
--- a/third_party/nixpkgs/pkgs/development/ocaml-modules/labltk/default.nix
+++ b/third_party/nixpkgs/pkgs/development/ocaml-modules/labltk/default.nix
@@ -56,6 +56,10 @@ let param =
version = "8.06.9";
sha256 = "1k42k3bjkf22gk39lwwzqzfhgjyhxnclslldrzpg5qy1829pbnc0";
};
+ "4.12" = mkNewParam {
+ version = "8.06.10";
+ sha256 = "06cck7wijq4zdshzhxm6jyl8k3j0zglj2axsyfk6q1sq754zyf4a";
+ };
}.${builtins.substring 0 4 ocaml.version};
in
diff --git a/third_party/nixpkgs/pkgs/development/ocaml-modules/lru/default.nix b/third_party/nixpkgs/pkgs/development/ocaml-modules/lru/default.nix
index e5c7937b27..035d612cfe 100644
--- a/third_party/nixpkgs/pkgs/development/ocaml-modules/lru/default.nix
+++ b/third_party/nixpkgs/pkgs/development/ocaml-modules/lru/default.nix
@@ -1,9 +1,11 @@
-{ lib, fetchurl, buildDunePackage, psq }:
+{ lib, fetchurl, buildDunePackage, ocaml, psq, qcheck-alcotest }:
buildDunePackage rec {
pname = "lru";
version = "0.3.0";
+ useDune2 = true;
+
src = fetchurl {
url = "https://github.com/pqwy/lru/releases/download/v${version}/lru-v${version}.tbz";
sha256 = "1ab9rd7cq15ml8x0wjl44wy99h5z7x4g9vkkz4i2d7n84ghy7vw4";
@@ -11,6 +13,9 @@ buildDunePackage rec {
propagatedBuildInputs = [ psq ];
+ doCheck = lib.versionAtLeast ocaml.version "4.05";
+ checkInputs = [ qcheck-alcotest ];
+
meta = {
homepage = "https://github.com/pqwy/lru";
description = "Scalable LRU caches for OCaml";
diff --git a/third_party/nixpkgs/pkgs/development/ocaml-modules/luv/default.nix b/third_party/nixpkgs/pkgs/development/ocaml-modules/luv/default.nix
new file mode 100644
index 0000000000..6ad5ce5d48
--- /dev/null
+++ b/third_party/nixpkgs/pkgs/development/ocaml-modules/luv/default.nix
@@ -0,0 +1,35 @@
+{ lib, buildDunePackage, fetchurl
+, ctypes, result
+, alcotest
+, file
+}:
+
+buildDunePackage rec {
+ pname = "luv";
+ version = "0.5.7";
+ useDune2 = true;
+
+ src = fetchurl {
+ url = "https://github.com/aantron/luv/releases/download/${version}/luv-${version}.tar.gz";
+ sha256 = "0wjnw5riydnzsk1xdzljlpzdnjwpa0j597y6x6ma4990mqj54260";
+ };
+
+ postConfigure = ''
+ for f in src/c/vendor/configure/{ltmain.sh,configure}; do
+ substituteInPlace "$f" --replace /usr/bin/file file
+ done
+ '';
+
+ nativeBuildInputs = [ file ];
+ propagatedBuildInputs = [ ctypes result ];
+ checkInputs = [ alcotest ];
+ doCheck = true;
+
+ meta = with lib; {
+ homepage = "https://github.com/aantron/luv";
+ description = "Binding to libuv: cross-platform asynchronous I/O";
+ # MIT-licensed, extra licenses apply partially to libuv vendor
+ license = with licenses; [ mit bsd2 bsd3 cc-by-sa-40 ];
+ maintainers = with maintainers; [ locallycompact sternenseemann ];
+ };
+}
diff --git a/third_party/nixpkgs/pkgs/development/ocaml-modules/ocaml-cairo/default.nix b/third_party/nixpkgs/pkgs/development/ocaml-modules/ocaml-cairo/default.nix
index 49c8fe5470..7d2960fc5a 100644
--- a/third_party/nixpkgs/pkgs/development/ocaml-modules/ocaml-cairo/default.nix
+++ b/third_party/nixpkgs/pkgs/development/ocaml-modules/ocaml-cairo/default.nix
@@ -19,8 +19,8 @@ stdenv.mkDerivation rec {
patches = [ ./META.patch ];
- nativeBuildInputs = [ pkg-config ];
- buildInputs = [ ocaml automake gnum4 autoconf unzip
+ nativeBuildInputs = [ pkg-config unzip ];
+ buildInputs = [ ocaml automake gnum4 autoconf
findlib freetype lablgtk cairo gdk-pixbuf gtk2 pango ];
createFindlibDestdir = true;
diff --git a/third_party/nixpkgs/pkgs/development/ocaml-modules/ocaml-lsp/default.nix b/third_party/nixpkgs/pkgs/development/ocaml-modules/ocaml-lsp/default.nix
index 0391498c37..46c84d8d70 100644
--- a/third_party/nixpkgs/pkgs/development/ocaml-modules/ocaml-lsp/default.nix
+++ b/third_party/nixpkgs/pkgs/development/ocaml-modules/ocaml-lsp/default.nix
@@ -14,10 +14,10 @@
, lib
}:
let
- version = "1.4.0";
+ version = "1.4.1";
src = fetchzip {
url = "https://github.com/ocaml/ocaml-lsp/releases/download/${version}/jsonrpc-${version}.tbz";
- sha256 = "16vvwq3d9xmr91r6yv5i2gyqcdliji7asyq4g6iygi617233fa33";
+ sha256 = "0hzpw17qfhb0cxgwah1fv4k300r363dy1kv0977anl44dlanx1v5";
};
# unvendor some (not all) dependencies.
@@ -73,6 +73,6 @@ buildDunePackage {
description = "OCaml Language Server Protocol implementation";
license = lib.licenses.isc;
platforms = platforms.unix;
- maintainers = [ maintainers.symphorien ];
+ maintainers = [ maintainers.symphorien maintainers.marsam ];
};
}
diff --git a/third_party/nixpkgs/pkgs/development/ocaml-modules/ppx_import/default.nix b/third_party/nixpkgs/pkgs/development/ocaml-modules/ppx_import/default.nix
index b5651a8cec..4ad26ff086 100644
--- a/third_party/nixpkgs/pkgs/development/ocaml-modules/ppx_import/default.nix
+++ b/third_party/nixpkgs/pkgs/development/ocaml-modules/ppx_import/default.nix
@@ -1,27 +1,28 @@
-{ lib, fetchurl, buildDunePackage, ocaml
-, ounit, ppx_deriving, ppx_tools_versioned
-, ppxlib, ocaml-migrate-parsetree
+{ lib, fetchurl, buildDunePackage
+, ppx_tools_versioned
+, ocaml-migrate-parsetree
+, ounit, ppx_deriving, ppxlib
}:
buildDunePackage rec {
pname = "ppx_import";
- version = "1.7.1";
+ version = "1.8.0";
useDune2 = true;
minimumOCamlVersion = "4.04";
src = fetchurl {
- url = "https://github.com/ocaml-ppx/ppx_import/releases/download/v${version}/ppx_import-v${version}.tbz";
- sha256 = "16dyxfb7syz659rqa7yq36ny5vzl7gkqd7f4m6qm2zkjc1gc8j4v";
+ url = "https://github.com/ocaml-ppx/ppx_import/releases/download/v${version}/ppx_import-${version}.tbz";
+ sha256 = "0zqcj70yyp4ik4jc6jz3qs2xhb94vxc6yq9ij0d5cyak28klc3gv";
};
propagatedBuildInputs = [
- ppxlib ppx_tools_versioned ocaml-migrate-parsetree
+ ppx_tools_versioned ocaml-migrate-parsetree
];
doCheck = true;
- checkInputs = [ ounit ppx_deriving ];
+ checkInputs = [ ounit ppx_deriving ppxlib ];
meta = {
description = "A syntax extension that allows to pull in types or signatures from other compiled interface files";
diff --git a/third_party/nixpkgs/pkgs/development/ocaml-modules/psq/default.nix b/third_party/nixpkgs/pkgs/development/ocaml-modules/psq/default.nix
index ff9c52c50a..f7c2f3497a 100644
--- a/third_party/nixpkgs/pkgs/development/ocaml-modules/psq/default.nix
+++ b/third_party/nixpkgs/pkgs/development/ocaml-modules/psq/default.nix
@@ -1,10 +1,12 @@
-{ lib, buildDunePackage, fetchurl, seq }:
+{ lib, buildDunePackage, ocaml, fetchurl, seq, qcheck-alcotest }:
buildDunePackage rec {
minimumOCamlVersion = "4.03";
pname = "psq";
version = "0.2.0";
+ useDune2 = true;
+
src = fetchurl {
url = "https://github.com/pqwy/psq/releases/download/v${version}/psq-v${version}.tbz";
sha256 = "1j4lqkq17rskhgcrpgr4n1m1a2b1x35mlxj6f9g05rhpmgvgvknk";
@@ -12,6 +14,9 @@ buildDunePackage rec {
propagatedBuildInputs = [ seq ];
+ doCheck = lib.versionAtLeast ocaml.version "4.07";
+ checkInputs = [ qcheck-alcotest ];
+
meta = {
description = "Functional Priority Search Queues for OCaml";
homepage = "https://github.com/pqwy/psq";
diff --git a/third_party/nixpkgs/pkgs/development/ocaml-modules/tcpip/default.nix b/third_party/nixpkgs/pkgs/development/ocaml-modules/tcpip/default.nix
index 80fa01066f..6e639f984c 100644
--- a/third_party/nixpkgs/pkgs/development/ocaml-modules/tcpip/default.nix
+++ b/third_party/nixpkgs/pkgs/development/ocaml-modules/tcpip/default.nix
@@ -1,5 +1,5 @@
{ lib, buildDunePackage, fetchurl
-, bisect_ppx, ppx_cstruct
+, bisect_ppx, ppx_cstruct, pkg-config
, rresult, cstruct, cstruct-lwt, mirage-net, mirage-clock
, mirage-random, mirage-stack, mirage-protocols, mirage-time
, ipaddr, macaddr, macaddr-cstruct, mirage-profile, fmt
@@ -11,18 +11,23 @@
buildDunePackage rec {
pname = "tcpip";
- version = "6.0.0";
+ version = "6.1.0";
useDune2 = true;
src = fetchurl {
url = "https://github.com/mirage/mirage-${pname}/releases/download/v${version}/${pname}-v${version}.tbz";
- sha256 = "0wbrs8jz1vw3zdrqmqcwawxh4yhc2gy30rw7gz4w116cblkvnb8s";
+ sha256 = "e81c98a6e80e05f9fa4e5fbee50e6c247f6011254c7b1d9a0e58bae318c1f0c8";
};
+ patches = [
+ ./no-opam-pkg-config-path.patch
+ ];
+
nativeBuildInputs = [
bisect_ppx
ppx_cstruct
+ pkg-config
];
propagatedBuildInputs = [
diff --git a/third_party/nixpkgs/pkgs/development/ocaml-modules/tcpip/no-opam-pkg-config-path.patch b/third_party/nixpkgs/pkgs/development/ocaml-modules/tcpip/no-opam-pkg-config-path.patch
new file mode 100644
index 0000000000..a7e9155ce5
--- /dev/null
+++ b/third_party/nixpkgs/pkgs/development/ocaml-modules/tcpip/no-opam-pkg-config-path.patch
@@ -0,0 +1,21 @@
+diff --git a/freestanding/Makefile b/freestanding/Makefile
+index f22d220d..4bb3ac57 100644
+--- a/freestanding/Makefile
++++ b/freestanding/Makefile
+@@ -1,6 +1,4 @@
+-PKG_CONFIG_PATH := $(shell opam config var prefix)/lib/pkgconfig
+-
+-EXISTS := $(shell PKG_CONFIG_PATH=$(PKG_CONFIG_PATH) pkg-config --exists ocaml-freestanding; echo $$?)
++EXISTS := $(shell pkg-config --exists ocaml-freestanding; echo $$?)
+
+ .PHONY: all clean
+ all: libtcpip_freestanding_stubs.a
+@@ -10,7 +8,7 @@ libtcpip_freestanding_stubs.a:
+ touch $@
+ else
+ CC ?= cc
+-FREESTANDING_CFLAGS := $(shell PKG_CONFIG_PATH=$(PKG_CONFIG_PATH) pkg-config --cflags ocaml-freestanding)
++FREESTANDING_CFLAGS := $(shell pkg-config --cflags ocaml-freestanding)
+ CFLAGS := $(FREESTANDING_CFLAGS)
+
+ OBJS=checksum_stubs.o
diff --git a/third_party/nixpkgs/pkgs/development/pharo/launcher/default.nix b/third_party/nixpkgs/pkgs/development/pharo/launcher/default.nix
index 45531b5517..23afd44b67 100644
--- a/third_party/nixpkgs/pkgs/development/pharo/launcher/default.nix
+++ b/third_party/nixpkgs/pkgs/development/pharo/launcher/default.nix
@@ -23,7 +23,8 @@ stdenv.mkDerivation rec {
# because upstream tarball has no top-level directory.
sourceRoot = ".";
- buildInputs = [ bash pharo unzip ];
+ nativeBuildInputs = [ unzip ];
+ buildInputs = [ bash pharo ];
installPhase = ''
mkdir -p $prefix/share/pharo-launcher
diff --git a/third_party/nixpkgs/pkgs/development/pharo/vm/build-vm.nix b/third_party/nixpkgs/pkgs/development/pharo/vm/build-vm.nix
index 5427e36746..c1f703f725 100644
--- a/third_party/nixpkgs/pkgs/development/pharo/vm/build-vm.nix
+++ b/third_party/nixpkgs/pkgs/development/pharo/vm/build-vm.nix
@@ -53,10 +53,9 @@ stdenv.mkDerivation rec {
# http://forum.world.st/OSProcess-fork-issue-with-Debian-built-VM-td4947326.html
#
# (stack protection is disabled above for gcc 4.8 compatibility.)
- nativeBuildInputs = [ autoreconfHook ];
+ nativeBuildInputs = [ autoreconfHook unzip ];
buildInputs = [
bash
- unzip
glibc
openssl
gcc48
diff --git a/third_party/nixpkgs/pkgs/development/pharo/vm/share.nix b/third_party/nixpkgs/pkgs/development/pharo/vm/share.nix
index 720f2e39a7..a2a55f2eb4 100644
--- a/third_party/nixpkgs/pkgs/development/pharo/vm/share.nix
+++ b/third_party/nixpkgs/pkgs/development/pharo/vm/share.nix
@@ -36,7 +36,7 @@ stdenv.mkDerivation rec {
sha256 = "0xbdi679ryb2zg412xy6zkh22l20pmbl92m3qhfgzjvgybna8z2a";
};
- buildInputs = [ unzip ];
+ nativeBuildInputs = [ unzip ];
installPhase = ''
mkdir -p $prefix/lib
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/APScheduler/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/APScheduler/default.nix
index 507147dc8d..a4dd79cd58 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/APScheduler/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/APScheduler/default.nix
@@ -1,8 +1,11 @@
{ lib
+, stdenv
, buildPythonPackage
, fetchPypi
, setuptools-scm
, pytestCheckHook
+, pytest-asyncio
+, pytest-tornado
, pytestcov
, sqlalchemy
, tornado
@@ -33,15 +36,16 @@ buildPythonPackage rec {
];
checkInputs = [
+ pytest-asyncio
+ pytest-tornado
pytestCheckHook
pytestcov
sqlalchemy
tornado
twisted
mock
- trollius
gevent
- ];
+ ] ++ lib.optionals (!isPy3k) [ trollius ];
propagatedBuildInputs = [
six
@@ -51,6 +55,11 @@ buildPythonPackage rec {
setuptools
] ++ lib.optional (!isPy3k) futures;
+ disabledTests = lib.optionals stdenv.isDarwin [
+ "test_submit_job"
+ "test_max_instances"
+ ];
+
pythonImportsCheck = [ "apscheduler" ];
meta = with lib; {
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/Cython/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/Cython/default.nix
index 64f5bb3ab6..c09f1586fd 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/Cython/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/Cython/default.nix
@@ -26,11 +26,11 @@ let
in buildPythonPackage rec {
pname = "Cython";
- version = "0.29.21";
+ version = "0.29.22";
src = fetchPypi {
inherit pname version;
- sha256 = "1bcwpra7c6k30yvic3sw2v3rq2dr40ypc4zqif6kr52mpn4wnyp5";
+ sha256 = "sha256-32uDx6bR2WfqiaKQPkqTE3djSil0WWUuRVFzTEgZVAY=";
};
nativeBuildInputs = [
@@ -49,6 +49,15 @@ in buildPythonPackage rec {
url = "https://github.com/cython/cython/commit/28251032f86c266065e4976080230481b1a1bb29.patch";
sha256 = "19rg7xs8gr90k3ya5c634bs8gww1sxyhdavv07cyd2k71afr83gy";
})
+
+ # backport Cython 3.0 trashcan support (https://github.com/cython/cython/pull/2842) to 0.X series.
+ # it does not affect Python code unless the code explicitly uses the feature.
+ # trashcan support is needed to avoid stack overflows during object deallocation in sage (https://trac.sagemath.org/ticket/27267)
+ (fetchpatch {
+ name = "trashcan.patch";
+ url = "https://git.sagemath.org/sage.git/plain/build/pkgs/cython/patches/trashcan.patch?id=4569a839f070a1a38d5dbce2a4d19233d25aeed2";
+ sha256 = "sha256-+pOF1XNTEtNseLpqPzrc1Jfwt5hGx7doUoccIhNneYY=";
+ })
];
checkPhase = ''
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/aioambient/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/aioambient/default.nix
index cd47d7f087..5e504ab87a 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/aioambient/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/aioambient/default.nix
@@ -16,7 +16,7 @@
buildPythonPackage rec {
pname = "aioambient";
- version = "1.2.3";
+ version = "1.2.4";
format = "pyproject";
disabled = pythonOlder "3.6";
@@ -24,7 +24,7 @@ buildPythonPackage rec {
owner = "bachya";
repo = pname;
rev = version;
- sha256 = "1jg93rjn1gxc66qmipw4z1c09l8hgfsydacjgkfjq7vg547lragp";
+ sha256 = "sha256-uqvM5F0rpw+xeCXYl4lGMt3r0ugPsUmSvujmTJ9HABk=";
};
nativeBuildInputs = [ poetry-core ];
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/aioesphomeapi/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/aioesphomeapi/default.nix
index 503a5336ee..4255754425 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/aioesphomeapi/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/aioesphomeapi/default.nix
@@ -2,13 +2,13 @@
buildPythonPackage rec {
pname = "aioesphomeapi";
- version = "2.6.5";
+ version = "2.6.6";
disabled = !isPy3k;
src = fetchPypi {
inherit pname version;
- sha256 = "sha256-inktluPKefrFQCF2yadvHwT9Rw+pJLw8pjdUc35IJoc=";
+ sha256 = "sha256-LdBUtU5rNoixh7DPIFkHxLMvBeI6MZH57sO0IjuOQAw=";
};
propagatedBuildInputs = [ attrs protobuf zeroconf ];
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/aioflo/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/aioflo/default.nix
index 60288178de..8fe61282ab 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/aioflo/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/aioflo/default.nix
@@ -12,14 +12,14 @@
buildPythonPackage rec {
pname = "aioflo";
- version = "0.4.2";
+ version = "0.4.3";
format = "pyproject";
src = fetchFromGitHub {
owner = "bachya";
repo = pname;
rev = version;
- sha256 = "1ppsinmjph6snj7s4hg28p3qa67kpkadc98ikjjg6w65vcm3dlaz";
+ sha256 = "sha256-Dap3yjFIS+k/LLNg+vmYmiFQCOEPNp27p0GCMpn/edA=";
};
nativeBuildInputs = [ poetry-core ];
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/aioguardian/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/aioguardian/default.nix
index 8d3de12cd9..47b8201618 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/aioguardian/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/aioguardian/default.nix
@@ -15,14 +15,14 @@
buildPythonPackage rec {
pname = "aioguardian";
- version = "1.0.4";
+ version = "1.0.7";
disabled = pythonAtLeast "3.9";
src = fetchFromGitHub {
owner = "bachya";
repo = pname;
rev = version;
- sha256 = "1cbxcsxh9c8r2zx3lsjdns26sm2qmlwnqgah2sfzbgp1lay23vvq";
+ sha256 = "sha256-KMhq86hcqoYloS/6VHsl+3KVEZBbN97ABrZlmEr32Z8=";
};
format = "pyproject";
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/aiohttp/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/aiohttp/default.nix
index 514d1d308e..c0722c8c97 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/aiohttp/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/aiohttp/default.nix
@@ -3,82 +3,77 @@
, buildPythonPackage
, fetchPypi
, pythonOlder
+, async-timeout
, attrs
, chardet
-, multidict
-, async-timeout
-, yarl
, idna-ssl
+, multidict
, typing-extensions
-, pytestrunner
-, pytestCheckHook
-, gunicorn
+, yarl
, async_generator
-, pytest_xdist
-, pytestcov
-, pytest-mock
-, trustme
, brotlipy
, freezegun
-, isPy38
+, gunicorn
+, pytest-mock
+, pytest-xdist
+, pytestCheckHook
, re-assert
+, trustme
}:
buildPythonPackage rec {
pname = "aiohttp";
- version = "3.7.3";
- # https://github.com/aio-libs/aiohttp/issues/4525 python3.8 failures
- disabled = pythonOlder "3.5";
+ version = "3.7.4.post0";
+ disabled = pythonOlder "3.6";
src = fetchPypi {
inherit pname version;
- sha256 = "9c1a81af067e72261c9cbe33ea792893e83bc6aa987bfbd6fdc1e5e7b22777c4";
+ sha256 = "493d3299ebe5f5a7c66b9819eacdcfbbaaf1a8e84911ddffcdc48888497afecf";
};
- checkInputs = [
- pytestrunner pytestCheckHook gunicorn async_generator pytest_xdist
- pytest-mock pytestcov trustme brotlipy freezegun
- re-assert
- ];
+ postPatch = ''
+ substituteInPlace setup.cfg --replace " --cov=aiohttp" ""
+ '';
propagatedBuildInputs = [
+ async-timeout
attrs
chardet
multidict
- async-timeout
typing-extensions
yarl
] ++ lib.optionals (pythonOlder "3.7") [
idna-ssl
];
+ checkInputs = [
+ async_generator
+ brotlipy
+ freezegun
+ gunicorn
+ pytest-mock
+ pytest-xdist
+ pytestCheckHook
+ re-assert
+ trustme
+ ];
+
+ pytestFlagsArray = [
+ "-n auto"
+ ];
+
disabledTests = [
- # disable tests which attempt to do loopback connections
- "get_valid_log_format_exc"
- "test_access_logger_atoms"
- "aiohttp_request_coroutine"
- "server_close_keepalive_connection"
- "connector"
- "client_disconnect"
- "handle_keepalive_on_closed_connection"
- "proxy_https_bad_response"
- "partially_applied_handler"
- "middleware"
+ # Disable tests that require network access
"test_mark_formdata_as_processed"
- # no longer compatible with pytest>=6
- "aiohttp_plugin_async_fixture"
] ++ lib.optionals stdenv.is32bit [
"test_cookiejar"
- ] ++ lib.optionals isPy38 [
- # Python 3.8 https://github.com/aio-libs/aiohttp/issues/4525
- "test_read_boundary_with_incomplete_chunk"
- "test_read_incomplete_chunk"
- "test_request_tracing_exception"
] ++ lib.optionals stdenv.isDarwin [
- "test_addresses" # https://github.com/aio-libs/aiohttp/issues/3572
+ "test_addresses" # https://github.com/aio-libs/aiohttp/issues/3572, remove >= v4.0.0
"test_close"
];
+ __darwinAllowLocalNetworking = true;
+
# aiohttp in current folder shadows installed version
# Probably because we run `python -m pytest` instead of `pytest` in the hook.
preCheck = ''
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/aiolyric/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/aiolyric/default.nix
index 0f1a297e6a..0dc576fca4 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/aiolyric/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/aiolyric/default.nix
@@ -8,14 +8,14 @@
buildPythonPackage rec {
pname = "aiolyric";
- version = "1.0.5";
+ version = "1.0.6";
disabled = pythonOlder "3.7";
src = fetchFromGitHub {
owner = "timmo001";
repo = pname;
rev = "v${version}";
- sha256 = "00kq3dsjcfhjzn585phb3g168dbg53wrqq7g8a4gljs49c2mf5qx";
+ sha256 = "1lnzsdw6kvgk0762f3vyw4xfzn7qkvsff16q61gm0ryjqg9j8whx";
};
propagatedBuildInputs = [ aiohttp ];
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/aiorecollect/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/aiorecollect/default.nix
index c802633e57..53daf1f226 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/aiorecollect/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/aiorecollect/default.nix
@@ -13,14 +13,14 @@
buildPythonPackage rec {
pname = "aiorecollect";
- version = "1.0.2";
+ version = "1.0.3";
format = "pyproject";
src = fetchFromGitHub {
owner = "bachya";
repo = pname;
rev = version;
- sha256 = "0dlz8zmqcn6g6000lfgcy5krpfafzdzrznmk6iwra65wcs7l9392";
+ sha256 = "sha256-S4HL8vJS/dTKsR5egKRSHqZYPClcET5Le06euHPyIkU=";
};
nativeBuildInputs = [ poetry-core ];
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/aiorun/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/aiorun/default.nix
index 9c67765055..414f8a6d9a 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/aiorun/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/aiorun/default.nix
@@ -1,25 +1,24 @@
{ lib
, buildPythonPackage
, fetchFromGitHub
-, isPy27
+, pythonOlder
, pygments
, pytestCheckHook
-, pytestcov
+, pytest-cov
, uvloop
}:
buildPythonPackage rec {
pname = "aiorun";
- version = "2020.6.1";
+ version = "2020.12.1";
format = "flit";
-
- disabled = isPy27;
+ disabled = pythonOlder "3.5";
src = fetchFromGitHub {
owner = "cjrh";
repo = pname;
rev = "v${version}";
- sha256 = "00mq5ylhhdfdqrh7zdqabf3wy85jrkqvgfb1421ll46fsjim2d14";
+ sha256 = "sha256-ktc2cmoPNYcsVyKCWs+ivhV5onywFIrdDRBiBKrdiF4=";
};
propagatedBuildInputs = [
@@ -28,7 +27,7 @@ buildPythonPackage rec {
checkInputs = [
pytestCheckHook
- pytestcov
+ pytest-cov
uvloop
];
@@ -43,6 +42,6 @@ buildPythonPackage rec {
description = "Boilerplate for asyncio applications";
homepage = "https://github.com/cjrh/aiorun";
license = licenses.asl20;
- maintainers = [ maintainers.costrouc ];
+ maintainers = with maintainers; [ costrouc ];
};
}
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/ajsonrpc/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/ajsonrpc/default.nix
new file mode 100644
index 0000000000..e5a81d9cfa
--- /dev/null
+++ b/third_party/nixpkgs/pkgs/development/python-modules/ajsonrpc/default.nix
@@ -0,0 +1,24 @@
+{ lib, pythonOlder, buildPythonPackage, fetchPypi, pytestCheckHook }:
+
+buildPythonPackage rec {
+ pname = "ajsonrpc";
+ version = "1.1.0";
+
+ disabled = pythonOlder "3.5";
+
+ src = fetchPypi {
+ inherit pname version;
+ sha256 = "1b5r8975wdnk3qnc1qjnn4lkxmqcir3brbwnxml9ii90dnsw408a";
+ };
+
+ checkInputs = [ pytestCheckHook ];
+
+ pythonImportsCheck = [ "ajsonrpc" ];
+
+ meta = with lib; {
+ description = "Async JSON-RPC 2.0 protocol + asyncio server";
+ homepage = "https://github.com/pavlov99/ajsonrpc";
+ license = licenses.mit;
+ maintainers = with maintainers; [ oxzi ];
+ };
+}
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/astroid/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/astroid/default.nix
index 49f04bcb91..468488ec0c 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/astroid/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/astroid/default.nix
@@ -1,34 +1,39 @@
-{ lib, fetchPypi, buildPythonPackage, pythonOlder, isPyPy, pythonAtLeast
-, lazy-object-proxy, six, wrapt, typing, typed-ast
-, pytestrunner, pytest
+{ lib
+, buildPythonPackage
+, fetchPypi
+, pythonOlder
+, isPyPy
+, lazy-object-proxy
+, wrapt
+, typed-ast
+, pytestCheckHook
}:
buildPythonPackage rec {
pname = "astroid";
- version = "2.4.2";
+ version = "2.5";
- disabled = pythonOlder "3.4" || pythonAtLeast "3.9";
+ disabled = pythonOlder "3.6";
src = fetchPypi {
inherit pname version;
- sha256 = "2f4078c2a41bf377eea06d71c9d2ba4eb8f6b1af2135bec27bbbb7d8f12bb703";
+ sha256 = "03dzhjrsc5d2whyjngfrwvxn42058k0cjjr85x2wqzai8psr475k";
};
- postPatch = ''
- substituteInPlace astroid/__pkginfo__.py --replace "lazy_object_proxy==1.4.*" "lazy_object_proxy"
- '';
-
# From astroid/__pkginfo__.py
- propagatedBuildInputs = [ lazy-object-proxy six wrapt ]
- ++ lib.optional (pythonOlder "3.5") typing
- ++ lib.optional (!isPyPy) typed-ast;
+ propagatedBuildInputs = [
+ lazy-object-proxy
+ wrapt
+ ] ++ lib.optional (!isPyPy && pythonOlder "3.8") typed-ast;
- checkInputs = [ pytestrunner pytest ];
+ checkInputs = [
+ pytestCheckHook
+ ];
meta = with lib; {
description = "An abstract syntax tree for Python with inference support";
homepage = "https://github.com/PyCQA/astroid";
- license = licenses.lgpl2;
+ license = licenses.lgpl21Plus;
platforms = platforms.all;
maintainers = with maintainers; [ nand0p ];
};
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/async-upnp-client/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/async-upnp-client/default.nix
index 6697cb5d13..5f6d68b9ca 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/async-upnp-client/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/async-upnp-client/default.nix
@@ -1,6 +1,6 @@
{ lib, buildPythonPackage, fetchFromGitHub, pythonOlder
, voluptuous, aiohttp, async-timeout, python-didl-lite, defusedxml
-, pytest_6, pytest-asyncio }:
+, pytestCheckHook, pytest-asyncio }:
buildPythonPackage rec {
pname = "async-upnp-client";
@@ -23,7 +23,7 @@ buildPythonPackage rec {
];
checkInputs = [
- pytest_6
+ pytestCheckHook
pytest-asyncio
];
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/asyncwhois/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/asyncwhois/default.nix
index 7ce389f984..fe055d7f19 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/asyncwhois/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/asyncwhois/default.nix
@@ -10,14 +10,14 @@
buildPythonPackage rec {
pname = "asyncwhois";
- version = "0.3.0";
+ version = "0.3.1";
disabled = pythonOlder "3.7";
src = fetchFromGitHub {
owner = "pogzyb";
repo = pname;
rev = "v${version}";
- sha256 = "1514fz942yix7fh4yg982mxjp8c0qb6a0i4fw5wsc3xx4g86zcdg";
+ sha256 = "1wp6pwnc1inzzn9nhkwq9m9ab1aylw0hzq94w6p2dsm2njfqma8h";
};
propagatedBuildInputs = [
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/azure-mgmt-datafactory/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/azure-mgmt-datafactory/default.nix
index 91f420f11a..8454d4463f 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/azure-mgmt-datafactory/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/azure-mgmt-datafactory/default.nix
@@ -11,12 +11,12 @@
buildPythonPackage rec {
pname = "azure-mgmt-datafactory";
- version = "1.0.0";
+ version = "1.1.0";
src = fetchPypi {
inherit pname version;
extension = "zip";
- sha256 = "d4f3984eca74b1e3691467aadc09626e578ed1fc5ef410872d474f3e7653916a";
+ sha256 = "433ad8e83bd8df4abc5af47a0e3a7a4515f79931db4036f2bccd65b5a9e88bfb";
};
propagatedBuildInputs = [
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/azure-mgmt-netapp/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/azure-mgmt-netapp/default.nix
index ec1caa5c3e..35dc7ef05a 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/azure-mgmt-netapp/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/azure-mgmt-netapp/default.nix
@@ -6,13 +6,13 @@
}:
buildPythonPackage rec {
- version = "1.0.0";
+ version = "2.0.0";
pname = "azure-mgmt-netapp";
disabled = isPy27;
src = fetchPypi {
inherit pname version;
- sha256 = "e2c0cecd634c0a106e389f39ad767bfd1d718d90692e4e3c9664b1fe9a792ade";
+ sha256 = "ff3b663e36c961e86fc0cdbd6f9fb9fb863d3e7db9035fe713af7299e809ee5e";
extension = "zip";
};
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/backports_ssl_match_hostname/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/backports_ssl_match_hostname/default.nix
index d6fecfbdfb..a7403e1612 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/backports_ssl_match_hostname/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/backports_ssl_match_hostname/default.nix
@@ -1,8 +1,9 @@
-{ lib, buildPythonPackage, fetchPypi }:
+{ lib, buildPythonPackage, fetchPypi, pythonAtLeast }:
buildPythonPackage rec {
pname = "backports.ssl_match_hostname";
version = "3.7.0.1";
+ disabled = pythonAtLeast "3.7";
src = fetchPypi {
inherit pname version;
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/bleak/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/bleak/default.nix
index 38390e8377..f229beb2b0 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/bleak/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/bleak/default.nix
@@ -1,14 +1,16 @@
-{ lib, buildPythonPackage, isPy3k, fetchPypi, bluez, txdbus, pytest, pytestcov }:
+{ lib, buildPythonPackage, isPy3k, fetchPypi
+, bluez, dbus-next, pytestCheckHook, pytest-cov
+}:
buildPythonPackage rec {
pname = "bleak";
- version = "0.10.0";
+ version = "0.11.0";
disabled = !isPy3k;
src = fetchPypi {
inherit pname version;
- sha256 = "5c3a873965f2910865895e572e7a4f10533d6e150e6ba17936397426bf8d1eee";
+ sha256 = "1zs5lz3r17a2xn19i4na132iccyjsl9navj0d3v7gks7hlcad5kp";
};
postPatch = ''
@@ -19,10 +21,11 @@ buildPythonPackage rec {
--replace \"bluetoothctl\" \"${bluez}/bin/bluetoothctl\"
'';
- propagatedBuildInputs = [ txdbus ];
- checkInputs = [ pytest pytestcov ];
+ propagatedBuildInputs = [ dbus-next ];
- checkPhase = "AGENT_OS=linux py.test";
+ checkInputs = [ pytestCheckHook pytest-cov ];
+
+ pythonImportsCheck = [ "bleak" ];
meta = with lib; {
description = "Bluetooth Low Energy platform Agnostic Klient for Python";
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/boto3/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/boto3/default.nix
index b8d184a058..cdd6af447b 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/boto3/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/boto3/default.nix
@@ -13,11 +13,11 @@
buildPythonPackage rec {
pname = "boto3";
- version = "1.17.25"; # N.B: if you change this, change botocore and awscli to a matching version
+ version = "1.17.30"; # N.B: if you change this, change botocore and awscli to a matching version
src = fetchPypi {
inherit pname version;
- sha256 = "sha256-Jz6WriuVpgNqTDVH52onCxerdhzHYFOCPJ42HSaCE+8=";
+ sha256 = "sha256-05wEtR5gGX9VA/hInwQ7yQSYFWfMhDHTiTZ3Z9w/1a4=";
};
propagatedBuildInputs = [ botocore jmespath s3transfer ] ++ lib.optionals (!isPy3k) [ futures ];
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/botocore/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/botocore/default.nix
index d6069e14a9..ca8ef220c9 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/botocore/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/botocore/default.nix
@@ -12,11 +12,11 @@
buildPythonPackage rec {
pname = "botocore";
- version = "1.20.25"; # N.B: if you change this, change boto3 and awscli to a matching version
+ version = "1.20.30"; # N.B: if you change this, change boto3 and awscli to a matching version
src = fetchPypi {
inherit pname version;
- sha256 = "sha256-uAtO/l+vsp8ko2V9H3eqFwUlyHa1/ZOE1eWFnQQFIG4=";
+ sha256 = "sha256-mP8eshDTlKH/5zazPIp75o8w8KA1ULVZxbtv3wwpMo0=";
};
propagatedBuildInputs = [
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/brother/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/brother/default.nix
index 3e86aac02f..e4f9d63bd6 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/brother/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/brother/default.nix
@@ -1,25 +1,33 @@
-{ lib, buildPythonPackage, fetchFromGitHub, pythonOlder
+{ lib
+, buildPythonPackage
+, fetchFromGitHub
, pysnmp
-, asynctest, pytestcov, pytestrunner, pytest-asyncio, pytest-trio, pytest-tornasync }:
+, pytest-asyncio
+, pytest-error-for-skips
+, pytest-runner
+, pytest-tornasync
+, pytest-trio
+, pytestCheckHook
+, pythonOlder
+}:
buildPythonPackage rec {
pname = "brother";
- version = "0.2.1";
+ version = "0.2.2";
disabled = pythonOlder "3.8";
src = fetchFromGitHub {
owner = "bieniu";
repo = pname;
rev = version;
- sha256 = "sha256-yOloGkOVhXcTt0PAjf3yWUItN1okO94DndRFsImiuz4=";
+ sha256 = "sha256-vIefcL3K3ZbAUxMFM7gbbTFdrnmufWZHcq4OA19SYXE=";
};
- # pytest-error-for-skips is not packaged
postPatch = ''
substituteInPlace pytest.ini \
- --replace " --error-for-skips" ""
- substituteInPlace setup.py \
- --replace "\"pytest-error-for-skips\"" ""
+ --replace "--cov --cov-report term-missing " ""
+ substituteInPlace requirements-test.txt \
+ --replace "pytest-cov" ""
'';
propagatedBuildInputs = [
@@ -27,16 +35,18 @@ buildPythonPackage rec {
];
checkInputs = [
- asynctest
- pytestcov
- pytestrunner
pytest-asyncio
- pytest-trio
+ pytest-error-for-skips
+ pytest-runner
pytest-tornasync
+ pytest-trio
+ pytestCheckHook
];
+ pythonImportsCheck = [ "brother" ];
+
meta = with lib; {
- description = "Python wrapper for getting data from Brother laser and inkjet printers via SNMP.";
+ description = "Python wrapper for getting data from Brother laser and inkjet printers via SNMP";
homepage = "https://github.com/bieniu/brother";
license = licenses.asl20;
maintainers = with maintainers; [ hexa ];
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/build/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/build/default.nix
index 46c3bea0b8..b5dce09d51 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/build/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/build/default.nix
@@ -1,25 +1,29 @@
{ lib
, buildPythonPackage
, fetchPypi
+, filelock
, flit-core
-, toml
-, pep517
-, packaging
-, isPy3k
-, typing
-, pythonOlder
, importlib-metadata
+, isPy3k
+, packaging
+, pep517
+, pytest-mock
+, pytest-xdist
+, pytestCheckHook
+, pythonOlder
+, toml
+, typing
}:
buildPythonPackage rec {
pname = "build";
- version = "0.1.0";
+ version = "0.3.0";
format = "pyproject";
src = fetchPypi {
inherit pname version;
- sha256 = "1d6m21lijwm04g50nwgsgj7x3vhblzw7jv05ah8psqgzk20bbch8";
+ sha256 = "sha256-DrlbLI13DXxMm5LGjCJ8NQu/ZfPsg1UazpCXwYzBX90=";
};
nativeBuildInputs = [
@@ -36,8 +40,25 @@ buildPythonPackage rec {
importlib-metadata
];
- # No tests in archive
- doCheck = false;
+ checkInputs = [
+ filelock
+ pytestCheckHook
+ pytest-mock
+ pytest-xdist
+ ];
+
+ disabledTests = [
+ "test_isolation"
+ "test_isolated_environment_install"
+ "test_default_pip_is_never_too_old"
+ "test_build_isolated - StopIteration"
+ "test_build_raises_build_exception"
+ "test_build_raises_build_backend_exception"
+ "test_projectbuilder.py"
+ "test_projectbuilder.py"
+ ];
+
+ pythonImportsCheck = [ "build" ];
meta = with lib; {
description = "Simple, correct PEP517 package builder";
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/buildbot/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/buildbot/default.nix
index ea4910712c..3946170c78 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/buildbot/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/buildbot/default.nix
@@ -3,7 +3,7 @@
sqlalchemy_migrate, dateutil, txaio, autobahn, pyjwt, pyyaml, treq,
txrequests, pypugjs, boto3, moto, mock, python-lz4, setuptoolsTrial,
isort, pylint, flake8, buildbot-worker, buildbot-pkg, buildbot-plugins,
- parameterized, git, openssh, glibcLocales, nixosTests }:
+ parameterized, git, openssh, glibcLocales, ldap3, nixosTests }:
let
withPlugins = plugins: buildPythonPackage {
@@ -25,11 +25,11 @@ let
package = buildPythonPackage rec {
pname = "buildbot";
- version = "3.0.0";
+ version = "3.0.2";
src = fetchPypi {
inherit pname version;
- sha256 = "0li47fpm398dk69q6g2zjaxx46w00g3n0jszz88kf57sakri553y";
+ sha256 = "0iywcvq1sx9z5f37pw7g9qqm19fr3bymzawb0i2afm737hxr2xfp";
};
propagatedBuildInputs = [
@@ -67,6 +67,9 @@ let
git
openssh
glibcLocales
+ # optional dependency that was accidentally made required for tests
+ # https://github.com/buildbot/buildbot/pull/5857
+ ldap3
];
patches = [
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/buildbot/pkg.nix b/third_party/nixpkgs/pkgs/development/python-modules/buildbot/pkg.nix
index 71da12049e..98666faee4 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/buildbot/pkg.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/buildbot/pkg.nix
@@ -6,7 +6,7 @@ buildPythonPackage rec {
src = fetchPypi {
inherit pname version;
- sha256 = "0ihcxdkbm1lq79fdjmcrj316zh6sjlc3162yynww8nggv2mlnz6v";
+ sha256 = "1vraxisvgnl9q2rgsmfdh1ywja125s97xqicrdx9mbmrwaka2a40";
};
postPatch = ''
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/buildbot/plugins.nix b/third_party/nixpkgs/pkgs/development/python-modules/buildbot/plugins.nix
index a9a9538f5b..b2d7cc38be 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/buildbot/plugins.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/buildbot/plugins.nix
@@ -7,7 +7,7 @@
src = fetchPypi {
inherit pname version;
- sha256 = "0pk7h5wwvmdn74ngj5rspz7z9y80ryzgqd2z2qy7kf9chpz7qczk";
+ sha256 = "0lzlghgsb247w0aw0x7vqw4f980kfbbbvjw48fcq9951qcqkr1sf";
};
# Remove unneccessary circular dependency on buildbot
@@ -34,7 +34,7 @@
src = fetchPypi {
inherit pname version;
- sha256 = "1y9dpxi7r5r2ya5y0i28b4g5fvla6wrbjz9rffqaqldf4h316jx2";
+ sha256 = "1sqmmxxi0npjcha3xfyy4ldqaks8hmlhilnyvzsfi56n9s96z1cj";
};
buildInputs = [ buildbot-pkg ];
@@ -56,7 +56,7 @@
src = fetchPypi {
inherit pname version;
- sha256 = "0vhnqqxl693b2d14ayifpjz8zlg3dngl127svr08amzmbad7irh1";
+ sha256 = "1w4mf8gi71ycf0m93cv1qqly36xnnrmpangzv0pvx23czs96lcms";
};
buildInputs = [ buildbot-pkg ];
@@ -78,7 +78,7 @@
src = fetchPypi {
inherit pname version;
- sha256 = "1dgs33z3sjr3s8ymqyxjkx2g6iah3p91ng9hxllmyyp4xpxaxyhk";
+ sha256 = "1a9ssl0plzrs150n958h7aasm0h64whixckfl1y2y3750qy3vrd2";
};
buildInputs = [ buildbot-pkg ];
@@ -100,7 +100,7 @@
src = fetchPypi {
inherit pname version;
- sha256 = "06j6f2k0r8nyh8swh689cy4zq50lmy5glx0pa3zdpnk02k4x3q72";
+ sha256 = "1wcli3vymsqc720jj23ir86lirshb3p8szp7m21lz13g9mpj0idl";
};
buildInputs = [ buildbot-pkg ];
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/buildbot/worker.nix b/third_party/nixpkgs/pkgs/development/python-modules/buildbot/worker.nix
index 7feb409a26..d9dea034ea 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/buildbot/worker.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/buildbot/worker.nix
@@ -7,7 +7,7 @@ buildPythonPackage (rec {
src = fetchPypi {
inherit pname version;
- sha256 = "0zrd9h9i7fnmh81zvscxzq3rspyvjvidzbgcziq2m0z522krs8qq";
+ sha256 = "1xvn0m8vijzfrm5sdls3n4ca8iyrnxsprl6dj15f7zy9rms4m47p";
};
propagatedBuildInputs = [ twisted future ];
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/bx-python/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/bx-python/default.nix
index 395978396a..aa1e3d1d86 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/bx-python/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/bx-python/default.nix
@@ -3,14 +3,14 @@
buildPythonPackage rec {
pname = "bx-python";
- version = "0.8.10";
+ version = "0.8.11";
disabled = isPy27;
src = fetchFromGitHub {
owner = "bxlab";
repo = "bx-python";
rev = "v${version}";
- sha256 = "09q5nrv0w9b1bclc7g80bih87ikffhvia22d6cpdc747wjrzz8il";
+ sha256 = "0cz5vgw19hmkcg689vr540q2gl2lb3xcf1lphm7zbfp8wmypcadm";
};
nativeBuildInputs = [ cython ];
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/casbin/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/casbin/default.nix
index 6d86ccb954..6057a770e0 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/casbin/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/casbin/default.nix
@@ -8,7 +8,7 @@
buildPythonPackage rec {
pname = "casbin";
- version = "0.18.3";
+ version = "0.18.4";
disabled = isPy27;
@@ -16,7 +16,7 @@ buildPythonPackage rec {
owner = pname;
repo = "pycasbin";
rev = "v${version}";
- sha256 = "1wbwccwizndiww9a3x1jhixzpcg2qmqlxidk2rqnrzvp04lb8b0q";
+ sha256 = "16yhl1xgrgkyqnmbw9in3y7ypcxvvy21h32v50cd73a3iw4x27d0";
};
propagatedBuildInputs = [
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/check-manifest/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/check-manifest/default.nix
index 95bb9660d4..de833e18be 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/check-manifest/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/check-manifest/default.nix
@@ -1,4 +1,14 @@
-{ lib, buildPythonPackage, fetchPypi, pep517, toml, mock, breezy, git, build }:
+{ lib
+, breezy
+, build
+, buildPythonPackage
+, fetchPypi
+, git
+, mock
+, pep517
+, pytestCheckHook
+, toml
+}:
buildPythonPackage rec {
pname = "check-manifest";
@@ -14,9 +24,20 @@ buildPythonPackage rec {
substituteInPlace tests.py --replace "test_build_sdist" "no_test_build_sdist"
'';
- propagatedBuildInputs = [ build pep517 toml ];
+ propagatedBuildInputs = [
+ build
+ pep517
+ toml
+ ];
- checkInputs = [ mock breezy git ];
+ checkInputs = [
+ breezy
+ git
+ mock
+ pytestCheckHook
+ ];
+
+ pythonImportsCheck = [ "check_manifest" ];
meta = with lib; {
homepage = "https://github.com/mgedmin/check-manifest";
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/cupy/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/cupy/default.nix
index 5c4978a388..d4b42ac83e 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/cupy/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/cupy/default.nix
@@ -1,7 +1,7 @@
{ lib, buildPythonPackage
, fetchPypi, isPy3k, linuxPackages
, fastrlock, numpy, six, wheel, pytest, mock, setuptools
-, cudatoolkit, cudnn, nccl
+, cudatoolkit, cudnn, cutensor, nccl
}:
buildPythonPackage rec {
@@ -26,6 +26,7 @@ buildPythonPackage rec {
propagatedBuildInputs = [
cudatoolkit
cudnn
+ cutensor
linuxPackages.nvidia_x11
nccl
fastrlock
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/curio/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/curio/default.nix
index 31875abd1e..fb1eceda7f 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/curio/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/curio/default.nix
@@ -1,6 +1,7 @@
{ lib
, buildPythonPackage
, fetchPypi
+, fetchpatch
, isPy3k
, pytestCheckHook
, sphinx
@@ -16,6 +17,20 @@ buildPythonPackage rec {
sha256 = "57edce81c837f3c2cf42fbb346dee26e537d1659e6605269fb13bd179e068744";
};
+ patches = [
+ # Fix the flaky test due to slow moving time on Apple Silicon chips.
+ # Remove when https://github.com/dabeaz/curio/pull/339 is in the next release.
+ (fetchpatch {
+ url = "https://github.com/dabeaz/curio/commit/132376724bbfaa0a52d3d63d0791aa4ac1eb6f5f.patch";
+ sha256 = "sha256-AxO0xRcR9l9/NKEJFwyZIoYcyZxpqOhpdNaeaYokVb4=";
+ })
+ # Same as above
+ (fetchpatch {
+ url = "https://github.com/dabeaz/curio/commit/8ac2f12a2cdacbc750b01fc7459cee8879bc1ee3.patch";
+ sha256 = "sha256-2Si3fuDLrI09QuzJd1TrE0QY02G9e9m+1eHFTB/MrWU=";
+ })
+ ];
+
disabled = !isPy3k;
checkInputs = [ pytestCheckHook sphinx ];
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/databricks-cli/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/databricks-cli/default.nix
index 54cec0f98a..547b9a3af7 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/databricks-cli/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/databricks-cli/default.nix
@@ -9,11 +9,11 @@
buildPythonPackage rec {
pname = "databricks-cli";
- version = "0.14.2";
+ version = "0.14.3";
src = fetchPypi {
inherit pname version;
- sha256 = "9e956f0efb7aad100d9963f223db986392cf2dc3e9922f2f83e55d372e84ef16";
+ sha256 = "bdf89a3917a3f8f8b99163e38d40e66dc478c7408954747f145cd09816b05e2c";
};
checkInputs = [
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/datasets/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/datasets/default.nix
index fc349cdc27..cc06297c4e 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/datasets/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/datasets/default.nix
@@ -3,6 +3,8 @@
, fetchFromGitHub
, dill
, filelock
+, fsspec
+, huggingface-hub
, multiprocess
, numpy
, pandas
@@ -14,18 +16,20 @@
buildPythonPackage rec {
pname = "datasets";
- version = "1.1.2";
+ version = "1.4.1";
src = fetchFromGitHub {
owner = "huggingface";
repo = pname;
rev = version;
- hash = "sha256-upXZ2rOfmjnJbDo6RMGeHv/fe10RQAf/zwDWWKdt6SA=";
+ hash = "sha256-is8TS84varARWyfeDTbQH0pcYFTk0PcEyK183emB4GE=";
};
propagatedBuildInputs = [
dill
filelock
+ fsspec
+ huggingface-hub
multiprocess
numpy
pandas
@@ -36,7 +40,9 @@ buildPythonPackage rec {
];
postPatch = ''
- substituteInPlace setup.py --replace '"tqdm>=4.27,<4.50.0"' '"tqdm>=4.27"'
+ substituteInPlace setup.py \
+ --replace '"tqdm>=4.27,<4.50.0"' '"tqdm>=4.27"' \
+ --replace "huggingface_hub==0.0.2" "huggingface_hub>=0.0.2"
'';
# Tests require pervasive internet access.
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/datashader/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/datashader/default.nix
index ad5cc8bfb0..d656a203b9 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/datashader/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/datashader/default.nix
@@ -24,11 +24,11 @@
buildPythonPackage rec {
pname = "datashader";
- version = "0.12.0";
+ version = "0.12.1";
src = fetchPypi {
inherit pname version;
- sha256 = "sha256-CnV6ne3cbMtoVUBDqXf4n3tlEMzuKp7H8Ju7Qrzn9es=";
+ sha256 = "a135612876dc3e4b16ccb9ddb70de50519825c8c1be251b49aefa550bcf8a39a";
};
propagatedBuildInputs = [
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/deprecated/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/deprecated/default.nix
index 0374bebe4f..c6e3093352 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/deprecated/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/deprecated/default.nix
@@ -3,11 +3,11 @@
buildPythonPackage rec {
pname = "Deprecated";
- version = "1.2.11";
+ version = "1.2.12";
src = fetchPypi {
inherit pname version;
- sha256 = "471ec32b2755172046e28102cd46c481f21c6036a0ec027521eba8521aa4ef35";
+ sha256 = "6d2de2de7931a968874481ef30208fd4e08da39177d61d3d4ebdf4366e7dbca1";
};
propagatedBuildInputs = [ wrapt ];
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/devolo-home-control-api/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/devolo-home-control-api/default.nix
index 1e388fd3a1..db26b089e4 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/devolo-home-control-api/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/devolo-home-control-api/default.nix
@@ -2,28 +2,26 @@
, aiohttp
, buildPythonPackage
, fetchFromGitHub
-, pytestCheckHook
-, pytest-cov
, pytest-mock
+, pytestCheckHook
+, pythonOlder
, requests
-, zeroconf
, websocket_client
-, pytest-runner
+, zeroconf
}:
buildPythonPackage rec {
pname = "devolo-home-control-api";
- version = "0.16.0";
+ version = "0.17.0";
+ disabled = pythonOlder "3.6";
src = fetchFromGitHub {
owner = "2Fake";
repo = "devolo_home_control_api";
rev = "v${version}";
- sha256 = "19zzdbx0dxlm8pq0yk00nn9gqqblgpp16fgl7z6a98hsa6459zzb";
+ sha256 = "sha256-g82YmlxlBdyNn7KPU+k+J3/P7ABWMMdLXUpXWnCkdpM=";
};
- nativeBuildInputs = [ pytest-runner ];
-
propagatedBuildInputs = [
requests
zeroconf
@@ -32,12 +30,22 @@ buildPythonPackage rec {
checkInputs = [
pytestCheckHook
- pytest-cov
pytest-mock
];
+ postPatch = ''
+ # setup.py is not able to detect the version with setuptools_scm
+ substituteInPlace setup.py \
+ --replace "setuptools_scm" "" \
+ --replace 'use_scm_version=True' 'use_scm_version="${version}"'
+ '';
+
# Disable test that requires network access
- disabledTests = [ "test__on_pong" ];
+ disabledTests = [
+ "test__on_pong"
+ "TestMprm"
+ ];
+
pythonImportsCheck = [ "devolo_home_control_api" ];
meta = with lib; {
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/ftfy/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/ftfy/default.nix
index dbc3631722..403ca52479 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/ftfy/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/ftfy/default.nix
@@ -2,36 +2,31 @@
, buildPythonPackage
, isPy3k
, fetchPypi
-, html5lib
, wcwidth
-, setuptools
-, pytest
+, pytestCheckHook
}:
buildPythonPackage rec {
pname = "ftfy";
- version = "5.8";
+ version = "5.9";
disabled = !isPy3k;
src = fetchPypi {
inherit pname version;
- sha256 = "081p5z20dirrf1i3nshylc31qd5mbxibjc7gzj8x4isbiizpdisi";
+ sha256 = "8c4fb2863c0b82eae2ab3cf353d9ade268dfbde863d322f78d6a9fd5cefb31e9";
};
propagatedBuildInputs = [
- html5lib
wcwidth
- setuptools
];
checkInputs = [
- pytest
+ pytestCheckHook
];
- # We suffix PATH like this because the tests want the ftfy executable
- checkPhase = ''
- PATH=$out/bin:$PATH pytest
+ preCheck = ''
+ export PATH=$out/bin:$PATH
'';
meta = with lib; {
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/ftputil/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/ftputil/default.nix
index 883ff69c6d..ed67746658 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/ftputil/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/ftputil/default.nix
@@ -1,13 +1,13 @@
{ stdenv, lib, buildPythonPackage, fetchPypi, pythonOlder, pytest, freezegun }:
buildPythonPackage rec {
- version = "4.0.0";
+ version = "5.0.0";
pname = "ftputil";
disabled = pythonOlder "3.6";
src = fetchPypi {
inherit pname version;
- sha256 = "d494c47f24fd3f8fbe92d40d90e0902c0e04288f200688af2b16d6b46fe441e1";
+ sha256 = "0dc82fa0a8ea385e8222b72bedb1ec31caac07822b6a1a9139adc98b0b051d06";
};
checkInputs = [ pytest freezegun ];
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/geventhttpclient/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/geventhttpclient/default.nix
index c6ccf88115..5563ff94ba 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/geventhttpclient/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/geventhttpclient/default.nix
@@ -6,6 +6,7 @@
, certifi
, six
, backports_ssl_match_hostname
+, pythonOlder
}:
buildPythonPackage rec {
@@ -18,7 +19,8 @@ buildPythonPackage rec {
};
buildInputs = [ pytest ];
- propagatedBuildInputs = [ gevent certifi six backports_ssl_match_hostname ];
+ propagatedBuildInputs = [ gevent certifi six ]
+ ++ lib.optionals (pythonOlder "3.7") [ backports_ssl_match_hostname ];
# Several tests fail that require network
doCheck = false;
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/google-cloud-bigquery-datatransfer/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/google-cloud-bigquery-datatransfer/default.nix
index 8f67fed79d..ccc8aa8397 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/google-cloud-bigquery-datatransfer/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/google-cloud-bigquery-datatransfer/default.nix
@@ -11,11 +11,11 @@
buildPythonPackage rec {
pname = "google-cloud-bigquery-datatransfer";
- version = "3.0.0";
+ version = "3.0.1";
src = fetchPypi {
inherit pname version;
- sha256 = "0hmsqvs2srmqcwmli48vd5vw829zax3pwj63fsxig6sdhjlf6j7j";
+ sha256 = "c5669410018eb41cecf6f9c90136d24d0ca9ed141bda8fbb3d52cd3de7162960";
};
propagatedBuildInputs = [ google-api-core libcst proto-plus ];
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/google-cloud-bigquery/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/google-cloud-bigquery/default.nix
index 2aa615a221..6f2e6c473a 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/google-cloud-bigquery/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/google-cloud-bigquery/default.nix
@@ -17,11 +17,11 @@
buildPythonPackage rec {
pname = "google-cloud-bigquery";
- version = "2.11.0";
+ version = "2.12.0";
src = fetchPypi {
inherit pname version;
- sha256 = "d8f8464188e3eb03925a4f4acbf4e8fbfbde84a06145bd8a52c6b736113713ae";
+ sha256 = "484bb733e5dd14bb82d28480a5d7f540b8ee59f081fcf32782546b717180d1b8";
};
propagatedBuildInputs = [
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/google-cloud-logging/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/google-cloud-logging/default.nix
index ab31a8ee4e..c266d3e792 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/google-cloud-logging/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/google-cloud-logging/default.nix
@@ -15,11 +15,11 @@
buildPythonPackage rec {
pname = "google-cloud-logging";
- version = "2.2.0";
+ version = "2.3.0";
src = fetchPypi {
inherit pname version;
- sha256 = "8932ac382eee6af85cd08400a77586dd3139fbf40b61db757c4c492490899741";
+ sha256 = "b5675ce159db4e9c1d755003b76190460766f426a7c3c1519014cdd5ce66e890";
};
propagatedBuildInputs = [ google-api-core google-cloud-core proto-plus ];
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/google-cloud-secret-manager/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/google-cloud-secret-manager/default.nix
index a143a418c2..2a50fd5fb6 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/google-cloud-secret-manager/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/google-cloud-secret-manager/default.nix
@@ -12,11 +12,11 @@
buildPythonPackage rec {
pname = "google-cloud-secret-manager";
- version = "2.2.0";
+ version = "2.3.0";
src = fetchPypi {
inherit pname version;
- sha256 = "97a46d2318f00c1c6ae1a4ab587e338677c5cc1651d7c6304982d74fa364dd9d";
+ sha256 = "4df4b7e3f83bc12d6bd29e69608172586b6ddfc7586dd2a2fd70cc4f18ed05c7";
};
propagatedBuildInputs = [
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/googlemaps/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/googlemaps/default.nix
index 007d4eb2ce..938a472edd 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/googlemaps/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/googlemaps/default.nix
@@ -1,28 +1,32 @@
{ lib
, buildPythonPackage
, fetchFromGitHub
+, pytest-cov
+, pytestCheckHook
+, pythonOlder
, requests
, responses
-, pytestCheckHook
-, pytestcov
-, isPy27
}:
buildPythonPackage rec {
pname = "googlemaps";
- version = "4.4.2";
- disabled = isPy27;
+ version = "4.4.5";
+ disabled = pythonOlder "3.5";
src = fetchFromGitHub {
owner = "googlemaps";
repo = "google-maps-services-python";
rev = "v${version}";
- sha256 = "DYhW1OGce/0gY7Jmwq6iM45PxLyXIYo4Cfg2u6Xuyg4=";
+ sha256 = "sha256-Rdfp98UqTMbqcOpkzh0Dz8fNSSbuvCnCztCkxiBgaAA=";
};
propagatedBuildInputs = [ requests ];
- checkInputs = [ pytestCheckHook responses pytestcov ];
+ checkInputs = [
+ pytest-cov
+ pytestCheckHook
+ responses
+ ];
disabledTests = [
# touches network
@@ -30,6 +34,8 @@ buildPythonPackage rec {
"test_transit_without_time"
];
+ pythonImportsCheck = [ "googlemaps" ];
+
meta = with lib; {
homepage = "https://github.com/googlemaps/google-maps-services-python";
description = "Python client library for Google Maps API Web Services";
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/gradient-utils/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/gradient-utils/default.nix
index cf0ffb6bb4..ee8d1bde62 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/gradient-utils/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/gradient-utils/default.nix
@@ -1,12 +1,13 @@
-{ buildPythonPackage
+{ lib
+, buildPythonPackage
, fetchFromGitHub
, hyperopt
-, lib
, mock
, numpy
-, poetry
+, poetry-core
, prometheus_client
, pytestCheckHook
+, requests
}:
buildPythonPackage rec {
@@ -24,23 +25,39 @@ buildPythonPackage rec {
postPatch = ''
substituteInPlace pyproject.toml \
--replace 'numpy = "1.18.5"' 'numpy = "^1.18.5"' \
- --replace 'hyperopt = "0.1.2"' 'hyperopt = ">=0.1.2"'
+ --replace 'hyperopt = "0.1.2"' 'hyperopt = ">=0.1.2"' \
+ --replace 'wheel = "^0.35.1"' 'wheel = "*"'
'';
- nativeBuildInputs = [ poetry ];
- checkInputs = [ mock pytestCheckHook ];
- propagatedBuildInputs = [ hyperopt prometheus_client numpy ];
+ nativeBuildInputs = [ poetry-core ];
+
+ propagatedBuildInputs = [
+ hyperopt
+ prometheus_client
+ numpy
+ ];
+
+ checkInputs = [
+ mock
+ requests
+ pytestCheckHook
+ ];
+
+ preCheck = ''
+ export HOSTNAME=myhost-experimentId
+ '';
- preCheck = "export HOSTNAME=myhost-experimentId";
disabledTests = [
"test_add_metrics_pushes_metrics" # requires a working prometheus push gateway
];
+ pythonImportsCheck = [ "gradient_utils" ];
+
meta = with lib; {
- description = "Gradient ML SDK";
- homepage = "https://github.com/Paperspace/gradient-utils";
- license = licenses.mit;
- platforms = platforms.unix;
+ description = "Python utils and helpers library for Gradient";
+ homepage = "https://github.com/Paperspace/gradient-utils";
+ license = licenses.mit;
+ platforms = platforms.unix;
maintainers = with maintainers; [ freezeboy ];
};
}
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/gradient/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/gradient/default.nix
index c4c6e3b356..c74501c621 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/gradient/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/gradient/default.nix
@@ -7,11 +7,11 @@
buildPythonPackage rec {
pname = "gradient";
- version = "1.4.2";
+ version = "1.4.3";
src = fetchPypi {
inherit pname version;
- sha256 = "2ed10db306d4c8632b7d04d71d44a04331a6e80e5ebab7296a98e67e8a50fb71";
+ sha256 = "a8fa91669c97440049132119019e90d0a9cf09e96352cf43c7c6ca244894bd4e";
};
postPatch = ''
@@ -19,8 +19,9 @@ buildPythonPackage rec {
--replace 'attrs<=' 'attrs>=' \
--replace 'colorama==' 'colorama>=' \
--replace 'PyYAML==' 'PyYAML>=' \
- --replace 'marshmallow<' 'marshmallow>='
- '';
+ --replace 'marshmallow<' 'marshmallow>=' \
+ --replace 'websocket-client==' 'websocket-client>='
+ '';
propagatedBuildInputs = [ attrs boto3 requests gradient_statsd terminaltables
click-completion click-didyoumean click-help-colors requests_toolbelt
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/h3/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/h3/default.nix
index e66a3f5e9f..3552b6922f 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/h3/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/h3/default.nix
@@ -13,14 +13,14 @@
buildPythonPackage rec {
pname = "h3";
- version = "3.7.1";
+ version = "3.7.2";
# pypi version does not include tests
src = fetchFromGitHub {
owner = "uber";
repo = "h3-py";
rev = "v${version}";
- sha256 = "sha256-MIVV3kZGsIsaJ/ccJOK3+j1VwkUsZGHS5d1sGOBa1Ec=";
+ sha256 = "00yi5ncfhi2wpakwm9visi1jlnnaaha66y90fjcsfyvi4hkm8xv2";
};
dontConfigure = true;
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/httpx/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/httpx/default.nix
index 9fe636c359..2aba203ea0 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/httpx/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/httpx/default.nix
@@ -18,14 +18,14 @@
buildPythonPackage rec {
pname = "httpx";
- version = "0.17.0";
+ version = "0.17.1";
disabled = pythonOlder "3.6";
src = fetchFromGitHub {
owner = "encode";
repo = pname;
rev = version;
- sha256 = "sha256-pRdhPAxKZOVbRhOm4881Dn+IRtpX5T3oFuYdtWp3cgY=";
+ sha256 = "sha256-P4Uki+vlAgVECBUz9UGvv1ip49jmf0kYbyU2/mkWE3U=";
};
propagatedBuildInputs = [
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/huggingface-hub/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/huggingface-hub/default.nix
new file mode 100644
index 0000000000..0fce65f2b8
--- /dev/null
+++ b/third_party/nixpkgs/pkgs/development/python-modules/huggingface-hub/default.nix
@@ -0,0 +1,39 @@
+{ lib
+, fetchFromGitHub
+, buildPythonPackage
+, pythonOlder
+, filelock
+, importlib-metadata
+, requests
+, tqdm
+}:
+
+buildPythonPackage rec {
+ pname = "huggingface-hub";
+ version = "0.0.6";
+
+ src = fetchFromGitHub {
+ owner = "huggingface";
+ repo = "huggingface_hub";
+ rev = "v${version}";
+ hash = "sha256-0DSgWmodeRmvGq2v3n86BzRx5Xdb8fIQh+G/2O2d+yo=";
+ };
+
+ propagatedBuildInputs = [
+ filelock
+ requests
+ tqdm
+ ] ++ lib.optionals (pythonOlder "3.8") [ importlib-metadata ];
+
+ # Tests require network access.
+ doCheck = false;
+ pythonImportsCheck = [ "huggingface_hub" ];
+
+ meta = with lib; {
+ homepage = "https://github.com/huggingface/huggingface_hub";
+ description = "Download and publish models and other files on the huggingface.co hub";
+ changelog = "https://github.com/huggingface/huggingface_hub/releases/tag/${version}";
+ license = licenses.asl20;
+ maintainers = with maintainers; [ danieldk ];
+ };
+}
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/hwi/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/hwi/default.nix
index 7c34235a19..0b52402ed4 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/hwi/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/hwi/default.nix
@@ -7,28 +7,20 @@
, libusb1
, mnemonic
, pyaes
-, pythonAtLeast
+, typing-extensions
}:
buildPythonPackage rec {
pname = "hwi";
- version = "1.2.1";
- disabled = pythonAtLeast "3.9";
+ version = "2.0.0";
src = fetchFromGitHub {
owner = "bitcoin-core";
repo = "HWI";
rev = version;
- sha256 = "0fs3152lw7y5l9ssr5as8gd739m9lb7wxpv1vc5m77k5nw7l8ax5";
+ sha256 = "0m8maxhjpfxnkry2l0x8143m1gmds8mbwyd9flnkfipxz0r0xwbr";
};
- postPatch = ''
- substituteInPlace setup.py \
- --replace "'ecdsa>=0.13.0,<0.14.0'" "'ecdsa'" \
- --replace "'hidapi>=0.7.99,<0.8.0'" "'hidapi'" \
- --replace "'mnemonic>=0.18.0,<0.19.0'" "'mnemonic'"
- '';
-
propagatedBuildInputs = [
bitbox02
ecdsa
@@ -36,6 +28,7 @@ buildPythonPackage rec {
libusb1
mnemonic
pyaes
+ typing-extensions
];
# tests require to clone quite a few firmwares
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/ijson/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/ijson/default.nix
index 8ccc7eb4e0..3f65b9291a 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/ijson/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/ijson/default.nix
@@ -2,11 +2,11 @@
buildPythonPackage rec {
pname = "ijson";
- version = "3.1.3";
+ version = "3.1.4";
src = fetchPypi {
inherit pname version;
- sha256 = "d29977f7235b5bf83c372825c6abd8640ba0e3a8e031d3ffc3b63deaf6ae1487";
+ sha256 = "1d1003ae3c6115ec9b587d29dd136860a81a23c7626b682e2b5b12c9fd30e4ea";
};
doCheck = false; # something about yajl
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/imap-tools/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/imap-tools/default.nix
index 2f87f24639..136415eb54 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/imap-tools/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/imap-tools/default.nix
@@ -7,7 +7,7 @@
buildPythonPackage rec {
pname = "imap-tools";
- version = "0.38.1";
+ version = "0.39.0";
disabled = isPy27;
@@ -15,7 +15,7 @@ buildPythonPackage rec {
owner = "ikvk";
repo = "imap_tools";
rev = "v${version}";
- sha256 = "0b2gnym7p6cwgviwdq8pg2dy28pm5535f8kkc8rzc50knqdifl7g";
+ sha256 = "sha256-PyksCYVe7Ij/+bZpntHgY51I/ZVnC6L20TcKfTLr2CY=";
};
checkInputs = [
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/inflect/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/inflect/default.nix
index 130b6a49bd..b8ebce462d 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/inflect/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/inflect/default.nix
@@ -9,12 +9,12 @@
buildPythonPackage rec {
pname = "inflect";
- version = "5.2.0";
+ version = "5.3.0";
disabled = isPy27;
src = fetchPypi {
inherit pname version;
- sha256 = "30e9d9d372e693739beaae1345dc53c48871ca70c5c7060edd3e7e77802bf945";
+ sha256 = "41a23f6788962e9775e40e2ecfb1d6455d02de315022afeedd3c5dc070019d73";
};
nativeBuildInputs = [ setuptools_scm toml ];
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/influxdb-client/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/influxdb-client/default.nix
index 56436cdd0e..82153f4b3d 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/influxdb-client/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/influxdb-client/default.nix
@@ -14,7 +14,7 @@
buildPythonPackage rec {
pname = "influxdb-client";
- version = "1.14.0";
+ version = "1.15.0";
disabled = pythonOlder "3.6"; # requires python version >=3.6
@@ -22,7 +22,7 @@ buildPythonPackage rec {
owner = "influxdata";
repo = "influxdb-client-python";
rev = "v${version}";
- sha256 = "1qq727gwz5migr3xlqxj57qxv1y52g7xpkdgggz2wz739w5czffd";
+ sha256 = "1b2xh78v965rgafyj7cdbjm2p96d74f7ifsqllc7242n9wv3k53q";
};
# makes test not reproducible
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/jenkins-job-builder/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/jenkins-job-builder/default.nix
index 7d4f6dd936..3ae6bf84ae 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/jenkins-job-builder/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/jenkins-job-builder/default.nix
@@ -10,11 +10,11 @@
buildPythonPackage rec {
pname = "jenkins-job-builder";
- version = "3.8.0";
+ version = "3.9.0";
src = fetchPypi {
inherit pname version;
- sha256 = "sha256-uRyeRP1y3GS7tXb0kHLBi7+trJRme/Ke3xgOY+LqZ6k=";
+ sha256 = "4a53e146843d567c375c2e61e70a840d75a412402fd78c1dd3da5642a6aaa375";
};
postPatch = ''
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/lxml/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/lxml/default.nix
index b583760310..36b1539834 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/lxml/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/lxml/default.nix
@@ -1,8 +1,9 @@
-{ lib, buildPythonPackage, fetchFromGitHub
+{ stdenv, lib, buildPythonPackage, fetchFromGitHub
, cython
, libxml2
, libxslt
, zlib
+, xcodebuild
}:
buildPythonPackage rec {
@@ -17,7 +18,7 @@ buildPythonPackage rec {
};
# setuptoolsBuildPhase needs dependencies to be passed through nativeBuildInputs
- nativeBuildInputs = [ libxml2.dev libxslt.dev cython ];
+ nativeBuildInputs = [ libxml2.dev libxslt.dev cython ] ++ lib.optionals stdenv.isDarwin [ xcodebuild ];
buildInputs = [ libxml2 libxslt zlib ];
# tests are meant to be ran "in-place" in the same directory as src
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/mat2/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/mat2/default.nix
new file mode 100644
index 0000000000..2e720f8ba7
--- /dev/null
+++ b/third_party/nixpkgs/pkgs/development/python-modules/mat2/default.nix
@@ -0,0 +1,98 @@
+{ lib
+, buildPythonPackage
+, python
+, pythonOlder
+, fetchFromGitLab
+, substituteAll
+, bubblewrap
+, exiftool
+, ffmpeg
+, mime-types
+, wrapGAppsHook
+, gdk-pixbuf
+, gobject-introspection
+, librsvg
+, poppler_gi
+, mutagen
+, pygobject3
+, pycairo
+, dolphinIntegration ? false, plasma5Packages
+}:
+
+buildPythonPackage rec {
+ pname = "mat2";
+ version = "0.12.0";
+
+ disabled = pythonOlder "3.5";
+
+ src = fetchFromGitLab {
+ domain = "0xacab.org";
+ owner = "jvoisin";
+ repo = "mat2";
+ rev = version;
+ sha256 = "0amxwwmcf47dakfm6zvsksv6ja7rz7dpmd1z2rsspy8yds6zgxs7";
+ };
+
+ patches = [
+ # hardcode paths to some binaries
+ (substituteAll ({
+ src = ./paths.patch;
+ bwrap = "${bubblewrap}/bin/bwrap";
+ exiftool = "${exiftool}/bin/exiftool";
+ ffmpeg = "${ffmpeg}/bin/ffmpeg";
+ # remove once faf0f8a8a4134edbeec0a73de7f938453444186d is in master
+ mimetypes = "${mime-types}/etc/mime.types";
+ } // lib.optionalAttrs dolphinIntegration {
+ kdialog = "${plasma5Packages.kdialog}/bin/kdialog";
+ }))
+ # the executable shouldn't be called .mat2-wrapped
+ ./executable-name.patch
+ # hardcode path to mat2 executable
+ ./tests.patch
+ ];
+
+ postPatch = ''
+ substituteInPlace dolphin/mat2.desktop \
+ --replace "@mat2@" "$out/bin/mat2" \
+ --replace "@mat2svg@" "$out/share/icons/hicolor/scalable/apps/mat2.svg"
+ '';
+
+ nativeBuildInputs = [
+ wrapGAppsHook
+ ];
+
+ buildInputs = [
+ gdk-pixbuf
+ gobject-introspection
+ librsvg
+ poppler_gi
+ ];
+
+ propagatedBuildInputs = [
+ mutagen
+ pygobject3
+ pycairo
+ ];
+
+ postInstall = ''
+ install -Dm 444 data/mat2.svg -t "$out/share/icons/hicolor/scalable/apps"
+ install -Dm 444 doc/mat2.1 -t "$out/share/man/man1"
+ install -Dm 444 nautilus/mat2.py -t "$out/share/nautilus-python/extensions"
+ buildPythonPath "$out $pythonPath"
+ patchPythonScript "$out/share/nautilus-python/extensions/mat2.py"
+ '' + lib.optionalString dolphinIntegration ''
+ install -Dm 444 dolphin/mat2.desktop -t "$out/share/kservices5/ServiceMenus"
+ '';
+
+ checkPhase = ''
+ ${python.interpreter} -m unittest discover -v
+ '';
+
+ meta = with lib; {
+ description = "A handy tool to trash your metadata";
+ homepage = "https://0xacab.org/jvoisin/mat2";
+ changelog = "https://0xacab.org/jvoisin/mat2/-/blob/${version}/CHANGELOG.md";
+ license = licenses.lgpl3Plus;
+ maintainers = with maintainers; [ dotlambda ];
+ };
+}
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/mat2/executable-name.patch b/third_party/nixpkgs/pkgs/development/python-modules/mat2/executable-name.patch
new file mode 100644
index 0000000000..6eee0a9494
--- /dev/null
+++ b/third_party/nixpkgs/pkgs/development/python-modules/mat2/executable-name.patch
@@ -0,0 +1,13 @@
+diff --git a/mat2 b/mat2
+index 3b77e1e..b99a633 100755
+--- a/mat2
++++ b/mat2
+@@ -46,7 +46,7 @@ def __check_file(filename: str, mode: int = os.R_OK) -> bool:
+
+
+ def create_arg_parser() -> argparse.ArgumentParser:
+- parser = argparse.ArgumentParser(description='Metadata anonymisation toolkit 2')
++ parser = argparse.ArgumentParser(description='Metadata anonymisation toolkit 2', prog='mat2')
+
+ parser.add_argument('-V', '--verbose', action='store_true',
+ help='show more verbose status information')
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/mat2/paths.patch b/third_party/nixpkgs/pkgs/development/python-modules/mat2/paths.patch
new file mode 100644
index 0000000000..e0144be9fe
--- /dev/null
+++ b/third_party/nixpkgs/pkgs/development/python-modules/mat2/paths.patch
@@ -0,0 +1,111 @@
+diff --git a/dolphin/mat2.desktop b/dolphin/mat2.desktop
+index e623962..5d69ae2 100644
+--- a/dolphin/mat2.desktop
++++ b/dolphin/mat2.desktop
+@@ -7,5 +7,5 @@ Type=Service
+ [Desktop Action cleanMetadata]
+ Name=Clean metadata
+ Name[es]=Limpiar metadatos
+-Icon=/usr/share/icons/hicolor/scalable/apps/mat2.svg
+-Exec=kdialog --yesno "$( mat2 -s %U )" --title "Clean Metadata?" && mat2 %U
++Icon=@mat2svg@
++Exec=@kdialog@ --yesno "$( @mat2@ -s %U )" --title "Clean Metadata?" && @mat2@ %U
+diff --git a/libmat2/bubblewrap.py b/libmat2/bubblewrap.py
+index 970d5dd..5d3c0b7 100644
+--- a/libmat2/bubblewrap.py
++++ b/libmat2/bubblewrap.py
+@@ -22,11 +22,7 @@ CalledProcessError = subprocess.CalledProcessError
+
+
+ def _get_bwrap_path() -> str:
+- which_path = shutil.which('bwrap')
+- if which_path:
+- return which_path
+-
+- raise RuntimeError("Unable to find bwrap") # pragma: no cover
++ return '@bwrap@'
+
+
+ def _get_bwrap_args(tempdir: str,
+@@ -37,16 +33,11 @@ def _get_bwrap_args(tempdir: str,
+
+ # XXX: use --ro-bind-try once all supported platforms
+ # have a bubblewrap recent enough to support it.
+- ro_bind_dirs = ['/usr', '/lib', '/lib64', '/bin', '/sbin', '/etc/alternatives', cwd]
++ ro_bind_dirs = ['/nix/store', cwd]
+ for bind_dir in ro_bind_dirs:
+ if os.path.isdir(bind_dir): # pragma: no cover
+ ro_bind_args.extend(['--ro-bind', bind_dir, bind_dir])
+
+- ro_bind_files = ['/etc/ld.so.cache']
+- for bind_file in ro_bind_files:
+- if os.path.isfile(bind_file): # pragma: no cover
+- ro_bind_args.extend(['--ro-bind', bind_file, bind_file])
+-
+ args = ro_bind_args + \
+ ['--dev', '/dev',
+ '--proc', '/proc',
+diff --git a/libmat2/exiftool.py b/libmat2/exiftool.py
+index eb65b2a..51a0fa1 100644
+--- a/libmat2/exiftool.py
++++ b/libmat2/exiftool.py
+@@ -1,8 +1,6 @@
+-import functools
+ import json
+ import logging
+ import os
+-import shutil
+ import subprocess
+ from typing import Dict, Union, Set
+
+@@ -70,14 +68,5 @@ class ExiftoolParser(abstract.AbstractParser):
+ return False
+ return True
+
+-@functools.lru_cache()
+ def _get_exiftool_path() -> str: # pragma: no cover
+- which_path = shutil.which('exiftool')
+- if which_path:
+- return which_path
+-
+- # Exiftool on Arch Linux has a weird path
+- if os.access('/usr/bin/vendor_perl/exiftool', os.X_OK):
+- return '/usr/bin/vendor_perl/exiftool'
+-
+- raise RuntimeError("Unable to find exiftool")
++ return '@exiftool@'
+diff --git a/libmat2/parser_factory.py b/libmat2/parser_factory.py
+index 9965432..bd45179 100644
+--- a/libmat2/parser_factory.py
++++ b/libmat2/parser_factory.py
+@@ -8,6 +8,7 @@ from . import abstract, UNSUPPORTED_EXTENSIONS
+
+ T = TypeVar('T', bound='abstract.AbstractParser')
+
++mimetypes.init(['@mimetypes@'])
+ mimetypes.add_type('application/epub+zip', '.epub')
+ mimetypes.add_type('application/x-dtbncx+xml', '.ncx') # EPUB Navigation Control XML File
+
+diff --git a/libmat2/video.py b/libmat2/video.py
+index b4a3232..3dd7ee5 100644
+--- a/libmat2/video.py
++++ b/libmat2/video.py
+@@ -1,6 +1,4 @@
+ import subprocess
+-import functools
+-import shutil
+ import logging
+
+ from typing import Dict, Union
+@@ -135,10 +133,5 @@ class MP4Parser(AbstractFFmpegParser):
+ }
+
+
+-@functools.lru_cache()
+ def _get_ffmpeg_path() -> str: # pragma: no cover
+- which_path = shutil.which('ffmpeg')
+- if which_path:
+- return which_path
+-
+- raise RuntimeError("Unable to find ffmpeg")
++ return '@ffmpeg@'
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/mat2/tests.patch b/third_party/nixpkgs/pkgs/development/python-modules/mat2/tests.patch
new file mode 100644
index 0000000000..8958d937dd
--- /dev/null
+++ b/third_party/nixpkgs/pkgs/development/python-modules/mat2/tests.patch
@@ -0,0 +1,18 @@
+diff --git a/tests/test_climat2.py b/tests/test_climat2.py
+index cede642..2d5ad77 100644
+--- a/tests/test_climat2.py
++++ b/tests/test_climat2.py
+@@ -10,12 +10,7 @@ import glob
+ from libmat2 import images, parser_factory
+
+
+-mat2_binary = ['./mat2']
+-
+-if 'MAT2_GLOBAL_PATH_TESTSUITE' in os.environ:
+- # Debian runs tests after installing the package
+- # https://0xacab.org/jvoisin/mat2/issues/16#note_153878
+- mat2_binary = ['/usr/bin/env', 'mat2']
++mat2_binary = [os.environ['out'] + '/bin/mat2']
+
+
+ class TestHelp(unittest.TestCase):
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/mergedeep/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/mergedeep/default.nix
index cdd19beb68..46de340502 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/mergedeep/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/mergedeep/default.nix
@@ -2,7 +2,7 @@
buildPythonPackage rec {
pname = "mergedeep";
- version = "1.3.1";
+ version = "1.3.4";
disabled = isPy27;
# PyPI tarball doesn't include tests directory
@@ -10,7 +10,7 @@ buildPythonPackage rec {
owner = "clarketm";
repo = "mergedeep";
rev = "v${version}";
- sha256 = "1ryccb64hg438y1wsjlfp4ciq05q4c6khwhllwdnndm8cbkbrgph";
+ sha256 = "1msvvdzk33sxzgyvs4fs8dlsrsi7fjj038z83s0yw5h8m8d78469";
};
checkInputs = [ pytest ];
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/minidump/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/minidump/default.nix
index 346430d239..60440ff4b4 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/minidump/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/minidump/default.nix
@@ -5,11 +5,11 @@
buildPythonPackage rec {
pname = "minidump";
- version = "0.0.13";
+ version = "0.0.15";
src = fetchPypi {
inherit pname version;
- sha256 = "1w93yh2dz7llxjgv0jn7gf9praz7d5952is7idgh0lsyj67ri2ms";
+ sha256 = "sha256-IVlzAsnl1KhErxWPi96hUFlIX4IN3Y9t8OicckdYUv0=";
};
# Upstream doesn't have tests
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/mpv/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/mpv/default.nix
index 0ff66fa813..11d0bed476 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/mpv/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/mpv/default.nix
@@ -4,14 +4,14 @@
buildPythonPackage rec {
pname = "mpv";
- version = "0.4.7";
+ version = "0.5.2";
disabled = isPy27;
src = fetchFromGitHub {
owner = "jaseg";
repo = "python-mpv";
rev = "v${version}";
- sha256 = "1gq2ynzbpmc7bv066ddv2f4rnmvfsi7034vhf9ffp7yzbixf6ys8";
+ sha256 = "0ffskpynhl1252h6a05087lvpjgn1cn2z3caiv3i666dn1n79fjd";
};
buildInputs = [ mpv ];
@@ -28,6 +28,6 @@ buildPythonPackage rec {
meta = with lib; {
description = "A python interface to the mpv media player";
homepage = "https://github.com/jaseg/python-mpv";
- license = licenses.agpl3;
+ license = licenses.agpl3Plus;
};
}
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/msldap/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/msldap/default.nix
index 826a4fddae..e9790db9f5 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/msldap/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/msldap/default.nix
@@ -12,11 +12,11 @@
buildPythonPackage rec {
pname = "msldap";
- version = "0.3.27";
+ version = "0.3.28";
src = fetchPypi {
inherit pname version;
- sha256 = "sha256-tAMl1Xkb04Vfh18uS30eKX/IfeXhwER3J1lHXHxHlXY=";
+ sha256 = "sha256-0sMi5PpwMWf/W+Hu0akQVF/1ZkbanfOzYDC3R6lZrSE=";
};
propagatedBuildInputs = [
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/notify/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/notify/default.nix
index 1a60cf70d2..8aa70b43e6 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/notify/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/notify/default.nix
@@ -27,7 +27,7 @@ stdenv.mkDerivation {
configure
'';
- nativeBuildInputs = [ pkgs.pkgconfig ];
+ nativeBuildInputs = [ pkgs.pkg-config ];
buildInputs = [ python pygobject2 pygtk pkgs.libnotify pkgs.glib pkgs.gtk2 pkgs.dbus-glib ];
postInstall = "cd $out/lib/python*/site-packages && ln -s gtk-*/pynotify .";
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/openwrt-luci-rpc/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/openwrt-luci-rpc/default.nix
index 2e7666d3ab..7661295ba2 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/openwrt-luci-rpc/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/openwrt-luci-rpc/default.nix
@@ -1,33 +1,39 @@
-{ buildPythonPackage
-, fetchPypi
-, lib
+{ lib
+, buildPythonPackage
, click
-, requests
+, fetchPypi
, packaging
+, pytestCheckHook
+, requests
}:
-with lib;
-
buildPythonPackage rec {
pname = "openwrt-luci-rpc";
- version = "1.1.7";
+ version = "1.1.8";
src = fetchPypi {
inherit pname version;
- sha256 = "8074c1ed24cdd1fadc5a99bd63d9313a0a44703714473ed781ed11e7fb45c96f";
+ sha256 = "sha256-bo9HLT0q0yiLJI7i5v/36G82FHbGCtnAI50iGniyKSU=";
};
- postPatch = ''
- substituteInPlace setup.py --replace "requests==2.21.0" "requests"
- substituteInPlace setup.py --replace "packaging==19.1" "packaging"
- '';
+ propagatedBuildInputs = [
+ click
+ requests
+ packaging
+ ];
- propagatedBuildInputs = [ click requests packaging ];
+ checkInputs = [
+ pytestCheckHook
+ ];
- meta = {
- description = ''
- Python3 module for interacting with the OpenWrt Luci RPC interface.
- Supports 15.X & 17.X & 18.X or newer releases of OpenWrt.
+ pythonImportsCheck = [ "openwrt_luci_rpc" ];
+
+ meta = with lib; {
+ description = "Python module for interacting with the OpenWrt Luci RPC interface";
+ longDescription = ''
+ This module allows you to use the Luci RPC interface to fetch connected devices
+ on your OpenWrt based router. Supports 15.X & 17.X & 18.X or newer releases of
+ OpenWrt.
'';
homepage = "https://github.com/fbradyirl/openwrt-luci-rpc";
license = licenses.asl20;
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/parso/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/parso/default.nix
index 6eebad4467..a68f535d29 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/parso/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/parso/default.nix
@@ -1,6 +1,7 @@
{ lib
, buildPythonPackage
, fetchPypi
+, fetchpatch
, pythonOlder
, pytestCheckHook
}:
@@ -15,6 +16,15 @@ buildPythonPackage rec {
sha256 = "8519430ad07087d4c997fda3a7918f7cfa27cb58972a8c89c2a0295a1c940e9e";
};
+ patches = [
+ # Fix the flaky test due to slow moving time on Apple Silicon chips.
+ # Remove when https://github.com/davidhalter/parso/pull/177 is in the next release.
+ (fetchpatch {
+ url = "https://github.com/davidhalter/parso/pull/177/commits/2799a7a3c2cf87fdc2d0c19a0890acea425091ce.patch";
+ sha256 = "sha256-A5EQly1wR/7lo+L8Pp0UPSUIhC0WcblXEWQNvRMlZYA=";
+ })
+ ];
+
checkInputs = [ pytestCheckHook ];
meta = with lib; {
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pillow/generic.nix b/third_party/nixpkgs/pkgs/development/python-modules/pillow/generic.nix
index dbf27febeb..64ae918955 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/pillow/generic.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/pillow/generic.nix
@@ -26,6 +26,9 @@ buildPythonPackage rec {
# pillow-simd
"test_roundtrip"
"test_basic"
+ ] ++ lib.optionals (lib.versions.major version == "6") [
+ # RuntimeError: Error setting from dictionary
+ "test_custom_metadata"
];
propagatedBuildInputs = [ olefile ];
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/poetry-core/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/poetry-core/default.nix
index d5d4e36d3a..80c4b5acfe 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/poetry-core/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/poetry-core/default.nix
@@ -13,14 +13,14 @@
buildPythonPackage rec {
pname = "poetry-core";
- version = "1.0.0";
+ version = "1.0.2";
format = "pyproject";
src = fetchFromGitHub {
owner = "python-poetry";
repo = pname;
rev = version;
- sha256 = "02pqkwzbg43xz2zsw8q7m0sfkj8wbw07in83gy0bk0znhljhp0vw";
+ sha256 = "sha256-OE6oc/3HYrMmgPnINxvSZ27m8YeZk5Gnn9ok8GlSIZ0=";
};
nativeBuildInputs = [
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/psutil/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/psutil/default.nix
index 6760ff168e..a53005c742 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/psutil/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/psutil/default.nix
@@ -1,6 +1,6 @@
{ lib, stdenv, buildPythonPackage, fetchPypi, isPy27, python
, darwin
-, pytest
+, pytestCheckHook
, mock
, ipaddress
, unittest2
@@ -18,15 +18,20 @@ buildPythonPackage rec {
# arch doesn't report frequency is the same way
# tests segfaults on darwin https://github.com/giampaolo/psutil/issues/1715
doCheck = !stdenv.isDarwin && stdenv.isx86_64;
- checkInputs = [ pytest ]
+ checkInputs = [ pytestCheckHook ]
++ lib.optionals isPy27 [ mock ipaddress unittest2 ];
- # out must be referenced as test import paths are relative
+ pytestFlagsArray = [
+ "$out/${python.sitePackages}/psutil/tests/test_system.py"
+ ];
# disable tests which don't work in sandbox
# cpu_times is flakey on darwin
- checkPhase = ''
- pytest $out/${python.sitePackages}/psutil/tests/test_system.py \
- -k 'not user and not disk_io_counters and not sensors_battery and not cpu_times'
- '';
+ disabledTests = [
+ "user"
+ "disk_io_counters"
+ "sensors_battery"
+ "cpu_times"
+ "cpu_freq"
+ ];
buildInputs = lib.optionals stdenv.isDarwin [ darwin.IOKit ];
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/py-cpuinfo/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/py-cpuinfo/default.nix
index 0afc75bf87..f9e276b3bb 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/py-cpuinfo/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/py-cpuinfo/default.nix
@@ -1,6 +1,7 @@
{ lib
, stdenv
, fetchFromGitHub
+, fetchpatch
, buildPythonPackage
, pytestCheckHook
, sysctl
@@ -17,6 +18,23 @@ buildPythonPackage rec {
sha256 = "10qfaibyb2syiwiyv74l7d97vnmlk079qirgnw3ncklqjs0s3gbi";
};
+ patches = [
+ # Make it detect Apple Silicon, remove after https://github.com/workhorsy/py-cpuinfo/pull/161 is merged.
+ (fetchpatch {
+ url = "https://github.com/workhorsy/py-cpuinfo/commit/54c32da6678f9d75ec5acf4534056cdc85c2a04d.patch";
+ sha256 = "sha256-3R46KrpACAQ1V0CQtz48V5mQXxvplUQrXnACtiE8WqY=";
+ })
+ # Continuation of the patch above
+ (fetchpatch {
+ url = "https://github.com/workhorsy/py-cpuinfo/commit/0d00f4b99750f292c85ff23e1039ea9489cb7ec8.patch";
+ sha256 = "sha256-mHoXoCAEG2v3xpQppRFWzSvhYCp5i9CZkbEgtiLVzMs=";
+ })
+ ];
+
+ checkInputs = [
+ pytestCheckHook
+ ];
+
# On Darwin sysctl is used to read CPU information.
postPatch = lib.optionalString stdenv.isDarwin ''
substituteInPlace cpuinfo/cpuinfo.py \
@@ -24,10 +42,6 @@ buildPythonPackage rec {
--replace "_run_and_get_stdout(['sysctl'" "_run_and_get_stdout(['${sysctl}/bin/sysctl'"
'';
- checkInputs = [
- pytestCheckHook
- ];
-
meta = {
description = "Get CPU info with pure Python 2 & 3";
longDescription = ''
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pyairvisual/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pyairvisual/default.nix
index 882182a3a1..bcbb672f5c 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/pyairvisual/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/pyairvisual/default.nix
@@ -15,7 +15,7 @@
buildPythonPackage rec {
pname = "pyairvisual";
- version = "5.0.6";
+ version = "5.0.7";
format = "pyproject";
disabled = pythonOlder "3.6";
@@ -24,7 +24,7 @@ buildPythonPackage rec {
owner = "bachya";
repo = pname;
rev = version;
- sha256 = "sha256-7u8AwIr1Ah/7zCfXFwj/C/CaD/B3uLRkZ8Gf6d18Xp0=";
+ sha256 = "sha256-r/AJl36dv6+C92tc3kpX4/VzG69qdh4ERCyQxDOHdVU=";
};
nativeBuildInputs = [ poetry-core ];
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pyatv/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pyatv/default.nix
index 2fca74b33a..ddf2c9695a 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/pyatv/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/pyatv/default.nix
@@ -1,55 +1,58 @@
-{ lib, buildPythonPackage
+{ lib
+, buildPythonPackage
, aiohttp
, aiozeroconf
-, asynctest
, cryptography
, deepdiff
+, fetchFromGitHub
, netifaces
, protobuf
-, pytest
, pytest-aiohttp
, pytest-asyncio
-, pytestrunner
+, pytest-runner
+, pytest-timeout
+, pytestCheckHook
, srptools
, zeroconf
-, fetchFromGitHub
-, pytestCheckHook
}:
buildPythonPackage rec {
pname = "pyatv";
- version = "0.7.6";
+ version = "0.7.7";
+
src = fetchFromGitHub {
owner = "postlund";
repo = pname;
rev = "v${version}";
- sha256 = "1lahv6f97fizgh5b2w5yz9455l8ygn99rslhiygkgjywi2flx3p3";
+ sha256 = "sha256-dPnh8XZN7ZVR2rYNnj7GSYXW5I2GNQwD/KRDTgs2AtI=";
};
- nativeBuildInputs = [ pytestrunner];
+ nativeBuildInputs = [ pytest-runner];
propagatedBuildInputs = [
- aiozeroconf
- srptools
aiohttp
- protobuf
+ aiozeroconf
cryptography
netifaces
+ protobuf
+ srptools
zeroconf
];
checkInputs = [
deepdiff
- pytest
pytest-aiohttp
pytest-asyncio
+ pytest-timeout
pytestCheckHook
];
__darwinAllowLocalNetworking = true;
+ pythonImportsCheck = [ "pyatv" ];
+
meta = with lib; {
- description = "A python client library for the Apple TV";
+ description = "Python client library for the Apple TV";
homepage = "https://github.com/postlund/pyatv";
license = licenses.mit;
maintainers = with maintainers; [ elseym ];
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pycdio/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pycdio/default.nix
index 712029b692..7e06b18e32 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/pycdio/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/pycdio/default.nix
@@ -26,7 +26,7 @@ buildPythonPackage rec {
patchShebangs .
'';
- nativeBuildInputs = [ nose pkgs.pkgconfig pkgs.swig ];
+ nativeBuildInputs = [ nose pkgs.pkg-config pkgs.swig ];
buildInputs = [ setuptools pkgs.libcdio ]
++ lib.optional stdenv.isDarwin pkgs.libiconv;
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pyflunearyou/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pyflunearyou/default.nix
index 9b77cc61de..c870676034 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/pyflunearyou/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/pyflunearyou/default.nix
@@ -15,7 +15,7 @@
buildPythonPackage rec {
pname = "pyflunearyou";
- version = "2.0.0";
+ version = "2.0.1";
format = "pyproject";
disabled = pythonOlder "3.6";
@@ -23,7 +23,7 @@ buildPythonPackage rec {
owner = "bachya";
repo = pname;
rev = version;
- sha256 = "18vxwfyvicbx8idpa0h0alp4ygnwfph6g4kq93hfm0fc94gi6h94";
+ sha256 = "sha256-2a4OKPmy9tFLJqRg9bEXqrbr3RKVHmKPSYDrtAEqvdo=";
};
nativeBuildInputs = [ poetry-core ];
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pyinsteon/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pyinsteon/default.nix
index cd8c566c46..cfe5112ab2 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/pyinsteon/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/pyinsteon/default.nix
@@ -17,14 +17,14 @@
buildPythonPackage rec {
pname = "pyinsteon";
- version = "1.0.9";
+ version = "1.0.10";
disabled = pythonOlder "3.6";
src = fetchFromGitHub {
owner = pname;
repo = pname;
rev = version;
- sha256 = "sha256-+3tA+YdpTKDt7uOSl6Z1G8jTjpBJ8S9gjiQTacQSFTc=";
+ sha256 = "sha256-8b/PvMFHvYGVWw6ycLnL8n972cn+1QW/VTMiblMPam4=";
};
propagatedBuildInputs = [
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pyiqvia/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pyiqvia/default.nix
index f231f98df8..d2775d6e3b 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/pyiqvia/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/pyiqvia/default.nix
@@ -12,7 +12,7 @@
buildPythonPackage rec {
pname = "pyiqvia";
- version = "0.3.2";
+ version = "0.3.3";
format = "pyproject";
disabled = pythonOlder "3.6";
@@ -21,7 +21,7 @@ buildPythonPackage rec {
owner = "bachya";
repo = pname;
rev = version;
- sha256 = "089lah23939m523jmjkaw2li0fikp2nswxznfvzwnr6wjpp3m9as";
+ sha256 = "sha256-XYWoHKa/yq7MtGVM6eVgLtR2E3VmqsjX3TNcQcd7dEQ=";
};
nativeBuildInputs = [ poetry-core ];
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pylint/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pylint/default.nix
index 19ffb6419d..43183482ec 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/pylint/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/pylint/default.nix
@@ -1,50 +1,67 @@
-{ stdenv, lib, buildPythonPackage, fetchPypi, pythonOlder, astroid, installShellFiles,
- isort, mccabe, pytestCheckHook, pytest-benchmark, pytestrunner, toml }:
+{ stdenv
+, lib
+, buildPythonPackage
+, fetchPypi
+, pythonOlder
+, installShellFiles
+, astroid
+, isort
+, mccabe
+, toml
+, pytest-benchmark
+, pytest-xdist
+, pytestCheckHook
+}:
buildPythonPackage rec {
pname = "pylint";
- version = "2.6.2";
+ version = "2.7.1";
- disabled = pythonOlder "3.5";
+ disabled = pythonOlder "3.6";
src = fetchPypi {
inherit pname version;
- sha256 = "sha256-cYt0eG6n7QeqDFi/VyFU1Geflg0m6WQcwd4gSjC4f8k=";
+ sha256 = "10nrvzk1naf5ryawmi59wp99k31053sz37q3x9li2hj2cf7i1kl1";
};
- nativeBuildInputs = [ pytestrunner installShellFiles ];
+ nativeBuildInputs = [
+ installShellFiles
+ ];
- checkInputs = [ pytestCheckHook pytest-benchmark ];
+ propagatedBuildInputs = [
+ astroid
+ isort
+ mccabe
+ toml
+ ];
- propagatedBuildInputs = [ astroid isort mccabe toml ];
-
- postPatch = lib.optionalString stdenv.isDarwin ''
- # Remove broken darwin test
- rm -vf pylint/test/test_functional.py
+ postInstall = ''
+ mkdir -p $out/share/emacs/site-lisp
+ cp -v "elisp/"*.el $out/share/emacs/site-lisp/
+ installManPage man/*.1
'';
- disabledTests = [
- # https://github.com/PyCQA/pylint/issues/3198
- "test_by_module_statement_value"
- # has issues with local directories
- "test_version"
- ] ++ lib.optionals stdenv.isDarwin [
- "test_parallel_execution"
- "test_py3k_jobs_option"
- ];
+ checkInputs = [
+ pytest-benchmark
+ pytest-xdist
+ pytestCheckHook
+ ];
+
+ dontUseSetuptoolsCheck = true;
# calls executable in one of the tests
preCheck = ''
export PATH=$PATH:$out/bin
'';
- dontUseSetuptoolsCheck = true;
+ pytestFlagsArray = [
+ "-n auto"
+ ];
- postInstall = ''
- mkdir -p $out/share/emacs/site-lisp
- cp "elisp/"*.el $out/share/emacs/site-lisp/
- installManPage man/*.1
- '';
+ disabledTests = lib.optionals stdenv.isDarwin [
+ "test_parallel_execution"
+ "test_py3k_jobs_option"
+ ];
meta = with lib; {
homepage = "https://pylint.pycqa.org/";
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pymazda/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pymazda/default.nix
index 145b405922..8b390ac12f 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/pymazda/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/pymazda/default.nix
@@ -8,12 +8,12 @@
buildPythonPackage rec {
pname = "pymazda";
- version = "0.0.9";
+ version = "0.0.10";
disabled = pythonOlder "3.6";
src = fetchPypi {
inherit pname version;
- sha256 = "15kygabjlxmy3g5kj48ixqdwaz8qrfzxj8ii27cidsp2fq8ph165";
+ sha256 = "sha256-sJj4RkVaELNitcz1H8YitNgIx4f35WeQf7M5miYD5yI=";
};
propagatedBuildInputs = [ aiohttp pycryptodome ];
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pymitv/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pymitv/default.nix
index ffaabb04a2..32f90d07dc 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/pymitv/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/pymitv/default.nix
@@ -7,12 +7,12 @@
buildPythonPackage rec {
pname = "pymitv";
- version = "1.4.3";
+ version = "1.5.0";
disabled = pythonOlder "3.5";
src = fetchPypi {
inherit pname version;
- sha256 = "0jbs1zhqpnsyad3pd8cqy1byv8m5bq17ydc6crmrfkjbp6xvvg3x";
+ sha256 = "sha256-0n4IS5W3nvYwKdl6FVf4upRrFDGdYHohsaXadFy8d8w=";
};
propagatedBuildInputs = [ requests ];
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pyopenssl/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pyopenssl/default.nix
index 86a4c84768..6bc8c04ec3 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/pyopenssl/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/pyopenssl/default.nix
@@ -64,11 +64,12 @@ let
in
buildPythonPackage rec {
- pname = "pyOpenSSL";
+ pname = "pyopenssl";
version = "20.0.1";
src = fetchPypi {
- inherit pname version;
+ pname = "pyOpenSSL";
+ inherit version;
sha256 = "4c231c759543ba02560fcd2480c48dcec4dae34c9da7d3747c508227e0624b51";
};
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pyopenuv/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pyopenuv/default.nix
index 17976137f5..130b44c096 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/pyopenuv/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/pyopenuv/default.nix
@@ -13,14 +13,14 @@
buildPythonPackage rec {
pname = "pyopenuv";
- version = "2.0.1";
+ version = "2.0.2";
format = "pyproject";
src = fetchFromGitHub {
owner = "bachya";
repo = pname;
rev = version;
- sha256 = "1pzdcy65gndrlyhrwyc1rwsh8n4w79wla8n9fr13m00vac3cqkl0";
+ sha256 = "sha256-QVgNwu/NXSV9nbRN0POBCdKCv6xdp4uSEzFAiHkhVaQ=";
};
nativeBuildInputs = [ poetry-core ];
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pyparted/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pyparted/default.nix
index f46a5d2db8..16a894546e 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/pyparted/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/pyparted/default.nix
@@ -38,7 +38,7 @@ buildPythonPackage rec {
PATH="${pkgs.parted}/sbin:$PATH"
'';
- nativeBuildInputs = [ pkgs.pkgconfig ];
+ nativeBuildInputs = [ pkgs.pkg-config ];
checkInputs = [ six ];
propagatedBuildInputs = [ pkgs.parted ];
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pypoppler/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pypoppler/default.nix
index 348f917150..d325c170dc 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/pypoppler/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/pypoppler/default.nix
@@ -17,7 +17,7 @@ buildPythonPackage rec {
};
NIX_CFLAGS_COMPILE="-I${pkgs.poppler.dev}/include/poppler/";
- nativeBuildInputs = [ pkgs.pkgconfig ];
+ nativeBuildInputs = [ pkgs.pkg-config ];
buildInputs = [ pkgs.poppler.dev ];
propagatedBuildInputs = [ pycairo pygobject2 ];
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pyshark/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pyshark/default.nix
index 206e3671f4..1bb9195398 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/pyshark/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/pyshark/default.nix
@@ -2,13 +2,13 @@
buildPythonPackage rec {
pname = "pyshark";
- version = "0.4.2.11";
+ version = "0.4.3";
src = fetchFromGitHub {
owner = "KimiNewt";
repo = pname;
rev = "v${version}";
- sha256 = "07dkhkf85cplcj1h3k8mmqzsn4zdkxzr0zg3gvf8yc8p5g5azx9q";
+ sha256 = "sha256-cveiFkkSplfQPgUEVWyV40KKHCtKJZsfvdV8JmEUmE4=";
};
propagatedBuildInputs = [
@@ -29,6 +29,8 @@ buildPythonPackage rec {
wireshark-cli
];
+ pythonImportsCheck = [ "pyshark" ];
+
meta = with lib; {
description = "Python wrapper for tshark, allowing python packet parsing using wireshark dissectors";
homepage = "https://github.com/KimiNewt/pyshark/";
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pytest-catchlog/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pytest-catchlog/default.nix
index 39c26a3e0f..58b69c4ce5 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/pytest-catchlog/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/pytest-catchlog/default.nix
@@ -10,7 +10,8 @@ buildPythonPackage rec {
extension = "zip";
};
- buildInputs = [ pytest unzip ];
+ nativeBuildInputs = [ unzip ];
+ buildInputs = [ pytest ];
checkPhase = "make test";
# Requires pytest < 3.1
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pytest-error-for-skips/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pytest-error-for-skips/default.nix
new file mode 100644
index 0000000000..60d3f16a1c
--- /dev/null
+++ b/third_party/nixpkgs/pkgs/development/python-modules/pytest-error-for-skips/default.nix
@@ -0,0 +1,31 @@
+{ lib
+, buildPythonPackage
+, fetchFromGitHub
+, pytest
+, pytestCheckHook
+}:
+
+buildPythonPackage rec {
+ pname = "pytest-error-for-skips";
+ version = "2.0.2";
+
+ src = fetchFromGitHub {
+ owner = "jankatins";
+ repo = pname;
+ rev = version;
+ sha256 = "04i4jd3bg4lgn2jfh0a0dzg3ml9b2bjv2ndia6b64w96r3r4p3qr";
+ };
+
+ buildInputs = [ pytest ];
+
+ checkInputs = [ pytestCheckHook ];
+
+ pythonImportsCheck = [ "pytest_error_for_skips" ];
+
+ meta = with lib; {
+ description = "Pytest plugin to treat skipped tests a test failures";
+ homepage = "https://github.com/jankatins/pytest-error-for-skips";
+ license = licenses.mit;
+ maintainers = with maintainers; [ fab ];
+ };
+}
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pytest-forked/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pytest-forked/default.nix
index 855e1fb470..0cfb8cd6af 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/pytest-forked/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/pytest-forked/default.nix
@@ -18,7 +18,13 @@ buildPythonPackage rec {
nativeBuildInputs = [ setuptools_scm ];
- propagatedBuildInputs = [ py pytest ];
+ buildInputs = [
+ pytest
+ ];
+
+ propagatedBuildInputs = [
+ py
+ ];
checkInputs = [ pytestCheckHook ];
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pytest-freezegun/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pytest-freezegun/default.nix
index e5fbb6bb07..2fbc7a651c 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/pytest-freezegun/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/pytest-freezegun/default.nix
@@ -18,9 +18,10 @@ buildPythonPackage rec {
sha256 = "10c4pbh03b4s1q8cjd75lr0fvyf9id0zmdk29566qqsmaz28npas";
};
+ buildInputs = [ pytest ];
+
propagatedBuildInputs = [
freezegun
- pytest
];
checkInputs = [
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pytest-testmon/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pytest-testmon/default.nix
index b86947f5f7..7d2e07db01 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/pytest-testmon/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/pytest-testmon/default.nix
@@ -8,12 +8,12 @@
buildPythonPackage rec {
pname = "pytest-testmon";
- version = "1.0.3";
+ version = "1.1.0";
disabled = pythonOlder "3.6";
src = fetchPypi {
inherit pname version;
- sha256 = "927a73dd510b90a2e4a48ea4d37e82c4490b56caa745663262024ea0cd278169";
+ sha256 = "sha256-+IpT0o+Jg2UJcy6d7mEdZsYfW4IXIBu4IqBFbywyPRk=";
};
propagatedBuildInputs = [ coverage ];
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pytest-timeout/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pytest-timeout/default.nix
index 5833790cf9..8c59b6ee2c 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/pytest-timeout/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/pytest-timeout/default.nix
@@ -16,7 +16,7 @@ buildPythonPackage rec {
sha256 = "0xnsigs0kmpq1za0d4i522sp3f71x5bgpdh3ski0rs74yqy13cr0";
};
- propagatedBuildInputs = [ pytest ];
+ buildInputs = [ pytest ];
checkInputs = [ pytestCheckHook pexpect pytestcov ];
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pytest-xdist/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pytest-xdist/default.nix
index a6f6ffd7dc..bbc08fb59d 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/pytest-xdist/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/pytest-xdist/default.nix
@@ -22,8 +22,11 @@ buildPythonPackage rec {
};
nativeBuildInputs = [ setuptools_scm ];
+ buildInputs = [
+ pytest
+ ];
checkInputs = [ pytestCheckHook filelock ];
- propagatedBuildInputs = [ execnet pytest pytest-forked psutil ];
+ propagatedBuildInputs = [ execnet pytest-forked psutil ];
# access file system
disabledTests = [
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pytest/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pytest/default.nix
index 798084d111..579cfe1271 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/pytest/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/pytest/default.nix
@@ -1,19 +1,16 @@
{ lib, buildPythonPackage, pythonOlder, fetchPypi, isPy3k, isPyPy
, atomicwrites
, attrs
-, funcsigs
, hypothesis
, iniconfig
-, mock
, more-itertools
, packaging
, pathlib2
, pluggy
, py
, pygments
-, python
, setuptools
-, setuptools_scm
+, setuptools-scm
, six
, toml
, wcwidth
@@ -21,18 +18,17 @@
}:
buildPythonPackage rec {
- version = "6.1.2";
pname = "pytest";
-
+ version = "6.2.2";
disabled = !isPy3k;
src = fetchPypi {
inherit pname version;
- sha256 = "c0a7e94a8cdbc5422a51ccdad8e6f1024795939cc89159a0ae7f0b316ad3823e";
+ sha256 = "sha256-nR7fnn0LhNcuo9vN/SKzX7VDpejypgCS3VeJNr9j1/k=";
};
- checkInputs = [ hypothesis pygments ];
- nativeBuildInputs = [ setuptools_scm ];
+ nativeBuildInputs = [ setuptools-scm ];
+
propagatedBuildInputs = [
atomicwrites
attrs
@@ -47,6 +43,11 @@ buildPythonPackage rec {
wcwidth
] ++ lib.optionals (pythonOlder "3.6") [ pathlib2 ];
+ checkInputs = [
+ hypothesis
+ pygments
+ ];
+
doCheck = !isPyPy; # https://github.com/pytest-dev/pytest/issues/3460
preCheck = ''
@@ -80,8 +81,9 @@ buildPythonPackage rec {
];
meta = with lib; {
- homepage = "https://docs.pytest.org";
description = "Framework for writing tests";
+ homepage = "https://docs.pytest.org";
+ changelog = "https://github.com/pytest-dev/pytest/releases/tag/${version}";
maintainers = with maintainers; [ domenkozar lovek323 madjar lsix ];
license = licenses.mit;
};
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/python-simple-hipchat/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/python-simple-hipchat/default.nix
index 3162a03262..904437bdcf 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/python-simple-hipchat/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/python-simple-hipchat/default.nix
@@ -10,7 +10,7 @@ buildPythonPackage rec {
sha256 = "0zy6prrj85jjc4xmxgfg8h94j81k6zhfxfffcbvq9b10jis1rgav";
};
- buildInputs = [ unzip ];
+ nativeBuildInputs = [ unzip ];
meta = with lib; {
description = "Easy peasy wrapper for HipChat's v1 API";
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pytile/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pytile/default.nix
index 720fdff743..c1901a7508 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/pytile/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/pytile/default.nix
@@ -25,10 +25,6 @@ buildPythonPackage rec {
format = "pyproject";
- postPatch = ''
- substituteInPlace pyproject.toml --replace 'aiohttp = "^3.7.4"' 'aiohttp = "^3.7.3"'
- '';
-
nativeBuildInputs = [ poetry-core ];
propagatedBuildInputs = [
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/regenmaschine/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/regenmaschine/default.nix
index 3380ef99f1..02ac2da967 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/regenmaschine/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/regenmaschine/default.nix
@@ -14,14 +14,14 @@
buildPythonPackage rec {
pname = "regenmaschine";
- version = "3.1.1";
+ version = "3.1.2";
format = "pyproject";
src = fetchFromGitHub {
owner = "bachya";
repo = pname;
rev = version;
- sha256 = "0m6i7vspp8ssdk2k32kznql1j8gkp300kzb7pk67hzvpijdy3mca";
+ sha256 = "sha256-lARti3Sb/jh7h8x+lFLqkM/BlL6XmELm46owsL041Cw=";
};
nativeBuildInputs = [ poetry-core ];
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/sagemaker/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/sagemaker/default.nix
index 7d9a985e39..f95696e20b 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/sagemaker/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/sagemaker/default.nix
@@ -14,11 +14,11 @@
buildPythonPackage rec {
pname = "sagemaker";
- version = "2.29.2";
+ version = "2.30.0";
src = fetchPypi {
inherit pname version;
- sha256 = "sha256-e+yrjtDC6d47+zEFv6WY7xGw9kDfKLrNyMh/IkC/bQs=";
+ sha256 = "sha256-3BxRDoaKxaXlKYGYQqhQ2DUO3XONvf6dlofE0pbXIho=";
};
pythonImportsCheck = [
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/sane/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/sane/default.nix
index d45c736d8d..b02feb9e21 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/sane/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/sane/default.nix
@@ -1,7 +1,7 @@
{ lib
, buildPythonPackage
, fetchPypi
-, saneBackends
+, sane-backends
}:
buildPythonPackage rec {
@@ -15,7 +15,7 @@ buildPythonPackage rec {
};
buildInputs = [
- saneBackends
+ sane-backends
];
meta = with lib; {
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/setuptools-rust/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/setuptools-rust/default.nix
index e24c771457..e3d8a35186 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/setuptools-rust/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/setuptools-rust/default.nix
@@ -1,4 +1,5 @@
-{ lib
+{ callPackage
+, lib
, buildPythonPackage
, fetchPypi
, isPy27
@@ -26,6 +27,8 @@ buildPythonPackage rec {
doCheck = false;
pythonImportsCheck = [ "setuptools_rust" ];
+ passthru.tests.pyo3 = callPackage ./pyo3-test {};
+
meta = with lib; {
description = "Setuptools plugin for Rust support";
homepage = "https://github.com/PyO3/setuptools-rust";
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/setuptools-rust/pyo3-test/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/setuptools-rust/pyo3-test/default.nix
new file mode 100644
index 0000000000..9af17aa515
--- /dev/null
+++ b/third_party/nixpkgs/pkgs/development/python-modules/setuptools-rust/pyo3-test/default.nix
@@ -0,0 +1,21 @@
+{ callPackage
+, rustPlatform
+, setuptools-rust
+}:
+
+callPackage ../../../tools/rust/maturin/pyo3-test/generic.nix {
+ # Isolated builds break for this package, because PyO3 is not
+ # in the build root of the Python Package:
+ #
+ # https://github.com/pypa/pip/issues/6276
+ #
+ format = "setuptools";
+
+ nativeBuildInputs = [ setuptools-rust ] ++ (with rustPlatform; [
+ cargoSetupHook
+ rust.cargo
+ rust.rustc
+ ]);
+
+ sourceRoot = "source/examples/word-count";
+}
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/simplejson/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/simplejson/default.nix
index fe08f5bbe2..dd27c02dc8 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/simplejson/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/simplejson/default.nix
@@ -2,39 +2,35 @@
, buildPythonPackage
, fetchFromGitHub
, stdenv
-, pytest
+, pytestCheckHook
}:
buildPythonPackage rec {
pname = "simplejson";
- version = "3.17.0";
+ version = "3.17.2";
doCheck = !stdenv.isDarwin;
src = fetchFromGitHub {
owner = pname;
repo = pname;
rev = "v${version}";
- sha256 = "1b1hhh1dia673vhq3jl2br1iqwb9yjii6iak56w96s9972vjbz3z";
+ sha256 = "sha256-2ZC7aKyUUcth43Ce0j6JdjrJ4gb4QfJDlY2M5TLMQ+o=";
};
- # Package does not need pytest, but its a bit easier debugging.
- checkInputs = [ pytest ];
- # Ignore warnings because test does not expect them in stderr
- # See https://github.com/simplejson/simplejson/issues/241
- checkPhase = ''
- PYTHONWARNINGS="ignore" pytest simplejson/tests
- '';
+ checkInputs = [ pytestCheckHook ];
- meta = {
- description = "A simple, fast, extensible JSON encoder/decoder for Python";
+ pythonImportsCheck = [ "simplejson" ];
+
+ meta = with lib; {
+ description = "Extensible JSON encoder/decoder for Python";
longDescription = ''
- simplejson is compatible with Python 2.4 and later with no
- external dependencies. It covers the full JSON specification
- for both encoding and decoding, with unicode support. By
- default, encoding is done in an encoding neutral fashion (plain
- ASCII with \uXXXX escapes for unicode characters).
+ simplejson covers the full JSON specification for both encoding
+ and decoding, with unicode support. By default, encoding is done
+ in an encoding neutral fashion (plain ASCII with \uXXXX escapes
+ for unicode characters).
'';
homepage = "https://github.com/simplejson/simplejson";
- license = with lib.licenses; [ mit afl21 ];
+ license = with licenses; [ mit afl21 ];
+ maintainers = with maintainers; [ fab ];
};
}
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/slack-sdk/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/slack-sdk/default.nix
index cb491cf600..195bd72061 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/slack-sdk/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/slack-sdk/default.nix
@@ -21,14 +21,14 @@
buildPythonPackage rec {
pname = "slack-sdk";
- version = "3.4.0";
+ version = "3.4.2";
disabled = !isPy3k;
src = fetchFromGitHub {
owner = "slackapi";
repo = "python-slack-sdk";
rev = "v${version}";
- sha256 = "sha256-WlHVorltN8Apq0MZUStPlJZKbBFSbnAoIBQUZYGdDiY=";
+ sha256 = "sha256-AbQqe6hCy6Ke5lwKHFWLJlXv7HdDApYYK++SPNQ2Nxg=";
};
propagatedBuildInputs = [
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/snapcast/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/snapcast/default.nix
index c5df9f7d99..702b0e3e36 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/snapcast/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/snapcast/default.nix
@@ -1,23 +1,25 @@
-{ lib, buildPythonPackage, fetchPypi, isPy3k, pytest
-, construct }:
+{ lib
+, buildPythonPackage
+, construct
+, fetchPypi
+, isPy3k
+}:
buildPythonPackage rec {
pname = "snapcast";
- version = "2.1.1";
-
+ version = "2.1.2";
disabled = !isPy3k;
src = fetchPypi {
inherit pname version;
- sha256 = "c3ecd63d997fbcf6e5322dc47c1f02615f1d9611cba01ec18e9c9f8c14ed824b";
+ sha256 = "sha256-ILBleqxEO7wTxAw/fvDW+4O4H4XWV5m5WWtaNeRBr4g=";
};
- checkInputs = [ pytest ];
-
propagatedBuildInputs = [ construct ];
# no checks from Pypi - https://github.com/happyleavesaoc/python-snapcast/issues/23
doCheck = false;
+ pythonImportsCheck = [ "snapcast" ];
meta = with lib; {
description = "Control Snapcast, a multi-room synchronous audio solution";
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/soco/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/soco/default.nix
index e86144dff0..a72c413c18 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/soco/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/soco/default.nix
@@ -30,10 +30,12 @@ buildPythonPackage rec {
sha256 = "sha256-CCgkzUkt9YqTJt9tPBLmYXW6ZuRoMDd7xahYmNXgfM0=";
};
- patches = [(fetchpatch {
- url = "https://patch-diff.githubusercontent.com/raw/SoCo/SoCo/pull/811.patch";
- sha256 = "sha256-GBd74c8zc25ROO411SZ9TTa+bi8yXJaaOQqY9FM1qj4=";
- })];
+ patches = [
+ (fetchpatch {
+ url = "https://patch-diff.githubusercontent.com/raw/SoCo/SoCo/pull/811.patch";
+ sha256 = "sha256-GBd74c8zc25ROO411SZ9TTa+bi8yXJaaOQqY9FM1qj4=";
+ })
+ ];
# N.B. These exist because:
# 1. Upstream's pinning isn't well maintained, leaving dependency versions no
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/sqlite-utils/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/sqlite-utils/default.nix
index 3ec4246cd0..a6dd6e41dc 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/sqlite-utils/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/sqlite-utils/default.nix
@@ -15,12 +15,12 @@
buildPythonPackage rec {
pname = "sqlite-utils";
- version = "3.5";
+ version = "3.6";
disabled = pythonOlder "3.6";
src = fetchPypi {
inherit pname version;
- sha256 = "sha256-i9SnT+DcQOcujV25bD/SNV1uRA2IgfiSWhEWlQC5TiA=";
+ sha256 = "sha256-WCqbz0tssy7i76Sg2PeexjDollypPGnOqqfUJOHAFWA=";
};
propagatedBuildInputs = [
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/tatsu/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/tatsu/default.nix
index 540c315c8f..3a72b5c310 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/tatsu/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/tatsu/default.nix
@@ -6,22 +6,16 @@
buildPythonPackage rec {
pname = "TatSu";
- version = "5.0.0";
+ version = "5.5.0";
src = fetchFromGitHub {
owner = "neogeny";
repo = pname;
rev = "v${version}";
- sha256 = "1c16fcxf0xjkh5py9bnj6ljb9krhrj57mkwayl1w1dvzwl5lkgj3";
+ sha256 = "07bmdnwh99p60cgzhlb8s5vwi5v4r5zi8shymxnnarannkc66hzn";
};
- # Since version 5.0.0 only >=3.8 is officially supported, but ics is not
- # compatible with Python 3.8 due to aiohttp:
- disabled = pythonOlder "3.7";
- postPatch = ''
- substituteInPlace setup.py \
- --replace "python_requires='>=3.8'," "python_requires='>=3.7',"
- '';
+ disabled = pythonOlder "3.8";
nativeBuildInputs = [ pytestrunner ];
propagatedBuildInputs = [ colorama mypy pyyaml regex ]
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/trio/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/trio/default.nix
index 94da63cd3e..baaff068db 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/trio/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/trio/default.nix
@@ -18,12 +18,12 @@
buildPythonPackage rec {
pname = "trio";
- version = "0.17.0";
+ version = "0.18.0";
disabled = pythonOlder "3.6";
src = fetchPypi {
inherit pname version;
- sha256 = "0zcxirpdvvl54pbfkgw7vz984879xwvdygqfpggnam24is2zjp78";
+ sha256 = "0xm0bd1rrlb4l9q0nf2n1wg7xh42ljdnm4i4j0651zi73zk6m9l7";
};
checkInputs = [ astor pytestCheckHook pyopenssl trustme jedi pylint yapf ];
@@ -34,6 +34,8 @@ buildPythonPackage rec {
"getprotobyname"
"waitpid"
"static_tool_sees_all_symbols"
+ # tests pytest more than python
+ "fallback_when_no_hook_claims_it"
];
propagatedBuildInputs = [
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/urllib3/2.nix b/third_party/nixpkgs/pkgs/development/python-modules/urllib3/2.nix
new file mode 100644
index 0000000000..b44993c71b
--- /dev/null
+++ b/third_party/nixpkgs/pkgs/development/python-modules/urllib3/2.nix
@@ -0,0 +1,74 @@
+{ lib
+, stdenv
+, brotli
+, buildPythonPackage
+, certifi
+, cryptography
+, dateutil
+, fetchPypi
+, idna
+, mock
+, pyopenssl
+, pysocks
+, pytest-freezegun
+, pytest-timeout
+, pytestCheckHook
+, pythonOlder
+, tornado
+, trustme
+}:
+
+buildPythonPackage rec {
+ pname = "urllib3";
+ version = "1.26.2";
+
+ src = fetchPypi {
+ inherit pname version;
+ sha256 = "19188f96923873c92ccb987120ec4acaa12f0461fa9ce5d3d0772bc965a39e08";
+ };
+
+ propagatedBuildInputs = [
+ brotli
+ certifi
+ cryptography
+ idna
+ pyopenssl
+ pysocks
+ ];
+
+ checkInputs = [
+ dateutil
+ mock
+ pytest-freezegun
+ pytest-timeout
+ pytestCheckHook
+ tornado
+ trustme
+ ];
+
+ # Tests in urllib3 are mostly timeout-based instead of event-based and
+ # are therefore inherently flaky. On your own machine, the tests will
+ # typically build fine, but on a loaded cluster such as Hydra random
+ # timeouts will occur.
+ #
+ # The urllib3 test suite has two different timeouts in their test suite
+ # (see `test/__init__.py`):
+ # - SHORT_TIMEOUT
+ # - LONG_TIMEOUT
+ # When CI is in the env, LONG_TIMEOUT will be significantly increased.
+ # Still, failures can occur and for that reason tests are disabled.
+ doCheck = false;
+
+ preCheck = ''
+ export CI # Increases LONG_TIMEOUT
+ '';
+
+ pythonImportsCheck = [ "urllib3" ];
+
+ meta = with lib; {
+ description = "Powerful, sanity-friendly HTTP client for Python";
+ homepage = "https://github.com/shazow/urllib3";
+ license = licenses.mit;
+ maintainers = with maintainers; [ fab ];
+ };
+}
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/urllib3/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/urllib3/default.nix
index 7bfb2ba75a..fa323fb960 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/urllib3/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/urllib3/default.nix
@@ -1,33 +1,75 @@
-{ lib, buildPythonPackage, fetchPypi
-, pytest, mock, tornado, pyopenssl, cryptography
-, idna, certifi, ipaddress, pysocks }:
+{ lib
+, stdenv
+, brotli
+, buildPythonPackage
+, certifi
+, cryptography
+, dateutil
+, fetchPypi
+, idna
+, mock
+, pyopenssl
+, pysocks
+, pytest-freezegun
+, pytest-timeout
+, pytestCheckHook
+, pythonOlder
+, tornado
+, trustme
+}:
buildPythonPackage rec {
pname = "urllib3";
version = "1.26.3";
+ disabled = pythonOlder "3.6";
src = fetchPypi {
inherit pname version;
sha256 = "de3eedaad74a2683334e282005cd8d7f22f4d55fa690a2a1020a416cb0a47e73";
};
- NOSE_EXCLUDE = lib.concatStringsSep "," [
- "test_headers" "test_headerdict" "test_can_validate_ip_san" "test_delayed_body_read_timeout"
- "test_timeout_errors_cause_retries" "test_select_multiple_interrupts_with_event"
+ propagatedBuildInputs = [
+ brotli
+ certifi
+ cryptography
+ idna
+ pyopenssl
+ pysocks
];
- checkPhase = ''
- nosetests -v --cover-min-percentage 1
- '';
+ checkInputs = [
+ dateutil
+ mock
+ pytest-freezegun
+ pytest-timeout
+ pytestCheckHook
+ tornado
+ trustme
+ ];
+ # Tests in urllib3 are mostly timeout-based instead of event-based and
+ # are therefore inherently flaky. On your own machine, the tests will
+ # typically build fine, but on a loaded cluster such as Hydra random
+ # timeouts will occur.
+ #
+ # The urllib3 test suite has two different timeouts in their test suite
+ # (see `test/__init__.py`):
+ # - SHORT_TIMEOUT
+ # - LONG_TIMEOUT
+ # When CI is in the env, LONG_TIMEOUT will be significantly increased.
+ # Still, failures can occur and for that reason tests are disabled.
doCheck = false;
- checkInputs = [ pytest mock tornado ];
- propagatedBuildInputs = [ pyopenssl cryptography idna certifi ipaddress pysocks ];
+ preCheck = ''
+ export CI # Increases LONG_TIMEOUT
+ '';
+
+ pythonImportsCheck = [ "urllib3" ];
meta = with lib; {
description = "Powerful, sanity-friendly HTTP client for Python";
homepage = "https://github.com/shazow/urllib3";
license = licenses.mit;
+ maintainers = with maintainers; [ fab ];
};
}
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/websocket_client/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/websocket_client/default.nix
index dacae3e81e..6ad0634631 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/websocket_client/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/websocket_client/default.nix
@@ -1,25 +1,33 @@
-{ lib, buildPythonPackage, fetchPypi, isPy27
-, six
+{ lib
, backports_ssl_match_hostname
+, buildPythonPackage
+, fetchPypi
+, isPy27
+, pytestCheckHook
+, six
}:
buildPythonPackage rec {
- version = "0.57.0";
pname = "websocket_client";
+ version = "0.58.0";
src = fetchPypi {
inherit pname version;
- sha256 = "d735b91d6d1692a6a181f2a8c9e0238e5f6373356f561bb9dc4c7af36f452010";
+ sha256 = "sha256-Y1CbQdFYrlt/Z+tK0g/su07umUNOc+FANU3D/44JcW8=";
};
propagatedBuildInputs = [
six
] ++ lib.optional isPy27 backports_ssl_match_hostname;
+ checkInputs = [ pytestCheckHook ];
+
+ pythonImportsCheck = [ "websocket" ];
+
meta = with lib; {
- description = "Websocket client for python";
+ description = "Websocket client for Python";
homepage = "https://github.com/websocket-client/websocket-client";
- license = licenses.bsd3;
- maintainers = with maintainers; [ ];
+ license = licenses.lgpl21Plus;
+ maintainers = with maintainers; [ fab ];
};
}
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/yapf/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/yapf/default.nix
index 9c0e9d3539..9c759f3a2b 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/yapf/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/yapf/default.nix
@@ -1,19 +1,46 @@
-{ lib, buildPythonPackage, fetchPypi }:
+{ lib
+, buildPythonPackage
+, fetchPypi
+, nose
+}:
buildPythonPackage rec {
pname = "yapf";
- version = "0.30.0";
+ version = "0.31.0";
src = fetchPypi {
inherit pname version;
- sha256 = "3000abee4c28daebad55da6c85f3cd07b8062ce48e2e9943c8da1b9667d48427";
+ hash = "sha256-QI+5orJUwwL0nbg8WfmqC0sP0OwlvjpcURgTJ5Iv9j0=";
};
+ checkInputs = [
+ nose
+ ];
+
meta = with lib; {
- description = "A formatter for Python code.";
- homepage = "https://github.com/google/yapf";
- license = licenses.asl20;
- maintainers = with maintainers; [ siddharthist ];
- };
+ homepage = "https://github.com/google/yapf";
+ description = "Yet Another Python Formatter";
+ longDescription = ''
+ Most of the current formatters for Python --- e.g., autopep8, and pep8ify
+ --- are made to remove lint errors from code. This has some obvious
+ limitations. For instance, code that conforms to the PEP 8 guidelines may
+ not be reformatted. But it doesn't mean that the code looks good.
+ YAPF takes a different approach. It's based off of 'clang-format',
+ developed by Daniel Jasper. In essence, the algorithm takes the code and
+ reformats it to the best formatting that conforms to the style guide, even
+ if the original code didn't violate the style guide. The idea is also
+ similar to the 'gofmt' tool for the Go programming language: end all holy
+ wars about formatting - if the whole codebase of a project is simply piped
+ through YAPF whenever modifications are made, the style remains consistent
+ throughout the project and there's no point arguing about style in every
+ code review.
+
+ The ultimate goal is that the code YAPF produces is as good as the code
+ that a programmer would write if they were following the style guide. It
+ takes away some of the drudgery of maintaining your code.
+ '';
+ license = licenses.asl20;
+ maintainers = with maintainers; [ AndersonTorres siddharthist ];
+ };
}
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/ytmusicapi/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/ytmusicapi/default.nix
new file mode 100644
index 0000000000..ed4a416568
--- /dev/null
+++ b/third_party/nixpkgs/pkgs/development/python-modules/ytmusicapi/default.nix
@@ -0,0 +1,33 @@
+{ lib
+, buildPythonPackage
+, isPy27
+, fetchPypi
+, requests
+}:
+
+buildPythonPackage rec {
+ pname = "ytmusicapi";
+ version = "0.14.3";
+
+ disabled = isPy27;
+
+ src = fetchPypi {
+ inherit pname version;
+ sha256 = "83251a95d5bd74116353d29dfda2d0c5055b88276a0876a313a66f8b9c691344";
+ };
+
+ propagatedBuildInputs = [
+ requests
+ ];
+
+ doCheck = false; # requires network access
+
+ pythonImportsCheck = [ "ytmusicapi" ];
+
+ meta = with lib; {
+ description = "Unofficial API for YouTube Music";
+ homepage = "https://github.com/sigma67/ytmusicapi";
+ license = licenses.mit;
+ maintainers = with maintainers; [ dotlambda ];
+ };
+}
diff --git a/third_party/nixpkgs/pkgs/development/r-modules/default.nix b/third_party/nixpkgs/pkgs/development/r-modules/default.nix
index fe823c17d9..24f6e7ccfc 100644
--- a/third_party/nixpkgs/pkgs/development/r-modules/default.nix
+++ b/third_party/nixpkgs/pkgs/development/r-modules/default.nix
@@ -231,7 +231,7 @@ let
};
packagesWithNativeBuildInputs = {
- arrow = [ pkgs.pkgconfig pkgs.arrow-cpp ];
+ arrow = [ pkgs.pkg-config pkgs.arrow-cpp ];
adimpro = [ pkgs.imagemagick ];
animation = [ pkgs.which ];
audio = [ pkgs.portaudio ];
diff --git a/third_party/nixpkgs/pkgs/development/ruby-modules/gem/default.nix b/third_party/nixpkgs/pkgs/development/ruby-modules/gem/default.nix
index 9e64b120af..02af8eaa96 100644
--- a/third_party/nixpkgs/pkgs/development/ruby-modules/gem/default.nix
+++ b/third_party/nixpkgs/pkgs/development/ruby-modules/gem/default.nix
@@ -129,6 +129,12 @@ stdenv.mkDerivation ((builtins.removeAttrs attrs ["source"]) // {
runHook postUnpack
'';
+ # As of ruby 3.0, ruby headers require -fdeclspec when building with clang
+ # Introduced in https://github.com/ruby/ruby/commit/0958e19ffb047781fe1506760c7cbd8d7fe74e57
+ NIX_CFLAGS_COMPILE = lib.optionals (stdenv.cc.isClang && lib.versionAtLeast ruby.version.major "3") [
+ "-fdeclspec"
+ ];
+
buildPhase = attrs.buildPhase or ''
runHook preBuild
diff --git a/third_party/nixpkgs/pkgs/development/tools/analysis/emma/default.nix b/third_party/nixpkgs/pkgs/development/tools/analysis/emma/default.nix
index 97f93722a1..a1e88d8ebf 100644
--- a/third_party/nixpkgs/pkgs/development/tools/analysis/emma/default.nix
+++ b/third_party/nixpkgs/pkgs/development/tools/analysis/emma/default.nix
@@ -8,7 +8,7 @@ stdenv.mkDerivation {
sha256 = "0xxy39s2lvgs56vicjzpcz936l1vjaplliwa0dm7v3iyvw6jn7vj";
};
- buildInputs = [unzip];
+ nativeBuildInputs = [ unzip ];
installPhase = ''
mkdir -p $out/lib/jars
diff --git a/third_party/nixpkgs/pkgs/development/tools/analysis/flow/default.nix b/third_party/nixpkgs/pkgs/development/tools/analysis/flow/default.nix
index 5c6fd8e3b9..0c6c9dbad0 100644
--- a/third_party/nixpkgs/pkgs/development/tools/analysis/flow/default.nix
+++ b/third_party/nixpkgs/pkgs/development/tools/analysis/flow/default.nix
@@ -2,13 +2,13 @@
stdenv.mkDerivation rec {
pname = "flow";
- version = "0.145.0";
+ version = "0.146.0";
src = fetchFromGitHub {
owner = "facebook";
repo = "flow";
rev = "refs/tags/v${version}";
- sha256 = "sha256-6fRKXKh+hB/d2CcmZYYSlMzP1IGCl7fLdXCQ1M0wuY4=";
+ sha256 = "0kxws51hri0b4z7k05li6vg1arcdc7i5jzfibi0iplsfyy14159q";
};
installPhase = ''
diff --git a/third_party/nixpkgs/pkgs/development/tools/analysis/makefile2graph/default.nix b/third_party/nixpkgs/pkgs/development/tools/analysis/makefile2graph/default.nix
index 66f767f470..1f9e2ba3c5 100644
--- a/third_party/nixpkgs/pkgs/development/tools/analysis/makefile2graph/default.nix
+++ b/third_party/nixpkgs/pkgs/development/tools/analysis/makefile2graph/default.nix
@@ -27,6 +27,6 @@ stdenv.mkDerivation {
description = "Creates a graph of dependencies from GNU-Make; Output is a graphiz-dot file or a Gexf-XML file";
maintainers = with maintainers; [ cmcdragonkai ];
license = licenses.mit;
- platforms = platforms.linux;
+ platforms = platforms.all;
};
}
diff --git a/third_party/nixpkgs/pkgs/development/tools/analysis/randoop/default.nix b/third_party/nixpkgs/pkgs/development/tools/analysis/randoop/default.nix
index 0d10d6d6b2..ed060d847e 100644
--- a/third_party/nixpkgs/pkgs/development/tools/analysis/randoop/default.nix
+++ b/third_party/nixpkgs/pkgs/development/tools/analysis/randoop/default.nix
@@ -9,7 +9,7 @@ stdenv.mkDerivation rec {
sha256 = "0v3vla3k6csfb8w0j9njrhcjj4n7yh172n9wv6z397f1sa0fs202";
};
- buildInputs = [ unzip ];
+ nativeBuildInputs = [ unzip ];
installPhase = ''
mkdir -p $out/lib $out/doc
diff --git a/third_party/nixpkgs/pkgs/development/tools/analysis/swarm/default.nix b/third_party/nixpkgs/pkgs/development/tools/analysis/swarm/default.nix
index 894d9a2357..e4ebb85f27 100644
--- a/third_party/nixpkgs/pkgs/development/tools/analysis/swarm/default.nix
+++ b/third_party/nixpkgs/pkgs/development/tools/analysis/swarm/default.nix
@@ -19,7 +19,7 @@ stdenv.mkDerivation {
description = "Verification script generator for Spin";
homepage = "http://spinroot.com/";
license = licenses.free;
- platforms = platforms.linux;
+ platforms = platforms.unix;
maintainers = with maintainers; [ abbradar ];
};
}
diff --git a/third_party/nixpkgs/pkgs/development/tools/analysis/tfsec/default.nix b/third_party/nixpkgs/pkgs/development/tools/analysis/tfsec/default.nix
index 09a77d0f93..c3c3d2dd2b 100644
--- a/third_party/nixpkgs/pkgs/development/tools/analysis/tfsec/default.nix
+++ b/third_party/nixpkgs/pkgs/development/tools/analysis/tfsec/default.nix
@@ -2,13 +2,13 @@
buildGoPackage rec {
pname = "tfsec";
- version = "0.39.6";
+ version = "0.39.8";
src = fetchFromGitHub {
owner = "tfsec";
repo = pname;
rev = "v${version}";
- sha256 = "sha256-2P+/y3iP/eMGGc0W1lHWWxO+uMy5gvlvjKzZ/8maJ9o=";
+ sha256 = "sha256-7LC7QT92Ecva/uQPwYEfbLQUpIesxa8pXrauMxIwZ98=";
};
goPackagePath = "github.com/tfsec/tfsec";
diff --git a/third_party/nixpkgs/pkgs/development/tools/build-managers/bazel/bazel_4/default.nix b/third_party/nixpkgs/pkgs/development/tools/build-managers/bazel/bazel_4/default.nix
index 5482db67ca..4f92f8448a 100644
--- a/third_party/nixpkgs/pkgs/development/tools/build-managers/bazel/bazel_4/default.nix
+++ b/third_party/nixpkgs/pkgs/development/tools/build-managers/bazel/bazel_4/default.nix
@@ -315,7 +315,7 @@ stdenv.mkDerivation rec {
src_for_updater = stdenv.mkDerivation rec {
name = "updater-sources";
inherit src;
- buildInputs = [ unzip ];
+ nativeBuildInputs = [ unzip ];
inherit sourceRoot;
installPhase = ''
cp -r . "$out"
diff --git a/third_party/nixpkgs/pkgs/development/tools/build-managers/cmake/default.nix b/third_party/nixpkgs/pkgs/development/tools/build-managers/cmake/default.nix
index 7c2e5372e7..65e1b55387 100644
--- a/third_party/nixpkgs/pkgs/development/tools/build-managers/cmake/default.nix
+++ b/third_party/nixpkgs/pkgs/development/tools/build-managers/cmake/default.nix
@@ -1,5 +1,5 @@
{ stdenv, lib, fetchurl, pkg-config
-, bzip2, curl, expat, libarchive, xz, zlib, libuv, rhash
+, bzip2, curlMinimal, expat, libarchive, xz, zlib, libuv, rhash
, buildPackages
# darwin attributes
, ps
@@ -20,12 +20,12 @@ stdenv.mkDerivation (rec {
+ lib.optionalString useNcurses "-cursesUI"
+ lib.optionalString withQt5 "-qt5UI"
+ lib.optionalString useQt4 "-qt4UI";
- version = "3.19.4";
+ version = "3.19.6";
src = fetchurl {
url = "${meta.homepage}files/v${lib.versions.majorMinor version}/cmake-${version}.tar.gz";
# compare with https://cmake.org/files/v${lib.versions.majorMinor version}/cmake-${version}-SHA-256.txt
- sha256 = "sha256-fQIyufHFfo3oHzgHHvggPmgg/n7siuRqHfEl2I28wuE=";
+ sha256 = "sha256-7IerZ8RfR8QoXyBCgMXN5I4ckgz8/tFVWyf7OxodILo=";
};
patches = [
@@ -50,7 +50,7 @@ stdenv.mkDerivation (rec {
nativeBuildInputs = [ setupHook pkg-config ];
buildInputs = []
- ++ lib.optionals useSharedLibraries [ bzip2 curl expat libarchive xz zlib libuv rhash ]
+ ++ lib.optionals useSharedLibraries [ bzip2 curlMinimal expat libarchive xz zlib libuv rhash ]
++ lib.optional useOpenSSL openssl
++ lib.optional useNcurses ncurses
++ lib.optional useQt4 qt4
@@ -64,8 +64,6 @@ stdenv.mkDerivation (rec {
--subst-var-by libc_bin ${lib.getBin stdenv.cc.libc} \
--subst-var-by libc_dev ${lib.getDev stdenv.cc.libc} \
--subst-var-by libc_lib ${lib.getLib stdenv.cc.libc}
- substituteInPlace Modules/FindCxxTest.cmake \
- --replace "$""{PYTHON_EXECUTABLE}" ${stdenv.shell}
''
# CC_FOR_BUILD and CXX_FOR_BUILD are used to bootstrap cmake
+ ''
diff --git a/third_party/nixpkgs/pkgs/development/tools/build-managers/cmake/setup-hook.sh b/third_party/nixpkgs/pkgs/development/tools/build-managers/cmake/setup-hook.sh
index 0bb695615f..89e8e0e197 100755
--- a/third_party/nixpkgs/pkgs/development/tools/build-managers/cmake/setup-hook.sh
+++ b/third_party/nixpkgs/pkgs/development/tools/build-managers/cmake/setup-hook.sh
@@ -50,9 +50,6 @@ cmakeConfigurePhase() {
# because we usually do not package the framework
cmakeFlags="-DCMAKE_FIND_FRAMEWORK=LAST $cmakeFlags"
- # on macOS i686 was only relevant for 10.5 or earlier.
- cmakeFlags="-DCMAKE_OSX_ARCHITECTURES=x86_64 $cmakeFlags"
-
# we never want to use the global macOS SDK
cmakeFlags="-DCMAKE_OSX_SYSROOT= $cmakeFlags"
diff --git a/third_party/nixpkgs/pkgs/development/tools/build-managers/dub/default.nix b/third_party/nixpkgs/pkgs/development/tools/build-managers/dub/default.nix
index 2df829a022..fb85c1f332 100644
--- a/third_party/nixpkgs/pkgs/development/tools/build-managers/dub/default.nix
+++ b/third_party/nixpkgs/pkgs/development/tools/build-managers/dub/default.nix
@@ -1,4 +1,6 @@
-{ lib, stdenv, fetchFromGitHub, curl, dmd, libevent, rsync }:
+{ lib, stdenv, fetchFromGitHub, curl, libevent, rsync, ldc, dcompiler ? ldc }:
+
+assert dcompiler != null;
stdenv.mkDerivation rec {
pname = "dub";
@@ -24,12 +26,23 @@ stdenv.mkDerivation rec {
--replace "dub remove" "\"${dubvar}\" remove"
'';
- nativeBuildInputs = [ dmd libevent rsync ];
+ nativeBuildInputs = [ dcompiler libevent rsync ];
buildInputs = [ curl ];
buildPhase = ''
- export DMD=${dmd.out}/bin/dmd
- ./build.sh
+ for dc_ in dmd ldmd2 gdmd; do
+ echo "... check for D compiler $dc_ ..."
+ dc=$(type -P $dc_ || echo "")
+ if [ ! "$dc" == "" ]; then
+ break
+ fi
+ done
+ if [ "$dc" == "" ]; then
+ exit "Error: could not find D compiler"
+ fi
+ echo "$dc_ found and used as D compiler to build $pname"
+ $dc ./build.d
+ ./build
'';
doCheck = !stdenv.isDarwin;
@@ -37,7 +50,8 @@ stdenv.mkDerivation rec {
checkPhase = ''
export DUB=$NIX_BUILD_TOP/source/bin/dub
export PATH=$PATH:$NIX_BUILD_TOP/source/bin/
- export DC=${dmd.out}/bin/dmd
+ export DC=${dcompiler.out}/bin/${dcompiler.pname}
+ echo "DC out --> $DC"
export HOME=$TMP
rm -rf test/issue502-root-import
@@ -46,7 +60,6 @@ stdenv.mkDerivation rec {
rm test/issue990-download-optional-selected.sh
rm test/issue877-auto-fetch-package-on-run.sh
rm test/issue1037-better-dependency-messages.sh
- rm test/issue1040-run-with-ver.sh
rm test/issue1416-maven-repo-pkg-supplier.sh
rm test/issue1180-local-cache-broken.sh
rm test/issue1574-addcommand.sh
@@ -62,13 +75,73 @@ stdenv.mkDerivation rec {
rm test/version-spec.sh
rm test/0-init-multi.sh
rm test/0-init-multi-json.sh
+ rm test/4-describe-data-1-list.sh
+ rm test/4-describe-data-3-zero-delim.sh
+ rm test/4-describe-import-paths.sh
+ rm test/4-describe-string-import-paths.sh
+ rm test/4-describe-json.sh
+ rm test/5-convert-stdout.sh
+ rm test/issue1003-check-empty-ld-flags.sh
+ rm test/issue103-single-file-package.sh
+ rm test/issue1040-run-with-ver.sh
+ rm test/issue1091-bogus-rebuild.sh
+ rm test/issue1194-warn-wrong-subconfig.sh
+ rm test/issue1277.sh
+ rm test/issue1372-ignore-files-in-hidden-dirs.sh
+ rm test/issue1447-build-settings-vars.sh
+ rm test/issue1531-toolchain-requirements.sh
+ rm test/issue346-redundant-flags.sh
+ rm test/issue361-optional-deps.sh
+ rm test/issue564-invalid-upgrade-dependency.sh
+ rm test/issue586-subpack-dep.sh
+ rm test/issue616-describe-vs-generate-commands.sh
+ rm test/issue686-multiple-march.sh
+ rm test/issue813-fixed-dependency.sh
+ rm test/issue813-pure-sub-dependency.sh
+ rm test/issue820-extra-fields-after-convert.sh
+ rm test/issue923-subpackage-deps.sh
+ rm test/single-file-sdl-default-name.sh
+ rm test/subpackage-common-with-sourcefile-globbing.sh
+ rm test/issue934-path-dep.sh
+ rm -r test/1-dynLib-simple
+ rm -r test/1-exec-simple-package-json
+ rm -r test/1-exec-simple
+ rm -r test/1-staticLib-simple
+ rm -r test/2-dynLib-dep
+ rm -r test/2-staticLib-dep
+ rm -r test/2-dynLib-with-staticLib-dep
+ rm -r test/2-sourceLib-dep/
+ rm -r test/3-copyFiles
+ rm -r test/custom-source-main-bug487
+ rm -r test/custom-unittest
+ rm -r test/issue1262-version-inheritance-diamond
+ rm -r test/issue1003-check-empty-ld-flags
+ rm -r test/ignore-hidden-1
+ rm -r test/ignore-hidden-2
+ rm -r test/issue1427-betterC
+ rm -r test/issue130-unicode-*
+ rm -r test/issue1262-version-inheritance
+ rm -r test/issue1372-ignore-files-in-hidden-dirs
+ rm -r test/issue1350-transitive-none-deps
+ rm -r test/issue1775
+ rm -r test/issue1447-build-settings-vars
+ rm -r test/issue1408-inherit-linker-files
+ rm -r test/issue1551-var-escaping
+ rm -r test/issue754-path-selection-fail
+ rm -r test/issue1788-incomplete-string-import-override
+ rm -r test/subpackage-ref
+ rm -r test/issue777-bogus-path-dependency
+ rm -r test/issue959-path-based-subpack-dep
+ rm -r test/issue97-targettype-none-nodeps
+ rm -r test/issue97-targettype-none-onerecipe
+ rm -r test/path-subpackage-ref
+ rm -r test/sdl-package-simple
./test/run-unittest.sh
'';
installPhase = ''
- mkdir $out
- mkdir $out/bin
+ mkdir -p $out/bin
cp bin/dub $out/bin
'';
diff --git a/third_party/nixpkgs/pkgs/development/tools/build-managers/gradle/default.nix b/third_party/nixpkgs/pkgs/development/tools/build-managers/gradle/default.nix
index 4c5d9a5df8..b27d75b780 100644
--- a/third_party/nixpkgs/pkgs/development/tools/build-managers/gradle/default.nix
+++ b/third_party/nixpkgs/pkgs/development/tools/build-managers/gradle/default.nix
@@ -33,8 +33,8 @@ rec {
echo ${stdenv.cc.cc} > $out/nix-support/manual-runtime-dependencies
'';
- nativeBuildInputs = [ makeWrapper ];
- buildInputs = [ unzip java ];
+ nativeBuildInputs = [ makeWrapper unzip ];
+ buildInputs = [ java ];
meta = {
description = "Enterprise-grade build system";
diff --git a/third_party/nixpkgs/pkgs/development/tools/build-managers/meson/allow-dirs-outside-of-prefix.patch b/third_party/nixpkgs/pkgs/development/tools/build-managers/meson/allow-dirs-outside-of-prefix.patch
index e5ac95d0b9..4eb292a2e5 100644
--- a/third_party/nixpkgs/pkgs/development/tools/build-managers/meson/allow-dirs-outside-of-prefix.patch
+++ b/third_party/nixpkgs/pkgs/development/tools/build-managers/meson/allow-dirs-outside-of-prefix.patch
@@ -1,14 +1,14 @@
--- a/mesonbuild/coredata.py
+++ b/mesonbuild/coredata.py
-@@ -491,7 +491,6 @@ class CoreData:
+@@ -506,7 +506,6 @@ class CoreData:
return value
- if option.endswith('dir') and value.is_absolute() and \
- option not in builtin_dir_noprefix_options:
+ if option.name.endswith('dir') and value.is_absolute() and \
+ option not in BULITIN_DIR_NOPREFIX_OPTIONS:
- # Value must be a subdir of the prefix
# commonpath will always return a path in the native format, so we
# must use pathlib.PurePath to do the same conversion before
# comparing.
-@@ -503,7 +502,7 @@ class CoreData:
+@@ -518,7 +517,7 @@ class CoreData:
try:
value = value.relative_to(prefix)
except ValueError:
diff --git a/third_party/nixpkgs/pkgs/development/tools/build-managers/meson/default.nix b/third_party/nixpkgs/pkgs/development/tools/build-managers/meson/default.nix
index 7009aa4898..de82609a54 100644
--- a/third_party/nixpkgs/pkgs/development/tools/build-managers/meson/default.nix
+++ b/third_party/nixpkgs/pkgs/development/tools/build-managers/meson/default.nix
@@ -9,11 +9,11 @@
python3.pkgs.buildPythonApplication rec {
pname = "meson";
- version = "0.56.0";
+ version = "0.57.1";
src = python3.pkgs.fetchPypi {
inherit pname version;
- sha256 = "04vj250bwrzq7c0z1r96b0z0vgirvn0m367wm3ygqmfdy67x6799";
+ sha256 = "19n8alcpzv6npgp27iqljkmvdmr7s2c7zm8y997j1nlvpa1cgqbj";
};
patches = [
diff --git a/third_party/nixpkgs/pkgs/development/tools/build-managers/meson/more-env-vars.patch b/third_party/nixpkgs/pkgs/development/tools/build-managers/meson/more-env-vars.patch
index ada58fff6d..4b2606e2d6 100644
--- a/third_party/nixpkgs/pkgs/development/tools/build-managers/meson/more-env-vars.patch
+++ b/third_party/nixpkgs/pkgs/development/tools/build-managers/meson/more-env-vars.patch
@@ -1,8 +1,8 @@
-diff --git a/mesonbuild/envconfig.py b/mesonbuild/envconfig.py
-index 219b62ec8..e3ceaddbd 100644
---- a/mesonbuild/envconfig.py
-+++ b/mesonbuild/envconfig.py
-@@ -94,7 +94,7 @@ def get_env_var_pair(for_machine: MachineChoice,
+diff --git a/mesonbuild/environment.py b/mesonbuild/environment.py
+index 756dd8193..a5cc6ef8b 100644
+--- a/mesonbuild/environment.py
++++ b/mesonbuild/environment.py
+@@ -151,7 +151,7 @@ def _get_env_var(for_machine: MachineChoice, is_cross: bool, var_name: str) -> T
# compiling we fall back on the unprefixed host version. This
# allows native builds to never need to worry about the 'BUILD_*'
# ones.
diff --git a/third_party/nixpkgs/pkgs/development/tools/build-managers/msbuild/default.nix b/third_party/nixpkgs/pkgs/development/tools/build-managers/msbuild/default.nix
index ce08986b3e..82c5c88d17 100644
--- a/third_party/nixpkgs/pkgs/development/tools/build-managers/msbuild/default.nix
+++ b/third_party/nixpkgs/pkgs/development/tools/build-managers/msbuild/default.nix
@@ -23,13 +23,13 @@ stdenv.mkDerivation rec {
nativeBuildInputs = [
dotnet-sdk
mono
+ unzip
];
buildInputs = [
dotnetPackages.Nuget
glibcLocales
makeWrapper
- unzip
];
# https://aur.archlinux.org/cgit/aur.git/tree/PKGBUILD?h=msbuild
diff --git a/third_party/nixpkgs/pkgs/development/tools/build-managers/rocm-cmake/default.nix b/third_party/nixpkgs/pkgs/development/tools/build-managers/rocm-cmake/default.nix
index 5b9a456ce7..9ef0cfe10e 100644
--- a/third_party/nixpkgs/pkgs/development/tools/build-managers/rocm-cmake/default.nix
+++ b/third_party/nixpkgs/pkgs/development/tools/build-managers/rocm-cmake/default.nix
@@ -18,6 +18,6 @@ stdenv.mkDerivation rec {
homepage = "https://github.com/RadeonOpenCompute/rocm-cmake";
license = licenses.mit;
maintainers = with maintainers; [ danieldk ];
- platforms = platforms.linux;
+ platforms = platforms.unix;
};
}
diff --git a/third_party/nixpkgs/pkgs/development/tools/build-managers/sbt/default.nix b/third_party/nixpkgs/pkgs/development/tools/build-managers/sbt/default.nix
index 62d704fccd..5b3ce3ab16 100644
--- a/third_party/nixpkgs/pkgs/development/tools/build-managers/sbt/default.nix
+++ b/third_party/nixpkgs/pkgs/development/tools/build-managers/sbt/default.nix
@@ -11,8 +11,7 @@ stdenv.mkDerivation rec {
version = "1.4.9";
src = fetchurl {
- url =
- "https://github.com/sbt/sbt/releases/download/v${version}/sbt-${version}.tgz";
+ url = "https://github.com/sbt/sbt/releases/download/v${version}/sbt-${version}.tgz";
sha256 = "sha256-lUaBGfdkFJk2czCmCkuKYhHm6n+L3n1kfGexndj9224=";
};
diff --git a/third_party/nixpkgs/pkgs/development/tools/castxml/default.nix b/third_party/nixpkgs/pkgs/development/tools/castxml/default.nix
index ff47bd0e9f..f3d9b74181 100644
--- a/third_party/nixpkgs/pkgs/development/tools/castxml/default.nix
+++ b/third_party/nixpkgs/pkgs/development/tools/castxml/default.nix
@@ -1,52 +1,69 @@
-{ lib, stdenv, fetchFromGitHub
-, python3Packages
+{ lib
+, stdenv
+, fetchFromGitHub
+, clang-unwrapped
, cmake
-, llvmPackages
-, libffi, libxml2, zlib
-, withMan ? true
+, libclang
+, libffi
+, libxml2
+, llvm
+, sphinx
+, zlib
+, withManual ? true
+, withHTML ? true
}:
-stdenv.mkDerivation rec {
- pname = "CastXML";
- version = "0.3.4";
+stdenv.mkDerivation rec {
+ pname = "CastXML";
+ version = "0.4.3";
src = fetchFromGitHub {
- owner = pname;
- repo = pname;
- rev = "v${version}";
- sha256 = "0ypj67xrgj228myp7l1gsjw1ja97q68nmj98dsd33srmiayqraj4";
+ owner = pname;
+ repo = pname;
+ rev = "v${version}";
+ hash = "sha256-MschwCEkZrZmNgr8a1ocdukjXzHbXl2gmkPmygJaA6k=";
};
- nativeBuildInputs = [ cmake ] ++ lib.optionals withMan [ python3Packages.sphinx ];
-
- clangVersion = lib.getVersion llvmPackages.clang;
+ nativeBuildInputs = [
+ cmake
+ llvm
+ ] ++ lib.optionals (withManual || withHTML) [
+ sphinx
+ ];
cmakeFlags = [
- "-DCLANG_RESOURCE_DIR=${llvmPackages.clang-unwrapped}/lib/clang/${clangVersion}/"
- "-DSPHINX_MAN=${if withMan then "ON" else "OFF"}"
+ "-DCLANG_RESOURCE_DIR=${clang-unwrapped}/lib/clang/${lib.getVersion clang-unwrapped}/"
+ "-DSPHINX_HTML=${if withHTML then "ON" else "OFF"}"
+ "-DSPHINX_MAN=${if withManual then "ON" else "OFF"}"
];
buildInputs = [
- llvmPackages.clang-unwrapped
- llvmPackages.llvm
- libffi libxml2 zlib
+ clang-unwrapped
+ libffi
+ libxml2
+ zlib
];
- propagatedBuildInputs = [ llvmPackages.libclang ];
+ propagatedBuildInputs = [
+ libclang
+ ];
# 97% tests passed, 97 tests failed out of 2881
# mostly because it checks command line and nix append -isystem and all
doCheck = false;
+ # -E exclude 4 tests based on names
+ # see https://github.com/CastXML/CastXML/issues/90
checkPhase = ''
- # -E exclude 4 tests based on names
- # see https://github.com/CastXML/CastXML/issues/90
+ runHook preCheck
ctest -E 'cmd.cc-(gnu|msvc)-((c-src-c)|(src-cxx))-cmd'
+ runHook postCheck
'';
meta = with lib; {
homepage = "https://github.com/CastXML/CastXML";
+ description = "C-family Abstract Syntax Tree XML Output";
license = licenses.asl20;
- description = "Abstract syntax tree XML output tool";
+ maintainers = with maintainers; [ AndersonTorres ];
platforms = platforms.unix;
};
}
diff --git a/third_party/nixpkgs/pkgs/development/tools/continuous-integration/gocd-agent/default.nix b/third_party/nixpkgs/pkgs/development/tools/continuous-integration/gocd-agent/default.nix
index 6e58b74654..3041a03173 100644
--- a/third_party/nixpkgs/pkgs/development/tools/continuous-integration/gocd-agent/default.nix
+++ b/third_party/nixpkgs/pkgs/development/tools/continuous-integration/gocd-agent/default.nix
@@ -17,7 +17,7 @@ stdenv.mkDerivation rec {
maintainers = with maintainers; [ grahamc swarren83 ];
};
- buildInputs = [ unzip ];
+ nativeBuildInputs = [ unzip ];
buildCommand = "
unzip $src -d $out
diff --git a/third_party/nixpkgs/pkgs/development/tools/continuous-integration/gocd-server/default.nix b/third_party/nixpkgs/pkgs/development/tools/continuous-integration/gocd-server/default.nix
index 90eb61dbff..4b3f61cf4b 100644
--- a/third_party/nixpkgs/pkgs/development/tools/continuous-integration/gocd-server/default.nix
+++ b/third_party/nixpkgs/pkgs/development/tools/continuous-integration/gocd-server/default.nix
@@ -18,7 +18,7 @@ stdenv.mkDerivation rec {
maintainers = with maintainers; [ grahamc swarren83 ];
};
- buildInputs = [ unzip ];
+ nativeBuildInputs = [ unzip ];
buildCommand = "
unzip $src -d $out
diff --git a/third_party/nixpkgs/pkgs/development/tools/coursier/default.nix b/third_party/nixpkgs/pkgs/development/tools/coursier/default.nix
index daa6d08cd4..bb5f8a4c9c 100644
--- a/third_party/nixpkgs/pkgs/development/tools/coursier/default.nix
+++ b/third_party/nixpkgs/pkgs/development/tools/coursier/default.nix
@@ -2,7 +2,7 @@
, coreutils, git, gnused, nix, nixfmt }:
let
- version = "2.0.13";
+ version = "2.0.14";
zshCompletion = fetchurl {
url =
@@ -19,7 +19,7 @@ in stdenv.mkDerivation rec {
src = fetchurl {
url =
"https://github.com/coursier/coursier/releases/download/v${version}/coursier";
- sha256 = "sha256-3FdvoSH/6MZK6KEImXsFteaCoTLO0unK6dp7t+snVt4=";
+ sha256 = "sha256-mGVOg+I42O3VYj7RStEOfZajS9RZo9hLWKap6UdjJCE=";
};
nativeBuildInputs = [ makeWrapper ];
diff --git a/third_party/nixpkgs/pkgs/development/tools/database/sqldeveloper/default.nix b/third_party/nixpkgs/pkgs/development/tools/database/sqldeveloper/default.nix
index 8fb7677f58..2e361076ae 100644
--- a/third_party/nixpkgs/pkgs/development/tools/database/sqldeveloper/default.nix
+++ b/third_party/nixpkgs/pkgs/development/tools/database/sqldeveloper/default.nix
@@ -49,8 +49,7 @@ in
sha256 = "1h53gl41ydr7kim6q9ckg3xyhb0rhmwj7jnis0xz6vms52b3h59k";
};
- nativeBuildInputs = [ makeWrapper ];
- buildInputs = [ unzip ];
+ nativeBuildInputs = [ makeWrapper unzip ];
unpackCmd = "unzip $curSrc";
diff --git a/third_party/nixpkgs/pkgs/development/tools/dtools/default.nix b/third_party/nixpkgs/pkgs/development/tools/dtools/default.nix
index 1c1604db65..7a994df51b 100644
--- a/third_party/nixpkgs/pkgs/development/tools/dtools/default.nix
+++ b/third_party/nixpkgs/pkgs/development/tools/dtools/default.nix
@@ -1,22 +1,22 @@
-{stdenv, lib, fetchFromGitHub, dmd, curl}:
+{stdenv, lib, fetchFromGitHub, ldc, curl}:
stdenv.mkDerivation rec {
pname = "dtools";
- version = "2.085.1";
+ version = "2.095.1";
srcs = [
(fetchFromGitHub {
owner = "dlang";
repo = "dmd";
rev = "v${version}";
- sha256 = "0ccidfcawrcwdpfjwjiln5xwr4ffp8i2hwx52p8zn3xmc5yxm660";
+ sha256 = "sha256:0faca1y42a1h16aml4lb7z118mh9k9fjx3xlw3ki5f1h3ln91xhk";
name = "dmd";
})
(fetchFromGitHub {
owner = "dlang";
repo = "tools";
rev = "v${version}";
- sha256 = "1x85w4k2zqgv2bjbvhschxdc6kq8ygp89h499cy8rfqm6q23g0ws";
+ sha256 = "sha256:0rdfk3mh3fjrb0h8pr8skwlq6ac9hdl1fkrkdl7n1fa2806b740b";
name = "dtools";
})
];
@@ -27,14 +27,13 @@ stdenv.mkDerivation rec {
mv dmd dtools
cd dtools
- substituteInPlace posix.mak --replace "\$(DMD) \$(DFLAGS) -unittest -main -run rdmd.d" ""
'';
- nativeBuildInputs = [ dmd ];
+ nativeBuildInputs = [ ldc ];
buildInputs = [ curl ];
makeCmd = ''
- make -f posix.mak DMD_DIR=dmd DMD=${dmd.out}/bin/dmd CC=${stdenv.cc}/bin/cc
+ make -f posix.mak all DMD_DIR=dmd DMD=${ldc.out}/bin/ldmd2 CC=${stdenv.cc}/bin/cc
'';
buildPhase = ''
diff --git a/third_party/nixpkgs/pkgs/development/tools/eclipse-mat/default.nix b/third_party/nixpkgs/pkgs/development/tools/eclipse-mat/default.nix
index 4f475440b0..608c721caf 100644
--- a/third_party/nixpkgs/pkgs/development/tools/eclipse-mat/default.nix
+++ b/third_party/nixpkgs/pkgs/development/tools/eclipse-mat/default.nix
@@ -79,6 +79,7 @@ stdenv.mkDerivation rec {
mv $out/share/pixmaps/eclipse64.png $out/share/pixmaps/eclipse.png
'';
+ nativeBuildInputs = [ unzip ];
buildInputs = [
fontconfig
freetype
@@ -91,7 +92,6 @@ stdenv.mkDerivation rec {
libXtst
makeWrapper
zlib
- unzip
shared-mime-info
webkitgtk
];
diff --git a/third_party/nixpkgs/pkgs/development/tools/electron/generic.nix b/third_party/nixpkgs/pkgs/development/tools/electron/generic.nix
index c60ab738aa..7d4593dee3 100644
--- a/third_party/nixpkgs/pkgs/development/tools/electron/generic.nix
+++ b/third_party/nixpkgs/pkgs/development/tools/electron/generic.nix
@@ -97,7 +97,7 @@ let
};
darwin = {
- buildInputs = [ unzip ];
+ nativeBuildInputs = [ unzip ];
buildCommand = ''
mkdir -p $out/Applications
diff --git a/third_party/nixpkgs/pkgs/development/tools/galen/default.nix b/third_party/nixpkgs/pkgs/development/tools/galen/default.nix
index 00831c0569..df7e58bde4 100644
--- a/third_party/nixpkgs/pkgs/development/tools/galen/default.nix
+++ b/third_party/nixpkgs/pkgs/development/tools/galen/default.nix
@@ -11,7 +11,7 @@ stdenv.mkDerivation rec {
sha256 = "13dq8cf0yy24vym6z7p8hb0mybgpcl4j5crsaq8a6pjfxz6d17mq";
};
- buildInputs = [ unzip ];
+ nativeBuildInputs = [ unzip ];
buildPhase = ''
mkdir -p $out/bin
diff --git a/third_party/nixpkgs/pkgs/development/tools/ginkgo/default.nix b/third_party/nixpkgs/pkgs/development/tools/ginkgo/default.nix
index fbbb773519..437013e1af 100644
--- a/third_party/nixpkgs/pkgs/development/tools/ginkgo/default.nix
+++ b/third_party/nixpkgs/pkgs/development/tools/ginkgo/default.nix
@@ -2,15 +2,15 @@
buildGoModule rec {
pname = "ginkgo";
- version = "1.15.1";
+ version = "1.15.2";
src = fetchFromGitHub {
owner = "onsi";
repo = "ginkgo";
rev = "v${version}";
- sha256 = "sha256-w2eP8mDGHHZGYQUU7lOe7gp3tdr9VO/NP5fFBWOWt/A=";
+ sha256 = "sha256-lZ2PIfZSvBxVIAEpRgsLvTWPFRsh2ZpXkame6pk0Cio=";
};
- vendorSha256 = "sha256-fB9/cf2VOMXWLHnnHJZDmOutIUvPleWBGCirJrypCts=";
+ vendorSha256 = "sha256:1nqam6y2dar8320yb5fg9chsvswq8fb1rrvr5kbcaf4mzmqpy7vw";
doCheck = false;
meta = with lib; {
diff --git a/third_party/nixpkgs/pkgs/development/tools/k6/default.nix b/third_party/nixpkgs/pkgs/development/tools/k6/default.nix
index 07446c21b5..b311ce4dea 100644
--- a/third_party/nixpkgs/pkgs/development/tools/k6/default.nix
+++ b/third_party/nixpkgs/pkgs/development/tools/k6/default.nix
@@ -2,7 +2,7 @@
buildGoPackage rec {
pname = "k6";
- version = "0.31.0";
+ version = "0.31.1";
goPackagePath = "github.com/loadimpact/k6";
@@ -10,7 +10,7 @@ buildGoPackage rec {
owner = "loadimpact";
repo = pname;
rev = "v${version}";
- sha256 = "sha256-UAVbYN4uDUMqUspycEZ2VGHzxFD7IlIW6m91U8ccZXw=";
+ sha256 = "sha256-wngOG0uSNoUU+88oShDpCgPpzuevzJxcwzSzWS3PzAw=";
};
subPackages = [ "./" ];
diff --git a/third_party/nixpkgs/pkgs/development/tools/kubie/default.nix b/third_party/nixpkgs/pkgs/development/tools/kubie/default.nix
index 8a199f9191..7f8a193551 100644
--- a/third_party/nixpkgs/pkgs/development/tools/kubie/default.nix
+++ b/third_party/nixpkgs/pkgs/development/tools/kubie/default.nix
@@ -2,16 +2,16 @@
rustPlatform.buildRustPackage rec {
pname = "kubie";
- version = "0.11.1";
+ version = "0.12.1";
src = fetchFromGitHub {
rev = "v${version}";
owner = "sbstp";
repo = "kubie";
- sha256 = "0q21qd9fhchggby18gzyvds517n9vq7b1rr0gmzik4036ykg1lm2";
+ sha256 = "sha256-y4/azFr2fngmUxQw3c2xAhAppYHeD6Bz7IvZ6GTdsEQ=";
};
- cargoSha256 = "0dp4prv8c2a6mxl7wskpc65qlfjphdxshb4q2bswqa5i21h8r534";
+ cargoSha256 = "sha256-/Vg3qojBWN2tp8QaKmHrzy3cDWlkT6067Wprcjlu31U=";
nativeBuildInputs = [ installShellFiles ];
diff --git a/third_party/nixpkgs/pkgs/development/tools/lazygit/default.nix b/third_party/nixpkgs/pkgs/development/tools/lazygit/default.nix
index f741ca3382..1d8e411530 100644
--- a/third_party/nixpkgs/pkgs/development/tools/lazygit/default.nix
+++ b/third_party/nixpkgs/pkgs/development/tools/lazygit/default.nix
@@ -2,13 +2,13 @@
buildGoModule rec {
pname = "lazygit";
- version = "0.26";
+ version = "0.26.1";
src = fetchFromGitHub {
owner = "jesseduffield";
repo = pname;
rev = "v${version}";
- sha256 = "sha256-9CiXbMYb+EoxBrVFiPuWAlRJvYAq8hpxVDFcymk7Ud0=";
+ sha256 = "sha256-naTO5cckUfs32z7bm5jGGEuo8db11fnTnQdUDKK2W/I=";
};
vendorSha256 = null;
diff --git a/third_party/nixpkgs/pkgs/development/tools/literate-programming/Literate/default.nix b/third_party/nixpkgs/pkgs/development/tools/literate-programming/Literate/default.nix
index 87213b911a..88b2f63fd5 100644
--- a/third_party/nixpkgs/pkgs/development/tools/literate-programming/Literate/default.nix
+++ b/third_party/nixpkgs/pkgs/development/tools/literate-programming/Literate/default.nix
@@ -1,16 +1,16 @@
-{ lib, stdenv, fetchgit, dmd, dub }:
+{ lib, stdenv, fetchgit, ldc, dub }:
stdenv.mkDerivation {
pname = "Literate";
- version = "unstable-2020-09-02";
+ version = "unstable-2021-01-22";
src = fetchgit {
url = "https://github.com/zyedidia/Literate.git";
- rev = "533991cca6ec7a608a778396d32d51b35182d944";
- sha256 = "09h1as01z0fw0bj0kf1g9nlhvinya7sqq2x8qb6zmhvqqm6v4n49";
+ rev = "7004dffec0cff3068828514eca72172274fd3f7d";
+ sha256 = "0x4xgrdskybaa7ssv81grmwyc1k167v3nwj320jvp5l59xxlbcvs";
};
- buildInputs = [ dmd dub ];
+ buildInputs = [ ldc dub ];
installPhase = "install -D bin/lit $out/bin/lit";
diff --git a/third_party/nixpkgs/pkgs/development/tools/misc/autoconf-archive/default.nix b/third_party/nixpkgs/pkgs/development/tools/misc/autoconf-archive/default.nix
index e0d558b188..b53adfd0be 100644
--- a/third_party/nixpkgs/pkgs/development/tools/misc/autoconf-archive/default.nix
+++ b/third_party/nixpkgs/pkgs/development/tools/misc/autoconf-archive/default.nix
@@ -2,11 +2,11 @@
stdenv.mkDerivation rec {
pname = "autoconf-archive";
- version = "2019.01.06";
+ version = "2021.02.19";
src = fetchurl {
url = "mirror://gnu/autoconf-archive/autoconf-archive-${version}.tar.xz";
- sha256 = "0gqya7nf4j5k98dkky0c3bnr0paciya91vkqazg7knlq621mq68p";
+ sha256 = "sha256-6KbrnSjdy6j/7z+iEWUyOem/I5q6agGmt8/Hzq7GnL0=";
};
buildInputs = [ xz ];
diff --git a/third_party/nixpkgs/pkgs/development/tools/misc/cproto/default.nix b/third_party/nixpkgs/pkgs/development/tools/misc/cproto/default.nix
index 5ee1a64f2c..84890f1662 100644
--- a/third_party/nixpkgs/pkgs/development/tools/misc/cproto/default.nix
+++ b/third_party/nixpkgs/pkgs/development/tools/misc/cproto/default.nix
@@ -2,7 +2,7 @@
stdenv.mkDerivation rec {
pname = "cproto";
- version = "4.7q";
+ version = "4.7r";
src = fetchurl {
urls = [
@@ -10,7 +10,7 @@ stdenv.mkDerivation rec {
# No version listings and apparently no versioned tarball over http(s).
"ftp://ftp.invisible-island.net/cproto/cproto-${version}.tgz"
];
- sha256 = "138n5j6lkanbbdcs63irzxny4nfgp0zk66z621xjbnybf920svpk";
+ sha256 = "sha256-bgRg2yVZXHobUz8AUaV4ZKBkp2KjP+2oXbDXmPTUX8U=";
};
# patch made by Joe Khoobyar copied from gentoo bugs
diff --git a/third_party/nixpkgs/pkgs/development/tools/misc/cwebbin/default.nix b/third_party/nixpkgs/pkgs/development/tools/misc/cwebbin/default.nix
index 3ab8800f3c..055a24f3fe 100644
--- a/third_party/nixpkgs/pkgs/development/tools/misc/cwebbin/default.nix
+++ b/third_party/nixpkgs/pkgs/development/tools/misc/cwebbin/default.nix
@@ -16,7 +16,15 @@ stdenv.mkDerivation rec {
sha256 = "1hdzxfzaibnjxjzgp6d2zay8nsarnfy9hfq55hz1bxzzl23n35aj";
};
- buildInputs = [ tie ];
+ # Remove references to __DATE__ and __TIME__
+ postPatch = ''
+ substituteInPlace wmerg-patch.ch --replace ' ("__DATE__", "__TIME__")' ""
+ substituteInPlace ctang-patch.ch --replace ' ("__DATE__", "__TIME__")' ""
+ substituteInPlace ctangle.cxx --replace ' ("__DATE__", "__TIME__")' ""
+ substituteInPlace cweav-patch.ch --replace ' ("__DATE__", "__TIME__")' ""
+ '';
+
+ nativeBuildInputs = [ tie ];
makeFlags = [
"MACROSDIR=$(out)/share/texmf/tex/generic/cweb"
@@ -27,7 +35,7 @@ stdenv.mkDerivation rec {
"CP=cp"
"RM=rm"
"PDFTEX=echo"
- "CC=c++"
+ "CC=${stdenv.cc.targetPrefix}c++"
];
buildPhase = ''
diff --git a/third_party/nixpkgs/pkgs/development/tools/misc/dialog/default.nix b/third_party/nixpkgs/pkgs/development/tools/misc/dialog/default.nix
index ac5fb4118b..dca8d9666a 100644
--- a/third_party/nixpkgs/pkgs/development/tools/misc/dialog/default.nix
+++ b/third_party/nixpkgs/pkgs/development/tools/misc/dialog/default.nix
@@ -12,11 +12,11 @@ assert unicodeSupport -> ncurses.unicode && ncurses != null;
stdenv.mkDerivation rec {
pname = "dialog";
- version = "1.3-20210117";
+ version = "1.3-20210306";
src = fetchurl {
url = "ftp://ftp.invisible-island.net/dialog/${pname}-${version}.tgz";
- sha256 = "PB7Qj0S89vFZ8qpv3nZduU6Jl7Pu+0nYtMhmkWk8Q+E=";
+ hash = "sha256-pz57YHtjX2PAICuzMTEG5wD5H+Sp9NJspwA/brK5yw8=";
};
buildInputs = [ ncurses ];
diff --git a/third_party/nixpkgs/pkgs/development/tools/misc/editorconfig-checker/default.nix b/third_party/nixpkgs/pkgs/development/tools/misc/editorconfig-checker/default.nix
index 82b2d2af7c..b934160949 100644
--- a/third_party/nixpkgs/pkgs/development/tools/misc/editorconfig-checker/default.nix
+++ b/third_party/nixpkgs/pkgs/development/tools/misc/editorconfig-checker/default.nix
@@ -2,16 +2,16 @@
buildGoModule rec {
pname = "editorconfig-checker";
- version = "2.3.3";
+ version = "2.3.4";
src = fetchFromGitHub {
owner = "editorconfig-checker";
repo = "editorconfig-checker";
rev = version;
- sha256 = "sha256-u3gTzsAoV4fgQjsnONIIGFE/Y02bKbCTg30O9FTI2/w=";
+ sha256 = "sha256-aTHY9RFFkpTQKv+Erczu5joqvE7L05Ev2GOSiXNxLj8=";
};
- vendorSha256 = "sha256-0Eznh9xXuYf4mVZipyE99fKwkGYeSAorhBLamupGkvw=";
+ vendorSha256 = "sha256-y+wQ6XzX4vmKzesUcF9jgfrKPj5EsCuw/aKizVX/ogI=";
doCheck = false;
diff --git a/third_party/nixpkgs/pkgs/development/tools/misc/jscoverage/default.nix b/third_party/nixpkgs/pkgs/development/tools/misc/jscoverage/default.nix
index a978c31c34..042d085c1e 100644
--- a/third_party/nixpkgs/pkgs/development/tools/misc/jscoverage/default.nix
+++ b/third_party/nixpkgs/pkgs/development/tools/misc/jscoverage/default.nix
@@ -12,7 +12,8 @@ stdenv.mkDerivation rec {
./jsfalse_to_null.patch
];
- buildInputs = [ autoconf makedepend perl python unzip zip ];
+ nativeBuildInputs = [ unzip ];
+ buildInputs = [ autoconf makedepend perl python zip ];
# It works without MOZ_FIX_LINK_PATHS, circumventing an impurity
# issue. Maybe we could kick js/ (spidermonkey) completely and
diff --git a/third_party/nixpkgs/pkgs/development/tools/misc/premake/3.nix b/third_party/nixpkgs/pkgs/development/tools/misc/premake/3.nix
index 9176842d75..d72cca0e78 100644
--- a/third_party/nixpkgs/pkgs/development/tools/misc/premake/3.nix
+++ b/third_party/nixpkgs/pkgs/development/tools/misc/premake/3.nix
@@ -12,7 +12,7 @@ stdenv.mkDerivation {
sha256 = "b59841a519e75d5b6566848a2c5be2f91455bf0cc6ae4d688fcbd4c40db934d5";
};
- buildInputs = [unzip];
+ nativeBuildInputs = [ unzip ];
installPhase = ''
install -Dm755 bin/premake $out/bin/premake
diff --git a/third_party/nixpkgs/pkgs/development/tools/misc/saleae-logic/default.nix b/third_party/nixpkgs/pkgs/development/tools/misc/saleae-logic/default.nix
index c26e834ee0..5943b57d80 100644
--- a/third_party/nixpkgs/pkgs/development/tools/misc/saleae-logic/default.nix
+++ b/third_party/nixpkgs/pkgs/development/tools/misc/saleae-logic/default.nix
@@ -44,7 +44,7 @@ stdenv.mkDerivation rec {
categories = "Development";
};
- buildInputs = [ unzip ];
+ nativeBuildInputs = [ unzip ];
installPhase = ''
# Copy prebuilt app to $out
diff --git a/third_party/nixpkgs/pkgs/development/tools/ocaml/opam/1.2.2.nix b/third_party/nixpkgs/pkgs/development/tools/ocaml/opam/1.2.2.nix
index 610093af19..60804684cc 100644
--- a/third_party/nixpkgs/pkgs/development/tools/ocaml/opam/1.2.2.nix
+++ b/third_party/nixpkgs/pkgs/development/tools/ocaml/opam/1.2.2.nix
@@ -47,8 +47,8 @@ in stdenv.mkDerivation {
pname = "opam";
version = "1.2.2";
- nativeBuildInputs = [ makeWrapper ];
- buildInputs = [ unzip curl ncurses ocaml ];
+ nativeBuildInputs = [ makeWrapper unzip ];
+ buildInputs = [ curl ncurses ocaml ];
src = srcs.opam;
diff --git a/third_party/nixpkgs/pkgs/development/tools/ocaml/opam/default.nix b/third_party/nixpkgs/pkgs/development/tools/ocaml/opam/default.nix
index 30bc089ee0..bd33d4cc1d 100644
--- a/third_party/nixpkgs/pkgs/development/tools/ocaml/opam/default.nix
+++ b/third_party/nixpkgs/pkgs/development/tools/ocaml/opam/default.nix
@@ -63,8 +63,8 @@ in stdenv.mkDerivation {
pname = "opam";
version = "2.0.8";
- nativeBuildInputs = [ makeWrapper ];
- buildInputs = [ unzip curl ncurses ocaml getconf ] ++ lib.optional stdenv.isLinux bubblewrap;
+ nativeBuildInputs = [ makeWrapper unzip ];
+ buildInputs = [ curl ncurses ocaml getconf ] ++ lib.optional stdenv.isLinux bubblewrap;
src = srcs.opam;
diff --git a/third_party/nixpkgs/pkgs/development/tools/ocaml/opam/opam.nix.pl b/third_party/nixpkgs/pkgs/development/tools/ocaml/opam/opam.nix.pl
index b94aa7dd9a..bfaea0c7ef 100755
--- a/third_party/nixpkgs/pkgs/development/tools/ocaml/opam/opam.nix.pl
+++ b/third_party/nixpkgs/pkgs/development/tools/ocaml/opam/opam.nix.pl
@@ -68,7 +68,8 @@ in stdenv.mkDerivation {
pname = "opam";
version = "$OPAM_RELEASE";
- buildInputs = [ unzip curl ncurses ocaml makeWrapper getconf ] ++ lib.optional stdenv.isLinux bubblewrap;
+ nativeBuildInputs = [ unzip ];
+ buildInputs = [ curl ncurses ocaml makeWrapper getconf ] ++ lib.optional stdenv.isLinux bubblewrap;
src = srcs.opam;
diff --git a/third_party/nixpkgs/pkgs/development/tools/omnisharp-roslyn/default.nix b/third_party/nixpkgs/pkgs/development/tools/omnisharp-roslyn/default.nix
index ac5ab022ef..5ed83c5411 100644
--- a/third_party/nixpkgs/pkgs/development/tools/omnisharp-roslyn/default.nix
+++ b/third_party/nixpkgs/pkgs/development/tools/omnisharp-roslyn/default.nix
@@ -1,7 +1,10 @@
{ lib, stdenv
, fetchurl
-, mono5
+, mono6
+, msbuild
+, dotnet-sdk
, makeWrapper
+, dotnetPackages
}:
stdenv.mkDerivation rec {
@@ -14,7 +17,7 @@ stdenv.mkDerivation rec {
sha256 = "0pknphydf194n7rjyax4mh8n7j8679j0jflw63gfgh37daxry0r2";
};
- nativeBuildInputs = [ makeWrapper ];
+ nativeBuildInputs = [ makeWrapper dotnet-sdk dotnetPackages.Nuget ];
preUnpack = ''
mkdir src
@@ -26,8 +29,13 @@ stdenv.mkDerivation rec {
mkdir -p $out/bin
cd ..
cp -r src $out/
- ls -al $out/src
- makeWrapper ${mono5}/bin/mono $out/bin/omnisharp \
+ rm -r $out/src/.msbuild
+ cp -r ${msbuild}/lib/mono/msbuild $out/src/.msbuild
+
+ chmod -R u+w $out/src
+ mv $out/src/.msbuild/Current/{bin,Bin}
+
+ makeWrapper ${mono6}/bin/mono $out/bin/omnisharp \
--add-flags "$out/src/OmniSharp.exe"
'';
@@ -36,7 +44,7 @@ stdenv.mkDerivation rec {
homepage = "https://github.com/OmniSharp/omnisharp-roslyn";
platforms = platforms.linux;
license = licenses.mit;
- maintainers = with maintainers; [ tesq0 ];
+ maintainers = with maintainers; [ tesq0 ericdallo ];
};
}
diff --git a/third_party/nixpkgs/pkgs/development/tools/operator-sdk/default.nix b/third_party/nixpkgs/pkgs/development/tools/operator-sdk/default.nix
index 764041b6ad..0df831b579 100644
--- a/third_party/nixpkgs/pkgs/development/tools/operator-sdk/default.nix
+++ b/third_party/nixpkgs/pkgs/development/tools/operator-sdk/default.nix
@@ -2,16 +2,16 @@
buildGoModule rec {
pname = "operator-sdk";
- version = "1.4.2";
+ version = "1.5.0";
src = fetchFromGitHub {
owner = "operator-framework";
repo = pname;
rev = "v${version}";
- sha256 = "sha256-wGlxi9X8RrAtvevDfufY1t3en6QgHy5XoSh0K/M/ve4=";
+ sha256 = "sha256-95fTfUKoknGBIoc/ALd5w9X89Tl9DBxapl9EgWENsa0=";
};
- vendorSha256 = "sha256-GRw0u6zox2gseQhrx7n0M3WVu4+yCKZ7D/QHVcBRb30=";
+ vendorSha256 = "sha256-Sp0ml5tnsbnuyk3NkA80dmFj6IOiL/NeYYbEbr7EPRY=";
doCheck = false;
diff --git a/third_party/nixpkgs/pkgs/development/tools/parsing/re2c/default.nix b/third_party/nixpkgs/pkgs/development/tools/parsing/re2c/default.nix
index 665609fe90..ebba9903a4 100644
--- a/third_party/nixpkgs/pkgs/development/tools/parsing/re2c/default.nix
+++ b/third_party/nixpkgs/pkgs/development/tools/parsing/re2c/default.nix
@@ -12,6 +12,30 @@ stdenv.mkDerivation rec {
};
patches = [
+ (fetchpatch {
+ name = "CVE-2018-21232-part1.patch";
+ url = "https://github.com/skvadrik/re2c/commit/fd634998f813340768c333cdad638498602856e5.patch";
+ sha256 = "1blyg5lyhqd4ymisih65xl0g36ig71ijia4skkkd59rdvj78aiw6";
+ })
+
+ (fetchpatch {
+ name = "CVE-2018-21232-part2.patch";
+ url = "https://github.com/skvadrik/re2c/commit/7b5643476bd99c994c4f51b8143f942982d85521.patch";
+ sha256 = "0rhmgqrinpk49r9x75ygrs14lz72aw5ad5kr6qp9bdyl8gs082qp";
+ })
+
+ (fetchpatch {
+ name = "CVE-2018-21232-part3.patch";
+ url = "https://github.com/skvadrik/re2c/commit/4d9c809355b574f2a58eac119f5e076c48e4d1e2.patch";
+ sha256 = "0k86wg9icw1gkqpf7rq2w6xsq4caxw3rc0zfxf39liwa35027rai";
+ })
+
+ (fetchpatch {
+ name = "CVE-2018-21232-part4.patch";
+ url = "https://github.com/skvadrik/re2c/commit/89be91f3df00657261870adbc590209fdb2bc405.patch";
+ sha256 = "1aygy9va7jwby93chlskwg7z90fn07x5hym0gziwlkx8k900p3a3";
+ })
+
(fetchpatch {
name = "CVE-2020-11958.patch";
url = "https://github.com/skvadrik/re2c/commit/c4603ba5ce229db83a2a4fb93e6d4b4e3ec3776a.patch";
diff --git a/third_party/nixpkgs/pkgs/development/tools/phantomjs/default.nix b/third_party/nixpkgs/pkgs/development/tools/phantomjs/default.nix
index 66cdb09cf1..4cd49b884c 100644
--- a/third_party/nixpkgs/pkgs/development/tools/phantomjs/default.nix
+++ b/third_party/nixpkgs/pkgs/development/tools/phantomjs/default.nix
@@ -29,7 +29,7 @@ stdenv.mkDerivation rec {
sha256 = "0j0aq8dgzmb210xdrh0v3d4nblskl3zsckl8bzf1a603wcx085cg";
};
- buildInputs = lib.optional stdenv.isDarwin unzip;
+ nativeBuildInputs = lib.optional stdenv.isDarwin unzip;
buildPhase = lib.optionalString (!stdenv.isDarwin) ''
patchelf \
diff --git a/third_party/nixpkgs/pkgs/development/tools/poetry2nix/poetry2nix/default.nix b/third_party/nixpkgs/pkgs/development/tools/poetry2nix/poetry2nix/default.nix
index 3b622c2055..62063ff099 100644
--- a/third_party/nixpkgs/pkgs/development/tools/poetry2nix/poetry2nix/default.nix
+++ b/third_party/nixpkgs/pkgs/development/tools/poetry2nix/poetry2nix/default.nix
@@ -5,7 +5,7 @@
}:
let
# Poetry2nix version
- version = "1.16.0";
+ version = "1.16.1";
inherit (poetryLib) isCompatible readTOML moduleName;
diff --git a/third_party/nixpkgs/pkgs/development/tools/poetry2nix/poetry2nix/overrides.nix b/third_party/nixpkgs/pkgs/development/tools/poetry2nix/poetry2nix/overrides.nix
index 2106708a28..aa58864fed 100644
--- a/third_party/nixpkgs/pkgs/development/tools/poetry2nix/poetry2nix/overrides.nix
+++ b/third_party/nixpkgs/pkgs/development/tools/poetry2nix/poetry2nix/overrides.nix
@@ -250,6 +250,15 @@ self: super:
}
);
+ fiona = super.fiona.overridePythonAttrs (
+ old: {
+ buildInputs = (old.buildInputs or [ ]) ++ [ pkgs.gdal_2 ];
+ nativeBuildInputs = [
+ pkgs.gdal_2 # for gdal-config
+ ];
+ }
+ );
+
gdal = super.gdal.overridePythonAttrs (
old: {
preBuild = (old.preBuild or "") + ''
@@ -266,6 +275,23 @@ self: super:
}
);
+ grpcio = super.grpcio.overridePythonAttrs (old: {
+ nativeBuildInputs = (old.nativeBuildInputs or [ ]) ++ [ self.cython pkgs.pkg-config ];
+ buildInputs = (old.buildInputs or [ ]) ++ [ pkgs.c-ares pkgs.openssl pkgs.zlib ];
+
+ outputs = [ "out" "dev" ];
+
+ GRPC_BUILD_WITH_BORING_SSL_ASM = "";
+ GRPC_PYTHON_BUILD_SYSTEM_OPENSSL = 1;
+ GRPC_PYTHON_BUILD_SYSTEM_ZLIB = 1;
+ GRPC_PYTHON_BUILD_SYSTEM_CARES = 1;
+ DISABLE_LIBC_COMPATIBILITY = 1;
+ });
+
+ grpcio-tools = super.grpcio-tools.overridePythonAttrs (old: {
+ outputs = [ "out" "dev" ];
+ });
+
h3 = super.h3.overridePythonAttrs (
old: {
preBuild = (old.preBuild or "") + ''
@@ -277,14 +303,34 @@ self: super:
h5py = super.h5py.overridePythonAttrs (
old:
- if old.format != "wheel" then rec {
- nativeBuildInputs = (old.nativeBuildInputs or [ ]) ++ [ pkgs.pkg-config ];
- buildInputs = (old.buildInputs or [ ]) ++ [ pkgs.hdf5 self.pkgconfig self.cython ];
- configure_flags = "--hdf5=${pkgs.hdf5}";
- postConfigure = ''
- ${self.python.executable} setup.py configure ${configure_flags}
- '';
- } else old
+ if old.format != "wheel" then
+ (
+ let
+ mpi = pkgs.hdf5.mpi;
+ mpiSupport = pkgs.hdf5.mpiSupport;
+ in
+ {
+ nativeBuildInputs = (old.nativeBuildInputs or [ ]) ++ [ pkgs.pkg-config ];
+ buildInputs =
+ (old.buildInputs or [ ])
+ ++ [ pkgs.hdf5 self.pkg-config self.cython ]
+ ++ lib.optional mpiSupport mpi
+ ;
+ propagatedBuildInputs =
+ old.propagatedBuildInputs
+ ++ lib.optionals mpiSupport [ self.mpi4py self.openssh ]
+ ;
+ preBuild = if mpiSupport then "export CC=${mpi}/bin/mpicc" else "";
+ HDF5_DIR = "${pkgs.hdf5}";
+ HDF5_MPI = if mpiSupport then "ON" else "OFF";
+ # avoid strict pinning of numpy
+ postPatch = ''
+ substituteInPlace setup.py \
+ --replace "numpy ==" "numpy >="
+ '';
+ pythonImportsCheck = [ "h5py" ];
+ }
+ ) else old
);
horovod = super.horovod.overridePythonAttrs (
@@ -407,7 +453,7 @@ self: super:
);
jsonslicer = super.jsonslicer.overridePythonAttrs (old: {
- nativeBuildInputs = (old.nativeBuildInputs or [ ]) ++ [ pkgs.pkgconfig ];
+ nativeBuildInputs = (old.nativeBuildInputs or [ ]) ++ [ pkgs.pkg-config ];
buildInputs = (old.buildInputs or [ ]) ++ [ pkgs.yajl ];
});
@@ -618,6 +664,12 @@ self: super:
}
);
+ munch = super.munch.overridePythonAttrs (
+ old: {
+ buildInputs = (old.buildInputs or [ ]) ++ [ self.pbr ];
+ }
+ );
+
mysqlclient = super.mysqlclient.overridePythonAttrs (
old: {
buildInputs = (old.buildInputs or [ ]) ++ [ pkgs.libmysqlclient ];
@@ -939,6 +991,13 @@ self: super:
}
);
+ pygeos = super.pygeos.overridePythonAttrs (
+ old: {
+ buildInputs = (old.buildInputs or [ ]) ++ [ pkgs.geos ];
+ nativeBuildInputs = (old.nativeBuildInputs or [ ]) ++ [ pkgs.geos ];
+ }
+ );
+
pygobject = super.pygobject.overridePythonAttrs (
old: {
nativeBuildInputs = (old.nativeBuildInputs or [ ]) ++ [ pkgs.pkg-config ];
@@ -1226,6 +1285,15 @@ self: super:
propagatedBuildInputs = (old.propagatedBuildInputs or [ ]) ++ [ self.setuptools ];
});
+ rtree = super.rtree.overridePythonAttrs (old: {
+ propagatedNativeBuildInputs = (old.propagatedNativeBuildInputs or [ ]) ++ [ pkgs.libspatialindex ];
+ postPatch = ''
+ substituteInPlace rtree/finder.py --replace \
+ "find_library('spatialindex_c')" \
+ "'${pkgs.libspatialindex}/lib/libspatialindex_c${pkgs.stdenv.hostPlatform.extensions.sharedLibrary}'"
+ '';
+ });
+
scipy = super.scipy.overridePythonAttrs (
old:
if old.format != "wheel" then {
diff --git a/third_party/nixpkgs/pkgs/development/tools/react-native-debugger/default.nix b/third_party/nixpkgs/pkgs/development/tools/react-native-debugger/default.nix
index d1c86d9248..ae1ac3e39f 100644
--- a/third_party/nixpkgs/pkgs/development/tools/react-native-debugger/default.nix
+++ b/third_party/nixpkgs/pkgs/development/tools/react-native-debugger/default.nix
@@ -44,7 +44,7 @@ in stdenv.mkDerivation rec {
sha256 = "sha256-UXKObJKk9UUgWtm8U+nXWvIJUr4NLm2f//pGTHJISYA=";
};
- buildInputs = [ unzip ];
+ nativeBuildInputs = [ unzip ];
buildCommand = ''
shopt -s extglob
mkdir -p $out
diff --git a/third_party/nixpkgs/pkgs/development/tools/rshell/default.nix b/third_party/nixpkgs/pkgs/development/tools/rshell/default.nix
index 4e3e12a8ee..bcda3c02dd 100644
--- a/third_party/nixpkgs/pkgs/development/tools/rshell/default.nix
+++ b/third_party/nixpkgs/pkgs/development/tools/rshell/default.nix
@@ -2,11 +2,11 @@
buildPythonApplication rec {
pname = "rshell";
- version = "0.0.28";
+ version = "0.0.30";
src = fetchPypi {
inherit pname version;
- sha256 = "1crnlv0khplpibl9mj3flrgp877pnr1xz6hnnsi6hk3kfbc6p3nj";
+ sha256 = "d2002d40d735204037d6142a6c2d51beecc763c124faaf759cabf7acd945be95";
};
propagatedBuildInputs = [ pyserial pyudev ];
diff --git a/third_party/nixpkgs/pkgs/development/tools/rust/cargo-expand/default.nix b/third_party/nixpkgs/pkgs/development/tools/rust/cargo-expand/default.nix
index 7cb366c550..934976f738 100644
--- a/third_party/nixpkgs/pkgs/development/tools/rust/cargo-expand/default.nix
+++ b/third_party/nixpkgs/pkgs/development/tools/rust/cargo-expand/default.nix
@@ -2,16 +2,16 @@
rustPlatform.buildRustPackage rec {
pname = "cargo-expand";
- version = "1.0.5";
+ version = "1.0.6";
src = fetchFromGitHub {
owner = "dtolnay";
repo = pname;
rev = version;
- sha256 = "sha256-FWXSEGjTr2DewZ8NidzPdc6jhfNAUdV9qKyR7ZciWio=";
+ sha256 = "sha256-6FjFG4RYvmsV/W7OMxj1ZWvruwUeP9Nvsdiv8toZmTk=";
};
- cargoSha256 = "sha256-uvTxOZPMTCd+3WQJeVfSC5mlJ487hJKs/0Dd2C8cpcM=";
+ cargoSha256 = "sha256-1+A+n5VQS8zJULiR8IWLGo+RnFuVjg6ist8G3eCsXJM=";
meta = with lib; {
description =
diff --git a/third_party/nixpkgs/pkgs/development/tools/rust/cargo-fuzz/default.nix b/third_party/nixpkgs/pkgs/development/tools/rust/cargo-fuzz/default.nix
index 569c8f88da..ced5d7cd58 100644
--- a/third_party/nixpkgs/pkgs/development/tools/rust/cargo-fuzz/default.nix
+++ b/third_party/nixpkgs/pkgs/development/tools/rust/cargo-fuzz/default.nix
@@ -2,16 +2,16 @@
rustPlatform.buildRustPackage rec {
pname = "cargo-fuzz";
- version = "0.8.0";
+ version = "0.10.0";
src = fetchFromGitHub {
owner = "rust-fuzz";
repo = "cargo-fuzz";
rev = version;
- sha256 = "1d4bq9140bri8cd9zcxh5hhc51vr0s6jadjhwkp688w7k10rq7w8";
+ sha256 = "sha256-kBbwE4ToUud5BDDlGoey2qpp2imzO6t3FcIbV3NTFa8=";
};
- cargoSha256 = "0zxhak79f50m8nw95ny733mk4x2f7kyk6q9v4f7jr2rkcldhgrpr";
+ cargoSha256 = "sha256-zqRlB2Kck4icMKzhaeeakEnn6O7zhoKPa5ZWbGooWIg=";
doCheck = false;
diff --git a/third_party/nixpkgs/pkgs/development/tools/rust/maturin/default.nix b/third_party/nixpkgs/pkgs/development/tools/rust/maturin/default.nix
index 02b111567c..28aeca4a0a 100644
--- a/third_party/nixpkgs/pkgs/development/tools/rust/maturin/default.nix
+++ b/third_party/nixpkgs/pkgs/development/tools/rust/maturin/default.nix
@@ -1,4 +1,5 @@
-{ lib
+{ callPackage
+, lib
, stdenv
, fetchFromGitHub
, rustPlatform
@@ -28,6 +29,8 @@ rustPlatform.buildRustPackage rec {
# Requires network access, fails in sandbox.
doCheck = false;
+ passthru.tests.pyo3 = callPackage ./pyo3-test {};
+
meta = with lib; {
description = "Build and publish Rust crates Python packages";
longDescription = ''
diff --git a/third_party/nixpkgs/pkgs/development/tools/rust/maturin/pyo3-test/Cargo.lock.patch b/third_party/nixpkgs/pkgs/development/tools/rust/maturin/pyo3-test/Cargo.lock.patch
new file mode 100644
index 0000000000..3aca2e4803
--- /dev/null
+++ b/third_party/nixpkgs/pkgs/development/tools/rust/maturin/pyo3-test/Cargo.lock.patch
@@ -0,0 +1,688 @@
+diff --git a/Cargo.lock b/Cargo.lock
+new file mode 100644
+index 000000000..5e698d4ff
+--- /dev/null
++++ b/Cargo.lock
+@@ -0,0 +1,682 @@
++# This file is automatically @generated by Cargo.
++# It is not intended for manual editing.
++[[package]]
++name = "ahash"
++version = "0.4.7"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "739f4a8db6605981345c5654f3a85b056ce52f37a39d34da03f25bf2151ea16e"
++
++[[package]]
++name = "assert_approx_eq"
++version = "1.1.0"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "3c07dab4369547dbe5114677b33fbbf724971019f3818172d59a97a61c774ffd"
++
++[[package]]
++name = "autocfg"
++version = "1.0.1"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "cdb031dd78e28731d87d56cc8ffef4a8f36ca26c38fe2de700543e627f8a464a"
++
++[[package]]
++name = "bitflags"
++version = "1.2.1"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "cf1de2fe8c75bc145a2f577add951f8134889b4795d47466a54a5c846d691693"
++
++[[package]]
++name = "byteorder"
++version = "1.4.2"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "ae44d1a3d5a19df61dd0c8beb138458ac2a53a7ac09eba97d55592540004306b"
++
++[[package]]
++name = "cfg-if"
++version = "1.0.0"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd"
++
++[[package]]
++name = "const_fn"
++version = "0.4.5"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "28b9d6de7f49e22cf97ad17fc4036ece69300032f45f78f30b4a4482cdc3f4a6"
++
++[[package]]
++name = "crossbeam-channel"
++version = "0.5.0"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "dca26ee1f8d361640700bde38b2c37d8c22b3ce2d360e1fc1c74ea4b0aa7d775"
++dependencies = [
++ "cfg-if",
++ "crossbeam-utils",
++]
++
++[[package]]
++name = "crossbeam-deque"
++version = "0.8.0"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "94af6efb46fef72616855b036a624cf27ba656ffc9be1b9a3c931cfc7749a9a9"
++dependencies = [
++ "cfg-if",
++ "crossbeam-epoch",
++ "crossbeam-utils",
++]
++
++[[package]]
++name = "crossbeam-epoch"
++version = "0.9.1"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "a1aaa739f95311c2c7887a76863f500026092fb1dce0161dab577e559ef3569d"
++dependencies = [
++ "cfg-if",
++ "const_fn",
++ "crossbeam-utils",
++ "lazy_static",
++ "memoffset",
++ "scopeguard",
++]
++
++[[package]]
++name = "crossbeam-utils"
++version = "0.8.1"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "02d96d1e189ef58269ebe5b97953da3274d83a93af647c2ddd6f9dab28cedb8d"
++dependencies = [
++ "autocfg",
++ "cfg-if",
++ "lazy_static",
++]
++
++[[package]]
++name = "ctor"
++version = "0.1.19"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "e8f45d9ad417bcef4817d614a501ab55cdd96a6fdb24f49aab89a54acfd66b19"
++dependencies = [
++ "quote",
++ "syn",
++]
++
++[[package]]
++name = "either"
++version = "1.6.1"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "e78d4f1cc4ae33bbfc157ed5d5a5ef3bc29227303d595861deb238fcec4e9457"
++
++[[package]]
++name = "getrandom"
++version = "0.1.16"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "8fc3cb4d91f53b50155bdcfd23f6a4c39ae1969c2ae85982b135750cccaf5fce"
++dependencies = [
++ "cfg-if",
++ "libc",
++ "wasi",
++]
++
++[[package]]
++name = "ghost"
++version = "0.1.2"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "1a5bcf1bbeab73aa4cf2fde60a846858dc036163c7c33bec309f8d17de785479"
++dependencies = [
++ "proc-macro2",
++ "quote",
++ "syn",
++]
++
++[[package]]
++name = "glob"
++version = "0.3.0"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "9b919933a397b79c37e33b77bb2aa3dc8eb6e165ad809e58ff75bc7db2e34574"
++
++[[package]]
++name = "hashbrown"
++version = "0.9.1"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "d7afe4a420e3fe79967a00898cc1f4db7c8a49a9333a29f8a4bd76a253d5cd04"
++dependencies = [
++ "ahash",
++]
++
++[[package]]
++name = "hermit-abi"
++version = "0.1.18"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "322f4de77956e22ed0e5032c359a0f1273f1f7f0d79bfa3b8ffbc730d7fbcc5c"
++dependencies = [
++ "libc",
++]
++
++[[package]]
++name = "indoc"
++version = "0.3.6"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "47741a8bc60fb26eb8d6e0238bbb26d8575ff623fdc97b1a2c00c050b9684ed8"
++dependencies = [
++ "indoc-impl",
++ "proc-macro-hack",
++]
++
++[[package]]
++name = "indoc-impl"
++version = "0.3.6"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "ce046d161f000fffde5f432a0d034d0341dc152643b2598ed5bfce44c4f3a8f0"
++dependencies = [
++ "proc-macro-hack",
++ "proc-macro2",
++ "quote",
++ "syn",
++ "unindent",
++]
++
++[[package]]
++name = "instant"
++version = "0.1.9"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "61124eeebbd69b8190558df225adf7e4caafce0d743919e5d6b19652314ec5ec"
++dependencies = [
++ "cfg-if",
++]
++
++[[package]]
++name = "inventory"
++version = "0.1.10"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "0f0f7efb804ec95e33db9ad49e4252f049e37e8b0a4652e3cd61f7999f2eff7f"
++dependencies = [
++ "ctor",
++ "ghost",
++ "inventory-impl",
++]
++
++[[package]]
++name = "inventory-impl"
++version = "0.1.10"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "75c094e94816723ab936484666968f5b58060492e880f3c8d00489a1e244fa51"
++dependencies = [
++ "proc-macro2",
++ "quote",
++ "syn",
++]
++
++[[package]]
++name = "itoa"
++version = "0.4.7"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "dd25036021b0de88a0aff6b850051563c6516d0bf53f8638938edbb9de732736"
++
++[[package]]
++name = "lazy_static"
++version = "1.4.0"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "e2abad23fbc42b3700f2f279844dc832adb2b2eb069b2df918f455c4e18cc646"
++
++[[package]]
++name = "libc"
++version = "0.2.86"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "b7282d924be3275cec7f6756ff4121987bc6481325397dde6ba3e7802b1a8b1c"
++
++[[package]]
++name = "lock_api"
++version = "0.4.2"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "dd96ffd135b2fd7b973ac026d28085defbe8983df057ced3eb4f2130b0831312"
++dependencies = [
++ "scopeguard",
++]
++
++[[package]]
++name = "memoffset"
++version = "0.6.1"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "157b4208e3059a8f9e78d559edc658e13df41410cb3ae03979c83130067fdd87"
++dependencies = [
++ "autocfg",
++]
++
++[[package]]
++name = "num-bigint"
++version = "0.3.1"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "5e9a41747ae4633fce5adffb4d2e81ffc5e89593cb19917f8fb2cc5ff76507bf"
++dependencies = [
++ "autocfg",
++ "num-integer",
++ "num-traits",
++]
++
++[[package]]
++name = "num-complex"
++version = "0.3.1"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "747d632c0c558b87dbabbe6a82f3b4ae03720d0646ac5b7b4dae89394be5f2c5"
++dependencies = [
++ "num-traits",
++]
++
++[[package]]
++name = "num-integer"
++version = "0.1.44"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "d2cc698a63b549a70bc047073d2949cce27cd1c7b0a4a862d08a8031bc2801db"
++dependencies = [
++ "autocfg",
++ "num-traits",
++]
++
++[[package]]
++name = "num-traits"
++version = "0.2.14"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "9a64b1ec5cda2586e284722486d802acf1f7dbdc623e2bfc57e65ca1cd099290"
++dependencies = [
++ "autocfg",
++]
++
++[[package]]
++name = "num_cpus"
++version = "1.13.0"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "05499f3756671c15885fee9034446956fff3f243d6077b91e5767df161f766b3"
++dependencies = [
++ "hermit-abi",
++ "libc",
++]
++
++[[package]]
++name = "parking_lot"
++version = "0.11.1"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "6d7744ac029df22dca6284efe4e898991d28e3085c706c972bcd7da4a27a15eb"
++dependencies = [
++ "instant",
++ "lock_api",
++ "parking_lot_core",
++]
++
++[[package]]
++name = "parking_lot_core"
++version = "0.8.3"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "fa7a782938e745763fe6907fc6ba86946d72f49fe7e21de074e08128a99fb018"
++dependencies = [
++ "cfg-if",
++ "instant",
++ "libc",
++ "redox_syscall",
++ "smallvec",
++ "winapi",
++]
++
++[[package]]
++name = "paste"
++version = "0.1.18"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "45ca20c77d80be666aef2b45486da86238fabe33e38306bd3118fe4af33fa880"
++dependencies = [
++ "paste-impl",
++ "proc-macro-hack",
++]
++
++[[package]]
++name = "paste-impl"
++version = "0.1.18"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "d95a7db200b97ef370c8e6de0088252f7e0dfff7d047a28528e47456c0fc98b6"
++dependencies = [
++ "proc-macro-hack",
++]
++
++[[package]]
++name = "ppv-lite86"
++version = "0.2.10"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "ac74c624d6b2d21f425f752262f42188365d7b8ff1aff74c82e45136510a4857"
++
++[[package]]
++name = "proc-macro-hack"
++version = "0.5.19"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "dbf0c48bc1d91375ae5c3cd81e3722dff1abcf81a30960240640d223f59fe0e5"
++
++[[package]]
++name = "proc-macro2"
++version = "1.0.24"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "1e0704ee1a7e00d7bb417d0770ea303c1bccbabf0ef1667dae92b5967f5f8a71"
++dependencies = [
++ "unicode-xid",
++]
++
++[[package]]
++name = "proptest"
++version = "0.10.1"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "12e6c80c1139113c28ee4670dc50cc42915228b51f56a9e407f0ec60f966646f"
++dependencies = [
++ "bitflags",
++ "byteorder",
++ "lazy_static",
++ "num-traits",
++ "quick-error",
++ "rand",
++ "rand_chacha",
++ "rand_xorshift",
++ "regex-syntax",
++]
++
++[[package]]
++name = "pyo3"
++version = "0.13.2"
++dependencies = [
++ "assert_approx_eq",
++ "cfg-if",
++ "ctor",
++ "hashbrown",
++ "indoc",
++ "inventory",
++ "libc",
++ "num-bigint",
++ "num-complex",
++ "parking_lot",
++ "paste",
++ "proptest",
++ "pyo3",
++ "pyo3-macros",
++ "rustversion",
++ "serde",
++ "serde_json",
++ "trybuild",
++ "unindent",
++]
++
++[[package]]
++name = "pyo3-macros"
++version = "0.13.2"
++dependencies = [
++ "pyo3-macros-backend",
++ "quote",
++ "syn",
++]
++
++[[package]]
++name = "pyo3-macros-backend"
++version = "0.13.2"
++dependencies = [
++ "proc-macro2",
++ "quote",
++ "syn",
++]
++
++[[package]]
++name = "quick-error"
++version = "1.2.3"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "a1d01941d82fa2ab50be1e79e6714289dd7cde78eba4c074bc5a4374f650dfe0"
++
++[[package]]
++name = "quote"
++version = "1.0.9"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "c3d0b9745dc2debf507c8422de05d7226cc1f0644216dfdfead988f9b1ab32a7"
++dependencies = [
++ "proc-macro2",
++]
++
++[[package]]
++name = "rand"
++version = "0.7.3"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "6a6b1679d49b24bbfe0c803429aa1874472f50d9b363131f0e89fc356b544d03"
++dependencies = [
++ "getrandom",
++ "libc",
++ "rand_chacha",
++ "rand_core",
++ "rand_hc",
++]
++
++[[package]]
++name = "rand_chacha"
++version = "0.2.2"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "f4c8ed856279c9737206bf725bf36935d8666ead7aa69b52be55af369d193402"
++dependencies = [
++ "ppv-lite86",
++ "rand_core",
++]
++
++[[package]]
++name = "rand_core"
++version = "0.5.1"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "90bde5296fc891b0cef12a6d03ddccc162ce7b2aff54160af9338f8d40df6d19"
++dependencies = [
++ "getrandom",
++]
++
++[[package]]
++name = "rand_hc"
++version = "0.2.0"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "ca3129af7b92a17112d59ad498c6f81eaf463253766b90396d39ea7a39d6613c"
++dependencies = [
++ "rand_core",
++]
++
++[[package]]
++name = "rand_xorshift"
++version = "0.2.0"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "77d416b86801d23dde1aa643023b775c3a462efc0ed96443add11546cdf1dca8"
++dependencies = [
++ "rand_core",
++]
++
++[[package]]
++name = "rayon"
++version = "1.5.0"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "8b0d8e0819fadc20c74ea8373106ead0600e3a67ef1fe8da56e39b9ae7275674"
++dependencies = [
++ "autocfg",
++ "crossbeam-deque",
++ "either",
++ "rayon-core",
++]
++
++[[package]]
++name = "rayon-core"
++version = "1.9.0"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "9ab346ac5921dc62ffa9f89b7a773907511cdfa5490c572ae9be1be33e8afa4a"
++dependencies = [
++ "crossbeam-channel",
++ "crossbeam-deque",
++ "crossbeam-utils",
++ "lazy_static",
++ "num_cpus",
++]
++
++[[package]]
++name = "redox_syscall"
++version = "0.2.5"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "94341e4e44e24f6b591b59e47a8a027df12e008d73fd5672dbea9cc22f4507d9"
++dependencies = [
++ "bitflags",
++]
++
++[[package]]
++name = "regex-syntax"
++version = "0.6.22"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "b5eb417147ba9860a96cfe72a0b93bf88fee1744b5636ec99ab20c1aa9376581"
++
++[[package]]
++name = "rustapi-module"
++version = "0.1.0"
++dependencies = [
++ "pyo3",
++]
++
++[[package]]
++name = "rustversion"
++version = "1.0.4"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "cb5d2a036dc6d2d8fd16fde3498b04306e29bd193bf306a57427019b823d5acd"
++
++[[package]]
++name = "ryu"
++version = "1.0.5"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "71d301d4193d031abdd79ff7e3dd721168a9572ef3fe51a1517aba235bd8f86e"
++
++[[package]]
++name = "scopeguard"
++version = "1.1.0"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "d29ab0c6d3fc0ee92fe66e2d99f700eab17a8d57d1c1d3b748380fb20baa78cd"
++
++[[package]]
++name = "serde"
++version = "1.0.123"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "92d5161132722baa40d802cc70b15262b98258453e85e5d1d365c757c73869ae"
++dependencies = [
++ "serde_derive",
++]
++
++[[package]]
++name = "serde_derive"
++version = "1.0.123"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "9391c295d64fc0abb2c556bad848f33cb8296276b1ad2677d1ae1ace4f258f31"
++dependencies = [
++ "proc-macro2",
++ "quote",
++ "syn",
++]
++
++[[package]]
++name = "serde_json"
++version = "1.0.62"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "ea1c6153794552ea7cf7cf63b1231a25de00ec90db326ba6264440fa08e31486"
++dependencies = [
++ "itoa",
++ "ryu",
++ "serde",
++]
++
++[[package]]
++name = "smallvec"
++version = "1.6.1"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "fe0f37c9e8f3c5a4a66ad655a93c74daac4ad00c441533bf5c6e7990bb42604e"
++
++[[package]]
++name = "syn"
++version = "1.0.60"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "c700597eca8a5a762beb35753ef6b94df201c81cca676604f547495a0d7f0081"
++dependencies = [
++ "proc-macro2",
++ "quote",
++ "unicode-xid",
++]
++
++[[package]]
++name = "termcolor"
++version = "1.1.2"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "2dfed899f0eb03f32ee8c6a0aabdb8a7949659e3466561fc0adf54e26d88c5f4"
++dependencies = [
++ "winapi-util",
++]
++
++[[package]]
++name = "toml"
++version = "0.5.8"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "a31142970826733df8241ef35dc040ef98c679ab14d7c3e54d827099b3acecaa"
++dependencies = [
++ "serde",
++]
++
++[[package]]
++name = "trybuild"
++version = "1.0.41"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "99471a206425fba51842a9186315f32d91c56eadc21ea4c21f847b59cf778f8b"
++dependencies = [
++ "glob",
++ "lazy_static",
++ "serde",
++ "serde_json",
++ "termcolor",
++ "toml",
++]
++
++[[package]]
++name = "unicode-xid"
++version = "0.2.1"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "f7fe0bb3479651439c9112f72b6c505038574c9fbb575ed1bf3b797fa39dd564"
++
++[[package]]
++name = "unindent"
++version = "0.1.7"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "f14ee04d9415b52b3aeab06258a3f07093182b88ba0f9b8d203f211a7a7d41c7"
++
++[[package]]
++name = "wasi"
++version = "0.9.0+wasi-snapshot-preview1"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "cccddf32554fecc6acb585f82a32a72e28b48f8c4c1883ddfeeeaa96f7d8e519"
++
++[[package]]
++name = "winapi"
++version = "0.3.9"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "5c839a674fcd7a98952e593242ea400abe93992746761e38641405d28b00f419"
++dependencies = [
++ "winapi-i686-pc-windows-gnu",
++ "winapi-x86_64-pc-windows-gnu",
++]
++
++[[package]]
++name = "winapi-i686-pc-windows-gnu"
++version = "0.4.0"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "ac3b87c63620426dd9b991e5ce0329eff545bccbbb34f3be09ff6fb6ab51b7b6"
++
++[[package]]
++name = "winapi-util"
++version = "0.1.5"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "70ec6ce85bb158151cae5e5c87f95a8e97d2c0c4b001223f33a334e3ce5de178"
++dependencies = [
++ "winapi",
++]
++
++[[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 = "word-count"
++version = "0.1.0"
++dependencies = [
++ "pyo3",
++ "rayon",
++]
diff --git a/third_party/nixpkgs/pkgs/development/tools/rust/maturin/pyo3-test/default.nix b/third_party/nixpkgs/pkgs/development/tools/rust/maturin/pyo3-test/default.nix
new file mode 100644
index 0000000000..b118309b36
--- /dev/null
+++ b/third_party/nixpkgs/pkgs/development/tools/rust/maturin/pyo3-test/default.nix
@@ -0,0 +1,12 @@
+{ callPackage
+, rustPlatform
+}:
+
+callPackage ./generic.nix {
+ buildAndTestSubdir = "examples/word-count";
+
+ nativeBuildInputs = with rustPlatform; [
+ cargoSetupHook
+ maturinBuildHook
+ ];
+}
diff --git a/third_party/nixpkgs/pkgs/development/tools/rust/maturin/pyo3-test/generic.nix b/third_party/nixpkgs/pkgs/development/tools/rust/maturin/pyo3-test/generic.nix
new file mode 100644
index 0000000000..f82c988fc5
--- /dev/null
+++ b/third_party/nixpkgs/pkgs/development/tools/rust/maturin/pyo3-test/generic.nix
@@ -0,0 +1,45 @@
+# Derivation prototype, used by maturin and setuptools-rust
+# passthrough tests.
+
+{ lib
+, fetchFromGitHub
+, python3Packages
+, rustPlatform
+
+, nativeBuildInputs
+
+, buildAndTestSubdir ? null
+, format ? "pyproject"
+, sourceRoot ? "source"
+}:
+
+python3Packages.buildPythonPackage rec {
+ pname = "word-count";
+ version = "0.13.2";
+
+ src = fetchFromGitHub {
+ owner = "PyO3";
+ repo = "pyo3";
+ rev = "v${version}";
+ hash = "sha256-NOMrrfo8WjlPhtGxWUOPJS/UDDdbLQRCXR++Zd6JmIA=";
+ };
+
+ cargoDeps = rustPlatform.fetchCargoTarball {
+ inherit src sourceRoot patches;
+ name = "${pname}-${version}";
+ hash = "sha256-//TmozgWy9zrSpMKX92XdHj4fw/T1Elfgn4YhhR7ot0=";
+ };
+
+ patches = [ ./Cargo.lock.patch ];
+
+ inherit buildAndTestSubdir format nativeBuildInputs sourceRoot;
+
+ pythonImportsCheck = [ "word_count" ];
+
+ meta = with lib; {
+ description = "PyO3 word count example";
+ homepage = "https://github.com/PyO3/pyo3";
+ license = licenses.asl20;
+ maintainers = [ maintainers.danieldk ];
+ };
+}
diff --git a/third_party/nixpkgs/pkgs/development/tools/rust/rust-analyzer/default.nix b/third_party/nixpkgs/pkgs/development/tools/rust/rust-analyzer/default.nix
index 642f2e936e..09e24775a3 100644
--- a/third_party/nixpkgs/pkgs/development/tools/rust/rust-analyzer/default.nix
+++ b/third_party/nixpkgs/pkgs/development/tools/rust/rust-analyzer/default.nix
@@ -1,4 +1,4 @@
-{ pkgs, callPackage }:
+{ pkgs, callPackage, CoreServices }:
{
rust-analyzer-unwrapped = callPackage ./generic.nix rec {
@@ -6,6 +6,8 @@
version = "unstable-${rev}";
sha256 = "150gydm0mg72bbhgjjks8qc5ldiqyzhai9z4yfh4f1s2bwdfh3yf";
cargoSha256 = "10l0lk5p11002q59dqa5yrrz6n6s11i7bmr1wnl141bxqvm873q2";
+
+ inherit CoreServices;
};
rust-analyzer = callPackage ./wrapper.nix {} {
diff --git a/third_party/nixpkgs/pkgs/development/tools/rust/rust-analyzer/generic.nix b/third_party/nixpkgs/pkgs/development/tools/rust/rust-analyzer/generic.nix
index ecca83f89a..ddb834af6c 100644
--- a/third_party/nixpkgs/pkgs/development/tools/rust/rust-analyzer/generic.nix
+++ b/third_party/nixpkgs/pkgs/development/tools/rust/rust-analyzer/generic.nix
@@ -1,4 +1,5 @@
-{ lib, stdenv, fetchFromGitHub, rustPlatform, darwin, cmake
+{ lib, stdenv, fetchFromGitHub, rustPlatform, CoreServices, cmake
+, libiconv
, useMimalloc ? false
, doCheck ? true
@@ -22,8 +23,10 @@ rustPlatform.buildRustPackage {
nativeBuildInputs = lib.optional useMimalloc cmake;
- buildInputs = lib.optionals stdenv.hostPlatform.isDarwin
- [ darwin.apple_sdk.frameworks.CoreServices ];
+ buildInputs = lib.optionals stdenv.isDarwin [
+ CoreServices
+ libiconv
+ ];
RUST_ANALYZER_REV = rev;
diff --git a/third_party/nixpkgs/pkgs/development/tools/sauce-connect/default.nix b/third_party/nixpkgs/pkgs/development/tools/sauce-connect/default.nix
index 12082de984..64517d865c 100644
--- a/third_party/nixpkgs/pkgs/development/tools/sauce-connect/default.nix
+++ b/third_party/nixpkgs/pkgs/development/tools/sauce-connect/default.nix
@@ -19,7 +19,7 @@ stdenv.mkDerivation rec {
}
);
- buildInputs = [ unzip ];
+ nativeBuildInputs = [ unzip ];
patchPhase = lib.optionalString stdenv.isLinux ''
patchelf \
diff --git a/third_party/nixpkgs/pkgs/development/tools/slimerjs/default.nix b/third_party/nixpkgs/pkgs/development/tools/slimerjs/default.nix
index 76728c5f2d..473f24b1b5 100644
--- a/third_party/nixpkgs/pkgs/development/tools/slimerjs/default.nix
+++ b/third_party/nixpkgs/pkgs/development/tools/slimerjs/default.nix
@@ -10,13 +10,11 @@ let
sha256="1w4sfrv520isbs7r1rlzl5y3idrpad7znw9fc92yz40jlwz7sxs4";
rev = version;
};
- buildInputs = [
- unzip zip
- ];
in
stdenv.mkDerivation {
inherit (s) name version;
- inherit buildInputs;
+ buildInputs = [ zip ];
+ nativeBuildInputs = [ unzip ];
#src = fetchurl {
# inherit (s) url sha256;
#};
diff --git a/third_party/nixpkgs/pkgs/development/tools/thrust/default.nix b/third_party/nixpkgs/pkgs/development/tools/thrust/default.nix
index 02183282ce..fcb1edf153 100644
--- a/third_party/nixpkgs/pkgs/development/tools/thrust/default.nix
+++ b/third_party/nixpkgs/pkgs/development/tools/thrust/default.nix
@@ -22,8 +22,8 @@ in stdenv.mkDerivation rec {
sha256 = "07rrnlj0gk500pvar4b1wdqm05p4n9yjwn911x93bd2qwc8r5ymc";
};
- nativeBuildInputs = [ makeWrapper ];
- buildInputs = [ thrustEnv unzip ];
+ nativeBuildInputs = [ makeWrapper unzip ];
+ buildInputs = [ thrustEnv ];
phases = [ "installPhase" "fixupPhase" ];
diff --git a/third_party/nixpkgs/pkgs/development/web/deno/default.nix b/third_party/nixpkgs/pkgs/development/web/deno/default.nix
index 013b365bce..17a3ae58f2 100644
--- a/third_party/nixpkgs/pkgs/development/web/deno/default.nix
+++ b/third_party/nixpkgs/pkgs/development/web/deno/default.nix
@@ -1,52 +1,49 @@
-{ lib, stdenv
-, fetchurl
+{ stdenv
+, lib
+, callPackage
, fetchFromGitHub
, rust
, rustPlatform
, installShellFiles
+, libobjc
, Security
, CoreServices
+, Metal
+, Foundation
+, librusty_v8 ? callPackage ./librusty_v8.nix { }
}:
-let
- deps = import ./deps.nix { };
- arch = rust.toRustTarget stdenv.hostPlatform;
- rustyV8Lib = with deps.rustyV8Lib; fetchurl {
- url = "https://github.com/denoland/rusty_v8/releases/download/v${version}/librusty_v8_release_${arch}.a";
- sha256 = sha256s."${stdenv.hostPlatform.system}";
- meta = { inherit version; };
- };
-in
+
rustPlatform.buildRustPackage rec {
pname = "deno";
- version = "1.6.3";
+ version = "1.8.1";
src = fetchFromGitHub {
owner = "denoland";
repo = pname;
rev = "v${version}";
- sha256 = "1wmkx458fpsfw57ysawxc0ghxag8v051hiyswm7nnb7gckrm6j8z";
- fetchSubmodules = true;
+ sha256 = "sha256-tyqZ/vjQ9gjLoK+Juj30It3H6+2sT9Fj/s0kEv0HRwI=";
};
- cargoSha256 = "08vzsp53019gmxkn8lpa6l84w3fvbrnr11lzrfgf99nmii6l2hq5";
+ cargoSha256 = "sha256-LpBQztMqw7IbgTJkfiD+6Fcy5XXmN58HO/zhVen3oCI=";
# Install completions post-install
nativeBuildInputs = [ installShellFiles ];
- buildInputs = lib.optionals stdenv.isDarwin [ Security CoreServices ];
+ buildInputs = lib.optionals stdenv.isDarwin [ libobjc Security CoreServices Metal Foundation ];
# The rusty_v8 package will try to download a `librusty_v8.a` release at build time to our read-only filesystem
# To avoid this we pre-download the file and place it in the locations it will require it in advance
- preBuild = ''
- _rusty_v8_setup() {
- for v in "$@"; do
- dir="target/$v/gn_out/obj"
- mkdir -p "$dir" && cp "${rustyV8Lib}" "$dir/librusty_v8.a"
- done
- }
+ preBuild =
+ let arch = rust.toRustTarget stdenv.hostPlatform; in
+ ''
+ _librusty_v8_setup() {
+ for v in "$@"; do
+ install -D ${librusty_v8} "target/$v/gn_out/obj/librusty_v8.a"
+ done
+ }
- # Copy over the `librusty_v8.a` file inside target/XYZ/gn_out/obj, symlink not allowed
- _rusty_v8_setup "debug" "release" "${arch}/release"
- '';
+ # Copy over the `librusty_v8.a` file inside target/XYZ/gn_out/obj, symlink not allowed
+ _librusty_v8_setup "debug" "release" "${arch}/release"
+ '';
# Tests have some inconsistencies between runs with output integration tests
# Skipping until resolved
@@ -54,7 +51,7 @@ rustPlatform.buildRustPackage rec {
postInstall = ''
# remove test plugin and test server
- rm -rf $out/lib $out/bin/test_server
+ rm -r $out/lib $out/bin/test_server $out/bin/denort
installShellCompletion --cmd deno \
--bash <($out/bin/deno completions bash) \
@@ -62,11 +59,19 @@ rustPlatform.buildRustPackage rec {
--zsh <($out/bin/deno completions zsh)
'';
+ doInstallCheck = true;
+ installCheckPhase = ''
+ runHook preInstallCheck
+ $out/bin/deno --help
+ $out/bin/deno --version | grep "deno ${version}"
+ runHook postInstallCheck
+ '';
+
passthru.updateScript = ./update/update.ts;
meta = with lib; {
homepage = "https://deno.land/";
- changelog = "${src.meta.homepage}/releases/tag/v${version}";
+ changelog = "https://github.com/denoland/deno/releases/tag/v${version}";
description = "A secure runtime for JavaScript and TypeScript";
longDescription = ''
Deno aims to be a productive and secure scripting environment for the modern programmer.
@@ -79,6 +84,6 @@ rustPlatform.buildRustPackage rec {
'';
license = licenses.mit;
maintainers = with maintainers; [ jk ];
- platforms = [ "x86_64-linux" "aarch64-linux" "x86_64-darwin" ];
+ platforms = [ "x86_64-linux" "aarch64-linux" "x86_64-darwin" "aarch64-darwin" ];
};
}
diff --git a/third_party/nixpkgs/pkgs/development/web/deno/deps.nix b/third_party/nixpkgs/pkgs/development/web/deno/deps.nix
deleted file mode 100644
index 4426c600df..0000000000
--- a/third_party/nixpkgs/pkgs/development/web/deno/deps.nix
+++ /dev/null
@@ -1,12 +0,0 @@
-# auto-generated file -- DO NOT EDIT!
-{}:
-rec {
- rustyV8Lib = {
- version = "0.15.0";
- sha256s = {
- x86_64-linux = "1j789pvqh44vsffzl5wg3pp3awrlixjrhbnjx2klsml7jv0lp0mq";
- aarch64-linux = "13srja4vc275ygm806hcsr8mxjnd9qkzaqs58lxnp0702qs5xls6";
- x86_64-darwin = "0aij9yb5i1r3pz0pyl51qdbgfspfdngwbk1qgkp4gxzl3cbnysx1";
- };
- };
-}
diff --git a/third_party/nixpkgs/pkgs/development/web/deno/librusty_v8.nix b/third_party/nixpkgs/pkgs/development/web/deno/librusty_v8.nix
new file mode 100644
index 0000000000..31dbce0892
--- /dev/null
+++ b/third_party/nixpkgs/pkgs/development/web/deno/librusty_v8.nix
@@ -0,0 +1,21 @@
+# auto-generated file -- DO NOT EDIT!
+{ rust, stdenv, fetchurl }:
+
+let
+ arch = rust.toRustTarget stdenv.hostPlatform;
+ fetch_librusty_v8 = args: fetchurl {
+ name = "librusty_v8-${args.version}";
+ url = "https://github.com/denoland/rusty_v8/releases/download/v${args.version}/librusty_v8_release_${arch}.a";
+ sha256 = args.shas.${stdenv.hostPlatform.system};
+ meta = { inherit (args) version; };
+ };
+in
+fetch_librusty_v8 {
+ version = "0.20.0";
+ shas = {
+ x86_64-linux = "sha256-pTWNYQzChyYJh+afn1AMw/MxUE+Cv4k2FnM3+KDYCvg=";
+ aarch64-linux = "sha256-SPRtQO0tnuEf49GuSsuo403QO0Y6ioRkOp4cjohXRhw=";
+ x86_64-darwin = "sha256-k0kS5NiITqW/WEFWe/Bnt7Z9HZp2YN19L7DvVlptrj4=";
+ aarch64-darwin = "sha256-CDGxSv7fPR+5kF3+5NVTOH8ugLaM07Kv5mjoEW6/g/8=";
+ };
+}
diff --git a/third_party/nixpkgs/pkgs/development/web/deno/update/common.ts b/third_party/nixpkgs/pkgs/development/web/deno/update/common.ts
index d8956b21d1..1b4e3509ea 100644
--- a/third_party/nixpkgs/pkgs/development/web/deno/update/common.ts
+++ b/third_party/nixpkgs/pkgs/development/web/deno/update/common.ts
@@ -3,12 +3,15 @@ interface GHRelease {
}
const decode = (buffer: Uint8Array) => new TextDecoder("utf-8").decode(buffer);
-const run = async (command: string, args: string[]) => {
- const cmd = Deno.run(
- { cmd: [command, ...args], stdout: "piped", stderr: "piped" },
- );
+const decodeTrim = (b: Uint8Array) => decode(b).trimEnd();
+export const run = async (command: string, args: string[]) => {
+ const cmd = Deno.run({
+ cmd: [command, ...args],
+ stdout: "piped",
+ stderr: "piped",
+ });
if (!(await cmd.status()).success) {
- const error = await cmd.stderrOutput().then((b) => decode(b).trimEnd());
+ const error = await cmd.stderrOutput().then(decodeTrim);
// Known error we can ignore
if (error.includes("'allow-unsafe-native-code-during-evaluation'")) {
// Extract the target sha256 out of the error
@@ -23,26 +26,16 @@ const run = async (command: string, args: string[]) => {
}
throw new Error(error);
}
- return cmd.output().then((b) => decode(b).trimEnd());
+ return cmd.output().then(decodeTrim);
};
// Exports
export const versionRegExp = /\d+\.\d+\.\d+/;
-export const sha256RegExp = /[a-z0-9]{52}/;
-
-export async function commit(
- name: string,
- oldVer: string,
- newVer: string,
- files: string[],
-) {
- await run("git", ["add", ...files]);
- await run("git", ["commit", "-m", `${name}: ${oldVer} -> ${newVer}`]);
-}
+export const sha256RegExp = /[a-z0-9]{52}|sha256-.{44}/;
export const getExistingVersion = async (filePath: string) =>
- read(filePath).then((s) =>
- s.match(genValueRegExp("version", versionRegExp))?.shift() || ""
+ read(filePath).then(
+ (s) => s.match(genValueRegExp("version", versionRegExp))?.shift() || "",
);
export const getLatestVersion = (owner: string, repo: string) =>
@@ -58,8 +51,5 @@ export const genValueRegExp = (key: string, regex: RegExp) =>
export const logger = (name: string) =>
(...a: any) => console.log(`[${name}]`, ...a);
-export const nixPrefetch = (args: string[]) => run("nix-prefetch", args);
-export const nixPrefetchURL = (args: string[]) => run("nix-prefetch-url", args);
-
export const read = Deno.readTextFile;
export const write = Deno.writeTextFile;
diff --git a/third_party/nixpkgs/pkgs/development/web/deno/update/deps.ts b/third_party/nixpkgs/pkgs/development/web/deno/update/deps.ts
deleted file mode 100644
index beedeade3a..0000000000
--- a/third_party/nixpkgs/pkgs/development/web/deno/update/deps.ts
+++ /dev/null
@@ -1,79 +0,0 @@
-import {
- getExistingVersion,
- genValueRegExp,
- logger,
- nixPrefetchURL,
- versionRegExp,
- write,
-} from "./common.ts";
-
-const log = logger("deps");
-
-export interface Architecture {
- nix: string;
- rust: string;
-}
-interface PrefetchResult {
- arch: Architecture;
- sha256: string;
-}
-
-const getRustyV8Version = async (
- owner: string,
- repo: string,
- version: string,
-) =>
- fetch(
- `https://github.com/${owner}/${repo}/raw/${version}/core/Cargo.toml`,
- )
- .then((res) => res.text())
- .then((txt) =>
- txt.match(genValueRegExp("rusty_v8", versionRegExp))?.shift()
- );
-
-const archShaTasks = (version: string, arches: Architecture[]) =>
- arches.map(async (arch: Architecture): Promise => {
- log("Fetching:", arch.nix);
- const sha256 = await nixPrefetchURL(
- [`https://github.com/denoland/rusty_v8/releases/download/v${version}/librusty_v8_release_${arch.rust}.a`],
- );
- log("Done: ", arch.nix);
- return { arch, sha256 };
- });
-
-const templateDeps = (version: string, deps: PrefetchResult[]) =>
- `# auto-generated file -- DO NOT EDIT!
-{}:
-rec {
- rustyV8Lib = {
- version = "${version}";
- sha256s = {
-${deps.map((d) => ` ${d.arch.nix} = "${d.sha256}";`).join("\n")}
- };
- };
-}
-`;
-
-export async function updateDeps(
- filePath: string,
- owner: string,
- repo: string,
- denoVersion: string,
- arches: Architecture[],
-) {
- log("Starting deps update");
- // 0.0.0
- const version = await getRustyV8Version(owner, repo, denoVersion);
- if (typeof version !== "string") {
- throw "no rusty_v8 version";
- }
- log("rusty_v8 version:", version);
- const existingVersion = await getExistingVersion(filePath);
- if (version === existingVersion) {
- log("Version already matches latest, skipping...");
- return;
- }
- const archShaResults = await Promise.all(archShaTasks(version, arches));
- await write(filePath, templateDeps(version, archShaResults));
- log("Finished deps update");
-}
diff --git a/third_party/nixpkgs/pkgs/development/web/deno/update/librusty_v8.ts b/third_party/nixpkgs/pkgs/development/web/deno/update/librusty_v8.ts
new file mode 100644
index 0000000000..dee3277c58
--- /dev/null
+++ b/third_party/nixpkgs/pkgs/development/web/deno/update/librusty_v8.ts
@@ -0,0 +1,92 @@
+import {
+ genValueRegExp,
+ getExistingVersion,
+ logger,
+ run,
+ versionRegExp,
+ write,
+} from "./common.ts";
+
+const log = logger("librusty_v8");
+
+export interface Architecture {
+ nix: string;
+ rust: string;
+}
+interface PrefetchResult {
+ arch: Architecture;
+ sha256: string;
+}
+
+const getLibrustyV8Version = async (
+ owner: string,
+ repo: string,
+ version: string,
+) =>
+ fetch(`https://github.com/${owner}/${repo}/raw/${version}/core/Cargo.toml`)
+ .then((res) => res.text())
+ .then((txt) =>
+ txt.match(genValueRegExp("rusty_v8", versionRegExp))?.shift()
+ );
+
+const fetchArchShaTasks = (version: string, arches: Architecture[]) =>
+ arches.map(
+ async (arch: Architecture): Promise => {
+ log("Fetching:", arch.nix);
+ const sha256 = await run("nix-prefetch", [
+ `
+{ fetchurl }:
+fetchurl {
+ url = "https://github.com/denoland/rusty_v8/releases/download/v${version}/librusty_v8_release_${arch.rust}.a";
+}
+`,
+ ]);
+ log("Done: ", arch.nix);
+ return { arch, sha256 };
+ },
+ );
+
+const templateDeps = (version: string, deps: PrefetchResult[]) =>
+ `# auto-generated file -- DO NOT EDIT!
+{ rust, stdenv, fetchurl }:
+
+let
+ arch = rust.toRustTarget stdenv.hostPlatform;
+ fetch_librusty_v8 = args: fetchurl {
+ name = "librusty_v8-\${args.version}";
+ url = "https://github.com/denoland/rusty_v8/releases/download/v\${args.version}/librusty_v8_release_\${arch}.a";
+ sha256 = args.shas.\${stdenv.hostPlatform.system};
+ meta = { inherit (args) version; };
+ };
+in
+fetch_librusty_v8 {
+ version = "${version}";
+ shas = {
+${deps.map(({ arch, sha256 }) => ` ${arch.nix} = "${sha256}";`).join("\n")}
+ };
+}
+`;
+
+export async function updateLibrustyV8(
+ filePath: string,
+ owner: string,
+ repo: string,
+ denoVersion: string,
+ arches: Architecture[],
+) {
+ log("Starting librusty_v8 update");
+ // 0.0.0
+ const version = await getLibrustyV8Version(owner, repo, denoVersion);
+ if (typeof version !== "string") {
+ throw "no librusty_v8 version";
+ }
+ log("librusty_v8 version:", version);
+ const existingVersion = await getExistingVersion(filePath);
+ if (version === existingVersion) {
+ log("Version already matches latest, skipping...");
+ return;
+ }
+ const archShaResults = await Promise.all(fetchArchShaTasks(version, arches));
+ await write(filePath, templateDeps(version, archShaResults));
+ log("Finished deps update");
+}
diff --git a/third_party/nixpkgs/pkgs/development/web/deno/update/src.ts b/third_party/nixpkgs/pkgs/development/web/deno/update/src.ts
index fae15acd0d..3bfae27c21 100644
--- a/third_party/nixpkgs/pkgs/development/web/deno/update/src.ts
+++ b/third_party/nixpkgs/pkgs/development/web/deno/update/src.ts
@@ -1,8 +1,8 @@
import {
genValueRegExp,
logger,
- nixPrefetch,
read,
+ run,
sha256RegExp,
versionRegExp,
write,
@@ -16,10 +16,11 @@ interface Replacer {
const log = logger("src");
const prefetchSha256 = (nixpkgs: string, version: string) =>
- nixPrefetch(["-f", nixpkgs, "deno.src", "--rev", version]);
+ run("nix-prefetch", ["-f", nixpkgs, "deno.src", "--rev", version]);
const prefetchCargoSha256 = (nixpkgs: string) =>
- nixPrefetch(
- [`{ sha256 }: (import ${nixpkgs} {}).deno.cargoDeps.overrideAttrs (_: { outputHash = sha256; })`],
+ run(
+ "nix-prefetch",
+ [`{ sha256 }: (import ${nixpkgs} {}).deno.cargoDeps.overrideAttrs (_: { inherit sha256; })`],
);
const replace = (str: string, replacers: Replacer[]) =>
@@ -53,7 +54,6 @@ export async function updateSrc(
[
genVerReplacer("version", trimVersion),
genShaReplacer("sha256", sha256),
- genShaReplacer("cargoSha256", ""), // Empty ready for prefetchCargoSha256
],
);
log("Fetching cargoSha256 for:", sha256);
diff --git a/third_party/nixpkgs/pkgs/development/web/deno/update/update.ts b/third_party/nixpkgs/pkgs/development/web/deno/update/update.ts
index 18d4514801..27e1d86ee8 100755
--- a/third_party/nixpkgs/pkgs/development/web/deno/update/update.ts
+++ b/third_party/nixpkgs/pkgs/development/web/deno/update/update.ts
@@ -2,13 +2,8 @@
/*
#!nix-shell -i "deno run --allow-net --allow-run --allow-read --allow-write" -p deno git nix-prefetch
*/
-import {
- commit,
- getExistingVersion,
- getLatestVersion,
- logger,
-} from "./common.ts";
-import { Architecture, updateDeps } from "./deps.ts";
+import { getExistingVersion, getLatestVersion, logger } from "./common.ts";
+import { Architecture, updateLibrustyV8 } from "./librusty_v8.ts";
import { updateSrc } from "./src.ts";
const log = logger("update");
@@ -19,11 +14,12 @@ const owner = "denoland";
const repo = "deno";
const denoDir = `${nixpkgs}/pkgs/development/web/${repo}`;
const src = `${denoDir}/default.nix`;
-const deps = `${denoDir}/deps.nix`;
+const librusty_v8 = `${denoDir}/librusty_v8.nix`;
const architectures: Architecture[] = [
{ nix: "x86_64-linux", rust: "x86_64-unknown-linux-gnu" },
{ nix: "aarch64-linux", rust: "aarch64-unknown-linux-gnu" },
{ nix: "x86_64-darwin", rust: "x86_64-apple-darwin" },
+ { nix: "aarch64-darwin", rust: "aarch64-apple-darwin" },
];
log("Updating deno");
@@ -41,10 +37,7 @@ if (trimVersion === existingVersion) {
const tasks = [
updateSrc(src, nixpkgs, version),
- updateDeps(deps, owner, repo, version, architectures),
+ updateLibrustyV8(librusty_v8, owner, repo, version, architectures),
];
await Promise.all(tasks);
log("Updating deno complete");
-log("Commiting");
-await commit(repo, existingVersion, trimVersion, [src, deps]);
-log("Done");
diff --git a/third_party/nixpkgs/pkgs/development/web/grails/default.nix b/third_party/nixpkgs/pkgs/development/web/grails/default.nix
index 944520b47e..2a888b8056 100644
--- a/third_party/nixpkgs/pkgs/development/web/grails/default.nix
+++ b/third_party/nixpkgs/pkgs/development/web/grails/default.nix
@@ -18,7 +18,7 @@ stdenv.mkDerivation rec {
sha256 = "0l99x3g485qjpdd7ga553xpi1s6rq21p8v16qjzqwdhyld961qsr";
};
- buildInputs = [ unzip ];
+ nativeBuildInputs = [ unzip ];
dontBuild = true;
diff --git a/third_party/nixpkgs/pkgs/development/web/nodejs/v15.nix b/third_party/nixpkgs/pkgs/development/web/nodejs/v15.nix
index f564d5bccc..194bb25cb0 100644
--- a/third_party/nixpkgs/pkgs/development/web/nodejs/v15.nix
+++ b/third_party/nixpkgs/pkgs/development/web/nodejs/v15.nix
@@ -8,6 +8,6 @@ let
in
buildNodejs {
inherit enableNpm;
- version = "15.11.0";
- sha256 = "1lfjm0jgzbr0a874c04pddbjnvjcdyx5vyaakdhp0fa222i92w0s";
+ version = "15.12.0";
+ sha256 = "0c8smzc7gbr7yg4y4z68976wk5741bspggag9h9laykq4i8bxfsy";
}
diff --git a/third_party/nixpkgs/pkgs/development/web/twitter-bootstrap/default.nix b/third_party/nixpkgs/pkgs/development/web/twitter-bootstrap/default.nix
index ca211ccf2d..b8a9f94a23 100644
--- a/third_party/nixpkgs/pkgs/development/web/twitter-bootstrap/default.nix
+++ b/third_party/nixpkgs/pkgs/development/web/twitter-bootstrap/default.nix
@@ -9,7 +9,7 @@ stdenv.mkDerivation rec {
sha256 = "sha256-CiEUUa0mCrUSp+XCoWNs8plJxhWHZZD+K+UBJSDu1CM=";
};
- buildInputs = [ unzip ];
+ nativeBuildInputs = [ unzip ];
dontBuild = true;
installPhase = ''
diff --git a/third_party/nixpkgs/pkgs/games/cbonsai/default.nix b/third_party/nixpkgs/pkgs/games/cbonsai/default.nix
index 9e318b92fa..c817b5d36b 100644
--- a/third_party/nixpkgs/pkgs/games/cbonsai/default.nix
+++ b/third_party/nixpkgs/pkgs/games/cbonsai/default.nix
@@ -1,14 +1,14 @@
{ stdenv, lib, fetchFromGitLab, ncurses, pkg-config, nix-update-script }:
stdenv.mkDerivation rec {
- version = "1.0.1";
+ version = "1.0.4";
pname = "cbonsai";
src = fetchFromGitLab {
owner = "jallbrit";
repo = pname;
rev = "v${version}";
- sha256 = "sha256-UTjbc0kGHOQse4sZF94p4LAwMk9vsZg1QHq8iuDcTDk=";
+ sha256 = "sha256-5yyvisExf4Minyr1ApJQ2SoctfjhdU6kEbgBGgHDtCg=";
};
nativeBuildInputs = [ pkg-config ];
diff --git a/third_party/nixpkgs/pkgs/games/chromium-bsu/default.nix b/third_party/nixpkgs/pkgs/games/chromium-bsu/default.nix
new file mode 100644
index 0000000000..1ab2fb8722
--- /dev/null
+++ b/third_party/nixpkgs/pkgs/games/chromium-bsu/default.nix
@@ -0,0 +1,68 @@
+{ lib
+, stdenv
+, fetchurl
+, SDL2
+, SDL2_image
+, SDL2_mixer
+, fontconfig
+, freealut
+, freeglut
+, ftgl
+, gettext
+, glpng
+, libGL
+, libGLU
+, openal
+, pkg-config
+, quesoglc
+}:
+
+stdenv.mkDerivation rec {
+ pname = "chromium-bsu";
+ version = "0.9.16.1";
+
+ src = fetchurl {
+ url = "mirror://sourceforge/project/chromium-bsu/Chromium%20B.S.U.%20source%20code/${pname}-${version}.tar.gz";
+ hash = "sha256-ocFBo00ZpZYHroEWahmGTrjITPhrFVRi/tMabVbhYko=";
+ };
+
+ nativeBuildInputs = [
+ gettext
+ pkg-config
+ ];
+ buildInputs = [
+ SDL2
+ SDL2_image
+ SDL2_mixer
+ fontconfig
+ freealut
+ freeglut
+ ftgl
+ glpng
+ libGL
+ libGLU
+ openal
+ quesoglc
+ ];
+
+ # Autodetection is somewhat buggy; this is to avoid SLD1 to be loaded
+ configureFlags = [
+ "--disable-sdlimage"
+ "--disable-sdlmixer"
+ ];
+
+
+ postInstall = ''
+ install -D misc/chromium-bsu.png $out/share/pixmaps/chromium-bsu.png
+ install -D misc/chromium-bsu.desktop $out/share/applications/chromium-bsu.desktop
+ '';
+
+ meta = with lib; {
+ homepage = "http://chromium-bsu.sourceforge.net/";
+ description = "A fast paced, arcade-style, top-scrolling space shooter";
+ license = licenses.artistic1;
+ maintainers = with maintainers; [ AndersonTorres ];
+ platforms = platforms.unix;
+ };
+}
+# TODO [ AndersonTorres ]: joystick; gothic uralic font
diff --git a/third_party/nixpkgs/pkgs/games/crafty/default.nix b/third_party/nixpkgs/pkgs/games/crafty/default.nix
index 1328488dde..b5b53aa3c4 100644
--- a/third_party/nixpkgs/pkgs/games/crafty/default.nix
+++ b/third_party/nixpkgs/pkgs/games/crafty/default.nix
@@ -19,7 +19,7 @@ stdenv.mkDerivation rec {
sha256 = "12g70mgfifwssfvndzq94pin34dizlixhsga75vgj7dakysi2p7f";
};
- buildInputs = [ unzip ];
+ nativeBuildInputs = [ unzip ];
unpackPhase = ''
mkdir "craftysrc"
diff --git a/third_party/nixpkgs/pkgs/games/dwarf-fortress/twbt/default.nix b/third_party/nixpkgs/pkgs/games/dwarf-fortress/twbt/default.nix
index 48826ca916..bee2c28e53 100644
--- a/third_party/nixpkgs/pkgs/games/dwarf-fortress/twbt/default.nix
+++ b/third_party/nixpkgs/pkgs/games/dwarf-fortress/twbt/default.nix
@@ -71,7 +71,7 @@ stdenvNoCC.mkDerivation rec {
outputs = [ "lib" "art" "out" ];
- buildInputs = [ unzip ];
+ nativeBuildInputs = [ unzip ];
installPhase = ''
mkdir -p $lib/hack/{plugins,lua} $art/data/art
diff --git a/third_party/nixpkgs/pkgs/games/exult/default.nix b/third_party/nixpkgs/pkgs/games/exult/default.nix
index e16e62f82f..40d7300e9c 100644
--- a/third_party/nixpkgs/pkgs/games/exult/default.nix
+++ b/third_party/nixpkgs/pkgs/games/exult/default.nix
@@ -21,8 +21,8 @@ stdenv.mkDerivation rec {
configureFlags = [ "--disable-tools" ];
- nativeBuildInputs = [ pkg-config ];
- buildInputs = [ SDL2 libogg libvorbis zlib unzip ];
+ nativeBuildInputs = [ pkg-config unzip ];
+ buildInputs = [ SDL2 libogg libvorbis zlib ];
enableParallelBuilding = true;
diff --git a/third_party/nixpkgs/pkgs/games/gogui/default.nix b/third_party/nixpkgs/pkgs/games/gogui/default.nix
index fa901c14f8..c7b37b31c3 100644
--- a/third_party/nixpkgs/pkgs/games/gogui/default.nix
+++ b/third_party/nixpkgs/pkgs/games/gogui/default.nix
@@ -5,8 +5,7 @@ let
in stdenv.mkDerivation {
pname = "gogui";
inherit version;
- nativeBuildInputs = [ makeWrapper ];
- buildInputs = [ unzip ];
+ nativeBuildInputs = [ makeWrapper unzip ];
src = fetchurl {
url = "mirror://sourceforge/project/gogui/gogui/${version}/gogui-${version}.zip";
sha256 = "0qk6p1bhi1816n638bg11ljyj6zxvm75jdf02aabzdmmd9slns1j";
diff --git a/third_party/nixpkgs/pkgs/games/keen4/default.nix b/third_party/nixpkgs/pkgs/games/keen4/default.nix
index c91cc48611..59bb30d627 100644
--- a/third_party/nixpkgs/pkgs/games/keen4/default.nix
+++ b/third_party/nixpkgs/pkgs/games/keen4/default.nix
@@ -9,7 +9,7 @@ stdenv.mkDerivation {
sha256 = "12rnc9ksl7v6l8wsxvr26ylkafzq80dbsa7yafzw9pqc8pafkhx1";
};
- buildInputs = [unzip];
+ nativeBuildInputs = [ unzip ];
inherit dosbox;
diff --git a/third_party/nixpkgs/pkgs/games/nexuiz/default.nix b/third_party/nixpkgs/pkgs/games/nexuiz/default.nix
index 60085d5c85..84d8a62000 100644
--- a/third_party/nixpkgs/pkgs/games/nexuiz/default.nix
+++ b/third_party/nixpkgs/pkgs/games/nexuiz/default.nix
@@ -21,9 +21,8 @@ in stdenv.mkDerivation {
sha256 = "0010jrxc68qqinkvdh1qn2b8z3sa5v1kcd8d1m4llp3pr6y7xqm5";
};
+ nativeBuildInputs = [ unzip ];
buildInputs = [
- # required for both
- unzip
# glx
libX11 libGLU libGL libXpm libXext libXxf86vm libXxf86dga alsaLib
# sdl
diff --git a/third_party/nixpkgs/pkgs/games/r2mod_cli/default.nix b/third_party/nixpkgs/pkgs/games/r2mod_cli/default.nix
index a966731725..f45dd39486 100644
--- a/third_party/nixpkgs/pkgs/games/r2mod_cli/default.nix
+++ b/third_party/nixpkgs/pkgs/games/r2mod_cli/default.nix
@@ -29,6 +29,6 @@ stdenv.mkDerivation rec {
homepage = "https://github.com/foldex/r2mod_cli";
license = licenses.gpl3Only;
maintainers = [ maintainers.reedrw ];
- platforms = platforms.linux;
+ platforms = platforms.unix;
};
}
diff --git a/third_party/nixpkgs/pkgs/games/rigsofrods/default.nix b/third_party/nixpkgs/pkgs/games/rigsofrods/default.nix
index 01dd1f0c04..72c8a49939 100644
--- a/third_party/nixpkgs/pkgs/games/rigsofrods/default.nix
+++ b/third_party/nixpkgs/pkgs/games/rigsofrods/default.nix
@@ -23,9 +23,9 @@ stdenv.mkDerivation rec {
ln -s $out/share/rigsofrods/{RoR,RoRConfig} $out/bin
'';
- nativeBuildInputs = [ cmake pkg-config ];
+ nativeBuildInputs = [ cmake pkg-config unzip ];
buildInputs = [ wxGTK30 freeimage zziplib libGLU libGL boost
- libuuid openal ogre ois curl gtk2 mygui unzip angelscript
+ libuuid openal ogre ois curl gtk2 mygui angelscript
ogrepaged mysocketw libxcb ];
meta = with lib; {
diff --git a/third_party/nixpkgs/pkgs/games/simutrans/default.nix b/third_party/nixpkgs/pkgs/games/simutrans/default.nix
index 942c93ec04..fc2654fd8e 100644
--- a/third_party/nixpkgs/pkgs/games/simutrans/default.nix
+++ b/third_party/nixpkgs/pkgs/games/simutrans/default.nix
@@ -115,8 +115,8 @@ let
sourceRoot = ".";
- nativeBuildInputs = [ pkg-config ];
- buildInputs = [ zlib libpng bzip2 SDL SDL_mixer unzip ];
+ nativeBuildInputs = [ pkg-config unzip ];
+ buildInputs = [ zlib libpng bzip2 SDL SDL_mixer ];
configurePhase = let
# Configuration as per the readme.txt and config.template
diff --git a/third_party/nixpkgs/pkgs/games/spring/default.nix b/third_party/nixpkgs/pkgs/games/spring/default.nix
index fe16a8a040..fef1a0f092 100644
--- a/third_party/nixpkgs/pkgs/games/spring/default.nix
+++ b/third_party/nixpkgs/pkgs/games/spring/default.nix
@@ -60,5 +60,7 @@ 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/third_party/nixpkgs/pkgs/games/steam/fonts.nix b/third_party/nixpkgs/pkgs/games/steam/fonts.nix
index 44dde01a8a..9cf68f2c29 100644
--- a/third_party/nixpkgs/pkgs/games/steam/fonts.nix
+++ b/third_party/nixpkgs/pkgs/games/steam/fonts.nix
@@ -8,7 +8,7 @@ stdenv.mkDerivation {
sha256 = "1cgygmwich5f1jhhbmbkkpnzasjl8gy36xln76n6r2gjh6awqfx0";
};
- buildInputs = [ unzip ];
+ nativeBuildInputs = [ unzip ];
sourceRoot = ".";
diff --git a/third_party/nixpkgs/pkgs/games/terraria-server/default.nix b/third_party/nixpkgs/pkgs/games/terraria-server/default.nix
index 94fb9d063b..de430d2962 100644
--- a/third_party/nixpkgs/pkgs/games/terraria-server/default.nix
+++ b/third_party/nixpkgs/pkgs/games/terraria-server/default.nix
@@ -10,8 +10,8 @@ stdenv.mkDerivation rec {
sha256 = "18hcy7jfizyyp0h66rga8z948xg3nyk32rzl7hgv7ar1w43airhh";
};
- buildInputs = [ file unzip ];
- nativeBuildInputs = [ autoPatchelfHook ];
+ buildInputs = [ file ];
+ nativeBuildInputs = [ autoPatchelfHook unzip ];
installPhase = ''
mkdir -p $out/bin
diff --git a/third_party/nixpkgs/pkgs/games/tremulous/default.nix b/third_party/nixpkgs/pkgs/games/tremulous/default.nix
index a4bf47b5e3..e07697f7c0 100644
--- a/third_party/nixpkgs/pkgs/games/tremulous/default.nix
+++ b/third_party/nixpkgs/pkgs/games/tremulous/default.nix
@@ -15,7 +15,8 @@ stdenv.mkDerivation rec {
url = "http://releases.mercenariesguild.net/tremded/mg_tremded_source_1.01.tar.gz";
sha256 = "1njrqlhzjvy9myddzkagszwdcf3m4h08wip888w2rmbshs6kz6ql";
};
- buildInputs = [ unzip libGLU libGL libX11 SDL openal ];
+ nativeBuildInputs = [ unzip ];
+ buildInputs = [ libGLU libGL libX11 SDL openal ];
unpackPhase = ''
unzip $src1
cd tremulous
diff --git a/third_party/nixpkgs/pkgs/games/urbanterror/default.nix b/third_party/nixpkgs/pkgs/games/urbanterror/default.nix
index 10553d483a..dfbad29fa9 100644
--- a/third_party/nixpkgs/pkgs/games/urbanterror/default.nix
+++ b/third_party/nixpkgs/pkgs/games/urbanterror/default.nix
@@ -15,7 +15,8 @@ stdenv.mkDerivation rec {
})
];
- buildInputs = [ unzip SDL libGL libGLU openal curl libXxf86vm ];
+ nativeBuildInputs = [ unzip ];
+ buildInputs = [ SDL libGL libGLU openal curl libXxf86vm ];
sourceRoot = "ioq3-for-UrbanTerror-4-release-${version}";
configurePhase = ''
diff --git a/third_party/nixpkgs/pkgs/games/worldofgoo/default.nix b/third_party/nixpkgs/pkgs/games/worldofgoo/default.nix
index 27a270fcf8..a9938cfcbc 100644
--- a/third_party/nixpkgs/pkgs/games/worldofgoo/default.nix
+++ b/third_party/nixpkgs/pkgs/games/worldofgoo/default.nix
@@ -34,7 +34,7 @@ stdenv.mkDerivation rec {
sha256 = "175e4b0499a765f1564942da4bd65029f8aae1de8231749c56bec672187d53ee";
};
- buildInputs = [ unzip ];
+ nativeBuildInputs = [ unzip ];
sourceRoot = pname;
phases = [ "unpackPhase installPhase" ];
diff --git a/third_party/nixpkgs/pkgs/games/xonotic/default.nix b/third_party/nixpkgs/pkgs/games/xonotic/default.nix
index 54ec25c8cf..fb6cb93f7f 100644
--- a/third_party/nixpkgs/pkgs/games/xonotic/default.nix
+++ b/third_party/nixpkgs/pkgs/games/xonotic/default.nix
@@ -62,7 +62,8 @@ let
sha256 = "0axxw04fyz6jlfqd0kp7hdrqa0li31sx1pbipf2j5qp9wvqicsay";
};
- buildInputs = [ unzip libjpeg zlib libvorbis curl ]
+ nativeBuildInputs = [ unzip ];
+ buildInputs = [ libjpeg zlib libvorbis curl ]
++ lib.optional withGLX [ libX11.dev libGLU.dev libGL.dev libXpm.dev libXext.dev libXxf86vm.dev alsaLib.dev ]
++ lib.optional withSDL [ SDL2.dev ];
diff --git a/third_party/nixpkgs/pkgs/games/zod/default.nix b/third_party/nixpkgs/pkgs/games/zod/default.nix
index 6c48caf875..c358e59992 100644
--- a/third_party/nixpkgs/pkgs/games/zod/default.nix
+++ b/third_party/nixpkgs/pkgs/games/zod/default.nix
@@ -24,8 +24,8 @@ stdenv.mkDerivation {
sourceRoot=`pwd`/src
'';
- nativeBuildInputs = [ makeWrapper ];
- buildInputs = [ unrar unzip SDL SDL_image SDL_ttf SDL_mixer libmysqlclient ];
+ nativeBuildInputs = [ makeWrapper unrar unzip ];
+ buildInputs = [ SDL SDL_image SDL_ttf SDL_mixer libmysqlclient ];
NIX_LDFLAGS = "-L${libmysqlclient}/lib/mysql";
diff --git a/third_party/nixpkgs/pkgs/misc/drivers/foo2zjs/default.nix b/third_party/nixpkgs/pkgs/misc/drivers/foo2zjs/default.nix
index deea3bd25f..e25deb4c77 100644
--- a/third_party/nixpkgs/pkgs/misc/drivers/foo2zjs/default.nix
+++ b/third_party/nixpkgs/pkgs/misc/drivers/foo2zjs/default.nix
@@ -8,7 +8,8 @@ stdenv.mkDerivation rec {
sha256 = "1rmw4jmxn2lqp124mapvnic0ma8ipyvisx2vj848mvad5g5w9x3z";
};
- buildInputs = [ foomatic-filters bc unzip ghostscript systemd vim ];
+ nativeBuildInputs = [ unzip ];
+ buildInputs = [ foomatic-filters bc ghostscript systemd vim ];
patches = [ ./no-hardcode-fw.diff ];
diff --git a/third_party/nixpkgs/pkgs/misc/emulators/atari800/default.nix b/third_party/nixpkgs/pkgs/misc/emulators/atari800/default.nix
index 163b81922c..53f1009cfa 100644
--- a/third_party/nixpkgs/pkgs/misc/emulators/atari800/default.nix
+++ b/third_party/nixpkgs/pkgs/misc/emulators/atari800/default.nix
@@ -13,9 +13,9 @@ stdenv.mkDerivation rec {
sha256 = "15l08clqqayi9izrgsz9achan6gl4x57wqsc8mad3yn0xayzz3qy";
};
- nativeBuildInputs = [ autoreconfHook ];
+ nativeBuildInputs = [ autoreconfHook unzip ];
- buildInputs = [ unzip zlib SDL readline libGLU libGL libX11 ];
+ buildInputs = [ zlib SDL readline libGLU libGL libX11 ];
configureFlags = [
"--target=default"
diff --git a/third_party/nixpkgs/pkgs/misc/emulators/nestopia/default.nix b/third_party/nixpkgs/pkgs/misc/emulators/nestopia/default.nix
index d1b18f12a8..70e5d94def 100644
--- a/third_party/nixpkgs/pkgs/misc/emulators/nestopia/default.nix
+++ b/third_party/nixpkgs/pkgs/misc/emulators/nestopia/default.nix
@@ -28,7 +28,6 @@ stdenv.mkDerivation rec {
libGLU libGL
libarchive
libao
- unzip
xdg-utils
gnome3.adwaita-icon-theme
];
@@ -37,6 +36,7 @@ stdenv.mkDerivation rec {
pkg-config
makeWrapper
wrapGAppsHook
+ unzip
];
installPhase = ''
diff --git a/third_party/nixpkgs/pkgs/misc/emulators/tilem/default.nix b/third_party/nixpkgs/pkgs/misc/emulators/tilem/default.nix
index d2252563d0..bde706e230 100644
--- a/third_party/nixpkgs/pkgs/misc/emulators/tilem/default.nix
+++ b/third_party/nixpkgs/pkgs/misc/emulators/tilem/default.nix
@@ -3,7 +3,7 @@
, lib
, pkg-config
, glib
-, gnome2
+, gtk2
, libticonv
, libtifiles2
, libticables2
@@ -18,7 +18,7 @@ stdenv.mkDerivation rec {
sha256 = "1ba38xzhp3yf21ip3cgql6jzy49jc34sfnjsl4syxyrd81d269zw";
};
nativeBuildInputs = [ pkg-config ];
- buildInputs = [ glib gnome2.gtk libticonv libtifiles2 libticables2 libticalcs2 ];
+ buildInputs = [ glib gtk2 libticonv libtifiles2 libticables2 libticalcs2 ];
NIX_CFLAGS_COMPILE = [ "-lm" ];
meta = with lib; {
homepage = "http://lpg.ticalc.org/prj_tilem/";
diff --git a/third_party/nixpkgs/pkgs/misc/mnemonicode/default.nix b/third_party/nixpkgs/pkgs/misc/mnemonicode/default.nix
index ec0dd0b1fd..352dd038fb 100644
--- a/third_party/nixpkgs/pkgs/misc/mnemonicode/default.nix
+++ b/third_party/nixpkgs/pkgs/misc/mnemonicode/default.nix
@@ -21,7 +21,7 @@ stdenv.mkDerivation {
back to data on the other side.
'';
license = licenses.mit;
- platforms = platforms.linux;
+ platforms = platforms.all;
maintainers = [ maintainers.cstrahan ];
};
}
diff --git a/third_party/nixpkgs/pkgs/misc/screensavers/xlockmore/default.nix b/third_party/nixpkgs/pkgs/misc/screensavers/xlockmore/default.nix
index b59ed85f6b..17b22ce072 100644
--- a/third_party/nixpkgs/pkgs/misc/screensavers/xlockmore/default.nix
+++ b/third_party/nixpkgs/pkgs/misc/screensavers/xlockmore/default.nix
@@ -2,11 +2,11 @@
, libXdmcp, libXt }:
stdenv.mkDerivation rec {
- name = "xlockmore-5.65";
+ name = "xlockmore-5.66";
src = fetchurl {
url = "http://sillycycle.com/xlock/${name}.tar.xz";
- sha256 = "0d4l8ibbvc62whlq8rrbvqr3011a7h21l9na93r579g0dfwdbh6d";
+ sha256 = "sha256-WXalw2YoKNFFIskOBvKN3PyOV3iP3gjri3pw6e87q3E=";
curlOpts = "--user-agent 'Mozilla/5.0'";
};
diff --git a/third_party/nixpkgs/pkgs/misc/source-and-tags/default.nix b/third_party/nixpkgs/pkgs/misc/source-and-tags/default.nix
index c82b96b82f..966a451c06 100644
--- a/third_party/nixpkgs/pkgs/misc/source-and-tags/default.nix
+++ b/third_party/nixpkgs/pkgs/misc/source-and-tags/default.nix
@@ -15,7 +15,7 @@
phases = "unpackPhase buildPhase";
inherit src srcDir tagSuffix;
name = "${name}-source-with-tags";
- buildInputs = [ unzip ];
+ nativeBuildInputs = [ unzip ];
# using separate tag directory so that you don't have to glob that much files when starting your editor
# is this a good choice?
buildPhase =
diff --git a/third_party/nixpkgs/pkgs/misc/vim-plugins/generated.nix b/third_party/nixpkgs/pkgs/misc/vim-plugins/generated.nix
index da4f37d28a..810622cfe8 100644
--- a/third_party/nixpkgs/pkgs/misc/vim-plugins/generated.nix
+++ b/third_party/nixpkgs/pkgs/misc/vim-plugins/generated.nix
@@ -65,12 +65,12 @@ let
ale = buildVimPluginFrom2Nix {
pname = "ale";
- version = "2021-03-07";
+ version = "2021-03-15";
src = fetchFromGitHub {
owner = "dense-analysis";
repo = "ale";
- rev = "c21d6afd2fb799013e3894d393bf976d9da31e65";
- sha256 = "1f4s6zq0270mpczwz7chi763rxnm2qk3gjfylwmr8r2ny6f5is1w";
+ rev = "dc40ece3c389804df6d9423e0d52c8da2355ea17";
+ sha256 = "0r4s8mbwa7zr3xa73viw8abvaz4ifvjahnifqd9nkivc2qz6s5x9";
};
meta.homepage = "https://github.com/dense-analysis/ale/";
};
@@ -209,12 +209,12 @@ let
auto-session = buildVimPluginFrom2Nix {
pname = "auto-session";
- version = "2021-03-08";
+ version = "2021-03-14";
src = fetchFromGitHub {
owner = "rmagatti";
repo = "auto-session";
- rev = "2bb1fcd8828df1de5c79821b6b01ba929af355f0";
- sha256 = "0xlzq51izzbhsl3jlqj3f719ixcqi7r7y8m8n6291yp1xpmidfwm";
+ rev = "aa1c0b161a82ecf876ca3fc2894e9000225f4adf";
+ sha256 = "13cinglppisp20mki1g23iz3kp5l9bq1yj89yip80y5kzb0aqsbj";
};
meta.homepage = "https://github.com/rmagatti/auto-session/";
};
@@ -257,12 +257,12 @@ let
barbar-nvim = buildVimPluginFrom2Nix {
pname = "barbar-nvim";
- version = "2021-03-07";
+ version = "2021-03-10";
src = fetchFromGitHub {
owner = "romgrk";
repo = "barbar.nvim";
- rev = "85432f426b7473bb7a4de9f698f91848737b0fd8";
- sha256 = "16ql06swg4flr933bp2qm8g5iy2sjgh650k18pzghc0qc9k517xd";
+ rev = "2d14a46d485363cdfc86c9a723f73b2a3e3930bd";
+ sha256 = "04c516xkr499z7yfpzmab7aa3y60qhid5zx2kf0askancpvxkmvc";
};
meta.homepage = "https://github.com/romgrk/barbar.nvim/";
};
@@ -389,12 +389,12 @@ let
chadtree = buildVimPluginFrom2Nix {
pname = "chadtree";
- version = "2021-03-10";
+ version = "2021-03-16";
src = fetchFromGitHub {
owner = "ms-jpq";
repo = "chadtree";
- rev = "36bc8699c7fe94d8c184bc2d17382752557bd22e";
- sha256 = "0swcw4cfhshfb6rmq93r5lmr338gn0ci7wmhabvmpxzhwwm28xvr";
+ rev = "9bfc3e5c79577b15be4b4a464573a4225d41184c";
+ sha256 = "0l7jm2v79kisk4xr33wdfm8fsx1g7c217m8dqn6d7bhj9s3nyf47";
};
meta.homepage = "https://github.com/ms-jpq/chadtree/";
};
@@ -497,24 +497,24 @@ let
coc-fzf = buildVimPluginFrom2Nix {
pname = "coc-fzf";
- version = "2021-02-27";
+ version = "2021-03-13";
src = fetchFromGitHub {
owner = "antoinemadec";
repo = "coc-fzf";
- rev = "3c8ca6127af51768cad8ff1074db5a9713d7fe13";
- sha256 = "17988plg3zrfnfzp4pr292qbk5zi8qgjldkhqsv5w9w38a02gxqj";
+ rev = "4f44d0749bf9ac1e3755c276222a20015c3fe3be";
+ sha256 = "0qrg8m82pmzs8pia16z05pkm9hhcijlw8w79r35silccsicsz8l1";
};
meta.homepage = "https://github.com/antoinemadec/coc-fzf/";
};
coc-lua = buildVimPluginFrom2Nix {
pname = "coc-lua";
- version = "2021-03-10";
+ version = "2021-03-16";
src = fetchFromGitHub {
owner = "josa42";
repo = "coc-lua";
- rev = "946e8393cd9189f97a50084c2a040966dce0f0cb";
- sha256 = "0d74lk85hkjb0w4fzvsp4gljl224ci749g2l25a1kd6kihyf7f82";
+ rev = "f149d512bd183db51ef0c714568a64d647d3e7ef";
+ sha256 = "0lrbn7rd6w5xqs9z7gsdka8kcaz46azzd9s3ppzdanq7715d8qx4";
};
meta.homepage = "https://github.com/josa42/coc-lua/";
};
@@ -545,12 +545,12 @@ let
coc-nvim = buildVimPluginFrom2Nix {
pname = "coc-nvim";
- version = "2021-03-09";
+ version = "2021-03-15";
src = fetchFromGitHub {
owner = "neoclide";
repo = "coc.nvim";
- rev = "ab4f3f5797754334def047466a998b92f3076db9";
- sha256 = "1wr0v1kgv9km5rfc9g49897043gk3hraf07z8i937144z34qasf1";
+ rev = "d3fa3e2a184c174ccdf68051886782fbe8fb8ade";
+ sha256 = "0ywicgnld69qp4vv0x2aq9xjaks6i3vmzq1lsr4nhss02jgd0ldx";
};
meta.homepage = "https://github.com/neoclide/coc.nvim/";
};
@@ -593,12 +593,12 @@ let
command-t = buildVimPluginFrom2Nix {
pname = "command-t";
- version = "2021-03-04";
+ version = "2021-03-14";
src = fetchFromGitHub {
owner = "wincent";
repo = "command-t";
- rev = "7c14a8c0da5127c38f0c5b1b7061491c3cfb5ea3";
- sha256 = "128331ipqjqicb5j8jifmg268faxfd4lwy4b20h5hy9macfyvys6";
+ rev = "a7ce436b211a7ac1f47cfd440370653e33c2a1d5";
+ sha256 = "1yfcbh9q35w1ckdv8isbwjwlgnjnjmqm8yc7bcbfirkx9pjlsw2z";
fetchSubmodules = true;
};
meta.homepage = "https://github.com/wincent/command-t/";
@@ -738,12 +738,12 @@ let
Coqtail = buildVimPluginFrom2Nix {
pname = "Coqtail";
- version = "2021-03-09";
+ version = "2021-03-14";
src = fetchFromGitHub {
owner = "whonore";
repo = "Coqtail";
- rev = "3b61d0755a4523a131096c97fb016b102e7b1672";
- sha256 = "1df1zq117vf6w7d9y0l9cdicsw1qw3d497xnckk3c0r0kv8w6hkc";
+ rev = "0c633489b6e6d2282b3abb9c5396c5f4c27afb55";
+ sha256 = "07vdzpy9ws76csgr8qs7m0krb6rkd17fbcn5168lyzcil52d3dwn";
};
meta.homepage = "https://github.com/whonore/Coqtail/";
};
@@ -786,12 +786,12 @@ let
csv-vim = buildVimPluginFrom2Nix {
pname = "csv-vim";
- version = "2021-02-18";
+ version = "2021-03-15";
src = fetchFromGitHub {
owner = "chrisbra";
repo = "csv.vim";
- rev = "73c8eeca4c89768e4c53bb7a83cc3741bdcb5c7d";
- sha256 = "0hdcq8acylp8i3gh0agxjr3v34q6c4qmdwnpx1v31y3cy0j8k7v3";
+ rev = "24da62f64e6025be12ad60b16489b561f228e619";
+ sha256 = "0x5z46rzhwrdr1fzq69c6bpn3dnjjj9a64s97wn220n4xwrz1y54";
};
meta.homepage = "https://github.com/chrisbra/csv.vim/";
};
@@ -858,12 +858,12 @@ let
dashboard-nvim = buildVimPluginFrom2Nix {
pname = "dashboard-nvim";
- version = "2021-03-10";
+ version = "2021-03-14";
src = fetchFromGitHub {
owner = "glepnir";
repo = "dashboard-nvim";
- rev = "6849ecf77a6075e55946c642f07a562fcdcdd579";
- sha256 = "0pyvscibc7ydn294kffwp80gfwk5rk4v63haih79c7acq52xmm0l";
+ rev = "563c8c1885044ad3fbb5339ad5a10439d9899e51";
+ sha256 = "0xp6dpdz45lfqx0s6xhxkgxwnbbdwiaybjvb0qfyh2pziirxdrxm";
};
meta.homepage = "https://github.com/glepnir/dashboard-nvim/";
};
@@ -894,12 +894,12 @@ let
defx-nvim = buildVimPluginFrom2Nix {
pname = "defx-nvim";
- version = "2021-03-09";
+ version = "2021-03-15";
src = fetchFromGitHub {
owner = "Shougo";
repo = "defx.nvim";
- rev = "fc76104d2b7204c016bd8e1750a06150800c4735";
- sha256 = "1ch1g39r2iyd8ma11kfi6fqy0cp0ybqv0laqs1pxphlw2z575jrj";
+ rev = "6224e6981dc33887bc045a7eab7df6f94106c4af";
+ sha256 = "0spj16d6n4swxcq2iv48si5l3pahmx6wypp4yc2mnaj2yxcjr39p";
};
meta.homepage = "https://github.com/Shougo/defx.nvim/";
};
@@ -942,24 +942,24 @@ let
denite-nvim = buildVimPluginFrom2Nix {
pname = "denite-nvim";
- version = "2021-03-03";
+ version = "2021-03-16";
src = fetchFromGitHub {
owner = "Shougo";
repo = "denite.nvim";
- rev = "db2d82cfbd85d8b6caafbd967a27f4d1c6ea5fa6";
- sha256 = "173nmv0d729hk9xbz9jdk9h9zlm9dhz89pgda7vggrp9dp8d1z5v";
+ rev = "c1dcff549abba061670a67af69eff7021955733c";
+ sha256 = "0vqdxjadxz1xh5q7i7m6964l9gqss59lv1n4s7109cfjylacmsxx";
};
meta.homepage = "https://github.com/Shougo/denite.nvim/";
};
deol-nvim = buildVimPluginFrom2Nix {
pname = "deol-nvim";
- version = "2021-02-22";
+ version = "2021-03-15";
src = fetchFromGitHub {
owner = "Shougo";
repo = "deol.nvim";
- rev = "d66c706c9788aa47399485a3ec29a2a76711a188";
- sha256 = "09bj5442xln6a98ncnq1lxkyrl8c973p9sfd02zl1a3f16sms415";
+ rev = "f0f28abb21dba278c041f6cb6c71585d9e3bed00";
+ sha256 = "05q8zm3hmc2rbw7hq0ri0f4jgqjh399dfrm5lpi2jmwf9hkqy0yc";
};
meta.homepage = "https://github.com/Shougo/deol.nvim/";
};
@@ -1184,12 +1184,12 @@ let
deoplete-nvim = buildVimPluginFrom2Nix {
pname = "deoplete-nvim";
- version = "2021-03-10";
+ version = "2021-03-14";
src = fetchFromGitHub {
owner = "Shougo";
repo = "deoplete.nvim";
- rev = "aa32b3d2e8f4240c7908f098f89359d20063c691";
- sha256 = "1048kb3sxmsbd9xk4s1nxvhgkrfixvpragbj6sm00sy4hx5qfq4j";
+ rev = "b05a60c81572994eb9b4e1aa5c1c5dba98e10349";
+ sha256 = "02dfns6ay9vi580nazzqfj858g0bhi3dwpd5kgg03gk38ybmxvgz";
};
meta.homepage = "https://github.com/Shougo/deoplete.nvim/";
};
@@ -1317,12 +1317,12 @@ let
embark-vim = buildVimPluginFrom2Nix {
pname = "embark-vim";
- version = "2021-02-23";
+ version = "2021-03-12";
src = fetchFromGitHub {
owner = "embark-theme";
repo = "vim";
- rev = "d9ea898794c486e2517823f24b9577ce4c488364";
- sha256 = "0l1f9pl8nh8lkswwrsw13s8d10ccq0c1jfd3bpszsxc6ryjm0wqw";
+ rev = "fda8867d405a93938f154fb9d70e4f4a4e6ef8c8";
+ sha256 = "09kvk3wjmpvssv8j5iba2dngnfkv178gkr620pa3k1imb0m9f0bq";
};
meta.homepage = "https://github.com/embark-theme/vim/";
};
@@ -1414,12 +1414,12 @@ let
fern-vim = buildVimPluginFrom2Nix {
pname = "fern-vim";
- version = "2021-02-28";
+ version = "2021-03-14";
src = fetchFromGitHub {
owner = "lambdalisue";
repo = "fern.vim";
- rev = "c09eb24de7a647a2b4878f8dc86b3d3565b3e8af";
- sha256 = "0mqrrb899bgf13r2klkqh4ycz167fx98kjnrhdg2jhq8gg85i0ih";
+ rev = "31c76b351f6d995009dcd117d7910b80df96928a";
+ sha256 = "1qkf6bsff6cfrqyhdrmn91diq9p53i3i3fvgcb5m9az33p42fqgn";
};
meta.homepage = "https://github.com/lambdalisue/fern.vim/";
};
@@ -1535,24 +1535,24 @@ let
fzf-vim = buildVimPluginFrom2Nix {
pname = "fzf-vim";
- version = "2021-03-06";
+ version = "2021-03-14";
src = fetchFromGitHub {
owner = "junegunn";
repo = "fzf.vim";
- rev = "711fb41e39e2ad3abec1ec9720782acbac6fb6b4";
- sha256 = "1jfjj20arsikk8alaa7jrp7aakkpakpnjbkk4ri0s95f8ix09wcm";
+ rev = "1ef72b14ccd05fdbdb01d253b91a74c4760ae655";
+ sha256 = "1yrj8dq0n3wfdrl5c93cfzsjyv175b9h65iwxkincag926m6sr06";
};
meta.homepage = "https://github.com/junegunn/fzf.vim/";
};
galaxyline-nvim = buildVimPluginFrom2Nix {
pname = "galaxyline-nvim";
- version = "2021-03-10";
+ version = "2021-03-14";
src = fetchFromGitHub {
owner = "glepnir";
repo = "galaxyline.nvim";
- rev = "a6c2cbc2218cb2e59fd3353fb827da82b84a248a";
- sha256 = "1vj4f61x5p1zg8cr4a7a90xij810v6zkbzdwpkbksfmyrxfkvqs8";
+ rev = "6a88f1bc181bef0ad2b10e962e30896cb064818a";
+ sha256 = "0gjqfiq0gqbbqd2irb5j0xhjmhriipy3vn8rsls5cmx3mfaxrz1r";
};
meta.homepage = "https://github.com/glepnir/galaxyline.nvim/";
};
@@ -1605,6 +1605,18 @@ let
meta.homepage = "https://github.com/eagletmt/ghcmod-vim/";
};
+ git-blame-nvim = buildVimPluginFrom2Nix {
+ pname = "git-blame-nvim";
+ version = "2021-02-20";
+ src = fetchFromGitHub {
+ owner = "f-person";
+ repo = "git-blame.nvim";
+ rev = "0ae9a1bd371b92e666c55b64447d8f75d5c7665a";
+ sha256 = "0i9gwpi00mn9mn20v8qz4q8v1dq79vq7f2i5f8ssnrgprqmc87zr";
+ };
+ meta.homepage = "https://github.com/f-person/git-blame.nvim/";
+ };
+
git-messenger-vim = buildVimPluginFrom2Nix {
pname = "git-messenger-vim";
version = "2021-02-28";
@@ -1631,12 +1643,12 @@ let
gitsigns-nvim = buildVimPluginFrom2Nix {
pname = "gitsigns-nvim";
- version = "2021-03-10";
+ version = "2021-03-15";
src = fetchFromGitHub {
owner = "lewis6991";
repo = "gitsigns.nvim";
- rev = "6f282d9e99e04780d645e0133c4376486bd16c23";
- sha256 = "0jy682lmafxpippsrd63r46dda5a96vrd1filj1b5xqniqwk4mrz";
+ rev = "89e8320d58b0a2aba32aca576510e4f08d27ae07";
+ sha256 = "1yd6jfakykl467m2glvy3alw7jw461jwgnnvfh47fy2a375rwy65";
};
meta.homepage = "https://github.com/lewis6991/gitsigns.nvim/";
};
@@ -1799,12 +1811,12 @@ let
hop-nvim = buildVimPluginFrom2Nix {
pname = "hop-nvim";
- version = "2021-03-06";
+ version = "2021-03-15";
src = fetchFromGitHub {
owner = "phaazon";
repo = "hop.nvim";
- rev = "b3224bc6231a6a3543390cdfab4e4226dbfe40a7";
- sha256 = "165csrpk2mq685i13kyf7w935al1qwgqd2myyn2gnznbfpbnlcw1";
+ rev = "ac45488406e2a21735be80d634bf0c218bffddd2";
+ sha256 = "1pzb1mw019wjx174jnaxnivblajrh00776jck7bdcn5rdpk2dmqs";
};
meta.homepage = "https://github.com/phaazon/hop.nvim/";
};
@@ -2064,12 +2076,12 @@ let
kotlin-vim = buildVimPluginFrom2Nix {
pname = "kotlin-vim";
- version = "2021-03-08";
+ version = "2021-03-11";
src = fetchFromGitHub {
owner = "udalov";
repo = "kotlin-vim";
- rev = "4188c157147fa1f3104edac7f52b41c8f18c6d8b";
- sha256 = "18kb56lwn3xl0xq4h34hr3z3ja1phbjpaxk6281d38wkj8randk8";
+ rev = "4e94ec5d3c821daaeac40c4d243cb55d07924fd2";
+ sha256 = "1vj3pcxn1byggbfqv2k5m09cwpbsphivdbzpw8qs111hda0cv61s";
};
meta.homepage = "https://github.com/udalov/kotlin-vim/";
};
@@ -2232,12 +2244,12 @@ let
lightline-bufferline = buildVimPluginFrom2Nix {
pname = "lightline-bufferline";
- version = "2021-02-28";
+ version = "2021-03-10";
src = fetchFromGitHub {
owner = "mengelbrecht";
repo = "lightline-bufferline";
- rev = "9cec4e2329324366801e1272305be907d141d77c";
- sha256 = "1xz36jrm3iql6xgznycwf8mxlaw05f788k4p9xbvcrh3i0zck1za";
+ rev = "f1feb5b3b9d1b13ccedae475e9346392e17895a4";
+ sha256 = "1wki7q6w6ld1lx792f62s8k72ikcdl6il3ybsxxlajmnj5mixvkg";
};
meta.homepage = "https://github.com/mengelbrecht/lightline-bufferline/";
};
@@ -2280,12 +2292,12 @@ let
lsp-status-nvim = buildVimPluginFrom2Nix {
pname = "lsp-status-nvim";
- version = "2021-02-14";
+ version = "2021-03-13";
src = fetchFromGitHub {
owner = "nvim-lua";
repo = "lsp-status.nvim";
- rev = "925acdab0886fe5f0752561ea49e95b9f02e09c7";
- sha256 = "0rd3gqgz573ll11wnw1r182siamc3cxqqf3cyhqznkiq7bw2g9xh";
+ rev = "0aaf6a68e8668c1baa724c0d31679ad12f27cd47";
+ sha256 = "08dlfm3f9qa4p77zznmgjrmx09yngpcfzmxmyc5z3gp51b6bbixb";
};
meta.homepage = "https://github.com/nvim-lua/lsp-status.nvim/";
};
@@ -2316,24 +2328,24 @@ let
lspsaga-nvim = buildVimPluginFrom2Nix {
pname = "lspsaga-nvim";
- version = "2021-03-10";
+ version = "2021-03-16";
src = fetchFromGitHub {
owner = "glepnir";
repo = "lspsaga.nvim";
- rev = "80c29017e9897280273473956009cc641a0b3709";
- sha256 = "1n08g56qiqq150hkihbwdnij5p1gipfddxh49vh8gs6jq7xk2vc5";
+ rev = "a89d3290ee259c5afca6eb32f236077aa91466f0";
+ sha256 = "0pm6069h1p84jj80jd8jyi0lb6s73qvrqg1hjks88cfgbq5p9ryy";
};
meta.homepage = "https://github.com/glepnir/lspsaga.nvim/";
};
lualine-nvim = buildVimPluginFrom2Nix {
pname = "lualine-nvim";
- version = "2021-03-06";
+ version = "2021-03-15";
src = fetchFromGitHub {
owner = "hoob3rt";
repo = "lualine.nvim";
- rev = "332f488e2499d0f7a09276adcdd50995b348f7de";
- sha256 = "184csjlaizgd1fi7f3w6j67qvy1cg9sqiy5zjd1qy010bfl1cl46";
+ rev = "62cdc8ec983eb189cfab7481f49e6bf058ff52ac";
+ sha256 = "1p25mpg448abqy1bi568mqzbh75xvvfnf0rgsrfah2rlxz468f5a";
};
meta.homepage = "https://github.com/hoob3rt/lualine.nvim/";
};
@@ -2400,12 +2412,12 @@ let
minimap-vim = buildVimPluginFrom2Nix {
pname = "minimap-vim";
- version = "2021-03-05";
+ version = "2021-03-14";
src = fetchFromGitHub {
owner = "wfxr";
repo = "minimap.vim";
- rev = "df3bef57602e9633151c9c4a0ab2b48f1c0d5abc";
- sha256 = "1v4k8nhss8asg2p5jdxkjaqg3z7w1byzxi62vl4k1wkzmp5afpnf";
+ rev = "98c598c4fd067735e16fc78a3d24be605c5d4588";
+ sha256 = "1mzbbfbayihlgd8xbj30vw0nbdyd6fd0wp4v5gnsgbdzfn63qda7";
};
meta.homepage = "https://github.com/wfxr/minimap.vim/";
};
@@ -2712,12 +2724,12 @@ let
neogit = buildVimPluginFrom2Nix {
pname = "neogit";
- version = "2021-03-03";
+ version = "2021-03-14";
src = fetchFromGitHub {
owner = "TimUntersberger";
repo = "neogit";
- rev = "974f8c51385710a1422e841372848308ca7e615b";
- sha256 = "1n0y4gsjbh4yc5b1smckzx7gy4kzavdp7dpaic03adf23akndm1i";
+ rev = "f60af4296507c453ea74b2557aac8eedd8a432b4";
+ sha256 = "1iby4h6wlkql7r8szahgjwpyzn8r0jh3yg9zdin3b21ywqld0jp0";
};
meta.homepage = "https://github.com/TimUntersberger/neogit/";
};
@@ -2914,6 +2926,18 @@ let
meta.homepage = "https://github.com/tjdevries/nlua.nvim/";
};
+ nnn-vim = buildVimPluginFrom2Nix {
+ pname = "nnn-vim";
+ version = "2021-02-28";
+ src = fetchFromGitHub {
+ owner = "mcchrish";
+ repo = "nnn.vim";
+ rev = "edfc91e1189a36a5f0d5438d7f9c575571f759fa";
+ sha256 = "11dzqhd2kp537ig8zcny0j56644mmrgygiw3wvfh1ly9gb9l2r9f";
+ };
+ meta.homepage = "https://github.com/mcchrish/nnn.vim/";
+ };
+
nord-vim = buildVimPluginFrom2Nix {
pname = "nord-vim";
version = "2020-07-06";
@@ -2940,12 +2964,12 @@ let
nvcode-color-schemes-vim = buildVimPluginFrom2Nix {
pname = "nvcode-color-schemes-vim";
- version = "2021-03-10";
+ version = "2021-03-15";
src = fetchFromGitHub {
owner = "ChristianChiarulli";
repo = "nvcode-color-schemes.vim";
- rev = "497d8f8ddc4e7ed339c8afbbfe80fb6a57743297";
- sha256 = "012vnr7s7y3vv3n3fk10yxm7khwxnn7mjrkiixhrjq3lp4cai7xi";
+ rev = "8d26e7cfbc2cd8cdca19432d2048e8e01a751573";
+ sha256 = "007vi49s9la0w31wcikf233f43nkhfdk29dh6bha1z0wrrys20kj";
};
meta.homepage = "https://github.com/ChristianChiarulli/nvcode-color-schemes.vim/";
};
@@ -2976,12 +3000,12 @@ let
nvim-bqf = buildVimPluginFrom2Nix {
pname = "nvim-bqf";
- version = "2021-03-08";
+ version = "2021-03-16";
src = fetchFromGitHub {
owner = "kevinhwang91";
repo = "nvim-bqf";
- rev = "0e772b3ffb16ad1b712fe72c95b3b2bddc2c7ade";
- sha256 = "051nly6h78cmx79nppxi86jchdjn90l3q96fx4g99pkgivsbswad";
+ rev = "fae71d14f2cd61becc87bae223f0c3a6fb72245c";
+ sha256 = "054v62pp33kxfx9rcqh7dqa2glpi1fsm0z4gsh9nwf4y60hx0fhs";
};
meta.homepage = "https://github.com/kevinhwang91/nvim-bqf/";
};
@@ -3000,12 +3024,12 @@ let
nvim-compe = buildVimPluginFrom2Nix {
pname = "nvim-compe";
- version = "2021-03-09";
+ version = "2021-03-16";
src = fetchFromGitHub {
owner = "hrsh7th";
repo = "nvim-compe";
- rev = "25170751944b64bb7b65af1e35772361485bc936";
- sha256 = "0vaw5g4iflc0k1xy51rhgn1kb4qzxdd92r5nhnwvbc3fr6xkn464";
+ rev = "f38ab64d66be371aae19495bc9880bd9232db7a8";
+ sha256 = "196nyan70mhh7p3fqdgnyy7hb5pbhg05gq8nlp8xaaas19ai6kqa";
};
meta.homepage = "https://github.com/hrsh7th/nvim-compe/";
};
@@ -3024,24 +3048,24 @@ let
nvim-dap = buildVimPluginFrom2Nix {
pname = "nvim-dap";
- version = "2021-03-04";
+ version = "2021-03-15";
src = fetchFromGitHub {
owner = "mfussenegger";
repo = "nvim-dap";
- rev = "9d2a8bf00b26c2acafdf921f3c81ee2283e5daff";
- sha256 = "1qma3cnh7hm81qpx1x8zx5qbqjh4m0c7n7x7622vs4c0698j9nqc";
+ rev = "492849bf57425d005c4a13ee2a5d6f3c8207cc02";
+ sha256 = "1jspnzkb9371jfkppj77f95zccbnyw6gn0i4jlqpbci2p0ppp0gz";
};
meta.homepage = "https://github.com/mfussenegger/nvim-dap/";
};
nvim-dap-virtual-text = buildVimPluginFrom2Nix {
pname = "nvim-dap-virtual-text";
- version = "2021-01-31";
+ version = "2021-03-15";
src = fetchFromGitHub {
owner = "theHamsta";
repo = "nvim-dap-virtual-text";
- rev = "3da747bbbaf3291838d984a26a423cc704794eca";
- sha256 = "1lmcjclvdhd4jq0lsgrzv7y7ry9yiqh6bsinwrla5fbh63rfwkzc";
+ rev = "b26acb69a5a4940f9eb3fd6f4bca8e1cc16fa5ce";
+ sha256 = "16dkgmcfdx1n72khlwrcykwwpcjzz2mdh7dc53vb4j0pbmqmnna2";
};
meta.homepage = "https://github.com/theHamsta/nvim-dap-virtual-text/";
};
@@ -3072,12 +3096,12 @@ let
nvim-hlslens = buildVimPluginFrom2Nix {
pname = "nvim-hlslens";
- version = "2021-03-03";
+ version = "2021-03-15";
src = fetchFromGitHub {
owner = "kevinhwang91";
repo = "nvim-hlslens";
- rev = "3ce138f52ba5fb8731899bcee0323594bf0aa7a0";
- sha256 = "042x1s1xqv81ym1jblhpm6ak8nf6s9pax6g340nac639x34zm7bh";
+ rev = "3e975aaaf19af2c11535cfa99fd4765b9836a3fd";
+ sha256 = "1dw1mq461jl3vrq9n920j630sqdbs716lyqs75p94xxdw9rrdd04";
};
meta.homepage = "https://github.com/kevinhwang91/nvim-hlslens/";
};
@@ -3096,36 +3120,36 @@ let
nvim-jdtls = buildVimPluginFrom2Nix {
pname = "nvim-jdtls";
- version = "2021-03-05";
+ version = "2021-03-12";
src = fetchFromGitHub {
owner = "mfussenegger";
repo = "nvim-jdtls";
- rev = "8ff60d5e91fe2a4c1dedc6685ef7722e8e7bce78";
- sha256 = "1gaw6pcvgw31dkdpni708l3kcyw3fv3fk05fn3cgs0sdn4xzmnkj";
+ rev = "de1fbbb64f57a5b770812ed0e8d515429f31f564";
+ sha256 = "08dbdmnl56yks8aqjszxi9qs0a47m92q2azhxgsri8566jsc3ny8";
};
meta.homepage = "https://github.com/mfussenegger/nvim-jdtls/";
};
nvim-lightbulb = buildVimPluginFrom2Nix {
pname = "nvim-lightbulb";
- version = "2021-02-18";
+ version = "2021-03-13";
src = fetchFromGitHub {
owner = "kosayoda";
repo = "nvim-lightbulb";
- rev = "37d427ae1635da7800f7f09f831b35df1185ac38";
- sha256 = "012hd5xpcmmvgxrk6m7m28q288v485w7nzvnayfl4s3dk4jzq8rp";
+ rev = "9c3b264ae2da1d984f0482d5a0dfa43f567fa064";
+ sha256 = "0yjxmnn3a7fw0fjwfqk284zshlw8v7wp8pn16d5m40rvbkk2ipzr";
};
meta.homepage = "https://github.com/kosayoda/nvim-lightbulb/";
};
nvim-lspconfig = buildVimPluginFrom2Nix {
pname = "nvim-lspconfig";
- version = "2021-03-10";
+ version = "2021-03-14";
src = fetchFromGitHub {
owner = "neovim";
repo = "nvim-lspconfig";
- rev = "11a581d1860a7ad2b6c1ee1e0ebbb000e81b9950";
- sha256 = "0khbp05sgz07sazgkmv4pwrnnisswkagx4gwkw9slawm4qb1k93j";
+ rev = "73691999f77db352823c0e92e7cb083582127dd8";
+ sha256 = "14d3w6gjkvc1pjsj106w34k7qgp92b8gwd9l12rmci805i9l696m";
};
meta.homepage = "https://github.com/neovim/nvim-lspconfig/";
};
@@ -3142,6 +3166,18 @@ let
meta.homepage = "https://github.com/RishabhRD/nvim-lsputils/";
};
+ nvim-nonicons = buildVimPluginFrom2Nix {
+ pname = "nvim-nonicons";
+ version = "2021-03-15";
+ src = fetchFromGitHub {
+ owner = "yamatsum";
+ repo = "nvim-nonicons";
+ rev = "62af84ae39407d8afbd6bbc53cbca1167df476f3";
+ sha256 = "0jbdyixpr8s6q3wd6hncc78qvs0rswx1kgmvnv4sl2nzimbpzfkw";
+ };
+ meta.homepage = "https://github.com/yamatsum/nvim-nonicons/";
+ };
+
nvim-peekup = buildVimPluginFrom2Nix {
pname = "nvim-peekup";
version = "2021-03-06";
@@ -3156,12 +3192,12 @@ let
nvim-scrollview = buildVimPluginFrom2Nix {
pname = "nvim-scrollview";
- version = "2021-03-09";
+ version = "2021-03-14";
src = fetchFromGitHub {
owner = "dstein64";
repo = "nvim-scrollview";
- rev = "16c7c64872d4e6634cd5cf2d7db63474b2e8beda";
- sha256 = "15ig6x9xdl4gz9yvnhhxic106h03xxm95sd6kgmjpdpvibnv448n";
+ rev = "58612e2b4fb4406bad3c916651dd00580cf69a61";
+ sha256 = "162vvgarasbq9x6l5k2b85a0pq1jilswfj7d12wvjczw8w0h2x6r";
};
meta.homepage = "https://github.com/dstein64/nvim-scrollview/";
};
@@ -3180,36 +3216,36 @@ let
nvim-tree-lua = buildVimPluginFrom2Nix {
pname = "nvim-tree-lua";
- version = "2021-03-09";
+ version = "2021-03-14";
src = fetchFromGitHub {
owner = "kyazdani42";
repo = "nvim-tree.lua";
- rev = "31ef294d05e1feeb5eb9e8ff3895d09cc93d95e4";
- sha256 = "0vcgvwcibqq5j59nw09z2mc0gb79nyhiwnxny81h0m56mn2v9a6r";
+ rev = "4c46d2b1927590e1bba4ee4656a771e9941b2727";
+ sha256 = "1sjn6fnwc9k0nv2jz88m34g0nyf43knb9f1l53nj69inilxirhmy";
};
meta.homepage = "https://github.com/kyazdani42/nvim-tree.lua/";
};
nvim-treesitter = buildVimPluginFrom2Nix {
pname = "nvim-treesitter";
- version = "2021-03-10";
+ version = "2021-03-16";
src = fetchFromGitHub {
owner = "nvim-treesitter";
repo = "nvim-treesitter";
- rev = "3b8c2ea492917fcb3c0e88ad6682dbd355cc0644";
- sha256 = "083ysgl1xwlfm2ri54m4qr17rvm6a5al95ybzzff6av699v632rb";
+ rev = "df81a91ba9e6ae29a70e168b49e21dc1835c0948";
+ sha256 = "0b8bv36d3wg1qsnfmaa2cwinj196yqly9d9227a298xqdbfq083x";
};
meta.homepage = "https://github.com/nvim-treesitter/nvim-treesitter/";
};
nvim-treesitter-context = buildVimPluginFrom2Nix {
pname = "nvim-treesitter-context";
- version = "2021-03-10";
+ version = "2021-03-11";
src = fetchFromGitHub {
owner = "romgrk";
repo = "nvim-treesitter-context";
- rev = "ff4955b250eebc320d32d6459297117004c68d3e";
- sha256 = "0qmhk6mdx00cf0vnz57n512ddifh08js7paxg9qsha374xqwq715";
+ rev = "91869ed307084836e45abcf63a4fc0aee66a2d6e";
+ sha256 = "0z8fxqhnmwldhjdx7z6yzlngisc8zjfsr9n76iz9c20brrazsp9k";
};
meta.homepage = "https://github.com/romgrk/nvim-treesitter-context/";
};
@@ -3228,36 +3264,36 @@ let
nvim-treesitter-textobjects = buildVimPluginFrom2Nix {
pname = "nvim-treesitter-textobjects";
- version = "2021-03-05";
+ version = "2021-03-15";
src = fetchFromGitHub {
owner = "nvim-treesitter";
repo = "nvim-treesitter-textobjects";
- rev = "ffe8dbb0f6ab22ed746ef753535a849e3147d914";
- sha256 = "0bq3416v9wijcx1jw5nqvjgn8md9fr4hgnm7pnf16dyrpvmihf4m";
+ rev = "704f7cbdc464a0bdec2ebcaa5e8400c61bf6a4eb";
+ sha256 = "1a37s6cyk3w0cprrm10qn09165nmg1vddidh5rznl2h6rlxp6rn3";
};
meta.homepage = "https://github.com/nvim-treesitter/nvim-treesitter-textobjects/";
};
nvim-ts-rainbow = buildVimPluginFrom2Nix {
pname = "nvim-ts-rainbow";
- version = "2021-02-12";
+ version = "2021-03-16";
src = fetchFromGitHub {
owner = "p00f";
repo = "nvim-ts-rainbow";
- rev = "3557b7baa9e773fff378235851cb3caac96fd4b9";
- sha256 = "14bz6xwwdypwxfxdxhmbwl0w04ys18l08s1dx40mm5l1627wh465";
+ rev = "f4de826ac4cba3a355f10064d9c3957e8096a884";
+ sha256 = "0hzfiajl02rnhxyz84444jrnc5n6fx6gzkfr9vbvm95ap62bjawr";
};
meta.homepage = "https://github.com/p00f/nvim-ts-rainbow/";
};
nvim-web-devicons = buildVimPluginFrom2Nix {
pname = "nvim-web-devicons";
- version = "2021-02-17";
+ version = "2021-03-10";
src = fetchFromGitHub {
owner = "kyazdani42";
repo = "nvim-web-devicons";
- rev = "b840a1f0fc35019998e6f09dfdd8dbb241764458";
- sha256 = "1q3a5ivlvk7ni5b9jxhymdrdssnxhisb6cq07rdwrh1kmfzv90yz";
+ rev = "1fb0962b8c4a217eec8166b03d683aa070115ed7";
+ sha256 = "1rqswcjqrg6ckp7vyzqlncfabkggnhjvp3b0sq7y2g333z925sjm";
};
meta.homepage = "https://github.com/kyazdani42/nvim-web-devicons/";
};
@@ -3312,12 +3348,12 @@ let
one-nvim = buildVimPluginFrom2Nix {
pname = "one-nvim";
- version = "2021-02-17";
+ version = "2021-03-11";
src = fetchFromGitHub {
owner = "Th3Whit3Wolf";
repo = "one-nvim";
- rev = "60970d279f5f2a82b1857601c63e6a51f9fd04de";
- sha256 = "1kmjq4kjlflhagasr3n2l47mmv739rwz9bqbzyyv5skxdkkp95lw";
+ rev = "a6fe11693bedb58a4ccf36491e6ce0e70772ff32";
+ sha256 = "04lxrawpkgvfsbd0v3q8ssv0r3x0czlar4q3b5lxm40dv1afz9mi";
};
meta.homepage = "https://github.com/Th3Whit3Wolf/one-nvim/";
};
@@ -3372,12 +3408,12 @@ let
packer-nvim = buildVimPluginFrom2Nix {
pname = "packer-nvim";
- version = "2021-03-08";
+ version = "2021-03-15";
src = fetchFromGitHub {
owner = "wbthomason";
repo = "packer.nvim";
- rev = "6a169bec7d15d24c1d680fb75aa24a2921829442";
- sha256 = "01z192y61vls455hjp6im87mzbngyhpn78mpf80c445anpwpb0xf";
+ rev = "6d7be3232ed0dcbbd040bf92ba70b997fe4fd840";
+ sha256 = "0k1ydkplqpizyqn56bdwhpsdib384ikv2lqfmk8j11r7p6m0xvir";
};
meta.homepage = "https://github.com/wbthomason/packer.nvim/";
};
@@ -3468,12 +3504,12 @@ let
plenary-nvim = buildVimPluginFrom2Nix {
pname = "plenary-nvim";
- version = "2021-03-10";
+ version = "2021-03-15";
src = fetchFromGitHub {
owner = "nvim-lua";
repo = "plenary.nvim";
- rev = "8f2babdd1bb76c2df0a1ef307bb9fe8477d13727";
- sha256 = "14c57pxhq4da8svi11rbzsg3rygcnly7cwjzzhpg2a9id1xxsppq";
+ rev = "2768ba75b32389a460273fab6f45575237b97bc2";
+ sha256 = "14l47j8j5idm170vk92j72ndmkkn0gqjp709yb1b731nsnz9wcjh";
};
meta.homepage = "https://github.com/nvim-lua/plenary.nvim/";
};
@@ -3492,12 +3528,12 @@ let
popfix = buildVimPluginFrom2Nix {
pname = "popfix";
- version = "2021-02-08";
+ version = "2021-03-11";
src = fetchFromGitHub {
owner = "RishabhRD";
repo = "popfix";
- rev = "efcd82cbae750aa743619bfae7453fbec9366b87";
- sha256 = "0041c9xnnhw24ablwqw9p9vlcmbfrp9l9r6i4ayh8id666ylsln9";
+ rev = "f3571e676739208871bd38f9fa0fddf554b6a7a8";
+ sha256 = "19hvwxcqca8l6dvlaccfvqc8755bpr0z0hi7l9qiw6rm458bhchi";
fetchSubmodules = true;
};
meta.homepage = "https://github.com/RishabhRD/popfix/";
@@ -3841,12 +3877,12 @@ let
sideways-vim = buildVimPluginFrom2Nix {
pname = "sideways-vim";
- version = "2021-03-02";
+ version = "2021-03-12";
src = fetchFromGitHub {
owner = "AndrewRadev";
repo = "sideways.vim";
- rev = "3a3210c8f1c4edf884a853631e641ea7c309cea0";
- sha256 = "04x1jfshk2j4mr7l9bybpk2q64ilgh1yf20qjw1fzdh5l395dv6q";
+ rev = "4de948c5fada3ce15a4fc29be8e075131986a199";
+ sha256 = "0gj5ij81kvaalz91hp7ipf9498j6ip5qd9a9an8f3fhfyhfzqv7q";
};
meta.homepage = "https://github.com/AndrewRadev/sideways.vim/";
};
@@ -3937,12 +3973,12 @@ let
SpaceCamp = buildVimPluginFrom2Nix {
pname = "SpaceCamp";
- version = "2020-05-14";
+ version = "2021-03-16";
src = fetchFromGitHub {
owner = "jaredgorski";
repo = "SpaceCamp";
- rev = "23c7a3948cd1861150346762a002dc7fa196c616";
- sha256 = "1sbc9ivczkyfylhk1n4sm2sqzp8vddw03k0xb6z8k475n5vm8mvq";
+ rev = "ce034929763903937396cf6b2c9912eb209e6b39";
+ sha256 = "07a1441gccilbhnk99lz66nvaiv14vdn34ink3jjd27d2mkf3skb";
};
meta.homepage = "https://github.com/jaredgorski/SpaceCamp/";
};
@@ -4118,12 +4154,12 @@ let
syntastic = buildVimPluginFrom2Nix {
pname = "syntastic";
- version = "2021-01-04";
+ version = "2021-03-15";
src = fetchFromGitHub {
owner = "vim-syntastic";
repo = "syntastic";
- rev = "d97a664b9adbd1a0a9cba6c1c3baf071a1059d1e";
- sha256 = "1azranlzdm1w98ifmczp1zx1w66yrpdi9h3k05v126rwaqkd6bsj";
+ rev = "f2ddb480c5afa1c0f155d78e6fc7853fd20f0420";
+ sha256 = "05ca80alkhnxj1klyy729y81g9ng2n841djxgd7zjg8cpkk94kw3";
};
meta.homepage = "https://github.com/vim-syntastic/syntastic/";
};
@@ -4214,12 +4250,12 @@ let
telescope-frecency-nvim = buildVimPluginFrom2Nix {
pname = "telescope-frecency-nvim";
- version = "2021-02-22";
+ version = "2021-03-10";
src = fetchFromGitHub {
owner = "nvim-telescope";
repo = "telescope-frecency.nvim";
- rev = "8b584bd88fbbeac0ce5c52af1ce7c1fecb7155b6";
- sha256 = "0a6sz6gx1qnr0ka9510mchca3b94553liw8ng386h60kh6lbc1k5";
+ rev = "926fbde059d6a7cefcccdd92b40fa866e073ba41";
+ sha256 = "100zi9ncz2b6hb5y9hxcsj5ra81kq8j2b4y8ck56y4yg96yi03pd";
};
meta.homepage = "https://github.com/nvim-telescope/telescope-frecency.nvim/";
};
@@ -4251,12 +4287,12 @@ let
telescope-nvim = buildVimPluginFrom2Nix {
pname = "telescope-nvim";
- version = "2021-03-10";
+ version = "2021-03-14";
src = fetchFromGitHub {
owner = "nvim-telescope";
repo = "telescope.nvim";
- rev = "add7ee394350f268684cff03d844f32f255fec47";
- sha256 = "0rfrgfx9xm02cy4dy40n4j90561ymw1pyqzzw4fawpajm3hmxcfv";
+ rev = "284f38c57539967b25c7d32700acffd46599c49f";
+ sha256 = "14gbwm1184n0nkyhz9zcwd87l141swyrch9dhwwydgnd5m853842";
};
meta.homepage = "https://github.com/nvim-telescope/telescope.nvim/";
};
@@ -4516,12 +4552,12 @@ let
vim-abolish = buildVimPluginFrom2Nix {
pname = "vim-abolish";
- version = "2020-10-30";
+ version = "2021-03-14";
src = fetchFromGitHub {
owner = "tpope";
repo = "vim-abolish";
- rev = "68bc80c88617672fd41da7a6ace87d29cd3fe1e3";
- sha256 = "1cgaf8nhprm8sligmq4km2p374a2x08fg3isl1k0mac1iz9vz1z8";
+ rev = "2b866c8946b00b2e97bfe12bc2ca0b3d5e5b3276";
+ sha256 = "1k721a7wlrdjnmnfj83v40jxcl8g7la5f15g345b6g3ix1w5yhjr";
};
meta.homepage = "https://github.com/tpope/vim-abolish/";
};
@@ -5044,12 +5080,12 @@ let
vim-clap = buildVimPluginFrom2Nix {
pname = "vim-clap";
- version = "2021-03-10";
+ version = "2021-03-13";
src = fetchFromGitHub {
owner = "liuchengxu";
repo = "vim-clap";
- rev = "c558950fa5e1aaa9fe4652b37380fffb762fdd09";
- sha256 = "0z0k1596a2wj1ynr4jbh0s53drrkmx1r4ff0ji7scx1jihxpfjqp";
+ rev = "b7b1d078f4556a6829400185bbfb47be171e6828";
+ sha256 = "1vncq3ypp5x3v9vq90zwg12ih45nph6g5mrl0xh2m82llqsp5r7c";
};
meta.homepage = "https://github.com/liuchengxu/vim-clap/";
};
@@ -5186,6 +5222,18 @@ let
meta.homepage = "https://github.com/tpope/vim-commentary/";
};
+ vim-concourse = buildVimPluginFrom2Nix {
+ pname = "vim-concourse";
+ version = "2016-11-21";
+ src = fetchFromGitHub {
+ owner = "luan";
+ repo = "vim-concourse";
+ rev = "7f61ca5d291fddd6d7ff04b03bf347f04bfe4344";
+ sha256 = "0ilf7r0lwx8f7shqxbs9av3gsnary8nbh3xhrfzwsivh8psi7qf6";
+ };
+ meta.homepage = "https://github.com/luan/vim-concourse/";
+ };
+
vim-cool = buildVimPluginFrom2Nix {
pname = "vim-cool";
version = "2020-04-18";
@@ -5284,12 +5332,12 @@ let
vim-dadbod = buildVimPluginFrom2Nix {
pname = "vim-dadbod";
- version = "2021-03-10";
+ version = "2021-03-15";
src = fetchFromGitHub {
owner = "tpope";
repo = "vim-dadbod";
- rev = "c1f00249cb47dae2457ae8b748284620b622e642";
- sha256 = "0s4srsnxqw0g5k75cqcy709x7jqipsfsvhsic2cj0b0y8m49wqzz";
+ rev = "fc44257bc9f5e41de0f01ff2d1e3907052307463";
+ sha256 = "0mcw8hq5by6k6rdldsn79a3ch2mlkd1ysan91571gr11gsv82k0v";
};
meta.homepage = "https://github.com/tpope/vim-dadbod/";
};
@@ -5690,6 +5738,18 @@ let
meta.homepage = "https://github.com/voldikss/vim-floaterm/";
};
+ vim-flog = buildVimPluginFrom2Nix {
+ pname = "vim-flog";
+ version = "2021-03-16";
+ src = fetchFromGitHub {
+ owner = "rbong";
+ repo = "vim-flog";
+ rev = "904b964eb0f878e44f47d39898e72fc0b939756b";
+ sha256 = "07x8xafcvpg6dgxlvmf46gh7a9xvnrxj7i326q73g3yfh5xpma6c";
+ };
+ meta.homepage = "https://github.com/rbong/vim-flog/";
+ };
+
vim-flutter = buildVimPluginFrom2Nix {
pname = "vim-flutter";
version = "2020-09-14";
@@ -5728,12 +5788,12 @@ let
vim-fugitive = buildVimPluginFrom2Nix {
pname = "vim-fugitive";
- version = "2021-03-10";
+ version = "2021-03-16";
src = fetchFromGitHub {
owner = "tpope";
repo = "vim-fugitive";
- rev = "753318ef83b685f32c6bda5ae5b65b7b239a29a7";
- sha256 = "0g3l1hb4nqwaz5hhagr6hy4nwv1n1qcwbak27s5sx9fbnsp6npaa";
+ rev = "3eb6f316c09553989e59bb3802da100a6fb7c091";
+ sha256 = "043vbbjaf04hza2bysiggl4bif4mf7pjvwkzbryq4mrwn0zs22y3";
};
meta.homepage = "https://github.com/tpope/vim-fugitive/";
};
@@ -5776,12 +5836,12 @@ let
vim-git = buildVimPluginFrom2Nix {
pname = "vim-git";
- version = "2020-07-13";
+ version = "2021-03-14";
src = fetchFromGitHub {
owner = "tpope";
repo = "vim-git";
- rev = "4be54a3e2e300a94f6f7dfa7a6ee9e81245c9886";
- sha256 = "1061l9igdywfbqgwpf2f25yby78phb512hjbyzvqz5l1p7dw1xyd";
+ rev = "0d2b79b7e74e9bd1d48ea91246f3cf3200328acd";
+ sha256 = "0bs7xnkrzni5pcvqfn80if9mlw7idi8g3lsllmgxgk3cjlhg7q19";
};
meta.homepage = "https://github.com/tpope/vim-git/";
};
@@ -5800,12 +5860,12 @@ let
vim-gitgutter = buildVimPluginFrom2Nix {
pname = "vim-gitgutter";
- version = "2021-02-22";
+ version = "2021-03-16";
src = fetchFromGitHub {
owner = "airblade";
repo = "vim-gitgutter";
- rev = "1283ec1670d1f4fce37213c5d66924088b2e730c";
- sha256 = "1h5jh38ihbyy95cm57ppb6m871010pk521ygss2drcriwnx4agd2";
+ rev = "64062dfe022885f6900ba016eb24faee22a72d26";
+ sha256 = "18cjabpm7icxjix58krvanzs1mmqaw80935n6wd3mnfxqj4qln8s";
};
meta.homepage = "https://github.com/airblade/vim-gitgutter/";
};
@@ -5848,12 +5908,12 @@ let
vim-go = buildVimPluginFrom2Nix {
pname = "vim-go";
- version = "2021-03-10";
+ version = "2021-03-14";
src = fetchFromGitHub {
owner = "fatih";
repo = "vim-go";
- rev = "95c79dcdcbc7e8e9165fa7f4a6bf17c08a6bab05";
- sha256 = "0110jifwa485l42cjjf3bbrwiahwm1ddijh4jlybchghrx2b64r2";
+ rev = "fe66df2057a90ae38bd154035b0751f0f50e6752";
+ sha256 = "13hinmg92n19clgnl0dnlcdnw7zh53ag9hhk98xrd3g6sngjyvpm";
};
meta.homepage = "https://github.com/fatih/vim-go/";
};
@@ -5968,12 +6028,12 @@ let
vim-hcl = buildVimPluginFrom2Nix {
pname = "vim-hcl";
- version = "2021-02-16";
+ version = "2021-03-10";
src = fetchFromGitHub {
owner = "jvirtanen";
repo = "vim-hcl";
- rev = "047a8643ce346d819ffbd1686fe3ac1a54e42a1e";
- sha256 = "1brwjgxxh8f1q2859lqgdn9jk8h3iip989yirii350kwqvv1wjk6";
+ rev = "92aa0081d0de6876bbbe3758e418d5b4eda3f14b";
+ sha256 = "0v9m83f62v9dqn3jks21vfs3l59rif1f6jsg3f01iknb8ghhwrpi";
};
meta.homepage = "https://github.com/jvirtanen/vim-hcl/";
};
@@ -6498,36 +6558,36 @@ let
vim-lsc = buildVimPluginFrom2Nix {
pname = "vim-lsc";
- version = "2021-02-28";
+ version = "2021-03-15";
src = fetchFromGitHub {
owner = "natebosch";
repo = "vim-lsc";
- rev = "801572d71ad05683a4ef57c1d35305f566c09bf5";
- sha256 = "02qj2svrdhhazyr8id0crw1qk0030pivdna28xnm9l7v24g7h9hl";
+ rev = "4b3c07ccedecb101c75ff974e5d1526933f69e03";
+ sha256 = "09vcc0w9fvpz4bqzpfgpw0hvafx1p8pwy4wbrjkn55gg14j4k93i";
};
meta.homepage = "https://github.com/natebosch/vim-lsc/";
};
vim-lsp = buildVimPluginFrom2Nix {
pname = "vim-lsp";
- version = "2021-03-06";
+ version = "2021-03-16";
src = fetchFromGitHub {
owner = "prabirshrestha";
repo = "vim-lsp";
- rev = "eb237a2cedf2c69a44543d2ffaee25470c53e29b";
- sha256 = "1aldjq32cpbd2gkxqvf6gqskyr4br9835vsap4sgjc2fgigmiyla";
+ rev = "8be2f495b8c5801131c8af87a9aa7a30be19ae33";
+ sha256 = "13whd8ydq1vls20nsmjvchbw7k48gdsqjf1508v3pndw1hgj2ps1";
};
meta.homepage = "https://github.com/prabirshrestha/vim-lsp/";
};
vim-lsp-cxx-highlight = buildVimPluginFrom2Nix {
pname = "vim-lsp-cxx-highlight";
- version = "2020-12-23";
+ version = "2021-03-14";
src = fetchFromGitHub {
owner = "jackguo380";
repo = "vim-lsp-cxx-highlight";
- rev = "f42db17e0917e6011a1d3581c3a8f29efab8ed93";
- sha256 = "0n67ap7zi888xin7c7ag8sk7hjrzg36mlpg42rqfgx66k6dm0455";
+ rev = "00818f0d8b7c87d3a1ecd81cc4ff1ab782355c2b";
+ sha256 = "1pjricwcqsbw466anwcndhj97g6qbblk95jaa8yg3a2fs8gdz8iz";
};
meta.homepage = "https://github.com/jackguo380/vim-lsp-cxx-highlight/";
};
@@ -6595,12 +6655,12 @@ let
vim-matchup = buildVimPluginFrom2Nix {
pname = "vim-matchup";
- version = "2021-03-03";
+ version = "2021-03-14";
src = fetchFromGitHub {
owner = "andymass";
repo = "vim-matchup";
- rev = "4f5619fd1ad2b1aa36536b332b058ef6a3387a85";
- sha256 = "0420fmdjbyi037ghs2g49zzxcpfb2vf6dnn3dk4xivl2af2jrr43";
+ rev = "5ce13cec884906819ef21be634b89b0693625b01";
+ sha256 = "0sgxnn9fjcr42hcmyib22vs7y11jxhzk4r99va7wwpsa5k6kn2yr";
};
meta.homepage = "https://github.com/andymass/vim-matchup/";
};
@@ -6691,12 +6751,12 @@ let
vim-mucomplete = buildVimPluginFrom2Nix {
pname = "vim-mucomplete";
- version = "2020-11-15";
+ version = "2021-03-14";
src = fetchFromGitHub {
owner = "lifepillar";
repo = "vim-mucomplete";
- rev = "80b13cbc30d258a4474b053fcdc6baaf199320a1";
- sha256 = "054g80n09mmxxlh8xaic29bn8bgn3clvv732rymljdyvbj1mlhwd";
+ rev = "83cd9b3775438faafc3475f9f9d5fbb8da4dfa5b";
+ sha256 = "1l8rdmy9i81zq2ck0zvlsmqs7hfqpcxa0b8psf5nw72mwhbvv1np";
};
meta.homepage = "https://github.com/lifepillar/vim-mucomplete/";
};
@@ -6967,12 +7027,12 @@ let
vim-pandoc = buildVimPluginFrom2Nix {
pname = "vim-pandoc";
- version = "2021-03-01";
+ version = "2021-03-10";
src = fetchFromGitHub {
owner = "vim-pandoc";
repo = "vim-pandoc";
- rev = "94b6a23b4c0fb3268408a38badd480d974b0919f";
- sha256 = "1dv33anir1pfnnbvj9alf4g13q58hdppry0hspy1d5kqsr5wfpix";
+ rev = "0d4b68eb7f63e43f963a119d60a3e29c2bb822e0";
+ sha256 = "0p7m75f7vqdm0nvg0p3nbzqnsd7wdvbsf3y2mzirdl7c0pbvphqp";
};
meta.homepage = "https://github.com/vim-pandoc/vim-pandoc/";
};
@@ -7315,12 +7375,12 @@ let
vim-rails = buildVimPluginFrom2Nix {
pname = "vim-rails";
- version = "2020-09-29";
+ version = "2021-03-11";
src = fetchFromGitHub {
owner = "tpope";
repo = "vim-rails";
- rev = "2c42236cf38c0842dd490095ffd6b1540cad2e29";
- sha256 = "0nhf4qd7dchrzjv2ijcddav72qb121c9jkkk06agsv23l9rb31pv";
+ rev = "ee53e8303be8a28234ea97109b4e1ce716f0f2ad";
+ sha256 = "0bjdhkw6ii3z310kjm06g7m03as001cgkzw082mb63kix7hh06x8";
};
meta.homepage = "https://github.com/tpope/vim-rails/";
};
@@ -7339,24 +7399,24 @@ let
vim-rhubarb = buildVimPluginFrom2Nix {
pname = "vim-rhubarb";
- version = "2021-02-11";
+ version = "2021-03-16";
src = fetchFromGitHub {
owner = "tpope";
repo = "vim-rhubarb";
- rev = "964d48fd11db7c3a3246885993319d544c7c6fd5";
- sha256 = "09xpjd96xd0mkzfwyvinjhbza7xp6v66bdrxwkb0j0n1kgfgkx4l";
+ rev = "3d444b5b4f636408c239a59adb88ee13a56486e0";
+ sha256 = "084k5kz7l8hydw072gzjci3nhrfxymszzyk10s5qkq223986vhvv";
};
meta.homepage = "https://github.com/tpope/vim-rhubarb/";
};
vim-rooter = buildVimPluginFrom2Nix {
pname = "vim-rooter";
- version = "2021-03-01";
+ version = "2021-03-11";
src = fetchFromGitHub {
owner = "airblade";
repo = "vim-rooter";
- rev = "67d51540a4b173d7c77bcf1db9742b3d50e4bf45";
- sha256 = "0a86qb39c5k1h2mi5qsn03zv598776gcvlsrkgw53f3g23xm6rk5";
+ rev = "544e701066c69bbeb45297d0285c2719e125440b";
+ sha256 = "0mj5zvfsi4n8qi8cq0h99j1zb11xmrpkm31ll4q1bm5mf57kbmxa";
};
meta.homepage = "https://github.com/airblade/vim-rooter/";
};
@@ -7627,12 +7687,12 @@ let
vim-snippets = buildVimPluginFrom2Nix {
pname = "vim-snippets";
- version = "2021-03-09";
+ version = "2021-03-15";
src = fetchFromGitHub {
owner = "honza";
repo = "vim-snippets";
- rev = "d30f65105e1f73c63c92c22c4afbad51539f5744";
- sha256 = "05qbrdipxpzj7v0n4q3bj8p2sgl28jm952hy7gs76ma3p3g7mnrq";
+ rev = "a8ac81b8922ac621e7043813d98e69ad0ac265a4";
+ sha256 = "0gl77mnajzvmnxwnbzb5fqzzljb59lbfv23gzbz1h493gfm0f04n";
};
meta.homepage = "https://github.com/honza/vim-snippets/";
};
@@ -7699,12 +7759,12 @@ let
vim-startify = buildVimPluginFrom2Nix {
pname = "vim-startify";
- version = "2020-10-07";
+ version = "2021-03-13";
src = fetchFromGitHub {
owner = "mhinz";
repo = "vim-startify";
- rev = "f2fc11844b234479d37bef37faa7ceb2aade788b";
- sha256 = "18n16hpkqadq18gpgppbr4s516jpc8qwd357vb2c7069q79kfx39";
+ rev = "d663f4db7a572f9a56c39ae17801a5a7eae81d20";
+ sha256 = "1lwpisz91hs7bjsvi4rjczi95s05kq0k241i8h3mblpsnpv8zm33";
};
meta.homepage = "https://github.com/mhinz/vim-startify/";
};
@@ -8024,12 +8084,12 @@ let
vim-tpipeline = buildVimPluginFrom2Nix {
pname = "vim-tpipeline";
- version = "2021-03-09";
+ version = "2021-03-11";
src = fetchFromGitHub {
owner = "vimpostor";
repo = "vim-tpipeline";
- rev = "3f6ed5af76d45cf3d0e7f87cd927866f3640aa22";
- sha256 = "04m652dfwgr52ic2f206s0mq8z10dnaxb90xcywrfjgkdcjd6d10";
+ rev = "327944d0d7824e6de4dda33bc2b008708a6cb447";
+ sha256 = "16nsick3p5nj9vmi6h531l8lc5c6gy2c1zd83xbgav38x655kjws";
};
meta.homepage = "https://github.com/vimpostor/vim-tpipeline/";
};
@@ -8072,12 +8132,12 @@ let
vim-twiggy = buildVimPluginFrom2Nix {
pname = "vim-twiggy";
- version = "2020-11-14";
+ version = "2021-03-11";
src = fetchFromGitHub {
owner = "sodapopcan";
repo = "vim-twiggy";
- rev = "305fa5ab43514b76b15a57596bc514c072b9cdda";
- sha256 = "1hn42fm9a2dvxwml17j5jvd8758s71dlipspn5vi9l545cg94jjf";
+ rev = "71ad5b657e7dc4e44758e45ccdd0be160cd87161";
+ sha256 = "17mi2fhw97xwgy9a7hyvvn1rmfxchh8xwrpv4x7v7v59pq7fcqi2";
};
meta.homepage = "https://github.com/sodapopcan/vim-twiggy/";
};
@@ -8108,12 +8168,12 @@ let
vim-vinegar = buildVimPluginFrom2Nix {
pname = "vim-vinegar";
- version = "2021-01-25";
+ version = "2021-03-16";
src = fetchFromGitHub {
owner = "tpope";
repo = "vim-vinegar";
- rev = "5f48edf4dcc130ae4a658541c0d6f72a558bc70d";
- sha256 = "195l6ly7ry8721rlkcp9103czvfcmqifbgbibdqdi3pjmaafrb9l";
+ rev = "b245f3ab4580eba27616a5ce06a56d5f791e67bd";
+ sha256 = "0lvqfa5drjzk3b877aldnjc9m4jnwlpxlvfvy8s81az92r69f13m";
};
meta.homepage = "https://github.com/tpope/vim-vinegar/";
};
@@ -8216,12 +8276,12 @@ let
vim-wayland-clipboard = buildVimPluginFrom2Nix {
pname = "vim-wayland-clipboard";
- version = "2021-02-17";
+ version = "2021-03-15";
src = fetchFromGitHub {
owner = "jasonccox";
repo = "vim-wayland-clipboard";
- rev = "2dc05c0f556213068a9ddf37a8b9b2276deccf84";
- sha256 = "16x7dk1x9q8kzjcgapgb9hw8hm4w8v1g6pzpiz6ccsd0ab0jzf40";
+ rev = "1f7f05039c572fde082043915953a88b77c0ddb0";
+ sha256 = "0ihyfdvgiclmcric66nd54ha7ikf2c1pl1slbn4y6mkbxla02yv9";
};
meta.homepage = "https://github.com/jasonccox/vim-wayland-clipboard/";
};
@@ -8408,14 +8468,14 @@ let
vimsence = buildVimPluginFrom2Nix {
pname = "vimsence";
- version = "2021-03-02";
+ version = "2021-03-12";
src = fetchFromGitHub {
- owner = "hugolgst";
+ owner = "vimsence";
repo = "vimsence";
- rev = "16ce1f653d3ae7b65506f7e35c3723aeea9f758f";
- sha256 = "0rnfmr8qk59dbdwd2jjjlkjwh82w58pmsm7p8b3lr2hhxz0z4sfd";
+ rev = "f04fc0d4c52c29bcf8b0a8bf06d1c10f15261fff";
+ sha256 = "17vc6vqlpqvf1nkvynvh6r9z88fvpxj488ys8y3hbkc9mx43x8lr";
};
- meta.homepage = "https://github.com/hugolgst/vimsence/";
+ meta.homepage = "https://github.com/vimsence/vimsence/";
};
vimshell-vim = buildVimPluginFrom2Nix {
@@ -8432,12 +8492,12 @@ let
vimspector = buildVimPluginFrom2Nix {
pname = "vimspector";
- version = "2021-03-05";
+ version = "2021-03-12";
src = fetchFromGitHub {
owner = "puremourning";
repo = "vimspector";
- rev = "943ae6c7c9d0f256e444c3ddc5e876156335f997";
- sha256 = "0wfdb89iafpwazgg42wxq1fd5g99gyrmk95nzxvnws2a7fy5hi65";
+ rev = "af2670ef9a631d1719250f0abc71e844f10ec352";
+ sha256 = "1jw6bsc4ynjv76kdmi4y94qyysq93irw4gr6wnmix4mk9ljv15fs";
fetchSubmodules = true;
};
meta.homepage = "https://github.com/puremourning/vimspector/";
@@ -8445,12 +8505,12 @@ let
vimtex = buildVimPluginFrom2Nix {
pname = "vimtex";
- version = "2021-03-09";
+ version = "2021-03-15";
src = fetchFromGitHub {
owner = "lervag";
repo = "vimtex";
- rev = "3af88f325e4784bd209df490dbf648a942326d57";
- sha256 = "0zqp4zvl8xqa0lsj6lwc4wlg0n3wknhfn1g1j2gbncgyiw38ax2l";
+ rev = "2bdee8f56ec224e65d18d55f9883b6f71b463fa9";
+ sha256 = "1nn2pfjfzwwdwg9bclps53gvixmpkd50bs1z6y53b6vfx61xdgn5";
};
meta.homepage = "https://github.com/lervag/vimtex/";
};
@@ -8675,12 +8735,12 @@ let
zephyr-nvim = buildVimPluginFrom2Nix {
pname = "zephyr-nvim";
- version = "2021-03-06";
+ version = "2021-03-14";
src = fetchFromGitHub {
owner = "glepnir";
repo = "zephyr-nvim";
- rev = "a9b4a655b61aeb02229d54ff7cd22395a02a9ee7";
- sha256 = "1dxr4p1ikmqacjb0x9p0ndlcdg812yzqmk56c79dgllf0cr0l7hg";
+ rev = "979f78f024178c1e9aff6fbebc33d291f64b121d";
+ sha256 = "04vfx1axq157qbqj832i04wsd4xk0zwh5bzs4g71q4hxhqdvy678";
};
meta.homepage = "https://github.com/glepnir/zephyr-nvim/";
};
diff --git a/third_party/nixpkgs/pkgs/misc/vim-plugins/overrides.nix b/third_party/nixpkgs/pkgs/misc/vim-plugins/overrides.nix
index 1ee9198748..7a0df067f6 100644
--- a/third_party/nixpkgs/pkgs/misc/vim-plugins/overrides.nix
+++ b/third_party/nixpkgs/pkgs/misc/vim-plugins/overrides.nix
@@ -731,7 +731,7 @@ self: super: {
libiconv
];
- cargoSha256 = "F+kIVnO7MBuaYRa2MPsD3eQ2d5W5VxHhxHKeo/ic6TE=";
+ cargoSha256 = "u1ryOhwDgRBQ32MBPkWHI6eU6yZqNAZfyKvckr6nvCY=";
};
in
''
diff --git a/third_party/nixpkgs/pkgs/misc/vim-plugins/vim-plugin-names b/third_party/nixpkgs/pkgs/misc/vim-plugins/vim-plugin-names
index 2076e24423..b37679f896 100644
--- a/third_party/nixpkgs/pkgs/misc/vim-plugins/vim-plugin-names
+++ b/third_party/nixpkgs/pkgs/misc/vim-plugins/vim-plugin-names
@@ -106,7 +106,7 @@ eikenb/acp
elixir-editors/vim-elixir
elmcast/elm-vim
elzr/vim-json
-embark-theme/vim as embark-vim
+embark-theme/vim@main as embark-vim
embear/vim-localvimrc
enomsg/vim-haskellConcealPlus
enricobacis/vim-airline-clock
@@ -115,6 +115,7 @@ ervandew/supertab
esneider/YUNOcommit.vim
euclidianAce/BetterLua.vim
euclio/vim-markdown-composer
+f-person/git-blame.nvim
farmergreg/vim-lastplace
fatih/vim-go
fcpg/vim-osc52
@@ -177,7 +178,6 @@ hrsh7th/vim-vsnip
hrsh7th/vim-vsnip-integ
hsanson/vim-android
hsitz/VimOrganizer
-hugolgst/vimsence
iamcco/coc-spell-checker
ianks/vim-tsx
idanarye/vim-merginal
@@ -301,6 +301,7 @@ liuchengxu/vim-which-key
liuchengxu/vista.vim
LnL7/vim-nix
lotabout/skim.vim
+luan/vim-concourse
LucHermitte/lh-brackets
LucHermitte/lh-vim-lib
ludovicchabant/vim-gutentags
@@ -344,6 +345,7 @@ maximbaz/lightline-ale
MaxMEllon/vim-jsx-pretty
mbbill/undotree
mboughaba/i3config.vim
+mcchrish/nnn.vim
megaannum/forms
megaannum/self
mengelbrecht/lightline-bufferline
@@ -485,6 +487,7 @@ raghur/vim-ghost
Raimondi/delimitMate
rakr/vim-one
rbgrouleff/bclose.vim
+rbong/vim-flog
reedes/vim-pencil
reedes/vim-wordy
rhysd/committia.vim
@@ -689,6 +692,7 @@ Vimjas/vim-python-pep8-indent
vimlab/split-term.vim
vimoutliner/vimoutliner
vimpostor/vim-tpipeline
+vimsence/vimsence
vimwiki/vimwiki
vito-c/jq.vim
vmchale/ats-vim
@@ -716,6 +720,7 @@ xolox/vim-easytags
xolox/vim-misc
xuhdev/vim-latex-live-preview
Xuyuanp/nerdtree-git-plugin
+yamatsum/nvim-nonicons@main
ycm-core/YouCompleteMe
Yggdroot/indentLine
Yilin-Yang/vim-markbar
diff --git a/third_party/nixpkgs/pkgs/misc/vscode-extensions/ms-vsliveshare-vsliveshare/default.nix b/third_party/nixpkgs/pkgs/misc/vscode-extensions/ms-vsliveshare-vsliveshare/default.nix
index e8e8ead9db..836b9cc2a2 100644
--- a/third_party/nixpkgs/pkgs/misc/vscode-extensions/ms-vsliveshare-vsliveshare/default.nix
+++ b/third_party/nixpkgs/pkgs/misc/vscode-extensions/ms-vsliveshare-vsliveshare/default.nix
@@ -38,8 +38,8 @@ in ((vscode-utils.override { stdenv = gccStdenv; }).buildVscodeMarketplaceExtens
mktplcRef = {
name = "vsliveshare";
publisher = "ms-vsliveshare";
- version = "1.0.3912";
- sha256 = "1k5yy04q85jjr7hzrv0s7x1m2251kglb038wcvvbs568vpscghi8";
+ version = "1.0.3968";
+ sha256 = "1nmhkxrlg9blxcqh7a3hl0wc5mkk2p77mn228lvmcirpbk3acsx5";
};
}).overrideAttrs({ nativeBuildInputs ? [], buildInputs ? [], ... }: {
nativeBuildInputs = nativeBuildInputs ++ [
diff --git a/third_party/nixpkgs/pkgs/misc/vscode-extensions/python/extract-nuget.nix b/third_party/nixpkgs/pkgs/misc/vscode-extensions/python/extract-nuget.nix
index e4d3b6a0ed..1e70cabe03 100644
--- a/third_party/nixpkgs/pkgs/misc/vscode-extensions/python/extract-nuget.nix
+++ b/third_party/nixpkgs/pkgs/misc/vscode-extensions/python/extract-nuget.nix
@@ -4,7 +4,7 @@
stdenv.mkDerivation {
inherit name version src;
- buildInputs = [ unzip ];
+ nativeBuildInputs = [ unzip ];
dontBuild = true;
unpackPhase = "unzip $src";
installPhase = ''
diff --git a/third_party/nixpkgs/pkgs/os-specific/darwin/apple-source-releases/bootstrap_cmds/default.nix b/third_party/nixpkgs/pkgs/os-specific/darwin/apple-source-releases/bootstrap_cmds/default.nix
index 002709ce2d..5ac971d02f 100644
--- a/third_party/nixpkgs/pkgs/os-specific/darwin/apple-source-releases/bootstrap_cmds/default.nix
+++ b/third_party/nixpkgs/pkgs/os-specific/darwin/apple-source-releases/bootstrap_cmds/default.nix
@@ -1,4 +1,4 @@
-{ lib, appleDerivation, yacc, flex }:
+{ lib, stdenv, appleDerivation, yacc, flex }:
appleDerivation {
nativeBuildInputs = [ yacc flex ];
@@ -26,7 +26,7 @@ appleDerivation {
cp migcom.1 $out/share/man/man1
substituteInPlace $out/bin/mig \
- --replace 'arch=`/usr/bin/arch`' 'arch=i386' \
+ --replace 'arch=`/usr/bin/arch`' 'arch=${stdenv.targetPlatform.darwinArch}' \
--replace '/usr/bin/' "" \
--replace '/bin/rmdir' "rmdir" \
--replace 'C=''${MIGCC}' "C=cc"
diff --git a/third_party/nixpkgs/pkgs/os-specific/darwin/binutils/default.nix b/third_party/nixpkgs/pkgs/os-specific/darwin/binutils/default.nix
index e9aa706da2..29ae1871dd 100644
--- a/third_party/nixpkgs/pkgs/os-specific/darwin/binutils/default.nix
+++ b/third_party/nixpkgs/pkgs/os-specific/darwin/binutils/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, binutils-unwrapped, cctools, llvm }:
+{ lib, stdenv, makeWrapper, binutils-unwrapped, cctools, llvm, clang-unwrapped }:
# Make sure both underlying packages claim to have prepended their binaries
# with the same targetPrefix.
@@ -49,8 +49,19 @@ stdenv.mkDerivation {
ln -sv "$path" "$dest_path"
done
done
+ ''
+ # On aarch64-darwin we must use clang, because "as" from cctools just doesn't
+ # handle the arch. Proxying calls to clang produces quite a bit of warnings,
+ # and using clang directly here is a better option than relying on cctools.
+ # On x86_64-darwin the Clang version is too old to support this mode.
+ + lib.optionalString stdenv.isAarch64 ''
+ rm $out/bin/as
+ makeWrapper "${clang-unwrapped}/bin/clang" "$out/bin/as" \
+ --add-flags "-x assembler -integrated-as -c"
'';
+ nativeBuildInputs = lib.optionals stdenv.isAarch64 [ makeWrapper ];
+
passthru = {
inherit targetPrefix;
};
diff --git a/third_party/nixpkgs/pkgs/os-specific/darwin/xcode/sdk-pkgs.nix b/third_party/nixpkgs/pkgs/os-specific/darwin/xcode/sdk-pkgs.nix
index 16ed52ea81..cabac19ba8 100644
--- a/third_party/nixpkgs/pkgs/os-specific/darwin/xcode/sdk-pkgs.nix
+++ b/third_party/nixpkgs/pkgs/os-specific/darwin/xcode/sdk-pkgs.nix
@@ -14,12 +14,6 @@ let
minSdkVersion = targetPlatform.minSdkVersion or "9.0";
-iosPlatformArch = { parsed, ... }: {
- armv7a = "armv7";
- aarch64 = "arm64";
- x86_64 = "x86_64";
-}.${parsed.cpu.name};
-
in
rec {
@@ -35,9 +29,7 @@ rec {
binutils = wrapBintoolsWith {
libc = targetIosSdkPkgs.libraries;
bintools = binutils-unwrapped;
- extraBuildCommands = ''
- echo "-arch ${iosPlatformArch targetPlatform}" >> $out/nix-support/libc-ldflags
- '' + lib.optionalString (sdk.platform == "iPhoneSimulator") ''
+ extraBuildCommands = lib.optionalString (sdk.platform == "iPhoneSimulator") ''
echo "-platform_version ios-sim ${minSdkVersion} ${sdk.version}" >> $out/nix-support/libc-ldflags
'' + lib.optionalString (sdk.platform == "iPhoneOS") ''
echo "-platform_version ios ${minSdkVersion} ${sdk.version}" >> $out/nix-support/libc-ldflags
@@ -52,7 +44,7 @@ rec {
extraBuildCommands = ''
tr '\n' ' ' < $out/nix-support/cc-cflags > cc-cflags.tmp
mv cc-cflags.tmp $out/nix-support/cc-cflags
- echo "-target ${targetPlatform.config} -arch ${iosPlatformArch targetPlatform}" >> $out/nix-support/cc-cflags
+ echo "-target ${targetPlatform.config}" >> $out/nix-support/cc-cflags
echo "-isystem ${sdk}/usr/include${lib.optionalString (lib.versionAtLeast "10" sdk.version) " -isystem ${sdk}/usr/include/c++/4.2.1/ -stdlib=libstdc++"}" >> $out/nix-support/cc-cflags
'' + lib.optionalString (sdk.platform == "iPhoneSimulator") ''
echo "-mios-simulator-version-min=${minSdkVersion}" >> $out/nix-support/cc-cflags
diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/ati-drivers/default.nix b/third_party/nixpkgs/pkgs/os-specific/linux/ati-drivers/default.nix
index b730183702..768aa7d7e7 100644
--- a/third_party/nixpkgs/pkgs/os-specific/linux/ati-drivers/default.nix
+++ b/third_party/nixpkgs/pkgs/os-specific/linux/ati-drivers/default.nix
@@ -85,11 +85,11 @@ stdenv.mkDerivation rec {
(lib.versionAtLeast kernel.version "4.9") )
[ ./patches/4.9-get_user_pages.patch ];
+ nativeBuildInputs = [ unzip ];
buildInputs =
[ xorg.libXrender xorg.libXext xorg.libX11 xorg.libXinerama xorg.libSM
xorg.libXrandr xorg.libXxf86vm xorg.xorgproto xorg.imake xorg.libICE
patchelf
- unzip
libGLU libGL
fontconfig
freetype
diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/bluez/default.nix b/third_party/nixpkgs/pkgs/os-specific/linux/bluez/default.nix
index 29dceecad6..6cb23de50a 100644
--- a/third_party/nixpkgs/pkgs/os-specific/linux/bluez/default.nix
+++ b/third_party/nixpkgs/pkgs/os-specific/linux/bluez/default.nix
@@ -19,11 +19,11 @@
];
in stdenv.mkDerivation rec {
pname = "bluez";
- version = "5.55";
+ version = "5.56";
src = fetchurl {
url = "mirror://kernel/linux/bluetooth/${pname}-${version}.tar.xz";
- sha256 = "124v9s4y1s7s6klx5vlmzpk1jlr4x84ch7r7scm7x2f42dqp2qw8";
+ sha256 = "sha256-WcTbqfyKripqX48S8ZvBsMLcJzVcfKMSPu0/5r19C50=";
};
buildInputs = [
diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/firmware/fwupd/default.nix b/third_party/nixpkgs/pkgs/os-specific/linux/firmware/fwupd/default.nix
index bfa7783b6b..24e23f2b7e 100644
--- a/third_party/nixpkgs/pkgs/os-specific/linux/firmware/fwupd/default.nix
+++ b/third_party/nixpkgs/pkgs/os-specific/linux/firmware/fwupd/default.nix
@@ -91,13 +91,7 @@ let
self = stdenv.mkDerivation rec {
pname = "fwupd";
- # A regression is present in https://github.com/fwupd/fwupd/commit/fde4b1676a2c64e70bebd88f7720307c62635654
- # released with 1.5.6.
- # Fix for the regression: https://github.com/fwupd/fwupd/pull/2902
- # Maintainer says a new release is to be expected in a few days:
- # https://twitter.com/hughsient/status/1362476792297185289
- # In the mean time, please do not release 1.5.6 and go strait to 1.5.7
- version = "1.5.5";
+ version = "1.5.7";
# libfwupd goes to lib
# daemon, plug-ins and libfwupdplugin go to out
@@ -106,7 +100,7 @@ let
src = fetchurl {
url = "https://people.freedesktop.org/~hughsient/releases/fwupd-${version}.tar.xz";
- sha256 = "0c2m9qz1g7zxqc6w90w9hksf8y9hvlh0vyvx06q01x893j5hzxh6";
+ sha256 = "16isrrv6zhdgccbfnz7km5g1cnvfnip7aiidkfhf5dlnrnyb2sxh";
};
patches = [
@@ -189,6 +183,11 @@ let
"-Defi-libdir=${gnu-efi}/lib"
"-Defi-ldsdir=${gnu-efi}/lib"
"-Defi-includedir=${gnu-efi}/include/efi"
+ "-Defi_sbat_distro_id=nixos"
+ "-Defi_sbat_distro_summary=NixOS"
+ "-Defi_sbat_distro_pkgname=fwupd"
+ "-Defi_sbat_distro_version=${version}"
+ "-Defi_sbat_distro_url=https://search.nixos.org/packages?channel=unstable&show=fwupd&from=0&size=50&sort=relevance&query=fwupd"
"--localstatedir=/var"
"--sysconfdir=/etc"
"-Dsysconfdir_install=${placeholder "out"}/etc"
@@ -236,6 +235,8 @@ let
contrib/get-version.py \
contrib/generate-version-script.py \
meson_post_install.sh \
+ plugins/uefi-capsule/efi/generate_sbat.py \
+ plugins/uefi-capsule/efi/generate_binary.py \
po/make-images \
po/make-images.sh \
po/test-deps
@@ -250,8 +251,8 @@ let
testFw = fetchFromGitHub {
owner = "fwupd";
repo = "fwupd-test-firmware";
- rev = "42b62c62dc85ecfb8e38099fe5de0625af87a722";
- sha256 = "XUpxE003DZSeLJMtyV5UN5CNHH89/nEVKpCbMStm91Q=";
+ rev = "c13bfb26cae5f4f115dd4e08f9f00b3cb9acc25e";
+ sha256 = "US81i7mtLEe85KdWz5r+fQTk61IhqjVkzykBaBPuKL4=";
};
in ''
# These files have weird licenses so they are shipped separately.
@@ -311,6 +312,7 @@ let
# DisabledPlugins key in fwupd/daemon.conf
defaultDisabledPlugins = [
"test"
+ "test_ble"
"invalid"
];
diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/iproute/default.nix b/third_party/nixpkgs/pkgs/os-specific/linux/iproute/default.nix
index afd495dd6d..affc18e8f3 100644
--- a/third_party/nixpkgs/pkgs/os-specific/linux/iproute/default.nix
+++ b/third_party/nixpkgs/pkgs/os-specific/linux/iproute/default.nix
@@ -5,11 +5,11 @@
stdenv.mkDerivation rec {
pname = "iproute2";
- version = "5.10.0";
+ version = "5.11.0";
src = fetchurl {
url = "mirror://kernel/linux/utils/net/${pname}/${pname}-${version}.tar.xz";
- sha256 = "1sakmhvh40gh4x55vzgy6cyvizqkhqalcfpvs6r0c14w62p38jm5";
+ sha256 = "0m2wa14rhmdb6k07minmw5lk97vz4vn56ndka5849cqjh88fmqn5";
};
preConfigure = ''
diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/kernel/hardened/patches.json b/third_party/nixpkgs/pkgs/os-specific/linux/kernel/hardened/patches.json
index 9fe7f62ae0..01158d9c4f 100644
--- a/third_party/nixpkgs/pkgs/os-specific/linux/kernel/hardened/patches.json
+++ b/third_party/nixpkgs/pkgs/os-specific/linux/kernel/hardened/patches.json
@@ -1,32 +1,32 @@
{
"4.14": {
"extra": "-hardened1",
- "name": "linux-hardened-4.14.225-hardened1.patch",
- "sha256": "1khdxny8jzvvhax10xq5kpbnhwrhfs7cxhi9f3rg4fa6c139pjbl",
- "url": "https://github.com/anthraxx/linux-hardened/releases/download/4.14.225-hardened1/linux-hardened-4.14.225-hardened1.patch"
+ "name": "linux-hardened-4.14.226-hardened1.patch",
+ "sha256": "12h42fsr1sc2zgr1cb2ais0aivg4hpg9x4gc762r7cd4l40fyyg9",
+ "url": "https://github.com/anthraxx/linux-hardened/releases/download/4.14.226-hardened1/linux-hardened-4.14.226-hardened1.patch"
},
"4.19": {
"extra": "-hardened1",
- "name": "linux-hardened-4.19.180-hardened1.patch",
- "sha256": "1wh01fwghgpbwkmndw5kkjbmav5iwmpk7g208jplhz6q6ymxfdbj",
- "url": "https://github.com/anthraxx/linux-hardened/releases/download/4.19.180-hardened1/linux-hardened-4.19.180-hardened1.patch"
+ "name": "linux-hardened-4.19.181-hardened1.patch",
+ "sha256": "13j15nwmnzl1s17403icrpx9cdpfpzb5y1pnl6zaj5wsnjda7k5d",
+ "url": "https://github.com/anthraxx/linux-hardened/releases/download/4.19.181-hardened1/linux-hardened-4.19.181-hardened1.patch"
},
"5.10": {
"extra": "-hardened1",
- "name": "linux-hardened-5.10.23-hardened1.patch",
- "sha256": "16mll5ayg7j0zdxciqa9m17zxv6kdm7vn1kp6bsl89nc301fxssc",
- "url": "https://github.com/anthraxx/linux-hardened/releases/download/5.10.23-hardened1/linux-hardened-5.10.23-hardened1.patch"
+ "name": "linux-hardened-5.10.24-hardened1.patch",
+ "sha256": "0d2kwz01kgh43li6b76b7dhnx37hchzx99rk4h6jdz364272lh1p",
+ "url": "https://github.com/anthraxx/linux-hardened/releases/download/5.10.24-hardened1/linux-hardened-5.10.24-hardened1.patch"
},
"5.11": {
"extra": "-hardened1",
- "name": "linux-hardened-5.11.6-hardened1.patch",
- "sha256": "0gl5irpqindz5d2pdhl0zzxx40xjqk591a20kyfjlnp3kjbg6nfj",
- "url": "https://github.com/anthraxx/linux-hardened/releases/download/5.11.6-hardened1/linux-hardened-5.11.6-hardened1.patch"
+ "name": "linux-hardened-5.11.7-hardened1.patch",
+ "sha256": "1d3rg722k796qh2zj97fyk30qak9i71yqy7mk2dpbmdpv0ksacax",
+ "url": "https://github.com/anthraxx/linux-hardened/releases/download/5.11.7-hardened1/linux-hardened-5.11.7-hardened1.patch"
},
"5.4": {
"extra": "-hardened1",
- "name": "linux-hardened-5.4.105-hardened1.patch",
- "sha256": "1djp2cpsb6kgbz2xvix1p0hd7001qw5bnqigf4gz205pianbpakc",
- "url": "https://github.com/anthraxx/linux-hardened/releases/download/5.4.105-hardened1/linux-hardened-5.4.105-hardened1.patch"
+ "name": "linux-hardened-5.4.106-hardened1.patch",
+ "sha256": "1hg18p1n26am6y2i459jrpnkq06rv0f5hds1znnm7jw4f61k395f",
+ "url": "https://github.com/anthraxx/linux-hardened/releases/download/5.4.106-hardened1/linux-hardened-5.4.106-hardened1.patch"
}
}
diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/kernel/linux-4.14.nix b/third_party/nixpkgs/pkgs/os-specific/linux/kernel/linux-4.14.nix
index 4c5dc96895..5052d3754b 100644
--- a/third_party/nixpkgs/pkgs/os-specific/linux/kernel/linux-4.14.nix
+++ b/third_party/nixpkgs/pkgs/os-specific/linux/kernel/linux-4.14.nix
@@ -3,7 +3,7 @@
with lib;
buildLinux (args // rec {
- version = "4.14.225";
+ version = "4.14.226";
# modDirVersion needs to be x.y.z, will automatically add .0 if needed
modDirVersion = if (modDirVersionArg == null) then concatStringsSep "." (take 3 (splitVersion "${version}.0")) else modDirVersionArg;
@@ -13,6 +13,6 @@ buildLinux (args // rec {
src = fetchurl {
url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz";
- sha256 = "09kik0jbfpijb4kylayphr8r2qxx4rlgsnmq300wzcjhxw5yxy3c";
+ sha256 = "09llp8jl5xgxxzj0f2sfx32annwyz82k1zmgd26zy90lz0d09p3s";
};
} // (args.argsOverride or {}))
diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/kernel/linux-4.19.nix b/third_party/nixpkgs/pkgs/os-specific/linux/kernel/linux-4.19.nix
index 701e25c8ed..53fb707ab2 100644
--- a/third_party/nixpkgs/pkgs/os-specific/linux/kernel/linux-4.19.nix
+++ b/third_party/nixpkgs/pkgs/os-specific/linux/kernel/linux-4.19.nix
@@ -3,7 +3,7 @@
with lib;
buildLinux (args // rec {
- version = "4.19.180";
+ version = "4.19.181";
# modDirVersion needs to be x.y.z, will automatically add .0 if needed
modDirVersion = if (modDirVersionArg == null) then concatStringsSep "." (take 3 (splitVersion "${version}.0")) else modDirVersionArg;
@@ -13,6 +13,6 @@ buildLinux (args // rec {
src = fetchurl {
url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz";
- sha256 = "0pxvnyhbcmbbkdrqsrf5hhaz36x9l07s0xmzrmc4ipcdhdy5va0x";
+ sha256 = "1kd967azsq6w41ch8iwpv0i4yjkpijzn5avcipi1141dx4ryw62j";
};
} // (args.argsOverride or {}))
diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/kernel/linux-4.4.nix b/third_party/nixpkgs/pkgs/os-specific/linux/kernel/linux-4.4.nix
index 966db2b84e..941a1dda9b 100644
--- a/third_party/nixpkgs/pkgs/os-specific/linux/kernel/linux-4.4.nix
+++ b/third_party/nixpkgs/pkgs/os-specific/linux/kernel/linux-4.4.nix
@@ -1,11 +1,11 @@
{ buildPackages, fetchurl, perl, buildLinux, ... } @ args:
buildLinux (args // rec {
- version = "4.4.261";
+ version = "4.4.262";
extraMeta.branch = "4.4";
src = fetchurl {
url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz";
- sha256 = "0d9j4j72n8fl3s93qm82cydwk8lvwhvl2357rcsai2vsk5l0k1mc";
+ sha256 = "0yz9qi4i46ndshxmb99kvv7lk6cbb09y7bzagq7sgvqaj4lwaw6j";
};
} // (args.argsOverride or {}))
diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/kernel/linux-4.9.nix b/third_party/nixpkgs/pkgs/os-specific/linux/kernel/linux-4.9.nix
index f2f95ba398..6d9bb6111d 100644
--- a/third_party/nixpkgs/pkgs/os-specific/linux/kernel/linux-4.9.nix
+++ b/third_party/nixpkgs/pkgs/os-specific/linux/kernel/linux-4.9.nix
@@ -1,11 +1,11 @@
{ buildPackages, fetchurl, perl, buildLinux, ... } @ args:
buildLinux (args // rec {
- version = "4.9.261";
+ version = "4.9.262";
extraMeta.branch = "4.9";
src = fetchurl {
url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz";
- sha256 = "0r5822mj2gk9s8rbc8bazg34y8bwr7svn3nbgcq57y2qch8nych4";
+ sha256 = "1zq77x9zf1wbk8n17rnblm5lfwlkin1xnxb3sxirwb9njm07cbmj";
};
} // (args.argsOverride or {}))
diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/kernel/linux-5.10.nix b/third_party/nixpkgs/pkgs/os-specific/linux/kernel/linux-5.10.nix
index 6ce16e67cd..c415fc601c 100644
--- a/third_party/nixpkgs/pkgs/os-specific/linux/kernel/linux-5.10.nix
+++ b/third_party/nixpkgs/pkgs/os-specific/linux/kernel/linux-5.10.nix
@@ -3,7 +3,7 @@
with lib;
buildLinux (args // rec {
- version = "5.10.23";
+ version = "5.10.24";
# modDirVersion needs to be x.y.z, will automatically add .0 if needed
modDirVersion = if (modDirVersionArg == null) then concatStringsSep "." (take 3 (splitVersion "${version}.0")) else modDirVersionArg;
@@ -13,6 +13,6 @@ buildLinux (args // rec {
src = fetchurl {
url = "mirror://kernel/linux/kernel/v5.x/linux-${version}.tar.xz";
- sha256 = "0snvkrs95wbx611kcnap59whfiz6h6mzsnbwswk5py3gxh1irqpn";
+ sha256 = "0gvnplip90gvlzw9rm0cg66z54cfa82gk23icf5xdickb17d1p66";
};
} // (args.argsOverride or {}))
diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/kernel/linux-5.11.nix b/third_party/nixpkgs/pkgs/os-specific/linux/kernel/linux-5.11.nix
index 00576d8d26..319ef0bfea 100644
--- a/third_party/nixpkgs/pkgs/os-specific/linux/kernel/linux-5.11.nix
+++ b/third_party/nixpkgs/pkgs/os-specific/linux/kernel/linux-5.11.nix
@@ -3,7 +3,7 @@
with lib;
buildLinux (args // rec {
- version = "5.11.6";
+ version = "5.11.7";
# modDirVersion needs to be x.y.z, will automatically add .0 if needed
modDirVersion = if (modDirVersionArg == null) then concatStringsSep "." (take 3 (splitVersion "${version}.0")) else modDirVersionArg;
@@ -13,6 +13,6 @@ buildLinux (args // rec {
src = fetchurl {
url = "mirror://kernel/linux/kernel/v5.x/linux-${version}.tar.xz";
- sha256 = "02dcq7cqll5c39z8dh9f0xy68hh4a8jsab5k4n9calfldrm7jw79";
+ sha256 = "1cd87v6j8nk89pjqqsaviyzx9lj0d51j46n1in7cjlg18wng3da9";
};
} // (args.argsOverride or {}))
diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/kernel/linux-5.4.nix b/third_party/nixpkgs/pkgs/os-specific/linux/kernel/linux-5.4.nix
index 2c2bb15a5e..8823e58088 100644
--- a/third_party/nixpkgs/pkgs/os-specific/linux/kernel/linux-5.4.nix
+++ b/third_party/nixpkgs/pkgs/os-specific/linux/kernel/linux-5.4.nix
@@ -3,7 +3,7 @@
with lib;
buildLinux (args // rec {
- version = "5.4.105";
+ version = "5.4.106";
# modDirVersion needs to be x.y.z, will automatically add .0 if needed
modDirVersion = if (modDirVersionArg == null) then concatStringsSep "." (take 3 (splitVersion "${version}.0")) else modDirVersionArg;
@@ -13,6 +13,6 @@ buildLinux (args // rec {
src = fetchurl {
url = "mirror://kernel/linux/kernel/v5.x/linux-${version}.tar.xz";
- sha256 = "1dmq1zkr4idbbvh7wln5hn5sl4d0mcfm1af5bvsmsa44c78lqki4";
+ sha256 = "1ny8b69ngydh0iw53jwlmqlgv31wjhkybkgnqi5kv0n174n3p1yc";
};
} // (args.argsOverride or {}))
diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/lsiutil/default.nix b/third_party/nixpkgs/pkgs/os-specific/linux/lsiutil/default.nix
index 4cb70faee9..1b1acdb535 100644
--- a/third_party/nixpkgs/pkgs/os-specific/linux/lsiutil/default.nix
+++ b/third_party/nixpkgs/pkgs/os-specific/linux/lsiutil/default.nix
@@ -18,7 +18,7 @@ stdenv.mkDerivation {
srcs = [ src "Source/lsiutil.tar.gz" ];
- buildInputs = [ unzip ];
+ nativeBuildInputs = [ unzip ];
sourceRoot = "lsiutil";
diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/msr-tools/default.nix b/third_party/nixpkgs/pkgs/os-specific/linux/msr-tools/default.nix
index 67356719ff..1e6a55a4d6 100644
--- a/third_party/nixpkgs/pkgs/os-specific/linux/msr-tools/default.nix
+++ b/third_party/nixpkgs/pkgs/os-specific/linux/msr-tools/default.nix
@@ -9,7 +9,7 @@ stdenv.mkDerivation rec {
sha256 = "07hxmddg0l31kjfmaq84ni142lbbvgq6391r8bd79wpm819pnigr";
};
- buildInputs = [ unzip ];
+ nativeBuildInputs = [ unzip ];
preInstall = ''
mkdir -p $out/bin
diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/net-tools/default.nix b/third_party/nixpkgs/pkgs/os-specific/linux/net-tools/default.nix
index 461a65c007..c9410c27df 100644
--- a/third_party/nixpkgs/pkgs/os-specific/linux/net-tools/default.nix
+++ b/third_party/nixpkgs/pkgs/os-specific/linux/net-tools/default.nix
@@ -2,11 +2,11 @@
stdenv.mkDerivation rec {
pname = "net-tools";
- version = "1.60_p20180626073013";
+ version = "2.10";
src = fetchurl {
url = "mirror://gentoo/distfiles/${pname}-${version}.tar.xz";
- sha256 = "0mzsjjmz5kn676w2glmxwwd8bj0xy9dhhn21aplb435b767045q4";
+ sha256 = "sha256-smJDWlJB6Jv6UcPKvVEzdTlS96e3uT8y4Iy52W9YDWk=";
};
preBuild =
diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/nixos-rebuild/nixos-rebuild.sh b/third_party/nixpkgs/pkgs/os-specific/linux/nixos-rebuild/nixos-rebuild.sh
index 47179afe51..5874f334fe 100644
--- a/third_party/nixpkgs/pkgs/os-specific/linux/nixos-rebuild/nixos-rebuild.sh
+++ b/third_party/nixpkgs/pkgs/os-specific/linux/nixos-rebuild/nixos-rebuild.sh
@@ -295,7 +295,7 @@ fi
# Resolve the flake.
if [[ -n $flake ]]; then
- flake=$(nix "${flakeFlags[@]}" flake info --json "${extraBuildFlags[@]}" "${lockFlags[@]}" -- "$flake" | jq -r .url)
+ flake=$(nix "${flakeFlags[@]}" flake metadata --json "${extraBuildFlags[@]}" "${lockFlags[@]}" -- "$flake" | jq -r .url)
fi
# Find configuration.nix and open editor instead of building.
diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/numactl/default.nix b/third_party/nixpkgs/pkgs/os-specific/linux/numactl/default.nix
index d796bf579f..2f8a4feb03 100644
--- a/third_party/nixpkgs/pkgs/os-specific/linux/numactl/default.nix
+++ b/third_party/nixpkgs/pkgs/os-specific/linux/numactl/default.nix
@@ -17,6 +17,8 @@ stdenv.mkDerivation rec {
patchShebangs test
'';
+ LDFLAGS = lib.optionalString stdenv.hostPlatform.isRiscV "-latomic";
+
# You probably shouldn't ever run these! They will reconfigure Linux
# NUMA settings, which on my build machine makes the rest of package
# building ~5% slower until reboot. Ugh!
@@ -26,6 +28,6 @@ stdenv.mkDerivation rec {
description = "Library and tools for non-uniform memory access (NUMA) machines";
homepage = "https://github.com/numactl/numactl";
license = with licenses; [ gpl2 lgpl21 ]; # libnuma is lgpl21
- platforms = [ "i686-linux" "x86_64-linux" "aarch64-linux" ];
+ platforms = platforms.linux;
};
}
diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/pax-utils/default.nix b/third_party/nixpkgs/pkgs/os-specific/linux/pax-utils/default.nix
index f69b2bd7fc..40159cd2ac 100644
--- a/third_party/nixpkgs/pkgs/os-specific/linux/pax-utils/default.nix
+++ b/third_party/nixpkgs/pkgs/os-specific/linux/pax-utils/default.nix
@@ -2,11 +2,11 @@
stdenv.mkDerivation rec {
pname = "pax-utils";
- version = "1.2.6";
+ version = "1.2.8";
src = fetchurl {
url = "http://distfiles.gentoo.org/distfiles/${pname}-${version}.tar.xz";
- sha256 = "08bzvgv1z3371sqf7zlm9i0b1y3wdymj2dqdvzvf192k3nix4hlp";
+ sha256 = "sha256-urTIhG4dLMNmnPqSMdIdszWEHX1Y+eGc0Jn+bOYmsVc=";
};
makeFlags = [ "PREFIX=$(out)" ];
diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/s6-linux-init/default.nix b/third_party/nixpkgs/pkgs/os-specific/linux/s6-linux-init/default.nix
index 87cc098d07..41790e5eb7 100644
--- a/third_party/nixpkgs/pkgs/os-specific/linux/s6-linux-init/default.nix
+++ b/third_party/nixpkgs/pkgs/os-specific/linux/s6-linux-init/default.nix
@@ -4,8 +4,8 @@ with skawarePackages;
buildPackage {
pname = "s6-linux-init";
- version = "1.0.6.0";
- sha256 = "0kzif3dqhm7h4h7c6npzdbcy7w756222g8ysw116fgb8j385dr6w";
+ version = "1.0.6.1";
+ sha256 = "0sq8ya39a1qs61cdjns8ijwrvxnqd4snk2ab4j5wl9a87i7wixhn";
description = "A set of minimalistic tools used to create a s6-based init system, including a /sbin/init binary, on a Linux kernel";
platforms = lib.platforms.linux;
diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/seturgent/default.nix b/third_party/nixpkgs/pkgs/os-specific/linux/seturgent/default.nix
index a2ffcae3d6..2e9e445edd 100644
--- a/third_party/nixpkgs/pkgs/os-specific/linux/seturgent/default.nix
+++ b/third_party/nixpkgs/pkgs/os-specific/linux/seturgent/default.nix
@@ -8,8 +8,9 @@ stdenv.mkDerivation {
sha256 = "0q1sr6aljkw2jr9b4xxzbc01qvnd5vk3pxrypif9yd8xjw4wqwri";
};
+ nativeBuildInputs = [ unzip ];
buildInputs = [
- libX11 xorgproto unzip
+ libX11 xorgproto
];
installPhase = ''
diff --git a/third_party/nixpkgs/pkgs/servers/amqp/rabbitmq-server/default.nix b/third_party/nixpkgs/pkgs/servers/amqp/rabbitmq-server/default.nix
index 6100498f9b..c2d13b00aa 100644
--- a/third_party/nixpkgs/pkgs/servers/amqp/rabbitmq-server/default.nix
+++ b/third_party/nixpkgs/pkgs/servers/amqp/rabbitmq-server/default.nix
@@ -16,8 +16,9 @@ stdenv.mkDerivation rec {
sha256 = "0b252l9r45h8r5gibdqcn6hhbm8g6rfzhm1k9d39pwhs5x77cjqv";
};
+ nativeBuildInputs = [ unzip ];
buildInputs =
- [ erlang elixir python libxml2 libxslt xmlto docbook_xml_dtd_45 docbook_xsl zip unzip rsync glibcLocales ]
+ [ erlang elixir python libxml2 libxslt xmlto docbook_xml_dtd_45 docbook_xsl zip rsync glibcLocales ]
++ lib.optionals stdenv.isDarwin [ AppKit Carbon Cocoa ];
outputs = [ "out" "man" "doc" ];
diff --git a/third_party/nixpkgs/pkgs/servers/computing/storm/default.nix b/third_party/nixpkgs/pkgs/servers/computing/storm/default.nix
index daebf174fa..07c636b6e5 100644
--- a/third_party/nixpkgs/pkgs/servers/computing/storm/default.nix
+++ b/third_party/nixpkgs/pkgs/servers/computing/storm/default.nix
@@ -15,7 +15,7 @@ stdenv.mkDerivation rec {
sha256 = "0xc6lfilfkkjyds59b6c770gj21v9srzpln31c9qb3ls6hzic8gn";
};
- buildInputs = [ zip unzip ];
+ nativeBuildInputs = [ zip unzip ];
installPhase = ''
mkdir -p $out/share/${name}
diff --git a/third_party/nixpkgs/pkgs/servers/home-assistant/appdaemon.nix b/third_party/nixpkgs/pkgs/servers/home-assistant/appdaemon.nix
index 4614e1d64c..51f3d10cd0 100644
--- a/third_party/nixpkgs/pkgs/servers/home-assistant/appdaemon.nix
+++ b/third_party/nixpkgs/pkgs/servers/home-assistant/appdaemon.nix
@@ -1,4 +1,7 @@
-{ lib, python3, fetchFromGitHub }:
+{ lib
+, python3
+, fetchFromGitHub
+}:
let
python = python3.override {
@@ -24,10 +27,11 @@ let
in python.pkgs.buildPythonApplication rec {
pname = "appdaemon";
version = "4.0.5";
+ disabled = python.pythonOlder "3.6";
src = fetchFromGitHub {
- owner = "home-assistant";
- repo = "appdaemon";
+ owner = "AppDaemon";
+ repo = pname;
rev = version;
sha256 = "7o6DrTufAC+qK3dDfpkuQMQWuduCZ6Say/knI4Y07QM=";
};
@@ -63,12 +67,13 @@ in python.pkgs.buildPythonApplication rec {
--replace "feedparser==5.2.1" "feedparser>=5.2.1" \
--replace "aiohttp_jinja2==1.2.0" "aiohttp_jinja2>=1.2.0" \
--replace "pygments==2.6.1" "pygments>=2.6.1" \
- --replace "paho-mqtt==1.5.0" "paho-mqtt>=1.5.0"
+ --replace "paho-mqtt==1.5.0" "paho-mqtt>=1.5.0" \
+ --replace "websocket-client==0.57.0" "websocket-client>=0.57.0"
'';
meta = with lib; {
description = "Sandboxed Python execution environment for writing automation apps for Home Assistant";
- homepage = "https://github.com/home-assistant/appdaemon";
+ homepage = "https://github.com/AppDaemon/appdaemon";
license = licenses.mit;
maintainers = with maintainers; [ peterhoeg dotlambda ];
};
diff --git a/third_party/nixpkgs/pkgs/servers/http/jboss/default.nix b/third_party/nixpkgs/pkgs/servers/http/jboss/default.nix
index ba89d19db3..fda57cb9a5 100644
--- a/third_party/nixpkgs/pkgs/servers/http/jboss/default.nix
+++ b/third_party/nixpkgs/pkgs/servers/http/jboss/default.nix
@@ -7,7 +7,7 @@ stdenv.mkDerivation {
sha256 = "1bdjw0ib9qr498vpfbg8klqw6rl11vbz7vwn6gp1r5gpqkd3zzc8";
};
- buildInputs = [ unzip ];
+ nativeBuildInputs = [ unzip ];
phases = [ "unpackPhase" "installPhase" "fixupPhase" ];
diff --git a/third_party/nixpkgs/pkgs/servers/http/nginx/mainline.nix b/third_party/nixpkgs/pkgs/servers/http/nginx/mainline.nix
index aad46be30b..0c33ab431d 100644
--- a/third_party/nixpkgs/pkgs/servers/http/nginx/mainline.nix
+++ b/third_party/nixpkgs/pkgs/servers/http/nginx/mainline.nix
@@ -1,6 +1,6 @@
{ callPackage, ... }@args:
callPackage ./generic.nix args {
- version = "1.19.7";
- sha256 = "03mmfnkhayn8vm2yhs3ngvif6275c368ymx8wvhsbls11h1dvr3s";
+ version = "1.19.8";
+ sha256 = "01cb6hsaik1sfjihbrldmwrcn54gk4plfy350sl1b4rml6qik29h";
}
diff --git a/third_party/nixpkgs/pkgs/servers/http/tomcat/axis2/default.nix b/third_party/nixpkgs/pkgs/servers/http/tomcat/axis2/default.nix
index e383d8f0d1..ab05d8cbb0 100644
--- a/third_party/nixpkgs/pkgs/servers/http/tomcat/axis2/default.nix
+++ b/third_party/nixpkgs/pkgs/servers/http/tomcat/axis2/default.nix
@@ -9,7 +9,8 @@ stdenv.mkDerivation rec {
sha256 = "0dh0s9bfh95wmmw8nyf2yw95biq7d9zmrbg8k4vzcyz1if228lac";
};
- buildInputs = [ unzip apacheAnt jdk ];
+ nativeBuildInputs = [ unzip ];
+ buildInputs = [ apacheAnt jdk ];
builder = ./builder.sh;
meta = {
diff --git a/third_party/nixpkgs/pkgs/servers/jellyfin/10.5.x.nix b/third_party/nixpkgs/pkgs/servers/jellyfin/10.5.x.nix
index da4d2c4c1d..9bece72566 100644
--- a/third_party/nixpkgs/pkgs/servers/jellyfin/10.5.x.nix
+++ b/third_party/nixpkgs/pkgs/servers/jellyfin/10.5.x.nix
@@ -26,8 +26,8 @@ in stdenv.mkDerivation rec {
sha256 = "1s3hva1j5w74qc9wyqnmr5clk4smzfi7wvx8qrzrwy81mx7r5w27";
};
+ nativeBuildInputs = [ unzip ];
buildInputs = [
- unzip
makeWrapper
];
diff --git a/third_party/nixpkgs/pkgs/servers/mail/postsrsd/default.nix b/third_party/nixpkgs/pkgs/servers/mail/postsrsd/default.nix
index 2ba07ee573..b61332be24 100644
--- a/third_party/nixpkgs/pkgs/servers/mail/postsrsd/default.nix
+++ b/third_party/nixpkgs/pkgs/servers/mail/postsrsd/default.nix
@@ -23,7 +23,7 @@ stdenv.mkDerivation rec {
homepage = "https://github.com/roehling/postsrsd";
description = "Postfix Sender Rewriting Scheme daemon";
license = licenses.gpl2;
- platforms = platforms.linux;
+ platforms = platforms.all;
maintainers = with maintainers; [ abbradar ];
};
}
diff --git a/third_party/nixpkgs/pkgs/servers/mail/rspamd/default.nix b/third_party/nixpkgs/pkgs/servers/mail/rspamd/default.nix
index 0740613bad..7a2eb9fd2c 100644
--- a/third_party/nixpkgs/pkgs/servers/mail/rspamd/default.nix
+++ b/third_party/nixpkgs/pkgs/servers/mail/rspamd/default.nix
@@ -11,13 +11,13 @@ assert withHyperscan -> stdenv.isx86_64;
stdenv.mkDerivation rec {
pname = "rspamd";
- version = "2.6";
+ version = "2.7";
src = fetchFromGitHub {
owner = "rspamd";
repo = "rspamd";
rev = version;
- sha256 = "0vwa7k2s2bkfb8w78z5izkd6ywjbzqysb0grls898y549hm8ii70";
+ sha256 = "sha256-LMLRDnKfGpApVsIvPNY2nxl+H5+qeVvwvwr3wdyyhjs=";
};
nativeBuildInputs = [ cmake pkg-config perl ];
diff --git a/third_party/nixpkgs/pkgs/servers/mail/sympa/default.nix b/third_party/nixpkgs/pkgs/servers/mail/sympa/default.nix
index 4bc969a851..82d8d30265 100644
--- a/third_party/nixpkgs/pkgs/servers/mail/sympa/default.nix
+++ b/third_party/nixpkgs/pkgs/servers/mail/sympa/default.nix
@@ -12,7 +12,6 @@ let
DBI
DateTimeFormatMail
DateTimeTimeZone
- DigestMD5
Encode
FCGI
FileCopyRecursive
@@ -28,7 +27,6 @@ let
libintl_perl
MHonArc
- MIMEBase64
MIMECharset
MIMETools
MIMEEncWords
@@ -56,8 +54,8 @@ let
IOSocketSSL
MailDKIM
NetDNS
- NetLDAP
- NetSMTP
+ perlldap
+ libnet
SOAPLite
]);
in
diff --git a/third_party/nixpkgs/pkgs/servers/matterbridge/default.nix b/third_party/nixpkgs/pkgs/servers/matterbridge/default.nix
index 6d12ac84d9..4235c7e26b 100644
--- a/third_party/nixpkgs/pkgs/servers/matterbridge/default.nix
+++ b/third_party/nixpkgs/pkgs/servers/matterbridge/default.nix
@@ -2,7 +2,7 @@
buildGoModule rec {
pname = "matterbridge";
- version = "1.21.0";
+ version = "1.22.0";
vendorSha256 = null;
@@ -10,7 +10,7 @@ buildGoModule rec {
src = fetchurl {
url = "https://github.com/42wim/matterbridge/archive/v${version}.tar.gz";
- sha256 = "sha256-ehn6KdPpDpfdyWCVfLuZLq2dDmZXc6InlnovqNsdG6Y=";
+ sha256 = "sha256-jwatqxQh4t4tgNiOEjS9vxIM+9XtnH8QNch887+xDnI=";
};
meta = with lib; {
diff --git a/third_party/nixpkgs/pkgs/servers/mattermost/default.nix b/third_party/nixpkgs/pkgs/servers/mattermost/default.nix
index f63f76efab..6a7ba06df8 100644
--- a/third_party/nixpkgs/pkgs/servers/mattermost/default.nix
+++ b/third_party/nixpkgs/pkgs/servers/mattermost/default.nix
@@ -1,7 +1,7 @@
{ lib, stdenv, fetchurl, fetchFromGitHub, buildGoPackage, buildEnv }:
let
- version = "5.25.3";
+ version = "5.32.1";
mattermost-server = buildGoPackage rec {
pname = "mattermost-server";
@@ -11,7 +11,7 @@ let
owner = "mattermost";
repo = "mattermost-server";
rev = "v${version}";
- sha256 = "03xcwlbb9ff5whsdn2m3kqskxpwpfciikjjndbhksc8k8963z07j";
+ sha256 = "BssrTfkIxUbXYXIfz9i+5b4rEYSzBim+/riK78m8Bxo=";
};
goPackagePath = "github.com/mattermost/mattermost-server";
@@ -29,7 +29,7 @@ let
src = fetchurl {
url = "https://releases.mattermost.com/${version}/mattermost-${version}-linux-amd64.tar.gz";
- sha256 = "1p1qxzrd6rj1i43vj18ysknrw2v02s7llx94nrdd5lk10ayzmg63";
+ sha256 = "kRerl3fYRTrotj86AIFSor3GpjhABkCmego1ms9HmkQ=";
};
installPhase = ''
diff --git a/third_party/nixpkgs/pkgs/servers/minio/default.nix b/third_party/nixpkgs/pkgs/servers/minio/default.nix
index a2ffe32acd..ce53f30929 100644
--- a/third_party/nixpkgs/pkgs/servers/minio/default.nix
+++ b/third_party/nixpkgs/pkgs/servers/minio/default.nix
@@ -2,13 +2,13 @@
buildGoModule rec {
pname = "minio";
- version = "2021-03-12T00-00-47Z";
+ version = "2021-03-17T02-33-02Z";
src = fetchFromGitHub {
owner = "minio";
repo = "minio";
rev = "RELEASE.${version}";
- sha256 = "sha256-7KHEmnrTw6SBhsImMjcv+b1wvFEg8AXgsuZTGp5iVis=";
+ sha256 = "sha256-nCCU9hSt8VaLpZmqZFl3GczqDJXEQJ4rFn/9B0gV/5g=";
};
vendorSha256 = "sha256-tMt6XRj1dd+AHqWA6WGm5GBFGx+IsP1ijYCj8cmUXy0=";
diff --git a/third_party/nixpkgs/pkgs/servers/monitoring/grafana/default.nix b/third_party/nixpkgs/pkgs/servers/monitoring/grafana/default.nix
index dc7ca728f2..9bf10165e0 100644
--- a/third_party/nixpkgs/pkgs/servers/monitoring/grafana/default.nix
+++ b/third_party/nixpkgs/pkgs/servers/monitoring/grafana/default.nix
@@ -2,7 +2,7 @@
buildGoModule rec {
pname = "grafana";
- version = "7.4.3";
+ version = "7.4.5";
excludedPackages = [ "release_publisher" ];
@@ -10,15 +10,15 @@ buildGoModule rec {
rev = "v${version}";
owner = "grafana";
repo = "grafana";
- sha256 = "sha256-FPQa6q1ks9Lpod5sI29YBnGZvVRU12hTiw6GR85/mEs=";
+ sha256 = "10pnwd4d19ry7w2x46acc3j8gjn73b45fzc579gz1hc8hx2b3s0s";
};
srcStatic = fetchurl {
url = "https://dl.grafana.com/oss/release/grafana-${version}.linux-amd64.tar.gz";
- sha256 = "sha256-idbG+K9NVnNhEB0f7DfP7iaEnHMf59ieQtYnmT6CvVM=";
+ sha256 = "1x9jx3ww37cn6r6cn6gqlavmllxydks23vm8w4934bv8zppj1zwz";
};
- vendorSha256 = "sha256-LL+EkDZbbaNo/fPMGlPsB8jgBYHoe6SdkBbQoW5y4EU=";
+ vendorSha256 = "0ig0f9pa3l0nj2fs8yz8h42y1j07xi9imk7kzmla6vav6s889grc";
postPatch = ''
substituteInPlace pkg/cmd/grafana-server/main.go \
diff --git a/third_party/nixpkgs/pkgs/servers/monitoring/loki/default.nix b/third_party/nixpkgs/pkgs/servers/monitoring/loki/default.nix
index d6e7983132..e27167041c 100644
--- a/third_party/nixpkgs/pkgs/servers/monitoring/loki/default.nix
+++ b/third_party/nixpkgs/pkgs/servers/monitoring/loki/default.nix
@@ -14,7 +14,13 @@ buildGoModule rec {
vendorSha256 = null;
- subPackages = [ "..." ];
+ subPackages = [
+ # TODO split every executable into its own package
+ "cmd/loki"
+ "cmd/loki-canary"
+ "cmd/promtail"
+ "cmd/logcli"
+ ];
nativeBuildInputs = [ makeWrapper ];
buildInputs = lib.optionals stdenv.isLinux [ systemd.dev ];
diff --git a/third_party/nixpkgs/pkgs/servers/monitoring/nagios/default.nix b/third_party/nixpkgs/pkgs/servers/monitoring/nagios/default.nix
index 09af13951c..a58ec2bf7b 100644
--- a/third_party/nixpkgs/pkgs/servers/monitoring/nagios/default.nix
+++ b/third_party/nixpkgs/pkgs/servers/monitoring/nagios/default.nix
@@ -10,7 +10,8 @@ stdenv.mkDerivation rec {
};
patches = [ ./nagios.patch ];
- buildInputs = [ php perl gd libpng zlib unzip ];
+ nativeBuildInputs = [ unzip ];
+ buildInputs = [ php perl gd libpng zlib ];
configureFlags = [ "--localstatedir=/var/lib/nagios" ];
buildFlags = [ "all" ];
diff --git a/third_party/nixpkgs/pkgs/servers/monitoring/net-snmp/default.nix b/third_party/nixpkgs/pkgs/servers/monitoring/net-snmp/default.nix
index 8f354d4bb4..27a6e01dba 100644
--- a/third_party/nixpkgs/pkgs/servers/monitoring/net-snmp/default.nix
+++ b/third_party/nixpkgs/pkgs/servers/monitoring/net-snmp/default.nix
@@ -37,8 +37,8 @@ stdenv.mkDerivation rec {
substituteInPlace testing/fulltests/support/simple_TESTCONF.sh --replace "/bin/netstat" "${nettools}/bin/netstat"
'';
- nativeBuildInputs = [ autoreconfHook nettools removeReferencesTo ];
- buildInputs = with perlPackages; [ file perl unzip openssl ncurses JSON Tk TermReadKey ];
+ nativeBuildInputs = [ autoreconfHook nettools removeReferencesTo unzip ];
+ buildInputs = with perlPackages; [ file perl openssl ncurses JSON Tk TermReadKey ];
enableParallelBuilding = true;
doCheck = false; # tries to use networking
diff --git a/third_party/nixpkgs/pkgs/servers/monitoring/prometheus/cups-exporter.nix b/third_party/nixpkgs/pkgs/servers/monitoring/prometheus/cups-exporter.nix
deleted file mode 100644
index a02dab88a3..0000000000
--- a/third_party/nixpkgs/pkgs/servers/monitoring/prometheus/cups-exporter.nix
+++ /dev/null
@@ -1,38 +0,0 @@
-{ lib, fetchFromGitHub, python3Packages, nixosTests }:
-
-python3Packages.buildPythonApplication rec {
- pname = "prometheus-cups-exporter-unstable";
- version = "2019-03-17";
-
- format = "other";
-
- src = fetchFromGitHub {
- owner = "ThoreKr";
- repo = "cups_exporter";
- rev = "8fd1c2517e9878b7b7c73a450e5e546f437954a9";
- sha256 = "1cwk2gbw2svqjlzgwv5wqzhq7fxwrwsrr0kkbnqn4mfb0kq6pa8m";
- };
-
- propagatedBuildInputs = with python3Packages; [ prometheus_client pycups ];
-
- installPhase = ''
- mkdir -p $out/share/
- cp cups_exporter.py $out/share/
- '';
-
- fixupPhase = ''
- makeWrapper "${python3Packages.python.interpreter}" "$out/bin/prometheus-cups-exporter" \
- --set PYTHONPATH "$PYTHONPATH" \
- --add-flags "$out/share/cups_exporter.py"
- '';
-
- passthru.tests = { inherit (nixosTests.prometheus-exporters) cups; };
-
- meta = with lib; {
- description = "A simple prometheus exporter for cups implemented in python";
- homepage = "https://github.com/ThoreKr/cups_exporter";
- license = licenses.unfree;
- maintainers = [ maintainers.mmahut ];
- platforms = platforms.all;
- };
-}
diff --git a/third_party/nixpkgs/pkgs/servers/nats-server/default.nix b/third_party/nixpkgs/pkgs/servers/nats-server/default.nix
index d24fe89cc4..06d7a954aa 100644
--- a/third_party/nixpkgs/pkgs/servers/nats-server/default.nix
+++ b/third_party/nixpkgs/pkgs/servers/nats-server/default.nix
@@ -4,7 +4,7 @@ with lib;
buildGoPackage rec {
pname = "nats-server";
- version = "2.1.9";
+ version = "2.2.0";
goPackagePath = "github.com/nats-io/${pname}";
@@ -12,7 +12,7 @@ buildGoPackage rec {
rev = "v${version}";
owner = "nats-io";
repo = pname;
- sha256 = "0y92isca1dlvprik0lbiz8ny1w84svy4zn73brqhzrkxnqppcxi2";
+ sha256 = "sha256-CNCdJUug99a9yE8YxSk7/s1CIEYJd9n8Gahz+B3ZyjI=";
};
meta = {
diff --git a/third_party/nixpkgs/pkgs/servers/nosql/riak/2.2.0.nix b/third_party/nixpkgs/pkgs/servers/nosql/riak/2.2.0.nix
index efa43f7a84..a9a74f0b75 100644
--- a/third_party/nixpkgs/pkgs/servers/nosql/riak/2.2.0.nix
+++ b/third_party/nixpkgs/pkgs/servers/nosql/riak/2.2.0.nix
@@ -28,8 +28,9 @@ in
stdenv.mkDerivation {
name = "riak-2.2.0";
+ nativeBuildInputs = [ unzip ];
buildInputs = [
- which unzip erlang pam
+ which erlang pam
];
src = srcs.riak;
diff --git a/third_party/nixpkgs/pkgs/servers/p910nd/default.nix b/third_party/nixpkgs/pkgs/servers/p910nd/default.nix
index e5e4df1a29..9cd06a3ebc 100644
--- a/third_party/nixpkgs/pkgs/servers/p910nd/default.nix
+++ b/third_party/nixpkgs/pkgs/servers/p910nd/default.nix
@@ -10,7 +10,8 @@ stdenv.mkDerivation rec {
};
postPatch = ''
- sed -e "s|/usr||g" -i Makefile
+ substituteInPlace Makefile --replace "/usr" ""
+ substituteInPlace Makefile --replace "gcc" "${stdenv.cc.targetPrefix}cc"
'';
makeFlags = [ "DESTDIR=$(out)" "BINDIR=/bin" ];
@@ -39,6 +40,6 @@ stdenv.mkDerivation rec {
homepage = "http://p910nd.sourceforge.net/";
downloadPage = "https://sourceforge.net/projects/p910nd/";
license = licenses.gpl2;
- platforms = platforms.linux;
+ platforms = platforms.unix;
};
}
diff --git a/third_party/nixpkgs/pkgs/servers/rainloop/default.nix b/third_party/nixpkgs/pkgs/servers/rainloop/default.nix
index 681a9dd38c..f86254e93b 100644
--- a/third_party/nixpkgs/pkgs/servers/rainloop/default.nix
+++ b/third_party/nixpkgs/pkgs/servers/rainloop/default.nix
@@ -4,7 +4,7 @@
pname = "rainloop${lib.optionalString (edition != "") "-${edition}"}";
version = "1.14.0";
- buildInputs = [ unzip ];
+ nativeBuildInputs = [ unzip ];
unpackPhase = ''
mkdir rainloop
diff --git a/third_party/nixpkgs/pkgs/servers/routinator/default.nix b/third_party/nixpkgs/pkgs/servers/routinator/default.nix
index f1e705b069..4d326c0bd6 100644
--- a/third_party/nixpkgs/pkgs/servers/routinator/default.nix
+++ b/third_party/nixpkgs/pkgs/servers/routinator/default.nix
@@ -1,4 +1,4 @@
-{ lib, fetchFromGitHub, rustPlatform }:
+{ stdenv, lib, fetchFromGitHub, rustPlatform, Security }:
rustPlatform.buildRustPackage rec {
pname = "routinator";
@@ -11,6 +11,7 @@ rustPlatform.buildRustPackage rec {
sha256 = "sha256-JwPAwhD+Pkx8Kx24m7z/RbEvDnI2YR8dnTgAV7TMsFE=";
};
+ buildInputs = lib.optionals stdenv.isDarwin [ Security ];
cargoSha256 = "sha256-lhSSyJxxHc0t43xoDMtr/lSVL0xZl6poPYiyYXNvKKQ=";
meta = with lib; {
@@ -18,6 +19,6 @@ rustPlatform.buildRustPackage rec {
homepage = "https://github.com/NLnetLabs/routinator";
license = licenses.bsd3;
maintainers = with maintainers; [ _0x4A6F ];
- platforms = platforms.linux;
+ platforms = platforms.all;
};
}
diff --git a/third_party/nixpkgs/pkgs/servers/search/elasticsearch/plugins.nix b/third_party/nixpkgs/pkgs/servers/search/elasticsearch/plugins.nix
index c51b0d2098..19aac33705 100644
--- a/third_party/nixpkgs/pkgs/servers/search/elasticsearch/plugins.nix
+++ b/third_party/nixpkgs/pkgs/servers/search/elasticsearch/plugins.nix
@@ -21,7 +21,7 @@ let
# Work around the "unpacker appears to have produced no directories"
# case that happens when the archive doesn't have a subdirectory.
setSourceRoot = "sourceRoot=$(pwd)";
- buildInputs = [ unzip ];
+ nativeBuildInputs = [ unzip ];
meta = a.meta // {
platforms = elasticsearch.meta.platforms;
maintainers = (a.meta.maintainers or []) ++ (with lib.maintainers; [ offline ]);
diff --git a/third_party/nixpkgs/pkgs/servers/sozu/default.nix b/third_party/nixpkgs/pkgs/servers/sozu/default.nix
index 8d3e4e1388..057bce2e4b 100644
--- a/third_party/nixpkgs/pkgs/servers/sozu/default.nix
+++ b/third_party/nixpkgs/pkgs/servers/sozu/default.nix
@@ -2,16 +2,16 @@
rustPlatform.buildRustPackage rec {
pname = "sozu";
- version = "0.11.50";
+ version = "0.11.56";
src = fetchFromGitHub {
owner = "sozu-proxy";
repo = pname;
rev = version;
- sha256 = "1srg2b8vwc4vp07kg4fizqj1rbm9hvf6hj1mjdh6yvb9cpbw3jz7";
+ sha256 = "sha256-/XyBzhZCsX9sGk+iTFlDnblWfDCZdI4b9yfo4Z+Wp1U=";
};
- cargoSha256 = "5WOigCiQZQ5DaTd15vV8pUh8Xl3UIe9yLG1ptUtY+iA=";
+ cargoSha256 = "sha256-F5EjBWHBNaQipxCi9Kiz5UTPMU0DuRf15NIVVvhiRxY=";
buildInputs =
lib.optional stdenv.isDarwin darwin.apple_sdk.frameworks.Security;
diff --git a/third_party/nixpkgs/pkgs/servers/sql/mysql/jdbc/default.nix b/third_party/nixpkgs/pkgs/servers/sql/mysql/jdbc/default.nix
index 5aab3000f3..6b22185cd8 100644
--- a/third_party/nixpkgs/pkgs/servers/sql/mysql/jdbc/default.nix
+++ b/third_party/nixpkgs/pkgs/servers/sql/mysql/jdbc/default.nix
@@ -9,7 +9,8 @@ stdenv.mkDerivation rec {
sha256 = "0dfjshrrx0ndfb6xbdpwhn1f1jkw0km57rgpar0ny8ixmgdnlwnm";
};
- buildInputs = [ unzip ant ];
+ nativeBuildInputs = [ unzip ];
+ buildInputs = [ ant ];
meta = {
platforms = lib.platforms.unix;
diff --git a/third_party/nixpkgs/pkgs/servers/tailscale/default.nix b/third_party/nixpkgs/pkgs/servers/tailscale/default.nix
index 32c5a23a9a..714cf51745 100644
--- a/third_party/nixpkgs/pkgs/servers/tailscale/default.nix
+++ b/third_party/nixpkgs/pkgs/servers/tailscale/default.nix
@@ -2,20 +2,20 @@
buildGoModule rec {
pname = "tailscale";
- version = "1.4.5";
+ version = "1.6.0";
src = fetchFromGitHub {
owner = "tailscale";
repo = "tailscale";
rev = "v${version}";
- sha256 = "sha256-PMBlvres95UIbd3uqZWPE3OzyrEAGEXit/Z7X1p46GY=";
+ sha256 = "07dzcqd98nsrdv72wp93q6f23mn3pfmpyyi61dx6c26w0j5n4r0p";
};
nativeBuildInputs = [ makeWrapper ];
CGO_ENABLED = 0;
- vendorSha256 = "sha256-WvojOnGQ/ssBkoQwIlOVsaEUJmi2ugqgtTAVKJg8Spk=";
+ vendorSha256 = "0wbw9pc0cv05bw2gsps3099zipwjj3r23vyf87qy6g21r08xrrm8";
doCheck = false;
diff --git a/third_party/nixpkgs/pkgs/servers/udpt/default.nix b/third_party/nixpkgs/pkgs/servers/udpt/default.nix
index b681727c08..3eb51b68b8 100644
--- a/third_party/nixpkgs/pkgs/servers/udpt/default.nix
+++ b/third_party/nixpkgs/pkgs/servers/udpt/default.nix
@@ -21,7 +21,7 @@ rustPlatform.buildRustPackage rec {
description = "A lightweight UDP torrent tracker";
homepage = "https://naim94a.github.io/udpt";
license = lib.licenses.gpl3;
- platforms = lib.platforms.linux;
+ platforms = lib.platforms.all;
maintainers = with lib.maintainers; [ makefu ];
};
}
diff --git a/third_party/nixpkgs/pkgs/servers/web-apps/bookstack/composer-env.nix b/third_party/nixpkgs/pkgs/servers/web-apps/bookstack/composer-env.nix
new file mode 100644
index 0000000000..b91be187f5
--- /dev/null
+++ b/third_party/nixpkgs/pkgs/servers/web-apps/bookstack/composer-env.nix
@@ -0,0 +1,238 @@
+# This file originates from composer2nix
+
+{ stdenv, lib, writeTextFile, fetchurl, php, unzip, phpPackages }:
+
+let
+ inherit (phpPackages) composer;
+ buildZipPackage = { name, src }:
+ stdenv.mkDerivation {
+ inherit name src;
+ buildInputs = [ unzip ];
+ buildCommand = ''
+ unzip $src
+ baseDir=$(find . -type d -mindepth 1 -maxdepth 1)
+ cd $baseDir
+ mkdir -p $out
+ mv * $out
+ '';
+ };
+
+ buildPackage =
+ { name
+ , src
+ , packages ? {}
+ , devPackages ? {}
+ , buildInputs ? []
+ , symlinkDependencies ? false
+ , executable ? false
+ , removeComposerArtifacts ? false
+ , postInstall ? ""
+ , noDev ? false
+ , unpackPhase ? "true"
+ , buildPhase ? "true"
+ , ...}@args:
+
+ let
+ reconstructInstalled = writeTextFile {
+ name = "reconstructinstalled.php";
+ executable = true;
+ text = ''
+ #! ${php}/bin/php
+
+ '';
+ };
+
+ constructBin = writeTextFile {
+ name = "constructbin.php";
+ executable = true;
+ text = ''
+ #! ${php}/bin/php
+
+ '';
+ };
+
+ bundleDependencies = dependencies:
+ lib.concatMapStrings (dependencyName:
+ let
+ dependency = dependencies.${dependencyName};
+ in
+ ''
+ ${if dependency.targetDir == "" then ''
+ vendorDir="$(dirname ${dependencyName})"
+ mkdir -p "$vendorDir"
+ ${if symlinkDependencies then
+ ''ln -s "${dependency.src}" "$vendorDir/$(basename "${dependencyName}")"''
+ else
+ ''cp -av "${dependency.src}" "$vendorDir/$(basename "${dependencyName}")"''
+ }
+ '' else ''
+ namespaceDir="${dependencyName}/$(dirname "${dependency.targetDir}")"
+ mkdir -p "$namespaceDir"
+ ${if symlinkDependencies then
+ ''ln -s "${dependency.src}" "$namespaceDir/$(basename "${dependency.targetDir}")"''
+ else
+ ''cp -av "${dependency.src}" "$namespaceDir/$(basename "${dependency.targetDir}")"''
+ }
+ ''}
+ '') (builtins.attrNames dependencies);
+
+ extraArgs = removeAttrs args [ "name" "packages" "devPackages" "buildInputs" ];
+ in
+ stdenv.mkDerivation ({
+ name = "composer-${name}";
+ buildInputs = [ php composer ] ++ buildInputs;
+
+ inherit unpackPhase buildPhase;
+
+ installPhase = ''
+ ${if executable then ''
+ mkdir -p $out/share/php
+ cp -av $src $out/share/php/$name
+ chmod -R u+w $out/share/php/$name
+ cd $out/share/php/$name
+ '' else ''
+ cp -av $src $out
+ chmod -R u+w $out
+ cd $out
+ ''}
+
+ # Remove unwanted files
+ rm -f *.nix
+
+ export HOME=$TMPDIR
+
+ # Remove the provided vendor folder if it exists
+ rm -Rf vendor
+
+ # If there is no composer.lock file, compose a dummy file.
+ # Otherwise, composer attempts to download the package.json file from
+ # the registry which we do not want.
+ if [ ! -f composer.lock ]
+ then
+ cat > composer.lock < vendor/composer/installed.json
+
+ # Copy or symlink the provided dependencies
+ cd vendor
+ ${bundleDependencies packages}
+ ${lib.optionalString (!noDev) (bundleDependencies devPackages)}
+ cd ..
+
+ # Reconstruct autoload scripts
+ # We use the optimize feature because Nix packages cannot change after they have been built
+ # Using the dynamic loader for a Nix package is useless since there is nothing to dynamically reload.
+ composer dump-autoload --optimize ${lib.optionalString noDev "--no-dev"}
+
+ # Run the install step as a validation to confirm that everything works out as expected
+ composer install --optimize-autoloader ${lib.optionalString noDev "--no-dev"}
+
+ ${lib.optionalString executable ''
+ # Reconstruct the bin/ folder if we deploy an executable project
+ ${constructBin} composer.json
+ ln -s $(pwd)/vendor/bin $out/bin
+ ''}
+
+ ${lib.optionalString (!symlinkDependencies) ''
+ # Patch the shebangs if possible
+ if [ -d $(pwd)/vendor/bin ]
+ then
+ # Look for all executables in bin/
+ for i in $(pwd)/vendor/bin/*
+ do
+ # Look for their location
+ realFile=$(readlink -f "$i")
+
+ # Restore write permissions
+ chmod u+wx "$(dirname "$realFile")"
+ chmod u+w "$realFile"
+
+ # Patch shebang
+ sed -e "s|#!/usr/bin/php|#!${php}/bin/php|" \
+ -e "s|#!/usr/bin/env php|#!${php}/bin/php|" \
+ "$realFile" > tmp
+ mv tmp "$realFile"
+ chmod u+x "$realFile"
+ done
+ fi
+ ''}
+
+ if [ "$removeComposerArtifacts" = "1" ]
+ then
+ # Remove composer stuff
+ rm -f composer.json composer.lock
+ fi
+
+ # Execute post install hook
+ runHook postInstall
+ '';
+ } // extraArgs);
+in
+{
+ composer = lib.makeOverridable composer;
+ buildZipPackage = lib.makeOverridable buildZipPackage;
+ buildPackage = lib.makeOverridable buildPackage;
+}
diff --git a/third_party/nixpkgs/pkgs/servers/web-apps/bookstack/composition.nix b/third_party/nixpkgs/pkgs/servers/web-apps/bookstack/composition.nix
new file mode 100644
index 0000000000..0df6cdae4c
--- /dev/null
+++ b/third_party/nixpkgs/pkgs/servers/web-apps/bookstack/composition.nix
@@ -0,0 +1,13 @@
+{pkgs ? import {
+ inherit system;
+ }, system ? builtins.currentSystem, noDev ? false}:
+
+let
+ composerEnv = import ./composer-env.nix {
+ inherit (pkgs) stdenv lib writeTextFile fetchurl php unzip phpPackages;
+ };
+in
+import ./php-packages.nix {
+ inherit composerEnv noDev;
+ inherit (pkgs) fetchurl fetchgit fetchhg fetchsvn;
+}
diff --git a/third_party/nixpkgs/pkgs/servers/web-apps/bookstack/default.nix b/third_party/nixpkgs/pkgs/servers/web-apps/bookstack/default.nix
new file mode 100644
index 0000000000..9ab47ace6a
--- /dev/null
+++ b/third_party/nixpkgs/pkgs/servers/web-apps/bookstack/default.nix
@@ -0,0 +1,38 @@
+{ pkgs, system, lib, fetchFromGitHub, dataDir ? "/var/lib/bookstack" }:
+
+let
+ package = (import ./composition.nix {
+ inherit pkgs system;
+ noDev = true; # Disable development dependencies
+ }).overrideAttrs (attrs : {
+ installPhase = attrs.installPhase + ''
+ rm -R $out/storage $out/public/uploads
+ ln -s ${dataDir}/.env $out/.env
+ ln -s ${dataDir}/storage $out/storage
+ ln -s ${dataDir}/public/uploads $out/public/uploads
+ '';
+ });
+
+in package.override rec {
+ name = "bookstack";
+ version = "0.31.7";
+
+ src = fetchFromGitHub {
+ owner = "bookstackapp";
+ repo = name;
+ rev = "v${version}";
+ sha256 = "1jak6g2q4zbr0gxqj0bqhks687whmmw8ylzwm4saws7ikcxkwna4";
+ };
+
+ meta = with lib; {
+ description = "A platform to create documentation/wiki content built with PHP & Laravel";
+ longDescription = ''
+ A platform for storing and organising information and documentation.
+ Details for BookStack can be found on the official website at https://www.bookstackapp.com/.
+ '';
+ homepage = "https://www.bookstackapp.com/";
+ license = licenses.mit;
+ maintainers = with maintainers; [ ymarkus ];
+ platforms = platforms.linux;
+ };
+}
diff --git a/third_party/nixpkgs/pkgs/servers/web-apps/bookstack/php-packages.nix b/third_party/nixpkgs/pkgs/servers/web-apps/bookstack/php-packages.nix
new file mode 100644
index 0000000000..5edd0b68e8
--- /dev/null
+++ b/third_party/nixpkgs/pkgs/servers/web-apps/bookstack/php-packages.nix
@@ -0,0 +1,897 @@
+{composerEnv, fetchurl, fetchgit ? null, fetchhg ? null, fetchsvn ? null, noDev ? false}:
+
+let
+ packages = {
+ "aws/aws-sdk-php" = {
+ targetDir = "";
+ src = composerEnv.buildZipPackage {
+ name = "aws-aws-sdk-php-3e6143f5c12986d727307d5d19d6aec21575d903";
+ src = fetchurl {
+ url = https://api.github.com/repos/aws/aws-sdk-php/zipball/3e6143f5c12986d727307d5d19d6aec21575d903;
+ sha256 = "16hbw8gqscbc3bcvnfdsll6x1653lq2s4dga3d5jbpczil3ws9yb";
+ };
+ };
+ };
+ "barryvdh/laravel-dompdf" = {
+ targetDir = "";
+ src = composerEnv.buildZipPackage {
+ name = "barryvdh-laravel-dompdf-30310e0a675462bf2aa9d448c8dcbf57fbcc517d";
+ src = fetchurl {
+ url = https://api.github.com/repos/barryvdh/laravel-dompdf/zipball/30310e0a675462bf2aa9d448c8dcbf57fbcc517d;
+ sha256 = "1fnan9b2g4xhqqvlfsn3alb4nx5jjlrapgiad2kca13b3gizv7zr";
+ };
+ };
+ };
+ "barryvdh/laravel-snappy" = {
+ targetDir = "";
+ src = composerEnv.buildZipPackage {
+ name = "barryvdh-laravel-snappy-1903ab84171072b6bff8d98eb58d38b2c9aaf645";
+ src = fetchurl {
+ url = https://api.github.com/repos/barryvdh/laravel-snappy/zipball/1903ab84171072b6bff8d98eb58d38b2c9aaf645;
+ sha256 = "1awr5kwj482qsh5wpg0q44fjqi7a9q26ghcc9wp1n9zm97y0rx7a";
+ };
+ };
+ };
+ "doctrine/cache" = {
+ targetDir = "";
+ src = composerEnv.buildZipPackage {
+ name = "doctrine-cache-13e3381b25847283a91948d04640543941309727";
+ src = fetchurl {
+ url = https://api.github.com/repos/doctrine/cache/zipball/13e3381b25847283a91948d04640543941309727;
+ sha256 = "088fxbpjssp8x95qr3ip2iynxrimimrby03xlsvp2254vcyx94c5";
+ };
+ };
+ };
+ "doctrine/dbal" = {
+ targetDir = "";
+ src = composerEnv.buildZipPackage {
+ name = "doctrine-dbal-47433196b6390d14409a33885ee42b6208160643";
+ src = fetchurl {
+ url = https://api.github.com/repos/doctrine/dbal/zipball/47433196b6390d14409a33885ee42b6208160643;
+ sha256 = "0bcg9494hr31902zcmq5kk7ji78yxk074d5bd9chxn9q0xz4g2h8";
+ };
+ };
+ };
+ "doctrine/event-manager" = {
+ targetDir = "";
+ src = composerEnv.buildZipPackage {
+ name = "doctrine-event-manager-41370af6a30faa9dc0368c4a6814d596e81aba7f";
+ src = fetchurl {
+ url = https://api.github.com/repos/doctrine/event-manager/zipball/41370af6a30faa9dc0368c4a6814d596e81aba7f;
+ sha256 = "0pn2aiwl4fvv6fcwar9alng2yrqy8bzc58n4bkp6y2jnpw5gp4m8";
+ };
+ };
+ };
+ "doctrine/inflector" = {
+ targetDir = "";
+ src = composerEnv.buildZipPackage {
+ name = "doctrine-inflector-9cf661f4eb38f7c881cac67c75ea9b00bf97b210";
+ src = fetchurl {
+ url = https://api.github.com/repos/doctrine/inflector/zipball/9cf661f4eb38f7c881cac67c75ea9b00bf97b210;
+ sha256 = "0gkaw5aqkdppd7cz1n46kdms0bv8kzbnpjh75jnhv98p9fik7f24";
+ };
+ };
+ };
+ "doctrine/lexer" = {
+ targetDir = "";
+ src = composerEnv.buildZipPackage {
+ name = "doctrine-lexer-e864bbf5904cb8f5bb334f99209b48018522f042";
+ src = fetchurl {
+ url = https://api.github.com/repos/doctrine/lexer/zipball/e864bbf5904cb8f5bb334f99209b48018522f042;
+ sha256 = "11lg9fcy0crb8inklajhx3kyffdbx7xzdj8kwl21xsgq9nm9iwvv";
+ };
+ };
+ };
+ "dompdf/dompdf" = {
+ targetDir = "";
+ src = composerEnv.buildZipPackage {
+ name = "dompdf-dompdf-db91d81866c69a42dad1d2926f61515a1e3f42c5";
+ src = fetchurl {
+ url = https://api.github.com/repos/dompdf/dompdf/zipball/db91d81866c69a42dad1d2926f61515a1e3f42c5;
+ sha256 = "10nsmaiqfk6wgv0l9wjsh7h8nigdfabygkhjk7wdbxdfvlvniddd";
+ };
+ };
+ };
+ "dragonmantank/cron-expression" = {
+ targetDir = "";
+ src = composerEnv.buildZipPackage {
+ name = "dragonmantank-cron-expression-65b2d8ee1f10915efb3b55597da3404f096acba2";
+ src = fetchurl {
+ url = https://api.github.com/repos/dragonmantank/cron-expression/zipball/65b2d8ee1f10915efb3b55597da3404f096acba2;
+ sha256 = "07yqbhf6n4d818gvla60mgg23gichwiafd5ypd70w4b4dlbcxcpl";
+ };
+ };
+ };
+ "egulias/email-validator" = {
+ targetDir = "";
+ src = composerEnv.buildZipPackage {
+ name = "egulias-email-validator-0dbf5d78455d4d6a41d186da50adc1122ec066f4";
+ src = fetchurl {
+ url = https://api.github.com/repos/egulias/EmailValidator/zipball/0dbf5d78455d4d6a41d186da50adc1122ec066f4;
+ sha256 = "00kwb8rhk1fq3a1i152xniipk3y907q1v5r3szqbkq5rz82dwbck";
+ };
+ };
+ };
+ "facade/flare-client-php" = {
+ targetDir = "";
+ src = composerEnv.buildZipPackage {
+ name = "facade-flare-client-php-ef0f5bce23b30b32d98fd9bb49c6fa37b40eb546";
+ src = fetchurl {
+ url = https://api.github.com/repos/facade/flare-client-php/zipball/ef0f5bce23b30b32d98fd9bb49c6fa37b40eb546;
+ sha256 = "1car7k8zzkgib9wpi9lzw1dj9qgjak8s9dmiimxaigvb7q4bc5vk";
+ };
+ };
+ };
+ "facade/ignition" = {
+ targetDir = "";
+ src = composerEnv.buildZipPackage {
+ name = "facade-ignition-b6aea4a99303d9d32afd486a285162a89af8a8a3";
+ src = fetchurl {
+ url = https://api.github.com/repos/facade/ignition/zipball/b6aea4a99303d9d32afd486a285162a89af8a8a3;
+ sha256 = "1dx6gf4qz6jf8hds3lyxs09zlr6ndl3d36212w2hr4b15ihmyszw";
+ };
+ };
+ };
+ "facade/ignition-contracts" = {
+ targetDir = "";
+ src = composerEnv.buildZipPackage {
+ name = "facade-ignition-contracts-aeab1ce8b68b188a43e81758e750151ad7da796b";
+ src = fetchurl {
+ url = https://api.github.com/repos/facade/ignition-contracts/zipball/aeab1ce8b68b188a43e81758e750151ad7da796b;
+ sha256 = "0b5hv56758fh2y6fqbygwn94qgqwjan8d2s1i10m242x80h9jjiw";
+ };
+ };
+ };
+ "fideloper/proxy" = {
+ targetDir = "";
+ src = composerEnv.buildZipPackage {
+ name = "fideloper-proxy-c073b2bd04d1c90e04dc1b787662b558dd65ade0";
+ src = fetchurl {
+ url = https://api.github.com/repos/fideloper/TrustedProxy/zipball/c073b2bd04d1c90e04dc1b787662b558dd65ade0;
+ sha256 = "05jzgjj4fy5p1smqj41b5qxj42zn0mnczvsaacni4fmq174mz4gy";
+ };
+ };
+ };
+ "filp/whoops" = {
+ targetDir = "";
+ src = composerEnv.buildZipPackage {
+ name = "filp-whoops-df7933820090489623ce0be5e85c7e693638e536";
+ src = fetchurl {
+ url = https://api.github.com/repos/filp/whoops/zipball/df7933820090489623ce0be5e85c7e693638e536;
+ sha256 = "0azpv2r8hc9s5pbk9wh2qk52qzycsbvpijr8w68l311igpcj4f78";
+ };
+ };
+ };
+ "guzzlehttp/guzzle" = {
+ targetDir = "";
+ src = composerEnv.buildZipPackage {
+ name = "guzzlehttp-guzzle-0aa74dfb41ae110835923ef10a9d803a22d50e79";
+ src = fetchurl {
+ url = https://api.github.com/repos/guzzle/guzzle/zipball/0aa74dfb41ae110835923ef10a9d803a22d50e79;
+ sha256 = "0gba1711dpi147fzi2ab2pg0k1g6zfanm5w5hf4c7w0b3h4ya5gj";
+ };
+ };
+ };
+ "guzzlehttp/promises" = {
+ targetDir = "";
+ src = composerEnv.buildZipPackage {
+ name = "guzzlehttp-promises-60d379c243457e073cff02bc323a2a86cb355631";
+ src = fetchurl {
+ url = https://api.github.com/repos/guzzle/promises/zipball/60d379c243457e073cff02bc323a2a86cb355631;
+ sha256 = "0lvcr64bx9sb90qggxk7g7fsplz403gm3i8lnlcaifyjrlmdj5wb";
+ };
+ };
+ };
+ "guzzlehttp/psr7" = {
+ targetDir = "";
+ src = composerEnv.buildZipPackage {
+ name = "guzzlehttp-psr7-53330f47520498c0ae1f61f7e2c90f55690c06a3";
+ src = fetchurl {
+ url = https://api.github.com/repos/guzzle/psr7/zipball/53330f47520498c0ae1f61f7e2c90f55690c06a3;
+ sha256 = "0948mbbqn1xcz39diajhvlr9a7586vx3091kzx96m0z4ki3lhv7g";
+ };
+ };
+ };
+ "intervention/image" = {
+ targetDir = "";
+ src = composerEnv.buildZipPackage {
+ name = "intervention-image-abbf18d5ab8367f96b3205ca3c89fb2fa598c69e";
+ src = fetchurl {
+ url = https://api.github.com/repos/Intervention/image/zipball/abbf18d5ab8367f96b3205ca3c89fb2fa598c69e;
+ sha256 = "1msfpr9bip69bmhg23ka2f43phgb6dq5z604j5psjh3xd86r6c5d";
+ };
+ };
+ };
+ "knplabs/knp-snappy" = {
+ targetDir = "";
+ src = composerEnv.buildZipPackage {
+ name = "knplabs-knp-snappy-7bac60fb729147b7ccd8532c07df3f52a4afa8a4";
+ src = fetchurl {
+ url = https://api.github.com/repos/KnpLabs/snappy/zipball/7bac60fb729147b7ccd8532c07df3f52a4afa8a4;
+ sha256 = "0qbywknz3zwhk91yaqd5p6nf48hzk1zmyqgrc9nb9ys2v6wy6njz";
+ };
+ };
+ };
+ "laravel/framework" = {
+ targetDir = "";
+ src = composerEnv.buildZipPackage {
+ name = "laravel-framework-d0e4731e92ca88f4a78fe9e0c2c426a3e8c063c8";
+ src = fetchurl {
+ url = https://api.github.com/repos/laravel/framework/zipball/d0e4731e92ca88f4a78fe9e0c2c426a3e8c063c8;
+ sha256 = "15zjpq6lbxs019vd0mm2nbfi91yyw40wsf5fl0jbw3s1ffvaq898";
+ };
+ };
+ };
+ "laravel/socialite" = {
+ targetDir = "";
+ src = composerEnv.buildZipPackage {
+ name = "laravel-socialite-8d25d574b4f2005411c0b9cb527ef5e745c1b07d";
+ src = fetchurl {
+ url = https://api.github.com/repos/laravel/socialite/zipball/8d25d574b4f2005411c0b9cb527ef5e745c1b07d;
+ sha256 = "0ash56za1flniq9nnk3siyb8l0m2cjwn2n25315qfhmdgbxxjz68";
+ };
+ };
+ };
+ "league/commonmark" = {
+ targetDir = "";
+ src = composerEnv.buildZipPackage {
+ name = "league-commonmark-11df9b36fd4f1d2b727a73bf14931d81373b9a54";
+ src = fetchurl {
+ url = https://api.github.com/repos/thephpleague/commonmark/zipball/11df9b36fd4f1d2b727a73bf14931d81373b9a54;
+ sha256 = "15chm1sa65b58b47am00ik03s2agnx49i8yww3mhqlijvbrjvxc3";
+ };
+ };
+ };
+ "league/flysystem" = {
+ targetDir = "";
+ src = composerEnv.buildZipPackage {
+ name = "league-flysystem-9be3b16c877d477357c015cec057548cf9b2a14a";
+ src = fetchurl {
+ url = https://api.github.com/repos/thephpleague/flysystem/zipball/9be3b16c877d477357c015cec057548cf9b2a14a;
+ sha256 = "0mhlr6l75j58xwbadq30x58s67434195zlpdax6ix4nkr7fc907j";
+ };
+ };
+ };
+ "league/flysystem-aws-s3-v3" = {
+ targetDir = "";
+ src = composerEnv.buildZipPackage {
+ name = "league-flysystem-aws-s3-v3-4e25cc0582a36a786c31115e419c6e40498f6972";
+ src = fetchurl {
+ url = https://api.github.com/repos/thephpleague/flysystem-aws-s3-v3/zipball/4e25cc0582a36a786c31115e419c6e40498f6972;
+ sha256 = "1q2vkgyaz7h6z3q0z3v3l5rsvhv4xc45prgzr214cgm656i2h1ab";
+ };
+ };
+ };
+ "league/mime-type-detection" = {
+ targetDir = "";
+ src = composerEnv.buildZipPackage {
+ name = "league-mime-type-detection-3b9dff8aaf7323590c1d2e443db701eb1f9aa0d3";
+ src = fetchurl {
+ url = https://api.github.com/repos/thephpleague/mime-type-detection/zipball/3b9dff8aaf7323590c1d2e443db701eb1f9aa0d3;
+ sha256 = "0pmq486v2nf6672y2z53cyb3mfrxcc8n7z2ilpzz9zkkf2yb990j";
+ };
+ };
+ };
+ "league/oauth1-client" = {
+ targetDir = "";
+ src = composerEnv.buildZipPackage {
+ name = "league-oauth1-client-1e7e6be2dc543bf466236fb171e5b20e1b06aee6";
+ src = fetchurl {
+ url = https://api.github.com/repos/thephpleague/oauth1-client/zipball/1e7e6be2dc543bf466236fb171e5b20e1b06aee6;
+ sha256 = "1vmzvghl4c4k9vxza50k0w28hxm88vcrcdspqp7f3vmfg5c1zav2";
+ };
+ };
+ };
+ "monolog/monolog" = {
+ targetDir = "";
+ src = composerEnv.buildZipPackage {
+ name = "monolog-monolog-1cb1cde8e8dd0f70cc0fe51354a59acad9302084";
+ src = fetchurl {
+ url = https://api.github.com/repos/Seldaek/monolog/zipball/1cb1cde8e8dd0f70cc0fe51354a59acad9302084;
+ sha256 = "1gymdiymwrjw25fjqapq3jlmf6wnp1h26ms74sckd70d53c4m52k";
+ };
+ };
+ };
+ "mtdowling/jmespath.php" = {
+ targetDir = "";
+ src = composerEnv.buildZipPackage {
+ name = "mtdowling-jmespath.php-42dae2cbd13154083ca6d70099692fef8ca84bfb";
+ src = fetchurl {
+ url = https://api.github.com/repos/jmespath/jmespath.php/zipball/42dae2cbd13154083ca6d70099692fef8ca84bfb;
+ sha256 = "157pdx45dmkxwxyq8vdjfci24fw7kl3yc2gj1cifp9kaia7mwlkk";
+ };
+ };
+ };
+ "nesbot/carbon" = {
+ targetDir = "";
+ src = composerEnv.buildZipPackage {
+ name = "nesbot-carbon-528783b188bdb853eb21239b1722831e0f000a8d";
+ src = fetchurl {
+ url = https://api.github.com/repos/briannesbitt/Carbon/zipball/528783b188bdb853eb21239b1722831e0f000a8d;
+ sha256 = "18pvfwjvclfj0mrgqvycgrbyx5jfcp1hks4yljc6mp66yxr787x4";
+ };
+ };
+ };
+ "nunomaduro/collision" = {
+ targetDir = "";
+ src = composerEnv.buildZipPackage {
+ name = "nunomaduro-collision-f7c45764dfe4ba5f2618d265a6f1f9c72732e01d";
+ src = fetchurl {
+ url = https://api.github.com/repos/nunomaduro/collision/zipball/f7c45764dfe4ba5f2618d265a6f1f9c72732e01d;
+ sha256 = "1cazbjxl5rqw4cl783nrymhcvjhvwwwjswr5w0si1wfhmpvr349q";
+ };
+ };
+ };
+ "onelogin/php-saml" = {
+ targetDir = "";
+ src = composerEnv.buildZipPackage {
+ name = "onelogin-php-saml-a7328b11887660ad248ea10952dd67a5aa73ba3b";
+ src = fetchurl {
+ url = https://api.github.com/repos/onelogin/php-saml/zipball/a7328b11887660ad248ea10952dd67a5aa73ba3b;
+ sha256 = "0ycj3n22k5i3h8p7gn0xff6a7smjypazl2k5qvyzg86fjr7s3vfv";
+ };
+ };
+ };
+ "opis/closure" = {
+ targetDir = "";
+ src = composerEnv.buildZipPackage {
+ name = "opis-closure-943b5d70cc5ae7483f6aff6ff43d7e34592ca0f5";
+ src = fetchurl {
+ url = https://api.github.com/repos/opis/closure/zipball/943b5d70cc5ae7483f6aff6ff43d7e34592ca0f5;
+ sha256 = "0y47ldgzzv22c5dnsdzqmbrsicq6acjyba0119d3dc6wa3n7zqi6";
+ };
+ };
+ };
+ "paragonie/random_compat" = {
+ targetDir = "";
+ src = composerEnv.buildZipPackage {
+ name = "paragonie-random_compat-84b4dfb120c6f9b4ff7b3685f9b8f1aa365a0c95";
+ src = fetchurl {
+ url = https://api.github.com/repos/paragonie/random_compat/zipball/84b4dfb120c6f9b4ff7b3685f9b8f1aa365a0c95;
+ sha256 = "03nsccdvcb79l64b7lsmx0n8ldf5z3v8niqr7bpp6wg401qp9p09";
+ };
+ };
+ };
+ "phenx/php-font-lib" = {
+ targetDir = "";
+ src = composerEnv.buildZipPackage {
+ name = "phenx-php-font-lib-ca6ad461f032145fff5971b5985e5af9e7fa88d8";
+ src = fetchurl {
+ url = https://api.github.com/repos/PhenX/php-font-lib/zipball/ca6ad461f032145fff5971b5985e5af9e7fa88d8;
+ sha256 = "0grirw04sfg38fd4h0yaks43s49cxr5bisrr4ligjig2q3rjai31";
+ };
+ };
+ };
+ "phenx/php-svg-lib" = {
+ targetDir = "";
+ src = composerEnv.buildZipPackage {
+ name = "phenx-php-svg-lib-5fa61b65e612ce1ae15f69b3d223cb14ecc60e32";
+ src = fetchurl {
+ url = https://api.github.com/repos/PhenX/php-svg-lib/zipball/5fa61b65e612ce1ae15f69b3d223cb14ecc60e32;
+ sha256 = "1jbkn7wm82y6pbyb7gx989k4yaprsc7xpa49nn4ywscmkz7ckd5y";
+ };
+ };
+ };
+ "php-parallel-lint/php-console-color" = {
+ targetDir = "";
+ src = composerEnv.buildZipPackage {
+ name = "php-parallel-lint-php-console-color-b6af326b2088f1ad3b264696c9fd590ec395b49e";
+ src = fetchurl {
+ url = https://api.github.com/repos/php-parallel-lint/PHP-Console-Color/zipball/b6af326b2088f1ad3b264696c9fd590ec395b49e;
+ sha256 = "030449mkpxs35y8dk336ls3bfdq3zjnxswnk5khlg45z5147cr3k";
+ };
+ };
+ };
+ "php-parallel-lint/php-console-highlighter" = {
+ targetDir = "";
+ src = composerEnv.buildZipPackage {
+ name = "php-parallel-lint-php-console-highlighter-21bf002f077b177f056d8cb455c5ed573adfdbb8";
+ src = fetchurl {
+ url = https://api.github.com/repos/php-parallel-lint/PHP-Console-Highlighter/zipball/21bf002f077b177f056d8cb455c5ed573adfdbb8;
+ sha256 = "013phmp5n6hp6mvlpbqbrih0zd8h7xc152dpzxxf49b0jczxh8y4";
+ };
+ };
+ };
+ "phpoption/phpoption" = {
+ targetDir = "";
+ src = composerEnv.buildZipPackage {
+ name = "phpoption-phpoption-994ecccd8f3283ecf5ac33254543eb0ac946d525";
+ src = fetchurl {
+ url = https://api.github.com/repos/schmittjoh/php-option/zipball/994ecccd8f3283ecf5ac33254543eb0ac946d525;
+ sha256 = "1snrnfvqhnr5z9llf8kbqk9l97gfyp8gghmhi1ng8qx5xzv1anr7";
+ };
+ };
+ };
+ "predis/predis" = {
+ targetDir = "";
+ src = composerEnv.buildZipPackage {
+ name = "predis-predis-9930e933c67446962997b05201c69c2319bf26de";
+ src = fetchurl {
+ url = https://api.github.com/repos/predis/predis/zipball/9930e933c67446962997b05201c69c2319bf26de;
+ sha256 = "0qnpiyv96gs8yzy3b1ba918yw1pv8bgzw7skcf3k40ffpxsmkxv6";
+ };
+ };
+ };
+ "psr/container" = {
+ targetDir = "";
+ src = composerEnv.buildZipPackage {
+ name = "psr-container-b7ce3b176482dbbc1245ebf52b181af44c2cf55f";
+ src = fetchurl {
+ url = https://api.github.com/repos/php-fig/container/zipball/b7ce3b176482dbbc1245ebf52b181af44c2cf55f;
+ sha256 = "0rkz64vgwb0gfi09klvgay4qnw993l1dc03vyip7d7m2zxi6cy4j";
+ };
+ };
+ };
+ "psr/http-client" = {
+ targetDir = "";
+ src = composerEnv.buildZipPackage {
+ name = "psr-http-client-2dfb5f6c5eff0e91e20e913f8c5452ed95b86621";
+ src = fetchurl {
+ url = https://api.github.com/repos/php-fig/http-client/zipball/2dfb5f6c5eff0e91e20e913f8c5452ed95b86621;
+ sha256 = "0cmkifa3ji1r8kn3y1rwg81rh8g2crvnhbv2am6d688dzsbw967v";
+ };
+ };
+ };
+ "psr/http-message" = {
+ targetDir = "";
+ src = composerEnv.buildZipPackage {
+ name = "psr-http-message-f6561bf28d520154e4b0ec72be95418abe6d9363";
+ src = fetchurl {
+ url = https://api.github.com/repos/php-fig/http-message/zipball/f6561bf28d520154e4b0ec72be95418abe6d9363;
+ sha256 = "195dd67hva9bmr52iadr4kyp2gw2f5l51lplfiay2pv6l9y4cf45";
+ };
+ };
+ };
+ "psr/log" = {
+ targetDir = "";
+ src = composerEnv.buildZipPackage {
+ name = "psr-log-0f73288fd15629204f9d42b7055f72dacbe811fc";
+ src = fetchurl {
+ url = https://api.github.com/repos/php-fig/log/zipball/0f73288fd15629204f9d42b7055f72dacbe811fc;
+ sha256 = "1npi9ggl4qll4sdxz1xgp8779ia73gwlpjxbb1f1cpl1wn4s42r4";
+ };
+ };
+ };
+ "psr/simple-cache" = {
+ targetDir = "";
+ src = composerEnv.buildZipPackage {
+ name = "psr-simple-cache-408d5eafb83c57f6365a3ca330ff23aa4a5fa39b";
+ src = fetchurl {
+ url = https://api.github.com/repos/php-fig/simple-cache/zipball/408d5eafb83c57f6365a3ca330ff23aa4a5fa39b;
+ sha256 = "1djgzclkamjxi9jy4m9ggfzgq1vqxaga2ip7l3cj88p7rwkzjxgw";
+ };
+ };
+ };
+ "ralouphie/getallheaders" = {
+ targetDir = "";
+ src = composerEnv.buildZipPackage {
+ name = "ralouphie-getallheaders-120b605dfeb996808c31b6477290a714d356e822";
+ src = fetchurl {
+ url = https://api.github.com/repos/ralouphie/getallheaders/zipball/120b605dfeb996808c31b6477290a714d356e822;
+ sha256 = "1bv7ndkkankrqlr2b4kw7qp3fl0dxi6bp26bnim6dnlhavd6a0gg";
+ };
+ };
+ };
+ "ramsey/uuid" = {
+ targetDir = "";
+ src = composerEnv.buildZipPackage {
+ name = "ramsey-uuid-7e1633a6964b48589b142d60542f9ed31bd37a92";
+ src = fetchurl {
+ url = https://api.github.com/repos/ramsey/uuid/zipball/7e1633a6964b48589b142d60542f9ed31bd37a92;
+ sha256 = "0s6z2c8jvwjmxzy2kqmxqpz0val9i5r757mdwf2yc7qrwm6bwd15";
+ };
+ };
+ };
+ "robrichards/xmlseclibs" = {
+ targetDir = "";
+ src = composerEnv.buildZipPackage {
+ name = "robrichards-xmlseclibs-f8f19e58f26cdb42c54b214ff8a820760292f8df";
+ src = fetchurl {
+ url = https://api.github.com/repos/robrichards/xmlseclibs/zipball/f8f19e58f26cdb42c54b214ff8a820760292f8df;
+ sha256 = "01zlpm36rrdj310cfmiz2fnabszxd3fq80fa8x8j3f9ki7dvhh5y";
+ };
+ };
+ };
+ "sabberworm/php-css-parser" = {
+ targetDir = "";
+ src = composerEnv.buildZipPackage {
+ name = "sabberworm-php-css-parser-d217848e1396ef962fb1997cf3e2421acba7f796";
+ src = fetchurl {
+ url = https://api.github.com/repos/sabberworm/PHP-CSS-Parser/zipball/d217848e1396ef962fb1997cf3e2421acba7f796;
+ sha256 = "17jkly8k02p54qa004spikakxis8syjw3vhwgrsi9g1cb4wsg3g9";
+ };
+ };
+ };
+ "scrivo/highlight.php" = {
+ targetDir = "";
+ src = composerEnv.buildZipPackage {
+ name = "scrivo-highlight.php-44a3d4136edb5ad8551590bf90f437db80b2d466";
+ src = fetchurl {
+ url = https://api.github.com/repos/scrivo/highlight.php/zipball/44a3d4136edb5ad8551590bf90f437db80b2d466;
+ sha256 = "0p0bj3yqiaa917lgx4ycwic2qqlg3cxka2adhziqzhlq9jqhzi8r";
+ };
+ };
+ };
+ "socialiteproviders/discord" = {
+ targetDir = "";
+ src = composerEnv.buildZipPackage {
+ name = "socialiteproviders-discord-c6eddeb07ace7473e82d02d4db852dfacf5ef574";
+ src = fetchurl {
+ url = https://api.github.com/repos/SocialiteProviders/Discord/zipball/c6eddeb07ace7473e82d02d4db852dfacf5ef574;
+ sha256 = "1w8m7jmlsdk94cqckgd75mwblh3jj6j16w3g4hzysyms25g091xc";
+ };
+ };
+ };
+ "socialiteproviders/gitlab" = {
+ targetDir = "";
+ src = composerEnv.buildZipPackage {
+ name = "socialiteproviders-gitlab-a8f67d3b02c9ee8c70c25c6728417c0eddcbbb9d";
+ src = fetchurl {
+ url = https://api.github.com/repos/SocialiteProviders/GitLab/zipball/a8f67d3b02c9ee8c70c25c6728417c0eddcbbb9d;
+ sha256 = "1blv2h69dmm0r0djz3h0l0cxkxmzd1fzgg13r3npxx7c80xjpw3a";
+ };
+ };
+ };
+ "socialiteproviders/manager" = {
+ targetDir = "";
+ src = composerEnv.buildZipPackage {
+ name = "socialiteproviders-manager-0f5e82af0404df0080bdc5c105cef936c1711524";
+ src = fetchurl {
+ url = https://api.github.com/repos/SocialiteProviders/Manager/zipball/0f5e82af0404df0080bdc5c105cef936c1711524;
+ sha256 = "0ppmln72khli94ylnsjarnhzkqzpkc32pn3zf3ljahm1yghccczx";
+ };
+ };
+ };
+ "socialiteproviders/microsoft-azure" = {
+ targetDir = "";
+ src = composerEnv.buildZipPackage {
+ name = "socialiteproviders-microsoft-azure-7808764f777a01df88be9ca6b14d683e50aaf88a";
+ src = fetchurl {
+ url = https://api.github.com/repos/SocialiteProviders/Microsoft-Azure/zipball/7808764f777a01df88be9ca6b14d683e50aaf88a;
+ sha256 = "1lxsvb5pzqrm467a8737v98sgmsxs6mvxc683p19b2y30g4fyrlj";
+ };
+ };
+ };
+ "socialiteproviders/okta" = {
+ targetDir = "";
+ src = composerEnv.buildZipPackage {
+ name = "socialiteproviders-okta-e3ef9f23c7d2f86b3b16a174b82333cf4e2459e8";
+ src = fetchurl {
+ url = https://api.github.com/repos/SocialiteProviders/Okta/zipball/e3ef9f23c7d2f86b3b16a174b82333cf4e2459e8;
+ sha256 = "1a3anw5di5nqiabvqpmsjv5x0jasmsn4y876qsv77gazxja880ng";
+ };
+ };
+ };
+ "socialiteproviders/slack" = {
+ targetDir = "";
+ src = composerEnv.buildZipPackage {
+ name = "socialiteproviders-slack-8efb25c71d98bedf4010a829d1e41ff9fe449bcc";
+ src = fetchurl {
+ url = https://api.github.com/repos/SocialiteProviders/Slack/zipball/8efb25c71d98bedf4010a829d1e41ff9fe449bcc;
+ sha256 = "0ax3n4s1djidkhgvrcgv1qipv3k0fhfd0cvs273h6wh66bjniq66";
+ };
+ };
+ };
+ "socialiteproviders/twitch" = {
+ targetDir = "";
+ src = composerEnv.buildZipPackage {
+ name = "socialiteproviders-twitch-7accf30ae7a3139b757b4ca8f34989c09a3dbee7";
+ src = fetchurl {
+ url = https://api.github.com/repos/SocialiteProviders/Twitch/zipball/7accf30ae7a3139b757b4ca8f34989c09a3dbee7;
+ sha256 = "089i4fwxb32zmbxib0544jfs48wzjyp7bsqss2bf2xx89dsrx4ah";
+ };
+ };
+ };
+ "ssddanbrown/htmldiff" = {
+ targetDir = "";
+ src = composerEnv.buildZipPackage {
+ name = "ssddanbrown-htmldiff-f60d5cc278b60305ab980a6665f46117c5b589c0";
+ src = fetchurl {
+ url = https://api.github.com/repos/ssddanbrown/HtmlDiff/zipball/f60d5cc278b60305ab980a6665f46117c5b589c0;
+ sha256 = "12h3swr8rjf5w78kfgwzkf0zb59b4a8mjwf65fgcgvjg115wha9x";
+ };
+ };
+ };
+ "swiftmailer/swiftmailer" = {
+ targetDir = "";
+ src = composerEnv.buildZipPackage {
+ name = "swiftmailer-swiftmailer-698a6a9f54d7eb321274de3ad19863802c879fb7";
+ src = fetchurl {
+ url = https://api.github.com/repos/swiftmailer/swiftmailer/zipball/698a6a9f54d7eb321274de3ad19863802c879fb7;
+ sha256 = "1zmyr6szxvbc77rs4q1cp7f3vzw1wfx9rbbj7x9s65gh37z9fd1w";
+ };
+ };
+ };
+ "symfony/console" = {
+ targetDir = "";
+ src = composerEnv.buildZipPackage {
+ name = "symfony-console-24026c44fc37099fa145707fecd43672831b837a";
+ src = fetchurl {
+ url = https://api.github.com/repos/symfony/console/zipball/24026c44fc37099fa145707fecd43672831b837a;
+ sha256 = "19c5yczwxk0965pdg7ka8sa8wsr569r6l725rj4y9sabfd6mg6jf";
+ };
+ };
+ };
+ "symfony/css-selector" = {
+ targetDir = "";
+ src = composerEnv.buildZipPackage {
+ name = "symfony-css-selector-f907d3e53ecb2a5fad8609eb2f30525287a734c8";
+ src = fetchurl {
+ url = https://api.github.com/repos/symfony/css-selector/zipball/f907d3e53ecb2a5fad8609eb2f30525287a734c8;
+ sha256 = "19yqy81psz2wh8gy2j3phywsgrw9sbcw83l8lbnxbk5khg8hw3nm";
+ };
+ };
+ };
+ "symfony/debug" = {
+ targetDir = "";
+ src = composerEnv.buildZipPackage {
+ name = "symfony-debug-af4987aa4a5630e9615be9d9c3ed1b0f24ca449c";
+ src = fetchurl {
+ url = https://api.github.com/repos/symfony/debug/zipball/af4987aa4a5630e9615be9d9c3ed1b0f24ca449c;
+ sha256 = "15y1bgdrzq3859ql37ymx4fsvd28kyck69ncm6zyg84q3fhd8i19";
+ };
+ };
+ };
+ "symfony/deprecation-contracts" = {
+ targetDir = "";
+ src = composerEnv.buildZipPackage {
+ name = "symfony-deprecation-contracts-5fa56b4074d1ae755beb55617ddafe6f5d78f665";
+ src = fetchurl {
+ url = https://api.github.com/repos/symfony/deprecation-contracts/zipball/5fa56b4074d1ae755beb55617ddafe6f5d78f665;
+ sha256 = "0ny59x0aaipqaj956wx7ak5f6d5rn90766swp5m18019v9cppg10";
+ };
+ };
+ };
+ "symfony/error-handler" = {
+ targetDir = "";
+ src = composerEnv.buildZipPackage {
+ name = "symfony-error-handler-d603654eaeb713503bba3e308b9e748e5a6d3f2e";
+ src = fetchurl {
+ url = https://api.github.com/repos/symfony/error-handler/zipball/d603654eaeb713503bba3e308b9e748e5a6d3f2e;
+ sha256 = "15xdk9bbyfdm8yf19jfb3zr1yaj0lprf9pmxgj630vbpbqkgsd8f";
+ };
+ };
+ };
+ "symfony/event-dispatcher" = {
+ targetDir = "";
+ src = composerEnv.buildZipPackage {
+ name = "symfony-event-dispatcher-c352647244bd376bf7d31efbd5401f13f50dad0c";
+ src = fetchurl {
+ url = https://api.github.com/repos/symfony/event-dispatcher/zipball/c352647244bd376bf7d31efbd5401f13f50dad0c;
+ sha256 = "1cxgn0y83i4qqx757kq96jadwwbc68h11snhvy175xvy8nvsmxkd";
+ };
+ };
+ };
+ "symfony/event-dispatcher-contracts" = {
+ targetDir = "";
+ src = composerEnv.buildZipPackage {
+ name = "symfony-event-dispatcher-contracts-84e23fdcd2517bf37aecbd16967e83f0caee25a7";
+ src = fetchurl {
+ url = https://api.github.com/repos/symfony/event-dispatcher-contracts/zipball/84e23fdcd2517bf37aecbd16967e83f0caee25a7;
+ sha256 = "1pcfrlc0rg8vdnp23y3y1p5qzng5nxf5i2c36g9x9f480xrnc1fw";
+ };
+ };
+ };
+ "symfony/finder" = {
+ targetDir = "";
+ src = composerEnv.buildZipPackage {
+ name = "symfony-finder-25d79cfccfc12e84e7a63a248c3f0720fdd92db6";
+ src = fetchurl {
+ url = https://api.github.com/repos/symfony/finder/zipball/25d79cfccfc12e84e7a63a248c3f0720fdd92db6;
+ sha256 = "04fwddn12sj6vzr5xr4xd25m86cn4l15079490h3q3igprzvrqk8";
+ };
+ };
+ };
+ "symfony/http-client-contracts" = {
+ targetDir = "";
+ src = composerEnv.buildZipPackage {
+ name = "symfony-http-client-contracts-41db680a15018f9c1d4b23516059633ce280ca33";
+ src = fetchurl {
+ url = https://api.github.com/repos/symfony/http-client-contracts/zipball/41db680a15018f9c1d4b23516059633ce280ca33;
+ sha256 = "1iia9rpbri1whp2dw4qfhh90gmkdvxhgjwxi54q7wlnlhijgga81";
+ };
+ };
+ };
+ "symfony/http-foundation" = {
+ targetDir = "";
+ src = composerEnv.buildZipPackage {
+ name = "symfony-http-foundation-8888741b633f6c3d1e572b7735ad2cae3e03f9c5";
+ src = fetchurl {
+ url = https://api.github.com/repos/symfony/http-foundation/zipball/8888741b633f6c3d1e572b7735ad2cae3e03f9c5;
+ sha256 = "0qs389nxxqc6nwx5x6b9kz8ykdlhdx7k8k6nd2apppxpqalvk6sw";
+ };
+ };
+ };
+ "symfony/http-kernel" = {
+ targetDir = "";
+ src = composerEnv.buildZipPackage {
+ name = "symfony-http-kernel-07ea794a327d7c8c5d76e3058fde9fec6a711cb4";
+ src = fetchurl {
+ url = https://api.github.com/repos/symfony/http-kernel/zipball/07ea794a327d7c8c5d76e3058fde9fec6a711cb4;
+ sha256 = "0mnay6nn299ljjgaqqbk8kcl431wrzvzsqybvl648pf513mp9vy9";
+ };
+ };
+ };
+ "symfony/mime" = {
+ targetDir = "";
+ src = composerEnv.buildZipPackage {
+ name = "symfony-mime-7dee6a43493f39b51ff6c5bb2bd576fe40a76c86";
+ src = fetchurl {
+ url = https://api.github.com/repos/symfony/mime/zipball/7dee6a43493f39b51ff6c5bb2bd576fe40a76c86;
+ sha256 = "0931zsmnpx75b9b34a03l0sfp22mailaa2y5az3cgx9v0bkc0vka";
+ };
+ };
+ };
+ "symfony/polyfill-ctype" = {
+ targetDir = "";
+ src = composerEnv.buildZipPackage {
+ name = "symfony-polyfill-ctype-c6c942b1ac76c82448322025e084cadc56048b4e";
+ src = fetchurl {
+ url = https://api.github.com/repos/symfony/polyfill-ctype/zipball/c6c942b1ac76c82448322025e084cadc56048b4e;
+ sha256 = "0jpk859wx74vm03q5s9z25f4ak2138p2x5q3b587wvy8rq2m4pbd";
+ };
+ };
+ };
+ "symfony/polyfill-iconv" = {
+ targetDir = "";
+ src = composerEnv.buildZipPackage {
+ name = "symfony-polyfill-iconv-06fb361659649bcfd6a208a0f1fcaf4e827ad342";
+ src = fetchurl {
+ url = https://api.github.com/repos/symfony/polyfill-iconv/zipball/06fb361659649bcfd6a208a0f1fcaf4e827ad342;
+ sha256 = "0glb56w5q4v2j629rkndp2c7v4mcs6xdl14nwaaxy85lr5w4ixnq";
+ };
+ };
+ };
+ "symfony/polyfill-intl-idn" = {
+ targetDir = "";
+ src = composerEnv.buildZipPackage {
+ name = "symfony-polyfill-intl-idn-2d63434d922daf7da8dd863e7907e67ee3031483";
+ src = fetchurl {
+ url = https://api.github.com/repos/symfony/polyfill-intl-idn/zipball/2d63434d922daf7da8dd863e7907e67ee3031483;
+ sha256 = "0sk592qrdb6dvk6v8msjva8p672qmhmnzkw1lw53gks0xrc20xjy";
+ };
+ };
+ };
+ "symfony/polyfill-intl-normalizer" = {
+ targetDir = "";
+ src = composerEnv.buildZipPackage {
+ name = "symfony-polyfill-intl-normalizer-43a0283138253ed1d48d352ab6d0bdb3f809f248";
+ src = fetchurl {
+ url = https://api.github.com/repos/symfony/polyfill-intl-normalizer/zipball/43a0283138253ed1d48d352ab6d0bdb3f809f248;
+ sha256 = "04irkl6aks8zyfy17ni164060liihfyraqm1fmpjbs5hq0b14sc9";
+ };
+ };
+ };
+ "symfony/polyfill-mbstring" = {
+ targetDir = "";
+ src = composerEnv.buildZipPackage {
+ name = "symfony-polyfill-mbstring-5232de97ee3b75b0360528dae24e73db49566ab1";
+ src = fetchurl {
+ url = https://api.github.com/repos/symfony/polyfill-mbstring/zipball/5232de97ee3b75b0360528dae24e73db49566ab1;
+ sha256 = "1mm670fxj2x72a9mbkyzs3yifpp6glravq2ss438bags1xf6psz8";
+ };
+ };
+ };
+ "symfony/polyfill-php72" = {
+ targetDir = "";
+ src = composerEnv.buildZipPackage {
+ name = "symfony-polyfill-php72-cc6e6f9b39fe8075b3dabfbaf5b5f645ae1340c9";
+ src = fetchurl {
+ url = https://api.github.com/repos/symfony/polyfill-php72/zipball/cc6e6f9b39fe8075b3dabfbaf5b5f645ae1340c9;
+ sha256 = "12dmz2n1b9pqqd758ja0c8h8h5dxdai5ik74iwvaxc5xn86a026b";
+ };
+ };
+ };
+ "symfony/polyfill-php73" = {
+ targetDir = "";
+ src = composerEnv.buildZipPackage {
+ name = "symfony-polyfill-php73-a678b42e92f86eca04b7fa4c0f6f19d097fb69e2";
+ src = fetchurl {
+ url = https://api.github.com/repos/symfony/polyfill-php73/zipball/a678b42e92f86eca04b7fa4c0f6f19d097fb69e2;
+ sha256 = "10rq2x2q9hsdzskrz0aml5qcji27ypxam324044fi24nl60fyzg0";
+ };
+ };
+ };
+ "symfony/polyfill-php80" = {
+ targetDir = "";
+ src = composerEnv.buildZipPackage {
+ name = "symfony-polyfill-php80-dc3063ba22c2a1fd2f45ed856374d79114998f91";
+ src = fetchurl {
+ url = https://api.github.com/repos/symfony/polyfill-php80/zipball/dc3063ba22c2a1fd2f45ed856374d79114998f91;
+ sha256 = "1mhfjibk7mqyzlqpz6jjpxpd93fnfw0nik140x3mq1d2blg5cbvd";
+ };
+ };
+ };
+ "symfony/process" = {
+ targetDir = "";
+ src = composerEnv.buildZipPackage {
+ name = "symfony-process-7e950b6366d4da90292c2e7fa820b3c1842b965a";
+ src = fetchurl {
+ url = https://api.github.com/repos/symfony/process/zipball/7e950b6366d4da90292c2e7fa820b3c1842b965a;
+ sha256 = "07ykgz5bjd45izf5n6jm2n27wcaa7aih2wlsiln1ffj9vqd6l1s4";
+ };
+ };
+ };
+ "symfony/routing" = {
+ targetDir = "";
+ src = composerEnv.buildZipPackage {
+ name = "symfony-routing-87529f6e305c7acb162840d1ea57922038072425";
+ src = fetchurl {
+ url = https://api.github.com/repos/symfony/routing/zipball/87529f6e305c7acb162840d1ea57922038072425;
+ sha256 = "0qrgacividsp7c61y03qh8lb4vj30g0mvljnm5k60h4zzdmivlgc";
+ };
+ };
+ };
+ "symfony/service-contracts" = {
+ targetDir = "";
+ src = composerEnv.buildZipPackage {
+ name = "symfony-service-contracts-d15da7ba4957ffb8f1747218be9e1a121fd298a1";
+ src = fetchurl {
+ url = https://api.github.com/repos/symfony/service-contracts/zipball/d15da7ba4957ffb8f1747218be9e1a121fd298a1;
+ sha256 = "168iq1lp2r5qb5h8j0s17da09iaj2h5hrrdc9rw2p73hq8rvm1w2";
+ };
+ };
+ };
+ "symfony/translation" = {
+ targetDir = "";
+ src = composerEnv.buildZipPackage {
+ name = "symfony-translation-e1d0c67167a553556d9f974b5fa79c2448df317a";
+ src = fetchurl {
+ url = https://api.github.com/repos/symfony/translation/zipball/e1d0c67167a553556d9f974b5fa79c2448df317a;
+ sha256 = "1b6fj278i1wdf4l7py9n86lmhrqmzvjy7kapjpfkz03adn2ps127";
+ };
+ };
+ };
+ "symfony/translation-contracts" = {
+ targetDir = "";
+ src = composerEnv.buildZipPackage {
+ name = "symfony-translation-contracts-e2eaa60b558f26a4b0354e1bbb25636efaaad105";
+ src = fetchurl {
+ url = https://api.github.com/repos/symfony/translation-contracts/zipball/e2eaa60b558f26a4b0354e1bbb25636efaaad105;
+ sha256 = "1k26yvgk84rz6ja9ml6l6iwbbi68qsqnq2cpky044g9ymvlg8d5g";
+ };
+ };
+ };
+ "symfony/var-dumper" = {
+ targetDir = "";
+ src = composerEnv.buildZipPackage {
+ name = "symfony-var-dumper-a1eab2f69906dc83c5ddba4632180260d0ab4f7f";
+ src = fetchurl {
+ url = https://api.github.com/repos/symfony/var-dumper/zipball/a1eab2f69906dc83c5ddba4632180260d0ab4f7f;
+ sha256 = "1yw12jbx6gf5mvg7jrr1v57ah3b2s4hflz2p1m98nayi4qhdp20m";
+ };
+ };
+ };
+ "tijsverkoyen/css-to-inline-styles" = {
+ targetDir = "";
+ src = composerEnv.buildZipPackage {
+ name = "tijsverkoyen-css-to-inline-styles-b43b05cf43c1b6d849478965062b6ef73e223bb5";
+ src = fetchurl {
+ url = https://api.github.com/repos/tijsverkoyen/CssToInlineStyles/zipball/b43b05cf43c1b6d849478965062b6ef73e223bb5;
+ sha256 = "0lc6jviz8faqxxs453dbqvfdmm6l2iczxla22v2r6xhakl58pf3w";
+ };
+ };
+ };
+ "vlucas/phpdotenv" = {
+ targetDir = "";
+ src = composerEnv.buildZipPackage {
+ name = "vlucas-phpdotenv-5e679f7616db829358341e2d5cccbd18773bdab8";
+ src = fetchurl {
+ url = https://api.github.com/repos/vlucas/phpdotenv/zipball/5e679f7616db829358341e2d5cccbd18773bdab8;
+ sha256 = "05j5wj1hry30vaqna4a232gjlibp89ha3ibhy04x5lbm0c98b73q";
+ };
+ };
+ };
+ };
+ devPackages = {};
+in
+composerEnv.buildPackage {
+ inherit packages devPackages noDev;
+ name = "bookstack";
+ src = ./.;
+ executable = false;
+ symlinkDependencies = false;
+ meta = {
+ license = "MIT";
+ };
+}
diff --git a/third_party/nixpkgs/pkgs/servers/web-apps/bookstack/update.sh b/third_party/nixpkgs/pkgs/servers/web-apps/bookstack/update.sh
new file mode 100755
index 0000000000..f61a511059
--- /dev/null
+++ b/third_party/nixpkgs/pkgs/servers/web-apps/bookstack/update.sh
@@ -0,0 +1,50 @@
+#!/usr/bin/env nix-shell
+#! nix-shell -i bash -p nix curl jq nix-update
+
+# check if composer2nix is installed
+if ! command -v composer2nix &> /dev/null; then
+ echo "Please install composer2nix (https://github.com/svanderburg/composer2nix) to run this script."
+ exit 1
+fi
+
+CURRENT_VERSION=$(nix eval --raw '(with import ../../../.. {}; bookstack.version)')
+TARGET_VERSION_REMOTE=$(curl https://api.github.com/repos/bookstackapp/bookstack/releases/latest | jq -r ".tag_name")
+TARGET_VERSION=${TARGET_VERSION_REMOTE:1}
+BOOKSTACK=https://github.com/bookstackapp/bookstack/raw/$TARGET_VERSION_REMOTE
+SHA256=$(nix-prefetch-url --unpack "https://github.com/bookstackapp/bookstack/archive/v$TARGET_VERSION/bookstack.tar.gz")
+
+if [[ "$CURRENT_VERSION" == "$TARGET_VERSION" ]]; then
+ echo "bookstack is up-to-date: ${CURRENT_VERSION}"
+ exit 0
+fi
+
+curl -LO "$BOOKSTACK/composer.json"
+curl -LO "$BOOKSTACK/composer.lock"
+
+composer2nix --name "bookstack" \
+ --composition=composition.nix \
+ --no-dev
+rm composer.json composer.lock
+
+# change version number
+sed -e "s/version =.*;/version = \"$TARGET_VERSION\";/g" \
+ -e "s/sha256 =.*;/sha256 = \"$SHA256\";/g" \
+ -i ./default.nix
+
+# fix composer-env.nix
+sed -e "s/stdenv\.lib/lib/g" \
+ -e '3s/stdenv, writeTextFile/stdenv, lib, writeTextFile/' \
+ -i ./composer-env.nix
+
+# fix composition.nix
+sed -e '7s/stdenv writeTextFile/stdenv lib writeTextFile/' \
+ -i composition.nix
+
+# fix missing newline
+echo "" >> composition.nix
+echo "" >> php-packages.nix
+
+cd ../../../..
+nix-build -A bookstack
+
+exit $?
diff --git a/third_party/nixpkgs/pkgs/servers/web-apps/moodle/moodle-utils.nix b/third_party/nixpkgs/pkgs/servers/web-apps/moodle/moodle-utils.nix
index 168482bffe..090d87cb1e 100644
--- a/third_party/nixpkgs/pkgs/servers/web-apps/moodle/moodle-utils.nix
+++ b/third_party/nixpkgs/pkgs/servers/web-apps/moodle/moodle-utils.nix
@@ -8,15 +8,16 @@ let
configurePhase ? ":",
buildPhase ? ":",
buildInputs ? [ ],
+ nativeBuildInputs ? [ ],
...
}:
stdenv.mkDerivation (a // {
name = name;
inherit pluginType;
- inherit configurePhase buildPhase;
+ inherit configurePhase buildPhase buildInputs;
- buildInputs = [ unzip ] ++ buildInputs;
+ nativeBuildInputs = [ unzip ] ++ nativeBuildInputs;
installPhase = ''
runHook preInstall
diff --git a/third_party/nixpkgs/pkgs/servers/web-apps/restya-board/default.nix b/third_party/nixpkgs/pkgs/servers/web-apps/restya-board/default.nix
index 934ef81ac9..e260702d57 100644
--- a/third_party/nixpkgs/pkgs/servers/web-apps/restya-board/default.nix
+++ b/third_party/nixpkgs/pkgs/servers/web-apps/restya-board/default.nix
@@ -44,7 +44,7 @@ stdenv.mkDerivation rec {
license = licenses.osl3;
homepage = "https://restya.com";
maintainers = with maintainers; [ tstrobel ];
- platforms = platforms.linux;
+ platforms = platforms.unix;
};
}
diff --git a/third_party/nixpkgs/pkgs/servers/web-apps/sogo/default.nix b/third_party/nixpkgs/pkgs/servers/web-apps/sogo/default.nix
index b3fedf9bc5..4a73c5770d 100644
--- a/third_party/nixpkgs/pkgs/servers/web-apps/sogo/default.nix
+++ b/third_party/nixpkgs/pkgs/servers/web-apps/sogo/default.nix
@@ -1,4 +1,4 @@
-{ gnustep, lib, fetchFromGitHub, fetchpatch, makeWrapper, python2, lndir
+{ gnustep, lib, fetchFromGitHub, fetchpatch, makeWrapper, python3, lndir
, openssl_1_1, openldap, sope, libmemcached, curl, libsodium, libzip, pkg-config }:
with lib; gnustep.stdenv.mkDerivation rec {
pname = "SOGo";
@@ -11,7 +11,7 @@ with lib; gnustep.stdenv.mkDerivation rec {
sha256 = "145hdlwnqds5zmpxbh4yainsbv5vy99ji93d6pl7xkbqwncfi80i";
};
- nativeBuildInputs = [ gnustep.make makeWrapper python2 ];
+ nativeBuildInputs = [ gnustep.make makeWrapper python3 ];
buildInputs = [ gnustep.base sope openssl_1_1 libmemcached (curl.override { openssl = openssl_1_1; }) libsodium libzip pkg-config ]
++ optional (openldap != null) openldap;
diff --git a/third_party/nixpkgs/pkgs/servers/x11/xorg/default.nix b/third_party/nixpkgs/pkgs/servers/x11/xorg/default.nix
index e8b29f9bba..59879c652f 100644
--- a/third_party/nixpkgs/pkgs/servers/x11/xorg/default.nix
+++ b/third_party/nixpkgs/pkgs/servers/x11/xorg/default.nix
@@ -1015,11 +1015,11 @@ lib.makeScope newScope (self: with self; {
}) {};
libXt = callPackage ({ stdenv, pkg-config, fetchurl, libICE, xorgproto, libSM, libX11 }: stdenv.mkDerivation {
- name = "libXt-1.2.0";
+ name = "libXt-1.2.1";
builder = ./builder.sh;
src = fetchurl {
- url = "mirror://xorg/individual/lib/libXt-1.2.0.tar.bz2";
- sha256 = "0cbqlyssr8aia88c8i7z59z9d0kp3p2hp6683xhz9ndyv8qza7dk";
+ url = "mirror://xorg/individual/lib/libXt-1.2.1.tar.bz2";
+ sha256 = "0q1x7842r8rcn2m0q4q9f69h4qa097fyizs8brzx5ns62s7w1737";
};
hardeningDisable = [ "bindnow" "relro" ];
nativeBuildInputs = [ pkg-config ];
@@ -1340,11 +1340,11 @@ lib.makeScope newScope (self: with self; {
}) {};
utilmacros = callPackage ({ stdenv, pkg-config, fetchurl }: stdenv.mkDerivation {
- name = "util-macros-1.19.2";
+ name = "util-macros-1.19.3";
builder = ./builder.sh;
src = fetchurl {
- url = "mirror://xorg/individual/util/util-macros-1.19.2.tar.bz2";
- sha256 = "04p7ydqxgq37jklnfj18b70zsifiz4h50wvrk94i2112mmv37r6p";
+ url = "mirror://xorg/individual/util/util-macros-1.19.3.tar.bz2";
+ sha256 = "0w8ryfqylprz37zj9grl4jzdsqq67ibfwq5raj7vm1i7kmp2x08g";
};
hardeningDisable = [ "bindnow" "relro" ];
nativeBuildInputs = [ pkg-config ];
diff --git a/third_party/nixpkgs/pkgs/servers/x11/xorg/tarballs.list b/third_party/nixpkgs/pkgs/servers/x11/xorg/tarballs.list
index 3ee31e4c2a..aaab0c994f 100644
--- a/third_party/nixpkgs/pkgs/servers/x11/xorg/tarballs.list
+++ b/third_party/nixpkgs/pkgs/servers/x11/xorg/tarballs.list
@@ -202,7 +202,7 @@ mirror://xorg/individual/lib/libXres-1.2.0.tar.bz2
mirror://xorg/individual/lib/libXScrnSaver-1.2.3.tar.bz2
mirror://xorg/individual/lib/libxshmfence-1.3.tar.bz2
mirror://xorg/individual/lib/libXTrap-1.0.1.tar.bz2
-mirror://xorg/individual/lib/libXt-1.2.0.tar.bz2
+mirror://xorg/individual/lib/libXt-1.2.1.tar.bz2
mirror://xorg/individual/lib/libXtst-1.2.3.tar.bz2
mirror://xorg/individual/lib/libXv-1.0.11.tar.bz2
mirror://xorg/individual/lib/libXvMC-1.0.12.tar.bz2
@@ -216,6 +216,6 @@ mirror://xorg/individual/util/gccmakedep-1.0.3.tar.bz2
mirror://xorg/individual/util/imake-1.0.8.tar.bz2
mirror://xorg/individual/util/lndir-1.0.3.tar.bz2
mirror://xorg/individual/util/makedepend-1.0.6.tar.bz2
-mirror://xorg/individual/util/util-macros-1.19.2.tar.bz2
+mirror://xorg/individual/util/util-macros-1.19.3.tar.bz2
mirror://xorg/individual/util/xorg-cf-files-1.0.6.tar.bz2
mirror://xorg/individual/xserver/xorg-server-1.20.10.tar.bz2
diff --git a/third_party/nixpkgs/pkgs/shells/fish/default.nix b/third_party/nixpkgs/pkgs/shells/fish/default.nix
index 581785beb7..c467c04c3f 100644
--- a/third_party/nixpkgs/pkgs/shells/fish/default.nix
+++ b/third_party/nixpkgs/pkgs/shells/fish/default.nix
@@ -131,7 +131,7 @@ let
fish = stdenv.mkDerivation rec {
pname = "fish";
- version = "3.2.0";
+ version = "3.2.1";
src = fetchurl {
# There are differences between the release tarball and the tarball GitHub
@@ -141,7 +141,7 @@ let
# --version`), as well as the local documentation for all builtins (and
# maybe other things).
url = "https://github.com/fish-shell/fish-shell/releases/download/${version}/${pname}-${version}.tar.xz";
- sha256 = "sha256-TwKT7Z9qa3fkfUHvq+YvMxnobvyL+DzFhzMET7xvkhE=";
+ sha256 = "2OSfQJDTd43xfdgl5KKoAZIBVoJCPNndArZnXWXDr1s=";
};
# Fix FHS paths in tests
@@ -214,7 +214,7 @@ let
checkInputs = [
coreutils
- (python3.withPackages(ps: [ps.pexpect]))
+ (python3.withPackages (ps: [ ps.pexpect ]))
procps
];
diff --git a/third_party/nixpkgs/pkgs/shells/fish/plugins/build-fish-plugin.nix b/third_party/nixpkgs/pkgs/shells/fish/plugins/build-fish-plugin.nix
index a52c574649..5bb4ffa243 100644
--- a/third_party/nixpkgs/pkgs/shells/fish/plugins/build-fish-plugin.nix
+++ b/third_party/nixpkgs/pkgs/shells/fish/plugins/build-fish-plugin.nix
@@ -11,8 +11,6 @@ attrs@{
buildPhase ? ":",
preInstall ? "",
postInstall ? "",
- # name of the subdirectory in which to store the plugin
- installPath ? lib.getName pname,
checkInputs ? [],
# plugin packages to add to the vendor paths of the test fish shell
@@ -26,7 +24,15 @@ attrs@{
...
}:
-stdenv.mkDerivation (attrs // {
+let
+ # Do not pass attributes that are only relevant to buildFishPlugin to mkDerivation.
+ drvAttrs = builtins.removeAttrs attrs [
+ "checkPlugins"
+ "checkFunctionDirs"
+ ];
+in
+
+stdenv.mkDerivation (drvAttrs // {
inherit name;
inherit unpackPhase configurePhase buildPhase;
diff --git a/third_party/nixpkgs/pkgs/shells/zsh/lambda-mod-zsh-theme/default.nix b/third_party/nixpkgs/pkgs/shells/zsh/lambda-mod-zsh-theme/default.nix
index d9a846c9e0..e8d00d73d1 100644
--- a/third_party/nixpkgs/pkgs/shells/zsh/lambda-mod-zsh-theme/default.nix
+++ b/third_party/nixpkgs/pkgs/shells/zsh/lambda-mod-zsh-theme/default.nix
@@ -19,7 +19,7 @@ stdenv.mkDerivation {
description = "A ZSH theme optimized for people who use Git & Unicode-compatible fonts and terminals";
homepage = "https://github.com/halfo/lambda-mod-zsh-theme/";
license = licenses.mit;
- platforms = platforms.linux;
+ platforms = platforms.all;
maintainers = with maintainers; [ ma27 ];
};
}
diff --git a/third_party/nixpkgs/pkgs/shells/zsh/oh-my-zsh/default.nix b/third_party/nixpkgs/pkgs/shells/zsh/oh-my-zsh/default.nix
index 063d73fa3e..6d5000e6f6 100644
--- a/third_party/nixpkgs/pkgs/shells/zsh/oh-my-zsh/default.nix
+++ b/third_party/nixpkgs/pkgs/shells/zsh/oh-my-zsh/default.nix
@@ -5,15 +5,15 @@
, git, nix, nixfmt, jq, coreutils, gnused, curl, cacert }:
stdenv.mkDerivation rec {
- version = "2021-03-13";
+ version = "2021-03-15";
pname = "oh-my-zsh";
- rev = "3bb5e97762ee764170cffa6cfd1d179a1ba92ff3";
+ rev = "95a06f3927a286db257dc99791b02caba757fe33";
src = fetchFromGitHub {
inherit rev;
owner = "ohmyzsh";
repo = "ohmyzsh";
- sha256 = "0c9l2a318bmh8amazybwd6nqljymaz16q91xv0khs4agm8ib7qqa";
+ sha256 = "1w0g68rvw17jg085qj1g264dsii25gph6vpp6gpn8wby0972h7n0";
};
installPhase = ''
diff --git a/third_party/nixpkgs/pkgs/stdenv/darwin/default.nix b/third_party/nixpkgs/pkgs/stdenv/darwin/default.nix
index 3e5c46709a..a7b91a82a9 100644
--- a/third_party/nixpkgs/pkgs/stdenv/darwin/default.nix
+++ b/third_party/nixpkgs/pkgs/stdenv/darwin/default.nix
@@ -322,7 +322,7 @@ in rec {
libxml2 gettext sharutils gmp libarchive ncurses pkg-config libedit groff
openssh sqlite sed serf openldap db cyrus-sasl expat apr-util subversion xz
findfreetype libssh curl cmake autoconf automake libtool ed cpio coreutils
- libssh2 nghttp2 libkrb5 ninja;
+ libssh2 nghttp2 libkrb5 ninja brotli;
llvmPackages_7 = super.llvmPackages_7 // (let
tools = super.llvmPackages_7.tools.extend (_: _: {
@@ -359,7 +359,7 @@ in rec {
[ bootstrapTools ] ++
(with pkgs; [
xz.bin xz.out libcxx libcxxabi llvmPackages_7.compiler-rt
- llvmPackages_7.clang-unwrapped zlib libxml2.out curl.out openssl.out
+ llvmPackages_7.clang-unwrapped zlib libxml2.out curl.out brotli.lib openssl.out
libssh2.out nghttp2.lib libkrb5 coreutils gnugrep pcre.out gmp libiconv
]) ++
(with pkgs.darwin; [ dyld Libsystem CF ICU locale ]);
@@ -411,7 +411,7 @@ in rec {
[ bootstrapTools ] ++
(with pkgs; [
xz.bin xz.out bash libcxx libcxxabi llvmPackages_7.compiler-rt
- llvmPackages_7.clang-unwrapped zlib libxml2.out curl.out openssl.out
+ llvmPackages_7.clang-unwrapped zlib libxml2.out curl.out brotli.lib openssl.out
libssh2.out nghttp2.lib libkrb5 coreutils gnugrep pcre.out gmp libiconv
]) ++
(with pkgs.darwin; [ dyld ICU Libsystem locale ]);
@@ -533,7 +533,7 @@ in rec {
gzip ncurses.out ncurses.dev ncurses.man gnused bash gawk
gnugrep llvmPackages.clang-unwrapped llvmPackages.clang-unwrapped.lib patch pcre.out gettext
binutils.bintools darwin.binutils darwin.binutils.bintools
- curl.out openssl.out libssh2.out nghttp2.lib libkrb5
+ curl.out brotli.lib openssl.out libssh2.out nghttp2.lib libkrb5
cc.expand-response-params libxml2.out
]) ++ (with pkgs.darwin; [
dyld Libsystem CF cctools ICU libiconv locale libtapi
diff --git a/third_party/nixpkgs/pkgs/stdenv/darwin/make-bootstrap-tools.nix b/third_party/nixpkgs/pkgs/stdenv/darwin/make-bootstrap-tools.nix
index 1d5abdc8b4..7b68c877a6 100644
--- a/third_party/nixpkgs/pkgs/stdenv/darwin/make-bootstrap-tools.nix
+++ b/third_party/nixpkgs/pkgs/stdenv/darwin/make-bootstrap-tools.nix
@@ -18,7 +18,7 @@ in rec {
bzip2_ = bzip2.override (args: { linkStatic = true; });
# Avoid messing with libkrb5 and libnghttp2.
- curl_ = curl.override (args: { gssSupport = false; http2Support = false; });
+ curl_ = curlMinimal.override (args: { gssSupport = false; http2Support = false; });
build = stdenv.mkDerivation {
name = "stdenv-bootstrap-tools";
diff --git a/third_party/nixpkgs/pkgs/stdenv/generic/make-derivation.nix b/third_party/nixpkgs/pkgs/stdenv/generic/make-derivation.nix
index 13a7a03d6a..19c3d8965a 100644
--- a/third_party/nixpkgs/pkgs/stdenv/generic/make-derivation.nix
+++ b/third_party/nixpkgs/pkgs/stdenv/generic/make-derivation.nix
@@ -251,6 +251,7 @@ in rec {
lib.optional (!stdenv.hostPlatform.isRedox) stdenv.hostPlatform.uname.system)}"]
++ lib.optional (stdenv.hostPlatform.uname.processor != null) "-DCMAKE_SYSTEM_PROCESSOR=${stdenv.hostPlatform.uname.processor}"
++ lib.optional (stdenv.hostPlatform.uname.release != null) "-DCMAKE_SYSTEM_VERSION=${stdenv.hostPlatform.release}"
+ ++ lib.optional (stdenv.hostPlatform.isDarwin) "-DCMAKE_OSX_ARCHITECTURES=${stdenv.hostPlatform.darwinArch}"
++ lib.optional (stdenv.buildPlatform.uname.system != null) "-DCMAKE_HOST_SYSTEM_NAME=${stdenv.buildPlatform.uname.system}"
++ lib.optional (stdenv.buildPlatform.uname.processor != null) "-DCMAKE_HOST_SYSTEM_PROCESSOR=${stdenv.buildPlatform.uname.processor}"
++ lib.optional (stdenv.buildPlatform.uname.release != null) "-DCMAKE_HOST_SYSTEM_VERSION=${stdenv.buildPlatform.uname.release}";
diff --git a/third_party/nixpkgs/pkgs/test/cuda/cuda-library-samples/default.nix b/third_party/nixpkgs/pkgs/test/cuda/cuda-library-samples/default.nix
new file mode 100644
index 0000000000..91095fbd3a
--- /dev/null
+++ b/third_party/nixpkgs/pkgs/test/cuda/cuda-library-samples/default.nix
@@ -0,0 +1,42 @@
+{ callPackage
+, cudatoolkit_10_1, cudatoolkit_10_2
+, cudatoolkit_11_0, cudatoolkit_11_1, cudatoolkit_11_2
+, cutensor_cudatoolkit_10_1, cutensor_cudatoolkit_10_2
+, cutensor_cudatoolkit_11_0, cutensor_cudatoolkit_11_1, cutensor_cudatoolkit_11_2
+}:
+
+rec {
+
+ cuda-library-samples_cudatoolkit_10_1 = callPackage ./generic.nix {
+ cudatoolkit = cudatoolkit_10_1;
+ cutensor_cudatoolkit = cutensor_cudatoolkit_10_1;
+ };
+
+ cuda-library-samples_cudatoolkit_10_2 = callPackage ./generic.nix {
+ cudatoolkit = cudatoolkit_10_2;
+ cutensor_cudatoolkit = cutensor_cudatoolkit_10_2;
+ };
+
+ cuda-library-samples_cudatoolkit_10 =
+ cuda-library-samples_cudatoolkit_10_2;
+
+ ##
+
+ cuda-library-samples_cudatoolkit_11_0 = callPackage ./generic.nix {
+ cudatoolkit = cudatoolkit_11_0;
+ cutensor_cudatoolkit = cutensor_cudatoolkit_11_0;
+ };
+
+ cuda-library-samples_cudatoolkit_11_1 = callPackage ./generic.nix {
+ cudatoolkit = cudatoolkit_11_1;
+ cutensor_cudatoolkit = cutensor_cudatoolkit_11_1;
+ };
+
+ cuda-library-samples_cudatoolkit_11_2 = callPackage ./generic.nix {
+ cudatoolkit = cudatoolkit_11_2;
+ cutensor_cudatoolkit = cutensor_cudatoolkit_11_2;
+ };
+
+ cuda-library-samples_cudatoolkit_11 =
+ cuda-library-samples_cudatoolkit_11_2;
+}
diff --git a/third_party/nixpkgs/pkgs/test/cuda/cuda-library-samples/generic.nix b/third_party/nixpkgs/pkgs/test/cuda/cuda-library-samples/generic.nix
new file mode 100644
index 0000000000..f1ce243bfa
--- /dev/null
+++ b/third_party/nixpkgs/pkgs/test/cuda/cuda-library-samples/generic.nix
@@ -0,0 +1,70 @@
+{ lib, stdenv, fetchFromGitHub
+, cmake, addOpenGLRunpath
+, cudatoolkit
+, cutensor_cudatoolkit
+}:
+
+let
+ rev = "5aab680905d853bce0dbad4c488e4f7e9f7b2302";
+ src = fetchFromGitHub {
+ owner = "NVIDIA";
+ repo = "CUDALibrarySamples";
+ inherit rev;
+ sha256 = "0gwgbkq05ygrfgg5hk07lmap7n7ampxv0ha1axrv8qb748ph81xs";
+ };
+ commonAttrs = {
+ version = lib.strings.substring 0 7 rev + "-" + lib.versions.majorMinor cudatoolkit.version;
+ nativeBuildInputs = [ cmake addOpenGLRunpath ];
+ buildInputs = [ cudatoolkit ];
+ enableParallelBuilding = true;
+ postFixup = ''
+ for exe in $out/bin/*; do
+ addOpenGLRunpath $exe
+ done
+ '';
+ meta = {
+ description = "examples of using libraries using CUDA";
+ longDescription = ''
+ CUDA Library Samples contains examples demonstrating the use of
+ features in the math and image processing libraries cuBLAS, cuTENSOR,
+ cuSPARSE, cuSOLVER, cuFFT, cuRAND, NPP and nvJPEG.
+ '';
+ license = lib.licenses.bsd3;
+ maintainers = with lib.maintainers; [ obsidian-systems-maintenance ];
+ };
+ };
+in
+
+{
+ cublas = stdenv.mkDerivation (commonAttrs // {
+ pname = "cuda-library-samples-cublas";
+
+ src = "${src}/cuBLASLt";
+ });
+
+ cusolver = stdenv.mkDerivation (commonAttrs // {
+ pname = "cuda-library-samples-cusolver";
+
+ src = "${src}/cuSOLVER";
+
+ sourceRoot = "cuSOLVER/gesv";
+ });
+
+ cutensor = stdenv.mkDerivation (commonAttrs // {
+ pname = "cuda-library-samples-cutensor";
+
+ src = "${src}/cuTENSOR";
+
+ cmakeFlags = [
+ "-DCUTENSOR_EXAMPLE_BINARY_INSTALL_DIR=${builtins.placeholder "out"}/bin"
+ ];
+
+ # CUTENSOR_ROOT is double escaped
+ postPatch = ''
+ substituteInPlace CMakeLists.txt \
+ --replace "\''${CUTENSOR_ROOT}/include" "${cutensor_cudatoolkit.dev}/include"
+ '';
+
+ CUTENSOR_ROOT = cutensor_cudatoolkit;
+ });
+}
diff --git a/third_party/nixpkgs/pkgs/test/cuda/cuda-samples/default.nix b/third_party/nixpkgs/pkgs/test/cuda/cuda-samples/default.nix
new file mode 100644
index 0000000000..46d4d53169
--- /dev/null
+++ b/third_party/nixpkgs/pkgs/test/cuda/cuda-samples/default.nix
@@ -0,0 +1,52 @@
+{ callPackage
+, cudatoolkit_9_2
+, cudatoolkit_10_0, cudatoolkit_10_1, cudatoolkit_10_2
+, cudatoolkit_11_0, cudatoolkit_11_1, cudatoolkit_11_2
+}:
+
+rec {
+ cuda-samples_cudatoolkit_9_2 = callPackage ./generic.nix {
+ cudatoolkit = cudatoolkit_9_2;
+ sha256 = "1ydankhyigcg99h0rqnmz1z4vc0sl6p9s1s0hbdxh5l1sx9141j6";
+ };
+
+ cuda-samples_cudatoolkit_9 = cuda-samples_cudatoolkit_9_2;
+
+ ##
+
+ cuda-samples_cudatoolkit_10_0 = callPackage ./generic.nix {
+ cudatoolkit = cudatoolkit_10_0;
+ sha256 = "1zvh4xsdyc59m87brpcmssxsjlp9dkynh4asnkcmc3g94f53l0jw";
+ };
+
+ cuda-samples_cudatoolkit_10_1 = callPackage ./generic.nix {
+ cudatoolkit = cudatoolkit_10_1;
+ sha256 = "1s8ka0hznrni36ajhzf2gqpdrl8kd8fi047qijxks5l2abc093qd";
+ };
+
+ cuda-samples_cudatoolkit_10_2 = callPackage ./generic.nix {
+ cudatoolkit = cudatoolkit_10_2;
+ sha256 = "01p1innzgh9siacpld6nsqimj8jkg93rk4gj8q4crn62pa5vhd94";
+ };
+
+ cuda-samples_cudatoolkit_10 = cuda-samples_cudatoolkit_10_2;
+
+ ##
+
+ cuda-samples_cudatoolkit_11_0 = callPackage ./generic.nix {
+ cudatoolkit = cudatoolkit_11_0;
+ sha256 = "1n3vjc8c7zdig2xgl5fppavrphqzhdiv9m9nk6smh4f99fwi0705";
+ };
+
+ cuda-samples_cudatoolkit_11_1 = callPackage ./generic.nix {
+ cudatoolkit = cudatoolkit_11_1;
+ sha256 = "1kjixk50i8y1bkiwbdn5lkv342crvkmbvy1xl5j3lsa1ica21kwh";
+ };
+
+ cuda-samples_cudatoolkit_11_2 = callPackage ./generic.nix {
+ cudatoolkit = cudatoolkit_11_2;
+ sha256 = "1p1qjvfbm28l933mmnln02rqrf0cy9kbpsyb488d1haiqzvrazl1";
+ };
+
+ cuda-samples_cudatoolkit_11 = cuda-samples_cudatoolkit_11_2;
+}
diff --git a/third_party/nixpkgs/pkgs/test/cuda/cuda-samples/generic.nix b/third_party/nixpkgs/pkgs/test/cuda/cuda-samples/generic.nix
new file mode 100644
index 0000000000..2e3dcc8891
--- /dev/null
+++ b/third_party/nixpkgs/pkgs/test/cuda/cuda-samples/generic.nix
@@ -0,0 +1,51 @@
+{ lib, stdenv, fetchFromGitHub
+, pkg-config, addOpenGLRunpath
+, sha256, cudatoolkit
+}:
+
+let
+ pname = "cuda-samples";
+ version = lib.versions.majorMinor cudatoolkit.version;
+in
+
+stdenv.mkDerivation {
+ inherit pname version;
+
+ src = fetchFromGitHub {
+ owner = "NVIDIA";
+ repo = pname;
+ rev = "v${version}";
+ inherit sha256;
+ };
+
+ nativeBuildInputs = [ pkg-config addOpenGLRunpath ];
+
+ buildInputs = [ cudatoolkit ];
+
+ enableParallelBuilding = true;
+
+ preConfigure = ''
+ export CUDA_PATH=${cudatoolkit}
+ '';
+
+ installPhase = ''
+ runHook preInstall
+
+ install -Dm755 -t $out/bin bin/${stdenv.hostPlatform.parsed.cpu.name}/${stdenv.hostPlatform.parsed.kernel.name}/release/*
+
+ runHook postInstall
+ '';
+
+ postFixup = ''
+ for exe in $out/bin/*; do
+ addOpenGLRunpath $exe
+ done
+ '';
+
+ meta = {
+ description = "Samples for CUDA Developers which demonstrates features in CUDA Toolkit";
+ # CUDA itself is proprietary, but these sample apps are not.
+ license = lib.licenses.bsd3;
+ maintainers = with lib.maintainers; [ obsidian-systems-maintenance ];
+ };
+}
diff --git a/third_party/nixpkgs/pkgs/test/cuda/default.nix b/third_party/nixpkgs/pkgs/test/cuda/default.nix
new file mode 100644
index 0000000000..9e7eaf8036
--- /dev/null
+++ b/third_party/nixpkgs/pkgs/test/cuda/default.nix
@@ -0,0 +1,26 @@
+{ callPackage }:
+
+rec {
+ cuda-samplesPackages = callPackage ./cuda-samples { };
+ inherit (cuda-samplesPackages)
+ cuda-samples_cudatoolkit_9
+ cuda-samples_cudatoolkit_9_2
+ cuda-samples_cudatoolkit_10
+ cuda-samples_cudatoolkit_10_0
+ cuda-samples_cudatoolkit_10_1
+ cuda-samples_cudatoolkit_10_2
+ cuda-samples_cudatoolkit_11
+ cuda-samples_cudatoolkit_11_0
+ cuda-samples_cudatoolkit_11_1
+ cuda-samples_cudatoolkit_11_2;
+
+ cuda-library-samplesPackages = callPackage ./cuda-library-samples { };
+ inherit (cuda-library-samplesPackages)
+ cuda-library-samples_cudatoolkit_10
+ cuda-library-samples_cudatoolkit_10_1
+ cuda-library-samples_cudatoolkit_10_2
+ cuda-library-samples_cudatoolkit_11
+ cuda-library-samples_cudatoolkit_11_0
+ cuda-library-samples_cudatoolkit_11_1
+ cuda-library-samples_cudatoolkit_11_2;
+}
diff --git a/third_party/nixpkgs/pkgs/test/default.nix b/third_party/nixpkgs/pkgs/test/default.nix
index f45e981cff..fa93ceb072 100644
--- a/third_party/nixpkgs/pkgs/test/default.nix
+++ b/third_party/nixpkgs/pkgs/test/default.nix
@@ -47,5 +47,7 @@ with pkgs;
texlive = callPackage ./texlive {};
+ cuda = callPackage ./cuda { };
+
writers = callPackage ../build-support/writers/test.nix {};
}
diff --git a/third_party/nixpkgs/pkgs/test/texlive/default.nix b/third_party/nixpkgs/pkgs/test/texlive/default.nix
index 30d0026c84..7a6affd6cb 100644
--- a/third_party/nixpkgs/pkgs/test/texlive/default.nix
+++ b/third_party/nixpkgs/pkgs/test/texlive/default.nix
@@ -1,4 +1,4 @@
-{ runCommandNoCC, fetchurl, file, texlive }:
+{ runCommandNoCC, fetchurl, file, texlive, writeShellScript }:
{
chktex = runCommandNoCC "texlive-test-chktex" {
@@ -17,7 +17,7 @@
'';
# https://github.com/NixOS/nixpkgs/issues/75605
- dvipng = runCommandNoCC "texlive-test-dvipng" {
+ dvipng.basic = runCommandNoCC "texlive-test-dvipng-basic" {
nativeBuildInputs = [ file texlive.combined.scheme-medium ];
input = fetchurl {
name = "test_dvipng.tex";
@@ -38,6 +38,47 @@
mv document*.png "$out"/
'';
+ # test dvipng's limited capability to render postscript specials via GS
+ dvipng.ghostscript = runCommandNoCC "texlive-test-ghostscript" {
+ nativeBuildInputs = [ file (with texlive; combine { inherit scheme-small dvipng; }) ];
+ input = builtins.toFile "postscript-sample.tex" ''
+ \documentclass{minimal}
+ \begin{document}
+ Ni
+ \special{ps:
+ newpath
+ 0 0 moveto
+ 7 7 rlineto
+ 0 7 moveto
+ 7 -7 rlineto
+ stroke
+ showpage
+ }
+ \end{document}
+ '';
+ gs_trap = writeShellScript "gs_trap.sh" ''
+ exit 1
+ '';
+ } ''
+ cp "$gs_trap" ./gs
+ export PATH=$PWD:$PATH
+ # check that the trap works
+ gs && exit 1
+
+ cp "$input" ./document.tex
+
+ latex document.tex
+ dvipng -T 1in,1in -strict -picky document.dvi
+ for f in document*.png; do
+ file "$f" | tee output
+ grep PNG output
+ done
+
+ mkdir "$out"
+ mv document*.png "$out"/
+ '';
+
+
# https://github.com/NixOS/nixpkgs/issues/75070
dvisvgm = runCommandNoCC "texlive-test-dvisvgm" {
nativeBuildInputs = [ file texlive.combined.scheme-medium ];
diff --git a/third_party/nixpkgs/pkgs/tools/X11/alttab/default.nix b/third_party/nixpkgs/pkgs/tools/X11/alttab/default.nix
index 34c17a7b51..591edff2ad 100644
--- a/third_party/nixpkgs/pkgs/tools/X11/alttab/default.nix
+++ b/third_party/nixpkgs/pkgs/tools/X11/alttab/default.nix
@@ -1,5 +1,5 @@
-{ lib, stdenv, fetchFromGitHub, autoconf, automake, pkg-config, ronn, libpng, uthash
-, xorg }:
+{ lib, stdenv, coreutils, fetchFromGitHub, autoconf, automake, pkg-config, procps, ronn,
+libpng, uthash , which, xnee, xorg, python3Packages }:
stdenv.mkDerivation rec {
version = "1.6.0";
@@ -35,10 +35,22 @@ stdenv.mkDerivation rec {
enableParallelBuilding = true;
+ doCheck = true;
+
+ checkInputs = [
+ coreutils
+ procps
+ python3Packages.xvfbwrapper
+ which
+ xnee
+ xorg.xeyes
+ xorg.xprop
+ ];
+
meta = with lib; {
homepage = "https://github.com/sagb/alttab";
description = "X11 window switcher designed for minimalistic window managers or standalone X11 session";
- license = licenses.gpl3;
+ license = licenses.gpl3Plus;
platforms = platforms.all;
maintainers = [ maintainers.sgraf ];
};
diff --git a/third_party/nixpkgs/pkgs/tools/admin/analog/default.nix b/third_party/nixpkgs/pkgs/tools/admin/analog/default.nix
index 68046be2ee..d85e5365d6 100644
--- a/third_party/nixpkgs/pkgs/tools/admin/analog/default.nix
+++ b/third_party/nixpkgs/pkgs/tools/admin/analog/default.nix
@@ -11,10 +11,11 @@ stdenv.mkDerivation rec {
sha256 = "15hi8kfknldwpvm885r9s7zd5h7cirs7x0zazx2nnz62xvz3iymk";
};
- configurePhase = ''
+ postPatch = ''
sed -i src/anlghead.h \
-e "s|#define DEFAULTCONFIGFILE .*|#define DEFAULTCONFIGFILE \"$out/etc/analog.cfg\"|g" \
-e "s|#define LANGDIR .*|#define LANGDIR \"$out/share/$pname}/lang/\"|g"
+ substituteInPlace src/Makefile --replace "gcc" "${stdenv.cc.targetPrefix}cc"
'';
installPhase = ''
@@ -32,7 +33,7 @@ stdenv.mkDerivation rec {
license = lib.licenses.gpl2;
description = "Powerful tool to generate web server statistics";
maintainers = [ lib.maintainers.peti ];
- platforms = lib.platforms.linux;
+ platforms = lib.platforms.all;
};
}
diff --git a/third_party/nixpkgs/pkgs/tools/admin/awscli/default.nix b/third_party/nixpkgs/pkgs/tools/admin/awscli/default.nix
index c5e792d6bc..58d87a033f 100644
--- a/third_party/nixpkgs/pkgs/tools/admin/awscli/default.nix
+++ b/third_party/nixpkgs/pkgs/tools/admin/awscli/default.nix
@@ -28,11 +28,11 @@ let
in
with py.pkgs; buildPythonApplication rec {
pname = "awscli";
- version = "1.19.25"; # N.B: if you change this, change botocore and boto3 to a matching version too
+ version = "1.19.30"; # N.B: if you change this, change botocore and boto3 to a matching version too
src = fetchPypi {
inherit pname version;
- sha256 = "sha256-YL5MnlN+DODGgpi2qtpr6wwC0nuebl/VoBzXRk4l4R8=";
+ sha256 = "sha256-XD0CwBTDUvCTSL7JrcQCAd8zq+Ve0zSDpfz0Vzi8oeM=";
};
# https://github.com/aws/aws-cli/issues/4837
diff --git a/third_party/nixpkgs/pkgs/tools/admin/google-cloud-sdk/default.nix b/third_party/nixpkgs/pkgs/tools/admin/google-cloud-sdk/default.nix
index 1d585514f7..1d70fa24fb 100644
--- a/third_party/nixpkgs/pkgs/tools/admin/google-cloud-sdk/default.nix
+++ b/third_party/nixpkgs/pkgs/tools/admin/google-cloud-sdk/default.nix
@@ -21,18 +21,18 @@ let
sources = name: system: {
x86_64-darwin = {
url = "${baseUrl}/${name}-darwin-x86_64.tar.gz";
- sha256 = "sha256-aHFwcynt4xQ0T1J+OTSxgttU9W3VFJAqCwmQSdVg8Fk=";
+ sha256 = "09jhcv0ysq37k06b4rw3f9w33spvkkxx7fydraikm3zzvy28l58x";
};
x86_64-linux = {
url = "${baseUrl}/${name}-linux-x86_64.tar.gz";
- sha256 = "sha256-MfldToK7ZfdWZiZnI1qKI1o/dSiUcysxzUkTYMVZ5u4=";
+ sha256 = "1971fz8cv69y7kvirgw9n0xr7z9b1yyh4y43mg10lvv3glx46xcy";
};
}.${system};
in stdenv.mkDerivation rec {
pname = "google-cloud-sdk";
- version = "328.0.0";
+ version = "332.0.0";
src = fetchurl (sources "${pname}-${version}" stdenv.hostPlatform.system);
@@ -81,7 +81,8 @@ in stdenv.mkDerivation rec {
# setup bash completion
mkdir -p $out/share/bash-completion/completions
- mv $out/google-cloud-sdk/completion.bash.inc $out/share/bash-completion/completions/gcloud.inc
+ mv $out/google-cloud-sdk/completion.bash.inc $out/share/bash-completion/completions/gcloud
+ ln -s $out/share/bash-completion/completions/gcloud $out/share/bash-completion/completions/gsutil
# This directory contains compiled mac binaries. We used crcmod from
# nixpkgs instead.
diff --git a/third_party/nixpkgs/pkgs/tools/admin/salt/default.nix b/third_party/nixpkgs/pkgs/tools/admin/salt/default.nix
index 592f4cc764..9a2d8e52fd 100644
--- a/third_party/nixpkgs/pkgs/tools/admin/salt/default.nix
+++ b/third_party/nixpkgs/pkgs/tools/admin/salt/default.nix
@@ -39,8 +39,8 @@ python3.pkgs.buildPythonApplication rec {
doCheck = false;
meta = with lib; {
- homepage = "https://saltstack.com/";
- changelog = "https://docs.saltstack.com/en/latest/topics/releases/${version}.html";
+ homepage = "https://saltproject.io/";
+ changelog = "https://docs.saltproject.io/en/latest/topics/releases/${version}.html";
description = "Portable, distributed, remote execution and configuration management system";
maintainers = with maintainers; [ Flakebi ];
license = licenses.asl20;
diff --git a/third_party/nixpkgs/pkgs/tools/admin/turbovnc/default.nix b/third_party/nixpkgs/pkgs/tools/admin/turbovnc/default.nix
index 16ae53d25b..33d248ffde 100644
--- a/third_party/nixpkgs/pkgs/tools/admin/turbovnc/default.nix
+++ b/third_party/nixpkgs/pkgs/tools/admin/turbovnc/default.nix
@@ -1,6 +1,7 @@
{ lib
, stdenv
, fetchFromGitHub
+, nixosTests
# Dependencies
, cmake
@@ -101,6 +102,8 @@ stdenv.mkDerivation rec {
--prefix PATH : ${lib.makeBinPath [ openssh ]}
'';
+ passthru.tests.turbovnc-headless-server = nixosTests.turbovnc-headless-server;
+
meta = {
homepage = "https://turbovnc.org/";
license = lib.licenses.gpl2Plus;
diff --git a/third_party/nixpkgs/pkgs/tools/archivers/rpm2targz/default.nix b/third_party/nixpkgs/pkgs/tools/archivers/rpm2targz/default.nix
new file mode 100644
index 0000000000..ac5b132d7a
--- /dev/null
+++ b/third_party/nixpkgs/pkgs/tools/archivers/rpm2targz/default.nix
@@ -0,0 +1,55 @@
+{ bzip2
+, coreutils
+, cpio
+, fetchurl
+, gnutar
+, gzip
+, lib
+, stdenv
+, xz
+, zstd
+}:
+
+let
+ shdeps = [
+ bzip2
+ coreutils
+ cpio
+ gnutar
+ gzip
+ xz
+ zstd
+ ];
+
+in stdenv.mkDerivation rec {
+ pname = "rpm2targz";
+ version = "2021.03.16";
+
+ # git repo: https://gitweb.gentoo.org/proj/rpm2targz.git/
+ src = fetchurl {
+ url = "https://dev.gentoo.org/~vapier/dist/${pname}-${version}.tar.xz";
+ hash = "sha256-rcV+o9V2wWKznqSW2rA8xgnpQ02kpK4te6mYvLRC5vQ=";
+ };
+
+ buildInputs = shdeps;
+
+ postPatch = ''
+ substituteInPlace rpm2targz --replace "=\"rpmoffset\"" "=\"$out/bin/rpmoffset\""
+ # rpm2targz relies on the executable name
+ # to guess what compressor it should use
+ # this is more reliable than wrapProgram
+ sed -i -e '2iexport PATH="${lib.makeBinPath shdeps}"' rpm2targz
+ '';
+
+ preBuild = ''
+ makeFlagsArray+=(prefix=$out)
+ '';
+
+ meta = with lib; {
+ description = "Convert a .rpm file to a .tar.gz archive";
+ homepage = "http://slackware.com/config/packages.php";
+ license = licenses.bsd1;
+ maintainers = with maintainers; [ zseri ];
+ platforms = platforms.all;
+ };
+}
diff --git a/third_party/nixpkgs/pkgs/tools/archivers/zpaq/default.nix b/third_party/nixpkgs/pkgs/tools/archivers/zpaq/default.nix
index 7c9f9ac7d6..a7663bbd23 100644
--- a/third_party/nixpkgs/pkgs/tools/archivers/zpaq/default.nix
+++ b/third_party/nixpkgs/pkgs/tools/archivers/zpaq/default.nix
@@ -11,8 +11,7 @@ stdenv.mkDerivation rec {
sha256 = "0v44rlg9gvwc4ggr2lhcqll8ppal3dk7zsg5bqwcc5lg3ynk2pz4";
};
- nativeBuildInputs = [ perl /* for pod2man */ ];
- buildInputs = [ unzip ];
+ nativeBuildInputs = [ perl /* for pod2man */ unzip ];
preBuild = let
CPPFLAGS = with stdenv; ""
diff --git a/third_party/nixpkgs/pkgs/tools/archivers/zpaq/zpaqd.nix b/third_party/nixpkgs/pkgs/tools/archivers/zpaq/zpaqd.nix
index 1ff204babc..c2f214ea2a 100644
--- a/third_party/nixpkgs/pkgs/tools/archivers/zpaq/zpaqd.nix
+++ b/third_party/nixpkgs/pkgs/tools/archivers/zpaq/zpaqd.nix
@@ -24,7 +24,7 @@ stdenv.mkDerivation {
sourceRoot = ".";
- buildInputs = [ unzip ];
+ nativeBuildInputs = [ unzip ];
buildPhase = ''
g++ ${compileFlags} -fPIC --shared libzpaq.cpp -o libzpaq.so
diff --git a/third_party/nixpkgs/pkgs/tools/audio/essentia-extractor/default.nix b/third_party/nixpkgs/pkgs/tools/audio/essentia-extractor/default.nix
index a02cca6a3d..63ebbb0ffc 100644
--- a/third_party/nixpkgs/pkgs/tools/audio/essentia-extractor/default.nix
+++ b/third_party/nixpkgs/pkgs/tools/audio/essentia-extractor/default.nix
@@ -14,13 +14,13 @@ let
arch = arch_table.${stdenv.system};
sha = sha_table.${stdenv.system};
-in stdenv.mkDerivation rec {
+in
+stdenv.mkDerivation rec {
pname = "essentia-extractor";
version = "2.1_beta2";
src = fetchurl {
- url =
- "ftp://ftp.acousticbrainz.org/pub/acousticbrainz/essentia-extractor-v${version}-${arch}.tar.gz";
+ url = "ftp://ftp.acousticbrainz.org/pub/acousticbrainz/essentia-extractor-v${version}-${arch}.tar.gz";
sha256 = sha;
};
diff --git a/third_party/nixpkgs/pkgs/tools/audio/midicsv/default.nix b/third_party/nixpkgs/pkgs/tools/audio/midicsv/default.nix
index f02f6ed956..cf55e0dd81 100644
--- a/third_party/nixpkgs/pkgs/tools/audio/midicsv/default.nix
+++ b/third_party/nixpkgs/pkgs/tools/audio/midicsv/default.nix
@@ -9,7 +9,9 @@ stdenv.mkDerivation rec {
};
postPatch = ''
- substituteInPlace Makefile --replace /usr/local $out
+ substituteInPlace Makefile \
+ --replace /usr/local $out \
+ --replace gcc "${stdenv.cc.targetPrefix}cc"
'';
meta = with lib; {
@@ -17,6 +19,6 @@ stdenv.mkDerivation rec {
homepage = "http://www.fourmilab.ch/webtools/midicsv/";
license = licenses.publicDomain;
maintainers = with maintainers; [ orivej ];
- platforms = platforms.linux;
+ platforms = platforms.all;
};
}
diff --git a/third_party/nixpkgs/pkgs/tools/audio/mpd-mpris/default.nix b/third_party/nixpkgs/pkgs/tools/audio/mpd-mpris/default.nix
index af4000dfa4..b90ab80bef 100644
--- a/third_party/nixpkgs/pkgs/tools/audio/mpd-mpris/default.nix
+++ b/third_party/nixpkgs/pkgs/tools/audio/mpd-mpris/default.nix
@@ -29,6 +29,6 @@ buildGoModule rec {
homepage = "https://github.com/natsukagami/mpd-mpris";
license = licenses.mit;
maintainers = with maintainers; [ doronbehar ];
- platforms = platforms.linux;
+ platforms = platforms.unix;
};
}
diff --git a/third_party/nixpkgs/pkgs/tools/cd-dvd/cdi2iso/default.nix b/third_party/nixpkgs/pkgs/tools/cd-dvd/cdi2iso/default.nix
index 9df7ab7657..26768747a4 100644
--- a/third_party/nixpkgs/pkgs/tools/cd-dvd/cdi2iso/default.nix
+++ b/third_party/nixpkgs/pkgs/tools/cd-dvd/cdi2iso/default.nix
@@ -1,4 +1,4 @@
-{lib, stdenv, fetchurl}:
+{ lib, stdenv, fetchurl }:
stdenv.mkDerivation rec {
pname = "cdi2iso";
@@ -9,9 +9,13 @@ stdenv.mkDerivation rec {
sha256 = "0fj2fxhpr26z649m0ph71378c41ljflpyk89g87x8r1mc4rbq3kh";
};
+ postPatch = ''
+ substituteInPlace Makefile --replace "gcc" "${stdenv.cc.targetPrefix}cc"
+ '';
+
installPhase = ''
- mkdir -p $out/bin/
- cp cdi2iso $out/bin/
+ mkdir -p $out/bin
+ cp cdi2iso $out/bin
'';
meta = with lib; {
@@ -19,6 +23,6 @@ stdenv.mkDerivation rec {
homepage = "https://sourceforge.net/projects/cdi2iso.berlios";
license = licenses.gpl2;
maintainers = with maintainers; [ hrdinka ];
- platforms = platforms.linux;
+ platforms = platforms.all;
};
}
diff --git a/third_party/nixpkgs/pkgs/tools/cd-dvd/uif2iso/default.nix b/third_party/nixpkgs/pkgs/tools/cd-dvd/uif2iso/default.nix
index d37cc649d3..ac0879e321 100644
--- a/third_party/nixpkgs/pkgs/tools/cd-dvd/uif2iso/default.nix
+++ b/third_party/nixpkgs/pkgs/tools/cd-dvd/uif2iso/default.nix
@@ -9,7 +9,8 @@ stdenv.mkDerivation rec {
sha256 = "1v18fmlzhkkhv8xdc9dyvl8vamwg3ka4dsrg7vvmk1f2iczdx3dp";
};
- buildInputs = [unzip zlib];
+ nativeBuildInputs = [ unzip ];
+ buildInputs = [zlib];
installPhase = ''
make -C . prefix="$out" install;
diff --git a/third_party/nixpkgs/pkgs/tools/compression/bzip2/default.nix b/third_party/nixpkgs/pkgs/tools/compression/bzip2/default.nix
index bfaf359522..da37cf9fbd 100644
--- a/third_party/nixpkgs/pkgs/tools/compression/bzip2/default.nix
+++ b/third_party/nixpkgs/pkgs/tools/compression/bzip2/default.nix
@@ -10,7 +10,7 @@
stdenv.mkDerivation rec {
pname = "bzip2";
- version = "1.0.6.0.1";
+ version = "1.0.6.0.2";
/* We use versions patched to use autotools style properly,
saving lots of trouble. */
@@ -23,7 +23,7 @@ stdenv.mkDerivation rec {
"ftp://ftp.mplayerhq.hu/pub/linux/suse"
"http://ftp.suse.com/pub" # the original patched version but slow
];
- sha256 = "0b5b5p8c7bslc6fslcr1nj9136412v3qcvbg6yxi9argq9g72v8c";
+ sha256 = "sha256-FnhwNy4OHe8d5M6iYCClkxzcB/EHXg0veXwv43ZlxbA=";
};
nativeBuildInputs = [ autoreconfHook ];
@@ -46,6 +46,8 @@ stdenv.mkDerivation rec {
meta = with lib; {
description = "High-quality data compression program";
+ homepage = "https://www.sourceware.org/bzip2";
+ changelog = "https://sourceware.org/git/?p=bzip2.git;a=blob;f=CHANGES;hb=HEAD";
license = licenses.bsdOriginal;
platforms = platforms.all;
maintainers = with maintainers; [ mic92 ];
diff --git a/third_party/nixpkgs/pkgs/tools/compression/dejsonlz4/default.nix b/third_party/nixpkgs/pkgs/tools/compression/dejsonlz4/default.nix
index 9e6f95aecb..07b6a5979a 100644
--- a/third_party/nixpkgs/pkgs/tools/compression/dejsonlz4/default.nix
+++ b/third_party/nixpkgs/pkgs/tools/compression/dejsonlz4/default.nix
@@ -10,7 +10,7 @@ stdenv.mkDerivation rec {
};
buildPhase = ''
- gcc -Wall -o dejsonlz4 src/dejsonlz4.c src/lz4.c
+ ${stdenv.cc.targetPrefix}cc -o dejsonlz4 src/dejsonlz4.c src/lz4.c
'';
installPhase = ''
@@ -23,6 +23,6 @@ stdenv.mkDerivation rec {
homepage = "https://github.com/avih/dejsonlz4";
license = licenses.bsd2;
maintainers = with maintainers; [ mt-caret ];
- platforms = platforms.linux;
+ platforms = platforms.all;
};
}
diff --git a/third_party/nixpkgs/pkgs/tools/compression/lrzip/default.nix b/third_party/nixpkgs/pkgs/tools/compression/lrzip/default.nix
index 78ce2d39f0..9f4f66521f 100644
--- a/third_party/nixpkgs/pkgs/tools/compression/lrzip/default.nix
+++ b/third_party/nixpkgs/pkgs/tools/compression/lrzip/default.nix
@@ -1,12 +1,12 @@
{lib, stdenv, fetchurl, zlib, lzo, bzip2, lz4, nasm, perl}:
stdenv.mkDerivation rec {
- version = "0.640";
+ version = "0.641";
pname = "lrzip";
src = fetchurl {
url = "http://ck.kolivas.org/apps/lrzip/${pname}-${version}.tar.xz";
- sha256 = "175466drfpz8rsfr0pzfn5rqrj3wmcmcs3i2sfmw366w2kbjm4j9";
+ sha256 = "0ziyanspd96dc3lp2qdcylc7aq8dhb511jhqrhxvlp502fjqjqrc";
};
buildInputs = [ zlib lzo bzip2 lz4 nasm perl ];
diff --git a/third_party/nixpkgs/pkgs/tools/compression/zdelta/builder.sh b/third_party/nixpkgs/pkgs/tools/compression/zdelta/builder.sh
deleted file mode 100644
index 03db413181..0000000000
--- a/third_party/nixpkgs/pkgs/tools/compression/zdelta/builder.sh
+++ /dev/null
@@ -1,8 +0,0 @@
-source $stdenv/setup
-
-installPhase() {
- mkdir -p $out/bin
- cp -p zdc zdu $out/bin
-}
-
-genericBuild
diff --git a/third_party/nixpkgs/pkgs/tools/compression/zdelta/default.nix b/third_party/nixpkgs/pkgs/tools/compression/zdelta/default.nix
index 46760c9130..b30a43f33c 100644
--- a/third_party/nixpkgs/pkgs/tools/compression/zdelta/default.nix
+++ b/third_party/nixpkgs/pkgs/tools/compression/zdelta/default.nix
@@ -1,16 +1,24 @@
-{lib, stdenv, fetchurl}:
+{ lib, stdenv, fetchurl }:
stdenv.mkDerivation rec {
- name = "zdelta-2.1";
- builder = ./builder.sh;
+ pname = "zdelta";
+ version = "2.1";
+
src = fetchurl {
- url = "${meta.homepage}/downloads/${name}.tar.gz";
- sha256 = "0k6y0r9kv5qiglnr2j4a0yvfynjkvm0pyv8ly28j0pr3w6rbxrh3";
+ url = "https://web.archive.org/web/20160316212948/http://cis.poly.edu/zdelta/downloads/zdelta-2.1.tar.gz";
+ sha256 = "sha256-WiQKWxJkINIwRBcdiuVLMDiupQ8gOsiXOEZvHDa5iFg=";
};
+ makeFlags = [ "CC=${stdenv.cc.targetPrefix}cc" ];
+
+ installPhase = ''
+ mkdir -p $out/bin
+ cp -p zdc zdu $out/bin
+ '';
+
meta = with lib; {
- homepage = "http://cis.poly.edu/zdelta";
- platforms = platforms.linux;
+ homepage = "https://web.archive.org/web/20160316212948/http://cis.poly.edu/zdelta/";
+ platforms = platforms.all;
license = licenses.zlib;
};
}
diff --git a/third_party/nixpkgs/pkgs/tools/filesystems/catcli/default.nix b/third_party/nixpkgs/pkgs/tools/filesystems/catcli/default.nix
index 1552505701..be9349daa2 100644
--- a/third_party/nixpkgs/pkgs/tools/filesystems/catcli/default.nix
+++ b/third_party/nixpkgs/pkgs/tools/filesystems/catcli/default.nix
@@ -25,6 +25,6 @@ buildPythonApplication rec {
homepage = "https://github.com/deadc0de6/catcli";
license = licenses.gpl3;
maintainers = with maintainers; [ petersjt014 ];
- platforms = platforms.linux;
+ platforms = platforms.all;
};
}
diff --git a/third_party/nixpkgs/pkgs/tools/filesystems/cpcfs/default.nix b/third_party/nixpkgs/pkgs/tools/filesystems/cpcfs/default.nix
index 2aa63208e0..a439e29358 100644
--- a/third_party/nixpkgs/pkgs/tools/filesystems/cpcfs/default.nix
+++ b/third_party/nixpkgs/pkgs/tools/filesystems/cpcfs/default.nix
@@ -36,6 +36,6 @@ stdenv.mkDerivation rec {
homepage = "https://github.com/derikz/cpcfs/" ;
license = licenses.bsd2;
maintainers = [ ];
- platforms = platforms.linux;
+ platforms = platforms.all;
};
}
diff --git a/third_party/nixpkgs/pkgs/tools/filesystems/idsk/default.nix b/third_party/nixpkgs/pkgs/tools/filesystems/idsk/default.nix
index 12a0af7ea4..0b7ae33905 100644
--- a/third_party/nixpkgs/pkgs/tools/filesystems/idsk/default.nix
+++ b/third_party/nixpkgs/pkgs/tools/filesystems/idsk/default.nix
@@ -24,6 +24,6 @@ stdenv.mkDerivation rec {
homepage = "https://github.com/cpcsdk/idsk" ;
license = licenses.mit;
maintainers = [ ];
- platforms = platforms.linux;
+ platforms = platforms.all;
};
}
diff --git a/third_party/nixpkgs/pkgs/tools/graphics/epstool/default.nix b/third_party/nixpkgs/pkgs/tools/graphics/epstool/default.nix
index 8052434ff0..6910f458a1 100644
--- a/third_party/nixpkgs/pkgs/tools/graphics/epstool/default.nix
+++ b/third_party/nixpkgs/pkgs/tools/graphics/epstool/default.nix
@@ -9,6 +9,12 @@ stdenv.mkDerivation rec {
sha256 = "1pfgqbipwk36clhma2k365jkpvyy75ahswn8jczzys382jalpwgk";
};
+ makeFlags = [
+ "CC=${stdenv.cc.targetPrefix}cc"
+ "CLINK=${stdenv.cc.targetPrefix}cc"
+ "LINK=${stdenv.cc.targetPrefix}cc"
+ ];
+
installPhase = ''
make EPSTOOL_ROOT=$out install
'';
@@ -20,6 +26,6 @@ stdenv.mkDerivation rec {
homepage = "http://pages.cs.wisc.edu/~ghost/gsview/epstool.htm";
license = licenses.gpl2;
maintainers = [ maintainers.asppsa ];
- platforms = platforms.linux;
+ platforms = platforms.all;
};
}
diff --git a/third_party/nixpkgs/pkgs/tools/graphics/fgallery/default.nix b/third_party/nixpkgs/pkgs/tools/graphics/fgallery/default.nix
index 865e0f141f..28deabb98d 100644
--- a/third_party/nixpkgs/pkgs/tools/graphics/fgallery/default.nix
+++ b/third_party/nixpkgs/pkgs/tools/graphics/fgallery/default.nix
@@ -16,8 +16,8 @@ stdenv.mkDerivation rec {
sha256 = "18wlvqbxcng8pawimbc8f2422s8fnk840hfr6946lzsxr0ijakvf";
};
- nativeBuildInputs = [ makeWrapper ];
- buildInputs = [ unzip ] ++ (with perlPackages; [ perl ImageExifTool CpanelJSONXS ]);
+ nativeBuildInputs = [ makeWrapper unzip ];
+ buildInputs = (with perlPackages; [ perl ImageExifTool CpanelJSONXS ]);
installPhase = ''
mkdir -p "$out/bin"
diff --git a/third_party/nixpkgs/pkgs/tools/graphics/graphviz/base.nix b/third_party/nixpkgs/pkgs/tools/graphics/graphviz/base.nix
index 6c9a847105..977886e90e 100644
--- a/third_party/nixpkgs/pkgs/tools/graphics/graphviz/base.nix
+++ b/third_party/nixpkgs/pkgs/tools/graphics/graphviz/base.nix
@@ -2,9 +2,7 @@
{ lib, stdenv, fetchFromGitLab, autoreconfHook, pkg-config, cairo, expat, flex
, fontconfig, gd, gettext, gts, libdevil, libjpeg, libpng, libtool, pango
-, yacc, fetchpatch, xorg ? null, ApplicationServices ? null }:
-
-assert stdenv.isDarwin -> ApplicationServices != null;
+, yacc, fetchpatch, xorg ? null, ApplicationServices }:
let
inherit (lib) optional optionals optionalString;
diff --git a/third_party/nixpkgs/pkgs/tools/graphics/imgurbash2/default.nix b/third_party/nixpkgs/pkgs/tools/graphics/imgurbash2/default.nix
index 8b79e3373a..30848d7d0d 100644
--- a/third_party/nixpkgs/pkgs/tools/graphics/imgurbash2/default.nix
+++ b/third_party/nixpkgs/pkgs/tools/graphics/imgurbash2/default.nix
@@ -24,7 +24,7 @@ stdenv.mkDerivation rec {
meta = with lib; {
description = "A shell script that uploads images to imgur";
license = licenses.mit;
- platforms = platforms.linux;
+ platforms = platforms.all;
maintainers = with maintainers; [ abbradar ];
homepage = "https://github.com/ram-on/imgurbash2";
};
diff --git a/third_party/nixpkgs/pkgs/tools/graphics/nip2/default.nix b/third_party/nixpkgs/pkgs/tools/graphics/nip2/default.nix
index ae07d0ced2..5fa2d26396 100644
--- a/third_party/nixpkgs/pkgs/tools/graphics/nip2/default.nix
+++ b/third_party/nixpkgs/pkgs/tools/graphics/nip2/default.nix
@@ -1,5 +1,5 @@
-{ lib, stdenv, fetchurl, pkg-config, glib, libxml2, flex, bison, vips, gnome2,
-fftw, gsl, goffice, libgsf }:
+{ lib, stdenv, fetchurl, pkg-config, glib, libxml2, flex, bison, vips, gtk2
+, fftw, gsl, goffice, libgsf }:
stdenv.mkDerivation rec {
pname = "nip2";
@@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
buildInputs =
[ pkg-config glib libxml2 flex bison vips
- gnome2.gtk fftw gsl goffice libgsf
+ gtk2 fftw gsl goffice libgsf
];
meta = with lib; {
diff --git a/third_party/nixpkgs/pkgs/tools/graphics/pdfread/default.nix b/third_party/nixpkgs/pkgs/tools/graphics/pdfread/default.nix
index 6201b2d588..8350e95188 100644
--- a/third_party/nixpkgs/pkgs/tools/graphics/pdfread/default.nix
+++ b/third_party/nixpkgs/pkgs/tools/graphics/pdfread/default.nix
@@ -13,8 +13,8 @@ stdenv.mkDerivation {
sha256 = "0mzxpnk97f0ww5ds7h4wsval3g4lnrhv6rhspjs7cy4i41gmk8an";
};
- nativeBuildInputs = [ makeWrapper ];
- buildInputs = [ unzip python ];
+ nativeBuildInputs = [ makeWrapper unzip ];
+ buildInputs = [ python ];
broken = true; # Not found.
diff --git a/third_party/nixpkgs/pkgs/tools/graphics/spirv-cross/default.nix b/third_party/nixpkgs/pkgs/tools/graphics/spirv-cross/default.nix
index cb5a37527b..19359698f0 100644
--- a/third_party/nixpkgs/pkgs/tools/graphics/spirv-cross/default.nix
+++ b/third_party/nixpkgs/pkgs/tools/graphics/spirv-cross/default.nix
@@ -17,7 +17,7 @@ stdenv.mkDerivation rec {
description = "A tool designed for parsing and converting SPIR-V to other shader languages";
homepage = "https://github.com/KhronosGroup/SPIRV-Cross";
changelog = "https://github.com/KhronosGroup/SPIRV-Cross/releases/tag/${version}";
- platforms = platforms.linux;
+ platforms = platforms.all;
license = licenses.asl20;
maintainers = with maintainers; [ Flakebi ];
};
diff --git a/third_party/nixpkgs/pkgs/tools/graphics/structure-synth/default.nix b/third_party/nixpkgs/pkgs/tools/graphics/structure-synth/default.nix
index a4772cad3c..5f6e655882 100644
--- a/third_party/nixpkgs/pkgs/tools/graphics/structure-synth/default.nix
+++ b/third_party/nixpkgs/pkgs/tools/graphics/structure-synth/default.nix
@@ -10,8 +10,8 @@ stdenv.mkDerivation {
sha256 = "1kiammx46719az6jzrav8yrwz82nk4m72ybj0kpbnvp9wfl3swbb";
};
- buildInputs = [ qt4 unzip libGLU ];
- nativeBuildInputs = [ qmake4Hook makeWrapper ];
+ buildInputs = [ qt4 libGLU ];
+ nativeBuildInputs = [ qmake4Hook makeWrapper unzip ];
# Thanks to https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=672000#15:
patches = [ ./gcc47.patch ];
diff --git a/third_party/nixpkgs/pkgs/tools/inputmethods/tegaki-zinnia-japanese/default.nix b/third_party/nixpkgs/pkgs/tools/inputmethods/tegaki-zinnia-japanese/default.nix
index 6829de9241..6274451364 100644
--- a/third_party/nixpkgs/pkgs/tools/inputmethods/tegaki-zinnia-japanese/default.nix
+++ b/third_party/nixpkgs/pkgs/tools/inputmethods/tegaki-zinnia-japanese/default.nix
@@ -17,7 +17,7 @@ stdenv.mkDerivation {
maintainers = [ maintainers.gebner ];
};
- buildInputs = [ unzip ];
+ nativeBuildInputs = [ unzip ];
makeFlags = [ "installpath=$(out)/share/tegaki/models/zinnia/" ];
}
diff --git a/third_party/nixpkgs/pkgs/tools/misc/abduco/default.nix b/third_party/nixpkgs/pkgs/tools/misc/abduco/default.nix
index dbba2193b1..9493df1c66 100644
--- a/third_party/nixpkgs/pkgs/tools/misc/abduco/default.nix
+++ b/third_party/nixpkgs/pkgs/tools/misc/abduco/default.nix
@@ -1,23 +1,23 @@
{ lib, stdenv, fetchFromGitHub, writeText, conf ? null }:
-with lib;
-
stdenv.mkDerivation rec {
- name = "abduco-2018-05-16";
+ pname = "abduco";
+ version = "2020-04-30";
src = fetchFromGitHub {
owner = "martanne";
repo = "abduco";
- rev = "8f80aa8044d7ecf0e43a0294a09007d056b20e4c";
- sha256 = "0wqcif633nbgnznn46j0sng9l0wncppw1x1c42f75b4p9hrph203";
+ rev = "8c32909a159aaa9484c82b71f05b7a73321eb491";
+ sha256 = "0a3p8xljhpk7zh203s75248blfir15smgw5jmszwbmdpy4mqzd53";
};
- configFile = optionalString (conf!=null) (writeText "config.def.h" conf);
- preBuild = optionalString (conf!=null) "cp ${configFile} config.def.h";
+ preBuild = lib.optionalString (conf != null)
+ "cp ${writeText "config.def.h" conf} config.def.h";
+ installFlags = [ "install-completion" ];
CFLAGS = lib.optionalString stdenv.isDarwin "-D_DARWIN_C_SOURCE";
- meta = {
+ meta = with lib; {
homepage = "http://brain-dump.org/projects/abduco";
license = licenses.isc;
description = "Allows programs to be run independently from its controlling terminal";
diff --git a/third_party/nixpkgs/pkgs/tools/misc/apparix/default.nix b/third_party/nixpkgs/pkgs/tools/misc/apparix/default.nix
index 7d8de2c143..d446a2cf0a 100644
--- a/third_party/nixpkgs/pkgs/tools/misc/apparix/default.nix
+++ b/third_party/nixpkgs/pkgs/tools/misc/apparix/default.nix
@@ -15,6 +15,6 @@ stdenv.mkDerivation rec {
description = "Add directory bookmarks, distant listing, and distant editing to the command line";
maintainers = with maintainers; [ lethalman ];
license = licenses.gpl2;
- platforms = platforms.linux;
+ platforms = platforms.all;
};
}
diff --git a/third_party/nixpkgs/pkgs/tools/misc/bash_unit/default.nix b/third_party/nixpkgs/pkgs/tools/misc/bash_unit/default.nix
index 2fd93cb33b..7541281eeb 100644
--- a/third_party/nixpkgs/pkgs/tools/misc/bash_unit/default.nix
+++ b/third_party/nixpkgs/pkgs/tools/misc/bash_unit/default.nix
@@ -21,7 +21,7 @@ stdenv.mkDerivation rec {
meta = with lib; {
description = "Bash unit testing enterprise edition framework for professionals";
maintainers = with maintainers; [ pamplemousse ];
- platforms = platforms.linux;
+ platforms = platforms.all;
license = licenses.gpl3Plus;
};
}
diff --git a/third_party/nixpkgs/pkgs/tools/misc/bbe/default.nix b/third_party/nixpkgs/pkgs/tools/misc/bbe/default.nix
index fb62b8be89..5cd7326d7b 100644
--- a/third_party/nixpkgs/pkgs/tools/misc/bbe/default.nix
+++ b/third_party/nixpkgs/pkgs/tools/misc/bbe/default.nix
@@ -16,7 +16,7 @@ stdenv.mkDerivation rec {
description = "A sed-like editor for binary files";
homepage = "http://bbe-.sourceforge.net/";
license = licenses.gpl2Plus;
- platforms = platforms.linux;
+ platforms = platforms.all;
maintainers = [ maintainers.hhm ];
};
}
diff --git a/third_party/nixpkgs/pkgs/tools/misc/bcunit/default.nix b/third_party/nixpkgs/pkgs/tools/misc/bcunit/default.nix
index bc3bbc8276..099ae294be 100644
--- a/third_party/nixpkgs/pkgs/tools/misc/bcunit/default.nix
+++ b/third_party/nixpkgs/pkgs/tools/misc/bcunit/default.nix
@@ -25,6 +25,6 @@ stdenv.mkDerivation rec {
homepage = "https://gitlab.linphone.org/BC/public/bcunit";
license = licenses.lgpl2Plus;
maintainers = with maintainers; [ raskin jluttine ];
- platforms = platforms.linux;
+ platforms = platforms.all;
};
}
diff --git a/third_party/nixpkgs/pkgs/tools/misc/cicero-tui/default.nix b/third_party/nixpkgs/pkgs/tools/misc/cicero-tui/default.nix
index e00ceb9517..dfc79e208a 100644
--- a/third_party/nixpkgs/pkgs/tools/misc/cicero-tui/default.nix
+++ b/third_party/nixpkgs/pkgs/tools/misc/cicero-tui/default.nix
@@ -10,13 +10,13 @@
rustPlatform.buildRustPackage rec {
pname = "cicero-tui";
- version = "0.1.4";
+ version = "0.2.0";
src = fetchFromGitHub {
owner = "eyeplum";
repo = "cicero-tui";
rev = "v${version}";
- sha256 = "1bz2y37qf9c3fxc73chb42rffdivp5krczhgd9rnwq5r6n6bdgq7";
+ sha256 = "sha256-TNNPTKLO5qjSeCxWb7bB4yV1J4Seu+tBKNs0Oav/pPE=";
};
nativeBuildInputs = [
@@ -29,7 +29,7 @@ rustPlatform.buildRustPackage rec {
freetype
];
- cargoSha256 = "04359gf9mirczqwh8jv3rf0cc4pp05r8ncqyz0n8r7x5qv77kgcp";
+ cargoSha256 = "sha256-kzU+i5DLmZULdJPURz10URE5sMUG6eQg0pCoEiyfgco=";
meta = with lib; {
description = "Unicode tool with a terminal user interface";
diff --git a/third_party/nixpkgs/pkgs/tools/misc/czkawka/default.nix b/third_party/nixpkgs/pkgs/tools/misc/czkawka/default.nix
new file mode 100644
index 0000000000..29748f781b
--- /dev/null
+++ b/third_party/nixpkgs/pkgs/tools/misc/czkawka/default.nix
@@ -0,0 +1,45 @@
+{ lib
+, rustPlatform
+, fetchFromGitHub
+, pkg-config
+, glib
+, cairo
+, pango
+, gdk-pixbuf
+, atk
+, gtk3
+}:
+
+rustPlatform.buildRustPackage rec {
+ pname = "czkawka";
+ version = "3.0.0";
+
+ src = fetchFromGitHub {
+ owner = "qarmin";
+ repo = pname;
+ rev = version;
+ sha256 = "1g5a9ns5lkiyk6hjsh08hgs41538dzj0a4lgn2c5cbad5psl0xa6";
+ };
+
+ cargoSha256 = "11ym2d7crp12w91111s3rv0gklkg2bzlq9g24cws4h7ipi0zfx5h";
+
+ nativeBuildInputs = [
+ pkg-config
+ ];
+
+ buildInputs = [
+ glib
+ cairo
+ pango
+ gdk-pixbuf
+ atk
+ gtk3
+ ];
+
+ meta = with lib; {
+ description = "A simple, fast and easy to use app to remove unnecessary files from your computer";
+ homepage = "https://github.com/qarmin/czkawka";
+ license = with licenses; [ mit ];
+ maintainers = with maintainers; [ yanganto ];
+ };
+}
diff --git a/third_party/nixpkgs/pkgs/tools/misc/debian-devscripts/default.nix b/third_party/nixpkgs/pkgs/tools/misc/debian-devscripts/default.nix
index cbeede0cc3..b2e753342d 100644
--- a/third_party/nixpkgs/pkgs/tools/misc/debian-devscripts/default.nix
+++ b/third_party/nixpkgs/pkgs/tools/misc/debian-devscripts/default.nix
@@ -16,8 +16,8 @@ in stdenv.mkDerivation rec {
sha256 = "0xy1nvqrnifx46g8ch69pk31by0va6hn10wpi1fkrsrgncanjjh1";
};
- nativeBuildInputs = [ makeWrapper ];
- buildInputs = [ unzip xz dpkg libxslt python setuptools curl gnupg diffutils ] ++
+ nativeBuildInputs = [ makeWrapper unzip ];
+ buildInputs = [ xz dpkg libxslt python setuptools curl gnupg diffutils ] ++
(with perlPackages; [ perl CryptSSLeay LWP TimeDate DBFile FileDesktopEntry ParseDebControl LWPProtocolHttps ]);
preConfigure = ''
diff --git a/third_party/nixpkgs/pkgs/tools/misc/ent/default.nix b/third_party/nixpkgs/pkgs/tools/misc/ent/default.nix
index 05dcd36c40..b0dc4f1e3d 100644
--- a/third_party/nixpkgs/pkgs/tools/misc/ent/default.nix
+++ b/third_party/nixpkgs/pkgs/tools/misc/ent/default.nix
@@ -12,7 +12,7 @@ stdenv.mkDerivation {
# case that happens when the archive doesn't have a subdirectory.
setSourceRoot = "sourceRoot=`pwd`";
- buildInputs = [ unzip ];
+ nativeBuildInputs = [ unzip ];
buildFlags = lib.optional stdenv.cc.isClang "CC=clang";
diff --git a/third_party/nixpkgs/pkgs/tools/misc/execline/default.nix b/third_party/nixpkgs/pkgs/tools/misc/execline/default.nix
index 887671b489..705a8a554c 100644
--- a/third_party/nixpkgs/pkgs/tools/misc/execline/default.nix
+++ b/third_party/nixpkgs/pkgs/tools/misc/execline/default.nix
@@ -4,8 +4,8 @@ with skawarePackages;
buildPackage {
pname = "execline";
- version = "2.7.0.0";
- sha256 = "0kl74yix60msgw8k3shhp9ymm80n91yxxqckixj5qbbhmylpnpqd";
+ version = "2.8.0.0";
+ sha256 = "0vbn4pdazy6x6213vn42k0khcij5bvkbrcfg7nw6inhf8154nx77";
description = "A small scripting language, to be used in place of a shell in non-interactive scripts";
diff --git a/third_party/nixpkgs/pkgs/tools/misc/fdtools/default.nix b/third_party/nixpkgs/pkgs/tools/misc/fdtools/default.nix
index d096f903bd..2a2f44d818 100644
--- a/third_party/nixpkgs/pkgs/tools/misc/fdtools/default.nix
+++ b/third_party/nixpkgs/pkgs/tools/misc/fdtools/default.nix
@@ -23,6 +23,9 @@ in stdenv.mkDerivation {
sed -e 's|gcc|$CC|' \
conf-compile/defaults/host_link.sh \
> conf-compile/host_link.sh
+ sed -e 's|gcc|$CC|' \
+ conf-compile/defaults/host_compile.sh \
+ > conf-compile/host_compile.sh
echo "${skawarePackages.skalibs.lib}/lib/skalibs/sysdeps" \
> conf-compile/depend_skalibs_sysdeps
diff --git a/third_party/nixpkgs/pkgs/tools/misc/gams/default.nix b/third_party/nixpkgs/pkgs/tools/misc/gams/default.nix
index f91acbf264..c6bd2c5384 100644
--- a/third_party/nixpkgs/pkgs/tools/misc/gams/default.nix
+++ b/third_party/nixpkgs/pkgs/tools/misc/gams/default.nix
@@ -10,7 +10,8 @@ stdenv.mkDerivation rec {
sha256 = "4f95389579f33ff7c2586838a2c19021aa0746279555cbb51aa6e0efd09bd297";
};
unpackCmd = "unzip $src";
- buildInputs = [ unzip file ];
+ nativeBuildInputs = [ unzip ];
+ buildInputs = [ file ];
dontBuild = true;
installPhase = ''
diff --git a/third_party/nixpkgs/pkgs/tools/misc/git-fire/default.nix b/third_party/nixpkgs/pkgs/tools/misc/git-fire/default.nix
index bba1bd65a5..15dc34cd52 100644
--- a/third_party/nixpkgs/pkgs/tools/misc/git-fire/default.nix
+++ b/third_party/nixpkgs/pkgs/tools/misc/git-fire/default.nix
@@ -23,7 +23,7 @@ stdenv.mkDerivation {
'';
homepage = "https://github.com/qw3rtman/git-fire";
license = licenses.mit;
- platforms = platforms.linux;
+ platforms = platforms.all;
maintainers = [ maintainers.swflint ];
};
}
diff --git a/third_party/nixpkgs/pkgs/tools/misc/graylog/plugins.nix b/third_party/nixpkgs/pkgs/tools/misc/graylog/plugins.nix
index 0355fe58f4..8df7f34bb2 100644
--- a/third_party/nixpkgs/pkgs/tools/misc/graylog/plugins.nix
+++ b/third_party/nixpkgs/pkgs/tools/misc/graylog/plugins.nix
@@ -15,7 +15,7 @@ let
stdenv.mkDerivation (a // {
inherit installPhase;
dontUnpack = true;
- buildInputs = [ unzip ];
+ nativeBuildInputs = [ unzip ];
meta = a.meta // {
platforms = graylog.meta.platforms;
maintainers = (a.meta.maintainers or []) ++ [ maintainers.fadenb ];
diff --git a/third_party/nixpkgs/pkgs/tools/misc/jdiskreport/default.nix b/third_party/nixpkgs/pkgs/tools/misc/jdiskreport/default.nix
index 117199617e..abd8398601 100644
--- a/third_party/nixpkgs/pkgs/tools/misc/jdiskreport/default.nix
+++ b/third_party/nixpkgs/pkgs/tools/misc/jdiskreport/default.nix
@@ -18,8 +18,7 @@ stdenv.mkDerivation {
sha256 = "0d5mzkwsbh9s9b1vyvpaawqc09b0q41l2a7pmwf7386b1fsx6d58";
};
- nativeBuildInputs = [ copyDesktopItems ];
- buildInputs = [ unzip ];
+ nativeBuildInputs = [ copyDesktopItems unzip ];
inherit jre;
installPhase = ''
diff --git a/third_party/nixpkgs/pkgs/tools/misc/mc/default.nix b/third_party/nixpkgs/pkgs/tools/misc/mc/default.nix
index d2456a08cb..12aa477219 100644
--- a/third_party/nixpkgs/pkgs/tools/misc/mc/default.nix
+++ b/third_party/nixpkgs/pkgs/tools/misc/mc/default.nix
@@ -27,7 +27,7 @@ stdenv.mkDerivation rec {
sha256 = "sha256-xt6txQWV8tmiLcbCmanyizk+NYNG6/bKREqEadwWbCc=";
};
- nativeBuildInputs = [ pkg-config autoreconfHook ];
+ nativeBuildInputs = [ pkg-config autoreconfHook unzip ];
buildInputs = [
file
@@ -39,7 +39,6 @@ stdenv.mkDerivation rec {
openssl
perl
slang
- unzip
zip
] ++ lib.optionals (!stdenv.isDarwin) [ e2fsprogs gpm ];
diff --git a/third_party/nixpkgs/pkgs/tools/misc/megacli/default.nix b/third_party/nixpkgs/pkgs/tools/misc/megacli/default.nix
index 7cf1e14dc1..3f86a073c0 100644
--- a/third_party/nixpkgs/pkgs/tools/misc/megacli/default.nix
+++ b/third_party/nixpkgs/pkgs/tools/misc/megacli/default.nix
@@ -9,7 +9,8 @@ stdenv.mkDerivation rec {
sha256 = "1sdn58fbmd3fj4nzbajq3gcyw71ilgdh45r5p4sa6xmb7np55cfr";
};
- buildInputs = [rpmextract ncurses5 unzip];
+ nativeBuildInputs = [ unzip ];
+ buildInputs = [rpmextract ncurses5];
libPath =
lib.makeLibraryPath
[ stdenv.cc.cc stdenv.cc.libc ncurses5 ];
diff --git a/third_party/nixpkgs/pkgs/tools/misc/ministat/default.nix b/third_party/nixpkgs/pkgs/tools/misc/ministat/default.nix
index 68670599c1..0cd3ff3a5c 100644
--- a/third_party/nixpkgs/pkgs/tools/misc/ministat/default.nix
+++ b/third_party/nixpkgs/pkgs/tools/misc/ministat/default.nix
@@ -26,6 +26,6 @@ stdenv.mkDerivation rec {
homepage = "https://git.decadent.org.uk/gitweb/?p=ministat.git";
license = licenses.beerware;
maintainers = [ maintainers.dezgeg ];
- platforms = platforms.linux;
+ platforms = platforms.all;
};
}
diff --git a/third_party/nixpkgs/pkgs/tools/misc/nncp/default.nix b/third_party/nixpkgs/pkgs/tools/misc/nncp/default.nix
index 4469f130b5..4c03172d9a 100644
--- a/third_party/nixpkgs/pkgs/tools/misc/nncp/default.nix
+++ b/third_party/nixpkgs/pkgs/tools/misc/nncp/default.nix
@@ -1,6 +1,7 @@
{ lib, stdenv
, go
, fetchurl
+, redo-apenwarr
, curl
, perl
, genericUpdater
@@ -9,24 +10,33 @@
stdenv.mkDerivation rec {
pname = "nncp";
- version = "5.3.3";
+ version = "6.2.0";
src = fetchurl {
url = "http://www.nncpgo.org/download/${pname}-${version}.tar.xz";
- sha256 = "1l35ndzrvpfim29jn1p0bwmc8w892z44nsrdnay28k229r9dhz3h";
+ sha256 = "1zj0v82zqigcxhpc50mvafvi1ihs92ck35vjfrwb7wzzd7nysb17";
};
- nativeBuildInputs = [ go ];
+ nativeBuildInputs = [ go redo-apenwarr ];
- preConfigure = ''
+ buildPhase = ''
+ runHook preBuild
export GOCACHE=$PWD/.cache
+ export CFGPATH=/etc/nncp.hjson
+ export SENDMAIL=sendmail # default value for generated config file
+ redo ''${enableParallelBuilding:+-j''${NIX_BUILD_CORES}}
+ runHook postBuild
'';
- makeFlags = [
- "PREFIX=${placeholder "out"}"
- "CFGPATH=/etc/nncp.hjson"
- "SENDMAIL=/run/wrappers/bin/sendmail"
- ];
+ installPhase = ''
+ runHook preInstall
+ export PREFIX=$out
+ rm -f INSTALL # work around case insensitivity
+ redo install
+ runHook postInstall
+ '';
+
+ enableParallelBuilding = true;
passthru.updateScript = genericUpdater {
inherit pname version;
@@ -54,7 +64,7 @@ stdenv.mkDerivation rec {
transmission exists.
'';
homepage = "http://www.nncpgo.org/";
- license = licenses.gpl3;
+ license = licenses.gpl3Only;
platforms = platforms.all;
maintainers = [ maintainers.woffs ];
};
diff --git a/third_party/nixpkgs/pkgs/tools/misc/partition-manager/default.nix b/third_party/nixpkgs/pkgs/tools/misc/partition-manager/default.nix
index 845c0fec92..064590ef97 100644
--- a/third_party/nixpkgs/pkgs/tools/misc/partition-manager/default.nix
+++ b/third_party/nixpkgs/pkgs/tools/misc/partition-manager/default.nix
@@ -1,30 +1,66 @@
-{ mkDerivation, fetchurl, lib
+{ mkDerivation, fetchurl, lib, makeWrapper
, extra-cmake-modules, kdoctools, wrapGAppsHook, wrapQtAppsHook
, kconfig, kcrash, kinit, kpmcore
-, eject, libatasmart , util-linux, qtbase
+, cryptsetup, lvm2, mdadm, smartmontools, systemdMinimal, util-linux
+, btrfs-progs, dosfstools, e2fsprogs, exfat, f2fs-tools, fatresize, hfsprogs
+, jfsutils, nilfs-utils, ntfs3g, reiser4progs, reiserfsprogs, udftools, xfsprogs, zfs
}:
let
- pname = "partitionmanager";
+ # External programs are resolved by `partition-manager` and then
+ # invoked by `kpmcore_externalcommand` from `kpmcore` as root.
+ # So these packages should be in PATH of `partition-manager`.
+ # https://github.com/KDE/kpmcore/blob/06f15334ecfbe871730a90dbe2b694ba060ee998/src/util/externalcommand_whitelist.h
+ runtimeDeps = lib.makeBinPath [
+ cryptsetup
+ lvm2
+ mdadm
+ smartmontools
+ systemdMinimal
+ util-linux
+
+ btrfs-progs
+ dosfstools
+ e2fsprogs
+ exfat
+ f2fs-tools
+ fatresize
+ hfsprogs
+ jfsutils
+ nilfs-utils
+ ntfs3g
+ reiser4progs
+ reiserfsprogs
+ udftools
+ xfsprogs
+ zfs
+
+ # FIXME: Missing command: tune.exfat hfsck hformat fsck.nilfs2 {fsck,mkfs,debugfs,tunefs}.ocfs2
+ ];
+
in mkDerivation rec {
- name = "${pname}-${version}";
- version = "3.3.1";
+ pname = "partitionmanager";
+ # NOTE: When changing this version, also change the version of `kpmcore`.
+ version = "4.2.0";
src = fetchurl {
- url = "mirror://kde/stable/${pname}/${version}/src/${name}.tar.xz";
- sha256 = "0jhggb4xksb0k0mj752n6pz0xmccnbzlp984xydqbz3hkigra1si";
+ url = "mirror://kde/stable/${pname}/${version}/src/${pname}-${version}.tar.xz";
+ hash = "sha256-6Qlt1c47Eek6TkWWBzTyBZYJ1jfhtwsC9X5q5h6IhPg=";
};
- nativeBuildInputs = [ extra-cmake-modules kdoctools wrapGAppsHook wrapQtAppsHook ];
+ nativeBuildInputs = [ extra-cmake-modules kdoctools wrapGAppsHook wrapQtAppsHook makeWrapper ];
- # refer to kpmcore for the use of eject
- buildInputs = [ eject libatasmart util-linux ];
propagatedBuildInputs = [ kconfig kcrash kinit kpmcore ];
+ postFixup = ''
+ wrapProgram $out/bin/partitionmanager \
+ --prefix PATH : "${runtimeDeps}"
+ '';
+
meta = with lib; {
description = "KDE Partition Manager";
- license = licenses.gpl2;
+ license = with licenses; [ cc-by-40 cc0 gpl3Plus lgpl3Plus mit ];
homepage = "https://www.kde.org/applications/system/kdepartitionmanager/";
- maintainers = with maintainers; [ peterhoeg ];
+ maintainers = with maintainers; [ peterhoeg oxalica ];
};
}
diff --git a/third_party/nixpkgs/pkgs/tools/misc/phoronix-test-suite/default.nix b/third_party/nixpkgs/pkgs/tools/misc/phoronix-test-suite/default.nix
index 348670c3bb..971f924faa 100644
--- a/third_party/nixpkgs/pkgs/tools/misc/phoronix-test-suite/default.nix
+++ b/third_party/nixpkgs/pkgs/tools/misc/phoronix-test-suite/default.nix
@@ -2,11 +2,11 @@
stdenv.mkDerivation rec {
pname = "phoronix-test-suite";
- version = "10.2.1";
+ version = "10.2.2";
src = fetchurl {
url = "https://phoronix-test-suite.com/releases/${pname}-${version}.tar.gz";
- sha256 = "sha256-2HB4TPbyG+cTY6O1k0tRPrnKyg41SYnVM919Hii3gpg=";
+ sha256 = "sha256-g5hUmsn01Msopxzmi/G4LcZISXMD2wFqreaHMkFzF1Y=";
};
buildInputs = [ php ];
diff --git a/third_party/nixpkgs/pkgs/tools/misc/sfeed/default.nix b/third_party/nixpkgs/pkgs/tools/misc/sfeed/default.nix
index 57e49c8874..93ef69ea2e 100644
--- a/third_party/nixpkgs/pkgs/tools/misc/sfeed/default.nix
+++ b/third_party/nixpkgs/pkgs/tools/misc/sfeed/default.nix
@@ -27,6 +27,6 @@ stdenv.mkDerivation rec {
'';
license = licenses.isc;
maintainers = [ maintainers.matthiasbeyer ];
- platforms = platforms.linux;
+ platforms = platforms.all;
};
}
diff --git a/third_party/nixpkgs/pkgs/tools/misc/shelldap/default.nix b/third_party/nixpkgs/pkgs/tools/misc/shelldap/default.nix
index 18c5aea3df..c782b12920 100644
--- a/third_party/nixpkgs/pkgs/tools/misc/shelldap/default.nix
+++ b/third_party/nixpkgs/pkgs/tools/misc/shelldap/default.nix
@@ -6,7 +6,7 @@ perlPackages.buildPerlPackage rec {
url = "https://bitbucket.org/mahlon/shelldap/downloads/shelldap-${version}.tar.gz";
sha256 = "07gkvvxcgw3pgkfy8p9mmidakciaq1rsq5zhmdqd8zcwgqkrr24i";
};
- buildInputs = with perlPackages; [ perl YAMLSyck NetLDAP AlgorithmDiff IOSocketSSL AuthenSASL TermReadLineGnu TermShell ];
+ buildInputs = with perlPackages; [ perl YAMLSyck perlldap AlgorithmDiff IOSocketSSL AuthenSASL TermReadLineGnu TermShell ];
prePatch = ''
touch Makefile.PL
'';
diff --git a/third_party/nixpkgs/pkgs/tools/misc/tea/default.nix b/third_party/nixpkgs/pkgs/tools/misc/tea/default.nix
new file mode 100644
index 0000000000..06e54559db
--- /dev/null
+++ b/third_party/nixpkgs/pkgs/tools/misc/tea/default.nix
@@ -0,0 +1,21 @@
+{ lib, buildGoModule, fetchgit }:
+
+buildGoModule rec {
+ pname = "tea";
+ version = "0.7.0";
+
+ src = fetchgit {
+ url = "https://gitea.com/gitea/tea";
+ rev = "v${version}";
+ sha256 = "sha256-Kq+A6YELfBJ04t7pPnX8Ulh4NSMFn3AHggplLD9J8MY=";
+ };
+
+ vendorSha256 = null;
+
+ meta = with lib; {
+ description = "Gitea official CLI client";
+ homepage = "https://gitea.com/gitea/tea";
+ license = licenses.mit;
+ maintainers = [ maintainers.j4m3s ];
+ };
+}
diff --git a/third_party/nixpkgs/pkgs/tools/misc/thin-provisioning-tools/default.nix b/third_party/nixpkgs/pkgs/tools/misc/thin-provisioning-tools/default.nix
index 794e0d4e25..bff6c9c968 100644
--- a/third_party/nixpkgs/pkgs/tools/misc/thin-provisioning-tools/default.nix
+++ b/third_party/nixpkgs/pkgs/tools/misc/thin-provisioning-tools/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, fetchFromGitHub, autoreconfHook, expat, libaio, boost, binutils }:
+{ lib, stdenv, fetchFromGitHub, autoreconfHook, expat, libaio, boost }:
stdenv.mkDerivation rec {
pname = "thin-provisioning-tools";
@@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
nativeBuildInputs = [ autoreconfHook ];
- buildInputs = [ expat libaio boost binutils ];
+ buildInputs = [ expat libaio boost ];
enableParallelBuilding = true;
diff --git a/third_party/nixpkgs/pkgs/tools/misc/umlet/default.nix b/third_party/nixpkgs/pkgs/tools/misc/umlet/default.nix
index a073417be7..d88e0bdea1 100644
--- a/third_party/nixpkgs/pkgs/tools/misc/umlet/default.nix
+++ b/third_party/nixpkgs/pkgs/tools/misc/umlet/default.nix
@@ -11,7 +11,7 @@ stdenv.mkDerivation rec {
sha256 = "0jfyxjxsjx29xhs3fl0f574nyncmk9j5jp8zlgd401mcaznn9c7l";
};
- buildInputs = [ unzip ];
+ nativeBuildInputs = [ unzip ];
installPhase = ''
mkdir -p "$out/bin"
diff --git a/third_party/nixpkgs/pkgs/tools/misc/usbview/default.nix b/third_party/nixpkgs/pkgs/tools/misc/usbview/default.nix
new file mode 100644
index 0000000000..2f417ea86d
--- /dev/null
+++ b/third_party/nixpkgs/pkgs/tools/misc/usbview/default.nix
@@ -0,0 +1,36 @@
+{ lib
+, stdenv
+, fetchFromGitHub
+, autoreconfHook
+, pkg-config
+, gtk3
+}:
+
+stdenv.mkDerivation rec {
+ pname = "usbview";
+ version = "2.0";
+
+ src = fetchFromGitHub {
+ owner = "gregkh";
+ repo = "usbview";
+ rev = "v${version}";
+ sha256 = "1cw5jjpidjn34rxdjslpdlj99k4dqaq1kz6mplv5hgjdddijvn5p";
+ };
+
+ nativeBuildInputs = [
+ autoreconfHook
+ pkg-config
+ ];
+
+ buildInputs = [
+ gtk3
+ ];
+
+ meta = with lib; {
+ description = "USB viewer for Linux";
+ license = licenses.gpl2Only;
+ homepage = "http://www.kroah.com/linux-usb/";
+ maintainers = with maintainers; [ shamilton ];
+ platforms = platforms.linux;
+ };
+}
diff --git a/third_party/nixpkgs/pkgs/tools/misc/vimer/default.nix b/third_party/nixpkgs/pkgs/tools/misc/vimer/default.nix
index 1fbb85f075..bbab2d64bb 100644
--- a/third_party/nixpkgs/pkgs/tools/misc/vimer/default.nix
+++ b/third_party/nixpkgs/pkgs/tools/misc/vimer/default.nix
@@ -25,7 +25,7 @@ stdenv.mkDerivation rec {
'';
license = licenses.mit;
maintainers = [ maintainers.matthiasbeyer ];
- platforms = platforms.linux;
+ platforms = platforms.all;
};
}
diff --git a/third_party/nixpkgs/pkgs/tools/misc/vorbisgain/default.nix b/third_party/nixpkgs/pkgs/tools/misc/vorbisgain/default.nix
index fe405b0eaa..6cc13e6f87 100644
--- a/third_party/nixpkgs/pkgs/tools/misc/vorbisgain/default.nix
+++ b/third_party/nixpkgs/pkgs/tools/misc/vorbisgain/default.nix
@@ -10,7 +10,8 @@ stdenv.mkDerivation rec {
hardeningDisable = [ "format" ];
- buildInputs = [ unzip libogg libvorbis ];
+ nativeBuildInputs = [ unzip ];
+ buildInputs = [ libogg libvorbis ];
patchPhase = ''
chmod -v +x configure
diff --git a/third_party/nixpkgs/pkgs/tools/misc/youtube-dl/default.nix b/third_party/nixpkgs/pkgs/tools/misc/youtube-dl/default.nix
index 96a4b8e7fe..fc3b52878b 100644
--- a/third_party/nixpkgs/pkgs/tools/misc/youtube-dl/default.nix
+++ b/third_party/nixpkgs/pkgs/tools/misc/youtube-dl/default.nix
@@ -18,11 +18,11 @@ buildPythonPackage rec {
# The websites youtube-dl deals with are a very moving target. That means that
# downloads break constantly. Because of that, updates should always be backported
# to the latest stable release.
- version = "2021.03.03";
+ version = "2021.03.14";
src = fetchurl {
url = "https://yt-dl.org/downloads/${version}/${pname}-${version}.tar.gz";
- sha256 = "11z2v8mdii0bl13850mc6hgz80d0kgzb4hdxyikc3wa4jqfwrq7f";
+ sha256 = "1bh74f9q6dv17ah5x8zcxw03dq6jbh959xd39kw374cf9ifrgnd3";
};
nativeBuildInputs = [ installShellFiles makeWrapper ];
diff --git a/third_party/nixpkgs/pkgs/tools/networking/altermime/default.nix b/third_party/nixpkgs/pkgs/tools/networking/altermime/default.nix
index c28df46145..703af40864 100644
--- a/third_party/nixpkgs/pkgs/tools/networking/altermime/default.nix
+++ b/third_party/nixpkgs/pkgs/tools/networking/altermime/default.nix
@@ -1,12 +1,11 @@
-{ lib, stdenv, fetchurl }:
+{ lib, gccStdenv, fetchurl }:
-stdenv.mkDerivation rec {
- baseName = "altermime";
- name = "${baseName}-${version}";
+gccStdenv.mkDerivation rec {
+ pname = "altermime";
version = "0.3.11";
src = fetchurl {
- url = "https://pldaniels.com/${baseName}/${name}.tar.gz";
+ url = "https://pldaniels.com/${pname}/${pname}-${version}.tar.gz";
sha256 = "15zxg6spcmd35r6xbidq2fgcg2nzyv1sbbqds08lzll70mqx4pj7";
};
@@ -19,14 +18,14 @@ stdenv.mkDerivation rec {
];
postPatch = ''
- sed -i Makefile -e "s@/usr/local@$out@"
- mkdir -p "$out/bin"
+ mkdir -p $out/bin
+ substituteInPlace Makefile --replace "/usr/local" "$out"
'';
meta = with lib; {
description = "MIME alteration tool";
maintainers = [ maintainers.raskin ];
- platforms = platforms.linux;
+ platforms = platforms.all;
license.fullName = "alterMIME LICENSE";
downloadPage = "https://pldaniels.com/altermime/";
};
diff --git a/third_party/nixpkgs/pkgs/tools/networking/assh/default.nix b/third_party/nixpkgs/pkgs/tools/networking/assh/default.nix
index 3995fc295d..7a7bb0ab51 100644
--- a/third_party/nixpkgs/pkgs/tools/networking/assh/default.nix
+++ b/third_party/nixpkgs/pkgs/tools/networking/assh/default.nix
@@ -2,13 +2,13 @@
buildGoModule rec {
pname = "assh";
- version = "2.11.0";
+ version = "2.11.3";
src = fetchFromGitHub {
repo = "advanced-ssh-config";
owner = "moul";
rev = "v${version}";
- sha256 = "sha256-/StB5yee9sbkebuJt6JDI+bp52NG0bBhprzmdepL+ek=";
+ sha256 = "sha256-NH7Dmqsu7uRhKWGFHBnh5GGqsNFOijDxsc+ATt28jtY=";
};
vendorSha256 = "sha256-6OAsO7zWAgPfQWD9k+nYH7hnDDUlKIjTB61ivvoubn0=";
diff --git a/third_party/nixpkgs/pkgs/tools/networking/dd-agent/5.nix b/third_party/nixpkgs/pkgs/tools/networking/dd-agent/5.nix
index c220f24046..af4ae7ed76 100644
--- a/third_party/nixpkgs/pkgs/tools/networking/dd-agent/5.nix
+++ b/third_party/nixpkgs/pkgs/tools/networking/dd-agent/5.nix
@@ -19,10 +19,9 @@ let
requests
websocket_client
ipaddress
- backports_ssl_match_hostname
docker_pycreds
uptime
- ];
+ ] ++ lib.optionals (self.pythonOlder "3.7") [ backports_ssl_match_hostname ];
# due to flake8
doCheck = false;
@@ -51,8 +50,8 @@ in stdenv.mkDerivation rec {
patches = [ ./40103-iostat-fix.patch ];
+ nativeBuildInputs = [ unzip ];
buildInputs = [
- unzip
makeWrapper
] ++ (with python'.pkgs; [
requests
diff --git a/third_party/nixpkgs/pkgs/tools/networking/dhcping/default.nix b/third_party/nixpkgs/pkgs/tools/networking/dhcping/default.nix
index d4255d4609..f1f8cd8b5e 100644
--- a/third_party/nixpkgs/pkgs/tools/networking/dhcping/default.nix
+++ b/third_party/nixpkgs/pkgs/tools/networking/dhcping/default.nix
@@ -27,6 +27,6 @@ stdenv.mkDerivation rec {
'';
homepage = "http://www.mavetju.org/unix/general.php";
license = licenses.bsd2;
- platforms = platforms.linux;
+ platforms = platforms.unix;
};
}
diff --git a/third_party/nixpkgs/pkgs/tools/networking/dnsperf/default.nix b/third_party/nixpkgs/pkgs/tools/networking/dnsperf/default.nix
index e440567036..671a80e578 100644
--- a/third_party/nixpkgs/pkgs/tools/networking/dnsperf/default.nix
+++ b/third_party/nixpkgs/pkgs/tools/networking/dnsperf/default.nix
@@ -1,17 +1,17 @@
{ lib, stdenv, fetchurl, fetchFromGitHub, autoreconfHook, pkg-config
-, openssl, ldns
+, openssl, ldns, libck
}:
stdenv.mkDerivation rec {
pname = "dnsperf";
- version = "2.4.0";
+ version = "2.5.0";
# The same as the initial commit of the new GitHub repo (only readme changed).
src = fetchFromGitHub {
owner = "DNS-OARC";
repo = "dnsperf";
rev = "v${version}";
- sha256 = "0q7zmzhhx71v41wf6rhyvpil43ch4a9sx21x47wgcg362lca3cbz";
+ sha256 = "0wcjs512in9w36hbn4mffca02cn5df3s1x7zaj02qv8na5nqq11m";
};
outputs = [ "out" "man" "doc" ];
@@ -21,6 +21,7 @@ stdenv.mkDerivation rec {
buildInputs = [
openssl
ldns # optional for DDNS (but cheap anyway)
+ libck
];
doCheck = true;
diff --git a/third_party/nixpkgs/pkgs/tools/networking/frp/default.nix b/third_party/nixpkgs/pkgs/tools/networking/frp/default.nix
index bc92d46569..375d0dc162 100644
--- a/third_party/nixpkgs/pkgs/tools/networking/frp/default.nix
+++ b/third_party/nixpkgs/pkgs/tools/networking/frp/default.nix
@@ -2,16 +2,16 @@
buildGoModule rec {
pname = "frp";
- version = "0.35.1";
+ version = "0.36.0";
src = fetchFromGitHub {
owner = "fatedier";
repo = pname;
rev = "v${version}";
- sha256 = "sha256-QnD8Yo1GLlOuCnYgzAIGW8JQ5yihmAZGqDFJ412L+W0=";
+ sha256 = "sha256-5BwSRHqsCLAD/p8U0zblAhtkpzkPVzHvS4VaTAYNF9o=";
};
- vendorSha256 = "sha256-odZPXLn5la2x9QIlT3g7+Rxb9tXGhjTycEvJPUPbM2s=";
+ vendorSha256 = "sha256-Q4ZwCH/RTa8cLtSg06s1S790MdZLgfWOvaD+WAt/RBM=";
doCheck = false;
diff --git a/third_party/nixpkgs/pkgs/tools/networking/httperf/default.nix b/third_party/nixpkgs/pkgs/tools/networking/httperf/default.nix
index f5c888dc4b..ea567f10d4 100644
--- a/third_party/nixpkgs/pkgs/tools/networking/httperf/default.nix
+++ b/third_party/nixpkgs/pkgs/tools/networking/httperf/default.nix
@@ -31,7 +31,7 @@ stdenv.mkDerivation rec {
homepage = "https://github.com/httperf/httperf";
maintainers = with maintainers; [ nand0p ];
license = licenses.gpl2;
- platforms = platforms.linux;
+ platforms = platforms.all;
};
}
diff --git a/third_party/nixpkgs/pkgs/tools/networking/kapp/default.nix b/third_party/nixpkgs/pkgs/tools/networking/kapp/default.nix
index dfb6413487..2ff2fd8dae 100644
--- a/third_party/nixpkgs/pkgs/tools/networking/kapp/default.nix
+++ b/third_party/nixpkgs/pkgs/tools/networking/kapp/default.nix
@@ -1,4 +1,4 @@
-{ lib, buildGoModule, fetchFromGitHub }:
+{ lib, buildGoModule, fetchFromGitHub, installShellFiles }:
buildGoModule rec {
pname = "kapp";
version = "0.36.0";
@@ -14,6 +14,15 @@ buildGoModule rec {
subPackages = [ "cmd/kapp" ];
+ nativeBuildInputs = [ installShellFiles ];
+
+ postInstall = ''
+ for shell in bash fish zsh; do
+ $out/bin/kapp completion $shell > kapp.$shell
+ installShellCompletion kapp.$shell
+ done
+ '';
+
meta = with lib; {
description = "CLI tool that encourages Kubernetes users to manage bulk resources with an application abstraction for grouping";
homepage = "https://get-kapp.io";
diff --git a/third_party/nixpkgs/pkgs/tools/networking/openvpn/default.nix b/third_party/nixpkgs/pkgs/tools/networking/openvpn/default.nix
index 3337a5bbb7..dd5fa9cbed 100644
--- a/third_party/nixpkgs/pkgs/tools/networking/openvpn/default.nix
+++ b/third_party/nixpkgs/pkgs/tools/networking/openvpn/default.nix
@@ -3,20 +3,17 @@
, pkg-config
, makeWrapper
, runtimeShell
-, iproute ? null
+, iproute
, lzo
, openssl
, pam
, useSystemd ? stdenv.isLinux
-, systemd ? null
-, util-linux ? null
+, systemd
+, util-linux
, pkcs11Support ? false
-, pkcs11helper ? null
+, pkcs11helper
}:
-assert useSystemd -> (systemd != null);
-assert pkcs11Support -> (pkcs11helper != null);
-
with lib;
let
# Check if the script needs to have other binaries wrapped when changing this.
diff --git a/third_party/nixpkgs/pkgs/tools/networking/p2p/azureus/default.nix b/third_party/nixpkgs/pkgs/tools/networking/p2p/azureus/default.nix
index 6453b2fbb1..1c72be0c51 100644
--- a/third_party/nixpkgs/pkgs/tools/networking/p2p/azureus/default.nix
+++ b/third_party/nixpkgs/pkgs/tools/networking/p2p/azureus/default.nix
@@ -7,7 +7,7 @@ stdenv.mkDerivation {
url = "http://tarballs.nixos.org/Azureus2.3.0.6.jar";
sha256 = "1hwrh3n0b0jbpsdk15zrs7pw175418phhmg6pn4xi1bvilxq1wrd";
};
-# buildInputs = [unzip];
+
inherit jdk swt;
meta = {
diff --git a/third_party/nixpkgs/pkgs/tools/networking/s6-networking/default.nix b/third_party/nixpkgs/pkgs/tools/networking/s6-networking/default.nix
index e7dd075df1..6159201bac 100644
--- a/third_party/nixpkgs/pkgs/tools/networking/s6-networking/default.nix
+++ b/third_party/nixpkgs/pkgs/tools/networking/s6-networking/default.nix
@@ -19,8 +19,8 @@ assert sslSupportEnabled -> sslLibs ? ${sslSupport};
buildPackage {
pname = "s6-networking";
- version = "2.4.0.0";
- sha256 = "1yqykwfl5jnkxgr6skfj5kzd896pknij0hi5m7lj0r18jpfs5zgq";
+ version = "2.4.1.0";
+ sha256 = "023wnayv1gddklnsh3qv7i5jfy2fisbp24wa0nzjg0nfq3p807yc";
description = "A suite of small networking utilities for Unix systems";
diff --git a/third_party/nixpkgs/pkgs/tools/networking/v2ray/default.nix b/third_party/nixpkgs/pkgs/tools/networking/v2ray/default.nix
index 852cd23360..7515105948 100644
--- a/third_party/nixpkgs/pkgs/tools/networking/v2ray/default.nix
+++ b/third_party/nixpkgs/pkgs/tools/networking/v2ray/default.nix
@@ -3,22 +3,22 @@
}:
let
- version = "4.35.1";
+ version = "4.36.2";
src = fetchFromGitHub {
owner = "v2fly";
repo = "v2ray-core";
rev = "v${version}";
- sha256 = "07fih1hnnv1a4aj6sb63408vqf10bgk74lhqqv63lvm7gaz73srd";
+ sha256 = "1gvzr4kq4klld8m0jv6mizgrx3xj6s2i69kl9vmh5n355bakb7kk";
};
- vendorSha256 = "sha256-+kI9p0lu4PbLe6jhWqTfRYXHFOOrKmY36LzdcQT9BWw=";
+ vendorSha256 = "sha256-8O0xUNIdu3W//LtwiMZlSs1wkpa6Jt+vFkTavz6TBKU=";
assets = {
# MIT licensed
"geoip.dat" = let
- geoipRev = "202103080146";
- geoipSha256 = "1qwmz5fxqqxcjw5jm9dvgpmbin2q69j9wdx4xv3pm8fc47wzx8w5";
+ geoipRev = "202103170314";
+ geoipSha256 = "147kajdhby92yxsvcpa6bpk11ilzvc4nj7rc0h84wp2f0y692kq2";
in fetchurl {
url = "https://github.com/v2fly/geoip/releases/download/${geoipRev}/geoip.dat";
sha256 = geoipSha256;
@@ -26,8 +26,8 @@ let
# MIT licensed
"geosite.dat" = let
- geositeRev = "20210308021214";
- geositeSha256 = "1fp787wlzdjn2gxx4zmqrqqzqcq4xd10pqx8q919fag0kkzdm23s";
+ geositeRev = "20210317031429";
+ geositeSha256 = "0nzd0ll0x7hv75cbh1i3kgmffasi002a8n3mjw22zywj71v2jwmz";
in fetchurl {
url = "https://github.com/v2fly/domain-list-community/releases/download/${geositeRev}/dlc.dat";
sha256 = geositeSha256;
diff --git a/third_party/nixpkgs/pkgs/tools/networking/v2ray/update.sh b/third_party/nixpkgs/pkgs/tools/networking/v2ray/update.sh
index 3b3a9de738..f645b8ea09 100755
--- a/third_party/nixpkgs/pkgs/tools/networking/v2ray/update.sh
+++ b/third_party/nixpkgs/pkgs/tools/networking/v2ray/update.sh
@@ -65,7 +65,7 @@ vendorSha256=$(
)
[[ "$vendorSha256" ]]
sed --in-place \
- -e "s/vendorSha256 = \".*\"/vendorSha256 = \"$vendorSha256\"/" \
+ -e "s#vendorSha256 = \".*\"#vendorSha256 = \"$vendorSha256\"#" \
"$version_nix"
echo "vendorSha256 updated" >&2
diff --git a/third_party/nixpkgs/pkgs/tools/networking/wireguard-tools/default.nix b/third_party/nixpkgs/pkgs/tools/networking/wireguard-tools/default.nix
index 687c9d988f..efb5b5c5b4 100644
--- a/third_party/nixpkgs/pkgs/tools/networking/wireguard-tools/default.nix
+++ b/third_party/nixpkgs/pkgs/tools/networking/wireguard-tools/default.nix
@@ -1,16 +1,15 @@
-{ lib, stdenv
+{ lib
+, stdenv
, fetchzip
, nixosTests
-, iptables ? null
-, iproute ? null
-, makeWrapper ? null
-, openresolv ? null
-, procps ? null
-, wireguard-go ? null
+, iptables
+, iproute
+, makeWrapper
+, openresolv
+, procps
+, wireguard-go
}:
-with lib;
-
stdenv.mkDerivation rec {
pname = "wireguard-tools";
version = "1.0.20210315";
@@ -37,11 +36,11 @@ stdenv.mkDerivation rec {
postFixup = ''
substituteInPlace $out/lib/systemd/system/wg-quick@.service \
--replace /usr/bin $out/bin
- '' + optionalString stdenv.isLinux ''
+ '' + lib.optionalString stdenv.isLinux ''
for f in $out/bin/*; do
- wrapProgram $f --prefix PATH : ${makeBinPath [procps iproute iptables openresolv]}
+ wrapProgram $f --prefix PATH : ${lib.makeBinPath [ procps iproute iptables openresolv ]}
done
- '' + optionalString stdenv.isDarwin ''
+ '' + lib.optionalString stdenv.isDarwin ''
for f in $out/bin/*; do
wrapProgram $f --prefix PATH : ${wireguard-go}/bin
done
@@ -52,7 +51,7 @@ stdenv.mkDerivation rec {
tests = nixosTests.wireguard;
};
- meta = {
+ meta = with lib; {
description = "Tools for the WireGuard secure network tunnel";
downloadPage = "https://git.zx2c4.com/wireguard-tools/refs/";
homepage = "https://www.wireguard.com/";
diff --git a/third_party/nixpkgs/pkgs/tools/package-management/emplace/default.nix b/third_party/nixpkgs/pkgs/tools/package-management/emplace/default.nix
index 5a8ca2d9a8..c41ef6836a 100644
--- a/third_party/nixpkgs/pkgs/tools/package-management/emplace/default.nix
+++ b/third_party/nixpkgs/pkgs/tools/package-management/emplace/default.nix
@@ -2,16 +2,16 @@
rustPlatform.buildRustPackage rec {
pname = "emplace";
- version = "1.2.1";
+ version = "1.3.0";
src = fetchFromGitHub {
owner = "tversteeg";
repo = pname;
rev = "v${version}";
- sha256 = "sha256-5t47QrYWbm8A4E1GhqZwME7rmSfU1SYVniRGSrcRpvk=";
+ sha256 = "sha256-02Pn5saPrw1PIFZXVSCgsnvo/78CdT17/rCtS9R9bvU=";
};
- cargoSha256 = "sha256-/GFpjovPGEgkfJ53+wR8CBDXiQQPDCiIaRG2Ka71dhQ=";
+ cargoSha256 = "sha256-ety50v0jxm45fzzkR9c/rvpJn3mWQUvAOHcHSJTTSd4=";
meta = with lib; {
description = "Mirror installed software on multiple machines";
diff --git a/third_party/nixpkgs/pkgs/tools/package-management/nix/default.nix b/third_party/nixpkgs/pkgs/tools/package-management/nix/default.nix
index d39af405da..352a6a5466 100644
--- a/third_party/nixpkgs/pkgs/tools/package-management/nix/default.nix
+++ b/third_party/nixpkgs/pkgs/tools/package-management/nix/default.nix
@@ -213,13 +213,13 @@ in rec {
nixUnstable = lib.lowPrio (callPackage common rec {
name = "nix-2.4${suffix}";
- suffix = "pre20210308_1c0e3e4";
+ suffix = "pre20210317_8a5203d";
src = fetchFromGitHub {
owner = "NixOS";
repo = "nix";
- rev = "1c0e3e453d41b869e4ac7e25dc1c00c349a7c411";
- sha256 = "17killwp42d25f17yq2jida64j7d0ipz6zish78iqi450yrd9wrd";
+ rev = "8a5203d3b836497c2c5f157f85008aa8bcb6a1d2";
+ sha256 = "IMzdmoWAX6Lerhslsf7h2814xjJolPnl2bICDixRgdk=";
};
inherit storeDir stateDir confDir boehmgc;
diff --git a/third_party/nixpkgs/pkgs/tools/security/bettercap/default.nix b/third_party/nixpkgs/pkgs/tools/security/bettercap/default.nix
index f2df464a90..940086788a 100644
--- a/third_party/nixpkgs/pkgs/tools/security/bettercap/default.nix
+++ b/third_party/nixpkgs/pkgs/tools/security/bettercap/default.nix
@@ -10,16 +10,16 @@
buildGoModule rec {
pname = "bettercap";
- version = "2.29";
+ version = "2.30";
src = fetchFromGitHub {
owner = pname;
repo = pname;
rev = "v${version}";
- sha256 = "sha256-hXYsFRYSyYKYJM4gS0Dyiia9aPA07GWSsp9doA0vYGI=";
+ sha256 = "sha256-Ge+fbNEWq+84LypUbNrnNMOxcDJb8rFlP/QUoE7yEds=";
};
- vendorSha256 = "sha256-yIvwYUK+4cnHFwvJS2seDa9vJ/2cQ10Q46hR8U0aSRE=";
+ vendorSha256 = "sha256-fApxHxdzEEc+M+U5f0271VgrkXTGkUD75BpDXpVYd5k=";
doCheck = false;
diff --git a/third_party/nixpkgs/pkgs/tools/security/bmrsa/11.nix b/third_party/nixpkgs/pkgs/tools/security/bmrsa/11.nix
index c8188fe421..71bdfae4e4 100644
--- a/third_party/nixpkgs/pkgs/tools/security/bmrsa/11.nix
+++ b/third_party/nixpkgs/pkgs/tools/security/bmrsa/11.nix
@@ -9,7 +9,7 @@ stdenv.mkDerivation rec {
sha256 = "0ksd9xkvm9lkvj4yl5sl0zmydp1wn3xhc55b28gj70gi4k75kcl4";
};
- buildInputs = [ unzip ];
+ nativeBuildInputs = [ unzip ];
unpackPhase = ''
mkdir bmrsa
diff --git a/third_party/nixpkgs/pkgs/tools/security/chntpw/default.nix b/third_party/nixpkgs/pkgs/tools/security/chntpw/default.nix
index ef462f5bf2..5bda55c418 100644
--- a/third_party/nixpkgs/pkgs/tools/security/chntpw/default.nix
+++ b/third_party/nixpkgs/pkgs/tools/security/chntpw/default.nix
@@ -10,8 +10,8 @@ stdenv.mkDerivation rec {
sha256 = "1k1cxsj0221dpsqi5yibq2hr7n8xywnicl8yyaicn91y8h2hkqln";
};
- buildInputs = [ unzip ]
- ++ lib.optionals stdenv.isLinux [ stdenv.glibc.out stdenv.glibc.static ];
+ nativeBuildInputs = [ unzip ];
+ buildInputs = lib.optionals stdenv.isLinux [ stdenv.glibc.out stdenv.glibc.static ];
patches = [
./00-chntpw-build-arch-autodetect.patch
diff --git a/third_party/nixpkgs/pkgs/tools/security/gencfsm/default.nix b/third_party/nixpkgs/pkgs/tools/security/gencfsm/default.nix
index 53127173f7..edec05272b 100644
--- a/third_party/nixpkgs/pkgs/tools/security/gencfsm/default.nix
+++ b/third_party/nixpkgs/pkgs/tools/security/gencfsm/default.nix
@@ -1,5 +1,5 @@
{ lib, stdenv, fetchurl, autoconf, automake, intltool, libtool, pkg-config, encfs
-, glib , gnome3, gtk3, libgnome-keyring, vala, wrapGAppsHook, xorg, gobject-introspection
+, glib , libgee, gtk3, libgnome-keyring, vala, wrapGAppsHook, xorg, gobject-introspection
}:
stdenv.mkDerivation rec {
@@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
nativeBuildInputs = [ pkg-config ];
buildInputs = [ autoconf automake intltool libtool vala glib encfs
- gtk3 libgnome-keyring gnome3.libgee xorg.libSM xorg.libICE
+ gtk3 libgnome-keyring libgee xorg.libSM xorg.libICE
wrapGAppsHook gobject-introspection ];
patches = [ ./makefile-mkdir.patch ];
diff --git a/third_party/nixpkgs/pkgs/tools/security/nuclei/default.nix b/third_party/nixpkgs/pkgs/tools/security/nuclei/default.nix
index 2df24e63d8..dd915a36e4 100644
--- a/third_party/nixpkgs/pkgs/tools/security/nuclei/default.nix
+++ b/third_party/nixpkgs/pkgs/tools/security/nuclei/default.nix
@@ -1,25 +1,28 @@
-{ buildGoModule
+{ lib
+, buildGoModule
, fetchFromGitHub
-, lib
}:
buildGoModule rec {
pname = "nuclei";
- version = "2.2.0";
+ version = "2.3.1";
src = fetchFromGitHub {
owner = "projectdiscovery";
- repo = "nuclei";
+ repo = pname;
rev = "v${version}";
- sha256 = "0xrvza86aczlnb11x58fiqch5g0q6gvpxwsi5dq3akfi95gk3a3x";
+ sha256 = "sha256-NM/Ggd5MKctQKE0MNawyE+Xciuj9++6DXXkMrrpfkhA=";
};
- vendorSha256 = "1v3ax8l1lgp2vs50gsa2fhdd6bvyfdlkd118akrqmwxahyyyqycv";
+ vendorSha256 = "sha256-h+MuMfIKXgXzLU6hNMxfPXawic9UZrwzVlzjjRF7X3o=";
preBuild = ''
mv v2/* .
'';
+ # Test files are not part of the release tarball
+ doCheck = false;
+
meta = with lib; {
description = "Tool for configurable targeted scanning";
longDescription = ''
diff --git a/third_party/nixpkgs/pkgs/tools/security/pcsc-scm-scl011/default.nix b/third_party/nixpkgs/pkgs/tools/security/pcsc-scm-scl011/default.nix
index b7c4319fa0..aa1580e245 100644
--- a/third_party/nixpkgs/pkgs/tools/security/pcsc-scm-scl011/default.nix
+++ b/third_party/nixpkgs/pkgs/tools/security/pcsc-scm-scl011/default.nix
@@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
sha256 = "0ik26sxgqgsqplksl87z61vwmx51k7plaqmrkdid7xidgfhfxr42";
};
- buildInputs = [ unzip ];
+ nativeBuildInputs = [ unzip ];
unpackPhase = ''
unzip $src
diff --git a/third_party/nixpkgs/pkgs/tools/security/pcsclite/default.nix b/third_party/nixpkgs/pkgs/tools/security/pcsclite/default.nix
index 3d966c575c..2a75c40930 100644
--- a/third_party/nixpkgs/pkgs/tools/security/pcsclite/default.nix
+++ b/third_party/nixpkgs/pkgs/tools/security/pcsclite/default.nix
@@ -1,5 +1,4 @@
-{ lib, stdenv, fetchurl, pkg-config, udev, dbus, perl, python3
-, IOKit ? null }:
+{ lib, stdenv, fetchurl, pkg-config, udev, dbus, perl, python3, IOKit }:
stdenv.mkDerivation rec {
pname = "pcsclite";
@@ -19,9 +18,9 @@ stdenv.mkDerivation rec {
"--enable-usbdropdir=/var/lib/pcsc/drivers"
"--enable-confdir=/etc"
] ++ lib.optional stdenv.isLinux
- "--with-systemdsystemunitdir=\${out}/etc/systemd/system"
- ++ lib.optional (!stdenv.isLinux)
- "--disable-libsystemd";
+ "--with-systemdsystemunitdir=\${out}/etc/systemd/system"
+ ++ lib.optional (!stdenv.isLinux)
+ "--disable-libsystemd";
postConfigure = ''
sed -i -re '/^#define *PCSCLITE_HP_DROPDIR */ {
@@ -35,8 +34,10 @@ stdenv.mkDerivation rec {
'';
nativeBuildInputs = [ pkg-config perl ];
- buildInputs = [ python3 ] ++ lib.optionals stdenv.isLinux [ udev dbus ]
- ++ lib.optionals stdenv.isDarwin [ IOKit ];
+
+ buildInputs = [ python3 ]
+ ++ lib.optionals stdenv.isLinux [ udev dbus ]
+ ++ lib.optionals stdenv.isDarwin [ IOKit ];
meta = with lib; {
description = "Middleware to access a smart card using SCard API (PC/SC)";
diff --git a/third_party/nixpkgs/pkgs/tools/security/pinentry/mac.nix b/third_party/nixpkgs/pkgs/tools/security/pinentry/mac.nix
index 9c328d472c..27917ffbbf 100644
--- a/third_party/nixpkgs/pkgs/tools/security/pinentry/mac.nix
+++ b/third_party/nixpkgs/pkgs/tools/security/pinentry/mac.nix
@@ -14,6 +14,12 @@ stdenv.mkDerivation {
nativeBuildInputs = [ xcbuildHook ];
buildInputs = [ libiconv ncurses Cocoa ];
+ preBuild = ''
+ # Only build for what we care about (also allows arm64)
+ substituteInPlace pinentry-mac.xcodeproj/project.pbxproj \
+ --replace "i386 x86_64 ppc" "${stdenv.targetPlatform.darwinArch}"
+ '';
+
installPhase = ''
mkdir -p $out/Applications
mv Products/Release/pinentry-mac.app $out/Applications
diff --git a/third_party/nixpkgs/pkgs/tools/security/prs/default.nix b/third_party/nixpkgs/pkgs/tools/security/prs/default.nix
index cf83a135f7..936bd7eda9 100644
--- a/third_party/nixpkgs/pkgs/tools/security/prs/default.nix
+++ b/third_party/nixpkgs/pkgs/tools/security/prs/default.nix
@@ -12,16 +12,16 @@
rustPlatform.buildRustPackage rec {
pname = "prs";
- version = "0.2.3";
+ version = "0.2.4";
src = fetchFromGitLab {
owner = "timvisee";
repo = "prs";
rev = "v${version}";
- sha256 = "sha256-aulrMXKKCFo8nU6mEplcpaGGMfLr03FCgIF6rg6LqGg=";
+ sha256 = "sha256-8rISyZdxxGqpZlOc4ziY33tMRK/w4fiTVCiK5RVBDvw=";
};
- cargoSha256 = "sha256-996iwBOp5F9q9/yptTHtsLj6wlY5HEpp8CWTbpBWPuA=";
+ cargoSha256 = "sha256-sxYm6uNTvBZsjzHywduq0fhnqZMbECLqxq8yg3ZxtVU=";
postPatch = ''
# The GPGME backend is recommended
diff --git a/third_party/nixpkgs/pkgs/tools/security/rarcrack/default.nix b/third_party/nixpkgs/pkgs/tools/security/rarcrack/default.nix
index 94800ca8c0..3745a9520f 100644
--- a/third_party/nixpkgs/pkgs/tools/security/rarcrack/default.nix
+++ b/third_party/nixpkgs/pkgs/tools/security/rarcrack/default.nix
@@ -11,7 +11,8 @@ stdenv.mkDerivation {
sha256 = "134fq84896w5vp8vg4qg0ybpb466njibigyd7bqqm1xydr07qrgn";
};
- buildInputs = [ libxml2 file p7zip unrar unzip ];
+ nativeBuildInputs = [ unzip ];
+ buildInputs = [ libxml2 file p7zip unrar ];
buildFlags = lib.optional stdenv.cc.isClang "CC=clang";
installFlags = [ "PREFIX=\${out}" ];
diff --git a/third_party/nixpkgs/pkgs/tools/security/sn0int/default.nix b/third_party/nixpkgs/pkgs/tools/security/sn0int/default.nix
index 7cc343b782..1577b47640 100644
--- a/third_party/nixpkgs/pkgs/tools/security/sn0int/default.nix
+++ b/third_party/nixpkgs/pkgs/tools/security/sn0int/default.nix
@@ -3,16 +3,16 @@
rustPlatform.buildRustPackage rec {
pname = "sn0int";
- version = "0.20.0";
+ version = "0.20.1";
src = fetchFromGitHub {
owner = "kpcyrd";
repo = pname;
rev = "v${version}";
- sha256 = "1zjrbrkk7phv8s5qr0gj6fnssa31j3k3m8c55pdfmajh7ry7wwd1";
+ sha256 = "sha256-vnSpItch9RDUyYxERKRwYPmRLwRG9gAI7iIY+7iRs1w=";
};
- cargoSha256 = "1jvaavhjyalnh10vfhrdyqg1jnl8b4a3gnp8a31bgi3mb0v466k3";
+ cargoSha256 = "sha256-1QqNI7rdH5wb1Zge8gkJtzg2Hgd/Vk9DAU9ULk/5wiw=";
nativeBuildInputs = [ pkg-config ];
diff --git a/third_party/nixpkgs/pkgs/tools/security/sonar-scanner-cli/default.nix b/third_party/nixpkgs/pkgs/tools/security/sonar-scanner-cli/default.nix
index f5ae475a45..95db01370b 100644
--- a/third_party/nixpkgs/pkgs/tools/security/sonar-scanner-cli/default.nix
+++ b/third_party/nixpkgs/pkgs/tools/security/sonar-scanner-cli/default.nix
@@ -21,7 +21,7 @@ in stdenv.mkDerivation rec {
src = fetchurl sonarScannerArchPackage.${stdenv.hostPlatform.system};
- buildInputs = [ unzip ];
+ nativeBuildInputs = [ unzip ];
installPhase = ''
mkdir -p $out/lib
diff --git a/third_party/nixpkgs/pkgs/tools/security/sudo/default.nix b/third_party/nixpkgs/pkgs/tools/security/sudo/default.nix
index 0f969288a2..d8b99c51de 100644
--- a/third_party/nixpkgs/pkgs/tools/security/sudo/default.nix
+++ b/third_party/nixpkgs/pkgs/tools/security/sudo/default.nix
@@ -1,4 +1,11 @@
-{ lib, stdenv, fetchurl, coreutils, pam, groff, sssd, nixosTests
+{ lib
+, stdenv
+, fetchurl
+, coreutils
+, pam
+, groff
+, sssd
+, nixosTests
, sendmailPath ? "/run/wrappers/bin/sendmail"
, withInsults ? false
, withSssd ? false
@@ -6,11 +13,11 @@
stdenv.mkDerivation rec {
pname = "sudo";
- version = "1.9.5p2";
+ version = "1.9.6p1";
src = fetchurl {
url = "https://www.sudo.ws/dist/${pname}-${version}.tar.gz";
- sha256 = "0y093z4f3822rc88g9asdch12nljdamp817vjxk04mca7ks2x7jk";
+ sha256 = "sha256-qenNwFj6/rnNPr+4ZMgXVeUk2YqgIhUnY/JbzoyjypA=";
};
prePatch = ''
@@ -36,17 +43,17 @@ stdenv.mkDerivation rec {
];
configureFlagsArray = [
- "--with-passprompt=[sudo] password for %p: " # intentional trailing space
+ "--with-passprompt=[sudo] password for %p: " # intentional trailing space
];
postConfigure =
''
- cat >> pathnames.h <<'EOF'
- #undef _PATH_MV
- #define _PATH_MV "${coreutils}/bin/mv"
- EOF
- makeFlags="install_uid=$(id -u) install_gid=$(id -g)"
- installFlags="sudoers_uid=$(id -u) sudoers_gid=$(id -g) sysconfdir=$out/etc rundir=$TMPDIR/dummy vardir=$TMPDIR/dummy DESTDIR=/"
+ cat >> pathnames.h <<'EOF'
+ #undef _PATH_MV
+ #define _PATH_MV "${coreutils}/bin/mv"
+ EOF
+ makeFlags="install_uid=$(id -u) install_gid=$(id -g)"
+ installFlags="sudoers_uid=$(id -u) sudoers_gid=$(id -g) sysconfdir=$out/etc rundir=$TMPDIR/dummy vardir=$TMPDIR/dummy DESTDIR=/"
'';
nativeBuildInputs = [ groff ];
@@ -56,10 +63,9 @@ stdenv.mkDerivation rec {
doCheck = false; # needs root
- postInstall =
- ''
- rm -f $out/share/doc/sudo/ChangeLog
- '';
+ postInstall = ''
+ rm $out/share/doc/sudo/ChangeLog
+ '';
passthru.tests = { inherit (nixosTests) sudo; };
@@ -68,10 +74,10 @@ stdenv.mkDerivation rec {
longDescription =
''
- Sudo (su "do") allows a system administrator to delegate
- authority to give certain users (or groups of users) the ability
- to run some (or all) commands as root or another user while
- providing an audit trail of the commands and their arguments.
+ Sudo (su "do") allows a system administrator to delegate
+ authority to give certain users (or groups of users) the ability
+ to run some (or all) commands as root or another user while
+ providing an audit trail of the commands and their arguments.
'';
homepage = "https://www.sudo.ws/";
diff --git a/third_party/nixpkgs/pkgs/tools/security/teler/default.nix b/third_party/nixpkgs/pkgs/tools/security/teler/default.nix
index f44b7abf52..1c4cba04d5 100644
--- a/third_party/nixpkgs/pkgs/tools/security/teler/default.nix
+++ b/third_party/nixpkgs/pkgs/tools/security/teler/default.nix
@@ -5,13 +5,13 @@
buildGoModule rec {
pname = "teler";
- version = "1.1.0";
+ version = "1.1.1";
src = fetchFromGitHub {
owner = "kitabisa";
repo = "teler";
rev = "v${version}";
- sha256 = "sha256-0tx/oyHl6s1mj7NyWMZGCJoSuOeB+BMlBrnGY4IN/i4=";
+ sha256 = "sha256-FZG23j7LUwfJ0dSbU4xW0YyCKJxOjVf1uqkuGlrwnqs=";
};
vendorSha256 = "sha256-KvUnDInUqFW7FypgsppIBQZKNu6HVsEeHtGwdqYtoys=";
diff --git a/third_party/nixpkgs/pkgs/tools/security/thc-hydra/default.nix b/third_party/nixpkgs/pkgs/tools/security/thc-hydra/default.nix
index 88ea30088f..f60d537464 100644
--- a/third_party/nixpkgs/pkgs/tools/security/thc-hydra/default.nix
+++ b/third_party/nixpkgs/pkgs/tools/security/thc-hydra/default.nix
@@ -3,13 +3,13 @@
stdenv.mkDerivation rec {
pname = "thc-hydra";
- version = "9.1";
+ version = "9.2";
src = fetchFromGitHub {
owner = "vanhauser-thc";
repo = "thc-hydra";
rev = "v${version}";
- sha256 = "1533h9z5jdlazwy0z7ll2753i507wq55by7rm9lh6y59889p0hps";
+ sha256 = "sha256-V9rr5fbJWm0pa+Kp8g95XvLPo/uWcDwyU2goImnIq58=";
};
postPatch = let
diff --git a/third_party/nixpkgs/pkgs/tools/system/inxi/default.nix b/third_party/nixpkgs/pkgs/tools/system/inxi/default.nix
index 1cceb5b009..12f2a2ef07 100644
--- a/third_party/nixpkgs/pkgs/tools/system/inxi/default.nix
+++ b/third_party/nixpkgs/pkgs/tools/system/inxi/default.nix
@@ -22,13 +22,13 @@ let
++ recommendedDisplayInformationPrograms;
in stdenv.mkDerivation rec {
pname = "inxi";
- version = "3.3.01-1";
+ version = "3.3.03-1";
src = fetchFromGitHub {
owner = "smxi";
repo = "inxi";
rev = version;
- sha256 = "sha256-wY9wsxBByxqy9qk/7UoKiUSpFGS1rFpdyTs3ig6OJRs=";
+ sha256 = "sha256-OFjhMlBR1QUYUvpuFATCWZWZp2dop30Iz8qVCIK2UN0=";
};
nativeBuildInputs = [ makeWrapper ];
diff --git a/third_party/nixpkgs/pkgs/tools/system/s6/default.nix b/third_party/nixpkgs/pkgs/tools/system/s6/default.nix
index 75aadbeda8..16fd1be633 100644
--- a/third_party/nixpkgs/pkgs/tools/system/s6/default.nix
+++ b/third_party/nixpkgs/pkgs/tools/system/s6/default.nix
@@ -4,8 +4,8 @@ with skawarePackages;
buildPackage {
pname = "s6";
- version = "2.10.0.0";
- sha256 = "0xzqrd0m3wjklmw1w3gjw5dcdxnhgvxv2r5wd6m2ismw2jprr9k0";
+ version = "2.10.0.2";
+ sha256 = "08bcrp7ck1l3wmjyzxi3vgk6j0n2jfymxs4rjjw4if40f3lgqfmj";
description = "skarnet.org's small & secure supervision software suite";
diff --git a/third_party/nixpkgs/pkgs/tools/text/dfmt/default.nix b/third_party/nixpkgs/pkgs/tools/text/dfmt/default.nix
new file mode 100644
index 0000000000..16702bb696
--- /dev/null
+++ b/third_party/nixpkgs/pkgs/tools/text/dfmt/default.nix
@@ -0,0 +1,27 @@
+{ lib
+, python3
+}:
+
+let
+ inherit (python3.pkgs)
+ buildPythonApplication
+ fetchPypi
+ pythonOlder;
+in
+buildPythonApplication rec {
+ pname = "dfmt";
+ version = "1.2.0";
+ disabled = pythonOlder "3.7";
+
+ src = fetchPypi {
+ inherit pname version;
+ sha256 = "7af6360ca8d556f1cfe82b97f03b8d1ea5a9d6de1fa3018290c844b6566d9d6e";
+ };
+
+ meta = with lib; {
+ description = "Format paragraphs, comments and doc strings";
+ homepage = "https://github.com/dmerejkowsky/dfmt";
+ license = licenses.bsd3;
+ maintainers = with maintainers; [ cole-h ];
+ };
+}
diff --git a/third_party/nixpkgs/pkgs/tools/text/m2r/default.nix b/third_party/nixpkgs/pkgs/tools/text/m2r/default.nix
new file mode 100644
index 0000000000..f6dda712d0
--- /dev/null
+++ b/third_party/nixpkgs/pkgs/tools/text/m2r/default.nix
@@ -0,0 +1,32 @@
+{ lib
+, buildPythonApplication
+, fetchFromGitHub
+, docutils
+, mistune
+, pygments
+}:
+
+buildPythonApplication rec {
+ pname = "m2r";
+ version = "0.2.1";
+
+ src = fetchFromGitHub {
+ owner = "miyakogi";
+ repo = pname;
+ rev = "v${version}";
+ hash = "sha256-JNLPEXMoiISh4RnKP+Afj9/PJp9Lrx9UYHsfuGAL7uI=";
+ };
+
+ buildInputs = [
+ docutils
+ mistune
+ pygments
+ ];
+
+ meta = with lib; {
+ homepage = "https://github.com/miyakogi/m2r";
+ description = "Markdown-to-RestructuredText converter";
+ license = licenses.mit;
+ maintainers = with maintainers; [ AndersonTorres ];
+ };
+}
diff --git a/third_party/nixpkgs/pkgs/tools/text/mark/default.nix b/third_party/nixpkgs/pkgs/tools/text/mark/default.nix
index 93fadfe0ef..af96b09b14 100644
--- a/third_party/nixpkgs/pkgs/tools/text/mark/default.nix
+++ b/third_party/nixpkgs/pkgs/tools/text/mark/default.nix
@@ -2,13 +2,13 @@
buildGoModule rec {
pname = "mark";
- version = "5.2.2";
+ version = "5.4";
src = fetchFromGitHub {
owner = "kovetskiy";
repo = "mark";
rev = version;
- sha256 = "sha256-CS9xzRxTKvBuDM1vs+p+U7LSMP8W6+cKNb+Sd3wgwig=";
+ sha256 = "sha256-IDW8dd2Bgr936hUKkfkoQ/kBnN+0uacJ1uX4Xhd27Vc=";
};
vendorSha256 = "sha256-nneQ0B7PyHAqiOzrmWqSssZM8B3np4VFUJLBqUvkjZE=";
diff --git a/third_party/nixpkgs/pkgs/tools/text/xml/basex/default.nix b/third_party/nixpkgs/pkgs/tools/text/xml/basex/default.nix
index 9256abf3cb..3048219632 100644
--- a/third_party/nixpkgs/pkgs/tools/text/xml/basex/default.nix
+++ b/third_party/nixpkgs/pkgs/tools/text/xml/basex/default.nix
@@ -9,7 +9,8 @@ stdenv.mkDerivation rec {
hash = "sha256-IZhRg2JcYQXQKU/lYZpLLcsSdjZZO+toY5yvk+RKUCY=";
};
- buildInputs = [ unzip jre ];
+ nativeBuildInputs = [ unzip ];
+ buildInputs = [ jre ];
desktopItem = makeDesktopItem {
name = "basex";
diff --git a/third_party/nixpkgs/pkgs/tools/text/xml/xmldiff/default.nix b/third_party/nixpkgs/pkgs/tools/text/xml/xmldiff/default.nix
new file mode 100644
index 0000000000..5814435e11
--- /dev/null
+++ b/third_party/nixpkgs/pkgs/tools/text/xml/xmldiff/default.nix
@@ -0,0 +1,41 @@
+{ lib
+, buildPythonApplication
+, fetchFromGitHub
+, lxml
+, six
+}:
+
+buildPythonApplication rec {
+ pname = "xmldiff";
+ version = "2.4";
+
+ src = fetchFromGitHub {
+ owner = "Shoobx";
+ repo = pname;
+ rev = version;
+ hash = "sha256-xqudHYfwOce2C0pcFzId0JDIIC6R5bllmVKsH+CvTdE=";
+ };
+
+ buildInputs = [
+ lxml
+ six
+ ];
+
+ meta = with lib; {
+ homepage = "https://xmldiff.readthedocs.io/en/stable/";
+ description = "A library and command line utility for diffing xml";
+ longDescription = ''
+ xmldiff is a library and a command-line utility for making diffs out of
+ XML. This may seem like something that doesn't need a dedicated utility,
+ but change detection in hierarchical data is very different from change
+ detection in flat data. XML type formats are also not only used for
+ computer readable data, it is also often used as a format for hierarchical
+ data that can be rendered into human readable formats. A traditional diff
+ on such a format would tell you line by line the differences, but this
+ would not be be readable by a human. xmldiff provides tools to make human
+ readable diffs in those situations.
+ '';
+ license = licenses.mit;
+ maintainers = with maintainers; [ AndersonTorres ];
+ };
+}
diff --git a/third_party/nixpkgs/pkgs/tools/typesetting/lowdown/default.nix b/third_party/nixpkgs/pkgs/tools/typesetting/lowdown/default.nix
index 1040532eb3..13606521b8 100644
--- a/third_party/nixpkgs/pkgs/tools/typesetting/lowdown/default.nix
+++ b/third_party/nixpkgs/pkgs/tools/typesetting/lowdown/default.nix
@@ -2,13 +2,13 @@
stdenv.mkDerivation rec {
pname = "lowdown";
- version = "0.8.2";
+ version = "0.8.3";
outputs = [ "out" "lib" "dev" "man" ];
src = fetchurl {
url = "https://kristaps.bsd.lv/lowdown/snapshots/lowdown-${version}.tar.gz";
- sha512 = "07xy6yjs24zkwrr06ly4ln5czvm3azw6iznx6m8gbrmzblkcp3gz1jcl9wclcyl8bs4xhgmyzkf5k67b95s0jndhyb9ap5zy6ixnias";
+ sha512 = "17q1jd2vih26yjjc4f9kg0qihrym8h0ydnli6z8p3h4rdwm4kfnvckrpkwminz5wl0k5z6d65dk7q4pynyfynp31d6s7q4yzkkqy6kc";
};
nativeBuildInputs = [ which ]
diff --git a/third_party/nixpkgs/pkgs/tools/typesetting/tex/lkproof/default.nix b/third_party/nixpkgs/pkgs/tools/typesetting/tex/lkproof/default.nix
index d5b6a7f9f9..4f896ef32b 100644
--- a/third_party/nixpkgs/pkgs/tools/typesetting/tex/lkproof/default.nix
+++ b/third_party/nixpkgs/pkgs/tools/typesetting/tex/lkproof/default.nix
@@ -8,7 +8,7 @@ stdenv.mkDerivation {
sha256 = "1qjkjhpc4rm62qxn18r83zdlwnj1wvnkcpdiqlv7w4bakh0gvjly";
};
- buildInputs = [ unzip ];
+ nativeBuildInputs = [ unzip ];
installPhase = "
mkdir -p $out/share/texmf-nix/tex/generic/lkproof
diff --git a/third_party/nixpkgs/pkgs/tools/typesetting/tex/pgf/3.x.nix b/third_party/nixpkgs/pkgs/tools/typesetting/tex/pgf/3.x.nix
index 42320b49b3..b33f05d34a 100644
--- a/third_party/nixpkgs/pkgs/tools/typesetting/tex/pgf/3.x.nix
+++ b/third_party/nixpkgs/pkgs/tools/typesetting/tex/pgf/3.x.nix
@@ -8,7 +8,7 @@ stdenv.mkDerivation {
sha256 = "0kj769hyp4z2zmdv3f8xv443wcfqn5nkkbzxzqgfxjizlz81aav7";
};
- buildInputs = [ unzip ];
+ nativeBuildInputs = [ unzip ];
# Multiple files problem
unpackPhase = ''
diff --git a/third_party/nixpkgs/pkgs/tools/typesetting/tex/pgfplots/default.nix b/third_party/nixpkgs/pkgs/tools/typesetting/tex/pgfplots/default.nix
index aecf32c587..fe928615eb 100644
--- a/third_party/nixpkgs/pkgs/tools/typesetting/tex/pgfplots/default.nix
+++ b/third_party/nixpkgs/pkgs/tools/typesetting/tex/pgfplots/default.nix
@@ -8,7 +8,7 @@ stdenv.mkDerivation {
sha256 = "1xajrmq35i0qlsfwydy5zzg6f1jg88hqqh5b3xsmglzrarnllbdi";
};
- buildInputs = [ unzip ];
+ nativeBuildInputs = [ unzip ];
unpackPhase = "unzip $src";
diff --git a/third_party/nixpkgs/pkgs/tools/typesetting/tex/texlive/bin.nix b/third_party/nixpkgs/pkgs/tools/typesetting/tex/texlive/bin.nix
index d2858a9088..fb9b748b5d 100644
--- a/third_party/nixpkgs/pkgs/tools/typesetting/tex/texlive/bin.nix
+++ b/third_party/nixpkgs/pkgs/tools/typesetting/tex/texlive/bin.nix
@@ -281,12 +281,9 @@ dvipng = stdenv.mkDerivation {
configureFlags = common.configureFlags
++ [ "--with-system-kpathsea" "--with-gs=yes" "--disable-debug" ];
- enableParallelBuilding = true;
+ GS="${ghostscript}/bin/gs";
- # I didn't manage to hardcode gs location by configureFlags
- postInstall = ''
- wrapProgram "$out/bin/dvipng" --prefix PATH : '${ghostscript}/bin'
- '';
+ enableParallelBuilding = true;
};
diff --git a/third_party/nixpkgs/pkgs/tools/virtualization/ec2-ami-tools/default.nix b/third_party/nixpkgs/pkgs/tools/virtualization/ec2-ami-tools/default.nix
index 00df6bd97e..8e6d7b06d1 100644
--- a/third_party/nixpkgs/pkgs/tools/virtualization/ec2-ami-tools/default.nix
+++ b/third_party/nixpkgs/pkgs/tools/virtualization/ec2-ami-tools/default.nix
@@ -5,8 +5,7 @@ stdenv.mkDerivation rec {
version = "1.5.7";
- nativeBuildInputs = [ makeWrapper ];
- buildInputs = [ unzip ];
+ nativeBuildInputs = [ makeWrapper unzip ];
src = fetchurl {
url = "https://s3.amazonaws.com/ec2-downloads/${pname}-${version}.zip";
diff --git a/third_party/nixpkgs/pkgs/tools/virtualization/ec2-api-tools/default.nix b/third_party/nixpkgs/pkgs/tools/virtualization/ec2-api-tools/default.nix
index 0c3aec2aad..475b97abdc 100644
--- a/third_party/nixpkgs/pkgs/tools/virtualization/ec2-api-tools/default.nix
+++ b/third_party/nixpkgs/pkgs/tools/virtualization/ec2-api-tools/default.nix
@@ -8,8 +8,7 @@ stdenv.mkDerivation rec {
sha256 = "0figmvcm82ghmpz3018ihysz8zpxpysgbpdx7rmciq9y80qbw6l5";
};
- nativeBuildInputs = [ makeWrapper ];
- buildInputs = [ unzip ];
+ nativeBuildInputs = [ makeWrapper unzip ];
installPhase =
''
diff --git a/third_party/nixpkgs/pkgs/tools/virtualization/xva-img/default.nix b/third_party/nixpkgs/pkgs/tools/virtualization/xva-img/default.nix
index b499294765..4fe2e5bbb4 100644
--- a/third_party/nixpkgs/pkgs/tools/virtualization/xva-img/default.nix
+++ b/third_party/nixpkgs/pkgs/tools/virtualization/xva-img/default.nix
@@ -2,13 +2,13 @@
stdenv.mkDerivation rec {
pname = "xva-img";
- version = "1.4.1";
+ version = "1.4.2";
src = fetchFromGitHub {
owner = "eriklax";
repo = "xva-img";
rev = version;
- sha256 = "1w3wrbrlgv7h2gdix2rmrmpjyla365kam5621a1aqjzwjqhjkwyq";
+ sha256 = "sha256-QHCKGsHSMT2P64No1IUCjenm1XZMSgEvsJGJOyHFZS8=";
};
nativeBuildInputs = [ cmake ];
diff --git a/third_party/nixpkgs/pkgs/top-level/aliases.nix b/third_party/nixpkgs/pkgs/top-level/aliases.nix
index 22e91ae016..b2ff3e93c3 100644
--- a/third_party/nixpkgs/pkgs/top-level/aliases.nix
+++ b/third_party/nixpkgs/pkgs/top-level/aliases.nix
@@ -105,6 +105,7 @@ mapAliases ({
codimd = hedgedoc; # added 2020-11-29
compton = picom; # added 2019-12-02
compton-git = compton; # added 2019-05-20
+ concurrencykit = libck; # added 2021-03
conntrack_tools = conntrack-tools; # added 2018-05
cool-old-term = cool-retro-term; # added 2015-01-31
coprthr = throw "coprthr has been removed."; # added 2019-12-08
@@ -560,6 +561,7 @@ mapAliases ({
ppl-address-book = throw "ppl-address-book deprecated on 2019-05-02: abandoned by upstream.";
processing3 = processing; # added 2019-08-16
procps-ng = procps; # added 2018-06-08
+ prometheus-cups-exporter = throw "outdated and broken by design; removed by developer."; # added 2021-03-16
pygmentex = texlive.bin.pygmentex; # added 2019-12-15
pyo3-pack = maturin;
pmenu = throw "pmenu has been removed from nixpkgs, as its maintainer is no longer interested in the package."; # added 2019-12-10
diff --git a/third_party/nixpkgs/pkgs/top-level/all-packages.nix b/third_party/nixpkgs/pkgs/top-level/all-packages.nix
index 5a9aac69c6..3b7831d879 100644
--- a/third_party/nixpkgs/pkgs/top-level/all-packages.nix
+++ b/third_party/nixpkgs/pkgs/top-level/all-packages.nix
@@ -190,7 +190,10 @@ in
castget = callPackage ../applications/networking/feedreaders/castget { };
- castxml = callPackage ../development/tools/castxml { };
+ castxml = callPackage ../development/tools/castxml {
+ inherit (llvmPackages) clang-unwrapped libclang llvm;
+ inherit (python3Packages) sphinx;
+ };
cen64 = callPackage ../misc/emulators/cen64 { };
@@ -417,7 +420,7 @@ in
else makeOverridable (import ../build-support/fetchurl) {
inherit lib stdenvNoCC buildPackages;
inherit cacert;
- curl = buildPackages.curl.override (old: rec {
+ curl = buildPackages.curlMinimal.override (old: rec {
# break dependency cycles
fetchurl = stdenv.fetchurlBoot;
zlib = buildPackages.zlib.override { fetchurl = stdenv.fetchurlBoot; };
@@ -1240,6 +1243,8 @@ in
detect-secrets = python3Packages.callPackage ../development/tools/detect-secrets { };
+ dfmt = callPackage ../tools/text/dfmt { };
+
diskonaut = callPackage ../tools/misc/diskonaut { };
diskus = callPackage ../tools/misc/diskus {
@@ -1743,6 +1748,8 @@ in
boringtun = callPackage ../tools/networking/boringtun { };
+ bookstack = callPackage ../servers/web-apps/bookstack { };
+
# Upstream recommends qt5.12 and it doesn't build with qt5.15
boomerang = libsForQt512.callPackage ../development/tools/boomerang { };
@@ -1998,6 +2005,8 @@ in
cowsay = callPackage ../tools/misc/cowsay { };
+ czkawka = callPackage ../tools/misc/czkawka { };
+
cherrytree = callPackage ../applications/misc/cherrytree { };
chntpw = callPackage ../tools/security/chntpw { };
@@ -2626,6 +2635,8 @@ in
massren = callPackage ../tools/misc/massren { };
+ mat2 = with python3.pkgs; toPythonApplication mat2;
+
maxcso = callPackage ../tools/archivers/maxcso {};
medusa = callPackage ../tools/security/medusa { };
@@ -2887,7 +2898,9 @@ in
roundcubePlugins = dontRecurseIntoAttrs (callPackage ../servers/roundcube/plugins { });
- routinator = callPackage ../servers/routinator { };
+ routinator = callPackage ../servers/routinator {
+ inherit (darwin.apple_sdk.frameworks) Security;
+ };
rsbep = callPackage ../tools/backup/rsbep { };
@@ -3262,8 +3275,6 @@ in
colordiff = callPackage ../tools/text/colordiff { };
- concurrencykit = callPackage ../development/libraries/concurrencykit { };
-
connect = callPackage ../tools/networking/connect { };
conspy = callPackage ../os-specific/linux/conspy {};
@@ -3316,6 +3327,8 @@ in
usbsdmux = callPackage ../development/tools/misc/usbsdmux { };
+ usbview = callPackage ../tools/misc/usbview { };
+
anthy = callPackage ../tools/inputmethods/anthy { };
evdevremapkeys = callPackage ../tools/inputmethods/evdevremapkeys { };
@@ -3536,14 +3549,29 @@ in
cudnn = cudnn_cudatoolkit_10;
+ cutensorPackages = callPackages ../development/libraries/science/math/cutensor { };
+ inherit (cutensorPackages)
+ cutensor_cudatoolkit_10
+ cutensor_cudatoolkit_10_1
+ cutensor_cudatoolkit_10_2
+ cutensor_cudatoolkit_11
+ cutensor_cudatoolkit_11_0
+ cutensor_cudatoolkit_11_1
+ cutensor_cudatoolkit_11_2;
+
+ cutensor = cutensor_cudatoolkit_10;
+
curlFull = curl.override {
- idnSupport = true;
ldapSupport = true;
+ };
+
+ curl = curlMinimal.override {
+ idnSupport = true;
gssSupport = true;
brotliSupport = true;
};
- curl = callPackage ../tools/networking/curl { };
+ curlMinimal = callPackage ../tools/networking/curl { };
curl_unix_socket = callPackage ../tools/networking/curl-unix-socket { };
@@ -3611,7 +3639,8 @@ in
};
deno = callPackage ../development/web/deno {
- inherit (darwin.apple_sdk.frameworks) Security CoreServices;
+ inherit (darwin) libobjc;
+ inherit (darwin.apple_sdk.frameworks) Security CoreServices Metal Foundation;
};
detox = callPackage ../tools/misc/detox { };
@@ -3961,6 +3990,8 @@ in
vorta = libsForQt5.callPackage ../applications/backup/vorta { };
+ vowpal-wabbit = callPackage ../applications/science/machine-learning/vowpal-wabbit { };
+
utahfs = callPackage ../applications/networking/utahfs { };
wakeonlan = callPackage ../tools/networking/wakeonlan { };
@@ -5705,7 +5736,7 @@ in
lego = callPackage ../tools/admin/lego { };
- leocad = callPackage ../applications/graphics/leocad { };
+ leocad = libsForQt5.callPackage ../applications/graphics/leocad { };
less = callPackage ../tools/misc/less { };
@@ -5831,6 +5862,8 @@ in
mcfly = callPackage ../tools/misc/mcfly { };
+ m2r = python3Packages.callPackage ../tools/text/m2r { };
+
mdbook = callPackage ../tools/text/mdbook {
inherit (darwin.apple_sdk.frameworks) CoreServices;
};
@@ -6074,6 +6107,8 @@ in
libqmi = callPackage ../development/libraries/libqmi { };
+ libqrtr-glib = callPackage ../development/libraries/libqrtr-glib { };
+
libmbim = callPackage ../development/libraries/libmbim { };
libmongo-client = callPackage ../development/libraries/libmongo-client { };
@@ -7200,7 +7235,7 @@ in
pinentry_mac = callPackage ../tools/security/pinentry/mac.nix {
inherit (darwin.apple_sdk.frameworks) Cocoa;
- xcbuildHook = xcbuild6Hook;
+ xcbuildHook = if stdenv.targetPlatform.isAarch64 then xcbuildHook else xcbuild6Hook;
};
pingtcp = callPackage ../tools/networking/pingtcp { };
@@ -7727,6 +7762,8 @@ in
gperf = gperf_3_0;
};
+ rpm2targz = callPackage ../tools/archivers/rpm2targz { };
+
rpmextract = callPackage ../tools/archivers/rpmextract { };
rrdtool = callPackage ../tools/misc/rrdtool { };
@@ -8343,6 +8380,8 @@ in
swiften = callPackage ../development/libraries/swiften { };
+ squeekboard = callPackage ../applications/accessibility/squeekboard { };
+
t = callPackage ../tools/misc/t { };
tabnine = callPackage ../development/tools/tabnine { };
@@ -8391,6 +8430,8 @@ in
tdns-cli = callPackage ../tools/networking/tdns-cli { };
+ tea = callPackage ../tools/misc/tea { };
+
ted = callPackage ../tools/typesetting/ted { };
teamviewer = libsForQt514.callPackage ../applications/networking/remote/teamviewer { };
@@ -9299,6 +9340,8 @@ in
xml2 = callPackage ../tools/text/xml/xml2 { };
+ xmldiff = python3Packages.callPackage ../tools/text/xml/xmldiff { };
+
xmlformat = callPackage ../tools/text/xml/xmlformat { };
xmlroff = callPackage ../tools/typesetting/xmlroff { };
@@ -9354,6 +9397,8 @@ in
yafaray-core = callPackage ../tools/graphics/yafaray-core { };
+ yapf = with python3Packages; toPythonApplication yapf;
+
yarn = callPackage ../development/tools/yarn { };
yarn2nix-moretea = callPackage ../development/tools/yarn2nix-moretea/yarn2nix { };
@@ -10914,14 +10959,14 @@ in
rust_1_45 = callPackage ../development/compilers/rust/1_45.nix {
inherit (darwin.apple_sdk.frameworks) CoreFoundation Security;
};
- rust_1_49 = callPackage ../development/compilers/rust/1_49.nix {
+ rust_1_50 = callPackage ../development/compilers/rust/1_50.nix {
inherit (darwin.apple_sdk.frameworks) CoreFoundation Security;
};
- rust = rust_1_49;
+ rust = rust_1_50;
rustPackages_1_45 = rust_1_45.packages.stable;
- rustPackages_1_49 = rust_1_49.packages.stable;
- rustPackages = rustPackages_1_49;
+ rustPackages_1_50 = rust_1_50.packages.stable;
+ rustPackages = rustPackages_1_50;
inherit (rustPackages) cargo clippy rustc rustPlatform;
@@ -11048,7 +11093,9 @@ in
rustracerd = callPackage ../development/tools/rust/racerd {
inherit (darwin.apple_sdk.frameworks) Security;
};
- inherit (callPackage ../development/tools/rust/rust-analyzer { })
+ inherit (callPackage ../development/tools/rust/rust-analyzer {
+ inherit (darwin.apple_sdk.frameworks) CoreServices;
+ })
rust-analyzer-unwrapped rust-analyzer;
rust-bindgen = callPackage ../development/tools/rust/bindgen { };
rust-cbindgen = callPackage ../development/tools/rust/cbindgen {
@@ -11684,13 +11731,15 @@ in
bison = buildPackages.bison_3_5;
})
ruby_2_6
- ruby_2_7;
+ ruby_2_7
+ ruby_3_0;
ruby = ruby_2_6;
rubyPackages = rubyPackages_2_6;
rubyPackages_2_6 = recurseIntoAttrs ruby_2_6.gems;
rubyPackages_2_7 = recurseIntoAttrs ruby_2_7.gems;
+ rubyPackages_3_0 = recurseIntoAttrs ruby_3_0.gems;
mruby = callPackage ../development/compilers/mruby { };
@@ -12403,7 +12452,7 @@ in
ffuf = callPackage ../tools/security/ffuf { };
flow = callPackage ../development/tools/analysis/flow {
- ocamlPackages = ocaml-ng.ocamlPackages_4_07;
+ ocamlPackages = ocaml-ng.ocamlPackages_4_09;
inherit (darwin.apple_sdk.frameworks) CoreServices;
};
@@ -15674,6 +15723,8 @@ in
libsearpc = callPackage ../development/libraries/libsearpc { };
+ libseat = callPackage ../development/libraries/libseat { };
+
libsigcxx = callPackage ../development/libraries/libsigcxx { };
libsigcxx12 = callPackage ../development/libraries/libsigcxx/1.2.nix { };
@@ -16044,6 +16095,8 @@ in
mdctags = callPackage ../development/tools/misc/mdctags { };
+ md4c = callPackage ../development/libraries/md4c { };
+
mdds = callPackage ../development/libraries/mdds { };
mediastreamer = callPackage ../development/libraries/mediastreamer { };
@@ -16216,7 +16269,7 @@ in
newman = callPackage ../development/web/newman {};
- newt = callPackage ../development/libraries/newt { };
+ newt = callPackage ../development/libraries/newt { python = python3; };
nghttp2 = callPackage ../development/libraries/nghttp2 { };
libnghttp2 = nghttp2.lib;
@@ -16404,11 +16457,12 @@ in
openvdb = callPackage ../development/libraries/openvdb {};
inherit (callPackages ../development/libraries/libressl { })
- libressl_3_1;
+ libressl_3_1
+ libressl_3_2;
# Please keep this pointed to the latest version. See also
# https://discourse.nixos.org/t/nixpkgs-policy-regarding-libraries-available-in-multiple-versions/7026/2
- libressl = libressl_3_1;
+ libressl = libressl_3_2;
boringssl = callPackage ../development/libraries/boringssl { };
@@ -16547,8 +16601,9 @@ in
python = python37;
};
- protobuf = protobuf3_14;
+ protobuf = protobuf3_15;
+ protobuf3_15 = callPackage ../development/libraries/protobuf/3.15.nix { };
protobuf3_14 = callPackage ../development/libraries/protobuf/3.14.nix { };
protobuf3_13 = callPackage ../development/libraries/protobuf/3.13.nix { };
protobuf3_12 = callPackage ../development/libraries/protobuf/3.12.nix { };
@@ -17638,6 +17693,8 @@ in
zziplib = callPackage ../development/libraries/zziplib { };
+ glpng = callPackage ../development/libraries/glpng { };
+
gsignond = callPackage ../development/libraries/gsignond {
plugins = [];
};
@@ -18600,7 +18657,6 @@ in
prometheus-bird-exporter = callPackage ../servers/monitoring/prometheus/bird-exporter.nix { };
prometheus-blackbox-exporter = callPackage ../servers/monitoring/prometheus/blackbox-exporter.nix { };
prometheus-collectd-exporter = callPackage ../servers/monitoring/prometheus/collectd-exporter.nix { };
- prometheus-cups-exporter = callPackage ../servers/monitoring/prometheus/cups-exporter.nix { };
prometheus-consul-exporter = callPackage ../servers/monitoring/prometheus/consul-exporter.nix { };
prometheus-dnsmasq-exporter = callPackage ../servers/monitoring/prometheus/dnsmasq-exporter.nix { };
prometheus-dovecot-exporter = callPackage ../servers/monitoring/prometheus/dovecot-exporter.nix { };
@@ -22611,7 +22667,20 @@ in
fractal = callPackage ../applications/networking/instant-messengers/fractal { };
- freecad = libsForQt5.callPackage ../applications/graphics/freecad { };
+ freecad = libsForQt5.callPackage ../applications/graphics/freecad {
+ inherit (python3Packages)
+ GitPython
+ boost
+ matplotlib
+ pivy
+ pycollada
+ pyside2
+ pyside2-tools
+ python
+ pyyaml
+ scipy
+ shiboken2;
+ };
freemind = callPackage ../applications/misc/freemind {
jdk = jdk8; # TODO: remove override https://github.com/NixOS/nixpkgs/pull/89731
@@ -23508,6 +23577,8 @@ in
kubectl = callPackage ../applications/networking/cluster/kubectl { };
+ kubectl-doctor = callPackage ../applications/networking/cluster/kubectl-doctor { };
+
kubectl-example = callPackage ../applications/networking/cluster/kubectl-example { };
kubeless = callPackage ../applications/networking/cluster/kubeless { };
@@ -23854,6 +23925,8 @@ in
meshlab = libsForQt5.callPackage ../applications/graphics/meshlab { };
+ metadata-cleaner = callPackage ../applications/misc/metadata-cleaner { };
+
metersLv2 = callPackage ../applications/audio/meters_lv2 { };
mhwaveedit = callPackage ../applications/audio/mhwaveedit {
@@ -24572,6 +24645,8 @@ in
wxGTK = wxGTK30-gtk3;
};
+ pdfslicer = callPackage ../applications/misc/pdfslicer { };
+
pekwm = callPackage ../applications/window-managers/pekwm { };
pencil = callPackage ../applications/graphics/pencil {
@@ -26831,6 +26906,8 @@ in
chiaki = libsForQt5.callPackage ../games/chiaki { };
+ chromium-bsu = callPackage ../games/chromium-bsu { };
+
chocolateDoom = callPackage ../games/chocolate-doom { };
clonehero-unwrapped = pkgs.callPackage ../games/clonehero { };
diff --git a/third_party/nixpkgs/pkgs/top-level/darwin-packages.nix b/third_party/nixpkgs/pkgs/top-level/darwin-packages.nix
index 2197f12838..3ece95c584 100644
--- a/third_party/nixpkgs/pkgs/top-level/darwin-packages.nix
+++ b/third_party/nixpkgs/pkgs/top-level/darwin-packages.nix
@@ -23,7 +23,7 @@ in
binutils-unwrapped = callPackage ../os-specific/darwin/binutils {
inherit (darwin) cctools;
inherit (pkgs) binutils-unwrapped;
- inherit (pkgs.llvmPackages_7) llvm;
+ inherit (pkgs.llvmPackages_7) llvm clang-unwrapped;
};
binutils = pkgs.wrapBintoolsWith {
diff --git a/third_party/nixpkgs/pkgs/top-level/dotnet-packages.nix b/third_party/nixpkgs/pkgs/top-level/dotnet-packages.nix
index 0b2b6af803..660ba01bcd 100644
--- a/third_party/nixpkgs/pkgs/top-level/dotnet-packages.nix
+++ b/third_party/nixpkgs/pkgs/top-level/dotnet-packages.nix
@@ -897,7 +897,7 @@ let self = dotnetPackages // overrides; dotnetPackages = with self; {
sha256 = "07r63xam6icm17pf6amh1qkmna13nxa3ncdan7a3ql307i5isriz";
};
- buildInputs = [ unzip ];
+ nativeBuildInputs = [ unzip ];
phases = [ "unpackPhase" "installPhase" ];
diff --git a/third_party/nixpkgs/pkgs/top-level/kodi-packages.nix b/third_party/nixpkgs/pkgs/top-level/kodi-packages.nix
new file mode 100644
index 0000000000..f9b20dd2bc
--- /dev/null
+++ b/third_party/nixpkgs/pkgs/top-level/kodi-packages.nix
@@ -0,0 +1,113 @@
+{ lib, newScope, kodi }:
+
+with lib;
+
+let self = rec {
+
+ addonDir = "/share/kodi/addons";
+ rel = "Matrix";
+
+ callPackage = newScope self;
+
+ inherit kodi;
+
+ # Convert derivation to a kodi module. Stolen from ../../../top-level/python-packages.nix
+ toKodiAddon = drv: drv.overrideAttrs (oldAttrs: {
+ # Use passthru in order to prevent rebuilds when possible.
+ passthru = (oldAttrs.passthru or {}) // {
+ kodiAddonFor = kodi;
+ requiredKodiAddons = requiredKodiAddons drv.propagatedBuildInputs;
+ };
+ });
+
+ # Check whether a derivation provides a Kodi addon.
+ hasKodiAddon = drv: drv ? kodiAddonFor && drv.kodiAddonFor == kodi;
+
+ # Get list of required Kodi addons given a list of derivations.
+ requiredKodiAddons = drvs:
+ let
+ modules = filter hasKodiAddon drvs;
+ in
+ unique (modules ++ concatLists (catAttrs "requiredKodiAddons" modules));
+
+ # package update scripts
+
+ addonUpdateScript = callPackage ../applications/video/kodi-packages/addon-update-script { };
+
+ # package builders
+
+ buildKodiAddon = callPackage ../applications/video/kodi/build-kodi-addon.nix { };
+
+ buildKodiBinaryAddon = callPackage ../applications/video/kodi/build-kodi-binary-addon.nix { };
+
+ # regular packages
+
+ kodi-platform = callPackage ../applications/video/kodi-packages/kodi-platform { };
+
+ # addon packages
+
+ controllers = {
+ default = callPackage ../applications/video/kodi-packages/controllers { controller = "default"; };
+
+ dreamcast = callPackage ../applications/video/kodi-packages/controllers { controller = "dreamcast"; };
+
+ gba = callPackage ../applications/video/kodi-packages/controllers { controller = "gba"; };
+
+ genesis = callPackage ../applications/video/kodi-packages/controllers { controller = "genesis"; };
+
+ mouse = callPackage ../applications/video/kodi-packages/controllers { controller = "mouse"; };
+
+ n64 = callPackage ../applications/video/kodi-packages/controllers { controller = "n64"; };
+
+ nes = callPackage ../applications/video/kodi-packages/controllers { controller = "nes"; };
+
+ ps = callPackage ../applications/video/kodi-packages/controllers { controller = "ps"; };
+
+ snes = callPackage ../applications/video/kodi-packages/controllers { controller = "snes"; };
+ };
+
+ joystick = callPackage ../applications/video/kodi-packages/joystick { };
+
+ netflix = callPackage ../applications/video/kodi-packages/netflix { };
+
+ svtplay = callPackage ../applications/video/kodi-packages/svtplay { };
+
+ steam-controller = callPackage ../applications/video/kodi-packages/steam-controller { };
+
+ steam-launcher = callPackage ../applications/video/kodi-packages/steam-launcher { };
+
+ pdfreader = callPackage ../applications/video/kodi-packages/pdfreader { };
+
+ pvr-hts = callPackage ../applications/video/kodi-packages/pvr-hts { };
+
+ pvr-hdhomerun = callPackage ../applications/video/kodi-packages/pvr-hdhomerun { };
+
+ pvr-iptvsimple = callPackage ../applications/video/kodi-packages/pvr-iptvsimple { };
+
+ osmc-skin = callPackage ../applications/video/kodi-packages/osmc-skin { };
+
+ vfs-sftp = callPackage ../applications/video/kodi-packages/vfs-sftp { };
+
+ vfs-libarchive = callPackage ../applications/video/kodi-packages/vfs-libarchive { };
+
+ # addon packages (dependencies)
+
+ certifi = callPackage ../applications/video/kodi-packages/certifi { };
+
+ chardet = callPackage ../applications/video/kodi-packages/chardet { };
+
+ idna = callPackage ../applications/video/kodi-packages/idna { };
+
+ inputstream-adaptive = callPackage ../applications/video/kodi-packages/inputstream-adaptive { };
+
+ inputstreamhelper = callPackage ../applications/video/kodi-packages/inputstreamhelper { };
+
+ myconnpy = callPackage ../applications/video/kodi-packages/myconnpy { };
+
+ requests = callPackage ../applications/video/kodi-packages/requests { };
+
+ signals = callPackage ../applications/video/kodi-packages/signals { };
+
+ urllib3 = callPackage ../applications/video/kodi-packages/urllib3 { };
+
+}; in self
diff --git a/third_party/nixpkgs/pkgs/top-level/ocaml-packages.nix b/third_party/nixpkgs/pkgs/top-level/ocaml-packages.nix
index 3c8c500d8b..fd8165085f 100644
--- a/third_party/nixpkgs/pkgs/top-level/ocaml-packages.nix
+++ b/third_party/nixpkgs/pkgs/top-level/ocaml-packages.nix
@@ -238,6 +238,8 @@ let
decompress = callPackage ../development/ocaml-modules/decompress { };
+ decompress-1-2 = callPackage ../development/ocaml-modules/decompress/1.2.nix { };
+
diet = callPackage ../development/ocaml-modules/diet { };
digestif = callPackage ../development/ocaml-modules/digestif { };
@@ -399,7 +401,9 @@ let
hxd = callPackage ../development/ocaml-modules/hxd { };
- imagelib = callPackage ../development/ocaml-modules/imagelib { };
+ imagelib = callPackage ../development/ocaml-modules/imagelib {
+ decompress = decompress-1-2;
+ };
inotify = callPackage ../development/ocaml-modules/inotify { };
@@ -572,6 +576,10 @@ let
lua-ml = callPackage ../development/ocaml-modules/lua-ml { };
+ luv = callPackage ../development/ocaml-modules/luv {
+ inherit (pkgs) file;
+ };
+
lwt = callPackage ../development/ocaml-modules/lwt {
ocaml-migrate-parsetree = ocaml-migrate-parsetree-2-1;
};
@@ -921,7 +929,9 @@ let
ppx_bap = callPackage ../development/ocaml-modules/ppx_bap { };
- ppx_bitstring = callPackage ../development/ocaml-modules/bitstring/ppx.nix { };
+ ppx_bitstring = callPackage ../development/ocaml-modules/bitstring/ppx.nix {
+ ppxlib = ppxlib.override { version = "0.22.0"; };
+ };
ppxfind = callPackage ../development/ocaml-modules/ppxfind { };
diff --git a/third_party/nixpkgs/pkgs/top-level/perl-packages.nix b/third_party/nixpkgs/pkgs/top-level/perl-packages.nix
index 2e42ce58bb..2c021c24f2 100644
--- a/third_party/nixpkgs/pkgs/top-level/perl-packages.nix
+++ b/third_party/nixpkgs/pkgs/top-level/perl-packages.nix
@@ -1843,8 +1843,8 @@ let
url = "mirror://cpan/authors/id/I/IL/ILMARI/Catalyst-Authentication-Store-LDAP-1.016.tar.gz";
sha256 = "0cm399vxqqf05cjgs1j5v3sk4qc6nmws5nfhf52qvpbwc4m82mq8";
};
- propagatedBuildInputs = [ NetLDAP CatalystPluginAuthentication ClassAccessorFast ];
- buildInputs = [ TestMore TestMockObject TestException NetLDAPServerTest ];
+ propagatedBuildInputs = [ perlldap CatalystPluginAuthentication ClassAccessor ];
+ buildInputs = [ TestMockObject TestException NetLDAPServerTest ];
meta = {
description= "Authentication from an LDAP Directory";
license = with lib.licenses; [ artistic1 ];
@@ -8016,6 +8016,7 @@ let
url = "mirror://cpan/authors/id/L/LE/LEONT/File-Map-0.67.tar.gz";
sha256 = "1hpv4aprgypjxjx1kzbjnf6r29a98rw7mndlinixzk62vyz5sy0j";
};
+ perlPreHook = "export LD=$CC";
propagatedBuildInputs = [ PerlIOLayers SubExporterProgressive ];
buildInputs = [ TestFatal TestWarnings ];
meta = {
@@ -9142,10 +9143,6 @@ let
};
buildInputs = [ pkgs.gtk3 ];
propagatedBuildInputs = [ Readonly Gtk3 ];
- # Tests are broken with PerlMagick and imagemagick version 7 as of 2021-02-22.
- # See https://github.com/carygravel/gtk3-imageview/issues/19 and
- # https://github.com/NixOS/nixpkgs/pull/114007#issuecomment-783595659.
- doCheck = false;
checkInputs = [ TestDifferences PerlMagick TryTiny TestMockObject CarpAlways pkgs.librsvg ];
checkPhase = ''
${pkgs.xvfb_run}/bin/xvfb-run -s '-screen 0 800x600x24' \
@@ -10883,10 +10880,10 @@ let
JSONValidator = buildPerlPackage {
pname = "JSON-Validator";
- version = "4.10";
+ version = "4.14";
src = fetchurl {
- url = "mirror://cpan/authors/id/J/JH/JHTHORSEN/JSON-Validator-4.10.tar.gz";
- sha256 = "15hgjldd85ada8anz5fdrlnixvwqahnvv3hprcvr9jgj3gvx0lww";
+ url = "mirror://cpan/authors/id/J/JH/JHTHORSEN/JSON-Validator-4.14.tar.gz";
+ sha256 = "16zaaw7p94nz7yclz30b9xph0riy5ailqg5rjkvi1yps2hr9ba7z";
};
buildInputs = [ TestDeep ];
propagatedBuildInputs = [ DataValidateDomain DataValidateIP Mojolicious NetIDNEncode YAMLLibYAML ];
@@ -11260,10 +11257,10 @@ let
LinkEmbedder = buildPerlPackage {
pname = "LinkEmbedder";
- version = "1.16";
+ version = "1.17";
src = fetchurl {
- url = "mirror://cpan/authors/id/J/JH/JHTHORSEN/LinkEmbedder-1.16.tar.gz";
- sha256 = "0pm5h5rlfparfvsi3ygj53mwjg8lwhql5mj0macfvsvfnfvnnp6j";
+ url = "mirror://cpan/authors/id/J/JH/JHTHORSEN/LinkEmbedder-1.17.tar.gz";
+ sha256 = "10r1q2xfba59w818li5xaj6jlph9qla7vb99ir1ampq5n8g0s5i6";
};
buildInputs = [ TestDeep ];
propagatedBuildInputs = [ Mojolicious ];
@@ -12914,10 +12911,10 @@ let
MinionBackendSQLite = buildPerlModule {
pname = "Minion-Backend-SQLite";
- version = "5.0.3";
+ version = "5.0.4";
src = fetchurl {
- url = "mirror://cpan/authors/id/D/DB/DBOOK/Minion-Backend-SQLite-v5.0.3.tar.gz";
- sha256 = "1ch92846cgr1s1y6nlicjxlq9r4qh1a3fig0jlr7ligzw05mxib4";
+ url = "mirror://cpan/authors/id/D/DB/DBOOK/Minion-Backend-SQLite-v5.0.4.tar.gz";
+ sha256 = "0xhcsxm3x5v9azmyy12wiwlbpiisq06hgj3yf9ggqx8fp9jqppb1";
};
buildInputs = [ ModuleBuildTiny ];
propagatedBuildInputs = [ Minion MojoSQLite ];
@@ -13525,10 +13522,10 @@ let
Mojolicious = buildPerlPackage {
pname = "Mojolicious";
- version = "8.71";
+ version = "9.10";
src = fetchurl {
- url = "mirror://cpan/authors/id/S/SR/SRI/Mojolicious-8.71.tar.gz";
- sha256 = "03bfxzq11v6k47axdwqhp2d3p1z17nwyxj0yww5z3x293p6zsnqm";
+ url = "mirror://cpan/authors/id/S/SR/SRI/Mojolicious-9.10.tar.gz";
+ sha256 = "0y4ccy85vh7nily2y1c457f687qc8rwi4mnx13619hslkagw4rqw";
};
meta = {
homepage = "https://mojolicious.org";
@@ -13540,10 +13537,10 @@ let
MojoliciousPluginAssetPack = buildPerlPackage {
pname = "Mojolicious-Plugin-AssetPack";
- version = "2.10";
+ version = "2.13";
src = fetchurl {
- url = "mirror://cpan/authors/id/J/JH/JHTHORSEN/Mojolicious-Plugin-AssetPack-2.10.tar.gz";
- sha256 = "0jfspr0mrb8f9p89d01ri7ci0dazrg341sbyd1khppxxwviip378";
+ url = "mirror://cpan/authors/id/S/SR/SRI/Mojolicious-Plugin-AssetPack-2.13.tar.gz";
+ sha256 = "1254yy70c7wv3p64pjyxc2h1p9czs65jm6lzl42qmn1x19i8fggj";
};
propagatedBuildInputs = [ FileWhich IPCRun3 Mojolicious ];
meta = {
@@ -13587,10 +13584,10 @@ let
MojoliciousPluginOpenAPI = buildPerlPackage {
pname = "Mojolicious-Plugin-OpenAPI";
- version = "3.40";
+ version = "4.00";
src = fetchurl {
- url = "mirror://cpan/authors/id/J/JH/JHTHORSEN/Mojolicious-Plugin-OpenAPI-3.40.tar.gz";
- sha256 = "0pj2azis2xfqcy04j0734hsfq3v60wympzpvsgfhmj0w66mb238y";
+ url = "mirror://cpan/authors/id/J/JH/JHTHORSEN/Mojolicious-Plugin-OpenAPI-4.00.tar.gz";
+ sha256 = "1npnbygs12d683m5i6cgvdmw6glvppnv75f4qpp908fdz8lwcb2z";
};
propagatedBuildInputs = [ JSONValidator ];
meta = {
@@ -13683,10 +13680,10 @@ let
MojoSQLite = buildPerlModule {
pname = "Mojo-SQLite";
- version = "3.004";
+ version = "3.005";
src = fetchurl {
- url = "mirror://cpan/authors/id/D/DB/DBOOK/Mojo-SQLite-3.004.tar.gz";
- sha256 = "d9ca9c1f3e8183611638e318b88ad3c0f8ab7e65f6ac72e48bffe51aea03b983";
+ url = "mirror://cpan/authors/id/D/DB/DBOOK/Mojo-SQLite-3.005.tar.gz";
+ sha256 = "0appzyhr5adzdfxns31lj568hz18bkmxmcv7fpafrx67b98cpza1";
};
buildInputs = [ ModuleBuildTiny ];
propagatedBuildInputs = [ DBDSQLite Mojolicious SQLAbstract URIdb ];
@@ -13715,6 +13712,23 @@ let
};
};
+ MojoIOLoopDelay = buildPerlModule {
+ pname = "Mojo-IOLoop-Delay";
+ version = "8.76";
+ src = fetchurl {
+ url = "mirror://cpan/authors/id/J/JB/JBERGER/Mojo-IOLoop-Delay-8.76.tar.gz";
+ sha256 = "1vd9s1r82wfxh8y1g2ninsyvzkawx7n6ncll8lhdj89p91hw1jwf";
+ };
+ buildInputs = [ ModuleBuildTiny ];
+ propagatedBuildInputs = [ Mojolicious ];
+ meta = {
+ homepage = "https://github.com/jberger/Mojo-IOLoop-Delay";
+ description = "(DISCOURAGED) Promises/A+ and flow-control helpers";
+ license = lib.licenses.artistic2;
+ maintainers = [ maintainers.zakame ];
+ };
+ };
+
MojoIOLoopForkCall = buildPerlModule {
pname = "Mojo-IOLoop-ForkCall";
version = "0.20";
@@ -13722,10 +13736,17 @@ let
url = "mirror://cpan/authors/id/J/JB/JBERGER/Mojo-IOLoop-ForkCall-0.20.tar.gz";
sha256 = "2b9962244c25a71e4757356fb3e1237cf869e26d1c27215115ba7b057a81f1a6";
};
- propagatedBuildInputs = [ IOPipely Mojolicious ];
+ propagatedBuildInputs = [ IOPipely Mojolicious MojoIOLoopDelay ];
+ preBuild = ''
+ # This module needs the deprecated Mojo::IOLoop::Delay
+ substituteInPlace lib/Mojo/IOLoop/ForkCall.pm \
+ --replace "use Mojo::IOLoop;" "use Mojo::IOLoop; use Mojo::IOLoop::Delay;"
+ '';
meta = {
- description = "Run blocking functions asynchronously by forking";
+ homepage = "https://github.com/jberger/Mojo-IOLoop-ForkCall";
+ description = "Run blocking functions asynchronously by forking (deprecated)";
license = with lib.licenses; [ artistic1 gpl1Plus ];
+ maintainers = [ maintainers.zakame ];
};
};
@@ -13765,10 +13786,10 @@ let
MojoUserAgentCached = buildPerlPackage {
pname = "Mojo-UserAgent-Cached";
- version = "1.12";
+ version = "1.16";
src = fetchurl {
- url = "mirror://cpan/authors/id/N/NI/NICOMEN/Mojo-UserAgent-Cached-1.12.tar.gz";
- sha256 = "08pa3sz63sq2y3g3lbhy2msbnx0myb2igmmc28cm3kaznryvsgwm";
+ url = "mirror://cpan/authors/id/N/NI/NICOMEN/Mojo-UserAgent-Cached-1.16.tar.gz";
+ sha256 = "17gp1kn97s1wv973w0g92alx13lmcvdan794471sfq2is6s6v1qd";
};
buildInputs = [ ModuleInstall ];
propagatedBuildInputs = [ AlgorithmLCSS CHI DataSerializer DevelStackTrace Mojolicious Readonly StringTruncate ];
@@ -14866,7 +14887,7 @@ let
url = "mirror://cpan/authors/id/E/ES/ESTRABD/MySQL-Diff-0.60.tar.gz";
sha256 = "5d7080a4bd5714ff9ef536aa774a7adb3c6f0e760215ca6c39d8a3545344f956";
};
- propagatedBuildInputs = [ pkgs.mysql-client FileSlurp StringShellQuote ];
+ propagatedBuildInputs = [ pkgs.mariadb.client FileSlurp StringShellQuote ];
meta = {
homepage = "https://github.com/estrabd/mysqldiff";
description = "Generates a database upgrade instruction set";
@@ -15365,7 +15386,7 @@ let
url = "mirror://cpan/authors/id/A/AA/AAR/Net-LDAP-Server-0.43.tar.gz";
sha256 = "0qmh3cri3fpccmwz6bhwp78yskrb3qmalzvqn0a23hqbsfs4qv6x";
};
- propagatedBuildInputs = [ NetLDAP ConvertASN1 ];
+ propagatedBuildInputs = [ perlldap ConvertASN1 ];
meta = {
description = "LDAP server side protocol handling";
license = with lib.licenses; [ artistic1 ];
@@ -15392,7 +15413,7 @@ let
url = "mirror://cpan/authors/id/K/KA/KARMAN/Net-LDAP-Server-Test-0.22.tar.gz";
sha256 = "13idip7jky92v4adw60jn2gcc3zf339gsdqlnc9nnvqzbxxp285i";
};
- propagatedBuildInputs = [ NetLDAP NetLDAPServer TestMore DataDump NetLDAPSID ];
+ propagatedBuildInputs = [ perlldap NetLDAPServer DataDump NetLDAPSID ];
meta = {
description= "test Net::LDAP code";
license = with lib.licenses; [ artistic1 ];
@@ -15912,10 +15933,10 @@ let
OpenAPIClient = buildPerlPackage rec {
pname = "OpenAPI-Client";
- version = "0.25";
+ version = "1.00";
src = fetchurl {
- url = "mirror://cpan/authors/id/J/JH/JHTHORSEN/OpenAPI-Client-0.25.tar.gz";
- sha256 = "bc6be443c9c44348899fd595e080abe53760ae7561d63615a2f9b9f0a943336c";
+ url = "mirror://cpan/authors/id/J/JH/JHTHORSEN/OpenAPI-Client-1.00.tar.gz";
+ sha256 = "41bcf211c1123fbfb844413aa53f97061410b592591367b61273a206865991f7";
};
propagatedBuildInputs = [ MojoliciousPluginOpenAPI ];
meta = {
@@ -16755,6 +16776,11 @@ let
preConfigure =
''
sed -i -e 's|my \$INC_magick = .*|my $INC_magick = "-I${pkgs.imagemagick.dev}/include/ImageMagick";|' Makefile.PL
+
+ # Enable HDRI support to match the native ImageMagick 7 defaults
+ # See: https://github.com/ImageMagick/ImageMagick/issues/3402#issuecomment-801195538
+ substituteInPlace Makefile.PL \
+ --replace 'MAGICKCORE_HDRI_ENABLE=0' 'MAGICKCORE_HDRI_ENABLE=1'
'';
};
@@ -23070,7 +23096,7 @@ let
sha256 = "582db53a091f8da3670c037733314f2510af5e8ee0ba42a0e391e2f2e3ca7734";
};
prePatch = "rm examples.pl";
- propagatedBuildInputs = [ LWPProtocolhttps ];
+ propagatedBuildInputs = [ LWPProtocolHttps ];
meta = {
description = "Accessing Twilio's REST API with Perl";
license = with lib.licenses; [ artistic1 gpl1Plus ];
diff --git a/third_party/nixpkgs/pkgs/top-level/python-packages.nix b/third_party/nixpkgs/pkgs/top-level/python-packages.nix
index ee6e9f8ac8..2b35c242ed 100644
--- a/third_party/nixpkgs/pkgs/top-level/python-packages.nix
+++ b/third_party/nixpkgs/pkgs/top-level/python-packages.nix
@@ -124,6 +124,16 @@ in {
venvShellHook
wheelUnpackHook;
+ # Not all packages are compatible with the latest pytest yet.
+ # We need to override the hook to select an older pytest, however,
+ # it should not override the version of pytest that is used for say
+ # Python 2. This is an ugly hack that is needed now because the hook
+ # propagates the package.
+ pytestCheckHook_6_1 = if isPy3k then
+ self.pytestCheckHook.override { pytest = self.pytest_6_1; }
+ else
+ self.pytestCheckHook;
+
# helpers
# We use build packages because we are making a setup hook to be used as a
@@ -250,7 +260,9 @@ in {
aiohomekit = callPackage ../development/python-modules/aiohomekit { };
- aiohttp = callPackage ../development/python-modules/aiohttp { };
+ aiohttp = callPackage ../development/python-modules/aiohttp {
+ pytestCheckHook = self.pytestCheckHook_6_1;
+ };
aiohttp-cors = callPackage ../development/python-modules/aiohttp-cors { };
@@ -328,6 +340,8 @@ in {
ajpy = callPackage ../development/python-modules/ajpy { };
+ ajsonrpc = callPackage ../development/python-modules/ajsonrpc { };
+
alabaster = callPackage ../development/python-modules/alabaster { };
alarmdecoder = callPackage ../development/python-modules/alarmdecoder { };
@@ -534,7 +548,9 @@ in {
async-timeout = callPackage ../development/python-modules/async_timeout { };
- async-upnp-client = callPackage ../development/python-modules/async-upnp-client { };
+ async-upnp-client = callPackage ../development/python-modules/async-upnp-client {
+ pytestCheckHook = self.pytestCheckHook_6_1;
+ };
asyncwhois = callPackage ../development/python-modules/asyncwhois { };
@@ -1589,6 +1605,7 @@ in {
cudatoolkit = pkgs.cudatoolkit_10_0;
cudnn = pkgs.cudnn_cudatoolkit_10_0;
nccl = pkgs.nccl_cudatoolkit_10;
+ cutensor = pkgs.cutensor_cudatoolkit_10;
};
curio = callPackage ../development/python-modules/curio { };
@@ -3134,6 +3151,8 @@ in {
hug = callPackage ../development/python-modules/hug { };
+ huggingface-hub = callPackage ../development/python-modules/huggingface-hub { };
+
humanfriendly = callPackage ../development/python-modules/humanfriendly { };
humanize = callPackage ../development/python-modules/humanize { };
@@ -4110,6 +4129,8 @@ in {
mask-rcnn = callPackage ../development/python-modules/mask-rcnn { };
+ mat2 = callPackage ../development/python-modules/mat2 { };
+
matchpy = callPackage ../development/python-modules/matchpy { };
mathlibtools = callPackage ../development/python-modules/mathlibtools { };
@@ -6362,6 +6383,14 @@ in {
};
};
+ pytest_6_1 = self.pytest_6.overridePythonAttrs (oldAttrs: rec {
+ version = "6.1.2";
+ src = oldAttrs.src.override {
+ inherit version;
+ sha256 = "c0a7e94a8cdbc5422a51ccdad8e6f1024795939cc89159a0ae7f0b316ad3823e";
+ };
+ });
+
pytest-aiohttp = callPackage ../development/python-modules/pytest-aiohttp { };
pytest-annotate = callPackage ../development/python-modules/pytest-annotate { };
@@ -6412,6 +6441,8 @@ in {
pytest-env = callPackage ../development/python-modules/pytest-env { };
+ pytest-error-for-skips = callPackage ../development/python-modules/pytest-error-for-skips { };
+
pytest-expect = callPackage ../development/python-modules/pytest-expect { };
pytest-factoryboy = callPackage ../development/python-modules/pytest-factoryboy { };
@@ -7324,7 +7355,7 @@ in {
salmon-mail = callPackage ../development/python-modules/salmon-mail { };
sane = callPackage ../development/python-modules/sane {
- inherit (pkgs) saneBackends;
+ inherit (pkgs) sane-backends;
};
sampledata = callPackage ../development/python-modules/sampledata { };
@@ -8321,7 +8352,9 @@ in {
trimesh = callPackage ../development/python-modules/trimesh { };
- trio = callPackage ../development/python-modules/trio { };
+ trio = callPackage ../development/python-modules/trio {
+ pytestCheckHook = self.pytestCheckHook_6_1;
+ };
trollius = callPackage ../development/python-modules/trollius { };
@@ -8512,7 +8545,12 @@ in {
urlgrabber = callPackage ../development/python-modules/urlgrabber { };
- urllib3 = callPackage ../development/python-modules/urllib3 { };
+ urllib3 = if isPy3k then
+ callPackage ../development/python-modules/urllib3 {
+ pytestCheckHook = self.pytestCheckHook_6_1;
+ }
+ else
+ callPackage ../development/python-modules/urllib3/2.nix { };
urwid = callPackage ../development/python-modules/urwid { };
@@ -8713,7 +8751,9 @@ in {
webthing = callPackage ../development/python-modules/webthing { };
- werkzeug = callPackage ../development/python-modules/werkzeug { };
+ werkzeug = callPackage ../development/python-modules/werkzeug {
+ pytestCheckHook = self.pytestCheckHook_6_1;
+ };
west = callPackage ../development/python-modules/west { };
@@ -8949,6 +8989,8 @@ in {
yt = callPackage ../development/python-modules/yt { };
+ ytmusicapi = callPackage ../development/python-modules/ytmusicapi { };
+
yubico-client = callPackage ../development/python-modules/yubico-client { };
z3c-checkversions = callPackage ../development/python-modules/z3c-checkversions { };